diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 2405f7d4efa..bac601fbf82 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -12,17 +12,17 @@ # Libraries /lib @edolstra @nbp -/lib/systems @edolstra @nbp @ericson2314 +/lib/systems @nbp @ericson2314 # Nixpkgs Internals /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 @edolstra -/pkgs/build-support/cc-wrapper @edolstra @Ericson2314 -/pkgs/build-support/bintools-wrapper @edolstra @Ericson2314 -/pkgs/build-support/setup-hooks @edolstra @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 diff --git a/COPYING b/COPYING index afc460fff5c..198597a1b41 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/doc/cross-compilation.xml b/doc/cross-compilation.xml index 4b35b72feae..10e4706b059 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/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md index bf8bcd7e704..629db289ab1 100644 --- a/doc/languages-frameworks/haskell.md +++ b/doc/languages-frameworks/haskell.md @@ -581,8 +581,8 @@ nix-shell "" -A haskellPackages.bar.env 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: +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 diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index 3700d2e57d4..039ca8545e9 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -191,7 +191,6 @@ building Python libraries is `buildPythonPackage`. Let's see how we can build th toolz = buildPythonPackage rec { pname = "toolz"; version = "0.7.4"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; @@ -237,7 +236,6 @@ with import {}; my_toolz = python35.pkgs.buildPythonPackage rec { pname = "toolz"; version = "0.7.4"; - name = "${pname}-${version}"; src = python35.pkgs.fetchPypi { inherit pname version; @@ -283,15 +281,15 @@ order to build [`datashape`](https://github.com/blaze/datashape). { # ... datashape = buildPythonPackage rec { - name = "datashape-${version}"; + pname = "datashape"; version = "0.4.7"; - src = pkgs.fetchurl { - url = "mirror://pypi/D/DataShape/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "14b2ef766d4c9652ab813182e866f493475e65e558bed0822e38bf07bba1a278"; }; - buildInputs = with self; [ pytest ]; + checkInputs = with self; [ pytest ]; propagatedBuildInputs = with self; [ numpy multipledispatch dateutil ]; meta = { @@ -318,10 +316,11 @@ when building the bindings and are therefore added as `buildInputs`. { # ... lxml = buildPythonPackage rec { - name = "lxml-3.4.4"; + pname = "lxml"; + version = "3.4.4"; - src = pkgs.fetchurl { - url = "mirror://pypi/l/lxml/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "16a0fa97hym9ysdk3rmqz32xdjqmy4w34ld3rm3jf5viqjx65lxk"; }; @@ -351,11 +350,11 @@ and `CFLAGS`. { # ... pyfftw = buildPythonPackage rec { - name = "pyfftw-${version}"; + pname = "pyFFTW"; version = "0.9.2"; - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyFFTW/pyFFTW-${version}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "f6bbb6afa93085409ab24885a1a3cdb8909f095a142f4d49e346f2bd1b789074"; }; @@ -440,11 +439,11 @@ We first create a function that builds `toolz` in `~/path/to/toolz/release.nix` { pkgs, buildPythonPackage }: buildPythonPackage rec { - name = "toolz-${version}"; + pname = "toolz"; version = "0.7.4"; - src = pkgs.fetchurl { - url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd"; }; @@ -549,25 +548,31 @@ The `buildPythonPackage` function is implemented in The following is an example: ```nix -{ # ... - twisted = buildPythonPackage { - name = "twisted-8.1.0"; +buildPythonPackage rec { + version = "3.3.1"; + pname = "pytest"; - src = pkgs.fetchurl { - url = http://tmrc.mit.edu/mirror/twisted/Twisted/8.1/Twisted-8.1.0.tar.bz2; - sha256 = "0q25zbr4xzknaghha72mq57kh53qw1bf8csgp63pm9sfi72qhirl"; - }; + preCheck = '' + # don't test bash builtins + rm testing/test_argcomplete.py + ''; - propagatedBuildInputs = [ self.ZopeInterface ]; + src = fetchPypi { + inherit pname version; + sha256 = "cf8436dc59d8695346fcd3ab296de46425ecab00d64096cebe79fb51ecb2eb93"; + }; - meta = { - homepage = http://twistedmatrix.com/; - description = "Twisted, an event-driven networking engine written in Python"; - license = stdenv.lib.licenses.mit; - }; + 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: @@ -623,7 +628,6 @@ with import {}; packageOverrides = self: super: { pandas = super.pandas.overridePythonAttrs(old: rec { version = "0.19.1"; - name = "pandas-${version}"; src = super.fetchPypi { pname = "pandas"; inherit version; diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 91c659408c4..3a7b23baaa7 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -179,6 +179,269 @@ genericBuild +
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 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. + + + + + + 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 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. + + + + + + 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. + + + + + depsBuildBuildPropagated + + The propagated equivalent of depsBuildBuild. + This perhaps never ought to be used, but it is included for consistency [see below for the others]. + + + + + propagatedNativeBuildInputs + + 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. + + + + + depsHostHostPropagated + + The propagated equivalent of depsHostHost. + + + + + propagatedBuildInputs + + 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 @@ -198,54 +461,6 @@ genericBuild - - Variables specifying dependencies - - - nativeBuildInputs - - 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. - - - - - buildInputs - - 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. - - - - - - propagatedNativeBuildInputs - - 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. - - - - - 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. - - - - - Variables affecting build properties @@ -656,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. @@ -780,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. + @@ -923,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 @@ -1051,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. + @@ -1353,8 +1585,55 @@ 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. @@ -1421,9 +1700,12 @@ someVar=$(stripHash $name) 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. + + diff --git a/lib/customisation.nix b/lib/customisation.nix index 483ef6fd486..823395f04d4 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,24 @@ 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; + }; + /* Add attributes to each output of a derivation without changing + the derivation itself. */ + addPassthru = + lib.warn "`addPassthru drv passthru` is deprecated, replace with `extendDerivation true passthru drv`" + (drv: passthru: extendDerivation true passthru drv); /* 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 646ef220ad0..d163e60b695 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 9dc4fea99fc..97d7c10192a 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -51,12 +51,12 @@ let 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 functionArgs setFunctionArgs isFunction; inherit (fixedPoints) fix fix' extends composeExtensions makeExtensible makeExtensibleWithCustomName; @@ -87,13 +87,14 @@ let inherit (stringsWithDeps) textClosureList textClosureMap noDepEntry fullDepEntry packEntry stringAfter; inherit (customisation) overrideDerivation makeOverridable - callPackageWith callPackagesWith addPassthru hydraJob makeScope; + callPackageWith callPackagesWith extendDerivation addPassthru + 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 diff --git a/lib/deprecated.nix b/lib/deprecated.nix index 2a0f5a55bf1..34cf336d1f4 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 b27ab485f41..73017f2c679 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -14,6 +14,8 @@ let libAttr = lib.attrsets; flipMapAttrs = flip libAttr.mapAttrs; + + inherit (lib) isFunction; in rec { @@ -110,7 +112,7 @@ rec { else if isString v then "\"" + v + "\"" 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); @@ -130,6 +132,6 @@ rec { (name: value: "${toPretty args name} = ${toPretty args value};") v) + " }" - else "toPretty: should never happen (v = ${v})"; + else abort "toPretty: should never happen (v = ${v})"; } diff --git a/lib/licenses.nix b/lib/licenses.nix index 1f2c448470b..0086bd63ebd 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -200,6 +200,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; @@ -309,6 +314,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"; diff --git a/lib/maintainers.nix b/lib/maintainers.nix index d584645a72c..348212df095 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -29,6 +29,7 @@ aherrmann = "Andreas Herrmann "; ahmedtd = "Taahir Ahmed "; aij = "Ivan Jager "; + ajgrf = "Alex Griffin "; ak = "Alexander Kjeldaas "; akaWolf = "Artjom Vejsel "; akc = "Anders Claesson "; @@ -54,11 +55,13 @@ antonxy = "Anton Schirg "; apeschar = "Albert Peschar "; apeyroux = "Alexandre Peyroux "; + arcadio = "Arcadio Rubio García "; ardumont = "Antoine R. Dumont "; aristid = "Aristid Breitkreuz "; arobyn = "Alexei Robyn "; artuuge = "Artur E. Ruuge "; ashalkhakov = "Artyom Shalkhakov "; + ashgillman = "Ashley Gillman "; aske = "Kirill Boltaev "; asppsa = "Alastair Pharo "; astsmtl = "Alexander Tsamutali "; @@ -97,6 +100,7 @@ bradediger = "Brad Ediger "; bramd = "Bram Duvigneau "; bstrik = "Berno Strik "; + bugworm = "Roman Gerasimenko "; bzizou = "Bruno Bzeznik "; c0bw3b = "Renaud "; c0dehero = "CodeHero "; @@ -115,8 +119,10 @@ chaoflow = "Florian Friesdorf "; chattered = "Phil Scott "; ChengCat = "Yucheng Zhang "; + chiiruno = "Okina Matara "; choochootrain = "Hurshal Patel "; chpatrick = "Patrick Chilton "; + chreekat = "Bryan Richter "; chris-martin = "Chris Martin "; chrisjefferson = "Christopher Jefferson "; chrisrosset = "Christopher Rosset "; @@ -124,7 +130,7 @@ ciil = "Simon Lackerbauer "; ck3d = "Christian Kögler "; ckampka = "Christian Kampka "; - ckauhaus = "Christian Kauhaus "; + ckauhaus = "Christian Kauhaus "; cko = "Christine Koppelt "; cleverca22 = "Michael Bishop "; cmcdragonkai = "Roger Qiu "; @@ -188,6 +194,7 @@ dtzWill = "Will Dietz "; dupgit = "Olivier Delhomme "; dywedir = "Vladyslav M. "; + dzabraev = "Maksim Dzabraev "; e-user = "Alexander Kahl "; earldouglas = "James Earl Douglas "; ebzzry = "Rommel Martinez "; @@ -224,6 +231,7 @@ fadenb = "Tristan Helmich "; falsifian = "James Cook "; fare = "Francois-Rene Rideau "; + f-breidenstein = "Felix Breidenstein "; fgaz = "Francesco Gazzetta "; FireyFly = "Jonas Höglund "; flokli = "Florian Klink "; @@ -282,6 +290,7 @@ hodapp = "Chris Hodapp "; hrdinka = "Christoph Hrdinka "; htr = "Hugo Tavares Reis "; + hyphon81 = "Masato Yonekawa "; iand675 = "Ian Duncan "; ianwookim = "Ian-Woo Kim "; iblech = "Ingo Blechschmidt "; @@ -293,6 +302,7 @@ ivan-tkatchev = "Ivan Tkatchev "; ixmatus = "Parnell Springmeyer "; izorkin = "Yurii Izorkin "; + ixxie = "Matan Bendix Shenhav "; j-keck = "Jürgen Keck "; jagajaga = "Arseniy Seroka "; jammerful = "jammerful "; @@ -319,11 +329,13 @@ joelmo = "Joel Moberg "; joelteon = "Joel Taylor "; johbo = "Johannes Bornhold "; + johnazoidberg = "Daniel Schäfer "; johnmh = "John M. Harris, Jr. "; johnramsden = "John Ramsden "; joko = "Ioannis Koutras "; jonafato = "Jon Banafato "; joncojonathan = "Jonathan Haddock "; + jpdoyle = "Joe Doyle "; jpierre03 = "Jean-Pierre PRUNARET "; jpotier = "Martin Potier "; jraygauthier = "Raymond Gauthier "; @@ -359,6 +371,7 @@ ldesgoui = "Lucas Desgouilles "; league = "Christopher League "; lebastr = "Alexander Lebedev "; + ledif = "Adam Fidel "; leemachin = "Lee Machin "; leenaars = "Michiel Leenaars "; leonardoce = "Leonardo Cecchi "; @@ -376,12 +389,14 @@ lovek323 = "Jason O'Conal "; lowfatcomputing = "Andreas Wagner "; lsix = "Lancelot SIX "; + lschuermann = "Leon Schuermann "; ltavard = "Laure Tavard "; lucas8 = "Luc Chabassier "; ludo = "Ludovic Courtès "; lufia = "Kyohei Kadota "; luispedro = "Luis Pedro Coelho "; lukego = "Luke Gorrie "; + luz = "Luz "; lw = "Sergey Sofeychuk "; lyt = "Tim Liou "; m3tti = "Mathaeus Sander "; @@ -416,6 +431,7 @@ meisternu = "Matt Miemiec "; metabar = "Celine Mercier "; mgdelacroix = "Miguel de la Cruz "; + mgttlinger = "Merlin Göttlinger 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; diff --git a/maintainers/scripts/debian-patches.sh b/maintainers/scripts/debian-patches.sh index 78678473a49..b4923fb537e 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 a2b8080e2a4..1357f87aaa5 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/rebuild-amount.sh b/maintainers/scripts/rebuild-amount.sh index 098a8c88cb7..1a54cada8af 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 3ddc8c23a79..ec2691ff617 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 = map(os.path.abspath, args.package) + 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") + + 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 diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 9bc83be6610..8079a2feb29 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -12,7 +12,7 @@ let 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. diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml index 7b25a39e83b..a8f6aa00858 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.xml +++ b/nixos/doc/manual/development/writing-nixos-tests.xml @@ -272,8 +272,37 @@ startAll; + + 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` + + + + + + + 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/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml index 31d51816e39..122a4745f19 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 diff --git a/nixos/doc/manual/installation/installing-virtualbox-guest.xml b/nixos/doc/manual/installation/installing-virtualbox-guest.xml index ee9680ced39..7fcd22a112c 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 ab9108c30a7..d4746f2eb3a 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -45,7 +45,10 @@ for a UEFI installation is by and large the same as a BIOS installation. The dif 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. diff --git a/nixos/doc/manual/installation/obtaining.xml b/nixos/doc/manual/installation/obtaining.xml index 20a4838be88..9b2b474c60c 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/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index 6329ec70582..46cbeb0a158 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -20,6 +20,22 @@ has the following highlights: + 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 + + + @@ -72,6 +88,28 @@ 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 + + + + @@ -95,6 +133,55 @@ following incompatible changes: here. + + + 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. TODO: actually remove it before branching 18.03 off. + + + + + 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. + +
@@ -145,6 +232,58 @@ following incompatible changes: 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. + + diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix index 1a17a080ba4..4685fe6914a 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 { diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 636d0223fb7..8a3d8ed1770 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,6 +43,10 @@ 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 @@ -51,6 +61,27 @@ 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}" {} '' @@ -79,20 +110,31 @@ let format' = format; in let targets = map (x: x.target) contents; prepareImage = '' - export PATH=${makeSearchPathOutput "bin" "bin" prepareImageInputs} + export PATH=${makeBinPath prepareImageInputs} + + # 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)) - '' else '' - offset=0 - ''} + ${partitionDiskScript} - mkfs.${fsType} -F -L nixos -E offset=$offset $diskImage + ${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 '' + mkfs.${fsType} -F -L nixos $diskImage + ''} root="$PWD/root" mkdir -p $root @@ -133,12 +175,12 @@ let format' = format; in let find $root/nix/store -mindepth 1 -maxdepth 1 -type f -o -type d | xargs chmod -R a-w 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 ]; + buildInputs = with pkgs; [ utillinux e2fsprogs dosfstools ]; exportReferencesGraph = [ "closure" metaClosure ]; postVM = '' ${if format == "raw" then '' @@ -152,11 +194,7 @@ in pkgs.vmTools.runInLinuxVM ( memSize = 1024; } '' - ${if partitioned then '' - rootDisk=/dev/vda1 - '' else '' - rootDisk=/dev/vda - ''} + rootDisk=${if partitionTableType != "none" then "/dev/vda${rootPartition}" else "/dev/vda"} # Some tools assume these exist ln -s vda /dev/xvda @@ -166,6 +204,14 @@ 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) '' diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix index f06649e1991..21c69ed560a 100644 --- a/nixos/lib/make-ext4-fs.nix +++ b/nixos/lib/make-ext4-fs.nix @@ -10,7 +10,7 @@ pkgs.stdenv.mkDerivation { name = "ext4-fs.img"; - buildInputs = with pkgs; [e2fsprogs libfaketime perl]; + nativeBuildInputs = with pkgs; [e2fsprogs libfaketime perl]; # For obtaining the closure of `storePaths'. exportReferencesGraph = diff --git a/nixos/lib/make-squashfs.nix b/nixos/lib/make-squashfs.nix index e66c0ae8f66..9d47a3222cc 100644 --- a/nixos/lib/make-squashfs.nix +++ b/nixos/lib/make-squashfs.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { name = "squashfs.img"; - buildInputs = [perl squashfsTools]; + nativeBuildInputs = [perl squashfsTools]; # For obtaining the closure of `storeContents'. exportReferencesGraph = diff --git a/nixos/lib/qemu-flags.nix b/nixos/lib/qemu-flags.nix index de355b08918..fcdcbf1b007 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 a01c3c336a1..78598b3efb4 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -362,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) { @@ -373,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) = @_; @@ -387,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 @@ -430,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); } diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 532fff681d3..cf213d906f5 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -85,7 +85,7 @@ rec { testScript' = # Call the test script with the computed nodes. - if builtins.isFunction testScript + if lib.isFunction testScript then testScript { inherit nodes; } else testScript; diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index 2e67edf8ee3..972c04453ae 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/modules/config/power-management.nix b/nixos/modules/config/power-management.nix index a4a4d6e1a6a..4c37e8a6208 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/shells-environment.nix b/nixos/modules/config/shells-environment.nix index 65f2e5d7af9..398660967c5 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/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index efb9ba39bcd..3306846b7fa 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix @@ -27,6 +27,7 @@ in 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 +43,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 880a6bf2e1e..f23275bc16d 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix @@ -27,6 +27,7 @@ in 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) diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix index eb676eae05e..2833b75b84d 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix @@ -27,6 +27,7 @@ in 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/misc/ids.nix b/nixos/modules/misc/ids.nix index 678593a2d8b..28ed10a5ece 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -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; @@ -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; @@ -301,6 +301,8 @@ pykms = 282; kodi = 283; restya-board = 284; + mighttpd2 = 285; + hass = 286; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -348,7 +350,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; @@ -475,10 +477,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 @@ -570,6 +572,8 @@ pykms = 282; kodi = 283; restya-board = 284; + mighttpd2 = 285; + hass = 286; # 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/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 1793c1447d6..b01f5431909 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -4,10 +4,10 @@ with lib; let 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,7 +38,7 @@ let overlayType = mkOptionType { name = "nixpkgs-overlay"; description = "nixpkgs overlay"; - check = builtins.isFunction; + check = lib.isFunction; merge = lib.mergeOneOption; }; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 405dc3823d5..2ec8b28c3fc 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -84,6 +84,7 @@ ./programs/info.nix ./programs/java.nix ./programs/kbdlight.nix + ./programs/less.nix ./programs/light.nix ./programs/man.nix ./programs/mosh.nix @@ -200,6 +201,7 @@ ./services/desktops/dleyna-server.nix ./services/desktops/geoclue2.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 @@ -220,13 +222,11 @@ ./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 @@ -246,6 +246,7 @@ ./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 @@ -261,6 +262,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 @@ -312,6 +315,7 @@ ./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 @@ -404,6 +408,7 @@ ./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 @@ -421,6 +426,7 @@ ./services/network-filesystems/yandex-disk.nix ./services/network-filesystems/xtreemfs.nix ./services/networking/amuled.nix + ./services/networking/aria2.nix ./services/networking/asterisk.nix ./services/networking/atftpd.nix ./services/networking/avahi-daemon.nix @@ -537,6 +543,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 @@ -631,6 +638,7 @@ ./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/phpfpm/default.nix @@ -679,6 +687,7 @@ ./system/activation/top-level.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 @@ -745,6 +754,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 diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix index 3c7e516c497..f56640f1978 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/clone-config.nix b/nixos/modules/profiles/clone-config.nix index 77d86f8d740..5b4e68beb6a 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/programs/less.nix b/nixos/modules/programs/less.nix new file mode 100644 index 00000000000..c0283c9e686 --- /dev/null +++ b/nixos/modules/programs/less.nix @@ -0,0 +1,118 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.programs.less; + + configFile = '' + #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" configFile; } + "${pkgs.less}/bin/lesskey -o $out $src"; + +in + +{ + options = { + + programs.less = { + + enable = mkEnableOption "less"; + + 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/rootston.nix b/nixos/modules/programs/rootston.nix index a8fe2b22be5..1946b1db657 100644 --- a/nixos/modules/programs/rootston.nix +++ b/nixos/modules/programs/rootston.nix @@ -10,6 +10,7 @@ let if [[ "$#" -ge 1 ]]; then exec ${pkgs.rootston}/bin/rootston "$@" else + ${cfg.extraSessionCommands} exec ${pkgs.rootston}/bin/rootston -C ${cfg.configFile} fi ''; @@ -21,14 +22,28 @@ in { 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; [ - xwayland rxvt_unicode dmenu + westonLite xwayland rofi ]; defaultText = literalExample '' with pkgs; [ - xwayland dmenu rxvt_unicode + westonLite xwayland rofi ] ''; example = literalExample "[ ]"; @@ -55,9 +70,8 @@ in { Logo+q = close Logo+m = maximize Alt+Tab = next_window - Logo+Return = exec urxvt - # Note: Dmenu will only work properly while e.g. urxvt is running. - Logo+d = exec dmenu_run + Logo+Return = exec weston-terminal + Logo+d = exec rofi -show run ''; description = '' Default configuration for rootston (used when called without any @@ -82,7 +96,8 @@ in { hardware.opengl.enable = mkDefault true; fonts.enableDefaultFonts = mkDefault true; + programs.dconf.enable = mkDefault true; }; - meta.maintainers = with lib.maintainers; [ primeos ]; + meta.maintainers = with lib.maintainers; [ primeos gnidorah ]; } diff --git a/nixos/modules/programs/tmux.nix b/nixos/modules/programs/tmux.nix index ed1d88a420a..1eb6fa6bf2f 100644 --- a/nixos/modules/programs/tmux.nix +++ b/nixos/modules/programs/tmux.nix @@ -151,6 +151,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 +172,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/zsh/oh-my-zsh.nix b/nixos/modules/programs/zsh/oh-my-zsh.nix index 9077643c444..b995d390b27 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.nix b/nixos/modules/programs/zsh/zsh.nix index 6fb1346bbb3..5102bfef032 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; }; diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 5e207a9509e..562be13a3f6 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -186,6 +186,9 @@ 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" ]) + # Options that are obsolete and have no replacement. (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "") (mkRemovedOptionModule [ "programs" "bash" "enable" ] "") diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index fb011019f7f..5940f471883 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -139,6 +139,14 @@ in ''; }; + tosHash = mkOption { + type = types.string; + default = "cc88d8d9517f490191401e7b54e9ffd12a2b9082ec7a1d4cec6101f9f1647e7b"; + description = '' + SHA256 of the Terms of Services document. This changes once in a while. + ''; + }; + production = mkOption { type = types.bool; default = true; @@ -188,7 +196,7 @@ in domain = if data.domain != null then data.domain else cert; cpath = "${cfg.directory}/${cert}"; rights = if data.allowKeysForGroup then "750" else "700"; - cmdline = [ "-v" "-d" domain "--default_root" data.webroot "--valid_min" cfg.validMin ] + cmdline = [ "-v" "-d" domain "--default_root" data.webroot "--valid_min" cfg.validMin "--tos_sha256" cfg.tosHash ] ++ 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) diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index bf7f62c5da9..3fff9e78aa1 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -223,6 +223,17 @@ let ''; }; + 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; description = "Contents of the PAM service file."; @@ -273,7 +284,7 @@ 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)) '' 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 +293,8 @@ 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.unixAuth "auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth try_first_pass"} @@ -351,6 +364,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.lxcfs}/lib/security/pam_cgfs.so -c freezer,memory,name=systemd,unified,cpuset"} ''); }; diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index cfd0595e63b..a57f14bb5ae 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 { @@ -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} ''; diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index 1f64213accd..77e4b2a616d 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/services/audio/mopidy.nix b/nixos/modules/services/audio/mopidy.nix index c0a0f037429..52613d450b5 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/znapzend.nix b/nixos/modules/services/backup/znapzend.nix index baf99930e3e..762bb4b3867 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 ${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/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix index dcc5e717460..1b0198ac93f 100644 --- a/nixos/modules/services/continuous-integration/buildkite-agent.nix +++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix @@ -48,6 +48,15 @@ in ''; }; + hooksPath = mkOption { + type = types.path; + default = "${pkgs.buildkite-agent}/share/hooks"; + defaultText = "${pkgs.buildkite-agent}/share/hooks"; + description = '' + Path to the directory storing the hooks. + ''; + }; + meta-data = mkOption { type = types.str; default = ""; @@ -114,8 +123,8 @@ in token="$(cat ${toString cfg.tokenPath})" name="${cfg.name}" meta-data="${cfg.meta-data}" - hooks-path="${pkgs.buildkite-agent}/share/hooks" build-path="${cfg.dataDir}/builds" + hooks-path="${cfg.hooksPath}" bootstrap-script="${pkgs.buildkite-agent}/share/bootstrap.sh" EOF ''; diff --git a/nixos/modules/services/databases/memcached.nix b/nixos/modules/services/databases/memcached.nix index c6875af506d..46bc6fc5c13 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"; + systemd.services.memcached = { + description = "Memcached server"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + 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}"; + 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; - }; + 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 a3bf4f9ba92..36d5340a306 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 @@ -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/redis.nix b/nixos/modules/services/databases/redis.nix index a039ad138f6..e4e38a4364a 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/chrome-gnome-shell.nix b/nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix new file mode 100644 index 00000000000..2740a22c7ca --- /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/games/ghost-one.nix b/nixos/modules/services/games/ghost-one.nix deleted file mode 100644 index 71ff6bb2f3f..00000000000 --- 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/amd-hybrid-graphics.nix b/nixos/modules/services/hardware/amd-hybrid-graphics.nix deleted file mode 100644 index b0f9ff56d1b..00000000000 --- 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/usbmuxd.nix b/nixos/modules/services/hardware/usbmuxd.nix new file mode 100644 index 00000000000..7ebd49fa01c --- /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/mail/clamsmtp.nix b/nixos/modules/services/mail/clamsmtp.nix new file mode 100644 index 00000000000..8f4f39aa728 --- /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 00000000000..894b88e25c1 --- /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/postfix.nix b/nixos/modules/services/mail/postfix.nix index 867c0ea6761..22af7e876af 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 { @@ -507,7 +442,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 +683,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 6d403e448e0..b80aa48f2c8 100644 --- a/nixos/modules/services/mail/rspamd.nix +++ b/nixos/modules/services/mail/rspamd.nix @@ -31,6 +31,8 @@ let ${mkBindSockets cfg.bindUISocket} .include "$CONFDIR/worker-controller.inc" } + + ${cfg.extraConfig} ''; in @@ -79,6 +81,15 @@ in ''; }; + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra configuration to add at the end of the rspamd configuration + file. + ''; + }; + user = mkOption { type = types.string; default = "rspamd"; diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 0c5d51564a0..9ed5875a019 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" ]; @@ -489,7 +492,9 @@ 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"; diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix new file mode 100644 index 00000000000..666fa68b01c --- /dev/null +++ b/nixos/modules/services/misc/home-assistant.nix @@ -0,0 +1,116 @@ +{ 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; + + # Returns whether component is used in config + useComponent = component: hasAttrByPath (splitString "." component) cfg.config; + + # 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"; + wantedBy = [ "multi-user.target" ]; + 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; + }; + }; + + 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/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index 11463cf4500..80979547d33 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -578,6 +578,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; @@ -627,7 +639,11 @@ in { Group = "matrix-synapse"; WorkingDirectory = cfg.dataDir; PermissionsStartOnly = true; - ExecStart = "${cfg.package}/bin/homeserver --config-path ${configFile} --keys-directory ${cfg.dataDir}"; + 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/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index beca820d2d6..a169b0f2c78 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. + # 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.stdenv.shell; 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; inherit binshDeps; } '' + ${optionalString (!isNix20) '' + extraPaths=$(for i in $(cat binshDeps); do if test -d $i; then echo $i; fi; done) + ''} cat > $out < 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/network-filesystems/beegfs.nix b/nixos/modules/services/network-filesystems/beegfs.nix new file mode 100644 index 00000000000..a6a2ec6cbc3 --- /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/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index 09cd9cb22ca..b23266e8d43 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -54,10 +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 ]; @@ -231,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/networking/aria2.nix b/nixos/modules/services/networking/aria2.nix index ad4ac9bf45e..df9c92db2e5 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/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix index ed658258c7f..857657eea4d 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 23cc92946e4..bf13d5c6f5f 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/kresd.nix b/nixos/modules/services/networking/kresd.nix index 18e2ab9aebf..d0c19c4ecb7 100644 --- a/nixos/modules/services/networking/kresd.nix +++ b/nixos/modules/services/networking/kresd.nix @@ -43,7 +43,7 @@ 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) ''; }; # TODO: perhaps options for more common stuff like cache size or forwarding @@ -72,6 +72,7 @@ in (iface: if elem ":" (stringToCharacters iface) then "[${iface}]:53" else "${iface}:53") cfg.interfaces; socketConfig.ListenDatagram = listenStreams; + socketConfig.FreeBind = true; }; systemd.sockets.kresd-control = rec { @@ -82,20 +83,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 +96,15 @@ in User = "kresd"; Type = "notify"; WorkingDirectory = cfg.cacheDir; + Restart = "on-failure"; }; + # 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 ba4e1b1542f..db1534edfd7 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/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix index 81915b5a2ef..273ca797b98 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; diff --git a/nixos/modules/services/networking/nat.nix b/nixos/modules/services/networking/nat.nix index bfaf30c1178..df4246d216d 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 = '' @@ -59,6 +61,8 @@ let --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 @@ -170,6 +174,28 @@ in ''; }; + 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/nsd.nix b/nixos/modules/services/networking/nsd.nix index c8b8ed547eb..4241e6fccea 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 3fbf5a9f022..7a96b673c51 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 { @@ -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/resilio.nix b/nixos/modules/services/networking/resilio.nix index 6d2b7bdbca1..d1c4101f80b 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 ({ diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index aa9c0fa1c09..d9b12d27816 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. ''; }; @@ -137,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 = { @@ -302,7 +310,7 @@ in }; - networking.firewall.allowedTCPPorts = cfg.ports; + networking.firewall.allowedTCPPorts = if cfg.openFirewall then cfg.ports else []; security.pam.services.sshd = { startSession = true; diff --git a/nixos/modules/services/networking/stunnel.nix b/nixos/modules/services/networking/stunnel.nix new file mode 100644 index 00000000000..89a14966eca --- /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/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix index ac589be5773..e3b6b638f5a 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 c51dd5d9465..adef500b7b5 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} @@ -92,8 +93,6 @@ in { node.name: "elasticsearch" node.master: true node.data: false - index.number_of_shards: 5 - index.number_of_replicas: 1 ''; }; @@ -165,7 +164,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 7de2d121e76..4161c61ed37 100644 --- a/nixos/modules/services/security/clamav.nix +++ b/nixos/modules/services/security/clamav.nix @@ -97,8 +97,8 @@ in 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 ]; diff --git a/nixos/modules/services/security/usbguard.nix b/nixos/modules/services/security/usbguard.nix index 1f2c56a9efa..4e685e63335 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:*:* } diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 76b0ee6da96..c784f4756d1 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}"; + services.nginx = { + enable = true; + # NOTE: No configuration is done if not using virtual host + virtualHosts = mkIf (cfg.virtualHost != null) { + "${cfg.virtualHost}" = { + root = "${cfg.root}"; - locations."/" = { - index = "index.php"; - }; + 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; - ''; + 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,7 +498,7 @@ 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}' \ @@ -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/mighttpd2.nix b/nixos/modules/services/web-servers/mighttpd2.nix new file mode 100644 index 00000000000..a888f623616 --- /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 b4a075ce0ae..100fabf902f 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -15,6 +15,9 @@ let } // (optionalAttrs vhostConfig.enableACME { sslCertificate = "/var/lib/acme/${serverName}/fullchain.pem"; sslCertificateKey = "/var/lib/acme/${serverName}/key.pem"; + }) // (optionalAttrs (vhostConfig.useACMEHost != null) { + sslCertificate = "/var/lib/acme/${vhostConfig.useACMEHost}/fullchain.pem"; + sslCertificateKey = "/var/lib/acme/${vhostConfig.useACMEHost}/key.pem"; }) ) cfg.virtualHosts; enableIPv6 = config.networking.enableIPv6; @@ -168,13 +171,13 @@ let listenString = { addr, port, ssl, ... }: "listen ${addr}:${toString port} " + optionalString ssl "ssl " - + optionalString vhost.http2 "http2 " + + 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}; @@ -194,7 +197,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; } @@ -204,7 +207,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; @@ -555,6 +558,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 = { @@ -580,7 +591,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/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix index 29f08cc4f30..bf18108a1a3 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 { diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix index 943415e08c6..0b2e5c0b69d 100644 --- a/nixos/modules/services/web-servers/tomcat.nix +++ b/nixos/modules/services/web-servers/tomcat.nix @@ -29,7 +29,7 @@ in 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. ''; diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix index 6ec56f2b153..814503ab0bc 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 { @@ -52,10 +67,29 @@ in # 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=$! ''; }; diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 685a93d952b..17a2cde3a65 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. ''; }; @@ -142,11 +142,13 @@ in 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 diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 8c8f9a825ea..c0c9d7ea47f 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -3,16 +3,11 @@ with lib; let - - xcfg = config.services.xserver; - pcfg = config.hardware.pulseaudio; - cfg = xcfg.desktopManager.xfce; - + cfg = config.services.xserver.desktopManager.xfce; in { options = { - services.xserver.desktopManager.xfce = { enable = mkOption { type = types.bool; @@ -55,84 +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 - config = mkIf (xcfg.enable && cfg.enable) { + # Supplies some abstract icons such as: + # utilities-terminal, accessories-text-editor + gnome3.defaultIconTheme - services.xserver.desktopManager.session = singleton - { name = "xfce"; - bgSupport = true; - start = - '' - ${cfg.extraSessionCommands} + hicolor_icon_theme + tango-icon-theme + xfce4-icon-theme - # 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" + desktop_file_utils + shared_mime_info - # Set GTK_DATA_PREFIX so that GTK+ can find the Xfce themes. - export GTK_DATA_PREFIX=${config.system.path} + # Needed by Xfce's xinitrc script + # TODO: replace with command -v + which - ${pkgs.stdenv.shell} ${pkgs.xfce.xinitrc} & - waitPID=$! - ''; - }; + 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" ]; + }; + + 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_DATA_PREFIX so that GTK+ can find the Xfce themes. + export GTK_DATA_PREFIX=${config.system.path} + + ${pkgs.stdenv.shell} ${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 - (if pcfg.enable then pkgs.xfce.xfce4mixer_pulse else pkgs.xfce.xfce4mixer) - (if pcfg.enable then pkgs.xfce.xfce4volumed_pulse else 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" ]; - environment.variables.GDK_PIXBUF_MODULE_FILE = [ - "$(echo ${pkgs.librsvg.out}/lib/gdk-pixbuf-*/*/loaders.cache)" - ]; - # Enable helpful DBus services. services.udisks2.enable = true; services.upower.enable = config.powerManagement.enable; - }; - } 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 1d5dcb2c7cb..35b715b98fc 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} ''; @@ -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/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix index 5aecdef812e..d0a87f183b6 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. diff --git a/nixos/modules/services/x11/window-managers/2bwm.nix b/nixos/modules/services/x11/window-managers/2bwm.nix index e3f5ec7dbe6..fdbdf35b0f5 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 eb97449c6bd..71eb02ec595 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/xserver.nix b/nixos/modules/services/x11/xserver.nix index 7acd621f53a..f96d3c5afba 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -548,7 +548,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; diff --git a/nixos/modules/system/boot/grow-partition.nix b/nixos/modules/system/boot/grow-partition.nix new file mode 100644 index 00000000000..c4c6d82dc5c --- /dev/null +++ b/nixos/modules/system/boot/grow-partition.nix @@ -0,0 +1,43 @@ +# 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="$(lsblk -npo PKNAME "$rootDevice")" + TMPDIR=/run sh $(type -P growpart) "$parentDevice" "''${rootDevice#$parentDevice}" + udevadm settle + fi + ''; + + }; + +} diff --git a/nixos/modules/system/boot/initrd-network.nix b/nixos/modules/system/boot/initrd-network.nix index 6e226c19060..4a6e1c7e56e 100644 --- a/nixos/modules/system/boot/initrd-network.nix +++ b/nixos/modules/system/boot/initrd-network.nix @@ -40,6 +40,10 @@ 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. ''; }; diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 4db9631743e..ba9d7285fba 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -197,7 +197,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" @@ -206,12 +206,13 @@ in "xhci_hcd" "xhci_pci" "usbhid" - "hid_generic" "hid_lenovo" "hid_apple" "hid_roccat" + "hid_generic" "hid_lenovo" "hid_apple" "hid_roccat" "hid_logitech_hidpp" - # 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/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 1f424f84c6e..63d07832d10 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -230,9 +230,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 diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index a365a01bfb1..5d72ad0f1bd 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -74,21 +74,17 @@ 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 diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index b7e85e402aa..f4851988d63 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -273,11 +273,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. ''; }; diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 9b4136223c0..41dec2af9ed 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -4,13 +4,10 @@ { config, lib, pkgs, ... }: with lib; +with import ../../lib/qemu-flags.nix { inherit pkgs; }; let kernel = config.boot.kernelPackages.kernel; - # FIXME: figure out a common place for this instead of copy pasting - serialDevice = 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}'"; in { @@ -28,8 +25,8 @@ in systemd.services.backdoor = { wantedBy = [ "multi-user.target" ]; - requires = [ "dev-hvc0.device" "dev-${serialDevice}.device" ]; - after = [ "dev-hvc0.device" "dev-${serialDevice}.device" ]; + requires = [ "dev-hvc0.device" "dev-${qemuSerialDevice}.device" ]; + after = [ "dev-hvc0.device" "dev-${qemuSerialDevice}.device" ]; script = '' export USER=root @@ -46,7 +43,7 @@ in cd /tmp exec < /dev/hvc0 > /dev/hvc0 - while ! exec 2> /dev/${serialDevice}; 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 @@ -55,10 +52,10 @@ in serviceConfig.KillSignal = "SIGHUP"; }; - # Prevent agetty from being instantiated on ${serialDevice}, since it - # interferes with the backdoor (writes to ${serialDevice} 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@${serialDevice}".enable = false; + systemd.services."serial-getty@${qemuSerialDevice}".enable = false; systemd.services."serial-getty@hvc0".enable = false; boot.initrd.preDeviceCommands = @@ -94,7 +91,7 @@ in # Panic if an error occurs in stage 1 (rather than waiting for # user intervention). boot.kernelParams = - [ "console=${serialDevice}" "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 ]; diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index 6cb9e07ae82..f74c42a777f 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"; diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix index b4f9d8b6fc1..5e368acd6d8 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/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix index 44f00d7730b..01512911a05 100644 --- a/nixos/modules/virtualisation/ec2-amis.nix +++ b/nixos/modules/virtualisation/ec2-amis.nix @@ -223,22 +223,22 @@ let self = { "17.03".us-west-2.hvm-ebs = "ami-a93daac9"; "17.03".us-west-2.hvm-s3 = "ami-5139ae31"; - # 17.09.2356.cb751f9b1c3 - "17.09".eu-west-1.hvm-ebs = "ami-d40185ad"; - "17.09".eu-west-2.hvm-ebs = "ami-c5445da1"; - "17.09".eu-west-3.hvm-ebs = "ami-2636815b"; - "17.09".eu-central-1.hvm-ebs = "ami-e758d388"; - "17.09".us-east-1.hvm-ebs = "ami-865327fc"; - "17.09".us-east-2.hvm-ebs = "ami-074d6562"; - "17.09".us-west-1.hvm-ebs = "ami-992c28f9"; - "17.09".us-west-2.hvm-ebs = "ami-2bd87953"; - "17.09".ca-central-1.hvm-ebs = "ami-c4bb01a0"; - "17.09".ap-southeast-1.hvm-ebs = "ami-5ff79723"; - "17.09".ap-southeast-2.hvm-ebs = "ami-57e71135"; - "17.09".ap-northeast-1.hvm-ebs = "ami-5249c434"; - "17.09".ap-northeast-2.hvm-ebs = "ami-f1288e9f"; - "17.09".sa-east-1.hvm-ebs = "ami-5492d438"; - "17.09".ap-south-1.hvm-ebs = "ami-c4fab2ab"; + # 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"; }; in self diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index e3b3e6a5f4a..2fb38059b26 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -6,7 +6,7 @@ let 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"; @@ -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" ]; @@ -211,7 +212,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 2cb932d208f..444c0bc1630 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 00000000000..ecd2a811771 --- /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 64465ae1852..a369b7ddbe1 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -128,6 +128,7 @@ in { dmidecode dnsmasq ebtables + cfg.qemuPackage # libvirtd requires qemu-img to manage disk images ] ++ optional vswitch.enable vswitch.package; diff --git a/nixos/modules/virtualisation/lxcfs.nix b/nixos/modules/virtualisation/lxcfs.nix index 48462dc66da..b2457403463 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/nova-config.nix b/nixos/modules/virtualisation/nova-config.nix index c865cf451e4..c1d2a314daf 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/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 26f7945a4ed..13d0eb7de5c 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -10,21 +10,11 @@ { config, lib, pkgs, ... }: with lib; +with import ../../lib/qemu-flags.nix { inherit pkgs; }; let qemu = config.system.build.qemu or pkgs.qemu_test; - qemuKvm = { - "i686-linux" = "${qemu}/bin/qemu-kvm"; - "x86_64-linux" = "${qemu}/bin/qemu-kvm -cpu kvm64"; - "armv7l-linux" = "${qemu}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host"; - "aarch64-linux" = "${qemu}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host"; - }.${pkgs.stdenv.system}; - - # FIXME: figure out a common place for this instead of copy pasting - serialDevice = 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}'"; vmName = if config.networking.hostName == "" @@ -34,7 +24,7 @@ let cfg = config.virtualisation; qemuGraphics = if cfg.graphics then "" else "-nographic"; - kernelConsole = if cfg.graphics then "" else "console=${serialDevice}"; + kernelConsole = if cfg.graphics then "" else "console=${qemuSerialDevice}"; ttys = [ "tty1" "tty2" "tty3" "tty4" "tty5" "tty6" ]; # Shell script to start the VM. @@ -83,7 +73,7 @@ let '')} # Start QEMU. - exec ${qemuKvm} \ + exec ${qemuBinary qemu} \ -name ${vmName} \ -m ${toString config.virtualisation.memorySize} \ -smp ${toString config.virtualisation.cores} \ diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index d68b3bb7390..a544403e6be 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}"; inherit pkgs lib config; - partitioned = true; + partitionTableType = "legacy"; diskSize = cfg.baseImageSize; postVM = @@ -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/release-combined.nix b/nixos/release-combined.nix index 34a413f1ac3..3564e629825 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -57,7 +57,7 @@ in rec { nixos.ova.x86_64-linux #(all nixos.tests.containers) - nixos.tests.chromium + nixos.tests.chromium.x86_64-linux (all nixos.tests.firefox) (all nixos.tests.firewall) (all nixos.tests.gnome3) @@ -80,7 +80,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 (all nixos.tests.ecryptfs) (all nixos.tests.env) (all nixos.tests.ipv6) diff --git a/nixos/release.nix b/nixos/release.nix index b7ec97bcf82..a396eaac9a3 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -3,6 +3,7 @@ , supportedSystems ? [ "x86_64-linux" "aarch64-linux" ] }: +with import ../pkgs/top-level/release-lib.nix { inherit supportedSystems; }; with import ../lib; let @@ -11,15 +12,15 @@ 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)); + callTestOnTheseSystems = systems: fn: args: forTheseSystems systems (system: hydraJob (importTest fn args system)); + callTest = callTestOnTheseSystems supportedSystems; - callSubTests = fn: args: let + callSubTests = callSubTestsOnTheseSystems supportedSystems; + callSubTestsOnTheseSystems = systems: fn: args: let discover = attrs: let subTests = filterAttrs (const (hasAttr "test")) attrs; in mapAttrs (const (t: hydraJob t.test)) subTests; @@ -28,10 +29,7 @@ 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"; }; @@ -91,13 +89,13 @@ let makeNetboot = config: let - config_evaled = import lib/eval-config.nix config; - build = config_evaled.config.system.build; - kernelTarget = config_evaled.pkgs.stdenv.platform.kernelTarget; + configEvaled = import lib/eval-config.nix config; + build = configEvaled.config.system.build; + kernelTarget = configEvaled.pkgs.stdenv.platform.kernelTarget; in pkgs.symlinkJoin { - name="netboot"; - paths=[ + name = "netboot"; + paths = [ build.netbootRamdisk build.kernel build.netbootIpxeScript @@ -108,6 +106,7 @@ let 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; }; @@ -124,22 +123,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 = makeNetboot { - system = "x86_64-linux"; - modules = [ - ./modules/installer/netboot/netboot-minimal.nix - versionModule - ]; - }; - } // (optionalAttrs (elem "aarch64-linux" supportedSystems) { - aarch64-linux = makeNetboot { - system = "aarch64-linux"; - modules = [ - ./modules/installer/netboot/netboot-minimal.nix - versionModule - ]; - };}); + netboot = forTheseSystems [ "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; @@ -147,7 +137,7 @@ in rec { inherit system; }); - iso_graphical = genAttrs [ "x86_64-linux" ] (system: makeIso { + iso_graphical = forTheseSystems [ "x86_64-linux" ] (system: makeIso { module = ./modules/installer/cd-dvd/installation-cd-graphical-kde.nix; type = "graphical"; inherit system; @@ -155,7 +145,7 @@ 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 = forTheseSystems [ "x86_64-linux" ] (system: makeIso { module = ./modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix; type = "minimal-new-kernel"; inherit system; @@ -163,7 +153,7 @@ in rec { # A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF). - ova = genAttrs [ "x86_64-linux" ] (system: + ova = forTheseSystems [ "x86_64-linux" ] (system: with import nixpkgs { inherit system; }; @@ -232,12 +222,14 @@ 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.cadvisor = callTestOnTheseSystems ["x86_64-linux"] tests/cadvisor.nix {}; + tests.chromium = (callSubTestsOnTheseSystems ["x86_64-linux"] tests/chromium.nix {}).stable; tests.cjdns = callTest tests/cjdns.nix {}; tests.cloud-init = callTest tests/cloud-init.nix {}; tests.containers-ipv4 = callTest tests/containers-ipv4.nix {}; @@ -251,20 +243,20 @@ in rec { tests.containers-hosts = callTest tests/containers-hosts.nix {}; tests.containers-macvlans = callTest tests/containers-macvlans.nix {}; tests.couchdb = callTest tests/couchdb.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.docker = callTestOnTheseSystems ["x86_64-linux"] tests/docker.nix {}; + tests.docker-edge = callTestOnTheseSystems ["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 = callTestOnTheseSystems ["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 = callTestOnTheseSystems ["x86_64-linux"] tests/etcd.nix {}; + tests.ec2-nixops = (callSubTestsOnTheseSystems ["x86_64-linux"] tests/ec2.nix {}).boot-ec2-nixops; + tests.ec2-config = (callSubTestsOnTheseSystems ["x86_64-linux"] tests/ec2.nix {}).boot-ec2-config; + tests.elk = callSubTestsOnTheseSystems ["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 = callTestOnTheseSystems ["x86_64-linux"] tests/fleet.nix {}; #tests.gitlab = callTest tests/gitlab.nix {}; tests.gitolite = callTest tests/gitolite.nix {}; tests.gocd-agent = callTest tests/gocd-agent.nix {}; @@ -275,6 +267,7 @@ 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.i3wm = callTest tests/i3wm.nix {}; tests.initrd-network-ssh = callTest tests/initrd-network-ssh {}; @@ -311,6 +304,7 @@ in rec { 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 @@ -324,7 +318,7 @@ in rec { tests.openssh = callTest tests/openssh.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 = callTestOnTheseSystems ["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 {}; @@ -346,12 +340,13 @@ in rec { 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.switchTest = callTest tests/switch-test.nix {}; tests.taskserver = callTest tests/taskserver.nix {}; tests.tomcat = callTest tests/tomcat.nix {}; tests.udisks2 = callTest tests/udisks2.nix {}; tests.vault = callTest tests/vault.nix {}; - tests.virtualbox = callSubTests tests/virtualbox.nix { system = "x86_64-linux"; }; + tests.virtualbox = callSubTestsOnTheseSystems ["x86_64-linux"] tests/virtualbox.nix {}; tests.wordpress = callTest tests/wordpress.nix {}; tests.xfce = callTest tests/xfce.nix {}; tests.xmonad = callTest tests/xmonad.nix {}; diff --git a/nixos/tests/beegfs.nix b/nixos/tests/beegfs.nix new file mode 100644 index 00000000000..433910feafe --- /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/boot.nix b/nixos/tests/boot.nix index 69ab4755e44..fc52cd09f20 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 diff --git a/nixos/tests/borgbackup.nix b/nixos/tests/borgbackup.nix new file mode 100644 index 00000000000..123b02be725 --- /dev/null +++ b/nixos/tests/borgbackup.nix @@ -0,0 +1,21 @@ +import ./make-test.nix ({ pkgs, ...}: { + name = "borgbackup"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ mic92 ]; + }; + + nodes = { + machine = { config, pkgs, ... }: { + environment.systemPackages = [ pkgs.borgbackup ]; + }; + }; + + testScript = '' + my $borg = "BORG_PASSPHRASE=supersecret borg"; + $machine->succeed("$borg init --encryption=repokey /tmp/backup"); + $machine->succeed("mkdir /tmp/data/ && echo 'data' >/tmp/data/file"); + $machine->succeed("$borg create --stats /tmp/backup::test /tmp/data"); + $machine->succeed("$borg extract /tmp/backup::test"); + $machine->succeed('c=$(cat data/file) && echo "c = $c" >&2 && [[ "$c" == "data" ]]'); + ''; +}) diff --git a/nixos/tests/cloud-init.nix b/nixos/tests/cloud-init.nix index c0add7eff36..2a258e4bff5 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/ec2.nix b/nixos/tests/ec2.nix index 4ec7e56cc6c..f585fa2ec23 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 65ff1cac070..ed656b3628b 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/home-assistant.nix b/nixos/tests/home-assistant.nix new file mode 100644 index 00000000000..5d7e0ec65e7 --- /dev/null +++ b/nixos/tests/home-assistant.nix @@ -0,0 +1,46 @@ +import ./make-test.nix ({ pkgs, ... }: + +let + configDir = "/var/lib/foobar"; + +in { + name = "home-assistant"; + + nodes = { + hass = + { config, pkgs, ... }: + { + services.home-assistant = { + inherit configDir; + enable = true; + config = { + homeassistant = { + name = "Home"; + time_zone = "UTC"; + latitude = "0.0"; + longitude = "0.0"; + elevation = 0; + }; + frontend = { }; + http = { }; + }; + }; + }; + }; + + 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 http://localhost:8123/api/ | grep 'API running'"); + + $hass->fail("cat ${configDir}/home-assistant.log | grep -qF ERROR"); + ''; +}) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 90ac5b933f3..637cbb45709 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 diff --git a/nixos/tests/keymap.nix b/nixos/tests/keymap.nix index c431c1a3417..eec674e227d 100644 --- a/nixos/tests/keymap.nix +++ b/nixos/tests/keymap.nix @@ -46,6 +46,7 @@ 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 ]; diff --git a/nixos/tests/kubernetes/base.nix b/nixos/tests/kubernetes/base.nix index acf2e025081..f3b930b630b 100644 --- a/nixos/tests/kubernetes/base.nix +++ b/nixos/tests/kubernetes/base.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/make-test.nix b/nixos/tests/make-test.nix index f3e26aa7e74..ee4ba310ad5 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/misc.nix b/nixos/tests/misc.nix index 79290861cb0..6de17518214 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -115,11 +115,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/netdata.nix b/nixos/tests/netdata.nix new file mode 100644 index 00000000000..58733c1b337 --- /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 7708775f73f..182328b3296 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -433,6 +433,49 @@ let $client2->succeed("ip addr show dev vlan >&2"); ''; }; + virtual = { + name = "Virtual"; + machine = { + networking.interfaces."tap0" = { + ip4 = [ { address = "192.168.1.1"; prefixLength = 24; } ]; + ip6 = [ { address = "2001:1470:fffd:2096::"; prefixLength = 64; } ]; + virtual = true; + }; + networking.interfaces."tun0" = { + ip4 = [ { address = "192.168.1.2"; prefixLength = 24; } ]; + ip6 = [ { 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" + ); + ''; + }; }; in mapAttrs (const (attrs: makeTest (attrs // { diff --git a/nixos/tests/statsd.nix b/nixos/tests/statsd.nix index d6bbc390163..a9d7dc61cb6 100644 --- a/nixos/tests/statsd.nix +++ b/nixos/tests/statsd.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ pkgs, lib }: +import ./make-test.nix ({ pkgs, lib, ... }: with lib; diff --git a/nixos/tests/sudo.nix b/nixos/tests/sudo.nix new file mode 100644 index 00000000000..35addb0ee80 --- /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/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 21c6b134114..757c6e276fd 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -1,11 +1,11 @@ -{ callPackage, boost155, boost162, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3 }: +{ callPackage, boost155, boost164, 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 = libsForQt5.callPackage ./bitcoin.nix { boost = boost164; miniupnpc = miniupnpc_2; withGui = true; }; + bitcoind = callPackage ./bitcoin.nix { boost = boost164; miniupnpc = miniupnpc_2; withGui = false; }; bitcoin-abc = libsForQt5.callPackage ./bitcoin-abc.nix { withGui = true; }; bitcoind-abc = callPackage ./bitcoin-abc.nix { withGui = false; }; @@ -29,6 +29,8 @@ rec { dogecoin = callPackage ./dogecoin.nix { withGui = true; }; dogecoind = callPackage ./dogecoin.nix { withGui = false; }; + ethsign = callPackage ./ethsign { }; + freicoin = callPackage ./freicoin.nix { boost = boost155; }; go-ethereum = callPackage ./go-ethereum.nix { inherit (darwin) libobjc; diff --git a/pkgs/applications/altcoins/ethsign/default.nix b/pkgs/applications/altcoins/ethsign/default.nix new file mode 100644 index 00000000000..b7d14a43921 --- /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 = http://github.com/dapphub/ethsign; + description = "Make raw signed Ethereum transactions"; + license = [licenses.gpl3]; + }; +} diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix new file mode 100644 index 00000000000..0d2899b2e64 --- /dev/null +++ b/pkgs/applications/altcoins/monero-gui/default.nix @@ -0,0 +1,89 @@ +{ stdenv, fetchFromGitHub +, makeWrapper, makeDesktopItem +, qtbase, qmake, qtmultimedia, qttools +, qtgraphicaleffects, qtdeclarative +, qtlocation, qtquickcontrols, qtwebchannel +, qtwebengine, qtx11extras, qtxmlpatterns +, monero, unbound, readline, boost, libunwind +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "monero-gui-${version}"; + version = "0.11.1.0"; + + src = fetchFromGitHub { + owner = "monero-project"; + repo = "monero-gui"; + rev = "v${version}"; + sha256 = "01d7apwrv8j8bh7plvvhlnll3ransaha3n6rx19nkgvfn319hswq"; + }; + + nativeBuildInputs = [ qmake ]; + + buildInputs = [ + qtbase qtmultimedia qtgraphicaleffects + qtdeclarative qtlocation qtquickcontrols + qtwebchannel qtwebengine qtx11extras + qtxmlpatterns monero unbound readline + boost libunwind 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 00000000000..928fb32911f --- /dev/null +++ b/pkgs/applications/altcoins/monero-gui/move-log-file.patch @@ -0,0 +1,42 @@ +diff --git a/main.cpp b/main.cpp +index 1a9a979..2316929 100644 +--- a/main.cpp ++++ b/main.cpp +@@ -74,10 +74,6 @@ 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"; +@@ -86,6 +82,13 @@ int main(int argc, char *argv[]) + app.setOrganizationDomain("getmonero.org"); + app.setOrganizationName("monero-project"); + ++ // Log settings ++ QString logfile = ++ QStandardPaths::writableLocation(QStandardPaths::CacheLocation) ++ + "/monero-wallet-gui.log"; ++ Monero::Wallet::init(argv[0], logfile.toUtf8().constData()); ++ ++ + filter *eventFilter = new filter; + app.installEventFilter(eventFilter); + +diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp +index 8525bf3..6967b24 100644 +--- a/src/libwalletqt/Wallet.cpp ++++ b/src/libwalletqt/Wallet.cpp +@@ -613,7 +613,7 @@ QString Wallet::getDaemonLogPath() const + + QString Wallet::getWalletLogPath() const + { +- return QCoreApplication::applicationDirPath() + "/monero-wallet-gui.log"; ++ return QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/monero-wallet-gui.log"; + } + + Wallet::Wallet(Monero::Wallet *w, QObject *parent) 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 00000000000..29bb5630154 --- /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/build-wallet-rpc.patch b/pkgs/applications/altcoins/monero/build-wallet-rpc.patch new file mode 100644 index 00000000000..5436332db80 --- /dev/null +++ b/pkgs/applications/altcoins/monero/build-wallet-rpc.patch @@ -0,0 +1,78 @@ +diff --git a/src/wallet/CMakeLists.txt b/src/wallet/CMakeLists.txt +index 63908005..f6656d5c 100644 +--- a/src/wallet/CMakeLists.txt ++++ b/src/wallet/CMakeLists.txt +@@ -86,43 +86,40 @@ target_link_libraries(wallet + ${EXTRA_LIBRARIES}) + add_dependencies(wallet version) + +-if (NOT BUILD_GUI_DEPS) +- set(wallet_rpc_sources +- wallet_rpc_server.cpp) ++set(wallet_rpc_sources ++ wallet_rpc_server.cpp) + +- set(wallet_rpc_headers) ++set(wallet_rpc_headers) + +- set(wallet_rpc_private_headers +- wallet_rpc_server.h) ++set(wallet_rpc_private_headers ++ wallet_rpc_server.h) + +- monero_private_headers(wallet_rpc_server +- ${wallet_rpc_private_headers}) +- monero_add_executable(wallet_rpc_server +- ${wallet_rpc_sources} +- ${wallet_rpc_headers} +- ${wallet_rpc_private_headers}) +- +- target_link_libraries(wallet_rpc_server +- PRIVATE +- wallet +- epee +- rpc +- cryptonote_core +- cncrypto +- common +- ${Boost_CHRONO_LIBRARY} +- ${Boost_PROGRAM_OPTIONS_LIBRARY} +- ${Boost_FILESYSTEM_LIBRARY} +- ${Boost_THREAD_LIBRARY} +- ${CMAKE_THREAD_LIBS_INIT} +- ${EXTRA_LIBRARIES}) +- add_dependencies(wallet_rpc_server version) +- set_property(TARGET wallet_rpc_server +- PROPERTY +- OUTPUT_NAME "monero-wallet-rpc") +- install(TARGETS wallet_rpc_server DESTINATION bin) +-endif() ++monero_private_headers(wallet_rpc_server ++ ${wallet_rpc_private_headers}) ++monero_add_executable(wallet_rpc_server ++ ${wallet_rpc_sources} ++ ${wallet_rpc_headers} ++ ${wallet_rpc_private_headers}) + ++target_link_libraries(wallet_rpc_server ++ PRIVATE ++ wallet ++ epee ++ rpc ++ cryptonote_core ++ cncrypto ++ common ++ ${Boost_CHRONO_LIBRARY} ++ ${Boost_PROGRAM_OPTIONS_LIBRARY} ++ ${Boost_FILESYSTEM_LIBRARY} ++ ${Boost_THREAD_LIBRARY} ++ ${CMAKE_THREAD_LIBS_INIT} ++ ${EXTRA_LIBRARIES}) ++add_dependencies(wallet_rpc_server version) ++set_property(TARGET wallet_rpc_server ++ PROPERTY ++ OUTPUT_NAME "monero-wallet-rpc") ++install(TARGETS wallet_rpc_server DESTINATION bin) + + # build and install libwallet_merged only if we building for GUI + if (BUILD_GUI_DEPS) diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix new file mode 100644 index 00000000000..4b1e9cd4ea3 --- /dev/null +++ b/pkgs/applications/altcoins/monero/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchpatch, fetchFromGitHub, cmake +, boost, miniupnpc, openssl, pkgconfig, unbound +}: + +stdenv.mkDerivation rec { + name = "monero-${version}"; + version = "0.11.1.0"; + + src = fetchFromGitHub { + owner = "monero-project"; + repo = "monero"; + rev = "v${version}"; + sha256 = "0nrpxx6r63ia6ard85d504x2kgaikvrhb5sg93ml70l6djyy1148"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ boost miniupnpc openssl unbound ]; + + patches = [ + ./build-wallet-rpc.patch # fixed in next release + ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DBUILD_GUI_DEPS=ON" + ]; + + doCheck = false; + + installPhase = '' + make install + install -Dt "$out/bin/" \ + bin/monero-blockchain-export \ + bin/monero-blockchain-import \ + bin/monero-wallet-rpc + ''; + + meta = with stdenv.lib; { + description = "Private, secure, untraceable currency"; + homepage = https://getmonero.org/; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = [ maintainers.ehmry ]; + }; +} diff --git a/pkgs/applications/altcoins/seth.nix b/pkgs/applications/altcoins/seth.nix index b2f5cfdea06..40fbf2ceb6a 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.2"; src = fetchFromGitHub { owner = "dapphub"; repo = "seth"; rev = "v${version}"; - sha256 = "1zl70xy7njjwy4k4g84v7lpf9a2nnnbxh4mkpw7jzqfs2mr636z6"; + sha256 = "1lbr7i3rznfp3h03y7pc094r0m992lbzr926rnr0xxbyp755wvm4"; }; 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/zcash/default.nix b/pkgs/applications/altcoins/zcash/default.nix index e9236544ee7..6a8fba3c2bb 100644 --- a/pkgs/applications/altcoins/zcash/default.nix +++ b/pkgs/applications/altcoins/zcash/default.nix @@ -2,20 +2,19 @@ , 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"; }; # Dependencies are underspecified: "make -C src gtest/zcash_gtest-test_merkletree.o" @@ -23,17 +22,15 @@ stdenv.mkDerivation rec { 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 ''; 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 303b3bc171e..00000000000 --- 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 be885493dcd..00000000000 --- 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 a66ff128293..00000000000 --- 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 88d432fd163..00000000000 --- 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/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix index 4f010213b65..c37963c77f3 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,8 +13,6 @@ let sha256 = "1ban59skw422mak3cp57lj27hgq5d3a4f6y79ysjnamf8rpz9x4s"; }; - stdenv_multi = overrideCC stdenv gcc_multi; - vst-sdk = stdenv.mkDerivation rec { name = "vstsdk368_08_11_2017_build_121"; src = requireFile { @@ -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 diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix deleted file mode 100644 index 022e33991f9..00000000000 --- 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 a96aa3ed65d..a4ac2943bfb 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/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 8242d035e5b..e5e8640b4fd 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -8,16 +8,16 @@ 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 = [ diff --git a/pkgs/applications/audio/audacious/qt-5.nix b/pkgs/applications/audio/audacious/qt-5.nix index 803b0115fbd..353865e8ec0 100644 --- a/pkgs/applications/audio/audacious/qt-5.nix +++ b/pkgs/applications/audio/audacious/qt-5.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, fetchurl, + mkDerivation, lib, fetchurl, fetchpatch, gettext, pkgconfig, qtbase, alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk_pixbuf, lame, libbs2b, @@ -10,18 +10,23 @@ }: 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,6 +38,8 @@ mkDerivation { nativeBuildInputs = [ gettext pkgconfig ]; + inherit qt510_plugins_patch; + buildInputs = [ # Core dependencies qtbase @@ -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 diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 4dbde82e092..100bb1c54fd 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.1"; name = "audacity-${version}"; src = fetchurl { url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"; - sha256 = "09xpr4bjnainz1xmc35v3qg3dadjr9wv8bmn1p4y91aqyihnhjry"; + sha256 = "1n05r8b4rnf9fas0py0is8cm97s3h65dgvqkk040aym5d1x6wd7z"; }; preConfigure = /* we prefer system-wide libs */ '' diff --git a/pkgs/applications/audio/bitwig-studio/default.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix similarity index 77% rename from pkgs/applications/audio/bitwig-studio/default.nix rename to pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix index bc87254cf18..8b26ba0959d 100644 --- a/pkgs/applications/audio/bitwig-studio/default.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix @@ -1,35 +1,35 @@ -{ 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 +{ 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 = "2.2.2"; + version = "1.3.16"; src = fetchurl { - url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; - sha256 = "1x4wka32xlygmhdh9rb15s37zh5qjrgap2qk35y34c52lf5aak22"; + 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; + dontBuild = true; dontPatchELF = true; - dontStrip = 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 + 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 [ - ffmpeg xdg_utils zenity + xdg_utils zenity ]; installPhase = '' @@ -95,6 +95,6 @@ stdenv.mkDerivation rec { homepage = http://www.bitwig.com/; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ michalrus ]; + 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 00000000000..e5a5cc7c9c6 --- /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.2.2"; + + src = fetchurl { + url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; + sha256 = "1x4wka32xlygmhdh9rb15s37zh5qjrgap2qk35y34c52lf5aak22"; + }; + + buildInputs = bitwig-studio1.buildInputs ++ [ ffmpeg ]; + + binPath = stdenv.lib.makeBinPath [ + ffmpeg xdg_utils zenity + ]; +}) diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 35fe510cbb2..35214502e09 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/cava/default.nix b/pkgs/applications/audio/cava/default.nix index 57107924b61..1420627c02a 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/denemo/default.nix b/pkgs/applications/audio/denemo/default.nix new file mode 100644 index 00000000000..be941bc3db2 --- /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 125df237dfe..d16534b03d3 100644 --- a/pkgs/applications/audio/dfasma/default.nix +++ b/pkgs/applications/audio/dfasma/default.nix @@ -62,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 740d6d8d7e0..6d56f53bd16 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 a6a7ad22fa1..5c9211e7f3b 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-10-10"; + name = "distrho-ports-unstable-2018-01-01"; - src = fetchgit { - url = "https://github.com/DISTRHO/DISTRHO-Ports.git"; - rev = "e11e2b204c14b8e370a0bf5beafa5f162fedb8e9"; - sha256 = "1nd542iian9kr2ldaf7fkkgf900ryzqigks999d1jhms6p0amvfv"; + src = fetchFromGitHub { + owner = "DISTRHO"; + repo = "DISTRHO-Ports"; + rev = "b200e7409aa9f6612c4d948932f6ce6f0a087f5a"; + sha256 = "0672r0a9s6skzkxpjdraziwh5k8ivrfzvi4zcpkcg3zrv2hia2vz"; }; patchPhase = '' diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 901df19ebf5..460c9da7ac3 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.10"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = "v${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "1pmiwy287g79ipz9pppnkfrdgls3l912kpkr7dfymk9wk5y5di9m"; + sha256 = "0sjhy7axa2dj1977iz6zmqvz9qzalcfnrx2fqx3xmk9hly847d6z"; + fetchSubmodules = true; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/faust/faust2jack.nix b/pkgs/applications/audio/faust/faust2jack.nix index 3867114562d..7762ca39369 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 c0911b31538..5a015e5ca31 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 425b2b866a5..99aedae1912 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/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index 66f82226b50..ba3f31d0501 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -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/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 3d074bf1e19..bdb32ab01e2 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -1,65 +1,63 @@ -{ 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.0"; - 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 = "0f3m1kcj641xiwsxan66k81lvslkl3aziakn5z17y4mmdci79jv0"; }; - 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" - ]}'" ''; - buildInputs = [ - intltool python2Packages.coverage python2Packages.minimock - gnome3.gnome_themes_standard gnome3.defaultIconTheme - gnome3.gsettings_desktop_schemas + nativeBuildInputs = [ + intltool + wrapGAppsHook + glibcLocales ]; - propagatedBuildInputs = with python2Packages; [ - feedparser dbus-python mygpoclient pygtk eyeD3 podcastparser html5lib + buildInputs = [ python3 gobjectIntrospection ]; + + 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 2f4bde92167..8c2987352fb 100644 --- a/pkgs/applications/audio/gradio/default.nix +++ b/pkgs/applications/audio/gradio/default.nix @@ -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 = [ diff --git a/pkgs/applications/audio/id3v2/default.nix b/pkgs/applications/audio/id3v2/default.nix index 6653526c6e2..d2720fcace6 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/jack-capture/default.nix b/pkgs/applications/audio/jack-capture/default.nix index f1e00e87673..e4d20db7868 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/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix index 060b7f703a3..e44dfddd37b 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 6a013e8c604..344e6894baf 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 f011e909052..55039e8508b 100644 --- a/pkgs/applications/audio/keyfinder/default.nix +++ b/pkgs/applications/audio/keyfinder/default.nix @@ -37,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/magnetophonDSP/CharacterCompressor/default.nix b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix index 206754a5195..f355c540f30 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 467e11daaf6..90e4eabeef0 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 b452d91426e..73dd7b48e9c 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 d1959ec3ceb..39065db6ede 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 6216ba55593..362451988d3 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 0bb2034fc46..3f809aa7847 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 e526e40a1e3..fece392ab1c 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 daa23baa966..6237628e600 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 422aabb2829..cb9247fd3d0 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/minimodem/default.nix b/pkgs/applications/audio/minimodem/default.nix index 2e293ee4552..8d179e8eed1 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 6d353344b07..f511fa65914 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/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix index d1c6ed6379a..55f3a667e06 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-iris/default.nix b/pkgs/applications/audio/mopidy-iris/default.nix index c486ff3de60..1f309c4503b 100644 --- a/pkgs/applications/audio/mopidy-iris/default.nix +++ b/pkgs/applications/audio/mopidy-iris/default.nix @@ -2,12 +2,12 @@ pythonPackages.buildPythonApplication rec { name = "mopidy-iris-${version}"; - version = "3.8.2"; + version = "3.11.0"; src = pythonPackages.fetchPypi { inherit version; pname = "Mopidy-Iris"; - sha256 = "051bzs8p2zz960mi9cmv51q1fmmm15nnb9apph9icicr0p8g7lif"; + sha256 = "1a9pn35vv1b9v0s30ajjg7gjjvcfjwgfyp7z61m567nv6cr37vhq"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/mopidy-local-images/default.nix b/pkgs/applications/audio/mopidy-local-images/default.nix index b09db88bbcb..063821544ae 100644 --- a/pkgs/applications/audio/mopidy-local-images/default.nix +++ b/pkgs/applications/audio/mopidy-local-images/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages, mopidy }: +{ stdenv, fetchFromGitHub, pythonPackages, mopidy, gobjectIntrospection }: pythonPackages.buildPythonApplication rec { name = "mopidy-local-images-${version}"; @@ -12,6 +12,12 @@ pythonPackages.buildPythonApplication rec { sha256 = "0gdqxws0jish50mmi57mlqcs659wrllzv00czl18niz94vzvyc0d"; }; + buildInputs = [ gobjectIntrospection ]; + + checkInputs = [ + pythonPackages.mock + ]; + propagatedBuildInputs = [ mopidy pythonPackages.pykka diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 7de8f6941c2..8541ec6e272 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -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/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index 73352b65092..220e72b568a 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 1e0b46826cf..1b30399ae0a 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.8"; src = fetchurl { url = "mirror://sourceforge/mpg123/${name}.tar.bz2"; - sha256 = "1ws40fglyyk51jvmz8gfapjkw1g51pkch1rffdsbh4b1yay5xc9i"; + sha256 = "16s9z1xc5kv1p90g42vsr9m4gq3dwjsmrj873x4i8601mvpm3nkr"; }; buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib; diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 9d6f2fc9c8f..f56ca009f1e 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 09c718c63e9..93e909fc604 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ncmpc-${version}"; - version = "0.28"; + version = "0.29"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "ncmpc"; rev = "v${version}"; - sha256 = "1z0bdkqsdb3f5k2lsws3qzav4r30fzk8fhxj9l0p738flcka6k4n"; + sha256 = "1b2kbx2phbf4s2qpy7mx72c87xranljr0yam6z9m1i1kvcnp8q1q"; }; buildInputs = [ glib ncurses mpd_clientlib ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { 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 4452ab23cd5..10c3bb2a195 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -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/opusfile/default.nix b/pkgs/applications/audio/opusfile/default.nix index 8a7ab8889a6..d864d5972bc 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/pd-plugins/cyclone/default.nix b/pkgs/applications/audio/pd-plugins/cyclone/default.nix index e4ec281cacb..ae43bad5b2c 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/maxlib/default.nix b/pkgs/applications/audio/pd-plugins/maxlib/default.nix index 3b836d9eb33..0eb75d77c68 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 f8a25256bb0..f2e54b327fc 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/pmidi/default.nix b/pkgs/applications/audio/pmidi/default.nix new file mode 100644 index 00000000000..9f51d300825 --- /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/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index c5a977d741a..925078fb3a1 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 132e4a0fca2..831a30bc4fe 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/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 4bc9371dd17..e075d68cd28 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 @@ -15,6 +15,7 @@ , 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.0"; src = fetchFromGitHub { owner = "ebruck"; repo = "radiotray-ng"; rev = "v${version}"; - sha256 = "1m853gzh9r249crn0xyrq22x154r005j58b0kq3nsrgi5cps2zdv"; + sha256 = "12mhi0q137cjdpmpczvrcr7szq1ja1r8bm0gh03b925y8xyrqp5z"; }; nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook makeWrapper ]; @@ -56,6 +57,7 @@ stdenv.mkDerivation rec { glibmm hicolor_icon_theme gnome3.gsettings_desktop_schemas libappindicator-gtk3 libnotify libxdg_basedir lsb-release + wxGTK ] ++ stdenv.lib.optional doCheck gmock ++ gstInputs ++ pythonInputs; @@ -65,15 +67,13 @@ stdenv.mkDerivation rec { --replace /usr $out substituteInPlace include/radiotray-ng/common.hpp \ --replace /usr $out - ''; - patches = [ - (fetchpatch { - # Fix menu separators and minor touchup to 'version' - url = "https://github.com/ebruck/radiotray-ng/commit/827e9f1baaa03ab4d8a5fb3aab043e72950eb965.patch"; - sha256 = "1aykl6lq4pga34xg5r9mc616gxnd63q6gr8qzg57w6874cj3csrr"; - }) - ]; + # 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 + ''; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/applications/audio/seq24/default.nix index ebeef301e10..11ee00adc88 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 0eaa9bde14f..63705d40c3f 100644 --- a/pkgs/applications/audio/setbfree/default.nix +++ b/pkgs/applications/audio/setbfree/default.nix @@ -4,11 +4,11 @@ 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 = '' diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix index 9aa24738c37..d234f6b6b8c 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 379a3ebbd4a..27d82942d34 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -6,11 +6,11 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "1.5.5"; + version = "1.5.6"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "0h71x9742bswifwll7bma1fz648fd5xd0yfp7byvsczy6zhjz5pf"; + sha256 = "0bjfhfslpa2hjrc9h38m7dlr62953w9n4cvkgvfy495cbym12dak"; }; buildInputs = [ diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix index 89ccb08b169..13740dd9dfd 100644 --- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://launchpad.net/lightdm-gtk-greeter; + homepage = https://launchpad.net/lightdm-gtk-greeter; platforms = platforms.linux; license = licenses.gpl3; maintainers = with maintainers; [ ocharles wkennington ]; diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 360d373f070..2c2227dd4ee 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -34,7 +34,7 @@ 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 +48,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 @@ -68,7 +69,6 @@ let # Runtime stuff git - ]}" \ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 70078e7c60a..4cd0553e4d2 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -27,9 +27,9 @@ in rec { preview = mkStudio { pname = "android-studio-preview"; - version = "3.1.0.5"; # "Android Studio 3.1 Canary 6" - build = "173.4506631"; - sha256Hash = "10yw27rxv6pfvyl9w18ch63lm85ykj7ssrv87pchvwkmsscaw2zn"; + version = "3.1.0.9"; # "Android Studio 3.1 Beta 1" + build = "173.4567466"; + sha256Hash = "01c6a46pk5zbhwk2w038nm68fkx86nafiw1v2i5rdr93mxvx9cag"; meta = stable.meta // { description = "The Official IDE for Android (preview version)"; diff --git a/pkgs/applications/editors/atom/beta.nix b/pkgs/applications/editors/atom/beta.nix index 61392b734dd..0734da173e5 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.24.0-beta1"; + version = "1.24.0-beta3"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "04cyxmk2h8qg9rzs8rm28xsahkkq9d8j14afmp5yx4p26qycdbg5"; + sha256 = "02nnjjwlkxafi2fbi4gz276nqkmi92kf3q414vw1k3kc8q5zvxrs"; name = "${name}.deb"; }; diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index a8e4adeac93..39b4b2e045e 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.23.1"; + version = "1.23.3"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "14cwg48cxrhkcj8ahfznqr1ym316437xds7aw5011dqbmswb0v4f"; + sha256 = "0vq0pics8ajjqwqlk396dxl10k80059f9bik0j4wj2cals42bifc"; name = "${name}.deb"; }; diff --git a/pkgs/applications/editors/deadpixi-sam/default.nix b/pkgs/applications/editors/deadpixi-sam/default.nix index d1ed4826c68..4ab11064eae 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/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 611b995c08d..4f82696efd5 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,52 @@ 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 ]; + }; + }; + anyedittools = buildEclipsePlugin rec { name = "anyedit-${version}"; version = "2.7.1.201709201439"; @@ -127,16 +185,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 +250,12 @@ rec { checkstyle = buildEclipseUpdateSite rec { name = "checkstyle-${version}"; - version = "8.5.1.201712211522"; + version = "8.7.0.201801131309"; src = fetchzip { stripRoot = false; - url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/8.5.1/net.sf.eclipsecs-updatesite_${version}.zip"; - sha256 = "0nid4a4qib9vx34ddry7sylj20p2d47dd0vn4zqqmj5dgqx1a1ab"; + 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 +291,7 @@ rec { }; }; - cup = buildEclipsePluginBase rec { + cup = buildEclipsePlugin rec { name = "cup-${version}"; version = "1.1.0.201604221613"; version_ = "1.0.0.201604221613"; @@ -243,31 +301,20 @@ rec { sha256 = "13nnsf0cqg02z3af6xg45rhcgiffsibxbx6h1zahjv7igvqgkyna"; }; - srcPlugin1 = fetchurl { - url = "http://www2.in.tum.de/projects/cup/eclipse/plugins/CupReferencedLibraries_${version_}.jar"; - sha256 = "0kif8kivrysprva1pxzajm88gi967qf7idhb6ga2xpvsdcris91j"; - }; + srcPlugins = [ + (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"; - }; - - 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,6 +407,44 @@ rec { }; }; + jsonedit = buildEclipsePlugin rec { + name = "jsonedit-${version}"; + version = "1.0.1"; + + srcFeature = fetchurl { + url = "https://boothen.github.io/Json-Eclipse-Plugin/features/jsonedit-feature_${version}.jar"; + sha256 = "19221409wzcsrlm2fqf6mrxzb5ip1x6y5ba8anw788p7aaz1w30k"; + }; + + 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 = "05ipjbh9yz97zhqaqq6cja3zz44n0dn40ms13qnlgf4bxyaf0f6w"; } + { n = "editor"; h = "1i71rh2fd5hsx6gygnafz2gjz4hlb0ckazxn0maxmnlx4p5apjql"; } + { n = "folding"; h = "13p8vqdna23ln82w1jgchm59375f1ky0p2b1v7jih55yfhw1ymam"; } + { n = "model"; h = "0llswhsd58f0rjb9canjncavq4z7q8zidn26yl5gradbbz580p6w"; } + { n = "outline"; h = "1rs8g0iv2kklbl7j0p6nr26m6ii89yyr9bpi05mh21xva40pzkl5"; } + { n = "preferences"; h = "0vs074ahhiba7if43ryf9m8xd81sqj9grppy0pzcnkkdkbk870n0"; } + { n = "text"; h = "0nqpzjw8hhvh9jlpldpmcmg83a170wjdabgsvjq207j12jkvfiqq"; } + ]; + + propagatedBuildInputs = [ antlr-runtime_4_5 ]; + + 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.2"; @@ -424,16 +509,16 @@ rec { spotbugs = buildEclipsePlugin rec { name = "spotbugs-${version}"; - version = "3.1.0.r201710241414-11c9895"; + version = "3.1.1.r201712011030-903b7a0"; srcFeature = fetchurl { url = "https://spotbugs.github.io/eclipse/features/com.github.spotbugs.plugin.eclipse_${version}.jar"; - sha256 = "084dj2bid5issh28j32hi5w9vx5xs829h7d5lbz5hqj1fyn9h6bs"; + sha256 = "12z5dbs10h5k567wbmwz1w4pnidmqsls52qcfdb3zlgr0rqvz072"; }; srcPlugin = fetchurl { url = "https://spotbugs.github.io/eclipse/plugins/com.github.spotbugs.plugin.eclipse_${version}.jar"; - sha256 = "1mqpl3gx06f54w13jm01qd8fbniab3x989mi3lysx078vrp23jas"; + sha256 = "0dnkp2alymvyyql7g8w79i27b3c64inhdvpxx1v014ng9liv54xb"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index 6c2f1ea2003..832dc3c0e79 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"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ lzip ]; - doCheck = hostPlatform == buildPlatform; + doCheck = true; # not cross; meta = { description = "An implementation of the standard Unix editor"; @@ -36,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/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 914db993b7c..9d37287d84a 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -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 = { @@ -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"; @@ -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 = { @@ -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.4.0.8"; + version = "1.5.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/el-search-1.4.0.8.tar"; - sha256 = "1gk42n04f1h2vc8sp86gvi795qgnvnh4cyyqfvy6sz1pfix76kfl"; + url = "https://elpa.gnu.org/packages/el-search-1.5.3.tar"; + sha256 = "095gpanpf88j65cbf4r6c787qxi07kqpvdsh0dsdpg9m3ivmxbra"; }; - packageRequires = [ emacs stream ]; + packageRequires = [ cl-print emacs stream ]; meta = { homepage = "https://elpa.gnu.org/packages/el-search.html"; license = lib.licenses.free; @@ -918,10 +931,10 @@ gited = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "gited"; - version = "0.3.3"; + version = "0.3.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gited-0.3.3.tar"; - sha256 = "0h3ps26sy4wp1s9vpsj066fpqjqacjlprz3kb09macgsg88k2c1p"; + url = "https://elpa.gnu.org/packages/gited-0.3.4.tar"; + sha256 = "0s03p0z5dqhigl01hzin2qy53nm7b4ilvfm83d0ca683i9rb7hx1"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1373,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 = { @@ -1582,19 +1595,6 @@ license = lib.licenses.free; }; }) {}; - org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { - pname = "org"; - version = "20171218"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/org-20171218.tar"; - sha256 = "0x3i9wdcl1nqdfhfinrs8bnhpjivm7s0akz90rwkh96d08kx0kpa"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/org.html"; - license = lib.licenses.free; - }; - }) {}; osc = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "osc"; version = "0.1"; @@ -1637,10 +1637,10 @@ }) {}; paced = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "paced"; - version = "1.0"; + version = "1.0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/paced-1.0.tar"; - sha256 = "0ld7cnlk6pn41hx2yfga5w7vfgg4ql6k25ffnf400nsn7y6wcapd"; + url = "https://elpa.gnu.org/packages/paced-1.0.1.tar"; + sha256 = "1y2sl3iqz2vjgkbc859sm3h9jhnrgla9ynazy9d5rql0nsb6sn8p"; }; packageRequires = [ async emacs ]; meta = { @@ -1754,6 +1754,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"; @@ -2241,10 +2254,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 = { @@ -2320,10 +2333,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 = { diff --git a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix index 634c654d58f..8e1d7092e6a 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 7b7004b72f3..733393307d3 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/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index aedcbe4d061..468b40f1181 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -761,8 +761,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "0bea9c7d800864b55d807c755254d03c796b1594"; - sha256 = "0d1gc7w1jgf8wigikwr7x5w3524acqim2ivk0xkp81isp7dc4ll6"; + rev = "1ad972b0394f0ecbfebae8041af96a1fe2e24cf0"; + sha256 = "07hljgfl1d6dg50dflr467fdif39xxp0jap46x85gilrlw458hp6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -778,12 +778,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "20171209.2145"; + version = "20180126.2015"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "0bea9c7d800864b55d807c755254d03c796b1594"; - sha256 = "0d1gc7w1jgf8wigikwr7x5w3524acqim2ivk0xkp81isp7dc4ll6"; + rev = "1ad972b0394f0ecbfebae8041af96a1fe2e24cf0"; + sha256 = "07hljgfl1d6dg50dflr467fdif39xxp0jap46x85gilrlw458hp6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -824,8 +824,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "c44d3b922de999080e5f815cf4746d2a286d551e"; - sha256 = "0zgrwpcc14w9qhasrfryh5qqw4kdr36x8i9wqcx5mjbylh7p08z5"; + rev = "53e74892e8bd15baa4d1bd1d640dcabcba9667ee"; + sha256 = "0ynhx1cyxvrmkadb8h81xrhxvf9wssq74xk236dhl7q1mqagnjaf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; @@ -1030,12 +1030,12 @@ ace-link = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-link"; - version = "20171109.1250"; + version = "20180101.1328"; src = fetchFromGitHub { owner = "abo-abo"; repo = "ace-link"; - rev = "3bc7a61a9d7923bb71066906e17cb8a0db415c24"; - sha256 = "0dalspw44ra9ik7f1lflmck76ar0v6qig700qczlml52lr9vf045"; + rev = "43d224546a2a557857294a8e3d13c4fe63508e03"; + sha256 = "0cw4br2nx4fa9jsal6b9gavffqjrhq2xgf87szi61dkgi2gacf7y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68032f40c0ce4170a22db535be4bfa7099f61f85/recipes/ace-link"; @@ -1093,12 +1093,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 = "7b8ad628a058d32c420f7615927a34a5d51a7ad3"; + sha256 = "183gc5lidxahfzik9ima2vph2sdi2rd9805kfnghsmwhck275i2r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/53742e2242101c4b3b3901f5c74e24facf62c7d6/recipes/ace-popup-menu"; @@ -1114,12 +1114,12 @@ ace-window = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-window"; - version = "20171211.921"; + version = "20180123.1111"; src = fetchFromGitHub { owner = "abo-abo"; repo = "ace-window"; - rev = "6c52b0bbcfa2a6f62236050bacd9d915f99732b7"; - sha256 = "0j84gv4f4z1l11dyd6ckwgr2bmghxmlqfpr48q8ccwy270x1qxdi"; + rev = "208ea2a4e809f0c91caf3354b44a8f4a4f1cbb73"; + sha256 = "1bkck2gbbgxhh1swzkdsyk5vp9h08dv8skc5hr4ncgxy2fq8m27g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe131d3c2ea498e4df30ba539a6b91c00f5b07/recipes/ace-window"; @@ -1197,12 +1197,12 @@ adafruit-wisdom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "adafruit-wisdom"; - version = "20171115.1228"; + version = "20180107.1521"; src = fetchFromGitHub { owner = "gonewest818"; repo = "adafruit-wisdom.el"; - rev = "e71b6b4794646ba2d6f1cb118ea447373f9a9cdd"; - sha256 = "0xk41y5rhw2csvqqhif34k8f5v52sq284qpym0klhszci1qimca3"; + rev = "f637f1b7cb397d4b993a20e94687663f6f09c615"; + sha256 = "0b5k8526p0c3xp2x5xbb5w0qgljasa1lywbbj5jqgnn64i7l5y2h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/18483af52c26f719fbfde626db84a67750bf4754/recipes/adafruit-wisdom"; @@ -1344,12 +1344,12 @@ ag = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ag"; - version = "20171209.450"; + version = "20180102.1441"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ag.el"; - rev = "8e547fcda57184963bcfdbfb48ca6d0d478ea213"; - sha256 = "14igyqd5blqax4f5ggdqwkyag309x5rk5ja9ma13zi9pr1ajsdxv"; + rev = "d00aa65ec2da6944f1ed81da440ad7a9024cfbf0"; + sha256 = "1cjchz7dq42ha6wrn21jqbmf333rg73bz4ppsnd9kz6vqnkgnya0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/67f410ac3a58a038e194bcf174bc0a8ceceafb9a/recipes/ag"; @@ -1406,11 +1406,11 @@ }) {}; ahg = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ahg"; - version = "20171123.201"; + version = "20180125.944"; src = fetchhg { url = "https://bitbucket.com/agriggio/ahg"; - rev = "fbe148d4ab94"; - sha256 = "1is92jw37wadzmkbm3qqz3sxfs5lkvvz6dx6flhm9kfgfmk9vkvh"; + rev = "622b519d8586"; + sha256 = "14jayh9bn8f6mjiln6h7ny404g0iy8zr7b6s6faqqhd840h519mz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/ahg"; @@ -1447,12 +1447,12 @@ ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ahungry-theme"; - version = "20171103.2238"; + version = "20180126.2021"; src = fetchFromGitHub { owner = "ahungry"; repo = "color-theme-ahungry"; - rev = "9ec7fca8002b213c7eee1168258e36a683190d18"; - sha256 = "01gjmyxb0m6i321md77wscqrhy30gyhrk4fjcx7mg2z9hzxvzljb"; + rev = "9367e4a277fdabde7433640fbae48407bab7c4da"; + sha256 = "0y71h25vi10qirn0q48csxd1xjhha17f9za9fdvfs7pcsqmkk8im"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme"; @@ -1552,12 +1552,12 @@ alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "alect-themes"; - version = "20170825.1009"; + version = "20180113.1316"; src = fetchFromGitHub { owner = "alezost"; repo = "alect-themes"; - rev = "ded94ab1421994aa863a4d7538ec7453768ec235"; - sha256 = "1616vkjgn5g4xf40p15847pkqyrlfzp9d143a4cyk7za50a175ll"; + rev = "b30158d5d9e43318fa0e4a211d81fe4b2495c027"; + sha256 = "0hylvk7ivibm8l6y21v88j1gfv8mwggdcbgw6gb4rz5ws6n0jdxd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84c25a290ae4bcc4674434c83c66ae128e4c4282/recipes/alect-themes"; @@ -1573,12 +1573,12 @@ alert = callPackage ({ fetchFromGitHub, fetchurl, gntp, lib, log4e, melpaBuild }: melpaBuild { pname = "alert"; - version = "20171213.1207"; + version = "20180122.1242"; src = fetchFromGitHub { owner = "jwiegley"; repo = "alert"; - rev = "34badcfef2b1c1e860a3af19bfe00759f95e8e1a"; - sha256 = "0plahyinqs21dkbqr3nfm7pzba9s9m37f771062aaabw3qqzq7aw"; + rev = "103d34c83fe77e46a6976dcaba3db678199e0c9c"; + sha256 = "1nbk768d8iqjf1mx956497hbjfxar144h3m3sd298byc54z8bvmf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/113953825ac4ff98d90a5375eb48d8b7bfa224e7/recipes/alert"; @@ -1633,22 +1633,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; @@ -1678,12 +1678,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"; @@ -1720,12 +1720,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"; @@ -1771,12 +1771,12 @@ ample-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ample-theme"; - version = "20161213.912"; + version = "20180115.627"; src = fetchFromGitHub { owner = "jordonbiondo"; repo = "ample-theme"; - rev = "8fbae3a9965f933c487f4cfdf2d881753d9feeb1"; - sha256 = "0knzfxdncb1x41zqknv70p62zwr4k5nxf8l108x9w043drxc10lw"; + rev = "64845a6b67627e897dd42d8302c25c03ddce2aee"; + sha256 = "0fb5pq5242xqss02si4nlwgy073kpvf909avwdngvyg6apyk66p2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d448c03202137a461ed814ce87acfac23faf676e/recipes/ample-theme"; @@ -1834,12 +1834,12 @@ anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "anaconda-mode"; - version = "20170924.704"; + version = "20171223.1118"; src = fetchFromGitHub { owner = "proofit404"; repo = "anaconda-mode"; - rev = "e68a3cb37915f1e0f91e13f3929d836427e40f69"; - sha256 = "0ia6c4iwkfij38w0d6419mpwqcan8rd9pwm7d6x1phpdwlg76hqp"; + rev = "e72e9beeb8c80acfee4d85748464d1c5147946ad"; + sha256 = "01p83h7a40v89xp4ar587xg97y86h8p641znlbd0sqckxkn087cs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode"; @@ -1957,6 +1957,27 @@ license = lib.licenses.free; }; }) {}; + anki-editor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "anki-editor"; + version = "20180128.129"; + src = fetchFromGitHub { + owner = "louietan"; + repo = "anki-editor"; + rev = "690121ce582105239f8bf20a9c011b8c6bb1661a"; + sha256 = "168lixn9s3s1p33qw8x6wr5ll6mikkx3316xfsql0bdnz1rkk6cp"; + }; + 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"; @@ -2128,12 +2149,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"; @@ -2379,12 +2400,12 @@ anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anything-tramp"; - version = "20171214.2056"; + version = "20171224.601"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-anything-tramp"; - rev = "7d25d7e7f5370a82811c307550de5e36d4a7c2a6"; - sha256 = "09crbgndhpm7mz5x01k0j8wsxga4gxraz4vgmbyb4m5b54h8jbpz"; + rev = "7364472a8e9ddaafdff7ad004c7a2bad42da9d92"; + sha256 = "0sfbx63mq8pmwwb2y7w6l9hy1qr4f7d9wij6r5n7y75r19l1j9ph"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anything-tramp"; @@ -2505,12 +2526,12 @@ apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apiwrap"; - version = "20171202.1653"; + version = "20180125.612"; src = fetchFromGitHub { owner = "vermiculus"; repo = "apiwrap.el"; - rev = "5363671b6a8fe8ecd4674497664974e089b2b035"; - sha256 = "04a4v6vpzmhj3g4mqr2fsq47k8spi8c7v4pbzkdz9si097dskvrg"; + rev = "dfb500b394cfb8332f40d8b9ba344f106fdb9370"; + sha256 = "1w6dfnrz3gi2d800k5ih2daak5krnpddkzjhmv92nyvgrn7x3hd3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap"; @@ -2882,12 +2903,12 @@ async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "async"; - version = "20171015.2239"; + version = "20180119.533"; src = fetchFromGitHub { owner = "jwiegley"; repo = "emacs-async"; - rev = "424ecd8a28cd59fe7d2de3cb4b37a4224e34c123"; - sha256 = "0zmbg3r6sykmchy8hhbw8glzl8xvki030rzg9r55v4g61k8qy13r"; + rev = "15bcbf6beae65d7606f0655711159ca56f050c6b"; + sha256 = "14y3jr636hn9p699ypd3kas6750kpz0lk4xchb0y44b94splczqb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/async"; @@ -2966,12 +2987,12 @@ atom-one-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "atom-one-dark-theme"; - version = "20171217.2049"; + version = "20180116.1024"; src = fetchFromGitHub { owner = "jonathanchu"; repo = "atom-one-dark-theme"; - rev = "d5b785ba6118110a9404a7f65429a954ae820d69"; - sha256 = "1a0ayw7jhbw3im5frs0rycl1ya18lbfslcr4xqsgs4kvczar4rzx"; + rev = "fbe026c64f53bf5afa27c55fda6118d45cea7d5e"; + sha256 = "0hg8drfcd6y6mis5xz9b0a43d5agfsrw39ri2i2p6gcm4mii1041"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme"; @@ -3092,12 +3113,12 @@ auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }: melpaBuild { pname = "auth-password-store"; - version = "20171109.1045"; + version = "20180129.34"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "auth-password-store"; - rev = "57c4bb749eb0fad9188c870098a61b03af346b75"; - sha256 = "0hmi8q59spjqchc7zkpfsyi5mplkb8npxfa00f4rxfspwd2il5wc"; + rev = "0470e6bde546b34677e393c92e2b064db61b6e9b"; + sha256 = "0m309nhiqbyrk2mwymha66xcl05x5vryzz0vj90pak62yil15mnr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store"; @@ -3155,12 +3176,12 @@ auto-compile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }: melpaBuild { pname = "auto-compile"; - version = "20171213.756"; + version = "20180111.436"; src = fetchFromGitHub { owner = "emacscollective"; repo = "auto-compile"; - rev = "694b92ea58feb30a0104ccf2424fd921235ba517"; - sha256 = "1im7z4sf4zxv97dcwviv7rzlc8ff5ibx8lhqmvhm8kxc0jf84iid"; + rev = "8d117868a0a091389d528428136e60f951e9c550"; + sha256 = "1qkw8qzhqzk16kvk1200ha10gi6ny0saqvyqm6b1ww0iw3q1ic5c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/auto-compile"; @@ -3491,12 +3512,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"; @@ -3656,6 +3677,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"; @@ -3932,12 +3974,12 @@ avk-emacs-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avk-emacs-themes"; - version = "20171206.258"; + version = "20180121.246"; src = fetchFromGitHub { owner = "avkoval"; repo = "avk-emacs-themes"; - rev = "9664858d7f34a9072e35c579bf2fc26d5d1404c4"; - sha256 = "01ix1b5dv20f18mcfnz7l3iiwfxf5dlr0gyg5jffmqiix8cp2sim"; + rev = "7f1da34f0d74e5a922400b05fcfada5df1c0e3ce"; + sha256 = "13pcd61a81f7cby5lk6hnasp95khhrgnqz8v738g2vwsqbfqbwyq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef362a76a3881c7596dcc2639df588227b3713c0/recipes/avk-emacs-themes"; @@ -3953,12 +3995,12 @@ avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy"; - version = "20171211.923"; + version = "20171230.220"; src = fetchFromGitHub { owner = "abo-abo"; repo = "avy"; - rev = "869261ae812723c0c6549202734a4135c3474ec1"; - sha256 = "05jwkjym79bv8adn4p9vd6hwpcq1hb1za084daim4hl10y8svg4m"; + rev = "34d3531a3cd35ae6b9e8dbc37343c027504fdcb0"; + sha256 = "0rgwbm5jcbv132xldbz2kcp09c7hs96329mwfa019v99qdbb5k32"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy"; @@ -3995,12 +4037,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 = "990cc94d708c923f761be083b3a57f6f844566c8"; + sha256 = "0kjxfg8wx5c8cixazih24s0mv4crk648v9bb6pd1i6lmh266rc6g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f0b4cfb30c405d44803b36ebcaccef0cf87fe2d/recipes/avy-menu"; @@ -4016,12 +4058,12 @@ avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }: melpaBuild { pname = "avy-migemo"; - version = "20171215.826"; + version = "20180104.624"; src = fetchFromGitHub { owner = "momomo5717"; repo = "avy-migemo"; - rev = "c62b71a76d0fdb38849bea54a61b9d8a28eca4fc"; - sha256 = "1dnsj5li67mwp7kil6fihrkfmd3ynf576ps3wsy77d73sbviphal"; + rev = "526494a2ae86b66a22848e5dc274480e3b4d04ca"; + sha256 = "04fkgiixfd0xgb2m0b48ngv2fmvz2vnjajfl1b59paczz8pnw96l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo"; @@ -4274,12 +4316,12 @@ base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; - version = "20171212.1621"; + version = "20180114.1149"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "3b0bb640572825873754276f699b18765c7e5172"; - sha256 = "14pyf9aw8qbc1367j32yl8hn9lxs9027cxsxw510x9qa8ffrmi7n"; + rev = "3492ce6613e974a329c8773e09a615c28b48aa10"; + sha256 = "140yxkg1gnfhmsw6pira2p0nq2ll1x8swi9rlngraxshldf0c6zv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; @@ -4299,8 +4341,8 @@ src = fetchFromGitHub { owner = "szermatt"; repo = "emacs-bash-completion"; - rev = "31bc1c1c21691668c6cc16a46361490d5bec303a"; - sha256 = "0iq9q0isaynrjhzgkm5hvw26162m52vbzwf12vic5nr9frxbxkv5"; + rev = "2c0b8d6a6e5cec52740b8f773297459b98f3e064"; + sha256 = "0psp1rli7h477js25kzm00s4j5x3604ly1m3xh2w29lz8jpc0nvk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/bash-completion"; @@ -4397,6 +4439,27 @@ license = lib.licenses.free; }; }) {}; + bazel-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "bazel-mode"; + version = "20171226.1551"; + 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"; @@ -4420,11 +4483,11 @@ }) {}; bbdb = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbdb"; - version = "20171017.817"; + version = "20180106.910"; src = fetchgit { url = "https://git.savannah.nongnu.org/git/bbdb.git"; - rev = "339aa15f20e1f542db97a3f3d2d65a61ce5c0e93"; - sha256 = "00782y1vas8rd9g30jqhnc24bsqsy5c31qn85ipi1vc8lrbyfcg1"; + rev = "f18720ff5cd963a0bf6fc0e41293e50c0172b8ae"; + sha256 = "1s5qi8njiqdpgnzlik36islzh13zfhybnynqisr61p602pn4ghk7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/bbdb"; @@ -4461,12 +4524,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"; @@ -4836,6 +4899,27 @@ license = lib.licenses.free; }; }) {}; + bibliothek = callPackage ({ a, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pdf-tools }: + melpaBuild { + pname = "bibliothek"; + version = "20180122.2021"; + src = fetchFromGitHub { + owner = "cadadr"; + repo = "elisp"; + rev = "41045e36a31782ecdfeb49918629fc4af94876e7"; + sha256 = "0isvmly7pslb9q7nvbkdwfja9aq9wa73azbncgsa63a2wxmwjqac"; + }; + 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"; @@ -4948,8 +5032,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "865e931889f33495f3ce1b9e14b5b3e959887424"; - sha256 = "0xs9yg1gar1xbk3x8cydmi26zkl0aggrks70m5rnsc3yp9iy6w8b"; + rev = "8ecb0f1c56eaeb04213b476866eaa6939f735a61"; + sha256 = "1w4v3zsz2ypmjdysql0v0jk326bdf1jc7w0l1kn0flzsl2l70yn8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/bind-chord"; @@ -4969,8 +5053,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "865e931889f33495f3ce1b9e14b5b3e959887424"; - sha256 = "0xs9yg1gar1xbk3x8cydmi26zkl0aggrks70m5rnsc3yp9iy6w8b"; + rev = "8ecb0f1c56eaeb04213b476866eaa6939f735a61"; + sha256 = "1w4v3zsz2ypmjdysql0v0jk326bdf1jc7w0l1kn0flzsl2l70yn8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key"; @@ -5343,12 +5427,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 = "88f69fe61955d655b774427ca95ce359f52d5e21"; - sha256 = "1br1li9ffxynqm8v5ayfl6pb36di0syplxfjs9x64gsq0y4fbcng"; + rev = "6ed4d3edbe771e586d873b826330f3ef23aa1611"; + sha256 = "0s4jwlaq3mqyzkyg3x4nh4nx7vw825jhz7ggakay7a2cfvpa4i2j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19fd0bf2f8e52c79120c492a6dcabdd51b465d35/recipes/bog"; @@ -5448,12 +5532,12 @@ boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: melpaBuild { pname = "boon"; - version = "20170825.416"; + version = "20180108.41"; src = fetchFromGitHub { owner = "jyp"; repo = "boon"; - rev = "13fca1929639e2239e9b4be060cbd4befd7921b4"; - sha256 = "0nbwmb4l2f6y58gx8bm42688y6sqc33l5sf0gh1vmn2ki2mq7jvh"; + rev = "836f25c5baa363691a8d31712d07248c0d9a49a7"; + sha256 = "1jh6c6i1jy1f8hskqbpqj2babk9yvqyjxyxy0x11686riasc5vps"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon"; @@ -5466,6 +5550,27 @@ license = lib.licenses.free; }; }) {}; + borg = callPackage ({ dash, emacs, epkg, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: + melpaBuild { + pname = "borg"; + version = "20180125.849"; + src = fetchFromGitHub { + owner = "emacscollective"; + repo = "borg"; + rev = "593314b8f1f4542155eb4dae0ff1be375895b83d"; + sha256 = "095l5cakz0clmna7njqdng3k1gpy4q6h1bld0pvichkkbqh8is6c"; + }; + 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"; @@ -5658,12 +5763,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"; @@ -5802,6 +5907,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"; @@ -5972,12 +6098,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"; @@ -6182,12 +6308,12 @@ buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buttercup"; - version = "20171029.1011"; + version = "20180128.228"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "emacs-buttercup"; - rev = "bbbf6924ff214b518718687ead96ceec92bdbaba"; - sha256 = "0z05rr85mf9as2byj3k1ai9x5ci45a7g425svv0ywgz1lgv2vsi4"; + rev = "6848057a224e2548a58ec81ce042c81a44dd481c"; + sha256 = "0qzfj57lwxqff3d9kpdg290ishy8h3il43y114kqs1gxcgyxzsv2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup"; @@ -6410,6 +6536,27 @@ license = lib.licenses.free; }; }) {}; + cakecrumbs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "cakecrumbs"; + version = "20180127.456"; + src = fetchFromGitHub { + owner = "kuanyui"; + repo = "cakecrumbs.el"; + rev = "b7bfcc46aed139abc1d30f700076f82584084f3f"; + sha256 = "1jl196qfgmn87kzkzhrqliarp9cmvl9c4ka2v20knw6ca2ymzbp9"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c970907affeb4a21fa1b7c350edf171dbdcd8de5/recipes/cakecrumbs"; + sha256 = "1s5j8w0y47qpdq4f34l7hmdhxp560wg1lgzqz6p3p3lg1l89sv47"; + name = "cakecrumbs"; + }; + packageRequires = [ emacs ]; + meta = { + 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"; @@ -6455,12 +6602,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"; @@ -6480,8 +6627,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"; @@ -6522,8 +6669,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"; @@ -6543,8 +6690,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"; @@ -6564,8 +6711,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"; @@ -6627,8 +6774,8 @@ src = fetchFromGitHub { owner = "ocaml"; repo = "ocaml"; - rev = "30e6aa9f1fdb552b538350180316c90d24955a36"; - sha256 = "0pgaxai00vbvbxdnkbzczakcmnfcdhrydxxdrfkv356gmpi068lw"; + rev = "261c7144e18d54dd38ec1b0b48ae6e7c46eccb02"; + sha256 = "1687rg64i64if3mm0k8sjjbblpkshdhf5aksm8gx24gm1vw3yid6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; @@ -6665,12 +6812,12 @@ cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: melpaBuild { pname = "cargo"; - version = "20171118.132"; + version = "20171218.855"; src = fetchFromGitHub { owner = "kwrooijen"; repo = "cargo.el"; - rev = "ae6b0523a9f3ca035da642913cb72858cb3926e9"; - sha256 = "0clcjla75jwl4650h1k51b6dgn2ckj6jk2r5ycqi0p25qvspzj29"; + rev = "ba652e464ccdd0860fbc5d932c2ae86c9a31a200"; + sha256 = "1wyk40c61hlkmx3v82hn89chvrx7fyyyc1j2wlhizi7x5cv3c497"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo"; @@ -6728,12 +6875,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"; @@ -7021,12 +7168,12 @@ centered-cursor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "centered-cursor-mode"; - version = "20170830.948"; + version = "20180112.755"; src = fetchFromGitHub { owner = "andre-r"; repo = "centered-cursor-mode.el"; - rev = "670af669b6871d4447e11710d1d39a4d5fcd4b17"; - sha256 = "1vihsd0kp6skad7j5y5is5c7qiisz9myspsxsi86i7x8vrhmsvc3"; + rev = "319636448ffb7dba5fade3b2599ed9c1fd3bf8c8"; + sha256 = "1fib5db8rjyjrr86nw1jvf30pz2zva0v21khyz7fkh2nkf8b3a7i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9a7a28caba49a20413dec3c3d0cc9c36b859834d/recipes/centered-cursor-mode"; @@ -7130,8 +7277,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "40aa12d58fdb66d25e535793d59ce9ed3d8f8600"; - sha256 = "1zpl33la3hnjrcsfm6h76hy1kq4xcgcxz0hhzazynb0kcm0x2lx4"; + rev = "e7f50592d1ff0c8e2fa175e56190566f447fbaf2"; + sha256 = "10f2an6pmz7a088rllf7k1kcyllak6xr4fhvxqgvyqm1h1jbqjbi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -7252,12 +7399,12 @@ challenger-deep-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "challenger-deep-theme"; - version = "20171118.437"; + version = "20171229.435"; src = fetchFromGitHub { owner = "MaxSt"; repo = "challenger-deep"; - rev = "08985cc17302f0e90a532fd5d67cfe2429b22444"; - sha256 = "1qn1l48fwhqw3lkag4322r16cq2ms9spg42jf0w1fc0y6w691p54"; + rev = "e0462b42218c94288f5c8a62f2b217bb8037995a"; + sha256 = "1v64yx8pr3aqds3grh79y27qg8x5ad3hwxv96pw0hlhvqc62s4ai"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7942f539d025c1e2b059d49e1984716cbbc90a67/recipes/challenger-deep-theme"; @@ -7315,12 +7462,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 = "3235f8e3c88848ce10d25f84a5da39061fd35c0d"; + sha256 = "05pjfj6g4gdbdj4z63283j5qzkvhvrzsx1jhbc5iih0nsffwapc3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f6676747e853045b3b19e7fc9524c793c6a08303/recipes/char-menu"; @@ -7693,12 +7840,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"; @@ -7714,12 +7861,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20171218.214"; + version = "20180129.1017"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "6b584d968552fe94918731316db8d764e0b8d921"; - sha256 = "1krqms84nzl4sl2nlhpzxrxhhz4h4gzhnyqbrwl4lrrmbmwz0qw1"; + rev = "c51903c8ba144ddb8e2b742db5daa572e09e6b97"; + sha256 = "066fvw3dgnrakl5bjpmkymnvv0nzhlbil15xhaywdygy2cylm00d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -7907,8 +8054,8 @@ src = fetchFromGitHub { owner = "GuidoSchmidt"; repo = "circadian.el"; - rev = "f3d724caa66e24a9ef41b8eba961467a94c9ef76"; - sha256 = "10l9syy8m6sbn719varv272awmyn2vdg5hajkfp5wsyznigiy2nn"; + rev = "bb49da54b2fb57524066e54ffee27cb9549ec925"; + sha256 = "0ra9cs407mz5243ymf4qsr92sly0k5gfl24xgdmxczg35w8hn31l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/circadian"; @@ -7924,12 +8071,12 @@ circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circe"; - version = "20171215.1010"; + version = "20180105.1158"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "4070f2d2c5585e5280fa57edc16e31dfebd9b7d7"; - sha256 = "1gmgb8cxqc891gzzf518467y9p65162sj0c1xgahzjan5gxhh25m"; + rev = "58fc1a3c7f9f6e3126585b1ab2f3d00f824b7d7c"; + sha256 = "1vsh2x794zaf02zql4s6bn3v0m3xm43icvrn7jfmi660qh3f4bsy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe"; @@ -7945,12 +8092,12 @@ circe-notifications = callPackage ({ alert, circe, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circe-notifications"; - version = "20171203.1746"; + version = "20180102.1518"; src = fetchFromGitHub { owner = "eqyiel"; repo = "circe-notifications"; - rev = "a21417f0ee82c922e017cc301503539cdd65aa1c"; - sha256 = "1pl42a1zmnwqqg993kah49nzqabs2wn5pmda6xi7i15bffpiagjw"; + rev = "291149ac12877bbd062da993479d3533a26862b0"; + sha256 = "18mva5nn919c86sgk6kdh437vdnlh9bk7fg10xqcpics1yv3viaw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/76c0408423c4e0728789de7b356b2971d6c446c7/recipes/circe-notifications"; @@ -8155,12 +8302,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"; @@ -8398,12 +8545,12 @@ clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode"; - version = "20171103.1150"; + version = "20180121.1011"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "118c19700c904ae6a45fb409ca795bb93ff8dbd8"; - sha256 = "0kdk94ffrw27fz8ycka7a24hj3p3w09rhq3ppga7dwgsxqjfjb5l"; + rev = "59e9247d64ca82d1e01bb21ee49df1220120fb0e"; + sha256 = "1ngirh0kp53i2qcvzkf84av8fijp23rfjfhwzkwhiihs3zy63356"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -8419,12 +8566,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 = "59e9247d64ca82d1e01bb21ee49df1220120fb0e"; + sha256 = "1ngirh0kp53i2qcvzkf84av8fijp23rfjfhwzkwhiihs3zy63356"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; @@ -8479,22 +8626,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 = "20180113.1550"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clomacs"; - rev = "8d3e12a2f73e81499fa18f30adaea8c861e4a9b1"; - sha256 = "01wpzbv4vjad0nvbydc0rwb3jdqbncwajs5xrng88n1xxhrajh1x"; + rev = "38240d15e4929a3c9f3788815f9743a855926812"; + sha256 = "0vql6hcraa6y6njxz62kwwfnkhl8l2gjs52bvpgsrgrkq471w48h"; }; 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; @@ -8503,12 +8650,12 @@ closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "closql"; - version = "20171015.822"; + version = "20171219.524"; src = fetchFromGitHub { owner = "emacscollective"; repo = "closql"; - rev = "49862bfdd1540d443d278fadef16a83388b360cb"; - sha256 = "0phpfsl00d39gp26mbf1n7r2210gk2407pqj3bng50sbip568jmp"; + rev = "01cb892f6a457fbff857d924cebfdc77f69bd45d"; + sha256 = "0c5b6w67qjy2kvk3daljjg01xsv91c03n6kxvg5bswqq1j7n66si"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql"; @@ -8629,12 +8776,12 @@ cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, s, seq }: melpaBuild { pname = "cmake-ide"; - version = "20171211.1457"; + version = "20180122.1301"; src = fetchFromGitHub { owner = "atilaneves"; repo = "cmake-ide"; - rev = "45ae352ca302828086b89936047baf806eb01868"; - sha256 = "000kmlpy9ph4yrcry8z8rhm1574dkwb45bfrcj239rkajnxwljq0"; + rev = "21c1ca99393ea0160f0503a6adb8f3606d33926a"; + sha256 = "11kqczlc8rwq9v9wk15h8hzhdffz9nxifr9laa07bx74yiddxmyj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide"; @@ -8650,12 +8797,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 = "438ed3bfc180fbee98fa07af1eb427c6da209b68"; - sha256 = "0hgjljdvkf4grgms4l86frlliqmjc5nxi207xqygq1mnjkfvv529"; + rev = "92cd3d06772ada13935790d66927ab4663c7d628"; + sha256 = "03f04yn0gphcd4664w73pdpmq46ljkvxbv7xyg5s084j5mk263hx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -9112,12 +9259,12 @@ color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-sanityinc-tomorrow"; - version = "20171202.1759"; + version = "20180122.1154"; src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-tomorrow"; - rev = "e3e051f88734593d4b7b92f157e618ebfe63693b"; - sha256 = "1nh26v8vk7g5rkqbklan2ai4i4lx3bdn03pch84xyn3drpq40rb3"; + rev = "0358ee25ba27741a41c62414785308b417cdc308"; + sha256 = "1dqssw407f9d4bbaks9k921fzcs2fz7ccbwpcm22ly46krlzxfpi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow"; @@ -9406,12 +9553,12 @@ company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "20171213.1534"; + version = "20180123.1315"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "4004c7f3ccd4f2fdede71f1b82216e93dbbf6826"; - sha256 = "0w91pjmlzdxc7qs1qy9y99kcvzc04gs14cchlcfqw2fym8vmryr8"; + rev = "d789f2643c11f7c53fc47ed9d9b271bb6f6718a3"; + sha256 = "0kqpjxbv9gfkki5cz78dslfgwwf2n15y32dq059lmbfm4mg9f5n4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -9427,12 +9574,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"; @@ -9599,6 +9746,27 @@ license = lib.licenses.free; }; }) {}; + company-childframe = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "company-childframe"; + version = "20180124.1744"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "company-childframe"; + rev = "bb3d778bb12d47c7f2311eecb17985a5695acd31"; + sha256 = "1b1xyy0f20ls7v695vg6m5g0vb3pn7v7vdbsziarf2jaqgc8ps57"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4fda072eb1e3f4feb9ad9834104f748f5b749a0d/recipes/company-childframe"; + sha256 = "1l8bd9fnw49apvwjgrlfywascbczavpaxns2ydymmb6ksj00rvzy"; + name = "company-childframe"; + }; + packageRequires = [ company emacs ]; + 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"; @@ -9774,27 +9942,6 @@ license = lib.licenses.free; }; }) {}; - company-eshell-autosuggest = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "company-eshell-autosuggest"; - version = "20171209.1109"; - src = fetchFromGitHub { - owner = "dieggsy"; - repo = "company-eshell-autosuggest"; - rev = "2ae70dd521c797f1673cd0f0ff6da6fbfce77dac"; - sha256 = "01i4qdl1gkv47vr4qkbz9jm7hqsyg0msz68h4p78lnmskmvr10b4"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b5beec83bd43b3f1f81feb3ef554ece846e327c2/recipes/company-eshell-autosuggest"; - sha256 = "1bpjyr01rwl58fypfhzzml69wx7h2a044s4l58cxl3fw8lbjb13f"; - name = "company-eshell-autosuggest"; - }; - packageRequires = [ company emacs ]; - meta = { - homepage = "https://melpa.org/#/company-eshell-autosuggest"; - license = lib.licenses.free; - }; - }) {}; company-flow = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-flow"; @@ -9819,12 +9966,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 = "05efcafb488f587bb6e60923078d97227462eb68"; + sha256 = "12cg8amyk1pg1d2n8fb0mmls14jzwx08hq6s6g7wyd9s7y96hkhb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f27d718ee67f8c91b208a35adbbcdac67bbb89ce/recipes/company-flx"; @@ -9907,8 +10054,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "0444ce1cda44fedd8f89f853dfb9d3ee6973fa13"; - sha256 = "1zr8ql7blacz4iz8l969sz3dmy9cfp4v15bwzxv71rg9vhz1ip9g"; + rev = "416643789f088aa5077f667cecde7f966131f6be"; + sha256 = "1vggwjpcssxp075l8aippgr318m0nkfjyakq7j24ml48g4gc48rm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go"; @@ -9970,8 +10117,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"; @@ -10012,8 +10159,8 @@ src = fetchFromGitHub { owner = "leanprover"; repo = "lean-mode"; - rev = "6b712ed05903fd92d44152d92d0820fc2502b25f"; - sha256 = "0xy2gn8c50h355yipi63nrpj3swgwzhfymq0gjpx9qq1y1jgjkis"; + rev = "ae90bd280588c96d540892d0f42247db5a126f51"; + sha256 = "06d5f577rv82g72m719w8z9w7m63amxjsdppcyvg2i6icymlhnqa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/company-lean"; @@ -10029,12 +10176,12 @@ company-lsp = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }: melpaBuild { pname = "company-lsp"; - version = "20171211.1017"; + version = "20180122.1747"; src = fetchFromGitHub { owner = "tigersoldier"; repo = "company-lsp"; - rev = "35d46dd3c6ac71c8baa0fc7798810e7fa64076ee"; - sha256 = "0kc76gfabp008vvfvqjj26c4v8p7vijb4cyjx6f97cnv0c7h62al"; + rev = "0f750d4cbde7063472b1f25b7cef7e632ae307cb"; + sha256 = "1xszd359y7f93azf1b8805v4s99ql4hfajbz9nzwkb5py1jqxxn0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp"; @@ -10155,12 +10302,12 @@ company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-php"; - version = "20171209.2243"; + version = "20171226.1924"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "0bea9c7d800864b55d807c755254d03c796b1594"; - sha256 = "0d1gc7w1jgf8wigikwr7x5w3524acqim2ivk0xkp81isp7dc4ll6"; + rev = "1ad972b0394f0ecbfebae8041af96a1fe2e24cf0"; + sha256 = "07hljgfl1d6dg50dflr467fdif39xxp0jap46x85gilrlw458hp6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -10176,12 +10323,12 @@ company-plsense = callPackage ({ cl-lib ? null, company, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "company-plsense"; - version = "20171114.2316"; + version = "20180117.1658"; src = fetchFromGitHub { owner = "CeleritasCelery"; repo = "company-plsense"; - rev = "00f0baa70502b8412627316f72fc8b27ae7a1106"; - sha256 = "1w3kv964dd0aqfmsk0v2hnnj7dr4hdsm041f2w61bfzpxs2mqjv1"; + rev = "b48e3181e08ec597269621d621aa06636f02d883"; + sha256 = "14rawd5xfgnkhdpp43mz4a5mf480949ny5hr5w6v5djmsibqxw5s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cf9d671d81e07c704676c557a9f0d686067ce5c/recipes/company-plsense"; @@ -10243,8 +10390,8 @@ src = fetchFromGitHub { owner = "expez"; repo = "company-quickhelp"; - rev = "432c62f034a5097d3f85d7f54afcdc016d7afa12"; - sha256 = "06ijf4ayqkmlmk5waxi7alinv3wpy23b8xm35llf3h1ncg99zwqj"; + rev = "c42610040ccfaacd8040f47c5e1c629a18987614"; + sha256 = "0j1fqyi97imv1zp0w0y51j2svs494r2bdi2q9jm11b9bdi3jmf7d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/022cc4fee54bb0194822947c70058145e2980b94/recipes/company-quickhelp"; @@ -10312,8 +10459,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "c44d3b922de999080e5f815cf4746d2a286d551e"; - sha256 = "0zgrwpcc14w9qhasrfryh5qqw4kdr36x8i9wqcx5mjbylh7p08z5"; + rev = "53e74892e8bd15baa4d1bd1d640dcabcba9667ee"; + sha256 = "0ynhx1cyxvrmkadb8h81xrhxvf9wssq74xk236dhl7q1mqagnjaf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; @@ -10354,8 +10501,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"; @@ -10536,22 +10683,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 = "20180111.942"; src = fetchFromGitHub { owner = "emacs-php"; repo = "composer.el"; - rev = "43e50a5e626bedb3c46c875ac765daf615f18ce9"; - sha256 = "0vfr9v60dgynjfz1kpx4c17mhsfbyi9g68jzvjkw7y95pwqv8f0y"; + rev = "e34ebe795d267e28965c85bd84cbb16b18165bd8"; + sha256 = "1vqjraldl2an10q1w91l7rx66mpsvqvjgg3j1k7xcvw07570aabl"; }; 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; @@ -10938,12 +11085,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20171217.338"; + version = "20180114.1336"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "364fb09dccc30c46169dfe8acc3dd0702d2f556b"; - sha256 = "1nqp8sfg0vrdibh4hm88szssn63pn09rn56sz690nvwwbdhf2m30"; + rev = "ffc34c666c2b214d01e3f722249f45d1672566bb"; + sha256 = "0gzf8l0clh2p86m6xcygykskhigr43cpwfvj1sl06mcq600fxavn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -11001,12 +11148,12 @@ counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "counsel-etags"; - version = "20171215.2123"; + version = "20180129.219"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "counsel-etags"; - rev = "3392436e99b2477687aabd2f54d32a2acaa94606"; - sha256 = "1ypi0vzhzn880agnkhsghfcibp7p6gviqgm13s4qjiagwci0m1zg"; + rev = "2219bf8d9a4584abc905c7470455777553496056"; + sha256 = "0kcxcbf1rm7cm74s5z87pv0bflx42h4j2lnb8b3r0nznj94ywnj3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags"; @@ -11040,6 +11187,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"; @@ -11064,12 +11232,12 @@ counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "counsel-projectile"; - version = "20171201.1224"; + version = "20180105.632"; src = fetchFromGitHub { owner = "ericdanan"; repo = "counsel-projectile"; - rev = "162cdc2655c58a75bb51e939f3688b1a4dd7632a"; - sha256 = "1vncznis89hqrg8yb26d0sxwdjp5c32p1ynwg5vni55cxc5cznv3"; + rev = "4d78ae8c90e8ebb903b8e70442989a69e46ff069"; + sha256 = "0s81jrmfql3cjh0bf6vfk3gpb94xqcpbkvjah11j0d0ijgw4y1dg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile"; @@ -11124,6 +11292,27 @@ license = lib.licenses.free; }; }) {}; + counsel-tramp = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "counsel-tramp"; + version = "20171224.321"; + src = fetchFromGitHub { + owner = "masasam"; + repo = "emacs-counsel-tramp"; + rev = "6efa0e6e204d08d5b8b8b66f7e3ae7f07d5a3665"; + sha256 = "1byskmvhs0vdj08xjnds8zczw19d2kmnsym514c56k3a0v7g1ldz"; + }; + 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"; @@ -11292,6 +11481,27 @@ license = lib.licenses.free; }; }) {}; + cquery = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: + melpaBuild { + pname = "cquery"; + version = "20180129.1017"; + src = fetchFromGitHub { + owner = "cquery-project"; + repo = "emacs-cquery"; + rev = "275bf669d14bfcbd342833c245fa9129c5ff76a1"; + sha256 = "0rm0m35sqwas9ayx8lvq19g04y3ndnhfgl7mpfmmjqab9pcqdrjn"; + }; + 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"; @@ -11400,12 +11610,12 @@ cricbuzz = callPackage ({ dash, enlive, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "cricbuzz"; - version = "20171216.1341"; + version = "20171227.1607"; src = fetchFromGitHub { owner = "lepisma"; repo = "cricbuzz.el"; - rev = "723d017ea146ce1e4b69878e631c4d436b52b5b7"; - sha256 = "1ckizna4r5ygqvd0wgbgfgnk8h6bh0cwnsq722sdzghps8jpjmjn"; + rev = "557f75f10525e7a4d50e83010b9ed07fbf9df889"; + sha256 = "18lc56l5vcbrw2agpgjcap5q0l1mi64khgkk00x7r9wm1zilf9wp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cricbuzz"; @@ -11442,12 +11652,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"; @@ -11463,12 +11673,12 @@ cryptol-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cryptol-mode"; - version = "20160819.1444"; + version = "20180118.535"; src = fetchFromGitHub { owner = "thoughtpolice"; repo = "cryptol-mode"; - rev = "9bf28f865d30d23b8b4fdef16a79ab66abbcc41f"; - sha256 = "0ihhx4zp725g1qaxq6n2ah8rsg099ccyavqxgkk53rpwr8iia0i2"; + rev = "dcc9498813a77ffb83010032e0e5a540f00f3d33"; + sha256 = "0w73i9a6qpab2h58mblhcjqs7xcyr9vpx9mczj3sxzygb2lhzwxw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/de12333bb429d84b2c214ac7ebb0219f67838f4f/recipes/cryptol-mode"; @@ -11505,12 +11715,12 @@ crystal-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "crystal-mode"; - version = "20171207.1556"; + version = "20180104.1920"; src = fetchFromGitHub { owner = "crystal-lang-tools"; repo = "emacs-crystal-mode"; - rev = "5ffeae2b5798543ca0a2dc747e397359949850d1"; - sha256 = "1gvkv6z3dgqbkrkzyxlhz7hk38b9jkmazncw6mwxd2lvrwhkhywr"; + rev = "0fe6815201bebe4c5ff6857bd541d95b05132b10"; + sha256 = "0r75dvc0jqcqi1qjns8zj132dnm0s6mvqlqynkis16nigbawix8m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b9b47d7deecf0cf24a42b26d50021cb1219a69/recipes/crystal-mode"; @@ -11568,12 +11778,12 @@ csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }: melpaBuild { pname = "csound-mode"; - version = "20171201.1636"; + version = "20180119.1726"; src = fetchFromGitHub { owner = "hlolli"; repo = "csound-mode"; - rev = "c6c7390faeddb8db11828e1636c0b479dc62f53f"; - sha256 = "19p13f9xsddxvy7isdzrc3r2xkc24fifsvkzkqqp4kqzj005kb8d"; + rev = "4fc4e77263d31604c86be799163d96cdad57c610"; + sha256 = "167s332b9pbbxv24kyhrx543954a86bffxngjhp0cl0slmd81g2m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c940d29de11e43b4abf2901c466c94d426a21818/recipes/csound-mode"; @@ -11586,6 +11796,27 @@ license = lib.licenses.free; }; }) {}; + css-autoprefixer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "css-autoprefixer"; + version = "20180118.1411"; + src = fetchFromGitHub { + owner = "kkweon"; + repo = "emacs-css-autoprefixer"; + rev = "2b18f38978845a18c66218e1abf0db789137073f"; + sha256 = "00y3ip6n0w9w6cyfrf3xqlrx2gqzq3b61n8c0bgjlvw85drjz2pd"; + }; + 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"; @@ -11782,8 +12013,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"; @@ -11866,8 +12097,8 @@ src = fetchFromGitHub { owner = "tom-tan"; repo = "cwl-mode"; - rev = "2fa8c8db68a8665ed555126975edd8749bcfc009"; - sha256 = "0zgnnvf8k5zcigykcf6slgcjmwb1l0jdfaqm19r34wp3md8wf0v1"; + rev = "bdeb9c0734126f940db80bfb8b1dc735dab671c7"; + sha256 = "0x9rvyhgy7ijq2r9pin94jz7nisrw6z91jch7d27lkhrmyb1rwk3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2309764cd56d9631dd97981a78b50b9fe793a280/recipes/cwl-mode"; @@ -11967,12 +12198,12 @@ cyphejor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cyphejor"; - version = "20171127.753"; + version = "20171231.2218"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "cyphejor"; - rev = "14838029b2d94878554308abd3a818a6536c5503"; - sha256 = "1rfhk60vwx2i3bmn98r5q0xgxr40a30z4pn4z9ms7qg2wlqi2vf4"; + rev = "d2faf26420ac16c4056f6eda067b845d33e102cd"; + sha256 = "0vg0n8xcqiv28i3xmnxzji77dbnyxrld4ncdzpa3hpc1j92s9a09"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad7cacfa39d8f85e26372ef21898663aebb68e43/recipes/cyphejor"; @@ -12013,8 +12244,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "f17ece062fb45e63f2fa56d857e1b72e58131482"; - sha256 = "0w6bbx8psyadb8k8ax3rczbp9vv33zz6ic0d5zqzxzdkblm2fbds"; + rev = "eb17d235aade6e338841bf4e53108e1a7c832190"; + sha256 = "1rf73qcyxf48pfxdrnr2bhqy8k5zj001dhixmg1d35z28cwx975n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -12156,12 +12387,12 @@ danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "danneskjold-theme"; - version = "20171124.1126"; + version = "20180129.634"; src = fetchFromGitHub { owner = "rails-to-cosmos"; repo = "danneskjold-theme"; - rev = "cb53f004ba30815174a4cfd3dced658b802100e1"; - sha256 = "1v8xfbb9bxy2px4ricq96zifybz0fs8xbasxwv9pm7kdxn3lgwli"; + rev = "13e5ea8758465e7d23081fbb524603394b09a689"; + sha256 = "1zhn2bblafmxc83rg33ipy8pd0i7qrn9630cy74bigl3x5zxs3xd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme"; @@ -12177,12 +12408,12 @@ dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }: melpaBuild { pname = "dante"; - version = "20171215.124"; + version = "20180125.116"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "4706339f7a4b089557a779296c15b5b8cb132053"; - sha256 = "10wb0khj300m21xbsn1y1l7qd7s8l246p74grxhwxdigj37zg8ra"; + rev = "5fb1765fcf5ac896c8d439d7f2d4030672e7509c"; + sha256 = "11nj1x9yxdkwvpsz7lkc9msgnkbzkrcw088nfryic9398mnrrccf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; @@ -12219,12 +12450,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"; @@ -12408,12 +12639,12 @@ dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash"; - version = "20171028.854"; + version = "20180118.743"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "91d8cb01e62bab0d6267d3d4dbcabd6da6fdea78"; - sha256 = "1q0nnn3j3fv6y3n14kql7gdf2vc038lbmnz542pma8q0yfksbkid"; + rev = "c1991d4c22f356be21df6b3badd7233a94df7937"; + sha256 = "14d4jlsymqsggdw12drf1qi7kwad9f43iswkyccr3jwg51ax00r7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash"; @@ -12450,12 +12681,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 = "c1991d4c22f356be21df6b3badd7233a94df7937"; + sha256 = "14d4jlsymqsggdw12drf1qi7kwad9f43iswkyccr3jwg51ax00r7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional"; @@ -12471,12 +12702,12 @@ dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }: melpaBuild { pname = "dashboard"; - version = "20170923.719"; + version = "20180110.1153"; src = fetchFromGitHub { owner = "rakanalh"; repo = "emacs-dashboard"; - rev = "8594c4f55448148b720eda5b72d51667fb7a8a39"; - sha256 = "1hhh1kfsz87qfmh45wjf2r93rz79rq0vbyxlfrsl02092zjbl1zr"; + rev = "e3fc28a6d3626c8cae9eb2e448b2f2e6b1a98f52"; + sha256 = "0kfdx5za610v3s8hmvy39gqn5w6xc8yljz6ybxzbg09byjinhxmn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard"; @@ -12534,12 +12765,12 @@ datetime = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "datetime"; - version = "20170928.815"; + version = "20180118.837"; src = fetchFromGitHub { owner = "doublep"; repo = "datetime"; - rev = "082d2c7b0e38c26a8c46af9c9956a2e100d88e71"; - sha256 = "0fdswqi53qx924lib7nd9dazn0916xf1ybrh3bcn3f8cn6b8ikg5"; + rev = "d99e56785d750d6c7e416955f047fe057fae54a6"; + sha256 = "0s2pmj2wpprmdx1mppbch8i1srwhfl2pzyhsmczan75wmiblpqfj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fff9f0748b0ef76130b24e85ed109325256f956e/recipes/datetime"; @@ -12576,12 +12807,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"; @@ -12849,12 +13080,12 @@ define-word = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "define-word"; - version = "20171125.25"; + version = "20180128.725"; src = fetchFromGitHub { owner = "abo-abo"; repo = "define-word"; - rev = "1e8e537c3b5b25e770c1b2f993497298405225b2"; - sha256 = "1phbyak6m97h2md0a8id5aqb5rmkpfw5259l2a7d87gk0lgkaqa2"; + rev = "06d094f070b5d675441f74e05a449ce4941529e8"; + sha256 = "0r0lihmkz802ik9qlbs41wfw86vj23mlm7z41zw8h845drxc8vl6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e318b30d8b2b89981f4b89d78e5a46e77d3de412/recipes/define-word"; @@ -12891,12 +13122,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"; @@ -13164,12 +13395,12 @@ diff-hl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "diff-hl"; - version = "20170709.2000"; + version = "20180123.1420"; src = fetchFromGitHub { owner = "dgutov"; repo = "diff-hl"; - rev = "bec9889de7bf48d28826039880cec9bfad24a628"; - sha256 = "0f9krv08jlw1sawjajdfy0cp5mzbq7hzvy478z8p54s1fwga6wxd"; + rev = "9ef21e4ea2389545417741e20a89d92bfd72d6ff"; + sha256 = "0fj4yjmvfbzqrcmngfbszvr1i8i17ap4lb99idyc9drgiq53xdw1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/diff-hl"; @@ -13185,12 +13416,12 @@ difflib = callPackage ({ cl-generic, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: melpaBuild { pname = "difflib"; - version = "20171204.2120"; + version = "20171227.718"; src = fetchFromGitHub { owner = "dieggsy"; repo = "difflib.el"; - rev = "850bfe991cec541d43127c48486bbd5f9c60b359"; - sha256 = "0wvmnvcmbbf0hkav07cf8rswcdf2yyl2f4i7xqagnkwx270y7hjz"; + rev = "b08850251812d71e62fd6956081299590acdf37b"; + sha256 = "03k5iy610f1m2nmkdk69p49fcfqfyxmy3h6fqvqsr2v1hix8i54a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/df1924ddff6fd1b5fa32481d3b3d6fbe89a127d3/recipes/difflib"; @@ -13349,6 +13580,27 @@ license = lib.licenses.free; }; }) {}; + dimmer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "dimmer"; + version = "20180124.1822"; + src = fetchFromGitHub { + owner = "gonewest818"; + repo = "dimmer.el"; + rev = "7dd76eb41f5684928365b28301412e8aff7235a9"; + sha256 = "14gf6z1pgy8rkxb2777yc7ng94y0yf3rppq3gfb98xfcl09ff06n"; + }; + 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"; @@ -13419,8 +13671,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "edea7534b36297211fe1c0e493220a5cc1bdec93"; - sha256 = "1g05r0krgyyj91digvd07vn6qi9m8yigj6w97bg8zgcsrxhlmc07"; + rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; + sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs"; @@ -13440,8 +13692,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "edea7534b36297211fe1c0e493220a5cc1bdec93"; - sha256 = "1g05r0krgyyj91digvd07vn6qi9m8yigj6w97bg8zgcsrxhlmc07"; + rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; + sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6aab23df1451682ff18d9ad02c35cb7ec612bc38/recipes/dired-collapse"; @@ -13566,8 +13818,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "edea7534b36297211fe1c0e493220a5cc1bdec93"; - sha256 = "1g05r0krgyyj91digvd07vn6qi9m8yigj6w97bg8zgcsrxhlmc07"; + rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; + sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter"; @@ -13587,8 +13839,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "edea7534b36297211fe1c0e493220a5cc1bdec93"; - sha256 = "1g05r0krgyyj91digvd07vn6qi9m8yigj6w97bg8zgcsrxhlmc07"; + rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; + sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils"; @@ -13713,8 +13965,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "edea7534b36297211fe1c0e493220a5cc1bdec93"; - sha256 = "1g05r0krgyyj91digvd07vn6qi9m8yigj6w97bg8zgcsrxhlmc07"; + rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; + sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow"; @@ -13734,8 +13986,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "edea7534b36297211fe1c0e493220a5cc1bdec93"; - sha256 = "1g05r0krgyyj91digvd07vn6qi9m8yigj6w97bg8zgcsrxhlmc07"; + rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; + sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open"; @@ -13776,8 +14028,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "edea7534b36297211fe1c0e493220a5cc1bdec93"; - sha256 = "1g05r0krgyyj91digvd07vn6qi9m8yigj6w97bg8zgcsrxhlmc07"; + rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; + sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow"; @@ -13793,12 +14045,12 @@ dired-ranger = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-ranger"; - version = "20160924.335"; + version = "20171229.753"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "edea7534b36297211fe1c0e493220a5cc1bdec93"; - sha256 = "1g05r0krgyyj91digvd07vn6qi9m8yigj6w97bg8zgcsrxhlmc07"; + rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; + sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger"; @@ -13814,12 +14066,12 @@ dired-sidebar = callPackage ({ dired-subtree, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-sidebar"; - version = "20171214.2022"; + version = "20180126.1812"; src = fetchFromGitHub { owner = "jojojames"; repo = "dired-sidebar"; - rev = "f33485a5feed660f93407f3d9dc9bf277483aa74"; - sha256 = "1vqsrwxlg64v4f6kmj5mw6vz82gkhw90q16qnd9sr03pr3si5nnm"; + rev = "6b2d1df460d4b0dd1448b092d3753314cba784c5"; + sha256 = "1i5ia9m7r63gr91ll9xmqq48y9823hg0mqq69rnzfvbw0zjbgkrq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30e15c8361b01195f198197e704828fbcac0e8d6/recipes/dired-sidebar"; @@ -13860,8 +14112,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "edea7534b36297211fe1c0e493220a5cc1bdec93"; - sha256 = "1g05r0krgyyj91digvd07vn6qi9m8yigj6w97bg8zgcsrxhlmc07"; + rev = "f0628fb58ae25563a5bba211f613f8bd7e23fabd"; + sha256 = "02dwazx62297wyyxxvb1zw2yz031lsw2h9kc1zgn63ra33kb4b2a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree"; @@ -13961,12 +14213,12 @@ direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "direnv"; - version = "20171205.227"; + version = "20171221.138"; src = fetchFromGitHub { owner = "wbolster"; repo = "emacs-direnv"; - rev = "80845b7a5da478514f2df90b09373e963bd785e1"; - sha256 = "0abidwyic6cflhx70j7jvlbpzyxzlxg4kdk8lxy8zwwciy4qw8rh"; + rev = "b1c14f307652e5a039165d196a799638feb16cd8"; + sha256 = "0vxa29z08idy74y0140c2ddxysj98d644zih9vvddjjmggj7czna"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv"; @@ -14066,12 +14318,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"; @@ -14569,12 +14821,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"; @@ -14653,12 +14905,12 @@ docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }: melpaBuild { pname = "docker"; - version = "20171121.2316"; + version = "20180107.925"; src = fetchFromGitHub { owner = "Silex"; repo = "docker.el"; - rev = "fc31c2b1aa8ef553050ace61beadf08ded58529c"; - sha256 = "0sx0iqwqfrkkjpx84w9cvhzgdsqd5lgc8y1akw689pc4pknl4x52"; + rev = "5a6e407ee9c6035245749ee1f249aed16d651728"; + sha256 = "0gl2rbx649yc4rbljmhdqsa17hnv24lpj5y8fxdh27gnjqksg2zq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker"; @@ -14749,8 +15001,8 @@ src = fetchFromGitHub { owner = "spotify"; repo = "dockerfile-mode"; - rev = "cd102cffa11a0557b1c04651e8cbd53fe01fbb92"; - sha256 = "01nz471zmj8gxvccyjk6mmwvijk7w6dqn45nhjxnkjb85np8iql0"; + rev = "4ab78f678e9ee40c7c5729dc8f1f5c1a847be2e7"; + sha256 = "0dc3pfqf6nrwnqsiyn49l0pgq7rm31kciwsqagnrjnc85nnbpf9m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1406f5a24115d29e3b140c360a51b977a369e4f9/recipes/dockerfile-mode"; @@ -14766,12 +15018,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"; @@ -14850,12 +15102,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20171214.1412"; + version = "20180128.2355"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-themes"; - rev = "5189ef50a0224c0557d6f604b93a58ee91727e7d"; - sha256 = "0hd8l1aalmvjvr2f92ragmirwyx949jg9fkk84f9xa07xg9wbipv"; + rev = "f7c05d390fa733ec7998025d407608fe9f67c111"; + sha256 = "18c3347n3x327qnpd0ab8j74zqs4yb5rn6gz0x2y8kknzzn4h76q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; @@ -14934,12 +15186,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"; @@ -15354,12 +15606,12 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "20171217.1155"; + version = "20180123.1100"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "6725079ebdea1d08100f33bd430ca3dba3598e81"; - sha256 = "1pk61dlw2m73bxk5sk1jnrbfq21msadka74sgssm4z02wbpvd48q"; + rev = "3bd7c23c3e4ac0936679ad6ebb68f14e37c7bc5d"; + sha256 = "0vnbp8q059z9bfhf1bq1n6cvc4ia3rkdk0iambgwd48i959mdsvs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump"; @@ -15794,12 +16046,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-hugo"; - version = "20171214.2243"; + version = "20180103.1855"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "1929ed8bcd837372a3681ce14ae3c1fe9c65d929"; - sha256 = "0yl1z6pryw51a95bs9ziradi06j1qbqvr8bbyrr40qvqi1iarhsd"; + rev = "62a79c5d359674c95719dd129260e4e1f6e760bd"; + sha256 = "084a99klm1lpjvsfls1m2zgwrh4wbwwj4fw7xb84qw5fzzy32ba1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -15815,12 +16067,12 @@ easy-jekyll = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-jekyll"; - version = "20171215.42"; + version = "20180108.559"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-jekyll"; - rev = "d894912cf65cf84244f27b1eb0186ad3344a661d"; - sha256 = "0sbyq2lcvkbxj9asm1yhpfqlvzx56r1g2qjymbari9j9lzhcdzsw"; + rev = "9a66d5c5dddac7d5b924df0c3bb414d3f797d8a5"; + sha256 = "0qx6lgpg2szjgy1a3a856klm7vh544braq8v2s7f81lq0ks2bjhj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll"; @@ -15899,12 +16151,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 = "3a7a9a66efed30416e2013da80fed2f79b91def1"; + sha256 = "0vxxswbx8l9jcv81akw1bd7ra4k51gjmv79z11fhbzf17n7y910a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal"; @@ -15941,12 +16193,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "20171110.1"; + version = "20180111.30"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "ab9596e03b749785919857f9785dc37c3c5dfc4e"; - sha256 = "0xn1dna7bwk5m144z53lpv0fxh5mg42gk8a7mgfz9d6yj890k33w"; + rev = "8c4735fbd7864a8420a16378ac2240fa60af5332"; + sha256 = "0g6prr8512dkr4mizqy1jkqc60w88i7kcx1lbarqi2mfkqdhhvg6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -16361,12 +16613,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 = "43ec7693bc7f36b5f497161ff3c4b27d2989c9dd"; - sha256 = "1kqv45p0h9xixks20d8fg5p1729gfv84rzijc8g4ls0j0n7a1ygm"; + rev = "f01f5775760d73a8b0975d8caf009c3b1e7b2229"; + sha256 = "1rri1h1ilhmyspp8krbqh2qz4f4wigmxk8kwvg39pr4mmma3dz4f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d98d69008b5ca8b92fa7a6045b9d1af86f269386/recipes/edit-server"; @@ -16604,8 +16856,8 @@ src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "0c8b8395b8c1b7bb28cc5945d7ca60d59299c5cf"; - sha256 = "187kl6gbqkiy99lnxrwbjgplmh66q2pyfag0yh83zqd5x79q7az1"; + rev = "5eeb1b8c8d8e2f394724700f930c9063b9fd279d"; + sha256 = "1kx574bqjsgcri40qhkw8p2rg0rvcbwhbrmiyd5znprk5pz5x1ps"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -16621,12 +16873,12 @@ ego = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: melpaBuild { pname = "ego"; - version = "20170601.817"; + version = "20180123.2256"; src = fetchFromGitHub { owner = "emacs-china"; repo = "EGO"; - rev = "93ccd450d2d9e5db27aebb024a1b2ed56d5131dc"; - sha256 = "0izxsckmkdw70cz3ljar2r4iv784c43mnzjkayly08hlabq1g6b6"; + rev = "ec91e8234e2b8fbfd37b6135dfda352a923c556e"; + sha256 = "1m98zkmyy1bbcz7jpa15in9kdgskl3l498q7a9vxpr8w2scq3cls"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ego"; @@ -16641,15 +16893,15 @@ }) {}; eide = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eide"; - version = "20170906.1216"; + version = "20171229.1435"; 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 = "faae6f1384826d18f70b28826dc528d70e91a5c9"; + sha256 = "02hylmgs6il59kkq59i9lpdg9gdirpb2y37xzybh7n5lqyzdafai"; }; 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 = []; @@ -16682,12 +16934,12 @@ ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, s, skewer-mode, websocket }: melpaBuild { pname = "ein"; - version = "20171128.516"; + version = "20180124.1435"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "1bd6155005ee9749e51bcc8232c80690484c8ca2"; - sha256 = "1cawqhb5ii3mq5i26v1lcwgf9hb4c96j76843zii9iy4b22qs7b6"; + rev = "63388e5d0cf318bdb687054e2de4a4205108ed73"; + sha256 = "0c1pd2d0yv0d4zclh6ri1mwcj1pa7bxbf376kwia4rz400jx5fah"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -16755,12 +17007,12 @@ ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, direx, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }: melpaBuild { pname = "ejc-sql"; - version = "20171205.530"; + version = "20171227.259"; src = fetchFromGitHub { owner = "kostafey"; repo = "ejc-sql"; - rev = "a7118493f1bcf78c5c3e9808b786387af9df9264"; - sha256 = "15sgf9nfdpbg0v8gr70xvfavgjcw536xkgavdh5bb59fzwakvfn2"; + rev = "afb3e6f1e82abec5407c7a3335bf1c70fa3690d6"; + sha256 = "0q8c35jnxgxmbbbpz4iv3x45ylckq4qi0pq05am5rf5rywlw00v1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql"; @@ -16805,12 +17057,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 = "32d6f967bf15077c7de74b0aece7f0fa57a486cb"; - sha256 = "0w76zvn9fdwyqb58830b6z6kr67vkw6zbq7hv1k96r070fxpq8f8"; + rev = "67dcb92c972f67f81c0667ee95d97f05eaa1907b"; + sha256 = "0yhcpcp22n4mj8yq2m9p020mzcmjcv3fb1vw7bnbz8qc42g58xai"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; @@ -16949,22 +17201,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; @@ -17075,6 +17327,48 @@ license = lib.licenses.free; }; }) {}; + elbank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: + melpaBuild { + pname = "elbank"; + version = "20180125.823"; + src = fetchFromGitHub { + owner = "NicolasPetton"; + repo = "Elbank"; + rev = "0b39f801ff614dd2cf36532ed12327138ac36682"; + sha256 = "1yk9mbjcw13lh8cwmwwq6i9ma5hrv7aiqwfsj0rn4x9vygsxwhgi"; + }; + 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; + }; + }) {}; + elcord = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "elcord"; + version = "20180125.659"; + src = fetchFromGitHub { + owner = "Zulu-Inuoe"; + repo = "elcord"; + rev = "8fe9c8cd6b5f32aab28fa4e12e3af2c113c7c0eb"; + sha256 = "0ka732ij7ahrqx6xm6s7yncazlpw530ck9dxy06m2rax7gfm6l51"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/36b64d0fead049df5ebd6606943a8f769324539e/recipes/elcord"; + sha256 = "044mwil9alh2v7bjj8yvx8azym2b7a5xb0c7y0r0k2vj72wiirjb"; + 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"; @@ -17096,24 +17390,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 = "20171218.233"; + pname = "eldoc-overlay"; + version = "20171219.140"; src = fetchFromGitHub { owner = "stardiviner"; - repo = "eldoc-overlay-mode"; - rev = "c11fedba9901f4f4ae5f76f48fd1eb150c31af35"; - sha256 = "1jbvgimkb3454vhljzznvas1ahq7nqkb35rci97gw8vvvjd08gc9"; + 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; }; }) {}; @@ -17141,12 +17435,12 @@ electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: melpaBuild { pname = "electric-operator"; - version = "20171218.226"; + version = "20180114.1000"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "electric-operator"; - rev = "fc46fbe25c1622aa92177788f23686772346c2af"; - sha256 = "1xrhapnyp4q77m824rhs3yhzairziw1y9fs8v810akhrikhjm3zr"; + rev = "63661980cef82a8032108f5ce14d5bd4f44d1255"; + sha256 = "1wanfvhx3wv3iych0v93kaxapg86vzgbsd8l7r460s8l2nl5yybr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator"; @@ -17225,12 +17519,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "20171212.1613"; + version = "20180127.1442"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "fb3fbf1a2c003962d5e22124c7a1ffae4356acaf"; - sha256 = "02frzbxifgfxcdy3xhj9v1mzbkxrww3wpvgq724kn5d9wmg5rm1n"; + rev = "e2b0e255fc3a3cb3e9d69c05df3b8e9d7ca70e86"; + sha256 = "1sq2w40ac8nc6pvifl0r5ri255jcd237x5rxfliwd2wdwqhk9izd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -17274,12 +17568,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"; @@ -17316,12 +17610,12 @@ 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 = "fb3fbf1a2c003962d5e22124c7a1ffae4356acaf"; - sha256 = "02frzbxifgfxcdy3xhj9v1mzbkxrww3wpvgq724kn5d9wmg5rm1n"; + rev = "e2b0e255fc3a3cb3e9d69c05df3b8e9d7ca70e86"; + sha256 = "1sq2w40ac8nc6pvifl0r5ri255jcd237x5rxfliwd2wdwqhk9izd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -17439,22 +17733,22 @@ 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 = "20171211.1100"; + version = "20180111.1431"; src = fetchFromGitHub { owner = "Wilfred"; repo = "refs.el"; - rev = "ae5abe0821fca407c3bd6f705fe277390e966269"; - sha256 = "0cg0x7abj7sgrxdv2ccy31r4nqv0xdjvm3z0cqjajj0bkrmbmm81"; + rev = "eee751a6120f925cdffcfbb6a4545e599b953e94"; + sha256 = "01gckl8fwmwr5kp1qy4dcmvm7dh4677brwjy4xpqwhiq094fw9b1"; }; 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; @@ -17547,12 +17841,12 @@ elm-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, seq }: melpaBuild { pname = "elm-mode"; - version = "20171114.1225"; + version = "20180114.9"; src = fetchFromGitHub { owner = "jcollard"; repo = "elm-mode"; - rev = "a01626ce462fffc11af1f7e64f6d520e363157f9"; - sha256 = "0v2c7h7j5y9mjvgwi7ki5pz8w9d2xcvab6s5i21yb5a6lihm0gma"; + rev = "09c6e62e14a2c9afaad03a867c7a268b6bc68ab0"; + sha256 = "0vc0m5rg9py01w07pifg3fp2z9cna6y21k2xmfns7p6i5c5fjj2g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode"; @@ -17757,12 +18051,12 @@ elpa-mirror = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elpa-mirror"; - version = "20171012.15"; + version = "20180113.2321"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "elpa-mirror"; - rev = "f4a84f71368dc343d09093312d1b2c2e9a5a3987"; - sha256 = "07j3bsv3vinpkxxbw4fyfgb5jb1kcd068821l59pk9yrw145kb96"; + rev = "3fedb1ca6f84cdbfc27723d6906b67a0e2ca2972"; + sha256 = "087sa553aqyphrdrn8clb8pjl609aw3qkmim47hvnq8npzvhhr0l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d64ce7042c45f29fb394be25ce415912182bac8b/recipes/elpa-mirror"; @@ -17778,12 +18072,12 @@ elpy = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "20171218.604"; + version = "20180119.54"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "66b08a58a46a5661b863c2b4fcc550ad81404f88"; - sha256 = "1d07sfkad8grz6zg6fxg7fz5xqbqzqmbzbfdgd7hjbpf54y9mrvy"; + rev = "1fc5e18c3e26f085167201147f9fe2bfb6fd167a"; + sha256 = "03a1nai4l7lk7kh196wvpxnmhqvmqv6jkqgkr9jqk326k2d5mwnp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -17804,6 +18098,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"; @@ -17996,12 +18311,12 @@ elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elx"; - version = "20170805.449"; + version = "20180129.124"; src = fetchFromGitHub { owner = "emacscollective"; repo = "elx"; - rev = "9f5d593b65686e8da29ef79457c8f6fc061af7e5"; - sha256 = "1vs7nmsi82gv9mw1mia6ri1vmn26ldwnj8akirqgq31rfgyfj4vh"; + rev = "09bbb07688c0c14130c5e38837aa26b8d607829d"; + sha256 = "0623fzyjjx08i98zmxpq4mcamr83jqj76nfn8ck0ql9k3bss1zlv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/elx"; @@ -18098,85 +18413,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 = "20171218.1903"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "1de10e8ad4c225d80e29fdc84ae34ba0ac055d8f"; - sha256 = "155gyc9rjcccf2j1a1c7jsv0ayn3dn82w6qbgf0is457f2j7lfxq"; + rev = "62d39157370219a1680265fa593f90ccd51457da"; + sha256 = "0ghl3g8n8wlw8rnmgbivlrm99wcwn93bv8flyalzs0z9j7p7fdq9"; }; 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 = "1de10e8ad4c225d80e29fdc84ae34ba0ac055d8f"; - sha256 = "155gyc9rjcccf2j1a1c7jsv0ayn3dn82w6qbgf0is457f2j7lfxq"; + rev = "62d39157370219a1680265fa593f90ccd51457da"; + sha256 = "0ghl3g8n8wlw8rnmgbivlrm99wcwn93bv8flyalzs0z9j7p7fdq9"; }; 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 = "1de10e8ad4c225d80e29fdc84ae34ba0ac055d8f"; - sha256 = "155gyc9rjcccf2j1a1c7jsv0ayn3dn82w6qbgf0is457f2j7lfxq"; + rev = "62d39157370219a1680265fa593f90ccd51457da"; + sha256 = "0ghl3g8n8wlw8rnmgbivlrm99wcwn93bv8flyalzs0z9j7p7fdq9"; }; 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 = "20171218.526"; + version = "20180128.1252"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "1de10e8ad4c225d80e29fdc84ae34ba0ac055d8f"; - sha256 = "155gyc9rjcccf2j1a1c7jsv0ayn3dn82w6qbgf0is457f2j7lfxq"; + rev = "62d39157370219a1680265fa593f90ccd51457da"; + sha256 = "0ghl3g8n8wlw8rnmgbivlrm99wcwn93bv8flyalzs0z9j7p7fdq9"; }; 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; @@ -18374,11 +18689,11 @@ emms = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms"; - version = "20171215.1502"; + version = "20180103.520"; src = fetchgit { url = "https://git.savannah.gnu.org/git/emms.git"; - rev = "de28c9389f1d347e2d6ee7329d6fcb3aac274a28"; - sha256 = "07fyjzp7gyd8q69ay0fpb1h9mh36np1vl1c5zbvv4gr39cn881n4"; + rev = "3a8d16d91edae81ffb2bb9efa12d41712edfd4f8"; + sha256 = "1cwsjrjasb2gi28aavy64g4sg9wwfq3wab24klssh3290qrr3gkb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms"; @@ -18391,6 +18706,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"; @@ -18646,12 +18982,12 @@ emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }: melpaBuild { pname = "emojify"; - version = "20171018.744"; + version = "20180128.607"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "emacs-emojify"; - rev = "001c3adcc521223f6b53a2243635528b2cb7f7e8"; - sha256 = "0hsrlzx8bslzhpipryxxqrdaiw66cgak14p8v47l0ylvwmxxqn13"; + rev = "8d89c10a5eb975544f8475261e758de390d141ba"; + sha256 = "1aa9kvfq6vh5rjwg5hif9lc7c886893f9ayl5nqgpxcdjvlpnvc9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify"; @@ -18805,12 +19141,12 @@ enh-ruby-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "enh-ruby-mode"; - version = "20171212.1249"; + version = "20180123.1835"; src = fetchFromGitHub { owner = "zenspider"; repo = "enhanced-ruby-mode"; - rev = "4f43eab67a9afb91b0408221d478dcb98131478f"; - sha256 = "0ahvsazrdlwfz0imsfvnhv1f58m7cnib8fzbffdjvvwmmc9g511y"; + rev = "989f7191078c8c1c46921167f5f96119fad930a5"; + sha256 = "167b34cgp5f7nfrcp9jn8phzs125jx8mkbni8yshfb5i2mf7g0ml"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode"; @@ -19002,12 +19338,12 @@ epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epkg"; - version = "20171217.1405"; + version = "20180112.457"; src = fetchFromGitHub { owner = "emacscollective"; repo = "epkg"; - rev = "af249c6980b25daf9ad98d3f400fe3539438c20e"; - sha256 = "18wdpv0nisi9j328irjl7hbyn6j4y8yp5pzbwbpb1pbxyrq1as3g"; + rev = "c8ab0e5e1fda70113633ac6ee01c0aaecd8a1a99"; + sha256 = "0kf1gcyfmh7zids4q2jwz6b0kffdhalfqx9ibk11adla8sf6bvj0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg"; @@ -19023,12 +19359,12 @@ epl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epl"; - version = "20150517.433"; + version = "20180127.351"; src = fetchFromGitHub { owner = "cask"; repo = "epl"; - rev = "83797835f729f39b80acba4c7e83d73a2e410e26"; - sha256 = "1rgxvmz9nv7922c30xz8ax3cwj8mmwxfni3xjwnhpfa744in4441"; + rev = "28af1ab1217c46367ab5f29d72a57fcc6d9cd45e"; + sha256 = "0hgqhzgbsi3gmnj0809mh1mqib4yrx16ibyn8j0h7v02dms4pk9q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c6cf24e86d8865bd2e4b405466118de1894851f/recipes/epl"; @@ -19211,12 +19547,12 @@ erc-image = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erc-image"; - version = "20170909.312"; + version = "20180118.739"; src = fetchFromGitHub { owner = "kidd"; repo = "erc-image.el"; - rev = "15805aa7ed4b13eeaaa4ec294443ef0f9d21c0c2"; - sha256 = "0ja8iv4wp58xab190mf3pj1bbaz25w8pvns03ayajzrflpkhjs79"; + rev = "0fcfe9283f75ec657d513c901c35cdbd48c8d2b5"; + sha256 = "1byxpz6v272ilkbxf2br8qksczq7s7l1vjbcvwsii68r7s7lf1yl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/erc-image"; @@ -19271,6 +19607,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"; @@ -19547,12 +19904,12 @@ erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20171117.243"; + version = "20171219.305"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "2aa6311f09a344b6631c986b65f58bf641f6a9b0"; - sha256 = "15w8m097kmfryvpvsyhws1h3nr9xfj5358br7q862rsswci17ady"; + rev = "fc6eb93ae081ac5ebf715e53d0d2519067fcea95"; + sha256 = "07fizaia7pvq4fzjmw7461qn4mkl0346377mr2nqnva1h8r48mz7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -19714,12 +20071,12 @@ es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, spark }: melpaBuild { pname = "es-mode"; - version = "20171130.941"; + version = "20180126.711"; src = fetchFromGitHub { owner = "dakrone"; repo = "es-mode"; - rev = "99338793d873a1494b1418a84f2d49b815cad8bc"; - sha256 = "1qqz19y9kay4ip6c4d4lr0s7n1kzr41xncdym2jgp49ps8b0i335"; + rev = "8c1c601a72fbc9b0e0a80974856abfc679843c86"; + sha256 = "0ppci48cz453ivkd37zbs3sgan0v7nf9d65qy77zvkn55qn2f4bq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9912193f73c4beae03b295822bf41cb2298756e2/recipes/es-mode"; @@ -19795,6 +20152,27 @@ license = lib.licenses.free; }; }) {}; + esh-autosuggest = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "esh-autosuggest"; + version = "20171223.1855"; + src = fetchFromGitHub { + owner = "dieggsy"; + repo = "esh-autosuggest"; + rev = "aa921f8975b0f95d1cb0044e6ad7f17529261610"; + sha256 = "19qhpvw5y7hvkqy8jdyrnm4m90jdxxdiaabcrjiwxmkzq3wgnx8q"; + }; + 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-buf-stack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esh-buf-stack"; @@ -19966,12 +20344,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"; @@ -20155,12 +20533,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20171204.1404"; + version = "20180128.1545"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "8a5cefe1bfec7c76d03332c4f6dfc224ad4bc61b"; - sha256 = "1p0j7s1vz184l4100gri8x8g453x43k5fmfp3pkvlgifny1vf26a"; + rev = "ec2c2f5649d01071ce9a7079072ef415f9426149"; + sha256 = "0sp1q6wrv3q0w8rlhj390v2584mdwswznj0nyp42bf8qdb74ba87"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -20323,12 +20701,12 @@ eterm-256color = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, xterm-color }: melpaBuild { pname = "eterm-256color"; - version = "20171216.1314"; + version = "20171221.1837"; src = fetchFromGitHub { owner = "dieggsy"; repo = "eterm-256color"; - rev = "249b1cbc4a94fd87bb341f0d9cb884bc416dda13"; - sha256 = "0rc1l84b54y97l0iiq0m85hlsl41gdspy33ja8zs5f5p8klj5rn5"; + rev = "a5560abfa81242dc45ab0342e41e33f6c7e6bc1e"; + sha256 = "0md53lhpxh1yqirfjgx8fq8vsh5zbl2v2hn63nkyh60rv3sc4jkm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e556383f7e18c0215111aa720d4653465e91eff6/recipes/eterm-256color"; @@ -20512,12 +20890,12 @@ evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: melpaBuild { pname = "evil"; - version = "20171214.948"; + version = "20180126.1159"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "9cf97b66f42734d41cb182ce69abf759bad84cd5"; - sha256 = "0y2n6k3rvpsdca8qwlp1fjyyv1yj894n7znyf1kpnqpaxjiqv79p"; + rev = "2992858748e6fe8ae706d182b86b684e7b9be8b9"; + sha256 = "18jyqf1k7b09j0q1sxavqyqyx21msbqklia83kbrn51wbhy70k49"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil"; @@ -20656,6 +21034,27 @@ license = lib.licenses.free; }; }) {}; + evil-collection = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-collection"; + version = "20180128.1213"; + src = fetchFromGitHub { + owner = "jojojames"; + repo = "evil-collection"; + rev = "52462cb8bfc523f93e20aede2d1936c32fdf14b2"; + sha256 = "0h01pa5zwh3jf7kfdl4vy5f8lcv147m1pcsmkmkg51qn520qr7f7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d7538c9eb00b6826867891b037e7aa537ac5b160/recipes/evil-collection"; + sha256 = "0wxx6x9lxlnxaa3i36gj4nad3q8c25mbw17bp4aa0agh43yk4bgn"; + name = "evil-collection"; + }; + packageRequires = [ 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"; @@ -20701,12 +21100,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"; @@ -20810,8 +21209,8 @@ src = fetchFromGitHub { owner = "edkolev"; repo = "evil-expat"; - rev = "152fdfacea2847d438cdd4e83779fe5a57edfde2"; - sha256 = "15lmv74nd9z87q09pg8dqfr94kmxbzd6a30dnadz3xv3sfvaqkv4"; + rev = "ff443637fc514813ed3139d99950391189a9360a"; + sha256 = "1w1yj0avg54gl7a143ib3rszi0a6arrvcb3s8j5pjr4hs7sy9jbd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f08f6396e66479eb9510727968c5bb01ac239476/recipes/evil-expat"; @@ -20890,12 +21289,12 @@ evil-goggles = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-goggles"; - version = "20171209.15"; + version = "20180116.653"; src = fetchFromGitHub { owner = "edkolev"; repo = "evil-goggles"; - rev = "b620c7512c69ffaffe6088703a4530f1cb5f6fba"; - sha256 = "03g6yrrcfc8f2vbiysia0gxgnsy15i9c4iqvbiwpi93y5jj40lzy"; + rev = "a1a62d2b562b9fc2172868e3b172207948d84bbf"; + sha256 = "1h999mqc84dfq2ysy2n0g2cbrqp2va41z2pdga54imfy899p7hmb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/811b1261705b4c525e165fa9ee23ae191727a623/recipes/evil-goggles"; @@ -21121,12 +21520,12 @@ evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-matchit"; - version = "20171127.245"; + version = "20180129.401"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-matchit"; - rev = "ceb13ad1b34eb0debe2472c024841bdddce9e593"; - sha256 = "1wal8kwz1gx0cw1a91rf0d9wl490kjiilv6kwd779zf5041hnhwf"; + rev = "50bb88241983f0bf06d35a455a87c04eddc11c83"; + sha256 = "1qn5nydh2pinjlyyplrdxrn2r828im6mgij95ahs8z14y9yxwcif"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit"; @@ -21289,12 +21688,12 @@ evil-org = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-org"; - version = "20171203.1211"; + version = "20180116.1347"; src = fetchFromGitHub { owner = "Somelauw"; repo = "evil-org-mode"; - rev = "5c01f573920e4794f812c30e7fd8f0bfb9734286"; - sha256 = "1ghiyc3shp8185plh0a7ayqdmijgwbrm3jm54sqfxihgz2mkfy1r"; + rev = "491b0b302b95d44ceb73d291dedbb9d5517ccee2"; + sha256 = "04lyp4z0vr8imjwrqc88d1pdpl86wgwn19vzl6256yl63xaipvf2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1768558ed0a0249421437b66fe45018dd768e637/recipes/evil-org"; @@ -21370,6 +21769,27 @@ license = lib.licenses.free; }; }) {}; + evil-replace-with-char = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-replace-with-char"; + version = "20171223.906"; + src = fetchFromGitHub { + owner = "ninrod"; + repo = "evil-replace-with-char"; + rev = "b08293f380ca8809ef12df572d37f977bed0ae52"; + sha256 = "05d505scnmhplaqrcj7fpb107bfgh4zpxrrq942nn035yw07yjjx"; + }; + 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"; @@ -21496,15 +21916,36 @@ license = lib.licenses.free; }; }) {}; + evil-string-inflection = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, string-inflection }: + melpaBuild { + pname = "evil-string-inflection"; + version = "20171225.1815"; + src = fetchFromGitHub { + owner = "ninrod"; + repo = "evil-string-inflection"; + rev = "ac261bee68444c2cb9aaab25b58509e8f58efe35"; + sha256 = "1b9h7qpmaqwcdj742y76hrs31l7z9aynih9mkwdcnx5fi2a649la"; + }; + 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 = "20171210.838"; + version = "20180102.601"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-surround"; - rev = "6e1da767ec7f8e6dca41b2a97edd7c1be9752ffa"; - sha256 = "1kaip002hsx9a6sd9nhm5ik895zlymq6m9w1n109rmyw75i0fyyn"; + rev = "5a20c9757eff64e1567d313eb254126aef2bf3b2"; + sha256 = "094vz707iyjknmhmhdlzc8sv8x86yxgx863c23nm6fjn5n5h7jmz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9dc47a4c837c44429a74fd998fe468c00639f2/recipes/evil-surround"; @@ -21583,12 +22024,12 @@ evil-test-helpers = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-test-helpers"; - version = "20171122.1206"; + version = "20180109.1040"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "9cf97b66f42734d41cb182ce69abf759bad84cd5"; - sha256 = "0y2n6k3rvpsdca8qwlp1fjyyv1yj894n7znyf1kpnqpaxjiqv79p"; + rev = "2992858748e6fe8ae706d182b86b684e7b9be8b9"; + sha256 = "18jyqf1k7b09j0q1sxavqyqyx21msbqklia83kbrn51wbhy70k49"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers"; @@ -21918,12 +22359,12 @@ exotica-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "exotica-theme"; - version = "20171216.2121"; + version = "20180119.441"; src = fetchFromGitHub { owner = "jbharat"; repo = "exotica-theme"; - rev = "ffc8a34742efa90d09b6d8e883e820cf02f0e9d1"; - sha256 = "1cxrv3kbjx2s5a652wv0if02215ap4vk2cjzm8an0r6nfvfjclsi"; + rev = "aca4fb0a6e460317ea1a04bdcb3e5175d30dc172"; + sha256 = "14iwsd1dck3pfa6hh2griwd3y02b432wi2pkknckzp61s912iz0y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9182f92dd62e2f1775a76699a6c8f9c3e71e9030/recipes/exotica-theme"; @@ -22023,12 +22464,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"; @@ -22062,6 +22503,27 @@ 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"; @@ -22178,12 +22640,12 @@ f = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "f"; - version = "20171119.723"; + version = "20180106.122"; src = fetchFromGitHub { owner = "rejeep"; repo = "f.el"; - rev = "595519ea07d6ff49e5cb1cbd442eb689f9142ed1"; - sha256 = "1nxkfya6bwn0bmiwcq5q68qpyhkdsc9b4n75vav06nn7w1k5y3gv"; + rev = "de6d4d40ddc844eee643e92d47b9d6a63fbebb48"; + sha256 = "1a47xk3yp1rp17fqg7ldl3d3fb888h0fz3sysqfdz1bfdgs8a9bk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/f"; @@ -22199,12 +22661,12 @@ f3 = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "f3"; - version = "20170728.1120"; + version = "20180109.2042"; src = fetchFromGitHub { owner = "cosmicexplorer"; repo = "f3"; - rev = "1ed0ac4368a9f631f6dfad7ad17e9f7434a42bd6"; - sha256 = "03crpcb1jbbc12nz912qdkipmm94xlrpzr2cgckya0cj8sdgv9fz"; + rev = "f896674c527f41fac8faea2ddeafb2757c7b9766"; + sha256 = "0w605iw5p4z8jzvzq0608jpcp0hdk9x48w1rvqz9hmjncsi3af8s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b40de62a82d6895a37ff795d56f7d0f783461e6/recipes/f3"; @@ -22511,6 +22973,26 @@ license = lib.licenses.free; }; }) {}; + faustine = callPackage ({ emacs, faust-mode, fetchgit, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "faustine"; + version = "20171122.402"; + src = fetchgit { + url = "https://bitbucket.org/yphil/faustine"; + rev = "07a38963111518f86123802f9d477be0d4689a3f"; + sha256 = "0dj35hwkm5v8758c4ssl873vkvplba5apjsh7l23nsmnzdji99zg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d7a6fc9f99241ff8e3a9c1fb12418d4d69d9e203/recipes/faustine"; + sha256 = "1hyvkd4y28smdp30bkky6bwmqwlxjrq136wp7112371w963iwjsb"; + name = "faustine"; + }; + packageRequires = [ emacs faust-mode ]; + meta = { + homepage = "https://melpa.org/#/faustine"; + license = lib.licenses.free; + }; + }) {}; fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fcitx"; @@ -22743,12 +23225,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "20171217.332"; + version = "20180125.1859"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "31ebfd65d254904ba3e5ec96507c0b01d7768940"; - sha256 = "1xy7a6crng5x7k0x810ijrm882gm597ljwzi4cj2i93js625cw2b"; + rev = "7be14de3c737e70606d208d8d443b89e58cd646d"; + sha256 = "1sdnyqv69mipbgs9yax88m9b6crsa59rjhwrih197pifl4089awr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -22971,6 +23453,27 @@ license = lib.licenses.free; }; }) {}; + firrtl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "firrtl-mode"; + version = "20180122.1950"; + src = fetchFromGitHub { + owner = "ibm"; + repo = "firrtl-mode"; + rev = "285f5c18722de98fd3dae195a2bd653497cf7daa"; + sha256 = "1a4dhx2dv7ld14jn4r941w5mdrh085nxnlc1w93r93h13fj352q3"; + }; + 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"; @@ -22995,12 +23498,12 @@ fish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fish-mode"; - version = "20170430.623"; + version = "20180117.1847"; src = fetchFromGitHub { owner = "wwwjfy"; repo = "emacs-fish"; - rev = "888d037008272f6001207a2990e51ba87fe187e6"; - sha256 = "1r2clxm68nq8jhgc5cly51i6axjmi720r5m34dhf6zblwib4lfdp"; + rev = "276db7de3c86411fbe3117f30272c5882b24a69e"; + sha256 = "04srqfndhm6f190l7jfcswhd84xkw6vi09s6kv8bjwrk8iiy3qm9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/efac97c0f54a3300251020c4626056526c18b441/recipes/fish-mode"; @@ -23016,12 +23519,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 = "e053fcc641f1f835f2fdb71143e095c1889b8233"; + sha256 = "1w8vv2ijmsch02xsc1r97r6s3jz0dkd8kwz5wgiizq5ghx7x6x6j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d31f907997d1d07ec794a4f09824f43818f035c/recipes/fix-input"; @@ -23058,12 +23561,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 = "3e3339f5d44dd8be100cec1c88bcaefd328a2bde"; + sha256 = "0hd5bhq57qgabs881xfrz1v1n8sp1nv2hrfs386dx7g5b3ancr0i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/22636390e8a15c09293a1506a901286dd72e565f/recipes/fix-word"; @@ -23295,12 +23798,12 @@ flim = callPackage ({ apel, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flim"; - version = "20161210.1728"; + version = "20180118.522"; src = fetchFromGitHub { owner = "wanderlust"; repo = "flim"; - rev = "3510d32e5820b2c22b4e9c9f29177beea42c5bfb"; - sha256 = "0ggr8fkzwa6k0i7gl41qxkvkvnzpqzbhnd6klbk6j6j0rw1pmgn8"; + rev = "e969ab24f729835b6f8dd71d57cee1aff345f959"; + sha256 = "1gs3f2dvqh0pfc2mdz00l66wm4hsl2qb7pz29r5yfzjbk5inwqry"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94faf56ff9bf94f51ef5253e4c4244faec5eecfd/recipes/flim"; @@ -23379,12 +23882,12 @@ flow-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flow-minor-mode"; - version = "20171207.952"; + version = "20180104.1348"; src = fetchFromGitHub { owner = "an-sh"; repo = "flow-minor-mode"; - rev = "640a99bdc5f5d484a546c41800255cd43ff710e6"; - sha256 = "04lwjn7zykfq5ygivs5j0d6qc9h99jzzq5jkrkxp7m4q6y8pb6vx"; + rev = "50dded94ad201fdc9453656a8b15179981cd5acd"; + sha256 = "1vaqml0ypbc14mnwycgm9slkds3bgg6x5qz99kck98acbcfijxk6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66504f789069922ea56f268f4da90fac52b601ff/recipes/flow-minor-mode"; @@ -23425,8 +23928,8 @@ src = fetchFromGitHub { owner = "lewang"; repo = "flx"; - rev = "ae0981b253b17b52dec666e2f739f889e7952291"; - sha256 = "0csflhd69vz3wwq5j7872xx2l62hwiz1f5nggl5nz7h7v9anjx3r"; + rev = "9c5cb5de0202b4eaac9359c84ca7ce9cbd7ee835"; + sha256 = "0i7pj4l0ilihvkgal8d71idy5jr9zwanzxch350pg4myr6j1hnad"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63bdf3ae2f861e333a8f9c5997f5cc52869d3b3a/recipes/flx"; @@ -23442,12 +23945,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 = "9c5cb5de0202b4eaac9359c84ca7ce9cbd7ee835"; + sha256 = "0i7pj4l0ilihvkgal8d71idy5jr9zwanzxch350pg4myr6j1hnad"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63bdf3ae2f861e333a8f9c5997f5cc52869d3b3a/recipes/flx-ido"; @@ -23463,12 +23966,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"; @@ -23484,12 +23987,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20171214.1215"; + version = "20180123.1419"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "6bc54f00666d14197cb8685b42dbd49e19c82ec8"; - sha256 = "0wdmwiy9fd5lbxdp2iix3krb7ia0aly8n5bwxap1pmrl2anjzik9"; + rev = "31122714e1971d8403d9daf5815482bf5118c94d"; + sha256 = "0ag0ffh4lnnsiqfplnjlwd7lnvz3zjnw68a2pf17jgx28jwdqz64"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -23698,8 +24201,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"; @@ -23782,8 +24285,8 @@ src = fetchFromGitHub { owner = "crystal-lang-tools"; repo = "emacs-crystal-mode"; - rev = "5ffeae2b5798543ca0a2dc747e397359949850d1"; - sha256 = "1gvkv6z3dgqbkrkzyxlhz7hk38b9jkmazncw6mwxd2lvrwhkhywr"; + rev = "0fe6815201bebe4c5ff6857bd541d95b05132b10"; + sha256 = "0r75dvc0jqcqi1qjns8zj132dnm0s6mvqlqynkis16nigbawix8m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c718f809af30226611358f9aaed7519e52923fd3/recipes/flycheck-crystal"; @@ -23967,12 +24470,12 @@ flycheck-dmd-dub = callPackage ({ f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-dmd-dub"; - version = "20170816.648"; + version = "20180119.1220"; src = fetchFromGitHub { owner = "atilaneves"; repo = "flycheck-dmd-dub"; - rev = "5a2e65fbae90e1dd69cfa78e4af0bda25c7db973"; - sha256 = "1zh6yb5snjrp09zh24fip97pqq7vk472g8nmjjqk0iq8m9i8sphs"; + rev = "d4f6fde2ce5cbdbfef44b68affee394c9c891a1c"; + sha256 = "11wg0mgrw2sphfr8dm27x500lyw6lkf94yk8nmlxx2fb2ns1nlyk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a812594901c1099283bdf51fbea1aa077cfc588d/recipes/flycheck-dmd-dub"; @@ -24132,15 +24635,36 @@ license = lib.licenses.free; }; }) {}; + flycheck-gradle = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-gradle"; + version = "20180121.2251"; + src = fetchFromGitHub { + owner = "jojojames"; + repo = "flycheck-gradle"; + rev = "f8c7ec0abdd77f35c5a9a653f8a80acea717b014"; + sha256 = "11lsk5mw2fkx81vd9r2xychh4nwadi516mpg8hr0ibh154p4ql6z"; + }; + 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 = "20180125.1531"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-haskell"; - rev = "ff21330a5a7db4e42d6ccf4410ef4a3231e5f19a"; - sha256 = "0vdm6bmvqvf5s7cvadkl0l88cza429xcy21icv55ii5iw1k4hywf"; + rev = "f97cefa9b69235bdc9a406c54d223ea26fb33107"; + sha256 = "1kcm0lssjb5lqx556sxxw1v1pvp7hybw38a4sva2s0is3w9pxl1y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ca601613788ae830655e148a222625035195f55/recipes/flycheck-haskell"; @@ -24282,12 +24806,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"; @@ -24384,6 +24908,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-mmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-mmark"; + version = "20180118.328"; + 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-mypy = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-mypy"; @@ -24450,12 +24995,12 @@ flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-objc-clang"; - version = "20171014.651"; + version = "20171231.453"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-objc-clang"; - rev = "29a9eb320d62400564360986f7ad400b74070d8e"; - sha256 = "0b4vwbxzhds9vb4nknfdywvfpr1gkk86vsbbq6f5ds0pfk75x022"; + rev = "07f17d1dbe878fdcabac791a8916ddf643571a68"; + sha256 = "03624xn6g1ybcjw634c7nd5s2yllwfffk2gzn5hm70vfz06q7wb9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang"; @@ -24513,12 +25058,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 = "6999f1b439fb4bc9504bc73f550b369c0bd47156"; - sha256 = "0s01f0fy2q7j52334wpp38kyflnprn279q1cbrcd609878c94nf7"; + rev = "7a69ddbb54dc0748734ace95f598c69e9882aa94"; + sha256 = "1bsbw5pjin7m556pnphq8plgfjvbp1pl738lf5qc85jcvinv998m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f6ecdb2ce6bc74a27dca01ab4942778e986ac8f/recipes/flycheck-perl6"; @@ -24727,8 +25272,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "c44d3b922de999080e5f815cf4746d2a286d551e"; - sha256 = "0zgrwpcc14w9qhasrfryh5qqw4kdr36x8i9wqcx5mjbylh7p08z5"; + rev = "53e74892e8bd15baa4d1bd1d640dcabcba9667ee"; + sha256 = "0ynhx1cyxvrmkadb8h81xrhxvf9wssq74xk236dhl7q1mqagnjaf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; @@ -24828,12 +25373,12 @@ flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-swift3"; - version = "20170926.317"; + version = "20171231.452"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-swift3"; - rev = "756833425f51baa9eb0a2fa7493df6e68612c88d"; - sha256 = "1hvrg717q0nlz4r8wby82gs3vdx8fdhf38rg4j77j3fqfmxdd3fi"; + rev = "34973cd28ca5e63f8f6328a17fd7b78cc913b93d"; + sha256 = "1iy6j05dzpi7pi87y6rpjzmlnl2s9izqpbzknis2kx9072qddm3q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3"; @@ -24846,6 +25391,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-swiftlint = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-swiftlint"; + version = "20180121.2251"; + src = fetchFromGitHub { + owner = "jojojames"; + repo = "flycheck-swiftlint"; + rev = "fef7fd20cc167790cb29f16de16a8045717e0a18"; + sha256 = "06m352s5ixxm5wdrkljfk0b2chlqhm8f7bp8c2f2fkcf1l2gvs5q"; + }; + 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-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }: melpaBuild { pname = "flycheck-tip"; @@ -24909,6 +25475,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"; @@ -25798,8 +26385,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"; @@ -26046,12 +26633,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 = "41045e36a31782ecdfeb49918629fc4af94876e7"; + sha256 = "0isvmly7pslb9q7nvbkdwfja9aq9wa73azbncgsa63a2wxmwjqac"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/forecast"; @@ -26235,12 +26822,12 @@ fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fountain-mode"; - version = "20171217.1841"; + version = "20180107.2123"; src = fetchFromGitHub { owner = "rnkn"; repo = "fountain-mode"; - rev = "1cdfa6cca86b63a9a8036db50ba4841a99821841"; - sha256 = "1xrijzdncigpnw02fv94bmabj59y2c0862bzlrm9g3q7bj8pxri7"; + rev = "361f2a58151c9e6ab52b59cdd230a3add461a2bb"; + sha256 = "10sgscfw70yw6khzl4nr1w1zh28g7rh4fwr3p2q4ny4z1zsxvbl9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode"; @@ -26319,12 +26906,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 = "4dbc6871d8220cb95d287dd35475725a1b7662ab"; + sha256 = "19y23jdfp9i950vl8ahywfh6gkf8cmy0nd3fk931xkx0x5kp64h9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e628416ad9420b3ac5bbfacf930a86d98958ac8/recipes/frames-only-mode"; @@ -26524,12 +27111,12 @@ fuel = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fuel"; - version = "20170805.2030"; + version = "20180129.312"; src = fetchFromGitHub { owner = "factor"; repo = "factor"; - rev = "24ebb0eb359f15d9e97dd2c298665b5b93dc32d8"; - sha256 = "1hd63f04402r54ngzz9b9bidrslq1fzkk51kzrqwmjv3gnm4846w"; + rev = "5709e0b621dc56491d4b52782f190744be2ca0a1"; + sha256 = "0a29p14fa2xqbafdl0l5wgrch89klp0v5naqkrn2vii1gfkcyck6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel"; @@ -26654,8 +27241,8 @@ src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "27afcbc6bf7cd5196b800bb1def2b8884cdcd7a2"; - sha256 = "026z78aq4wdl8qxv2491jyab6s5n6yrf6km1xl2w7z7900wyxwnn"; + rev = "e6406d573c58ac30eec0a263211ffb4f06437925"; + sha256 = "0ydfhnbn4z50l777y8c1b85mfvk71rvwbjrn43kyqxasxdry5n59"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -26776,12 +27363,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"; @@ -26876,6 +27463,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"; @@ -26942,12 +27550,12 @@ geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geiser"; - version = "20171217.1353"; + version = "20180128.1821"; src = fetchFromGitHub { owner = "jaor"; repo = "geiser"; - rev = "0bfc6be0d25ff311d739d2f65fd343135142f6f3"; - sha256 = "01jz9yp5g003mhwq0blxy509xcwb8whzqaf90ibdr7v39y96jmdm"; + rev = "33783307abab46433ce18273f562b3a729628e8e"; + sha256 = "1vzcfy9qw32xmi7h4g9vlnxp2z2f23s01nqgs5vp42vls5yzdirr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; @@ -26963,12 +27571,12 @@ general = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "general"; - version = "20171217.1803"; + version = "20180121.1539"; src = fetchFromGitHub { owner = "noctuid"; repo = "general.el"; - rev = "32a94e066fe2d7bbdc70e7f06a59f1eaa06e4e55"; - sha256 = "0hhr8pkj05ans3cf31py4jrgsfr6q3xl1bv1m77h78j8hrbli9ax"; + rev = "cc9983470cc5152c9de584e971ffc8bd38413616"; + sha256 = "039vs972f6gwk9b1wpzs0qkznh6y0jw7cxlc7q5v6hmkx67bch0i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general"; @@ -27089,12 +27697,12 @@ gh = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, logito, marshal, melpaBuild, pcache, s }: melpaBuild { pname = "gh"; - version = "20171120.1302"; + version = "20180112.1110"; src = fetchFromGitHub { owner = "sigma"; repo = "gh.el"; - rev = "458aa6e6b107a4b30b64939233c107d1378d0402"; - sha256 = "0x52v1rk94bprvg79nqr0kfy6lcy6r709g1rc72wir1da4zcmpcz"; + rev = "519e8397fb223bb1071b726ed65c59a9ebd9fa48"; + sha256 = "0fz6f9g1r6lzwvnqmlnn4lr91nn2s59wrv9ajm9baxvivgr4x8w1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gh"; @@ -27131,12 +27739,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 = "0f281bea89edf8f11c82c5359ee2b3ce19888b99"; - sha256 = "0f70nrlqgizsrya1x5kgxib7hxc0ip18b7nh62jclny1fq4r02vm"; + rev = "39b96c475090f91e4f717197c96e083fdb2ccaf7"; + sha256 = "0f9qzk3czamqjb42xg2bmx70hafza8cn84zylx60bw8yx4i0q7nx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc"; @@ -27194,12 +27802,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"; @@ -27257,12 +27865,12 @@ ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "ghub"; - version = "20171217.1309"; + version = "20180117.1249"; src = fetchFromGitHub { owner = "magit"; repo = "ghub"; - rev = "6443c4f5a8a80fdadd7f8e4fa31b749ee1d1dfe9"; - sha256 = "1dvig0x43d3hv2hny75yq4s3h96s5379f7bg2nvbyc5cdp9l0bkz"; + rev = "f1b647faf5ce5f033728236b9263e7ecee8f536f"; + sha256 = "1hk3ww1q5h1zywjwsprx7268bq2783d03b0ydzv97klpqniw7rs0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5db83957187c9b65f697eba7e4c3320567cf4ab/recipes/ghub"; @@ -27278,12 +27886,12 @@ ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: melpaBuild { pname = "ghub-plus"; - version = "20171203.1627"; + version = "20180121.1435"; src = fetchFromGitHub { owner = "vermiculus"; repo = "ghub-plus"; - rev = "4c4a1d009790a805404edf72ff55df6fce3645a7"; - sha256 = "1m0r6g2arzh87iha1kbqb327vv7wy3m9iafw9czp3655k0sx240h"; + rev = "8dfd995ca4b3b0f94dbf4cc09ec50b8ebedf5c0f"; + sha256 = "0vw4qszisjc07anzmgknxfcancldyq11i9z16w6rkdi1fb7in27l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+"; @@ -27467,12 +28075,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "20171214.929"; + version = "20180126.913"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "c741dc3d035aeac060fa3992e0016e31c606b813"; - sha256 = "0v92qjbmcm2m9d2lnzkcrr6pcs6lm7m5i363bsv25jfff3c8k2fr"; + rev = "275a32b8af950f59324d69c39f01d653948f6481"; + sha256 = "1cm1ryd4hidaybv323gjbrqpdaicwr18ar7bhzkfjnkakvrb35pj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -27674,6 +28282,27 @@ 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"; @@ -27702,8 +28331,8 @@ src = fetchFromGitHub { owner = "pidu"; repo = "git-timemachine"; - rev = "7cb0d03bc370d3e734c8ee23b809a4e768b01743"; - sha256 = "11yjw08dp8m25psl27qfgk8c9m9v51rbiyq3lp0mp9mhr17wdp9d"; + rev = "92f8ad4afc802d01c24426ff52ad6fefb3bb91be"; + sha256 = "1ljgc7jmll3534zj1r72gh4al909slhiriscqv9lmvqzdiy3l21g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/41e95e41fc429b688f0852f58ec6ce80303b68ce/recipes/git-timemachine"; @@ -28076,12 +28705,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"; @@ -28286,12 +28915,12 @@ gnu-apl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnu-apl-mode"; - version = "20170406.732"; + version = "20180124.143"; src = fetchFromGitHub { owner = "lokedhs"; repo = "gnu-apl-mode"; - rev = "d79e519308727dec897f2574c938c6425b9a30c2"; - sha256 = "1dr9wcj697d68dxg1026ggxvyvpxjdvydilmym3fhczijdpwm33y"; + rev = "dc46c72e1a4e759c04d17c0411a8c53c2f9915f5"; + sha256 = "03ia362bwkkkysfp2wz5jpqlvsjvvzgl06i1gcrkb1aa8ssb82lc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/369a55301bba0c4f7ce27f6e141944a523beaa0f/recipes/gnu-apl-mode"; @@ -28412,12 +29041,12 @@ gnus-summary-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnus-summary-ext"; - version = "20171201.1850"; + version = "20180113.516"; src = fetchFromGitHub { owner = "vapniks"; repo = "gnus-summary-ext"; - rev = "fa75cdccc4d0775c775bae1ef92f4429e0341a37"; - sha256 = "1954r76228wcp1kmhrprgvywrzmmzj0qsp3n0rcsypz9i6y8qrz0"; + rev = "025fd853fe9280ae696a89ec2c2cac9befd010aa"; + sha256 = "07ww2nc03daz70f2ajw7b2gin22xa306001zclhrxkm1cpjif2fi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5ca4a905b5f81991074c7d3e41d4422c7e6713d5/recipes/gnus-summary-ext"; @@ -28500,8 +29129,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "0444ce1cda44fedd8f89f853dfb9d3ee6973fa13"; - sha256 = "1zr8ql7blacz4iz8l969sz3dmy9cfp4v15bwzxv71rg9vhz1ip9g"; + rev = "416643789f088aa5077f667cecde7f966131f6be"; + sha256 = "1vggwjpcssxp075l8aippgr318m0nkfjyakq7j24ml48g4gc48rm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete"; @@ -28619,6 +29248,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"; @@ -28703,6 +29353,27 @@ license = lib.licenses.free; }; }) {}; + go-imports = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "go-imports"; + version = "20180107.1423"; + src = fetchFromGitHub { + owner = "yasushi-saito"; + repo = "go-imports"; + rev = "5b3a1d520c599553f621efaf9aec71609d2b9bb6"; + sha256 = "19v05qc9fmrbdcrjliw02hqrl29dqsg3l57qp2rn8z63n3s17rqq"; + }; + 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"; @@ -28832,12 +29503,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"; @@ -28874,12 +29545,12 @@ go-tag = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-tag"; - version = "20171204.1903"; + version = "20180116.2332"; src = fetchFromGitHub { owner = "brantou"; repo = "emacs-go-tag"; - rev = "51b032465405a62f84d9181168a570610ba04085"; - sha256 = "0158c3yjw21skwa03qmh3xpg9wg7rnk6xbxqx5vxi24205zsz0kd"; + rev = "3e334d9ef3c85fd09b05973734584f401ea18c21"; + sha256 = "1nr6ijbc4g7mwrhsbl2pacagcrhkyb32vmbp2wdc3c5j9831h7j1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc4cd3fd8fb0707912e205b9d71789ea8126c442/recipes/go-tag"; @@ -28916,12 +29587,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"; @@ -29018,6 +29689,27 @@ 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"; @@ -29025,8 +29717,8 @@ src = fetchFromGitHub { owner = "golang"; repo = "lint"; - rev = "f635bddafc7154957bd70209ee858a4b97e64a9b"; - sha256 = "0sgi9p7dhsnl7i93vcp95zl9y5wljzq25x63pqbagcskwvcbyh8m"; + rev = "e14d9b0f1d332b1420c1ffa32562ad2dc84d645d"; + sha256 = "15ynf78v39n71aplrhbqvzfblhndp8cd6lnknm586sdl81wama6p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/34f22d829257456abbc020c006b92da9c7a7860e/recipes/golint"; @@ -29294,12 +29986,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"; @@ -29357,12 +30049,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "20171108.1429"; + version = "20180129.905"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "e15ff586b59d4bfeb27fc5e915645db6490b6dd1"; - sha256 = "1hkzx4qf6qlw69g606ahadxq9acgg4fik04h0xahnnyc2fbbw7s2"; + rev = "406990cbb165af7510b6282f88742c005edd2aa1"; + sha256 = "1pm5ndfxf6qmq4dlvawd4v8j75ipl12vbw13yxzrc5q0rfqqqgdl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -29399,12 +30091,12 @@ grab-mac-link = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grab-mac-link"; - version = "20171117.1047"; + version = "20180116.251"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "grab-mac-link.el"; - rev = "efac050750551fcbe323c44d94f49ac8c75ae845"; - sha256 = "009l3z4qyk017x0vn56accfi3v7bhk9dxvp4j7kkrm49jhmagjws"; + rev = "19369badf8b0621eb03ea9e3adeecb22b9710c23"; + sha256 = "0bp4x8s16zj2v7z0i5sxvqafka9v27riizjdrgfbvlvw9idlnsq0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4cc8a72a9f161f024ed9415ad281dbea5f07a18/recipes/grab-mac-link"; @@ -29487,8 +30179,8 @@ src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "c1e4cf8378bdd7e0d8205b2bcdcb3ff3e05ad8d2"; - sha256 = "0jk0a0n43jabyn8shv2i0fzqcy2aw16hanjqcsfzmrv5881hzyy1"; + rev = "186aae7d8b69f2679876c4606c1df3dd0e07403c"; + sha256 = "124abs1gpxmb76wilszrdkxk4hyszj9gc1x0hvwvn7i40shcr22k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode"; @@ -29525,12 +30217,12 @@ grandshell-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grandshell-theme"; - version = "20171216.55"; + version = "20171230.440"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "grandshell-theme"; - rev = "b2cec9d836b0eee167618e1f395dbf91c16ccafa"; - sha256 = "04v41332s4sm5yg5ayhzbl4kz5xvkha5bh0kj64g326pi2ny6ylc"; + rev = "c8f1dd4ceb3b752bcb4a0122af45e3a197c4fa99"; + sha256 = "1b0azylab54183kf9nmpx6qb8hrr91fsxladwfmiljrcpvf6pdh8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b04b0024f5a0367e2998d35ca88c2613a8e3470/recipes/grandshell-theme"; @@ -29764,6 +30456,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"; @@ -29867,22 +30580,22 @@ license = lib.licenses.free; }; }) {}; - groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + groovy-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "groovy-mode"; - version = "20171024.221"; + version = "20180109.718"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "c1e4cf8378bdd7e0d8205b2bcdcb3ff3e05ad8d2"; - sha256 = "0jk0a0n43jabyn8shv2i0fzqcy2aw16hanjqcsfzmrv5881hzyy1"; + rev = "186aae7d8b69f2679876c4606c1df3dd0e07403c"; + sha256 = "124abs1gpxmb76wilszrdkxk4hyszj9gc1x0hvwvn7i40shcr22k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode"; sha256 = "1pxw7rdn56klmr6kw21lhzh7zhp338gyf54ypsml64ibzr1x9kal"; name = "groovy-mode"; }; - packageRequires = [ s ]; + packageRequires = [ emacs s ]; meta = { homepage = "https://melpa.org/#/groovy-mode"; license = lib.licenses.free; @@ -29937,8 +30650,8 @@ src = fetchFromGitHub { owner = "Greduan"; repo = "emacs-theme-gruvbox"; - rev = "87a59d8c3a25ec8bb00dcdef0efac8ac191c4431"; - sha256 = "1n6l76izdmhyzz2niv6rrb2yfiyf42n0siy9qf1kbynwlcdkl10g"; + rev = "fb4f0a2dd3d146678fee3bf4d7bfce1c8e7cbd00"; + sha256 = "0n9z3m10sim28q2k760vhwczzdprla92hi0g8prpvv1g6bb8qrs7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme"; @@ -29996,12 +30709,12 @@ 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"; @@ -30080,12 +30793,12 @@ guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: melpaBuild { pname = "guix"; - version = "20171114.1204"; + version = "20180107.1303"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "80980e064a9d5f0fa19ad2ac033d104d42021ce8"; - sha256 = "18qnnl18x07399xq41fy9rpzqsvjgm2w4520q5labjl6ndc9y248"; + rev = "b4d897f7daafb5794809760340548b96b0a89ac3"; + sha256 = "1bl6k0vdjl9b10pz76afwnmagjjazp1pxl9rash4m1f6zry4hbj7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; @@ -30248,12 +30961,12 @@ hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "hackernews"; - version = "20170930.1313"; + version = "20180117.1302"; src = fetchFromGitHub { owner = "clarete"; repo = "hackernews.el"; - rev = "520e8dca91b8c2bc1de852f577af46ed1b7cabcd"; - sha256 = "0951vb08sjpxx28cpaa8njirjw6fml60m91wa146cnxpngd68w6b"; + rev = "fe0c7284f17f00cc6f1971a9bd565467faa0574e"; + sha256 = "0kxj49x16j7avbgry6advw4qixr76hdawfq6vy8rfj42kzmdj179"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c43a342e47e5ede468bcf51a60d4dea3926f51bd/recipes/hackernews"; @@ -30646,12 +31359,12 @@ hasky-extensions = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hasky-extensions"; - version = "20171209.736"; + version = "20180107.2112"; src = fetchFromGitHub { owner = "hasky-mode"; repo = "hasky-extensions"; - rev = "d4f4eb136ccbf880d7f50c541450dbb0b403b7f2"; - sha256 = "03h5nvwdp75sj0ggf92zd5d8kpd8zff7nx6d2jk70hybwwszzv1a"; + rev = "d75dc57f4eaeb92785bde6c26c1031710be1cf00"; + sha256 = "135rn33ldrhz3z6fg1rcdaxs1dnahliw782qc4ffxkays186id63"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3f73e3df8476fa231d04211866671dd74911603/recipes/hasky-extensions"; @@ -30667,12 +31380,12 @@ hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "hasky-stack"; - version = "20171218.9"; + version = "20171231.942"; src = fetchFromGitHub { owner = "hasky-mode"; repo = "hasky-stack"; - rev = "17b9facafcff8203012c037c5a589f290169fc33"; - sha256 = "00k13sl2yjnqjjdqlmz8ril07xw5al2ysbsnpmz81sccqa1kbikr"; + rev = "7a97d039489ff23b3362b543dea1007357e2ada9"; + sha256 = "1rqj7yypsd25h4x9lx6vkqchq70fwnjs4dpivd7n105h41pz3kiv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack"; @@ -30855,12 +31568,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20171206.2200"; + version = "20180127.2219"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "fd71d598b8160f07d7151d898e17001d1d39bb0c"; - sha256 = "17f0ydvi8yp8cadpgabngdjpcqwacip8grswwsb3lgniwa07hnnx"; + rev = "5882f69be33e255b4f3cb182879c9cf5464364e6"; + sha256 = "0k4mlffs5a2k1g53dzrkqclhkcsyzvn9z1nmhwajhlrijx8z8ym9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -31023,12 +31736,12 @@ 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"; @@ -31086,12 +31799,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20171213.317"; + version = "20180124.338"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "84863a37695b786c6c6980a589f8ea282c385ab2"; - sha256 = "0nh0n17mnrf9qf68mxcxclci1qmqal1li827a1qia3fkjry4vqxk"; + rev = "f5f7d45fb9d636fad1429867ccbc327a446bb350"; + sha256 = "1dpxw8h6aqdajqf929hwmrm2iik7vwhkv05m0vl8vf1i5zbz307i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -31317,12 +32030,12 @@ helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-cider"; - version = "20170708.1525"; + version = "20180120.1212"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "helm-cider"; - rev = "9480e969d5387efdd5e66c6db089e02a296b2025"; - sha256 = "0ci0z1zaypbdnjxk6bhf83kx808j4xi5ikqwq4w5mlsbz8f5iqx1"; + rev = "739589b6c6b3cedc71ca366da95fd1b147931c34"; + sha256 = "025z5dbrh5a9jwrfsckvmzd4nxq672m6bfikzcmhkvqs89kw1s2s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-cider"; @@ -31422,12 +32135,12 @@ helm-codesearch = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-codesearch"; - version = "20171215.26"; + version = "20180127.2237"; src = fetchFromGitHub { owner = "youngker"; repo = "helm-codesearch.el"; - rev = "ccb99aee4851bc156a67835299b24099aa8ff5c1"; - sha256 = "0yhhiax06arvimgxvh9xdflgjbkflhi1cp0g8816bwr0hdmv57dh"; + rev = "1ccbd68acab682d2d348aaff81022123939e53fd"; + sha256 = "1afjvdjqp91n44ijfc5kh8x5lmkiyncin5l25rfpxcljkfixblcr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a992824e46a4170e2f0915f7a507fcb8a9ef0a6/recipes/helm-codesearch"; @@ -31485,12 +32198,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20171130.2340"; + version = "20180129.39"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "fd71d598b8160f07d7151d898e17001d1d39bb0c"; - sha256 = "17f0ydvi8yp8cadpgabngdjpcqwacip8grswwsb3lgniwa07hnnx"; + rev = "5882f69be33e255b4f3cb182879c9cf5464364e6"; + sha256 = "0k4mlffs5a2k1g53dzrkqclhkcsyzvn9z1nmhwajhlrijx8z8ym9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -31548,12 +32261,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"; @@ -31779,12 +32492,12 @@ helm-emms = callPackage ({ cl-lib ? null, emacs, emms, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-emms"; - version = "20171217.2138"; + version = "20180124.1023"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-emms"; - rev = "f1d3280f4a8b3523ef8c39ebeb50b8c85a112a2a"; - sha256 = "1lh60ymq5by4gl9487j9d9l973vgc7jkv6s1f5q1m4pr3b5p4pq2"; + rev = "6e05efc4612262b39732d2d82d606c48fd6bf46b"; + sha256 = "04iaxzx3r5f7jr42nycnvrrs3rx51nf9a20l2zpyz14i2g4pqjvn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/db836b671705607f6cd9bce8229884b1f29b4a76/recipes/helm-emms"; @@ -31821,12 +32534,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"; @@ -31842,12 +32555,12 @@ helm-exwm = callPackage ({ emacs, exwm, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-exwm"; - version = "20171120.1204"; + version = "20180115.311"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-exwm"; - rev = "f90ac4356d30d713927c65029345b3aa3624341d"; - sha256 = "10rbqfmxykkmynmlz885hx5bw5hm9b1hcbpz3yjyv2vfbqll9lgm"; + rev = "0b557cbf0f1c84b80a83ffafb17c5aadf753859b"; + sha256 = "0i2sbdxjv3nbnv2250gwghqk202s3z43s6dn1pa5sdsp7gkvwxjz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ecdf9e00cf19fabbeade12a66d66cd010561366/recipes/helm-exwm"; @@ -31905,12 +32618,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"; @@ -32637,22 +33350,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; @@ -32665,8 +33378,8 @@ src = fetchFromGitHub { owner = "leanprover"; repo = "lean-mode"; - rev = "6b712ed05903fd92d44152d92d0820fc2502b25f"; - sha256 = "0xy2gn8c50h355yipi63nrpj3swgwzhfymq0gjpx9qq1y1jgjkis"; + rev = "ae90bd280588c96d540892d0f42247db5a126f51"; + sha256 = "06d5f577rv82g72m719w8z9w7m63amxjsdppcyvg2i6icymlhnqa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/helm-lean"; @@ -32955,12 +33668,12 @@ helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-org-rifle"; - version = "20171202.1216"; + version = "20180115.137"; src = fetchFromGitHub { owner = "alphapapa"; repo = "helm-org-rifle"; - rev = "94cb602d6373229c88126a5888f03f4b538f0771"; - sha256 = "0jf6dc461ki21w4s5hxj5mx57y3jilxxgd2sc11cv5ilh4x0776v"; + rev = "cd875b796e1a5d36ca99dede653a8e315a00029a"; + sha256 = "004sxd3v414ac7d85jkfq36nbicyr153gias0rbmlykv660xf5dy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle"; @@ -32994,27 +33707,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"; @@ -33039,12 +33731,12 @@ helm-pass = callPackage ({ auth-password-store, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, password-store }: melpaBuild { pname = "helm-pass"; - version = "20170627.1124"; + version = "20180103.1838"; src = fetchFromGitHub { owner = "jabranham"; repo = "helm-pass"; - rev = "dc599627789284eea044e881e105586f9e05bc9f"; - sha256 = "143vd248kziz95mdr568qh7wg1h00dxniqr144d867ng1gybi8cb"; + rev = "986af08301476bc6a1c8645dc5d2302a31d5044d"; + sha256 = "1hbpwi4sbibsckrldlgny3wc9cw3y9qv7x98b4x3w78ldns50qpq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8100599d69a760cd4548004a552cc0adcdb3bed/recipes/helm-pass"; @@ -33291,12 +33983,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"; @@ -33463,8 +34155,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "c44d3b922de999080e5f815cf4746d2a286d551e"; - sha256 = "0zgrwpcc14w9qhasrfryh5qqw4kdr36x8i9wqcx5mjbylh7p08z5"; + rev = "53e74892e8bd15baa4d1bd1d640dcabcba9667ee"; + sha256 = "0ynhx1cyxvrmkadb8h81xrhxvf9wssq74xk236dhl7q1mqagnjaf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; @@ -33561,6 +34253,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 = "d2609cdfce14052ab2d9c23761d4fe56966a8ed1"; + sha256 = "0nbfs5s6lshxib6kp20dzh1qbmq079hwcqwi1n61ank22qa9qw5x"; + }; + 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"; @@ -33648,12 +34361,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"; @@ -33708,6 +34421,27 @@ license = lib.licenses.free; }; }) {}; + helm-system-packages = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, seq }: + melpaBuild { + pname = "helm-system-packages"; + version = "20180129.530"; + src = fetchFromGitHub { + owner = "emacs-helm"; + repo = "helm-system-packages"; + rev = "2f5297294901d1845e2245bca76486c383f1c49c"; + sha256 = "03qb5al26qfn2sh3bwnvfyqxiwbxgmcwd4qkbad32nsk4s51d1z0"; + }; + 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"; @@ -33753,12 +34487,12 @@ helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-tramp"; - version = "20171214.2054"; + version = "20171224.702"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-helm-tramp"; - rev = "29d863d5e2a46cd2576895bc72754ad835ba9b30"; - sha256 = "0sba7jjbw406gvb0h4wfda0yhp760fv5hlm1f3hmm9xqw7hs6n2f"; + rev = "94e05b0bf6f2604a2786ef6ff358363b9d4790ec"; + sha256 = "0b0d1ka9jx68dfkdw2l7sbawa85yzkzxigjwlwki1i5l7m3cr5pd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp"; @@ -33960,22 +34694,22 @@ license = lib.licenses.free; }; }) {}; - helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: + helpful = callPackage ({ dash, dash-functional, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "helpful"; - version = "20171217.951"; + version = "20180120.355"; src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "c716d07af3878a6ae486c480c7b5724a1cd392fa"; - sha256 = "1i38rcmapc1m95gwnwny9ivbsz3xg05rlk3ybvwyj4nc43fmyh4j"; + rev = "6530314def5685772387f67d118ff31cbb2fad7a"; + sha256 = "13lcyzy6c2lhlxflxhm3h1m755s3m1fm9qakicb8iklvbzmqycbd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; sha256 = "17w9j5v1r2c8ka1fpzbr295cgnsbiw8fxlslh4zbjqzaazamchn2"; name = "helpful"; }; - packageRequires = [ dash elisp-refs emacs s shut-up ]; + packageRequires = [ dash dash-functional elisp-refs emacs s shut-up ]; meta = { homepage = "https://melpa.org/#/helpful"; license = lib.licenses.free; @@ -34068,12 +34802,12 @@ hexo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hexo"; - version = "20170702.1915"; + version = "20171226.2035"; src = fetchFromGitHub { owner = "kuanyui"; repo = "hexo.el"; - rev = "201c795ded01d96690ceadc1dd068744aceaeda8"; - sha256 = "0rj5lcmlghxm4d1vx8jxdhw53famzjxzp1bx38zgrqlhwakyghab"; + rev = "07c2366d1bdc25e09bebf429050bc0e8a7bb7aa8"; + sha256 = "0xj8jj2mnn2vasiaq7dhx3rd5knqll518ap23wfihnn96cba2rrh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/21de1b7db0fa4af4fc0014207d41893a0713d738/recipes/hexo"; @@ -34215,12 +34949,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"; @@ -34233,6 +34967,27 @@ license = lib.licenses.free; }; }) {}; + highlight = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "highlight"; + version = "20180125.1126"; + src = fetchFromGitHub { + owner = "steckerhalter"; + repo = "highlight.el"; + rev = "2371d6d134f07ac648d525b7eafd4eecfb0e36fe"; + sha256 = "0x0mr52fy1cc6f710ibqy0fh68jpfb1gj4ddg173q0azb76m2klq"; + }; + 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"; @@ -34638,8 +35393,8 @@ src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "cb0987ca0a0a97db298cbb70167b81c195d54884"; - sha256 = "013m48ynrv1p3xfgphzmjj3izf3q64wv1wr1lxjya7fcjjzwpcia"; + rev = "6f6db40cca1b759f78d7e4b971111e40833c3aa0"; + sha256 = "05xlk8pq19vh61cvpbp6156pd5ynnp8zqnj09j0hp8k6kd3wq62z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -34718,12 +35473,12 @@ historian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "historian"; - version = "20170722.1714"; + version = "20180102.2118"; src = fetchFromGitHub { owner = "PythonNut"; repo = "historian.el"; - rev = "78ec5632e4f4fd005014bd762c4a5ccdeabbd33d"; - sha256 = "1ag9hpxrzg5add4nj2j08ymxrggnzdzqb8k1vcpkd8rg72138k3w"; + rev = "ba560443a216befd4460fcf16dc6c7f23cb73d8d"; + sha256 = "1g1p02kx50nry4vm5bcp7kyjnn9lafc9a57nirnkf0gm41m6yj8q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f16dacf64c52767c0c8aef653ac5d1a7a3bd0883/recipes/historian"; @@ -35158,11 +35913,11 @@ howm = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "howm"; - version = "20160928.439"; + version = "20171225.652"; src = fetchgit { url = "https://scm.osdn.net/gitroot/howm/howm.git"; - rev = "e0237b07f60011a1926b36848c73340ae46cdb3e"; - sha256 = "0ljsvrpbj7y690pq6llnqqkvm9mlrhksxihv9jpx06d1g4ghknpq"; + rev = "1329df206e5de11e78b5064050b5dc6c5b775d9d"; + sha256 = "0k6b03ifz1d5c3055imm6hicvfryss621bcd9i39pdccazpccj67"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0099a1f9b0efb3fc3a1420cfe71a647ec6458998/recipes/howm"; @@ -35493,12 +36248,12 @@ hy-mode = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "hy-mode"; - version = "20171202.1141"; + version = "20180115.1230"; src = fetchFromGitHub { owner = "hylang"; repo = "hy-mode"; - rev = "3220f00a9bdb24667a1c3876b4a2f889dcb77501"; - sha256 = "06aw6l8nn8w6a7dfwh9ifs41acyq0jycszhhisv0idqrs8q5njsv"; + rev = "5c1167c17372c7448fedbbabbca6abc0e7e50050"; + sha256 = "09pvgrbbq1z9s4bbr40iabcxpw1z08hqbr8i997hmfy7whmv8mwp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode"; @@ -35581,8 +36336,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "hydra"; - rev = "e228432bb64385f67f20aa525bce56ae4e8419eb"; - sha256 = "18mqmrq3xwmpzqw4chx7xkgsi4kmh8dhwidih0hhqhfzvmicls0m"; + rev = "1deed8a00e6936903cace1dac123364b6c0cde90"; + sha256 = "0jraj3l7w0bw2c6qkq1bfdfa2zf7xssmk9cdkdgbjjip5xvq31ns"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra"; @@ -35635,6 +36390,27 @@ license = lib.licenses.free; }; }) {}; + ialign = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ialign"; + version = "20180120.304"; + src = fetchFromGitHub { + owner = "mkcms"; + repo = "interactive-align"; + rev = "6afe9a62ae9dccf8e2348d73f9d5637a906b1cf6"; + sha256 = "0d4x74g8s4x9q434kwfwyn2rvw4myayh7dr7r1nbh8gnijwrnpsz"; + }; + 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"; @@ -35680,12 +36456,12 @@ ibuffer-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "ibuffer-projectile"; - version = "20171201.1458"; + version = "20171222.2000"; src = fetchFromGitHub { owner = "purcell"; repo = "ibuffer-projectile"; - rev = "c18ac540ee46cb759fc5df18747f6e8d23563011"; - sha256 = "1nd26cwwdpnwj0g4w393rd59klpyr6wqrnyr6scmwb5d06bsm44n"; + rev = "bfa02c76dabdc02557b67fa556969bc74e255023"; + sha256 = "0isgy5nkcbcf56p4f7xaf0shi4ja99s23gbvan6fimf6ra7qw4i2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/363a6a888945f2c8b02f5715539439ba744d737d/recipes/ibuffer-projectile"; @@ -35726,8 +36502,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"; @@ -35932,12 +36708,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 = "20180122.1340"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-completing-read-plus"; - rev = "e2ea358725f03ae623ae03ed90715efb92a61030"; - sha256 = "1bai04fz6ln4dbc3lgglv11g6mibg40wci5ylmc90wgd38iw9gkn"; + rev = "51861afe385f59f3262ee40acbe772ccb3dd52e7"; + sha256 = "0hspgk8m4acyhpcldwg3xqla9xp3fjrhf37cnjp45j1b3h94x3iy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+"; @@ -36247,12 +37023,12 @@ ido-ubiquitous = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: melpaBuild { pname = "ido-ubiquitous"; - version = "20170923.842"; + version = "20180122.1340"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-completing-read-plus"; - rev = "e2ea358725f03ae623ae03ed90715efb92a61030"; - sha256 = "1bai04fz6ln4dbc3lgglv11g6mibg40wci5ylmc90wgd38iw9gkn"; + rev = "51861afe385f59f3262ee40acbe772ccb3dd52e7"; + sha256 = "0hspgk8m4acyhpcldwg3xqla9xp3fjrhf37cnjp45j1b3h94x3iy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous"; @@ -36727,16 +37503,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 ]; @@ -36853,12 +37629,12 @@ indent-tools = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild, s, yafolding }: melpaBuild { pname = "indent-tools"; - version = "20171215.327"; + version = "20180124.408"; src = fetchFromGitLab { owner = "emacs-stuff"; repo = "indent-tools"; - rev = "7d7ff66e699f28478c0d63f39ff6b1477cf0bee7"; - sha256 = "1y2dlq2n0rn70bccjd20s44ihyq1jja7lh2h3d8syy31xc6i1i6z"; + rev = "b650b2ca82ccd9ccb4f3142afa0da4737ddd364f"; + sha256 = "01xkkrdfn3c8ivs2wc3ck2278m75gq73wv59fchb6gw1a9d6xj7d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/indent-tools"; @@ -36895,12 +37671,12 @@ indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "indium"; - version = "20171213.236"; + version = "20180122.507"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Indium"; - rev = "4769ab443e153a19c9d40522e5f40656b0ef4385"; - sha256 = "13rii0vnh9d981jklb6apilx8yhqyc69fxp095f7i4n0aimfa413"; + rev = "b84d3553edc7db3d95fb1fe9a82a08a0661c72fb"; + sha256 = "0lqjkhidd2ambasvc52qkipjk88q4jivbm33r48bhw78bik7y8bz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium"; @@ -36937,12 +37713,12 @@ inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-clojure"; - version = "20171214.1444"; + version = "20180128.901"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; - rev = "8c27b0603971e603db686131c3e411a02579501d"; - sha256 = "0834x1kmbhmny8fcb6kh0qnvkg7pwn7q2wikrw9w2swgmjg1c47k"; + rev = "ec99211bbe9bef6d579a313ab6422694ef63b181"; + sha256 = "0d54m3g8ahz7xg06qb592ai25ydpjh0dzxxnhbp5jk2l0r0irwnq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; @@ -36955,6 +37731,27 @@ 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"; @@ -36979,12 +37776,12 @@ inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-ruby"; - version = "20171211.225"; + version = "20180121.2300"; src = fetchFromGitHub { owner = "nonsequitur"; repo = "inf-ruby"; - rev = "5ae6149a15068d3e2f83a5bd08e9cd7605f75fa9"; - sha256 = "0778ykgsmhry9h4n6wcszwh0gzkl9n7rx4jd60rplk38qj3p89hv"; + rev = "d39ea0bd59e5f62eb92a051c1ab3d7a0f896ae0c"; + sha256 = "0jfcdmyvxk8vj097qiq2zsr2h6v7wmsxlm8yldpsan8wa0s4rkzx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby"; @@ -37398,12 +38195,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20171215.332"; + version = "20180117.921"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "ca8b99ab55a34c376ad6746ba0d30a590af18a48"; - sha256 = "1c87gvck3kkzlf486iagcqk5262sajvba0lwg8yj7wgjifs3cwx8"; + rev = "b6ef262dee10a92bc31935644e087e83957f6d74"; + sha256 = "1hxfmrq10r39inysa1x104siwdladpdpcdjqbniml0hcpzrdcpd9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -37626,6 +38423,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"; @@ -37692,12 +38510,12 @@ irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "irony"; - version = "20171110.1151"; + version = "20180104.1109"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "irony-mode"; - rev = "1d865c71fefeab952a2f61184d7f77371706954a"; - sha256 = "0xkl9wm63dxwb1s3sd3skbzvsdhva6gfbfz27m7z1j5zdc94x64x"; + rev = "82ba45ec15c9011bbdf1d69cf25c8193d33c0028"; + sha256 = "0iby446mpgjrs4kg0ji8435h3aamdvcxbmv1j3qg0i9p6abmi7f8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony"; @@ -37818,12 +38636,12 @@ isortify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "isortify"; - version = "20170726.1254"; + version = "20171223.1812"; src = fetchFromGitHub { owner = "proofit404"; repo = "isortify"; - rev = "28699f29cfc0d9d78b636d0ecadcf9139173bc6f"; - sha256 = "0r7hbvsnn590wfydwibvpdihcah5jj6ylqhqq7w1a1nljzwk6d4h"; + rev = "2db50c1f585db8a8ec5fa28a90a8179516c16cd0"; + sha256 = "04wzq9cf1bzbyx3jn7anrzc1r64l23s073xqsfcqb8hgh2swcpl6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9d4ad18492e7f4a56a1515873bc0b66fa49829bb/recipes/isortify"; @@ -37986,12 +38804,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20171217.856"; + version = "20180124.1127"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "364fb09dccc30c46169dfe8acc3dd0702d2f556b"; - sha256 = "1nqp8sfg0vrdibh4hm88szssn63pn09rn56sz690nvwwbdhf2m30"; + rev = "ffc34c666c2b214d01e3f722249f45d1672566bb"; + sha256 = "0gzf8l0clh2p86m6xcygykskhigr43cpwfvj1sl06mcq600fxavn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -38007,12 +38825,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20171213.317"; + version = "20180124.338"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "84863a37695b786c6c6980a589f8ea282c385ab2"; - sha256 = "0nh0n17mnrf9qf68mxcxclci1qmqal1li827a1qia3fkjry4vqxk"; + rev = "f5f7d45fb9d636fad1429867ccbc327a446bb350"; + sha256 = "1dpxw8h6aqdajqf929hwmrm2iik7vwhkv05m0vl8vf1i5zbz307i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -38116,8 +38934,8 @@ src = fetchFromGitHub { owner = "PythonNut"; repo = "historian.el"; - rev = "78ec5632e4f4fd005014bd762c4a5ccdeabbd33d"; - sha256 = "1ag9hpxrzg5add4nj2j08ymxrggnzdzqb8k1vcpkd8rg72138k3w"; + rev = "ba560443a216befd4460fcf16dc6c7f23cb73d8d"; + sha256 = "1g1p02kx50nry4vm5bcp7kyjnn9lafc9a57nirnkf0gm41m6yj8q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb79cbc9af6cd443b9de97817d24bcc9050d5940/recipes/ivy-historian"; @@ -38137,8 +38955,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "364fb09dccc30c46169dfe8acc3dd0702d2f556b"; - sha256 = "1nqp8sfg0vrdibh4hm88szssn63pn09rn56sz690nvwwbdhf2m30"; + rev = "ffc34c666c2b214d01e3f722249f45d1672566bb"; + sha256 = "0gzf8l0clh2p86m6xcygykskhigr43cpwfvj1sl06mcq600fxavn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -38238,12 +39056,12 @@ ivy-rich = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-rich"; - version = "20171215.1945"; + version = "20180109.1933"; src = fetchFromGitHub { owner = "yevgnen"; repo = "ivy-rich"; - rev = "ba89b9682a22ae42640bfd326c9d9e83854da39e"; - sha256 = "0p2afnv2xr8in62p5f8clv22v7mxxd1x4ng5c89k126d9q12nlf6"; + rev = "efe35d2f579202ca14a90cfd46ecac624109558c"; + sha256 = "1vsgz2qg8mxd3lw590zzy9zn72lcvmrixp8j9h65gjqqdwz7xzwn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc297f4949e8040d1b0b3271c9a70c64887b960/recipes/ivy-rich"; @@ -38263,8 +39081,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "c44d3b922de999080e5f815cf4746d2a286d551e"; - sha256 = "0zgrwpcc14w9qhasrfryh5qqw4kdr36x8i9wqcx5mjbylh7p08z5"; + rev = "53e74892e8bd15baa4d1bd1d640dcabcba9667ee"; + sha256 = "0ynhx1cyxvrmkadb8h81xrhxvf9wssq74xk236dhl7q1mqagnjaf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; @@ -38322,12 +39140,12 @@ ivy-xref = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-xref"; - version = "20171202.1351"; + version = "20171229.252"; src = fetchFromGitHub { owner = "alexmurray"; repo = "ivy-xref"; - rev = "43b7c35be871b04635864334ffd2b315401150d5"; - sha256 = "13v4l95smna8jgv1c8al9bkj4nfdcrplra9yphxzac9rz77mim3m"; + rev = "aa97103ea8ce6ab8891e34deff7d43aa83fe36dd"; + sha256 = "1j4xnr16am5hz02y1jgiz516rqmn43564394qilckmzvi9clhny8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4cd8724e8a4119b61950a97b88219bf56ce3945/recipes/ivy-xref"; @@ -38406,12 +39224,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"; @@ -38824,12 +39642,12 @@ jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize, s }: melpaBuild { pname = "jdee"; - version = "20171007.835"; + version = "20180109.1233"; src = fetchFromGitHub { owner = "jdee-emacs"; repo = "jdee"; - rev = "ebe5d2e36a6a367376ed6cde590d5f805830ec9e"; - sha256 = "0rq8vp3pmnyabqzzplc91dk2ka48k809is9v4q486xv7y43013jh"; + rev = "bffcac3e7a8c57da359185e01ae5a6bdce0ba8e0"; + sha256 = "0bv1pkl6a9a9cs7ka3v17lqb45nx11mg779x7l54rvlkxg4ppchs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee"; @@ -39223,12 +40041,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"; @@ -39391,12 +40209,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20171211.607"; + version = "20171224.1833"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "33c71692aa7fb84e11bdca6e7ff1893578a0c4a0"; - sha256 = "1qgb2nnbn1j280j4ii3d3mqlgm2b9w7xhp600kgrralb4n5642fn"; + rev = "40885b6b50e497d2af53161785b3c9cc3133e42d"; + sha256 = "1yr96bm3vd6na967nn13p462ggh16k0lczgjmwg2qafmpyypn1di"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -39412,12 +40230,12 @@ js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }: melpaBuild { pname = "js2-refactor"; - version = "20171207.202"; + version = "20180118.251"; src = fetchFromGitHub { owner = "magnars"; repo = "js2-refactor.el"; - rev = "a86cb31b1c9f9719b4c4199a721fe2b8b58a015c"; - sha256 = "06hv1agmwyqxgb37p9f6sazg12mk90cahvym0qpdx9daqcslx381"; + rev = "c005a0df51fd671213a45d8693a1d9cf5b21a06f"; + sha256 = "1jyrirfnrb38jcl24ad2v427arzw3ynxwsw29b58zm9c6rxr7k6h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor"; @@ -39517,12 +40335,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"; @@ -39559,12 +40377,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"; @@ -40080,12 +40898,12 @@ kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-themes"; - version = "20171212.32"; + version = "20180128.1459"; src = fetchFromGitHub { owner = "ogdenwebb"; repo = "emacs-kaolin-themes"; - rev = "5c09046676cfa34bae06c43c1cf4d1a1781e37f4"; - sha256 = "1vxp3gzgv481m5hlzh1ik5vn9126g1avbaz3ybm2schda79gisar"; + rev = "14d73a1ffce245b1ef4bb962bd9d9051e2a9fe1c"; + sha256 = "1b8669qc8hpz99ybdpz60mls00kxqj1fj6xy522jrhyij87dws7y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; @@ -40101,12 +40919,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"; @@ -40143,12 +40961,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"; @@ -40479,12 +41297,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 = "d21aa7a12f1a76d47249db36eb9825242df9d512"; + sha256 = "1m790afdrns8afh7f690slq2gcya5bp7630fxwi8fqp5vil7lswg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25016ed09b6333bd79b989a8f6b7b03cd92e08b3/recipes/kill-or-bury-alive"; @@ -40588,8 +41406,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "4c6f7be66628e01a22e3bd72b19db2380a6444bb"; - sha256 = "1vpj02af8mck8jwdc855svxkmwsnhm57s9jz2mgpli0pqpvfwmvj"; + rev = "8776f284f75f5589d3b0c6f1e82795d73e9f3c45"; + sha256 = "0zhdj13bjvs8yxq1jndgifbniigbmpq35r27fsn014wg3ih5k17q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -40668,12 +41486,12 @@ kodi-remote = callPackage ({ elnode, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }: melpaBuild { pname = "kodi-remote"; - version = "20171008.2226"; + version = "20180126.822"; src = fetchFromGitHub { owner = "spiderbit"; repo = "kodi-remote.el"; - rev = "479075d96857696cf029cd1f482b9f2f31d82452"; - sha256 = "0kvx43ny49j115kj6zpy1i5g87bjgiimfgj9xp2fn9830adymc24"; + rev = "c49d137f10f8e07de915126a766eb1f59f7fd193"; + sha256 = "1sja17fd2gvl16jlya6cl2mj7lzg19vgl830yz1dc2iqvf3nnsfi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote"; @@ -41213,12 +42031,12 @@ latexdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "latexdiff"; - version = "20171211.1721"; + version = "20171225.1623"; src = fetchFromGitHub { owner = "galaunay"; repo = "latexdiff.el"; - rev = "090b801760abd75e445ab570b1f6642f23f51dd2"; - sha256 = "1hqj4kqa92gidjbndhb47rigi6cj0p81n7qw4awrqv0gx966ymp4"; + rev = "665aa65707d0e8c5778de70f38a42be4ba1def5d"; + sha256 = "1ppxmcbkscsdsnm5vf7lmhzq1y0vkkg8dpp4gh0hmsvqvh7d67bp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d164cf118a2c928c04e4d5cbfd47ac732e626fe0/recipes/latexdiff"; @@ -41336,6 +42154,27 @@ license = lib.licenses.free; }; }) {}; + lcr = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "lcr"; + version = "20180127.1229"; + src = fetchFromGitHub { + owner = "jyp"; + repo = "lcr"; + rev = "8a6306a08066aa6b17cba1d1f278cb359d6b6c6a"; + sha256 = "12fc6k71cly9xznh461sdlfb6vlp0pddvv7p0vdzr03mspw4qa9s"; + }; + 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; + }; + }) {}; ldap-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ldap-mode"; @@ -41360,12 +42199,12 @@ lean-mode = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }: melpaBuild { pname = "lean-mode"; - version = "20171215.1538"; + version = "20180123.413"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean-mode"; - rev = "6b712ed05903fd92d44152d92d0820fc2502b25f"; - sha256 = "0xy2gn8c50h355yipi63nrpj3swgwzhfymq0gjpx9qq1y1jgjkis"; + rev = "ae90bd280588c96d540892d0f42247db5a126f51"; + sha256 = "06d5f577rv82g72m719w8z9w7m63amxjsdppcyvg2i6icymlhnqa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/lean-mode"; @@ -41402,12 +42241,12 @@ ledger-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ledger-mode"; - version = "20170901.2039"; + version = "20180126.1808"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger-mode"; - rev = "24b43e34dd34de23e54d7ddaa2a147efda6af03d"; - sha256 = "0cdcd2hpv34yhpplgqljiyncs2q0i321f4xwfkb2inqbv9q4byhk"; + rev = "e098be20cf603f48dfe18c6237546a8c49e1f97c"; + sha256 = "140hl7s2gxhh14yx34d9ys4ryqp87qckvcjscqllnc51qmkjwf1r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode"; @@ -41679,8 +42518,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"; @@ -41864,12 +42703,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"; @@ -41953,15 +42792,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 = "20171215.1126"; + version = "20180123.1255"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "75daac5b82ce763ae269f1dcf4a97610e393efcf"; - sha256 = "0xsy3072d7x3jr3rvb8563qmdl0x5ks0023d9j13xn6x60zkark2"; + rev = "aac21815d8fe833faf1043ee2ec582f96e56c4e5"; + sha256 = "1wmgpygadkkyrsxscrxvjdy314qdlrzgs3rg3kvmd5j9nhdiwnnv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -41998,12 +42858,12 @@ lispyville = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, lispy, melpaBuild }: melpaBuild { pname = "lispyville"; - version = "20170907.926"; + version = "20180120.1206"; src = fetchFromGitHub { owner = "noctuid"; repo = "lispyville"; - rev = "522fd8dcce23b2719c758e64f99b64591406f2f5"; - sha256 = "0sbqw585lv5j3w13zq2adrcqybw88y36qnnd2vp8nk9kgzvl4p62"; + rev = "d9ae0dd5e3e86b5c0ae37bd3b469949b0dc71374"; + sha256 = "0a3l5a836slh99vzwc6a46nc6xj0wjcfj9726rs8haxkav6wzv61"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b5d96d3603dc328467fcce29d3ac1b0a02833d51/recipes/lispyville"; @@ -42271,12 +43131,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "20171214.2329"; + version = "20180126.2158"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "95077491433a2dfdc48246307105c3a534f4e577"; - sha256 = "0jdif4g2ds0382kp75r483bdrs0q34grarcxx130yd7ymswqiaf6"; + rev = "465c3f807c3ccd9af0af7032aec40c039d950ac0"; + sha256 = "1idn0bjxw5sgjb7p958fdxn8mg2rs8yjqsz8k56r9jjzr7z9jdfx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -42373,26 +43233,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 = "a1f6793f4a365c130b45fb8d7d41c485a901399c"; - sha256 = "1ybr57l0isi7y48wn4d7qpwbgp20c7560pa6nkmizp0mdfzyiffv"; - }; - 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"; @@ -42622,6 +43462,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"; @@ -42646,12 +43506,12 @@ logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logview"; - version = "20170928.820"; + version = "20180128.1429"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "72b6c5349206172a146b2c730b8ac040a92ebc3f"; - sha256 = "1f93iyxf8v0jazzh6jljrm7r28z00nn14wr90qrh9y9chyq72n63"; + rev = "60b86ec5888d3bbd857f4abb434a6ae3406b7c93"; + sha256 = "0f292yh493lpwllgs9mihfdmp6ian2rqmldfv92qz0jb348khmdn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; @@ -42839,8 +43699,8 @@ src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-haskell"; - rev = "16ca9fa975e64e840e062485ed30e4b297d72424"; - sha256 = "03zrk3h76hpacrqw7lchjbslh0lg081jqkgf9n5nhxj2jg60v3vd"; + rev = "778f816376c0a77d7404a123a5a1683e46394173"; + sha256 = "00j1b63q611qr76qf4nvkhlblcvbjakgljilwdh973k3zdc6a0v1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-haskell"; @@ -42898,12 +43758,12 @@ lsp-javascript-typescript = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-javascript-typescript"; - version = "20171125.147"; + version = "20180124.2058"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-javascript"; - rev = "6e303c84f1edd9863cacfcfacaf52f7adb64babc"; - sha256 = "0yp608ybsz0920sg55lf01l32204lb2125ip113sl2cgmrp2ygj7"; + rev = "213dd077ec181eb3f5b8139ed02cde82398ed5ea"; + sha256 = "1zqvpk65m6hfgharjvrmjwp88n5nkvz32ra82k57d3jkgbslxsw6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/999a4b0cd84e821c7e785ae4e487f32cff5c346b/recipes/lsp-javascript-typescript"; @@ -42919,12 +43779,12 @@ lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "lsp-mode"; - version = "20171210.124"; + version = "20180129.409"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-mode"; - rev = "93497872bfd79d707c2991ecd18293be86333026"; - sha256 = "1vj8wrzjg2s4zyakplynjbx6k6mjp3xk87g9r936q043fn47b8ny"; + rev = "111fcdb3929e015e95645548686687efabb3c7de"; + sha256 = "1hanr9njdyc5b6n5awfknb6rxnmskm7vikrpwbg3f6iiq56mzsbg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode"; @@ -42958,6 +43818,27 @@ license = lib.licenses.free; }; }) {}; + lsp-php = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: + melpaBuild { + pname = "lsp-php"; + version = "20180104.152"; + src = fetchFromGitHub { + owner = "tszg"; + repo = "lsp-php"; + rev = "6f332a08c28d2f402a783b91e1846234e55ec130"; + 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"; @@ -42965,8 +43846,8 @@ src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-python"; - rev = "5acea5f921dc396ea092ee253ec01b45dee3cbfd"; - sha256 = "0nz0n7k0i0h77fn8w0d49b4pkljw7l15hzvjym16jh4gr1n098ar"; + rev = "035fed681ef18a774dcb82e361bd6b5b8778623f"; + sha256 = "0mhs7v1mc23h0rlcyinl3pf1qavjl4s6j5vrf9vc65sggsnw0x1d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-python"; @@ -42979,27 +43860,48 @@ license = lib.licenses.free; }; }) {}; - lsp-rust = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, rust-mode }: + lsp-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, markdown-mode, melpaBuild, rust-mode }: melpaBuild { pname = "lsp-rust"; - version = "20171128.331"; + version = "20180126.6"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-rust"; - rev = "e560b81f21f770648a1a8621add9a2fe3dbe83af"; - sha256 = "1xscv5zbbz2pr893pb8a0c4mpdfkz5x2b8xmsk69960azslv7cd6"; + rev = "660dfa99917440acf79e1e2d3ede4d3a90f0d196"; + sha256 = "1drr2wlbgn6zyr15hjgdwldw94ryi1dbazbb44f4h9qakw7nqd2b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-rust"; sha256 = "0p86223pfpi4hh8m66ccksxgl0yi7zrigd1gmbz0bzqa6yjgbp28"; name = "lsp-rust"; }; - packageRequires = [ lsp-mode rust-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, emacs, fetchFromGitHub, fetchurl, flycheck, lib, lsp-mode, markdown-mode, melpaBuild }: + melpaBuild { + pname = "lsp-ui"; + version = "20180124.414"; + src = fetchFromGitHub { + owner = "emacs-lsp"; + repo = "lsp-ui"; + rev = "7aeff9326ec7664ab935cb4c4ada6062a0a26981"; + sha256 = "0v6jg9jna3bnxbkzx8k5d7is4fr0g1dfz6gyqqxpnd1gzjwq15w8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e4fa7cdf71f49f6998b26d81de9522248bc58e6/recipes/lsp-ui"; + sha256 = "00y5i44yd79z0v00a9lvgixb4mrx9nq5vcgmib70h41ffffaq42j"; + name = "lsp-ui"; + }; + packageRequires = [ dash 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"; @@ -43024,12 +43926,12 @@ lua-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lua-mode"; - version = "20170130.435"; + version = "20180104.626"; src = fetchFromGitHub { owner = "immerrr"; repo = "lua-mode"; - rev = "652e299cb967fccca827dda381d61a9c144d97de"; - sha256 = "1k64cjzylmfw89pyfjza8s9sxijraknwg573vh619wvnggflc7lb"; + rev = "6c691839b7e784884ae5c390bf1927953cd2bde7"; + sha256 = "0fm1d85302q79r4zrzmdx4v5c1vvr53g687vm5frf9sv8gg6hx0w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/lua-mode"; @@ -43087,12 +43989,12 @@ lusty-explorer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lusty-explorer"; - version = "20171126.1221"; + version = "20180127.1443"; src = fetchFromGitHub { owner = "sjbach"; repo = "lusty-emacs"; - rev = "303618cafa01da3c8f99da4849d3ddbdc146a5d1"; - sha256 = "0i8hgg3hpmmvchldxlqmvd1c5j24qv0k8vv222k026ilk95dpy2p"; + rev = "3df794ed4829e353ee3c1e3c6686440f9e868ef6"; + sha256 = "1z2nzjlmmcnin3h0713kqaaikyc0h4iiazv50lsvrp0agjbmhcqp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/efedaa3b1de5f6406c7dcd842eee42eefaf8ab50/recipes/lusty-explorer"; @@ -43129,12 +44031,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"; @@ -43339,12 +44241,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, ghub, git-commit, let-alist, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20171217.1409"; + version = "20180129.629"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "c741dc3d035aeac060fa3992e0016e31c606b813"; - sha256 = "0v92qjbmcm2m9d2lnzkcrr6pcs6lm7m5i363bsv25jfff3c8k2fr"; + rev = "275a32b8af950f59324d69c39f01d653948f6481"; + sha256 = "1cm1ryd4hidaybv323gjbrqpdaicwr18ar7bhzkfjnkakvrb35pj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit"; @@ -43369,12 +44271,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"; @@ -43495,12 +44397,12 @@ magit-imerge = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-imerge"; - version = "20170805.819"; + version = "20180120.1554"; src = fetchFromGitHub { owner = "magit"; repo = "magit-imerge"; - rev = "1cd0fa843095f4ce8aa4eae89476c116414d060c"; - sha256 = "1h9m0miiv44az4bigg5gjgkpdgdy4hh114kavzjgjhmw5zsg6qfg"; + rev = "1969c445d16e5c59db9548a61a5fe5f0b7448cd3"; + sha256 = "0yiqjaxnrb46z38bbcg1dlswi6sp8994hcmbnp31xf27m29vr2fx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e78a5c27eedfc9b1d79e37e8d333c5d253f31a3c/recipes/magit-imerge"; @@ -43558,12 +44460,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "20171217.1235"; + version = "20180119.111"; src = fetchFromGitHub { owner = "magit"; repo = "magit-popup"; - rev = "3f23e81eb0267d6578d8f1733c5e42699b0229a1"; - sha256 = "1nv3gc3wb7r2l9hbsgx78gqbcdi6iw1l9a0nqq5vjvr3cmb014r4"; + rev = "ab75385a1fb8c0fba0769d448b13ba8324835261"; + sha256 = "0ky4l3k3camh1paa5ap9frr9hcadj7nj40l3imiiqfcvgyl8ijp6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit-popup"; @@ -43579,12 +44481,12 @@ magit-rockstar = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-rockstar"; - version = "20171213.737"; + version = "20171215.1135"; src = fetchFromGitHub { owner = "tarsius"; repo = "magit-rockstar"; - rev = "44e3bf03b0c5db914ce391c0c645267f0a5759bd"; - sha256 = "0nqb6ipzql4jxipmh262j9q72sjk4s4cbyz5c61akwxbpr32nz3l"; + rev = "c8320472e8a50c8299140ba0943bb1fe485d294a"; + sha256 = "1xjym51z0v7ibxw059f6k3zljli6z390rmxvrywbfzkb8hqms0l1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a20b539cbd38ffa546c1b56b9fac78c0b9457f6/recipes/magit-rockstar"; @@ -43642,12 +44544,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"; @@ -43684,12 +44586,12 @@ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, git-commit, lib, magit, markdown-mode, melpaBuild, s }: melpaBuild { pname = "magithub"; - version = "20171209.835"; + version = "20180128.1035"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "c8d8af52c6d47f1fb16c76edbe6874e89f6e1939"; - sha256 = "1g3js4rjp3pnxy0lw8ji2vfga85b2zxnnlzr3z5hvszn818nqln6"; + rev = "f6273604ef87e1b513f69430af50600ee4b20deb"; + sha256 = "00cwc2qbspqjrxrz00vjfcfx4ydfj7q977d2gffsg2lkjyjspzpp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub"; @@ -43744,27 +44646,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"; @@ -43831,12 +44712,12 @@ make-it-so = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "make-it-so"; - version = "20171129.655"; + version = "20180128.1307"; src = fetchFromGitHub { owner = "abo-abo"; repo = "make-it-so"; - rev = "4f8b61011700036c98993e287d7aa36a52f2e206"; - sha256 = "1ks3mj78xcsi7f4xx95hhpi2gpdgz9fhy60qy3z780814ylq856w"; + rev = "bc3b01d6b9ed6ff66ebbd524234f9d6df60dd4be"; + sha256 = "0833bzlscpnkvjnrg3g54yr246afbjwri8n5wxk8drnsq6acvd8z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aad592089ed2200e2f8c5191e8adeac1db4bce54/recipes/make-it-so"; @@ -44041,12 +44922,12 @@ mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }: melpaBuild { pname = "mandoku"; - version = "20171002.12"; + version = "20171220.419"; src = fetchFromGitHub { owner = "mandoku"; repo = "mandoku"; - rev = "77647573331c602847b06b9e21de69f72cd7bad5"; - sha256 = "0yqxsls9phvd4dgzb908xds4x437rqpm3ddy07pq3qq7ghri1cnv"; + rev = "f993b7428c7e83efdbc6e6040d3eae9406d9b090"; + sha256 = "0731w64jxjmphsjpz4fz21h27q4y9afbkbpczspnc90vs1ighn4y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku"; @@ -44196,12 +45077,12 @@ markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "markdown-mode"; - version = "20171211.2209"; + version = "20180124.138"; src = fetchFromGitHub { owner = "jrblevin"; repo = "markdown-mode"; - rev = "e8b336cb83d06149bdea35127cd097324d0da468"; - sha256 = "0h21zj8yi9sd617dm0vzfw0rn5kjy20hiq2kkwwzi8mk6rlm16wd"; + rev = "668de4a965980d618637a3b5754e721b54c51e83"; + sha256 = "00biiz0s5mwq092qxdh9943f6qf6k6n7dhrrj7nvj2b8iciid9as"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode"; @@ -44392,12 +45273,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 = "6a31133b25addabc5ec9c87ba959d69c5122171b"; - sha256 = "1h5ilihlpqg1as6cd58z3flxzhj7izk7sz1nzwhwzvh3kfm47h9d"; + rev = "f038689cbd5b3680b80b44edd0c7a63ca3038e26"; + sha256 = "1n79im1r7h1ilvppn9alqwl96zhyxbm5hk7kbmqh022dggw0cx15"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/203f2061c5c7d4aefab3175de5e0538f12158ee3/recipes/marshal"; @@ -44518,11 +45399,11 @@ 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"; @@ -44724,6 +45605,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"; @@ -44748,12 +45650,12 @@ meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "20171122.626"; + version = "20171230.802"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "555b8b9ea8ef56dda645ea605b38501cb4222b12"; - sha256 = "1z3vvasah4gq6byq4ibkihy5mbch5zzxnn0gy86jldapwi1z74sq"; + rev = "98ad6a5361c725319a355522d2d1ba0e0fbb7cde"; + sha256 = "06iryz4dbldc9vxy67g977hih8r1bfvjld53lvwnjsc7r3x9i07q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -44962,8 +45864,8 @@ src = fetchFromGitHub { owner = "myTerminal"; repo = "meta-presenter"; - rev = "e882ac7f7658dd9507aca0ff88c88fcf74618252"; - sha256 = "0h8zg2nvb0yn0z8xv1101r8rjxgs05k08j3n71inr7n118sa98bj"; + rev = "1f8d635301d1f9849416c551bf1530e87e31d235"; + sha256 = "19y4iwi24p86d64n9075zjrjj6i27vpvwi898qanw1ih7spgpg1q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b73e9424515b3ddea220b786e91c57ee22bed87f/recipes/meta-presenter"; @@ -45084,12 +45986,12 @@ mhc = callPackage ({ calfw, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mhc"; - version = "20171016.335"; + version = "20180127.621"; src = fetchFromGitHub { owner = "yoshinari-nomura"; repo = "mhc"; - rev = "03a50a7dd5f90fb981b72e4b9e9385e4d1fe3be3"; - sha256 = "17p6gkf6xmx6sflzd3pyc3p3x7ma8p497hmj1yc7w863kqm8jclk"; + rev = "5c5265be1a0099d48ada502aaa28c7f3f08f9078"; + sha256 = "0xaqbkdmn3hlalnzz69812a2cigpgh1199fl6hp20d4dq4hj4m6c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8d3efa0fcd6cd4af94bc99b35614ef6402cbdba/recipes/mhc"; @@ -45419,12 +46321,12 @@ minizinc-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "minizinc-mode"; - version = "20171208.958"; + version = "20180119.2348"; src = fetchFromGitHub { owner = "m00nlight"; repo = "minizinc-mode"; - rev = "8bb428b52e974ecea35f3f2b20ad161735085a30"; - sha256 = "10b8y23vamj9r0dnqqcn36w4n8zz61p17njakinfadqa813s4hhv"; + rev = "c6cd9614d84e26065852aeb1942e8339e08e382d"; + sha256 = "0ypid82lvh5np326csm8y6c9ac7drqj6gdmqyzqbrn1m6lz9xkkl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc86b4ba54fca6f1ebf1ae3557fe564e05c1e382/recipes/minizinc-mode"; @@ -45437,6 +46339,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"; @@ -45482,12 +46405,12 @@ mixed-pitch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mixed-pitch"; - version = "20170723.955"; + version = "20180121.1039"; src = fetchFromGitHub { owner = "jabranham"; repo = "mixed-pitch"; - rev = "121ab33af7973292bcfb081be2db4664a972d7bd"; - sha256 = "0gdf50cgd0bdb5rv2a8m2q0xkdp304prvmrnw822dirf9g1jmn10"; + rev = "5915172c86a1d249854fed32c0e472501d1df1e6"; + sha256 = "1mm5nkc167bli01lbng1iiswh5mgz0a48k11aipki213inhm29jc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/20e85b11dc864500d44b25e36c5e7c4c67c1ebe2/recipes/mixed-pitch"; @@ -45586,12 +46509,12 @@ 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 = "b8cc8d29e185c15a1e43ecc2a78e36a6d2f86b8f"; + sha256 = "17v26116g05py2yd24a5rjlr2lbdacahglxar10k5291v9i4msdw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1137bb53ecd92b1a8537abcd2635602c5ab3277/recipes/mmt"; @@ -45733,12 +46656,12 @@ modalka = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "modalka"; - version = "20170519.32"; + version = "20171231.2213"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "modalka"; - rev = "3cb3fdd20def5888e232863e13bd9ad68ea85a01"; - sha256 = "1zkfby6m16yafzz511jgjlh3cyjnqaknbrdky05h1a4hbk2rvsnl"; + rev = "e69ec8fa01e86cb789f7f2b27b6d5a47e1ca3069"; + sha256 = "10yn56vamcfblilsnfqfagssr4060gr7qbpnqa2fjqv1l8fg6jrf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa0a02da851a603b81e183f461da55bf4c71f0e9/recipes/modalka"; @@ -45772,6 +46695,27 @@ 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"; @@ -45796,12 +46740,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"; @@ -45856,6 +46800,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 = "758dad6f5701c3a2e1146ba5895c08ef734a93d2"; + sha256 = "0syirvzjgbf1yvcvp00a19m4gi49yh1g95ba896mh741wrkilhb4"; + }; + 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"; @@ -45985,12 +46949,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "20171013.236"; + version = "20180104.429"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "019e07947426f0192fc3458f3f72c19031b607de"; - sha256 = "0id35345zp0fchbcz8qk2lg71jyln91k56vfama27ss3nzy3f9kz"; + rev = "bb5cbbd5895b8b3fbc6af572b1fd0aacd4988a8a"; + sha256 = "1f0jl4a3b6i9skbcym0qzpszy620385m947l2ba2wxf1na7rc626"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -46006,12 +46970,12 @@ 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 = "666431c047479e414b47ca1f83fe0a2ecc02144a"; + sha256 = "0k7d2k3m9rf77a1812clqvmsva27c7wpvkgdhkgvi7kpglj1dz2n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/590e5e784c5a1c12a241d90c9a0794d2737a61ef/recipes/monroe"; @@ -46199,8 +47163,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"; @@ -46220,8 +47184,8 @@ src = fetchFromGitHub { owner = "retroj"; repo = "mowedline"; - rev = "42fa7bb47a8d77e9cce23c137912d481a9afcdb4"; - sha256 = "08pm5cbdzk4rdngcsv4l3qbrqcq13xgq8gc5m2rlipv671zqmhj9"; + rev = "6121b7d4aacd18f7b24da226e61dbae054e50a7c"; + sha256 = "16j3y4hffnv2rg97p49hqz3x1icp7qkpcjxhalny5l4gysx9mfqg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline"; @@ -46279,12 +47243,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 = "6b878e31fb6ac4347dc9dfd8ccc1080fe718479f"; + sha256 = "03gcda62xl6hfibw3y15lf6b04998kj1v95gyzs3q0bqxav74ahw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30fef77e1d7194ee3c3c1d4775c349a4a9f6af2c/recipes/mozc"; @@ -46405,12 +47369,12 @@ msvc = callPackage ({ ac-clang, cedet ? null, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "msvc"; - version = "20171203.921"; + version = "20171225.738"; src = fetchFromGitHub { owner = "yaruopooner"; repo = "msvc"; - rev = "093f6d4eecfbfc67650644ebb637a4f1c31c08fa"; - sha256 = "0pvxrgpbwn748rs25hhvlvxcm83vrysk7wf8lpm6ly8xm07yj14i"; + rev = "dfc529aa6da8b46b0a0c7db9a0e5e9bc33ab1fb3"; + sha256 = "19n9an0nznwqw3ml022i6vidqbrgxf4yff0nbvvcb91ppc1saf40"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69939b85353a23f374cab996ede879ab315a323b/recipes/msvc"; @@ -46468,12 +47432,12 @@ mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: melpaBuild { pname = "mu4e-alert"; - version = "20170901.1027"; + version = "20171222.2315"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "mu4e-alert"; - rev = "ef90cd0f0fb6c841f326db5cad276567eb5f96b5"; - sha256 = "0sym7mp1via65h883f5h45cbfxq58qck7ypcvcfdmnmn9jnl3j9d"; + rev = "3095de457ec88e752f83ce086eff4aeb22399980"; + sha256 = "04y26r7cb0sza8wp45khk8la4mvj4h4ksxfm5z7ry77xi7j2894w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mu4e-alert"; @@ -46618,8 +47582,8 @@ version = "20171217.1211"; src = fetchhg { url = "https://bitbucket.com/ellisvelo/multi-project"; - rev = "24708e6fb0c4"; - sha256 = "1ys4c346j46rgkyz39rqnminpvg59fyjcgm3ksn82z40fzsb7043"; + rev = "a6e7c1542c0b"; + sha256 = "1wh7xlas6chdliya847092j5rkngxxg1m9a98y2r782ywgyl7xv6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/multi-project"; @@ -46887,12 +47851,12 @@ mwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mwim"; - version = "20161004.647"; + version = "20180116.740"; src = fetchFromGitHub { owner = "alezost"; repo = "mwim.el"; - rev = "e53da113b88a7e0693fd8f91862ce5948ad80a5b"; - sha256 = "0vm6iynkx328zc4ww6zjibj7impiz53g2cqzxfa8bjfs2src2sw3"; + rev = "a27879c4d0ef1d3f8494efa18490dd17d707375b"; + sha256 = "0v2qar878z6imh6ih4qxwc7jmwga8l6c626zrzz81l60b675li8x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7e1aa2fa1294b27ed7b6c5bdd5844fa5c37df72/recipes/mwim"; @@ -46971,12 +47935,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"; @@ -47017,8 +47981,8 @@ src = fetchFromGitHub { owner = "myTerminal"; repo = "myterminal-controls"; - rev = "3edcef051f882342ca769b84527bf92dfb755e14"; - sha256 = "0g9vyy639aqnk0g9rmrlszc7i0rl2f2ygnzfs4pwakgfiwig5r0c"; + rev = "eaa8c82b8e140f4c0f2e286ee14253b76e4639a6"; + sha256 = "1vy34f8gcaspjmgamz5dbxmjxjiixf0wmhgpr61fwd4vh5rvwcci"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a82a45d9fcafea0795f832bce1bdd7bc83667e2/recipes/myterminal-controls"; @@ -47474,12 +48438,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"; @@ -47516,12 +48480,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"; @@ -47541,8 +48505,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"; @@ -47726,12 +48690,12 @@ ng2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "ng2-mode"; - version = "20170504.2007"; + version = "20180128.1006"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "ng2-mode"; - rev = "adbfe16a47cf26edeb1b508cbedae5307b4efbf6"; - sha256 = "0ll850wpr4dyh25mq41afwbz17mqz82i53hfn970n9vw2icf36py"; + rev = "43179216c08958486ed7a8e7a3766d1df11d38d8"; + sha256 = "1biww57phq5mcd80is38fnishj3jmj09iwiqkn6j03p53kvgqchb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a856ecd8aca2d9232bb20fa7019de9e1dbbb19f4/recipes/ng2-mode"; @@ -47851,12 +48815,12 @@ nimbus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nimbus-theme"; - version = "20171214.355"; + version = "20180129.536"; src = fetchFromGitHub { owner = "m-cat"; repo = "nimbus-theme"; - rev = "12de9c2ef7da3546c00329d530ebf4c9e3ecdf9b"; - sha256 = "0480j55qpr8cmpqh8bwc63n3y3lknfcyrn8075nljk2yl5v9jvfz"; + rev = "22c4a1cf1ce8686c01a341477502d2676829699b"; + sha256 = "1sf8ijk08kivfj0dxgmx73l10hkd921z766z5x4w1p3axwc8w9j1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme"; @@ -47914,12 +48878,12 @@ nix-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-mode"; - version = "20170831.1721"; + version = "20180126.1935"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix-mode"; - rev = "3294f8a2f83ace2d71f16c274a262ff76be412dc"; - sha256 = "1p1dka9v8fm6rklspkscj5rs5f21dwi3bq44d3hjqw6xva4q7bx4"; + rev = "664fa51cfa9d8e4c39f2086ad1b6b6fdc1e8fbd7"; + sha256 = "0nnxd2lis4qx2zakfcy5ypvlp1nrw70dq2jcf0gldg0qmr1dhlgk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1870d786dbfac3b14386c8030e06f2d13ab9da6/recipes/nix-mode"; @@ -48058,15 +49022,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 = "20171215.308"; + version = "20180125.1539"; src = fetchFromGitHub { owner = "emacscollective"; repo = "no-littering"; - rev = "d016c62f4b0975ff3b2efef49d7a45545ebb2df4"; - sha256 = "13zyd6q076cfj77976l85gahz9ij9jbmjihsg65rdqr2ab9q4wly"; + rev = "5156e005d59453f2608b9c38e9fe92ba8df550db"; + sha256 = "086y8y5309hhmhiq9c5yqvya0fm6j3vxba47861ckwjqyp7d3ygk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering"; @@ -48229,12 +49214,12 @@ 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"; @@ -48268,11 +49253,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "20171208.1819"; + version = "20180104.1635"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "572259885af4d5858c3be5c2119ec7019e1ca617"; - sha256 = "1sc4sfgnjiqfzyq42c3jcz0c6ir6ljiq33k4wshh7mlvbr5bhdsf"; + rev = "12541fea7fe333f7c154a4a12a1d40394c2d6364"; + sha256 = "1r5a5smg2mc28wy3iq4sp8p0rmpqsi5ajk31hwc9lhldklz2c0nj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -48309,12 +49294,12 @@ nov = callPackage ({ dash, emacs, esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nov"; - version = "20171104.1641"; + version = "20180115.1407"; src = fetchFromGitHub { owner = "wasamasa"; repo = "nov.el"; - rev = "7d14b6a2aa649e2213348883893a24a6a6083cb9"; - sha256 = "0l8b4847rig76d974akpkbb43i7pnhx75wmlgczqscmripspdxyb"; + rev = "4ef20ebb587ffb0ab73c85ad5748d41af1071596"; + sha256 = "03s0qjvwk1f7y3i4wh2p5y3z4hdv00adgz8za3vphzc0q8i1kjzb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf543955ba2d5d0074fa2a5ba176f9415f6e006d/recipes/nov"; @@ -48435,12 +49420,12 @@ nu-mode = callPackage ({ ace-window, avy, fetchFromGitHub, fetchurl, lib, melpaBuild, transpose-frame, undo-tree, which-key }: melpaBuild { pname = "nu-mode"; - version = "20171217.1451"; + version = "20180104.1243"; src = fetchFromGitHub { owner = "pyluyten"; repo = "emacs-nu"; - rev = "5e1fbd91e67f114143ab08bafd716dbb19d0b0ef"; - sha256 = "0nn684axw1lm81jms4iz2h8dkxvb4lyxj4rbxdbnkjzsp50r9r1h"; + rev = "91056b70667036bc78d6c8585cf0bc8fe7ba21c0"; + sha256 = "0pf8ng0r829lrbqjz61wjdag9cb27cx0cj2idgpy92hfiy9s6saa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/230d5f8fdd965a24b8ff3cc94acf378d04815fca/recipes/nu-mode"; @@ -48718,8 +49703,8 @@ src = fetchFromGitHub { owner = "astahlman"; repo = "ob-async"; - rev = "6099e94538083e035a4152335f93eae5b13c8d3f"; - sha256 = "1ws5yngga0zi8cxwd6nzgq17d1k6g44zw2pzivc2fyljxnm70892"; + rev = "99a6f24191cacb343d6090ecc8c1c67f768b2e22"; + sha256 = "1cw62nsdnmllpkn4mqi80vp6s17yf6an418gvr06z8cxqndw07h1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-async"; @@ -48797,12 +49782,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"; @@ -48815,6 +49800,27 @@ license = lib.licenses.free; }; }) {}; + ob-clojure-literate = callPackage ({ cider, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "ob-clojure-literate"; + version = "20180111.210"; + src = fetchFromGitHub { + owner = "stardiviner"; + repo = "ob-clojure-literate"; + rev = "7acb5d1e9a84c9caa1e8477cdbb60d9a5dbf2eaa"; + sha256 = "1n5w7c181x5zbkmcvnzk2hxi339p2mfjwlhkxnfh3i20hzgqxci6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e958745861c9673248955443bcc2c76d504b32f7/recipes/ob-clojure-literate"; + sha256 = "0jprgnslkc9m404n32rr510is823yr9kziqcw70z828fy7wl2glk"; + name = "ob-clojure-literate"; + }; + packageRequires = [ cider dash emacs org ]; + meta = { + homepage = "https://melpa.org/#/ob-clojure-literate"; + license = lib.licenses.free; + }; + }) {}; ob-coffee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-coffee"; @@ -48836,22 +49842,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; @@ -48860,12 +49866,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"; @@ -49049,12 +50055,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"; @@ -49070,12 +50076,12 @@ ob-ipython = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ob-ipython"; - version = "20171209.634"; + version = "20180113.929"; src = fetchFromGitHub { owner = "gregsexton"; repo = "ob-ipython"; - rev = "a3bf46dd6c9a76f4cd5058f3ab5426d90f0c073a"; - sha256 = "0ck3r5qwp4184anpa9f9hjp3rra6yx5hkwcxg1byippp75hdc50m"; + rev = "75b84cb1ca09dfa84113fa0790e182299b72244c"; + sha256 = "05yhrivsxf8qvnhvsdb5kdq1a881l5c7d3apz1sk2mdxw89vcv7k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557c36e86844c211f2d2ee097ce51ee9db92ea8b/recipes/ob-ipython"; @@ -49196,12 +50202,12 @@ ob-php = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-php"; - version = "20171017.2206"; + version = "20180103.441"; src = fetchFromGitHub { owner = "stardiviner"; repo = "ob-php"; - rev = "c281c1e17f0fd7de4adb6c3e6029dc2bd76beca1"; - sha256 = "1c0967cpimmr5j7ymr4654y62f615dfrv1h3385i7n57jsvqr6bs"; + rev = "08b41282fba31abca030a387062c3f1eb25a723f"; + sha256 = "1anrqqd4g4pq2ngslgkqarxisgmn9i7nggj2m76ny7ga1hxi2agv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/940a22790c9e5fd2f7729c71efad907683cc392c/recipes/ob-php"; @@ -49973,12 +50979,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 = "20171119.1236"; + version = "20180121.702"; src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "b0c61e91d1b600875ad2eae06fe72a179a3028b6"; - sha256 = "1b0y20r9rimarfa1zgid78jh1zyzykdxd07n3vzam6ds9diygzxd"; + rev = "588b8482685adedbc56933cb13c58d9cc6a82456"; + sha256 = "1iqwxc19jvcb2gsm2aq59zblg1qjmbxgb2yl3h3aybqp968j3i00"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -50507,12 +51513,12 @@ org-brain = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-brain"; - version = "20171216.536"; + version = "20180116.2216"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "org-brain"; - rev = "aff34e19582d7bddd6ac241eaa3366fbd254a06f"; - sha256 = "1lsvm2ibhlzwf5vmwd5iv2kppaqjg38m1g0hq5p4ijwvfd23chq9"; + rev = "754adb19ee88cba2757f0dd214abc85a6b05491f"; + sha256 = "1f581785rkvy1qjriwpjc3xqsz2a4jvbzi3ghzz76zz3j36yisln"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain"; @@ -50654,12 +51660,12 @@ org-clock-csv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "org-clock-csv"; - version = "20170904.1745"; + version = "20180128.2130"; src = fetchFromGitHub { owner = "atheriel"; repo = "org-clock-csv"; - rev = "20ab6ee4395bedc0a7b8dfaf7b51f2c63dc8d2c6"; - sha256 = "00lcvmls7zlkqmsi0yfiihyxv49803jlc9khcbqawxlkijvr65pm"; + rev = "e3b1c4236f6b74105b291ec68c0909226621b4ac"; + sha256 = "1ykam54wz53n0gx0raywhd92diggyxw8669w988sw6jghhg65ivs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e023cb898699f76f6c3d9ffe8162aacfc6a8c34f/recipes/org-clock-csv"; @@ -50759,12 +51765,12 @@ org-dashboard = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-dashboard"; - version = "20171203.210"; + version = "20171223.1124"; src = fetchFromGitHub { owner = "bard"; repo = "org-dashboard"; - rev = "716a557f9f0dcb8e79fcc5775ec1f6f43d338a11"; - sha256 = "0r94i4qqqrirgdl8rc5l5r6ah9jkh4734cy8b2qghh8h9bjscmhn"; + rev = "02c0699771d199075a286e4502340ca6e7c9e831"; + sha256 = "0zi23xgv5fq827dljhzp6m2v7ggr3pdw3fpgq8515gs9q4f12v1r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/11ce0ba772672d9cbae5713ebaf3798eec5fdb3c/recipes/org-dashboard"; @@ -50861,22 +51867,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; @@ -51133,22 +52139,22 @@ 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 = "20171126.1833"; + version = "20180103.1813"; src = fetchFromGitHub { owner = "ahungry"; repo = "org-jira"; - rev = "d125ade5069e0840e204142ca3d4405cac2593f7"; - sha256 = "00wqz6k72iv6mwvpg9qv35qfkk8fpq1nsww80jddafdfzlslm0bw"; + 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; @@ -51157,12 +52163,12 @@ org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-journal"; - version = "20171113.53"; + version = "20180118.31"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "44a52a20a154d5c1a78684ef720972c4fe36b64a"; - sha256 = "0c4jwh53mgy4qpv7aiwbsbvjjhchyfjb0ca5ny5875ljvkq59qz6"; + rev = "1d6f7ddf3baa296bf7ca7ed008f0d86c10397021"; + sha256 = "02r4h7l8mj5blxwsiv0zyfiwagmxckxdsi39vbx2kxjvxasv4zw3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; @@ -51304,12 +52310,12 @@ org-mru-clock = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mru-clock"; - version = "20171101.506"; + version = "20171219.314"; src = fetchFromGitHub { owner = "unhammer"; repo = "org-mru-clock"; - rev = "9af184d3c8a15432516113be481f6882ef67cb3e"; - sha256 = "1jy94nja8icwp4xa0a1yclrrpa4bgj6wrnpyv9hh8pvn2kzbnfb4"; + rev = "ccf477735d76c078b44bba7bff12e7e30e66bdb3"; + sha256 = "17dxdghnh3h24584pa374pmz0a7qr13p0a4rfsndns9xv8wfzbic"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock"; @@ -51350,8 +52356,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"; @@ -51364,6 +52370,27 @@ license = lib.licenses.free; }; }) {}; + org-noter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "org-noter"; + version = "20180129.840"; + src = fetchFromGitHub { + owner = "weirdNox"; + repo = "org-noter"; + rev = "107fae73d5149a774d8c3a5d8a05c7355160388e"; + sha256 = "04269kll3dfh0jd8s6w6xdp90c9hbyfy68ifv1z30x67mz18chbx"; + }; + 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"; @@ -51500,12 +52527,12 @@ org-pdfview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, pdf-tools }: melpaBuild { pname = "org-pdfview"; - version = "20161130.1053"; + version = "20180102.2349"; src = fetchFromGitHub { owner = "markus1189"; repo = "org-pdfview"; - rev = "9de96eef6f187a10cd910e3bc3eb274d38856819"; - sha256 = "0lrcj3mcdfcdrndivhj5ds386zrsy78sfg0i8126wwwc5lfh48vq"; + rev = "645f451df82fb5ebdf42b2c208711d307781062d"; + sha256 = "1iq90f821iycqs1qff1m2vjl1czri01c484gcnn50wnf7mdfynhk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-pdfview"; @@ -51647,12 +52674,12 @@ org-random-todo = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-random-todo"; - version = "20171208.400"; + version = "20171219.58"; src = fetchFromGitHub { owner = "unhammer"; repo = "org-random-todo"; - rev = "905bee66cc320558c62a0cca1aee93ae016209d7"; - sha256 = "09gqal3xvp7ymhvlxfr8wjcyp7p5pcax9sal1jlzagwdqh5i6rgl"; + rev = "24500edf303a854f09a88b07e1a16a21e164eb87"; + sha256 = "0c2d5dbr10p1hz51ybygmwv25si6sfwy21kc9xmbjyrrlw5l5sqv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/80fad6244ea3e5bdf7f448c9f62374fae45bae78/recipes/org-random-todo"; @@ -51672,8 +52699,8 @@ src = fetchFromGitHub { owner = "mwfogleman"; repo = "org-randomnote"; - rev = "c544202d6cba1c1618ed39b2a45fa0ffc5f83e60"; - sha256 = "1ny7qq3av43kbzd9q2rsqi04sg7n9snaqss3nazr80mpswx906dx"; + rev = "c89eb4cf625ea7e7624b6a2d3d5676ce25ab03d7"; + sha256 = "05ap1kbq5cwak70jlm3m0pvbax75kg3281qxs5flz3qbkfsbg3h2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d92cb392b23701948176ba12516df5ae6608e950/recipes/org-randomnote"; @@ -51758,12 +52785,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }: melpaBuild { pname = "org-ref"; - version = "20171217.1111"; + version = "20180129.719"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "ad9ddfc15e8b65b1b9bb8b674040232ec742d38d"; - sha256 = "1is3lvpikm1cl7mg55kdsgqavpqywidz6cjmaqpgs6fzkyvcag6c"; + rev = "3b16a4f7c98bcccd54a2d41d5ff7b5796b87a42d"; + sha256 = "0qiflgczhvav2wlgpy6fxm7vdh21ai75hdh00qs8b6d0d4i2mqhy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -51790,12 +52817,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"; @@ -51871,6 +52898,27 @@ license = lib.licenses.free; }; }) {}; + org-send-ebook = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: + melpaBuild { + pname = "org-send-ebook"; + version = "20180117.1824"; + src = fetchFromGitHub { + owner = "stardiviner"; + repo = "org-send-ebook"; + rev = "3e8030a16e420fe4a6fc73b6f166af73880c4843"; + sha256 = "19v9vjbpvib9jcv4z0jflqym2z101a2xaf2mcjcf692nlrz8y2wk"; + }; + 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"; @@ -52228,27 +53276,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, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "org-wild-notifier"; + version = "20180125.721"; + src = fetchFromGitHub { + owner = "akhramov"; + repo = "org-wild-notifier.el"; + rev = "3f87465d6c4ea63010b9beab8de3cfa54429bce8"; + sha256 = "1vxjlfdkl6yxgh50nmz87qsyga71wf8cmrggnp6bkljak88vgz98"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/114552a24f73f13b253e3db4885039b680f6ef33/recipes/org-wild-notifier"; + sha256 = "1lmpa614jnkpmfg3m1d2wjn9w0zig3gwd02n3dyjn23n71fiyhkp"; + name = "org-wild-notifier"; + }; + packageRequires = [ alert dash org ]; + 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"; @@ -52273,12 +53342,12 @@ org2blog = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, metaweblog, org, xml-rpc }: melpaBuild { pname = "org2blog"; - version = "20171216.1848"; + version = "20171218.1911"; src = fetchFromGitHub { owner = "punchagan"; repo = "org2blog"; - rev = "bcf31223242381cb9a2c38e4131bde0a014f1f39"; - sha256 = "1qpw5bs5qjlpw3hphbf2jg0h8bdrcgrb8xavdsx8viwjl013d4ps"; + rev = "aa7a5730f4a58a53c41370dcde7bec43d5c1a2cd"; + sha256 = "1ivf156186myr84rqbd8rn6wa8qjrip7la6sgc8k6ggg6lzvkqac"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog"; @@ -52489,22 +53558,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; @@ -52615,22 +53684,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; @@ -52933,12 +54002,12 @@ outrespace = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "outrespace"; - version = "20170904.511"; + version = "20180126.857"; src = fetchFromGitHub { owner = "articuluxe"; repo = "outrespace"; - rev = "020612dbbae2e5e9763b2c92038cbab406bc945f"; - sha256 = "0d6djy5j87caqwjnzy9ylz1pypkbjh46dynnpnfphlj85siwg6ji"; + rev = "5c3e036e0d72889b5084c67eeac317e88b1bf2f6"; + sha256 = "025lgvy8m70m72zxzdsdxgsayi3hr0hfp076mf0b97zfcw6h87c3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2659a78181b8fe98ca4a80c75ec8c9b6dff44bb5/recipes/outrespace"; @@ -53164,12 +54233,12 @@ ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-hugo"; - version = "20171208.816"; + version = "20180129.1108"; src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-hugo"; - rev = "0a6d6927c142346e75c3d58f617ad35af2f5c9bf"; - sha256 = "0pxfnx2rh01phxp5295zg8qacf2394bja26q1xws0vpp19kfwjqw"; + rev = "ebb670b73be1b8759ce093c4101b198f12b5cea2"; + sha256 = "0ks6q0fgbyz0bq222dqh88fivkr150hlhb5kkibdr644bjwmcwcy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; @@ -53248,12 +54317,12 @@ 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"; @@ -53395,12 +54464,12 @@ ox-rst = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-rst"; - version = "20171004.1553"; + version = "20180115.405"; src = fetchFromGitHub { owner = "msnoigrs"; repo = "ox-rst"; - rev = "6d1eab55ff7c8dc4bcf511c9483e69f2a840e928"; - sha256 = "10z922lcg8hz517kg57knx2irfcac8plp9nsxayrbxpkjx7mmjlj"; + rev = "58715dcba3922b5c7fc8ed5e7915277a9732fae3"; + sha256 = "1267rfj1rq04g9ngw0yglsdjma6bb04j3fc8afwsjixnbqv618kj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85770d6e235217e98dda9d8b9f027a4ba3ebba96/recipes/ox-rst"; @@ -53416,12 +54485,12 @@ ox-textile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-textile"; - version = "20171120.1758"; + version = "20180110.516"; src = fetchFromGitHub { owner = "yashi"; repo = "org-textile"; - rev = "e40472b13aee3d7dbf7bd916825431547024303d"; - sha256 = "112d8rzwz5r9ny0k9l080qxq0ly6alwbj0wfh22678hjwgx69zcn"; + rev = "0af57d17c93049bf7533061863f711d13fbed891"; + sha256 = "17jgb5bn3c4q4gasb2xas5bs3mrd1drnizgbqpnc50c8jfmcr4kd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02a68a7a99ecce8f1afa03e72ff1f636edaf5868/recipes/ox-textile"; @@ -53878,12 +54947,12 @@ pamparam = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, lispy, melpaBuild, worf }: melpaBuild { pname = "pamparam"; - version = "20171217.551"; + version = "20180122.1325"; src = fetchFromGitHub { owner = "abo-abo"; repo = "pamparam"; - rev = "eaa53a1f582e0ec244200f4d324edf3aca640de7"; - sha256 = "0xfs9brynqn13jwin85n2b4h64qcpw3zbpmy9cn1j459zhbldziz"; + rev = "f531518bd9952d39af8605f461fc43aa6b6fa5f4"; + sha256 = "110jnj7yp6j2qj5ar72c5kgkpj43b4b82ipq725xivk6zsvrhicr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/067b5e3594641447478db8c1ffcb36d63018b1b2/recipes/pamparam"; @@ -53920,12 +54989,12 @@ pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: melpaBuild { pname = "pandoc-mode"; - version = "20171216.1545"; + version = "20180122.108"; src = fetchFromGitHub { owner = "joostkremers"; repo = "pandoc-mode"; - rev = "242bc6fb154ed02d5829644778586234e31c0710"; - sha256 = "1ghkphkpvabmzds6pib88fpwgv83rcfqv78j59kjxhkcgpzd8bw2"; + rev = "883e131c53a6351a239c422f05027aa526181ddb"; + sha256 = "1qb50m4zyk57hs8siwiz21q5qymhl585crmhgqnvkspk6dg0063s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode"; @@ -53959,22 +55028,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 = "41045e36a31782ecdfeb49918629fc4af94876e7"; + sha256 = "0isvmly7pslb9q7nvbkdwfja9aq9wa73azbncgsa63a2wxmwjqac"; }; 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; @@ -54107,12 +55176,12 @@ paren-face = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "paren-face"; - version = "20161028.1127"; + version = "20180124.352"; src = fetchFromGitHub { owner = "tarsius"; repo = "paren-face"; - rev = "0a7cbd65bb578cc52a9dc495a4fcaf23a57507bf"; - sha256 = "0wsnng874dbyikd4dgx2rxmcp0774ix5v29dq372zynq6lamqkl7"; + rev = "166975683225367c866e6ae6f6acb88d24e21a35"; + sha256 = "02mh8w2na6qa94p3bh6pvdvmg36p2vrbp5hpjnwjcayrb92dskgy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d398398d1d5838dc4985a06515ee668f0f566aab/recipes/paren-face"; @@ -54191,12 +55260,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"; @@ -54216,8 +55285,8 @@ src = fetchFromGitHub { owner = "cute-jumper"; repo = "parsec.el"; - rev = "212f848d95c2614a86f135c1bf3de15ef0e09805"; - sha256 = "11qr9i55530pzmiwilfazaqxcjw8sx1iry19jvzdqsffjqvx2mnl"; + rev = "72c1897a42b3b0b59505b3562e8f46c6354faec1"; + sha256 = "0yg35fs9gr07j6x7xi4f3v11xdanmkhr5sr9lqim0m10aglv7vwf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/248aaf5ff9c98cd3e439d0a26611cdefe6b6c32a/recipes/parsec"; @@ -54254,12 +55323,12 @@ pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, password-store-otp }: melpaBuild { pname = "pass"; - version = "20171010.410"; + version = "20180109.201"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "pass"; - rev = "0f4ff034fb31b18f387e67f1de4029826db6cd0b"; - sha256 = "084497na8qql638qjhgad02rvhwyzz81xwh70p6rxxwfzj0i1p17"; + rev = "855e89446676f03065ed01e4a5c8dfba5eca3610"; + sha256 = "0s784pvv8jxiicvqcb9x0nynnpp0m431vw835qhp1pi1y4cfbbf8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass"; @@ -54611,12 +55680,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"; @@ -54842,12 +55911,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"; @@ -54984,6 +56053,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"; @@ -55068,22 +56158,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; @@ -55092,12 +56182,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"; @@ -55617,12 +56707,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "20171204.23"; + version = "20180128.843"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "bb68298e568cc0657bd362d7581c123c3010a5f2"; - sha256 = "0n4yv3aiv0g2s89cvsvij2hm55l3cp88cg75qdxabhb00nxni3m7"; + rev = "ff86ba6e5e9b9b27539eeec61a4adde65bb59f6c"; + sha256 = "0nh9sw9ykbgw8ljs3cqcx3c8aq00zz6ywlin4l3sjbhrgc2lpdab"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -55680,12 +56770,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"; @@ -56142,12 +57232,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"; @@ -56202,6 +57292,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 = "11eb23920410818fe444887b97ad4c8722d66c85"; + sha256 = "0lqz8m8a2ahvgm0i9cz0j4bisi34czc4s29z70p5p6rdg4g21fk1"; + }; + 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"; @@ -56223,6 +57334,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"; @@ -56394,8 +57526,8 @@ version = "20170419.303"; src = fetchgit { url = "https://git.savannah.gnu.org/git/gettext.git"; - rev = "981c523ddbd1462970335a1069573ca3bdd3df5e"; - sha256 = "1aq95scp0lg5r1fsn62r54dqamm3174wzrr0h3vxx75m3iycsxxi"; + rev = "7b967191976bf013cca0a5b21b1e3dbe34e86889"; + sha256 = "18ar8m5sj3drflcpl7z528x28nskhahjl5bwa8624csdzn0fhngy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode"; @@ -56656,8 +57788,8 @@ src = fetchFromGitHub { owner = "TatriX"; repo = "pomidor"; - rev = "f97a42cd261b5cf51ce07e1edaacb687472bd71f"; - sha256 = "14j1k0iqxpz8yfsdw5c31df4xxgcpvia3n4170fx48amvw475ip9"; + rev = "000dd3800829c469a072e788a272edca24313ee2"; + sha256 = "1rhc1n4r3yjlrxxj1mkziflb475z7gqcqm2r7r7b667f8k1b5wg4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0d4f313081594df23f357c40feb456847d8bd0/recipes/pomidor"; @@ -57051,12 +58183,12 @@ powerline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "powerline"; - version = "20171023.750"; + version = "20180115.1942"; src = fetchFromGitHub { owner = "milkypostman"; repo = "powerline"; - rev = "fda4fb96984607d4a6502b1d8c8898e56d10cf6c"; - sha256 = "1lz3kr8w9z9xx5amqqvim85asjji13q84d4r1cb5x77wajmj1p21"; + rev = "2933f2b6d00a8cab39f73fc6231fac311cba5b29"; + sha256 = "0fxkz7rqj057bnxfqgh3i88waqxnla05dqw20v8njf9swchry0ya"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f805053cd4dd9ed53ee0df17ad69429bc62325bb/recipes/powerline"; @@ -57135,12 +58267,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"; @@ -57198,12 +58330,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 = "0e8b95c4e5898a03e85dbc555c37b4f968292aec"; + sha256 = "0l8i0fbwwyhllkpk8xd6w5gcv65z4ja1ygf6slh5sd1g0ixh29md"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/968ac7bb98b385f8542dc150486982c0ded73187/recipes/prettier-js"; @@ -57447,6 +58579,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"; @@ -57596,12 +58749,12 @@ projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "projectile"; - version = "20171126.6"; + version = "20180128.655"; src = fetchFromGitHub { owner = "bbatsov"; repo = "projectile"; - rev = "184d3451c9258cfbbfa2b26a07c7daeee2e9a605"; - sha256 = "0a3h980xyqx7wx90gnfzqjs5zhakq8cygvxgc7iy0v54d6qp5v5s"; + rev = "c3562c3a182d3c9948db9c8f364e84da2e90c218"; + sha256 = "044fdvcjqkp25kn20lr77jirgdnzjrxp8i024zp3lz7wa4gywyhy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile"; @@ -57659,12 +58812,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"; @@ -58041,8 +59194,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "77d32bc56ce8f0cb37577eabcfd426b99fa3c091"; - sha256 = "1kd7jxzgqwmf0flk0zgwvi61n4mr62m3xh8r1s7g558nc7628yjp"; + rev = "da6b07a2e58cf6b6d5326b1f538e902aab3de5be"; + sha256 = "00baxp6nh6lskc0w5mm4w7m0pd0z6ai2sbpcl9ylcajqw0n4kknq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -58079,12 +59232,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 = "20171122.347"; + version = "20180101.1421"; src = fetchFromGitHub { owner = "epost"; repo = "psc-ide-emacs"; - rev = "633b07b238aff51dc4b95a75c67910a18ba28da1"; - sha256 = "0myvb9dqxm5g1zf7hgx6frgkr5h5839sdnrv25xf2h1w8jmyc0cn"; + rev = "085e9d5541ccf35e876a6135daaddaa0a58f3bb2"; + sha256 = "0q7xqrjvllngz658w32zm9jbz1njqwpaqgiv3b377nfnay9rsh3p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/384ffc463cc6edb4806f8da68bd251e662718e65/recipes/psc-ide"; @@ -58320,12 +59473,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"; @@ -58341,12 +59494,12 @@ purescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "purescript-mode"; - version = "20171203.2234"; + version = "20180120.709"; src = fetchFromGitHub { owner = "dysinger"; repo = "purescript-mode"; - rev = "2d1fa590a6de875ea4bd964349df0ba5e24fb1f3"; - sha256 = "00n15i3b33glhqc2yqs3axrdyc8id20w543cx74nn5ab4ybbjm4s"; + rev = "b76c7f37f1a3527e8ace66bbd584851e1f803cc8"; + sha256 = "0nnrfs1siz4wwn56razlig6cvi8fqgcgk5wv5b0iyizq8a8wwia7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77175fa470e517fa134751fbb38e144eb5b979ff/recipes/purescript-mode"; @@ -58721,8 +59874,8 @@ src = fetchFromGitHub { owner = "ssbb"; repo = "pyenv-mode-auto"; - rev = "714e322319ad7a8f5f2a3691aa431537b8a1b26c"; - sha256 = "1sclhzv3w9fg54dg4qhlfbc0p1z5clyr8phrckhypvlwfgbar4b4"; + rev = "783a93488e255346f9b1b2658424ffe0d670e8cf"; + sha256 = "090c5lnw2fz674c49szjsac3hdj5dwbnrbn921kvhw6q5lsn8z47"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f3fcb707356bd16fd0b573c176023534cd69d0d7/recipes/pyenv-mode-auto"; @@ -58780,12 +59933,12 @@ pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pyim-basedict }: melpaBuild { pname = "pyim"; - version = "20171212.2309"; + version = "20180128.405"; src = fetchFromGitHub { owner = "tumashu"; repo = "pyim"; - rev = "3b1c5fbdf3b910f96771935785e28cf33d8d54cc"; - sha256 = "1ijfsnjvyys941kgcq00d5dgnkbzj14gb7c9pks0x11bsdl0vr6p"; + rev = "37be07e2e585d1cb5964d7187fca22e863714056"; + sha256 = "1kgf363a7g7kpy32qw0n7iwlpkr93k4g6h84r3f0g58d8ckargm3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim"; @@ -58910,8 +60063,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "ad57a3f2c7ea890e06136250e0edbb39f568c760"; - sha256 = "1kp5frvlx13w0w17xp0vmc8qrss0gny3d9d1m5ic3x9vfcr03c4x"; + rev = "60d471c36f0f390b4f51744eacd73ed99aae164a"; + sha256 = "07bwknfcf148vp6hs9jq3f2ixkkiwwg1xy9jck4disfvym81kqz3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -59053,12 +60206,12 @@ python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-mode"; - version = "20171216.1153"; + version = "20180121.50"; src = fetchFromGitLab { owner = "python-mode-devs"; repo = "python-mode"; - rev = "09cd67a9ef9cfe0d564b2803aaa99ebb41800dcb"; - sha256 = "0nr1scq5f4pbrr2zbbj0gv9bc7pa7n7f1hx9h234f8dbsnz9d9cp"; + rev = "c9009f6753e05a4182674fdd3d9f80808de2dc2f"; + sha256 = "01r54skcxkjd6ihx7spx4rmp1b4x02yy9my93qgb4bkg3mwsbq5w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; @@ -59137,12 +60290,12 @@ pythonic = callPackage ({ cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "pythonic"; - version = "20160221.1123"; + version = "20171219.810"; src = fetchFromGitHub { owner = "proofit404"; repo = "pythonic"; - rev = "ef57d2b4267d1bb27fdf27b74954da89a3f70049"; - sha256 = "06wq41wnm2ixi0bylq53sma1330mxnris6xnikig1avaxhx8j409"; + rev = "ce9c45564efa5553f6268c34f5f1ca2dfcb4d4da"; + sha256 = "0kv9iv3d5jdrl9c5pnay6lj3if3a0l3f8gc01mms7b8xdpk37xr7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5589c55d459f15717914061d0f0f4caa32caa13c/recipes/pythonic"; @@ -59158,12 +60311,12 @@ pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pyvenv"; - version = "20171215.1329"; + version = "20180126.303"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "pyvenv"; - rev = "651a624fb41898d0c68970889ef7a72bad78b10b"; - sha256 = "0plpj3ndwvdzmnwinhpkq4z3pk6zmhjwxq0wjkkgl8vy12jkywpx"; + rev = "f925bcb46ea64b699f7cd06933c48e0d5db88b73"; + sha256 = "1a346qdimr1dvj53q033aqnahwd2dhyn9jadrs019nm0bzgw7g63"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv"; @@ -59288,8 +60441,8 @@ src = fetchFromGitHub { owner = "quelpa"; repo = "quelpa"; - rev = "355d06d5364a1be62e662eec77d32ae3c7b6d739"; - sha256 = "083qm5zpxcnf03179bkpba89m5l9l6vamnhwlp2fnaqxshh5nb9x"; + rev = "fc393aeb3bb1a9a35e603515d13c90cc008caece"; + sha256 = "1zkx7bpzmphhfwgqf5pfwf6qb4vjwgvhmds38vm6h2302hl4racx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7dc3ba4f3efbf66142bf946d9cd31ff0c7a0b60e/recipes/quelpa"; @@ -59540,8 +60693,8 @@ src = fetchFromGitHub { owner = "greghendershott"; repo = "racket-mode"; - rev = "132175062ca4b8436bfc69b60e0de1feac0d2c8c"; - sha256 = "10bqg28znv1frfvdg8gp3iv5j3dpimnvi96l8gdg7w9217v82ja8"; + rev = "240a52f5e944ca6aa1799cb32160301b1d128917"; + sha256 = "1r14q751g87846ilvqkifaq0nqyl02dgkfdfdpmsw9k006ml8rfa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode"; @@ -59998,12 +61151,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"; @@ -60145,12 +61298,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"; @@ -60166,12 +61319,12 @@ realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }: melpaBuild { pname = "realgud"; - version = "20171218.639"; + version = "20180115.127"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-dbgr"; - rev = "3a2e3000561d605dbafb3c5f483f6aec3c0a86de"; - sha256 = "1bw1ygqvq3vih3mn8wg4is06il4bhkn68idzp5ixds6jz0vfb023"; + rev = "a5853d53a63e8a23b7b4c2ae0faf575623637c8d"; + sha256 = "0yalj4nn42g32xjr2s5hvlhinyhz1jjyx74494c018prybs16z75"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; @@ -60337,6 +61490,27 @@ 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; + }; + }) {}; recompile-on-save = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "recompile-on-save"; @@ -60487,12 +61661,12 @@ redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redprl"; - version = "20171204.757"; + version = "20180112.838"; src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "d7b6baf807d4199666d313a9f3e3face7f82e227"; - sha256 = "0735np7pxzpmdbq76by9s7j1yyfc26z97jvqywc4dvvkzlka15kl"; + rev = "6737a3dba0501aeb275c1e5ee8833ee3a9a35845"; + sha256 = "0vrrwiz02vi21h11907lhbbkbl367nqd7ccqjpv2g6rsswsfrnpy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -60508,12 +61682,12 @@ redshank = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }: melpaBuild { pname = "redshank"; - version = "20171115.1156"; + version = "20180128.1348"; src = fetchFromGitHub { owner = "emacsattic"; repo = "redshank"; - rev = "9b64da7895973a29a32320a13c08de69befa0006"; - sha256 = "0vzha8pn4bgdnri1j5cgmasvn9j3ny0rh0i0plhjbys26f88klnb"; + rev = "f3eef7d4891570e6bcb74eb52c73edb765a639b8"; + sha256 = "00mihmjd0amr9wzb3qsz69bp7y5iqx9vvh1hg77i57zlm88x6ma6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2677a5cf74ebace6510517f47eaa43b35f736683/recipes/redshank"; @@ -60948,12 +62122,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 = "0c0ac7451149dac6bfda2adfe959d1df1c273de6"; + sha256 = "0sx3kw1gpliifbc0gh2z1lvig68v3gwqjbj0izgn77js8kqxad84"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f58a801f0791566d0c39493a5f82ff0d15d7ab41/recipes/req-package"; @@ -61137,12 +62311,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"; @@ -61263,12 +62437,12 @@ rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "rg"; - version = "20171121.1151"; + version = "20180122.855"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "68984092d0e0725057e7b67ba32016903170f189"; - sha256 = "0qd3qh640339n1dn1isk23xhnkj0pds08yzfak4ijxyzlgl63bdq"; + rev = "0a4df0c3a64ace6a5aebbfeea5c0161e752471ab"; + sha256 = "0z1igj5c74qdjx5knsf73d7qwfyybfixyilw7z7chbyffw77z1km"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; @@ -61477,8 +62651,8 @@ src = fetchFromGitHub { owner = "felipeochoa"; repo = "rjsx-mode"; - rev = "4c10dcd764ade8e3d5dc235c26ba9299576a513d"; - sha256 = "034hrzcvbnsrr9cxy2wzggnsax708hd231hfkixwffzrrwdlhwz8"; + rev = "ed8ff80f7fb7a9d46715577e4937de756b001ff7"; + sha256 = "14a6qhh4rvsn1z8jhj4wjlljmxmmq2hrmsqpfmvx7yn1r3x51liq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode"; @@ -61704,12 +62878,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20171215.1410"; + version = "20180107.2358"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "c44d3b922de999080e5f815cf4746d2a286d551e"; - sha256 = "0zgrwpcc14w9qhasrfryh5qqw4kdr36x8i9wqcx5mjbylh7p08z5"; + rev = "53e74892e8bd15baa4d1bd1d640dcabcba9667ee"; + sha256 = "0ynhx1cyxvrmkadb8h81xrhxvf9wssq74xk236dhl7q1mqagnjaf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -62103,12 +63277,12 @@ rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rust-mode"; - version = "20171208.1015"; + version = "20180109.544"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-mode"; - rev = "27911c88b0d32b66429d61bb056ecf1b10e66598"; - sha256 = "1p8z1s3j0cbwxkbcb1p3h4m1vmrxrpkch0xax24jmkpzjrqhl7j9"; + rev = "cfb440810a010b099e7196f8701c9d990a3641d8"; + sha256 = "17mm7mk8s4s9ka7035bf7bd6sfxwi3m2iss9q3pg2d7931nzh1dz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; @@ -62166,12 +63340,12 @@ ryo-modal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ryo-modal"; - version = "20170217.1021"; + version = "20180114.1004"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "ryo-modal"; - rev = "f6073b56c43a8bc4fc01eb27faba3335d556606a"; - sha256 = "1pq8c79qrs2zwp8q89rhm5lmcpl48axnc9mwl10gq4jy2rlzfrks"; + rev = "4dbe9e472306e5d293213842d9488c0b531eae8b"; + sha256 = "0l4153dczvkl88xnppqwdmj78c9rfj1bhl2d4c2sr1gc6hy7nj9l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ryo-modal"; @@ -62334,12 +63508,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"; @@ -62544,12 +63718,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 = "4b5e9f5b1ab464321ad616e3940a97c2c194d334"; - sha256 = "0q7sn6c5s5i8zkgfnmxi9diifzxx9ahsl7w1ss2w2q1rlb7a0zb0"; + rev = "b635c493875e43e57102eb54bc80d008e3ca85b5"; + sha256 = "1vx7ybj4p5smal2sxa4j96dxfgzw184xxqn9m8y2s5lpwlndpz49"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -62984,12 +64158,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"; @@ -63107,21 +64281,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; @@ -63379,6 +64553,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"; @@ -63571,12 +64766,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"; @@ -63907,12 +65102,12 @@ shimbun = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shimbun"; - version = "20171018.131"; + version = "20180108.1712"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "w3m"; - rev = "33f17ec647363ff0f8c6b9c800f9cfdd32417f79"; - sha256 = "1zh0xn0nhngd4h0rs19vasl961qpm75h7q8yg1v5m0pfrgkai3i2"; + rev = "92be3a5bf5940826882bb6e17a85952a6b4eb537"; + sha256 = "1n3020y18brpi7d286s3qia8fp4nbws16224nqga18hcx00zzdna"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/shimbun"; @@ -64138,12 +65333,12 @@ shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shx"; - version = "20171108.910"; + version = "20171230.1219"; src = fetchFromGitHub { owner = "riscy"; repo = "shx-for-emacs"; - rev = "aa2fda2419b6e2540f1e6eb3789b6a247c319050"; - sha256 = "1imnpbc1wkx8gwac1v3ailycjxs4yxwhbhifgn20jib85nn8s66i"; + rev = "33383bd359d795df2d7ef725b5349c953f5a6aa8"; + sha256 = "1arwsb6as8jpah0bs3b92a3kdnbfkhnsm1jglspfh4lqpafmx5vf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; @@ -64327,12 +65522,12 @@ simple-call-tree = callPackage ({ anaphora, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simple-call-tree"; - version = "20161007.1913"; + version = "20171223.1037"; src = fetchFromGitHub { owner = "vapniks"; repo = "simple-call-tree"; - rev = "431206e9c2b88cbab9cfe9ebf3f6cb73f5e6740f"; - sha256 = "1qwswf5i060j396gfsr60zid0lqwf5xkrq3q0c1s6nz9wxlhayjw"; + rev = "51cbb9baac4a71c9e2759b3dbbd48829b7b0ea79"; + sha256 = "16blbycmqgkkvx1pqyld7jbb37wpwjh1y8kcd23ckdd9pr8qccfs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/316a5ffcb3080abd623bbe3065077809e6cbfb74/recipes/simple-call-tree"; @@ -64390,12 +65585,12 @@ simple-paren = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simple-paren"; - version = "20171206.128"; + version = "20180104.1016"; src = fetchFromGitHub { owner = "andreas-roehler"; repo = "simple-paren"; - rev = "d231218ee2f4ef47683ddc3e9de22e84c3489582"; - sha256 = "10cmifq3sr9hvvzf659llq4gwxigcd3si35bh5ji6axvqwcf77g2"; + rev = "6a8c33443a1e8d502d272584a4a09b23a2342679"; + sha256 = "01lr9rndk5l2ssdqvrxikwhl9sswcp3hn233bjsq9kv6i5f9r8ca"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e8886feb4a034fddd40d7381508b09db79f608f/recipes/simple-paren"; @@ -64432,12 +65627,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"; @@ -64583,8 +65778,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"; @@ -64663,12 +65858,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20171217.2027"; + version = "20180125.450"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "645b450984de7b3d205b392542d1e32f98f46e74"; - sha256 = "0y77lr2yysfq815hzfc5awjwmrm2q437aa7whys879y9q48cq75v"; + rev = "8b92582a1b7567bd85de2996e5883982ef9c2f1b"; + sha256 = "1h7bd8dvcw0sqknh5wdnvci47l5ffhj539sz2vjf90fvmqhf51id"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -64726,12 +65921,12 @@ slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: melpaBuild { pname = "slime"; - version = "20171207.1712"; + version = "20180126.1033"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "cdb7e0caea98156d4be00147c8dc967522c1a682"; - sha256 = "16hq0s5zvwnx2cm4369gb2qs6fnrx8jcsixvay6mwsmq8g5ba32n"; + rev = "ae3b7e7ed63a850e9cb5130e0ca5544150d74156"; + sha256 = "1q27jxagllhmnc44b3rg1lkas1w2q6xv91j3f020gvasnzmbv5gh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; @@ -64744,22 +65939,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; @@ -64894,12 +66089,12 @@ sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sly"; - version = "20171111.1604"; + version = "20180128.435"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly"; - rev = "83c88318bca48b1269924cd5c76b9777ecf84f11"; - sha256 = "0s6y54mi4p336cmky9kvfhwrwfkhvl8awy73knf27zfhclhjfh7c"; + rev = "f6dda1ec006ee67122d864e6069e85194a628083"; + sha256 = "1g92nksifwh7yvrwkwqzrhrficrlkyi04nw9ydrf8mkvn3svybgy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly"; @@ -65187,12 +66382,12 @@ smart-jump = callPackage ({ dumb-jump, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smart-jump"; - version = "20171217.2037"; + version = "20180121.2252"; src = fetchFromGitHub { owner = "jojojames"; repo = "smart-jump"; - rev = "26277136af9d483950dbd704b692ed01ef2699e7"; - sha256 = "092dl7wvx4lyz9djkhxggg4ghr9kmdi3rya61gn4mnk7zh01cram"; + rev = "5431fcd2052918d85507ac31c40256adb67eb77e"; + sha256 = "12224rfgb9193dmjgshcaxac70fprfl7r0m64p4aw0f6cxfr0pqp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/52f29e14e61b28cd1637ca5d6bd878d91a71251f/recipes/smart-jump"; @@ -65229,12 +66424,12 @@ smart-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rich-minority }: melpaBuild { pname = "smart-mode-line"; - version = "20171013.849"; + version = "20180129.130"; src = fetchFromGitHub { owner = "Malabarba"; repo = "smart-mode-line"; - rev = "1facbe9816b602c640ddb23602e30588d6d904ca"; - sha256 = "1fgh4yss9brchnfphdijy23qknv30hxkgsbz6p2d5ck6w7xml4lc"; + rev = "5aca51956fae55d7310c1f96b5d128201087864a"; + sha256 = "1wpavjkxszq1xr49q0qvqniq751s69axgnsdv37n73k3zl527vqw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/smart-mode-line"; @@ -65254,8 +66449,8 @@ src = fetchFromGitHub { owner = "Malabarba"; repo = "smart-mode-line"; - rev = "1facbe9816b602c640ddb23602e30588d6d904ca"; - sha256 = "1fgh4yss9brchnfphdijy23qknv30hxkgsbz6p2d5ck6w7xml4lc"; + rev = "5aca51956fae55d7310c1f96b5d128201087864a"; + sha256 = "1wpavjkxszq1xr49q0qvqniq751s69axgnsdv37n73k3zl527vqw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60072b183151e519d141ec559b4902d20c87904c/recipes/smart-mode-line-powerline-theme"; @@ -65418,12 +66613,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20171201.242"; + version = "20180129.939"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "65fbcfc849afb89e2642f9b87f66e6a96382f88c"; - sha256 = "0k4ar82axgxs84l2qdmrhhgf82309j2cxrv2gaxc3g7cxnj16ska"; + rev = "05591f370ca31edc6c5ff0a762f8b03ebc1309df"; + sha256 = "1lb4j0gddzk6wb0wslhmvm09r2q1rl7vfwjraldyfzkfwspmb6r4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -65502,12 +66697,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"; @@ -65754,12 +66949,12 @@ snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "snakemake-mode"; - version = "20171030.1016"; + version = "20180128.752"; src = fetchFromGitHub { owner = "kyleam"; repo = "snakemake-mode"; - rev = "990d6d8e98b96b9afe5b9b340507b1aecd8de1ce"; - sha256 = "1bd6kwzkk8vfhfc7m384y40lh6rdw90g6624c0hlfrs9zwihmvs3"; + rev = "6cf6d20db2e5253ce3f86e302651faa28f220aa7"; + sha256 = "0dmvd5f5rb5kkzjkhzz17b40hlld23sy5wyzr8vq763f6pzs37kk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode"; @@ -65985,12 +67180,12 @@ solarized-theme = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solarized-theme"; - version = "20171215.2313"; + version = "20180101.42"; src = fetchFromGitHub { owner = "bbatsov"; repo = "solarized-emacs"; - rev = "e77ddc10b43a5155e6c72608539df7c68802371d"; - sha256 = "1xg9my5galzbkylsn9mmq5ii45s8dph45ilcakkmkdiwlhsvv1c5"; + rev = "2dd2699b2f315374333292b132dc0dc03719aba2"; + sha256 = "04365kpw8a3f3963v6c3q8zka5xivx9jikvcar7fx59l4l7k5i2p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme"; @@ -66006,12 +67201,12 @@ solidity-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solidity-mode"; - version = "20171113.1058"; + version = "20171231.741"; src = fetchFromGitHub { owner = "ethereum"; repo = "emacs-solidity"; - rev = "b8ddfd683c3335805f0a4788244bf0d224ffc6ae"; - sha256 = "0s5hb4l3x9q3vch0i314138p53aq9kb0pyn9whk7r9zwrzvi34jd"; + rev = "b5d95ef678305ca70b17e94fc2ee4289a8328048"; + sha256 = "04l3hvfpgqiaxdxh8s2cg2rx4cy50i7a411q81g8661fx60c6h6p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb9df5ec0692352b6494d435d11166f4ea26c99e/recipes/solidity-mode"; @@ -66223,12 +67418,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"; @@ -66370,12 +67565,12 @@ spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spacemacs-theme"; - version = "20171217.611"; + version = "20180117.1333"; src = fetchFromGitHub { owner = "nashamri"; repo = "spacemacs-theme"; - rev = "a8b51ed10a1a0f648dc8c2cc16043189be0edd88"; - sha256 = "18p16w05yrln7h2hg126bm5qxv09miqxcqrf68bfd5hc61na3nws"; + rev = "fb2a88a604b0eb6bdeb02506733b947e155a9e64"; + sha256 = "0ic09n4ddxv78sb4h5gz9a1frnnbsdkvizdhj2lfdr5xy00hais2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme"; @@ -66493,18 +67688,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 = []; @@ -66516,12 +67712,12 @@ speed-type = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "speed-type"; - version = "20171217.624"; + version = "20171230.847"; src = fetchFromGitHub { owner = "parkouss"; repo = "speed-type"; - rev = "6a1784c80a6b62d6bf76eb0ff0058e36ade70e1e"; - sha256 = "1z1x3n9cxchbylima4w7is8j98ny58c8y68ygyp55c3s4h0qm892"; + rev = "7a67fcd7bf825eee890097bd4a1b3c4f531a1135"; + sha256 = "0nlmqgf4rg5qmkhpsal7j18wr5h74971k6d0wzw7rmjmpnjqhzvc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6c33b5bd15875baea0fd2f24ee8ec9414a6f7aa/recipes/speed-type"; @@ -66618,24 +67814,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 = "20180125.900"; src = fetchFromGitHub { - owner = "m31271n"; - repo = "spike-theme"; - rev = "7a7766be0b6197103840644bb074f864d0d91cd8"; - sha256 = "0ah19a68d6fda3g5zzvqz28cms0yiadykkx7p8hiid4s4mdl41hj"; + owner = "unrepl"; + repo = "spiral"; + rev = "8e9707af9d6d61d8ec54edc98b958f1c829e98dd"; + sha256 = "1p91k6xvy0w11p08nbk1b9x33ck6kxz4khgsc39wlhyv02rhqqi0"; }; 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; }; }) {}; @@ -66730,8 +67926,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"; @@ -67020,12 +68216,12 @@ ssh-agency = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-agency"; - version = "20170807.1152"; + version = "20180127.1301"; src = fetchFromGitHub { owner = "magit"; repo = "ssh-agency"; - rev = "e572e031852561f98a7053afcdc9a3796dde2137"; - sha256 = "0z2ywkiwv983vz4bk5vc62p3xapp15a4715l9sp5c8x70nlq02y3"; + rev = "31b2b41e33d315fff54ace8bc2234abc38adf7cc"; + sha256 = "02kw4h3hzpad39ir6y8cg8lnldd01cl0lm8p22kf4bf5f7f3sdlw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9a9e4bd0205908bfb99762c7daaf3be276bb03a/recipes/ssh-agency"; @@ -67062,12 +68258,12 @@ ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "20171211.311"; + version = "20180129.245"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "ee808acef916c7cf828923e6517a6867044caaf5"; - sha256 = "0dv2d6rhp23ckpzzdda3w3p5l7pps8vxs7b98r6320w2a2villq5"; + rev = "5d70d89cddae17e4e412c9246871c3cbc860e3c6"; + sha256 = "02cdd5jx03n1xzkkswlcb0l4zf32ysmz2hn76cc7lh4i20iqi06q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy"; @@ -67125,12 +68321,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"; @@ -67150,8 +68346,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"; @@ -67314,12 +68510,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"; @@ -67332,6 +68528,27 @@ 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"; @@ -67440,12 +68657,12 @@ string-inflection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "string-inflection"; - version = "20171117.1731"; + version = "20180102.643"; src = fetchFromGitHub { owner = "akicho8"; repo = "string-inflection"; - rev = "e644c8bf2a5e36ddadcfe4de657588c00fd368dd"; - sha256 = "1p5i5jkybzjb008hlq90mjrbcap67dszzmp9flarkq6p0sf1lw12"; + rev = "d3bbc560bad160ba183778ca4628a2cce34fdd65"; + sha256 = "1yjy11s027r7v8bzwsqfpfzh2r2ywnywx7ngajw9gy9yfchw1xxs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c2e2b6dba8686236c2595475cfddac5fd700e60/recipes/string-inflection"; @@ -67753,12 +68970,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "20171016.1420"; + version = "20180115.1439"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "345e00569333095eb24e61239a80b0f0c77b2d11"; - sha256 = "0npqvhnfmrx7jq1slz489rh2l4rnfhqhbi6ybdzw5rism8r3jqwb"; + rev = "bcb2629e548de11d5eeca4a4f346b8a251b533c7"; + sha256 = "0rq93sljqa8r1vc47cwsrf2qnrl3rs1dixg6zkr9fr0clg5vz0jq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -68005,12 +69222,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"; @@ -68068,12 +69285,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "swift-mode"; - version = "20171202.2314"; + version = "20180124.2324"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "18c3dc47dfece59640ad501266f2e47b918f2a14"; - sha256 = "0qk962xzxm8si1h5p7vdnqw7xcaxdjxsaz1yad11pvn9l2b2zpzq"; + rev = "7739e4954cc614ecd6b37e935f82ad057e256d56"; + sha256 = "09mvwfi3nv4hkdvh76d7737nl3zaxn4a5vpmv2645q9s4vcq8zj8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -68110,12 +69327,12 @@ swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "20171217.334"; + version = "20180124.1142"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "364fb09dccc30c46169dfe8acc3dd0702d2f556b"; - sha256 = "1nqp8sfg0vrdibh4hm88szssn63pn09rn56sz690nvwwbdhf2m30"; + rev = "ffc34c666c2b214d01e3f722249f45d1672566bb"; + sha256 = "0gzf8l0clh2p86m6xcygykskhigr43cpwfvj1sl06mcq600fxavn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -68236,12 +69453,12 @@ sx = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, markdown-mode, melpaBuild }: melpaBuild { pname = "sx"; - version = "20170521.1832"; + version = "20180128.1705"; src = fetchFromGitHub { owner = "vermiculus"; repo = "sx.el"; - rev = "8f1e3346286cfa5a5299ef192cc5aca3f37a7745"; - sha256 = "1ans6l0rv71w2vq0v4137jr0jhgzhkk62l7cq6b5m83v4ld9gr09"; + rev = "0bc0adf1b5c93795ca814f3f123405d2782088f8"; + sha256 = "0r54y80x44ydpbhsx4rgxwcf37x9w099wis0yy8cbb95asl7765j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f16958a09820233fbe2abe403561fd9a012d0046/recipes/sx"; @@ -68383,12 +69600,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 = "ceeb06e24d3af3643862ecfdb263590eec1f492f"; + sha256 = "1qdppyx24zmz9dzm9kjvcx30g6znik602mg2h2s835cww9n97idm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/synosaurus"; @@ -68425,12 +69642,12 @@ syntactic-close = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "syntactic-close"; - version = "20171209.810"; + version = "20180109.316"; src = fetchFromGitHub { owner = "emacs-berlin"; repo = "syntactic-close"; - rev = "096f068a338278b1603b7291227332a4e7690d76"; - sha256 = "1d6ffz1bbwc20njn2ax5vqinifp2z36hyz5xwg0n8ls4yxsjpzvc"; + rev = "0118d3a041448dbf98c1ab8cc25ed75d7649ca17"; + sha256 = "0s1hamnrnh64v8sl816vd259y6j7r8rjy8avxwlfp65ah4xlcdcr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2c15c0c8ee37a1de042a974c6daddbfa7f33f1d/recipes/syntactic-close"; @@ -68487,12 +69704,12 @@ system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "system-packages"; - version = "20171216.934"; + version = "20180121.1007"; src = fetchFromGitHub { owner = "jabranham"; repo = "system-packages"; - rev = "e3493bb2b8704a903a035e158e35892ad86a6894"; - sha256 = "05722r27syq86fd96m9f2ylfc1jc36yc6islcdlpfjfpjjh6z120"; + rev = "466785ba8425308d00de1211bc79aebc0dd1ce75"; + sha256 = "16szrakal0l3p2aj133a16830zl7rcca357bbz0gj3n3vj9hiys9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages"; @@ -68529,12 +69746,12 @@ systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "systemd"; - version = "20171006.1352"; + version = "20180101.1803"; src = fetchFromGitHub { owner = "holomorph"; repo = "systemd-mode"; - rev = "22f024fe8f433af7b6a6b99520cea1e766894fe5"; - sha256 = "11h1nr9gz0mw2gwlplv00i06s9ziw77a7zfcrrzd01rmanz1m4fa"; + rev = "228f0b99ca3e1f3139ae8cacd15f9698d5b6da90"; + sha256 = "0cdqpzkx01qm0pk66hs6yhzv5iccrzzgfv3bh5c8i91v55d66bff"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd"; @@ -68822,12 +70039,12 @@ tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tao-theme"; - version = "20171126.2321"; + version = "20171221.1001"; src = fetchFromGitHub { owner = "11111000000"; repo = "tao-theme-emacs"; - rev = "e4e55cf2646c0479262db013b15b6831dd2069fa"; - sha256 = "1dsix9hn5x4wc562jcmxw7802shch1qj9xjfi7ys1rbwa2awm8rx"; + rev = "a97df8c51d77696787aaf55c67207f19c803fabe"; + sha256 = "1djp4gbs6gr956a5hpkwh5laasc7pypqip32l7djd7405vx5ixp2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme"; @@ -68847,8 +70064,8 @@ src = fetchFromGitHub { owner = "phillord"; repo = "tawny-owl"; - rev = "a8fc8300481a1e033a3811ccda54e552392d1689"; - sha256 = "1lkldr6rr21f97vp6kms2ha8hsszhmba4sn07is4k55lpvlnxd49"; + rev = "ba321af1103d463ee46cef68416cab635884cc7c"; + sha256 = "17038h6yxq8h0nb35vrjgxh0iwhqibbxympxlnxa1z2k46imzyhg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode"; @@ -69491,6 +70708,27 @@ license = lib.licenses.free; }; }) {}; + texfrag = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "texfrag"; + version = "20180117.2025"; + src = fetchFromGitHub { + owner = "TobiasZawada"; + repo = "texfrag"; + rev = "aca88ea6440dc9a8ac35692e72ee00aac27ce575"; + sha256 = "0bgjsqsxpfncfab5wnjpwy64wli6k7xw77dn7l1lpbymmsm9mnr5"; + }; + 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"; @@ -69599,12 +70837,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"; @@ -69624,8 +70862,8 @@ src = fetchFromGitHub { owner = "myTerminal"; repo = "theme-looper"; - rev = "0feeed3c93fc54305499bda5953112487f25a3a0"; - sha256 = "18fkfr7cihnkxbz7r2p6dl5w2yzaibx3qxgwqgmx3g47lb1g13gc"; + rev = "d520d29a8bf4061b2f5f750122a0f87f4dc3da6e"; + sha256 = "1zfmmn2wiw2vb0c262nnn5pkfjm7md91rx18l65glcq4y7200ra0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/theme-looper"; @@ -69750,8 +70988,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "041c3c777db9639b0a9195bc6aa1f935501fd506"; - sha256 = "0ichslkv2qxk815d9j0q6rz51nndm462l63bv6czydphk3k5vbb7"; + rev = "3d556248a8b97310da49939195330691dfe9d9ad"; + sha256 = "0nz71cgi4ixs33x6f6lfdamsbn59sgjqn8x4z0ibssgb7ahahj2f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -69788,12 +71026,12 @@ tickscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tickscript-mode"; - version = "20171204.1316"; + version = "20171218.1803"; src = fetchFromGitHub { owner = "msherry"; repo = "tickscript-mode"; - rev = "4f8635c6c5165cebf0a57abb9d86aff3a9f9dc1c"; - sha256 = "11pfvswyv7m96w2cjiw6mp24lc8g40q2l5m3khph7987nc45rlnz"; + rev = "f0579f38ff14954df5002ce30ae6d4a2c978d461"; + sha256 = "0b3rbsd978ch0hiv45sqg9g4zsxhjn557j5f72vjql8cx1h5d8s4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c60ee1839f728c5041bde1fe4fa62c4d41c746ef/recipes/tickscript-mode"; @@ -69830,12 +71068,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }: melpaBuild { pname = "tide"; - version = "20171214.543"; + version = "20180125.418"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "008f8f9cf44c81e230d58ed3d932e0ee43c2e09f"; - sha256 = "0s42f66lp3mn44jq04r4ccxac0l150w9nvy3bbvx8xxza2zn7lrw"; + rev = "6a62e0709cf1f78c0596973217a167d233ad4a74"; + sha256 = "16f418sk0b7z2kq047pz1lxwx1yanbfcjyp7jlhxajklwmmsv43i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -70091,12 +71329,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"; @@ -70406,12 +71644,12 @@ total-lines = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "total-lines"; - version = "20171211.421"; + version = "20171227.439"; src = fetchFromGitHub { owner = "hinrik"; repo = "total-lines"; - rev = "eb4d5406633ba891fc3122087b8969429ebc2c00"; - sha256 = "154jysl3irr5clsb0yap0c26bdjiabvb5qiisff7qfpgqrg8ggfp"; + rev = "c762f08d039c8103f71c747e00304f209c2254f4"; + sha256 = "0ajbqrkg3v0yn8mj7dsv12w9zzcwjkabd776fabxamhcj6zbvza3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b6455dd89167a854477a00284f64737905b54d8/recipes/total-lines"; @@ -70510,12 +71748,12 @@ traad = callPackage ({ dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, request, request-deferred, virtualenvwrapper }: melpaBuild { pname = "traad"; - version = "20171130.2146"; + version = "20180104.2351"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-traad"; - rev = "78e67f7ecef4804cfd1b7c241ee2de8560600f4e"; - sha256 = "0nnc41lalyy6hwb3m6cz1yn9hm8qlkdz25n0p8d8w9l0sks9a3bg"; + rev = "ad160e32f4cc9849aa570ed8e29269a0845921ae"; + sha256 = "0rj8fg66rzrw1hv707p0dmf025c1dymp373z87ryy5sxs24vn3j5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2b3eb31c077fcaff94b74b757c1ce17650333943/recipes/traad"; @@ -70542,8 +71780,8 @@ src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "4070f2d2c5585e5280fa57edc16e31dfebd9b7d7"; - sha256 = "1gmgb8cxqc891gzzf518467y9p65162sj0c1xgahzjan5gxhh25m"; + rev = "58fc1a3c7f9f6e3126585b1ab2f3d00f824b7d7c"; + sha256 = "1vsh2x794zaf02zql4s6bn3v0m3xm43icvrn7jfmi660qh3f4bsy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking"; @@ -70584,8 +71822,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"; @@ -70643,12 +71881,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "20171209.905"; + version = "20180116.854"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "7ba791404541c5cf7b063bbfe390ee7384dd2bdd"; - sha256 = "0nibvw1d5ykdgm7im6nil0hclribss7lk3ynn9whqcjbk790xg2f"; + rev = "cbdf6fe7a25f5ff7aee786fdda83ce0f2de2bd2c"; + sha256 = "1ddqk466fjxmy41w9dm7cxx89f18di9410aqmfzhivsi0ryl8q3i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -70748,12 +71986,12 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "20171217.335"; + version = "20180128.1312"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "ca06bac16dda60ee1a41f8ce2262509f2048f123"; - sha256 = "19qar9rlrkmibgjdcxv0nqjkh4nz709j2rn33zrmhcy65iaamxgz"; + rev = "16640850f4b9810e88236e81b7b64ca56a95e05c"; + sha256 = "0dxcpdw3jvfnij7pyy4d13wspfw7kxknxk8512q22ck51n0835ss"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs"; @@ -70769,12 +72007,12 @@ treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }: melpaBuild { pname = "treemacs-evil"; - version = "20171210.1526"; + version = "20180110.905"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "ca06bac16dda60ee1a41f8ce2262509f2048f123"; - sha256 = "19qar9rlrkmibgjdcxv0nqjkh4nz709j2rn33zrmhcy65iaamxgz"; + rev = "16640850f4b9810e88236e81b7b64ca56a95e05c"; + sha256 = "0dxcpdw3jvfnij7pyy4d13wspfw7kxknxk8512q22ck51n0835ss"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-evil"; @@ -70794,8 +72032,8 @@ src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "ca06bac16dda60ee1a41f8ce2262509f2048f123"; - sha256 = "19qar9rlrkmibgjdcxv0nqjkh4nz709j2rn33zrmhcy65iaamxgz"; + rev = "16640850f4b9810e88236e81b7b64ca56a95e05c"; + sha256 = "0dxcpdw3jvfnij7pyy4d13wspfw7kxknxk8512q22ck51n0835ss"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-projectile"; @@ -71229,12 +72467,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"; @@ -71271,12 +72509,12 @@ typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "typescript-mode"; - version = "20171213.541"; + version = "20180118.2305"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "typescript.el"; - rev = "861d5983b6894a101b6417ef3f4bd2999ea17ea1"; - sha256 = "1bld49njpbd8r86d886yc96i91z722553r1d9zy94iz76yw98fnw"; + rev = "7249d76e2d4580c5c2f1f5978490b1fe0ffc57dc"; + sha256 = "0bvarlk3pmzh1g489rdbsh0c255fj78si99m9a6l4ha9jk4xa5b6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode"; @@ -71334,12 +72572,12 @@ typit = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, mmt }: melpaBuild { pname = "typit"; - version = "20170519.51"; + version = "20171231.2214"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "typit"; - rev = "bf6e72d76c0f3a68d7cd53c6580e92aa15d28dc5"; - sha256 = "0qf2599x60nipmr78cmlnswid0lj552b0fjcw2lbyg7mnhxlnkmj"; + rev = "41309d8a64a992f532753093742c15d413c446b5"; + sha256 = "1fqaf4n236l4qzy4ac370laysb9jnj98769nri6qkirsfzk6hcgd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d17d019155e19c156f123dcd702f18cfba488701/recipes/typit"; @@ -71929,6 +73167,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"; @@ -72034,15 +73293,36 @@ license = lib.licenses.free; }; }) {}; + 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 = "20171217.35"; + version = "20180127.1413"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "865e931889f33495f3ce1b9e14b5b3e959887424"; - sha256 = "0xs9yg1gar1xbk3x8cydmi26zkl0aggrks70m5rnsc3yp9iy6w8b"; + rev = "8ecb0f1c56eaeb04213b476866eaa6939f735a61"; + sha256 = "1w4v3zsz2ypmjdysql0v0jk326bdf1jc7w0l1kn0flzsl2l70yn8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/51a19a251c879a566d4ae451d94fcb35e38a478b/recipes/use-package"; @@ -72058,12 +73338,12 @@ use-package-chords = callPackage ({ bind-chord, bind-key, fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild, use-package }: melpaBuild { pname = "use-package-chords"; - version = "20171207.2240"; + version = "20180127.1413"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "865e931889f33495f3ce1b9e14b5b3e959887424"; - sha256 = "0xs9yg1gar1xbk3x8cydmi26zkl0aggrks70m5rnsc3yp9iy6w8b"; + rev = "8ecb0f1c56eaeb04213b476866eaa6939f735a61"; + sha256 = "1w4v3zsz2ypmjdysql0v0jk326bdf1jc7w0l1kn0flzsl2l70yn8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/use-package-chords"; @@ -72076,15 +73356,36 @@ license = lib.licenses.free; }; }) {}; + use-package-el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, use-package }: + melpaBuild { + pname = "use-package-el-get"; + version = "20180122.142"; + src = fetchFromGitHub { + owner = "edvorg"; + repo = "use-package-el-get"; + rev = "34f9feec6db0d9cf0a95544b960cf5d5c6a33621"; + sha256 = "1sjvzhnl2nk2wq440mqbai01r2zxyflsl96vxbbz9g9z8ak47k8b"; + }; + 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 = "20171205.1029"; + version = "20180127.46"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "865e931889f33495f3ce1b9e14b5b3e959887424"; - sha256 = "0xs9yg1gar1xbk3x8cydmi26zkl0aggrks70m5rnsc3yp9iy6w8b"; + rev = "8ecb0f1c56eaeb04213b476866eaa6939f735a61"; + sha256 = "1w4v3zsz2ypmjdysql0v0jk326bdf1jc7w0l1kn0flzsl2l70yn8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/use-package-ensure-system-package"; @@ -72580,6 +73881,27 @@ license = lib.licenses.free; }; }) {}; + vertica-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: + melpaBuild { + pname = "vertica-snippets"; + version = "20180122.44"; + src = fetchFromGitHub { + owner = "baron42bba"; + repo = "vertica-snippets"; + rev = "61b33bb012801e6c883a72c829cddbbc4241590b"; + sha256 = "0n6gsblj6b3jnmjq9mgr0hx5jj5p4wg3b4mpvhilp3crw02zllw2"; + }; + 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"; @@ -72751,12 +74073,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 = "1469c953bc20d21d87ce5d92def767e551cda07c"; + sha256 = "0nywz6nk1qanx7z9sykf28h9c2qj7xzs9w4hya4vmhwigqqbhldl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4862b0a3d43f073e645803cbbf11d973a4b51d5/recipes/vimish-fold"; @@ -73066,12 +74388,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"; @@ -73087,12 +74409,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 = "20180104.1611"; src = fetchFromGitHub { owner = "CodeFalling"; repo = "vue-mode"; - rev = "c93c725121bed4d8686bafe89a4ef4af1545a877"; - sha256 = "1bky3r8aw6h1c9c1xpzzjmkk677bnxhdbgp810c9wgg3w0w852kl"; + rev = "b489a63dabe0f2fee2730121ecabb1b4f4c11761"; + sha256 = "09fkyyj0lg3q9q0874q0jpvx1h8rf26g96sn9a2xw0j3fl5ab1n4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode"; @@ -73129,12 +74451,12 @@ w3m = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "w3m"; - version = "20171210.2030"; + version = "20180116.135"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "w3m"; - rev = "33f17ec647363ff0f8c6b9c800f9cfdd32417f79"; - sha256 = "1zh0xn0nhngd4h0rs19vasl961qpm75h7q8yg1v5m0pfrgkai3i2"; + rev = "92be3a5bf5940826882bb6e17a85952a6b4eb537"; + sha256 = "1n3020y18brpi7d286s3qia8fp4nbws16224nqga18hcx00zzdna"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/w3m"; @@ -73233,12 +74555,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"; @@ -73506,12 +74828,12 @@ web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20171118.1132"; + version = "20180120.1009"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "78d49396b0ddb5e60596dc4a2c09d7cbb5812ff5"; - sha256 = "1hs1fx4269qbnajhhsvnf61clbl1smbkyz4w74p72balpgjxnpy7"; + rev = "716893f9fd4dc9612f00a5dfe4b2b8e8fdb19762"; + sha256 = "0jl36d40454h3qljc8hgqxjcdzvi1xfk7zhld7y0d4r4n77r08r0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -73632,12 +74954,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"; @@ -73695,12 +75017,12 @@ weechat = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tracking }: melpaBuild { pname = "weechat"; - version = "20171128.440"; + version = "20180112.1217"; src = fetchFromGitHub { owner = "the-kenny"; repo = "weechat.el"; - rev = "f8e6a2361f4de2299b861dd8fea1d0a5502be7c4"; - sha256 = "1hqjc43bmn5bgad6iais9b4plb6ijcwwvvgyfgjfjmpb81inxdvh"; + rev = "4842e966a557e13fa4f16052cb60d221cdb886cf"; + sha256 = "0y4vdsm4rb221hmr2a2sn0kj51jsgndkmhwcjiryqxzn2giy9siw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e38255a31a4ca31541c97a506a55f82e2670abe6/recipes/weechat"; @@ -73884,12 +75206,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "20171217.1916"; + version = "20180108.1930"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "ef384e781e6107850c7fadc78cb0675d7fe72e69"; - sha256 = "1xiw2blc1z2fvpz30i350gk28nfwlallnqvqmxibb84rydadx705"; + rev = "1219622b756f149efe4b44c625f2140c5229f936"; + sha256 = "14wfaqlixiqg79q6vb89jjvgvxwfgcdkgxyqh2bqsjwam9xksmlp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -74454,8 +75776,8 @@ version = "20160419.1232"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "52fa9101d8c4"; - sha256 = "1ijzd3xmygkkkwm0ckkmi576y93drcs63l6bsc8qz2pvjcn5k8sw"; + rev = "d04938232934"; + sha256 = "1sjadb0kh3hrdsvwywi04agrzrs21sxzh1v1km0z3x6f15nr048c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -74492,12 +75814,12 @@ with-editor = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "20171217.1239"; + version = "20180111.433"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "05338d893f3879391d7283324364b472e3f4f4d1"; - sha256 = "0h5wlskfb0xpw1jjijcvyl2ivylky3y2czmfi8f0qv9vz6g495w3"; + rev = "04d59d68dab58a7cf3034c84d8ba0553b78ae30c"; + sha256 = "080f39m9nmi163arpmxw45xwadb7q7w7p385yi1jy62bzvqnk0pm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -75038,12 +76360,12 @@ xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-css-mode"; - version = "20170821.400"; + version = "20180120.241"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-css-mode"; - rev = "7167c7a9a0f0dcc167dafa833efd43a0c9ae4307"; - sha256 = "1iychyj79g9mxpr688f2a9w8bbsgm2r88rr11b42gagal0kgk8q4"; + rev = "ee1c71cd2b3fc00a76e55789ad9a74eed4ae59c2"; + sha256 = "16wbdm2a5wdpfhxwd1wlqnj0h1ivrrq00nk8ddzp7qsdc8m1i4gn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-css-mode"; @@ -75101,12 +76423,12 @@ xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20171204.1819"; + version = "20180107.1546"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "1f25c0df7d74a05ef93e46fbcc594d91cc07ec52"; - sha256 = "0qhy8r45mv74aipz4q85d7w95ycmzr0q8w1dx7dc4390kaxr4p3v"; + rev = "c7ebabe6ccff0bce35cf7feb1cef34f4c69aee50"; + sha256 = "1r4ld1b8dd39bggjhzj6rd3wan3yhw5sm3zi623yad7w48c4xpna"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-fly-keys"; @@ -75777,8 +77099,8 @@ src = fetchFromGitHub { owner = "drdv"; repo = "yahtzee"; - rev = "5dc0bc6ddfae85bbef9bca6026b75cbc87439ef9"; - sha256 = "1jg8lazdwyp8gnv3k4ip4qaw026bq094aa13zn9qcnkj16dmkk7i"; + rev = "b028fc03a1526b166043e783add3be4f04b7a92e"; + sha256 = "0abl81q726jdhlirz77vl55xdbhpyfqrfqc2x6qdz9jmh04r912g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee"; @@ -75899,12 +77221,12 @@ yankpad = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yankpad"; - version = "20170607.819"; + version = "20180127.254"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "yankpad"; - rev = "70e755fcf58e37092de2c335355eab93d5f1fb44"; - sha256 = "1ijd3vpym573p96dh81pw9rzlmman7dvamhvnf0jqp8mmy4g4bml"; + rev = "4b04dd134599b2e360c10d8be9110078aa1aca9d"; + sha256 = "031v4r5spgsl8i0vgfzrwvcp8s8vbdw0kf56wj7qz9732hmb14j7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64746d10f9e0158621a7c4dc41dc2eca6ad573c/recipes/yankpad"; @@ -75920,12 +77242,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"; @@ -76046,12 +77368,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "20170923.1646"; + version = "20180124.1445"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "4ab9cb5bac683112852f58b26557a7dc283b717b"; - sha256 = "1sjvzdzzkifw6751gplvm964b85c04jcl1sbq6pjm75alsjv6mrp"; + rev = "8b421bc78d56263a2adc128337540e50a1c19c6a"; + sha256 = "0ryzk38gdz87cr44nqn31wz74qjyrjzcnqwnjsisvzzz3ivhpdqm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; @@ -76067,12 +77389,12 @@ yasnippet-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "yasnippet-snippets"; - version = "20171127.423"; + version = "20180122.521"; src = fetchFromGitHub { owner = "AndreaCrotti"; repo = "yasnippet-snippets"; - rev = "72d3292f7a5df67502ae990278642f56164e1463"; - sha256 = "10r2z3fi28dj31w7qk9sjkx3wpvciqa2qa9harvgkrs1n2anxhj9"; + rev = "b42c2b670bdd761b9c1c232998ebf4bbc5b914e8"; + sha256 = "0mzfck8jdcy6p18r37nc06w888zhvd3kamaaxzspbda4yws7y2wk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25b8d4efe2e7833eb95dfdf33aa3ecc34af7a687/recipes/yasnippet-snippets"; @@ -76088,12 +77410,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 = "c1de31d2b16d98af197a4392b6481346ab4e8d57"; + sha256 = "0lp5ym2smmvmlxpdyv4kh75qsz8dsdz9afd8nxaq8y4fazzabblx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ba3cdb74f121cbf36b6d9d5a434c363905ce526/recipes/yatemplate"; @@ -76108,11 +77430,11 @@ }) {}; yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yatex"; - version = "20171030.502"; + version = "20180122.1744"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "16763e5b7481"; - sha256 = "1mrcc9amz0kflm570bd2cprhin0z8lr668k2s56mj6shixb61dwh"; + rev = "b1896ef49747"; + sha256 = "1a8qc1krskl5qdy4fikilrrzrwmrghs4h1yaj5lclzywpc67zi8b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex"; @@ -76390,12 +77712,12 @@ zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zenburn-theme"; - version = "20171216.1027"; + version = "20180123.59"; src = fetchFromGitHub { owner = "bbatsov"; repo = "zenburn-emacs"; - rev = "62d91fd7c054b0747f1309c012976deb471d4608"; - sha256 = "1ddr47xy86kajwwf7dnzz9a9qh7bd9wkf7x30qwlygc41mg6w6zy"; + rev = "4b3e541721f52dbfa307e2cab3cd682e25987fdd"; + sha256 = "0x3b3dbkgpf9py7z3bf9629q3vqi303xp2hy7vi2qdfrnqn0600q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme"; @@ -76473,12 +77795,12 @@ zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }: melpaBuild { pname = "zerodark-theme"; - version = "20171128.610"; + version = "20180125.739"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "8f348962ea876980f09e01a945026e8e3e629add"; - sha256 = "1czdf34iwj4znvyjn3rphrq04jvvyrc38djrq0c2k9vmb9rwhxwa"; + rev = "f22ea6ed957440dccbb4a21bacc545d27830423e"; + sha256 = "0p317q99js4aynjvkxanwlbq0hb10njhzl9s975p7pi6abfxfkkm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/zerodark-theme"; @@ -76913,12 +78235,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 = "8ddda49de3356d8fa0308d79b5d68272baf2c57b"; + sha256 = "17d8mmmgj2w4nm2nfg12g35i7zbp4bp47ix5ifqqm1zvwmbmzrqx"; }; 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 90b885d683d..6b986aa7499 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -131,12 +131,15 @@ self: # 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; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index f84a742c7da..507e7bfcbe3 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -548,12 +548,12 @@ ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "ac-php"; - version = "2.0"; + version = "2.0.2"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "0bea9c7d800864b55d807c755254d03c796b1594"; - sha256 = "0d1gc7w1jgf8wigikwr7x5w3524acqim2ivk0xkp81isp7dc4ll6"; + rev = "b9f455d863d3e92fcf32eaa722447c6d62ee1297"; + sha256 = "1mwx61yxsxzd9d6jas61rsc68vc7mrlzkxxyyzcq21qvikadigrk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -569,12 +569,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "2.0"; + version = "2.0.2"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "0bea9c7d800864b55d807c755254d03c796b1594"; - sha256 = "0d1gc7w1jgf8wigikwr7x5w3524acqim2ivk0xkp81isp7dc4ll6"; + rev = "b9f455d863d3e92fcf32eaa722447c6d62ee1297"; + sha256 = "1mwx61yxsxzd9d6jas61rsc68vc7mrlzkxxyyzcq21qvikadigrk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -758,12 +758,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,6 +902,27 @@ license = lib.licenses.free; }; }) {}; + adafruit-wisdom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "adafruit-wisdom"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "gonewest818"; + repo = "adafruit-wisdom.el"; + rev = "67e1fb17964c09514e7635dba85fb14b0926e49c"; + sha256 = "097r31l4fpj4yd2ajv6zwgwn35fwn3c83qg9yzm2rjz1rdcwxlrw"; + }; + 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"; @@ -1073,12 +1094,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 +1217,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 +1544,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"; @@ -1648,12 +1669,12 @@ anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anything-tramp"; - version = "0.7.5"; + version = "0.8.5"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-anything-tramp"; - rev = "7d25d7e7f5370a82811c307550de5e36d4a7c2a6"; - sha256 = "09crbgndhpm7mz5x01k0j8wsxga4gxraz4vgmbyb4m5b54h8jbpz"; + rev = "942affd6b7538d1e829ee257bbd829cb4e860cce"; + sha256 = "0njynjg7p7i5li668ldpvmnpc5w7bikcs4cmkf26vf5n714fvlc1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anything-tramp"; @@ -1732,12 +1753,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"; @@ -2026,12 +2047,12 @@ auto-compile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }: melpaBuild { pname = "auto-compile"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "emacscollective"; repo = "auto-compile"; - rev = "a31819a1b75a2320edb0f7f25d6c6faf528bf41a"; - sha256 = "17hzl03livgj49zb0knlfn6r020nvj41pjjz3acy82zwrjydsvxa"; + rev = "8d117868a0a091389d528428136e60f951e9c550"; + sha256 = "1qkw8qzhqzk16kvk1200ha10gi6ny0saqvyqm6b1ww0iw3q1ic5c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/auto-compile"; @@ -2575,6 +2596,27 @@ 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"; @@ -3019,12 +3061,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"; @@ -3100,6 +3142,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"; @@ -3313,12 +3376,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"; @@ -3712,12 +3775,12 @@ caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "caml"; - version = "4.6.0"; + version = "4.6.1pre1"; src = fetchFromGitHub { owner = "ocaml"; repo = "ocaml"; - rev = "0d68080b95016f747b7cb63dd36ccdd42d40016e"; - sha256 = "1dxg82xqjx4yh4sg2dy48ybn4czv9yq0q3zpr29sxp1grvwvrg2b"; + rev = "b50ba2e822ff3a780f9b5a323d48e40881a88fc7"; + sha256 = "10im6z3nrkn0yh8004jwk68gjl0lz7qq3dpj24q50nhhqabw9ah5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; @@ -4214,12 +4277,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"; @@ -4298,12 +4361,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"; @@ -4625,12 +4688,12 @@ closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "closql"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "emacscollective"; repo = "closql"; - rev = "49862bfdd1540d443d278fadef16a83388b360cb"; - sha256 = "0phpfsl00d39gp26mbf1n7r2210gk2407pqj3bng50sbip568jmp"; + rev = "01cb892f6a457fbff857d924cebfdc77f69bd45d"; + sha256 = "0c5b6w67qjy2kvk3daljjg01xsv91c03n6kxvg5bswqq1j7n66si"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql"; @@ -4709,12 +4772,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "3.10.1"; + version = "3.10.2"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "166bf4c490b8f46eca057fc23c3f3c2e042e9cb3"; - sha256 = "1qgny1px7afgxi7hj12fg0zk55sy9mbk0w5sigamyzxp336nfxmz"; + rev = "c1e087a9d3af74299d7681c9f9de59e5977a1539"; + sha256 = "08qw6kq3l7dv37s5mppqxb6ys22h733k0qh2llzk2430wv5y9crk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -5231,27 +5294,6 @@ license = lib.licenses.free; }; }) {}; - company-eshell-autosuggest = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "company-eshell-autosuggest"; - version = "1.2.1"; - src = fetchFromGitHub { - owner = "dieggsy"; - repo = "company-eshell-autosuggest"; - rev = "61d5999abcc6c24bf5285613a781ee7c7bc7b460"; - sha256 = "182yvi41s0cwz6c2vi3il8yk3c8j490rgjn13dihw2n7xg86gjp9"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b5beec83bd43b3f1f81feb3ef554ece846e327c2/recipes/company-eshell-autosuggest"; - sha256 = "1bpjyr01rwl58fypfhzzml69wx7h2a044s4l58cxl3fw8lbjb13f"; - name = "company-eshell-autosuggest"; - }; - packageRequires = [ company emacs ]; - meta = { - homepage = "https://melpa.org/#/company-eshell-autosuggest"; - license = lib.licenses.free; - }; - }) {}; company-ghc = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, ghc, lib, melpaBuild }: melpaBuild { pname = "company-ghc"; @@ -5444,12 +5486,12 @@ company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-php"; - version = "2.0"; + version = "2.0.2"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "0bea9c7d800864b55d807c755254d03c796b1594"; - sha256 = "0d1gc7w1jgf8wigikwr7x5w3524acqim2ivk0xkp81isp7dc4ll6"; + rev = "b9f455d863d3e92fcf32eaa722447c6d62ee1297"; + sha256 = "1mwx61yxsxzd9d6jas61rsc68vc7mrlzkxxyyzcq21qvikadigrk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -6017,12 +6059,12 @@ counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "counsel-etags"; - version = "1.3.6"; + version = "1.3.9"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "counsel-etags"; - rev = "80f291ce74d1612366b0a31fd7c46e83e16264c2"; - sha256 = "0n59wrqmj32plx0fpf3nr5p7f29in4dsyygcnsbi74izw65dlbbc"; + rev = "2219bf8d9a4584abc905c7470455777553496056"; + sha256 = "0kcxcbf1rm7cm74s5z87pv0bflx42h4j2lnb8b3r0nznj94ywnj3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags"; @@ -6056,6 +6098,48 @@ 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.3.1"; + src = fetchFromGitHub { + owner = "masasam"; + repo = "emacs-counsel-tramp"; + rev = "d4c35e1aca724af6a0084362a027fdd70876d2c8"; + sha256 = "0dflm700n9wzn2nrwlbrh1558zv0c9fzzrs43d1kqvzw98wihfz2"; + }; + 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"; @@ -6164,12 +6248,12 @@ cricbuzz = callPackage ({ dash, enlive, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "cricbuzz"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "lepisma"; repo = "cricbuzz.el"; - rev = "b1e11294bcf6dbdbb0c4b8714f1960dfef674913"; - sha256 = "1kg9f1sbrv3x8mdfpp6v0hj2zpxkn0ayaxflvxqk64i9g1mxsvkg"; + rev = "557f75f10525e7a4d50e83010b9ed07fbf9df889"; + sha256 = "18lc56l5vcbrw2agpgjcap5q0l1mi64khgkk00x7r9wm1zilf9wp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cricbuzz"; @@ -6245,6 +6329,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"; @@ -6269,12 +6374,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"; @@ -6392,6 +6497,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"; @@ -6416,12 +6542,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"; @@ -6542,12 +6668,12 @@ 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"; @@ -6731,12 +6857,12 @@ datetime = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "datetime"; - version = "0.3"; + version = "0.3.2"; src = fetchFromGitHub { owner = "doublep"; repo = "datetime"; - rev = "082d2c7b0e38c26a8c46af9c9956a2e100d88e71"; - sha256 = "0fdswqi53qx924lib7nd9dazn0916xf1ybrh3bcn3f8cn6b8ikg5"; + rev = "d99e56785d750d6c7e416955f047fe057fae54a6"; + sha256 = "0s2pmj2wpprmdx1mppbch8i1srwhfl2pzyhsmczan75wmiblpqfj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fff9f0748b0ef76130b24e85ed109325256f956e/recipes/datetime"; @@ -6878,12 +7004,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"; @@ -7025,12 +7151,12 @@ difflib = callPackage ({ cl-generic, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: melpaBuild { pname = "difflib"; - version = "0.3.7"; + version = "0.3.8"; src = fetchFromGitHub { owner = "dieggsy"; repo = "difflib.el"; - rev = "56032966934dae5ac04764d2580d3dbadb0345ef"; - sha256 = "18m67w0ly4wlm417l3hrkqb7jzd4zbzr9sasg01gpyhvxv73hh9m"; + rev = "b08850251812d71e62fd6956081299590acdf37b"; + sha256 = "03k5iy610f1m2nmkdk69p49fcfqfyxmy3h6fqvqsr2v1hix8i54a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/df1924ddff6fd1b5fa32481d3b3d6fbe89a127d3/recipes/difflib"; @@ -7148,6 +7274,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"; @@ -7767,12 +7914,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "2.0.9"; + version = "2.1.0"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-themes"; - rev = "8ff86e456b22ab4c28605c44e544b3ef0b4b4637"; - sha256 = "0zfr6487hvn08dc9hhwf2snhd3ds4kfaglribxddx38dhd87hk73"; + rev = "bc747b3b65baf737f99dc4ccf68558581958bbba"; + sha256 = "0j5aywwh8cw0bb55frrpmyfmbzg6d6jv29ys61p1xf49gvki870m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; @@ -8228,12 +8375,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-hugo"; - version = "2.6.19"; + version = "2.8.21"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "16bebdbff275db41d673d0c04046198a35b8d97d"; - sha256 = "082594g0g1c4dwr9z1dib1dyn3hhhc741qnzfmg5bxcyx8pz06c7"; + rev = "61a504616705feae8c3fd8b01bf315e2cb89f699"; + sha256 = "1lr2hbz4gxcn2r5m3hx4izk8aawgy0fls0isp6cvcgs1s54s2kxi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -8249,12 +8396,12 @@ easy-jekyll = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-jekyll"; - version = "1.3.10"; + version = "1.5.12"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-jekyll"; - rev = "d894912cf65cf84244f27b1eb0186ad3344a661d"; - sha256 = "0sbyq2lcvkbxj9asm1yhpfqlvzx56r1g2qjymbari9j9lzhcdzsw"; + rev = "9a66d5c5dddac7d5b924df0c3bb414d3f797d8a5"; + sha256 = "0qx6lgpg2szjgy1a3a856klm7vh544braq8v2s7f81lq0ks2bjhj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll"; @@ -8585,12 +8732,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"; @@ -8732,12 +8879,12 @@ egison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "egison-mode"; - version = "3.7.9"; + version = "3.7.10"; src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "82f6ee43b8e35e6d04882d9c9942a22746fde0f1"; - sha256 = "1scxkgq4ij33306fjydwcqs69x5hpfw9l52z1xcprg51s23f2hgh"; + rev = "b7c073e0a29c9632d82b501849e270d62304e22f"; + sha256 = "13p6nfsjnbhw0cgy1s28ww9dk4hmwmanf2j6ydhcafvbynp964zs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -8754,13 +8901,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 = []; @@ -8947,22 +9094,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; @@ -9010,6 +9157,48 @@ license = lib.licenses.free; }; }) {}; + elbank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: + melpaBuild { + pname = "elbank"; + version = "1.0"; + src = fetchFromGitHub { + owner = "NicolasPetton"; + repo = "Elbank"; + rev = "e4b532373a32889b8ab3389bd3e726dff5dd0bcf"; + sha256 = "0kqiwa5gr8q0rhr598v9p7dx88i3359j49j04crqwnc5y107s1xk"; + }; + 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; + }; + }) {}; + elcord = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "elcord"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "Zulu-Inuoe"; + repo = "elcord"; + rev = "91c665fd832ef3b79c3eb810b7a6b08979a352cd"; + sha256 = "04nxyj94rmi22wfasi4lavn3lzkcpxpr5ksfqc8dfq9bllz4c9pa"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/36b64d0fead049df5ebd6606943a8f769324539e/recipes/elcord"; + sha256 = "044mwil9alh2v7bjj8yvx8azym2b7a5xb0c7y0r0k2vj72wiirjb"; + 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"; @@ -9076,12 +9265,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"; @@ -9118,12 +9307,12 @@ 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"; @@ -9328,12 +9517,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"; @@ -9346,15 +9535,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.18.0"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "99f0b6401bff25d40b9f58123533271f7870a286"; - sha256 = "06n0vr8y5s8y7q9v96z030l1i9n29p622p36biyi5cjcmgf5h09j"; + rev = "30cb5e3c344edef572b6cffac94c6ff80bf6595f"; + sha256 = "17iwdaly9kw17ih86rk9w1iswn8r6vvj9sh71picsxg6gqdrqnrk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -9363,6 +9552,7 @@ }; packageRequires = [ company + emacs find-file-in-project highlight-indentation pyvenv @@ -9440,12 +9630,12 @@ elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elx"; - version = "1.1.1"; + version = "1.2.1"; src = fetchFromGitHub { owner = "emacscollective"; repo = "elx"; - rev = "9f5d593b65686e8da29ef79457c8f6fc061af7e5"; - sha256 = "1vs7nmsi82gv9mw1mia6ri1vmn26ldwnj8akirqgq31rfgyfj4vh"; + rev = "9f32e91ebbaebd7f1125107dce2aa979827b26c0"; + sha256 = "1hc4jw2fy25ri2hh3xw7sp67yfl2jvrgj1a25xa6svchjq3h1yf2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/elx"; @@ -9521,85 +9711,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; @@ -9974,12 +10164,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"; @@ -10296,12 +10486,12 @@ erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20.2.1"; + version = "20.2.2"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "3a14bb468b1f3f1f5bef3c18291fe0498429a417"; - sha256 = "1jj7ai35vvipvpvpqfvv1psvbjrky875g2lk42g40231vxcm7fww"; + rev = "194513197e19cd592f3f5c2231510542f5193fe4"; + sha256 = "1cns1qcmmr00nyvcvcj4p4n2gvliyjynlwfqc7qzpkjjnkb7fzl6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -10460,6 +10650,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"; @@ -11156,12 +11367,12 @@ evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-matchit"; - version = "2.2.5"; + version = "2.2.6"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-matchit"; - rev = "ceb13ad1b34eb0debe2472c024841bdddce9e593"; - sha256 = "1wal8kwz1gx0cw1a91rf0d9wl490kjiilv6kwd779zf5041hnhwf"; + rev = "50bb88241983f0bf06d35a455a87c04eddc11c83"; + sha256 = "1qn5nydh2pinjlyyplrdxrn2r828im6mgij95ahs8z14y9yxwcif"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit"; @@ -11321,6 +11532,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"; @@ -11426,6 +11658,27 @@ 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"; @@ -11848,12 +12101,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"; @@ -12013,6 +12266,26 @@ license = lib.licenses.free; }; }) {}; + faustine = callPackage ({ emacs, faust-mode, fetchgit, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "faustine"; + version = "0.4"; + src = fetchgit { + url = "https://bitbucket.org/yphil/faustine"; + rev = "f186461e2bc38ec8ae38bd5ab727cc769218a168"; + sha256 = "16p7qmljjki4svci3mxzydmvpxaprbnfq6794b3adyyixkmgr6k7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d7a6fc9f99241ff8e3a9c1fb12418d4d69d9e203/recipes/faustine"; + sha256 = "1hyvkd4y28smdp30bkky6bwmqwlxjrq136wp7112371w963iwjsb"; + name = "faustine"; + }; + packageRequires = [ emacs faust-mode ]; + meta = { + homepage = "https://melpa.org/#/faustine"; + license = lib.licenses.free; + }; + }) {}; fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fcitx"; @@ -12121,12 +12394,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "5.4.6"; + version = "5.4.7"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "31ebfd65d254904ba3e5ec96507c0b01d7768940"; - sha256 = "1xy7a6crng5x7k0x810ijrm882gm597ljwzi4cj2i93js625cw2b"; + rev = "7be14de3c737e70606d208d8d443b89e58cd646d"; + sha256 = "1sdnyqv69mipbgs9yax88m9b6crsa59rjhwrih197pifl4089awr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -12247,12 +12520,12 @@ fish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fish-mode"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "wwwjfy"; repo = "emacs-fish"; - rev = "22aabbccd564883684f6d224b8e0a512f334be41"; - sha256 = "17djaz79spms9il71m4xdfjhm58dzswb6fpncngkgx8kxvcy9y24"; + rev = "cd0387f7f1d5c50e080091f86ca97d8a67d603a6"; + sha256 = "0q4cq1rkiz5mjxhp7p5awmw59q1yjb2sryc9i54cwhr5dwwqf95k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/efac97c0f54a3300251020c4626056526c18b441/recipes/fish-mode"; @@ -12419,22 +12692,22 @@ 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; @@ -12629,6 +12902,27 @@ license = lib.licenses.free; }; }) {}; + 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 ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-dmd-dub"; @@ -12839,6 +13133,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"; @@ -12863,12 +13178,12 @@ flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-objc-clang"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-objc-clang"; - rev = "29a9eb320d62400564360986f7ad400b74070d8e"; - sha256 = "0b4vwbxzhds9vb4nknfdywvfpr1gkk86vsbbq6f5ds0pfk75x022"; + rev = "07f17d1dbe878fdcabac791a8916ddf643571a68"; + sha256 = "03624xn6g1ybcjw634c7nd5s2yllwfffk2gzn5hm70vfz06q7wb9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang"; @@ -13094,12 +13409,12 @@ flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-swift3"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-swift3"; - rev = "756833425f51baa9eb0a2fa7493df6e68612c88d"; - sha256 = "1hvrg717q0nlz4r8wby82gs3vdx8fdhf38rg4j77j3fqfmxdd3fi"; + rev = "34973cd28ca5e63f8f6328a17fd7b78cc913b93d"; + sha256 = "1iy6j05dzpi7pi87y6rpjzmlnl2s9izqpbzknis2kx9072qddm3q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3"; @@ -13913,12 +14228,12 @@ fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fountain-mode"; - version = "2.3.1"; + version = "2.4.1"; src = fetchFromGitHub { owner = "rnkn"; repo = "fountain-mode"; - rev = "5c63d2f199e96bdf8fd60d375b2b6e305a5f9017"; - sha256 = "0vxizl4pr0668b1d94wrl42li2709srvnn5likn8lskv2mv0bnvn"; + rev = "f1dc9dff6779c0ce6ab0a1c0ae349df1194a314f"; + sha256 = "0j1s6qws773aq3si7pnc1xmlrh9x3v3sfdni6pnlsirv2sc7c4g9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode"; @@ -14551,12 +14866,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+"; @@ -15493,6 +15808,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"; @@ -15619,6 +15955,27 @@ license = lib.licenses.free; }; }) {}; + go-tag = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: + melpaBuild { + pname = "go-tag"; + version = "1.0.1"; + src = fetchFromGitHub { + owner = "brantou"; + repo = "emacs-go-tag"; + rev = "a239f58bbef2629086d9e2cf90a64ba3d389a8a3"; + sha256 = "1w1m05ypl94xn2qvypbgvjhq7gysi13g42pqwlmppgsdh1kphwha"; + }; + 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"; @@ -15790,12 +16147,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"; @@ -15958,12 +16315,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"; @@ -16000,12 +16357,12 @@ grandshell-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grandshell-theme"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "grandshell-theme"; - rev = "7a6350d46790cf00f7a627e8a407b6032ddbd414"; - sha256 = "13gm1dn6bf7h06ynwpxhjawza5ma4q21ag5affb7kygx9ygm88hy"; + rev = "22c8df52c0fb8899fa748fa2980947ab38b53380"; + sha256 = "08556ci80iycm4qkvbnrci55wyv91b4fh6sjp0im0ywndmrq3yyc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b04b0024f5a0367e2998d35ca88c2613a8e3470/recipes/grandshell-theme"; @@ -16237,22 +16594,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; @@ -16387,12 +16744,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"; @@ -16827,12 +17184,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "2.8.6"; + version = "2.8.8"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "cec6fb275fa37715bbcbf2abc716457521065068"; - sha256 = "1n2yg03adjlknhf123d7xanhnny4v42p14xjvh1ibbgnxg083p7y"; + rev = "5b7237acc11ed0fbee10af9cf6345da7c3d9dd26"; + sha256 = "18ay4c5mvr5b5i8qfn1h75yy5znzm1l6h5rhhzhhaiidvb2arr69"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -17055,22 +17412,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; @@ -17163,12 +17520,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "2.8.6"; + version = "2.8.8"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "cec6fb275fa37715bbcbf2abc716457521065068"; - sha256 = "1n2yg03adjlknhf123d7xanhnny4v42p14xjvh1ibbgnxg083p7y"; + rev = "5b7237acc11ed0fbee10af9cf6345da7c3d9dd26"; + sha256 = "18ay4c5mvr5b5i8qfn1h75yy5znzm1l6h5rhhzhhaiidvb2arr69"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -17814,12 +18171,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.0"; src = fetchFromGitHub { owner = "alphapapa"; repo = "helm-org-rifle"; - rev = "26749ff9f34b2abddf7c47ff71b1046942e38398"; - sha256 = "1q969rlqj706wdzd3s54pqpfpqkg18bzl5srl7xkw43cfzxpcpj2"; + rev = "68f01726795ca3054cfc6327dcdb22c9c83dfdfa"; + sha256 = "0vak9phqgxz5dk1zj3i4cs94y797h77qadirsf33gl073cg95l8a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle"; @@ -17853,27 +18210,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"; @@ -18273,6 +18609,27 @@ license = lib.licenses.free; }; }) {}; + helm-system-packages = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, seq }: + melpaBuild { + pname = "helm-system-packages"; + version = "1.7.0"; + src = fetchFromGitHub { + owner = "emacs-helm"; + repo = "helm-system-packages"; + rev = "22ff951b092a3fbde8eadf284a24e86bb4694f6a"; + sha256 = "0argxi8dppgyfljwn654a7183lva74wnnwzkk3xlrvgngmir56kp"; + }; + 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"; @@ -18297,12 +18654,12 @@ helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-tramp"; - version = "0.7.5"; + version = "0.8.5"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-helm-tramp"; - rev = "29d863d5e2a46cd2576895bc72754ad835ba9b30"; - sha256 = "0sba7jjbw406gvb0h4wfda0yhp760fv5hlm1f3hmm9xqw7hs6n2f"; + rev = "ee7f6a2c09df5fdc28b4d910840a7c56922059c3"; + sha256 = "0lkzi6h6wkm19mn7v6wjy50kd96k6hw7jhx7pxwgfp577816c7c2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp"; @@ -18399,22 +18756,22 @@ license = lib.licenses.free; }; }) {}; - helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: + helpful = callPackage ({ dash, dash-functional, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "helpful"; - version = "0.4"; + version = "0.6"; src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "dce09e9c338c8733254e10387ad0dc118a89bd82"; - sha256 = "1y7afppn5y8c568d3mynb5fcf75zarv0gzzj0g5xhs5wzqic4yaz"; + rev = "e1b660e2a48b39b0a81119c2593362dd60076757"; + sha256 = "031hglxwlq8fryi8vs11hyflcrk09qc9qja28nqby0adn20z47mc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; sha256 = "17w9j5v1r2c8ka1fpzbr295cgnsbiw8fxlslh4zbjqzaazamchn2"; name = "helpful"; }; - packageRequires = [ dash elisp-refs emacs s shut-up ]; + packageRequires = [ dash dash-functional elisp-refs emacs s shut-up ]; meta = { homepage = "https://melpa.org/#/helpful"; license = lib.licenses.free; @@ -18654,12 +19011,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"; @@ -19176,6 +19533,27 @@ license = lib.licenses.free; }; }) {}; + ialign = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ialign"; + version = "0.4.0"; + src = fetchFromGitHub { + owner = "mkcms"; + repo = "interactive-align"; + rev = "1d00ab870d06b946d94e5e6d340b85a3e51fbfb1"; + sha256 = "191w5di4f0in49h60xmc5d6xaisbkv8y9f9bxzc3162c4b982qfr"; + }; + 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"; @@ -19197,6 +19575,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"; @@ -19305,12 +19704,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+"; @@ -19407,22 +19806,22 @@ license = lib.licenses.free; }; }) {}; - ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: + ido-ubiquitous = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: melpaBuild { pname = "ido-ubiquitous"; - 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-ubiquitous"; sha256 = "11sdk0ymsqnsw1gycvq2wj4j0g502fp23qk6q9d95lm98nz68frz"; name = "ido-ubiquitous"; }; - packageRequires = [ cl-lib emacs ido-completing-read-plus ]; + packageRequires = [ cl-lib ido-completing-read-plus ]; meta = { homepage = "https://melpa.org/#/ido-ubiquitous"; license = lib.licenses.free; @@ -19638,6 +20037,27 @@ license = lib.licenses.free; }; }) {}; + imake = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "imake"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "tarsius"; + repo = "imake"; + rev = "edd2e59f7996c35450987cf8f137ecb54777e9ca"; + sha256 = "12mq1ki001jgjdfr3fx43z1xz4jrki18rb0wkb7n956dvl34w0fg"; + }; + 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"; @@ -19748,14 +20168,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 ]; @@ -19872,12 +20292,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"; @@ -19890,6 +20310,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"; @@ -20225,6 +20666,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"; @@ -20856,12 +21318,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"; @@ -21297,12 +21759,12 @@ kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-themes"; - version = "1.1.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "ogdenwebb"; repo = "emacs-kaolin-themes"; - rev = "f9e5b87ea26cc86b926586fac91a5a8c66ffc783"; - sha256 = "15141id9zgasa423azpg84dswd924l0ji7a1q44nq5bvjpjdm9g8"; + rev = "56bafd9b1b022ebfd98cad022792957164ec56fb"; + sha256 = "02nmrdc2ldvfzyn3s9qrvq61nl93krc1vyr4ad1vkmbyqrwszyvd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; @@ -22074,12 +22536,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"; @@ -22291,12 +22753,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "2.19.2"; + version = "2.21.0"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "2a3b716056aad04ef8668856323a4b8678173fab"; - sha256 = "1dbx9wn7xca02sf72y76s31b5sjcmmargjhn90ygiqzbxapm0xcb"; + rev = "465c3f807c3ccd9af0af7032aec40c039d950ac0"; + sha256 = "1idn0bjxw5sgjb7p958fdxn8mg2rs8yjqsz8k56r9jjzr7z9jdfx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -22843,12 +23305,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "2.12.0"; + version = "2.12.2"; src = fetchFromGitHub { owner = "magit"; repo = "magit-popup"; - rev = "05a836caf02eba91fa26bdf5dd6fd183fe23937d"; - sha256 = "08p57alfbkcsqkhnfjhfckqhans278ffjyhhhvgy8s7asa6as9kl"; + rev = "ab75385a1fb8c0fba0769d448b13ba8324835261"; + sha256 = "0ky4l3k3camh1paa5ap9frr9hcadj7nj40l3imiiqfcvgyl8ijp6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit-popup"; @@ -22864,12 +23326,12 @@ magit-rockstar = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-rockstar"; - version = "1.0.6"; + version = "1.1.0"; src = fetchFromGitHub { owner = "tarsius"; repo = "magit-rockstar"; - rev = "a65042e3445008b55190f1258ae54bd78e12174b"; - sha256 = "1wbbg9jr9kl69sbq9b9dgwvnplmdzjyanwfcncamw3lfcjfnw1bn"; + rev = "c8320472e8a50c8299140ba0943bb1fe485d294a"; + sha256 = "1xjym51z0v7ibxw059f6k3zljli6z390rmxvrywbfzkb8hqms0l1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a20b539cbd38ffa546c1b56b9fac78c0b9457f6/recipes/magit-rockstar"; @@ -22966,22 +23428,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; @@ -23312,12 +23774,12 @@ mastodon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mastodon"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "jdenen"; repo = "mastodon.el"; - rev = "a9e595142eee69fe84f0ab06f7fde76cef27cdac"; - sha256 = "1wgx8i6ww9w99f0f62p7v626bb6pvdg04hnhqyjgsmb99wzwlpk7"; + rev = "e08bb5794762d22f90e85fd65cef7c143e6b9318"; + sha256 = "0bil0xxava04pd4acjqm3bfqm1kjdk4g0czd4zqvacsp5c9sl2qp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/809d963b69b154325faaf61e54ca87b94c1c9a90/recipes/mastodon"; @@ -23501,12 +23963,12 @@ meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "0.8.4"; + version = "0.9.0"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "555b8b9ea8ef56dda645ea605b38501cb4222b12"; - sha256 = "1z3vvasah4gq6byq4ibkihy5mbch5zzxnn0gy86jldapwi1z74sq"; + rev = "98ad6a5361c725319a355522d2d1ba0e0fbb7cde"; + sha256 = "06iryz4dbldc9vxy67g977hih8r1bfvjld53lvwnjsc7r3x9i07q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -23648,12 +24110,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"; @@ -24130,12 +24592,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "3.4.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "019e07947426f0192fc3458f3f72c19031b607de"; - sha256 = "0id35345zp0fchbcz8qk2lg71jyln91k56vfama27ss3nzy3f9kz"; + rev = "bb5cbbd5895b8b3fbc6af572b1fd0aacd4988a8a"; + sha256 = "1f0jl4a3b6i9skbcym0qzpszy620385m947l2ba2wxf1na7rc626"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -24361,12 +24823,12 @@ msvc = callPackage ({ ac-clang, cedet ? null, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "msvc"; - version = "1.3.6"; + version = "1.3.7"; src = fetchFromGitHub { owner = "yaruopooner"; repo = "msvc"; - rev = "093f6d4eecfbfc67650644ebb637a4f1c31c08fa"; - sha256 = "0pvxrgpbwn748rs25hhvlvxcm83vrysk7wf8lpm6ly8xm07yj14i"; + rev = "dfc529aa6da8b46b0a0c7db9a0e5e9bc33ab1fb3"; + sha256 = "19n9an0nznwqw3ml022i6vidqbrgxf4yff0nbvvcb91ppc1saf40"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69939b85353a23f374cab996ede879ab315a323b/recipes/msvc"; @@ -24484,6 +24946,26 @@ 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-term = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multi-term"; @@ -25096,12 +25578,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "0.5.11"; + version = "0.5.12"; src = fetchFromGitHub { owner = "emacscollective"; repo = "no-littering"; - rev = "a4b42b185b65e78bc3bb6523e23aefb1213eb3b2"; - sha256 = "1yzcawvz3vbq6pgr0b3sk0qg24jx1fpkinwcmsdl283ib8msbc7g"; + rev = "8e321f1036770c20637a0f946b655805cd070e25"; + sha256 = "11hxf0fkka4mv1qsw0nx3ymvgcav95r2bvk1gwyj5m5cbwb4a1n9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering"; @@ -25198,11 +25680,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "0.25.3"; + version = "0.26"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "ae55a86639f86ad1b547e961f71b1bde2180752d"; - sha256 = "0kq2j23381qr50zkvx68yciq1xag20fzidgy5jd69bd7z6gziq90"; + rev = "3c4e64d976eb561ac5157df1bbe5882e3e65b583"; + sha256 = "00a9ggrc63n88g7vp57c09r859pl2dbxnqgf543ks94lm0jzyz3f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -25239,12 +25721,12 @@ nov = callPackage ({ dash, emacs, esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nov"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "wasamasa"; repo = "nov.el"; - rev = "19ab463864f137b43704b4f34173349c88e84d8e"; - sha256 = "00f5hhw157nwdwy26yn6l3z2hgk6xxvx5xl0hasskj1l9rg0zgh2"; + rev = "4ef20ebb587ffb0ab73c85ad5748d41af1071596"; + sha256 = "03s0qjvwk1f7y3i4wh2p5y3z4hdv00adgz8za3vphzc0q8i1kjzb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf543955ba2d5d0074fa2a5ba176f9415f6e006d/recipes/nov"; @@ -25467,6 +25949,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"; @@ -25488,6 +25991,27 @@ 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"; @@ -25848,12 +26372,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 = "b0c61e91d1b600875ad2eae06fe72a179a3028b6"; - sha256 = "1b0y20r9rimarfa1zgid78jh1zyzykdxd07n3vzam6ds9diygzxd"; + rev = "588b8482685adedbc56933cb13c58d9cc6a82456"; + sha256 = "1iqwxc19jvcb2gsm2aq59zblg1qjmbxgb2yl3h3aybqp968j3i00"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -26381,22 +26905,22 @@ 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 = "2.8.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "ahungry"; repo = "org-jira"; - rev = "9315d871556ebe92e766544ff5210dc85ad1ef33"; - sha256 = "03ddwdzby0s3km0a3dmn6mfdp2zsiqyrddvpp8mgj77rb039g08k"; + 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; @@ -26772,12 +27296,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"; @@ -27063,6 +27587,27 @@ license = lib.licenses.free; }; }) {}; + org-wild-notifier = callPackage ({ alert, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "org-wild-notifier"; + version = "0.2.2"; + src = fetchFromGitHub { + owner = "akhramov"; + repo = "org-wild-notifier.el"; + rev = "28f6af12a9efbcab53e310363c451f53ce8ea3f2"; + sha256 = "00v4f26np4i947xgqr03wylz4ichc168znlwxn4l6np1s85i3mzb"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/114552a24f73f13b253e3db4885039b680f6ef33/recipes/org-wild-notifier"; + sha256 = "1lmpa614jnkpmfg3m1d2wjn9w0zig3gwd02n3dyjn23n71fiyhkp"; + name = "org-wild-notifier"; + }; + packageRequires = [ alert dash org ]; + 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"; @@ -27516,12 +28061,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"; @@ -27913,12 +28458,12 @@ paren-face = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "paren-face"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "tarsius"; repo = "paren-face"; - rev = "0a7cbd65bb578cc52a9dc495a4fcaf23a57507bf"; - sha256 = "0wsnng874dbyikd4dgx2rxmcp0774ix5v29dq372zynq6lamqkl7"; + rev = "166975683225367c866e6ae6f6acb88d24e21a35"; + sha256 = "02mh8w2na6qa94p3bh6pvdvmg36p2vrbp5hpjnwjcayrb92dskgy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d398398d1d5838dc4985a06515ee668f0f566aab/recipes/paren-face"; @@ -27976,12 +28521,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"; @@ -28706,6 +29251,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"; @@ -28958,6 +29524,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"; @@ -29765,12 +30352,12 @@ protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "protobuf-mode"; - version = "3.5.0.1"; + version = "3.5.1.1"; src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "457f6a607ce167132b833c049b0eaf3a9c4b3f5f"; - sha256 = "10pchdarigxrgy9akv2vdkkmjlxcly88ybycvbkwljpr98xg9xjp"; + rev = "860bd12fec5c69e6529565165532b3d5108a7d97"; + sha256 = "1h4xydr5j2zg1888ncn8a1jvqq8fgpgckrmjg6lqzy9jpkvqvfdk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -30311,12 +30898,12 @@ pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pyvenv"; - version = "1.10"; + version = "1.11"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "pyvenv"; - rev = "91c47b8d2608ccbcac2eba91f0e36b422101ce55"; - sha256 = "09c0f7ln1in8h03idbzggvmqkxj6i9jdjbmg1nnyarhffmgbcvnh"; + rev = "f925bcb46ea64b699f7cd06933c48e0d5db88b73"; + sha256 = "1a346qdimr1dvj53q033aqnahwd2dhyn9jadrs019nm0bzgw7g63"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv"; @@ -30731,12 +31318,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"; @@ -31157,12 +31744,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"; @@ -31346,12 +31933,12 @@ rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "rg"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "5de611eae7787ecbc285fe7e31e412b9281a4e14"; - sha256 = "18mhcipj5yywd5648pwm955wx3ipsnp9nwjyyl270qnn56hwkb6g"; + rev = "68984092d0e0725057e7b67ba32016903170f189"; + sha256 = "0qd3qh640339n1dn1isk23xhnkj0pds08yzfak4ijxyzlgl63bdq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; @@ -32793,12 +33380,12 @@ shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shx"; - version = "0.0.12"; + version = "0.0.13"; src = fetchFromGitHub { owner = "riscy"; repo = "shx-for-emacs"; - rev = "aa45e7b586b1215ca1af05c14984ce872571b5f7"; - sha256 = "0ya7vbp71vmvli35rwcwspbclss5ngr1ck9074i2gg1dzrqyxijn"; + rev = "33383bd359d795df2d7ef725b5349c953f5a6aa8"; + sha256 = "1arwsb6as8jpah0bs3b92a3kdnbfkhnsm1jglspfh4lqpafmx5vf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; @@ -33234,12 +33821,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"; @@ -33255,12 +33842,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"; @@ -33507,12 +34094,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"; @@ -33651,6 +34238,27 @@ license = lib.licenses.free; }; }) {}; + solidity-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "solidity-mode"; + version = "0.1.8"; + src = fetchFromGitHub { + owner = "ethereum"; + repo = "emacs-solidity"; + rev = "b5d95ef678305ca70b17e94fc2ee4289a8328048"; + sha256 = "04l3hvfpgqiaxdxh8s2cg2rx4cy50i7a411q81g8661fx60c6h6p"; + }; + 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"; @@ -34577,12 +35185,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "swift-mode"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "18c3dc47dfece59640ad501266f2e47b918f2a14"; - sha256 = "0qk962xzxm8si1h5p7vdnqw7xcaxdjxsaz1yad11pvn9l2b2zpzq"; + rev = "7739e4954cc614ecd6b37e935f82ad057e256d56"; + sha256 = "09mvwfi3nv4hkdvh76d7737nl3zaxn4a5vpmv2645q9s4vcq8zj8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -34846,6 +35454,27 @@ license = lib.licenses.free; }; }) {}; + system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "system-packages"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "jabranham"; + repo = "system-packages"; + rev = "149c253583e8b4d56a851b1e91e456260749cdea"; + sha256 = "1c0q9c0wq9kskg8p6mnh6mnkivlabb46aqfcs7ms21497ndlmlsv"; + }; + 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"; @@ -35665,6 +36294,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"; @@ -35709,12 +36359,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"; @@ -35772,12 +36422,12 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "1.14"; + version = "1.16.1"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "f62a946f0fc5db79d37fb748ab49334c4e3cbbfd"; - sha256 = "12i2q692zczlq62aij2pih4m7bm36dii4y2jq6dxcwb54i96kdr0"; + rev = "ef7597d5e99d50efd014bfa9f01046956d0da95f"; + sha256 = "15379w0frxwl9p1xraqapn9r2wra75g8mjybj41jd1y65acjg9wg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs"; @@ -35793,12 +36443,12 @@ treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }: melpaBuild { pname = "treemacs-evil"; - version = "1.14"; + version = "1.16.1"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "f62a946f0fc5db79d37fb748ab49334c4e3cbbfd"; - sha256 = "12i2q692zczlq62aij2pih4m7bm36dii4y2jq6dxcwb54i96kdr0"; + rev = "ef7597d5e99d50efd014bfa9f01046956d0da95f"; + sha256 = "15379w0frxwl9p1xraqapn9r2wra75g8mjybj41jd1y65acjg9wg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-evil"; @@ -35814,12 +36464,12 @@ treemacs-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, treemacs }: melpaBuild { pname = "treemacs-projectile"; - version = "1.14"; + version = "1.16.1"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "f62a946f0fc5db79d37fb748ab49334c4e3cbbfd"; - sha256 = "12i2q692zczlq62aij2pih4m7bm36dii4y2jq6dxcwb54i96kdr0"; + rev = "ef7597d5e99d50efd014bfa9f01046956d0da95f"; + sha256 = "15379w0frxwl9p1xraqapn9r2wra75g8mjybj41jd1y65acjg9wg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-projectile"; @@ -36870,12 +37520,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"; @@ -37206,12 +37856,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"; @@ -37395,12 +38045,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"; @@ -37692,8 +38342,8 @@ version = "0.9.8"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "52fa9101d8c4"; - sha256 = "1ijzd3xmygkkkwm0ckkmi576y93drcs63l6bsc8qz2pvjcn5k8sw"; + rev = "d04938232934"; + sha256 = "1sjadb0kh3hrdsvwywi04agrzrs21sxzh1v1km0z3x6f15nr048c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -37730,12 +38380,12 @@ with-editor = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "2.7.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "99d3278b1c79718de16dd4f57dcc8c4aa31a4051"; - sha256 = "1mcfinr1wv87hqn2787dcyn7lkgfni4xfgsji50pwj3zfgg0yqyr"; + rev = "04d59d68dab58a7cf3034c84d8ba0553b78ae30c"; + sha256 = "080f39m9nmi163arpmxw45xwadb7q7w7p385yi1jy62bzvqnk0pm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -38357,6 +39007,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"; @@ -38441,22 +39112,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; @@ -38467,8 +39138,8 @@ version = "1.80"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "16763e5b7481"; - sha256 = "1mrcc9amz0kflm570bd2cprhin0z8lr668k2s56mj6shixb61dwh"; + rev = "b1896ef49747"; + sha256 = "1a8qc1krskl5qdy4fikilrrzrwmrghs4h1yaj5lclzywpc67zi8b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix index b0ccf8349ca..a2ba794933e 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix @@ -86,7 +86,7 @@ self: }; # upstream issue: doesn't build - eterm-256color = markBroken super.emacs-256color; + eterm-256color = markBroken super.eterm-256color; # upstream issue: missing dependency highlight evil-search-highlight-persist = markBroken super.evil-search-highlight-persist; @@ -118,6 +118,9 @@ self: # 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; diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index ba270425897..f74ae6ab381 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 = "20171218"; + version = "20180129"; src = fetchurl { - url = "http://orgmode.org/elpa/org-20171218.tar"; - sha256 = "01w09hl1l03bxa31af6k433h6i2cwaxwd1v6n87zjnbwwlli2la6"; + url = "https://orgmode.org/elpa/org-20180129.tar"; + sha256 = "0cwxqr34c77qmv7flcpd46qwkn0nzli21s3m9km00mwc8xy308n4"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20171218"; + version = "20180129"; src = fetchurl { - url = "http://orgmode.org/elpa/org-plus-contrib-20171218.tar"; - sha256 = "1dndmv99sjl2nknlj76235yygdpwgq61gp3mqgsihjyr9irsp58d"; + url = "https://orgmode.org/elpa/org-plus-contrib-20180129.tar"; + sha256 = "1bk7jmizlvfbq2bbis3kal8nllxj752a8dkq7j68q6kfbc6w1z24"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index 10816e0a283..4964de13986 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.8"; src = fetchurl { url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2"; - sha256 = "10rqzinr6yd6ca06rklg34kdc08a3xgygfzmprsfg7gdsybfay5z"; + sha256 = "1d2q99xa7dhdpqkipapzi1r1mvynf70s7sgdczd59kn0d8sr3map"; }; nativeBuildInputs = [ pkgconfig qmake qttools ]; diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index 5ff5c0845d0..9288d293b91 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -50,7 +50,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/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index ec0d90115e6..6cd68b6f21d 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -234,12 +234,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2017.3"; /* updated by script */ + version = "2017.3.2"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "0gv9krqy4bhijx5s005qhswxnc05l1jsjlxs0h15z23bmv7rlpnf"; /* updated by script */ + sha256 = "0lv0nwfgm6h67mxhh0a2154ym7wcbm1qp3k1k1i00lg0lwig1rcw"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -260,12 +260,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2017.3"; /* updated by script */ + version = "2017.3.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 = "0l4l0lsmq1g4fwfrxhbrnfsp8nk38ml48cryvdr241zsxz43fax0"; /* updated by script */ + sha256 = "0cfjfv01ra67sr8n8ijqwd9zm2yzb1nm447kf0mr5cynr124ch0z"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "goland_release"; @@ -273,12 +273,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2017.3"; /* updated by script */ + version = "2017.3.3"; /* 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 = "04qp37pv4z6d9gw6j56m4zfxw4v2cydk8w7jzyzrcg52jr064kwi"; /* updated by script */ + sha256 = "1wxaz25609wri2d91s9wy00gngplyjg7gzix3mzdhgysm00qizf1"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IDEA_Release"; @@ -286,12 +286,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2017.3"; /* updated by script */ + version = "2017.3.3"; /* 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 = "0w9ihi6vzgfiav2qia7d7vrn14k8v56npir0dyx7ii8an887s7ws"; /* updated by script */ + sha256 = "01d5a6m927q9bnjlpz8va8bfjnj52k8q6i3im5ygj6lwadbzawyf"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IDEA_Release"; @@ -299,12 +299,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2017.3"; /* updated by script */ + version = "2017.3.3"; /* 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 = "1byhlm5bnp6ic4n2xg17v4g34ipygy50i9xj4292b0xw7srxh910"; /* updated by script */ + sha256 = "0mk4d2c41qvfz7sqxqw7adak86pm95wvhzxrfg32y01r5i5q0av7"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PS2017.3"; @@ -312,12 +312,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2017.3"; /* updated by script */ + version = "2017.3.3"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1lca3g5h716l97pkqfb8i7apsnx445xzcc9j41d0y3yyncf5hwxr"; /* updated by script */ + sha256 = "1j9pp8lfy62d9l3953d5mpij60s6sqyv3bcjimgy85hsrw570x3r"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm_Release"; @@ -325,12 +325,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2017.3"; /* updated by script */ + version = "2017.3.3"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "06lh0nxmzn0lsyd6isyb6gf01h4nbksi0f03hwwm6wdfvsfw92pb"; /* updated by script */ + sha256 = "180cwva49air4j7g409algrm4svvmcbapspf9als3djhazqmczgr"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm_Release"; @@ -351,12 +351,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2017.3"; /* updated by script */ + version = "2017.3.2"; /* 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 = "04h299mbzwrdgqxkff0vgpj2kbisb29l55mm6r45amgpqcnms6i5"; /* updated by script */ + sha256 = "1dc14k7i0nfhkzi0j53hysqzxcls29j487jr9kv1aqp81k544bdy"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "rm2017.3"; @@ -364,12 +364,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2017.3"; /* updated by script */ + version = "2017.3.3"; /* 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 = "0whr5zygrbi044pl48ac2w7a4rxldbaqlf76dkfqj83g2wl4n990"; /* updated by script */ + sha256 = "1fhs13944928rqcqbv8d29qm1y0zzry4drr9gqqmj814y2vkbpnl"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WS_Release"; diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix new file mode 100644 index 00000000000..bea1e18e061 --- /dev/null +++ b/pkgs/applications/editors/micro/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "micro-${version}"; + version = "1.3.4"; + + goPackagePath = "github.com/zyedidia/micro"; + + src = fetchFromGitHub { + owner = "zyedidia"; + repo = "micro"; + rev = "v${version}"; + sha256 = "1giyp2xk2rb6vdyfnj5wa7qb9fwbcmmwm16wdlnmq7xnp7qamdkw"; + 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 a1506eb9d6c..751b78ab674 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/nano/default.nix b/pkgs/applications/editors/nano/default.nix index dcb124bcb12..a4dd39b8f76 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -20,15 +20,13 @@ let in stdenv.mkDerivation rec { name = "nano-${version}"; - version = "2.9.1"; + version = "2.9.3"; src = fetchurl { url = "mirror://gnu/nano/${name}.tar.xz"; - sha256 = "0z5sxji8jh8sh0g3inbzndhsrbm4qyqlvjrxl5wkxbr61lnxa5k3"; + sha256 = "04j05nbnp8vjjwja90d83p4s6ywyl6qhggflcjzw0p9d9gyvr0vp"; }; - patches = [ ./nano-2.9.1-darwin.patch ]; - nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; buildInputs = [ ncurses ]; diff --git a/pkgs/applications/editors/nano/nano-2.9.1-darwin.patch b/pkgs/applications/editors/nano/nano-2.9.1-darwin.patch deleted file mode 100644 index d3a630d4486..00000000000 --- a/pkgs/applications/editors/nano/nano-2.9.1-darwin.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/lib/stat.c -+++ b/lib/stat.c -@@ -48,4 +48,6 @@ orig_stat (const char *filename, struct stat *buf) - #include "sys/stat.h" - -+#include "stat-time.h" -+ - #include - #include diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 238109ae9cb..149f7804a79 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -1,16 +1,7 @@ { stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey , libtool, libuv, luaPackages, ncurses, perl, pkgconfig -, unibilium, makeWrapper, vimUtils, xsel, gperf, callPackage - -, withPython ? true, pythonPackages, extraPythonPackages ? [] -, withPython3 ? true, python3Packages, extraPython3Packages ? [] +, unibilium, vimUtils, xsel, gperf, callPackage , withJemalloc ? true, jemalloc -, withRuby ? true, bundlerEnv, ruby - -, withPyGUI ? false -, vimAlias ? false -, viAlias ? false -, configure ? null }: with stdenv.lib; @@ -41,59 +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; - postBuild = '' - ln -s ${ruby}/bin/* $out/bin - ''; - }; - rubyWrapper = ''--cmd \"let g:ruby_host_prog='$out/bin/nvim-ruby'\" ''; - - 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'\" ''; - - additionalFlags = - optionalString (withPython || withPython3 || withRuby) - ''--add-flags "${(optionalString withPython pythonWrapper) + - (optionalString withPython3 python3Wrapper) + - (optionalString withRuby rubyWrapper)}" --unset PYTHONPATH '' + - optionalString (withRuby) - ''--suffix PATH : \"${rubyEnv}/bin\" --set GEM_HOME \"${rubyEnv}/${rubyEnv.ruby.gemPath}\" ''; - 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; @@ -113,7 +65,6 @@ let nativeBuildInputs = [ cmake gettext - makeWrapper pkgconfig ]; @@ -140,17 +91,6 @@ let install_name_tool -change libjemalloc.1.dylib \ ${jemalloc}/lib/libjemalloc.1.dylib \ $out/bin/nvim - '' + optionalString withPython '' - ln -s ${pythonEnv}/bin/python $out/bin/nvim-python - '' + optionalString withPython3 '' - ln -s ${python3Env}/bin/python3 $out/bin/nvim-python3 - '' + optionalString withPython3 '' - 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 (withPython || withPython3 || withRuby) '' - wrapProgram $out/bin/nvim ${additionalFlags} ''; meta = { @@ -175,24 +115,5 @@ let }; }; -in if (vimAlias == false && viAlias == 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 viAlias '' - ln -s $out/bin/nvim $out/bin/vi - '' + 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 61df9ed7932..87b011c4f8b 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock +++ b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock @@ -1,9 +1,9 @@ GEM remote: https://rubygems.org/ specs: - msgpack (1.1.0) - multi_json (1.12.2) - neovim (0.6.1) + msgpack (1.2.2) + multi_json (1.13.1) + neovim (0.6.2) msgpack (~> 1.0) multi_json (~> 1.0) diff --git a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix index 85bff42b64d..aefecbf5ba8 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix +++ b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix @@ -2,26 +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 = "1raim9ddjh672m32psaa9niw67ywzjbxbdb8iijx3wv9k5b0pk2x"; + sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; type = "gem"; }; - version = "1.12.2"; + version = "1.13.1"; }; neovim = { dependencies = ["msgpack" "multi_json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dnv2pdl8lwwy4av8bqc6kdlgxw88dmajm4fkdk6hc7qdx1sw234"; + sha256 = "15r3j9bwlpm1ry7cp6059xb0irvsvvlmw53i28z6sf2khwfj5j53"; type = "gem"; }; - version = "0.6.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 00000000000..e2218473d72 --- /dev/null +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -0,0 +1,111 @@ +{ stdenv, lib, makeDesktopItem, makeWrapper, lndir +, vimUtils +, neovim +, 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 -s ${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 b508521790b..6ff67728ea1 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -1,10 +1,10 @@ -{ 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"; + version = "1.1.414"; ginVer = "1.5"; gwtVer = "2.7.0"; in @@ -15,19 +15,15 @@ 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 = "1rr2zkv53r8swhq5d745jpp0ivxpsizzh7srf34isqpkn5pgx3v8"; }; # 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; @@ -49,14 +45,18 @@ stdenv.mkDerivation rec { sha256 = "0wbcqb9rbfqqvvhqr1pbqax75wp8ydqdyhp91fbqfqp26xzjv6lk"; }; - rmarkdownSrc = fetchurl { - url = "https://github.com/rstudio/rmarkdown/archive/95b8b1fa64f78ca99f225a67fff9817103be56.zip"; - sha256 = "12fa65qr04rwsprkmyl651mkaqcbn1znwsmcjg4qsk9n5nxg0fah"; + rmarkdownSrc = fetchFromGitHub { + owner = "rstudio"; + repo = "rmarkdown"; + rev = "v1.8"; + sha256 = "1blqxdr1vp2z5wd52nmf8hq36sdd4s2pyms441dqj50v35f8girb"; }; - rsconnectSrc = fetchurl { - url = "https://github.com/rstudio/rsconnect/archive/425f3767b3142bc6b81c9eb62c4722f1eedc9781.zip"; - sha256 = "1sgf9dj9wfk4c6n5p1jc45386pf0nj2alg2j9qx09av3can1dy9p"; + rsconnectSrc = fetchFromGitHub { + owner = "rstudio"; + repo = "rsconnect"; + rev = "953c945779dd180c1bfe68f41c173c13ec3e222d"; + sha256 = "1yxwd9v4mvddh7m5rbljicmssw7glh1lhin7a9f01vxxa92vpj7z"; }; rstudiolibclang = fetchurl { @@ -88,8 +88,10 @@ stdenv.mkDerivation rec { done unzip $mathJaxSrc -d dependencies/common/mathjax-26 - unzip $rmarkdownSrc -d dependencies/common/rmarkdown - unzip $rsconnectSrc -d dependencies/common/rsconnect + mkdir -p dependencies/common/rmarkdown + ln -s $rmarkdownSrc dependencies/common/rmarkdown/ + mkdir -p dependencies/common/rsconnect + ln -s $rsconnectSrc dependencies/common/rsconnect/ mkdir -p dependencies/common/libclang/3.5 unzip $rstudiolibclang -d dependencies/common/libclang/3.5 mkdir -p dependencies/common/libclang/builtin-headers @@ -124,7 +126,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 0c716ed63c1..a6f454deaf5 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/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index d1c0ab274f0..1c5767d17f4 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.1"; src = fetchFromGitHub { owner = "bjorn"; repo = "tiled"; rev = "v${version}"; - sha256 = "1j8307h7xkxqwr8rpr9fn1svm5h10k61w6zxr4sgph1hiv8x33aa"; + sha256 = "1c6n5xshadxv5qwv8kfrj1kbfnkvx6nyxc9p4mpzkjrkxw1b1qf1"; }; nativeBuildInputs = [ pkgconfig qmake ]; @@ -27,6 +25,5 @@ in stdenv.mkDerivation rec { gpl2Plus # all the rest ]; platforms = platforms.linux; - maintainers = [ maintainers.nckx ]; }; } diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index b20a6e5ec45..22e7c3d31b3 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.41"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://www.typora.io/linux/typora_${version}_amd64.deb"; - sha256 = "bf6a069c5da4a7dc289bdb3c8d27e7a81daeaee99488d4d3b512c6b673780557"; + sha256 = "e4916f86c7c12aec8fd59b3ef79c2a4d3f77b02a0a9e962916c688871c9fda1d"; } else fetchurl { url = "https://www.typora.io/linux/typora_${version}_i386.deb"; - sha256 = "edd092e96ebf69503cf6b39b77a61ec5e3185f8a1447da0bed063fa11861c1b9"; + sha256 = "18960fb4b2cd6cf9cb77025a4035a3258f1599b1d225fb673b49c1588fa272d6"; } ; diff --git a/pkgs/applications/editors/vbindiff/default.nix b/pkgs/applications/editors/vbindiff/default.nix index becb5ccc29a..8d3a5353c98 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 417f2d80516..5155f94eef5 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.1451"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "1y4c7wn5gr7n4c2ni36kadr26aldydxlf06yj7nsmw22ywwg78ig"; + sha256 = "1vxd5mr8c62qyf7ax7gi2wka48282yplckq91154yd55xcqw36zx"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 2f110749277..067179974b1 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/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index f997de0e767..5f1d5c50d4e 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.19.0"; + version = "1.19.3"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "036mdmma3b7iwinq1g6pxsn8vwx977hmjy3b4b0m84023phwm2x7"; - "x86_64-linux" = "089j9plq96d2px56gh1q4m9dhclb5xy0ca4b97rnnpdw93hhx94n"; - "x86_64-darwin" = "1q37bak2m966kfa5a87nzalnpa205gkjvb4zf1klmqipwqq4wm4d"; + "i686-linux" = "0qaijcsjy9sysim19gyqmagg8rmxgamf0l74qj3ap0wsv2v7xixr"; + "x86_64-linux" = "1kvkcrr1hgnssy2z45h8fdgr9j6w94myr2hvlknwcahzxrnrwr7k"; + "x86_64-darwin" = "19vkv97yq0alnq4dvs62a2vx3f1mvfz1ic63114s9sd6smikrg0g"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 3382bb3e56d..987b544c556 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -4,15 +4,15 @@ }: 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 ] ++ (with python2Packages; [ python dateutil wxPython30 numpy ]); configureFlags = [ @@ -22,9 +22,12 @@ 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" ]; @@ -40,17 +43,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,7 +64,7 @@ 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' @@ -72,6 +78,5 @@ 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; }; } diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index 4d229450a4a..847421de3b1 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.2.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.2.0/saga-6.2.0.tar.gz"; + sha256 = "91b030892c894ba02eb4292ebfc9ccbf4acf3062118f2a89a9a11208773fa280"; }; meta = { diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 98e2c0e3f7d..e716146ec7a 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-14"; - sha256 = "04hpc9i6fp09iy0xkidlfhfqr7zg45izqqj5fx93n3dxalq65xqw"; + version = "7.0.7-22"; + sha256 = "1ad7mwx48xrkvm3v060n2f67kmi0qk7gfql1shiwbkkjvzzaaiam"; 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 e3500a621cb..be3a369c28b 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-26"; - sha256 = "10rcq7b9hhz50m4yqnm4g3iai7lr9jkglb7sm49ycw59arrkmwnw"; + 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 = "ImageMagick"; + rev = cfg.version; inherit (cfg) sha256; }; diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix index 9b1dd4c25ae..459e07f9838 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/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 8c1db9c039e..787ddc72ec9 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -11,12 +11,12 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - version = "2.2.5"; + version = "2.4.1"; name = "darktable-${version}"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "10gjzd4irxhladh4jyss9kgp627k8vgx2divipsb33pp6cms80z3"; + sha256 = "014pq80i5k1kdvvrl7xrgaaq3i4fzv09h7a3pwzlp2ahkczwcm32"; }; buildInputs = @@ -49,6 +49,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 1e2ff00cdb2..d2ef35fcca8 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, fetchpatch +{ mkDerivation, lib, fetchFromGitHub, cmake, doxygen, extra-cmake-modules, wrapGAppsHook, fetchpatch # For `digitaglinktree` , perl, sqlite @@ -50,11 +50,13 @@ mkDerivation rec { name = "digikam-${version}"; - version = "5.7.0"; + version = "5.8.0"; - src = fetchurl { - url = "mirror://kde/stable/digikam/${name}.tar.xz"; - sha256 = "1xah079g47fih8l9qy1ifppfvmq5yms5y1z54nvxdyz8nsszy19n"; + src = fetchFromGitHub { + owner = "KDE"; + repo = "digikam"; + rev = "v${version}"; + sha256 = "1bvidg0fn92xvw5brhb34lm7m4iy4jb5xpvnhbgh8vik2m4n41w1"; }; nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ]; @@ -75,7 +77,6 @@ mkDerivation rec { libqtav libusb1 mesa - mysql opencv3 pcre @@ -112,20 +113,6 @@ mkDerivation rec { --replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3" ''; - patches = [ - # fix Qt-5.9.3 empty album problem - (fetchpatch { - url = "https://cgit.kde.org/digikam.git/patch/?id=855ba5b7d4bc6337234720a72ea824ddd3b32e5b"; - sha256 = "0zk8p182piy6xn9v0mhwawya9ciq596vql1qc3lgnx371a97mmni"; - }) - ]; - - patchFlags = "-d core -p1"; - - # `en make -f core/utilities/assistants/expoblending/CMakeFiles/expoblending_src.dir/build.make core/utilities/assistants/expoblending/CMakeFiles/expoblending_src.dir/manager/expoblendingthread.cpp.o`: - # digikam_version.h:37:24: fatal error: gitversion.h: No such file or directory - enableParallelBuilding = false; - meta = with lib; { description = "Photo Management Program"; license = licenses.gpl2; diff --git a/pkgs/applications/graphics/displaycal/default.nix b/pkgs/applications/graphics/displaycal/default.nix index 80d2b290367..a845bc63a38 100644 --- a/pkgs/applications/graphics/displaycal/default.nix +++ b/pkgs/applications/graphics/displaycal/default.nix @@ -49,7 +49,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/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index b447fa7810f..478e9d2b453 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.23"; src = fetchurl { url = "https://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "1kcflv4jb4250g94nqn28i98xqvvci8w7vqpfr62gxlp16z1za05"; + sha256 = "18922zv8ckm82r1ap1yn7plbk6djpj02za2ahng58sjj2fw3rpqn"; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix new file mode 100644 index 00000000000..6fb7182035b --- /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.2"; + + src = fetchFromGitHub { + owner = "guillaumechereau"; + repo = "goxel"; + rev = "v${version}"; + sha256 = "1d6waj8zz9iq3ddbi9wbpcnh200ajjy9x53xrj5bij01pb8jwskv"; + }; + + 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 11a2b3a8c8b..f086a8f5ba6 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.27"; in +let version = "1.3.28"; in stdenv.mkDerivation { name = "graphicsmagick-${version}"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; - sha256 = "0rq35p3rml10cxz2z4s7xcfsilhhk19mmy094g3ivz0fg797hcnh"; + sha256 = "0jlrrimrajcmwp7llivyj14qnzb1mpqd8vw95dl6zbx5m2lnhall"; }; patches = [ diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index d9e0f42e53e..161e8915124 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "gthumb"; - version = "${major}.3"; - major = "3.5"; + version = "${major}.0"; + major = "3.6"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${major}/${name}.tar.xz"; - sha256 = "0hka1b3l8mf94zsk7jff87wsb8bz4pj5pixjrs0w2j8jbsa9sggk"; + sha256 = "1zc7myvnzgq7dawjg03rqvwfad7p938m20f25sfhv65jsfq8n928"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index a9c238ead3c..791cd7be2d0 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 = "3.3.3"; 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 = "0pc6hnakkqy81x5b5ncivaps6hqv43i50sjwgi3i3cz9j8rlxh5y"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix index 5f27cb44699..4b5c4517dea 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 = "17.07"; src = fetchFromGitHub { owner = "leozide"; repo = "leocad"; rev = "v${version}"; - sha256 = "0d7l2il6r4swnmrmaf1bsrgpjgai5xwhwk2mkpcsddnk59790mmc"; + sha256 = "1j361pvxywi4nb2alhnnd4qpqrpg6503gbi17cadcdi434gbqbsd"; }; nativeBuildInputs = [ qmake4Hook ]; @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "CAD program for creating virtual LEGO models"; homepage = http://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 30d34a88d90..867c0a55838 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 ac2a194b7ca..c25c1277ee0 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 00000000000..2fddc39e0d0 --- /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/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index e7a05c522ca..06a1a946cdf 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -3,12 +3,12 @@ }: 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 = [ @@ -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/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix index 0d1adcff6e8..73bbd5003bd 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/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 82e8793199b..01affbbbd94 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/renderdoc/custom_swig.patch b/pkgs/applications/graphics/renderdoc/custom_swig.patch new file mode 100644 index 00000000000..e6ed05ea97a --- /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 2a5bbb9401a..2bd3ab89161 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -1,8 +1,26 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig , qtbase, qtx11extras, qtsvg, makeWrapper, python3, bison -, autoconf, automake, pcre, vulkan-loader, xorg +, 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.91"; @@ -17,7 +35,8 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader ]; - nativeBuildInputs = [ cmake makeWrapper pkgconfig python3 bison autoconf automake pcre ]; + + nativeBuildInputs = [ cmake makeWrapper pkgconfig python3 bison ]; cmakeFlags = [ "-DBUILD_VERSION_HASH=${src.rev}" @@ -28,6 +47,7 @@ stdenv.mkDerivation rec { # 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/" ''; @@ -41,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/; diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix index 5d35857f05e..2ca1fead84c 100644 --- a/pkgs/applications/graphics/sane/backends/generic.nix +++ b/pkgs/applications/graphics/sane/backends/generic.nix @@ -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/swingsane/default.nix b/pkgs/applications/graphics/swingsane/default.nix index 53bdbcd1274..94666531c0c 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/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index dcb7c512dde..a8b4038b11f 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/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 00000000000..1b5e12c7ec3 --- /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 bb7dac1b62a..da7cd2e8d79 100644 --- a/pkgs/applications/kde/akonadi/default.nix +++ b/pkgs/applications/kde/akonadi/default.nix @@ -19,13 +19,13 @@ mkDerivation { ]; 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 9e067f0a000..f828d503cc7 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 3d7bf26c794..1470406d5a4 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 378fcde41e1..8fd65770afd 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 {}; @@ -101,7 +100,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,6 +125,7 @@ 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 {}; @@ -135,6 +137,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 {}; @@ -154,8 +157,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 1542b9c2519..1c1a0102dd0 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.1/ -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 6275bb84c17..fe8b15febf2 100644 --- a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch +++ b/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch @@ -11,85 +11,6 @@ Index: grantleetheme-17.04.0/src/grantleetheme_p.h QString author; QString email; -Index: grantleetheme-17.04.0/src/grantleetheme.cpp -=================================================================== ---- grantleetheme-17.04.0.orig/src/grantleetheme.cpp -+++ grantleetheme-17.04.0/src/grantleetheme.cpp -@@ -45,7 +45,7 @@ ThemePrivate::ThemePrivate(const ThemePr - , description(other.description) - , name(other.name) - , dirName(other.dirName) -- , absolutePath(other.absolutePath) -+ , absolutePaths(other.absolutePaths) - , author(other.author) - , email(other.email) - , loader(other.loader) -@@ -63,12 +63,15 @@ void ThemePrivate::setupEngine() - - void ThemePrivate::setupLoader() - { -- // Get the parent dir with themes, we set the theme directory separately -- QDir dir(absolutePath); -- dir.cdUp(); -+ QStringList templateDirs; -+ for (const QString& path : absolutePaths) { -+ QDir dir(path); -+ dir.cdUp(); -+ templateDirs << dir.absolutePath(); -+ } - - 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 - KConfigGroup group(&config, QStringLiteral("Desktop Entry")); - if (group.isValid()) { - d->dirName = dirName; -- d->absolutePath = themePath; -+ d->absolutePaths = QStringList(themePath); - d->name = group.readEntry("Name", QString()); - d->description = group.readEntry("Description", QString()); - d->themeFileName = group.readEntry("FileName", QString()); -@@ -141,7 +142,7 @@ Theme::~Theme() - - bool Theme::operator==(const Theme &other) const - { -- return isValid() && other.isValid() && d->absolutePath == other.absolutePath(); -+ return isValid() && other.isValid() && d->absolutePaths == other.absolutePaths(); - } - - Theme &Theme::operator=(const Theme &other) -@@ -185,7 +186,12 @@ QString Theme::dirName() const - - QString Theme::absolutePath() const - { -- return d->absolutePath; -+ return d->absolutePaths.first(); -+} -+ -+QStringList Theme::absolutePaths() const -+{ -+ return d->absolutePaths; - } - - QString Theme::author() const -@@ -224,6 +230,13 @@ QString Theme::render(const QString &tem - return result; - } - -+void Theme::addThemeDir(const QString& path) -+{ -+ QDir dir(path); -+ dir.cdUp(); -+ d->absolutePaths << dir.absolutePath(); -+} -+ - 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 @@ -153,3 +74,80 @@ Index: grantleetheme-17.04.0/src/grantleethememanager.cpp } } } +--- 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) +- , absolutePath(other.absolutePath) ++ , absolutePaths(other.absolutePaths) + , author(other.author) + , email(other.email) + , loader(other.loader) +@@ -64,12 +64,15 @@ void ThemePrivate::setupEngine() + + void ThemePrivate::setupLoader() + { +- // Get the parent dir with themes, we set the theme directory separately +- QDir dir(absolutePath); +- dir.cdUp(); ++ QStringList templateDirs; ++ for (const QString& path : absolutePaths) { ++ QDir dir(path); ++ dir.cdUp(); ++ templateDirs << dir.absolutePath(); ++ } + + loader = QSharedPointer::create(); +- loader->setTemplateDirs({ dir.absolutePath() }); ++ loader->setTemplateDirs(templateDirs); + loader->setTheme(dirName); + + if (!sEngine) { +@@ -121,7 +124,7 @@ Theme::Theme(const QString &themePath, c + KConfigGroup group(&config, QStringLiteral("Desktop Entry")); + if (group.isValid()) { + d->dirName = dirName; +- d->absolutePath = themePath; ++ d->absolutePaths = QStringList(themePath); + d->name = group.readEntry("Name", QString()); + d->description = group.readEntry("Description", QString()); + d->themeFileName = group.readEntry("FileName", QString()); +@@ -140,7 +143,7 @@ Theme::~Theme() + + bool Theme::operator==(const Theme &other) const + { +- return isValid() && other.isValid() && d->absolutePath == other.absolutePath(); ++ return isValid() && other.isValid() && d->absolutePaths == other.absolutePaths(); + } + + Theme &Theme::operator=(const Theme &other) +@@ -184,7 +187,12 @@ QString Theme::dirName() const + + QString Theme::absolutePath() const + { +- return d->absolutePath; ++ return d->absolutePaths.first(); ++} ++ ++QStringList Theme::absolutePaths() const ++{ ++ return d->absolutePaths; + } + + QString Theme::author() const +@@ -223,6 +231,13 @@ QString Theme::render(const QString &tem + return result; + } + ++void Theme::addThemeDir(const QString& path) ++{ ++ QDir dir(path); ++ dir.cdUp(); ++ d->absolutePaths << dir.absolutePath(); ++} ++ + void Theme::addPluginPath(const QString &path) + { + if (!ThemePrivate::sEngine) { diff --git a/pkgs/applications/kde/kde-locale-4.nix b/pkgs/applications/kde/kde-locale-4.nix deleted file mode 100644 index daf0a55b19e..00000000000 --- 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/kdelibs/0001-old-kde4-cmake-policies.patch b/pkgs/applications/kde/kdelibs/0001-old-kde4-cmake-policies.patch deleted file mode 100644 index b7d7300e9a8..00000000000 --- 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 ff0306ea148..00000000000 --- 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 a79d7b2b7d1..00000000000 --- 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 31e578e228a..00000000000 --- 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/kdepim-runtime.nix b/pkgs/applications/kde/kdepim-runtime.nix index 0fde861a023..3230efd8201 100644 --- a/pkgs/applications/kde/kdepim-runtime.nix +++ b/pkgs/applications/kde/kdepim-runtime.nix @@ -5,7 +5,7 @@ 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 { @@ -19,7 +19,7 @@ mkDerivation { 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 00000000000..df301af0cba --- /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 00000000000..6a50f1d08d1 --- /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 a78da6f48ca..8abb58b46b2 100644 --- a/pkgs/applications/kde/kio-extras.nix +++ b/pkgs/applications/kde/kio-extras.nix @@ -18,5 +18,5 @@ mkDerivation { 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/kmailtransport.nix b/pkgs/applications/kde/kmailtransport.nix index 19ce2ba94f3..c4b7c0ab432 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 b18a3f7fdc1..4523a69fc1b 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/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 00000000000..74e83761eb7 --- /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 00000000000..6a5f51a17bf --- /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/l10n.nix b/pkgs/applications/kde/l10n.nix deleted file mode 100644 index 10a8472d5a9..00000000000 --- 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 edd9732d051..3fd48605654 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 00000000000..7ff3a1f04b0 --- /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/minuet.nix b/pkgs/applications/kde/minuet.nix index fd628a7aacf..efe850ab414 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/srcs.nix b/pkgs/applications/kde/srcs.nix index 2edfb0d79bb..781a5978675 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.1"; 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.1/src/akonadi-17.12.1.tar.xz"; + sha256 = "0iaw6kmbi68wd728v6m5w90xy9v0nqgd66n026r5dy64pm08hj0x"; + name = "akonadi-17.12.1.tar.xz"; }; }; akonadi-calendar = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/akonadi-calendar-17.12.1.tar.xz"; + sha256 = "0j32xxglksya014c2199bn5k540zllmlsyvvr6jcmvbfpcilnl7d"; + name = "akonadi-calendar-17.12.1.tar.xz"; }; }; akonadi-calendar-tools = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/akonadi-calendar-tools-17.12.1.tar.xz"; + sha256 = "0yk59hq0fflmv18w7i6jx48436ykhgc1q5agbjckfw9g9qfmaj04"; + name = "akonadi-calendar-tools-17.12.1.tar.xz"; }; }; akonadiconsole = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/akonadiconsole-17.12.1.tar.xz"; + sha256 = "1x1cazikj7a3paf93ms2wl9cbbqhr43jpk7ijb6wjnhzv0jx0yv0"; + name = "akonadiconsole-17.12.1.tar.xz"; }; }; akonadi-contacts = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/akonadi-contacts-17.12.1.tar.xz"; + sha256 = "12gvzwxhazwz6cn07vz2v21nh31nnxq5ckvm9bw94amhxdcrhji1"; + name = "akonadi-contacts-17.12.1.tar.xz"; }; }; akonadi-import-wizard = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/akonadi-import-wizard-17.12.1.tar.xz"; + sha256 = "1v4sqmlbkvhi14bjpg88017slsmsingk3lcvl1hpi9wh5chhybs2"; + name = "akonadi-import-wizard-17.12.1.tar.xz"; }; }; akonadi-mime = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/akonadi-mime-17.12.1.tar.xz"; + sha256 = "0y0s4qaa00240czq1mgm3p63cagdn4kv0njwhlh5va6jknb56rsq"; + name = "akonadi-mime-17.12.1.tar.xz"; }; }; akonadi-notes = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/akonadi-notes-17.12.1.tar.xz"; + sha256 = "1ylbrz5p5y80j7carlqwpxw222faf1ri7lyhnl09j1xsiaw74jz1"; + name = "akonadi-notes-17.12.1.tar.xz"; }; }; akonadi-search = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/akonadi-search-17.12.1.tar.xz"; + sha256 = "14blwxccz36qdmahwz14vnd7a5j01xpzijc3bbw768l1ifxac5sp"; + name = "akonadi-search-17.12.1.tar.xz"; }; }; akregator = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/akregator-17.12.1.tar.xz"; + sha256 = "03292r4l2wpsikrngldmkvjl75ijpy9sfwr14r2kk0rbkqpzn7gn"; + name = "akregator-17.12.1.tar.xz"; }; }; analitza = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/analitza-17.12.1.tar.xz"; + sha256 = "1zp3xki1jppqzpsjxv0mif44hx5amdk9w9a8h1h9wbdwf9zn7038"; + name = "analitza-17.12.1.tar.xz"; }; }; ark = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/ark-17.12.1.tar.xz"; + sha256 = "0xxahw4qysynim32pi4f3kzvpn8fikii3nxdjk1f58cs7ylk7h9h"; + name = "ark-17.12.1.tar.xz"; }; }; artikulate = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/artikulate-17.12.1.tar.xz"; + sha256 = "1f99gdjlrfxfii605d58566qkzg0vwbdj2sl7gaf2n8974qih26l"; + name = "artikulate-17.12.1.tar.xz"; }; }; audiocd-kio = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/audiocd-kio-17.12.1.tar.xz"; + sha256 = "1q5rl3h5vlqa16wsa2zqapqycnbqcsfskkgh47pklsbzi49p2b7w"; + name = "audiocd-kio-17.12.1.tar.xz"; }; }; baloo-widgets = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/baloo-widgets-17.12.1.tar.xz"; + sha256 = "1w681fxjimwnywx6dbk7486ncwgq4izj7r4q5ahism10kxjyvy1i"; + name = "baloo-widgets-17.12.1.tar.xz"; }; }; blinken = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/blinken-17.12.1.tar.xz"; + sha256 = "0935gyc499j1br0g1knkpzr73q44mqfr89rjnl5ax6cncs6kkwcd"; + name = "blinken-17.12.1.tar.xz"; }; }; bomber = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/bomber-17.12.1.tar.xz"; + sha256 = "1jmkzq07rq19dzci1p3zida12yamn3rsd1l7zy75skwm43q8210r"; + name = "bomber-17.12.1.tar.xz"; }; }; bovo = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/bovo-17.12.1.tar.xz"; + sha256 = "0fa0cp3w2khvsg5rvnhn9yrx7pg0qvgd3grk7dbzv9frs3nc8k8a"; + name = "bovo-17.12.1.tar.xz"; }; }; calendarsupport = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/calendarsupport-17.12.1.tar.xz"; + sha256 = "02g845mnyyjma9kadi9j1y774nb157qk4s9xfh414j35wa4n4ml0"; + name = "calendarsupport-17.12.1.tar.xz"; }; }; cantor = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/cantor-17.12.1.tar.xz"; + sha256 = "1jxjv729js6na70nc8rmr65ah4bvly27qndv1g4grzyv1j5v9pwa"; + name = "cantor-17.12.1.tar.xz"; }; }; cervisia = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/cervisia-17.12.1.tar.xz"; + sha256 = "1jjc2iarpl6vinav20rly9b2ha3d35ipm45mmn6hdqwrgh08x61a"; + name = "cervisia-17.12.1.tar.xz"; }; }; dolphin = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/dolphin-17.12.1.tar.xz"; + sha256 = "0pyajijsadkl1yky0p66d0sglxp7ks1bl23x4xy5zhdv3clr5gzc"; + name = "dolphin-17.12.1.tar.xz"; }; }; dolphin-plugins = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/dolphin-plugins-17.12.1.tar.xz"; + sha256 = "1igyk2jx2rsgy7rbxi84fkhi831a2v4fg0bc08ad36y43cm849zh"; + name = "dolphin-plugins-17.12.1.tar.xz"; }; }; dragon = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/dragon-17.12.1.tar.xz"; + sha256 = "02apbhw98sq817660ldb1gdzna4jjb2v6379mvrb2d1qgigh1afd"; + name = "dragon-17.12.1.tar.xz"; }; }; eventviews = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/eventviews-17.12.1.tar.xz"; + sha256 = "1cga2i941x1rgp4i8aff8vr7hlk4q312pynr44hfidx4vjig9ia9"; + name = "eventviews-17.12.1.tar.xz"; }; }; ffmpegthumbs = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/ffmpegthumbs-17.12.1.tar.xz"; + sha256 = "0lmd8papahnqr5c830wqz8bhkvdsads97b23dnzhnck78dinww2s"; + name = "ffmpegthumbs-17.12.1.tar.xz"; }; }; filelight = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/filelight-17.12.1.tar.xz"; + sha256 = "0c0fi9dziwf5v7069wsrqnqw95cfpicg4a6xp05hhpc9qqkvdngk"; + name = "filelight-17.12.1.tar.xz"; }; }; granatier = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/granatier-17.12.1.tar.xz"; + sha256 = "1ja7v2xr2yyw2qh7zkf2s7ym8qv5gfr1zbii54dk2r5k4a8slvi4"; + name = "granatier-17.12.1.tar.xz"; }; }; grantlee-editor = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/grantlee-editor-17.12.1.tar.xz"; + sha256 = "19w2f30rsk65xdc8kqr03fmkm0a743mgyj6gm6207nxsm5plr3nv"; + name = "grantlee-editor-17.12.1.tar.xz"; }; }; grantleetheme = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/grantleetheme-17.12.1.tar.xz"; + sha256 = "1nga48vvqysbh2g10wka02ibbyny77wrz8a1p336sycr76q1xmcz"; + name = "grantleetheme-17.12.1.tar.xz"; }; }; gwenview = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/gwenview-17.12.1.tar.xz"; + sha256 = "1a87b6wh2ga9j8r498zyf2dga77lhky41dl31ndkx94vm8ycdnlv"; + name = "gwenview-17.12.1.tar.xz"; }; }; incidenceeditor = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/incidenceeditor-17.12.1.tar.xz"; + sha256 = "0x7c3j8frzqmvgz6zn98h0qiays1fdvnlngdksi7gkm82bsvk7i2"; + name = "incidenceeditor-17.12.1.tar.xz"; }; }; juk = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/juk-17.12.1.tar.xz"; + sha256 = "13k7j7h62mggfj79a534m58rl9fd2vzhvv0wj7752n4nbiha6q3q"; + name = "juk-17.12.1.tar.xz"; }; }; k3b = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/k3b-17.12.1.tar.xz"; + sha256 = "11jsfja3r9x6drs0v1nb4h9w6hl3ab7rxjcxm8czbwmx2897vgyg"; + name = "k3b-17.12.1.tar.xz"; }; }; kaccounts-integration = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kaccounts-integration-17.12.1.tar.xz"; + sha256 = "1zfq6yknn8kjjnkp3s58gj15r5qd0xpmxl49c2615j08qjbbs5k2"; + name = "kaccounts-integration-17.12.1.tar.xz"; }; }; kaccounts-providers = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kaccounts-providers-17.12.1.tar.xz"; + sha256 = "1mzh7brgd42fb4nnnn607nivqpb3hvy982dini32j54k1rls4810"; + name = "kaccounts-providers-17.12.1.tar.xz"; }; }; kaddressbook = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kaddressbook-17.12.1.tar.xz"; + sha256 = "1ls02igrp4q6zbw62gyp3rkzbyv6jm0s46z1q3ifkqyxanm3mpbv"; + name = "kaddressbook-17.12.1.tar.xz"; }; }; kajongg = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kajongg-17.12.1.tar.xz"; + sha256 = "05vakzhzrr7p8hdrmmvy8q0mj0z5xf7zyzm4lckaj9mpfvg9gnxm"; + name = "kajongg-17.12.1.tar.xz"; }; }; kalarm = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kalarm-17.12.1.tar.xz"; + sha256 = "11aa89k44jzmkm3xrgi59y4fgk2vb68zhhrkm53r13wxv2k2z9d7"; + name = "kalarm-17.12.1.tar.xz"; }; }; kalarmcal = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kalarmcal-17.12.1.tar.xz"; + sha256 = "05ynq5rbcny5h0k43r13b019zkg8mfkpkfx6drnar7nif6ji3qg5"; + name = "kalarmcal-17.12.1.tar.xz"; }; }; kalgebra = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kalgebra-17.12.1.tar.xz"; + sha256 = "10pn3b17ahxp99glza6yyj4fmn6f6mhjggfd1d612gj8jldqr7r4"; + name = "kalgebra-17.12.1.tar.xz"; }; }; kalzium = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kalzium-17.12.1.tar.xz"; + sha256 = "13h4134w97dbsxrg4f6bgq5l14shlzg4djzwyiad4m892hmyrajn"; + name = "kalzium-17.12.1.tar.xz"; }; }; kamera = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kamera-17.12.1.tar.xz"; + sha256 = "19ps2p6cwhgfw9ll8gjjdq7k88srcixsfmfsqk8jvi9jpfqcw9mn"; + name = "kamera-17.12.1.tar.xz"; }; }; kanagram = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kanagram-17.12.1.tar.xz"; + sha256 = "0pq0iwd7qrd5rc5jgm3ll2hgdxrjb6rq1qzz1175lj4b9ackn7ad"; + name = "kanagram-17.12.1.tar.xz"; }; }; kapman = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kapman-17.12.1.tar.xz"; + sha256 = "1d0a36jj1prp6zsxhzxz081w6wr5p7hb6lx687nfrqhbiqkr9059"; + name = "kapman-17.12.1.tar.xz"; }; }; kapptemplate = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kapptemplate-17.12.1.tar.xz"; + sha256 = "1gcb8gc4x6f1brxqxdsppq61n8r20p9a0qq0pp8g88q1n5r3irpc"; + name = "kapptemplate-17.12.1.tar.xz"; }; }; kate = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kate-17.12.1.tar.xz"; + sha256 = "0rnkp197ranq3hi9scw1k1nmqj05fhnifyk9gjbg4mp8wwn3zgcv"; + name = "kate-17.12.1.tar.xz"; }; }; katomic = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/katomic-17.12.1.tar.xz"; + sha256 = "13xszrnc3bgz2vbzhhz00k1hzlzi7n7jvg61rjqg0frf0n4ccih0"; + name = "katomic-17.12.1.tar.xz"; }; }; kblackbox = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kblackbox-17.12.1.tar.xz"; + sha256 = "1iish6qs2q7pn9y8k4v07gkyqs0jq6ppdvxc6jfrkzymcnnaq9by"; + name = "kblackbox-17.12.1.tar.xz"; }; }; kblocks = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kblocks-17.12.1.tar.xz"; + sha256 = "11kfm99hp6a4dp5q6bapq3axgkjmwcp1cd284plm3nxsd15sv87b"; + name = "kblocks-17.12.1.tar.xz"; }; }; kblog = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kblog-17.12.1.tar.xz"; + sha256 = "1f7ygzb3acgjr1ax768cv94l3li8lbq6230lkgqz6lms3x9plpdc"; + name = "kblog-17.12.1.tar.xz"; }; }; kbounce = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kbounce-17.12.1.tar.xz"; + sha256 = "18w0jxdfjkvrkz1g1k0f37ajjyxc7cazbp3qxg0m2pbrkllgs12v"; + name = "kbounce-17.12.1.tar.xz"; }; }; kbreakout = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kbreakout-17.12.1.tar.xz"; + sha256 = "166ck3z0x77p6n065q41fwj3lvxyzsshpgmi7xavbjgjl6cb941r"; + name = "kbreakout-17.12.1.tar.xz"; }; }; kbruch = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kbruch-17.12.1.tar.xz"; + sha256 = "04ylr7jj1qz3clnavv195gqm4hi017jzrz3vbx0dg7jfqr9jvzxh"; + name = "kbruch-17.12.1.tar.xz"; }; }; kcachegrind = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kcachegrind-17.12.1.tar.xz"; + sha256 = "1qiwv7xpcf01s08bm83n77nhwplg19dd0zaqcr6xagjhf9y165xf"; + name = "kcachegrind-17.12.1.tar.xz"; }; }; kcalc = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kcalc-17.12.1.tar.xz"; + sha256 = "00asfczvfvfmfg0ffd0d2rh3nmqgzqf4f9bdkwq9z8gajfz3cjs1"; + name = "kcalc-17.12.1.tar.xz"; }; }; kcalcore = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kcalcore-17.12.1.tar.xz"; + sha256 = "0zyf3r3zwivjzqag76pi9wrbvzqzbcnraajbb0xksf9ik53gk3pd"; + name = "kcalcore-17.12.1.tar.xz"; }; }; kcalutils = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kcalutils-17.12.1.tar.xz"; + sha256 = "01djf24immjn62hxs2gsi5f27q54vh254wq3sqzgxz0vbfv97bza"; + name = "kcalutils-17.12.1.tar.xz"; }; }; kcharselect = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kcharselect-17.12.1.tar.xz"; + sha256 = "14bh4n4bqi5y7ya6xi7ykl398i2qdkmximp87r5qcimxgvxfczki"; + name = "kcharselect-17.12.1.tar.xz"; }; }; kcolorchooser = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kcolorchooser-17.12.1.tar.xz"; + sha256 = "1aqzwbw7ajb5nzj2k107m32naj0c6nsdhzmg0w0wrd80fz2qnpx3"; + name = "kcolorchooser-17.12.1.tar.xz"; }; }; kcontacts = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kcontacts-17.12.1.tar.xz"; + sha256 = "152a9bhyya4rigmydfh6x932pp3vi4i1zya5sdlg9vr045ljgzwk"; + name = "kcontacts-17.12.1.tar.xz"; }; }; kcron = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kcron-17.12.1.tar.xz"; + sha256 = "0qzc8427l1hndisq163b4ppph8ividw38lxczirv186gm01xsgqk"; + name = "kcron-17.12.1.tar.xz"; }; }; kdav = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kdav-17.12.1.tar.xz"; + sha256 = "09q1d0yzhwr4gr4xfp1zbmqbdhrw827y379blqg1351k8mxvfhzi"; + name = "kdav-17.12.1.tar.xz"; }; }; kdebugsettings = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kdebugsettings-17.12.1.tar.xz"; + sha256 = "0ac8mnjm7mvk9988ds0kvgxnjfkpv8iiwgaccsykiqgpnk8dx7qh"; + name = "kdebugsettings-17.12.1.tar.xz"; }; }; kde-dev-scripts = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kde-dev-scripts-17.12.1.tar.xz"; + sha256 = "1cxfjc4can7ggbrcdz03lsalq221fw5qmcw9y35kqs504wgc0g1w"; + name = "kde-dev-scripts-17.12.1.tar.xz"; }; }; kde-dev-utils = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kde-dev-utils-17.12.1.tar.xz"; + sha256 = "0mnk6zzq0xa3fd32c46gyjsqsxji5p7ky5g7bly2myhl7f03hnc0"; + name = "kde-dev-utils-17.12.1.tar.xz"; }; }; kdeedu-data = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kdeedu-data-17.12.1.tar.xz"; + sha256 = "0i917gys8bpsmswm7rp2idbrwv5470cvp4xa0wxfnnq0y6nxj0w3"; + name = "kdeedu-data-17.12.1.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kdegraphics-mobipocket-17.12.1.tar.xz"; + sha256 = "09bh0qjzr27zkvz5cyrxpx5pkz9fldr2yxzc1f3hxs2fmqgj7rc6"; + name = "kdegraphics-mobipocket-17.12.1.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "17.08.3"; + version = "17.12.1"; 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"; - 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.1/src/kdegraphics-thumbnailers-17.12.1.tar.xz"; + sha256 = "0fm8vsbmaxibjlkjkbic7b8x3xrz8nrjn8r8ps4mka4hnsmkk2b9"; + name = "kdegraphics-thumbnailers-17.12.1.tar.xz"; }; }; kdenetwork-filesharing = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kdenetwork-filesharing-17.12.1.tar.xz"; + sha256 = "10d0ayd3krkac0249smnxn8jfyj9rfy1jjx0d2sqs28jhq5z8892"; + name = "kdenetwork-filesharing-17.12.1.tar.xz"; }; }; kdenlive = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kdenlive-17.12.1.tar.xz"; + sha256 = "0rv52w6kccsz6796nhn5hw0x5x2jjwx7y8jxmglc7jbdlsf90bj1"; + name = "kdenlive-17.12.1.tar.xz"; }; }; kdepim-addons = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kdepim-addons-17.12.1.tar.xz"; + sha256 = "19sn4j4ks5iqmcgnir1p2hgzvgncy2iqdvwq7p4ns7hy35bl59n3"; + name = "kdepim-addons-17.12.1.tar.xz"; }; }; kdepim-apps-libs = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kdepim-apps-libs-17.12.1.tar.xz"; + sha256 = "1xy7wcz4wk9qcgmss3xfbkhyhvfp31c13n1wj7a4ar724s35sja9"; + name = "kdepim-apps-libs-17.12.1.tar.xz"; }; }; kdepim-runtime = { - version = "17.08.3"; + version = "17.12.1"; 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"; - 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.1/src/kdepim-runtime-17.12.1.tar.xz"; + sha256 = "0k2b52smz68b9ijcdawimnh471zzadqnfxhvkvprkah952p23z32"; + name = "kdepim-runtime-17.12.1.tar.xz"; }; }; kdesdk-kioslaves = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kdesdk-kioslaves-17.12.1.tar.xz"; + sha256 = "07zv4xkgqpirc0jzidbv0nc5bgqn5sywz9lvgs2v73v1pz1gy13m"; + name = "kdesdk-kioslaves-17.12.1.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kdesdk-thumbnailers-17.12.1.tar.xz"; + sha256 = "0r2dpin3cf19qii0sfl4s8pj99n0fsxgc1l1lh3bnm94z7myld2c"; + name = "kdesdk-thumbnailers-17.12.1.tar.xz"; }; }; kdf = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kdf-17.12.1.tar.xz"; + sha256 = "0jk9i94mc0jb08z4vnnr3m6mlih6y877hll42p0iywliwsbnyz21"; + name = "kdf-17.12.1.tar.xz"; }; }; kdialog = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kdialog-17.12.1.tar.xz"; + sha256 = "075xhg3bzyxaanixlzr740km2z84csx4jbq37gijdz6rllnxjxwl"; + name = "kdialog-17.12.1.tar.xz"; }; }; kdiamond = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kdiamond-17.12.1.tar.xz"; + sha256 = "08qw7gry0zdrslq5dpzm45blcr951xnrgfs75jpw3f7g9xy042kx"; + name = "kdiamond-17.12.1.tar.xz"; }; }; keditbookmarks = { - version = "17.08.3"; + version = "17.12.1"; 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"; - 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.1/src/keditbookmarks-17.12.1.tar.xz"; + sha256 = "1ml3bl6f24c6cs4hfa87rvyax36wcjxkh94iy5xwlhfd176qcjnn"; + name = "keditbookmarks-17.12.1.tar.xz"; }; }; kfind = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kfind-17.12.1.tar.xz"; + sha256 = "0z97w4p86ylkndq12dphpfa0r10ld2b5fvcj1xdfa9cic14lgfxk"; + name = "kfind-17.12.1.tar.xz"; }; }; kfloppy = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kfloppy-17.12.1.tar.xz"; + sha256 = "11gc0v1nkwg6f334ydsh289s5bgxr7ccdybbw3zq16q0vih9px3a"; + name = "kfloppy-17.12.1.tar.xz"; }; }; kfourinline = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kfourinline-17.12.1.tar.xz"; + sha256 = "0rb6z0siw8yhf4w3m9hrkv6csm4vdr8qj7754c41fqkrnlfa8w96"; + name = "kfourinline-17.12.1.tar.xz"; }; }; kgeography = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kgeography-17.12.1.tar.xz"; + sha256 = "1v6xyqv8d4faj0ix7jwq8ralr8s8vi8ryn6hy1i4lj3a06mvgk5z"; + name = "kgeography-17.12.1.tar.xz"; }; }; kget = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kget-17.12.1.tar.xz"; + sha256 = "1n6z92fcbvnvzk3wwpfrf8ycx3kv8vnybpay6hmr63vnbgn7bssw"; + name = "kget-17.12.1.tar.xz"; }; }; kgoldrunner = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kgoldrunner-17.12.1.tar.xz"; + sha256 = "01c2439a7vic3nxhnzhjph3qnfp6qm7yv6qcanxaf2jy7idbm5zq"; + name = "kgoldrunner-17.12.1.tar.xz"; }; }; kgpg = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kgpg-17.12.1.tar.xz"; + sha256 = "1h82gx0y7vm3n7idhqdawns47fmjv6szz3qivds4jj0wx9z2gc9f"; + name = "kgpg-17.12.1.tar.xz"; }; }; khangman = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/khangman-17.12.1.tar.xz"; + sha256 = "1a5ifxm2flkbxy1lqvkaz48ff57yvhqm49j3l637q60i7v2gd75q"; + name = "khangman-17.12.1.tar.xz"; }; }; khelpcenter = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/khelpcenter-17.12.1.tar.xz"; + sha256 = "0y7axdqfmbd2sas5c6ncsi6bpbh95mgymsbpvp2gv7r7d3p11irj"; + name = "khelpcenter-17.12.1.tar.xz"; }; }; kholidays = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kholidays-17.12.1.tar.xz"; + sha256 = "0595d7wbnz8kyq1bnivdrp20lwdp8ykvdll1fmb0fgm4q24z0cl8"; + name = "kholidays-17.12.1.tar.xz"; }; }; kidentitymanagement = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kidentitymanagement-17.12.1.tar.xz"; + sha256 = "1hz1zawc3zmbj0ylhxc4p1qgffpjbpvzhj5mi4b5zvi0nblqsnk6"; + name = "kidentitymanagement-17.12.1.tar.xz"; }; }; kig = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kig-17.12.1.tar.xz"; + sha256 = "0nvsz4q51bjr380w8gfzfahigpxyap7bf54lnllhfbad673b897d"; + name = "kig-17.12.1.tar.xz"; }; }; kigo = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kigo-17.12.1.tar.xz"; + sha256 = "01f0l6fs12v5m88hc9g788mq4k61irgdnf47h7hln4k62rn7yfp9"; + name = "kigo-17.12.1.tar.xz"; }; }; killbots = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/killbots-17.12.1.tar.xz"; + sha256 = "16x72i36vy8a2r7bsg5qmg7bs91cxk3r1yhk8ch8666jl8jvxlnx"; + name = "killbots-17.12.1.tar.xz"; }; }; kimagemapeditor = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kimagemapeditor-17.12.1.tar.xz"; + sha256 = "0zhrfr17596swxp7g53y74kh3pndgpjk8lrxfhpvxn45628wzb62"; + name = "kimagemapeditor-17.12.1.tar.xz"; }; }; kimap = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kimap-17.12.1.tar.xz"; + sha256 = "1isga4zz98qcgfhvvjmkm0fv8fm27japzc69il814bypd49bkvmb"; + name = "kimap-17.12.1.tar.xz"; }; }; kio-extras = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kio-extras-17.12.1.tar.xz"; + sha256 = "0vqzvd9linv6y6pfqdi9az79d9294wadz96pr03zwhbak0z5bw65"; + name = "kio-extras-17.12.1.tar.xz"; }; }; kiriki = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kiriki-17.12.1.tar.xz"; + sha256 = "08xhsdxz0w0qw155zasyq49r1hfqqrbk916lxilmqgkxqww53wgw"; + name = "kiriki-17.12.1.tar.xz"; }; }; kiten = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kiten-17.12.1.tar.xz"; + sha256 = "1mrlj80m1g7r9wwmyrz7iq0lz5lmx56h8fzwcg4nkpim571cn6ch"; + name = "kiten-17.12.1.tar.xz"; }; }; kjumpingcube = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kjumpingcube-17.12.1.tar.xz"; + sha256 = "04bzxq4r7jr776g7hyf2wm08y7j9y5wy0c2war7mn2nc8an2rnna"; + name = "kjumpingcube-17.12.1.tar.xz"; }; }; kldap = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kldap-17.12.1.tar.xz"; + sha256 = "0gn84blvrfspvw4gaqisrsdxp2051j5xva00cw3lv9n0vyrq8vqf"; + name = "kldap-17.12.1.tar.xz"; }; }; kleopatra = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kleopatra-17.12.1.tar.xz"; + sha256 = "1rzil9m982iilwpz8qi6j8brrwvzcdrmzldrwaqdpa1v56sjq5f0"; + name = "kleopatra-17.12.1.tar.xz"; }; }; klettres = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/klettres-17.12.1.tar.xz"; + sha256 = "1ibrkwy9bb60cilmnv46zhw0zl4lv8sn9wddjg53havh38rwjgwc"; + name = "klettres-17.12.1.tar.xz"; }; }; klickety = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/klickety-17.12.1.tar.xz"; + sha256 = "09d8mkca0p5fp93i5w30zbvz746j7cvz11wrscjbg2n6vi36pcbd"; + name = "klickety-17.12.1.tar.xz"; }; }; klines = { - version = "17.08.3"; + version = "17.12.1"; 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"; - 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.1/src/klines-17.12.1.tar.xz"; + sha256 = "0b9srbianz3c5knbm9cwn9f5i88pg5v5gc1fnz1vgir2izlyx5pg"; + name = "klines-17.12.1.tar.xz"; }; }; kmag = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kmag-17.12.1.tar.xz"; + sha256 = "04z02kyaf5xfb8j4fxq1i5b08hvl2j9dbik2liiykzdhv5kn8di8"; + name = "kmag-17.12.1.tar.xz"; }; }; kmahjongg = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kmahjongg-17.12.1.tar.xz"; + sha256 = "1d46d8dpx969sih2dlc6qf3kiqj9ry7w8jgqczsjnm1irh6l7gqd"; + name = "kmahjongg-17.12.1.tar.xz"; }; }; kmail = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kmail-17.12.1.tar.xz"; + sha256 = "0dfzgf0mpjanq43fwlv4165ggxi1iqv8dfxpgdf8vg1l8ckb86p0"; + name = "kmail-17.12.1.tar.xz"; }; }; kmail-account-wizard = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kmail-account-wizard-17.12.1.tar.xz"; + sha256 = "0swilpfry4fqkjpd4hwqxycxy2655znphppp67h5fjrnjbvpkyfv"; + name = "kmail-account-wizard-17.12.1.tar.xz"; }; }; kmailtransport = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kmailtransport-17.12.1.tar.xz"; + sha256 = "1yxxj93lxfb068z5f5dhz85jy3f0a76zifvxgh8ph05n2kr23rq3"; + name = "kmailtransport-17.12.1.tar.xz"; }; }; kmbox = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kmbox-17.12.1.tar.xz"; + sha256 = "12ds7kzrjb885ip73drd9q40gb59d8yhr3y8pdkmz048z7495dh9"; + name = "kmbox-17.12.1.tar.xz"; }; }; kmime = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kmime-17.12.1.tar.xz"; + sha256 = "1659ri4fxmfnkfa6nqbhkvpj349ynhcl254hwp43pngf1zmk280x"; + name = "kmime-17.12.1.tar.xz"; }; }; kmines = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kmines-17.12.1.tar.xz"; + sha256 = "0dhwda6gkjix0lmb3wcz6ds8fglzw7i8wg85a2ij6amc6am9014j"; + name = "kmines-17.12.1.tar.xz"; }; }; kmix = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kmix-17.12.1.tar.xz"; + sha256 = "1xf46qjn6ax5w8z7l78wcw4k4j59c40vncmrpqdb62kmr4zi0m7q"; + name = "kmix-17.12.1.tar.xz"; }; }; kmousetool = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kmousetool-17.12.1.tar.xz"; + sha256 = "1qbxq4b892i4ssjbky0i5jk96q8zs4lr859y3190kz538g5jakh0"; + name = "kmousetool-17.12.1.tar.xz"; }; }; kmouth = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kmouth-17.12.1.tar.xz"; + sha256 = "1yn510zhcw9kw0qcy21k85ryhki56lvgzgzq2hjqbjq0ymzpmlmp"; + name = "kmouth-17.12.1.tar.xz"; }; }; kmplot = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kmplot-17.12.1.tar.xz"; + sha256 = "06ybsjl9m9awjb70inm7i2hg92p34gqmb4vc5sn8jm2ckm5qsgc6"; + name = "kmplot-17.12.1.tar.xz"; }; }; knavalbattle = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/knavalbattle-17.12.1.tar.xz"; + sha256 = "1yzf70lnjvyk63bv88ycjcwxnbwp0wh2lifqq7m34n3c51ifhd5g"; + name = "knavalbattle-17.12.1.tar.xz"; }; }; knetwalk = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/knetwalk-17.12.1.tar.xz"; + sha256 = "078gzqyq33val8kvsfw63r0jhnh8q2lwv7p11a8z2qy44cp0bg25"; + name = "knetwalk-17.12.1.tar.xz"; }; }; knotes = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/knotes-17.12.1.tar.xz"; + sha256 = "16bjbxc5l3nxcw6k7csq0phr2hamk4ps1b367s8j6x5w81y3gypw"; + name = "knotes-17.12.1.tar.xz"; }; }; kolf = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kolf-17.12.1.tar.xz"; + sha256 = "0sgn5702rf3kmflrb0dxlgvx0lb7ajfyq6izzqh147kkp9s8h44i"; + name = "kolf-17.12.1.tar.xz"; }; }; kollision = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kollision-17.12.1.tar.xz"; + sha256 = "08px3m7jl78cg4mbsfwp4xa0fm7kp0p12zb973iy2ipqnhp1wkqp"; + name = "kollision-17.12.1.tar.xz"; }; }; kolourpaint = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kolourpaint-17.12.1.tar.xz"; + sha256 = "1cdz7dhjmg757y70lzsxzsn1k2ih2q89vdcy8vgwggx9b47xgbar"; + name = "kolourpaint-17.12.1.tar.xz"; }; }; kompare = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kompare-17.12.1.tar.xz"; + sha256 = "09w9g20hkgnvdv7g27pmw3kb82f52ia30fbg9dswbv5snjr82db3"; + name = "kompare-17.12.1.tar.xz"; }; }; konqueror = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/konqueror-17.12.1.tar.xz"; + sha256 = "0nfsfzyzd27m9sxrs2yx2rywkj31ip0qkna5frflsh4fa13jbnjw"; + name = "konqueror-17.12.1.tar.xz"; }; }; konquest = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/konquest-17.12.1.tar.xz"; + sha256 = "1yph9hp40v1z9kfz7n72hi7y17fbrsgfn7jqdyk0dc7j3ldhji5y"; + name = "konquest-17.12.1.tar.xz"; }; }; konsole = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/konsole-17.12.1.tar.xz"; + sha256 = "0k8d5am4qb5p1w02fbn164ffwlg1mg5hjxh5848dvrip8gxhhq40"; + name = "konsole-17.12.1.tar.xz"; }; }; kontact = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kontact-17.12.1.tar.xz"; + sha256 = "1ml71112422sggpi7y3lyn0gs374k99hpy9g4991vsyx53z5yn53"; + name = "kontact-17.12.1.tar.xz"; }; }; kontactinterface = { - version = "17.08.3"; + version = "17.12.1"; 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"; - 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.1/src/kontactinterface-17.12.1.tar.xz"; + sha256 = "13a898b60mfbi6ara411ns0b7r57vfsq3wbdkq2c6fag5jsafaxl"; + name = "kontactinterface-17.12.1.tar.xz"; }; }; korganizer = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/korganizer-17.12.1.tar.xz"; + sha256 = "0qrqmiv86f17w8ycfxk8dj3r5ajzyp667kd8cq9yz9xzzf76xhlh"; + name = "korganizer-17.12.1.tar.xz"; }; }; kpat = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kpat-17.12.1.tar.xz"; + sha256 = "1f12jad1439zbrmya1hwbfsz6mxgjncchy94a1ynic5p8ixmja32"; + name = "kpat-17.12.1.tar.xz"; }; }; kpimtextedit = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kpimtextedit-17.12.1.tar.xz"; + sha256 = "08qcrd6ii0hp8afjwk2g64lvxyndy36lnzklc8hszls82h5qablp"; + name = "kpimtextedit-17.12.1.tar.xz"; }; }; kqtquickcharts = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kqtquickcharts-17.12.1.tar.xz"; + sha256 = "09ppnv95dxrl1wr4h9kmxjhrj8q3h40jjjz68k3d9nzhzb1lz7vi"; + name = "kqtquickcharts-17.12.1.tar.xz"; }; }; krdc = { - version = "17.08.3"; + version = "17.12.1"; 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"; - 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.1/src/krdc-17.12.1.tar.xz"; + sha256 = "1hs7f55s8r6f9h1f5g357zvdzn1dgw5y9pih9n3yxa2522bh0j7r"; + name = "krdc-17.12.1.tar.xz"; }; }; kreversi = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kreversi-17.12.1.tar.xz"; + sha256 = "0vgxwv0cpnpr4q2fdgc1nsrxrac59db558gwbw706a2yh3bn69dk"; + name = "kreversi-17.12.1.tar.xz"; }; }; krfb = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/krfb-17.12.1.tar.xz"; + sha256 = "101h35f8vk3fgbjpw3f32cs6nc184z43qd3q345cq564cmh6h7z3"; + name = "krfb-17.12.1.tar.xz"; }; }; kross-interpreters = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kross-interpreters-17.12.1.tar.xz"; + sha256 = "1n9y7ynnkg8h61kyv894bwja3i2z1a5h2542flriny9788xfwwp0"; + name = "kross-interpreters-17.12.1.tar.xz"; }; }; kruler = { - version = "17.08.3"; + version = "17.12.1"; 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"; - }; - }; - 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"; - 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.1/src/kruler-17.12.1.tar.xz"; + sha256 = "0yxyqrz901fimdqap20rdarikdlcd9rlxmsl7dbfgrgjygxdhwlf"; + name = "kruler-17.12.1.tar.xz"; }; }; kshisen = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kshisen-17.12.1.tar.xz"; + sha256 = "1sx1dcjg1pbww3xx3r8ackswp61nmlawi5nf38ppgnpmcgz3b7md"; + name = "kshisen-17.12.1.tar.xz"; }; }; ksirk = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/ksirk-17.12.1.tar.xz"; + sha256 = "112m9liq8xfjqnz0fbb7qpi54vys4mcp3i0zvph8i7aidqch6jbk"; + name = "ksirk-17.12.1.tar.xz"; + }; + }; + ksmtp = { + version = "17.12.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.12.1/src/ksmtp-17.12.1.tar.xz"; + sha256 = "11y0pwfy2pzjj678b53x222x0vzbxsng8j936s4afy1dbpx66ms2"; + name = "ksmtp-17.12.1.tar.xz"; }; }; ksnakeduel = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/ksnakeduel-17.12.1.tar.xz"; + sha256 = "1py4zcn311kh4kjzmwrviy91i9gj94fivdqyvfhzkbis59hwvnf4"; + name = "ksnakeduel-17.12.1.tar.xz"; }; }; kspaceduel = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kspaceduel-17.12.1.tar.xz"; + sha256 = "16flrinzg2pysgab2mygijc9pb96ps28pk4ybnxc5bswzhkbhqyz"; + name = "kspaceduel-17.12.1.tar.xz"; }; }; ksquares = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/ksquares-17.12.1.tar.xz"; + sha256 = "0ma162lsh0vgis1qgsbav6w3v628s29mj4hgs05hlhl576f7h1zw"; + name = "ksquares-17.12.1.tar.xz"; }; }; ksudoku = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/ksudoku-17.12.1.tar.xz"; + sha256 = "16d2r0vwy1yzwlkvwq98by35zpg6w35j2npfzacjzmy5xxq2k63m"; + name = "ksudoku-17.12.1.tar.xz"; }; }; ksystemlog = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/ksystemlog-17.12.1.tar.xz"; + sha256 = "03f0pjxc8zbkn47csm45dqswl9sc37cfyawlmnl7pwjbsqmimpi6"; + name = "ksystemlog-17.12.1.tar.xz"; }; }; kteatime = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kteatime-17.12.1.tar.xz"; + sha256 = "0zvr3qkasnf26m6x2lg0pa7m3f2va4favz2sdav0g2ix9jdglqz6"; + name = "kteatime-17.12.1.tar.xz"; }; }; ktimer = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/ktimer-17.12.1.tar.xz"; + sha256 = "00v8za6dhs7lb2aynlsrfjdq1zzbrxcxk7hr6x5vrxw7q6wp730c"; + name = "ktimer-17.12.1.tar.xz"; }; }; ktnef = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/ktnef-17.12.1.tar.xz"; + sha256 = "0b6axld4h9dr1a4cr650ibgm2avp1yynwvfyz1s8jaz58lpw8l1b"; + name = "ktnef-17.12.1.tar.xz"; }; }; ktouch = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/ktouch-17.12.1.tar.xz"; + sha256 = "006ng7ajz4x37k2zy2gk7i1wpw2f2yqwvx6lc7vny3s8hz61a8zr"; + name = "ktouch-17.12.1.tar.xz"; }; }; ktp-accounts-kcm = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/ktp-accounts-kcm-17.12.1.tar.xz"; + sha256 = "003v1228nk2x8h9r8698fij1q461ibs76ycybgk2611r547jqwxm"; + name = "ktp-accounts-kcm-17.12.1.tar.xz"; }; }; ktp-approver = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/ktp-approver-17.12.1.tar.xz"; + sha256 = "0f3cqq005c2363b23c393qcml84g3h23906rsnc6id0b2zcdfkp3"; + name = "ktp-approver-17.12.1.tar.xz"; }; }; ktp-auth-handler = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/ktp-auth-handler-17.12.1.tar.xz"; + sha256 = "0z6c1p7v8zkj54knpxvcnk1xk88ncm751nd6j2lrzg3fxnk4kdyj"; + name = "ktp-auth-handler-17.12.1.tar.xz"; }; }; ktp-call-ui = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/ktp-call-ui-17.12.1.tar.xz"; + sha256 = "07x0n8b21sfrc01rvya51rg0shvbi265i2pzc0c3kv0d6di74bs1"; + name = "ktp-call-ui-17.12.1.tar.xz"; }; }; ktp-common-internals = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/ktp-common-internals-17.12.1.tar.xz"; + sha256 = "0h6vd98168rs1rcxpj43c7i57yd4lch95qxihy32l8nbyjxn0cc2"; + name = "ktp-common-internals-17.12.1.tar.xz"; }; }; ktp-contact-list = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/ktp-contact-list-17.12.1.tar.xz"; + sha256 = "1b8x9mxd00f9zvlni95q6arvv912srsshgdfrig6jl8l94aknhfz"; + name = "ktp-contact-list-17.12.1.tar.xz"; }; }; ktp-contact-runner = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/ktp-contact-runner-17.12.1.tar.xz"; + sha256 = "03bxpcgxazp4g44iidbc2y8a4i147bxvm9hqkglv5bdy86lvg0y3"; + name = "ktp-contact-runner-17.12.1.tar.xz"; }; }; ktp-desktop-applets = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/ktp-desktop-applets-17.12.1.tar.xz"; + sha256 = "1qb54wpyh5pz4d0nan02gkf2n16cvq2cfj61vpi2xml6cb1yqypf"; + name = "ktp-desktop-applets-17.12.1.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/ktp-filetransfer-handler-17.12.1.tar.xz"; + sha256 = "1976sjks028faahm6gha2kd0if0czbiyplj2vq9x1jnwh9fcbvcx"; + name = "ktp-filetransfer-handler-17.12.1.tar.xz"; }; }; ktp-kded-module = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/ktp-kded-module-17.12.1.tar.xz"; + sha256 = "1l8jkixyc41irmf8ak358nfkn6m7nab5a2hxzfhgzi4grr2cassc"; + name = "ktp-kded-module-17.12.1.tar.xz"; }; }; ktp-send-file = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/ktp-send-file-17.12.1.tar.xz"; + sha256 = "0fhqf15dl0rq1dlgb42na64dj5sr53hqdgk4fghjpma4lvr8qd4p"; + name = "ktp-send-file-17.12.1.tar.xz"; }; }; ktp-text-ui = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/ktp-text-ui-17.12.1.tar.xz"; + sha256 = "0zjvxncvr1cbis2amd0s5x3kxgd2dw4mcjbfnqgf30mjbg13bn5m"; + name = "ktp-text-ui-17.12.1.tar.xz"; }; }; ktuberling = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/ktuberling-17.12.1.tar.xz"; + sha256 = "0b1wfmkd8lxh0cdalcniwz53wkv3iqlgfcb5wkp40xk4yzgm1i2g"; + name = "ktuberling-17.12.1.tar.xz"; }; }; kturtle = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kturtle-17.12.1.tar.xz"; + sha256 = "1f1gij16s5501p41h6m9z5qf8ldix4avw7cgxcib0s273fds8wxl"; + name = "kturtle-17.12.1.tar.xz"; }; }; kubrick = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kubrick-17.12.1.tar.xz"; + sha256 = "15vy1srmfsbxcjrm2jp0yqqn0x984jlblapma6jvgpcygxf2cxjg"; + name = "kubrick-17.12.1.tar.xz"; }; }; kwalletmanager = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kwalletmanager-17.12.1.tar.xz"; + sha256 = "00x122kr7vbf6wans95spq0qxlavnjnp25h1pqzxg4y4sqdgy88p"; + name = "kwalletmanager-17.12.1.tar.xz"; }; }; kwave = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kwave-17.12.1.tar.xz"; + sha256 = "0ry9hgmkhs6sx9plqzyds5qn0b7qvq9g2hhxrycahsaj2q9kwk8a"; + name = "kwave-17.12.1.tar.xz"; }; }; kwordquiz = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/kwordquiz-17.12.1.tar.xz"; + sha256 = "1a427jy3vyqc3jadrlwfvq8gh8zx6mfwrnwwaf4skixlwgnpwcp4"; + name = "kwordquiz-17.12.1.tar.xz"; }; }; libgravatar = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/libgravatar-17.12.1.tar.xz"; + sha256 = "0v0xnmfv272hppv7ccdj3ccq6g344v1n883pcp0fbsppkhrfwbwq"; + name = "libgravatar-17.12.1.tar.xz"; }; }; libkcddb = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/libkcddb-17.12.1.tar.xz"; + sha256 = "03iz1cf69pzk0vfgjkdfwlp3iq2zj3ybzqp8mds9m7725qad35bq"; + name = "libkcddb-17.12.1.tar.xz"; }; }; libkcompactdisc = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/libkcompactdisc-17.12.1.tar.xz"; + sha256 = "19ifymhr3wbf3bcsdhdbjqwnnbqrdhkxc6bq35av2n40b7395avc"; + name = "libkcompactdisc-17.12.1.tar.xz"; }; }; libkdcraw = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/libkdcraw-17.12.1.tar.xz"; + sha256 = "05ji1s7p5sdcvrzmivp7dw98kxl6zm8vsfb6wc41x1syp18xvbxj"; + name = "libkdcraw-17.12.1.tar.xz"; }; }; libkdegames = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/libkdegames-17.12.1.tar.xz"; + sha256 = "0sqiq3xsfigd77czw3mrgrdn4bhz6f08ibv0yy4vfvgzx5ldysbp"; + name = "libkdegames-17.12.1.tar.xz"; }; }; libkdepim = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/libkdepim-17.12.1.tar.xz"; + sha256 = "1h6gcn1lsk9zd2q4m4w4gwgx2nawf7iqzxq4liyrx9s0j980v9vy"; + name = "libkdepim-17.12.1.tar.xz"; }; }; libkeduvocdocument = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/libkeduvocdocument-17.12.1.tar.xz"; + sha256 = "0qfhfhy18w5fa8989hjqrk9910sb3j99xpp55zkwvfssxjnrwwxj"; + name = "libkeduvocdocument-17.12.1.tar.xz"; }; }; libkexiv2 = { - version = "17.08.3"; + version = "17.12.1"; 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"; - 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.1/src/libkexiv2-17.12.1.tar.xz"; + sha256 = "18has05apcfw2qvyzkk4ywi0vbx46k0abvk6ai2rpag9kqw877i9"; + name = "libkexiv2-17.12.1.tar.xz"; }; }; libkgapi = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/libkgapi-17.12.1.tar.xz"; + sha256 = "177m12jfswilb1qfi7zyhymscxrz52wplm8nzlrmwv7pr3brnmnl"; + name = "libkgapi-17.12.1.tar.xz"; }; }; libkgeomap = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/libkgeomap-17.12.1.tar.xz"; + sha256 = "0zixbp0vkmf8nrlzhwkbsgn0bxpwx6xcgslhjrl5q8w1bvp2hfjp"; + name = "libkgeomap-17.12.1.tar.xz"; }; }; libkipi = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/libkipi-17.12.1.tar.xz"; + sha256 = "11438klx8lj16py2vvyahs1pf0as0dx1523bsrxy8hmyx5gsivas"; + name = "libkipi-17.12.1.tar.xz"; }; }; libkleo = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/libkleo-17.12.1.tar.xz"; + sha256 = "1mbiljd4xpzlmf7xmf21pr2ka0cz5sg4f38z0m9if61903ag2bcc"; + name = "libkleo-17.12.1.tar.xz"; }; }; libkmahjongg = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/libkmahjongg-17.12.1.tar.xz"; + sha256 = "1x8zbldp66my0pn4p44pg2wxybh7hq221bda91p2andaqa72nswq"; + name = "libkmahjongg-17.12.1.tar.xz"; }; }; libkomparediff2 = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/libkomparediff2-17.12.1.tar.xz"; + sha256 = "0jd700pjw51vyan5d22k6j60jgb95pfn2nvwz2nfs2f4xlsly1hz"; + name = "libkomparediff2-17.12.1.tar.xz"; }; }; libksane = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/libksane-17.12.1.tar.xz"; + sha256 = "1jglv4b5zqgs3qysadcrizfwlzwv39w369hhj4180xjjc07kxjw0"; + name = "libksane-17.12.1.tar.xz"; }; }; libksieve = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/libksieve-17.12.1.tar.xz"; + sha256 = "1w3cqhig1nwy5q98503f0s6i0vibsrq35js8y9vqqa22hyksy8xb"; + name = "libksieve-17.12.1.tar.xz"; }; }; lokalize = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/lokalize-17.12.1.tar.xz"; + sha256 = "0ygsz8mbind93sc148rd3asdpzlki1ps7xkc6y2zgf069ikrp504"; + name = "lokalize-17.12.1.tar.xz"; }; }; lskat = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/lskat-17.12.1.tar.xz"; + sha256 = "036lhwx0d49cb2ml514rawbcngrrxhly4cjrrhf21yw8apxfwa92"; + name = "lskat-17.12.1.tar.xz"; }; }; mailcommon = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/mailcommon-17.12.1.tar.xz"; + sha256 = "0m9ng8mj0hwj5zg9da5cqy8paa80q2v92qn6a6b1wm34ylbdfhsm"; + name = "mailcommon-17.12.1.tar.xz"; }; }; mailimporter = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/mailimporter-17.12.1.tar.xz"; + sha256 = "1rd55alsa502v1vrp2fbmfxyf29h248n78d9wcw93grwg50sabdn"; + name = "mailimporter-17.12.1.tar.xz"; }; }; marble = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/marble-17.12.1.tar.xz"; + sha256 = "0g4vr27ggc3xdr274apcmv8ys9584lzxxc78ssr16snb1rkrb9my"; + name = "marble-17.12.1.tar.xz"; }; }; mbox-importer = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/mbox-importer-17.12.1.tar.xz"; + sha256 = "1vm0f2yb5adrnsdl6dy34bb7zggrh6xd89n0cvz1grq5fsrb3ilk"; + name = "mbox-importer-17.12.1.tar.xz"; }; }; messagelib = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/messagelib-17.12.1.tar.xz"; + sha256 = "1nc6vh68fy26kcisqbr4lvhwxx3dzmjdawgzhy7jnbhdx36siw3b"; + name = "messagelib-17.12.1.tar.xz"; }; }; minuet = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/minuet-17.12.1.tar.xz"; + sha256 = "1y7l1qh3vwhhkv9mp165kyhf3ps4xzclnmbml3kpczhgxs0hzw47"; + name = "minuet-17.12.1.tar.xz"; }; }; okteta = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/okteta-17.12.1.tar.xz"; + sha256 = "1ryaqbccqlir910v628wcv7gwp85w82d6f1lwwg92dh55zmlx6a4"; + name = "okteta-17.12.1.tar.xz"; }; }; okular = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/okular-17.12.1.tar.xz"; + sha256 = "0rai5m7alks6lri2fwg07s842azd6q9xizwsk0ib4pnw07hj2fqj"; + name = "okular-17.12.1.tar.xz"; }; }; palapeli = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/palapeli-17.12.1.tar.xz"; + sha256 = "0xbcfsrzlj41wr2fx0awgmvdxdd6y890sigf42nzi8mizvd70b5v"; + name = "palapeli-17.12.1.tar.xz"; }; }; parley = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/parley-17.12.1.tar.xz"; + sha256 = "199qkhsrgcviyi3hfaazr8acd1xji1rraqvwlrb8b1bsrdnknbfs"; + name = "parley-17.12.1.tar.xz"; }; }; picmi = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/picmi-17.12.1.tar.xz"; + sha256 = "024bia05vczjaz2df0lg4jqkjn8l7x36cjr6jkr0c77p37vm3w6k"; + name = "picmi-17.12.1.tar.xz"; }; }; pimcommon = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/pimcommon-17.12.1.tar.xz"; + sha256 = "0wmlzx43730zgdvgnw1ljplspbg19r5i88s0nvz53s0fa70nbga2"; + name = "pimcommon-17.12.1.tar.xz"; }; }; pim-data-exporter = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/pim-data-exporter-17.12.1.tar.xz"; + sha256 = "0ryw03lb5lhj5k6g7rqnmmqfgrd6004im7p3wwf9v3ynmjbkx0v7"; + name = "pim-data-exporter-17.12.1.tar.xz"; }; }; pim-sieve-editor = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/pim-sieve-editor-17.12.1.tar.xz"; + sha256 = "1adz9whyvqz0fw2ggkr7g8xd67m779vyymqbyx3h05kwmdy6kims"; + name = "pim-sieve-editor-17.12.1.tar.xz"; }; }; poxml = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/poxml-17.12.1.tar.xz"; + sha256 = "1ynycpwvsx2514rar3ycvmyv6fj2ac1adxx2gcip9vkb4chija6b"; + name = "poxml-17.12.1.tar.xz"; }; }; print-manager = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/print-manager-17.12.1.tar.xz"; + sha256 = "024hzc2ja1cb6wvag0w040q3ifrpzlb6s23d75hvkpyqqgi1qq5d"; + name = "print-manager-17.12.1.tar.xz"; }; }; rocs = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/rocs-17.12.1.tar.xz"; + sha256 = "04v3khfyz7gg7krn3v3j5885ivmf0avmgl5xwyqh8vy7zwxajvq7"; + name = "rocs-17.12.1.tar.xz"; }; }; signon-kwallet-extension = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/signon-kwallet-extension-17.12.1.tar.xz"; + sha256 = "05w8hpxc2fmm5w1fj8df8dqj8hag62f154mpyiq5zy04a0j69mbl"; + name = "signon-kwallet-extension-17.12.1.tar.xz"; }; }; spectacle = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/spectacle-17.12.1.tar.xz"; + sha256 = "0zl2wr9n5lb6ry5xp33wv73r5xkadm4zm1bnric85q383qzwzhvd"; + name = "spectacle-17.12.1.tar.xz"; }; }; step = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/step-17.12.1.tar.xz"; + sha256 = "027czrw3dkvcbw74jrh8qwi577zxb7hzbzmnpd7b01qal486qj0f"; + name = "step-17.12.1.tar.xz"; }; }; svgpart = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/svgpart-17.12.1.tar.xz"; + sha256 = "13g89s83y7wwwkx06zxcghcv9rdpziyq5f2lc81y583qsqg6j6lh"; + name = "svgpart-17.12.1.tar.xz"; }; }; sweeper = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/sweeper-17.12.1.tar.xz"; + sha256 = "0rhn2ia3sxjlig9vp15jdvi7ij5xgyn4bz8cbh5g93an79z4mi59"; + name = "sweeper-17.12.1.tar.xz"; }; }; syndication = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/syndication-17.12.1.tar.xz"; + sha256 = "1y8nsrbdc69cyh0rhjfvi99qx2fgvpvfsixpqjsyis1xhkxc3901"; + name = "syndication-17.12.1.tar.xz"; }; }; umbrello = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/umbrello-17.12.1.tar.xz"; + sha256 = "13krbjzg840rhr74zwday4p5min0zwrpxri6k1sdz7mhqm4lbj19"; + name = "umbrello-17.12.1.tar.xz"; }; }; zeroconf-ioslave = { - version = "17.08.3"; + version = "17.12.1"; 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.1/src/zeroconf-ioslave-17.12.1.tar.xz"; + sha256 = "10n0zyr2by91d0985r8cq6d8p0h3pxxq3kckrz2pmafr0q7l1zqx"; + name = "zeroconf-ioslave-17.12.1.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/airspy/default.nix b/pkgs/applications/misc/airspy/default.nix index 211e8fd0541..9b6771a3925 100644 --- a/pkgs/applications/misc/airspy/default.nix +++ b/pkgs/applications/misc/airspy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ stdenv, lib, fetchFromGitHub , cmake , pkgconfig, libusb }: @@ -22,13 +22,14 @@ in nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ libusb ]; - cmakeFlags = [ "-DINSTALL_UDEV_RULES=ON" ]; + cmakeFlags = + lib.optionals stdenv.isLinux [ "-DINSTALL_UDEV_RULES=ON" ]; meta = with stdenv.lib; { - homepage = http://github.com/airspy/airspyone_host; + homepage = https://github.com/airspy/airspyone_host; description = "Host tools and driver library for the AirSpy SDR"; license = licenses.free; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ markuskowa ]; }; } diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index bb934ff4812..7bfcc6e72c8 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -12,6 +12,7 @@ libXcursor, libXxf86vm, libXi, + libXrandr, xclip }: with rustPlatform; @@ -24,22 +25,23 @@ let libX11 libXcursor libXxf86vm + libXrandr libXi ]; in buildRustPackage rec { name = "alacritty-unstable-${version}"; - version = "2017-11-12"; + version = "2017-12-29"; # 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 = "0pk4b8kfxixmd9985v2fya1m7np8ggws8d9msw210drc0grwbfkd"; fetchSubmodules = true; }; - cargoSha256 = "10blch8pzk1zk3w27sbcszhcnq908xh1q55vqgy8iv5x47rpl02q"; + cargoSha256 = "0acj526cx4xl52vbcbd3hp1klh4p756j6alxqqz3x715zi2dqkzf"; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/applications/misc/calcurse/default.nix index 3f22d1629e2..d4b07cb91dc 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 ]; + }; + propogatedBuildInputs = [ 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 b406f38613d..186cdc6c62e 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.12.0"; + version = "3.15.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "0l7r5ny9a36yg22fqzz3as6wh1xqpa3hrlx2gy25yp649sbkd9vq"; + sha256 = "1zvk499g3ddl82f6655ddqzl7r62hj1fq3qjsxpn07an2lizail7"; }; patches = [ diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix index 985a418e158..f4ad3a1c538 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/cura/default.nix b/pkgs/applications/misc/cura/default.nix index 1012f187497..b9a160564a5 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.1.0"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "Cura"; rev = version; - sha256 = "0ks8bb3mif6kyvb01ddhpn1c2l31s8fxivi70kmpm743sqv4kjaa"; + sha256 = "1x732bzxdxnz1av8jlv5kzs08jpmsg6bz9i88jr63kw32d901xsm"; }; buildInputs = [ qtbase qtquickcontrols ]; diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix new file mode 100644 index 00000000000..caf40ef5faf --- /dev/null +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -0,0 +1,70 @@ +{ stdenv, fetchurl, makeDesktopItem, makeWrapper +, fontconfig, freetype, glib, gtk2 +, jdk, libX11, libXrender, libXtst, zlib }: + +# The build process is almost like eclipse's. +# See `pkgs/applications/editors/eclipse/*.nix` + +stdenv.mkDerivation rec { + name = "dbeaver-ce-${version}"; + version = "4.3.3"; + + desktopItem = makeDesktopItem { + name = "dbeaver"; + exec = "dbeaver"; + icon = "dbeaver"; + desktopName = "dbeaver"; + comment = "SQL Integrated Development Environment"; + genericName = "SQL Integrated Development Environment"; + categories = "Application;Development;"; + }; + + buildInputs = [ + fontconfig freetype glib gtk2 + jdk libX11 libXrender libXtst zlib + ]; + + nativeBuildInputs = [ + makeWrapper + ]; + + src = fetchurl { + url = "https://dbeaver.jkiss.org/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; + sha256 = "063h2za2m33b4k9s756lwicxwszzsqr2sqr2gi4ai05dqkgkw951"; + }; + + installPhase = '' + mkdir -p $out/ + cp -r . $out/dbeaver + + # Patch binaries. + interpreter=$(cat $NIX_CC/nix-support/dynamic-linker) + patchelf --set-interpreter $interpreter $out/dbeaver/dbeaver + + makeWrapper $out/dbeaver/dbeaver $out/bin/dbeaver \ + --prefix PATH : ${jdk}/bin \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk2 libXtst ])} \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + + # Create desktop item. + mkdir -p $out/share/applications + cp ${desktopItem}/share/applications/* $out/share/applications + + mkdir -p $out/share/pixmaps + ln -s $out/dbeaver/icon.xpm $out/share/pixmaps/dbeaver.xpm + ''; + + meta = with stdenv.lib; { + homepage = https://dbeaver.jkiss.org; + description = "Universal SQL Client for developers, DBA and analysts. Supports MySQL, PostgreSQL, MariaDB, SQLite, and more"; + longDescription = '' + Free multi-platform database tool for developers, SQL programmers, database + administrators and analysts. Supports all popular databases: MySQL, + PostgreSQL, MariaDB, SQLite, Oracle, DB2, SQL Server, Sybase, MS Access, + Teradata, Firebird, Derby, etc. + ''; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = [ maintainers.samueldr ]; + }; +} diff --git a/pkgs/applications/misc/deepin-terminal/default.nix b/pkgs/applications/misc/deepin-terminal/default.nix index e08a2827b83..12ceb0958f0 100644 --- a/pkgs/applications/misc/deepin-terminal/default.nix +++ b/pkgs/applications/misc/deepin-terminal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, json_glib }: +{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, json_glib, gobjectIntrospection }: stdenv.mkDerivation rec { name = "deepin-terminal-${version}"; @@ -25,7 +25,11 @@ stdenv.mkDerivation rec { substituteInPlace ssh_login.sh --replace /usr/lib/deepin-terminal/zssh "${zssh}/bin/zssh" ''; - nativeBuildInputs = [ pkgconfig vala cmake gettext ]; + nativeBuildInputs = [ + pkgconfig vala cmake gettext + # For setup hook + gobjectIntrospection + ]; buildInputs = [ gtk3 vte libgee wnck librsvg libsecret json_glib ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 919ad10fa70..9906b1fd858 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 7ba665f339c..21af05133bf 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -7,14 +7,14 @@ let in python3Packages.buildPythonApplication rec { - version = "3.0"; + version = "3.1.2"; name = "electron-cash-${version}"; src = fetchurl { 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 = "f0e2bf5c6d29da714eddd50b45761fea9fc905a0172c7b92df8fca7427439f1a"; + sha256 = "18h44jfbc2ksj34hdzgszvvq82xi28schl3wp3lkq9fjp7ny0mf3"; }; propagatedBuildInputs = with python3Packages; [ @@ -36,6 +36,11 @@ python3Packages.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 pyrcc5 icons.qrc -o gui/qt/icons_rc.py @@ -69,6 +74,7 @@ python3Packages.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-ltc/default.nix b/pkgs/applications/misc/electrum-ltc/default.nix index 58844500195..10b2aacbf8c 100644 --- a/pkgs/applications/misc/electrum-ltc/default.nix +++ b/pkgs/applications/misc/electrum-ltc/default.nix @@ -1,33 +1,34 @@ { stdenv , fetchurl -, python2Packages +, python3Packages }: -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { name = "electrum-ltc-${version}"; - version = "2.6.4.2"; + version = "3.0.5.1"; src = fetchurl { url = "https://electrum-ltc.org/download/Electrum-LTC-${version}.tar.gz"; - sha256 = "0sqcyk6n6kgaiinnwh6mzbbn4whk3ga59r5bw5rqmnnfqk1xdnb4"; + sha256 = "1acsgzmd83cz6ha5fw63mi7123fr6gbiq537p5lxxfs2i8zrl63r"; }; - propagatedBuildInputs = with python2Packages; [ - pyqt4 - slowaes + propagatedBuildInputs = with python3Packages; [ + pyaes ecdsa pbkdf2 requests qrcode - ltc_scrypt + py_scrypt + pyqt5 protobuf dnspython - jsonrpclib + jsonrpclib-pelix + pysocks ]; 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 ''; @@ -47,7 +48,7 @@ python2Packages.buildPythonApplication rec { ''; homepage = https://electrum-ltc.org/; license = licenses.mit; - platforms = platforms.all; + platforms = platforms.linux; maintainers = with maintainers; [ asymmetric ]; }; } diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index a339770ba58..caa050581bf 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, python3, python3Packages }: +{ stdenv, fetchurl, python3, python3Packages, zbar }: python3Packages.buildPythonApplication rec { name = "electrum-${version}"; - version = "3.0.3"; + version = "3.0.5"; src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "09h3s1mbkliwh8758prbdk3sm19bnma7wy3k10pl9q9fkarbhp75"; + sha256 = "06z0a5p1jg93jialphslip8d72q9yg3651qqaf494gs3h9kw1sv1"; }; propagatedBuildInputs = with python3Packages; [ @@ -38,6 +38,7 @@ python3Packages.buildPythonApplication rec { 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 = '' diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index 6d67d3a340f..8c63c856578 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, +{ stdenv, fetchFromGitHub, automake, autoconf, libtool, pkgconfig, file, intltool, libxml2, json_glib , sqlite, itstool, - librsvg, vala_0_34, gnome3, wrapGAppsHook + librsvg, vala_0_34, gnome3, wrapGAppsHook, gobjectIntrospection }: stdenv.mkDerivation rec { @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - makeWrapper pkgconfig automake autoconf libtool file @@ -23,6 +22,8 @@ stdenv.mkDerivation rec { vala_0_34 gnome3.yelp_tools wrapGAppsHook + # For setup hook + gobjectIntrospection ]; buildInputs = [ diff --git a/pkgs/applications/misc/ganttproject-bin/default.nix b/pkgs/applications/misc/ganttproject-bin/default.nix index 1b29def11ad..2257b2a98fb 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/girara/default.nix b/pkgs/applications/misc/girara/default.nix index b6bb3c2fd83..7fd3db860df 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -6,11 +6,11 @@ assert withBuildColors -> ncurses != null; stdenv.mkDerivation rec { name = "girara-${version}"; - version = "0.2.7"; + version = "0.2.8"; src = fetchurl { url = "http://pwmt.org/projects/girara/download/${name}.tar.gz"; - sha256 = "1r9jbhf9n40zj4ddqv1q5spijpjm683nxg4hr5lnir4a551s7rlq"; + sha256 = "18wss3sak3djip090v2vdbvq1mvkwcspfswc87zbvv3magihan98"; }; preConfigure = '' diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix index 470e046e85e..58d8e9fae61 100644 --- a/pkgs/applications/misc/gnuradio/default.nix +++ b/pkgs/applications/misc/gnuradio/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { addGRCBlocksPath() { addToSearchPath GRC_BLOCKS_PATH $1/share/gnuradio/grc/blocks } - envHooks+=(addGRCBlocksPath) + addEnvHooks "$targetOffset" addGRCBlocksPath ''; setupHook = [ grcSetupHook ]; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 00735624ad9..d87ac459d02 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 27bda1e2092..f6d9f4edb62 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.10"; src = fetchFromGitHub { owner = "csete"; repo = "gqrx"; rev = "v${version}"; - sha256 = "0niy4c05886mhbfmix93j2bnj4kzdh9bvrmymawl6z28glyz5d3c"; + sha256 = "1qc944sn1kjdnhdhcsdc39764vqcryk86808xxl49vy8sznqr0mf"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index dc771fc2d5e..c82e5026ff1 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,6 +20,12 @@ pythonPackages.buildPythonApplication rec { six ]; + 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"; diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index 6c3f317707d..bd4a891a329 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.15-590e8bc"; + version = "1.3.0-9b2ba62"; 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,14 +19,14 @@ stdenv.mkDerivation { src = fetchurl { url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/${version}/Hubstaff-${version}.sh"; - sha256 = "142q8xvwn5gdmpv5x25py2lindr74jqncf8vvw22yb9nj5aqqsi6"; + sha256 = "1dxzyl3yxbfmbw1pv8k3vhqzbmyyf16zkgrhzsbm866nmbgnqk1s"; }; 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) dd bs=$dataZipOffset skip=1 if=$curSrc of=data.zip 2>/dev/null @@ -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 0dfc725b9ea..86b806a916c 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "hugo-${version}"; - version = "0.29"; + version = "0.32.2"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "gohugoio"; repo = "hugo"; rev = "v${version}"; - sha256 = "1vklws05534ig9rj55cqnxpqfsvns64kfdg6zjyrcpz7l0z07a33"; + sha256 = "0k62sg9rvr4aqzh1r60m456cw8mj6kxjpri2nnj4c2dxmvll8qhr"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix index 35faf6b5704..6c870833d1a 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 = "c9f612c1940a4951cd2b55811744632a7b3b3bb2"; + sha256 = "0s1mzb175s96adxfx5vhyazpzfq9j4dzx4sr4n8gj7r8afkqys8h"; }; } { @@ -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 = "8d868be6e9bf9d5350910bab97a050e49887600f"; + sha256 = "0vy096wzkq1z59in1if486k0adaj1idvma0ax9z1igh9qpq53vd9"; }; } { @@ -80,13 +81,22 @@ sha256 = "09sdijfx5d05z4cd5k6lhl7k3kbpdf2amzlngv15h5v0fff9qw4s"; }; } + { + goPackagePath = "github.com/disintegration/imaging"; + fetch = { + type = "git"; + url = "https://github.com/disintegration/imaging"; + rev = "1884593a19ddc6f2ea050403430d02c1d0fc1283"; + sha256 = "13wlkidihz7gc36hd1vy7i81d0v1rbnw97118z3slq1kv1j56zll"; + }; + } { goPackagePath = "github.com/dlclark/regexp2"; fetch = { type = "git"; url = "https://github.com/dlclark/regexp2"; - rev = "487489b64fb796de2e55f4e8a4ad1e145f80e957"; - sha256 = "144s81ndviwhyy20ipxvvfvap8phv5p762glxrz6aqxprkxfarj5"; + rev = "7632a260cbaf5e7594fc1544a503456ecd0827f1"; + sha256 = "0vhp5r0ywv9p1c74fm8xzclnwx2mg9f0764b3id7a9nwh0plisx2"; }; } { @@ -94,17 +104,8 @@ fetch = { type = "git"; url = "https://github.com/eknkc/amber"; - rev = "b8bd8b03e4f747e33f092617225e9fa8076c0448"; - sha256 = "0qp5y9zhr6hi9ck33p7cnwla7d7p8vi4hj9llhg3bn1a69g21y0a"; - }; - } - { - goPackagePath = "github.com/fortytw2/leaktest"; - fetch = { - type = "git"; - url = "https://github.com/fortytw2/leaktest"; - rev = "3b724c3d7b8729a35bf4e577f71653aec6e53513"; - sha256 = "0dmf7dp6b86nbfaq0s1mpjzd8q7jwrxvyxc0r6dhx3qx4dhddwpz"; + rev = "cdade1c073850f4ffc70a829e31235ea6892853b"; + sha256 = "152w97yckwncgw7lwjvgd8d00wy6y0nxzlvx72kl7nqqxs9vhxd9"; }; } { @@ -121,8 +122,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/websocket"; - rev = "a69d9f6de432e2c6b296a947d8a5ee88f68522cf"; - sha256 = "01y3ni7xzazsdzq2xqyjr69q9m4w1668zkrcbf58yp3q99jvckhi"; + rev = "d965e9adc66deebadcc7d0c6c7598e2a4baa7838"; + sha256 = "0ka8pvby06farlji7pixlrk3zb962qp5xarvy2vxnfrdzlarv7xb"; }; } { @@ -148,17 +149,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,8 +158,8 @@ fetch = { type = "git"; url = "https://github.com/jdkato/prose"; - rev = "c24611cae00c16858e611ef77226dd2f7502759f"; - sha256 = "0xdrjwbcnwiwbqyrxfknb9bskrsrbnqp0nza44bycwaj23by9bs1"; + rev = "e27abfd3f31b84c37bbce37179b0428fcb1384be"; + sha256 = "04rjqh3jdxaqr9czp4vcj14hqfv7yppv4nb7ynb04c9jcq23ajw7"; }; } { @@ -184,8 +176,8 @@ fetch = { type = "git"; url = "https://github.com/kyokomi/emoji"; - rev = "ddd4753eac3f6480ca86b16cc6c98d26a0935d17"; - sha256 = "16vnpj8zxg3gg9ljwmvrlmdf4dqbxjagi8mldpq1cr481r35dsqh"; + rev = "2e9a9507333f3ee28f3fab88c2c3aba34455d734"; + sha256 = "005rxyxlqcd2sfjn686xb52l11wn2w0g5jv042ka6pnsx24r812a"; }; } { @@ -193,8 +185,8 @@ fetch = { type = "git"; url = "https://github.com/magiconair/properties"; - rev = "be5ece7dd465ab0765a9682137865547526d1dfb"; - sha256 = "0spk58x9b0hj29cw6wy6rlvc6s9xk4r0gmlxgsc194pkzqcg1my8"; + rev = "49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934"; + sha256 = "0cnvcd4q88nvxk3q9617dcis2kng2xxsx3iivi5xs8azk290lpyy"; }; } { @@ -202,8 +194,17 @@ fetch = { type = "git"; url = "https://github.com/markbates/inflect"; - rev = "6cacb66d100482ef7cc366289ccb156020e57e76"; - sha256 = "1cglvw75qagnz6bnaxpkfyq9j4j0vw377a8ywa9i1vskxlssj1b2"; + rev = "a12c3aec81a6a938bf584a4bac567afed9256586"; + sha256 = "0mawr6z9nav4f5j0nmjdxg9lbfhr7wz8zi34g7b6wndmzyf8jbsd"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "97311d9f7767e3d6f422ea06661bc2c7a19e8a5d"; + sha256 = "0dxlrzn570xl7gb11hjy1v4p3gw3r41yvqhrffgw95ha3q9p50cg"; }; } { @@ -211,8 +212,8 @@ fetch = { type = "git"; url = "https://github.com/miekg/mmark"; - rev = "fd2f6c1403b37925bd7fe13af05853b8ae58ee5f"; - sha256 = "0q2zrwa2vwk7a0zhmi000zpqrc01zssrj9c5n3573rg68fksg77m"; + rev = "057eb9e3ae87944c038036d046101dec0c56e21f"; + sha256 = "0hlqcwx6qqgy3vs13r10wn0d9x0xmww1v9jm09y2dp1ykgbampnk"; }; } { @@ -220,8 +221,8 @@ fetch = { type = "git"; url = "https://github.com/mitchellh/mapstructure"; - rev = "d0303fe809921458f417bcf828397a65db30a7e4"; - sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8"; + rev = "06020f85339e21b2478f756a78e295255ffa4d6a"; + sha256 = "12zb5jh7ri4vna3f24y9g10nzrnz9wbvwnk29wjk3vg0ljia64s9"; }; } { @@ -229,8 +230,17 @@ fetch = { type = "git"; url = "https://github.com/nicksnyder/go-i18n"; - rev = "3e70a1a463008cea6726380c908b1a6a8bdf7b24"; - sha256 = "0fxjgmwn9927wckl2xx8byv64cxgc0yxdwpfzval5n3wm5l5ij1i"; + rev = "aa0ce51472e0a9982717fd19cf02cb08b1e433aa"; + sha256 = "0355fxpd69wnw56m6dak8k7rlw3q36bql8algg3jkjnxjpgfii4p"; + }; + } + { + goPackagePath = "github.com/olekukonko/tablewriter"; + fetch = { + type = "git"; + url = "https://github.com/olekukonko/tablewriter"; + rev = "65fec0d89a572b4367094e2058d3ebe667de3b60"; + sha256 = "116waspmr33dqq3zxj2msnqp2f5v2b6ihk3rxqj7gz25rmcxh5wp"; }; } { @@ -238,8 +248,8 @@ fetch = { type = "git"; url = "https://github.com/pelletier/go-toml"; - rev = "69d355db5304c0f7f809a2edc054553e7142f016"; - sha256 = "1ay861x1bqcs629rqb3nq4f347y80phmgm8w7w8kjfdlgpy1v9dm"; + rev = "0131db6d737cfbbfb678f8b7d92e55e27ce46224"; + sha256 = "10sz1bh45346wdv8i3nffdmpfh8fb6xd0b3r474cs2mk961pw73v"; }; } { @@ -247,8 +257,8 @@ fetch = { type = "git"; url = "https://github.com/russross/blackfriday"; - rev = "4048872b16cc0fc2c5fd9eacf0ed2c2fedaa0c8c"; - sha256 = "17zg26ia43c8axrxp5q2bxh1asiqfhin4ah7h5d8ibil6pv7xbx4"; + rev = "6d1ef893fcb01b4f50cb6e57ed7df3e2e627b6b2"; + sha256 = "13p2xq5624b9j2f6j6j76j1h4l2lvmh7w6vcv2f5xsvzjy779r27"; }; } { @@ -256,8 +266,8 @@ fetch = { type = "git"; url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "541ff5ee47f1dddf6a5281af78307d921524bcb5"; - sha256 = "1fslblamqkd0yrvl1kbq95hnnji78bq9m33nnxiqs7y9w32zylv5"; + rev = "86672fcb3f950f35f2e675df2240550f2a50762f"; + sha256 = "142m507s9971cl8qdmbcw7sqxnkgi3xqd8wzvfq15p0w7w8i4a3h"; }; } { @@ -265,8 +275,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/afero"; - rev = "9be650865eab0c12963d8753212f4f9c66cdcf12"; - sha256 = "12dhh6d07304lsjv7c4p95hkip0hnshqhwivdw39pbypgg0p8y34"; + rev = "57afd63c68602b63ed976de00dd066ccb3c319db"; + sha256 = "0jf9v16m7k46j3mgw469yilhs5p3i32qvzi5954cqyigs6zzqbnk"; }; } { @@ -283,8 +293,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/cobra"; - rev = "34594c771f2c18301dc152640ad40ece28795373"; - sha256 = "0cgyba80gbw4vq2zp1chjz5zil3rapv65y7883f7va2ygcy57s38"; + rev = "ccaecb155a2177302cb56cae929251a256d0f646"; + sha256 = "1zm89akryx6x0vzvn50736z732gdm3jsx5898annr0zr1cfpf443"; }; } { @@ -301,8 +311,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/jwalterweatherman"; - rev = "0efa5202c04663c757d84f90f5219c1250baf94f"; - sha256 = "1sfd72zvw9lrzfc8haswhqf93bzm20q4yhbynm6n5fnnc56zn4gs"; + rev = "12bd96e66386c1960ab0f74ced1362f66f552f7b"; + sha256 = "1abvqd1dl3m7mxv44wvl0vwd50l6qpndzrxk28vyb77x41rc8b2g"; }; } { @@ -319,8 +329,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/pflag"; - rev = "e57e3eeb33f795204c1ca35f56c44f83227c6e66"; - sha256 = "13mhx4i913jil32j295m3a36jzvq1y64xig0naadiz7q9ja011r2"; + rev = "4c012f6dcd9546820e378d0bdda4d8fc772cdfea"; + sha256 = "0plmm67lkm25ir0lczwh7hmanyilrs1vxmbp8a0dyr282ji1dqm5"; }; } { @@ -328,17 +338,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 +356,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/image"; - rev = "426cfd8eeb6e08ab1932954e09e3c2cb2bc6e36d"; - sha256 = "0zbqvkn7amq9bnq38pxjqyn1xggphrisaw98x7diw3i0a5phk93r"; + rev = "12117c17ca67ffa1ce22e9409f3b0b0a93ac08c7"; + sha256 = "017xpcshrj1r2w20xvpcx0rklpfmbz6h16msv12l3x0w6vy0800s"; }; } { @@ -364,8 +365,17 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "f5079bd7f6f74e23c4d65efa0f4ce14cbd6a3c0f"; - sha256 = "0sck2mq4bwyh5iv51jpbywzwhc47ci1q5yd7pqr68xnsz7b3b55k"; + rev = "d866cfc389cec985d6fda2859936a575a55a3ab6"; + sha256 = "10iahqcsiih5hgmqw8yfgv5b3fimfwl1skxg5062avcjjks59f03"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "fd80eb99c8f653c847d294a001bdf2a3a6f768f5"; + sha256 = "12lzldlj1cqc1babp1hkkn76fglzn5abkqvmbpr4f2j95mf9x836"; }; } { @@ -373,8 +383,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "35ef4487ce0a1ea5d4b616ffe71e34febe723695"; - sha256 = "1gxxj4vcsds5aiphv39d3x5jgyfscwxylf10hxgsmzs5m7jzr47n"; + rev = "83801418e1b59fb1880e363299581ee543af32ca"; + sha256 = "0ilykaanvnzb27d42kmbr4i37hcn7hgqbx98z945gy63aa8dskji"; }; } { @@ -382,8 +392,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "836efe42bb4aa16aaa17b9c155d8813d336ed720"; - sha256 = "11s7bjk0karl1lx8v4n6dvdnsh702x4f2qlmnqac2qdz8hdswmi1"; + rev = "e19ae1496984b1c655b8044a65c0300a3c878dd3"; + sha256 = "1cvnnx8nwx5c7gr6ajs7sldhbqh52n7h6fsa3i21l2lhx6xrsh4w"; }; } { @@ -391,8 +401,8 @@ fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "25c4ec802a7d637f88d584ab26798e94ad14c13b"; - sha256 = "053mknsl3xhjscmd552005xnwbfcg0z2iphvbvj3wi0w3pvmlw44"; + rev = "287cf08546ab5e7e37d55a84f7ed3fd1db036de5"; + sha256 = "15502klds9wwv567vclb9kx95gs8lnyzn4ybsk6l9fc7a67lk831"; }; } ] diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/applications/misc/icesl/default.nix new file mode 100644 index 00000000000..d39d734dd7b --- /dev/null +++ b/pkgs/applications/misc/icesl/default.nix @@ -0,0 +1,39 @@ +{ stdenv, lib, fetchzip, patchelf, freeglut, libXmu, libXi, libX11, libICE, mesa, libSM, libXext, dialog, makeWrapper }: +let + lpath = stdenv.lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE mesa 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/j4-dmenu-desktop/default.nix b/pkgs/applications/misc/j4-dmenu-desktop/default.nix index 6b4762c0de4..f24951624c5 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 = '' diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix index f3661030a2b..ad8b7b262e5 100644 --- a/pkgs/applications/misc/jekyll/default.nix +++ b/pkgs/applications/misc/jekyll/default.nix @@ -11,7 +11,7 @@ bundlerEnv rec { meta = with lib; { description = "Simple, blog aware, static site generator"; - homepage = http://jekyllrb.com/; + homepage = https://jekyllrb.com/; license = licenses.mit; maintainers = with maintainers; [ pesterhazy ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix index 1beff54ba3e..b7b09816abd 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.5"; + version = "0.8"; src = fetchFromGitHub { owner = "johanmalm"; repo = "jgmenu"; rev = "v${version}"; - sha256 = "1gml2g711pr6wakznlxjrlmz8kylkv0ydpvv0jx2y5qczp3rwk3a"; + sha256 = "042nvix85a37aalc2rwg4yc2g3wyy6lym3c2ljj2xkl6c1b0c1r7"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 46263f7d83b..b908941d2bc 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 = "13265"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "0czsmx0gsml3vqzx6940jw2xpmh16idypydw0d4147k4fi9gzyz6"; + sha256 = "0mmpxmf17lw1j1m1gfz2jrm3qj2416zgbwgcy7xbvn6qcd8k7dr5"; }; buildInputs = [ jre8 makeWrapper ]; diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix index a95dd6adbce..fe250362593 100644 --- a/pkgs/applications/misc/kdeconnect/default.nix +++ b/pkgs/applications/misc/kdeconnect/default.nix @@ -13,26 +13,32 @@ , libfakekey , libXtst , qtx11extras +, sshfs +, makeWrapper }: stdenv.mkDerivation rec { pname = "kdeconnect"; - version = "1.2"; + version = "1.2.1"; name = "${pname}-${version}"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${pname}-kde-${version}.tar.xz"; - sha256 = "0w3rdldnr6md70r4ch255vk712d37vy63ml7ly2fhr4cfnk2i1ay"; + url = "mirror://kde/stable/${pname}/${version}/src/${pname}-kde-v${version}.tar.xz"; + sha256 = "01v432p9ylwss9gl6fvby8954bnjd91dni5jk1i44vv7x26yn8zg"; }; buildInputs = [ libfakekey libXtst ki18n kiconthemes kcmutils kconfigwidgets kdbusaddons knotifications - qca-qt5 qtx11extras + qca-qt5 qtx11extras makeWrapper ]; 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/kgocode/default.nix b/pkgs/applications/misc/kgocode/default.nix deleted file mode 100644 index b12c9fe2551..00000000000 --- 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/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix index f3bb825cbf7..e2290105c92 100644 --- a/pkgs/applications/misc/kupfer/default.nix +++ b/pkgs/applications/misc/kupfer/default.nix @@ -3,6 +3,7 @@ , fetchurl , intltool , python3Packages +, gobjectIntrospection , gtk3 , dbus , libwnck3 @@ -22,7 +23,11 @@ buildPythonApplication rec { sha256 = "0c9xjx13r8ckfr4az116bhxsd3pk78v04c3lz6lqhraak0rp4d92"; }; - nativeBuildInputs = [ wrapGAppsHook intltool ]; + nativeBuildInputs = [ + wrapGAppsHook intltool + # For setup hook + gobjectIntrospection + ]; buildInputs = [ hicolor_icon_theme docutils libwnck3 keybinder3 ]; propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ]; diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/misc/lxterminal/default.nix new file mode 100644 index 00000000000..a514b0ff63d --- /dev/null +++ b/pkgs/applications/misc/lxterminal/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, automake, autoconf, intltool, pkgconfig, gtk2, 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" + ]; + + nativeBuildInputs = [ + automake autoconf intltool pkgconfig + libxslt docbook_xml_dtd_412 docbook_xml_xslt libxml2 findXMLCatalogs + ]; + + buildInputs = [ gtk2 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 00000000000..598f506118f --- /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/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix index f627a3cda22..9e584217c59 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)" ]; diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index e6175356348..7b4b8f0d780 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 = "17.12"; name = "mediainfo-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "1yvh4r19kk3bzzgnr4ikrjxqldr6860s35sh4bqr51c7l77k048c"; + sha256 = "1pxdf0ny3c38gl513zdiaagpvk4bqnsc2fn7476yjdpv2lxsw56f"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/misc/mencal/default.nix b/pkgs/applications/misc/mencal/default.nix new file mode 100644 index 00000000000..df0a4db7fc7 --- /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/milu/default.nix b/pkgs/applications/misc/milu/default.nix index d8d1cff6040..09c4d1db290 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/monero/default.nix b/pkgs/applications/misc/monero/default.nix deleted file mode 100644 index ed2049ee5ab..00000000000 --- 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 c95f935b855..42f1b58061e 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/multimon-ng/default.nix b/pkgs/applications/misc/multimon-ng/default.nix index 24a8b0c46a6..953c4c1d9a9 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.4"; in stdenv.mkDerivation { name = "multimon-ng-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "EliasOenal"; repo = "multimon-ng"; - rev = "4cc984f35f859539c94aa56d3fc6218a6de51148"; + rev = "${version}"; sha256 = "12z6f0ra2k0qh56pcvnwvlxd3msvr6yr97jvs7w5kf42jqbxdsga"; }; diff --git a/pkgs/applications/misc/mupdf/darwin.patch b/pkgs/applications/misc/mupdf/darwin.patch new file mode 100644 index 00000000000..e0c7d6a7a67 --- /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 9dcba11b3fa..75d8463cf7f 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -1,7 +1,8 @@ -{ 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, mesa_glu }: let @@ -13,64 +14,28 @@ let in stdenv.mkDerivation rec { - version = "1.11"; + version = "1.12.0"; name = "mupdf-${version}"; src = fetchurl { url = "http://mupdf.com/downloads/archive/${name}-source.tar.gz"; - sha256 = "02phamcchgsmvjnb3ir7r5sssvx9fcrscn297z73b82n1jl79510"; + sha256 = "0mc7a92zri27lk17wdr2iffarbfi4lvrmxhc53sz84hm5yl56qsw"; }; patches = [ # Compatibility with new openjpeg (fetchpatch { - name = "mupdf-1.11-openjpeg-version.patch"; - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/0001-mupdf-openjpeg.patch?h=packages/mupdf&id=c19349f42838e4dca02e564b97e0a5ab3e1b943f"; - sha256 = "0sx7jq84sr8bj6sg2ahg9cdgqz8dh4w6r0ah2yil8vrsznn4la8r"; + 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"; - }) + # Use shared libraries to decrease size + ++ stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.12-shared_libs-1.patch - (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"; - }) - - (fetchurl { - name = "mupdf-1.11-CVE-2017-14685.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=ab1a420613dec93c686acbee2c165274e922f82a"; - sha256 = "120xapwj0af333n3a32ypxk0jmjv2ia476jg8pzsfqk9a5qqkx46"; - }) - - (fetchurl { - name = "mupdf-1.11-CVE-2017-14686.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=0f0fbc07d9be31f5e83ec5328d7311fdfd8328b1"; - sha256 = "0pkn7mfqhmnsyia4rh4mw4q435bzvlc22crqa1bxpaa0gcyky51c"; - }) - - (fetchurl { - name = "mupdf-1.11-CVE-2017-14687.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=2b16dbd8f73269cb15ca61ece75cf8d2d196ed28"; - sha256 = "01v41cwrdnz3k32fcadk2gk4knqrm3mavzp6pxhn19nwgmqkshjd"; - }) - - (fetchurl { - name = "mupdf-1.11-CVE-2017-15587.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=82df2631d7d0446b206ea6b434ea609b6c28b0e8"; - sha256 = "04kfww7y0wazg6372g44fa2k5kiiigq4616ihkvmp18rz86903n9"; - }) - - (fetchurl { - name = "mupdf-1.11-CVE-2017-15369.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=c2663e51238ec8256da7fc61ad580db891d9fe9a"; - sha256 = "0xx2mrbjcymi3gh0l3cq81m6bygp9dv79v1kyrbcvpl5z6wgl71y"; - }) - ]; + ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch + ; postPatch = '' sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c @@ -78,9 +43,15 @@ in stdenv.mkDerivation rec { 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 mesa_glu ] + ++ 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 mesa_glu ]) + ; outputs = [ "bin" "dev" "out" "man" "doc" ]; preConfigure = '' @@ -123,6 +94,6 @@ in 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/mupdf-1.12-shared_libs-1.patch b/pkgs/applications/misc/mupdf/mupdf-1.12-shared_libs-1.patch new file mode 100644 index 00000000000..b39f005ed74 --- /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/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix index ad3d72e9ef5..35931707ed6 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 a6d40c75c1c..972fbfb7b07 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -101,7 +101,7 @@ in pythonPackages.buildPythonApplication rec { 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/orca/default.nix b/pkgs/applications/misc/orca/default.nix new file mode 100644 index 00000000000..fc7fd95bbb9 --- /dev/null +++ b/pkgs/applications/misc/orca/default.nix @@ -0,0 +1,67 @@ +{ 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 + version = "3.26.0"; + majorVersion = builtins.concatStringsSep "." (take 2 (splitString "." version)); +in buildPythonApplication rec { + name = "orca-${version}"; + + format = "other"; + + src = fetchurl { + url = "mirror://gnome/sources/orca/${majorVersion}/${name}.tar.xz"; + sha256 = "0xk5k9cbswymma60nrfj00dl97wypx59c107fb1hwi75gm0i07a7"; + }; + + 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 + ''; + + 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 00000000000..d3e77773f28 --- /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/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 8e0fc613721..515127e12eb 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/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix index fd66ce8fc31..e08035aef57 100644 --- a/pkgs/applications/misc/pgmanage/default.nix +++ b/pkgs/applications/misc/pgmanage/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pgmanage-${version}"; - version = "10.0.2"; + version = "10.1.0"; src = fetchFromGitHub { owner = "pgManage"; repo = "pgManage"; rev = "v${version}"; - sha256 = "0g9kvhs9b6kc1s7j90fqv71amiy9v0w5p906yfvl0j7pf3ayq35a"; + sha256 = "0kzdq3xl6wyclngq307544yk57vpm10wyklkbgzx649z3pls3kyw"; }; buildInputs = [ postgresql openssl ]; diff --git a/pkgs/applications/misc/pmenu/default.nix b/pkgs/applications/misc/pmenu/default.nix index 2472b05a2e0..b14bb445b5d 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/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix index a13f2bef0c6..556889e126c 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/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix index 60a8cf2c6cd..e162d0d317f 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/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index d300e411c94..e03dd65b9eb 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 00000000000..629bcbb5bac --- /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 f3198085b9a..ce1c790614e 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"; + name = "ranger-v${version}"; + version = "1.9.0"; - 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"; + src = fetchFromGitHub { + owner = "ranger"; + repo = "ranger"; + rev = "v${version}"; + sha256= "0h3qz0sr21390xdshhlfisvscja33slv1plzcisg1wrdgwgyr5j6"; }; 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 ca65e4bf7f8..169d6951d45 100644 --- a/pkgs/applications/misc/redis-desktop-manager/default.nix +++ b/pkgs/applications/misc/redis-desktop-manager/default.nix @@ -76,7 +76,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 00000000000..d731d8ec43a --- /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 3fe0503d7f9..9871c559523 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -1,68 +1,63 @@ -{ 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 }: -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 ]; - - configureFlags = [ - (mkFlag guiSupport "gui") - (mkFlag drmSupport "drm") - (mkFlag randrSupport "randr") - (mkFlag vidModeSupport "vidmode") + patches = [ + # https://github.com/jonls/redshift/pull/575 + ./575.patch ]; + nativeBuildInputs = [ + autoconf + automake + gettext + intltool + libtool + pkgconfig + wrapGAppsHook + wrapPython + ]; + + buildInputs = [ + geoclue2 + gobjectIntrospection + gtk3 + libdrm + libxcb + python + ]; + + pythonPath = [ pygobject3 pyxdg ]; + + preConfigure = "./bootstrap"; + postFixup = "wrapPythonPrograms"; + enableParallelBuilding = true; - 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" - - install -Dm644 {.,$out/share/doc/redshift}/redshift.conf.sample - ''; - 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/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index 7ad8a85a419..57cdfd08d5b 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -11,33 +11,26 @@ let url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb"; sha256 = "0b56iglg8g45biddwsdn1hmx9gsz4kxr64civwyy7f69f022ppab"; }; - -in - -stdenv.mkDerivation { +in stdenv.mkDerivation { # https://www.rescuetime.com/updates/linux_release_notes.html 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/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index 02af4c28d59..c9064d93740 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.21.0"; name = "rtv-${version}"; src = fetchFromGitHub { owner = "michael-lazar"; repo = "rtv"; rev = "v${version}"; - sha256 = "19rnw9cac06ns10vqn2cj0v61ycrj9g1ysa3hncamwxxibmkycp7"; + sha256 = "0srm01nrb23hdmj3ripsa9p8nv2cgss3m6and9rdr875qw5ii130"; }; # Tests try to access network diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index 281f2176833..4ee9f461760 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/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix new file mode 100644 index 00000000000..ae2bab64187 --- /dev/null +++ b/pkgs/applications/misc/sigal/default.nix @@ -0,0 +1,33 @@ +{ lib, buildPythonApplication, fetchPypi, pythonPackages }: + +buildPythonApplication rec { + version = "1.3.0"; + pname = "sigal"; + + src = fetchPypi { + inherit version pname; + sha256 = "0ycyrap4rc0yrjagi5c5fs5gpw9whvkli656syfpj99dq1q9q1d0"; + }; + + buildInputs = with pythonPackages; [ pytest ]; + propagatedBuildInputs = with pythonPackages; [ + jinja2 + markdown + pillow + pilkit + clint + click + blinker + ]; + + # 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 matthiasbeyer ]; + }; +} + diff --git a/pkgs/applications/misc/styx/default.nix b/pkgs/applications/misc/styx/default.nix index 2cdf047a10f..f9779beec0f 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 051b67bc972..5e1e7bf3225 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/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix index 04f38968142..13f3fa98d56 100644 --- a/pkgs/applications/misc/synapse/default.nix +++ b/pkgs/applications/misc/synapse/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, pkgconfig, glib, libnotify, gtk3, libgee -, keybinder3, json_glib, zeitgeist, vala_0_34, hicolor_icon_theme +, keybinder3, json_glib, zeitgeist, vala_0_34, hicolor_icon_theme, gobjectIntrospection }: let @@ -12,7 +12,11 @@ in stdenv.mkDerivation rec { sha256 = "04cnsmwf9xa52dh7rpb4ia715c0ls8jg1p7llc9yf3lbg1m0bvzv"; }; - nativeBuildInputs = [ pkgconfig intltool vala_0_34 ]; + nativeBuildInputs = [ + pkgconfig intltool vala_0_34 + # For setup hook + gobjectIntrospection + ]; buildInputs = [ glib libnotify gtk3 libgee keybinder3 json_glib zeitgeist hicolor_icon_theme diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix index 74ef55ee8cc..80e1b9b69ef 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 3959ad88ece..59ea70e3da2 100644 --- a/pkgs/applications/misc/terminator/default.nix +++ b/pkgs/applications/misc/terminator/default.nix @@ -1,19 +1,22 @@ -{ stdenv, fetchurl, pythonPackages, pango, keybinder, vte, gettext, intltool, file +{ stdenv, fetchurl, pythonPackages, keybinder, vte, gettext, intltool, file, gtk3, gobjectIntrospection, cairo +, wrapGAppsHook, gnome3 }: pythonPackages.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 ]; + nativeBuildInputs = [ file intltool wrapGAppsHook ]; + buildInputs = [ gtk3 gnome3.vte gobjectIntrospection cairo ]; pythonPath = with pythonPackages; [ - pygtk pygobject2 vte keybinder notify gettext pango psutil + pygobject3 vte keybinder notify gettext psutil + pycairo ]; postPatch = '' @@ -32,7 +35,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/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix index d417140b29b..f6dd7cb8c23 100644 --- a/pkgs/applications/misc/timewarrior/default.nix +++ b/pkgs/applications/misc/timewarrior/default.nix @@ -2,22 +2,20 @@ stdenv.mkDerivation rec { name = "timewarrior-${version}"; - version = "1.0.0"; + version = "1.1.0"; enableParallelBuilding = true; src = fetchurl { url = "https://taskwarrior.org/download/timew-${version}.tar.gz"; - sha256 = "1d8b9sjdbdld81n535iwip9igl16kcw452wa47fmndp8w487j0mc"; + sha256 = "0jnwj8lflr6nlch2j2hkmgpdqq3zbdd2sfpi5iwiabljk25v9iq9"; }; nativeBuildInputs = [ cmake ]; - patches = [ ./install-all-themes.patch ]; - meta = with stdenv.lib; { description = "A command-line time tracker"; - homepage = http://tasktools.org/projects/timewarrior.html; + homepage = https://tasktools.org/projects/timewarrior.html; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/timewarrior/install-all-themes.patch b/pkgs/applications/misc/timewarrior/install-all-themes.patch deleted file mode 100644 index c6e8d3b0dbf..00000000000 --- a/pkgs/applications/misc/timewarrior/install-all-themes.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e4a14c61bff3a55de42718dc11b282c4d5342995 Mon Sep 17 00:00:00 2001 -From: Will Dietz -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 2bd8b07e499..05deac81af6 100644 --- a/pkgs/applications/misc/tint2/default.nix +++ b/pkgs/applications/misc/tint2/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "tint2-${version}"; - version = "16.0"; + version = "16.2"; src = fetchFromGitLab { owner = "o9000"; repo = "tint2"; rev = version; - sha256 = "04h32f9yybxb2v6bwmlyjzr8gg8jv4iidhpwaq3zhg44iz2b75j0"; + sha256 = "1fp9kamb09qbply8jn0gqwgnv9xdds81jzpl0lkziz8dydyis4wm"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index d1b1daa26d6..1f8ab8b438d 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 = '' diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index bcf43514f45..9f94b0aa48e 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -1,16 +1,22 @@ { stdenv, fetchFromGitHub, asciidoc-full, gettext , gobjectIntrospection, gtk3, hicolor_icon_theme, libnotify, librsvg -, pythonPackages, udisks2, wrapGAppsHook }: +, udisks2, wrapGAppsHook +, buildPythonApplication +, docopt +, pygobject3 +, pyyaml +, ... +}: -pythonPackages.buildPythonApplication rec { +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 = [ @@ -21,8 +27,8 @@ pythonPackages.buildPythonApplication rec { ]; 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/urlview/default.nix b/pkgs/applications/misc/urlview/default.nix index daf93e8c469..8764c41c8a4 100644 --- a/pkgs/applications/misc/urlview/default.nix +++ b/pkgs/applications/misc/urlview/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Extract URLs from text"; - homepage = http://packages.qa.debian.org/u/urlview.html; + 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 f780e5469d0..38c4055a10b 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/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix index 86924d9b3ca..201e2bcc6ac 100644 --- a/pkgs/applications/misc/veracrypt/default.nix +++ b/pkgs/applications/misc/veracrypt/default.nix @@ -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 ffeca99cf9c..c43ec5efbaf 100644 --- a/pkgs/applications/misc/vifm/default.nix +++ b/pkgs/applications/misc/vifm/default.nix @@ -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/wmname/default.nix b/pkgs/applications/misc/wmname/default.nix index dfd3c487713..fe0348cad21 100644 --- a/pkgs/applications/misc/wmname/default.nix +++ b/pkgs/applications/misc/wmname/default.nix @@ -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/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index 8c554da0362..fbf68f317de 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -50,7 +50,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/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix index 7d22a160574..b152badcda4 100644 --- a/pkgs/applications/misc/xfontsel/default.nix +++ b/pkgs/applications/misc/xfontsel/default.nix @@ -1,5 +1,5 @@ # 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}: @@ -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/xkbmon/default.nix b/pkgs/applications/misc/xkbmon/default.nix new file mode 100644 index 00000000000..38bda9a8f56 --- /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 index 4931a3f8a12..c985f601447 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { name = "xmr-stak-${version}"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "fireice-uk"; repo = "xmr-stak"; rev = "v${version}"; - sha256 = "0ijhimsd03v1psj7pyj70z4rrgfvphpf69y7g72p06010xq1agp8"; + sha256 = "0n21y37d8khgfk9965mrhnh6y5ag7w0s6as1fmf76yx6vajvajsn"; }; NIX_CFLAGS_COMPILE = "-O3"; diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index 9e64557838e..838043881e4 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -3,11 +3,14 @@ }: stdenv.mkDerivation rec { - name = "xterm-330"; + name = "xterm-331"; 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 = "047gk58hvj64974sg259ss5gixj7pac6halmjfz4cc6r1yimds4s"; }; buildInputs = @@ -56,7 +59,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/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 8a460f89016..d7a487ce309 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -10,11 +10,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "zathura-core-${version}"; - version = "0.3.7"; + version = "0.3.8"; src = fetchurl { url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz"; - sha256 = "1w0g74dq4z2vl3f99s2gkaqrb5pskgzig10qhbxj4gq9yj4zzbr2"; + sha256 = "0dz5pky3vmf3s2cp2rv1c099gb1s49p9xlgm3ghyy4pzyxc8bgs6"; }; icon = ./icon.xpm; diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix index 34508da0e37..bb573020b4e 100644 --- a/pkgs/applications/misc/zathura/djvu/default.nix +++ b/pkgs/applications/misc/zathura/djvu/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }: stdenv.mkDerivation rec { - name = "zathura-djvu-0.2.5"; + name = "zathura-djvu-0.2.7"; src = fetchurl { url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; - sha256 = "03cw54d2fipvbrnbqy0xccqkx6s77dyhyymx479aj5ryy4513dq8"; + sha256 = "1sbfdsyp50qc85xc4458sn4w1rv1qbygdwmcr5kjlfpsmdq98vhd"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/misc/zathura/djvu/gtkflags.patch b/pkgs/applications/misc/zathura/djvu/gtkflags.patch index 2a2fe298a7b..6e8819e6082 100644 --- a/pkgs/applications/misc/zathura/djvu/gtkflags.patch +++ b/pkgs/applications/misc/zathura/djvu/gtkflags.patch @@ -1,7 +1,7 @@ ---- 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 +--- zathura-djvu-0.2.7.orig/config.mk 2017-12-21 14:20:24.000000000 +0100 ++++ zathura-djvu-0.2.7/config.mk 2017-12-31 00:41:02.580154770 +0100 +@@ -16,6 +16,9 @@ + DESKTOPPREFIX ?= ${PREFIX}/share/applications # libs +GTK_INC ?= $(shell pkg-config --cflags gtk+-2.0) @@ -10,14 +10,14 @@ CAIRO_INC ?= $(shell pkg-config --cflags cairo) CAIRO_LIB ?= $(shell pkg-config --libs cairo) -@@ -29,8 +32,8 @@ +@@ -34,8 +37,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} +-INCS = ${GIRARA_INC} ${GLIB_INC} ${DJVU_INC} ${CAIRO_INC} ${ZATHURA_INC} +-LIBS = ${GIRARA_LIB} ${GLIB_LIB} ${DJVU_LIB} ${CAIRO_LIB} ++INCS = ${GIRARA_INC} ${GLIB_INC} ${DJVU_INC} ${CAIRO_INC} ${ZATHURA_INC} ${GTK_INC} ++LIBS = ${GIRARA_LIB} ${GLIB_LIB} ${DJVU_LIB} ${CAIRO_LIB} ${GTK_LIB} - # flags - CFLAGS += -std=c99 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS) + # pre-processor flags + CPPFLAGS += -D_FILE_OFFSET_BITS=64 diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index c9472f35667..aca676de213 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -2,12 +2,12 @@ , libjpeg, jbig2dec, openjpeg, fetchpatch }: stdenv.mkDerivation rec { - version = "0.3.1"; + version = "0.3.2"; name = "zathura-pdf-mupdf-${version}"; src = fetchurl { url = "https://pwmt.org/projects/zathura-pdf-mupdf/download/${name}.tar.gz"; - sha256 = "06zqn8z6a0hfsx3s1kzqvqzb73afgcl6z5r062sxv7kv570fvffr"; + sha256 = "0xkajc3is7ncmb2fmymbzfgrran2bz12i7zsm1vvxhxds728h7ck"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index 2dda88f409b..f954d2392d7 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchurl, pkgconfig, zathura_core, girara, poppler }: stdenv.mkDerivation rec { - version = "0.2.6"; + version = "0.2.8"; name = "zathura-pdf-poppler-${version}"; src = fetchurl { url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; - sha256 = "1maqiv7yv8d8hymlffa688c5z71v85kbzmx2j88i8z349xx0rsyi"; + sha256 = "1m55m7s7f8ng8a7lmcw9z4n5zv7xk4vp9n6fp9j84z6rk2imf7a2"; }; nativeBuildInputs = [ pkgconfig ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { homepage = http://pwmt.org/projects/zathura/; 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; diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix index a415cde3c7e..dd8c3a26ce1 100644 --- a/pkgs/applications/misc/zathura/ps/default.nix +++ b/pkgs/applications/misc/zathura/ps/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, fetchurl, pkgconfig, gtk, zathura_core, girara, libspectre, gettext }: stdenv.mkDerivation rec { - name = "zathura-ps-0.2.3"; + name = "zathura-ps-0.2.5"; src = fetchurl { url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; - sha256 = "18wsfy8pqficdgj8wy2aws7j4fy8z78157rhqk17mj5f295zgvm9"; + sha256 = "1x4knqja8pw2a5cb3y2209nr3iddj1z8nwasy48v5nprj61fdxqj"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/misc/zathura/ps/gtkflags.patch b/pkgs/applications/misc/zathura/ps/gtkflags.patch index 7c944a12f0e..1464d2c8373 100644 --- a/pkgs/applications/misc/zathura/ps/gtkflags.patch +++ b/pkgs/applications/misc/zathura/ps/gtkflags.patch @@ -1,9 +1,7 @@ -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 +--- zathura-ps-0.2.5.orig/config.mk 2017-12-21 14:21:17.000000000 +0100 ++++ zathura-ps-0.2.5/config.mk 2017-12-31 01:05:17.507268817 +0100 +@@ -16,6 +16,9 @@ + DESKTOPPREFIX ?= ${PREFIX}/share/applications # libs +GTK_INC ?= $(shell pkg-config --cflags gtk+-2.0) @@ -12,14 +10,14 @@ index c3a7b37..0cbce67 100644 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 +@@ -34,8 +37,8 @@ + PLUGINDIR = ${LIBDIR}/zathura + endif --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} +-INCS = ${GLIB_INC} ${SPECTRE_INC} ${GIRARA_INC} ${CAIRO_INC} ${ZATHURA_INC} +-LIBS = ${GLIB_LIB} ${SPECTRE_LIB} ${GIRARA_LIB} ${CAIRO_LIB} ++INCS = ${GLIB_INC} ${SPECTRE_INC} ${GIRARA_INC} ${CAIRO_INC} ${ZATHURA_INC} ${GTK_INC} ++LIBS = ${GLIB_LIB} ${SPECTRE_LIB} ${GIRARA_LIB} ${CAIRO_LIB } ${GTK_LIB} - # flags - CFLAGS += -std=c99 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS) + # compiler flags + CFLAGS += -std=c11 -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 55ac9bd187a..0f12251a3df 100644 --- a/pkgs/applications/misc/zathura/wrapper.nix +++ b/pkgs/applications/misc/zathura/wrapper.nix @@ -16,7 +16,7 @@ in symlinkJoin { ''; 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 diff --git a/pkgs/applications/networking/apache-directory-studio/default.nix b/pkgs/applications/networking/apache-directory-studio/default.nix index 36d0c9e4acf..d593947f3e6 100644 --- a/pkgs/applications/networking/apache-directory-studio/default.nix +++ b/pkgs/applications/networking/apache-directory-studio/default.nix @@ -1,9 +1,20 @@ -{ stdenv, fetchurl, xorg, jre, makeWrapper }: +{ 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}"; @@ -36,6 +47,8 @@ stdenv.mkDerivation rec { "$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; { diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 54fee5847e1..e35d894e0e7 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 6b7e64bf8c0..b0ce1bb7316 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -44,6 +44,11 @@ let # source tree. extraAttrs = buildFun base; + gentooPatch = name: sha256: fetchurl { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/${name}"; + inherit sha256; + }; + mkGnFlags = let # Serialize Nix types into GN types according to this document: @@ -133,15 +138,16 @@ let # 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 "63" "64") [ - ./patches/chromium-gcc5-r4.patch - ./patches/include-math-for-round.patch - ] - ++ optional enableWideVine ./patches/widevine.patch; + + # (gentooPatch "" "0000000000000000000000000000000000000000000000000000000000000000") + ] ++ optionals (versionRange "64" "65") [ + (gentooPatch "chromium-cups-r0.patch" "0hyjlfh062c8h54j4b27y4dq5yzd4w6mxzywk3s02yf6cj3cbkrl") + (gentooPatch "chromium-angle-r0.patch" "0izdrqwsyr48117dhvwdsk8c6dkrnq2njida1q4mb1lagvwbz7gc") + ] ++ optional enableWideVine ./patches/widevine.patch; postPatch = '' # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX @@ -190,6 +196,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 ({ @@ -201,6 +210,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; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 911b55b115f..42616147536 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -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/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index a20d7b17a83..5749689bfb1 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 = "28.0.0.126"; + version = "28.0.0.137"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "10q005jp5vcfqx35jzwp138djv9g7jp83jqbyism40k67ah33i1z"; + sha256 = "1776jjv2abzrwhgff8c75wm9dh3gfsihv9c5vzllhdys21zvravy"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/chromium/update.nix b/pkgs/applications/networking/browsers/chromium/update.nix index 3b9ea396647..277ad29abe2 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 738be28ac17..3fe73c8669c 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 = "1mv01q6sdvkmfyk9q834zcaq1z4s07sgfp5i107vgcbwnmwmhpgi"; - sha256bin64 = "0x176ijcmn25xhn4apn3yal1xb14rz0xaiy2mjbknm011s4ysvby"; - version = "64.0.3282.24"; + sha256 = "09ris0aj743x3mh7q45z55byxwmw7h6klhibbcazb1axj85ahbil"; + sha256bin64 = "18833sqqfssjvcmf6v7wj9h9gsc07wr09cms5c0k7f8v9dqysc7r"; + version = "64.0.3282.119"; }; dev = { - sha256 = "1mv01q6sdvkmfyk9q834zcaq1z4s07sgfp5i107vgcbwnmwmhpgi"; - sha256bin64 = "15zmh4ix6822kzqcapkpjzsjkd4yaw45jgddh5gdv65j65a6fhlq"; - version = "64.0.3282.24"; + sha256 = "04vrcsvlanjljah3pbgfz49ygwr9i6zymr1a09kldrnykv770c5l"; + sha256bin64 = "016s8lh94i0m3zyld32vzqfw1c0s97sa143dyww7x26b2mp93lcc"; + version = "65.0.3322.3"; }; stable = { - sha256 = "0aqsqd2s4hj3lci7wa7bss4wy4sv889f0z4va7fqp9sd36c0gn27"; - sha256bin64 = "188wxkagihq77aaikkdiq923bbx7a0np73skhrfd4y38lygirry9"; - version = "63.0.3239.108"; + sha256 = "09ris0aj743x3mh7q45z55byxwmw7h6klhibbcazb1axj85ahbil"; + sha256bin64 = "18a61myi3wlrk9zr7jjad1zi8k0ls9cnl2nyhjibjlwiz3npwbm5"; + version = "64.0.3282.119"; }; } 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 00000000000..347fb8e1287 --- /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/0001-Remove-post-install-script-handle-in-nix-config-inst.patch b/pkgs/applications/networking/browsers/eolie/0001-Remove-post-install-script-handle-in-nix-config-inst.patch new file mode 100644 index 00000000000..770cd8afa9e --- /dev/null +++ b/pkgs/applications/networking/browsers/eolie/0001-Remove-post-install-script-handle-in-nix-config-inst.patch @@ -0,0 +1,23 @@ +From a79d2dcd1b6275904193454fb9d68614813929f3 Mon Sep 17 00:00:00 2001 +From: Sam Parkinson +Date: Mon, 27 Nov 2017 11:17:35 +1100 +Subject: [PATCH] Remove post install script - handle in nix config instead + +--- + meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/meson.build b/meson.build +index fc45296..2227f1f 100644 +--- a/meson.build ++++ b/meson.build +@@ -53,5 +53,3 @@ configure_file( + configuration: conf, + install_dir: bindir + ) +- +-meson.add_install_script('meson_post_install.py') +-- +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 00000000000..e41783ddf5b --- /dev/null +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -0,0 +1,68 @@ +{ stdenv, fetchgit, intltool, itstool, meson, ninja, pkgconfig, wrapGAppsHook +, git, glib, glib_networking, gsettings_desktop_schemas, gst_all_1, gtk3 +, 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 + ]; + + buildInputs = [ + git # required to download ad blocking DB + 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" ]; + + enableParallelBuilding = true; + + postInstall = '' + ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas + ''; + + patches = [ + ./0001-Remove-post-install-script-handle-in-nix-config-inst.patch + ./0001-Extend-the-python-path-rather-than-replacing-it.patch + ]; + + meta = with stdenv.lib; { + description = "A new GNOME web browser"; + homepage = https://gitlab.gnome.org/gnumdk/eolie; + license = licenses.gpl3; + maintainers = [ maintainers.samdroid-apps ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index f954b7bd442..f359cfbf79b 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,965 +1,975 @@ { - version = "58.0b9"; + version = "59.0b5"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/ach/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ach/firefox-59.0b5.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "63054fd235b220308114c26ef9dab2c8c8eeae8ace81a1bba70f0e3ae8135255d6dd5f21c7cfd3b5324e4fe81c1f4cb1d5104cb2f1adedf8f5d1c7025255588d"; + sha512 = "8378bf22714f1e687a52dd12637a566cf5239f8413cb7508259b58d557e7d8babfbf3c4251a82d3554d812c74791a4b99290a14497ebf69d91db9d8d3c5e0043"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/af/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/af/firefox-59.0b5.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "eb86b4fe1d3fcbc6f7f63d6625d4dfec460077a30aa908918af2a77ca3f38ce6083c629f4afb28369ac4dc3b8dbc97577a47c1b48d12eeec8489bab9f5247a7f"; + sha512 = "6df91af8a37c092c36decf7b8278674ce32d6840ef92cf658ca2803fb3744e38dc246115028af86e5e36b7ec17aba4a9b0b9d219a540b328ac9cb7753bb58262"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/an/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/an/firefox-59.0b5.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "c22aec6900b8d428a4a1129c77dafbfb379b04697fac1e94d764f9bd598d2e5caadaaa15581166226616e77603b0e3dcde1009964d8c13f724e2e58504f3434a"; + sha512 = "09e53bfcd586eac946b372673d4c37641aae81473386d52e1b0060023760c09e5fa22c3b69484be66c6cfe51a99585c957f088eb7c04f7330622ba2f1a5e51d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/ar/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ar/firefox-59.0b5.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "c6cb3c95ff0f91a368222da9d96cbbe6a983c041a75860044d76a927353a9af5017b29f079259bf338cb1c230463c1bbc003d9b154851bf1fc86e4b3c2291983"; + sha512 = "96d84c9139bfc4518e452045cf94e4e61ebca6e7a43085d18d9475dc163c8955a7995935d430d0da386ac268979b6765bccdfd1493a15606225055e7622990fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/as/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/as/firefox-59.0b5.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "4c4736fd3b5bf924dcd58f837583bac631cd0c011d8e7826b2b9bdd4b9eea21f287f995d21b3bfca27a96546ca56b39e59b10f7f09ec998dd74ea6ca2e44c620"; + sha512 = "13daffa3b652455957aed912c9e5f86121d99c25daef470d4b2fe1140fc04b0085a3e8f317f9b36f8c26f207ae412a8dd71f2ef7cf233c15c0552682eadf14cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/ast/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ast/firefox-59.0b5.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "7eab106b72d22d76ae60f8bb723b709f6bca41210fd6cc8b7c48dbc2e42fab276a57ff64502504d4ce4b161635ba0a3166dbb8829ca99d80f4207bb62f78f31d"; + sha512 = "b9d9e21fc2bdc3054a86c993be82c1e04c086db9ce8c64b40bafff75b967a7c30817aaf924fdd5464c64e05aff7004efd8607a123699ae58e163fbc3c1c3530a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/az/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/az/firefox-59.0b5.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "0eb5a17f7d6ccec8e49eba45945e0a34897bae4bfe8427ba05887077ed5e4d16a60c0613f2f28c3fbf99d4e9823cf17ac011c54d2977c6e37f2c4cf94f4bfae9"; + sha512 = "5f0bb5796e4ee6ba8f08b18a19254b51b04b60aad93cccac21eec0e10ef1e280ebb0d4a66d053b7f3f875b4cce34b90f58cadfa7705f89f26f96e5b94316cf11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/be/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/be/firefox-59.0b5.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "5a5be397f4c9ea41d0a6f7d65b95c6bd6646c09650925591a3765a9cae18ea7cf832bf957dd76c9816a0b9ca1aebf618a778ad839aafcbae38251ad09b77c595"; + sha512 = "736e5e0c81969107b6bc83d9212a30f027f84d646c896eaa61374c0464942bb74b3e22f94d8254cd17e0c5e9f6431a5b9b910f2b9bb6132f10f336d7e952af09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/bg/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/bg/firefox-59.0b5.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "58b77d3b355016beff67aec658f182b5d8b44d03f2beea528630bed938794c3060a637f43890466ef1ec0942d9f971af94c883a8b59c9e0f91c578d678b2e89c"; + sha512 = "b2dc4f280897b5806077e4ae527cffe8961910c114456244153edee182db969507722d1c30e5abee9f9b9034c58e22a2b54bbfb00b3e8198569892b87e84df50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/bn-BD/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/bn-BD/firefox-59.0b5.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "6ade71b4eb54aa9207c411d801e5323a1f4f09dd29d26b50b0c2be3e401f2e780810e925fa18da11b59fd1cebaae850e721cbcc510aea893281d78d02b7ff085"; + sha512 = "0546005b584f504378799f359eecb11347f16a9d364deaf72a8f1094b2c6030749dbf4eb5bba1224d91965617b2d919b873fbdf4c5c3ca9996286d281af51df4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/bn-IN/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/bn-IN/firefox-59.0b5.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "588046dcb10f63ed838cd0a2a1b87f540bf7303f8a23479b7c72b6945940ec248c85a56753d263de66a0fb056848d7f2e67eedcdb2a89a73a105d3bc3c06ff05"; + sha512 = "cece516f3c46b1f98dd837d17533a7607401452d95b3e7611d4352f88699008bc38a95e6abea5c2c69d145e934a34116fe00bdee2b9ad404c26a20e35c5b16d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/br/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/br/firefox-59.0b5.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "d770d3b6fb545df73d6a9639cded93396f2b58d21875bc3ed804bae8f69b25f0067c88e6fce46fececde9582cc9100c8261119a0cceb82489863939be3accd96"; + sha512 = "5aaa92650ff188d457fa9d8b7e33198b847e41b9ddb068d1bcf7015792352757e02e5b1deb36e0c20ad1ef214f523003ebdbb70273d153f4194f50514c876aa2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/bs/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/bs/firefox-59.0b5.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "1cc8c3e70ec8fc55c873d852647af373d7c992deac70b61001186509aad624825d4f680d55b56da78b879ba89c5166fb942847637f6f036c209618865315d51e"; + sha512 = "1ccf76aaac7d2ff4e4a8c09e7431ef8f0d5a55cfb5bd9aed032e147e87b6d86391a927d76251b6ca1b3c21a57832f050ee818b43a5513c49d75652e62e5eaa6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/ca/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ca/firefox-59.0b5.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "83260fbe907aabaf996b0bf5649df4a487eb55e68643c82f06b5493b2b6676cd842d112ca3447e9d3cf3916d096259e2ad6bea2c938cec25e1f529af8d6f21c7"; + sha512 = "9b3d4b0abd19ff7ddb51ce1925e2f8929621b215be80f124dbcaed7b34320914c9593645bd6b1b406fabf7693016816fd27a9b66d0d577e72c659a28ecb86fed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/cak/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/cak/firefox-59.0b5.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "3b718d80c8b7624e51c6030c1be00993dec43d2a45fcf9e5c810c193a52a7d4704d355d675882a2c7d3475eb6c35840ded7de62e05965c8c9d17a10e401d7825"; + sha512 = "fac861443276137842c0b7ca0620d0714bd4ed391abe28ee9a377686261670301d5cd62c105ca31379d9ea97a42aba3bea0edc284bf3058da1748dfb3456cef8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/cs/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/cs/firefox-59.0b5.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "12f77f3ced08134dfedabc4f45f74450c65ac4eb6656bb443643d7547186a2fddcdd4502782b62300fcd9d4ea3fbcce6869497b6a55959b414f3786819c9ce0c"; + sha512 = "3de6a8c71d2befe5ae58d1968420c72ef52eefc6f0ad2330c817baa3ce9a2160d5e332846d00cbd1b8504f806620787fd967c1970f9bea7964ea1a6000c70c3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/cy/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/cy/firefox-59.0b5.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "239b37ef93e116294c8bb5f310b3af17f2e5daa4b54b89c9e0f2e7d12d1bb2ec22ba5ad4b59b19b69182c390d9706bd642d9397560b1f79a5b8221efe6ae943d"; + sha512 = "71e9af6aee3e9d22a51274d8987a296b2906e8c3b1c85d3f4e0469db5c11a22f93948e78b76d1d8d12ebe22e8987781147ea5e028b97803da5f21755c5721a74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/da/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/da/firefox-59.0b5.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "636790755a92cf1d645a9a4ef8d4852c4e64a285545547f9c996fdd199056baed4239404329f7cefacaa7d97ca1d542426ff6821eac3968643b052f9e2031d5a"; + sha512 = "40d1325baad0050524df5a397e4d78d6f78d53a9ac34bd57188febdf8c6e291e723186c596cb634df18b5b8809d52401cca2f733de95015d658710e38fa8cb25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/de/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/de/firefox-59.0b5.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "6d43434f585a474fd96c02aab4398dee0f208288a8d232bf7a657da3fed4bf0bfbd204164b137e135d3abadf867ac9f312cbdc23834015e7404f8aaecc1c4d2f"; + sha512 = "4b1971ef58f68c2d2d8e37c2759bae6a0ddccdc14e4ab125712508885dbf7490323d568aff70702a056cdcb64c80b85cf67d2013c4efc9cb2f0063ade13ee1f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/dsb/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/dsb/firefox-59.0b5.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "f4ce15f421fd78bc0b1a91975f7630cc3ed52a09b840b13b75bdd422c43f2d599b1e6193c9d43ea0b5d26ddecdf5dceea1fad6d9c9dae0e2223692c63b60eaf3"; + sha512 = "78e9f74125d27c37067a52fe33503979a998fe0e0f84e3859b75d4544ac70cd387e76088cf28b520ac6185bf0884508c399077dbe8ad74b87b4a5d01c4e1a557"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/el/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/el/firefox-59.0b5.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "5954c1689fceae7f77873d815a330b7ee7ac9657f27b80e7d6da15bb3b42d766908a6561882265ccd2816fc4cc70caeab10504a5cac865dd790e29f24c81d115"; + sha512 = "18d2bf64feb0a89f715ac8add7b46e296422c130d6afaf35edf1b4cb2a46ad5a77ed4e7c3131d0fc19750e3cd9b53e2bab835abc375daaed2a69195bf60781a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/en-GB/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/en-GB/firefox-59.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "6ab628b6da15511c765b1a52ca0d5e1d86eedde6af7a5bb73c75dce214b6ec73108ebeafd0dfa389e53327b0c24019bce9f78bff1067ce0fab2319dd88645a4d"; + sha512 = "2aaa98402c21153f1419d3319db5cc0db71cf23e02be560ad8051384fb8465049500d8a3b1b7c327916435ae4da61043492ff3a51a8da65699d6b9be368aaa36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/en-US/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/en-US/firefox-59.0b5.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "46daf5bae10946112538f9ff404715364866fb84a12215c7c1f398f560c11cd6b56ae6edd707fa2926971942e33a53e8e3c45773c30a43aacfb71f2dea5a6368"; + sha512 = "5e281d84456a7c4cad57b13af5f77d2e9ce903be0993c752e995e0b3df7c1b2453a45f322833cf1bac872d1fe4bd9209a29dd5fc9c7571baab3665b3eca874f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/en-ZA/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/en-ZA/firefox-59.0b5.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "e530babb296739e458a3137c693d1b8b7f560b6533f66479c1839c382e55ed4739f33858754501a98f677c279f8391318bec548c043f38df39f92490f10cb7b8"; + sha512 = "c431628654fe39e59036ab1567749ff4f931bcf00b6b55a11a240823905a7ca6c5ccf0e1184f8f7495f3650bf0976fe2e3da2e09b0a5abbc6735235dbf4bc6cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/eo/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/eo/firefox-59.0b5.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "c0df41e60ec4ef1af34d85c84a7b4021cb6565b7c5ddee998b345126fe02b7ecf1581867accba7e204a573e1d662e83835909ce42d15ceb157f82e234b98e66b"; + sha512 = "b3b0307e5d9db7a12a7a0fcfa75cb179a1ce91d0760ef6196ecf734ebd0aa3cbe701f3c8610dfa6faf2b5e4d8c9b73d51b526bceae7d905b17dd76224c3ed15d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/es-AR/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/es-AR/firefox-59.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "546caa033a102ea9b843e1e4f468253f33d4805f5a290f3e35bf809ec782fccbfffa78ded8e0487aeedb8c296ca98fbe86d5873e2883ecfdf10a2f2b9c6eeaec"; + sha512 = "57baa3cdc360129bc68ebccdfc51d1cecd239aef84cf5043003cf2911e2f3ba4f13302acc096aee96c603e21f4df8e7dc81521bf5de5f8c70abdb9026ece189a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/es-CL/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/es-CL/firefox-59.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "7e3a88a23d6d635ea051970643d9252beb482cecc6feaec2c920fb8c24e0ec23bba61f1f66960bc49901d3ece6750f85fd9128fe0f8ce98e1e989888cca65738"; + sha512 = "b385405596093d1a2fd25b290e0825110744bb702239be615809522595bbf34a1ed25e7b7abe17b078020a755a28a603823b7014a11967793e1d4597a3d6ba04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/es-ES/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/es-ES/firefox-59.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "042861001ddc804d78c7f0d01e4624dad9be7b9a3717de7524d199ad68bebee2596a8039729fa62655fce664cf4411cce7ba0f5a288685f675ad13df47387687"; + sha512 = "f3921d502ed19c3c131f7aad613ccab775c173b4767f4bdbddd4aa98601ee7810254cb6f0c588809b9e0a61dacdd74a1662e83184d380830f35b7cbe326e116e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/es-MX/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/es-MX/firefox-59.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "9c8f4687f230ba87ae3db0400d0df16c5ec208de4ec9a8273c71b08bfd2084a501ec1d3f579900e34821a1431002bdd911a08ae97fe84946501a9a8f8ad7fbc2"; + sha512 = "da072c427f2a232be0a84cb23897bfb6a93b92326b180dda491b2c9afb68afa7e798f1451a6ef5dd36f13f473fd9b667fcad96a0124490d0c89c0c5ff3887f92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/et/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/et/firefox-59.0b5.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "51da061ee3b7fb28f03ced395ff3e847d744e7d45a53283a36477cc710f441dbd713c9a845187744f63fa2a72a7c60be6b82e6806b040b3ae7bddbe1a7fadef7"; + sha512 = "e8a72113b7df9193d6044fd6e6120087422c7f2d4456d5dd24881723c77039607ce8025f5f3547b80b671409b0a2017368fff376c9ae581eef285201661cd719"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/eu/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/eu/firefox-59.0b5.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "023c77aa186ed77dbdf7fd2eb629738e06e48729bfae0f7ace7e1acd423a766e0297a40e83b3a9ff1dbc6da6f9d526206a74fa6b3c0ad174f28e5a1b19efc91f"; + sha512 = "dfc9ff76c8e76fef732a89f29ff4d821af9190c45a02d0a56ecff9f6199b674aa6445817765eb01468b16b253aba9d4507d8750228bce74658f84f3c4daa64a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/fa/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/fa/firefox-59.0b5.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "bab9c1856a97be0ea91bb2fe0c4dea8237f278630d2aecd9dc93b53550190b72faa3087b5e1105dc31956fe95c365f8eec86586c01ef32a4e5af9a7e64ef057e"; + sha512 = "a5d1ec23f3b7ae46b9aebbfd2e6d2f5df959a34c2df0660e3bd17fd45fdbfc696936e9fc921a783304a3bdafa548ae616c910a5e2e150fb2bf98739d52deeaeb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/ff/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ff/firefox-59.0b5.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "55e143c1aff880461917b0cceb2934e8a8f80a32c78137c1e62d57dbf446d4a00e34fef4cff5a5e7f802f82adcb106c1344927750e07b845c776ae8c9c209851"; + sha512 = "2a70a2255a029db0222098304d5fd5a0e204764f1900705dc3de97c768aa1b729610c968cf73f885c05ff6bcc95c51329c752f5d58da07ecbd9bf1fb5d7f0e0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/fi/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/fi/firefox-59.0b5.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "816902935bddf9cef89d47fb7feed02c6b7f08337683b4da9bafb578d1f86400d35d15098f545dbf8484704663184fc4d8d74958ea11b0c18413d0c70d29a324"; + sha512 = "c346c7e849928fde63fbae05ac91030653dbd43779ea3042f9fb202f028063f98a6060ae36b0ec394ffd5d5956d6d87af99d85ed89b9d08fe06c1c34207f20d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/fr/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/fr/firefox-59.0b5.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "2ed2c8619e4f0867f6affc319d6c1358a1bb02ec6df77150ec39959b0dfc6966b41b3407ec433c766cfe54614d771442b297bde7fef432df3f994b6390fedcd5"; + sha512 = "3e54e6687bae4b9c62a63d2d3749d47132939febec5be09f3e7cbb3633d2cb0662bef0c86e4df7cd678c6f6e8391548cf01d27b8eaec9d9a45434584038c76f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/fy-NL/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/fy-NL/firefox-59.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "0f7cb71c860ff34cc96fc273279c70a42a025ce12b05326bfb60657d612303e249d3c702c863d4d3c76303014aeebc11d87a85801944c06dad93af10679bcdb0"; + sha512 = "47e2fb7fbea44595e9e70c7739cd7666e9ddd02c822cfdab932974bebdfe542ef560a02f4708866a33828b1427a3e71c71645974481a3c7fa327af53f43c0cb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/ga-IE/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ga-IE/firefox-59.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "76fc1cc43ef59bddc28c308debb88224ad75e8b05398893b70f9c8e4f4862f01d9cd96a8a39892bd35a92bd580e7e484be45eb6068d3284b8b18d769709feac5"; + sha512 = "3132195d3f304fccb1df185d331b5cc883b9e3017e6165c5e87e4cbdbb35bb5bf8a7341d4fc36595fc33493a63741a32a35a2bdb8ed3f5525d8216f467fdffdb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/gd/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/gd/firefox-59.0b5.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "96f572a8edbcb37221094b0607828e84bfee59847b7567627c102ff88607d8d1ce1351f2ceb5db74f370910b9bbe5d3a52045388ccd8d3f76c0922c7a6135ed3"; + sha512 = "8d3603b4c237e725ea22aabf4d6cf8c28912d938836ab2b2440c12c3171f2acc27daeb143a8aaeee493471e956cb7a921213427a2302bddd46cd08ac29d73b16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/gl/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/gl/firefox-59.0b5.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "83474253c80fbe6d55c226f2ac20cb920ee3d2720f9ef27676aca4f78a3286a8b3a8e950cced221e7b7287dd222976c7b3bd5f1348a997a8f03e0f4a24190e86"; + sha512 = "ea4692cfaa6d3cc321ff871e415efa99521ff972c2b317249598268b52355acb8d7f19a9de2ab63a12d5cd8f36565cd7688b62712c828bbbe3b7132d13ef1998"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/gn/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/gn/firefox-59.0b5.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "efb2361f7d5a48467934629a69d62d4c5f0485bc135658364c665ab9f35e9f2d77fdf2e1a53b4166ed802c70b3256f4caba0043d4e75741557dd2d4a3465b684"; + sha512 = "7e574c7664ef33ca6d922a7cb4cf65bf89e5a63358a8b3c3630aefa0687be675b19bc4aa0516e524a84a25ead6852ce435aec3645894eae8f68e58d5821efb0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/gu-IN/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/gu-IN/firefox-59.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "c3786b11a9ff21c5de58cd05804dd44c3812012085a1ff57ea469f0d8e0001d92f9ca0ef7ac51bbd1251f96938fbef3080cea162b549dd2b8bf4ddb252aaef49"; + sha512 = "b24eed7e1c5d81eb7938b7da957b7f94b735111d37510d13a14bc928477a5868aecf3c3e0b37e3422c8a8bebda6bb30bc56fdf339cc718be0f4a478c13c12eb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/he/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/he/firefox-59.0b5.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "c472f7648618b50cd82eabbcbbc6516d8ae198747ecdd071f7c9fda02e8f4acc80961625663166e3d1b37a0c322886057d84923b3525115aaaaf23513c1004a6"; + sha512 = "10bd7ba2a8d8cc003428bf3afc710ef3e5a1fa8bbf24542dd764f622f74ba8a4f4e6f1cc0978c907f9bd9104d870f2cc38763d9a6d80b47134318d48fa0af90c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/hi-IN/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/hi-IN/firefox-59.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "cde020c3f8294d1e42ac78f736cc9f09f1095439b87a5069792e4b4016b6db1c6a944289d9fd5df979f8d756a08ec6fbae5266f8bf9054802a218e70644eb033"; + sha512 = "66c3151b9b2785025c4bb70cea9f4c12d4b2549239c3a2fbd96098c72118d0ac0306458142a1cc2ddb73232620717a03ccf84e27c606769d0725ad29c2a871d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/hr/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/hr/firefox-59.0b5.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "23569134d781d0aa51764cc6b3cd434d6aa9fa16d567314864bfce391aff688f3d988b9d892b0b839c4657e94e8fb44a70064452fa176fae88e98a00123736d2"; + sha512 = "9abfb9cce29b06b0618d8d5c5ec0a91aec78b875054e1b1af522e5f05546fc861a86493c9fb026fd5e133bd38522ff8583208557ae207b94e338fa8a2b153880"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/hsb/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/hsb/firefox-59.0b5.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "1c932a8531a72062ab486fad4eaba42fa4b43eadb0c77e24e62c3b8fa606bcd54802666712b27101991adc04fb0f8ac0ecf4be3560ef35c80fac1e349ec61bd0"; + sha512 = "65135c16685a448a374e1ef9eddda23e7a11167d72a4d66acb22f6f204112d45c2720d9f61e07bfb37e219b8d9d2264cc1bd80f75c7e3683ab69fb50a617a4ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/hu/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/hu/firefox-59.0b5.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "c789c24b4d1e31b3a19bc8821fc93fdb23888dc71e5ef45988b4b4839646b8d7538da96a1d8aff9191a9355a3d26e993754cb1fda088db6a1f7fc3e2ef136e0b"; + sha512 = "edcf63cd231ca163881d6ffc61cb6b21936b30a0c05286d8bd79e20f3b89cf727832ade1e799ae3067fbc0e84593da60fc0a865233fbbd65a16c887c6f56fb72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/hy-AM/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/hy-AM/firefox-59.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "f0662d37a492852acf7426aad691228ac4eef8476d2a3f3d7eed61f5c9ce5195cf52a28f4f4a2faa36870f3711e2a481aace4981ec5fdf596766f9ff47efcf66"; + sha512 = "30c9e552e0f5a369ea072bfa2518643199da84242f233367b2bff23c387ee18bf4b377f4539222b69885cc991410904ed2f725de99009d6c9e25f6cd560ed3dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/id/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ia/firefox-59.0b5.tar.bz2"; + locale = "ia"; + arch = "linux-x86_64"; + sha512 = "26ae62912440ffc4fc55799bbde78e2aaad0cb5bdd653fad0f7d2b7d0be479efc89750c5ff1b67f1dfb89540f8cdd16c5b3db446c06bdade2bf27e7d6d605fa8"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/id/firefox-59.0b5.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "f57b91a25990a3e06bb113d6c28f9f72049eed1811d4afc05fdb55eb1d6cce897c8307abd854696b6650c2ab5ec148be98c55f1060749520feb59dda362e45d5"; + sha512 = "b0a2c2a60550e478d8cab3e7608464411961ea4b561a9554d174165856104475432e8b2c62cf5e0dd6f9e893241f40d8479ce9bca5bb56bd2ca0206539fe50a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/is/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/is/firefox-59.0b5.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "af07f53a6fc9052af927e54ed0f92a02af0ae3d5b0d669224eabba172cd76fe96c50a67e692f7de8358a0e5a9815fb9a7a6290a24d71844b4d59522e4ea46f9e"; + sha512 = "63bfc964d60e59349ff1a6e9619ded97be07345cabdd95f372938500cd16ce7729c091e740bee8065f8fe43d3205f6b617d7eb90f2e9e3f956e4af59356dcb39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/it/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/it/firefox-59.0b5.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "d040d7de6a3437e6147ddb676dfdc60fc3eb3f1cae1b9f8025a56261cb2588f492de4b6d7265377f0f633066a09c16081ab599ee787d302677f39123b2a97b08"; + sha512 = "a9eb83e6b82b13ea962405575f849e9fbfcead7ee704bdc2076ac6578231d075c66273cf164b222ea38ade1412a690080acd297dc58d0e993310173d2afc3e4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/ja/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ja/firefox-59.0b5.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "c294c831cc7d3e9dd2ee8bb405aac5e91282f8f9ba9a521dcb66eab91fa674bbb2702770d2ae13d3ffbb8dfe749035d2ea7f1254bc85a904658e1f303f5f1af9"; + sha512 = "9241e09e3d13fd270165250413b8ca08e012e7ac6911fd9bca886d9a2d4d95d514f8842b6aef6654bcc1df54b7aec1b02a6a56350b56f2011e885c56540ed706"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/ka/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ka/firefox-59.0b5.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "f6d18591f6c75a99b6dda732ee661a17e93757ab82272904e86f295a831364c89bfed1d19ead3a4a56facf6fe35e3a1a246b9bd06d6f0a1fd7440d2042e2a4aa"; + sha512 = "5753301f447753748b26b1ceff617a5e5efdc9723415325d131abfd17f354316345713365a5a0be31bf787c0b34ad12e9d6be0d6aad9a10409ef0c21b45283c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/kab/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/kab/firefox-59.0b5.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "8ce4b060f4dd4bffb5faf4713c9be551df451d4f1c3f4cdab72d147d97c49632fa3fa58881e5dfc1d7ab0795f0e46d71d3395e8ed0c7de66478a2648dbe0d7cd"; + sha512 = "67808d90c284355a0df44d9386e902264fa44e36cbf3a043e423c30939d1fb4b7501889ff4a28799a31d5330c858958f4510b77f13ff2b9f7d27e22e903f9b3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/kk/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/kk/firefox-59.0b5.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "2ce89a9b0bd5e7832bc46ceeaa44d46d02b9fa2f27106775cb0dc27f04a0264a6da8f928051e3171eca11bb4657bcdd3f36d9c1fc777bf1ede0dd627c66e1aee"; + sha512 = "d7cf93cece39a033a541c44093253721de2846c5d5a1864429d009db1c6eee1351b525bdcd997a454dc551b647db6308afd5561ebd585e23c4ac528ebd47afe9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/km/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/km/firefox-59.0b5.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "b4e6be289c77b7f71c5088d51354994a9a43bc6698ec6a5e9e450d008122f677ab7eae57a8d9ba0e4737352437b242a4d724bb279bc230c7175e77a84333bd27"; + sha512 = "01b09dbc3bd6308304783c144bad3d75d119ed61a60c30aff821f28de887e05875e4718f30538dd0edba5abdc7f7cf4fe7d0592d29f60baec58d546590b9fff1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/kn/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/kn/firefox-59.0b5.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "c2fd931c74d42497911ad81d49cd7d85ac0beb63a2557a1035eea658f71b9b7ab2786183d5d280bdfa992d42ed2ee274d69a6b711ec3d69de22d6c28b5a90e2d"; + sha512 = "d1aed9ef1e98f028a2827abab0f581b3957601301d60f8dbf365429b7dc228942b329f148703581a3d4556cc7b9420065f7c5b8b18b7ef6b65c661dbf7bfc3d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/ko/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ko/firefox-59.0b5.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "eff2abeff7dad46821fbe9a1f5bd148edd7b41a9585f7e025d5a2d8bd56bcfae32d745cba59aea3dc623edb6883f1ee2153f39137bd56a9246658dbb2bce177f"; + sha512 = "bbf106777b4e8f41fbc84157e25f113e1703f96a1cddd63ab95bf08ad4057614318f3ffd85ab51c8191a20bce6c457d44c8f34db3484341083a8348690447217"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/lij/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/lij/firefox-59.0b5.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "02b51b90a82a8ca182f45fcb830c962f5259289f29c01800bbcb91418257a021902ec3dcf4801d14beec133ad6caaf403b9f9ba5189dac367118146c92a5180e"; + sha512 = "618b7eaa94b81420bccd0216a6b12eebfa0934c06fd3d415bf7f49e042d2a56eb8c90c59ed58f7a459cce985d6bd1b5e1ff19c2dfc86b5824a2e909a81a90360"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/lt/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/lt/firefox-59.0b5.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "a453917d412c54cbebcfdaf562c58d3106ce6bfbb18cd682505ac2aa93fb1407c921f8a1aace3d2b08e2d5e6832393632359e22b513a3fcffe0161dbefa38125"; + sha512 = "4a00c16b74e07c4b485d348f78b8b369dc1d069ca158ec8ae8cbbab416434b4129bca283c01a9880c19503bf332a12c520f266363a3212ddfb379c5a3aae74ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/lv/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/lv/firefox-59.0b5.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "23c2993542380ccad49c6f1f30c5a2a971d77385f40914aaf7115b4a6e2517fe8ddcd1bfead5b8d9234706c2f6397ec98bba71ab0868631c2e1030633d2637ec"; + sha512 = "c2facfdf8862c84ae1d3186d83d653982e9b0e5cbbdffa987ee83c72be8866b64bdad2ea8de7b7c7d2f301d7a3740a9ce6f0ca6facfa7552fb71956586328d10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/mai/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/mai/firefox-59.0b5.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "4608bff5d0eb0ee522993daf829736b39c7f54110bc2161216a040ba3556b413162aea2cd87ac384c4f59f917b3817e45c950dc55992419d764837bb5a62617d"; + sha512 = "0b83cd5d65108e126408dd56124965699daad192b318a085fd5e0af77864b998606e15a21260606785bdd49602e275595ff44c0e72318d37aa0ab129c413c947"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/mk/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/mk/firefox-59.0b5.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "b3dd213710c1724e88cded7618f17de1450c5051eb5a9e70cd0351416276b7bf2904e93139e50b4b67c5288423792f24af9dfd5c5120dca187c4b3c167e05aa9"; + sha512 = "62cb3e3b9dcb6eb76a1f26a443286b99a5d46f0d492c0ef0c5d93d85d7c0a4659eae448b5458e859ae5a2570f8b8a15fd10c033c49b933e1ce612e5ac7305c92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/ml/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ml/firefox-59.0b5.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "9b749edfb2b07b82e76ed184e585d5f3b98b57d48473c612c76221f5269e3bf1a3ac362612e83afff593175564f9f97167140ddab4f7fc3077b9d7fb61d789b7"; + sha512 = "4faf79a4cf834f51a3e0716a523b9f3b1225d32180222e357bb6ad5ab3ee3b858c7822cd5c5c9e468ff216cd5d7969b71bd18e111c89fe83eee95cb1696937bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/mr/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/mr/firefox-59.0b5.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "11c46d20d1de0863466399b305204ecc3853015587dba0bea5bccd64bc6790b9babab6ab2be83899e227eb350fb73780289c7c7c35ef08f6bc07bea38de60989"; + sha512 = "608a2efaeed3225c8a3f2609afe4160fcdb5286e3777def703e172864adc9b0a76a87889a7e93cde7f118afd218b5eff38b00dee923222c3cc1a044ba0ce00d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/ms/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ms/firefox-59.0b5.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "83af04f7f64dd90417cfdd723c112e23a1eabed5e1f23071f5b3ca1f46beb524c969d7025971b9045ff20343d239f8f173c87683fe4101d442db6407a1ac45e0"; + sha512 = "ea717a9bb9a8f644e66b8b0e0f28645460c9ac3a4f49db4c9f2f87b6419901d41e358f1f90a01122a70557bbd5fb4425bceffa8262e04c02759bb15ccff91d6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/my/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/my/firefox-59.0b5.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "eeb7ec6228cb834be63b3f74673c4c97c92a500f469421f632677f990c3445f2f4aaafea3c81ab3a4020bb6cb6f5d25744afa6bf796847ab0fcfe0afa4936175"; + sha512 = "71468ad6a258665873122759364af4bd9a9f4b9d4c02d77a02c13512482b044c2b00f4c18332560d78fa77b413e89cf1d7d6625884b4e52f48345c0b4f62d04b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/nb-NO/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/nb-NO/firefox-59.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "c28bc8c701a0a76ed08b5d993987a47d1ae990215eab388d4c70762b8c2de2731fbd567085b4381db95b16c45142c7aed3cfdce04c9e2d312bbeea1ec5c1c5bd"; + sha512 = "594054e80f00111076786e322d561cea228e0ef9879d59fcbb9c3346a10314ca35df7466e2e008ab2a866ec627cdaee005deeed8be17d85a1803c35c0c6cc989"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/ne-NP/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ne-NP/firefox-59.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "9ffab3edded6c0706a4c3f3f2c0ac602c3666b6b152014b4dcee8e5b9db1e5e10a2237f46087aab232031c3fa60d89ad5e088ea0a07f19d22de19abfe2eb292a"; + sha512 = "2fb3bacfc57f664423af9672ecec7ca8bc68207cfb809423120e894760fa3a4d388fed7398a6d66803707b8e0571a21eeb313b09df6275c8c3f77cdf2a39563d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/nl/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/nl/firefox-59.0b5.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "f5c82929a05b89c27e5e74c9e3e01f6bca63dcb312e49fcd2207612d70a5fb4c3986dfe9e27fcdba55163d554c4c35362b5135f06957a2f2812338f349e705ba"; + sha512 = "f1afa644f76b76c88d4607e08de50724e9dcdcd407a98e2dc1de4fe408fc6b1ac7beffd26174d1919bb4a6136c82d12c95d13c0fbdfc2cc4d7b7c5d519a6125e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/nn-NO/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/nn-NO/firefox-59.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "1f5fdbfcfc38f98aa02e85f6021ca47455058c011b56b0b3fe6d0768f14920d758fa998db9f325a2ed10e273aa2244128711198346f72df7dbc1d0e62e0738bb"; + sha512 = "b9a8a7ae6cb3e91c780a83219281abe84318e17906f0f4b47ca9300720141a90679a55438956050a54cf733320210bc9e60bc903fed4e4b5b6a41e0d6cc46446"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/or/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/or/firefox-59.0b5.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "0989f274a12db64b969a12acc0fe3ff0328c546d7e91f38a522bdf478591e1ebe83308d968d412af139200d0f3f8af876198c69b961b8f6c24c466589569fbb7"; + sha512 = "0b062d8b564442ffcee2617faf0e55ff4d23e56342c3602e6bdedb986542206486e776b701fac5ff31102e3dab3d7c68d6facb348d29476a64cda8aaefed3ba0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/pa-IN/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/pa-IN/firefox-59.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "a1096e4780e89f501ff9074615bfba63dcc66bf48dfb73c2850e10bada4c2af905eb0600120acb17d2bdd9e0c6728703f64353e556bf498dc1c7ee263ceae365"; + sha512 = "dd8154289d9d948db4a1d91020968b1f9502dbc6cbf1477d705396fe531a8f06f8d06289c9173c799be033e5e0f44b341b5029e492a8b7c8b0f81e918198d605"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/pl/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/pl/firefox-59.0b5.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "c7a4a463afd81270ec12b8baa71d4e7219f477280bd4689486df336819d9c42ac08c87c4c01dc255e2afda6515108b651ea782c5cbb89d2c728a5b13bf5a9534"; + sha512 = "f6cde5bc5bec287feb3882de991a86506f0cbee8f9ed2f02b655911a2e0d69136b615f5a7a0bc782eb3cf6f68d99fefa4ff0a47c7058f344a9a8e9aef94ae4a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/pt-BR/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/pt-BR/firefox-59.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "c45f4bc454a3d0b7f705ab986b035b9406291199fc0e6107c583dfdb1cbf81137b9bff064819f60d3c8dd463f3185c8edeffaa9d00ac242350c4c3cf0f7a8371"; + sha512 = "978dbbee8f116d9123d121d778c52e19cb95d1b7cc565b538e65e0c24257e568bc01354841ba97c642d4f832c1e5279a844c98044b5a5aee4b44e0641f7f4105"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/pt-PT/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/pt-PT/firefox-59.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "48673ddc509e34ac14abd064aeda3421220cb48653e305bf6a4594210584890fa6b7cc52090e3fa6c850468de5337692495688537cf1d804a73bbc0c2d85fad4"; + sha512 = "b634de4ef37db1b8c96a03149aef441844728b25430dcef579edc62798ea54da7d2af50573cfe7963bd19c6c758104fc8f1efe159fc096a8f0479b851239049e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/rm/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/rm/firefox-59.0b5.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "f18161f1d48fd7e6422f8f662b6083c4ee371d8c574285b00c44b77c131c244116fb5ed9ee47c86c594264a40fb68f9a1eddd460c8b29175ee8c756e971511f3"; + sha512 = "64d5e36a600dc11aef92d6a3e80688ff6f9d6fd03c17c94ccfa5cbefae3e05c2cce0ba86286861989bf1201ed05fc373de327953c944e7b3b692f4a670a3ac4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/ro/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ro/firefox-59.0b5.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "95fda39af2f819974ebe4531f697cd88e204fda6b952e58c9ff54f0435bc3e43c2fad4c288d1f1d38f923c95432aacec7481a07d03bd344391ddb9ab8a013704"; + sha512 = "8a4ef1a88ed197f3fa8042faf34e234d7b7fe6cd61a54a19aa19244a2b3f56da284062861978d7711536ed7e4722a3351d31d3f73a1f8782a2748f52d7197e96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/ru/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ru/firefox-59.0b5.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "72d0f3c837c8d5083eda8b1f315e1299298ee1740357df8e747cdd85cc2755c3c8c7b669904f0d89350bc3e9e39ff7abce71e143cb2c1c957e8f7aa9ec560c39"; + sha512 = "5b43553eb9cc67be6bc5d7b0341d8f9f7df936f6a918a5bdc229c6b1e478067eef34eb0e593c2e9dec1724283e32bc8b6ef77fa93a3b20f367d5d2445b99f439"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/si/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/si/firefox-59.0b5.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "4731b0c11f9c57adc0cc1aa181aaaf6b7d20715349a048fa0376f9431bf06eb0fff6528eef42c509f3132854569dacd1a9285e0ed9e9d0fe07c680d9b60248b6"; + sha512 = "29bc4104a50c28b2b8cb7e7d7e652bc430dd42bb719dfc6d81902a2a5c5bb0f9ec31cefdcca2c71edbf9ff1f27f91317ab04f89e910ec6cdf8d7bb93a46d80a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/sk/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/sk/firefox-59.0b5.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "6b84ce8ed75aa95f2d367c8f62c12de946556623295f398f4d9d3b6aeabd4d4b3c28e0838468b6c7d9f60bec3a5b2f4940c1b1cff5d0e3624658f3dfe9981303"; + sha512 = "b84bf339d93296c3c2c6debe1bb5bdd6dd1873c21f2345f81beeede0f6c68f5853e6ab092c63d973010798aa0f74afc81b1c4a3433ad02419d81475e73951ad7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/sl/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/sl/firefox-59.0b5.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "59cdf3c4b437ed31d98da60e22edd1c4e62ae31a60dda3ff9bd3c4a92d5ed3a34421390489c228c1ef80031a80c60fd3ecd7aaba7944ea93d141501854672610"; + sha512 = "0fb0878e5addb1a66530238ace042dc5821e89ae23ca2e9404b2c41b66bd56b9764bf3babaf9cb21c7259bc32cbabdc52372fba84fabf1415e783b06dd9935e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/son/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/son/firefox-59.0b5.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "36154bb7b9b0ca836527f1404b630569b72a642029a3264949a7a885d792ae28b35fa22b89a971901b148a804c80e965d4b1558ed0058b0e66e22af2cf015645"; + sha512 = "5edad9a53752a63484b3256eaac74832fa34d46182d54c5dfc71a5e7c0d7b0e2308209e03f5ac118e9870913d02815f25a3124b15cb98c2d9df190d5c6ec9f6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/sq/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/sq/firefox-59.0b5.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "43bce2f0eceb5169491cdfc631e75ae5e273f80e6c7a9ab9890eb0cbffcb3c2f7f6b09da2084661e6b7b61906f71dedccdf229b2b78f68df9a1c234b2502f75b"; + sha512 = "53eb9336acd2759e5d4022dc5924010b73d0152342931dcf8bc97d2b9f6bb8f3c1f6512a004796558b74144781a9785a380ac3d1786b66f95fe0b0394f474663"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/sr/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/sr/firefox-59.0b5.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "08556ab74a39e2b1ff07bc638d9b2a85480a03a817051603e21ab887f26437bb8302c91f480ed3197f541b561b5fac8b88640255521cb08e0280074716433553"; + sha512 = "60fb87b0d71f879be495827fae12987de865863e88dcc623642093b287a8a7dd959274760f78c1b824b8a9e5282badad49811369a5b575fa29e993f5f960d1e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/sv-SE/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/sv-SE/firefox-59.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "9e89ed67c45b4181af902e13483fe41dcc9c22642b199da7945cd43be079a1fb372badd53c4262a6b7856c27168417b8be25255a0707899d535d2243679f8c5a"; + sha512 = "8314d679716002e4bd162a5408a2d6286b325ff1b08f92a455bd33399870acea023bd31693d7c10469d853c134e283a87bb5cf0dad2f525266f882581ba93ab0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/ta/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ta/firefox-59.0b5.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "a1b11e94a92034cc9d8c5653de97e0247cf6eebe251e41f7557d9124cb039dbb79942a974c079eedc0e4a5673d8ed23e3eb8bda795a655e25b2cdc6adff83406"; + sha512 = "4ac7867c2e6c0e3bbbdeb38254e8c425b9630f314ab78a177a9dd83d2aa7495a7720400ba4095301fdace8179e30b5b15ab6f67d0beed7b026f581b2d0143bb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/te/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/te/firefox-59.0b5.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "72518b346cb1104192df57e3ea00a17cdb1acbbac97eda8927e617638d42f4d79ea9c61aa1d2bb3b7e406c32a7d4c025114f645f6ebea8a59b91904f747d66d9"; + sha512 = "717c6489dd2863e39a9148b3394c81e855cdfaabb01aaaa90729797cf53760b8003c354eb9e1b98a453f23f2d2173bb5a37116eadcf03ed470d5670e562f422a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/th/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/th/firefox-59.0b5.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "013adb9f32f9fa8501e76469bb729ba957b6803d09a2692bc70139d52dfd3b007829926a51698e3b177cbb91800aa343449270f1eb5462fd40bf9803f4ca931e"; + sha512 = "a2d6fa4f9bc9327afce0aa74d8fdf6a632bd40158b3b9dff3d553e18a79fc893bce74b45e78ddb42ff913c3338d918a552058a69a313975fc04ecd832595062a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/tr/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/tr/firefox-59.0b5.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "eaf87dc9f4c5de80dc715d44d532fb07634b77be37fdb475790c2721b34efa7711854f63cdf999f0032b0c2d5b0b37fe8eeafb219b79157ba2c721e97fd1f8e0"; + sha512 = "65a01e7b7777f4e96b8fc195d17ec433bad492918e3fc2978e945c6d5c8125f10e4d7ef1356fb003381b5bd41a1c2930b249065822d1f461a185c70b11455844"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/uk/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/uk/firefox-59.0b5.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "1d9f7420d7f7ebde6c848267e8dea5ee1884d9215f379429cf11cd9e6ddfc6cf6e188a9cf5254fcb09859f94658944c9334d15a0616955b9e2d067b9a49f0a9f"; + sha512 = "38fccfbcac23f03f3801064d4cbd10fac73aa1f14b622f6d0cf01582a2fe4e5b18350b1fe6d338266604823af61131d830d2d673ddadd51b45e2beb2d201e18c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/ur/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/ur/firefox-59.0b5.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "50baaa049d08d5698158d1ef0d49edb3e591671966eefc64e85df17748959aebd8c8d63e0cabf15f1982cddde705bf54ec93eac3f5b1bee2c8adf57a86395f51"; + sha512 = "5e8becb32d19c51673cfa6ba87fff0790fc4bef9a885195e15b7f42272c486b1d27de4f3e1d09ec9817184620d66adf8c42e61692c80181ff497cfdca06ae584"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/uz/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/uz/firefox-59.0b5.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "c12599625423b6126d652c610768dd5c9016294e65c272a1e0dfdb0c35380b3553d7d9da65840ad0ed6985fcb52d2c090775a8754f7cae2be4257a3fdf5f6c87"; + sha512 = "2076ef96b2a4dc236234f33e400b7c3406d0fba417c7e1d9af5dc1f005ad2bf09673b3420cd885a23a7e0113b6fbc4e569a655f8cae6052448d7c7118d46ce41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/vi/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/vi/firefox-59.0b5.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "a698b0ca275a1cb88d05e5c19863bb36487e548d63319534848b22c2c4cad7a8cd7392d8f853fd026c208d2b9174fe1ca1c29a1b7d70c98cdf023b7aceb50552"; + sha512 = "bad0038493b166255cd25e500c6a751fd6fa9dccb72dfc6161660d5bae2267039ea8a7fee4c54e58cffb5a2cc819623a3239a5a49a07933e4e76340cfc13960d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/xh/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/xh/firefox-59.0b5.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "8ffda2bee53275f9e95109dc51cb7c49dc67ff3f926c3c0db316d5cc7c71d35acbb2ea5905ddab246751352f1f3b0329b170902ab33e202301345ae150264d8f"; + sha512 = "d3b9cd39b1f558e63c34ec9cfea0348e4aae20789fb11059a6d9bc39b47dbd66fb79b24d7d296d665aaf3d42cdf672ad73e832b39b4bd5f62869a3d8c693c0d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/zh-CN/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/zh-CN/firefox-59.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "037fd6cb89b373142b286983175c9099a916f20e38cccc9d10f236a63a0b76df9664f108b0265a23e96723a0e38e1fe634ceaa86e9f6b0ccb793b0f0ec0131d2"; + sha512 = "150fe754440b8fad0b372539875261de4bfa46dacb5711a672fb1016b9909929378a5465b2500c79fd6d5babe5084050044d9bf1722c8ab5752549b081245bc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-x86_64/zh-TW/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-x86_64/zh-TW/firefox-59.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "ccd8b648f63b9f1ecc977154c7814933772a3279bb76ce827032058a9d12febe44e5f481f83729bd7117ad56f413cdf2bc5947fafd1ce424e1d6a423325e8c4b"; + sha512 = "b0a6f82e4f4118087a97daf4e8772b9ceeed0fe537510df600e88abe5a9d6c6b81c85813cc64b19df9d2bf799c042bf1aeb9e2a014adff0eb08c937ec113b9a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/ach/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ach/firefox-59.0b5.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "f3e094cdc6065b6063f2e28c3fe0143837434623aa7e54b1c14de8cdaf2e9054ea7cd06829f5a229485fc827ebfe9418fa8e28acd709da6542025ca96498564b"; + sha512 = "7c9a45c296acf084fd8c4ae9203f6c09125dffde389f5cdad903c4beea09e379a4e2f55fbc292fffd6242cd5124bb9fd865fc73c4d738671f6dce27e2fceb38c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/af/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/af/firefox-59.0b5.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "699afe3559f0c95dd69721c862f5b091f380fa058d1efa30405aab171af113406c6b6fc74e6c8f98a903c317581a4fe9de2e6da34719efec9af0e745aeb4632e"; + sha512 = "3964d406c54fd20c93fba2a6fa967670a0e866c2d05e1ce6e4a0279ef355ebd65b1bd9b730d0c2d4e6bcf56bd72d5d543e3ac8c2824deec503159c96ef434227"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/an/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/an/firefox-59.0b5.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "41d228dc01ab5bf871be78918ce079b72b21a5218295534c4639ef319ff2353bd06df92489c38daf93fb43f171b0b5e859d59bfdb06074ac203316cb9c957e77"; + sha512 = "b6c5873a0e42d171b46615c751b3ab2fd8b668aac0d95da0d4c8f5f64514780221ce373421f5ac3edc44bb185a319f34f8d970703b0e44ec413512c6a337955d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/ar/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ar/firefox-59.0b5.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "c5ed77500869d69477f4b70b70094adb304abff296082a1a577917972cc877d26d6f0786a3b4521f93047d4b84b79b01be74d496877db1794fc42d7f6d7e47a3"; + sha512 = "9f3812eb426ff05eadbdf38a67044365de649e4954f33642947222ae05e273d650b54ff3d4fee6d4fbdf6b7145df86d3bfd45de2d9055cf7b1555c3d903c7f3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/as/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/as/firefox-59.0b5.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "8e14b7113eeecebfd6ef3008045991534cf4fb4507347dd6c3cfc0bf9e1f54ab5a137fcd020ffbbb6727974afbeaf429927f8e5b158bf72c9e8d1ede86c97ec3"; + sha512 = "c32997341f7280d3481a586747cf74efa2d136b25881d5cb1b8efdea51884dbc82524ecc856b14f21c8d70a95bbe1957637c3d74c7a22adf7f595a8af90b05b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/ast/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ast/firefox-59.0b5.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "f5f5933d80193c644c978c1f6734ea2b98e054ccd229fb27e99e68859f818e739a13ad46eee511169c8c64e647e4c5aa3c2ccdcd5ba2fd8e21ef72616e1f9446"; + sha512 = "991cd6ed0e8470d3896a103fd96faf945dc73357d804552fb6ecb15144aa7a75a0154974be0a41997343b2c7e55eed16f1c6d864f1d556101a9eab8436aaba8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/az/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/az/firefox-59.0b5.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "4e952384007906debf50382d2b009580adeac958b18a958bb9a85106ed834f03e63b309fd338369877b0aa412e838c1c69f8b9ec7a63efdf9a8326df1333bc4c"; + sha512 = "0ca184beb54fcd0a494ffef3bea069db2bd2d834ae09d1d30073b951d0ed7556d805bd9d2c90b1343e3522872d6be4a2f913f17a7682e16fd88dc3d33c9892c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/be/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/be/firefox-59.0b5.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "b515208a117ba7fda736c4d3c25e3f125e577c999764a73d41c4827f3476d35ba0578f4a49afb6293b2b765793e35f2a0dc63e1c36240c419184d49bee4d118a"; + sha512 = "5ba9d89726e051a3d2b620bdda0dde16d79c3dd8fe8bf3d2518c4203d3c5109052560ee41e288dccb23bcae8a20319165274009503931d9fce04085376b44d4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/bg/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/bg/firefox-59.0b5.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "d4e1366cdd0a4b5d629a297ea2800988c1629849a98c7ac30a3625802f928fe01a5297a93a63b3d658d81757730b2595231b5edb3f54fdef444454d24cd1e30c"; + sha512 = "3e118566762363f5a28acf0db68f2579dbcd8671bf6422583e868c50e70c8b59f7bbf847d4ee2a2b01fe199d0f0b7d2ddb3f0648a4726e39320744dd097cdfa3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/bn-BD/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/bn-BD/firefox-59.0b5.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "aa13e542813c062ba1486d96516498bd4c8aa881df77331bc6f74331acc39aed4ba4db7429984159037012d24f05ec5a8a2b34a388e601fb0cc89f45f422de5f"; + sha512 = "80e0d0b8199bd4ce35d2b9e88fd7602fd0c1f232251fbde89376c77cafc96cc75833d9d0b3756dbbe6b538bf237d57fb717b8ee6da4ec000540288344fa059f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/bn-IN/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/bn-IN/firefox-59.0b5.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "99287ef30c8db3fb88d0ae913f9aa84de851ac83cad54feb64e60189b39f009742ce2e8d34c327a54aa5c53e87898ffeed4ad18762022a865257af6770d22b9a"; + sha512 = "f887684ad0ab676a063bff238bdba8e0a05e6dd57d7472b7a834c6443f5c5697788cb408ba11399f38b949da0d57b4a9e90bcedd032b3d5fd9f6e1029b6657d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/br/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/br/firefox-59.0b5.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "2c71ebc342c69fe22832411c0bde59e659d5f7f022853fe949b706bdf628542ac343a6b80299333c855288f1f3f1087c30faa127fb9d86ab714b05314c88c90a"; + sha512 = "50d422b2863e3384de0c7fdf5bb10abbaf878c047532865226d6af5089e8a87c1515856e3ad294762f2de0335d18fdaf9efaaa7bd95245ac29a0c663aa73bb57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/bs/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/bs/firefox-59.0b5.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "0f9f072fe07326721580d40dd672ea666ef40413c90f72557aed4c69cd616e9c98aa762ebf6b75bf10acb2ce39843c233752cd9474e499a962d9f8a9cd6d16b3"; + sha512 = "2de27aba569a25b1f45a328b255c5bb7933fce48b0ed1c006d9befd164b6ad7af26b255c9688dcb86dc92a36b35d12c0be4bdd91e4ef08a398259eed2ae6d9ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/ca/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ca/firefox-59.0b5.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "9f83d72bf220f89262f52cb6be293363d7c9e073e28143f65cbe842a4ead19bd2f796632eae380c3d758da8b2c17a85f9ec517031d1fd6ed08896c444a198b24"; + sha512 = "70ec71c259b8f5935d0b603d586e5a71d28382e848543d81eb7a004d38530b6107be6ac63be2d908b47110110ec93331fadf33397ee5af057df35991909c5f36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/cak/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/cak/firefox-59.0b5.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "d36e73b81ccb2fad9a407aa4d89f99eec51ca8725945195fbba188f51be67cc63130853f9b8fb963f04d7cb6d5e9ed3dec7a1ea8ffb01ff1b202cd89f74c9ffd"; + sha512 = "ae1ee282f71c133fdd3cab09bf44da6f1613ac4eb6679747ba3922b4233f76879aac57cb88a976b0c1135c08914d8aeb024a88cd9e6636a79e5010bba1d2221c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/cs/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/cs/firefox-59.0b5.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "3858394f24100f934cbd38493f6d204d13b017c802bca78c718c38f7a7e8c8f860ae89f6d1777227876bb5d0b891c8fe11cd1efbb89573ecbd2db474c31766ec"; + sha512 = "d9f5f4dc2117c98d08d28098221356bdb7a86f2c48a9f2fa5826618a861f013d72455d14706e05784c19e61864241a923c7987d3ce5fc9703502b80645e81546"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/cy/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/cy/firefox-59.0b5.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "bcf7c75e67409802233166973146626665a13a291f775248bae99fd8358c27697429c580ccc6efa0ad171b5e522891ef7c4e090ecce8a9bc613a61536befd06c"; + sha512 = "b05a5ed0231a7c36f179112318e00a4905120f4174cddabdd15e7425b669d7d9af319cf4fd81d87865afa7a9c18ef4fbdf16b271133884ef4d30951b19e9c266"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/da/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/da/firefox-59.0b5.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "e8fbe6719cb8b46bdafb6913581e54f2b621382555a03cfc079fe8a67214d49354ebc234bae2537a473b9cd2b3b9651bacb1aa29a152d2a4b3b9f119d8aa4844"; + sha512 = "280a4a86b21c66757b0b21c5a1620720a8d395052e1b36c7f4968a628c2b44d6131e93eafa17c33ca5e02a002ddcd21304983f02768e3f03b854f31fe9ecc509"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/de/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/de/firefox-59.0b5.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "d8a478eda3aa0df4177838887212296b0bbf691fa2698e936cb010ccf7b43a6ecbbf761aeb745bc253e3c2a489571c42b9e356f2c60081c6fd3624bef3817820"; + sha512 = "48b782b1e1dfcd68cb5a0529a3cff471178ef219d622db1d217adccb4aeb80d0574e10fe07eeaac4d709e8ff8425b60892a9ddd5dfa090292fbaafa047fc420a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/dsb/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/dsb/firefox-59.0b5.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "04d1d8a667a234d0138f2e012b1a41b1e687009827e55cfeccd3110cf2d1b2affac1ade63f49e960fd8ab5a1765791f9286d642b402ff5f427e8b24c5d8488ba"; + sha512 = "b2e9c73317460bdca82d08754c591c18a6b078b14f8f0a1f0544040ab618d22215d014d8275dc1a4d9ca4e36201a26404006dcf8ac9443b383afcb6983c07005"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/el/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/el/firefox-59.0b5.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "cb2a09b981eac89ed98345fcd062ae4fa6f22030fb788dac4ccd56c604f1a5ee4a57993e65655f454b90fd975a4ed3abbedb2f77a2ed1037f60e452af70ecd82"; + sha512 = "2bc5f65d92b3dfa86485809fd92fcbd61bfe6fddb28a928385ec54527a4b1beed9d6db6db987dadaedc17639d1d1e2a3e5d8f1cb96f55f20b203c6e537749159"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/en-GB/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/en-GB/firefox-59.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "012330e70833e0bb9cf22a5bd626c13e4408fd1db85a34ffdb791b1d511acb3923bc8b0118319db55c905e4278c75c6b5274f3a042902492427ce38470691603"; + sha512 = "6f85e6e2590f181f52fa79fae12bc59a1d53c44a8df75e360dbc7dcdf4078d02e6d34b904c47b214f7c23a978092b995cdab92093b85432907d28dd0ef054bd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/en-US/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/en-US/firefox-59.0b5.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "25978b191744516a62a4192dccacdb0483fa32c4acb3cef8bf905bb61f11c9070e29fcc58339abb05c89ae17d14ffea27b68ed42d72fa5ed95f598d3158cf218"; + sha512 = "2d84381da9042b0682377660f8d524f503c4e71e2002a98d2f443d00d0761ea8aac59464a54b7807e6c133e7aa9f983d00c6fee09c4020dfa15377a1d662dc1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/en-ZA/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/en-ZA/firefox-59.0b5.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "393b335107463d79a3ac1c35a2d128b8f919ae7a06d594fabedb4ec18f9cc7cb51e567875e36cdf1ae05e47927bc5b309031e9ecadfd0cc20f412353ffa2bc83"; + sha512 = "d38ebe9d512e64bddba19d4ededa6a9df596b43d61ee7b8d06c183884639d693a1ed7f1b2086027f30cbeb8eb5aadc7f8a902802c827a31751985509067ecd6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/eo/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/eo/firefox-59.0b5.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "9edfa52b507912603114f79b0ce5f077bc77f2825b3c2ac3b156524e8bfae031170409c64dd3e4f88f5365a4c3eb7117e6f8c3abf0b133a40f174fd5303c79c2"; + sha512 = "8f7d50d14c75137d61156a360330e8e086da96fd13e1a32bc956f93f5c3361943b8011ec7ce95ff1c45194b0adcb980d123d0f58e67fc7e1b881571d81e68adb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/es-AR/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/es-AR/firefox-59.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "6daa886d4adfd805e27819a7798e450bc6693a78dc60d7e4efb48acecc19bfacd12e07861de7daad414f620db01224f89c6b71c95b9a230b7d3a10c6ebf81f5a"; + sha512 = "fd3bf685c7ef048b29fd10131b1f06ee4de9f5af5704ec1b3ed657678ffab6aeb901fc64a6a9461ffad4ae6fa8f04535ff91276cf15a886642821ef5f739217b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/es-CL/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/es-CL/firefox-59.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "20c09c13bbb58afd7225fdcc765d85b03b937bad210235b56bf9df6ec9f5d0c49c6218b05a5f640ec5f54d41e056a4559e7e1f451a4c76999153b5e84ef10bd8"; + sha512 = "e6711cf4073c120228afc230aaa4ba45da0b93fb7bfc10eb48f0cf8194ac9022aca243fc9457af208c5dc8ad2702eadce88fe1e598b86ba6c2f34eab426eaaac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/es-ES/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/es-ES/firefox-59.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "64d69d56a6b4981bdd69a937584cd8914349031931a944b9a303dc657ec9636fa58db0bb61824e9a863f982b5e2e3d518c1c7a54fe7cbb4d03c1a7c4466d68aa"; + sha512 = "939eb996a025362181e89e1a978b6cbca4157a84f314c3f75e43e5f041738548a467ff2d8346ec6bb76305f40856b8530803784a8feffbbd8cd3d77cc0a28b51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/es-MX/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/es-MX/firefox-59.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "10c0601892f9aa0c2ccead0307d1c0f257a5bd0a61fff08b1b4423fc9ddb593618a4e42c77d6068d3f56a0d92336bc5b6e247d36054b54735461c5583183ebb2"; + sha512 = "f2e13cc14f3356ea205b0553de6a856cc5ca65b3ac2ad64026137e4fd018df71dbc308473fbbe8c5d77f63c813351fe5f8392acc14a90ff89fd0c0f971c4ad7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/et/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/et/firefox-59.0b5.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "d8a858e9018180239781fe76908a29546eb93586c9a9cdce4aa5e2a168ee8d6866e6a1af4d233f8c7f7399a6d8248b97f9ec3e783d612034576f215c87a6bdb5"; + sha512 = "305dc29de3ba9f73deae066963c6d1c687128aa2f132ca1405d09da04b6a0a112d9b0353f9b59fe0503769301fe8cb14fb469e64de8d1e313ff3d415c032e33f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/eu/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/eu/firefox-59.0b5.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "05125dbf6a01321a5f38d59738cac2623f73300d419bf5dbe933091bf812ee790f027bde43dd991840407aff7dff64e520f61e6e03d989fd41978eb0957f7696"; + sha512 = "61134d922d05bb5599f70106128911e1e7beb8430f1f9a100a5a32f02b6144d6313010e6fe29f7c422af4210c510edb55ffeafe4858ee7f1202f41941982f784"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/fa/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/fa/firefox-59.0b5.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "3eec2fe8f3eda9a6695768e9c887caadfae254d5d966b5327ed6108fba5a290b0d5d5dbc488dd3385b0e29133187d26b35ca03948be715efb89a3853d5dc7d4b"; + sha512 = "83f3ec87151cfe565a3e350ad98558741a6b4e8c72b5f36e0aab07d4ac26ae2b4d6622f0faafff8ee1a6f851c723349bbfbaf175f209bd97ae8bea2c4ba811e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/ff/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ff/firefox-59.0b5.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "eb4d69efd40fad67ed4f43fa20f526dfa918db7a2fa41f0865d9f282bfbfda0fd6a014eaa1d83c605121b2456746a77a471718c0c13c05a3961cd1e5b139e962"; + sha512 = "99f781590e7bc8ea63cfe13e3fe56e1f14346caa4b3e32d23d53600c0d4ea8f55bfded6ec422ad8b41eaa47313dd3726c952e547ddde6cdb17f6515308791bc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/fi/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/fi/firefox-59.0b5.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "7553c9fc9adaa698ca8773e3ca04d0efcf228877c67e4be0b58654fc00f474a10afbb3bfcd03d72f8b371425072f67da3106ee408f7727701203a769ef42365d"; + sha512 = "27de47eb3ec0ed3517ef6a3cb00933a8b891f8f1c1cc0e9c4a7ae2b732141c8872dd35c8a54bf6c5ceaa054360e053f5e52dd2c5cbe2f5ca4156ccc8ea337c84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/fr/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/fr/firefox-59.0b5.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "7f96af0ce3e7540df48b1984254ad341ac77f2e43b616b2195cf578e0ec454a0d8fbf8352f28ea12c2045ff891bc7374751a915c75fe4fa0dc736bf0f554b809"; + sha512 = "25fbf0d23dff1f37d069e34afa3b8249da51e33522013608b4e623b0334ca63dafeebbc6db5718ef829282a78d0fd06bf00d6233123e0f405773dc1188dd4615"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/fy-NL/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/fy-NL/firefox-59.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "39337f585ee072a17100c3bb7861c09a540d9640e700964df9fe29ff33e819f8d7604a2d893a23aca8b01241cc8107debda48804c1a6909d8e06ad8fe7bc82ad"; + sha512 = "e82bdef3a02f356eab85facddb6a643a0059de873782691bd663d741f29f06b223acc6e1d1058a5f8a0692262a764ad019abd1b77b1d5bd5610eb9a338e2fb43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/ga-IE/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ga-IE/firefox-59.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "7938a38fe5456773b7a4a8ed6a0861bfd1786468fc1d40518533a4f7225dced86cbf5c82dda851f70ec802d2688800a1bcadb6c7daa49a33815ed03b009e49d6"; + sha512 = "36e2a43da67b1f6e941ddc5a68db953186af1ea0f505bf4a1affb70aadf3ee5f9a61562d66fb87007ceeff87ff33fe5244ba1337f83ee187cb004b9859b4f2c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/gd/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/gd/firefox-59.0b5.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "efd1c0d527c0738dd430a2f887d62c0451b0c40d4b7dd7ffaf10e6578ad604a72085409cb6064d925503af809e37fff9b5d0624970a8135b2c1a651e1f915669"; + sha512 = "45bdb9aa59647238d457ee1eb61ce31777734b1054a7045b0ab917cac82ee0636aa033a578492966ed2c405890743334b942c962cddf00c7aab7cc8a2868faa7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/gl/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/gl/firefox-59.0b5.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "b9bd0e5748cc259d116d4d9418bc13260d40b732372cc3f9a3fbb90a794b298623de87f19d6e80a64f2b906ccb07e156ba7be5883c34c6c5b6457fc996bc4ec2"; + sha512 = "cbee32deb9cf59e94f6144d88f8b78d053fca294f050cca739e81c5cceb33d6c34153a082413317353bf5e792c8ad1c34a3db34fe2bd5cdf9c7f59d70d050d73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/gn/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/gn/firefox-59.0b5.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "c8be7d6c00eca42381dd687a417a765232297c02bf4bf8952889d35bcebb412a431f7aca5014550d938efa9f71366296ddc701ddca2eb2370ef7ab7f9b355d01"; + sha512 = "f824fe5a4cc0b56e7d479f3f54f33ad939e93c9911c4a133e567607b325c75b36e0ae40b2c4ee52eb90ede34f64fc9ef83e56d86000194e453c76c8cd505e43b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/gu-IN/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/gu-IN/firefox-59.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "430b4c9d9721dee95f68726bc4bd92dc9505112213c76119079f7cb9d941911840fbd3f1571e061c4519ac845802fc47722a91a745b52e500a311b305a44392e"; + sha512 = "2706befded2f4ce9c7bcbc907dd634ae90309dc3e55849b2862498323fe854d563f7445701e652d7205e41f3bf23f17bbf7e7c43ef8e9808cb63f873d3a5b343"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/he/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/he/firefox-59.0b5.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "6b5186fe538f7868ebf8e1de3b1c9a63ed111b9c808a702fe6134f46ec7f0c7c815be781df29ba040c921e9d1420b127a20f2d5ca91fa0e666cf43d5da3bf65e"; + sha512 = "572c907f6c8d8de9da98a68d74b50a17f073aa2af45d7c6d3af1e637ef9bb7192804ac89bc77b10a9e99dd0ecfd1eeb8b5594473125b1265e41ae91da1fdc3ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/hi-IN/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/hi-IN/firefox-59.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "a9785a9c4a4b26bcb0a681caaaade5ffe37a31aeffba53ca0bdb3819126819374c3e1e370f1ec4985672812d8aa63dfd7b59f0caf4bb4fac367ac7b5115830f8"; + sha512 = "48d3b243d4b656f6ffaf18d63c549c71a530f4a252f368d879f5c854ea8107674b50b4ed4bddb5c36d937b7652bdfc6150672dbaf639eb1efb1f2982f2b8622a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/hr/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/hr/firefox-59.0b5.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "b185347b18b460b416e69c4437969ee9c6359105d4ea82fc8cb5841cae5d6c36437053ad44256511b4a402d731230f20be23dd58b273340e4425c604bba5f61e"; + sha512 = "18d4d5e1892fdb647b4decc13e4e48b74195f924533a32c1e7a8387e94b51d02da2f7accee7420d8112093951a311a7e871c8547ebcdda4c3226f4fa5ce294a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/hsb/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/hsb/firefox-59.0b5.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "0e8f3b5680e293c5bdcf8ce03edbd22e6997dc17caad151e04f23882fc82fafa97712ff9e5f508364fbb96af7254aed3bbd9a14fe980c7024506278d56fbd52b"; + sha512 = "ef3cdf002efcc9fc2c3fad7c0ee0e098b0a967f610066d7efc180dbadb30dcd3d0696136391f15a9304758fb610a96cb84321d9e40bfe28c36e7f43a96e1d7df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/hu/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/hu/firefox-59.0b5.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "0eeb16c484ed3432976a51503b686d96851cda31a38f975483cef0a003ed657fb283492bc2c9de7bac9752e77c6bfba67f33a37237b61aaf03b71700fdf83a13"; + sha512 = "4bbc24ab9700af5449709fc2fdc612955e3b75e5973765c698ade3ac9f041510999033edf5a587983ad62574fd45eac467043b1a1671133cf5b9ac07834e0ae7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/hy-AM/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/hy-AM/firefox-59.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "4d83bebb29604fbe87024350fff1bb0b86dd7f66c856dbd5224d2faf3f6998664e5392602b06f883aba0e56eeb6b64773d667934160eb911643cb37fe30ba2d8"; + sha512 = "987ee31ec5ae384c6f6dffab7583a246f1d67fb94aed09ae3d389eff8e3f6d898fecb2afb0db41ef7521ca5c8d8ae5f525071fa7931f83524462634c3b3d049c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/id/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ia/firefox-59.0b5.tar.bz2"; + locale = "ia"; + arch = "linux-i686"; + sha512 = "e419094a4bffba6e1ed263a14a92039d861832bceaa1da6eb91fd2ac07f625736bcfa483434f303c6370a8c4212f32365bcfb469cf8183c6a6bdae59643ba42d"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/id/firefox-59.0b5.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "ed21b1236462707e2b38f18dfca4dc3061a77dd60976702117dfe22dbb725100fc9fd4a53eb5e3287edf3293c9fc30cd917ea2e7d743026854b050ebe4add3da"; + sha512 = "c65d19533e0e9174a5a290dfe932284109308f3a9a227a59b533ca5d68eeeffcb064d52bf407baafa497b1b569cbf03ea4f5565d6e39b2886496d2bae9aef2dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/is/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/is/firefox-59.0b5.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "0ed77c72d3ae08237d409550dfb231ed8733656937ed1f569f66187ee572420cc7542a72ec603f80b75abd67f0bfe2516a5834afc181218944b5190c8ad878f0"; + sha512 = "19452bc2f73d53ba8eb6d5d5b5a67540f2130a43508c7841b1e724e143783f973458ae1948e71263fd1bd9ff12dd717f02a6c6e57ef7b165d189a7428bc00007"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/it/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/it/firefox-59.0b5.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "ad203cd18b8f473cab6f4471fb7ef1a00e017f67742163473eb4388401b7e0339a9d936bbf77e1497b5375ec047df91bbdc257a27c52071233470d9ff80f9bbc"; + sha512 = "577bba4202831b92ecf74484016c5ea0cd9161ee64d6df2bf0f81f6ca88ae718e64ada78d8d3e190dc3a54aa9ae15881b34e04949f6c6376bbbcf59225a9b6ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/ja/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ja/firefox-59.0b5.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "efb8b739990704dc734f5a543c42e2fd10c4c37beacae9b8922e008a649c25d92f189c717dd41f636bed8339fcd6a9cb2520ca06b9f478f28c20739142600360"; + sha512 = "80ff213322a015c906adf43f278f0ed7691964692b036e8bd03fa9417f46bd7d2604b1fcb7f6d1038741c592b1ca63a1accdbef1b9e8e40e150230f6ccb350ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/ka/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ka/firefox-59.0b5.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "58132f5a7ffa18478e7573d449b0c7f1b67fd698d69b8ae1a8dca70bfeb2e897910bfe6add9ddeb298cf31fd906ccaeeca2629ce28b181cf5cfd04f1a312bf2f"; + sha512 = "542a019b300edbee543e86b265b80f899dcd646423b367957c255be864a4c25f1cd7a5e566368492f83c0b76854d48563764e01cf660d41666420c3d959f4505"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/kab/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/kab/firefox-59.0b5.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "a2a59ba33cc555cbad587c44de1aa37e47921994062536a069677551f78e1d3a8b01d6e27fafb6c03d40fa1a7c2ba129dffb6d536184876925084816cdfc6fe2"; + sha512 = "b2f158e86a62c345cb82fbd7be2d3f4888c0a39d239b1973083ea7f710da755b160ad5b7b0c2c15a11ec4c7f707df9aa5fa1f9c479821bc7bdb71e5732410721"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/kk/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/kk/firefox-59.0b5.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "5a893d5595f1ea8fca73dfb79a8a2394b455b70be4fb31acc38ed7a08155c0652d0bddb47c2bd803af6d87a65ba4a392bcd9f971132fb97af106df7b951efa2e"; + sha512 = "f78ca53fe7fb3a74b46cabc079f5ed837f76196a0253b7525fa7f0e9b0e96c21f0c93f04da3e6b50393c262a34cc399d3c6a2f02fd5e75b9b05ae99a1237ee18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/km/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/km/firefox-59.0b5.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "d4c15de6c29d3ce22984d5f72b834202175470cd991117cb4a613d63b7a2c8b046a0455f39f18767315fd7cfd511e70f95ea90be5cd2721c4ea7c21aacfb5d69"; + sha512 = "9a63de9bb32eecfd7cdebbdcd43ecf8977a96a73199dac06561964fc874d785e67db5583b7300023048524208d7ea6d4d83df68d713ed3227fe3371269d54951"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/kn/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/kn/firefox-59.0b5.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "4ab5c5ea793dc00a68a20b2207ac20130ea35d4212e4b83a09d152fa65f44bdcc98a4a2907c9c13a32e952b3a4aa08bfc04837a49b69f0177b4a2517633fb984"; + sha512 = "0500919759971c60007c9766d4c719ccb3f794859aee0d06ec46b552cea6186b0c49a3e0ae7439c48326e6562a50cadccc138a1ed425d677aab070d15e53ef89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/ko/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ko/firefox-59.0b5.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "3b76834960d7917912c67ca0a0237cf1ba43a67fd450b636a202dcdc2306c64ebcffab60dd8437e9b048e5a63a1f41482d640ab8eb7acc584e0eced955962177"; + sha512 = "96043eca2dc79f2ba635b7fa930219e1e8995f7983c9aaca73d700153002cd05375feffd9c501681ae73caebb060ec7c6ccfb2a3666f8b6424575728f1975f82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/lij/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/lij/firefox-59.0b5.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "db89e1b527f4b6118179f1e949b4cfabb4f38872a3362b916fb52af063104a46316d40265513025c2d453fdfe75e40f9a4cece0cf2fe849382f3a1dac554c1b9"; + sha512 = "603b9d3764d92f3fc66f89e451526749ae11c5329e4052e81d1949bb17171e0d1536b6824a9b0fc9017b98ce5a7ae31adfbc51583b275a770f361b77d6dfe742"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/lt/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/lt/firefox-59.0b5.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "369a121ffbc54aced959f737e890feaeb08fad82899fba66c308d88c091b1c2ab2102a739b91ed235ca9df28d9d86437b5ba233e4b0542e861cf09c2a7ac211d"; + sha512 = "dc7447ec483b1419d8b752045bd8380f2678bf976368734800daae02085d99323a931954aface4e1f701f970a3ad70e07107812fe930eb300a1458a14ff88b3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/lv/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/lv/firefox-59.0b5.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "fede63dce44e3b445ec4e28ec6c1ab0989e534e2809fbaa938ee9bf7e4cc7a5cc52fd8f13672c35e33ec06d0bb7d7c49dd4ecd0ea626b30211e5557318b86790"; + sha512 = "f63e391b4c490ecd76d3b2806f4413817d0ed8da5298cdf2e9da7abe0499ff3fe612474f8f040d35f186a9a4cc0c989074affb26b8ee0f25e774fffcce049f78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/mai/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/mai/firefox-59.0b5.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "69b94032052707f040f75c5cbe4cc5ab16cf973c54176bb267be771e63db0d229d924354c09f3533663272fa6851c357760c1db5b80fca47d2a3ebb30615586e"; + sha512 = "ceb3d5005b5e7b2edef0447ab9372feb14dea49bd0a3d2946cc7852f30aa0c174a0535c8edcc1e5164faa3c7829f5016daaa3641203dc2690984cb2a72cee626"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/mk/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/mk/firefox-59.0b5.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "ab8ed79914a94a32d036be5785b9e61e868935aa05e1b849523c5669f7cecd2d33e0ff5ab3bcdf194430a0e2f93ca0d5639d4bcbaeef63ec99b7cb586f7076bb"; + sha512 = "a2d4ba92c6971e99521617ffa1ae2f047c63d106f2644ad22a09eb76aab516f1468fe6e2aebdfa71b51a9d92379140e19f5ad968a11b61cee027cebcc84d0552"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/ml/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ml/firefox-59.0b5.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "f5554313c2467e99543b56f84df5131acd0a55547acb8cde91aea2760d478b0508fea6704d1665b96580fc64791a28fcd3a2927b4c27bef6141c5c6ae511236b"; + sha512 = "00b6358ca10bd1728f80954d2a2660888e1c73dd2892855c72ab3ec0ba746786dde29e6b7fd4d559eac704fefd2c87a05ebfee1c226eb46440ef8ec354c08fa6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/mr/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/mr/firefox-59.0b5.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "355d8279b52bbfeb3121ac2ebb08c04f2bd0865d9f0c1d053cb4820fb2db134b64b0f384a6a1157caa347e07b37247ade8eafe5f6750bf48f6982c5d80e45186"; + sha512 = "2b3c154a9ffe91e0882e4ac7b42fb2b332e9cbce726a68522f9a99d159ab11d2aa75ffd017d8d0ed73ba700c4612e4802ac9a7767e2751b2833d48c850536b2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/ms/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ms/firefox-59.0b5.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "2a8872df84ef635424c06c183dd19b8baf5437039256cb5249d968a3c716e7b09de46d7b9b5dca283fa0163b2d96182971082dcf651718fdee8624b5d769ac38"; + sha512 = "71c16d638faa108c26419913f3bd7ed5aa65774a4a1b6de4b89f1613290ffb321ad85cde2a423573bfc0fcac2a6d26d2235318e87f4a534919e5726bbeecf910"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/my/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/my/firefox-59.0b5.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "fe176d96cf10f85b1d9fe64f9051151246e6da92ea13780b7890cb414d03e9425149158fc7ca56d3e2cd625a7191717f9fad82399ae482f5a51772b488c454a7"; + sha512 = "f45356d2b746928c1a210489a8936ad267905c192c9bdb8c703c86cdf52a9db0cb118512649803c5f64a7f7b5c5e9bad1480284d09ce16f27d1630ce16326f36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/nb-NO/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/nb-NO/firefox-59.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "e40d74435fd42a8bd4806c839b57c0a6d7fb05e614aeb75eb7a28e25f58030f09076c0641d47886ddf20243db1bef6e948e61c712bd73a0b98a1cfbe95c7c143"; + sha512 = "64310a4d25756915efd8a586861419a3daf6b85ec3c5fcf52dcfe0446267f217fcc11f375e67e917f37177ebf8edd5da9e945afcfc114ab90102282e94e39d14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/ne-NP/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ne-NP/firefox-59.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "1a5f05bc31e3948c76c581042af3c4c3f06849b8a61e8f4d601e55fa8550377c783975e6935d82bb4031a41711be7b84d3e8a6630f09b3ae53f053cbd99135f0"; + sha512 = "87e5586928918b8b8c294f3a3c229c393abd116ebc27ce64f641671a5cbc10a0165ec62f8b4f9fc8fee084feb51fd16a43db6288dd62abf6f4319cf58a3fc0fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/nl/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/nl/firefox-59.0b5.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "0ad899c0da27f2394b8c4f62d54905690e02d086a8dc0cc47e080e39eaa05d07852c3c41925cf4c1cf2d849a536359c9d4ea8d5f3072239f7e9a15cacaa95c9f"; + sha512 = "fa96336f5db42925016592845cece77d369775ad8463aaf72090a759bac0c69032e1b7379b1be3dbb2a131d5f3dae3317d5b0dcd9e36f5a91fe7a2dfdbc9d5fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/nn-NO/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/nn-NO/firefox-59.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "5e8c09c571bf5d78043c68b031a39821b54daf048a8a8d564f09bde72a8935ea30ca74efac415fe3ce7075717624dbdc86a0011b7142bcec3ec27625541b3b4b"; + sha512 = "7ddd0ace9adb84cde7910c0b247468e47b802d90cd00307f9e660110d5fd80d79dd6dbbd9efc1baae632812742c977a58d0d8f951f1c1e70648a2b2054bc63a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/or/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/or/firefox-59.0b5.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "f38f8b9f39e475aef9a514a72f4661c122289bec4c170842bf3d9041eab6f27a1ef558a89cf09c42a5e305af7f09a51dc39ffbf10743d9fbc097e5d9d04292ca"; + sha512 = "a4a1eec3e2e62ba617cf6a921f125522a6ac49a2f5deff0855dcbee3037f17f6d5e32180a215893028f933dcdd879c95cdcf4f133c6c952db073a7543012e474"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/pa-IN/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/pa-IN/firefox-59.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "cd6391057645561ac30e98d29301bbdda41c8527cdf9fa493ca86c5330d3f538c7371ab8a52235febec8ee0aba1b1bb640dac9cab0357485d7ec9bc11a2ab87a"; + sha512 = "71fc1b5f4a1525e3358783498232db6df0b92b52d6ac2420051b5f15191c40e94ce3c7409b917ba171e1b8c65b316e771b56e46812b5e9421163c9e6267adc2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/pl/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/pl/firefox-59.0b5.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "2ced24c4022dff6a922432b00b78b3b6184e4b5df5d56dfe72060b77d0dec63103f5f7d8a16c88c267e0c566abaecdf5c7e62a07db3778a75fc72a605642234e"; + sha512 = "8ab57e4bbf78abc9e6ead70fb579d0c5c0066ee8297941e6030a6132c74cd965d23775029c7c4357dc80b24223473311b13f0a826ce7a763a4fb87b80de81f9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/pt-BR/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/pt-BR/firefox-59.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "8e695fcc5a6628fd159931f61874df71784d6cc3eb820bb7e741cd63a8cde8cf6cf0485c2ccd0c3f50c3fb7559da17d65b9770c40cd57e9bfdc820182912e2a7"; + sha512 = "3ef11e84ac83cb2c38b029342b4e7782554af6831e8c18c27e12efc97243e2b84e041633b43ce8d4162d451ad0df6109481d94c3bc4c9bbcea27807427c9e830"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/pt-PT/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/pt-PT/firefox-59.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "9fe8c18cf069981e42f30a3a20855987e599d89b48bd3e937e47378ef9093ddc707fb18952cdee2a549c3d0c0ebc3510d3da85b3f5fe1d072c1cf79bb3aad291"; + sha512 = "a795e111da79b03dcf73c90cfacb58d56fcd866ba1a7d5d70474844d91586eb98191cde4c18cdceb481cf5be3fdf7ab2fe98f22690421877b9c9f87afa8c5bd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/rm/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/rm/firefox-59.0b5.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "65d273611e535b56693b8a960bb8a5cd9250b7fde766861f1356f3ee9596bbd110f5c3bc76db19ba35e9b3079f8400d8b8dbc208d709ff290096fd55e11262d6"; + sha512 = "8dec0be4a506c750c6c6cc3a52964b6d3cf072ea6a37c9d5a6ef855eaadd3b715ff48fe9ee320716ed23ec56889e3585c729f1f8c22683d45fb1a04a344475ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/ro/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ro/firefox-59.0b5.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "060af988e3600d9c5ba36462a0af265c4e82e77d900d96f3bdda137b1fbf79d55df43fd710b916c27f00b3fe8d5d526737fffb909f16dbb80638f55b0e071428"; + sha512 = "e9adb45a8e22243de0113007a3b6f4f2eeed119cd326a0024e3b7e42abbbeccf0be26c8ea80c951e50e857fb773cfaca6532b6ae32df0f6516421b1d1683d98b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/ru/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ru/firefox-59.0b5.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "fbbbb639c6b9ac5cffb3fcb35aa95efbdcbe6bf3cb764b056ec7b739b5e3b2a8204e857ad61b6cf116ef381638ecfb7e6868224729c51e89eb7e4d1a80d59a0d"; + sha512 = "dece61a88d1a3fa706a26a847601bd633c06dab512afcc4815c1a379a56589b6afaf2877658f9745d328657803e248f5c22d5e611db79c46b7d78d38f3819778"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/si/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/si/firefox-59.0b5.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "eb4a45616d9cac1df7ed73ca13da514615590cb71e93d33bc1c1efaf2b32d454cba4ee30c5768a810f534597367c7c4af75fa95975ed8ce6af3edb4631be55d4"; + sha512 = "63a57a44e92e2dff5e24dc720aa1e2c5f469ff670b839ffac11ed27e242afb8fd30f5472d6a120c0d9a75553242e4017566460f0a374ba71e08cdb967bef198a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/sk/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/sk/firefox-59.0b5.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "3111ebfb89b22e1a55e94912ec4df476180e846e21f4d700d04b6285733c1028304d7c57f53bcebf895f630e010b38504bb53660dd0e2bbb1c1c39418fbee099"; + sha512 = "f4d2d08315d00374bf1bd5f9b0aa156df9fa27676c191bb11a8add1396f506651298ccc6e35f6a260c1d1ae36deee51c0aba39dd0a996bf532f6c627db07d52f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/sl/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/sl/firefox-59.0b5.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "d653b1c7918b2a548d04437ac257d12f7bc00e2bb591e006cc1d40cdf45ee4ec72984ba90ee93efa2a36cbedc849caea600e03defa8f484786b21a115d4f0847"; + sha512 = "bd067c5ce137d3d60c2646c6121823c5b2d466b1d5e6ea8b97e3a341ac66088f6d7cd86d1530fdffaeb5a9298972b6823596940ed8133712e4ea2420df337f40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/son/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/son/firefox-59.0b5.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "bb94a041edf2579a501a44e06c1f93dbd1d7fdf7be3b0880909b97ef5cbcd944ba52f06d8772a50f045bbbc4abd63c5e6d4477b03bb4384b9acd4bb1e93404b3"; + sha512 = "60dcea372bc427733d1939ba10e476545ea2545ab63358152947d7aa92581800384e4f9812945651db911523c48b7b8279248d01dcd6e331dec8457bd6eb68df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/sq/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/sq/firefox-59.0b5.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "e721d721f33c0a07b2b84511871e0a741578f769436a6f579aad72974329ceff2f3bd1b4b6044c21e63cacec49721c90ee7c3a9f7d06cef2805e57cd5fef72c5"; + sha512 = "ee0120540d500cb9e23843a970c9d0a7c4c59d93dce098580e0e26a1de789d82f86252767553f42b58146c8c9bade95de4aa0b0834c8c73a9654bc646e241ec4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/sr/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/sr/firefox-59.0b5.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "f6b885b967214f53dcd12437e0a842d171ca144c882accd7f4e8c09cca928c106181394a8cc7be51979bd73a24dbba13e57e67c3b0e836aad67a791089c5b1e0"; + sha512 = "572949804891307635ea3edeaa3f8a2a5fd9417491b73c3314785749889b32a89ea454d84b87e26af78f06bd65a9b40069e7015e12de702c68e1600f1ff55291"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/sv-SE/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/sv-SE/firefox-59.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "f39e41188e3aeb087458d702c14b72732ea97142ecc08bbf67f76058578480d02068d67da9659f2af73dd281eff2653ab2b0bcc798051772bd4a90e906487b93"; + sha512 = "30320faa886b39827eb6a167e133b205e0628570c29013c123f30919fd6f08c9eee13d9a989d518ffd5a7115c07b0c4144ae7ec1d4a78a6abe130ad1b6ecc3fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/ta/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ta/firefox-59.0b5.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "6dbe3a1c1cf507ee5a50c1770b970f7f1a1bdef7ad3f5695951b5b666c6ce8aa70a39d40230f332c5ef8096f2a0689896e6edee28da0875890c9d32ed666bb9c"; + sha512 = "d8caab89ce3d95f432f5e05415fdd2bfabd8ccc4019312df87d56aae9cbd991baadcdf4d7bccd2c549f01f4fbaa3bdc08e48de36258ad1dac6cc91e7983c4736"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/te/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/te/firefox-59.0b5.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "a0219de5d4e59ee364aa90dd517f716242da2087bb278484c199fed9daa8c349e9324d38e276d3144abcd8652c0ef0fcdf61cfe199de82e5bf454cb308e405ea"; + sha512 = "f1f063ab4115fb66fb3c16330748be402dce101fca5139ac62174c4efaa877282390a435a1998d28950f8c2d37267a930f8b5c72ff86ff88c3fd472075ea0794"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/th/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/th/firefox-59.0b5.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "aa513d01fe0c006715b0925124bce924e5f036cd86c85e87e10d8a93930d4d0e7673972cd8d8bdc8308e8c558161fc7bda653920a4c03bf718af183d8a5e0657"; + sha512 = "dc35e94d5329de50ee8a6d49bbf7c1a21163e6e93d94ba42cb9e6f15e7b173d21df218388130d9033afb6dc4d4af402c42614841b22c97d98ce8a68c8a1b02a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/tr/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/tr/firefox-59.0b5.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "1048beb1293cfa935962bfec36df055b743b4588c90107c4459afedb059f117c819af82a3a25f22263fde646a819b3d9633ab047883f3a2310861a87942dff9b"; + sha512 = "295f600dd18fb684534ec301541f144bf21bdc245d812507cb8b7425c46337af4100e8cd9265c5e9b3bd76e65fa2d6ac48619d1253a4458b7d2a5d003366c694"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/uk/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/uk/firefox-59.0b5.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "c6797cce026b205823c323fea21ec2ed46064aa645ccb612a5558ad0c71da50120718d32a918a81e107886d79f1fb30e0ba93449bb0877ea373d5e95e9f000b1"; + sha512 = "77aa3e08489d5c2fa15c793ef1cb514c7f210eae4e24a331513e7d40a729f58b92b339ec05ce646c9861c8524bcb6e312af267e4db7586ef058aef0e53e3f5bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/ur/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/ur/firefox-59.0b5.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "a2f2c8b4b35b091fa33aa04c7d3135c208ba9ddd7d47648f33196cc860833898916460d205b22eb452133c20e01cc314142e0e108e473def3ccd7432b70ce877"; + sha512 = "4da69920ffbc3120a6ca75da79252e6bf1ca97b4540315683599cc702b6c3db4c996b0cf0565a9c97ffcf316f3519a8fc16529350aa9e22fd6b4ca48f734a289"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/uz/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/uz/firefox-59.0b5.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "54ed599201788d369cb9869836541aa485180bd5d09fa2cd36b88b1053bd701079da4f205fcbd849bdee7b14868489a5a446c142b91dcf009cdeb3a4b4869145"; + sha512 = "12639e719842e98181c4c0fed1ba284da143e49d42950dc350c7ae996bbe07154979a2377cf59b2979e91f8b75a64b9e7ba20cc64388de94329488d1151ddeca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/vi/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/vi/firefox-59.0b5.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "e55c6cc32b9ff1e33bcaec0b8936c88193c98ed95e2cde9503fa32e7f456a0ac1590c2a7c20a22e2182b1a305c7c7ddf05ad18d616b3a1213350947fd4b73cd9"; + sha512 = "946a0b00c94a030ab0547a0529b2639d880795c821952a71b467f199332424e42de4fa06c015208d58be12e52ff5044c8ca40dcb57480a838b4688917e9d527f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/xh/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/xh/firefox-59.0b5.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "ba6b8a600dc23af6b051d0483b6ce0b1ca138462d85a2dba443d9a7d8d1a3f539cbb1252b7724840ff864560a318675f4fd20e64474ae73746f7fcb99f462f7e"; + sha512 = "7f71bb5dc8af9733b3cf14b72e74034942b46f06945870b550489e178f21c348da4b67fd4c7e51c601c59caad9868d1b64dd8e7d5ae5976525d57b739a847308"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/zh-CN/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/zh-CN/firefox-59.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "5e9511764099bfdabeec41e365207c55ca8ccb19a655aa245a2ec7c1731a44888b1b0311254a8185aca49a2866996875f0faa81f755bcde3a09655d7fbe1e870"; + sha512 = "79ecb68f4b4da883e7238ded7a40fa9e61e830926e5943e7c70d7fde63d9757963e3ca7c763df12a929615a1817580074f661f03fa02712479d1b677578ffada"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b9/linux-i686/zh-TW/firefox-58.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/59.0b5/linux-i686/zh-TW/firefox-59.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "3210ef9a1e7dd94bc319dc7c346d627f0644f47f9078fd4614e45482d4895a10269af9cd073a68a6536a00e73fb6c17ac34489e367fee3892bb1c46907e6f571"; + sha512 = "c41ced6025916634099a01dfe9213472b936b89e4719cde0a1a06404140fc564d93b2a0188b7cd74afc90dba4777d0919e64ee496ad9fcf76966f3392f434592"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index bf7c700e978..23ea0b80267 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,965 +1,975 @@ { - version = "58.0b11"; + version = "59.0b5"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/ach/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ach/firefox-59.0b5.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "0f078b3bf1af8e217a0138a52510443db7e2c5aad88e400802fcf6a967bb9f9558d9919205366d3b3013674ccc581bbed85647597a3f8290bb5d7f61d41ac669"; + sha512 = "6de09f1ba2bdfb652ed32a7cb64bcea7afb52f29eeed965c02643dbe032083c7c37e5151aa03033fb93c6b29fc1f2dac03575af8e03887f74fa0e3161294eea0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/af/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/af/firefox-59.0b5.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "1db8f790a208b01bf01ca9afcb37c37c0dee66bae95f007ce0d86411cd14e424ef273533fb27f8d513d27b3671077c294a5c4232d754fd10d50bdb442db0c4f0"; + sha512 = "44d2b1de47ed25b0fc363b310046532739cbe16281ffa43715ff2e0cab090dec91bd21d237c06eb364f0fe015258fbb2366015a6f9be12fbf6ebfaa1bde165bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/an/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/an/firefox-59.0b5.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "17f8bb3555772225fcc38b920cf2c373584a94036ffa7f2e725ef77a65ce827267b48b38cac3d41e23ef90141d3438a42662fdeb87ad921bddbd249f3703f5ba"; + sha512 = "2c58f4eb227b58ac804d98cd6388fe2f9630d423a2ab45c5c4cee448aa6a07aeb5f7e54f373a39dc280557d0e2400e233100b5721465f96f5cb53c28289aaa60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/ar/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ar/firefox-59.0b5.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "0c2c0d062f56817d575d947b2d8c0adee7a59447cede51ea6d58c830d20b25d512ef45589c8f1f63dadad42644581bbc8f60f4bf12fe9391eccdd74642b6f9a8"; + sha512 = "1bc623e6eb796a679aa3e60acb418a49dad24267849db4e54c962b54bd3d2193444bf39912075dc3687b83f5d579c23d4ced940102a046608cea744ecf0fc9f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/as/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/as/firefox-59.0b5.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "1b232946ff33b57a3975cecb9dc8001a44e843cb8ccaef0548b1ee91fd3348154af173d86e40364b35c5374ea14143fd0f72814eb769b582efa1640a5cb03273"; + sha512 = "b40d5955835c7370553967ac32870c47625c493992e1f1672be363ded1a5a2b3637cc3b2756530f324aad0149a84fc90df5a0992f16aa1b6939c15f6c8ef9d14"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/ast/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ast/firefox-59.0b5.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "5ad776b0fbb621cb3efddeec88220e439e65529f28916da7edc9b78fcf3dfc75a0f4654346905df1d238856d5e07ad24541c955a0fb3cc2ee0e03de05245a7fc"; + sha512 = "e9be9a5b55504784cc6531f90356a2a256a27ad20faf5880b5eae58b326163d43bff138feb48f23993e6d9715cfca8bd48c601cb6786129ed814c5c9d8e97261"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/az/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/az/firefox-59.0b5.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "9bc9149524d60974db804814332f8bb7fa85e19b41f7c8ce120b29f2156367350612bfe31631e6afa5ff088a49bf86adcb046b491ab2b29643e2b2c79b6049fb"; + sha512 = "f067b3e1f4482dd32f7dbb1611f33052d55f835f164e7fb23bbc7244ecee3eb11b49b49447cae2c2d29b29c3769296ff98fa716a9171c8083825f6403d2c7fbf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/be/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/be/firefox-59.0b5.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "80583b01d99f39c0662df874d8c99789d750fbec597538f6e1a11e059276ea6795982fbf992bf71d88dc12d87c3107927cc7faf5d0e4b7610a2756c494ee8712"; + sha512 = "489f7df280844c60e5badea653c51c9649dc484ca7e8d114309a4849afe3cf20c4f3dde58e041500d654d40fdd7452cddcafc971976e0aa163fce3bc1815930d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/bg/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/bg/firefox-59.0b5.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "631656b3feda4915634e69bb83549a9ec276d0173a9787e976e3705422450a4e315054b5a29d895438fc4a753d0dde6b78d947c871ed17a0443f1f3d32ef4a3c"; + sha512 = "8e563ec2b7640369134c1490b753a39de957b326042547805d99fefb24c5d35aed09f6dc66a93077d09d367542a64200e19729ab3e7f86cf30d7444054f3f931"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/bn-BD/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/bn-BD/firefox-59.0b5.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "db644ad94f0f76a5e6916de7b81323e062a68efbf9aae6116b27a010d005ad08b5cdc573ca82e14ccc49a270d1906137959e459dbd3d7ff81ca243d31c22415b"; + sha512 = "08ecdc5d4da416d6b2119f328137db2f707ed6dd9fb49084b8b4052bcfe7d221ad3e9b65ebca8b2f72e728603a30e66c5ea21066b7ce7a97c8b5c2aafa2eabe0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/bn-IN/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/bn-IN/firefox-59.0b5.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "17987f093206532892ffe4e420e76189ba7f7a8205b9e042714bd768f05699da5a9a543e6167c96e9aaed910b7126c5c382b08887e0bee970861c97b6e10ce1b"; + sha512 = "981881c012a33e3b63bba012d4c692cccde51590b1ba75367ffad3d26b75499d6e5acfd8a532991f1901ec8a1950d58d6f3c629d48b2f8cc6559799c1792f76a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/br/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/br/firefox-59.0b5.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "04fd0ce6b8b36508472ca84de4ef4609db31357ef1c4520ca0d61a01c6b0fac1f560b6aaf295731457bd11bcb7512cadbe770d8d91b9c3f4fba9db872d058019"; + sha512 = "ff6f6ef5d457b4df00366bc872dbcf605568b6161b0ac74da9b1bde2c4e9900aecd62448e2bc3dc4923c4f62a760e15ca351ed69490213f7db31e62a0aa8874e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/bs/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/bs/firefox-59.0b5.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "043f9438d0d302191fa5c9c372e0e08d2b3ddd4818749707e545ec9f281994a34e0f21489fd398cbb5cf37ccff0512c5d52ad0e23a5277ec930dac4e9bb913af"; + sha512 = "19e98369d4c0add670870fff37d9eee743a6ccffc56d173d539c4a0bf59525969fa77f3e9f36a4d130ca8c8bfe817c0d9a3f4d3b9acec4abf6e7e2e2cd739c46"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/ca/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ca/firefox-59.0b5.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "8e19eca1e5051afe874b748ca48b4624dc6fa8da08bfe57aebc7102db5091592614d9d478b26233887d3478eb01b3cfeb6ba6df71b3b8f91aae717e1171a2718"; + sha512 = "14a226c60421c441c835e68cf23d0754f0bc5639ca034e9a0e5aad766faadc57feff03b0174df87c1dee0ccf66bffd4530ddad5c264f8ff6aaa5d55c0968bfaf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/cak/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/cak/firefox-59.0b5.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "de066fef5348415a669e94ce19f83decaf14eaa350cd022c2d4fa2bf99391969c71f0dfc99eafe506de616e6f8d5047322e361d3b5f75dbb124b45d5475208d6"; + sha512 = "5ec83245a40eebe7fc7eb43058149816ce2b54d35fb4b413a86f1509d59b467c0ee77a0f5cac3f5bbb4af7ef9068e30971bb00f40eb1a483d5b60e60f3d06c81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/cs/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/cs/firefox-59.0b5.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "302ce799188cfd1670fb4f4e20554e0454f09804e728b7bb1df074b9af0537ffe5c25359394c3659ba0b46e6a8b9665de6490c9bace93926bcb8360b0b1edba3"; + sha512 = "a0156ec17dd39619256fcc2c03722f6dee9a722b16ab1f0c8cfa0ff91c4110f471704f59eb26010d4f10f5e18facc9e4ecd1793320ec344280c5b009af3a5afb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/cy/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/cy/firefox-59.0b5.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "0f893e19115b389408fbc1687948af64cb0b9f96c6965e01153eda59399f3d48600d587be0bfe8cb051fab16834c4ab977d5a24c16d637ac1cc7bbf6bd7f0282"; + sha512 = "32f54e38fb4a3a79b1ec63e80d4bb89c652976f9b978ade25ae9e4e4a0957ab0321054207ea9251be256637615b647d2b94499d9b9b1cbc427e7671de16a749e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/da/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/da/firefox-59.0b5.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "dc412fb589501049ebb3f480fd9b6ebdd6cc9ef2326db260a11b7624358d900646feeca283b9e2314cb6a973887164dff8afabebca6bc90efa03b40ae44ac421"; + sha512 = "958ab9b7a29e3a0b71425345a643b8d3ffb2f052fa8aeac80d06c4bfd549a0215dadcb6290e0975b177b1120ed299a487b1c18c58a316d681c7bb7ed9e6de9c7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/de/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/de/firefox-59.0b5.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "cbe2646a55d1752474834cdb6d33b23aa84e46068661f565cf19b8b1227ab7382ced3bd50686f469c6acd85cc655a4b01605cf14dfc8db2410a499ab0a7d75b8"; + sha512 = "29e11ccfecf52fd1f6636de3062382c0476cc86644d8d7d0ad05ecbdf8c1640ae4064b348504d1e86f9fedab9303c4f504bb655f01bf2ef5b6607335f5f580a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/dsb/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/dsb/firefox-59.0b5.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "9ff2268a5fe8a74c5845fcb41ed395508421b64bd9ab85a8c5e9b9c47bae7a9626fbb44be587b7af7e2b728d9003ae607754b68091453c72d9fad7f2779983cc"; + sha512 = "7b2542d0c4737f5665be10f540895b1af9fe5320dc5c40ab24feb523588925b159862cdeb18c9a4f14dc78715703c048ea56ca53d1fcec7fbcc9d3f9bf256cfe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/el/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/el/firefox-59.0b5.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "c356b96ba42478ba135d3d5fa345b7afc2396c9c34d86401979149abe7ab7ab39a009e3e75a4927a3c3ea5414a68161d5dc89285a3a522838ecdf3ad247d49e3"; + sha512 = "233ebd6c09a91521ff69f947ade1539ad136e284e539d06df08552c9bfb0efe4fb755484d6038e2161865e0997aeff93002f613fde3e93b6eb9c205f63a5191f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/en-GB/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/en-GB/firefox-59.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "6e661d12e9326846b9608f6862e4741ef755fceedcbcb0024d07aea228fe6c8488b9c44cf13731c0ec32c26a7929180925ffba5c1e703a67d90afc72f1fe5369"; + sha512 = "1bb4e2b3db6291c74769e2d335553cff68bd426fd3aec20e858d2db29d558b327f316e25b73ae0131e2cbee7a58ad337d85b05b347a2a0abe442473e94cf29ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/en-US/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/en-US/firefox-59.0b5.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "bd4ce883c1cbf853b14e1d59c70460134e955774821f2fa46c4733d5dacc8ef5636e25a39d73964bd2aefd1532cc1fbad908dbcd455554d86e17ac9eff30d3fe"; + sha512 = "72db0fb93a0a58f0ecbefcf27808439e5488df47851ea584101e1308e0569297a32f6ad7fe2a523af099ddd197845a3582f12a1c0381e080f31253a5334cf767"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/en-ZA/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/en-ZA/firefox-59.0b5.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "804060bad673ef88f7cb8d3e34743dde32c65d846880067c01ba127144c75719cdc4d0c1f2b34bc2f1e6e4772aced224d45807e68237d305bac263bdbcfe899d"; + sha512 = "58b0dc3614f56570556ccc20407d9070f8aeca22308b0e3975e44108b9c21a95546a9625a41aff6cd887aecd6119390d32769295e08e88de76ad0b5c48a57ee5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/eo/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/eo/firefox-59.0b5.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "20b6faac6141ea7be584e22cb05ebdc83bb7c2372a02e732192a2df9f9bbcd13a34ef1a2c46bb0dab442453b8913b5861e40f2471c44892a9f330a947e5765d7"; + sha512 = "6b2b1653e3cd3c6858e4259f51dcf7cd8e34cc38445d995f5aa08461ddecf9d961502500e0e43f6059c7255216917305ce40bcaa6e208b027f22dab035b5dc19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/es-AR/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/es-AR/firefox-59.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "e3fe33857b31d6d534de3af43846440d733fac7f2529624f32f75f465c7b37379335d4305f2eeed812f553e190572473b776e6da7bcd4184e0765201a81d8f1e"; + sha512 = "e884adf45c7b5897722ea80052de616cce2fe45dbb6e4af6c20f74294e9becbf5d2e15804772f23ee697adb66af2d230b2d3834785ce40f3989cef22d28f8714"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/es-CL/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/es-CL/firefox-59.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "2d579b34818fc0565662fe90ed2562f3915f1a38489e6763bdea0df86fb6fe8d8b6dcada6452121b5c27da4341f0477d053622c442603682d97e6ea56f4cc877"; + sha512 = "31e7bc4a6b6151a9411acce7ec713f12ce4fd00651f757d2ba989ee5c870c78c5bbf4453333a5063edfb0a6a58d533dec738bc1b93020855e38911fa29eaed6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/es-ES/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/es-ES/firefox-59.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "65a4eda5f4434158c10278f9d5d13f4ab93111aa47aa97e12e4b0151dedd5acc28376d3c2860bd3714e79037e0181f928232d2b3aeff036b2245c94d6cf3f21e"; + sha512 = "63b17939a194b1042d350c5a793262d674d41d6ee2e2c0cf92d6f8ed35f0f05457bfe4de61fd97c5d1bd2b256386140d26c31e8db6b53f6a04d0ddd0bbaf34d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/es-MX/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/es-MX/firefox-59.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "fcb8f5b56abb9e94672adc8f72ca6f0d7571632bdf0c7c7d2cda71d009709aab6665c6acc63d0268f50788ae7a71669436644fb2af0a96d0389d0d4e5657fc6d"; + sha512 = "d03c6a6b2bf9cb62b3fd44d8ad43b619e14489ffe163de376226f3c720aff84dcfbffeacb2590b11565f094f6b1c20e899d65d0457ae3889e054f74184ad5c37"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/et/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/et/firefox-59.0b5.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "46f0363f36df2335a514f76a6c25f7e5c78521e6a2dd758e58dc07a8f75fe43c15ee4e4775ac7370ea1d45248b0b1ad0724a5384d2e85ea8e664f811b5bb0c0c"; + sha512 = "e7b0023505781e0ec8098ab98d2797a4341238c763aa5a0872fa4334e0116dc8bc74aa989522f7b2cb135c2c20bb580c8510e9e57f4363cac69d55b6b6d88d9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/eu/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/eu/firefox-59.0b5.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "1663250bba720afa7517797a4351eaf41e06af57c70b13182416cba2bb74fc0cf4a6b613b47596fecec7a385309d74309d0c6cd45c98af233a8ed33ce0e909f7"; + sha512 = "aeb87fa12ea9b5fb4e6e91d83df47f51a1e6c75f020202be6f0604854f8aa011820698328b92b3fb871599f9a94bf7f1ca2c0ebf0abccf84485e610cf5153ea6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/fa/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/fa/firefox-59.0b5.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "9d5bfeab6694b86ea2122562a8fff81504220fe936b62d971f5b35dd95622e652dc73c186631ee290dbe037ce6ff2750cf2239c6a4b89493cd37c0ce8aa248e8"; + sha512 = "e8718666948beac9709fabc9505e8963fd3f00b09342193fe455c7e56265402922cb4151be0bfce0269297a14304ac966aec8ac696b18e3d7227e5dccae0c1c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/ff/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ff/firefox-59.0b5.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "bf24799f0bc3bcb6320930a96bc07f888c3d5102a8cfc3172e88d882de8ad19381a08a973d010c027ec82880b1e9a1b57b4c1140bb3e0da1549b21d4f499216a"; + sha512 = "b13f2b8a6522caa16c797c37bba806742a93addf1e1a88e31294c0667115f57d72744daa0af3fed160f02997409d4bd6f7c9170cdff75eae71f5427ff4fc98ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/fi/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/fi/firefox-59.0b5.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "6bcaeb4bdba3aece39607aff9ff3822d3c844b2da4465a95551134c1ea60ff8e11d01b681d12d4f8ec00f17bd1cb1cc1595a8f9819ef6bd45aa9d99d73dd0700"; + sha512 = "4951e56f9295dd6bff569c0d76fe082bcf498af4b675041d78dccc3725be0294db5cfd62e49ad8c08fad81d6a53236f56519bdf7b4f4177a69e824df0054efc7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/fr/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/fr/firefox-59.0b5.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "e95dcb0ba35873376855a5d91c5a8a888eba6e4859055817fc384b00e431c8102bb7b7ee7d9aeee7a268a26b14d04731245af9863f33c78c93953dfe5c128c3d"; + sha512 = "be5388a199d18b85347caf3f3691149970b614a1f9ca4da7e379e2b8a49e37c6a70953e7342c6621fe3534fe8a1e7a9fd6b1c05c1769ea33f7a51b61c5803134"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/fy-NL/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/fy-NL/firefox-59.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "850d63cb235f6eefdcdae9b6e1e512f76740895d638ec1db0782efaba2f9b1bbaf2b5f2070e1d6f2ca84909fc79a624f8fd0455e026e16df33e6f59440087ad5"; + sha512 = "6468b03d724ad585d8d31c17c75917eafe908d155a4e4544b6f2a3f6ca467c6ec34c2c0a5d7ffbcec17faf8cbd00c5bbbf4f71660e7dc04adc337295eadd4ed9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/ga-IE/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ga-IE/firefox-59.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "bb11182c53c5a42441a746da63bff6a1265630d2d3f1d3a4cc8226f51044c21e7af92805cdf472c2111cef6e8d1ce1e9788cbf1b10d5654f650a959057d1dbef"; + sha512 = "531b36471ce64e3e9b1693081bd028b6d417b5c60543b9d1a192c67a20708a898595b80e7a2862f3f984e3c776bbb2b97870e6c88d4f474a215b31901ecf508d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/gd/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/gd/firefox-59.0b5.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "dcda5739adf99674c8ba9eb47cd694a996653cf5011a0b04cef55bae6bf223512dd6fb2d54aa61b93d55fdd79581b83bc770b05c6cd625f159dc51f415c71191"; + sha512 = "4b0df4896516396ba7593c579b528b5010d3be1c2db019a191263f28309a62d54bad9bdb013c8dbedd3094b22d31cd2a97c76bcb0045532b309aef3fa45b3260"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/gl/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/gl/firefox-59.0b5.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "2b1f6d5ee9f6a954d2f2f9c1b1750e1818c76927efc9ae0ee261c9ee73ae014b1c9fea5de1fd61081c6da2c39531915206a6160002a781262325588ebc903ee6"; + sha512 = "c8c15bb5df2798ed16d97849c620002747554f46f1c89de665df151581f6832a445e2e969f3cc25ce4bb97833894fbf06fe4e48c4a2bc89c436443101b2a8a6a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/gn/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/gn/firefox-59.0b5.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "718142f10fd44d48884628a67d8057d387a50be5e7e7f3797f0aeceaa5e453d3cf206d000d34b1839262cab88771990557a867c2f91f5174f10267702fc08058"; + sha512 = "7bdc09008f5171515e63ee2625cafc2a2eaa14f2f7586ba977a890f2304ead1781a913e959508d277c93995ee5be9f519eb69782dc7c48244547a0fa6a36f5ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/gu-IN/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/gu-IN/firefox-59.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "06be8be68a42de6ca387cd58ebed9d9c68d713d929b4304cd772744c86ce6f5fc40136ce11bfb54b875b51ccdb0672e72e806e26d5f658d2721e47bdb8d5bba1"; + sha512 = "c29a89728ff91d3b8ea6c83d276122af2cea578ca36deeb56619fb03949b5efab37210d7bcbe4c248e01996e9feee83eb0bc88b72575a963131b17be956d7d56"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/he/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/he/firefox-59.0b5.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "d4c73d9922b3466e2030c2b594731ca529447e0ebdfb0c73c723302c105ed887372db8a4677573e5425834761551c96d6dfc1b2c603d1564cacd033d749115ce"; + sha512 = "a8dfa6ff14c74e5c9df282e97e1f3fa719dac2d440531d6d34e065a4cf8ed54153153f9615ffb89fc8fe84131fb008ab27490ff8152e8a048d00a0e5ccc02c55"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/hi-IN/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/hi-IN/firefox-59.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "3aceb2989b27df1f19ea6be3a836da34086a2fa652d7889210b7de87d59ff722423b8d4de43095a5fb36b8f8d1f5c62738f6e29a63adb68e04e3ff1c27779be2"; + sha512 = "1fd289c95ccc3aa5156489931171abc98a731a4faecac0fec605991f94b7ea001480ce1e623e2721376f221390eb7ea5555d8d982fdfefc8726d825bcab6fd2e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/hr/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/hr/firefox-59.0b5.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "af7a52b0f4fb9880ba61d57aa010f1ae486c4f5ca8e2114c442ebd3d063ed44ed32ae7fc86f361b9961af8ee61b973bd2b61368b2f64bcce52f656a14c573baf"; + sha512 = "2e26d9b4e4a994b0334ba7634152fa03d8de19d20ad0fd34c23a9c21d705bda57d328b6f9fdb7874aeada9bbd3c2b4468031630d7b3d49cfb78deefc67173b27"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/hsb/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/hsb/firefox-59.0b5.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "eadbaf7361497367c2cd74394e9434a367c26339fc625be279627a59d748260b87e0a45e7d285132df145a779073afd3697c306bd1d9f328023ed10177daf514"; + sha512 = "be5ad1cc7c389a6e11f368bde8395284eec98c4a7db4d450998d377a937c727b3318404610dd4c1de8b679e9064ad67a48957767121d5dd3e449447e448bf362"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/hu/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/hu/firefox-59.0b5.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "99d2480f4079917f45a1c2c4838cce8ed958ec7ed6721bb2485f5e3127788878ef3cdf9e88a890ad1f6572c4f1487b59b67c39de0ef331d700c287157bef79c5"; + sha512 = "76aa9e09601f62bef027fdd35e473bff89af5cb026dea145480d321b6aa2b31bba4fd9960c48ff2abf464474f9884c2b1cca9563d1a0d8df4aba9ce73945ee8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/hy-AM/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/hy-AM/firefox-59.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "6c47808012eba4fdc14c025ee3adc9b13688eac94117513fbc529b790c6b01af2b94c51826373a8e48f99f663831ad5422bde90d29c605808b196cabc79cd1de"; + sha512 = "720e0c135a04f3af595c1e01d6e1241624df45d3494b08ba777ddad1b0784bab62854f581ff614a576d30a12cdd495ba5a53766976783e0169bd288d285c8187"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/id/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ia/firefox-59.0b5.tar.bz2"; + locale = "ia"; + arch = "linux-x86_64"; + sha512 = "5d19d1e1cbc7994dbb5c4c4d9dbfbc7a6514561659f737bb2f24f75a44c1b118293059f8e5276d6eac5418bdfbbb4020d8fb886f839450449bd2ac5c95e9c55e"; + } + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/id/firefox-59.0b5.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "5d842f6875a69ce7e38589b4e95eac08d10a3c82fdb580d33808d74e8763c7101f6804712528e7e44d39e2ee02c2f712f5ef5aaf7bdfa4130d0dffc29c181400"; + sha512 = "2e30628640f68e78154331572c860c96400a7ed84b89a37f03520135b0bdd3c966b14a25fd0ab5467e4114fcc24a35a69c575b28e2fd213c2df338d7b26ae111"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/is/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/is/firefox-59.0b5.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "ea4c795d498de6accd553075575e37ce3f49a2f640ec401fbda449f675f694912faf5410fb9eb6d6350cf181ac6051ecb6dbb034d019839f5c1c5a41b0acfeb4"; + sha512 = "c801600e229105f50d6343c7f2c912e94fe918e566f28e6d39da4df112d94d315db29abbd9854e5b39eb875364483f8ac65131b73d4574099c5cbee6fcfcedec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/it/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/it/firefox-59.0b5.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "d455b598180611105ab7553bc29572afd00494a3fd6ee5402de385984e8646e101f2a615e8a78f182f778ba2dddef65f3e37aefc1cecf2b137b2829816601a98"; + sha512 = "83556862e82dd1f96a261e433e136f9ed30e0aaae28af6a3c5b4a3a9b68477e82e6b34d54cfde0c9aa8e694ec9df79405e6b8f0841096b46c09ccfdec0637ee4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/ja/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ja/firefox-59.0b5.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "8b19006ec4f2795dc867c4cbc2298de2c74a6b1730fc17d673f61cd68a30eb8e07b926c7748341f0c29be0118a8fee2d948b6d11df012347a51663b27e63d9e7"; + sha512 = "cc0a5e22cded43e999eeda350cc8e7adc11c7e6dcb8eef3eee209e0f663fa4b1e7e57fda928d163a27421195a233690c939385544e6293305c33fb3fc6f56c00"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/ka/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ka/firefox-59.0b5.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "af2bb760970c555e5db00442f0711017a5d9412be9c209e97e273af2506af00ede5ff25ff2f2d0e738e282298334e0025a8aa2f214d289819b7a67ffe5f3d969"; + sha512 = "c2c5609a180033b41866f4acd356a7830fe5204f81e1eb0702c5e1a7f228f46846012bbef7fcabc02d76f7d79a0079ea580a602f381672a75230b2f8f66e53a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/kab/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/kab/firefox-59.0b5.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "5dc745d761237b5c22ea236e8219605c3141ed5e7d171d0bf18c758801c6cf11c922cd0898db2f44b857f39f51a19b19e564b06ba13d8e4a8f38eb8345390712"; + sha512 = "567a0ba23f39fa88cb5c242adc372016fb771dc562fc086597a48e6a28e329403d4eda194726a181d1ca4b45ea55e721fd02c2c1cf013f8dd7b15d9a525cafc9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/kk/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/kk/firefox-59.0b5.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "01e0d78ff4047a4d01832971eab9d46764ccc1b5212a5b3ff626599bb5fcab74dea69258c77db4581f73b1d21fba571e34c6d0a9fd7d7a8616f303255ccea884"; + sha512 = "5d5367d2e60de1577aac257137d8449028f30b75cd278d378dcd213acdac31ebb6fdd86082b387404aeb68a1d41552c96221bb647be62f4b968c433caf6a5dad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/km/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/km/firefox-59.0b5.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "db054d688b293febbe67cf6f8c8bab60e8df1c289d3b8f0cfa6f2ebe10c678b33c86c60dbabc0712935462d3cb5721cd558b903daf4bd920d6f2dfeb3b9aa8db"; + sha512 = "8540ba0245932a3de10985fdc4f99db61700af56a3529c412e30a960fe05ac2ed1e9511355f6a2d1022b99ceabb16448adf0468b94ecc4aa3d5b91ea63b59be6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/kn/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/kn/firefox-59.0b5.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "71d88cdad255f501a1ca54e71faf606abe59e119b8b0654cf37bfc64bbdcf00726728073c660046ffe8fd16b6a1621e4c591e13da4fac0905a7fc1551e139a6d"; + sha512 = "0f860427adc1b5f40dc44663124363e69415a8daf1551aa8671282a717cd7443dc47fbf5dd75c961ac9973833c255dcea212bb9457297f9eab28df8db5c2db26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/ko/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ko/firefox-59.0b5.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "43bd270934915f26435fbcb803f9facbba368f7d5162e24d8ca2216f92f3de8d7ecdb284f60eeca5ca4c0a16c199de47519991a693ec3261a43904e7a18681d0"; + sha512 = "79e997f5506e55a0685d26988052df7404f0e91f8c3a3eec0ec894c6a40a8e2483dde0b47b43fbaf8ced5fbc8aaebc13bbf487e079ad10cded9ebe6450d7a9ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/lij/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/lij/firefox-59.0b5.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "debc1e1cf6c2488e4dbfcf76ef144bb19a72aa4c02d07734de1da4d4c2f7dc6d54567ebb8af8611acb5eaf289cd39a71229092a303e4574cbeb007f41c224fe9"; + sha512 = "1779bd366a6c9b36e3dd7f069baf07a383c0a9f863427f325ff3d9d60ac96d25aa6b70c069bd0419f412243adfafe21dbd9c232dbf4dc8e6bf7fb02d6761290d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/lt/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/lt/firefox-59.0b5.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "6a4e3f14a4c542cf8fbdda56917affab409085e030fc75a55958ef671d7ccba4dad499793837fcd13fa1b22625e169ed9a30116cb6ca3b1196c144ddb58d6f42"; + sha512 = "7531d092f9b47d6d5eb0a5c21f9a47d60d9790b8db93a36179c4a333afdffc89408ffd49a7ef664097ade6d741131912846d52ee0077c834010fcdb438d07045"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/lv/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/lv/firefox-59.0b5.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "0d8d3f76c752042f8228f084b1696286e962402a20dac9122b3d460d212f53a5058d308570df9e81fa87243dd937c85384ec21b7c999e4bc02b86436fd4f3118"; + sha512 = "acd88bad84d7c1280298f968139878d1dcfb9851266666c59a0fc830d61c46a2feb95f34c0fc7bc81874d6f393175ad1c48d317cdc475149b06ac11824f4d1ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/mai/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/mai/firefox-59.0b5.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "24233909ae97885182125cee51f7339b1f4d5bd757c9f59d4645b9cf1c8c2d703ed71189268c6e7658b00328e3ab5efb44fbb4cf008ad3a1dd858342d9375bb4"; + sha512 = "c4612d9b2aa2bada63a484f705788a97bf7895c2d92f32eb88684374f8fc10bc6e99514084568d4ca1e142f06208e8f4bd0135a8c4f4b7f6941e993cb12b88ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/mk/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/mk/firefox-59.0b5.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "6d14782664cd32cc9838229ca149c5cb2a9840b56e989863592b13995817055ea00c695cf396ca24f4ea92c25eabeda545a121cbb362734c35db421e60e7c5b1"; + sha512 = "6bb1ad34746943553e22d9424e015c698bcace10e16487c854d4ecfea05ba47e6d2f1bb68fce244b7c8ad9b5ead69cefd20b39eadc77433a5084abca4a5edd69"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/ml/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ml/firefox-59.0b5.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "e1da225ce72d712a8b21ea9900dee653d76de6054bc29942fa78e81f69cd4b271c143c273722d33c65788d985fc7ddefff712472011261a2207f1d4d45259f0a"; + sha512 = "97656ea9ae3f252c012f2b6946768226cc8fce1a5ad44fede8fb436bb439681c8183cadaa16bb17e7529865b8991ed1856bd90f884fdabe87aa4973d75b451f1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/mr/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/mr/firefox-59.0b5.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "9698ab79015c55be22b8e466b4676cc63175430b6ab84057c7ac099a19ee525ddc4d60b66e1cb43bbc5ebcfad45a411e1cf2f1319722f818cbf3048aa9ff02c9"; + sha512 = "f90820153d06ffcb98e881bdf3ea761d1548e0b54f91cd734a5d6fcd86439c1aebdb695ed0a73cab1cf03e3f26aa4833b85845dfc9bc5394c07da51db70a6022"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/ms/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ms/firefox-59.0b5.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "86fd705090e8862553d77b01536f0a2d67896c665cfab39e0651e7ca8c99c9e5d564a9ba0a1b174b062439cd2a73b90a0705c6c06cd17b365a91ff3df0df922d"; + sha512 = "7dd3bc7b383015d437d9f8cfcb2288b40fbeb00caf562cd4127c85e4324f7c0bb18c34e37eb5472fc7082f9d4101393315ab50a9af016d6d56d6df022d8cc912"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/my/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/my/firefox-59.0b5.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "fc51dec8d79e30ae339a1e0986fa9bbafe14e39bc989d6d9e9d0205396e75ea0346fbca6a07c612addc3f49f69204add9c40790ffc7322422bd7177ad799d1b5"; + sha512 = "fd69a6880d932b1957a2da3a457cecb1cf0350144044777155f59ec09969e8e0977f12b5980b180a086b4a75c1d94b74aec11113b683bdb58722e745fd4dfefe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/nb-NO/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/nb-NO/firefox-59.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "e9102a53a91726eeafdd9f7551a6bf320caf2540ebf6beb21075ec66beef3ee08d56eb7956ebbd607fb84a863d118e900241c6a4116d9abaf661f0a82fe2cc92"; + sha512 = "dae68bdf96119efea5820e281bae73cebfb857a26fb7f3e308b6fc5a89ce9ec409cf73d6f8360ea63de849e46ccbc9299fd941c3bb1d18100692aaa55215782a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/ne-NP/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ne-NP/firefox-59.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "1c4962aa85437fe6459bcc9bef6e79c689030dd47038528897c1d8cdc4a4d27eb824cd07c85c1c05e50bc684ee1cab8642d4849db6ddaa5d3b2ab51412260969"; + sha512 = "6dae447690cbfe761ac805b2a006b09d5bbeebd4ccb65b71f9ac7d6873f416c59f84bd1146ca3950fb44f926447d603f262f78b2ee4ce06119c729bacf5ee8d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/nl/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/nl/firefox-59.0b5.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "08721ab6fabc0544a705f9b15c52ff414270a0655e06f2b18194c79b09b4eb381dcf947f77c53e30f9af2fc8854c198a70263a4f0ea525ffb37d3b351e82c0fe"; + sha512 = "931e2a9e95c8aece76c7b7cf8c9ab7da8ec50868157bfa18eefdca40fce33d2d8deafd26e177b8c6d880d17a81abbc4fd53d77928bed7e8378652033d35e4d45"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/nn-NO/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/nn-NO/firefox-59.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "f9506f46e65b6cf72fd73fe2c93d959368ad8be4da09a6a214bbd271934095363b0727965da36c6a17a121202acc751add257c3f87311925d302beee572e5f9d"; + sha512 = "926f3ef2cb66b816ef12969f5841aae4662a495cc9f7a69d4ffe6a9e53f7286122416dab24550e93cdfdb1a9523f989dd6949aaa9a43b9f9128e9db4d5886482"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/or/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/or/firefox-59.0b5.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "ab92f7fa33cea7a8a00c62523ff2e48a41b23827dc185f3386ca0a5b8c14673d0da5fdbbfb910562c95597fd34f77d7efe1ae002a2d7913839fc2ade3a06c470"; + sha512 = "4a432b203baf674acb654ba8efbfd5f18f40bc3a03ab31f627783dfd3e13797e45de8a115e08b73afdd440f3e7a3cafa695969c8225593a55d09c58a1c5f6971"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/pa-IN/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/pa-IN/firefox-59.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "35631533264050c671f84fdee0181872f0a2ae12c7ef7074099ef3021611e6317d33441aec2682609bd6f2830550f1029f4886943c6c3d5f76a9d5c66d07b900"; + sha512 = "1036eb53799852063433ed2b9e85e964f6073da7a384759e740385602ebbb20bf5101d2317663c56933eef13fd963e8299ea3166cdf61b94b5efbab614067553"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/pl/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/pl/firefox-59.0b5.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "8c8077422a9b378b53ff213238b3d45bdb26dfa9bf19152730581ca14e0c393e8c8043fabf841d11994fbfa1050ae38008b5597a7241bcd1aee3ae577df41781"; + sha512 = "4038ac928a5ab61c47a6de53e5563f84995480e19f846e67c7cfbc9137736191010d605647f0e95d3c19c3abd7095d935c6afde9719c71df802ffd1236915066"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/pt-BR/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/pt-BR/firefox-59.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "ce6c5840c5dc726fbed6ed511a78a0872aa070b9e7f4d50bda157914252662be33948041d24313bd675c5865040e1e062c619e8a323436a5db6127a93a7d636c"; + sha512 = "7de41f598b616c7e1144410a2f25f105ae307d7d6d9099d48f8f6044a9eeb65f4652b80371d4d61065cb7b48a9190087dfdc55b7118d0ff4246255ba3f1f90f8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/pt-PT/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/pt-PT/firefox-59.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "22e92df855245f9441545e27f03b25024c0d6d083e8376f58789b49deb14b6173f1d6f122026b500498b31b8992e9589a648822e3ffb372efbcafae205473231"; + sha512 = "1508f24a9f3bb206dc33fb7182c203ead18261cce765605e2460341dafae5d6b908923d2611b93157e8f437427f93051d8400f50da36cb3cc155fb97a11b79f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/rm/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/rm/firefox-59.0b5.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "576a13ecb87a180a95637bf85516615d9b3555421d2f97f6dbe1ae6c05f27ae3d82646e5a763aa310ad266c88cbb055cc42e1a5dbb23ac78b6c9216f66a220e5"; + sha512 = "6ea10d8335c2011b3e413e2e0a9e9d7f1471509cc6238f44251183318ab3d80c87050e15329ac5df5643304325cdeb32c821028cf994784b2d4ef719d7a2afaf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/ro/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ro/firefox-59.0b5.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "583b9bc90a263622069840285b869fcfe97fca61587f9a3c7c5977de44e1c8660645b18c324c913c449510a7fca5faac83d154f198e55a29033815f8df3a20ee"; + sha512 = "8f052d48a41f43527b7eafffbbfddfa9e7e5d38ee9066e279fda3e714f3f29bcaa2b2808f4090df49210171e9d337ceea60589203a57d49bf2c3fd1c1c45f3d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/ru/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ru/firefox-59.0b5.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "29b16df393bd4e8993e7ea536a6783c0e0b0d9a8c3a9a34a7c1b065d1879810fb57ef6c5928f7386d2bdc5b3686a60828ca27ef89cc98b0a2890827def6a450b"; + sha512 = "71cf09dc451dd58eff03a90610e8507a5084833500d7b29671051a1202274f59fcfb237d47a33d07b26eb5cb8b9130cd8126c4eb546200fdafb56aa86bf885f2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/si/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/si/firefox-59.0b5.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "96ff752f44daaa0c7f1259564053507b5818fc71214c885622a2335876b7c5e33734c176c68dc7e408dfa04ceb952dd00e8996f64c5eb2a84978b4da566d736a"; + sha512 = "edd4764173bd0db3eabe024260d1630385bb40736092a2dd2eef2d53652f31c0cc7d919e99c938d1ad1a76d2b1dab43482c011c1bc1608a2f0589508ef6d082b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/sk/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/sk/firefox-59.0b5.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "01dcd7ac03c5dfada7967de793b4c03f94cf47277ef44f24ae113f797359b9f7d356b710c3f2afcbb30de4c474d262a03ff6783efda70ac25961a39d608980d7"; + sha512 = "6004642d3b2a5c81e82473c8ce36d1154165f7690959ee2ccf5e26387cbce3aa5081dc01a441f90bf13f4b95ed4456daa1026f76a4634bd2a076db84f72f9ae6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/sl/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/sl/firefox-59.0b5.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "f785490a583f498ecfd3564c918aabc4a2395696a014be4cc2d21f413baa2ad96845a6dba7012ea238b22f96d8bb3e59df7644a489d66e441f112293e7cb8fbf"; + sha512 = "7c34ba23fdc3999717928cd4465d88ffb77551bfe6e1d142a4675719fec1976094a5afa6117ce5240fc52741bc1fc616338f30227fddbf08be253d9e9e15a632"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/son/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/son/firefox-59.0b5.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "1d2603e1d0aaa4e7784073a5a6112e2663a08f26b5b835827f30d564ae2cfeddf9d18575b90d770c150900cf61d7150959efedfa428e98ac3c1941eaa58520eb"; + sha512 = "c15314dc5063751a291b50b1f319eb8bc99ec8f5dfadfe6e6c2c87fa6c9c97b2be9ad4836ec16954a6785ff18259c3c77806d09d9b2aa62318fe8acacdec6149"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/sq/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/sq/firefox-59.0b5.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "7b76372edb4b200db2632d6f0132e087364c9cc2d81cdb5a0a55590440777948419ee8a61678656bb64812f39c47252b22716f16f386a24b39126bfba5c32371"; + sha512 = "4d6b82218287c243a9bf15a95b7abbf38fd733042f33bde959d16452a8a15c10e4a999397c71624bc4b4234e3128b73875fc467992fe9ffc6a859fff7d328572"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/sr/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/sr/firefox-59.0b5.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "2e61f2ab6aeaf1b1cd6cef0aa33710527427111bbf4683bacbf264e8057779656ae584df21e763485f070f5ee9d94b482b2e4cb44cd36c57923247c0777e99de"; + sha512 = "18e152bf426300ea964cbc539740883b8a62dc12ea8a48cb5ff8171fd3499a4dc6b8a824eab8e711762a5146899d62f4bfcfd03b3878f16aa997a8583b004643"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/sv-SE/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/sv-SE/firefox-59.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "4edc5186a2c35184cb30b3cf4c514ba78322b378487234e8d0e7b8aa735125f3dada9b1ffcd555f346db5535d77ff6e4a869d02eadb9bed2cf6eaf55eb98eeec"; + sha512 = "53a3ca59a8535a3b7a69b5116ce0906f8162611a14b877dc56a86946b1ba7b55885fe822309d00b12d8855a3ac7dc515bd8bc396c71b4055fdb2203f119d7fb4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/ta/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ta/firefox-59.0b5.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "d4f551371961924869ff50e5d8824cc79ffe1b122819bdee6943e5cb075fc08267085c5197b6db0e07b42d75c52d8693e35c480f69c7ded63e18760f96bcfda1"; + sha512 = "922f626af6df624d4154dfb074627bad3a7e6ccb95e1e607bfdca0a3c0823a68720614a52d5dd51a2773f8214695803899a3b160c1220fab3d43351d4c41d3a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/te/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/te/firefox-59.0b5.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "d815d93e0465039faf2fcd41178068703472753e4b0b855a0815c72c73fecffac74968aad3e8d47bba3e032a1f93d5f6e7437867d1ebf8d2c6815fdbc3d78f12"; + sha512 = "2138095dc31f49b6266c8b8789ce7ffd674d9d3888eb0f2255a04f15b884d3f076d4e7f00331f6b4782e0bb5f32db9fd923679c19b07da029b691283ad9cfcf5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/th/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/th/firefox-59.0b5.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "e0e7735e7bd702a76ce058132e597059ceafa9dc9d2741c71e10b19d5ce4887c98b1eac7335acebb130fe2569b70e3d643ab866f46fd99a1ad8820f332e5842d"; + sha512 = "cbe73835e029354327ae3ab08617508750252056b1ce5d6bae244e12e0141eb284fac068670afa40abd7da568c50f0d278f12c9650d605d785feb040d911e53f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/tr/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/tr/firefox-59.0b5.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "b81295bda0408343fc4789eeb715519d3759af3142aec44f58613059eb574aae4835dc585fc720df46920de8fea2d147038643ea8e2d49c461c7285d20a42f93"; + sha512 = "c02b011ef67bd32c07140e2a994de8751eeb48594f872ee7f4e2e886f3e0c80821a9a2937bf1dedf673561b0a18961953699116ae3a3b409a47ef1c9bf56159d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/uk/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/uk/firefox-59.0b5.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "fd3b792984180d3172724895c86e33fd85534c6e0c32de919c9af8d762f8c49e8adcf0a00f78c6285305e0691918a82255dfa4aebf070696cc3ccb07f40aeb1f"; + sha512 = "929b9c653d9d4fb0b930256638238a70ac6b000b688cabccba5dd408742756a54fe08857ac43d4c18ac638ecd2b4219d5b885897aad4f2c665cfc7f3a8250128"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/ur/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/ur/firefox-59.0b5.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "c4f715930762123056a9b26a05911d879daf39a3e46c88806b9ca99871bc42b5c2b6cb727d6f2ff5a16101a2cb3a03bef66cc38377f2b917efe2dad99fa65be4"; + sha512 = "349d6c15c211b1b764797e46a6275a4ad6d50d17c50968e91e23d9d3f185180436c63eb3d5c98eba1d7ac48844ba296de15c4cf22be26a169e38cd9c9682343a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/uz/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/uz/firefox-59.0b5.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "31c0fb30c314452cf1f1072b4f87e19ec568c28329dfe35025f02fbaa14f68f77daa50b2f4c51c7d3aee7d05728f75f5b481516802bbffca16aa978577392f63"; + sha512 = "19a7fccc33c0b71af6ffa2a699041bd0f04e2aeed3d22db11354250e3d5ac50149e38c23fcc7b2fb61ab7edc4cae30bbb34b7c0331e22e35652eb3f0a6d20c65"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/vi/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/vi/firefox-59.0b5.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "ebbca80b168f1b65c3746a392114b16816e07f68807236d5e7dc06c532c62dfe8d538a00ff5213fbff8f1d9c56a8ea97fa68ec040d64550e86a71a2d535a8ecd"; + sha512 = "d1ed26f2c38e6918bb58d9284f1e190f1d644014b567d71603ef06d181d550e10cad198efc1758a0f84ae91edd272f7ea2cb96c79c32dbc8dd4124977d984348"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/xh/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/xh/firefox-59.0b5.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "82b45ca0803f037e573ae199b786295346f9e47759cc66af27a2a4c1a7fb80ba03763bc481db7fd106cabc869fed1d657f57ac181092c0ee5117b2dd19f8283b"; + sha512 = "dde88337bd1aecd728234f4a868d7fd32087b863c193d8ba87875b2dd7acf6c3bf72ac2fe3b0283929e64320b7fd481a898637b7860e58303f41c59e6adcafb9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/zh-CN/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/zh-CN/firefox-59.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "f03848146ce299a9dfc3dd3893025b270775722fd6b6eb5681aa739a8eed11bcb590d119adf56ca757f7117b990108f3fde7585e9d43e5144a47cf190e0e7296"; + sha512 = "dd659b712c7c5f36eaecf62a382cfd45fb70dff95fe9f1bd162d9cafae860de71fb64dc5d6dc3eaaa19af3ba7df714aacc63fa471ca29afd7616f80038e65b35"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-x86_64/zh-TW/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-x86_64/zh-TW/firefox-59.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "bccf01b3ffe784f0275da7a00232363b72881b54a31f2107c2a9bbecfb8a7df482ede0d5c8c72a8a0f94d182350a434051de3851df846eb26101c7a1817a0a91"; + sha512 = "9b3ebec8f372ce750ec17dec78013e910f8b05bbbf8b270aa7e9be84f627719190c2dd8525c82c04a4f6e957ef71dfd4bd0aaee1e92fd019cba9a297802a49ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/ach/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ach/firefox-59.0b5.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "9bf7ddf8b27017a8d326473d71fbe2ab88670c5c555376d950fa2b28600e43b8af9d04b574e90f16b4ce2763f75c3f8cfae427d89dff00f498c84d3f9219bfe4"; + sha512 = "666100224cb7c90409b86921ef4f01eac685187bcbe306077909f4822691935d77c72f7685483e76ae7eb830d57d3fa2e404bcb542247564114239e3933c0497"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/af/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/af/firefox-59.0b5.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "40033986b4fe3518566a0c4099f357c115faaf3cb6b627410e59679a150b1260334a73c617ed85a9d36a12195975d1a433f7cf533c2f79d1ccb29d4feff1453f"; + sha512 = "32024e9c4870efa6576b35559ee04ee5130d90ed5e9931e0b6665b65d202314bb343d197f5d1ce3bd5d0a2e3136b18beaea033825f225b157a5a47ec78e9c35f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/an/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/an/firefox-59.0b5.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "65ce414c54f1b6ca41359a2c313a6488e6c5d2df6ee76387668c1a925e39b8a65749c8af96630ffd9bfeb673611167cc4494c576f36140df09c3d9bcfd67854f"; + sha512 = "5291bd5d28a1d3f28473731bf916e8a2d2f0e1fa521423f588b35155c889d1784c986ee6fc40faee0b6c879088bdc04987037ae5b34585cc981611ab2d1c2bb8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/ar/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ar/firefox-59.0b5.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "4a41adb9dd0323073d5993a354d7963db8b4c8e2daaaac73068f19efbe1de8fdd58ec3b1685dd35717bcf1c2484b8a5c039a700b0d080f187ec12102be4a6b4e"; + sha512 = "b8c744f892dfcfbbeaea16e137b37860f447235f7a6842a1e5164030253974aa713cab0e9ec4646b15bd62e23794c6d69065457cb7aeab18214dfd898062995a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/as/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/as/firefox-59.0b5.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "aa77e0c4af98a3288d5d7865cdef5d7791bdd3145145d851b3bdc96e6d2f0a361614e845d7882d146029056c8b0c5bbacff555fb8ffac93c8a0b4405c88064aa"; + sha512 = "4964447e37193809decfc09a47ed96133560dbada6178dbb2b6f2cf974f2b2daa62b3eff0d015f890dd651bf9f2432cb47bbfabdedc75315af97b2158ef5046b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/ast/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ast/firefox-59.0b5.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "46d0a0999e8b05e5bf8f7e9bc1ee5bb60f62aacd54afd22d4d26aab618d78e2ab045252bd012fa3925087aec1dc79e999a885786e8d5deea4d89990d3be62497"; + sha512 = "e34a66027afdd4191a11888a9e0c9cb5b35996f57255caf1fa8eb2b7effcc373fd96a253ec8067a1b6c36e5cd4d6071d04cc94071ca4212ca49308200d09545e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/az/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/az/firefox-59.0b5.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "2334fd559c54806f8b20c563a8edc0f70d52b220a2820bd19d49044bd0805d3759db2dfda962d658d2a2b4d7dcd4b09487a4c6318b6c691f9e09034cdfd8fa30"; + sha512 = "83ac6d10d9e5606011e6addc54b02026d1ca272a87813e84756fa3e8015c7070e3f617c9d9f17a673b161af1cda86a418ed96bca46c8397d7950bb40f1255825"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/be/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/be/firefox-59.0b5.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "cf5a294026977bad4240856d7abefd6add2afc93efde7c114b123fdb491592febefb5b5a47a21b0c168a65721e73393181b21881443e7a4b61edbd490c3d61fa"; + sha512 = "482a0ea33bcac3a760b6d8ae3ac7d52e514654ae340c22f8db17fb39b92d5db5796821bf8c658435624550adc92ec9f1d3567bc6c277ad182820756cf41ea19c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/bg/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/bg/firefox-59.0b5.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "7420d1246b5638d33366535db0408dcb68b8576574f6f95dbdceb8302dfb9ef982997d3e43cf3c6352731c88ed3886b9425cb1149985103896e639cdfb156a1d"; + sha512 = "e57d29c139f43d42bac98434ce0285405c16ad48141485ac9d0fb15ce3b1ee920bdbc5ff1f763faf45c71553086b9001d5e24e2940635ed6caa6bfbbebefabc1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/bn-BD/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/bn-BD/firefox-59.0b5.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "b1f5aa5d0b6f2aca481d79f20c11aea932686ec6cbdb27af38b0582420afba15db153f20d16928aec6b17b183f53dda2dedb3bc1c3bdcaa441ed06b592e365c7"; + sha512 = "4e145b1a7a5681d43178a210981785ee3a44d9c8b7a1e166b44331daf99bcd4d0413e2ddc6e323d228ef6c26f0bfc5cdbcac82a34d71a7964b4a67bb5348356d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/bn-IN/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/bn-IN/firefox-59.0b5.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "c1cc1abb25290ab1d93a6cb60d0c02e7e28c537626f24de4803818a274d91eb217e1b289dd4d490e23225e61cf3c5c608ca45b1212e3abd705b999ccd40cf3a5"; + sha512 = "fc33f3661e98cdcdedff6a5bef544ff059861389f14cf7854044e6ee32950f53a1cb74339599e407f60d92dd82ca8a6df77b877501a323a67186100da640267e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/br/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/br/firefox-59.0b5.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "9693d40e9b7e3d1ed61ee69aa9212a85641a59309669793f941420ac1a758aee69d42a6363d393889509d25cbc48dc194e5787849ab7a195eda09a313d69f793"; + sha512 = "af31f2571a2cf85598412f7921a286f44c2f78ecf46f94f76626de29e2b5a7278963757a47746d974c085297ecda8b42d7ba02b0613091a1eaa116c5cf36876d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/bs/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/bs/firefox-59.0b5.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "7840c8aee7104ca818d059589c8189c78f03fa7b2e2137c4adac77f714dbe49be35dccde0917fdfaffa36fbd815db9c9a32dbec02f4dee5ce819257f27b20557"; + sha512 = "c1016709138e985608d6edba3edaff43f46af60bad19247cb1f7942fc609d2ff845341b2aad38336456dfa1d74783cede88eeef3abb97dfeb1c3c2ebdc4be1ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/ca/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ca/firefox-59.0b5.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "39dbabe075e145424ea4c394d0e273ad7f5311aa6dd4ad7b612c6ef8816446630b62a674141c1be350aae90f0869380add96e90f8041e16783f727dc7ab00de4"; + sha512 = "d862326e3d3045bc0939d444b12399f89392a1b91972b27c93f475d1a8432272bab3b9c568a3f597abc540e2a085d1538906e8c3a8dd79ecd5afdb0891a07c81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/cak/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/cak/firefox-59.0b5.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "2b266e1e34e31fd1a0c78c8b67f2be3db3a5b0e562514120546244374b0e1af55492125f3a5e8c1cb2baca9ff396a1cd0737ae17e4f3ded5644cf6ce3bae13fa"; + sha512 = "10d2d073868fbdd8b8b9c49d10368948e9d24e641b3c86d2629fb513077ddd1c364aeefedadd47f6d8709df4372b26624b3211f09816bbe60fd02be7ea7a59ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/cs/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/cs/firefox-59.0b5.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "a388f3917da5daa492f9c9f34a86d840d8bdf085e77cd68328325e6f8e65dcb7699567b3ab9e4fdcd3972343349a782b58f97b3917bb238d5b9bc2b394823647"; + sha512 = "488d65b5c33faf6de23f922f8456f14ed4dda2db7fcd307b3b34b01fe22ee7abc679cf0ca009917fd00bf71383965239320011b0e275a103c45c6e22056816c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/cy/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/cy/firefox-59.0b5.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "cc514798cd30484f2fe1c09511cc700d4b6323ca89ccaea01d596d6059835d53d3c009c1e363a103070f1c80b54436043d0f69d24545be7d2491258d0affa891"; + sha512 = "03450045a45114d7228d3534c3488e34a8c1a163396592a8194db6d599aaf7542843123bfc136cb8b9b2a7e5f58ae8b8187717a0c05aad7bd0f3051c0ec0876c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/da/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/da/firefox-59.0b5.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "c0220ce6ec6e0d926ef0ab935d259affbc6949626d4a5d169b48955018fefb9ae3f59502fbf49c11abe8714e1ff0cc4262a49161346d090719eac10b35ed2971"; + sha512 = "f91d643d5e90bfee170437c990e01744bc5e4fffccfe16c3b806cd4c299c9601b651645ea8c52bef6fde3c1b4a4509e1bba433a315671cd4c614fe0462af4ced"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/de/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/de/firefox-59.0b5.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "716a936a251aead694adb86723628aa58be0148988456c22992d7a7ac504b39d4b03173989413fdd0d991a62534e2635b66d8b1e04024dd6e9f12a5f07b51db1"; + sha512 = "224a65f6a82c8a50d9a1349e88879dd93e7bd5f958ad0208d5f7264d6e5deef0b76659627ffdb21bbbdedd6853050d7a0a3ae1a86c5f6713418c6447eba00ea8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/dsb/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/dsb/firefox-59.0b5.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "29a251d0c37b30752e6443c5bbcb18bc115273483608389955da5782a3957eee398e5d5918eaf275a6c686580accca5024906fcad3155f3ebccf5f998b9220c1"; + sha512 = "c5639b8c3c002d79992deeb2d6156f82cb04e11e646fcd0f41437faeb8b49fd7e08ff89c00eb5a9aff80e70c5b90ccf62498865fccd08c1e4db64f4b27633fcb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/el/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/el/firefox-59.0b5.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "428ccab5f552bda5fe4f8d04fa631971a9264c7a2ead4af28476e6cd4048bb2572174d0bb96f0a0771a90772ecb135882e30bd984da6e8e306073565b94d7039"; + sha512 = "6175fde499171372212d088882203c62cd75addb138946ef7dc0a61d1ba4cda71dda6e3070688b5b4075ac602073a001999ddc0be52ca41f23899b23d053e659"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/en-GB/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/en-GB/firefox-59.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "5d305b59279fad73003d7643b57a5525aa2d823ee59cec5370c8a79e126c058a5c4e0961cd6ef7c93757d5ab6b8891ea2711c34a41cbf5aa10054bd8055b6b49"; + sha512 = "a694c3260358baadf3eab7b0feadab53facceef72ce1c760e845183ca0309fc67ea02581d977f0b45d64742c48792f8b07658c83f4ec9cc9aef6e5fc126f8842"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/en-US/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/en-US/firefox-59.0b5.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "0f2e563354036941b1900383417b553180df8b0a00f6642af294ba352d85b11383428a568a7c75722619df2e3d56a41899d6275bad81c606ed307633594f0b43"; + sha512 = "c2f2a3599280f0a44053879ed5fdce337c15a78952e93d93d3138b550e31b5ffb62403ddc0092c4ac82d04908d2b0aaa6a7698fe2dd94cf78ebab066dc40585c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/en-ZA/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/en-ZA/firefox-59.0b5.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "da2ac0345f00d954aa979fce5a2d12d84843281e04efc4981596c3f6748c1405469beb015c8e07d9966c623d9f105b7f86f6633d0a25beeacfdee8431803f4ea"; + sha512 = "bd6e7c2732503ff2ed9b4e0b399bd4f98e02e1fa1d43637ea1deaff00d1916fbdb5951430ae06296370a4959c2364a7473ecaff145eacb304a9ea888a0d5af53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/eo/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/eo/firefox-59.0b5.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "1004615fb78788c07acd6fca9c7ef24c2b66b9fe1a9e3ad131febeed3463e7be7b273b0d65cbc90dc5cd341b00c3fbc938e4406e0638181047d101a26c173acf"; + sha512 = "e737792c3ae820aaa9e01ebb5dc6ed508fcc25fbf1b873942f5dba8e99c4ada0320b7924de31813794b76998c1ea8ef555e9a8ea98f394a455eea5614a1c2a60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/es-AR/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/es-AR/firefox-59.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "3e4be778027214abafa667916849d2d326d276593810a84b419439dbc8b9137f4049824f66d0e3f180c4f2cdbedef6403fd3bad8a6f14360013e4c2a96b4ede1"; + sha512 = "3043e15fc4e6b4cc19f2e0c74ac87cab1ce4ddf79b7227bbf986c6e325d60edc33924909939def86092368f7158a5f12d725ac20b71f53ac038e2f3ca7709f8c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/es-CL/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/es-CL/firefox-59.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "b8b60e49eda4885dbee67c22127bb06453b1e20c68ae85fe6ebb6722b7725295b8d01e3d6b0652da718bdf006c93d02f3fc55b26d4038d1e4a872cbeae674a07"; + sha512 = "396a832f795c20eca7adc9147cacad5a90a56bf4008699f96cd8180d9fc52f1d318656a8729c82052a985444ef3a3ba4bdeaf2caa279b2a1c9d6618c94a2c517"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/es-ES/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/es-ES/firefox-59.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "f253acbf8e864755fe03768427d2a738b43041cb283c29968e51116a023c12e5d66b24aee9bffb9bee07b04bb2504abbb6d035c065f43cc44c04239d367a39bc"; + sha512 = "c7101edd19e9a1106d586ae79e9678e3526beb1c90f1d0922b898ebb986236338cae2c93121b3186b9e9084fb293f7725b769586059b2dfff5ad7646d294b3f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/es-MX/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/es-MX/firefox-59.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "3393e4abc9ac5d2da09dd4708cb4f8489ae77d5ad344e4608f31c9e9ab8c067a37c313f302955400c0731eab588daca42d23b9a43fc1210864981387c237ac4a"; + sha512 = "859be5955ea7066be34c8436ad79e8a19add4794be5fe8822df5c5b418f63d675f5a22e0608aca1b872873289288cfb5bd3e98a18774ff23afa0a66af5dbe0a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/et/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/et/firefox-59.0b5.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "0c35bab790796f635d8f423089d7b3e5cfc674fe6fcec6223f16760be9d01c69871d16f7aab45952093ca3c401ea99009ba0f5fb3ea4feb133d1f2e1858ca59a"; + sha512 = "10e1085be63d4baa19391b54e8960344d70f901d07f67f5c1eaaf8f2bf8fb2b90635da1e5c423aab6ccc6368a7d4bf27ce5dfd3693ffdcf7311f9c1bd888e1f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/eu/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/eu/firefox-59.0b5.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "d1bfa7e8111251bdc59b55fee8d565348b9d12b01f5da81a7cf256dbfe307516f095b7d719ecce91803df7c105674238e0f7194481e0b17eeaac8f2fada7d023"; + sha512 = "ce1c796b1bb419c27d949fc268d5eaa0e1baa9fe93cd10603bf1a4ae60f66f6fdb8a29e14255859c45adc37e000dc65a9887f9eeb5ebd3e05d46a0f0f73dbdf9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/fa/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/fa/firefox-59.0b5.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "1bd4672cf9d095afe35ddb447678fd800f89e06efcd5b457bb60528b778f67eaea8aa9fe4e7faf164812db2757dd76270bb730f288562becb99753977df7422e"; + sha512 = "5ccf9dbfcb55b67658611c049d6ec5e859493c45015ff9f424cff8dab45b69be5426c1905006b04f79762ec7be5e63dd8bfb19e0d5cc59e02f31033b1529d57f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/ff/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ff/firefox-59.0b5.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "e00b945741f70f63d591bbb44a6f9c4c4e1c268564c54aaa0964e122fda5985608b01c82ce63cf6f0818e90ebaa97e3bb6f8d449f21ed9d0a0c565df300e08cd"; + sha512 = "f2ddf1065e5e848bc99e2fcf8ee9c6e5049070380c9414e675581bb842c98ed7e9e1fa3958662282bffb9ba41d52dac0a66c1376d094573019cdb101401b4e5f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/fi/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/fi/firefox-59.0b5.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "9360aa1b7b736b2964331c1b5d80d00f4f1a33f251c2d94c153c660deda1810db02ec114db72475de0867f46a555f9de97b9dd749354993c4914dd28da8c8cfa"; + sha512 = "4fb98ca5bd53beed2dd33f3f3d1bc802690a7e856c8cab0e830f062c0f115a964c60117392cc9b24b75adbc564c9196fc951174bb2da72b76941ec2148895393"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/fr/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/fr/firefox-59.0b5.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "527e2be2a662fc97e792a5248c89d55128f5fe454809e5130e73c85b147cc4e927bb683cda9fc8a9d44ee447081843d451a25c3b1c76434c377752817460151b"; + sha512 = "6a2c6c1f0f4e72db4125e613c9c9c3c91b0bea8945bf4e12f3e2682cb50f7cecfcb0fddd63c9591bc39fd31e9eea575b159fc65bd3fb8326e24bd315ad1fbd40"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/fy-NL/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/fy-NL/firefox-59.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "a1505be8c3ef2741edc41ecd3521081b6b1ecaddede25c06c1db2778ad98d50e8b17a49a614b5b589cc7ebf641f5748e71b0d0106a4c3e5f43f24c410bb885f6"; + sha512 = "3d1de44f6c0b01951777ae913dd25b89ea0c0fed1d12eb8571aa4c79769cc2222f4c417c29a81cef908def319482eaa09c3c09549bf388841806b2ec27edcffa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/ga-IE/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ga-IE/firefox-59.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "57fbdd6c6055d2425e2ea58c72048c3ce7754d4c6aef3af9efa201fd986c8dcd5a2f3e4dc57bb050b3852c53c1894d6a0b82d8d61b3b789a27590e1b5d950280"; + sha512 = "3bf2882d814b539ecd3f7445fd48983d585d40e530693160b39342215ba5a65623985d1b189ad76b07c1c0c39cbb4ea1b2f45234182766e4bd9f13ef1707d009"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/gd/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/gd/firefox-59.0b5.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "d91d75d4842bf1af525047e0f43e5d4a67f74942c17380e521d136113d0a0ac757885fab7180faae9923a07e6968c7fe830624189525bf230d29c0c71da5641e"; + sha512 = "547f62c2cd0105e4328171b30b2747e4d75424e42866b19fc600206d90208c9e21b484df2455f5c2354be493ae22f7c8ccbc5c26a4c17a7d4c55f5b177d77f56"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/gl/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/gl/firefox-59.0b5.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "824021e9080e045f4292dc1525135c69a13e7941aebd2bf9dcdfad5a974247b61455badee0406637d7d2876d877a0993d36f64c15697a15f147f4f6f14ae7ebd"; + sha512 = "90676f1f7ea1cb0fbeef5a3bb8ec28acf389ab755cfeaa1484639fe44add3fa89ec994f93dc7eede2cb71f76bb085a3351dca6a0a8374997db855f921aea889c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/gn/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/gn/firefox-59.0b5.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "41cc7f1011e99284253d92a86c8301cbf3ee9e0bc85564345228f05cad85f05c7243d739f8d752af6cc5c45eae5040a232e5e5892ca224dbff352923be92db73"; + sha512 = "43b55fb395cf9cb2b9705f4986b95cd323c26bf1c6fe47d6548f58fa03084e5213b1be99ce843d0af7947b94cd8891fb0431a1c80cbfb42bf09e69eff3b9998d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/gu-IN/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/gu-IN/firefox-59.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "4be931503d49360865a68cd9bb81c4cd79143d0792147f99869847fdbabc33b22e905c38de70c643e1ad66d453aa06583ed790b6a0264a005a6a97f50148b22c"; + sha512 = "c294b70d51d0ef31d8db3fce36ecaa0d50b79efa272731a473d8eb7502ec9461ee6a5acceae6e6f46ecc008713e28f943817153c458664238be01c21fcd1952e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/he/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/he/firefox-59.0b5.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "3804268c7cdd7a8c1e7f4ac8452eb0ee6e905570c3ce3a2ea0859f3a20611bf5f628eb86e16fc78bcb3962038ef3b225e81b96bb38bfe619c97f7849b5bf85b4"; + sha512 = "872384072f61046c18169ec399c7a72f9231b58d05fef6b41b5591ae0b28c8f496bf9210738c56249e682b451f257cb220204aab74e7f3fcf6e998b5350f7665"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/hi-IN/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/hi-IN/firefox-59.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "8c5aa00a74ccdc45abc3b320a712e9f8b87e39712948f5053a0857c1f035cdf395d48593a3fa1d3cf060f0a91b3dc8d305250b4a84816c5314c7e06dcbca1ace"; + sha512 = "6adff5467cc9a2514a456ca84de2bf91dfeb8d528e1296a636fac7048a353c4373270d551902cbcaf62567af53df3d4db0abb2788d28c24b014aa73cc515be69"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/hr/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/hr/firefox-59.0b5.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "f828cb97a052b54b6d0bf611494d62b6cb80458f57e47d4ce68670950351bbf03f5ad39f9bc6658f44b1402ff95e25a697f9c0f602ff45b373609d4fb9c9367d"; + sha512 = "09694e46fd369ce0c8b6b11c04916032880056529a4fa5d7acdcc2d46b1a47f01efdcccdae8f569e597a52acf45198b132654dd3fac094031ba729101cd36aed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/hsb/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/hsb/firefox-59.0b5.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "f863ce0f8888c0058cf2e9647807dc0d6417e9647dbf802b1eeda3d33bcfd0608a83064a5cd2215887b4e4682398b45639812867f89d7f1a408d5de7e5e33b4f"; + sha512 = "7eeb065f6c7b971a9a9f9f94e1eac6cfb45b2c7c32b9770cdd49d50162a5b409abeb349e676568f3c63e973311791dd8ce6b9df340a8f13cf5afa19df780dad6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/hu/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/hu/firefox-59.0b5.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "35c267a70c0e91e07c40ce56793d037e6014f8635bf295d96681043ed634f1656f929fb787d123068af1a7f4d4e87bbbf85d25265ff1c6df0c3dbd67d3e895ba"; + sha512 = "da930d401adcad3c1648cbbbfb7148e8ee7255b937a4503f9e8c686504ce7b1c40cd5aae54dd5084669a153c449807414eaf689804b56c06a0f453a998aecd40"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/hy-AM/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/hy-AM/firefox-59.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "5e16713df0a417604768f166371e6b2159a4982d7ac8975b328174824ae3bd8f9e07c26a7abe9641726b54c306aedb9ae3d94ea5df35a36e3a46bdaeca1bce92"; + sha512 = "e5686af9acdf7d11f0cbf80492e9288570d358ed8b4db9567b943f3e2de5f44715caa2fee8da5e11affda917a896a8822658c8a55f0085a93e73fe9540cfb09f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/id/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ia/firefox-59.0b5.tar.bz2"; + locale = "ia"; + arch = "linux-i686"; + sha512 = "bc7600040fc001e39fb654946ffee9317983729391767b91793711bd1083d7cdc16af7c1fbb91fc3bb8bc903529da3c398de9da4a3e4b0d3ecfea6e1ba8904ca"; + } + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/id/firefox-59.0b5.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "71e8f33e491456982e1a6ce6fe9319af12a5fe892ba390c3dad08258ba63f5ac2d07f8386d984851fffb6f309c55da6ccc497a1aeb392d81fc3ead85c672cea4"; + sha512 = "0b3e845a2f346f21ec90e0e423c7d3f1b635fa0ab1cebeeb7cffdb4f4c849ac100f17f370ab4902b18997a8f883ad71f651d397fcc8b7ad3ade7b643f2e75a79"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/is/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/is/firefox-59.0b5.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "9a406105b1a7bcd2831624df5249ae72df92ed4f330d652c1218e0a73744d57837a87646793558c6b762bc113a3322d057c7e716dc7dfba5350aee622348a4ec"; + sha512 = "f345579826a039d7008a86e04f437fa112579f6b21e2032e8120f9444fd86d38831629683c9441d7f1f5010c02f18a0b7232e7c0db0ebfa82012fc38d7f90165"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/it/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/it/firefox-59.0b5.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "19e24c0d4d1a258ed3a7751d0e436c2f4ce7d70f7b7dcb913bf1a7555f7cabe3f86a89e3dda4159f55dd3a06be3e59d36c52b3405436381ac4879468bd1b8f68"; + sha512 = "27e4ebb4674c0ce189f649d5dca273787386103f9b2274600fcdbff10b78bcd5ce39e7d530e5438e2c3127ff2ad15ea82bfbe07a9118baa2d1b722ba8ec2be18"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/ja/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ja/firefox-59.0b5.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "7fb565751f9f66e4fe2b935bbdb8276100fde7ddd78d5575855248b41ac02f7712740113971b5ae25d28ee6913aa41be5f8368e14c1809794b1cc5b0e9c38c63"; + sha512 = "30ba80bf62edbc26314b10ae2bf0caa41c69f92d6fa04fb086471b5d7b9f439f74d37b0c9265f8de888c599e8efd074f284a085fc22251599753c65fba7bbca7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/ka/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ka/firefox-59.0b5.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "ae59964b85fc7d8db67ff3fe8068417a97db9170367b5b626d34707df5fb13a5568bb5bba6e0c57233815c19ae0e75b79813cecd22340afc99c36afc5d47445d"; + sha512 = "fe305ca5165d693841e151e3356068e797c2058a017f8108cdf2e9959a13055fdd77091c206bbfbbf92971b0bc3141821159add88c031053370da266883c887e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/kab/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/kab/firefox-59.0b5.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "55d7cb1e2f8a2f70acd1e3c7f72fb254d7c857ec3871e2e6239eb83e891e19f9dc888af0ae577f26b03f9924eef74220c780e0352a378031487a07c32000ea32"; + sha512 = "3413725d76686e50a4bc8125efa0160ac0ce89c92ae1afc41e9977dd2212a59042e4c02c75e2a48c9b09d1ea2da7fd8683a524f90f8217e58292b0abbd0a3242"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/kk/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/kk/firefox-59.0b5.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "1d04ff2f908758edd7c2376b7b2effbeada0aa35b831cc3553bc0aaeb83b754ae1ee2043e21165e308e1fe1fb1bc5a93b5a68651901debca5026208b11c99e7a"; + sha512 = "12dbec279fceef28b199510175a18455e2db411beff26d6593dd5ed4deac509be50ecd55f9c4e31e65eccec59a8bef6fc02dd054ec9644505166d4a0de672cf2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/km/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/km/firefox-59.0b5.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "fcef5efd174f3acb5ac6521083d2291f2950342ff0ef840bdda06f3e9d310d03ba1105319298fed5ef32a9f410f31c217759e8453abfcd1a99e9ebc85463eea0"; + sha512 = "e69c4aad3b2fda0249dc5840af8f48b2420a213f0801397c434ecf17d096773f235817bd9f6205a06fc22529fc289417fc3ebb292cc7932ffff9e7de07ab0c4d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/kn/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/kn/firefox-59.0b5.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "eb4d9f15091d278b579db71bf2848f7deaf196a24bf6173e32c841b0ae91be545a142c1eb1493727b90cd94824d6658d0c5d87aaee4ed7f2f22ec61967999b3d"; + sha512 = "7748d7f3666684021affd3d50fe3005ca5bb47e0eede9aa4379de60a0d6fab292753e577ced60c117ae6225517828bf750e05cb24a0406a9f5b4aef7f09aaf2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/ko/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ko/firefox-59.0b5.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "c4edc07b510fa57f8e66fb446cae3b21fb76b99b2b258e3878b0f05f2feba97f86697a4699a29bd392a43ed0951d4354db3612f429040a01c5c77b2d22e5baac"; + sha512 = "04de73ca7c1ab3611baf8192b108aa5cd56582804e17a822f3fb39595cfc155538ffabe38324a1475d95605ff7c702988cb9f4b6e086813b5c661428774c2fa4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/lij/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/lij/firefox-59.0b5.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "7cecd1fb43849b569b7bfda543da89215ab1a1b7636173558e73b29219318aa66c987a0bcf21a726f4e93e97d7f123866de52f296d69acd9b2d883406b15b33f"; + sha512 = "d35f733597a2faff1ca54fc4fecd97ac03576443b1c2ed8114e14f59bcc71e58e3a828451146a592222d406b631b6c55cb554c5900593a8cfce83ea68d29f88c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/lt/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/lt/firefox-59.0b5.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "74420b29ae1dd7a64da9e37c3c8752c27c393068be61da83e0068ebfd1649cb06066acdf00a86beced98a4a327e042662dd7d425ccff08074f4fa6593bd67455"; + sha512 = "594d93a8537b9d4ada5b87d74f12902580c8488f9e0dca9b5a8be109025006c27d6b92ab45b76f177cc15bc0b7e95d2544c0d2acad5a7ac64119b008c8304703"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/lv/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/lv/firefox-59.0b5.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "e5d9ff45fa5744d2992e87bbc30b6653433b0b09835c0f8ef26684384e86e2199df953bd6bbf88747c9d914084c0a238415a46652c35bffd9034c914dbbc88d7"; + sha512 = "f904004e0bf94ee2cfb9fa22c020f6e3a4c0377522f6ccc00ac69df1133717b57bfd5403ce97ba8b69775c3caec9c730513c53db262e8b62f8b8360a0e340c7e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/mai/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/mai/firefox-59.0b5.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "c0c28f19b99981b989a9d8611dbd3902729163410b19372884a069156c07c6ed69b1a271b27571e10d6e58035d5c4ece4ee2a14aed7fe8c0e2f146826b8c107a"; + sha512 = "47fc45930445344210762116c56004c8e6dab52e70926ea9837852faff9d717a4d6f5d04df66026fb33487051776bdbbf07d4faa2a3eddae23faae3c88df7618"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/mk/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/mk/firefox-59.0b5.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "4bc61d865cd43de6a00ba5262cea51180b8a88da6de0ea339a6ee84e1fd96912ad80c6c8ee84425f8b519eed1c945034d102c97aa7183bf08ac385bee0ea3448"; + sha512 = "8747d1626b54a83da79780ae9919aa75a6828fa94b5eabeb299b0bacb1fe5f44f2540a223206df3c3a3cb3ddc890e87a062b7acdbc890e19cb5d957d29a28fc6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/ml/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ml/firefox-59.0b5.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "af22757058d795e516edc2488b8b6a9f813a15d9ed901739edae19d10870fb5a171d7179deb16ffb14f37149a4e01c17f57e37530fe762373e509e6d220890b8"; + sha512 = "9388c5f3b3a12f72149899d4f13ef305396f5d3d4e838bd909050cf24a0c72b4b26017ed5057f30b42d59d8bb27532f71d174ce7285fef82672d12e50297d283"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/mr/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/mr/firefox-59.0b5.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "f36ffdc55b313a39f08f4333aa83e78f6cd4e16254f96150c34a8d0c3c85528436ce0b9b7149c488e3ee2584a2560cf4eaaebd6cc71a18fd4520f9b4518aa02a"; + sha512 = "2db6f9628f9cbb533ec2575cd95c54423cfffd185251b65cffe8233b9af92a6000a371f1ac1efe5fa2e7939e3cff36da5a8f0d7ae1bbc8354a3b3ecd3a0eb7ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/ms/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ms/firefox-59.0b5.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "be97366ee38c2f3d4d81217bc4259cf3bc3ff6317241f48c06113939e98ea6ed88e289ef70e27ce8c83c2fbae0297e78c67f887acbe8a42296c3a7e5a49c3dac"; + sha512 = "1513aa8958e26c1b8c618151ba88c7a0279fbd42f1a8e3ae6616cf069657337647cb180bc9d42f88a53d8d1f71e6515412f0da2cba16fa177f87a048988024f9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/my/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/my/firefox-59.0b5.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "beae6c098aab9af9bc1527576efd8a9601e2d67074200017ec248d41427dbbd64abbab5cb9ed66c2634530faeb8538bb306a6cc46d1520996d5d9cadf526262e"; + sha512 = "200d0ca08a7a2215f56b71e73ddc37c6b57188aed3926b1852d53253327ff631274442536cfcebedf2e78e4bdee6e431fbf4e722f867819484707ffb882a2e3d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/nb-NO/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/nb-NO/firefox-59.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "5c8b731cc748c38f5acf2696e66e18b463331e86d418e5de435508b472f3d02f90939d2ef6dd7b2027e0f37ca522f6939e18e5dbe3c807e77bcb1993c7c48280"; + sha512 = "dcb391720e9b2d51f10346fae4d46396e47ab391ec80c57d9ce4a3c96a631e61c94b23e1e7bcf00360822ab32a803732e686f7f54bcb60207b190dcc271ca8b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/ne-NP/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ne-NP/firefox-59.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "d4b2e8560a659112a01a7857daeef59e875131495cda6c7d6033f9f7fbf4e9ed32f2d9474c0d019f64451566a306fa66fbc12dc9a50fbf47ee291bcda638825d"; + sha512 = "c977b42a401be633b40435ef25dd0b3faf362cda71f02f1991d41ab43d8b465497792a6b80c0d57ad693a5fd542832c98057a915f64fe9a75181d91bdbc7df87"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/nl/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/nl/firefox-59.0b5.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "c7c8b49161ced687b638506cced7e24e867c854243768ba0195e370f01cbe30ae9367eea9946c2793bf61721a4738ed0884b2c03c36b001eca8098e2bf8ef9a9"; + sha512 = "9b91c4663f12df7c1bed18d928b41ab7f767f751b33b83aac9655bcfdbd6385e26cd72564f422e79060740d03ff512bdbc03df75603016dab6651520d2c83c4c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/nn-NO/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/nn-NO/firefox-59.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "0a2cc00c4bf64a78e1b8d637afb97bbfcba392ae40040669ba9412c94296585bc42a6e4b8f966506f9966714361d3eac4191bd6dee6bde0f83c1727412707c88"; + sha512 = "66a72b57845cf85362756b9abdeedaa754a82ba792b9d736419a80ea6bc2214f01b875b3307156c73a5f58a858b18bc11cb9adc04fa71d19e2aadecfd2ae4e10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/or/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/or/firefox-59.0b5.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "52324b92ccab6a3b645a7893b552ea1983c4f08c992223802e0d0126eda39d52199b59f045cc92d54f763f452e0418f64886470fe057f98371a3000877052725"; + sha512 = "b821114749a241c9c68c0d8a19aaeebcc72b89eae1ce9ec141c06ea4c09432a8d26426092a35d5daa2886bb4b129e74e2254e6aa6b795ea537413cd31f1f738a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/pa-IN/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/pa-IN/firefox-59.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "6eaf964f040a0822de8b641508fd7c2d34ab86d1f668e2cf7ffaec391274ba0b295099ec3b3abd7028f56674629c4e79566dbc885c2febd24eecef384dfc2271"; + sha512 = "211e65d8a4d681be39f6b1d47210f07ecb357c6e3c51d078d21827681f8a168489ce4c01d251f5f711063dd3ff9ccf0585b2bc11c3f1399f06761678541ed911"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/pl/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/pl/firefox-59.0b5.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "5794cbf23ba03805ef7f74dd36a03b4de2545279ab6adfb3acd9b147c7600424e562d2010d434702d2106a393e1f2cb0da1d7970cf9e2768a541c17bdcbead47"; + sha512 = "310d890061a823e9cb2014b8555dd29d201bd80d1e846ae7a457ae7bfe0df06b0a331ff1dcea09cf159d7d969454a2f730304254bb7775b995414f0f20617806"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/pt-BR/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/pt-BR/firefox-59.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "ef095de2342acfdfc8297e4308fba71ba379a46e1bc134c6913c9ee2ab8eacf4830f3f61e1ba010280fa26d74dd73a1431d18d61568a125417218832bcbcf631"; + sha512 = "f39ec82806e5a83eb997d2c16f93238d417d39a3ddc62d591d153da16a7b71e7d916220ce7721307589dfc671239fec15b0a15b8387620eca6478452e0605d41"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/pt-PT/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/pt-PT/firefox-59.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "6eb526955ea6b62395dec7cc826f1ffd1f4762fe458551089873a9630c235c4abc69d55029d9f794fe9f90bc1f95a7261ba3a13cfe6ee1c6f24d2486a6ecae2c"; + sha512 = "8463135fe439ba1e8796ebf626dac84c3672296a84ad8217ae90e104260ac4c89d036c7c87c496f2bc45b259f98e10af99d3ac2a370b2a6ba04223a9b71a9029"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/rm/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/rm/firefox-59.0b5.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "c86a880cf28d6742ad6c3e6e959501c0e706b164b8f1670e369c995c2e6cbe15fdb0e463cf1893d868170bf7fd935f6791f4e0e7bbf3cf74ce5d9a16cd3680f4"; + sha512 = "8b5b601e3b458e75b1cc27fd6f6be45c503c52d3f70be5a2a0fbed0aa8e1badb2d88cf8011d852a4f39caa87d894c3c412ba7b2351049dccd34eaa5f8d493c6c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/ro/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ro/firefox-59.0b5.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "a1363e1f0e0d1fec3105d0ef5a8cf79d961cf45c239a095c5793f355857fe2a4137f90883df6b7ab23656dbfcb1d5adde8a64a56241c8de10c3f6237a22e7588"; + sha512 = "4dcf71bdf2fb5cdb238230b5ef33a01db062bfbfc29cf0a6ace929e5fb84e6d0aa7598faf5b040a4b7ac899fd3024f5d91a1838098b91135bf2f3351f48678d3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/ru/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ru/firefox-59.0b5.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "62912b54a85ebad00244b1ce88f8971de8b886384ee70edc159d73513357e96483bf35000957aee321b25f751da12fabf47d115997764a70ee6c14a199dfddaf"; + sha512 = "0dbc609a7d10351772f807b78f1fb68dca4df80dcbbcfc48a3872fef07fbf0179bfaa53b08d58f54751e2648e792547d314d39c29c37ea036d8ba501cd2f5670"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/si/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/si/firefox-59.0b5.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "a1bdec851548f4718136276b0e8f8f9c5f7fca1536295447deca0292a3eedc7166241d3a1cea4b4dd332402fc3570e990f17ce985afd18584f2faa084c41665d"; + sha512 = "66c1e12658008c762ab66cdb617e04ec6c6cd1d950ff81a3e278f5473b7e552d27e5906b01419c954081372ff02a06195d3daaf513ac83cd40c71b4f4cab5385"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/sk/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/sk/firefox-59.0b5.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "7c4a8e6f47469a792d966e5a10de56ae187fcfbeb80f86c96c2fdb947431a33c10a6435cc88e0f3ccc0524ee6bcebd7f0fc39df7fb1902f5afc0303295db55f5"; + sha512 = "11383a0760432febf961e2342dc5ab4d1bfe89732be71f776d313f14443caf8e2673cd81476979465f333dd6e338db9368d969c736234195b5bce4f57db4ab10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/sl/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/sl/firefox-59.0b5.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "930280ff2cd2d1aa36b80a89fd3d5b6d789fc28b655ac5ab37c7569533a923b34296c829975ce86b3b13d1cd3bb18f41bea9ac52ebdbbb3348c5467793329342"; + sha512 = "c137a8f2e5932cf1eb07b3d374dfabc5d3465fc9496a6e8932de12f8b166bd2647071ba64918f42df38af9becb574ec5c4fccf7e9fd323a64488f057aef0f06e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/son/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/son/firefox-59.0b5.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "6a2f8b3dd53dd4adfd747b1d2560f0434f92b45330fc1df36b6aefc4d142636f42d2cbb35a33b4af885ae273428e614fb9341f8628d1d4fc26739940989791ef"; + sha512 = "29865376c3dd16a0c54c4b1c47685ce862d0455351f6c22acb118a987f8258fe5ba0ddfc62d904a9e11b787d34bd8d22414acc2b95a6f9d6d051621a990497b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/sq/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/sq/firefox-59.0b5.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "5f0531fa1ab39bea3a0f559b20e134745fcf08804bda03dc767334088c508635199b83af4aca0eb30b2687be4e6909de7f7307b8f142516923cf4dfee416b5f5"; + sha512 = "1a52f547683a7380d605b43ee3eee9d2a34efe42adf68bc74905adf168d30ea4bb23ff33e3e954a8ebd580920aaab70473c001562b0c77e983aa5f365f8bd238"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/sr/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/sr/firefox-59.0b5.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "a4779a99d5fd88e012c1d3949751b4cfac0ed666fed7cb5d76d7fb998ae5290a7392a1d0bbab065698615eb14600cf37264dd7cf32eff5674ed6a2874c22b291"; + sha512 = "c1ca752f999d54a6c2c9c37b78d98e9fe87bdd82e3769c6312a74b63dd402f874c1e9e708b88945745f2ab1f8309b7c9955104e4e2981a9e7b53fb196b01ebbe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/sv-SE/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/sv-SE/firefox-59.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "e83e02acd70b2f2184a38788c37c7dcf9c557a3096cc127814322cd40b4641b1416c85b7c0a055aed3a6af2014d5554ff82c83623ce400539264ab7731a4249d"; + sha512 = "31b94482b5a2c7627a08f40b67480c26d685eea350b6ac6e22d6e8014375e9d45fe74d81782cc2056ee69e27a06dc36f78898f9b7419a4745987b162fe34c6c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/ta/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ta/firefox-59.0b5.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "2e3ca717b624b09cf2cb777be5e5546ecc27c3d9705d50d74129907a3ad5617775d7e6788b6e5abf4ec1789dbc7dba020b082e54d5c1f58ab5f8a8d936ac7f36"; + sha512 = "254a0b805ea3b24d05248a6abca647dff6a95a28c939acaf6e01b68646a94643123e7ff49977ad6d7bc54ba0aca71b2b4d3d147ad02ca84173ff15c21464d271"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/te/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/te/firefox-59.0b5.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "145c5751f5e7c7f20a6e098adf177c63695864d1d32f687b2e06c18a87102108a0047b0b143df3803aa60bbd6c731586439ce3d76a48d37b2ea6307b665fcd32"; + sha512 = "32c86b921324e81ee8bb1c2e64b8c9a9815006ce29b19a2269066ec13d6c6ceb3c45e3c83a22dc8f1dcc78ee13845bdf5a9d9776ea84c8a9a2128a0b45f7c074"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/th/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/th/firefox-59.0b5.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "627981b64612de30a53dd4f47bbf46f95332066c2bc7660d33bccfbd8c89ce7837c1d906b99944253708d404635fac564ac6d2690254de8a670957c8a348f841"; + sha512 = "9d2f979e7bfa97b6b6705f77a38948de80327fc657e43e574a2ab7bcb100aa58c7450c1bcb30d3894e150323e1c8e1c4fde91877be782c67996a95987a61bbad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/tr/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/tr/firefox-59.0b5.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "ee827636e069f23947ac520c7a48b07f4043613f534a533184e3de209aa7625efa8143cf007210fdfe150214825a94d3c6d6643e5be35a503fd3dcc1fcfedb99"; + sha512 = "672136b49e6805960e209c7b743fb7b8428a7bb78474f355efe01830e253888c5939714ff72a7fa0e87c848557002bd45cfcd2d502f9a703193ce1c42db5d13e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/uk/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/uk/firefox-59.0b5.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "53da5f68464eb82042eb38336fab685731a526ba8c75c4a71a4e4b0c33796cec1c809c47c523406e8b383910c9ce7541fac69e1018d06596c2310a15f982a214"; + sha512 = "d8f619b346de9c3b36d20704524b464b1dc44ad230b17048cf884cf7999996fe08c543285611b358f9afc219f7448976f9d831f4eb6cf4e965f365f17ddf3382"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/ur/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/ur/firefox-59.0b5.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "48d8d0fdae5dc539221ed54b9352c8ac081f0c4fbd197e5f2d65b89f9d8388ca2d69c59864db6b4cdad3703b637a5bc18ecb72604f9c22d6aa8791a3e569470a"; + sha512 = "1cfc67675838e768e7c330f1dc0b0289feb18deecfcf68b726f0636438fba5b577627e5aa9d241f510a123fc1793ac14a35a2c0d098dafa2e3a6213b6fa9be93"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/uz/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/uz/firefox-59.0b5.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "b16f0c34fcdd94e97fe131deb8b3e322cb32a5c1185db8e9193e949bfff25a2d4d89859496b36bf0c3624837066d7001cd42d9ecdbd1836a94c824465f15e3c2"; + sha512 = "00dca0daef262c75e3aa6ea91a0339e7716ec696d747db04b3a308efffceb908ad772abf929c190c1a6e2b8f09c64dcb6d09784bb092070c87cbfcf82dc004cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/vi/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/vi/firefox-59.0b5.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "dc7f0f802dd56b7a610d30590ba87852740541fc878f74ae690ed48ff88d97b6d1a7423e3b6614c7c93c3b696393d9a9160a7fc5c805e0800a8cb08a074fd1c8"; + sha512 = "84cbcb02d41dab03ce9c35c9de44a73f06255fab65f5d5f3fceab968e6162add3c9fc2b6694559107625e1a9e429ab974223806899bd5fe47c9d87b38ceaf68d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/xh/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/xh/firefox-59.0b5.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "2081be972092698539080bdc27f71ace71bdc863c0370af0c95463ef0a555ad810a0c646ea3829e4cebfbd3e263a3dc74d4066baa76b07c5793984ebbe4539d3"; + sha512 = "90648cc26f600e52b46e4e6ea2fad93550a904d762300ca3167c46a10d16c7148aa88ab807165928e6a15b91b21528b503b017d87e084386bc102574932b1326"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/zh-CN/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/zh-CN/firefox-59.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "b13fe8b8dfd56e6fca4a7a82cc9fd23d175527346ae81d8326260f17e394b3c072ce1f2004d0ae284f02198171ba642d2374750463edc24e07ce6b16447c413b"; + sha512 = "33efcd6f165827b951c0e4e05fbd24a759ba4405f7148c7b78481bbc02edc87d6bcdd31c7c7acde88da8660c9178687878ef2f3a2362fec2c037f244efc335ff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b11/linux-i686/zh-TW/firefox-58.0b11.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/59.0b5/linux-i686/zh-TW/firefox-59.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "a1165e6bc8efa1b3e0d45589b80c9fceac6058d5c08676efe45c0e3578d782953baa3d708c7d13c616f3f5249a1655eb6e2dd67bcd146a016cf3fe7dbcfb53dc"; + sha512 = "e2dc8c395b5a5aed89e3231bde24550f8f6f964b02a5fbebfd199c8263aaf79e6d4cd28808be61ff65ffa281418585f066986c49c6ab94708a28d470031935ad"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index c9d957ad69d..2221100f21c 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,955 +1,965 @@ { - version = "57.0.2"; + version = "58.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/ach/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ach/firefox-58.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "cdbdf196dcfbf94762d8cc0c4db9e774df785c980c31d196a59c9bb0d5144811bf01cf01c755f2bc36ecbc3f2e17bc6d2e89a177ec5b67a2ad7d7b96c5958bcf"; + sha512 = "7b32498fed47b1e0a58b399436c54ccb784a870ec0e8ab7f789218b17a168d0968666bb01abb456c4d0f6350a7769e05eaf2a3a6a5f3827a42725bf7704ac941"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/af/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/af/firefox-58.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "98185dccf6261423ca09725f1c04fe65cf147d0b396dad5817d7114408982671f349290a45d448eb4a5cf1e2330f09fce4a2176e7b79f0696c853efd91de6695"; + sha512 = "12ca5365ea453af0ad4cd4c296c05b3dd99e713e46aa618544573c1023a7e1b6596d91d90fd9bd5a6a332624d985637bb12ffab20548dc808c5dccc0909e3fae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/an/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/an/firefox-58.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "a6a76ed69f5e5a05bc17050f49a1ea445d48c5fd879372189d5c4e6d678e9b0853665492e7ca5caae8cd37f5f3912d768b2a51e5d23caa65852a470404ae9205"; + sha512 = "7da1af63fdfa939724aac8c9def9b179bd2fdb37f2034e9758f4578a682c22bcd0803fc2e67412d2339b722eb269cffa96863b819d6e390ac01009152b00c90e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/ar/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ar/firefox-58.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "526046d6931a0b2eb562c8f9996151af027ab715460d27d0106ef8a16cdd8e4fb04531a7dcd57c2fe4ac2883156ae8b9e5fb622adec326cb0490e65864bddd00"; + sha512 = "1e2d9ae0ce968803b6ea6fdf9841328a561c90576a5849e3ef1e89a6f5ea0aa70b2179ca0c04fd89b829ce21f45d3eecdca607a07d64e6c16a8aa06cda8333ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/as/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/as/firefox-58.0.1.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "2c7b5bda872ba60afdd06374a59c7c44790b7fe35777eaf6e8808af153da462f58ca2d18d587df81e76eb11aefdd808e7913d16ad0429aa9a0660774ba3f3600"; + sha512 = "c40af34a01fe616e0924993b267cbf498a21962f77139b5aecebd6e1b6d17464685c44f435a18be018a00761e40ff3473a205d55c111be954f379ff6540645c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/ast/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ast/firefox-58.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "5946fefe494c0883f602f5f6c6c4686215583b8c5824504c7296f80294a18e7954b86c99b613f494e2981de0af3f59faf24f0abab85e7ab46f4fc7b5730e27e1"; + sha512 = "81898690a8c7bbeddc0c89a2e6c91082e37016d86815a79b2488adc36cbea3c0b669221fa9951e4fe4880f777c5c0be9e9728549d01c77e592c8b1afdb4a629d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/az/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/az/firefox-58.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "b6402986ccc5d19ec65ab77da4d1a7a4d97b109e344066911f3ae36580b42a7051e0dde10bc957676d6d7f46a9803803191f981d4fe219f1772767320d79784c"; + sha512 = "73ff9c0be45cd7d5f70abcb8e397e9adc777383b793a78c6907396724c78f9fea5794a8a138c9c19f2d0ab46a0133da69f6e5c98a15a8b120567c22bebefcd27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/be/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/be/firefox-58.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "8c71ea8ec89ffff3150205d7f09823ec6fcd6f4787495da35a5b21e4b63651c50c715d5861f0e49e1ec0439046fc4e96bc9e8195820230894a2b27fb03bd1c22"; + sha512 = "19b581888cf07fe9cbabba66832fd62a803920f2a39b195bffd8316b3100edb4b0c628d0563e3d6ab76b097f8e038310079d5d1a2bc2722bb78ee5a51b4bfdcd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/bg/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/bg/firefox-58.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "48e544ced24598031e4c66b6f5640ec0450e327b8a32dd8f3a2a2124f232152482eb204bff8dc65928a0f67ebeb98fd12197d6bf3383e6ae43142eea6e077050"; + sha512 = "bb440c3132a75a7fdb0c3886af57b0650609adf3992b086d9ded68be5525c6dea292de0ff51dbab42968348eb8ce8c918869fa40ab26126cfe775b69a40fc5dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/bn-BD/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/bn-BD/firefox-58.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "ed2a97d3438c9e27390617c57adbb0ecf5ca8a60139a79773e71e104d3eb71a429d448d15e8e736fe326ba66330d0e46156026ad1870f775ad00917d68f28c4e"; + sha512 = "5d7f7a98bcd0f927d1911e4d1a7eb79640912b2944f7c335ba6c81eb6e8310edb26917b9944272205ab2e90aecc28bd9208ffcd4049aa0a491f3e5671f21be8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/bn-IN/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/bn-IN/firefox-58.0.1.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "e90ec533d16cf1fe569d0e3c00646984f77dd769bf4e482a9e5cc5e70c9b67aa5fd6fa74921a32d0124f6a2ce8d4fc6c504bc0ab64844dd66fd46f7adce8ac2f"; + sha512 = "96ed7a7c7cef4f88591f6b1f2c4d683d1b39220c8ffdbee9db9b9b470cca1e1902b042b10e62555ec614cb2b0ba560972042c4e65f5b17a2b8bad78d3c456744"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/br/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/br/firefox-58.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "9feac6509d6b45c9b330d90f35719f9bc657b11faf8899d4a8aee59fe2db5cf69fff6870c0465d319d2b85d1b21a2fe02c651b0bb4536054021e5e5257ed44ad"; + sha512 = "9537b2f8edc30d76649e7be50f1ef9576ebd8dbde45c6a0c685d846ad2ee8634b80060449f01ea60926040e1bc6b8d8c49346bcc69fc276c4c6d3142e9dd8d06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/bs/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/bs/firefox-58.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "f22df0d0d97c02c3e507ce75d6b005ebd293a9747441731f418a870262a51c7e24a500edaf898ae9ac1752eb3b44127f5718845dcacfc8c63443262a03316c0a"; + sha512 = "b9cc1e8d570173f283a77b552ed99fd4546fb1f55a1a5e766d6f441e2589e615445c45317c39043d98ae8c4f77a75d80d0fef9bc20944690fa7c75ffd4bc5ed4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/ca/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ca/firefox-58.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "d77b2e2f02b659f57aff3142f266d304492ebc2d4a0f97f6ad826e2753c7915519581206626e21cad0d65db185ab4c92e05c7e1aaa0c05904b96e1aa09c42ddb"; + sha512 = "dc263ccc27c14d7aaa9fb66a9b9398df48d3685b2e2c3493627f279d5509884293121316cc8ffe3aaeb200287d1e0438852dc9e4c02f2aa525c2f16f9a2b510e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/cak/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/cak/firefox-58.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "0275f0bb7d846aa0346255dfee76af8d4c23ef06631974b7667041b9e1be736b256bc73c82ce445a63b1c3c80d2afd46057a17d25e60dd979625d756be9c75c9"; + sha512 = "69026c93cb0e48c3b8790978694642cd6e854203a2d78bba48ac922906cf938781bf1c1dc5316eb887c89b9933132253d378233c3669954a1182d1d7d4145e3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/cs/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/cs/firefox-58.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "2ec61ffdead584bf93436a0499fbab2284be9aacc8a3b61d1b237a78f1b2322e92ffe2816eb601bf58cff49af10bccd51a28eaaf18d076baab5f1821b5e20bbe"; + sha512 = "4dc64d4fa8424b85713a566b0cd7373e352624799055ee7bc0879ebb93008ca6aec9f39f0aa657809f7c7a70f8473e731279ef7b3ffa16ea5132d01c83e5aaed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/cy/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/cy/firefox-58.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "a6a8963cf9e92f5078753890e9c7438d1e50e9fb4ed32c6910f7b01c45e8c31cc395212e45557fbfd963682dd6da1252f91cbb7efc73ee0209096869c9cfea19"; + sha512 = "85b7c7210429d5ac6120629a033347f1c13de5998b83276f3b735ace1f4a62cd0f201e2312e0be6d7f0607062688402f687e593b93e92439fbda14367efaad66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/da/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/da/firefox-58.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "022c6a8c7827c6316d50cd0f33e1a9fcfcbcf9e25d799e64649dcb81b191e0edfcc37447b2417eef5720dbea513abc1a539bb77813e17d7245c4c8a0b21f4540"; + sha512 = "d902f11e93a23dbc4a4e2340926134fadb2a251bb4b00de1d79bbccc9d21de35f99bc2d4469cee812b15d95dbeff6f4388649d27fea020a54b24a59ef3084634"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/de/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/de/firefox-58.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "1190182a39de202345b30d9014a4a3981ee7255802ea8ce4e72f00e3f3be54f6ab5500d7e425c3ff34934451f8eb2ce2a62a33949b02b2146dbb1026f7711fe0"; + sha512 = "558502bf31db14744aac18c3efb8e2b0189a118cdf080621910c9cf15a05b1bd28fe1b2f5e2acad678ccbe9769ceabe9dec0b7016f1570ae888f9c3fad7fd6b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/dsb/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/dsb/firefox-58.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "34f73baf07ba592788a06b143704f53952e005cf8ce41dc7d22ea15cfd2ce7187eb67a8c63cc53370fa79f67c41fccffbde3553bbe8b9e23b73524b0c01f3d39"; + sha512 = "89ad64c3a489a0ef30099581370fffd3743c1857d12fbff65f6387ecf1503e6e394ee91d744847b6db3611800fa195de2e4d1df4a2ec9424436348c36b6731c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/el/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/el/firefox-58.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "e1480e1a9c98788c52db06f87085abe233ec4e05c53bb17d77dad1810f32fd8d74e07d370e555e04b280c4b620e9bc032adbc80b037d7a0b0f8b5ad2396ac170"; + sha512 = "c7f77728e18d63745cc6385f7923e673483df76b6e8e2ba8f39cf635bb94d8243f9ac1728c4ddb5b94e316ebab026a52871e9fad86276dd885e48481a6dc1edb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/en-GB/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/en-GB/firefox-58.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "95e7a8d50d4f4711dacccaea3f50e701f0ca36c8af66c40dfffc6f4b6d02b42b26d0b4015461ea730575cee9a2228fc7769543ff1b8137c7bf833ad85454d831"; + sha512 = "f76ea7e2d15016ca779a5b2f1bcdeb3cf1607ba4b570142cebb60caba5728be65ef05179ee7c5a3029ae8e21e26ea759e7b754b3670a0b6debd0da4528720078"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/en-US/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/en-US/firefox-58.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "b696fe306e84927407f0c216fb8672beb33c7bf000abf6e390df52f8eeae9373d2764c6ec9678302f57fae34f7fdfb986577823528a48ee2972e13c8970382ca"; + sha512 = "ad5b2b66a8579ad2f3a9ff97425af7e9c7ab4235cf44a5684ad481879ea953492f0639fc79121be9f808bedba80e3c0205e43433b99a1c8809544fbd1bb3808c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/en-ZA/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/en-ZA/firefox-58.0.1.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "f4c1ab045d17d529e9331e2723a7e006ae1b1381fcb1c52c5a6a48f1d95cdf3d19363faba82c6fa5a27cd776b83e34721c107c4e008c0e607d4265fc8f5d1275"; + sha512 = "aaca4fc5bb264e0f2c8a5d783b3e1e53786403d01c157d8ca3a87642a3668e839fb0d5e204e96371dc442f21bd66e589ed55b6a76d3f50271dc0345da8059eb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/eo/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/eo/firefox-58.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "c5aa2220b72efc9d176fe86c213656be129a1fe7b21927b085a468544eb6aef91ef6fd91adb4eedd474aa55743dfa47932ff8bd3c695d8232326cce5c33ac564"; + sha512 = "f49f89c5c6fbfee70e47a6b632de5b92981a23b54e8e9d7b47ac83ef18bf45d98417c73cfbd06b277b67f94f138c37ebbdea4f1c756e4229d8842f49da6a34c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/es-AR/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/es-AR/firefox-58.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "9131379168adb3c18bee9a2f98df521c211b84d05a9209303026efb0b9992c462f6cc0c1689c941732123581ebbc5f63bc644dd44eaea2d86ecbf7812e569699"; + sha512 = "d04e9a28755ec6de2021b20f72b32ad6aca151cbe8300a54ace876878d8df043923b6afb3b186e5ae3db6345216eeebe9f97978a4e50d9a0a854207e5503a3ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/es-CL/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/es-CL/firefox-58.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "65b994ee4ca70d3b92e513517a44dfe50e130bfde860720e7da295f083617ba1602b3d2926a3f12cb21b1fc74ff063f17d671b8085bcc45254fccea034c82b7f"; + sha512 = "0251f56864a79cb38ce5c5cb3908bd1691d2dc15b1198d901a6907f47f1a15385c931538b022d45f75ac3ed0eec7244a081b79c1292bee7a35beb24ccc307dc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/es-ES/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/es-ES/firefox-58.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "0ebf79bee68243642d2f6fa0280cecb01ee23727ffcb49c86beef59dd3099eda475f24da59c1f74a9ac0473ec8e4dab195a10e97a7bee0ae06e7e4ee7b682f05"; + sha512 = "93a405ef018010d5097ade9f08c228e31b50e76573b75cd2d04205d89f61363d0b8f24585f4e08b93eb8424367d90213dd32fc85ee2f7e28a1ef2742c1c31b3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/es-MX/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/es-MX/firefox-58.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "70231a639d7fa5307f6354a744beae51bbe0181199c4b626151ddd071b43f6a6884113a267ea527491fd7baf0f2fd4c0c21c299494cf1e0f3cc771a04c3c2f0a"; + sha512 = "4286767ce5866ea0b6f1b41804d92e54361e4defa8fa59b7721abeeba402b07ec3fef051005c083d65f6fb32dd37edd2253cf8ffcd28ea9109963500e4fa3332"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/et/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/et/firefox-58.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "03ea6fbfe517f8d69ac66c4897635b3ff00d9d9c8a4ca2669343f9b410c58039a35de05fc223320c2b2e60ee4701928dcc2aff194ec640d3b78f1dbb91dffefb"; + sha512 = "f9a11e6b738a09a9f1eb8834f4932535b828bb1c8dde449b14794ac03ba4a37089ecb45b015daa2dbdde2adc2531ded5d9eec83e70b1ded4eb642e4dbaf118fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/eu/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/eu/firefox-58.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "31c996da3408f227a3e1e02f680eeef3f977fb9b74d763ec4aadfbe1381db374efd88a564b20adeff6185420b6a36df894b0ff177ed63221056e3c87a8600add"; + sha512 = "c6015ccc4598bb2f0d5bfd12a962d457a3868552853ae6b053c3e40c1668fdf140a2bb791ecb6c2fbe283371f8c1e8789fa315e5a6c05b9b593c413dfaba1351"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/fa/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/fa/firefox-58.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "525d764c216651bca83f21c180963f0f3b2d0437d20f6a580099df81c465fde790361148ad943d6df84c1f7fd01b643d3ac192844bfe59a84cd3812dcf06bb5c"; + sha512 = "4bfa551b23e62ce7a92136afd09e233763abbf36b536340667ba487e3c491a269bbc5e508d196771edbd1745a294a14d3f51ad3d4d79adcda86394ca2e7e5ad8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/ff/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ff/firefox-58.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "2a2cdee1e8d6f05f89e105c4415c873ab374984ca02d7dcc7b0b67a839538a2c9878993d9bdc78f1f1a8932e70418789e264d69ddddecf60b1c0487fc942dd52"; + sha512 = "e24f247816b7a633c814275a1a858f0580e274285a3875e0509ca65027bf7f39d2f56709af6454187326a7b0a5b20408582b4f16993c3580c5bd67473726d902"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/fi/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/fi/firefox-58.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "2d92ced89557270a84c787300d1a48e93c44b337b08b859c097daf0edb190c801316a9aa70b9e9b74b27f032c9dc935698956916c434f95412af126f7f927e73"; + sha512 = "5ff4c6daa231072927b0af6482992859adbfad7645c5c75666c4de69930bb809541c756031b4309fe81b776a434af19badbb285f0f68ebfef4a25a117448e813"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/fr/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/fr/firefox-58.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "2f81777d6d45d2ef51b3356fe30734015d016539bc149fcfc773e0c2cacd4b06be9d1c62cc603d2614857ec8af1dd33e9e30e1e5a5536a8cba5411d8ea274e48"; + sha512 = "7ca09555e939136ab336b70343f889832f3dc585aac2f6b3853b628b5db5686f56b97a7c9abba22b5ed7ac0d2eb9bf93ab2fde8ba992d9b9f3d2790130817e43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/fy-NL/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/fy-NL/firefox-58.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "7d3debe9c5e18db87cccbfd50e5ba2aae7aecf577cedf32c95b7f70d4ca5f1946e8e67b2a69d4f0cd6d780f91f91f4b902a6f33a2a2d01198407f9a0ce1a3c11"; + sha512 = "a5d2b78ad7cd9e1677cddb3889d74598383585caad7914ee08333e96c7e66b4b81d5d2ac13432f694dfb3ed5f8515473839317b68f06f4b3708fd02994240da8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/ga-IE/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ga-IE/firefox-58.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "c57bf7127462e64a2a6beb7dab0889c2b84e337017faf3f38e7bbfa1a893ea0df9a1d2dc2070d0c0fed8961cc9d657203dba00fdf1cb7bd67f40207c5c98ed55"; + sha512 = "e1b28c3f064c190bb723373326f1f023821a2192836d619f23dc6cbb424e10376d307a895bfb1db5062a85037f78c3877b684ea1014da205caa4bd284370803c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/gd/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/gd/firefox-58.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "c4d88329d4f80c389fa8aeed33e7b25a4430484b3ef3e76076dd42f87cb57a61608d8a1aa770f4b108d14ab2017f0c2d1944838b747798e75c9a51a95ffcd6b2"; + sha512 = "14b98f08cfdbb6ca0c18afef9fbe4d1f283ea2a2635069aa8426ef8075c2e63d4b348c591d556832b3ed8a68dae6e54d9e82dcb9e1dec1b26d6de3189ec6cb9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/gl/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/gl/firefox-58.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "0961cf5df1a7459c2629b59f0b68dc9a8a0b6487a82826f0e29d22ce7054740625f30561379df8a347f917b54e67c09b7266b5d4408dfca176268900630e2e74"; + sha512 = "61473be66b6109a156c6fdf73222167825990dc1b85614ca7ec20c10948ed5a3fe6752361255ed73f31c6f1013265aed5d59a5ae0e184d818edf388cf5a33fb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/gn/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/gn/firefox-58.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "4c2a93d7fef39a8af3dd882b595ac9e89f7617857953ba405fb492777051f087d14fd0f5080ce39a8c4be039d4159c3c6c4f119395dbd9d12157d4e67f01432e"; + sha512 = "b1706bee4fbc84365a26f733ead82f95db6865c2d042fc40f97e9e1e2ecd9cdead2bbc8ee3acbf62cf288f5c907ca4b9be5eeba0ad92dd9c25355491c0849696"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/gu-IN/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/gu-IN/firefox-58.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "10521b904aae0ac32ee4b5a6a8a7ae3f3208550421d16965a60fa32da8ab0c74853200d2f8a1625c0cd36dcb0694390ddd4270698afccb2c79731a6a9a86f772"; + sha512 = "7a04ad824559b04709431e21197aa9c93a6afae05893ed29922b039b4a4c24ed27e1b091d06e948cd83f1b7f25df0a67477e22b9ce288dfb9ad805b3f43f3cd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/he/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/he/firefox-58.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "b77916118d994883dcfdeb2e505992064f379dd9ef1e1d2143bb670d825a6ac3b90eba41503acd1ff8366e5a29b3111e52c1fdc35d16456f2b8f40d12ecbbda5"; + sha512 = "3f00ef9afa945f41b8d84c45c314a76abb2bdd219ab228387c3ac1b548948d9ee6037f1df6cb5b0de294a7920e77c3a16d2c687727087e8c422b2f37ec3beaa4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/hi-IN/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/hi-IN/firefox-58.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "955b9c76fe94415550d135ead50c2533f2aa3079785f9fa05e6af96f7ca43d5c7c2867bda8943ed30dda83a6db6a1813f1d0d3d3d88262cd92a842379eb4188c"; + sha512 = "068bbfdf10900f244349c65913772e3565510d73805cdb658ec346c4eab670c91e8c886ad085a469df74bbabbf5a1cce5a9b845c24a9b155f96e2b9749856f15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/hr/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/hr/firefox-58.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "4b1ae414990d759dc04c17b7095bf13240f8a3ff7fc86eabe251776247093b8b610ffb0432f54167758c9dc6a1a21b6340ee10de6298cc7c36b15657a424da42"; + sha512 = "b965b136811d174ee69ab3424fb15b24f39a59b3261eabe83d988cbc8dd639d4b0ec82285163a33cea1be52a3671e2763e7892eccf176cd286cebc8e9453fbb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/hsb/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/hsb/firefox-58.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "00e416c7341489218a0e6630ce049eb45c71916469ccd91e3570842452a3823f9fb38d811820f06e266756cb79420682b71bf7d0f7f87b232fb2a1e1d70107bb"; + sha512 = "4b3d92d245f9d93980325080b0394ce9877e0a6e4e2337cf941e5e72becc0125e984166ee30e81b45f95ba9a562b040a26f4cb05114beb5ab18dbbcf968a32eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/hu/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/hu/firefox-58.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "fbb7032669dab46160f1d423d51f7ecf3fec3ee02e492c6b95d4cd298e25713bd57d0efbc2524cb6d0b2da6d14fe88c261e9597170d1ad34ea464ef55654542a"; + sha512 = "42b70cff446c60a2e8388fb16ef3d2829e46f420169b73b4849069ccc75812a10d4a74af7ab19ea78566731e51cd86aae0c047f66fa5c9eaafa169dd520900ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/hy-AM/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/hy-AM/firefox-58.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "9c9cc52f5ca0cf79f65336d7db2ba29b8a675a3e005b24851f231566829a017350cf461a6b184bda21ab8a531c57a7fade7cd6a65de440cdc056b8d9b06b0024"; + sha512 = "84f001a101ea71e8675b4ed7c359a8fcf8b1dea72bb73ff08c6e5a2383abca2e98da32f9d5da31d86291a5ee7f156c04b033259b538656fa17a60b3f66dccfef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/id/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/id/firefox-58.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "95a9089a75f4ff07c99710fbf65452d32ac150c29d8400c2b94a6c064985c2394e4cfc625b53724c7c21f43f441a9cd39f84ab4c23803479077a2021852a619a"; + sha512 = "5285ae283ea21e24b0ab04c767bfac4d4db9be66a2716934476ca03755634c333c0e96c367889760137e584b2a58c8cb6e9689996038149ee5b568c2e4eb499c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/is/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/is/firefox-58.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "2eac5967c82531aa761ee23044b65b82384a0fcc956216faa2313cac5c10f6a28925f4604b022bf67237451438a0c8d2369b54a1c40799602f2fae607a6a12b6"; + sha512 = "f1e8eab99c650cf0e4c0d836c5143033b7cb2a9f87f81ba5057c511dfe61ac08778db8762a683b38dbaf2fccbb70a38a0650fc01dfdf8d59ea12d7b31235ca39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/it/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/it/firefox-58.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "83695972d7aa487325891e62247772e553a1c29642fd2fd6697a4cfccc331005b1829141b92b43dff305761c2576eb755f8e9ac1e88062efa43a887d46e4625b"; + sha512 = "ac877c6b0783c90ce4c44f96144d28d416af43710fe8ad6ac6c56a4847c748c2411dd817b1809801e4d96dddd301466886f45030e74f7ac1f2afefd162e47dc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/ja/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ja/firefox-58.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "4baa3fe584c2d002e83410bd0f7748c72cc737d9fc3850752d62ddc8e80eabeb472e4425d55d12891b4241dba389258935df23342183fa565dc4c6286acdc757"; + sha512 = "8ee911c05a31230df94d7044de5dcc549b5fdb9779fe0acff0d0095fe45caa13fbbbaf6e8018389222281bfd9ae0a416754836105e1f153467abb1e1db6b8245"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/ka/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ka/firefox-58.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "68db6af187d82cbecf9ab4f20017c6457b06a0ca743a281a7a254a3706b8f02b84a39a0639fe2bceb750730e991fbc4b4e2c220f946b4db92e0c04ef61df3cc5"; + sha512 = "3d5399531290e30c746657286d0a01c03009d08b777b0155ff4a7a5ccb4ed8036d7d6d79de8495e75753aa573c4ab14c1462fc73ca4a0cc93cb5a5095cdc5454"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/kab/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/kab/firefox-58.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "b51c02ea58dd6b50771dbec2cd07ee091a85688612653a52af4b66769b489604f9b092a9de184a447a7913d414cc6ac25baf6d6458ca7f7a121bf3c9b2892b00"; + sha512 = "690cbbbaa4fe9947189623853ef4a1a4d0df2d73ff50118dab40ddbe57ca772d59d85988d8d30216bfba835b827cc33eb96567ff9f2916514497b76a8e4c1c93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/kk/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/kk/firefox-58.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "c9fb3234acf8a49404c7474ae78e86c7e0ffa00f5a6bd92ab210b7d18a86c2c82db684a81efd583eec2ae0be6c8b2d52cef407d936c2a9522f2df8ffb9af8163"; + sha512 = "75199857516c970b0ef13808b2a0a13a837643188c3030378bcb010dbfc8c970c4195af4507e32fe17f94b9e1f12b41ddf80f914ba24b1431e6cd0975a334420"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/km/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/km/firefox-58.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "3620c323f7412aef138ee1c6638a35b98c3c654b394f10802325f709a736635553081a7dd70bf0b91d0fe79d825856cb2ca58f20a84ded32ea4f277fcd5714e7"; + sha512 = "3733a9367ebe2a2082e2d7d1a5e09c13a1a587b13e7cb0bff3b4fa1d9c4fec5077e3b9c5156affae4c90ac035a94acaa3ca5666d6dd59ac6d2dfc6a4e9141f28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/kn/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/kn/firefox-58.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "d12554f6668b12c0bf154ea7cb07f288f9f7592191c32e6ff927133b4aaedb526119558d7fa76fa09a37be1e8634d7c8e0d14786edbe55fc5e3d4205fde27d29"; + sha512 = "767521f281d9a369569c639cf14618f79fcda275cd2f11a6950e91d0d88843a70dfe6845bc9dabce4229597b92e8562a15af2caaaa511e578601cade1a5dd057"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/ko/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ko/firefox-58.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "fc17302e3eefe61eb081563f01e316985decf5f311480fd1e61a4a78c0ace18667cca724cb627a86224c2829c5366352740b28ec496389d0be9bc7d1d7b92954"; + sha512 = "113a28ea22d0a2e79f66680471f8d5974abbca440197590cfee0a934f40403d704ed35bca5be9a4164b740e0eba8292f6e0096707a288735d34a2b77604b8d85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/lij/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/lij/firefox-58.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "6c9ba11b4a4e9f6b4905b1c6c9eda4cc9484803ecfcbf0e0f7539aa29623cd05a7833a97f4e05b60d708d6d01e09632d9d49d85ba8cbbf5a71e3b4a0611921f0"; + sha512 = "36f284f3605e55ceef29eb4e88205524df8ef1e92f7d1851427c4a4fbf6859721d6918dd4184315743b7a8108a1b85aa40d90189d46f3763c3fdf6d5b73e0279"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/lt/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/lt/firefox-58.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "0deea3c74031524e9acc022d51640956f4befbf41315eacd958ed515dd26d9fe12ce5ee6f2e7c5020e1a5ba76059c302c035346c65f0f4af58418f0532a378ae"; + sha512 = "d56da7e01024210a5ec486c410da70c63728a890c319e4496f6cc33efae41c554aad552c081f3b4777f1fefeec7b6b6d331000608ae4c7b128bcfc726d6be5fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/lv/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/lv/firefox-58.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "a782afe808892eb73929f951c9be730e7d8f6ddfdd12b36440d6f63a3826ca09b62d24a28bdc417c9dc80fa10adac8c63aa3e3e981353a844c8e6f9610edcc2a"; + sha512 = "d5a0f538a1a5860229e1a07d89cd0a7ba6b78ec049d71978bc0791bdb1e3861b8459962e8bdadee996d2abada552abad4f81002e7b042dbe136feee3367fe3e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/mai/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/mai/firefox-58.0.1.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "955599681aa46826ff48a506ba60a00aae0005079d0f370e0a330375ef5392b677ce1d5a0f2638d593de3a37b99398b3b59875e0b1afa5e15d332b879d9cd387"; + sha512 = "2c96217b38ec9fc78d025ea79a934e10d1d1553e39480d1dbbd878ef774aacec5ecbd63baaae1c834c44acae417605aaad5e748ca74f5814af83f862812d1d8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/mk/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/mk/firefox-58.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "f134dc4d37f5c959247acca393290f050239bd877821e3123539532a2f74eb99d1d7df1d7c4fb05959f0059ba1617b91316fa06ebcf4001318d8d937bbd2d7c3"; + sha512 = "64fd2f8f140dab2786063218f1b6074d8c8f9c5dd506a737676afb9a68edf06d9800e3c9bad3dfad8fceb82c321531ca6fff6a97856c952dced721f0d0915913"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/ml/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ml/firefox-58.0.1.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "7ed4e45dee60b8fce59c4b6e05566964e0b9c05be8391e669fae3f21519136d9d8c55dcdd63806493eee7b9b621afd12a31c678265af08a00e807e74e2e6b33b"; + sha512 = "59036ccacdeff45c27a1b737913e54c0e06ddb12a670c1549ba26da4b1d99fd2338a133e1b15b1fbb673df2471b5cd5d5d4061ce56c631e37c429351da2cbceb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/mr/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/mr/firefox-58.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "8ea097c99b599e0afe9b45e4a0f897dbadea805663513be81ee31ff430fdec89f619ac360c17cb09f13c4f7c907d8fa685755f885beacbdf83944d265fbf7aed"; + sha512 = "2fbac808598aa7ce028f2d922fa55b49174507b5ff6e66e1951c3f579cdd051ae4bcd28edfaabd2319dd7286b08d35a0fe33ac2f63c628d217b8f43b89dc23d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/ms/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ms/firefox-58.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "73d5c2ecdf6d76cc447ff99f975daccb1db44059b9fcbc50cd86dfd7b5360ce363fb5976f92a7b31dc5cfa37cde6d2a6c30fd1280e4920d224eab2c0a2f77b67"; + sha512 = "52f6857cdb97b86cd25b0926d509405a1548dfe310fe088c3b27ca77e87fab585faf4893e8562d55fd2ecff43eff5535ede306abcb57bc2ee31a4890530a27af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/my/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/my/firefox-58.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "3a7f1e1234b3120dfdf3d450848f63ff1a745bd1e57581c9466869eddbb74baf5bd7fdb0284b8752c440b6abd5b0cd233523c6f93a2800b953eed6f0bb97a26d"; + sha512 = "1e89a3a595ff4b6a1f1044788e34266af60bd6b6e0cf94c64af5e50ad074e7a2d405ead7210e1b55622aeeca3255f966f7f500e38e639fc2677502385e4ababb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/nb-NO/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/nb-NO/firefox-58.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "39942038719188bc85d61a5ce47a672ac54e75a8fc51e48185b284fc39a14ac77c6745c51abe85dc4f387b9cf3205f4e4915584914e56a75cc463c9dbe99e8e0"; + sha512 = "b14c55689f787e4a6d4edb504e701d63b36512ae49008249f1fa34cc7961d58ad0b0c7f1aa76933afbcdb76b8830bbc7620580347502acc0712b500dcfa34f70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/nl/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ne-NP/firefox-58.0.1.tar.bz2"; + locale = "ne-NP"; + arch = "linux-x86_64"; + sha512 = "20426cd45c9c2c5517587eb2c6d04426eb6c2d8f7370d690549dcf44ae2d9bfa823ed359655a75be83916cab2505759f1212abb4d5672a2b70d81ec573d1e5e3"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/nl/firefox-58.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "ce0ee056c6f34c15d81861605dd005f72a9a660a2d78565eec0499cee587c10e91e07ca06724139aea137ef4500b3c1a5bab5af3c9dc2d9cb41e5f15c6ed6b5e"; + sha512 = "a98a214fd2c4cdffc5a85fcc074b8516d90c5d79e23c80f0ad464931b8288395d953ac46e575f66bcf0b0e5cf862fbe16f07060be73d9c7fd28930983ceea72c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/nn-NO/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/nn-NO/firefox-58.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "6cb72241f70b0fa57db9895ec251e4ef69e5008e0c7b368ea161936616cf61274bfe6ecd755dab871350d5f1bbf8cb64cb6bea1d6c8db944dad18b5fa128c34f"; + sha512 = "ab5ba866afc67caa89f6794bd93981067ff12684cc307f6fca9f8cb4eb352f96282fd745ef20ff5b2d9911c75f99f78784753d4755623ed3496488a98797db70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/or/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/or/firefox-58.0.1.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "f7b6be03b9974d7c444f1e7b74af78d61a136fc02455d28ca149bae5eb808f3f1ff4b9624517bdf8276986350712de436c16177b999c038e17630798dddec709"; + sha512 = "6c32d13fc0ff2cf68e784d4e4a58e6befca6bbf1aa77a6dea64825a1e9d6c3c3705d6a60e31fb0fbc4b87147e954eedeab4cf194e0f2b500d8aa3462b95adb30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/pa-IN/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/pa-IN/firefox-58.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "d6e8d2b801890b375336502a95af1f32462550c4590db6da208d05fae1c56545966004b7bce9e82f6a691b41fcc38ade0a5ab4842869658af256e1465a9e684e"; + sha512 = "483f1b53af7900dcafeba88872ed5b5c5d0d3c703e83d3e080df92ba66467656f43161851474362b8d3a4bfd48ae19a2a21ae244717e55aebbbbed3b55488b96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/pl/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/pl/firefox-58.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "f0422006ccc68b448f5f455607357cafc547515948d457e1bc82f6845c4709399195c84c9c7894b6a20fc9c78adf4a0234e46af7e404dac4de5a52d76b8c5d7b"; + sha512 = "bf580678caf2fd653022ed5120f461b87beb47defb323836e40c0e1755adad1e893930a39afa9bf9137a2bbd197d5918b715871056df3cfa9574e684f80fd56b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/pt-BR/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/pt-BR/firefox-58.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "f6fd2a885c0236407a14f6fd67064a078706c87efc42a9bc0fd5087c0a50adcdbfcf57823fc5ce3d2d73709e08fa9e99e78a8a447957a8925a64dacfc4659529"; + sha512 = "8036559e9d83540cfefcc5217550f401d988c626117e42db66d4ccd9c31afd8aa4224bbadd7293c44b3973df7646d36ade1728d24fde3f5e7cbab19e3e83832b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/pt-PT/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/pt-PT/firefox-58.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "547fbf162b849432b52546450f00551849c4d1e5951680308f2395905e6d1615595436c079d10a4fe08d93a8444164c50a2adbaa4b23b6e2995d6928040752c8"; + sha512 = "afa6bdcffd36065c94bb1984ac9734d1091c14bf065e68c2a650e28fb49a5f7d52f19aa83078973dafb7446c2a01aa9fde7ef43e26a7f26963863329b868841f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/rm/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/rm/firefox-58.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "708b40a8660e3ba358a6c52139ea3253e5c2833ec560a387fc07d9d113bf335d228f9f16d6f8fbdd1b0bcb2a9bc4a45acbe11295c0c90c8c6b9f522cdc2326ac"; + sha512 = "26b71c4b734bb2bcd7141247894721b2d35e521c5e9da2cd9fa455646f234fec97b55467e80f8d6b36bae62c807c79e7e12a395e65e4c59d464f7b4c3115f3e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/ro/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ro/firefox-58.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "71af24efe6b5892e5cbccd863379feb411b21a3b25717d79fef17b2e6828e124fd1c5833e8c60ae188fcf491029824747435361225318e776cc086e28678c3bf"; + sha512 = "e0a3358a71ae65166bca792a8e60c6319f9a4c277c8369a2563a084dd9fe8b68952df87d1f9ce5270420090d5ac7a6dbb207cd7063b488dae4d0efc8006e46a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/ru/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ru/firefox-58.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "a69baf2bde1866be4f0fa90de8eeb94a8484ee1011f625548109dfca7cf38104eedd8099741e96f3686aed5af58b9cbf256e14a0661c63efeab501f41ebb1507"; + sha512 = "adfe22866b6123b537ddaf1dd81d397478e7894c021ad74327c922d85bee8ec132f410509a147bd7f1300df778922ab940c36385db2659c8a356914b908ce9ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/si/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/si/firefox-58.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "91f9a79a090fa93756fe2cc1866acb2505523684fa21ed7181c3f91a183497a6a20e2c0963e1f38267b1e80d2479707d21532ba6c1ac8393bb336007d671d45b"; + sha512 = "94892e878fc9feeb9e208aff8096496423e40e42bc22ede273cc5e3e549564861ec31ef9935f1e29d68b51abe79b17a9c6b1e5763917111fe94c95f27c3826b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/sk/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/sk/firefox-58.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "c25d91d7700da70b9e8c683f23fd22775f95da96f3a06878f3b85771d95abd6f7929985d4c7911c62529706c9227969347230768f7155df33ac6a6877c3265a1"; + sha512 = "26985d29d4cef9fa987d83b873da188b7a776929533aecfd1f1639bc0b7c4393bd9e04cfeb3f7f9f2cfb7b43b5ee14a421791a6024b2eea3707b7c3699594e83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/sl/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/sl/firefox-58.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "6295d9a4803ec8cf9472582c9e916973ed3463791d62c226f4ac07e830c4f1c550065d82ad96e7f7430302d3eee93483e6417b8763ae3d93c0c456d69db0aac6"; + sha512 = "c8796f686d147774ed4205a04521fb1375d1189575e855b6eeb0db7c35da96aba70803cd477656118f6137658f71d53c188d10653d67f121942d95d81a6a05a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/son/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/son/firefox-58.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "faf8e5c6061dbeab02e525a75fe979ff7fd180f5a84510e4087fd841c8adb035288b7f84ee15e622dff709f3b2016d533599fc64c2b5ca2425b480fc75420646"; + sha512 = "56f8b81bc5619b88234feef3e17c1a80ce06effc78880b4c9da083530c7f9c037015b6a940914bada62e98711065d6a0c556d90b60125af357ade797403885cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/sq/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/sq/firefox-58.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "dd8afb42a6bca64c56a81c72bb665b1fa5a0889b942b7b0c7762e47112f0341506d220f742d2396f04d7ee037e061e8ec8900978b87d9e3e9bd2245da1353268"; + sha512 = "1bd75656650f34ddcffd38eae46ba84eb18fecd79b9cd7972f96d0906862d37013c48046355530baf5f253985b65922d386ffcaa25339e964db16fca6bf85505"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/sr/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/sr/firefox-58.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "4c5d5a6f02c78dbc95d922211bc451e37cf5345e87644d2bb709e025dd88d8d620b9ca3a4fc412e08eff635502d300be48e8c86130b4bd3246a44fd552a30b7e"; + sha512 = "abbfc2f50567f4506dabcf8500ca56b369fe6e6502147ced5a52cb2d506c6b28248adeb6564a6a092ae96632ed2fd43356507cc53c6c4a53756df2ae2f6dc735"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/sv-SE/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/sv-SE/firefox-58.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "a5ca9583c1f9c64b92b150fabca892c1345cdec1f33fb129cc084225919528df92c3124037545f4eee1ab0d5fdd8b6b0f0252108c1aa851ac6192379c18304f4"; + sha512 = "5f19b531d37c8774142a86cf83c678e0ab889c5f22aa792c6bfa881ad9441c02aced2324077137c8ec75c18a1e7a93243b9b87604036b5d29ae4e93871540ea5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/ta/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ta/firefox-58.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "156d2d3cb255f7cd82a1db2c4aa08ab671162eb9bec2ccd9ab79dc968490c2e12d5466c214d847322d9f244b9c6adfc0f91347bf717bc41bbff89294629d93d7"; + sha512 = "f503d38e25cd403f8dca12992258265cd3abd50219655eb51867ee455790e1864dea2a26cb0d72bc311c3685e79836df9c0c1794b499d13fb54689ab9408d484"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/te/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/te/firefox-58.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "75fe5bba7d212514b26597d1ff573ad9e4941fa205a94b30a5d152d8dee892a8a88fa117aef1a886f9695590b8b0a370a0fd740cb12ebe6c90b568968c74009f"; + sha512 = "3f68679d85cc1c844fcffccb371424c38406df074c8e21a200e04bcc5fbbfb1199d2202487c660c95ff1941b433d22ef3474580a0de0909dc251092e139b4bf3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/th/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/th/firefox-58.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "2f5bf7a4092a5a50f4540676e0f104da8e83043bc97bf4f2aba62bbccde882f7281cd18a2a60d9dd08ceb50a21e825ca316d09a1e6e67cba44c5de934b5f0292"; + sha512 = "b3ea54ed6c65b68f39eedad3d4500030de3f53c6b603a15f63a82b2766e023f552869d5d0e05cc5a4ec4eeafeb3dc124ff6ed09a5adc53e44068034247ac0bf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/tr/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/tr/firefox-58.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "e176a13f6876e4a56b218403c9b7dc872b6899133edb4a61d0640181057b275cdddab2abab12d713cf4d203fc867279c9c0ed96f2312441207bde88e686456f2"; + sha512 = "644ffebe355085ccaffe266c2ff50440200adf95a46aa1822f21a160dc982bbdbc8157d9231e1b96c11c573409c620bcff113865d55eba3c3b7f3cea7faf29a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/uk/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/uk/firefox-58.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "ab51d55fbc297fc42d11749205d8babb07bf4ebe1fa5c338ac443d22bfaf608b2fcbf2065aeb55a4a1d06e3b69e70a6fa8ca8202607b9a1f475e0fb6b5bfbf7f"; + sha512 = "20579b4afeb36f5fb07a3a93e4c5837919df959f9ae98e25c39597e2f1446347952fedaa776d40bd606264cf935ff343cf69431e8c8f978dc8fcc60020f669a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/ur/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/ur/firefox-58.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "ea71403b62089380db7cba0c473d513794846d279c88ace7f5212958c527442ebd8344f95acf5d5674e040d75ff29256cc59f47f538599974c55bd46b353a964"; + sha512 = "4466d3f53a1d68df8e7bf6074c2639d84e5a7bcbee32db522f8d3a771266454c1d0c9bad1baf52b27c91a6fbb779c41fbea50a84675e9530ce33b1bafe722c96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/uz/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/uz/firefox-58.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "dd498dfe76fdd4d84dfd11ab529e7021905a212256bfc0760ade1e34e8433c1dd3c37b969d214a422c3c525985e9d3ff53760f930fe7428e5271a5f7941be84b"; + sha512 = "4234f1c10daec449867a4357a123be7d04ed3456b98a2d2e82a3ec3d85f7da167e5dab95ed6c4f4f1f44b9481608a80cb1ff1713bd0abe06606a15bce7df6d6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/vi/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/vi/firefox-58.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "fc6e588cd5c7ab2ff076104fce5e954e186fe420a34c8043cadeef6f94f0abd71ec4e8dcb59806fa7165545b490ccacc24de40bd47972fad13d1871eaa05e96e"; + sha512 = "fa5b72aec8b5a845ffe37588424059037ed1121f35047b123d39e7b6b11f0ff54731a974b7ceb3406adaa1705e14477a7ef189ce53305add2712cc7d433daf82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/xh/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/xh/firefox-58.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "23d7fa08f37ec4745b47cf5fe5b684fab541926d3822e3042aae7a2c3b3e3dbcf03e7d51e68c3d3d938d0d0d0271cb953d24311eacd6eab860933f244f96b9dd"; + sha512 = "17db5a14e2e9e4a022a6d1048f72e734f41de485f72ce45a6848b69db1a96bbafef25809b79a3f85fa70c6e7f43c9f1fb6f16472c294f13f1b77fcbb45d84dfc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/zh-CN/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/zh-CN/firefox-58.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "6ef8400344a0f450dcffae1e297bc2b333a5f8e606e0a6dd7b5a623452e60e942b95cc58c295a4b23578ac270d532e9381c4aba691496aaa153691ffb02b7a01"; + sha512 = "e8570e0c589e298e84653302c85ccc46ef7b9362b5449a09a43eaaccaf2d3ba1b55475c5fb190067d596f85d9ac3cc037e5ad400454a2d49c8e9ad878bd8e04a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-x86_64/zh-TW/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-x86_64/zh-TW/firefox-58.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "2b6072c7d2fe8d5517504c14ddb7198ec66050faaabd37c64fb2e67f30320f113f5eab0005ad7e375385dd77fcaf7eca95180f3cb64bee7c925cdfef5c9dcd7e"; + sha512 = "51243e1c7a330f0043988904759fa8d7fb67e287ed47a6b6a18a12ade989346f4939874dbc6b15670217436f8132126b29fb641d60e8f338bb8985ee5411498e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/ach/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ach/firefox-58.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "f26e36860eca48558358c5f71225a83741e31d3cb3aa637eacc19c2f66c1ff617975179474863764404a2c4696be7722b632e9389abf8acf56ef3b501aaae5ad"; + sha512 = "a36499123874af16bf33d80ccf2a84dbd21f641155ded9d58e0c064a8cc5d9f034fb64d154f0ab46cebff191e9c9cc46c820026c53408329810a318556be6210"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/af/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/af/firefox-58.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "cf0e803829d3c567c42e42d760226b35d81a5e24093de70aee9ce84e8eac8317d0c298d26e848d3075cae43b80ec1896dd03fcdf36f235cc71062795bc29b6c2"; + sha512 = "4c42737bcd7af2f9f0b6ae3415a56d82d360998f8bd0ab01b6b0cd5f72bbc84fff4045b3553a1a87f0c3258f46b526f9e9eb0c3dc8c8c66a2a22d5430fc38499"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/an/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/an/firefox-58.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "267eab32a78296d04fef98f392b7944902d75a46f032f903bec7ea2c8a4fa9fe96290f09526c4b5e43af9862bd41ddcb1a764d10aa23e1824b0835e55e74ca94"; + sha512 = "e821fd76b262744b740ee1a42092b954df2a6a552cfe305ab88e6ca8b2538045654f64f4e1a0e1446906f91896486f204518836148eebf19d306b4af0c2b4d6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/ar/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ar/firefox-58.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "e60272d8eb45baa4363b2e6fcf77d7991fe8b8650bd6b1f7f94cdcd7fbb7bcc5087e6dae07b85dc1e830454b0958d2aee553127aa4e89b9d44872bd5741c8823"; + sha512 = "de178b0791074179c76a9e0334b5c5f2bb3599e67ccf4c8ab1d9964952b17c2ec0c509e8e37d83332d1cef7b74ee3081eb4092001023c3a2f14d906a8c0e48e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/as/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/as/firefox-58.0.1.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "ae067590af09c9f4c2446ce4c459623412767e0ba38d59d832722e0f144f7029bd2b381a68d435226eaee1fab45cc695b3947bc23e43c4c854c8d8c70175d074"; + sha512 = "a6f3ff8f5f31b5bea725175a27fac0872765f584a91877adc01dd42811b059b61706c53f64e4d1a0b7782c26998bbb2f73e865bed4f4e992762b5f90993265b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/ast/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ast/firefox-58.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "c41da767c5fd59b94a1256775da344a1cbe8a478561aeb1f54dbbe1e2297364fc790ec15e15cc0d37dbc41c8137d7d466f59c8be5e3378e4642eb7444d110b08"; + sha512 = "dcc47a42af28f1814541f71650e24c653b5f99958b495aac3d0408ddd27aeb8d689d6244633c5a397d5f304dad3e8d2778e5a3573497e47c895a9f46365c40ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/az/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/az/firefox-58.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "a6b54c4386a4c7cb12b81fec013e175c00bf05f79c8285f7e7739c83431e38685ca19b9977fb36c3c4f7503790184b5564403fc030678cc80e1bd290492bc972"; + sha512 = "41212665cbd529e935af5dcb8582b152e84bac8c7055b02f2a43dc6fe53e33bb882908feb71faaa8f34a026a64117a286e59422ba110bff8c04e18229bc418aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/be/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/be/firefox-58.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "257f9f78aff4fc5c965192b228fe1b2140d68a2721cfc2bee3f8ebc963d0e009c6b977315b939969b4202808574054aa0296cc19ae12d880d613ae8d6ce04fbe"; + sha512 = "681e9c68187d9b53880494ab08300bc28b8536f5aae320dc9da6abfc8642c8aea2e2613b48d32c25309589f737743c733b361c543525106ed9373ecd3b40b891"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/bg/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/bg/firefox-58.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "fef5031f5b45d77632528f0824afb7cb2ffd175808a7164c727699f7427b891d2912b1f7fe5e63953c765eb2b4bfb9e6219d543a832edf8d789e93fabf4269a8"; + sha512 = "742cebc1e646a2d9f5d9d6c406ca1903f81faf21c4a38df0ce6edad8f7b96ee8b22d7ada34fbc24461f5e7644417d37b4dcac6a5a10f8b0ce11fdbfda9c01508"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/bn-BD/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/bn-BD/firefox-58.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "f2629cf851f3e096db61ab970d93ba0aa798d2f20dd072cba81526ebc040c661f3b5b202b13f3037d5ed6ad5d286487b45f707df898b24762c489a0c442e338a"; + sha512 = "0562b8bc93c1c768ca49e94a6285206e3402b45d9217c6679eec7f30395cfa500c35da7ab0e560a5fff3db5eb60e6085845a6a7b2ba7b695ebdf09990bdce5e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/bn-IN/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/bn-IN/firefox-58.0.1.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "9f5f732506fa1d24bec4139c7f706225d050000558bfe376d786e6555400980ac5e59b48b9cc2ffb9468bc421f0791e3927cd52328224a5be8902e3d0250e406"; + sha512 = "d459a21206cf140acff54ccf6d7557090ffb3eb752f62b91ea56a4c4138858ed9146d3edb6ee3252ebdd548f3435cb973c284cd0008207d46dfe5b8b12a6bf55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/br/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/br/firefox-58.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "4c6af1a9210f9c46411d32126f7d72e5e2782262bac3ef229c7a3e6d5523b45c848e6304d4f9adf419cf0684812c2c24b9dfd89b786ffec8b30b7c7467317f7d"; + sha512 = "c23ee525c1c989264fbd1e00834cd0a1da1c470a54bebb5caf18502499f16917697f3b6de55ecdb9270ae11741420dd1def626603f2f945f2fea8ec6279f4b8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/bs/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/bs/firefox-58.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "a363f64f5cec1d41c458caa08c1261922cb9a485684e65f5bde92c289b28adb2a6a7b9017a7af0d6f6a929e6cfe79827237dfc431456b930348f2a3bf3599d57"; + sha512 = "dc254689e74cf7038fefe2b6b911cb75b96fbee105a44713828f8f7c9f1a9fd8624f5ce62205f26b4d287f73004edfde73d4fcc4431d2e4464d36e822f4667ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/ca/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ca/firefox-58.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "fba95d45ec566f6ea266d34031b8f8bc7fb8812458910e20943eb7815336b30772bb4b5ff7c8b44249a05b1851e76876220a869deaf4451a0c3eb153f6c4591d"; + sha512 = "3f358d601c182bdca9e82221e9e6061ee5d610cd42caf722e1597c6e3e47ea005949ce52d0e38d160a02e4f02f210328d631fc095b0a49af71e92919aeddbb37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/cak/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/cak/firefox-58.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "5f61c68251b9f053b22c99980f43ae240c9cc9e6737d00e70878380f5979686dafed82350519254fa805a0d9f31e52dfb484baef0b5e99a000c96fe61c30341c"; + sha512 = "274ebb0800585fd06dee02bb4a2a88cb4a64d39198e23fe481061b0cd96c281c2bc9983516614eea980c118fb98db01be2c0a387a8cc595da7a2144215f27230"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/cs/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/cs/firefox-58.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "265c0b1ee00f61c71abd91476d2334701076f6fe5b6ce78e3e63798e2af6b0b30d3c64f24d1340cbabbf9393bf9125ccc3c66a2d09f235e572c46105eab931e7"; + sha512 = "dc688379b955cb619e1780c66368ebf5a09415a3b31c8d116c1182051281bec251a06ff15b54816e5f0f11f1c0246f33d2db42009035a7254702bd73d13ca83a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/cy/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/cy/firefox-58.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "d60f2b92bba38449fb9f54e590d4c3c8a69112fc29ff6e5e8906a3f6b57c0806c89714e334e89b1fa1523587da9f5871110ca4966fbcc26a5fe696e6f0634667"; + sha512 = "f20ad279750ec9281ee9a800971a4538e43dc3587df35afe676e7980e965522dba2b6a9deb2d0b9acac31308de3a8a167ec8dcb05934503602483a6eeadf00f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/da/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/da/firefox-58.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "a17da9a657d92d8a24c6eced37215106c90830fa9fb381547da3e3df11bd3cfdc6f3a9272d2f2ebed0cb19e488c411fc30f6365e9839b8a24b9e5bceddaaa267"; + sha512 = "b9fea0a664a02698423099a963787f8b5aa89f3aae8ce6be9962d9d8316e01547d2d3fe54f05116ad1fc6d7a68d6f72d65adcbe63de98bd4b16c8689190510c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/de/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/de/firefox-58.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "97bd32360ba6a6cb2206866da08cc71bdb7b263137c77d7918bdddc839691f4193b54e9ee714b28ef338a5b6639948c51ecf74fdb8ab25af1b87cba6f07f0166"; + sha512 = "13407206fe0fdd88793406c349e4f7a66132f2edbc32af12b7d30026d22cf721970c8e8494228fc80602cd57feb3dcdf17f0490580b2e33806f0b3bf03fc7ff0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/dsb/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/dsb/firefox-58.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "e003bdc7beb0faa57bee3b3e0f65e9bd74a90f8690e0e2811ab4f0a16a1711ae49ea072df75c9b4af1fbe4b7fcd835c46e0d312a9d50e97443edf101aac71638"; + sha512 = "6d6661cc82de4eb37b0326f8cdbc55feaaf85cc44137af1bc217d609f42d97216402927021dbacf81cfe704ec8c1e42c3dd18f39bc1f7e6665984ccf3bd678ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/el/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/el/firefox-58.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "f6262456f377208e49c6b78782091fdc4ad5f2621e6fd93091f5c873083ad1da483c82680382b636d1a906d711b6919d8623115738315a9145bd5e163cc2ccfe"; + sha512 = "2e8d1ad194159f6d7e56a461d594b1cf998f073da332a1f1bfba46ccd76e0e5733a691608a16ee08207f45d16ca59766e774534024239b8d5b3be9156942b31b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/en-GB/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/en-GB/firefox-58.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "e96ff5ed84ec15f2de98e97da08cdce9621d92c30137c344c4404e8aa7a7875a7877aa26e0a0dec4add605a686e89eb8eae68f3adfd17f6b49d31ed22d1c17d1"; + sha512 = "f45ccaa1b6684558a1c9b5e43907fb59be0ca466260950d701091e6bc1c6a9d18d1a8dd2b2dec77381450f61f99b632cb0f3c0269ff309321750e16577df697c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/en-US/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/en-US/firefox-58.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "122d91799f704be16525bba403686e861ccbd85862a64dd57dbda89b28fc14958c2cedebf83a3c61de1439afc4c87fcdc4666d3f237f6b0484850ab7c97995b4"; + sha512 = "e3d289363aa63cb459e1a1f4f18e893617bfc6f972a49308aacf126698d2dde0baffb3dacaeffae9471a8111eb332c753f376ebbe31aebfbce52c5ea84122a16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/en-ZA/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/en-ZA/firefox-58.0.1.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "243625c2657053b9e5406407cfa242dff02c5877d0fb1c21f53b867e4ea823edab1895411697ceb17f08b7db7204519a0f68dfba706c6938b56e741e0aaff171"; + sha512 = "a4c56c45280faf3dc65bba6de159f65b121972da5831664a70369b446aeda44f7614d01dde6a070df058a4bc2d42f32772e1003f64d277cc5bf8361f76fa2816"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/eo/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/eo/firefox-58.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "e3e72073f3eb299df330a0603c846cf8fb12f900d3e178bfb03de26fb1a03875b3869a58afd664367cb8eb81230b0ef463bf95127e29e1af0cb81513a7eaa242"; + sha512 = "d79405fa9fa01f13a4a98797b3192f1feda51b26568e89746f6b25fed6b73c1f45f3e6bd69427547da19c7eb70508fdea0ff6db21e8d15211faf8da03b088e85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/es-AR/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/es-AR/firefox-58.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "999c2627062723bd2283b865f37a51ee8b54fe5f71b6f339a83fe18f441c88bb177ee986cea81b982ccd7fc905b498a4ea7c8bd8c2198c3bd7b87610187679bf"; + sha512 = "f5751dc82ceeff378d78717ee5850edb4f160f3ae26c0efd70557014c96c765fe789fec2a8650f65c9fad67cf1253c00f4bdb75387162db1c914ed45dfb7164d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/es-CL/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/es-CL/firefox-58.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "294c518f8fb62aeb02b2c8ae88f2150e6a588dacf7e9bd6f2dc5f39176553b5f2682cb0f43fa123b3e3a13e0b9e8216cead37969fe49819875e3e1886e3285df"; + sha512 = "592c5f9a70e28521f75e16b79fa0852815f34b9570ecbab610a96892d9b13fae609a9050a4dd0867bee7b811cac67188c9a756bccc2d6d99821f9ce9db48a509"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/es-ES/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/es-ES/firefox-58.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "26f684cac176e86bea72d99b5db3923f66731cdc119505561873995a3cb48c59ed6a3f1044d6b8d8c201b508ccc3f50b1a13b156c0eaf186d9f272faee9c9326"; + sha512 = "e3fd1f13087eac51a830acc760b83ff9459cf6a1a14136c43c8ab7395b22b01cb2627b077c5f50968023c47f31484818ccf18245d109610dd04e3e5627fdb65f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/es-MX/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/es-MX/firefox-58.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "97e6c04bbb044eb6186a76f72cbc3183abda61ebe8a9c3d114c1768cf6fd423924b3f3bf45d8de127487c02795ec5697a493c92a5670c1d99a238ec124a0263a"; + sha512 = "35ea8599e66c29f7fdf1f2ab5a400a0ccae4d0ded4bb3d509d0caf7a6449bb7944c794fe080b1364be055eedc8bac017b8281bd9a76b1d76def573d3191cd011"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/et/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/et/firefox-58.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "a92b7c9bfc9ccaa4af1d1123178d44060c3734534922127df187d417bc3ce69fdbba32dfda6b581fac6676783e181cb1cb7137d2910144c96ef24f91c4d62a79"; + sha512 = "29e6013843c56fde01478cc871fe15c2f1485d41e87af30daf97e5c0f4e80ae14368601a2df43bbe3618fc878e7503007708b760d1f2a571b4993a99c2411f17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/eu/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/eu/firefox-58.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "8019412526acb948afb183cba043e3934feb5338c7397588f6baac6ec5ed2057fbc5d9b4db901d927b8ca4692d2243fc1d5a7f67d1b6ef9f7156c18b2194383b"; + sha512 = "3f6ef7db13d1b8c8eaded290430a8462aab2172c4e813c9bf2f11f0e417485d88872a66628130987a37286ba474e8bddb9ef01e120dc2c6baf49bf9b5c5e67ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/fa/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/fa/firefox-58.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "40c30df6d0a70559b4fafe760deb0a66da25174362154cb0cea015931218bb71756b59cb5fd5de10e7743563ddb104e7b4f6b76e8a4928f63f4a8d920c3910fb"; + sha512 = "14dc9bfa351de740e46a8a3d59c99d0de7ec5d890783f03a8b260217a02d1cf03a94c6a0d7411698f789e9b77c2e1def24b74d9754be821b1104964308a6322e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/ff/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ff/firefox-58.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "2b9b66e9f10c4743b6e4f5562efb3e108b65d977307ce9055ef2bf1389a2ac30f6e43a942bbb80d04c87fc1effafd332654bff102c4f17a9754d22c8ada0ddfb"; + sha512 = "273b3a3c6d32f63de9a8b47cc6eedb7239e42cbf5b8e48191b2d9f9d88731a5da6957ad9bbadfc6bc52e591328a2a89540c4ff880cefda455ce1e5beb35492fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/fi/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/fi/firefox-58.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "d6df4629a8b7c3a8441b314bbb0e58b9dc8534902154eb00777df46546accd79169cf3add27b7bbf92f973a6fc9aa3e836ee1d4ade31ba1f970cbea58ba4799b"; + sha512 = "1d71f85cb661c87bbf1c64c2711b45ce912aca629638d2b7953d0ee3256e7e50c920f400c2bcf92ce171be44134a66b28a34a3b38580da3ce2436dae1b0dd44a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/fr/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/fr/firefox-58.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "8da9af23a0a54a968992f9fcf11543c4fa9378cdebad2de50a1d96a896b20dcf80b8eee80a38884056bb204725e717e51c8c375cc3e060829df3c960aa130f0d"; + sha512 = "ef15d841348c23f35c2fd6cf93d86657d6e3308bc03935505b99ba1119a02846c2ca2c5c55cc0cde992d4e8af50bc612e086be34cfa61711858f11e6e256f7d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/fy-NL/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/fy-NL/firefox-58.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "bf08ad07d9c8c2ea2d307c46b1c0e865b983ec1cd6d90092e510ef448c3fb007bd92d58aafc98b0c6267a4bca61708baaedccf09832f8b7943b5166d564e7f1a"; + sha512 = "f42e5dbb7d16828aa2d5fb45faf44ef92b8ef29e5c49dc8a75540959cf6c153f7d423255c4eda765a9db69dbbc18e7b8a04bd3ec1329314c1d69bfa41ea32f93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/ga-IE/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ga-IE/firefox-58.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "aee747a77b19c256f7cd4e24af642e99f1313df556bcd327b06e424098920394c2d999cf864660f004cc8067621a0478c45fcee812849237181ca76e0a7bdf98"; + sha512 = "4fea194d08121ce95dc6891b18cbbb031e64f402f31c83b92c9044c8d9337f2b50d76017f4ecfa616f51e8188e6705e8e940fc2fed95b7d21d4c8385b656ece3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/gd/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/gd/firefox-58.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "3b03a0544021c26446fe8884c4054ec689b45d6c613409885b21c11ead0160534ba8963d564cc6863792f73e9808317e53604d45a8dc802adbe98e771e5d0f07"; + sha512 = "614811dae0bd10f809ae048d47543fbdf0459320a8f9926280bdd8467b2859646b7201355777081638b46b77d3def96f8052b55c243ff524a22d2db4e20db864"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/gl/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/gl/firefox-58.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "e041a7f7abaf1f772d00780bffd872f18858c6a052bacce79be3cb764fb604334270b4f8becc115aac9bff4346732c719855bc3be3cd5a94e425acb6d1750183"; + sha512 = "a20e1f54fd12acd5480bff14d24993c2d58a33618170813980a8a1f0b810140a99c7157d8c8eed3d56f8daaf2fbbd525c1df98e1a90cd0f6f89ec253e4b5b73e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/gn/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/gn/firefox-58.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "698341a2b37904753fa1d96eb195baa892e12e760e9296582f8e5939c51a1b442c5515959c893c27110fa881a3b8962478ac5d109952a21b8805a5bbf0d6d7ef"; + sha512 = "ccd057d636e8f3884db25ed91186a5c995b02eca0c3c7e07616364ce7d95e42dc1f3d1c6e9eb844c6bab4088127232bdd85e3f33898f681f837c3887ab0415e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/gu-IN/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/gu-IN/firefox-58.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "5a1b6a24a586e0ed08a9c93d413a5c87c254ba780959fe734dbf12db49bc8676dfcec631eb4633bcf06bde93ff7b492d491678821853e894266eb3ed4ec61c9b"; + sha512 = "fadc9a802e9322e2ab0f6b66bf8d938a5e3bfc67a1ac901c0d41d5ea82bd87be0165f50b2c5ce7a75c68f8db45eec8b0e7ea3de237f6c6f79d72cdf386cf3e00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/he/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/he/firefox-58.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "f03349f009bdd061f4971a2d61f7e6e895c93ee431852223c00f741d2fec60f5978ba0606e5dac6b35abfe7ebf5611d94c22c1401fbd54d7c4d39c8e5f3e8a17"; + sha512 = "9fd2d1f4087b247814282e2edab633fd865ebe94fc73906bad065e0af927f298f46306dbe7f36c98875b57bbb66aa5e51f37f5a5308f024eaa9a62f968916c0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/hi-IN/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/hi-IN/firefox-58.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "f7ec471bc7e0949732bef8d2abc8982c9280bc31cd69d2e077b86753bda2e373b661c7528a2be016b08d9134f44f4a860381b8d4ebd5d4f3db0b57fc8496fc94"; + sha512 = "7a07dc67e58c295309768e84b2489413b6d8ff71a786d249b977a7bbba245f74c6d88e33beb934444a34de88a205233953f0b7be3a3628950b0c851c35c593d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/hr/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/hr/firefox-58.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "bd1bf0e25017784223fcb89e65b2300a37e1b173449cb0fa9d05a95eb92d780b8ec8c1f86f12286a95a7a94a9de51ab45d2d1d1587c6c4868585a5c61ab2437f"; + sha512 = "5db4c7e305856d96899270e20b41c6db2c130abf25bd5eb47cbd2683e8097fb41d37bbd3c577253601c99d2bcedf42472bfce74cc4155a01de3998160b3a139c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/hsb/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/hsb/firefox-58.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "8bb53e163295c3e6076e414e10872876926df5e8896f5a981ed5c23f010fa8389680a7b291e571c34cac52632ae194fc7b872b106c512561e65850568e24a2d0"; + sha512 = "5729719fa57723f4c87c5f63f9c08b552e374d9ed9cc9f39aec49223be7b85d550074f680511c79c5b47cc0219dff687c7ac288781822a5bd10f4365cea88825"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/hu/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/hu/firefox-58.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "f3a5b79e49a7d6078dacc46db5e6e9e4dfe2511cb0d2d7439161bfe733565e8f05a7f8ba9132b717f595df1f2399656d47018da3ea1fce8d801d6a9f14395bed"; + sha512 = "b0334bd7fdfe6737ca5fa1166c37204a6f0205f6756af31b8aa34da6df759f487a3c1aa88bc9cf2dcab4be8724a203e3d35509af4fcf03581c8c59023db532a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/hy-AM/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/hy-AM/firefox-58.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "0a7cdff0c865dabd64d830b27fb28aa11d9656e94b0994e0dd89d85d97a82c4849236f94f110747a5b5af08020b1c1fb4c8894a5452fdcf485c6b3f5a0d587f3"; + sha512 = "33ac9a2a7a554c4662a9285124fb8050894c921ec72d7d3655197923e2fe3fadee007afb54a25bafb9ab8c9a0d898af52102bf629a604563d10f462001f08853"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/id/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/id/firefox-58.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "c3717bf3cfe7fab099abbd3307d18b18f8faf6f8c77a9e89452a930fcf7d5c60f38d5c6d341eede78885d1205d26b4149f01b54c2e13852473017805c4629bed"; + sha512 = "7bc77cb0cecd1cb993b158670e448fd22bf982ecec84213c8c32634df32ba538fbee8eb834719dd99ef1087b6f8955effbe1776a3e150bf5fd2ccc90606bc215"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/is/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/is/firefox-58.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "1aa74ab93fdac1cb61e78f687502bdc7deef8f7d720b6c3f99852883c21218c664b18a1301ab3e05118856e8ed0a6600347efec52fa945a59a40a526198bcd16"; + sha512 = "8a3fd3e89f503fe4c74b85e8ef87e1e332646cd150c95ff8685071bcc456bdeb09de46e256d13a53f5f8f4cd3172a12ec6c8096dbe54a9cf018be857b4997e94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/it/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/it/firefox-58.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "d68aca6e221907169ca9c0b504dcb0569a4732b10c465805843bb67f2513ea29d8848ee386c2f09b3033e868c80c7142a72a79c4d1e55a9f6a2aae178396aea1"; + sha512 = "8babf797e0b804e4e8b98a6261dfed27c93832966a66de71ba6794ffd3bf7d3b41ceff7ac4308ec9f978fab310baba5a87dec82f710014cc9dd6f27a520ceaff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/ja/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ja/firefox-58.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "6c5f5bdd91cb8ae02a6443c7d2be20b7ae0544b54cc3c2d2894069b3df89934721ef5fdf1dfe824316f0e07969a27df1f28e73c5ee17781be67b40eb1b63f02b"; + sha512 = "f3fd18b97b2880b3627e100ae20527eb998c7b9d11b2c38b628fd1372f7811cd40662cb5d199f12982fa35f8fb9e6923e2c8b1ecaf5634b6989e8b89480ff252"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/ka/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ka/firefox-58.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "9f5f794964fc39b3f6516781eacea068970b397d3624b339be2aed2142cf7791cb61cdd2ab59cad052e34f3216e36eeb19132655145088b37e8f0c2cede6d394"; + sha512 = "4f69cc6927a6aea8496283c1c47961a38ed621b4a4563346506e4c138714824cd5bcba2f0c4d1226c643412ac071838693c0b3a2acd6fc9602a6f12060955f75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/kab/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/kab/firefox-58.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "2b068facb186f39744ce49b2e849e24df8667cd81bd5d0bd25aa8d7c68ea70ac8080e51165b5b2af09238593a1f58b418d2adc4df170073e3a7eb65f70566b78"; + sha512 = "93fb1351b4c6271cbbf04e8bc8750569f5e3a4375559512055f4bdc68b7ef1c7f78c9354d5168e54d49bb0a529a380eacfb25a109e7f7ef2fdddb1bcd7bb9fcc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/kk/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/kk/firefox-58.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "49710f8e65bcafb88b6270e2100f50623fda1a916e105cad3cc247a929e98889456652006566bb7a3be8f6de2ba9102a4bcf36b01a94bd362ed11eca3c969db8"; + sha512 = "e4d849284c358bd297b07f557ae304cf9ae681733ee2acd232eda28abb9bfc38ad97916b00f257f56a9a514bfaff9b440ced15194dc3abf56b0af209221a7272"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/km/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/km/firefox-58.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "fe35dd90c5aad2e0690ab007952ebca82724613dc8b2cb92777690ba63b48e51dd7392abf4b2f1e668794647a3dacc1541ce92a2d51404f3198d3701f5160fbe"; + sha512 = "0fa3bcf4b054c8033ca4ace9446b6062114889a9b3affa730ebf3ee23fdff470676919cc7086b5a13a215ef87b73aae306e667d0b1c18437b6265d5622972a8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/kn/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/kn/firefox-58.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "344419e9b47786936294babb49d905deda79fd7164a8b994fa3df87e2f1f5284aab1f2c4862a4d4f247cdb68fae322ea2e3a766d5c03ed192179699db0b4ee1e"; + sha512 = "7ff42d342f103c2b6f4f4050c7c79dd0687f87105e31dd80efedec34dea27dc5c9eeda16b79ea676d43f78a85e55a1e47c400e0faff9006bfefa55f183efb82b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/ko/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ko/firefox-58.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "970ac1bccb69e05eaa767ba621263bb46e706f38cb1647cf453d2a9f34f5f358eac599a02baece223b5d25816a5dd4822835362b98bddfa7a2022403087ad9b3"; + sha512 = "9fff35314fcb6031923b51db50e779564b7e5aea3068165bec73c6d8833b18579f87e676291a6570827aed29a1074ba54f08255c6125333da2f040c9ac404bb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/lij/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/lij/firefox-58.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "1b4a72183476ec147b76fa7c6e7ac01f920173cb9a23d646ce383c50677b818742d47d8e8ce35aba2fab31be6ff128fd82555aceaa05f75aba1e9a5e3482a20a"; + sha512 = "d574c03667da40589736295bad53fe22cc67d3f6dbc5281feba5d76138ecbace6daf7d39145d11ea794730c3606f6586fa58d3058fa7eb3f0d1336acf7958cf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/lt/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/lt/firefox-58.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "39b8aa096583e62e7e43ec14c798b24a8f5c746e7ba749172228ba59dffd2861e1d122920a4ab1ce256c2c8407feab6443308bc08d50dca44e7d19569c3c31cc"; + sha512 = "4c38dd3f72be96b2a7bec60a55e7ac0a75c13036c3b62d4805ac3f32efb6422b2a74807cefb87a3ad10f25d41c14d00055cdf09092ad9068bcddd5a46dded650"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/lv/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/lv/firefox-58.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "3c0f580ec1f6b780be801cc8fc5a375bd71ecafa5e0931f263de7264117c8d32e372445ce7eaee90cf3aac52aeb929a73b9fa857aba66cb9351443f200492275"; + sha512 = "fca51f322300f18b3e5c988f883fb352593c40988e5f0203008b71c725a162da0a15e67434a91af0e8dc63ad869280f6ead6714e2da1b4b6b83284fc56790688"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/mai/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/mai/firefox-58.0.1.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "0f86af1b078c76573da49f427662bd43752b5f351592b2a78406405535e15d13937e83598ddd8aa95e0f2b19d29eec64b4c5220aa2a3ff86410a2f25f891ce0f"; + sha512 = "650b729a0dc938c2a0375e967e89a2d6e95595bd9c0f8f0e9940dbb51be4ee80257ab7c7006eb933b4d21fb4cad053a4e55e2dee673c8f976a1f038e3ba5c1d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/mk/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/mk/firefox-58.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "f31fc0df700b2b00ce12c39a45165151b5154ba7ca06eae9a57cfcec8553eeb3609663515f9ecdfe27e6fc8e8e42d43407cc478564f80eb1b2f232eedce8433c"; + sha512 = "3c15491a97cf61676c6dd1705a281b2f85b4e2e4446645b20d7fd46b5968248591d11ec344544b42c00643a9a21bc3cc57665b7effcd03f9a8105d6a89fd876f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/ml/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ml/firefox-58.0.1.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "2dfbe2d64ea9d79d836773fddd7e31912107c10ee9eddb59ce547a2c6a1d53918f203eb20c5517a7c810024caa690e05a21f939a8a6e3cc1c08e081ad0e1c1db"; + sha512 = "d76726b4d18d114ef391fa65e3396bef3e5d7896b90264e89e82673d0ee8be69633d831220908da30852994f1d5f782e6d6f221b0a93b028f543aa9899d2234d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/mr/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/mr/firefox-58.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "fddb7600432b7253159570e21a45bb2f906cd6606212ee163b128045fa298020ada2a494124b4398f2878abe6027ad7678bcea99bf31b01c2f51128b5b5322c2"; + sha512 = "b789f8e68a2020902bddcb95daf854cc784cc2a3319c2a145a5cb877755780699010b4162ffb124d0f5945e722ee6d7b0f0a1baedf277bd8d3c429b9d7870b42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/ms/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ms/firefox-58.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "0801d30f9b059ae9602b435beec4d683167f881909b2aca90eb20967faa20ecb8ee1fbe000403498f450d8dc7240b8839a83be9cf6c8b792179cf73c31e1264a"; + sha512 = "76fe657a616e786926740bd10bb8332cc520e08aa6944ecefe98824e5f0d059c6c93cf0e5968c11b153e55bc445a79939ef0b2a765daa69d6c72b8e25010f4ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/my/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/my/firefox-58.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "6c2fefbf04fd9c0d65e4bb9efc8f7cab998f6e6a0a1c9882357dfac21f14f6008433dd0243354545949afbf4c2041e1c761275a846eeea47f8238984a532fff9"; + sha512 = "618224cff81d80523150cae7c020e8a29569fc7310fa031076ace7006bd8f8efcc4773b450de4ae4965445b277770603a7793287cb85714f0aa057584e636116"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/nb-NO/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/nb-NO/firefox-58.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "b896ae8e005dd46d5e25752e780bc720e3e647de17fc6864716341b1ac9e7ae7c5b203d1ca3b3afd914b83eb54419120604e1f9802a5f0a7b0c7924677812057"; + sha512 = "7f33f1f49e6ac31a022d1ba856e23d1b10a23aa2501550d5ffbdeed05c752c27b3345704bb9d15d8eead5115085b0ed00d5b5d53de9cf2290e753f04a4f3fc1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/nl/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ne-NP/firefox-58.0.1.tar.bz2"; + locale = "ne-NP"; + arch = "linux-i686"; + sha512 = "892223856ff20d4cf7c601066ba6f3620b39fbf4e56fd89207f3d18b10b39bebc236d5eddabde57585f0e0c906dc035ed030d49b53bc346ce630581b9288654f"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/nl/firefox-58.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "c97442a61a72bb80c59e32756038b665b9842c9afd4c874a4138aeb0bb5e498d7efc2e437b2d291a63e6805328dd5f1dfa9f60cbae8e19de53f33cb889da70c3"; + sha512 = "f139e9420300a0276f9ff7b70fb1839ae9e2aaf089ccaddca782b8dd1797df80873cb8ebc91d37399c39772d5b381b30ddda8c41395065d2424defb709eae21d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/nn-NO/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/nn-NO/firefox-58.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "566432e4939a804821b5775a00757223f420a3bd8b0916d057ecf8999181d1c998d84f28f39fc3fb2a61d8e76cc7930d4ed3e0540f58e6327d8a9b3d978f3a74"; + sha512 = "50cd63ddb3f83f7c62916299d910d940930f046da612e3cce890310d271822acd87f971b5aee56aebc4011b1c414574c7c96cced936ba6f89a21bb93ea9bd356"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/or/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/or/firefox-58.0.1.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "38f694105912a9a34f54d96a607db504580b9d32ec3e79a7e8e7c5d22f392286d0ca7c0b3a51cd5a70167d86ceab27461a68baef4982bbb5af9441117c455f0b"; + sha512 = "ef73a14c8210d1b82e0ed33109027099a8d5dc3961476eedc31a92bd855a529e2be6411b196d0c4df97124c5be69ec4b6a245a936de1c0e8c609a0d17d51d8d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/pa-IN/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/pa-IN/firefox-58.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "8524c3de930b061a086ec9c8eab55255a93ce21d3b205cf8c187fb6c7957921f761d921802b1a87c7f7439c86d506adaaae37bc219e110de4c9248b451be61b3"; + sha512 = "53fc6c822192bf96db817d32ea46f0570a83e296b1e4cdfa585503b02b961346b21751e22d50c056a6411ace168844df019e6dcb96346e02bc9deada71c5e237"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/pl/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/pl/firefox-58.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "29bf7fd1ccc860565c0fafd1d4f5adb2a90c4493a7bcadb64c4e86d47f423a2ba119770b20df06d368c1f456bea8ddc57dd21280be3e34b286bdba2d6e9250fc"; + sha512 = "a009db74e155f4a089501ab96d7c72c2baa2e2ad0e555ffe0ee0baf6b259b5bfbf422ed6bca4b012f7b1799db02dd0d13323b39e6f73c7e5877e8ea080f62335"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/pt-BR/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/pt-BR/firefox-58.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "eb953ba93d7e96049758096e10335bfcc1199cfa3b0c4e7c1a0bfd7294bb95849b0fdca34ca5068ef02dee6cfea09537c362b8d35a3800e7ad42bfa22ae5daf5"; + sha512 = "c77a8c87942045b959058319fcccc35ff8d054842fc8d7332171f110e82595886746597614ec4884915ba8397c63ebce597dbab648d2f823a1fd803f8c662382"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/pt-PT/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/pt-PT/firefox-58.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "6922ae12e56178fda49792c62e6cd40e78696739fd2ec680bb4fd5391d43babbce5f5a9d1dd30b5113323d77d03940c64a1a05a1f1e06031a63b4bcd4ac9739c"; + sha512 = "6c09645104219be720c843f3065617184ac5731f354d4217347c662d2cc7cf66060b7805e16b032914f20e75ebddc72de06c3f7b520656bf7d5afd9c4ca517d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/rm/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/rm/firefox-58.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "b690ee89fbb1846328cde39bc4f6f51bfe7d5239c190ca29b62c5c4bb9b7cf86235fa17b7d35b85055fd7e6e99a14d87758a9b1b3bbbbd9093a0742729ef0383"; + sha512 = "a232ea477b7b0841eb5dce7efb722b81da8136ec974bbdd7739d0700b163953f0b07e9509b973afa3c09af75b0b08523fe94dee21aec919f40f57e2ffd9dd6f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/ro/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ro/firefox-58.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "976d41585a6c8c5c83d8d4ce1d78687830cf780f7eb5003ec25e3fc82f08902014540f1b4bd913955f49c122c57d560928c826a643febe536b434b715ecab7ce"; + sha512 = "887a70aa19415abe5bb2bb10f4e66e293177713612186567e9691b715e8b7b7ec3487509a111e8d9053241bc74d1bc9bcbf930931a14050b7c8b513076ed385d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/ru/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ru/firefox-58.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "54cf44e265870c317803db753abf4ae9b0efc8c2afb21c137a79a7b0eb81f07baeae737051384927cc7b07aaacf5c745dc4777bf24c9f38311ecc28e81d2dd69"; + sha512 = "efb8f8746d07a387d094e23c10f8a2ae3697e854b26a9ec78013f4fb2284a359bfa6cac686779fb8e1d72114c59e191f86240f02b61f4c748909dfcea45368a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/si/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/si/firefox-58.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "1d27e3b6be480668410adc8cadac2cd477a5ce5e31a45498474bfb77c1b975cc9c55c03a1ec50132a660100ae5e5b0307302623861b546b3f995f09e9ebd4ad3"; + sha512 = "9b469c23762a85e1f536928d78df87da8cf2661f78e5a558d8caeaf504ef7ae54c54eb2c3b6ea00381fc2e83348e9f403bd1c106cb518148ebccd113b5e5f442"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/sk/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/sk/firefox-58.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "6812a0563712e9d3aefbb2c112e564b7147b96869ef333991aa86ea6a37f345f8636ab5dea6fe37eb46912bc5dafa08d4bded06757aa76bed09ff924ac916858"; + sha512 = "1ff839d7c631fba2510534032345fcf6397f694d035daff179382270a7889b6c2046b4b2bd6d7666c6e298146ef47cc9fac2b7c525d7c8f563b58b7fe11a5dea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/sl/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/sl/firefox-58.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "514bc5af454a4e3ad96d7b589c1193f02ad7013f9d58b0da592037ea98aa72f47b6e36a147edd52e74fcc89881acc7ded8043d8733afd1503266730707c30c4e"; + sha512 = "766e06e574d0f4933f8bf3e50521b5025915797f25712a29f0961759410272fda59aeb869d4d84cad961b277f5fc8ec78b8c333ee0e60e52e07fbb99822973b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/son/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/son/firefox-58.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "3172ce00f9c32e7acd18b98033e120aacf28e60f08252fdda4db40930be03d66d9465ca8967ce984b233962f4c34fd4dc79941e867417405d0b7401c78f76386"; + sha512 = "60df99153af07b88fd888b232b570eeeb4cafe01ed1c85cd536774b03e121523689d6de3fa3d6335fe7e0c9534273ce571d7a3fa00034e1681b78f4012a8fe7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/sq/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/sq/firefox-58.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "72e2cecba9d83e557bd4caa7b7b94b61f7903ae544ef60eccb65030c9b618c0b3486849ed3ed6f579b019fa56afe1c9af5a44fa263cfcf5e99614f79ba0c185a"; + sha512 = "97263478fbeeada0ff397723bd8c4e0935c88c25cfc259bb2906e8d0a2ecce8101f4cb5ea9457b8b0b3276de475e0a8fbe995faa1edb33ced17b98404ac1021b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/sr/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/sr/firefox-58.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "bc9c6640d18a385ce331318093cde67ae2f257952f4c356413f63f851e3bb1b82d30836fee53963f7b3764b4e12873c89e5938c372617fd628ecfcf9bf9bee4e"; + sha512 = "b822f5077378b3c41951aafed6f6b3ab174d9240058d69a05905803c2b8ab74791abfc1ce59550585f0eca9fd97e3c0325c9bfeef47d14b8eca039959ebbbd1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/sv-SE/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/sv-SE/firefox-58.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "67b463ea15b104b44084aee81e47ddb1644780aef2c598db1ce01bee3e3eecbbee7e6bd211c5839b00c3d055e3931f7bdc686bfede36ea3b1364a65b91413e03"; + sha512 = "20555a59e733f49b3714cd4517aa952a0e9306681f5ea1f33d9464ee50705187ad0e745ebfa00a64e4cd0aac4d7c3c3257cf04681e74e18037684e675b05df7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/ta/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ta/firefox-58.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "9f584d50557cbbdbcc291788c8ce6b325e66041401127c28ed387c3431d36edb10f51b34724bac52e44deb86ba0159b4744edd7e44c2239e15752dfaf88ed036"; + sha512 = "2d5721bc3519b766dc70163b8f91988b49512e4709d998239691c382a006bb06fd82b793fce843f976a55cffa8a0ff06711917e35233629945539c1f27453d02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/te/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/te/firefox-58.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "1572472578a3c692403fca59282640fcf222d4d49d265f3e24b280f553fa6ebad8e4974497ee0dca9748263a48846455a0abcd955ca4e1d6b65b391451c3e9c7"; + sha512 = "28ff1470be8a12212ef2467daa9a363ef929fe8f6741678b5d17ccfa149b122bc2dd74478bb96e721725c87d6a3000878dd7b51d1e38e6242e6e286c3621b25f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/th/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/th/firefox-58.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "f9040dbc10e0db7c895356caa42e4f4b6a069e4abd3c1151adaf11f7dfb24e66340031d2f8f4ec0c1a7de81a27703ca3fb4e11757486dfd46611b3e388dfff9e"; + sha512 = "935a7354cca219695f58592b1d6668ee3d305559ad9c30cfc274b63952bb133429528e38bda10d5cdeddb428133712da74ba621e2c831ae14329c22530f9ff91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/tr/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/tr/firefox-58.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "7bcc301e575d10778f7a318d7570b7c1e6edaef4df6db93e78997fe66dbf97fe1019d183aa61055bc8b7d0daa660d433ea915b5f1ff5369494c04c4fad2d2aa1"; + sha512 = "9f30bcd90b0c5ae5b55dc74a1e4adf8b029d8b87ba4f2961a4eb47ff4c61decff4abfac4f4664f1e99653f05a1749a17c775ba323ac322ec1fe3e104a4c57cc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/uk/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/uk/firefox-58.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "5444a561aa4610c22b1db8f954029380013f016a7efc642e7c845bad676c9c7eed45a54dbfd6d07dfd106c193a0be1c3b663ae909995273adeec8e0a28def584"; + sha512 = "eca33af02a5f2d7363688aa2636d407822dfe9b70fa003d085ca6b9c3089adb49d080204c5e94d89178ff952dc5ca6a9402446610eb3e4460e55cdb066b965e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/ur/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/ur/firefox-58.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "bd8f9bf1d698ca331862715e7d3974c84363d133e0593c47059e33bc58891665768b08722fda7e3d56d6303d08457b6c2da9c2dd26cd01be4be21b3e2998d9e9"; + sha512 = "6dc7bb3693fa86305bb50be09c7945f199450c286867f56e66721944a27894e3de7a6452801ef4d04b0339403900b46effb7d2282a81c0b042ccf4c49f758a47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/uz/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/uz/firefox-58.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "75a4544a44284c97a99a7209b099416e5c6cfb035f3abdb6fdf4567efb42b8b71ad078595460b2b49f9dc165a0cb8306f0b9e586e86e83a77ec56557900b7d4b"; + sha512 = "1ab8b3aefedc0c50c76169c0890cc5e3c381b7f743bb901c5573103761ae67985deae20ac2ef5b5d0f85f848a82a8d60bc87336205e462ddd2f040ba3586f258"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/vi/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/vi/firefox-58.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "ead2e55cccfdd98b1134dd1b958a6e55b6847cec26068891d98354752efc24f7f5a22220f315c7b662a7253950188bd773666a0f1814c3c6bc0ace6d78937b1e"; + sha512 = "cca1d12e5f34b78f930d7b7b53afce55567be0e9e6894b2af1d20a5c2c11df0531d06945d812bec956904fbd3ecb4921c282f8a9a520661c4988d2147d370dd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/xh/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/xh/firefox-58.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "7fa5de93fa29cb6d6927e2c9aefd2895c2383d252c2c2cbcc8cc2922406db03e0f8937acd71ed16a92bd4a90ff7b45a8b627edd73f64e8763b59aaf388668308"; + sha512 = "8ed571a58fe104ef53aa785d10481371adcdf4a38f449bdbc65f6ab532797d9c4d301f6f75868645aca291cdc10ae3b5b8d2fd1f8f116f9ef21b9d91e4264f24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/zh-CN/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/zh-CN/firefox-58.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "fdc4652edaa272e245a05160b5669b70a416a09ec784ab59df5ba4de0bf652ad8112533759f44e4496ebd38decdb4ce32119da761f0518d8f7bbf99ddffb4254"; + sha512 = "ca63b214cdd67857d69ba86263e3efeadddbfc0f35a6c13ba9308959bc158d481cd6930246f3b59b7c335399ccfcfe5fbbff5fd1cd62aa1316c1da96403dfae8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/57.0.2/linux-i686/zh-TW/firefox-57.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0.1/linux-i686/zh-TW/firefox-58.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "993f1034938e4a33f4bd68e1328f708c285e23a11013d6d164d0eaf833f1600c192dd80480a20c51640223fcbc0be29a182fb4c662f2d46b933d41cc12a4e5b1"; + sha512 = "35bcec66fb184dddc9aab83fd91c561c396b6ae48bb9e027e4a64aa7aa60fd264ce4da917255370736ffb08fc42362bba61844ee0295c6b7adf721fb70d93136"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index aeae471ce5b..91b86a18375 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -38,12 +38,25 @@ ## 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; @@ -88,8 +101,20 @@ stdenv.mkDerivation (rec { rm -f js/src/configure rm -f .mozconfig* + '' + lib.optionalString (stdenv.lib.versionAtLeast version "58.0.0") '' + cat >.mozconfig < $TMPDIR/ga + configureFlagsArray+=("--with-google-api-keyfile=$TMPDIR/ga") + '' + '' # this will run autoconf213 - make -f client.mk configure-files + ${if (stdenv.lib.versionAtLeast version "58.0.0") then "./mach configure" else "make -f client.mk configure-files"} configureScript="$(realpath ./configure)" @@ -99,11 +124,6 @@ stdenv.mkDerivation (rec { 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 ''; configureFlags = [ @@ -132,7 +152,7 @@ stdenv.mkDerivation (rec { ] ++ lib.optionals (stdenv.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 (stdenv.lib.versionAtLeast version "57") [ @@ -166,7 +186,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" diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 0b7720fa90b..930f0877412 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -6,10 +6,10 @@ rec { firefox = common rec { pname = "firefox"; - version = "57.0.2"; + version = "58.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "e66402c182fae579dc645de1570a2eba4f95953f608de668da07a1ee4f371041cbdb3e01ce6e4708d8fa3b6b3ebe5b79e03e48ced3605f66cb09ac49abf3bbcd"; + sha512 = "08xgv1qm2xx5wjczqg1ldf0yqm939zsghhr4acbkwnymv5apfak3vx0kcr9iwqkmdqjdjmggxz439kjn510f92fik33zjfsjn7sd9k5"; }; patches = @@ -32,10 +32,10 @@ rec { firefox-esr = common rec { pname = "firefox-esr"; - version = "52.5.2esr"; + version = "52.6.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "bbc7dcc4cb392f06fe2e963a3b6372efcfbbcc1ca7218a3ef05885285fe00c9e87e0f8d307bd9363668327eb43542c0600443bd9e6744de64494b96dd00efa5a"; + sha512 = "cf583df34272b7ff8841c3b093ca0819118f9c36d23c6f9b3135db298e84ca022934bcd189add6473922b199b47330c0ecf14c303ab4177c03dbf26e64476fa4"; }; patches = diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index dd4cb439c1f..010f60881b5 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -8,7 +8,7 @@ , google_talk_plugin, fribid, gnome3/*.gnome_shell*/ , esteidfirefoxplugin , vlc_npapi -, browserpass +, browserpass, chrome-gnome-shell , libudev , kerberos }: @@ -63,6 +63,7 @@ let 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 ]) diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index bc8aca5b170..b1b1132f22b 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -4,7 +4,7 @@ , 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 # command line arguments which are always set e.g "--disable-gpu" , commandLineArgs ? "" @@ -38,13 +38,12 @@ 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 +56,7 @@ let libexif liberation_ttf curl utillinux xdg_utils wget flac harfbuzz icu libpng opusWithCustomModes snappy speechd - bzip2 libcap + bzip2 libcap at_spi2_atk ] ++ optional pulseSupport libpulseaudio ++ [ gtk ]; @@ -68,7 +67,7 @@ in stdenv.mkDerivation rec { name = "google-chrome${suffix}-${version}"; - src = binary; + src = chromium.upstream-info.binary; buildInputs = [ patchelf diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index 0f6c4ed36d4..9cad2838a39 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/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 5004c55b5bb..614f55d01d6 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -73,7 +73,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "28.0.0.126"; + version = "28.0.0.137"; src = fetchurl { url = @@ -84,14 +84,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "16ivf0j7kr7hak2pxs4mbhw5g0i8ky72mvdkaxpfq42g4mr7qf62" + "1hj3sfrspdkhq967fmnpgamgiq90k263cqfas94gp3dzslmkingw" else - "09dn1zr5bcfvkb46z86p7gr2g9p0a3nj9vvw1qw2fblvbajmznk0" + "1v4k6hzngm23xwxnh6ngplp2m0ga480sbcm668bpcj61krmi6xy4" else if arch == "x86_64" then - "0z5p3zimvx8zas649gn2nzp4gfvwc69hklza3d2hpmzb35ckfqbc" + "0ijmrk6262a1xcf98g94vdlqxnik9f7igjy08j3a2i4b5bikq479" else - "0kyyjqim7qq0am2hr9ldcbm4sx8dsbgf3916km9gbgg8vjddgxwy"; + "10a17dba4zy29padvi3fnv2s8v71q698ffqjp8ggsla42pjyhvkh"; }; 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 8de4e7bd111..d5c4f993d8b 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -55,7 +55,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "28.0.0.126"; + version = "28.0.0.137"; src = fetchurl { url = @@ -65,9 +65,9 @@ stdenv.mkDerivation rec { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/28/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "07692qivf09zh36vlaczwwq93f8p7v1afnsgkry7m9yybxh1753d" + "0xr3hf828sm0xdnmk2kavxmvzc6m0mw369khrxyfwrbxvdsibwn8" else - "14xj55wjp9jvm01n8bwrbwmkhpcrxc44yfqi3jq8f8pzrqi7smck"; + "1wr0avjpshrj51svb1sfnshz39xxla1brqs8pbcgfgyqjh350rgn"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 0852b5c9d43..b98d1d415c6 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/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 736011a13eb..006aa88f363 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { desktopItem = makeDesktopItem { name = "palemoon"; exec = "palemoon %U"; + icon = "palemoon"; desktopName = "Pale Moon"; genericName = "Web Browser"; categories = "Application;Network;WebBrowser;"; @@ -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,6 +87,14 @@ 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 ''; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index f4beb70f40d..9142ecde859 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 = ""; - version = "1.0.4"; +in python3Packages.buildPythonApplication rec { + name = "qutebrowser-${version}${versionPostfix}"; namePrefix = ""; + version = "1.1.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 = "0z8zrgr914bfmimqk3l17dxyc7gzh42sw8lfp041zzvj6fxw3lkr"; + sha256 = "09fa77rg1yrl8cksavxmgm9z2246s4d8wjbkl5jm1gsam345f7mz"; }; # 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; + ] ++ 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/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 8f22045578d..d64c7a20cb9 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -98,7 +98,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "7.0.11"; + version = "7.5"; 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 = "0i42jxdka0sq8fp6lj64n0az6m4g72il9qhdn63p0h7y4204i2v4"; + sha256 = "1ia8qv5hj7zrrli5d9qf65s3rlrls0whrx3q96lw63x2gn05nwv7"; }; "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 = "1p9s6wqghpkml662vnp5194i8gb9bkqxdr96fmw0fh305cyk25k0"; + sha256 = "1sw1n7jsagyl5cjs265x3k9jzh0j0yh767ixcy17vif5f9dfyzak"; }; }; in diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index c654723f4c2..5b10932e73b 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -4,11 +4,11 @@ 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 ]; @@ -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/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index f65e2fe1851..83819761e9b 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -70,7 +70,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/cluster/chronos/chronos-deps.nix b/pkgs/applications/networking/cluster/chronos/chronos-deps.nix index 1caf1ce0bc8..aac0dd10e15 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/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 6654ee89c80..68c66d78de1 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -23,7 +23,7 @@ let }); in stdenv.mkDerivation rec { - version = "1.4.0"; + version = "1.4.1"; name = "mesos-${version}"; enableParallelBuilding = true; @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://apache/mesos/${version}/${name}.tar.gz"; - sha256 = "0c08kd226nrjwm2z2drpq4vi97h9r8b1xkdvkgh1114fxg7cyvys"; + sha256 = "1c7l0rim9ija913gpppz2mcms08ywyqhlzbbspqsi7wwfdd7jwsr"; }; patches = [ diff --git a/pkgs/applications/networking/cluster/mesos/mesos-deps.nix b/pkgs/applications/networking/cluster/mesos/mesos-deps.nix index 642c660edb6..1cf819870f4 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 f69b0e5eca9..d27693823a6 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -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.9.0"; localkube-binary = fetchurl { url = "https://storage.googleapis.com/minikube/k8sReleases/v${localkube-version}/localkube-linux-amd64"; - sha256 = "09mv1g9i0d14brvvp2wxgmfqvgp0na5dbm4z76a660q1fxszvgqc"; + sha256 = "1z5c061mx2flg6hq05d00bvkn722gxv8y9rfpjyk23nk697k31fh"; }; in buildGoPackage rec { pname = "minikube"; name = "${pname}-${version}"; - version = "0.24.1"; + version = "0.25.0"; goPackagePath = "k8s.io/minikube"; @@ -31,7 +31,7 @@ in buildGoPackage rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "18b5ic4lcn84hq2ji5alyx58x9vi0b03544i5xzfgn3h2k78kynk"; + sha256 = "0nsdi8mr8p69z696ksfb5ahzqqnvjn4a2z6cp0kyby8sakcjhsby"; }; patches = [ diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 79500a33bf8..99b7566fc71 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -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 diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index a7c5bf4046b..890fe231cbf 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -72,7 +72,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"; @@ -97,10 +97,14 @@ in { passthru = { inherit plugins; }; }); + terraform_0_10-full = terraform_0_10.withPlugins lib.attrValues; + terraform_0_11 = pluggable (generic { - version = "0.11.1"; - sha256 = "04qyhlif3b3kjs3m6c3mx45sgr5r13x55aic638zzlrhbpmqiih1"; + version = "0.11.3"; + sha256 = "0637x7jcm62pdnivmh4rggly6dmlvdh3jpsd1z4vba15gbm203nz"; 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 fb778b4c221..af359ed1a4d 100644 --- a/pkgs/applications/networking/cluster/terraform/providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform/providers/data.nix @@ -4,8 +4,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-alicloud"; - version = "1.2.0"; - sha256 = "0v3ji83igjf3b7lp8525j42jxwlvbxws1d7q72v20xlnbyz03h3x"; + version = "1.5.0"; + sha256 = "14wrp6szg9mh8bxqqjbx0i654lciw09wghm8h3c6x79ayxan5n8x"; }; archive = { @@ -32,13 +32,13 @@ { owner = "terraform-providers"; repo = "terraform-provider-aws"; - version = "1.5.0"; - sha256 = "1c1mkb3299ahf3w58zkk7ilkasflwj2n1kqgddaylqqfcjykblyj"; + version = "1.6.0"; + sha256 = "0x4lrpq00z5ww8awym7p6kwrf17ghai36zj8hr10n4qraf8a9ma6"; }; - azure = + azure-classic = { owner = "terraform-providers"; - repo = "terraform-provider-azure"; + repo = "terraform-provider-azure-classic"; version = "0.1.1"; sha256 = "11myqq3wnxvpysjycvwg7b14ll8d9vkn06xb3r26kmc42fkl5xv1"; }; @@ -95,8 +95,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-cloudstack"; - version = "0.1.1"; - sha256 = "09iqxpc5a6938qj1js2y9s4dcgk7hw69xga56ixpbbknms2yrhnb"; + version = "0.1.4"; + sha256 = "1dj6zkwv0bix31b8sjad9gil43m8c2c5d1dr10qza40f9z4agaxa"; }; cobbler = { @@ -116,8 +116,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-datadog"; - version = "1.0.1"; - sha256 = "1a5acwxqwasckkyj9h33kgn1cmnmn14x4fg19kz742zwfyjmncwj"; + version = "1.0.3"; + sha256 = "0nh2dww3hx6jrkcd9lq5hpnqr3grp9cmqi4nwmxlrc5azf8x0mii"; }; digitalocean = { @@ -172,8 +172,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-fastly"; - version = "0.1.2"; - sha256 = "1z7nsgqqzvily9rxr79yjv6jfx56896c9lxb8flmzwjz6b6mvnz7"; + version = "0.1.3"; + sha256 = "0q331j91c1kns01yhvbxrq0vf21653ch6fvkzlx61337az7jhky8"; }; github = { @@ -207,15 +207,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-heroku"; - version = "0.1.1"; - sha256 = "0i5pdb05qkd6h9zyr88ppsiii6g6zjc5096xblizvmiww7mp81gn"; + 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 = { @@ -256,8 +256,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-local"; - version = "1.0.0"; - sha256 = "1dxdpmai8f0g1gj6khgv769lhg6ssfmgqskg4c5qf1jnv8yn8mkd"; + version = "1.1.0"; + sha256 = "1qxfyyg8k43rw0gny4dadamc2a9hk3x6ybdivifjc17m7il0janc"; }; logentries = { @@ -284,8 +284,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-mysql"; - version = "1.0.0"; - sha256 = "1vkr1gg9adrkzlbdy0w0wn1ap5zla1k54kxfmd5jndw4hzgysi82"; + version = "1.0.1"; + sha256 = "07lm1la9llp52gfs5wf6kq5rjys9lmd3hl7x5821vz54rakzic6n"; }; newrelic = { @@ -319,15 +319,15 @@ { 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.0.1"; + sha256 = "0r8xczb1vy1h6ka97x7x025d030m7d01r52bbmf2z9sh81hhsa1x"; }; openstack = { @@ -354,8 +354,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-ovh"; - version = "0.1.0"; - sha256 = "052bnfw146h9nh3cw77clwwxbmw1gvaich2yw39v4b1ca8brm5dr"; + version = "0.2.0"; + sha256 = "12dpgx0fpmqw64v5a70fihbgixyw71bdjbdi17gal7s2pj1xw159"; }; packet = { @@ -389,8 +389,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-profitbricks"; - version = "1.0.0"; - sha256 = "15j66mm7mkwblwncb5s0xbcz7jz99mzswhppzxchwkbk3325syyx"; + version = "1.0.1"; + sha256 = "02blr487pbp7myw2l6nib9g1a8vplk9khakxaj9wbg779vp8wvcg"; }; rabbitmq = { @@ -403,8 +403,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-rancher"; - version = "1.1.1"; - sha256 = "1gs62yd31kywg2yhnikli1khai1n0lwy8pb3g7k5ad8ibffjskmz"; + version = "1.2.0"; + sha256 = "0xxff4mh4cv27mignvanhsz5sf5476ljk7q4h67fy4y0gzyxwpzw"; }; random = { @@ -473,8 +473,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-triton"; - version = "0.3.0"; - sha256 = "0x8cws41mpxcwd4hf380gizhdnnfs2df5pwcc417sbp2706cai1h"; + version = "0.4.1"; + sha256 = "09zljia422afm565d3qm57j5y1n12h52bgyqz6s1s8dmcdygd75g"; }; ultradns = { diff --git a/pkgs/applications/networking/cluster/terraform/providers/default.nix b/pkgs/applications/networking/cluster/terraform/providers/default.nix index 8d41df24d8c..72da1dd77d5 100644 --- a/pkgs/applications/networking/cluster/terraform/providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform/providers/default.nix @@ -14,8 +14,8 @@ let }; 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/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 576daa88127..a31c7882693 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "terragrunt-${version}"; - version = "0.13.23"; + version = "0.14.0"; goPackagePath = "github.com/gruntwork-io/terragrunt"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "gruntwork-io"; repo = "terragrunt"; - sha256 = "1xx3kw38vr563x3bn0rrg1iq4r51rl0qci2magwwng62cgh3zaiy"; + sha256 = "1fz4ny7jmwr1xp68bmzlb6achird7jwbb6n6zim6c1w0qybxiqg9"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix index c371c756a15..30d6acb9afa 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 = "d0cb8551ac28d362e77ea475e5b7b2ebaec06b6b"; - sha256 = "1546kb49wb1qjx6pz7aj4iygmqsjps70npb5csm5q08wxk63vhls"; + rev = "00cca3f093a8236a93fbbeeae7d28ad83811683c"; + sha256 = "1x2frsin6d9drx9k65pv0r0l0asj16fzj815s2a9db2mxh8jycsp"; }; } { @@ -41,8 +41,8 @@ fetch = { type = "git"; url = "https://github.com/hashicorp/go-getter"; - rev = "994f50a6f071b07cfbea9eca9618c9674091ca51"; - sha256 = "1v2whvi9rnrkz4ji3b3sinvv3ahr5s4iyzchz00wjw0q2kdvj1zj"; + rev = "285374cdfad63de2c43d7562f49ced6dde5a7ba0"; + sha256 = "0xmwxfb0vm20ga1j1r3lavxm15vwqdkisdkshw1nia7byhwmb4xm"; }; } { @@ -68,8 +68,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-zglob"; - rev = "4b74c24375b3b1ee226867156e01996f4e19a8d6"; - sha256 = "1qc502an4q3wgvrd9zw6zprgm28d90d2f98bdamdf4js03jj22xn"; + rev = "4959821b481786922ac53e7ef25c61ae19fb7c36"; + sha256 = "0rwkdw143kphpmingsrw1zp030zf3p08f64h347jpdm4lz8z5449"; }; } { @@ -95,8 +95,8 @@ fetch = { type = "git"; url = "https://github.com/mitchellh/mapstructure"; - rev = "06020f85339e21b2478f756a78e295255ffa4d6a"; - sha256 = "12zb5jh7ri4vna3f24y9g10nzrnz9wbvwnk29wjk3vg0ljia64s9"; + rev = "b4575eea38cca1123ec2dc90c26529b5c5acfcff"; + sha256 = "1x80f3kcb1wd2mdxks3wcsp26q9g7ahr8b18z1anl5igg6zl61kf"; }; } { @@ -104,8 +104,8 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "2aa2c176b9dab406a6970f6a55f513e8a8c8b18f"; - sha256 = "1j92x4291flz3i4pk6bi3y59nnsi6lj34zmyfp7axf68fd8vm5ml"; + rev = "12b6f73e6084dad08a7c6e575284b177ecafbc71"; + sha256 = "01f80s0q64pw5drfgqwwk1wfwwkvd2lhbs56lhhkff4ni83k73fd"; }; } { @@ -122,8 +122,8 @@ fetch = { type = "git"; url = "https://github.com/urfave/cli"; - rev = "39908eb08fee7c10d842622a114a5c133fb0a3c6"; - sha256 = "1s0whq54xmcljdg94g6sghpf6mkhf6fdxxb18zg0yzzj6fz9yj8j"; + rev = "75104e932ac2ddb944a6ea19d9f9f26316ff1145"; + sha256 = "13iagavgqq3sn9m3sck0chydwy5rcbhj0ylvc1169vs8q2m13yh9"; }; } ] diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 64d42835df2..5bafb8e7c4c 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"; diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix index 611d7904991..8664e38a8ed 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; diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix new file mode 100644 index 00000000000..e6a5737530b --- /dev/null +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -0,0 +1,45 @@ +{ 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.10.2"; + + src = fetchurl { + url = "https://newsboat.org/releases/${version}/${name}.tar.xz"; + sha256 = "1x4nxx1kvmrcm8jy73dvg56h4z15y3sach2vr13cw8rsbi7v99px"; + }; + + 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"; + + 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 72a98a99604..3a5983c2e27 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/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index b25d4e109eb..0a89ec6023b 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -1,22 +1,27 @@ -{ 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.5"; - 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 = "0swjh664y1yqr1rn3ym2kicyx7r97ypr4qf7qrjl4a5q1spzsv48"; }; buildInputs = [ qtwebengine qttools ]; nativeBuildInputs = [ qmake wrapGAppsHook ]; qmakeFlags = [ "CONFIG+=release" ]; + # FIXME: This shouldn't be needed after 3.5.5. + # See: https://github.com/martinrotter/rssguard/issues/175 + preConfigure = '' + lrelease rssguard.pro + ''; + meta = with stdenv.lib; { description = "Simple RSS/Atom feed reader with online synchronization"; longDescription = '' diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix index fd349b320d2..a7fd31cac2f 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/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 210d78369da..ddfa4fd607d 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.30.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 = "1w0zqkccbsbmnjc9pfd1i3ywzwrdp0pprryvdk4sfn5ms9nnf2wi"; }; configureFlags = [ diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 1d120f09a91..a140de2c236 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.1"; - previewVersion = "2.1.1"; + stableVersion = "2.1.3"; + # 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 = "1yya0alc4ifgikka513ps243l8211rvifm0xz1ymx8nck0s6sj35"; + serverSrcHash = "16d698gpj2r3z7qvvlrsx8ylgb1nfkmia2pcvk22068p3ajwypx1"; in { guiStable = mkGui { stable = true; - sha256Hash = "1iyp5k8z3y32rv8wq268dk92vms5vhhhijxphwvfndh743jaynyk"; + sha256Hash = guiSrcHash; }; guiPreview = mkGui { stable = false; - sha256Hash = "1iyp5k8z3y32rv8wq268dk92vms5vhhhijxphwvfndh743jaynyk"; + sha256Hash = guiSrcHash; }; serverStable = mkServer { stable = true; - sha256Hash = "0d427p1g7misbryrn3yagpgxcjwiim39g11zzisw2744l116p7pv"; + sha256Hash = serverSrcHash; }; serverPreview = mkServer { stable = false; - sha256Hash = "0d427p1g7misbryrn3yagpgxcjwiim39g11zzisw2744l116p7pv"; + sha256Hash = serverSrcHash; }; } diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 5a201dfc407..3fd7317ef6c 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -4,29 +4,6 @@ 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: - rec { - pname = "multidict"; - version = "3.1.3"; - name = "${pname}-${version}"; - src = pythonPackages.fetchPypi { - inherit pname version; - sha256 = "04kdxh19m41c6vbshwk8jfbidsfsqn7mn0abvx09nyg78sh80pw7"; - }; - doInstallCheck = false; - })); - yarl = (stdenv.lib.overrideDerivation pythonPackages.yarl - (oldAttrs: - { propagatedBuildInputs = [ multidict_3_1_3 ]; })); - aiohttp = (stdenv.lib.overrideDerivation pythonPackages.aiohttp - (oldAttrs: - rec { - propagatedBuildInputs = [ yarl multidict_3_1_3 ] - ++ (with pythonPackages; [ async-timeout chardet ]); - })); aiohttp-cors = (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors (oldAttrs: rec { @@ -37,7 +14,6 @@ let inherit pname version; sha256 = "11b51mhr7wjfiikvj3nc5s8c7miin2zdhl3yrzcga4mbpkj892in"; }; - propagatedBuildInputs = [ aiohttp ]; })); in pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; @@ -50,16 +26,13 @@ in pythonPackages.buildPythonPackage rec { sha256 = sha256Hash; }; - propagatedBuildInputs = [ yarl aiohttp aiohttp-cors multidict_3_1_3 ] + 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; 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 00000000000..00636c7c1e9 --- /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-steam/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix index fd05948864c..1477d067464 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/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 0fb05eda4a8..76d68880263 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.3"; + version = "0.0.4"; name = "${pname}-${version}"; src = fetchurl { url = "https://cdn.discordapp.com/apps/linux/${version}/${pname}-${version}.tar.gz"; - sha256 = "1yxxy9q75zlgk1b4winw4zy9yxk5pn8x4camh52n6v3mw6gq0bfh"; + 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/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index 9f9236244ae..9f85c940c1b 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -3,20 +3,22 @@ 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 + ptime notty sexplib hex uutf ]; buildPhase = "${ocamlPackages.topkg.run} build --pinned true"; 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 00000000000..38f38a03a80 --- /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/kadu/cmake.patch b/pkgs/applications/networking/instant-messengers/kadu/cmake.patch deleted file mode 100644 index bb2d2d39d25..00000000000 --- 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 d5595fc85af..00000000000 --- 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/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index cf1893b198e..bd3fc82f7cb 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -3,6 +3,7 @@ , perl, perlXMLParser, libxml2, nss, nspr, farstream , libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn , lib, python, libICE, libXext, libSM +, cyrus_sasl ? null , openssl ? null , gnutls ? null , libgcrypt ? null @@ -33,7 +34,7 @@ let unwrapped = stdenv.mkDerivation rec { libxml2 nss nspr farstream libXScrnSaver ncurses python avahi dbus dbus_glib intltool libidn - libICE libXext libSM + 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/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index 8b2e35c2f0e..768ab24c2f3 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { name = "quaternion-${version}"; - version = "0.0.4"; + version = "0.0.5"; - # libqmatrixclient doesn't support dynamic linking as of 0.1 so we simply pull in the source + # 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 = "1nbxlflm94pb19gdwb95z92kzg4px97dmp8av3mj4imk1ysnyrvi"; + sha256 = "14xmaq446aggqhpcilahrw2mr5gf2mlr1xzyp7r6amrnmnqsyxrd"; }; buildInputs = [ qtbase qtquickcontrols libqmatrixclient ]; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix index 1276306a8dc..9876767b57e 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix @@ -45,7 +45,7 @@ in src = if stdenv.system == "x86_64-linux" then fetchurl { - url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop-beta_${version}_amd64.deb"; + url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; sha256 = "1kllym2iazp9i5afrh0vmsqqlh5b8i6f929p5yhl8bl4zd17zwpx"; } else diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 11a1efec8ab..f75487565e1 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -6,7 +6,7 @@ let # 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.11.0.4"; + version = "8.13.0.2"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -57,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 = "1chwc4rqcwwim03n6nski5dar33bb1gnadbvcjg6gln3xqr0ipib"; + sha256 = "15p1v6y8fwx9qj3ag645bvrcw7c1j20v63iy75s4xwsv1siz8cf9"; } else throw "Skype for linux is not supported on ${stdenv.system}"; diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index a32623c1c84..b6f731ee651 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 = "3.0.0"; + version = "3.0.5"; 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 = "17hq31x9k03rvj2sdsdfj6j75v30yrywlsbca4d56a0qsdzysxkw"; + sha256 = "13im5m119cp5v0gvr1vpxjqskr8rvl6pii91b5x522wm7plfhj8s"; } else throw "Slack is not supported on ${stdenv.system}"; diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index c14c9ade2dd..b7dfdb3e341 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.7"; 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 "1ww20805b7iphkh1ra3py6f7l7s321cg70sfl9iw69n05l3313fn" + else "0yvhmbhliraakn9k4bij6rnai7hn50g4z6mfjsyliizf6437x4nr"; }; # grab the plugin sdk for the desktop icon diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 3f438c62508..c4158d280e2 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,36 +1,42 @@ -{ mkDerivation, lib, fetchgit, pkgconfig, gyp, cmake -, qtbase, qtimageformats -, gtk3, libappindicator-gtk3, dee -, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio -, gcc +{ mkDerivation, lib, fetchgit, fetchpatch +, pkgconfig, gyp, cmake, gcc7, makeWrapper +, qtbase, qtimageformats, gtk3, libappindicator-gtk3 +, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 }: mkDerivation rec { name = "telegram-desktop-${version}"; - version = "1.1.23"; + version = "1.2.6"; # Submodules src = fetchgit { url = "git://github.com/telegramdesktop/tdesktop"; rev = "v${version}"; - sha256 = "0pdjrypjg015zvg8iydrja8kzvq0jsi1wz77r2cxvyyb4rkgyv7x"; + sha256 = "15g0m2wwqfp13wd7j31p8cx1kpylx5m8ljaksnsqdkgyr9l1ar8w"; fetchSubmodules = true; }; + # TODO: Not active anymore. tgaur = fetchgit { url = "https://aur.archlinux.org/telegram-desktop-systemqt.git"; - rev = "885d0594d8dfa0a17c14140579a3d27ef2b9bdd0"; - sha256 = "0cdci8d8j3czhznp7gqn16w32j428njmzxr34pdsv40gggh0lbpn"; + rev = "1ed27ce40913b9e6e87faf7a2310660c2790b98e"; + sha256 = "1i7ipqgisaw54g1nbg2cvpbx89g9gyjjb3sak1486pxsasp1qhyc"; }; - buildInputs = [ - gtk3 libappindicator-gtk3 dee qtbase qtimageformats ffmpeg openalSoft minizip - libopus alsaLib libpulseaudio + patches = [ + (fetchpatch { + name = "tdesktop.patch"; + url = "https://git.archlinux.org/svntogit/community.git/plain/repos/community-x86_64/tdesktop.patch?h=packages/telegram-desktop&id=f0eefac36f529295f8b065a14b6d5f1a51d7614d"; + sha256 = "1a4wap5xnp6zn4913r3zdpy6hvkcfxcy4zzimy7fwzp7iwy20iqa"; + }) ]; - nativeBuildInputs = [ pkgconfig gyp cmake gcc ]; + nativeBuildInputs = [ pkgconfig gyp cmake gcc7 makeWrapper ]; - patches = [ "${tgaur}/tdesktop.patch" ]; + buildInputs = [ + qtbase qtimageformats gtk3 libappindicator-gtk3 + dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3 + ]; enableParallelBuilding = true; @@ -54,7 +60,7 @@ mkDerivation rec { "-I${libopus.dev}/include/opus" "-I${alsaLib.dev}/include/alsa" "-I${libpulseaudio.dev}/include/pulse" - ]) [ "QtCore" "QtGui" ]; + ]) [ "QtCore" "QtGui" "QtDBus" ]; CPPFLAGS = NIX_CFLAGS_COMPILE; preConfigure = '' @@ -69,6 +75,9 @@ mkDerivation rec { -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" @@ -98,6 +107,13 @@ mkDerivation rec { 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 + + # This is necessary to run Telegram in a pure environment. + wrapProgram $out/bin/telegram-desktop \ + --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 = with lib; { @@ -105,6 +121,6 @@ mkDerivation rec { license = licenses.gpl3; platforms = platforms.linux; homepage = https://desktop.telegram.org/; - maintainers = with maintainers; [ abbradar garbas ]; + maintainers = with maintainers; [ abbradar garbas primeos ]; }; } diff --git a/pkgs/applications/networking/irc/ii/default.nix b/pkgs/applications/networking/irc/ii/default.nix index c6bb2479bfc..5e65c0dfeaf 100644 --- a/pkgs/applications/networking/irc/ii/default.nix +++ b/pkgs/applications/networking/irc/ii/default.nix @@ -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 75c4f9ac5c9..c543825c9f2 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintlOrEmpty }: stdenv.mkDerivation rec { - version = "1.0.5"; + version = "1.1.0"; name = "irssi-${version}"; src = fetchurl { url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz"; - sha256 = "1lasb8flic4qc1sd3pvfg9aig5skcxlyx6iy9bk73147r8vzaq75"; + sha256 = "0y362v6ncgs77q5axv7vgjm6vcxiaj5chsxj1ha07jaxsr1z7285"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 78646f7a8b2..7c685b9df6b 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 6f48f44214c..975715ed7fc 100644 --- a/pkgs/applications/networking/irc/sic/default.nix +++ b/pkgs/applications/networking/irc/sic/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { 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/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix index db36c8dca61..a89898c3739 100644 --- a/pkgs/applications/networking/jmeter/default.nix +++ b/pkgs/applications/networking/jmeter/default.nix @@ -1,13 +1,17 @@ -{ fetchurl, stdenv, ant }: +{ fetchurl, stdenv, jre }: stdenv.mkDerivation rec { - name = "jmeter-2.11"; + name = "jmeter-3.3"; src = fetchurl { url = "http://archive.apache.org/dist/jmeter/binaries/apache-${name}.tgz"; - sha256 = "1fr3sw06qncb6yygcf2lbnkxma4v1dbigpf39ajrm0isxbpyv944"; + sha256 = "190k6yrh5casadphkv4azp4nvf4wf2q85mrfysw67r9d96nb9kk5"; }; + buildInputs = [ jre ]; + installPhase = '' + substituteInPlace ./bin/jmeter.sh --replace "java $ARGS" "${jre}/bin/java $ARGS" + substituteInPlace ./bin/jmeter --replace "java $ARGS" "${jre}/bin/java $ARGS" mkdir $out cp ./* $out/ -R ''; diff --git a/pkgs/applications/networking/kget/default.nix b/pkgs/applications/networking/kget/default.nix deleted file mode 100644 index 0dc37d10d1a..00000000000 --- 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 00000000000..7fbdf0f6a64 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/afew/default.nix @@ -0,0 +1,28 @@ +{ stdenv, pythonPackages, notmuch }: + +pythonPackages.buildPythonApplication rec { + pname = "afew"; + version = "1.2.0"; + + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "121w7bd53xyibllxxbfykjj76n81kn1vgjqd22izyh67y8qyyk5r"; + }; + + buildInputs = with pythonPackages; [ setuptools_scm ]; + + propagatedBuildInputs = with pythonPackages; [ + pythonPackages.notmuch chardet + ] ++ 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/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index cccfdbc7560..aee4d8ca04e 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -32,19 +32,17 @@ 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 diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix new file mode 100644 index 00000000000..ef66f69f979 --- /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.0.0"; + + 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 = "01384fi5vrfqpznk9389nf3bwpi2zjbnkg84g6z1css8f3gp5i1c"; + }; + + 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/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix new file mode 100644 index 00000000000..6cfac41676c --- /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"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; + + src = fetchFromGitHub { + owner = "chneukirchen"; + repo = "mblaze"; + rev = "v${version}"; + sha256 = "1jrn81rvw6qanlfppc12dkvpbmidzrq1lx3rfhvcsna55k3gjyw9"; + }; + + 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 d28bfb647e5..90fbe18f0bc 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mutt-${version}"; - version = "1.9.2"; + version = "1.9.3"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz"; - sha256 = "15kqxpx8bykqbyw4q33hkz0j2f65v6cl21sl5li2vw5vaaim5qd2"; + sha256 = "1qbngck1pq1jkpnbpcwcb2q2zqrkgp0nd68wwp57bprxjgb8a6j3"; }; patches = optional smimeSupport (fetchpatch { diff --git a/pkgs/applications/networking/mailreaders/notbit/default.nix b/pkgs/applications/networking/mailreaders/notbit/default.nix new file mode 100644 index 00000000000..3e235400498 --- /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/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 079e1b7927c..0c0f55e6337 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.3"; + version = "0.26"; name = "notmuch-${version}"; passthru = { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "1fyx20rjpwbf2j1v5fpa5s0rjnwhcgvijzh2qyinp8rlbh1qxmab"; + sha256 = "1pvn1n7giv8n3xlazi3wpscdqhd2yak0fgv68aj23myr5bnr9s6k"; }; nativeBuildInputs = [ pkgconfig ]; @@ -46,9 +46,8 @@ stdenv.mkDerivation rec { "{}" ";" 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\" @@ -97,7 +96,7 @@ stdenv.mkDerivation rec { description = "Mail indexer"; homepage = https://notmuchmail.org/; license = licenses.gpl3; - maintainers = with maintainers; [ chaoflow garbas the-kenny ]; + 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 b865622efe4..e25dfe834f6 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/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index a63bedfb29d..d58680d15d5 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 }: + +assert gpgSupport -> gpgme != null; +assert sslSupport -> openssl != null; with stdenv.lib; -assert sslSupport -> openssl != null; -assert gpgSupport -> gpgme != null; - stdenv.mkDerivation rec { name = "sylpheed-${version}"; - version = "3.5.1"; + version = "3.6.0"; src = fetchurl { - url = "http://sylpheed.sraoss.jp/sylpheed/v3.5/${name}.tar.bz2"; - sha256 = "11qhbfyvi5hxv1f448zgbzgrdjj3a4mxj2bfpk6k4bqf7ahh8nis"; + url = "http://sylpheed.sraoss.jp/sylpheed/v3.6/${name}.tar.bz2"; + sha256 = "0idk9nz3d200l2bxc38vnxlx0wcslrvncy9lk50vz7dl8c5sg97b"; }; 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/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 656c4f03c0e..0ae1777a839 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.5.2"; + version = "52.6.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/ar/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/ar/thunderbird-52.6.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "637ca11b07a86b806ea274cf3cd9a47dc2d23a2700203c1ddfb25bac15bb4ed1eb4749f630021dd0f33f00c43539954d9fecc192d3582e752940ade0930422ef"; + sha512 = "fa4cc97701d7a44e2256149497a72a7057f3b677163b85029a9721fa03b4b518fa8c3564ad727824faf3c81242bc7dfe673f7fbbe1bb2b92aea16b779df8d6f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/ast/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/ast/thunderbird-52.6.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "78c6da93f60134c9b033f270d04b983713dd84ba6af8cd1c0529471dbd3c860085491bc54f0fd37a8373dd5164b064653d9ae6ab12f7748a9722aa61472ed7cb"; + sha512 = "f40ae6c5f72ad797b42c6ada1302eebf63b649bfa2d5838cea7371ad92de8e1eaaa79cd115993d96dd873bca996b12fb20c8f4f40ee4db144cc2bbd5a27ef182"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/be/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/be/thunderbird-52.6.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "7081fddbc88cdd0280bb35c7f16c33f8935d639d91e2ed4258e344565ea6f27d1ed8f2b5daa5d2e861e92357ba65c4c4b05260fab83f0bfaf6e2fa44ab081fbb"; + sha512 = "768453738bda8b0040d3b4cb21b1695dacaa54cacac5ec3130d5e4ebeea4e0ad8303ff2860fe5cfe5915df951aabe2f8a069b979abdc8ab8eb161811d93a8558"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/bg/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/bg/thunderbird-52.6.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "d5d21dfea54ac7c75c515cd95f0140a21451a3b2c533cc95f0a519a13b950e01c6f1d17e2fdae3610b46fef7450e1d816158a71ae37e8813d8b9dbbde2fbb4e1"; + sha512 = "dbe67671831f90f739a7af794578270f1177ce7e54727c78e6b74d6bc400ca3cff2ed4174b5b38b73ad1ebab0d9d0df34fd6e3ee769cf96e99f4fd84ff69d018"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/bn-BD/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/bn-BD/thunderbird-52.6.0.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "c59b5b7381ce8fc65018bd70dce55488b12915d2c9fab7421433d7836cde95a409c2f5206323581bcf7af08b90e7ce8eb3c55b0a4f660734d3e159077ba60374"; + sha512 = "4d7aa1a03c1ec122150611270502fc209406703f0081e4e6ed212d07b327adc67c49db2891b1b62799c48218935200c5f671615a159a900f4d838250ab578798"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/br/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/br/thunderbird-52.6.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "f3d5bea008f0849dc8834d51b6ba0529c2f803e5b059582076baf016fd9a02288d57851e1073c1df3f79f4fdb0f72ca8c707d25f75109d6b33ed60353180e80c"; + sha512 = "9e229670bb1a4263a1922b5c4d6329209d95aed8f92264977c8c9d1de81c89440666602fad19b686fe214e8847e305d531046fc00a77347393d3d38be31f7f1e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/ca/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/ca/thunderbird-52.6.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "64d024e4c696cffd4d97566411f7412ae16e98f169101bd36e87efb027555bc163f38ea1898b29a772fe31e1667dd69cc5eb19a96e04982b01b0de3975654292"; + sha512 = "0a905562d18452535a6cc05b945467e40c4ab8dd80d13ea07de293e02477cf5ac1c49546213e236f8266aaccc923ed261f1702b38289f2e165d818bb7e55b218"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/cs/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/cs/thunderbird-52.6.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "ecd78ba038a9133d8ecd0184ae44af661efd38d08e53184cb26b221d50101df38bc7833a0cd7c76d55a185288f055f5ac630b1da525a9008d878b4c5a3d9166c"; + sha512 = "3a2417f8b8396e0bd9c1b900f1547ea631683d35cf1e089698641dfd62672824a5594c8bae1ceed6d9fa4adb646da1b027a3c0378687b86ecd2351e4db227d22"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/cy/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/cy/thunderbird-52.6.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "1aaef9550bb3e3e5a49ad220344a9b8e20db885e06eea182f87dc8ddeaac62b0cd2b94f58524b0c6d3afea054cea0d75cc96f80732e390cc47848da16cad3fba"; + sha512 = "6f705e71057c5f4016ffc60ffd0dc114f462785eb139da474412fd6164c761d89f7faf08ffdc93cc746b0d3df1b57024d69c20303d867bb3ffdd2739869bc075"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/da/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/da/thunderbird-52.6.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "fa501b4febbeefc90ff9ecf4c2dc4468c6fd2dd04559ac886d8e58ea3d4eaf003cb4577197b5b5c391f602b83defe158b8e3405b36edf2a6e48e48719849deeb"; + sha512 = "4f981281b63ed48e58bee4b7702389dca2bf5497cc74e8603945b25c7ce18e73b7b0ec006df8e48ea5ca8d57c6b874e7cbdeb2f43e214cbb0b99cc7983556790"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/de/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/de/thunderbird-52.6.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "e4c87e3736dcfbe4e8fcce8a101030844cacfe2c20209de4a21cce247b8e80de3e4646c9a84c36d6d73199ea5926c2777a678b8f2b83521078c0c3a10a752b32"; + sha512 = "4553f9b771e4ee907e2e379eb87ac62143df34cd3777e8dadd74b46839c6cb79f8fec87b4bd48fefdd21a4837611637897232895278ef3bb0337f816c37ce685"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/dsb/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/dsb/thunderbird-52.6.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "eb169f9d2e9836b83edfd8ef8f7af867ac27831bb5aadf5a75f6e652b507dd7c34ca135c278f95d8f967406732d296af3d42a18fa9e91c8ed18216da77824e11"; + sha512 = "cfb64b6eddcbe54a701c5bca339225bec63e96dc2b1d3d2e358b32820239a970913415e8248ed8852be77d1e64741ab4746476e51a1fb9e9d6510cd6eabcfcb4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/el/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/el/thunderbird-52.6.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "dfd0160965fbebdffc217ed171bbb308902e1b0e89d91abe8167d7d26db991a8ce2b40b3161d623441102b2b6379a774b6af4a19bb39c27c59d76840351900b1"; + sha512 = "4761f016a202abfafd3d249ccca8d05b8697645eb820cb45b1567476cd806c49e9a13d9c5ff28df5c226e1f787abd698cbc610df28e03b5f0d70ad43b90a0ae4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/en-GB/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/en-GB/thunderbird-52.6.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "8c8506a8fe62e6ca55b1d99d8db9ec5fd224fa87ff63f9eae49656001f94124312110a414769d5d396574aa0e1f69a8f0a5298d6ad86146ba40912ebe68393a6"; + sha512 = "a310e79e4da7a79a0c9d48db19b68e197fa71e4ff3d3b1c1178206ff0bbe883623d97ded1268a8512f370dbb232b8534e503d42bb6fc70583b78e78deb27fcd5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/en-US/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/en-US/thunderbird-52.6.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "73e15c04a11190e8968bc64226ae4c677fa00ab460fe3497aab861c92c07ff6a3814673a7773ffc4e735491ac338e9d190e0c7cd626416c2508826000e1df002"; + sha512 = "10c1147b8509876d3b278df8d362cfb3279086d51ad40de1ffc8814878ba28b051940b347b4ca1a67bad8090ba488426403b219b2add070b704fac200ad4c283"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/es-AR/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/es-AR/thunderbird-52.6.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "6b42efb1bd21fb9c9df67496a09fdba958145d56b185d10187256e45b8891dcf725cecbf1868c7cdba515397085f616328c111301ab1cce584158a17ae47b944"; + sha512 = "77753858bcba266c6ea44f12eefc5a8fd1b6a7ef39b2e778e01490ff290046415e6a75a56a104dae12b1a6cfc69b179d13f6cf5b80ef20e8120864b7e9447d1f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/es-ES/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/es-ES/thunderbird-52.6.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "c1eaa597f18102f93b7621d50b5ebb54f9007ad01b5ce543e3f53cae88a42ce06c7d2332fb0e6b080ac2209403dfe06ce24a17f09c7ae3d5ace8d5e85e1ce603"; + sha512 = "f9228ef15899197a8defc67cfa8f51e17aa3f2e5b1e8b79cef8b221a012e47b74d5a91dc82ba1a53e97f1518b4d60f08220f870427751c9ee1c477600cfb3a38"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/et/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/et/thunderbird-52.6.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "b0386ef97662e21806c15342b68b2224ed3b41a8f1648f1b9869b527eb8b60951f9453a5abbc74e94905799953af5a7289b25c80fc370772368f39a048ef89bc"; + sha512 = "37cdd026fe48f84b19adf63c6bb642fd2efa72a95125fbf5e2761623c920549c045589dc53892a828bc759630e8cfd1afad5825af7d51d6c7c5fc495e450f401"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/eu/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/eu/thunderbird-52.6.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "d7070db2bac9aabbf5b020f60080d3beb9b1ecb4df73fb541f387435eb9ea80e2297c76a79910af0858ea42882298cfdd5c5016bd2049fdbe91dfe1f4bdb8b70"; + sha512 = "4827d5f30c5a9bda1aaf5836250d43b41d38d2f882cae61a097c5ae753a7d429a7486d8a47991173ebea15bb70cfdd6b1d4ee4c1e7696b41e9e047786f320b0f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/fi/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/fi/thunderbird-52.6.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "2dc49e7ebb96cafb37b600490bbf49a40393ed00cd4889e1bda6331e9dbf377a4cd53cb6cd98e7fb2e7cdf0da75e69e38e9f3894ab289f3ba0894f499e4f83b3"; + sha512 = "9e40fdfa10cfb24e4983834d72c831b5e94d8a05e51e45e989564c558af6d5c91710da1a63f5a21042da2cca9a4b310a52c1c212db02bcbe77d5579ba600d9fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/fr/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/fr/thunderbird-52.6.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "2ece29dfad71788ee5bf98afa262edc3b9bfaf57a2ea07d669c1003b09c5a5fbefcdb028d4842c53e17c1a63cce16f9296e574b834631cd485d0737cb13b174c"; + sha512 = "362d689566ac6ad74adcbccb188ca958af5d308090cc13f268be8608f4b20917ed0b1ccc33fd344b6b4434ed2a8a62c212cc25dc85f52f7ab20e0355df06a370"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/fy-NL/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/fy-NL/thunderbird-52.6.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "a84eab825c051666d606fff131542c71bcad7f204db19dc10d54166b499869e43951c9799d05b194f66ff40d5f307957c2d27de17da6ecac48ac24621da7287a"; + sha512 = "90b553cf697bc488e7f91eca2b9fceda94da72d49ff561af9a2f59dbe830a1ea29a49c9be8c544e1c83503a1902076a2badd7b35656372a18899f579d9455de6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/ga-IE/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/ga-IE/thunderbird-52.6.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "181fcdb0bae1a2aed16ba61523ec90f89b884d907796e1d1c37c722f68b89dbbabf977446022af6c7050e3e26d995e33891880e875f28247653225479847acfb"; + sha512 = "8fa91ed0e71961e0850f6acd69ffec0876e4b8f72d19b170429c10bd00681095bf816f7c028afa2f01eb5c32f27b6f8272b1a1e3340bdc87ccc9477bb100fbf1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/gd/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/gd/thunderbird-52.6.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "cc91084f593788da76815f185e2b9a877409537cdf52566000953a008bcb2783c09cd8893cba9f387b731fd636b1d8e7b7208832623d1222b5fef72db8cb4541"; + sha512 = "8653c7664694898222e1dc292bdc244a6a2bc900b240a7fed30ea5cce47e7fc5524afe7b67795d15f0eafb250a5218ae5f8fa8236b7c6e91e15c3c74808a798c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/gl/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/gl/thunderbird-52.6.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "6491bf74093139c86a5809d02582b6d055ebdb3cbf29a1a24ff7529a6e8c2bb89e26c27e7f65bb588c379566741510d6f8372f7f2a11004350cc7e907a3a6d8d"; + sha512 = "22e5454c0af357e030dda5a84347eb154524d0337fae6389102ffb0073ff33997dacac9b40dede462f55ea30c1bb4da65cc8e272271611f42ddd80b5ab9dae05"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/he/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/he/thunderbird-52.6.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "4235dfe0f51f55dcb905453aadc01baec3b8033384e5085072abb600c71f777699df4b556233ffa9b07f5d62442aefbce6f1eef2a9d557b24b48d797cf03b026"; + sha512 = "51bddbb2a254849b6dcbfaf1f2faae13454bbb71472c7c95d279b5f83a6b29b1b063d904f02f13295fa32e6b33867856341994db9a2201d8f358b006c0c7752b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/hr/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/hr/thunderbird-52.6.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "4236d464d704ba9c4c60323dd3518a37f71d24cd441404b6ae7a0e97ff17c839e2eff48d100211cf5ce9d3759336e7a0c29abe5f8390facedd769804adb8b956"; + sha512 = "a08e2a71ac92e317944f09b2f03bbcfc32122493ebc0800534b6f3c714d4af0c431caf97be1818bc284826b88f08db3e4392f0c2b89ac7adba587f2f450cf804"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/hsb/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/hsb/thunderbird-52.6.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "876a6c45e62c1025bf29ad3c626e3d2cbbc7d9d660e8e862b0fb586b73ed42a0bb58611dc69af727571c93f31dca450dd9156ba78b23b9a4a2116e561a8e3763"; + sha512 = "9539a6c48e60c4c773b735afa6ee544ceceffdca76ceeedd90973145f7deb23f2e449901cdc75190b5bd510537e70fd948775dc66caef8a7b95fc31843cbdb66"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/hu/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/hu/thunderbird-52.6.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "7bf7604f08e452f33154ba91cdef8aeda9905470f526f403dd76e19d1010f822cf2f3fb7c5f0525299bd0401139df1a12631f796d603e0ec3af4aa8df73ed0f2"; + sha512 = "d4d0fca22d430ec037bdf5cf8ccbce99df3cab22e4e6a2c3fb040cd1db960903e503ff2c8f633aa1f037a590b0a48134d949c1c4899de429a0533175fbb4a61b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/hy-AM/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/hy-AM/thunderbird-52.6.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "bd62aedb2c800265fc34c884f1605caa0040794cc49479189dfa4a959d49397ef023efaac0937c9573ef7a114cee16504b5a65f8f8f3f3d4d222f4a173707bfa"; + sha512 = "362ddd92ceec22ac93d95d721c1806ff0270fccf33f0cc4452ee147b3388f071b6d5aa27a0e7548a35a50453d55be2532d7fde19be611b9f0ecd741b5de59e1f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/id/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/id/thunderbird-52.6.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "1dd761bc1bdd865b5ebb494c00dede5e616a1bf7fbe6d7cf88d4f5362eb75435ae162d2e027fb7928783fe255179de00d28a29ab3d90350f75be7a1e4ad428a9"; + sha512 = "29ba391bbd9b8984850f056d856bcf90c0ac816fb8b831416e5a96f36e9b2dd0517cb5f1caf37998f75f024f3fbdd3b989ca6d4973ded22cbd15568a7b249531"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/is/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/is/thunderbird-52.6.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "12dbca26babd51739fc6505fdd36ad32b5827e1c3e439f3ae4c2c8e0f165528e693af537bec8630146c6c6bbc55b75d7c5bdd3bd84b5255cbf756d627beac2ce"; + sha512 = "2303d0d74e112bc4f86e6d73fb63fabe8f10aa3486a9d2f61fe16b0b0525bc7b6091c94e27f0ccb548b47bf808c937b83a4609c5c0cd0bd0fc6556c18dc08661"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/it/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/it/thunderbird-52.6.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "9c9b77c70429436b1cb0030c92109343eba9357f58873c13399e9e64f44807e06fc0c429e0748ce9a11f68baf643bec7cf313fe79cbfd35e548ad579b0e6e108"; + sha512 = "d3d9e95728063bd4e4742619c8ec27d4a0cdc34941ef8e6e3af71f19d59b4db6661366a81f1df7fd1de3a2ce995a1232f39744a825493a0c456d5257d02f7cf0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/ja/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/ja/thunderbird-52.6.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "2f785ddcb2e16ee1970cb582852ce52e1f3f7cbd58e8f714a18a387019b510cddfa1927f593b61ccc4b662b6e65f3fe20135eed451ba07a1df45b5979743b20d"; + sha512 = "1d64a298e5b0ec9eaac8f8972ae975a98a5bcbc4823abd59a6cbab251ddcb5ba76263bdae0b55dac15455d8b7d9c8bda71cc54ea0fe67aea5efa5552973be94b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/kab/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/kab/thunderbird-52.6.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "1bbd7b2c79cce7b74614e6f09cd7235d58def667f74bf3276ec928df4f0084704654224f100f227cdb350f839a13e474cbc98e4614ae45cf00969b2706291076"; + sha512 = "1b351b01ea540b809cad198912853b3f74bc9cb52c33b7fe4ab586f921ea4a2486f28e855d2be95398af6abad2911c5fd3f0ab16938edea85596689799b452b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/ko/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/ko/thunderbird-52.6.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "e176558707cda5570b020aa0fc3620deae7edc6e7e363e1ba4b51d6cad9f4a9e74a35be5f419fcc0e18dca31b6c887a62112f99b4a60d9026b8dc5f87de45f74"; + sha512 = "d9895da7e3099c5d9389308ae6982a77387cd7d61c07ec16e4511c00fc3b18bd025b95c6f05a94cd5e990eb9472816bd4af0a1bbe3605561f2bfe2b9f9b207e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/lt/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/lt/thunderbird-52.6.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "f431c57a74e0f8498a9a1ad36e6528d09dccf8b03aaf9e7ab66ddd503bbd78ddd15176a5e6c2358eeb616ee023f78414c30b67fd39c4c2f15f4e377df81759cf"; + sha512 = "8791ae3c0ee4745449b1690f69de0665f7854288188f1570e4c876b1f936e790d651bb1f9ecfcfe99f01f49026d534e667f262c72290894368579313b8a59615"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/nb-NO/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/nb-NO/thunderbird-52.6.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "5bfae55863550e32ea6581d0c24ae5374e2365d9e5e8f05f91856d0fd2760b761d183b12c9809668730efbba63e6c23408431f4616f6a7cc52ee465ccb939aba"; + sha512 = "be2e537c4dabfc6070f180205787712317ea3bf1befebb5d99d0be562aac60f728635ab665b6813776d985ff5c5d10e72658dbe20c6441722113ca8f9cf00553"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/nl/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/nl/thunderbird-52.6.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "fd7d35c0205610d868fb0676f3a8aaf328b1906dd1b174124e254ec8b08e5173741853938707dc99b10b4417df4a7010e20cb8a1038bf8f3258dee593cf788bb"; + sha512 = "20bc3bd3105880541b2dae20b703191cdb499dc7778fe874da5ae9b0b1626d72075631e256bc0c2fee1c4d1d27424cc6168c419afa8bec8a00d5904ae0678f12"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/nn-NO/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/nn-NO/thunderbird-52.6.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "1070fbd6c51d68e560fa0eeab66f2baa39d11752018d20d23a3577b12b504355f5729d0d961ffd20256521f54eda69d03fb8efef70f8254685e28b0164201354"; + sha512 = "2437751b998ee2898bbb8f8187adcbd102d29fc54054fb04efef2e0f7f308c864215bb8468ac42975bbd18c6e4a0c8903e5784a4d203df3643029cff696c2540"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/pa-IN/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/pa-IN/thunderbird-52.6.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "12293c8258f02403c8db220c73cf76b24315268324f2c6ac41dba7d77d9653cd1a21771a4994f7c6dc0db9948a601008e347d908c05dc59b7cf6ddcf95b2e86b"; + sha512 = "925ffbbd7d9e301c52b60963bced66af8b97a7b24275d73ca923f0d757164faf4ba7c69003286d74a69f1ed328e94347ba63c6ca7e13f47f42b7529af9de5ee6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/pl/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/pl/thunderbird-52.6.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "331b81876aeb162e1f4e838cb00712e971310285febfa669bf7c6d245c1e8353be941b6d1236423e0d835feacaabf859077da1918cf2652f6b79de30c4beaa30"; + sha512 = "27dfc79cfcfaea36ee50b2249e8e2a5195e9dd2f755b0f9d3274af2e4cb3d0d5214a4065e08678bbfcae4b51f0a0c2c4b4385c2a199a5b65035ac895de08bd63"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/pt-BR/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/pt-BR/thunderbird-52.6.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "d69fdae2048b738133fd07c6aa0ab6c264e555a3bc3a899d09fd7fe49435511fd544f3ef04e079c4efd320bc2abfa813f85a5f2a9e477af56aa47495466103b6"; + sha512 = "b600e2e3dc931ba2db5e4bf36187f971c7c1c710f8535d59c999a9685f551454a6e39f80cf70374aeac41ddace2f80fbe68bcda1675b80c5cc39dd8fccf7625f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/pt-PT/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/pt-PT/thunderbird-52.6.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "fa3286336d47b2216b0ec0c5fb6cba2421cb0cc81d1f815515c637a063b8de167cccfc3dd30b02636ae88e74efb34f8fde1b198924fe864b1fdc08d95b7f0f3d"; + sha512 = "3ca5ed7c487ca11ef2fc743e8a66eeaa05d2585d2fab0ca40b0d965e10e43d1216de358eb61921578fcdc72b69766f8fe24beb3c548ed47c705ab84a30941c34"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/rm/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/rm/thunderbird-52.6.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "b4affea897ac5af177c1fb6e4919f94f5f20860c3f492584c79664d803b7c2d092a96f1a3afe6b3212f689901a52d0ca74abab4910ba291280d52ecef2cf9a33"; + sha512 = "2d9e51a01175549c712c5bd1e95e08012ed9494a0f6fa5ffec8ee1c311279a6826cee99488a72d86f2cd98d9d9d6d20ef886bd4f69d100a2b589ef8dfc887335"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/ro/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/ro/thunderbird-52.6.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "3cdcf374f33961484962a6294ad8fd654b006f3472ce6550936a8c00a28943088c9c61049fba278cd304381003b46903a5514ac340b5a85a959edfe17242eb4e"; + sha512 = "8cfd1503ef3f4a9b4765d6c3fcc3a44aaa2fa557fc2a698452d10b037fdfcca09c462b455c4088b69aa89c153f14b1621d3c87c942a7bbb4627f95bbf0a37738"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/ru/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/ru/thunderbird-52.6.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "aa1d54fe356ef15d852a9ce3f269deee411d4815f4108c93c832def784c1afa104193e62fd9b47977d20ecfcf3057c05d76f39cc3abeb0341102b7e6e6639763"; + sha512 = "74d611abaa10d04be342139e19b7f724516a91de07a5f4ae4c4cd3ad927accb5e6668830040defa20878ec1fc884bc983d084729ebcd1fd453c7082a627329ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/si/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/si/thunderbird-52.6.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "543710116d67afb86e316dd17bf9a74a07ee5e3772381d9f0495af4d42075e96b6ff888ce0c3ce68ec779dc051f3ecb6105d51a6e4459cb4907a604662c933b7"; + sha512 = "292b5da1ea566ebeae2756b659b1f2ad40a4dc57517da926b3f8263a219e734d197d9aa55ce91582bd8818e0434d2a6b3bc40892d0cbd4715fcac50e3aebf7f3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/sk/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/sk/thunderbird-52.6.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "3ae5ab97172ff0f4d3eaea7a69fa54d9bcf639a8032ee2c5a3fcda2d8b30072d3386c54ef7e8c9bf5417a6030966c1097d69d41dd8c5355e82d048b783aef461"; + sha512 = "a5f6466d7ff0ceed4fa25c446925e398cd91c29d705ea1e28166bec09834b1f3ac61722823828d97d17b1ce7ac2e67aa98c3d5d94806b7a470d29c5722f37d9b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/sl/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/sl/thunderbird-52.6.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "9f3e0724e837608cf4a64a2505af732e4cdf61928bd5dd1237e27d5222147a8ec52870e88c73653de8518e9ab81af4fb8916b067c780b1af25b8f6c208a10684"; + sha512 = "9167d416f7552b55f8551146a3073757bea4106fea2004ad4303809f0532b85d37fea449ed09f0d162cbda2f429d869b90b5ef14f29784f418c63085a7c9b5b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/sq/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/sq/thunderbird-52.6.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "0f2e10a8b9cae1185079af8e37ca9622d9ed29b6bb38377cc2db7523dded8da4969798941ab1e99cc70b36bf2fa59549567cf5c1e1cc40ee0131350d60f8239f"; + sha512 = "aceb16a89f40243f56611d726a47b15bc6b0e5c1177a4beda6b147749299640742dd9d5f64384e88f4fc065c5f5ab80a7456a81ed63331a99a60e1e2e8b76a08"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/sr/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/sr/thunderbird-52.6.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "1f32b2705e4939c5e57f7a6a3eac29ccacbd90bb93361007b208a0eb1aea4f279b50fa17ffb86571cc2aa793742d3ff62caf28047b69c95ce358b6ec2cd24268"; + sha512 = "c0cefc58703c51d169686bb6c25477ea3116fc9691e0bf971d2a141ee8e93e4e1853911189c2b49d331d8b04c70e3c154083a05179c93a22b043a70918808ba3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/sv-SE/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/sv-SE/thunderbird-52.6.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "887176e1d4d9cb385ce0261a45f22bb67a87a125da737403c6965a6dd57ec7f0763b1245ea0d04b79aff5f41cd1ded3a06dc4ee301a17c01a9417ea2d515dcb0"; + sha512 = "179429292f73320f33d3cfbdd4b55b65117c8b8f60abadbf8c28537ab1e6e7664f7e2fa1b20ecdb201d7d535a9974638a7c22c2f5ba0fabea580509bd35d2a3e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/ta-LK/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/ta-LK/thunderbird-52.6.0.tar.bz2"; locale = "ta-LK"; arch = "linux-x86_64"; - sha512 = "fb981e6175b1f8fe79b65f2c324e376a89c7378074a6ead4cf3444516fd8d566591f942133642830caeef1f342ceb169d2e558171a5675ffc96a82deeca585a5"; + sha512 = "ccc1e3b1ca1e2a762c840c5e52b33cb3c05b75195576e95f7d28abe53aa6438d83eb185664797be9a0726f51416b4cc70877a4d6e01282d426459820eac59b01"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/tr/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/tr/thunderbird-52.6.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "2ce313b74b8512eea958c2c3e303829a3d7452a48efc07afbfbe9ea783c6099e75693b679cddb65802fef5a47f98526b7ceaf4c1e7fdebf9357c91d5a306bd70"; + sha512 = "55b14f94b1824df5e05d8c8f8c1a86a3d9667123dfb7b86723888ffeab93b8b0ed8dde082c3db0ee33446052e81b6f282e4ac3ae9a2a51ef25e01c6ffc93ad1d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/uk/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/uk/thunderbird-52.6.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "dcf852d0c584c3959fe0f7ff72cdd45fa8497aa1ca44ca036e849c3395da470a52376343f4b6e37a343e2f2919245a52e63bb5dfb5651bbf749c72c35a8918b0"; + sha512 = "94047ef1efc45fcd228012a8833ca1d6d5540ba0549a5f598ca420564e85dd0bfe4995968ba241d57b588db542f6c33445459c77b40eb3b568f66d3ef8e4e91b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/vi/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/vi/thunderbird-52.6.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "2b3c262c1955045bbda194715f4e9fce97872054ca8cc6f7bca3c1c6da303ccda4715336c846d47bc204fadca003ba9f4efdb6798e55c9e928ca822544bfe152"; + sha512 = "f30ab0cc3b6d4322d9d65150da1b247db12305f8a39acef383048118f30a757ca380134f0f12c238432a23f5d70d173e53e24f46af158ccdcf5eac516267840c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/zh-CN/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/zh-CN/thunderbird-52.6.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "74e7d7f4039d38f6af9590303d173d7293046f897e5b23acf8ff16c7b1ecfc50d0e8896550ee371f19e73518432d137779cba26bad913e8deb9e4af1b0637edc"; + sha512 = "4dd0923c8258dec6de71aad216dffb2945852f2d6ad20e104599a43a13e7c48bdaaa70a7afb35e3699bbaffc9a69623d6d24e299f1a0e75f604ba9bad96647ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-x86_64/zh-TW/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-x86_64/zh-TW/thunderbird-52.6.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "914af708ab185b76a67e8a2a4c85c14f41bdc05bfbef66c56a8b28820e4eeb866dcb6d60b1b4b61d924af9a6ccfa9ec6a10afd6ffb74794487472d508807b417"; + sha512 = "39264550d88ad4fbc247b9bb61015b2c0a9e75ffc19ec34e1d7053995e2fcfd65721140f2f4486fe959e67484c6ca6305e997c77b59b98e60e9e979c60e320f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/ar/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/ar/thunderbird-52.6.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "b749fdc34c15b48bcc0b99af41ac0357fff3a9c4bf774de536caf1fa65b33dfc69a4a14a4cb0c06a82d41e222362cccafb9ff8f4ca64c128cf0a031c1161d74f"; + sha512 = "b801148b9eccf4425710ff3c5430795d873448ee068dec8e8343ec9094d8c04e317dd0cf6e2d3b69029459d980b841470365441e26d8f71503d9c6f03a52d0fa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/ast/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/ast/thunderbird-52.6.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "f3ddb2b95237e8c505286328369c9f7613e5cb22ede50f8842e936c158aa6cbdb053de6c0f4ef0a9256b394b5510c1733ce0f8cc8423370581ec54b871f59b56"; + sha512 = "7368be5dab56f03635d3bc06f1d1871893dd8a694388baa90a44cef5f88717a705daeb2230dae8c2bfaf8b40e1f7987aeefc729b4e77ec1055726b0944276c79"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/be/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/be/thunderbird-52.6.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "d41e1bcb8460015876d784eccb37aabfeaa8a283f408e6606d84175f3e6b1e7428b8d277d30b250192cede4cb6bf2746945cf6fd4afa698fcb1b4230ee0f6d5b"; + sha512 = "a39137149f5800b5ea612382b86840b095fd09e38d06ffaeb4a2f5e242b47cac828ffb87c9870a9ebc75b9bd26b0499c2899d5b778267dc6842d21afaab0e7bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/bg/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/bg/thunderbird-52.6.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "e07885f88953dab1a940d21142fc04c7b8b2f807fc424f69b99f90d4a8f5ed034fc00de92d76dd4fb858c669cf6c3e9cb82f93ac3a264ba71f7b644e99849fef"; + sha512 = "2314afbb259a561e98bffe3d30aaac571b8f7f54de2246af78a012fcbee19fda15c8a921221ebea738fb09be07a1139f5edc14f1f9f55945a63e08c625a6bf52"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/bn-BD/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/bn-BD/thunderbird-52.6.0.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "2cdab1cc1066ab51d8fd0787115568cf70f3d584d2fd5e3908eee0f64037ce61a80a3f19ae31dc8cabca8f05cee51221917c717ea535a5a8085dd3410fa56422"; + sha512 = "e8cd137f04521293ea60c8f8557b4482baf1d7936c9fca1ea7426ea8a99cae48f3e441a81cf1a779034595eb755009db512f29d31c8ada11391cea0f3962d61d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/br/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/br/thunderbird-52.6.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "0db76f3544b14360bdee64186b9f828dce717d72d23ab59d4568cf079dd1db138e5b79eb500bae6d0043550bb906a0558f07e3b5ac98d0ff67705578d04ebefb"; + sha512 = "0715d8eda4c144c35b5583bdce6eac058788b761949bcb79f156ba4931c380e33f7810fed55e283e02c5af2d555df471c48383d1ace21da7f88c3b0a8e97213b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/ca/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/ca/thunderbird-52.6.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "6229309d3e81f374f4f04071843e3a1e7e18ad8316359ba6badd0509284ef59c16085af9a52956a5a2f438bd9cf8c88400e15fb99bcb75001f08fb72c285b3ad"; + sha512 = "21ec148ddfef69ead9f1b367dce4d6a93a7f1d31fb691035d40132cd4955a66f162a44f0e5b0caaae8cfdb76b0842cd78a630cb6a7949e839611d98d58776a47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/cs/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/cs/thunderbird-52.6.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "12a2df8d37d02076acf6cd2bc86bbc71e38e157e121b1729096c880481a82d23a0c1c8f1c8b1ff53193aefa1eebc64ffa49bebf38dcdee5fdbdf429bff5d9993"; + sha512 = "f2c7c86db91332b9f38ab4ae732ca44c7f7bfa32e3b8123f7ba9662fe9f74b9f01a58ca63a9954b45aad05272baca385797679103c29a95dcf248fe8cdac5a53"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/cy/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/cy/thunderbird-52.6.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "7c71ae8ce62dd271e0202b4e25b52ab9291ff83b920465b9a96c36d55c520ee87a5a348ab9d0ffd495744b787d424741ecf9e89ae4879281d0a6f2cb3742ae2b"; + sha512 = "f0bdfa8373fc87faa567720c4c998f08ba836f8c26a59e38e92bd641e7efd42010530575bdfe1fa7bc78b7688380eafc274b8954f2a59e60912713afacd42789"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/da/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/da/thunderbird-52.6.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "36861c719370036033286139f5e93d750eb8712afea42df7cc7f8bbfb9a00dde999e3ac4e38bc48b64a343a8091483163914cd362e9e30e0f9a98c6cf6a1783a"; + sha512 = "80dc629b815c4ec98026f0ee5c2b7f754bc9bf0e5d026775866f502ca55b826ce071470a8713ae98089bf2208e5b0d0771a20307db5351b4af78169bd8efc1ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/de/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/de/thunderbird-52.6.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "8571075c5435ab4763ac1c0f3904ca39b5ad1363390fd78eec9b73115caccb3eb3cc9f2e1a8c4119469ed5cc99d648fc905a8fb4d51c0bd10dc9ecb0338ad59b"; + sha512 = "bd66cf808f3d5ba73dfb0d314050c5d4ddc59966abc84e904cde2dd73c20086dcbd580c1a0bff4d1dee7ae940e38a53b9a37ed75e05758ff9da799f2ae1f7aab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/dsb/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/dsb/thunderbird-52.6.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "1b873aa804d253786b37a8bd1e85884f12c48292c3703d9c04a9d370e8fff73b0d865495a65de7fe690e34f835220ea88810194385ef50f3b285e8237f3761bc"; + sha512 = "58e50c2d6c2d42fcd34273ead868753373e054602ab1ea7e9ea9d5ed15b8ae15e6b654fe81b6a56942f1cd4eb3778d11897fc2b9e34e789aff7d83b47bd3c100"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/el/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/el/thunderbird-52.6.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "8f6327796a1e937e0d43f2af23f25292ee3a56b9d173bcbad1bf1d7cd60ca464570ef4a9d8255d2f3897dc862680073146a6509944014d0abeb21395da8c0201"; + sha512 = "40888eca974a5e9dab7459c790b7e589906da72ca9ea64fa690225d876310239faeff8925366b5fc559a5793efcac01696f22886c9ecbd5dfad5661083b8e63d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/en-GB/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/en-GB/thunderbird-52.6.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "e27a9c743a1d439e3cda7f2924c01044c797f88bd4b90723face80a472c8e0854c747472e5cb72dfe10ab1018188044681e1ae633ea55f4a11aae6f62a3a891b"; + sha512 = "5a418b8f6b857a4554cddb81b36b5f4885ba694ff08b3b5f3c342491637587719578738eac9abee2735e8d0fa1ab216ee9bb5cce67955c4b7c30c3a063b95477"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/en-US/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/en-US/thunderbird-52.6.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "b20aeac366bbfe257e709133fafa59bc8fd784d33926a167adf24d2c90d2cf5adfb68815e2000de4837be7cf73258d890cef555be82112aaeaef2bcc244f634f"; + sha512 = "628a5f50871bf44c59e1d8983f520d5ede9f22bff15eb4b03673dc6d4b0f72c84247a5e29ba67e871be449825dde8090a6e9a50501e434bbc17d86aeb846e1cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/es-AR/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/es-AR/thunderbird-52.6.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "a3547d8ea9675970dfe9dc40e1b763558fbb204b8d0940156b97212f2a5af00ca82ea2493f77fe896e257d7e0cb1ce7a1fe05a4c23aaa09222da43cc9b823e88"; + sha512 = "595419a4c26c8974ada3e9856dcabe863666133a98d5730a1a295f1edc414d1d0b3a159afc94bd927c934d44e9b4ed4282d4211948bcbe8b6d744948e7b48e02"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/es-ES/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/es-ES/thunderbird-52.6.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "2ad8177608038799c2ea653ea056c599949972a51493a27a34d4aa0769814106cebc8eac3521c7d6186432fadbf8e17e7b9e5221bdd1bf70de4fa80de163e964"; + sha512 = "898a14402ab621fb81b563c039db3ae343173cb39872ca6a2985f6a279af7ffaca404af179cef3adb48285b05e24b372c1e8a1918557280ecd10a4368b540f27"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/et/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/et/thunderbird-52.6.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "a68d4606e943a4b5841853b1c2d5165f5c97405690d467c0548ef0169fe472e76088c0387f9adabcd5837a3fba72287398453c4e149343bc9130348b5d62c682"; + sha512 = "b2ce107034b87b9e4459add9e1d6777e58f52465f81720d1a6276dbe0c341c92984fa9979ec8da0544f4699cf98a097098ed14759c38e47a0f9ea4aba6916907"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/eu/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/eu/thunderbird-52.6.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "dfc826d722b7ff331df35b6fc9b82eae9714f8f8e75c1fe3119a3b449a5b2817a8641e939ddf32b4b6605406a7cfeb57de24493b5a4d0cf9992a3dc30f2558cc"; + sha512 = "a401cb39dd18e83cbe64de9c527ce4d72a951f32c5150a88bb509487f3ed4364624354a6571d41ee18f1061841cfe9bb704bf355893fab6cc44d94f660a5e0b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/fi/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/fi/thunderbird-52.6.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "2676d22c662a5d7b4b3eb32a71b032e76bb609b39a89381054b254ad7a966625af2166b2a5edd9c09ad8d9728933203c99a3c60e03c2fb031b748e94c16eba77"; + sha512 = "d87a4ff14023c2a20241a920d2fac288d76124ba3734ffcae664cbf46ba3a3d54fe42979c243e6ae231f7b5aa54dfe9c82ad87f3839714aa8a21409a6e87221d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/fr/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/fr/thunderbird-52.6.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "b6ec3f6f2abb0f1ae8de3167e03d9d254959a93881b4cb8202db5880bade5569a53f1b5aaeaec10fb6fcfe453fcbe7cf0c090947c546ec62ae0f858dc0b251d8"; + sha512 = "5bd14acb63b044b2aa6f2f75fc365b6d65012a504ac3735cd2d72097b65aa61662007e06857f7288329c39517af01e694d19be5498bf4b718fb9b2510c8ed313"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/fy-NL/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/fy-NL/thunderbird-52.6.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "c0e2618f223f5b58d80283b23c38ce703d5fa019444dc2168d1ca88149780e458ed9c5414931457a0a3e7733407eb07b1fd38f3b40c381db2f012c5a1eec7eaf"; + sha512 = "13baa3c5bf0c24474f6f31291b54ff9c846bc3a6056bf43a74f3e5ad4919879adeadfe583151f55cc721e8aaa0b9011cc8e9c3a402d2fc363b4b2ab97f5aef76"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/ga-IE/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/ga-IE/thunderbird-52.6.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "fb6e815a5690382f1608d20cecb596012677616cfe3de11ba8aacdf32c59314a5e61ade11151965fa4c5f310445700f9fe89e14734f8876ebad4dcde9f46535a"; + sha512 = "632cc17bb0e9a5ee4e651cde51f71eb6efb6eac35297126ca3c7397e4bbd407f583b70a2aa5cdb4345276b493f3d8161cd376a443b37be3ba6b2782b7d6a534b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/gd/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/gd/thunderbird-52.6.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "3edf7e424f7a21540225d6e30543bb39f395564a3effd5064f3471f7922c19e275fc7b20e1df929a93eb375e0b37937f5beb239003300bff0af8af0d2f7b203d"; + sha512 = "03b3f6ab1fa5edd9f4c37f1d2ed9ba7a34e4b3d714bdf238f7e4ed8e8c65c432fff5a2815a1993ac8f221a997dab2b0ee22dea46d5a8b566bad35ae1cc9a4f46"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/gl/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/gl/thunderbird-52.6.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "7afea0817603271e8ddfa01374102f8856fa1d090fb3a98ff9e3ef477aeb019f3860e68c6ea72659ea0b65c54967c68bfa0d84a040d7677469ece8460fbf93c3"; + sha512 = "36398fa1d04ee096c1e2fa1420ca375dc7ff135ff63343e20c916b6ecb03b2adc6e30d26e66ee6ab38cd816d928e8c628a55bb3f6cf921bf7691b6092700200b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/he/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/he/thunderbird-52.6.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "546484c47f925bfb92bab962735cef6a74336d6b282881afce1054caaee559360e2df1d497d857a12ae76b99ce765ac985adf48d17f9a759b262f8b134e9adf0"; + sha512 = "f819c1bc97298445f3d3d5ef91470a7ff370a5db5e4884e8c2590e06bbfbf9a33c7d1cb9919379a6aa654e47f49b6f9e127584eeb29cb14f2e73efc01d4f8ee7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/hr/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/hr/thunderbird-52.6.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "552ebbc20522633fdd27117a941a0541bc3195b4a650612e6bf9f5e341f09c39efe1a58dcb9b0bf3ebb4797c7cf49e7d8a8d7922d2f3cb83284f9a3dca7e6b68"; + sha512 = "bdebf02084d98a6279c27d914935e4e8486d86cb27475e99983ab0cd8166f78c82b6815528f7afc10e6aae8f0859c393f6f42b7d1a081925b1fe2053f309052f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/hsb/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/hsb/thunderbird-52.6.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "f92450010bfb1d1620bd4819103d89f0d58af567231219ff106dbd48550e04af2900b362b93bd199482aaeb72a0ac88344e3767d754d6934d401cca13af4b718"; + sha512 = "b0db8f59739e0ead2d0ec64bf00f6b62854b2b55b34db04e31c27db14b3b67e6af3bc9d857fb528e4e6115e3e1f2da75b685b17a33cf9ea976cca7ef5ebecb56"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/hu/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/hu/thunderbird-52.6.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "6a4d10925475f3fc499f49894f6c79de88bd394c9b3359efb326e55aa3e1af9b7d6ee2c853908bedd95e113d697ae3b25e612dff72d81d01addb1fbc39c6ea36"; + sha512 = "10ca02217736663a1fb44e20430bf2ac3a76fb5f87e57e539361ba12361c2f79aa3892fac02c4365890c6506eb86bde8fc955dd126eeddefb7b27813050d1861"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/hy-AM/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/hy-AM/thunderbird-52.6.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "ecf982393bfc9c826dd74ea6c0452788c34958f031636c4f70bf12388e966a3630cde159f3751540b3b917e52f0b64a2cd572d211ef3b61d97725a80f51b4f5e"; + sha512 = "a0240daee40e6d8cd76d81bfbc4bd47052f9e20a00b8c687806633eb72e16d9393a6005c16f5391d2caa5a55fb7e0b7e12d1097fe140d6fd664e3ca40358b597"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/id/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/id/thunderbird-52.6.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "a4d735acd212827ceea6205125e8d38f292b0994a5375738857b12531aaa947539033fe3be3e198eae82b77647d243227200a9fafb4ff2729bf4b0028868295f"; + sha512 = "4450789df3c0176cde9adac0f8b075ca64690c0278b6da9de4040faefa35a9c915de1daec1e1b1ccae2d80c8d55f664c8535d9cc31ade68ef8081fc3f102e992"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/is/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/is/thunderbird-52.6.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "8d4b0a3eef192d42ecc9c65eb692b5c35ead5c1a7ef17f575e96e06f8990a76607b31abafbb03cabbdd4385eefcb09bb0477c7a6cff1b5fc3a60bc9fb1d0518e"; + sha512 = "9ad56f873a0138d55a34b6058681c9edb185734c3b358aa1ffd91161403cba5fa0a2d02d858fe45ebbb2e991c0a8da1bfcb6516c9836e26a3aec7e2160f292a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/it/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/it/thunderbird-52.6.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "4f2d5c1bd7cc404bb8ab6097bc3dd40424a745f8a6cbc0e73722a28d68a582150acbdab83e02b89811c6617e63a2d56f5f02f6fc463092e8e959a91552a6f3d8"; + sha512 = "242f2c9b2a7821bbd6601f4aeccbfe8f9c31556a061c0200b1139ce28c613c3781fa0ece4c9674c19a2283f647b2804820f29e26cba9ecfdc53a6b05964e2762"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/ja/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/ja/thunderbird-52.6.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "78445e5bb7211d7319609edb30e063c3584ed8c92eb4fb2953520720125306c28905e2248eb5825d6bc09399d38e35f37be57707e64edd3aae555b4ea748205f"; + sha512 = "1686f8cfc156744f2e9c02afa19ca00ac29db0e6f9b07900aae9b068928ff30431350ddb75824918df5a64e076d88b312f1055b74db44ec7cb909d505d2c013d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/kab/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/kab/thunderbird-52.6.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "7ad9d0213a2cd6297cf899f311ea3b8a7493f8596c352c351aa5aae3c7b0639c787dfda9d63adde7b2d920277c09d987b690506c762e24da16d86f985cb8f846"; + sha512 = "cadfcf6a02732831411f180d0363d3c3cb08e31d7d108b5f55d14bb75b6c48a744b40ec2a964f659904fde4c5e82ea8b89651db55406e5327db41c6f15f74416"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/ko/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/ko/thunderbird-52.6.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "a76a8acadbf082a7fbaecae8798fbb3fec4d03515db2f0a7d2d10d15ef468c128329e79f68e9b0075c4a7767bf56de5d3f1f5521cfa7beaad2fa2026fecb43f2"; + sha512 = "4b4e6bc229049210695536a0e12d685995bf439ab8b2b7879142c93cc749882ed79b98063fabd4df97503e771f585cbfc1590b2a3815a6121a7e43417addaaad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/lt/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/lt/thunderbird-52.6.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "cd8911a16d2662f5b80b76b04013113a8e9a231d25404afebe29852b5335d587a1dd22aaa74727c1b74ae5b26ffbd0f4723fc86ecef5c43397485a5199d65b71"; + sha512 = "5d73c90f57e50500debfccb555183cb616ac9d893a19ee29fe22f4823085bd62aea156fd5c0f0f6ff49291636c4d90af253096416aeb87982da5455bf548a40b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/nb-NO/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/nb-NO/thunderbird-52.6.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "3a82189796c1bbbe4633ef7beb054cd5f324504173678aae2763714b4ca25b04bce479eb63d89abe920c89ce7a4159eefa5e27b6e5959d2bea01a4cd53e13e58"; + sha512 = "0adf9e6b10010ea5cce216a510e53fc5dc9c2066eceacf3c3c6bda7526b3bfef1083b130c08432dc59f09e02e19f0c4a5b885cb43627771aec00d78828377eb6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/nl/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/nl/thunderbird-52.6.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "63e40217f5abea50375c0fc0060cab6c6291acb25d468edde8a14751c0693f0e9d751cbdee339a2c141269edad6c4ac87ec37f440257b5a78492bc43e66a9cd6"; + sha512 = "372e39c33a78e70d628fc1bc1a9719b3d902d67eead4e47091b40913a4aa76dac63db003cae8113f7d194cc6fd24cad13c4e87aefd1d6bf425434835c983ca7a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/nn-NO/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/nn-NO/thunderbird-52.6.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "bfa15dfb0606ca225ec370426b983a17c614dc850b665e40ba648504f5d9bf556a2f31ec20533fe739ff94f57f3eb5486f422972c7ed8c08d8cd7c8a023f9937"; + sha512 = "1c66f021fbdf85e1aaed26e5a6d3abcbc9d71e91126bca10a6f8b62b10abf3927a44ae559136478fd9628dfe3409c4edd83f3336302c84fb0b6be6d4031dbb3a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/pa-IN/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/pa-IN/thunderbird-52.6.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "6989775d3e36ec43aeccf3db32627d3f1be13021943a088385313fc7111d4288b8daa32ec37a9679353d68a9f15761fac2f7a4eb7dc1a60e3d15598296b11f82"; + sha512 = "aba5a6804f08eb303e71aba94b11116f253dd19dd31e10c05ad5469800378ffef678a90a8a33db2da516bb55ea2d1d1b5537c3c11ff9132ce9ce890fb4e8e413"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/pl/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/pl/thunderbird-52.6.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "05d252299552f987641be34e5f3462d56b08b01a66637b2d039d1a39f2fdb1b9b986ecd353bc69290bd64b5858b2e7fb7c928209cdbb98b27fca479ec8f959b4"; + sha512 = "19559239283420bac401dfefec812bbc18d33483380c44f217b70d9412b3d93f9ab3c2f5d9d518191fd891316e9ccb5b21f901676026f7ad2414a4541d584f98"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/pt-BR/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/pt-BR/thunderbird-52.6.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "b40deb4d5239e335f2c2e65d676cb6528c3320ee28bc9d83dd53bae2a486bcce2921726309754cc0bc155d3f8a0f56d69aa98e782bb4b8375cfcebfee5f58320"; + sha512 = "64ada0291a3da9713eb81cd05ddbcddd70379bf07a14e019580bbb7b5fea4976ad7aeae87a651da070139e975bb52f66271ed3124eeada4d6a90f4afed948d3f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/pt-PT/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/pt-PT/thunderbird-52.6.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "0afa965096f5a79b79b3e49af1758dc200ceb8161192a97d260313f9582f1c8b7a1d4e54e093cca6b9c92a9458dd38ba0493fdd1d6567f0505a90fc9bd97f09a"; + sha512 = "ce57a764ee2a529d7e37b6d620cf7c3825f7af1cc04da0502d64d2a7fb577a27a171a4f5d589c3f5e738192241776be4119d45958b2d77fbe3ae4f82279ab380"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/rm/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/rm/thunderbird-52.6.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "c9babc6d6e85936a251d4f7214991a06a3b92c6ae207a8012fe14cffb277a6b2468213a4ba94672a360bfdf9f4b817b8663cc15ceeafb79a63cbac13310e1aca"; + sha512 = "04bc57c8360be5917fe2e05b6b672fab614ea5a6ff150c83242ee20e89756f2f24afa096249fad5f2795c47e570815281bce70449385efc5e510c64204e5f7cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/ro/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/ro/thunderbird-52.6.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "86f303e7878cb988ee1773e6de2ea6b433028d4bfd40d9388384b14b5343b1de9b6b5084f92f1c95b4110ecc7fda669ed98d50dbb6266a775f4e058d5083e24a"; + sha512 = "86c790e5b3faeface66d001ea9e56006ac2955883337204e5f79764cdf74860df210688f8467c9f7b0051c9efd5cdbc5c98b615656155b99361bbba656254a47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/ru/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/ru/thunderbird-52.6.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "d262ad2a73ab34bdecf6d180840922bfe16fdd4dc7097ccd900712d99ca915da648f2a196accbf6ff9946d9fc48c674e9eb0f0bafdfc94cd6f9069139cf0f036"; + sha512 = "cbf316a94b64d02ee83fdafddbb60daac5157ea11c57889703bde88e3c4baec720dde515e9864f021cbb39e6945a33ccf909623fda0abe542e07b11eab8154d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/si/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/si/thunderbird-52.6.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "6b39cd9501b2dc44d033efe9524c5865cad8fdfd8224a51fb04679227e5306d67d05a9acaf4f5810cd67e6d10b1afc69ff80e63a7926616c35c79ecc3f02d93b"; + sha512 = "cf0dddbe01bddd623ce5052f0a72dee9da4eb5de1932d0a0a656baba55c79eaec51387e37f74c1a1a754ee71def8c972af5dda5a5bf9e78c19a2c11c1cc42e57"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/sk/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/sk/thunderbird-52.6.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "356c86279387b023540fba86f73376b1be12413887f8ea2c3b706ccc268aad282d77b7eb863e58d6f15f66516dd4bd8f56a8f413815753dfd6496f81ee842aea"; + sha512 = "5c70a7e8a47e44a47eac2d00526c4c8da340121c1fc8c136b3b40cbe0809548e9cde6d6dc76d1ad679d7bdedefdaf3fc373b2c124cca6b36a9cdb9f4e6da939a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/sl/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/sl/thunderbird-52.6.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "86d035a6b7108fab33582eb665afce9063e3d55b0c468b81569503cdde7ffe169de227024e94a60dd45e39073eaa3c3f313bf061c0ba492b66f75f79941c6100"; + sha512 = "9bbaf000fd2c1fe28f0f64c31c7736a2595399788498ae8be8fdac8dabc709efeacd8fb1f6ae8a095c130ff7620e1b7c6e909959b9c724b7bde736049664357c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/sq/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/sq/thunderbird-52.6.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "f2dd5958774c81710aa59d7c9cf8543c86d82cd21da16b13ad1580cb2680df5caf973cf28a505fb994ad809264deeceea8806641fa27b9df5a7f26c725030515"; + sha512 = "6f8d71fa87777b11f5ebf14c6811ce9a0c2c380db5b7f3fe774219cc60bea6d4f59de8a3dd193d855725c3a0e5470b36dc0538f94539d637be14de5d8e480c7b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/sr/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/sr/thunderbird-52.6.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "47a96a821fb825b6624262bbc0138027b842a9a69985af8903a7bfd435f6cbd3211e382899f3cc989cf716759aad927a8be22b2500f42f75362cfad09dbe67fe"; + sha512 = "0bbcd2a98f767a8836d054a97c797a0ea7eac5c08fed9177189474e47e8dc50d395735c0eaf8c6e839ac608084c6e533a3b20fda5e69ad74ada53636f1181359"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/sv-SE/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/sv-SE/thunderbird-52.6.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "978c8c41034137361663f2b12818477baac0e795e4c1ca7f7a013a8e1bb68534ef2a8a9d73e31c1ded7461bc5dc6298fc628dc6190b3657ce415f9687a3ed85e"; + sha512 = "22cc597657e44124162a6b8693022bd4086e3b4e0f9e42342c997bd333e1182163f0ca0c67d91cbb5e18c45605c877eb69d00372c86a9378ed2e7846547f3964"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/ta-LK/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/ta-LK/thunderbird-52.6.0.tar.bz2"; locale = "ta-LK"; arch = "linux-i686"; - sha512 = "970405c59d2589e49c53f0ab37e959c6f3b94bac41929ac6d5776c7b78b91bc0f8a6c1acee1557338b76bb8fc2a9f62f179a0ad10a0a8c984254d39577402556"; + sha512 = "902832bf66b2efd39cf038e9361bf0ee8f9682e73a42895ccf6bb637eeabb8d4d5e8b3b3d28bfa52e537ad1babee6bbb8d033c538a61880920ace6a4a7cadf95"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/tr/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/tr/thunderbird-52.6.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "cec76a997708b5339d5e49baea40125226f4bd708fa57f43f7812e2c7be686515986b90ab6ee525dadcaccbd9b9ea2c961e1a645b2c9634062e3e0c9c00ce2dc"; + sha512 = "70dbb015aa4acf35d5cba0e9d8916bed2603c7e44574c98e98e56edfb68db3ab572402fda5c809d838c51a2e3f135cd3b86f2dde44acd2e1ae2f12cecc276655"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/uk/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/uk/thunderbird-52.6.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "be710c5a5d28b34136ad72456ab9893d7c31dc0f3eea8cfc38d70169c37df5c96fb3aa18b72555e081115d0791f3a634325da191ac004ffc6a38d1412e140e95"; + sha512 = "9fd85a4f4366caea3409cca47df70d2f028c7d85c248ebbe5e7e92005d98d45947639fae2aac8a145e4cad12cc92e368b9f86de4623a7d1a35e0485fb35cff97"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/vi/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/vi/thunderbird-52.6.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "7d1f59f1fd78609700b6d6246087b88c5190139c79e7e60f2eaba91908ff0afbac0bce0e2a60594cda0800cf68ab0b5568702e0cfcfd1718e4cf46a88f20bc01"; + sha512 = "205b22a39b795946f019cbb9e8c1813a0ca9f59551c9ea30c661fbe43bbf1d87069dd3992e71c83226b2559cdb4db2186b37120c847367b6a4e1b16aba24510f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/zh-CN/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/zh-CN/thunderbird-52.6.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "5763d93646a83b8a88e8c4b1c1c72101831f72323b600d576619330e2cf77ac7a9dc668aef5ef59188e0f467db900d1d8f3c2ef299f422f83de51f53519c70be"; + sha512 = "d1a9247b1db70ddba4f0cf80af7b8606e6bf006b31d3e771a4047dd7ccd121114bab900c38c02f36c4b60636caae75047f153bafd06aacf1b546c3d8af01806a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.5.2/linux-i686/zh-TW/thunderbird-52.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.6.0/linux-i686/zh-TW/thunderbird-52.6.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "cd593b08ed5f31dd89b44e9b79b1db324c51facf63e9d9c0c2ad847b9cc13a0548e831a87078c9c0ae910512c4855e6f3ae22d1c40189e082ff6ff26224c35b4"; + sha512 = "a92b42e7e1869ad91d8343072d508df6bb8e67ddf7d929d4911457c5bba04fc1ec7d3218685954a4ded7ecf819bfbef975813fb2bbb9d1da60444b83f1f0fdb9"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 720b20e7129..bfbd9700197 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -22,11 +22,11 @@ let wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper; in stdenv.mkDerivation rec { name = "thunderbird-${version}"; - version = "52.5.2"; + version = "52.6.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "d626d3d37959539b15b5d2ae4a580fcc160380974bfc1a69a1fc8ff2435932e90a69fa386d5ecb6721d9154603c6b7d063e3368f6f995fea057eb593c06ef4ff"; + sha512 = "80742c95ed61d1cb2e72b71bb23bdd211a40240ab4393e9f028a38f902547372084a8f56445e2394484be088a7b9801405f3d6618fb2742601cc968bf34427f0"; }; # New sed no longer tolerates this mistake. diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 283307fc9de..d8029f02a6f 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}" @@ -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 2e67cea4c93..743da795806 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -6,13 +6,13 @@ let pname = "liferea"; - version = "1.12.0"; + version = "1.12.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "02qzg85l2vrja2qwzdbrfa4z1lp5p6lp528bv74abmxz5wlpif70"; + sha256 = "14qx3x2xjcnydc4ma8vdac63phas7jzwbjl4b9r5hf6vxv3mpvdq"; }; nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ]; diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index e900f90f46e..94e3b7d0ba6 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -2,11 +2,11 @@ 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 ]; diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix index 7f8594b8bbb..c6e5d0f3cb3 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/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix index 6d204de9ac4..400600751a2 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 1cf6db21bed..59c48c0a3d3 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -10,11 +10,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "qbittorrent-${version}"; - version = "4.0.1"; + version = "4.0.3"; src = fetchurl { url = "mirror://sourceforge/qbittorrent/${name}.tar.xz"; - sha256 = "0khy875ahh9rlk8lyfpwsbxjsbp7i1cwqvd1j1s4cqc812szh3z3"; + sha256 = "1lkbrvpzdfbqwilj09a9vraai7pz6dh999w4vl51mj1adm7bh0ws"; }; nativeBuildInputs = [ pkgconfig which ]; @@ -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/transgui/r988-compile-fix.patch b/pkgs/applications/networking/p2p/transgui/r988-compile-fix.patch index fe5a04fee81..4b070d0cbe8 100644 --- a/pkgs/applications/networking/p2p/transgui/r988-compile-fix.patch +++ b/pkgs/applications/networking/p2p/transgui/r988-compile-fix.patch @@ -16,7 +16,7 @@ index eb8b828..1ff2440 100644 function ParamStrUTF8(Param: Integer): utf8string; begin - Result:=FileUtil.ParamStrUTF8(Param); -+ Result:=ParamStrUTF8(Param); ++ Result:=LazUtf8.ParamStrUTF8(Param); end; function ParamCount: integer; diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index d2bbef7f581..3c5fb499a8b 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, wrapGAppsHook +{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, file, wrapGAppsHook , openssl, curl, libevent, inotify-tools, systemd, zlib , enableGTK3 ? false, gtk3 , enableSystemd ? stdenv.isLinux @@ -27,6 +27,16 @@ stdenv.mkDerivation rec { ++ optionals enableSystemd [ systemd ] ++ optionals stdenv.isLinux [ inotify-tools ]; + patches = [ + (fetchpatch { + # See https://github.com/transmission/transmission/pull/468 + # Patch from: https://github.com/transmission/transmission/pull/468#issuecomment-357098126 + name = "transmission-fix-dns-rebinding-vuln.patch"; + url = https://github.com/transmission/transmission/files/1624507/transmission-fix-dns-rebinding-vuln.patch.txt; + sha256 = "1p9m20kp4kdyp5jjr3yp5px627n8cfa29mg5n3wzsdfv0qzk9gy4"; + }) + ]; + postPatch = '' substituteInPlace ./configure \ --replace "libsystemd-daemon" "libsystemd" \ diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 9d26a74f8bb..d8e0c76dc49 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -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 bceabc2a64a..b4328723027 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.1"; src = fetchurl { url = "http://www.pjsip.org/release/${version}/pjproject-${version}.tar.bz2"; - sha256 = "1d67c58jn22f7h6smkykk5vwl3sqpc7xi2vm3j3lbn3lq6hisnig"; + sha256 = "09ii5hgl5s7grx4fiimcl3s77i385h7b3kwpfa2q0arbl1ibryjr"; }; 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/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix index f6be80e4a1d..6f87e55e8ea 100644 --- a/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix @@ -67,9 +67,20 @@ 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/linux/receiver-for-linux-latest.html; }; }; diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index 3edf45d9acd..904a6812c48 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/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 2ed87c71a90..5556a58ec56 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -12,7 +12,7 @@ assert withQt -> !withGtk && qt5 != null; with stdenv.lib; let - version = "2.4.2"; + version = "2.4.4"; variant = if withGtk then "gtk" else if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,10 +20,13 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "0zglapd3sz08p2z9x8a5va3jnz17b3n5a1bskf7f2dgx6m3v5b6i"; + sha256 = "0n3g28hrhifnchlz4av0blq4ykm4zaxwwxbzdm9wsba27677b6h4"; }; - 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"}" + ]; nativeBuildInputs = [ bison cmake extra-cmake-modules flex pkgconfig diff --git a/pkgs/applications/networking/sync/rsync/base.nix b/pkgs/applications/networking/sync/rsync/base.nix index f6224b0f48f..abc1f27e4f6 100644 --- a/pkgs/applications/networking/sync/rsync/base.nix +++ b/pkgs/applications/networking/sync/rsync/base.nix @@ -1,27 +1,21 @@ { 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"; + }; + 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 = "167vk463bb3xl9c4gsbxms111dk1ip7pq8y361xc0xfa427q9hhd"; }; - patches = [ - (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"; - }) - (fetchpatch { - name = "CVE-2017-16548.patch"; - url = "https://git.samba.org/rsync.git/?p=rsync.git;a=commitdiff_plain;h=47a63d90e71d3e19e0e96052bb8c6b9cb140ecc1;hp=bc112b0e7feece62ce98708092306639a8a53cce"; - sha256 = "1dcdnfhbc5gd0ph7pds0xr2v8rpb2a4p7l9c1wml96nhnyww1pg1"; - }) - ]; 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 8c66e41f4cd..f1e3f6b7301 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { 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/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix new file mode 100644 index 00000000000..5e4f9738d44 --- /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.override { enableIntrospection = true; }) + 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 00000000000..6c516e98acb --- /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 00000000000..0ba5a4f2db8 --- /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/default.nix b/pkgs/applications/networking/syncthing/default.nix index 953febf67a8..1a79e31a05d 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, go, procps, removeReferencesTo }: stdenv.mkDerivation rec { - version = "0.14.42"; + version = "0.14.43"; name = "syncthing-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "1n3favv94wj1fr7x9av523fgm12b0kjlrmifa25wg2p6z10vwbqf"; + sha256 = "1n09zmp9dqrl3y0fa0l1gx6f09j9mm3xdf7b58y03znspsg7mxhi"; }; buildInputs = [ go removeReferencesTo ]; diff --git a/pkgs/applications/networking/syncthing012/default.nix b/pkgs/applications/networking/syncthing012/default.nix index 4b5359555f4..cd6fcc28a50 100644 --- a/pkgs/applications/networking/syncthing012/default.nix +++ b/pkgs/applications/networking/syncthing012/default.nix @@ -24,4 +24,12 @@ buildGoPackage rec { preBuild = '' export buildFlagsArray+=("-tags" "noupgrade release") ''; + + meta = { + knownVulnerabilities = [ "CVE-2017-1000420" ]; + homepage = https://www.syncthing.net/; + description = "Open Source Continuous File Synchronization"; + license = stdenv.lib.licenses.mpl20; + platforms = with stdenv.lib.platforms; linux ++ freebsd ++ openbsd ++ netbsd; + }; } diff --git a/pkgs/applications/networking/syncthing013/default.nix b/pkgs/applications/networking/syncthing013/default.nix index b6d318011aa..e1a0dc38c11 100644 --- a/pkgs/applications/networking/syncthing013/default.nix +++ b/pkgs/applications/networking/syncthing013/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { ''; meta = { + knownVulnerabilities = [ "CVE-2017-1000420" ]; homepage = https://www.syncthing.net/; description = "Open Source Continuous File Synchronization"; license = stdenv.lib.licenses.mpl20; diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix index dc7c961856d..50ebee4a0ce 100644 --- a/pkgs/applications/networking/testssl/default.nix +++ b/pkgs/applications/networking/testssl/default.nix @@ -1,7 +1,11 @@ { stdenv, fetchFromGitHub, pkgs }: -stdenv.mkDerivation rec { +let version = "2.9.5-1"; + pwdBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ coreutils ])}/pwd"; + opensslBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ openssl ])}/openssl"; + +in stdenv.mkDerivation rec { name = "testssl.sh-${version}"; src = fetchFromGitHub { @@ -17,8 +21,6 @@ stdenv.mkDerivation rec { 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" \ diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index c3424e2fc77..7c059b6f9fd 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -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/modules.nix b/pkgs/applications/networking/znc/modules.nix index 2923a30b2ef..4b68285c3f1 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/calligra/2.nix b/pkgs/applications/office/calligra/2.nix deleted file mode 100644 index 959a44a35c1..00000000000 --- 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 bec19d675cb..1537dd9b03f 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, makeWrapper, + 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, @@ -23,6 +23,16 @@ 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 = [ diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index f6c4728eb53..d17cd2a7ab7 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 3632138a022..60c8b0280a1 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.36"; + name = "gnumeric-1.12.38"; src = fetchurl { url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz"; - sha256 = "3cbfe25f26bd31b832efed2827ac35c3c1600bed9ccd233a4037a9f4d7c54848"; + sha256 = "3435d7d93a47a32764b1ec2d03f7fbb348a97af52530815e49370803a1a69c65"; }; configureFlags = "--disable-component"; diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 1d90e8be282..3d63b4195a2 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -2,10 +2,10 @@ , hicolor_icon_theme, libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "homebank-5.1.6"; + name = "homebank-5.1.7"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "1q4h890g6a6pm6kfiavbq9sbpsnap0f854sja2y5q3x0j0ay2q98"; + sha256 = "19szz86jxya8v4r3pa5czng9q2kn5hhbk273x1wqvdv40z0577jp"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix index 66aee6bd962..8463703c017 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 2d66fe4b309..bb6e529f5d2 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.nix b/pkgs/applications/office/libreoffice/default.nix index cd59f78b6c6..c8948d13cf7 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -13,7 +13,7 @@ , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , 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 }: diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 42d8abf49bd..5070de5262e 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -6,16 +6,15 @@ , openssl, gperf, cppunit, GConf, ORBit2, poppler , librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw, libzmf , 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 , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook , defaultIconTheme, glib, ncurses -, 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 }: let @@ -187,7 +186,6 @@ in stdenv.mkDerivation rec { "--disable-report-builder" "--enable-python=system" "--enable-dbus" - (lib.enableFeature kdeIntegration "kde4") "--with-package-format=installed" "--enable-epm" "--with-jdk-home=${jdk.home}" @@ -250,8 +248,7 @@ in stdenv.mkDerivation rec { libxshmfence libatomic_ops graphite2 harfbuzz librevenge libe-book libmwaw glm glew ncurses libodfgen CoinMP librdf_rasqal defaultIconTheme - ] - ++ lib.optional kdeIntegration kdelibs4; + ]; nativeBuildInputs = [ wrapGAppsHook ]; passthru = { diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index b78eaa9fd3f..6a741e0ab9e 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -15,7 +15,13 @@ , orc , nss , nspr -, qt5 +, qtbase +, qtsvg +, qtdeclarative +, qtwebchannel +, qtquickcontrols +, qtwebkit +, qtwebengine , sqlite , xorg , xlibs @@ -25,6 +31,8 @@ # 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 +45,23 @@ let then "i386" else "amd64"; - shortVersion = "1.17.12-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 "09n910ny8k103g1v8m19f9n827l2y0kmz79cwgy95k6acf2rkc2x" - else "11z65mj1a2rw6cwfarl8r1vzpcz4ww5mgvd5fyv31l60mbmnqkap"; + 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 @@ -96,6 +104,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ dpkg which ] ++ deps; + propagatedUserEnvPkgs = [ gconf ]; + unpackPhase = "true"; installPhase = '' @@ -125,11 +135,14 @@ stdenv.mkDerivation { 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 00000000000..9ac82615c56 --- /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 <> /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/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 3f17825202e..5578a41f444 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.17.4"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "0rcfcvy9zacqmh7nyqlm93hzsx6gfygmcf8d2p02h5l69gvygnb9"; + sha256 = "00ffi8kkrlh72vjjkjpgi8zys3r9hkdk4xi82kcahch8pix4qzf2"; }; buildInputs = [ 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 00000000000..1642739140d --- /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/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix new file mode 100644 index 00000000000..98499ca009a --- /dev/null +++ b/pkgs/applications/science/chemistry/molden/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, which, gfortran, mesa_glu, 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 mesa_glu 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/electronics/bitscope/common.nix b/pkgs/applications/science/electronics/bitscope/common.nix new file mode 100644 index 00000000000..90bf4dc840d --- /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; + 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 00000000000..c10e9de851a --- /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/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix new file mode 100644 index 00000000000..f4418f53563 --- /dev/null +++ b/pkgs/applications/science/electronics/librepcb/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, qtbase, qttools, qmake, mesa, 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 00000000000..75fc590ad7f --- /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/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 31c2d4f6475..e3438386557 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -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/coq/8.4.nix b/pkgs/applications/science/logic/coq/8.4.nix index 1f7ef571eaf..64b0f85aed2 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/default.nix b/pkgs/applications/science/logic/coq/default.nix index f62f20fe788..9ed535cfe63 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -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 ] + ++ stdenv.lib.optional buildIde ocamlPackages.lablgtk; postPatch = '' UNAME=$(type -tp uname) @@ -109,7 +110,7 @@ self = stdenv.mkDerivation { fi } - envHooks=(''${envHooks[@]} addCoqPath) + addEnvHooks "$targetOffset" addCoqPath ''; preConfigure = '' diff --git a/pkgs/applications/science/logic/sapic/default.nix b/pkgs/applications/science/logic/sapic/default.nix new file mode 100644 index 00000000000..27efe865a9d --- /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 00000000000..6e0b98113df --- /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 367449f44f3..081dc788163 100644 --- a/pkgs/applications/science/logic/stp/default.nix +++ b/pkgs/applications/science/logic/stp/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { 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 3769b15f32a..6a26ee6e3d6 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.12.06"; + version = "2018.01.10"; src = fetchFromGitHub { owner = "cliffordwolf"; repo = "symbiyosys"; - rev = "82f394260a74b07892d7f5bdec10ae0a8cad6caa"; - sha256 = "0cniqxaf2m5xh7hqwcpdvwcxg7vqargzahbkzdfwafkdsqpb0ly3"; + rev = "25936009bbc2cffd289c607ddf42a578527aa59c"; + sha256 = "06idd8vbn4s2k6bja4f6lxjc4qwgbak2fhfxj8f18ki1xb3yqfh6"; }; buildInputs = [ python3 yosys ]; 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 00000000000..bed7eb65e32 --- /dev/null +++ b/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -0,0 +1,87 @@ +{ haskell, haskellPackages, mkDerivation, fetchFromGitHub, lib +# the following are non-haskell dependencies +, makeWrapper, which, maude, graphviz, sapic +}: + +let + version = "1.3.0"; + src = fetchFromGitHub { + owner = "tamarin-prover"; + repo = "tamarin-prover"; + rev = "8e823691ad3325bce8921617b013735523d74557"; + sha256 = "0rr2syl9xhv17bwky5p39mhn0bypr24h8pld1xidxv87vy7vk7nr"; + }; + + # 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 ]} + ''; + + 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/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index 54c8caa99d8..202d52f0cc0 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/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index be25738a607..532df11209b 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -4,13 +4,13 @@ let python = python2; in 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 ]; diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index d2188673fb7..725b3f342c3 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -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 ]; 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,8 +54,6 @@ stdenv.mkDerivation rec { --without-tcltk --without-aqua --disable-R-framework - CC="clang" - CXX="clang++" OBJC="clang" '' + '' ) diff --git a/pkgs/applications/science/math/R/setup-hook.sh b/pkgs/applications/science/math/R/setup-hook.sh index 09a775db9bf..6951e2a4b61 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 00000000000..fb76699b0c8 --- /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/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix index 89ed0582b37..bef695fc650 100644 --- a/pkgs/applications/science/math/cntk/default.nix +++ b/pkgs/applications/science/math/cntk/default.nix @@ -95,5 +95,6 @@ in stdenv.mkDerivation rec { description = "An open source deep-learning toolkit"; license = if onebitSGDSupport then licenses.unfreeRedistributable else licenses.mit; maintainers = with maintainers; [ abbradar ]; + broken = true; # Never succeeded to build. }; } diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index 4ef00d56f18..b2b052bdb15 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -29,7 +29,10 @@ 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 ]; diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 3e4c8c70286..67dcfd8dc1d 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7"; }; - buildInputs = [ freeglut mesa mysql.lib mpfr gmp + buildInputs = [ freeglut mesa 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/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index 24dc4436b0f..686e93b5d5e 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -18,6 +18,7 @@ # - https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/sagemath { stdenv +, bash , fetchurl , perl , gfortran @@ -26,13 +27,17 @@ , gettext , which , texlive +, texinfo , hevea }: 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,11 +75,12 @@ 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 = '' @@ -84,14 +90,16 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; buildInputs = [ + bash # needed for the build perl # needed for the build python # needed for the build - gfortran # needed to build giac + gfortran # 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 (texlive.combine { inherit (texlive) scheme-basic collection-pstricks # needed by giac @@ -102,18 +110,22 @@ stdenv.mkDerivation rec { }) ]; + nativeBuildInputs = [ gfortran 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; @@ -144,7 +156,14 @@ stdenv.mkDerivation rec { 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 = '' @@ -153,9 +172,12 @@ stdenv.mkDerivation rec { rm -rf "$out/sage-root/src/.git" rm -r "$out/sage-root/logs" # 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 all shebangs are properly patched + bash $patchSageShebangs $out ''; # TODO there are some doctest failures, which seem harmless. diff --git a/pkgs/applications/science/math/sage/patchSageShebangs.sh b/pkgs/applications/science/math/sage/patchSageShebangs.sh new file mode 100644 index 00000000000..6ddf93af011 --- /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 00000000000..96ed5a4bc6c --- /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-python.patch b/pkgs/applications/science/math/sage/spkg-python.patch new file mode 100644 index 00000000000..e39981b6552 --- /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 5d92d3f8bea..00000000000 --- 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 51827fd11be..00000000000 --- 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/weka/default.nix b/pkgs/applications/science/math/weka/default.nix index 7af0df5360d..6a692e07c43 100644 --- a/pkgs/applications/science/math/weka/default.nix +++ b/pkgs/applications/science/math/weka/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "weka-${version}"; - version = "3.8.1"; + version = "3.8.2"; src = fetchurl { url = "mirror://sourceforge/weka/${stdenv.lib.replaceChars ["."]["-"] name}.zip"; - sha256 = "16n1a74d1cispp0a22zyiivi78izi354y67gmbyvv2lv9sc45wmk"; + sha256 = "0p353lhhcv3swwn1bl64vkyjk480vv9ghhlyqjxiar4p3xifjayb"; }; buildInputs = [ unzip ]; diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 6c866a8d216..c7f74071c24 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, wrapGAppsHook, autoreconfHook, gettext +, wrapGAppsHook, cmake, gettext , maxima, wxGTK, gnome3 }: stdenv.mkDerivation rec { @@ -15,14 +15,12 @@ stdenv.mkDerivation rec { 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/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix index d5ffe9cd9ba..0194ee0b83c 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.0"; src = fetchurl { url = "http://chianti.ucsd.edu/${name}/${name}.tar.gz"; - sha256 = "1dvv0f7sc7q7lwmpd7xkcx86dd8lxh2il3wiwkij44gh7ni1qkfm"; + sha256 = "13q8caksbzi6j7xy8v5f0pi6766yfawys6jcm50ng78mnhrv2v97"; }; buildInputs = [jre makeWrapper]; diff --git a/pkgs/applications/science/misc/gephi/default.nix b/pkgs/applications/science/misc/gephi/default.nix index 6736ce75897..82b95132d88 100644 --- a/pkgs/applications/science/misc/gephi/default.nix +++ b/pkgs/applications/science/misc/gephi/default.nix @@ -2,13 +2,13 @@ with stdenv.lib; -let version = "0.9.1"; in +let version = "0.9.2"; 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"; + sha256 = "1wr3rka8j2y10nnwbg27iaxkbrp4d7d07ccs9n94yqv6wqawj5z8"; }; meta = { diff --git a/pkgs/applications/science/programming/fdr/default.nix b/pkgs/applications/science/programming/fdr/default.nix index 8ed8e0e73b0..3bfb70f5ce8 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/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 98ec39eb206..087969fe61a 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -1,13 +1,13 @@ -{ 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 , makeWrapper, lndir , gst_all_1, qt-gstreamer1, pkgconfig, glibc -, version ? "2.9.4" }: stdenv.mkDerivation rec { name = "qgroundcontrol-${version}"; + version = "3.2.7"; qtInputs = [ qtbase qtlocation qtserialport qtdeclarative qtconnectivity qtxmlpatterns qtsvg @@ -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 = "1sla3sgj2p3h87d7kcaj53f8z5xzyadvsqlqzgh4d2n1f7sikdc5"; 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/search/doodle/default.nix b/pkgs/applications/search/doodle/default.nix index 3a9df150574..ba9fbee5d96 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/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 7056249de3f..96e2220f582 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -100,6 +100,8 @@ rec { gitflow = callPackage ./gitflow { }; + grv = callPackage ./grv { }; + hub = callPackage ./hub { inherit (darwin) Security; }; 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 5878f3a8b74..988911d2eb7 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-bz/default.nix b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix index 4ed9c5c0509..c14a027b4ab 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-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index 8e3c6b8d9d0..31504d542d2 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-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix index 4ec83af9160..b4c3baecd41 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-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix index ba2b7113806..1208afa1963 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 @@ -14,12 +14,7 @@ stdenv.mkDerivation rec { 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/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 3a258543330..8b64e2d375b 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -13,7 +13,7 @@ }: let - version = "2.15.1"; + version = "2.16.1"; svn = subversionClient.override { perlBindings = true; }; in @@ -22,7 +22,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0p04linqdywdf7m1hqa904fzqvgzplsxlzdqrn96j1j5gpyr174r"; + sha256 = "06gay8k29glg4giwphjalcc1fknxw4bmxkmbr3ic3gzxy8vl7bfg"; }; hardeningDisable = [ "format" ]; 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 index 1aec77504b7..9a484262b7b 100644 --- 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 @@ -1,47 +1,28 @@ -From 9a4396ddaedaf59ebee16d69900884e990b79cdd Mon Sep 17 00:00:00 2001 -From: Florian Klink -Date: Fri, 17 Nov 2017 13:21:37 +0100 -Subject: [PATCH] git-send-email: honor $PATH - -This will search $PATH for a sendmail binary, instead of the (previously -fixed) list of paths. - -Signed-off-by: Florian Klink ---- - Documentation/git-send-email.txt | 5 ++--- - git-send-email.perl | 3 ++- - 2 files changed, 4 insertions(+), 4 deletions(-) - diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt -index bac9014ac..b9b1f2c41 100644 +index 8060ea35c..c81067a19 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt -@@ -203,9 +203,8 @@ a password is obtained using 'git-credential'. +@@ -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 `/usr/sbin/sendmail` or -- `/usr/lib/sendmail` if such program is available, or -- `localhost` otherwise. -+ option; the built-in default is to search in $PATH if such program is -+ available, or `localhost` otherwise. - +- 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=:: - Specifies a port different from the default port (SMTP diff --git a/git-send-email.perl b/git-send-email.perl -index 2208dcc21..8e357aeab 100755 +index edcc6d346..8e357aeab 100755 --- a/git-send-email.perl +++ b/git-send-email.perl -@@ -885,7 +885,8 @@ if (defined $initial_reply_to) { +@@ -885,8 +885,7 @@ if (defined $initial_reply_to) { } - + if (!defined $smtp_server) { -- foreach (qw( /usr/sbin/sendmail /usr/lib/sendmail )) { +- 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) { + foreach (@sendmail_paths) { if (-x $_) { $smtp_server = $_; - last; --- -2.15.0 - 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 5e24c19f0fe..addb1dbc5e0 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/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix new file mode 100644 index 00000000000..386589aaf05 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, curl, libgit2_0_25, ncurses, pkgconfig, readline }: +let + version = "0.1.0"; +in +buildGoPackage { + name = "grv-${version}"; + + buildInputs = [ ncurses readline curl libgit2_0_25 ]; + nativeBuildInputs = [ pkgconfig ]; + + goPackagePath = "github.com/rgburke/grv"; + + goDeps = ./deps.nix; + + src = fetchFromGitHub { + owner = "rgburke"; + repo = "grv"; + rev = "v${version}"; + sha256 = "1qd9kq8l29v3gwwls98933bk0rdw44mrbnqgb1r6hm9m6vzjfcn3"; + }; + + 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/grv/deps.nix b/pkgs/applications/version-management/git-and-tools/grv/deps.nix new file mode 100644 index 00000000000..8de555df2e8 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/grv/deps.nix @@ -0,0 +1,102 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/Sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/Sirupsen/logrus"; + rev = "768a92a02685ee7535069fc1581341b41bab9b72"; + sha256 = "1m67cxb6p0zgq0xba63qb4vvy6z5d78alya0vnx5djfixygiij53"; + }; + } + { + goPackagePath = "github.com/bradfitz/slice"; + fetch = { + type = "git"; + url = "https://github.com/bradfitz/slice"; + rev = "d9036e2120b5ddfa53f3ebccd618c4af275f47da"; + sha256 = "189h48w3ppvx2kqyxq0s55kxv629lljjxbyqjnlrgg8fy6ya8wgy"; + }; + } + { + goPackagePath = "github.com/gobwas/glob"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/glob"; + rev = "51eb1ee00b6d931c66d229ceeb7c31b985563420"; + sha256 = "090wzpwsjana1qas8ipwh1pj959gvc4b7vwybzi01f3bmd79jwlp"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "97311d9f7767e3d6f422ea06661bc2c7a19e8a5d"; + sha256 = "0dxlrzn570xl7gb11hjy1v4p3gw3r41yvqhrffgw95ha3q9p50cg"; + }; + } + { + goPackagePath = "github.com/rgburke/goncurses"; + fetch = { + type = "git"; + url = "https://github.com/rgburke/goncurses"; + rev = "9a788ac9d81e61c6a2ca6205ee8d72d738ed12b9"; + sha256 = "0xqwxscdszbybriyzqmsd2zkzda9anckx56q8gksfy3gwj286gpb"; + }; + } + { + goPackagePath = "github.com/rjeczalik/notify"; + fetch = { + type = "git"; + url = "https://github.com/rjeczalik/notify"; + rev = "27b537f07230b3f917421af6dcf044038dbe57e2"; + sha256 = "05alsqjz2x8jzz2yp8r20zwglcg7y1ywq60zy6icj18qs3abmlp0"; + }; + } + { + goPackagePath = "github.com/tchap/go-patricia"; + fetch = { + type = "git"; + url = "https://github.com/tchap/go-patricia"; + rev = "5ad6cdb7538b0097d5598c7e57f0a24072adf7dc"; + sha256 = "0351x63zqympgfsnjl78cgvqhvipl3kfs1i15hfaw91hqin6dykr"; + }; + } + { + goPackagePath = "go4.org"; + fetch = { + type = "git"; + url = "https://github.com/camlistore/go4"; + rev = "fba789b7e39ba524b9e60c45c37a50fae63a2a09"; + sha256 = "01irxqy8na646b4zbw7v3zwy3yx9m7flhim5c3z4lzq5hiy2h75i"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "1875d0a70c90e57f11972aefd42276df65e895b9"; + sha256 = "1kprrdzr4i4biqn7r9gfxzsmijya06i9838skprvincdb1pm0q2q"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "3dbebcf8efb6a5011a60c2b4591c1022a759af8a"; + sha256 = "02pwjyimpm13km3fk0rg2l9p37w7qycdwp74piawwgcgh80qnww9"; + }; + } + { + goPackagePath = "gopkg.in/libgit2/git2go.v25"; + fetch = { + type = "git"; + url = "https://gopkg.in/libgit2/git2go.v25"; + rev = "334260d743d713a55ff3c097ec6707f2bb39e9d5"; + sha256 = "0hfya9z2pg29zbc0s92hj241rnbk7d90jzj34q0dp8b7akz6r1rc"; + }; + } +] 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 bed0ef35827..07ea2be7ad3 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.2"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "jonas"; repo = pname; rev = name; - sha256 = "04qw3fyamm1lka9vh7adrkr2mcnwcch9ya5sph51jx6d4jz1lih5"; + sha256 = "14cdlrdxbl8vzqw86fm3wyaixh607z47shc4dwd6rd9vj05w0m97"; }; nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkgconfig ]; diff --git a/pkgs/applications/version-management/gitaly/Gemfile b/pkgs/applications/version-management/gitaly/Gemfile index 7e8f9f2b255..2aaf872d109 100644 --- a/pkgs/applications/version-management/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitaly/Gemfile @@ -1,8 +1,10 @@ source 'https://rubygems.org' gem 'github-linguist', '~> 4.7.0', require: 'linguist' -gem 'gitaly-proto', '~> 0.37.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.59.0', require: 'gitaly' gem 'activesupport' +gem 'gollum-lib', '~> 4.2', require: false +gem 'gollum-rugged_adapter', '~> 0.4.4', require: false group :development, :test do gem 'gitlab-styles', '~> 2.0.0', require: false diff --git a/pkgs/applications/version-management/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitaly/Gemfile.lock index 5ea14855b97..f4e4ab10883 100644 --- a/pkgs/applications/version-management/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitaly/Gemfile.lock @@ -11,10 +11,13 @@ GEM 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) multipart-post (>= 1.2, < 3) - gitaly-proto (0.37.0) + gemojione (3.3.0) + json + gitaly-proto (0.59.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -22,10 +25,29 @@ 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-styles (2.0.0) rubocop (~> 0.49) rubocop-gitlab-security (~> 0.1.0) rubocop-rspec (~> 1.15) + 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.4.0.2) googleauth (0.5.3) faraday (~> 0.12) @@ -39,6 +61,7 @@ GEM google-protobuf (~> 3.1) googleauth (~> 0.5.1) i18n (0.8.1) + json (2.1.0) jwt (1.5.6) little-plugger (1.1.4) logging (2.2.2) @@ -48,18 +71,23 @@ 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) 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) rainbow (2.2.2) rake rake (12.1.0) + rouge (2.2.1) rubocop (0.50.0) parallel (~> 1.10) parser (>= 2.3.3.1, < 3.0) @@ -73,11 +101,14 @@ GEM rubocop (>= 0.50.0) ruby-progressbar (1.8.3) rugged (0.26.0) + sanitize (2.1.0) + nokogiri (>= 1.4.4) signet (0.7.3) addressable (~> 2.3) faraday (~> 0.9) jwt (~> 1.5) multi_json (~> 1.10) + stringex (2.7.1) thread_safe (0.3.6) tzinfo (1.2.2) thread_safe (~> 0.1) @@ -88,9 +119,11 @@ PLATFORMS DEPENDENCIES activesupport - gitaly-proto (~> 0.37.0) + gitaly-proto (~> 0.59.0) github-linguist (~> 4.7.0) gitlab-styles (~> 2.0.0) + gollum-lib (~> 4.2) + gollum-rugged_adapter (~> 0.4.4) BUNDLED WITH - 1.15.4 + 1.16.0 diff --git a/pkgs/applications/version-management/gitaly/default.nix b/pkgs/applications/version-management/gitaly/default.nix index 63e5758107f..43ac470dcd4 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.59.2"; name = "gitaly-${version}"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "19ggfc5nwv8q1wq739ab8qdfdngpi33431dgfa9593p6ad7v6hyq"; + sha256 = "08f109rw3qxdr93l0kl8wxmrvn846a6vdkssvrp2zr40yn9wif7m"; }; 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 57480f3f337..81bb334085a 100644 --- a/pkgs/applications/version-management/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitaly/gemset.nix @@ -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"]; @@ -58,14 +66,23 @@ }; version = "0.12.2"; }; + gemojione = { + dependencies = ["json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ayk8r147k1s38nj18pwk76npx1p7jhi86silk800nj913pjvrhj"; + type = "gem"; + }; + version = "3.3.0"; + }; gitaly-proto = { dependencies = ["google-protobuf" "grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nqp9ib00q55ig8zf1r6ldf3xkqw0874ra1mbcsm8sl46l84lx11"; + sha256 = "0s86126iqhbmkix6zs357ixlc1syyxmwk2blaimsav7f0x9swy82"; type = "gem"; }; - version = "0.37.0"; + version = "0.59.0"; }; github-linguist = { dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; @@ -76,6 +93,23 @@ }; 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-styles = { dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"]; source = { @@ -85,6 +119,33 @@ }; 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"]; @@ -119,6 +180,14 @@ }; version = "0.8.1"; }; + json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + type = "gem"; + }; + version = "2.1.0"; + }; jwt = { source = { remotes = ["https://rubygems.org"]; @@ -169,6 +238,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"]; @@ -193,6 +270,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 +304,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"]; @@ -251,6 +345,14 @@ }; version = "12.1.0"; }; + rouge = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02kpahk5nkc33yxnn75649kzxaz073wvazr2zyg491nndykgnvcs"; + type = "gem"; + }; + version = "2.2.1"; + }; rubocop = { dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"]; source = { @@ -294,6 +396,15 @@ }; 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 = { @@ -303,6 +414,14 @@ }; version = "0.7.3"; }; + stringex = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zc93v00av643lc6njl09wwki7h5yqayhh1din8zqfylw814l1dv"; + type = "gem"; + }; + version = "2.7.1"; + }; thread_safe = { source = { remotes = ["https://rubygems.org"]; diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix index ac05ca4c484..ab0ff74f03f 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 = "5.10.2"; name = "gitlab-shell-${version}"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "12iil8ap9lbd7skj7xr2v6lsyjdd97svbmyj0n2j8m819fv0x27p"; + sha256 = "16lwnzsppql7pkf8fka6cwkghdr57g225zvln9ii29w7nzz1hvaf"; }; - buildInputs = [ - ruby bundler go - ]; + buildInputs = [ ruby bundler go ]; patches = [ ./remove-hardcoded-locations.patch ./fixes.patch ]; 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 dd1ecafb8bf..f28e74b88c5 100644 --- a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch @@ -25,3 +25,16 @@ index e7d0254..181ec8a 100644 end def api +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 + +- configBytes, err := ioutil.ReadFile(path.Join(cfg.RootDir, configFile)) ++ configBytes, err := ioutil.ReadFile(os.Getenv("GITLAB_SHELL_CONFIG_PATH")) + if err != nil { + return nil, err + } diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix index 1f3407eddcf..c43b5ab2a1b 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.3.1"; name = "gitlab-workhorse-${version}"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "1ivqlhvmxhdb8359yh469zl45j00n94b53naqi8jx06kijfsdz4r"; + sha256 = "19x9ryp99xygj39kq2r756rahh9mxp6j83hxvv09y33vgz64y8xh"; }; buildInputs = [ git go ]; diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile index b4a457bff6e..916314f42f9 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 @@ -90,7 +90,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 +102,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 +111,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.6' # Upgrade to > 2.3.7 once https://github.com/mbleigh/seed-fu/issues/123 is solved # Markdown and HTML processing gem 'html-pipeline', '~> 1.11.0' @@ -171,7 +171,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' @@ -245,7 +245,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 +263,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' + # Perf bar gem 'peek', '~> 1.0.1' gem 'peek-gc', '~> 0.0.2' @@ -281,7 +283,7 @@ group :metrics do gem 'influxdb', '~> 0.2', require: false # Prometheus - gem 'prometheus-client-mmap', '~>0.7.0.beta18' + gem 'prometheus-client-mmap', '~> 0.7.0.beta43' gem 'raindrops', '~> 0.18' end @@ -324,9 +326,9 @@ 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' @@ -343,7 +345,7 @@ group :development, :test do 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' @@ -398,7 +400,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 0.39.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.59.0', require: 'gitaly' gem 'toml-rb', '~> 0.3.15', require: false diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock index fd3aab2d54a..c8915e9172c 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/Gemfile.lock @@ -4,40 +4,40 @@ 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) @@ -75,6 +75,7 @@ GEM thread_safe (~> 0.3, >= 0.3.1) babosa (1.0.2) base32 (0.3.2) + batch-loader (1.1.1) bcrypt (3.1.11) bcrypt_pbkdf (1.0.0) benchmark-ips (2.3.0) @@ -85,6 +86,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 +111,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) @@ -216,7 +219,7 @@ GEM 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 +278,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.59.0) google-protobuf (~> 3.1) grpc (~> 1.0) github-linguist (4.7.6) @@ -293,14 +296,14 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16) posix-spawn (~> 0.3) - gitlab-markup (1.6.2) + gitlab-markup (1.6.3) 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 +329,7 @@ GEM mime-types (~> 3.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) - google-protobuf (3.4.0.2) + google-protobuf (3.4.1.1) googleauth (0.5.3) faraday (~> 0.12) jwt (~> 1.4) @@ -353,7 +356,7 @@ GEM rake grape_logging (1.7.0) grape - grpc (1.6.0) + grpc (1.4.5) google-protobuf (~> 3.1) googleauth (~> 0.5.1) haml (4.0.7) @@ -396,7 +399,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 +411,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 +453,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 +474,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 +488,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) @@ -567,8 +572,10 @@ GEM parallel (1.12.0) paranoia (2.3.1) activerecord (>= 4.0, < 5.2) - parser (2.4.0.0) - ast (~> 2.2) + parser (2.4.0.2) + ast (~> 2.3) + parslet (1.5.0) + blankslate (~> 2.0) path_expander (1.0.1) peek (1.0.1) concurrent-ruby (>= 0.9.0) @@ -603,11 +610,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 +624,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.7.0.beta43) pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -653,16 +654,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 +676,15 @@ 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) rblineprof (0.3.6) debugger-ruby_core_source (~> 1.3) rbnacl (4.0.2) @@ -698,24 +699,24 @@ GEM recursive-open-struct (1.0.0) redcarpet (3.4.0) redis (3.3.3) - redis-actionpack (5.0.1) + 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) @@ -817,6 +818,9 @@ GEM 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) @@ -867,7 +871,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 +902,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 +954,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) @@ -978,6 +982,7 @@ DEPENDENCIES awesome_print (~> 1.2.0) babosa (~> 1.0.2) base32 (~> 0.3.0) + batch-loader bcrypt_pbkdf (~> 1.0) benchmark-ips (~> 2.3.0) better_errors (~> 2.1.0) @@ -988,9 +993,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) @@ -1015,7 +1020,7 @@ DEPENDENCIES flay (~> 2.8.0) flipper (~> 0.10.2) flipper-active_record (~> 0.10.2) - fog-aliyun (~> 0.1.0) + fog-aliyun (~> 0.2.0) fog-aws (~> 1.4) fog-core (~> 1.44) fog-google (~> 0.5) @@ -1030,7 +1035,7 @@ 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.59.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.6.2) @@ -1055,14 +1060,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) @@ -1104,16 +1109,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.7.0.beta43) pry-byebug (~> 3.4.1) pry-rails (~> 0.3.4) rack-attack (~> 4.4.1) rack-cors (~> 0.4.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 +1131,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) @@ -1148,8 +1152,9 @@ DEPENDENCIES sanitize (~> 2.0) sass-rails (~> 5.0.6) scss_lint (~> 0.54.0) - seed-fu (~> 2.3.5) + seed-fu (= 2.3.6) 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 +1194,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.15.4 + 1.16.0 diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index bc3ca9192bc..d13e6139582 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -18,11 +18,11 @@ let }; }; - version = "10.1.1"; + version = "10.3.4"; gitlabDeb = fetchurl { url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download"; - sha256 = "0xvzxcygy6ffqm24rk6v9gs6g9r744vpwwvk9d00wjla7hwmq3w2"; + sha256 = "0b6508hcahvhfpxyrqs05kz9a7c1wv658asm6a7ccish6hnwcica"; }; in @@ -30,17 +30,17 @@ 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 = "0cvp4wwkc04qffsq738867j31igwzj7zlmahdl24yddbmpa5x8r1"; }; + buildInputs = [ + rubyEnv ruby bundler tzdata git procps dpkg nettools + ]; + patches = [ ./remove-hardcoded-locations.patch ./nulladapter.patch @@ -74,7 +74,11 @@ stdenv.mkDerivation rec { buildPhase = '' mv config/gitlab.yml.example config/gitlab.yml - dpkg -x ${gitlabDeb} . + # work around unpacking deb containing binary with suid bit + ar p ${gitlabDeb} data.tar.gz | gunzip > 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 4fb4c48b0de..fe861e14304 100644 --- a/pkgs/applications/version-management/gitlab/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gemset.nix @@ -19,55 +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"; + version = "4.2.10"; }; activerecord-nulldb-adapter = { dependencies = ["activerecord"]; @@ -91,10 +91,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"]; @@ -248,6 +248,14 @@ }; version = "0.3.2"; }; + batch-loader = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1w4ysjfh74612wsgdnnaq3xqw25hzsr6ajb5syiv1ix7fi15y8bv"; + type = "gem"; + }; + version = "1.1.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"]; @@ -894,10 +911,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 +1088,10 @@ dependencies = ["google-protobuf" "grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0irc3yfyr5li2ki6w03znsklnk0qx3srk4wrb7jav042c4kw325k"; + sha256 = "0s86126iqhbmkix6zs357ixlc1syyxmwk2blaimsav7f0x9swy82"; type = "gem"; }; - version = "0.39.0"; + version = "0.59.0"; }; github-linguist = { dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; @@ -1114,10 +1131,10 @@ gitlab-markup = { source = { remotes = ["https://rubygems.org"]; - sha256 = "114jfbyyfwad609k1l1fcmbzszb3frdchh83gdwndkglllvprhjz"; + sha256 = "1pvx257azpr00yvb74lgjpgnj72nwyd29l9a18280rgmp4cjniki"; type = "gem"; }; - version = "1.6.2"; + version = "1.6.3"; }; gitlab_omniauth-ldap = { dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"]; @@ -1132,10 +1149,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 +1202,10 @@ google-protobuf = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1jh8axm5m75rvdf2i3s24pmi7p613armh9vk3p1d0ryfx159mqkl"; + sha256 = "1l9b2f4msp1gkay2mqjbjs7kfhchf916zh1y365singiysrwn2i6"; type = "gem"; }; - version = "3.4.0.2"; + version = "3.4.1.1"; }; googleauth = { dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"]; @@ -1248,10 +1265,10 @@ dependencies = ["google-protobuf" "googleauth"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "056ipqai887x5jpbgcc215kdi0lfqjzcjbx3hx11cjrfww01zc52"; + sha256 = "1zhci260088zlghpaz6ania1blz1dd7lgklsjnqk1vcymhpr6b38"; type = "gem"; }; - version = "1.6.0"; + version = "1.4.5"; }; haml = { dependencies = ["tilt"]; @@ -1401,12 +1418,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 +1472,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 +1600,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 +1661,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 +1751,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"]; @@ -2081,10 +2091,19 @@ dependencies = ["ast"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "130rfk8a2ws2fyq52hmi1n0xakylw39wv4x1qhai4z17x2b0k9cq"; + sha256 = "0bqc29xx4zwlshvi6krrd0sl82d7xjfhcrxvgf38wvdqcl3b7ck3"; type = "gem"; }; - version = "2.4.0.0"; + version = "2.4.0.2"; + }; + parslet = { + dependencies = ["blankslate"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qp1m8n3m6k6g22nn1ivcfkvccq5jmbkw53vvcjw5xssq179l9z3"; + type = "gem"; + }; + version = "1.5.0"; }; path_expander = { source = { @@ -2192,15 +2211,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 +2263,12 @@ version = "0.0.3"; }; prometheus-client-mmap = { - dependencies = ["mmap2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fgkilpiha338mvfkj5rwhny3vld0nb3v1vgbrlxbhnvch26wakh"; + sha256 = "1wpk9zfbr7c1asvnq1v6jmc3ydbl8y17v24cj4vyhy3nkpds0cij"; type = "gem"; }; - version = "0.7.0.beta18"; + version = "0.7.0.beta43"; }; pry = { dependencies = ["coderay" "method_source" "slop"]; @@ -2378,10 +2387,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 +2432,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 +2457,10 @@ rake = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0mfqgpp3m69s5v1rd51lfh5qpjwyia5p4rg337pw8c8wzm6pgfsw"; + sha256 = "190p7cs8zdn07mjj6xwwsdna3g0r98zs4crz7jh2j2q5b0nbxgjf"; type = "gem"; }; - version = "12.1.0"; + version = "12.3.0"; }; rblineprof = { dependencies = ["debugger-ruby_core_source"]; @@ -2542,19 +2551,19 @@ 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 +2578,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"]; @@ -2954,6 +2963,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 = { @@ -3141,10 +3159,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 +3313,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 +3344,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,23 +3503,6 @@ }; version = "0.9.10"; }; - websocket-driver = { - dependencies = ["websocket-extensions"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1v39w1ig6ps8g55xhz6x1w53apl17ii6kpy0jg9249akgpdvb0k9"; - type = "gem"; - }; - version = "0.6.3"; - }; - websocket-extensions = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "07qnsafl6203a2zclxl20hy4jq11c471cgvd0bj5r9fx1qqw06br"; - type = "gem"; - }; - version = "0.1.2"; - }; wikicloth = { dependencies = ["builder" "expression_parser" "rinku"]; source = { @@ -3502,6 +3512,14 @@ }; version = "0.8.1"; }; + with_env = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1r5ns064mbb99hf1dyxsk9183hznc5i7mn3bi86zka6dlvqf9csh"; + type = "gem"; + }; + version = "1.1.0"; + }; xml-simple = { source = { remotes = ["https://rubygems.org"]; @@ -3519,4 +3537,4 @@ }; version = "2.1.0"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/version-management/gitlab/nulladapter.patch b/pkgs/applications/version-management/gitlab/nulladapter.patch index 3b30ff03346..a495ce63cc5 100644 --- a/pkgs/applications/version-management/gitlab/nulladapter.patch +++ b/pkgs/applications/version-management/gitlab/nulladapter.patch @@ -7,7 +7,7 @@ index 4861171ef5..f6e701c548 100644 +gem 'activerecord-nulldb-adapter' + - gem 'rails', '4.2.8' + gem 'rails', '4.2.10' gem 'rails-deprecated_sanitizer', '~> 1.0.3' diff --git a/Gemfile.lock b/Gemfile.lock diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch index 39c7c28847c..acc615c63ca 100644 --- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch @@ -62,24 +62,15 @@ diff --git a/lib/gitlab/logger.rb b/lib/gitlab/logger.rb index 59b21149a9..4f4a39a06c 100644 --- a/lib/gitlab/logger.rb +++ b/lib/gitlab/logger.rb -@@ -13,7 +13,7 @@ +@@ -26,7 +26,7 @@ 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 --- a/lib/gitlab/uploads_transfer.rb diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix index 5e1feacd83d..78b59f59e94 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/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 05db6d964c3..d5bd24cf938 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -1,18 +1,18 @@ -{ 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; + minor = "3.18"; + version = "${minor}.0"; + inherit (python3Packages) python buildPythonApplication pycairo pygobject3; in buildPythonApplication rec { name = "meld-${version}"; src = fetchurl { url = "mirror://gnome/sources/meld/${minor}/meld-${version}.tar.xz"; - sha256 = "0rwflfkfnb9ydnk4k591x0il29d4dvz95cjs2f279blx64lgki4k"; + sha256 = "0gi2jzgsrd5q2icyp6wphbn532ddg82nxhfxlffkniy7wnqmi0c4"; }; buildInputs = [ @@ -41,6 +41,8 @@ in buildPythonApplication rec { pythonPath = [ gtk3 ]; + doCheck = false; + 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 774aa1082bc..541bc8799a8 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -18,12 +18,12 @@ in python2Packages.buildPythonApplication { 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/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix index c3ed61f31a2..c4c09094edd 100644 --- a/pkgs/applications/version-management/nbstripout/default.nix +++ b/pkgs/applications/version-management/nbstripout/default.nix @@ -25,7 +25,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/rabbitvcs/default.nix b/pkgs/applications/version-management/rabbitvcs/default.nix index 01929655081..2d77a9c3265 100644 --- a/pkgs/applications/version-management/rabbitvcs/default.nix +++ b/pkgs/applications/version-management/rabbitvcs/default.nix @@ -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/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index f0185e187bb..8b2d6fcc8c3 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/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 7f70818bb14..76b42acef3e 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchurl, cmake, pkgconfig, lndir , zlib, gettext, libvdpau, libva, libXv, sqlite , yasm, freetype, fontconfig, fribidi, gtk3, qt4 +, alsaLib , withX265 ? true, x265 , withX264 ? true, x264 , withXvid ? true, xvidcore @@ -29,7 +30,7 @@ let enableParallelBuilding = false; nativeBuildInputs = [ cmake pkgconfig yasm ]; - buildInputs = [ zlib gettext libvdpau libva libXv sqlite fribidi fontconfig freetype ] + buildInputs = [ zlib gettext libvdpau libva libXv sqlite fribidi fontconfig freetype alsaLib ] ++ lib.optional withX264 x264 ++ lib.optional withX265 x265 ++ lib.optional withXvid xvidcore diff --git a/pkgs/applications/video/bombono/default.nix b/pkgs/applications/video/bombono/default.nix index 40d9aa2f228..e3ba331e437 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/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index 69f58fe94bd..e9f172aad76 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -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/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix index ba72e085bf7..9f98d46d53b 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 00000000000..ede4991c466 --- /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 2f073d1731d..0b4bd585134 100644 --- a/pkgs/applications/video/gnome-mpv/default.nix +++ b/pkgs/applications/video/gnome-mpv/default.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { ''; doCheck = true; - checkPhase = "meson test"; meta = with stdenv.lib; { description = "Simple GTK+ frontend for the mpv video player"; @@ -38,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/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 125a6d492a3..28577a429bd 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -130,7 +130,7 @@ in stdenv.mkDerivation rec { 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 diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix index f70c142ab41..8b94204cd62 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/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 867dacc213e..9324b08efd7 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitLab, pkgconfig, autoconf, automake, libiconv , drake, ruby, docbook_xsl, file, xdg_utils, gettext, expat, qt5, boost -, libebml, zlib, libmatroska, libogg, libvorbis, flac, libxslt +, libebml, zlib, libmatroska, libogg, libvorbis, flac, libxslt, cmark , withGUI ? true }: @@ -10,20 +10,20 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "19.0.0"; + version = "20.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "068g0mmi284zl9d9p9zhp55h6rj58j5c27czd3mg42kq74cwcsx9"; + sha256 = "0qrjvvp0pvw9i91rh0zrxpclq7xap2dpjip0s5bm4gv14gh4l4mc"; }; nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby docbook_xsl libxslt ]; buildInputs = [ expat file xdg_utils boost libebml zlib libmatroska libogg - libvorbis flac + libvorbis flac cmark ] ++ optional stdenv.isDarwin libiconv ++ optionals withGUI [qt5.qtbase qt5.qtmultimedia]; diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix index d5215488707..67c91168fa2 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/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 24c5b4335c4..fe6090c3230 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -102,7 +102,8 @@ 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 diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 7aaa1b65fc4..dcbafd8594d 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -172,7 +172,7 @@ in stdenv.mkDerivation rec { '' + 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 diff --git a/pkgs/applications/video/ogmtools/default.nix b/pkgs/applications/video/ogmtools/default.nix index 83e69495b03..221f4fc0e5c 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/quvi/library.nix b/pkgs/applications/video/quvi/library.nix index 8b2a69acfcc..c3204cc9c0c 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 6f4e6091339..603534be4c8 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 3f99258737c..333f4e6ab4d 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/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index 447518d008b..75bd398b208 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, mesa, pkgconfig, libpulseaudio, qt4, cmake, ninja }: stdenv.mkDerivation rec { name = "simplescreenrecorder-${version}"; - version = "0.3.8"; + version = "0.3.9"; src = fetchurl { url = "https://github.com/MaartenBaert/ssr/archive/${version}.tar.gz"; - sha256 = "0v8w35n8w772s08w7k0icynqdsdakbrcanbgx6j847bfqfsg21gg"; + sha256 = "1gnf9wbiq2fcbqcn1a5nfmp8r0nxrrlgh2wly2mfkkwymynhx0pk"; }; 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 = [ + nativeBuildInputs = [ pkgconfig cmake ninja ]; + buildInputs = [ alsaLib ffmpeg libjack2 libX11 libXext libXfixes mesa 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/smtube/default.nix b/pkgs/applications/video/smtube/default.nix index b0588796709..406d49c9939 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.1.0"; name = "smtube-${version}"; src = fetchurl { url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2"; - sha256 = "13m0ll18n1da8i4r4b7gn0jjz9dgrkkyk9mpfas4rgnjw92m5jld"; + sha256 = "1sw2b89ricxfbmgbzsp9f89n0gwh9dbnii6lr9gcccs8djpp1ad1"; }; makeFlags = [ diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 9fd07febbfc..9ff54bd681f 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/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix index 88768b3cb8f..536b4ba0fac 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 @@ -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/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 3316633e437..86b6535e539 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.1"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "0rix0mv203fn3rcxmpqdpb54l1a0paqplg2xgldpd943qi1rm552"; + sha256 = "0kfafqi66yp4qy738pl11f050hfrx9m4kc670qpx7fmf9ii7q6p2"; }; - 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 09e7de898d5..56436d047f2 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -39,13 +39,6 @@ rec { hardeningDisable = [ "fortify" ]; buildInputs = [ removeReferencesTo go btrfs-progs ]; - - # This should go into the containerd derivation once 1.0.0 is out - preBuild = '' - export GOPATH=$(pwd)/vendor - mkdir $(pwd)/vendor/src - mv $(pwd)/vendor/{github.com,golang.org,google.golang.org} $(pwd)/vendor/src/ - '' + oldAttrs.preBuild; }); docker-tini = tini.overrideAttrs (oldAttrs: rec { @@ -105,6 +98,7 @@ rec { cd ./components/engine export AUTO_GOPATH=1 export DOCKER_GITCOMMIT="${rev}" + export VERSION="${version}" ./hack/make.sh dynbinary cd - '') + '' @@ -136,11 +130,7 @@ rec { extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux ]); installPhase = optionalString (stdenv.isLinux) '' - 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 + install -Dm755 ./components/engine/bundles/dynbinary-daemon/dockerd $out/libexec/docker/dockerd makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \ --prefix PATH : "$out/libexec/docker:$extraPath" @@ -207,26 +197,26 @@ rec { # 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.1-ce"; - rev = "19e2cf6259bd7f027a3fff180876a22945ce4ba8"; # git commit - sha256 = "10glpbaw7bg2acgf1nmfn79is2b3xsm4shz67rp72dmpzzaavb42"; - runcRev = "3f2f8b84a77f73d38244dd690525642a72156c64"; - runcSha256 = "0vaagmav8443kmyxac2y1y5l2ipcs1c7gdmsnvj48y9bafqx72rq"; - containerdRev = "06b9cb35161009dcb7123345749fef02f7cea8e0"; - containerdSha256 = "10hms8a2nn69nfnwly6923jzx40c3slpsdhjhff4bxh36flpf9gd"; + docker_17_12 = dockerGen rec { + version = "17.12.0-ce"; + rev = "486a48d2701493bb65385788a291e36febb44ec1"; # git commit + sha256 = "14kp7wrzf3s9crk8px1dc575lchyrcl2dqiwr3sgxb9mzjfiyqps"; + runcRev = "b2567b37d7b75eb4cf325b77297b140ea686ce8f"; + runcSha256 = "0zarsrbfcm1yp6mdl6rcrigdf7nb70xmv2cbggndz0qqyrw0mk0l"; + containerdRev = "89623f28b87a6004d4b785663257362d1658a729"; + containerdSha256 = "0irx7ps6rhq7z69cr3gspxdr7ywrv6dz62gkr1z2723cki9hsxma"; tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; - docker_17_11 = dockerGen rec { - version = "17.11.0-ce"; - rev = "1caf76ce6baa889133ece59fab3c36aaf143d4ef"; # git commit - sha256 = "09s7lxcs4wdjj69l7z3nybbms7iqspk1wy7qnr4r52s8vr3fd5s4"; - runcRev = "0351df1c5a66838d0c392b4ac4cf9450de844e2d"; - runcSha256 = "1cmkdv6rli7v0y0fddqxvrvzd486fg9ssp3kgkya3szkljzz4xj0"; - containerdRev = "992280e8e265f491f7a624ab82f3e238be086e49"; - containerdSha256 = "1ci6jlgrrgz4ph451035sl98lj2jd467pd4qnv85ma9gzblrxs7n"; + docker_18_01 = dockerGen rec { + version = "18.01.0-ce"; + rev = "03596f51b120095326d2004d676e97228a21014d"; # git commit + sha256 = "1zffaxwkfz8ca76f5ql5z76mcjx37jbgv2kk75i68487yg16x0md"; + runcRev = "b2567b37d7b75eb4cf325b77297b140ea686ce8f"; + runcSha256 = "0zarsrbfcm1yp6mdl6rcrigdf7nb70xmv2cbggndz0qqyrw0mk0l"; + containerdRev = "89623f28b87a6004d4b785663257362d1658a729"; + containerdSha256 = "0irx7ps6rhq7z69cr3gspxdr7ywrv6dz62gkr1z2723cki9hsxma"; tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; 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 00000000000..16be0cc5b6d --- /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 = platforms.linux; + }; +} diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/applications/virtualization/remotebox/default.nix index a99e6f56956..cb84ad49aeb 100644 --- a/pkgs/applications/virtualization/remotebox/default.nix +++ b/pkgs/applications/virtualization/remotebox/default.nix @@ -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/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index b99475bcda8..52737179108 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -17,7 +17,10 @@ python2Packages.buildPythonApplication rec { sha256 = "093azs8p4p7y4nf5j25xpsvdxww7gky1g0hs8mkcvmpxl2wjd0jj"; }; - 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 diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix index f386b457fc5..4c5000f0208 100644 --- a/pkgs/applications/virtualization/virt-manager/qt.nix +++ b/pkgs/applications/virtualization/virt-manager/qt.nix @@ -1,27 +1,27 @@ { mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig , qtbase, qtmultimedia, qtsvg -, lxqt, libvncserver, libvirt, pcre, pixman, spice_gtk, spice_protocol +, libvncserver, libvirt, pcre, pixman, qtermwidget, spice_gtk, spice_protocol }: mkDerivation rec { name = "virt-manager-qt-${version}"; - version = "0.45.75"; + version = "0.48.79"; src = fetchFromGitHub { owner = "F1ash"; repo = "qt-virt-manager"; rev = "${version}"; - sha256 = "1s59g7kkz8481y8yyf89f549xwbg1978zj9ds61iy94mwz80b38n"; + sha256 = "1mzncca9blc742vb77gyfza0sd1rby3qy5yl4x19nkllid92jn6k"; }; 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 + libvirt libvncserver pcre pixman qtermwidget spice_gtk spice_protocol ]; nativeBuildInputs = [ cmake pkgconfig ]; @@ -38,5 +38,6 @@ mkDerivation rec { ''; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; + inherit (qtbase.meta) platforms; }; } diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 68ee06953a3..2f5a6192c86 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -13,12 +13,12 @@ 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 ]; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index d46702d6205..38509d299d9 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -21,10 +21,10 @@ let buildType = "release"; # Manually sha256sum the extensionPack file, must be hex! # Do not forget to update the hash in ./guest-additions/default.nix! - extpack = "98e9df4f23212c3de827af9d770b391cf2dba8d21f4de597145512c1479302cd"; - extpackRev = "119785"; - main = "053xpf0kxrig4jq5djfz9drhkxy1x5a4p9qvgxc0b3hnk6yn1869"; - version = "5.2.4"; + extpack = "70584a70b666e9332ae2c6be0e64da4b8e3a27124801156577f205750bdde4f5"; + extpackRev = "120293"; + main = "1rx45ivwk89ghjc5zdd7c7j92w0w3930xj7l1zhwrvshxs454w7y"; + version = "5.2.6"; # See https://github.com/NixOS/nixpkgs/issues/672 for details extensionPack = requireFile rec { @@ -207,7 +207,7 @@ in stdenv.mkDerivation { meta = { description = "PC emulator"; license = licenses.gpl2; - homepage = http://www.virtualbox.org/; + 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 409187a99fb..f82eec07a29 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "0qhsr6vc48ld2p9q3a6n6rfg57rsn163axr3r1m2yqr2snr4pnk0"; + sha256 = "1px9jp6lv7ff7kn4ns5r4dq7xl4wiz3h4ckgdhgvxs040njpdzy5"; }; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; @@ -36,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/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 4043c05e3d6..ca596cdfddc 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -49,8 +49,8 @@ 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' \ + --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 ]}" diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index 9f6c8937518..76352753db1 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { buildPhase = " make "; meta = { - homepage = 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/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index a589e21be98..ec1673f5040 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 = '' diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix index 6c53c51551a..e28a9cf75be 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 20df6566b23..4d572e8c040 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/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index 05965fc3717..0b86c0283e0 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-01-15"; src = fetchFromGitHub { owner = "greshake"; repo = "i3status-rust"; - rev = "5daf2cdd611bed3db804d011d5d5af34b558e615"; - sha256 = "0j6h7x5mm3m7wq0if20qxc9z3qw29xgf5qb3sqwdbdpz8ykpqdgk"; + rev = "aa7bc98d945ba63358cd48c66e0261c201b999e4"; + sha256 = "1q2p53nl499yxsw0i81ryyc2ln80p8i3iii5hx7aiwfi4ybm55b1"; }; cargoSha256 = "1197hp6d4z14j0r22bvw9ly294li0ivg6yfql4lgi27hbvzag71h"; diff --git a/pkgs/applications/window-managers/orbment/bemenu.nix b/pkgs/applications/window-managers/orbment/bemenu.nix index a708ad08afa..065b81948c2 100644 --- a/pkgs/applications/window-managers/orbment/bemenu.nix +++ b/pkgs/applications/window-managers/orbment/bemenu.nix @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { description = "A dynamic menu library and client program inspired by dmenu"; homepage = src.meta.homepage; license = with licenses; [ gpl3 lgpl3 ]; - maintainers = with maintainers; [ gnidorah ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/pkgs/applications/window-managers/oroborus/default.nix index d2bf1e5a96d..13eef1c045a 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 e3c88a5fa55..71d3d9cafaa 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 b620bfb2501..7d184838fba 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 d9377897fc6..c9ae57c8615 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 a7b9a77b3db..79752829e2a 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -7,13 +7,13 @@ 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 = [ diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 4aa729e888d..d643e2dd218 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.1"; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = version; - sha256 = "0rz5rgap2ah7hkk4glvlmjq0c8i2f47qzkwjx7gm4wmb8gymikmh"; + sha256 = "00prns3dnafd19ap774p8v994i3p185ji0dnp2xxbkgh2z7sbwpi"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix index 5e92c52e521..a5d02093e3f 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 b704c480d66..77abc0c7ed4 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/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 0dcae204824..bb0e6b82aa5 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -164,7 +164,21 @@ stdenv.mkDerivation { set +u ''; - propagatedBuildInputs = extraPackages; + 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"; + 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 throw "unknown emulation for platform: " + targetPlatform.config; + in targetPlatform.platform.bfdEmulation or (fmt + "-" + arch); + + depsTargetTargetPropagated = extraPackages; setupHook = ./setup-hook.sh; diff --git a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh index 136621d27af..991ed0fe263 100644 --- a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh @@ -67,6 +67,11 @@ 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 diff --git a/pkgs/build-support/bintools-wrapper/setup-hook.sh b/pkgs/build-support/bintools-wrapper/setup-hook.sh index 43f79ec5920..48a00b0b9b0 100644 --- a/pkgs/build-support/bintools-wrapper/setup-hook.sh +++ b/pkgs/build-support/bintools-wrapper/setup-hook.sh @@ -2,12 +2,20 @@ # # 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 $depOffset in + case $depHostOffset in -1) local role='BUILD_' ;; 0) local role='' ;; 1) local role='TARGET_' ;; - *) echo "bintools-wrapper: Error: Cannot be used with $depOffset-offset deps, " >2; + *) echo "bintools-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2; return 1 ;; esac @@ -20,17 +28,29 @@ bintoolsWrapper_addLDVars () { fi } -if [ -n "${crossConfig:-}" ]; then - export NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_BUILD=1 - role_pre='BUILD_' - role_post='_FOR_BUILD' -else - export NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_HOST=1 - role_pre="" - role_post='' -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 -envHooks+=(bintoolsWrapper_addLDVars) +addEnvHooks "$targetOffset" bintoolsWrapper_addLDVars # shellcheck disable=SC2157 if [ -n "@bintools_bin@" ]; then @@ -65,3 +85,4 @@ done # No local scope in sourced file unset -v role_pre role_post cmd upper_case +set +u diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv.c b/pkgs/build-support/build-fhs-userenv/chrootenv.c deleted file mode 100644 index d3b49db0e42..00000000000 --- a/pkgs/build-support/build-fhs-userenv/chrootenv.c +++ /dev/null @@ -1,242 +0,0 @@ -#define _GNU_SOURCE - -#include -#include - -#define errorf(status, fmt, ...) \ - error_at_line(status, errno, __FILE__, __LINE__, fmt, ##__VA_ARGS__) - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#define LEN(x) (sizeof(x) / sizeof(*x)) - -// TODO: fill together with @abbradar when he gets better -const char *environ_blacklist[] = {}; - -void environ_blacklist_filter() { - for (size_t i = 0; i < LEN(environ_blacklist); i++) { - if (unsetenv(environ_blacklist[i]) < 0) - errorf(EX_OSERR, "unsetenv(%s)", environ_blacklist[i]); - } -} - -void bind(const char *from, const char *to) { - if (mkdir(to, 0755) < 0) - errorf(EX_IOERR, "mkdir(%s)", to); - - if (mount(from, to, "bind", MS_BIND | MS_REC, NULL) < 0) - errorf(EX_OSERR, "mount(%s, %s)", from, to); -} - -const char *bind_blacklist[] = {".", "..", "bin", "etc", "host", "usr"}; - -bool str_contains(const char *needle, const char **haystack, size_t len) { - for (size_t i = 0; i < len; i++) { - if (!strcmp(needle, haystack[i])) - return true; - } - - return false; -} - -bool is_dir(const char *path) { - struct stat buf; - - if (stat(path, &buf) < 0) - errorf(EX_IOERR, "stat(%s)", path); - - return S_ISDIR(buf.st_mode); -} - -void bind_to_cwd(const char *prefix) { - DIR *prefix_dir = opendir(prefix); - - if (prefix_dir == NULL) - errorf(EX_IOERR, "opendir(%s)", prefix); - - struct dirent *prefix_dirent; - - while (prefix_dirent = readdir(prefix_dir)) { - if (str_contains(prefix_dirent->d_name, bind_blacklist, - LEN(bind_blacklist))) - continue; - - char *prefix_dirent_path; - - if (asprintf(&prefix_dirent_path, "%s%s", prefix, prefix_dirent->d_name) < - 0) - errorf(EX_IOERR, "asprintf"); - - if (is_dir(prefix_dirent_path)) { - bind(prefix_dirent_path, prefix_dirent->d_name); - } else { - char *host_target; - - if (asprintf(&host_target, "host/%s", prefix_dirent->d_name) < 0) - errorf(EX_IOERR, "asprintf"); - - if (symlink(host_target, prefix_dirent->d_name) < 0) - errorf(EX_IOERR, "symlink(%s, %s)", host_target, prefix_dirent->d_name); - - free(host_target); - } - - free(prefix_dirent_path); - } - - bind(prefix, "host"); - - if (closedir(prefix_dir) < 0) - errorf(EX_IOERR, "closedir(%s)", prefix); -} - -void spitf(const char *path, char *fmt, ...) { - va_list args; - va_start(args, fmt); - - FILE *f = fopen(path, "w"); - - if (f == NULL) - errorf(EX_IOERR, "spitf(%s): fopen", path); - - if (vfprintf(f, fmt, args) < 0) - errorf(EX_IOERR, "spitf(%s): vfprintf", path); - - if (fclose(f) < 0) - errorf(EX_IOERR, "spitf(%s): fclose", path); -} - -int nftw_remove(const char *path, const struct stat *sb, int type, - struct FTW *ftw) { - return remove(path); -} - -char *root; - -void root_cleanup() { - if (nftw(root, nftw_remove, getdtablesize(), - FTW_DEPTH | FTW_MOUNT | FTW_PHYS) < 0) - errorf(EX_IOERR, "nftw(%s)", root); - - free(root); -} - -#define REQUIREMENTS \ - "Requires Linux version >= 3.19 built with CONFIG_USER_NS option.\n" - -int main(int argc, char *argv[]) { - const char *self = *argv++; - - if (argc < 2) { - fprintf(stderr, "Usage: %s command [arguments...]\n" REQUIREMENTS, self); - exit(EX_USAGE); - } - - if (getenv("NIX_CHROOTENV") != NULL) { - fputs("Can't create chrootenv inside chrootenv!\n", stderr); - exit(EX_USAGE); - } - - if (setenv("NIX_CHROOTENV", "1", false) < 0) - errorf(EX_OSERR, "setenv(NIX_CHROOTENV, 1)"); - - const char *temp = getenv("TMPDIR"); - - if (temp == NULL) - temp = "/tmp"; - - if (asprintf(&root, "%s/chrootenvXXXXXX", temp) < 0) - errorf(EX_IOERR, "asprintf"); - - root = mkdtemp(root); - - if (root == NULL) - errorf(EX_IOERR, "mkdtemp(%s)", root); - - atexit(root_cleanup); - - // Don't make root private so that privilege drops inside chroot are possible: - if (chmod(root, 0755) < 0) - errorf(EX_IOERR, "chmod(%s, 0755)", root); - - pid_t cpid = fork(); - - if (cpid < 0) - errorf(EX_OSERR, "fork"); - - if (cpid == 0) { - uid_t uid = getuid(); - gid_t gid = getgid(); - - // If we are root, no need to create new user namespace. - if (uid == 0) { - if (unshare(CLONE_NEWNS) < 0) { - fputs(REQUIREMENTS, stderr); - errorf(EX_OSERR, "unshare"); - } - // Mark all mounted filesystems as slave so changes - // don't propagate to the parent mount namespace. - if (mount(NULL, "/", NULL, MS_REC | MS_SLAVE, NULL) < 0) - errorf(EX_OSERR, "mount"); - } else { - // Create new mount and user namespaces. CLONE_NEWUSER - // requires a program to be non-threaded. - if (unshare(CLONE_NEWNS | CLONE_NEWUSER) < 0) { - fputs(access("/proc/sys/kernel/unprivileged_userns_clone", F_OK) - ? REQUIREMENTS - : "Run: sudo sysctl -w kernel.unprivileged_userns_clone=1\n", - stderr); - errorf(EX_OSERR, "unshare"); - } - - // Map users and groups to the parent namespace. - // setgroups is only available since Linux 3.19: - spitf("/proc/self/setgroups", "deny"); - - spitf("/proc/self/uid_map", "%d %d 1", uid, uid); - spitf("/proc/self/gid_map", "%d %d 1", gid, gid); - } - - if (chdir(root) < 0) - errorf(EX_IOERR, "chdir(%s)", root); - - bind_to_cwd("/"); - - if (chroot(root) < 0) - errorf(EX_OSERR, "chroot(%s)", root); - - if (chdir("/") < 0) - errorf(EX_IOERR, "chdir(/)"); - - environ_blacklist_filter(); - - if (execvp(*argv, argv) < 0) - errorf(EX_OSERR, "execvp(%s)", *argv); - } - - int status; - - if (waitpid(cpid, &status, 0) < 0) - errorf(EX_OSERR, "waitpid(%d)", cpid); - - if (WIFEXITED(status)) { - return WEXITSTATUS(status); - } else if (WIFSIGNALED(status)) { - kill(getpid(), WTERMSIG(status)); - } - - return EX_OSERR; -} 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 00000000000..c03a1710f45 --- /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 00000000000..375c30e1e46 --- /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 5f3ec4dc8ea..219530a67bd 100644 --- a/pkgs/build-support/build-fhs-userenv/default.nix +++ b/pkgs/build-support/build-fhs-userenv/default.nix @@ -1,4 +1,4 @@ -{ callPackage, runCommand, lib, writeScript, stdenv, coreutils, ruby }: +{ callPackage, runCommand, lib, writeScript, stdenv, coreutils }: let buildFHSEnv = callPackage ./env.nix { }; in @@ -7,14 +7,7 @@ args@{ name, runScript ? "bash", extraInstallCommands ? "", meta ? {}, passthru let env = buildFHSEnv (removeAttrs args [ "runScript" "extraInstallCommands" "meta" "passthru" ]); - chrootenv = stdenv.mkDerivation { - name = "chrootenv"; - - unpackPhase = "cp ${./chrootenv.c} chrootenv.c"; - installPhase = "cp chrootenv $out"; - - makeFlags = [ "chrootenv" ]; - }; + chrootenv = callPackage ./chrootenv {}; init = run: writeScript "${name}-init" '' #! ${stdenv.shell} diff --git a/pkgs/build-support/build-pecl.nix b/pkgs/build-support/build-pecl.nix index ce948739c32..738dbb56708 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/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 218e9f6b957..8de2366ff5f 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -201,7 +201,8 @@ stdenv.mkDerivation { ln -s $ccPath/${targetPrefix}ghdl $out/bin/${targetPrefix}ghdl ''; - propagatedBuildInputs = [ bintools ] ++ extraPackages; + propagatedBuildInputs = [ bintools ]; + depsTargetTargetPropagated = extraPackages; setupHook = ./setup-hook.sh; @@ -292,7 +293,7 @@ stdenv.mkDerivation { ## Hardening support ## - export hardening_unsupported_flags="" + export hardening_unsupported_flags="${builtins.concatStringsSep " " (cc.hardeningUnsupportedFlags or [])}" '' + optionalString hostPlatform.isCygwin '' diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh index a922193ad2e..29a7306b9b7 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 @@ -87,20 +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_pre='BUILD_' - role_post='_FOR_BUILD' -else - export NIX_CC_WRAPPER_@infixSalt@_TARGET_HOST=1 - role_pre='' - role_post='' -fi +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 -# 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) +# 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. @@ -131,3 +149,4 @@ export CXX${role_post}=@named_cxx@ # No local scope in sourced file unset -v role_pre role_post +set +u diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index b9a33497174..691d4bb74db 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"; diff --git a/pkgs/build-support/docker/pull.nix b/pkgs/build-support/docker/pull.nix index 5ccd0a41c5e..5611c778586 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/emacs/setup-hook.sh b/pkgs/build-support/emacs/setup-hook.sh index defef45b55f..e1db3e828fd 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 bd733f1b9ba..4e780b104b0 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 3e1f0eff84a..fd971d431df 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 dd2c0363187..f9250de4ee0 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 d4c88ca6d15..9d9deb3f629 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 2df1b136c55..3b965b06662 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/fetchegg/default.nix b/pkgs/build-support/fetchegg/default.nix index 41d2c936e01..746af9e2737 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 439c96019a4..27933b47178 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 8e060b87ebd..9fccc27ef63 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 17962d08acc..2441da156d1 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 a1dd9210e73..4dcf6d06718 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 ea91a0854d1..3ccf5d273fc 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 aba12317963..36a48ce9f17 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 196b3bebc91..dc894979422 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 1dc14e8cab1..7ce67453d69 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 62b700dd81b..40ba79ec435 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 e3159d20530..c185497e691 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 199c029d3b6..f8793dbac95 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 a5cdbd150b8..e6b7a3418c0 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/default.nix b/pkgs/build-support/fetchsvn/default.nix index 8a1085affd3..da57d581dad 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 a6f3d3469f0..f76bd10247b 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 8dac273eb1c..3e47d4a4b68 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. +{ 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 = stdenvNoCC.lib.fetchers.proxyImpureEnvVars ++ [ # This variable allows the user to pass additional options to curl "NIX_CURL_FLAGS" @@ -103,8 +103,8 @@ let 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 { +else if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${stdenvNoCC.lib.concatStringsSep ", " urls_}" +else stdenvNoCC.mkDerivation { name = if showURLs then "urls" else if name != "" then name @@ -112,7 +112,7 @@ else stdenv.mkDerivation { builder = ./builder.sh; - buildInputs = [ curl ]; + nativeBuildInputs = [ curl ]; urls = urls_; diff --git a/pkgs/build-support/gcc-wrapper-old/default.nix b/pkgs/build-support/gcc-wrapper-old/default.nix index ae17989d932..2c2b2c0e1d5 100644 --- a/pkgs/build-support/gcc-wrapper-old/default.nix +++ b/pkgs/build-support/gcc-wrapper-old/default.nix @@ -8,7 +8,7 @@ { name ? "", stdenv, lib, nativeTools, nativeLibc, nativePrefix ? "" , gcc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell , zlib ? null -, hostPlatform, targetPlatform +, hostPlatform, targetPlatform, targetPackages }: assert nativeTools -> nativePrefix != ""; @@ -58,18 +58,6 @@ stdenv.mkDerivation { 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 = @@ -83,17 +71,6 @@ stdenv.mkDerivation { # 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) + targetPackages.stdenv.cc.bintools.dynamicLinker else ""; } diff --git a/pkgs/build-support/gcc-wrapper-old/setup-hook.sh b/pkgs/build-support/gcc-wrapper-old/setup-hook.sh index d8bdf858ae5..ad3ffeffbbb 100644 --- a/pkgs/build-support/gcc-wrapper-old/setup-hook.sh +++ b/pkgs/build-support/gcc-wrapper-old/setup-hook.sh @@ -1,4 +1,4 @@ -addCVars () { +gccWrapperOld_addCVars () { if test -d $1/include; then export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem $1/include" fi @@ -12,7 +12,7 @@ addCVars () { fi } -envHooks=(${envHooks[@]} addCVars) +envBuildBuildHooks+=(gccWrapperOld_addCVars) # Note: these come *after* $out in the PATH (see setup.sh). diff --git a/pkgs/build-support/release/source-tarball.nix b/pkgs/build-support/release/source-tarball.nix index 5e178544644..c7129ae83f9 100644 --- a/pkgs/build-support/release/source-tarball.nix +++ b/pkgs/build-support/release/source-tarball.nix @@ -123,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/carnix.nix b/pkgs/build-support/rust/carnix.nix index 80c0903369a..1457832c928 100644 --- a/pkgs/build-support/rust/carnix.nix +++ b/pkgs/build-support/rust/carnix.nix @@ -1,4 +1,4 @@ -# Generated by carnix 0.5.0: carnix -o carnix.nix --src ./. Cargo.lock +# Generated by carnix 0.6.0: carnix -o carnix.nix --src ./. Cargo.lock { lib, buildPlatform, buildRustCrate, fetchgit }: let kernel = buildPlatform.parsed.kernel.name; abi = buildPlatform.parsed.abi.name; @@ -7,869 +7,1144 @@ let kernel = buildPlatform.parsed.kernel.name; (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); + 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; 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); - 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; - }; - ansi_term_0_10_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "ansi_term"; - version = "0.10.2"; - authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) " "Josh Triplett " ]; - sha256 = "07k0hfmlhv43lihyxb9d81l5mq5zlpqvv30dkfd3knmv2ginasn9"; - 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_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "backtrace"; - version = "0.3.4"; - authors = [ "Alex Crichton " "The Rust Project Developers" ]; - sha256 = "1caba8w3rqd5ghr88ghyz5wgkf81dgx18bj1llkax6qmianc6gk7"; - 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_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_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "carnix"; - version = "0.5.0"; - authors = [ "pe@pijul.org " ]; - sha256 = "0mrprfa9l6q351ci77zr305jk5wdii8gamaphd2iars4xwn26lj4"; - 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; - }; - clap_2_28_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "clap"; - version = "2.28.0"; - authors = [ "Kevin K. " ]; - sha256 = "0m0rj9xw6mja4gdhqmaldv0q5y5jfsfzbyzfd70mm3857aynq03k"; - 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; - }; - 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_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "either"; - version = "1.4.0"; - authors = [ "bluss" ]; - sha256 = "04kpfd84lvyrkb2z4sljlz2d3d5qczd0sb1yy37fgijq2yx3vb37"; - 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; - }; - 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; - }; - itertools_0_7_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "itertools"; - version = "0.7.3"; - authors = [ "bluss" ]; - sha256 = "128a69cnmgpj38rs6lcwzya773d2vx7f9y7012iycjf9yi2pyckj"; - 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; - }; - 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; - }; - 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; - }; - libsqlite3_sys_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "libsqlite3-sys"; - version = "0.9.0"; - authors = [ "John Gallagher " ]; - sha256 = "1pnx3i9h85si6cs4nhazfb28hsvk7dn0arnfvpdzpjdnj9z38q57"; - 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_3_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "log"; - version = "0.3.8"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1c43z4z85sxrsgir4s1hi84558ab5ic7jrn5qgmsiqcv90vvn006"; - 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; - }; - 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_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "num-traits"; - version = "0.1.40"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1fr8ghp4i97q3agki54i0hpmqxv3s65i2mqd1pinc7w7arc3fplw"; - 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; - }; - 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_32_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "redox_syscall"; - version = "0.1.32"; - authors = [ "Jeremy Soller " ]; - sha256 = "1axxj8x6ngh6npkzqc5h216fajkcyrdxdgb7m2f0n5xfclbk47fv"; - 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; - }; - 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_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "rustc-demangle"; - version = "0.1.5"; - authors = [ "Alex Crichton " ]; - sha256 = "096kkcx9j747700fhxj1s4rlwkj21pqjmvj64psdj6bakb2q13nc"; - inherit dependencies buildDependencies features; - }; - serde_1_0_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde"; - version = "1.0.21"; - authors = [ "Erick Tryzelaar " "David Tolnay " ]; - sha256 = "10almq7pvx8s4ryiqk8gf7fj5igl0yq6dcjknwc67rkmxd8q50w3"; - inherit dependencies buildDependencies features; - }; - serde_derive_1_0_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde_derive"; - version = "1.0.21"; - authors = [ "Erick Tryzelaar " "David Tolnay " ]; - sha256 = "0r20qyimm9scfaz7lc0swnhik9d045zklmbidd0zzpd4b2f3jsqm"; - procMacro = true; - inherit dependencies buildDependencies features; - }; - serde_derive_internals_0_17_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde_derive_internals"; - version = "0.17.0"; - authors = [ "Erick Tryzelaar " "David Tolnay " ]; - sha256 = "1g1j3v6pj9wbcz3v3w4smjpwrcdwjicmf6yd5cbai04as9iwhw74"; - inherit dependencies buildDependencies features; - }; - serde_json_1_0_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde_json"; - version = "1.0.6"; - authors = [ "Erick Tryzelaar " "David Tolnay " ]; - sha256 = "1kacyc59splwbg8gr7qs32pp9smgy1khq0ggnv07yxhs7h355vjz"; - 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; - }; - 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; - }; - 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_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "thread_local"; - version = "0.3.4"; - authors = [ "Amanieu d'Antras " ]; - sha256 = "1y6cwyhhx2nkz4b3dziwhqdvgq830z8wjp32b40pjd8r0hxqv2jr"; - inherit dependencies buildDependencies features; - }; - time_0_1_38_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "time"; - version = "0.1.38"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1ws283vvz7c6jfiwn53rmc6kybapr4pjaahfxxrz232b0qzw7gcp"; - 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_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_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; - }; - 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; - }; - 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_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; - }; - + ) (if hasFeature (feat.default or {}) then [ "default" ] else []) (builtins.attrNames feat); in rec { - aho_corasick_0_6_3 = aho_corasick_0_6_3_ rec { - dependencies = [ memchr_1_0_2 ]; + 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; }; - memchr_1_0_2_features."default".from_aho_corasick_0_6_3__default = true; - ansi_term_0_10_2 = ansi_term_0_10_2_ rec {}; - 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 []); + ansi_term_0_10_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "ansi_term"; + version = "0.10.2"; + authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) " "Josh Triplett " ]; + sha256 = "07k0hfmlhv43lihyxb9d81l5mq5zlpqvv30dkfd3knmv2ginasn9"; + inherit dependencies buildDependencies features; }; - termion_1_5_1_features."default".from_atty_0_2_3__default = true; - libc_0_2_33_features."default".from_atty_0_2_3__default = false; - kernel32_sys_0_2_2_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_4 = backtrace_0_3_4_ rec { - dependencies = [ cfg_if_0_1_2 rustc_demangle_0_1_5 ] - ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "fuchsia") && !(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_4_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_4_features."".self = true; - backtrace_0_3_4_features."kernel32-sys".self_dbghelp = hasFeature (backtrace_0_3_4_features."dbghelp" or {}); - backtrace_0_3_4_features."winapi".self_dbghelp = hasFeature (backtrace_0_3_4_features."dbghelp" or {}); - backtrace_0_3_4_features."dbghelp-sys".self_dbghelp = hasFeature (backtrace_0_3_4_features."dbghelp" or {}); - backtrace_0_3_4_features."libunwind".self_default = hasDefault backtrace_0_3_4_features; - backtrace_0_3_4_features."libbacktrace".self_default = hasDefault backtrace_0_3_4_features; - backtrace_0_3_4_features."coresymbolication".self_default = hasDefault backtrace_0_3_4_features; - backtrace_0_3_4_features."dladdr".self_default = hasDefault backtrace_0_3_4_features; - backtrace_0_3_4_features."dbghelp".self_default = hasDefault backtrace_0_3_4_features; - backtrace_0_3_4_features."addr2line".self_gimli-symbolize = hasFeature (backtrace_0_3_4_features."gimli-symbolize" or {}); - backtrace_0_3_4_features."findshlibs".self_gimli-symbolize = hasFeature (backtrace_0_3_4_features."gimli-symbolize" or {}); - backtrace_0_3_4_features."backtrace-sys".self_libbacktrace = hasFeature (backtrace_0_3_4_features."libbacktrace" or {}); - backtrace_0_3_4_features."rustc-serialize".self_serialize-rustc = hasFeature (backtrace_0_3_4_features."serialize-rustc" or {}); - backtrace_0_3_4_features."serde".self_serialize-serde = hasFeature (backtrace_0_3_4_features."serialize-serde" or {}); - backtrace_0_3_4_features."serde_derive".self_serialize-serde = hasFeature (backtrace_0_3_4_features."serialize-serde" or {}); - addr2line_0_0_0_features."default".from_backtrace_0_3_4__default = true; - cfg_if_0_1_2_features."default".from_backtrace_0_3_4__default = true; - cpp_demangle_0_0_0_features."default".from_backtrace_0_3_4__default = false; - findshlibs_0_0_0_features."default".from_backtrace_0_3_4__default = true; - rustc_demangle_0_1_5_features."default".from_backtrace_0_3_4__default = true; - rustc_serialize_0_0_0_features."default".from_backtrace_0_3_4__default = true; - serde_0_0_0_features."default".from_backtrace_0_3_4__default = true; - serde_derive_0_0_0_features."default".from_backtrace_0_3_4__default = true; - backtrace_sys_0_1_16_features."default".from_backtrace_0_3_4__default = true; - libc_0_2_33_features."default".from_backtrace_0_3_4__default = true; - dbghelp_sys_0_2_0_features."default".from_backtrace_0_3_4__default = true; - kernel32_sys_0_2_2_features."default".from_backtrace_0_3_4__default = true; - winapi_0_2_8_features."default".from_backtrace_0_3_4__default = true; - backtrace_sys_0_1_16 = backtrace_sys_0_1_16_ rec { - dependencies = [ libc_0_2_33 ]; - buildDependencies = [ cc_1_0_3 ]; + backtrace_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "backtrace"; + version = "0.3.4"; + authors = [ "Alex Crichton " "The Rust Project Developers" ]; + sha256 = "1caba8w3rqd5ghr88ghyz5wgkf81dgx18bj1llkax6qmianc6gk7"; + inherit dependencies buildDependencies features; }; - libc_0_2_33_features."default".from_backtrace_sys_0_1_16__default = true; - bitflags_0_7_0 = bitflags_0_7_0_ rec {}; - bitflags_1_0_1 = bitflags_1_0_1_ rec { - features = mkFeatures bitflags_1_0_1_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_features."example_generated".self_default = hasDefault bitflags_1_0_1_features; - carnix_0_5_0 = carnix_0_5_0_ rec { - dependencies = [ clap_2_28_0 env_logger_0_4_3 error_chain_0_11_0 itertools_0_7_3 log_0_3_8 nom_3_2_1 regex_0_2_2 rusqlite_0_13_0 serde_1_0_21 serde_derive_1_0_21 serde_json_1_0_6 tempdir_0_3_5 toml_0_4_5 ]; + 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; }; - clap_2_28_0_features."default".from_carnix_0_5_0__default = true; - env_logger_0_4_3_features."default".from_carnix_0_5_0__default = true; - error_chain_0_11_0_features."default".from_carnix_0_5_0__default = true; - itertools_0_7_3_features."default".from_carnix_0_5_0__default = true; - log_0_3_8_features."default".from_carnix_0_5_0__default = true; - nom_3_2_1_features."default".from_carnix_0_5_0__default = true; - regex_0_2_2_features."default".from_carnix_0_5_0__default = true; - rusqlite_0_13_0_features."default".from_carnix_0_5_0__default = true; - serde_1_0_21_features."default".from_carnix_0_5_0__default = true; - serde_derive_1_0_21_features."default".from_carnix_0_5_0__default = true; - serde_json_1_0_6_features."default".from_carnix_0_5_0__default = true; - tempdir_0_3_5_features."default".from_carnix_0_5_0__default = true; - toml_0_4_5_features."default".from_carnix_0_5_0__default = true; - cc_1_0_3 = cc_1_0_3_ rec { + 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_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "carnix"; + version = "0.6.0"; + authors = [ "pe@pijul.org " ]; + src = include [ "Cargo.toml" "src/main.rs" "src/cache.rs" "src/cfg.rs" "src/krate/mod.rs" "src/krate/prefetch.rs" ] ./.; + 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; + }; + clap_2_28_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "clap"; + version = "2.28.0"; + authors = [ "Kevin K. " ]; + sha256 = "0m0rj9xw6mja4gdhqmaldv0q5y5jfsfzbyzfd70mm3857aynq03k"; + 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; + }; + 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_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "either"; + version = "1.4.0"; + authors = [ "bluss" ]; + sha256 = "04kpfd84lvyrkb2z4sljlz2d3d5qczd0sb1yy37fgijq2yx3vb37"; + 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; + }; + 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; + }; + itertools_0_7_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "itertools"; + version = "0.7.3"; + authors = [ "bluss" ]; + sha256 = "128a69cnmgpj38rs6lcwzya773d2vx7f9y7012iycjf9yi2pyckj"; + 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; + }; + 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; + }; + 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; + }; + libsqlite3_sys_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "libsqlite3-sys"; + version = "0.9.0"; + authors = [ "John Gallagher " ]; + sha256 = "1pnx3i9h85si6cs4nhazfb28hsvk7dn0arnfvpdzpjdnj9z38q57"; + 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_3_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "log"; + version = "0.3.8"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1c43z4z85sxrsgir4s1hi84558ab5ic7jrn5qgmsiqcv90vvn006"; + 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; + }; + 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_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "num-traits"; + version = "0.1.40"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1fr8ghp4i97q3agki54i0hpmqxv3s65i2mqd1pinc7w7arc3fplw"; + 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; + }; + 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_32_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "redox_syscall"; + version = "0.1.32"; + authors = [ "Jeremy Soller " ]; + sha256 = "1axxj8x6ngh6npkzqc5h216fajkcyrdxdgb7m2f0n5xfclbk47fv"; + 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; + }; + 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_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "rustc-demangle"; + version = "0.1.5"; + authors = [ "Alex Crichton " ]; + sha256 = "096kkcx9j747700fhxj1s4rlwkj21pqjmvj64psdj6bakb2q13nc"; + inherit dependencies buildDependencies features; + }; + serde_1_0_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde"; + version = "1.0.21"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "10almq7pvx8s4ryiqk8gf7fj5igl0yq6dcjknwc67rkmxd8q50w3"; + inherit dependencies buildDependencies features; + }; + serde_derive_1_0_21_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_derive"; + version = "1.0.21"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "0r20qyimm9scfaz7lc0swnhik9d045zklmbidd0zzpd4b2f3jsqm"; + procMacro = true; + inherit dependencies buildDependencies features; + }; + serde_derive_internals_0_17_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_derive_internals"; + version = "0.17.0"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "1g1j3v6pj9wbcz3v3w4smjpwrcdwjicmf6yd5cbai04as9iwhw74"; + inherit dependencies buildDependencies features; + }; + serde_json_1_0_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "serde_json"; + version = "1.0.6"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "1kacyc59splwbg8gr7qs32pp9smgy1khq0ggnv07yxhs7h355vjz"; + 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; + }; + 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; + }; + 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_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "thread_local"; + version = "0.3.4"; + authors = [ "Amanieu d'Antras " ]; + sha256 = "1y6cwyhhx2nkz4b3dziwhqdvgq830z8wjp32b40pjd8r0hxqv2jr"; + inherit dependencies buildDependencies features; + }; + time_0_1_38_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "time"; + version = "0.1.38"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1ws283vvz7c6jfiwn53rmc6kybapr4pjaahfxxrz232b0qzw7gcp"; + 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_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_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; + }; + 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; + }; + 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_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; + }; + aho_corasick_0_6_3 = f: aho_corasick_0_6_3_ rec { + dependencies = [ (memchr_1_0_2 f) ]; + }; + aho_corasick_0_6_3_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + memchr_1_0_2.default.from_aho_corasick_0_6_3__default_ = true; + })) + [ memchr_1_0_2_features ]; + ansi_term_0_10_2 = f: ansi_term_0_10_2_ rec {}; + ansi_term_0_10_2_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + })) + [ ]; + atty_0_2_3 = f: atty_0_2_3_ rec { + dependencies = (if kernel == "redox" then [ (termion_1_5_1 f) ] else []) + ++ (if (kernel == "linux" || kernel == "darwin") then [ (libc_0_2_33 f) ] else []) + ++ (if kernel == "windows" then [ (kernel32_sys_0_2_2 f) (winapi_0_2_8 f) ] else []); + }; + atty_0_2_3_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + kernel32_sys_0_2_2.default.from_atty_0_2_3__default_ = true; + libc_0_2_33.default.from_atty_0_2_3__default_ = false; + termion_1_5_1.default.from_atty_0_2_3__default_ = true; + winapi_0_2_8.default.from_atty_0_2_3__default_ = true; + })) + [ termion_1_5_1_features libc_0_2_33_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; + backtrace_0_3_4 = f: backtrace_0_3_4_ rec { + dependencies = [ (cfg_if_0_1_2 f) (rustc_demangle_0_1_5 f) ] + ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "fuchsia") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then [ ] + ++ (if hasFeature (f.backtrace_0_3_4."backtrace-sys" or {}) then [(backtrace_sys_0_1_16 f)] else []) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then [ (libc_0_2_33 f) ] else []) + ++ (if kernel == "windows" then [ ] + ++ (if hasFeature (f.backtrace_0_3_4."dbghelp-sys" or {}) then [(dbghelp_sys_0_2_0 f)] else []) + ++ (if hasFeature (f.backtrace_0_3_4."kernel32-sys" or {}) then [(kernel32_sys_0_2_2 f)] else []) + ++ (if hasFeature (f.backtrace_0_3_4."winapi" or {}) then [(winapi_0_2_8 f)] else []) else []); + features = mkFeatures (f.backtrace_0_3_4 or {}); + }; + backtrace_0_3_4_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + backtrace_0_3_4."kernel32-sys".self_dbghelp = hasFeature (backtrace_0_3_4."dbghelp" or {}) || hasFeature (features.backtrace_0_3_4."dbghelp" or {}); + backtrace_0_3_4."winapi".self_dbghelp = hasFeature (backtrace_0_3_4."dbghelp" or {}) || hasFeature (features.backtrace_0_3_4."dbghelp" or {}); + backtrace_0_3_4."dbghelp-sys".self_dbghelp = hasFeature (backtrace_0_3_4."dbghelp" or {}) || hasFeature (features.backtrace_0_3_4."dbghelp" or {}); + backtrace_0_3_4."libunwind".self_default = hasFeature (backtrace_0_3_4.default or {}) || hasFeature (features.backtrace_0_3_4.default or {}); + backtrace_0_3_4."libbacktrace".self_default = hasFeature (backtrace_0_3_4.default or {}) || hasFeature (features.backtrace_0_3_4.default or {}); + backtrace_0_3_4."coresymbolication".self_default = hasFeature (backtrace_0_3_4.default or {}) || hasFeature (features.backtrace_0_3_4.default or {}); + backtrace_0_3_4."dladdr".self_default = hasFeature (backtrace_0_3_4.default or {}) || hasFeature (features.backtrace_0_3_4.default or {}); + backtrace_0_3_4."dbghelp".self_default = hasFeature (backtrace_0_3_4.default or {}) || hasFeature (features.backtrace_0_3_4.default or {}); + backtrace_0_3_4."addr2line".self_gimli-symbolize = hasFeature (backtrace_0_3_4."gimli-symbolize" or {}) || hasFeature (features.backtrace_0_3_4."gimli-symbolize" or {}); + backtrace_0_3_4."findshlibs".self_gimli-symbolize = hasFeature (backtrace_0_3_4."gimli-symbolize" or {}) || hasFeature (features.backtrace_0_3_4."gimli-symbolize" or {}); + backtrace_0_3_4."backtrace-sys".self_libbacktrace = hasFeature (backtrace_0_3_4."libbacktrace" or {}) || hasFeature (features.backtrace_0_3_4."libbacktrace" or {}); + backtrace_0_3_4."rustc-serialize".self_serialize-rustc = hasFeature (backtrace_0_3_4."serialize-rustc" or {}) || hasFeature (features.backtrace_0_3_4."serialize-rustc" or {}); + backtrace_0_3_4."serde".self_serialize-serde = hasFeature (backtrace_0_3_4."serialize-serde" or {}) || hasFeature (features.backtrace_0_3_4."serialize-serde" or {}); + backtrace_0_3_4."serde_derive".self_serialize-serde = hasFeature (backtrace_0_3_4."serialize-serde" or {}) || hasFeature (features.backtrace_0_3_4."serialize-serde" or {}); + backtrace_sys_0_1_16.default.from_backtrace_0_3_4__default_ = true; + cfg_if_0_1_2.default.from_backtrace_0_3_4__default_ = true; + dbghelp_sys_0_2_0.default.from_backtrace_0_3_4__default_ = true; + kernel32_sys_0_2_2.default.from_backtrace_0_3_4__default_ = true; + libc_0_2_33.default.from_backtrace_0_3_4__default_ = true; + rustc_demangle_0_1_5.default.from_backtrace_0_3_4__default_ = true; + winapi_0_2_8.default.from_backtrace_0_3_4__default_ = true; + })) + [ cfg_if_0_1_2_features rustc_demangle_0_1_5_features backtrace_sys_0_1_16_features libc_0_2_33_features dbghelp_sys_0_2_0_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; + backtrace_sys_0_1_16 = f: backtrace_sys_0_1_16_ rec { + dependencies = [ (libc_0_2_33 f) ]; + buildDependencies = [ (cc_1_0_3 f) ]; + }; + backtrace_sys_0_1_16_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + cc_1_0_3.default.from_backtrace_sys_0_1_16__default_ = true; + libc_0_2_33.default.from_backtrace_sys_0_1_16__default_ = true; + })) + [ libc_0_2_33_features cc_1_0_3_features ]; + bitflags_0_7_0 = f: bitflags_0_7_0_ rec {}; + bitflags_0_7_0_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + })) + [ ]; + bitflags_1_0_1 = f: bitflags_1_0_1_ rec { + features = mkFeatures (f.bitflags_1_0_1 or {}); + }; + bitflags_1_0_1_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + bitflags_1_0_1."example_generated".self_default = hasFeature (bitflags_1_0_1.default or {}) || hasFeature (features.bitflags_1_0_1.default or {}); + })) + [ ]; + carnix_0_6_0 = f: carnix_0_6_0_ rec { + dependencies = [ (clap_2_28_0 f) (env_logger_0_4_3 f) (error_chain_0_11_0 f) (itertools_0_7_3 f) (log_0_3_8 f) (nom_3_2_1 f) (regex_0_2_2 f) (rusqlite_0_13_0 f) (serde_1_0_21 f) (serde_derive_1_0_21 f) (serde_json_1_0_6 f) (tempdir_0_3_5 f) (toml_0_4_5 f) ]; + }; + carnix_0_6_0_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + clap_2_28_0.default.from_carnix_0_6_0__default_ = true; + env_logger_0_4_3.default.from_carnix_0_6_0__default_ = true; + error_chain_0_11_0.default.from_carnix_0_6_0__default_ = true; + itertools_0_7_3.default.from_carnix_0_6_0__default_ = true; + log_0_3_8.default.from_carnix_0_6_0__default_ = true; + nom_3_2_1.default.from_carnix_0_6_0__default_ = true; + regex_0_2_2.default.from_carnix_0_6_0__default_ = true; + rusqlite_0_13_0.default.from_carnix_0_6_0__default_ = true; + serde_1_0_21.default.from_carnix_0_6_0__default_ = true; + serde_derive_1_0_21.default.from_carnix_0_6_0__default_ = true; + serde_json_1_0_6.default.from_carnix_0_6_0__default_ = true; + tempdir_0_3_5.default.from_carnix_0_6_0__default_ = true; + toml_0_4_5.default.from_carnix_0_6_0__default_ = true; + })) + [ clap_2_28_0_features env_logger_0_4_3_features error_chain_0_11_0_features itertools_0_7_3_features log_0_3_8_features nom_3_2_1_features regex_0_2_2_features rusqlite_0_13_0_features serde_1_0_21_features serde_derive_1_0_21_features serde_json_1_0_6_features tempdir_0_3_5_features toml_0_4_5_features ]; + cc_1_0_3 = f: cc_1_0_3_ rec { dependencies = []; - features = mkFeatures cc_1_0_3_features; + features = mkFeatures (f.cc_1_0_3 or {}); }; - 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 {}; - clap_2_28_0 = clap_2_28_0_ rec { - dependencies = [ ansi_term_0_10_2 atty_0_2_3 bitflags_1_0_1 strsim_0_6_0 textwrap_0_9_0 unicode_width_0_1_4 vec_map_0_8_0 ] - ++ (if lib.lists.any (x: x == "ansi_term") features then [ansi_term_0_10_2] else []) ++ (if lib.lists.any (x: x == "atty") features then [atty_0_2_3] else []) ++ (if lib.lists.any (x: x == "strsim") features then [strsim_0_6_0] else []) ++ (if lib.lists.any (x: x == "vec_map") features then [vec_map_0_8_0] else []); - features = mkFeatures clap_2_28_0_features; + cc_1_0_3_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + cc_1_0_3."rayon".self_parallel = hasFeature (cc_1_0_3."parallel" or {}) || hasFeature (features.cc_1_0_3."parallel" or {}); + })) + [ ]; + cfg_if_0_1_2 = f: cfg_if_0_1_2_ rec {}; + cfg_if_0_1_2_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + })) + [ ]; + clap_2_28_0 = f: clap_2_28_0_ rec { + dependencies = [ (bitflags_1_0_1 f) (textwrap_0_9_0 f) (unicode_width_0_1_4 f) ] + ++ (if hasFeature (f.clap_2_28_0."ansi_term" or {}) then [(ansi_term_0_10_2 f)] else []) + ++ (if hasFeature (f.clap_2_28_0."atty" or {}) then [(atty_0_2_3 f)] else []) + ++ (if hasFeature (f.clap_2_28_0."strsim" or {}) then [(strsim_0_6_0 f)] else []) + ++ (if hasFeature (f.clap_2_28_0."vec_map" or {}) then [(vec_map_0_8_0 f)] else []); + features = mkFeatures (f.clap_2_28_0 or {}); }; - clap_2_28_0_features."".self = true; - clap_2_28_0_features."ansi_term".self_color = hasFeature (clap_2_28_0_features."color" or {}); - clap_2_28_0_features."atty".self_color = hasFeature (clap_2_28_0_features."color" or {}); - clap_2_28_0_features."suggestions".self_default = hasDefault clap_2_28_0_features; - clap_2_28_0_features."color".self_default = hasDefault clap_2_28_0_features; - clap_2_28_0_features."vec_map".self_default = hasDefault clap_2_28_0_features; - clap_2_28_0_features."yaml".self_doc = hasFeature (clap_2_28_0_features."doc" or {}); - clap_2_28_0_features."clippy".self_lints = hasFeature (clap_2_28_0_features."lints" or {}); - clap_2_28_0_features."strsim".self_suggestions = hasFeature (clap_2_28_0_features."suggestions" or {}); - clap_2_28_0_features."term_size".self_wrap_help = hasFeature (clap_2_28_0_features."wrap_help" or {}); - clap_2_28_0_features."yaml-rust".self_yaml = hasFeature (clap_2_28_0_features."yaml" or {}); - ansi_term_0_10_2_features."default".from_clap_2_28_0__default = true; - atty_0_2_3_features."default".from_clap_2_28_0__default = true; - bitflags_1_0_1_features."default".from_clap_2_28_0__default = true; - clippy_0_0_0_features."default".from_clap_2_28_0__default = true; - strsim_0_6_0_features."default".from_clap_2_28_0__default = true; - term_size_0_0_0_features."default".from_clap_2_28_0__default = true; - textwrap_0_9_0_features."term_size".from_clap_2_28_0__wrap_help = hasFeature (clap_2_28_0_features."wrap_help" or {}); - textwrap_0_9_0_features."default".from_clap_2_28_0__default = true; - unicode_width_0_1_4_features."default".from_clap_2_28_0__default = true; - vec_map_0_8_0_features."default".from_clap_2_28_0__default = true; - yaml_rust_0_0_0_features."default".from_clap_2_28_0__default = true; - dbghelp_sys_0_2_0 = dbghelp_sys_0_2_0_ rec { - dependencies = [ winapi_0_2_8 ]; - buildDependencies = [ winapi_build_0_1_1 ]; + clap_2_28_0_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + clap_2_28_0."ansi_term".self_color = hasFeature (clap_2_28_0."color" or {}) || hasFeature (features.clap_2_28_0."color" or {}); + clap_2_28_0."atty".self_color = hasFeature (clap_2_28_0."color" or {}) || hasFeature (features.clap_2_28_0."color" or {}); + clap_2_28_0."suggestions".self_default = hasFeature (clap_2_28_0.default or {}) || hasFeature (features.clap_2_28_0.default or {}); + clap_2_28_0."color".self_default = hasFeature (clap_2_28_0.default or {}) || hasFeature (features.clap_2_28_0.default or {}); + clap_2_28_0."vec_map".self_default = hasFeature (clap_2_28_0.default or {}) || hasFeature (features.clap_2_28_0.default or {}); + clap_2_28_0."yaml".self_doc = hasFeature (clap_2_28_0."doc" or {}) || hasFeature (features.clap_2_28_0."doc" or {}); + clap_2_28_0."clippy".self_lints = hasFeature (clap_2_28_0."lints" or {}) || hasFeature (features.clap_2_28_0."lints" or {}); + clap_2_28_0."strsim".self_suggestions = hasFeature (clap_2_28_0."suggestions" or {}) || hasFeature (features.clap_2_28_0."suggestions" or {}); + clap_2_28_0."term_size".self_wrap_help = hasFeature (clap_2_28_0."wrap_help" or {}) || hasFeature (features.clap_2_28_0."wrap_help" or {}); + clap_2_28_0."yaml-rust".self_yaml = hasFeature (clap_2_28_0."yaml" or {}) || hasFeature (features.clap_2_28_0."yaml" or {}); + textwrap_0_9_0."term_size".from_clap_2_28_0__term_size = hasFeature (clap_2_28_0."wrap_help" or {}) || hasFeature (features.clap_2_28_0."wrap_help" or {}); + ansi_term_0_10_2.default.from_clap_2_28_0__default_ = true; + atty_0_2_3.default.from_clap_2_28_0__default_ = true; + bitflags_1_0_1.default.from_clap_2_28_0__default_ = true; + strsim_0_6_0.default.from_clap_2_28_0__default_ = true; + textwrap_0_9_0.default.from_clap_2_28_0__default_ = true; + unicode_width_0_1_4.default.from_clap_2_28_0__default_ = true; + vec_map_0_8_0.default.from_clap_2_28_0__default_ = true; + })) + [ ansi_term_0_10_2_features atty_0_2_3_features bitflags_1_0_1_features strsim_0_6_0_features textwrap_0_9_0_features unicode_width_0_1_4_features vec_map_0_8_0_features ]; + dbghelp_sys_0_2_0 = f: dbghelp_sys_0_2_0_ rec { + dependencies = [ (winapi_0_2_8 f) ]; + buildDependencies = [ (winapi_build_0_1_1 f) ]; }; - winapi_0_2_8_features."default".from_dbghelp_sys_0_2_0__default = true; - dtoa_0_4_2 = dtoa_0_4_2_ rec {}; - either_1_4_0 = either_1_4_0_ rec { + dbghelp_sys_0_2_0_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + winapi_0_2_8.default.from_dbghelp_sys_0_2_0__default_ = true; + winapi_build_0_1_1.default.from_dbghelp_sys_0_2_0__default_ = true; + })) + [ winapi_0_2_8_features winapi_build_0_1_1_features ]; + dtoa_0_4_2 = f: dtoa_0_4_2_ rec {}; + dtoa_0_4_2_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + })) + [ ]; + either_1_4_0 = f: either_1_4_0_ rec { dependencies = []; - features = mkFeatures either_1_4_0_features; + features = mkFeatures (f.either_1_4_0 or {}); }; - either_1_4_0_features."use_std".self_default = hasDefault either_1_4_0_features; - serde_0_0_0_features."derive".from_either_1_4_0 = true; - serde_0_0_0_features."default".from_either_1_4_0__default = true; - 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; + either_1_4_0_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + either_1_4_0."use_std".self_default = hasFeature (either_1_4_0.default or {}) || hasFeature (features.either_1_4_0.default or {}); + })) + [ ]; + env_logger_0_4_3 = f: env_logger_0_4_3_ rec { + dependencies = [ (log_0_3_8 f) ] + ++ (if hasFeature (f.env_logger_0_4_3."regex" or {}) then [(regex_0_2_2 f)] else []); + features = mkFeatures (f.env_logger_0_4_3 or {}); }; - 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_4 ] - ++ (if lib.lists.any (x: x == "backtrace") features then [backtrace_0_3_4] else []); - features = mkFeatures error_chain_0_11_0_features; + env_logger_0_4_3_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + env_logger_0_4_3."regex".self_default = hasFeature (env_logger_0_4_3.default or {}) || hasFeature (features.env_logger_0_4_3.default or {}); + log_0_3_8.default.from_env_logger_0_4_3__default_ = true; + regex_0_2_2.default.from_env_logger_0_4_3__default_ = true; + })) + [ log_0_3_8_features regex_0_2_2_features ]; + error_chain_0_11_0 = f: error_chain_0_11_0_ rec { + dependencies = [ ] + ++ (if hasFeature (f.error_chain_0_11_0."backtrace" or {}) then [(backtrace_0_3_4 f)] else []); + features = mkFeatures (f.error_chain_0_11_0 or {}); }; - 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_4_features."default".from_error_chain_0_11_0__default = true; - fuchsia_zircon_0_2_1 = fuchsia_zircon_0_2_1_ rec { - dependencies = [ fuchsia_zircon_sys_0_2_0 ]; + error_chain_0_11_0_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + error_chain_0_11_0."backtrace".self_default = hasFeature (error_chain_0_11_0.default or {}) || hasFeature (features.error_chain_0_11_0.default or {}); + error_chain_0_11_0."example_generated".self_default = hasFeature (error_chain_0_11_0.default or {}) || hasFeature (features.error_chain_0_11_0.default or {}); + backtrace_0_3_4.default.from_error_chain_0_11_0__default_ = true; + })) + [ backtrace_0_3_4_features ]; + fuchsia_zircon_0_2_1 = f: fuchsia_zircon_0_2_1_ rec { + dependencies = [ (fuchsia_zircon_sys_0_2_0 f) ]; }; - 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 ]; + fuchsia_zircon_0_2_1_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + fuchsia_zircon_sys_0_2_0.default.from_fuchsia_zircon_0_2_1__default_ = true; + })) + [ fuchsia_zircon_sys_0_2_0_features ]; + fuchsia_zircon_sys_0_2_0 = f: fuchsia_zircon_sys_0_2_0_ rec { + dependencies = [ (bitflags_0_7_0 f) ]; }; - bitflags_0_7_0_features."default".from_fuchsia_zircon_sys_0_2_0__default = true; - itertools_0_7_3 = itertools_0_7_3_ rec { - dependencies = [ either_1_4_0 ]; - features = mkFeatures itertools_0_7_3_features; + fuchsia_zircon_sys_0_2_0_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + bitflags_0_7_0.default.from_fuchsia_zircon_sys_0_2_0__default_ = true; + })) + [ bitflags_0_7_0_features ]; + itertools_0_7_3 = f: itertools_0_7_3_ rec { + dependencies = [ (either_1_4_0 f) ]; + features = mkFeatures (f.itertools_0_7_3 or {}); }; - itertools_0_7_3_features."use_std".self_default = hasDefault itertools_0_7_3_features; - either_1_4_0_features."default".from_itertools_0_7_3__default = false; - itoa_0_3_4 = itoa_0_3_4_ rec { - features = mkFeatures itoa_0_3_4_features; + itertools_0_7_3_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + itertools_0_7_3."use_std".self_default = hasFeature (itertools_0_7_3.default or {}) || hasFeature (features.itertools_0_7_3.default or {}); + either_1_4_0.default.from_itertools_0_7_3__default_ = false; + })) + [ either_1_4_0_features ]; + itoa_0_3_4 = f: itoa_0_3_4_ rec { + features = mkFeatures (f.itoa_0_3_4 or {}); }; - itoa_0_3_4_features."".self = true; - kernel32_sys_0_2_2 = kernel32_sys_0_2_2_ rec { - dependencies = [ winapi_0_2_8 ]; - buildDependencies = [ winapi_build_0_1_1 ]; + itoa_0_3_4_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + })) + [ ]; + kernel32_sys_0_2_2 = f: kernel32_sys_0_2_2_ rec { + dependencies = [ (winapi_0_2_8 f) ]; + buildDependencies = [ (winapi_build_0_1_1 f) ]; }; - winapi_0_2_8_features."default".from_kernel32_sys_0_2_2__default = true; - lazy_static_0_2_11 = lazy_static_0_2_11_ rec { + kernel32_sys_0_2_2_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + winapi_0_2_8.default.from_kernel32_sys_0_2_2__default_ = true; + winapi_build_0_1_1.default.from_kernel32_sys_0_2_2__default_ = true; + })) + [ winapi_0_2_8_features winapi_build_0_1_1_features ]; + lazy_static_0_2_11 = f: lazy_static_0_2_11_ rec { dependencies = []; - features = mkFeatures lazy_static_0_2_11_features; + features = mkFeatures (f.lazy_static_0_2_11 or {}); }; - lazy_static_0_2_11_features."compiletest_rs".self_compiletest = hasFeature (lazy_static_0_2_11_features."compiletest" or {}); - lazy_static_0_2_11_features."nightly".self_spin_no_std = hasFeature (lazy_static_0_2_11_features."spin_no_std" or {}); - lazy_static_0_2_11_features."spin".self_spin_no_std = hasFeature (lazy_static_0_2_11_features."spin_no_std" or {}); - compiletest_rs_0_0_0_features."default".from_lazy_static_0_2_11__default = true; - spin_0_0_0_features."default".from_lazy_static_0_2_11__default = true; - libc_0_2_33 = libc_0_2_33_ rec { - features = mkFeatures libc_0_2_33_features; + lazy_static_0_2_11_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + lazy_static_0_2_11."compiletest_rs".self_compiletest = hasFeature (lazy_static_0_2_11."compiletest" or {}) || hasFeature (features.lazy_static_0_2_11."compiletest" or {}); + lazy_static_0_2_11."nightly".self_spin_no_std = hasFeature (lazy_static_0_2_11."spin_no_std" or {}) || hasFeature (features.lazy_static_0_2_11."spin_no_std" or {}); + lazy_static_0_2_11."spin".self_spin_no_std = hasFeature (lazy_static_0_2_11."spin_no_std" or {}) || hasFeature (features.lazy_static_0_2_11."spin_no_std" or {}); + })) + [ ]; + libc_0_2_33 = f: libc_0_2_33_ rec { + features = mkFeatures (f.libc_0_2_33 or {}); }; - libc_0_2_33_features."use_std".self_default = hasDefault libc_0_2_33_features; - libsqlite3_sys_0_9_0 = libsqlite3_sys_0_9_0_ rec { + libc_0_2_33_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + libc_0_2_33."use_std".self_default = hasFeature (libc_0_2_33.default or {}) || hasFeature (features.libc_0_2_33.default or {}); + })) + [ ]; + libsqlite3_sys_0_9_0 = f: libsqlite3_sys_0_9_0_ rec { dependencies = (if abi == "msvc" then [] else []); - buildDependencies = [ pkg_config_0_3_9 ] - ++ (if lib.lists.any (x: x == "pkg-config") features then [pkg_config_0_3_9] else []); - features = mkFeatures libsqlite3_sys_0_9_0_features; + buildDependencies = [ ] + ++ (if hasFeature (f.libsqlite3_sys_0_9_0."pkg-config" or {}) then [(pkg_config_0_3_9 f)] else []); + features = mkFeatures (f.libsqlite3_sys_0_9_0 or {}); }; - libsqlite3_sys_0_9_0_features."bindgen".self_buildtime_bindgen = hasFeature (libsqlite3_sys_0_9_0_features."buildtime_bindgen" or {}); - libsqlite3_sys_0_9_0_features."pkg-config".self_buildtime_bindgen = hasFeature (libsqlite3_sys_0_9_0_features."buildtime_bindgen" or {}); - libsqlite3_sys_0_9_0_features."vcpkg".self_buildtime_bindgen = hasFeature (libsqlite3_sys_0_9_0_features."buildtime_bindgen" or {}); - libsqlite3_sys_0_9_0_features."cc".self_bundled = hasFeature (libsqlite3_sys_0_9_0_features."bundled" or {}); - libsqlite3_sys_0_9_0_features."min_sqlite_version_3_6_8".self_default = hasDefault libsqlite3_sys_0_9_0_features; - libsqlite3_sys_0_9_0_features."pkg-config".self_min_sqlite_version_3_6_11 = hasFeature (libsqlite3_sys_0_9_0_features."min_sqlite_version_3_6_11" or {}); - libsqlite3_sys_0_9_0_features."vcpkg".self_min_sqlite_version_3_6_11 = hasFeature (libsqlite3_sys_0_9_0_features."min_sqlite_version_3_6_11" or {}); - libsqlite3_sys_0_9_0_features."pkg-config".self_min_sqlite_version_3_6_23 = hasFeature (libsqlite3_sys_0_9_0_features."min_sqlite_version_3_6_23" or {}); - libsqlite3_sys_0_9_0_features."vcpkg".self_min_sqlite_version_3_6_23 = hasFeature (libsqlite3_sys_0_9_0_features."min_sqlite_version_3_6_23" or {}); - libsqlite3_sys_0_9_0_features."pkg-config".self_min_sqlite_version_3_6_8 = hasFeature (libsqlite3_sys_0_9_0_features."min_sqlite_version_3_6_8" or {}); - libsqlite3_sys_0_9_0_features."vcpkg".self_min_sqlite_version_3_6_8 = hasFeature (libsqlite3_sys_0_9_0_features."min_sqlite_version_3_6_8" or {}); - libsqlite3_sys_0_9_0_features."pkg-config".self_min_sqlite_version_3_7_16 = hasFeature (libsqlite3_sys_0_9_0_features."min_sqlite_version_3_7_16" or {}); - libsqlite3_sys_0_9_0_features."vcpkg".self_min_sqlite_version_3_7_16 = hasFeature (libsqlite3_sys_0_9_0_features."min_sqlite_version_3_7_16" or {}); - libsqlite3_sys_0_9_0_features."pkg-config".self_min_sqlite_version_3_7_3 = hasFeature (libsqlite3_sys_0_9_0_features."min_sqlite_version_3_7_3" or {}); - libsqlite3_sys_0_9_0_features."vcpkg".self_min_sqlite_version_3_7_3 = hasFeature (libsqlite3_sys_0_9_0_features."min_sqlite_version_3_7_3" or {}); - libsqlite3_sys_0_9_0_features."pkg-config".self_min_sqlite_version_3_7_4 = hasFeature (libsqlite3_sys_0_9_0_features."min_sqlite_version_3_7_4" or {}); - libsqlite3_sys_0_9_0_features."vcpkg".self_min_sqlite_version_3_7_4 = hasFeature (libsqlite3_sys_0_9_0_features."min_sqlite_version_3_7_4" or {}); - linked_hash_map_0_4_2 = linked_hash_map_0_4_2_ rec { + libsqlite3_sys_0_9_0_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + libsqlite3_sys_0_9_0."bindgen".self_buildtime_bindgen = hasFeature (libsqlite3_sys_0_9_0."buildtime_bindgen" or {}) || hasFeature (features.libsqlite3_sys_0_9_0."buildtime_bindgen" or {}); + libsqlite3_sys_0_9_0."pkg-config".self_buildtime_bindgen = hasFeature (libsqlite3_sys_0_9_0."buildtime_bindgen" or {}) || hasFeature (features.libsqlite3_sys_0_9_0."buildtime_bindgen" or {}); + libsqlite3_sys_0_9_0."vcpkg".self_buildtime_bindgen = hasFeature (libsqlite3_sys_0_9_0."buildtime_bindgen" or {}) || hasFeature (features.libsqlite3_sys_0_9_0."buildtime_bindgen" or {}); + libsqlite3_sys_0_9_0."cc".self_bundled = hasFeature (libsqlite3_sys_0_9_0."bundled" or {}) || hasFeature (features.libsqlite3_sys_0_9_0."bundled" or {}); + libsqlite3_sys_0_9_0."min_sqlite_version_3_6_8".self_default = hasFeature (libsqlite3_sys_0_9_0.default or {}) || hasFeature (features.libsqlite3_sys_0_9_0.default or {}); + libsqlite3_sys_0_9_0."pkg-config".self_min_sqlite_version_3_6_11 = hasFeature (libsqlite3_sys_0_9_0."min_sqlite_version_3_6_11" or {}) || hasFeature (features.libsqlite3_sys_0_9_0."min_sqlite_version_3_6_11" or {}); + libsqlite3_sys_0_9_0."vcpkg".self_min_sqlite_version_3_6_11 = hasFeature (libsqlite3_sys_0_9_0."min_sqlite_version_3_6_11" or {}) || hasFeature (features.libsqlite3_sys_0_9_0."min_sqlite_version_3_6_11" or {}); + libsqlite3_sys_0_9_0."pkg-config".self_min_sqlite_version_3_6_23 = hasFeature (libsqlite3_sys_0_9_0."min_sqlite_version_3_6_23" or {}) || hasFeature (features.libsqlite3_sys_0_9_0."min_sqlite_version_3_6_23" or {}); + libsqlite3_sys_0_9_0."vcpkg".self_min_sqlite_version_3_6_23 = hasFeature (libsqlite3_sys_0_9_0."min_sqlite_version_3_6_23" or {}) || hasFeature (features.libsqlite3_sys_0_9_0."min_sqlite_version_3_6_23" or {}); + libsqlite3_sys_0_9_0."pkg-config".self_min_sqlite_version_3_6_8 = hasFeature (libsqlite3_sys_0_9_0."min_sqlite_version_3_6_8" or {}) || hasFeature (features.libsqlite3_sys_0_9_0."min_sqlite_version_3_6_8" or {}); + libsqlite3_sys_0_9_0."vcpkg".self_min_sqlite_version_3_6_8 = hasFeature (libsqlite3_sys_0_9_0."min_sqlite_version_3_6_8" or {}) || hasFeature (features.libsqlite3_sys_0_9_0."min_sqlite_version_3_6_8" or {}); + libsqlite3_sys_0_9_0."pkg-config".self_min_sqlite_version_3_7_16 = hasFeature (libsqlite3_sys_0_9_0."min_sqlite_version_3_7_16" or {}) || hasFeature (features.libsqlite3_sys_0_9_0."min_sqlite_version_3_7_16" or {}); + libsqlite3_sys_0_9_0."vcpkg".self_min_sqlite_version_3_7_16 = hasFeature (libsqlite3_sys_0_9_0."min_sqlite_version_3_7_16" or {}) || hasFeature (features.libsqlite3_sys_0_9_0."min_sqlite_version_3_7_16" or {}); + libsqlite3_sys_0_9_0."pkg-config".self_min_sqlite_version_3_7_3 = hasFeature (libsqlite3_sys_0_9_0."min_sqlite_version_3_7_3" or {}) || hasFeature (features.libsqlite3_sys_0_9_0."min_sqlite_version_3_7_3" or {}); + libsqlite3_sys_0_9_0."vcpkg".self_min_sqlite_version_3_7_3 = hasFeature (libsqlite3_sys_0_9_0."min_sqlite_version_3_7_3" or {}) || hasFeature (features.libsqlite3_sys_0_9_0."min_sqlite_version_3_7_3" or {}); + libsqlite3_sys_0_9_0."pkg-config".self_min_sqlite_version_3_7_4 = hasFeature (libsqlite3_sys_0_9_0."min_sqlite_version_3_7_4" or {}) || hasFeature (features.libsqlite3_sys_0_9_0."min_sqlite_version_3_7_4" or {}); + libsqlite3_sys_0_9_0."vcpkg".self_min_sqlite_version_3_7_4 = hasFeature (libsqlite3_sys_0_9_0."min_sqlite_version_3_7_4" or {}) || hasFeature (features.libsqlite3_sys_0_9_0."min_sqlite_version_3_7_4" or {}); + pkg_config_0_3_9.default.from_libsqlite3_sys_0_9_0__default_ = true; + })) + [ pkg_config_0_3_9_features ]; + linked_hash_map_0_4_2 = f: linked_hash_map_0_4_2_ rec { dependencies = []; - features = mkFeatures linked_hash_map_0_4_2_features; + features = mkFeatures (f.linked_hash_map_0_4_2 or {}); }; - linked_hash_map_0_4_2_features."heapsize".self_heapsize_impl = hasFeature (linked_hash_map_0_4_2_features."heapsize_impl" or {}); - linked_hash_map_0_4_2_features."serde".self_serde_impl = hasFeature (linked_hash_map_0_4_2_features."serde_impl" or {}); - linked_hash_map_0_4_2_features."serde_test".self_serde_impl = hasFeature (linked_hash_map_0_4_2_features."serde_impl" or {}); - clippy_0_0_0_features."default".from_linked_hash_map_0_4_2__default = true; - heapsize_0_0_0_features."default".from_linked_hash_map_0_4_2__default = true; - serde_0_0_0_features."default".from_linked_hash_map_0_4_2__default = true; - serde_test_0_0_0_features."default".from_linked_hash_map_0_4_2__default = true; - log_0_3_8 = log_0_3_8_ rec { - features = mkFeatures log_0_3_8_features; + linked_hash_map_0_4_2_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + linked_hash_map_0_4_2."heapsize".self_heapsize_impl = hasFeature (linked_hash_map_0_4_2."heapsize_impl" or {}) || hasFeature (features.linked_hash_map_0_4_2."heapsize_impl" or {}); + linked_hash_map_0_4_2."serde".self_serde_impl = hasFeature (linked_hash_map_0_4_2."serde_impl" or {}) || hasFeature (features.linked_hash_map_0_4_2."serde_impl" or {}); + linked_hash_map_0_4_2."serde_test".self_serde_impl = hasFeature (linked_hash_map_0_4_2."serde_impl" or {}) || hasFeature (features.linked_hash_map_0_4_2."serde_impl" or {}); + })) + [ ]; + log_0_3_8 = f: log_0_3_8_ rec { + features = mkFeatures (f.log_0_3_8 or {}); }; - log_0_3_8_features."use_std".self_default = hasDefault log_0_3_8_features; - lru_cache_0_1_1 = lru_cache_0_1_1_ rec { - dependencies = [ linked_hash_map_0_4_2 ]; - features = mkFeatures lru_cache_0_1_1_features; + log_0_3_8_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + log_0_3_8."use_std".self_default = hasFeature (log_0_3_8.default or {}) || hasFeature (features.log_0_3_8.default or {}); + })) + [ ]; + lru_cache_0_1_1 = f: lru_cache_0_1_1_ rec { + dependencies = [ (linked_hash_map_0_4_2 f) ]; + features = mkFeatures (f.lru_cache_0_1_1 or {}); }; - lru_cache_0_1_1_features."heapsize".self_heapsize_impl = hasFeature (lru_cache_0_1_1_features."heapsize_impl" or {}); - heapsize_0_0_0_features."default".from_lru_cache_0_1_1__default = true; - linked_hash_map_0_4_2_features."heapsize_impl".from_lru_cache_0_1_1__heapsize_impl = hasFeature (lru_cache_0_1_1_features."heapsize_impl" or {}); - linked_hash_map_0_4_2_features."default".from_lru_cache_0_1_1__default = true; - 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; + lru_cache_0_1_1_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + lru_cache_0_1_1."heapsize".self_heapsize_impl = hasFeature (lru_cache_0_1_1."heapsize_impl" or {}) || hasFeature (features.lru_cache_0_1_1."heapsize_impl" or {}); + linked_hash_map_0_4_2."heapsize_impl".from_lru_cache_0_1_1__heapsize_impl = hasFeature (lru_cache_0_1_1."heapsize_impl" or {}) || hasFeature (features.lru_cache_0_1_1."heapsize_impl" or {}); + linked_hash_map_0_4_2.default.from_lru_cache_0_1_1__default_ = true; + })) + [ linked_hash_map_0_4_2_features ]; + memchr_1_0_2 = f: memchr_1_0_2_ rec { + dependencies = [ ] + ++ (if hasFeature (f.memchr_1_0_2."libc" or {}) then [(libc_0_2_33 f)] else []); + features = mkFeatures (f.memchr_1_0_2 or {}); }; - 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; - nom_3_2_1 = nom_3_2_1_ rec { - dependencies = [ memchr_1_0_2 ]; - features = mkFeatures nom_3_2_1_features; + memchr_1_0_2_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + memchr_1_0_2."use_std".self_default = hasFeature (memchr_1_0_2.default or {}) || hasFeature (features.memchr_1_0_2.default or {}); + memchr_1_0_2."libc".self_default = hasFeature (memchr_1_0_2.default or {}) || hasFeature (features.memchr_1_0_2.default or {}); + memchr_1_0_2."libc".self_use_std = hasFeature (memchr_1_0_2."use_std" or {}) || hasFeature (features.memchr_1_0_2."use_std" or {}); + libc_0_2_33."use_std".from_memchr_1_0_2__use_std = hasFeature (memchr_1_0_2."use_std" or {}) || hasFeature (features.memchr_1_0_2."use_std" or {}); + libc_0_2_33.default.from_memchr_1_0_2__default_ = false; + })) + [ libc_0_2_33_features ]; + nom_3_2_1 = f: nom_3_2_1_ rec { + dependencies = [ (memchr_1_0_2 f) ]; + features = mkFeatures (f.nom_3_2_1 or {}); }; - nom_3_2_1_features."std".self_default = hasDefault nom_3_2_1_features; - nom_3_2_1_features."stream".self_default = hasDefault nom_3_2_1_features; - nom_3_2_1_features."compiler_error".self_nightly = hasFeature (nom_3_2_1_features."nightly" or {}); - nom_3_2_1_features."regex".self_regexp = hasFeature (nom_3_2_1_features."regexp" or {}); - nom_3_2_1_features."regexp".self_regexp_macros = hasFeature (nom_3_2_1_features."regexp_macros" or {}); - nom_3_2_1_features."lazy_static".self_regexp_macros = hasFeature (nom_3_2_1_features."regexp_macros" or {}); - compiler_error_0_0_0_features."default".from_nom_3_2_1__default = true; - lazy_static_0_0_0_features."default".from_nom_3_2_1__default = true; - memchr_1_0_2_features."use_std".from_nom_3_2_1__std = hasFeature (nom_3_2_1_features."std" or {}); - memchr_1_0_2_features."default".from_nom_3_2_1__default = false; - regex_0_0_0_features."default".from_nom_3_2_1__default = true; - num_traits_0_1_40 = num_traits_0_1_40_ rec {}; - pkg_config_0_3_9 = pkg_config_0_3_9_ rec {}; - 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; + nom_3_2_1_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + nom_3_2_1."std".self_default = hasFeature (nom_3_2_1.default or {}) || hasFeature (features.nom_3_2_1.default or {}); + nom_3_2_1."stream".self_default = hasFeature (nom_3_2_1.default or {}) || hasFeature (features.nom_3_2_1.default or {}); + nom_3_2_1."compiler_error".self_nightly = hasFeature (nom_3_2_1."nightly" or {}) || hasFeature (features.nom_3_2_1."nightly" or {}); + nom_3_2_1."regex".self_regexp = hasFeature (nom_3_2_1."regexp" or {}) || hasFeature (features.nom_3_2_1."regexp" or {}); + nom_3_2_1."regexp".self_regexp_macros = hasFeature (nom_3_2_1."regexp_macros" or {}) || hasFeature (features.nom_3_2_1."regexp_macros" or {}); + nom_3_2_1."lazy_static".self_regexp_macros = hasFeature (nom_3_2_1."regexp_macros" or {}) || hasFeature (features.nom_3_2_1."regexp_macros" or {}); + memchr_1_0_2."use_std".from_nom_3_2_1__use_std = hasFeature (nom_3_2_1."std" or {}) || hasFeature (features.nom_3_2_1."std" or {}); + memchr_1_0_2.default.from_nom_3_2_1__default_ = false; + })) + [ memchr_1_0_2_features ]; + num_traits_0_1_40 = f: num_traits_0_1_40_ rec {}; + num_traits_0_1_40_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + })) + [ ]; + pkg_config_0_3_9 = f: pkg_config_0_3_9_ rec {}; + pkg_config_0_3_9_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + })) + [ ]; + quote_0_3_15 = f: quote_0_3_15_ rec {}; + quote_0_3_15_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + })) + [ ]; + rand_0_3_18 = f: rand_0_3_18_ rec { + dependencies = [ (libc_0_2_33 f) ] + ++ (if kernel == "fuchsia" then [ (fuchsia_zircon_0_2_1 f) ] else []); + features = mkFeatures (f.rand_0_3_18 or {}); }; - rand_0_3_18_features."i128_support".self_nightly = hasFeature (rand_0_3_18_features."nightly" or {}); - libc_0_2_33_features."default".from_rand_0_3_18__default = true; - fuchsia_zircon_0_2_1_features."default".from_rand_0_3_18__default = true; - redox_syscall_0_1_32 = redox_syscall_0_1_32_ rec {}; - redox_termios_0_1_1 = redox_termios_0_1_1_ rec { - dependencies = [ redox_syscall_0_1_32 ]; + rand_0_3_18_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + rand_0_3_18."i128_support".self_nightly = hasFeature (rand_0_3_18."nightly" or {}) || hasFeature (features.rand_0_3_18."nightly" or {}); + fuchsia_zircon_0_2_1.default.from_rand_0_3_18__default_ = true; + libc_0_2_33.default.from_rand_0_3_18__default_ = true; + })) + [ libc_0_2_33_features fuchsia_zircon_0_2_1_features ]; + redox_syscall_0_1_32 = f: redox_syscall_0_1_32_ rec {}; + redox_syscall_0_1_32_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + })) + [ ]; + redox_termios_0_1_1 = f: redox_termios_0_1_1_ rec { + dependencies = [ (redox_syscall_0_1_32 f) ]; }; - redox_syscall_0_1_32_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; + redox_termios_0_1_1_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + redox_syscall_0_1_32.default.from_redox_termios_0_1_1__default_ = true; + })) + [ redox_syscall_0_1_32_features ]; + regex_0_2_2 = f: regex_0_2_2_ rec { + dependencies = [ (aho_corasick_0_6_3 f) (memchr_1_0_2 f) (regex_syntax_0_4_1 f) (thread_local_0_3_4 f) (utf8_ranges_1_0_0 f) ]; + features = mkFeatures (f.regex_0_2_2 or {}); }; - 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 {}; - rusqlite_0_13_0 = rusqlite_0_13_0_ rec { - dependencies = [ bitflags_1_0_1 libsqlite3_sys_0_9_0 lru_cache_0_1_1 time_0_1_38 ]; - features = mkFeatures rusqlite_0_13_0_features; + regex_0_2_2_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + regex_0_2_2."simd".self_simd-accel = hasFeature (regex_0_2_2."simd-accel" or {}) || hasFeature (features.regex_0_2_2."simd-accel" or {}); + aho_corasick_0_6_3.default.from_regex_0_2_2__default_ = true; + memchr_1_0_2.default.from_regex_0_2_2__default_ = true; + regex_syntax_0_4_1.default.from_regex_0_2_2__default_ = true; + thread_local_0_3_4.default.from_regex_0_2_2__default_ = true; + utf8_ranges_1_0_0.default.from_regex_0_2_2__default_ = true; + })) + [ aho_corasick_0_6_3_features memchr_1_0_2_features regex_syntax_0_4_1_features thread_local_0_3_4_features utf8_ranges_1_0_0_features ]; + regex_syntax_0_4_1 = f: regex_syntax_0_4_1_ rec {}; + regex_syntax_0_4_1_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + })) + [ ]; + rusqlite_0_13_0 = f: rusqlite_0_13_0_ rec { + dependencies = [ (bitflags_1_0_1 f) (libsqlite3_sys_0_9_0 f) (lru_cache_0_1_1 f) (time_0_1_38 f) ]; + features = mkFeatures (f.rusqlite_0_13_0 or {}); }; - rusqlite_0_13_0_features."".self = true; - bitflags_1_0_1_features."default".from_rusqlite_0_13_0__default = true; - chrono_0_0_0_features."default".from_rusqlite_0_13_0__default = true; - libsqlite3_sys_0_9_0_features."min_sqlite_version_3_6_11".from_rusqlite_0_13_0__backup = hasFeature (rusqlite_0_13_0_features."backup" or {}); - libsqlite3_sys_0_9_0_features."min_sqlite_version_3_7_4".from_rusqlite_0_13_0__blob = hasFeature (rusqlite_0_13_0_features."blob" or {}); - libsqlite3_sys_0_9_0_features."buildtime_bindgen".from_rusqlite_0_13_0__buildtime_bindgen = hasFeature (rusqlite_0_13_0_features."buildtime_bindgen" or {}); - libsqlite3_sys_0_9_0_features."bundled".from_rusqlite_0_13_0__bundled = hasFeature (rusqlite_0_13_0_features."bundled" or {}); - libsqlite3_sys_0_9_0_features."min_sqlite_version_3_7_3".from_rusqlite_0_13_0__functions = hasFeature (rusqlite_0_13_0_features."functions" or {}); - libsqlite3_sys_0_9_0_features."sqlcipher".from_rusqlite_0_13_0__sqlcipher = hasFeature (rusqlite_0_13_0_features."sqlcipher" or {}); - libsqlite3_sys_0_9_0_features."min_sqlite_version_3_6_23".from_rusqlite_0_13_0__trace = hasFeature (rusqlite_0_13_0_features."trace" or {}); - libsqlite3_sys_0_9_0_features."default".from_rusqlite_0_13_0__default = true; - lru_cache_0_1_1_features."default".from_rusqlite_0_13_0__default = true; - serde_json_0_0_0_features."default".from_rusqlite_0_13_0__default = true; - time_0_1_38_features."default".from_rusqlite_0_13_0__default = true; - rustc_demangle_0_1_5 = rustc_demangle_0_1_5_ rec {}; - serde_1_0_21 = serde_1_0_21_ rec { + rusqlite_0_13_0_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + libsqlite3_sys_0_9_0."min_sqlite_version_3_6_11".from_rusqlite_0_13_0__min_sqlite_version_3_6_11 = hasFeature (rusqlite_0_13_0."backup" or {}) || hasFeature (features.rusqlite_0_13_0."backup" or {}); + libsqlite3_sys_0_9_0."min_sqlite_version_3_7_4".from_rusqlite_0_13_0__min_sqlite_version_3_7_4 = hasFeature (rusqlite_0_13_0."blob" or {}) || hasFeature (features.rusqlite_0_13_0."blob" or {}); + libsqlite3_sys_0_9_0."buildtime_bindgen".from_rusqlite_0_13_0__buildtime_bindgen = hasFeature (rusqlite_0_13_0."buildtime_bindgen" or {}) || hasFeature (features.rusqlite_0_13_0."buildtime_bindgen" or {}); + libsqlite3_sys_0_9_0."bundled".from_rusqlite_0_13_0__bundled = hasFeature (rusqlite_0_13_0."bundled" or {}) || hasFeature (features.rusqlite_0_13_0."bundled" or {}); + libsqlite3_sys_0_9_0."min_sqlite_version_3_7_3".from_rusqlite_0_13_0__min_sqlite_version_3_7_3 = hasFeature (rusqlite_0_13_0."functions" or {}) || hasFeature (features.rusqlite_0_13_0."functions" or {}); + libsqlite3_sys_0_9_0."sqlcipher".from_rusqlite_0_13_0__sqlcipher = hasFeature (rusqlite_0_13_0."sqlcipher" or {}) || hasFeature (features.rusqlite_0_13_0."sqlcipher" or {}); + libsqlite3_sys_0_9_0."min_sqlite_version_3_6_23".from_rusqlite_0_13_0__min_sqlite_version_3_6_23 = hasFeature (rusqlite_0_13_0."trace" or {}) || hasFeature (features.rusqlite_0_13_0."trace" or {}); + bitflags_1_0_1.default.from_rusqlite_0_13_0__default_ = true; + libsqlite3_sys_0_9_0.default.from_rusqlite_0_13_0__default_ = true; + lru_cache_0_1_1.default.from_rusqlite_0_13_0__default_ = true; + time_0_1_38.default.from_rusqlite_0_13_0__default_ = true; + })) + [ bitflags_1_0_1_features libsqlite3_sys_0_9_0_features lru_cache_0_1_1_features time_0_1_38_features ]; + rustc_demangle_0_1_5 = f: rustc_demangle_0_1_5_ rec {}; + rustc_demangle_0_1_5_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + })) + [ ]; + serde_1_0_21 = f: serde_1_0_21_ rec { dependencies = []; - features = mkFeatures serde_1_0_21_features; + features = mkFeatures (f.serde_1_0_21 or {}); }; - serde_1_0_21_features."unstable".self_alloc = hasFeature (serde_1_0_21_features."alloc" or {}); - serde_1_0_21_features."std".self_default = hasDefault serde_1_0_21_features; - serde_1_0_21_features."serde_derive".self_derive = hasFeature (serde_1_0_21_features."derive" or {}); - serde_1_0_21_features."serde_derive".self_playground = hasFeature (serde_1_0_21_features."playground" or {}); - serde_derive_0_0_0_features."default".from_serde_1_0_21__default = true; - serde_derive_1_0_21 = serde_derive_1_0_21_ rec { - dependencies = [ quote_0_3_15 serde_derive_internals_0_17_0 syn_0_11_11 ]; + serde_1_0_21_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + serde_1_0_21."unstable".self_alloc = hasFeature (serde_1_0_21."alloc" or {}) || hasFeature (features.serde_1_0_21."alloc" or {}); + serde_1_0_21."std".self_default = hasFeature (serde_1_0_21.default or {}) || hasFeature (features.serde_1_0_21.default or {}); + serde_1_0_21."serde_derive".self_derive = hasFeature (serde_1_0_21."derive" or {}) || hasFeature (features.serde_1_0_21."derive" or {}); + serde_1_0_21."serde_derive".self_playground = hasFeature (serde_1_0_21."playground" or {}) || hasFeature (features.serde_1_0_21."playground" or {}); + })) + [ ]; + serde_derive_1_0_21 = f: serde_derive_1_0_21_ rec { + dependencies = [ (quote_0_3_15 f) (serde_derive_internals_0_17_0 f) (syn_0_11_11 f) ]; }; - quote_0_3_15_features."default".from_serde_derive_1_0_21__default = true; - serde_derive_internals_0_17_0_features."default".from_serde_derive_1_0_21__default = false; - syn_0_11_11_features."visit".from_serde_derive_1_0_21 = true; - syn_0_11_11_features."default".from_serde_derive_1_0_21__default = true; - serde_derive_internals_0_17_0 = serde_derive_internals_0_17_0_ rec { - dependencies = [ syn_0_11_11 synom_0_11_3 ]; + serde_derive_1_0_21_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + syn_0_11_11."visit".from_serde_derive_1_0_21 = true; + quote_0_3_15.default.from_serde_derive_1_0_21__default_ = true; + serde_derive_internals_0_17_0.default.from_serde_derive_1_0_21__default_ = false; + syn_0_11_11.default.from_serde_derive_1_0_21__default_ = true; + })) + [ quote_0_3_15_features serde_derive_internals_0_17_0_features syn_0_11_11_features ]; + serde_derive_internals_0_17_0 = f: serde_derive_internals_0_17_0_ rec { + dependencies = [ (syn_0_11_11 f) (synom_0_11_3 f) ]; }; - syn_0_11_11_features."parsing".from_serde_derive_internals_0_17_0 = true; - syn_0_11_11_features."default".from_serde_derive_internals_0_17_0__default = false; - synom_0_11_3_features."default".from_serde_derive_internals_0_17_0__default = true; - serde_json_1_0_6 = serde_json_1_0_6_ rec { - dependencies = [ dtoa_0_4_2 itoa_0_3_4 num_traits_0_1_40 serde_1_0_21 ]; - features = mkFeatures serde_json_1_0_6_features; + serde_derive_internals_0_17_0_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + syn_0_11_11."parsing".from_serde_derive_internals_0_17_0 = true; + syn_0_11_11.default.from_serde_derive_internals_0_17_0__default_ = false; + synom_0_11_3.default.from_serde_derive_internals_0_17_0__default_ = true; + })) + [ syn_0_11_11_features synom_0_11_3_features ]; + serde_json_1_0_6 = f: serde_json_1_0_6_ rec { + dependencies = [ (dtoa_0_4_2 f) (itoa_0_3_4 f) (num_traits_0_1_40 f) (serde_1_0_21 f) ]; + features = mkFeatures (f.serde_json_1_0_6 or {}); }; - serde_json_1_0_6_features."linked-hash-map".self_preserve_order = hasFeature (serde_json_1_0_6_features."preserve_order" or {}); - dtoa_0_4_2_features."default".from_serde_json_1_0_6__default = true; - itoa_0_3_4_features."default".from_serde_json_1_0_6__default = true; - linked_hash_map_0_0_0_features."default".from_serde_json_1_0_6__default = true; - num_traits_0_1_40_features."default".from_serde_json_1_0_6__default = true; - serde_1_0_21_features."default".from_serde_json_1_0_6__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; + serde_json_1_0_6_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + serde_json_1_0_6."linked-hash-map".self_preserve_order = hasFeature (serde_json_1_0_6."preserve_order" or {}) || hasFeature (features.serde_json_1_0_6."preserve_order" or {}); + dtoa_0_4_2.default.from_serde_json_1_0_6__default_ = true; + itoa_0_3_4.default.from_serde_json_1_0_6__default_ = true; + num_traits_0_1_40.default.from_serde_json_1_0_6__default_ = true; + serde_1_0_21.default.from_serde_json_1_0_6__default_ = true; + })) + [ dtoa_0_4_2_features itoa_0_3_4_features num_traits_0_1_40_features serde_1_0_21_features ]; + strsim_0_6_0 = f: strsim_0_6_0_ rec {}; + strsim_0_6_0_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + })) + [ ]; + syn_0_11_11 = f: syn_0_11_11_ rec { + dependencies = [ ] + ++ (if hasFeature (f.syn_0_11_11."quote" or {}) then [(quote_0_3_15 f)] else []) + ++ (if hasFeature (f.syn_0_11_11."synom" or {}) then [(synom_0_11_3 f)] else []) + ++ (if hasFeature (f.syn_0_11_11."unicode-xid" or {}) then [(unicode_xid_0_0_4 f)] else []); + features = mkFeatures (f.syn_0_11_11 or {}); }; - 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 ]; + syn_0_11_11_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + syn_0_11_11."parsing".self_default = hasFeature (syn_0_11_11.default or {}) || hasFeature (features.syn_0_11_11.default or {}); + syn_0_11_11."printing".self_default = hasFeature (syn_0_11_11.default or {}) || hasFeature (features.syn_0_11_11.default or {}); + syn_0_11_11."unicode-xid".self_parsing = hasFeature (syn_0_11_11."parsing" or {}) || hasFeature (features.syn_0_11_11."parsing" or {}); + syn_0_11_11."synom".self_parsing = hasFeature (syn_0_11_11."parsing" or {}) || hasFeature (features.syn_0_11_11."parsing" or {}); + syn_0_11_11."quote".self_printing = hasFeature (syn_0_11_11."printing" or {}) || hasFeature (features.syn_0_11_11."printing" or {}); + quote_0_3_15.default.from_syn_0_11_11__default_ = true; + synom_0_11_3.default.from_syn_0_11_11__default_ = true; + unicode_xid_0_0_4.default.from_syn_0_11_11__default_ = true; + })) + [ quote_0_3_15_features synom_0_11_3_features unicode_xid_0_0_4_features ]; + synom_0_11_3 = f: synom_0_11_3_ rec { + dependencies = [ (unicode_xid_0_0_4 f) ]; }; - unicode_xid_0_0_4_features."default".from_synom_0_11_3__default = true; - tempdir_0_3_5 = tempdir_0_3_5_ rec { - dependencies = [ rand_0_3_18 ]; + synom_0_11_3_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + unicode_xid_0_0_4.default.from_synom_0_11_3__default_ = true; + })) + [ unicode_xid_0_0_4_features ]; + tempdir_0_3_5 = f: tempdir_0_3_5_ rec { + dependencies = [ (rand_0_3_18 f) ]; }; - rand_0_3_18_features."default".from_tempdir_0_3_5__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_32 redox_termios_0_1_1 ] else []); + tempdir_0_3_5_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + rand_0_3_18.default.from_tempdir_0_3_5__default_ = true; + })) + [ rand_0_3_18_features ]; + termion_1_5_1 = f: termion_1_5_1_ rec { + dependencies = (if !(kernel == "redox") then [ (libc_0_2_33 f) ] else []) + ++ (if kernel == "redox" then [ (redox_syscall_0_1_32 f) (redox_termios_0_1_1 f) ] else []); }; - libc_0_2_33_features."default".from_termion_1_5_1__default = true; - redox_syscall_0_1_32_features."default".from_termion_1_5_1__default = true; - redox_termios_0_1_1_features."default".from_termion_1_5_1__default = true; - textwrap_0_9_0 = textwrap_0_9_0_ rec { - dependencies = [ unicode_width_0_1_4 ]; + termion_1_5_1_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + libc_0_2_33.default.from_termion_1_5_1__default_ = true; + redox_syscall_0_1_32.default.from_termion_1_5_1__default_ = true; + redox_termios_0_1_1.default.from_termion_1_5_1__default_ = true; + })) + [ libc_0_2_33_features redox_syscall_0_1_32_features redox_termios_0_1_1_features ]; + textwrap_0_9_0 = f: textwrap_0_9_0_ rec { + dependencies = [ (unicode_width_0_1_4 f) ]; }; - hyphenation_0_0_0_features."default".from_textwrap_0_9_0__default = true; - term_size_0_0_0_features."default".from_textwrap_0_9_0__default = true; - unicode_width_0_1_4_features."default".from_textwrap_0_9_0__default = true; - thread_local_0_3_4 = thread_local_0_3_4_ rec { - dependencies = [ lazy_static_0_2_11 unreachable_1_0_0 ]; + textwrap_0_9_0_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + unicode_width_0_1_4.default.from_textwrap_0_9_0__default_ = true; + })) + [ unicode_width_0_1_4_features ]; + thread_local_0_3_4 = f: thread_local_0_3_4_ rec { + dependencies = [ (lazy_static_0_2_11 f) (unreachable_1_0_0 f) ]; }; - lazy_static_0_2_11_features."default".from_thread_local_0_3_4__default = true; - unreachable_1_0_0_features."default".from_thread_local_0_3_4__default = true; - time_0_1_38 = time_0_1_38_ rec { - dependencies = [ libc_0_2_33 ] - ++ (if kernel == "redox" then [ redox_syscall_0_1_32 ] else []) - ++ (if kernel == "windows" then [ kernel32_sys_0_2_2 winapi_0_2_8 ] else []); + thread_local_0_3_4_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + lazy_static_0_2_11.default.from_thread_local_0_3_4__default_ = true; + unreachable_1_0_0.default.from_thread_local_0_3_4__default_ = true; + })) + [ lazy_static_0_2_11_features unreachable_1_0_0_features ]; + time_0_1_38 = f: time_0_1_38_ rec { + dependencies = [ (libc_0_2_33 f) ] + ++ (if kernel == "redox" then [ (redox_syscall_0_1_32 f) ] else []) + ++ (if kernel == "windows" then [ (kernel32_sys_0_2_2 f) (winapi_0_2_8 f) ] else []); }; - libc_0_2_33_features."default".from_time_0_1_38__default = true; - rustc_serialize_0_0_0_features."default".from_time_0_1_38__default = true; - redox_syscall_0_1_32_features."default".from_time_0_1_38__default = true; - kernel32_sys_0_2_2_features."default".from_time_0_1_38__default = true; - winapi_0_2_8_features."default".from_time_0_1_38__default = true; - toml_0_4_5 = toml_0_4_5_ rec { - dependencies = [ serde_1_0_21 ]; + time_0_1_38_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + kernel32_sys_0_2_2.default.from_time_0_1_38__default_ = true; + libc_0_2_33.default.from_time_0_1_38__default_ = true; + redox_syscall_0_1_32.default.from_time_0_1_38__default_ = true; + winapi_0_2_8.default.from_time_0_1_38__default_ = true; + })) + [ libc_0_2_33_features redox_syscall_0_1_32_features kernel32_sys_0_2_2_features winapi_0_2_8_features ]; + toml_0_4_5 = f: toml_0_4_5_ rec { + dependencies = [ (serde_1_0_21 f) ]; }; - serde_1_0_21_features."default".from_toml_0_4_5__default = true; - unicode_width_0_1_4 = unicode_width_0_1_4_ rec { - features = mkFeatures unicode_width_0_1_4_features; + toml_0_4_5_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + serde_1_0_21.default.from_toml_0_4_5__default_ = true; + })) + [ serde_1_0_21_features ]; + unicode_width_0_1_4 = f: unicode_width_0_1_4_ rec { + features = mkFeatures (f.unicode_width_0_1_4 or {}); }; - unicode_width_0_1_4_features."".self = true; - unicode_xid_0_0_4 = unicode_xid_0_0_4_ rec { - features = mkFeatures unicode_xid_0_0_4_features; + unicode_width_0_1_4_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + })) + [ ]; + unicode_xid_0_0_4 = f: unicode_xid_0_0_4_ rec { + features = mkFeatures (f.unicode_xid_0_0_4 or {}); }; - unicode_xid_0_0_4_features."".self = true; - unreachable_1_0_0 = unreachable_1_0_0_ rec { - dependencies = [ void_1_0_2 ]; + unicode_xid_0_0_4_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + })) + [ ]; + unreachable_1_0_0 = f: unreachable_1_0_0_ rec { + dependencies = [ (void_1_0_2 f) ]; }; - void_1_0_2_features."default".from_unreachable_1_0_0__default = false; - utf8_ranges_1_0_0 = utf8_ranges_1_0_0_ rec {}; - vcpkg_0_2_2 = vcpkg_0_2_2_ rec {}; - vec_map_0_8_0 = vec_map_0_8_0_ rec { + unreachable_1_0_0_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + void_1_0_2.default.from_unreachable_1_0_0__default_ = false; + })) + [ void_1_0_2_features ]; + utf8_ranges_1_0_0 = f: utf8_ranges_1_0_0_ rec {}; + utf8_ranges_1_0_0_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + })) + [ ]; + vcpkg_0_2_2 = f: vcpkg_0_2_2_ rec {}; + vcpkg_0_2_2_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + })) + [ ]; + vec_map_0_8_0 = f: vec_map_0_8_0_ rec { dependencies = []; - features = mkFeatures vec_map_0_8_0_features; + features = mkFeatures (f.vec_map_0_8_0 or {}); }; - vec_map_0_8_0_features."serde".self_eders = hasFeature (vec_map_0_8_0_features."eders" or {}); - vec_map_0_8_0_features."serde_derive".self_eders = hasFeature (vec_map_0_8_0_features."eders" or {}); - serde_0_0_0_features."default".from_vec_map_0_8_0__default = true; - serde_derive_0_0_0_features."default".from_vec_map_0_8_0__default = true; - void_1_0_2 = void_1_0_2_ rec { - features = mkFeatures void_1_0_2_features; + vec_map_0_8_0_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + vec_map_0_8_0."serde".self_eders = hasFeature (vec_map_0_8_0."eders" or {}) || hasFeature (features.vec_map_0_8_0."eders" or {}); + vec_map_0_8_0."serde_derive".self_eders = hasFeature (vec_map_0_8_0."eders" or {}) || hasFeature (features.vec_map_0_8_0."eders" or {}); + })) + [ ]; + void_1_0_2 = f: void_1_0_2_ rec { + features = mkFeatures (f.void_1_0_2 or {}); }; - void_1_0_2_features."std".self_default = hasDefault void_1_0_2_features; - winapi_0_2_8 = winapi_0_2_8_ rec {}; - winapi_build_0_1_1 = winapi_build_0_1_1_ rec {}; + void_1_0_2_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + void_1_0_2."std".self_default = hasFeature (void_1_0_2.default or {}) || hasFeature (features.void_1_0_2.default or {}); + })) + [ ]; + winapi_0_2_8 = f: winapi_0_2_8_ rec {}; + winapi_0_2_8_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + })) + [ ]; + winapi_build_0_1_1 = f: winapi_build_0_1_1_ rec {}; + winapi_build_0_1_1_features = features: + lib.lists.foldl' (features: f: f features) + (lib.attrsets.recursiveUpdate features (rec { + })) + [ ]; } diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 57948c33bbc..d720532e147 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation (args // { 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 @@ -60,7 +60,6 @@ in stdenv.mkDerivation (args // { 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 9b3ba530339..19cffcd9c14 100644 --- a/pkgs/build-support/rust/fetchcargo.nix +++ b/pkgs/build-support/rust/fetchcargo.nix @@ -2,7 +2,7 @@ { name ? "cargo-deps", src, srcs, sourceRoot, sha256, cargoUpdateHook ? "" }: stdenv.mkDerivation { name = "${name}-vendor"; - buildInputs = [ cacert cargoVendor git rust.cargo ]; + nativeBuildInputs = [ cacert cargoVendor git rust.cargo ]; inherit src srcs sourceRoot; phases = "unpackPhase installPhase"; @@ -19,7 +19,6 @@ stdenv.mkDerivation { exit 1 fi - export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt export CARGO_HOME=$(mktemp -d cargo-home.XXX) cargo vendor diff --git a/pkgs/build-support/safe-discard-string-context.nix b/pkgs/build-support/safe-discard-string-context.nix new file mode 100644 index 00000000000..293a15295d5 --- /dev/null +++ b/pkgs/build-support/safe-discard-string-context.nix @@ -0,0 +1,14 @@ +# | Discard the context of a string while ensuring that expected path +# validity invariants hold. +# +# This relies on import-from-derivation, but it is only useful in +# contexts where the string is going to be used in an +# import-from-derivation anyway. +# +# safeDiscardStringContext : String → String +{ writeText }: s: + builtins.seq + (import (writeText + "discard.nix" + "${builtins.substring 0 0 s}null\n")) + (builtins.unsafeDiscardStringContext s) diff --git a/pkgs/build-support/setup-hooks/find-xml-catalogs.sh b/pkgs/build-support/setup-hooks/find-xml-catalogs.sh index b742d5a8ffd..85364a61f61 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/set-java-classpath.sh b/pkgs/build-support/setup-hooks/set-java-classpath.sh index 047da91bc97..5d3548dc2e8 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 2fd2a2d6da6..96bf48cf123 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 a33968ca18d..fc4c7bfbaf9 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/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh index 79b8d5b73fa..25ac12996cc 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/vm/default.nix b/pkgs/build-support/vm/default.nix index e31f513c666..d599f9bbb65 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_mmio" "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" ] + ++ 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,8 +23,6 @@ rec { patches = [ ../../../nixos/modules/virtualisation/azure-qemu-220-no-etc-install.patch ]; }); - qemuProg = "${qemu}/bin/qemu-kvm"; - modulesClosure = makeModulesClosure { inherit kernel rootModules; @@ -196,22 +196,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 ''; @@ -223,8 +222,6 @@ rec { mkdir xchg mv saved-env xchg/ - diskImage=''${diskImage:-/dev/null} - eval "$preVM" if [ "$enableParallelBuilding" = 1 ]; then @@ -240,7 +237,7 @@ rec { # the -K option to preserve the temporary build directory). cat > ./run-vm <"$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 | grep "output path .* has .* hash .* when .* was expected" | head -n1 | tr -dc '\040-\177' | tr -d "'" | awk '{ print $(NF-4) }') fi if [ -z "$newHash" ]; then @@ -82,6 +82,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/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index b77b79338c7..0e6a0450bb4 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.14"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz"; - sha256 = "6f6d79d991fed04e16e7c7a15705304b0b9d51de772c51c57428555039fbe093"; + sha256 = "0wf9ymqxk1k5xwcl3n919p66a1aayif3x4cahj4w04y3k1wbhlih"; }; 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/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 1951429fa90..68a1fb92cc8 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -32,7 +32,7 @@ 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 peterhoeg ]; platforms = platforms.linux; diff --git a/pkgs/data/fonts/clearlyU/default.nix b/pkgs/data/fonts/clearlyU/default.nix index 1e4df0c9221..cbca697cb26 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 91c8ed1163d..8c45c813953 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 60e1eff2c9d..23158a38f21 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"; diff --git a/pkgs/data/fonts/dina-pcf/default.nix b/pkgs/data/fonts/dina-pcf/default.nix index b94004b24bb..975bbc1749a 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/envypn-font/default.nix b/pkgs/data/fonts/envypn-font/default.nix index 40880d022db..0e31231d05f 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 de52ae411ef..7d05482ef5f 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/gentium/default.nix b/pkgs/data/fonts/gentium/default.nix index 2e2ffdeb5bb..829eca8c06f 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 f4043697e7b..7936a216ada 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 f997f10db1d..0edd27dab0e 100644 --- a/pkgs/data/fonts/hack/default.nix +++ b/pkgs/data/fonts/hack/default.nix @@ -37,6 +37,5 @@ in fetchzip rec { */ license = licenses.free; platforms = platforms.all; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/data/fonts/inconsolata/lgc.nix b/pkgs/data/fonts/inconsolata/lgc.nix index aa7d3d7def4..8563e0e112a 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/kochi-substitute/default.nix b/pkgs/data/fonts/kochi-substitute/default.nix index f49d20e3ba7..5815b84f21a 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 3fac3024dd4..b7985578998 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 = '' diff --git a/pkgs/data/fonts/meslo-lg/default.nix b/pkgs/data/fonts/meslo-lg/default.nix index 8a11a98ebd2..d95aea26c8d 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/nafees/default.nix b/pkgs/data/fonts/nafees/default.nix index 054c2ca91f6..b39a59d1ba7 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/open-dyslexic/default.nix b/pkgs/data/fonts/open-dyslexic/default.nix index 9b132463972..40a9be3282e 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 b27290707b6..81fc7b79925 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 895ef3dae0f..5ebb365ecdf 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/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix index 3fbcefc3187..88d438096c1 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/roboto/default.nix b/pkgs/data/fonts/roboto/default.nix index 00c4bb7fb88..26697c52327 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/tempora-lgc/default.nix b/pkgs/data/fonts/tempora-lgc/default.nix index d0e7b89888c..1cab3da200e 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 e499eb412ba..32d859bf53b 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/twemoji-color-font/default.nix b/pkgs/data/fonts/twemoji-color-font/default.nix new file mode 100644 index 00000000000..9173387a4c7 --- /dev/null +++ b/pkgs/data/fonts/twemoji-color-font/default.nix @@ -0,0 +1,39 @@ +{ 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"; + + 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 75ab2f40b6f..996d1192397 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 ce18893ced7..2a13824b36f 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 29d5060d401..e56807a434e 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 092537c216a..c4969d046d4 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/icons/hicolor-icon-theme/setup-hook.sh b/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh index 05ab9b3d65d..29306cb316a 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/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 1dd268cf816..3de3dbe110c 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.mkDerivation rec { - version = "17-09-13"; + version = "17-12-25"; package-name = "numix-icon-theme-circle"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "numixproject"; repo = package-name; rev = version; - sha256 = "14ck07j9v0yh8ky191sa3xxi4qh7bbg84i8jijy3kbjcx9s0zl8a"; + sha256 = "10sn2w9xzmh7arbw0vn516p9nfym1bs8bf7i8zzvz7y09s61lkxh"; }; buildInputs = [ numix-icon-theme ]; diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 90040c8fc28..503a66b736f 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${package-name}-${version}"; package-name = "numix-icon-theme-square"; - version = "17-09-13"; + version = "17-12-25"; src = fetchFromGitHub { owner = "numixproject"; repo = package-name; rev = version; - sha256 = "1grpm902hiid561fbp9y1rb9z21y8d1krjgxgs7j8qnpx380sd5x"; + sha256 = "07rcfkz3c1z5fwqiib4r1bm964mpwf1f128xm8kz55xp6w1c7zgl"; }; buildInputs = [ numix-icon-theme ]; diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index a7c6c490897..08fd012bb41 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, hicolor_icon_theme }: stdenv.mkDerivation rec { - version = "2017-11-18"; + version = "17-12-25"; package-name = "numix-icon-theme"; @@ -10,10 +10,12 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "numixproject"; repo = package-name; - rev = "ea7f2069ca1f6190494e96aa2febcadf6248c5b4"; - sha256 = "1nk0mc2qycwmjqdlrsfgar5m83pyj3hf6f66pywf9706nn2yz8fv"; + rev = version; + sha256 = "0q3hpq2jc9iwnzzqpb12g1qzjsw4ckhdqkfqf6nirl87r5drkv6j"; }; + buildInputs = [ hicolor_icon_theme ]; + dontBuild = true; installPhase = '' diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix index 9e793caf9de..f161d6fbbd6 100644 --- a/pkgs/data/icons/paper-icon-theme/default.nix +++ b/pkgs/data/icons/paper-icon-theme/default.nix @@ -3,21 +3,17 @@ stdenv.mkDerivation rec { name = "${package-name}-${version}"; package-name = "paper-icon-theme"; - version = "2017-02-13"; + version = "2017-11-20"; src = fetchFromGitHub { owner = "snwh"; repo = package-name; - rev = "fcaf8bb2aacdd1bb7dcde3d45ef92d0751567e8e"; - sha256 = "1l1w99411jrv4l7jr5dvwszghrncsir23c7lpc26gh2f0ydf3d0d"; + rev = "af0296ecc872ad723fad7dca6e7e89eb85cbb3a8"; + sha256 = "18a9zl9lbw9gc3zas49w329xrps4slvkp4nv815nlnmimz8dj85m"; }; nativeBuildInputs = [ autoreconfHook ]; - postPatch = '' - substituteInPlace Makefile.am --replace '$(DESTDIR)'/usr $out - ''; - meta = with stdenv.lib; { description = "Modern icon theme designed around bold colours and simple geometric shapes"; homepage = https://snwh.org/paper; diff --git a/pkgs/data/misc/adapta-backgrounds/default.nix b/pkgs/data/misc/adapta-backgrounds/default.nix index 35655cf851b..41f704e750c 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.5.1.1"; + version = "0.5.2.3"; src = fetchFromGitHub { owner = "adapta-project"; repo = "adapta-backgrounds"; rev = version; - sha256 = "00gwiraq6c9jh1xl5mmmi5fdj9l3r75ii5wk8jnw856qvrajhxyq"; + 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/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index 275ae6dc2d8..91af84c4224 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -52,6 +52,8 @@ stdenv.mkDerivation rec { cp -v ca-bundle.crt $out/etc/ssl/certs ''; + 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 00000000000..b704a6a919e --- /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/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index 5f449702031..309ae47a851 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { 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 91d38f3537e..bdf2abf9b6f 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/00012ce23948b9547fe6609d595109741e0f58cf.tar.gz"; + sha256 = "1swgfx7b41jxq0pyws2wipdiyvy8nn6cp54yj3ip3r9l3gdv3f7b"; } diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix index 249f0e5dcb9..6b1abad02d7 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 = "20180108"; src = fetchurl { url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz"; - sha256 = "0pbmq95gdkp66cljwklv4gzh8lvl30l4k77hfwvrxz5mfqia6qdd"; + sha256 = "1x4jacrvjwcsan88rg2wf2a8bajsglg6w4396vbr18zh0sya84a2"; }; installPhase = '' diff --git a/pkgs/data/misc/scowl/default.nix b/pkgs/data/misc/scowl/default.nix index 2769ed1a166..5e4d17bcc8f 100644 --- a/pkgs/data/misc/scowl/default.nix +++ b/pkgs/data/misc/scowl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, unzip, zip, perl, aspell, dos2unix}: +{stdenv, fetchFromGitHub, unzip, zip, perl, aspell, dos2unix, singleWordlist ? null}: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "scowl"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}$PWD/varcon" ''; - postBuild = '' + postBuild = stdenv.lib.optionalString (singleWordlist == null) '' ( cd scowl/speller make aspell @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; - installPhase = '' + installPhase = if singleWordlist == null then '' eval "$preInstall" mkdir -p "$out/share/scowl" @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { fi echo $region $regcode $regcode_sz - for s in 10 20 30 35 40 50 55 60 70 80 90; do + 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" @@ -88,6 +88,10 @@ stdenv.mkDerivation rec { ) eval "$postInstall" + '' else '' + mkdir -p "$out/share/dict" + cd scowl + ./mk-list ${singleWordlist} > "$out/share/dict/words.txt" ''; meta = { diff --git a/pkgs/data/misc/sound-theme-freedesktop/default.nix b/pkgs/data/misc/sound-theme-freedesktop/default.nix index 7c3f045b1b7..043d3d65b84 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/tzdata-setup-hook.sh b/pkgs/data/misc/tzdata/tzdata-setup-hook.sh index 9ae9b46d85c..9975d0aec31 100644 --- a/pkgs/data/misc/tzdata/tzdata-setup-hook.sh +++ b/pkgs/data/misc/tzdata/tzdata-setup-hook.sh @@ -2,5 +2,4 @@ tzdataHook() { export TZDIR=@out@/share/zoneinfo } -envHooks+=(tzdataHook) -crossEnvHooks+=(tzdataHook) +addEnvHooks "$targetOffset" tzdataHook diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix index b69762d933f..70f217f1b7e 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/desktops/enlightenment/rage.nix b/pkgs/desktops/enlightenment/rage.nix index 5f6a451d065..9b3bdc90eb5 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, curl, 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 ]; diff --git a/pkgs/desktops/gnome-3/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/apps/bijiben/default.nix index ddff55c96a0..ca266d73fd3 100644 --- a/pkgs/desktops/gnome-3/apps/bijiben/default.nix +++ b/pkgs/desktops/gnome-3/apps/bijiben/default.nix @@ -8,7 +8,6 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; doCheck = true; - checkPhase = "meson test"; patches = [ ./no-update-icon-cache.patch diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix index 15f1f58b558..a354c4f6316 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, gjs, gdk_pixbuf, librsvg }: +, intltool, gobjectIntrospection, gjs, gdk_pixbuf, librsvg }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ]; buildInputs = [ - gtk3 wrapGAppsHook intltool gjs gdk_pixbuf + gtk3 gjs gdk_pixbuf gobjectIntrospection librsvg gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix index df8c6befc60..5441f1e5edc 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { prePatch = "patchShebangs build-aux/"; - checkPhase = "meson test"; - meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Clocks; description = "Clock application designed for GNOME 3"; 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 00000000000..2fd0dfa5ac9 --- /dev/null +++ b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix @@ -0,0 +1,47 @@ +{ stdenv +, intltool +, fetchurl +, pkgconfig +, gtk3 +, glib +, meson +, ninja +, upower +, desktop_file_utils +, wrapGAppsHook +, gnome3 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + nativeBuildInputs = [ + meson + ninja + pkgconfig + wrapGAppsHook + intltool + + # needed by meson_post_install.sh + glib.dev + desktop_file_utils + ]; + + buildInputs = [ + gtk3 + glib + upower + gnome3.defaultIconTheme + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://projects.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-power-manager/src.nix b/pkgs/desktops/gnome-3/apps/gnome-power-manager/src.nix new file mode 100644 index 00000000000..bdffa453504 --- /dev/null +++ b/pkgs/desktops/gnome-3/apps/gnome-power-manager/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-power-manager-3.26.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-power-manager/3.26/gnome-power-manager-3.26.0.tar.xz; + sha256 = "20aee0b0b4015e7cc6fbabc3cbc4344c07c230fe3d195e90c8ae0dc5d55a2d4e"; + }; +} diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix index 49ad25a8c5e..ae0abfd7150 100644 --- a/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/core/eog/default.nix @@ -1,10 +1,10 @@ { fetchurl, stdenv, gettext, pkgconfig, itstool, libxml2, libjpeg, gnome3 -, shared_mime_info, wrapGAppsHook, librsvg, libexif }: +, shared_mime_info, wrapGAppsHook, librsvg, libexif, gobjectIntrospection }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook ]; + nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook gobjectIntrospection ]; buildInputs = with gnome3; [ libxml2 libjpeg gtk glib libpeas librsvg diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index 8c87609f85c..6dafa160b1f 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { postFixup = '' # Patched meson does not add internal libraries to rpath - for f in bin/.epiphany-wrapped libexec/.epiphany-search-provider-wrapped libexec/epiphany/.ephy-profile-migrator-wrapped lib/epiphany/web-extensions/libephywebextension.so; do - patchelf --set-rpath "$out/lib/epiphany:$(patchelf --print-rpath $out/$f)" "$out/$f" + for f in $out/bin/.*-wrapped $out/libexec/.*-wrapped $out/libexec/epiphany/.*-wrapped $out/lib/epiphany/*.so $out/lib/epiphany/web-extensions/*.so; do + patchelf --set-rpath "$out/lib/epiphany:$(patchelf --print-rpath $f)" "$f" done ''; diff --git a/pkgs/desktops/gnome-3/core/gconf/default.nix b/pkgs/desktops/gnome-3/core/gconf/default.nix index 1729ec06623..99883c8a3f6 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 }: +, intltool, polkit, orbit, python, withGtk ? false }: assert withGtk -> (gnome3 != null); @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr"; }; - buildInputs = [ libxml2 polkit orbit ] ++ stdenv.lib.optional withGtk gnome3.gtk; + buildInputs = [ libxml2 polkit orbit python ] ++ stdenv.lib.optional withGtk gnome3.gtk; propagatedBuildInputs = [ glib dbus_glib ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix index 9eaad021d32..3dbb4e32654 100644 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, gtk3, intltool, glib -, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra_gtk3 }: +, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra_gtk3, gobjectIntrospection }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - nativeBuildInputs = [ meson ninja intltool itstool pkgconfig libxml2 wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja intltool itstool pkgconfig libxml2 wrapGAppsHook gobjectIntrospection ]; buildInputs = [ glib gtk3 udev libnotify libcanberra_gtk3 gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix index 72d1602eee4..6cfdd45c2f9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { desktop_file_utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43]; buildInputs = [ gtk glib gnome3.gsettings_desktop_schemas ]; - checkPhase = "meson test"; - meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Dictionary; description = "Dictionary is the GNOME application to look up definitions"; 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 cdf119d83a3..dade56158fb 100644 --- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix @@ -7,8 +7,6 @@ stdenv.mkDerivation rec { doCheck = true; - checkPhase = "meson test"; - nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook libxml2 ]; buildInputs = [ gtk3 glib gnome3.gnome_desktop gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index 6a6722c3b60..d4f5835ed3a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; buildInputs = with gnome3; [ - dbus libgcrypt pam gtk3 gconf libgnome_keyring + dbus libgcrypt pam gtk3 libgnome_keyring pango gcr gdk_pixbuf atk p11_kit ]; @@ -30,7 +30,8 @@ stdenv.mkDerivation rec { patchShebangs build ''; - doCheck = true; + # Tests are not deterministic https://bugzilla.gnome.org/show_bug.cgi?id=791932 + doCheck = false; checkPhase = '' export HOME=$(mktemp -d) dbus-run-session \ diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix index 69a967d6d24..5986b07229f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix @@ -7,9 +7,6 @@ stdenv.mkDerivation rec { doCheck = true; - checkPhase = "meson test"; - - postPatch = '' chmod +x build-aux/postinstall.py # patchShebangs requires executable file patchShebangs build-aux/postinstall.py diff --git a/pkgs/desktops/gnome-3/core/grilo/setup-hook.sh b/pkgs/desktops/gnome-3/core/grilo/setup-hook.sh index 3291e38addb..9337c520a20 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/gtksourceview/default.nix b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix index 363cf1a0c4a..45001e55127 100644 --- a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix @@ -1,7 +1,9 @@ { stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango -, libxml2, perl, intltool, gettext, gnome3, dbus, xvfb_run, shared_mime_info }: +, libxml2, perl, intltool, gettext, gnome3, gobjectIntrospection, dbus, xvfb_run, shared_mime_info }: -stdenv.mkDerivation rec { +let + checkInputs = [ xvfb_run dbus ]; +in stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; propagatedBuildInputs = [ @@ -13,10 +15,10 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig intltool gettext perl ] + nativeBuildInputs = [ pkgconfig intltool gettext perl gobjectIntrospection ] ++ stdenv.lib.optionals doCheck checkInputs; + buildInputs = [ atk cairo glib pango libxml2 ]; - checkInputs = [ xvfb_run dbus ]; preBuild = '' substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share" @@ -24,7 +26,7 @@ stdenv.mkDerivation rec { patches = [ ./nix_share_path.patch ]; - doCheck = true; + doCheck = stdenv.isLinux; checkPhase = '' export NO_AT_BRIDGE=1 xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix index 58d9901ad01..731ff7e2688 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix @@ -1,7 +1,7 @@ { stdenv, intltool, fetchurl, pkgconfig, gtk3 , glib, desktop_file_utils, bash, appdata-tools , wrapGAppsHook, gnome3, itstool, libxml2 -, callPackage, unzip }: +, callPackage, unzip, gobjectIntrospection }: # TODO: icons and theme still does not work # use packaged gnome3.adwaita-icon-theme @@ -15,11 +15,12 @@ stdenv.mkDerivation rec { 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 ]; unicode-data = callPackage ./unicode-data.nix {}; diff --git a/pkgs/desktops/gnome-3/core/libcroco/default.nix b/pkgs/desktops/gnome-3/core/libcroco/default.nix index 4141afeb821..744ec3c2fe6 100644 --- a/pkgs/desktops/gnome-3/core/libcroco/default.nix +++ b/pkgs/desktops/gnome-3/core/libcroco/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, glib }: +{ stdenv, fetchurl, pkgconfig, libxml2, glib, fetchpatch }: stdenv.mkDerivation rec { name = "libcroco-0.6.12"; @@ -8,6 +8,19 @@ stdenv.mkDerivation rec { 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"; diff --git a/pkgs/desktops/gnome-3/core/libgepub/default.nix b/pkgs/desktops/gnome-3/core/libgepub/default.nix index f1e13e10fd9..10d676d11d6 100644 --- a/pkgs/desktops/gnome-3/core/libgepub/default.nix +++ b/pkgs/desktops/gnome-3/core/libgepub/default.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { doCheck = true; - checkPhase = "meson test"; - nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ]; buildInputs = [ glib webkitgtk libsoup libxml2 libarchive ]; diff --git a/pkgs/desktops/gnome-3/core/libpeas/default.nix b/pkgs/desktops/gnome-3/core/libpeas/default.nix index 8fddd8f7d5a..998a1a02b3f 100644 --- a/pkgs/desktops/gnome-3/core/libpeas/default.nix +++ b/pkgs/desktops/gnome-3/core/libpeas/default.nix @@ -8,7 +8,11 @@ stdenv.mkDerivation rec { 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/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index 27a1e4b0be5..e4213b240a2 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -1,13 +1,17 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, wrapGAppsHook , cairo, gdk_pixbuf, colord, glib, gtk, gusb, packagekit, libwebp -, libxml2, sane-backends, vala, gnome3 }: +, libxml2, sane-backends, vala, gnome3, gobjectIntrospection }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; buildInputs = [ cairo gdk_pixbuf colord glib gnome3.defaultIconTheme gusb gtk libwebp packagekit sane-backends vala ]; - nativeBuildInputs = [ meson ninja gettext itstool pkgconfig wrapGAppsHook libxml2 ]; + nativeBuildInputs = [ + meson ninja gettext itstool pkgconfig wrapGAppsHook libxml2 + # For setup hook + gobjectIntrospection + ]; postPatch = '' patchShebangs data/meson_compile_gschema.py @@ -35,8 +39,6 @@ stdenv.mkDerivation rec { doCheck = true; - checkPhase = "meson test"; - meta = with stdenv.lib; { description = "Simple scanning utility"; longDescription = '' @@ -50,6 +52,5 @@ stdenv.mkDerivation rec { homepage = https://launchpad.net/simple-scan; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix index 638c0cbe7dc..37b311256bd 100644 --- a/pkgs/desktops/gnome-3/core/sushi/default.nix +++ b/pkgs/desktops/gnome-3/core/sushi/default.nix @@ -32,7 +32,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/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index 651b7cff226..c26b9b45dfd 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -27,8 +27,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gobjectIntrospection python3Packages.pylint python3Packages.pygobject2 ]; - checkPhase = "meson test"; - patches = [ (fetchurl { name = "remove-pycompile.patch"; diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index d60fddb589b..0650ddf04ea 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -36,6 +36,7 @@ let 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 ]; gamesPackages = with gnome3; [ swell-foop lightsoff iagno @@ -297,6 +298,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 { }; 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 bda356cf4c3..11d891b6743 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,36 @@ -{stdenv, lib, python, dbus, fetchgit, cmake, coreutils, jq, gobjectIntrospection, python27Packages, makeWrapper, gnome3, wrapGAppsHook}: +{stdenv, fetchurl, cmake, ninja, jq, python3, gnome3, wrapGAppsHook}: -stdenv.mkDerivation rec { -name="chrome-gnome-shell"; - src = fetchgit { - url = "git://git.gnome.org/chrome-gnome-shell"; - rev = "7d99523e90805cb65027cc2f5f1191a957dcf276"; - sha256 = "0qc34dbhsz5yf4z5bx6py08h561rcxw9928drgk9256g3vnygnbc"; +let + version = "9"; + + inherit (python3.pkgs) python pygobject3 requests; +in stdenv.mkDerivation rec { + name = "chrome-gnome-shell-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/chrome-gnome-shell/${version}/${name}.tar.xz"; + sha256 = "0j6lzlp3jvkpnkk8s99y3m14xiq94rjwjzy2pbfqgv084ahzmz8i"; }; - buildInputs = [ gnome3.gnome_shell makeWrapper jq dbus gobjectIntrospection - python python27Packages.requests python27Packages.pygobject3 wrapGAppsHook]; - - preConfigure = '' - mkdir build usr etc - cd build - ${cmake}/bin/cmake -DCMAKE_INSTALL_PREFIX=$out/usr -DBUILD_EXTENSION=OFF ../ - substituteInPlace cmake_install.cmake --replace "/etc" "$out/etc" - ''; - - postInstall = '' - rm $out/etc/opt/chrome/policies/managed/chrome-gnome-shell.json - rm $out/etc/chromium/policies/managed/chrome-gnome-shell.json - wrapProgram $out/usr/bin/chrome-gnome-shell \ - --prefix PATH : '"${dbus}/bin"' \ - --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" ]; + + meta = with stdenv.lib; { + description = "GNOME Shell integration for Chrome"; + 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 00000000000..e41227e8513 --- /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-panel/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix new file mode 100644 index 00000000000..3baedbf0c59 --- /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 00000000000..7ad26a7c6d4 --- /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/mediaplayer/default.nix b/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix new file mode 100644 index 00000000000..f64a0ef3f27 --- /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/nohotcorner/default.nix b/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix new file mode 100644 index 00000000000..4061c3bb5cc --- /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/pixel-saver/default.nix b/pkgs/desktops/gnome-3/extensions/pixel-saver/default.nix new file mode 100644 index 00000000000..ccc3fd578e9 --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/pixel-saver/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "gnome-shell-extension-pixel-saver-${version}"; + version = "1.10"; + + src = fetchFromGitHub { + owner = "deadalnix"; + repo = "pixel-saver"; + rev = version; + sha256 = "040ayzhpv9jq49vp32w85wvjs57047faa7872qm4brii450iy7v4"; + }; + + uuid = "pixel-saver@deadalnix.me"; + + installPhase = '' + mkdir -p $out/share/gnome-shell/extensions + cp -r ${uuid} $out/share/gnome-shell/extensions + ''; + + meta = with stdenv.lib; { + description = "Pixel Saver is designed to save pixel by fusing activity bar and title bar in a natural way"; + license = licenses.mit; + maintainers = with maintainers; [ jonafato ]; + platforms = platforms.linux; + homepage = https://github.com/deadalnix/pixel-saver; + }; +} diff --git a/pkgs/desktops/gnome-3/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/misc/gexiv2/default.nix index d0801714a0f..852ed00ed90 100644 --- a/pkgs/desktops/gnome-3/misc/gexiv2/default.nix +++ b/pkgs/desktops/gnome-3/misc/gexiv2/default.nix @@ -1,29 +1,42 @@ -{ stdenv, fetchurl, pkgconfig, exiv2, glib, libtool, m4, gnome3 }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, exiv2, glib, gnome3, gobjectIntrospection, vala }: let majorVersion = "0.10"; in stdenv.mkDerivation rec { name = "gexiv2-${version}"; - version = "${majorVersion}.6"; + version = "${majorVersion}.7"; src = fetchurl { url = "mirror://gnome/sources/gexiv2/${majorVersion}/${name}.tar.xz"; - sha256 = "09aqsnpah71p9gx0ap2px2dyanrs7jmkkar6q114n9b7js8qh9qk"; + sha256 = "1f7312zygw77ml37i5qilhfvmjm59dn753ax71rcb2jm1p76vgcb"; }; + patches = [ + # Darwin compatibility (https://bugzilla.gnome.org/show_bug.cgi?id=791941) + (fetchurl { + url = https://bugzilla.gnome.org/attachment.cgi?id=365969; + sha256 = "06w744acgnz3hym7sm8c245yzlg05ldkmwgiz3yz4pp6h72brizj"; + }) + # GIR & Vala bindings fix (https://bugzilla.gnome.org/show_bug.cgi?id=792431) + (fetchurl { + url = https://bugzilla.gnome.org/attachment.cgi?id=366662; + sha256 = "1ljb2pap5v9z3zhx69ghfyrbl2b62ck35nyn7h5h410d008lcb4v"; + }) + ]; + preConfigure = '' patchShebangs . ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib libtool m4 ]; + nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection vala ]; + buildInputs = [ glib ]; propagatedBuildInputs = [ exiv2 ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/gexiv2; description = "GObject wrapper around the Exiv2 photo metadata library"; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/misc/gspell/default.nix b/pkgs/desktops/gnome-3/misc/gspell/default.nix index e8c299685f7..2bbf219e3f3 100644 --- a/pkgs/desktops/gnome-3/misc/gspell/default.nix +++ b/pkgs/desktops/gnome-3/misc/gspell/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk3, enchant, isocodes, vala }: +{ stdenv, fetchurl, pkgconfig, glib, gtk3, enchant, isocodes, vala, gobjectIntrospection }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; propagatedBuildInputs = [ enchant ]; # required for pkgconfig - nativeBuildInputs = [ pkgconfig vala ]; + nativeBuildInputs = [ pkgconfig vala gobjectIntrospection ]; buildInputs = [ glib gtk3 isocodes ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnustep/make/setup-hook.sh b/pkgs/desktops/gnustep/make/setup-hook.sh index 71618ef960f..53138901116 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 1fe26484605..00000000000 --- 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 02cd509537d..00000000000 --- 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 cd19b7e2d72..00000000000 --- 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 dd14e0429dd..00000000000 --- 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 df211f49199..00000000000 --- 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 5d9e2401ca8..00000000000 --- 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 94f878097de..00000000000 --- 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 1da7bc810c3..00000000000 --- 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 952a05a9d27..00000000000 --- 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 2dc07d14a0d..00000000000 --- 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 18697e13b66..00000000000 --- 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 46ec45fad01..00000000000 --- 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 de7b7799993..00000000000 --- 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 2fc0e373dbd..00000000000 --- 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 8883c03274d..00000000000 --- 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 6068516ba2b..00000000000 --- 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 66b0cfe869f..00000000000 --- 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 1f412d3c766..00000000000 --- 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 b4c272cb328..00000000000 --- 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 ec159a1e204..00000000000 --- 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 a6d48ae51bf..00000000000 --- 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 ecfb4913a42..00000000000 --- 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/lxde/core/lxappearance/default.nix b/pkgs/desktops/lxde/core/lxappearance/default.nix index aece5fefaec..c06a99eb36c 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/lxqt/optional/qlipper/default.nix b/pkgs/desktops/lxqt/optional/qlipper/default.nix index 04b0cd3e6ac..e09c8bc09d5 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 5b02c6ad117..ab00cdce671 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsecret, poppler, itstool, mate, hicolor_icon_theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsecret, poppler, itstool, caja, mate-desktop, hicolor_icon_theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "atril-${version}"; @@ -23,12 +23,13 @@ stdenv.mkDerivation rec { libsecret libxml2 poppler + caja + mate-desktop hicolor_icon_theme - mate.mate-desktop ]; - - 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 00000000000..da5200eb3b3 --- /dev/null +++ b/pkgs/desktops/mate/caja-dropbox/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, pkgconfig, gtk3, caja, pythonPackages }: + +stdenv.mkDerivation rec { + name = "caja-dropbox-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "0"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "18wd8abjaxa68n1yjmvh9az1m8lqa2wing73xdymz0d5gmxmk25g"; + }; + + nativeBuildInputs = [ + pkgconfig + ]; + + buildInputs = [ + gtk3 + 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 d3b2a558bc9..9bd86d962ec 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus_glib, gupnp, mate, imagemagick }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus_glib, gupnp, caja, mate-desktop, imagemagick, wrapGAppsHook }: stdenv.mkDerivation rec { name = "caja-extensions-${version}"; @@ -14,14 +14,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool + wrapGAppsHook ]; buildInputs = [ gtk3 dbus_glib gupnp - mate.caja - mate.mate-desktop + caja + mate-desktop imagemagick ]; diff --git a/pkgs/desktops/mate/caja/cajaWithExtensions.nix b/pkgs/desktops/mate/caja/cajaWithExtensions.nix deleted file mode 100644 index cb315d7f09a..00000000000 --- 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 d0383fcc5eb..3c872e72091 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -1,4 +1,4 @@ -{ 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}"; @@ -24,6 +24,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 acb3b31e801..0c495fd190e 100644 --- a/pkgs/desktops/mate/default.nix +++ b/pkgs/desktops/mate/default.nix @@ -7,31 +7,43 @@ let 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 @@ -46,6 +58,7 @@ let mate-menus mate-notification-daemon mate-panel + mate-polkit mate-session-manager mate-settings-daemon mate-themes @@ -53,13 +66,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/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index b7df66d520b..e4d52183ab4 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { pkgconfig intltool itstool - hicolor_icon_theme wrapGAppsHook ]; @@ -31,6 +30,7 @@ stdenv.mkDerivation rec { gnome3.gtk gnome3.libpeas mate.mate-desktop + hicolor_icon_theme ]; meta = { diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix new file mode 100644 index 00000000000..ba5ef927fb6 --- /dev/null +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, libwnck3, libgtop, libxml2, libnotify, dbus_glib, polkit, upower, wirelesstools, libmateweather, mate-panel, pythonPackages, hicolor_icon_theme, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "mate-applets-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "2"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "045cl62nnfsl14vnfydwqjssdakgdrahh5h0xiz5afmdcbq6cqgw"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + itstool + wrapGAppsHook + ]; + + buildInputs = [ + gnome3.gtk + gnome3.gtksourceview + gnome3.gucharmap + libwnck3 + libgtop + libxml2 + libnotify + dbus_glib + polkit + upower + wirelesstools + libmateweather + mate-panel + pythonPackages.python + pythonPackages.pygobject3 + 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 00000000000..6ce78491d03 --- /dev/null +++ b/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, intltool }: + +stdenv.mkDerivation rec { + name = "mate-backgrounds-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "0"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "06q8ksjisijps2wn959arywsimhzd3j35mqkr048c26ck24d60zi"; + }; + + 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 00000000000..b00bcc27ac5 --- /dev/null +++ b/pkgs/desktops/mate/mate-calc/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "mate-calc-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "1"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "1h6kr9qb1kaw8jvfm7xmqm1wqnxsw2iwha5vl38b986x4zm2b712"; + }; + + 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.unix; + maintainers = [ 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 00000000000..7d863a929e7 --- /dev/null +++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libindicator-gtk3, mate-panel, hicolor_icon_theme, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "mate-indicator-applet-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "1"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "1h77f1gbz1a8l9xyq5fk75bs58mcwx6pbk6db33v0v1mwq6cidiv"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + libindicator-gtk3 + 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-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix new file mode 100644 index 00000000000..0a2a0e47202 --- /dev/null +++ b/pkgs/desktops/mate/mate-netbook/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libwnck3, libfakekey, libXtst, mate-panel, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "mate-netbook-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "2"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "0xy5mhkg0xfgyr7gnnjrfzqhmdnhyqscrl2h496p06cflknm17vb"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + libwnck3 + libfakekey + libXtst + 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-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index 1ca20047fa1..ec934b1fc63 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mate-panel-${version}"; version = "${major-ver}.${minor-ver}"; major-ver = "1.18"; - minor-ver = "6"; + minor-ver = "7"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "0cyfqq7i3qilw6qfxay4j9rl9y03s611nrqy5bh7lkdx1y0l16kx"; + sha256 = "1m0fxyzbvg239dddmz3ksd8871lhkd7n3fxvdgdf4hv9rlvm1klv"; }; nativeBuildInputs = [ @@ -24,12 +24,12 @@ stdenv.mkDerivation rec { 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 00000000000..94fb5ef43e8 --- /dev/null +++ b/pkgs/desktops/mate/mate-polkit/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gobjectIntrospection, libappindicator-gtk3, libindicator-gtk3, polkit }: + +stdenv.mkDerivation rec { + name = "mate-polkit-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "2"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "01mxl7wj1501d3clrwlwa54970vpkahp5968xpaxwfb2zbnqgjbd"; + }; + + 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-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix new file mode 100644 index 00000000000..dbaebb4c7be --- /dev/null +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus_glib, libXScrnSaver, libnotify, pam, systemd, mate-desktop, mate-menus, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "mate-screensaver-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "2"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "03za7ssww095i49braaq0di5ir9g6wxh1n5hfgy6b3w9nb0j1y2p"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + dbus_glib + libXScrnSaver + libnotify + pam + systemd + mate-desktop + 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 00000000000..ed98ffaa645 --- /dev/null +++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, dbus_glib, lm_sensors, mate-panel, hicolor_icon_theme, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "mate-sensors-applet-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "3"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "1nm68rhp73kgvs7wwsgs5zbvq3lzaanl5s5nnn28saiknjbz1mcx"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + itstool + wrapGAppsHook + ]; + + # maybe add nvidia-settings later on + buildInputs = [ + gtk3 + libxml2 + libxslt + libatasmart + libnotify + dbus_glib + lm_sensors + 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 6b4abbeff00..f15a78120cb 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -1,4 +1,7 @@ -{ 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, mate-desktop, hicolor_icon_theme, + wrapGAppsHook +}: stdenv.mkDerivation rec { name = "mate-session-manager-${version}"; @@ -14,18 +17,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool + xtrans wrapGAppsHook ]; buildInputs = [ dbus_glib systemd - xtrans + libSM + libXtst + gtk3 + mate-desktop hicolor_icon_theme - xorg.libSM - gnome3.gtk3 - gnome3.gsettings_desktop_schemas - mate.mate-desktop ]; meta = with stdenv.lib; { 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 00000000000..1378cc7f3ba --- /dev/null +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, systemd, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "mate-system-monitor-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "1"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "1xhz7d9045xfh431rn27kh1sd1clbzkfrw1zkjgfnpad6v3aaaks"; + }; + + 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-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix new file mode 100644 index 00000000000..ce8029fb215 --- /dev/null +++ b/pkgs/desktops/mate/mate-user-guide/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, intltool, itstool, libxml2, yelp }: + +stdenv.mkDerivation rec { + name = "mate-user-guide-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "0"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "0f3b46r9a3cywm7rpj08xlkfnlfr9db58xfcpix8i33qp50fxqmb"; + }; + + 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 00000000000..afacad52778 --- /dev/null +++ b/pkgs/desktops/mate/mate-user-share/default.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, dbus_glib, libnotify, libxml2, libcanberra_gtk3, caja, mod_dnssd, apacheHttpd, hicolor_icon_theme, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "mate-user-share-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "0"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "0w7r7jmm12n41hcxj1pfk3f0xy69cddx7ga490x191rdpcb3ry1n"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + itstool + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + dbus_glib + libnotify + libcanberra_gtk3 + libxml2 + 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 00000000000..281fef42e61 --- /dev/null +++ b/pkgs/desktops/mate/mate-utils/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libgtop, libcanberra_gtk3, mate-panel, hicolor_icon_theme, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "mate-utils-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "3"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "1nw8rcq3x67v73cmy44zz6r2ikz46wsx834qzkbq4i2ac96kdkfz"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + itstool + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + libgtop + libcanberra_gtk3 + libxml2 + 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 00000000000..b376736c473 --- /dev/null +++ b/pkgs/desktops/mate/mozo/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, intltool, mate-menus, pythonPackages }: + +stdenv.mkDerivation rec { + name = "mozo-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "0"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "04yn9bw64q5a5kvpmkb7rb3mlp11pmnvkbphficsgb0368fj895b"; + }; + + pythonPath = [ 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/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix new file mode 100644 index 00000000000..4eb9b72b8b5 --- /dev/null +++ b/pkgs/desktops/mate/python-caja/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, caja, pythonPackages }: + +stdenv.mkDerivation rec { + name = "python-caja-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "1"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "0n43cvvv29gq31hgrsf9al184cr87c3hzskrh2593rid52kwyz44"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + pythonPackages.wrapPython + ]; + + buildInputs = [ + gtk3 + 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/pantheon/apps/pantheon-terminal/default.nix b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix index b7c27ec3d0a..13a34f90fcd 100644 --- a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, cmake, vala_0_38, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, makeWrapper }: +{ stdenv, fetchurl, perl, cmake, vala_0_38, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, makeWrapper, gobjectIntrospection }: stdenv.mkDerivation rec { majorVersion = "0.4"; @@ -20,7 +20,11 @@ stdenv.mkDerivation rec { done ''; - nativeBuildInputs = [ perl cmake vala_0_38 pkgconfig makeWrapper ]; + nativeBuildInputs = [ + perl cmake vala_0_38 pkgconfig makeWrapper + # For setup hook + gobjectIntrospection + ]; buildInputs = with gnome3; [ glib gtk3 granite libnotify gettext vte_290 libgee gsettings_desktop_schemas defaultIconTheme diff --git a/pkgs/desktops/plasma-5/breeze-qt4.nix b/pkgs/desktops/plasma-5/breeze-qt4.nix deleted file mode 100644 index 6c31398037b..00000000000 --- 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 cae5c74b442..0972673b7b8 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -100,7 +100,6 @@ 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 {}; diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 0469589e48c..921441c0292 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.4/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.11.5/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index f31294e00d6..289d5a812f7 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -30,8 +30,8 @@ mkDerivation { ]; outputs = [ "bin" "dev" "out" ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - NIX_CFLAGS_COMPILE = [ - ''-DNIXPKGS_XWAYLAND="${lib.getBin xwayland}/bin/Xwayland"'' + CXXFLAGS = [ + ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"'' ]; cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; postInstall = '' diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix index 18675159df6..318d416d885 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix @@ -34,9 +34,9 @@ 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" diff --git a/pkgs/desktops/plasma-5/plasma-vault/default.nix b/pkgs/desktops/plasma-5/plasma-vault/default.nix index 203ff50d735..300627163e5 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/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 4b71e314fba..ee605bdba8a 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,355 +3,355 @@ { bluedevil = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/bluedevil-5.11.4.tar.xz"; - sha256 = "1xjvx5w2pkwj63hdxjkh4fdqyydxvc2sqg1pwkwqnw58z78lhq20"; - name = "bluedevil-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/bluedevil-5.11.5.tar.xz"; + sha256 = "0xzdf1qrf2nlpvn2hr9zk72hw027i318s9pnzgmqg1lwhdr276h5"; + name = "bluedevil-5.11.5.tar.xz"; }; }; breeze = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/breeze-5.11.4.tar.xz"; - sha256 = "0nxp13x5326ahkrb37rbrsn7xhl9gbrrpnbhhflmr9zdx2af7700"; - name = "breeze-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/breeze-5.11.5.tar.xz"; + sha256 = "0xxwnhxpkdf4nyc1rvsjrnqsv1cgzs3a88mwfwpvci4snfva8jp1"; + name = "breeze-5.11.5.tar.xz"; }; }; breeze-grub = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/breeze-grub-5.11.4.tar.xz"; - sha256 = "1yz31j3dgzkliz8sk80d6fs0afnd45nw6xkhrws2aar2rnn9d1w4"; - name = "breeze-grub-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/breeze-grub-5.11.5.tar.xz"; + sha256 = "1l3dv1acgs6ssydg985d90136p9n4h0xry3xlx12g5wg07i8s89g"; + name = "breeze-grub-5.11.5.tar.xz"; }; }; breeze-gtk = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/breeze-gtk-5.11.4.tar.xz"; - sha256 = "0n9fn3jp610g617561c8pr7i9v4k6cdpyqi7kl4f56h6cwq6b0ga"; - name = "breeze-gtk-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/breeze-gtk-5.11.5.tar.xz"; + sha256 = "0mkd1gqih5irmabxly2y744sr1iwxy7r7hx68jrd452nbvqvyrqq"; + name = "breeze-gtk-5.11.5.tar.xz"; }; }; breeze-plymouth = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/breeze-plymouth-5.11.4.tar.xz"; - sha256 = "099hl3dfcc3n4yh94hdhgnwy01a74s6as2yma57idcqw2akf6d0v"; - name = "breeze-plymouth-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/breeze-plymouth-5.11.5.tar.xz"; + sha256 = "0ydfrrsqvzn71j9x1f26771x99yiq59h745k476dcqajj2m0ari3"; + name = "breeze-plymouth-5.11.5.tar.xz"; }; }; discover = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/discover-5.11.4.tar.xz"; - sha256 = "1n6s52n8ynsymcwjckkfxrnzsj15f10if8r3ka5qhd7w6nb2x2iz"; - name = "discover-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/discover-5.11.5.tar.xz"; + sha256 = "0yxsp4jimyrsxf72hinqa51ycg4hmfxrxdicm9n8qfz47srcgkml"; + name = "discover-5.11.5.tar.xz"; }; }; drkonqi = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/drkonqi-5.11.4.tar.xz"; - sha256 = "0vnfx8sha9mdsdb5baw5xwlswm32wmd96kv8yzm3zr67fkz95n3s"; - name = "drkonqi-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/drkonqi-5.11.5.tar.xz"; + sha256 = "1kngafr1hdq6r02mpd4bj5lgbgzk2cd10f5zqsvdfgsirz91vfsf"; + name = "drkonqi-5.11.5.tar.xz"; }; }; kactivitymanagerd = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/kactivitymanagerd-5.11.4.tar.xz"; - sha256 = "10942fzaai30agzmbldwiwycpb7198qhgk3jr2p5wlfrawl1sl4q"; - name = "kactivitymanagerd-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kactivitymanagerd-5.11.5.tar.xz"; + sha256 = "11nnmqpw4kq96912rys2a539yzgncc5vp7b52wgc4is9i5czsr50"; + name = "kactivitymanagerd-5.11.5.tar.xz"; }; }; kde-cli-tools = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/kde-cli-tools-5.11.4.tar.xz"; - sha256 = "07415ssr25lnr9klv6r7jclf9l5mca6dxf6xskwgixcap1fl5vdg"; - name = "kde-cli-tools-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kde-cli-tools-5.11.5.tar.xz"; + sha256 = "0d4d360pq6winykjp6lgq77k9yc435d5g71dj7bivkyilqc4cp8c"; + name = "kde-cli-tools-5.11.5.tar.xz"; }; }; kdecoration = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/kdecoration-5.11.4.tar.xz"; - sha256 = "0vvhhdd3jlb7x9zdc3bjalchhvjkg411ip379rifn9z7zxbrsq9m"; - name = "kdecoration-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kdecoration-5.11.5.tar.xz"; + sha256 = "0hl9mqwyfkh1r5nbl46g5axi446fdf7fw09b7v6l3jg9c5xbx89d"; + name = "kdecoration-5.11.5.tar.xz"; }; }; kde-gtk-config = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/kde-gtk-config-5.11.4.tar.xz"; - sha256 = "08s5z7lck37cyzkkg5v9qrnlfxjrpfd565y2i1ng9k6vm9m39172"; - name = "kde-gtk-config-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kde-gtk-config-5.11.5.tar.xz"; + sha256 = "1y9ji82qlvp2z00xw0l32zj8asbg85n6azw8ringg2l6376r01l6"; + name = "kde-gtk-config-5.11.5.tar.xz"; }; }; kdeplasma-addons = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/kdeplasma-addons-5.11.4.tar.xz"; - sha256 = "19ywc3ryjax7g7wg969j256n4cr3n51lzxsw4gklf4n0px4pk2pi"; - name = "kdeplasma-addons-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kdeplasma-addons-5.11.5.tar.xz"; + sha256 = "1vp9r7ia5wriw5srpyq89nqdp82akz3jnh7dcbh2h0gdagw7hb94"; + name = "kdeplasma-addons-5.11.5.tar.xz"; }; }; kgamma5 = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/kgamma5-5.11.4.tar.xz"; - sha256 = "1njzb06hk0lpj3s6i2hmlww0k7122dca9mi0rbr0ilfwha36ib2s"; - name = "kgamma5-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kgamma5-5.11.5.tar.xz"; + sha256 = "16vlx51n52j5q1nfsz4ji6bz4x6sfagxzn6q3r6ckj41rkwmp9gg"; + name = "kgamma5-5.11.5.tar.xz"; }; }; khotkeys = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/khotkeys-5.11.4.tar.xz"; - sha256 = "0wszl7bzjl6gszvg9n4p8x3m6h0x5xx3qz3yi1y6g5mplfg7h0c6"; - name = "khotkeys-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/khotkeys-5.11.5.tar.xz"; + sha256 = "051yjqkf5bigz6cz2qbq0lggw9i6ydfaxrvy4xh40mw2c6x3xmvh"; + name = "khotkeys-5.11.5.tar.xz"; }; }; kinfocenter = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/kinfocenter-5.11.4.tar.xz"; - sha256 = "0ff3v90fj187glb22rvp27kp1b83br71vshcq2cpfzrbv97wrqf4"; - name = "kinfocenter-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kinfocenter-5.11.5.tar.xz"; + sha256 = "0ym7i64k48x8dcln0lajj0379blp3c3a0axfcjibp3ya2xcaqdif"; + name = "kinfocenter-5.11.5.tar.xz"; }; }; kmenuedit = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/kmenuedit-5.11.4.tar.xz"; - sha256 = "0kbqrri7mnnarfw45k7j3ckxdpkasc25prvn1zlhci0acqhz0skk"; - name = "kmenuedit-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kmenuedit-5.11.5.tar.xz"; + sha256 = "0wh4hk51k2mz1gqm9brvdy16gp2ap2iz5b6yjiqbkpz6giy88kwc"; + name = "kmenuedit-5.11.5.tar.xz"; }; }; kscreen = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/kscreen-5.11.4.tar.xz"; - sha256 = "0rjy594qj9825gan3r4iw4qphnksnrfn2f1dgyvd63ds70xm272h"; - name = "kscreen-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kscreen-5.11.5.tar.xz"; + sha256 = "0qa23qs8v8hm91190ssdnlg7dyljra7csgykb7d8la30yxa9vzc7"; + name = "kscreen-5.11.5.tar.xz"; }; }; kscreenlocker = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/kscreenlocker-5.11.4.tar.xz"; - sha256 = "0r2438s7gs39qbkprx90smvb8mlgqm486qgv34ljx9vi0zm4kq47"; - name = "kscreenlocker-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kscreenlocker-5.11.5.tar.xz"; + sha256 = "0qrby8jxmvmnr1abkry8h5xapdswabj27n35s9l71d9lp9p96naz"; + name = "kscreenlocker-5.11.5.tar.xz"; }; }; ksshaskpass = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/ksshaskpass-5.11.4.tar.xz"; - sha256 = "1wqzwvlimw5mkq1hfzjjw9az3g9bdqkiw9m7vrxfb67asgmmbrbx"; - name = "ksshaskpass-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/ksshaskpass-5.11.5.tar.xz"; + sha256 = "08jf6f1i9xn0zsz2j2czgdzcr203wrlj1nlam26dakrphhaj8vm2"; + name = "ksshaskpass-5.11.5.tar.xz"; }; }; ksysguard = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/ksysguard-5.11.4.tar.xz"; - sha256 = "1dl5q6k2ipdwlg8i5bh2xsz20wg5dwn8401rba9jzp3la97id2sc"; - name = "ksysguard-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/ksysguard-5.11.5.tar.xz"; + sha256 = "161bcmsw4bjlsgkr3izfsqbiwambmm3za8mln3m96nf70gpqpa6i"; + name = "ksysguard-5.11.5.tar.xz"; }; }; kwallet-pam = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/kwallet-pam-5.11.4.tar.xz"; - sha256 = "0xkgm0i0x1kcw4rcsv762pqs1vk2gxi09n421whq9ibmj8cm2ky2"; - name = "kwallet-pam-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kwallet-pam-5.11.5.tar.xz"; + sha256 = "0wqnaszvwclz2gn74nmhqmci39525hwvpc3igxzjhdccnkfb5ac4"; + name = "kwallet-pam-5.11.5.tar.xz"; }; }; kwayland-integration = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/kwayland-integration-5.11.4.tar.xz"; - sha256 = "03azlds5iv3mq7g1livrqca4k30znac088qllzl4rh0mfmw4bmcy"; - name = "kwayland-integration-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kwayland-integration-5.11.5.tar.xz"; + sha256 = "0xisgzymlhmbngvmv3dkh6a51dqnhcwrjj2480f0yxsmhvknxrps"; + name = "kwayland-integration-5.11.5.tar.xz"; }; }; kwin = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/kwin-5.11.4.tar.xz"; - sha256 = "0lfp2nyh28mlqbm3qjhd9adgp8w8j2gfn6xzw8ckxmkrzpdv52gr"; - name = "kwin-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kwin-5.11.5.tar.xz"; + sha256 = "06bz2vm78i1x0i0ljdqd2a0bnnrfwz9zvlg7r86qlmhkzn2dpc4z"; + name = "kwin-5.11.5.tar.xz"; }; }; kwrited = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/kwrited-5.11.4.tar.xz"; - sha256 = "16l280dh3fw0sn3h9yprb74wmc0adsqq092s4dyka55md06qzqif"; - name = "kwrited-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/kwrited-5.11.5.tar.xz"; + sha256 = "0sx5v1apambb8w6mndkkp2lvwlqwzbpxxp5d5zsz96lxndjx6sbv"; + name = "kwrited-5.11.5.tar.xz"; }; }; libkscreen = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/libkscreen-5.11.4.tar.xz"; - sha256 = "0sv3q6zmplm0iz6ax87763mg771zvk1dfdh2gmiz2dn2lnxbkrzd"; - name = "libkscreen-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/libkscreen-5.11.5.tar.xz"; + sha256 = "03cnr7z74j2kjwbg1ddavmj0l8hpxg7bg2ipglirnzvp2ihv1wzg"; + name = "libkscreen-5.11.5.tar.xz"; }; }; libksysguard = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/libksysguard-5.11.4.tar.xz"; - sha256 = "1ry4478fv7blp80zyhz0xr3qragsddrkzjzmxkdarh01f4p987aq"; - name = "libksysguard-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/libksysguard-5.11.5.tar.xz"; + sha256 = "0f2py4zkqzpxxf3mqaij0q8ka0v3nschj17dv6rbzzmr5mjv825f"; + name = "libksysguard-5.11.5.tar.xz"; }; }; milou = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/milou-5.11.4.tar.xz"; - sha256 = "1zq6gcmjc4wa23b2c94nwsxranpangl2b3apj56qpl68bjfvlrbq"; - name = "milou-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/milou-5.11.5.tar.xz"; + sha256 = "0ja7a668wv67vb3mgsd2nbjdcp0lm7aix5dpc496wr1jy47pxv8a"; + name = "milou-5.11.5.tar.xz"; }; }; oxygen = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/oxygen-5.11.4.tar.xz"; - sha256 = "0vfs220w6rc0vf5y2qshqby1jmd5kgm0gqkzg9ckgvjm0skbk75z"; - name = "oxygen-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/oxygen-5.11.5.tar.xz"; + sha256 = "1n2xr3a0002xfiy99gjqlny76nxjlss1d3sgcj8adpza44j91228"; + name = "oxygen-5.11.5.tar.xz"; }; }; plasma-desktop = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/plasma-desktop-5.11.4.tar.xz"; - sha256 = "0adc9fi582x7gkxsxz3xhs0h6ardxbcxsl5xxzi3y2bmhd4f7vrq"; - name = "plasma-desktop-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/plasma-desktop-5.11.5.tar.xz"; + sha256 = "0djzs80mr0radmhai3k7jnlwlp76maf7vvrgkfckzs63n1jhdhb3"; + name = "plasma-desktop-5.11.5.tar.xz"; }; }; plasma-integration = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/plasma-integration-5.11.4.tar.xz"; - sha256 = "0wialbswpgf03paxfr4473sgb11fymxw34xvwdql6wwks86xyf6k"; - name = "plasma-integration-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/plasma-integration-5.11.5.tar.xz"; + sha256 = "1rmq8i0flrvqcl21fnn94d58zyw55scagrzbjw92p34i1mllhif1"; + name = "plasma-integration-5.11.5.tar.xz"; }; }; plasma-nm = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/plasma-nm-5.11.4.tar.xz"; - sha256 = "1kjbad69s3dfqgv1zyfzq7bmfyhr0hd4xwhf6bljad8d2l5azydi"; - name = "plasma-nm-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/plasma-nm-5.11.5.tar.xz"; + sha256 = "11lw26nd1rp2wbmqlf37wgk8qzv4fcc5x04g1i1h7c6hmjf5svqv"; + name = "plasma-nm-5.11.5.tar.xz"; }; }; plasma-pa = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/plasma-pa-5.11.4.tar.xz"; - sha256 = "0zg34xs3fbxig63i1lf0hyfsmsis3d5gmlgyqc0vkdbwg6l2qpbw"; - name = "plasma-pa-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/plasma-pa-5.11.5.tar.xz"; + sha256 = "1gdkz9yx21skg3c95nwh1mwacvrklgpfl0cspsmyyfnbnv93cz94"; + name = "plasma-pa-5.11.5.tar.xz"; }; }; plasma-sdk = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/plasma-sdk-5.11.4.tar.xz"; - sha256 = "0vis5psn2zyglkd6gcgqsnf99b38dcjpq3rwbyhj8rfjcakdg4nx"; - name = "plasma-sdk-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/plasma-sdk-5.11.5.tar.xz"; + sha256 = "013dc8dg0nhgdjlflgpqi28jsyparnwrj5am8lzvc0kkd9f69yhk"; + name = "plasma-sdk-5.11.5.tar.xz"; }; }; plasma-tests = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/plasma-tests-5.11.4.tar.xz"; - sha256 = "1kifka84csqsm3qjycagwx093hv3n5wsxl8p6xpa44cxjg4xjqfa"; - name = "plasma-tests-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/plasma-tests-5.11.5.tar.xz"; + sha256 = "00n1i6s1811w5h37i2iyy924495d2w24vfsl348cxplfxpxhcqf0"; + name = "plasma-tests-5.11.5.tar.xz"; }; }; plasma-vault = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/plasma-vault-5.11.4.tar.xz"; - sha256 = "1pymr6hiz0j4x98dchrzsq17ddlbcj5f9dggzr0fiw4sm5yvyxz0"; - name = "plasma-vault-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/plasma-vault-5.11.5.tar.xz"; + sha256 = "1pg891fahslnjn5jdsjjlw8i2l71ddznxjg96l9wycvh6nn7k0v6"; + name = "plasma-vault-5.11.5.tar.xz"; }; }; plasma-workspace = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/plasma-workspace-5.11.4.tar.xz"; - sha256 = "1qin68zcczgf3rwa8gg4i3rcsy6i8na9z8kk4bm9q3mfagbzqfx8"; - name = "plasma-workspace-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/plasma-workspace-5.11.5.tar.xz"; + sha256 = "1ipklc6v2ml095sy80rgq4123vkk3famjwf8s3rgkk172s76qm98"; + name = "plasma-workspace-5.11.5.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/plasma-workspace-wallpapers-5.11.4.tar.xz"; - sha256 = "09q63i85d82fdq9vafv55wiflndil048ryn9n3kpa4v9s0yjklkh"; - name = "plasma-workspace-wallpapers-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/plasma-workspace-wallpapers-5.11.5.tar.xz"; + sha256 = "0zhcpbb74phnmr24kxcp0k6gr7gjzdfbrrv4xjjb2qpg2d00l3pm"; + name = "plasma-workspace-wallpapers-5.11.5.tar.xz"; }; }; plymouth-kcm = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/plymouth-kcm-5.11.4.tar.xz"; - sha256 = "17jyg6133xb0f1dm1c0cpys2008aa65k1y1ap4b3y29xyv1p79rd"; - name = "plymouth-kcm-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/plymouth-kcm-5.11.5.tar.xz"; + sha256 = "152fyg5hc3rzvqw0z88pgapnhc64jx34vcqgsslsfja8mwk9h0ql"; + name = "plymouth-kcm-5.11.5.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.11.4"; + version = "1-5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/polkit-kde-agent-1-5.11.4.tar.xz"; - sha256 = "004ra4nb6dh3b1lmpfg303fg7201d2sm9f4glkj0mk3a0s9fkfcw"; - name = "polkit-kde-agent-1-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/polkit-kde-agent-1-5.11.5.tar.xz"; + sha256 = "0bwv567czi9h3rxgn19aw10nq5c674zd8wgk9nj006km1yyxrgy6"; + name = "polkit-kde-agent-1-5.11.5.tar.xz"; }; }; powerdevil = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/powerdevil-5.11.4.tar.xz"; - sha256 = "0cncn8xv5sqv1wqmnmhmqn2jznzy7yik4hvq0vadsrh4blyzwyrj"; - name = "powerdevil-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/powerdevil-5.11.5.tar.xz"; + sha256 = "0jqf85bain8vj5plxvvbdwiwc2jyb1r6idajhr6igcpjryfa75hj"; + name = "powerdevil-5.11.5.tar.xz"; }; }; sddm-kcm = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/sddm-kcm-5.11.4.tar.xz"; - sha256 = "1jhm5gbz296hk1dc7476kw23v73l7s939baln5v5pax349w40l23"; - name = "sddm-kcm-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/sddm-kcm-5.11.5.tar.xz"; + sha256 = "1ln1h4r614rg4w6b7g5l7yqqijkaaj04s4g4m41d8rg8z5ywq4v0"; + name = "sddm-kcm-5.11.5.tar.xz"; }; }; systemsettings = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/systemsettings-5.11.4.tar.xz"; - sha256 = "1j555f505hbc2zmg7biv05llzd2bb58z5ccspdgcvmskkwm2rlb3"; - name = "systemsettings-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/systemsettings-5.11.5.tar.xz"; + sha256 = "0ycdfl585853481bjix63nnj7qvg767qpbyr015k32c1v3vllx8y"; + name = "systemsettings-5.11.5.tar.xz"; }; }; user-manager = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/user-manager-5.11.4.tar.xz"; - sha256 = "0mz6kaqwns57bwp2gl7qzm7mwq3w2qh6kyp7m5qqh96wgq133c55"; - name = "user-manager-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/user-manager-5.11.5.tar.xz"; + sha256 = "1r4q411g2r6cz4z6bm5jwygfbvrfrl8dawdd69s6h93ixs7697s4"; + name = "user-manager-5.11.5.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.11.4"; + version = "5.11.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.11.4/xdg-desktop-portal-kde-5.11.4.tar.xz"; - sha256 = "162gc6bfsxlj5rc4yz94sv41p75gf2kgayxa534gw3zhvry1jb52"; - name = "xdg-desktop-portal-kde-5.11.4.tar.xz"; + url = "${mirror}/stable/plasma/5.11.5/xdg-desktop-portal-kde-5.11.5.tar.xz"; + sha256 = "07xwb4zbf0cp4a672vs631dh9cqyvn0j9wwlknc21jzr619mnkap"; + name = "xdg-desktop-portal-kde-5.11.5.tar.xz"; }; }; } diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index b18f3466770..d83e51a676c 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -1,106 +1,208 @@ -{ config, pkgs, newScope }: +{ lib, pkgs }: -let +lib.makeScope pkgs.newScope (self: with self; { + #### NixOS support -callPackage = newScope (deps // xfce_self); - -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 { }; - 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 { }; + garcon = callPackage ./core/garcon.nix { }; - xfce4_appfinder = callPackage ./core/xfce4-appfinder.nix { }; - xfce4_dev_tools = callPackage ./core/xfce4-dev-tools.nix { }; # only if autotools are needed + # When built with GTK+3, it was breaking GTK+3 app layout + gtk-xfce-engine = callPackage ./core/gtk-xfce-engine.nix { withGtk3 = false; }; - #### APPLICATIONS from "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2" + 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 { }; - 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 { }; - xfce4mixer_pulse = callPackage ./applications/xfce4-mixer.nix { pulseaudioSupport = true; }; - 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 = callPackage ./applications/xfce4-volumed.nix { }; - xfce4volumed_pulse = callPackage ./applications/xfce4-volumed-pulse.nix { }; - #### ART from "mirror://xfce/src/art/${p_name}/${ver_maj}/${name}.tar.bz2" + xfce4-volumed = callPackage ./applications/xfce4-volumed.nix { }; - xfce4icontheme = callPackage ./art/xfce4-icon-theme.nix { }; - xfwm4themes = callPackage ./art/xfwm4-themes.nix { }; + xfce4-volumed-pulse = callPackage ./applications/xfce4-volumed-pulse.nix { }; - #### PANEL PLUGINS from "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.{bz2,gz}" + #### 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_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 + xfce4-namebar-plugin = callPackage ./panel-plugins/xfce4-namebar-plugin.nix { }; -in xfce_self + 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/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index fdb9d1be6ad..a427023df56 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 f74da977372..e71c898dd55 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 187899b8964..a3720619241 100644 --- a/pkgs/development/arduino/platformio/chrootenv.nix +++ b/pkgs/development/arduino/platformio/chrootenv.nix @@ -18,8 +18,8 @@ buildFHSUserEnv { python27Packages.setuptools python27Packages.pip python27Packages.bottle - zlib python27Packages.platformio + zlib ]); meta = with stdenv.lib; { @@ -30,5 +30,9 @@ buildFHSUserEnv { platforms = with platforms; linux; }; + extraInstallCommands = '' + ln -s $out/bin/platformio $out/bin/pio + ''; + runScript = "platformio"; } diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 1d4cef68514..83de6f9e569 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 26d868a8e7c..d6b83cb1af0 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/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix index 1e7791c84c4..9629d4eface 100644 --- a/pkgs/development/compilers/arachne-pnr/default.nix +++ b/pkgs/development/compilers/arachne-pnr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "arachne-pnr-${version}"; - version = "2017.12.06"; + version = "2018.01.10"; src = fetchFromGitHub { owner = "cseed"; repo = "arachne-pnr"; - rev = "a32dd2c137b2bb6ba6704b25109790ac76bc2f45"; - sha256 = "16pfm8spcm3nsrdsjdj22v7dddnwzlhbj1y71wflvvb84xnbga2y"; + rev = "24f6b9c341910f6aaca1498872fe2e99ff8210cf"; + sha256 = "0jd91hx16jx0p0jiqhgh1kbh59k82i4979f4xp4wzc249br7lxlv"; }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/chicken/setup-hook.sh b/pkgs/development/compilers/chicken/setup-hook.sh index d7f28539dc6..b0d9b53b537 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/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix index 6ac5165b7e9..3f25041f175 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 ee9224b380c..06c4b62e294 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/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix index 17d91f36875..0681e8210a6 100644 --- a/pkgs/development/compilers/coreclr/default.nix +++ b/pkgs/development/compilers/coreclr/default.nix @@ -83,7 +83,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/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 875e60dd6dc..de3544a3a63 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -3,10 +3,10 @@ , curl, tzdata, gdb, darwin , callPackage , bootstrapVersion ? false -, version ? "2.075.1" -, dmdSha256 ? "0kq6r8rcghvzk5jcphg89l85rg734s29bssd2rcw3fygx0k9a9k5" -, druntimeSha256 ? "0idn2v1lmp7hl637g3i7pdfj9mjk4sclkz4cm77nl8873k2fhk8j" -, phobosSha256 ? "1a7q5fd15yspgs5plxgx54jyrcwgzlyw3rahmz04jd2s5h56dj04" +, version ? "2.078.1" +, dmdSha256 ? "0b9lphh4g3r9cyzv4wcfppv9j3w952vvwv615za23acgwav3mqg2" +, druntimeSha256 ? "16jv40m073cflpkyl0vmg1g58cianybfcsgcvwli7pfryxbgsbrr" +, phobosSha256 ? "08ircpf4ilznz638kra272hz8fi5ccvw2cswj5hqckssl1lyqzs8" }: let @@ -125,10 +125,6 @@ let # Use proper C++ compiler substituteInPlace ${dmdPath}/posix.mak \ --replace g++ $CXX - - # TODO - substituteInPlace druntime/src/core/memory.d \ - --replace "assert(z is null);" "//assert(z is null);" '' + stdenv.lib.optionalString (!bootstrapVersion) '' diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix index af33039d341..5c1f931da9a 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/default.nix b/pkgs/development/compilers/gambit/default.nix index b70d3649bb9..01463f091c2 100644 --- a/pkgs/development/compilers/gambit/default.nix +++ b/pkgs/development/compilers/gambit/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "gambit-${version}"; - version = "4.8.8-415-g29ed48bb"; + version = "4.8.8-427-g37b111a5"; bootstrap = import ./bootstrap.nix ( pkgs ); src = fetchgit { url = "https://github.com/feeley/gambit.git"; - rev = "29ed48bb688e8302d2430b5d24a2fc7c2039aeec"; - sha256 = "1h3kmczvjir0pi6cmqa2bsc09n68jhw0bxq7m6w4b1f0xvgvn3fr"; + rev = "37b111a5ca3aeff9dc6cb8be470277a8c1e80f24"; + sha256 = "14l7jql9nh7bjs6c822a17rcp9583l6bb5kiq95allgyf229vy50"; }; buildInputs = [ openssl git autoconf bootstrap ]; diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index b4ae867d585..6b2718f5e69 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -118,7 +118,7 @@ let version = "4.5.4"; "--enable-sjlj-exceptions" "--enable-hash-synchronization" "--enable-version-specific-runtime-libs" - "--disable-libssp" + "--enable-libssp" "--disable-nls" "--with-dwarf2" ] else [ @@ -229,11 +229,22 @@ stdenv.mkDerivation ({ inherit noSysDirs profiledCompiler staticCompiler langJava libcCross crossMingw; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] ++ optional (perl != null) perl; - buildInputs = [ gmp mpfr libmpc libelf ] - ++ (optional (ppl != null) ppl) + # 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 (ppl != null) ppl) ++ (optional (cloogppl != null) cloogppl) ++ (optional (zlib != null) zlib) ++ (optional langJava boehmgc) @@ -247,7 +258,7 @@ 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"; @@ -314,56 +325,9 @@ stdenv.mkDerivation ({ /* For cross-built gcc (build != host == target) */ crossAttrs = { - AR_FOR_BUILD = "ar"; - AS_FOR_BUILD = "as"; - LD_FOR_BUILD = "ld"; - NM_FOR_BUILD = "nm"; - OBJCOPY_FOR_BUILD = "objcopy"; - OBJDUMP_FOR_BUILD = "objdump"; - RANLIB_FOR_BUILD = "ranlib"; - SIZE_FOR_BUILD = "size"; - STRINGS_FOR_BUILD = "strings"; - STRIP_FOR_BUILD = "strip"; - CC_FOR_BUILD = "gcc"; - CXX_FOR_BUILD = "g++"; - - AR = "${targetPlatform.config}-ar"; - AS = "${targetPlatform.config}-as"; - LD = "${targetPlatform.config}-ld"; - NM = "${targetPlatform.config}-nm"; - OBJCOPY = "${targetPlatform.config}-objcopy"; - OBJDUMP = "${targetPlatform.config}-objdump"; - RANLIB = "${targetPlatform.config}-ranlib"; - SIZE = "${targetPlatform.config}-size"; - STRINGS = "${targetPlatform.config}-strings"; - STRIP = "${targetPlatform.config}-strip"; - CC = "${targetPlatform.config}-gcc"; - CXX = "${targetPlatform.config}-g++"; - - AR_FOR_TARGET = "${targetPlatform.config}-ar"; - AS_FOR_TARGET = "${targetPlatform.config}-as"; - LD_FOR_TARGET = "${targetPlatform.config}-ld"; - NM_FOR_TARGET = "${targetPlatform.config}-nm"; - OBJCOPY_FOR_TARGET = "${targetPlatform.config}-objcopy"; - OBJDUMP_FOR_TARGET = "${targetPlatform.config}-objdump"; - RANLIB_FOR_TARGET = "${targetPlatform.config}-ranlib"; - SIZE_FOR_TARGET = "${targetPlatform.config}-size"; - STRINGS_FOR_TARGET = "${targetPlatform.config}-strings"; - STRIP_FOR_TARGET = "${targetPlatform.config}-strip"; - CC_FOR_TARGET = "${targetPlatform.config}-gcc"; - CXX_FOR_TARGET = "${targetPlatform.config}-g++"; - dontStrip = true; }; - NIX_BUILD_BINTOOLS = buildPackages.stdenv.cc.bintools; - NIX_BUILD_CC = buildPackages.stdenv.cc; - - # 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. # @@ -422,8 +386,11 @@ stdenv.mkDerivation ({ "-Wl,${libpthreadCross.TARGET_LDFLAGS}" ]); - passthru = { inherit langC langCC langAda langFortran langVhdl - enableMultilib version; isGNU = true; }; + passthru = { + inherit langC langCC langAda langFortran langVhdl enableMultilib version; + isGNU = true; + hardeningUnsupportedFlags = [ "stackprotector" ]; + }; enableParallelBuilding = !langAda; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 4efac1b26c3..0105a159877 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -163,13 +163,9 @@ let version = "4.8.5"; "--enable-threads=win32" "--enable-sjlj-exceptions" "--enable-hash-synchronization" - "--disable-libssp" + "--enable-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 @@ -271,6 +267,7 @@ stdenv.mkDerivation ({ inherit noSysDirs staticCompiler langJava libcCross crossMingw; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) ++ (optional javaAwtGtk pkgconfig); @@ -303,7 +300,7 @@ 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"; @@ -401,57 +398,12 @@ stdenv.mkDerivation ({ /* For cross-built gcc (build != host == target) */ crossAttrs = { - AR_FOR_BUILD = "ar"; - AS_FOR_BUILD = "as"; - LD_FOR_BUILD = "ld"; - NM_FOR_BUILD = "nm"; - OBJCOPY_FOR_BUILD = "objcopy"; - OBJDUMP_FOR_BUILD = "objdump"; - RANLIB_FOR_BUILD = "ranlib"; - SIZE_FOR_BUILD = "size"; - STRINGS_FOR_BUILD = "strings"; - STRIP_FOR_BUILD = "strip"; - CC_FOR_BUILD = "gcc"; - CXX_FOR_BUILD = "g++"; - - AR = "${targetPlatform.config}-ar"; - AS = "${targetPlatform.config}-as"; - LD = "${targetPlatform.config}-ld"; - NM = "${targetPlatform.config}-nm"; - OBJCOPY = "${targetPlatform.config}-objcopy"; - OBJDUMP = "${targetPlatform.config}-objdump"; - RANLIB = "${targetPlatform.config}-ranlib"; - SIZE = "${targetPlatform.config}-size"; - STRINGS = "${targetPlatform.config}-strings"; - STRIP = "${targetPlatform.config}-strip"; - CC = "${targetPlatform.config}-gcc"; - CXX = "${targetPlatform.config}-g++"; - - AR_FOR_TARGET = "${targetPlatform.config}-ar"; - AS_FOR_TARGET = "${targetPlatform.config}-as"; - LD_FOR_TARGET = "${targetPlatform.config}-ld"; - NM_FOR_TARGET = "${targetPlatform.config}-nm"; - OBJCOPY_FOR_TARGET = "${targetPlatform.config}-objcopy"; - OBJDUMP_FOR_TARGET = "${targetPlatform.config}-objdump"; - RANLIB_FOR_TARGET = "${targetPlatform.config}-ranlib"; - SIZE_FOR_TARGET = "${targetPlatform.config}-size"; - STRINGS_FOR_TARGET = "${targetPlatform.config}-strings"; - STRIP_FOR_TARGET = "${targetPlatform.config}-strip"; - CC_FOR_TARGET = "${targetPlatform.config}-gcc"; - CXX_FOR_TARGET = "${targetPlatform.config}-g++"; - dontStrip = true; buildFlags = ""; }; - NIX_BUILD_BINTOOLS = buildPackages.stdenv.cc.bintools; - NIX_BUILD_CC = buildPackages.stdenv.cc; - - # 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. @@ -511,8 +463,11 @@ stdenv.mkDerivation ({ "-Wl,${libpthreadCross.TARGET_LDFLAGS}" ]); - passthru = - { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; isGNU = true; }; + passthru = { + inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; + isGNU = true; + hardeningUnsupportedFlags = [ "stackprotector" ]; + }; inherit enableParallelBuilding enableMultilib; diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index fb4218a0ede..1b1492686d0 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -154,13 +154,9 @@ let version = "4.9.4"; "--enable-threads=win32" "--enable-sjlj-exceptions" "--enable-hash-synchronization" - "--disable-libssp" + "--enable-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 @@ -266,12 +262,23 @@ 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 ]) @@ -302,7 +309,7 @@ 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"; @@ -399,57 +406,12 @@ stdenv.mkDerivation ({ /* For cross-built gcc (build != host == target) */ crossAttrs = { - AR_FOR_BUILD = "ar"; - AS_FOR_BUILD = "as"; - LD_FOR_BUILD = "ld"; - NM_FOR_BUILD = "nm"; - OBJCOPY_FOR_BUILD = "objcopy"; - OBJDUMP_FOR_BUILD = "objdump"; - RANLIB_FOR_BUILD = "ranlib"; - SIZE_FOR_BUILD = "size"; - STRINGS_FOR_BUILD = "strings"; - STRIP_FOR_BUILD = "strip"; - CC_FOR_BUILD = "gcc"; - CXX_FOR_BUILD = "g++"; - - AR = "${targetPlatform.config}-ar"; - AS = "${targetPlatform.config}-as"; - LD = "${targetPlatform.config}-ld"; - NM = "${targetPlatform.config}-nm"; - OBJCOPY = "${targetPlatform.config}-objcopy"; - OBJDUMP = "${targetPlatform.config}-objdump"; - RANLIB = "${targetPlatform.config}-ranlib"; - SIZE = "${targetPlatform.config}-size"; - STRINGS = "${targetPlatform.config}-strings"; - STRIP = "${targetPlatform.config}-strip"; - CC = "${targetPlatform.config}-gcc"; - CXX = "${targetPlatform.config}-g++"; - - AR_FOR_TARGET = "${targetPlatform.config}-ar"; - AS_FOR_TARGET = "${targetPlatform.config}-as"; - LD_FOR_TARGET = "${targetPlatform.config}-ld"; - NM_FOR_TARGET = "${targetPlatform.config}-nm"; - OBJCOPY_FOR_TARGET = "${targetPlatform.config}-objcopy"; - OBJDUMP_FOR_TARGET = "${targetPlatform.config}-objdump"; - RANLIB_FOR_TARGET = "${targetPlatform.config}-ranlib"; - SIZE_FOR_TARGET = "${targetPlatform.config}-size"; - STRINGS_FOR_TARGET = "${targetPlatform.config}-strings"; - STRIP_FOR_TARGET = "${targetPlatform.config}-strip"; - CC_FOR_TARGET = "${targetPlatform.config}-gcc"; - CXX_FOR_TARGET = "${targetPlatform.config}-g++"; - dontStrip = true; buildFlags = ""; }; - NIX_BUILD_BINTOOLS = buildPackages.stdenv.cc.bintools; - NIX_BUILD_CC = buildPackages.stdenv.cc; - - # 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. diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index b4399ef72f1..0636ce7381a 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -49,9 +49,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; @@ -157,13 +154,9 @@ let version = "5.5.0"; "--enable-threads=win32" "--enable-sjlj-exceptions" "--enable-hash-synchronization" - "--disable-libssp" + "--enable-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 @@ -281,17 +274,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]) @@ -315,7 +318,7 @@ 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"; @@ -408,57 +411,12 @@ stdenv.mkDerivation ({ /* For cross-built gcc (build != host == target) */ crossAttrs = { - AR_FOR_BUILD = "ar"; - AS_FOR_BUILD = "as"; - LD_FOR_BUILD = "ld"; - NM_FOR_BUILD = "nm"; - OBJCOPY_FOR_BUILD = "objcopy"; - OBJDUMP_FOR_BUILD = "objdump"; - RANLIB_FOR_BUILD = "ranlib"; - SIZE_FOR_BUILD = "size"; - STRINGS_FOR_BUILD = "strings"; - STRIP_FOR_BUILD = "strip"; - CC_FOR_BUILD = "gcc"; - CXX_FOR_BUILD = "g++"; - - AR = "${targetPlatform.config}-ar"; - AS = "${targetPlatform.config}-as"; - LD = "${targetPlatform.config}-ld"; - NM = "${targetPlatform.config}-nm"; - OBJCOPY = "${targetPlatform.config}-objcopy"; - OBJDUMP = "${targetPlatform.config}-objdump"; - RANLIB = "${targetPlatform.config}-ranlib"; - SIZE = "${targetPlatform.config}-size"; - STRINGS = "${targetPlatform.config}-strings"; - STRIP = "${targetPlatform.config}-strip"; - CC = "${targetPlatform.config}-gcc"; - CXX = "${targetPlatform.config}-g++"; - - AR_FOR_TARGET = "${targetPlatform.config}-ar"; - AS_FOR_TARGET = "${targetPlatform.config}-as"; - LD_FOR_TARGET = "${targetPlatform.config}-ld"; - NM_FOR_TARGET = "${targetPlatform.config}-nm"; - OBJCOPY_FOR_TARGET = "${targetPlatform.config}-objcopy"; - OBJDUMP_FOR_TARGET = "${targetPlatform.config}-objdump"; - RANLIB_FOR_TARGET = "${targetPlatform.config}-ranlib"; - SIZE_FOR_TARGET = "${targetPlatform.config}-size"; - STRINGS_FOR_TARGET = "${targetPlatform.config}-strings"; - STRIP_FOR_TARGET = "${targetPlatform.config}-strip"; - CC_FOR_TARGET = "${targetPlatform.config}-gcc"; - CXX_FOR_TARGET = "${targetPlatform.config}-g++"; - dontStrip = true; buildFlags = ""; }; - NIX_BUILD_BINTOOLS = buildPackages.stdenv.cc.bintools; - NIX_BUILD_CC = buildPackages.stdenv.cc; - - # 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. diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index d923092168a..2614e96e1b7 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -49,9 +49,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; @@ -155,13 +152,9 @@ let version = "6.4.0"; "--enable-threads=win32" "--enable-sjlj-exceptions" "--enable-hash-synchronization" - "--disable-libssp" + "--enable-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 @@ -280,12 +273,23 @@ 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)) @@ -317,7 +321,7 @@ 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"; @@ -409,57 +413,12 @@ stdenv.mkDerivation ({ /* For cross-built gcc (build != host == target) */ crossAttrs = { - AR_FOR_BUILD = "ar"; - AS_FOR_BUILD = "as"; - LD_FOR_BUILD = "ld"; - NM_FOR_BUILD = "nm"; - OBJCOPY_FOR_BUILD = "objcopy"; - OBJDUMP_FOR_BUILD = "objdump"; - RANLIB_FOR_BUILD = "ranlib"; - SIZE_FOR_BUILD = "size"; - STRINGS_FOR_BUILD = "strings"; - STRIP_FOR_BUILD = "strip"; - CC_FOR_BUILD = "gcc"; - CXX_FOR_BUILD = "g++"; - - AR = "${targetPlatform.config}-ar"; - AS = "${targetPlatform.config}-as"; - LD = "${targetPlatform.config}-ld"; - NM = "${targetPlatform.config}-nm"; - OBJCOPY = "${targetPlatform.config}-objcopy"; - OBJDUMP = "${targetPlatform.config}-objdump"; - RANLIB = "${targetPlatform.config}-ranlib"; - SIZE = "${targetPlatform.config}-size"; - STRINGS = "${targetPlatform.config}-strings"; - STRIP = "${targetPlatform.config}-strip"; - CC = "${targetPlatform.config}-gcc"; - CXX = "${targetPlatform.config}-g++"; - - AR_FOR_TARGET = "${targetPlatform.config}-ar"; - AS_FOR_TARGET = "${targetPlatform.config}-as"; - LD_FOR_TARGET = "${targetPlatform.config}-ld"; - NM_FOR_TARGET = "${targetPlatform.config}-nm"; - OBJCOPY_FOR_TARGET = "${targetPlatform.config}-objcopy"; - OBJDUMP_FOR_TARGET = "${targetPlatform.config}-objdump"; - RANLIB_FOR_TARGET = "${targetPlatform.config}-ranlib"; - SIZE_FOR_TARGET = "${targetPlatform.config}-size"; - STRINGS_FOR_TARGET = "${targetPlatform.config}-strings"; - STRIP_FOR_TARGET = "${targetPlatform.config}-strip"; - CC_FOR_TARGET = "${targetPlatform.config}-gcc"; - CXX_FOR_TARGET = "${targetPlatform.config}-g++"; - dontStrip = true; buildFlags = ""; }; - NIX_BUILD_BINTOOLS = buildPackages.stdenv.cc.bintools; - NIX_BUILD_CC = buildPackages.stdenv.cc; - - # 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. diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index c9daf813e6f..0e5f69c2726 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -50,16 +50,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"; @@ -153,13 +150,9 @@ let version = "7.2.0"; "--enable-threads=win32" "--enable-sjlj-exceptions" "--enable-hash-synchronization" - "--disable-libssp" + "--enable-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 @@ -192,7 +185,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "16j7i0888j2f1yp9l0nhji6cq65dy6y4nwy8868a8njbzzwavxqw"; + sha256 = "0p71bij6bfhzyrs8676a8jmpjsfz392s2rg862sdnsk30jpacb43"; }; inherit patches; @@ -277,12 +270,23 @@ 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)) @@ -310,7 +314,7 @@ 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"; @@ -403,57 +407,12 @@ stdenv.mkDerivation ({ /* For cross-built gcc (build != host == target) */ crossAttrs = { - AR_FOR_BUILD = "ar"; - AS_FOR_BUILD = "as"; - LD_FOR_BUILD = "ld"; - NM_FOR_BUILD = "nm"; - OBJCOPY_FOR_BUILD = "objcopy"; - OBJDUMP_FOR_BUILD = "objdump"; - RANLIB_FOR_BUILD = "ranlib"; - SIZE_FOR_BUILD = "size"; - STRINGS_FOR_BUILD = "strings"; - STRIP_FOR_BUILD = "strip"; - CC_FOR_BUILD = "gcc"; - CXX_FOR_BUILD = "g++"; - - AR = "${targetPlatform.config}-ar"; - AS = "${targetPlatform.config}-as"; - LD = "${targetPlatform.config}-ld"; - NM = "${targetPlatform.config}-nm"; - OBJCOPY = "${targetPlatform.config}-objcopy"; - OBJDUMP = "${targetPlatform.config}-objdump"; - RANLIB = "${targetPlatform.config}-ranlib"; - SIZE = "${targetPlatform.config}-size"; - STRINGS = "${targetPlatform.config}-strings"; - STRIP = "${targetPlatform.config}-strip"; - CC = "${targetPlatform.config}-gcc"; - CXX = "${targetPlatform.config}-g++"; - - AR_FOR_TARGET = "${targetPlatform.config}-ar"; - AS_FOR_TARGET = "${targetPlatform.config}-as"; - LD_FOR_TARGET = "${targetPlatform.config}-ld"; - NM_FOR_TARGET = "${targetPlatform.config}-nm"; - OBJCOPY_FOR_TARGET = "${targetPlatform.config}-objcopy"; - OBJDUMP_FOR_TARGET = "${targetPlatform.config}-objdump"; - RANLIB_FOR_TARGET = "${targetPlatform.config}-ranlib"; - SIZE_FOR_TARGET = "${targetPlatform.config}-size"; - STRINGS_FOR_TARGET = "${targetPlatform.config}-strings"; - STRIP_FOR_TARGET = "${targetPlatform.config}-strip"; - CC_FOR_TARGET = "${targetPlatform.config}-gcc"; - CXX_FOR_TARGET = "${targetPlatform.config}-g++"; - dontStrip = true; buildFlags = ""; }; - NIX_BUILD_BINTOOLS = buildPackages.stdenv.cc.bintools; - NIX_BUILD_CC = buildPackages.stdenv.cc; - - # 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. diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix index 9d1bdc08133..c1306d374d5 100644 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -50,9 +50,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; @@ -153,13 +150,9 @@ let version = "7-20170409"; "--enable-threads=win32" "--enable-sjlj-exceptions" "--enable-hash-synchronization" - "--disable-libssp" + "--enable-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 @@ -264,12 +257,23 @@ 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)) @@ -297,7 +301,7 @@ 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"; @@ -390,57 +394,12 @@ stdenv.mkDerivation ({ /* For cross-built gcc (build != host == target) */ crossAttrs = { - AR_FOR_BUILD = "ar"; - AS_FOR_BUILD = "as"; - LD_FOR_BUILD = "ld"; - NM_FOR_BUILD = "nm"; - OBJCOPY_FOR_BUILD = "objcopy"; - OBJDUMP_FOR_BUILD = "objdump"; - RANLIB_FOR_BUILD = "ranlib"; - SIZE_FOR_BUILD = "size"; - STRINGS_FOR_BUILD = "strings"; - STRIP_FOR_BUILD = "strip"; - CC_FOR_BUILD = "gcc"; - CXX_FOR_BUILD = "g++"; - - AR = "${targetPlatform.config}-ar"; - AS = "${targetPlatform.config}-as"; - LD = "${targetPlatform.config}-ld"; - NM = "${targetPlatform.config}-nm"; - OBJCOPY = "${targetPlatform.config}-objcopy"; - OBJDUMP = "${targetPlatform.config}-objdump"; - RANLIB = "${targetPlatform.config}-ranlib"; - SIZE = "${targetPlatform.config}-size"; - STRINGS = "${targetPlatform.config}-strings"; - STRIP = "${targetPlatform.config}-strip"; - CC = "${targetPlatform.config}-gcc"; - CXX = "${targetPlatform.config}-g++"; - - AR_FOR_TARGET = "${targetPlatform.config}-ar"; - AS_FOR_TARGET = "${targetPlatform.config}-as"; - LD_FOR_TARGET = "${targetPlatform.config}-ld"; - NM_FOR_TARGET = "${targetPlatform.config}-nm"; - OBJCOPY_FOR_TARGET = "${targetPlatform.config}-objcopy"; - OBJDUMP_FOR_TARGET = "${targetPlatform.config}-objdump"; - RANLIB_FOR_TARGET = "${targetPlatform.config}-ranlib"; - SIZE_FOR_TARGET = "${targetPlatform.config}-size"; - STRINGS_FOR_TARGET = "${targetPlatform.config}-strings"; - STRIP_FOR_TARGET = "${targetPlatform.config}-strip"; - CC_FOR_TARGET = "${targetPlatform.config}-gcc"; - CXX_FOR_TARGET = "${targetPlatform.config}-g++"; - dontStrip = true; buildFlags = ""; }; - NIX_BUILD_BINTOOLS = buildPackages.stdenv.cc.bintools; - NIX_BUILD_CC = buildPackages.stdenv.cc; - - # 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. diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix index 622107c7534..9bd23aebfc4 100644 --- a/pkgs/development/compilers/gerbil/default.nix +++ b/pkgs/development/compilers/gerbil/default.nix @@ -1,25 +1,27 @@ { stdenv, fetchurl, fetchgit, gambit, coreutils, rsync, bash, - openssl, zlib, sqlite, libxml2, libyaml, libmysql, lmdb, leveldb }: + openssl, zlib, sqlite, libxml2, libyaml, mysql, lmdb, leveldb }: # TODO: distinct packages for gerbil-release and gerbil-devel stdenv.mkDerivation rec { name = "gerbil-${version}"; - version = "0.12-DEV-836-gcde6802"; + version = "0.12-DEV-1030-gbbed3bc"; src = fetchgit { url = "https://github.com/vyzo/gerbil.git"; - rev = "2904b0014fac344409d0ae2ba5835d0e67ac83b5"; - sha256 = "1nnirqdd11n6pkvidnf8pb39m45jjnpmwj2qy62di024r7ha3y18"; + rev = "bbed3bc4cf7bcaa64eaabdf097192bfcc2bfc928"; + sha256 = "1dc0j143j860yq72lfjp71fin7hpsy1426azz7rl1szxvjfb7h4r"; }; buildInputs = [ gambit coreutils rsync bash - openssl zlib sqlite libxml2 libyaml libmysql lmdb leveldb + openssl zlib sqlite libxml2 libyaml mysql.connector-c lmdb leveldb ]; + NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ]; + postPatch = '' echo '(define (gerbil-version-string) "v${version}")' > src/gerbil/runtime/gx-version.scm @@ -36,6 +38,9 @@ stdenv.mkDerivation rec { # Enable all optional libraries substituteInPlace "src/std/build-features.ss" --replace '#f' '#t' + # gxprof testing uses $HOME/.cache/gerbil/gxc + export HOME=$$PWD + # Build, replacing make by build.sh ( cd src && sh build.sh ) diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix deleted file mode 100644 index 84250c1a6d3..00000000000 --- a/pkgs/development/compilers/ghc/6.10.2-binary.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ stdenv -, fetchurl, perl -, libedit, ncurses5, gmp -}: - -stdenv.mkDerivation rec { - version = "6.10.2"; - - name = "ghc-${version}-binary"; - - src = fetchurl ({ - "i686-linux" = { - # This binary requires libedit.so.0 (rather than libedit.so.2). - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-unknown-linux.tar.bz2"; - sha256 = "1fw0zr2qshlpk8s0d16k27zcv5263nqdg2xds5ymw8ff6qz9rz9b"; - }; - "x86_64-linux" = { - # Idem. - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-unknown-linux.tar.bz2"; - sha256 = "1rd2j7lmcfsm2rdfb5g6q0l8dz3sxadk5m3d2f69d4a6g4p4h7jj"; - }; - }.${stdenv.hostPlatform.system} - or (throw "cannot bootstrap GHC on this platform")); - - buildInputs = [perl]; - - postUnpack = - # 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" - '' + - # 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 c56762edd24..00000000000 --- 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 a46ef66a8cb..00000000000 --- 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 index 394e4239e9a..51dd24671bd 100644 --- a/pkgs/development/compilers/ghc/7.0.4-binary.nix +++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix @@ -3,6 +3,19 @@ , 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 = "7.0.4"; @@ -28,7 +41,11 @@ stdenv.mkDerivation rec { }.${stdenv.hostPlatform.system} or (throw "cannot bootstrap GHC on this platform")); - buildInputs = [perl]; + nativeBuildInputs = [ perl ]; + + # 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 @@ -57,41 +74,25 @@ stdenv.mkDerivation rec { 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. + # Rename needed libraries and binaries, fix interpreter 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 ]}" {} \; + find . -type f -perm -0100 -exec patchelf \ + --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 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}"} - ''; + 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) @@ -101,7 +102,26 @@ stdenv.mkDerivation rec { # calls install-strip ... dontBuild = true; - postInstall = '' + # On Linux, use patchelf to modify the executables so that they can + # find editline/gmp. + preFixup = stdenv.lib.optionalString stdenv.isLinux '' + find "$out" -type f -executable \ + -exec patchelf --set-rpath "${libPath}" {} \; + '' + 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 $exe + done + + for file in $(find "$out" -name setup-config); do + substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)" + done + ''; + + doInstallCheck = true; + installCheckPhase = '' # Sanity check, can ghc create executables? cd $TMP mkdir test-ghc; cd test-ghc @@ -114,6 +134,13 @@ stdenv.mkDerivation rec { [ $(./main) == "yes" ] ''; + passthru = { + targetPrefix = ""; + + # Our Cabal compiler name + haskellCompilerName = "ghc"; + }; + 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 index 9d052ddb246..54323458d9b 100644 --- a/pkgs/development/compilers/ghc/7.0.4.nix +++ b/pkgs/development/compilers/ghc/7.0.4.nix @@ -1,11 +1,14 @@ { stdenv, fetchurl, ghc, perl, gmp, ncurses, libiconv }: +# TODO(@Ericson2314): Cross compilation support +assert stdenv.targetPlatform == stdenv.hostPlatform; + stdenv.mkDerivation rec { version = "7.0.4"; name = "ghc-${version}"; src = fetchurl { - url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.bz2"; sha256 = "1a9b78d9d66c9c21de6c0932e36bb87406a4856f1611bf83bd44539bdc6ed0ed"; }; @@ -25,7 +28,7 @@ stdenv.mkDerivation rec { ''; preConfigure = '' - echo "${buildMK}" > mk/build.mk + echo -n "${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(|' @@ -42,6 +45,13 @@ stdenv.mkDerivation rec { # that in turn causes GHCi to abort stripDebugFlags=["-S" "--keep-file-symbols"]; + passthru = { + targetPrefix = ""; + + # Our Cabal compiler name + haskellCompilerName = "ghc"; + }; + meta = { homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; 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 51274dd6059..00000000000 --- 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 00000000000..c56798e31ae --- /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 d573a22e0ae..c4780690f67 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"; }; 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 dd3b5cb2ebc..00000000000 --- 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 index 9d85253f630..4f00ef8fb75 100644 --- a/pkgs/development/compilers/ghc/7.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix @@ -1,8 +1,21 @@ { stdenv -, fetchurl, perl, makeWrapper +, fetchurl, perl , 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 = "7.4.2"; @@ -28,7 +41,11 @@ stdenv.mkDerivation rec { }.${stdenv.hostPlatform.system} or (throw "cannot bootstrap GHC on this platform")); - buildInputs = [perl]; + nativeBuildInputs = [ perl ]; + + # 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 @@ -57,14 +74,11 @@ stdenv.mkDerivation rec { 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. + # Rename needed libraries and binaries, fix interpreter 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 ]}" {} \; + find . -type f -perm -0100 -exec patchelf \ + --replace-needed libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \; paxmark m ./ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 @@ -73,30 +87,13 @@ stdenv.mkDerivation rec { 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}"} - ''; + 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) @@ -106,15 +103,26 @@ stdenv.mkDerivation rec { # 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 + # On Linux, use patchelf to modify the executables so that they can + # find editline/gmp. + preFixup = stdenv.lib.optionalString stdenv.isLinux '' + find "$out" -type f -executable \ + -exec patchelf --set-rpath "${libPath}" {} \; + '' + 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 $exe + done + + for file in $(find "$out" -name setup-config); do + substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)" + done ''; - postInstall = '' + doInstallCheck = true; + installCheckPhase = '' # Sanity check, can ghc create executables? cd $TMP mkdir test-ghc; cd test-ghc @@ -128,6 +136,13 @@ stdenv.mkDerivation rec { [ $(./main) == "yes" ] ''; + passthru = { + targetPrefix = ""; + + # Our Cabal compiler name + haskellCompilerName = "ghc"; + }; + 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 index e5bc4724c9e..7f636284c68 100644 --- a/pkgs/development/compilers/ghc/7.4.2.nix +++ b/pkgs/development/compilers/ghc/7.4.2.nix @@ -1,17 +1,21 @@ { stdenv, fetchurl, ghc, perl, ncurses, libiconv - # If enabled GHC will be build with the GPL-free but slower integer-simple +, # 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 }: +# TODO(@Ericson2314): Cross compilation support +assert stdenv.targetPlatform == stdenv.hostPlatform; +assert !enableIntegerSimple -> gmp != null; + 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"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.bz2"; sha256 = "0vc3zmxqi4gflssmj35n5c8idbvyrhd88abi50whbirwlf4i5vpj"; }; @@ -28,17 +32,17 @@ stdenv.mkDerivation rec { libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib" ''} '' + (if enableIntegerSimple then '' - INTEGER_LIBRARY=integer-simple + 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 + 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 '' 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(|' @@ -52,6 +56,13 @@ stdenv.mkDerivation rec { # that in turn causes GHCi to abort stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; + passthru = { + targetPrefix = ""; + + # Our Cabal compiler name + haskellCompilerName = "ghc"; + }; + meta = { homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; diff --git a/pkgs/development/compilers/ghc/7.6.3.nix b/pkgs/development/compilers/ghc/7.6.3.nix index fde4ca2aa37..481b8d90918 100644 --- a/pkgs/development/compilers/ghc/7.6.3.nix +++ b/pkgs/development/compilers/ghc/7.6.3.nix @@ -1,10 +1,14 @@ { stdenv, fetchurl, ghc, perl, ncurses, libiconv - # If enabled GHC will be build with the GPL-free but slower integer-simple +, # 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 }: +# TODO(@Ericson2314): Cross compilation support +assert stdenv.targetPlatform == stdenv.hostPlatform; +assert !enableIntegerSimple -> gmp != null; + 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 @@ -18,7 +22,7 @@ in stdenv.mkDerivation rec { name = "ghc-${version}"; src = fetchurl { - url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.bz2"; sha256 = "1669m8k9q72rpd2mzs0bh2q6lcwqiwd1ax3vrard1dgn64yq4hxx"; }; @@ -39,14 +43,14 @@ in stdenv.mkDerivation rec { SRC_HC_OPTS += ${ghcFlags} SRC_CC_OPTS += ${cFlags} '' + (if enableIntegerSimple then '' - INTEGER_LIBRARY=integer-simple + 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 + echo -n "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString stdenv.isLinux '' @@ -54,7 +58,7 @@ in stdenv.mkDerivation rec { 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}" + export 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(|' @@ -78,6 +82,13 @@ in stdenv.mkDerivation rec { # that in turn causes GHCi to abort stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; + passthru = { + targetPrefix = ""; + + # Our Cabal compiler name + haskellCompilerName = "ghc"; + }; + meta = { homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; 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 50b0108861f..00000000000 --- 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-binary.nix b/pkgs/development/compilers/ghc/7.8.4-binary.nix new file mode 100644 index 00000000000..58a9370b321 --- /dev/null +++ b/pkgs/development/compilers/ghc/7.8.4-binary.nix @@ -0,0 +1,156 @@ +{ stdenv +, fetchurl, perl +, 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 = "7.8.4"; + + name = "ghc-${version}-binary"; + + src = fetchurl ({ + "i686-linux" = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-unknown-linux-deb7.tar.bz2"; + sha256 = "5da2cf45986f33319a92a666f1f0149915334a7b64b41892ab94f4557242b406"; + }; + "x86_64-linux" = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-unknown-linux-deb7.tar.bz2"; + sha256 = "20b5731d268613bbf6e977dbb192a3a3b7b78d954c35edbfca4fb36b652e24f7"; + }; + "x86_64-darwin" = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.bz2"; + sha256 = "dfa161c2a136ee16214a49d5902e2377407c8292dbbdbb14fa0fa6b17220cae6"; + }; + }.${stdenv.hostPlatform.system} + or (throw "cannot bootstrap GHC on this platform")); + + nativeBuildInputs = [ perl ]; + + # 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 $exe + for file in $(find . -name setup-config); do + substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)" + done + 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 $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"]; +} diff --git a/pkgs/development/compilers/ghc/7.8.4.nix b/pkgs/development/compilers/ghc/7.8.4.nix index 5a380c75c69..15f105946f5 100644 --- a/pkgs/development/compilers/ghc/7.8.4.nix +++ b/pkgs/development/compilers/ghc/7.8.4.nix @@ -1,54 +1,86 @@ -{ stdenv, fetchurl, ghc, perl, ncurses, libiconv +{ stdenv, targetPackages - # If enabled GHC will be build with the GPL-free but slower integer-simple +, fetchurl, ghc, perl +, libffi, libiconv ? null, ncurses + +, # 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 }: -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; +# TODO(@Ericson2314): Cross compilation support +assert stdenv.targetPlatform == stdenv.hostPlatform; +assert !enableIntegerSimple -> gmp != null; +let 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 '' + ${stdenv.lib.optionalString (stdenv.hostPlatform.libc != "glibc") '' 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 + 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" ''); + # Splicer will pull out correct variations + libDeps = [ ncurses ] + ++ stdenv.lib.optional (!enableIntegerSimple) gmp + ++ stdenv.lib.optional (stdenv.hostPlatform.libc != "glibc") libiconv; + +in + +stdenv.mkDerivation rec { + version = "7.8.4"; + name = "ghc-${version}"; + + src = fetchurl { + url = "http://www.haskell.org/ghc/dist/${version}/${name}-src.tar.xz"; + sha256 = "1i4254akbb4ym437rf469gc0m40bxm31blp6s1z1g15jmnacs6f3"; + }; + + enableParallelBuilding = true; + + patches = [ ./relocation.patch ] + ++ stdenv.lib.optional stdenv.isDarwin ./hpc-7.8.4.patch; + preConfigure = '' - echo "${buildMK}" > mk/build.mk + 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" ''; + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ]; + + nativeBuildInputs = [ ghc perl ]; + depsBuildTarget = [ targetPackages.stdenv.cc ]; + + buildInputs = libDeps; + propagatedBuildInputs = [ targetPackages.stdenv.cc ]; + + depsTargetTarget = map stdenv.lib.getDev libDeps; + depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") libDeps; + # 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"; + passthru = { + targetPrefix = ""; + + # Our Cabal compiler name + haskellCompilerName = "ghc"; + }; + meta = { homepage = http://haskell.org/ghc; description = "The Glasgow Haskell Compiler"; @@ -56,7 +88,4 @@ stdenv.mkDerivation (rec { 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 d475e3438b4..011822994ed 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"; }; 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 00000000000..8a08ab4b986 --- /dev/null +++ b/pkgs/development/compilers/ghc/8.2.1-binary.nix @@ -0,0 +1,162 @@ +{ 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; + meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux" "aarch64-linux"]; +} diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 736a6edc365..8b62bbffcc8 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -1,82 +1,189 @@ -{ 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 + +, 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)) }: +assert !enableIntegerSimple -> gmp != null; + let inherit (bootPkgs) ghc; - version = "8.2.2"; - 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/${name}-src.tar.xz"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; sha256 = "1z05vkpaj54xdypmaml50hgsdpw29dhbs2r7magx0cm199iw73mv"; }; - postPatch = "patchShebangs ."; - - preConfigure = commonPreConfigure; - - buildInputs = commonBuildInputs; - enableParallelBuilding = true; - configureFlags = [ - "CC=${stdenv.cc}/bin/cc" - "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - "--datadir=$doc/share/doc/ghc" - ] ++ stdenv.lib.optional (! enableIntegerSimple) [ - "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" - ] ++ stdenv.lib.optional stdenv.isDarwin [ - "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" + outputs = [ "out" "doc" ]; + + patches = [ + (fetchpatch { # Fix STRIP to be substituted from configure + url = "https://git.haskell.org/ghc.git/commitdiff_plain/2fc8ce5f0c8c81771c26266ac0b150ca9b75c5f3"; + sha256 = "03253ci40np1v6k0wmi4aypj3nmj3rdyvb1k6rwqipb30nfc719f"; + }) ]; + 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 = [ 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"; }; meta = { @@ -86,32 +193,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 00000000000..17dc24e567f --- /dev/null +++ b/pkgs/development/compilers/ghc/8.4.1.nix @@ -0,0 +1,193 @@ +{ stdenv, targetPackages +, buildPlatform, hostPlatform, targetPlatform + +# 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 ? 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.4.20180122" +}: + +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 = "61db0b8941cfb7ed8941ed29bdb04bd8ef3b71a5"; + sha256 = "15sbpgkal4854jc1xn3sprvpnxwdj0fyy43y5am0h9vja3pjhjyi"; + }; + + 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 + 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 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"; + }; + + 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/head.nix b/pkgs/development/compilers/ghc/head.nix index 3f5dfa65958..82cef10ce3b 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.5.20171209" + 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 ]; + # TODO(@Ericson2314) Make unconditional + targetPrefix = stdenv.lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; - rev = "4335c07ca7e64624819b22644d7591853826bd75"; - - 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 = "19csad94sk0bw2nj97ppmnwh4c193jg0jmg5w2sx9rqm9ih4yg85"; + rev = "e1d4140be4d2a1508015093b69e1ef53516e1eb6"; + sha256 = "1gdcr10dd968d40qgljdwx9vfkva3yrvjm9a4nis7whaaac3ag58"; }; - postPatch = "patchShebangs ."; - - preConfigure = commonPreConfigure; - - buildInputs = commonBuildInputs; - 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 + 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"; }; 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/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix index d4418b058d9..ab72d1fb1b3 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 { diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index ff989ea22c4..7f3cc944001 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 2cf6c8b39c2..84eb2d8bd0d 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/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix index b1230da5a14..82ed9b53c60 100644 --- a/pkgs/development/compilers/go/1.7.nix +++ b/pkgs/development/compilers/go/1.7.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { # perl is used for testing go vet nativeBuildInputs = [ perl which pkgconfig patch ]; - buildInputs = [ pcre ]; + buildInputs = [ cacert pcre ]; propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; hardeningDisable = [ "all" ]; @@ -116,8 +116,6 @@ stdenv.mkDerivation rec { }) ]; - 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" diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix index 210f259df89..651eb79d75a 100644 --- a/pkgs/development/compilers/go/1.8.nix +++ b/pkgs/development/compilers/go/1.8.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { # perl is used for testing go vet nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ] ++ optionals stdenv.isLinux [ procps ]; - buildInputs = [ pcre ] + buildInputs = [ cacert pcre ] ++ optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ]; propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; @@ -83,7 +83,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 @@ -122,8 +122,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" diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index 8708bd762c4..b226cd7a7eb 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -25,19 +25,19 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "07p4ld07r2nml2bsbfb8h51hqilbqyhhdlia99y1gk7ibvhybv8i"; + sha256 = "0ivb6z30d6qrrkwjm9fdz9jfs567q4b6dljwwxc9shmdr2l9chah"; }; # perl is used for testing go vet nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ] ++ optionals stdenv.isLinux [ procps ]; - buildInputs = [ pcre ] + buildInputs = [ cacert pcre ] ++ optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ]; propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; @@ -87,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 @@ -128,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" @@ -141,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. diff --git a/pkgs/development/compilers/go/setup-hook.sh b/pkgs/development/compilers/go/setup-hook.sh index 1b91c8312b8..7dce15eeb10 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/halvm/2.4.0.nix b/pkgs/development/compilers/halvm/2.4.0.nix deleted file mode 100644 index 0c4cef653d8..00000000000 --- 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/setup-hook.sh b/pkgs/development/compilers/haxe/setup-hook.sh index 21cc0206859..e6496107a5e 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 2f84387a888..a66b2264f07 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -2,7 +2,7 @@ , 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 }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; 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 diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index 0e4bc420241..62fa578cef6 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/jhc/default.nix b/pkgs/development/compilers/jhc/default.nix deleted file mode 100644 index 6b8c6599062..00000000000 --- 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 790f9a4827a..d4664673306 100644 --- a/pkgs/development/compilers/jsonnet/default.nix +++ b/pkgs/development/compilers/jsonnet/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, emscripten }: -let version = "0.9.4"; in +let version = "0.9.5"; in stdenv.mkDerivation { name = "jsonnet-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { rev = "v${version}"; owner = "google"; repo = "jsonnet"; - sha256 = "1bh9x8d3mxnic31b6gh4drn5l6qpyqfgsn2l48sv0jknhinm1a7l"; + sha256 = "193sa4hdhvml0c32nmdkjii41hbyc5l0zisdn699ar0gaq7yiqan"; }; buildInputs = [ emscripten ]; diff --git a/pkgs/development/compilers/julia/0.6.nix b/pkgs/development/compilers/julia/0.6.nix index fabb2a7d6d7..6acb192933e 100644 --- a/pkgs/development/compilers/julia/0.6.nix +++ b/pkgs/development/compilers/julia/0.6.nix @@ -33,10 +33,10 @@ 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"; @@ -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 diff --git a/pkgs/development/compilers/julia/git.nix b/pkgs/development/compilers/julia/git.nix index cfddb862f59..19519823f37 100644 --- a/pkgs/development/compilers/julia/git.nix +++ b/pkgs/development/compilers/julia/git.nix @@ -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/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 5015f490077..108fefca863 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.2.10"; + version = "1.2.21"; in stdenv.mkDerivation rec { inherit version; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "1qr61i5fjd5p7bi05hplagmcxgb05k4xdh5yjjvaq8cij5l4b1wm"; + sha256 = "08mg0xl6n5kl71rn4ix6innqa7dlirmw1rlj9qwmqv5abp9wpwn5"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index 73d798bb66f..bdb74680b13 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -2,8 +2,8 @@ , python, libconfig, lit, gdb, unzip, darwin, bash , callPackage , bootstrapVersion ? false -, version ? "1.5.0" -, ldcSha256 ? "1150sgns03vplni2wd4afk3rgw3rap8rsiipspw0rzxgki5rlr83" +, version ? "1.7.0" +, ldcSha256 ? "1g8qvmlzvsp030z2rw6lis4kclsd9mlmnbim5kas0k1yr9063m3w" }: let @@ -59,8 +59,8 @@ let '' + stdenv.lib.optionalString (!bootstrapVersion) '' - # https://github.com/NixOS/nixpkgs/issues/29611 - rm tests/sanitizers/asan_* + # http://forum.dlang.org/thread/xtbbqthxutdoyhnxjhxl@forum.dlang.org + rm -r tests/dynamiccompile ''; ROOT_HOME_DIR = "$(echo ~root)"; @@ -71,9 +71,6 @@ let "phobos/std/datetime/timezone.d"; postPatch = '' - substituteInPlace cmake/Modules/FindLLVM.cmake \ - --replace "llvm_set(LIBRARY_DIRS" "#llvm_set(LIBRARY_DIRS" - substituteInPlace runtime/${datetimePath} \ --replace "import core.time;" "import core.time;import std.path;" @@ -97,7 +94,7 @@ let substituteInPlace runtime/phobos/std/path.d \ --replace "\"/root" "\"${ROOT_HOME_DIR}" - # TODO + # 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);" '' @@ -108,14 +105,16 @@ let 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 + # 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 (stdenv.hostPlatform.isLinux && bootstrapVersion) '' - substituteInPlace dmd2/root/port.c \ - --replace "#include " "#include " + + 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) '' @@ -147,7 +146,6 @@ let "-DLDC_WITH_LLD=OFF" # Xcode 9.0.1 fixes that bug according to ldc release notes "-DRT_ARCHIVE_WITH_LDC=OFF" - "-DLLVM_LIBRARY_DIRS=${llvm}/lib" ) ''; @@ -214,7 +212,6 @@ let "-DLDC_WITH_LLD=OFF" # Xcode 9.0.1 fixes that bug according to ldc release notes "-DRT_ARCHIVE_WITH_LDC=OFF" - "-DLLVM_LIBRARY_DIRS=${llvm}/lib" "-DD_COMPILER=${ldcBuild}/bin/ldmd2" ) ''; diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix index 741ecc3856f..10510c75035 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.7/default.nix b/pkgs/development/compilers/llvm/3.7/default.nix index 35af978216c..5cac04c044d 100644 --- a/pkgs/development/compilers/llvm/3.7/default.nix +++ b/pkgs/development/compilers/llvm/3.7/default.nix @@ -44,15 +44,11 @@ let 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/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix index 90b8ea2581e..0147485dd58 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 bd79db012a6..9e37f93dbdd 100644 --- a/pkgs/development/compilers/llvm/3.8/default.nix +++ b/pkgs/development/compilers/llvm/3.8/default.nix @@ -22,6 +22,8 @@ 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 { @@ -41,15 +43,11 @@ let 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/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix index ec2ec27df36..aafe30e4c9b 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 5ce51bc9c12..a675bcceb1c 100644 --- a/pkgs/development/compilers/llvm/3.9/default.nix +++ b/pkgs/development/compilers/llvm/3.9/default.nix @@ -22,6 +22,8 @@ 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 { @@ -41,15 +43,11 @@ let 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/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix index 8d40ee3c8aa..a2ba1fe7f4c 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,9 +37,8 @@ let patches = [ ./purity.patch ]; - postBuild = stdenv.lib.optionalString enableManpages '' - cmake --build . --target docs-clang-man - ''; + # XXX: TODO: This should be removed on next rebuild + postBuild = ""; postPatch = '' sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp @@ -49,8 +48,7 @@ let sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt ''; - 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 +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 { @@ -92,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/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix index fa61a6c22e7..562f9e3457d 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; @@ -56,15 +57,11 @@ let 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/lldb.nix b/pkgs/development/compilers/llvm/4/lldb.nix index 7d33179913b..5ffc346a479 100644 --- a/pkgs/development/compilers/llvm/4/lldb.nix +++ b/pkgs/development/compilers/llvm/4/lldb.nix @@ -43,6 +43,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/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index 33147b07599..711024c7d3c 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -27,7 +27,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,8 +39,7 @@ 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 ] ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; @@ -129,10 +128,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" \ @@ -160,4 +156,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/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index fa8502ebd67..0ee1404484b 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,9 +37,8 @@ let patches = [ ./purity.patch ]; - postBuild = stdenv.lib.optionalString enableManpages '' - cmake --build . --target docs-clang-man - ''; + # XXX: TODO: This should be removed on next rebuild + postBuild = ""; postPatch = '' sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ @@ -50,8 +49,7 @@ let sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt ''; - 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 +58,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 +87,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 9891f3090ac..13e1d2308f8 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; @@ -56,15 +57,11 @@ let 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 036161f7b88..6f03e225ad6 100644 --- a/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "libc++-${version}"; - src = fetch "libcxx" "1cf953msb0vwgjjrapw06950dnsdb2ps305czkn0vvr1k8g9irga"; + src = fetch "libcxx" "003wwniwlikgh38cbqbcshc5gkiv3a2jkmbn6am9s46y5gfrk3zs"; postUnpack = '' unpackFile ${libcxxabi.src} diff --git a/pkgs/development/compilers/llvm/5/libc++abi.nix b/pkgs/development/compilers/llvm/5/libc++abi.nix index 5a2a269345d..166f4260291 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; diff --git a/pkgs/development/compilers/llvm/5/lld.nix b/pkgs/development/compilers/llvm/5/lld.nix index f19a9afc804..1d00b16cce1 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 fac23b290bc..559c52831cd 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 8358b6b18c3..400ffa34117 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -22,12 +22,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 = '' @@ -39,8 +39,7 @@ 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 ] ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; @@ -123,10 +122,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" \ @@ -154,4 +150,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 9ba42eed2e2..5a01c191b5a 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/mentor/default.nix b/pkgs/development/compilers/mentor/default.nix index 74905c6ffae..7cd3c179366 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 076f3c95675..4670f39eac1 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/5.4.nix b/pkgs/development/compilers/mono/5.4.nix new file mode 100644 index 00000000000..31e86f94c0a --- /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/generic-cmake.nix b/pkgs/development/compilers/mono/generic-cmake.nix index de19e4b633e..7621bd56d47 100644 --- a/pkgs/development/compilers/mono/generic-cmake.nix +++ b/pkgs/development/compilers/mono/generic-cmake.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { 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" \ + -e 's#[^"]*libgdiplus[^"]*"#${libgdiplus}/lib/libgdiplus.so"#' \ ''; # Without this, any Mono application attempting to open an SSL connection will throw with diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index 51e39593fe1..a8012f6bb9e 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://mono-project.com/; description = "Cross platform, open source .NET development framework"; - platforms = with stdenv.lib.platforms; darwin ++ linux; + platforms = with stdenv.lib.platforms; allBut [ "aarch64-linux" ]; maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice obadz vrthra ]; license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ? }; diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index 236273bf6be..4dce11f93b1 100644 --- a/pkgs/development/compilers/neko/default.nix +++ b/pkgs/development/compilers/neko/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, boehmgc, zlib, sqlite, pcre, cmake, pkgconfig -, git, apacheHttpd, apr, aprutil, mariadb, mbedtls, openssl, pkgs, gtk2, libpthreadstubs +, git, apacheHttpd, apr, aprutil, mysql, mbedtls, openssl, pkgs, gtk2, libpthreadstubs }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig git ]; buildInputs = [ boehmgc zlib sqlite pcre apacheHttpd apr aprutil - mariadb.client mbedtls openssl libpthreadstubs ] + 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]; diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index fde4861e982..a49b1b82439 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/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 17b3033c31d..03ae6e518d0 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/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 71ce9271bfa..b74c8a47dde 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -21,42 +21,42 @@ let else throw "openjdk requires i686-linux or x86_64 linux"; - update = "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}"; diff --git a/pkgs/development/compilers/openjdk/9.nix b/pkgs/development/compilers/openjdk/9.nix index f76d1e8ffb5..0a9be04ebb2 100644 --- a/pkgs/development/compilers/openjdk/9.nix +++ b/pkgs/development/compilers/openjdk/9.nix @@ -21,42 +21,42 @@ let else throw "openjdk requires i686-linux or x86_64 linux"; - update = "9.0.1"; + update = "9.0.4"; build = "11"; baseurl = "http://hg.openjdk.java.net/jdk-updates/jdk9u"; repover = "jdk-${update}+${build}"; paxflags = if stdenv.isi686 then "msp" else "m"; jdk9 = fetchurl { url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = "13zqai3kpk5yi7yg3f7n2ss8spzyq0zy9431y97ni0j72h8ddsvy"; + sha256 = "1y8sq0fxvj5s5gx5qm2mbr710xqrgv3d200k6bv71bawjh57v3xx"; }; langtools = fetchurl { url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = "1w2djchv3dr8hv815kxfi1458n1nbq23yzv4p8rxpl1fzxrcd5pm"; + sha256 = "1n6aqmph6a9spxyfi40k8g5hy2bnfd499gr6jkmq49phdb2qg7wy"; }; hotspot = fetchurl { url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = "1kb4h9w0xbxvndi5rk3byv3v95883nkqdzjadbw1cvqvzp3kgaw8"; + sha256 = "1i34k3pc2slnjk469zskqq1z0jna1xg2zzjdk7zjrhrfgsrgvfsh"; }; corba = fetchurl { url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = "0hqzmlg6dmr67ghrlh515iam34d9jx4jcdbhchbl2ny00q42diy2"; + sha256 = "1k6r5yxf5h1m451vlwzk9zqkmdlln3ky3kir5qjgan4hz892f297"; }; jdk = fetchurl { url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = "0km0k9hi8wfv2d10i08jgb4kf0l8jhp1174dsmmc9yh0ig1vij08"; + sha256 = "0gafc0jx8fx13y6iir9zxmqrsw1a3w71xgdvjx9rk64acc24piy2"; }; jaxws = fetchurl { url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = "1crsr3hcq4j0xbmn1jcsw0m6hxqqkxxsib86i63vvcha94336iyp"; + sha256 = "1bw3z346mna6pgz76phcmfm0ykydcwagqxhffj0mzbdll7ysw25p"; }; jaxp = fetchurl { url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = "1w9i1zl72nq7aw9l50fc7dlggiy7iq52p8xh44hv50mdvn0xsa4k"; + sha256 = "063fhnmm2g83jrdv2bl968glr46vvgjpyk9rjmh2fwfplzclb51s"; }; nashorn = fetchurl { url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; - sha256 = "0rm50mk6935iqx2rla6j8j8kjs0p4f7rff0wsp0qvbf6g0pwwks1"; + sha256 = "0wyx76nd4v6xy4vmp94anxwk9bfqyb0l4n3hqhfqyz6azi8pqk66"; }; openjdk9 = stdenv.mkDerivation { name = "openjdk-${update}-b${build}"; diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix index 096fe9dbb2b..5bafa70af9f 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix @@ -1,11 +1,11 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "151"; + patchVersion = "161"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256.i686-linux = "0w1snn9hxwvdnk77frhdzbsm6v30v99dy5zmpy8ij7yxd57z6ql0"; - sha256.x86_64-linux = "0zq2dxbxmshz080yskhc8y2wbqi0y0kl9girxjbb4rwk837010n7"; - sha256.armv7l-linux = "0fdkvg1al7g9lqbq10rlw400aqr0xxi2a802319sw5n0zipkrjic"; - sha256.aarch64-linux = "1xva22cjjpwa95h7x3xzyymn1bgxp1q67j5j304kn6cqah4k31j1"; + sha256.i686-linux = "1p6p93msn3bsg9775rq171kd4160w4w8z57p0qpjdjycfix62sfg"; + sha256.x86_64-linux = "07h2wah80qr78y0f821z12lbdmsv90xbckdn3glnj2riwfh5dg3d"; + sha256.armv7l-linux = "0mngw2lnhx3hzgp444advybhjn5hjk3mi14y72km4kp03gh82a7x"; + sha256.aarch64-linux = "18l5fny7yxhpj5c935rnlq4pvwadyr5zkid6yh9x87frl401shy7"; 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 6c2816c8b87..78d5a6f2c40 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix @@ -1,11 +1,11 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "152"; + patchVersion = "162"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; - sha256.i686-linux = "0gjc7kcfx40f43z1w1qsn1fqxdz8d46wml2g11qgm55ishhv2q7w"; - sha256.x86_64-linux = "1gv1348hrgna9l3sssv3g9jzs37y1lkx05xq83chav9z1hs3p2r1"; - sha256.armv7l-linux = "1w0hwslsd3z0kvb3z7gmbh20xsyiz73vglmdqz2108y7alim7arm"; - sha256.aarch64-linux = "13qpxa8nxsnikmm7h6ysnsdqg5vl8j7hzfa8kgh20z8a17fhj9kk"; + sha256.i686-linux = "097vlvvj1vr7815rgarf5x97lagi4q0kai0x4lvd4y3wrzdqikzf"; + sha256.x86_64-linux = "0mq2d0lj53gzn4qqdjdgbwl0h857k2rnsnr2hkmvihnrgza85v38"; + sha256.armv7l-linux = "0xzsgdmpgs1n1g70hgly0mpxflhjrmq3vxwx8gl0kmqdiv4hqwjp"; + sha256.aarch64-linux = "19ykcsmvkf7sdq2lqwvyi60nhb8v7f88dqjycimrsar9y4r7skf8"; 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 index 29d77a613b3..f9b48f239fa 100644 --- a/pkgs/development/compilers/oraclejdk/jdk9-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk9-linux.nix @@ -7,7 +7,6 @@ , xorg ? null , packageType ? "JDK" # JDK, JRE, or ServerJRE , pluginSupport ? true -, installjce ? false , glib , libxml2 , ffmpeg_2 @@ -30,20 +29,10 @@ assert stdenv.system == "x86_64-linux"; assert swingSupport -> xorg != null; let - version = "9.0.1"; + version = "9.0.4"; 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" @@ -63,24 +52,23 @@ let result = stdenv.mkDerivation rec { requireFile { name = "jdk-${version}_linux-x64_bin.tar.gz"; url = "${downloadUrlBase}/jdk9-downloads-3848520.html"; - sha256 = "0560dc3icrwb0ifykshvzkr04b1jr153m26x1r8rp0nhjbzz1nic"; + sha256 = "18nsjn64wkfmyb09wf2k7lvhazf83cs3dyichr038vl1gs3ymi4h"; } else if packageType == "JRE" then requireFile { name = "jre-${version}_linux-x64_bin.tar.gz"; url = "${downloadUrlBase}/jre9-downloads-3848532.html"; - sha256 = "11pfcck8am48yv7riaj10g6h79xdiy8lm5a9wjqbm3g9cls9ar1w"; + sha256 = "01fp079mr04nniyf06w8vd47qxr6rly1lbh8dqkddb8fp9h6a79k"; } else if packageType == "ServerJRE" then requireFile { name = "serverjre-${version}_linux-x64_bin.tar.gz"; url = "${downloadUrlBase}/server-jre9-downloads-3848530.html"; - sha256 = "1biyks6jy0a2kksaj9qbsjifv34ym5mdw8akibmkwr1xh0wavygc"; + sha256 = "1jlpa4mn306hx0p9jcw3i6cpdvnng29dwjsymgcan56810q6p6yj"; } else abort "unknown package Type ${packageType}"; - nativeBuildInputs = [ file ] - ++ stdenv.lib.optional installjce unzip; + nativeBuildInputs = [ file ]; buildInputs = [ makeWrapper ]; @@ -108,11 +96,6 @@ let result = stdenv.mkDerivation rec { 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 diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index af9057e2cf3..28f12b8ba37 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.21.0"; + version = "0.21.3"; src = fetchFromGitHub { owner = "ponylang"; repo = "ponyc"; rev = version; - sha256 = "0kpnmgxhha22nhl2bmch47cpr0d9h5718h3w9h7qqwd994xcfk9z"; + 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/rust/binaryBuild.nix b/pkgs/development/compilers/rust/binaryBuild.nix index 8dfe26f72f4..c8af0d979e2 100644 --- a/pkgs/development/compilers/rust/binaryBuild.nix +++ b/pkgs/development/compilers/rust/binaryBuild.nix @@ -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") @@ -56,7 +36,7 @@ rec { phases = ["unpackPhase" "installPhase" "fixupPhase"]; - propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; installPhase = '' ./install.sh --prefix=$out \ @@ -69,14 +49,21 @@ rec { patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ "$out/bin/rustdoc" - ''} - ${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/libcurl.4.dylib '${stdenv.lib.getLib curl}/lib/libcurl.4.dylib' "$out/bin/cargo" - install_name_tool -change /usr/lib/libz.1.dylib '${stdenv.lib.getLib zlib}/lib/libz.1.dylib' "$out/bin/cargo" + 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 @@ -101,14 +88,23 @@ rec { phases = ["unpackPhase" "installPhase" "fixupPhase"]; - buildInputs = [ makeWrapper ]; - propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin Security; + buildInputs = [ makeWrapper ] ++ stdenv.lib.optional stdenv.isDarwin Security; installPhase = '' ./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 a707fe2e69e..034334f5850 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -3,15 +3,16 @@ let # Note: the version MUST be one version prior to the version we're # building - version = "1.20.0"; + version = "1.21.0"; - # fetch hashes by running `print-hashes.sh 1.20.0` + # fetch hashes by running `print-hashes.sh 1.21.0` hashes = { - i686-unknown-linux-gnu = "abe592e06616cdc2fcca56ddbe482050dd49a1fada35e2af031c64fe6eb14668"; - x86_64-unknown-linux-gnu = "ca1cf3aed73ff03d065a7d3e57ecca92228d35dc36d9274a6597441319f18eb8"; - aarch64-unknown-linux-gnu = "eaab3df489d4d8f976c4327d812b9870730eed6d0bbd52712767083d02be7472"; - i686-apple-darwin = "b3c2470f8f132d285e6c989681e251592b67071bc9d93cac8a2e6b66f7bdfcb5"; - x86_64-apple-darwin = "fa1fb8896d5e327cbe6deeb50e6e9a3346de629f2e6bcbd8c10f19f3e2ed67d5"; + i686-unknown-linux-gnu = "b7caed0f602cdb8ef22e0bfa9125a65bec411e15c0b8901d937e43303ec7dbee"; + x86_64-unknown-linux-gnu = "b41e70e018402bc04d02fde82f91bea24428e6be432f0df12ac400cfb03108e8"; + armv7-unknown-linux-gnueabihf = "416fa6f107ad9e386002e6af1aec495472e2ee489c842183dd429a25b07488d6"; + aarch64-unknown-linux-gnu = "491ee6c43cc672006968d665bd34c94cc2219ef3592d93d38097c97eaaa864c3"; + i686-apple-darwin = "c8b0fabeebcde66b683f3a871187e614e07305adda414c2862cb332aecb2b3bf"; + x86_64-apple-darwin = "75a7f4bd7c72948030bb9e421df27e8a650dea826fb5b836cf59d23d6f985a0d"; }; platform = @@ -19,6 +20,8 @@ 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" diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index fb3001bbf17..386ffa62294 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { passthru.rustc = rustc; 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 +48,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 diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 76dafd95353..b5550a96a83 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -6,7 +6,7 @@ let rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); - version = "1.21.0"; + version = "1.22.1"; in rec { rustc = callPackage ./rustc.nix { @@ -18,7 +18,7 @@ rec { src = fetchurl { url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; - sha256 = "1yj8lnxybjrybp00fqhxw8fpr641dh8wcn9mk44xjnsb4i1c21qp"; + sha256 = "1lrzzp0nh7s61wgfs2h6ilaqi6iq89f1pd1yaf65l87bssyl4ylb"; }; patches = [ @@ -30,9 +30,9 @@ rec { }; cargo = callPackage ./cargo.nix rec { - version = "0.22.0"; - srcSha = "0x9pm73hkkd1hq4qrmz8iv91djgpdsxzwll7jari0h77vpwajmw4"; - cargoSha256 = "0xd0rb8gcqy6xngsx9l30jg3fqrcwccgv904ksqs9c4d44hga0gd"; + version = "0.23.0"; + srcSha = "14b2n1msxma19ydchj54hd7f2zdsr524fg133dkmdn7j65f1x6aj"; + cargoSha256 = "1sj59z0w172qvjwg1ma5fr5am9dgw27086xwdnrvlrk4hffcr7y7"; 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 dc7e3719355..7eb00a30ad7 100755 --- a/pkgs/development/compilers/rust/print-hashes.sh +++ b/pkgs/development/compilers/rust/print-hashes.sh @@ -10,6 +10,7 @@ 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 ec0f100fb56..9d6f641bc46 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -17,13 +17,13 @@ let inherit (stdenv.lib) optional optionalString; + inherit (darwin.apple_sdk.frameworks) Security; procps = if stdenv.isDarwin then darwin.ps else args.procps; llvmShared = llvm.override { enableSharedLibraries = true; }; target = builtins.replaceStrings [" "] [","] (builtins.toString targets); - in stdenv.mkDerivation { @@ -37,6 +37,12 @@ stdenv.mkDerivation { # 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"; # Enable nightly features in stable compiles (used for @@ -55,7 +61,6 @@ stdenv.mkDerivation { # ++ [ "--jemalloc-root=${jemalloc}/lib" ++ [ "--default-linker=${targetPackages.stdenv.cc}/bin/cc" "--default-ar=${targetPackages.stdenv.cc.bintools}/bin/ar" ] ++ optional (!forceBundledLLVM) [ "--enable-llvm-link-shared" ] - ++ optional (stdenv.cc.cc ? isClang) "--enable-clang" ++ optional (targets != []) "--target=${target}" ++ optional (!forceBundledLLVM) "--llvm-root=${llvmShared}"; @@ -79,8 +84,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.rs || 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 @@ -112,6 +118,10 @@ stdenv.mkDerivation { # Disable all lldb tests. # error: Can't run LLDB test because LLDB's python path is not set rm -vr src/test/debuginfo/* + 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 \ @@ -122,12 +132,6 @@ stdenv.mkDerivation { rm -v src/test/run-pass/sync-send-in-std.rs # FIXME: ??? ''; - preConfigure = '' - # Needed flags as the upstream configure script has a broken prefix substitution - configureFlagsArray+=("--datadir=$out/share") - configureFlagsArray+=("--infodir=$out/share/info") - ''; - # rustc unfortunately need cmake for compiling llvm-rt but doesn't # use it for the normal build. This disables cmake in Nix. dontUseCmakeConfigure = true; @@ -141,6 +145,7 @@ stdenv.mkDerivation { ++ optional (!stdenv.isDarwin) gdb; buildInputs = [ ncurses ] ++ targetToolchains + ++ optional stdenv.isDarwin Security ++ optional (!forceBundledLLVM) llvmShared; outputs = [ "out" "man" "doc" ]; @@ -168,7 +173,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 b800d71198a..54610467e7a 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "05s7wsx6bsnx4h6w3d8yim9apbvi8ih0glmvkmgjz7nrad4abjwd"; + sha256 = "1z8d11k6vc6jhmpwzy0nawj84qdd2jvibrvqmb1nmq3h8w64hlam"; }; patchPhase = '' @@ -91,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/dotty-bare.nix b/pkgs/development/compilers/scala/dotty-bare.nix new file mode 100644 index 00000000000..60cb3e9a202 --- /dev/null +++ b/pkgs/development/compilers/scala/dotty-bare.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, makeWrapper, jre }: + +stdenv.mkDerivation rec { + version = "0.4.0-RC1"; + name = "dotty-bare-${version}"; + + src = fetchurl { + url = "https://github.com/lampepfl/dotty/releases/download/${version}/dotty-${version}.tar.gz"; + sha256 = "1d1ab08b85bd6898ce6273fa50818de0d314fc6e5377fb6ee05494827043321b"; + }; + + 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 cb0c4355002..a999bd422e6 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 ] ; +stdenv.mkDerivation { + name = "dotty-${dotty-bare.version}"; + + unpackPhase = ":"; installPhase = '' - mkdir -p $out - mv * $out - - mkdir -p $out/shared - mv $out/bin/common $out/shared + 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 ''; - fixupPhase = '' - for file in $out/bin/* ; do - substituteInPlace $file \ - --replace '$PROG_HOME/bin/common' $out/shared/common - - wrapProgram $file \ - --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]; - }; + inherit (dotty-bare) meta; } diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 078cf3e36c2..cd8c839cf4f 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchzip, fetchgit, boost, cmake, z3 }: let - version = "0.4.17"; - rev = "bdeb9e52a2211510644fb53df93fb98258b40a65"; - sha256 = "1x6q2rlq6gxggidgsy6li7m4phwr1hcfi65pq9yimz64ddqfiira"; + version = "0.4.19"; + rev = "c4cbbb054b5ed3b8ceaa21ee5b47b0704762ff40"; + sha256 = "1h2ziwdswghj4aa3vd3k3y2ckfiwjk6x38w2kp4m324k2ydxd15c"; jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz; jsoncpp = fetchzip { url = jsoncppURL; diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix index af56026b43a..25ea47978fc 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/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix deleted file mode 100644 index 79b22214ecc..00000000000 --- 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 74ca5dc4c4b..f2b6016ceb7 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 40af4c312cf..f42cdcabae3 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -29,6 +29,12 @@ let in rec { + vala_0_23 = generic { + major = "0.23"; + minor = "3"; + sha256 = "101xjbc818g4849n9a80c2aai13zakj7mpnd7470xnkvz5jwqq96"; + }; + vala_0_26 = generic { major = "0.26"; minor = "2"; @@ -37,8 +43,8 @@ in rec { vala_0_28 = generic { major = "0.28"; - minor = "0"; - sha256 = "0zwpzhkhfk3piya14m7p2hl2vaabahprphppfm46ci91z39kp7hd"; + minor = "1"; + sha256 = "0isg327w6rfqqdjja6a8pc3xcdkj7pqrkdhw48bsyxab2fkaw3hw"; }; vala_0_32 = generic { @@ -49,14 +55,20 @@ in rec { vala_0_34 = generic { major = "0.34"; - minor = "1"; - sha256 = "16cjybjw100qps6jg0jdyjh8hndz8a876zmxpybnf30a8vygrk7m"; + minor = "13"; + sha256 = "0ahbnhgwhhjkndmbr1d039ws0g2bb324c60fk6wgx7py5wvmgcd2"; + }; + + vala_0_36 = generic { + major = "0.36"; + minor = "8"; + sha256 = "1nz5a8kcb22ss9idb7k1higwpvghd617xwf40fi0a9ggws614lfz"; }; 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 ]; }; diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 117319c1ad5..4f4a54ef426 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -4,21 +4,21 @@ stdenv.mkDerivation rec { name = "yosys-${version}"; - version = "2017.12.06"; + version = "2018.01.10"; srcs = [ (fetchFromGitHub { owner = "cliffordwolf"; repo = "yosys"; - rev = "8f2638ae2f12a48dcad14f24b0211c16ac724762"; - sha256 = "0synbskclgn97hp28myvl0hp8pqp66awp37z4cv7zl154ipysfl1"; + rev = "9ac560f5d3e5847b7e475195f66b7034e91fd938"; + sha256 = "01p1bcjq030y7g21lsghgkqj23x6yl8cwrcx2xpik45xls6pxrg7"; name = "yosys"; }) (fetchFromBitbucket { owner = "alanmi"; repo = "abc"; - rev = "31fc97b0aeed"; - sha256 = "0ljmclr4hfh3iiyfw7ji0fm8j983la8021xfpnfd20dyc807hh65"; + rev = "6e3c24b3308a"; + sha256 = "1i4wv0si4fb6dpv2yrpkp588mdlfrnx2s02q2fgra5apdm54c53w"; name = "yosys-abc"; }) ]; diff --git a/pkgs/development/coq-modules/tlc/default.nix b/pkgs/development/coq-modules/tlc/default.nix new file mode 100644 index 00000000000..4748a0dd238 --- /dev/null +++ b/pkgs/development/coq-modules/tlc/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, coq }: + +stdenv.mkDerivation rec { + version = "20171206"; + name = "coq${coq.coq-version}-tlc-${version}"; + + src = fetchurl { + url = "http://tlc.gforge.inria.fr/releases/tlc-${version}.tar.gz"; + sha256 = "1wc44qb5zmarafp56gdrbka8gllipqna9cj0a6d99jzb361xg4mf"; + }; + + buildInputs = [ coq ]; + + installFlags = "CONTRIB=$(out)/lib/coq/${coq.coq-version}/user-contrib"; + + 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/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 58de439d839..746c00b037d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -48,8 +48,9 @@ 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; @@ -58,19 +59,12 @@ self: super: { statistics = dontCheck super.statistics; vector-builder = dontCheck super.vector-builder; - # 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"; - }); - # 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; @@ -86,7 +80,7 @@ self: super: { name = "git-annex-${drv.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + drv.version; - sha256 = "1fd7lyrwr60dp55swc5iwl0mkkzmdzpmj9qmx1qca2r7y9wc5w5k"; + sha256 = "0vvh1k7i6y4bqy6fn8z5i6ndqv6x94hvk2zh5gw99na8kfri7sxq"; }; })).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -106,15 +100,9 @@ self: super: { # 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. @@ -144,37 +132,11 @@ self: super: { }); # 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; @@ -211,9 +173,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; @@ -258,8 +217,9 @@ 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; + # Fails for non-obvious reasons while attempting to use doctest. search = dontCheck super.search; @@ -476,15 +436,9 @@ 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; @@ -494,9 +448,6 @@ self: super: { # 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; @@ -511,8 +462,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; @@ -530,13 +481,16 @@ self: super: { # https://github.com/alphaHeavy/lzma-enumerator/issues/3 lzma-enumerator = dontCheck super.lzma-enumerator; + # https://github.com/haskell-hvr/lzma/issues/8 + 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. @@ -565,8 +519,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; @@ -589,14 +543,8 @@ 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 and metadata, remove broken hgettext dependency. - # https://github.com/vasylp/hgettext/issues/10 + # Install icons, metadata and cli program. bustle = overrideCabal super.bustle (drv: { - configureFlags = drv.configureFlags or [] ++ ["-f-hgettext"]; - executableHaskellDepends = pkgs.lib.remove self.hgettext drv.executableHaskellDepends; buildDepends = [ pkgs.libpcap ]; buildTools = with pkgs; [ gettext perl help2man intltool ]; doCheck = false; # https://github.com/wjt/bustle/issues/6 @@ -653,7 +601,13 @@ 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_20_1; + }; + + # Need newer versions of their dependencies than the ones we have in LTS-10.x. + cabal2nix = super.cabal2nix.override { hpack = self.hpack_0_23_0; }; + hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_20_1; }); # https://github.com/bos/configurator/issues/22 configurator = dontCheck super.configurator; @@ -667,36 +621,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 mesa 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"]; @@ -705,9 +646,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 { }; @@ -765,6 +703,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 @@ -790,6 +729,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 @@ -800,57 +740,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; @@ -867,10 +773,6 @@ 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; @@ -887,17 +789,12 @@ 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; @@ -905,24 +802,15 @@ self: super: { # 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); # test suite requires git and does a bunch of git operations - restless-git = dontCheck super.restless-git; + # 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; @@ -955,12 +843,22 @@ self: super: { # https://github.com/fpco/stackage/issues/3126 stack = doJailbreak super.stack; - # Hoogle needs a newer version than lts-10 provides. - hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_20_1; }; + # Hoogle needs newer versions than lts-10 provides. lambdabot-haskell-plugins + # depends on Hoogle and therefore needs to use the same version. + hoogle = super.hoogle.override { + haskell-src-exts = self.haskell-src-exts_1_20_1; + http-conduit = self.http-conduit_2_3_0; + }; + lambdabot-haskell-plugins = super.lambdabot-haskell-plugins.override { + haskell-src-exts-simple = self.haskell-src-exts-simple_1_20_0_0; + }; + haskell-src-exts-simple_1_20_0_0 = super.haskell-src-exts-simple_1_20_0_0.override { + haskell-src-exts = self.haskell-src-exts_1_20_1; + }; - # These packages depend on each other, forming an infinte loop. - scalendar = markBroken super.scalendar; - SCalendar = markBroken super.SCalendar; + # 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; @@ -982,6 +880,7 @@ self: super: { 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; @@ -990,6 +889,9 @@ self: super: { 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; @@ -1009,6 +911,9 @@ self: super: { # 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/strake/lenz.hs/issues/2 lenz = let patch = pkgs.fetchpatch @@ -1019,4 +924,79 @@ self: super: { { patches = (drv.patches or []) ++ [ patch ]; editedCabalFile = null; }); + + # 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,/' darcs.cabal"; }); + + # https://github.com/Twinside/Juicy.Pixels/issues/149 + JuicyPixels = dontHaddock super.JuicyPixels; + + # armv7l fixes. + happy = if pkgs.stdenv.isArm then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062 + hashable = if pkgs.stdenv.isArm then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95 + servant-docs = if pkgs.stdenv.isArm then dontCheck super.servant-docs else super.servant-docs; + servant-swagger = if pkgs.stdenv.isArm then dontCheck super.servant-swagger else super.servant-swagger; + swagger2 = if pkgs.stdenv.isArm 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; + + # Sporadically OOMs even with 16G + ChasingBottoms = dontCheck super.ChasingBottoms; + + # Add support for https://github.com/haskell-hvr/multi-ghc-travis. + multi-ghc-travis = self.callPackage ../tools/haskell/multi-ghc-travis { ShellCheck = self.ShellCheck_0_4_6; }; + + # 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 $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/*.$i $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/.otherdocs/*.$i; do + mkdir -p $out/share/man/man$i + cp $j $out/share/man/man$i/ + done + done + mkdir $out/share/info + cp $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/*.info $out/share/info/ + ''; + }); + hledger-ui = overrideCabal super.hledger-ui (drv: { + postInstall = '' + for i in $(seq 1 9); do + for j in $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/*.$i $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/.otherdocs/*.$i; do + mkdir -p $out/share/man/man$i + cp $j $out/share/man/man$i/ + done + done + mkdir $out/share/info + cp $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/*.info $out/share/info/ + ''; + }); + hledger-web = overrideCabal super.hledger-web (drv: { + postInstall = '' + for i in $(seq 1 9); do + for j in $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/*.$i $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/.otherdocs/*.$i; do + mkdir -p $out/share/man/man$i + cp $j $out/share/man/man$i/ + done + done + mkdir $out/share/info + cp $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/*.info $out/share/info/ + ''; + }); + } 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 47c8e7fa69e..00000000000 --- 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 6bb96704cc2..00000000000 --- 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 1a9158fa665..fc41fc0b3d3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -161,8 +161,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; @@ -182,30 +181,39 @@ self: super: { 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; + 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]; QuickCheck = addBuildDepend super.QuickCheck self.semigroups; semigroups = addBuildDepends (dontCheck super.semigroups) (with self; [hashable tagged text unordered-containers]); 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; + } 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 de47086409b..00000000000 --- 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 73bc28b4dd3..00000000000 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ /dev/null @@ -1,117 +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; - - # Haddock fails with an internal error. - utf8-string = dontHaddock super.utf8-string; - -} 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 43a1b1b70bd..00000000000 --- 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 372155a8791..00000000000 --- 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 30ecbe92f16..30be6a031d4 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -65,4 +65,11 @@ self: super: { # 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; + + # Newer versions require GHC 8.2. + 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 e6ba886032b..4538d8471c0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -56,21 +56,10 @@ 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; - # Upstream failed to distribute the testsuite for 8.2 # https://github.com/alanz/ghc-exactprint/pull/60 ghc-exactprint = dontCheck super.ghc-exactprint; @@ -93,4 +82,8 @@ self: super: { sha256 = "06sfxk5cyd8nqgjyb95jkihxxk8m6dw9m3mlv94sm2qwylj86gqy"; }; in appendPatch super.coordinate patch; + + # https://github.com/purescript/purescript/issues/3189 + purescript = doJailbreak (super.purescript); + } 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 00000000000..49c8ac0d005 --- /dev/null +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -0,0 +1,49 @@ +{ pkgs, haskellLib }: + +with haskellLib; + +self: super: { + + # Use the latest LLVM. + inherit (pkgs) llvmPackages; + + # Disable GHC 8.4.x core libraries. + # + # Verify against: + # ls /nix/store/wnh3kxra586h9wvxrn62g4lmsri2akds-ghc-8.4.20180115/lib/ghc-8.4.20180115/ -1 | sort | grep -e '-' | grep -Ev '(txt|h|targets)$' + array = null; + base = null; + binary = null; + bytestring = null; + Cabal = null; + containers = null; + deepseq = null; + directory = null; + filepath = null; + bin-package-db = null; + ghc-boot = null; + ghc-boot-th = null; + ghc-compact = null; + ghci = null; + ghc-prim = null; + haskeline = null; + hpc = null; + integer-gmp = null; + mtl = null; + parsec = null; + pretty = null; + process = null; + stm = null; + template-haskell = null; + terminfo = null; + text = null; + time = null; + transformers = null; + unix = null; + xhtml = null; + + # GHC 8.4.x needs newer versions than LTS-10.x offers by default. + hspec = dontCheck super.hspec_2_4_7; # test suite causes an infinite loop + test-framework = self.test-framework_0_8_2_0; + +} diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index f81920edd61..99003102ec5 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-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 1dfd973c446..b0d7c77dd32 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -38,7 +38,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 10.0 + # LTS Haskell 10.4 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -49,17 +49,17 @@ default-package-overrides: - accelerate-examples ==1.1.0.0 - accelerate-fft ==1.1.0.0 - accelerate-fftw ==1.0 - - accelerate-fourier ==1.0.0.2 + - accelerate-fourier ==1.0.0.3 - 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.0 + - accelerate-llvm-ptx ==1.1.0.1 - accelerate-utility ==1.0 - accuerr ==0.2.0.2 - ace ==0.6 - action-permutations ==0.0.0.1 - active ==0.2.0.13 - - ad ==4.3.4 + - ad ==4.3.5 - adjunctions ==4.3 - adler32 ==0.1.1.0 - aern2-mp ==0.1.2.0 @@ -70,11 +70,12 @@ default-package-overrides: - aeson-compat ==0.3.7.1 - aeson-diff ==1.1.0.4 - aeson-extra ==0.4.1.0 - - aeson-generic-compat ==0.0.1.0 + - aeson-generic-compat ==0.0.1.1 - aeson-injector ==1.1.0.0 - aeson-pretty ==0.8.5 - aeson-qq ==0.8.2 - aeson-utils ==0.3.0.2 + - aeson-yak ==0.1.1.3 - Agda ==2.5.3 - airship ==0.9.2 - alarmclock ==0.4.0.3 @@ -87,7 +88,7 @@ default-package-overrides: - alsa-pcm ==0.6.0.4 - alsa-seq ==0.6.0.7 - alternative-vector ==0.0.0 - - alternators ==0.1.1.1 + - alternators ==0.1.2.0 - ALUT ==2.4.0.2 - amazonka ==1.5.0 - amazonka-apigateway ==1.5.0 @@ -180,9 +181,9 @@ default-package-overrides: - amazonka-xray ==1.5.0 - amqp ==0.18.1 - annotated-wl-pprint ==0.7.0 - - ansigraph ==0.3.0.4 + - ansigraph ==0.3.0.5 - ansi-terminal ==0.7.1.1 - - ansi-wl-pprint ==0.6.8.1 + - ansi-wl-pprint ==0.6.8.2 - apecs ==0.2.4.7 - api-field-json-th ==0.1.0.2 - appar ==0.1.4 @@ -190,7 +191,7 @@ default-package-overrides: - apportionment ==0.0.0.2 - approximate ==0.3.1 - app-settings ==0.2.0.11 - - arithmoi ==0.6.0.0 + - arithmoi ==0.6.0.1 - array-memoize ==0.6.0 - arrow-extras ==0.1.0.1 - arrow-list ==0.7 @@ -213,7 +214,7 @@ default-package-overrides: - atom-conduit ==0.5.0.1 - atomic-primops ==0.8.1.1 - atomic-write ==0.2.0.5 - - attoparsec ==0.13.2.0 + - attoparsec ==0.13.2.2 - attoparsec-binary ==0.2 - attoparsec-expr ==0.1.1.2 - attoparsec-ip ==0.0.1 @@ -224,7 +225,7 @@ default-package-overrides: - authenticate ==1.3.4 - authenticate-oauth ==1.6 - auto ==0.4.3.1 - - autoexporter ==1.1.2 + - autoexporter ==1.1.3 - auto-update ==0.1.4 - avers ==0.0.17.1 - avers-api ==0.1.0 @@ -249,8 +250,8 @@ default-package-overrides: - base-unicode-symbols ==0.2.2.4 - basic-prelude ==0.7.0 - bbdb ==0.8 - - bcrypt ==0.0.10 - - bench ==1.0.7 + - bcrypt ==0.0.11 + - bench ==1.0.8 - benchpress ==0.2.2.10 - bencode ==0.6.0.0 - bento ==0.1.0 @@ -292,7 +293,7 @@ default-package-overrides: - bit-stream ==0.1.0.2 - bitx-bitcoin ==0.11.0.1 - blake2 ==0.2.0 - - blank-canvas ==0.6.1 + - blank-canvas ==0.6.2 - blas-carray ==0.0 - blas-ffi ==0.0 - blas-hs ==0.1.1.0 @@ -301,10 +302,10 @@ default-package-overrides: - blaze-bootstrap ==0.1.0.1 - blaze-builder ==0.4.0.2 - blaze-html ==0.9.0.1 - - blaze-markup ==0.8.0.0 + - blaze-markup ==0.8.2.0 - blaze-svg ==0.3.6.1 - blaze-textual ==0.2.1.0 - - bloodhound ==0.15.0.0 + - bloodhound ==0.15.0.1 - bloomfilter ==2.0.1.0 - blosum ==0.1.1.4 - bmp ==1.2.6.3 @@ -347,11 +348,11 @@ default-package-overrides: - bzlib-conduit ==0.2.1.5 - c2hs ==0.28.3 - Cabal ==2.0.1.1 - - cabal-doctest ==1.0.4 + - cabal-doctest ==1.0.5 - cabal-file-th ==0.2.4 - cabal-rpm ==0.12 - - cabal-toolkit ==0.0.3 - - cache ==0.1.0.0 + - cabal-toolkit ==0.0.4 + - cache ==0.1.0.1 - cairo ==0.13.4.2 - calendar-recycling ==0.0 - call-stack ==0.1.0 @@ -365,8 +366,8 @@ default-package-overrides: - cassava-conduit ==0.4.0.1 - cassette ==0.1.0 - cast ==0.1.0.2 - - cayley-client ==0.4.1 - - cereal ==0.5.4.0 + - cayley-client ==0.4.2 + - cereal ==0.5.5.0 - cereal-conduit ==0.7.3 - cereal-text ==0.1.0.2 - cereal-time ==0.1.0.0 @@ -377,16 +378,17 @@ default-package-overrides: - Chart ==1.8.2 - Chart-cairo ==1.8.2 - Chart-diagrams ==1.8.2 - - chart-unit ==0.5.4 + - chart-unit ==0.5.5.0 - chaselev-deque ==0.5.0.5 - - chatwork ==0.1.2.0 + - ChasingBottoms ==1.3.1.3 + - chatwork ==0.1.3.0 - 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 - 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 @@ -414,7 +416,7 @@ default-package-overrides: - 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 @@ -440,20 +442,20 @@ default-package-overrides: - concise ==0.1.0.0 - concurrency ==1.2.3.0 - concurrent-extra ==0.7.0.11 - - concurrent-output ==1.10.1 + - concurrent-output ==1.10.2 - concurrent-split ==0.0.1 - concurrent-supply ==0.1.8 - cond ==0.4.1.1 - - conduit ==1.2.12.1 - - conduit-algorithms ==0.0.6.1 + - conduit ==1.2.13 + - conduit-algorithms ==0.0.7.1 - conduit-combinators ==1.1.2 - conduit-connection ==0.1.0.3 - - conduit-extra ==1.2.2 + - conduit-extra ==1.2.3.2 - conduit-iconv ==0.1.1.2 - conduit-parse ==0.1.2.2 - - conduit-throttle ==0.3.0.0 + - conduit-throttle ==0.3.1.0 - ConfigFile ==1.1.4 - - config-ini ==0.2.1.1 + - config-ini ==0.2.2.0 - configuration-tools ==0.3.0 - configurator ==0.3.0.0 - configurator-export ==0.1.0.1 @@ -463,7 +465,7 @@ default-package-overrides: - constraints ==0.9.1 - consul-haskell ==0.4.2 - containers-unicode-symbols ==0.3.1.1 - - contravariant ==1.4 + - contravariant ==1.4.1 - contravariant-extras ==0.3.3.1 - control-bool ==0.2.1 - control-monad-free ==0.6.1 @@ -483,12 +485,12 @@ default-package-overrides: - crackNum ==1.9 - criterion ==1.2.6.0 - cron ==0.6.1 - - crypto-api ==0.13.2 + - 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 + - crypto-enigma ==0.0.2.10 - cryptohash ==0.11.9 - cryptohash-cryptoapi ==0.1.4 - cryptohash-md5 ==0.11.100.1 @@ -510,11 +512,11 @@ default-package-overrides: - csv ==0.1.2 - csv-conduit ==0.6.7 - ctrie ==0.2 - - cubicbezier ==0.6.0.4 + - cubicbezier ==0.6.0.5 - cubicspline ==0.1.2 - cublas ==0.4.0.0 - cuda ==0.9.0.0 - - cue-sheet ==1.0.0 + - cue-sheet ==1.0.1 - cufft ==0.8.0.0 - curl ==1.3.8 - currencies ==0.1.1.1 @@ -533,12 +535,13 @@ default-package-overrides: - data-clist ==0.1.2.0 - data-default ==0.7.1.1 - data-default-class ==0.1.2.0 + - data-default-instances-base ==0.1.0.1 - data-default-instances-containers ==0.0.1 - data-default-instances-dlist ==0.0.1 - data-default-instances-old-locale ==0.0.1 - - data-diverse ==2.0.0.0 + - data-diverse ==2.0.1.0 - data-diverse-lens ==1.0.0.1 - - data-dword ==0.3.1.1 + - data-dword ==0.3.1.2 - data-endian ==0.1.1 - data-fix ==0.2.0 - data-has ==0.3.0.0 @@ -546,7 +549,8 @@ default-package-overrides: - data-inttrie ==0.1.2 - 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 @@ -559,7 +563,7 @@ default-package-overrides: - DAV ==1.3.1 - dawg-ord ==0.5.1.0 - dbcleaner ==0.1.3 - - dbus ==0.10.13 + - dbus ==0.10.15 - debian-build ==0.10.1.0 - debug ==0.0.2 - Decimal ==0.4.2 @@ -579,17 +583,17 @@ default-package-overrides: - dhall-nix ==1.0.9 - dhall-text ==1.0.4 - diagrams ==1.4 - - diagrams-builder ==0.8.0.1 + - diagrams-builder ==0.8.0.2 - diagrams-cairo ==1.4 - diagrams-canvas ==1.4 - diagrams-contrib ==1.4.1 - diagrams-core ==1.4.0.1 - - diagrams-lib ==1.4.1.2 + - diagrams-lib ==1.4.2 - diagrams-postscript ==1.4 - diagrams-solve ==0.1.1 - diagrams-svg ==1.4.1.1 - dice ==0.1 - - dictionaries ==0.2.0.3 + - dictionaries ==0.2.0.4 - Diff ==0.3.4 - diff3 ==0.3.0 - digest ==0.0.1.2 @@ -613,10 +617,10 @@ default-package-overrides: - 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 - - dns ==3.0.0 + - dns ==3.0.1 - docker ==0.4.1.1 - docker-build-cacher ==1.8.2 - dockerfile ==0.1.0.1 @@ -627,7 +631,7 @@ default-package-overrides: - doctest-driver-gen ==0.1.0.1 - do-list ==1.0.1 - dom-parser ==3.0.0 - - dotenv ==0.5.1.1 + - dotenv ==0.5.2.3 - dotnet-timespan ==0.0.1.0 - double-conversion ==2.0.2.0 - download ==0.3.2.6 @@ -635,7 +639,7 @@ default-package-overrides: - drawille ==0.1.2.0 - DRBG ==0.5.5 - drifter ==0.2.3 - - drifter-postgresql ==0.2.0 + - drifter-postgresql ==0.2.1 - dsp ==0.2.4 - dual-tree ==0.2.1 - dublincore-xml-conduit ==0.1.0.2 @@ -668,7 +672,7 @@ default-package-overrides: - elm-export ==0.6.0.1 - elm-export-persistent ==0.1.2 - emailaddress ==0.2.0.0 - - email-validate ==2.3.2 + - email-validate ==2.3.2.1 - enclosed-exceptions ==1.0.2 - EntrezHTTP ==1.0.4 - entropy ==0.3.8 @@ -685,7 +689,7 @@ default-package-overrides: - errors ==2.2.2 - errors-ext ==0.4.1 - error-util ==0.0.1.2 - - ersatz ==0.4.1 + - ersatz ==0.4.2 - esqueleto ==2.5.3 - etcd ==1.0.5 - ether ==0.5.1.0 @@ -716,12 +720,12 @@ default-package-overrides: - expiring-cache-map ==0.0.6.1 - explicit-exception ==0.1.9 - exp-pairs ==0.1.5.2 - - extensible ==0.4.7 + - extensible ==0.4.7.1 - extensible-effects ==2.1.0.0 - extensible-exceptions ==0.1.1.4 - - extra ==1.6.2 + - extra ==1.6.3 - extractable-singleton ==0.0.1 - - extrapolate ==0.3.0 + - extrapolate ==0.3.1 - fail ==4.9.0.0 - farmhash ==0.1.0.5 - fasta ==0.10.4.2 @@ -762,8 +766,8 @@ default-package-overrides: - flexible-defaults ==0.0.1.2 - FloatingHex ==0.4 - floatshow ==0.2.4 - - flow ==1.0.9 - - fmlist ==0.9 + - flow ==1.0.10 + - fmlist ==0.9.2 - fmt ==0.5.0.0 - fn ==0.3.0.2 - focus ==0.1.5.2 @@ -789,7 +793,7 @@ default-package-overrides: - free-vl ==0.1.4 - friday ==0.2.3.1 - 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 @@ -798,7 +802,7 @@ default-package-overrides: - funcmp ==1.8 - functor-classes-compat ==1 - fuzzcheck ==0.1.1 - - fuzzyset ==0.1.0.2 + - fuzzyset ==0.1.0.4 - gauge ==0.1.3 - gd ==3000.7.3 - gdax ==0.6.0.0 @@ -806,16 +810,16 @@ default-package-overrides: - general-games ==1.0.5 - generic-aeson ==0.2.0.9 - generic-arbitrary ==0.1.0 - - generic-deriving ==1.12 - - generic-lens ==0.5.0.0 + - generic-deriving ==1.12.1 + - generic-lens ==0.5.1.0 - GenericPretty ==1.2.1 - generic-random ==1.0.0.0 - generics-eot ==0.2.1.1 - - generics-sop ==0.3.1.0 + - generics-sop ==0.3.2.0 - generics-sop-lens ==0.1.2.1 - generic-xmlpickler ==0.1.0.5 - geniplate-mirror ==0.7.5 - - genvalidity ==0.4.0.2 + - genvalidity ==0.4.0.4 - genvalidity-aeson ==0.1.0.0 - genvalidity-bytestring ==0.1.0.0 - genvalidity-containers ==0.3.0.0 @@ -828,7 +832,7 @@ default-package-overrides: - genvalidity-property ==0.1.0.0 - genvalidity-scientific ==0.1.0.0 - genvalidity-text ==0.4.0.0 - - genvalidity-time ==0.1.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 @@ -837,7 +841,7 @@ default-package-overrides: - ghc-core ==0.5.6 - ghc-events ==0.7.0 - ghc-exactprint ==0.5.5.0 - - ghcid ==0.6.8 + - ghcid ==0.6.9 - ghcjs-base-stub ==0.1.0.4 - ghcjs-codemirror ==0.0.0.1 - ghcjs-dom ==0.9.2.0 @@ -846,10 +850,10 @@ default-package-overrides: - ghc-paths ==0.1.0.9 - ghc-prof ==1.4.0.4 - 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.7 + - ghc-tcplugins-extra ==0.2.2 + - ghc-typelits-extra ==0.2.4 + - ghc-typelits-knownnat ==0.4 + - ghc-typelits-natnormalise ==0.5.8 - ghost-buster ==0.1.1.0 - gi-atk ==2.0.14 - gi-cairo ==1.0.14 @@ -860,7 +864,7 @@ default-package-overrides: - giphy-api ==0.5.2.0 - git ==0.2.1 - github ==0.18 - - github-release ==1.1.0 + - github-release ==1.1.2 - github-types ==0.2.1 - github-webhook-handler ==0.0.8 - github-webhook-handler-snap ==0.0.7 @@ -886,7 +890,7 @@ default-package-overrides: - GLURaw ==2.0.0.3 - GLUT ==2.7.0.12 - gluturtle ==0.0.58.1 - - gnuplot ==0.5.4.2 + - gnuplot ==0.5.5 - goggles ==0.1.0.3 - gogol ==0.3.0 - gogol-adexchange-buyer ==0.3.0 @@ -1019,11 +1023,11 @@ default-package-overrides: - hailgun-simple ==0.1.0.0 - hakyll ==4.10.0.0 - half ==0.2.2.3 - - hamilton ==0.1.0.1 + - hamilton ==0.1.0.2 - hamlet ==1.2.0 - HandsomeSoup ==0.4.2 - handwriting ==0.1.0.3 - - hapistrano ==0.3.5.0 + - hapistrano ==0.3.5.1 - happstack-hsp ==7.3.7.3 - happstack-jmacro ==7.0.12 - happstack-server ==7.5.0.1 @@ -1034,7 +1038,7 @@ default-package-overrides: - hashable ==1.2.6.1 - hashable-time ==0.2.0.1 - hashids ==1.0.2.3 - - hashmap ==1.3.2 + - hashmap ==1.3.3 - hashtables ==1.2.2.1 - haskeline ==0.7.4.2 - haskell-gi ==0.20.3 @@ -1042,8 +1046,8 @@ default-package-overrides: - haskell-gi-overloading ==1.0 - haskell-import-graph ==1.0.3 - haskell-lexer ==1.0.1 - - haskell-lsp ==0.2.0.0 - - haskell-lsp-client ==1.0.0.0 + - haskell-lsp ==0.2.0.1 + - haskell-lsp-client ==1.0.0.1 - haskell-names ==0.9.0 - haskell-neo4j-client ==0.3.2.4 - HaskellNet ==0.5.1 @@ -1052,20 +1056,20 @@ default-package-overrides: - haskell-src ==1.0.2.0 - haskell-src-exts ==1.19.1 - 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 ==1.0.0.2 - - haskell-tools-backend-ghc ==1.0.0.2 - - haskell-tools-builtin-refactorings ==1.0.0.2 - - haskell-tools-cli ==1.0.0.2 - - haskell-tools-daemon ==1.0.0.2 - - haskell-tools-debug ==1.0.0.2 - - haskell-tools-demo ==1.0.0.2 - - haskell-tools-prettyprint ==1.0.0.2 - - haskell-tools-refactor ==1.0.0.2 - - haskell-tools-rewrite ==1.0.0.2 + - haskell-src-exts-util ==0.2.2 + - haskell-src-meta ==0.8.0.2 + - haskell-tools-ast ==1.0.0.4 + - haskell-tools-backend-ghc ==1.0.0.4 + - haskell-tools-builtin-refactorings ==1.0.0.4 + - haskell-tools-cli ==1.0.0.4 + - haskell-tools-daemon ==1.0.0.4 + - haskell-tools-debug ==1.0.0.4 + - haskell-tools-demo ==1.0.0.4 + - haskell-tools-prettyprint ==1.0.0.4 + - haskell-tools-refactor ==1.0.0.4 + - haskell-tools-rewrite ==1.0.0.4 - haskintex ==0.8.0.0 - - hasmin ==1.0 + - hasmin ==1.0.1 - hasql ==1.1.1 - hasql-migration ==0.1.3 - hasql-optparse-applicative ==0.2.4 @@ -1081,19 +1085,19 @@ default-package-overrides: - hbeanstalk ==0.2.4 - Hclip ==3.0.0.4 - HCodecs ==0.5 - - 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.1 - heap ==1.0.3 - - heaps ==0.3.5 + - heaps ==0.3.6 - heatshrink ==0.1.0.0 - hebrew-time ==0.1.1 - hedgehog ==0.5.1 - hedgehog-quickcheck ==0.1 - hedis ==0.9.12 - - here ==1.2.11 + - here ==1.2.12 - heredoc ==0.2.0.0 - heterocephalus ==1.0.5.1 - hex ==0.1.2 @@ -1105,7 +1109,7 @@ default-package-overrides: - 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.4.0.1 - highjson ==0.4.0.0 @@ -1119,21 +1123,20 @@ default-package-overrides: - hit ==0.6.3 - hjsmin ==0.2.0.2 - hjsonpointer ==1.3.0 - - hjsonschema ==1.7.1 + - hjsonschema ==1.7.2 - hlibgit2 ==0.18.0.16 - hlibsass ==0.1.6.1 - - hlint ==2.0.11 - - hmatrix ==0.18.1.0 + - hmatrix ==0.18.2.0 - hmatrix-gsl ==0.18.0.1 - 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 + - hmpfr ==0.4.4 - hnix ==0.3.4 - hoauth2 ==1.5.1 - hocilib ==0.2.0 - - Hoed ==0.4.0 + - Hoed ==0.4.1 - holy-project ==0.2.0.1 - hOpenPGP ==2.5.5 - hopenpgp-tools ==0.19.5 @@ -1147,14 +1150,14 @@ default-package-overrides: - hpack ==0.21.2 - hpc-coveralls ==1.0.10 - HPDF ==1.4.10 - - hpio ==0.9.0.2 + - hpio ==0.9.0.3 - hpp ==0.5.1 - hpqtypes ==1.5.1.1 - hprotoc ==2.4.6 - hquantlib ==0.0.4.0 - hreader ==1.1.0 - hreader-lens ==0.1.3.0 - - hruby ==0.3.5 + - hruby ==0.3.5.1 - hsass ==0.5.0 - hsb2hs ==0.3.1 - hs-bibutils ==6.2.0.1 @@ -1170,12 +1173,12 @@ default-package-overrides: - hsignal ==0.2.7.5 - hsinstall ==1.6 - hslogger ==1.2.10 - - hslua ==0.9.3 + - hslua ==0.9.5 - 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.12 - HsOpenSSL-x509-system ==0.1.0.3 - hsp ==0.10.0 - hspec ==2.4.4 @@ -1189,7 +1192,7 @@ default-package-overrides: - hspec-expectations-pretty-diff ==0.7.2.4 - hspec-golden-aeson ==0.4.0.0 - hspec-megaparsec ==1.0.0 - - hspec-meta ==2.4.4 + - hspec-meta ==2.4.6 - hspec-pg-transact ==0.1.0.2 - hspec-smallcheck ==0.4.2 - hspec-wai ==0.9.0 @@ -1214,7 +1217,7 @@ default-package-overrides: - HTTP ==4000.3.9 - http2 ==1.6.3 - http-api-data ==0.3.7.1 - - http-client ==0.5.7.1 + - http-client ==0.5.9 - http-client-openssl ==0.2.1.1 - http-client-tls ==0.3.5.1 - http-common ==0.8.2.0 @@ -1259,12 +1262,13 @@ 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 + - hyphenation ==0.7.1 - ical ==0.0.1 - iconv ==0.4.1.3 - identicon ==0.2.2 + - idris ==1.2.0 - ieee754 ==0.8.0 - if ==0.1.0.0 - IfElse ==0.85 @@ -1275,19 +1279,19 @@ default-package-overrides: - imagesize-conduit ==1.1 - Imlib ==0.1.2 - immortal ==0.2.2.1 - - importify ==1.0 + - importify ==1.0.1 - 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.4.0.0 + - indents ==0.4.0.1 + - inflections ==0.4.0.1 - influxdb ==1.2.2.2 - ini ==0.3.5 - inline-c ==0.6.0.5 - inline-c-cpp ==0.2.1.0 - - inline-java ==0.7.1 - - inline-r ==0.9.0.2 + - inline-java ==0.7.2 + - inline-r ==0.9.1 - insert-ordered-containers ==0.2.1.0 - inspection-testing ==0.1.2 - instance-control ==0.1.2.0 @@ -1296,13 +1300,13 @@ default-package-overrides: - intern ==0.9.1.4 - interpolate ==0.1.1 - interpolatedstring-perl6 ==1.0.0 - - Interpolation ==0.3.0 - interpolation ==0.1.0.2 + - Interpolation ==0.3.0 - IntervalMap ==0.5.3.1 - intervals ==0.8.1 - - intro ==0.3.0.1 + - intro ==0.3.1.0 - invariant ==0.5 - - invertible ==0.2.0.2 + - invertible ==0.2.0.3 - io-choice ==0.0.6 - io-machine ==0.2.0.0 - io-manager ==0.1.0.2 @@ -1311,14 +1315,14 @@ default-package-overrides: - io-storage ==0.3 - io-streams ==1.5.0.1 - io-streams-haproxy ==1.0.0.2 - - ip ==1.1.0 + - ip ==1.1.2 - ip6addr ==0.5.3 - iproute ==1.7.1 - IPv6Addr ==1.0.1 - - IPv6DB ==0.2.3 - - ipython-kernel ==0.9.0.0 + - IPv6DB ==0.2.4 + - ipython-kernel ==0.9.0.1 - irc ==0.6.1.0 - - irc-client ==1.0.0.1 + - irc-client ==1.0.1.0 - irc-conduit ==0.2.2.4 - irc-ctcp ==0.1.3.0 - irc-dcc ==2.0.1 @@ -1337,7 +1341,7 @@ default-package-overrides: - jmacro-rpc ==0.3.2 - jmacro-rpc-happstack ==0.3.2 - jmacro-rpc-snap ==0.3 - - jni ==0.5.0 + - jni ==0.5.1 - jose ==0.6.0.3 - jose-jwt ==0.7.8 - jsaddle ==0.9.4.0 @@ -1347,14 +1351,14 @@ default-package-overrides: - json ==0.9.1 - 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 ==3.2.9.3 - JuicyPixels-extra ==0.2.2 - JuicyPixels-scale-dct ==0.1.1.2 - justified-containers ==0.2.0.1 - - jvm ==0.4.0.1 + - jvm ==0.4.1 - jwt ==0.7.2 - kan-extensions ==5.0.2 - kanji ==3.0.2 @@ -1372,7 +1376,7 @@ default-package-overrides: - kraken ==0.1.0 - l10n ==0.1.0.1 - labels ==0.3.3 - - lackey ==0.4.6 + - lackey ==0.4.7 - lame ==0.1.1 - language-c ==0.7.1 - language-c-quote ==0.12.1 @@ -1397,7 +1401,7 @@ default-package-overrides: - leapseconds-announced ==2017.1.0.1 - lens ==4.15.4 - lens-accelerate ==0.1.0.0 - - lens-action ==0.2.2 + - lens-action ==0.2.3 - lens-aeson ==1.0.2 - lens-datetime ==0.3 - lens-family ==1.2.2 @@ -1418,8 +1422,8 @@ default-package-overrides: - libsystemd-journal ==1.4.2 - libxml-sax ==0.7.5 - LibZip ==1.0.1 - - licensor ==0.2.1 - - lifted-async ==0.9.3.2 + - licensor ==0.2.2 + - lifted-async ==0.9.3.3 - lifted-base ==0.2.3.11 - lift-generics ==0.1.2 - line ==4.0.1 @@ -1432,8 +1436,8 @@ default-package-overrides: - ListLike ==4.5.1 - listsafe ==0.1.0.1 - list-t ==1.0.0.1 - - llvm-hs ==5.1.0 - - llvm-hs-pure ==5.1.0 + - llvm-hs ==5.1.3 + - llvm-hs-pure ==5.1.2 - lmdb ==0.2.5 - load-env ==0.1.2 - loch-th ==0.2.1 @@ -1452,12 +1456,12 @@ default-package-overrides: - logging-facade-syslog ==1 - logict ==0.6.0.2 - log-postgres ==0.7.0.2 - - log-warper ==1.8.2 + - log-warper ==1.8.3 - loop ==0.3.0 - lrucache ==1.2.0.0 - - lrucaching ==0.3.2 + - lrucaching ==0.3.3 - lucid ==2.9.9 - - lxd-client ==0.1.0.4 + - lxd-client ==0.1.0.5 - lxd-client-config ==0.1.0.1 - lzma ==0.0.0.3 - lzma-conduit ==1.2.0 @@ -1492,8 +1496,8 @@ default-package-overrides: - median-stream ==0.7.0.0 - med-module ==0.1.1 - megaparsec ==6.3.0 - - mega-sdist ==0.3.0.5 - - memory ==0.14.10 + - mega-sdist ==0.3.0.6 + - memory ==0.14.11 - MemoTrie ==0.6.8 - mercury-api ==0.1.0.1 - mersenne-random-pure64 ==0.2.2.0 @@ -1503,14 +1507,14 @@ default-package-overrides: - MFlow ==0.4.6.0 - mfsolve ==0.3.2.0 - microformats2-parser ==1.0.1.7 - - microlens ==0.4.8.1 + - microlens ==0.4.8.3 - microlens-aeson ==2.2.0.2 - 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 - - microsoft-translator ==0.1.0.0 + - microlens-th ==0.4.1.3 + - microsoft-translator ==0.1.1 - microspec ==0.1.0.0 - microstache ==1.0.1.1 - midi ==0.2.2.1 @@ -1531,13 +1535,13 @@ default-package-overrides: - mixed-types-num ==0.3.1.4 - mltool ==0.1.0.2 - mmap ==0.5.9 - - mmark ==0.0.3.0 - - mmark-ext ==0.0.1.1 + - mmark ==0.0.4.0 + - mmark-ext ==0.0.1.2 - mmorph ==1.1.0 - mnist-idx ==0.1.2.8 - mockery ==0.3.5 - model ==0.4.4 - - modern-uri ==0.1.2.0 + - modern-uri ==0.1.2.1 - modify-fasta ==0.8.2.3 - moesocks ==1.0.0.43 - mole ==0.0.6 @@ -1550,7 +1554,7 @@ default-package-overrides: - monadic-arrays ==0.2.2 - monad-journal ==0.8.1 - monadloc ==0.7.1 - - monad-logger ==0.3.26 + - monad-logger ==0.3.28.1 - monad-logger-json ==0.1.0.0 - monad-logger-prefix ==0.1.6 - monad-logger-syslog ==0.1.4.0 @@ -1574,14 +1578,14 @@ default-package-overrides: - monad-time ==0.2 - monad-unlift ==0.2.0 - monad-unlift-ref ==0.2.1 - - mongoDB ==2.3.0 + - mongoDB ==2.3.0.1 - 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.5.0 + - mono-traversable ==1.0.8.1 - mono-traversable-instances ==0.1.0.0 - - morte ==1.6.13 + - morte ==1.6.14 - mountpoints ==1.0.2 - mstate ==0.2.7 - mtl ==2.2.1 @@ -1608,7 +1612,7 @@ default-package-overrides: - nakadi-client ==0.3.0.0 - 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 - natural-sort ==0.1.2 @@ -1621,8 +1625,8 @@ default-package-overrides: - nettle ==0.2.0 - netwire ==5.0.2 - netwire-input ==0.0.6 - - netwire-input-glfw ==0.0.6 - - network ==2.6.3.2 + - netwire-input-glfw ==0.0.7 + - network ==2.6.3.3 - network-anonymous-i2p ==0.10.0 - network-anonymous-tor ==0.11.0 - network-attoparsec ==0.12.2 @@ -1631,7 +1635,7 @@ default-package-overrides: - network-house ==0.1.0.2 - network-info ==0.2.0.9 - network-ip ==0.3.0.2 - - network-msgpack-rpc ==0.0.3 + - network-msgpack-rpc ==0.0.4 - network-multicast ==0.2.0 - Network-NineP ==0.4.1 - network-simple ==0.4.0.5 @@ -1662,15 +1666,15 @@ default-package-overrides: - numbers ==3000.2.0.1 - numeric-extras ==0.1 - numeric-prelude ==0.4.2 - - numhask ==0.1.3 - - numhask-range ==0.1.2 + - 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 ==0.2.5 - nvim-hs-contrib ==0.2.0 - nvim-hs-ghcid ==0.2.0 - - nvvm ==0.8.0.1 - - objective ==1.1.1 + - nvvm ==0.8.0.2 + - objective ==1.1.2 - ObjectName ==1.1.0.1 - ochintin-daicho ==0.1.0.1 - oeis ==0.3.9 @@ -1678,7 +1682,7 @@ default-package-overrides: - 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 - OneTuple ==0.2.1 - online ==0.2.0 - Only ==0.1 @@ -1689,7 +1693,7 @@ default-package-overrides: - open-browser ==0.2.1.0 - openexr-write ==0.1.0.1 - OpenGL ==3.0.2.0 - - OpenGLRaw ==3.2.6.0 + - OpenGLRaw ==3.2.7.0 - openpgp-asciiarmor ==0.1 - opensource ==0.1.0.0 - openssl-streams ==1.2.1.3 @@ -1709,9 +1713,9 @@ default-package-overrides: - pagerduty ==0.0.8 - pagination ==0.2.1 - palette ==0.1.0.5 - - pandoc ==2.0.5 - - pandoc-citeproc ==0.12.1.1 - - pandoc-types ==1.17.3 + - pandoc ==2.0.6 + - pandoc-citeproc ==0.12.2.5 + - pandoc-types ==1.17.3.1 - pango ==0.13.4.0 - papillon ==0.1.0.5 - parallel ==3.2.1.1 @@ -1720,8 +1724,8 @@ default-package-overrides: - parsec ==3.1.11 - parsec-numeric ==0.1.0.0 - ParsecTools ==0.0.2.0 - - parser-combinators ==0.2.1 - - parsers ==0.12.7 + - parser-combinators ==0.4.0 + - parsers ==0.12.8 - partial-handler ==1.0.2 - partial-isomorphisms ==0.2.2.1 - partial-order ==0.1.2.1 @@ -1752,8 +1756,8 @@ default-package-overrides: - persistent ==2.7.1 - persistent-mongoDB ==2.6.0 - persistent-mysql ==2.6.2.1 - - persistent-mysql-haskell ==0.3.5 - - persistent-postgresql ==2.6.2.1 + - persistent-mysql-haskell ==0.3.6 + - persistent-postgresql ==2.6.3 - persistent-refs ==0.4 - persistent-sqlite ==2.6.4 - persistent-template ==2.5.3 @@ -1764,7 +1768,7 @@ 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.8 - pinch ==0.3.2.0 - pipes ==4.3.7 - pipes-aeson ==0.4.1.8 @@ -1790,7 +1794,7 @@ default-package-overrides: - placeholders ==0.1 - plan-b ==0.2.1 - plot ==0.2.3.9 - - pointed ==5 + - pointed ==5.0.1 - pointedlist ==0.6.1 - pointful ==1.0.9 - pointless-fun ==1.1.0.6 @@ -1798,16 +1802,17 @@ default-package-overrides: - poly-arity ==0.1.0 - polynomials-bernstein ==1.1.2 - polyparse ==1.12 + - pomaps ==0.0.0.3 - pooled-io ==0.0.2.1 - PortMidi ==0.1.6.1 - posix-paths ==0.2.1.3 - postgresql-binary ==0.12.1 - - postgresql-libpq ==0.9.3.1 + - postgresql-libpq ==0.9.4.0 - postgresql-query ==3.3.0 - postgresql-schema ==0.1.14 - postgresql-simple ==0.5.3.0 - postgresql-simple-migration ==0.1.11.0 - - postgresql-simple-queue ==1.0.0 + - postgresql-simple-queue ==1.0.1 - postgresql-simple-url ==0.2.0.0 - postgresql-transactional ==1.1.1 - postgresql-typed ==0.5.2 @@ -1829,23 +1834,23 @@ default-package-overrides: - 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.15 - - pretty-simple ==2.0.1.0 + - pretty-show ==1.6.16 + - pretty-simple ==2.0.2.0 - pretty-types ==0.2.3.1 - prim-array ==0.2.1 - primes ==0.2.1.0 - - primitive ==0.6.2.0 + - primitive ==0.6.3.0 - printcess ==0.1.0.3 - probability ==0.2.5.1 - - process-extras ==0.7.2 + - process-extras ==0.7.3 - product-isomorphic ==0.0.3.1 - product-profunctors ==0.8.0.3 - profiterole ==0.1 - - profiteur ==0.4.3.0 + - profiteur ==0.4.4.0 - profunctor-extras ==4.0 - - profunctors ==5.2.1 + - profunctors ==5.2.2 - projectroot ==0.2.0.1 - - project-template ==0.2.0 + - project-template ==0.2.0.1 - prometheus-client ==0.3.0 - prometheus-metrics-ghc ==0.3.0 - promises ==0.3 @@ -1861,17 +1866,17 @@ default-package-overrides: - proto-lens-optparse ==0.1.0.4 - proto-lens-protobuf-types ==0.2.2.0 - proto-lens-protoc ==0.2.2.3 - - protolude ==0.2 + - protolude ==0.2.1 - proxied ==0.3 - psql-helpers ==0.1.0.0 - PSQueue ==1.1 - - psqueues ==0.2.4.0 + - psqueues ==0.2.5.0 - pthread ==0.2.0 - publicsuffix ==0.20170802 - pure-io ==0.2.1 - pureMD5 ==2.1.3 - purescript-bridge ==0.11.1.2 - - pusher-http-haskell ==1.5.0.1 + - pusher-http-haskell ==1.5.1.0 - pwstore-fast ==2.4.4 - qchas ==1.0.1.0 - qm-interpolated-string ==0.2.1.0 @@ -1882,19 +1887,19 @@ default-package-overrides: - quickcheck-assertions ==0.3.0 - quickcheck-classes ==0.3.1 - quickcheck-combinators ==0.0.2 - - quickcheck-instances ==0.3.16 + - quickcheck-instances ==0.3.16.1 - quickcheck-io ==0.2.0 - quickcheck-properties ==0.1 - quickcheck-simple ==0.1.0.2 - quickcheck-special ==0.1.0.6 - - quickcheck-state-machine ==0.3.0 + - quickcheck-state-machine ==0.3.1 - quickcheck-text ==0.1.2.1 - quickcheck-unicode ==1.0.1.0 - quickcheck-with-counterexamples ==1.0 - raaz ==0.2.0 - rainbow ==0.28.0.4 - rainbox ==0.18.0.10 - - rakuten ==0.1.0.4 + - rakuten ==0.1.0.5 - ramus ==0.1.2 - random ==1.1 - random-fu ==0.2.7.0 @@ -1907,8 +1912,8 @@ default-package-overrides: - rank-product ==0.2.0.1 - Rasterific ==0.7.2.1 - rasterific-svg ==0.3.3 - - ratel ==0.3.7 - - ratel-wai ==0.3.1 + - ratel ==0.3.10 + - ratel-wai ==0.3.2 - ratio-int ==0.1.2 - rattletrap ==3.1.2 - rawfilepath ==0.2.4 @@ -1929,7 +1934,7 @@ default-package-overrides: - references ==0.3.3.1 - ref-fd ==0.4.0.1 - refined ==0.1.2.1 - - reflection ==2.1.2 + - reflection ==2.1.3 - reform ==0.2.7.1 - reform-blaze ==0.2.4.3 - reform-hamlet ==0.0.5.3 @@ -1963,7 +1968,7 @@ default-package-overrides: - req-conduit ==1.0.0 - reroute ==0.4.1.0 - resource-pool ==0.2.3.2 - - resourcet ==1.1.10 + - resourcet ==1.1.11 - rest-client ==0.5.1.1 - rest-core ==0.39 - rest-gen ==0.20.0.1 @@ -1992,7 +1997,7 @@ default-package-overrides: - safecopy ==0.9.3.3 - safe-exceptions ==0.1.6.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 @@ -2000,10 +2005,10 @@ default-package-overrides: - sandi ==0.4.1 - sandman ==0.2.0.1 - say ==0.1.0.0 - - sbp ==2.3.2 + - sbp ==2.3.6 - sbv ==7.4 - - scalendar ==1.2.0 - SCalendar ==1.1.0 + - scalendar ==1.2.0 - scalpel ==0.5.1 - scalpel-core ==0.5.1 - scanner ==0.2 @@ -2019,8 +2024,8 @@ default-package-overrides: - search-algorithms ==0.3.0 - securemem ==0.1.9 - SegmentTree ==0.3 - - selda ==0.1.11.2 - - selda-postgresql ==0.1.7.0 + - selda ==0.1.12 + - selda-postgresql ==0.1.7.1 - selda-sqlite ==0.1.6.0 - semigroupoid-extras ==5 - semigroupoids ==5.2.1 @@ -2040,18 +2045,18 @@ default-package-overrides: - servant-client ==0.11 - servant-docs ==0.11 - servant-elm ==0.4.0.1 - - servant-exceptions ==0.1.0 + - servant-exceptions ==0.1.1 - servant-foreign ==0.10.1 - servant-generic ==0.1.0.1 - servant-js ==0.9.3.1 - servant-JuicyPixels ==0.3.0.3 - - servant-kotlin ==0.1.0.2 + - servant-kotlin ==0.1.0.3 - servant-lucid ==0.7.1 - servant-mock ==0.8.3 - servant-pandoc ==0.4.1.4 - servant-purescript ==0.9.0.2 - servant-rawm ==0.2.0.2 - - servant-ruby ==0.5.0.0 + - servant-ruby ==0.5.1.0 - servant-server ==0.11.0.1 - servant-static-th ==0.1.0.6 - servant-subscriber ==0.6.0.1 @@ -2061,7 +2066,7 @@ default-package-overrides: - servant-yaml ==0.1.0.0 - serversession ==1.0.1 - serversession-backend-persistent ==1.0.4 - - serversession-backend-redis ==1.0.2 + - serversession-backend-redis ==1.0.3 - serversession-frontend-wai ==1.0 - serversession-frontend-yesod ==1.0 - servius ==1.2.0.3 @@ -2077,8 +2082,8 @@ default-package-overrides: - shakespeare ==2.0.14.1 - shell-conduit ==4.6.1 - shell-escape ==0.2.0 - - shelly ==1.7.0 - - shikensu ==0.3.7 + - shelly ==1.7.0.1 + - shikensu ==0.3.8 - shortcut-links ==0.4.2.0 - should-not-typecheck ==2.1.0 - show-prettyprint ==0.2 @@ -2091,16 +2096,16 @@ default-package-overrides: - simple-session ==0.10.1.1 - simple-templates ==0.8.0.1 - singleton-bool ==0.1.2.0 - - singleton-nats ==0.4.0.3 + - 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.5 + - skylighting ==0.5.1 - slack-web ==0.2.0.1 - slave-thread ==1.0.2 - slug ==0.1.7 - - smallcheck ==1.1.3 + - smallcheck ==1.1.3.1 - smoothie ==0.4.2.7 - smtp-mail ==0.1.4.6 - snap-blaze ==0.2.1.5 @@ -2113,7 +2118,7 @@ default-package-overrides: - soap-tls ==0.1.1.2 - socket ==0.8.0.1 - socket-activation ==0.1.0.2 - - socks ==0.5.5 + - socks ==0.5.6 - sort ==1.0.0.0 - sorted-list ==0.2.0.0 - sourcemap ==0.1.6 @@ -2128,7 +2133,7 @@ default-package-overrides: - 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 - Spock ==0.12.0.0 - Spock-api ==0.12.0.0 @@ -2149,7 +2154,7 @@ default-package-overrides: - stateref ==0.3 - statestack ==0.2.0.5 - StateVar ==1.1.0.4 - - stateWriter ==0.2.9 + - stateWriter ==0.2.10 - statistics ==0.14.0.2 - stm ==2.4.4.1 - stm-chans ==3.0.0.4 @@ -2195,7 +2200,7 @@ default-package-overrides: - stripe-haskell ==2.2.3 - stripe-http-streams ==2.2.3 - stripe-tests ==2.2.3 - - strive ==4.0.1 + - strive ==4.0.3 - structured-haskell-mode ==1.1.0 - stylish-haskell ==0.8.1.0 - sum-type-boilerplate ==0.1.1 @@ -2206,7 +2211,7 @@ default-package-overrides: - svg-tree ==0.6.2.1 - swagger ==0.3.0 - swagger2 ==2.2 - - swagger-petstore ==0.0.1.6 + - swagger-petstore ==0.0.1.7 - swish ==0.9.1.10 - syb ==0.7 - syb-with-class ==0.6.1.8 @@ -2215,35 +2220,35 @@ default-package-overrides: - sysinfo ==0.1.1 - system-argv0 ==0.1.1 - system-fileio ==0.3.16.3 - - system-filepath ==0.4.13.4 + - system-filepath ==0.4.14 - system-posix-redirect ==1.1.0.1 - tabular ==0.2.2.7 - tagchup ==0.4.1 - tagged ==0.8.5 - tagged-binary ==0.2.0.1 - tagged-identity ==0.1.2 - - tagsoup ==0.14.2 + - tagsoup ==0.14.3 - tagstream-conduit ==0.5.5.3 - tar ==0.5.0.3 - tar-conduit ==0.1.1 - tardis ==0.4.1.0 - tasty ==0.11.3 - - tasty-ant-xml ==1.1.1 + - tasty-ant-xml ==1.1.2 - tasty-auto ==0.2.0.0 - tasty-dejafu ==0.7.1.1 - - tasty-discover ==4.1.1 + - tasty-discover ==4.1.3 - tasty-expected-failure ==0.11.0.4 - tasty-fail-fast ==0.0.3 - tasty-golden ==2.3.1.2 - tasty-hedgehog ==0.1.0.1 - - tasty-hspec ==1.1.3.2 + - tasty-hspec ==1.1.3.3 - tasty-html ==0.4.1.1 - tasty-hunit ==0.9.2 - tasty-kat ==0.0.3 - tasty-program ==1.0.5 - tasty-quickcheck ==0.9.1 - - tasty-rerun ==1.1.8 - - tasty-silver ==3.1.10 + - tasty-rerun ==1.1.9 + - tasty-silver ==3.1.11 - tasty-smallcheck ==0.8.1 - tasty-stats ==0.2.0.3 - tasty-tap ==0.0.4 @@ -2268,7 +2273,7 @@ default-package-overrides: - test-framework-quickcheck2 ==0.3.0.4 - test-framework-smallcheck ==0.2 - test-framework-th ==0.2.4 - - texmath ==0.10 + - texmath ==0.10.1.1 - text ==1.2.2.2 - text-all ==0.4.1.1 - text-binary ==0.2.1.1 @@ -2277,7 +2282,7 @@ default-package-overrides: - text-generic-pretty ==1.2.1 - text-icu ==0.7.0.1 - text-latin1 ==0.3 - - text-ldap ==0.1.1.8 + - text-ldap ==0.1.1.10 - textlocal ==0.1.0.5 - text-manipulate ==0.2.0.1 - text-metrics ==0.3.0 @@ -2285,7 +2290,7 @@ default-package-overrides: - text-printer ==0.5 - text-region ==0.3.0.0 - text-short ==0.1.1 - - text-show ==3.7 + - text-show ==3.7.1 - text-show-instances ==3.6.2 - text-zipper ==0.10.1 - tfp ==1.0.0.2 @@ -2294,11 +2299,11 @@ default-package-overrides: - th-data-compat ==0.0.2.5 - th-desugar ==1.7 - these ==0.7.4 - - th-expand-syns ==0.4.3.0 + - th-expand-syns ==0.4.4.0 - th-extras ==0.0.0.4 - th-lift ==0.7.7 - th-lift-instances ==0.1.11 - - th-orphans ==0.13.4 + - th-orphans ==0.13.5 - thread-hierarchy ==0.3.0.0 - thread-local-storage ==0.1.2 - threads ==0.5.1.5 @@ -2323,7 +2328,7 @@ default-package-overrides: - time-compat ==0.1.0.3 - timeit ==1.0.0.0 - timelens ==0.2.0.2 - - time-lens ==0.4.0.1 + - time-lens ==0.4.0.2 - time-locale-compat ==0.1.1.3 - time-locale-vietnamese ==1.0.0.0 - timemap ==0.0.6 @@ -2335,7 +2340,7 @@ default-package-overrides: - tinylog ==0.14.0 - tinytemplate ==0.1.2.0 - titlecase ==1.0.1 - - tldr ==0.2.3 + - tldr ==0.2.5 - tls ==1.4.0 - tls-debug ==0.4.5 - tls-session-manager ==0.0.0.2 @@ -2352,7 +2357,7 @@ default-package-overrides: - transient ==0.5.9.2 - transient-universe ==0.4.6.1 - traverse-with-class ==1.0.0.0 - - tree-diff ==0.0.0.1 + - tree-diff ==0.0.1 - tree-fun ==0.8.1.0 - tries ==0.0.4.2 - trifecta ==1.7.1.1 @@ -2365,7 +2370,7 @@ default-package-overrides: - tuple-th ==0.2.5 - turtle ==1.4.5 - turtle-options ==0.1.0.4 - - twitter-conduit ==0.2.2.2 + - twitter-conduit ==0.2.3 - twitter-types ==0.7.2.2 - twitter-types-lens ==0.7.2 - type-aligned ==0.9.6 @@ -2373,14 +2378,14 @@ default-package-overrides: - type-combinators ==0.2.4.3 - type-combinators-singletons ==0.1.0.0 - TypeCompose ==0.9.12 - - typed-process ==0.2.0.0 + - typed-process ==0.2.1.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 - typelits-witnesses ==0.2.3.0 - - type-of-html ==1.3.0.1 + - type-of-html ==1.3.2.1 - type-operators ==0.1.0.4 - type-spec ==0.3.0.1 - typography-geometry ==1.0.0.1 @@ -2388,13 +2393,13 @@ default-package-overrides: - tzdata ==0.1.20170320.0 - ua-parser ==0.7.4.1 - uglymemo ==0.1.0.1 - - unagi-chan ==0.4.0.0 + - unagi-chan ==0.4.1.0 - unbounded-delays ==0.1.1.0 - unbound-generics ==0.3.1 - unboxed-ref ==0.4.0.0 - uncertain ==0.3.1.0 - unexceptionalio ==0.3.0 - - unfoldable ==0.9.4 + - unfoldable ==0.9.5 - unfoldable-restricted ==0.0.3 - unicode ==0.0 - unicode-show ==0.1.0.2 @@ -2404,10 +2409,10 @@ default-package-overrides: - union-find ==0.2 - uniplate ==1.6.12 - uniq-deep ==1.1.0.0 - - Unique ==0.4.7.1 - unique ==0 + - Unique ==0.4.7.2 - unit-constraint ==0.0.0 - - 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 @@ -2418,13 +2423,13 @@ default-package-overrides: - unix-bytestring ==0.3.7.3 - unix-compat ==0.5.0.1 - unix-time ==0.3.7 - - unliftio ==0.2.0.0 - - unliftio-core ==0.1.0.0 + - unliftio ==0.2.4.0 + - unliftio-core ==0.1.1.0 - unlit ==0.4.0.0 - unordered-containers ==0.2.8.0 - unordered-intmap ==0.1.0.0 - unsafe ==0.0 - - uri-bytestring ==0.3.0.1 + - uri-bytestring ==0.3.1.0 - uri-bytestring-aeson ==0.1.0.4 - uri-encode ==1.5.0.5 - uri-templater ==0.3.1.0 @@ -2444,7 +2449,7 @@ default-package-overrides: - validate-input ==0.4.0.0 - validation ==0.6.2 - validationt ==0.2.0.0 - - validity ==0.4.0.2 + - validity ==0.4.0.3 - validity-aeson ==0.1.0.0 - validity-bytestring ==0.2.0.0 - validity-containers ==0.2.0.0 @@ -2475,22 +2480,22 @@ default-package-overrides: - versions ==3.3.1 - vhd ==0.2.2 - ViennaRNAParser ==1.3.3 - - viewprof ==0.0.0.12 + - viewprof ==0.0.0.13 - 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.19 + - vty ==5.19.2 - wai ==3.2.1.1 - wai-app-static ==3.1.6.1 - wai-cli ==0.1.1 - wai-conduit ==3.0.0.3 - wai-cors ==0.2.6 - wai-eventsource ==3.0.0 - - wai-extra ==3.0.20.2 + - wai-extra ==3.0.22.0 - wai-handler-launch ==3.0.2.3 - - wai-logger ==2.3.0 + - wai-logger ==2.3.1 - wai-middleware-auth ==0.1.2.1 - wai-middleware-caching ==0.1.0.2 - wai-middleware-caching-lru ==0.1.0.0 @@ -2499,7 +2504,7 @@ default-package-overrides: - wai-middleware-crowd ==0.1.4.2 - wai-middleware-metrics ==0.2.4 - wai-middleware-prometheus ==0.3.0 - - wai-middleware-rollbar ==0.8.0 + - wai-middleware-rollbar ==0.8.2 - wai-middleware-static ==0.8.1 - wai-middleware-throttle ==0.2.2.0 - wai-predicates ==0.10.0 @@ -2518,22 +2523,22 @@ default-package-overrides: - webdriver-angular ==0.1.11 - webpage ==0.0.5 - web-plugins ==0.2.9 - - web-routes ==0.27.12 + - web-routes ==0.27.13 - 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 - webrtc-vad ==0.1.0.3 - - websockets ==0.12.2.0 + - websockets ==0.12.3.1 - websockets-rpc ==0.6.0 - websockets-simple ==0.0.6.3 - websockets-snap ==0.10.2.4 - - weeder ==0.1.9 + - weeder ==0.1.13 - weigh ==0.0.7 - wide-word ==0.1.0.5 - wikicfp-scraper ==0.1.0.9 - - wild-bind ==0.1.0.3 + - wild-bind ==0.1.1.0 - wild-bind-x11 ==0.1.0.7 - Win32 ==2.5.4.1 - Win32-notify ==0.3.0.3 @@ -2555,15 +2560,15 @@ default-package-overrides: - word-wrap ==0.4.1 - Workflow ==0.8.3 - wrap ==0.0.0 - - wrecker ==1.2.3.0 - - wreq ==0.5.1.0 - - wreq-stringless ==0.5.1.0 + - wrecker ==1.2.4.0 + - wreq ==0.5.2.0 + - 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.6 - X11 ==1.8 - X11-xft ==0.3.1 - x11-xim ==0.0.9.0 @@ -2581,7 +2586,7 @@ default-package-overrides: - xlsx-tabular ==0.2.2 - xml ==1.3.14 - xml-basic ==0.1.2 - - xml-conduit ==1.7.0 + - xml-conduit ==1.7.1.2 - xml-conduit-parse ==0.3.1.2 - xml-conduit-writer ==0.1.1.2 - xmlgen ==0.6.2.1 @@ -2602,7 +2607,7 @@ default-package-overrides: - xturtle ==0.2.0.0 - xxhash ==0.0.2 - xxhash-ffi ==0.2.0.0 - - yaml ==0.8.25 + - yaml ==0.8.28 - Yampa ==0.10.7 - YampaSynth ==0.2 - yeshql ==3.0.1.3 @@ -2612,7 +2617,8 @@ default-package-overrides: - yesod-auth-basic ==0.1.0.2 - yesod-auth-fb ==1.8.1 - yesod-auth-hashdb ==1.6.2 - - yesod-core ==1.4.37.2 + - yesod-bin ==1.5.3 + - yesod-core ==1.4.37.3 - yesod-csp ==0.2.4.0 - yesod-eventsource ==1.4.1 - yesod-fb ==0.4.0 @@ -2628,7 +2634,7 @@ default-package-overrides: - yesod-static ==1.5.3.1 - yesod-static-angular ==0.1.8 - yesod-table ==2.0.3 - - yesod-test ==1.5.8 + - yesod-test ==1.5.9.1 - yesod-websockets ==0.2.6 - yes-precure5-command ==5.5.3 - yi-core ==0.17.1 @@ -2652,8 +2658,8 @@ default-package-overrides: - zeromq4-haskell ==0.7.0 - zim-parser ==0.2.1.0 - zip ==0.2.0 - - zip-archive ==0.3.1.1 - - zippers ==0.2.4 + - zip-archive ==0.3.2.2 + - zippers ==0.2.5 - ziptastic-client ==0.3.0.3 - ziptastic-core ==0.2.0.3 - zlib ==0.6.1.2 @@ -2672,20 +2678,25 @@ extra-packages: - 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 - 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.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.19.* # required by hindent and structured-haskell-mode - - hpack == 0.20.* # required by stack-1.6.1 + - hoogle == 5.0.14 # required by hie-hoogle + - inline-c < 0.6 # required on GHC 8.0.x + - inline-c-cpp < 0.2 # required on GHC 8.0.x - language-c == 0.7.0 # required by c2hs hack to work around https://github.com/haskell/c2hs/issues/192. - 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 @@ -2695,6 +2706,7 @@ extra-packages: - QuickCheck < 2 # required by test-framework-quickcheck and its users - seqid < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x - seqid-streams < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x + - ShellCheck == 0.4.6 # required by multi-ghc-travis - 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 @@ -2704,6 +2716,7 @@ package-maintainers: peti: - cabal-install - cabal2nix + - cabal2spec - funcmp - git-annex - hackage-db @@ -2716,6 +2729,8 @@ package-maintainers: - hsemail - hsyslog - jailbreak-cabal + - lambdabot-core + - lambdabot-irc-plugins - language-nix - logging-facade-syslog - pandoc @@ -2745,17 +2760,14 @@ package-maintainers: - path-pieces - persistent - persistent-postgresql - - persistent-redis - persistent-sqlite - persistent-template - shakespeare abbradar: - Agda - - lambdabot alunduil: - - collection-json + - network-arbitrary - network-uri-json - - siren-json dont-distribute-packages: # hard restrictions that really belong into meta.platforms @@ -2862,6 +2874,7 @@ dont-distribute-packages: 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 ] @@ -2901,6 +2914,7 @@ 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-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 ] @@ -2951,8 +2965,11 @@ 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: [ 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 ] @@ -3218,6 +3235,7 @@ dont-distribute-packages: 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-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 ] @@ -3226,6 +3244,7 @@ dont-distribute-packages: 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 ] @@ -3328,6 +3347,7 @@ dont-distribute-packages: bla: [ i686-linux, x86_64-linux, x86_64-darwin ] blakesum-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] blakesum: [ i686-linux, x86_64-linux, x86_64-darwin ] + blank-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] blas-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 ] @@ -3336,6 +3356,7 @@ dont-distribute-packages: blaze-builder-enumerator: [ 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 ] blaze-json: [ i686-linux, x86_64-linux, x86_64-darwin ] blaze-textual-native: [ i686-linux, x86_64-linux, x86_64-darwin ] ble: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3377,6 +3398,7 @@ dont-distribute-packages: 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: [ 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 ] @@ -3452,7 +3474,6 @@ dont-distribute-packages: 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 ] @@ -3484,6 +3505,7 @@ dont-distribute-packages: 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 ] carboncopy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3585,6 +3607,8 @@ 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 ] chu2: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3601,6 +3625,8 @@ dont-distribute-packages: citeproc-hs: [ 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-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] clanki: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3639,6 +3665,7 @@ dont-distribute-packages: click-clack: [ i686-linux, x86_64-linux, x86_64-darwin ] clif: [ i686-linux, x86_64-linux, x86_64-darwin ] clifford: [ i686-linux, x86_64-linux, x86_64-darwin ] + clingo: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -3671,20 +3698,24 @@ dont-distribute-packages: cmv: [ i686-linux, x86_64-linux, x86_64-darwin ] cnc-spec-compiler: [ 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-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 ] + coincident-root-loci: [ i686-linux, x86_64-linux, x86_64-darwin ] colada: [ i686-linux, x86_64-linux, x86_64-darwin ] colchis: [ i686-linux, x86_64-linux, x86_64-darwin ] collada-output: [ i686-linux, x86_64-linux, x86_64-darwin ] collada-types: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -3695,6 +3726,8 @@ dont-distribute-packages: 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 ] + combinat-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] + combinat: [ 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 ] @@ -3829,6 +3862,7 @@ dont-distribute-packages: couchdb-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] CouchDB: [ i686-linux, x86_64-linux, x86_64-darwin ] countable-inflections: [ i686-linux, x86_64-linux, x86_64-darwin ] + courier: [ 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 ] @@ -3902,6 +3936,7 @@ dont-distribute-packages: 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 ] @@ -4067,6 +4102,7 @@ dont-distribute-packages: dhcp-lease-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-boolean: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-canvas: [ 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 ] @@ -4173,6 +4209,7 @@ 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 ] doublify-toolkit: [ i686-linux, x86_64-linux, x86_64-darwin ] download-media-content: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4249,6 +4286,7 @@ dont-distribute-packages: eccrypto: [ i686-linux, x86_64-linux, x86_64-darwin ] ecdsa: [ i686-linux, x86_64-linux, x86_64-darwin ] ecma262: [ i686-linux, x86_64-linux, x86_64-darwin ] + ecstasy: [ 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 ] edenmodules: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4393,6 +4431,7 @@ 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 ] 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 ] @@ -4416,6 +4455,8 @@ dont-distribute-packages: 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-combinatorics: [ i686-linux, x86_64-linux, x86_64-darwin ] fast-nats: [ i686-linux, x86_64-linux, x86_64-darwin ] fast-tagsoup: [ i686-linux, x86_64-linux, x86_64-darwin ] fastbayes: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4664,6 +4705,7 @@ dont-distribute-packages: geek: [ i686-linux, x86_64-linux, x86_64-darwin ] gegl: [ 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 ] @@ -4718,6 +4760,7 @@ dont-distribute-packages: 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 ] 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 ] @@ -4755,6 +4798,7 @@ dont-distribute-packages: 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-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 ] @@ -4773,6 +4817,7 @@ dont-distribute-packages: 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 ] @@ -4965,6 +5010,7 @@ dont-distribute-packages: gyah-bin: [ 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 ] haar: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5011,6 +5057,7 @@ dont-distribute-packages: 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 ] @@ -5325,6 +5372,7 @@ dont-distribute-packages: heap: [ 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-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 ] @@ -5487,6 +5535,7 @@ 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 ] @@ -5588,6 +5637,7 @@ dont-distribute-packages: hpg: [ 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 ] + hpio: [ 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 ] @@ -5678,6 +5728,7 @@ dont-distribute-packages: hsdns-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] Hsed: [ 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 ] HSFFIG: [ i686-linux, x86_64-linux, x86_64-darwin ] hsfilt: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5808,6 +5859,8 @@ dont-distribute-packages: hunit-gui: [ i686-linux, x86_64-linux, x86_64-darwin ] hunit-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] hunp: [ i686-linux, x86_64-linux, x86_64-darwin ] + hunt-searchengine: [ i686-linux, x86_64-linux, x86_64-darwin ] + hunt-server: [ i686-linux, x86_64-linux, x86_64-darwin ] hup: [ i686-linux, x86_64-linux, x86_64-darwin ] hurdle: [ i686-linux, x86_64-linux, x86_64-darwin ] hurriyet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5819,9 +5872,13 @@ dont-distribute-packages: hw-kafka-avro: [ 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 ] 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 ] @@ -5891,6 +5948,7 @@ dont-distribute-packages: 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-gnuplot: [ 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 ] @@ -5953,7 +6011,6 @@ dont-distribute-packages: 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-nix-shim: [ 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 ] @@ -5983,6 +6040,7 @@ dont-distribute-packages: irc-fun-color: [ i686-linux, x86_64-linux, x86_64-darwin ] Irc: [ i686-linux, x86_64-linux, x86_64-darwin ] ircbot: [ 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 ] @@ -6181,7 +6239,9 @@ dont-distribute-packages: lambda-toolbox: [ i686-linux, x86_64-linux, x86_64-darwin ] lambda2js: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdaBase: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdabot-haskell-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdabot-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdabot: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacms-core: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacms-media: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacube-bullet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6444,9 +6504,11 @@ 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 ] + 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-colonnade: [ 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 ] @@ -6477,6 +6539,7 @@ dont-distribute-packages: 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 ] @@ -6635,6 +6698,7 @@ 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 ] @@ -6846,6 +6910,7 @@ 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 ] @@ -6941,6 +7006,7 @@ dont-distribute-packages: 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 ] + ntha: [ 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 ] @@ -6954,6 +7020,7 @@ dont-distribute-packages: 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-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 ] @@ -6962,6 +7029,7 @@ dont-distribute-packages: 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 ] @@ -6978,6 +7046,7 @@ dont-distribute-packages: oculus: [ 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 ] @@ -7077,6 +7146,7 @@ dont-distribute-packages: 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-emphasize-code: [ 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 ] @@ -7100,6 +7170,7 @@ dont-distribute-packages: 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 ] paranoia: [ i686-linux, x86_64-linux, x86_64-darwin ] parco-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7175,6 +7246,7 @@ dont-distribute-packages: persistent-map: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-mysql-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-protobuf: [ i686-linux, x86_64-linux, x86_64-darwin ] + persistent-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-relational-record: [ 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 ] @@ -7234,6 +7306,7 @@ 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-transduce: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-zeromq4: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-zlib: [ i686-linux, x86_64-linux, x86_64-darwin ] pisigma: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7369,6 +7442,7 @@ dont-distribute-packages: 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 ] @@ -7423,6 +7497,7 @@ dont-distribute-packages: PUH-Project: [ i686-linux, x86_64-linux, 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 ] @@ -7444,6 +7519,7 @@ 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 ] @@ -7605,6 +7681,7 @@ 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 ] + reformat: [ i686-linux, x86_64-linux, x86_64-darwin ] refresht: [ 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 ] @@ -7707,6 +7784,7 @@ 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 ] + 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 ] @@ -7715,6 +7793,7 @@ dont-distribute-packages: ridley: [ i686-linux, x86_64-linux, x86_64-darwin ] riemann: [ i686-linux, x86_64-linux, x86_64-darwin ] riff: [ i686-linux, x86_64-linux, x86_64-darwin ] + rio: [ 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 ] @@ -7933,6 +8012,7 @@ dont-distribute-packages: servant-mock: [ 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-router: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8005,6 +8085,7 @@ dont-distribute-packages: 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 ] + sigma-ij: [ i686-linux, x86_64-linux, x86_64-darwin ] sign: [ i686-linux, x86_64-linux, x86_64-darwin ] signals: [ i686-linux, x86_64-linux, x86_64-darwin ] signed-multiset: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8047,6 +8128,7 @@ dont-distribute-packages: 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 ] sitepipe: [ i686-linux, x86_64-linux, x86_64-darwin ] sixfiguregroup: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8342,6 +8424,7 @@ dont-distribute-packages: 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 ] successors: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8448,6 +8531,7 @@ dont-distribute-packages: tamarin-prover-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] tamarin-prover: [ i686-linux, x86_64-linux, x86_64-darwin ] Tape: [ i686-linux, x86_64-linux, x86_64-darwin ] + target: [ i686-linux, x86_64-linux, x86_64-darwin ] tart: [ i686-linux, x86_64-linux, x86_64-darwin ] task-distribution: [ i686-linux, x86_64-linux, x86_64-darwin ] task: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8551,6 +8635,7 @@ dont-distribute-packages: 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 ] @@ -8873,7 +8958,6 @@ dont-distribute-packages: 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 ] - vaultenv: [ i686-linux, x86_64-linux, x86_64-darwin ] vcatt: [ 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 ] @@ -9027,6 +9111,7 @@ dont-distribute-packages: why3: [ 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: [ 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 ] @@ -9043,6 +9128,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 ] Wordlint: [ i686-linux, x86_64-linux, x86_64-darwin ] WordNet-ghc74: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9165,6 +9251,7 @@ dont-distribute-packages: 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 ] + 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 ] yampa2048: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9254,6 +9341,7 @@ dont-distribute-packages: 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 ] + z3: [ 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 ] @@ -9293,4 +9381,5 @@ dont-distribute-packages: Zora: [ i686-linux, x86_64-linux, x86_64-darwin ] zsh-battery: [ i686-linux, x86_64-linux, x86_64-darwin ] zstd: [ 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 ] diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 50ed1f19637..2320d6a8752 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -53,7 +53,7 @@ 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: { @@ -258,7 +258,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_5; }; # Needs help finding LLVM. spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm; @@ -502,4 +502,7 @@ self: super: builtins.intersectAttrs super { partial-semigroup = dontCheck super.partial-semigroup; colour = dontCheck super.colour; + LDAP = dontCheck (overrideCabal super.LDAP (drv: { + librarySystemDepends = drv.librarySystemDepends or [] ++ [ pkgs.cyrus_sasl.dev ]; + })); } diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 1658ce79393..d528230b77c 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; }; commonConfiguration = configurationCommon { inherit pkgs haskellLib; }; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 3182b4846c0..eb66a6f8922 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) @@ -20,8 +27,8 @@ let isCross = (ghc.cross or null) != null; in , enableLibraryProfiling ? false , enableExecutableProfiling ? false # 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)) +, enableSharedExecutables ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version) +, enableSharedLibraries ? ((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 , enableStaticLibraries ? true @@ -53,7 +60,7 @@ 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: @@ -74,7 +81,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,11 +113,12 @@ 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" + "--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" + "--with-hsc2hs=${nativeGhc}/bin/hsc2hs" # not cross one + "--with-strip=${stdenv.cc.bintools.targetPrefix}strip" ] ++ (if isHaLVM then [] else ["--hsc2hs-options=--cross-compile"]); crossCabalFlagsString = @@ -122,7 +134,7 @@ 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") (enableFeature enableExecutableProfiling (if versionOlder ghc.version "8" then "executable-profiling" else "profiling")) (enableFeature enableSharedLibraries "shared") @@ -135,12 +147,11 @@ let ] ++ 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 +163,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 +177,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; @@ -213,7 +223,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 +231,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 @@ -243,7 +252,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 +273,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 +289,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,8 +330,14 @@ 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 @@ -350,6 +369,8 @@ stdenv.mkDerivation ({ inherit pname version; + compiler = ghc; + isHaskellLibrary = hasActiveLibrary; # TODO: ask why the split outputs are configurable at all? @@ -394,7 +415,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; } @@ -413,5 +433,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.isLinux){ 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 c5bb3145fa4..d2e3281bbba 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -753,6 +753,8 @@ self: { pname = "Agda"; version = "2.5.3"; sha256 = "0r80vw7vnvbgq47y50v050malv7zvv2p2kg6f47i04r0b2ix855a"; + revision = "3"; + editedCabalFile = "1hd1viy4wj7fyskjmmf5hqziyvk5qxjr0zcnbp5zdyacng0yyafi"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -1819,21 +1821,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.5"; + sha256 = "0xcliysj78z51vapjbndwdh39gn3vcwqxnylqb3501i15rmsfm63"; 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/"; @@ -2692,6 +2692,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ChannelT_0_0_0_7" = callPackage + ({ mkDerivation, base, free, mmorph, mtl, transformers-base }: + mkDerivation { + pname = "ChannelT"; + version = "0.0.0.7"; + sha256 = "183pghm74vk1vdcn0mdn6g5q284sncpl1cc49lpczz1wbr15s89y"; + libraryHaskellDepends = [ base free mmorph mtl transformers-base ]; + homepage = "https://github.com/pthariensflame/ChannelT"; + description = "Generalized stream processors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Chart" = callPackage ({ mkDerivation, array, base, colour, data-default-class, lens, mtl , old-locale, operational, time, vector @@ -4006,6 +4019,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Decimal_0_5_1" = callPackage + ({ mkDerivation, base, deepseq, HUnit, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "Decimal"; + version = "0.5.1"; + sha256 = "0k7kh05mr2f54w1lpgq1nln0h8k6s6h99dyp5jzsb9cfbb3aap2p"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ + base deepseq HUnit QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + homepage = "https://github.com/PaulJohnson/Haskell-Decimal"; + description = "Decimal numbers with variable precision"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "DecisionTree" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -4706,6 +4738,23 @@ self: { license = "unknown"; }) {}; + "EdisonCore_1_3_2_1" = callPackage + ({ mkDerivation, array, base, containers, EdisonAPI, mtl + , QuickCheck + }: + mkDerivation { + pname = "EdisonCore"; + 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 efficient, purely-functional data structures (Core Implementations)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "EditTimeReport" = callPackage ({ mkDerivation, array, base, containers, csv, directory, editline , filepath, haskell98, html, pretty, xhtml @@ -6002,8 +6051,8 @@ 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 ]; @@ -6515,6 +6564,19 @@ 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; + }) {}; + "GiST" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -7381,8 +7443,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 ]; @@ -8461,13 +8523,11 @@ 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; }) {}; @@ -8536,6 +8596,8 @@ self: { pname = "HStringTemplate"; version = "0.8.6"; sha256 = "1kam09fhnz1485swp5z1k8whjiwz9fcscp6zibxkq8hw3sfcn8kh"; + revision = "1"; + editedCabalFile = "05j23rsll9xxj92gk1qvaksd9z985fpdmbp8mv73ywwjl29kfwyb"; libraryHaskellDepends = [ array base blaze-builder bytestring containers deepseq directory filepath mtl old-locale parsec pretty syb template-haskell text @@ -9071,6 +9133,24 @@ 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; + }) {}; + "HarmTrace" = callPackage ({ mkDerivation, array, base, binary, cmdargs, deepseq, Diff , directory, filepath, ghc-prim, HarmTrace-Base, instant-generics @@ -9337,15 +9417,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.1"; + sha256 = "0z8ph9frrad5nn23hi3qr2gj7lh7p2qpcmx4rdyv8vlqal38zdv1"; 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"; @@ -9633,23 +9714,52 @@ self: { }) {}; "Hoed" = callPackage - ({ mkDerivation, array, base, bytestring, cereal, containers - , directory, filepath, libgraph, mtl, process, regex-posix, time + ({ mkDerivation, array, base, bytestring, cereal, clock, containers + , deepseq, directory, libgraph, process, QuickCheck, regex-tdfa + , semigroups, strict, template-haskell, terminal-size, uniplate + , vector }: mkDerivation { pname = "Hoed"; - version = "0.4.0"; - sha256 = "0l01viv04dkxinysd7wbzn7k5rm8c21ix8k5a4p940hml879m9f1"; - enableSeparateDataOutput = true; + version = "0.4.1"; + sha256 = "14d4wypx75xmhb81f4lplvw04f5hjc97ncgzv4s07vd09bal8kq7"; libraryHaskellDepends = [ - array base bytestring cereal containers directory filepath libgraph - mtl process regex-posix time + array base bytestring cereal clock containers deepseq directory + libgraph process QuickCheck regex-tdfa semigroups strict + template-haskell terminal-size uniplate vector ]; - 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; }) {}; + "Hoed_0_5_0" = callPackage + ({ mkDerivation, array, base, bytestring, cereal, cereal-text + , cereal-vector, clock, containers, deepseq, directory, hashable + , hashtables, libgraph, open-browser, primitive, process + , QuickCheck, regex-tdfa, regex-tdfa-text, semigroups, strict + , template-haskell, terminal-size, text, transformers, uniplate + , vector, vector-th-unbox + }: + mkDerivation { + pname = "Hoed"; + version = "0.5.0"; + sha256 = "1pj2scisdissbhlf6gn5bxqp09zvi5v7h8n7l3y1rirkqwwf74a8"; + libraryHaskellDepends = [ + array base bytestring cereal cereal-text cereal-vector clock + containers deepseq directory hashable hashtables libgraph + open-browser primitive process QuickCheck regex-tdfa + regex-tdfa-text semigroups strict template-haskell terminal-size + text transformers uniplate vector vector-th-unbox + ]; + testHaskellDepends = [ base process QuickCheck ]; + homepage = "https://github.com/MaartenFaddegon/Hoed"; + description = "Lightweight algorithmic debugging"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "HoleyMonoid" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -9918,8 +10028,8 @@ self: { }: mkDerivation { pname = "HsOpenSSL"; - version = "0.11.4.11"; - sha256 = "0dgywjkvzxwpr33l642cw8v2gqn3s8kclg97xs1w8a5pqcg647pp"; + version = "0.11.4.12"; + sha256 = "18hmbjg15rlpnqq95z2d2xskj5l0hcv5mp9hb16jb26rcdi54sim"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring integer-gmp network time @@ -10245,8 +10355,8 @@ self: { }: mkDerivation { pname = "IPv6DB"; - version = "0.2.3"; - sha256 = "0j51v7y475wdrhjwrqrmlh6574l032vh7zsdhxqx723f7iswjimf"; + version = "0.2.4"; + sha256 = "1axppdhckdch3kjcmw8dga76v865xccdwsksxfnahg32k613g8zd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -10664,10 +10774,8 @@ self: { }: mkDerivation { pname = "JuicyPixels"; - version = "3.2.9.1"; - sha256 = "1g31zgsg7gq5ac9r5aizghvrg7jwn1a0qs4qwnfillqn4wkw6y5b"; - revision = "1"; - editedCabalFile = "04llw8m0s7bqz1d1vymhnzr51y9y6r9vwn4acwch1a10kq02kkpg"; + version = "3.2.9.3"; + sha256 = "14s57fgf6kd5n5al2kcvk1aaxbq1ph0r5h8blflrjkx83yl6r8yn"; libraryHaskellDepends = [ base binary bytestring containers deepseq mtl primitive transformers vector zlib @@ -10677,6 +10785,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "JuicyPixels_3_2_9_4" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl + , primitive, transformers, vector, zlib + }: + mkDerivation { + pname = "JuicyPixels"; + version = "3.2.9.4"; + sha256 = "1mlj3zcr3c49mjv0sddsfdzvzv3m0cbv56fbrkarygs5dxyh8dgz"; + libraryHaskellDepends = [ + base binary bytestring containers deepseq mtl primitive + transformers vector zlib + ]; + homepage = "https://github.com/Twinside/Juicy.Pixels"; + description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "JuicyPixels-canvas" = callPackage ({ mkDerivation, base, containers, JuicyPixels }: mkDerivation { @@ -10696,6 +10822,8 @@ self: { pname = "JuicyPixels-extra"; version = "0.2.2"; sha256 = "1f0ysxwd73s04mrqzqj9rfp6dd5441ckc96x2a4zkc1hixgkfzld"; + revision = "1"; + editedCabalFile = "1h88x4bp9jvxx8laz69izna82a9d3bapr7nfpa9gpbvqpmi7d3vd"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base JuicyPixels ]; testHaskellDepends = [ base hspec JuicyPixels ]; @@ -11541,6 +11669,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ListLike_4_6" = callPackage + ({ mkDerivation, array, base, bytestring, containers, deepseq + , dlist, fmlist, HUnit, QuickCheck, random, semigroups, text + , utf8-string, vector + }: + mkDerivation { + pname = "ListLike"; + version = "4.6"; + sha256 = "16jsj979mzjrgmpa20pls9ganym3wsps49paks1sb1gmlmwyrkf1"; + libraryHaskellDepends = [ + array base bytestring containers deepseq dlist fmlist semigroups + text utf8-string vector + ]; + testHaskellDepends = [ + array base bytestring containers dlist fmlist HUnit QuickCheck + random semigroups text utf8-string vector + ]; + homepage = "http://github.com/JohnLato/listlike"; + description = "Generic support for list-like structures"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ListT" = callPackage ({ mkDerivation, base, smallcheck, tasty, tasty-smallcheck , transformers, util @@ -11824,8 +11975,8 @@ self: { ({ mkDerivation, base, bytestring, hidapi, mtl }: mkDerivation { pname = "MBot"; - version = "0.2.3.0"; - sha256 = "1h2fapfjr5hzsr9grpk268rxfaiwl4yfgfw7wz0khrcnhjs5m9b2"; + 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; @@ -12091,6 +12242,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "MemoTrie_0_6_9" = callPackage + ({ mkDerivation, base, newtype-generics }: + mkDerivation { + pname = "MemoTrie"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "MetaHDBC" = callPackage ({ mkDerivation, base, convertible, hashtables, HDBC, HDBC-odbc , mtl, template-haskell @@ -13009,6 +13176,7 @@ self: { libraryHaskellDepends = [ array base integer ]; description = "A binary I/O library"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {integer = null;}; @@ -13681,8 +13849,8 @@ self: { }: mkDerivation { pname = "OpenGLRaw"; - version = "3.2.6.0"; - sha256 = "1fsrlc0wy27dvb1551zwgwyf1sdxd37kn1ddv33rxbli988wha60"; + version = "3.2.7.0"; + sha256 = "024aln102d1mmsdalq9jd5mmwjbnrb8gxcak73lybrc7q87kswk2"; libraryHaskellDepends = [ base bytestring containers fixed half text transformers ]; @@ -13845,6 +14013,22 @@ 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; + }) {}; + "PArrows" = callPackage ({ mkDerivation, base, containers, ghc-prim, mtl }: mkDerivation { @@ -14072,6 +14256,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 @@ -14801,6 +15078,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "QuickCheck_2_11_3" = callPackage + ({ mkDerivation, base, containers, deepseq, random + , template-haskell, tf-random, transformers + }: + mkDerivation { + pname = "QuickCheck"; + version = "2.11.3"; + sha256 = "0xhqk35fkzlbjcqbabg6962jkv8d688nzmz7ng4bm84x2d95d328"; + libraryHaskellDepends = [ + base containers deepseq random template-haskell tf-random + transformers + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/nick8325/quickcheck"; + description = "Automatic testing of Haskell programs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "QuickCheck-GenT" = callPackage ({ mkDerivation, base, mtl, QuickCheck, random }: mkDerivation { @@ -15574,7 +15870,7 @@ self: { sha256 = "139lggc8f7sw703asdyxqbja0jfcgphx0l5si1046lsryinvywa9"; libraryHaskellDepends = [ base containers text time ]; testHaskellDepends = [ - base containers hspec QuickCheck text time + base containers hspec QuickCheck scalendar text time ]; 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"; @@ -15673,6 +15969,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;}; @@ -16259,6 +16556,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ShellCheck_0_4_6" = callPackage + ({ mkDerivation, base, containers, directory, json, mtl, parsec + , process, QuickCheck, regex-tdfa + }: + mkDerivation { + pname = "ShellCheck"; + version = "0.4.6"; + sha256 = "1g5ihsma3zgb7q89n2j4772f504nnhfn065xdz6bqgrnjhkrpsqi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory json mtl parsec process QuickCheck + regex-tdfa + ]; + executableHaskellDepends = [ + base containers directory json mtl parsec QuickCheck regex-tdfa + ]; + testHaskellDepends = [ + base containers directory json mtl parsec QuickCheck regex-tdfa + ]; + homepage = "http://www.shellcheck.net/"; + description = "Shell script analysis tool"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ShellCheck" = callPackage ({ mkDerivation, base, containers, directory, json, mtl, parsec , process, QuickCheck, regex-tdfa @@ -17059,8 +17382,8 @@ 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 @@ -17159,6 +17482,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 @@ -18136,8 +18460,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 ]; @@ -18403,13 +18727,13 @@ self: { "Villefort" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, HDBC - , HDBC-sqlite3, MissingH, 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.5"; - sha256 = "1d4yq1bzjqk3w0rsjmb7y50jg0gyjbjckgbfhw9np0qbzbv2vpy3"; + version = "0.1.2.9"; + sha256 = "1mnh2snr1pwv5nwv4g7scwmclh2nm871kqb5py0v5sx4ff04kgbi"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -18420,7 +18744,9 @@ self: { 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; @@ -19051,7 +19377,7 @@ self: { "X11" = callPackage ({ mkDerivation, base, data-default, libX11, libXext, libXinerama - , libXrandr, libXrender + , libXrandr, libXrender, libXScrnSaver }: mkDerivation { pname = "X11"; @@ -19059,14 +19385,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 }: @@ -20092,8 +20418,8 @@ self: { }: mkDerivation { pname = "accelerate-fourier"; - version = "1.0.0.2"; - sha256 = "1rcbxrhh55jrp8f8g7pb8a4mq0cmhrhfx6q8z8n1hlyazswfdw1d"; + version = "1.0.0.3"; + sha256 = "1xh6anashsvj5mfkwbl3as9gjgwl69q0qz3js0xbii8vdmhbbbnb"; libraryHaskellDepends = [ accelerate accelerate-arithmetic accelerate-utility base containers QuickCheck transformers utility-ht @@ -20109,6 +20435,7 @@ self: { 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 @@ -20202,10 +20529,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 @@ -20471,6 +20796,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 { @@ -20711,6 +21051,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 { @@ -20944,8 +21298,8 @@ self: { pname = "active"; version = "0.2.0.13"; sha256 = "1yw029rh0gb63bhwwjynbv173mny14is4cyjkrlvzvxwb0fi96jx"; - revision = "2"; - editedCabalFile = "1ml42hbvfhqzpdi1y5q6dqp4wq6zqb30f15r34n9ip9iv44qjwwf"; + revision = "3"; + editedCabalFile = "0jm8kkqa5k9nppis3jdx11nmds6w0x62rmnv5bn5q3b75llhnlc1"; libraryHaskellDepends = [ base lens linear semigroupoids semigroups vector ]; @@ -21030,18 +21384,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"; + version = "4.3.5"; + sha256 = "0q4dvi02k21jq8xf0ywgmcs5mph4hpx5s3y3pj839y0g3x5paplw"; revision = "1"; - editedCabalFile = "0rfxjifhaxvq8nv1n1l8wf49gh13ailcnyachffk7y55nqr0zqdf"; + editedCabalFile = "10azjkyjx9gxz8pp6aapx2jkniyayns5qqdapb5vi7i7ykx6j92n"; 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 ]; @@ -21188,6 +21542,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "adjunctions_4_4" = callPackage + ({ mkDerivation, array, base, comonad, containers, contravariant + , distributive, free, generic-deriving, hspec, hspec-discover, mtl + , profunctors, semigroupoids, semigroups, tagged, transformers + , transformers-compat, void + }: + mkDerivation { + pname = "adjunctions"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "adler32" = callPackage ({ mkDerivation, base, bytestring, hspec, zlib }: mkDerivation { @@ -21288,6 +21665,7 @@ 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 @@ -21312,6 +21690,7 @@ self: { 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 @@ -21518,6 +21897,7 @@ 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 @@ -21623,8 +22003,8 @@ 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; @@ -21730,6 +22110,18 @@ 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.0"; + sha256 = "1976cf67y0077gd1s13vrfws5w5mcak94dc6ygnl1pir6ysanaf7"; + libraryHaskellDepends = [ aeson base lens lens-aeson text ]; + testHaskellDepends = [ base hspec text ]; + homepage = "https://github.com/ozzzzz/aeson-picker#readme"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aeson-prefix" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, mtl, text , unordered-containers, vector @@ -21969,6 +22361,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "aeson-typescript" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, hspec, interpolate, mtl, process, tasty, tasty-ant-xml + , tasty-hspec, template-haskell, temporary, text, th-abstraction + , unordered-containers + }: + mkDerivation { + pname = "aeson-typescript"; + version = "0.1.0.3"; + sha256 = "0f5s26fhkpcciqy5wcdsq123nzgcxf2dx9g2v0n9i6h3jkp5800b"; + libraryHaskellDepends = [ + aeson base containers interpolate mtl template-haskell text + th-abstraction unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring containers directory filepath hspec + interpolate mtl process tasty tasty-ant-xml tasty-hspec + 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; + }) {}; + "aeson-utils" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, scientific , text @@ -22018,18 +22434,18 @@ self: { }) {}; "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"; @@ -22214,8 +22630,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 ]; @@ -22821,8 +23237,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 @@ -23346,8 +23762,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"; @@ -23454,6 +23870,8 @@ self: { pname = "amazonka"; 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 @@ -23982,6 +24400,8 @@ self: { pname = "amazonka-core"; version = "1.5.0"; sha256 = "173mdmk3p9jqnskjf5g9r1kr568plrmshb6p17cq11n1wnngkxnk"; + revision = "1"; + editedCabalFile = "0w04b2cpshrv1r8nkw70y0n70wshzmnl0lp1khpj8qzzj1zxl1i2"; libraryHaskellDepends = [ aeson attoparsec base bifunctors bytestring case-insensitive conduit conduit-extra cryptonite deepseq exceptions hashable @@ -25069,8 +25489,8 @@ self: { }: mkDerivation { pname = "amazonka-s3-streaming"; - version = "0.2.0.3"; - sha256 = "1pndy65mk3kjl51jr75k1dk182wsbzfd2q9zsvcxpalfs0nsaf30"; + version = "0.2.0.4"; + sha256 = "1lz9a4ra6mjk19spm4i014n076f9x557ax6dsjdg8kn868hqcj56"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -25871,8 +26291,8 @@ self: { }: mkDerivation { pname = "animate"; - version = "0.3.0"; - sha256 = "040csdyzncfbdf46jy8mkgn2n4hd80na0jm4p3q954zhaqk2bvck"; + version = "0.4.0"; + sha256 = "1mzjvnr1q8lj380ijhqpnqpbqfz34bcv4frg1phsr478j55x17v4"; libraryHaskellDepends = [ aeson base bytestring containers text vector ]; @@ -26046,18 +26466,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ansi-terminal_0_8_0_1" = callPackage + ({ mkDerivation, base, colour }: + mkDerivation { + pname = "ansi-terminal"; + version = "0.8.0.1"; + sha256 = "0na61wyqn686qvzy5xbi3c8i1ba5ps6qlwnkkigzhj3c2xf3bm0v"; + 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 }: 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; @@ -26067,8 +26500,8 @@ self: { ({ 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"; @@ -26372,8 +26805,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 @@ -27201,26 +27634,26 @@ 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, conduit-extra, containers, deepseq + , directory, exceptions, filepath, mtl, parsec, pcre-light + , process-extras, strict, tasty, tasty-golden, tasty-hunit + , terminal-progress-bar, time, transformers, unix, utf8-string, X11 }: mkDerivation { pname = "arbtt"; - version = "0.9.0.13"; - sha256 = "0ga0jq47s83w36ipmz1wdcrg6ir5z2klppx6kcxpmkikf8f85gl9"; + version = "0.10"; + sha256 = "0klxsxyq4yij11c9z11jgrarmz1fya2rpx0zax7kqpvc26xbc24n"; 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 conduit-extra containers deepseq directory exceptions + filepath mtl parsec pcre-light strict terminal-progress-bar time + transformers unix 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 ]; @@ -27228,7 +27661,7 @@ self: { description = "Automatic Rule-Based Time Tracker"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xorg) libXScrnSaver;}; + }) {}; "arcgrid" = callPackage ({ mkDerivation, base, parsec, parsec-numeric }: @@ -27280,6 +27713,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;}; @@ -27613,36 +28047,6 @@ self: { }) {}; "arithmoi" = callPackage - ({ mkDerivation, array, base, containers, criterion, exact-pi - , ghc-prim, integer-gmp, integer-logarithms, mtl, QuickCheck - , random, smallcheck, tasty, tasty-hunit, tasty-quickcheck - , tasty-smallcheck, transformers - }: - mkDerivation { - pname = "arithmoi"; - version = "0.6.0.0"; - sha256 = "14kcv5n9rm48f9vac333cbazy4hlpb0wqgb4fbv97ivxnjs7g22m"; - revision = "2"; - editedCabalFile = "1n2aqkcz2glzcmpiv6wi29pgvgkhqp5gwv134slhz9v3jj4ji1j3"; - configureFlags = [ "-f-llvm" ]; - libraryHaskellDepends = [ - array base containers exact-pi ghc-prim integer-gmp - integer-logarithms mtl random - ]; - testHaskellDepends = [ - base containers integer-gmp QuickCheck smallcheck tasty tasty-hunit - tasty-quickcheck tasty-smallcheck transformers - ]; - benchmarkHaskellDepends = [ - base containers criterion integer-logarithms random - ]; - homepage = "https://github.com/cartazio/arithmoi"; - description = "Efficient basic number-theoretic functions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "arithmoi_0_6_0_1" = callPackage ({ mkDerivation, array, base, containers, criterion, exact-pi , ghc-prim, integer-gmp, integer-logarithms, mtl, QuickCheck , random, smallcheck, tasty, tasty-hunit, tasty-quickcheck @@ -27652,6 +28056,8 @@ self: { pname = "arithmoi"; version = "0.6.0.1"; sha256 = "0dhr55r5vi10d9wqr054fy8rxp7h9z0kfpwvckaly0j90d6gvkqm"; + revision = "2"; + editedCabalFile = "1z16qjjz7qy0jribxzxn394f78b71lddv2sg199s2k8r8ndzkp0c"; configureFlags = [ "-f-llvm" ]; libraryHaskellDepends = [ array base containers exact-pi ghc-prim integer-gmp @@ -28054,8 +28460,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 @@ -28285,6 +28691,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;}; @@ -28885,6 +29292,22 @@ 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 { @@ -29021,36 +29444,71 @@ self: { }) {}; "ats-format" = callPackage - ({ mkDerivation, alex, ansi-terminal, ansi-wl-pprint, array, base - , bytestring, Cabal, composition-prelude, criterion, deepseq - , directory, file-embed, happy, hspec, htoml-megaparsec, lens - , megaparsec, optparse-applicative, process, recursion-schemes - , text, unordered-containers + ({ mkDerivation, alex, ansi-wl-pprint, base, Cabal, cli-setup + , directory, file-embed, happy, htoml-megaparsec, language-ats + , optparse-applicative, process, text, unordered-containers }: mkDerivation { pname = "ats-format"; - version = "0.1.0.3"; - sha256 = "0pisqcx11n2xrdr5xq1y08fbx0hhnvhqngf2bh1wqpfr1ad4vj76"; + version = "0.2.0.5"; + sha256 = "1b5sawd2i890cnj5wkp99psfgk0l52wv82xa00vr25nb708k8pkw"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal directory lens process ]; + setupHaskellDepends = [ base Cabal cli-setup ]; libraryHaskellDepends = [ - ansi-terminal ansi-wl-pprint array base bytestring - composition-prelude deepseq directory file-embed htoml-megaparsec - lens megaparsec optparse-applicative process recursion-schemes text - unordered-containers + ansi-wl-pprint base directory file-embed htoml-megaparsec + language-ats optparse-applicative process text unordered-containers ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec ]; - benchmarkHaskellDepends = [ base criterion ]; homepage = "https://hub.darcs.net/vmchale/ats-format#readme"; 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, bytestring, Cabal, cli-setup + , composition-prelude, dhall, directory, filemanip, http-client + , http-client-tls, lens, optparse-applicative, parallel-io, process + , shake, shake-ats, shake-ext, tar, temporary, text, unix, zlib + }: + mkDerivation { + pname = "ats-pkg"; + version = "1.4.0.6"; + sha256 = "0lh6blxawz9crx7sgb2ih9ls7ca9z0lid15viczrzws44d6s3s2g"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cli-setup ]; + libraryHaskellDepends = [ + ansi-wl-pprint base bytestring composition-prelude dhall directory + filemanip http-client http-client-tls lens optparse-applicative + parallel-io process shake shake-ats shake-ext tar temporary text + unix zlib + ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/vmchale/ats-pkg#readme"; + description = "Package manager for ATS"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "ats-setup" = callPackage + ({ mkDerivation, base, Cabal, directory, http-client + , http-client-tls, parallel-io, tar, zlib + }: + mkDerivation { + pname = "ats-setup"; + version = "0.1.0.2"; + sha256 = "0si95yvwmjxy79z1ifqqxmps289l8xfqdzm9y430s341638ajivj"; + libraryHaskellDepends = [ + base Cabal directory http-client http-client-tls parallel-io tar + zlib + ]; + description = "ATS scripts for Cabal builds"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "attempt" = callPackage ({ mkDerivation, base, failure }: mkDerivation { @@ -29137,8 +29595,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 @@ -29696,8 +30154,8 @@ self: { ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "autoexporter"; - version = "1.1.2"; - sha256 = "1n7pzpxz3bb4l20hy53qdda4r1gwf6j47py08n9w568j7hygrklx"; + version = "1.1.3"; + sha256 = "0rkgb2vfznn6a28h40c26if43mzcavwd81myi27zbg8811g9bv6m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal directory filepath ]; @@ -29979,6 +30437,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;}; @@ -30696,6 +31155,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;}; @@ -31667,6 +32127,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "basement_0_0_6" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "basement"; + version = "0.0.6"; + sha256 = "1xszp4nf55hr6iglqf1dx1yb9pgm3gpw81wwpjkwdn0602a3p8lw"; + libraryHaskellDepends = [ base ghc-prim ]; + homepage = "https://github.com/haskell-foundation/foundation"; + description = "Foundation scrap box of array & string"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "basex-client" = callPackage ({ mkDerivation, base, network, pureMD5, utf8-string }: mkDerivation { @@ -31766,6 +32239,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 { @@ -31930,8 +32421,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 ]; @@ -31939,6 +32430,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, 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.1.1"; + sha256 = "1sxksvn852glnq181cj8y2pw2gkfg7afvhxx4rshvkxb7y58v8w9"; + 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 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-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 + 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 = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) ostree;}; + "bdd" = callPackage ({ mkDerivation, base, directory, HUnit, mtl, process , test-framework, test-framework-hunit, transformers @@ -32003,6 +32542,65 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "beam-core" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, dlist, free + , ghc-prim, hashable, microlens, mtl, network-uri, tasty + , tasty-hunit, text, time, vector-sized + }: + mkDerivation { + pname = "beam-core"; + version = "0.6.0.0"; + sha256 = "1pnxmy5xv84fng0391cckizwdrwzh0p0v3g0vc29z5vpksqr24kg"; + libraryHaskellDepends = [ + aeson base bytestring containers dlist free ghc-prim hashable + microlens mtl network-uri 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; + }) {}; + + "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, vector + }: + mkDerivation { + pname = "beam-migrate"; + version = "0.2.0.0"; + sha256 = "17c1wh2ygbjlr8hrm0vnk2130kmzy795sswp7wyqkjjhfp4rzyzb"; + 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 vector + ]; + homepage = "https://travis.athougies.net/projects/beam.html"; + description = "SQL DDL support and migrations support library for Beam"; + license = stdenv.lib.licenses.mit; + }) {}; + + "beam-sqlite" = callPackage + ({ mkDerivation, aeson, attoparsec, base, beam-core, beam-migrate + , bytestring, dlist, free, hashable, mtl, network-uri, scientific + , sqlite-simple, text, time + }: + mkDerivation { + pname = "beam-sqlite"; + version = "0.2.0.0"; + sha256 = "0a0z5nrgrc3m7c4b81avjnkf2y5i30z5yws0jrsw5gg2b682v0ry"; + libraryHaskellDepends = [ + aeson attoparsec base beam-core beam-migrate bytestring dlist free + hashable mtl network-uri scientific sqlite-simple text time + ]; + homepage = "http://tathougies.github.io/beam/user-guide/backends/beam-sqlite/"; + description = "Beam driver for SQLite"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "beam-th" = callPackage ({ mkDerivation, base, beam, doctest, doctest-discover, microlens , mtl, tasty, tasty-hunit, template-haskell, text, th-expand-syns @@ -32148,14 +32746,44 @@ 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, process , silently, text, turtle }: mkDerivation { pname = "bench"; - version = "1.0.7"; - sha256 = "1mn9lsix5ng9a6k0c26mw6fbqx4gap2c3cqzm30ariisdkh2bdaf"; + version = "1.0.8"; + sha256 = "18lyjkyz1yynnln92ihn9g28w2s2xmahaqg1lr1cr2v3kpv8ilvl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -32445,6 +33073,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.4"; + sha256 = "0r19z0ywxnzymd23kr9skl287w1d0g4420rxwdpq087gw77a67wl"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base brick bytestring containers directory filepath hoogle lens + process protolude text time vector vty + ]; + homepage = "https://github.com/githubuser/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 @@ -32644,6 +33292,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;}; @@ -32983,6 +33632,8 @@ self: { pname = "binary-orphans"; version = "0.1.8.0"; sha256 = "1k6067wn9zki7xvbslvxx8cq1wrmz3kjb3q3x8mxycc9v765fxgi"; + revision = "1"; + editedCabalFile = "1zgp08sikp71k9llcplkdrfhh2gn43gk7hx81nslixl5s91a1j9q"; libraryHaskellDepends = [ aeson base binary case-insensitive hashable scientific tagged text text-binary time unordered-containers vector @@ -33152,6 +33803,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;}; @@ -34275,15 +34927,15 @@ self: { }: mkDerivation { pname = "biohazard"; - version = "0.6.16"; - sha256 = "05w44blv6bawkiw2vyb32swnv6wg92033xz9p03fhrc2yhl33pps"; + version = "1.0.0"; + sha256 = "0cc855d3h1fh52ldvqzwf3f834g8singavvpk1ir157fgg8qjz3g"; 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 ]; - homepage = "http://github.com/udo-stenzel/biohazard"; + homepage = "https://bitbucket.org/ustenzel/biohazard"; description = "bioinformatics support library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -34444,6 +35096,37 @@ self: { 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 { @@ -34643,6 +35326,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;}; @@ -35013,6 +35697,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 @@ -35072,13 +35777,40 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bitx-bitcoin_0_12_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, deepseq, directory + , doctest, exceptions, hspec, http-client, http-client-tls + , http-types, microlens, microlens-th, network, QuickCheck, safe + , scientific, split, text, time + }: + mkDerivation { + pname = "bitx-bitcoin"; + version = "0.12.0.0"; + sha256 = "0wf86pkpm5vlcv5cci2sn6by0ajmq44b3azxc41zivqdpf5kkwii"; + libraryHaskellDepends = [ + aeson base bytestring deepseq exceptions http-client + http-client-tls http-types microlens microlens-th network + QuickCheck scientific split text time + ]; + testHaskellDepends = [ + aeson base bytestring directory doctest hspec http-client + http-types microlens safe text time + ]; + homepage = "https://github.com/tebello-thejane/bitx.hs"; + description = "A Haskell library for working with the BitX bitcoin exchange"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "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.1.0"; + sha256 = "1vpdh9fm4jrl7zkzp8wh8ng3x6glwk3h88fbjmajz6qpqw3z2w4h"; + 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; @@ -35258,21 +35990,22 @@ 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 + , 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 = "2"; - editedCabalFile = "1lb4q70s3xgwzkirgci6b5flq8y9lfj8qspx52hl20zrwvhi6h1n"; + version = "0.6.2"; + sha256 = "1qhdvxia8wlnv0ss9dsrxdfw3qsf376ypnpsijz7vxkj9dmzyq84"; + revision = "1"; + editedCabalFile = "0zc84pjrmb2xpsvavvf950vrwyd6nlfj3x2hi930wq1kjm7pr4ps"; 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 + scotty semigroups stm text text-show transformers vector wai + wai-extra warp ]; testHaskellDepends = [ base containers directory process shake stm text time unix vector @@ -35280,6 +36013,7 @@ self: { homepage = "https://github.com/ku-fpg/blank-canvas/wiki"; description = "HTML5 Canvas Graphics Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blas" = callPackage @@ -35549,6 +36283,7 @@ self: { homepage = "http://github.com/mruegenberg/blaze-html-truncate"; description = "A truncator for blaze-html"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blaze-json" = callPackage @@ -35576,17 +36311,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.0"; + sha256 = "0m3h3ryxj5r74mv5g5dnfq5jbbwmvkl7ray18vi20d5vd93sydj4"; 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"; @@ -35866,8 +36600,8 @@ self: { }: mkDerivation { pname = "bloodhound"; - version = "0.15.0.0"; - sha256 = "05q2zxmrxxqmi4vr98dvgfly8gir5h4iaimb3lwiflk0pw8nfn6n"; + version = "0.15.0.1"; + sha256 = "0g85fp2vppx6p1zbx506jnsfcik8q7nmc98fwrhcckgvkbdpi2v8"; libraryHaskellDepends = [ aeson base blaze-builder bytestring containers data-default-class exceptions hashable http-client http-types mtl mtl-compat @@ -35885,6 +36619,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bloodhound_0_15_0_2" = 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.2"; + sha256 = "17xw085k72dmw1q4cbqjs07gvvwwfsijcs9lsb3smxxhri1s229i"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bloodhound-amazonka-auth" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core , amazonka-elasticsearch, base, bloodhound, exceptions, http-client @@ -36387,8 +37151,8 @@ self: { }: mkDerivation { pname = "bookkeeping-jp"; - version = "0.1.1.0"; - sha256 = "1hmh8q041p0f4v58ywpwd833v7k0jg900r1la3wh4x1h08bxmbxm"; + version = "0.1.1.1"; + sha256 = "1mnjwfdzhp1kbd02g7vdc1x2rrm10hzi96j6ljin17vynh06dmm0"; libraryHaskellDepends = [ base bookkeeping mono-traversable text time ]; @@ -37039,7 +37803,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "brick_0_30" = callPackage + "brick_0_33" = callPackage ({ mkDerivation, base, config-ini, containers, contravariant , data-clist, deepseq, dlist, microlens, microlens-mtl , microlens-th, stm, template-haskell, text, text-zipper @@ -37047,8 +37811,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.30"; - sha256 = "0annvmb68vazmk3cabk01n9i00lifijxmxkbq1280yhack2q0mzz"; + version = "0.33"; + sha256 = "0052hdwvqrprf5911axikxpigbc1iv3h4kq3zhrnvpy038wjbis1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37065,6 +37829,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "brick-skylighting" = callPackage + ({ mkDerivation, base, brick, containers, skylighting, text, vty }: + mkDerivation { + pname = "brick-skylighting"; + version = "0.1"; + sha256 = "189qpq2cg45binlb9nq43h05g97ch56855xlz2givxw8psb0kb1i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base brick containers skylighting text vty + ]; + executableHaskellDepends = [ base brick skylighting 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 @@ -37842,6 +38624,8 @@ self: { pname = "butcher"; version = "1.2.1.0"; sha256 = "0vam5lqbp2k8r56d997bcp63lnsc4bbs7yd4lzjvibimr38g032w"; + revision = "3"; + editedCabalFile = "1faax0pipbywayjn961id2bc19y109bq0ny2hl1p9mh209iccnza"; libraryHaskellDepends = [ base bifunctors containers deque either extra free microlens microlens-th mtl multistate pretty transformers unsafe void @@ -38221,8 +39005,8 @@ self: { ({ mkDerivation, base, bytestring, terminal-progress-bar, time }: mkDerivation { pname = "bytestring-progress"; - version = "1.0.7"; - sha256 = "0c1pz39jp9p8ppajnj3f2phph12nvhhjj7iz8sm580gzdl5rbc4p"; + version = "1.0.8"; + sha256 = "0zqb9aanlwq2ddcn7n8xar73fjb04xvfym7k5pjah2cs1lh3cv8l"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring terminal-progress-bar time @@ -38702,6 +39486,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;}; @@ -38725,19 +39510,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 = [ @@ -38755,8 +39542,8 @@ self: { }: mkDerivation { pname = "cabal-cargs"; - version = "0.8.1"; - sha256 = "0xzzxzh41k8h6sf04b6j49b44c68gvghh0slifywj171ip4zv5g3"; + version = "0.9.0"; + sha256 = "0w371991841m4d9r73nr86j4jnr0jilj9jnvkmgh9a055vyi573s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38898,14 +39685,27 @@ self: { ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "cabal-doctest"; - version = "1.0.4"; - sha256 = "03sawamkp95jycq9sah72iw525pdndb3x4h489zf4s3ir9avds3d"; + version = "1.0.5"; + sha256 = "0x3m97q3xjmvf601vzkx4a8sl77x1y8jf0lwbq67181s37jp9asm"; libraryHaskellDepends = [ base Cabal directory filepath ]; homepage = "https://github.com/phadej/cabal-doctest"; description = "A Setup.hs helper for doctests running"; license = stdenv.lib.licenses.bsd3; }) {}; + "cabal-doctest_1_0_6" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath }: + mkDerivation { + pname = "cabal-doctest"; + version = "1.0.6"; + sha256 = "0bgd4jdmzxq5y465r4sf4jv2ix73yvblnr4c9wyazazafddamjny"; + libraryHaskellDepends = [ base Cabal directory filepath ]; + homepage = "https://github.com/phadej/cabal-doctest"; + description = "A Setup.hs helper for doctests running"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cabal-file-th" = callPackage ({ mkDerivation, base, Cabal, directory, pretty, template-haskell }: @@ -38974,35 +39774,35 @@ 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 + , 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.0"; + sha256 = "050g5y74ldpv8haj8grqpk2cw72l3gm0hypza72f556dl9j5hz2m"; 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 containers 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; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -39138,8 +39938,8 @@ 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 @@ -39237,25 +40037,26 @@ 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"; + 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"; description = "Library and utiltity for processing cabal's plan.json file"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -39462,8 +40263,8 @@ self: { }: mkDerivation { pname = "cabal-toolkit"; - version = "0.0.3"; - sha256 = "1l0ak8jch6hvmk5phibadzphwac60f00l1rkq03irifqs17c9a1f"; + version = "0.0.4"; + sha256 = "04afwsbbqsw9lj7flbnrfwy3qbv1c9nkwm65ylspy2nzf9v06ljj"; libraryHaskellDepends = [ base binary bytestring Cabal containers ghc template-haskell ]; @@ -39574,19 +40375,19 @@ self: { "cabal2nix" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal - , cabal-doctest, containers, deepseq, directory - , distribution-nixpkgs, doctest, filepath, hackage-db, hopenssl - , hpack, 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, text, time, transformers, utf8-string, yaml }: mkDerivation { pname = "cabal2nix"; - version = "2.7"; - sha256 = "1ypzldvifqm4nv9bwzvm5pfsxxn4mp19z50fpkxk84fhb5pb6nbd"; + version = "2.8.1"; + sha256 = "1ahdqyiw76fixk90bi1b87ym5ii09fskpk0q9f9csbdmjif945x7"; + revision = "1"; + editedCabalFile = "0pq2cns1q7hbxd7gpyy643vaz8pcc7l96vlw23y30hpdgcnn23d3"; 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 hpack @@ -39594,17 +40395,9 @@ self: { time transformers yaml ]; executableHaskellDepends = [ - aeson ansi-wl-pprint base bytestring Cabal containers deepseq - directory distribution-nixpkgs filepath hackage-db hopenssl hpack - language-nix lens monad-par monad-par-extras mtl - optparse-applicative pretty process split text time transformers - utf8-string yaml - ]; - testHaskellDepends = [ - aeson ansi-wl-pprint base bytestring Cabal containers deepseq - directory distribution-nixpkgs doctest filepath hackage-db hopenssl - hpack language-nix lens optparse-applicative pretty process split - text time transformers yaml + aeson base bytestring Cabal containers directory + distribution-nixpkgs filepath hopenssl language-nix lens monad-par + monad-par-extras mtl optparse-applicative pretty utf8-string ]; homepage = "https://github.com/nixos/cabal2nix#readme"; description = "Convert Cabal files into Nix build instructions"; @@ -39613,23 +40406,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.0.0"; + sha256 = "16xvv9qg1rxxnb9mdymx574kx6awhrn855x59ihl27bzp2q2pa53"; + 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 @@ -39790,8 +40584,8 @@ self: { }: mkDerivation { pname = "cache"; - version = "0.1.0.0"; - sha256 = "1l7vn3fnspbnm3qrrxai7ldcy63wkppa4amspxhpqaajch5f97hl"; + version = "0.1.0.1"; + sha256 = "0bv7s9lffhggh0z5ad03ryqzq6bcqga1zg4c6f57i7hh9q8161qd"; libraryHaskellDepends = [ base clock hashable stm transformers unordered-containers ]; @@ -40456,6 +41250,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "capataz" = callPackage + ({ mkDerivation, async, base, bytestring, data-default, 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.0.0.2"; + sha256 = "0d6k13qqm30rcs27qr6q8p0a4wlqw75qyfmk9x2s6zhydl4cwb85"; + libraryHaskellDepends = [ + async base bytestring data-default protolude safe-exceptions stm + teardown text time unordered-containers uuid vector + ]; + testHaskellDepends = [ + async base bytestring data-default 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 { @@ -40821,6 +41640,8 @@ self: { pname = "case-insensitive"; version = "1.2.0.10"; sha256 = "0v1hclvv0516fnlj5j2izd9xmakl7dshi9cb32iz6dgvzx01qck6"; + revision = "1"; + editedCabalFile = "153x2i7gw7lyhydlf0924vfxmkk53r65c40104bbha2bhp1vj7fi"; libraryHaskellDepends = [ base bytestring deepseq hashable text ]; testHaskellDepends = [ base bytestring HUnit test-framework test-framework-hunit text @@ -41207,6 +42028,8 @@ self: { pname = "cassava-megaparsec"; version = "1.0.0"; sha256 = "14d1idyw4pm8gq41383sy6cid6v1dr9zc7wviy4vd786406j2n28"; + revision = "1"; + editedCabalFile = "0dk6bxyvlg0iq83m81cbyysiydcj3dsvhlishjc119hzpy8g8xd6"; libraryHaskellDepends = [ base bytestring cassava containers megaparsec unordered-containers vector @@ -41220,6 +42043,29 @@ self: { 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 ({ mkDerivation, base, bytestring, cassava, io-streams, QuickCheck , tasty, tasty-quickcheck, vector @@ -41387,10 +42233,8 @@ self: { ({ mkDerivation, alg, base }: mkDerivation { pname = "category"; - version = "0.2.0.0"; - sha256 = "1zl7jsc99wqdw6fibxr9l3zf7xprkh5q1681gx6d5kvj9cfahcav"; - revision = "1"; - editedCabalFile = "0j24ymqy443wx7r5w8xklqsp1x133pwlwfni92qm0im66flfdb44"; + version = "0.2.0.1"; + sha256 = "0v5b15lgbdjrqpln532kw2d4isl5lf633jbld3clcp7c71vb7l07"; libraryHaskellDepends = [ alg base ]; description = "Categorical types and classes"; license = stdenv.lib.licenses.bsd3; @@ -41492,8 +42336,8 @@ self: { }: mkDerivation { pname = "cayley-client"; - version = "0.4.1"; - sha256 = "11q92jbc4sgvif6akd5vvsdj3ncx0xhwk0mimyc55m4m7srjdplq"; + version = "0.4.2"; + sha256 = "1pzsr7jcqsi27mnxgq4y5np4ysig29cmk27iqp0m73xj5fiss6z8"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring exceptions http-client http-conduit lens lens-aeson mtl text transformers @@ -41755,8 +42599,8 @@ self: { }: mkDerivation { pname = "celtchar"; - version = "0.1.2.0"; - sha256 = "1p53fyv15vvch6zjv2mgycj9wpcxkxpfbwkmbi7dpjgi65wyaz97"; + version = "0.1.3.0"; + sha256 = "1f67vi6kjjhnnr4kxnzgkva1qvcadx9968cmac3iix2g56xs26wn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41807,8 +42651,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 ]; @@ -42181,8 +43025,8 @@ self: { }: mkDerivation { pname = "cgrep"; - version = "6.6.17"; - sha256 = "18si8gmgkfzky9rd53llz489j2wgzaw2b7hgr1djlc9yvp5h7482"; + version = "6.6.22"; + sha256 = "0nh8smbhwkqygxdv61yd82n26q6d4sdh4zzixcq5pczzacfzp8j9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -42273,8 +43117,8 @@ self: { ({ mkDerivation, async, base, stm }: mkDerivation { pname = "chan"; - version = "0.0.2"; - sha256 = "1qig63k7iarmmfjnm3zl32b9268ix9bjmhh2gf99hknr0c5h7dmc"; + version = "0.0.3"; + sha256 = "0ci20y0wd232qnh1mql3vjqml13mkrpm9dgv005wcgym7w18isgr"; libraryHaskellDepends = [ async base stm ]; testHaskellDepends = [ async base stm ]; homepage = "https://github.com/athanclark/chan#readme"; @@ -42389,24 +43233,25 @@ self: { ({ 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 + , primitive, protolude, scientific, SVGFonts, tasty, tasty-hspec + , tdigest, text }: mkDerivation { pname = "chart-unit"; - version = "0.5.4"; - sha256 = "1zyfh713sr8bhyn6v2la52xzyq7frg0igwxhfl8ym8l7nhxrrby7"; + version = "0.5.5.0"; + sha256 = "0hskfcg17h22fyprr9y264g6jz4lq1a7akqvdyji4fln61mqn07r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base colour data-default diagrams-lib diagrams-svg foldl formatting - lens linear numhask numhask-range palette SVGFonts text + lens linear numhask numhask-range palette scientific SVGFonts text ]; executableHaskellDepends = [ base containers diagrams-lib diagrams-svg foldl formatting lens mwc-probability mwc-random numhask primitive protolude tdigest text ]; 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; @@ -42517,27 +43362,26 @@ self: { "chatwork" = callPackage ({ mkDerivation, aeson, aeson-casing, base, bytestring, connection , data-default-class, hspec, http-api-data, http-client - , http-client-tls, http-types, req, retry, servant-server, text - , warp + , http-client-tls, http-types, req, servant-server, text, warp }: mkDerivation { pname = "chatwork"; - version = "0.1.2.0"; - sha256 = "1qgb5b8y99rh243x1mz0n12lv59l73vnhczxzq8s2h5lzcay3bps"; + version = "0.1.3.0"; + sha256 = "1b6s5f2v4qc19l2psbpwlx6nyq0285mpfl25gfv4p9xrsdmqcyr4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-casing base bytestring connection data-default-class - http-api-data http-client http-client-tls http-types req retry text + http-api-data http-client http-client-tls http-types req text ]; executableHaskellDepends = [ aeson aeson-casing base bytestring connection data-default-class - http-api-data http-client http-client-tls http-types req retry text + http-api-data http-client http-client-tls http-types req text ]; testHaskellDepends = [ aeson aeson-casing base bytestring connection data-default-class hspec http-api-data http-client http-client-tls http-types req - retry servant-server text warp + servant-server text warp ]; homepage = "https://github.com/matsubara0507/chatwork#readme"; description = "The ChatWork API in Haskell"; @@ -42969,6 +43813,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 { @@ -43063,12 +43995,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; }) {}; @@ -43630,6 +44562,7 @@ self: { homepage = "http://clafer.org"; description = "Compiles Clafer models to other formats: Alloy, JavaScript, JSON, HTML, Dot"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "claferIG" = callPackage @@ -43663,6 +44596,7 @@ self: { homepage = "http://clafer.org"; description = "claferIG is an interactive tool that generates instances of Clafer models"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "claferwiki" = callPackage @@ -44468,6 +45402,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cli-setup" = callPackage + ({ mkDerivation, base, bytestring, directory, process }: + mkDerivation { + pname = "cli-setup"; + version = "0.1.0.3"; + sha256 = "1w41pdprifdgp7h2z08m78jg058i49530pfvgmr53lmch5dkk4vf"; + libraryHaskellDepends = [ base bytestring directory 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 @@ -44583,6 +45529,7 @@ self: { homepage = "https://github.com/tsahyt/clingo-haskell#readme"; description = "Haskell bindings to the Clingo ASP solver"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) clingo;}; "clippard" = callPackage @@ -45319,8 +46266,8 @@ self: { }: mkDerivation { pname = "cmdargs"; - version = "0.10.18"; - sha256 = "1lnmcsf6p9yrwwz1zvrw5lbc32xpff7b70yz4ylawaflnlz6wrlh"; + version = "0.10.20"; + sha256 = "0cbkmgrcnwgigg6z88y3c09gm7g6dwm7gzbgr53h8k1xik29s9hf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45438,8 +46385,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 ]; @@ -45457,8 +46404,8 @@ self: { }: mkDerivation { pname = "cmv"; - version = "1.0.6"; - sha256 = "1djqw8szaq8p8mhxp4789gx5mgibdlcwhbkilzc5zcxf619pn3c1"; + version = "1.0.8"; + sha256 = "1l113yawclfpvhb5p3j6mhi3nqh8d1ix64k7d2q9slnvs3vdvphb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45504,14 +46451,33 @@ self: { ({ mkDerivation, array, base, bytestring, file-embed, text }: mkDerivation { pname = "cndict"; - version = "0.9.0"; - sha256 = "0v0drr7zxh2ndq91vhpsi4ykna993fnkfmxana7g1q4c2vn8b5sc"; + 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; + }) {}; + "code-builder" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -45691,6 +46657,7 @@ self: { ]; description = "Graphics library for CodeWorld"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "codex" = callPackage @@ -45857,6 +46824,7 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "Equivariant CSM classes of coincident root loci"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "colada" = callPackage @@ -45968,25 +46936,27 @@ self: { }) {}; "collection-json" = callPackage - ({ mkDerivation, aeson, base, bytestring, hspec, network-uri - , network-uri-json, 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.2"; - sha256 = "033hwm20w1432nh3gvphkkyl9i4rjm74l3szplpsq0a9rp097la0"; + version = "1.1.2.1"; + sha256 = "1x43b1rmlrsv8jmr2mawy2ykwljbbb4h8cfcfd6gxrkzxwvlxhsl"; libraryHaskellDepends = [ aeson base network-uri network-uri-json text ]; testHaskellDepends = [ - aeson base bytestring hspec network-uri network-uri-json 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 @@ -46185,6 +47155,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "colour_2_3_3" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "colour"; + version = "2.3.3"; + sha256 = "1qmn1778xzg07jg9nx4k1spdz2llivpblf6wwrps1qpqjhsac5cd"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base ]; + 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 @@ -46319,6 +47303,7 @@ self: { ]; description = "Commonmark (markdown) to HTML renderer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {comark-testutils = null;}; @@ -46345,6 +47330,7 @@ self: { ]; description = "Parser for Commonmark (markdown)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {comark-testutils = null;}; @@ -46377,6 +47363,7 @@ self: { 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 @@ -46394,6 +47381,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 @@ -46436,6 +47424,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "combinatorial_0_1" = callPackage + ({ mkDerivation, array, base, containers, QuickCheck, transformers + , utility-ht + }: + mkDerivation { + pname = "combinatorial"; + version = "0.1"; + sha256 = "1a5l4iixjhvqca8dvwkx3zvlaimp6ggr3fcm7vk7r77rv6n6svh9"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "combinatorial-problems" = callPackage ({ mkDerivation, array, base, bytestring, bytestring-lexing , containers, parsec, random @@ -46658,8 +47666,8 @@ self: { pname = "comonad"; version = "5.0.2"; sha256 = "115pai560rllsmym76bj787kwz5xx19y8bl6262005nddqwzxc0v"; - revision = "1"; - editedCabalFile = "1lnsnx8p3wlfhd1xfc68za3b00vq77z2m6b0vqiw2laqmpj9akcw"; + revision = "2"; + editedCabalFile = "1ngks9bym68rw0xdq43n14nay4kxdxv2n7alwfd9wcpismfz009g"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base containers contravariant distributive semigroups tagged @@ -46824,10 +47832,10 @@ self: { ({ mkDerivation, base, containers, transformers, vector }: mkDerivation { pname = "compactable"; - version = "0.1.0.2"; - sha256 = "19ra58dz8wcwx3f5znfqqc0dvnfhldkbd8rg9psc7cynf9xcf93m"; + version = "0.1.0.4"; + sha256 = "1xf13k0syj8ssjgf2snddkgljwxpb4gpl0di9hsf1iy1wcx6pgh6"; libraryHaskellDepends = [ base containers transformers vector ]; - description = "A generalization for containers that can be stripped of Nothings"; + description = "A typeclass for structures which can be catMaybed, filtered, and partitioned"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -47241,8 +48249,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "composition-prelude"; - version = "0.1.1.1"; - sha256 = "124r75vmbjd6nvibj3yadwnrkhr1r2d6i30qx3acidljw0fjfcnm"; + version = "1.1.0.2"; + sha256 = "1r6i0b9kphx8pmmlkna50gdsqwsmsc538nxhax3imxydi2lhxsdd"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/vmchale/composition-prelude#readme"; description = "Higher-order function combinators"; @@ -47283,10 +48291,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 @@ -47678,6 +48684,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "concurrency_1_4_0_0" = callPackage + ({ mkDerivation, array, atomic-primops, base, exceptions + , monad-control, mtl, stm, transformers + }: + mkDerivation { + pname = "concurrency"; + version = "1.4.0.0"; + sha256 = "0rpljvcswb1smidvxh7nwb6ms2gr8wf0gzs0kapiqc9g3wlr1r9r"; + libraryHaskellDepends = [ + array atomic-primops base exceptions monad-control mtl stm + transformers + ]; + homepage = "https://github.com/barrucadu/dejafu"; + description = "Typeclasses, functions, and data types for concurrency and STM"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "concurrent-barrier" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -47761,8 +48785,8 @@ self: { }: mkDerivation { pname = "concurrent-machines"; - version = "0.3.1"; - sha256 = "0n04gnnv323fk1h9mp8krqbl2v6ljjv1vzw5df38cxvj2xd64y94"; + version = "0.3.1.1"; + sha256 = "109c202sqhsx6fr8m0zkwgzsy7pnnaps2nhyykp7cd6rw0ak6i28"; libraryHaskellDepends = [ async base containers lifted-async machines monad-control semigroups time transformers transformers-base @@ -47782,8 +48806,8 @@ self: { }: mkDerivation { pname = "concurrent-output"; - version = "1.10.1"; - sha256 = "17h081vj2sksv9ldpp9jlir2avnzbx92ay321lha8cjm9cpv4996"; + version = "1.10.2"; + sha256 = "02kfg61f7lm8796n4pdi7yvscg8n869vhl9i6rd9rpyb4l9myzd1"; libraryHaskellDepends = [ ansi-terminal async base directory exceptions process stm terminal-size text transformers unix @@ -47870,10 +48894,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"; @@ -48004,8 +49026,8 @@ self: { }: mkDerivation { pname = "conduit"; - version = "1.2.12.1"; - sha256 = "0zl6gflh7y36y2vypjhqx13nhkk5y3h12c1zj7kjfclrmwnvnwh0"; + version = "1.2.13"; + sha256 = "1b0i6zbmp9j0km150nghmq77rz3iahkib3dd2m9hihabc6n1p793"; libraryHaskellDepends = [ base exceptions lifted-base mmorph monad-control mtl primitive resourcet transformers transformers-base transformers-compat @@ -48026,25 +49048,26 @@ self: { "conduit-algorithms" = callPackage ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit , conduit-combinators, conduit-extra, containers, deepseq - , directory, HUnit, mtl, resourcet, stm, stm-conduit + , directory, HUnit, lzma-conduit, mtl, resourcet, stm, stm-conduit , test-framework, test-framework-hunit, test-framework-th - , transformers + , transformers, vector }: mkDerivation { pname = "conduit-algorithms"; - version = "0.0.6.1"; - sha256 = "0zs7klxlkirch0j7gasxqalfw9nc4pfslgrg93jwn5vhpxdxhgwk"; + version = "0.0.7.1"; + sha256 = "153g4lhd8ah97hbdvjxc1j4cnkdmpy6x2pbdjv2n7wyn80mqh9i7"; libraryHaskellDepends = [ async base bytestring bzlib-conduit conduit conduit-combinators - conduit-extra containers deepseq mtl resourcet stm stm-conduit - transformers + conduit-extra containers deepseq lzma-conduit mtl resourcet stm + stm-conduit transformers 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 HUnit lzma-conduit mtl + resourcet stm stm-conduit test-framework test-framework-hunit + test-framework-th transformers vector ]; + homepage = "https://github.com/luispedro/conduit-algorithms#readme"; description = "Conduit-based algorithms"; license = stdenv.lib.licenses.mit; }) {}; @@ -48174,8 +49197,8 @@ self: { }: mkDerivation { pname = "conduit-extra"; - version = "1.2.2"; - sha256 = "04bc1vy9giwfdcavrhjbmzm31lrf5360swns38yg6brql4pa2vii"; + version = "1.2.3.2"; + sha256 = "1xihl8zrd6jyfnlmsrqshwwqc8176whs5im4jvxvk9038wl6cnqx"; libraryHaskellDepends = [ async attoparsec base blaze-builder bytestring conduit directory exceptions filepath monad-control network primitive process @@ -48328,8 +49351,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 @@ -48426,8 +49449,8 @@ self: { }: mkDerivation { pname = "config-ini"; - version = "0.2.1.1"; - sha256 = "0rhjqbg6f37jmcddad0yiqvn9i4i8k7rcivnqz92swd2bikyrp3n"; + version = "0.2.2.0"; + sha256 = "1820w4y8k0qrlilrizkqckwiyli0x4qcdjmagvcngy5bfsw6fk9n"; libraryHaskellDepends = [ base containers megaparsec text transformers unordered-containers ]; @@ -48463,13 +49486,13 @@ self: { }) {}; "config-parser" = callPackage - ({ mkDerivation, base, hspec, lens, parsec, text }: + ({ mkDerivation, base, extra, hspec, lens, parsec, text }: mkDerivation { pname = "config-parser"; - version = "1.0.0.0"; - sha256 = "0ak3yhlfnw24d8rbv0z8mpkg839048ywp0c64slbxam3sxs8g170"; + version = "1.2.0.0"; + sha256 = "1jmb8c2ksxp9gfryymg100hjfn5kfshi95a1533d6h18ypqd5zb3"; libraryHaskellDepends = [ base parsec text ]; - testHaskellDepends = [ base hspec lens 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; @@ -48484,6 +49507,8 @@ self: { pname = "config-schema"; version = "0.5.0.0"; sha256 = "108gjzafzc5hv1vilnxagf65bh2xia2rfwxcjw6axzzhw5lszgli"; + revision = "1"; + editedCabalFile = "03py056v8wvabykx95h5z52g0a5sxglmvvk67wvr94ig8161gbjc"; libraryHaskellDepends = [ base config-value containers free kan-extensions pretty semigroupoids text transformers @@ -48948,8 +49973,8 @@ self: { ({ mkDerivation, base, category }: mkDerivation { pname = "constraint"; - version = "0.1.1.0"; - sha256 = "15kkkbqy6vjhbjl1jdqrsazrhv5k2l2vqymdjjdn3l07cfnf9lzj"; + version = "0.1.1.1"; + sha256 = "0iyz3n8qplp892cw2k2z5pp4pv54p5qaqrcjgpiwfm9jkri0v012"; libraryHaskellDepends = [ base category ]; description = "Reified constraints"; license = stdenv.lib.licenses.bsd3; @@ -48997,6 +50022,27 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "constraints_0_10" = callPackage + ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, hspec + , hspec-discover, mtl, semigroups, transformers + , transformers-compat + }: + mkDerivation { + pname = "constraints"; + version = "0.10"; + sha256 = "1ii6j62xihxwb85akvy8cdd73g9qr7rd5zl37h4925y2acpbh962"; + libraryHaskellDepends = [ + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "constructible" = callPackage ({ mkDerivation, arithmoi, base, binary-search, complex-generic }: mkDerivation { @@ -49134,15 +50180,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 @@ -49282,12 +50328,12 @@ self: { }) {}; "continued-fraction" = callPackage - ({ mkDerivation, base, criterion, free, hspec, recursion-schemes }: + ({ mkDerivation, base, criterion, hspec, recursion-schemes }: mkDerivation { pname = "continued-fraction"; - version = "0.1.0.3"; - sha256 = "08zvphhxm5w79zrrj1qsixdq4i5flwz0ci47mmkh671dp99qjriq"; - libraryHaskellDepends = [ base free recursion-schemes ]; + version = "0.1.0.6"; + sha256 = "04vv2qnpz2pfkizrx8layf3z9kfjkika15ha5kpm0av52d405fiz"; + libraryHaskellDepends = [ base recursion-schemes ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion ]; homepage = "https://hub.darcs.net/vmchale/continued-fraction#readme"; @@ -49348,15 +50394,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"; @@ -49395,8 +50440,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)`."; @@ -50348,6 +51393,7 @@ 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 @@ -50524,8 +51570,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; @@ -51035,17 +52081,20 @@ self: { }) {}; "crdt" = callPackage - ({ mkDerivation, base, containers, mtl, QuickCheck, tasty - , tasty-discover, tasty-quickcheck + ({ mkDerivation, base, binary, bytestring, containers, mtl + , network-info, QuickCheck, quickcheck-instances, safe, stm, tasty + , tasty-discover, tasty-quickcheck, time }: mkDerivation { pname = "crdt"; - version = "4.0"; - sha256 = "16lsyvcnz8qjy5lakf4dxzz9b4rcgz8bk6wzf3cmxn51kpxyc0rn"; - libraryHaskellDepends = [ base containers mtl ]; + version = "6.2"; + sha256 = "0d88s8wj3679v4hjgh2jzhsp3iscbh8ph8vkc2rv528abkxfrqfv"; + libraryHaskellDepends = [ + base binary bytestring containers mtl network-info safe stm time + ]; testHaskellDepends = [ - base containers mtl QuickCheck tasty tasty-discover - tasty-quickcheck + base containers QuickCheck quickcheck-instances tasty + tasty-discover tasty-quickcheck ]; homepage = "https://github.com/cblp/crdt#readme"; description = "Conflict-free replicated data types"; @@ -51086,8 +52135,8 @@ self: { }: mkDerivation { pname = "credential-store"; - version = "0.1.1"; - sha256 = "1qim9hqyak3c7giqjrkvdvlpgwlbgnyz418q6pndwvyrhzm7n21m"; + version = "0.1.2"; + sha256 = "114jdbpiyx8xnjxnpz05nqpnb5s29y1iv330b0i491vik8hvrbad"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -51287,6 +52336,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "criterion_1_3_0_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 + }: + mkDerivation { + pname = "criterion"; + version = "1.3.0.0"; + sha256 = "0csgk6njr6a3i895d10pajf7z4r9hx8aj2r0c3rj5li6vrm37f8q"; + 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 + ]; + executableHaskellDepends = [ + base base-compat optparse-applicative semigroups + ]; + testHaskellDepends = [ + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "criterion-plus" = callPackage ({ mkDerivation, base, criterion, deepseq, HTF, HUnit, loch-th , monad-control, mtl, optparse-applicative, placeholders @@ -51523,8 +52608,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 ]; @@ -51656,10 +52743,8 @@ self: { }: mkDerivation { pname = "crypto-enigma"; - version = "0.0.2.9"; - sha256 = "18nc5gqsy4dsm22van6iz96lqq45f7jqik4fljczgp6n1knyig9z"; - revision = "1"; - editedCabalFile = "1hbcnj3w5z7cmlrmfih7mv27n75bpcpbiq66wsfgrrvaiycrb58n"; + version = "0.0.2.10"; + sha256 = "1c7baw7k9shllfxp1yg5czr9m0392pnpqiblaz8v17rc71d402p6"; libraryHaskellDepends = [ base containers MissingH mtl split ]; testHaskellDepends = [ base HUnit QuickCheck ]; homepage = "https://github.com/orome/crypto-enigma-hs"; @@ -52071,21 +53156,33 @@ self: { }) {}; "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"; 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"; + 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 { @@ -52658,8 +53755,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 @@ -52754,8 +53851,8 @@ self: { }: mkDerivation { pname = "cue-sheet"; - version = "1.0.0"; - sha256 = "05fj4iqg0ixrs8076p9jcl5my0qx4hgzcprnaymfkkr0n9x06sz1"; + version = "1.0.1"; + sha256 = "13vzay3i385k8i2k56bl9rr9sy7mnhas4b35xc8q7744gbl5hji1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers data-default-class exceptions megaparsec @@ -52790,12 +53887,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; @@ -52897,41 +53996,61 @@ 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"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "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 ]; - executableHaskellDepends = [ - base containers curry-base mtl old-time pretty syb + libraryHaskellDepends = [ + base containers curry-base directory extra filepath mtl network-uri + pretty process set-extra transformers ]; - homepage = "http://www.curry-language.org"; + executableHaskellDepends = [ + base containers curry-base directory extra filepath mtl network-uri + pretty process set-extra transformers + ]; + 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; }) {}; @@ -53919,6 +55038,7 @@ self: { 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; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {basic = null;}; @@ -54309,8 +55429,8 @@ self: { }: mkDerivation { pname = "data-diverse"; - version = "2.0.0.0"; - sha256 = "07lb6cyjskl5483qw6wqhipznpb996gvyr07dhplayc2djy8cjvw"; + version = "2.0.1.0"; + sha256 = "0997mn0amfl4k70rvrxjw24dzyr6sv42nr1d24whyy114lsiv05b"; libraryHaskellDepends = [ base containers deepseq ghc-prim tagged ]; @@ -54340,14 +55460,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-diverse-lens_2_1_0_0" = callPackage + ({ mkDerivation, base, data-diverse, generic-lens, hspec, lens + , profunctors, tagged + }: + mkDerivation { + pname = "data-diverse-lens"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "data-dword" = callPackage ({ mkDerivation, base, data-bword, ghc-prim, hashable, tasty , tasty-quickcheck, template-haskell }: 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 ]; @@ -54587,8 +55727,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."; @@ -54783,8 +55923,8 @@ self: { }: mkDerivation { pname = "data-lens"; - version = "2.11.1"; - sha256 = "0ciwqxm79a8zdfi7wymy9hhan6362hlhd6n8sz79pyjlsyvhpgpv"; + version = "2.11.2"; + sha256 = "123rxp37qjg0rkwz0521s5181qcm4v9gk94ny2j86vw7311kd0ax"; libraryHaskellDepends = [ base comonad containers semigroupoids transformers ]; @@ -54900,23 +56040,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 @@ -55487,19 +56626,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.0.0"; + sha256 = "0zk4dkd6q2rv0fbylp2fprizahfx2imczhrj08n0qd5h3mnck3c9"; 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; }) {}; @@ -55662,8 +56810,8 @@ self: { ({ mkDerivation, base, dates, hspec, QuickCheck, time }: mkDerivation { pname = "date-conversions"; - version = "0.1.0.0"; - sha256 = "0348mi754n9611hzs62v17f3qba4vyls9x82capjasy8f2mw1cqn"; + version = "0.2.0.0"; + sha256 = "1bx8r66wfghrfbmcyddsi6z5b66kc9skrq0hnk2mvz4gx2cl0gdq"; libraryHaskellDepends = [ base dates time ]; testHaskellDepends = [ base dates hspec QuickCheck time ]; homepage = "https://github.com/thoughtbot/date-conversions#readme"; @@ -55930,25 +57078,26 @@ self: { }) {}; "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"; @@ -56581,6 +57730,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 { @@ -57060,6 +58228,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "dejafu_1_0_0_1" = callPackage + ({ mkDerivation, base, concurrency, containers, deepseq, exceptions + , leancheck, profunctors, random, ref-fd, transformers + }: + mkDerivation { + pname = "dejafu"; + version = "1.0.0.1"; + sha256 = "1v2hizvwf4clvqwwaab6ijlmwv7n97h8ag7dw9a63w4lipfl2anf"; + libraryHaskellDepends = [ + base concurrency containers deepseq exceptions leancheck + profunctors random ref-fd transformers + ]; + homepage = "https://github.com/barrucadu/dejafu"; + description = "A library for unit-testing concurrent programs"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "deka" = callPackage ({ mkDerivation, base, bytestring, mpdec, parsec, transformers }: mkDerivation { @@ -57664,8 +58850,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "derulo"; - version = "0.0.3"; - sha256 = "19g7nrgd5z7larkw1nb4vm9hfid1j8s2pcqyqflff4mp764m2ipg"; + version = "1.0.0"; + sha256 = "0ylfaj73yv9bzp1sygbhcipji2g9jws2r4alvhns1y7wzl74fgbz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -57908,6 +59094,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dhall_1_9_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, base16-bytestring + , bytestring, case-insensitive, charset, containers, contravariant + , cryptohash, deepseq, 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 { + pname = "dhall"; + version = "1.9.0"; + sha256 = "1i59rvjjkqikz964kzrnbxfwjhwvnwqwvaw9m03yq540qi4kmiaz"; + 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 + unordered-containers vector + ]; + executableHaskellDepends = [ + base optparse-generic prettyprinter system-filepath text trifecta + ]; + testHaskellDepends = [ + base containers deepseq 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 @@ -57930,6 +59148,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dhall-bash_1_0_7" = callPackage + ({ mkDerivation, base, bytestring, containers, dhall + , neat-interpolation, optparse-generic, shell-escape, text + , text-format, trifecta, vector + }: + mkDerivation { + pname = "dhall-bash"; + version = "1.0.7"; + sha256 = "1mwxzrr5dmlm1892a4akgs52jl0bwiyf2qpl2mnr91y7fnmn00qs"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers dhall neat-interpolation shell-escape + text text-format vector + ]; + executableHaskellDepends = [ + base bytestring dhall optparse-generic text trifecta + ]; + description = "Compile Dhall to Bash"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dhall-check" = callPackage ({ mkDerivation, base, containers, dhall, directory, filepath , fsnotify, text, trifecta @@ -57968,6 +59209,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dhall-json_1_0_10" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall + , optparse-generic, text, trifecta, vector, yaml + }: + mkDerivation { + pname = "dhall-json"; + version = "1.0.10"; + sha256 = "0zqb5hh3520l75walfnyr1i9dqphjxcawchvm12shjz2vqpi6wpq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ aeson base dhall text vector ]; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring dhall optparse-generic text + trifecta yaml + ]; + description = "Compile Dhall to JSON or YAML"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dhall-nix" = callPackage ({ mkDerivation, base, containers, data-fix, dhall, hnix , neat-interpolation, optparse-generic, text, text-format, trifecta @@ -57990,6 +59251,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dhall-nix_1_0_10" = callPackage + ({ mkDerivation, base, containers, data-fix, dhall, hnix + , neat-interpolation, optparse-generic, text, text-format, trifecta + , vector + }: + mkDerivation { + pname = "dhall-nix"; + version = "1.0.10"; + sha256 = "09iy1a0nc2mwbsly58na9lw4jh7wv7zq0lspdcynhsxj3xv2q23n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers data-fix dhall hnix neat-interpolation text + text-format vector + ]; + executableHaskellDepends = [ + base dhall hnix optparse-generic text trifecta + ]; + description = "Dhall to Nix compiler"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dhall-text" = callPackage ({ mkDerivation, base, dhall, optparse-generic, text }: mkDerivation { @@ -58003,6 +59287,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dhall-text_1_0_5" = callPackage + ({ mkDerivation, base, dhall, optparse-generic, text }: + mkDerivation { + pname = "dhall-text"; + version = "1.0.5"; + sha256 = "195nfflpk787m8jjmspw2x4rb2s7vd0z5wz5s0bzfwdl6c7xgg27"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base dhall optparse-generic text ]; + description = "Template text using Dhall"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dhcp-lease-parser" = callPackage ({ mkDerivation, attoparsec, base, bytestring, chronos, ip, tasty , tasty-hunit, text @@ -58110,10 +59408,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; @@ -58175,6 +59471,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-contrib" = callPackage @@ -58189,6 +59486,8 @@ self: { pname = "diagrams-contrib"; version = "1.4.1"; sha256 = "1apbgicaq7qaij42hwh5aiy67si2fjd0m4lah1hw4vz0cqfxxs2v"; + revision = "1"; + editedCabalFile = "0143vrfnb5qp3m23nvh5h67b2wvkq8y27yn6jjq601cs95f3b41c"; libraryHaskellDepends = [ base circle-packing colour containers cubicbezier data-default data-default-class diagrams-core diagrams-lib diagrams-solve @@ -58247,6 +59546,8 @@ self: { pname = "diagrams-gtk"; version = "1.4"; sha256 = "1sga2wwkircjgryd4pn9i0wvvcnh3qnhpxas32crpdq939idwsxn"; + revision = "1"; + editedCabalFile = "0afpcbgkc897gp0hpqi5frwbzln1qapf36p93v9zxl05my6nj04i"; libraryHaskellDepends = [ base cairo diagrams-cairo diagrams-lib gtk ]; @@ -58338,10 +59639,10 @@ self: { }: mkDerivation { pname = "diagrams-lib"; - version = "1.4.1.2"; - sha256 = "0w16cljv9jcvn46hd19qvw1bfvxijlak286nap9qbvyavq2qhvjb"; - revision = "4"; - editedCabalFile = "0wlb4ng803rhx82msl49b39im4cw8naik0pcyyybpphyqbxxs6dd"; + version = "1.4.2"; + sha256 = "1rdg8b46hc1ybk1y9dw7w725rag58rkr7hs7z3gvk4isxm11gm79"; + revision = "1"; + editedCabalFile = "0vz16br2gn4agi35k92qw84cja2dqj63g7q3ak64jhc8r99bd4a1"; libraryHaskellDepends = [ active adjunctions array base bytestring cereal colour containers data-default-class diagrams-core diagrams-solve directory @@ -58473,6 +59774,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 @@ -58611,21 +59914,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; @@ -58702,8 +60005,8 @@ self: { }: mkDerivation { pname = "dictionaries"; - version = "0.2.0.3"; - sha256 = "0a8d20vfd5gcxrfhsa0530fnzb9fqh47qsjbyhf7pnh0f0p0qbi6"; + version = "0.2.0.4"; + sha256 = "1m581w0fmb9ggwqkyfgxjw6zxfkk6iapmh17sizsqkmg2vbw7qzx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -58963,8 +60266,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 ]; @@ -59008,8 +60311,8 @@ 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 ]; @@ -59025,8 +60328,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 ]; @@ -59042,8 +60345,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 @@ -60584,8 +61887,8 @@ self: { pname = "distributive"; version = "0.5.3"; sha256 = "0y566r97sfyvhsmd4yxiz4ns2mqgwf5bdbp56wgxl6wlkidq0wwi"; - revision = "2"; - editedCabalFile = "02j27xvlj0jw3b2jpfg6wbysj0blllin792wj6qnrgnrvd4haj7v"; + revision = "3"; + editedCabalFile = "17qqdl8p04vy314jp045100989lh84cbhqv6ghizm87xpk7ck4j3"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base-orphans tagged transformers transformers-compat @@ -60733,17 +62036,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; @@ -60881,8 +62180,8 @@ self: { }: mkDerivation { pname = "dns"; - version = "3.0.0"; - sha256 = "1i2mdrzvyxclfrpik2rm36ljm3c3z1a73vjy7vivzy6wcmfzyb56"; + version = "3.0.1"; + sha256 = "1aq8n0qglvx134fl8ry1liw7kpw7flm631s9qb7is7bw510wgdd6"; libraryHaskellDepends = [ async attoparsec auto-update base base64-bytestring binary bytestring conduit conduit-extra containers cryptonite iproute mtl @@ -61039,6 +62338,8 @@ self: { pname = "docker"; version = "0.4.1.1"; sha256 = "103j8hcabfwrzjmjzxw3ks7b90nnanznck941v956q1h3240npka"; + revision = "1"; + editedCabalFile = "1zbi904jaq2mvbxhmw2l181xz0p6q8mia843g5arsz3akckq2z72"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit conduit-combinators conduit-extra containers data-default-class directory exceptions @@ -61058,6 +62359,43 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "docker_0_5_0_1" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit + , conduit-combinators, conduit-extra, connection, containers + , data-default-class, directory, exceptions, filemanip, filepath + , http-client, http-client-tls, http-conduit, http-types, lens + , lens-aeson, monad-control, mtl, network, process, QuickCheck + , resourcet, scientific, tar, tasty, tasty-hunit, tasty-quickcheck + , temporary, text, time, tls, transformers, transformers-base + , unordered-containers, uuid, vector, x509, x509-store, x509-system + , zlib + }: + mkDerivation { + pname = "docker"; + version = "0.5.0.1"; + sha256 = "0357d9hnrr990ysp87c17a8brnkp1w2w666m5jxhkap53n2dji4v"; + revision = "1"; + editedCabalFile = "1rrhgk3g33ppzxp3yqwdsj7l9nrmxl2xssb97slm7l81vypvs5z5"; + 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 + ]; + testHaskellDepends = [ + 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 + ]; + 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-docker , system-filepath, text, turtle @@ -61075,6 +62413,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "docker-build-cacher_1_9_1" = callPackage + ({ mkDerivation, base, containers, foldl, language-docker + , system-filepath, text, turtle + }: + mkDerivation { + pname = "docker-build-cacher"; + version = "1.9.1"; + sha256 = "1d8v9900j9ygx060gahwk208i5f36sdpnlpdaa1qqhcnywvmfzi4"; + 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 ({ mkDerivation, aeson, aeson-pretty, attoparsec, base , base16-bytestring, bytestring, conduit, conduit-combinators @@ -61516,31 +62873,33 @@ self: { }) {}; "dotenv" = 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.3"; + sha256 = "194cjf641q54b19daldg9nyi9gf8j4fxql6aslqzbgy7bfg5aj5b"; 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"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dotfs" = callPackage @@ -62056,16 +63415,15 @@ self: { "drifter-postgresql" = callPackage ({ mkDerivation, base, containers, drifter, either, mtl , postgresql-simple, tasty, tasty-hunit, text, time, transformers + , transformers-compat }: mkDerivation { pname = "drifter-postgresql"; - version = "0.2.0"; - sha256 = "0nl26zzvj3wvz13xgjn1j70br69wlaj1ddaz10d9ib6n1brn6hcd"; - revision = "1"; - editedCabalFile = "1nfzgzbqdnhdxg8zjhfgkbs9birdpwcr7ym14ynysrfv15w69bnq"; + version = "0.2.1"; + sha256 = "0p7ddvfmjhf22psga0phhw2m0sdhymsc5k13jrwrdawsxivh2clk"; libraryHaskellDepends = [ - base containers drifter either mtl postgresql-simple time - transformers + base containers drifter mtl postgresql-simple time transformers + transformers-compat ]; testHaskellDepends = [ base drifter either postgresql-simple tasty tasty-hunit text @@ -62077,13 +63435,19 @@ self: { }) {}; "drinkery" = callPackage - ({ mkDerivation, base, criterion, mtl, transformers }: + ({ mkDerivation, base, conduit, conduit-combinators, gauge, list-t + , ListT, machines, mtl, pipes, transformers + }: mkDerivation { pname = "drinkery"; - version = "0"; - sha256 = "06ad33l3xv9paspb5ymr97zzb4dkdfq9sg40b3i62nf52gpjfdly"; + version = "0.1"; + sha256 = "0cwv7z7gzbbkxrdfikkbmkhd6asbib1m0j9h98nwhm7i1c498rhi"; + revision = "1"; + editedCabalFile = "19zjmmfjkkx3dsy4zwz8f3iciwgvlra9rxp5y11mkb5glg5qy3f9"; libraryHaskellDepends = [ base mtl transformers ]; - benchmarkHaskellDepends = [ base criterion ]; + benchmarkHaskellDepends = [ + base conduit conduit-combinators gauge list-t ListT machines pipes + ]; homepage = "https://github.com/fumieval/drinkery#readme"; description = "Boozy streaming library"; license = stdenv.lib.licenses.bsd3; @@ -62826,8 +64190,8 @@ self: { }: mkDerivation { pname = "dynamic-graph"; - version = "0.1.0.9"; - sha256 = "0paa9y5h0pp4b44kq5yn8m43nir4wg9hgfmns2d76r8qjry617qp"; + version = "0.1.0.11"; + sha256 = "0mgciglcq8cshbcrc0ff858596zlm07z6wcmjpaa3irqbkdn7ma1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base cairo colour either GLFW-b GLUtil OpenGL pango pipes @@ -63396,6 +64760,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ecstasy" = callPackage + ({ mkDerivation, base, containers, mtl, transformers }: + mkDerivation { + pname = "ecstasy"; + version = "0.1.0.0"; + sha256 = "0hid87vwyzxf1fsp0y8yw69wpsxzljyjr27bm1q7b79r9zsg63vj"; + libraryHaskellDepends = [ base containers mtl transformers ]; + homepage = "http://github.com/isovector/ecstasy/"; + description = "A GHC.Generics based entity component system."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ecu" = callPackage ({ mkDerivation, base, bytestring, canlib, digest, directory , process, vcd @@ -63725,10 +65102,10 @@ self: { ({ 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; }) {}; @@ -63822,8 +65199,8 @@ self: { }: mkDerivation { pname = "egison"; - version = "3.7.9"; - sha256 = "1jx6nrp2v581nbwgblrpqv052lbnbba5nppd3m8npbx5pvpda994"; + version = "3.7.10"; + sha256 = "129g0xw951pkizs4rmbn5mhy1w0lhqw06hj2sr8sf7r2wnqmn0dy"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -64150,16 +65527,17 @@ self: { }) {}; "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"; @@ -64422,6 +65800,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "eliminators_0_4" = callPackage + ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats + , singletons, template-haskell, th-abstraction, th-desugar + }: + mkDerivation { + pname = "eliminators"; + version = "0.4"; + sha256 = "1lsvz498db2vlaj4d9p4bi4pl4cnsl27gmmhw1ipfxw4kxmfdf4z"; + revision = "1"; + editedCabalFile = "188dnmw7gwfp4fxyljhb3gv78bj9gai4v2if8d9gcnss6ykp5mn1"; + 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; + }) {}; + "elision" = callPackage ({ mkDerivation, base, profunctors }: mkDerivation { @@ -64439,18 +65839,16 @@ self: { }) {}; "elm-bridge" = callPackage - ({ mkDerivation, aeson, base, containers, hspec, QuickCheck - , template-haskell, text + ({ mkDerivation, aeson, base, containers, hspec, hspec-discover + , QuickCheck, template-haskell, text }: mkDerivation { pname = "elm-bridge"; - version = "0.4.1"; - sha256 = "1wp813l6bdw5x7vpiq098v1gbxzvv3129n2rl4div9mrj53a3i2l"; - revision = "1"; - editedCabalFile = "05kk6lsh10ligdgj4dw0iyhvv0blnrcvmk94hn27qq70bpv8xcqz"; + version = "0.4.2"; + sha256 = "1mcaic3xdll6bdv4yjp0j0861yapgfgb4wd0ckh7dpcmcnfnarhx"; libraryHaskellDepends = [ aeson base template-haskell ]; testHaskellDepends = [ - aeson base containers hspec QuickCheck text + aeson base containers hspec hspec-discover QuickCheck text ]; homepage = "https://github.com/agrafix/elm-bridge"; description = "Derive Elm types and Json code from Haskell types"; @@ -64940,8 +66338,8 @@ self: { }: mkDerivation { pname = "email-validate"; - version = "2.3.2"; - sha256 = "1h15z89qsp7b08nnjgs2rcwavfhfrkanvh7j8jp0rrx7xh0rz6lv"; + version = "2.3.2.1"; + sha256 = "0qvxysiap3r4mi3xff5nsk9qv6diqxfgwj186bypbamzvzlz0lav"; libraryHaskellDepends = [ attoparsec base bytestring template-haskell ]; @@ -65096,6 +66494,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 { @@ -65233,6 +66650,26 @@ 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 @@ -65371,6 +66808,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "entropy_0_4" = callPackage + ({ mkDerivation, base, bytestring, Cabal, directory, filepath + , process, unix + }: + mkDerivation { + pname = "entropy"; + version = "0.4"; + sha256 = "0h8icprikafidq4x88crz5phfgp6zgmxq4awam2dhs0z2fswd9wc"; + revision = "1"; + editedCabalFile = "1hx5yxzypi708zlg1almqhfasfgmaisrv44fr0i8ldvvqxf5slza"; + 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 { @@ -65757,8 +67212,8 @@ self: { }: mkDerivation { pname = "epub-tools"; - version = "2.9"; - sha256 = "198fzgd04j1dyiv9cpkg6aqvawfiqb4k5awyqbiw6ll84sy0ymgb"; + version = "2.11"; + sha256 = "18k4aipaw6zlzhpxidl5b7q5hvy51sj030p7mw89flrgd8kd3g2p"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -65768,9 +67223,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; + license = stdenv.lib.licenses.isc; }) {}; "epubname" = callPackage @@ -65803,6 +67258,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "eq_4_1" = callPackage + ({ mkDerivation, base, semigroupoids }: + mkDerivation { + pname = "eq"; + version = "4.1"; + sha256 = "10k1xnvga7c6ijmkfq2qd4vc5i2lnkz4xjmba74g0xzhk6gkvp0n"; + libraryHaskellDepends = [ base semigroupoids ]; + homepage = "http://github.com/ekmett/eq/"; + description = "Leibnizian equality"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "equal-files" = callPackage ({ mkDerivation, base, bytestring, explicit-exception, filemanip , transformers, utility-ht @@ -66151,23 +67619,23 @@ self: { "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"; 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"; @@ -66443,8 +67911,8 @@ self: { }: mkDerivation { pname = "ethereum-analyzer"; - version = "3.2.0"; - sha256 = "1rqzx2b6fn8vzls05g7hs163h5fjw2cdhkyqbfr8a7p9cyv32nk8"; + version = "3.3.4"; + sha256 = "0d9xw77i8dzb4sk3j7qhnbdand58vz1bhfvqb0qhvg0qdfg732vi"; libraryHaskellDepends = [ aeson base bimap bytestring containers ethereum-analyzer-deps extra fgl GenericPretty graphviz hexstring hoopl pretty protolude split @@ -66469,8 +67937,8 @@ self: { }: mkDerivation { pname = "ethereum-analyzer-cli"; - version = "3.2.0"; - sha256 = "1svyxmk4441x95xxfqn3z18dqvkqykyksqiyb4298pb8g0cq54sx"; + version = "3.3.4"; + sha256 = "1bpr5l8hsn6ggiqs3b4mw27r52ikpqibdhn4w22k1gk8mdfr9gzc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66496,8 +67964,8 @@ self: { }: mkDerivation { pname = "ethereum-analyzer-deps"; - version = "3.2.0"; - sha256 = "1ahpk43ihr3ddzzpxi6vx27f77i84grny5avsakjn0hlzz3ady19"; + 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 @@ -66516,8 +67984,8 @@ self: { }: mkDerivation { pname = "ethereum-analyzer-webui"; - version = "3.2.0"; - sha256 = "17hmsmr13qvmfl9w9yfmxbbi6lv3b3r3kqsgnbji5i01jvgnggvs"; + version = "3.3.4"; + sha256 = "11h5q6xmig8fk3bxk797s231pk5dnsvvxs9r68zbxv7jk466yq97"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66664,6 +68132,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "euler-tour-tree" = callPackage + ({ mkDerivation, base, containers, fingertree, hlint, 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 hlint 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 @@ -66971,8 +68461,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 @@ -67042,15 +68532,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "eventsource-geteventstore-store_1_0_5" = callPackage + "eventsource-geteventstore-store_1_0_6" = callPackage ({ mkDerivation, aeson, base, eventsource-api , eventsource-store-specs, eventstore, mtl, protolude , string-conversions, tasty, tasty-hspec, transformers-base }: mkDerivation { pname = "eventsource-geteventstore-store"; - version = "1.0.5"; - sha256 = "0lbgjbl14p6480pmr27zls91g0zy8g0id59ls0hajaghwibcabb6"; + version = "1.0.6"; + sha256 = "0fy1sgc43a6d4hrwyc3kawcnvpm4zlmwnznw27zd40hrbzkkkzw2"; libraryHaskellDepends = [ aeson base eventsource-api eventstore mtl string-conversions transformers-base @@ -67199,7 +68689,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "eventstore_1_0_0" = callPackage + "eventstore_1_1_0" = callPackage ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring , cereal, clock, connection, containers, dns, dotnet-timespan , ekg-core, exceptions, fast-logger, hashable, http-client @@ -67211,8 +68701,8 @@ self: { }: mkDerivation { pname = "eventstore"; - version = "1.0.0"; - sha256 = "1mhgvh1mm6fkibjd9p8k2wjhi064b22knwkjdk4i396zya6210f0"; + version = "1.1.0"; + sha256 = "0r91vgnq291aq4smbap07agm6bry1xflawihm31d0krzv0j69rx1"; libraryHaskellDepends = [ aeson array base bifunctors bytestring cereal clock connection containers dns dotnet-timespan ekg-core exceptions fast-logger @@ -67286,8 +68776,8 @@ self: { }: mkDerivation { pname = "ex-pool"; - version = "0.2"; - sha256 = "0da5grl2fdca24zhlngq2n16smdb4f5vvxqzc29ipsc3j7wkbmva"; + version = "0.2.1"; + sha256 = "0djk2g99jn24jcnq2l5yzrs2ra7wq1h3p80xkqx30arkqq5wbf0d"; libraryHaskellDepends = [ base exceptions hashable stm time transformers vector ]; @@ -67340,6 +68830,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "exact-pi_0_4_1_3" = callPackage + ({ mkDerivation, base, numtype-dk, semigroups }: + mkDerivation { + pname = "exact-pi"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "exact-real" = callPackage ({ mkDerivation, base, checkers, criterion, directory, doctest , filepath, groups, integer-gmp, memoize, QuickCheck, random, tasty @@ -67486,8 +68989,8 @@ self: { pname = "exceptions"; version = "0.8.3"; sha256 = "1gl7xzffsqmigam6zg0jsglncgzxqafld2p6kb7ccp9xirzdjsjd"; - revision = "2"; - editedCabalFile = "1vl59j0l7m53hkzlcfmdbqbab8dk4lp9gzwryn7nsr6ylg94wayw"; + revision = "4"; + editedCabalFile = "18iip6wffnrp1jgnf09gxg4v17ymjank50kjshxvcy9s9l9g13ln"; libraryHaskellDepends = [ base mtl stm template-haskell transformers transformers-compat ]; @@ -67754,6 +69257,7 @@ self: { ]; description = "Existential types with lens-like accessors"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {control-invariants = null;}; @@ -67919,6 +69423,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 { @@ -68078,6 +69595,7 @@ self: { ]; description = "Encode and Decode expressions from Z3 ASTs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extcore" = callPackage @@ -68165,8 +69683,8 @@ self: { }: mkDerivation { pname = "extensible"; - version = "0.4.7"; - sha256 = "0a0xmixyhfxlkrqr0nk1nvi8177i4432xamg91y5971mgail7kgv"; + version = "0.4.7.1"; + sha256 = "04gb1havami26mkwdr9vbqs28r1rc9ggd9xxcaf6zw9s5z2hvr5a"; libraryHaskellDepends = [ base comonad constraints deepseq ghc-prim hashable monad-skeleton mtl primitive profunctors QuickCheck semigroups StateVar tagged @@ -68216,6 +69734,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "extensible-effects_2_4_0_0" = callPackage + ({ 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 = "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-exceptions" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -68258,8 +69800,8 @@ self: { }: mkDerivation { pname = "extra"; - version = "1.6.2"; - sha256 = "1l8l8724g3kd3f01pq429y7czr1bnhbrq2y0lii1hi767sjxgnz4"; + version = "1.6.3"; + sha256 = "06ds0jlx6sljwdf63l154qbzia9mnsri79i9qm3xikky3nj9ia1m"; libraryHaskellDepends = [ base clock directory filepath process time unix ]; @@ -68344,8 +69886,8 @@ self: { ({ mkDerivation, base, leancheck, speculate, template-haskell }: mkDerivation { pname = "extrapolate"; - version = "0.3.0"; - sha256 = "1mqhn515mq730frzcadw4m0zsizk1vkhcygazy6y03533mai0z2g"; + version = "0.3.1"; + sha256 = "1hz03mdascy4jvqhyrqqmb1py3pb03g4z3if05z2cbdxgbgsbbn4"; libraryHaskellDepends = [ base leancheck speculate template-haskell ]; @@ -68399,8 +69941,8 @@ self: { }: mkDerivation { pname = "factory"; - version = "0.3.0.0"; - sha256 = "0izhwb0plxhlsr4ghk2rybm367n83d598s3nk8ss0mnnv7gv5wpm"; + version = "0.3.1.4"; + sha256 = "0k5bb0imp001f1sj785qqy9k67wvb91mr4fpdcg5riykiv8j9l1x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -68673,6 +70215,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fast-arithmetic" = callPackage + ({ mkDerivation, arithmoi, ats-setup, base, Cabal, combinat + , composition-prelude, criterion, hspec, QuickCheck + , recursion-schemes + }: + mkDerivation { + pname = "fast-arithmetic"; + version = "0.3.2.4"; + sha256 = "0dvrwlcpfsrrw8la5brvhjc78k48s2kaz08cg6xqx82vkrzipm63"; + setupHaskellDepends = [ ats-setup base Cabal ]; + libraryHaskellDepends = [ + base composition-prelude recursion-schemes + ]; + testHaskellDepends = [ arithmoi base combinat hspec QuickCheck ]; + benchmarkHaskellDepends = [ arithmoi base combinat 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 @@ -68694,6 +70257,26 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "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 ({ mkDerivation, base, criterion, digits, integer-gmp, QuickCheck , smallcheck, tasty, tasty-quickcheck, tasty-smallcheck @@ -68984,15 +70567,13 @@ self: { , 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 + , 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.23.2.0"; + sha256 = "1fhdznpqyrgk2m239qdq6zxsdhx3qhciq8fi2ka7s6l7h9z277dw"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -69001,8 +70582,8 @@ self: { 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 + traverse-with-class uniplate unordered-containers utf8-string + vector ]; executableHaskellDepends = [ base mtl optparse-applicative split ]; homepage = "https://github.com/faylang/fay/wiki"; @@ -69740,6 +71321,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;}; @@ -70358,12 +71940,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"; @@ -70374,16 +71956,16 @@ 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"; 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; @@ -70847,8 +72429,8 @@ self: { }: mkDerivation { pname = "fishfood"; - version = "0.0.1.7"; - sha256 = "1b2nabliv1xqi42q2bknri85gizb1xbh7j5729dxv3sybzq50wd8"; + version = "0.0.1.8"; + sha256 = "04wqj8s8b97i6448f66ljv5wk6nhcjs80vapg96vwmlslxwcmhnc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -71172,6 +72754,35 @@ 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; + }) {}; + "fixfile" = callPackage ({ mkDerivation, array, base, bytestring, cereal, containers , directory, exceptions, filepath, hashable, hashtables, lens, mtl @@ -71714,8 +73325,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 ]; @@ -71729,8 +73340,8 @@ self: { ({ mkDerivation, base, doctest, QuickCheck, template-haskell }: mkDerivation { pname = "flow"; - version = "1.0.9"; - sha256 = "1rqljbq4s9swh19r57gpp3nzxwgwa1j0q53m971i455wq1xszx1m"; + version = "1.0.10"; + sha256 = "1k8p475m1485nq4236jf53gmls264c5dy8x57zihb7gbvgnl71fj"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest QuickCheck template-haskell ]; homepage = "https://github.com/tfausak/flow#readme"; @@ -71913,18 +73524,20 @@ self: { "fltkhs" = callPackage ({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath - , mtl, parsec, text + , mtl, OpenGLRaw, parsec, text }: mkDerivation { pname = "fltkhs"; - version = "0.5.4.1"; - sha256 = "0yclwq488g9mz6wsjcch7c5kwgc97rxp0lqjlfj44vbqbjk72l5x"; + version = "0.5.4.4"; + sha256 = "1bv7djak2ilirk7ajm8w6100bk6vx14znf3699blih72kyql6rgh"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base bytestring text ]; libraryToolDepends = [ c2hs ]; - executableHaskellDepends = [ base directory filepath mtl parsec ]; + executableHaskellDepends = [ + base directory filepath mtl OpenGLRaw parsec text + ]; homepage = "http://github.com/deech/fltkhs"; description = "FLTK bindings"; license = stdenv.lib.licenses.mit; @@ -72156,8 +73769,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"; @@ -72326,15 +73939,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 @@ -72436,16 +74052,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; }) {}; @@ -72613,8 +74233,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 ]; @@ -72709,8 +74329,8 @@ self: { }: mkDerivation { pname = "forest-fire"; - version = "0.2.2"; - sha256 = "053gp1wmzfhn26gq0awhz3fas8vcjbx953cis4r4ahfzwvy71r7r"; + version = "0.3"; + sha256 = "09h8hpb9b0hsj2bpwywxdk2a1ww1si3g5rn5n6ajq5dgvqki8rlp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72878,6 +74498,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "formatting_6_3_0" = callPackage + ({ mkDerivation, array, base, bytestring, clock, ghc-prim, hspec + , integer-gmp, old-locale, scientific, text, time, transformers + }: + mkDerivation { + pname = "formatting"; + version = "6.3.0"; + sha256 = "16xngayk1jd92bj2qaf7fmrgzdskdnc7rsgpk1ij06xd8cdgahf1"; + libraryHaskellDepends = [ + array base bytestring clock ghc-prim integer-gmp old-locale + scientific text time transformers + ]; + testHaskellDepends = [ base hspec ]; + 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 @@ -72962,6 +74600,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 { @@ -73008,8 +74660,8 @@ 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 ]; @@ -73119,6 +74771,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "foundation_0_0_19" = callPackage + ({ mkDerivation, base, basement, gauge, ghc-prim }: + mkDerivation { + pname = "foundation"; + version = "0.0.19"; + sha256 = "053g5fdg9p74irvdh3g19hkb6g28h0sngkh2zqwplbxwy59dhfxq"; + libraryHaskellDepends = [ base basement ghc-prim ]; + testHaskellDepends = [ base basement ]; + benchmarkHaskellDepends = [ base basement gauge ]; + homepage = "https://github.com/haskell-foundation/foundation"; + description = "Alternative prelude with batteries and no dependencies"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "foundation-edge" = callPackage ({ mkDerivation, bytestring, foundation, text }: mkDerivation { @@ -73347,6 +75014,7 @@ self: { executableHaskellDepends = [ pretty ]; description = "A simple web framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {ghc-binary = null;}; @@ -73435,6 +75103,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "free_5" = callPackage + ({ mkDerivation, base, bifunctors, comonad, containers + , distributive, exceptions, mtl, profunctors, semigroupoids + , semigroups, template-haskell, transformers, transformers-base + , transformers-compat + }: + mkDerivation { + pname = "free"; + version = "5"; + sha256 = "1s4avwm4lnscmxv3fy0zws3vbg61sczgxm1m3cdnqxp95bd6p4c7"; + libraryHaskellDepends = [ + base bifunctors comonad containers distributive exceptions mtl + profunctors semigroupoids semigroups template-haskell transformers + transformers-base transformers-compat + ]; + homepage = "http://github.com/ekmett/free/"; + description = "Monads for free"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "free-concurrent" = callPackage ({ mkDerivation, base, type-aligned }: mkDerivation { @@ -73687,18 +75376,19 @@ 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.1.0"; + sha256 = "1rz7xpffyw4nl7iaxfmhzzmn7kyvv8rfh4wvv2d02i2ihfykirxs"; 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"; @@ -73808,6 +75498,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "freer-simple_1_0_1_0" = callPackage + ({ mkDerivation, base, criterion, extensible-effects, free, mtl + , natural-transformation, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, transformers-base + }: + mkDerivation { + pname = "freer-simple"; + version = "1.0.1.0"; + sha256 = "0vh14z39pk1ni16hcq9yw0x8ckhcbyi8hgndpv7gmqzhvcdd0saf"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "freesect" = callPackage ({ mkDerivation, array, base, cpphs, directory, mtl, parallel , pretty, random, syb @@ -73968,8 +75685,8 @@ self: { }: mkDerivation { pname = "friday-juicypixels"; - version = "0.1.2.2"; - sha256 = "1sci0whrkjlm731z1qk7p7sg7vaw61brcb167w9f6fbkagn2f67l"; + version = "0.1.2.3"; + sha256 = "19j321vqca8sl366j3acdskr8zhzcki429zxzs8xawdmxqh93vzv"; libraryHaskellDepends = [ base friday JuicyPixels vector ]; testHaskellDepends = [ base bytestring file-embed friday hspec JuicyPixels @@ -74014,8 +75731,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"; @@ -74395,6 +76112,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;}; @@ -74618,14 +76336,31 @@ self: { pname = "funcmp"; version = "1.8"; sha256 = "09kmfgl15d71fr5h66j2b0ngw69y8dp41d55lz35nrjxq3l3gz1k"; + revision = "1"; + editedCabalFile = "1fkjmx4mmfmf2y08w7mgw1rp6q6w9zxdj95zfydgxgkmvk9b37c4"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base filepath process ]; - homepage = "http://savannah.nongnu.org/projects/funcmp/"; + homepage = "https://github.com/peti/funcmp"; description = "Functional MetaPost"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "funcmp_1_9" = callPackage + ({ mkDerivation, base, filepath, pretty, process }: + mkDerivation { + pname = "funcmp"; + version = "1.9"; + sha256 = "1d5appkjhajb9ndv2gwnfz8lw2w53v8baajzmrhg26ihzj1bkch8"; + enableSeparateDataOutput = true; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "funcons-tools" = callPackage ({ mkDerivation, base, bv, containers, directory, mtl, multiset , parsec, split, text, vector @@ -75017,8 +76752,8 @@ self: { }: mkDerivation { pname = "fuzzyset"; - version = "0.1.0.2"; - sha256 = "1gpx8qw9vxlardjxncgkbbk3zvq8zjrc6nhjk80va7d7ix5zpdhz"; + version = "0.1.0.4"; + sha256 = "1nk3qrjcg5q4mnv2lzbw08ikgibix0ns6910z9xixcfq5kgij6my"; libraryHaskellDepends = [ base base-unicode-symbols data-default lens text text-metrics unordered-containers vector @@ -75032,6 +76767,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fuzzyset_0_1_0_5" = callPackage + ({ mkDerivation, base, base-unicode-symbols, data-default, hspec + , ieee754, lens, text, text-metrics, unordered-containers, vector + }: + mkDerivation { + pname = "fuzzyset"; + version = "0.1.0.5"; + sha256 = "12cl135ph7qjnfm0x36yw3mvjilsw4pm509yvh7i5whsafs3kakq"; + libraryHaskellDepends = [ + base base-unicode-symbols data-default lens text text-metrics + unordered-containers vector + ]; + testHaskellDepends = [ + base base-unicode-symbols hspec ieee754 lens text + unordered-containers + ]; + homepage = "https://github.com/laserpants/fuzzyset-haskell"; + description = "Fuzzy set for approximate string matching"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fuzzytime" = callPackage ({ mkDerivation, base, cmdargs, directory, old-time, process }: mkDerivation { @@ -75101,12 +76858,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; @@ -75350,6 +77107,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "gauge_0_2_1" = callPackage + ({ mkDerivation, base, basement, bytestring, deepseq, directory + , HUnit, process, tasty, tasty-hunit, vector + }: + mkDerivation { + pname = "gauge"; + version = "0.2.1"; + sha256 = "0401b5jzfib4wxwicqynhkn79q98hnxrpiqk1b353a6wix55hy1d"; + libraryHaskellDepends = [ + base basement deepseq directory process vector + ]; + testHaskellDepends = [ + base bytestring deepseq directory HUnit tasty tasty-hunit + ]; + benchmarkHaskellDepends = [ base ]; + homepage = "https://github.com/vincenthz/hs-gauge"; + description = "small framework for performance measurement and analysis"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gbu" = callPackage ({ mkDerivation, base, containers, fgl, Graphalyze, haskell98, mtl , regex-posix @@ -75791,6 +77569,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 @@ -76039,17 +77834,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.12"; - sha256 = "09nl2c2b54ngqv4rgv3avvallyvfnv5jfld0wk2v90srl3x6p5vk"; + 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; @@ -76074,10 +77872,10 @@ self: { }: mkDerivation { pname = "generic-lens"; - version = "0.5.0.0"; - sha256 = "0jp6qy45j7cg251pxq5x4ygg6m7gc6v57nd8ky26r18g9wn9f7w3"; + version = "0.5.1.0"; + sha256 = "09q13axb00kgy2w9c7lq84sh113vhxlw0g8zcjg07a1kp9wj7l47"; libraryHaskellDepends = [ base profunctors tagged ]; - testHaskellDepends = [ base doctest inspection-testing ]; + testHaskellDepends = [ base doctest inspection-testing lens ]; benchmarkHaskellDepends = [ base criterion deepseq lens QuickCheck ]; @@ -76086,6 +77884,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "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 { @@ -76155,6 +77965,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "generic-random_1_1_0_2" = callPackage + ({ mkDerivation, base, QuickCheck }: + mkDerivation { + pname = "generic-random"; + version = "1.1.0.2"; + sha256 = "0zslrz4cizw8c76q5szgmpc58f25hx4qf01lavxshynn771cx271"; + 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 ({ mkDerivation, base }: mkDerivation { @@ -76238,8 +78062,8 @@ self: { pname = "generic-xmlpickler"; version = "0.1.0.5"; sha256 = "1brnlgnbys811qy64aps2j03ks2p0rkihaqzaszfwl80cpsn05ym"; - revision = "5"; - editedCabalFile = "18hs5adb6wfasazdlv2wf92xszyjw94i3v20w8058hl7q1ax9dv0"; + revision = "6"; + editedCabalFile = "0jc2rnh8kyzay8ny59ahqb9q6vmp7si4aps1a42la79735078x51"; libraryHaskellDepends = [ base generic-deriving hxt text ]; testHaskellDepends = [ base hxt hxt-pickle-utils tasty tasty-hunit tasty-th @@ -76271,8 +78095,8 @@ self: { ({ 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"; libraryHaskellDepends = [ base deepseq ghc-prim template-haskell ]; testHaskellDepends = [ base ]; description = "Generic Programming using True Sums of Products"; @@ -76285,8 +78109,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"; @@ -76535,8 +78359,8 @@ self: { ({ mkDerivation, base, hspec, QuickCheck, validity }: mkDerivation { pname = "genvalidity"; - version = "0.4.0.2"; - sha256 = "1kmbjx57212v7v1b7b7585m0i9sd5qh32ln83pc63m6jdpw161a1"; + version = "0.4.0.4"; + sha256 = "0gfndjss4j2dmyk46r9ab3ahw8pmc6bry7nzzx7qpgim6zz5597w"; libraryHaskellDepends = [ base QuickCheck validity ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/NorfairKing/validity#readme"; @@ -76790,8 +78614,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 ]; @@ -77064,6 +78888,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.0.0"; + sha256 = "02r9c063kkqalyadfqwhhwfb42kky7nkfp5k968l1qidyx6aha5j"; + libraryHaskellDepends = [ + base bytestring cassava 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 @@ -77442,6 +79285,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ghc-exactprint_0_5_6_0" = callPackage + ({ mkDerivation, base, bytestring, containers, Diff, directory + , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl + , silently, syb + }: + mkDerivation { + pname = "ghc-exactprint"; + version = "0.5.6.0"; + sha256 = "0fbq7p2kykqq2pzf0mld0brj3pdrgxb1zvpa05pqxsfs66czlbsg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers directory filepath free ghc ghc-boot + ghc-paths mtl syb + ]; + testHaskellDepends = [ + base bytestring containers Diff directory filemanip filepath ghc + ghc-boot ghc-paths HUnit mtl silently syb + ]; + description = "ExactPrint for GHC"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-gc-tune" = callPackage ({ mkDerivation, base, directory, filepath, process }: mkDerivation { @@ -77524,6 +79391,28 @@ 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-make" = callPackage ({ mkDerivation, base, process, shake, unordered-containers }: mkDerivation { @@ -77640,6 +79529,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;}; @@ -77673,8 +79563,8 @@ self: { ({ mkDerivation, base, cpphs, ghc, happy }: mkDerivation { pname = "ghc-parser"; - version = "0.2.0.0"; - sha256 = "0jd02qgjs529ac0jvg59rgrjvpm541j993lyfpqr9aqwqj1n3ylp"; + version = "0.2.0.1"; + sha256 = "10xx2d9awgizjz1jrlw2m30nsl938mh297azp7zay7zkdzsv0fyh"; libraryHaskellDepends = [ base ghc ]; libraryToolDepends = [ cpphs happy ]; homepage = "https://github.com/gibiansky/IHaskell"; @@ -77731,12 +79621,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-prim_0_5_1_0" = callPackage + "ghc-prim_0_5_1_1" = callPackage ({ mkDerivation, rts }: mkDerivation { pname = "ghc-prim"; - version = "0.5.1.0"; - sha256 = "13ypjfpz5b4zpbr2q8x37nbqjd0224l9g8xn62iv7mbqbgynkbf9"; + version = "0.5.1.1"; + sha256 = "1dkl0l891min86jpndcah8dx7i3ssnaj6yf2ghxplp8619bmqhb2"; libraryHaskellDepends = [ rts ]; description = "GHC primitives"; license = stdenv.lib.licenses.bsd3; @@ -77846,10 +79736,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; @@ -77886,8 +79774,8 @@ self: { ({ mkDerivation, base, ghc }: mkDerivation { pname = "ghc-tcplugins-extra"; - version = "0.2.1"; - sha256 = "04m8cblgxb3axjhsbwlb18jmlcfhcllm68c1d5pzv6av404ild4z"; + version = "0.2.2"; + sha256 = "1k52r8hdbhsp5ydfi010976nck81q38lm8x069x6sdvslmwda1wq"; libraryHaskellDepends = [ base ghc ]; homepage = "http://github.com/clash-lang/ghc-tcplugins-extra"; description = "Utilities for writing GHC type-checker plugins"; @@ -77930,15 +79818,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 @@ -77951,20 +79839,19 @@ 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"; + sha256 = "0qwp44jpp8jbrgri0i3yviqnypdj79b8hpxxbk80dwwsjg1q5ynv"; 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"; @@ -77977,8 +79864,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-natnormalise"; - version = "0.5.7"; - sha256 = "0spqlrj7iys6i355sv7r71niimaqx9n3p4p5pfkfck8n5rfc9lq3"; + version = "0.5.8"; + sha256 = "0xkhj0kka7j9achgzn66zbxs84pxr5h9jq35x4kdnha5hw34c0i1"; libraryHaskellDepends = [ base ghc ghc-tcplugins-extra integer-gmp ]; @@ -78164,12 +80051,12 @@ self: { }: mkDerivation { pname = "ghcid"; - version = "0.6.8"; - sha256 = "1ca8962sh41jkz82lx1snx8fzp8s2v5dsq0mczgzc7aqjgclb35g"; + version = "0.6.9"; + sha256 = "0bkhbzjjp4n97dsf8q4ggphsfh0rxwgdn4kmg8l87zbrih41gdpc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base cmdargs directory extra filepath process time unix + base cmdargs directory extra filepath process time ]; executableHaskellDepends = [ ansi-terminal base cmdargs containers directory extra filepath @@ -78385,6 +80272,7 @@ self: { ]; description = "Virtual-dom bindings for GHCJS"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {ghcjs-ffiqq = null; ghcjs-prim = null;}; @@ -78519,6 +80407,28 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) atk;}; + "gi-atk_2_0_15" = callPackage + ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading + , text, transformers + }: + mkDerivation { + pname = "gi-atk"; + version = "2.0.15"; + sha256 = "1vmzby12nvbrka6f44pr1pjwccl0p6s984pxvibajzp72x2knxc9"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ atk ]; + doHaddock = false; + 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 ({ mkDerivation, base, bytestring, Cabal, cairo, containers , haskell-gi, haskell-gi-base, haskell-gi-overloading, text @@ -78544,6 +80454,32 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) cairo;}; + "gi-cairo_1_0_15" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cairo, containers + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-cairo"; + version = "1.0.15"; + sha256 = "1hm8bcd6j11dimb3ksfjkcqf9wqa9frq1jyjpbr2j5s8srrf7031"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ cairo ]; + doHaddock = false; + preCompileBuildDriver = '' + PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" + setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" + ''; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Cairo bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) cairo;}; + "gi-gdk" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3 @@ -78552,8 +80488,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 @@ -78575,8 +80511,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 @@ -78597,8 +80533,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 @@ -78619,8 +80555,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 @@ -78641,8 +80577,8 @@ self: { }: mkDerivation { pname = "gi-gio"; - version = "2.0.14"; - sha256 = "0dwy8zd66b04jbn0g7c5n511nl2xxjvchzf56bmw8cfcm384r66d"; + version = "2.0.15"; + sha256 = "1mxiwwm6dnbxxnqm05bh73qnb27dbfsyz3pr2bvgwvhp4f2m0nn3"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -78663,8 +80599,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 @@ -78675,6 +80611,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GIRepository (gobject-introspection) bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gobjectIntrospection;}; "gi-glib" = callPackage @@ -78698,6 +80635,28 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "gi-glib_2_0_16" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, glib + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-glib"; + version = "2.0.16"; + sha256 = "03hl5szq0cyzg37kxh4kyxzciibs4grsypf78ihfsa6nvj4n5fqw"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + doHaddock = false; + 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 ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib , haskell-gi, haskell-gi-base, haskell-gi-overloading, text @@ -78719,6 +80678,28 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "gi-gobject_2_0_16" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-gobject"; + version = "2.0.16"; + sha256 = "1bgn4ywx94py0v213iv7mbjjvvy3y7gvpgw4wpn38s2np7al8y65"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + doHaddock = false; + 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 ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, gstreamer, haskell-gi, haskell-gi-base @@ -78726,8 +80707,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 @@ -78748,8 +80729,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 @@ -78770,8 +80751,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 @@ -78793,8 +80774,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 @@ -78816,8 +80797,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 @@ -78838,8 +80819,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 @@ -78861,8 +80842,8 @@ self: { }: mkDerivation { pname = "gi-gtk"; - version = "3.0.18"; - sha256 = "1fp84dba8hg6pvkdy0mip2pz9npx0kwp492gx8p1bgf119rqqfl1"; + version = "3.0.19"; + sha256 = "1qcivdbwa3g05dzgzd3jnzha33j5jm06gp2ml9fma0d1160dqa2g"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf @@ -78903,8 +80884,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 @@ -78926,8 +80907,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 @@ -78964,6 +80945,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome3) webkitgtk;}; + "gi-javascriptcore_4_0_15" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi + , haskell-gi-base, haskell-gi-overloading, text, transformers + , webkitgtk + }: + mkDerivation { + pname = "gi-javascriptcore"; + version = "4.0.15"; + sha256 = "07dz5kisis93x0ywb207w8nv54bfdgsahq325dyvbfvlgkqrxsh3"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ webkitgtk ]; + 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.gnome3) webkitgtk;}; + "gi-notify" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf , gi-glib, gi-gobject, haskell-gi, haskell-gi-base @@ -78971,8 +80974,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 @@ -78993,8 +80996,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 @@ -79015,8 +81018,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 @@ -79042,8 +81045,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 @@ -79068,8 +81071,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 @@ -79090,8 +81093,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 @@ -79112,8 +81115,8 @@ self: { }: mkDerivation { pname = "gi-soup"; - version = "2.4.14"; - sha256 = "1z0cxhyadampjdibsrvqi6rw3kmcvq0q3mf4gk33ss2xb0f86m75"; + version = "2.4.15"; + sha256 = "1imgkbqfkdf7vbx4x170qnnyivy7jdn4hcj428wv3996ff5pjqa6"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi @@ -79134,8 +81137,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 @@ -79158,8 +81161,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 @@ -79182,8 +81185,8 @@ self: { }: mkDerivation { pname = "gi-webkit2"; - version = "4.0.14"; - sha256 = "15r5kq0vq5gc4rsi0icw2f5zbqjw7kgdwpa3fbzn6jx7xmbl39kp"; + version = "4.0.15"; + sha256 = "1mwd5jyis7rfqpigyk1yp3rx2hkdb2gwg4m1l41dggdb8svv1jhp"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib @@ -79206,8 +81209,8 @@ self: { }: mkDerivation { pname = "gi-webkit2webextension"; - version = "4.0.15"; - sha256 = "100m6m13gcyz1wgwj20gh2mybmfpzq9fvqn44a9as37680srx2bi"; + version = "4.0.16"; + sha256 = "010svwg3p3sdd209l8cnwhsm2dp9n6qf0shzqjdx5l1pkjv32zqm"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-gobject gi-gtk @@ -79228,8 +81231,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 @@ -79240,6 +81243,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 @@ -79338,8 +81342,8 @@ self: { }: mkDerivation { pname = "gio"; - version = "0.13.4.0"; - sha256 = "1jjkz7d81dljhgdcpc5zr5bn1jxnlb23f8hpzx4xz5v9jfy0bflr"; + version = "0.13.4.1"; + sha256 = "11w567c4zafcdm5i6wpi1dr4m6mpfvyqyda4llq7wgvjbshy5fqk"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -79468,7 +81472,7 @@ self: { "git-annex" = callPackage ({ mkDerivation, aeson, async, aws, base, blaze-builder - , bloomfilter, bup, byteable, bytestring, case-insensitive + , bloomfilter, bup, byteable, bytestring, Cabal, 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 @@ -79488,8 +81492,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20171214"; - sha256 = "06nmsibpb1ng058gkfdspwkmv8psgd144qrxchwf3d8lfdphpkih"; + version = "6.20180112"; + sha256 = "0662780hzv2afajphjmgglm01d5w5vs4rp7xa1px1bznk67yjdxw"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -79498,6 +81502,10 @@ self: { ]; 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 @@ -79885,17 +81893,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 + , 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"; - revision = "1"; - editedCabalFile = "1krz0plxhm1q1k7bb0wzl969zd5fqkgqcgfr6rmqw60njpwrdsrp"; + revision = "2"; + editedCabalFile = "1rywfb78acwh81mdnxb4q35n374k1wbxg0562biis0i0jjxfp211"; libraryHaskellDepends = [ aeson aeson-compat base base-compat base16-bytestring binary binary-orphans byteable bytestring containers cryptohash deepseq @@ -79908,6 +81917,7 @@ 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; @@ -79941,6 +81951,30 @@ self: { license = stdenv.lib.licenses.gpl3; }) {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; + }) {}; + "github-post-receive" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , email-validate, http-types, text, wai, wai-logger, warp @@ -79965,8 +81999,8 @@ self: { }: mkDerivation { pname = "github-release"; - version = "1.1.0"; - sha256 = "1a3a7pil5k0danybcfk19b4rql5s4alrlbprgq9053npb2369js2"; + version = "1.1.2"; + sha256 = "0czc53xwg21jvd7g4ggjva0nzc2rpyf36rc4876dss9lckcc2p93"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -79979,6 +82013,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "github-release_1_1_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-client + , http-client-tls, http-types, mime-types, optparse-generic, text + , unordered-containers, uri-templater + }: + mkDerivation { + pname = "github-release"; + version = "1.1.3"; + sha256 = "040yd8npjv54xfh4fv4i1p9x6qsa5qj1m5wblr7xjf0w090sblf0"; + 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 ]; + homepage = "https://github.com/tfausak/github-release#readme"; + description = "Upload files to GitHub releases"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "github-tools" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, github , groom, html, http-client, http-client-tls, monad-parallel @@ -80757,10 +82813,8 @@ self: { }: mkDerivation { pname = "glirc"; - version = "2.24"; - sha256 = "1fhpwr7v2ad49j9699f5za1ww2m1ln39cvnm82z57cngjghpnngs"; - revision = "2"; - editedCabalFile = "0fz8vr8kiny3jhh2jr3c5pv2283zm6nkfi93pj34v7xs62zcpg59"; + version = "2.25"; + sha256 = "1hh6zqkk1cm50n7d17i2490q2xh7hzy63krpj58rwhgpmn3ps5sb"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -81352,8 +83406,8 @@ self: { }: mkDerivation { pname = "gnss-converters"; - version = "0.3.25"; - sha256 = "1ps3jjlf9igqmllyapqznzxjkf7291i7zv8w86p2fnm6wxsd73q9"; + version = "0.3.30"; + sha256 = "1cjfhpza7mhfywx09rf2qzglqwyss3ndk9sqn0vwvpv4c2wvglaq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81403,8 +83457,8 @@ self: { }: mkDerivation { pname = "gnuplot"; - version = "0.5.4.2"; - sha256 = "0s7z8a7cqnmfrs551wyqaj557hslhkw401z35nfb7shx6wrdvpq5"; + version = "0.5.5"; + sha256 = "1ka756zvc6q5hkjhi8zknb7d5whizmyl7ff0qzclx1n8qbx4jv98"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -84239,16 +86293,17 @@ self: { "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"; @@ -84923,6 +86978,24 @@ 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 @@ -85810,6 +87883,7 @@ self: { homepage = "https://github.com/apoorvingle/h-reversi"; description = "Reversi game in haskell/blank-canvas"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "h2048" = callPackage @@ -86002,6 +88076,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;}; @@ -87089,8 +89164,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 = [ @@ -87177,6 +89252,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hackernews_1_4_0_0" = callPackage + ({ mkDerivation, aeson, base, hspec, http-client, http-client-tls + , http-types, QuickCheck, quickcheck-instances, servant + , servant-client, string-conversions, text + }: + mkDerivation { + pname = "hackernews"; + version = "1.4.0.0"; + sha256 = "0ilj91vjnsfdlzhjh35nqrr3c1z7p6qfabvk3xdz6iqzmpcq3ys8"; + 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; + }) {}; + "hackertyper" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -87299,6 +89399,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haddock_2_17_5" = callPackage + ({ mkDerivation, base, filepath, haddock-api, hspec }: + mkDerivation { + pname = "haddock"; + version = "2.17.5"; + sha256 = "1qxy6yxpxgpqpwcs76ydpal45cz4a3hyq3rq07cwma1cs4p034ql"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base haddock-api ]; + testHaskellDepends = [ base filepath hspec ]; + doCheck = false; + preCheck = "unset GHC_PACKAGE_PATH"; + 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" = callPackage ({ mkDerivation, base, filepath, haddock-api, hspec }: mkDerivation { @@ -87357,11 +89475,35 @@ 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 }: + mkDerivation { + pname = "haddock-api"; + version = "2.17.4"; + sha256 = "00fn6pzgg8xjbaw12d76jdqh2dbc5xy7miyz0x6kidvvar7i35ss"; + revision = "1"; + editedCabalFile = "0saa5ksmvxyvwi2nrzh7m4ha1kwh31pkpa79yrppvw7sm39klpyw"; + 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 ]; + homepage = "http://www.haskell.org/haddock/"; + description = "A documentation-generation tool for Haskell libraries"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "haddock-api" = callPackage + ({ mkDerivation, array, base, bytestring, Cabal, containers + , deepseq, directory, filepath, ghc, ghc-boot, ghc-paths + , haddock-library, hspec, hspec-discover, QuickCheck, transformers + , xhtml + }: mkDerivation { pname = "haddock-api"; version = "2.18.1"; @@ -87374,6 +89516,7 @@ self: { ghc ghc-boot ghc-paths haddock-library transformers xhtml ]; testHaskellDepends = [ base containers ghc hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; license = stdenv.lib.licenses.bsd3; @@ -87435,21 +89578,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "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 ]; + 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 + ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec + , hspec-discover, QuickCheck, transformers }: mkDerivation { pname = "haddock-library"; version = "1.4.5"; sha256 = "0dmpxj6fgv9js90cxlf4yhrclh8kwmn8dm4llwhiyzmiddanjjy9"; - libraryHaskellDepends = [ - attoparsec base bytestring transformers - ]; + libraryHaskellDepends = [ base bytestring deepseq transformers ]; testHaskellDepends = [ - attoparsec base base-compat bytestring deepseq hspec QuickCheck - transformers + base base-compat bytestring deepseq hspec QuickCheck transformers ]; + testToolDepends = [ hspec-discover ]; homepage = "http://www.haskell.org/haddock/"; description = "Library exposing some functionality of Haddock"; license = stdenv.lib.licenses.bsd3; @@ -87496,6 +89656,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hadolint" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, gitrev + , hspec, HUnit, language-docker, optparse-applicative, parsec + , ShellCheck, split, yaml + }: + mkDerivation { + pname = "hadolint"; + version = "1.3.0"; + sha256 = "13z78q36x28h7yn282k03568hj0lvava678d7hhhp5hrbk6ni8xv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring language-docker parsec ShellCheck split + ]; + executableHaskellDepends = [ + base directory filepath gitrev language-docker optparse-applicative + parsec yaml + ]; + testHaskellDepends = [ + 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 @@ -87778,6 +89965,7 @@ self: { ]; description = "Multi-app web platform framework"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {quickcheck-lio-instances = null;}; @@ -87966,6 +90154,51 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) utillinux;}; + "hakyll_4_11_0_0" = callPackage + ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring + , containers, cryptohash, data-default, deepseq, directory + , file-embed, 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, 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.11.0.0"; + sha256 = "08930cs783krsjqzlswz4fplppdlmw5b29nry5i7kan7d4f4lfb8"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base binary blaze-html blaze-markup bytestring containers + cryptohash data-default deepseq directory file-embed filepath + fsnotify http-conduit http-types lrucache mtl network network-uri + optparse-applicative pandoc pandoc-citeproc parsec process random + regex-base regex-tdfa resourcet scientific tagsoup text time + time-locale-compat unordered-containers vector wai wai-app-static + warp yaml + ]; + executableHaskellDepends = [ base directory filepath pandoc ]; + 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 + tagsoup tasty tasty-hunit tasty-quickcheck text time + time-locale-compat unordered-containers vector wai wai-app-static + warp yaml + ]; + testToolDepends = [ utillinux ]; + homepage = "http://jaspervdj.be/hakyll"; + description = "A static website compiler library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) utillinux;}; + "hakyll-R" = callPackage ({ mkDerivation, base, directory, filepath, hakyll, pandoc, process }: @@ -88172,8 +90405,8 @@ self: { ({ 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"; @@ -88456,6 +90689,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;}; @@ -88477,8 +90711,8 @@ self: { }: mkDerivation { pname = "hamilton"; - version = "0.1.0.1"; - sha256 = "12wp6z2dhcpyijvf1bqcx1bamw19crm23wvzgbpbjw3azyi72sn3"; + version = "0.1.0.2"; + sha256 = "1fhwvimqim9jj33wps42wsbwjz28h3waqn7wrwhqci307xbcib0m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88574,8 +90808,8 @@ self: { }: mkDerivation { pname = "hamtsolo"; - version = "1.0.0"; - sha256 = "0lpac24fayd9s40b39l46aak9d51vv3bjslg0drgj2xlp1d9w60y"; + version = "1.0.2"; + sha256 = "0756ffnh1fxwagwkj3zy8axnwkwhnn8m37583sr0ymwyp9vwi3sx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -88830,6 +91064,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;}; @@ -88853,22 +91088,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.5.0"; - sha256 = "15cjssws55awwq8j0xz8f4dd0y826f99zdv6mpxfxq97fah7zlcc"; + version = "0.3.5.1"; + sha256 = "1zpvwdq9dzfkq9jh1bpc5x8vh41508x0wph5a020q31rknc8llad"; 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 @@ -89455,6 +91691,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) openssl;}; + "happstack-server-tls_7_1_6_5" = callPackage + ({ mkDerivation, base, bytestring, extensible-exceptions + , happstack-server, hslogger, HsOpenSSL, network, openssl, sendfile + , time, unix + }: + mkDerivation { + pname = "happstack-server-tls"; + version = "7.1.6.5"; + sha256 = "0hp13wxaghs6ldqpbpyf8agph7b1y488fc516z1n6bvbpzcbhbvq"; + libraryHaskellDepends = [ + base bytestring extensible-exceptions happstack-server hslogger + HsOpenSSL network sendfile time unix + ]; + librarySystemDepends = [ openssl ]; + homepage = "http://www.happstack.com/"; + description = "extend happstack-server with https:// support (TLS/SSL)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) openssl;}; + "happstack-server-tls-cryptonite" = callPackage ({ mkDerivation, base, bytestring, cryptonite, data-default-class , extensible-exceptions, happstack-server, hslogger, network @@ -90323,14 +92579,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 @@ -90885,6 +93158,27 @@ 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, time, transformers, unix + }: + mkDerivation { + pname = "haskell-dap"; + version = "0.0.2.0"; + sha256 = "1wxidyga0abxyxwiy9qxjl8qj456rlcflav18jz3227yc6y4ziwz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ + array base bytestring containers deepseq directory filepath ghc + ghc-boot ghc-paths ghci haskeline process time transformers unix + ]; + homepage = "https://github.com/phoityne/haskell-dap"; + description = "haskell-dap is a GHCi having DAP interface"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskell-disque" = callPackage ({ mkDerivation, base, bytestring, hedis, string-conversions , transformers @@ -91089,6 +93383,34 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; + "haskell-gi_0_21_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers + , directory, doctest, filepath, glib, gobjectIntrospection + , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe + , text, transformers, xdg-basedir, xml-conduit + }: + mkDerivation { + pname = "haskell-gi"; + version = "0.21.0"; + sha256 = "109jgixxrb9xjlkqnwkch9zgb2rj79knd8ivgfi1cc4v30299vwi"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; + "haskell-gi-base" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { @@ -91102,6 +93424,20 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "haskell-gi-base_0_21_0" = callPackage + ({ mkDerivation, base, bytestring, containers, glib, text }: + mkDerivation { + pname = "haskell-gi-base"; + 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 ({ mkDerivation }: mkDerivation { @@ -91271,8 +93607,8 @@ self: { }: mkDerivation { pname = "haskell-lsp"; - version = "0.2.0.0"; - sha256 = "1hvqimg580hbanlhim2kxni3wk6rfwsd93agkfjhy216lb8bd9h8"; + version = "0.2.0.1"; + sha256 = "0xvgm1kkfz5yf1949f07phg5lic1zhwy5pdbgfnqdpaxrwscxm8y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91300,8 +93636,8 @@ self: { }: mkDerivation { pname = "haskell-lsp-client"; - version = "1.0.0.0"; - sha256 = "1c4zjq5vh46gxw3jrfh1f3hk1cbjqg8j2dlz6axb75ir14kxgky1"; + version = "1.0.0.1"; + sha256 = "06zx80nhhf5fik84rijaxzjy9yv1c29g6hwfx73axlav80g176qw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91327,6 +93663,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 { @@ -91753,6 +94108,21 @@ 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.4"; + sha256 = "00db79f99333viibrzhr77cvhv9ihk7vb5yh1xbsz2lirfajwmr2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base haskell-src-exts ]; + executableHaskellDepends = [ 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 { @@ -91765,16 +94135,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "haskell-src-exts-simple_1_20_0_0" = callPackage + ({ mkDerivation, base, haskell-src-exts }: + mkDerivation { + pname = "haskell-src-exts-simple"; + 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"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "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"; @@ -91788,8 +94172,8 @@ self: { }: mkDerivation { pname = "haskell-src-meta"; - version = "0.8.0.1"; - sha256 = "1i5f21mx061k50nl3pvvffjqsbvvldl50y8d4b9b31g63l0jg5q9"; + version = "0.8.0.2"; + sha256 = "12rc4v5dbbbcwdp7j8isvnm9vqpazv124j5kdfwlgwgwjhxi8ysb"; libraryHaskellDepends = [ base haskell-src-exts pretty syb template-haskell th-orphans ]; @@ -91862,8 +94246,8 @@ self: { }: mkDerivation { pname = "haskell-tools-ast"; - version = "1.0.0.2"; - sha256 = "02g90k13yif22dpil39icx95xfm4ac13b8xc6n40wglci8fmy8pz"; + version = "1.0.0.4"; + sha256 = "000dazz2qmc46pyfxskimz02xllf7fs6nl18ki6pvvahp0ammgd9"; libraryHaskellDepends = [ base ghc mtl references template-haskell uniplate ]; @@ -91933,8 +94317,8 @@ self: { }: mkDerivation { pname = "haskell-tools-backend-ghc"; - version = "1.0.0.2"; - sha256 = "1h1ccqng5w25d0k0iw8w7jpdww3gnm4mzs8gzr0amlbw8azar29d"; + version = "1.0.0.4"; + sha256 = "0c909xknb4q28cqm4cckx5girygz1jjg0nwj9v31dj7yhwgm6y2g"; libraryHaskellDepends = [ base bytestring containers ghc ghc-boot-th haskell-tools-ast mtl references safe split template-haskell transformers uniplate @@ -91954,8 +94338,8 @@ self: { }: mkDerivation { pname = "haskell-tools-builtin-refactorings"; - version = "1.0.0.2"; - sha256 = "0ysn8fgyj89f7bnmijb1vcp9qckc7w7zjj209rlg2cx5qfs75dhn"; + version = "1.0.0.4"; + sha256 = "1hxl8j8nkn3f59wxbzfyhjbshjypi4bv7v2vrqlpfygnb1n1jhci"; libraryHaskellDepends = [ base Cabal containers directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc @@ -91985,8 +94369,8 @@ self: { }: mkDerivation { pname = "haskell-tools-cli"; - version = "1.0.0.2"; - sha256 = "11x0b85jixdpf1jps6y35v3gsh5yrnr1qvdwim75rzhkd73fxrwn"; + version = "1.0.0.4"; + sha256 = "121q9ydi0jlj9bs6zyy2h6vkmaajwf1pcnnq4s21yw99ah4xhy6q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92023,8 +94407,8 @@ self: { }: mkDerivation { pname = "haskell-tools-daemon"; - version = "1.0.0.2"; - sha256 = "0sczrldcby64cghivmd8ks9srdg84xk1h9rxxp1ywysjah86ir6x"; + version = "1.0.0.4"; + sha256 = "1gqx9nn87mq2n722lzl0slpw54dg6asc2s77zjs0sywvcpck4b4v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92056,8 +94440,8 @@ self: { }: mkDerivation { pname = "haskell-tools-debug"; - version = "1.0.0.2"; - sha256 = "1shgm21g0s0f0amlf42imfb2s6279s6aqfnb7gqkh22q8pamsvhj"; + version = "1.0.0.4"; + sha256 = "0lh48bfjicpjsk2vazl91n6xw0ahff89rw9iiizpla92rz1fcb20"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92083,8 +94467,8 @@ self: { }: mkDerivation { pname = "haskell-tools-demo"; - version = "1.0.0.2"; - sha256 = "1hmpjm5z7k4qbq3q1gl2qmqrprx3kd8n980gsmwk53i5lj17h7dp"; + version = "1.0.0.4"; + sha256 = "0vqjs4wrgjacj3i6hykfvafhnyik6nn9p8miyb1plmhm9w6g0ynq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92115,8 +94499,8 @@ self: { }: mkDerivation { pname = "haskell-tools-experimental-refactorings"; - version = "1.0.0.2"; - sha256 = "0avxnp5zdc3rafqg5arvnfljyhp3v2ass96z39458b4zmrxf2mgd"; + version = "1.0.0.4"; + sha256 = "0mzwvs33snv3a3dvhkd1mnidkifip21rj2y44k9dcwdhfzcz6xbl"; libraryHaskellDepends = [ base Cabal containers directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc @@ -92142,8 +94526,8 @@ self: { }: mkDerivation { pname = "haskell-tools-prettyprint"; - version = "1.0.0.2"; - sha256 = "00r76y11l7sj8w76svxnjr4rxb99s47m6lv4jp0k1jdzyybzsjjf"; + version = "1.0.0.4"; + sha256 = "001mk8fdxl06il8s3w1i4901s85kb99nyhp3yk7jg6ghh4iaf1c9"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast mtl references split text uniplate @@ -92161,8 +94545,8 @@ self: { }: mkDerivation { pname = "haskell-tools-refactor"; - version = "1.0.0.2"; - sha256 = "03pvjgwz9w79zk7rkx0pm09arbpijnljp3q2aykjpblh7lh6va95"; + version = "1.0.0.4"; + sha256 = "192najfy3r05vhxl21bg6lqy8m5081sdxp5yfvw9nyjlarfcb2b9"; libraryHaskellDepends = [ base Cabal containers directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc @@ -92181,8 +94565,8 @@ self: { }: mkDerivation { pname = "haskell-tools-rewrite"; - version = "1.0.0.2"; - sha256 = "1lq5xxsplr6w0jrwwih86jl8alvzlzg3dqfb0pimdi0z23jyqq4f"; + version = "1.0.0.4"; + sha256 = "1jjg6w2ajlnjz7hl74znm2gaylmlixvp65m2ns7p4iryycsr5fjg"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl references @@ -92277,8 +94661,8 @@ self: { }: mkDerivation { pname = "haskell-updater"; - version = "1.3"; - sha256 = "1q9rjy36wqagy665k0ifnfwr9r1fy2if5gnva9q069hdir15lkzm"; + version = "1.3.1"; + sha256 = "0q2aix579mm3ksi0hipcmw8g2p5xfbgk6ph7jnraq5i2rxjchg7v"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -92652,6 +95036,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;}; @@ -92690,6 +95075,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;}; @@ -92840,8 +95226,8 @@ self: { }: mkDerivation { pname = "haskey"; - version = "0.2.0.0"; - sha256 = "1c0snqs740gqwfzlpyhr8zggaplmba6mzj8cnl8r47sgn006q95i"; + version = "0.2.0.1"; + sha256 = "07q7kp07ipq20v3ag49j3ca116p48yn3pn5im5p101l8372hj58n"; libraryHaskellDepends = [ base binary bytestring containers directory exceptions filepath focus haskey-btree list-t lz4 mtl semigroups stm stm-containers @@ -92866,8 +95252,8 @@ self: { }: mkDerivation { pname = "haskey-btree"; - version = "0.2.0.0"; - sha256 = "00gp5fh64b26bqrchdrpdl8s46fdzglsqi07xf0cfrfcm867az23"; + version = "0.2.0.1"; + sha256 = "025g1sa41fa29v69hpbghabq2irkb498a6b48bgp0nb8m3cmz2ls"; libraryHaskellDepends = [ base binary bytestring containers hashable mtl semigroups text transformers vector @@ -93491,24 +95877,25 @@ self: { }) {}; "hasmin" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers - , criterion, directory, doctest, doctest-discover, gitrev, hopfli - , hspec, hspec-attoparsec, matrix, mtl, numbers + ({ mkDerivation, attoparsec, base, bifunctors, bytestring + , containers, criterion, directory, doctest, doctest-discover + , gitrev, hopfli, hspec, hspec-attoparsec, matrix, mtl, numbers , optparse-applicative, parsers, QuickCheck, text }: mkDerivation { pname = "hasmin"; - version = "1.0"; - sha256 = "1a512s1fd472agy2pv9qizp61jrz1jzdpxla3213y6wsahi9wdnm"; + version = "1.0.1"; + sha256 = "1h5ygl9qmzmbhqfb58hhm2zw850dqfkp4b8cp3bhsnangg4lgbjk"; + revision = "2"; + editedCabalFile = "0hav8khv14k41rf4lmh79w6ym4basrmmsjwfc5bww2qya7889d5k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base bytestring containers matrix mtl numbers parsers + attoparsec base bifunctors 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 @@ -93669,8 +96056,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 @@ -93966,6 +96353,7 @@ self: { homepage = "http://haste-lang.org/"; description = "Haskell To ECMAScript compiler"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {bin-package-db = null;}; @@ -94613,10 +97001,10 @@ self: { }: mkDerivation { pname = "hblas"; - version = "0.3.2.1"; - sha256 = "05c2mqhwjq0r8jyaj0cncaxn4n5x27dd8z6lv8g8cdc7r749q59y"; + version = "0.3.2.2"; + sha256 = "1r38ch9xi02dg4pfngpp3rndrla14w75pijkdb6kkq5r80i7hxmw"; revision = "2"; - editedCabalFile = "02cxp6nxr2x1ka8bq8zjlx6kjy54lzsc9bdw1zf981f3i8yz9cj8"; + editedCabalFile = "0rvym111j5rpdx8cng1nwy7fg1f84wcfzfbwi8qgcvg29126jbnf"; libraryHaskellDepends = [ base primitive storable-complex vector ]; librarySystemDepends = [ blas liblapack ]; testHaskellDepends = [ base HUnit tasty tasty-hunit vector ]; @@ -94945,8 +97333,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 ]; @@ -95411,10 +97799,8 @@ self: { }: mkDerivation { pname = "heaps"; - version = "0.3.5"; - sha256 = "1p1nsglsf8hric63cn3n1iw1nlbiv3lgk3n5gq0znajj7j7s64qv"; - revision = "1"; - editedCabalFile = "05avm1b16gj3rlm9sjqkxb0flq055r6gqhnacp7yzw4j1bghm5j7"; + version = "0.3.6"; + sha256 = "1cnxgmxxvl053yv93vcz5fnla4iir5g9wr697n88ysdyybbkq70q"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory doctest filepath ]; @@ -95611,6 +97997,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "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-posix, scientific + , tasty, tasty-hedgehog, text, unordered-containers, vector + }: + mkDerivation { + pname = "hedgehog-gen-json"; + version = "0.1.0"; + sha256 = "1b2sb33ah8df2v36hq1axf8dc5d3kflvpb70fcs2pbr44wzrv8x4"; + libraryHaskellDepends = [ + aeson base bytestring containers exceptions hedgehog lens protolude + regex-genex scientific text unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers exceptions hedgehog lens protolude + regex-genex regex-posix scientific tasty tasty-hedgehog text + unordered-containers vector + ]; + homepage = "https://github.com/githubuser/haskell-hedgehog-gen-json#readme"; + description = "JSON generators for Hedgehog"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hedgehog-quickcheck" = callPackage ({ mkDerivation, base, hedgehog, QuickCheck, transformers }: mkDerivation { @@ -95647,6 +98069,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hedis_0_10_0" = callPackage + ({ mkDerivation, async, base, bytestring, bytestring-lexing + , 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.10.0"; + sha256 = "02f095461v812csrncf4bdhvgpn1a3wqpd66gpb72pxij4mrh5zy"; + libraryHaskellDepends = [ + 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 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 ({ mkDerivation, aeson, base, bytestring, hedis, scientific, text , time @@ -95808,8 +98256,10 @@ self: { }: mkDerivation { pname = "heist"; - version = "1.0.1.1"; - sha256 = "1incy8w291k3vivnrxxqw12i77qzq8b840z8l99i0mkwbl3w3gf7"; + version = "1.0.1.2"; + sha256 = "0kpn5c3j7d42l12axd05hglhxqc4y7l0rz57lcqh3yznjl7mzv71"; + revision = "1"; + editedCabalFile = "0aac04b374bi02nj1li7xf0w2z1d87l8qhzjmpsharg9jxrk8ngn"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring containers directory directory-tree dlist filepath hashable @@ -96303,8 +98753,8 @@ self: { }: mkDerivation { pname = "here"; - version = "1.2.11"; - sha256 = "1jpcwzi5pq82zlv1w987dlpfyi566gvabaj2wywyr9i95hv97jk8"; + version = "1.2.12"; + sha256 = "0kiwcknk145z7y48qgpf73f0kwz4nnqa72q14vypy21sb5bpcgxc"; libraryHaskellDepends = [ base haskell-src-meta mtl parsec template-haskell ]; @@ -96985,8 +99435,8 @@ self: { }: mkDerivation { pname = "heyefi"; - version = "2.0.0.1"; - sha256 = "08lry3bxppnxr1mqpsbplq041nf2c5aaaim4iqhrapvqwwca7n5v"; + version = "2.0.0.2"; + sha256 = "1dhjvg5hhqj7apbsz5sq5p05rp3g07igc00r8qa7dmgixrp0a77b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -97075,25 +99525,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-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.0"; + sha256 = "1d62kby9mzld7lnfvrvhkri8lf2wgijb972wzrarbcbnkahhjnps"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring Cabal directory exceptions filepath - haskell-src-exts hindent hlint HUnit path path-io pipes + base bytestring Cabal 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-combinators directory + optparse-applicative ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit @@ -97369,22 +99820,21 @@ 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 = "3"; - editedCabalFile = "1cxc4jqkngabnramva9s718mavk1082pjkkq2z8x326k0v269w2g"; + 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; @@ -97452,6 +99902,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;}; @@ -97698,12 +100149,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; }) {}; @@ -98089,6 +100542,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;}; @@ -98138,21 +100592,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 @@ -98924,8 +101378,8 @@ self: { }: mkDerivation { pname = "hjsonschema"; - version = "1.7.1"; - sha256 = "0x9w33scdnbfdmadxpx2c4fgkmpvny9ipsl2y7fq56zr6fa0ybfz"; + version = "1.7.2"; + sha256 = "1czxfwfhl7zxx8385x8qskiym8qb1fpjdxmbywl8p4p102cb9083"; libraryHaskellDepends = [ aeson base bytestring containers file-embed filepath hashable hjsonpointer http-client http-types pcre-heavy profunctors @@ -99064,7 +101518,7 @@ 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 @@ -99074,24 +101528,22 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.4"; - sha256 = "146llzlpijcai3cfqcd4l4dcyjq6j6wd6pinkllja73vpx7wyi75"; - revision = "2"; - editedCabalFile = "0yksk4ckbr84s3ksvhx9miy8r5w7v0b0kmxj688f5gd1857n6vrx"; + version = "1.5"; + sha256 = "0mmgjahdlyka2mi1271kawrvkvnw8bgd3a08r8bykskj9b9f5181"; 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 + data-default Decimal 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 ]; 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 @@ -99099,7 +101551,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 @@ -99124,10 +101576,8 @@ self: { }: mkDerivation { pname = "hledger-api"; - version = "1.4"; - sha256 = "00vpl1ch1v80f37y8yn2psdzm7ccxpfn3jp93xqxbasksxfawfa7"; - revision = "1"; - editedCabalFile = "1q3fvasxg32xza2pgf725x0j5dsz4rklng3blyw0kq70bccgdaka"; + version = "1.5"; + sha256 = "1wanah469danp0ljjxr258gdcd9lb175chz2jlq0y604wksaaj19"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -99165,8 +101615,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 ]; @@ -99185,10 +101635,10 @@ self: { }: mkDerivation { pname = "hledger-iadd"; - version = "1.2.6"; - sha256 = "1l5vzhyya5h6sc3l74iy0mnys8bcjp6m5z0m3lqabk37ik31ld36"; - revision = "8"; - editedCabalFile = "0fjlyb3pbn5dfkns8hlb696aawmw6gkm1ad2la0aiy2kyzhvl838"; + version = "1.3.1"; + sha256 = "0z7f9bm7xkq8a9kbhf3bd6fxhfaab08ddgghpbg5z460l4lhcczv"; + revision = "1"; + editedCabalFile = "1kwncys0n2xbvbq6a5rgfxg955726xk8av6v9221qx8zpndf2di4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -99236,8 +101686,8 @@ self: { }: mkDerivation { pname = "hledger-irr"; - version = "0.1.1.12"; - sha256 = "1mk8yq601l5hljdmzj68q10wcvkl0l4li1h4aqcj04ygp0sg7471"; + version = "0.1.1.13"; + sha256 = "16y195h5wjs8vrccs18dx65kz3xrcifcwy1ggrsblf0kgml0cj7l"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -99250,22 +101700,20 @@ 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, extra, filepath, Glob + , hashtables, HUnit, megaparsec, mtl, mtl-compat, old-time, parsec + , pretty-show, regex-tdfa, safe, semigroups, split, test-framework , test-framework-hunit, text, time, transformers, uglymemo , utf8-string }: mkDerivation { pname = "hledger-lib"; - version = "1.4"; - sha256 = "15hyrpn0ifwx4x22hggjdm1xz0jyk8p5wnrynzxy9ali0wci1qxq"; - revision = "2"; - editedCabalFile = "1ckwjx3k4xfwj1vdrp5hsf1m0bpyax3nr1xyiyn8745w89vqrf0q"; + version = "1.5"; + sha256 = "00k0wqib3hadi4rcnldr14q2va57b09whfbwzd14pz824x7pnfd7"; enableSeparateDataOutput = true; 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 @@ -99273,10 +101721,10 @@ self: { 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 - test-framework test-framework-hunit text time transformers uglymemo - utf8-string + doctest extra filepath Glob hashtables HUnit megaparsec mtl + mtl-compat old-time parsec pretty-show regex-tdfa safe semigroups + split test-framework test-framework-hunit text time transformers + uglymemo utf8-string ]; homepage = "http://hledger.org"; description = "Core data types, parsers and functionality for the hledger accounting tools"; @@ -99292,10 +101740,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.4"; - sha256 = "0rm6091nlpijhi6k74dg35g38a7ly22mqfnb0mvjp8pyxb4phq33"; - revision = "8"; - editedCabalFile = "0xk0iqjy5vr674xl565wip8h2hfkxpfymw3jlfgc984a5vjwan44"; + version = "1.5"; + sha256 = "104vjyqpddwv8g9mfbaw174nl4lb41zwl14i8225m6v1gxvs5w6x"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -99341,10 +101787,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.4"; - sha256 = "1l5mxvhgvn3q1ds9qmqkdmrs82619nvs13gmjsynr0vbbx52zw7h"; - revision = "3"; - editedCabalFile = "1xvycx1s54pz6rmjip9lxsg7p6anksi1pjqfjjs94yw977dcwm46"; + version = "1.5"; + sha256 = "10ar6ic9snrbwi60sz1729dshff01s3knmb7d7kwfk9svmilxq6f"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -99461,8 +101905,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "2.0.11"; - sha256 = "040p4rr7jjr40i6239vwkr2qqva7r9ccksg5n9k9r7ljbh8rf66b"; + version = "2.0.15"; + sha256 = "0k9y9dj9sq8rwkjnca4s6wv0ncba536lmcpq10vpyvy47x5dzs2d"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -99478,29 +101922,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hlint_2_0_12" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs - , containers, cpphs, data-default, directory, extra, filepath - , haskell-src-exts, haskell-src-exts-util, hscolour, process - , refact, text, transformers, uniplate, unordered-containers - , vector, yaml - }: + "hlint-test" = callPackage + ({ mkDerivation, base, hlint }: mkDerivation { - pname = "hlint"; - version = "2.0.12"; - sha256 = "1cfq4g1h5c47nxqn7433jd40hajv5pq30p5rb132fc5sp68vx0by"; + pname = "hlint-test"; + version = "0.1.0.0"; + sha256 = "1lvbhhcxs9axvpm5m3axni30aafa9d32jrx00072kywm536gnnny"; isLibrary = true; isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson ansi-terminal base bytestring cmdargs containers cpphs - data-default directory extra filepath haskell-src-exts - haskell-src-exts-util hscolour process refact text transformers - uniplate unordered-containers vector yaml - ]; - executableHaskellDepends = [ base ]; - homepage = "https://github.com/ndmitchell/hlint#readme"; - description = "Source code suggestions"; + 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; }) {}; @@ -99620,19 +102064,19 @@ 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.1.0"; - sha256 = "07zkwvg872hfk6jyn4s54ws8mvclynazaxf7fsbqi16dmf9dn61c"; - 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; @@ -99764,8 +102208,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"; @@ -100018,17 +102462,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"; @@ -100062,8 +102506,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 ]; @@ -100193,6 +102637,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hnix_0_4_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, containers, criterion + , 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.4.0"; + sha256 = "0rgx97ckv5zvly6x76h7nncswfw0ik4bhnlj8n5bpl4rqzd7d4fd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base containers data-fix deepseq deriving-compat + parsers regex-tdfa regex-tdfa-text semigroups text transformers + trifecta unordered-containers + ]; + executableHaskellDepends = [ + ansi-wl-pprint base containers data-fix deepseq + ]; + testHaskellDepends = [ + base containers data-fix tasty tasty-hunit tasty-th text + ]; + benchmarkHaskellDepends = [ base containers criterion text ]; + homepage = "http://github.com/jwiegley/hnix"; + description = "Haskell implementation of the Nix language"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hnn" = callPackage ({ mkDerivation, base, binary, bytestring, hmatrix, mwc-random , random, vector, vector-binary-instances, zlib @@ -100220,6 +102694,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base ]; license = stdenv.lib.licenses.unfree; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hnormalise" = callPackage @@ -100326,6 +102801,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hoauth2_1_6_2" = 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.6.2"; + sha256 = "185yia9mdjhmhian83rrd0hm3wjpja7hawnyvzq25rnhh2g4l2ay"; + 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 ({ mkDerivation, base, bytestring, containers, directory, filepath , glib, gtk-largeTreeStore, gtk3, gtksourceview3, hspec, mtl, pango @@ -100416,17 +102916,17 @@ self: { , 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, optional-args - , optparse-applicative, optparse-generic, pooled-io, pureMD5 - , scientific, tar, tasty, tasty-golden, tasty-hunit + , 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.2"; - sha256 = "1bdzbggvin83m778qq6367mpv2cwgwpbahhlzf290iwikmhmhgr2"; + version = "1.0.4"; + sha256 = "1lf8m6cd54vc436krl3j4kanmnd86r4ri45a1qp7y4qqlpplcnpf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100434,9 +102934,9 @@ self: { 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 optparse-applicative optparse-generic pooled-io pureMD5 - scientific tar temporary text time transformers turtle - unordered-containers uri-bytestring vector wreq zlib + 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 @@ -100865,11 +103365,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; @@ -101099,6 +103598,41 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "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, 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 @@ -101110,8 +103644,8 @@ self: { }: mkDerivation { pname = "hoogle"; - version = "5.0.15"; - sha256 = "0bfb3y4rasl8dzcivvhhpq6ijspn37i53rhzxc9gx4yvdnai57sb"; + version = "5.0.17.1"; + sha256 = "0678kdssjmb8k08jmazg1w9lglz27ni2p3b5031likk2dp9gvf2h"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -101170,8 +103704,8 @@ self: { }: mkDerivation { pname = "hookup"; - version = "0.1.1.0"; - sha256 = "11gbk92wqcakmqqrvggjypxxpgdccacqbrrzicwy8113hd6kiw75"; + version = "0.2"; + sha256 = "17sj62b78a22alq9hpsrjcri5yxz7yzxdar521yd6x7jv3xxpix2"; libraryHaskellDepends = [ base bytestring HsOpenSSL HsOpenSSL-x509-system network socks ]; @@ -101298,6 +103832,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hopenpgp-tools_0_20" = callPackage + ({ mkDerivation, aeson, alex, ansi-wl-pprint, array, attoparsec + , base, base16-bytestring, binary, binary-conduit, bytestring + , conduit, conduit-extra, containers, crypto-pubkey, cryptohash + , directory, errors, fgl, graphviz, happy, hOpenPGP, http-client + , http-client-tls, http-types, ixset-typed, lens, monad-loops + , openpgp-asciiarmor, optparse-applicative, resourcet, text, time + , time-locale-compat, transformers, unordered-containers + , wl-pprint-extras, wl-pprint-terminfo, yaml + }: + mkDerivation { + pname = "hopenpgp-tools"; + version = "0.20"; + sha256 = "1qhx58l6qxs7b5zp76dsy3y0whqnkp919c98lz9n1clla0hfhdgb"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson ansi-wl-pprint array attoparsec base base16-bytestring binary + binary-conduit bytestring conduit conduit-extra containers + crypto-pubkey cryptohash directory errors fgl graphviz hOpenPGP + http-client http-client-tls http-types ixset-typed lens monad-loops + openpgp-asciiarmor optparse-applicative resourcet text time + time-locale-compat transformers unordered-containers + wl-pprint-extras wl-pprint-terminfo yaml + ]; + executableToolDepends = [ alex happy ]; + homepage = "https://salsa.debian.org/clint/hOpenPGP"; + description = "hOpenPGP-based command-line tools"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hopenssl" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, doctest , HUnit, openssl @@ -101378,6 +103944,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"; @@ -101390,8 +103958,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 ]; @@ -101407,8 +103975,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 ]; @@ -101422,8 +103990,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 ]; @@ -101437,8 +104005,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 @@ -101613,6 +104181,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;}; @@ -101867,39 +104436,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hpack_0_20_0" = callPackage - ({ mkDerivation, aeson, base, base-compat, bytestring, Cabal - , containers, cryptonite, deepseq, directory, filepath, Glob, hspec - , HUnit, interpolate, mockery, pretty, QuickCheck, temporary, text - , unordered-containers, yaml - }: - mkDerivation { - pname = "hpack"; - version = "0.20.0"; - sha256 = "0n8dhxk0h45lhc436xmdbmf0pva26dyg6p9vcksfl3dfp0nvf2mi"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base-compat bytestring Cabal containers cryptonite - deepseq directory filepath Glob pretty text unordered-containers - yaml - ]; - executableHaskellDepends = [ - aeson base base-compat bytestring Cabal containers cryptonite - deepseq directory filepath Glob pretty text unordered-containers - yaml - ]; - testHaskellDepends = [ - aeson base base-compat bytestring Cabal containers cryptonite - deepseq directory filepath Glob hspec HUnit interpolate mockery - pretty QuickCheck temporary text unordered-containers yaml - ]; - homepage = "https://github.com/sol/hpack#readme"; - description = "An alternative format for Haskell packages"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hpack" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal , containers, cryptonite, deepseq, directory, filepath, Glob, hspec @@ -101933,6 +104469,43 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hpack_0_23_0" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal + , containers, cryptonite, deepseq, directory, filepath, Glob, hspec + , http-client, http-client-tls, http-types, interpolate, mockery + , pretty, QuickCheck, scientific, temporary, text, transformers + , unordered-containers, yaml + }: + mkDerivation { + pname = "hpack"; + version = "0.23.0"; + sha256 = "1604lr20745kkzbhl2ski74p6swjgvarsbaxcpj5wldhk65add6y"; + 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 + 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 + yaml + ]; + testHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob hspec http-client http-client-tls + http-types interpolate mockery pretty QuickCheck scientific + temporary text transformers unordered-containers yaml + ]; + homepage = "https://github.com/sol/hpack#readme"; + description = "An alternative format for Haskell packages"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hpack-convert" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring , Cabal, containers, deepseq, directory, filepath, Glob, hspec @@ -102206,8 +104779,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 ]; @@ -102225,8 +104798,8 @@ self: { }: mkDerivation { pname = "hpio"; - version = "0.9.0.2"; - sha256 = "0jxmmch6y897rk02rql4rs82qmdj3r3xpbsrv75sgc2mb09cx2zy"; + version = "0.9.0.3"; + sha256 = "0cz7dxxxxfr142gr3hrq1k1x8axdgvyw7bsjsd1v9spka2i03rcd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102245,6 +104818,38 @@ self: { homepage = "https://github.com/quixoftic/hpio#readme"; description = "Monads for GPIO in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hpio_0_9_0_4" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , 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.4"; + sha256 = "18j60xiwh18s01bbapi95h8g6ixr9brqh375qlhg600cgf0yzirx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers directory exceptions filepath + monad-control monad-logger mtl protolude QuickCheck text + transformers transformers-base unix unix-bytestring + ]; + executableHaskellDepends = [ + async base exceptions mtl optparse-applicative protolude text + transformers + ]; + testHaskellDepends = [ + 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 @@ -102361,8 +104966,8 @@ self: { }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.5.0.0"; - sha256 = "1hp9nn49a8kg58y8cywsiwcy64zq65c1hnsn2xi5ajk71hag8b8c"; + version = "1.5.0.1"; + sha256 = "022732jsji79a1bb805gh6pcif9ismivs2dwgwks0fb5i9hviilm"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash exceptions fields-json hpqtypes lifted-base log-base monad-control mtl safe @@ -102686,8 +105291,8 @@ self: { }: mkDerivation { pname = "hruby"; - version = "0.3.5"; - sha256 = "0ngl6irnbkrjs7mq8gz3v6gh98l724595vyibw5chzikjl183fj8"; + version = "0.3.5.1"; + sha256 = "0gzg7yhkrzgqaip5fd1lbd15j1274w28kqv0k6ls6sfk52gq56wn"; libraryHaskellDepends = [ aeson attoparsec base bytestring scientific stm text unordered-containers vector @@ -102767,6 +105372,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;}; @@ -104211,49 +106817,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.0"; + sha256 = "04k2yq4a5q87yj8z9h2qzmw32p0c8snc5ccaqyyk24kxa9p26av8"; 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 @@ -104312,6 +106918,23 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {inherit (pkgs) adns;}; + "hsdns_1_7_1" = callPackage + ({ mkDerivation, adns, base, containers, network }: + mkDerivation { + pname = "hsdns"; + version = "1.7.1"; + sha256 = "0i50p31zxsrkx9hv3mqcl2042lf922b1fsswmd99d66ybkl01kag"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers network ]; + librarySystemDepends = [ adns ]; + homepage = "http://github.com/peti/hsdns"; + description = "Asynchronous DNS Resolver"; + license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {inherit (pkgs) adns;}; + "hsdns-cache" = callPackage ({ mkDerivation, base, hsdns, network, SafeSemaphore, text, time , unordered-containers @@ -104462,6 +107085,7 @@ self: { homepage = "http://lpuppet.banquise.net"; description = "A small and ugly library that emulates the output of the puppet facter program"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsfcsh" = callPackage @@ -104611,8 +107235,8 @@ self: { }: mkDerivation { pname = "hsimport"; - version = "0.8.4"; - sha256 = "1xngy3qnk6nr0yvvkq7cqay0kkhnp0v4ah27w8r5v3q4malraa1l"; + version = "0.8.5"; + sha256 = "05gdzl4h67rjpw2nhk6dvd9l8lmx1kdg4cy9hmk5l36vrk8s9ic6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104815,8 +107439,8 @@ self: { }: mkDerivation { pname = "hslua"; - version = "0.9.3"; - sha256 = "1ml64f8faz17qfp0wm9fqgribcf8fvyhazjk9a1385fsjy96ks8m"; + version = "0.9.5"; + sha256 = "1j2zk7f7nyywg2b0n6kb2yf6ljc7cn2sk9jz0h76g3ag2b70l12n"; configureFlags = [ "-fsystem-lua" ]; libraryHaskellDepends = [ base bytestring containers exceptions fail mtl text @@ -105215,6 +107839,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec_2_4_7" = callPackage + ({ mkDerivation, base, call-stack, directory, hspec-core + , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck + , stringbuilder, transformers + }: + mkDerivation { + pname = "hspec"; + version = "2.4.7"; + sha256 = "1jvf7x43gkch4b8nxqdascqlh4rh2d1qvl44skwqkz0gw154ldan"; + libraryHaskellDepends = [ + base call-stack hspec-core hspec-discover hspec-expectations HUnit + QuickCheck transformers + ]; + testHaskellDepends = [ + base call-stack directory hspec-core hspec-discover + hspec-expectations hspec-meta HUnit QuickCheck stringbuilder + transformers + ]; + homepage = "http://hspec.github.io/"; + description = "A Testing Framework for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec , hspec-expectations, text @@ -105271,6 +107919,8 @@ self: { pname = "hspec-core"; version = "2.4.4"; sha256 = "1pxzr3l8b9640mh904n51nwlr2338wak23781s48a9kzvwf347b0"; + revision = "1"; + editedCabalFile = "0m4bmclgs7as957wdnq1y4zh49hrwpslgz5m9430myl4dc14r81l"; libraryHaskellDepends = [ ansi-terminal array async base call-stack deepseq directory filepath hspec-expectations HUnit QuickCheck quickcheck-io random @@ -105288,6 +107938,53 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-core_2_4_7" = callPackage + ({ mkDerivation, ansi-terminal, array, async, base, call-stack + , deepseq, directory, filepath, hspec-expectations, hspec-meta + , HUnit, process, QuickCheck, quickcheck-io, random, setenv + , silently, temporary, tf-random, time, transformers + }: + mkDerivation { + pname = "hspec-core"; + version = "2.4.7"; + sha256 = "0syjbx3s62shwddp75qj0nfwmfjn0yflja4bh23x161xpx1g0igx"; + libraryHaskellDepends = [ + ansi-terminal array async base call-stack deepseq directory + filepath hspec-expectations HUnit QuickCheck quickcheck-io random + setenv tf-random time transformers + ]; + testHaskellDepends = [ + ansi-terminal array async base call-stack deepseq directory + filepath hspec-expectations hspec-meta HUnit process QuickCheck + quickcheck-io random setenv silently temporary tf-random time + transformers + ]; + 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 = "0.3.0.0"; + sha256 = "1gg17qx95v0widjng6sf0mf589vckixnwjl8n0kh08wpvbriqz60"; + 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 { @@ -105304,6 +108001,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-discover_2_4_7" = callPackage + ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck + }: + mkDerivation { + pname = "hspec-discover"; + version = "2.4.7"; + sha256 = "1cgj6c6f5vpn36jg2j7v80nr87x1dsf7qyvxvjw8qimjdxrcx0ba"; + 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 { @@ -105431,6 +108148,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hspec-golden-aeson_0_5_1_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory + , filepath, hspec, hspec-core, QuickCheck, quickcheck-arbitrary-adt + , random, silently, transformers + }: + mkDerivation { + pname = "hspec-golden-aeson"; + version = "0.5.1.0"; + sha256 = "0d3ww44c0al841j6z5w6br1qa91v5nr0lfbzaa4cdydynvi4s6lq"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring directory filepath hspec + QuickCheck quickcheck-arbitrary-adt random transformers + ]; + testHaskellDepends = [ + aeson base directory hspec hspec-core QuickCheck + quickcheck-arbitrary-adt silently transformers + ]; + homepage = "https://github.com/plow-technologies/hspec-golden-aeson#readme"; + description = "Use tests to monitor changes in Aeson serialization"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-hashable" = callPackage ({ mkDerivation, base, hashable, hspec, hspec-core, QuickCheck , silently @@ -105511,8 +108251,8 @@ self: { }: mkDerivation { pname = "hspec-meta"; - version = "2.4.4"; - sha256 = "117n4j56wfh48xj02mv0wkp10bkr2xkyvwg7n7r2ynp03wrf9ykm"; + version = "2.4.6"; + sha256 = "0qmvk01n79j6skn79r6zalg2pd0x0nqqn9qn8mhg0pgyzcdnfc9b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105661,6 +108401,8 @@ self: { pname = "hspec-smallcheck"; version = "0.4.2"; sha256 = "1lsy71ri0lfvs6w1drwa4p69bcy0nrpb62dah3bg4vqwxfrd82ds"; + revision = "1"; + editedCabalFile = "19fp4xandn3jn1hzs1bkjbncyv74908wzcqkvk7xf0dfmm0wpmqw"; libraryHaskellDepends = [ base hspec-core smallcheck ]; testHaskellDepends = [ base hspec hspec-core QuickCheck smallcheck @@ -105670,6 +108412,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-smallcheck_0_5_0" = callPackage + ({ mkDerivation, base, call-stack, hspec, hspec-core, HUnit + , QuickCheck, smallcheck + }: + mkDerivation { + pname = "hspec-smallcheck"; + version = "0.5.0"; + sha256 = "0lff095qm855y7dd055c4h5ip8lcx1i6pady2b81fby4wgf78g1m"; + libraryHaskellDepends = [ + base call-stack hspec-core HUnit smallcheck + ]; + testHaskellDepends = [ + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-snap" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , digestive-functors, directory, HandsomeSoup, hspec, hspec-core @@ -106622,6 +109384,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hsx2hs_0_14_1_2" = callPackage + ({ mkDerivation, base, bytestring, haskell-src-exts + , haskell-src-meta, mtl, template-haskell, utf8-string + }: + mkDerivation { + pname = "hsx2hs"; + version = "0.14.1.2"; + sha256 = "06j2nc2yg8a8pp3c2ayxrm76fj2w2w5d2ilq91hvwwb1ikrklg5b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring haskell-src-exts haskell-src-meta mtl + template-haskell utf8-string + ]; + homepage = "https://github.com/seereason/hsx2hs"; + description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hsyscall" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -106912,6 +109694,8 @@ self: { pname = "html-entity-map"; version = "0.1.0.0"; sha256 = "0k1l1pbmrfmh44v9cc9ka01bx9xm1x4jabbl675fc5c57v1h0dlq"; + revision = "1"; + editedCabalFile = "1y2w3jmdxwa8lfj1gr4ln98v1474bw1cjsdfpmbaphcjj9bjg0sg"; libraryHaskellDepends = [ base text unordered-containers ]; benchmarkHaskellDepends = [ base criterion text unordered-containers @@ -107115,8 +109899,8 @@ self: { }: mkDerivation { pname = "htoml-megaparsec"; - version = "1.0.1.11"; - sha256 = "09810a4s0gfza0sh4ldh355sbp3810qy8gkcpvq2048h6ajh2kz5"; + version = "1.1.0.1"; + sha256 = "10bgm0dqi2hni9sxjri2i7imfwqfi750pwwrpbghdvyfxrivfcpy"; libraryHaskellDepends = [ base composition-prelude containers deepseq megaparsec mtl old-locale text time unordered-containers vector @@ -107125,11 +109909,8 @@ self: { 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; }) {}; @@ -107248,6 +110029,8 @@ self: { pname = "http-api-data"; version = "0.3.7.1"; sha256 = "1zbmf0kkfsw7pfznisi205gh7jd284gfarxsyiavd2iw26akwqwc"; + revision = "1"; + editedCabalFile = "0g57k71bssf81yba6xf9fcxlys8m5ax5kvrs4gvckahf5ihdxds6"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ attoparsec attoparsec-iso8601 base bytestring containers hashable @@ -107263,6 +110046,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-api-data_0_3_7_2" = 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, uuid-types + }: + mkDerivation { + pname = "http-api-data"; + version = "0.3.7.2"; + sha256 = "10kcpxl9m1q2dl4z2ig6ysrhrdmdg35skfh8kwx0h7f0n7d6wlb8"; + 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 + ]; + 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 { @@ -107281,16 +110092,16 @@ self: { , 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 + , random, stm, streaming-commons, text, time, transformers, zlib }: mkDerivation { pname = "http-client"; - version = "0.5.7.1"; - sha256 = "19cvnnfcjj2m3pgs6ivyjs21rw9wx5ynarh6hvb27a76cscai2fy"; + version = "0.5.9"; + sha256 = "0bccpvinzc7z5v83grjzvd3g3kdz2q5h2206l7x9jh4bvz9prblf"; 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 + ghc-prim http-types mime-types network network-uri random stm streaming-commons text time transformers ]; testHaskellDepends = [ @@ -107526,6 +110337,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-conduit_2_3_0" = 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.0"; + sha256 = "0z9158a27g6kg7vbhkiw6icb2wgzb3lhsifgg5yh6wph5cd40fx4"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-conduit-browser" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring , case-insensitive, conduit, containers, cookie, data-default @@ -107962,6 +110803,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-reverse-proxy_0_5_0" = callPackage + ({ mkDerivation, async, base, blaze-builder, bytestring + , case-insensitive, conduit, conduit-extra, containers + , data-default-class, hspec, http-client, http-conduit, http-types + , lifted-base, monad-control, network, resourcet, streaming-commons + , text, transformers, wai, wai-logger, warp, word8 + }: + mkDerivation { + pname = "http-reverse-proxy"; + version = "0.5.0"; + sha256 = "10j58i0xkbf84ypk5q8pxz2a85kk24s4xqhkprr6j12d4hx1zl6i"; + libraryHaskellDepends = [ + async base blaze-builder bytestring case-insensitive conduit + conduit-extra containers data-default-class http-client http-types + lifted-base monad-control network resourcet streaming-commons text + transformers wai wai-logger word8 + ]; + testHaskellDepends = [ + base blaze-builder bytestring conduit conduit-extra hspec + http-conduit http-types lifted-base network resourcet + streaming-commons transformers wai warp + ]; + 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 ({ mkDerivation, base, HTTP, mime, network, network-uri, text, unix , url, utf8-string @@ -108088,14 +110957,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "http-types_0_11" = callPackage + "http-types_0_12" = callPackage ({ mkDerivation, array, base, bytestring, case-insensitive, doctest , hspec, QuickCheck, quickcheck-instances, text }: mkDerivation { pname = "http-types"; - version = "0.11"; - sha256 = "08w30rf1i7kbh2j1iajqmj6yhhmglnb8kjggc8kdni3xahhrgcss"; + version = "0.12"; + sha256 = "1fb7hn8d4zkf1q0kyj7p02js15n4mw48bbr43bym9v5v8xj3lyk3"; libraryHaskellDepends = [ array base bytestring case-insensitive text ]; @@ -108554,6 +111423,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hunit-dejafu_1_0_0_0" = callPackage + ({ mkDerivation, base, dejafu, exceptions, HUnit }: + mkDerivation { + pname = "hunit-dejafu"; + version = "1.0.0.0"; + sha256 = "1xsfv8pdkmyplggzk0k17j1y10kbjrvb86izsnc9k2w0lmd1j6ji"; + 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 = stdenv.lib.platforms.none; + }) {}; + "hunit-gui" = callPackage ({ mkDerivation, base, cairo, gtk, haskell98, HUnit }: mkDerivation { @@ -108646,6 +111528,7 @@ self: { homepage = "http://github.com/hunt-framework/"; description = "A search and indexing engine"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hunt-server" = callPackage @@ -108670,6 +111553,7 @@ self: { homepage = "http://github.com/hunt-framework"; description = "A search and indexing engine server"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hunt-server-cli" = callPackage @@ -108694,6 +111578,7 @@ 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;}; @@ -109000,6 +111885,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-fingertree" = callPackage + ({ mkDerivation, base, deepseq, HUnit, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "hw-fingertree"; + version = "0.1.0.0"; + sha256 = "0hh1f9m92s53254a2bk3h4i77girf8nni8rmyrd0ljramn4hiz55"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ + base deepseq HUnit QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + description = "Generic finger-tree structure, with example instances"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "hw-fingertree-strict" = callPackage + ({ mkDerivation, base, hedgehog, hspec, HUnit, hw-hspec-hedgehog + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "hw-fingertree-strict"; + version = "0.1.0.0"; + sha256 = "02bgqcjjhxpzd5nql50abbbjlg5pan2wy1dhdwc2br87n3jhx90x"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + homepage = "https://github.com/githubuser/hw-fingertree-strict#readme"; + description = "Generic strict finger-tree structure"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hw-hedgehog" = callPackage ({ mkDerivation, base, hedgehog, vector }: mkDerivation { @@ -109154,8 +112075,8 @@ self: { }: mkDerivation { pname = "hw-kafka-client"; - version = "2.3.0"; - sha256 = "0nrymgfp2kgfhizi5niaa08n56b1zsypy1vk9in9i0k39kxfkd3n"; + version = "2.3.1"; + sha256 = "0sjr3xqpx47lwzm6kk1rjinc9k39i9zjm74160ly9i68gnjgx69i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109469,6 +112390,27 @@ self: { 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 ({ mkDerivation, aeson, attoparsec, base, bytestring, hedis, hspec , hspec-contrib, HUnit, text, time, uuid @@ -109547,6 +112489,7 @@ self: { homepage = "https://github.com/srijs/hwsl2"; description = "Hashing with SL2"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hwsl2-bytevector" = callPackage @@ -109559,6 +112502,7 @@ self: { homepage = "https://github.com/srijs/hwsl2-haskell-bytevector"; description = "A hashed byte-vector based on algebraic hashes and finger trees"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hwsl2-reducers" = callPackage @@ -109573,6 +112517,7 @@ self: { homepage = "https://github.com/srijs/hwsl2-reducers"; description = "Semigroup and Reducer instances for Data.Hash.SL2"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hx" = callPackage @@ -109974,14 +112919,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; @@ -110502,10 +113447,8 @@ self: { }: mkDerivation { pname = "hyphenation"; - version = "0.7"; - sha256 = "0l1yvfdkkgba91pzncy399hv65pdipb9p78v2j9g0sdkmb1anq9s"; - revision = "2"; - editedCabalFile = "0bf147dfnp8lw4kmscgkmd4pnawzv0yc63hhjr7sjvk5xyyvb5mq"; + version = "0.7.1"; + sha256 = "1h5i07v2zlka29dj4zysc47p747j88x6z4zm3zwcr5i8yirm0p52"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ @@ -110516,7 +113459,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 @@ -110974,8 +113917,8 @@ self: { pname = "identicon"; version = "0.2.2"; sha256 = "0qzj2063sh7phbqyxqxf96avz1zcwd1ry06jdqxwkg55q3yb8y9n"; - revision = "1"; - editedCabalFile = "0jlm9cmw0ycbyifab7bzkmykj8w7vn2wyc6pfadfjrhb76zyvcxr"; + revision = "2"; + editedCabalFile = "0shj211pvba5cfgs1vy9f8jd84by8j4mprk4yvhv4ia1kl6dq4mr"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring JuicyPixels ]; testHaskellDepends = [ @@ -111090,17 +114033,16 @@ self: { , 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; @@ -111110,11 +114052,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 = [ @@ -111375,8 +114317,8 @@ self: { }: mkDerivation { pname = "ihaskell"; - version = "0.9.0.1"; - sha256 = "1xfp0pzxsfcz8h4f27fqvbc6pprwz45cgq5sa393z3wqy17ni4lq"; + version = "0.9.0.2"; + sha256 = "0pa366b4vn5hc9ymd4g1pr4dsffvk80x9c8yq4d1pf4jngjfayql"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -111407,8 +114349,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 ]; @@ -111435,8 +114377,8 @@ 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"; @@ -111450,8 +114392,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 @@ -111468,8 +114410,8 @@ self: { }: mkDerivation { pname = "ihaskell-diagrams"; - version = "0.3.1.0"; - sha256 = "18q7m6xrshn1ixn0j75bdvpgvjq63sic3dfjzcz9zk73zmvpj4qz"; + version = "0.3.1.1"; + sha256 = "1c6a469ymfcjmf4larh1sh6qzaxgq260r55vzx78irh036k5h0lc"; libraryHaskellDepends = [ active base bytestring diagrams diagrams-cairo diagrams-lib directory ihaskell text @@ -111493,12 +114435,25 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "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"; @@ -111530,8 +114485,8 @@ 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 ]; @@ -111547,8 +114502,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 @@ -111577,12 +114532,12 @@ 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; @@ -111614,8 +114569,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 @@ -111802,8 +114757,8 @@ self: { }: mkDerivation { pname = "imap"; - version = "0.3.0.4"; - sha256 = "021ya9pkf8q1nk805ck5hhm06q9lnp22d78hr0nz112xbxm5rqkw"; + version = "0.3.0.5"; + sha256 = "1wkm6agp0gsqg8lqfqp7sm0aq64426lpfw56nmnzvfk1hkq2gwmp"; libraryHaskellDepends = [ attoparsec base bytestring connection containers derive either exceptions hslogger list-t network pipes random rolling-queue stm @@ -111881,6 +114836,93 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "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 = "imj-base"; + version = "0.1.0.2"; + sha256 = "1b42xqzbgr47r2rkhy9299p68z9imgx19xc1d5rvfc3qyg8ciph2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base imj-prelude mtl primitive random terminal-size + text time vector vector-algorithms + ]; + 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; + }) {}; + + "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 @@ -112076,8 +115118,8 @@ self: { }: mkDerivation { pname = "importify"; - version = "1.0"; - sha256 = "1cwi1mgd4dn8iinhxk8wq00v93g20clpidw86yyzdmz64rk0k31b"; + version = "1.0.1"; + sha256 = "1snm75p3p3nvjclqis6qglb17gr0pm2dw0i980jpzrqm3n3kciy3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112146,6 +115188,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;}; @@ -112171,6 +115214,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 { @@ -112192,8 +115250,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 ]; @@ -112326,8 +115384,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 @@ -112451,8 +115509,8 @@ 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"; @@ -112692,8 +115750,8 @@ self: { }: mkDerivation { pname = "inflections"; - version = "0.4.0.0"; - sha256 = "1m42sigx621yzd6sznaas6917skyw8lf5ynfcjd87jybhv2r9g2k"; + version = "0.4.0.1"; + sha256 = "1vc04afp5lvh5drs4pf6djmkn80513h4phkw5gs4g4d37h3d3jg2"; libraryHaskellDepends = [ base exceptions megaparsec text unordered-containers ]; @@ -112750,6 +115808,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "influxdb_1_2_2_3" = 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 { + pname = "influxdb"; + version = "1.2.2.3"; + sha256 = "14454644vlkyd27ywhsvkczxdxdwqkl917zcb51ay68gdnrrwm1i"; + isLibrary = true; + isExecutable = true; + 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 http-client HUnit mtl tasty tasty-hunit tasty-quickcheck + tasty-th 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 ({ mkDerivation, base, containers, csv, highlighting-kate , http-conduit, monad-logger, pandoc, persistent @@ -112859,6 +115949,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "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 + }: + mkDerivation { + pname = "inline-c"; + version = "0.5.6.1"; + sha256 = "0kpbwrri9idllwd7gfamghrdrz16zqjphmb3cp5nq160dxz73brd"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base binary bytestring containers cryptohash + 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 + unordered-containers vector + ]; + 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" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers, gsl , gslcblas, hashable, hspec, mtl, parsec, parsers, QuickCheck @@ -112885,6 +116004,19 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) gsl; gslcblas = null;}; + "inline-c-cpp_0_1_0_0" = callPackage + ({ mkDerivation, base, inline-c, template-haskell }: + mkDerivation { + pname = "inline-c-cpp"; + version = "0.1.0.0"; + sha256 = "0iba77p2ncxbg5sb4ks8f3lgp6zdnjhzvrr2ap3yg49is5b9f5rf"; + libraryHaskellDepends = [ base inline-c template-haskell ]; + testHaskellDepends = [ base ]; + description = "Lets you embed C++ code into Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "inline-c-cpp" = callPackage ({ mkDerivation, base, hspec, inline-c, safe-exceptions , template-haskell @@ -112924,8 +116056,8 @@ self: { }: mkDerivation { pname = "inline-java"; - version = "0.7.1"; - sha256 = "000qzhjg2qah379dlhshgxqzm4mslcv6d5cwqycvx8q3hxginv08"; + version = "0.7.2"; + sha256 = "0hfjgkv8shi3zhjx7jkcwqyglrh5hrc11zf58ykhwxjhzhj4f05b"; libraryHaskellDepends = [ base bytestring Cabal directory filepath ghc jni jvm language-java mtl process template-haskell temporary text @@ -112937,9 +116069,9 @@ self: { }) {}; "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 @@ -112947,16 +116079,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 @@ -113004,6 +116135,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;}; @@ -113016,8 +116148,8 @@ self: { pname = "insert-ordered-containers"; version = "0.2.1.0"; sha256 = "1612f455dw37da9g7bsd1s5kyi84mnr1ifnjw69892amyimi47fp"; - revision = "3"; - editedCabalFile = "0ik4n32rvamxvlp80ixjrbhskivynli7b89s4hk6401bcy3ykp3g"; + revision = "4"; + editedCabalFile = "0ls5rm5hg2lqp2m6bfssa30y72x8xyyl7izvwr3w804dpa9fvwrm"; libraryHaskellDepends = [ aeson base base-compat hashable lens semigroupoids semigroups text transformers unordered-containers @@ -113028,7 +116160,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; }) {}; @@ -113079,6 +116211,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "inspection-testing_0_2" = callPackage + ({ mkDerivation, base, containers, ghc, mtl, template-haskell + , transformers + }: + mkDerivation { + pname = "inspection-testing"; + version = "0.2"; + sha256 = "0dnnsmzi6k548fgyigzmif26g1yia8m5aqaf7fxj06171i6fihx2"; + libraryHaskellDepends = [ + base containers ghc mtl template-haskell transformers + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/nomeata/inspection-testing"; + description = "GHC plugin to do inspection testing"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "inspector-wrecker" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive , connection, data-default, http-client, http-client-tls @@ -113292,6 +116442,8 @@ self: { pname = "integer-logarithms"; version = "1.0.2"; sha256 = "0w5mhak181zi6qr5h2zbcs9ymaqacisp9jwk99naz6s8zz5rq1ii"; + revision = "1"; + editedCabalFile = "0sccd0d6qrcm3a7nni5lqv40g5m5knf965z4skkgbyyhb3z6qsq8"; libraryHaskellDepends = [ array base ghc-prim integer-gmp ]; testHaskellDepends = [ base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck @@ -113680,8 +116832,8 @@ self: { }: mkDerivation { pname = "intricacy"; - version = "0.7.1"; - sha256 = "1byc6k4d5wcwls96zg12xq6kz4fzp9zmr0wcsk92iv2qpg0ra6ji"; + version = "0.7.1.1"; + sha256 = "1s947b71r0m3f81w8sid2cwgh9j16bxsmlpi498rzxajq32cd5yk"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -113702,13 +116854,13 @@ self: { }: mkDerivation { pname = "intrinsic-superclasses"; - version = "0.2.0.0"; - sha256 = "0bx8igqwpyhs1q8rhyxhc5389nx49ynfq08bis30x9gdq209dqih"; + 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 implementation of the Intrinsic Superclasses Proposal"; + description = "A quasiquoter for better instance deriving and default methods"; license = stdenv.lib.licenses.mit; }) {}; @@ -113719,8 +116871,8 @@ self: { }: mkDerivation { pname = "intro"; - version = "0.3.0.1"; - sha256 = "0yc163r255w7df0hjly30bh5dqgx38f1z5lk3x3i7jh93j97cpn0"; + version = "0.3.1.0"; + sha256 = "14kl6nx62qkm19fjn593m62iy4myjwg94yyr38kkbna438n5wpns"; libraryHaskellDepends = [ base binary bytestring containers deepseq dlist extra hashable mtl safe text transformers unordered-containers writer-cps-mtl @@ -113847,10 +116999,8 @@ self: { }: mkDerivation { pname = "invertible"; - version = "0.2.0.2"; - sha256 = "1a45hgsz46rqx2bfi0cgnf443pr28ik2rqi2f745q2qr41pvdqgf"; - revision = "1"; - editedCabalFile = "1jbk0mcn66j2931yka1923j7k45jgv6174q8rr3plidyn8fgm2hg"; + version = "0.2.0.3"; + sha256 = "0pckhl1nv6w66k3ll9q1bwbmzl2rpbwk6c3xkm7dscxzjzw43qwf"; libraryHaskellDepends = [ base haskell-src-meta invariant lens partial-isomorphisms semigroupoids template-haskell transformers TypeCompose @@ -114077,6 +117227,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 { @@ -114184,35 +117348,8 @@ self: { }: mkDerivation { pname = "ip"; - version = "1.1.0"; - sha256 = "0a5dc019jmkx77kk3jmgvk79ffigam38fanjwajaqsxy5ysp5xyf"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring hashable primitive text vector - ]; - testHaskellDepends = [ - attoparsec base bytestring doctest 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; - }) {}; - - "ip_1_1_1" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion - , doctest, hashable, HUnit, primitive, QuickCheck - , quickcheck-classes, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, vector - }: - mkDerivation { - pname = "ip"; - version = "1.1.1"; - sha256 = "150gbl7589w1a1imqn8qh5g9ar68bkkx0ifiab5zf0gvxgkiz4jd"; + version = "1.1.2"; + sha256 = "16vjbcrjpvs4wh89r4k3d5hpkklvcvrk50qjnx67bsi2jjhcn0aj"; libraryHaskellDepends = [ aeson attoparsec base bytestring hashable primitive text vector ]; @@ -114426,8 +117563,8 @@ self: { }: mkDerivation { pname = "ipython-kernel"; - version = "0.9.0.0"; - sha256 = "04byvmf4n55sdanw2lg5hicp2h7ivn2620wybd8i43hgcckx1ach"; + version = "0.9.0.1"; + sha256 = "0nzl5zcl03cdp0l6idscp648n64qjnhvfyj2j47fiiy1fkz133s7"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -114481,8 +117618,8 @@ self: { }: mkDerivation { pname = "irc-client"; - version = "1.0.0.1"; - sha256 = "0qg4bvl82wwm7jlrxsmc4aw51rfdygq8qzm6x7j4121av5wbk095"; + version = "1.0.1.0"; + sha256 = "0c0vzmzpryjfv22kxinnqjf7rkj51dz7shi1gn8ivgcmnhf9hl57"; libraryHaskellDepends = [ base bytestring conduit connection containers contravariant exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale @@ -114671,8 +117808,8 @@ self: { }: mkDerivation { pname = "ircbot"; - version = "0.6.5.1"; - sha256 = "1cam9f7ppxj7yh1am0qjkh8b19haggrqdmkd26xik1ymn7nq9iyd"; + version = "0.6.5.2"; + sha256 = "06is6hbk1992brbjrrjsqbv221h9c3syq0v1bah953sczg3a99jk"; libraryHaskellDepends = [ base bytestring containers directory filepath irc mtl network parsec random SafeSemaphore stm time unix @@ -114705,6 +117842,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "iri" = callPackage + ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring + , contravariant, 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 + }: + mkDerivation { + pname = "iri"; + version = "0.2"; + sha256 = "0rldjjfdrg5sv96aig5y4yb13633yy3dcxq659i2drmipyll8iw0"; + libraryHaskellDepends = [ + attoparsec base base-prelude bug bytestring contravariant ip + profunctors ptr punycode semigroups template-haskell text + text-builder th-lift th-lift-instances unordered-containers vector + vector-builder + ]; + 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 @@ -115467,6 +118631,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 { @@ -116225,14 +119402,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "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 = "jml-web-service"; + version = "0.1.0"; + sha256 = "1gs3qmcx87wh7372a4sa3g5f4w1lbyvd8iwr1w5pay21f0kcgnxk"; + libraryHaskellDepends = [ + base bytestring clock data-default http-types monad-logger + optparse-applicative prometheus-client prometheus-metrics-ghc + protolude text wai wai-extra warp + ]; + 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" = callPackage ({ mkDerivation, base, bytestring, choice, constraints, containers , cpphs, deepseq, inline-c, jdk, singletons }: mkDerivation { pname = "jni"; - version = "0.5.0"; - sha256 = "0sjyhf9pdzm1rvsw8lhxap293kgb72ihag1kcwdp5lq1qjkf9y1j"; + version = "0.5.1"; + sha256 = "0lrgj5dxhn7amzjw7gsqxg0gh91nxh1j4vmb4j2f5r8y3m8nwq4a"; libraryHaskellDepends = [ base bytestring choice constraints containers deepseq inline-c singletons @@ -116453,6 +119651,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "js-jquery_3_3_1" = callPackage + ({ mkDerivation, base, HTTP }: + mkDerivation { + pname = "js-jquery"; + version = "3.3.1"; + sha256 = "16q68jzbs7kp07dnq8cprdcc8fd41rim38039vg0w4x11lgniq70"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base HTTP ]; + doCheck = false; + homepage = "https://github.com/ndmitchell/js-jquery#readme"; + description = "Obtain minified jQuery code"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "jsaddle" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , bytestring, containers, deepseq, filepath, ghc-prim, http-types @@ -116892,8 +120106,8 @@ self: { }: mkDerivation { pname = "json-feed"; - version = "0.0.2"; - sha256 = "0ka8g2d3hn8z122k8r7gxs8m72s4ys46j6s2yc2ys045r1fhzlc1"; + version = "1.0.0"; + sha256 = "06h9qji4cnzqw4nmxs6dka7ywhz8jr56v5pcb3dlvganjg3s0gdx"; libraryHaskellDepends = [ aeson base bytestring mime-types network-uri tagsoup text time ]; @@ -117087,8 +120301,8 @@ self: { pname = "json-rpc-client"; version = "0.2.5.0"; sha256 = "177lrw5m9dxdk6mcay0f92rwyih8q7znwb8m6da6r3zsn30gajak"; - revision = "2"; - editedCabalFile = "0d070nv5kyplqpch98cfbcd5nxa24q3hrfjzpwkkvngqn6j0g6pi"; + revision = "3"; + editedCabalFile = "0hi2im3k7hpz3rasap90fvik3x5ibb7dd38sr1zsy7wsjkhk7zs4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117112,8 +120326,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 @@ -117161,8 +120375,8 @@ self: { pname = "json-schema"; version = "0.7.4.1"; sha256 = "15kwgpkryd865nls9zm6ya6jzmiygsb537ij7ps39dzasqbnl3an"; - revision = "11"; - editedCabalFile = "0jnlgkr1dikkcy4ln942c14lmpj49287b74dqcc5rd6sgxcm7xq2"; + revision = "12"; + editedCabalFile = "0x3cvndfshy4sd66m2xilyp876kvmgw5flagawamwis6hs8pfdi2"; libraryHaskellDepends = [ aeson base containers generic-aeson generic-deriving mtl scientific text time unordered-containers vector @@ -117585,8 +120799,8 @@ self: { }: mkDerivation { pname = "judy"; - version = "0.3.0"; - sha256 = "17fblav2npg47kn2dq82lcpf299igd91pi0ynffklf5hr8dw70zl"; + version = "0.4.0"; + sha256 = "115991jvp9gg9iy3n8p8y0y39x236v17g5xqchmlfsja1nx9hbzc"; libraryHaskellDepends = [ base bytestring ghc-prim ]; librarySystemDepends = [ Judy ]; testHaskellDepends = [ base hspec QuickCheck ]; @@ -117602,8 +120816,8 @@ self: { }: mkDerivation { pname = "juicy-gcode"; - version = "0.1.0.3"; - sha256 = "0czb1vb1nwn1wzx52vpvnpki2kfwwb775wg512rn46snm5wibvzv"; + version = "0.1.0.4"; + sha256 = "1nf30901jv226n7cpnbkqdh51gpmkzri79m271afzsgya3cs9gi5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -117717,8 +120931,8 @@ self: { }: mkDerivation { pname = "jvm"; - version = "0.4.0.1"; - sha256 = "0zazz893fxzh8hdc2k2irg0l5ic2v2h7z2cb60ngiarvrr07hpvl"; + version = "0.4.1"; + sha256 = "1mwhp5a4ykwcwr7h3j6803fy558q93cdkazqhck9dg67cgx7iyjr"; libraryHaskellDepends = [ base bytestring choice constraints distributed-closure exceptions jni singletons text vector @@ -118042,6 +121256,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "kan-extensions_5_1" = callPackage + ({ mkDerivation, adjunctions, array, base, comonad, containers + , contravariant, distributive, fail, free, mtl, profunctors + , semigroupoids, tagged, transformers, transformers-compat + }: + mkDerivation { + pname = "kan-extensions"; + version = "5.1"; + sha256 = "019jyrilk97i5bj8v044ig03m66h02q4b073m1fksrk7y9c8wgqr"; + libraryHaskellDepends = [ + adjunctions array base comonad containers contravariant + distributive fail free mtl profunctors semigroupoids tagged + transformers transformers-compat + ]; + homepage = "http://github.com/ekmett/kan-extensions/"; + description = "Kan extensions, Kan lifts, the Yoneda lemma, and (co)density (co)monads"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "kangaroo" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -118301,6 +121535,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "katip-elasticsearch_0_4_0_4" = callPackage + ({ 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 + }: + mkDerivation { + pname = "katip-elasticsearch"; + version = "0.4.0.4"; + sha256 = "0zg0f5czqff9zd0rnkj68bmxmizrl01q4wbvz43hj5j8mj0jzybj"; + 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 + ]; + testHaskellDepends = [ + aeson base bloodhound bytestring containers http-client http-types + katip lens lens-aeson quickcheck-instances scientific stm tagged + tasty tasty-hunit tasty-quickcheck text time transformers + unordered-containers vector + ]; + benchmarkHaskellDepends = [ + aeson base bloodhound criterion deepseq random text + unordered-containers uuid + ]; + homepage = "https://github.com/Soostone/katip"; + description = "ElasticSearch scribe for the Katip logging framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "katip-syslog" = callPackage ({ mkDerivation, aeson, base, bytestring, hsyslog, katip , string-conv, text @@ -118365,6 +121632,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "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 @@ -118469,6 +121758,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;}; @@ -119020,6 +122310,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "keys_3_12" = callPackage + ({ mkDerivation, array, base, comonad, containers, free, hashable + , semigroupoids, semigroups, tagged, transformers + , transformers-compat, unordered-containers + }: + mkDerivation { + pname = "keys"; + version = "3.12"; + sha256 = "0may9nrlfji2mmypl9q47lcpg4r793hmm4i22x7j4l6zz67sggyl"; + revision = "1"; + editedCabalFile = "1lbl62y3alhpgkf2knh4q5pcby54kblb68cbx2i77fbdwz8jbka7"; + libraryHaskellDepends = [ + array base comonad containers free hashable semigroupoids + semigroups tagged transformers transformers-compat + unordered-containers + ]; + homepage = "http://github.com/ekmett/keys/"; + description = "Keyed functors and containers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "keysafe" = callPackage ({ mkDerivation, aeson, argon2, async, base, bloomfilter , bytestring, containers, deepseq, directory, disk-free-space @@ -119156,20 +122468,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"; @@ -119448,6 +122761,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;}; @@ -119796,8 +123110,8 @@ self: { ({ mkDerivation, base, hspec, servant, servant-foreign, text }: mkDerivation { pname = "lackey"; - version = "0.4.6"; - sha256 = "162nlb96l7mzyr449lw15c3l8ljx9821bnijlzcq47vyrjlh2ym5"; + version = "0.4.7"; + sha256 = "026w7wmz71g9796mx6mdn3s1nxrds631kacn423zdvchridm0398"; libraryHaskellDepends = [ base servant servant-foreign text ]; testHaskellDepends = [ base hspec servant servant-foreign text ]; homepage = "https://github.com/tfausak/lackey#readme"; @@ -119805,6 +123119,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "lackey_1_0_0" = callPackage + ({ mkDerivation, base, hspec, servant, servant-foreign, text }: + mkDerivation { + pname = "lackey"; + version = "1.0.0"; + sha256 = "0spgcfg2py1ff1zak211xsgmccpg56c9bbv14xsgjdig9k6cfyz0"; + libraryHaskellDepends = [ base servant servant-foreign text ]; + testHaskellDepends = [ base hspec servant servant-foreign text ]; + homepage = "https://github.com/tfausak/lackey#readme"; + description = "Generate Ruby clients from Servant APIs"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lagrangian" = callPackage ({ mkDerivation, ad, base, hmatrix, HUnit, nonlinear-optimization , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -120073,7 +123401,7 @@ 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 ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-core" = callPackage @@ -120100,6 +123428,7 @@ self: { homepage = "https://wiki.haskell.org/Lambdabot"; description = "Lambdabot core functionality"; license = "GPL"; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "lambdabot-haskell-plugins" = callPackage @@ -120113,8 +123442,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 @@ -120126,6 +123455,7 @@ self: { homepage = "https://wiki.haskell.org/Lambdabot"; description = "Lambdabot Haskell plugins"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-irc-plugins" = callPackage @@ -120144,6 +123474,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 @@ -120654,6 +123985,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-ats" = callPackage + ({ mkDerivation, alex, ansi-terminal, ansi-wl-pprint, array, base + , composition-prelude, criterion, deepseq, happy, hspec + , hspec-dirstream, lens, recursion-schemes, system-filepath + , unordered-containers + }: + mkDerivation { + pname = "language-ats"; + version = "0.1.1.6"; + sha256 = "1463z1xpjdm6cziib10w7x7n5ch77mjgy73h7rik3ybawj8njswd"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + ansi-terminal ansi-wl-pprint array base composition-prelude deepseq + lens recursion-schemes unordered-containers + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ + base hspec hspec-dirstream system-filepath + ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Parser and pretty-printer for ATS"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "language-bash" = callPackage ({ mkDerivation, base, parsec, pretty, process, QuickCheck, tasty , tasty-expected-failure, tasty-hunit, tasty-quickcheck @@ -120889,6 +124244,33 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "language-docker_2_0_1" = 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-dockerfile" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath, free , Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck @@ -121180,6 +124562,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 @@ -121457,7 +124852,7 @@ self: { homepage = "http://lpuppet.banquise.net/"; description = "Tools to parse and evaluate the Puppet DSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "x86_64-linux" ]; }) {}; "language-python" = callPackage @@ -121936,6 +125331,8 @@ self: { pname = "lattices"; version = "1.7"; sha256 = "1p5bqr3a8haib4wsdzy08z61jv8cq91n7rzj7wanh1nwp3r2n1nc"; + revision = "1"; + editedCabalFile = "1nsc77nnh8cvfw8f58g0w5mjamy4iivkadyyaj3yzawfr8jbxi53"; libraryHaskellDepends = [ base base-compat containers deepseq hashable semigroupoids tagged universe-base universe-reverse-instances unordered-containers @@ -121950,6 +125347,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lattices_1_7_1" = callPackage + ({ mkDerivation, base, base-compat, containers, deepseq, hashable + , QuickCheck, quickcheck-instances, semigroupoids, tagged, tasty + , tasty-quickcheck, transformers, universe-base + , universe-instances-base, universe-reverse-instances + , unordered-containers + }: + mkDerivation { + pname = "lattices"; + version = "1.7.1"; + sha256 = "0bcv28dazaz0n166jbd579vim0hr4c20rmg0s34284fdr6p50m3x"; + libraryHaskellDepends = [ + base base-compat containers deepseq hashable semigroupoids tagged + universe-base universe-reverse-instances unordered-containers + ]; + testHaskellDepends = [ + base base-compat containers QuickCheck quickcheck-instances tasty + tasty-quickcheck transformers universe-instances-base + unordered-containers + ]; + homepage = "http://github.com/phadej/lattices/"; + description = "Fine-grained library for constructing and manipulating lattices"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "launchpad-control" = callPackage ({ mkDerivation, array, base, containers, hmidi, mtl, transformers }: @@ -122762,6 +126185,50 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "lens_4_16" = callPackage + ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring + , Cabal, cabal-doctest, call-stack, comonad, containers + , contravariant, criterion, deepseq, directory, distributive + , doctest, exceptions, filepath, free, generic-deriving, ghc-prim + , hashable, HUnit, kan-extensions, mtl, nats, parallel, profunctors + , QuickCheck, reflection, semigroupoids, semigroups, simple-reflect + , tagged, template-haskell, test-framework, test-framework-hunit + , test-framework-quickcheck2, test-framework-th, text + , th-abstraction, transformers, transformers-compat + , unordered-containers, vector, void + }: + mkDerivation { + pname = "lens"; + version = "4.16"; + sha256 = "16wz3s62zmnmis7xs9jahyc7b75090b96ayk98c3gvzmpg7bx54z"; + revision = "1"; + editedCabalFile = "0pgjpixph8idgf2wp8z25cbq6jf2bddigfs7r7nbln2a1v8yli1y"; + setupHaskellDepends = [ base Cabal cabal-doctest filepath ]; + libraryHaskellDepends = [ + array base base-orphans bifunctors bytestring call-stack comonad + containers contravariant distributive exceptions filepath free + ghc-prim hashable kan-extensions mtl parallel profunctors + reflection semigroupoids semigroups tagged template-haskell text + th-abstraction transformers transformers-compat + unordered-containers vector void + ]; + testHaskellDepends = [ + base bytestring containers deepseq directory doctest filepath + generic-deriving HUnit mtl nats parallel QuickCheck semigroups + simple-reflect test-framework test-framework-hunit + test-framework-quickcheck2 test-framework-th text transformers + unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base bytestring comonad containers criterion deepseq + generic-deriving transformers unordered-containers vector + ]; + homepage = "http://github.com/ekmett/lens/"; + description = "Lenses, Folds and Traversals"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lens-accelerate" = callPackage ({ mkDerivation, accelerate, base, lens }: mkDerivation { @@ -122783,8 +126250,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 @@ -122864,6 +126331,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"; @@ -122906,8 +126375,10 @@ self: { ({ 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"; @@ -123102,6 +126573,34 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "lentil_1_0_10_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip + , filepath, hspec, natural-sort, optparse-applicative, parsec + , pipes, regex-tdfa, semigroups, terminal-progress-bar, text + , transformers + }: + mkDerivation { + pname = "lentil"; + version = "1.0.10.0"; + sha256 = "0s7qxd65bjw0h709q9igb5q4jls80wc9jzh5s8ic7ww11f0m5hm7"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-wl-pprint base csv directory filemanip filepath natural-sort + optparse-applicative parsec pipes regex-tdfa semigroups + terminal-progress-bar text transformers + ]; + testHaskellDepends = [ + ansi-wl-pprint base csv directory filemanip filepath hspec + natural-sort optparse-applicative parsec pipes regex-tdfa + semigroups terminal-progress-bar text transformers + ]; + homepage = "http://www.ariis.it/static/articles/lentil/page.html"; + description = "frugal issue tracker"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lenz" = callPackage ({ mkDerivation, base, base-unicode-symbols, hs-functors , transformers @@ -124116,6 +127615,9 @@ 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"; @@ -124189,8 +127691,8 @@ self: { }: mkDerivation { pname = "licensor"; - version = "0.2.1"; - sha256 = "1is281xsrfdh2vsank07j1gw634iadz0sp8ssabpfqgnb3a98rvz"; + version = "0.2.2"; + sha256 = "0kxcsw1ds9q8apsmhbnwcz76kxfhabv08b8myadbflwm4wj0szlz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -124245,8 +127747,8 @@ self: { }: mkDerivation { pname = "lifted-async"; - version = "0.9.3.2"; - sha256 = "0c8y6m1kpkviq2zi1d2889hbzh7k46rly4mvmfkrzam45fqggrcj"; + version = "0.9.3.3"; + sha256 = "1gqd4ih72mky1s97120yx9gmabaxb1l54b3jwijsl8fxng5djdxf"; libraryHaskellDepends = [ async base constraints lifted-base monad-control transformers-base ]; @@ -124269,6 +127771,8 @@ self: { pname = "lifted-base"; version = "0.2.3.11"; sha256 = "1ass00wfa91z5xp2xmm97xrvwm7j5hdkxid5cqvr3xbwrsgpmi4f"; + revision = "1"; + editedCabalFile = "0vrik0j1xv2yp759ffa7jb7q838z4wglnbgsrja97mx0dwsbavnx"; libraryHaskellDepends = [ base monad-control transformers-base ]; testHaskellDepends = [ base HUnit monad-control test-framework test-framework-hunit @@ -125331,8 +128835,8 @@ self: { }: mkDerivation { pname = "liquid-fixpoint"; - version = "0.7.0.5"; - sha256 = "081z90vcqrmfjc3jna419a8ziif2rcrag4ba4h902lrjh5hpvpaj"; + version = "0.7.0.6"; + sha256 = "1sbvnj2as93dywh43zcsb23hr1mqlia5gr2sw08ynqh48dcx181p"; configureFlags = [ "-fbuild-external" ]; isLibrary = true; isExecutable = true; @@ -125361,17 +128865,16 @@ 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, hashable, hpc, hscolour, liquid-fixpoint + , located-base, mtl, optparse-applicative, parsec, pretty, process + , QuickCheck, stm, syb, tagged, tasty, tasty-ant-xml, tasty-hunit + , tasty-rerun, template-haskell, temporary, text, text-format + , th-lift, time, transformers, unordered-containers, vector, z3 }: mkDerivation { pname = "liquidhaskell"; - version = "0.8.2.0"; - sha256 = "17fm1jn00wns6nkwvxm96j85jwiiaqmw3s7w4ilkslzgr9wslp8f"; + version = "0.8.2.2"; + sha256 = "0rq0fs5ydwiqi2f3pn9q4d1agbmz0z46ws2q5w8y7lrsb2mr4zf3"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -125384,8 +128887,8 @@ self: { 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 @@ -125794,26 +129297,25 @@ 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, stm, stm-split + , strict, transformers, unix, utility-ht, wx, wxcore }: mkDerivation { pname = "live-sequencer"; - version = "0.0.6"; - sha256 = "0gsbixz0cmy9cajqj4s8iaf8mjk42162sd39bpcdp4xqyxfj5g63"; + version = "0.0.6.1"; + sha256 = "0g099sm4q7n0aiqc8qznqfcqvlnc25kzvz31qf49xblah89dzx0n"; 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 - transformers unix utility-ht wx wxcore + data-accessor data-accessor-transformers explicit-exception html + httpd-shed midi midi-alsa network network-uri non-empty parsec + pathtype pretty process stm stm-split strict transformers unix + utility-ht wx wxcore ]; homepage = "http://www.haskell.org/haskellwiki/Live-Sequencer"; description = "Live coding of MIDI music"; @@ -125841,6 +129343,7 @@ self: { executableHaskellDepends = [ base ]; description = "Liveplotting"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {andromeda = null;}; @@ -126140,34 +129643,8 @@ self: { }: mkDerivation { pname = "llvm-hs"; - version = "5.1.0"; - sha256 = "1l6r409zviis70qd3w8ysycy479q0sqjd85kd6z8b0ngjvq1y5ik"; - setupHaskellDepends = [ base Cabal containers ]; - libraryHaskellDepends = [ - array attoparsec base bytestring containers exceptions llvm-hs-pure - 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 - ]; - homepage = "http://github.com/llvm-hs/llvm-hs/"; - description = "General purpose LLVM bindings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {llvm-config = null;}; - - "llvm-hs_5_1_2" = callPackage - ({ mkDerivation, array, attoparsec, base, bytestring, Cabal - , containers, exceptions, llvm-config, llvm-hs-pure, mtl - , pretty-show, QuickCheck, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, temporary, transformers, utf8-string - }: - mkDerivation { - pname = "llvm-hs"; - version = "5.1.2"; - sha256 = "01ayla3a119cir40zjwhgyn0dwrq7cw2waydhadk7rayk6pfk3fc"; + version = "5.1.3"; + sha256 = "0swpc431w16g9yip5w67kd77ilc6yqqk526h7sl5n4sn7xlc9nnc"; setupHaskellDepends = [ base Cabal containers ]; libraryHaskellDepends = [ array attoparsec base bytestring containers exceptions llvm-hs-pure @@ -126191,8 +129668,8 @@ self: { }: mkDerivation { pname = "llvm-hs-pretty"; - version = "0.1.0.0"; - sha256 = "1p16vhxx7w1hdb130c9mls45rwyq8hix1grnwdj92rbrqbjwk7l3"; + version = "0.2.0.0"; + sha256 = "133kyksbp88q0wavp3wdjg69h9fpwi7nq626nvikdy46cf7lgklh"; libraryHaskellDepends = [ array base bytestring llvm-hs-pure text wl-pprint-text ]; @@ -126207,35 +129684,14 @@ self: { }) {}; "llvm-hs-pure" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, mtl - , tasty, tasty-hunit, tasty-quickcheck, template-haskell - , transformers - }: - mkDerivation { - pname = "llvm-hs-pure"; - version = "5.1.0"; - sha256 = "0m4ahrh2d0h9vfky9852y99g1xwsi7s7qr3xxnbgnw8zci7966f5"; - libraryHaskellDepends = [ - attoparsec base bytestring containers mtl template-haskell - transformers - ]; - testHaskellDepends = [ - base containers mtl tasty tasty-hunit tasty-quickcheck transformers - ]; - 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_1" = 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.1"; - sha256 = "1b3gfmyd40knq3kbx4s3sk9d6aw2f5n81liywjfsxirl6vm8xrz5"; + version = "5.1.2"; + sha256 = "0m6r8l37151y5a7ad5bbb1xw5f18y4hm91ildmz10wnsmhx9kl64"; libraryHaskellDepends = [ attoparsec base bytestring containers fail mtl template-haskell transformers unordered-containers @@ -126247,7 +129703,6 @@ self: { homepage = "http://github.com/llvm-hs/llvm-hs/"; description = "Pure Haskell LLVM functionality (no FFI)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "llvm-ht" = callPackage @@ -126471,8 +129926,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"; @@ -126896,8 +130351,8 @@ self: { }: mkDerivation { pname = "log-warper"; - version = "1.8.2"; - sha256 = "0h2asypn5aw9w0npwygvsn5hl0sybdn6lg5kqs0dngk0wss87f3i"; + version = "1.8.3"; + sha256 = "1awblvxh6cncwlqacxb1wq4s77x79ncrz6dl81wgrbjjifwpf0xz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126907,7 +130362,7 @@ self: { vector yaml ]; executableHaskellDepends = [ - base markdown-unlit text universum yaml + base markdown-unlit mtl text universum yaml ]; testHaskellDepends = [ async base data-default directory filepath hspec HUnit @@ -126918,6 +130373,40 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "log-warper_1_8_6" = callPackage + ({ mkDerivation, aeson, ansi-terminal, async, base, containers + , data-default, deepseq, directory, filepath, fmt, hspec + , hspec-discover, HUnit, markdown-unlit, microlens, microlens-mtl + , microlens-platform, mmorph, monad-control, monad-loops, mtl + , QuickCheck, text, time, transformers, transformers-base + , universum, unix, unordered-containers, vector, yaml + }: + mkDerivation { + pname = "log-warper"; + version = "1.8.6"; + sha256 = "11lh26fkmyx5hzpjhjm1198g6gy1qpsix2srp1w7laim3kxbl4rb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base containers deepseq directory filepath fmt + microlens-platform mmorph monad-control monad-loops mtl text time + transformers transformers-base universum unix unordered-containers + vector yaml + ]; + executableHaskellDepends = [ + base markdown-unlit microlens mtl text universum yaml + ]; + testHaskellDepends = [ + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "log2json" = callPackage ({ mkDerivation, base, containers, json, parsec }: mkDerivation { @@ -127011,8 +130500,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 @@ -127045,6 +130534,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "logging-effect_1_2_2" = callPackage + ({ mkDerivation, async, base, bytestring, criterion, exceptions + , fast-logger, free, lifted-async, monad-control, monad-logger, mtl + , semigroups, stm, stm-delay, text, time, transformers + , transformers-base, wl-pprint-text + }: + mkDerivation { + pname = "logging-effect"; + version = "1.2.2"; + sha256 = "1p0czcwph777dncidsrn0nbrmhhv7f8c5ic86mnrkxj7hzym0dfw"; + libraryHaskellDepends = [ + async base exceptions free monad-control mtl semigroups stm + stm-delay text time transformers transformers-base wl-pprint-text + ]; + benchmarkHaskellDepends = [ + base bytestring criterion fast-logger lifted-async monad-logger + text time wl-pprint-text + ]; + homepage = "https://github.com/ocharles/logging-effect"; + description = "A mtl-style monad transformer for general purpose & compositional logging"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "logging-effect-extra" = callPackage ({ mkDerivation, base, logging-effect, logging-effect-extra-file , logging-effect-extra-handler, wl-pprint-text @@ -127217,8 +130730,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"; @@ -127528,6 +131041,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "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 @@ -127828,8 +131353,8 @@ self: { }: mkDerivation { pname = "lrucaching"; - version = "0.3.2"; - sha256 = "1vg6ip77vlqixj2ghvwm036yb4qhkif175k8gfd27nmr4w5rv2ns"; + version = "0.3.3"; + sha256 = "192a2zap1bmxa2y48n48rmngf18fr8k0az4a230hziv3g795yzma"; libraryHaskellDepends = [ base base-compat deepseq hashable psqueues vector ]; @@ -127899,6 +131424,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;}; @@ -127987,6 +131513,7 @@ self: { homepage = "http://www.leksah.org"; description = "Leksah tool kit"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {gtk3 = pkgs.gnome3.gtk;}; "ltl" = callPackage @@ -128112,6 +131639,21 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lucid-extras" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, directory, lucid , text @@ -128396,8 +131938,8 @@ self: { }: mkDerivation { pname = "lxd-client"; - version = "0.1.0.4"; - sha256 = "188n9qc7c4755wmp6w50x7rzkdrf8f31d7alxcp0qg28qvhq94hx"; + version = "0.1.0.5"; + sha256 = "1981q1b71xgmxlis2hydhzhcwcspyrwnllg3fdrajv7m9z1zlryc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128714,8 +132256,8 @@ self: { pname = "machines"; version = "0.6.3"; sha256 = "1kxypm26xxd30979yrg94pnaaj3yfn180ri3y4z2xsm2m5iyiliz"; - revision = "1"; - editedCabalFile = "045qh0qwjiyrwcfsfw9galhqr6w7c96zpg7fnib3jaw8509d53x5"; + revision = "2"; + editedCabalFile = "1k62b3h2xklv170wdxf607s4h7vmjjj4dscgnv54gfbwi224cysq"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ adjunctions base comonad containers distributive mtl pointed @@ -128923,22 +132465,22 @@ 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 + ({ 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, recursion-schemes-ext, tar, template-haskell , text, th-lift-instances, titlecase, zip-archive, zlib }: mkDerivation { pname = "madlang"; - version = "3.2.0.1"; - sha256 = "0ypca6yy8zvp0n0njqhm6az5xfaxjc91j4p39f3sn9dgd2ksbw27"; + version = "4.0.0.4"; + sha256 = "1rfax7s4sc63943izc1r0gk848ji0kxsjgsb81i2f6dc5860xkz9"; 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 @@ -128982,6 +132524,38 @@ 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, ekg-core @@ -129013,6 +132587,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "magicbane_0_2_0" = callPackage + ({ 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-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.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, EKG, fast-logger, wai-cli…"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "magico" = callPackage ({ mkDerivation, base, hmatrix, transformers, utility-ht }: mkDerivation { @@ -129873,13 +133478,13 @@ self: { ({ 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; hydraPlatforms = stdenv.lib.platforms.none; @@ -130689,35 +134294,38 @@ 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, 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 = "40400.0.0"; - sha256 = "1qp2d18lhf6j4gq67w1sd5alwhz5zlbmjp26apsvxbvcary0mb0a"; + version = "40600.0.0"; + sha256 = "0niha43l1p00af3qjkz5j43ksdl0a0sgagra584c8j34cl1f9akv"; 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 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 + 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; @@ -130733,8 +134341,8 @@ self: { }: mkDerivation { pname = "mattermost-api"; - version = "40400.0.0"; - sha256 = "1n5mv56srq171ql9n7gvpfma8mx9jb61w88ab72v99xhiid3ahdi"; + version = "40600.0.0"; + sha256 = "0s27n9a7s6bgbara2rzh689234ykl3vfpm84yg1nvc61wsrxbkql"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130760,8 +134368,8 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "40400.0.0"; - sha256 = "0kp36m2vf3zzfgibzs6kgai1bfsghxpzx7hpw0bywg1jpwqr95ka"; + version = "40600.0.0"; + sha256 = "0pfmf4ja4a7vc9bnr4kc604j0b8dmcm1ggddg4m64jf355mw6nxm"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; @@ -130929,6 +134537,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; @@ -131492,8 +135102,8 @@ self: { }: mkDerivation { pname = "mega-sdist"; - version = "0.3.0.5"; - sha256 = "1rdx74bxiwrcp0k8h8028b65nbcmgcbpg7jnzli91y8nzr2qql6c"; + version = "0.3.0.6"; + sha256 = "0cgak9hp1j9ybcpbqjs56pq7h9wn0my46mlx6nqv3fvidwdp5vl7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -131516,6 +135126,8 @@ self: { pname = "megaparsec"; version = "6.3.0"; sha256 = "15bhghiszm18acn1igmq6vgdlcvsvsx4dlkl2vg2ghy5qgyrqxsv"; + revision = "2"; + editedCabalFile = "1npxvydar8l68vfp3g0ir9cvq5vglf1z2a9q1h1mj438y0084f7v"; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq mtl parser-combinators scientific text transformers @@ -131530,6 +135142,33 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "megaparsec_6_4_0" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , criterion, deepseq, hspec, hspec-expectations, mtl + , parser-combinators, QuickCheck, scientific, text, transformers + , weigh + }: + mkDerivation { + pname = "megaparsec"; + version = "6.4.0"; + sha256 = "0h9azhs0dfrc359vrbd1jljrg3yfdbwd4p62cxqkn7mnh8913jpd"; + revision = "1"; + editedCabalFile = "1jzj3gb96skggngv69wibyx27bgng78dmlgv9i3lvz46z6bx8qzd"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers deepseq mtl + parser-combinators scientific text transformers + ]; + testHaskellDepends = [ + base bytestring containers hspec hspec-expectations mtl QuickCheck + scientific text transformers + ]; + benchmarkHaskellDepends = [ base criterion deepseq text weigh ]; + homepage = "https://github.com/mrkkrp/megaparsec"; + description = "Monadic parser combinators"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "meldable-heap" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -131549,14 +135188,14 @@ self: { }: mkDerivation { pname = "mellon-core"; - version = "0.8.0.2"; - sha256 = "0fl9pwh67diibj2ki75xcwylbhvw0nqn0b0azla4ndr3fxdgnh30"; + version = "0.8.0.4"; + sha256 = "03gh3ks6k3y11sga15bnknqw7j29kfhgw8zvfz87vgw5xlsva3j2"; libraryHaskellDepends = [ async base mtl time transformers ]; testHaskellDepends = [ async base doctest hlint hspec mtl 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; @@ -131566,11 +135205,11 @@ self: { ({ mkDerivation, base, hlint, hpio, mellon-core }: mkDerivation { pname = "mellon-gpio"; - version = "0.8.0.2"; - sha256 = "1dx31nyyi4gar2wlmmgfnqi48x4pzwh53q87xg8rrbghc9vfqygj"; + version = "0.8.0.4"; + sha256 = "0b12wvv11ny3rdrd8wg236zn8yy3szm85n7qjdyiiznx2jf33rm7"; libraryHaskellDepends = [ base hpio mellon-core ]; testHaskellDepends = [ base hlint ]; - homepage = "https://github.com/quixoftic/mellon/"; + homepage = "https://github.com/quixoftic/mellon#readme"; description = "GPIO support for mellon"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -131588,8 +135227,8 @@ self: { }: mkDerivation { pname = "mellon-web"; - version = "0.8.0.2"; - sha256 = "03awn8qcqn5iz5cd082cr6ap15zlbidp5l2aacz24m0fn5vdgjlf"; + version = "0.8.0.4"; + sha256 = "1fyd8vkdym9rm54dbcnn9821jdmbvdyl942339m6prnc2188hkcc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131610,7 +135249,7 @@ self: { 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; @@ -131890,8 +135529,8 @@ self: { }: mkDerivation { pname = "memory"; - version = "0.14.10"; - sha256 = "01i1nx83n5lspwdhkhhjxxcp9agf9y70547dzs5m8zl043jmd0z4"; + version = "0.14.11"; + sha256 = "0k6x58r3if8zbsgip8nr7lb77xf468qxlwqnmah8p313rxfg0k37"; libraryHaskellDepends = [ base basement bytestring deepseq foundation ghc-prim ]; @@ -131903,6 +135542,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "memory_0_14_14" = callPackage + ({ mkDerivation, base, basement, bytestring, deepseq, foundation + , ghc-prim, tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "memory"; + version = "0.14.14"; + sha256 = "03lnb7nqshddiwqbz1vpba7mb6l80nav896rr77vlp8m41b9h6qx"; + libraryHaskellDepends = [ + base basement bytestring deepseq foundation ghc-prim + ]; + testHaskellDepends = [ + base basement bytestring foundation tasty tasty-hunit + tasty-quickcheck + ]; + homepage = "https://github.com/vincenthz/hs-memory"; + description = "memory and related abstraction stuff"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "memorypool" = callPackage ({ mkDerivation, base, containers, transformers, unsafe, vector }: mkDerivation { @@ -131942,8 +135602,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 = [ @@ -132445,8 +136105,8 @@ self: { ({ 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."; @@ -132522,8 +136182,8 @@ self: { }: 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 ]; @@ -132553,8 +136213,8 @@ self: { ({ 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 ]; @@ -132583,23 +136243,6 @@ self: { }) {}; "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.0.0"; - sha256 = "1zs8pf154nmr7n38kwbd6n3g17j5khd6wdghk05nyv71fj9v7545"; - libraryHaskellDepends = [ - base bytestring http-api-data http-client http-client-tls - http-media mtl safe servant servant-client text time xml - ]; - description = "Bindings to the Microsoft Translator API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "microsoft-translator_0_1_1" = callPackage ({ mkDerivation, base, bytestring, http-api-data, http-client , http-client-tls, http-media, mtl, safe, servant, servant-client , text, time, xml @@ -132615,7 +136258,6 @@ self: { 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 @@ -133015,6 +136657,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "milena_0_5_2_1" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, digest, lens + , lifted-base, monad-control, mtl, murmur-hash, network, QuickCheck + , random, resource-pool, semigroups, tasty, tasty-hspec + , tasty-quickcheck, transformers, zlib + }: + mkDerivation { + pname = "milena"; + version = "0.5.2.1"; + sha256 = "1mylkqp8vha9gq7li5cir5h3i27zb573alxgxnvr1y938z2nimf2"; + libraryHaskellDepends = [ + base bytestring cereal containers digest lens lifted-base + monad-control mtl murmur-hash network random resource-pool + semigroups transformers zlib + ]; + testHaskellDepends = [ + base bytestring lens mtl network QuickCheck semigroups tasty + tasty-hspec tasty-quickcheck + ]; + homepage = "https://github.com/adamflott/milena.git#readme"; + description = "A Kafka client for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mime" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -133555,6 +137222,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "miso_0_12_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.12.0.0"; + sha256 = "08d50apwcyym4crdnly97j1vwl85p9a5fr606x1mj8729pd0pwjb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "missing-foreign" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -133730,22 +137418,24 @@ self: { "mmark" = callPackage ({ mkDerivation, aeson, base, case-insensitive, containers - , criterion, data-default-class, deepseq, email-validate, foldl - , hashable, hspec, hspec-megaparsec, html-entity-map, lucid + , 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 = "mmark"; - version = "0.0.3.0"; - sha256 = "13lfrs9pr3hyxsw2gmpwg4ggk2nqqnrn4cmllib7z5izalzps7jz"; + version = "0.0.4.0"; + sha256 = "05dslarsdfcp2im9w80ks52wzqcqq8ma23b69wdl8nyfbkmaj5ch"; + revision = "2"; + editedCabalFile = "1l2xljnasvgj3icc8dynsakyskd65c114gm4f94la3pv8ghcc3rg"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base case-insensitive containers data-default-class deepseq - email-validate foldl hashable html-entity-map lucid megaparsec - microlens microlens-th modern-uri mtl parser-combinators text - text-metrics unordered-containers yaml + 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 @@ -133757,47 +137447,68 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "mmark_0_0_3_1" = callPackage + "mmark_0_0_5_3" = callPackage ({ mkDerivation, aeson, base, case-insensitive, containers - , criterion, data-default-class, deepseq, email-validate, foldl - , hashable, hspec, hspec-megaparsec, html-entity-map, lucid + , 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 = "mmark"; - version = "0.0.3.1"; - sha256 = "0q6abmml27qww95hzpck4mjshaxhz3pmpzgxdbg8bnaaa6prv0jp"; + version = "0.0.5.3"; + sha256 = "0i5x3rpsq9diqb1nagnswzcgi0sj8jwp73xi46hfwjnc656r955k"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base case-insensitive containers data-default-class deepseq - email-validate foldl hashable html-entity-map lucid megaparsec - microlens microlens-th modern-uri mtl parser-combinators text - text-metrics unordered-containers yaml + 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/mrkkrp/mmark"; + homepage = "https://github.com/mmark-md/mmark"; description = "Strict markdown processor for writers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "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"; + 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, data-default-class, foldl, hspec, lucid - , mmark, modern-uri, text + , microlens, mmark, modern-uri, text }: mkDerivation { pname = "mmark-ext"; - version = "0.0.1.1"; - sha256 = "0wsilw9mlh77qvxgpzay09b8xfsjz3dbrabd1wvw0whwf2cnzpp7"; + version = "0.0.1.2"; + sha256 = "0f698yvlcbvq627advl832nlzl975jx462zg7pd8h43chdbj5qar"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base data-default-class foldl lucid mmark modern-uri text + base data-default-class foldl lucid microlens mmark modern-uri text ]; testHaskellDepends = [ base data-default-class hspec lucid mmark text @@ -133807,6 +137518,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mmark-ext_0_2_0_0" = callPackage + ({ mkDerivation, base, foldl, hspec, lucid, microlens, mmark + , modern-uri, skylighting, text + }: + mkDerivation { + pname = "mmark-ext"; + version = "0.2.0.0"; + sha256 = "1ccfdjsn8z80x2m5p9q17r2hf14zj63nkxkrg9s7knwr1j08gj1k"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base foldl lucid microlens mmark modern-uri skylighting text + ]; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mmorph" = callPackage ({ mkDerivation, base, mtl, transformers, transformers-compat }: mkDerivation { @@ -133976,8 +137706,10 @@ self: { }: mkDerivation { pname = "modern-uri"; - version = "0.1.2.0"; - sha256 = "0n8ihy43mc3m0j70nbr86bd1kgzbkcb0dx9g3ql40v66i66kfb29"; + version = "0.1.2.1"; + sha256 = "10y3ppcd4d987khk9jxaa0clkjssmvip2kpq63z8xcigvdiil91h"; + revision = "1"; + editedCabalFile = "1kgwf0y5p5imrkjga53yna4sy6jqk5x3v0zks24c4vb52mi2a19n"; libraryHaskellDepends = [ base bytestring containers contravariant deepseq exceptions megaparsec profunctors QuickCheck template-haskell text @@ -133993,6 +137725,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "modern-uri_0_2_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, contravariant + , criterion, deepseq, exceptions, hspec, hspec-megaparsec + , megaparsec, mtl, profunctors, QuickCheck, reflection, tagged + , template-haskell, text, weigh + }: + mkDerivation { + pname = "modern-uri"; + version = "0.2.0.0"; + sha256 = "01wq2w2kfy9zlpsh8pwcs61xjy3xdwbz6nd0skb6g3bigrqs2w8z"; + revision = "1"; + editedCabalFile = "1svq0ndnv5jfz3nhxwdx4vxim5sahfcryj5ik4l4x704jsjbl4bm"; + libraryHaskellDepends = [ + base bytestring containers contravariant deepseq exceptions + megaparsec mtl profunctors QuickCheck reflection tagged + template-haskell text + ]; + testHaskellDepends = [ + base bytestring hspec hspec-megaparsec megaparsec QuickCheck text + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq megaparsec text weigh + ]; + 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 @@ -134692,8 +138453,8 @@ self: { }: mkDerivation { pname = "monad-logger"; - version = "0.3.26"; - sha256 = "0p7mdiv0n4wizcam2lw143szs584yzs0bq9lfrn90pgvz0q7k1ia"; + version = "0.3.28.1"; + sha256 = "15gpr6wgyqfiz780p8l4lfxmxnanpviyvkba20hdsx92czq64cgr"; libraryHaskellDepends = [ base blaze-builder bytestring conduit conduit-extra exceptions fast-logger lifted-base monad-control monad-loops mtl resourcet stm @@ -135220,8 +138981,8 @@ self: { ({ 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"; @@ -135704,8 +139465,8 @@ self: { }: mkDerivation { pname = "mongoDB"; - version = "2.3.0"; - sha256 = "024w6183nnaq30r9jnfiy5pjv422mnnkawqdgzgzafngi7sad322"; + version = "2.3.0.1"; + sha256 = "1snr144yk05p5l9ck5gfs4zawg2l8fd8slmzxsrd29w2x6pk7iqv"; libraryHaskellDepends = [ array base base16-bytestring base64-bytestring binary bson bytestring conduit conduit-extra containers cryptohash @@ -135725,6 +139486,38 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "mongoDB_2_3_0_2" = callPackage + ({ mkDerivation, array, base, base16-bytestring, base64-bytestring + , binary, bson, bytestring, conduit, conduit-extra, containers + , criterion, cryptohash, data-default-class, hashtables, hspec + , lifted-base, monad-control, mtl, network, nonce, old-locale + , parsec, pureMD5, random, random-shuffle, resourcet, tagged, text + , time, tls, transformers, transformers-base + }: + mkDerivation { + pname = "mongoDB"; + version = "2.3.0.2"; + sha256 = "10gl9116hkjvm12ysgr1pi1vlk4d9jbkxgrcql6qhyvpsgv7s7bd"; + libraryHaskellDepends = [ + array base base16-bytestring base64-bytestring binary bson + bytestring conduit conduit-extra containers cryptohash + data-default-class hashtables lifted-base monad-control mtl network + nonce parsec pureMD5 random random-shuffle resourcet tagged text + time tls transformers transformers-base + ]; + testHaskellDepends = [ base hspec mtl old-locale text time ]; + benchmarkHaskellDepends = [ + array base base16-bytestring base64-bytestring binary bson + bytestring containers criterion cryptohash hashtables lifted-base + monad-control mtl network nonce parsec random random-shuffle text + transformers-base + ]; + homepage = "https://github.com/mongodb-haskell/mongodb"; + description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mongodb-queue" = callPackage ({ mkDerivation, base, data-default, hspec, lifted-base , monad-control, mongoDB, network, text, transformers @@ -135816,15 +139609,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.5.0"; - sha256 = "1zrn7wp938di4mdc8q0z4imgg2hky7ap98ralzf8rdgqfrrvfpa6"; + version = "1.0.8.1"; + sha256 = "0d9r6z3a8gkhl1j5yq8hjg5wcndi5yixxm9xwbrf4z6pgdwr04lr"; libraryHaskellDepends = [ base bytestring containers hashable split text transformers unordered-containers vector vector-algorithms @@ -135833,37 +139626,12 @@ self: { base bytestring containers foldl hspec HUnit QuickCheck semigroups text transformers unordered-containers vector ]; - benchmarkHaskellDepends = [ base criterion mwc-random vector ]; + 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; }) {}; - "mono-traversable_1_0_6_0" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion, foldl - , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split - , text, transformers, unordered-containers, vector - , vector-algorithms - }: - mkDerivation { - pname = "mono-traversable"; - version = "1.0.6.0"; - sha256 = "1as3s9aj9pc4hmi588lard2r1p716hbr18arjzlh3442z8z0610m"; - libraryHaskellDepends = [ - base bytestring containers hashable split text transformers - unordered-containers vector vector-algorithms - ]; - testHaskellDepends = [ - base bytestring containers foldl hspec HUnit QuickCheck semigroups - text transformers unordered-containers vector - ]; - benchmarkHaskellDepends = [ base criterion mwc-random vector ]; - homepage = "https://github.com/snoyberg/mono-traversable#readme"; - description = "Type classes for mapping, folding, and traversing monomorphic containers"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "mono-traversable-instances" = callPackage ({ mkDerivation, base, comonad, containers, dlist, dlist-instances , mono-traversable, semigroupoids, semigroups, transformers @@ -136074,6 +139842,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;}; @@ -136097,6 +139866,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;}; @@ -136187,6 +139957,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 { @@ -136268,8 +140051,8 @@ self: { }: mkDerivation { pname = "morte"; - version = "1.6.13"; - sha256 = "03vjkp3ngbdhv5ib7jwdwx23bklm32m3gmvq63r2cxagydl1267m"; + version = "1.6.14"; + sha256 = "1wrm982gxm8hg2x8srm5ibp2s8752apsz2ljlldway2n49cf2bsm"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -136401,21 +140184,21 @@ self: { "movie-monad" = callPackage ({ mkDerivation, base, filepath, gi-gdk, gi-gdkpixbuf, gi-glib - , gi-gobject, gi-gst, gi-gstvideo, gi-gtk, haskell-gi-base - , MissingH, network-uri, process, system-fileio, system-filepath - , text, time + , gi-gobject, gi-gst, gi-gstvideo, gi-gtk, haskell-gi + , haskell-gi-base, MissingH, network-uri, process, system-fileio + , system-filepath, text, time }: mkDerivation { pname = "movie-monad"; - version = "0.0.2.0"; - sha256 = "0cf4hrakz6cw1c3izrrckhjjhn8hd8cn9gfh41v2xi8kcn6bbciw"; + version = "0.0.4.0"; + sha256 = "0wdnf8gm3h7ykdmnwc7jw1y0rs27izzh1kz2gkgi3g2dyllh7sq3"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ base filepath gi-gdk gi-gdkpixbuf gi-glib gi-gobject gi-gst - gi-gstvideo gi-gtk haskell-gi-base MissingH network-uri process - system-fileio system-filepath text time + gi-gstvideo gi-gtk haskell-gi haskell-gi-base MissingH network-uri + process system-fileio system-filepath text time ]; homepage = "https://github.com/lettier/movie-monad"; description = "Plays videos using GStreamer and GTK+"; @@ -136993,13 +140776,13 @@ 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; }) {}; @@ -137169,15 +140952,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; }) {}; @@ -138246,6 +142047,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mwc-probability_2_0_2" = callPackage + ({ mkDerivation, base, mwc-random, primitive, transformers }: + mkDerivation { + pname = "mwc-probability"; + 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"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mwc-random" = callPackage ({ mkDerivation, base, HUnit, math-functions, primitive, QuickCheck , statistics, test-framework, test-framework-hunit @@ -138683,6 +142497,19 @@ 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; + }) {}; + "n-m" = callPackage ({ mkDerivation, base, HSH, mtl, process }: mkDerivation { @@ -138803,12 +142630,46 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "nakadi-client_0_4_1_0" = 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 + , random, resourcet, retry, safe-exceptions, say, scientific, split + , stm, tasty, tasty-hunit, template-haskell, text, time + , transformers, unordered-containers, uuid, vector, wai, warp + }: + mkDerivation { + pname = "nakadi-client"; + version = "0.4.1.0"; + sha256 = "08f2gp9fvc6dlsqb6z50rpfb8rjnlwv2001q5aixlkslhhh0jhr7"; + 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 template-haskell + text time transformers 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 stm tasty tasty-hunit template-haskell text + time transformers unordered-containers uuid vector wai warp + ]; + homepage = "https://github.com/mtesseract/nakadi-haskell#readme"; + description = "Client library for the Nakadi Event Broker"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "namecoin-update" = callPackage ({ mkDerivation, aeson, attoparsec, base, lens, text, wreq }: mkDerivation { pname = "namecoin-update"; - version = "0.2.1.0"; - sha256 = "1vz4n57xk8zbyqiwsm69mls31f36ng0bh9av5axi3rq7car2jlxz"; + version = "0.2.2.0"; + sha256 = "09g3mjvmfgynlna17nvynh1gwzkski0kg07d82zvdmd7j8qvdrvg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base lens text wreq ]; @@ -139052,10 +142913,11 @@ 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; }) {}; @@ -139302,8 +143164,8 @@ self: { pname = "natural-transformation"; version = "0.4"; sha256 = "1by8xwjc23l6pa9l4iv7zp82dykpll3vc3hgxk0pgva724n8xhma"; - revision = "2"; - editedCabalFile = "1j90pd1zznr18966axskad5w0kx4dvqg62r65rmw1ihqwxm1ndix"; + revision = "3"; + editedCabalFile = "0z6vmdgz9r2fbgzh2xvrw6cy5h7m1jv911jah615s6xgr52smhrf"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base containers quickcheck-instances tasty tasty-quickcheck @@ -139361,8 +143223,8 @@ self: { }: mkDerivation { pname = "nbt"; - version = "0.6"; - sha256 = "0lcnxlj0cfrw840saay3lxyjmc00rxhksqa6ccyhg8119y20gcjd"; + version = "0.7"; + sha256 = "10iby4sg50la1k635ygdqf5h50rvidl0k871brdjs8b9hi1vlv5r"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring cereal text ]; testHaskellDepends = [ @@ -139596,8 +143458,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 ]; @@ -139700,6 +143562,22 @@ 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 @@ -139801,6 +143679,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;}; @@ -140146,17 +144025,23 @@ self: { }) {}; "netwire-input-glfw" = callPackage - ({ mkDerivation, base, containers, GLFW-b, mtl, netwire-input, stm + ({ mkDerivation, array, base, bytestring, containers, directory + , filepath, GLFW-b, mtl, netwire, netwire-input, OpenGL, stm + , transformers }: mkDerivation { pname = "netwire-input-glfw"; - version = "0.0.6"; - sha256 = "01nxv6bkwhafk5dg85lg5ggcvqlhv2kiwnm75zbscp002pwmq2fx"; + version = "0.0.7"; + sha256 = "1rsvhwxrr00qpff7adwiwci5fl6hbv8r8mvxhkq3az235w9pll8g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers GLFW-b mtl netwire-input stm ]; + executableHaskellDepends = [ + array base bytestring containers directory filepath GLFW-b mtl + netwire netwire-input OpenGL transformers + ]; homepage = "https://www.github.com/Mokosha/netwire-input-glfw"; description = "GLFW instance of netwire-input"; license = stdenv.lib.licenses.mit; @@ -140226,10 +144111,10 @@ self: { }: mkDerivation { pname = "network"; - version = "2.6.3.2"; - sha256 = "1dn092zfqmxfbzln6d0khka4gizzjivf2yja9w9hwb5g9q3pfi1m"; + version = "2.6.3.3"; + sha256 = "1xa0jif154i26a465bp2wpvsm891zhy98y5zp9zdbl39m6q6hrkp"; revision = "1"; - editedCabalFile = "17234sy0vqic8g9wg8gmfmc0by50scjwbdk8bkcl9kjf3fvs4nyx"; + editedCabalFile = "0nh9sbbyj3jdm2ybffsxa3c4mdywy3wq48sg8d5ylkr2s6cmbbpz"; libraryHaskellDepends = [ base bytestring unix ]; testHaskellDepends = [ base bytestring doctest HUnit test-framework test-framework-hunit @@ -140332,6 +144217,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "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; + maintainers = with stdenv.lib.maintainers; [ alunduil ]; + }) {}; + "network-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, bytestring, enclosed-exceptions , exceptions, hspec, lifted-base, monad-control, mtl, network @@ -140681,17 +144589,20 @@ 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"; 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/"; @@ -141097,21 +145008,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; + maintainers = with stdenv.lib.maintainers; [ alunduil ]; }) {}; "network-uri-static" = callPackage @@ -141181,8 +145094,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 ]; @@ -141367,13 +145280,15 @@ self: { }) {}; "newtype-generics" = callPackage - ({ mkDerivation, base, hspec, HUnit, transformers }: + ({ mkDerivation, base, hspec, hspec-discover, HUnit, transformers + }: mkDerivation { pname = "newtype-generics"; version = "0.5.1"; sha256 = "1cm9v5agz6dmqd2ijwl1llgabihk49zjvx0wxrvhlmdfj6b44gr7"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ base hspec HUnit ]; + testToolDepends = [ hspec-discover ]; description = "A typeclass and set of functions for working with newtypes, with generics support"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -141483,15 +145398,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.1.0"; + sha256 = "1d3xz1jsvnr0rg5y0rpkrlwzng589abq8w5ylg7d5pmr75ih2a0n"; 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"; @@ -141539,21 +145455,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"; @@ -141696,8 +145613,8 @@ self: { }: mkDerivation { pname = "nix-deploy"; - version = "1.0.0"; - sha256 = "0qvf83kai3fa2s5xf6az2j1gxhiannvw569fnd2lylhcmjffl3j5"; + version = "1.0.2"; + sha256 = "07cirn4gaaarw5va128f63jp2q7jlghmg4kclya4fvapx963qbya"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -141739,8 +145656,8 @@ self: { }: mkDerivation { pname = "nix-diff"; - version = "1.0.0"; - sha256 = "1dds8r7ld64zl6hba8z3dij1kiacg6xqxlv85nhm2lf6lm9257i8"; + version = "1.0.1"; + sha256 = "0xk8ggng32czhy4wxgzw7g28xj18jcbncmfshviqlw17rccrm2fx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -141771,17 +145688,17 @@ self: { }) {}; "nix-paths" = callPackage - ({ mkDerivation, base, nix, nix-hash, process }: + ({ mkDerivation, base, nix, process }: mkDerivation { pname = "nix-paths"; version = "1.0.1"; sha256 = "1y09wl1ihxmc9p926g595f70pdcsx78r3q5n5rna23lpq8xicdxb"; libraryHaskellDepends = [ base process ]; - libraryToolDepends = [ nix nix-hash ]; + libraryToolDepends = [ nix ]; homepage = "https://github.com/peti/nix-paths"; description = "Knowledge of Nix's installation directories"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) nix; nix-hash = null;}; + }) {inherit (pkgs) nix;}; "nixfromnpm" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring @@ -141846,8 +145763,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 ]; @@ -141928,6 +145845,7 @@ 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;}; @@ -142191,6 +146109,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;}; @@ -142369,6 +146288,8 @@ self: { pname = "normalization-insensitive"; version = "2.0.1"; sha256 = "00nbha984yg4lxnpkyd3q0gbywf7xn5z5ixy3cr9ksn05w6blm1v"; + revision = "1"; + editedCabalFile = "1zaqbgrfy33y2d9ix178mhyysyffsia0hbmg77gcjmvv32b44m6j"; libraryHaskellDepends = [ base bytestring deepseq hashable text unicode-transforms ]; @@ -142583,6 +146504,28 @@ 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; + }) {}; + "nsis" = callPackage ({ mkDerivation, base, directory, process, transformers, uniplate }: @@ -142637,6 +146580,7 @@ self: { homepage = "https://github.com/zjhmale/ntha"; description = "A tiny statically typed functional programming language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nthable" = callPackage @@ -143023,8 +146967,8 @@ self: { }: mkDerivation { pname = "numhask"; - version = "0.1.3"; - sha256 = "1jycpcdidhc8zh64j67pb87drggmwdmja5klwm1wbdcvnsw4nzm6"; + version = "0.1.4.0"; + sha256 = "1324d4fqsjidrq3i0n869a5xq1w1nl2q2lpcf7bpb5a7wgmsfmgj"; libraryHaskellDepends = [ base protolude QuickCheck tasty tasty-quickcheck ]; @@ -143038,20 +146982,47 @@ self: { }) {}; "numhask-array" = callPackage - ({ mkDerivation, adjunctions, base, deepseq, distributive, doctest - , ghc-typelits-natnormalise, numhask, protolude, singletons + ({ mkDerivation, accelerate, accelerate-llvm + , accelerate-llvm-native, adjunctions, base, deepseq, dimensions + , distributive, doctest, ghc-typelits-natnormalise, numhask + , protolude, QuickCheck, singletons, tasty, tasty-quickcheck , typelits-witnesses, vector }: mkDerivation { pname = "numhask-array"; - version = "0.0.2"; - sha256 = "0gbmwkpxdp1flzyndsqc5zgm2nlrpc8q4s0d2z8pws8g2gyymyj9"; + version = "0.1.0.0"; + sha256 = "0m8xgdizpw80dxhbdx45bhn8m71a4lk2zy6ckczrly02g272mqxv"; libraryHaskellDepends = [ - adjunctions base deepseq distributive ghc-typelits-natnormalise - numhask protolude singletons typelits-witnesses vector + accelerate accelerate-llvm accelerate-llvm-native adjunctions base + deepseq dimensions distributive ghc-typelits-natnormalise numhask + protolude QuickCheck singletons typelits-witnesses vector ]; - testHaskellDepends = [ base doctest numhask ]; - homepage = "https://github.com/tonyday567/numhask-array"; + testHaskellDepends = [ + base doctest numhask QuickCheck tasty tasty-quickcheck + ]; + homepage = "https://github.com/tonyday567/numhask-array#readme"; + description = "See readme.md"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "numhask-histogram" = callPackage + ({ mkDerivation, base, containers, doctest, foldl, HUnit, numhask + , numhask-range, protolude, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, tdigest + }: + mkDerivation { + pname = "numhask-histogram"; + version = "0.0.0.1"; + sha256 = "1a7kd8va59rzsfsxin5m785ihpka3al53kfv16cz9p7kw9bjpanf"; + libraryHaskellDepends = [ + base containers foldl numhask numhask-range protolude tdigest + ]; + testHaskellDepends = [ + base doctest HUnit protolude QuickCheck tasty tasty-hunit + tasty-quickcheck + ]; + homepage = "https://github.com/tonyday567/numhask-histogram#readme"; description = "See readme.md"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -143059,19 +147030,17 @@ self: { "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.2"; - sha256 = "0rz2h4glfrc0h26f5idfv7966b95fm96bai1iwzkz0f3xmfvy8a0"; + 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; @@ -143146,7 +147115,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "nvim-hs" = callPackage + "nvim-hs_0_2_4" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, cereal , cereal-conduit, conduit, conduit-extra, containers, data-default , deepseq, directory, dyre, exceptions, filepath, foreign-store @@ -143183,6 +147152,46 @@ self: { 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" = 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, void + }: + mkDerivation { + pname = "nvim-hs"; + version = "0.2.5"; + sha256 = "1qiypd9cn80zjk38p572rbyfsrlff6a2qwvfj7ck3jdj5vv1dq2b"; + 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 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 + process QuickCheck resourcet setenv stm streaming-commons + template-haskell text time time-locale-compat transformers + transformers-base utf8-string + ]; + homepage = "https://github.com/neovimhaskell/nvim-hs"; + description = "Haskell plugin backend for neovim"; + license = stdenv.lib.licenses.asl20; }) {}; "nvim-hs-contrib" = callPackage @@ -143230,8 +147239,8 @@ self: { }: mkDerivation { pname = "nvvm"; - version = "0.8.0.1"; - sha256 = "0nvxsmi5xr7n4ifizqd76bn7990yq5dysn0xk2pvyvd1ddazsrz1"; + version = "0.8.0.2"; + sha256 = "05px0bxqqxph5ancvklg1fmp6p7c15vghzrwq8alsfjg7lvrd933"; setupHaskellDepends = [ base Cabal cuda directory filepath template-haskell ]; @@ -143294,6 +147303,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "o-clock" = callPackage + ({ mkDerivation, base, deepseq, gauge, ghc-prim, hedgehog + , markdown-unlit, tasty, tasty-hedgehog, tasty-hspec, tiempo + , time-units, transformers, type-spec + }: + mkDerivation { + pname = "o-clock"; + version = "0.0.0"; + sha256 = "0nswlj9anwmhl6vgw5gpdd924niiw15plwb46wwmzrv7jsmbaiyj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ghc-prim transformers ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base 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 @@ -143474,28 +147507,6 @@ self: { }) {}; "objective" = callPackage - ({ mkDerivation, base, containers, either, 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"; - revision = "2"; - editedCabalFile = "12zyr9szwr8g8lqs20sgmi8dqvjfwnb5c4r14lamv6nn5mvs0xl2"; - libraryHaskellDepends = [ - base containers either exceptions free hashable monad-skeleton mtl - profunctors template-haskell transformers transformers-compat - unordered-containers void witherable - ]; - homepage = "https://github.com/fumieval/objective"; - description = "Composable objects"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "objective_1_1_2" = callPackage ({ mkDerivation, base, containers, exceptions, free, hashable , monad-skeleton, mtl, profunctors, template-haskell, transformers , transformers-compat, unordered-containers, void, witherable @@ -143504,6 +147515,8 @@ self: { pname = "objective"; version = "1.1.2"; sha256 = "0i36r3ygwpzb57ga0jjkp9rzikpsp15l777dclp7yi1zvqz2ikrg"; + revision = "1"; + editedCabalFile = "039j3xac9ish0yk4w04bmip6g9p6ndfd9ngh46ya125ms4nhmyj4"; libraryHaskellDepends = [ base containers exceptions free hashable monad-skeleton mtl profunctors template-haskell transformers transformers-compat @@ -143512,7 +147525,6 @@ self: { homepage = "https://github.com/fumieval/objective"; description = "Composable objects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "observable-sharing" = callPackage @@ -143537,8 +147549,8 @@ self: { }: mkDerivation { pname = "ocaml-export"; - version = "0.1.1.0"; - sha256 = "1rj2pq87i9jlg74pxqc6npsskfv1p8my1572kmmb98nd7a2qxdp1"; + version = "0.5.0.0"; + sha256 = "0xp4aiqn5p1c3frl83axjchbs5dwh4ibqqyiixvi0i1wpbi9fqka"; libraryHaskellDepends = [ aeson base bytestring containers directory file-embed filepath formatting hspec-golden-aeson mtl QuickCheck @@ -143669,6 +147681,17 @@ self: { }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXinerama; inherit (pkgs) mesa; ovr = null; systemd = null;}; + "odbc" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "odbc"; + version = "0.0.0"; + sha256 = "1yyp21j0kmq7mc80z3vpmra16kbqb35pzblir1gppiz0wh1wmgpb"; + doHaddock = false; + description = "TBA"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "oden-go-packages" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, text , unordered-containers @@ -143686,6 +147709,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "odpic-raw" = callPackage + ({ mkDerivation, base, c2hs, hspec, odpic, QuickCheck, text }: + mkDerivation { + pname = "odpic-raw"; + version = "0.1.7"; + sha256 = "0hwb43si56adsgzjlqlncw3hiq901w2g5d41hjv5b8gyhbhzzkmz"; + libraryHaskellDepends = [ base text ]; + librarySystemDepends = [ odpic ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/leptonyu/odpic-raw#readme"; + 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 @@ -143738,13 +147776,13 @@ self: { }: mkDerivation { pname = "ogmarkup"; - version = "3.1.0"; - sha256 = "0za23qz85r9xmw57gxi84x2zy8ddxwcdphawyfzkmxqny9kplx1r"; + version = "4.0"; + sha256 = "06bbh2ylxw33hik1k4ykvmb74qkcn1zda1n1m20lzcp2ji37fp8k"; 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; @@ -144075,8 +148113,8 @@ self: { }: 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 @@ -144148,6 +148186,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "online_0_2_1_0" = callPackage + ({ mkDerivation, base, doctest, foldl, formatting, numhask + , optparse-generic, perf, protolude, scientific, tasty, tdigest + , text, vector, vector-algorithms + }: + mkDerivation { + pname = "online"; + version = "0.2.1.0"; + sha256 = "16s1hcf2jk8lzs3z0v2xp4jn2q6idzhqaksy97r64hcgnys7sylx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base foldl numhask protolude tdigest vector vector-algorithms + ]; + 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; + }) {}; + "only" = callPackage ({ mkDerivation, base, parsec, regex-compat }: mkDerivation { @@ -144425,8 +148488,8 @@ 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"; @@ -144457,8 +148520,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++" ]; @@ -144491,8 +148554,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 @@ -145220,8 +149283,8 @@ self: { }: mkDerivation { pname = "opn"; - version = "0.1.2"; - sha256 = "0x53kvcpbd9fh00zs8wdkb3xsl8hf1bsqgl83ci17di1jyg3m4ch"; + version = "0.1.3"; + sha256 = "17ysp1xzqbcr58ibzwf88bim58yyc309kf71jw66gn0brp0b0w1h"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -145266,8 +149329,8 @@ self: { }: mkDerivation { pname = "optimization"; - version = "0.1.7"; - sha256 = "1y490h96qvn9w3z360adbxmbcvw3zpirgfs02hbjkarxi13z4shn"; + version = "0.1.9"; + sha256 = "0v1bi97jvdnn4jfknsnayaqdawckh7xxcnkr5nwvxqnpckg89yyf"; libraryHaskellDepends = [ ad base distributive linear semigroupoids vector ]; @@ -146155,6 +150218,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "packcheck" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "packcheck"; + version = "0.1.1"; + sha256 = "10c822mx6vjf42d0lzi950s61s8hcw6451ckxq5g7wg4pavyr7zp"; + 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, optparse-applicative, process, semigroups, split, tar @@ -146280,8 +150357,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 ]; @@ -146535,8 +150612,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "2.0.5"; - sha256 = "0670fzvlgzcw9prswjyms49nlgbwbd2bj4xvhlr8had3yklml94i"; + version = "2.0.6"; + sha256 = "1vhj6splykksb1mkxv5cs0361nj12qn23a3y1i8j5dc637lkdwpj"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -146554,9 +150631,10 @@ self: { ]; 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 hslua pandoc-types process QuickCheck + tasty tasty-golden tasty-hunit tasty-quickcheck temporary text time + zip-archive ]; benchmarkHaskellDepends = [ base bytestring containers criterion text time @@ -146568,6 +150646,56 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "pandoc_2_1_1" = 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, 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.1.1"; + sha256 = "1dg97d74bqmq11bkh1ni92g4imcq45nh8y9ixwpk8pcafv401z7a"; + configureFlags = [ "-fhttps" "-f-trypandoc" ]; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + aeson aeson-pretty base 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 ]; + testHaskellDepends = [ + base base64-bytestring bytestring containers Diff directory + executable-path filepath 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 + ]; + doCheck = false; + 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 @@ -146577,8 +150705,8 @@ self: { }: mkDerivation { pname = "pandoc-citeproc"; - version = "0.12.1.1"; - sha256 = "1a6r7jiqzfgw3mbc6ii643x5nlfw4ds5zww559lbi97s7i4birh8"; + version = "0.12.2.5"; + sha256 = "1l58nbflcnlznc93qimkk7ghk2gv8kipf45zf88piqa2zys41yyx"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -146604,6 +150732,43 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pandoc-citeproc_0_14" = 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 + }: + mkDerivation { + pname = "pandoc-citeproc"; + version = "0.14"; + sha256 = "1pbbkfrvwr4qg1p6vdnpg1zlxj48r23bprz48k35jbriw1j6i452"; + 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 + ]; + testHaskellDepends = [ + aeson base 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 ({ mkDerivation, base, directory, filepath, pandoc-types, process }: @@ -146630,8 +150795,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.0.0"; - sha256 = "0fgds8i9fwxmfprbp4giv7qi4gzx373p07smfm7arpbimv239d6n"; + version = "0.3.0.1"; + sha256 = "0lhjbkgmd9hshi3lxvciwviknbbj8lyrzinzfxbwssgqrdzcaayn"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -146676,6 +150841,32 @@ self: { 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.2"; + sha256 = "05vf3fli3glq013c9w9bbjggndfwhjb1rqxqspxyfh8pi14sbj9v"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pandoc-filter-graphviz" = callPackage ({ mkDerivation, base, base16-bytestring, byteable, bytestring , containers, cryptonite, directory, filepath, pandoc, pandoc-types @@ -146724,8 +150915,8 @@ self: { }: mkDerivation { pname = "pandoc-include-code"; - version = "1.2.0.1"; - sha256 = "1qcmhdx47grgjydq0dzcz6iss247p0y8432bpw908ygr222gkqhp"; + version = "1.2.0.2"; + sha256 = "0mnk6ld2d1bka2wmz9718k8rfdbzhp4ym3axn4js4m0ka51w50h9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -146857,8 +151048,8 @@ self: { }: mkDerivation { pname = "pandoc-types"; - version = "1.17.3"; - sha256 = "0k6z5ixgpi7gm4wlpvy2j7zzv68xsqak7fhajrf0fb60dpn4ac0n"; + version = "1.17.3.1"; + sha256 = "0dhp5bcjl6605n2chiab5rp51zir3671gxkmwy34znh0s3vp85jb"; libraryHaskellDepends = [ aeson base bytestring containers deepseq ghc-prim QuickCheck syb transformers @@ -146966,6 +151157,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;}; @@ -148065,8 +152257,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "parser-combinators"; - version = "0.2.1"; - sha256 = "1iai2i4kr7f8fbvvm4xw4hqcwnv26g0gaglpcim9r36jmzhf2yna"; + version = "0.4.0"; + sha256 = "1azkz0a6ikym02s8wydjcklp7rz8k512bs4s9lp9g1g03m0yj95i"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/mrkkrp/parser-combinators"; description = "Lightweight package providing commonly useful parser combinators"; @@ -148128,23 +152320,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"; @@ -148393,9 +152583,9 @@ self: { "passman-core" = callPackage ({ mkDerivation, aeson, async, base, bcrypt, bytestring, conduit , conduit-extra, containers, cryptohash-md5, csv-conduit - , data-ordlist, directory, filepath, int-cast, memory - , passman-core-internal, QuickCheck, quickcheck-unicode, resourcet - , template-haskell, temporary, text, unix-compat, yaml + , data-ordlist, directory, filepath, int-cast, memory, QuickCheck + , quickcheck-unicode, resourcet, template-haskell, temporary, text + , unix-compat, yaml }: mkDerivation { pname = "passman-core"; @@ -148404,17 +152594,17 @@ self: { libraryHaskellDepends = [ aeson base bcrypt bytestring conduit conduit-extra containers cryptohash-md5 csv-conduit data-ordlist directory filepath int-cast - memory passman-core-internal resourcet text unix-compat yaml + memory resourcet text unix-compat yaml ]; testHaskellDepends = [ - async base conduit filepath passman-core-internal QuickCheck - quickcheck-unicode template-haskell temporary text yaml + async base conduit filepath QuickCheck quickcheck-unicode + template-haskell temporary text yaml ]; homepage = "https://github.com/PasswordManager/passman-core#readme"; description = "Deterministic password generator core"; license = stdenv.lib.licenses.gpl3; - broken = true; - }) {passman-core-internal = null;}; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; "passwords" = callPackage ({ mkDerivation, base, containers, MonadRandom, random }: @@ -148480,8 +152670,8 @@ self: { }: mkDerivation { pname = "patat"; - version = "0.6.0.0"; - sha256 = "0pf5baidncam2c2xjm5w4kd48210ng36xsj7wr81v2pwdxp18r7h"; + version = "0.6.1.0"; + sha256 = "1i6vql76j5439bwdd1z7haphgm4x82rh08s22fc70hmfzkrln733"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -149188,6 +153378,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;}; @@ -149744,6 +153935,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "perf_0_3_1_0" = callPackage + ({ mkDerivation, base, containers, doctest, foldl, formatting + , numhask, optparse-generic, protolude, rdtsc, scientific, tdigest + , text, time, vector + }: + mkDerivation { + pname = "perf"; + version = "0.3.1.0"; + sha256 = "1pr735gflp91ljfrlpba6il1l4zm260whdp4hc205jff0r0gv44c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers foldl numhask protolude rdtsc tdigest time + ]; + executableHaskellDepends = [ + base formatting numhask optparse-generic protolude scientific text + vector + ]; + 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; + }) {}; + "perfect-hash-generator" = callPackage ({ mkDerivation, base, containers, data-ordlist, directory , filepath, hashable, HUnit, optparse-applicative, random @@ -149963,7 +154179,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "persistent_2_7_3" = callPackage + "persistent_2_7_3_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, blaze-markup, bytestring, conduit, containers , exceptions, fast-logger, haskell-src-meta, hspec, http-api-data @@ -149974,8 +154190,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.7.3"; - sha256 = "16by2ip2gljz1xsyp6j3k04jab0l0as9ynfwxdsbbcv4qd8l1sxk"; + version = "2.7.3.1"; + sha256 = "1jbvavdvr9qz5ld7vf6l1jgiadhmxx6zc4vqsdk9ivfq6d5wlg1p"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html blaze-markup bytestring conduit containers exceptions fast-logger @@ -150182,8 +154398,8 @@ self: { }: mkDerivation { pname = "persistent-mysql-haskell"; - version = "0.3.5"; - sha256 = "0sc6hw112d8jk1rflyrmcc8gkjddl41bbw6hksyv7a5w6sc7z33n"; + version = "0.3.6"; + sha256 = "1a829hrbsa54qikbnafv7vk7shzyg0697nvj43md19p172mkwj93"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -150242,8 +154458,8 @@ self: { }: mkDerivation { pname = "persistent-postgresql"; - version = "2.6.2.1"; - sha256 = "0imb13aw2wsfv0zrknim376sfpa72k4zdrlkxki88pm0bd3mp9mf"; + version = "2.6.3"; + sha256 = "0yr384b77mp8z7k8mjmdbsqrrqplymcy9rfy6lm1v3ff81g52vli"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-control monad-logger persistent postgresql-libpq @@ -150293,8 +154509,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 @@ -150307,7 +154523,7 @@ self: { ]; description = "Backend for persistent library using Redis"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ psibi ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-refs" = callPackage @@ -150707,10 +154923,8 @@ self: { }: mkDerivation { pname = "pgdl"; - version = "10.9"; - sha256 = "0hwky1331bv1zbjq9nbfnvx8gkbfhs5sjawxjccz9l484xsrbb5z"; - revision = "8"; - editedCabalFile = "1zasl5qvmaxf8pymfmapp30rbwl2a0zm4krd3xlk6ddx0dz1w0yq"; + version = "10.10"; + sha256 = "0wqj7i4shdcy80aiib0dkp3y6ccilqq4g3p8bvndh4vl3cyd2pwv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -150907,8 +155121,8 @@ self: { }: mkDerivation { pname = "phoityne-vscode"; - version = "0.0.19.0"; - sha256 = "1lm4fjgha582vi88bz483p6g282zh72j31qk743rv4nm2faksi00"; + version = "0.0.20.0"; + sha256 = "1k9vh2xyk2nwck1g86lxvbrab7ap5p8p9vhh7pj98a56wkvxmv7y"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -150917,7 +155131,7 @@ self: { mtl parsec process resourcet safe 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; }) {}; @@ -151005,8 +155219,8 @@ self: { }: mkDerivation { pname = "photoname"; - version = "3.2"; - sha256 = "1ygwhs79jrv5h1l407w41vfs96nd3kn2bl248j8bc1fh67kf6kka"; + version = "3.3"; + sha256 = "1fcl0m5hm6xvnzvn8v0l69vr7yh2q58six62147mwf4nlzny61gd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -151018,7 +155232,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; }) {}; @@ -151348,8 +155562,8 @@ self: { }: mkDerivation { pname = "pinboard"; - version = "0.9.12.6"; - sha256 = "0z5sfgvbckd636hi1girlfpfz2v21xydzi3d1py3q6hyq34b67iq"; + version = "0.9.12.8"; + sha256 = "0k9lyk3h108y3zyvqz1krr08cqf4fahg4lh4f5fn1spgz46q3dwk"; libraryHaskellDepends = [ aeson base bytestring containers http-client http-client-tls http-types monad-logger mtl network profunctors random @@ -152010,6 +156224,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-group_1_0_9" = callPackage + ({ mkDerivation, base, doctest, free, lens-family-core, pipes + , pipes-parse, transformers + }: + mkDerivation { + pname = "pipes-group"; + 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 ({ mkDerivation, base, bytestring, http-client, http-client-tls , pipes @@ -152095,8 +156326,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 @@ -152352,6 +156583,8 @@ self: { pname = "pipes-s3"; version = "0.3.0.3"; sha256 = "16gm7xjc8vbbajwmq91fj1l5cgd6difrz5g30b8czac4gdgqfppa"; + revision = "1"; + editedCabalFile = "1hm2wwz8qz67hpwp5gfpp1rnz864z8pnn4ii5n35phhy9vg67dlz"; libraryHaskellDepends = [ aws base bytestring http-client http-client-tls http-types pipes pipes-bytestring pipes-safe resourcet text transformers @@ -152443,8 +156676,8 @@ self: { }: mkDerivation { pname = "pipes-transduce"; - version = "0.4"; - sha256 = "0krcjw7bry726bgkjfsv72wq6z930jz8n5yj5dzfh51n5ps8qkcq"; + version = "0.4.1"; + sha256 = "10lf6fnnq1zf9v04l00f1nd4s6qq6a0pcdl72vxczmj6rn3c0kgq"; libraryHaskellDepends = [ base bifunctors bytestring conceit foldl free microlens pipes pipes-bytestring pipes-concurrency pipes-group pipes-parse @@ -152455,6 +156688,7 @@ self: { ]; description = "Interfacing pipes with foldl folds"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-vector" = callPackage @@ -152538,6 +156772,8 @@ self: { pname = "pipes-zlib"; version = "0.4.4.1"; sha256 = "1sdxhb3000k57ck1mbasdwaxmkmw2bbh2m1ry3fvpgsilq91xb4g"; + revision = "1"; + editedCabalFile = "1vjvbww9b0892p1r1vz3biim3r5zaxkg8ks8w9cj2nc6i0bs7qy1"; libraryHaskellDepends = [ base bytestring pipes streaming-commons transformers ]; @@ -153063,17 +157299,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 @@ -153116,14 +157354,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.1.0"; + sha256 = "1gxzfhzylk7i5cjnzgn4jicvbrv67w2v6fwb2x067q9c2g0b0npy"; 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"; @@ -153175,15 +157417,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; hydraPlatforms = stdenv.lib.platforms.none; @@ -153229,8 +157469,8 @@ 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; @@ -153393,10 +157633,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 @@ -153915,8 +158153,8 @@ self: { }: mkDerivation { pname = "pomaps"; - version = "0.0.0.1"; - sha256 = "1k2p59qq9yqndk8p3igxrbiqq7i6f80krynnvja7nx4bjlpcm19w"; + version = "0.0.0.3"; + sha256 = "1gxfaqcg6d9wkm67d8rrjvigy9kvvh9403v3jk790x9pfydcjvym"; libraryHaskellDepends = [ base containers deepseq ghc-prim lattices ]; @@ -153924,7 +158162,9 @@ self: { base ChasingBottoms containers doctest Glob lattices tasty tasty-hspec tasty-quickcheck ]; - benchmarkHaskellDepends = [ base criterion deepseq random vector ]; + 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; @@ -154704,14 +158944,14 @@ self: { }) {}; "postgresql-libpq" = callPackage - ({ mkDerivation, base, bytestring, postgresql }: + ({ mkDerivation, base, bytestring, postgresql, unix }: mkDerivation { pname = "postgresql-libpq"; - version = "0.9.3.1"; - sha256 = "0x0bjnwqhdlxba345yjkf978wfsy8g5xsjdbrckrnb2dvsfscqih"; - libraryHaskellDepends = [ base bytestring ]; + version = "0.9.4.0"; + sha256 = "15laa8m6i4girhr0i3xscgsl30iqj61mx5vbl67wasb8rwx0pi82"; + 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;}; @@ -154919,8 +159159,8 @@ self: { }: mkDerivation { pname = "postgresql-simple-queue"; - version = "1.0.0"; - sha256 = "1kfgj8i84nqbm1416q2yq6n9dma4aaxnf26xkalm73mlg595ah7f"; + version = "1.0.1"; + sha256 = "0gss9s2splrvwgxhkjpqvx0cg9kx9dqpw4aq2wbh8l879v2nj2rk"; libraryHaskellDepends = [ aeson base bytestring exceptions monad-control pg-transact postgresql-simple random stm text time transformers @@ -155065,9 +159305,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 @@ -155077,17 +159317,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 ]; @@ -155098,9 +159338,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"; @@ -155174,8 +159414,8 @@ self: { }: mkDerivation { pname = "postmark"; - version = "0.2.2"; - sha256 = "043q69v629r6y8ljij8nmfjz4qs3181278wrnlfgagfahh98pg0b"; + version = "0.2.3"; + sha256 = "140z6r01byld665471dbk5zdqaf6lrcxwqp0wvbs5fbpjq37mfmp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155575,8 +159815,8 @@ self: { }: mkDerivation { pname = "preamble"; - version = "0.0.57"; - sha256 = "04hc8cywmwwjxcgj0h26ahlnxj56awq9jnvpdgxgw5rvw4q4qqb3"; + version = "0.0.58"; + sha256 = "02nqrryi2mjp4zcail23rh0ysqnc8i97wzn77bq7ksimqwzynabq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155741,6 +159981,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "prefix-expression" = callPackage + ({ mkDerivation, base, hspec, regex-pcre-builtin }: + mkDerivation { + pname = "prefix-expression"; + version = "1.2.3"; + sha256 = "0hcp7wfgqcbqlkg60zy5c1b9gyvzkr678m4qpjxsv07x33h0xgnr"; + 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 @@ -156049,14 +160301,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; @@ -156150,8 +160403,8 @@ self: { }: mkDerivation { pname = "pretty-show"; - version = "1.6.15"; - sha256 = "16ik7dhagyr3is5dmkihw109l4d0500vi55z46p8lhigmfwqpn2n"; + version = "1.6.16"; + sha256 = "0l03mhbdnf0sj6kw2s3cf2xhfbl0809jr9fhj7cmpkhjpxv89vnv"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -156171,8 +160424,8 @@ self: { }: mkDerivation { pname = "pretty-simple"; - version = "2.0.1.0"; - sha256 = "0a72kns4ydh22q1kwbljknrbgcpvh9l4jx16fm2s3hkkw9fivl27"; + version = "2.0.2.0"; + sha256 = "1rzc9sfrw0m4aqp19zpzllkrrr6966byc06m9qcy77fbv1icsr44"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156480,10 +160733,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"; @@ -156792,14 +161043,14 @@ self: { 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"; @@ -156834,8 +161085,8 @@ self: { }: mkDerivation { pname = "process-extras"; - version = "0.7.2"; - sha256 = "0n79m1kj59w4s2a86m1hm98019452mhh06szn0jwsvb9xhqi0v77"; + version = "0.7.3"; + sha256 = "0hyrqz2dinvql6r9ldd2q35zkavjwqadw13zqzcwrdhq8myhawzb"; libraryHaskellDepends = [ base bytestring data-default deepseq generic-deriving ListLike mtl process text @@ -156943,8 +161194,8 @@ self: { }: mkDerivation { pname = "process-streaming"; - version = "0.9.1.2"; - sha256 = "0kjq8bylhab6zhszf9vfnvzjkzfkh3bcgkkys7f13f6mrdp02bjz"; + version = "0.9.2.1"; + sha256 = "1p1nfb09sg9krwm7k6j8y5ggbc28yddlkf2yifs06iqfkcmbsbm6"; libraryHaskellDepends = [ base bifunctors bytestring conceit free kan-extensions pipes pipes-bytestring pipes-concurrency pipes-parse pipes-safe @@ -156961,6 +161212,7 @@ self: { ]; description = "Streaming interface to system processes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "processing" = callPackage @@ -157195,8 +161447,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; @@ -157224,15 +161476,15 @@ 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"; libraryHaskellDepends = [ base base-orphans bifunctors comonad contravariant distributive - tagged transformers + semigroups tagged transformers ]; homepage = "http://github.com/ekmett/profunctors/"; description = "Profunctors"; @@ -157252,12 +161504,12 @@ 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; @@ -157417,8 +161669,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 @@ -157701,8 +161953,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "5.1.0"; - sha256 = "0bl1kb24s2bs7li096s4iwvd2wj188lb2y3cfymhgsyqj8c2fbzp"; + version = "5.2.0"; + sha256 = "06h1q1kx2ifbfpicb0ivp4x8pv1fn15x0v5wn1dygnbf862h9brh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -158123,15 +162375,15 @@ self: { "protolude" = callPackage ({ mkDerivation, array, async, base, bytestring, containers , deepseq, ghc-prim, hashable, mtl, mtl-compat, safe, stm, text - , transformers + , transformers, transformers-compat }: mkDerivation { pname = "protolude"; - version = "0.2"; - sha256 = "1ky72pv1icrcj9s3al23nwylyv7l60s2h0m2hs85wdb3kn1c042n"; + version = "0.2.1"; + sha256 = "1r2baxx6q4z75sswirlqsnyynk4i7amfmpzajggh31fbz13hxgxx"; libraryHaskellDepends = [ array async base bytestring containers deepseq ghc-prim hashable - mtl mtl-compat safe stm text transformers + mtl mtl-compat safe stm text transformers transformers-compat ]; homepage = "https://github.com/sdiehl/protolude"; description = "A small prelude"; @@ -158355,8 +162607,8 @@ self: { }: mkDerivation { pname = "psqueues"; - version = "0.2.4.0"; - sha256 = "1lbjm6mnw91qg1ik73mwh48cq79k4kkaj4l380ilqp0p05a386j9"; + version = "0.2.5.0"; + sha256 = "1fy2rflmk2g5qkrbdz53wcxbr2nzxlnvkwwf4xf56yhm1ciffgqn"; libraryHaskellDepends = [ base deepseq ghc-prim hashable ]; testHaskellDepends = [ array base deepseq ghc-prim hashable HUnit QuickCheck tagged @@ -158456,6 +162708,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "publicsuffix_0_20171229" = callPackage + ({ mkDerivation, base, criterion, filepath, hspec, random + , template-haskell + }: + mkDerivation { + pname = "publicsuffix"; + 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 ({ mkDerivation, base, bytestring, cereal, containers, data-default , HUnit, idna, text, utf8-string @@ -158762,6 +163031,7 @@ self: { homepage = "http://lpuppet.banquise.net"; description = "A program that displays the puppet resources associated to a node given .pp files."; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pure-cdb" = callPackage @@ -159149,23 +163419,49 @@ self: { "pusher-http-haskell" = 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.0"; + sha256 = "1mnigsf10jxqsvjr1vbizxjrf97w3cx54xy850mj3b8i34929bmh"; 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-http-haskell_1_5_1_1" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , cryptonite, hashable, hspec, http-client, http-types, memory + , QuickCheck, scientific, text, time, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "pusher-http-haskell"; + version = "1.5.1.1"; + sha256 = "0j8gsarczvdidri63s162flzdkb6w0sysawairlxmmgcdbybfci5"; + libraryHaskellDepends = [ + 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-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"; @@ -159203,8 +163499,8 @@ self: { }: mkDerivation { pname = "pushme"; - version = "2.0.2"; - sha256 = "12gd31fbsm3adxmcwkikx4zwq5a7snv8mc0jd73crqfy46spm6zw"; + version = "2.1.1"; + sha256 = "1adgdbnifilzpxgkzdv0wxd475s7kl0ib8qqpd8ifx1cnm1zggjw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -159214,7 +163510,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; @@ -159484,23 +163780,23 @@ self: { }) {}; "q4c12-twofinger" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, doctest, lens - , QuickCheck, semigroupoids, streams, template-haskell + ({ mkDerivation, base, Cabal, cabal-doctest, containers, deepseq + , doctest, lens, lens-properties, semigroupoids, tasty + , tasty-quickcheck }: mkDerivation { pname = "q4c12-twofinger"; - version = "0.0.0.2"; - sha256 = "036c02x5vph24a43vr58acrwny9vidmmv7536sw5b9fiynfkd343"; + version = "0.2"; + sha256 = "0c4fm6pdl1mlh4xnp8syjifknyvbdqwdyiika9pkww4xmf12lv7z"; setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base deepseq QuickCheck semigroupoids streams - ]; + libraryHaskellDepends = [ base containers deepseq semigroupoids ]; testHaskellDepends = [ - base doctest lens QuickCheck streams template-haskell + 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 @@ -159628,6 +163924,19 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "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 , either, haskell-qrencode, hspec, jose-jwt, JuicyPixels @@ -159704,11 +164013,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"; @@ -159723,8 +164035,8 @@ self: { }: mkDerivation { pname = "qtah-examples"; - version = "0.3.0"; - sha256 = "0scb00dilgbiqzp1jq0jknx76qb0fc9l9wsv214k9x741q7cv71b"; + version = "0.4.0"; + sha256 = "0q8k2diyrxpvsnhlw484lxy3j6qbk07hkqj0hg2cxv8whhi02bp9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -159737,15 +164049,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 @@ -159759,13 +164073,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 ]; @@ -159988,6 +164304,7 @@ self: { benchmarkHaskellDepends = [ base criterion text ]; description = "Analysis and parsing library for SQL queries"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {predicate-class = null;}; @@ -160008,6 +164325,7 @@ self: { ]; description = "Parsing for Hive SQL queries"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {predicate-class = null;}; @@ -160028,6 +164346,7 @@ self: { ]; description = "Parsing for Presto SQL queries"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {predicate-class = null;}; @@ -160048,6 +164367,7 @@ self: { ]; description = "Parsing for Vertica SQL queries"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {predicate-class = null;}; @@ -160202,6 +164522,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quickcheck-arbitrary-adt_0_3_1_0" = callPackage + ({ mkDerivation, base, hspec, lens, QuickCheck, template-haskell + , transformers + }: + mkDerivation { + pname = "quickcheck-arbitrary-adt"; + version = "0.3.1.0"; + sha256 = "1fa5gb111m740q399l7wbr9n03ws9rasq48jhnx7dvvd6qh2wjjw"; + libraryHaskellDepends = [ base QuickCheck ]; + testHaskellDepends = [ + base hspec lens QuickCheck template-haskell transformers + ]; + homepage = "https://github.com/plow-technologies/quickcheck-arbitrary-adt#readme"; + description = "Generic typeclasses for generating arbitrary ADTs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "quickcheck-assertions" = callPackage ({ mkDerivation, base, hspec, ieee754, pretty-show, QuickCheck }: mkDerivation { @@ -160251,10 +164589,8 @@ self: { }: mkDerivation { pname = "quickcheck-instances"; - version = "0.3.16"; - sha256 = "07xqbjb3rb5hzhjak3qpvj4hl91gc0z2272n60hv67zmv3w8kcf1"; - revision = "1"; - editedCabalFile = "1sfqjhk7z185l0gxrvn5pi3s8mvnqv1d1yzrx0k0mi48y5421jcm"; + version = "0.3.16.1"; + sha256 = "01v5bs7r9yvhkvb4yc9bqnacy8r6cy2gr9lnmwx40n5apgi0gcbz"; libraryHaskellDepends = [ array base base-compat bytestring case-insensitive containers hashable old-time QuickCheck scientific tagged text time @@ -160435,6 +164771,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"; @@ -160449,8 +164787,8 @@ self: { }: mkDerivation { pname = "quickcheck-state-machine"; - version = "0.3.0"; - sha256 = "0rcfc6yk5x99jk2zppfnzkkhc3k2wkvz6jh1h80l0zdpdhbd191a"; + 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 @@ -160468,8 +164806,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 @@ -161046,8 +165384,8 @@ self: { }: mkDerivation { pname = "radius"; - version = "0.5.0.0"; - sha256 = "0jj4g6m70i6dw1r0a821vn4fpx35n0mgsg820wpwmrk7xd2v6xhz"; + version = "0.5.0.1"; + sha256 = "0mrgcrhi99imclc400lp666gimxv4gkg4svjr49p9aip5dx03bjh"; libraryHaskellDepends = [ base binary bytestring cryptonite iproute memory ]; @@ -161071,6 +165409,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 @@ -161292,8 +165652,8 @@ self: { }: mkDerivation { pname = "rakuten"; - version = "0.1.0.4"; - sha256 = "0nxnw5b0qhjzb0zwak74x84f081p1giyzbvpinhx527ph4j96aqf"; + version = "0.1.0.5"; + sha256 = "1197vkml0pvrdqvh55bvsb52rzqfj6p6vrpihr5ci7flp4h9wkp1"; libraryHaskellDepends = [ aeson base bytestring connection constraints data-default-class extensible http-api-data http-client http-client-tls http-types @@ -161843,8 +166203,8 @@ 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 ]; @@ -162132,31 +166492,51 @@ 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 = "0.3.10"; + sha256 = "10cqg2rrr8fx57r0vhw37wrv92243lzi2mp7ghsl3kkl1n73qz8n"; libraryHaskellDepends = [ aeson base bytestring case-insensitive containers http-client http-client-tls http-types text uuid ]; - testHaskellDepends = [ base filepath tasty tasty-hspec ]; + testHaskellDepends = [ base filepath hspec ]; homepage = "https://github.com/tfausak/ratel#readme"; description = "Notify Honeybadger about exceptions"; license = stdenv.lib.licenses.mit; }) {}; + "ratel_1_0_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, filepath, hspec, http-client, http-client-tls + , http-types, text, uuid + }: + mkDerivation { + pname = "ratel"; + version = "1.0.1"; + sha256 = "1cspvwnq7v0ngxlc0w0f2fv14m3ndi8nkvcglygbac454nlka12s"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive containers http-client + http-client-tls http-types text uuid + ]; + testHaskellDepends = [ base filepath hspec ]; + homepage = "https://github.com/tfausak/ratel#readme"; + description = "Notify Honeybadger about exceptions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ratel-wai" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , http-client, ratel, wai }: mkDerivation { pname = "ratel-wai"; - version = "0.3.1"; - sha256 = "13p5ny1x752l9xqiyxdxvjfjqggsb0g9hpqqcmdr828lvr9qxi6s"; + version = "0.3.2"; + sha256 = "1f38xivw19ic002idr936859rwmz2g9nmhbwxvsf4fw3lm31qwpa"; libraryHaskellDepends = [ base bytestring case-insensitive containers http-client ratel wai ]; @@ -162165,6 +166545,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ratel-wai_1_0_1" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , http-client, ratel, wai + }: + mkDerivation { + pname = "ratel-wai"; + version = "1.0.1"; + sha256 = "190kgqhvda3r5gqk0j8pzr6d123fl77dv3i1csglq22yzrwynkv3"; + 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 ({ mkDerivation, base }: mkDerivation { @@ -162221,6 +166618,38 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rattletrap_4_0_5" = callPackage + ({ 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 = "4.0.5"; + sha256 = "0yxmym79xrs35lz8qyrkyqa9vihng4p3448085ybwbfqmaqk6pl5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base binary binary-bits bytestring containers + filepath http-client http-client-tls template-haskell text + transformers + ]; + executableHaskellDepends = [ + aeson aeson-pretty base binary binary-bits bytestring containers + filepath http-client http-client-tls template-haskell text + transformers + ]; + testHaskellDepends = [ + 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, mtl , network, random, resourcet, text, time, unordered-containers @@ -162400,6 +166829,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;}; @@ -162563,17 +166993,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 @@ -163226,7 +167657,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "rebase_1_2_2" = callPackage + "rebase_1_2_3" = callPackage ({ mkDerivation, base, base-prelude, bifunctors, bytestring , containers, contravariant, contravariant-extras, deepseq, dlist , either, fail, hashable, mtl, profunctors, scientific @@ -163235,8 +167666,8 @@ self: { }: mkDerivation { pname = "rebase"; - version = "1.2.2"; - sha256 = "11p4wg2xissj4xzw80dww2srj2ylgw3wlnapykizy2fwjl1az9k4"; + version = "1.2.3"; + sha256 = "1glnxvgf79qm2iz4xxdn6zygjff42cyakk1nah2wrzkkrr11axqk"; libraryHaskellDepends = [ base base-prelude bifunctors bytestring containers contravariant contravariant-extras deepseq dlist either fail hashable mtl @@ -163436,6 +167867,8 @@ self: { pname = "recursion-schemes"; version = "5.0.2"; sha256 = "1lmayskniljw3lxk64apvshn9h90gwfpflgxilfivsqhrjxnaj9s"; + revision = "1"; + editedCabalFile = "1mmq9dx0dgws4dbmij76snj91dv6czigs1kchi0vy01hplsb0wks"; libraryHaskellDepends = [ base base-orphans bifunctors comonad free semigroups template-haskell transformers transformers-compat @@ -163452,8 +167885,8 @@ self: { }: mkDerivation { pname = "recursion-schemes-ext"; - version = "1.0.0.0"; - sha256 = "154ypcjn15z3g9rbl257csz8zfalkw7xf6pawfyi9w69jw2sz381"; + version = "1.0.0.1"; + sha256 = "1jd3dsns2ahsbkrzcp955bbq4xyhr0rmip3y6dvsgs4qjs0jlvbi"; libraryHaskellDepends = [ base composition-prelude lens recursion-schemes ]; @@ -163538,16 +167971,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"; @@ -163921,8 +168354,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"; @@ -163967,10 +168400,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 @@ -164274,6 +168705,19 @@ 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 { @@ -164837,8 +169281,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; @@ -164857,15 +169301,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"; @@ -166250,8 +170694,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 @@ -166534,8 +170978,8 @@ self: { }: mkDerivation { pname = "resourcet"; - version = "1.1.10"; - sha256 = "1hhw9w85nj8i2azzj5sxixffdvciq96b0jhl0zz24038bij66cyl"; + version = "1.1.11"; + sha256 = "1n94m2c7rxk2bgm8wywrkp9pmqlnv2dl35yaylninzm8xk1xavil"; libraryHaskellDepends = [ base containers exceptions lifted-base mmorph monad-control mtl transformers transformers-base transformers-compat unliftio-core @@ -166587,8 +171031,8 @@ self: { pname = "rest-client"; version = "0.5.1.1"; sha256 = "0qzn56bj821l9gcxyq6lcgwfa2444igiqczajybrnyy8yb4j792x"; - revision = "1"; - editedCabalFile = "1q7ad9lhlszbmdv5r9zzqj9c3rh9x5hlrl4dyb4wb0xf0v3bj3kx"; + revision = "2"; + editedCabalFile = "0issr73rbnyaqfgx4c0wsy9sq948sqrkima2cr2sb1lkf8n4ihr8"; libraryHaskellDepends = [ aeson-utils base bytestring case-insensitive data-default exceptions http-client http-conduit http-types hxt hxt-pickle-utils @@ -166599,6 +171043,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rest-client_0_5_2_1" = callPackage + ({ mkDerivation, aeson-utils, base, bytestring, case-insensitive + , data-default, exceptions, http-client, http-conduit, http-types + , hxt, hxt-pickle-utils, monad-control, mtl, resourcet, rest-types + , tostring, transformers, transformers-base, transformers-compat + , uri-encode, utf8-string + }: + mkDerivation { + pname = "rest-client"; + version = "0.5.2.1"; + sha256 = "0axilkrqjbq1l30cnm05fl0mm3ngnijnxgl6idi6mcydyrdgl14n"; + libraryHaskellDepends = [ + aeson-utils base bytestring case-insensitive data-default + exceptions http-client http-conduit http-types hxt hxt-pickle-utils + monad-control mtl resourcet rest-types tostring transformers + transformers-base transformers-compat uri-encode utf8-string + ]; + description = "Utility library for use in generated API client libraries"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rest-core" = callPackage ({ mkDerivation, aeson, aeson-utils, base, base-compat, bytestring , case-insensitive, errors, fclabels, HUnit, hxt, hxt-pickle-utils @@ -166759,8 +171225,8 @@ 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 @@ -167144,31 +171610,34 @@ self: { }) {}; "rfc" = callPackage - ({ mkDerivation, aeson, aeson-diff, async, base, blaze-html + ({ mkDerivation, aeson, aeson-diff, async, base, binary, blaze-html , classy-prelude, containers, data-default, exceptions, hedis , http-api-data, http-client-tls, http-types, lens, lifted-async , markdown, monad-control, postgresql-simple, resource-pool - , servant, servant-blaze, servant-docs, servant-server - , servant-swagger, simple-logger, string-conversions, swagger2 - , temporary, text, time-units, unordered-containers, url - , uuid-types, vector, wai, wai-cors, wai-extra, wreq + , servant, servant-blaze, servant-client, servant-docs + , servant-server, servant-swagger, simple-logger + , string-conversions, swagger2, temporary, text, time-units + , unordered-containers, url, uuid-types, vector, wai, wai-cors + , wai-extra, wreq }: mkDerivation { pname = "rfc"; - version = "0.0.0.4"; - sha256 = "1zsbgq8f2a0sr575lkz6r5n0vq8jyn32q1sjxkw7d1zqkmzx1f0b"; + version = "0.0.0.13"; + sha256 = "06bjxgfhqjbgnkvk6vb42v3c8mi934y2dfb4hafzdgknwnlcsy19"; libraryHaskellDepends = [ - aeson aeson-diff async base blaze-html classy-prelude containers - data-default exceptions hedis http-api-data http-client-tls - http-types lens lifted-async markdown monad-control - postgresql-simple resource-pool servant servant-blaze servant-docs - servant-server servant-swagger simple-logger string-conversions - swagger2 temporary text time-units unordered-containers url - uuid-types vector wai wai-cors wai-extra wreq + aeson aeson-diff async base binary blaze-html classy-prelude + containers data-default exceptions hedis http-api-data + http-client-tls http-types lens lifted-async markdown monad-control + postgresql-simple resource-pool servant servant-blaze + servant-client servant-docs servant-server servant-swagger + simple-logger string-conversions swagger2 temporary text time-units + unordered-containers url uuid-types vector wai wai-cors wai-extra + wreq ]; homepage = "https://github.com/RobertFischer/rfc#README.md"; - description = "Robert Fischer's Common library, for all Robert Fischer's common needs"; + description = "Robert Fischer's Common library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rfc1413-server" = callPackage @@ -167483,6 +171952,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rio" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , exceptions, filepath, hashable, microlens, mtl, text, time + , typed-process, unix, unliftio, unordered-containers, vector + }: + mkDerivation { + pname = "rio"; + version = "0.0.1.0"; + sha256 = "006avzlv6ghwang3dhllxj7absa32sxw2qss2wdf3hxqbij6fy0b"; + libraryHaskellDepends = [ + base bytestring containers deepseq directory exceptions filepath + hashable microlens mtl 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "riot" = callPackage ({ mkDerivation, base, containers, directory, haskell98, mtl , ncurses, old-locale, packedstring, process, unix @@ -168378,8 +172867,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 @@ -168723,8 +173212,8 @@ self: { }: 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 @@ -168776,8 +173265,8 @@ self: { }: mkDerivation { pname = "rtcm"; - version = "0.2.11"; - sha256 = "01vlj8ilxzyv6rqffpj3il7dcmcyy4vg6ab3mprdgcy6f0rpsv8b"; + version = "0.2.14"; + sha256 = "1ypwxlfmlhx3zjmgi24y5mriprk9wjnc14l0lry38j4ml11glcsd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -168998,17 +173487,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"; @@ -169221,6 +173711,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "safe_0_3_16" = callPackage + ({ mkDerivation, base, deepseq, QuickCheck }: + mkDerivation { + pname = "safe"; + version = "0.3.16"; + sha256 = "0xar4gh32izxl2a102xpgjrhppin7hqa837pv3fswmlj51cfb2k8"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base deepseq QuickCheck ]; + homepage = "https://github.com/ndmitchell/safe#readme"; + description = "Library of safe (exception free) functions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "safe-access" = callPackage ({ mkDerivation, base, mtl, transformers }: mkDerivation { @@ -169248,6 +173752,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "safe-exceptions_0_1_7_0" = callPackage + ({ mkDerivation, base, deepseq, exceptions, hspec, transformers + , void + }: + mkDerivation { + pname = "safe-exceptions"; + version = "0.1.7.0"; + sha256 = "0sd0zfsm9pcll5bzzj523rbn45adjrnavdkz52hgmdjjgdcdrk8q"; + libraryHaskellDepends = [ base deepseq exceptions transformers ]; + testHaskellDepends = [ base hspec void ]; + homepage = "https://github.com/fpco/safe-exceptions#readme"; + description = "Safe, consistent, and easy exception handling"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "safe-exceptions-checked" = callPackage ({ mkDerivation, base, deepseq, hspec, safe-exceptions , transformers @@ -169256,8 +173776,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 ]; @@ -169459,8 +173979,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 @@ -169496,22 +174016,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; }) {}; @@ -169679,8 +174200,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "salve"; - version = "0.0.9"; - sha256 = "0x16rdrm8i2jwbi1zd7zj43r3h7jb9fzb33b5nbwkwfh397sm11h"; + version = "1.0.0"; + sha256 = "0s7np2xdzc7sbhyh0hwfx6bznjxji5cg4ymvqncjdcdkb8w31gdk"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/tfausak/salve#readme"; @@ -170185,8 +174706,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 @@ -170223,8 +174744,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "2.3.2"; - sha256 = "19r6a5sh2shaxzkvcysjk2ibfx85w0s1yvg2zjznka4wpzihfs91"; + version = "2.3.6"; + sha256 = "05n81l73r1w39cwrjyapwddhq9fcgj22cpn2y5ccjk7mj72jknhk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -170290,6 +174811,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) z3;}; + "sbv_7_5" = 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.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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) z3;}; + "sbvPlugin" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc , ghc-prim, mtl, process, sbv, tasty, tasty-golden @@ -170880,8 +175430,8 @@ self: { pname = "scientific"; version = "0.3.5.2"; sha256 = "0msnjz7ml0zycw9bssslxbg0nigziw7vs5km4q3vjbs8jpzpkr2w"; - revision = "2"; - editedCabalFile = "0wsrd213480p3pqrd6i650fr092yv7dhla7a85p8154pn5gvbr0a"; + revision = "4"; + editedCabalFile = "108m6b9w8l2q4r68mla9m5z47k6ahb0p68hypsmn140hgfr6a8la"; libraryHaskellDepends = [ base binary bytestring containers deepseq hashable integer-gmp integer-logarithms primitive text @@ -171045,8 +175595,8 @@ self: { pname = "scotty"; version = "0.11.0"; sha256 = "1vc6lc8q1cqqq67y78c70sw2jim8ps7bgp85a2gjgwfc6z4h68l9"; - revision = "7"; - editedCabalFile = "0mn4v7sgnihxvd9wmdqlfhz8818n4r4kgqvrz7sn4raqq5jxkdyr"; + revision = "8"; + editedCabalFile = "1jjpaiksvdhsmvv6p267w5grkiv4xmd59xsgwhhyhp5v2503p8sn"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive data-default-class fail http-types monad-control mtl nats network @@ -171660,6 +176210,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) SDL2_mixer;}; + "sdl2-mixer_1_1_0" = callPackage + ({ mkDerivation, base, bytestring, data-default-class, lifted-base + , monad-control, sdl2, SDL2_mixer, template-haskell, vector + }: + mkDerivation { + pname = "sdl2-mixer"; + version = "1.1.0"; + sha256 = "1k8avyccq5l9z7bwxigim312yaancxl1sr3q6a96bcm7pnhiak0g"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring data-default-class lifted-base monad-control sdl2 + template-haskell vector + ]; + librarySystemDepends = [ SDL2_mixer ]; + libraryPkgconfigDepends = [ SDL2_mixer ]; + description = "Bindings to SDL2_mixer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) SDL2_mixer;}; + "sdl2-ttf" = callPackage ({ mkDerivation, base, bytestring, SDL2, sdl2, SDL2_ttf , template-haskell, text, transformers @@ -171701,8 +176272,8 @@ self: { }: mkDerivation { pname = "sdr"; - version = "0.1.0.9"; - sha256 = "0mabbapd1hvf26j1z3mfgpf8qyq7ccvsda57wkscsc6rkw2jaxqd"; + version = "0.1.0.10"; + sha256 = "1cjp05sk558vcwasbi15j6qzpa9icfqcyjsvz3a4b2fb59z6gv6z"; libraryHaskellDepends = [ array base bytestring cairo cereal Chart Chart-cairo colour containers Decimal dynamic-graph either fftwRaw GLFW-b mwc-random @@ -172065,14 +176636,14 @@ self: { }: mkDerivation { pname = "selda"; - version = "0.1.11.2"; - sha256 = "0ahh54sz40d4gcfgx6fb0cy1447b3qlk9kir89wk3brzfaglyyn9"; + version = "0.1.12"; + sha256 = "1pbf141p3j2gj91lz4ilfc75kf2b0mzfnzxpjn220knkzianm2d9"; 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; }) {}; @@ -172082,10 +176653,8 @@ self: { }: mkDerivation { pname = "selda-postgresql"; - version = "0.1.7.0"; - sha256 = "0smx2hvpdxjcw58zchwmzcqz4xr5m1idv5y5rrj20df190r4l3l2"; - revision = "1"; - editedCabalFile = "0icxqqb4n1qbfpjlngs3lypnvjanwqrw3l8298my7b1wzj3iyw2m"; + version = "0.1.7.1"; + sha256 = "1izc27wdi9ldhjmmhwjw99g8pgbcayldwn65p5lsad173nc2rd22"; libraryHaskellDepends = [ base bytestring exceptions postgresql-libpq selda text ]; @@ -172309,6 +176878,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "semigroupoids_5_2_2" = callPackage + ({ mkDerivation, base, base-orphans, bifunctors, Cabal + , cabal-doctest, comonad, containers, contravariant, distributive + , doctest, hashable, semigroups, tagged, template-haskell + , transformers, transformers-compat, unordered-containers + }: + mkDerivation { + pname = "semigroupoids"; + version = "5.2.2"; + sha256 = "17i96y4iqj8clcs090lf6k0ij3j16nj14vsfwz0mm9nd6i4gbpp4"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base base-orphans bifunctors comonad containers contravariant + distributive hashable semigroups tagged template-haskell + transformers transformers-compat unordered-containers + ]; + testHaskellDepends = [ base doctest ]; + homepage = "http://github.com/ekmett/semigroupoids"; + description = "Semigroupoids: Category sans id"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "semigroupoids-syntax" = callPackage ({ mkDerivation, base, comonad, containers, contravariant , directory, distributive, doctest, filepath, QuickCheck @@ -172343,6 +176935,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "semigroups_0_18_4" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "semigroups"; + version = "0.18.4"; + sha256 = "09sxd17h1kcjsjaf1am2nwpb4vaq8d0q718fbkxwysws691317jq"; + libraryHaskellDepends = [ base ]; + homepage = "http://github.com/ekmett/semigroups/"; + description = "Anything that associates"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "semigroups-actions" = callPackage ({ mkDerivation, base, containers, semigroups }: mkDerivation { @@ -172550,6 +177155,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sensu-run_0_4_0_4" = callPackage + ({ mkDerivation, aeson, base, bytestring, filepath, http-client + , http-types, lens, network, optparse-applicative, process + , temporary, text, time, unix, unix-compat, vector, wreq + }: + mkDerivation { + pname = "sensu-run"; + version = "0.4.0.4"; + sha256 = "1pgzfa6ns67fq5cx7qizwjfb2gw6awx012iwhskx8s4wg9snbq5y"; + 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 + ]; + homepage = "https://github.com/maoe/sensu-run#readme"; + description = "A tool to send command execution results to Sensu"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sentence-jp" = callPackage ({ mkDerivation, base, mecab, random-shuffle, text, transformers }: mkDerivation { @@ -172943,10 +177570,10 @@ 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 + ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring + , base64-bytestring, bytestring, clock, containers, deepseq + , directory, exceptions, extra, filepath, formatting, hashable + , hspec, hspec-discover, 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 @@ -172954,21 +177581,21 @@ self: { }: mkDerivation { pname = "serokell-util"; - version = "0.5.3"; - sha256 = "02rr1wc1ss2rjx31w485k2hdnzhbs59pqzr9yvmk39082q9ppmk3"; + version = "0.6.0"; + sha256 = "1821f6hak3wwjradyzy2zb3pfy153l7yc39i5z2mdxn8b4vh4k88"; 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 + 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 + scientific semigroups stm template-haskell text text-format + time-units transformers universum unordered-containers vector yaml ]; testHaskellDepends = [ aeson base bytestring hspec QuickCheck quickcheck-instances safecopy scientific text text-format unordered-containers vector ]; + testToolDepends = [ hspec-discover ]; homepage = "https://github.com/serokell/serokell-util"; description = "General-purpose functions by Serokell"; license = stdenv.lib.licenses.mit; @@ -173070,10 +177697,11 @@ self: { "servant_0_12_1" = 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 + , doctest, filemanip, filepath, hspec, hspec-discover + , 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"; @@ -173091,6 +177719,7 @@ self: { doctest filemanip filepath hspec QuickCheck quickcheck-instances string-conversions text url ]; + testToolDepends = [ hspec-discover ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "A family of combinators for defining webservices APIs"; license = stdenv.lib.licenses.bsd3; @@ -173126,8 +177755,8 @@ self: { }: mkDerivation { pname = "servant-aeson-specs"; - version = "0.5.3.0"; - sha256 = "13xakmbr0qykff695cj631g97nlcjmmzki68c2gg5sn9jl63yq1q"; + version = "0.6.1.0"; + sha256 = "0246bdrcy0rq0jyba2c945hlz8csaff9zakv0g5qpzylsc5dnwmd"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring directory filepath hspec hspec-golden-aeson QuickCheck quickcheck-arbitrary-adt random @@ -173159,9 +177788,10 @@ self: { "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"; @@ -173176,6 +177806,7 @@ self: { servant servant-auth servant-auth-server servant-client servant-server time transformers wai warp ]; + testToolDepends = [ hspec-discover ]; homepage = "http://github.com/plow-technologies/servant-auth#readme"; description = "servant-client/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; @@ -173211,7 +177842,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-auth-cookie_0_6_0" = callPackage + "servant-auth-cookie_0_6_0_3" = 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 @@ -173220,8 +177851,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 = [ @@ -173243,9 +177874,9 @@ 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"; @@ -173259,6 +177890,7 @@ self: { base doctest hspec lens QuickCheck servant servant-auth servant-docs template-haskell text ]; + testToolDepends = [ hspec-discover ]; homepage = "http://github.com/plow-technologies/servant-auth#readme"; description = "servant-docs/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; @@ -173303,10 +177935,11 @@ 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"; @@ -173330,14 +177963,15 @@ self: { jose lens lens-aeson mtl QuickCheck servant-server time wai warp wreq ]; + testToolDepends = [ hspec-discover ]; homepage = "http://github.com/plow-technologies/servant-auth#readme"; description = "servant-server/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; }) {}; "servant-auth-swagger" = callPackage - ({ mkDerivation, base, 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"; @@ -173350,6 +177984,7 @@ self: { base hspec lens QuickCheck servant servant-auth servant-swagger swagger2 text ]; + testToolDepends = [ hspec-discover ]; homepage = "http://github.com/plow-technologies/servant-auth#readme"; description = "servant-swagger/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; @@ -173362,8 +177997,8 @@ self: { }: mkDerivation { pname = "servant-auth-token"; - version = "0.5.0.0"; - sha256 = "1ivlc7ivn4rn2appxyv2cgn4s812s82d3a8q9ykfy1yhpjygk9hp"; + version = "0.5.1.0"; + sha256 = "113pjs52nvi94bfx1ys4lanyvzkrlmb1p2y8sxhhb4bal917xki1"; libraryHaskellDepends = [ aeson-injector base bytestring containers http-api-data mtl pwstore-fast servant servant-auth-token-api servant-server text @@ -173384,8 +178019,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-acid"; - version = "0.5.0.0"; - sha256 = "1hvslg23l43k6wz6z84xcm3sv0lxgnvcsrx7z8493zyav9lnlx6h"; + version = "0.5.1.0"; + sha256 = "1kxmgdj7bz2bbs6n9kfp28y9a9cvc2xk8345jnd4ks0iw43xjwr3"; libraryHaskellDepends = [ acid-state aeson-injector base bytestring containers ghc-prim monad-control mtl safe safecopy servant-auth-token @@ -173404,8 +178039,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-api"; - version = "0.4.2.2"; - sha256 = "0dnaqhri1hg1c3gmlpnpyk21q4cq9j513fnd3g1m9k7mkc6h6bgv"; + version = "0.5.1.0"; + sha256 = "0kn25ldc774zx8r5hnrd7ibdm4g3769f99g8vl99x0miplpz0v0a"; libraryHaskellDepends = [ aeson aeson-injector base lens raw-strings-qq servant servant-docs servant-swagger swagger2 text @@ -173425,8 +178060,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-leveldb"; - version = "0.5.0.0"; - sha256 = "1v1h9jpc9ypdd6sfcb9w4lhv2ldsnlcpmmsghbdky50vqmq1y8qj"; + version = "0.5.1.0"; + sha256 = "0bkprvi9zwc599ynkabjsk1m9wpbvfpmhzjx6rqj92m1nki62264"; libraryHaskellDepends = [ aeson-injector base bytestring concurrent-extra containers exceptions lens leveldb-haskell monad-control mtl resourcet safe @@ -173448,8 +178083,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-persistent"; - version = "0.6.0.0"; - sha256 = "18y9g9pfzbhv35pfcr4973h320p8ify8nf4vllcdv83whfm48bc1"; + version = "0.6.1.0"; + sha256 = "1ni74vk121ncfkdjksf15g6686c2acbg22dn1srzwyngx5iwjcnc"; libraryHaskellDepends = [ aeson-injector base bytestring containers monad-control mtl persistent persistent-template servant-auth-token @@ -173471,8 +178106,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-rocksdb"; - version = "0.5.0.0"; - sha256 = "0cr8qgkv89sps6ykv0v1bng2xk4g7r00fjnmgjp58kpc18pvg4vl"; + version = "0.5.1.0"; + sha256 = "1xbnqv3b64r1xnzra2pdysjg5r9kxwxaya5rfrcgl8fz1b4n4hbb"; libraryHaskellDepends = [ aeson-injector base bytestring concurrent-extra containers exceptions lens monad-control mtl resourcet rocksdb-haskell safe @@ -173589,10 +178224,11 @@ self: { "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, text, transformers, transformers-base + , transformers-compat, wai, warp }: mkDerivation { pname = "servant-client"; @@ -173612,6 +178248,7 @@ 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; @@ -173621,8 +178258,8 @@ self: { "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"; @@ -173636,6 +178273,7 @@ self: { 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; @@ -173737,8 +178375,8 @@ self: { "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 + , hspec-discover, http-media, http-types, lens, servant + , string-conversions, text, unordered-containers }: mkDerivation { pname = "servant-docs"; @@ -173757,6 +178395,7 @@ 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; @@ -173867,8 +178506,8 @@ self: { }: mkDerivation { pname = "servant-exceptions"; - version = "0.1.0"; - sha256 = "0dkwggl7d8drnd2msk3cniyi7ia58d7cwi1hb0zcqgc0p9br7lbn"; + version = "0.1.1"; + sha256 = "1qdb6ins7l0ryyrmg9j5pw428rlhkmzpbq5jqawfn01j8vf9yav5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -173879,7 +178518,6 @@ self: { aeson base exceptions http-types servant-server text warp ]; homepage = "https://github.com/ch1bo/servant-exceptions#readme"; - description = "Extensible exceptions for servant APIs"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -173896,13 +178534,16 @@ self: { }) {}; "servant-foreign_0_10_2" = callPackage - ({ mkDerivation, base, hspec, http-types, lens, servant, text }: + ({ mkDerivation, base, hspec, hspec-discover, http-types, lens + , servant, text + }: mkDerivation { pname = "servant-foreign"; version = "0.10.2"; sha256 = "16r42df628jsw9khv5kjwb702ajwmxg4kya19acm10660c0gxygs"; libraryHaskellDepends = [ base 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; hydraPlatforms = stdenv.lib.platforms.none; @@ -173951,19 +178592,19 @@ 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 + , string-conversions, text, wai, warp }: mkDerivation { pname = "servant-github-webhook"; - version = "0.3.1.0"; - sha256 = "0px2pxw6piqjh2vawf0mkhcf96pqk2rm0izvbsy5xcd011qlvfhq"; + version = "0.3.2.1"; + sha256 = "1yy5hnnj64wgafn60cj4ywwkwpzl506g0fsm9fcsyz4dr7irhpyf"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite github http-types memory servant servant-server string-conversions text - transformers wai + wai ]; testHaskellDepends = [ - aeson base bytestring servant-server transformers wai warp + aeson base bytestring servant-server wai warp ]; homepage = "https://github.com/tsani/servant-github-webhook"; description = "Servant combinators to facilitate writing GitHub webhooks"; @@ -174043,9 +178684,9 @@ self: { "servant-js" = callPackage ({ mkDerivation, aeson, base, base-compat, charset, filepath, hspec - , hspec-expectations, language-ecmascript, lens, QuickCheck - , servant, servant-foreign, servant-server, stm, text, transformers - , warp + , hspec-discover, hspec-expectations, language-ecmascript, lens + , QuickCheck, servant, servant-foreign, servant-server, stm, text + , transformers, warp }: mkDerivation { pname = "servant-js"; @@ -174064,6 +178705,7 @@ self: { 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; @@ -174076,8 +178718,8 @@ self: { }: mkDerivation { pname = "servant-kotlin"; - version = "0.1.0.2"; - sha256 = "0dwm9aia14hr2gblcak7vyh7jgs1mnfwqq131rxyygf9d11wpx41"; + version = "0.1.0.3"; + sha256 = "1idki7vf2yph8sndpl8r9a5cngix3163yxb73l5l5fm9a78pk5gd"; libraryHaskellDepends = [ base containers directory formatting lens servant servant-foreign text time wl-pprint-text @@ -174150,13 +178792,15 @@ self: { "servant-mock" = callPackage ({ mkDerivation, aeson, base, bytestring, bytestring-conversion - , hspec, hspec-wai, http-types, QuickCheck, servant, servant-server - , transformers, wai, warp + , hspec, hspec-discover, hspec-wai, http-types, QuickCheck, servant + , servant-server, transformers, wai, warp }: mkDerivation { pname = "servant-mock"; version = "0.8.3"; sha256 = "0fwkygv4rx98qys8apj7aby4xhssgzqdgsxmb6vh4ky71vjq0q5m"; + revision = "2"; + editedCabalFile = "00dq310ik9nm20mxxr9d46jilp9h6k54f5mdl1ii2ggwy2mck1dm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -174170,6 +178814,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; @@ -174252,6 +178897,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "servant-pandoc_0_5_0_0" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, http-media + , lens, pandoc-types, servant-docs, string-conversions, text + , unordered-containers + }: + mkDerivation { + pname = "servant-pandoc"; + 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 ({ mkDerivation, base, resource-pool, servant, time }: mkDerivation { @@ -174285,6 +178948,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "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-proto-lens"; + version = "0.1.0.1"; + sha256 = "1sa3vkr4vd6lvclscb4ki7ph17pdvq8ka22gmymz0yr760nx398a"; + libraryHaskellDepends = [ + base bytestring http-media proto-lens servant + ]; + testHaskellDepends = [ + 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/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" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, http-types, lens, mainland-pretty, purescript-bridge @@ -174361,10 +179048,10 @@ self: { "servant-quickcheck" = callPackage ({ 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-blaze, 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"; @@ -174381,6 +179068,7 @@ self: { http-client QuickCheck quickcheck-io servant servant-blaze servant-client servant-server transformers warp ]; + testToolDepends = [ hspec-discover ]; description = "QuickCheck entire APIs"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -174459,8 +179147,8 @@ self: { }: mkDerivation { pname = "servant-ruby"; - version = "0.5.0.0"; - sha256 = "07rjrx5g41yz4wiax4z535zrdcyfvwpbjm81sdyskmkv44mv5g8z"; + version = "0.5.1.0"; + sha256 = "0j1q8yl1cz8lwij17zl13rk35r0qnk8ibh963qlcd35w83wms56j"; libraryHaskellDepends = [ base casing lens servant-foreign text ]; testHaskellDepends = [ base doctest QuickCheck ]; homepage = "https://github.com/joneshf/servant-ruby#readme"; @@ -174492,11 +179180,12 @@ self: { ({ 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 + , hspec-discover, 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"; @@ -174520,6 +179209,7 @@ self: { 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; @@ -174529,11 +179219,12 @@ self: { ({ 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 + , hspec-discover, 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"; @@ -174559,6 +179250,7 @@ self: { 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; @@ -174601,8 +179293,8 @@ self: { }: mkDerivation { pname = "servant-snap"; - version = "0.8.0.1"; - sha256 = "06n9zvz18hwizi5iqldlhgwr1m83fg5l3dzlaarl2rgvr1dnkh2i"; + version = "0.8.1"; + sha256 = "0l85gs987g6z3r6pqrf79279l1jmxq3pl8xjz62ps0p3ww1rp296"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -174613,7 +179305,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 @@ -174758,6 +179450,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-websockets_1_1_0" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, conduit + , exceptions, resourcet, servant-server, text, wai, wai-websockets + , warp, websockets + }: + mkDerivation { + pname = "servant-websockets"; + version = "1.1.0"; + sha256 = "0l8a5zc6wiwdfxv2kirb7kxky4zwj71rcrrg1zh07gc3vf4lqf33"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bytestring conduit exceptions resourcet + servant-server text wai wai-websockets warp websockets + ]; + executableHaskellDepends = [ + aeson base conduit servant-server text wai warp websockets + ]; + homepage = "https://github.com/moesenle/servant-websockets#readme"; + description = "Small library providing WebSocket endpoints for servant"; + 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 @@ -174883,6 +179599,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "serverless-haskell" = callPackage + ({ mkDerivation, aeson, aeson-casing, amazonka-core + , amazonka-kinesis, amazonka-s3, base, bytestring, hspec + , hspec-discover, lens, raw-strings-qq, text, time, unix + , unordered-containers + }: + mkDerivation { + pname = "serverless-haskell"; + version = "0.4.0"; + sha256 = "12nwj81hwlqmmr4d0vgi4a5gd2zcnndn5rhkx33b0cflfrqcwyp3"; + libraryHaskellDepends = [ + aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base + bytestring lens text time unix unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base + bytestring 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; + }) {}; + "serversession" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , containers, data-default, hashable, hspec, nonce, path-pieces @@ -174961,8 +179701,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 @@ -175141,8 +179881,8 @@ self: { }: mkDerivation { pname = "sessiontypes"; - version = "0.1.1"; - sha256 = "0l9chnnyq8mblxqyg89nlfa55cadwy62mj29arakrc988l6ja3gq"; + version = "0.1.2"; + sha256 = "1xjf3yjapz9ipjkqhm8fljgbj6fww3iyl1mx1kjwh18s6b9ymq5s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -175162,8 +179902,8 @@ self: { }: mkDerivation { pname = "sessiontypes-distributed"; - version = "0.1.0"; - sha256 = "1q0y37iwjafcb70fv42hny44ay0bpzbvss48h10dahvsmzpqkk8a"; + version = "0.1.1"; + sha256 = "0fi263sdpshzjwc51h9rqgg0zj7f5a6igrfj9487lbdgaz1cb1ya"; libraryHaskellDepends = [ base binary bytestring distributed-process distributed-static exceptions rank1dynamic sessiontypes @@ -175314,6 +180054,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 { @@ -175740,6 +180502,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "shake-ats" = callPackage + ({ mkDerivation, base, directory, language-ats, shake, shake-ext + , text + }: + mkDerivation { + pname = "shake-ats"; + version = "0.2.0.4"; + sha256 = "0n4sxla0ribkr2m5bbbh6h0lhp3ddiaan8w1k34ca1qbjwj1xz77"; + libraryHaskellDepends = [ + base directory language-ats shake shake-ext text + ]; + homepage = "https://github.com/vmchale/shake-ats#readme"; + description = "Utilities for building ATS projects with shake"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "shake-cabal-build" = callPackage ({ mkDerivation, base, Cabal, directory, filepath, process }: mkDerivation { @@ -175757,6 +180535,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "shake-ext" = callPackage + ({ mkDerivation, base, composition-prelude, directory, language-ats + , mtl, shake, text + }: + mkDerivation { + pname = "shake-ext"; + version = "1.4.0.7"; + sha256 = "00c4yv2gdrzi4cm9n3k8s33xmv6p78ips1l809qbjpkdpn2dc5jy"; + libraryHaskellDepends = [ + base composition-prelude directory language-ats mtl shake text + ]; + homepage = "https://hub.darcs.net/vmchale/shake-ext"; + description = "Helper functions for linting with shake"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "shake-extras" = callPackage ({ mkDerivation, base, bytestring, cmdargs, directory, filepath , shake @@ -175825,8 +180619,8 @@ self: { ({ 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"; @@ -175889,8 +180683,8 @@ self: { }: mkDerivation { pname = "shakers"; - version = "0.0.38"; - sha256 = "08wnf9cv4qsrnx2m3l1nfh74q6i14ng2js4h7gj3z5dv1ki3xwm9"; + version = "0.0.40"; + sha256 = "0jlihrgg0c2ksbj2dkzsp6c83m66dxdsy3993xpa018idjsm3cf9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -176312,10 +181106,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 = [ @@ -176323,23 +181115,23 @@ 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 + , enclosed-exceptions, exceptions, filepath, hspec, 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.7.0"; - sha256 = "0jscygg381hzb4mjknrwsfw0q3j4sf1w4qrz1mf4k38794axx21q"; + version = "1.7.0.1"; + sha256 = "0a4ngy8jqcscqhimgiyz7f9kqm23is7x7gyjxr0j6iq1dy57ahq3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -176350,9 +181142,9 @@ 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 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"; @@ -176423,8 +181215,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 @@ -176454,6 +181246,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;}; @@ -176711,10 +181504,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 @@ -176867,6 +181661,7 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "Thom polynomials of second order Thom-Boardman singularities"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sign" = callPackage @@ -176948,18 +181743,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.3"; - sha256 = "1brvx8acfvpcw402b3676ydi6r95js6bhaasll59bm1khhl8d90b"; + 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; }) {}; @@ -177753,6 +182550,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "simpleconfig" = callPackage + ({ mkDerivation, base, containers, generic-deriving, lens, text }: + mkDerivation { + pname = "simpleconfig"; + version = "0.0.8"; + sha256 = "0xxnirw7px97gssi2i823hsri168jy2rjwkhnkh6c80p997icdjf"; + 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 ({ mkDerivation, base, bytestring, connection, containers, hspec , HUnit, knob, network, old-locale, time @@ -178013,8 +182825,8 @@ self: { ({ 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"; @@ -178053,6 +182865,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "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.4.1"; + sha256 = "1kzrl9njvkbvxylk9jg61vy3ksmxmzymci5hdp0ilpsah4620yjx"; + libraryHaskellDepends = [ + base containers ghc-boot-th mtl syb template-haskell text + th-desugar transformers + ]; + testHaskellDepends = [ + base directory filepath process tasty tasty-golden + ]; + homepage = "http://www.github.com/goldfirere/singletons"; + description = "A framework for generating singleton types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "singnal" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -178126,23 +182960,25 @@ self: { "siren-json" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, hspec, http-media, http-types, network-uri - , network-uri-json, 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.2"; - sha256 = "0jkrqqfl713vpmypm7bkzvv5sia23zjhk0l90slyk4cmcmxn1s1a"; + version = "0.1.3.1"; + sha256 = "1chwf9kldwf039qad55la4yh13wjax64g0pi99hw2b46x7dx4qm1"; libraryHaskellDepends = [ aeson base bytestring containers http-media http-types network-uri network-uri-json text unordered-containers ]; testHaskellDepends = [ aeson base bytestring case-insensitive containers hspec http-media - http-types network-uri network-uri-json 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; @@ -178486,14 +183322,14 @@ self: { "skylighting" = 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 - , utf8-string + , 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.5"; - sha256 = "1as4rdzn69jyn3lmzk257j6q208a8z695jsc82jwmlsdyva1m3ic"; + version = "0.5.1"; + sha256 = "0l5lhhqqlfaq1fs7pn3n3b25kmazk8p4ahwvhagbrhcbm5hsigdg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -178508,7 +183344,8 @@ self: { ]; 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 @@ -178518,32 +183355,34 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "skylighting_0_5_0_1" = 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 - , utf8-string + "skylighting_0_6" = 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, utf8-string }: mkDerivation { pname = "skylighting"; - version = "0.5.0.1"; - sha256 = "1jq61wdb83by5qkyfjp9bda2651ddnbskldc4cisr2xm4qjds1ap"; + version = "0.6"; + sha256 = "1027rcj6zqmnwm6is5k5v28r8af8bsf6i36dwi128h5g92pg206f"; 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 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 + aeson ansi-terminal base base64-bytestring binary blaze-html + bytestring case-insensitive colour containers directory filepath + hxt pretty-show 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 containers criterion directory filepath text @@ -178591,6 +183430,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;}; @@ -178703,6 +183543,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "slate" = callPackage + ({ mkDerivation, base, directory, filepath, optparse-applicative }: + mkDerivation { + pname = "slate"; + version = "0.4.0.0"; + sha256 = "0j2n2wix01ildnpy6k289j5dlf9i7zbi1yd4k5hdvamwlvibqzjl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory filepath optparse-applicative + ]; + executableHaskellDepends = [ + base directory filepath optparse-applicative + ]; + testHaskellDepends = [ + base directory filepath optparse-applicative + ]; + 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 @@ -178902,8 +183764,8 @@ self: { }: mkDerivation { pname = "smallcaps"; - version = "0.6.0.4"; - sha256 = "1lw5zzfpizwrbpm981xr7sx1ac7iwkhwp541g276sszq927ls8n5"; + version = "0.6.0.5"; + sha256 = "06cqknha64gmf3rjjmcr3358fd5rii6xlgph5fvan0h25cnlk7nw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -178923,8 +183785,8 @@ self: { ({ mkDerivation, base, ghc-prim, logict, mtl, pretty }: mkDerivation { pname = "smallcheck"; - version = "1.1.3"; - sha256 = "15f00jzfv9a35507hax3y7vwwzj1fkbf38hs16797hlrsaxmnlmm"; + 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"; @@ -179381,19 +184243,17 @@ 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"; libraryHaskellDepends = [ aeson attoparsec base bytestring cereal clientsession configurator containers directory directory-tree dlist filepath hashable heist @@ -179404,7 +184264,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 @@ -179604,8 +184464,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; @@ -179733,8 +184593,8 @@ self: { pname = "snap-server"; version = "1.0.3.3"; sha256 = "1vjfpgcl09l974mdsvgxdlqcl68xmn33z1scx3sfyvcnz32xnnkl"; - revision = "1"; - editedCabalFile = "1laqh4q98ia8l7znhsv4vpx04rb9sdb9dgycx4aychfrb0fbb3pc"; + revision = "2"; + editedCabalFile = "1nb3jxr7sgw2r305k6bbbyyx8myxm3r01a8zhvxdkz4xvv9907d0"; configureFlags = [ "-fopenssl" ]; isLibrary = true; isExecutable = true; @@ -179776,10 +184636,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 = [ @@ -180269,21 +185127,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.5.1"; + sha256 = "00p5f1xysv618yd4s9zw66zfjpa1gx7nld5k9ysm8vrd0haa4v5r"; 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"; @@ -181238,13 +186096,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; }) {}; @@ -181711,8 +186567,8 @@ self: { }: mkDerivation { pname = "spake2"; - version = "0.4.0"; - sha256 = "109hvcphd2rvqls84ahs6yy9k58yhh4f0zgqc4c78a6nz4709hdp"; + version = "0.4.2"; + sha256 = "02zvlh7pva2d2k56n3070wdp4chv6avhwzn7mg2zax1mzswd21r4"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -181759,8 +186615,8 @@ self: { }: mkDerivation { pname = "sparkle"; - version = "0.7.1"; - sha256 = "1494c6zwn8q3aj9x07r2iikkbnxf8r3aw823dip47sygc95wy39w"; + version = "0.7.2.1"; + sha256 = "1bfgj1a43aj4nwzq1471l2sb9il7sh0czc22fhmd8mhpbz6wlnsp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -181778,6 +186634,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "sparql-protocol" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, exceptions + , http-client, lens, text, wreq + }: + mkDerivation { + pname = "sparql-protocol"; + version = "1.1.0.0"; + sha256 = "0nzgficvcbidxgsga106kgzwavf92qb75b6cd49fbp0fmw02krj7"; + libraryHaskellDepends = [ + aeson base bytestring containers exceptions http-client lens text + wreq + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/ardamose123/sparql-protocol"; + description = "An SPARQL 1.1 Protocol client library."; + license = stdenv.lib.licenses.gpl3; + }) {}; + "sparse" = callPackage ({ mkDerivation, array, base, bytestring, containers, contravariant , criterion, deepseq, directory, doctest, filepath, hlint @@ -182387,8 +187261,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"; @@ -182612,6 +187486,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;}; @@ -183024,13 +187899,13 @@ self: { }) {}; "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 = [ @@ -183039,7 +187914,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"; @@ -183430,6 +188307,8 @@ self: { pname = "stache"; version = "1.2.1"; sha256 = "0fqipjyin2hpklm0gaab4qhcfj9gzkpb2g948sqzf1n6alkxvyvb"; + revision = "1"; + editedCabalFile = "18h31a8bd7v96lc9q0ai7sblnxg3y55s1053jqdixi3y7lz3jh79"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory filepath @@ -183469,10 +188348,10 @@ self: { }: mkDerivation { pname = "stack"; - version = "1.6.1"; - sha256 = "0mf95h83qrgidkfvwm47w262fprsh8g5rf9mzkc1v2ifbn9b93v9"; - revision = "1"; - editedCabalFile = "103w999pac6337idj241iil52rssjp4vn5r5bvgl72sn64wxkm4x"; + version = "1.6.3"; + sha256 = "0ylika6qf7agj07wh47xjirhg74l63lx80q0xm41yd9g5ssk9cbj"; + revision = "3"; + editedCabalFile = "0sqhg84iyh8rmsls5lgk0and68rxkp6m4668z42y5zzy810xgd4i"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -183596,6 +188475,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 @@ -184034,8 +188929,8 @@ self: { }: mkDerivation { pname = "stackage2nix"; - version = "0.3.0"; - sha256 = "1cgcdgsw8qbc7dcfvj2jhwaja5x03fqa8f67c8f86fzrn0wcvw47"; + version = "0.4.0"; + sha256 = "0qj8v7kdyqsgm518gfrpdsvv7njwzrg2lm3k6cwd3lh50l9vsgcd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184049,7 +188944,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; @@ -184074,8 +188969,8 @@ self: { }: mkDerivation { pname = "stagen"; - version = "0.0.0"; - sha256 = "17hvijrkc0lczppp8c73n8drjghn7mmwhdai0m4rilga3vminw7r"; + version = "0.1.0"; + sha256 = "0cd0639ms4vcdvjvhn8l0893d5nv51kzg3ky0xd9bnmjr8f0wpzm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184123,8 +189018,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"; @@ -184281,8 +189176,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 = [ @@ -184355,6 +189252,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;}; @@ -184388,6 +189286,23 @@ self: { 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 ({ mkDerivation, array, base, containers, hashable, primes }: mkDerivation { @@ -184668,13 +189583,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; hydraPlatforms = stdenv.lib.platforms.none; @@ -185546,6 +190459,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stratosphere_0_15_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hashable + , hspec, hspec-discover, lens, template-haskell, text + , unordered-containers + }: + mkDerivation { + pname = "stratosphere"; + version = "0.15.1"; + sha256 = "13221ynzcaj6hilvbcllnjf1ixv6zmsp7jnhp1ishmj42z5qarbl"; + 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 + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring 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; + }) {}; + "stratum-tool" = callPackage ({ mkDerivation, aeson, async, base, bytestring, bytestring-builder , cmdargs, connection, containers, curl, curl-aeson, network, stm @@ -185787,8 +190729,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 @@ -185956,10 +190898,8 @@ 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 @@ -186176,6 +191116,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "strict-base-types_0_6_0" = callPackage + ({ mkDerivation, aeson, base, bifunctors, binary, deepseq, ghc-prim + , hashable, lens, QuickCheck, strict + }: + mkDerivation { + pname = "strict-base-types"; + version = "0.6.0"; + sha256 = "01i8v4l47xp5f4i9czlwg1kk4lvnfmxhgqlcnacirrp0pfjmrq7p"; + libraryHaskellDepends = [ + aeson base bifunctors binary deepseq ghc-prim hashable lens + QuickCheck strict + ]; + homepage = "https://github.com/meiersi/strict-base-types"; + description = "Strict variants of the types provided in base"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "strict-concurrency" = callPackage ({ mkDerivation, base, deepseq }: mkDerivation { @@ -186632,6 +191590,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stripe-core_2_3_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, mtl, text, time + , transformers, unordered-containers + }: + mkDerivation { + pname = "stripe-core"; + version = "2.3.0"; + sha256 = "08656c3s9326kgppwiys7whil47yw6qibjzmivjzykh6858j0kfm"; + libraryHaskellDepends = [ + aeson base bytestring mtl text time transformers + unordered-containers + ]; + homepage = "https://github.com/dmjio/stripe-haskell"; + description = "Stripe API for Haskell - Pure Core"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stripe-haskell" = callPackage ({ mkDerivation, base, stripe-core, stripe-http-streams }: mkDerivation { @@ -186644,6 +191620,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stripe-haskell_2_3_0" = callPackage + ({ mkDerivation, base, stripe-core, stripe-http-streams }: + mkDerivation { + pname = "stripe-haskell"; + 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 ({ mkDerivation, aeson, base, bytestring, free, HsOpenSSL, hspec , http-streams, io-streams, stripe-core, stripe-tests, text @@ -186664,6 +191653,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stripe-http-streams_2_3_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, free, HsOpenSSL, hspec + , http-streams, io-streams, stripe-core, stripe-tests, text + }: + mkDerivation { + pname = "stripe-http-streams"; + version = "2.3.0"; + sha256 = "0nn244ghmyibdrvzfz9k8skhsfh47sh8g34v1c63rkswqb4wpnsp"; + libraryHaskellDepends = [ + aeson base bytestring HsOpenSSL http-streams io-streams stripe-core + text + ]; + testHaskellDepends = [ + base free HsOpenSSL hspec http-streams stripe-core stripe-tests + ]; + doCheck = false; + description = "Stripe API for Haskell - http-streams backend"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stripe-tests" = callPackage ({ mkDerivation, aeson, base, bytestring, free, hspec, hspec-core , mtl, random, stripe-core, text, time, transformers @@ -186682,6 +191692,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stripe-tests_2_3_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, free, hspec, hspec-core + , mtl, random, stripe-core, text, time, transformers + , unordered-containers + }: + mkDerivation { + pname = "stripe-tests"; + version = "2.3.0"; + sha256 = "14j0zvnrl0s2br0vwpm105wscdyddan62iqwrf0fg8c4mj6kpfrw"; + libraryHaskellDepends = [ + aeson base bytestring free hspec hspec-core mtl random stripe-core + text time transformers unordered-containers + ]; + 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 ({ mkDerivation, base, containers, hspec, mtl }: mkDerivation { @@ -186704,8 +191733,8 @@ self: { }: mkDerivation { pname = "strive"; - version = "4.0.1"; - sha256 = "1bws8z9ky5zryzy7njllm2f7lddbncb1rxz2ngq6kqcdnc14ph2v"; + version = "4.0.3"; + sha256 = "1b1shq0jznyx9cbir33diflw1602py651rqj2hfjrgdywjrac8fq"; libraryHaskellDepends = [ aeson base bytestring data-default gpolyline http-client http-client-tls http-types template-haskell text time transformers @@ -186716,6 +191745,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "strive_5_0_2" = 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 = "5.0.2"; + sha256 = "1dx93rda40nv87amgk885bg4dn96qhmnq4mmfiqwb09mp6g1a0m5"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "strptime" = callPackage ({ mkDerivation, base, bytestring, text, time }: mkDerivation { @@ -186995,6 +192044,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stylish-haskell_0_9_0_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , file-embed, filepath, haskell-src-exts, HUnit, mtl + , optparse-applicative, strict, syb, test-framework + , test-framework-hunit, yaml + }: + mkDerivation { + pname = "stylish-haskell"; + version = "0.9.0.2"; + sha256 = "0w0hh08b1zlp3disxp20yrg20vblqgk5y3arf8xbfiznzf05x5zr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers directory file-embed filepath + haskell-src-exts mtl syb yaml + ]; + executableHaskellDepends = [ + aeson base bytestring containers directory file-embed filepath + haskell-src-exts mtl optparse-applicative strict syb yaml + ]; + testHaskellDepends = [ + aeson base bytestring containers directory file-embed filepath + haskell-src-exts HUnit mtl syb test-framework test-framework-hunit + yaml + ]; + homepage = "https://github.com/jaspervdj/stylish-haskell"; + description = "Haskell code prettifier"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stylized" = callPackage ({ mkDerivation, ansi-terminal, base }: mkDerivation { @@ -187069,6 +192149,7 @@ self: { homepage = "http://github.com/mikeizbicki/subhask"; description = "Type safe interface for programming in subcategories of Hask"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "subleq-toolchain" = callPackage @@ -187129,15 +192210,16 @@ self: { }) {}; "substring-parser" = callPackage - ({ mkDerivation, attoparsec, base, containers, hspec, NoTrace, text + ({ mkDerivation, attoparsec, base, dlist, hspec, NoTrace + , QuickCheck, text }: mkDerivation { pname = "substring-parser"; - version = "0.3.0.0"; - sha256 = "0yfdrmadsra7692zsqm2cnmx0hr2lrkx0swvhk3gw3666453x84j"; - libraryHaskellDepends = [ attoparsec base NoTrace text ]; + version = "0.4.0.0"; + sha256 = "0xi3yjgp87515g99qxnhjkcr2ddqc0b6rz0whg2zsi00z1sb6wc3"; + libraryHaskellDepends = [ attoparsec base dlist NoTrace text ]; testHaskellDepends = [ - attoparsec base containers hspec NoTrace text + attoparsec base hspec NoTrace QuickCheck text ]; homepage = "https://gitlab.com/igrep/substring-parser"; description = "Match / replace substrings with a parser combinators"; @@ -187215,8 +192297,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"; @@ -187868,8 +192950,8 @@ self: { }: mkDerivation { pname = "swagger-petstore"; - version = "0.0.1.6"; - sha256 = "0whvh1b2s6jzr885avakswrcriv8hs4x36gdx22hg0fj77dh3b5q"; + version = "0.0.1.7"; + sha256 = "07p2hd35wg5g1r3lmhffvjch5vy6idmhdv21k1g8v3131apgjpxy"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers deepseq exceptions http-api-data http-client http-client-tls @@ -187886,6 +192968,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "swagger-petstore_0_0_1_8" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , case-insensitive, containers, deepseq, exceptions, hspec + , http-api-data, http-client, http-client-tls, http-media + , http-types, iso8601-time, katip, microlens, mtl, network + , QuickCheck, random, safe-exceptions, semigroups, text, time + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "swagger-petstore"; + 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 + http-media http-types iso8601-time katip microlens mtl network + random safe-exceptions text time transformers unordered-containers + vector + ]; + testHaskellDepends = [ + aeson base bytestring containers hspec iso8601-time mtl QuickCheck + semigroups text time transformers unordered-containers vector + ]; + homepage = "https://github.com/swagger-api/swagger-codegen#readme"; + description = "Auto-generated swagger-petstore API Client"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "swagger-test" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, binary, blaze-html , bytestring, case-insensitive, containers, directory, filepath @@ -187919,10 +193030,10 @@ self: { "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 + , scientific, template-haskell, text, time, transformers + , transformers-compat, unordered-containers, uuid-types, vector }: mkDerivation { pname = "swagger2"; @@ -187940,6 +193051,7 @@ self: { hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck 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; @@ -188465,6 +193577,7 @@ self: { homepage = "http://github.com/brentlintner/synt"; description = "Similar code analysis"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {Synt = null;}; @@ -188797,6 +193910,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;}; @@ -188995,8 +194109,8 @@ self: { }: mkDerivation { pname = "system-filepath"; - version = "0.4.13.4"; - sha256 = "1yy5zsmmimhg6iaw9fmpwrxvxrgi5s6bfyqfihdsnx4bjvn7sp9l"; + version = "0.4.14"; + sha256 = "14yras4pz2dh55xpwmazcgxijvi8913pjgzb9iw50mjq1lycwmhn"; libraryHaskellDepends = [ base bytestring deepseq text ]; testHaskellDepends = [ base bytestring chell chell-quickcheck QuickCheck text @@ -189022,8 +194136,8 @@ self: { ({ mkDerivation, attoparsec, base, process, text }: mkDerivation { pname = "system-info"; - version = "0.1.0.10"; - sha256 = "164f8x4npp5pywplpz7x7q2qrmc7fc2hlqxm8zw083402sw668m7"; + version = "0.1.0.13"; + sha256 = "0ym1j9bjjv7aa3v1zqklljfyq19agv3imghglfii0qk7mrlyya9d"; libraryHaskellDepends = [ attoparsec base process text ]; testHaskellDepends = [ base ]; homepage = "https://github.com/ChaosGroup/system-info"; @@ -189189,6 +194303,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;}; @@ -189628,8 +194743,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 ]; @@ -189765,10 +194880,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; @@ -189872,12 +194985,11 @@ self: { }: mkDerivation { pname = "tagsoup"; - version = "0.14.2"; - sha256 = "1j7gliwn4x6i25zlhc8f704pbc96ddn9gb9czq3a4m0k1sfpm3w8"; + version = "0.14.3"; + sha256 = "00j2rm2sx0syn16kg2402fz4k8yqfl9knmi367jsiycds1q9zzf9"; libraryHaskellDepends = [ base bytestring containers text ]; testHaskellDepends = [ - base bytestring containers deepseq directory process QuickCheck - text time + 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"; @@ -190277,6 +195389,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tar-conduit_0_2_0" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-combinators + , containers, criterion, deepseq, directory, filepath, hspec, unix + , weigh + }: + mkDerivation { + pname = "tar-conduit"; + version = "0.2.0"; + sha256 = "01fqvm5wji1rgivqri0prp3k3drhr3gmmlcwy0v4qcwdhwgi0r2r"; + libraryHaskellDepends = [ + base bytestring conduit-combinators directory filepath unix + ]; + testHaskellDepends = [ + base bytestring conduit conduit-combinators containers deepseq + directory filepath hspec weigh + ]; + benchmarkHaskellDepends = [ + base bytestring conduit conduit-combinators containers criterion + deepseq directory filepath hspec + ]; + homepage = "https://github.com/snoyberg/tar-conduit#readme"; + description = "Extract and create tar files using conduit for streaming"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tardis" = callPackage ({ mkDerivation, base, mmorph, mtl }: mkDerivation { @@ -190327,6 +195465,7 @@ self: { ]; description = "Generate test-suites from refinement types"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) z3;}; "tart" = callPackage @@ -190447,18 +195586,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty_0_12" = callPackage + "tasty_1_0_0_1" = callPackage ({ mkDerivation, ansi-terminal, async, base, clock, containers - , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged - , unbounded-delays, unix + , deepseq, mtl, optparse-applicative, stm, tagged, unbounded-delays + , unix }: mkDerivation { pname = "tasty"; - version = "0.12"; - sha256 = "0840ziawhj0lrzn927nx9lww6wxc5krvf0c3xygl577vvxh4adg1"; + version = "1.0.0.1"; + sha256 = "0ggqffw9kbb6nlq1pplk131qzxndqqzqyf4s2p7576nljx11a7qf"; libraryHaskellDepends = [ ansi-terminal async base clock containers deepseq mtl - optparse-applicative regex-tdfa stm tagged unbounded-delays unix + optparse-applicative stm tagged unbounded-delays unix ]; homepage = "https://github.com/feuerbach/tasty"; description = "Modern and extensible testing framework"; @@ -190473,8 +195612,8 @@ self: { }: mkDerivation { pname = "tasty-ant-xml"; - version = "1.1.1"; - sha256 = "0asvz2jjk1zf3ylps1277kf4yy6bifascblsd3vjfk9k9rh52w3j"; + version = "1.1.2"; + sha256 = "10k8092iz8klx7wa3ajfny8zvrxv3clz330v3qz3k7dmbj596nhq"; libraryHaskellDepends = [ base containers directory filepath generic-deriving ghc-prim mtl stm tagged tasty transformers xml @@ -190518,6 +195657,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-dejafu_1_0_0_1" = callPackage + ({ mkDerivation, base, dejafu, random, tagged, tasty }: + mkDerivation { + pname = "tasty-dejafu"; + version = "1.0.0.1"; + sha256 = "1b06x1z6bc010w4nfz7hf5qb35z6cwa8bz35qd4526qnxqf88qf5"; + 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 = stdenv.lib.platforms.none; + }) {}; + "tasty-discover" = callPackage ({ mkDerivation, base, containers, directory, filepath, Glob , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit @@ -190525,8 +195677,8 @@ self: { }: mkDerivation { pname = "tasty-discover"; - version = "4.1.1"; - sha256 = "0lsz73rnvwb6z522bxfhlslvvymnjw7kw4fs8llwr3w6cvzl5vfj"; + version = "4.1.3"; + sha256 = "13w177l9ghfb9dwjwp4y1j45y2acv2ga7nw38jcqgj6a81ai9m5c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190636,18 +195788,16 @@ self: { }) {}; "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.3.3"; + sha256 = "00ym5jlh11smmg3aryfylnwjbmi62gsy5jl1pv85bc8gl0kqa85d"; 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"; @@ -190845,14 +195995,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-quickcheck_0_9_2" = callPackage + ({ mkDerivation, base, pcre-light, QuickCheck, random, tagged + , tasty, tasty-hunit + }: + mkDerivation { + pname = "tasty-quickcheck"; + version = "0.9.2"; + sha256 = "0wsqm4fjxnh64sjlccjapvgvw4dhl603qpxl79g3sa3fmgg0m4n5"; + libraryHaskellDepends = [ base QuickCheck random tagged tasty ]; + testHaskellDepends = [ base pcre-light tasty tasty-hunit ]; + homepage = "https://github.com/feuerbach/tasty"; + description = "QuickCheck support for the Tasty test framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-rerun" = callPackage ({ mkDerivation, base, containers, mtl, optparse-applicative , reducers, split, stm, tagged, tasty, transformers }: mkDerivation { pname = "tasty-rerun"; - version = "1.1.8"; - sha256 = "0yg8cicfn3qaazvp4rbanzy3dyk95k3y1kkd4bykvkl9v4076788"; + version = "1.1.9"; + sha256 = "0piwv5nrqvwnzp76xpsjlncrl2cd9jsxxb1ghkaijn2fi2c63akd"; libraryHaskellDepends = [ base containers mtl optparse-applicative reducers split stm tagged tasty transformers @@ -190865,17 +196031,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 @@ -190906,8 +196072,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 ]; @@ -191313,26 +196479,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 - , random, servant, servant-client, string-conversions, text - , transformers, utf8-string + ({ 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.7.1.0"; - sha256 = "0shb5al3ih6qrs2aw1h03mfqk954gml1lnyh6svzcsz9z6f7hvbb"; + 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 random servant - servant-client text transformers utf8-string + servant-client servant-client-core text transformers utf8-string ]; homepage = "http://github.com/klappvisor/haskell-telegram-api#readme"; description = "Telegram Bot API bindings"; @@ -192103,6 +197270,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "terminal-progress-bar_0_2" = callPackage + ({ mkDerivation, async, base, HUnit, stm, stm-chans, terminal-size + , test-framework, test-framework-hunit + }: + mkDerivation { + pname = "terminal-progress-bar"; + version = "0.2"; + sha256 = "052az3lxmhfssvm1i5md5d9la7vhfy560ls101kvw73vdzxk9cfn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ async base stm stm-chans terminal-size ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit + ]; + homepage = "https://github.com/roelvandijk/terminal-progress-bar"; + description = "A simple progress bar in the terminal"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "terminal-size" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -192127,12 +197314,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"; @@ -192256,8 +197443,8 @@ self: { pname = "test-framework"; version = "0.8.1.1"; sha256 = "0wxjgdvb1c4ykazw774zlx86550848wbsvgjgcrdzcgbb9m650vq"; - revision = "2"; - editedCabalFile = "1mp1h0fzwxa3xxnbw33lp8hj0rb8vwkd712r5ak8ny5nmawh2c9y"; + revision = "3"; + editedCabalFile = "1b6pi4j1dpcbiyx1bpfks29x293j02z7ashs2sdc8fhzbwsr9lxj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192269,6 +197456,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "test-framework_0_8_2_0" = callPackage + ({ 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.2.0"; + sha256 = "1hhacrzam6b8f10hyldmjw8pb7frdxh04rfg3farxcxwbnhwgbpm"; + libraryHaskellDepends = [ + ansi-terminal ansi-wl-pprint base containers hostname old-locale + random regex-posix time xml + ]; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "test-framework-doctest" = callPackage ({ mkDerivation, base, doctest, test-framework , test-framework-hunit @@ -192803,8 +198014,8 @@ self: { }: mkDerivation { pname = "texbuilder"; - version = "0.1.2.0"; - sha256 = "076im75jx1g37cvhvfc6a7my6m81rcgdww6y97p0ldwjbv88gsk3"; + version = "0.1.4.0"; + sha256 = "0i301a78790cqhgb28bhc2qksymbx2jdr31m2x59nsj7hmw268b2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -192824,8 +198035,8 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.10"; - sha256 = "0i9haxii7kklz6qrfidb54iv5cl73p201zy24mwkf4bf56lff1pa"; + version = "0.10.1.1"; + sha256 = "0q2fld5mdcd6j1n3rrg3bjpndbgbn17cwg0xbnvscrpa0s767jaj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192886,6 +198097,31 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "text_1_2_3_0" = callPackage + ({ mkDerivation, array, base, binary, bytestring, deepseq + , directory, ghc-prim, HUnit, integer-gmp, QuickCheck + , quickcheck-unicode, random, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "text"; + version = "1.2.3.0"; + sha256 = "06iir7q99rnffzxi8gagn8w1k9m49368sbidgz634fv1gxib3q10"; + libraryHaskellDepends = [ + array base binary bytestring deepseq ghc-prim integer-gmp + ]; + testHaskellDepends = [ + array base binary bytestring deepseq directory ghc-prim HUnit + integer-gmp QuickCheck quickcheck-unicode random test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + doCheck = false; + homepage = "https://github.com/haskell/text"; + description = "An efficient packed Unicode text type"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-all" = callPackage ({ mkDerivation, base, bytestring, text, text-format, utf8-string }: @@ -193177,21 +198413,21 @@ self: { "text-ldap" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring , containers, dlist, QuickCheck, quickcheck-simple, random - , semigroups, transformers + , transformers }: mkDerivation { pname = "text-ldap"; - version = "0.1.1.8"; - sha256 = "0ff057nr4v6hvwsa7avkz14nw63542l0zfsjb91q9nr60kvnsipj"; + version = "0.1.1.10"; + sha256 = "13wjarsshp64cc632bqmckx664a57w7cnlm8gs7rfp1bcm7vdnjk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring containers dlist - semigroups transformers + 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; @@ -193292,6 +198528,8 @@ self: { pname = "text-metrics"; version = "0.3.0"; sha256 = "18mzxwkdvjp31r720ai9bnxr638qq8x3a2v408bz0d8f0rsayx1q"; + revision = "1"; + editedCabalFile = "0jl0vlx9y0n7x4j5zspx6zmbbnmlf5p2bg6v9k2afdfc02fmhasm"; libraryHaskellDepends = [ base containers text vector ]; testHaskellDepends = [ base hspec QuickCheck text ]; benchmarkHaskellDepends = [ base criterion deepseq text weigh ]; @@ -193446,6 +198684,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "text-replace" = callPackage + ({ mkDerivation, base, containers, hedgehog, neat-interpolation + , optparse-applicative, parsec, text + }: + mkDerivation { + pname = "text-replace"; + version = "0.0.0.1"; + sha256 = "15qf0pwjhaa2zwdzixil5q1iqs5cwlazggzsgwwq553jlggbf063"; + 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 @@ -193469,14 +198725,17 @@ self: { ({ 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 + , 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.7"; - sha256 = "11wnvnc87rrzg949b00vbx3pbcxskrapdy9dklh6szq6pcc38irr"; + version = "3.7.1"; + sha256 = "0gbf3cpxz92v4jphmwvz93il7m38qkwirfnk5453517k2s84s899"; + revision = "1"; + editedCabalFile = "1f30i7b45hq3m1hb7b6m8kc1fwz4i697m17wwiabjsyzbx4qiv98"; libraryHaskellDepends = [ array base base-compat bifunctors bytestring bytestring-builder containers contravariant generic-deriving ghc-boot-th ghc-prim @@ -193490,6 +198749,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 @@ -193514,6 +198774,8 @@ self: { pname = "text-show-instances"; version = "3.6.2"; sha256 = "0c64ibvzpz2h4f54bhrla4yf4mhsl3x2ag2nx2kj81g47pw917r5"; + revision = "1"; + editedCabalFile = "04rkwk7c6zzl2ql22x66gn3amgq7cfqdndxyhh6ywlbksa9ljjsw"; libraryHaskellDepends = [ base base-compat bifunctors binary bytestring containers directory ghc-boot-th haskeline hoopl hpc old-locale old-time pretty process @@ -193971,12 +199233,47 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "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.8"; + sha256 = "0nbsgf3lxmjj43f1xdjb1z486h8av47mym6v1y5pzdv39wgiykdv"; + libraryHaskellDepends = [ + base containers mtl syb template-haskell th-expand-syns th-lift + th-orphans + ]; + testHaskellDepends = [ + base containers hspec HUnit mtl syb template-haskell th-expand-syns + th-lift th-orphans + ]; + homepage = "https://github.com/goldfirere/th-desugar"; + description = "Functions to desugar Template Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "th-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"; @@ -194132,17 +199429,18 @@ self: { }) {}; "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"; 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; }) {}; @@ -194305,8 +199603,8 @@ self: { }: mkDerivation { pname = "thank-you-stars"; - version = "0.2.0"; - sha256 = "0a1mv7k7m4yaadfrmb45s09aa5zy0wd2jccjsyqhp63v89m58z8j"; + version = "0.3.0"; + sha256 = "0cks475c8ivhikci7h8zkvxhxmp7n9w85b16wvx998q3bjrbkj04"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -194453,8 +199751,8 @@ self: { pname = "these"; version = "0.7.4"; sha256 = "0jl8ippnsy5zmy52cvpn252hm2g7xqp1zb1xcrbgr00pmdxpvwyw"; - revision = "2"; - editedCabalFile = "0mxl547dy7pp95kh3bvmdhsfcrmxcx8rzc94nnmcs3ahrbyw1nl1"; + revision = "5"; + editedCabalFile = "1jx0p6z91nz5dagw4bcvb7lr9a15ahjnx0nhyv8cmd8p056m5515"; libraryHaskellDepends = [ aeson base bifunctors binary containers data-default-class deepseq hashable keys mtl profunctors QuickCheck semigroupoids transformers @@ -195054,24 +200352,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; @@ -195288,14 +200584,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "time_1_8_0_3" = callPackage + "time_1_9" = 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"; + sha256 = "13nfiwsh1bq4w9rwmqm1iy9kxwrqbi82qpqlpcd02ywklh21silx"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq QuickCheck random tasty tasty-hunit tasty-quickcheck @@ -195423,9 +200719,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; }) {}; @@ -196354,8 +201651,8 @@ self: { }: mkDerivation { pname = "tldr"; - version = "0.2.3"; - sha256 = "11xg9b2abfvwh484wkrj8j1c65qdy95c3xdc6gsmzqcyzi8d6k7j"; + version = "0.2.5"; + sha256 = "0b87zkwj27z7h5rxf25qh4sq20smwbd3fg6j30hgmn0p9rsg4gzw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -196856,17 +202153,19 @@ self: { "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"; @@ -197564,16 +202863,17 @@ 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, transformers }: + ({ mkDerivation, base, text, transformers }: mkDerivation { pname = "transformers-either"; - version = "0.0.1"; - sha256 = "1hr10mfmx2ac7si8a43cyhgxzg75amqin3wyvw06bgymnvd00dqj"; - libraryHaskellDepends = [ base transformers ]; + version = "0.0.2"; + sha256 = "1122rgspazl3n9vghlzzg14hv6p0a66lf6r7hkim14p0rcagvx5a"; + libraryHaskellDepends = [ base text transformers ]; description = "An Either monad transformer"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -197952,8 +203252,10 @@ self: { }: mkDerivation { pname = "tree-diff"; - version = "0.0.0.1"; - sha256 = "0km6himykj2q9ymaivv67dvlk7ia9dli2zhyx6g8yh8963mcn91v"; + version = "0.0.1"; + sha256 = "049v44c520jy3icxlnrvbdblh3mjmvd7m6qmkzxbzkf02x63xqmz"; + revision = "1"; + editedCabalFile = "0d3kbs32q816vlrbj17lwl1bmmv7lvwi2c2i3k3agm2a8h0psx6s"; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base base-compat bytestring containers generics-sop hashable MemoTrie parsec parsers pretty @@ -198192,8 +203494,8 @@ self: { pname = "trifecta"; version = "1.7.1.1"; sha256 = "13n6a3fdxngnzsjnhfrzigv1c2g0xm6lqkjcnirpc37sd0rpby31"; - revision = "1"; - editedCabalFile = "17i9137mqcm74s8zwdnkcg5kj583zzwqjyyz1z0af4anxfs1hvng"; + revision = "2"; + editedCabalFile = "1pbywxk2aw0bkhkhhcdqhxnkvyxxnrj13qahlzf2ivd5awmynmqp"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html @@ -198808,6 +204110,18 @@ 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-th" = callPackage ({ mkDerivation, base, containers, template-haskell }: mkDerivation { @@ -198949,7 +204263,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "turtle_1_5_0" = callPackage + "turtle_1_5_1" = callPackage ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock , containers, criterion, directory, doctest, exceptions, foldl , hostname, managed, optional-args, optparse-applicative, process @@ -198958,8 +204272,8 @@ self: { }: mkDerivation { pname = "turtle"; - version = "1.5.0"; - sha256 = "1ivskskvqbwm4bp8m2pfhb3ma9y747jfg5gfcsadwmqyqzzf90l5"; + version = "1.5.1"; + sha256 = "06yya57w3i598b6h3gkhv8zs0a3f1az12x8viy16sgdbgwph8scm"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions foldl hostname managed optional-args @@ -199302,23 +204616,25 @@ 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"; @@ -199445,15 +204761,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 @@ -199469,6 +204785,7 @@ 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; @@ -199776,6 +205093,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "type-combinators-singletons_0_2_1_0" = callPackage + ({ mkDerivation, base, singletons, type-combinators }: + mkDerivation { + pname = "type-combinators-singletons"; + 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/"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "type-digits" = callPackage ({ mkDerivation, base, template-haskell, type-spine }: mkDerivation { @@ -200020,8 +205350,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; @@ -200057,10 +205387,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 @@ -200097,8 +205425,8 @@ self: { }: mkDerivation { pname = "type-of-html"; - version = "1.3.0.1"; - sha256 = "1f6np6m3bqiigwq2859j7d4fiyzkmlyxv5gg11f53lx92f1qfaz2"; + version = "1.3.2.1"; + sha256 = "1c7yj9fh9dxkif2f116cjjgz2prdz1a3xaqni5m9gmvy2y5gvbdn"; libraryHaskellDepends = [ base bytestring double-conversion ghc-prim text ]; @@ -200316,8 +205644,8 @@ self: { }: mkDerivation { pname = "typed-process"; - version = "0.2.0.0"; - sha256 = "1vc6ig5r5ajdr9d28fk1q0cb4p7nahbknn9fkzli4n9l9bk4xhdf"; + version = "0.2.1.0"; + sha256 = "1l6wpkwnz4lriq1n0hxv3mdvzmrf44ddkb1ys8cyj3ywfn2xh56j"; libraryHaskellDepends = [ async base bytestring process stm transformers ]; @@ -200506,6 +205834,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "typelits-witnesses_0_3_0_1" = callPackage + ({ mkDerivation, base, base-compat, constraints, reflection + , transformers + }: + mkDerivation { + pname = "typelits-witnesses"; + version = "0.3.0.1"; + sha256 = "0d2537dwz5kiq81amrj2v00bvlwjfkidlz45g1h96zv78mlw1l7c"; + libraryHaskellDepends = [ + base base-compat constraints reflection transformers + ]; + homepage = "https://github.com/mstksg/typelits-witnesses"; + description = "Existential witnesses, singletons, and classes for operations on GHC TypeLits"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "typeof" = callPackage ({ mkDerivation, base, process }: mkDerivation { @@ -200571,8 +205916,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.5.0.1"; - sha256 = "1c1f6wmn8yf3crzmna4ww977cwga6wl814f0ka99s1sr65j2c5bx"; + version = "0.5.1.1"; + sha256 = "0yg75dj3bfxpqzdqw8lk7ligs39dnlya93qcg9grlbav9jpzv38n"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist monad-skeleton template-haskell text th-data-compat @@ -200925,27 +206270,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"; @@ -200954,18 +206299,19 @@ 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"; @@ -201111,8 +206457,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 @@ -201299,12 +206645,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; }) {}; @@ -201327,8 +206672,8 @@ self: { }: mkDerivation { pname = "unfoldable"; - version = "0.9.4"; - sha256 = "0qqjr060d79g5lnsdzx9ff6ava78441h8wvkn38hs7y3rvzw9vzd"; + version = "0.9.5"; + sha256 = "0ll29dvizh8hqhqncrmzwzgbb1q9br2f7326r38dr7xmdpmpjsbn"; libraryHaskellDepends = [ base containers ghc-prim one-liner QuickCheck random transformers ]; @@ -201831,16 +207176,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; }) {}; @@ -201862,8 +207224,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 @@ -201915,8 +207277,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 @@ -202028,6 +207390,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"; @@ -202042,8 +207406,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 ]; @@ -202076,6 +207440,8 @@ self: { pname = "universe-reverse-instances"; version = "1.0"; sha256 = "0jcd7qyvzq8xxv9d3hfi0f1h48xdsy9r9xnxgxc7ggga4szirm79"; + revision = "1"; + editedCabalFile = "0rq6h7yghnzrnv56pxnlfr6cfih8dbnhc6hh5416pgy5bxsa0ydj"; libraryHaskellDepends = [ base containers universe-instances-base ]; @@ -202132,6 +207498,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "universum_1_0_4" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , doctest, ghc-prim, Glob, hashable, microlens, microlens-mtl, mtl + , safe-exceptions, semigroups, stm, text, text-format, transformers + , type-operators, unordered-containers, utf8-string, vector + }: + mkDerivation { + pname = "universum"; + version = "1.0.4"; + sha256 = "1r5hwmwj5s2xpnjy9r0a6wpz9hv63bwqs7m96zj0rkip9f6nvpyv"; + libraryHaskellDepends = [ + 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 doctest Glob ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq hashable mtl semigroups text + unordered-containers + ]; + homepage = "https://github.com/serokell/universum"; + description = "Custom prelude used in Serokell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unix_2_7_2_2" = callPackage ({ mkDerivation, base, bytestring, time }: mkDerivation { @@ -202315,48 +207707,34 @@ self: { }) {}; "unliftio" = callPackage - ({ mkDerivation, async, base, deepseq, directory, filepath - , transformers, unix, unliftio-core + ({ mkDerivation, async, base, deepseq, directory, filepath, hspec + , stm, transformers, unix, unliftio-core }: mkDerivation { pname = "unliftio"; - version = "0.2.0.0"; - sha256 = "03bbhm91n0xlc207n8zzlnxp2cifr1zrcnqdys6884l062bh1xig"; - libraryHaskellDepends = [ - async base deepseq directory filepath transformers unix - unliftio-core - ]; - homepage = "https://github.com/fpco/unliftio/tree/master/unliftio#readme"; - description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; - license = stdenv.lib.licenses.mit; - }) {}; - - "unliftio_0_2_1_0" = callPackage - ({ mkDerivation, async, base, deepseq, directory, filepath, stm - , transformers, unix, unliftio-core - }: - mkDerivation { - pname = "unliftio"; - version = "0.2.1.0"; - sha256 = "09i17ajszvr1cm4x31k157mlfinxsmrmkxmjsmlvsxvch58m2lgi"; + version = "0.2.4.0"; + sha256 = "0vpncmwaq5zb6bziqfns4qdgxmq8ky0rlxna2yngxp170s5zxx9z"; libraryHaskellDepends = [ async base deepseq directory filepath stm transformers unix unliftio-core ]; + testHaskellDepends = [ + async base deepseq directory filepath hspec stm transformers unix + unliftio-core + ]; homepage = "https://github.com/fpco/unliftio/tree/master/unliftio#readme"; description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unliftio-core" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "unliftio-core"; - version = "0.1.0.0"; - sha256 = "0wxv6s91wpfv2f5x17lwm04fvghcfnmzqw7p65117pr1r6yz5fcj"; + version = "0.1.1.0"; + sha256 = "1193fplsjm1lcr05xwvkj1rsyzx74i755f6kw3ikmxbsv0bv0l3m"; 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; }) {}; @@ -202841,8 +208219,8 @@ self: { }: mkDerivation { pname = "uri-bytestring"; - version = "0.3.0.1"; - sha256 = "10bg6ia6l2blfb5068ppbnkk46linnda0c79yq99ls4j1x91wwgw"; + version = "0.3.1.0"; + sha256 = "04qjv1sgyrdg538290p9hqnvyxnahvr5cjwl8vm1rn9j0fv3ymq9"; libraryHaskellDepends = [ attoparsec base blaze-builder bytestring containers fail template-haskell th-lift-instances @@ -203457,8 +208835,8 @@ 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"; @@ -203469,8 +208847,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "util"; - version = "0.1.4.0"; - sha256 = "1b4s199qwsb1yz8wjpqybi8na20b44kkjqq09kzqky6198nmqqd8"; + version = "0.1.5.0"; + sha256 = "0rll7fv31bamnqcy3hcm8vdgzz5wjzlqhvz5lnbp1gfymx43jrga"; libraryHaskellDepends = [ base ]; description = "Utilities"; license = stdenv.lib.licenses.bsd3; @@ -203661,13 +209039,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; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -203744,14 +209122,15 @@ 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"; 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; @@ -203824,8 +209203,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"; @@ -204147,8 +209526,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "validity"; - version = "0.4.0.2"; - sha256 = "1ppisj45dccymlid7xwp1r2rgzql435smhl6s0n2b6alsx2h9qnz"; + version = "0.4.0.3"; + sha256 = "15vp8qd3fvarwd58i69if87kyc7fmf26qgrvacwnis3xwav9nyvs"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity typeclass"; @@ -204769,8 +210148,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 @@ -204835,6 +210214,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-binary-instances_0_2_4" = callPackage + ({ mkDerivation, base, binary, bytestring, criterion, deepseq + , tasty, tasty-quickcheck, vector + }: + mkDerivation { + pname = "vector-binary-instances"; + version = "0.2.4"; + sha256 = "1y236jb72iab9ska1mc48z6yb0xgwmj45laaqdyjxksd84z7hbrb"; + libraryHaskellDepends = [ base binary vector ]; + testHaskellDepends = [ base binary tasty tasty-quickcheck vector ]; + benchmarkHaskellDepends = [ + base binary bytestring criterion deepseq vector + ]; + homepage = "https://github.com/bos/vector-binary-instances"; + description = "Instances of Data.Binary and Data.Serialize for vector"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-buffer" = callPackage ({ mkDerivation, base, deepseq, vector }: mkDerivation { @@ -205080,6 +210478,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-space_0_13" = callPackage + ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: + mkDerivation { + pname = "vector-space"; + 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 ({ mkDerivation, base, containers, doctest, vector-space }: mkDerivation { @@ -205205,6 +210615,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "vectortiles_1_3_0" = callPackage + ({ 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.3.0"; + sha256 = "1hvnk2b3g6dm58az7wyl8bcq4h8s0fkz0v0pig9gpad5smkmgjk0"; + libraryHaskellDepends = [ + base bytestring containers deepseq hashable protocol-buffers + protocol-buffers-descriptor text transformers unordered-containers + vector + ]; + testHaskellDepends = [ + base bytestring containers hashable hex protocol-buffers + protocol-buffers-descriptor tasty tasty-hunit text + unordered-containers vector + ]; + benchmarkHaskellDepends = [ + 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.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "verbalexpressions" = callPackage ({ mkDerivation, base, regex-pcre }: mkDerivation { @@ -205391,19 +210832,35 @@ 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; + }) {}; + "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.12"; - sha256 = "0a9bf8smqjjwz4m0gqac9zf9qp6ka3dhy2qrflbg1k5spd0dqqh5"; + version = "0.0.0.13"; + sha256 = "1ichcff012k1f9cqk01sixv3yx52krnhjfnw73yw06kacpd7i74z"; 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"; @@ -205641,8 +211098,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"; @@ -206009,8 +211466,8 @@ self: { }: mkDerivation { pname = "vty"; - version = "5.19"; - sha256 = "0wbapqy1w3mbmfga4azlxcj047nfcpd6hnqa3xf33xy6simwxnrr"; + version = "5.19.2"; + sha256 = "158afcgzcwq7ybjw7jk28q799xzpns47m1l4sivc3wrrfklqh7xz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -206440,8 +211897,8 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.0.20.2"; - sha256 = "0szmh1wnbcw1mi89rrp35kgnjglc2dx6ib5l3rcki4d9fc04w8xn"; + version = "3.0.22.0"; + sha256 = "0rwksl5jkhkgd10qi0wvhfw28g1qci60pc6chrv5bg0w0xqkv532"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -206460,38 +211917,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "wai-extra_3_0_21_0" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring - , blaze-builder, 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.21.0"; - sha256 = "1kngdp16hia9x3i47a6f3cwbsn58678madzmj3l4qb6mcfnk1a3y"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal base base64-bytestring blaze-builder 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 blaze-builder 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 @@ -206741,8 +212166,8 @@ self: { }: mkDerivation { pname = "wai-logger"; - version = "2.3.0"; - sha256 = "1w0b0vinsyqr37wciljkz8g5dcmfi2r210lq194a0wkycly9kkch"; + version = "2.3.1"; + sha256 = "0ldx9jiq70ga2clsrg1sw5jsy76n4s6kzs3785qs87gbj5dqfdip"; libraryHaskellDepends = [ base blaze-builder byteorder bytestring case-insensitive fast-logger http-types network unix unix-time wai @@ -206752,6 +212177,30 @@ self: { 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 @@ -207008,8 +212457,8 @@ self: { }: mkDerivation { pname = "wai-middleware-content-type"; - version = "0.5.1"; - sha256 = "1xvb38nq7mb4gpraj46j39hgf9vqcqng3hxhlj52zj7yn7d6279q"; + version = "0.5.2"; + sha256 = "0v9gi7lljfn58g558xlxhlmp4chq7m6a4kf0b4k23scygwh727jj"; libraryHaskellDepends = [ aeson base blaze-builder blaze-html bytestring clay exceptions extractable-singleton hashable http-media http-types lucid mmorph @@ -207243,8 +212692,8 @@ self: { }: mkDerivation { pname = "wai-middleware-rollbar"; - version = "0.8.0"; - sha256 = "07fms55rpa099hlmr02dsbij8pr81r9h4m7ll1bxq06zgyi7ajzd"; + version = "0.8.2"; + sha256 = "08bzikcfgrni328mmxwxsr4kbsc5bjjacbxm18hs74b8n4g5f1qd"; libraryHaskellDepends = [ aeson base bytestring case-insensitive hostname http-client http-conduit http-types network text time unordered-containers uuid @@ -207259,6 +212708,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wai-middleware-rollbar_0_8_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, hostname, hspec, hspec-golden-aeson, http-client + , http-conduit, http-types, lens, lens-aeson, network, QuickCheck + , text, time, unordered-containers, uuid, wai + }: + mkDerivation { + pname = "wai-middleware-rollbar"; + version = "0.8.3"; + sha256 = "17ys7ddpfa0sbjh79k240zqk2v7nlh0v7hrgr7kanal3pk7mvwvm"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive hostname http-client + http-conduit http-types network text time unordered-containers uuid + wai + ]; + testHaskellDepends = [ + aeson base bytestring case-insensitive containers hspec + hspec-golden-aeson lens lens-aeson QuickCheck text + ]; + homepage = "https://github.com/joneshf/wai-middleware-rollbar#readme"; + description = "Middleware that communicates to Rollbar"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-middleware-route" = callPackage ({ mkDerivation, base, bytestring, http-types, HUnit , test-framework, test-framework-hunit, text, wai, wai-test @@ -207291,8 +212765,8 @@ self: { pname = "wai-middleware-static"; version = "0.8.1"; sha256 = "0xaksnb1lzbw6rj62l4x9jpx40c1l2c33x5cb5vqk08g84zz3dg0"; - revision = "4"; - editedCabalFile = "0yxrs5dzd79pklvk014nj4dq8arjzyr3bhq432rzqzr4zjijyblf"; + revision = "5"; + editedCabalFile = "1lb4whil5x1arjb3503x8j9i3wmf678ii1dx0paqqx7dchs6cfwl"; libraryHaskellDepends = [ base bytestring containers cryptonite directory expiring-cache-map filepath http-types memory mime-types mtl old-locale semigroups @@ -207486,8 +212960,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 @@ -207987,6 +213461,42 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "warp_3_2_15" = callPackage + ({ mkDerivation, array, async, auto-update, base, blaze-builder + , 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.15"; + sha256 = "10l2qk4qn6vf898fp4ahdyhn49f8zjhlczxv0d93wkc695m59his"; + libraryHaskellDepends = [ + array async auto-update base blaze-builder 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 + 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 gauge hashable http-date + http-types network unix unix-compat + ]; + homepage = "http://github.com/yesodweb/wai"; + description = "A fast, light-weight web server for WAI applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "warp-dynamic" = callPackage ({ mkDerivation, base, data-default, dyre, http-types, wai, warp }: mkDerivation { @@ -208457,10 +213967,10 @@ self: { }: mkDerivation { pname = "web-routes"; - version = "0.27.12"; - sha256 = "0c0wqr3f79gx26pfknvv4zka8g8fkfxw5fqb0qpq8zv0mv5rflba"; + version = "0.27.13"; + sha256 = "10b0hs7mmvs9ay3ik93s8xd7zlx8pyz20626nrha4mwyixgkmc59"; revision = "1"; - editedCabalFile = "1pdp6x3q5423m99n24nhwlqmi0xyz0dhz02v2m8n4nkbg33lrv1q"; + editedCabalFile = "1s8ax7r8l0484730p36c3gn3n28zhl2p1nwjnprsbhcxd83yq4dh"; libraryHaskellDepends = [ base blaze-builder bytestring exceptions ghc-prim http-types mtl parsec split text utf8-string @@ -208471,6 +213981,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "web-routes_0_27_14" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, exceptions + , ghc-prim, hspec, http-types, HUnit, mtl, parsec, QuickCheck + , split, text, utf8-string + }: + mkDerivation { + pname = "web-routes"; + version = "0.27.14"; + sha256 = "1m5ywqy2c9v478ybyrzqc407zdqcg18p5587mrq34v7bnjk27rak"; + revision = "1"; + editedCabalFile = "061kp8rpmbpr9f9n3kja8160z209hwz42yy3kikn6b446rdc4pdr"; + libraryHaskellDepends = [ + base blaze-builder bytestring exceptions ghc-prim http-types mtl + parsec split text utf8-string + ]; + testHaskellDepends = [ base hspec HUnit QuickCheck text ]; + homepage = "http://www.happstack.com/docs/crashcourse/index.html#web-routes"; + description = "portable, type-safe URL routing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "web-routes-boomerang" = callPackage ({ mkDerivation, base, boomerang, mtl, parsec, text, web-routes }: mkDerivation { @@ -208592,6 +214124,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "web-routes-wai_0_24_3_1" = callPackage + ({ mkDerivation, base, bytestring, http-types, text, wai + , web-routes + }: + mkDerivation { + pname = "web-routes-wai"; + version = "0.24.3.1"; + sha256 = "0j9h22nsj7zf5qpf4i07jdcih00r2fivdilvj8wsylk4d23x27wf"; + libraryHaskellDepends = [ + base bytestring http-types text wai web-routes + ]; + description = "Library for maintaining correctness of URLs within an application"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "web-routing" = callPackage ({ mkDerivation, base, bytestring, criterion, doctest, primitive , text, types-compat, unordered-containers @@ -208880,6 +214428,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;}; @@ -209053,8 +214602,8 @@ self: { }: mkDerivation { pname = "websockets"; - version = "0.12.2.0"; - sha256 = "1jjb3qp6kniddn7jf4vv25v3fqainiclw0f3iyk4shq49clllki1"; + version = "0.12.3.1"; + sha256 = "019jkvmbs5wvjwczqy06spd6545mly08n5pqbsaacmff4xznkz39"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -209209,8 +214758,8 @@ self: { }: mkDerivation { pname = "weeder"; - version = "0.1.9"; - sha256 = "1k5q34zyw2ajy7k5imxygs86q0a245ax5ch4kgff12pfpyz0jmz7"; + version = "0.1.13"; + sha256 = "0a0zfp1g5mh393v4d1js5a0fnkj03q5kzycsyp3x4nk37dnc67fy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -209222,6 +214771,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "weeder_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, cmdargs, deepseq + , directory, extra, filepath, foundation, hashable, process, text + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "weeder"; + version = "1.0"; + sha256 = "1s6xfzv49pism1z4qpid3745w8x06nddifzb9165j2h6n7fivgav"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring cmdargs deepseq directory extra filepath + foundation hashable process text unordered-containers vector yaml + ]; + homepage = "https://github.com/ndmitchell/weeder#readme"; + description = "Detect dead code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "weigh" = callPackage ({ mkDerivation, base, bytestring-trie, containers, deepseq, mtl , process, random, split, template-haskell, temporary @@ -209546,6 +215116,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;}; @@ -209593,8 +215164,8 @@ self: { }: mkDerivation { pname = "wild-bind"; - version = "0.1.0.3"; - sha256 = "0zvkkxmlpfgb107cx2rcp7igsqxhdng88sk4hw6y7bikkd5pdxgj"; + version = "0.1.1.0"; + sha256 = "1z9jiqbla3nxfij6cxcpd5lpgnixz89mhnfr5ksma5khfyc01sis"; libraryHaskellDepends = [ base containers text transformers ]; testHaskellDepends = [ base hspec microlens QuickCheck stm transformers @@ -209610,8 +215181,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 @@ -209627,8 +215198,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 ]; @@ -209636,6 +215207,7 @@ 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 = stdenv.lib.platforms.none; }) {}; "wild-bind-x11" = callPackage @@ -209655,6 +215227,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wild-bind-x11_0_2_0_0" = callPackage + ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl + , semigroups, stm, text, time, transformers, wild-bind, X11 + }: + mkDerivation { + pname = "wild-bind-x11"; + version = "0.2.0.0"; + sha256 = "0x7zy76x9zmh6pjv6yhkb53l6pkn4wh76x34adx538fyf6a8mk6b"; + libraryHaskellDepends = [ + base containers fold-debounce mtl semigroups stm text transformers + wild-bind X11 + ]; + testHaskellDepends = [ + async base hspec text time transformers wild-bind X11 + ]; + homepage = "https://github.com/debug-ito/wild-bind"; + description = "X11-specific implementation for WildBind"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "win-hp-path" = callPackage ({ mkDerivation, base, process, split }: mkDerivation { @@ -210143,8 +215736,8 @@ self: { }: mkDerivation { pname = "wolf"; - version = "0.3.37"; - sha256 = "09ry5bq0hmrdv09hd9v16r4dyyyfzpf785sfrz3by6hal8bkwj6w"; + version = "0.3.40"; + sha256 = "1ns6dy76m5sw4rzi98ah29g21car7hlkmbfxdiawwsaq0x4bn4ph"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -210233,6 +215826,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 { @@ -210548,22 +216170,21 @@ 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 - , 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 - , streaming-commons, tabular, tdigest, text, threads - , threads-extras, time, tls, transformers, unagi-chan, unix - , unordered-containers, vector, vty, wai, warp, wreq + , deepseq, exceptions, filepath, http-client, http-client-tls + , http-types, immortal, lens, markdown-unlit, 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 }: mkDerivation { pname = "wrecker"; - version = "1.2.3.0"; - sha256 = "138a8az5500ys2yvwif17vbmsmisd0r3q4yc8azfrd09y359ndlq"; + version = "1.2.4.0"; + sha256 = "1yrjr1mhywxwdcnakyfgga7jlwpxzb4clldp21igw35y3n53i6y8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -210579,12 +216200,47 @@ self: { ]; executableHaskellDepends = [ base http-client http-client-tls lens markdown-unlit - optparse-applicative wreq + optparse-applicative transformers 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 + homepage = "https://github.com/lorenzo/wrecker#readme"; + description = "An HTTP Performance Benchmarker"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "wrecker_1_3_1_0" = callPackage + ({ 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, 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, statistics, stm, stm-chans + , streaming-commons, tabular, tdigest, text, threads + , threads-extras, time, tls, transformers, unix + , unordered-containers, vector, vty, wreq + }: + mkDerivation { + pname = "wrecker"; + 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 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 transformers wreq ]; homepage = "https://github.com/lorenzo/wrecker#readme"; description = "An HTTP Performance Benchmarker"; @@ -210605,8 +216261,8 @@ self: { }: mkDerivation { pname = "wrecker-ui"; - version = "3.0.0.0"; - sha256 = "0plzkb9bhsrd14h07f6rd9689hxx79kdr9gs5r5qsxsk3zpn4rs6"; + version = "3.1.1.0"; + sha256 = "0lsgbjn4fcvk5qaldhlskyz3vq9g6w7an0sqbvndx7r1hvpaznrh"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -210620,6 +216276,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; @@ -210628,21 +216285,24 @@ 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 + , byteable, bytestring, Cabal, cabal-doctest, 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.1.0"; - sha256 = "1p8cn9yzm2ggb3kac17xc3if6sdxjdh544k730imvvhm0szx4j76"; + version = "0.5.2.0"; + sha256 = "06v70dpnh7lp1sr0i0fvl2b2cx0z57dfwi8i2fxva0gcdwan0fki"; + revision = "1"; + editedCabalFile = "01x430yrqiv02pq7h55h3y70hvz7n62882vnw1m53qqxp667i580"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec authenticate-oauth base base16-bytestring byteable bytestring case-insensitive containers cryptohash exceptions @@ -210706,8 +216366,8 @@ 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"; @@ -211066,8 +216726,8 @@ self: { }: mkDerivation { pname = "wuss"; - version = "1.1.5"; - sha256 = "0n7sixmvy084hggvagkd9nq06gxhisrklm1b8fahkjylahbzh2qd"; + version = "1.1.6"; + sha256 = "1g2k48mngg8fr6cvkimjr39jc83b87lva0320bwdnf19nyz1fy9y"; libraryHaskellDepends = [ base bytestring connection network websockets ]; @@ -212022,6 +217682,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "xlsx_0_7_0" = callPackage + ({ 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.7.0"; + sha256 = "1fg0y6raxavqnk6hnchjppizc01zszav78hdf38d3c7rgnd0vnmd"; + libraryHaskellDepends = [ + 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 ({ mkDerivation, aeson, base, bytestring, containers, data-default , lens, text, xlsx @@ -212112,8 +217802,8 @@ self: { }: mkDerivation { pname = "xml-conduit"; - version = "1.7.0"; - sha256 = "0g0a6h52n6q3w09350d6vgjpvb6xj224isp4lphgwbmd2xr12i76"; + version = "1.7.1.2"; + sha256 = "0n4k0rq9j5cc9kdvj9xbx8gmiqlyk5x6pw8yxzw5wfsw7qkych2s"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-html blaze-markup bytestring conduit conduit-extra containers data-default-class deepseq @@ -213058,17 +218748,17 @@ self: { }) {}; "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.6"; + sha256 = "1im97p6g7c7gvcm9an7nzv9k7yipvd5yv39zfgr26q7vnr6hj4dq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base composition containers process transformers X11 xmonad + base composition-prelude containers process transformers X11 xmonad xmonad-contrib ]; executableHaskellDepends = [ base ]; @@ -213083,8 +218773,8 @@ 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; @@ -213596,6 +219286,83 @@ 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; + }) {}; + + "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; + }) {}; + + "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; + }) {}; + + "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; + }) {}; + + "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; + }) {}; + "yamemo" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -213609,16 +219376,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, 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.28"; + sha256 = "0swgkzkfrwj0ac7lssn8rnrdfmh3lcsdn5fbq2iwv55di6jbc0pp"; + revision = "1"; + editedCabalFile = "0f8vb5v0xfpsc02zqh9pzgv4fir93sgijk342lz5k872gscfjn62"; configureFlags = [ "-fsystem-libyaml" ]; isLibrary = true; isExecutable = true; @@ -213630,9 +219398,9 @@ self: { 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"; @@ -213696,8 +219464,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 ]; @@ -213842,6 +219610,7 @@ self: { executableHaskellDepends = [ base blank-canvas text Yampa ]; description = "blank-canvas frontend for Yampa"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yampa-glfw" = callPackage @@ -214487,8 +220256,8 @@ self: { }: mkDerivation { pname = "yesod-auth-hmac-keccak"; - version = "0.0.0.3"; - sha256 = "1x5qnhdhy0n6kf9gljkig2q4dsfay1rv8gg3xc5ly5dvbbmy4zp8"; + version = "0.0.0.4"; + sha256 = "17i3xxxdpq58q7y80xrh266lzkl8dh686v25kpapn2r0c4vxm291"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring cryptonite mtl persistent random shakespeare @@ -214832,8 +220601,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.4.37.2"; - sha256 = "0pip1y97zwfy073rc5yrhfcfj1m0nwrzih8f27m77y9dbdcwgmhs"; + 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 @@ -215982,8 +221751,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 @@ -217048,6 +222817,7 @@ self: { homepage = "http://bitbucket.org/iago/z3-haskell"; description = "Bindings for the Z3 Theorem Prover"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {gomp = null; inherit (pkgs) z3;}; "z3-encoding" = callPackage @@ -217352,22 +223122,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"; @@ -217382,8 +223152,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 ]; @@ -217397,8 +223167,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"; @@ -217412,8 +223182,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 ]; @@ -217429,8 +223199,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 ]; @@ -217445,10 +223215,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 ]; @@ -217459,16 +223227,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; @@ -217543,14 +223315,12 @@ self: { "zip-archive" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , digest, directory, filepath, HUnit, mtl, old-time, pretty - , process, temporary, text, time, unix, zip, zlib + , process, temporary, text, time, unix, unzip, zip, zlib }: mkDerivation { pname = "zip-archive"; - version = "0.3.1.1"; - sha256 = "09c3y13r77shyamibr298i4l0rp31i41w3rg1ksnrl3gkrj8x1ly"; - revision = "1"; - editedCabalFile = "0n8f1075gz5q2k9mqzadca6is0fi1bgi91sfw1yq2kqakkbrbkqy"; + version = "0.3.2.2"; + sha256 = "1xyabamc3670r8qjwpyfxcbsxhsnzy6i9n5zx58maq830lwp2m9c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -217559,14 +223329,14 @@ self: { ]; executableHaskellDepends = [ base bytestring directory ]; testHaskellDepends = [ - base bytestring directory HUnit old-time process temporary time - unix + base bytestring directory filepath HUnit old-time process temporary + time unix ]; - testToolDepends = [ zip ]; + testToolDepends = [ unzip 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; inherit (pkgs) zip;}; "zip-conduit" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra @@ -217667,16 +223437,16 @@ self: { "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"; 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/"; @@ -218117,6 +223887,45 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "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 ({ mkDerivation, base }: mkDerivation { diff --git a/pkgs/development/haskell-modules/hie-packages.nix b/pkgs/development/haskell-modules/hie-packages.nix new file mode 100644 index 00000000000..3f08f64b1e1 --- /dev/null +++ b/pkgs/development/haskell-modules/hie-packages.nix @@ -0,0 +1,502 @@ +{ pkgs, stdenv, callPackage }: self: +let src = pkgs.fetchFromGitHub + { owner = "haskell"; + repo = "haskell-ide-engine"; + rev = "3ec8e93e9ca751cf282556998851ffa65f32e06b"; + sha256 = "1wzqzvsa39c1cngmmjryqrq4vqdg6d4wp5wdf17vp96ljvz1cczw"; + }; + cabal-helper-src = pkgs.fetchgit + { url = "https://gitlab.com/dxld/cabal-helper.git"; + rev = "4bfc6b916fcc696a5d82e7cd35713d6eabcb0533"; + sha256 = "1a8231as0wdvi0q73ha9lc0qrx23kmcwf910qaicvmdar5p2b15m"; + }; + ghc-dump-tree-src = pkgs.fetchgit + { url = "https://gitlab.com/alanz/ghc-dump-tree.git"; + rev = "50f8b28fda675cca4df53909667c740120060c49"; + sha256 = "0v3r81apdqp91sv7avy7f0s3im9icrakkggw8q5b7h0h4js6irqj"; + }; + ghc-mod-src = pkgs.fetchFromGitHub + { owner = "wz1000"; + repo = "ghc-mod"; + rev = "03c91ea53b6389e7a1fcf4e471171aa3d6c8de41"; + sha256 = "11iic93klsh5izp8v4mhl7vnnlib821cfhdymlpg4drx7zbm9il6"; + }; + HaRe-src = pkgs.fetchgit + { url = "https://gitlab.com/alanz/HaRe.git"; + rev = "e325975450ce89d790ed3f92de3ef675967d9538"; + sha256 = "0z7r3l4j5a1brz7zb2rgd985m58rs0ki2p59y1l9i46fcy8r9y4g"; + }; + cabal-helper = self.cabal-helper_hie; + haddock-library = self.haddock-library_1_4_4; + hoogle = self.hoogle_5_0_14; + ghc-dump-tree = self.ghc-dump-tree_hie; + ghc-mod = self.ghc-mod_hie; + HaRe = self.HaRe_hie; +in + { ### Overrides required by hie + cabal-helper_hie = callPackage + ({ mkDerivation, base, bytestring, Cabal, cabal-install, containers + , directory, exceptions, filepath, ghc-prim, mtl, process + , semigroupoids, template-haskell, temporary, transformers + , unix, unix-compat, utf8-string + }: + mkDerivation { + pname = "cabal-helper"; + version = "0.8.0.0"; + src = cabal-helper-src; + isLibrary = true; + isExecutable = true; + jailbreak = true; + setupHaskellDepends = [ base Cabal directory filepath ]; + libraryHaskellDepends = [ + base Cabal directory filepath ghc-prim mtl process semigroupoids + transformers unix unix-compat + ]; + executableHaskellDepends = [ + base bytestring Cabal containers directory exceptions filepath + ghc-prim mtl process template-haskell temporary transformers unix + unix-compat utf8-string + ]; + testHaskellDepends = [ + base bytestring Cabal directory exceptions filepath ghc-prim mtl + process template-haskell temporary transformers unix unix-compat + utf8-string + ]; + testToolDepends = [ cabal-install ]; + postInstall = + '' + libexec="$out/libexec/$(basename $out/lib/ghc*/*ghc*)/$name" + mkdir -p "$libexec" + ln -sv $out/bin/cabal-helper-wrapper "$libexec" + ''; + doCheck = false; + description = "Simple interface to some of Cabal's configuration state, mainly used by ghc-mod"; + license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + ghc-dump-tree_hie = callPackage + ({ mkDerivation, aeson, base, bytestring, ghc, optparse-applicative + , pretty, pretty-show, process, unordered-containers + , vector + }: + mkDerivation { + pname = "ghc-dump-tree"; + version = "0.2.0.1"; + src = ghc-dump-tree-src; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring ghc pretty pretty-show process + unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base bytestring ghc optparse-applicative pretty pretty-show + process unordered-containers vector + ]; + homepage = "https://github.com/edsko/ghc-dump-tree"; + description = "Dump GHC's parsed, renamed, and type checked ASTs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + ghc-mod-core = callPackage + ({ mkDerivation, base, binary, bytestring, Cabal, cabal-helper + , containers, deepseq, directory, djinn-ghc, extra, fclabels + , filepath, fingertree, ghc, ghc-boot, ghc-paths, ghc-syb-utils + , haskell-src-exts, hlint, monad-control, monad-journal, mtl + , old-time, optparse-applicative, pipes, process, safe, semigroups + , split, syb, template-haskell, temporary, text, time + , transformers, transformers-base + }: + mkDerivation { + pname = "ghc-mod-core"; + version = "5.9.0.0"; + src = "${ghc-mod-src}/core"; + setupHaskellDepends = [ + base Cabal containers directory filepath process template-haskell + transformers + ]; + libraryHaskellDepends = [ + base binary bytestring cabal-helper containers deepseq directory + djinn-ghc extra fclabels filepath fingertree ghc ghc-boot ghc-paths + ghc-syb-utils haskell-src-exts hlint monad-control monad-journal + mtl old-time optparse-applicative pipes process safe semigroups + split syb template-haskell temporary text time transformers + transformers-base + ]; + homepage = "https://github.com/DanielG/ghc-mod"; + description = "Happy Haskell Hacking"; + license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) { inherit cabal-helper; }; + ghc-mod_hie = callPackage + ({ mkDerivation, base, binary, bytestring, Cabal, cabal-doctest + , cabal-helper, containers, criterion, deepseq, directory + , djinn-ghc, doctest, extra, fclabels, filepath, ghc, ghc-boot + , ghc-mod-core, ghc-paths, ghc-syb-utils, haskell-src-exts, hlint + , hspec, monad-control, monad-journal, mtl, old-time + , optparse-applicative, pipes, process, safe, semigroups, shelltest + , split, syb, template-haskell, temporary, text, time + , transformers, transformers-base + }: + mkDerivation { + pname = "ghc-mod"; + version = "5.9.0.0"; + src = ghc-mod-src; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ + base Cabal cabal-doctest containers directory filepath process + template-haskell transformers + ]; + libraryHaskellDepends = [ + base binary bytestring cabal-helper containers deepseq directory + djinn-ghc extra fclabels filepath ghc ghc-boot ghc-mod-core + ghc-paths ghc-syb-utils haskell-src-exts hlint monad-control + monad-journal mtl old-time optparse-applicative pipes process safe + semigroups split syb template-haskell temporary text time + transformers transformers-base + ]; + executableHaskellDepends = [ + base binary deepseq directory fclabels filepath ghc ghc-mod-core + monad-control mtl old-time optparse-applicative process semigroups + split time + ]; + testHaskellDepends = [ + base cabal-helper containers directory doctest fclabels filepath + ghc ghc-boot ghc-mod-core hspec monad-journal mtl process split + temporary transformers + ]; + testToolDepends = [ shelltest ]; + # Doesn't work with our doctest + doCheck = false; + benchmarkHaskellDepends = [ + base criterion directory filepath ghc-mod-core temporary + ]; + homepage = "https://github.com/DanielG/ghc-mod"; + description = "Happy Haskell Hacking"; + license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) { shelltest = null; inherit cabal-helper; }; + HaRe_hie = callPackage + ({ mkDerivation, attoparsec, base, base-prelude, Cabal, cabal-helper + , case-insensitive, containers, conversion + , conversion-case-insensitive, conversion-text, Diff, directory + , filepath, foldl, ghc, ghc-exactprint, ghc-mod-core, ghc-syb-utils + , gitrev, hslogger, hspec, HUnit, monad-control, mtl + , optparse-applicative, optparse-simple, parsec, stdenv + , Strafunski-StrategyLib, syb, syz, turtle + }: + mkDerivation { + pname = "HaRe"; + version = "0.8.4.1"; + src = HaRe-src; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base cabal-helper containers directory filepath ghc ghc-exactprint + ghc-mod-core ghc-syb-utils hslogger monad-control mtl + Strafunski-StrategyLib syb syz + ]; + executableHaskellDepends = [ + base Cabal ghc-mod-core gitrev mtl optparse-applicative + optparse-simple + ]; + testHaskellDepends = [ + attoparsec base base-prelude cabal-helper case-insensitive + containers conversion conversion-case-insensitive conversion-text + Diff directory filepath foldl ghc ghc-exactprint ghc-mod-core + ghc-syb-utils hslogger hspec HUnit monad-control mtl parsec + Strafunski-StrategyLib syb syz turtle + ]; + # Test directory doesn't exist + doCheck = false; + homepage = "https://github.com/RefactoringTools/HaRe/wiki"; + description = "the Haskell Refactorer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) { inherit cabal-helper; }; + ### hie packages + haskell-ide-engine = callPackage + ({ mkDerivation, aeson, async, base, bytestring, Cabal, cabal-install + , containers, data-default, Diff, directory, either, ekg, filepath, ghc + , ghc-mod-core, gitrev, haskell-lsp, hie-apply-refact, hie-base + , hie-brittany, hie-build-plugin, hie-eg-plugin-async + , hie-example-plugin2, hie-ghc-mod, hie-ghc-tree, hie-haddock + , hie-hare, hie-hoogle, hie-plugin-api, hoogle, hoogleLocal, hslogger, hspec + , lens, mtl, optparse-simple, QuickCheck, quickcheck-instances + , sorted-list, stm, text, time, transformers + , unordered-containers, vector, vinyl, yaml, yi-rope + }: + mkDerivation { + pname = "haskell-ide-engine"; + version = "0.1.0.0"; + inherit src; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bytestring Cabal containers data-default directory + either filepath ghc ghc-mod-core gitrev haskell-lsp + hie-apply-refact hie-base hie-brittany hie-ghc-mod hie-haddock + hie-hare hie-hoogle hie-plugin-api hslogger lens mtl + optparse-simple sorted-list stm text transformers + unordered-containers vector yi-rope + ]; + executableHaskellDepends = [ + base Cabal containers directory ekg ghc-mod-core gitrev haskell-lsp + hie-apply-refact hie-build-plugin hie-eg-plugin-async + hie-example-plugin2 hie-ghc-mod hie-ghc-tree hie-hare hie-hoogle + hie-plugin-api hslogger optparse-simple stm text time transformers + unordered-containers vinyl + ]; + testHaskellDepends = [ + aeson base containers Diff directory filepath ghc-mod-core + haskell-lsp hie-apply-refact hie-base hie-eg-plugin-async + hie-example-plugin2 hie-ghc-mod hie-ghc-tree hie-hare hie-hoogle + hie-plugin-api hoogle hslogger hspec QuickCheck + quickcheck-instances stm text transformers unordered-containers + vector vinyl yaml + ]; + + preCheck = + '' + export HOME=$NIX_BUILD_TOP/home + mkdir -p $HOME/.hoogle + ln -sv ${hoogleLocal}/share/doc/hoogle/default.hoo $HOME/.hoogle/default-haskell-${hoogle.version}.hoo + ''; + # https://github.com/haskell/haskell-ide-engine/issues/425 + # The disabled tests do work in a local nix-shell with cabal available. + patches = [ ./patches/hie-testsuite.patch ]; + homepage = "http://github.com/githubuser/haskell-ide-engine#readme"; + description = "Provide a common engine to power any Haskell IDE"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) { inherit hoogle; hoogleLocal = (self.hoogleLocal {}).override { inherit hoogle; }; }; + hie-apply-refact = callPackage + ({ mkDerivation, aeson, apply-refact, base, either, extra, ghc-mod + , ghc-mod-core, haskell-src-exts, hie-base, hie-plugin-api, hlint + , text, transformers + }: + mkDerivation { + pname = "hie-apply-refact"; + version = "0.1.0.0"; + inherit src; + postUnpack = "sourceRoot=source/hie-apply-refact"; + libraryHaskellDepends = [ + aeson apply-refact base either extra ghc-mod ghc-mod-core + haskell-src-exts hie-base hie-plugin-api hlint text transformers + ]; + description = "Haskell IDE Apply Refact plugin"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) { inherit ghc-mod; }; + hie-base = callPackage + ({ mkDerivation, aeson, base, haskell-lsp, text }: + mkDerivation { + pname = "hie-base"; + version = "0.1.0.0"; + inherit src; + preUnpack = "sourceRoot=source/hie-base"; + libraryHaskellDepends = [ aeson base haskell-lsp text ]; + description = "Haskell IDE API base types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + hie-brittany = callPackage + ({ mkDerivation, aeson, base, brittany, ghc-mod, ghc-mod-core + , haskell-lsp, hie-plugin-api, lens, text + }: + mkDerivation { + pname = "hie-brittany"; + version = "0.1.0.0"; + inherit src; + postUnpack = "sourceRoot=source/hie-brittany"; + libraryHaskellDepends = [ + aeson base brittany ghc-mod ghc-mod-core haskell-lsp hie-plugin-api + lens text + ]; + description = "Haskell IDE Hoogle plugin"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) { inherit ghc-mod; }; + hie-build-plugin = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, cabal-helper + , containers, directory, filepath, haskell-lsp, hie-plugin-api + , process, stm, text, transformers, yaml + }: + mkDerivation { + pname = "hie-build-plugin"; + version = "0.1.0.0"; + inherit src; + postUnpack = "sourceRoot=source/hie-build-plugin"; + libraryHaskellDepends = [ + aeson base bytestring Cabal cabal-helper containers directory + filepath haskell-lsp hie-plugin-api process stm text transformers + yaml + ]; + description = "Haskell IDE build plugin"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) { inherit cabal-helper; }; + hie-eg-plugin-async = callPackage + ({ mkDerivation, base, ghc-mod-core, hie-plugin-api, stm + , text + }: + mkDerivation { + pname = "hie-eg-plugin-async"; + version = "0.1.0.0"; + inherit src; + postUnpack = "sourceRoot=source/hie-eg-plugin-async"; + libraryHaskellDepends = [ + base ghc-mod-core hie-plugin-api stm text + ]; + description = "Haskell IDE example plugin, using async processes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + hie-example-plugin2 = callPackage + ({ mkDerivation, base, hie-plugin-api, text }: + mkDerivation { + pname = "hie-example-plugin2"; + version = "0.1.0.0"; + inherit src; + postUnpack = "sourceRoot=source/hie-example-plugin2"; + libraryHaskellDepends = [ base hie-plugin-api text ]; + description = "Haskell IDE example plugin"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + hie-ghc-mod = callPackage + ({ mkDerivation, aeson, base, containers, ghc, ghc-mod, ghc-mod-core + , hie-base, hie-plugin-api, text, transformers + }: + mkDerivation { + pname = "hie-ghc-mod"; + version = "0.1.0.0"; + inherit src; + postUnpack = "sourceRoot=source/hie-ghc-mod"; + libraryHaskellDepends = [ + aeson base containers ghc ghc-mod ghc-mod-core hie-base + hie-plugin-api text transformers + ]; + description = "Haskell IDE ghc-mod plugin"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) { inherit ghc-mod; }; + hie-ghc-tree = callPackage + ({ mkDerivation, aeson, base, ghc-dump-tree, ghc-mod, ghc-mod-core + , hie-base, hie-plugin-api, text + }: + mkDerivation { + pname = "hie-ghc-tree"; + version = "0.1.0.0"; + inherit src; + postUnpack = "sourceRoot=source/hie-ghc-tree"; + libraryHaskellDepends = [ + aeson base ghc-dump-tree ghc-mod ghc-mod-core hie-base + hie-plugin-api text + ]; + description = "Haskell IDE GHC Tree plugin"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) { inherit ghc-dump-tree ghc-mod; }; + hie-haddock = callPackage + ({ mkDerivation, aeson, base, containers, directory, either + , filepath, ghc, ghc-exactprint, ghc-mod, ghc-mod-core, haddock-api + , haddock-library, HaRe, haskell-lsp, hie-base, hie-ghc-mod + , hie-hare, hie-plugin-api, lens, monad-control, mtl, text + , transformers + }: + mkDerivation { + pname = "hie-haddock"; + version = "0.1.0.0"; + inherit src; + postUnpack = "sourceRoot=source/hie-haddock"; + libraryHaskellDepends = [ + aeson base containers directory either filepath ghc ghc-exactprint + ghc-mod ghc-mod-core haddock-api haddock-library HaRe haskell-lsp + hie-base hie-ghc-mod hie-hare hie-plugin-api lens monad-control mtl + text transformers + ]; + description = "Haskell IDE Haddock plugin"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) { inherit haddock-library HaRe ghc-mod; }; + hie-hare = callPackage + ({ mkDerivation, aeson, base, containers, Diff, either, ghc + , ghc-exactprint, ghc-mod, ghc-mod-core, HaRe, haskell-lsp + , hie-base, hie-ghc-mod, hie-plugin-api, lens, monad-control, mtl + , text, transformers + }: + mkDerivation { + pname = "hie-hare"; + version = "0.1.0.0"; + inherit src; + postUnpack = "sourceRoot=source/hie-hare"; + libraryHaskellDepends = [ + aeson base containers Diff either ghc ghc-exactprint ghc-mod + ghc-mod-core HaRe haskell-lsp hie-base hie-ghc-mod hie-plugin-api + lens monad-control mtl text transformers + ]; + description = "Haskell IDE HaRe plugin"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) { inherit ghc-mod HaRe; }; + hie-hoogle = callPackage + ({ mkDerivation, aeson, base, directory, filepath, ghc-mod + , ghc-mod-core, hie-plugin-api, hoogle, tagsoup, text + }: + mkDerivation { + pname = "hie-hoogle"; + version = "0.1.0.0"; + inherit src; + postUnpack = "sourceRoot=source/hie-hoogle"; + libraryHaskellDepends = [ + aeson base directory filepath ghc-mod ghc-mod-core hie-plugin-api + hoogle tagsoup text + ]; + description = "Haskell IDE Hoogle plugin"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) { inherit ghc-mod hoogle; }; + hie-plugin-api = callPackage + ({ mkDerivation, aeson, base, containers, Diff, directory, either + , filepath, fingertree, ghc, ghc-mod-core, haskell-lsp, hie-base + , hslogger, lifted-base, monad-control, mtl, stdenv, stm, syb, text + , time, transformers, unordered-containers + }: + mkDerivation { + pname = "hie-plugin-api"; + version = "0.1.0.0"; + inherit src; + postUnpack = "sourceRoot=source/hie-plugin-api"; + libraryHaskellDepends = [ + aeson base containers Diff directory either filepath fingertree ghc + ghc-mod-core haskell-lsp hie-base hslogger lifted-base + monad-control mtl stm syb text time transformers + unordered-containers + ]; + description = "Haskell IDE API for plugin communication"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + } diff --git a/pkgs/development/haskell-modules/initial-packages.nix b/pkgs/development/haskell-modules/initial-packages.nix new file mode 100644 index 00000000000..8e8712d9096 --- /dev/null +++ b/pkgs/development/haskell-modules/initial-packages.nix @@ -0,0 +1,2 @@ +args@{ pkgs, stdenv, callPackage }: self: + (import ./hie-packages.nix args self) // (import ./hackage-packages.nix args self) diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 96520dce2b2..fef827cd9a1 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,7 +156,7 @@ 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; }); @@ -76,17 +182,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,10 +216,15 @@ 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; @@ -112,6 +234,11 @@ rec { 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 +247,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 +281,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 7ac0ef509f4..0f866a96e71 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 }: 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.haskellPackages.cabal2nix ]; preferLocalBuild = true; phases = ["installPhase"]; LANG = "en_US.UTF-8"; - LOCALE_ARCHIVE = pkgs.lib.optionalString pkgs.stdenv.isLinux "${pkgs.glibcLocales}/lib/locale/locale-archive"; + 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=${stdenv.system} ${sha256Arg} "${src}" > "$out/default.nix" ''; }; @@ -134,55 +140,40 @@ in package-set { inherit pkgs stdenv callPackage; } self // { inherit mkDerivation callPackage haskellSrc2nix hackage2nix; + inherit (haskellLib) packageSourceOverrides; + callHackage = name: version: self.callPackage (self.hackage2nix name version); # Creates a Haskell package from a source package by calling cabal2nix on the source. - callCabal2nix = name: src: 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 "${name}.cabal" path || pkgs.lib.hasSuffix "package.yaml" 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: + overrideCabal (self.callPackage (haskellSrc2nix { + inherit name; + src = pkgs.lib.cleanSourceWith + { src = if pkgs.lib.canCleanSource src + then src + else pkgs.safeDiscardStringContext src; + filter = path: type: + pkgs.lib.hasSuffix "${name}.cabal" path || + pkgs.lib.hasSuffix "package.yaml" path; + }; + }) args) (_: { 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); 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 00000000000..86cac15c246 --- /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 00000000000..e4e327ab6bb --- /dev/null +++ b/pkgs/development/haskell-modules/patches/lzma-tests.patch @@ -0,0 +1,13 @@ +--- a/lzma.cabal ++++ b/lzma.cabal +@@ -70,8 +70,8 @@ test-suite lzma-tests + , base + , bytestring + -- additional dependencies that require version bounds +- build-depends: HUnit >= 1.2 && <1.4 +- , QuickCheck >= 2.8 && <2.9 ++ build-depends: HUnit >= 1.2 && <2 ++ , QuickCheck >= 2.8 && <3 + , tasty >= 0.10 && <0.12 + , tasty-hunit == 0.9.* + , tasty-quickcheck >= 0.8.3.2 && < 0.9 diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index ac484b3c112..aa0090e4cff 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 { @@ -59,7 +57,6 @@ symlinkJoin { name = ghc.name + "-with-packages"; paths = paths ++ [ghc]; extraOutputsToInstall = [ "out" "doc" ]; - inherit ignoreCollisions; postBuild = '' . ${makeWrapper}/nix-support/setup-hook @@ -99,7 +96,7 @@ symlinkJoin { makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "${packageDBFlag}=${packageCfgDir}" fi done - '' + (lib.optionalString stdenv.isDarwin '' + '' + (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 +104,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 +130,5 @@ symlinkJoin { passthru = { preferLocalBuild = true; inherit (ghc) version meta; - inherit haskellPackages; }; } diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix index 9dfa3430ed8..0048634f5b4 100644 --- a/pkgs/development/idris-modules/build-idris-package.nix +++ b/pkgs/development/idris-modules/build-idris-package.nix @@ -3,39 +3,21 @@ # 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) - ''; - buildPhase = '' - ${idris}/bin/idris --build *.ipkg + idris --build *.ipkg ''; doCheck = true; checkPhase = '' if grep -q test *.ipkg; then - ${idris}/bin/idris --testpkg *.ipkg + idris --testpkg *.ipkg fi ''; installPhase = '' - ${idris}/bin/idris --install *.ipkg --ibcsubdir $IBCSUBDIR + idris --install *.ipkg --ibcsubdir $IBCSUBDIR ''; - buildInputs = [ gmp ]; + buildInputs = [ gmp idris ]; } // args) diff --git a/pkgs/development/idris-modules/idris-wrapper.nix b/pkgs/development/idris-modules/idris-wrapper.nix index 5e3eb511bd3..0e3a8393140 100644 --- a/pkgs/development/idris-modules/idris-wrapper.nix +++ b/pkgs/development/idris-modules/idris-wrapper.nix @@ -10,5 +10,7 @@ symlinkJoin { wrapProgram $out/bin/idris \ --suffix PATH : ${ stdenv.lib.makeBinPath path } \ --suffix LIBRARY_PATH : ${stdenv.lib.makeLibraryPath lib} - ''; -} + mkdir -p $out/nix-support + substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook + ''; + } diff --git a/pkgs/development/idris-modules/setup-hook.sh b/pkgs/development/idris-modules/setup-hook.sh new file mode 100644 index 00000000000..30a487ea80d --- /dev/null +++ b/pkgs/development/idris-modules/setup-hook.sh @@ -0,0 +1,16 @@ +# Library import path +export IDRIS_LIBRARY_PATH=$PWD/idris-libs +mkdir -p $IDRIS_LIBRARY_PATH + +# Library install path +export IBCSUBDIR=$out/lib/@name@ +mkdir -p $IBCSUBDIR + +addIdrisLibs () { + if [ -d $1/lib/@name@ ]; then + ln -sv $1/lib/@name@/* $IDRIS_LIBRARY_PATH + fi +} + +# All run-time deps +addEnvHooks 1 addIdrisLibs diff --git a/pkgs/development/idris-modules/with-packages.nix b/pkgs/development/idris-modules/with-packages.nix index d2b09808ec1..d4638670f69 100644 --- a/pkgs/development/idris-modules/with-packages.nix +++ b/pkgs/development/idris-modules/with-packages.nix @@ -14,7 +14,7 @@ fi } - envHooks+=(installIdrisLib) + envHostTargetHooks+=(installIdrisLib) ''; unpackPhase = '' diff --git a/pkgs/development/interpreters/elixir/1.6.nix b/pkgs/development/interpreters/elixir/1.6.nix new file mode 100644 index 00000000000..673a4b6e51b --- /dev/null +++ b/pkgs/development/interpreters/elixir/1.6.nix @@ -0,0 +1,7 @@ +{ mkDerivation }: + +mkDerivation rec { + version = "1.6.0"; + sha256 = "0wfmbrq70n85mx17kl9h2k0xzgnhncz3xygjx9cbvpmiwwdzgrdx"; + minimumOTPVersion = "18"; +} diff --git a/pkgs/development/interpreters/elixir/setup-hook.sh b/pkgs/development/interpreters/elixir/setup-hook.sh index 2ed3b2e6454..501eca3cf02 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/R16B02-basho.nix b/pkgs/development/interpreters/erlang/R16B02-basho.nix index 33c34f7fecc..714924514ed 100644 --- a/pkgs/development/interpreters/erlang/R16B02-basho.nix +++ b/pkgs/development/interpreters/erlang/R16B02-basho.nix @@ -36,7 +36,7 @@ mkDerivation rec { 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##*/}" + mkdir -p "$out/share/man/''${prefix##*/}" ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl" done ''; diff --git a/pkgs/development/interpreters/erlang/setup-hook.sh b/pkgs/development/interpreters/erlang/setup-hook.sh index 68c0f762dfc..3962d154ba9 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/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index fe9f94beed1..e10c5fbb568 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -10,11 +10,11 @@ (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" ]; diff --git a/pkgs/development/interpreters/guile/setup-hook-2.0.sh b/pkgs/development/interpreters/guile/setup-hook-2.0.sh index fd1dc944ed4..c7fb4f70fc6 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 86c1e0d3e4a..73e700bde02 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 c1d19e579ed..bf04fee1e89 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 3cafd956277..41e5e3d93be 100644 --- a/pkgs/development/interpreters/hy/default.nix +++ b/pkgs/development/interpreters/hy/default.nix @@ -2,7 +2,7 @@ pythonPackages.buildPythonApplication rec { name = "hy-${version}"; - version = "0.12.1"; + version = "0.13.1"; src = fetchurl { url = "mirror://pypi/h/hy/${name}.tar.gz"; diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index ff192c07286..2224a13ba7c 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -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/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix index 43e289cd369..0cdc4770a98 100644 --- a/pkgs/development/interpreters/lua-5/5.2.nix +++ b/pkgs/development/interpreters/lua-5/5.2.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { ''; crossAttrs = let - inherit (hostPlatform) isDarwin isMingw; + inherit (hostPlatform) isDarwin isMinGW; in { configurePhase = '' makeFlagsArray=( @@ -65,10 +65,10 @@ stdenv.mkDerivation rec { INSTALL_MAN=$out/share/man/man1 V=${luaversion} R=${version} - ${if isMingw then "mingw" else stdenv.lib.optionalString isDarwin '' + ${if isMinGW then "mingw" else stdenv.lib.optionalString isDarwin '' ''} ) - '' + stdenv.lib.optionalString isMingw '' + '' + stdenv.lib.optionalString isMinGW '' installFlagsArray=( TO_BIN="lua.exe luac.exe" TO_LIB="liblua.a lua52.dll" diff --git a/pkgs/development/interpreters/lua-5/5.3.nix b/pkgs/development/interpreters/lua-5/5.3.nix index a512a251313..ad1dfa8823c 100644 --- a/pkgs/development/interpreters/lua-5/5.3.nix +++ b/pkgs/development/interpreters/lua-5/5.3.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ''; crossAttrs = let - inherit (hostPlatform) isDarwin isMingw; + inherit (hostPlatform) isDarwin isMinGW; in { configurePhase = '' makeFlagsArray=( @@ -64,10 +64,10 @@ stdenv.mkDerivation rec { INSTALL_MAN=$out/share/man/man1 V=${luaversion} R=${version} - ${if isMingw then "mingw" else stdenv.lib.optionalString isDarwin '' + ${if isMinGW then "mingw" else stdenv.lib.optionalString isDarwin '' ''} ) - '' + stdenv.lib.optionalString isMingw '' + '' + stdenv.lib.optionalString isMinGW '' installFlagsArray=( TO_BIN="lua.exe luac.exe" TO_LIB="liblua.a lua52.dll" diff --git a/pkgs/development/interpreters/lua-5/sockets.nix b/pkgs/development/interpreters/lua-5/sockets.nix index b83b920497d..d8a789e9209 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/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 62c63ef6c5c..14a4bac47f6 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurlBoot, enableThreading ? stdenv ? glibc }: +{ lib, stdenv, fetchurlBoot, buildPackages, enableThreading ? stdenv ? glibc }: with lib; @@ -19,7 +19,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 { @@ -50,6 +51,8 @@ let 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" ''; # Build a thread-safe Perl with a dynamic libperls.o. We need the @@ -58,8 +61,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" @@ -69,14 +74,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") @@ -121,7 +125,23 @@ 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"; + }; + + nativeBuildInputs = [ buildPackages.stdenv.cc ]; + + postUnpack = '' + unpackFile ${perl-cross-src} + cp -R perl-cross-${crossVersion}/* perl-${version}/ + ''; + + configurePlatforms = [ "build" "host" "target" ]; + }); in rec { perl = perl524; diff --git a/pkgs/development/interpreters/perl/setup-hook.sh b/pkgs/development/interpreters/perl/setup-hook.sh index a8656b8531d..7909412806c 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 db4eb6eaee0..c547e3d8ada 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" ]; @@ -333,17 +338,22 @@ let in { php56 = generic { - version = "5.6.32"; - sha256 = "0lfbmdkvijkm6xc4p9sykv66y8xwhws0vsmka8v5cax4bxx4xr1y"; + version = "5.6.33"; + sha256 = "1k1ip1slk89hkp57qiqp8k2m5yrg9lx5rja542g87k8xfslrdxh7"; }; php70 = generic { - version = "7.0.25"; - sha256 = "09fc2lj447phprvilvq2sb6n0r1snj142f8faphrd896s6b4v8lm"; + version = "7.0.27"; + sha256 = "0ca174kp2l3fjcp8z0mqnkbjfhijjzz7rs7bkzg1qk2cpdijbylr"; }; php71 = generic { - version = "7.1.11"; - sha256 = "0ww5493w8w3jlks0xqlfm3v6mm53vpnv5vjy63inkj8zf3gdfikn"; + version = "7.1.13"; + sha256 = "18cqry8jy7q9fp82p3n9ndxffyba6f6q3maz3100jq245lfsbz9m"; + }; + + php72 = generic { + version = "7.2.1"; + sha256 = "0ygbcilbp3fiswd240ib2mvnhy0yy0az8kjzpjfd4kca4qzpj1py"; }; } diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/development/interpreters/picoc/default.nix index e78b7434719..62ab7b02585 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 b196af8e3ae..928a5517324 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 34b47113193..4a7f3423def 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/python/build-python-package-setuptools.nix b/pkgs/development/interpreters/python/build-python-package-setuptools.nix index a09febb492b..bc512357acd 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/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 9352bb4d52e..1cb739b4d29 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -227,7 +227,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/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix index 5c13035be1b..2e8a95e7329 100644 --- a/pkgs/development/interpreters/python/cpython/3.4/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix @@ -185,6 +185,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/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix index 951cb367528..eb8d0a2df38 100644 --- a/pkgs/development/interpreters/python/cpython/3.5/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix @@ -178,6 +178,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.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index d5ac94c76e6..f48f2c19026 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -178,6 +178,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/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 5f7348ac825..d9cff16f448 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -13,7 +13,10 @@ { name ? "${attrs.pname}-${attrs.version}" -# Dependencies for building the package +# Build-time dependencies for the package +, nativeBuildInputs ? [] + +# Run-time dependencies for the package , buildInputs ? [] # Dependencies needed for running the checkPhase. @@ -66,13 +69,15 @@ toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [ name = namePrefix + name; - buildInputs = ([ wrapPython (ensureNewerSourcesHook { year = "1980"; }) ] - ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip) + nativeBuildInputs = [ (ensureNewerSourcesHook { year = "1980"; }) ] + ++ nativeBuildInputs; + + buildInputs = [ wrapPython ] + ++ lib.optional (lib.hasSuffix "zip" (attrs.src.name or "")) unzip ++ lib.optionals doCheck checkInputs - ++ lib.optional catchConflicts setuptools # If we nog longer propagate setuptools + ++ lib.optional catchConflicts setuptools # If we no longer propagate setuptools ++ buildInputs - ++ pythonPath - ); + ++ pythonPath; # Propagate python and setuptools. We should stop propagating setuptools. propagatedBuildInputs = propagatedBuildInputs ++ [ python setuptools ]; diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix index aea389d160f..e68cfc3148f 100644 --- a/pkgs/development/interpreters/python/pypy/2.7/default.nix +++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix @@ -10,7 +10,7 @@ assert zlibSupport -> zlib != null; let - majorVersion = "5.9"; + majorVersion = "5.10"; minorVersion = "0"; minorVersionSuffix = ""; pythonVersion = "2.7"; @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2"; - sha256 = "1q3kcnniyvnca1l7x10mbhp4xwjr03ajh2h8j6cbdllci38zdjy1"; + sha256 = "10j1s6r6iv80nvpi6gv8w05v505h2ndj9xx31yz7d50ab04dfg23"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; @@ -79,17 +79,6 @@ in stdenv.mkDerivation rec { setupHook = python-setup-hook sitePackages; - postBuild = '' - pushd ./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 - popd - ''; - doCheck = true; checkPhase = '' export TERMINFO="${ncurses.out}/share/terminfo/"; @@ -149,7 +138,7 @@ in stdenv.mkDerivation rec { 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 ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/interpreters/python/setup-hook.sh b/pkgs/development/interpreters/python/setup-hook.sh index dda9bed39f8..77ec9e9ac0b 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/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index f949e16321d..2397cce97ea 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -33,11 +33,11 @@ in stdenv.mkDerivation rec { name = "racket-${version}"; - version = "6.11"; + version = "6.12"; src = fetchurl { url = "https://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; - sha256 = "1nk7705x24jjlbqqhj8yvbgqkfscxx3m81bry1g56kjxysjmf3sw"; + sha256 = "0cwcypzjfl9py1s695mhqkiapff7c1w29llsmdj7qgn58wl0apk5"; }; FONTCONFIG_FILE = fontsConf; diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index d664c00bc31..9d82810900f 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -1,7 +1,7 @@ { stdenv, 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 @@ -27,6 +27,7 @@ let 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 @@ -40,7 +41,7 @@ let , libffi, fiddleSupport ? true , autoreconfHook, bison, autoconf , darwin ? null - , buildEnv, bundler, bundix + , buildEnv, bundler, bundix, Foundation }: let rubySrc = if useRailsExpress then fetchFromGitHub { @@ -75,11 +76,13 @@ 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; @@ -106,6 +109,11 @@ let cp ${config}/config.guess tool/ cp ${config}/config.sub tool/ '' + else if isRuby25 then '' + sed -i configure.ac -e '/config.guess/d' + cp ${config}/config.guess tool/ + cp ${config}/config.sub tool/ + '' else opString useRailsExpress '' sed -i configure.in -e '/config.guess/d' cp ${config}/config.guess tool/ @@ -142,7 +150,7 @@ let addToSearchPath GEM_PATH \$1/${passthru.gemPath} } - envHooks+=(addGemPath) + addEnvHooks "$hostOffset" addGemPath EOF '' + opString useRailsExpress '' rbConfig=$(find $out/lib/ruby -name rbconfig.rb) @@ -197,27 +205,35 @@ in { }; }; - ruby_2_2_8 = generic { - version = rubyVersion "2" "2" "8" ""; + ruby_2_2_9 = generic { + version = rubyVersion "2" "2" "9" ""; sha256 = { - src = "12i6v5i0djl4xx3x7fq12snqb5d4drqjmnwqs05fby4bagcbjdwg"; - git = "16nw0795nhrj13crp5x4jis8hmi3gsyjl96pwk698wlrb89lf9bw"; + src = "19m1ximl7vcrsvq595dgrjh4yb6kar944095wbywqh7waiqcfirg"; + git = "03qrjh55098wcqh2khxryzkzfqkznjrcdgwf27r2bgcycbg5ca5q"; }; }; - ruby_2_3_5 = generic { - version = rubyVersion "2" "3" "5" ""; + ruby_2_3_6 = generic { + version = rubyVersion "2" "3" "6" ""; sha256 = { - src = "1k6x4g68lq30i0myip5bn56rcbwjxmqq95j1fkdgbvwbnaxzfqjl"; - git = "0spwqz4b5xxqzs13azsd4xz4jkc3is7d9q4s6s2qilb8ib4863jl"; + src = "07jpa7fw1gyf069m7alf2b0zm53qm08w2ns45mhzmvgrg4r528l3"; + git = "1bk59i0ygdc5z3zz3k6indfrxd2ix55np6rwvkcdpdw8svm749ds"; }; }; - ruby_2_4_2 = generic { - version = rubyVersion "2" "4" "2" ""; + ruby_2_4_3 = generic { + version = rubyVersion "2" "4" "3" ""; sha256 = { - src = "174cdiz3am1f76vsnm3iqi9c5vqphypbf9kbxx6vqqmj01gfgfck"; - git = "1w83kzak3m6vv3k09ynfw9vpgc7vpmij3x3zmgrhwm4ds1sp5irl"; + src = "161smb52q19r9lrzy22b3bhnkd0z8wjffm0qsfkml14j5ic7a0zx"; + git = "0x2lqbqm2rq9j5zh1p72dma56nqvdkfbgzb9wybm4y4hwhiw8c1m"; + }; + }; + + ruby_2_5_0 = generic { + version = rubyVersion "2" "5" "0" ""; + sha256 = { + src = "1azj0d2lzziw6iml7bx3sxpxzcdmfwfq3yhm7djyp20q1xiz7rj6"; + git = "0d436nqmp3ykdkp4sck5bb8sf3qvx30x1p58xh8axv66mvsyc2jd"; }; }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 3d3b17cd2f7..55f4a9ef237 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -24,19 +24,24 @@ rec { "${patchSet}/patches/ruby/2.1.8/railsexpress/08-funny-falcon-method-cache.patch" "${patchSet}/patches/ruby/2.1.8/railsexpress/09-heap-dump-support.patch" ]; - "2.2.8" = ops useRailsExpress [ + "2.2.9" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.2/head/railsexpress/01-zero-broken-tests.patch" "${patchSet}/patches/ruby/2.2/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.2/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; - "2.3.5" = ops useRailsExpress [ + "2.3.6" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; - "2.4.2" = ops useRailsExpress [ + "2.4.3" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch" "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; + "2.5.0" = ops useRailsExpress [ + "${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" + "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch" + "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch" + ]; } diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/pkgs/development/interpreters/ruby/rvm-patchsets.nix index c60d6e3728d..1598cbc56e1 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/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 642fd928f41..19abfe1cea2 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.8.1"; src = fetchurl { url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source-linux.tar.bz2"; - sha256 = "053b2xc2x1sczvlb41w6iciqlwy0zyfiv3jrynx4f8jgd6mizsm6"; + sha256 = "1y8yb20k3lvj7c93qz2srrkvfv175n4n7p3qj89w0dp085mj0qmw"; }; hardeningDisable = [ "stackprotector" ]; diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index e4eb8d3ab2e..46cdf3a47c6 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"; name = "cgal-" + version; src = fetchFromGitHub { owner = "CGAL"; repo = "releases"; rev = "CGAL-${version}"; - sha256 = "044amgml1x5h17rpkck2azmxrmjvlzzykv71cjh5hlajsi88cid5"; + sha256 = "126r06aba5h8l73xmm5mwmxkir7sy122jn2j18cd4gz3z9p23npr"; }; # note: optional component libCGAL_ImageIO would need zlib and opengl; diff --git a/pkgs/development/libraries/SDL/setup-hook.sh b/pkgs/development/libraries/SDL/setup-hook.sh index 3696e743a07..20382f18f52 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/setup-hook.sh b/pkgs/development/libraries/SDL2/setup-hook.sh index 5a26440f37b..3acce9d473c 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 a7ef0290734..a630e9cead8 100644 --- a/pkgs/development/libraries/SDL2_gfx/default.nix +++ b/pkgs/development/libraries/SDL2_gfx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL2 }: +{ stdenv, darwin, fetchurl, SDL2 }: stdenv.mkDerivation rec { name = "SDL2_gfx-${version}"; @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "16jrijzdp095qf416zvj9gs2fqqn6zkyvlxs5xqybd0ip37cp6yn"; }; - buildInputs = [ SDL2 ]; + buildInputs = [ SDL2 ] + ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc; configureFlags = if stdenv.isi686 || stdenv.isx86_64 then "--enable-mmx" else "--disable-mmx"; @@ -38,6 +39,6 @@ stdenv.mkDerivation rec { license = licenses.zlib; maintainers = with maintainers; [ bjg ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index 6eada0c83e5..00251adb915 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 cf81fc0cac8..780444d51f4 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 010ca46695a..87436119ef4 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, mesa_noglu }: stdenv.mkDerivation rec { name = "SDL2_ttf-${version}"; @@ -9,11 +9,12 @@ stdenv.mkDerivation rec { sha256 = "0xljwcpvd2knrjdfag5b257xqayplz55mqlszrqp0kpnphh5xnrl"; }; - buildInputs = [ SDL2 freetype mesa_noglu ]; + buildInputs = [ SDL2 freetype mesa_noglu ] + ++ 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/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index 8cadc7290aa..07d256f4f57 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -4,9 +4,9 @@ stdenv.mkDerivation { name = "Xaw3d-1.6.2"; src = fetchurl { urls = [ - ftp://ftp.x.org/pub/xorg/individual/lib/libXaw3d-1.6.tar.bz2 + ftp://ftp.x.org/pub/xorg/individual/lib/libXaw3d-1.6.2.tar.bz2 ]; - sha256 = "099kx6ni5vkgr3kf40glif8m6r1m1hq6hxqlqrblaj1w5cphh8hi"; + sha256 = "0awplv1nf53ywv01yxphga3v6dcniwqnxgnb0cn4khb121l12kxp"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [imake gccmakedep libXpm libXp bison flex]; diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix index e45a9f2f387..e7a90e40548 100644 --- a/pkgs/development/libraries/accounts-qt/default.nix +++ b/pkgs/development/libraries/accounts-qt/default.nix @@ -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/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index bd540cdd500..a185f19a9a1 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, cmake, openexr, hdf5 }: +{ stdenv, fetchFromGitHub, unzip, cmake, openexr, hdf5-threadsafe }: stdenv.mkDerivation rec { @@ -14,7 +14,8 @@ stdenv.mkDerivation rec 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/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 3251693f574..7e7864cef52 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 9abf48289ae..ecdeb35f6ed 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/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index fc6b47e8a63..8d97d6db2f1 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -212,6 +212,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"; diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index 61c18837782..f7d3887cc18 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -18,13 +18,11 @@ stdenv.mkDerivation rec { buildInputs = libintlOrEmpty; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkgconfig perl gobjectIntrospection ]; propagatedBuildInputs = [ # Required by atk.pc glib - # TODO: Why propagate? - gobjectIntrospection ]; doCheck = true; diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index 80aae344dcd..182471acf4a 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -5,7 +5,7 @@ let fetchDebianPatch = { name, debname, sha256 }: fetchpatch { inherit sha256 name; - url = "https://anonscm.debian.org/cgit/pkg-multimedia/audiofile.git/plain/debian/patches/${debname}?h=debian/0.3.6-4"; + url = "https://salsa.debian.org/multimedia-team/audiofile/raw/debian/0.3.6-4/debian/patches/${debname}"; }; in diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 40df40480f3..47d9e7dba4c 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -28,7 +28,8 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; separateDebugInfo = stdenv.isLinux; - buildInputs = [ cmake curl ]; + nativeBuildInputs = [ cmake curl ]; + buildInputs = [ zlib curl openssl ]; cmakeFlags = lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0" @@ -51,10 +52,6 @@ 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 ]); - meta = { description = "A C++ interface for Amazon Web Services"; homepage = https://github.com/awslabs/aws-sdk-cpp; diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 04e714f886e..f7788eb93cb 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babl-0.1.38"; + name = "babl-0.1.42"; src = fetchurl { url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; - sha256 = "11pfbyzq20596p9sgwraxspg3djg1jzz6wvz4bapf0yyr97jiyd0"; + sha256 = "1wc7fyj9bfqfiwf1w33g3vv3wcl18pd9cxr9fc0iy391szrsynb8"; }; doCheck = true; diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix index 9805930c7bf..dd7d6a34867 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 421d7072397..b79900288c9 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -3,11 +3,15 @@ }: stdenv.mkDerivation rec { - name = "boehm-gc-7.6.0"; + name = "boehm-gc-${version}"; + version = "7.6.2"; 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 = "07nli9hgdzc09qzw169sn7gchkrn5kqgyniv2rspcy1xaq2j04dx"; }; buildInputs = [ libatomic_ops ]; @@ -20,17 +24,11 @@ stdenv.mkDerivation rec { [ "--enable-cplusplus" ] ++ lib.optional enableLargeConfig "--enable-large-config"; - 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 = { diff --git a/pkgs/development/libraries/boost/1.59.nix b/pkgs/development/libraries/boost/1.59.nix index 2666b1d6c5d..603d7883c64 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.65.nix b/pkgs/development/libraries/boost/1.65.nix index 56b136cd99b..9837e1c6919 100644 --- a/pkgs/development/libraries/boost/1.65.nix +++ b/pkgs/development/libraries/boost/1.65.nix @@ -9,6 +9,4 @@ callPackage ./generic.nix (args // rec { sha256 = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81"; }; - enableNumpy = true; - }) diff --git a/pkgs/development/libraries/boost/1.66.nix b/pkgs/development/libraries/boost/1.66.nix new file mode 100644 index 00000000000..3fd9c160824 --- /dev/null +++ b/pkgs/development/libraries/boost/1.66.nix @@ -0,0 +1,12 @@ +{ stdenv, callPackage, fetchurl, ... } @ 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"; + }; + +}) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index b2ec31ace17..c2a59431ac0 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 +, 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.targetPrefix}ranlib "$out/lib/"*.a - ''; + ]); in stdenv.mkDerivation { name = "boost-${version}"; - inherit src patches version; + 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,6 +113,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; + nativeBuildInputs = [ which buildPackages.stdenv.cc ]; buildInputs = [ expat zlib bzip2 libiconv ] ++ optional (hostPlatform == buildPlatform) icu ++ optional stdenv.isDarwin fixDarwinDylibNames @@ -159,39 +121,35 @@ stdenv.mkDerivation { ++ 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 = installer nativeB2Args; + installPhase = '' + # boostbook is needed by some applications + mkdir -p $dev/share/boostbook + cp -a tools/boostbook/{xsl,dtd} $dev/share/boostbook/ - postFixup = fixup; + # Let boost install everything else + ./b2 ${b2Args} install + ''; + + postFixup = '' + # Make boost header paths relative so that they are not runtime dependencies + find "$dev/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/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index f6676321860..39a5a9869ba 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -2,13 +2,13 @@ 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 ] ++ @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { then with darwin.apple_sdk.frameworks; [ Cocoa OpenGL ] else [mesa 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 diff --git a/pkgs/development/libraries/bullet/gwen-narrowing.patch b/pkgs/development/libraries/bullet/gwen-narrowing.patch new file mode 100644 index 00000000000..c6c06325dae --- /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/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index 14ff7a5f16c..6b3b69f9997 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 00000000000..e745648062a --- /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/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix index a97ca5cc698..19f39217fd0 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/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix index ecc730597c3..e5391e7100d 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 72fa309b721..07c6e1490e7 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/csfml/default.nix b/pkgs/development/libraries/csfml/default.nix new file mode 100644 index 00000000000..8f66b65e49a --- /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 c1579b71748..c1c867abcdf 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/dleyna-core/setup-hook.sh b/pkgs/development/libraries/dleyna-core/setup-hook.sh index 046a77d5a4d..87b5c67dff5 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/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index 61932b29e62..bb150da6799 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.8"; name = "dlib-${version}"; src = fetchFromGitHub { owner = "davisking"; repo = "dlib"; rev ="v${version}"; - sha256 = "1nlx4z53jnk7wysaxrzbyyqb65m45rw4g1fagazl2jvwh1qn49ds"; + sha256 = "0ras4dl1ws9f9680bi8wg0mnbqvrpn0l2xl5lrvq3jvnijb3cz9i"; }; postPatch = '' diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index 01f3c11ac73..e341ce842eb 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/faad2/default.nix b/pkgs/development/libraries/faad2/default.nix index 865bedf09ba..04a6b9c5354 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/fastpbkdf2/default.nix b/pkgs/development/libraries/fastpbkdf2/default.nix new file mode 100644 index 00000000000..e781e2aab83 --- /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/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index e8eab4827e6..906a15c419d 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -175,7 +175,7 @@ stdenv.mkDerivation rec { configureFlags = configureFlags ++ [ "--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/gamin/debian-patches.nix b/pkgs/development/libraries/gamin/debian-patches.nix index f784b8ccfee..a8f334fb3c3 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 4faad71d44d..46d2420b21e 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/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 984d3da8119..54174e7cfe4 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.3"; name = "gdal-${version}"; src = fetchurl { url = "http://download.osgeo.org/gdal/${version}/${name}.tar.xz"; - sha256 = "0rk0p0k787whzzdl8m1f9wcrm7h9bf1pny3z96d93b4383arhw4j"; + sha256 = "a328d63d476b3653f5a25b5f7971e87a15cdf8860ab0729d4b1157ba988b8d0b"; }; 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 c9f0c076101..7a80ce7fdb6 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 3b78225a447..310aaa430da 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"; src = fetchurl { url = "mirror://gnu/gdbm/${name}.tar.gz"; - sha256 = "0lx201q20dvc70f8a3c9s7s18z15inlxvbffph97ngvrgnyjq9cx"; + sha256 = "02dakgrq93xwgln8qfv3vs5jyz5yvds5nyzkx6rhg9v585x478dd"; }; - 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/gdk-pixbuf/setup-hook.sh b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh index ba7ab82f50b..5a7dcd79299 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/gegl/3.0.nix b/pkgs/development/libraries/gegl/3.0.nix index 158707557a5..2bb773a17b8 100644 --- a/pkgs/development/libraries/gegl/3.0.nix +++ b/pkgs/development/libraries/gegl/3.0.nix @@ -3,13 +3,15 @@ , libwebp, gnome3 }: stdenv.mkDerivation rec { - name = "gegl-0.3.26"; + name = "gegl-0.3.28"; src = fetchurl { url = "http://download.gimp.org/pub/gegl/0.3/${name}.tar.bz2"; - sha256 = "1a9zbi6ws0r0sqynvg2fh3ad0ipnphg7w62y7whlcrbpqi29izvf"; + sha256 = "1zr3gmmzjhp2d3d3h51x80r5q7gs9rv67ywx69sif6as99h8fbqm"; }; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + hardeningDisable = [ "format" ]; # needs fonts otherwise don't know how to pass them @@ -28,11 +30,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool which autoreconfHook ]; - meta = { + meta = with stdenv.lib; { description = "Graph-based image processing framework"; homepage = http://www.gegl.org; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ jtojnar ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/development/libraries/geoip/default.nix index 60d40b10aa4..d93430ac1f5 100644 --- a/pkgs/development/libraries/geoip/default.nix +++ b/pkgs/development/libraries/geoip/default.nix @@ -1,17 +1,22 @@ # 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"; }; + nativeBuildInputs = [ autoreconfHook ]; + postPatch = '' find . -name Makefile.in -exec sed -i -r 's#^pkgdatadir\s*=.+$#pkgdatadir = ${dataDir}#' {} \; ''; diff --git a/pkgs/development/libraries/gettext/gettext-setup-hook.sh b/pkgs/development/libraries/gettext/gettext-setup-hook.sh index fe3ef1f9e15..5932ef6a44f 100644 --- a/pkgs/development/libraries/gettext/gettext-setup-hook.sh +++ b/pkgs/development/libraries/gettext/gettext-setup-hook.sh @@ -4,4 +4,4 @@ gettextDataDirsHook() { fi } -envHooks+=(gettextDataDirsHook) +addEnvHooks "$hostOffset" gettextDataDirsHook diff --git a/pkgs/development/libraries/gflags/default.nix b/pkgs/development/libraries/gflags/default.nix new file mode 100644 index 00000000000..d79b7691335 --- /dev/null +++ b/pkgs/development/libraries/gflags/default.nix @@ -0,0 +1,10 @@ +{ stdenv, fetchurl, cmake }: + +stdenv.mkDerivation + { name = "gflags-2.2.1"; + src = fetchurl + { url = "https://github.com/gflags/gflags/archive/v2.2.1.tar.gz"; + sha256 = "03lxc2ah8i392kh1naq99iip34k4fpv22kwflyx3byd2ssycs9xf"; + }; + nativeBuildInputs = [ cmake ]; + } diff --git a/pkgs/development/libraries/glib/setup-hook.sh b/pkgs/development/libraries/glib/setup-hook.sh index c5cf293902c..233845c6541 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 00000000000..3d866c567a7 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 00000000000..9bf1a4f7d39 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 00000000000..ce18b874c42 --- /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 86f3be15fea..b17d4effb1e 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -20,7 +20,7 @@ let version = "2.26"; - patchSuffix = "-75"; + patchSuffix = "-131"; sha256 = "1ggnj1hzjym7sn93rbwydcqd562q73lsb7g7kd199g6j9j9hlkp5"; cross = if buildPlatform != hostPlatform then hostPlatform else null; in @@ -47,6 +47,10 @@ stdenv.mkDerivation ({ $ git show --reverse glibc-2.25..release/2.25/master | gzip -n -9 --rsyncable - > 2.25-49.patch.gz */ ./2.26-75.patch.gz + ./2.26-75to115.diff.gz + # contains fix for CVE-2018-1000001 as the last commit: + # https://sourceware.org/git/?p=glibc.git;a=commit;h=fabef2edbc + ./2.26-115to131.diff.gz /* Have rpcgen(1) look for cpp(1) in $PATH. */ ./rpcgen-path.patch @@ -64,6 +68,25 @@ 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; @@ -104,7 +127,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" @@ -121,7 +143,7 @@ stdenv.mkDerivation ({ outputs = [ "out" "bin" "dev" "static" ]; - nativeBuildInputs = lib.optional (cross != null) buildPackages.stdenv.cc; + depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = lib.optionals withGd [ gd libpng ]; # Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to @@ -133,8 +155,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"; @@ -167,14 +188,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"; diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix index 0841990fa95..904727ceae6 100644 --- a/pkgs/development/libraries/glm/default.nix +++ b/pkgs/development/libraries/glm/default.nix @@ -1,23 +1,28 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, 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" + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '"''${CMAKE_CURRENT_BINARY_DIR}/''${GLM_INSTALL_CONFIGDIR}' '"''${GLM_INSTALL_CONFIGDIR}' + ''; + + postInstall = '' + mkdir -p $doc/share/doc/glm + cp -rv $NIX_BUILD_TOP/$sourceRoot/doc/* $doc/share/doc/glm ''; meta = with stdenv.lib; { @@ -33,3 +38,4 @@ stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; }; } + diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index e3bacc86d58..5973c89cef7 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 00000000000..0fac97aaa43 --- /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 00000000000..64738300aba --- /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/gobject-introspection/setup-hook.sh b/pkgs/development/libraries/gobject-introspection/setup-hook.sh index 583d8475ec3..a79ce05a38d 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/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index d2f3d848dd7..f67129c007e 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.36"; + name = "goffice-0.10.38"; src = fetchurl { url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz"; - sha256 = "cfe65fc0a665538704c7bab8541784291cf0781df8b4cff73cb0a513ee0baad6"; + sha256 = "443199d7a9833fddaadfc4f9065c289e639eed480de316f37da816e396bb9764"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/development/libraries/grantlee/5/setup-hook.sh b/pkgs/development/libraries/grantlee/5/setup-hook.sh index aaa64868dc9..b51cb4a3190 100644 --- a/pkgs/development/libraries/grantlee/5/setup-hook.sh +++ b/pkgs/development/libraries/grantlee/5/setup-hook.sh @@ -10,8 +10,4 @@ _grantleeEnvHook() { propagatedUserEnvPkgs+=" $1" fi } -if [ "$crossEnv" ]; then - crossEnvHooks+=(_grantleeEnvHook) -else - envHooks+=(_grantleeEnvHook) -fi +addEnvHooks "$hostOffset" _grantleeEnvHook diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix new file mode 100644 index 00000000000..4e6fe783dc2 --- /dev/null +++ b/pkgs/development/libraries/grpc/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }: + +stdenv.mkDerivation rec + { name = "grpc-1.8.3"; + src = fetchurl + { url = "https://github.com/grpc/grpc/archive/v1.8.3.tar.gz"; + sha256 = "14ichjllvhkbv8sjh9j5njnagpqw2sl12n41ga90jnj7qvfwwjy1"; + }; + 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; + } diff --git a/pkgs/development/libraries/gstreamer/core/setup-hook.sh b/pkgs/development/libraries/gstreamer/core/setup-hook.sh index 3dd7812ece6..b8c741af578 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/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix index f6138fafaef..bee80cb24ec 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; - maintainers = with maintainers; [ romildo ]; platforms = platforms.unix; + maintainers = with maintainers; [ romildo ]; }; } 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 bdb1b6c7bb7..77465645d23 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/gstreamer/setup-hook.sh b/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh index e89aeda5bc1..65ce2611251 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/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index 45222b7d7fc..169fd119d51 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, libintlOrEmpty, xlibsWrapper, gobjectIntrospection , xineramaSupport ? stdenv.isLinux , cupsSupport ? true, cups ? null , gdktarget ? "x11" @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { 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 ]; diff --git a/pkgs/development/libraries/libgumbo/default.nix b/pkgs/development/libraries/gumbo/default.nix similarity index 95% rename from pkgs/development/libraries/libgumbo/default.nix rename to pkgs/development/libraries/gumbo/default.nix index 210a66e654a..17ca323a5fe 100644 --- a/pkgs/development/libraries/libgumbo/default.nix +++ b/pkgs/development/libraries/gumbo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool }: stdenv.mkDerivation rec { - name = "libgumbo-${version}"; + name = "gumbo-${version}"; version = "0.10.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 4d6af866990..c0745cb9e68 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -6,15 +6,13 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "hwloc-1.11.8"; + name = "hwloc-1.11.9"; src = fetchurl { url = "http://www.open-mpi.org/software/hwloc/v1.11/downloads/${name}.tar.bz2"; - sha256 = "0karxv4r1r8sa7ki5aamlxdvyvz0bvzq4gdhq0yi5nc4a0k11vzc"; + sha256 = "0r2im1s5lp7zjwqalcqcnlxx0dsky1bnx5waf2r3rmj888c36hrr"; }; - hardeningDisable = [ "format" ]; - configureFlags = [ "--localstatedir=/var" ]; @@ -75,8 +73,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/ignition-math/default.nix b/pkgs/development/libraries/ignition-math/default.nix index 66b21b6fae6..867ce024d2f 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/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index 21c2c46105e..956a8667be5 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/ip2location-c/default.nix b/pkgs/development/libraries/ip2location-c/default.nix index 109510df79b..82a4ec33755 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/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix index 05ad908b3c3..df9b3f96c87 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/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index 8c8c181409d..0882431cc15 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -1,21 +1,30 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { name = "jemalloc-${version}"; - version = "4.5.0"; + version = "5.0.1"; src = fetchurl { url = "https://github.com/jemalloc/jemalloc/releases/download/${version}/${name}.tar.bz2"; - sha256 = "9409d85664b4f135b77518b0b118c549009dc10f6cba14557d170476611f6780"; + sha256 = "4814781d395b0ef093b21a08e8e6e0bd3dab8762f9935bbfb71679b0dea7c3e9"; }; # By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which # then stops downstream builds (mariadb in particular) from detecting it. This # option should remove the prefix and give us a working jemalloc. - configureFlags = stdenv.lib.optional stdenv.isDarwin "--with-jemalloc-prefix="; - + configureFlags = stdenv.lib.optional stdenv.isDarwin "--with-jemalloc-prefix=" + # jemalloc is unable to correctly detect transparent hugepage support on + # ARM (https://github.com/jemalloc/jemalloc/issues/526), and the default + # kernel ARMv6/7 kernel does not enable it, so we explicitly disable support + ++ stdenv.lib.optional stdenv.isArm "--disable-thp"; doCheck = true; + patches = stdenv.lib.optional stdenv.isAarch64 (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/jemalloc/jemalloc/pull/1035.patch"; + sha256 = "02y0q3dp253bipxv4r954nqipbjbj92p6ww9bx5bk3d8pa81wkqq"; + }); + + enableParallelBuilding = true; meta = with stdenv.lib; { homepage = http://jemalloc.net; diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index 2414931e76a..bf32f4f8e8b 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, fetchpatch, glib, meson, ninja, pkgconfig, gettext, gobjectIntrospection, dbus, libintlOrEmpty }: +{ stdenv, fetchurl, fetchpatch, glib, meson, ninja, pkgconfig, gettext +, gobjectIntrospection, dbus, libintlOrEmpty +, fixDarwinDylibNames +}: stdenv.mkDerivation rec { name = "json-glib-${minVer}.2"; @@ -11,7 +14,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib ]; nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ]; - buildInputs = libintlOrEmpty; + buildInputs = libintlOrEmpty + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; @@ -27,8 +31,6 @@ stdenv.mkDerivation rec { doCheck = true; - checkPhase = "meson test"; - meta = with stdenv.lib; { homepage = http://live.gnome.org/JsonGlib; description = "A library providing (de)serialization support for the JavaScript Object Notation (JSON) format"; diff --git a/pkgs/development/libraries/kdb/default.nix b/pkgs/development/libraries/kdb/default.nix index 399d5914c2d..e85190cdfce 100644 --- a/pkgs/development/libraries/kdb/default.nix +++ b/pkgs/development/libraries/kdb/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchurl, extra-cmake-modules, - qtbase, qttranslations, kcoreaddons, python2, sqlite, postgresql, libmysql + qtbase, qttranslations, kcoreaddons, python2, sqlite, postgresql, mysql }: mkDerivation rec { @@ -16,7 +16,7 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qttranslations kcoreaddons python2 sqlite postgresql libmysql ]; + buildInputs = [ qttranslations kcoreaddons python2 sqlite postgresql mysql.connector-c ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh index c1b1e21852c..88091e78a0c 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh @@ -2,7 +2,7 @@ _ecmEnvHook() { addToSearchPath XDG_DATA_DIRS "$1/share" addToSearchPath XDG_CONFIG_DIRS "$1/etc/xdg" } -envHooks+=(_ecmEnvHook) +addEnvHooks "$targetOffset" _ecmEnvHook _ecmPreConfigureHook() { # Because we need to use absolute paths here, we must set *all* the paths. diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index b9f6d092571..119abbe9f53 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.41/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.42/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-follow-symlinks.patch index 5e1007b7fc0..cc041b9aa3b 100644 --- a/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-follow-symlinks.patch +++ b/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-follow-symlinks.patch @@ -1,13 +1,13 @@ -Index: kcmutils-5.33.0/src/kpluginselector.cpp -=================================================================== ---- kcmutils-5.33.0.orig/src/kpluginselector.cpp -+++ kcmutils-5.33.0/src/kpluginselector.cpp -@@ -305,7 +305,7 @@ void KPluginSelector::addPlugins(const Q +diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp +index 137c865..097ab75 100644 +--- a/src/kpluginselector.cpp ++++ b/src/kpluginselector.cpp +@@ -303,7 +303,7 @@ void KPluginSelector::addPlugins(const QString &componentName, QStringList desktopFileNames; const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory); - Q_FOREACH (const QString &dir, dirs) { + for (const QString &dir : dirs) { - QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); ++ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); while (it.hasNext()) { desktopFileNames.append(it.next()); } diff --git a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch index 7a6c0ee9053..3b6ea27d41e 100644 --- a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch +++ b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch @@ -1,25 +1,18 @@ -From 4f84780893d505b2d62a14633dd983baa8ec6e28 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -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/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix index 661e89e3078..0a600fe8d05 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 5cfffbd622d..2928d9b34db 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/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix index 26a8637bafc..29748a5f7f4 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 1036ea27745..538078fd745 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/plasma-framework.nix b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix index d3a81b50bf1..a2a90e448d4 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 }: mkDerivation { @@ -14,7 +14,7 @@ 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 ]; propagatedBuildInputs = [ kpackage kservice qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index d99c723082f..f8d4bcf5c8f 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,611 +3,611 @@ { attica = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/attica-5.41.0.tar.xz"; - sha256 = "1l97qhf053z7grl8d77p9zajdvaw3zicllwna9p2vyzbb6n6qyq7"; - name = "attica-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/attica-5.42.0.tar.xz"; + sha256 = "0icjsk5sbri6nwybb2301wc6ysc1h4p35rxqp0adifyksq8akyxd"; + name = "attica-5.42.0.tar.xz"; }; }; baloo = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/baloo-5.41.0.tar.xz"; - sha256 = "1kl4xs09r21bi11b5dzjkmc8igh5iv8nvq0gxd00n7qjghpxa399"; - name = "baloo-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/baloo-5.42.0.tar.xz"; + sha256 = "18yknkcls1ypsp8n5l254bhlffiq4as5w1wgcjzhnf49cacys8nl"; + name = "baloo-5.42.0.tar.xz"; }; }; bluez-qt = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/bluez-qt-5.41.0.tar.xz"; - sha256 = "08wlsmr12n3whqr65zm3l9hmzbaca2jkkhb1wwq5ilqm3gvxxz0n"; - name = "bluez-qt-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/bluez-qt-5.42.0.tar.xz"; + sha256 = "0pbb0nn70hbsnp9q8jvqr3s85gh4bnnh1mp8xfkia2hp4c63ws9f"; + name = "bluez-qt-5.42.0.tar.xz"; }; }; breeze-icons = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/breeze-icons-5.41.0.tar.xz"; - sha256 = "1k06ms48cnnwnlrh9wdabsms581jy70nz5narwg1zpzb6clf9p4w"; - name = "breeze-icons-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/breeze-icons-5.42.0.tar.xz"; + sha256 = "0mrj0b022yfy669qqby09k4ij6aqyky23gpnjcp85df9saq0x44r"; + name = "breeze-icons-5.42.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/extra-cmake-modules-5.41.0.tar.xz"; - sha256 = "0rwz2rdyxr424z0mra29p8i6gf0b1402ifi94qrq7y4z1fa61bxs"; - name = "extra-cmake-modules-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/extra-cmake-modules-5.42.0.tar.xz"; + sha256 = "1ml6s3ssr5izm3vnzlg5gn2nkcbz5l5nmapvyr4ml7n0089b43a3"; + name = "extra-cmake-modules-5.42.0.tar.xz"; }; }; frameworkintegration = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/frameworkintegration-5.41.0.tar.xz"; - sha256 = "1k67hkzc2jw5im7vc8j64fqsxz5m8fnlq696hm5dh4fbclyckh5s"; - name = "frameworkintegration-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/frameworkintegration-5.42.0.tar.xz"; + sha256 = "17fyny3c5chv7bipr19ayfjmd1amp2nms4ba5r7mwjp97xkphry7"; + name = "frameworkintegration-5.42.0.tar.xz"; }; }; kactivities = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kactivities-5.41.0.tar.xz"; - sha256 = "1zxwmizq48kk6pd9y350gzszqi87wjbqni8z4mxa1kmw9lq01xlc"; - name = "kactivities-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kactivities-5.42.0.tar.xz"; + sha256 = "0z0ac426npq99s1b8yzrqkjjjc34nbxlpw8pw388yj7fa41hw21r"; + name = "kactivities-5.42.0.tar.xz"; }; }; kactivities-stats = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kactivities-stats-5.41.0.tar.xz"; - sha256 = "1nm34ln222x6mm4zpmvn8prqk9fr3jxyppn18kwlv0nfw16qmppq"; - name = "kactivities-stats-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kactivities-stats-5.42.0.tar.xz"; + sha256 = "0si70hayf4brr83jzdjdsfvp8nc1sb7vdk0q532liafhf8hw9mq8"; + name = "kactivities-stats-5.42.0.tar.xz"; }; }; kapidox = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kapidox-5.41.0.tar.xz"; - sha256 = "0jdphs536ymaj5f9gh5ycfgq1d41sas6bx4dzzjg13y26w6afyy6"; - name = "kapidox-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kapidox-5.42.0.tar.xz"; + sha256 = "0izyd66p5403gl09l7irzy97mb9b14n4zyjrwap800zjlpwh41pz"; + name = "kapidox-5.42.0.tar.xz"; }; }; karchive = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/karchive-5.41.0.tar.xz"; - sha256 = "0hd7jy9517m53ijvprl9ci97kjx7nd42ga33af71kqx5x030zi23"; - name = "karchive-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/karchive-5.42.0.tar.xz"; + sha256 = "1vq2ngdxmdl6hzjwdcrv66ban8v9s5jiqwy1mgdqv4ak14l31qbi"; + name = "karchive-5.42.0.tar.xz"; }; }; kauth = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kauth-5.41.0.tar.xz"; - sha256 = "1hkaf83p3xwcwkhlfbrdbg7b7nhw0gh0yw4lv8y3vpryn7pcd32l"; - name = "kauth-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kauth-5.42.0.tar.xz"; + sha256 = "04kqb2hhr9lkpkxiaqlnyk0kmk6p89z5fgp5i5g83hsi8maz7swi"; + name = "kauth-5.42.0.tar.xz"; }; }; kbookmarks = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kbookmarks-5.41.0.tar.xz"; - sha256 = "173rf85msrp1awmf2zsxwv6jjfkz7yc2pbh4jq0hfcgnqk46s9v0"; - name = "kbookmarks-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kbookmarks-5.42.0.tar.xz"; + sha256 = "08q413mr5ib04gwnqznvm9vkkfmnh16rgf6rqdvclnci9w7ml5x2"; + name = "kbookmarks-5.42.0.tar.xz"; }; }; kcmutils = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kcmutils-5.41.0.tar.xz"; - sha256 = "165b5hk0cv769kk9dqqggc6ji6gzln8zns5k6rv12rz825aysnhs"; - name = "kcmutils-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kcmutils-5.42.0.tar.xz"; + sha256 = "1q67b0m6w3xvm22kq8b0b0rib1jzf25gf6dz7h286987zfbbs5n7"; + name = "kcmutils-5.42.0.tar.xz"; }; }; kcodecs = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kcodecs-5.41.0.tar.xz"; - sha256 = "0y96mbp9j083kwkqxk0qgrjyhylp8f7f0ngcqcvhh8s6sgpb8xq9"; - name = "kcodecs-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kcodecs-5.42.0.tar.xz"; + sha256 = "0b19z432r9dnyjknvwffhcmrg969yhydjvy4qrkrf22026f4smwc"; + name = "kcodecs-5.42.0.tar.xz"; }; }; kcompletion = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kcompletion-5.41.0.tar.xz"; - sha256 = "0b6bh5l4s5q8yi6vls11c8b8dpscykh138kydfi925nxkrms7yv3"; - name = "kcompletion-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kcompletion-5.42.0.tar.xz"; + sha256 = "0yqci2v0dk5v1mz4n3gca599a7mpihy563zc6sl8hsa30ld8li0f"; + name = "kcompletion-5.42.0.tar.xz"; }; }; kconfig = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kconfig-5.41.0.tar.xz"; - sha256 = "1jch9bpqshigwvc2qs46qa0mclr1hdn0sqlkxbl4b2xb5xj28nzn"; - name = "kconfig-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kconfig-5.42.0.tar.xz"; + sha256 = "08gg0d20c09j7hyxm8ydpzk2yf30c87g9ag7a9nfykrmi6cqirdq"; + name = "kconfig-5.42.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kconfigwidgets-5.41.0.tar.xz"; - sha256 = "1lbpjkhxmpah32ig1wlxkr1v1l3fqicnnvj6lhwpk0bxys8cdnd2"; - name = "kconfigwidgets-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kconfigwidgets-5.42.0.tar.xz"; + sha256 = "191zm24q2n001b65hcnfh2639k4iqhxwdmgdw29php3n2648xq4z"; + name = "kconfigwidgets-5.42.0.tar.xz"; }; }; kcoreaddons = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kcoreaddons-5.41.0.tar.xz"; - sha256 = "1f45x4adql708903x4g27x1wbzvbwd809ibiqa5kiijayaqkjxqf"; - name = "kcoreaddons-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kcoreaddons-5.42.0.tar.xz"; + sha256 = "17qv7r6z72mm9a0hyx5dgk90ikhhgm41bkvnq2hjal0py2lsnrs9"; + name = "kcoreaddons-5.42.0.tar.xz"; }; }; kcrash = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kcrash-5.41.0.tar.xz"; - sha256 = "1jp06hz33mpcy2y93w4j3yqcvkphigiwq6j89mvgi9h21pahpjvy"; - name = "kcrash-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kcrash-5.42.0.tar.xz"; + sha256 = "049y0xdyw37y0qid3d3plj8szfys5gw98j7lhcakiini8mn5cins"; + name = "kcrash-5.42.0.tar.xz"; }; }; kdbusaddons = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kdbusaddons-5.41.0.tar.xz"; - sha256 = "02d6zv43vpz5h8si100zlsf5yfgjajsgwldcxblckyjr0qn42xny"; - name = "kdbusaddons-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kdbusaddons-5.42.0.tar.xz"; + sha256 = "1613pc3r70jnzvpwm1xjdbdsmcpx28jwvcs2qq9swlywr5qr9hbd"; + name = "kdbusaddons-5.42.0.tar.xz"; }; }; kdeclarative = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kdeclarative-5.41.0.tar.xz"; - sha256 = "1hxfrz4d7xjm63b9kawhf382gz1xykvdi9q4syhkjfbpyacxfjga"; - name = "kdeclarative-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kdeclarative-5.42.0.tar.xz"; + sha256 = "1w604jy6vg2247vggz0ivl7wy2h5iapkz2z86mah3aw99f7dqa22"; + name = "kdeclarative-5.42.0.tar.xz"; }; }; kded = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kded-5.41.0.tar.xz"; - sha256 = "10wmj3nb8vn90h1j0s5kfr8iydk7k853gg9v6hxivm92v6zr6l9g"; - name = "kded-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kded-5.42.0.tar.xz"; + sha256 = "0w25dl4pnvby28gz0yvij32vi9n3p8si4nm4x45j7zsi2cb70j4l"; + name = "kded-5.42.0.tar.xz"; }; }; kdelibs4support = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/portingAids/kdelibs4support-5.41.0.tar.xz"; - sha256 = "1mkp3w8h8cyskbfxcwsl72v87376x66n20ig7b3b6ply36578br4"; - name = "kdelibs4support-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/portingAids/kdelibs4support-5.42.0.tar.xz"; + sha256 = "0aiig8akn6bdxrqdl96xjjy2pxw8hhfrsalbkkzyhh06j794snfb"; + name = "kdelibs4support-5.42.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kdesignerplugin-5.41.0.tar.xz"; - sha256 = "1c1pnjgp9nifynwvsyjp7c45j40i111xnmjp89bb1jk9fv9g2f99"; - name = "kdesignerplugin-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kdesignerplugin-5.42.0.tar.xz"; + sha256 = "004axa1fkj954d65x7l9z8dmw04209hb368rwa4gjzb8naf13ib6"; + name = "kdesignerplugin-5.42.0.tar.xz"; }; }; kdesu = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kdesu-5.41.0.tar.xz"; - sha256 = "126m7by50zzkmk0r778xlkqfbfpihwd6d3wzd4hbqkh9km18l1rb"; - name = "kdesu-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kdesu-5.42.0.tar.xz"; + sha256 = "0402p1h7wifk6sppg7ca9w0zfjllbhc1j5gsxj7ypq55g94np7hx"; + name = "kdesu-5.42.0.tar.xz"; }; }; kdewebkit = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kdewebkit-5.41.0.tar.xz"; - sha256 = "1rnixlm37x5k4cdwckml2zdmm30k938nklkd7qnbaal230dzvj6d"; - name = "kdewebkit-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kdewebkit-5.42.0.tar.xz"; + sha256 = "1csd4p996im7ygxc5rfdkzgdpngjgzyqakj12rl9rnfbsd15i8kb"; + name = "kdewebkit-5.42.0.tar.xz"; }; }; kdnssd = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kdnssd-5.41.0.tar.xz"; - sha256 = "042dmh50rxvipb5pqz0csb3y7cvzc2ga2a5qcvd1vw84ii1mmjbh"; - name = "kdnssd-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kdnssd-5.42.0.tar.xz"; + sha256 = "1k1rz62h3mafliik5n0k98dc56b5v2v6qyqj40696mcyc2d1yvll"; + name = "kdnssd-5.42.0.tar.xz"; }; }; kdoctools = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kdoctools-5.41.0.tar.xz"; - sha256 = "06v63br6m5nhvsdsynhb7i825yrry94s7zrk20k0xw4yahpvkjcs"; - name = "kdoctools-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kdoctools-5.42.0.tar.xz"; + sha256 = "1bby3avdllch1mji0mxzcix8q5yir5a0i6wpjs5lwckv1glh6kmz"; + name = "kdoctools-5.42.0.tar.xz"; }; }; kemoticons = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kemoticons-5.41.0.tar.xz"; - sha256 = "1lj6c6k8dh2rgj1128ms2xv7dk1v9li5rcy2djqfynqdrvg5iy3g"; - name = "kemoticons-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kemoticons-5.42.0.tar.xz"; + sha256 = "0f6an1bwxnga41a2b35b2pdcni4p0hh76k4jvanl3g046v07f2wr"; + name = "kemoticons-5.42.0.tar.xz"; }; }; kfilemetadata = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kfilemetadata-5.41.0.tar.xz"; - sha256 = "0y9ya18bqa8sfi2c10y2q0dkwdry0wfq5s2sb53q0fh2fph7hjvi"; - name = "kfilemetadata-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kfilemetadata-5.42.0.tar.xz"; + sha256 = "03wk38q3sq354ykz9dwbgykn73ldf94ryx6hxvpr66bq3a59jmwz"; + name = "kfilemetadata-5.42.0.tar.xz"; }; }; kglobalaccel = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kglobalaccel-5.41.0.tar.xz"; - sha256 = "0i8aw0jbsh26asjmhs0lax1yv9qalpr82cd8m0nbyqn2s3f4jyaf"; - name = "kglobalaccel-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kglobalaccel-5.42.0.tar.xz"; + sha256 = "0nlza73i0qd79yhwhpnvgbh2xa9lvd1n2xg25p3bvfzwidcfdxg6"; + name = "kglobalaccel-5.42.0.tar.xz"; }; }; kguiaddons = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kguiaddons-5.41.0.tar.xz"; - sha256 = "0cva0qy946srqay9nmh97mjv7kf2lr51nipx9qx2jd21d8cvz8p1"; - name = "kguiaddons-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kguiaddons-5.42.0.tar.xz"; + sha256 = "193i8b4f13dkgp88m3pk9wzi0dhx7qmsnmpizxia3457gg016wn7"; + name = "kguiaddons-5.42.0.tar.xz"; }; }; khtml = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/portingAids/khtml-5.41.0.tar.xz"; - sha256 = "0gbs63d7izb8kaf4k8ssp2lkcps9fqk32czjpmzx3fq1gnaczry3"; - name = "khtml-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/portingAids/khtml-5.42.0.tar.xz"; + sha256 = "1bfslndxvad0zgzr22w2mz1xwavix9bh5qrrv8dpshlh043bwr3l"; + name = "khtml-5.42.0.tar.xz"; }; }; ki18n = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/ki18n-5.41.0.tar.xz"; - sha256 = "12ylqsi7lsxvdcg9a1p9hkd6lpcj971k77zly6vpb4yb3s6z0jqd"; - name = "ki18n-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/ki18n-5.42.0.tar.xz"; + sha256 = "1rpriflb2a48j94zxgh63l6rzq4nlnlkvy89ns1vkdw42bnqrjx9"; + name = "ki18n-5.42.0.tar.xz"; }; }; kiconthemes = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kiconthemes-5.41.0.tar.xz"; - sha256 = "1ywg7b3vy3p7vmd055a72hmpnwp0l0yvf6cnb6nvmpnp3pm737g1"; - name = "kiconthemes-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kiconthemes-5.42.0.tar.xz"; + sha256 = "1nbxxpf8bv835xl35b17rk8s3zs110bh31078kqqh7dhvwzlxic7"; + name = "kiconthemes-5.42.0.tar.xz"; }; }; kidletime = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kidletime-5.41.0.tar.xz"; - sha256 = "0k4q8ssqfbgfqvjq1rpills16nz4fi92mc754644by3s0czh409w"; - name = "kidletime-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kidletime-5.42.0.tar.xz"; + sha256 = "019r41r28pcrcn1kwxsll53za705jkc9n23b6sr2lplgjk05bcxh"; + name = "kidletime-5.42.0.tar.xz"; }; }; kimageformats = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kimageformats-5.41.0.tar.xz"; - sha256 = "11df264s3n192pggdmql2pklnflc8fn9v8zrjpn38f99hs46bq8s"; - name = "kimageformats-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kimageformats-5.42.0.tar.xz"; + sha256 = "1k67yrmszx7azjzrg478rimbz991lghx4d6dmg22p6dknajd78a6"; + name = "kimageformats-5.42.0.tar.xz"; }; }; kinit = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kinit-5.41.0.tar.xz"; - sha256 = "05jqsnj33gwxp4lc81378kb58idnmcmn84smy3hkqwlakisnwgy9"; - name = "kinit-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kinit-5.42.0.tar.xz"; + sha256 = "05vpac41pw1n8y58l2z08vyknzv950x8dxxw66dnymm2v31w07ia"; + name = "kinit-5.42.0.tar.xz"; }; }; kio = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kio-5.41.0.tar.xz"; - sha256 = "17k4pfbhkv1inx5c3wqm388c02cdf3wnqgnhky271v7gb5ww5i4h"; - name = "kio-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kio-5.42.0.tar.xz"; + sha256 = "1526a89x11ank55dp3rfp7xd04w8x7prjg3y6i7n2q9nabwhw7gc"; + name = "kio-5.42.0.tar.xz"; }; }; kirigami2 = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kirigami2-5.41.0.tar.xz"; - sha256 = "04l7b86fs7s80dfrznc2c0zh6phpgirwsinykrzfqg792gmbvx2h"; - name = "kirigami2-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kirigami2-5.42.0.tar.xz"; + sha256 = "11gqn7amp0r9bgh8ldgisfc2lrkzkn5mq2a1madf24nvjbkvqnqv"; + name = "kirigami2-5.42.0.tar.xz"; }; }; kitemmodels = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kitemmodels-5.41.0.tar.xz"; - sha256 = "13kngcj8ifnhbp0jsrjwhw49my8pnw493g11y11cw17hw7sqg55k"; - name = "kitemmodels-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kitemmodels-5.42.0.tar.xz"; + sha256 = "0mcdzdqwmvf9pwirsrnjbhrgqphnfmanbl9zij4qsmin8n866mhc"; + name = "kitemmodels-5.42.0.tar.xz"; }; }; kitemviews = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kitemviews-5.41.0.tar.xz"; - sha256 = "0147pm5p03w1b71mrr5rssmh2n80q54ghfpbjpq3spjdkjg1f26f"; - name = "kitemviews-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kitemviews-5.42.0.tar.xz"; + sha256 = "1j1q0b08f8mnfc3r2a7rplyb2nv9f0aq5a3fxskinvg70c6y248w"; + name = "kitemviews-5.42.0.tar.xz"; }; }; kjobwidgets = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kjobwidgets-5.41.0.tar.xz"; - sha256 = "1fbdk6l8rbnyqn0cz2dm9cagn7x89zpy3wczj1cdvnc7k7wg75qv"; - name = "kjobwidgets-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kjobwidgets-5.42.0.tar.xz"; + sha256 = "1m3csdl7wh18ywv5p0qpbjpixvflgjcq3yvk3vlvh0sxxlwcz8k4"; + name = "kjobwidgets-5.42.0.tar.xz"; }; }; kjs = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/portingAids/kjs-5.41.0.tar.xz"; - sha256 = "1a263cng8i304yh66iq45hwpgnl8ng6wvjrsl11hhqmyv07h2kk0"; - name = "kjs-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/portingAids/kjs-5.42.0.tar.xz"; + sha256 = "1m26sb2qyrcgmpkw76k2yv5my2pkhld96vw6aaqm77q90faw734g"; + name = "kjs-5.42.0.tar.xz"; }; }; kjsembed = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/portingAids/kjsembed-5.41.0.tar.xz"; - sha256 = "1vxbh5rd9rdj3m7sag48c4cns443j479mlfbwxgnpm92z67ka7x7"; - name = "kjsembed-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/portingAids/kjsembed-5.42.0.tar.xz"; + sha256 = "10w4w4ncwr245bv1ii4sh154w91ghfz0l60k89j50lsydpcqcp3a"; + name = "kjsembed-5.42.0.tar.xz"; }; }; kmediaplayer = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/portingAids/kmediaplayer-5.41.0.tar.xz"; - sha256 = "03420i82p984w6iqdiam2xam7b9khh76pll4ffn0c5k4wf1ba2z4"; - name = "kmediaplayer-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/portingAids/kmediaplayer-5.42.0.tar.xz"; + sha256 = "1k1pjc0cz36gs0pl2pxw8f9f82xkbqyy320nfyhan5waxbl1qd5n"; + name = "kmediaplayer-5.42.0.tar.xz"; }; }; knewstuff = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/knewstuff-5.41.0.tar.xz"; - sha256 = "0j9qgswiacv7yj8c28q343falaglh5zc4wwcflwy1zvrp59bjcz4"; - name = "knewstuff-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/knewstuff-5.42.0.tar.xz"; + sha256 = "0i2gmyp67xzf2m5wnv7v574q3gsp1yxfflv1jgl0wy57vchwn9g6"; + name = "knewstuff-5.42.0.tar.xz"; }; }; knotifications = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/knotifications-5.41.0.tar.xz"; - sha256 = "1dsiigmzmhmg3x6y5nf2i9zq3hc4nca2gg2dvl0bz1lm438ddy84"; - name = "knotifications-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/knotifications-5.42.0.tar.xz"; + sha256 = "0awmwypmd104vhaj2v9k83niflxj26d4mbl6mzfcj75lgka6kffc"; + name = "knotifications-5.42.0.tar.xz"; }; }; knotifyconfig = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/knotifyconfig-5.41.0.tar.xz"; - sha256 = "0hrdjh76php34wkcswnh5rfnkajf0g9n8mpqsdj4djxja39vi6vs"; - name = "knotifyconfig-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/knotifyconfig-5.42.0.tar.xz"; + sha256 = "1h07bjj71611v6912m5ajli6qszh9w925zqbk3vih8rn6pd2s3mc"; + name = "knotifyconfig-5.42.0.tar.xz"; }; }; kpackage = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kpackage-5.41.0.tar.xz"; - sha256 = "1663sshy52my9qbrj8ny1a6sipl94l2paxss4k5977fyyax15zdm"; - name = "kpackage-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kpackage-5.42.0.tar.xz"; + sha256 = "10amhh07x8d0jkyylb19cyzjs71k8dq1y8isfahqzb2kd43vijqa"; + name = "kpackage-5.42.0.tar.xz"; }; }; kparts = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kparts-5.41.0.tar.xz"; - sha256 = "09ddh7n8jj8zisdm90lbmc4xk4axsibhx1cjbpaigzcfcvnj1b71"; - name = "kparts-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kparts-5.42.0.tar.xz"; + sha256 = "1mb5gp2ckmmrb4ym7cqvyl81wnp7cryk85gmizl7cnn69svlf40h"; + name = "kparts-5.42.0.tar.xz"; }; }; kpeople = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kpeople-5.41.0.tar.xz"; - sha256 = "1k72br66mnvkripzdq2wcchlrg6p7mxfqa0rbq0rq3q7npw1zzw5"; - name = "kpeople-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kpeople-5.42.0.tar.xz"; + sha256 = "050km3rpx58acx2341si46lxc2hywa59m8rwd849c2dnsxw3w1hm"; + name = "kpeople-5.42.0.tar.xz"; }; }; kplotting = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kplotting-5.41.0.tar.xz"; - sha256 = "197n2m3q9b588j56m30i12z55nbymbj4wgpgrkbsci7162jjjj1z"; - name = "kplotting-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kplotting-5.42.0.tar.xz"; + sha256 = "109b9grshrwralyp8ilkbf1k0akaggygqh6wafqdf0ris0ps13l9"; + name = "kplotting-5.42.0.tar.xz"; }; }; kpty = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kpty-5.41.0.tar.xz"; - sha256 = "04xg5pn65nvk1bdh6bfznbsmlra6gzph72i7m28h9idnz143lr12"; - name = "kpty-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kpty-5.42.0.tar.xz"; + sha256 = "07s16zxs03ixy7yxy9fda83yqhcgqzx42gnvwjwkyc8q05njmma6"; + name = "kpty-5.42.0.tar.xz"; }; }; kross = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/portingAids/kross-5.41.0.tar.xz"; - sha256 = "0xsfgwb3ihgby6r6wycxnqkd9d7zrj6w3h9bxw8n4asjfri7lgwi"; - name = "kross-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/portingAids/kross-5.42.0.tar.xz"; + sha256 = "1aqqwby6jslimpvx42d4n6gjsjc8l82gmsq5ajpv9zkkk91dqfqi"; + name = "kross-5.42.0.tar.xz"; }; }; krunner = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/krunner-5.41.0.tar.xz"; - sha256 = "0vyxijs0vnpa19z7avd1438q1c7s4ka17hbsdq2r0jza3iwkfx83"; - name = "krunner-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/krunner-5.42.0.tar.xz"; + sha256 = "0xh9kss67l09am1ilsr9zyx1yhlmaq3g9x60hw0sx7h7wrl6zsw6"; + name = "krunner-5.42.0.tar.xz"; }; }; kservice = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kservice-5.41.0.tar.xz"; - sha256 = "0k3ch3vbdy9rm82d9n6mf6ir3qm7l2fddp98jy4jmsr0qynqn50q"; - name = "kservice-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kservice-5.42.0.tar.xz"; + sha256 = "0z8zfpd00ndvkm1klp8l4mrcksshhyg280zgmg3gffz5rgh3gwri"; + name = "kservice-5.42.0.tar.xz"; }; }; ktexteditor = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/ktexteditor-5.41.0.tar.xz"; - sha256 = "1idvldchfbnvimvcrizigmmam62q7rpam06xprcizywyxq53yw7z"; - name = "ktexteditor-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/ktexteditor-5.42.0.tar.xz"; + sha256 = "020y3j6vm15sfpiwainr3qsx9i93j15mrvq523wmbmdj1z36yrh2"; + name = "ktexteditor-5.42.0.tar.xz"; }; }; ktextwidgets = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/ktextwidgets-5.41.0.tar.xz"; - sha256 = "0m6n4v0njvcaky87f0ga47iwq12hsvghadj8pngjrksankvaj23n"; - name = "ktextwidgets-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/ktextwidgets-5.42.0.tar.xz"; + sha256 = "088azbv95ycwxmxxw4l63i2l14fmn8l473pb4djh2mvz1ypfqayk"; + name = "ktextwidgets-5.42.0.tar.xz"; }; }; kunitconversion = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kunitconversion-5.41.0.tar.xz"; - sha256 = "1kn6lw58b9w6f38mra2hizbnik64ka3gvgqk1xqp0mspqmr498rw"; - name = "kunitconversion-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kunitconversion-5.42.0.tar.xz"; + sha256 = "0219pna4l3vvhyf5acsc87n48jzdnws6kwyhaiy3hy1pzrilv32l"; + name = "kunitconversion-5.42.0.tar.xz"; }; }; kwallet = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kwallet-5.41.0.tar.xz"; - sha256 = "1gdzfp3gbr5qp821pkhaj6v8zg3q21xz6j11frjww8fn5nmp3v3l"; - name = "kwallet-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kwallet-5.42.0.tar.xz"; + sha256 = "1kv3v7593srfn0wd7qp4rhvb30rxp7d2qmlwi0n4nc9s6v59pabn"; + name = "kwallet-5.42.0.tar.xz"; }; }; kwayland = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kwayland-5.41.0.tar.xz"; - sha256 = "1dw2g6wwj7hhxlgzrjqk39ywpzh6ijwfjnzqjp6s8s5274fvjqbn"; - name = "kwayland-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kwayland-5.42.0.tar.xz"; + sha256 = "0wr6ygppahxsx3dh71h2wmybv7z7iyqdv7wn80cxb0mp4zpyinh7"; + name = "kwayland-5.42.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.41.0"; + version = "5.42.1"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kwidgetsaddons-5.41.0.tar.xz"; - sha256 = "15fm7gni22wb64pski3fn5myrn9z22h077hzzcc34c3af21yh5s5"; - name = "kwidgetsaddons-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kwidgetsaddons-5.42.1.tar.xz"; + sha256 = "0h0vfrfl5zi01fpvmd825kazzlyawz3i66qrfkymdrnvqmfzcmlg"; + name = "kwidgetsaddons-5.42.1.tar.xz"; }; }; kwindowsystem = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kwindowsystem-5.41.0.tar.xz"; - sha256 = "0x4jz9qkvxs5dlzk860f8vhlczgxg6di614y8ji6afra760nk17l"; - name = "kwindowsystem-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kwindowsystem-5.42.0.tar.xz"; + sha256 = "15k6x0f93qxka3mz7qfzak2ibdd88q77pz6akil8s3g41zsg2dqv"; + name = "kwindowsystem-5.42.0.tar.xz"; }; }; kxmlgui = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kxmlgui-5.41.0.tar.xz"; - sha256 = "0cgwx3lhnn982gvl2yv5272bs3il05ssfpjlkgmqgnrnz2qxlhlr"; - name = "kxmlgui-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kxmlgui-5.42.0.tar.xz"; + sha256 = "0kfxjx8wrhkys5bydnv84nqxc2jqvv92zb2l6zpi0km5ggmia5y0"; + name = "kxmlgui-5.42.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/kxmlrpcclient-5.41.0.tar.xz"; - sha256 = "0y7n6xk18a6zci36ka426h7ar8r7kkr80jn47mc6jw3qdk4nvri7"; - name = "kxmlrpcclient-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kxmlrpcclient-5.42.0.tar.xz"; + sha256 = "0ciip27ilsfk9s3gslpbi06v8i6ipdbmcig2jf43z3amsxpq0ncn"; + name = "kxmlrpcclient-5.42.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/modemmanager-qt-5.41.0.tar.xz"; - sha256 = "1bp9mllzgvqr3dsjg9a81yv487whf26vfxiyim8hr42b9j8v8wj0"; - name = "modemmanager-qt-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/modemmanager-qt-5.42.0.tar.xz"; + sha256 = "0q6qzn60z55h0gyc9xwdfaq45mjpk3zrr6d4qqjjfkqsr3866sfx"; + name = "modemmanager-qt-5.42.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/networkmanager-qt-5.41.0.tar.xz"; - sha256 = "0vdrbfwamk5p6mm0i05bxvmrlqxm9c5d373pn7qrm0kzs916xhlv"; - name = "networkmanager-qt-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/networkmanager-qt-5.42.0.tar.xz"; + sha256 = "03hhvx8d52mfgbhd4gn0vhsk9k1fv1pvq24ixxdgs2mw44v884xq"; + name = "networkmanager-qt-5.42.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/oxygen-icons5-5.41.0.tar.xz"; - sha256 = "1zpcjfzw4pv73ms8pc1w4fpvxcbpasl2av0g4y6sj7rshzdgrj31"; - name = "oxygen-icons5-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/oxygen-icons5-5.42.0.tar.xz"; + sha256 = "0pnav9h0xmvbaamzpcyznjjv25slz8maszshx7sj7h07b5a23x46"; + name = "oxygen-icons5-5.42.0.tar.xz"; }; }; plasma-framework = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/plasma-framework-5.41.0.tar.xz"; - sha256 = "1risn810pyncfpn01xiqsb5j8pwsnmx60lfajnx7qygny6b69pl4"; - name = "plasma-framework-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/plasma-framework-5.42.0.tar.xz"; + sha256 = "079c8h0lmbkfr3srj5m8a40b50kyrxbgmy1n66329l8js9xrvaah"; + name = "plasma-framework-5.42.0.tar.xz"; }; }; prison = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/prison-5.41.0.tar.xz"; - sha256 = "0q3r1a3047yxhsd3qfwzwsw261zrfdmsklnyq5d2ayflchcj5vxi"; - name = "prison-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/prison-5.42.0.tar.xz"; + sha256 = "0bhg2fjdwsv7mk16jh1nc3miwggz1dl9l99l2f20xvi75hn7rryg"; + name = "prison-5.42.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/qqc2-desktop-style-5.41.0.tar.xz"; - sha256 = "166cjfaly8fzzchq8pk2s7f5mm63cwmayw3qc0p7amy5d0nykm0w"; - name = "qqc2-desktop-style-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/qqc2-desktop-style-5.42.0.tar.xz"; + sha256 = "1arlfhcshfs11pgf87jzjgln1p711zlx0v0q014740mbzb9g5wnk"; + name = "qqc2-desktop-style-5.42.0.tar.xz"; }; }; solid = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/solid-5.41.0.tar.xz"; - sha256 = "0i2qxps26rg2x1576m35k4kj018i9jpsnlayzsk4fcj44kvsq9z3"; - name = "solid-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/solid-5.42.0.tar.xz"; + sha256 = "10lr8paaq6vaiqn833kzcdc3kkyv8j9fdchy7h8pvi9ajjjwq0lq"; + name = "solid-5.42.0.tar.xz"; }; }; sonnet = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/sonnet-5.41.0.tar.xz"; - sha256 = "1jhpl0ajqlln88fmzbwjxn0illbas4s0hbzwd3w56s9wg8j18s76"; - name = "sonnet-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/sonnet-5.42.0.tar.xz"; + sha256 = "1r3amddmy0nm8klw0jzvb8bl1l9hkrx50d8j0zq2lbjy36h3yliw"; + name = "sonnet-5.42.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/syntax-highlighting-5.41.0.tar.xz"; - sha256 = "0hmcb9f162hyvfb0mfkm69avgrbl146l7lyfzb93z1hk6f2gpxqc"; - name = "syntax-highlighting-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/syntax-highlighting-5.42.0.tar.xz"; + sha256 = "1iwiym50859jki4x41rfdmbd14jiq5lr2hdg46pjkyw17njdjd60"; + name = "syntax-highlighting-5.42.0.tar.xz"; }; }; threadweaver = { - version = "5.41.0"; + version = "5.42.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.41/threadweaver-5.41.0.tar.xz"; - sha256 = "08nlskhdds13wplv4lwy4xshimkhl8jvzkz1h1qks6wggbwxf11m"; - name = "threadweaver-5.41.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/threadweaver-5.42.0.tar.xz"; + sha256 = "1isqlpnfxzxyz7mdm7yfrafgnx09mcndicdgdw3mi4r4misbrrbn"; + name = "threadweaver-5.42.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 101c3aca07d..98073b7bbdc 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -22,7 +22,12 @@ stdenv.mkDerivation rec { 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 ] ++ optional (!libOnly) yacc diff --git a/pkgs/development/libraries/libagar/default.nix b/pkgs/development/libraries/libagar/default.nix index 1c9e8eca0d5..ee984a53b4c 100644 --- a/pkgs/development/libraries/libagar/default.nix +++ b/pkgs/development/libraries/libagar/default.nix @@ -20,15 +20,16 @@ stdenv.mkDerivation rec { "--with-gettext=${gettext}" "--with-jpeg=${libjpeg.dev}" "--with-gl=${mesa}" - "--with-mysql=yes" + "--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 mesa mysql.connector-c mandoc freetype.dev libpng libjpeg.dev fontconfig portaudio libsndfile ]; diff --git a/pkgs/development/libraries/libargon2/default.nix b/pkgs/development/libraries/libargon2/default.nix index 79cbf09317c..94e8ea05e66 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 = '' diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 058839f70f8..d7ebf781a04 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 bad2a060cdc..94369449ff3 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, pth, libgpgerror }: stdenv.mkDerivation rec { - name = "libassuan-2.4.3"; + name = "libassuan-2.5.1"; src = fetchurl { url = "mirror://gnupg/libassuan/${name}.tar.bz2"; - sha256 = "0w9bmasln4z8mn16s1is55a06w3nv8jbyal496z5jvr5vcxkm112"; + sha256 = "0jb4nb4nrjr949gd3lw8lh4v5d6qigxaq6xwy24w5apjnhvnrya7"; }; outputs = [ "out" "dev" "info" ]; diff --git a/pkgs/development/libraries/libast/default.nix b/pkgs/development/libraries/libast/default.nix index 900bcac4156..bcfee044475 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 eedc0993d73..3aae754be40 100644 --- a/pkgs/development/libraries/libatomic_ops/default.nix +++ b/pkgs/development/libraries/libatomic_ops/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "libatomic_ops-${version}"; - version = "7.6.0"; + version = "7.6.2"; 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 ="1rif2hjscq5mh639nsnjhb90c01gnmy1sbmj6x6hsn1xmpnj95r1"; }; nativeBuildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake libtool ]; diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index 8948a74ad63..3f4f48775c1 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 8b67d52b875..fea4744a075 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/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 7e112caf3c7..0e232a50e94 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libbsd-${version}"; - version = "0.8.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 diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index 670484f0ae6..6d8cafcfaa6 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/libcli/default.nix b/pkgs/development/libraries/libcli/default.nix index 587e72409c4..f101eb22310 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/libcollectdclient/default.nix b/pkgs/development/libraries/libcollectdclient/default.nix index f6d9d7ca69b..e4e61c94283 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 a89bdec2c8a..1ef550238d1 100644 --- a/pkgs/development/libraries/libconfuse/default.nix +++ b/pkgs/development/libraries/libconfuse/default.nix @@ -32,6 +32,5 @@ stdenv.mkDerivation rec { ''; license = licenses.isc; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix index 77c09f3ed15..2a03efd632f 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/libdivecomputer/default.nix b/pkgs/development/libraries/libdivecomputer/default.nix index 23ab36fe09f..a09e48dcc1d 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 533d5d4cac8..e5e1e2e7a39 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.88"; + name = "libdrm-2.4.89"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "b5e55dbac2124e742e639f5b8553e8b7395863bf73dab4f77e99fe2fc25572b5"; + sha256 = "629f9782aabbb4809166de5f24d26fe0766055255038f16935602d89f136a02e"; }; outputs = [ "out" "dev" "bin" ]; diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix index bd0d23bd0cd..bb1dbe51765 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"; + 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 ]; + 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/libewf/04-fix-FTBFS-GCC5.patch b/pkgs/development/libraries/libewf/04-fix-FTBFS-GCC5.patch deleted file mode 100644 index 54878303589..00000000000 --- 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 ec53b50b5af..b1a6238a378 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 a071132463f..00000000000 --- 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/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 0df0f570b2e..84e3517835e 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.11.2"; src = fetchurl { url = "http://download.filezilla-project.org/libfilezilla/${name}.tar.bz2"; - sha256 = "1xv4is3zaz66h6iblj9pikapsjasjcbxx31bhkgn62xdq1sadfpc"; + sha256 = "0wl42yxrha633dbh1vcbhrpsd7sv4zwskbmlpx549ygnzi39krcn"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index e32ba050c38..397000fc7d2 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -4,11 +4,11 @@ assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { name = "libgcrypt-${version}"; - version = "1.8.1"; + version = "1.8.2"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; - sha256 = "1cvqd9jk5qshbh48yh3ixw4zyr4n5k50r3475rrh20xfn7w7aa3s"; + sha256 = "01sca9m8hm6b5v8hmqsfdjhyz013869p1f0fxw9ln52qfnp4q1n8"; }; outputs = [ "out" "dev" "info" ]; diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index bfdd0cf8fd7..e659b31d974 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -2,7 +2,10 @@ , 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 +, javaSupport ? false, jdk ? null }: + +assert javaSupport -> jdk != null; stdenv.mkDerivation rec { name = "libguestfs-${version}"; @@ -24,7 +27,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 +44,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" ] + ++ stdenv.lib.optionals (!javaSupport) [ "--disable-java" "--without-java" ]; patches = [ ./libguestfs-syms.patch ]; NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2/"; installFlags = "REALLY_INSTALL=yes"; diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix index 88a3ebbc4fb..c3405148242 100644 --- a/pkgs/development/libraries/libhttpseverywhere/default.nix +++ b/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -1,7 +1,8 @@ -{stdenv, fetchurl, gnome3, glib, json_glib, libxml2, libarchive, libsoup, gobjectIntrospection, meson, ninja, pkgconfig, valadoc}: +{ stdenv, fetchurl, pkgconfig, meson, ninja, valadoc +, gnome3, glib, json_glib, libarchive, libsoup, gobjectIntrospection }: stdenv.mkDerivation rec { - major = "0.4"; + major = "0.6"; minor = "5"; version = "${major}.${minor}"; @@ -9,16 +10,20 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/libhttpseverywhere/${major}/libhttpseverywhere-${version}.tar.xz"; - sha256 = "07sgcw285rl9wqr5k7srs3fj7fhgrrw6w780jx8wy8jw2bfwlvj2"; + sha256 = "0ksf6vqjyjii29dvy5147dmgqlqsq4d70xxai0p2prkx4jrwgj3z"; }; - nativeBuildInputs = [ gnome3.vala valadoc gobjectIntrospection meson ninja pkgconfig ]; - buildInputs = [ glib gnome3.libgee libxml2 json_glib libsoup libarchive ]; + nativeBuildInputs = [ gnome3.vala gobjectIntrospection meson ninja pkgconfig valadoc ]; + buildInputs = [ glib gnome3.libgee json_glib libsoup libarchive ]; + + mesonFlags = "-Denable_valadoc=true"; doCheck = true; checkPhase = "./httpseverywhere_test"; + outputs = [ "out" "devdoc" ]; + meta = { description = "library to use HTTPSEverywhere in desktop applications"; homepage = https://git.gnome.org/browse/libhttpseverywhere; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index db4c0c7738d..a0f7807786e 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -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/libite/default.nix b/pkgs/development/libraries/libite/default.nix index 479deb7593d..51a7ab4851c 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/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index bf626df28ea..4ec0e5ebd9f 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -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/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix index 326d9c4f9d7..93f3b2a4f84 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/liblcf/default.nix b/pkgs/development/libraries/liblcf/default.nix new file mode 100644 index 00000000000..95b6b657fa2 --- /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/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix index 8071d386db0..c509fcd2b4f 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/libmpc/default.nix b/pkgs/development/libraries/libmpc/default.nix index 4be59af6f0c..97366d24c36 100644 --- a/pkgs/development/libraries/libmpc/default.nix +++ b/pkgs/development/libraries/libmpc/default.nix @@ -10,7 +10,7 @@ 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"; + url = "https://ftp.gnu.org/gnu/mpc/mpc-${version}.tar.gz"; sha256 = "1hzci2zrrd7v3g1jk35qindq05hbl0bhjcyyisq9z209xb3fqzb1"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { 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/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index 3905ba1b271..c184e647d28 100644 --- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -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/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix index a94bf28cd97..17dea7b3d7d 100644 --- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix +++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix @@ -24,6 +24,5 @@ stdenv.mkDerivation rec { homepage = http://netfilter.org/projects/libnetfilter_conntrack/; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/libraries/libnetfilter_log/default.nix b/pkgs/development/libraries/libnetfilter_log/default.nix index e3c8447549d..f660cd7a781 100644 --- a/pkgs/development/libraries/libnetfilter_log/default.nix +++ b/pkgs/development/libraries/libnetfilter_log/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = http://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 5de9409b729..12a45d088ef 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/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index 074c1a9dfd2..ad8c7626661 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/libopcodes/default.nix b/pkgs/development/libraries/libopcodes/default.nix index 7ffc40f1494..d6d6989761b 100644 --- a/pkgs/development/libraries/libopcodes/default.nix +++ b/pkgs/development/libraries/libopcodes/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { find . ../include/opcode -type f -exec sed {} -i -e 's/"bfd.h"//' \; ''; - nativeBuildInputs = [ autoreconfHook264 bison buildPackages.stdenv.cc ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ autoreconfHook264 bison ]; buildInputs = [ libiberty ]; # dis-asm.h includes bfd.h propagatedBuildInputs = [ libbfd ]; diff --git a/pkgs/development/libraries/libowfat/default.nix b/pkgs/development/libraries/libowfat/default.nix index aaa1abacab8..1304aff9e3b 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/libpinyin/default.nix b/pkgs/development/libraries/libpinyin/default.nix index 15d14199041..26694eb3777 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/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index c4a6a246b90..5ad9cf1e7b7 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/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index c35c7e1bc0f..b1100d00f3e 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -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/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 0e67f970b76..89b71c1855d 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -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/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix index dc4981798bc..f537013d2fe 100644 --- a/pkgs/development/libraries/libqmatrixclient/default.nix +++ b/pkgs/development/libraries/libqmatrixclient/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "libqmatrixclient-${version}"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "QMatrixClient"; repo = "libqmatrixclient"; - rev = "v${version}"; - sha256 = "1dlanf0y65zf6n1b1f4jzw04w07sl85wiw01c3yyn2ivp3clr13l"; + rev = "v${version}-q0.0.5"; + sha256 = "1m53yxsqjxv2jq0h1xipwsgaj5rca4fk4cl3azgvmf19l9yn00ck"; }; buildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index 0b88cd02df7..c1df11aa544 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.7"; src = fetchurl { url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz"; - sha256 = "0y519nlvl4bfnnxbwry35f6gbcv6jbbpd2lmiwv6pbyzv4a7saps"; + sha256 = "0wap67mb03fl2himbs20yncnnrr71mszsfm2v4spks58c714gqw7"; }; outputs = [ "out" "lib" "dev" "doc" ]; diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix index 8e6fa005635..402af5d6f58 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/librep/setup-hook.sh b/pkgs/development/libraries/librep/setup-hook.sh index 420d63d6c51..4d875b69330 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 4818a720a30..ae03ef7ecb9 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/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix index 3409948f59e..0f2ca371297 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.1"; src = fetchFromGitHub { owner = "librsync"; repo = "librsync"; rev = "v${version}"; - sha256 = "0yad7nkw6d8j824qkxrj008ak2wq6yw5p894sbhr35yc1wr5mki6"; + sha256 = "0wihjinqbjl4hnvrgsk4ca1zy5v6bj7vjm6wlygwvgbn5yh3yq0x"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index 75bc9668fca..0ad02c190c1 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.4.8"; src = fetchurl { url = "https://github.com/sass/libsass/archive/${version}.tar.gz"; - sha256 = "1j22138l5ymqjfj5zan9d2hipa3ahjmifgpjahqy1smlg5sb837x"; + sha256 = "0gq0mg42sq2nxiv25fh37frlr0iyqamh7shv83qixnqklqpkfi13"; }; patchPhase = '' diff --git a/pkgs/development/libraries/libserialport/default.nix b/pkgs/development/libraries/libserialport/default.nix index 812847ea123..90f0afa5796 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 c8751c3e5dd..49cdb2c95ba 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 4a309a87f2e..f6bfff78fa2 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 8e1079bfbc8..8152c1ea852 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/libsnark/darwin-fix-clock-gettime.patch b/pkgs/development/libraries/libsnark/darwin-fix-clock-gettime.patch new file mode 100644 index 00000000000..2eee84d1c4b --- /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 00000000000..578053bbb42 --- /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/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index 5d4535676e7..0b341b38917 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/libsrs2/default.nix b/pkgs/development/libraries/libsrs2/default.nix index a2e94c33ce3..7d9ea25e9d2 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 036bb806f68..72d73e35848 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 5c0e7c9bdfa..f8397052b77 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 diff --git a/pkgs/development/libraries/libstemmer/default.nix b/pkgs/development/libraries/libstemmer/default.nix new file mode 100644 index 00000000000..67d6d8d42ea --- /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/libsvm/default.nix b/pkgs/development/libraries/libsvm/default.nix index a366baf27e3..8d3d2f4c60c 100644 --- a/pkgs/development/libraries/libsvm/default.nix +++ b/pkgs/development/libraries/libsvm/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.20"; src = fetchurl { - url = "http://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-${version}.tar.gz"; + url = "https://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-${version}.tar.gz"; sha256 = "1gj5v5zp1qnsnv0iwxq0ikhf8262d3s5dq6syr6yqkglps0284hg"; }; @@ -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/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index ee21f3df7ac..0f95b6d34c7 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -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/libtorrent-rasterbar/1.0.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix deleted file mode 100644 index fbd30ac04f7..00000000000 --- 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 ff5027fd472..00ec2298617 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 af9c38a9634..a742be3c1e4 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 = [ @@ -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/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix index 3b92aff72a5..0c88f987104 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.9.5"; name = "liburcu-${version}"; src = fetchurl { url = "http://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; - sha256 = "01j0xp3f0w147yfyzybkjvb7i67i7prsvnkssgvgwry9lvk35khv"; + sha256 = "19iq7985rhvbrj99hlmbyq2wjrkhssvigh5454mhaprn3c7jaj6r"; }; nativeBuildInputs = stdenv.lib.optional doCheck perl; diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index ceb42fe2bfc..eccee83fa85 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libvdpau-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"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { 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/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix index f7e477ff34a..b325c9b246c 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 682fcca98a3..f59237ee164 100644 --- a/pkgs/development/libraries/libvorbis/default.nix +++ b/pkgs/development/libraries/libvorbis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libogg, pkgconfig }: +{ stdenv, fetchurl, libogg, pkgconfig, fetchpatch }: stdenv.mkDerivation rec { name = "libvorbis-1.3.5"; @@ -10,6 +10,23 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; + patches = [ + (fetchpatch { + url = "https://github.com/xiph/vorbis/commit/a79ec216cd119069c68b8f3542c6a425a74ab993.patch"; + sha256 = "0xhsa96n3dlh2l85bxpz4b9m78mfxfgi2ibhjp77110a0nvkjr6h"; + name = "CVE-2017-14633"; + }) + (fetchpatch { + url = "https://github.com/xiph/vorbis/commit/c1c2831fc7306d5fbd7bc800324efd12b28d327f.patch"; + sha256 = "17lb86105im6fc0h0cx5sn94p004jsdbbs2vj1m9ll6z9yb4rxwc"; + name = "CVE-2017-14632"; + }) + (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 +34,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 4b50fe090e3..1e96ff9bb1a 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/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix new file mode 100644 index 00000000000..67ec3b57fa7 --- /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 f38c7a90032..68f8c44a8ec 100644 --- a/pkgs/development/libraries/libxcomp/default.nix +++ b/pkgs/development/libraries/libxcomp/default.nix @@ -23,6 +23,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/libxmp/default.nix b/pkgs/development/libraries/libxmp/default.nix index 28584d14a87..ca4d7edbf32 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/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 850bb27e364..131b64c1c7f 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/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix index 9aea42082c5..f5660e93d79 100644 --- a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix +++ b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix @@ -44,7 +44,7 @@ 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 ]; diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index 960c8cc2494..7f4d8cc19c8 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/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix index e8f8a6ab9bb..c7667b554f4 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/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index 8195ba2d4d6..82d867fedf0 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -1,11 +1,13 @@ -{ stdenv, fetchurl, perl }: +{ stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { - name = "mbedtls-2.6.0"; + name = "mbedtls-2.6.1"; - src = fetchurl { - url = "https://tls.mbed.org/download/${name}-gpl.tgz"; - sha256 = "042q1l4708zjn5v72sa9qdvgx173kmy4hbcd23wj5vqd6vbmk6d9"; + src = fetchFromGitHub { + owner = "ARMmbed"; + repo = "mbedtls"; + rev = name; + sha256 = "0d421w9bz4p1nw6kza3licv2w97y1364mcpb4fxvpgdqz48rc1vg"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index fca99550a3c..d343bd1112d 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -66,7 +66,7 @@ let in let - version = "17.2.7"; + version = "17.2.8"; branch = head (splitString "." version); driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; in @@ -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 = "0s3slgjxnx482yw0knn4a6alsy2cq28rah6hnjbmf12mvyldxksh"; + sha256 = "0pq9kmmyllgd63d936f3x1zsg7sqaswx47khbn0gvbgari2h753f"; }; prePatch = "patchShebangs ."; @@ -98,7 +98,7 @@ stdenv.mkDerivation { # TODO: Figure out how to enable opencl without having a runtime dependency on clang configureFlags = [ - "--sysconfdir=/etc" + "--sysconfdir=${driverLink}/etc" "--localstatedir=/var" "--with-dri-driverdir=$(drivers)/lib/dri" "--with-dri-searchpath=${driverLink}/lib/dri" @@ -197,7 +197,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 = '' @@ -214,7 +213,7 @@ stdenv.mkDerivation { 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; maintainers = with maintainers; [ eduarrrd vcunat ]; diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index f3bdc005247..7111a78381d 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -69,7 +69,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/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index 6be199af193..fe364f22f9a 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -21,7 +21,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/mps/default.nix b/pkgs/development/libraries/mps/default.nix index 4e4ddfb6389..5a841f165ca 100644 --- a/pkgs/development/libraries/mps/default.nix +++ b/pkgs/development/libraries/mps/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.116.0"; src = fetchurl { - url = "http://www.ravenbrook.com/project/mps/release/${version}/mps-kit-${version}.tar.gz"; + url = "https://www.ravenbrook.com/project/mps/release/${version}/mps-kit-${version}.tar.gz"; sha256 = "1k7vnanpgawnj84x2xs6md57pfib9p7c3acngqzkl3c2aqw8qay0"; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "A flexible memory management and garbage collection library"; - homepage = "http://www.ravenbrook.com/project/mps"; + homepage = "https://www.ravenbrook.com/project/mps"; license = stdenv.lib.licenses.sleepycat; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 9aade8b9672..0dd7b37e1a6 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -18,11 +18,16 @@ stdenv.mkDerivation rec { url = "mirror://gnu/ncurses/${name}.tar.gz"; sha256 = "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh"; } else { - url = "ftp://ftp.invisible-island.net/ncurses/current/${name}.tgz"; + urls = [ + "ftp://ftp.invisible-island.net/ncurses/current/${name}.tgz" + "https://invisible-mirror.net/archives/ncurses/current/${name}.tgz" + ]; sha256 = "11adzj0k82nlgpfrflabvqn2m7fmhp2y6pd7ivmapynxqb9vvb92"; }); - patches = [ ./clang.patch ] ++ lib.optional (abiVersion == "5" && stdenv.cc.isGNU) ./gcc-5.patch; + # Unnecessarily complicated in order to avoid mass-rebuilds + patches = lib.optional (!stdenv.cc.isClang || abiVersion == "5") ./clang.patch + ++ lib.optional (stdenv.cc.isGNU && abiVersion == "5") ./gcc-5.patch; outputs = [ "out" "dev" "man" ]; setOutputFlags = false; # some aren't supported @@ -37,10 +42,11 @@ stdenv.mkDerivation rec { # Only the C compiler, and explicitly not C++ compiler needs this flag on solaris: CFLAGS = lib.optionalString stdenv.isSunOS "-D_XOPEN_SOURCE_EXTENDED"; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkgconfig ] ++ lib.optionals (buildPlatform != hostPlatform) [ - buildPackages.ncurses buildPackages.stdenv.cc + buildPackages.ncurses ]; buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm; diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix index f1232d7d253..c84cddc897c 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 de9023a5710..a57884912ba 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/default.nix b/pkgs/development/libraries/netcdf/default.nix index e7c64b9a76d..696df48bfbc 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.0"; - buildInputs = [ hdf5 m4 curl mpi]; + src = fetchurl { + url = "https://www.unidata.ucar.edu/downloads/netcdf/ftp/${name}.tar.gz"; + sha256 = "099qmdjj059wkj5za13zqnz0lcziqkcvyfdf894j4n6qq4c5iw2b"; + }; - 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/npth/default.nix b/pkgs/development/libraries/npth/default.nix index 8ebf62cfdf0..dc4f4926e9d 100644 --- a/pkgs/development/libraries/npth/default.nix +++ b/pkgs/development/libraries/npth/default.nix @@ -1,11 +1,11 @@ { 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"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/nss/ckpem.patch b/pkgs/development/libraries/nss/ckpem.patch new file mode 100644 index 00000000000..c1a65a6c0b2 --- /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 3e8ed856bfa..8d799e2c13a 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.33"; + version = "3.34.1"; 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_34_1_RTM/src/${name}.tar.gz"; + sha256 = "186x33wsk4mzjz7dzbn8p0py9a0nzkgzpfkdv4rlyy5gghv5vhd3"; }; buildInputs = [ perl zlib sqlite ]; @@ -28,6 +28,7 @@ in stdenv.mkDerivation rec { [ # 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"; @@ -45,7 +46,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 +86,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/ogre/1.9.x.nix b/pkgs/development/libraries/ogre/1.9.x.nix new file mode 100644 index 00000000000..b3b6e918bde --- /dev/null +++ b/pkgs/development/libraries/ogre/1.9.x.nix @@ -0,0 +1,46 @@ +{ fetchFromGitHub, stdenv, lib +, cmake, mesa +, 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 mesa + 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 = http://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 aba02827665..e0d6d2fa41c 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -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}" ] @@ -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 2408c3e4904..e4045bcd5dc 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/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index a9b3c85d396..356e1e336ac 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 +, fetchurl, fetchFromGitHub, fetchpatch , cmake, pkgconfig, unzip, zlib, pcre, hdf5 +, caffe, glog, boost, google-gflags, protobuf , config , enableJPEG ? true, libjpeg @@ -14,34 +15,39 @@ , enableCuda ? (config.cudaSupport or false), cudatoolkit +, enableUnfree ? false , enableIpp ? false -, enableContrib ? false #, caffe, glog, boost, google-gflags +, enableContrib ? false , enablePython ? false, pythonPackages , enableGtk2 ? false, gtk2 , enableGtk3 ? false, gtk3 +, enableVtk ? false, vtk , enableFfmpeg ? false, ffmpeg , enableGStreamer ? false, gst_all_1 , enableTesseract ? false, tesseract, leptonica +, 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.1"; + version = "3.4.0"; src = fetchFromGitHub { owner = "opencv"; repo = "opencv"; rev = version; - sha256 = "1jq8nny78gp54yjgsnb2rdp5rwhp78b3r2i36b2vyx6xk6h6wwji"; + sha256 = "1nc14kvsjwaisv7d1r6f0hn7na9zr2cm2zh3hd3r9qwm3g78xnac"; }; contribSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_contrib"; rev = version; - sha256 = "0q5vsa8dpa3mdhzas0ckagwh2sbckpm1kxsp0i3yfknsr5ampyi2"; + sha256 = "1cxw7nra3f1hng057c6hi1ynsyqdazd69irjdgn8xjg6q9h76br0"; }; # Contrib must be built in order to enable Tesseract support: @@ -104,6 +110,20 @@ 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}" @@ -122,14 +142,23 @@ 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 { name = "opencv-${version}"; inherit version src; + patches = [ + # Fix for: https://github.com/opencv/opencv/issues/10474 + (fetchpatch { + url = "https://github.com/opencv/opencv/commit/ea5a3e557f93844fdb5e54e3e8acfc5f61c6fd9f.patch"; + sha256 = "1w7jmqlrx73ydh9jjsnnic5xz8r04kxbjpzkcfyb91v3az9132r1"; + }) + ]; + postUnpack = lib.optionalString buildContrib '' cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib" ''; @@ -151,16 +180,19 @@ stdenv.mkDerivation rec { ${installExtraFiles vgg} ${installExtraFiles boostdesc} + ${installExtraFiles face} mkdir -p "${tinyDnn.dst}" ln -s "${tinyDnn.src}" "${tinyDnn.dst}/${tinyDnn.md5}-${tinyDnn.name}" ''); buildInputs = - [ zlib pcre hdf5 ] + [ zlib pcre hdf5 glog boost google-gflags protobuf ] + ++ lib.optional (!stdenv.isDarwin) caffe ++ 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 @@ -168,7 +200,12 @@ 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 @@ -176,12 +213,7 @@ stdenv.mkDerivation rec { # tesseract & leptonica. ++ lib.optionals enableTesseract [ tesseract leptonica ] ++ 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; @@ -192,6 +224,9 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DWITH_OPENMP=ON" + "-DBUILD_PROTOBUF=OFF" + "-DPROTOBUF_UPDATE_FILES=ON" + "-DOPENCV_ENABLE_NONFREE=${printEnabled enableUnfree}" (opencvFlag "IPP" enableIpp) (opencvFlag "TIFF" enableTIFF) (opencvFlag "JASPER" enableJPEG2K) @@ -204,17 +239,14 @@ stdenv.mkDerivation rec { ] ++ 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" + ] + ++ lib.optionals stdenv.isDarwin [ + "-DWITH_OPENCL=OFF" + "-DWITH_LAPACK=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"]; + # On OS X the tiny-dnn-1.0.0a3 dependency of dnn_modern fails to build. + "-DBUILD_opencv_dnn_modern=OFF" + ]; enableParallelBuilding = true; @@ -229,7 +261,7 @@ stdenv.mkDerivation rec { meta = { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = http://opencv.org/; - license = stdenv.lib.licenses.bsd3; + 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 aadd108620a..cbac7210a10 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 37afa3fd507..48ec5141e34 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/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index d2d8b686f35..8d5a6bb65a9 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -5,19 +5,11 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz"; - sha256 = "0ca2j526n4wlamrxb85y2jrgcv0gf21b3a19rr0gh4rjqkv1581n"; + sha256 = "1kdf2gqznsdinbd5vcmqnif442nyhdf9l7ckc51410qm2gv5m6lg"; }; patches = [ ./bootstrap.patch - (fetchpatch { - # https://github.com/openexr/openexr/issues/232 - # https://github.com/openexr/openexr/issues/238 - name = "CVE-2017-12596.patch"; - url = "https://github.com/openexr/openexr/commit/f09f5f26c1924.patch"; - sha256 = "1d014da7c8cgbak5rgr4mq6wzm7kwznb921pr7nlb52vlfvqp4rs"; - stripLen = 1; - }) ]; outputs = [ "bin" "dev" "out" "doc" ]; diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 475ac496e7e..56118c9bbb2 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 2d08f37c8c2..c2f79753bd1 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, rdma-core # Enable the Sun Grid Engine bindings , enableSGE ? false @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ gfortran ] - ++ optional (stdenv.isLinux || stdenv.isFreeBSD) libibverbs; + ++ optional (stdenv.isLinux || stdenv.isFreeBSD) rdma-core; nativeBuildInputs = [ perl ]; @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { 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 ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/opensaml-cpp/default.nix b/pkgs/development/libraries/opensaml-cpp/default.nix index c2c102ccf9b..659c4fb7cff 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 00000000000..06223deda89 --- /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 3ab3f68cde5..3e178d92013 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 78792e5b8dc..775e6056dff 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,34 @@ 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; 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} = []; configureFlags = [ "shared" @@ -49,7 +57,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 +91,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"; @@ -114,6 +110,13 @@ in { openssl_1_1_0 = common { version = "1.1.0g"; sha256 = "1bvka2wf33w2vxv7yw578nnjqyhz2b3chvfb0l4k2ffscw950kfy"; + patches = [ + (fetchpatch { + name = "CVE-2017-3738.patch"; + url = "https://github.com/openssl/openssl/commit/563066.patch"; + sha256 = "0ni9fwpxf8raw8b58pfa15akbqmxx4q64v0ldsm4b9dqhbxf8mkz"; + }) + ]; }; } diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix index df2c23266c5..1aa0f268457 100644 --- a/pkgs/development/libraries/openwsman/default.nix +++ b/pkgs/development/libraries/openwsman/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = https://openwsman.github.io; license = licenses.bsd3; maintainers = with maintainers; [ deepfire ]; - platforms = platforms.unix; + platforms = platforms.linux; # PAM is not available on Darwin inherit version; }; } diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index d0085752623..1c629c13779 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/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index e6055151301..b34c9ff31f2 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -33,6 +33,9 @@ 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 ]; + 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 00000000000..4bc97069b1e --- /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 dd562d2e0f1..9603e45a8b4 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -20,21 +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; - addPrefixes = true; + extraPrefix = ""; }) ]; diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix index 43bcef0f2d3..e29af17f35d 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 ]; + + enableParallelBuilding = true; + + patchPhase = '' + sed s,-Werror,, -i CMakeLists.txt + ''; + + 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; + }; }; - nativeBuildInputs = [ cmake ]; - - 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; - }; +in { + physfs_2 = generic "2.0.3" "0sbbyqzqhyf0g68fcvvv20n3928j0x6ik1njmhn1yigvq2bj11na"; + physfs = generic "3.0.1" "1wgj2zqpnfbnyyi1i7bq5pshcc9n5cvwlpzp8im67nb8662ryyxp"; } diff --git a/pkgs/development/libraries/png++/default.nix b/pkgs/development/libraries/png++/default.nix index 6ca4734a4f7..ef4b3ea7e01 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 0f971cff64d..40755913737 100644 --- a/pkgs/development/libraries/poco/default.nix +++ b/pkgs/development/libraries/poco/default.nix @@ -1,4 +1,4 @@ -{ 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}"; @@ -12,10 +12,9 @@ stdenv.mkDerivation rec { 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/psol/default.nix b/pkgs/development/libraries/psol/default.nix index 5c78c1a288f..dd6037e6832 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.1"; # Latest beta, 2017-11-08 + sha256 = "126823gpr3rdqakwixmr887rbvwhksr3xg14jnyzlp84q4hg1p0n"; } diff --git a/pkgs/development/libraries/psol/generic.nix b/pkgs/development/libraries/psol/generic.nix index 3e82bb4975d..c61926fe13f 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/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index 9433eb87109..0ea58e6c434 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -11,6 +11,12 @@ stdenv.mkDerivation rec { buildInputs = [ openssl qtbase ]; nativeBuildInputs = [ cmake pkgconfig ]; + # 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; diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix index 2265d0df394..4976399a66a 100644 --- a/pkgs/development/libraries/qca2/default.nix +++ b/pkgs/development/libraries/qca2/default.nix @@ -14,6 +14,12 @@ stdenv.mkDerivation rec { 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"; diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index 2057aee3e99..79ed37dd2a9 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/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index 6d92de001cb..1bc4fd1085e 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -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/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 32691faa689..488306fc1ce 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -160,7 +160,7 @@ 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 ]; 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 00000000000..cf66e60d569 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.10/default.nix @@ -0,0 +1,124 @@ +/* + +# 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, mesa, 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 ] ++ optional stdenv.isDarwin ./qtbase-darwin.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 mesa; + 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 {}; + 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-${qtbase.version}" ([ + qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects + qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript + qtsensors qtserialport qtsvg qttools qttranslations 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 00000000000..849e76d616d --- /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.0/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 00000000000..e85a284f3bb --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.10/qtbase-darwin.patch @@ -0,0 +1,57 @@ +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 00000000000..b79ce9fc356 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.10/qtbase.patch @@ -0,0 +1,1119 @@ +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 e645ba5803..a0e5c68b7e 100644 +--- a/mkspecs/features/mac/default_post.prf ++++ b/mkspecs/features/mac/default_post.prf +@@ -24,166 +24,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 { +- !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 44636f2288..3b01424e67 100644 +--- a/mkspecs/features/mac/default_pre.prf ++++ b/mkspecs/features/mac/default_pre.prf +@@ -1,56 +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 +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 668669e4cd..eb4840a0aa 100644 +--- a/mkspecs/features/qt_example_installs.prf ++++ b/mkspecs/features/qt_example_installs.prf +@@ -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 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 62e1b69fde..abd63123f9 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 609e52d9d2..f0f29ce61f 100644 +--- a/src/corelib/kernel/qcoreapplication.cpp ++++ b/src/corelib/kernel/qcoreapplication.cpp +@@ -2580,6 +2580,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 bcc1285472..a77eb472a3 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 1da00813ce..0bf877afcb 100644 +--- a/src/network/kernel/qdnslookup_unix.cpp ++++ b/src/network/kernel/qdnslookup_unix.cpp +@@ -92,7 +92,7 @@ static bool resolveLibraryInternal() + if (!lib.load()) + #endif + { +- lib.setFileName(QLatin1String("resolv")); ++ lib.setFileName(QLatin1String(NIXPKGS_LIBRESOLV)); + if (!lib.load()) + return false; + } +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 3bc8590d36..2a78fde518 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) + #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 00000000000..01a975c14ec --- /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 00000000000..5508dec1280 --- /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 00000000000..f25524e80bc --- /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 00000000000..fbba439ef7a --- /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 00000000000..e1621b005c6 --- /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 00000000000..c78cb58f564 --- /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/srcs.nix b/pkgs/development/libraries/qt-5/5.10/srcs.nix new file mode 100644 index 00000000000..5369169aa67 --- /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.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qt3d-everywhere-src-5.10.0.tar.xz"; + sha256 = "1arlplfpqdk0qki7bs1pp16y9cwa0awn071p551jg4y74xr7wi8j"; + name = "qt3d-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtactiveqt = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtactiveqt-everywhere-src-5.10.0.tar.xz"; + sha256 = "0x6nbi5hlbr1pncbd8zzkwmqi04gcy64q3bjy5w45rg6zws41mzr"; + name = "qtactiveqt-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtandroidextras = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtandroidextras-everywhere-src-5.10.0.tar.xz"; + sha256 = "1ifb49px86abaf4znmlis9wyyxq132nlgj3fyqppbx1sranikygk"; + name = "qtandroidextras-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtbase = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtbase-everywhere-src-5.10.0.tar.xz"; + sha256 = "0qpp56cbw1sfz5ayhj2mskb07cl6jd1ijayg29y624qa6b6phmgx"; + name = "qtbase-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtcanvas3d = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtcanvas3d-everywhere-src-5.10.0.tar.xz"; + sha256 = "11r98mdxy833kcnywlsjrfaqhax7m3b6yhb56072qvr30rpn52fj"; + name = "qtcanvas3d-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtcharts = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtcharts-everywhere-src-5.10.0.tar.xz"; + sha256 = "1vri3f7wyg84w6j84452g8h2p7sk7k01r0xszpn4klv7hi52rkhj"; + name = "qtcharts-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtconnectivity = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtconnectivity-everywhere-src-5.10.0.tar.xz"; + sha256 = "19k9n6gzrbg0sbgyhhcl5gv0d4b2gjwmz5966gn6b424fblf4grf"; + name = "qtconnectivity-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtdatavis3d = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtdatavis3d-everywhere-src-5.10.0.tar.xz"; + sha256 = "06363x449k7wkqrd7c0y6b5vqlpwssnkl0g5s1bhp8lkl3bw81lj"; + name = "qtdatavis3d-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtdeclarative = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtdeclarative-everywhere-src-5.10.0.tar.xz"; + sha256 = "07kicxzbwiqwkg1x2k6447rwzvzn31cv1yyggc1m8r84lny4vjsw"; + name = "qtdeclarative-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtdoc = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtdoc-everywhere-src-5.10.0.tar.xz"; + sha256 = "01z4ikqrnnx9mzf5pvk4i2lqks4xai32fs9qqbqnsp0qrrcb1jfn"; + name = "qtdoc-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtgamepad = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtgamepad-everywhere-src-5.10.0.tar.xz"; + sha256 = "1rl77rsfgs69cdv75nfjp9w66mndwi211wix5cwl46d7i3wm0xak"; + name = "qtgamepad-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtgraphicaleffects = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtgraphicaleffects-everywhere-src-5.10.0.tar.xz"; + sha256 = "0c2y0ixxncn5xslpxciigq1gfaxd3n7wkcf14k4iy5i15w8nkfcp"; + name = "qtgraphicaleffects-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtimageformats = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtimageformats-everywhere-src-5.10.0.tar.xz"; + sha256 = "1z7lnw85apzf6ph3dgnbb6py17qzpgww92kz31n6vbv5z62bigwi"; + name = "qtimageformats-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtlocation = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtlocation-everywhere-src-5.10.0.tar.xz"; + sha256 = "1iw5m9v5p6l6mivjvj7g1macpqf2n21mg4wg0hza36dwrz3wwkfq"; + name = "qtlocation-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtmacextras = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtmacextras-everywhere-src-5.10.0.tar.xz"; + sha256 = "08n8na36j9c15hvicqfs7h915m2av5xd5v0azf7660z0q9lk9zb3"; + name = "qtmacextras-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtmultimedia = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtmultimedia-everywhere-src-5.10.0.tar.xz"; + sha256 = "0vw0i5jgn4q63g5ijwwrb6835qdaxcw7sfcjffbqfbdwqgyk70q0"; + name = "qtmultimedia-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtnetworkauth = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtnetworkauth-everywhere-src-5.10.0.tar.xz"; + sha256 = "1lnqi1qpy9j5pi2lcmdihf81lspxv6hgdg5jmbqqdqxwzblgpnpc"; + name = "qtnetworkauth-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtpurchasing = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtpurchasing-everywhere-src-5.10.0.tar.xz"; + sha256 = "0mkxslc8qc6sclpngllby3bb86qq5csrsz0xrc14nwmbkhwksxwc"; + name = "qtpurchasing-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtquickcontrols = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtquickcontrols-everywhere-src-5.10.0.tar.xz"; + sha256 = "0ab19raip9828br21qqaglr4y0kqmxix882r13sfxlnm4ivyycx1"; + name = "qtquickcontrols-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtquickcontrols2 = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtquickcontrols2-everywhere-src-5.10.0.tar.xz"; + sha256 = "18d1b5aivaqgs1px61glkyclkky60xd7yzy1vwa1f89sg8j711w1"; + name = "qtquickcontrols2-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtremoteobjects = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtremoteobjects-everywhere-src-5.10.0.tar.xz"; + sha256 = "01bf1ykqxb4d8wz58vxy15yj4jsaqhi258k05dhy7ygdvfgscdnz"; + name = "qtremoteobjects-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtscript = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtscript-everywhere-src-5.10.0.tar.xz"; + sha256 = "1z6a14x9yj0p2znc0vny8y4zkdvm5fp42rnisnf9rynakkqg5wkc"; + name = "qtscript-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtscxml = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtscxml-everywhere-src-5.10.0.tar.xz"; + sha256 = "142qysd5s706r62gap62s89xm7334i1ys29dqsp09av9n7b1kfsb"; + name = "qtscxml-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtsensors = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtsensors-everywhere-src-5.10.0.tar.xz"; + sha256 = "0w9rzqc0hva4521i5j298lrsvys3jqddmqd80cxj9nsvnapwb66d"; + name = "qtsensors-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtserialbus = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtserialbus-everywhere-src-5.10.0.tar.xz"; + sha256 = "06rr0191zy5yxqzxiv0c6dvshncjg8kdc33lszk41pajv624fn9z"; + name = "qtserialbus-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtserialport = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtserialport-everywhere-src-5.10.0.tar.xz"; + sha256 = "0mqlhdp20jl6agv58mszznsikmi1dflhalkpfbgpiafjzzczx075"; + name = "qtserialport-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtspeech = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtspeech-everywhere-src-5.10.0.tar.xz"; + sha256 = "1hashidb33f1215f0azjby1lh8iw7v2bvxp08mqvdk02jld9w5br"; + name = "qtspeech-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtsvg = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtsvg-everywhere-src-5.10.0.tar.xz"; + sha256 = "1c77wnpzjz4wwic5if876y5v1n44v2g2nhjmcs25cc8awz5afaja"; + name = "qtsvg-everywhere-src-5.10.0.tar.xz"; + }; + }; + qttools = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qttools-everywhere-src-5.10.0.tar.xz"; + sha256 = "0cpybii2yznk6gwaa2cz83rk3cpzzm6l4wvn4n2xwdbrgdsdrx8z"; + name = "qttools-everywhere-src-5.10.0.tar.xz"; + }; + }; + qttranslations = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qttranslations-everywhere-src-5.10.0.tar.xz"; + sha256 = "1gmrisf08nsrni7fyjlz5ggfgfzzkjpq3g7l2hc6vq5g04vbskgc"; + name = "qttranslations-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtvirtualkeyboard = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtvirtualkeyboard-everywhere-src-5.10.0.tar.xz"; + sha256 = "0mqb9sgvq7djd2lz4q4p6p9f0c23cfhk447zx4axvv1mldjxsb9c"; + name = "qtvirtualkeyboard-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtwayland = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwayland-everywhere-src-5.10.0.tar.xz"; + sha256 = "14sb0227rzqzf5z8dz8b9nzkk5rwq6hrfxifz603iy4mdijzjmsn"; + name = "qtwayland-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtwebchannel = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwebchannel-everywhere-src-5.10.0.tar.xz"; + sha256 = "18rml5xyb9chz8wrfamsgx4z32kkjbk1rc47ynvhn49mcbf2897j"; + name = "qtwebchannel-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtwebengine = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwebengine-everywhere-src-5.10.0.tar.xz"; + sha256 = "1yb7jpydxg0dwdrx0iv7i5dq4wb9ld1iff8zpjdj8yl4xy4mkgx8"; + name = "qtwebengine-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtwebglplugin = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwebglplugin-everywhere-src-5.10.0.tar.xz"; + sha256 = "0hgwb5lll3275knnj3ms04y1n0i6gph9kac2246ixmcq8sc7a2k7"; + name = "qtwebglplugin-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtwebsockets = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwebsockets-everywhere-src-5.10.0.tar.xz"; + sha256 = "00wlyhw7h2axyhinksfm912jfa3n73szxdccz5dlir8742i0zaqp"; + name = "qtwebsockets-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtwebview = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwebview-everywhere-src-5.10.0.tar.xz"; + sha256 = "1955fkc7a22d7a0y2n7kz7r1md56v2s5qvyb3h68szs60zjnk3xa"; + name = "qtwebview-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtwinextras = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwinextras-everywhere-src-5.10.0.tar.xz"; + sha256 = "1mx5qihmh3awqcr9k3z2chxz8273bi5ha90v7f4fqr2vk3g6w4yd"; + name = "qtwinextras-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtx11extras = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtx11extras-everywhere-src-5.10.0.tar.xz"; + sha256 = "11jp0a40jqwcdq7isyip4f4mq2d58c9fx1kvg9g71m92n52ffyfb"; + name = "qtx11extras-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtxmlpatterns = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtxmlpatterns-everywhere-src-5.10.0.tar.xz"; + sha256 = "1hq3sbimbhaiw570d2cd84jhki0n2jw2x2s7iq92m53y4akbr2mh"; + name = "qtxmlpatterns-everywhere-src-5.10.0.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 7930bd909aa..1200884a30c 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -33,7 +33,7 @@ existing packages here and modify it as necessary. # 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 ]; }; diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase.patch b/pkgs/development/libraries/qt-5/5.6/qtbase.patch index 6bdf774e15d..d8322cbc199 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 00000000000..bf6af805982 --- /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 0582a9f3f82..9afa818c36e 100644 --- a/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/default.nix @@ -24,7 +24,7 @@ top-level attribute to `top-level/all-packages.nix`. # options developerBuild ? false, decryptSslTraffic ? false, - debug ? null, + debug ? false, }: with stdenv.lib; @@ -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 {}; @@ -104,7 +105,7 @@ let qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript qtsensors qtserialport qtsvg qttools qttranslations qtwebsockets - qtx11extras qtxmlpatterns + qtx11extras qtxmlpatterns qtvirtualkeyboard ] ++ optional (!stdenv.isDarwin) qtwayland ++ optional (stdenv.isDarwin) qtmacextras); diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase.patch b/pkgs/development/libraries/qt-5/5.9/qtbase.patch index 69e389a5a6d..086ddf4fe3e 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 @@ -432,13 +432,13 @@ index e645ba5803..a0e5c68b7e 100644 - -QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index 44636f2288..61ed486a76 100644 +index 44636f2288..3b01424e67 100644 --- a/mkspecs/features/mac/default_pre.prf +++ b/mkspecs/features/mac/default_pre.prf -@@ -1,56 +1,3 @@ +@@ -1,56 +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") @@ -493,11 +493,11 @@ index 44636f2288..61ed486a76 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 3f6dc076ca..8b13789179 100644 +index 3f6dc076ca..e69de29bb2 100644 --- a/mkspecs/features/mac/sdk.prf +++ b/mkspecs/features/mac/sdk.prf -@@ -1,58 +1 @@ - +@@ -1,58 +0,0 @@ +- -isEmpty(QMAKE_MAC_SDK): \ - error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.") - @@ -676,30 +676,18 @@ 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 668669e4cd..30f7fbac41 100644 +index 668669e4cd..eb4840a0aa 100644 --- a/mkspecs/features/qt_example_installs.prf +++ b/mkspecs/features/qt_example_installs.prf -@@ -77,13 +77,13 @@ for(extra, extras): \ - # Just for Qt Creator - OTHER_FILES += $$sourcefiles - --sourcefiles += \ -- $$_PRO_FILE_ $$RC_FILE $$DEF_FILE \ -- $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ -- $$DBUS_ADAPTORS $$DBUS_INTERFACES --addInstallFiles(sources.files, $$sourcefiles) +@@ -82,7 +82,7 @@ sourcefiles += \ + $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ + $$DBUS_ADAPTORS $$DBUS_INTERFACES + addInstallFiles(sources.files, $$sourcefiles) -sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase --INSTALLS += sources -+ sourcefiles += \ -+ $$_PRO_FILE_ $$RC_FILE $$DEF_FILE \ -+ $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ -+ $$DBUS_ADAPTORS $$DBUS_INTERFACES -+ addInstallFiles(sources.files, $$sourcefiles) -+ sources.path = $$NIX_OUTPUT_DEV/share/examples/$$probase -+ INSTALLS += sources ++sources.path = $$NIX_OUTPUT_DEV/share/examples/$$probase + INSTALLS += sources check_examples { - srcfiles = $$sources.files diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 1903e509c8..ae7b585989 100644 --- a/mkspecs/features/qt_functions.prf @@ -952,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 @@ @@ -976,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 @@ -1028,28 +1016,6 @@ 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 b5a0a5bbeb..6c20305f4d 100644 --- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp @@ -1068,19 +1034,6 @@ index b5a0a5bbeb..6c20305f4d 100644 } QString TableGenerator::findComposeFile() -diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm -index 5cd4beb4f0..84919e6d6a 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 e2e573f0e1..1c8289f81e 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp @@ -1153,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/hooks/fix-qt-module-paths.sh b/pkgs/development/libraries/qt-5/hooks/fix-qt-module-paths.sh index 916981b5299..33682f6f3c6 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 2a20e77e7ba..00000000000 --- 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/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh index 8ec7eeda8ae..3a558153988 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" ] @@ -42,11 +41,7 @@ qtEnvHook() { propagatedUserEnvPkgs+=" $1" fi } -if [ "$crossConfig" ]; then - crossEnvHooks+=(qtEnvHook) -else - envHooks+=(qtEnvHook) -fi +envHostTargetHooks+=(qtEnvHook) postPatchMkspecs() { local bin="${!outputBin}" @@ -67,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 385ebeacd8f..739c9b4a160 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 172b20bc51b..aa4449504bb 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -80,7 +80,7 @@ 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 = @@ -93,11 +93,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} @@ -363,11 +361,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/qtvirtualkeyboard.nix b/pkgs/development/libraries/qt-5/modules/qtvirtualkeyboard.nix new file mode 100644 index 00000000000..2ba720c8eed --- /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/qtstyleplugin-kvantum-qt4/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix new file mode 100644 index 00000000000..2f0e39eb5c9 --- /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 00000000000..5085d9bf5ef --- /dev/null +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, libX11, libXext, qttools }: + +stdenv.mkDerivation rec { + name = "qtstyleplugin-kvantum-${version}"; + version = "0.10.4"; + + src = fetchFromGitHub { + owner = "tsujan"; + repo = "Kvantum"; + rev = "0527bb03f2252269fd382e11181a34ca72c96b4b"; + sha256 = "0ky44s1fgqxraywagx1mv07yz76ppgiz3prq447db78wkwqg2d8p"; + }; + + nativeBuildInputs = [ qmake qttools ]; + buildInputs = [ qtbase qtsvg qtx11extras libX11 libXext ]; + + postUnpack = "sourceRoot=\${sourceRoot}/Kvantum"; + + postInstall= '' + mkdir -p $out/$qtPluginPrefix/styles + mv $NIX_QT5_TMP/$qtPluginPrefix/styles/libkvantum.so $out/$qtPluginPrefix/styles/libkvantum.so + ''; + + 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.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.bugworm ]; + }; +} diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix index 0ab9cd1df04..13c0198ba50 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 ]; diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix index 1183f46b8db..75c25e12d66 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/rep-gtk/setup-hook.sh b/pkgs/development/libraries/rep-gtk/setup-hook.sh index 420d63d6c51..4d875b69330 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/rote/default.nix b/pkgs/development/libraries/rote/default.nix index 524afd7cf4d..195db9a1685 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/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index fe90d41ccb2..77cb7cf1f2b 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/nccl/default.nix b/pkgs/development/libraries/science/math/nccl/default.nix new file mode 100644 index 00000000000..c4deccff5b7 --- /dev/null +++ b/pkgs/development/libraries/science/math/nccl/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub +, gcc5, eject, cudatoolkit +}: + +stdenv.mkDerivation rec { + name = "cudatoolkit-${cudatoolkit.majorVersion}-nccl-${version}"; + version = "1.3.4-1"; + + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = "nccl"; + rev = "v${version}"; + sha256 = "0fvnrfn572lc6i2a3xyhbifm53ivcrr46z6cqr3b0bwb1iq79m7q"; + }; + + nativeBuildInputs = [ + gcc5 + eject + ]; + + propagatedBuildInputs = [ + cudatoolkit + ]; + + makeFlags = [ + "PREFIX=$(out)" + "CUDA_HOME=${cudatoolkit}" + "CUDA_LIB=${cudatoolkit.lib}/lib" + ]; + + meta = with stdenv.lib; { + description = '' + NVIDIA Collective Communications Library. + Multi-GPU and multi-node collective communication primitives. + ''; + homepage = https://developer.nvidia.com/nccl; + license = licenses.bsd3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ hyphon81 ]; + }; +} diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 82f51bffa8e..42eaf71942e 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -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"; diff --git a/pkgs/development/libraries/shibboleth-sp/default.nix b/pkgs/development/libraries/shibboleth-sp/default.nix index 219cda38bc2..74f861297d1 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/slib/setup-hook.sh b/pkgs/development/libraries/slib/setup-hook.sh index 62b72d6dc0a..3c7e91e8188 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/smpeg2/default.nix b/pkgs/development/libraries/smpeg2/default.nix index 10386a7b33e..3207bdb3a7f 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/speex/default.nix b/pkgs/development/libraries/speex/default.nix index 602359965f1..173b460a0ab 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/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix index e4d7b426854..67db6e5097d 100644 --- a/pkgs/development/libraries/taglib/default.nix +++ b/pkgs/development/libraries/taglib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zlib, cmake}: +{stdenv, fetchurl, zlib, cmake, fetchpatch}: stdenv.mkDerivation rec { name = "taglib-1.11.1"; @@ -8,6 +8,15 @@ stdenv.mkDerivation rec { sha256 = "0ssjcdjv4qf9liph5ry1kngam1y7zp8fzr9xv4wzzrma22kabldn"; }; + 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"; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 1e7448b6605..8b06e3f2e09 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.11"; src = fetchurl { url = "mirror://samba/talloc/${name}.tar.gz"; - sha256 = "0c3ihyb0jd8mhvi7gg2mr5w1zl2habx6jlkbyxzyckad2q8lkl92"; + sha256 = "1lzfxv2zjxap5snf9ydl1bqgjpz0kgkq7n644f8rkbx0arav77k3"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/theft/default.nix b/pkgs/development/libraries/theft/default.nix index a0110c5f22b..2a1180533ce 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/tntdb/default.nix b/pkgs/development/libraries/tntdb/default.nix index d11a5c344c9..75a494cfbde 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 fec256e703f..5e08a61cd1b 100644 --- a/pkgs/development/libraries/tremor/default.nix +++ b/pkgs/development/libraries/tremor/default.nix @@ -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/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 233fdd90254..badcb7e661b 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -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/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index edb2a8214dd..7bd036cf2e5 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { 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 4522ecc1bb6..f0089110c3c 100644 --- a/pkgs/development/libraries/vaapi-vdpau/default.nix +++ b/pkgs/development/libraries/vaapi-vdpau/default.nix @@ -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 6864db12f18..24c4a50d874 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "vapoursynth-${version}"; - version = "R39"; + version = "R40"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = version; - sha256 = "0cw7w8xiwhxhwykydy13m44wm9vn9hrsi30z6017ngga9d84fhqy"; + sha256 = "1ycc3fdhhryp7hap80z3qmh89br31kcswzp8ai3wlc07zfvcrfck"; }; nativeBuildInputs = [ pkgconfig autoreconfHook nasm ]; diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 324d977c72e..438b4eda454 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/vmime/default.nix b/pkgs/development/libraries/vmime/default.nix index 9bef1b27e9c..e0398487abc 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 ccdf2b05e7e..18b9278539f 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/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 5def37b791c..a5b7a6a99ce 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "1.14.0"; src = fetchurl { - url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; + url = "https://wayland.freedesktop.org/releases/${name}.tar.xz"; sha256 = "1f3sla6h0bw15fz8pjc67jhwj7pwmfdc7qlj42j5k9v116ycm07d"; }; @@ -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/webkitgtk/2.18.nix b/pkgs/development/libraries/webkitgtk/2.18.nix index 946f032f0f7..d3e3163a8af 100644 --- a/pkgs/development/libraries/webkitgtk/2.18.nix +++ b/pkgs/development/libraries/webkitgtk/2.18.nix @@ -15,7 +15,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.18.3"; + version = "2.18.6"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "17lgn7qwrwqxl1lgmq5icvzmna6aymx4c7al47rp0vvac7hj0m71"; + sha256 = "0g5cpdijjv5hlrbi4i4dh97yrh5apnyvm90wpr9f84hgyk12r4ck"; }; # see if we can clean this up.... diff --git a/pkgs/development/libraries/websocket++/default.nix b/pkgs/development/libraries/websocket++/default.nix index fbfc460db96..8a0ec2523b9 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/wt/default.nix b/pkgs/development/libraries/wt/default.nix index 3adf4f1497f..37819c2a98e 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -1,42 +1,56 @@ -{ stdenv, fetchFromGitHub, cmake, boost, pkgconfig, doxygen, qt48Full, libharu -, pango, fcgi, firebird, libmysql, postgresql, graphicsmagick, glew, openssl +{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, doxygen, qt48Full, libharu +, 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 = "kdeforche"; + repo = "wt"; + rev = version; + inherit sha256; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + cmake boost165 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=${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 = with maintainers; [ juliendehos willibutz ]; + }; + }; +in { + wt3 = generic { + # with the next version update the version pinning of boost should be omitted + version = "3.3.9"; + sha256 = "1mkflhvzzzxkc5yzvr6nk34j0ldpwxjxb6n7xml59h3j3px3ixjm"; }; - enableParallelBuilding = true; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - cmake boost doxygen qt48Full libharu - pango fcgi firebird libmysql postgresql graphicsmagick glew - openssl pcre - ]; - - cmakeFlags = [ - "-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick" - "-DWT_CPP_11_MODE=-std=c++11" - "-DGM_PREFIX=${graphicsmagick}" - "-DMYSQL_PREFIX=${libmysql.dev}" - "--no-warn-unused-cli" - ]; - - 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 ]; + wt4 = generic { + # with the next version update the version pinning of boost should be omitted + version = "4.0.2"; + sha256 = "0r729gjd1sy0pcmir2r7ga33mp5cr5b4gvf44852q65hw2577w1x"; }; } - diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index a0600399784..49f12842533 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/x265/default.nix b/pkgs/development/libraries/x265/default.nix index 29d7ddf1fdc..418829e7af8 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/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 23fee81e0a5..482c765dcda 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 2923bfc1fc6..09c2171945e 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 4ccdcb19f81..17f8646b517 100644 --- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix @@ -13,7 +13,7 @@ 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; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/xml-tooling-c/default.nix b/pkgs/development/libraries/xml-tooling-c/default.nix index f2d7711c9f0..8e1d71fab3f 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/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix index 057be97ce96..17d7320cb64 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 c6ab03df10a..02e1e96cabd 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/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index 030246db318..eea0fb727b0 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 b5bb73e3e33..00973350e18 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"; src = fetchFromGitHub { owner = "sekrit-twc"; repo = "zimg"; rev = "release-${version}"; - sha256 = "08hynzcxz95a4i67k5cn6isafdb6xjgd0x0miyhlnp2xc220zfqj"; + sha256 = "1jvx3a523mzkc54rrjab9kz66kc6q1snry9ymwmsx7rrd3kv3j6m"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/zxcvbn-c/default.nix b/pkgs/development/libraries/zxcvbn-c/default.nix new file mode 100644 index 00000000000..1ba07394348 --- /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/lisp-modules/clwrapper/cl-wrapper.sh b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh index 55b469729f9..a1cfae0e606 100755 --- a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh +++ b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh @@ -87,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/setup-hook.sh b/pkgs/development/lisp-modules/clwrapper/setup-hook.sh index 7ac8c70d59f..8975ada5320 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 0224bf16ab7..b13ddf8357f 100644 --- a/pkgs/development/lisp-modules/define-package.nix +++ b/pkgs/development/lisp-modules/define-package.nix @@ -33,7 +33,7 @@ let 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' ':')'" >> "$path_config_script" echo "fi" >> "$path_config_script" ''; deployLaunchScript = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index fae5818171b..4de4947c073 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" ''; @@ -53,11 +52,11 @@ in 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" ''; }; }; @@ -69,12 +68,10 @@ in 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/" ''; }; }; diff --git a/pkgs/development/lisp-modules/shell.nix b/pkgs/development/lisp-modules/shell.nix index b29ba53159e..d3cb7b36aee 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:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib"; }; in stdenv.mkDerivation self 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 00000000000..f0ec21b7589 --- /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 f456214f944..0bfa6d1f238 100644 --- a/pkgs/development/misc/avr/gcc/default.nix +++ b/pkgs/development/misc/avr/gcc/default.nix @@ -11,6 +11,16 @@ stdenv.mkDerivation { sha256 = "0fihlcy5hnksdxk0sn6bvgnyq8gfrgs8m794b1jxwd1dxinzg3b0"; }; + 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 ]; diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix index 0c1bb5d4d42..be4fc0f7f54 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/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 0c9c3e3f42c..4079adaef51 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; @@ -19,6 +19,7 @@ let 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 @@ -47,9 +48,11 @@ 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) '' @@ -77,9 +80,9 @@ stdenv.mkDerivation { 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 ${if release then @@ -129,9 +132,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 +198,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 6ca4c441e64..031fe3b18c6 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 ? "6.3.1.GA"}: rec { androidenv = pkgs.androidenv; @@ -9,9 +9,7 @@ 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 throw "Titanium version not supported: "+tiVersion; in import titaniumSdkFile { @@ -19,8 +17,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 3c5d3a018ec..5753c8d7da9 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 ? "6.3.1.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 4abf650ebee..5849ee368c1 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 ? "6.3.1.GA", release ? false +, rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null, iosVersion ? "11.2" , enableWirelessDistribution ? false, installURL ? null }: @@ -9,9 +9,9 @@ let src = fetchgit { url = https://github.com/appcelerator/KitchenSink.git; rev = "ec9edebf35030f61368000a8a9071dd7a0773884"; - sha256 = "1j41w4nhcbl40x550pjgabqrach80f9dybv7ya32771wnw2000iy"; + sha256 = "3e020004b73c9c2386f2672fdf9203083295f1524f5e504a07842e062de181c8"; }; - + # Rename the bundle id to something else renamedSrc = stdenv.mkDerivation { name = "KitchenSink-renamedsrc"; @@ -29,14 +29,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 670e55e0f30..00000000000 --- 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 511e8f0301b..00000000000 --- 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.3.nix similarity index 59% rename from pkgs/development/mobile/titaniumenv/titaniumsdk-6.0.nix rename to pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix index fdaaff39453..53963c100c7 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-6.0.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix @@ -1,14 +1,14 @@ {stdenv, fetchurl, unzip, makeWrapper, python, jdk}: stdenv.mkDerivation { - name = "mobilesdk-6.0.2.GA"; + 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_0_X/mobilesdk-6.0.2.v20170123140026-linux.zip; - sha256 = "1yjhr4fgjnxfxzwmgw71yynrfzhsjqj2cirjr5rd14zlp4q9751q"; + 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_0_X/mobilesdk-6.0.2.v20170123140026-osx.zip; - sha256 = "1ijd1wp56ygy238xpcffy112akim208wbv5zm901dvych83ibw1c"; + 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!"; @@ -21,9 +21,13 @@ stdenv.mkDerivation { # Rename ugly version number cd mobilesdk/* - mv * 6.0.2.GA + 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 diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix index bbbe1728ee5..d208f26ab67 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 @@ -80,8 +80,10 @@ stdenv.mkDerivation { ''} # Do the building + 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 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 ""} - + ${stdenv.lib.optionalString release '' ${stdenv.lib.optionalString generateIPA '' # Produce an IPA file diff --git a/pkgs/development/mobile/xcodeenv/default.nix b/pkgs/development/mobile/xcodeenv/default.nix index afe430df383..b3b9dbdf07a 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 e1b2b0cb2fa..d5ffb7f6c01 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/composition-v4.nix b/pkgs/development/node-packages/composition-v4.nix index 2d9f1ae4217..e5892ee616d 100644 --- a/pkgs/development/node-packages/composition-v4.nix +++ b/pkgs/development/node-packages/composition-v4.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.0. Do not edit! +# This file has been generated by node2nix 1.5.1. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix index 9396c59be69..4232324f350 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.5.0. Do not edit! +# This file has been generated by node2nix 1.5.1. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/development/node-packages/composition-v8.nix b/pkgs/development/node-packages/composition-v8.nix index c96c1ec2cbe..cb8e6ee8adf 100644 --- a/pkgs/development/node-packages/composition-v8.nix +++ b/pkgs/development/node-packages/composition-v8.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.0. Do not edit! +# This file has been generated by node2nix 1.5.1. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/development/node-packages/node-packages-v4.json b/pkgs/development/node-packages/node-packages-v4.json index c178f0fde82..b1349773a73 100644 --- a/pkgs/development/node-packages/node-packages-v4.json +++ b/pkgs/development/node-packages/node-packages-v4.json @@ -6,5 +6,4 @@ , "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 index acb65b614fa..9db71971647 100644 --- a/pkgs/development/node-packages/node-packages-v4.nix +++ b/pkgs/development/node-packages/node-packages-v4.nix @@ -1,135 +1,9 @@ -# This file has been generated by node2nix 1.5.0. Do not edit! +# This file has been generated by node2nix 1.5.1. 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"; @@ -139,319 +13,40 @@ let sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy"; }; }; - "archy-1.0.0" = { - name = "archy"; - packageName = "archy"; - version = "1.0.0"; + "accepts-1.3.4" = { + name = "accepts"; + packageName = "accepts"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz"; - sha1 = "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"; + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz"; + sha1 = "86246758c7dd6d21a6474ff084a4740ec05eb21f"; }; }; - "chalk-1.1.3" = { - name = "chalk"; - packageName = "chalk"; - version = "1.1.3"; + "after-0.8.2" = { + name = "after"; + packageName = "after"; + version = "0.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; - sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + url = "https://registry.npmjs.org/after/-/after-0.8.2.tgz"; + sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f"; }; }; - "deprecated-0.0.1" = { - name = "deprecated"; - packageName = "deprecated"; - version = "0.0.1"; + "ajv-4.11.8" = { + name = "ajv"; + packageName = "ajv"; + version = "4.11.8"; src = fetchurl { - url = "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"; - sha1 = "f9c9af5464afa1e7a971458a8bdef2aa94d5bb19"; + url = "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz"; + sha1 = "82ffb02b29e662ae53bdc20af15947706739c536"; }; }; - "gulp-util-3.0.8" = { - name = "gulp-util"; - packageName = "gulp-util"; - version = "3.0.8"; + "ajv-5.5.2" = { + name = "ajv"; + packageName = "ajv"; + version = "5.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz"; - sha1 = "0054e1e744502e27c04c187c3ecc505dd54bbb4f"; - }; - }; - "interpret-1.1.0" = { - name = "interpret"; - packageName = "interpret"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz"; - sha1 = "7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"; - }; - }; - "liftoff-2.5.0" = { - name = "liftoff"; - packageName = "liftoff"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/liftoff/-/liftoff-2.5.0.tgz"; - sha1 = "2009291bb31cea861bbf10a7c15a28caf75c31ec"; - }; - }; - "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.2" = { - name = "fancy-log"; - packageName = "fancy-log"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.2.tgz"; - sha1 = "f41125e3d84f2e7d89a43d06d958c8f78be16be1"; - }; - }; - "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"; + url = "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz"; + sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; }; }; "ansi-gray-0.1.1" = { @@ -463,22 +58,22 @@ let sha1 = "2962cf54ec9792c48510a3deb524436861ef7251"; }; }; - "color-support-1.1.3" = { - name = "color-support"; - packageName = "color-support"; - version = "1.1.3"; + "ansi-regex-2.1.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz"; - sha512 = "13g563h7mrddc3rlljgg75km4zycb8rhzxb5wiiricqvh4n7zgl60psnz39ijkzx5bn93s5qvacwkxbg1cglcmg5z3yyb6cjs96685a"; + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; }; }; - "time-stamp-1.1.0" = { - name = "time-stamp"; - packageName = "time-stamp"; - version = "1.1.0"; + "ansi-styles-2.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz"; - sha1 = "764a5a11af50561921b133f3b44e618687e0f5c3"; + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; + sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; }; }; "ansi-wrap-0.1.0" = { @@ -490,1678 +85,22 @@ let sha1 = "a82250ddb0015e9a27ca82e82ea603bbfa45efaf"; }; }; - "glogg-1.0.0" = { - name = "glogg"; - packageName = "glogg"; + "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"; + }; + }; + "archy-1.0.0" = { + name = "archy"; + packageName = "archy"; 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-2.0.0" = { - name = "findup-sync"; - packageName = "findup-sync"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz"; - sha1 = "9326b1488c22d1a6088650a86901b2d9a90a2cbc"; - }; - }; - "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-1.0.0" = { - name = "flagged-respawn"; - packageName = "flagged-respawn"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.0.tgz"; - sha1 = "4e79ae9b2eb38bf86b3bb56bf3e0a56aa5fcabd7"; - }; - }; - "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.map-1.0.0" = { - name = "object.map"; - packageName = "object.map"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object.map/-/object.map-1.0.0.tgz"; - sha1 = "92aef871cd6dcbced31fe29c0921db8395624597"; - }; - }; - "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-1.0.0" = { - name = "detect-file"; - packageName = "detect-file"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz"; - sha1 = "f0d66d03672a825cb1b73bdb3fe62310c8e552b7"; - }; - }; - "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"; - }; - }; - "micromatch-3.1.4" = { - name = "micromatch"; - packageName = "micromatch"; - version = "3.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.4.tgz"; - sha512 = "1z55bzyr3xwhvk8wbclnfjsbzwivqf9whb7k84gd8ljwfzmhsra430ikzd3p0nzxk90ybqas0c4bl6j4l1q5iyyz99h584q4az6sm4h"; - }; - }; - "resolve-dir-1.0.1" = { - name = "resolve-dir"; - packageName = "resolve-dir"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz"; - sha1 = "79a40644c362be82f26effe739c9bb5382046f43"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "braces-2.3.0" = { - name = "braces"; - packageName = "braces"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/braces/-/braces-2.3.0.tgz"; - sha512 = "2ngfivxj9g7knac123y1lk3arpmmzdhfn2g4qf1n4kzpvka4vafp48zcsh2qq7c97fxw2la5q2h6m2xcq5b1cr8b45j66jx0i8vr0rz"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "extglob-2.0.2" = { - name = "extglob"; - packageName = "extglob"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/extglob/-/extglob-2.0.2.tgz"; - sha512 = "3bi96hlw84salahixd3vvyzzx1riqlfnrf44qnlhl46yqpl5rad97halvj3vybzvh970jyk50lagp9qys69qhayy25m337y25j9wkr3"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "nanomatch-1.2.6" = { - name = "nanomatch"; - packageName = "nanomatch"; - version = "1.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.6.tgz"; - sha512 = "014pd4mh3hhi0gmrpss462ivnr8ic21ihmyjs4rx6v5prf5mw2zqzhsxbinx2mxiy4kc7wlw5w052bi18y6rgxq7l2pangg4r69g7jq"; - }; - }; - "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"; - }; - }; - "regex-not-1.0.0" = { - name = "regex-not"; - packageName = "regex-not"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.0.tgz"; - sha1 = "42f83e39771622df826b02af176525d6a5f157f9"; - }; - }; - "snapdragon-0.8.1" = { - name = "snapdragon"; - packageName = "snapdragon"; - version = "0.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.1.tgz"; - sha1 = "e12b5487faded3e3dea0ac91e9400bf75b401370"; - }; - }; - "to-regex-3.0.1" = { - name = "to-regex"; - packageName = "to-regex"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.1.tgz"; - sha1 = "15358bee4a2c83bd76377ba1dc049d0f18837aae"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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-descriptor-1.0.1" = { - name = "is-descriptor"; - packageName = "is-descriptor"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.1.tgz"; - sha512 = "1s669mqvckcwsqrnni08lac1anx00q82rkfplnq6zl9inaqzlq8n9ln8j8m49a9gaxjrwgkl8wjw4188whbj65yxspalzgaaiacaxqv"; - }; - }; - "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-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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "is-odd-1.0.0" = { - name = "is-odd"; - packageName = "is-odd"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-odd/-/is-odd-1.0.0.tgz"; - sha1 = "3b8a932eb028b3775c39bb09e91767accdb69088"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "use-2.0.2" = { - name = "use"; - packageName = "use"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/use/-/use-2.0.2.tgz"; - sha1 = "ae28a0d72f93bf22422a18a2e379993112dec8e8"; - }; - }; - "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"; - }; - }; - "class-utils-0.3.5" = { - name = "class-utils"; - packageName = "class-utils"; - version = "0.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.5.tgz"; - sha1 = "17e793103750f9627b2176ea34cfd1b565903c80"; - }; - }; - "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"; - }; - }; - "mixin-deep-1.3.0" = { - name = "mixin-deep"; - packageName = "mixin-deep"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.0.tgz"; - sha512 = "016isy937hd503fn41ivc4j267cr1brp7f65waxkk2ijslc1gyh7r815xk4g27cjrgjzydwqbpwk5yj4nyjj085n3l5k2vsi2z841kn"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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-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"; - }; - }; - "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"; - }; - }; - "lazy-cache-2.0.2" = { - name = "lazy-cache"; - packageName = "lazy-cache"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz"; - sha1 = "b9190a4f913354694840859f8a8f7084d8822264"; - }; - }; - "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"; - }; - }; - "set-getter-0.1.0" = { - name = "set-getter"; - packageName = "set-getter"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/set-getter/-/set-getter-0.1.0.tgz"; - sha1 = "d769c182c9d5a51f409145f2fba82e5e86e80376"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "atob-2.0.3" = { - name = "atob"; - packageName = "atob"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/atob/-/atob-2.0.3.tgz"; - sha1 = "19c7a760473774468f20b2d2d03372ad7d4cbf5d"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "global-modules-1.0.0" = { - name = "global-modules"; - packageName = "global-modules"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz"; - sha512 = "1pgpsvm0rm1fnqmblx77xs67gh8c80nf4dsgcgalhh9phmlp8ahn5w7vzx3xkwyxw3fg33h8vhh3plsycw6fd7c2r76mm7m8w9fkb5h"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "global-prefix-1.0.2" = { - name = "global-prefix"; - packageName = "global-prefix"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz"; - sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; - }; - }; - "is-windows-1.0.1" = { - name = "is-windows"; - packageName = "is-windows"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.1.tgz"; - sha1 = "310db70f742d259a16a369202b51af84233310d9"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "parse-filepath-1.0.2" = { - name = "parse-filepath"; - packageName = "parse-filepath"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz"; - sha1 = "a632127f53aaf3d15876f5872f3ffac763d6c891"; - }; - }; - "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.1.0" = { - name = "array-slice"; - packageName = "array-slice"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz"; - sha512 = "3myjiz16qi117x0k52sisqyn0cqx6yxvpgr43bkil9shgs7yhs8wpdgd3wjwfzgwxsw330yqwhp880gsyx2kxj1lfyb6gs1fh7qqnh7"; - }; - }; - "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-1.0.0" = { - name = "is-absolute"; - packageName = "is-absolute"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz"; - sha512 = "02g5p9wfcx3f1p0zq01ycrx5biwg79qg1mdw1cv6li7kxpny5hxsp34ynam7w2g6nvah73f0kzdkh6pxxmx1ymd8m02fwvgz6lsirbl"; - }; - }; - "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-1.0.0" = { - name = "is-relative"; - packageName = "is-relative"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz"; - sha512 = "0c1pd4414iy40xq652p1zgqgmncmm7xcns96pfazd63v439vyc1z93bvzvbw5r2qc4fp24414ydnj4gdsqlq223pfg05ar2mmwd23rb"; - }; - }; - "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/is-unc-path/-/is-unc-path-1.0.0.tgz"; - sha512 = "2asak63h3kc1vackrpai7qfiv15ndr231w1yc753m1dy7fd6ywxsr0rvh88b9ppyxhmc373fqk89a0pw3dllv7m5nbbbcqzvmaskccs"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "make-iterator-1.0.0" = { - name = "make-iterator"; - packageName = "make-iterator"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.0.tgz"; - sha1 = "57bef5dc85d23923ba23767324d8e8f8f3d9694b"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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.1" = { - name = "natives"; - packageName = "natives"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/natives/-/natives-1.1.1.tgz"; - sha512 = "08a9lf00d2pkqmdi6ipp00pjin0gwl6fh283cjdjbayaz834lppwrw19kn4s642kwa46bfcway3033j6rbqd96iy86qrzrfgz35mr7i"; - }; - }; - "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"; + url = "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz"; + sha1 = "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"; }; }; "are-we-there-yet-1.1.4" = { @@ -2173,130 +112,166 @@ let sha1 = "bb5dca382bb94f05e15194373d16fd3ba1ca110d"; }; }; - "console-control-strings-1.1.0" = { - name = "console-control-strings"; - packageName = "console-control-strings"; + "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/console-control-strings/-/console-control-strings-1.1.0.tgz"; - sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; + url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"; + sha512 = "2vdly17xk5kw7bfzajrjdnw4ml3wrfblx8064n0i4fxlchcscx2mvnwkq2bnnqvbqvdy4vs9ad462lz0rid7khysly9m9vzjiblly1g"; }; }; - "gauge-2.7.4" = { - name = "gauge"; - packageName = "gauge"; - version = "2.7.4"; + "arr-union-3.1.0" = { + name = "arr-union"; + packageName = "arr-union"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz"; - sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; + url = "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz"; + sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; }; }; - "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"; + "array-differ-1.0.0" = { + name = "array-differ"; + packageName = "array-differ"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"; - sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + url = "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"; + sha1 = "eff52e3758249d33be402b8bb8e564bb2b5d4031"; }; }; - "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"; + "array-each-1.0.1" = { + name = "array-each"; + packageName = "array-each"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha1 = "097b602b53422a522c1afb8790318336941a011d"; + url = "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz"; + sha1 = "a794af0c05ab1752846ee753a1f211a05ba0c44f"; }; }; - "os-tmpdir-1.0.2" = { - name = "os-tmpdir"; - packageName = "os-tmpdir"; + "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/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; - sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz"; + sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; + }; + }; + "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"; + }; + }; + "array-slice-1.1.0" = { + name = "array-slice"; + packageName = "array-slice"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz"; + sha512 = "3myjiz16qi117x0k52sisqyn0cqx6yxvpgr43bkil9shgs7yhs8wpdgd3wjwfzgwxsw330yqwhp880gsyx2kxj1lfyb6gs1fh7qqnh7"; + }; + }; + "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.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"; + }; + }; + "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-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"; + }; + }; + "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"; + }; + }; + "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.0.3" = { + name = "atob"; + packageName = "atob"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/atob/-/atob-2.0.3.tgz"; + sha1 = "19c7a760473774468f20b2d2d03372ad7d4cbf5d"; + }; + }; + "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"; }; }; "aws-sign2-0.7.0" = { @@ -2317,589 +292,22 @@ let 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"; + "balanced-match-1.0.0" = { + name = "balanced-match"; + packageName = "balanced-match"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; }; }; - "isstream-0.1.2" = { - name = "isstream"; - packageName = "isstream"; - version = "0.1.2"; + "base-0.11.2" = { + name = "base"; + packageName = "base"; + version = "0.11.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.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"; - }; - }; - "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"; - }; - }; - "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"; + url = "https://registry.npmjs.org/base/-/base-0.11.2.tgz"; + sha512 = "11dwi4v72034dqafp0qxsg8h6cpn92vv4vf909a9fybd69yfg6gqn4hhav6x59r1wbi8h1qlgfh9np0340mpljv1hc9v9p02giqygp5"; }; }; "base64-js-0.0.8" = { @@ -2911,85 +319,31 @@ let sha1 = "1101e9544f4a76b1bc3b26d452ca96d7a35e7978"; }; }; - "xmlbuilder-4.0.0" = { - name = "xmlbuilder"; - packageName = "xmlbuilder"; - version = "4.0.0"; + "bcrypt-pbkdf-1.0.1" = { + name = "bcrypt-pbkdf"; + packageName = "bcrypt-pbkdf"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.0.0.tgz"; - sha1 = "98b8f651ca30aa624036f127d11cc66dc7b907a3"; + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz"; + sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; }; }; - "xmldom-0.1.27" = { - name = "xmldom"; - packageName = "xmldom"; - version = "0.1.27"; + "beeper-1.1.1" = { + name = "beeper"; + packageName = "beeper"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz"; - sha1 = "d501f97b3bdb403af8ef9ecc20573187aadac0e9"; + url = "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz"; + sha1 = "e6d5ea8c5dad001304a70b22638447f69cb2f809"; }; }; - "lodash-3.10.1" = { - name = "lodash"; - packageName = "lodash"; - version = "3.10.1"; + "biased-opener-0.2.8" = { + name = "biased-opener"; + packageName = "biased-opener"; + version = "0.2.8"; 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"; + url = "https://registry.npmjs.org/biased-opener/-/biased-opener-0.2.8.tgz"; + sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4"; }; }; "big-integer-1.6.26" = { @@ -3001,130 +355,85 @@ let sha1 = "3af1672fa62daf2d5ecafacf6e5aa0d25e02c1c8"; }; }; - "camelcase-keys-2.1.0" = { - name = "camelcase-keys"; - packageName = "camelcase-keys"; - version = "2.1.0"; + "block-stream-0.0.9" = { + name = "block-stream"; + packageName = "block-stream"; + version = "0.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz"; - sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7"; + url = "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz"; + sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a"; }; }; - "decamelize-1.2.0" = { - name = "decamelize"; - packageName = "decamelize"; - version = "1.2.0"; + "body-parser-1.18.2" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; - sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz"; + sha1 = "87678a19d84b47d859b83199bd59bce222b10454"; }; }; - "loud-rejection-1.6.0" = { - name = "loud-rejection"; - packageName = "loud-rejection"; - version = "1.6.0"; + "boom-2.10.1" = { + name = "boom"; + packageName = "boom"; + version = "2.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz"; - sha1 = "5b46f80147edee578870f086d04821cf998e551f"; + url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"; + sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; }; }; - "map-obj-1.0.1" = { - name = "map-obj"; - packageName = "map-obj"; - version = "1.0.1"; + "boom-4.3.1" = { + name = "boom"; + packageName = "boom"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; - sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; + url = "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz"; + sha1 = "4f8a3005cb4a7e3889f749030fd25b96e01d2e31"; }; }; - "normalize-package-data-2.4.0" = { - name = "normalize-package-data"; - packageName = "normalize-package-data"; - version = "2.4.0"; + "boom-5.2.0" = { + name = "boom"; + packageName = "boom"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; - sha512 = "01wzws79ps84ylshjb7rfpjykgiqxnpr89s52p2yyzfx8nfvyh5flvf1almiiavsi75xgi8g3s5davc1mmgz7gn8yvlqz6gnhax8f7n"; + url = "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz"; + sha512 = "19h20yqpvca08dns1rs4f057f10w63v0snxfml4h5khsk266x3x1im0w72bza4k2xn0kfz6jlv001dhcvxsjr09bmbqnysils9m7437"; }; }; - "read-pkg-up-1.0.1" = { - name = "read-pkg-up"; - packageName = "read-pkg-up"; - version = "1.0.1"; + "bplist-parser-0.1.1" = { + name = "bplist-parser"; + packageName = "bplist-parser"; + version = "0.1.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/bplist-parser/-/bplist-parser-0.1.1.tgz"; + sha1 = "d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6"; }; }; - "redent-1.0.0" = { - name = "redent"; - packageName = "redent"; - version = "1.0.0"; + "brace-expansion-1.1.8" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz"; - sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"; + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz"; + sha1 = "c07b211c7c952ec1f8efd51a77ef0d1d3990a292"; }; }; - "trim-newlines-1.0.0" = { - name = "trim-newlines"; - packageName = "trim-newlines"; - version = "1.0.0"; + "braces-2.3.0" = { + name = "braces"; + packageName = "braces"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"; - sha1 = "5887966bb582a4503a41eb524f7d35011815a613"; + url = "https://registry.npmjs.org/braces/-/braces-2.3.0.tgz"; + sha512 = "2ngfivxj9g7knac123y1lk3arpmmzdhfn2g4qf1n4kzpvka4vafp48zcsh2qq7c97fxw2la5q2h6m2xcq5b1cr8b45j66jx0i8vr0rz"; }; }; - "camelcase-2.1.1" = { - name = "camelcase"; - packageName = "camelcase"; - version = "2.1.1"; + "browser-launcher2-0.4.6" = { + name = "browser-launcher2"; + packageName = "browser-launcher2"; + version = "0.4.6"; 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"; + url = "https://registry.npmjs.org/browser-launcher2/-/browser-launcher2-0.4.6.tgz"; + sha1 = "51598408a13f4c9c5b20eba44554b2c0b0ae4074"; }; }; "builtin-modules-1.1.1" = { @@ -3136,211 +445,175 @@ let sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; }; }; - "spdx-correct-1.0.2" = { - name = "spdx-correct"; - packageName = "spdx-correct"; - version = "1.0.2"; + "bytes-3.0.0" = { + name = "bytes"; + packageName = "bytes"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz"; - sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40"; + url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"; + sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; }; }; - "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"; + "cache-base-1.0.1" = { + name = "cache-base"; + packageName = "cache-base"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"; - sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2"; + url = "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz"; + sha512 = "36i943khi87af4gif9r6imjgybqxq9cbd69z2h8p2s2j6scfbhrv7j3n591xl982fmyq29rkwh70a6qdcf3v0piwzfh8n2jf571v9q0"; }; }; - "repeating-2.0.1" = { - name = "repeating"; - packageName = "repeating"; - version = "2.0.1"; + "camelcase-2.1.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"; - sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; + url = "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz"; + sha1 = "7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"; }; }; - "is-finite-1.0.2" = { - name = "is-finite"; - packageName = "is-finite"; - version = "1.0.2"; + "camelcase-keys-2.1.0" = { + name = "camelcase-keys"; + packageName = "camelcase-keys"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; - sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; + url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz"; + sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7"; }; }; - "get-stdin-4.0.1" = { - name = "get-stdin"; - packageName = "get-stdin"; - version = "4.0.1"; + "caseless-0.12.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"; - sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe"; + url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; - "accepts-1.3.4" = { - name = "accepts"; - packageName = "accepts"; - version = "1.3.4"; + "chalk-1.1.3" = { + name = "chalk"; + packageName = "chalk"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz"; - sha1 = "86246758c7dd6d21a6474ff084a4740ec05eb21f"; + url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; }; }; - "array-flatten-1.1.1" = { - name = "array-flatten"; - packageName = "array-flatten"; - 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/array-flatten/-/array-flatten-1.1.1.tgz"; - sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; + url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz"; + sha512 = "1xcqwmfmsbrm2ck76brwiqjmcza655khgh5szh6wngk357i37sgwsga1pbarwzaz9hvzkriqhq6j0z5mv0pmz61cf9wxvk3y5mlzs58"; }; }; - "body-parser-1.18.2" = { - name = "body-parser"; - packageName = "body-parser"; - version = "1.18.2"; + "cliui-3.2.0" = { + name = "cliui"; + packageName = "cliui"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz"; - sha1 = "87678a19d84b47d859b83199bd59bce222b10454"; + url = "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz"; + sha1 = "120601537a916d29940f934da3b48d585a39213d"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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-support-1.1.3" = { + name = "color-support"; + packageName = "color-support"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz"; + sha512 = "13g563h7mrddc3rlljgg75km4zycb8rhzxb5wiiricqvh4n7zgl60psnz39ijkzx5bn93s5qvacwkxbg1cglcmg5z3yyb6cjs96685a"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; }; }; "content-disposition-0.5.2" = { @@ -3379,6 +652,159 @@ let sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; }; }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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.1.1" = { name = "depd"; packageName = "depd"; @@ -3388,13 +814,103 @@ let sha1 = "5783b4e1c459f06fa5ca27f991f3d06e7a310359"; }; }; - "encodeurl-1.0.1" = { + "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"; + }; + }; + "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"; + }; + }; + "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-file-1.0.0" = { + name = "detect-file"; + packageName = "detect-file"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz"; + sha1 = "f0d66d03672a825cb1b73bdb3fe62310c8e552b7"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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.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"; + }; + }; + "encodeurl-1.0.2" = { name = "encodeurl"; packageName = "encodeurl"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz"; - sha1 = "79e3d58655346909fe6f0f45a5de68103b294d20"; + url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"; + sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + }; + }; + "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"; + }; + }; + "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"; }; }; "escape-html-1.0.3" = { @@ -3406,6 +922,15 @@ let sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; }; }; + "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"; + }; + }; "etag-1.8.1" = { name = "etag"; packageName = "etag"; @@ -3415,6 +940,114 @@ let sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; }; }; + "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-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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "fancy-log-1.3.2" = { + name = "fancy-log"; + packageName = "fancy-log"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.2.tgz"; + sha1 = "f41125e3d84f2e7d89a43d06d958c8f78be16be1"; + }; + }; + "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"; + }; + }; + "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"; @@ -3424,6 +1057,132 @@ let sha1 = "ce0b6855b45853e791b2fcc680046d88253dd7f5"; }; }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "findup-sync-2.0.0" = { + name = "findup-sync"; + packageName = "findup-sync"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz"; + sha1 = "9326b1488c22d1a6088650a86901b2d9a90a2cbc"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "flagged-respawn-1.0.0" = { + name = "flagged-respawn"; + packageName = "flagged-respawn"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.0.tgz"; + sha1 = "4e79ae9b2eb38bf86b3bb56bf3e0a56aa5fcabd7"; + }; + }; + "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-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"; + }; + }; + "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.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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; @@ -3433,6 +1192,1149 @@ let sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; }; }; + "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"; + }; + }; + "fstream-1.0.11" = { + name = "fstream"; + packageName = "fstream"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz"; + sha1 = "5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"; + }; + }; + "fstream-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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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-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"; + }; + }; + "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"; + }; + }; + "global-modules-1.0.0" = { + name = "global-modules"; + packageName = "global-modules"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz"; + sha512 = "1pgpsvm0rm1fnqmblx77xs67gh8c80nf4dsgcgalhh9phmlp8ahn5w7vzx3xkwyxw3fg33h8vhh3plsycw6fd7c2r76mm7m8w9fkb5h"; + }; + }; + "global-prefix-1.0.2" = { + name = "global-prefix"; + packageName = "global-prefix"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz"; + sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; + }; + }; + "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"; + }; + }; + "glogg-1.0.1" = { + name = "glogg"; + packageName = "glogg"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/glogg/-/glogg-1.0.1.tgz"; + sha512 = "0vr9sdx0f84b9s5vy72ralm494844c0p9kqqgcvy25gcn9abv57y7hwwafdsswc3z283v8bqa50j8gp740dd4biyngi5f15p9f2lxna"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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-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"; + }; + }; + "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-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"; + }; + }; + "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-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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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-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"; + }; + }; + "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"; + }; + }; + "interpret-1.1.0" = { + name = "interpret"; + packageName = "interpret"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz"; + sha1 = "7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "is-absolute-1.0.0" = { + name = "is-absolute"; + packageName = "is-absolute"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz"; + sha512 = "02g5p9wfcx3f1p0zq01ycrx5biwg79qg1mdw1cv6li7kxpny5hxsp34ynam7w2g6nvah73f0kzdkh6pxxmx1ymd8m02fwvgz6lsirbl"; + }; + }; + "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-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-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-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"; + }; + }; + "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-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-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-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"; + }; + }; + "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-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-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-odd-1.0.0" = { + name = "is-odd"; + packageName = "is-odd"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-odd/-/is-odd-1.0.0.tgz"; + sha1 = "3b8a932eb028b3775c39bb09e91767accdb69088"; + }; + }; + "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-relative-1.0.0" = { + name = "is-relative"; + packageName = "is-relative"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz"; + sha512 = "0c1pd4414iy40xq652p1zgqgmncmm7xcns96pfazd63v439vyc1z93bvzvbw5r2qc4fp24414ydnj4gdsqlq223pfg05ar2mmwd23rb"; + }; + }; + "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-unc-path-1.0.0" = { + name = "is-unc-path"; + packageName = "is-unc-path"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz"; + sha512 = "2asak63h3kc1vackrpai7qfiv15ndr231w1yc753m1dy7fd6ywxsr0rvh88b9ppyxhmc373fqk89a0pw3dllv7m5nbbbcqzvmaskccs"; + }; + }; + "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-windows-1.0.1" = { + name = "is-windows"; + packageName = "is-windows"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.1.tgz"; + sha1 = "310db70f742d259a16a369202b51af84233310d9"; + }; + }; + "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"; + }; + }; + "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-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-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-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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "lazy-cache-2.0.2" = { + name = "lazy-cache"; + packageName = "lazy-cache"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz"; + sha1 = "b9190a4f913354694840859f8a8f7084d8822264"; + }; + }; + "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"; + }; + }; + "liftoff-2.5.0" = { + name = "liftoff"; + packageName = "liftoff"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/liftoff/-/liftoff-2.5.0.tgz"; + sha1 = "2009291bb31cea861bbf10a7c15a28caf75c31ec"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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._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._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._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._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._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.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.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"; + }; + }; + "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.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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "make-iterator-1.0.0" = { + name = "make-iterator"; + packageName = "make-iterator"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.0.tgz"; + sha1 = "57bef5dc85d23923ba23767324d8e8f8f3d9694b"; + }; + }; + "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-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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; "merge-descriptors-1.0.1" = { name = "merge-descriptors"; packageName = "merge-descriptors"; @@ -3451,211 +2353,13 @@ let sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; }; }; - "on-finished-2.3.0" = { - name = "on-finished"; - packageName = "on-finished"; - version = "2.3.0"; + "micromatch-3.1.5" = { + name = "micromatch"; + packageName = "micromatch"; + version = "3.1.5"; 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"; + url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.5.tgz"; + sha512 = "2y22i8yrib7vcgpfcm5sq9g4fh4wxrn0f3z017vdbkvybvywa1axl3kym81k9ad6h3d4jmqkqyahcaj2c5qy5wpa17kvbyhnfn6sjya"; }; }; "mime-1.4.1" = { @@ -3667,40 +2371,103 @@ let sha512 = "2sz22r1xrnyvq6jg0h6b6cab3s3xdsfqa0n6vl9xv9gq3ppcxrcpg2hqfc41xjwnfwfkr6240l5gys7nds61ch6xcb3gr3fwsl7x398"; }; }; - "media-typer-0.3.0" = { - name = "media-typer"; - packageName = "media-typer"; - version = "0.3.0"; + "mime-db-1.30.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; - sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz"; + sha1 = "74c643da2dd9d6a45399963465b26d5ca7d71f01"; }; }; - "deep-extend-0.4.2" = { - name = "deep-extend"; - packageName = "deep-extend"; - version = "0.4.2"; + "mime-types-2.1.17" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.17"; src = fetchurl { - url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz"; - sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz"; + sha1 = "09d7a393f03e995a79f8af857b70a9e0ab16557a"; }; }; - "strip-json-comments-2.0.1" = { - name = "strip-json-comments"; - packageName = "strip-json-comments"; - version = "2.0.1"; + "minimatch-0.2.14" = { + name = "minimatch"; + packageName = "minimatch"; + version = "0.2.14"; src = fetchurl { - url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; - sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + url = "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"; + sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a"; }; }; - "truncate-1.0.5" = { - name = "truncate"; - packageName = "truncate"; - version = "1.0.5"; + "minimatch-2.0.10" = { + name = "minimatch"; + packageName = "minimatch"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/truncate/-/truncate-1.0.5.tgz"; - sha1 = "c636c6c1f50eed7c927af06c1dbffab53c7abe28"; + url = "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz"; + sha1 = "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"; + }; + }; + "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"; + }; + }; + "mixin-deep-1.3.0" = { + name = "mixin-deep"; + packageName = "mixin-deep"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.0.tgz"; + sha512 = "016isy937hd503fn41ivc4j267cr1brp7f65waxkk2ijslc1gyh7r815xk4g27cjrgjzydwqbpwk5yj4nyjj085n3l5k2vsi2z841kn"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; }; }; "nan-2.8.0" = { @@ -3712,6 +2479,33 @@ let sha1 = "ed715f3fe9de02b57a5e6252d90a96675e1f085a"; }; }; + "nanomatch-1.2.7" = { + name = "nanomatch"; + packageName = "nanomatch"; + version = "1.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.7.tgz"; + sha512 = "2m4xaq739s2r5bvh287d8zm8af9mxa706z1a7ila48yhvkspi4iimwyg0id1cl327i7kqssrcnc2nwdc2qw8s83xwqg3bmfgjr5v6gz"; + }; + }; + "natives-1.1.1" = { + name = "natives"; + packageName = "natives"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/natives/-/natives-1.1.1.tgz"; + sha512 = "08a9lf00d2pkqmdi6ipp00pjin0gwl6fh283cjdjbayaz834lppwrw19kn4s642kwa46bfcway3033j6rbqd96iy86qrzrfgz35mr7i"; + }; + }; + "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"; + }; + }; "node-pre-gyp-0.6.39" = { name = "node-pre-gyp"; packageName = "node-pre-gyp"; @@ -3721,6 +2515,15 @@ let sha512 = "2cwrivwc0ha272cly9r61bbb14kkl1s1hsmn53yr88b6pfjqj512nac6c5rphc6ak88v8gpl1f879qdd3v7386103zzr7miibpmbhis"; }; }; + "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"; @@ -3730,202 +2533,130 @@ let sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; }; }; - "request-2.81.0" = { - name = "request"; - packageName = "request"; - version = "2.81.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/request/-/request-2.81.0.tgz"; - sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; + sha512 = "01wzws79ps84ylshjb7rfpjykgiqxnpr89s52p2yyzfx8nfvyh5flvf1almiiavsi75xgi8g3s5davc1mmgz7gn8yvlqz6gnhax8f7n"; }; }; - "hawk-3.1.3" = { - name = "hawk"; - packageName = "hawk"; - version = "3.1.3"; + "npmlog-4.1.2" = { + name = "npmlog"; + packageName = "npmlog"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"; - sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4"; + url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; + sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs"; }; }; - "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.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"; - }; - }; - "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"; + "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/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"; - sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af"; + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; }; }; - "jsonify-0.0.0" = { - name = "jsonify"; - packageName = "jsonify"; - version = "0.0.0"; + "oauth-sign-0.8.2" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"; - sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"; + sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; }; }; - "assert-plus-0.2.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "0.2.0"; + "object-assign-3.0.0" = { + name = "object-assign"; + packageName = "object-assign"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"; - sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; + url = "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz"; + sha1 = "9bedd5ca0897949bca47e7ff408062d549f587f2"; }; }; - "hoek-2.16.3" = { - name = "hoek"; - packageName = "hoek"; - version = "2.16.3"; + "object-assign-4.1.1" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"; - sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; }; }; - "boom-2.10.1" = { - name = "boom"; - packageName = "boom"; - version = "2.10.1"; + "object-copy-0.1.0" = { + name = "object-copy"; + packageName = "object-copy"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"; - sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; + url = "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz"; + sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; }; }; - "cryptiles-2.0.5" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "2.0.5"; + "object-visit-1.0.1" = { + name = "object-visit"; + packageName = "object-visit"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"; - sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8"; + url = "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz"; + sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; }; }; - "sntp-1.0.9" = { - name = "sntp"; - packageName = "sntp"; - version = "1.0.9"; + "object.defaults-1.1.0" = { + name = "object.defaults"; + packageName = "object.defaults"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; - sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; + url = "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz"; + sha1 = "3a7f868334b407dea06da16d88d5cd29e435fecf"; }; }; - "fstream-ignore-1.0.5" = { - name = "fstream-ignore"; - packageName = "fstream-ignore"; - version = "1.0.5"; + "object.map-1.0.1" = { + name = "object.map"; + packageName = "object.map"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz"; - sha1 = "9c31dae34767018fe1d249b24dada67d092da105"; + url = "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz"; + sha1 = "cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"; }; }; - "uid-number-0.0.6" = { - name = "uid-number"; - packageName = "uid-number"; - version = "0.0.6"; + "object.pick-1.3.0" = { + name = "object.pick"; + packageName = "object.pick"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"; - sha1 = "0ea10e8035e8eb5b8e4449f06da1c730663baa81"; + url = "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz"; + sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; + }; + }; + "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.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"; + }; + }; + "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"; }; }; "options-0.0.6" = { @@ -3937,22 +2668,31 @@ let sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; }; }; - "ultron-1.0.2" = { - name = "ultron"; - packageName = "ultron"; - version = "1.0.2"; + "orchestrator-0.3.8" = { + name = "orchestrator"; + packageName = "orchestrator"; + version = "0.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz"; - sha1 = "ace116ab557cd197386a4e88f4685378c8b2e4fa"; + url = "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz"; + sha1 = "14e7e9e2764f7315fbac184e506c7aa6df94ad7e"; }; }; - "cliui-3.2.0" = { - name = "cliui"; - packageName = "cliui"; - version = "3.2.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/cliui/-/cliui-3.2.0.tgz"; - sha1 = "120601537a916d29940f934da3b48d585a39213d"; + url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"; + sha1 = "fd565a9af8eb4473ba69b6ed8a34352cb552f126"; + }; + }; + "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-locale-1.4.0" = { @@ -3964,6 +2704,1230 @@ let sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9"; }; }; + "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.4" = { + name = "osenv"; + packageName = "osenv"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz"; + sha1 = "42fe6d5953df06c8064be6f176c3d05aaaa34644"; + }; + }; + "parse-filepath-1.0.2" = { + name = "parse-filepath"; + packageName = "parse-filepath"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz"; + sha1 = "a632127f53aaf3d15876f5872f3ffac763d6c891"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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-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"; + }; + }; + "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-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"; + }; + }; + "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"; + }; + }; + "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-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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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.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"; + }; + }; + "rc-1.2.4" = { + name = "rc"; + packageName = "rc"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/rc/-/rc-1.2.4.tgz"; + sha1 = "a0f606caae2a3b862bbd0ef85482c0125b315fa3"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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.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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "regex-not-1.0.0" = { + name = "regex-not"; + packageName = "regex-not"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.0.tgz"; + sha1 = "42f83e39771622df826b02af176525d6a5f157f9"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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-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"; + }; + }; + "resolve-dir-1.0.1" = { + name = "resolve-dir"; + packageName = "resolve-dir"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz"; + sha1 = "79a40644c362be82f26effe739c9bb5382046f43"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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-getter-0.1.0" = { + name = "set-getter"; + packageName = "set-getter"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-getter/-/set-getter-0.1.0.tgz"; + sha1 = "d769c182c9d5a51f409145f2fba82e5e86e80376"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "snapdragon-0.8.1" = { + name = "snapdragon"; + packageName = "snapdragon"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.1.tgz"; + sha1 = "e12b5487faded3e3dea0ac91e9400bf75b401370"; + }; + }; + "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-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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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_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-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-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-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-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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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-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"; + }; + }; + "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"; + }; + }; + "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-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"; + }; + }; + "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.1" = { + name = "to-regex"; + packageName = "to-regex"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.1.tgz"; + sha1 = "15358bee4a2c83bd76377ba1dc049d0f18837aae"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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.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"; + }; + }; + "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.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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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-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"; + }; + }; + "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-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"; + }; + }; + "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"; + }; + }; + "use-2.0.2" = { + name = "use"; + packageName = "use"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/use/-/use-2.0.2.tgz"; + sha1 = "ae28a0d72f93bf22422a18a2e379993112dec8e8"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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-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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; "window-size-0.1.4" = { name = "window-size"; packageName = "window-size"; @@ -3973,15 +3937,6 @@ let sha1 = "f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"; }; }; - "y18n-3.2.1" = { - name = "y18n"; - packageName = "y18n"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz"; - sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; - }; - }; "wrap-ansi-2.1.0" = { name = "wrap-ansi"; packageName = "wrap-ansi"; @@ -3991,526 +3946,85 @@ let 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"; - }; - }; - "uglify-to-browserify-1.0.2" = { - name = "uglify-to-browserify"; - packageName = "uglify-to-browserify"; + "wrappy-1.0.2" = { + name = "wrappy"; + packageName = "wrappy"; version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"; - sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; + url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; }; - "yargs-3.10.0" = { - name = "yargs"; - packageName = "yargs"; - version = "3.10.0"; + "ws-1.1.5" = { + name = "ws"; + packageName = "ws"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"; - sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; + url = "https://registry.npmjs.org/ws/-/ws-1.1.5.tgz"; + sha512 = "3iv2yz706h7wyg563jsfjdykkkxs8j49vz60r6qx5by0npfhs98rgc114kdqs15sc52mldscc22bkfpkrs08cwlqaxx8lfdjn5alwm3"; }; }; - "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.12.2" = { - name = "commander"; - packageName = "commander"; - version = "2.12.2"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz"; - sha512 = "007wb3baahjcrv17kgxryqjlsyr3c3kl2y07p85m4ia78pba9xyjr3cgi95jjrwq8qq550s78hj06f7z0ab8ssrxk6w06afjsmxln84"; - }; - }; - "is-my-json-valid-2.17.1" = { - name = "is-my-json-valid"; - packageName = "is-my-json-valid"; - version = "2.17.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.1.tgz"; - sha512 = "2qkjhj6i3y40j35y8k722kklm1j8dfwk9506csa3vxr16vv7125v8jzpmkl551gsif98bzn205yj3sb99xi1i4bd6p5a1m81wvj2sa3"; - }; - }; - "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"; + "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/pkginfo/-/pkginfo-0.3.1.tgz"; - sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21"; + url = "https://registry.npmjs.org/x-default-browser/-/x-default-browser-0.3.1.tgz"; + sha1 = "7f6194154fd1786cf261e68b5488c47127a04977"; }; }; - "stack-trace-0.0.10" = { - name = "stack-trace"; - packageName = "stack-trace"; - version = "0.0.10"; + "xmlbuilder-4.0.0" = { + name = "xmlbuilder"; + packageName = "xmlbuilder"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz"; - sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0"; + url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.0.0.tgz"; + sha1 = "98b8f651ca30aa624036f127d11cc66dc7b907a3"; }; }; - "jsonfile-2.4.0" = { - name = "jsonfile"; - packageName = "jsonfile"; - version = "2.4.0"; + "xmldom-0.1.27" = { + name = "xmldom"; + packageName = "xmldom"; + version = "0.1.27"; src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz"; - sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"; + url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz"; + sha1 = "d501f97b3bdb403af8ef9ecc20573187aadac0e9"; + }; + }; + "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"; + }; + }; + "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-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"; }; }; }; @@ -4636,7 +4150,7 @@ in }) (sources."gulplog-1.0.0" // { dependencies = [ - (sources."glogg-1.0.0" // { + (sources."glogg-1.0.1" // { dependencies = [ sources."sparkles-1.0.0" ]; @@ -4680,9 +4194,9 @@ in (sources."readable-stream-1.1.14" // { dependencies = [ sources."core-util-is-1.0.2" + sources."inherits-2.0.3" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.3" ]; }) ]; @@ -4727,7 +4241,7 @@ in sources."is-extglob-2.1.1" ]; }) - (sources."micromatch-3.1.4" // { + (sources."micromatch-3.1.5" // { dependencies = [ sources."arr-diff-4.0.0" sources."array-unique-0.3.2" @@ -4778,27 +4292,10 @@ in }) (sources."define-property-1.0.0" // { dependencies = [ - (sources."is-descriptor-1.0.1" // { + (sources."is-descriptor-1.0.2" // { dependencies = [ - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - sources."kind-of-5.1.0" + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" ]; }) ]; @@ -4808,7 +4305,7 @@ in sources."is-extendable-0.1.1" ]; }) - (sources."extglob-2.0.2" // { + (sources."extglob-2.0.4" // { dependencies = [ (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -4855,7 +4352,7 @@ in ]; }) sources."kind-of-6.0.2" - (sources."nanomatch-1.2.6" // { + (sources."nanomatch-1.2.7" // { dependencies = [ (sources."is-odd-1.0.0" // { dependencies = [ @@ -4961,7 +4458,7 @@ in }) ]; }) - (sources."class-utils-0.3.5" // { + (sources."class-utils-0.3.6" // { dependencies = [ sources."arr-union-3.1.0" (sources."define-property-0.2.5" // { @@ -4991,23 +4488,6 @@ in }) ]; }) - (sources."lazy-cache-2.0.2" // { - dependencies = [ - (sources."set-getter-0.1.0" // { - dependencies = [ - (sources."to-object-path-0.3.0" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - ]; - }) - ]; - }) (sources."static-extend-0.1.2" // { dependencies = [ (sources."object-copy-0.1.0" // { @@ -5027,27 +4507,10 @@ in sources."component-emitter-1.2.1" (sources."define-property-1.0.0" // { dependencies = [ - (sources."is-descriptor-1.0.1" // { + (sources."is-descriptor-1.0.2" // { dependencies = [ - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - (sources."kind-of-3.2.2" // { - dependencies = [ - sources."is-buffer-1.1.6" - ]; - }) - ]; - }) - sources."kind-of-5.1.0" + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" ]; }) ]; @@ -5098,11 +4561,11 @@ in sources."source-map-0.5.7" (sources."source-map-resolve-0.5.1" // { dependencies = [ - sources."decode-uri-component-0.2.0" - sources."source-map-url-0.4.0" sources."atob-2.0.3" - sources."urix-0.1.0" + sources."decode-uri-component-0.2.0" sources."resolve-url-0.2.1" + sources."source-map-url-0.4.0" + sources."urix-0.1.0" ]; }) (sources."use-2.0.2" // { @@ -5257,9 +4720,9 @@ in sources."isobject-3.0.1" ]; }) - (sources."object.map-1.0.0" // { + (sources."object.map-1.0.1" // { dependencies = [ - (sources."for-own-0.1.5" // { + (sources."for-own-1.0.0" // { dependencies = [ sources."for-in-1.0.2" ]; @@ -5335,6 +4798,11 @@ in }) ]; }) + (sources."glob2base-0.0.12" // { + dependencies = [ + sources."find-index-0.1.1" + ]; + }) (sources."minimatch-2.0.10" // { dependencies = [ (sources."brace-expansion-1.1.8" // { @@ -5346,11 +4814,6 @@ in ]; }) 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" ]; }) @@ -5360,13 +4823,13 @@ in 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."lodash-1.0.2" (sources."minimatch-0.2.14" // { dependencies = [ sources."lru-cache-2.7.3" @@ -5400,9 +4863,9 @@ in (sources."readable-stream-1.0.34" // { dependencies = [ sources."core-util-is-1.0.2" + sources."inherits-2.0.3" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.3" ]; }) sources."xtend-4.0.1" @@ -5562,13 +5025,13 @@ in }) (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."hoek-4.2.0" sources."sntp-2.1.0" ]; }) @@ -5589,12 +5052,12 @@ in (sources."sshpk-1.13.1" // { dependencies = [ sources."asn1-0.2.3" + sources."bcrypt-pbkdf-1.0.1" sources."dashdash-1.14.1" + sources."ecc-jsbn-0.1.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" ]; }) ]; @@ -5618,7 +5081,7 @@ in ]; }) sources."tunnel-agent-0.6.0" - sources."uuid-3.1.0" + sources."uuid-3.2.1" ]; }) sources."rimraf-2.6.2" @@ -5674,15 +5137,17 @@ in (sources."plist-1.2.0" // { dependencies = [ sources."base64-js-0.0.8" + sources."util-deprecate-1.0.2" (sources."xmlbuilder-4.0.0" // { dependencies = [ sources."lodash-3.10.1" ]; }) sources."xmldom-0.1.27" - sources."util-deprecate-1.0.2" ]; }) + sources."rimraf-2.2.8" + sources."uid-0.0.2" (sources."win-detect-browsers-1.0.2" // { dependencies = [ sources."after-0.8.2" @@ -5690,8 +5155,6 @@ in sources."yargs-1.3.3" ]; }) - sources."uid-0.0.2" - sources."rimraf-2.2.8" ]; }) sources."minimist-1.2.0" @@ -5857,6 +5320,7 @@ in sources."bytes-3.0.0" (sources."http-errors-1.6.2" // { dependencies = [ + sources."depd-1.1.1" sources."inherits-2.0.3" sources."setprototypeof-1.0.3" ]; @@ -5873,8 +5337,8 @@ in 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."depd-1.1.2" + sources."encodeurl-1.0.2" sources."escape-html-1.0.3" sources."etag-1.8.1" (sources."finalhandler-1.1.0" // { @@ -5906,6 +5370,7 @@ in sources."destroy-1.0.4" (sources."http-errors-1.6.2" // { dependencies = [ + sources."depd-1.1.1" sources."inherits-2.0.3" sources."setprototypeof-1.0.3" ]; @@ -5957,7 +5422,7 @@ in ]; }) sources."path-is-absolute-1.0.1" - (sources."rc-1.2.2" // { + (sources."rc-1.2.4" // { dependencies = [ sources."deep-extend-0.4.2" sources."ini-1.3.5" @@ -5985,6 +5450,15 @@ in sources."nan-2.8.0" (sources."node-pre-gyp-0.6.39" // { dependencies = [ + sources."detect-libc-1.0.3" + (sources."hawk-3.1.3" // { + dependencies = [ + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."hoek-2.16.3" + sources."sntp-1.0.9" + ]; + }) (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -6098,12 +5572,12 @@ in dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" + sources."bcrypt-pbkdf-1.0.1" sources."dashdash-1.14.1" + sources."ecc-jsbn-0.1.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" ]; }) ]; @@ -6127,15 +5601,7 @@ in ]; }) 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."uuid-3.2.1" ]; }) (sources."rimraf-2.6.2" // { @@ -6168,8 +5634,7 @@ in }) ]; }) - sources."semver-5.4.1" - sources."detect-libc-1.0.3" + sources."semver-5.5.0" (sources."tar-2.2.1" // { dependencies = [ sources."block-stream-0.0.9" @@ -6232,6 +5697,15 @@ in sources."nan-2.8.0" (sources."node-pre-gyp-0.6.39" // { dependencies = [ + sources."detect-libc-1.0.3" + (sources."hawk-3.1.3" // { + dependencies = [ + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."hoek-2.16.3" + sources."sntp-1.0.9" + ]; + }) (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -6345,12 +5819,12 @@ in dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" + sources."bcrypt-pbkdf-1.0.1" sources."dashdash-1.14.1" + sources."ecc-jsbn-0.1.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" ]; }) ]; @@ -6374,15 +5848,7 @@ in ]; }) 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."uuid-3.2.1" ]; }) (sources."rimraf-2.6.2" // { @@ -6415,8 +5881,7 @@ in }) ]; }) - sources."semver-5.4.1" - sources."detect-libc-1.0.3" + sources."semver-5.5.0" (sources."tar-2.2.1" // { dependencies = [ sources."block-stream-0.0.9" @@ -6545,6 +6010,15 @@ in sha512 = "2cwrivwc0ha272cly9r61bbb14kkl1s1hsmn53yr88b6pfjqj512nac6c5rphc6ak88v8gpl1f879qdd3v7386103zzr7miibpmbhis"; }; dependencies = [ + sources."detect-libc-1.0.3" + (sources."hawk-3.1.3" // { + dependencies = [ + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."hoek-2.16.3" + sources."sntp-1.0.9" + ]; + }) (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -6607,7 +6081,7 @@ in sources."set-blocking-2.0.0" ]; }) - (sources."rc-1.2.2" // { + (sources."rc-1.2.4" // { dependencies = [ sources."deep-extend-0.4.2" sources."ini-1.3.5" @@ -6666,12 +6140,12 @@ in dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" + sources."bcrypt-pbkdf-1.0.1" sources."dashdash-1.14.1" + sources."ecc-jsbn-0.1.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" ]; }) ]; @@ -6695,15 +6169,7 @@ in ]; }) 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."uuid-3.2.1" ]; }) (sources."rimraf-2.6.2" // { @@ -6737,8 +6203,7 @@ in }) ]; }) - sources."semver-5.4.1" - sources."detect-libc-1.0.3" + sources."semver-5.5.0" (sources."tar-2.2.1" // { dependencies = [ sources."block-stream-0.0.9" @@ -6824,258 +6289,4 @@ in production = true; bypassCache = false; }; - 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.12.2" - (sources."is-my-json-valid-2.17.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; - bypassCache = false; - }; } \ 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 8f9e923fe2b..49380392bab 100644 --- a/pkgs/development/node-packages/node-packages-v6.json +++ b/pkgs/development/node-packages/node-packages-v6.json @@ -6,8 +6,10 @@ , "bower2nix" , "browserify" , "castnow" +, "clean-css" , "coffee-script" , "coinmon" +, "configurable-http-proxy" , "cordova" , "csslint" , "dat" @@ -48,6 +50,8 @@ , "karma" , { "kibana-authentication-proxy": "git://github.com/fangli/kibana-authentication-proxy.git" } , "lerna" +, "less" +, "less-plugin-clean-css" , "lcov-result-merger" , "livedown" , "live-server" @@ -76,6 +80,7 @@ , "pulp" , "quassel-webserver" , "react-tools" +, "react-native-cli" , "s3http" , "semver" , "serve" @@ -91,6 +96,7 @@ , "stylus" , "svgo" , "tern" +, "titanium" , "typescript" , "typings" , "uglify-js" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 325ad4ce28e..316693ecec0 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -1,763 +1,169 @@ -# This file has been generated by node2nix 1.5.0. Do not edit! +# This file has been generated by node2nix 1.5.1. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: let sources = { - "async-2.6.0" = { - name = "async"; - packageName = "async"; - version = "2.6.0"; + "@browserify/acorn5-object-spread-5.0.1" = { + name = "_at_browserify_slash_acorn5-object-spread"; + packageName = "@browserify/acorn5-object-spread"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.6.0.tgz"; - sha512 = "0zp4b5788400npi1ixjry5x3a4m21c8pnknk8v731rgnwnjbp5ijmfcf5ppmn1ap4a04md1s9dr8n9ygdvrmiai590v0k6dby1wc1y4"; + url = "https://registry.npmjs.org/@browserify/acorn5-object-spread/-/acorn5-object-spread-5.0.1.tgz"; + sha512 = "0l47lh2pz596qayh9mmg2x2zjvjm6phj6llj4465cc420fpsjpwbm4i67mkc7d3iylilxhrcs9mlyqm2cpc79xqvrm3f4hy70zr8l5h"; }; }; - "babel-core-6.26.0" = { - name = "babel-core"; - packageName = "babel-core"; - version = "6.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz"; - sha1 = "af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"; - }; - }; - "babel-generator-6.26.0" = { - name = "babel-generator"; - packageName = "babel-generator"; - version = "6.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.0.tgz"; - sha1 = "ac1ae20070b79f6e3ca1d3269613053774f20dc5"; - }; - }; - "babel-traverse-6.26.0" = { - name = "babel-traverse"; - packageName = "babel-traverse"; - version = "6.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz"; - sha1 = "46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"; - }; - }; - "babel-types-6.26.0" = { - name = "babel-types"; - packageName = "babel-types"; - version = "6.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz"; - sha1 = "a3b073f94ab49eb6fa55cd65227a334380632497"; - }; - }; - "babylon-6.18.0" = { - name = "babylon"; - packageName = "babylon"; - version = "6.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz"; - sha512 = "1qk460vyxfs08g8586jdc02wqzyy2y06596qcn1na9bz7yxra6vgh6177qf345xai0virpaz56bkpgmfcrd8yx5l2vjkn49y66h9xdb"; - }; - }; - "chmodr-1.0.2" = { - name = "chmodr"; - packageName = "chmodr"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/chmodr/-/chmodr-1.0.2.tgz"; - sha1 = "04662b932d0f02ec66deaa2b0ea42811968e3eb9"; - }; - }; - "colors-0.6.0-1" = { - name = "colors"; - packageName = "colors"; - version = "0.6.0-1"; - src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-0.6.0-1.tgz"; - sha1 = "6dbb68ceb8bc60f2b313dcc5ce1599f06d19e67a"; - }; - }; - "commander-0.6.1" = { - name = "commander"; - packageName = "commander"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz"; - sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"; - }; - }; - "deasync-0.1.12" = { - name = "deasync"; - packageName = "deasync"; - version = "0.1.12"; - src = fetchurl { - url = "https://registry.npmjs.org/deasync/-/deasync-0.1.12.tgz"; - sha512 = "1vnaqczk6nr30xzzf6qxsaa2fj00z80rr6xrb7mxwn0d41zdwrgffk5vizwf6b17bps2zdr4f87s2mdmnixhsfh41vrh185ixi9r5l2"; - }; - }; - "ejs-2.3.4" = { - name = "ejs"; - packageName = "ejs"; - version = "2.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/ejs/-/ejs-2.3.4.tgz"; - sha1 = "3c76caa09664b3583b0037af9dc136e79ec68b98"; - }; - }; - "fs-extra-3.0.1" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz"; - sha1 = "3794f378c58b342ea7dbbb23095109c4b3b62291"; - }; - }; - "global-paths-0.1.2" = { - name = "global-paths"; - packageName = "global-paths"; + "@ionic/cli-framework-0.1.2" = { + name = "_at_ionic_slash_cli-framework"; + packageName = "@ionic/cli-framework"; version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/global-paths/-/global-paths-0.1.2.tgz"; - sha1 = "8869ecb2a8c80995be8a459f27ae5db7a0b03299"; + url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-0.1.2.tgz"; + sha512 = "265kszf17mdz60zpfrj5i47lqwwgp6h1b7i8vymig1pnlqd3lnljibxvd2d1rfa3827ks435k9wws458z3dk7fyq8wfmzmv8fk9qjhh"; }; }; - "jsonlint-1.5.1" = { - name = "jsonlint"; - packageName = "jsonlint"; - version = "1.5.1"; + "@ionic/cli-utils-1.19.1" = { + name = "_at_ionic_slash_cli-utils"; + packageName = "@ionic/cli-utils"; + version = "1.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsonlint/-/jsonlint-1.5.1.tgz"; - sha1 = "3cf436dcc9f3477ef3d7fa55a5bdf6d893f1c6c6"; + url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-1.19.1.tgz"; + sha512 = "3anhsxw0zyzi9j4kfnqxg2h4fxqjyw6pabb75z5b17hmksmjcyy6psic9fziyrgllp5rqksadqdzbkbb6lrviclhiz26sj8f7gjfi8r"; }; }; - "moment-2.17.1" = { - name = "moment"; - packageName = "moment"; - version = "2.17.1"; + "@ionic/discover-0.4.0" = { + name = "_at_ionic_slash_discover"; + packageName = "@ionic/discover"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.17.1.tgz"; - sha1 = "fed9506063f36b10f066c8b59a144d7faebe1d82"; + url = "https://registry.npmjs.org/@ionic/discover/-/discover-0.4.0.tgz"; + sha512 = "0x6yxaj489n9lbq0kfvdnpj1pacgv3r0vk5cnlla7w1jkvxzwaf0vbcnwd9gdaj6zkq69wm1g4zjvj37pyn1lajjkzl1f50l7cnr2ad"; }; }; - "node.extend-1.0.10" = { - name = "node.extend"; - packageName = "node.extend"; - version = "1.0.10"; + "@sindresorhus/is-0.7.0" = { + name = "_at_sindresorhus_slash_is"; + packageName = "@sindresorhus/is"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/node.extend/-/node.extend-1.0.10.tgz"; - sha1 = "3269bddf81c54535f408abc784c32b0d2bd55f6f"; + url = "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz"; + sha512 = "2ilygr40l2yqbk6lix4xnnnqsq6fxa6sysdxg49bg1ax5gzhwy3bcjbdlk7lndgh9055slpx6fybs3p8mhvbsnnjkmkqzrfy8l5mn1q"; }; }; - "pkginfo-0.2.2" = { - name = "pkginfo"; - packageName = "pkginfo"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.2.tgz"; - sha1 = "97e1100dbbb275ff6fab583a256a7eea85120c8e"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "xml2tss-0.0.5" = { - name = "xml2tss"; - packageName = "xml2tss"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/xml2tss/-/xml2tss-0.0.5.tgz"; - sha1 = "d76a310d6b8a7ba9e4825bb3d43f5427e9fe8f6e"; - }; - }; - "xmldom-0.1.19" = { - name = "xmldom"; - packageName = "xmldom"; - version = "0.1.19"; - src = fetchurl { - url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz"; - sha1 = "631fc07776efd84118bf25171b37ed4d075a0abc"; - }; - }; - "lodash-4.17.4" = { - name = "lodash"; - packageName = "lodash"; - version = "4.17.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"; - sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae"; - }; - }; - "babel-code-frame-6.26.0" = { - name = "babel-code-frame"; - packageName = "babel-code-frame"; - version = "6.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz"; - sha1 = "63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"; - }; - }; - "babel-helpers-6.24.1" = { - name = "babel-helpers"; - packageName = "babel-helpers"; - version = "6.24.1"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz"; - sha1 = "3471de9caec388e5c850e597e58a26ddf37602b2"; - }; - }; - "babel-messages-6.23.0" = { - name = "babel-messages"; - packageName = "babel-messages"; - version = "6.23.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz"; - sha1 = "f3cdf4703858035b2a2951c6ec5edf6c62f2630e"; - }; - }; - "babel-register-6.26.0" = { - name = "babel-register"; - packageName = "babel-register"; - version = "6.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz"; - sha1 = "6ed021173e2fcb486d7acb45c6009a856f647071"; - }; - }; - "babel-runtime-6.26.0" = { - name = "babel-runtime"; - packageName = "babel-runtime"; - version = "6.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz"; - sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe"; - }; - }; - "babel-template-6.26.0" = { - name = "babel-template"; - packageName = "babel-template"; - version = "6.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz"; - sha1 = "de03e2d16396b069f46dd9fff8521fb1a0e35e02"; - }; - }; - "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/convert-source-map/-/convert-source-map-1.5.1.tgz"; - sha1 = "b8278097b9bc229365de5c62cf5fcaed8b5599e5"; - }; - }; - "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"; - }; - }; - "json5-0.5.1" = { - name = "json5"; - packageName = "json5"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz"; - sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; - }; - }; - "minimatch-3.0.4" = { - name = "minimatch"; - packageName = "minimatch"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8"; - }; - }; - "path-is-absolute-1.0.1" = { - name = "path-is-absolute"; - packageName = "path-is-absolute"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; - }; - }; - "private-0.1.8" = { - name = "private"; - packageName = "private"; - version = "0.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/private/-/private-0.1.8.tgz"; - sha512 = "2dgznnpxsgy9bgp4kfby1is72blvca4lhmqb3nlja8yiig1v52c12p5yw0aag8jqazhkqvihpxmqf9gsjlg5dr1jb56jxzgnqrazy2n"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "chalk-1.1.3" = { - name = "chalk"; - packageName = "chalk"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; - sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; - }; - }; - "esutils-2.0.2" = { - name = "esutils"; - packageName = "esutils"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz"; - sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"; - }; - }; - "js-tokens-3.0.2" = { - name = "js-tokens"; - packageName = "js-tokens"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz"; - sha1 = "9866df395102130e38f7f996bceb65443209c25b"; - }; - }; - "ansi-styles-2.2.1" = { - name = "ansi-styles"; - packageName = "ansi-styles"; + "@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/ansi-styles/-/ansi-styles-2.2.1.tgz"; - sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; + url = "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.1.tgz"; + sha512 = "2fv2qaz90rp6ib2s45ix0p3a4bd6yl6k94k1kkhw7w4s2aa5mqc6chppkf6pfvsz1l6phh7y0xswyfyzjgny7qzascch8c7ws20a0r4"; }; }; - "escape-string-regexp-1.0.5" = { - name = "escape-string-regexp"; - packageName = "escape-string-regexp"; + "@types/node-8.5.9" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "8.5.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-8.5.9.tgz"; + sha512 = "2j38fqqziiv6m51w16lz6lgivrkycvn4nwch7sdpg32hbl5kv5m2ngg4y4jrf0v1s7iryi5gyh9729b8l1p48cf9hf0gj567h13grxk"; + }; + }; + "@types/node-9.3.0" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "9.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-9.3.0.tgz"; + sha512 = "0mhmzddyv8rhkha7ibpbsa5dfygzaa90438aqzpg9w7d31n093a7spx2zg4zfki4qrab71xrfb381hmqajn826cnrw9kc7kv2y5zl60"; + }; + }; + "@types/request-2.0.13" = { + name = "_at_types_slash_request"; + packageName = "@types/request"; + version = "2.0.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/request/-/request-2.0.13.tgz"; + sha512 = "3gbwnwgvm7d4jwixg004j635l89kvd2vll1wkv0rdlz5v8biqwnmgfg67nbj3lccvn4rhbalwpkrgvqz66j0n3d20fs02xyxr0z8x80"; + }; + }; + "@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/@types/tough-cookie/-/tough-cookie-2.3.2.tgz"; + sha512 = "1nbw2qb74417hfamhd2a4yxf6ls3rjy92lv847mnhj7dxfla54kiwwdi64bnvcn7ysn5spkfakq4ssknb78qgz5nhd926whpdm6drdw"; + }; + }; + "@types/uuid-3.4.3" = { + name = "_at_types_slash_uuid"; + packageName = "@types/uuid"; + version = "3.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.3.tgz"; + sha512 = "1psrs8sjpmhz8sz2zjkkd7743vzdi7q7vcj8p219q1pkfawr619rl1m5pczp69hbm1769kn8zwlbayjylhl7an5hkvkdd2bi04lpx75"; + }; + }; + "@zeit/check-updates-1.0.5" = { + name = "_at_zeit_slash_check-updates"; + packageName = "@zeit/check-updates"; version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + url = "https://registry.npmjs.org/@zeit/check-updates/-/check-updates-1.0.5.tgz"; + sha512 = "3a4h5bdrpjkv8rjvyafqf9b3wnyynzi3gisz92k37c35nvawlicsdv4svwnsxfqvhjhqn3lab6rjmkkivvdijr41vm3r048pp5dm1s0"; }; }; - "has-ansi-2.0.0" = { - name = "has-ansi"; - packageName = "has-ansi"; - version = "2.0.0"; + "CSSselect-0.4.1" = { + name = "CSSselect"; + packageName = "CSSselect"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; - sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + url = "https://registry.npmjs.org/CSSselect/-/CSSselect-0.4.1.tgz"; + sha1 = "f8ab7e1f8418ce63cda6eb7bd778a85d7ec492b2"; }; }; - "strip-ansi-3.0.1" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "3.0.1"; + "CSSwhat-0.4.7" = { + name = "CSSwhat"; + packageName = "CSSwhat"; + version = "0.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; - sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + url = "https://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.7.tgz"; + sha1 = "867da0ff39f778613242c44cfea83f0aa4ebdf9b"; }; }; - "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"; - }; - }; - "core-js-2.5.3" = { - name = "core-js"; - packageName = "core-js"; - version = "2.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz"; - sha1 = "8acc38345824f16d8365b7c9b4259168e8ed603e"; - }; - }; - "home-or-tmp-2.0.0" = { - name = "home-or-tmp"; - packageName = "home-or-tmp"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz"; - sha1 = "e36c3f2d2cae7d746a857e38d18d5f32a7882db8"; - }; - }; - "mkdirp-0.5.1" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; - }; - }; - "source-map-support-0.4.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"; - }; - }; - "os-homedir-1.0.2" = { - name = "os-homedir"; - packageName = "os-homedir"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; - sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; - }; - }; - "os-tmpdir-1.0.2" = { - name = "os-tmpdir"; - packageName = "os-tmpdir"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; - sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; - }; - }; - "minimist-0.0.8" = { - name = "minimist"; - packageName = "minimist"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; - }; - }; - "regenerator-runtime-0.11.1" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"; - sha512 = "03d4l8l8cyywh93wf5vw84lq56jh1b1d7jll4ny4z060j9hvx7w5q3q0b8q227jm93749k1c9h86r2pz0bm2xq5vp14g3r2kbvqc2rj"; - }; - }; - "ms-2.0.0" = { - name = "ms"; - packageName = "ms"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; - sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; - }; - }; - "brace-expansion-1.1.8" = { - name = "brace-expansion"; - packageName = "brace-expansion"; - version = "1.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz"; - sha1 = "c07b211c7c952ec1f8efd51a77ef0d1d3990a292"; - }; - }; - "balanced-match-1.0.0" = { - name = "balanced-match"; - packageName = "balanced-match"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; - sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; - }; - }; - "concat-map-0.0.1" = { - name = "concat-map"; - packageName = "concat-map"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; - }; - }; - "detect-indent-4.0.0" = { - name = "detect-indent"; - packageName = "detect-indent"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz"; - sha1 = "f76d064352cdf43a1cb6ce619c4ee3a9475de208"; - }; - }; - "jsesc-1.3.0" = { - name = "jsesc"; - packageName = "jsesc"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz"; - sha1 = "46c3fec8c1892b12b0833db9bc7622176dbab34b"; - }; - }; - "trim-right-1.0.1" = { - name = "trim-right"; - packageName = "trim-right"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz"; - sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003"; - }; - }; - "repeating-2.0.1" = { - name = "repeating"; - packageName = "repeating"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"; - sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; - }; - }; - "is-finite-1.0.2" = { - name = "is-finite"; - packageName = "is-finite"; - 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"; - }; - }; - "globals-9.18.0" = { - name = "globals"; - packageName = "globals"; - version = "9.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz"; - sha512 = "18psd5ig23apaw07k4mma3z1hi2ndfwsqkm05hxashnf5lf7mpfs6kjiircc0x3x3q15j2x2j4zfzsqacxvfsmw40zjchn44bfccjab"; - }; - }; - "invariant-2.2.2" = { - name = "invariant"; - packageName = "invariant"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz"; - sha1 = "9e1f56ac0acdb6bf303306f338be3b204ae60360"; - }; - }; - "loose-envify-1.3.1" = { - name = "loose-envify"; - packageName = "loose-envify"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz"; - sha1 = "d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"; - }; - }; - "to-fast-properties-1.0.3" = { - name = "to-fast-properties"; - packageName = "to-fast-properties"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz"; - sha1 = "b83571fa4d8c25b82e231b06e3a3055de4ca1a47"; - }; - }; - "bindings-1.2.1" = { - name = "bindings"; - packageName = "bindings"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"; - sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; - }; - }; - "nan-2.8.0" = { - name = "nan"; - packageName = "nan"; - version = "2.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz"; - sha1 = "ed715f3fe9de02b57a5e6252d90a96675e1f085a"; - }; - }; - "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"; - }; - }; - "jsonfile-3.0.1" = { - name = "jsonfile"; - packageName = "jsonfile"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz"; - sha1 = "a5ecc6f65f53f662c4415c7675a0331d0992ec66"; - }; - }; - "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"; - }; - }; - "array-unique-0.2.1" = { - name = "array-unique"; - packageName = "array-unique"; + "JSONSelect-0.2.1" = { + name = "JSONSelect"; + packageName = "JSONSelect"; version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz"; - sha1 = "a1d97ccafcbc2625cc70fadceb36a50c58b01a53"; + url = "https://registry.npmjs.org/JSONSelect/-/JSONSelect-0.2.1.tgz"; + sha1 = "415418a526d33fe31d74b4defa3c836d485ec203"; }; }; - "global-modules-0.2.3" = { - name = "global-modules"; - packageName = "global-modules"; - version = "0.2.3"; + "JSONStream-0.10.0" = { + name = "JSONStream"; + packageName = "JSONStream"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz"; - sha1 = "ea5a3bed42c6d6ce995a4f8a1269b5dae223828d"; + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-0.10.0.tgz"; + sha1 = "74349d0d89522b71f30f0a03ff9bd20ca6f12ac0"; }; }; - "is-windows-0.1.1" = { - name = "is-windows"; - packageName = "is-windows"; - version = "0.1.1"; + "JSONStream-0.8.4" = { + name = "JSONStream"; + packageName = "JSONStream"; + version = "0.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-windows/-/is-windows-0.1.1.tgz"; - sha1 = "be310715431cfabccc54ab3951210fa0b6d01abe"; + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz"; + sha1 = "91657dfe6ff857483066132b4618b62e8f4887bd"; }; }; - "global-prefix-0.1.5" = { - name = "global-prefix"; - packageName = "global-prefix"; - version = "0.1.5"; + "JSONStream-1.3.2" = { + name = "JSONStream"; + packageName = "JSONStream"; + version = "1.3.2"; 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.5" = { - name = "ini"; - packageName = "ini"; - version = "1.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; - sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5"; - }; - }; - "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"; - }; - }; - "nomnom-1.8.1" = { - name = "nomnom"; - packageName = "nomnom"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz"; - sha1 = "2151f722472ba79e50a76fc125bb8c8f2e4dc2a7"; + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz"; + sha1 = "c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea"; }; }; "JSV-4.0.2" = { @@ -769,301 +175,13 @@ let sha1 = "d077f6825571f82132f9dffaed587b4029feff57"; }; }; - "underscore-1.6.0" = { - name = "underscore"; - packageName = "underscore"; - version = "1.6.0"; + "abbrev-1.0.9" = { + name = "abbrev"; + packageName = "abbrev"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"; - sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8"; - }; - }; - "chalk-0.4.0" = { - name = "chalk"; - packageName = "chalk"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz"; - sha1 = "5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"; - }; - }; - "has-color-0.1.7" = { - name = "has-color"; - packageName = "has-color"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz"; - sha1 = "67144a5260c34fc3cca677d041daf52fe7b78b2f"; - }; - }; - "ansi-styles-1.0.0" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz"; - sha1 = "cb102df1c56f5123eab8b67cd7b98027a0279178"; - }; - }; - "strip-ansi-0.1.1" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz"; - sha1 = "39e8a98d044d150660abe4a6808acf70bb7bc991"; - }; - }; - "is-0.3.0" = { - name = "is"; - packageName = "is"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is/-/is-0.3.0.tgz"; - sha1 = "a8f71dfc8a6e28371627f26c929098c6f4d5d5d7"; - }; - }; - "path-parse-1.0.5" = { - name = "path-parse"; - packageName = "path-parse"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz"; - sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"; - }; - }; - "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/ensure-posix-path/-/ensure-posix-path-1.0.2.tgz"; - sha1 = "a65b3e42d0b71cfc585eb774f9943c8d9b91b0c2"; - }; - }; - "matcher-collection-1.0.5" = { - name = "matcher-collection"; - packageName = "matcher-collection"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/matcher-collection/-/matcher-collection-1.0.5.tgz"; - sha512 = "1hfvbsx85xqrw6g0k7rkqwngl8b2nwj92ax10ilx3b4lma2mcp8q6zpvam1sffgqsssa9d13cj7prrzg5c00mf0c8q92w59m36ach4x"; - }; - }; - "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"; - }; - }; - "sax-0.5.8" = { - name = "sax"; - packageName = "sax"; - version = "0.5.8"; - src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz"; - sha1 = "d472db228eb331c2506b0e8c15524adb939d12c1"; - }; - }; - "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/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz"; - sha1 = "04a106672c18b085ab774d983dfa3ea138f22205"; - }; - }; - "commander-2.12.2" = { - name = "commander"; - packageName = "commander"; - version = "2.12.2"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz"; - sha512 = "007wb3baahjcrv17kgxryqjlsyr3c3kl2y07p85m4ia78pba9xyjr3cgi95jjrwq8qq550s78hj06f7z0ab8ssrxk6w06afjsmxln84"; - }; - }; - "cuint-0.2.2" = { - name = "cuint"; - packageName = "cuint"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz"; - sha1 = "408086d409550c2631155619e9fa7bcadc3b991b"; - }; - }; - "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"; - }; - }; - "mksnapshot-0.3.1" = { - name = "mksnapshot"; - packageName = "mksnapshot"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mksnapshot/-/mksnapshot-0.3.1.tgz"; - sha1 = "2501c05657436d742ce958a4ff92c77e40dd37e6"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "decompress-zip-0.3.0" = { - name = "decompress-zip"; - packageName = "decompress-zip"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decompress-zip/-/decompress-zip-0.3.0.tgz"; - sha1 = "ae3bcb7e34c65879adfe77e19c30f86602b4bdb0"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "binary-0.3.0" = { - name = "binary"; - packageName = "binary"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz"; - sha1 = "9f60553bc5ce8c3386f3b553cff47462adecaa79"; - }; - }; - "mkpath-0.1.0" = { - name = "mkpath"; - packageName = "mkpath"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz"; - sha1 = "7554a6f8d871834cc97b5462b122c4c124d6de91"; - }; - }; - "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"; - }; - }; - "q-1.5.1" = { - name = "q"; - packageName = "q"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/q/-/q-1.5.1.tgz"; - sha1 = "7e32f75b41381291d04611f1bf14109ac00651d7"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "chainsaw-0.1.0" = { - name = "chainsaw"; - packageName = "chainsaw"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz"; - sha1 = "5eab50b28afe58074d0d58291388828b5e5fbc98"; - }; - }; - "buffers-0.1.1" = { - name = "buffers"; - packageName = "buffers"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"; - sha1 = "b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb"; - }; - }; - "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"; + url = "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz"; + sha1 = "91b4792588a7738c25f35dd6f63752a2f8776135"; }; }; "abbrev-1.1.1" = { @@ -1075,85 +193,1363 @@ let sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy"; }; }; - "core-util-is-1.0.2" = { - name = "core-util-is"; - packageName = "core-util-is"; - version = "1.0.2"; + "abstract-leveldown-0.12.4" = { + name = "abstract-leveldown"; + packageName = "abstract-leveldown"; + version = "0.12.4"; src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + url = "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-0.12.4.tgz"; + sha1 = "29e18e632e60e4e221d5810247852a63d7b2e410"; }; }; - "isarray-0.0.1" = { - name = "isarray"; - packageName = "isarray"; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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-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"; + }; + }; + "acorn-3.3.0" = { + name = "acorn"; + packageName = "acorn"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz"; + sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a"; + }; + }; + "acorn-4.0.13" = { + name = "acorn"; + packageName = "acorn"; + version = "4.0.13"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz"; + sha1 = "105495ae5361d697bd195c825192e1ad7f253787"; + }; + }; + "acorn-5.3.0" = { + name = "acorn"; + packageName = "acorn"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-5.3.0.tgz"; + sha512 = "197zp88clmmxjyvhahqv32kv07q825hf87facxaq8qmvb1swfqnpyy4398dl56sr2fa44f7gjpzzlwy1szqzwww6746y3kmwb6gxs31"; + }; + }; + "acorn-dynamic-import-2.0.2" = { + name = "acorn-dynamic-import"; + packageName = "acorn-dynamic-import"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz"; + sha1 = "c752bd210bef679501b6c6cb7fc84f8f47158cc4"; + }; + }; + "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"; + }; + }; + "acorn-globals-3.1.0" = { + name = "acorn-globals"; + packageName = "acorn-globals"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-3.1.0.tgz"; + sha1 = "fd8270f71fbb4996b004fa880ee5d46573a731bf"; + }; + }; + "acorn-jsx-3.0.1" = { + name = "acorn-jsx"; + packageName = "acorn-jsx"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz"; + sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b"; + }; + }; + "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/isarray/-/isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + url = "https://registry.npmjs.org/active-x-obfuscator/-/active-x-obfuscator-0.0.1.tgz"; + sha1 = "089b89b37145ff1d9ec74af6530be5526cae1f1a"; }; }; - "string_decoder-0.10.31" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "0.10.31"; + "adal-node-0.1.21" = { + name = "adal-node"; + packageName = "adal-node"; + version = "0.1.21"; src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + url = "https://registry.npmjs.org/adal-node/-/adal-node-0.1.21.tgz"; + sha1 = "11c58e427b7e83d9ef2d77c9c3a2a60fbb0b6cc8"; }; }; - "nopt-1.0.10" = { - name = "nopt"; - packageName = "nopt"; - version = "1.0.10"; + "adal-node-0.1.27" = { + name = "adal-node"; + packageName = "adal-node"; + version = "0.1.27"; src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz"; - sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee"; + url = "https://registry.npmjs.org/adal-node/-/adal-node-0.1.27.tgz"; + sha1 = "42252337bc1d01aff6b3c26138a08a3d4f420b0e"; }; }; - "jsonfile-2.4.0" = { - name = "jsonfile"; - packageName = "jsonfile"; - version = "2.4.0"; + "adbkit-2.11.0" = { + name = "adbkit"; + packageName = "adbkit"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz"; - sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"; + url = "https://registry.npmjs.org/adbkit/-/adbkit-2.11.0.tgz"; + sha512 = "1yf29dq993f047nmbm3yv9qsla7z3s9xn61jh43lzlgbpcxw36p2jn1ahv53i8ik69fkb5l7mqi6r1xm6qfzagz0jm2i64r8y2d8swg"; }; }; - "klaw-1.3.1" = { - name = "klaw"; - packageName = "klaw"; - version = "1.3.1"; + "adbkit-logcat-1.1.0" = { + name = "adbkit-logcat"; + packageName = "adbkit-logcat"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz"; - sha1 = "4088433b46b3b1ba259d78785d8e96f73ba02439"; + url = "https://registry.npmjs.org/adbkit-logcat/-/adbkit-logcat-1.1.0.tgz"; + sha1 = "01d7f9b0cef9093a30bcb3b007efff301508962f"; }; }; - "rimraf-2.6.2" = { - name = "rimraf"; - packageName = "rimraf"; - version = "2.6.2"; + "adbkit-monkey-1.0.1" = { + name = "adbkit-monkey"; + packageName = "adbkit-monkey"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz"; - sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn"; + url = "https://registry.npmjs.org/adbkit-monkey/-/adbkit-monkey-1.0.1.tgz"; + sha1 = "f291be701a2efc567a63fc7aa6afcded31430be1"; }; }; - "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"; + "add-stream-1.0.0" = { + name = "add-stream"; + packageName = "add-stream"; 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/add-stream/-/add-stream-1.0.0.tgz"; + sha1 = "6a7990437ca736d5e1288db92bd3266d5f5cb2aa"; + }; + }; + "addons-linter-0.33.0" = { + name = "addons-linter"; + packageName = "addons-linter"; + version = "0.33.0"; + src = fetchurl { + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-0.33.0.tgz"; + sha1 = "0b2a75a6650e743fe22a34ec7cfd4647fd062efc"; + }; + }; + "addr-to-ip-port-1.4.2" = { + name = "addr-to-ip-port"; + packageName = "addr-to-ip-port"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/addr-to-ip-port/-/addr-to-ip-port-1.4.2.tgz"; + sha1 = "7e46ff1f26b7a9f5e33fd839d57aef6303b4c692"; + }; + }; + "address-1.0.3" = { + name = "address"; + packageName = "address"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/address/-/address-1.0.3.tgz"; + sha512 = "27dii2i2aw9z3pw09110914532z5dfywxp8gbrfr14737cwy8m0jysam3abmfsbp8g51sd02ys57j5snwly3zfd0vrbli4109rni7ng"; + }; + }; + "addressparser-0.1.3" = { + name = "addressparser"; + packageName = "addressparser"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/addressparser/-/addressparser-0.1.3.tgz"; + sha1 = "9e9ab43d257e1ae784e1df5f580c9f5240f58874"; + }; + }; + "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"; + }; + }; + "addressparser-1.0.1" = { + name = "addressparser"; + packageName = "addressparser"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz"; + sha1 = "47afbe1a2a9262191db6838e4fd1d39b40821746"; + }; + }; + "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"; + }; + }; + "after-0.8.1" = { + name = "after"; + packageName = "after"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/after/-/after-0.8.1.tgz"; + sha1 = "ab5d4fb883f596816d3515f8f791c0af486dd627"; + }; + }; + "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"; + }; + }; + "agent-base-2.1.1" = { + name = "agent-base"; + packageName = "agent-base"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz"; + sha1 = "d6de10d5af6132d5bd692427d46fc538539094c7"; + }; + }; + "agent-base-4.2.0" = { + name = "agent-base"; + packageName = "agent-base"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/agent-base/-/agent-base-4.2.0.tgz"; + sha512 = "0i6q0c347f7z5c56gi1cggjiwvdhl3p9zfsysq66gqggk3prlqildnpva900rz8f8gfc8rav8jk7m51z9dhias0z7v3rnzyjm9pzr3k"; + }; + }; + "aggregate-error-1.0.0" = { + name = "aggregate-error"; + packageName = "aggregate-error"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-1.0.0.tgz"; + sha1 = "888344dad0220a72e3af50906117f48771925fac"; + }; + }; + "airplay-js-0.2.16" = { + name = "airplay-js"; + packageName = "airplay-js"; + version = "0.2.16"; + src = fetchurl { + url = "https://registry.npmjs.org/airplay-js/-/airplay-js-0.2.16.tgz"; + sha1 = "48566d5fa55a921d80187ad946f7e8f7555902a1"; + }; + }; + "airplay-protocol-2.0.2" = { + name = "airplay-protocol"; + packageName = "airplay-protocol"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/airplay-protocol/-/airplay-protocol-2.0.2.tgz"; + sha1 = "b5b2a7137331f5545acbe196ba5693c13238fc5e"; + }; + }; + "airplayer-2.0.0" = { + name = "airplayer"; + packageName = "airplayer"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/airplayer/-/airplayer-2.0.0.tgz"; + sha1 = "7ab62d23b96d44234138aec1281d2e67ef190259"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "ajv-keywords-1.5.1" = { + name = "ajv-keywords"; + packageName = "ajv-keywords"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz"; + sha1 = "314dd0a4b3368fad3dfcdc54ede6171b886daf3c"; + }; + }; + "ajv-keywords-2.1.1" = { + name = "ajv-keywords"; + packageName = "ajv-keywords"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz"; + sha1 = "617997fc5f60576894c435f940d819e135b80762"; + }; + }; + "aliasify-2.1.0" = { + name = "aliasify"; + packageName = "aliasify"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aliasify/-/aliasify-2.1.0.tgz"; + sha1 = "7c30825b9450b9e6185ba27533eaf6e2067d4b42"; + }; + }; + "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"; + }; + }; + "amqplib-0.5.2" = { + name = "amqplib"; + packageName = "amqplib"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/amqplib/-/amqplib-0.5.2.tgz"; + sha512 = "0h54i1d01av3cd2z1hv2nkc5r8za54nmmi2j0678ly7m4w9rr6619b915lgpqapqgakscwpmrav3ni94h34gqhrm53xpjfvlarq5ncp"; + }; + }; + "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/anchor-markdown-header/-/anchor-markdown-header-0.5.7.tgz"; + sha1 = "045063d76e6a1f9cd327a57a0126aa0fdec371a7"; + }; + }; + "ansi-0.3.1" = { + name = "ansi"; + packageName = "ansi"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz"; + sha1 = "0c42d4fb17160d5a9af1e484bace1c66922c1b21"; + }; + }; + "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-color-0.2.1" = { + name = "ansi-color"; + packageName = "ansi-color"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-color/-/ansi-color-0.2.1.tgz"; + sha1 = "3e75c037475217544ed763a8db5709fa9ae5bf9a"; + }; + }; + "ansi-diff-stream-1.2.0" = { + name = "ansi-diff-stream"; + packageName = "ansi-diff-stream"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-diff-stream/-/ansi-diff-stream-1.2.0.tgz"; + sha1 = "eb325c20ac3623ecd592011a9295d76d97de460e"; + }; + }; + "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.0.0" = { + name = "ansi-escapes"; + packageName = "ansi-escapes"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz"; + sha512 = "06szfav8g7xywvqsis16nnkjqs2snhv37r4m53l1ax8k2sahvqv9id2klam32jajqd08ylw8g9wbcjr971igx6vh8idan76drrjby9v"; + }; + }; + "ansi-gray-0.1.1" = { + name = "ansi-gray"; + packageName = "ansi-gray"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz"; + sha1 = "2962cf54ec9792c48510a3deb524436861ef7251"; + }; + }; + "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"; + }; + }; + "ansi-regex-1.1.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"; + sha1 = "41c847194646375e6a1a5d10c3ca054ef9fc980d"; + }; + }; + "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-1.0.0" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz"; + sha1 = "cb102df1c56f5123eab8b67cd7b98027a0279178"; + }; + }; + "ansi-styles-1.1.0" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"; + sha1 = "eaecbf66cd706882760b2f4691582b8f55d7a7de"; + }; + }; + "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.0" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz"; + sha512 = "2x19fs1qvg7ifsdvii4g8kqpa5hir1lm0k0y0fz6dhm5c8gh4z9il4wqczl078p2ikmrav23dmj86cxy8y1j22k4mv59d8qq6c8wx1n"; + }; + }; + "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"; + }; + }; + "ansicolors-0.3.2" = { + name = "ansicolors"; + packageName = "ansicolors"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz"; + sha1 = "665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"; + }; + }; + "any-promise-1.3.0" = { + name = "any-promise"; + packageName = "any-promise"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz"; + sha1 = "abc6afeedcea52e809cdc0376aed3ce39635d17f"; + }; + }; + "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"; + }; + }; + "apache-crypt-1.2.1" = { + name = "apache-crypt"; + packageName = "apache-crypt"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/apache-crypt/-/apache-crypt-1.2.1.tgz"; + sha1 = "d6fc72aa6d27d99c95a94fd188d731eefffa663c"; + }; + }; + "apache-md5-1.1.2" = { + name = "apache-md5"; + packageName = "apache-md5"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/apache-md5/-/apache-md5-1.1.2.tgz"; + sha1 = "ee49736b639b4f108b6e9e626c6da99306b41692"; + }; + }; + "append-0.1.1" = { + name = "append"; + packageName = "append"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/append/-/append-0.1.1.tgz"; + sha1 = "7e5dd327747078d877286fbb624b1e8f4d2b396b"; + }; + }; + "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"; + }; + }; + "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/appendable-cli-menu/-/appendable-cli-menu-2.0.0.tgz"; + sha1 = "dcfca9e509300e4c3b2d467965fe50c56fc75e66"; + }; + }; + "applicationinsights-0.16.0" = { + name = "applicationinsights"; + packageName = "applicationinsights"; + version = "0.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.16.0.tgz"; + sha1 = "e02dafb10cf573c19b429793c87797d6404f0ee3"; + }; + }; + "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"; + }; + }; + "arch-2.1.0" = { + name = "arch"; + packageName = "arch"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arch/-/arch-2.1.0.tgz"; + sha1 = "3613aa46149064b3c1f0607919bf1d4786e82889"; + }; + }; + "archiver-2.1.1" = { + name = "archiver"; + packageName = "archiver"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/archiver/-/archiver-2.1.1.tgz"; + sha1 = "ff662b4a78201494a3ee544d3a33fe7496509ebc"; + }; + }; + "archiver-utils-1.3.0" = { + name = "archiver-utils"; + packageName = "archiver-utils"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/archiver-utils/-/archiver-utils-1.3.0.tgz"; + sha1 = "e50b4c09c70bf3d680e32ff1b7994e9f9d895174"; + }; + }; + "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"; + }; + }; + "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-0.1.15" = { + name = "argparse"; + packageName = "argparse"; + version = "0.1.15"; + src = fetchurl { + url = "https://registry.npmjs.org/argparse/-/argparse-0.1.15.tgz"; + sha1 = "28a1f72c43113e763220e5708414301c8840f0a1"; + }; + }; + "argparse-0.1.16" = { + name = "argparse"; + packageName = "argparse"; + version = "0.1.16"; + src = fetchurl { + url = "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz"; + sha1 = "cfd01e0fbba3d6caed049fbd758d40f65196f57c"; + }; + }; + "argparse-1.0.4" = { + name = "argparse"; + packageName = "argparse"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/argparse/-/argparse-1.0.4.tgz"; + sha1 = "2b12247b933001971addcbfe4e67d20fd395bbf4"; + }; + }; + "argparse-1.0.9" = { + name = "argparse"; + packageName = "argparse"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz"; + sha1 = "73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"; + }; + }; + "args-3.0.8" = { + name = "args"; + packageName = "args"; + version = "3.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/args/-/args-3.0.8.tgz"; + sha512 = "26h2nssgwzgc9y1mywgjcx2rbbkxlpx23zj9gh81bayjr8522zi78rwrhpkkqwh7dwqx6mv8gphcx8zyv3vm8hxw5s89kjlzm66k7y9"; + }; + }; + "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-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-filter-0.0.1" = { + name = "array-filter"; + packageName = "array-filter"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz"; + sha1 = "7da8cf2e26628ed732803581fd21f67cacd2eeec"; + }; + }; + "array-find-0.1.1" = { + name = "array-find"; + packageName = "array-find"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-find/-/array-find-0.1.1.tgz"; + sha1 = "dc813845ad5a9afc35cb92b786c878d81b5b82ce"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "array-flatten-2.1.1" = { + name = "array-flatten"; + packageName = "array-flatten"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.1.tgz"; + sha1 = "426bb9da84090c1838d812c8150af20a8331e296"; + }; + }; + "array-from-2.1.1" = { + name = "array-from"; + packageName = "array-from"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz"; + sha1 = "cfe9d8c26628b9dc5aecc62a9f5d8f1f352c1195"; + }; + }; + "array-ify-1.0.0" = { + name = "array-ify"; + packageName = "array-ify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz"; + sha1 = "9e528762b4a9066ad163a6962a364418e9626ece"; + }; + }; + "array-indexofobject-0.0.1" = { + name = "array-indexofobject"; + packageName = "array-indexofobject"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-indexofobject/-/array-indexofobject-0.0.1.tgz"; + sha1 = "aaa128e62c9b3c358094568c219ff64fe489d42a"; + }; + }; + "array-loop-1.0.0" = { + name = "array-loop"; + packageName = "array-loop"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-loop/-/array-loop-1.0.0.tgz"; + sha1 = "c033d086cf0d12af73aed5a99c0cedb37367b395"; + }; + }; + "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-map-0.0.0" = { + name = "array-map"; + packageName = "array-map"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz"; + sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662"; + }; + }; + "array-reduce-0.0.0" = { + name = "array-reduce"; + packageName = "array-reduce"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz"; + sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b"; + }; + }; + "array-shuffle-1.0.1" = { + name = "array-shuffle"; + packageName = "array-shuffle"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-shuffle/-/array-shuffle-1.0.1.tgz"; + sha1 = "7ea4882a356b4bca5f545e0b6e52eaf6d971557a"; + }; + }; + "array-slice-0.2.3" = { + name = "array-slice"; + packageName = "array-slice"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz"; + sha1 = "dd3cfb80ed7973a75117cdac69b0b99ec86186f5"; + }; + }; + "array-slice-1.1.0" = { + name = "array-slice"; + packageName = "array-slice"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz"; + sha512 = "3myjiz16qi117x0k52sisqyn0cqx6yxvpgr43bkil9shgs7yhs8wpdgd3wjwfzgwxsw330yqwhp880gsyx2kxj1lfyb6gs1fh7qqnh7"; + }; + }; + "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"; + }; + }; + "arraybuffer.slice-0.0.6" = { + name = "arraybuffer.slice"; + packageName = "arraybuffer.slice"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz"; + sha1 = "f33b2159f0532a3f3107a272c0ccfbd1ad2979ca"; + }; + }; + "arraybuffer.slice-0.0.7" = { + name = "arraybuffer.slice"; + packageName = "arraybuffer.slice"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz"; + sha512 = "2ifpj39fza01g4z9jhgl0shmh5f79czgfh7bf40n66v5p93nrf43kiqhsgic9az2jrwmj8n60dn7kav1rzvm41a9kwi4ypf0mahhrf0"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "asap-2.0.6" = { + name = "asap"; + packageName = "asap"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz"; + sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46"; + }; + }; + "ascli-0.3.0" = { + name = "ascli"; + packageName = "ascli"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ascli/-/ascli-0.3.0.tgz"; + sha1 = "5e66230e5219fe3e8952a4efb4f20fae596a813a"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "asn1.js-4.9.2" = { + name = "asn1.js"; + packageName = "asn1.js"; + version = "4.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.2.tgz"; + sha512 = "071d32h5646ddyfxvmm0yd0xc320zh2cdsjal4hs8cs0hgn9dpq7k9c9ndlhjq3y93nlawkinm99znqvp0cxx61ic7qy4nn7d5arwvg"; + }; + }; + "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"; + }; + }; + "assert-plus-0.1.2" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"; + sha1 = "d93ffdbb67ac5507779be316a7d65146417beef8"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "assertion-error-1.1.0" = { + name = "assertion-error"; + packageName = "assertion-error"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz"; + sha512 = "07swiwljqy13fyil4y9lp319zcqsgdkchaic1y4dlfi3flh5l4qlwv497g40bnspsl9h857a3ig5assmvjdwv913dppgymkvcsil2wf"; + }; + }; + "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"; + }; + }; + "ast-types-0.10.1" = { + name = "ast-types"; + packageName = "ast-types"; + version = "0.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.10.1.tgz"; + sha512 = "2wjsah372x6rjrrsq3bv915lccq4pjpyk4b0vb7kmc87ab5yjgac4rab0qclh6brhhyv95mbyy1k5sijfyx36676darz57k6gsgx3ji"; + }; + }; + "ast-types-0.9.6" = { + name = "ast-types"; + packageName = "ast-types"; + version = "0.9.6"; + src = fetchurl { + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.6.tgz"; + sha1 = "102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9"; + }; + }; + "astw-2.2.0" = { + name = "astw"; + packageName = "astw"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/astw/-/astw-2.2.0.tgz"; + sha1 = "7bd41784d32493987aeb239b6b4e1c57a873b917"; + }; + }; + "async-0.1.22" = { + name = "async"; + packageName = "async"; + version = "0.1.22"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-0.1.22.tgz"; + sha1 = "0fc1aaa088a0e3ef0ebe2d8831bab0dcf8845061"; + }; + }; + "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"; + }; + }; + "async-0.2.7" = { + name = "async"; + packageName = "async"; + version = "0.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-0.2.7.tgz"; + sha1 = "44c5ee151aece6c4bf5364cfc7c28fe4e58f18df"; + }; + }; + "async-0.2.9" = { + name = "async"; + packageName = "async"; + version = "0.2.9"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-0.2.9.tgz"; + sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619"; + }; + }; + "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.4.2" = { + name = "async"; + packageName = "async"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-1.4.2.tgz"; + sha1 = "6c9edcb11ced4f0dd2f2d40db0d49a109c088aab"; + }; + }; + "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.2" = { + name = "async"; + packageName = "async"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-2.1.2.tgz"; + sha1 = "612a4ab45ef42a70cde806bad86ee6db047e8385"; + }; + }; + "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"; + }; + }; + "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.5.0" = { + name = "async"; + packageName = "async"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-2.5.0.tgz"; + sha512 = "1ijrwmifg76a8wwhhfqxg23kd0rsjhzklwvj2czvqxs2k25ii6p3y6s3vhbcc5hnr87b0gfc4nb54b8bph2hn9c6z1f6nldjw04ksbv"; + }; + }; + "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"; + }; + }; + "async-limiter-1.0.0" = { + name = "async-limiter"; + packageName = "async-limiter"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz"; + sha512 = "1ddib7nbyayhldvsyrfdpxk7khyi6s72570gkf3qqf4b1xwzdh52w0vlj6bknl40imispychhwfjb2bm29pjxbd5yz26fi8g8bfx7wf"; + }; + }; + "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.0.3" = { + name = "atob"; + packageName = "atob"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/atob/-/atob-2.0.3.tgz"; + sha1 = "19c7a760473774468f20b2d2d03372ad7d4cbf5d"; + }; + }; + "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"; + }; + }; + "auto-bind-1.2.0" = { + name = "auto-bind"; + packageName = "auto-bind"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/auto-bind/-/auto-bind-1.2.0.tgz"; + sha512 = "0wamaj1k757h28fyrvfam4fz8ymz84pvfcyvm3k88bs8vxq36jn9kbiqqa3s0axwi6pcmwgmpjqfsh2721a1bb5kp5dpkpdkrkfj3k7"; + }; + }; + "aws-sdk-1.18.0" = { + name = "aws-sdk"; + packageName = "aws-sdk"; + version = "1.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-1.18.0.tgz"; + sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; + }; + }; + "aws-sdk-2.187.0" = { + name = "aws-sdk"; + packageName = "aws-sdk"; + version = "2.187.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.187.0.tgz"; + sha1 = "04cb9a333d39c09753bf3ff63ec065b32b00db18"; + }; + }; + "aws-sign-0.2.0" = { + name = "aws-sign"; + packageName = "aws-sign"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign/-/aws-sign-0.2.0.tgz"; + sha1 = "c55013856c8194ec854a0cbec90aab5a04ce3ac5"; + }; + }; + "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"; }; }; "aws-sign2-0.7.0" = { @@ -1174,463 +1570,22 @@ let sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e"; }; }; - "caseless-0.12.0" = { - name = "caseless"; - packageName = "caseless"; - version = "0.12.0"; + "axios-0.15.3" = { + name = "axios"; + packageName = "axios"; + version = "0.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; - sha1 = "1b681c21ff84033c826543090689420d187151dc"; + url = "https://registry.npmjs.org/axios/-/axios-0.15.3.tgz"; + sha1 = "2c9d638b2e191a08ea1d6cc988eadd6ba5bdc053"; }; }; - "combined-stream-1.0.5" = { - name = "combined-stream"; - packageName = "combined-stream"; - version = "1.0.5"; + "axios-0.17.1" = { + name = "axios"; + packageName = "axios"; + version = "0.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"; - sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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.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"; - }; - }; - "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"; - }; - }; - "adal-node-0.1.21" = { - name = "adal-node"; - packageName = "adal-node"; - version = "0.1.21"; - src = fetchurl { - url = "https://registry.npmjs.org/adal-node/-/adal-node-0.1.21.tgz"; - sha1 = "11c58e427b7e83d9ef2d77c9c3a2a60fbb0b6cc8"; - }; - }; - "async-1.4.2" = { - name = "async"; - packageName = "async"; - version = "1.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-1.4.2.tgz"; - sha1 = "6c9edcb11ced4f0dd2f2d40db0d49a109c088aab"; - }; - }; - "azure-common-0.9.18" = { - name = "azure-common"; - packageName = "azure-common"; - version = "0.9.18"; - src = fetchurl { - url = "https://registry.npmjs.org/azure-common/-/azure-common-0.9.18.tgz"; - sha1 = "38b960f4ddadd44d34f52e8b85d5d1e0226440fd"; + url = "https://registry.npmjs.org/axios/-/axios-0.17.1.tgz"; + sha1 = "2d8e3e5d0bdbd7327f91bc814f5c57660f81824d"; }; }; "azure-arm-authorization-2.0.0" = { @@ -1642,6 +1597,15 @@ let sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f"; }; }; + "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/azure-arm-batch/-/azure-arm-batch-0.3.0.tgz"; + sha1 = "78b000b10a16b97dcf273729b4dba919efbfdaf7"; + }; + }; "azure-arm-cdn-1.0.3" = { name = "azure-arm-cdn"; packageName = "azure-arm-cdn"; @@ -1687,6 +1651,24 @@ let sha1 = "c8b7c113016c92703a84dc28d29ba518e8c64763"; }; }; + "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/azure-arm-devtestlabs/-/azure-arm-devtestlabs-0.1.0.tgz"; + sha1 = "76604b8d2ad7b881f6ff53a37e37365481ca8c40"; + }; + }; + "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/azure-arm-dns/-/azure-arm-dns-2.0.0-preview.tgz"; + sha1 = "3dd0645c7f1767fe150e00a8ac33b4b55bce9b8c"; + }; + }; "azure-arm-hdinsight-0.2.2" = { name = "azure-arm-hdinsight"; packageName = "azure-arm-hdinsight"; @@ -1723,15 +1705,6 @@ let sha1 = "f63a6dad0355633d9347fb403f417fb195fe3b91"; }; }; - "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/azure-arm-servermanagement/-/azure-arm-servermanagement-0.1.2.tgz"; - sha1 = "937f87a8aeceb641a8210a9ba837323f0206eb47"; - }; - }; "azure-arm-network-4.0.1" = { name = "azure-arm-network"; packageName = "azure-arm-network"; @@ -1750,33 +1723,6 @@ let sha1 = "f0050ed833e2b3b12daba83d6f9e3d96852ee970"; }; }; - "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/azure-arm-trafficmanager/-/azure-arm-trafficmanager-1.1.0-preview.tgz"; - sha1 = "b46cfcf7f1690e4739864dcdb5c8de322e82ec50"; - }; - }; - "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/azure-arm-dns/-/azure-arm-dns-2.0.0-preview.tgz"; - sha1 = "3dd0645c7f1767fe150e00a8ac33b4b55bce9b8c"; - }; - }; - "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/azure-arm-website/-/azure-arm-website-0.11.4.tgz"; - sha1 = "6972dd9844a0d12376d74014b541c49247caa37d"; - }; - }; "azure-arm-rediscache-0.2.3" = { name = "azure-arm-rediscache"; packageName = "azure-arm-rediscache"; @@ -1786,40 +1732,49 @@ let sha1 = "b6898abe8b4c3e1b2ec5be82689ef212bc2b1a06"; }; }; - "azure-arm-devtestlabs-0.1.0" = { - name = "azure-arm-devtestlabs"; - packageName = "azure-arm-devtestlabs"; - version = "0.1.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/azure-arm-devtestlabs/-/azure-arm-devtestlabs-0.1.0.tgz"; - sha1 = "76604b8d2ad7b881f6ff53a37e37365481ca8c40"; + url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.6.1-preview.tgz"; + sha1 = "aa9a49fb9081a210f2f4cc6596ca4653b68306e6"; }; }; - "azure-graph-2.1.0-preview" = { - name = "azure-graph"; - packageName = "azure-graph"; - version = "2.1.0-preview"; + "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/azure-graph/-/azure-graph-2.1.0-preview.tgz"; - sha1 = "2005abb76d9193cbfb90f25ee92823cde87d4f5f"; + url = "https://registry.npmjs.org/azure-arm-servermanagement/-/azure-arm-servermanagement-0.1.2.tgz"; + sha1 = "937f87a8aeceb641a8210a9ba837323f0206eb47"; }; }; - "azure-gallery-2.0.0-pre.18" = { - name = "azure-gallery"; - packageName = "azure-gallery"; - version = "2.0.0-pre.18"; + "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/azure-gallery/-/azure-gallery-2.0.0-pre.18.tgz"; - sha1 = "3cd4c5e4e0091551d6a5ee757af2354c8a36b3e6"; + url = "https://registry.npmjs.org/azure-arm-storage/-/azure-arm-storage-0.15.0-preview.tgz"; + sha1 = "e25c13a1e716656caa019a7bc9fabe05c5062b7e"; }; }; - "azure-keyvault-0.11.0" = { - name = "azure-keyvault"; - packageName = "azure-keyvault"; - version = "0.11.0"; + "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/azure-keyvault/-/azure-keyvault-0.11.0.tgz"; - sha1 = "379e6c2ed4155de86caff63243923c7330d34802"; + url = "https://registry.npmjs.org/azure-arm-trafficmanager/-/azure-arm-trafficmanager-1.1.0-preview.tgz"; + sha1 = "b46cfcf7f1690e4739864dcdb5c8de322e82ec50"; + }; + }; + "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/azure-arm-website/-/azure-arm-website-0.11.4.tgz"; + sha1 = "6972dd9844a0d12376d74014b541c49247caa37d"; }; }; "azure-asm-compute-0.18.0" = { @@ -1840,15 +1795,6 @@ let sha1 = "2d11cdaaa073fc38f31c718991d5923fb7259fa0"; }; }; - "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/azure-asm-trafficmanager/-/azure-asm-trafficmanager-0.10.3.tgz"; - sha1 = "91e2e63d73869090613cd42ee38a3823e55f4447"; - }; - }; "azure-asm-mgmt-0.10.1" = { name = "azure-asm-mgmt"; packageName = "azure-asm-mgmt"; @@ -1858,15 +1804,6 @@ let sha1 = "d0a44b47ccabf338b19d53271675733cfa2d1751"; }; }; - "azure-monitoring-0.10.2" = { - name = "azure-monitoring"; - packageName = "azure-monitoring"; - version = "0.10.2"; - src = fetchurl { - url = "https://registry.npmjs.org/azure-monitoring/-/azure-monitoring-0.10.2.tgz"; - sha1 = "2b7d493306747b43e4e2dcad44d65328e6c3cf57"; - }; - }; "azure-asm-network-0.13.0" = { name = "azure-asm-network"; packageName = "azure-asm-network"; @@ -1876,24 +1813,6 @@ let sha1 = "8d5d46b66b16c36dfc067f7c7c87bd2f42049c54"; }; }; - "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/azure-arm-resource/-/azure-arm-resource-1.6.1-preview.tgz"; - sha1 = "aa9a49fb9081a210f2f4cc6596ca4653b68306e6"; - }; - }; - "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/azure-arm-storage/-/azure-arm-storage-0.15.0-preview.tgz"; - sha1 = "e25c13a1e716656caa019a7bc9fabe05c5062b7e"; - }; - }; "azure-asm-sb-0.10.1" = { name = "azure-asm-sb"; packageName = "azure-asm-sb"; @@ -1930,6 +1849,15 @@ let sha1 = "917a5e87a04b69c0f5c29339fe910bb5e5e7a04c"; }; }; + "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/azure-asm-trafficmanager/-/azure-asm-trafficmanager-0.10.3.tgz"; + sha1 = "91e2e63d73869090613cd42ee38a3823e55f4447"; + }; + }; "azure-asm-website-0.10.4" = { name = "azure-asm-website"; packageName = "azure-asm-website"; @@ -1939,24 +1867,6 @@ let sha1 = "bfd0c01a8ae6afd90eaa13360976242e28459650"; }; }; - "azure-storage-2.1.0" = { - name = "azure-storage"; - packageName = "azure-storage"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.1.0.tgz"; - sha1 = "7fc81246cd64b54cabced70b5138d7cc4571ea01"; - }; - }; - "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/azure-arm-batch/-/azure-arm-batch-0.3.0.tgz"; - sha1 = "78b000b10a16b97dcf273729b4dba919efbfdaf7"; - }; - }; "azure-batch-0.5.2" = { name = "azure-batch"; packageName = "azure-batch"; @@ -1966,6 +1876,51 @@ let sha1 = "21b23f9db7f42734e97f35bd703818a1cf2492eb"; }; }; + "azure-common-0.9.18" = { + name = "azure-common"; + packageName = "azure-common"; + version = "0.9.18"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-common/-/azure-common-0.9.18.tgz"; + sha1 = "38b960f4ddadd44d34f52e8b85d5d1e0226440fd"; + }; + }; + "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/azure-gallery/-/azure-gallery-2.0.0-pre.18.tgz"; + sha1 = "3cd4c5e4e0091551d6a5ee757af2354c8a36b3e6"; + }; + }; + "azure-graph-2.1.0-preview" = { + name = "azure-graph"; + packageName = "azure-graph"; + version = "2.1.0-preview"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-graph/-/azure-graph-2.1.0-preview.tgz"; + sha1 = "2005abb76d9193cbfb90f25ee92823cde87d4f5f"; + }; + }; + "azure-keyvault-0.11.0" = { + name = "azure-keyvault"; + packageName = "azure-keyvault"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-keyvault/-/azure-keyvault-0.11.0.tgz"; + sha1 = "379e6c2ed4155de86caff63243923c7330d34802"; + }; + }; + "azure-monitoring-0.10.2" = { + name = "azure-monitoring"; + packageName = "azure-monitoring"; + version = "0.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-monitoring/-/azure-monitoring-0.10.2.tgz"; + sha1 = "2b7d493306747b43e4e2dcad44d65328e6c3cf57"; + }; + }; "azure-servicefabric-0.1.5" = { name = "azure-servicefabric"; packageName = "azure-servicefabric"; @@ -1975,400 +1930,346 @@ let sha1 = "bdc4b378292490ce77e788ee189f291ce5ae25a6"; }; }; - "applicationinsights-0.16.0" = { - name = "applicationinsights"; - packageName = "applicationinsights"; - version = "0.16.0"; + "azure-storage-2.1.0" = { + name = "azure-storage"; + packageName = "azure-storage"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.16.0.tgz"; - sha1 = "e02dafb10cf573c19b429793c87797d6404f0ee3"; + url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.1.0.tgz"; + sha1 = "7fc81246cd64b54cabced70b5138d7cc4571ea01"; }; }; - "caller-id-0.1.0" = { - name = "caller-id"; - packageName = "caller-id"; - version = "0.1.0"; + "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/caller-id/-/caller-id-0.1.0.tgz"; - sha1 = "59bdac0893d12c3871408279231f97458364f07b"; + url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz"; + sha1 = "63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"; }; }; - "colors-1.1.2" = { - name = "colors"; - packageName = "colors"; - version = "1.1.2"; + "babel-core-6.26.0" = { + name = "babel-core"; + packageName = "babel-core"; + version = "6.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz"; - sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63"; + url = "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz"; + sha1 = "af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"; }; }; - "commander-1.0.4" = { - name = "commander"; - packageName = "commander"; - version = "1.0.4"; + "babel-generator-6.26.0" = { + name = "babel-generator"; + packageName = "babel-generator"; + version = "6.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-1.0.4.tgz"; - sha1 = "5edeb1aee23c4fb541a6b70d692abef19669a2d3"; + url = "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.0.tgz"; + sha1 = "ac1ae20070b79f6e3ca1d3269613053774f20dc5"; }; }; - "date-utils-1.2.21" = { - name = "date-utils"; - packageName = "date-utils"; - version = "1.2.21"; + "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/date-utils/-/date-utils-1.2.21.tgz"; - sha1 = "61fb16cdc1274b3c9acaaffe9fc69df8720a2b64"; + url = "https://registry.npmjs.org/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz"; + sha1 = "39ff8313b75c8b65dceff1f31d383e0ff2a408a0"; }; }; - "easy-table-1.1.0" = { - name = "easy-table"; - packageName = "easy-table"; - version = "1.1.0"; + "babel-helpers-6.24.1" = { + name = "babel-helpers"; + packageName = "babel-helpers"; + version = "6.24.1"; src = fetchurl { - url = "https://registry.npmjs.org/easy-table/-/easy-table-1.1.0.tgz"; - sha1 = "86f9ab4c102f0371b7297b92a651d5824bc8cb73"; + url = "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz"; + sha1 = "3471de9caec388e5c850e597e58a26ddf37602b2"; }; }; - "event-stream-3.1.5" = { - name = "event-stream"; - packageName = "event-stream"; - version = "3.1.5"; + "babel-messages-6.23.0" = { + name = "babel-messages"; + packageName = "babel-messages"; + version = "6.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/event-stream/-/event-stream-3.1.5.tgz"; - sha1 = "6cba5a3ae02a7e4967d65ad04ef12502a2fff66c"; + url = "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz"; + sha1 = "f3cdf4703858035b2a2951c6ec5edf6c62f2630e"; }; }; - "eyes-0.1.8" = { - name = "eyes"; - packageName = "eyes"; - version = "0.1.8"; + "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/eyes/-/eyes-0.1.8.tgz"; - sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; + url = "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz"; + sha1 = "0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"; }; }; - "github-0.1.6" = { - name = "github"; - packageName = "github"; - version = "0.1.6"; + "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/github/-/github-0.1.6.tgz"; - sha1 = "1344e694f8d20ef9b29bcbfd1ca5eb4f7a287922"; + url = "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz"; + sha1 = "fd6536f2bce13836ffa3a5458c4903a597bb3bf5"; }; }; - "fast-json-patch-0.5.6" = { - name = "fast-json-patch"; - packageName = "fast-json-patch"; - version = "0.5.6"; + "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/fast-json-patch/-/fast-json-patch-0.5.6.tgz"; - sha1 = "66e4028e381eaa002edeb280d10238f3a46c3402"; + url = "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz"; + sha1 = "997bb1f1ab967f682d2b0876fe358d60e765c56d"; }; }; - "js2xmlparser-1.0.0" = { - name = "js2xmlparser"; - packageName = "js2xmlparser"; + "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/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz"; + sha1 = "0f36692d50fef6b7e2d4b3ac1478137a963b7b06"; + }; + }; + "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/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz"; + sha1 = "840a028e7df460dfc3a2d29f0c0d91f6376e66a3"; + }; + }; + "babel-polyfill-6.16.0" = { + name = "babel-polyfill"; + packageName = "babel-polyfill"; + version = "6.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.16.0.tgz"; + sha1 = "2d45021df87e26a374b6d4d1a9c65964d17f2422"; + }; + }; + "babel-polyfill-6.26.0" = { + name = "babel-polyfill"; + packageName = "babel-polyfill"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz"; + sha1 = "379937abc67d7895970adc621f284cd966cf2153"; + }; + }; + "babel-register-6.26.0" = { + name = "babel-register"; + packageName = "babel-register"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz"; + sha1 = "6ed021173e2fcb486d7acb45c6009a856f647071"; + }; + }; + "babel-runtime-6.26.0" = { + name = "babel-runtime"; + packageName = "babel-runtime"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz"; + sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe"; + }; + }; + "babel-template-6.26.0" = { + name = "babel-template"; + packageName = "babel-template"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz"; + sha1 = "de03e2d16396b069f46dd9fff8521fb1a0e35e02"; + }; + }; + "babel-traverse-6.26.0" = { + name = "babel-traverse"; + packageName = "babel-traverse"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz"; + sha1 = "46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"; + }; + }; + "babel-types-6.26.0" = { + name = "babel-types"; + packageName = "babel-types"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz"; + sha1 = "a3b073f94ab49eb6fa55cd65227a334380632497"; + }; + }; + "babybird-0.0.1" = { + name = "babybird"; + packageName = "babybird"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babybird/-/babybird-0.0.1.tgz"; + sha1 = "da80c79c6d7441cdfec7c2ff2dcbd7c13ebdbea2"; + }; + }; + "babylon-6.18.0" = { + name = "babylon"; + packageName = "babylon"; + version = "6.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz"; + sha512 = "1qk460vyxfs08g8586jdc02wqzyy2y06596qcn1na9bz7yxra6vgh6177qf345xai0virpaz56bkpgmfcrd8yx5l2vjkn49y66h9xdb"; + }; + }; + "babylon-7.0.0-beta.19" = { + name = "babylon"; + packageName = "babylon"; + version = "7.0.0-beta.19"; + src = fetchurl { + url = "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.19.tgz"; + sha512 = "3y91819zra4jxfjqqdvbi44fr34m68vk7j76rkqkxvayhxmcmrvmxpk7rz16r2s3riql0xs322mkzm61asxzkc5b2zpw4firzv043an"; + }; + }; + "backo2-1.0.2" = { + name = "backo2"; + packageName = "backo2"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz"; + sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947"; + }; + }; + "backoff-2.5.0" = { + name = "backoff"; + packageName = "backoff"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/backoff/-/backoff-2.5.0.tgz"; + sha1 = "f616eda9d3e4b66b8ca7fca79f695722c5f8e26f"; + }; + }; + "bail-1.0.2" = { + name = "bail"; + packageName = "bail"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bail/-/bail-1.0.2.tgz"; + sha1 = "f7d6c1731630a9f9f0d4d35ed1f962e2074a1764"; + }; + }; + "balanced-match-1.0.0" = { + name = "balanced-match"; + packageName = "balanced-match"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-1.0.0.tgz"; - sha1 = "5a170f2e8d6476ce45405e04823242513782fe30"; + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; }; }; - "jsonlint-1.6.2" = { - name = "jsonlint"; - packageName = "jsonlint"; - version = "1.6.2"; + "base-0.11.2" = { + name = "base"; + packageName = "base"; + version = "0.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.2.tgz"; - sha1 = "5737045085f55eb455c68b1ff4ebc01bd50e8830"; + url = "https://registry.npmjs.org/base/-/base-0.11.2.tgz"; + sha512 = "11dwi4v72034dqafp0qxsg8h6cpn92vv4vf909a9fybd69yfg6gqn4hhav6x59r1wbi8h1qlgfh9np0340mpljv1hc9v9p02giqygp5"; }; }; - "jsonminify-0.4.1" = { - name = "jsonminify"; - packageName = "jsonminify"; - version = "0.4.1"; + "base62-0.1.1" = { + name = "base62"; + packageName = "base62"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsonminify/-/jsonminify-0.4.1.tgz"; - sha1 = "805dafbb39395188cee9ab582c81ef959d7e710c"; + url = "https://registry.npmjs.org/base62/-/base62-0.1.1.tgz"; + sha1 = "7b4174c2f94449753b11c2651c083da841a7b084"; }; }; - "jsrsasign-4.8.2" = { - name = "jsrsasign"; - packageName = "jsrsasign"; - version = "4.8.2"; + "base64-arraybuffer-0.1.2" = { + name = "base64-arraybuffer"; + packageName = "base64-arraybuffer"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/jsrsasign/-/jsrsasign-4.8.2.tgz"; - sha1 = "bd0a7040d426d7598d6c742ec8f875d0e88644a9"; + url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz"; + sha1 = "474df4a9f2da24e05df3158c3b1db3c3cd46a154"; }; }; - "jwt-decode-2.2.0" = { - name = "jwt-decode"; - packageName = "jwt-decode"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jwt-decode/-/jwt-decode-2.2.0.tgz"; - sha1 = "7d86bd56679f58ce6a84704a657dd392bba81a79"; - }; - }; - "kuduscript-1.0.15" = { - name = "kuduscript"; - packageName = "kuduscript"; - version = "1.0.15"; - src = fetchurl { - url = "https://registry.npmjs.org/kuduscript/-/kuduscript-1.0.15.tgz"; - sha1 = "2721f05aa6876534cd30d6ded9418651cadfaa21"; - }; - }; - "moment-2.20.1" = { - name = "moment"; - packageName = "moment"; - version = "2.20.1"; - src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.20.1.tgz"; - sha512 = "2zc9qgzsrnp9g4jm4qsb1g1h7w5zmnkz8690br52l83yr9kwhch0mh7r2vdhc706jkrqczia9wbrgkscz0x6k8cwmb3r5jifbpp47v2"; - }; - }; - "ms-rest-2.3.0" = { - name = "ms-rest"; - packageName = "ms-rest"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.3.0.tgz"; - sha512 = "2dfmfxr3xagmds2agz7g6rnj1s9lh29fgfwxbqsfpkkabh3qhcc7sznkaviilpzr59fks1401wy6sh9xyy3wsaqbm975vm5b2bj6cwf"; - }; - }; - "ms-rest-azure-2.4.5" = { - name = "ms-rest-azure"; - packageName = "ms-rest-azure"; - version = "2.4.5"; - src = fetchurl { - url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.4.5.tgz"; - sha512 = "17n7vax0wim6r3x51vaib4yblfkm791vv1awqs6p16y3zbfxdhgk1sks1iw2519187mmw4njnrja6kxvms4ly8l8qf481qh87xnia1v"; - }; - }; - "node-forge-0.6.23" = { - name = "node-forge"; - packageName = "node-forge"; - version = "0.6.23"; - src = fetchurl { - url = "https://registry.npmjs.org/node-forge/-/node-forge-0.6.23.tgz"; - sha1 = "f03cf65ebd5d4d9dd2f7becb57ceaf78ed94a2bf"; - }; - }; - "omelette-0.3.2" = { - name = "omelette"; - packageName = "omelette"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/omelette/-/omelette-0.3.2.tgz"; - sha1 = "68c1b3c57ced778b4e67d8637d2559b2c1b3ec26"; - }; - }; - "openssl-wrapper-0.2.1" = { - name = "openssl-wrapper"; - packageName = "openssl-wrapper"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/openssl-wrapper/-/openssl-wrapper-0.2.1.tgz"; - sha1 = "ff2d6552c83bb14437edc0371784704c75289473"; - }; - }; - "progress-1.1.8" = { - name = "progress"; - packageName = "progress"; - version = "1.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz"; - sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"; - }; - }; - "prompt-0.2.14" = { - name = "prompt"; - packageName = "prompt"; - version = "0.2.14"; - src = fetchurl { - url = "https://registry.npmjs.org/prompt/-/prompt-0.2.14.tgz"; - sha1 = "57754f64f543fd7b0845707c818ece618f05ffdc"; - }; - }; - "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"; - }; - }; - "request-2.74.0" = { - name = "request"; - packageName = "request"; - version = "2.74.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.74.0.tgz"; - sha1 = "7693ca768bbb0ea5c8ce08c084a45efa05b892ab"; - }; - }; - "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/ssh-key-to-pem/-/ssh-key-to-pem-0.11.0.tgz"; - sha1 = "512675a28f08f1e581779e1989ab1e13effb49e4"; - }; - }; - "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-streams-0.1.5" = { - name = "streamline-streams"; - packageName = "streamline-streams"; + "base64-arraybuffer-0.1.5" = { + name = "base64-arraybuffer"; + packageName = "base64-arraybuffer"; version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/streamline-streams/-/streamline-streams-0.1.5.tgz"; - sha1 = "5b0ff80cf543f603cc3438ed178ca2aec7899b54"; + url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz"; + sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8"; }; }; - "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"; - }; - }; - "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"; - }; - }; - "tunnel-0.0.2" = { - name = "tunnel"; - packageName = "tunnel"; + "base64-js-0.0.2" = { + name = "base64-js"; + packageName = "base64-js"; version = "0.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/tunnel/-/tunnel-0.0.2.tgz"; - sha1 = "f23bcd8b7a7b8a864261b2084f66f93193396334"; + url = "https://registry.npmjs.org/base64-js/-/base64-js-0.0.2.tgz"; + sha1 = "024f0f72afa25b75f9c0ee73cd4f55ec1bed9784"; }; }; - "underscore-1.4.4" = { - name = "underscore"; - packageName = "underscore"; - version = "1.4.4"; + "base64-js-0.0.8" = { + name = "base64-js"; + packageName = "base64-js"; + version = "0.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; - sha1 = "61a6a32010622afa07963bf325203cf12239d604"; + url = "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz"; + sha1 = "1101e9544f4a76b1bc3b26d452ca96d7a35e7978"; }; }; - "user-home-2.0.0" = { - name = "user-home"; - packageName = "user-home"; - version = "2.0.0"; + "base64-js-1.1.2" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz"; - sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.1.2.tgz"; + sha1 = "d6400cac1c4c660976d90d07a04351d89395f5e8"; }; }; - "validator-5.2.0" = { - name = "validator"; - packageName = "validator"; - version = "5.2.0"; + "base64-js-1.2.0" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/validator/-/validator-5.2.0.tgz"; - sha1 = "e66fb3ec352348c1f7232512328738d8d66a9689"; + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz"; + sha1 = "a39992d723584811982be5e290bb6a53d86700f1"; }; }; - "winston-2.1.1" = { - name = "winston"; - packageName = "winston"; - version = "2.1.1"; + "base64-js-1.2.1" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-2.1.1.tgz"; - sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e"; + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz"; + sha512 = "0dhi66vsajfcm04s11xqklh5lj3abs4ncnl8h3689964aqam3ps9spmc454hz94rz3x1x5l1ad03jrba67mq9zc9vq9a1gchma581bp"; }; }; - "wordwrap-0.0.2" = { - name = "wordwrap"; - packageName = "wordwrap"; - version = "0.0.2"; + "base64-url-1.2.1" = { + name = "base64-url"; + packageName = "base64-url"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; - sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; + url = "https://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz"; + sha1 = "199fd661702a0e7b7dcae6e0698bb089c52f6d78"; }; }; - "xml2js-0.1.14" = { - name = "xml2js"; - packageName = "xml2js"; - version = "0.1.14"; + "base64id-0.1.0" = { + name = "base64id"; + packageName = "base64id"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/xml2js/-/xml2js-0.1.14.tgz"; - sha1 = "5274e67f5a64c5f92974cd85139e0332adc6b90c"; + url = "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz"; + sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f"; }; }; - "xmlbuilder-0.4.3" = { - name = "xmlbuilder"; - packageName = "xmlbuilder"; - version = "0.4.3"; + "base64id-1.0.0" = { + name = "base64id"; + packageName = "base64id"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.3.tgz"; - sha1 = "c4614ba74e0ad196e609c9272cd9e1ddb28a8a58"; - }; - }; - "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"; - }; - }; - "jws-3.1.4" = { - name = "jws"; - packageName = "jws"; - version = "3.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz"; - sha1 = "f9e8b9338e8a847277d6444b1464f61880e050a2"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; + url = "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz"; + sha1 = "47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"; }; }; "base64url-2.0.0" = { @@ -2380,553 +2281,319 @@ let sha1 = "eac16e03ea1438eff9423d69baa36262ed1f70bb"; }; }; - "jwa-1.1.5" = { - name = "jwa"; - packageName = "jwa"; - version = "1.1.5"; + "basic-auth-1.0.4" = { + name = "basic-auth"; + packageName = "basic-auth"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz"; - sha1 = "a0552ce0220742cd52e153774a32905c30e756e5"; + url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz"; + sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290"; }; }; - "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/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz"; - sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"; - }; - }; - "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/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz"; - sha1 = "4bc926274ec3b5abb5016e7e1d60921ac262b2a1"; - }; - }; - "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"; - }; - }; - "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/dateformat/-/dateformat-1.0.2-1.2.3.tgz"; - sha1 = "b0220c02de98617433b72851cf47de3df2cdbee9"; - }; - }; - "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"; - }; - }; - "envconf-0.0.4" = { - name = "envconf"; - packageName = "envconf"; - version = "0.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/envconf/-/envconf-0.0.4.tgz"; - sha1 = "85675afba237c43f98de2d46adc0e532a4dcf48b"; - }; - }; - "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"; - }; - }; - "sax-0.5.2" = { - name = "sax"; - packageName = "sax"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-0.5.2.tgz"; - sha1 = "735ffaa39a1cff8ffb9598f0223abdb03a9fb2ea"; - }; - }; - "ms-rest-1.15.7" = { - name = "ms-rest"; - packageName = "ms-rest"; - version = "1.15.7"; - src = fetchurl { - url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.7.tgz"; - sha1 = "400515e05b1924889cb61a1ec6054290a68e1207"; - }; - }; - "ms-rest-azure-1.15.7" = { - name = "ms-rest-azure"; - packageName = "ms-rest-azure"; - version = "1.15.7"; - src = fetchurl { - url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.7.tgz"; - sha1 = "8bce09f053b1565dbaa8bd022ca40155c35b0fde"; - }; - }; - "async-0.2.7" = { - name = "async"; - packageName = "async"; - version = "0.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.2.7.tgz"; - sha1 = "44c5ee151aece6c4bf5364cfc7c28fe4e58f18df"; - }; - }; - "moment-2.6.0" = { - name = "moment"; - packageName = "moment"; - version = "2.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.6.0.tgz"; - sha1 = "0765b72b841dd213fa91914c0f6765122719f061"; - }; - }; - "moment-2.14.1" = { - name = "moment"; - packageName = "moment"; - version = "2.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.14.1.tgz"; - sha1 = "b35b27c47e57ed2ddc70053d6b07becdb291741c"; - }; - }; - "browserify-mime-1.2.9" = { - name = "browserify-mime"; - packageName = "browserify-mime"; - version = "1.2.9"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify-mime/-/browserify-mime-1.2.9.tgz"; - sha1 = "aeb1af28de6c0d7a6a2ce40adb68ff18422af31f"; - }; - }; - "extend-1.2.1" = { - name = "extend"; - packageName = "extend"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz"; - sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c"; - }; - }; - "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/json-edm-parser/-/json-edm-parser-0.1.2.tgz"; - sha1 = "1e60b0fef1bc0af67bc0d146dfdde5486cd615b4"; - }; - }; - "md5.js-1.3.4" = { - name = "md5.js"; - packageName = "md5.js"; - version = "1.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz"; - sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d"; - }; - }; - "readable-stream-2.0.6" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"; - sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e"; - }; - }; - "jsonparse-1.2.0" = { - name = "jsonparse"; - packageName = "jsonparse"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.2.0.tgz"; - sha1 = "5c0c5685107160e72fe7489bddea0b44c2bc67bd"; - }; - }; - "hash-base-3.0.4" = { - name = "hash-base"; - packageName = "hash-base"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz"; - sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "keypress-0.1.0" = { - name = "keypress"; - packageName = "keypress"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz"; - sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a"; - }; - }; - "wcwidth-1.0.1" = { - name = "wcwidth"; - packageName = "wcwidth"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz"; - sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"; - }; - }; - "defaults-1.0.3" = { - name = "defaults"; - packageName = "defaults"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz"; - sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d"; - }; - }; - "clone-1.0.3" = { - name = "clone"; - packageName = "clone"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz"; - sha1 = "298d7e2231660f40c003c2ed3140decf3f53085f"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "commander-1.1.1" = { - name = "commander"; - packageName = "commander"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-1.1.1.tgz"; - sha1 = "50d1651868ae60eccff0a2d9f34595376bc6b041"; - }; - }; - "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"; - }; - }; - "@types/node-8.5.2" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "8.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.5.2.tgz"; - sha512 = "1amd3742m7s65mqdd5fl3p0bxwl95rp916lsv46wf9m24w0nz2sfq7rc5lv0bvxslarhh660p3aqq5zc9c0k7kx23m7lpk0x8l0c3i8"; - }; - }; - "@types/request-2.0.9" = { - name = "_at_types_slash_request"; - packageName = "@types/request"; - version = "2.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/request/-/request-2.0.9.tgz"; - sha512 = "2kdhxhp1x6x3bmggmcsf6zl71a5j4wr22gbxid1264gards2wxk9plfgr3q3vl7l2h7pp29c622dlmz91mnrpyr7mqjhxdv359bhsi1"; - }; - }; - "@types/uuid-3.4.3" = { - name = "_at_types_slash_uuid"; - packageName = "@types/uuid"; - version = "3.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.3.tgz"; - sha512 = "1psrs8sjpmhz8sz2zjkkd7743vzdi7q7vcj8p219q1pkfawr619rl1m5pczp69hbm1769kn8zwlbayjylhl7an5hkvkdd2bi04lpx75"; - }; - }; - "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-stream-1.1.0" = { - name = "is-stream"; - packageName = "is-stream"; + "basic-auth-1.1.0" = { + name = "basic-auth"; + packageName = "basic-auth"; version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; - sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.1.0.tgz"; + sha1 = "45221ee429f7ee1e5035be3f51533f1cdfd29884"; }; }; - "moment-2.18.1" = { - name = "moment"; - packageName = "moment"; - version = "2.18.1"; + "basic-auth-2.0.0" = { + name = "basic-auth"; + packageName = "basic-auth"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz"; - sha1 = "c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"; + url = "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.0.tgz"; + sha1 = "015db3f353e02e56377755f962742e8981e7bbba"; }; }; - "through-2.3.8" = { - name = "through"; - packageName = "through"; - version = "2.3.8"; + "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/through/-/through-2.3.8.tgz"; - sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + url = "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz"; + sha1 = "fdb0b43962ca7b40456a7c2bb48fe173da2d2122"; }; }; - "tunnel-0.0.5" = { - name = "tunnel"; - packageName = "tunnel"; - version = "0.0.5"; + "batch-0.5.3" = { + name = "batch"; + packageName = "batch"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/tunnel/-/tunnel-0.0.5.tgz"; - sha512 = "1n2p6ca2m26hbf9gxlww91fp653cyqdbfnvxjc8jn91ybvbwbhsqg3cm4da8rrxzgfr9nsa6zpi20bv5w708753chaixbsym1v6qgl2"; + url = "https://registry.npmjs.org/batch/-/batch-0.5.3.tgz"; + sha1 = "3f3414f380321743bfc1042f9a83ff1d5824d464"; }; }; - "@types/form-data-2.2.1" = { - name = "_at_types_slash_form-data"; - packageName = "@types/form-data"; - version = "2.2.1"; + "batch-0.6.1" = { + name = "batch"; + packageName = "batch"; + version = "0.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.1.tgz"; - sha512 = "2fv2qaz90rp6ib2s45ix0p3a4bd6yl6k94k1kkhw7w4s2aa5mqc6chppkf6pfvsz1l6phh7y0xswyfyzjgny7qzascch8c7ws20a0r4"; + url = "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz"; + sha1 = "dc34314f4e679318093fc760272525f94bf25c16"; }; }; - "async-2.5.0" = { - name = "async"; - packageName = "async"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.5.0.tgz"; - sha512 = "1ijrwmifg76a8wwhhfqxg23kd0rsjhzklwvj2czvqxs2k25ii6p3y6s3vhbcc5hnr87b0gfc4nb54b8bph2hn9c6z1f6nldjw04ksbv"; - }; - }; - "adal-node-0.1.26" = { - name = "adal-node"; - packageName = "adal-node"; - version = "0.1.26"; - src = fetchurl { - url = "https://registry.npmjs.org/adal-node/-/adal-node-0.1.26.tgz"; - sha1 = "5a0a955b74ee8f2bb44f32305cafdc7a6877fced"; - }; - }; - "debug-0.7.4" = { - name = "debug"; - packageName = "debug"; - version = "0.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"; - sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39"; - }; - }; - "q-0.9.7" = { - name = "q"; - packageName = "q"; - version = "0.9.7"; - src = fetchurl { - url = "https://registry.npmjs.org/q/-/q-0.9.7.tgz"; - sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "async-0.2.10" = { - name = "async"; - packageName = "async"; - version = "0.2.10"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz"; - sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; - }; - }; - "deep-equal-1.0.1" = { - name = "deep-equal"; - packageName = "deep-equal"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz"; - sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5"; - }; - }; - "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"; - }; - }; - "ncp-0.4.2" = { - name = "ncp"; - packageName = "ncp"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"; - sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574"; - }; - }; - "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"; - }; - }; - "cycle-1.0.3" = { - name = "cycle"; - packageName = "cycle"; + "bcrypt-1.0.3" = { + name = "bcrypt"; + packageName = "bcrypt"; version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; - sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; + url = "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.3.tgz"; + sha512 = "1zfn87155w6q9fsv5ls3gxwih7yvarrh16kzpfrpppblzpmp1cy9gjkknsf9lkixacza39h51jd7varqfg19w3qkdic62zpirv86755"; }; }; - "pkginfo-0.3.1" = { - name = "pkginfo"; - packageName = "pkginfo"; - version = "0.3.1"; + "bcrypt-nodejs-0.0.3" = { + name = "bcrypt-nodejs"; + packageName = "bcrypt-nodejs"; + version = "0.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"; - sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21"; + url = "https://registry.npmjs.org/bcrypt-nodejs/-/bcrypt-nodejs-0.0.3.tgz"; + sha1 = "c60917f26dc235661566c681061c303c2b28842b"; }; }; - "aws-sign2-0.6.0" = { - name = "aws-sign2"; - packageName = "aws-sign2"; - version = "0.6.0"; + "bcrypt-pbkdf-1.0.1" = { + name = "bcrypt-pbkdf"; + packageName = "bcrypt-pbkdf"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"; - sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f"; + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz"; + sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; + }; + }; + "bcryptjs-2.4.3" = { + name = "bcryptjs"; + packageName = "bcryptjs"; + version = "2.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz"; + sha1 = "9ab5627b93e60621ff7cdac5da9733027df1d0cb"; + }; + }; + "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"; + }; + }; + "bencode-0.7.0" = { + name = "bencode"; + packageName = "bencode"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bencode/-/bencode-0.7.0.tgz"; + sha1 = "811ed647c0118945e41bb4bbbdea9a2c78a17083"; + }; + }; + "bencode-0.8.0" = { + name = "bencode"; + packageName = "bencode"; + version = "0.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bencode/-/bencode-0.8.0.tgz"; + sha1 = "3143448e82b0fadc745633ecc2a5f8fa87932f19"; + }; + }; + "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"; + }; + }; + "better-assert-1.0.2" = { + name = "better-assert"; + packageName = "better-assert"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz"; + sha1 = "40866b9e1b9e0b55b481894311e68faffaebc522"; + }; + }; + "better-curry-1.6.0" = { + name = "better-curry"; + packageName = "better-curry"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/better-curry/-/better-curry-1.6.0.tgz"; + sha1 = "38f716b24c8cee07a262abc41c22c314e20e3869"; + }; + }; + "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"; + }; + }; + "big-integer-1.6.26" = { + name = "big-integer"; + packageName = "big-integer"; + version = "1.6.26"; + src = fetchurl { + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.26.tgz"; + sha1 = "3af1672fa62daf2d5ecafacf6e5aa0d25e02c1c8"; + }; + }; + "big.js-3.2.0" = { + name = "big.js"; + packageName = "big.js"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz"; + sha512 = "3qicqys1bg16slzbzjn3f0fir82r4d1h6lvy5y0cqqwzbs2iaxf93xgi6x47m7l87i102ifjn4qvjbf764gyncsxcqw7lw33mk7y4zs"; + }; + }; + "bin-version-1.0.4" = { + name = "bin-version"; + packageName = "bin-version"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/bin-version/-/bin-version-1.0.4.tgz"; + sha1 = "9eb498ee6fd76f7ab9a7c160436f89579435d78e"; + }; + }; + "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/bin-version-check/-/bin-version-check-2.1.0.tgz"; + sha1 = "e4e5df290b9069f7d111324031efc13fdd11a5b0"; + }; + }; + "binary-0.3.0" = { + name = "binary"; + packageName = "binary"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz"; + sha1 = "9f60553bc5ce8c3386f3b553cff47462adecaa79"; + }; + }; + "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"; + }; + }; + "binaryheap-0.0.3" = { + name = "binaryheap"; + packageName = "binaryheap"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/binaryheap/-/binaryheap-0.0.3.tgz"; + sha1 = "0d6136c84e9f1a5a90c0b97178c3e00df59820d6"; + }; + }; + "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"; + }; + }; + "bindings-1.3.0" = { + name = "bindings"; + packageName = "bindings"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz"; + sha512 = "15lvjac4av3h7xmks8jgd56vryz5xb27r8xcpfwhfyr9dv305lms5llc1x6nx6nfvha873d4vg04nfi89aj4jkxplrnjiyc9kjf34hf"; + }; + }; + "binstall-1.2.0" = { + name = "binstall"; + packageName = "binstall"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/binstall/-/binstall-1.2.0.tgz"; + sha1 = "6b2c0f580b9e3c607f50ef7a22a54ce9fdc8d933"; + }; + }; + "bitfield-0.1.0" = { + name = "bitfield"; + packageName = "bitfield"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bitfield/-/bitfield-0.1.0.tgz"; + sha1 = "b05d8b5f0d09f2df35a9db3b3a62d3808c46c457"; + }; + }; + "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"; + }; + }; + "bitsyntax-0.0.4" = { + name = "bitsyntax"; + packageName = "bitsyntax"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/bitsyntax/-/bitsyntax-0.0.4.tgz"; + sha1 = "eb10cc6f82b8c490e3e85698f07e83d46e0cba82"; + }; + }; + "bittorrent-dht-6.4.2" = { + name = "bittorrent-dht"; + packageName = "bittorrent-dht"; + version = "6.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-6.4.2.tgz"; + sha1 = "8b40f8cee6bea87f2b34fd2ae0bd367a8b1247a6"; + }; + }; + "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"; + }; + }; + "bittorrent-tracker-7.7.0" = { + name = "bittorrent-tracker"; + packageName = "bittorrent-tracker"; + version = "7.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-7.7.0.tgz"; + sha1 = "ffd2eabc141d36ed5c1817df7e992f91fd7fc65c"; + }; + }; + "bl-0.8.2" = { + name = "bl"; + packageName = "bl"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-0.8.2.tgz"; + sha1 = "c9b6bca08d1bc2ea00fc8afb4f1a5fd1e1c66e4e"; + }; + }; + "bl-1.0.3" = { + name = "bl"; + packageName = "bl"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz"; + sha1 = "fc5421a28fd4226036c3b3891a66a25bc64d226e"; }; }; "bl-1.1.2" = { @@ -2938,148 +2605,202 @@ let sha1 = "fdca871a99713aa00d19e3bbba41c44787a65398"; }; }; - "caseless-0.11.0" = { - name = "caseless"; - packageName = "caseless"; - version = "0.11.0"; + "bl-1.2.1" = { + name = "bl"; + packageName = "bl"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"; - sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7"; + url = "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz"; + sha1 = "cac328f7bee45730d404b692203fcb590e172d5e"; }; }; - "form-data-1.0.1" = { - name = "form-data"; - packageName = "form-data"; - version = "1.0.1"; + "blake2b-2.1.2" = { + name = "blake2b"; + packageName = "blake2b"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz"; - sha1 = "ae315db9a4907fa065502304a66d7733475ee37c"; + url = "https://registry.npmjs.org/blake2b/-/blake2b-2.1.2.tgz"; + sha1 = "6880eddca35cfede92c4fb2724221334f989145a"; }; }; - "har-validator-2.0.6" = { - name = "har-validator"; - packageName = "har-validator"; - version = "2.0.6"; + "blake2b-wasm-1.1.7" = { + name = "blake2b-wasm"; + packageName = "blake2b-wasm"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz"; - sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"; + url = "https://registry.npmjs.org/blake2b-wasm/-/blake2b-wasm-1.1.7.tgz"; + sha512 = "1q4aaql83818qzgh01c6x9jvcchmd6bq7r0kfs3f364vhwxnp7qc25y3h2ij5751mi1zhh96874ib0afn8an92xh3ag1kv5g2yhflm0"; }; }; - "hawk-3.1.3" = { - name = "hawk"; - packageName = "hawk"; - version = "3.1.3"; + "blob-0.0.2" = { + name = "blob"; + packageName = "blob"; + version = "0.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"; - sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4"; + url = "https://registry.npmjs.org/blob/-/blob-0.0.2.tgz"; + sha1 = "b89562bd6994af95ba1e812155536333aa23cf24"; }; }; - "http-signature-1.1.1" = { - name = "http-signature"; - packageName = "http-signature"; - version = "1.1.1"; + "blob-0.0.4" = { + name = "blob"; + packageName = "blob"; + version = "0.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"; - sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf"; + url = "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz"; + sha1 = "bcf13052ca54463f30f9fc7e95b9a47630a94921"; }; }; - "qs-6.2.3" = { - name = "qs"; - packageName = "qs"; - version = "6.2.3"; + "blob-to-buffer-1.2.6" = { + name = "blob-to-buffer"; + packageName = "blob-to-buffer"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.2.3.tgz"; - sha1 = "1cfcb25c10a9b2b483053ff39f5dfc9233908cfe"; + url = "https://registry.npmjs.org/blob-to-buffer/-/blob-to-buffer-1.2.6.tgz"; + sha1 = "089ac264c686b73ead6c539a484a8003bfbb2033"; }; }; - "tunnel-agent-0.4.3" = { - name = "tunnel-agent"; - packageName = "tunnel-agent"; - version = "0.4.3"; + "block-stream-0.0.9" = { + name = "block-stream"; + packageName = "block-stream"; + version = "0.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"; - sha1 = "6373db76909fe570e08d73583365ed828a74eeeb"; + url = "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz"; + sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a"; }; }; - "is-my-json-valid-2.17.1" = { - name = "is-my-json-valid"; - packageName = "is-my-json-valid"; - version = "2.17.1"; + "bluebird-2.9.34" = { + name = "bluebird"; + packageName = "bluebird"; + version = "2.9.34"; src = fetchurl { - url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.1.tgz"; - sha512 = "2qkjhj6i3y40j35y8k722kklm1j8dfwk9506csa3vxr16vv7125v8jzpmkl551gsif98bzn205yj3sb99xi1i4bd6p5a1m81wvj2sa3"; + url = "https://registry.npmjs.org/bluebird/-/bluebird-2.9.34.tgz"; + sha1 = "2f7b4ec80216328a9fddebdf69c8d4942feff7d8"; }; }; - "pinkie-promise-2.0.1" = { - name = "pinkie-promise"; - packageName = "pinkie-promise"; - version = "2.0.1"; + "bluebird-2.9.9" = { + name = "bluebird"; + packageName = "bluebird"; + version = "2.9.9"; src = fetchurl { - url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; - sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; + url = "https://registry.npmjs.org/bluebird/-/bluebird-2.9.9.tgz"; + sha1 = "61a26904d43d7f6b19dff7ed917dbc92452ad6d3"; }; }; - "generate-function-2.0.0" = { - name = "generate-function"; - packageName = "generate-function"; - version = "2.0.0"; + "bluebird-3.5.1" = { + name = "bluebird"; + packageName = "bluebird"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"; - sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74"; + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz"; + sha512 = "2631bhp784qng0ifbypsmvijn6kjfvkhq2335kdz8ix5qi3wb3lbpg94xjn1av2s6i95ygr5a4y9j1721dw6zdbywwh1m48by4qpa1h"; }; }; - "generate-object-property-1.2.0" = { - name = "generate-object-property"; - packageName = "generate-object-property"; - version = "1.2.0"; + "blueimp-md5-2.10.0" = { + name = "blueimp-md5"; + packageName = "blueimp-md5"; + version = "2.10.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/blueimp-md5/-/blueimp-md5-2.10.0.tgz"; + sha512 = "18r5wdrfrrjip7xipgxyg673njbfkj46hkswp4bmb5n7zx6gmajrashp6w32rkvhanymnx6rd7mrlqgzm68ksd89sy5x9gd5qx58hqj"; }; }; - "jsonpointer-4.0.1" = { - name = "jsonpointer"; - packageName = "jsonpointer"; - version = "4.0.1"; + "bn.js-4.11.8" = { + name = "bn.js"; + packageName = "bn.js"; + version = "4.11.8"; src = fetchurl { - url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz"; - sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"; + url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz"; + sha512 = "20bg51v29zygy89w84qb64pkjikxfjdsgjs0ry6pvv8fkwn5kd1izrqn022d838q3rcaq8dmy033g7q8b6960j4f8ipan74y9ydimr2"; }; }; - "xtend-4.0.1" = { - name = "xtend"; - packageName = "xtend"; - version = "4.0.1"; + "bncode-0.2.3" = { + name = "bncode"; + packageName = "bncode"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"; - sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; + url = "https://registry.npmjs.org/bncode/-/bncode-0.2.3.tgz"; + sha1 = "37f851dc8e47188a83fbc0f6fa4775cacc9a3296"; }; }; - "is-property-1.0.2" = { - name = "is-property"; - packageName = "is-property"; - version = "1.0.2"; + "bncode-0.5.3" = { + name = "bncode"; + packageName = "bncode"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"; - sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; + url = "https://registry.npmjs.org/bncode/-/bncode-0.5.3.tgz"; + sha1 = "e16661697452d436bf9886238cc791b08d66a61a"; }; }; - "pinkie-2.0.4" = { - name = "pinkie"; - packageName = "pinkie"; - version = "2.0.4"; + "body-0.1.0" = { + name = "body"; + packageName = "body"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"; - sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; + url = "https://registry.npmjs.org/body/-/body-0.1.0.tgz"; + sha1 = "e714fe28cd8848aa34cdf2c9f242bbe2e15d1cd8"; }; }; - "hoek-2.16.3" = { - name = "hoek"; - packageName = "hoek"; - version = "2.16.3"; + "body-5.1.0" = { + name = "body"; + packageName = "body"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"; - sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; + 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.17.2" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.17.2"; + src = fetchurl { + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.17.2.tgz"; + sha1 = "f8892abc8f9e627d42aedafbca66bf5ab99104ee"; + }; + }; + "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/boolbase/-/boolbase-1.0.0.tgz"; + sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"; + }; + }; + "boom-0.3.8" = { + name = "boom"; + packageName = "boom"; + version = "0.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/boom/-/boom-0.3.8.tgz"; + sha1 = "c8cdb041435912741628c044ecc732d1d17c09ea"; }; }; "boom-2.10.1" = { @@ -3091,202 +2812,49 @@ let sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; }; }; - "cryptiles-2.0.5" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "2.0.5"; + "boom-4.3.1" = { + name = "boom"; + packageName = "boom"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"; - sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8"; + url = "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz"; + sha1 = "4f8a3005cb4a7e3889f749030fd25b96e01d2e31"; }; }; - "sntp-1.0.9" = { - name = "sntp"; - packageName = "sntp"; - version = "1.0.9"; + "boom-5.2.0" = { + name = "boom"; + packageName = "boom"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; - sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; + url = "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz"; + sha512 = "19h20yqpvca08dns1rs4f057f10w63v0snxfml4h5khsk266x3x1im0w72bza4k2xn0kfz6jlv001dhcvxsjr09bmbqnysils9m7437"; }; }; - "assert-plus-0.2.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "0.2.0"; + "bops-0.1.1" = { + name = "bops"; + packageName = "bops"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"; - sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; + url = "https://registry.npmjs.org/bops/-/bops-0.1.1.tgz"; + sha1 = "062e02a8daa801fa10f2e5dbe6740cff801fe17e"; }; }; - "asn1-0.1.11" = { - name = "asn1"; - packageName = "asn1"; - version = "0.1.11"; + "bottleneck-1.5.3" = { + name = "bottleneck"; + packageName = "bottleneck"; + version = "1.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; - sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; + url = "https://registry.npmjs.org/bottleneck/-/bottleneck-1.5.3.tgz"; + sha1 = "55fa64920d9670087d44150404525d59f9511c20"; }; }; - "ctype-0.5.2" = { - name = "ctype"; - packageName = "ctype"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"; - sha1 = "fe8091d468a373a0b0c9ff8bbfb3425c00973a1d"; - }; - }; - "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"; - }; - }; - "fibers-1.0.15" = { - name = "fibers"; - packageName = "fibers"; - version = "1.0.15"; - src = fetchurl { - url = "https://registry.npmjs.org/fibers/-/fibers-1.0.15.tgz"; - sha1 = "22f039c8f18b856190fbbe4decf056154c1eae9c"; - }; - }; - "galaxy-0.1.12" = { - name = "galaxy"; - packageName = "galaxy"; - version = "0.1.12"; - src = fetchurl { - url = "https://registry.npmjs.org/galaxy/-/galaxy-0.1.12.tgz"; - sha1 = "0c989774f2870c69378aa665648cdc60f343aa53"; - }; - }; - "amdefine-1.0.1" = { - name = "amdefine"; - packageName = "amdefine"; + "boundary-1.0.1" = { + name = "boundary"; + packageName = "boundary"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"; - sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; - }; - }; - "concat-stream-1.6.0" = { - name = "concat-stream"; - packageName = "concat-stream"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz"; - sha1 = "0aac662fd52be78964d5532f694784e70110acf7"; - }; - }; - "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/http-response-object/-/http-response-object-1.1.0.tgz"; - sha1 = "a7c4e75aae82f3bb4904e4f43f615673b4d518c3"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "http-basic-2.5.1" = { - name = "http-basic"; - packageName = "http-basic"; - version = "2.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-basic/-/http-basic-2.5.1.tgz"; - sha1 = "8ce447bdb5b6c577f8a63e3fa78056ec4bb4dbfb"; - }; - }; - "promise-7.3.1" = { - name = "promise"; - packageName = "promise"; - version = "7.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz"; - sha512 = "17cn4nns2nxh9r0pdiqsqx3fpvaa82c1mhcr8r84k2a9hkpb0mj4bxzfbg3l9iy74yn9hj6mh2gsddsi3v939a1zp7ycbzqkxfm12cy"; - }; - }; - "asap-2.0.6" = { - name = "asap"; - packageName = "asap"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz"; - sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "argparse-1.0.4" = { - name = "argparse"; - packageName = "argparse"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/argparse/-/argparse-1.0.4.tgz"; - sha1 = "2b12247b933001971addcbfe4e67d20fd395bbf4"; + url = "https://registry.npmjs.org/boundary/-/boundary-1.0.1.tgz"; + sha1 = "4d67dc2602c0cc16dd9bce7ebf87e948290f5812"; }; }; "bower-1.8.2" = { @@ -3325,4432 +2893,31 @@ let sha1 = "0c1817c48063a88d96cc3d516c55e57fff5d9ecb"; }; }; - "lodash-4.2.1" = { - name = "lodash"; - packageName = "lodash"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.2.1.tgz"; - sha1 = "171fdcfbbc30d689c544cd18c0529f56de6c1aa9"; - }; - }; - "promised-temp-0.1.0" = { - name = "promised-temp"; - packageName = "promised-temp"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/promised-temp/-/promised-temp-0.1.0.tgz"; - sha1 = "5f8a704ccdf5f2ac23996fcafe2b301bc2a8d0eb"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "ext-name-3.0.0" = { - name = "ext-name"; - packageName = "ext-name"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ext-name/-/ext-name-3.0.0.tgz"; - sha1 = "07e4418737cb1f513c32c6ea48d8b8c8e0471abb"; - }; - }; - "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"; - }; - }; - "intersect-1.0.1" = { - name = "intersect"; - packageName = "intersect"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/intersect/-/intersect-1.0.1.tgz"; - sha1 = "332650e10854d8c0ac58c192bdc27a8bf7e7a30c"; - }; - }; - "ends-with-0.2.0" = { - name = "ends-with"; - packageName = "ends-with"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ends-with/-/ends-with-0.2.0.tgz"; - sha1 = "2f9da98d57a50cfda4571ce4339000500f4e6b8a"; - }; - }; - "ext-list-2.2.2" = { - name = "ext-list"; - packageName = "ext-list"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz"; - sha512 = "0a77zmipy5silq8yx7adj0hw82ccvshbs5alv3h8l0vk83lkm5m7pw6y2781wnbks8h98ixyn2q3q065l6m8pwbrhxa3bcvrf191r5v"; - }; - }; - "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"; - }; - }; - "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/sort-keys-length/-/sort-keys-length-1.0.1.tgz"; - sha1 = "9cb6f4f4e9e48155a6aa0671edd336ff1479a188"; - }; - }; - "mime-db-1.32.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.32.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.32.0.tgz"; - sha512 = "1bl21q8acya2jj67757518bdy1yhc5d7ybn755wnikwcca3gq5akfg835nj5mp2kmd4f97yyy0qwx662jlwk1rgx7nl9qsd2vzsi5gr"; - }; - }; - "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.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"; - }; - }; - "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.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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "sort-keys-1.1.2" = { - name = "sort-keys"; - packageName = "sort-keys"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz"; - sha1 = "441b6d4d346798f1b4e49e8920adfba0e543f9ad"; - }; - }; - "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/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; - sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e"; - }; - }; - "natives-1.1.1" = { - name = "natives"; - packageName = "natives"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/natives/-/natives-1.1.1.tgz"; - sha512 = "08a9lf00d2pkqmdi6ipp00pjin0gwl6fh283cjdjbayaz834lppwrw19kn4s642kwa46bfcway3033j6rbqd96iy86qrzrfgz35mr7i"; - }; - }; - "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"; - }; - }; - "JSONStream-1.3.2" = { - name = "JSONStream"; - packageName = "JSONStream"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz"; - sha1 = "c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea"; - }; - }; - "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"; - }; - }; - "browser-pack-6.0.2" = { - name = "browser-pack"; - packageName = "browser-pack"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.2.tgz"; - sha1 = "f86cd6cef4f5300c8e63e07a4d512f65fbff4531"; - }; - }; - "browser-resolve-1.11.2" = { - name = "browser-resolve"; - packageName = "browser-resolve"; - version = "1.11.2"; - src = fetchurl { - url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.2.tgz"; - sha1 = "8ff09b0a2c421718a1051c260b32e48f442938ce"; - }; - }; - "browserify-zlib-0.2.0" = { - name = "browserify-zlib"; - packageName = "browserify-zlib"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz"; - sha512 = "24488d4s6d901hj9d9jdddapmcvmibbdpjq6nv3bpyjx72546fcqa0vripy0ydsrw1jk6bakfzvynh5i9cz0g59hrmn4ph75d3kdpk7"; - }; - }; - "buffer-5.0.8" = { - name = "buffer"; - packageName = "buffer"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.0.8.tgz"; - sha512 = "0capij8lgps5fzc5hikkkdsn58lmzfdpni7v2m0ham5r67q24kln1spwz4dnk3nh6zkiqmgz0cqnq591pms1pkkv8prvksd2m1f6yy5"; - }; - }; - "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/cached-path-relative/-/cached-path-relative-1.0.1.tgz"; - sha1 = "d09c4b52800aa4c078e2dd81a869aac90d2e54e7"; - }; - }; - "concat-stream-1.5.2" = { - name = "concat-stream"; - packageName = "concat-stream"; - version = "1.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz"; - sha1 = "708978624d856af41a5a741defdd261da752c266"; - }; - }; - "console-browserify-1.1.0" = { - name = "console-browserify"; - packageName = "console-browserify"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz"; - sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10"; - }; - }; - "constants-browserify-1.0.0" = { - name = "constants-browserify"; - packageName = "constants-browserify"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz"; - sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; - }; - }; - "crypto-browserify-3.12.0" = { - name = "crypto-browserify"; - packageName = "crypto-browserify"; - version = "3.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz"; - sha512 = "1d3mrhqlay037azmjp2ml5a8yyls9ijdhilv6f0znz0ajgfm972yr9bhm78wqi09p4crc3shgflk50jc63zijsqv777ikkyi2j2qgkz"; - }; - }; - "defined-1.0.0" = { - name = "defined"; - packageName = "defined"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz"; - sha1 = "c98d9bcef75674188e110969151199e39b1fa693"; - }; - }; - "deps-sort-2.0.0" = { - name = "deps-sort"; - packageName = "deps-sort"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.0.tgz"; - sha1 = "091724902e84658260eb910748cccd1af6e21fb5"; - }; - }; - "domain-browser-1.1.7" = { - name = "domain-browser"; - packageName = "domain-browser"; - version = "1.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz"; - sha1 = "867aa4b093faa05f1de08c06f4d7b21fdf8698bc"; - }; - }; - "duplexer2-0.1.4" = { - name = "duplexer2"; - packageName = "duplexer2"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz"; - sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1"; - }; - }; - "events-1.1.1" = { - name = "events"; - packageName = "events"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/events/-/events-1.1.1.tgz"; - sha1 = "9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"; - }; - }; - "has-1.0.1" = { - name = "has"; - packageName = "has"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/has/-/has-1.0.1.tgz"; - sha1 = "8461733f538b0837c9361e39a9ab9e9704dc2f28"; - }; - }; - "htmlescape-1.1.1" = { - name = "htmlescape"; - packageName = "htmlescape"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz"; - sha1 = "3a03edc2214bca3b66424a3e7959349509cb0351"; - }; - }; - "https-browserify-1.0.0" = { - name = "https-browserify"; - packageName = "https-browserify"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz"; - sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"; - }; - }; - "insert-module-globals-7.0.1" = { - name = "insert-module-globals"; - packageName = "insert-module-globals"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.0.1.tgz"; - sha1 = "c03bf4e01cb086d5b5e5ace8ad0afe7889d638c3"; - }; - }; - "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/labeled-stream-splicer/-/labeled-stream-splicer-2.0.0.tgz"; - sha1 = "a52e1d138024c00b86b1c0c91f677918b8ae0a59"; - }; - }; - "module-deps-4.1.1" = { - name = "module-deps"; - packageName = "module-deps"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/module-deps/-/module-deps-4.1.1.tgz"; - sha1 = "23215833f1da13fd606ccb8087b44852dcb821fd"; - }; - }; - "os-browserify-0.3.0" = { - name = "os-browserify"; - packageName = "os-browserify"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz"; - sha1 = "854373c7f5c2315914fc9bfc6bd8238fdda1ec27"; - }; - }; - "parents-1.0.1" = { - name = "parents"; - packageName = "parents"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz"; - sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751"; - }; - }; - "path-browserify-0.0.0" = { - name = "path-browserify"; - packageName = "path-browserify"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz"; - sha1 = "a0b870729aae214005b7d5032ec2cbbb0fb4451a"; - }; - }; - "process-0.11.10" = { - name = "process"; - packageName = "process"; - version = "0.11.10"; - src = fetchurl { - url = "https://registry.npmjs.org/process/-/process-0.11.10.tgz"; - sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182"; - }; - }; - "querystring-es3-0.2.1" = { - name = "querystring-es3"; - packageName = "querystring-es3"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz"; - sha1 = "9ec61f79049875707d69414596fd907a4d711e73"; - }; - }; - "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/read-only-stream/-/read-only-stream-2.0.0.tgz"; - sha1 = "2724fd6a8113d73764ac288d4386270c1dbf17f0"; - }; - }; - "shasum-1.0.2" = { - name = "shasum"; - packageName = "shasum"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz"; - sha1 = "e7012310d8f417f4deb5712150e5678b87ae565f"; - }; - }; - "shell-quote-1.6.1" = { - name = "shell-quote"; - packageName = "shell-quote"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz"; - sha1 = "f4781949cce402697127430ea3b3c5476f481767"; - }; - }; - "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-http-2.7.2" = { - name = "stream-http"; - packageName = "stream-http"; - version = "2.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz"; - sha512 = "09n1hj53jy075fnbsaaiknry7in0l4yarh912abwgvk4hwl33lvn8wrfw891zg5bkfa7sxlmd5yz3xxd4dmcln19bnkahyvd87r6k3k"; - }; - }; - "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"; - }; - }; - "syntax-error-1.3.0" = { - name = "syntax-error"; - packageName = "syntax-error"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.3.0.tgz"; - sha1 = "1ed9266c4d40be75dc55bf9bb1cb77062bb96ca1"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "jsonparse-1.3.1" = { - name = "jsonparse"; - packageName = "jsonparse"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz"; - sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280"; - }; - }; - "combine-source-map-0.7.2" = { - name = "combine-source-map"; - packageName = "combine-source-map"; - version = "0.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.7.2.tgz"; - 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"; - src = fetchurl { - url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz"; - sha1 = "4829c877e9fe49b3161f3bf3673888e204699860"; - }; - }; - "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/inline-source-map/-/inline-source-map-0.6.2.tgz"; - sha1 = "f9393471c18a79d1724f863fa38b586370ade2a5"; - }; - }; - "lodash.memoize-3.0.4" = { - name = "lodash.memoize"; - packageName = "lodash.memoize"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz"; - sha1 = "2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"; - }; - }; - "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"; - }; - }; - "pako-1.0.6" = { - name = "pako"; - packageName = "pako"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz"; - sha512 = "1r9hy37qsbhv5ipsydkbir2yl7qg3lbpgj4qzrnb903w8mhj9ibaww0zykbp0ak1nxxp6mpbws3xsrf7fgq39zchci90c7chgqvh1wm"; - }; - }; - "base64-js-1.2.1" = { - name = "base64-js"; - packageName = "base64-js"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz"; - sha512 = "0dhi66vsajfcm04s11xqklh5lj3abs4ncnl8h3689964aqam3ps9spmc454hz94rz3x1x5l1ad03jrba67mq9zc9vq9a1gchma581bp"; - }; - }; - "ieee754-1.1.8" = { - name = "ieee754"; - packageName = "ieee754"; - version = "1.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz"; - sha1 = "be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "create-hash-1.1.3" = { - name = "create-hash"; - packageName = "create-hash"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz"; - sha1 = "606042ac8b9262750f483caddab0f5819172d8fd"; - }; - }; - "create-hmac-1.1.6" = { - name = "create-hmac"; - packageName = "create-hmac"; - version = "1.1.6"; - src = fetchurl { - 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"; - src = fetchurl { - url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz"; - sha1 = "b5835739270cfe26acf632099fded2a07f209e5e"; - }; - }; - "pbkdf2-3.0.14" = { - name = "pbkdf2"; - packageName = "pbkdf2"; - version = "3.0.14"; - src = fetchurl { - url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz"; - sha512 = "30bb7vx0m1k1m3d1i1khgvmgddx3ahqgprs421ssrh5plpx50k5bazsj67gdi7qiknircqy59yxbclq95s2rnmk8ysgkqdpsddijfw2"; - }; - }; - "public-encrypt-4.0.0" = { - name = "public-encrypt"; - packageName = "public-encrypt"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz"; - sha1 = "39f699f3a46560dd5ebacbca693caf7c65c18cc6"; - }; - }; - "randombytes-2.0.5" = { - name = "randombytes"; - packageName = "randombytes"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz"; - sha512 = "293m4ffiafbjg0b99a2k78wiffmlwc2v7cigrn5l3n7555x7qxyr34sp0s4p713vwlaf0ny5n57iysgkz08slld3hzw8ci1a2gxjgpi"; - }; - }; - "randomfill-1.0.3" = { - name = "randomfill"; - packageName = "randomfill"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/randomfill/-/randomfill-1.0.3.tgz"; - sha512 = "08l7hdx65kfxli7g9pcnlv84bdrccj7d267d1kfi93db6a4mihwyhvsipmx2n0yk9z45cs21isgpld6rib5saxg28s2g8nn3ap8dgk0"; - }; - }; - "browserify-aes-1.1.1" = { - name = "browserify-aes"; - packageName = "browserify-aes"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.1.tgz"; - sha512 = "0b874c5j68a6h1smd9avnc98zpjy2b4sykkhfpn97lzg7k5aq3ab0jdsmxjafifm0sa3srwscfpcl70gwnlg242p7cavnf115hd6sah"; - }; - }; - "browserify-des-1.0.0" = { - name = "browserify-des"; - packageName = "browserify-des"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz"; - sha1 = "daa277717470922ed2fe18594118a175439721dd"; - }; - }; - "evp_bytestokey-1.0.3" = { - name = "evp_bytestokey"; - packageName = "evp_bytestokey"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz"; - sha512 = "1wd18zxd7n42asa63aa4k1bdf58warg29c7c8cdzzkd4r1wva7qwzqnn52h8g8hqwj7bxjkk3ryghajrvz4i27h5bzp30p8hjiqdzgx"; - }; - }; - "buffer-xor-1.0.3" = { - name = "buffer-xor"; - packageName = "buffer-xor"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"; - sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9"; - }; - }; - "cipher-base-1.0.4" = { - name = "cipher-base"; - packageName = "cipher-base"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz"; - sha512 = "3cm9kdc1sv7pakzlhrc1pazdvg9lk4hv31lximwbcrgmwfzg6imxrndszgx9yzlizknfh2b73cr7b5mfcv50bldpyq6jr5s4zknsj1a"; - }; - }; - "des.js-1.0.0" = { - name = "des.js"; - packageName = "des.js"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz"; - sha1 = "c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"; - }; - }; - "minimalistic-assert-1.0.0" = { - name = "minimalistic-assert"; - packageName = "minimalistic-assert"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"; - sha1 = "702be2dda6b37f4836bcb3f5db56641b64a1d3d3"; - }; - }; - "bn.js-4.11.8" = { - name = "bn.js"; - packageName = "bn.js"; - version = "4.11.8"; - src = fetchurl { - url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz"; - sha512 = "20bg51v29zygy89w84qb64pkjikxfjdsgjs0ry6pvv8fkwn5kd1izrqn022d838q3rcaq8dmy033g7q8b6960j4f8ipan74y9ydimr2"; - }; - }; - "browserify-rsa-4.0.1" = { - name = "browserify-rsa"; - packageName = "browserify-rsa"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz"; - sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; - }; - }; - "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"; - }; - }; - "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"; - src = fetchurl { - url = "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz"; - sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f"; - }; - }; - "hash.js-1.1.3" = { - name = "hash.js"; - packageName = "hash.js"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz"; - sha512 = "0f88i7rv3ib8lwdh5z5lwrml404frzb1a9n3g25y85jpfng82vzsv7m3c5fbyrpq5ki4c3pa8823z3s61xfigm45q469nqnzp416hgx"; - }; - }; - "hmac-drbg-1.0.1" = { - name = "hmac-drbg"; - packageName = "hmac-drbg"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz"; - sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1"; - }; - }; - "minimalistic-crypto-utils-1.0.1" = { - name = "minimalistic-crypto-utils"; - packageName = "minimalistic-crypto-utils"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"; - sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"; - }; - }; - "asn1.js-4.9.2" = { - name = "asn1.js"; - packageName = "asn1.js"; - version = "4.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.2.tgz"; - sha512 = "071d32h5646ddyfxvmm0yd0xc320zh2cdsjal4hs8cs0hgn9dpq7k9c9ndlhjq3y93nlawkinm99znqvp0cxx61ic7qy4nn7d5arwvg"; - }; - }; - "ripemd160-2.0.1" = { - name = "ripemd160"; - packageName = "ripemd160"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz"; - sha1 = "0f4584295c53a3628af7e6d79aca21ce57d1c6e7"; - }; - }; - "sha.js-2.4.9" = { - name = "sha.js"; - packageName = "sha.js"; - version = "2.4.9"; - src = fetchurl { - url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.9.tgz"; - sha512 = "3l96mlw71zgkmfm9madd3jcndrpm2fm4jz2q5gz9mbm27mdg89hsbrg22pfl32ha76xa3pza83m2mc3b47pnq19mz3j6vkasn9dxk0v"; - }; - }; - "hash-base-2.0.2" = { - name = "hash-base"; - packageName = "hash-base"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz"; - sha1 = "66ea1d856db4e8a5470cadf6fce23ae5244ef2e1"; - }; - }; - "miller-rabin-4.0.1" = { - name = "miller-rabin"; - packageName = "miller-rabin"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz"; - sha512 = "12277knznlw4myxmgg6vgkrwmrhj9dyniscrlph3s08ndi2q25v3wrv6rwanvz29v5k5x756xa5yif4xllrghpn3jqaamnr3cp5ypnp"; - }; - }; - "function-bind-1.1.1" = { - name = "function-bind"; - packageName = "function-bind"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; - sha512 = "38chm1mh077ksx6hy2sssfz4q29hf0ncb9k6ila7si54zqcpl5fxd1rh6wi82blqp7jcspf4aynr7jqhbsg2yc9y42xpqqp6c1jz2n8"; - }; - }; - "lexical-scope-1.2.0" = { - name = "lexical-scope"; - packageName = "lexical-scope"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz"; - sha1 = "fcea5edc704a4b3a8796cdca419c3a0afaf22df4"; - }; - }; - "astw-2.2.0" = { - name = "astw"; - packageName = "astw"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/astw/-/astw-2.2.0.tgz"; - sha1 = "7bd41784d32493987aeb239b6b4e1c57a873b917"; - }; - }; - "acorn-4.0.13" = { - name = "acorn"; - packageName = "acorn"; - version = "4.0.13"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz"; - sha1 = "105495ae5361d697bd195c825192e1ad7f253787"; - }; - }; - "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"; - }; - }; - "detective-4.7.1" = { - name = "detective"; - packageName = "detective"; - version = "4.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz"; - sha512 = "259c687nsmq5ni5q79081s6lpd2srwn7xlwipxwbrqkq9bq0zsvwb0n1d99jc7c6kvpm95bhvvlncfb0l4hqy6vnlb5lrhwwmwyd8qz"; - }; - }; - "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"; - }; - }; - "acorn-5.2.1" = { - name = "acorn"; - packageName = "acorn"; - version = "5.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz"; - sha512 = "3ryzhy30vzfnn2a0crafh3qsrx145ali8i88q1bc0lzl1dz0ycmjmmwh2yn9xfjs3vmjxl7nphpwcs4imgz3da5jb8fvjqbrvnjwvcc"; - }; - }; - "path-platform-0.11.15" = { - name = "path-platform"; - packageName = "path-platform"; - version = "0.11.15"; - src = fetchurl { - url = "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz"; - sha1 = "e864217f74c36850f0852b78dc7bf7d4a5721bf2"; - }; - }; - "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/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz"; - sha1 = "611c23e814db375527df851193db59dd2af27f45"; - }; - }; - "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"; - }; - }; - "array-filter-0.0.1" = { - name = "array-filter"; - packageName = "array-filter"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz"; - sha1 = "7da8cf2e26628ed732803581fd21f67cacd2eeec"; - }; - }; - "array-reduce-0.0.0" = { - name = "array-reduce"; - packageName = "array-reduce"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz"; - sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b"; - }; - }; - "array-map-0.0.0" = { - name = "array-map"; - packageName = "array-map"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz"; - sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662"; - }; - }; - "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/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz"; - sha1 = "85982878e21b98e1c66425e03d0174788f569ee8"; - }; - }; - "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"; - }; - }; - "punycode-1.3.2" = { - name = "punycode"; - packageName = "punycode"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; - sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; - }; - }; - "querystring-0.2.0" = { - name = "querystring"; - packageName = "querystring"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"; - sha1 = "b209849203bb25df820da756e747005878521620"; - }; - }; - "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"; - }; - }; - "indexof-0.0.1" = { - name = "indexof"; - packageName = "indexof"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"; - sha1 = "82dc336d232b9062179d05ab3293a66059fd435d"; - }; - }; - "array-loop-1.0.0" = { - name = "array-loop"; - packageName = "array-loop"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-loop/-/array-loop-1.0.0.tgz"; - sha1 = "c033d086cf0d12af73aed5a99c0cedb37367b395"; - }; - }; - "array-shuffle-1.0.1" = { - name = "array-shuffle"; - packageName = "array-shuffle"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/array-shuffle/-/array-shuffle-1.0.1.tgz"; - sha1 = "7ea4882a356b4bca5f545e0b6e52eaf6d971557a"; - }; - }; - "castv2-client-1.2.0" = { - name = "castv2-client"; - packageName = "castv2-client"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/castv2-client/-/castv2-client-1.2.0.tgz"; - sha1 = "a9193b1a5448b8cb9a0415bd021c8811ed7b0544"; - }; - }; - "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"; - src = fetchurl { - url = "https://registry.npmjs.org/chromecast-player/-/chromecast-player-0.2.3.tgz"; - sha1 = "fe9ce69911c88096d681e4242c1902ad30787216"; - }; - }; - "debounced-seeker-1.0.0" = { - name = "debounced-seeker"; - packageName = "debounced-seeker"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/debounced-seeker/-/debounced-seeker-1.0.0.tgz"; - sha1 = "e74befcd1a62ae7a5e5fbfbfa6f5d2bacd962bdd"; - }; - }; - "diveSync-0.3.0" = { - name = "diveSync"; - packageName = "diveSync"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/diveSync/-/diveSync-0.3.0.tgz"; - sha1 = "d9980493ae33beec36f4fec6f171ff218130cc12"; - }; - }; - "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"; - }; - }; - "internal-ip-1.2.0" = { - name = "internal-ip"; - packageName = "internal-ip"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/internal-ip/-/internal-ip-1.2.0.tgz"; - sha1 = "ae9fbf93b984878785d50a8de1b356956058cf5c"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "peerflix-0.34.0" = { - name = "peerflix"; - packageName = "peerflix"; - version = "0.34.0"; - src = fetchurl { - url = "https://registry.npmjs.org/peerflix/-/peerflix-0.34.0.tgz"; - sha1 = "748f7e401284bf8f2c620264d229223304199dbe"; - }; - }; - "playerui-1.2.0" = { - name = "playerui"; - packageName = "playerui"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/playerui/-/playerui-1.2.0.tgz"; - sha1 = "2d59c8cb736e189cb2398cd809469ca47077f812"; - }; - }; - "query-string-1.0.1" = { - name = "query-string"; - packageName = "query-string"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/query-string/-/query-string-1.0.1.tgz"; - sha1 = "63ac953352499ad670a9681a75680f6bf3dd1faf"; - }; - }; - "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"; - }; - }; - "read-torrent-1.3.0" = { - name = "read-torrent"; - packageName = "read-torrent"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-torrent/-/read-torrent-1.3.0.tgz"; - sha1 = "4e0ef5bea6cb24d31843eb6fa8543ad0232ab9f4"; - }; - }; - "router-0.6.2" = { - name = "router"; - packageName = "router"; - version = "0.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/router/-/router-0.6.2.tgz"; - sha1 = "6f04063a2d04eba3303a1bbc6765eef63037cf3d"; - }; - }; - "srt2vtt-1.3.1" = { - name = "srt2vtt"; - packageName = "srt2vtt"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/srt2vtt/-/srt2vtt-1.3.1.tgz"; - sha1 = "c2b5047c2c297b693d3bab518765e4b7c24d8173"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "xspfr-0.3.1" = { - name = "xspfr"; - packageName = "xspfr"; + "boxen-0.3.1" = { + name = "boxen"; + packageName = "boxen"; version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/xspfr/-/xspfr-0.3.1.tgz"; - sha1 = "f164263325ae671f53836fb210c7ddbcfda46598"; + url = "https://registry.npmjs.org/boxen/-/boxen-0.3.1.tgz"; + sha1 = "a7d898243ae622f7abb6bb604d740a76c6a5461b"; }; }; - "castv2-0.1.9" = { - name = "castv2"; - packageName = "castv2"; - version = "0.1.9"; - src = fetchurl { - url = "https://registry.npmjs.org/castv2/-/castv2-0.1.9.tgz"; - sha1 = "d0b0fab1fd06b0d9cca636886716ec1293a5905a"; - }; - }; - "protobufjs-3.8.2" = { - name = "protobufjs"; - packageName = "protobufjs"; - version = "3.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/protobufjs/-/protobufjs-3.8.2.tgz"; - sha1 = "bc826e34c3af4697e8d0af7a669e4d612aedcd17"; - }; - }; - "bytebuffer-3.5.5" = { - name = "bytebuffer"; - packageName = "bytebuffer"; - version = "3.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/bytebuffer/-/bytebuffer-3.5.5.tgz"; - sha1 = "7a6faf1a13514b083f1fcf9541c4c9bfbe7e7fd3"; - }; - }; - "ascli-0.3.0" = { - name = "ascli"; - packageName = "ascli"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ascli/-/ascli-0.3.0.tgz"; - sha1 = "5e66230e5219fe3e8952a4efb4f20fae596a813a"; - }; - }; - "long-2.4.0" = { - name = "long"; - packageName = "long"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/long/-/long-2.4.0.tgz"; - sha1 = "9fa180bb1d9500cdc29c4156766a1995e1f4524f"; - }; - }; - "bufferview-1.0.1" = { - name = "bufferview"; - packageName = "bufferview"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bufferview/-/bufferview-1.0.1.tgz"; - sha1 = "7afd74a45f937fa422a1d338c08bbfdc76cd725d"; - }; - }; - "colour-0.7.1" = { - name = "colour"; - packageName = "colour"; - version = "0.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/colour/-/colour-0.7.1.tgz"; - sha1 = "9cb169917ec5d12c0736d3e8685746df1cadf778"; - }; - }; - "optjs-3.2.2" = { - name = "optjs"; - packageName = "optjs"; - version = "3.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/optjs/-/optjs-3.2.2.tgz"; - sha1 = "69a6ce89c442a44403141ad2f9b370bd5bb6f4ee"; - }; - }; - "has-ansi-1.0.3" = { - name = "has-ansi"; - packageName = "has-ansi"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz"; - sha1 = "c0b5b1615d9e382b0ff67169d967b425e48ca538"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "ansi-regex-1.1.1" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"; - sha1 = "41c847194646375e6a1a5d10c3ca054ef9fc980d"; - }; - }; - "chromecast-scanner-0.5.0" = { - name = "chromecast-scanner"; - packageName = "chromecast-scanner"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chromecast-scanner/-/chromecast-scanner-0.5.0.tgz"; - sha1 = "01296a3e5d130cce34974eb509cbbc7d6f78dd3d"; - }; - }; - "mutate.js-0.2.0" = { - name = "mutate.js"; - packageName = "mutate.js"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mutate.js/-/mutate.js-0.2.0.tgz"; - sha1 = "2e5cb1ac64c937dae28296e8f42af5eafd9bc7ef"; - }; - }; - "promiscuous-0.6.0" = { - name = "promiscuous"; - packageName = "promiscuous"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/promiscuous/-/promiscuous-0.6.0.tgz"; - sha1 = "54014cd3d62cafe831e3354990c05ff5b78c8892"; - }; - }; - "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"; - }; - }; - "ware-1.3.0" = { - name = "ware"; - packageName = "ware"; + "boxen-1.3.0" = { + name = "boxen"; + packageName = "boxen"; version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ware/-/ware-1.3.0.tgz"; - sha1 = "d1b14f39d2e2cb4ab8c4098f756fe4b164e473d4"; + url = "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz"; + sha512 = "0pmn5jcnph7yfgfhlncg1lys066cq44kavj4d9qhmyy9705w61pabpwlma09xg4xplzbxh78d3m4xwvjwk478r3xyqnmpzq79yy7lsc"; }; }; - "array-find-0.1.1" = { - name = "array-find"; - packageName = "array-find"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/array-find/-/array-find-0.1.1.tgz"; - sha1 = "dc813845ad5a9afc35cb92b786c878d81b5b82ce"; - }; - }; - "multicast-dns-4.0.1" = { - name = "multicast-dns"; - packageName = "multicast-dns"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-4.0.1.tgz"; - sha1 = "abf022fc866727055a9e0c2bc98097f5ebad97a2"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "append-0.1.1" = { - name = "append"; - packageName = "append"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/append/-/append-0.1.1.tgz"; - sha1 = "7e5dd327747078d877286fbb624b1e8f4d2b396b"; - }; - }; - "object-assign-1.0.0" = { - name = "object-assign"; - packageName = "object-assign"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz"; - sha1 = "e65dc8766d3b47b4b8307465c8311da030b070a6"; - }; - }; - "airplay-js-0.2.16" = { - name = "airplay-js"; - packageName = "airplay-js"; - version = "0.2.16"; - src = fetchurl { - url = "https://registry.npmjs.org/airplay-js/-/airplay-js-0.2.16.tgz"; - sha1 = "48566d5fa55a921d80187ad946f7e8f7555902a1"; - }; - }; - "clivas-0.1.4" = { - name = "clivas"; - packageName = "clivas"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/clivas/-/clivas-0.1.4.tgz"; - sha1 = "e1c1e481d1273d57f1752132b0e4410a0d88235a"; - }; - }; - "inquirer-0.8.5" = { - name = "inquirer"; - packageName = "inquirer"; - version = "0.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-0.8.5.tgz"; - sha1 = "dbd740cf6ca3b731296a63ce6f6d961851f336df"; - }; - }; - "network-address-0.0.5" = { - name = "network-address"; - packageName = "network-address"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/network-address/-/network-address-0.0.5.tgz"; - sha1 = "a400225438cacb67cd6108e8e826d5920a705dcc"; - }; - }; - "numeral-1.5.6" = { - name = "numeral"; - packageName = "numeral"; - version = "1.5.6"; - src = fetchurl { - url = "https://registry.npmjs.org/numeral/-/numeral-1.5.6.tgz"; - sha1 = "3831db968451b9cf6aff9bf95925f1ef8e37b33f"; - }; - }; - "open-0.0.5" = { - name = "open"; - packageName = "open"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-0.0.5.tgz"; - sha1 = "42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc"; - }; - }; - "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"; - }; - }; - "parse-torrent-5.8.3" = { - name = "parse-torrent"; - packageName = "parse-torrent"; - version = "5.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.8.3.tgz"; - sha1 = "f95ef23301239609de406794ad9f958a1bca1b6c"; - }; - }; - "pump-0.3.5" = { - name = "pump"; - packageName = "pump"; - version = "0.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/pump/-/pump-0.3.5.tgz"; - sha1 = "ae5ff8c1f93ed87adc6530a97565b126f585454b"; - }; - }; - "rc-0.4.0" = { - name = "rc"; - packageName = "rc"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-0.4.0.tgz"; - sha1 = "ce24a2029ad94c3a40d09604a87227027d7210d3"; - }; - }; - "torrent-stream-1.0.3" = { - name = "torrent-stream"; - packageName = "torrent-stream"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/torrent-stream/-/torrent-stream-1.0.3.tgz"; - sha1 = "d8c043b44c3c448c9397a3aec42d2df55887037b"; - }; - }; - "windows-no-runnable-0.0.6" = { - name = "windows-no-runnable"; - packageName = "windows-no-runnable"; + "bplist-creator-0.0.6" = { + name = "bplist-creator"; + packageName = "bplist-creator"; version = "0.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/windows-no-runnable/-/windows-no-runnable-0.0.6.tgz"; - sha1 = "91e5129088330a0fe248520cee12d1ad6bb4ddfb"; - }; - }; - "mdns-js-1.0.1" = { - name = "mdns-js"; - packageName = "mdns-js"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mdns-js/-/mdns-js-1.0.1.tgz"; - sha512 = "0z9rixsyb1m6w2qjqimn0ga0qdcpnxnm0ci7zd0svzd9kivqds0zczf7r32064r8c32m94cs3lrcvwvg21d7x2s38f28r5874rjs0bp"; - }; - }; - "plist-2.1.0" = { - name = "plist"; - packageName = "plist"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/plist/-/plist-2.1.0.tgz"; - sha1 = "57ccdb7a0821df21831217a3cad54e3e146a1025"; - }; - }; - "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"; - }; - }; - "dns-js-0.2.1" = { - name = "dns-js"; - packageName = "dns-js"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dns-js/-/dns-js-0.2.1.tgz"; - sha1 = "5d66629b3c0e6a5eb0e14f0ae701d05f6ea46673"; - }; - }; - "qap-3.3.1" = { - name = "qap"; - packageName = "qap"; - version = "3.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/qap/-/qap-3.3.1.tgz"; - sha1 = "11f9e8fa8890fe7cb99210c0f44d0613b7372cac"; - }; - }; - "base64-js-1.2.0" = { - name = "base64-js"; - packageName = "base64-js"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz"; - sha1 = "a39992d723584811982be5e290bb6a53d86700f1"; - }; - }; - "xmlbuilder-8.2.2" = { - name = "xmlbuilder"; - packageName = "xmlbuilder"; - version = "8.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.2.tgz"; - sha1 = "69248673410b4ba42e1a6136551d2922335aa773"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "readline2-0.1.1" = { - name = "readline2"; - packageName = "readline2"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/readline2/-/readline2-0.1.1.tgz"; - sha1 = "99443ba6e83b830ef3051bfd7dc241a82728d568"; - }; - }; - "rx-2.5.3" = { - name = "rx"; - packageName = "rx"; - version = "2.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/rx/-/rx-2.5.3.tgz"; - sha1 = "21adc7d80f02002af50dae97fd9dbf248755f566"; - }; - }; - "mute-stream-0.0.4" = { - name = "mute-stream"; - packageName = "mute-stream"; - version = "0.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"; - sha1 = "a9219960a6d5d5d046597aee51252c6655f7177e"; - }; - }; - "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"; - }; - }; - "blob-to-buffer-1.2.6" = { - name = "blob-to-buffer"; - packageName = "blob-to-buffer"; - version = "1.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/blob-to-buffer/-/blob-to-buffer-1.2.6.tgz"; - sha1 = "089ac264c686b73ead6c539a484a8003bfbb2033"; - }; - }; - "get-stdin-5.0.1" = { - name = "get-stdin"; - packageName = "get-stdin"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz"; - sha1 = "122e161591e21ff4c52530305693f20e6393a398"; - }; - }; - "magnet-uri-5.1.7" = { - name = "magnet-uri"; - packageName = "magnet-uri"; - version = "5.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.7.tgz"; - sha1 = "8f8016ab74c415f274f4fb1943faaf7e92030eff"; - }; - }; - "parse-torrent-file-4.0.3" = { - name = "parse-torrent-file"; - packageName = "parse-torrent-file"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.3.tgz"; - sha512 = "2shaz6cv4fgbmy1hq6hc59spkja51qg0vvx514r1nqsspdnsq6xzxabk0gs17x3n8s03y9mj8hx1xn5c0bkq9fvx59sxms2a4mlig9r"; - }; - }; - "simple-get-2.7.0" = { - name = "simple-get"; - packageName = "simple-get"; - version = "2.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/simple-get/-/simple-get-2.7.0.tgz"; - sha512 = "2r1w3cxxmd92r19mjrlzwn6xypjd5vrx0gk21l2bmxcp1x54pavhmifbhq8llxfk6z2lmzly7g3l8rrdl19m65nzlcicwy7cfn3sha6"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "rusha-0.8.9" = { - name = "rusha"; - packageName = "rusha"; - version = "0.8.9"; - src = fetchurl { - url = "https://registry.npmjs.org/rusha/-/rusha-0.8.9.tgz"; - sha1 = "77bd0951608bf81cedb948cec9c44d8ce5662219"; - }; - }; - "decompress-response-3.3.0" = { - name = "decompress-response"; - packageName = "decompress-response"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz"; - sha1 = "80a4dd323748384bfa248083622aedec982adff3"; - }; - }; - "simple-concat-1.0.0" = { - name = "simple-concat"; - packageName = "simple-concat"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.0.tgz"; - sha1 = "7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6"; - }; - }; - "mimic-response-1.0.0" = { - name = "mimic-response"; - packageName = "mimic-response"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.0.tgz"; - sha1 = "df3d3652a73fded6b9b0b24146e6fd052353458e"; - }; - }; - "once-1.2.0" = { - name = "once"; - packageName = "once"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.2.0.tgz"; - sha1 = "de1905c636af874a8fba862d9aabddd1f920461c"; - }; - }; - "end-of-stream-1.0.0" = { - name = "end-of-stream"; - packageName = "end-of-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz"; - sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e"; - }; - }; - "once-1.3.3" = { - name = "once"; - packageName = "once"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.3.3.tgz"; - sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20"; - }; - }; - "deep-extend-0.2.11" = { - name = "deep-extend"; - packageName = "deep-extend"; - version = "0.2.11"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz"; - sha1 = "7a16ba69729132340506170494bc83f7076fe08f"; - }; - }; - "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"; - }; - }; - "ini-1.1.0" = { - name = "ini"; - packageName = "ini"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz"; - sha1 = "4e808c2ce144c6c1788918e034d6797bc6cf6281"; - }; - }; - "bitfield-0.1.0" = { - name = "bitfield"; - packageName = "bitfield"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bitfield/-/bitfield-0.1.0.tgz"; - sha1 = "b05d8b5f0d09f2df35a9db3b3a62d3808c46c457"; - }; - }; - "bncode-0.5.3" = { - name = "bncode"; - packageName = "bncode"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/bncode/-/bncode-0.5.3.tgz"; - sha1 = "e16661697452d436bf9886238cc791b08d66a61a"; - }; - }; - "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"; - }; - }; - "fs-chunk-store-1.6.5" = { - name = "fs-chunk-store"; - packageName = "fs-chunk-store"; - version = "1.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-1.6.5.tgz"; - sha1 = "fc42c2ff4c7f1688ab5fd41cf17c0f9ece4c6156"; - }; - }; - "hat-0.0.3" = { - name = "hat"; - packageName = "hat"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/hat/-/hat-0.0.3.tgz"; - sha1 = "bb014a9e64b3788aed8005917413d4ff3d502d8a"; - }; - }; - "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/immediate-chunk-store/-/immediate-chunk-store-1.0.8.tgz"; - sha1 = "0ecdad0c546332672d7b5b511b26bb18ce56e73f"; - }; - }; - "ip-set-1.0.1" = { - name = "ip-set"; - packageName = "ip-set"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ip-set/-/ip-set-1.0.1.tgz"; - sha1 = "633b66d0bd6c8d0de968d053263c9120d3b6727e"; - }; - }; - "mkdirp-0.3.5" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; - sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; - }; - }; - "parse-torrent-4.1.0" = { - name = "parse-torrent"; - packageName = "parse-torrent"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-4.1.0.tgz"; - sha1 = "a814bd8505e8b58e88eb8ff3e2daff5d19a711b7"; - }; - }; - "peer-wire-swarm-0.12.1" = { - name = "peer-wire-swarm"; - packageName = "peer-wire-swarm"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/peer-wire-swarm/-/peer-wire-swarm-0.12.1.tgz"; - sha1 = "51b75da99c335c64c9ba9ef99fe27a4a5951ff42"; - }; - }; - "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-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"; - }; - }; - "random-access-file-1.8.1" = { - name = "random-access-file"; - packageName = "random-access-file"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.8.1.tgz"; - sha512 = "3pvi9knrjp8krj1hsg8i2qmv5097fid3qnyz4wh2dvpr37x2ga6qqk7afh5f1i5sb9dsw169bara13knccdmjwnivb62xgywz868j7r"; - }; - }; - "run-parallel-1.1.6" = { - name = "run-parallel"; - packageName = "run-parallel"; - version = "1.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.6.tgz"; - sha1 = "29003c9a2163e01e2d2dfc90575f2c6c1d61a039"; - }; - }; - "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"; - }; - }; - "buffer-alloc-unsafe-1.0.0" = { - name = "buffer-alloc-unsafe"; - packageName = "buffer-alloc-unsafe"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.0.0.tgz"; - sha1 = "474aa88f34e7bc75fa311d2e6457409c5846c3fe"; - }; - }; - "ip-1.1.5" = { - name = "ip"; - packageName = "ip"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz"; - sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; - }; - }; - "magnet-uri-4.2.3" = { - name = "magnet-uri"; - packageName = "magnet-uri"; - version = "4.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-4.2.3.tgz"; - sha1 = "79cc6d65a00bb5b7ef5c25ae60ebbb5d9a7681a8"; - }; - }; - "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/parse-torrent-file/-/parse-torrent-file-2.1.4.tgz"; - sha1 = "32d4b6afde631420e5f415919a222b774b575707"; - }; - }; - "flatten-0.0.1" = { - name = "flatten"; - packageName = "flatten"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/flatten/-/flatten-0.0.1.tgz"; - sha1 = "554440766da0a0d603999f433453f6c2fc6a75c1"; - }; - }; - "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"; - }; - }; - "bencode-0.7.0" = { - name = "bencode"; - packageName = "bencode"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bencode/-/bencode-0.7.0.tgz"; - sha1 = "811ed647c0118945e41bb4bbbdea9a2c78a17083"; - }; - }; - "fifo-0.1.4" = { - name = "fifo"; - packageName = "fifo"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/fifo/-/fifo-0.1.4.tgz"; - sha1 = "bf42d87c0ad07b00d0949d12388f6289606ece34"; - }; - }; - "peer-wire-protocol-0.7.0" = { - name = "peer-wire-protocol"; - packageName = "peer-wire-protocol"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/peer-wire-protocol/-/peer-wire-protocol-0.7.0.tgz"; - sha1 = "6c015abf24b4877ed9eca3822b22d996078011da"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "bncode-0.2.3" = { - name = "bncode"; - packageName = "bncode"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/bncode/-/bncode-0.2.3.tgz"; - sha1 = "37f851dc8e47188a83fbc0f6fa4775cacc9a3296"; - }; - }; - "cyclist-0.1.1" = { - name = "cyclist"; - packageName = "cyclist"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cyclist/-/cyclist-0.1.1.tgz"; - sha1 = "1bcfa56b081448cdb5e12bfc1bfad34b47fba8f3"; - }; - }; - "bittorrent-dht-6.4.2" = { - name = "bittorrent-dht"; - packageName = "bittorrent-dht"; - version = "6.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-6.4.2.tgz"; - sha1 = "8b40f8cee6bea87f2b34fd2ae0bd367a8b1247a6"; - }; - }; - "bittorrent-tracker-7.7.0" = { - name = "bittorrent-tracker"; - packageName = "bittorrent-tracker"; - version = "7.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-7.7.0.tgz"; - sha1 = "ffd2eabc141d36ed5c1817df7e992f91fd7fc65c"; - }; - }; - "re-emitter-1.1.3" = { - name = "re-emitter"; - packageName = "re-emitter"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/re-emitter/-/re-emitter-1.1.3.tgz"; - sha1 = "fa9e319ffdeeeb35b27296ef0f3d374dac2f52a7"; - }; - }; - "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"; - }; - }; - "k-bucket-0.6.0" = { - name = "k-bucket"; - packageName = "k-bucket"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/k-bucket/-/k-bucket-0.6.0.tgz"; - sha1 = "afc532545f69d466293e887b00d5fc73377c3abb"; - }; - }; - "k-rpc-3.7.0" = { - name = "k-rpc"; - packageName = "k-rpc"; - version = "3.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/k-rpc/-/k-rpc-3.7.0.tgz"; - sha1 = "641f99b2825be34b6e7984f22b7962dc1a906c23"; - }; - }; - "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"; - }; - }; - "buffer-equal-0.0.1" = { - name = "buffer-equal"; - packageName = "buffer-equal"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz"; - sha1 = "91bc74b11ea405bc916bc6aa908faafa5b4aac4b"; - }; - }; - "k-bucket-2.0.1" = { - name = "k-bucket"; - packageName = "k-bucket"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/k-bucket/-/k-bucket-2.0.1.tgz"; - sha1 = "58cccb244f563326ba893bf5c06a35f644846daa"; - }; - }; - "k-rpc-socket-1.7.2" = { - name = "k-rpc-socket"; - packageName = "k-rpc-socket"; - version = "1.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.7.2.tgz"; - sha512 = "02w1ih1lh86i5ap7c3dy2ml7g5a11r0w300iyxdf6v02qr0j1x3vf78hx5q9dgg3drifab018mgm851m457zzzi05i2z2r1s3zlflc3"; - }; - }; - "bencode-0.8.0" = { - name = "bencode"; - packageName = "bencode"; - version = "0.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bencode/-/bencode-0.8.0.tgz"; - sha1 = "3143448e82b0fadc745633ecc2a5f8fa87932f19"; - }; - }; - "compact2string-1.4.0" = { - name = "compact2string"; - packageName = "compact2string"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/compact2string/-/compact2string-1.4.0.tgz"; - sha1 = "a99cd96ea000525684b269683ae2222d6eea7b49"; - }; - }; - "random-iterate-1.0.1" = { - name = "random-iterate"; - packageName = "random-iterate"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/random-iterate/-/random-iterate-1.0.1.tgz"; - sha1 = "f7d97d92dee6665ec5f6da08c7f963cad4b2ac99"; - }; - }; - "run-series-1.1.4" = { - name = "run-series"; - packageName = "run-series"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/run-series/-/run-series-1.1.4.tgz"; - sha1 = "89a73ddc5e75c9ef8ab6320c0a1600d6a41179b9"; - }; - }; - "simple-peer-6.4.4" = { - name = "simple-peer"; - packageName = "simple-peer"; - version = "6.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.4.4.tgz"; - sha1 = "4e421f485ac7b13b08077a4476934d52c5ba3bb3"; - }; - }; - "simple-websocket-4.3.1" = { - name = "simple-websocket"; - packageName = "simple-websocket"; - version = "4.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.3.1.tgz"; - sha1 = "5d3d5751bb39aeba2f710d8eec78768df821f38d"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "ipaddr.js-1.5.4" = { - name = "ipaddr.js"; - packageName = "ipaddr.js"; - version = "1.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.4.tgz"; - sha1 = "962263d9d26132956fc5c630b638a30d3cdffc14"; - }; - }; - "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/get-browser-rtc/-/get-browser-rtc-1.0.2.tgz"; - sha1 = "bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9"; - }; - }; - "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"; - }; - }; - "safe-buffer-5.0.1" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"; - sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7"; - }; - }; - "ultron-1.1.1" = { - name = "ultron"; - packageName = "ultron"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz"; - sha512 = "0x78hsv3jykmjl6qdqlqiz7v5nf06li8b5yvzpj6grnzwbcjch8ngyg55lm8g8mg4znvk7qbryvrr2dxacz3cvyb1nsm64qsw21g0ah"; - }; - }; - "addr-to-ip-port-1.4.2" = { - name = "addr-to-ip-port"; - packageName = "addr-to-ip-port"; - version = "1.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/addr-to-ip-port/-/addr-to-ip-port-1.4.2.tgz"; - sha1 = "7e46ff1f26b7a9f5e33fd839d57aef6303b4c692"; - }; - }; - "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"; - }; - }; - "chalk-0.5.1" = { - name = "chalk"; - packageName = "chalk"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz"; - sha1 = "663b3a648b68b55d04690d49167aa837858f2174"; - }; - }; - "pad-0.0.5" = { - name = "pad"; - packageName = "pad"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/pad/-/pad-0.0.5.tgz"; - sha1 = "2219ab4db2ac74549a676164bc475d68cb87de05"; - }; - }; - "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/single-line-log/-/single-line-log-0.4.1.tgz"; - sha1 = "87a55649f749d783ec0dcd804e8140d9873c7cee"; - }; - }; - "ansi-styles-1.1.0" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"; - sha1 = "eaecbf66cd706882760b2f4691582b8f55d7a7de"; - }; - }; - "has-ansi-0.1.0" = { - name = "has-ansi"; - packageName = "has-ansi"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz"; - sha1 = "84f265aae8c0e6a88a12d7022894b7568894c62e"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - src = fetchurl { - url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz"; - sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907"; - }; - }; - "cookie-jar-0.2.0" = { - name = "cookie-jar"; - packageName = "cookie-jar"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie-jar/-/cookie-jar-0.2.0.tgz"; - sha1 = "64ecc06ac978db795e4b5290cbe48ba3781400fa"; - }; - }; - "aws-sign-0.2.0" = { - name = "aws-sign"; - packageName = "aws-sign"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sign/-/aws-sign-0.2.0.tgz"; - sha1 = "c55013856c8194ec854a0cbec90aab5a04ce3ac5"; - }; - }; - "oauth-sign-0.2.0" = { - name = "oauth-sign"; - packageName = "oauth-sign"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.2.0.tgz"; - sha1 = "a0e6a1715daed062f322b622b7fe5afd1035b6e2"; - }; - }; - "forever-agent-0.2.0" = { - name = "forever-agent"; - packageName = "forever-agent"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.2.0.tgz"; - sha1 = "e1c25c7ad44e09c38f233876c76fcc24ff843b1f"; - }; - }; - "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"; - }; - }; - "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/json-stringify-safe/-/json-stringify-safe-3.0.0.tgz"; - sha1 = "9db7b0e530c7f289c5e8c8432af191c2ff75a5b3"; - }; - }; - "qs-0.5.6" = { - name = "qs"; - packageName = "qs"; - version = "0.5.6"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz"; - sha1 = "31b1ad058567651c526921506b9a8793911a0384"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "hoek-0.7.6" = { - name = "hoek"; - packageName = "hoek"; - version = "0.7.6"; - src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-0.7.6.tgz"; - sha1 = "60fbd904557541cd2b8795abf308a1b3770e155a"; - }; - }; - "boom-0.3.8" = { - name = "boom"; - packageName = "boom"; - version = "0.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-0.3.8.tgz"; - sha1 = "c8cdb041435912741628c044ecc732d1d17c09ea"; - }; - }; - "cryptiles-0.1.3" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.1.3.tgz"; - sha1 = "1a556734f06d24ba34862ae9cb9e709a3afbff1c"; - }; - }; - "sntp-0.1.4" = { - name = "sntp"; - packageName = "sntp"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-0.1.4.tgz"; - sha1 = "5ef481b951a7b29affdf4afd7f26838fc1120f84"; - }; - }; - "codepage-1.4.0" = { - name = "codepage"; - packageName = "codepage"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/codepage/-/codepage-1.4.0.tgz"; - sha1 = "ffd5b603ae6a8ebb63559d5fb89a57d12b943837"; - }; - }; - "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"; - }; - }; - "voc-1.0.0" = { - name = "voc"; - packageName = "voc"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/voc/-/voc-1.0.0.tgz"; - sha512 = "1zss1rcd373slj9qjmy4zp7ann95isbkvjlrgp2dirpazvn1sy23hgnw6p72w0mj8hcgqpxvs0ls035zmb8isilqhqqpkmya9d3234r"; - }; - }; - "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/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz"; - sha512 = "2kxcf7dq1q9z2wqwwfjagn77kpzg2zpjqf2kd3vj5drx576gwglbsfly2b1imabj3svgcz5xsx79kspq1xsdgm4wwg1fksfnjdgjv47"; - }; - }; - "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"; - }; - }; - "xmlbuilder-9.0.4" = { - name = "xmlbuilder"; - packageName = "xmlbuilder"; - version = "9.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.4.tgz"; - sha1 = "519cb4ca686d005a8420d3496f3f0caeecca580f"; - }; - }; - "axios-0.17.1" = { - name = "axios"; - packageName = "axios"; - version = "0.17.1"; - src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.17.1.tgz"; - sha1 = "2d8e3e5d0bdbd7327f91bc814f5c57660f81824d"; - }; - }; - "cfonts-1.1.3" = { - name = "cfonts"; - packageName = "cfonts"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cfonts/-/cfonts-1.1.3.tgz"; - sha1 = "5d9a7a6bf1a023fc2d535da7264ea90ecd9dbf48"; - }; - }; - "cli-table2-0.2.0" = { - name = "cli-table2"; - packageName = "cli-table2"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-table2/-/cli-table2-0.2.0.tgz"; - sha1 = "2d1ef7f218a0e786e214540562d4bd177fe32d97"; - }; - }; - "humanize-plus-1.8.2" = { - name = "humanize-plus"; - packageName = "humanize-plus"; - version = "1.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/humanize-plus/-/humanize-plus-1.8.2.tgz"; - sha1 = "a65b34459ad6367adbb3707a82a3c9f916167030"; - }; - }; - "ora-1.3.0" = { - name = "ora"; - packageName = "ora"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ora/-/ora-1.3.0.tgz"; - sha1 = "80078dd2b92a934af66a3ad72a5b910694ede51a"; - }; - }; - "follow-redirects-1.2.6" = { - name = "follow-redirects"; - packageName = "follow-redirects"; - version = "1.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.2.6.tgz"; - sha512 = "1h8p8m3gkaav4s3l03h3kgg3gi264n9hgaq2yjjdzvvxfq1wrnw6sh2avrazpf7bihh44q8x5b59x551xaygfm3dvkx2djfy5kjmcqn"; - }; - }; - "babel-runtime-6.22.0" = { - name = "babel-runtime"; - packageName = "babel-runtime"; - version = "6.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.22.0.tgz"; - sha1 = "1cf8b4ac67c77a4ddb0db2ae1f74de52ac4ca611"; - }; - }; - "change-case-3.0.0" = { - name = "change-case"; - packageName = "change-case"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/change-case/-/change-case-3.0.0.tgz"; - sha1 = "6c9c8e35f8790870a82b6b0745be8c3cbef9b081"; - }; - }; - "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"; - }; - }; - "window-size-0.3.0" = { - name = "window-size"; - packageName = "window-size"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/window-size/-/window-size-0.3.0.tgz"; - sha1 = "b8f0b66e325d22160751e496337e44b45b727546"; - }; - }; - "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"; - }; - }; - "camel-case-3.0.0" = { - name = "camel-case"; - packageName = "camel-case"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz"; - sha1 = "ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"; - }; - }; - "constant-case-2.0.0" = { - name = "constant-case"; - packageName = "constant-case"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/constant-case/-/constant-case-2.0.0.tgz"; - sha1 = "4175764d389d3fa9c8ecd29186ed6005243b6a46"; - }; - }; - "dot-case-2.1.1" = { - name = "dot-case"; - packageName = "dot-case"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dot-case/-/dot-case-2.1.1.tgz"; - sha1 = "34dcf37f50a8e93c2b3bca8bb7fb9155c7da3bee"; - }; - }; - "header-case-1.0.1" = { - name = "header-case"; - packageName = "header-case"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/header-case/-/header-case-1.0.1.tgz"; - sha1 = "9535973197c144b09613cd65d317ef19963bd02d"; - }; - }; - "is-lower-case-1.1.3" = { - name = "is-lower-case"; - packageName = "is-lower-case"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/is-lower-case/-/is-lower-case-1.1.3.tgz"; - sha1 = "7e147be4768dc466db3bfb21cc60b31e6ad69393"; - }; - }; - "is-upper-case-1.1.2" = { - name = "is-upper-case"; - packageName = "is-upper-case"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-upper-case/-/is-upper-case-1.1.2.tgz"; - sha1 = "8d0b1fa7e7933a1e58483600ec7d9661cbaf756f"; - }; - }; - "lower-case-1.1.4" = { - name = "lower-case"; - packageName = "lower-case"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz"; - sha1 = "9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"; - }; - }; - "lower-case-first-1.0.2" = { - name = "lower-case-first"; - packageName = "lower-case-first"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lower-case-first/-/lower-case-first-1.0.2.tgz"; - sha1 = "e5da7c26f29a7073be02d52bac9980e5922adfa1"; - }; - }; - "no-case-2.3.2" = { - name = "no-case"; - packageName = "no-case"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz"; - sha512 = "34msnfifpdmxl414b8rch1p1six59jd9251b7wkb37n78fa84xfa5f5f5cxxp477wb846nfrsg6b1py3rahz4xdpk17lzzy9kvdjr5f"; - }; - }; - "param-case-2.1.1" = { - name = "param-case"; - packageName = "param-case"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz"; - sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247"; - }; - }; - "pascal-case-2.0.1" = { - name = "pascal-case"; - packageName = "pascal-case"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pascal-case/-/pascal-case-2.0.1.tgz"; - sha1 = "2d578d3455f660da65eca18ef95b4e0de912761e"; - }; - }; - "path-case-2.1.1" = { - name = "path-case"; - packageName = "path-case"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-case/-/path-case-2.1.1.tgz"; - sha1 = "94b8037c372d3fe2906e465bb45e25d226e8eea5"; - }; - }; - "sentence-case-2.1.1" = { - name = "sentence-case"; - packageName = "sentence-case"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sentence-case/-/sentence-case-2.1.1.tgz"; - sha1 = "1f6e2dda39c168bf92d13f86d4a918933f667ed4"; - }; - }; - "snake-case-2.1.0" = { - name = "snake-case"; - packageName = "snake-case"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snake-case/-/snake-case-2.1.0.tgz"; - sha1 = "41bdb1b73f30ec66a04d4e2cad1b76387d4d6d9f"; - }; - }; - "swap-case-1.1.2" = { - name = "swap-case"; - packageName = "swap-case"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/swap-case/-/swap-case-1.1.2.tgz"; - sha1 = "c39203a4587385fad3c850a0bd1bcafa081974e3"; - }; - }; - "title-case-2.1.1" = { - name = "title-case"; - packageName = "title-case"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/title-case/-/title-case-2.1.1.tgz"; - sha1 = "3e127216da58d2bc5becf137ab91dae3a7cd8faa"; - }; - }; - "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"; - }; - }; - "upper-case-first-1.1.2" = { - name = "upper-case-first"; - packageName = "upper-case-first"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/upper-case-first/-/upper-case-first-1.1.2.tgz"; - sha1 = "5d79bedcff14419518fd2edb0a0507c9b6859115"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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.1.0" = { - name = "cli-spinners"; - packageName = "cli-spinners"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.1.0.tgz"; - sha1 = "f1847b168844d917a671eb9d147e3df497c90d06"; - }; - }; - "log-symbols-1.0.2" = { - name = "log-symbols"; - packageName = "log-symbols"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz"; - sha1 = "376ff7b58ea3086a0f09facc74617eca501e1a18"; - }; - }; - "restore-cursor-2.0.0" = { - name = "restore-cursor"; - packageName = "restore-cursor"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz"; - sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; - }; - }; - "onetime-2.0.1" = { - name = "onetime"; - packageName = "onetime"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz"; - sha1 = "067428230fd67443b2794b22bba528b6867962d4"; - }; - }; - "mimic-fn-1.1.0" = { - name = "mimic-fn"; - packageName = "mimic-fn"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz"; - sha1 = "e667783d92e89dbd342818b5230b9d62a672ad18"; - }; - }; - "configstore-2.1.0" = { - name = "configstore"; - packageName = "configstore"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz"; - sha1 = "737a3a7036e9886102aa6099e47bb33ab1aba1a1"; - }; - }; - "cordova-common-2.2.1" = { - name = "cordova-common"; - packageName = "cordova-common"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cordova-common/-/cordova-common-2.2.1.tgz"; - sha1 = "7009bc591729caa7285a588cfd6a7b54cd834f0c"; - }; - }; - "cordova-lib-8.0.0" = { - name = "cordova-lib"; - packageName = "cordova-lib"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-8.0.0.tgz"; - sha1 = "864bd5de6b79fc4944361460aa3214e59da936f2"; - }; - }; - "editor-1.0.0" = { - name = "editor"; - packageName = "editor"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/editor/-/editor-1.0.0.tgz"; - sha1 = "60c7f87bd62bcc6a894fa8ccd6afb7823a24f742"; - }; - }; - "insight-0.8.4" = { - name = "insight"; - packageName = "insight"; - version = "0.8.4"; - src = fetchurl { - url = "https://registry.npmjs.org/insight/-/insight-0.8.4.tgz"; - sha1 = "671caf65b47c9fe8c3d1b3206cf45bb211b75884"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "dot-prop-3.0.0" = { - name = "dot-prop"; - packageName = "dot-prop"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz"; - sha1 = "1b708af094a49c9a0e7dbcad790aba539dac1177"; - }; - }; - "osenv-0.1.4" = { - name = "osenv"; - packageName = "osenv"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz"; - sha1 = "42fe6d5953df06c8064be6f176c3d05aaaa34644"; - }; - }; - "uuid-2.0.3" = { - name = "uuid"; - packageName = "uuid"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz"; - sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a"; - }; - }; - "write-file-atomic-1.3.4" = { - name = "write-file-atomic"; - packageName = "write-file-atomic"; - version = "1.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz"; - sha1 = "f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"; - }; - }; - "xdg-basedir-2.0.0" = { - name = "xdg-basedir"; - packageName = "xdg-basedir"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz"; - sha1 = "edbc903cc385fc04523d966a335504b5504d1bd2"; - }; - }; - "is-obj-1.0.1" = { - name = "is-obj"; - packageName = "is-obj"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz"; - sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; - }; - }; - "imurmurhash-0.1.4" = { - name = "imurmurhash"; - packageName = "imurmurhash"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; - }; - }; - "slide-1.1.6" = { - name = "slide"; - packageName = "slide"; - version = "1.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz"; - sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; - }; - }; - "ansi-0.3.1" = { - name = "ansi"; - packageName = "ansi"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz"; - sha1 = "0c42d4fb17160d5a9af1e484bace1c66922c1b21"; - }; - }; - "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"; - }; - }; - "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/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz"; - sha1 = "e244b9185b8175473bff6079324905115f83dc7c"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "shelljs-0.5.3" = { - name = "shelljs"; - packageName = "shelljs"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz"; - sha1 = "c54982b996c76ef0c1e6b59fbdc5825f5b713113"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "big-integer-1.6.26" = { - name = "big-integer"; - packageName = "big-integer"; - version = "1.6.26"; - src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.26.tgz"; - sha1 = "3af1672fa62daf2d5ecafacf6e5aa0d25e02c1c8"; - }; - }; - "sax-0.3.5" = { - name = "sax"; - packageName = "sax"; - version = "0.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz"; - sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d"; - }; - }; - "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"; - }; - }; - "aliasify-2.1.0" = { - name = "aliasify"; - packageName = "aliasify"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aliasify/-/aliasify-2.1.0.tgz"; - sha1 = "7c30825b9450b9e6185ba27533eaf6e2067d4b42"; - }; - }; - "cordova-create-1.1.2" = { - name = "cordova-create"; - packageName = "cordova-create"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cordova-create/-/cordova-create-1.1.2.tgz"; - sha1 = "83b09271b378d1c03bc7d9a786fedd60485c3ccf"; - }; - }; - "cordova-fetch-1.3.0" = { - name = "cordova-fetch"; - packageName = "cordova-fetch"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.3.0.tgz"; - sha1 = "4986d0779b36eb239822c2ab413a47ff9f097fea"; - }; - }; - "cordova-js-4.2.2" = { - name = "cordova-js"; - packageName = "cordova-js"; - version = "4.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cordova-js/-/cordova-js-4.2.2.tgz"; - sha1 = "a7eb20911e6a59f15ac64e7db6ec543df31c2f92"; - }; - }; - "cordova-serve-2.0.0" = { - name = "cordova-serve"; - packageName = "cordova-serve"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-2.0.0.tgz"; - sha1 = "d7834b83b186607e2b8f1943e073c0633360ea43"; - }; - }; - "dep-graph-1.1.0" = { - name = "dep-graph"; - packageName = "dep-graph"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dep-graph/-/dep-graph-1.1.0.tgz"; - sha1 = "fade86a92799a813e9b42511cdf3dfa6cc8dbefe"; - }; - }; - "detect-indent-5.0.0" = { - name = "detect-indent"; - packageName = "detect-indent"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz"; - sha1 = "3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"; - }; - }; - "dependency-ls-1.1.1" = { - name = "dependency-ls"; - packageName = "dependency-ls"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dependency-ls/-/dependency-ls-1.1.1.tgz"; - sha1 = "0481b07f023d74ce311192e5c690d13e18600054"; - }; - }; - "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"; - }; - }; - "init-package-json-1.10.1" = { - name = "init-package-json"; - packageName = "init-package-json"; - version = "1.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.10.1.tgz"; - sha1 = "cd873a167796befb99612b28762a0b6393fd8f6a"; - }; - }; - "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"; - }; - }; - "opener-1.4.2" = { - name = "opener"; - packageName = "opener"; - version = "1.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/opener/-/opener-1.4.2.tgz"; - sha1 = "b32582080042af8680c389a499175b4c54fff523"; - }; - }; - "plist-2.0.1" = { - name = "plist"; - packageName = "plist"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/plist/-/plist-2.0.1.tgz"; - sha1 = "0a32ca9481b1c364e92e18dc55c876de9d01da8b"; - }; - }; - "properties-parser-0.3.1" = { - name = "properties-parser"; - packageName = "properties-parser"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/properties-parser/-/properties-parser-0.3.1.tgz"; - sha1 = "1316e9539ffbfd93845e369b211022abd478771a"; - }; - }; - "q-1.0.1" = { - name = "q"; - packageName = "q"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/q/-/q-1.0.1.tgz"; - sha1 = "11872aeedee89268110b10a718448ffb10112a14"; - }; - }; - "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"; - }; - }; - "shelljs-0.3.0" = { - name = "shelljs"; - packageName = "shelljs"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz"; - sha1 = "3596e6307a781544f591f37da618360f31db57b1"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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/browserify-transform-tools/-/browserify-transform-tools-1.7.0.tgz"; - sha1 = "83e277221f63259bed2e7eb2a283a970a501f4c4"; - }; - }; - "falafel-2.1.0" = { - name = "falafel"; - packageName = "falafel"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/falafel/-/falafel-2.1.0.tgz"; - sha1 = "96bb17761daba94f46d001738b3cedf3a67fe06c"; - }; - }; - "foreach-2.0.5" = { - name = "foreach"; - packageName = "foreach"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz"; - sha1 = "0bee005018aeb260d0a3af3ae658dd0136ec1b99"; - }; - }; - "object-keys-1.0.11" = { - name = "object-keys"; - packageName = "object-keys"; - version = "1.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz"; - sha1 = "c54601778ad560f1142ce0e01bcca8b56d13426d"; - }; - }; - "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/cordova-app-hello-world/-/cordova-app-hello-world-3.12.0.tgz"; - sha1 = "270e06b67b2ae94bcfee6592ed39eb42303d186f"; - }; - }; - "is-url-1.2.2" = { - name = "is-url"; - packageName = "is-url"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-url/-/is-url-1.2.2.tgz"; - sha1 = "498905a593bf47cc2d9e7f738372bbf7696c7f26"; - }; - }; - "shelljs-0.7.8" = { - name = "shelljs"; - packageName = "shelljs"; - version = "0.7.8"; - src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz"; - sha1 = "decbcf874b0d1e5fb72e14b164a9683048e9acb3"; - }; - }; - "interpret-1.1.0" = { - name = "interpret"; - packageName = "interpret"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz"; - sha1 = "7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"; - }; - }; - "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"; - }; - }; - "browserify-14.4.0" = { - name = "browserify"; - packageName = "browserify"; - version = "14.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-14.4.0.tgz"; - sha1 = "089a3463af58d0e48d8cd4070b3f74654d5abca9"; - }; - }; - "browserify-zlib-0.1.4" = { - name = "browserify-zlib"; - packageName = "browserify-zlib"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz"; - sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d"; - }; - }; - "os-browserify-0.1.2" = { - name = "os-browserify"; - packageName = "os-browserify"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz"; - sha1 = "49ca0293e0b19590a5f5de10c7f265a617d8fe54"; - }; - }; - "pako-0.2.9" = { - name = "pako"; - packageName = "pako"; - version = "0.2.9"; - src = fetchurl { - url = "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz"; - sha1 = "f3f7522f4ef782348da8161bad9ecfd51bf83a75"; - }; - }; - "compression-1.7.1" = { - name = "compression"; - packageName = "compression"; - version = "1.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/compression/-/compression-1.7.1.tgz"; - sha1 = "eff2603efc2e22cf86f35d2eb93589f9875373db"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "compressible-2.0.12" = { - name = "compressible"; - packageName = "compressible"; - version = "2.0.12"; - src = fetchurl { - url = "https://registry.npmjs.org/compressible/-/compressible-2.0.12.tgz"; - sha1 = "c59a5c99db76767e9876500e271ef63b3493bd66"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "q-1.4.1" = { - name = "q"; - packageName = "q"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/q/-/q-1.4.1.tgz"; - sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e"; - }; - }; - "npm-package-arg-5.1.2" = { - name = "npm-package-arg"; - packageName = "npm-package-arg"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.1.2.tgz"; - sha512 = "36g1gm57qcvdgb4lm6ibl9pgma8lgx8l8i2jzap6w3v36wfzsqa7vb411zd26yp9rgcq23951vl5j6pac22qd5h9x7jm9raznnnr460"; - }; - }; - "promzard-0.3.0" = { - name = "promzard"; - packageName = "promzard"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz"; - sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"; - }; - }; - "read-package-json-2.0.12" = { - name = "read-package-json"; - packageName = "read-package-json"; - version = "2.0.12"; - src = fetchurl { - url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.12.tgz"; - sha512 = "15w2z3m1iysjf0zwvyc5mix8nypx42shx90alil4sslq6caj3pgk59zsn2ppxn95nls6bs7yw7khl5rmlq9gljv27w3vs2gxg9wigwv"; - }; - }; - "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"; - }; - }; - "json-parse-better-errors-1.0.1" = { - name = "json-parse-better-errors"; - packageName = "json-parse-better-errors"; - 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"; - }; - }; - "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"; - }; - }; - "base64-js-1.1.2" = { - name = "base64-js"; - packageName = "base64-js"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.1.2.tgz"; - sha1 = "d6400cac1c4c660976d90d07a04351d89395f5e8"; - }; - }; - "string.prototype.codepointat-0.2.0" = { - name = "string.prototype.codepointat"; - packageName = "string.prototype.codepointat"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.0.tgz"; - sha1 = "6b26e9bd3afcaa7be3b4269b526de1b82000ac78"; - }; - }; - "form-data-2.1.4" = { - name = "form-data"; - packageName = "form-data"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz"; - sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1"; - }; - }; - "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"; - }; - }; - "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-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"; - }; - }; - "pegjs-0.10.0" = { - name = "pegjs"; - packageName = "pegjs"; - version = "0.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pegjs/-/pegjs-0.10.0.tgz"; - sha1 = "cf8bafae6eddff4b5a7efb185269eaaf4610ddbd"; - }; - }; - "simple-plist-0.2.1" = { - name = "simple-plist"; - packageName = "simple-plist"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/simple-plist/-/simple-plist-0.2.1.tgz"; - sha1 = "71766db352326928cf3a807242ba762322636723"; - }; - }; - "uuid-3.0.1" = { - name = "uuid"; - packageName = "uuid"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz"; - sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"; + url = "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.6.tgz"; + sha1 = "fef069bee85975b2ddcc2264aaa7c50dc17a3c7e"; }; }; "bplist-creator-0.0.7" = { @@ -7762,1093 +2929,31 @@ let sha1 = "37df1536092824b87c42f957b01344117372ae45"; }; }; - "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"; - }; - }; - "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"; - }; - }; - "configstore-1.4.0" = { - name = "configstore"; - packageName = "configstore"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/configstore/-/configstore-1.4.0.tgz"; - sha1 = "c35781d0501d268c25c54b8b17f6240e8a4fb021"; - }; - }; - "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"; - }; - }; - "lodash.debounce-3.1.1" = { - name = "lodash.debounce"; - packageName = "lodash.debounce"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-3.1.1.tgz"; - sha1 = "812211c378a94cc29d5aa4e3346cf0bfce3a7df5"; - }; - }; - "os-name-1.0.3" = { - name = "os-name"; - packageName = "os-name"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/os-name/-/os-name-1.0.3.tgz"; - sha1 = "1b379f64835af7c5a7f498b357cb95215c159edf"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "onetime-1.1.0" = { - name = "onetime"; - packageName = "onetime"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz"; - sha1 = "a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "osx-release-1.1.0" = { - name = "osx-release"; - packageName = "osx-release"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/osx-release/-/osx-release-1.1.0.tgz"; - sha1 = "f217911a28136949af1bf9308b241e2737d3cd6c"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "latest-version-1.0.1" = { - name = "latest-version"; - packageName = "latest-version"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/latest-version/-/latest-version-1.0.1.tgz"; - sha1 = "72cfc46e3e8d1be651e1ebb54ea9f6ea96f374bb"; - }; - }; - "repeating-1.1.3" = { - name = "repeating"; - packageName = "repeating"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz"; - sha1 = "3d4114218877537494f97f77f9785fab810fa4ac"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "package-json-1.2.0" = { - name = "package-json"; - packageName = "package-json"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/package-json/-/package-json-1.2.0.tgz"; - sha1 = "c8ecac094227cdf76a316874ed05e27cc939a0e0"; - }; - }; - "got-3.3.1" = { - name = "got"; - packageName = "got"; - version = "3.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-3.3.1.tgz"; - sha1 = "e5d0ed4af55fc3eef4d56007769d98192bcb2eca"; - }; - }; - "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"; - }; - }; - "duplexify-3.5.1" = { - name = "duplexify"; - packageName = "duplexify"; - version = "3.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz"; - sha512 = "0cyjpkdqc1lkh2fh7z9p2i6va4fvwazvpn4153ndpb2ng8w0q9x9kb0hk07yy0baj50s1kl58m7f7zmx8fqdfcp2vsl0m7hfk22i64g"; - }; - }; - "infinity-agent-2.0.3" = { - name = "infinity-agent"; - packageName = "infinity-agent"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/infinity-agent/-/infinity-agent-2.0.3.tgz"; - sha1 = "45e0e2ff7a9eb030b27d62b74b3744b7a7ac4216"; - }; - }; - "is-redirect-1.0.0" = { - name = "is-redirect"; - packageName = "is-redirect"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz"; - sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"; - }; - }; - "lowercase-keys-1.0.0" = { - name = "lowercase-keys"; - packageName = "lowercase-keys"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz"; - sha1 = "4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"; - }; - }; - "nested-error-stacks-1.0.2" = { - name = "nested-error-stacks"; - packageName = "nested-error-stacks"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-1.0.2.tgz"; - sha1 = "19f619591519f096769a5ba9a86e6eeec823c3cf"; - }; - }; - "object-assign-3.0.0" = { - name = "object-assign"; - packageName = "object-assign"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz"; - sha1 = "9bedd5ca0897949bca47e7ff408062d549f587f2"; - }; - }; - "prepend-http-1.0.4" = { - name = "prepend-http"; - packageName = "prepend-http"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz"; - sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"; - }; - }; - "read-all-stream-3.1.0" = { - name = "read-all-stream"; - packageName = "read-all-stream"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz"; - sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa"; - }; - }; - "timed-out-2.0.0" = { - name = "timed-out"; - packageName = "timed-out"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz"; - sha1 = "f38b0ae81d3747d628001f41dafc652ace671c0a"; - }; - }; - "end-of-stream-1.4.0" = { - name = "end-of-stream"; - packageName = "end-of-stream"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz"; - sha1 = "7a90d833efda6cfa6eac0f4949dbb0fad3a63206"; - }; - }; - "stream-shift-1.0.0" = { - name = "stream-shift"; - packageName = "stream-shift"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz"; - sha1 = "d5c752825e5367e786f78e18e445ea223a155952"; - }; - }; - "rc-1.2.2" = { - name = "rc"; - packageName = "rc"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.2.2.tgz"; - sha1 = "d8ce9cb57e8d64d9c7badd9876c7c34cbe3c7077"; - }; - }; - "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"; - }; - }; - "clone-2.1.1" = { - name = "clone"; - packageName = "clone"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz"; - sha1 = "d217d1e961118e3ac9a4b8bba3285553bf647cdb"; - }; - }; - "parserlib-1.1.1" = { - name = "parserlib"; - packageName = "parserlib"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/parserlib/-/parserlib-1.1.1.tgz"; - sha1 = "a64cfa724062434fdfc351c9a4ec2d92b94c06f4"; - }; - }; - "chalk-2.3.0" = { - name = "chalk"; - packageName = "chalk"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz"; - sha512 = "3fj8njcdcvyplivm2fj19lqw8qv7gb8v7gd6a223pmn8f3di4zwkhyb09vzlmw3pnk4ib88kp4cg8r9i5k5rskalzdfh1l23ljp6gh3"; - }; - }; - "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"; - }; - }; - "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-json-1.0.1" = { - name = "dat-json"; - packageName = "dat-json"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dat-json/-/dat-json-1.0.1.tgz"; - sha512 = "13nn20vg6jx1h8ypazv9zn236hvv29wwq52mdbbfl77zrg8d7syni933v2mm3y1jsk25c7dc2gs1876fz0yblniryncnbjxrf0aq0nq"; - }; - }; - "dat-link-resolve-1.1.1" = { - name = "dat-link-resolve"; - packageName = "dat-link-resolve"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dat-link-resolve/-/dat-link-resolve-1.1.1.tgz"; - sha512 = "3a3rmwv687r07qnzdp4k15ng7xbbgibssjiqjvhhhrxq5mc22m34g7hi1h15rqjs3zzlajn291j3xv9af22j3fynpygky13zzvxj367"; - }; - }; - "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.6" = { - name = "dat-node"; - packageName = "dat-node"; - version = "3.5.6"; - src = fetchurl { - url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.6.tgz"; - sha512 = "17i7n2n3bappi34pnv2240cr5baawf2ab8wf22bmlxx4xkcb5g0z24ycz542fsx8myn4fyjgfgdhwbv44f5sz1c4z7i7g4q3ah9n7zh"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "ansi-styles-3.2.0" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz"; - sha512 = "2x19fs1qvg7ifsdvii4g8kqpa5hir1lm0k0y0fz6dhm5c8gh4z9il4wqczl078p2ikmrav23dmj86cxy8y1j22k4mv59d8qq6c8wx1n"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "strip-ansi-4.0.0" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"; - sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; - }; - }; - "ansi-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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "discovery-channel-5.4.6" = { - name = "discovery-channel"; - packageName = "discovery-channel"; - version = "5.4.6"; - src = fetchurl { - url = "https://registry.npmjs.org/discovery-channel/-/discovery-channel-5.4.6.tgz"; - sha1 = "1b0f25e58124507e861b6dc3ecb744366bb53cad"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "utp-native-1.6.2" = { - name = "utp-native"; - packageName = "utp-native"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/utp-native/-/utp-native-1.6.2.tgz"; - sha512 = "2mcnn6w5as2dvz6rj4fb33174z3a1rl9bm2cfazrr4084gq7aal0bkmkwr1cjpkvy1zgni3zdk0570fx7cmnd0k0hg18wfb2hvbigfg"; - }; - }; - "bittorrent-dht-7.8.2" = { - name = "bittorrent-dht"; - packageName = "bittorrent-dht"; - version = "7.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-7.8.2.tgz"; - sha512 = "33jcwf8rh9r7m810lw75s1ij9k0bv1kjmnc24488i6nd1ri9a1p2gmci5z1xdfriyb8j7x8h1ch3aj5a1chdglwn6pbsll7cx4j6wd4"; - }; - }; - "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"; - }; - }; - "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-rpc-4.2.1" = { - name = "k-rpc"; - packageName = "k-rpc"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/k-rpc/-/k-rpc-4.2.1.tgz"; - sha512 = "2nbjxg0x7jsa14zhvx68w1vri68hsxzbxz7b7ap76fdp0jkrgna2rq636yxnax04f3f8i2ambj2fpan6qli6vixmfryz78vrapdip8n"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "node-gyp-build-3.2.2" = { - name = "node-gyp-build"; - packageName = "node-gyp-build"; - version = "3.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.2.2.tgz"; - sha512 = "34hwi28wvvh5nn8bv71n0fb83xjyk84jsn8j9zgkaqnfigpv2hk6fs9jaffsn7qi3yi4n7iwd9yjyagd1rh74ckzdf5s6l59b8vzidp"; - }; - }; - "dns-socket-1.6.2" = { - name = "dns-socket"; - packageName = "dns-socket"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/dns-socket/-/dns-socket-1.6.2.tgz"; - sha512 = "0ibd2ndmlqbk96vdcimsl4w1njplh9gplvqa5f7653km79f9kqpd6d7f0f3lq1sz548lqcbjfcgcr7fc9159b4gzzk1g86kjxzxmmk6"; - }; - }; - "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"; - }; - }; - "multicast-dns-6.2.1" = { - name = "multicast-dns"; - packageName = "multicast-dns"; - version = "6.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.1.tgz"; - sha512 = "3gm760icxiv0bkil78dgsjkss4vwg3ya76jl3v8a5fa86wdv0ksvi1n7lnzisk4x4sa8chxnfxasyfpgay45ilaykqz2zbc8xrgypdr"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "dns-packet-1.2.2" = { - name = "dns-packet"; - packageName = "dns-packet"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.2.2.tgz"; - sha512 = "0770ymyc0rv6a11mj3990d0z1jl1b2qxp4bapqa819y269sszfd96wn2y7pb6aw8bdgsn3bvpr7bmig5lcmkrxya13d5vc5y66q7pwh"; - }; - }; - "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"; - }; - }; - "toiletdb-1.4.0" = { - name = "toiletdb"; - packageName = "toiletdb"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/toiletdb/-/toiletdb-1.4.0.tgz"; - sha1 = "6c6f871834b22178c5490f9f832b58c3c7cba852"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "dom-walk-0.1.1" = { - name = "dom-walk"; - packageName = "dom-walk"; + "bplist-parser-0.1.1" = { + name = "bplist-parser"; + packageName = "bplist-parser"; version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz"; - sha1 = "672226dc74c8f799ad35307df936aba11acd6018"; + url = "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz"; + sha1 = "d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6"; }; }; - "for-each-0.3.2" = { - name = "for-each"; - packageName = "for-each"; - version = "0.3.2"; + "brace-expansion-1.1.8" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/for-each/-/for-each-0.3.2.tgz"; - sha1 = "2c40450b9348e97f281322593ba96704b9abd4d4"; + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz"; + sha1 = "c07b211c7c952ec1f8efd51a77ef0d1d3990a292"; }; }; - "trim-0.0.1" = { - name = "trim"; - packageName = "trim"; - version = "0.0.1"; + "braces-0.1.5" = { + name = "braces"; + packageName = "braces"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz"; - sha1 = "5858547f6b290757ee95cccc666fb50084c460dd"; - }; - }; - "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"; - }; - }; - "dat-ignore-2.0.0" = { - name = "dat-ignore"; - packageName = "dat-ignore"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dat-ignore/-/dat-ignore-2.0.0.tgz"; - sha512 = "1s78mv3ngs1v1cgpcp97y1xmns97m2r6gjkkrksl63j5d870vpsmmrhsfm1vw4q0dz4c1yfnfcpijlgbqai9c5d2zj1lz56rih0kxk8"; - }; - }; - "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-storage-1.0.3" = { - name = "dat-storage"; - packageName = "dat-storage"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/dat-storage/-/dat-storage-1.0.3.tgz"; - sha512 = "1n7gszxdkchx0bilz4phnanzmw00fkljwm9rl0z7cndi94xrb6pkzczh6x137xn62j9p7yp6nz24a82q8llsrlk3c1pwvn269cdx97a"; - }; - }; - "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"; - }; - }; - "hyperdrive-9.12.0" = { - name = "hyperdrive"; - packageName = "hyperdrive"; - version = "9.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-9.12.0.tgz"; - sha512 = "285nxd3xfdr51r8av9d7dal8hqa3lfrac1m46gn9b73ljwivlhhsxpbrqyhdf80v7bnmw8vpy61x77gm8cfmwv5z8pffmmnla2p8l5y"; - }; - }; - "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.0.1" = { - name = "hyperdrive-network-speed"; - packageName = "hyperdrive-network-speed"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/hyperdrive-network-speed/-/hyperdrive-network-speed-2.0.1.tgz"; - sha1 = "40daf82e31b9d753f2ae6dfaf0818661ed24fe15"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; + url = "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz"; + sha1 = "c085711085291d8b75fdd74eab0f8597280711e6"; }; }; "braces-1.8.5" = { @@ -8860,3833 +2965,13 @@ let 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"; - }; - }; - "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-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"; - }; - }; - "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"; - }; - }; - "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-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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "append-tree-2.4.0" = { - name = "append-tree"; - packageName = "append-tree"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/append-tree/-/append-tree-2.4.0.tgz"; - sha512 = "1ym9wsmz3fjv0wf675xclbnjp825cyvxp3a9x8af96yms45dbk8c79jrx5vgdii1zimcnr2pg305g9sw79k5yqah9267k71lsz5vv35"; - }; - }; - "dat-secret-storage-4.0.0" = { - name = "dat-secret-storage"; - packageName = "dat-secret-storage"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dat-secret-storage/-/dat-secret-storage-4.0.0.tgz"; - sha1 = "01b219a5bc1619efc0f58122a3c6cebb1eb8b40a"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "brfs-1.4.3" = { - name = "brfs"; - packageName = "brfs"; - version = "1.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/brfs/-/brfs-1.4.3.tgz"; - sha1 = "db675d6f5e923e6df087fca5859c9090aaed3216"; - }; - }; - "codecs-1.2.0" = { - name = "codecs"; - packageName = "codecs"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/codecs/-/codecs-1.2.0.tgz"; - sha1 = "5148549e3d156c5fa053d7cbb419715a0cf43d16"; - }; - }; - "from2-2.3.0" = { - name = "from2"; - packageName = "from2"; + "braces-2.3.0" = { + name = "braces"; + packageName = "braces"; version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz"; - sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; - }; - }; - "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"; - }; - }; - "protocol-buffers-3.2.1" = { - name = "protocol-buffers"; - packageName = "protocol-buffers"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/protocol-buffers/-/protocol-buffers-3.2.1.tgz"; - sha1 = "37258e17e24a082f06ebb17731e92851d1c76889"; - }; - }; - "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"; - }; - }; - "quote-stream-1.0.2" = { - name = "quote-stream"; - packageName = "quote-stream"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/quote-stream/-/quote-stream-1.0.2.tgz"; - sha1 = "84963f8c9c26b942e153feeb53aae74652b7e0b2"; - }; - }; - "static-module-1.5.0" = { - name = "static-module"; - packageName = "static-module"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/static-module/-/static-module-1.5.0.tgz"; - sha1 = "27da9883c41a8cd09236f842f0c1ebc6edf63d86"; - }; - }; - "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"; - }; - }; - "escodegen-1.3.3" = { - name = "escodegen"; - packageName = "escodegen"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz"; - sha1 = "f024016f5a88e046fd12005055e939802e6c5f23"; - }; - }; - "object-inspect-0.4.0" = { - name = "object-inspect"; - packageName = "object-inspect"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-0.4.0.tgz"; - sha1 = "f5157c116c1455b243b06ee97703392c5ad89fec"; - }; - }; - "quote-stream-0.0.0" = { - name = "quote-stream"; - packageName = "quote-stream"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/quote-stream/-/quote-stream-0.0.0.tgz"; - sha1 = "cde29e94c409b16e19dc7098b89b6658f9721d3b"; - }; - }; - "shallow-copy-0.0.1" = { - name = "shallow-copy"; - packageName = "shallow-copy"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz"; - sha1 = "415f42702d73d810330292cc5ee86eae1a11a170"; - }; - }; - "static-eval-0.2.4" = { - name = "static-eval"; - packageName = "static-eval"; - version = "0.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/static-eval/-/static-eval-0.2.4.tgz"; - sha1 = "b7d34d838937b969f9641ca07d48f8ede263ea7b"; - }; - }; - "through2-0.4.2" = { - name = "through2"; - packageName = "through2"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz"; - sha1 = "dbf5866031151ec8352bb6c4db64a2292a840b9b"; - }; - }; - "esutils-1.0.0" = { - name = "esutils"; - packageName = "esutils"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz"; - sha1 = "8151d358e20c8acc7fb745e7472c0025fe496570"; - }; - }; - "estraverse-1.5.1" = { - name = "estraverse"; - packageName = "estraverse"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz"; - sha1 = "867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71"; - }; - }; - "esprima-1.1.1" = { - name = "esprima"; - packageName = "esprima"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz"; - sha1 = "5b6f1547f4d102e670e140c509be6771d6aeb549"; - }; - }; - "escodegen-0.0.28" = { - name = "escodegen"; - packageName = "escodegen"; - version = "0.0.28"; - src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-0.0.28.tgz"; - sha1 = "0e4ff1715f328775d6cab51ac44a406cd7abffd3"; - }; - }; - "esprima-1.0.4" = { - name = "esprima"; - packageName = "esprima"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz"; - sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"; - }; - }; - "estraverse-1.3.2" = { - name = "estraverse"; - packageName = "estraverse"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-1.3.2.tgz"; - sha1 = "37c2b893ef13d723f276d878d60d8535152a6c42"; - }; - }; - "xtend-2.1.2" = { - name = "xtend"; - packageName = "xtend"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz"; - sha1 = "6efecc2a4dad8e6962c4901b337ce7ba87b5d28b"; - }; - }; - "object-keys-0.4.0" = { - name = "object-keys"; - packageName = "object-keys"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz"; - sha1 = "28a6aae7428dd2c3a92f3d95f21335dd204e0336"; - }; - }; - "protocol-buffers-schema-3.3.2" = { - name = "protocol-buffers-schema"; - packageName = "protocol-buffers-schema"; - version = "3.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.3.2.tgz"; - sha512 = "3rvq2xsb9y9vfy8vgf6ja08362bjcg132kxcwcfdik1j6j17dvlk535agpwiqzj47g1d7shcwq5h6zk5jy1ny25n4z6bzh1rfkv5mjx"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "sorted-array-functions-1.0.0" = { - name = "sorted-array-functions"; - packageName = "sorted-array-functions"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sorted-array-functions/-/sorted-array-functions-1.0.0.tgz"; - sha1 = "c0b554d9e709affcbe56d34c1b2514197fd38279"; - }; - }; - "hypercore-6.11.0" = { - name = "hypercore"; - packageName = "hypercore"; - version = "6.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-6.11.0.tgz"; - sha512 = "0q0972kpj73qndhwb3msk3xkfpx1zldfw1ld815kncb0lbr7mdhawjz701y230zji0lamnznrv61cmcnx2zlqjhvcyrf9fyyr93r6ds"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "uint64be-2.0.1" = { - name = "uint64be"; - packageName = "uint64be"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uint64be/-/uint64be-2.0.1.tgz"; - sha1 = "a310d94e4e5e0b02a95d678e33323f802bdc8428"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "bulk-write-stream-1.1.3" = { - name = "bulk-write-stream"; - packageName = "bulk-write-stream"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/bulk-write-stream/-/bulk-write-stream-1.1.3.tgz"; - sha1 = "d29ca385fbd53f357aee5bd3d3028732b62ae275"; - }; - }; - "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"; - }; - }; - "hypercore-protocol-6.4.2" = { - name = "hypercore-protocol"; - packageName = "hypercore-protocol"; - version = "6.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.4.2.tgz"; - sha512 = "07lwyavmways0q0ljrvpgvdii96f96a692m4x8dwmdwlfgh604gjz47vs95zk2ryfs9qm5j9msvy955bgyqns2az3ypysi76k51n7y7"; - }; - }; - "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"; - }; - }; - "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-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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "sodium-javascript-0.5.4" = { - name = "sodium-javascript"; - packageName = "sodium-javascript"; - version = "0.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/sodium-javascript/-/sodium-javascript-0.5.4.tgz"; - sha512 = "1dqdzm0qjk1rwq62b010b649wdpvlzdxpmwc972p0dcwsc86wqfcm8lbdcxlrwypkn2jq5df1xpbxhxfphnpr993ac543p9s212si30"; - }; - }; - "sodium-native-2.1.2" = { - name = "sodium-native"; - packageName = "sodium-native"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.2.tgz"; - sha512 = "3rkm9fyndric0yxx4qsrxmj1wbz7q4ixm6735jlsvkyi8gvibszsc017660p4gdypcikwbzfyvcxl1bpjwnbcd60gbri5xnxqd1m0yl"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "blake2b-wasm-1.1.4" = { - name = "blake2b-wasm"; - packageName = "blake2b-wasm"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/blake2b-wasm/-/blake2b-wasm-1.1.4.tgz"; - sha512 = "3hgcz1c3h2hxgavmlf5r4dwk0wy2sg9y4lfs5ifj4spdlwyy3ki9i1i4hjaw0029c896d6yw424mw2j1nf4qyibkz2lbh1ws6z6rdlg"; - }; - }; - "base64-to-uint8array-1.0.0" = { - name = "base64-to-uint8array"; - packageName = "base64-to-uint8array"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-to-uint8array/-/base64-to-uint8array-1.0.0.tgz"; - sha512 = "01a4ip2ivflpjsx4flnww5fqvdcsy2sqnjgp2cii6b2gnkkccr02vbf2y8r2wlcab4pb8x47qb3jpahca61v584bmz9xcwyqx0xdf3n"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "recursive-watch-1.1.2" = { - name = "recursive-watch"; - packageName = "recursive-watch"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/recursive-watch/-/recursive-watch-1.1.2.tgz"; - sha1 = "912e2d62a83c8b388d288c4343495f247bc43f8e"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "ansi-diff-stream-1.2.0" = { - name = "ansi-diff-stream"; - packageName = "ansi-diff-stream"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-diff-stream/-/ansi-diff-stream-1.2.0.tgz"; - sha1 = "eb325c20ac3623ecd592011a9295d76d97de460e"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "bluebird-2.9.9" = { - name = "bluebird"; - packageName = "bluebird"; - version = "2.9.9"; - src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-2.9.9.tgz"; - sha1 = "61a26904d43d7f6b19dff7ed917dbc92452ad6d3"; - }; - }; - "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"; - }; - }; - "event-stream-3.2.2" = { - name = "event-stream"; - packageName = "event-stream"; - version = "3.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/event-stream/-/event-stream-3.2.2.tgz"; - sha1 = "f79f9984c07ee3fd9b44ffb3cd0422b13e24084d"; - }; - }; - "express-4.11.2" = { - name = "express"; - packageName = "express"; - version = "4.11.2"; - src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.11.2.tgz"; - sha1 = "8df3d5a9ac848585f00a0777601823faecd3b148"; - }; - }; - "hiredis-0.4.1" = { - name = "hiredis"; - packageName = "hiredis"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/hiredis/-/hiredis-0.4.1.tgz"; - sha1 = "aab4dcfd0fc4cbdb219d268005f2335a3c639e8f"; - }; - }; - "json-rpc2-0.8.1" = { - name = "json-rpc2"; - packageName = "json-rpc2"; - version = "0.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-rpc2/-/json-rpc2-0.8.1.tgz"; - sha1 = "efe8c9834605b556c488d1ed7bcf24ee381eeeb2"; - }; - }; - "lodash-3.1.0" = { - name = "lodash"; - packageName = "lodash"; - version = "3.1.0"; - 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"; - }; - }; - "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/native-dns-packet/-/native-dns-packet-0.1.1.tgz"; - sha1 = "97da90570b8438a00194701ce24d011fd3cc109a"; - }; - }; - "nconf-0.7.1" = { - name = "nconf"; - packageName = "nconf"; - version = "0.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nconf/-/nconf-0.7.1.tgz"; - sha1 = "ee4b561dd979a3c58db122e38f196d49d61aeb5b"; - }; - }; - "properties-1.2.1" = { - name = "properties"; - packageName = "properties"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/properties/-/properties-1.2.1.tgz"; - sha1 = "0ee97a7fc020b1a2a55b8659eda4aa8d869094bd"; - }; - }; - "redis-0.12.1" = { - name = "redis"; - packageName = "redis"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/redis/-/redis-0.12.1.tgz"; - sha1 = "64df76ad0fc8acebaebd2a0645e8a48fac49185e"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "cookie-signature-1.0.5" = { - name = "cookie-signature"; - packageName = "cookie-signature"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.5.tgz"; - sha1 = "a122e3f1503eca0f5355795b0711bb2368d450f9"; - }; - }; - "debug-2.1.3" = { - name = "debug"; - packageName = "debug"; - version = "2.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz"; - sha1 = "ce8ab1b5ee8fbee2bfa3b633cab93d366b63418e"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "etag-1.5.1" = { - name = "etag"; - packageName = "etag"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz"; - sha1 = "54c50de04ee42695562925ac566588291be7e9ea"; - }; - }; - "finalhandler-0.3.3" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "0.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.3.3.tgz"; - sha1 = "b1a09aa1e6a607b3541669b09bcb727f460cd426"; - }; - }; - "fresh-0.2.4" = { - name = "fresh"; - packageName = "fresh"; - version = "0.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"; - sha1 = "3582499206c9723714190edd74b4604feb4a614c"; - }; - }; - "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"; - }; - }; - "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.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"; - }; - }; - "qs-2.3.3" = { - name = "qs"; - packageName = "qs"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"; - sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404"; - }; - }; - "range-parser-1.0.3" = { - name = "range-parser"; - packageName = "range-parser"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz"; - sha1 = "6872823535c692e2c2a0103826afd82c2e0ff175"; - }; - }; - "send-0.11.1" = { - name = "send"; - packageName = "send"; - version = "0.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.11.1.tgz"; - sha1 = "1beabfd42f9e2709f99028af3078ac12b47092d5"; - }; - }; - "serve-static-1.8.1" = { - name = "serve-static"; - packageName = "serve-static"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.8.1.tgz"; - sha1 = "08fabd39999f050fc311443f46d5888a77ecfc7c"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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.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"; - }; - }; - "ms-0.7.0" = { - name = "ms"; - packageName = "ms"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz"; - sha1 = "865be94c2e7397ad8a57da6a633a6e2f30798b83"; - }; - }; - "crc-3.2.1" = { - name = "crc"; - packageName = "crc"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"; - sha1 = "5d9c8fb77a245cd5eca291e5d2d005334bab0082"; - }; - }; - "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"; - }; - }; - "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-types-2.0.14" = { - name = "mime-types"; - packageName = "mime-types"; - version = "2.0.14"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz"; - sha1 = "310e159db23e077f8bb22b748dabfa4957140aa6"; - }; - }; - "mime-db-1.12.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz"; - sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7"; - }; - }; - "bindings-1.3.0" = { - name = "bindings"; - packageName = "bindings"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz"; - sha512 = "15lvjac4av3h7xmks8jgd56vryz5xb27r8xcpfwhfyr9dv305lms5llc1x6nx6nfvha873d4vg04nfi89aj4jkxplrnjiyc9kjf34hf"; - }; - }; - "jsonparse-0.0.6" = { - name = "jsonparse"; - packageName = "jsonparse"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.6.tgz"; - sha1 = "ab599f19324d4ae178fa21a930192ab11ab61a4e"; - }; - }; - "debug-1.0.5" = { - name = "debug"; - packageName = "debug"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-1.0.5.tgz"; - sha1 = "f7241217430f99dec4c2b473eab92228e874c2ac"; - }; - }; - "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"; - }; - }; - "es5class-2.3.1" = { - name = "es5class"; - packageName = "es5class"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es5class/-/es5class-2.3.1.tgz"; - sha1 = "42c5c18a9016bcb0db28a4d340ebb831f55d1b66"; - }; - }; - "faye-websocket-0.11.1" = { - name = "faye-websocket"; - packageName = "faye-websocket"; - version = "0.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz"; - sha1 = "f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"; - }; - }; - "eventemitter3-0.1.6" = { - name = "eventemitter3"; - packageName = "eventemitter3"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-0.1.6.tgz"; - sha1 = "8c7ac44b87baab55cd50c828dc38778eac052ea5"; - }; - }; - "better-curry-1.6.0" = { - name = "better-curry"; - packageName = "better-curry"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/better-curry/-/better-curry-1.6.0.tgz"; - sha1 = "38f716b24c8cee07a262abc41c22c314e20e3869"; - }; - }; - "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"; - }; - }; - "http-parser-js-0.4.9" = { - name = "http-parser-js"; - packageName = "http-parser-js"; - version = "0.4.9"; - src = fetchurl { - url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.9.tgz"; - sha1 = "ea1a04fb64adff0242e9974f297dd4c3cad271e1"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "binaryheap-0.0.3" = { - name = "binaryheap"; - packageName = "binaryheap"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/binaryheap/-/binaryheap-0.0.3.tgz"; - sha1 = "0d6136c84e9f1a5a90c0b97178c3e00df59820d6"; - }; - }; - "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"; - }; - }; - "buffercursor-0.0.12" = { - name = "buffercursor"; - packageName = "buffercursor"; - version = "0.0.12"; - src = fetchurl { - url = "https://registry.npmjs.org/buffercursor/-/buffercursor-0.0.12.tgz"; - sha1 = "78a9a7f4343ae7d820a8999acc80de591e25a779"; - }; - }; - "extsprintf-1.4.0" = { - name = "extsprintf"; - packageName = "extsprintf"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.0.tgz"; - sha1 = "e2689f8f356fad62cca65a3a91c5df5f9551692f"; - }; - }; - "qs-1.2.0" = { - name = "qs"; - packageName = "qs"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-1.2.0.tgz"; - sha1 = "ed079be28682147e6fd9a34cc2b0c1e0ec6453ee"; - }; - }; - "formidable-1.0.14" = { - name = "formidable"; - packageName = "formidable"; - version = "1.0.14"; - src = fetchurl { - url = "https://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz"; - sha1 = "2b3f4c411cbb5fdd695c44843e2a23514a43231a"; - }; - }; - "component-emitter-1.1.2" = { - name = "component-emitter"; - packageName = "component-emitter"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz"; - sha1 = "296594f2753daa63996d2af08d15a95116c9aec3"; - }; - }; - "methods-1.0.1" = { - name = "methods"; - packageName = "methods"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/methods/-/methods-1.0.1.tgz"; - sha1 = "75bc91943dffd7da037cf3eeb0ed73a0037cd14b"; - }; - }; - "cookiejar-2.0.1" = { - name = "cookiejar"; - packageName = "cookiejar"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.0.1.tgz"; - sha1 = "3d12752f6adf68a892f332433492bd5812bb668f"; - }; - }; - "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"; - }; - }; - "form-data-0.1.3" = { - name = "form-data"; - packageName = "form-data"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz"; - sha1 = "4ee4346e6eb5362e8344a02075bd8dbd8c7373ea"; - }; - }; - "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"; - }; - }; - "JSONStream-0.8.4" = { - name = "JSONStream"; - packageName = "JSONStream"; - version = "0.8.4"; - src = fetchurl { - url = "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz"; - sha1 = "91657dfe6ff857483066132b4618b62e8f4887bd"; - }; - }; - "basic-auth-1.1.0" = { - name = "basic-auth"; - packageName = "basic-auth"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.1.0.tgz"; - sha1 = "45221ee429f7ee1e5035be3f51533f1cdfd29884"; - }; - }; - "cors-2.8.4" = { - name = "cors"; - packageName = "cors"; - version = "2.8.4"; - src = fetchurl { - url = "https://registry.npmjs.org/cors/-/cors-2.8.4.tgz"; - sha1 = "2bd381f2eb201020105cd50ea59da63090694686"; - }; - }; - "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/docker-parse-image/-/docker-parse-image-3.0.1.tgz"; - sha1 = "33dc69291eac3414f84871f2d59d77b6f6948be4"; - }; - }; - "from2-1.3.0" = { - name = "from2"; - packageName = "from2"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/from2/-/from2-1.3.0.tgz"; - sha1 = "88413baaa5f9a597cfde9221d86986cd3c061dfd"; - }; - }; - "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/fs-blob-store/-/fs-blob-store-5.2.1.tgz"; - sha1 = "2a7db7ef59a5ec548cce8564066508224c9b0457"; - }; - }; - "level-0.18.0" = { - name = "level"; - packageName = "level"; - version = "0.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/level/-/level-0.18.0.tgz"; - sha1 = "e1a3f4cad65fc02e25070a47d63d7b527361c1cf"; - }; - }; - "level-sublevel-6.6.1" = { - name = "level-sublevel"; - packageName = "level-sublevel"; - version = "6.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/level-sublevel/-/level-sublevel-6.6.1.tgz"; - sha1 = "f9a77f7521ab70a8f8e92ed56f21a3c7886a4485"; - }; - }; - "leveldown-0.10.6" = { - name = "leveldown"; - packageName = "leveldown"; - version = "0.10.6"; - src = fetchurl { - url = "https://registry.npmjs.org/leveldown/-/leveldown-0.10.6.tgz"; - sha1 = "a1bb751c95263ff60f41bde0f973ff8c1e98bbe9"; - }; - }; - "levelup-0.18.6" = { - name = "levelup"; - packageName = "levelup"; - version = "0.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/levelup/-/levelup-0.18.6.tgz"; - sha1 = "e6a01cb089616c8ecc0291c2a9bd3f0c44e3e5eb"; - }; - }; - "lexicographic-integer-1.1.0" = { - name = "lexicographic-integer"; - packageName = "lexicographic-integer"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lexicographic-integer/-/lexicographic-integer-1.1.0.tgz"; - sha1 = "52ca6d998a572e6322b515f5b80e396c6043e9b8"; - }; - }; - "memdown-0.10.2" = { - name = "memdown"; - packageName = "memdown"; - version = "0.10.2"; - src = fetchurl { - url = "https://registry.npmjs.org/memdown/-/memdown-0.10.2.tgz"; - sha1 = "a15ed0b6a8f216848d80a75c0fe8dd0bad89b608"; - }; - }; - "minimist-0.2.0" = { - name = "minimist"; - packageName = "minimist"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz"; - sha1 = "4dffe525dae2b864c66c2e23c6271d7afdecefce"; - }; - }; - "ndjson-1.5.0" = { - name = "ndjson"; - packageName = "ndjson"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ndjson/-/ndjson-1.5.0.tgz"; - sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8"; - }; - }; - "pumpify-1.3.5" = { - name = "pumpify"; - packageName = "pumpify"; - version = "1.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/pumpify/-/pumpify-1.3.5.tgz"; - sha1 = "1b671c619940abcaeac0ad0e3a3c164be760993b"; - }; - }; - "relative-date-1.1.3" = { - name = "relative-date"; - packageName = "relative-date"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/relative-date/-/relative-date-1.1.3.tgz"; - sha1 = "120903040588ec7a4a399c6547fd01d0e3d2dc63"; - }; - }; - "root-2.0.0" = { - name = "root"; - packageName = "root"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/root/-/root-2.0.0.tgz"; - sha1 = "5cde3bc4ee9eb314c9dc64f97d9b9787df22e2f7"; - }; - }; - "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/sorted-union-stream/-/sorted-union-stream-1.0.2.tgz"; - sha1 = "558e7f57a5bf6baf6501baf2ae2c9076c4502006"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "jsonparse-0.0.5" = { - name = "jsonparse"; - packageName = "jsonparse"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz"; - sha1 = "330542ad3f0a654665b778f3eb2d9a9fa507ac64"; - }; - }; - "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"; - }; - }; - "level-packager-0.18.0" = { - name = "level-packager"; - packageName = "level-packager"; - version = "0.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/level-packager/-/level-packager-0.18.0.tgz"; - sha1 = "c076b087646f1d7dedcc3442f58800dd0a0b45f5"; - }; - }; - "bytewise-1.1.0" = { - name = "bytewise"; - packageName = "bytewise"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bytewise/-/bytewise-1.1.0.tgz"; - sha1 = "1d13cbff717ae7158094aa881b35d081b387253e"; - }; - }; - "levelup-0.19.1" = { - name = "levelup"; - packageName = "levelup"; - version = "0.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/levelup/-/levelup-0.19.1.tgz"; - sha1 = "f3a6a7205272c4b5f35e412ff004a03a0aedf50b"; - }; - }; - "ltgt-2.1.3" = { - name = "ltgt"; - packageName = "ltgt"; - version = "2.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ltgt/-/ltgt-2.1.3.tgz"; - sha1 = "10851a06d9964b971178441c23c9e52698eece34"; - }; - }; - "pull-level-2.0.3" = { - name = "pull-level"; - packageName = "pull-level"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/pull-level/-/pull-level-2.0.3.tgz"; - sha1 = "9500635e257945d6feede185f5d7a24773455b17"; - }; - }; - "pull-stream-3.6.1" = { - name = "pull-stream"; - packageName = "pull-stream"; - version = "3.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.1.tgz"; - sha1 = "c5c2ae4a51246efeebcc65c0412a3d725a92ce00"; - }; - }; - "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"; - }; - }; - "bytewise-core-1.2.3" = { - name = "bytewise-core"; - packageName = "bytewise-core"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/bytewise-core/-/bytewise-core-1.2.3.tgz"; - sha1 = "3fb410c7e91558eb1ab22a82834577aa6bd61d42"; - }; - }; - "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"; - }; - }; - "bl-0.8.2" = { - name = "bl"; - packageName = "bl"; - version = "0.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-0.8.2.tgz"; - sha1 = "c9b6bca08d1bc2ea00fc8afb4f1a5fd1e1c66e4e"; - }; - }; - "deferred-leveldown-0.2.0" = { - name = "deferred-leveldown"; - packageName = "deferred-leveldown"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-0.2.0.tgz"; - sha1 = "2cef1f111e1c57870d8bbb8af2650e587cd2f5b4"; - }; - }; - "errno-0.1.6" = { - name = "errno"; - packageName = "errno"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/errno/-/errno-0.1.6.tgz"; - sha512 = "0vny3xisd56kx193rhv6vpccjxlajjn9ss5wk96l1ya8zbpkwbjrrgrm9wpfm3xc8apx8z9xb0kjkw0y5qnc6gy1hf2qsas79093hr2"; - }; - }; - "prr-0.0.0" = { - name = "prr"; - packageName = "prr"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz"; - sha1 = "1a84b85908325501411853d0081ee3fa86e2926a"; - }; - }; - "semver-5.1.1" = { - name = "semver"; - packageName = "semver"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.1.1.tgz"; - sha1 = "a3292a373e6f3e0798da0b20641b9a9c5bc47e19"; - }; - }; - "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"; - src = fetchurl { - url = "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-0.12.4.tgz"; - sha1 = "29e18e632e60e4e221d5810247852a63d7b2e410"; - }; - }; - "prr-1.0.1" = { - name = "prr"; - packageName = "prr"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz"; - sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476"; - }; - }; - "level-post-1.0.5" = { - name = "level-post"; - packageName = "level-post"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/level-post/-/level-post-1.0.5.tgz"; - sha1 = "2a66390409bf6a1621a444bab6f016444cc9802c"; - }; - }; - "pull-cat-1.1.11" = { - name = "pull-cat"; - packageName = "pull-cat"; - version = "1.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/pull-cat/-/pull-cat-1.1.11.tgz"; - sha1 = "b642dd1255da376a706b6db4fa962f5fdb74c31b"; - }; - }; - "pull-live-1.0.1" = { - name = "pull-live"; - packageName = "pull-live"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pull-live/-/pull-live-1.0.1.tgz"; - sha1 = "a4ecee01e330155e9124bbbcf4761f21b38f51f5"; - }; - }; - "pull-pushable-2.1.1" = { - name = "pull-pushable"; - packageName = "pull-pushable"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pull-pushable/-/pull-pushable-2.1.1.tgz"; - sha1 = "86666abbe3f5402f1f7ead03eefd69b785eca5b8"; - }; - }; - "pull-window-2.1.4" = { - name = "pull-window"; - packageName = "pull-window"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/pull-window/-/pull-window-2.1.4.tgz"; - sha1 = "fc3b86feebd1920c7ae297691e23f705f88552f0"; - }; - }; - "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"; - }; - }; - "looper-2.0.0" = { - name = "looper"; - packageName = "looper"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/looper/-/looper-2.0.0.tgz"; - sha1 = "66cd0c774af3d4fedac53794f742db56da8f09ec"; - }; - }; - "looper-3.0.0" = { - name = "looper"; - packageName = "looper"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/looper/-/looper-3.0.0.tgz"; - sha1 = "2efa54c3b1cbaba9b94aee2e5914b0be57fbb749"; - }; - }; - "nan-2.1.0" = { - name = "nan"; - packageName = "nan"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.1.0.tgz"; - sha1 = "020a7ccedc63fdee85f85967d5607849e74abbe8"; - }; - }; - "semver-2.3.2" = { - name = "semver"; - packageName = "semver"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-2.3.2.tgz"; - sha1 = "b9848f25d6cf36333073ec9ef8856d42f1233e52"; - }; - }; - "ltgt-1.0.2" = { - name = "ltgt"; - packageName = "ltgt"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ltgt/-/ltgt-1.0.2.tgz"; - sha1 = "e6817eb29ad204fc0c9e96ef8b0fee98ef6b9aa3"; - }; - }; - "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"; - }; - }; - "murl-0.4.1" = { - name = "murl"; - packageName = "murl"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/murl/-/murl-0.4.1.tgz"; - sha1 = "489fbcc7f1b2b77e689c84120a51339c3849c939"; - }; - }; - "protein-0.5.0" = { - name = "protein"; - packageName = "protein"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/protein/-/protein-0.5.0.tgz"; - sha1 = "80ab4e919749351263ef14500d684e57c4202840"; - }; - }; - "bl-1.2.1" = { - name = "bl"; - packageName = "bl"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz"; - sha1 = "cac328f7bee45730d404b692203fcb590e172d5e"; - }; - }; - "aws-sdk-2.173.0" = { - name = "aws-sdk"; - packageName = "aws-sdk"; - version = "2.173.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.173.0.tgz"; - sha1 = "2b29486f16e1d04159d0513aa47f5dd70370116d"; - }; - }; - "buffer-4.9.1" = { - name = "buffer"; - packageName = "buffer"; - version = "4.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz"; - sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; - }; - }; - "crypto-browserify-1.0.9" = { - name = "crypto-browserify"; - packageName = "crypto-browserify"; - version = "1.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-1.0.9.tgz"; - sha1 = "cc5449685dfb85eb11c9828acc7cb87ab5bbfcc0"; - }; - }; - "jmespath-0.15.0" = { - name = "jmespath"; - packageName = "jmespath"; - version = "0.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz"; - sha1 = "a3f222a9aae9f966f5d27c796510e28091764217"; - }; - }; - "sax-1.2.1" = { - name = "sax"; - packageName = "sax"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz"; - sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a"; - }; - }; - "url-0.10.3" = { - name = "url"; - packageName = "url"; - version = "0.10.3"; - src = fetchurl { - url = "https://registry.npmjs.org/url/-/url-0.10.3.tgz"; - sha1 = "021e4d9c7705f21bbf37d03ceb58767402774c64"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "binstall-1.2.0" = { - name = "binstall"; - packageName = "binstall"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/binstall/-/binstall-1.2.0.tgz"; - sha1 = "6b2c0f580b9e3c607f50ef7a22a54ce9fdc8d933"; - }; - }; - "chalk-2.1.0" = { - name = "chalk"; - packageName = "chalk"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz"; - sha512 = "1fnn3znivja3xq1lacvsdwkl2s8ki9w95sylnf2pkmaia1mjz3llbdb5r2dxsflqfky3h8f1bh0piv0l5waw2bkdniqnyv0yx5wch9d"; - }; - }; - "chokidar-1.6.0" = { - name = "chokidar"; - packageName = "chokidar"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-1.6.0.tgz"; - sha1 = "90c32ad4802901d7713de532dc284e96a63ad058"; - }; - }; - "cross-spawn-4.0.0" = { - name = "cross-spawn"; - packageName = "cross-spawn"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.0.tgz"; - sha1 = "8254774ab4786b8c5b3cf4dfba66ce563932c252"; - }; - }; - "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"; - src = fetchurl { - url = "https://registry.npmjs.org/firstline/-/firstline-1.2.1.tgz"; - sha1 = "b88673c42009f8821fac2926e99720acee924fae"; - }; - }; - "fs-extra-0.30.0" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "0.30.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz"; - sha1 = "f233ffcc08d4da7d432daa449776989db1df93f0"; - }; - }; - "fsevents-1.1.2" = { - name = "fsevents"; - packageName = "fsevents"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz"; - sha512 = "25k3z64r4fhzjs1crh981lkkvkrhn2xv67k7y00zpnpsl571y5apg0r0kanddirms8kxf2xgf4yx9n2hzs9ml3v3p9qcnqhkh9khzja"; - }; - }; - "lodash-4.13.1" = { - name = "lodash"; - packageName = "lodash"; - version = "4.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz"; - sha1 = "83e4b10913f48496d4d16fec4a560af2ee744b68"; - }; - }; - "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/murmur-hash-js/-/murmur-hash-js-1.0.0.tgz"; - sha1 = "5041049269c96633c866386960b2f4289e75e5b0"; - }; - }; - "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/node-elm-compiler/-/node-elm-compiler-4.3.3.tgz"; - sha512 = "2xwfrbx7s959y63gdiy54y86mp770vkxfgszp5xhwnxr29d3xavf8dnp0ab238732wh1121qwlx6k68wa4wkk4rm4qiswq5h5m9fjhd"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "lru-cache-4.1.1" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz"; - sha512 = "1xz91sizgyzh8plz5jx1labzpygapm6xy3qpxriaj00yvnhy4lnmhqcb20qln4lh80c5g3yzp4j5i6g63njq1r5sl9c0zlkh9xjk2xb"; - }; - }; - "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"; - }; - }; - "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/find-elm-dependencies/-/find-elm-dependencies-1.0.2.tgz"; - sha512 = "2hpc7v115prqkr487hxh0gllwvf0xa90lsb3i1azmrpfclp37vahxvdsqkr9pwvbcr7znccvhfgp1xy26czrmdcxzfl250a63dywyw2"; - }; - }; - "lodash-4.14.2" = { - name = "lodash"; - packageName = "lodash"; - version = "4.14.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz"; - sha1 = "bbccce6373a400fbfd0a8c67ca42f6d1ef416432"; - }; - }; - "firstline-1.2.0" = { - name = "firstline"; - packageName = "firstline"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/firstline/-/firstline-1.2.0.tgz"; - sha1 = "c9f4886e7f7fbf0afc12d71941dce06b192aea05"; - }; - }; - "auto-bind-1.1.0" = { - name = "auto-bind"; - packageName = "auto-bind"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/auto-bind/-/auto-bind-1.1.0.tgz"; - sha1 = "93b864dc7ee01a326281775d5c75ca0a751e5961"; - }; - }; - "clipboardy-1.2.2" = { - name = "clipboardy"; - packageName = "clipboardy"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/clipboardy/-/clipboardy-1.2.2.tgz"; - sha512 = "2pq14hxz6w4k5yvndrm1fv3iyscdqf5c4nja421gl2661didzh80r08zddd84zny94831qs44biamjhvwmqh40pfy3pjv3vwl2ap8np"; - }; - }; - "conf-1.3.1" = { - name = "conf"; - packageName = "conf"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/conf/-/conf-1.3.1.tgz"; - sha512 = "0s33rz07rq4r5kf3bgza6gz4157ph97cm2dh8ws0mj7b924prjaqwbsnljx61pvzkl3db82z51i2k41dpg0hqw6srhkx9qx4nb1yrs8"; - }; - }; - "got-7.1.0" = { - name = "got"; - packageName = "got"; - version = "7.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-7.1.0.tgz"; - sha512 = "0phvycaq4yl6jjpyc9vwmgghfy7a6nnpynscpgpbx74zjaa5dbpl1ag0jf7jvimfk0vf6xfjqgh67xdlvi0ycgvp1kasajapjiqr5b3"; - }; - }; - "has-ansi-3.0.0" = { - name = "has-ansi"; - packageName = "has-ansi"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-ansi/-/has-ansi-3.0.0.tgz"; - sha1 = "36077ef1d15f333484aa7fa77a28606f1c655b37"; - }; - }; - "import-jsx-1.3.0" = { - name = "import-jsx"; - packageName = "import-jsx"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/import-jsx/-/import-jsx-1.3.0.tgz"; - sha512 = "26xxz57vqm8p6mg0syr21risma4h5h9n8kn4zv4pcxqap4zxicc210w5m7vz6a4zldhd102sbi7giwzmw0wjlpr6rb1hycr8iv703b1"; - }; - }; - "ink-0.3.1" = { - name = "ink"; - packageName = "ink"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ink/-/ink-0.3.1.tgz"; - sha512 = "0km0z5smnzrh4c5386h3vbmvps6m45m6hbbf62as9wl4vw370q411gpxxhqz3i83n0qjds7py2ylgjx2y3915m5v77c1sf428w4wwkv"; - }; - }; - "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/ink-text-input/-/ink-text-input-1.1.1.tgz"; - sha512 = "3zdg79viy9vippnaj942c8scyk2nay9fqv3zbd681hfcvn082pxbhc7vszppd7k0fy74rd20s2ias98mi2qzhc6a6zm0p4vv6yybrkc"; - }; - }; - "lodash.debounce-4.0.8" = { - name = "lodash.debounce"; - packageName = "lodash.debounce"; - version = "4.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; - sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af"; - }; - }; - "mem-1.1.0" = { - name = "mem"; - packageName = "mem"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz"; - sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76"; - }; - }; - "skin-tone-1.0.0" = { - name = "skin-tone"; - packageName = "skin-tone"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/skin-tone/-/skin-tone-1.0.0.tgz"; - sha1 = "d4ba3e8e5e92760e4d1d3b603d772805c6cb256f"; - }; - }; - "arch-2.1.0" = { - name = "arch"; - packageName = "arch"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/arch/-/arch-2.1.0.tgz"; - sha1 = "3613aa46149064b3c1f0607919bf1d4786e82889"; - }; - }; - "execa-0.8.0" = { - name = "execa"; - packageName = "execa"; - version = "0.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.8.0.tgz"; - sha1 = "d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "npm-run-path-2.0.2" = { - name = "npm-run-path"; - packageName = "npm-run-path"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz"; - sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; - }; - }; - "p-finally-1.0.0" = { - name = "p-finally"; - packageName = "p-finally"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; - sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; - }; - }; - "strip-eof-1.0.0" = { - name = "strip-eof"; - packageName = "strip-eof"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz"; - sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "env-paths-1.0.0" = { - name = "env-paths"; - packageName = "env-paths"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/env-paths/-/env-paths-1.0.0.tgz"; - sha1 = "4168133b42bb05c38a35b1ae4397c8298ab369e0"; - }; - }; - "make-dir-1.1.0" = { - name = "make-dir"; - packageName = "make-dir"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz"; - sha512 = "1q7686aqgkxk9l6nqhzbil3599f9pxiz364kdbfy7pdr9sny7zylpm6yf4rwz4i0aa11lmf35mh8jmj7g7vxm37pvqvl9qbij5jxyfh"; - }; - }; - "pkg-up-2.0.0" = { - name = "pkg-up"; - packageName = "pkg-up"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz"; - sha1 = "c819ac728059a461cab1c3889a2be3c49a004d7f"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "find-up-2.1.0" = { - name = "find-up"; - packageName = "find-up"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz"; - sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; - }; - }; - "locate-path-2.0.0" = { - name = "locate-path"; - packageName = "locate-path"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz"; - sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; - }; - }; - "p-locate-2.0.0" = { - name = "p-locate"; - packageName = "p-locate"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz"; - sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43"; - }; - }; - "path-exists-3.0.0" = { - name = "path-exists"; - packageName = "path-exists"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz"; - sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; - }; - }; - "p-limit-1.1.0" = { - name = "p-limit"; - packageName = "p-limit"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz"; - sha1 = "b07ff2d9a5d88bec806035895a2bab66a27988bc"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "p-cancelable-0.3.0" = { - name = "p-cancelable"; - packageName = "p-cancelable"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz"; - sha512 = "35jir2yjv2l3v8aj062w0hfinzgwpb1sbhmaym8h4xn78j498naj7mkf4rpv74n5bfkysxb7l893l2yw3dpqk5dgb2yiwr8pcydjmj5"; - }; - }; - "p-timeout-1.2.1" = { - name = "p-timeout"; - packageName = "p-timeout"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz"; - sha1 = "5eb3b353b7fce99f101a1038880bb054ebbea386"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - src = fetchurl { - url = "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz"; - sha1 = "8952688c5ec2ffd6b03ecc85e769e02903083470"; - }; - }; - "has-symbol-support-x-1.4.1" = { - name = "has-symbol-support-x"; - packageName = "has-symbol-support-x"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.1.tgz"; - sha512 = "0qgqbqmrlx51w4ixcln9ljr5hs2jj8fvryq7i8cg9a739p7y2c5z8wpplp9jhnfn4a3xn6li2b2npmhfm2x80khm9di3vllyyv9wii6"; - }; - }; - "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/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz"; - sha1 = "997bb1f1ab967f682d2b0876fe358d60e765c56d"; - }; - }; - "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/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz"; - sha1 = "0f36692d50fef6b7e2d4b3ac1478137a963b7b06"; - }; - }; - "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/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz"; - sha1 = "840a028e7df460dfc3a2d29f0c0d91f6376e66a3"; - }; - }; - "caller-path-2.0.0" = { - name = "caller-path"; - packageName = "caller-path"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz"; - sha1 = "468f83044e369ab2010fac5f06ceee15bb2cb1f4"; - }; - }; - "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/require-from-string/-/require-from-string-1.2.1.tgz"; - sha1 = "529c9ccef27380adfec9a2f965b649bbee636418"; - }; - }; - "resolve-from-3.0.0" = { - name = "resolve-from"; - packageName = "resolve-from"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz"; - sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748"; - }; - }; - "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/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz"; - sha1 = "fd6536f2bce13836ffa3a5458c4903a597bb3bf5"; - }; - }; - "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/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz"; - sha1 = "39ff8313b75c8b65dceff1f31d383e0ff2a408a0"; - }; - }; - "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/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz"; - sha1 = "0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"; - }; - }; - "caller-callsite-2.0.0" = { - name = "caller-callsite"; - packageName = "caller-callsite"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz"; - sha1 = "847e0fce0a223750a9a027c54b33731ad3154134"; - }; - }; - "callsites-2.0.0" = { - name = "callsites"; - packageName = "callsites"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz"; - sha1 = "06eb84f00eea413da86affefacbffb36093b3c50"; - }; - }; - "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"; - }; - }; - "indent-string-3.2.0" = { - name = "indent-string"; - packageName = "indent-string"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz"; - sha1 = "4a5fd6d27cc332f37e5419a504dbb837105c9289"; - }; - }; - "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"; - }; - }; - "log-update-2.3.0" = { - name = "log-update"; - packageName = "log-update"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/log-update/-/log-update-2.3.0.tgz"; - sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708"; - }; - }; - "prop-types-15.6.0" = { - name = "prop-types"; - packageName = "prop-types"; - version = "15.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz"; - sha1 = "ceaf083022fc46b4a35f69e13ef75aed0d639856"; - }; - }; - "ansi-escapes-3.0.0" = { - name = "ansi-escapes"; - packageName = "ansi-escapes"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz"; - sha512 = "06szfav8g7xywvqsis16nnkjqs2snhv37r4m53l1ax8k2sahvqv9id2klam32jajqd08ylw8g9wbcjr971igx6vh8idan76drrjby9v"; - }; - }; - "fbjs-0.8.16" = { - name = "fbjs"; - packageName = "fbjs"; - version = "0.8.16"; - src = fetchurl { - url = "https://registry.npmjs.org/fbjs/-/fbjs-0.8.16.tgz"; - sha1 = "5e67432f550dc41b572bf55847b8aca64e5337db"; - }; - }; - "core-js-1.2.7" = { - name = "core-js"; - packageName = "core-js"; - version = "1.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz"; - sha1 = "652294c14651db28fa93bd2d5ff2983a4f08c636"; - }; - }; - "isomorphic-fetch-2.2.1" = { - name = "isomorphic-fetch"; - packageName = "isomorphic-fetch"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz"; - sha1 = "611ae1acf14f5e81f729507472819fe9733558a9"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "node-fetch-1.7.3" = { - name = "node-fetch"; - packageName = "node-fetch"; - version = "1.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz"; - sha512 = "0lz5m15w7qaks0a0s3dm0crsjrsd123dy00pn6qwcp50zfjykxkp22i5ymh6smlc0ags38nmdxlxw9yyq509azlv8kcdvdiq857h5in"; - }; - }; - "whatwg-fetch-2.0.3" = { - name = "whatwg-fetch"; - packageName = "whatwg-fetch"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz"; - sha1 = "9c84ec2dcf68187ff00bc64e1274b442176e1c84"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "doctrine-2.0.2" = { - name = "doctrine"; - packageName = "doctrine"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/doctrine/-/doctrine-2.0.2.tgz"; - sha512 = "3q2dym3ya3hkv5x95fzyax46mxfd8bm53y4xhay4a3zl9mvys1sx1bk6n35x1skq8wqfyi865n2gl2mw3rxdn94m5vhmjxszbj6cjyb"; - }; - }; - "eslint-scope-3.7.1" = { - name = "eslint-scope"; - packageName = "eslint-scope"; - version = "3.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz"; - sha1 = "3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"; - }; - }; - "espree-3.5.2" = { - name = "espree"; - packageName = "espree"; - version = "3.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-3.5.2.tgz"; - sha512 = "04mnrkdqs32w98h9sfkn9i9zkyqj69sz2q1kxpnmsryjnfd9jrpqqlwrik73a80mdz86xckbr7vayw1dwkxhhnbvs4zciqsiiwlm9xi"; - }; - }; - "esquery-1.0.0" = { - name = "esquery"; - packageName = "esquery"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz"; - sha1 = "cfba8b57d7fba93f17298a8a006a04cda13d80fa"; - }; - }; - "estraverse-4.2.0" = { - name = "estraverse"; - packageName = "estraverse"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz"; - sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13"; - }; - }; - "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/file-entry-cache/-/file-entry-cache-2.0.0.tgz"; - sha1 = "c392990c3e684783d838b8c84a45d8a048458361"; - }; - }; - "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/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; - sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; - }; - }; - "globals-11.1.0" = { - name = "globals"; - packageName = "globals"; - version = "11.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-11.1.0.tgz"; - sha512 = "24q4kgcwq3yjsidaajrrvd529l4yfxzv4icxzwl1y2l1nwpv8898gd4k5clygb2i4gsvyjdzm9xd28gwg0zm8iaq71m6kmav6vrcjxq"; - }; - }; - "ignore-3.3.7" = { - name = "ignore"; - packageName = "ignore"; - version = "3.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz"; - sha512 = "0f6xhxww989yic6hwdm8mbylcyakfkrrn22a39wdcc9k842xxyyhzfxkmi79s9gjk3rp3h07n265lf4n51z8yafpdm78d617dxbfqb0"; - }; - }; - "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"; - }; - }; - "is-resolvable-1.0.1" = { - name = "is-resolvable"; - packageName = "is-resolvable"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.1.tgz"; - sha512 = "3kb6apf2r7xkp0saq6lbgg0y18fnqghd18rvmhhmbb537vsbs20rzq5n2xm51wync9igp4kprci8aggcm9iy6b0kp9ph1zgpihrg46b"; - }; - }; - "js-yaml-3.10.0" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "3.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz"; - sha512 = "0h26sq1bwxc45bm0hvlcadrbk4bizzaw729wvw690ya7mpys45bqfzdqwhjkdrnq0i44dzxckykz4bix22jfdyfg1asybg3yzczjsrv"; - }; - }; - "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/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; - sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; - }; - }; - "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"; - }; - }; - "natural-compare-1.4.0" = { - name = "natural-compare"; - packageName = "natural-compare"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"; - sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "pluralize-7.0.0" = { - name = "pluralize"; - packageName = "pluralize"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz"; - sha512 = "2ihaln20qjx82jx73wgzirbyp8mfmhxr75am1h0w8n5hy2gsbgvw9dricv7h57ycxzax84bma96wjscmdszs5mr2lsyxpfjvhwl2601"; - }; - }; - "progress-2.0.0" = { - name = "progress"; - packageName = "progress"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz"; - sha1 = "8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"; - }; - }; - "require-uncached-1.0.3" = { - name = "require-uncached"; - packageName = "require-uncached"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz"; - sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "esrecurse-4.2.0" = { - name = "esrecurse"; - packageName = "esrecurse"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz"; - sha1 = "fa9568d98d3823f9a41d91e902dcab9ea6e5b163"; - }; - }; - "acorn-jsx-3.0.1" = { - name = "acorn-jsx"; - packageName = "acorn-jsx"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz"; - sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b"; - }; - }; - "acorn-3.3.0" = { - name = "acorn"; - packageName = "acorn"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz"; - sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a"; - }; - }; - "flat-cache-1.3.0" = { - name = "flat-cache"; - packageName = "flat-cache"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz"; - sha1 = "d3030b32b38154f4e3b7e9c709f490f7ef97c481"; - }; - }; - "circular-json-0.3.3" = { - name = "circular-json"; - packageName = "circular-json"; - version = "0.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz"; - sha512 = "3hadrrn41znfv3gbqjxf0ckzjmns7w7zgsqw73sdz8nclaff9b0cg1mqhz3zxw3ndnmqqvrdcfykkfpv2v1pv4jdyzcccbn3hsbg4ji"; - }; - }; - "del-2.2.2" = { - name = "del"; - packageName = "del"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/del/-/del-2.2.2.tgz"; - sha1 = "c12c981d067846c84bcaf862cff930d907ffd1a8"; - }; - }; - "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"; - }; - }; - "globby-5.0.0" = { - name = "globby"; - packageName = "globby"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz"; - sha1 = "ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"; - }; - }; - "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/is-path-cwd/-/is-path-cwd-1.0.0.tgz"; - sha1 = "d225ec23132e89edd38fda767472e62e65f1106d"; - }; - }; - "is-path-in-cwd-1.0.0" = { - name = "is-path-in-cwd"; - packageName = "is-path-in-cwd"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz"; - sha1 = "6477582b8214d602346094567003be8a9eac04dc"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "external-editor-2.1.0" = { - name = "external-editor"; - packageName = "external-editor"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/external-editor/-/external-editor-2.1.0.tgz"; - sha512 = "366albydy3glqs8h6y7rdpdhmyffn7vaig5snw8cb1zmn22mgvfywr08jfbmqjiqc9pyjyaaqv6xz5sfy2j1y18590l4f8mji7j53hk"; - }; - }; - "figures-2.0.0" = { - name = "figures"; - packageName = "figures"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz"; - sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; - }; - }; - "run-async-2.3.0" = { - name = "run-async"; - packageName = "run-async"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz"; - sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; - }; - }; - "rx-lite-4.0.8" = { - name = "rx-lite"; - packageName = "rx-lite"; - version = "4.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz"; - sha1 = "0b1e11af8bc44836f04a6407e92da42467b79444"; - }; - }; - "rx-lite-aggregates-4.0.8" = { - name = "rx-lite-aggregates"; - packageName = "rx-lite-aggregates"; - version = "4.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz"; - sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "argparse-1.0.9" = { - name = "argparse"; - packageName = "argparse"; - version = "1.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz"; - sha1 = "73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "caller-path-0.1.0" = { - name = "caller-path"; - packageName = "caller-path"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz"; - sha1 = "94085ef63581ecd3daa92444a8fe94e82577751f"; - }; - }; - "resolve-from-1.0.1" = { - name = "resolve-from"; - packageName = "resolve-from"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz"; - sha1 = "26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"; - }; - }; - "callsites-0.2.0" = { - name = "callsites"; - packageName = "callsites"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz"; - sha1 = "afab96262910a7f33c19a5775825c69f34e350ca"; - }; - }; - "ajv-keywords-2.1.1" = { - name = "ajv-keywords"; - packageName = "ajv-keywords"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz"; - sha1 = "617997fc5f60576894c435f940d819e135b80762"; - }; - }; - "eslint-4.13.1" = { - name = "eslint"; - packageName = "eslint"; - version = "4.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.13.1.tgz"; - sha512 = "1zhzyi5ajjmgx37845pnkkvq366jzpnfsq3q52ai98xg3jmf813yrf919r28j7gh3irnm921r553yrh0aghsx8srkcb3d0ikmbma8jh"; - }; - }; - "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"; - }; - }; - "log-update-1.0.2" = { - name = "log-update"; - packageName = "log-update"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz"; - sha1 = "19929f64c4093d2d2e7075a1dad8af59c296b8d1"; - }; - }; - "phantomjs-prebuilt-2.1.16" = { - name = "phantomjs-prebuilt"; - packageName = "phantomjs-prebuilt"; - version = "2.1.16"; - src = fetchurl { - url = "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz"; - sha1 = "efd212a4a3966d3647684ea8ba788549be2aefef"; - }; - }; - "promise-phantom-3.1.6" = { - name = "promise-phantom"; - packageName = "promise-phantom"; - version = "3.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/promise-phantom/-/promise-phantom-3.1.6.tgz"; - sha1 = "bbcfd248725259f2bb115a27bfa8d65dc420f931"; - }; - }; - "zen-observable-0.5.2" = { - name = "zen-observable"; - packageName = "zen-observable"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/zen-observable/-/zen-observable-0.5.2.tgz"; - sha512 = "3sy4za4hd6lczig5ah6ksh92i4ds0pk9b8nn4nwjwpsyyabywrnayf78zh41jf7amm6khqyjb3iknbp2mc3nfgvpkvphj3a993py6hf"; - }; - }; - "es6-promise-4.1.1" = { - name = "es6-promise"; - packageName = "es6-promise"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz"; - sha512 = "2g2gkw8cxy2lww5lqjbv0imkxkhy684pagbq4qaw6np46xcx1r6rbkg7qy4wjv12b7jy7zs208iilim7clc9v6ws2dzy9g0g223b99r"; - }; - }; - "extract-zip-1.6.6" = { - name = "extract-zip"; - packageName = "extract-zip"; - version = "1.6.6"; - src = fetchurl { - url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.6.tgz"; - sha1 = "1290ede8d20d0872b429fd3f351ca128ec5ef85c"; - }; - }; - "fs-extra-1.0.0" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz"; - sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950"; - }; - }; - "hasha-2.2.0" = { - name = "hasha"; - packageName = "hasha"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz"; - sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1"; - }; - }; - "kew-0.7.0" = { - name = "kew"; - packageName = "kew"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz"; - sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b"; - }; - }; - "request-progress-2.0.1" = { - name = "request-progress"; - packageName = "request-progress"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz"; - sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08"; - }; - }; - "mkdirp-0.5.0" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz"; - sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12"; - }; - }; - "yauzl-2.4.1" = { - name = "yauzl"; - packageName = "yauzl"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz"; - sha1 = "9528f442dab1b2284e58b4379bb194e22e0c4005"; - }; - }; - "fd-slicer-1.0.1" = { - name = "fd-slicer"; - packageName = "fd-slicer"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz"; - sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"; - }; - }; - "pend-1.2.0" = { - name = "pend"; - packageName = "pend"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz"; - sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; - }; - }; - "throttleit-1.0.0" = { - name = "throttleit"; - packageName = "throttleit"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz"; - sha1 = "9e785836daf46743145a5984b6268d828528ac6c"; - }; - }; - "mkpath-1.0.0" = { - name = "mkpath"; - packageName = "mkpath"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mkpath/-/mkpath-1.0.0.tgz"; - sha1 = "ebb3a977e7af1c683ae6fda12b545a6ba6c5853d"; - }; - }; - "node-phantom-simple-2.2.4" = { - name = "node-phantom-simple"; - packageName = "node-phantom-simple"; - version = "2.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/node-phantom-simple/-/node-phantom-simple-2.2.4.tgz"; - sha1 = "4fc4effbb02f241fb5082bd4fbab398e4aecb64d"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "cliff-0.1.10" = { - name = "cliff"; - packageName = "cliff"; - version = "0.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/cliff/-/cliff-0.1.10.tgz"; - sha1 = "53be33ea9f59bec85609ee300ac4207603e52013"; - }; - }; - "flatiron-0.4.3" = { - name = "flatiron"; - packageName = "flatiron"; - version = "0.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/flatiron/-/flatiron-0.4.3.tgz"; - sha1 = "248cf79a3da7d7dc379e2a11c92a2719cbb540f6"; - }; - }; - "forever-monitor-1.7.1" = { - name = "forever-monitor"; - packageName = "forever-monitor"; - version = "1.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/forever-monitor/-/forever-monitor-1.7.1.tgz"; - sha1 = "5d820f4a3a78db2d81ae2671f158b9e86a091bb8"; - }; - }; - "nconf-0.6.9" = { - name = "nconf"; - packageName = "nconf"; - version = "0.6.9"; - src = fetchurl { - url = "https://registry.npmjs.org/nconf/-/nconf-0.6.9.tgz"; - sha1 = "9570ef15ed6f9ae6b2b3c8d5e71b66d3193cd661"; - }; - }; - "nssocket-0.5.3" = { - name = "nssocket"; - packageName = "nssocket"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/nssocket/-/nssocket-0.5.3.tgz"; - sha1 = "883ca2ec605f5ed64a4d5190b2625401928f8f8d"; - }; - }; - "prettyjson-1.2.1" = { - name = "prettyjson"; - packageName = "prettyjson"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/prettyjson/-/prettyjson-1.2.1.tgz"; - sha1 = "fcffab41d19cab4dfae5e575e64246619b12d289"; - }; - }; - "shush-1.0.0" = { - name = "shush"; - packageName = "shush"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shush/-/shush-1.0.0.tgz"; - sha1 = "c27415a9e458f2fed39b27cf8eb37c003782b431"; - }; - }; - "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"; + url = "https://registry.npmjs.org/braces/-/braces-2.3.0.tgz"; + sha512 = "2ngfivxj9g7knac123y1lk3arpmmzdhfn2g4qf1n4kzpvka4vafp48zcsh2qq7c97fxw2la5q2h6m2xcq5b1cr8b45j66jx0i8vr0rz"; }; }; "broadway-0.3.6" = { @@ -12698,2381 +2983,229 @@ let sha1 = "7dbef068b954b7907925fd544963b578a902ba7a"; }; }; - "optimist-0.6.0" = { - name = "optimist"; - packageName = "optimist"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz"; - sha1 = "69424826f3405f79f142e6fc3d9ae58d4dbb9200"; - }; - }; - "director-1.2.7" = { - name = "director"; - packageName = "director"; - version = "1.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/director/-/director-1.2.7.tgz"; - sha1 = "bfd3741075fd7fb1a5b2e13658c5f4bec77736f3"; - }; - }; - "cliff-0.1.9" = { - name = "cliff"; - packageName = "cliff"; - version = "0.1.9"; - src = fetchurl { - url = "https://registry.npmjs.org/cliff/-/cliff-0.1.9.tgz"; - sha1 = "a211e09c6a3de3ba1af27d049d301250d18812bc"; - }; - }; - "eventemitter2-0.4.14" = { - name = "eventemitter2"; - packageName = "eventemitter2"; - version = "0.4.14"; - src = fetchurl { - url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz"; - sha1 = "8f61b75cde012b2e9eb284d4545583b5643b61ab"; - }; - }; - "chokidar-1.7.0" = { - name = "chokidar"; - packageName = "chokidar"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz"; - sha1 = "798e689778151c8076b4b360e5edd28cda2bb468"; - }; - }; - "ps-tree-0.0.3" = { - name = "ps-tree"; - packageName = "ps-tree"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ps-tree/-/ps-tree-0.0.3.tgz"; - sha1 = "dbf8d752a7fe22fa7d58635689499610e9276ddc"; - }; - }; - "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"; - }; - }; - "event-stream-0.5.3" = { - name = "event-stream"; - packageName = "event-stream"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/event-stream/-/event-stream-0.5.3.tgz"; - sha1 = "b77b9309f7107addfeab63f0c0eafd8db0bd8c1c"; - }; - }; - "optimist-0.2.8" = { - name = "optimist"; - packageName = "optimist"; - version = "0.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/optimist/-/optimist-0.2.8.tgz"; - sha1 = "e981ab7e268b457948593b55674c099a815cac31"; - }; - }; - "async-0.2.9" = { - name = "async"; - packageName = "async"; - version = "0.2.9"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.2.9.tgz"; - sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619"; - }; - }; - "lazy-1.0.11" = { - name = "lazy"; - packageName = "lazy"; - version = "1.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/lazy/-/lazy-1.0.11.tgz"; - sha1 = "daa068206282542c088288e975c297c1ae77b690"; - }; - }; - "caller-0.0.1" = { - name = "caller"; - packageName = "caller"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/caller/-/caller-0.0.1.tgz"; - sha1 = "f37a1d6ea10e829d94721ae29a90bb4fb52ab767"; - }; - }; - "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"; - }; - }; - "deep-equal-0.1.2" = { - name = "deep-equal"; - packageName = "deep-equal"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-equal/-/deep-equal-0.1.2.tgz"; - sha1 = "b246c2b80a570a47c11be1d9bd1070ec878b87ce"; - }; - }; - "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"; - src = fetchurl { - url = "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz"; - sha1 = "f1e8f461e4064ba39e82af3cdc2a8c893d076759"; - }; - }; - "lodash.groupby-4.6.0" = { - name = "lodash.groupby"; - packageName = "lodash.groupby"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.groupby/-/lodash.groupby-4.6.0.tgz"; - sha1 = "0b08a1dcf68397c397855c3239783832df7403d1"; - }; - }; - "minilog-3.1.0" = { - name = "minilog"; - packageName = "minilog"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/minilog/-/minilog-3.1.0.tgz"; - sha1 = "d2d0f1887ca363d1acf0ea86d5c4df293b3fb675"; - }; - }; - "simple-git-1.85.0" = { - name = "simple-git"; - packageName = "simple-git"; - version = "1.85.0"; - src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-1.85.0.tgz"; - sha1 = "563ad291efc8a127735e8fbcd796967377614cd4"; - }; - }; - "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"; - }; - }; - "microee-0.0.6" = { - name = "microee"; - packageName = "microee"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/microee/-/microee-0.0.6.tgz"; - sha1 = "a12bdb0103681e8b126a9b071eba4c467c78fffe"; - }; - }; - "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"; + "brorand-1.1.0" = { + name = "brorand"; + packageName = "brorand"; version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.0.tgz"; - sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; + url = "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz"; + sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f"; }; }; - "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"; - }; - }; - "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"; - }; - }; - "q-2.0.3" = { - name = "q"; - packageName = "q"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/q/-/q-2.0.3.tgz"; - sha1 = "75b8db0255a1a5af82f58c3f3aaa1efec7d0d134"; - }; - }; - "msgpack-1.0.2" = { - name = "msgpack"; - packageName = "msgpack"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/msgpack/-/msgpack-1.0.2.tgz"; - sha1 = "923e2c5cffa65c8418e9b228d1124793969c429c"; - }; - }; - "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.28" = { - name = "clean-css"; - packageName = "clean-css"; - version = "3.4.28"; - src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.28.tgz"; - sha1 = "bf1945e82fc808f55695e6ddeaec01400efd03ff"; - }; - }; - "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"; - }; - }; - "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.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"; - }; - }; - "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"; - }; - }; - "acorn-2.7.0" = { - name = "acorn"; - packageName = "acorn"; - version = "2.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz"; - sha1 = "ab6e7d9d886aaca8b085bc3312b79a198433f0e7"; - }; - }; - "promise-6.1.0" = { - 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"; - }; - }; - "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"; - }; - }; - "yargs-3.10.0" = { - name = "yargs"; - packageName = "yargs"; - version = "3.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"; - sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; - }; - }; - "uglify-to-browserify-1.0.2" = { - name = "uglify-to-browserify"; - packageName = "uglify-to-browserify"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"; - sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; - }; - }; - "camelcase-1.2.1" = { - name = "camelcase"; - packageName = "camelcase"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; - sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; - }; - }; - "cliui-2.1.0" = { - name = "cliui"; - packageName = "cliui"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz"; - sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1"; - }; - }; - "window-size-0.1.0" = { - name = "window-size"; - packageName = "window-size"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"; - sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"; - }; - }; - "center-align-0.1.3" = { - name = "center-align"; - packageName = "center-align"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz"; - sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; - }; - }; - "right-align-0.1.3" = { - name = "right-align"; - packageName = "right-align"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz"; - sha1 = "61339b722fe6a3515689210d24e14c96148613ef"; - }; - }; - "align-text-0.1.4" = { - name = "align-text"; - packageName = "align-text"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"; - sha1 = "0cd90a561093f35d0a99256c22b7069433fad117"; - }; - }; - "lazy-cache-1.0.4" = { - name = "lazy-cache"; - packageName = "lazy-cache"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz"; - sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; - }; - }; - "longest-1.0.1" = { - name = "longest"; - packageName = "longest"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"; - sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097"; - }; - }; - "acorn-1.2.2" = { - name = "acorn"; - packageName = "acorn"; - 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"; - }; - }; - "pop-iterate-1.0.1" = { - name = "pop-iterate"; - packageName = "pop-iterate"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pop-iterate/-/pop-iterate-1.0.1.tgz"; - sha1 = "ceacfdab4abf353d7a0f2aaa2c1fc7b3f9413ba3"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "liftoff-2.5.0" = { - name = "liftoff"; - packageName = "liftoff"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/liftoff/-/liftoff-2.5.0.tgz"; - sha1 = "2009291bb31cea861bbf10a7c15a28caf75c31ec"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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.2" = { - name = "fancy-log"; - packageName = "fancy-log"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.2.tgz"; - sha1 = "f41125e3d84f2e7d89a43d06d958c8f78be16be1"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "ansi-gray-0.1.1" = { - name = "ansi-gray"; - packageName = "ansi-gray"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz"; - sha1 = "2962cf54ec9792c48510a3deb524436861ef7251"; - }; - }; - "color-support-1.1.3" = { - name = "color-support"; - packageName = "color-support"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz"; - sha512 = "13g563h7mrddc3rlljgg75km4zycb8rhzxb5wiiricqvh4n7zgl60psnz39ijkzx5bn93s5qvacwkxbg1cglcmg5z3yyb6cjs96685a"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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.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"; - }; - }; - "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"; - }; - }; - "findup-sync-2.0.0" = { - name = "findup-sync"; - packageName = "findup-sync"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz"; - sha1 = "9326b1488c22d1a6088650a86901b2d9a90a2cbc"; - }; - }; - "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-1.0.0" = { - name = "flagged-respawn"; - packageName = "flagged-respawn"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.0.tgz"; - sha1 = "4e79ae9b2eb38bf86b3bb56bf3e0a56aa5fcabd7"; - }; - }; - "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.map-1.0.0" = { - name = "object.map"; - packageName = "object.map"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object.map/-/object.map-1.0.0.tgz"; - sha1 = "92aef871cd6dcbced31fe29c0921db8395624597"; - }; - }; - "detect-file-1.0.0" = { - name = "detect-file"; - packageName = "detect-file"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz"; - sha1 = "f0d66d03672a825cb1b73bdb3fe62310c8e552b7"; - }; - }; - "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"; - }; - }; - "micromatch-3.1.4" = { - name = "micromatch"; - packageName = "micromatch"; - version = "3.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.4.tgz"; - sha512 = "1z55bzyr3xwhvk8wbclnfjsbzwivqf9whb7k84gd8ljwfzmhsra430ikzd3p0nzxk90ybqas0c4bl6j4l1q5iyyz99h584q4az6sm4h"; - }; - }; - "resolve-dir-1.0.1" = { - name = "resolve-dir"; - packageName = "resolve-dir"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz"; - sha1 = "79a40644c362be82f26effe739c9bb5382046f43"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "braces-2.3.0" = { - name = "braces"; - packageName = "braces"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/braces/-/braces-2.3.0.tgz"; - sha512 = "2ngfivxj9g7knac123y1lk3arpmmzdhfn2g4qf1n4kzpvka4vafp48zcsh2qq7c97fxw2la5q2h6m2xcq5b1cr8b45j66jx0i8vr0rz"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "extglob-2.0.2" = { - name = "extglob"; - packageName = "extglob"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/extglob/-/extglob-2.0.2.tgz"; - sha512 = "3bi96hlw84salahixd3vvyzzx1riqlfnrf44qnlhl46yqpl5rad97halvj3vybzvh970jyk50lagp9qys69qhayy25m337y25j9wkr3"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "nanomatch-1.2.6" = { - name = "nanomatch"; - packageName = "nanomatch"; - version = "1.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.6.tgz"; - sha512 = "014pd4mh3hhi0gmrpss462ivnr8ic21ihmyjs4rx6v5prf5mw2zqzhsxbinx2mxiy4kc7wlw5w052bi18y6rgxq7l2pangg4r69g7jq"; - }; - }; - "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"; - }; - }; - "regex-not-1.0.0" = { - name = "regex-not"; - packageName = "regex-not"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.0.tgz"; - sha1 = "42f83e39771622df826b02af176525d6a5f157f9"; - }; - }; - "snapdragon-0.8.1" = { - name = "snapdragon"; - packageName = "snapdragon"; - version = "0.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.1.tgz"; - sha1 = "e12b5487faded3e3dea0ac91e9400bf75b401370"; - }; - }; - "to-regex-3.0.1" = { - name = "to-regex"; - packageName = "to-regex"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.1.tgz"; - sha1 = "15358bee4a2c83bd76377ba1dc049d0f18837aae"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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-descriptor-1.0.1" = { - name = "is-descriptor"; - packageName = "is-descriptor"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.1.tgz"; - sha512 = "1s669mqvckcwsqrnni08lac1anx00q82rkfplnq6zl9inaqzlq8n9ln8j8m49a9gaxjrwgkl8wjw4188whbj65yxspalzgaaiacaxqv"; - }; - }; - "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-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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "is-odd-1.0.0" = { - name = "is-odd"; - packageName = "is-odd"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-odd/-/is-odd-1.0.0.tgz"; - sha1 = "3b8a932eb028b3775c39bb09e91767accdb69088"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "use-2.0.2" = { - name = "use"; - packageName = "use"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/use/-/use-2.0.2.tgz"; - sha1 = "ae28a0d72f93bf22422a18a2e379993112dec8e8"; - }; - }; - "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"; - }; - }; - "class-utils-0.3.5" = { - name = "class-utils"; - packageName = "class-utils"; - version = "0.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.5.tgz"; - sha1 = "17e793103750f9627b2176ea34cfd1b565903c80"; - }; - }; - "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"; - }; - }; - "mixin-deep-1.3.0" = { - name = "mixin-deep"; - packageName = "mixin-deep"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.0.tgz"; - sha512 = "016isy937hd503fn41ivc4j267cr1brp7f65waxkk2ijslc1gyh7r815xk4g27cjrgjzydwqbpwk5yj4nyjj085n3l5k2vsi2z841kn"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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-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"; - }; - }; - "lazy-cache-2.0.2" = { - name = "lazy-cache"; - packageName = "lazy-cache"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz"; - sha1 = "b9190a4f913354694840859f8a8f7084d8822264"; - }; - }; - "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"; - }; - }; - "set-getter-0.1.0" = { - name = "set-getter"; - packageName = "set-getter"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/set-getter/-/set-getter-0.1.0.tgz"; - sha1 = "d769c182c9d5a51f409145f2fba82e5e86e80376"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "atob-2.0.3" = { - name = "atob"; - packageName = "atob"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/atob/-/atob-2.0.3.tgz"; - sha1 = "19c7a760473774468f20b2d2d03372ad7d4cbf5d"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "global-modules-1.0.0" = { - name = "global-modules"; - packageName = "global-modules"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz"; - sha512 = "1pgpsvm0rm1fnqmblx77xs67gh8c80nf4dsgcgalhh9phmlp8ahn5w7vzx3xkwyxw3fg33h8vhh3plsycw6fd7c2r76mm7m8w9fkb5h"; - }; - }; - "global-prefix-1.0.2" = { - name = "global-prefix"; - packageName = "global-prefix"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz"; - sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; - }; - }; - "is-windows-1.0.1" = { - name = "is-windows"; - packageName = "is-windows"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.1.tgz"; - sha1 = "310db70f742d259a16a369202b51af84233310d9"; - }; - }; - "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"; - }; - }; - "parse-filepath-1.0.2" = { - name = "parse-filepath"; - packageName = "parse-filepath"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz"; - sha1 = "a632127f53aaf3d15876f5872f3ffac763d6c891"; - }; - }; - "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.1.0" = { - name = "array-slice"; - packageName = "array-slice"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz"; - sha512 = "3myjiz16qi117x0k52sisqyn0cqx6yxvpgr43bkil9shgs7yhs8wpdgd3wjwfzgwxsw330yqwhp880gsyx2kxj1lfyb6gs1fh7qqnh7"; - }; - }; - "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-1.0.0" = { - name = "is-absolute"; - packageName = "is-absolute"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz"; - sha512 = "02g5p9wfcx3f1p0zq01ycrx5biwg79qg1mdw1cv6li7kxpny5hxsp34ynam7w2g6nvah73f0kzdkh6pxxmx1ymd8m02fwvgz6lsirbl"; - }; - }; - "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-1.0.0" = { - name = "is-relative"; - packageName = "is-relative"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz"; - sha512 = "0c1pd4414iy40xq652p1zgqgmncmm7xcns96pfazd63v439vyc1z93bvzvbw5r2qc4fp24414ydnj4gdsqlq223pfg05ar2mmwd23rb"; - }; - }; - "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/is-unc-path/-/is-unc-path-1.0.0.tgz"; - sha512 = "2asak63h3kc1vackrpai7qfiv15ndr231w1yc753m1dy7fd6ywxsr0rvh88b9ppyxhmc373fqk89a0pw3dllv7m5nbbbcqzvmaskccs"; - }; - }; - "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"; - }; - }; - "make-iterator-1.0.0" = { - name = "make-iterator"; - packageName = "make-iterator"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.0.tgz"; - sha1 = "57bef5dc85d23923ba23767324d8e8f8f3d9694b"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "vinyl-0.4.6" = { - name = "vinyl"; - packageName = "vinyl"; + "browser-launcher2-0.4.6" = { + name = "browser-launcher2"; + packageName = "browser-launcher2"; version = "0.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz"; - sha1 = "2f356c87a550a255461f36bbeb2a5ba8bf784847"; + url = "https://registry.npmjs.org/browser-launcher2/-/browser-launcher2-0.4.6.tgz"; + sha1 = "51598408a13f4c9c5b20eba44554b2c0b0ae4074"; }; }; - "glob-4.5.3" = { - name = "glob"; - packageName = "glob"; - version = "4.5.3"; + "browser-pack-6.0.3" = { + name = "browser-pack"; + packageName = "browser-pack"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz"; - sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f"; + url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.3.tgz"; + sha512 = "3rbr2j80zl8099hjgsqkizp276cg4q60zjkd481fvnj66k8gmm5w0wbvvqdzpsipgaa3xxsypcr3ryjw1sk2vgzr2hw6pzwr5i933r6"; }; }; - "minimatch-2.0.10" = { - name = "minimatch"; - packageName = "minimatch"; - version = "2.0.10"; + "browser-resolve-1.11.2" = { + name = "browser-resolve"; + packageName = "browser-resolve"; + version = "1.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz"; - sha1 = "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"; + url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.2.tgz"; + sha1 = "8ff09b0a2c421718a1051c260b32e48f442938ce"; }; }; - "ordered-read-streams-0.1.0" = { - name = "ordered-read-streams"; - packageName = "ordered-read-streams"; - version = "0.1.0"; + "browser-stdout-1.3.0" = { + name = "browser-stdout"; + packageName = "browser-stdout"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"; - sha1 = "fd565a9af8eb4473ba69b6ed8a34352cb552f126"; + url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz"; + sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f"; }; }; - "glob2base-0.0.12" = { - name = "glob2base"; - packageName = "glob2base"; - version = "0.0.12"; + "browserify-13.3.0" = { + name = "browserify"; + packageName = "browserify"; + version = "13.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz"; - sha1 = "9d419b3e28f12e83a362164a277055922c9c0d56"; + url = "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz"; + sha1 = "b5a9c9020243f0c70e4675bec8223bc627e415ce"; }; }; - "unique-stream-1.0.0" = { - name = "unique-stream"; - packageName = "unique-stream"; + "browserify-14.4.0" = { + name = "browserify"; + packageName = "browserify"; + version = "14.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify/-/browserify-14.4.0.tgz"; + sha1 = "089a3463af58d0e48d8cd4070b3f74654d5abca9"; + }; + }; + "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.1.1" = { + name = "browserify-aes"; + packageName = "browserify-aes"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.1.tgz"; + sha512 = "0b874c5j68a6h1smd9avnc98zpjy2b4sykkhfpn97lzg7k5aq3ab0jdsmxjafifm0sa3srwscfpcl70gwnlg242p7cavnf115hd6sah"; + }; + }; + "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/browserify-cache-api/-/browserify-cache-api-3.0.1.tgz"; + sha1 = "96247e853f068fd6e0d45cc73f0bb2cd9778ef02"; + }; + }; + "browserify-cipher-1.0.0" = { + name = "browserify-cipher"; + packageName = "browserify-cipher"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz"; - sha1 = "d59a4a75427447d9aa6c91e70263f8d26a4b104b"; + url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz"; + sha1 = "9988244874bf5ed4e28da95666dcd66ac8fc363a"; }; }; - "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"; - }; - }; - "first-chunk-stream-1.0.0" = { - name = "first-chunk-stream"; - packageName = "first-chunk-stream"; + "browserify-des-1.0.0" = { + name = "browserify-des"; + packageName = "browserify-des"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"; - sha1 = "59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"; + url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz"; + sha1 = "daa277717470922ed2fe18594118a175439721dd"; }; }; - "clone-0.2.0" = { - name = "clone"; - packageName = "clone"; + "browserify-incremental-3.1.1" = { + name = "browserify-incremental"; + packageName = "browserify-incremental"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-incremental/-/browserify-incremental-3.1.1.tgz"; + sha1 = "0713cb7587247a632a9f08cf1bd169b878b62a8a"; + }; + }; + "browserify-mime-1.2.9" = { + name = "browserify-mime"; + packageName = "browserify-mime"; + version = "1.2.9"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-mime/-/browserify-mime-1.2.9.tgz"; + sha1 = "aeb1af28de6c0d7a6a2ce40adb68ff18422af31f"; + }; + }; + "browserify-rsa-4.0.1" = { + name = "browserify-rsa"; + packageName = "browserify-rsa"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz"; + sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; + }; + }; + "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"; + }; + }; + "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/browserify-transform-tools/-/browserify-transform-tools-1.7.0.tgz"; + sha1 = "83e277221f63259bed2e7eb2a283a970a501f4c4"; + }; + }; + "browserify-zlib-0.1.4" = { + name = "browserify-zlib"; + packageName = "browserify-zlib"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz"; + sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d"; + }; + }; + "browserify-zlib-0.2.0" = { + name = "browserify-zlib"; + packageName = "browserify-zlib"; version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"; - sha1 = "c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"; + url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz"; + sha512 = "24488d4s6d901hj9d9jdddapmcvmibbdpjq6nv3bpyjx72546fcqa0vripy0ydsrw1jk6bakfzvynh5i9cz0g59hrmn4ph75d3kdpk7"; }; }; - "http-proxy-1.0.2" = { - name = "http-proxy"; - packageName = "http-proxy"; - version = "1.0.2"; + "bson-0.1.8" = { + name = "bson"; + packageName = "bson"; + version = "0.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.0.2.tgz"; - sha1 = "08060ff2edb2189e57aa3a152d3ac63ed1af7254"; + url = "https://registry.npmjs.org/bson/-/bson-0.1.8.tgz"; + sha1 = "cf34fdcff081a189b589b4b3e5e9309cd6506c81"; }; }; - "redis-0.10.3" = { - name = "redis"; - packageName = "redis"; - version = "0.10.3"; + "buffer-4.9.1" = { + name = "buffer"; + packageName = "buffer"; + version = "4.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/redis/-/redis-0.10.3.tgz"; - sha1 = "8927fe2110ee39617bcf3fd37b89d8e123911bb6"; + url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz"; + sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; }; }; - "lru-cache-2.5.2" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "2.5.2"; + "buffer-5.0.8" = { + name = "buffer"; + packageName = "buffer"; + version = "5.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.2.tgz"; - sha1 = "1fddad938aae1263ce138680be1b3f591c0ab41c"; + url = "https://registry.npmjs.org/buffer/-/buffer-5.0.8.tgz"; + sha512 = "0capij8lgps5fzc5hikkkdsn58lmzfdpni7v2m0ham5r67q24kln1spwz4dnk3nh6zkiqmgz0cqnq591pms1pkkv8prvksd2m1f6yy5"; }; }; - "eventemitter3-3.0.0" = { - name = "eventemitter3"; - packageName = "eventemitter3"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.0.0.tgz"; - sha512 = "0jijxlrlxb3vf5xqxibisd132qzlh9ag6ckxgvz791d4rqrzvzc2mzzn86jx1bgbsym1wi0pgm017i4rd5m84g1d38n56zqvh5g2r7b"; - }; - }; - "csslint-0.10.0" = { - name = "csslint"; - packageName = "csslint"; - version = "0.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/csslint/-/csslint-0.10.0.tgz"; - sha1 = "3a6a04e7565c8e9d19beb49767c7ec96e8365805"; - }; - }; - "jshint-2.8.0" = { - name = "jshint"; - packageName = "jshint"; - version = "2.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jshint/-/jshint-2.8.0.tgz"; - sha1 = "1d09a3bd913c4cadfa81bf18d582bd85bffe0d44"; - }; - }; - "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"; - }; - }; - "xml-1.0.0" = { - name = "xml"; - packageName = "xml"; + "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/xml/-/xml-1.0.0.tgz"; - sha1 = "de3ee912477be2f250b60f612f34a8c4da616efe"; + url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.0.0.tgz"; + sha1 = "474aa88f34e7bc75fa311d2e6457409c5846c3fe"; }; }; - "parserlib-0.2.5" = { - name = "parserlib"; - packageName = "parserlib"; - version = "0.2.5"; + "buffer-crc32-0.1.1" = { + name = "buffer-crc32"; + packageName = "buffer-crc32"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/parserlib/-/parserlib-0.2.5.tgz"; - sha1 = "85907dd8605aa06abb3dd295d50bb2b8fa4dd117"; + url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.1.1.tgz"; + sha1 = "7e110dc9953908ab7c32acdc70c9f945b1cbc526"; }; }; - "cli-0.6.6" = { - name = "cli"; - packageName = "cli"; - version = "0.6.6"; + "buffer-crc32-0.2.1" = { + name = "buffer-crc32"; + packageName = "buffer-crc32"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/cli/-/cli-0.6.6.tgz"; - sha1 = "02ad44a380abf27adac5e6f0cdd7b043d74c53e3"; - }; - }; - "exit-0.1.2" = { - name = "exit"; - packageName = "exit"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"; - sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c"; - }; - }; - "htmlparser2-3.8.3" = { - name = "htmlparser2"; - packageName = "htmlparser2"; - version = "3.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz"; - sha1 = "996c28b191516a8be86501a7d79757e5c70c1068"; - }; - }; - "lodash-3.7.0" = { - name = "lodash"; - packageName = "lodash"; - version = "3.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz"; - sha1 = "3678bd8ab995057c07ade836ed2ef087da811d45"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "entities-1.0.0" = { - name = "entities"; - packageName = "entities"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz"; - sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "clean-css-4.1.9" = { - name = "clean-css"; - packageName = "clean-css"; - version = "4.1.9"; - src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-4.1.9.tgz"; - sha1 = "35cee8ae7687a49b98034f70de00c4edd3826301"; - }; - }; - "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"; - }; - }; - "ncname-1.0.0" = { - name = "ncname"; - packageName = "ncname"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ncname/-/ncname-1.0.0.tgz"; - sha1 = "5b57ad18b1ca092864ef62b0b1ed8194f383b71c"; - }; - }; - "relateurl-0.2.7" = { - name = "relateurl"; - packageName = "relateurl"; - version = "0.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz"; - sha1 = "54dbf377e51440aca90a4cd274600d3ff2d888a9"; - }; - }; - "uglify-js-3.2.2" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "3.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.2.2.tgz"; - sha512 = "22ibn4zyyrqi1gxr94xs4kaq1y402sxwp68z9w87r4g66wgkashr3fvgrp19w01aidqma2jgmghz5283rkj00x7gxb4f86rzhxlvvgv"; - }; - }; - "xml-char-classes-1.0.0" = { - name = "xml-char-classes"; - packageName = "xml-char-classes"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xml-char-classes/-/xml-char-classes-1.0.0.tgz"; - sha1 = "64657848a20ffc5df583a42ad8a277b4512bbc4d"; - }; - }; - "@ionic/cli-framework-0.1.2" = { - name = "_at_ionic_slash_cli-framework"; - packageName = "@ionic/cli-framework"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-0.1.2.tgz"; - sha512 = "265kszf17mdz60zpfrj5i47lqwwgp6h1b7i8vymig1pnlqd3lnljibxvd2d1rfa3827ks435k9wws458z3dk7fyq8wfmzmv8fk9qjhh"; - }; - }; - "@ionic/cli-utils-1.19.0" = { - name = "_at_ionic_slash_cli-utils"; - packageName = "@ionic/cli-utils"; - version = "1.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@ionic/cli-utils/-/cli-utils-1.19.0.tgz"; - sha512 = "24v61p6kqm6l6b5p58y5f4qgf7svxqnwpygz7bw1b7102p6hv6hkcnfgh32vf0nypd8fgdhyyhci5sz342ksdg11q6nj8snnqgd1gss"; - }; - }; - "opn-5.1.0" = { - name = "opn"; - packageName = "opn"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/opn/-/opn-5.1.0.tgz"; - sha512 = "2k8g3x11xbm64r7bbyad08cjv27vaparkigq11w2v8kg8h73k2rzdr3q6f5i2klidgpaq9rbhfv45rf9dkqqv3d8vsbvw4c5knnbww8"; - }; - }; - "tslib-1.8.1" = { - name = "tslib"; - packageName = "tslib"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.8.1.tgz"; - sha1 = "6946af2d1d651a7b1863b531d6e5afa41aa44eac"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "formidable-1.1.1" = { - name = "formidable"; - packageName = "formidable"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz"; - sha1 = "96b8886f7c3c3508b932d6bd70c4d3a88f35f1a9"; - }; - }; - "@ionic/discover-0.4.0" = { - name = "_at_ionic_slash_discover"; - packageName = "@ionic/discover"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@ionic/discover/-/discover-0.4.0.tgz"; - sha512 = "0x6yxaj489n9lbq0kfvdnpj1pacgv3r0vk5cnlla7w1jkvxzwaf0vbcnwd9gdaj6zkq69wm1g4zjvj37pyn1lajjkzl1f50l7cnr2ad"; - }; - }; - "archiver-2.1.0" = { - name = "archiver"; - packageName = "archiver"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/archiver/-/archiver-2.1.0.tgz"; - sha1 = "d2df2e8d5773a82c1dcce925ccc41450ea999afd"; - }; - }; - "ci-info-1.1.2" = { - name = "ci-info"; - packageName = "ci-info"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ci-info/-/ci-info-1.1.2.tgz"; - sha512 = "1jbmihk48iby72h0b6k4rvhrnaydml49qyjcb83ix310ivjzd4zmdk3yxx1ssn6ryjblm7xzaswnwj53rxwcyn1fr0jm7bzvhy8hcdr"; - }; - }; - "dargs-5.1.0" = { - name = "dargs"; - packageName = "dargs"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dargs/-/dargs-5.1.0.tgz"; - sha1 = "ec7ea50c78564cd36c9d5ec18f66329fade27829"; - }; - }; - "diff-3.4.0" = { - name = "diff"; - packageName = "diff"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz"; - sha512 = "1qawya1qhgy4q0bgx0s9ryfz70ddrgyj33rdnnppzszi7x31iir66y7v89kc82lr7prkafrax9sa6w5ssxykqmcf1xw291864qnx5a2"; - }; - }; - "elementtree-0.1.7" = { - name = "elementtree"; - packageName = "elementtree"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz"; - sha1 = "9ac91be6e52fb6e6244c4e54a4ac3ed8ae8e29c0"; - }; - }; - "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/http-proxy-middleware/-/http-proxy-middleware-0.17.4.tgz"; - sha1 = "642e8848851d66f09d4f124912846dbaeb41b833"; - }; - }; - "leek-0.0.24" = { - name = "leek"; - packageName = "leek"; - version = "0.0.24"; - src = fetchurl { - url = "https://registry.npmjs.org/leek/-/leek-0.0.24.tgz"; - sha1 = "e400e57f0e60d8ef2bd4d068dc428a54345dbcda"; - }; - }; - "os-name-2.0.1" = { - name = "os-name"; - packageName = "os-name"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/os-name/-/os-name-2.0.1.tgz"; - sha1 = "b9a386361c17ae3a21736ef0599405c9a8c5dc5e"; - }; - }; - "ssh-config-1.1.3" = { - name = "ssh-config"; - packageName = "ssh-config"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ssh-config/-/ssh-config-1.1.3.tgz"; - sha1 = "2b19630af85b1666688b9d68f6e4218900f81f8c"; - }; - }; - "tar-4.2.0" = { - name = "tar"; - packageName = "tar"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.2.0.tgz"; - sha512 = "2gxmbyhp1fl504kj9lkj0p7fx6z7ixvnjkvww945i6dbhc76lci537p5jpw1g64w5yj2npcyfspbg2dfzpcvbmn0a55z16yi670pkpi"; - }; - }; - "tiny-lr-1.0.5" = { - name = "tiny-lr"; - packageName = "tiny-lr"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.0.5.tgz"; - sha512 = "2b8y1xdv7szw0hvad64rghp2zdahs6qhx0k79c0s9xa0a35zbcrb9b9gywixhcxqi1c9ab7ah8ibra22k8baakh7rvmhf904d559g32"; - }; - }; - "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"; - }; - }; - "netmask-1.0.6" = { - name = "netmask"; - packageName = "netmask"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/netmask/-/netmask-1.0.6.tgz"; - sha1 = "20297e89d86f6f6400f250d9f4f6b4c1945fcd35"; - }; - }; - "archiver-utils-1.3.0" = { - name = "archiver-utils"; - packageName = "archiver-utils"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/archiver-utils/-/archiver-utils-1.3.0.tgz"; - sha1 = "e50b4c09c70bf3d680e32ff1b7994e9f9d895174"; + url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz"; + sha1 = "be3e5382fc02b6d6324956ac1af98aa98b08534c"; }; }; "buffer-crc32-0.2.13" = { @@ -15084,265 +3217,238 @@ let sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"; }; }; - "zip-stream-1.2.0" = { - name = "zip-stream"; - packageName = "zip-stream"; - version = "1.2.0"; + "buffer-equal-0.0.1" = { + name = "buffer-equal"; + packageName = "buffer-equal"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/zip-stream/-/zip-stream-1.2.0.tgz"; - sha1 = "a8bc45f4c1b49699c6b90198baacaacdbcd4ba04"; + url = "https://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz"; + sha1 = "91bc74b11ea405bc916bc6aa908faafa5b4aac4b"; }; }; - "lazystream-1.0.0" = { - name = "lazystream"; - packageName = "lazystream"; - version = "1.0.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/lazystream/-/lazystream-1.0.0.tgz"; - sha1 = "f6995fe0f820392f61396be89462407bb77168e4"; + url = "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz"; + sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"; }; }; - "compress-commons-1.2.2" = { - name = "compress-commons"; - packageName = "compress-commons"; - version = "1.2.2"; + "buffer-equals-1.0.4" = { + name = "buffer-equals"; + packageName = "buffer-equals"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/compress-commons/-/compress-commons-1.2.2.tgz"; - sha1 = "524a9f10903f3a813389b0225d27c48bb751890f"; + url = "https://registry.npmjs.org/buffer-equals/-/buffer-equals-1.0.4.tgz"; + sha1 = "0353b54fd07fd9564170671ae6f66b9cf10d27f5"; }; }; - "crc32-stream-2.0.0" = { - name = "crc32-stream"; - packageName = "crc32-stream"; + "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"; + }; + }; + "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/buffer-more-ints/-/buffer-more-ints-0.0.2.tgz"; + sha1 = "26b3885d10fa13db7fc01aae3aab870199e0124c"; + }; + }; + "buffer-xor-1.0.3" = { + name = "buffer-xor"; + packageName = "buffer-xor"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"; + sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9"; + }; + }; + "buffercursor-0.0.12" = { + name = "buffercursor"; + packageName = "buffercursor"; + version = "0.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/buffercursor/-/buffercursor-0.0.12.tgz"; + sha1 = "78a9a7f4343ae7d820a8999acc80de591e25a779"; + }; + }; + "buffers-0.1.1" = { + name = "buffers"; + packageName = "buffers"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"; + sha1 = "b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb"; + }; + }; + "bufferutil-2.0.1" = { + name = "bufferutil"; + packageName = "bufferutil"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bufferutil/-/bufferutil-2.0.1.tgz"; + sha1 = "8de37f5a300730c305fc3edd9f93348ee8a46288"; + }; + }; + "bufferview-1.0.1" = { + name = "bufferview"; + packageName = "bufferview"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bufferview/-/bufferview-1.0.1.tgz"; + sha1 = "7afd74a45f937fa422a1d338c08bbfdc76cd725d"; + }; + }; + "bufrw-1.2.1" = { + name = "bufrw"; + packageName = "bufrw"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bufrw/-/bufrw-1.2.1.tgz"; + sha1 = "93f222229b4f5f5e2cd559236891407f9853663b"; + }; + }; + "buildmail-2.0.0" = { + name = "buildmail"; + packageName = "buildmail"; version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/crc32-stream/-/crc32-stream-2.0.0.tgz"; - sha1 = "e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4"; + url = "https://registry.npmjs.org/buildmail/-/buildmail-2.0.0.tgz"; + sha1 = "f0b7b0a59e9a4a1b5066bbfa051d248f3832eece"; }; }; - "crc-3.5.0" = { - name = "crc"; - packageName = "crc"; - version = "3.5.0"; + "buildmail-4.0.1" = { + name = "buildmail"; + packageName = "buildmail"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-3.5.0.tgz"; - sha1 = "98b8ba7d489665ba3979f59b21381374101a1964"; + url = "https://registry.npmjs.org/buildmail/-/buildmail-4.0.1.tgz"; + sha1 = "877f7738b78729871c9a105e3b837d2be11a7a72"; }; }; - "statuses-1.4.0" = { - name = "statuses"; - packageName = "statuses"; - version = "1.4.0"; + "builtin-modules-1.1.1" = { + name = "builtin-modules"; + packageName = "builtin-modules"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz"; - sha512 = "1xxwqpj713rq1idbmp7mj7cj9dl52lazgpd5x8a9g88jawbkn9xpwbgljl7cvnd0jqkll2zpdj5xy63dlis9l2k8vmx1n1gvyv8456f"; + url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz"; + sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; }; }; - "sax-1.1.4" = { - name = "sax"; - packageName = "sax"; - version = "1.1.4"; + "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/sax/-/sax-1.1.4.tgz"; - sha1 = "74b6d33c9ae1e001510f179a91168588f1aedaa9"; + url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz"; + sha1 = "85982878e21b98e1c66425e03d0174788f569ee8"; }; }; - "http-proxy-1.16.2" = { - name = "http-proxy"; - packageName = "http-proxy"; - version = "1.16.2"; + "builtins-1.0.3" = { + name = "builtins"; + packageName = "builtins"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz"; - sha1 = "06dff292952bf64dbe8471fa9df73066d4f37742"; + url = "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz"; + sha1 = "cb94faeb61c8696451db36534e1422f94f0aee88"; }; }; - "eventemitter3-1.2.0" = { - name = "eventemitter3"; - packageName = "eventemitter3"; - version = "1.2.0"; + "bulk-write-stream-1.1.3" = { + name = "bulk-write-stream"; + packageName = "bulk-write-stream"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz"; - sha1 = "1c86991d816ad1e504750e73874224ecf3bec508"; + url = "https://registry.npmjs.org/bulk-write-stream/-/bulk-write-stream-1.1.3.tgz"; + sha1 = "d29ca385fbd53f357aee5bd3d3028732b62ae275"; }; }; - "requires-port-1.0.0" = { - name = "requires-port"; - packageName = "requires-port"; - version = "1.0.0"; + "bunyan-1.5.1" = { + name = "bunyan"; + packageName = "bunyan"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"; - sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; + url = "https://registry.npmjs.org/bunyan/-/bunyan-1.5.1.tgz"; + sha1 = "5f6e7d44c43b952f56b0f41309e3ab12391b4e2d"; }; }; - "lodash.assign-3.2.0" = { - name = "lodash.assign"; - packageName = "lodash.assign"; - version = "3.2.0"; + "bunyan-1.8.12" = { + name = "bunyan"; + packageName = "bunyan"; + version = "1.8.12"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz"; - sha1 = "3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa"; + url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.12.tgz"; + sha1 = "f150f0f6748abdd72aeae84f04403be2ef113797"; }; }; - "rsvp-3.6.2" = { - name = "rsvp"; - packageName = "rsvp"; - version = "3.6.2"; + "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/rsvp/-/rsvp-3.6.2.tgz"; - sha512 = "2bjwzsigk7685syp50amryj0sx08l155azg1z4ldx95gadlwfm07y0iyv0vfwgfchbripn2a5r04qhv546djh0biw8prgpx6r0qdx9r"; + url = "https://registry.npmjs.org/bunyan-syslog-udp/-/bunyan-syslog-udp-0.1.0.tgz"; + sha1 = "fbfaee03a81cd2a95abc18f92c99f2bb87e2429c"; }; }; - "lodash._baseassign-3.2.0" = { - name = "lodash._baseassign"; - packageName = "lodash._baseassign"; - version = "3.2.0"; + "busboy-0.2.14" = { + name = "busboy"; + packageName = "busboy"; + version = "0.2.14"; src = fetchurl { - url = "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz"; - sha1 = "8c38a099500f215ad09e59f1722fd0c52bfe0a4e"; + url = "https://registry.npmjs.org/busboy/-/busboy-0.2.14.tgz"; + sha1 = "6c2a622efcf47c57bbbe1e2a9c37ad36c7925453"; }; }; - "lodash._createassigner-3.1.1" = { - name = "lodash._createassigner"; - packageName = "lodash._createassigner"; - version = "3.1.1"; + "byline-5.0.0" = { + name = "byline"; + packageName = "byline"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz"; - sha1 = "838a5bae2fdaca63ac22dee8e19fa4e6d6970b11"; + url = "https://registry.npmjs.org/byline/-/byline-5.0.0.tgz"; + sha1 = "741c5216468eadc457b03410118ad77de8c1ddb1"; }; }; - "lodash._bindcallback-3.0.1" = { - name = "lodash._bindcallback"; - packageName = "lodash._bindcallback"; - version = "3.0.1"; + "bytebuffer-3.5.5" = { + name = "bytebuffer"; + packageName = "bytebuffer"; + version = "3.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz"; - sha1 = "e531c27644cf8b57a99e17ed95b35c748789392e"; + url = "https://registry.npmjs.org/bytebuffer/-/bytebuffer-3.5.5.tgz"; + sha1 = "7a6faf1a13514b083f1fcf9541c4c9bfbe7e7fd3"; }; }; - "macos-release-1.1.0" = { - name = "macos-release"; - packageName = "macos-release"; - version = "1.1.0"; + "bytes-0.1.0" = { + name = "bytes"; + packageName = "bytes"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/macos-release/-/macos-release-1.1.0.tgz"; - sha512 = "260gwv2k1svhzfxs50g921jbhrqlbfr94mcs9ak0dip7i2331nqc7ip0fgdkfl3r1b30w1s87qh2ssq6wxzd08pbmkjwchqc6xdnqls"; + url = "https://registry.npmjs.org/bytes/-/bytes-0.1.0.tgz"; + sha1 = "c574812228126d6369d1576925a8579db3f8e5a2"; }; }; - "chownr-1.0.1" = { - name = "chownr"; - packageName = "chownr"; - version = "1.0.1"; + "bytes-0.2.0" = { + name = "bytes"; + packageName = "bytes"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz"; - sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181"; + url = "https://registry.npmjs.org/bytes/-/bytes-0.2.0.tgz"; + sha1 = "aad33ec14e3dc2ca74e8e7d451f9ba053ad4f7a0"; }; }; - "fs-minipass-1.2.3" = { - name = "fs-minipass"; - packageName = "fs-minipass"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.3.tgz"; - sha512 = "3jin38c3wsayawcxqs83qk9072fxypi41y16zhkak9l0fxsn92d4cgbw5s4rwaf69n9ix8sarpsychdhy3vi0nfghjj3y7if04lfnmv"; - }; - }; - "minipass-2.2.1" = { - name = "minipass"; - packageName = "minipass"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-2.2.1.tgz"; - sha512 = "3yy9s65iwrx5hndcqbxrks88xi9cf8hra6zalgf8xfr4ahpp31s0i8lv6jpyb42p0y7z55ac3390sbqxcgcvan3xls449agbjb98mmv"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - src = fetchurl { - url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz"; - sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"; - }; - }; - "livereload-js-2.2.2" = { - name = "livereload-js"; - packageName = "livereload-js"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/livereload-js/-/livereload-js-2.2.2.tgz"; - sha1 = "6c87257e648ab475bc24ea257457edcc1f8d0bc2"; - }; - }; - "continuable-cache-0.3.1" = { - name = "continuable-cache"; - packageName = "continuable-cache"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz"; - sha1 = "bd727a7faed77e71ff3985ac93351a912733ad0f"; - }; - }; - "error-7.0.2" = { - name = "error"; - packageName = "error"; - version = "7.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/error/-/error-7.0.2.tgz"; - sha1 = "a5f75fff4d9926126ddac0ea5dc38e689153cb02"; - }; - }; - "raw-body-1.1.7" = { - name = "raw-body"; - packageName = "raw-body"; - version = "1.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz"; - sha1 = "1d027c2bfa116acc6623bca8f00016572a87d425"; - }; - }; - "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/safe-json-parse/-/safe-json-parse-1.0.1.tgz"; - sha1 = "3e76723e38dfdda13c9b1d29a1e07ffee4b30b57"; - }; - }; - "string-template-0.2.1" = { - name = "string-template"; - packageName = "string-template"; + "bytes-0.2.1" = { + name = "bytes"; + packageName = "bytes"; version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz"; - sha1 = "42932e598a352d01fc22ec3367d9d84eec6c9add"; + url = "https://registry.npmjs.org/bytes/-/bytes-0.2.1.tgz"; + sha1 = "555b08abcb063f8975905302523e4cd4ffdfdf31"; }; }; "bytes-1.0.0" = { @@ -15354,76 +3460,301 @@ let sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8"; }; }; - "async-limiter-1.0.0" = { - name = "async-limiter"; - packageName = "async-limiter"; - version = "1.0.0"; + "bytes-2.1.0" = { + name = "bytes"; + packageName = "bytes"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz"; - sha512 = "1ddib7nbyayhldvsyrfdpxk7khyi6s72570gkf3qqf4b1xwzdh52w0vlj6bknl40imispychhwfjb2bm29pjxbd5yz26fi8g8bfx7wf"; + url = "https://registry.npmjs.org/bytes/-/bytes-2.1.0.tgz"; + sha1 = "ac93c410e2ffc9cc7cf4b464b38289067f5e47b4"; }; }; - "is-wsl-1.1.0" = { - name = "is-wsl"; - packageName = "is-wsl"; + "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"; + }; + }; + "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"; + }; + }; + "bytewise-1.1.0" = { + name = "bytewise"; + packageName = "bytewise"; version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz"; - sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d"; + url = "https://registry.npmjs.org/bytewise/-/bytewise-1.1.0.tgz"; + sha1 = "1d13cbff717ae7158094aa881b35d081b387253e"; }; }; - "abbrev-1.0.9" = { - name = "abbrev"; - packageName = "abbrev"; - version = "1.0.9"; + "bytewise-core-1.2.3" = { + name = "bytewise-core"; + packageName = "bytewise-core"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz"; - sha1 = "91b4792588a7738c25f35dd6f63752a2f8776135"; + url = "https://registry.npmjs.org/bytewise-core/-/bytewise-core-1.2.3.tgz"; + sha1 = "3fb410c7e91558eb1ab22a82834577aa6bd61d42"; }; }; - "escodegen-1.8.1" = { - name = "escodegen"; - packageName = "escodegen"; - version = "1.8.1"; + "cache-base-1.0.1" = { + name = "cache-base"; + packageName = "cache-base"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz"; - sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018"; + url = "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz"; + sha512 = "36i943khi87af4gif9r6imjgybqxq9cbd69z2h8p2s2j6scfbhrv7j3n591xl982fmyq29rkwh70a6qdcf3v0piwzfh8n2jf571v9q0"; }; }; - "esprima-2.7.3" = { - name = "esprima"; - packageName = "esprima"; - version = "2.7.3"; + "cacheable-request-2.1.4" = { + name = "cacheable-request"; + packageName = "cacheable-request"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz"; - sha1 = "96e3b70d5779f6ad49cd032673d1c312767ba581"; + url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz"; + sha1 = "0d808801b6342ad33c91df9d0b44dc09b91e5c3d"; }; }; - "handlebars-4.0.11" = { - name = "handlebars"; - packageName = "handlebars"; - version = "4.0.11"; + "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/handlebars/-/handlebars-4.0.11.tgz"; - sha1 = "630a35dfe0294bc281edae6ffc5d329fc7982dcc"; + url = "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.1.tgz"; + sha1 = "d09c4b52800aa4c078e2dd81a869aac90d2e54e7"; }; }; - "estraverse-1.9.3" = { - name = "estraverse"; - packageName = "estraverse"; - version = "1.9.3"; + "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/estraverse/-/estraverse-1.9.3.tgz"; - sha1 = "af67f2dc922582415950926091a4005d29c9bb44"; + url = "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz"; + sha1 = "26d208ea89e37b5cbde60250a15f031c16a4d66b"; }; }; - "source-map-0.2.0" = { - name = "source-map"; - packageName = "source-map"; + "callback-stream-1.1.0" = { + name = "callback-stream"; + packageName = "callback-stream"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/callback-stream/-/callback-stream-1.1.0.tgz"; + sha1 = "4701a51266f06e06eaa71fc17233822d875f4908"; + }; + }; + "caller-0.0.1" = { + name = "caller"; + packageName = "caller"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/caller/-/caller-0.0.1.tgz"; + sha1 = "f37a1d6ea10e829d94721ae29a90bb4fb52ab767"; + }; + }; + "caller-callsite-2.0.0" = { + name = "caller-callsite"; + packageName = "caller-callsite"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz"; + sha1 = "847e0fce0a223750a9a027c54b33731ad3154134"; + }; + }; + "caller-id-0.1.0" = { + name = "caller-id"; + packageName = "caller-id"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caller-id/-/caller-id-0.1.0.tgz"; + sha1 = "59bdac0893d12c3871408279231f97458364f07b"; + }; + }; + "caller-path-0.1.0" = { + name = "caller-path"; + packageName = "caller-path"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz"; + sha1 = "94085ef63581ecd3daa92444a8fe94e82577751f"; + }; + }; + "caller-path-2.0.0" = { + name = "caller-path"; + packageName = "caller-path"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz"; + sha1 = "468f83044e369ab2010fac5f06ceee15bb2cb1f4"; + }; + }; + "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"; + }; + }; + "callsites-0.2.0" = { + name = "callsites"; + packageName = "callsites"; version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz"; - sha1 = "dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"; + url = "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz"; + sha1 = "afab96262910a7f33c19a5775825c69f34e350ca"; + }; + }; + "callsites-2.0.0" = { + name = "callsites"; + packageName = "callsites"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz"; + sha1 = "06eb84f00eea413da86affefacbffb36093b3c50"; + }; + }; + "camel-case-3.0.0" = { + name = "camel-case"; + packageName = "camel-case"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz"; + sha1 = "ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"; + }; + }; + "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-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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "camelo-1.1.11" = { + name = "camelo"; + packageName = "camelo"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/camelo/-/camelo-1.1.11.tgz"; + sha512 = "39qf2hdriyb5zn5bc62wgj59whx06nmzij9yylv0mrjnivgpqg2z3ksxl035nn35lnavi1b20qi062l41xah3b3nnbw42dh6b4qk34i"; + }; + }; + "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.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"; + }; + }; + "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"; + }; + }; + "castv2-0.1.9" = { + name = "castv2"; + packageName = "castv2"; + version = "0.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/castv2/-/castv2-0.1.9.tgz"; + sha1 = "d0b0fab1fd06b0d9cca636886716ec1293a5905a"; + }; + }; + "castv2-client-1.2.0" = { + name = "castv2-client"; + packageName = "castv2-client"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/castv2-client/-/castv2-client-1.2.0.tgz"; + sha1 = "a9193b1a5448b8cb9a0415bd021c8811ed7b0544"; + }; + }; + "catharsis-0.8.9" = { + name = "catharsis"; + packageName = "catharsis"; + version = "0.8.9"; + src = fetchurl { + url = "https://registry.npmjs.org/catharsis/-/catharsis-0.8.9.tgz"; + sha1 = "98cc890ca652dd2ef0e70b37925310ff9e90fc8b"; + }; + }; + "ccount-1.0.2" = { + name = "ccount"; + packageName = "ccount"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ccount/-/ccount-1.0.2.tgz"; + sha1 = "53b6a2f815bb77b9c2871f7b9a72c3a25f1d8e89"; + }; + }; + "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"; }; }; "chai-4.1.2" = { @@ -15444,130 +3775,130 @@ let sha512 = "1lf4xj5gc7gxbqjx1pmshsddaqah4zlvzm1r4rbrf4rsgjgf2zj9lx8rccgy0y7ps7wv2i1wf259dwd6mj8aaryxdpfryi2rb2glckb"; }; }; - "fast-json-patch-2.0.6" = { - name = "fast-json-patch"; - packageName = "fast-json-patch"; - version = "2.0.6"; + "chainsaw-0.1.0" = { + name = "chainsaw"; + packageName = "chainsaw"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.0.6.tgz"; - sha1 = "86fff8f8662391aa819722864d632e603e6ee605"; + url = "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz"; + sha1 = "5eab50b28afe58074d0d58291388828b5e5fbc98"; }; }; - "iterare-0.0.8" = { - name = "iterare"; - packageName = "iterare"; - version = "0.0.8"; + "chalk-0.4.0" = { + name = "chalk"; + packageName = "chalk"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/iterare/-/iterare-0.0.8.tgz"; - sha1 = "a969a80a1fbff6b78f28776594d7bc2bdfab6aad"; + url = "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz"; + sha1 = "5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"; }; }; - "jaeger-client-3.7.0" = { - name = "jaeger-client"; - packageName = "jaeger-client"; - version = "3.7.0"; + "chalk-0.5.1" = { + name = "chalk"; + packageName = "chalk"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.7.0.tgz"; - sha1 = "65ec79e33fc6aaeb5acf36064d08acf4ec47da96"; + url = "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz"; + sha1 = "663b3a648b68b55d04690d49167aa837858f2174"; }; }; - "mz-2.7.0" = { - name = "mz"; - packageName = "mz"; - version = "2.7.0"; + "chalk-1.0.0" = { + name = "chalk"; + packageName = "chalk"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz"; - sha512 = "3cpmwzmngnmxhklvicnsbl5dchvsy0yikzgf705cq1cplyps3waa03xbjp306bjf167wnplibwki0csnavz98dihq2877g7xqs4dkfg"; + url = "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz"; + sha1 = "b3cf4ed0ff5397c99c75b8f679db2f52831f96dc"; }; }; - "object-hash-1.2.0" = { - name = "object-hash"; - packageName = "object-hash"; - version = "1.2.0"; + "chalk-1.1.3" = { + name = "chalk"; + packageName = "chalk"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/object-hash/-/object-hash-1.2.0.tgz"; - sha512 = "19310wpjhfybr8gslg93qybbsrf3fjlmdgsgvn7d9yim1nmpcgjn5az280w4p8spvhq1djly7naa9434166gcmbavv0xirg75gmcr5j"; + url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; }; }; - "opentracing-0.14.1" = { - name = "opentracing"; - packageName = "opentracing"; - version = "0.14.1"; + "chalk-2.1.0" = { + name = "chalk"; + packageName = "chalk"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/opentracing/-/opentracing-0.14.1.tgz"; - sha1 = "40d278beea417660a35dd9d3ee76511ffa911dcd"; + url = "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz"; + sha512 = "1fnn3znivja3xq1lacvsdwkl2s8ki9w95sylnf2pkmaia1mjz3llbdb5r2dxsflqfky3h8f1bh0piv0l5waw2bkdniqnyv0yx5wch9d"; }; }; - "rxjs-5.5.5" = { - name = "rxjs"; - packageName = "rxjs"; - version = "5.5.5"; + "chalk-2.3.0" = { + name = "chalk"; + packageName = "chalk"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.5.tgz"; - sha512 = "3j1cki70sa6rg0klw9jlz0k20a0mj44f2p91ayqrng42kqa65nci3519x2gvzy4a3fnxwdrq42rdrljq8dipw07y87ly1ncfd11zwqg"; + url = "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz"; + sha512 = "3fj8njcdcvyplivm2fj19lqw8qv7gb8v7gd6a223pmn8f3di4zwkhyb09vzlmw3pnk4ib88kp4cg8r9i5k5rskalzdfh1l23ljp6gh3"; }; }; - "semaphore-async-await-1.5.1" = { - name = "semaphore-async-await"; - packageName = "semaphore-async-await"; - version = "1.5.1"; + "character-entities-1.2.1" = { + name = "character-entities"; + packageName = "character-entities"; + version = "1.2.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/character-entities/-/character-entities-1.2.1.tgz"; + sha1 = "f76871be5ef66ddb7f8f8e3478ecc374c27d6dca"; }; }; - "string-similarity-1.2.0" = { - name = "string-similarity"; - packageName = "string-similarity"; - version = "1.2.0"; + "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/string-similarity/-/string-similarity-1.2.0.tgz"; - sha1 = "d75153cb383846318b7a39a8d9292bb4db4e9c30"; + url = "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.1.tgz"; + sha1 = "359a2a4a0f7e29d3dc2ac99bdbe21ee39438ea50"; }; }; - "typescript-2.4.2" = { - name = "typescript"; - packageName = "typescript"; - version = "2.4.2"; + "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/typescript/-/typescript-2.4.2.tgz"; - sha1 = "f8395f85d459276067c988aa41837a8f82870844"; + url = "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.1.tgz"; + sha1 = "f40779df1a101872bb510a3d295e1fccf147202f"; }; }; - "vscode-jsonrpc-3.5.0" = { - name = "vscode-jsonrpc"; - packageName = "vscode-jsonrpc"; - version = "3.5.0"; + "character-parser-1.2.1" = { + name = "character-parser"; + packageName = "character-parser"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.5.0.tgz"; - sha1 = "87239d9e166b2d7352245b8a813597804c1d63aa"; + url = "https://registry.npmjs.org/character-parser/-/character-parser-1.2.1.tgz"; + sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6"; }; }; - "vscode-languageserver-3.5.0" = { - name = "vscode-languageserver"; - packageName = "vscode-languageserver"; - version = "3.5.0"; + "character-parser-2.2.0" = { + name = "character-parser"; + packageName = "character-parser"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.5.0.tgz"; - sha1 = "d28099bc6ddda8c1dd16b707e454e1b1ddae0dba"; + url = "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz"; + sha1 = "c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"; }; }; - "vscode-languageserver-types-3.5.0" = { - name = "vscode-languageserver-types"; - packageName = "vscode-languageserver-types"; - version = "3.5.0"; + "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/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0.tgz"; - sha1 = "e48d79962f0b8e02de955e3f524908e2b19c0374"; + url = "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.1.tgz"; + sha1 = "942835f750e4ec61a308e60c2ef8cc1011202efc"; }; }; - "assertion-error-1.0.2" = { - name = "assertion-error"; - packageName = "assertion-error"; - version = "1.0.2"; + "chardet-0.4.2" = { + name = "chardet"; + packageName = "chardet"; + version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.2.tgz"; - sha1 = "13ca515d86206da0bac66e834dd397d87581094c"; + url = "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz"; + sha1 = "b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"; }; }; "check-error-1.0.2" = { @@ -15579,247 +3910,211 @@ let sha1 = "574d312edd88bb5dd8912e9286dd6c0aed4aac82"; }; }; - "deep-eql-3.0.1" = { - name = "deep-eql"; - packageName = "deep-eql"; - version = "3.0.1"; + "cheerio-0.17.0" = { + name = "cheerio"; + packageName = "cheerio"; + version = "0.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz"; - sha512 = "1rrbk0h0a836gj1x6lalzgqfs0v34d4fswq23c8lxzmb6k7pna45zd509h1r1fr312n4qml94xqlmzzga40sfa9vnzf6rkr4d1qh1zr"; + url = "https://registry.npmjs.org/cheerio/-/cheerio-0.17.0.tgz"; + sha1 = "fa5ae42cc60121133d296d0b46d983215f7268ea"; }; }; - "get-func-name-2.0.0" = { - name = "get-func-name"; - packageName = "get-func-name"; - version = "2.0.0"; + "cheerio-0.22.0" = { + name = "cheerio"; + packageName = "cheerio"; + version = "0.22.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/cheerio/-/cheerio-0.22.0.tgz"; + sha1 = "a9baa860a3f9b595a6b81b1a86873121ed3a269e"; }; }; - "pathval-1.1.0" = { - name = "pathval"; - packageName = "pathval"; - version = "1.1.0"; + "cheerio-1.0.0-rc.2" = { + name = "cheerio"; + packageName = "cheerio"; + version = "1.0.0-rc.2"; src = fetchurl { - url = "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz"; - sha1 = "b942e6d4bde653005ef6b71361def8727d0645e0"; + url = "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.2.tgz"; + sha1 = "4b9f53a81b27e4d5dac31c0ffd0cfa03cc6830db"; }; }; - "type-detect-4.0.5" = { - name = "type-detect"; - packageName = "type-detect"; - version = "4.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/type-detect/-/type-detect-4.0.5.tgz"; - sha512 = "08z0fl5f7kx0fhjbj75cvshf4j5j3zzk04766g04rlwcjqr2i3z84qla0ci1h2iv014qkmsh9z7vbvd6ncr04bf1c36cl151f8jzlip"; - }; - }; - "node-int64-0.4.0" = { - name = "node-int64"; - packageName = "node-int64"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz"; - sha1 = "87a9065cdb355d3182d8f94ce11188b825c68a3b"; - }; - }; - "thriftrw-3.11.1" = { - name = "thriftrw"; - packageName = "thriftrw"; - version = "3.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/thriftrw/-/thriftrw-3.11.1.tgz"; - sha1 = "5a2f5165d665bb195e665e5b5b9f8897dac23acc"; - }; - }; - "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"; - }; - }; - "opentracing-0.13.0" = { - name = "opentracing"; - packageName = "opentracing"; - version = "0.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/opentracing/-/opentracing-0.13.0.tgz"; - sha1 = "6a341442f09d7d866bc11ed03de1e3828e3d6aab"; - }; - }; - "bufrw-1.2.1" = { - name = "bufrw"; - packageName = "bufrw"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bufrw/-/bufrw-1.2.1.tgz"; - sha1 = "93f222229b4f5f5e2cd559236891407f9853663b"; - }; - }; - "ansi-color-0.2.1" = { - name = "ansi-color"; - packageName = "ansi-color"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-color/-/ansi-color-0.2.1.tgz"; - sha1 = "3e75c037475217544ed763a8db5709fa9ae5bf9a"; - }; - }; - "any-promise-1.3.0" = { - name = "any-promise"; - packageName = "any-promise"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz"; - sha1 = "abc6afeedcea52e809cdc0376aed3ce39635d17f"; - }; - }; - "thenify-all-1.6.0" = { - name = "thenify-all"; - packageName = "thenify-all"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz"; - sha1 = "1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"; - }; - }; - "thenify-3.3.0" = { - name = "thenify"; - packageName = "thenify"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz"; - sha1 = "e69e38a1babe969b0108207978b9f62b88604839"; - }; - }; - "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"; - }; - }; - "vscode-uri-1.0.1" = { - name = "vscode-uri"; - packageName = "vscode-uri"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.1.tgz"; - sha1 = "11a86befeac3c4aa3ec08623651a3c81a6d0bbc8"; - }; - }; - "vscode-languageserver-protocol-3.5.0" = { - name = "vscode-languageserver-protocol"; - packageName = "vscode-languageserver-protocol"; - version = "3.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.5.0.tgz"; - sha1 = "067c5cbe27709795398d119692c97ebba1452209"; - }; - }; - "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"; - }; - }; - "babylon-7.0.0-beta.19" = { - name = "babylon"; - packageName = "babylon"; - version = "7.0.0-beta.19"; - src = fetchurl { - url = "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.19.tgz"; - sha512 = "3y91819zra4jxfjqqdvbi44fr34m68vk7j76rkqkxvayhxmcmrvmxpk7rz16r2s3riql0xs322mkzm61asxzkc5b2zpw4firzv043an"; - }; - }; - "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"; - }; - }; - "catharsis-0.8.9" = { - name = "catharsis"; - packageName = "catharsis"; - version = "0.8.9"; - src = fetchurl { - url = "https://registry.npmjs.org/catharsis/-/catharsis-0.8.9.tgz"; - sha1 = "98cc890ca652dd2ef0e70b37925310ff9e90fc8b"; - }; - }; - "js2xmlparser-3.0.0" = { - name = "js2xmlparser"; - packageName = "js2xmlparser"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-3.0.0.tgz"; - sha1 = "3fb60eaa089c5440f9319f51760ccd07e2499733"; - }; - }; - "klaw-2.0.0" = { - name = "klaw"; - packageName = "klaw"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/klaw/-/klaw-2.0.0.tgz"; - sha1 = "59c128e0dc5ce410201151194eeb9cbf858650f6"; - }; - }; - "marked-0.3.7" = { - name = "marked"; - packageName = "marked"; - version = "0.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-0.3.7.tgz"; - sha512 = "2yx1jx6vzjxzhhq2qcsrh0300d452bdl8pvsj0w1ajsxhcqvsba8mmx1lawxx025mzqbvwp5pvay8sff0pg3vbid5whlqdmlgi0y4fc"; - }; - }; - "requizzle-0.2.1" = { - name = "requizzle"; - packageName = "requizzle"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/requizzle/-/requizzle-0.2.1.tgz"; - sha1 = "6943c3530c4d9a7e46f1cddd51c158fc670cdbde"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "xmlcreate-1.0.2" = { - name = "xmlcreate"; - packageName = "xmlcreate"; + "chmodr-1.0.2" = { + name = "chmodr"; + packageName = "chmodr"; version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/xmlcreate/-/xmlcreate-1.0.2.tgz"; - sha1 = "fa6bf762a60a413fb3dd8f4b03c5b269238d308f"; + url = "https://registry.npmjs.org/chmodr/-/chmodr-1.0.2.tgz"; + sha1 = "04662b932d0f02ec66deaa2b0ea42811968e3eb9"; + }; + }; + "chokidar-1.6.0" = { + name = "chokidar"; + packageName = "chokidar"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-1.6.0.tgz"; + sha1 = "90c32ad4802901d7713de532dc284e96a63ad058"; + }; + }; + "chokidar-1.7.0" = { + name = "chokidar"; + packageName = "chokidar"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz"; + sha1 = "798e689778151c8076b4b360e5edd28cda2bb468"; + }; + }; + "chokidar-2.0.0" = { + name = "chokidar"; + packageName = "chokidar"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-2.0.0.tgz"; + sha512 = "01y5j8xkkzlzc4yzh4f8gbshbs6i3hb4wlz5nd48xcmm3vmawah9jj052km463v3d2vqx9kbrnxvjw2fkcbdxw0sg33ksclzlvc419s"; + }; + }; + "chownr-0.0.2" = { + name = "chownr"; + packageName = "chownr"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chownr/-/chownr-0.0.2.tgz"; + sha1 = "2f9aebf746f90808ce00607b72ba73b41604c485"; + }; + }; + "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"; + }; + }; + "chromecast-player-0.2.3" = { + name = "chromecast-player"; + packageName = "chromecast-player"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chromecast-player/-/chromecast-player-0.2.3.tgz"; + sha1 = "fe9ce69911c88096d681e4242c1902ad30787216"; + }; + }; + "chromecast-scanner-0.5.0" = { + name = "chromecast-scanner"; + packageName = "chromecast-scanner"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chromecast-scanner/-/chromecast-scanner-0.5.0.tgz"; + sha1 = "01296a3e5d130cce34974eb509cbbc7d6f78dd3d"; + }; + }; + "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/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz"; + sha1 = "04a106672c18b085ab774d983dfa3ea138f22205"; + }; + }; + "ci-info-1.1.2" = { + name = "ci-info"; + packageName = "ci-info"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ci-info/-/ci-info-1.1.2.tgz"; + sha512 = "1jbmihk48iby72h0b6k4rvhrnaydml49qyjcb83ix310ivjzd4zmdk3yxx1ssn6ryjblm7xzaswnwj53rxwcyn1fr0jm7bzvhy8hcdr"; + }; + }; + "cint-8.2.1" = { + name = "cint"; + packageName = "cint"; + version = "8.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cint/-/cint-8.2.1.tgz"; + sha1 = "70386b1b48e2773d0d63166a55aff94ef4456a12"; + }; + }; + "cipher-base-1.0.4" = { + name = "cipher-base"; + packageName = "cipher-base"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz"; + sha512 = "3cm9kdc1sv7pakzlhrc1pazdvg9lk4hv31lximwbcrgmwfzg6imxrndszgx9yzlizknfh2b73cr7b5mfcv50bldpyq6jr5s4zknsj1a"; + }; + }; + "circular-json-0.3.3" = { + name = "circular-json"; + packageName = "circular-json"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz"; + sha512 = "3hadrrn41znfv3gbqjxf0ckzjmns7w7zgsqw73sdz8nclaff9b0cg1mqhz3zxw3ndnmqqvrdcfykkfpv2v1pv4jdyzcccbn3hsbg4ji"; + }; + }; + "circular-json-0.5.1" = { + name = "circular-json"; + packageName = "circular-json"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/circular-json/-/circular-json-0.5.1.tgz"; + sha512 = "1myzlq58v42dc2b1i17rcmvj7529spwcqgzc7j2q663a7xkk4nhzqk6hpw20lvp99iaq0k0zg5p0jzf19n7p0vrg45hk160ai31qf2j"; + }; + }; + "clarinet-0.11.0" = { + name = "clarinet"; + packageName = "clarinet"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clarinet/-/clarinet-0.11.0.tgz"; + sha1 = "6cc912b93138dc867fc273cd34ea90e83e054719"; + }; + }; + "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"; + }; + }; + "clean-css-3.4.28" = { + name = "clean-css"; + packageName = "clean-css"; + version = "3.4.28"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.28.tgz"; + sha1 = "bf1945e82fc808f55695e6ddeaec01400efd03ff"; + }; + }; + "clean-css-4.1.9" = { + name = "clean-css"; + packageName = "clean-css"; + version = "4.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-css/-/clean-css-4.1.9.tgz"; + sha1 = "35cee8ae7687a49b98034f70de00c4edd3826301"; + }; + }; + "clean-stack-1.3.0" = { + name = "clean-stack"; + packageName = "clean-stack"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-stack/-/clean-stack-1.3.0.tgz"; + sha1 = "9e821501ae979986c46b1d66d2d432db2fd4ae31"; + }; + }; + "cli-0.6.6" = { + name = "cli"; + packageName = "cli"; + version = "0.6.6"; + src = fetchurl { + url = "https://registry.npmjs.org/cli/-/cli-0.6.6.tgz"; + sha1 = "02ad44a380abf27adac5e6f0cdd7b043d74c53e3"; }; }; "cli-1.0.1" = { @@ -15831,312 +4126,6 @@ let sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14"; }; }; - "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"; - }; - }; - "editorconfig-0.13.3" = { - name = "editorconfig"; - packageName = "editorconfig"; - version = "0.13.3"; - src = fetchurl { - url = "https://registry.npmjs.org/editorconfig/-/editorconfig-0.13.3.tgz"; - sha512 = "08ysphnfa9fynh31z9sbxq8nyw0v2w2q6xkvqpy13xr16mh58na9xrxjxj0r6vwr01xjna3jyz6njwbxw0dvyrq509y5fs2sm8fqj2s"; - }; - }; - "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"; - }; - }; - "lru-cache-3.2.0" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz"; - sha1 = "71789b3b7f5399bec8565dda38aa30d2a097efee"; - }; - }; - "graphlib-2.1.1" = { - name = "graphlib"; - packageName = "graphlib"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/graphlib/-/graphlib-2.1.1.tgz"; - sha1 = "42352c52ba2f4d035cb566eb91f7395f76ebc951"; - }; - }; - "native-promise-only-0.8.1" = { - name = "native-promise-only"; - packageName = "native-promise-only"; - version = "0.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz"; - sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11"; - }; - }; - "path-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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "connect-pause-0.1.1" = { - name = "connect-pause"; - packageName = "connect-pause"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/connect-pause/-/connect-pause-0.1.1.tgz"; - sha1 = "b269b2bb82ddb1ac3db5099c0fb582aba99fb37a"; - }; - }; - "errorhandler-1.5.0" = { - name = "errorhandler"; - packageName = "errorhandler"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/errorhandler/-/errorhandler-1.5.0.tgz"; - sha1 = "eaba64ca5d542a311ac945f582defc336165d9f4"; - }; - }; - "express-urlrewrite-1.2.0" = { - name = "express-urlrewrite"; - packageName = "express-urlrewrite"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/express-urlrewrite/-/express-urlrewrite-1.2.0.tgz"; - sha1 = "8e667b7761ff1c7ffdb0efa05d64035387c823eb"; - }; - }; - "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/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz"; - sha1 = "13f14ce02eed4e981297b64eb9e3b932e2dd13dc"; - }; - }; - "lodash-id-0.14.0" = { - name = "lodash-id"; - packageName = "lodash-id"; - version = "0.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash-id/-/lodash-id-0.14.0.tgz"; - sha1 = "baf48934e543a1b5d6346f8c84698b1a8c803896"; - }; - }; - "lowdb-0.15.5" = { - name = "lowdb"; - packageName = "lowdb"; - version = "0.15.5"; - src = fetchurl { - url = "https://registry.npmjs.org/lowdb/-/lowdb-0.15.5.tgz"; - sha1 = "9ade105df8aa573692d1221622b85414fbf4fa96"; - }; - }; - "method-override-2.3.10" = { - name = "method-override"; - packageName = "method-override"; - version = "2.3.10"; - src = fetchurl { - url = "https://registry.npmjs.org/method-override/-/method-override-2.3.10.tgz"; - sha1 = "e3daf8d5dee10dd2dce7d4ae88d62bbee77476b4"; - }; - }; - "morgan-1.9.0" = { - name = "morgan"; - packageName = "morgan"; - version = "1.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/morgan/-/morgan-1.9.0.tgz"; - sha1 = "d01fa6c65859b76fcf31b3cb53a3821a311d8051"; - }; - }; - "nanoid-1.0.1" = { - name = "nanoid"; - packageName = "nanoid"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-1.0.1.tgz"; - sha512 = "3dh8fdgynnii8rgdpyk69z99y49bnl60244wsaw8mk2lzhfhczgf7nxgmm0qakmgzbvqqqfngq03z3j8hp70smh7ka0il806w7ajxh5"; - }; - }; - "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/please-upgrade-node/-/please-upgrade-node-3.0.1.tgz"; - sha1 = "0a681f2c18915e5433a5ca2cd94e0b8206a782db"; - }; - }; - "server-destroy-1.0.1" = { - name = "server-destroy"; - packageName = "server-destroy"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/server-destroy/-/server-destroy-1.0.1.tgz"; - sha1 = "f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"; - }; - }; - "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"; - }; - }; - "yargs-10.0.3" = { - name = "yargs"; - packageName = "yargs"; - version = "10.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-10.0.3.tgz"; - sha512 = "1vn6jsqrhybxddyhmvkh0d43n2lk1z8081glfq80zpjfs4xgwpk0mmgdiry9zgsihmv9a2qidmp5hhyqqq8mzzkr037wla0qd1nk80f"; - }; - }; - "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"; - }; - }; - "jju-1.3.0" = { - name = "jju"; - packageName = "jju"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jju/-/jju-1.3.0.tgz"; - sha1 = "dadd9ef01924bc728b03f2f7979bdbd62f7a2aaa"; - }; - }; - "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"; - }; - }; - "basic-auth-2.0.0" = { - name = "basic-auth"; - packageName = "basic-auth"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.0.tgz"; - sha1 = "015db3f353e02e56377755f962742e8981e7bbba"; - }; - }; - "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"; - }; - }; - "configstore-3.1.1" = { - name = "configstore"; - packageName = "configstore"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz"; - sha512 = "2zmidvkp20q25yv6a5d7k1daawdg0w6ppgayxzpwfhyvmgwybkkv7ni0j4b2j9c8wjn8z33zf5d4bjr8jywb5qixc75vypyy87n90z6"; - }; - }; - "import-lazy-2.1.0" = { - name = "import-lazy"; - packageName = "import-lazy"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz"; - sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43"; - }; - }; - "is-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"; - }; - }; - "latest-version-3.1.0" = { - name = "latest-version"; - packageName = "latest-version"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz"; - sha1 = "a205383fea322b33b5ae3b18abee0dc2f356ee15"; - }; - }; - "xdg-basedir-3.0.0" = { - name = "xdg-basedir"; - packageName = "xdg-basedir"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz"; - sha1 = "496b2cc109eca8dbacfe2dc72b603c17c5870ad4"; - }; - }; - "ansi-align-2.0.0" = { - name = "ansi-align"; - packageName = "ansi-align"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz"; - sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f"; - }; - }; - "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"; - }; - }; "cli-boxes-1.0.0" = { name = "cli-boxes"; packageName = "cli-boxes"; @@ -16146,112 +4135,139 @@ let sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143"; }; }; - "term-size-1.2.0" = { - name = "term-size"; - packageName = "term-size"; - version = "1.2.0"; + "cli-cursor-1.0.2" = { + name = "cli-cursor"; + packageName = "cli-cursor"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz"; - sha1 = "458b83887f288fc56d6fffbfad262e26638efa69"; + url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz"; + sha1 = "64da3f7d56a54412e59794bd62dc35295e8f2987"; }; }; - "widest-line-2.0.0" = { - name = "widest-line"; - packageName = "widest-line"; - version = "2.0.0"; + "cli-cursor-2.1.0" = { + name = "cli-cursor"; + packageName = "cli-cursor"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/widest-line/-/widest-line-2.0.0.tgz"; - sha1 = "0142a4e8a243f8882c0233aa0e0281aa76152273"; + url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz"; + sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; }; }; - "execa-0.7.0" = { - name = "execa"; - packageName = "execa"; - version = "0.7.0"; + "cli-list-0.2.0" = { + name = "cli-list"; + packageName = "cli-list"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz"; - sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777"; + url = "https://registry.npmjs.org/cli-list/-/cli-list-0.2.0.tgz"; + sha1 = "7e673ee0dd39a611a486476e53f3c6b3941cb582"; }; }; - "unique-string-1.0.0" = { - name = "unique-string"; - packageName = "unique-string"; - version = "1.0.0"; + "cli-spinners-1.1.0" = { + name = "cli-spinners"; + packageName = "cli-spinners"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz"; - sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a"; + url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.1.0.tgz"; + sha1 = "f1847b168844d917a671eb9d147e3df497c90d06"; }; }; - "crypto-random-string-1.0.0" = { - name = "crypto-random-string"; - packageName = "crypto-random-string"; - version = "1.0.0"; + "cli-table-0.3.1" = { + name = "cli-table"; + packageName = "cli-table"; + version = "0.3.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/cli-table/-/cli-table-0.3.1.tgz"; + sha1 = "f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"; }; }; - "global-dirs-0.1.1" = { - name = "global-dirs"; - packageName = "global-dirs"; - version = "0.1.1"; + "cli-table2-0.2.0" = { + name = "cli-table2"; + packageName = "cli-table2"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz"; - sha1 = "b319c0dd4607f353f3be9cca4c72fc148c49f445"; + url = "https://registry.npmjs.org/cli-table2/-/cli-table2-0.2.0.tgz"; + sha1 = "2d1ef7f218a0e786e214540562d4bd177fe32d97"; }; }; - "package-json-4.0.1" = { - name = "package-json"; - packageName = "package-json"; - version = "4.0.1"; + "cli-truncate-1.1.0" = { + name = "cli-truncate"; + packageName = "cli-truncate"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz"; - sha1 = "8869a0401253661c4c4ca3da6c2121ed555f5eed"; + url = "https://registry.npmjs.org/cli-truncate/-/cli-truncate-1.1.0.tgz"; + sha512 = "1h48346i2bsfvj3h0qfxmyh1770cxb3d9ibk75yjag1xgzk021yqbmkiv30k5c0qgyb0sxkvjc3sckmakf4i7q1d2gh1nmw9fimj2vc"; }; }; - "got-6.7.1" = { - name = "got"; - packageName = "got"; - version = "6.7.1"; + "cli-width-1.1.1" = { + name = "cli-width"; + packageName = "cli-width"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-6.7.1.tgz"; - sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0"; + url = "https://registry.npmjs.org/cli-width/-/cli-width-1.1.1.tgz"; + sha1 = "a4d293ef67ebb7b88d4a4d42c0ccf00c4d1e366d"; }; }; - "registry-auth-token-3.3.1" = { - name = "registry-auth-token"; - packageName = "registry-auth-token"; - version = "3.3.1"; + "cli-width-2.2.0" = { + name = "cli-width"; + packageName = "cli-width"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.1.tgz"; - sha1 = "fb0d3289ee0d9ada2cbb52af5dfe66cb070d3006"; + url = "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz"; + sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639"; }; }; - "create-error-class-3.0.2" = { - name = "create-error-class"; - packageName = "create-error-class"; - version = "3.0.2"; + "cliclopts-1.1.1" = { + name = "cliclopts"; + packageName = "cliclopts"; + version = "1.1.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/cliclopts/-/cliclopts-1.1.1.tgz"; + sha1 = "69431c7cb5af723774b0d3911b4c37512431910f"; }; }; - "unzip-response-2.0.1" = { - name = "unzip-response"; - packageName = "unzip-response"; - version = "2.0.1"; + "cliff-0.1.10" = { + name = "cliff"; + packageName = "cliff"; + version = "0.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz"; - sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97"; + url = "https://registry.npmjs.org/cliff/-/cliff-0.1.10.tgz"; + sha1 = "53be33ea9f59bec85609ee300ac4207603e52013"; }; }; - "capture-stack-trace-1.0.0" = { - name = "capture-stack-trace"; - packageName = "capture-stack-trace"; - version = "1.0.0"; + "cliff-0.1.9" = { + name = "cliff"; + packageName = "cliff"; + version = "0.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz"; - sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d"; + url = "https://registry.npmjs.org/cliff/-/cliff-0.1.9.tgz"; + sha1 = "a211e09c6a3de3ba1af27d049d301250d18812bc"; + }; + }; + "clipboardy-1.2.2" = { + name = "clipboardy"; + packageName = "clipboardy"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/clipboardy/-/clipboardy-1.2.2.tgz"; + sha512 = "2pq14hxz6w4k5yvndrm1fv3iyscdqf5c4nja421gl2661didzh80r08zddd84zny94831qs44biamjhvwmqh40pfy3pjv3vwl2ap8np"; + }; + }; + "clite-0.3.0" = { + name = "clite"; + packageName = "clite"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clite/-/clite-0.3.0.tgz"; + sha1 = "e7fcbc8cc5bd3e7f8b84ed48db12e9474cc73441"; + }; + }; + "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"; }; }; "cliui-3.2.0" = { @@ -16263,1093 +4279,112 @@ let 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-2.1.0" = { - name = "os-locale"; - packageName = "os-locale"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz"; - sha512 = "0lafrp0i2ajapsnma0x74q7zscn97a56i5hh58a0nyig2igfx9fqn4ain9kvjrr06as5gzdrv2wdf52qc5m861fd0f4cv69ghdjbjyy"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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-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"; - }; - }; - "wrap-ansi-2.1.0" = { - name = "wrap-ansi"; - packageName = "wrap-ansi"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; - sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; - }; - }; - "lcid-1.0.0" = { - name = "lcid"; - packageName = "lcid"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz"; - sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; - }; - }; - "invert-kv-1.0.0" = { - name = "invert-kv"; - packageName = "invert-kv"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"; - sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; - }; - }; - "combine-lists-1.0.1" = { - name = "combine-lists"; - packageName = "combine-lists"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz"; - sha1 = "458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"; - }; - }; - "connect-3.6.5" = { - name = "connect"; - packageName = "connect"; - version = "3.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-3.6.5.tgz"; - sha1 = "fb8dde7ba0763877d0ec9df9dac0b4b40e72c7da"; - }; - }; - "di-0.0.1" = { - name = "di"; - packageName = "di"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/di/-/di-0.0.1.tgz"; - sha1 = "806649326ceaa7caa3306d75d985ea2748ba913c"; - }; - }; - "dom-serialize-2.2.1" = { - name = "dom-serialize"; - packageName = "dom-serialize"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz"; - sha1 = "562ae8999f44be5ea3076f5419dcd59eb43ac95b"; - }; - }; - "expand-braces-0.1.2" = { - name = "expand-braces"; - packageName = "expand-braces"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz"; - sha1 = "488b1d1d2451cb3d3a6b192cfc030f44c5855fea"; - }; - }; - "isbinaryfile-3.0.2" = { - name = "isbinaryfile"; - packageName = "isbinaryfile"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.2.tgz"; - sha1 = "4a3e974ec0cba9004d3fc6cde7209ea69368a621"; - }; - }; - "log4js-0.6.38" = { - name = "log4js"; - packageName = "log4js"; - version = "0.6.38"; - src = fetchurl { - url = "https://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz"; - sha1 = "2c494116695d6fb25480943d3fc872e662a522fd"; - }; - }; - "qjobs-1.1.5" = { - name = "qjobs"; - packageName = "qjobs"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/qjobs/-/qjobs-1.1.5.tgz"; - sha1 = "659de9f2cf8dcc27a1481276f205377272382e73"; - }; - }; - "socket.io-1.7.3" = { - name = "socket.io"; - packageName = "socket.io"; - version = "1.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-1.7.3.tgz"; - sha1 = "b8af9caba00949e568e369f1327ea9be9ea2461b"; - }; - }; - "useragent-2.2.1" = { - name = "useragent"; - packageName = "useragent"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/useragent/-/useragent-2.2.1.tgz"; - sha1 = "cf593ef4f2d175875e8bb658ea92e18a4fd06d8e"; - }; - }; - "finalhandler-1.0.6" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.6.tgz"; - sha1 = "007aea33d1a4d3e42017f624848ad58d212f814f"; - }; - }; - "custom-event-1.0.1" = { - name = "custom-event"; - packageName = "custom-event"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz"; - sha1 = "5d02a46850adf1b4a317946a3928fccb5bfd0425"; - }; - }; - "ent-2.2.0" = { - name = "ent"; - packageName = "ent"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz"; - sha1 = "e964219325a21d05f44466a2f686ed6ce5f5dd1d"; - }; - }; - "array-slice-0.2.3" = { - name = "array-slice"; - packageName = "array-slice"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz"; - sha1 = "dd3cfb80ed7973a75117cdac69b0b99ec86186f5"; - }; - }; - "braces-0.1.5" = { - name = "braces"; - packageName = "braces"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz"; - sha1 = "c085711085291d8b75fdd74eab0f8597280711e6"; - }; - }; - "expand-range-0.1.1" = { - name = "expand-range"; - packageName = "expand-range"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz"; - sha1 = "4cb8eda0993ca56fa4f41fc42f3cbb4ccadff044"; - }; - }; - "is-number-0.1.1" = { - name = "is-number"; - packageName = "is-number"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz"; - sha1 = "69a7af116963d47206ec9bd9b48a14216f1e3806"; - }; - }; - "repeat-string-0.2.2" = { - name = "repeat-string"; - packageName = "repeat-string"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz"; - sha1 = "c7a8d3236068362059a7e4651fc6884e8b1fb4ae"; - }; - }; - "debug-2.3.3" = { - name = "debug"; - packageName = "debug"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz"; - sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c"; - }; - }; - "engine.io-1.8.3" = { - name = "engine.io"; - packageName = "engine.io"; - version = "1.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.3.tgz"; - sha1 = "8de7f97895d20d39b85f88eeee777b2bd42b13d4"; - }; - }; - "has-binary-0.1.7" = { - name = "has-binary"; - packageName = "has-binary"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz"; - sha1 = "68e61eb16210c9545a0a5cce06a873912fe1e68c"; - }; - }; - "object-assign-4.1.0" = { - name = "object-assign"; - packageName = "object-assign"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz"; - sha1 = "7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"; - }; - }; - "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/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz"; - sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b"; - }; - }; - "socket.io-client-1.7.3" = { - name = "socket.io-client"; - packageName = "socket.io-client"; - version = "1.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.3.tgz"; - sha1 = "b30e86aa10d5ef3546601c09cde4765e381da377"; - }; - }; - "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/socket.io-parser/-/socket.io-parser-2.3.1.tgz"; - sha1 = "dd532025103ce429697326befd64005fcfe5b4a0"; - }; - }; - "ms-0.7.2" = { - name = "ms"; - packageName = "ms"; - version = "0.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"; - sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765"; - }; - }; - "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"; - }; - }; - "base64id-1.0.0" = { - name = "base64id"; - packageName = "base64id"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz"; - sha1 = "47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"; - }; - }; - "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/engine.io-parser/-/engine.io-parser-1.3.2.tgz"; - sha1 = "937b079f0007d0893ec56d46cb220b8cb435220a"; - }; - }; - "ws-1.1.2" = { - name = "ws"; - packageName = "ws"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-1.1.2.tgz"; - sha1 = "8a244fa052401e08c9886cf44a85189e1fd4067f"; - }; - }; - "after-0.8.2" = { - name = "after"; - packageName = "after"; - version = "0.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/after/-/after-0.8.2.tgz"; - sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f"; - }; - }; - "arraybuffer.slice-0.0.6" = { - name = "arraybuffer.slice"; - packageName = "arraybuffer.slice"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz"; - sha1 = "f33b2159f0532a3f3107a272c0ccfbd1ad2979ca"; - }; - }; - "base64-arraybuffer-0.1.5" = { - name = "base64-arraybuffer"; - packageName = "base64-arraybuffer"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz"; - sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "backo2-1.0.2" = { - name = "backo2"; - packageName = "backo2"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz"; - sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947"; - }; - }; - "component-bind-1.0.0" = { - name = "component-bind"; - packageName = "component-bind"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz"; - sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"; - }; - }; - "engine.io-client-1.8.3" = { - name = "engine.io-client"; - packageName = "engine.io-client"; - version = "1.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.3.tgz"; - sha1 = "1798ed93451246453d4c6f635d7a201fe940d5ab"; - }; - }; - "object-component-0.0.3" = { - name = "object-component"; - packageName = "object-component"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz"; - sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "component-inherit-0.0.3" = { - name = "component-inherit"; - packageName = "component-inherit"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz"; - sha1 = "645fc4adf58b72b649d5cae65135619db26ff143"; - }; - }; - "has-cors-1.1.0" = { - name = "has-cors"; - packageName = "has-cors"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz"; - sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39"; - }; - }; - "parsejson-0.0.3" = { - name = "parsejson"; - packageName = "parsejson"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz"; - sha1 = "ab7e3759f209ece99437973f7d0f1f64ae0e64ab"; - }; - }; - "parseqs-0.0.5" = { - name = "parseqs"; - packageName = "parseqs"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz"; - sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "better-assert-1.0.2" = { - name = "better-assert"; - packageName = "better-assert"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz"; - sha1 = "40866b9e1b9e0b55b481894311e68faffaebc522"; - }; - }; - "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"; - }; - }; - "debug-2.2.0" = { - name = "debug"; - packageName = "debug"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; - sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; - }; - }; - "json3-3.3.2" = { - name = "json3"; - packageName = "json3"; - version = "3.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz"; - sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1"; - }; - }; - "ms-0.7.1" = { - name = "ms"; - packageName = "ms"; - version = "0.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; - sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; - }; - }; - "lru-cache-2.2.4" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "2.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz"; - sha1 = "6c658619becf14031d0d0b594b16042ce4dc063d"; - }; - }; - "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"; - }; - }; - "passport-0.4.0" = { - name = "passport"; - packageName = "passport"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/passport/-/passport-0.4.0.tgz"; - sha1 = "c5095691347bd5ad3b5e180238c3914d16f05811"; - }; - }; - "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/passport-google-oauth/-/passport-google-oauth-1.0.0.tgz"; - sha1 = "65f50633192ad0627a18b08960077109d84eb76d"; - }; - }; - "connect-restreamer-1.0.3" = { - name = "connect-restreamer"; - packageName = "connect-restreamer"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/connect-restreamer/-/connect-restreamer-1.0.3.tgz"; - sha1 = "a73f04d88e7292d7fd2f2d7d691a0cdeeed141a9"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "etag-1.7.0" = { - name = "etag"; - packageName = "etag"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz"; - sha1 = "03d30b5f67dd6e632d2945d30d6652731a34d5d8"; - }; - }; - "fresh-0.3.0" = { - name = "fresh"; - packageName = "fresh"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz"; - sha1 = "651f838e22424e7566de161d8358caa199f83d4f"; - }; - }; - "merge-descriptors-1.0.0" = { - name = "merge-descriptors"; - packageName = "merge-descriptors"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz"; - sha1 = "2169cf7538e1b0cc87fb88e1502d8474bbf79864"; - }; - }; - "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"; - }; - }; - "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-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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; + "cliui-4.0.0" = { + name = "cliui"; + packageName = "cliui"; version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz"; - sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607"; + url = "https://registry.npmjs.org/cliui/-/cliui-4.0.0.tgz"; + sha512 = "0mh539939k4z2nhj5h1m8kdr3bfy2f1kmdkss02cdbyabmpdkc6m22llyykymriahf54gpx6qg9v3vrs51gqgrrfhpsgbdndgjdd3cx"; }; }; - "response-time-2.3.2" = { - name = "response-time"; - packageName = "response-time"; - version = "2.3.2"; + "clivas-0.1.4" = { + name = "clivas"; + packageName = "clivas"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/response-time/-/response-time-2.3.2.tgz"; - sha1 = "ffa71bab952d62f7c1d49b7434355fbc68dffc5a"; + url = "https://registry.npmjs.org/clivas/-/clivas-0.1.4.tgz"; + sha1 = "e1c1e481d1273d57f1752132b0e4410a0d88235a"; }; }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "stream-counter-0.2.0" = { - name = "stream-counter"; - packageName = "stream-counter"; + "clivas-0.2.0" = { + name = "clivas"; + packageName = "clivas"; version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz"; - sha1 = "ded266556319c8b0e222812b9cf3b26fa7d947de"; + url = "https://registry.npmjs.org/clivas/-/clivas-0.2.0.tgz"; + sha1 = "b8d19188b3243e390f302410bd0cb1622db82649"; }; }; - "batch-0.5.3" = { - name = "batch"; - packageName = "batch"; - version = "0.5.3"; + "clone-0.1.5" = { + name = "clone"; + packageName = "clone"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/batch/-/batch-0.5.3.tgz"; - sha1 = "3f3414f380321743bfc1042f9a83ff1d5824d464"; + url = "https://registry.npmjs.org/clone/-/clone-0.1.5.tgz"; + sha1 = "46f29143d0766d663dbd7f80b7520a15783d2042"; }; }; - "send-0.13.2" = { - name = "send"; - packageName = "send"; - version = "0.13.2"; + "clone-0.1.6" = { + name = "clone"; + packageName = "clone"; + version = "0.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.13.2.tgz"; - sha1 = "765e7607c8055452bba6f0b052595350986036de"; + url = "https://registry.npmjs.org/clone/-/clone-0.1.6.tgz"; + sha1 = "4af2296d4a23a64168c2f5fb0a2aa65e80517000"; }; }; - "mime-1.3.4" = { - name = "mime"; - packageName = "mime"; - version = "1.3.4"; + "clone-0.2.0" = { + name = "clone"; + packageName = "clone"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; - sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; + url = "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"; + sha1 = "c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"; }; }; - "statuses-1.2.1" = { - name = "statuses"; - packageName = "statuses"; - version = "1.2.1"; + "clone-1.0.3" = { + name = "clone"; + packageName = "clone"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz"; - sha1 = "dded45cc18256d51ed40aec142489d5c61026d28"; + url = "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz"; + sha1 = "298d7e2231660f40c003c2ed3140decf3f53085f"; }; }; - "passport-strategy-1.0.0" = { - name = "passport-strategy"; - packageName = "passport-strategy"; + "clone-2.1.1" = { + name = "clone"; + packageName = "clone"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz"; + sha1 = "d217d1e961118e3ac9a4b8bba3285553bf647cdb"; + }; + }; + "clone-deep-0.3.0" = { + name = "clone-deep"; + packageName = "clone-deep"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clone-deep/-/clone-deep-0.3.0.tgz"; + sha1 = "348c61ae9cdbe0edfe053d91ff4cc521d790ede8"; + }; + }; + "clone-regexp-1.0.0" = { + name = "clone-regexp"; + packageName = "clone-regexp"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz"; - sha1 = "b5539aa8fc225a3d1ad179476ddf236b440f52e4"; + url = "https://registry.npmjs.org/clone-regexp/-/clone-regexp-1.0.0.tgz"; + sha1 = "eae0a2413f55c0942f818c229fefce845d7f3b1c"; }; }; - "pause-0.0.1" = { - name = "pause"; - packageName = "pause"; + "clone-response-1.0.2" = { + name = "clone-response"; + packageName = "clone-response"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz"; + sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b"; + }; + }; + "clone-stats-0.0.1" = { + name = "clone-stats"; + packageName = "clone-stats"; version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz"; - sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"; - }; - }; - "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/passport-google-oauth1/-/passport-google-oauth1-1.0.0.tgz"; - sha1 = "af74a803df51ec646f66a44d82282be6f108e0cc"; - }; - }; - "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/passport-google-oauth20/-/passport-google-oauth20-1.0.0.tgz"; - sha1 = "3b960e8a1d70d1dbe794615c827c68c40392a5d0"; - }; - }; - "passport-oauth1-1.1.0" = { - name = "passport-oauth1"; - packageName = "passport-oauth1"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/passport-oauth1/-/passport-oauth1-1.1.0.tgz"; - sha1 = "a7de988a211f9cf4687377130ea74df32730c918"; - }; - }; - "oauth-0.9.15" = { - name = "oauth"; - packageName = "oauth"; - version = "0.9.15"; - src = fetchurl { - url = "https://registry.npmjs.org/oauth/-/oauth-0.9.15.tgz"; - sha1 = "bd1fefaf686c96b75475aed5196412ff60cfb9c1"; - }; - }; - "passport-oauth2-1.4.0" = { - name = "passport-oauth2"; - packageName = "passport-oauth2"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.4.0.tgz"; - sha1 = "f62f81583cbe12609be7ce6f160b9395a27b86ad"; - }; - }; - "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"; + url = "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"; + sha1 = "b88f94a82cf38b8791d58046ea4029ad88ca99d1"; }; }; "cmd-shim-2.0.2" = { @@ -17361,6 +4396,204 @@ let sha1 = "6fcbda99483a8fd15d7d30a196ca69d688a2efdb"; }; }; + "cmdln-3.2.1" = { + name = "cmdln"; + packageName = "cmdln"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cmdln/-/cmdln-3.2.1.tgz"; + sha1 = "8d21967625b25ee35fca8e8453ccf10fccd04e45"; + }; + }; + "co-3.0.6" = { + name = "co"; + packageName = "co"; + version = "3.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/co/-/co-3.0.6.tgz"; + sha1 = "1445f226c5eb956138e68c9ac30167ea7d2e6bda"; + }; + }; + "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"; + }; + }; + "coa-2.0.1" = { + name = "coa"; + packageName = "coa"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/coa/-/coa-2.0.1.tgz"; + sha512 = "2nxlq1p7l0446g1hnmpgv37c0m2jqnzfddgsa4ys4p5sapd43mx6p7yas925hjimzzx41jvxr36fvllsziwaliiwbdginq4xx6d61z7"; + }; + }; + "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.0" = { + name = "codecs"; + packageName = "codecs"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/codecs/-/codecs-1.2.0.tgz"; + sha1 = "5148549e3d156c5fa053d7cbb419715a0cf43d16"; + }; + }; + "codepage-1.4.0" = { + name = "codepage"; + packageName = "codepage"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/codepage/-/codepage-1.4.0.tgz"; + sha1 = "ffd5b603ae6a8ebb63559d5fb89a57d12b943837"; + }; + }; + "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"; + }; + }; + "coffee-script-1.6.3" = { + name = "coffee-script"; + packageName = "coffee-script"; + version = "1.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz"; + sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be"; + }; + }; + "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/collapse-white-space/-/collapse-white-space-1.0.3.tgz"; + sha1 = "4b906f670e5a963a87b76b0e1689643341b6023c"; + }; + }; + "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-2.0.1" = { + name = "color"; + packageName = "color"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/color/-/color-2.0.1.tgz"; + sha512 = "1gir7mfj6033amg78p7jvpj0nk2hw61hqd81r6x3a2qmgizbw3d89k0qk62680zhm9ypcx6c9p2cgwjvb8smxv0qgvblkwza9ah5ddr"; + }; + }; + "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"; + }; + }; + "color-string-1.5.2" = { + name = "color-string"; + packageName = "color-string"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/color-string/-/color-string-1.5.2.tgz"; + sha1 = "26e45814bc3c9a7cbd6751648a41434514a773a9"; + }; + }; + "color-support-1.1.3" = { + name = "color-support"; + packageName = "color-support"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz"; + sha512 = "13g563h7mrddc3rlljgg75km4zycb8rhzxb5wiiricqvh4n7zgl60psnz39ijkzx5bn93s5qvacwkxbg1cglcmg5z3yyb6cjs96685a"; + }; + }; + "colors-0.5.1" = { + name = "colors"; + packageName = "colors"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/colors/-/colors-0.5.1.tgz"; + sha1 = "7d0023eaeb154e8ee9fce75dcb923d0ed1667774"; + }; + }; + "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"; + }; + }; + "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.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"; + }; + }; + "colour-0.7.1" = { + name = "colour"; + packageName = "colour"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/colour/-/colour-0.7.1.tgz"; + sha1 = "9cb169917ec5d12c0736d3e8685746df1cadf778"; + }; + }; "columnify-1.5.4" = { name = "columnify"; packageName = "columnify"; @@ -17370,6 +4603,51 @@ let sha1 = "4737ddf1c7b69a8a7c340570782e947eec8e78bb"; }; }; + "combine-lists-1.0.1" = { + name = "combine-lists"; + packageName = "combine-lists"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz"; + sha1 = "458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"; + }; + }; + "combine-source-map-0.7.2" = { + name = "combine-source-map"; + packageName = "combine-source-map"; + version = "0.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.7.2.tgz"; + sha1 = "0870312856b307a87cc4ac486f3a9a62aeccc09e"; + }; + }; + "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/combine-source-map/-/combine-source-map-0.8.0.tgz"; + sha1 = "a58d0df042c186fcf822a8e8015f5450d2d79a8b"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; "command-join-2.0.0" = { name = "command-join"; packageName = "command-join"; @@ -17379,166 +4657,581 @@ let sha1 = "52e8b984f4872d952ff1bdc8b98397d27c7144cf"; }; }; - "conventional-changelog-cli-1.3.5" = { - name = "conventional-changelog-cli"; - packageName = "conventional-changelog-cli"; - version = "1.3.5"; + "commander-0.6.1" = { + name = "commander"; + packageName = "commander"; + version = "0.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.5.tgz"; - sha1 = "46c51496216b7406588883defa6fac589e9bb31e"; + url = "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz"; + sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"; }; }; - "conventional-recommended-bump-1.1.0" = { - name = "conventional-recommended-bump"; - packageName = "conventional-recommended-bump"; - version = "1.1.0"; + "commander-1.0.4" = { + name = "commander"; + packageName = "commander"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-1.1.0.tgz"; - sha512 = "3gh833x8hqmnxfmacs3ryrb2gh3y397ddkiwisv6g3dfz6j617i1fm22yq3r83y40pidmf1n77qzvwmbx4ws7jn4yydfxypi6fhgbaq"; + url = "https://registry.npmjs.org/commander/-/commander-1.0.4.tgz"; + sha1 = "5edeb1aee23c4fb541a6b70d692abef19669a2d3"; }; }; - "dedent-0.7.0" = { - name = "dedent"; - packageName = "dedent"; - version = "0.7.0"; + "commander-1.1.1" = { + name = "commander"; + packageName = "commander"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz"; - sha1 = "2495ddbaf6eb874abb0e1be9df22d2e5a544326c"; + url = "https://registry.npmjs.org/commander/-/commander-1.1.1.tgz"; + sha1 = "50d1651868ae60eccff0a2d9f34595376bc6b041"; }; }; - "fs-extra-4.0.3" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "4.0.3"; + "commander-1.3.1" = { + name = "commander"; + packageName = "commander"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz"; - sha512 = "05bphjab1lk12dz3qf87dywgpsjsx0f59kpligxqph53yicigij2gsmvkppgyhpi70h3q3id3ymz30c02v3pphakn06k8vm6xsdpamb"; + url = "https://registry.npmjs.org/commander/-/commander-1.3.1.tgz"; + sha1 = "02443e02db96f4b32b674225451abb6e9510000e"; }; }; - "get-port-3.2.0" = { - name = "get-port"; - packageName = "get-port"; - version = "3.2.0"; + "commander-1.3.2" = { + name = "commander"; + packageName = "commander"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz"; - sha1 = "dd7ce7de187c06c8bf353796ac71e099f0980ebc"; + url = "https://registry.npmjs.org/commander/-/commander-1.3.2.tgz"; + sha1 = "8a8f30ec670a6fdd64af52f1914b907d79ead5b5"; }; }; - "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"; - }; - }; - "globby-6.1.0" = { - name = "globby"; - packageName = "globby"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz"; - sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; - }; - }; - "is-ci-1.0.10" = { - name = "is-ci"; - packageName = "is-ci"; - version = "1.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/is-ci/-/is-ci-1.0.10.tgz"; - sha1 = "f739336b2632365061a9d48270cd56ae3369318e"; - }; - }; - "load-json-file-3.0.0" = { - name = "load-json-file"; - packageName = "load-json-file"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/load-json-file/-/load-json-file-3.0.0.tgz"; - sha1 = "7eb3735d983a7ed2262ade4ff769af5369c5c440"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "read-pkg-2.0.0" = { - name = "read-pkg"; - packageName = "read-pkg"; + "commander-2.0.0" = { + name = "commander"; + packageName = "commander"; version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz"; - sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"; + url = "https://registry.npmjs.org/commander/-/commander-2.0.0.tgz"; + sha1 = "d1b86f901f8b64bd941bdeadaf924530393be928"; }; }; - "strong-log-transformer-1.0.6" = { - name = "strong-log-transformer"; - packageName = "strong-log-transformer"; - version = "1.0.6"; + "commander-2.1.0" = { + name = "commander"; + packageName = "commander"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-1.0.6.tgz"; - sha1 = "f7fb93758a69a571140181277eea0c2eb1301fa3"; + url = "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz"; + sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781"; }; }; - "temp-write-3.3.0" = { - name = "temp-write"; - packageName = "temp-write"; - version = "3.3.0"; + "commander-2.11.0" = { + name = "commander"; + packageName = "commander"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/temp-write/-/temp-write-3.3.0.tgz"; - sha1 = "c1a96de2b36061342eae81f44ff001aec8f615a9"; + url = "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz"; + sha512 = "2yi2hwf0bghfnv1fdgd4wvh7s0acjrgqbgww97ncm6i6s6ffs1zahnj48f6gqpqj6fsf0jigvnr0civ25k2160c38281r80wvg7jkkg"; }; }; - "write-json-file-2.3.0" = { - name = "write-json-file"; - packageName = "write-json-file"; - version = "2.3.0"; + "commander-2.12.2" = { + name = "commander"; + packageName = "commander"; + version = "2.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/write-json-file/-/write-json-file-2.3.0.tgz"; - sha1 = "2b64c8a33004d54b8698c76d585a77ceb61da32f"; + url = "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz"; + sha512 = "007wb3baahjcrv17kgxryqjlsyr3c3kl2y07p85m4ia78pba9xyjr3cgi95jjrwq8qq550s78hj06f7z0ab8ssrxk6w06afjsmxln84"; }; }; - "write-pkg-3.1.0" = { - name = "write-pkg"; - packageName = "write-pkg"; - version = "3.1.0"; + "commander-2.13.0" = { + name = "commander"; + packageName = "commander"; + version = "2.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/write-pkg/-/write-pkg-3.1.0.tgz"; - sha1 = "030a9994cc9993d25b4e75a9f1a1923607291ce9"; + url = "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz"; + sha512 = "1h27ar13gbld2jk6wk84irqmyz6ya6b4dzmxb6nq8azyi48iq8pqqyq90jwzxqb3i7j167y5fpiys6v7vvjzhm8bbd8rya1kzgr4nri"; }; }; - "yargs-8.0.2" = { - name = "yargs"; - packageName = "yargs"; - version = "8.0.2"; + "commander-2.6.0" = { + name = "commander"; + packageName = "commander"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz"; - sha1 = "6299a9055b1cefc969ff7e79c1d918dceb22c360"; + url = "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz"; + sha1 = "9df7e52fb2a0cb0fb89058ee80c3104225f37e1d"; }; }; - "add-stream-1.0.0" = { - name = "add-stream"; - packageName = "add-stream"; + "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"; + }; + }; + "commist-1.0.0" = { + name = "commist"; + packageName = "commist"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz"; - sha1 = "6a7990437ca736d5e1288db92bd3266d5f5cb2aa"; + url = "https://registry.npmjs.org/commist/-/commist-1.0.0.tgz"; + sha1 = "c0c352501cf6f52e9124e3ef89c9806e2022ebef"; + }; + }; + "common-tags-1.7.2" = { + name = "common-tags"; + packageName = "common-tags"; + version = "1.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/common-tags/-/common-tags-1.7.2.tgz"; + sha512 = "0jx2cncv7x5ms1gg2vks5bhxi9c5jbwymfk42dzmp9vrxrmhrl9vaw4wsh4lvf65shxmq1v8f8s0i3rkyk2x8mrfpq2m30famkgv24f"; + }; + }; + "commoner-0.10.8" = { + name = "commoner"; + packageName = "commoner"; + version = "0.10.8"; + src = fetchurl { + url = "https://registry.npmjs.org/commoner/-/commoner-0.10.8.tgz"; + sha1 = "34fc3672cd24393e8bb47e70caa0293811f4f2c5"; + }; + }; + "compact2string-1.4.0" = { + name = "compact2string"; + packageName = "compact2string"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/compact2string/-/compact2string-1.4.0.tgz"; + sha1 = "a99cd96ea000525684b269683ae2222d6eea7b49"; + }; + }; + "compare-func-1.3.2" = { + name = "compare-func"; + packageName = "compare-func"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/compare-func/-/compare-func-1.3.2.tgz"; + sha1 = "99dd0ba457e1f9bc722b12c08ec33eeab31fa648"; + }; + }; + "component-bind-1.0.0" = { + name = "component-bind"; + packageName = "component-bind"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz"; + sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"; + }; + }; + "component-emitter-1.1.2" = { + name = "component-emitter"; + packageName = "component-emitter"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz"; + sha1 = "296594f2753daa63996d2af08d15a95116c9aec3"; + }; + }; + "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"; + }; + }; + "component-inherit-0.0.3" = { + name = "component-inherit"; + packageName = "component-inherit"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz"; + sha1 = "645fc4adf58b72b649d5cae65135619db26ff143"; + }; + }; + "compress-commons-1.2.2" = { + name = "compress-commons"; + packageName = "compress-commons"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/compress-commons/-/compress-commons-1.2.2.tgz"; + sha1 = "524a9f10903f3a813389b0225d27c48bb751890f"; + }; + }; + "compressible-2.0.12" = { + name = "compressible"; + packageName = "compressible"; + version = "2.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/compressible/-/compressible-2.0.12.tgz"; + sha1 = "c59a5c99db76767e9876500e271ef63b3493bd66"; + }; + }; + "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"; + }; + }; + "compression-1.7.1" = { + name = "compression"; + packageName = "compression"; + version = "1.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/compression/-/compression-1.7.1.tgz"; + sha1 = "eff2603efc2e22cf86f35d2eb93589f9875373db"; + }; + }; + "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.5.0" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz"; + sha1 = "53f7d43c51c5e43f81c8fdd03321c631be68d611"; + }; + }; + "concat-stream-1.5.2" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz"; + sha1 = "708978624d856af41a5a741defdd261da752c266"; + }; + }; + "concat-stream-1.6.0" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz"; + sha1 = "0aac662fd52be78964d5532f694784e70110acf7"; + }; + }; + "conf-1.4.0" = { + name = "conf"; + packageName = "conf"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conf/-/conf-1.4.0.tgz"; + sha512 = "07g80zfanxf96as7ikxbv6csskj2033zw2hj8jpii0s3wqxjyq1x73fk1bqnj833clsmmiz6khcvid668gji5vsnhgb67ck5mcmafbg"; + }; + }; + "config-0.4.15" = { + name = "config"; + packageName = "config"; + version = "0.4.15"; + src = fetchurl { + url = "https://registry.npmjs.org/config/-/config-0.4.15.tgz"; + sha1 = "d43ddf58b8df5637fdd1314fc816ccae7bfbcd18"; + }; + }; + "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-1.4.0" = { + name = "configstore"; + packageName = "configstore"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/configstore/-/configstore-1.4.0.tgz"; + sha1 = "c35781d0501d268c25c54b8b17f6240e8a4fb021"; + }; + }; + "configstore-2.1.0" = { + name = "configstore"; + packageName = "configstore"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz"; + sha1 = "737a3a7036e9886102aa6099e47bb33ab1aba1a1"; + }; + }; + "configstore-3.1.1" = { + name = "configstore"; + packageName = "configstore"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz"; + sha512 = "2zmidvkp20q25yv6a5d7k1daawdg0w6ppgayxzpwfhyvmgwybkkv7ni0j4b2j9c8wjn8z33zf5d4bjr8jywb5qixc75vypyy87n90z6"; + }; + }; + "connect-1.9.2" = { + name = "connect"; + packageName = "connect"; + version = "1.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/connect/-/connect-1.9.2.tgz"; + sha1 = "42880a22e9438ae59a8add74e437f58ae8e52807"; + }; + }; + "connect-2.11.0" = { + name = "connect"; + packageName = "connect"; + version = "2.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/connect/-/connect-2.11.0.tgz"; + sha1 = "9991ce09ff9b85d9ead27f9d41d0b2a2df2f9284"; + }; + }; + "connect-2.3.9" = { + name = "connect"; + packageName = "connect"; + version = "2.3.9"; + src = fetchurl { + url = "https://registry.npmjs.org/connect/-/connect-2.3.9.tgz"; + sha1 = "4d26ddc485c32e5a1cf1b35854823b4720d25a52"; + }; + }; + "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-2.7.6" = { + name = "connect"; + packageName = "connect"; + version = "2.7.6"; + src = fetchurl { + url = "https://registry.npmjs.org/connect/-/connect-2.7.6.tgz"; + sha1 = "b83b68fa6f245c5020e2395472cc8322b0060738"; + }; + }; + "connect-3.5.1" = { + name = "connect"; + packageName = "connect"; + version = "3.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/connect/-/connect-3.5.1.tgz"; + sha1 = "6d30d7a63c7f170857a6b3aa6b363d973dca588e"; + }; + }; + "connect-3.6.5" = { + name = "connect"; + packageName = "connect"; + version = "3.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/connect/-/connect-3.6.5.tgz"; + sha1 = "fb8dde7ba0763877d0ec9df9dac0b4b40e72c7da"; + }; + }; + "connect-busboy-0.0.2" = { + name = "connect-busboy"; + packageName = "connect-busboy"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/connect-busboy/-/connect-busboy-0.0.2.tgz"; + sha1 = "ac5c9c96672171885e576c66b2bfd95d3bb11097"; + }; + }; + "connect-flash-0.1.0" = { + name = "connect-flash"; + packageName = "connect-flash"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/connect-flash/-/connect-flash-0.1.0.tgz"; + sha1 = "82b381d61a12b651437df1c259c1f1c841239b88"; + }; + }; + "connect-multiparty-2.1.0" = { + name = "connect-multiparty"; + packageName = "connect-multiparty"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/connect-multiparty/-/connect-multiparty-2.1.0.tgz"; + sha512 = "2im4bqk3xwxwilkg8gli3pblmalbhsd4wl5w10p63bvl0jd3m0qp5by840k5s7dr8wi0krixp2297bn76v38dwgznja4h4wp6my3g0c"; + }; + }; + "connect-pause-0.1.1" = { + name = "connect-pause"; + packageName = "connect-pause"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/connect-pause/-/connect-pause-0.1.1.tgz"; + sha1 = "b269b2bb82ddb1ac3db5099c0fb582aba99fb37a"; + }; + }; + "connect-restreamer-1.0.3" = { + name = "connect-restreamer"; + packageName = "connect-restreamer"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/connect-restreamer/-/connect-restreamer-1.0.3.tgz"; + sha1 = "a73f04d88e7292d7fd2f2d7d691a0cdeeed141a9"; + }; + }; + "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"; + }; + }; + "connection-parse-0.0.7" = { + name = "connection-parse"; + packageName = "connection-parse"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz"; + sha1 = "18e7318aab06a699267372b10c5226d25a1c9a69"; + }; + }; + "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-browserify-1.1.0" = { + name = "console-browserify"; + packageName = "console-browserify"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz"; + sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "constantinople-3.1.0" = { + name = "constantinople"; + packageName = "constantinople"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/constantinople/-/constantinople-3.1.0.tgz"; + sha1 = "7569caa8aa3f8d5935d62e1fa96f9f702cd81c79"; + }; + }; + "constants-browserify-1.0.0" = { + name = "constants-browserify"; + packageName = "constants-browserify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz"; + sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; + }; + }; + "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/consume-http-header/-/consume-http-header-1.0.0.tgz"; + sha1 = "95976d74f7f1b38dfb13fd9b3b68b91a0240556f"; + }; + }; + "consume-until-1.0.0" = { + name = "consume-until"; + packageName = "consume-until"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/consume-until/-/consume-until-1.0.0.tgz"; + sha1 = "75b91fa9f16663e51f98e863af995b9164068c1a"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "continuable-cache-0.3.1" = { + name = "continuable-cache"; + packageName = "continuable-cache"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz"; + sha1 = "bd727a7faed77e71ff3985ac93351a912733ad0f"; }; }; "conventional-changelog-1.1.7" = { @@ -17550,15 +5243,6 @@ let sha1 = "9151a62b1d8edb2d82711dabf5b7cf71041f82b1"; }; }; - "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"; - }; - }; "conventional-changelog-angular-1.6.0" = { name = "conventional-changelog-angular"; packageName = "conventional-changelog-angular"; @@ -17577,6 +5261,15 @@ let sha1 = "12595ad5267a6937c34cf900281b1c65198a4c63"; }; }; + "conventional-changelog-cli-1.3.5" = { + name = "conventional-changelog-cli"; + packageName = "conventional-changelog-cli"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.5.tgz"; + sha1 = "46c51496216b7406588883defa6fac589e9bb31e"; + }; + }; "conventional-changelog-codemirror-0.2.1" = { name = "conventional-changelog-codemirror"; packageName = "conventional-changelog-codemirror"; @@ -17649,24 +5342,6 @@ let sha1 = "86139bb3ac99899f2b177e9617e09b37d99bcf3a"; }; }; - "compare-func-1.3.2" = { - name = "compare-func"; - packageName = "compare-func"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/compare-func/-/compare-func-1.3.2.tgz"; - sha1 = "99dd0ba457e1f9bc722b12c08ec33eeab31fa648"; - }; - }; - "array-ify-1.0.0" = { - name = "array-ify"; - packageName = "array-ify"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz"; - sha1 = "9e528762b4a9066ad163a6962a364418e9626ece"; - }; - }; "conventional-changelog-writer-2.0.3" = { name = "conventional-changelog-writer"; packageName = "conventional-changelog-writer"; @@ -17676,6 +5351,15 @@ let sha512 = "1nchhqyp5qmrwqn9yxrkn8zjhlk1ph5jgnky26lzkrd1j4lh2n93602xw1zm6gv7qg48r61qzk5qh74v480nx4q7d8zilfb8pnn2kfq"; }; }; + "conventional-commits-filter-1.1.1" = { + name = "conventional-commits-filter"; + packageName = "conventional-commits-filter"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.1.1.tgz"; + sha512 = "0jrsm3hlyq0a425d320l1rghxmmb621r0bcvlsfbdichzbyimflwn7wz1mhw62kdnr3wxskdpaq11f5qpdsz5g2d5f7ha4d4jvrl33d"; + }; + }; "conventional-commits-parser-2.1.0" = { name = "conventional-commits-parser"; packageName = "conventional-commits-parser"; @@ -17685,6 +5369,978 @@ let sha512 = "0mnckb77dj8jk9xspzh6q0kaybc5wyb2ny94qgnvbj5f1yjnk7s2sak86b0h3dhrfk4y9nncwfjpvsg8iyiary68sdbwrbl4gkz9h7h"; }; }; + "conventional-recommended-bump-1.1.0" = { + name = "conventional-recommended-bump"; + packageName = "conventional-recommended-bump"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conventional-recommended-bump/-/conventional-recommended-bump-1.1.0.tgz"; + sha512 = "3gh833x8hqmnxfmacs3ryrb2gh3y397ddkiwisv6g3dfz6j617i1fm22yq3r83y40pidmf1n77qzvwmbx4ws7jn4yydfxypi6fhgbaq"; + }; + }; + "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/convert-source-map/-/convert-source-map-1.1.3.tgz"; + sha1 = "4829c877e9fe49b3161f3bf3673888e204699860"; + }; + }; + "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/convert-source-map/-/convert-source-map-1.5.1.tgz"; + sha1 = "b8278097b9bc229365de5c62cf5fcaed8b5599e5"; + }; + }; + "cookie-0.0.4" = { + name = "cookie"; + packageName = "cookie"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.0.4.tgz"; + sha1 = "5456bd47aee2666eac976ea80a6105940483fe98"; + }; + }; + "cookie-0.0.5" = { + name = "cookie"; + packageName = "cookie"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.0.5.tgz"; + sha1 = "f9acf9db57eb7568c9fcc596256b7bb22e307c81"; + }; + }; + "cookie-0.1.0" = { + name = "cookie"; + packageName = "cookie"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.1.0.tgz"; + sha1 = "90eb469ddce905c866de687efc43131d8801f9d0"; + }; + }; + "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"; + }; + }; + "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-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-jar-0.2.0" = { + name = "cookie-jar"; + packageName = "cookie-jar"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-jar/-/cookie-jar-0.2.0.tgz"; + sha1 = "64ecc06ac978db795e4b5290cbe48ba3781400fa"; + }; + }; + "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-parser-1.4.3" = { + name = "cookie-parser"; + packageName = "cookie-parser"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.3.tgz"; + sha1 = "0fe31fa19d000b95f4aadf1f53fdc2b8a203baa5"; + }; + }; + "cookie-signature-1.0.1" = { + name = "cookie-signature"; + packageName = "cookie-signature"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.1.tgz"; + sha1 = "44e072148af01e6e8e24afbf12690d68ae698ecb"; + }; + }; + "cookie-signature-1.0.5" = { + name = "cookie-signature"; + packageName = "cookie-signature"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.5.tgz"; + sha1 = "a122e3f1503eca0f5355795b0711bb2368d450f9"; + }; + }; + "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"; + }; + }; + "cookie-signature-1.1.0" = { + name = "cookie-signature"; + packageName = "cookie-signature"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.1.0.tgz"; + sha512 = "3h44zl7m31c7zzyyc3lxzckqyz6rmg5xydp2clpnf2vm3928garan768x7pmh1n52xnpgwdlkz78cfsy9spg93wpbg4xav0spbyqnq2"; + }; + }; + "cookiejar-2.0.1" = { + name = "cookiejar"; + packageName = "cookiejar"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.0.1.tgz"; + sha1 = "3d12752f6adf68a892f332433492bd5812bb668f"; + }; + }; + "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"; + }; + }; + "cookies-0.7.1" = { + name = "cookies"; + packageName = "cookies"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cookies/-/cookies-0.7.1.tgz"; + sha1 = "7c8a615f5481c61ab9f16c833731bcb8f663b99b"; + }; + }; + "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"; + }; + }; + "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/cordova-app-hello-world/-/cordova-app-hello-world-3.12.0.tgz"; + sha1 = "270e06b67b2ae94bcfee6592ed39eb42303d186f"; + }; + }; + "cordova-common-2.2.1" = { + name = "cordova-common"; + packageName = "cordova-common"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cordova-common/-/cordova-common-2.2.1.tgz"; + sha1 = "7009bc591729caa7285a588cfd6a7b54cd834f0c"; + }; + }; + "cordova-create-1.1.2" = { + name = "cordova-create"; + packageName = "cordova-create"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cordova-create/-/cordova-create-1.1.2.tgz"; + sha1 = "83b09271b378d1c03bc7d9a786fedd60485c3ccf"; + }; + }; + "cordova-fetch-1.3.0" = { + name = "cordova-fetch"; + packageName = "cordova-fetch"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cordova-fetch/-/cordova-fetch-1.3.0.tgz"; + sha1 = "4986d0779b36eb239822c2ab413a47ff9f097fea"; + }; + }; + "cordova-js-4.2.2" = { + name = "cordova-js"; + packageName = "cordova-js"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cordova-js/-/cordova-js-4.2.2.tgz"; + sha1 = "a7eb20911e6a59f15ac64e7db6ec543df31c2f92"; + }; + }; + "cordova-lib-8.0.0" = { + name = "cordova-lib"; + packageName = "cordova-lib"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-8.0.0.tgz"; + sha1 = "864bd5de6b79fc4944361460aa3214e59da936f2"; + }; + }; + "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/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz"; + sha1 = "e244b9185b8175473bff6079324905115f83dc7c"; + }; + }; + "cordova-serve-2.0.0" = { + name = "cordova-serve"; + packageName = "cordova-serve"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-2.0.0.tgz"; + sha1 = "d7834b83b186607e2b8f1943e073c0633360ea43"; + }; + }; + "core-js-1.2.7" = { + name = "core-js"; + packageName = "core-js"; + version = "1.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz"; + sha1 = "652294c14651db28fa93bd2d5ff2983a4f08c636"; + }; + }; + "core-js-2.5.3" = { + name = "core-js"; + packageName = "core-js"; + version = "2.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz"; + sha1 = "8acc38345824f16d8365b7c9b4259168e8ed603e"; + }; + }; + "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"; + }; + }; + "cors-2.8.3" = { + name = "cors"; + packageName = "cors"; + version = "2.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cors/-/cors-2.8.3.tgz"; + sha1 = "4cf78e1d23329a7496b2fc2225b77ca5bb5eb802"; + }; + }; + "cors-2.8.4" = { + name = "cors"; + packageName = "cors"; + version = "2.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cors/-/cors-2.8.4.tgz"; + sha1 = "2bd381f2eb201020105cd50ea59da63090694686"; + }; + }; + "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"; + }; + }; + "couch-login-0.1.20" = { + name = "couch-login"; + packageName = "couch-login"; + version = "0.1.20"; + src = fetchurl { + url = "https://registry.npmjs.org/couch-login/-/couch-login-0.1.20.tgz"; + sha1 = "007c70ef80089dbae6f59eeeec37480799b39595"; + }; + }; + "crc-0.2.0" = { + name = "crc"; + packageName = "crc"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crc/-/crc-0.2.0.tgz"; + sha1 = "f4486b9bf0a12df83c3fca14e31e030fdabd9454"; + }; + }; + "crc-3.2.1" = { + name = "crc"; + packageName = "crc"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"; + sha1 = "5d9c8fb77a245cd5eca291e5d2d005334bab0082"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "crc-3.5.0" = { + name = "crc"; + packageName = "crc"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crc/-/crc-3.5.0.tgz"; + sha1 = "98b8ba7d489665ba3979f59b21381374101a1964"; + }; + }; + "crc32-stream-2.0.0" = { + name = "crc32-stream"; + packageName = "crc32-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crc32-stream/-/crc32-stream-2.0.0.tgz"; + sha1 = "e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "create-hash-1.1.3" = { + name = "create-hash"; + packageName = "create-hash"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz"; + sha1 = "606042ac8b9262750f483caddab0f5819172d8fd"; + }; + }; + "create-hmac-1.1.6" = { + name = "create-hmac"; + packageName = "create-hmac"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz"; + sha1 = "acb9e221a4e17bdb076e90657c42b93e3726cf06"; + }; + }; + "cron-1.2.1" = { + name = "cron"; + packageName = "cron"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cron/-/cron-1.2.1.tgz"; + sha1 = "3a86c09b41b8f261ac863a7cc85ea4735857eab2"; + }; + }; + "cross-spawn-4.0.0" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.0.tgz"; + sha1 = "8254774ab4786b8c5b3cf4dfba66ce563932c252"; + }; + }; + "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"; + }; + }; + "cross-spawn-async-2.2.5" = { + name = "cross-spawn-async"; + packageName = "cross-spawn-async"; + version = "2.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz"; + sha1 = "845ff0c0834a3ded9d160daca6d390906bb288cc"; + }; + }; + "crossroads-0.12.2" = { + name = "crossroads"; + packageName = "crossroads"; + version = "0.12.2"; + src = fetchurl { + url = "https://registry.npmjs.org/crossroads/-/crossroads-0.12.2.tgz"; + sha1 = "b1d5f9c1d98af3bdd61f1bda6a86dd1aee4ff8f2"; + }; + }; + "crx-parser-0.1.2" = { + name = "crx-parser"; + packageName = "crx-parser"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/crx-parser/-/crx-parser-0.1.2.tgz"; + sha1 = "7eeeed9eddc95e22c189382e34624044a89a5a6d"; + }; + }; + "crypt3-0.2.0" = { + name = "crypt3"; + packageName = "crypt3"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crypt3/-/crypt3-0.2.0.tgz"; + sha1 = "4bd28e0770fad421fc807745c1ef3010905b2332"; + }; + }; + "cryptiles-0.1.3" = { + name = "cryptiles"; + packageName = "cryptiles"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.1.3.tgz"; + sha1 = "1a556734f06d24ba34862ae9cb9e709a3afbff1c"; + }; + }; + "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"; + }; + }; + "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-0.0.3" = { + name = "crypto"; + packageName = "crypto"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/crypto/-/crypto-0.0.3.tgz"; + sha1 = "470a81b86be4c5ee17acc8207a1f5315ae20dbb0"; + }; + }; + "crypto-browserify-3.12.0" = { + name = "crypto-browserify"; + packageName = "crypto-browserify"; + version = "3.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz"; + sha512 = "1d3mrhqlay037azmjp2ml5a8yyls9ijdhilv6f0znz0ajgfm972yr9bhm78wqi09p4crc3shgflk50jc63zijsqv777ikkyi2j2qgkz"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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-parse-1.7.0" = { + name = "css-parse"; + packageName = "css-parse"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz"; + sha1 = "321f6cf73782a6ff751111390fc05e2c657d8c9b"; + }; + }; + "css-select-1.2.0" = { + name = "css-select"; + packageName = "css-select"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz"; + sha1 = "2b3a110539c5355f1cd8d314623e870b121ec858"; + }; + }; + "css-select-1.3.0-rc0" = { + name = "css-select"; + packageName = "css-select"; + version = "1.3.0-rc0"; + src = fetchurl { + url = "https://registry.npmjs.org/css-select/-/css-select-1.3.0-rc0.tgz"; + sha1 = "6f93196aaae737666ea1036a8cb14a8fcb7a9231"; + }; + }; + "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/css-select-base-adapter/-/css-select-base-adapter-0.1.0.tgz"; + sha1 = "0102b3d14630df86c3eb9fa9f5456270106cf990"; + }; + }; + "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"; + }; + }; + "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/css-tree/-/css-tree-1.0.0-alpha.27.tgz"; + sha512 = "08x63k8gxl9wgq7lljw7q5mlhwbcifkg7f6yakqcj8wfwv3xq5vj2glhrq826pbxi4az53akc76a6c4vhqablgvipbk5qldbks2j1h4"; + }; + }; + "css-tree-1.0.0-alpha25" = { + name = "css-tree"; + packageName = "css-tree"; + version = "1.0.0-alpha25"; + src = fetchurl { + url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha25.tgz"; + sha512 = "3a7768nyac729dk372kmbf8f28j0pajy699g45bs8vrlx605wiad3i692a8y58x437bvnfy7015lx08sxhm2vknmsi83a69dwnv2bjw"; + }; + }; + "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/css-url-regex/-/css-url-regex-1.1.0.tgz"; + sha1 = "83834230cc9f74c457de59eebd1543feeb83b7ec"; + }; + }; + "css-what-2.1.0" = { + name = "css-what"; + packageName = "css-what"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz"; + sha1 = "9467d032c38cfaefb9f2d79501253062f87fa1bd"; + }; + }; + "csslint-0.10.0" = { + name = "csslint"; + packageName = "csslint"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/csslint/-/csslint-0.10.0.tgz"; + sha1 = "3a6a04e7565c8e9d19beb49767c7ec96e8365805"; + }; + }; + "csso-3.5.0" = { + name = "csso"; + packageName = "csso"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/csso/-/csso-3.5.0.tgz"; + sha512 = "0rxlhy2ha4xjnw27ha5q8crvpqwydnhb4xnnsj2ba8i1r09n864ygl76lcjgnpnqp1qj5930qz8gnq76pwy6sr6hrb2gcfrzla67ljs"; + }; + }; + "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"; + }; + }; + "csv-0.4.6" = { + name = "csv"; + packageName = "csv"; + version = "0.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/csv/-/csv-0.4.6.tgz"; + sha1 = "8dbae7ddfdbaae62c1ea987c3e0f8a9ac737b73d"; + }; + }; + "csv-generate-0.0.6" = { + name = "csv-generate"; + packageName = "csv-generate"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/csv-generate/-/csv-generate-0.0.6.tgz"; + sha1 = "97e4e63ae46b21912cd9475bc31469d26f5ade66"; + }; + }; + "csv-parse-1.3.3" = { + name = "csv-parse"; + packageName = "csv-parse"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.3.3.tgz"; + sha1 = "d1cfd8743c2f849a0abb2fd544db56695d19a490"; + }; + }; + "csv-stringify-0.0.8" = { + name = "csv-stringify"; + packageName = "csv-stringify"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/csv-stringify/-/csv-stringify-0.0.8.tgz"; + sha1 = "52cc3b3dfc197758c55ad325a95be85071f9e51b"; + }; + }; + "ctype-0.5.2" = { + name = "ctype"; + packageName = "ctype"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"; + sha1 = "fe8091d468a373a0b0c9ff8bbfb3425c00973a1d"; + }; + }; + "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"; + }; + }; + "cuint-0.2.2" = { + name = "cuint"; + packageName = "cuint"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz"; + sha1 = "408086d409550c2631155619e9fa7bcadc3b991b"; + }; + }; + "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"; + }; + }; + "custom-event-1.0.1" = { + name = "custom-event"; + packageName = "custom-event"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz"; + sha1 = "5d02a46850adf1b4a317946a3928fccb5bfd0425"; + }; + }; + "cvss-1.0.2" = { + name = "cvss"; + packageName = "cvss"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cvss/-/cvss-1.0.2.tgz"; + sha1 = "df67e92bf12a796f49e928799c8db3ba74b9fcd6"; + }; + }; + "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"; + }; + }; + "cyclist-0.1.1" = { + name = "cyclist"; + packageName = "cyclist"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cyclist/-/cyclist-0.1.1.tgz"; + sha1 = "1bcfa56b081448cdb5e12bfc1bfad34b47fba8f3"; + }; + }; + "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"; + }; + }; + "dargs-4.1.0" = { + name = "dargs"; + packageName = "dargs"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dargs/-/dargs-4.1.0.tgz"; + sha1 = "03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"; + }; + }; + "dargs-5.1.0" = { + name = "dargs"; + packageName = "dargs"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dargs/-/dargs-5.1.0.tgz"; + sha1 = "ec7ea50c78564cd36c9d5ec18f66329fade27829"; + }; + }; + "dashdash-1.10.1" = { + name = "dashdash"; + packageName = "dashdash"; + version = "1.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.10.1.tgz"; + sha1 = "0abf1af89a8f5129a81f18c2b35b21df22622f60"; + }; + }; + "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"; + }; + }; + "dashdash-1.7.3" = { + name = "dashdash"; + packageName = "dashdash"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.7.3.tgz"; + sha1 = "bf533fedaa455ed8fee11519ebfb9ad66170dcdf"; + }; + }; + "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.0.0" = { + name = "dat-ignore"; + packageName = "dat-ignore"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-ignore/-/dat-ignore-2.0.0.tgz"; + sha512 = "1s78mv3ngs1v1cgpcp97y1xmns97m2r6gjkkrksl63j5d870vpsmmrhsfm1vw4q0dz4c1yfnfcpijlgbqai9c5d2zj1lz56rih0kxk8"; + }; + }; + "dat-json-1.0.1" = { + name = "dat-json"; + packageName = "dat-json"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-json/-/dat-json-1.0.1.tgz"; + sha512 = "13nn20vg6jx1h8ypazv9zn236hvv29wwq52mdbbfl77zrg8d7syni933v2mm3y1jsk25c7dc2gs1876fz0yblniryncnbjxrf0aq0nq"; + }; + }; + "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.6" = { + name = "dat-node"; + packageName = "dat-node"; + version = "3.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-node/-/dat-node-3.5.6.tgz"; + sha512 = "17i7n2n3bappi34pnv2240cr5baawf2ab8wf22bmlxx4xkcb5g0z24ycz542fsx8myn4fyjgfgdhwbv44f5sz1c4z7i7g4q3ah9n7zh"; + }; + }; + "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.0" = { + name = "dat-secret-storage"; + packageName = "dat-secret-storage"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-secret-storage/-/dat-secret-storage-4.0.0.tgz"; + sha1 = "01b219a5bc1619efc0f58122a3c6cebb1eb8b40a"; + }; + }; + "dat-storage-1.0.3" = { + name = "dat-storage"; + packageName = "dat-storage"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-storage/-/dat-storage-1.0.3.tgz"; + sha512 = "1n7gszxdkchx0bilz4phnanzmw00fkljwm9rl0z7cndi94xrb6pkzczh6x137xn62j9p7yp6nz24a82q8llsrlk3c1pwvn269cdx97a"; + }; + }; + "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"; + }; + }; + "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/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz"; + sha512 = "18vh45y1sdi44vwca9js1hpy9mjwb641dwnc0fm9y2x3pgivzjndjksrlpk65kp5g99lsy2z2m8a4907bj11118c95m2dqg6h6kv95w"; + }; + }; + "date-format-1.2.0" = { + name = "date-format"; + packageName = "date-format"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/date-format/-/date-format-1.2.0.tgz"; + sha1 = "615e828e233dd1ab9bb9ae0950e0ceccfa6ecad8"; + }; + }; + "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"; + }; + }; + "date-utils-1.2.21" = { + name = "date-utils"; + packageName = "date-utils"; + version = "1.2.21"; + src = fetchurl { + url = "https://registry.npmjs.org/date-utils/-/date-utils-1.2.21.tgz"; + sha1 = "61fb16cdc1274b3c9acaaffe9fc69df8720a2b64"; + }; + }; "dateformat-1.0.12" = { name = "dateformat"; packageName = "dateformat"; @@ -17694,6 +6350,3661 @@ let sha1 = "9f124b67594c937ff706932e4a642cca8dbbfee9"; }; }; + "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/dateformat/-/dateformat-1.0.2-1.2.3.tgz"; + sha1 = "b0220c02de98617433b72851cf47de3df2cdbee9"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "deasync-0.1.12" = { + name = "deasync"; + packageName = "deasync"; + version = "0.1.12"; + src = fetchurl { + url = "https://registry.npmjs.org/deasync/-/deasync-0.1.12.tgz"; + sha512 = "1vnaqczk6nr30xzzf6qxsaa2fj00z80rr6xrb7mxwn0d41zdwrgffk5vizwf6b17bps2zdr4f87s2mdmnixhsfh41vrh185ixi9r5l2"; + }; + }; + "debounce-1.1.0" = { + name = "debounce"; + packageName = "debounce"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debounce/-/debounce-1.1.0.tgz"; + sha512 = "10r1pg8azrc8k3sfc6kslhcnpjl0acgv0fvpmd6q01vxbi496hnxnjx1i7fs66f598g4qzy2h079kzh18qpf9wxsz1ighb52myll1b5"; + }; + }; + "debounced-seeker-1.0.0" = { + name = "debounced-seeker"; + packageName = "debounced-seeker"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debounced-seeker/-/debounced-seeker-1.0.0.tgz"; + sha1 = "e74befcd1a62ae7a5e5fbfbfa6f5d2bacd962bdd"; + }; + }; + "debug-0.5.0" = { + name = "debug"; + packageName = "debug"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-0.5.0.tgz"; + sha1 = "9d48c946fb7d7d59807ffe07822f515fd76d7a9e"; + }; + }; + "debug-0.6.0" = { + name = "debug"; + packageName = "debug"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-0.6.0.tgz"; + sha1 = "ce9d5d025d5294b3f0748a494bebaf3c9fd8734f"; + }; + }; + "debug-0.7.4" = { + name = "debug"; + packageName = "debug"; + version = "0.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"; + sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39"; + }; + }; + "debug-1.0.5" = { + name = "debug"; + packageName = "debug"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-1.0.5.tgz"; + sha1 = "f7241217430f99dec4c2b473eab92228e874c2ac"; + }; + }; + "debug-2.1.3" = { + name = "debug"; + packageName = "debug"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz"; + sha1 = "ce8ab1b5ee8fbee2bfa3b633cab93d366b63418e"; + }; + }; + "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.3.3" = { + name = "debug"; + packageName = "debug"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz"; + sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c"; + }; + }; + "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"; + }; + }; + "debug-2.6.7" = { + name = "debug"; + packageName = "debug"; + version = "2.6.7"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz"; + sha1 = "92bad1f6d05bbb6bba22cca88bcd0ec894c2861e"; + }; + }; + "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"; + }; + }; + "decamelize-2.0.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz"; + sha512 = "0zc3slyk7cc9xjfcnw3nk2d1vkq4kxrjalavqgp3zykbgnp5v12xcs47kr436k0izbzyxhkrdww94p5g1lcmzcdqncc9p0mqzk6jji2"; + }; + }; + "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-response-3.3.0" = { + name = "decompress-response"; + packageName = "decompress-response"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz"; + sha1 = "80a4dd323748384bfa248083622aedec982adff3"; + }; + }; + "decompress-zip-0.3.0" = { + name = "decompress-zip"; + packageName = "decompress-zip"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-zip/-/decompress-zip-0.3.0.tgz"; + sha1 = "ae3bcb7e34c65879adfe77e19c30f86602b4bdb0"; + }; + }; + "dedent-0.7.0" = { + name = "dedent"; + packageName = "dedent"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz"; + sha1 = "2495ddbaf6eb874abb0e1be9df22d2e5a544326c"; + }; + }; + "deep-eql-3.0.1" = { + name = "deep-eql"; + packageName = "deep-eql"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz"; + sha512 = "1rrbk0h0a836gj1x6lalzgqfs0v34d4fswq23c8lxzmb6k7pna45zd509h1r1fr312n4qml94xqlmzzga40sfa9vnzf6rkr4d1qh1zr"; + }; + }; + "deep-equal-0.1.2" = { + name = "deep-equal"; + packageName = "deep-equal"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-0.1.2.tgz"; + sha1 = "b246c2b80a570a47c11be1d9bd1070ec878b87ce"; + }; + }; + "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-equal-1.0.1" = { + name = "deep-equal"; + packageName = "deep-equal"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz"; + sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5"; + }; + }; + "deep-extend-0.2.11" = { + name = "deep-extend"; + packageName = "deep-extend"; + version = "0.2.11"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz"; + sha1 = "7a16ba69729132340506170494bc83f7076fe08f"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "deepcopy-0.6.3" = { + name = "deepcopy"; + packageName = "deepcopy"; + version = "0.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/deepcopy/-/deepcopy-0.6.3.tgz"; + sha1 = "634780f2f8656ab771af8fa8431ed1ccee55c7b0"; + }; + }; + "deepmerge-1.5.2" = { + name = "deepmerge"; + packageName = "deepmerge"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz"; + sha512 = "2sylzgq5rwi12ac5y4fbvyyhs128zlcrp1q1i0bkp27fvlg60hr1slxzckk22x2rzgmwsqqlvzyylm9v0gwzbsbprd3c1mg78c396gp"; + }; + }; + "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"; + }; + }; + "default-uid-1.0.0" = { + name = "default-uid"; + packageName = "default-uid"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/default-uid/-/default-uid-1.0.0.tgz"; + sha1 = "fcefa9df9f5ac40c8916d912dd1fe1146aa3c59e"; + }; + }; + "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"; + }; + }; + "deferred-leveldown-0.2.0" = { + name = "deferred-leveldown"; + packageName = "deferred-leveldown"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-0.2.0.tgz"; + sha1 = "2cef1f111e1c57870d8bbb8af2650e587cd2f5b4"; + }; + }; + "define-properties-1.1.2" = { + name = "define-properties"; + packageName = "define-properties"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz"; + sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "defined-1.0.0" = { + name = "defined"; + packageName = "defined"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz"; + sha1 = "c98d9bcef75674188e110969151199e39b1fa693"; + }; + }; + "degenerator-1.0.4" = { + name = "degenerator"; + packageName = "degenerator"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/degenerator/-/degenerator-1.0.4.tgz"; + sha1 = "fcf490a37ece266464d9cc431ab98c5819ced095"; + }; + }; + "del-2.2.2" = { + name = "del"; + packageName = "del"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/del/-/del-2.2.2.tgz"; + sha1 = "c12c981d067846c84bcaf862cff930d907ffd1a8"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "dep-graph-1.1.0" = { + name = "dep-graph"; + packageName = "dep-graph"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dep-graph/-/dep-graph-1.1.0.tgz"; + sha1 = "fade86a92799a813e9b42511cdf3dfa6cc8dbefe"; + }; + }; + "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.1" = { + name = "depd"; + packageName = "depd"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz"; + sha1 = "5783b4e1c459f06fa5ca27f991f3d06e7a310359"; + }; + }; + "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"; + }; + }; + "dependency-ls-1.1.1" = { + name = "dependency-ls"; + packageName = "dependency-ls"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dependency-ls/-/dependency-ls-1.1.1.tgz"; + sha1 = "0481b07f023d74ce311192e5c690d13e18600054"; + }; + }; + "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"; + }; + }; + "deps-sort-2.0.0" = { + name = "deps-sort"; + packageName = "deps-sort"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.0.tgz"; + sha1 = "091724902e84658260eb910748cccd1af6e21fb5"; + }; + }; + "des.js-1.0.0" = { + name = "des.js"; + packageName = "des.js"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz"; + sha1 = "c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"; + }; + }; + "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"; + }; + }; + "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-file-1.0.0" = { + name = "detect-file"; + packageName = "detect-file"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz"; + sha1 = "f0d66d03672a825cb1b73bdb3fe62310c8e552b7"; + }; + }; + "detect-indent-4.0.0" = { + name = "detect-indent"; + packageName = "detect-indent"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz"; + sha1 = "f76d064352cdf43a1cb6ce619c4ee3a9475de208"; + }; + }; + "detect-indent-5.0.0" = { + name = "detect-indent"; + packageName = "detect-indent"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz"; + sha1 = "3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"; + }; + }; + "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"; + }; + }; + "detect-port-1.2.2" = { + name = "detect-port"; + packageName = "detect-port"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-port/-/detect-port-1.2.2.tgz"; + sha512 = "2q44vf4c9rqz21wc7a1pj1xz6pa2s7sp2fz9zxksmz679xh8sbfzyzhgkkbyznsgbnif013n0a6387dppcs370gdkc0dhh2jgsgv8fk"; + }; + }; + "detective-4.7.1" = { + name = "detective"; + packageName = "detective"; + version = "4.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz"; + sha512 = "259c687nsmq5ni5q79081s6lpd2srwn7xlwipxwbrqkq9bq0zsvwb0n1d99jc7c6kvpm95bhvvlncfb0l4hqy6vnlb5lrhwwmwyd8qz"; + }; + }; + "detective-5.0.2" = { + name = "detective"; + packageName = "detective"; + version = "5.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/detective/-/detective-5.0.2.tgz"; + sha512 = "0q6jv51mrwjp7ws5xdfpi49rq6ywl0fcl70hllsxiyqy4c89k14v0g9fj5g4y690n8yqw9vxxq6zgnw8lpwbsdvlgyhdqz3xjhhnjrm"; + }; + }; + "di-0.0.1" = { + name = "di"; + packageName = "di"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/di/-/di-0.0.1.tgz"; + sha1 = "806649326ceaa7caa3306d75d985ea2748ba913c"; + }; + }; + "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.0.8" = { + name = "diff"; + packageName = "diff"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-1.0.8.tgz"; + sha1 = "343276308ec991b7bc82267ed55bc1411f971666"; + }; + }; + "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.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"; + }; + }; + "diff-3.3.1" = { + name = "diff"; + packageName = "diff"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz"; + sha512 = "31pj7v5gg5igmvwzk6zxw1wbvwjg6m9sfl0h3bs1x4q6idcw98vr8z8wcqk2603q0blpqkmkxp659kjj91wksr03yr8xlh16djcg8rh"; + }; + }; + "diff-3.4.0" = { + name = "diff"; + packageName = "diff"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-3.4.0.tgz"; + sha512 = "1qawya1qhgy4q0bgx0s9ryfz70ddrgyj33rdnnppzszi7x31iir66y7v89kc82lr7prkafrax9sa6w5ssxykqmcf1xw291864qnx5a2"; + }; + }; + "diff2html-2.3.3" = { + name = "diff2html"; + packageName = "diff2html"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/diff2html/-/diff2html-2.3.3.tgz"; + sha1 = "31bb815881c975634c7f3907a5e789341e1560bc"; + }; + }; + "diffie-hellman-5.0.2" = { + name = "diffie-hellman"; + packageName = "diffie-hellman"; + version = "5.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz"; + sha1 = "b5835739270cfe26acf632099fded2a07f209e5e"; + }; + }; + "director-1.2.7" = { + name = "director"; + packageName = "director"; + version = "1.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/director/-/director-1.2.7.tgz"; + sha1 = "bfd3741075fd7fb1a5b2e13658c5f4bec77736f3"; + }; + }; + "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.4.7" = { + name = "discovery-channel"; + packageName = "discovery-channel"; + version = "5.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/discovery-channel/-/discovery-channel-5.4.7.tgz"; + sha512 = "3c8npbdr7r6725kkj76h5zy72l3gd8ndb3dy4dwbapxapfzccl9f6iy0zdy3wxywcfb6cc64w4mf089v00rcr1aqcjdlvn483pnzs78"; + }; + }; + "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"; + }; + }; + "dispensary-0.12.0" = { + name = "dispensary"; + packageName = "dispensary"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dispensary/-/dispensary-0.12.0.tgz"; + sha1 = "cc491bbbfa66a57414c958c68582a4c8703ff159"; + }; + }; + "diveSync-0.3.0" = { + name = "diveSync"; + packageName = "diveSync"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diveSync/-/diveSync-0.3.0.tgz"; + sha1 = "d9980493ae33beec36f4fec6f171ff218130cc12"; + }; + }; + "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-equal-1.0.0" = { + name = "dns-equal"; + packageName = "dns-equal"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz"; + sha1 = "b39e7f1da6eb0a75ba9c17324b34753c47e0654d"; + }; + }; + "dns-js-0.2.1" = { + name = "dns-js"; + packageName = "dns-js"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-js/-/dns-js-0.2.1.tgz"; + sha1 = "5d66629b3c0e6a5eb0e14f0ae701d05f6ea46673"; + }; + }; + "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-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-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"; + }; + }; + "dnscache-1.0.1" = { + name = "dnscache"; + packageName = "dnscache"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dnscache/-/dnscache-1.0.1.tgz"; + sha1 = "42cb2b9bfb5e8fbdfa395aac74e127fc05074d31"; + }; + }; + "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/docker-parse-image/-/docker-parse-image-3.0.1.tgz"; + sha1 = "33dc69291eac3414f84871f2d59d77b6f6948be4"; + }; + }; + "doctoc-1.3.0" = { + name = "doctoc"; + packageName = "doctoc"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/doctoc/-/doctoc-1.3.0.tgz"; + sha1 = "7f0839851dd58c808a2cae55d9504e012d08ee30"; + }; + }; + "doctrine-2.1.0" = { + name = "doctrine"; + packageName = "doctrine"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz"; + sha512 = "0iz6zh5d0kqs0ndd1ydsj4vaf2x3k3p0k5a7b75gsbhkqaqqq93dgsa2bpifvw7svck2sndd21mv7mp60q111rbghpssp0rxs9956fz"; + }; + }; + "doctypes-1.1.0" = { + name = "doctypes"; + packageName = "doctypes"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz"; + sha1 = "ea80b106a87538774e8a3a4a5afe293de489e0a9"; + }; + }; + "dom-serialize-2.2.1" = { + name = "dom-serialize"; + packageName = "dom-serialize"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz"; + sha1 = "562ae8999f44be5ea3076f5419dcd59eb43ac95b"; + }; + }; + "dom-serializer-0.0.1" = { + name = "dom-serializer"; + packageName = "dom-serializer"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.0.1.tgz"; + sha1 = "9589827f1e32d22c37c829adabd59b3247af8eaf"; + }; + }; + "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"; + }; + }; + "dom-storage-2.0.2" = { + name = "dom-storage"; + packageName = "dom-storage"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-storage/-/dom-storage-2.0.2.tgz"; + sha1 = "ed17cbf68abd10e0aef8182713e297c5e4b500b0"; + }; + }; + "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"; + }; + }; + "domain-browser-1.1.7" = { + name = "domain-browser"; + packageName = "domain-browser"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz"; + sha1 = "867aa4b093faa05f1de08c06f4d7b21fdf8698bc"; + }; + }; + "domain-browser-1.2.0" = { + name = "domain-browser"; + packageName = "domain-browser"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz"; + sha512 = "1fcxv8rzfhs99afvhji7bs5ppxwn9mw040ixdgvkm6iabz72q61arly2lr57086rjn4g2vkb3rkih1cyc7z35kzv1jjciwyrs4g4y4f"; + }; + }; + "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"; + }; + }; + "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.2.1" = { + name = "domhandler"; + packageName = "domhandler"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/domhandler/-/domhandler-2.2.1.tgz"; + sha1 = "59df9dcd227e808b365ae73e1f6684ac3d946fc2"; + }; + }; + "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"; + }; + }; + "domhandler-2.4.1" = { + name = "domhandler"; + packageName = "domhandler"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz"; + sha1 = "892e47000a99be55bbf3774ffea0561d8879c259"; + }; + }; + "domino-1.0.30" = { + name = "domino"; + packageName = "domino"; + version = "1.0.30"; + src = fetchurl { + url = "https://registry.npmjs.org/domino/-/domino-1.0.30.tgz"; + sha512 = "1g3pbkg3gg3kjffah03vil47662ra58gckz5z8qymfgb9xq97k7vsd83410fmncbbll1p40rs0s4r0pgdypfvj9j2fq146j41dbqjla"; + }; + }; + "domutils-1.4.3" = { + name = "domutils"; + packageName = "domutils"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz"; + sha1 = "0865513796c6b306031850e175516baf80b72a6f"; + }; + }; + "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"; + }; + }; + "domutils-1.6.2" = { + name = "domutils"; + packageName = "domutils"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/domutils/-/domutils-1.6.2.tgz"; + sha1 = "1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"; + }; + }; + "dot-prop-3.0.0" = { + name = "dot-prop"; + packageName = "dot-prop"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz"; + sha1 = "1b708af094a49c9a0e7dbcad790aba539dac1177"; + }; + }; + "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"; + }; + }; + "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/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz"; + sha1 = "103d3527fd31528f40188130c841efdd78264e5c"; + }; + }; + "downgrade-root-1.2.2" = { + name = "downgrade-root"; + packageName = "downgrade-root"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/downgrade-root/-/downgrade-root-1.2.2.tgz"; + sha1 = "531319715b0e81ffcc22eb28478ba27643e12c6c"; + }; + }; + "dtrace-provider-0.6.0" = { + name = "dtrace-provider"; + packageName = "dtrace-provider"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.6.0.tgz"; + sha1 = "0b078d5517937d873101452d9146737557b75e51"; + }; + }; + "dtrace-provider-0.8.6" = { + name = "dtrace-provider"; + packageName = "dtrace-provider"; + version = "0.8.6"; + src = fetchurl { + url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.6.tgz"; + sha1 = "428a223afe03425d2cd6d6347fdf40c66903563d"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "duplexer2-0.1.4" = { + name = "duplexer2"; + packageName = "duplexer2"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz"; + sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1"; + }; + }; + "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.3" = { + name = "duplexify"; + packageName = "duplexify"; + version = "3.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.3.tgz"; + sha512 = "0c611ik2kv5wiqwfi5zjyx70dnw117lbr0wwqxqxc0hldnnfigiqyh5xr7x6267vs63jgvqkzvvwb3b1g37zkk3nx5dh5z8xbs07hl3"; + }; + }; + "each-async-1.1.1" = { + name = "each-async"; + packageName = "each-async"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/each-async/-/each-async-1.1.1.tgz"; + sha1 = "dee5229bdf0ab6ba2012a395e1b869abf8813473"; + }; + }; + "eachr-3.2.0" = { + name = "eachr"; + packageName = "eachr"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eachr/-/eachr-3.2.0.tgz"; + sha1 = "2c35e43ea086516f7997cf80b7aa64d55a4a4484"; + }; + }; + "easy-table-1.1.0" = { + name = "easy-table"; + packageName = "easy-table"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/easy-table/-/easy-table-1.1.0.tgz"; + sha1 = "86f9ab4c102f0371b7297b92a651d5824bc8cb73"; + }; + }; + "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"; + }; + }; + "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/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz"; + sha1 = "4bc926274ec3b5abb5016e7e1d60921ac262b2a1"; + }; + }; + "editions-1.3.3" = { + name = "editions"; + packageName = "editions"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/editions/-/editions-1.3.3.tgz"; + sha1 = "0907101bdda20fac3cbe334c27cbd0688dc99a5b"; + }; + }; + "editor-1.0.0" = { + name = "editor"; + packageName = "editor"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/editor/-/editor-1.0.0.tgz"; + sha1 = "60c7f87bd62bcc6a894fa8ccd6afb7823a24f742"; + }; + }; + "editorconfig-0.13.3" = { + name = "editorconfig"; + packageName = "editorconfig"; + version = "0.13.3"; + src = fetchurl { + url = "https://registry.npmjs.org/editorconfig/-/editorconfig-0.13.3.tgz"; + sha512 = "08ysphnfa9fynh31z9sbxq8nyw0v2w2q6xkvqpy13xr16mh58na9xrxjxj0r6vwr01xjna3jyz6njwbxw0dvyrq509y5fs2sm8fqj2s"; + }; + }; + "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"; + }; + }; + "ejs-0.8.3" = { + name = "ejs"; + packageName = "ejs"; + version = "0.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ejs/-/ejs-0.8.3.tgz"; + sha1 = "db8aac47ff80a7df82b4c82c126fe8970870626f"; + }; + }; + "ejs-2.5.7" = { + name = "ejs"; + packageName = "ejs"; + version = "2.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/ejs/-/ejs-2.5.7.tgz"; + sha1 = "cc872c168880ae3c7189762fd5ffc00896c9518a"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "elementtree-0.1.7" = { + name = "elementtree"; + packageName = "elementtree"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz"; + sha1 = "9ac91be6e52fb6e6244c4e54a4ac3ed8ae8e29c0"; + }; + }; + "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"; + }; + }; + "email-validator-1.1.1" = { + name = "email-validator"; + packageName = "email-validator"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/email-validator/-/email-validator-1.1.1.tgz"; + sha512 = "3ydmy134p48c4zswbvjllak53h545dmzsz77bwpfxjf7aw510yyg4w58pazc2yz9agm93rphfgglrlj9cfkfdygcg1rbv0vj4jhjixy"; + }; + }; + "emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" = { + name = "emitter"; + packageName = "emitter"; + version = "1.0.1"; + src = fetchurl { + name = "emitter-1.0.1.tar.gz"; + url = https://codeload.github.com/component/emitter/tar.gz/1.0.1; + sha256 = "0eae744826723877457f7a7ac7f31d68a5a060673b3a883f6a8e325bf48f313d"; + }; + }; + "emoji-regex-6.1.1" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.1.1.tgz"; + sha1 = "c6cd0ec1b0642e2a3c67a1137efc5e796da4f88e"; + }; + }; + "emoji-regex-6.1.3" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "6.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.1.3.tgz"; + sha1 = "ec79a3969b02d2ecf2b72254279bf99bc7a83932"; + }; + }; + "emojic-1.1.14" = { + name = "emojic"; + packageName = "emojic"; + version = "1.1.14"; + src = fetchurl { + url = "https://registry.npmjs.org/emojic/-/emojic-1.1.14.tgz"; + sha512 = "0j0wbbcyvx0qklz7xvqbv2w2n2vqzq5vhyv3jrnsvb775c0zr2bh7m3k7mh0aw6i4rbmgf8x6rw7bfvgzsh5hvlgj01w61xfml89b4z"; + }; + }; + "emojilib-2.2.12" = { + name = "emojilib"; + packageName = "emojilib"; + version = "2.2.12"; + src = fetchurl { + url = "https://registry.npmjs.org/emojilib/-/emojilib-2.2.12.tgz"; + sha512 = "2z6nk0nin1cmj81c54pxjyxgpa61d0g61sdn3swykk4j8n8mnba95m1s1cpjcr4wr96jhgyal1z4swd8pcazzp3a50msqir0vj4vcwq"; + }; + }; + "emojis-list-2.1.0" = { + name = "emojis-list"; + packageName = "emojis-list"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz"; + sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "end-of-stream-1.0.0" = { + name = "end-of-stream"; + packageName = "end-of-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz"; + sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e"; + }; + }; + "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/end-of-stream/-/end-of-stream-1.1.0.tgz"; + sha1 = "e9353258baa9108965efc41cb0ef8ade2f3cfb07"; + }; + }; + "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"; + }; + }; + "ends-with-0.2.0" = { + name = "ends-with"; + packageName = "ends-with"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ends-with/-/ends-with-0.2.0.tgz"; + sha1 = "2f9da98d57a50cfda4571ce4339000500f4e6b8a"; + }; + }; + "engine.io-1.3.1" = { + name = "engine.io"; + packageName = "engine.io"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io/-/engine.io-1.3.1.tgz"; + sha1 = "2d968308fffae5d17f5209b6775246e90d8a705e"; + }; + }; + "engine.io-1.8.5" = { + name = "engine.io"; + packageName = "engine.io"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.5.tgz"; + sha512 = "3ff3a0anvy48mmpay3jkzlrjvxmlclq823j8jmjfdhy48xpz1syz44bwr13zdh161x1vqzsclgwb6gvgrn9vymvq98qihrdr4hxcl4g"; + }; + }; + "engine.io-3.1.4" = { + name = "engine.io"; + packageName = "engine.io"; + version = "3.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io/-/engine.io-3.1.4.tgz"; + sha1 = "3d0211b70a552ce841ffc7da8627b301a9a4162e"; + }; + }; + "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/engine.io-client/-/engine.io-client-1.3.1.tgz"; + sha1 = "1c5a65d5c5af6d04b44c22c3dbcd95c39ed1c989"; + }; + }; + "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/engine.io-client/-/engine.io-client-1.8.5.tgz"; + sha512 = "1kfc2cmjw891x0i9cm9alm93db5s40h3n4a3zcpjha7nrvz0s7ggzpp2x2v8zmnhp9278amjdm0j5lfkn3qxan7nanzhl4m4wgy1101"; + }; + }; + "engine.io-client-3.1.4" = { + name = "engine.io-client"; + packageName = "engine.io-client"; + version = "3.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.4.tgz"; + sha1 = "4fcf1370b47163bd2ce9be2733972430350d4ea1"; + }; + }; + "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/engine.io-parser/-/engine.io-parser-1.0.6.tgz"; + sha1 = "d38813143a411cb3b914132ab05bf99e6f7a248e"; + }; + }; + "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/engine.io-parser/-/engine.io-parser-1.3.2.tgz"; + sha1 = "937b079f0007d0893ec56d46cb220b8cb435220a"; + }; + }; + "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/engine.io-parser/-/engine.io-parser-2.1.2.tgz"; + sha512 = "0rjbixsn5qvjwklnvvjdfz4wy85dk82zkvh6lk3znbd3p3isgr57a5kikgndr3xhhkv5zzvh4bfxbz7gqfsgijscyiiilgw78bwp2bl"; + }; + }; + "enhanced-resolve-2.3.0" = { + name = "enhanced-resolve"; + packageName = "enhanced-resolve"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-2.3.0.tgz"; + sha1 = "a115c32504b6302e85a76269d7a57ccdd962e359"; + }; + }; + "enhanced-resolve-3.4.1" = { + name = "enhanced-resolve"; + packageName = "enhanced-resolve"; + version = "3.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz"; + sha1 = "0421e339fd71419b3da13d129b3979040230476e"; + }; + }; + "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/ensure-posix-path/-/ensure-posix-path-1.0.2.tgz"; + sha1 = "a65b3e42d0b71cfc585eb774f9943c8d9b91b0c2"; + }; + }; + "ent-2.2.0" = { + name = "ent"; + packageName = "ent"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz"; + sha1 = "e964219325a21d05f44466a2f686ed6ce5f5dd1d"; + }; + }; + "entities-1.0.0" = { + name = "entities"; + packageName = "entities"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz"; + sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26"; + }; + }; + "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"; + }; + }; + "env-paths-1.0.0" = { + name = "env-paths"; + packageName = "env-paths"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/env-paths/-/env-paths-1.0.0.tgz"; + sha1 = "4168133b42bb05c38a35b1ae4397c8298ab369e0"; + }; + }; + "envconf-0.0.4" = { + name = "envconf"; + packageName = "envconf"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/envconf/-/envconf-0.0.4.tgz"; + sha1 = "85675afba237c43f98de2d46adc0e532a4dcf48b"; + }; + }; + "errno-0.1.6" = { + name = "errno"; + packageName = "errno"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/errno/-/errno-0.1.6.tgz"; + sha512 = "0vny3xisd56kx193rhv6vpccjxlajjn9ss5wk96l1ya8zbpkwbjrrgrm9wpfm3xc8apx8z9xb0kjkw0y5qnc6gy1hf2qsas79093hr2"; + }; + }; + "error-7.0.2" = { + name = "error"; + packageName = "error"; + version = "7.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/error/-/error-7.0.2.tgz"; + sha1 = "a5f75fff4d9926126ddac0ea5dc38e689153cb02"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "errorhandler-1.5.0" = { + name = "errorhandler"; + packageName = "errorhandler"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/errorhandler/-/errorhandler-1.5.0.tgz"; + sha1 = "eaba64ca5d542a311ac945f582defc336165d9f4"; + }; + }; + "es-abstract-1.10.0" = { + name = "es-abstract"; + packageName = "es-abstract"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.10.0.tgz"; + sha512 = "04nd5ylkfffc08vn5kjhz0saqh44nj19f5j3ahrrhf3zvc9da5rf6snnh63xv4gfhacjbax1jajzgqv4zpm77v806jf883a2w77zs7y"; + }; + }; + "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/es-to-primitive/-/es-to-primitive-1.1.1.tgz"; + sha1 = "45355248a88979034b6792e19bb81f2b7975dd0d"; + }; + }; + "es5-ext-0.10.38" = { + name = "es5-ext"; + packageName = "es5-ext"; + version = "0.10.38"; + src = fetchurl { + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.38.tgz"; + sha512 = "0m7d1yd67hb93gsxv7790h9ayxg3pwf3vgih9v2kxqvsg073wim7jgwf3z57lksdczxnqv2d8gm4mfk4b29f6rc27a7c09vz9w348wc"; + }; + }; + "es5class-2.3.1" = { + name = "es5class"; + packageName = "es5class"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es5class/-/es5class-2.3.1.tgz"; + sha1 = "42c5c18a9016bcb0db28a4d340ebb831f55d1b66"; + }; + }; + "es6-error-4.0.0" = { + name = "es6-error"; + packageName = "es6-error"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-error/-/es6-error-4.0.0.tgz"; + sha1 = "f094c7041f662599bb12720da059d6b9c7ff0f40"; + }; + }; + "es6-error-4.1.1" = { + name = "es6-error"; + packageName = "es6-error"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz"; + sha512 = "1b98y4j9fy6c2wm7ys3csnyfg8cn40sy2g958i45fdh5bnx1lkl19d4508aldabga5rm1q5hzxq68yjdyb8n6qxb8925x1b2cbzwvsj"; + }; + }; + "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-promise-2.3.0" = { + name = "es6-promise"; + packageName = "es6-promise"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz"; + sha1 = "96edb9f2fdb01995822b263dd8aadab6748181bc"; + }; + }; + "es6-promise-3.3.1" = { + name = "es6-promise"; + packageName = "es6-promise"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz"; + sha1 = "a08cdde84ccdbf34d027a1451bc91d4bcd28a613"; + }; + }; + "es6-promise-4.2.4" = { + name = "es6-promise"; + packageName = "es6-promise"; + version = "4.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz"; + sha512 = "10hlgvxhshjxlbwvm1gnf1b01sv1fmh191a97l0h5gmcs9am1b6x937wnhkvvj5fkin10qscii8pcwnp9rlnpkgnrhfdyk0a9jlvmzw"; + }; + }; + "es6-promisify-5.0.0" = { + name = "es6-promisify"; + packageName = "es6-promisify"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz"; + sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; + }; + }; + "es6-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-shim-0.21.1" = { + name = "es6-shim"; + packageName = "es6-shim"; + version = "0.21.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-shim/-/es6-shim-0.21.1.tgz"; + sha1 = "6621bce72e1ac80a6e1f002abd4e789f12489fd2"; + }; + }; + "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"; + }; + }; + "es6-weak-map-2.0.2" = { + name = "es6-weak-map"; + packageName = "es6-weak-map"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz"; + sha1 = "5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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-regexp-component-1.0.2" = { + name = "escape-regexp-component"; + packageName = "escape-regexp-component"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-regexp-component/-/escape-regexp-component-1.0.2.tgz"; + sha1 = "9c63b6d0b25ff2a88c3adbd18c5b61acc3b9faa2"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "escodegen-1.9.0" = { + name = "escodegen"; + packageName = "escodegen"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/escodegen/-/escodegen-1.9.0.tgz"; + sha512 = "0il8dp1bh3n1am3xx5pazmpjb5m8wzdn9xg1lgh4j8axvsy8v24i1171c04qafx0j4xsaq76j29ljq2srf4i3kdl3qbrn9psjy1hhxz"; + }; + }; + "escope-3.6.0" = { + name = "escope"; + packageName = "escope"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz"; + sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3"; + }; + }; + "eslint-3.19.0" = { + name = "eslint"; + packageName = "eslint"; + version = "3.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz"; + sha1 = "c8fc6201c7f40dd08941b87c085767386a679acc"; + }; + }; + "eslint-4.15.0" = { + name = "eslint"; + packageName = "eslint"; + version = "4.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-4.15.0.tgz"; + sha512 = "3l1j4qy0gqa8rkwpdsmkkbqcmbx23ym8h64d1bbj5i5ds5ks0g91myldzp0y25r6b3ba9646hy4i2jiad2jmm8h68z89i2larkvyhyc"; + }; + }; + "eslint-4.16.0" = { + name = "eslint"; + packageName = "eslint"; + version = "4.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-4.16.0.tgz"; + sha512 = "330nda1zwh0sqsxsfmlmhbg903gz6n9n4zy870gc2k95wrg1bc7jysfyn98nk2bd8p821xszpygp1vs1i7csapxfb3q2dp1n3hxamb1"; + }; + }; + "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/eslint-plugin-no-unsafe-innerhtml/-/eslint-plugin-no-unsafe-innerhtml-1.0.16.tgz"; + sha1 = "7d02878c8e9bf7916b88836d5ac122b42f151932"; + }; + }; + "eslint-scope-3.7.1" = { + name = "eslint-scope"; + packageName = "eslint-scope"; + version = "3.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz"; + sha1 = "3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"; + }; + }; + "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/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz"; + sha512 = "02hr99x8cnc80p9hn5si7mngqpzvvjkxmdv8sch68z0qpqwjdlx3j1w6d9rhr6wgcnqf1mrxyji8wvfddbf7xr13z2nzihv29gvyfdb"; + }; + }; + "espree-3.5.2" = { + name = "espree"; + packageName = "espree"; + version = "3.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/espree/-/espree-3.5.2.tgz"; + sha512 = "04mnrkdqs32w98h9sfkn9i9zkyqj69sz2q1kxpnmsryjnfd9jrpqqlwrik73a80mdz86xckbr7vayw1dwkxhhnbvs4zciqsiiwlm9xi"; + }; + }; + "esprima-1.0.4" = { + name = "esprima"; + packageName = "esprima"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz"; + sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"; + }; + }; + "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"; + }; + }; + "esprima-3.1.3" = { + name = "esprima"; + packageName = "esprima"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz"; + sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; + }; + }; + "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"; + }; + }; + "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/esprima-fb/-/esprima-fb-13001.1001.0-dev-harmony-fb.tgz"; + sha1 = "633acdb40d9bd4db8a1c1d68c06a942959fad2b0"; + }; + }; + "esquery-1.0.0" = { + name = "esquery"; + packageName = "esquery"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz"; + sha1 = "cfba8b57d7fba93f17298a8a006a04cda13d80fa"; + }; + }; + "esrecurse-4.2.0" = { + name = "esrecurse"; + packageName = "esrecurse"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz"; + sha1 = "fa9568d98d3823f9a41d91e902dcab9ea6e5b163"; + }; + }; + "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"; + }; + }; + "estraverse-4.2.0" = { + name = "estraverse"; + packageName = "estraverse"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz"; + sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13"; + }; + }; + "esutils-2.0.2" = { + name = "esutils"; + packageName = "esutils"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz"; + sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"; + }; + }; + "etag-1.5.1" = { + name = "etag"; + packageName = "etag"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz"; + sha1 = "54c50de04ee42695562925ac566588291be7e9ea"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "eve-0.5.4" = { + name = "eve"; + packageName = "eve"; + version = "0.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/eve/-/eve-0.5.4.tgz"; + sha1 = "67d080b9725291d7e389e34c26860dd97f1debaa"; + }; + }; + "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-0.5.3" = { + name = "event-stream"; + packageName = "event-stream"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/event-stream/-/event-stream-0.5.3.tgz"; + sha1 = "b77b9309f7107addfeab63f0c0eafd8db0bd8c1c"; + }; + }; + "event-stream-3.1.5" = { + name = "event-stream"; + packageName = "event-stream"; + version = "3.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/event-stream/-/event-stream-3.1.5.tgz"; + sha1 = "6cba5a3ae02a7e4967d65ad04ef12502a2fff66c"; + }; + }; + "event-stream-3.2.2" = { + name = "event-stream"; + packageName = "event-stream"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/event-stream/-/event-stream-3.2.2.tgz"; + sha1 = "f79f9984c07ee3fd9b44ffb3cd0422b13e24084d"; + }; + }; + "event-stream-3.3.4" = { + name = "event-stream"; + packageName = "event-stream"; + version = "3.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz"; + sha1 = "4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"; + }; + }; + "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/event-to-promise/-/event-to-promise-0.8.0.tgz"; + sha1 = "4b84f11772b6f25f7752fc74d971531ac6f5b626"; + }; + }; + "eventemitter2-0.4.14" = { + name = "eventemitter2"; + packageName = "eventemitter2"; + version = "0.4.14"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz"; + sha1 = "8f61b75cde012b2e9eb284d4545583b5643b61ab"; + }; + }; + "eventemitter2-3.0.2" = { + name = "eventemitter2"; + packageName = "eventemitter2"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-3.0.2.tgz"; + sha1 = "81c0edb739ffa64fb9f21bbcb1d2b419a5133512"; + }; + }; + "eventemitter3-0.1.6" = { + name = "eventemitter3"; + packageName = "eventemitter3"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-0.1.6.tgz"; + sha1 = "8c7ac44b87baab55cd50c828dc38778eac052ea5"; + }; + }; + "eventemitter3-1.2.0" = { + name = "eventemitter3"; + packageName = "eventemitter3"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz"; + sha1 = "1c86991d816ad1e504750e73874224ecf3bec508"; + }; + }; + "eventemitter3-3.0.0" = { + name = "eventemitter3"; + packageName = "eventemitter3"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.0.0.tgz"; + sha512 = "0jijxlrlxb3vf5xqxibisd132qzlh9ag6ckxgvz791d4rqrzvzc2mzzn86jx1bgbsym1wi0pgm017i4rd5m84g1d38n56zqvh5g2r7b"; + }; + }; + "events-1.1.1" = { + name = "events"; + packageName = "events"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/events/-/events-1.1.1.tgz"; + sha1 = "9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"; + }; + }; + "events.node-0.4.9" = { + name = "events.node"; + packageName = "events.node"; + version = "0.4.9"; + src = fetchurl { + url = "https://registry.npmjs.org/events.node/-/events.node-0.4.9.tgz"; + sha1 = "82998ea749501145fd2da7cf8ecbe6420fac02a4"; + }; + }; + "everyauth-0.4.5" = { + name = "everyauth"; + packageName = "everyauth"; + version = "0.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/everyauth/-/everyauth-0.4.5.tgz"; + sha1 = "282d358439d91c30fb4aa2320dc362edac7dd189"; + }; + }; + "evp_bytestokey-1.0.3" = { + name = "evp_bytestokey"; + packageName = "evp_bytestokey"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz"; + sha512 = "1wd18zxd7n42asa63aa4k1bdf58warg29c7c8cdzzkd4r1wva7qwzqnn52h8g8hqwj7bxjkk3ryghajrvz4i27h5bzp30p8hjiqdzgx"; + }; + }; + "execa-0.4.0" = { + name = "execa"; + packageName = "execa"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-0.4.0.tgz"; + sha1 = "4eb6467a36a095fabb2970ff9d5e3fb7bce6ebc3"; + }; + }; + "execa-0.6.3" = { + name = "execa"; + packageName = "execa"; + version = "0.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-0.6.3.tgz"; + sha1 = "57b69a594f081759c69e5370f0d17b9cb11658fe"; + }; + }; + "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"; + }; + }; + "execa-0.8.0" = { + name = "execa"; + packageName = "execa"; + version = "0.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-0.8.0.tgz"; + sha1 = "d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da"; + }; + }; + "execall-1.0.0" = { + name = "execall"; + packageName = "execall"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execall/-/execall-1.0.0.tgz"; + sha1 = "73d0904e395b3cab0658b08d09ec25307f29bb73"; + }; + }; + "exit-0.1.2" = { + name = "exit"; + packageName = "exit"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"; + sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c"; + }; + }; + "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"; + }; + }; + "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/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz"; + sha512 = "2kxcf7dq1q9z2wqwwfjagn77kpzg2zpjqf2kd3vj5drx576gwglbsfly2b1imabj3svgcz5xsx79kspq1xsdgm4wwg1fksfnjdgjv47"; + }; + }; + "expand-braces-0.1.2" = { + name = "expand-braces"; + packageName = "expand-braces"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz"; + sha1 = "488b1d1d2451cb3d3a6b192cfc030f44c5855fea"; + }; + }; + "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-0.1.1" = { + name = "expand-range"; + packageName = "expand-range"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz"; + sha1 = "4cb8eda0993ca56fa4f41fc42f3cbb4ccadff044"; + }; + }; + "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"; + }; + }; + "expand-template-1.1.0" = { + name = "expand-template"; + packageName = "expand-template"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-template/-/expand-template-1.1.0.tgz"; + sha512 = "34i2f4clwy5bpzgl137zwplybp5hn6ncxq0p794cx9m0crhgk31nfy0s8wp1v6hvw90h20c268r040g892dixy6zqq1xlm3ra8g0j4j"; + }; + }; + "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"; + }; + }; + "express-2.5.11" = { + name = "express"; + packageName = "express"; + version = "2.5.11"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-2.5.11.tgz"; + sha1 = "4ce8ea1f3635e69e49f0ebb497b6a4b0a51ce6f0"; + }; + }; + "express-3.2.0" = { + name = "express"; + packageName = "express"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-3.2.0.tgz"; + sha1 = "7b66d6c66b038038eedf452804222b3077374ae0"; + }; + }; + "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-3.4.4" = { + name = "express"; + packageName = "express"; + version = "3.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-3.4.4.tgz"; + sha1 = "0b63ae626c96b71b78d13dfce079c10351635a86"; + }; + }; + "express-4.11.2" = { + name = "express"; + packageName = "express"; + version = "4.11.2"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-4.11.2.tgz"; + sha1 = "8df3d5a9ac848585f00a0777601823faecd3b148"; + }; + }; + "express-4.15.3" = { + name = "express"; + packageName = "express"; + version = "4.15.3"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-4.15.3.tgz"; + sha1 = "bab65d0f03aa80c358408972fc700f916944b662"; + }; + }; + "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"; + }; + }; + "express-5.0.0-alpha.6" = { + name = "express"; + packageName = "express"; + version = "5.0.0-alpha.6"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-5.0.0-alpha.6.tgz"; + sha1 = "85dc44d7e90d4809041407f388f239b5bd2f681e"; + }; + }; + "express-handlebars-3.0.0" = { + name = "express-handlebars"; + packageName = "express-handlebars"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/express-handlebars/-/express-handlebars-3.0.0.tgz"; + sha1 = "80a070bb819b09e4af2ca6d0780f75ce05e75c2f"; + }; + }; + "express-json5-0.1.0" = { + name = "express-json5"; + packageName = "express-json5"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/express-json5/-/express-json5-0.1.0.tgz"; + sha1 = "114a514bd734b319e018a1bde337923cc455b836"; + }; + }; + "express-partials-0.0.6" = { + name = "express-partials"; + packageName = "express-partials"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/express-partials/-/express-partials-0.0.6.tgz"; + sha1 = "b2664f15c636d5248e60fdbe29131c4440552eda"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "express-session-1.15.6" = { + name = "express-session"; + packageName = "express-session"; + version = "1.15.6"; + src = fetchurl { + url = "https://registry.npmjs.org/express-session/-/express-session-1.15.6.tgz"; + sha512 = "100j4z1046rpprbjyf9gkbq2nzj9z8g0a5sfkrdzxv929j11l2p1a3mz2isr4pi58fhvbymsfzbaxhiv4f90x062wmh7d4q60fynjdg"; + }; + }; + "express-urlrewrite-1.2.0" = { + name = "express-urlrewrite"; + packageName = "express-urlrewrite"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/express-urlrewrite/-/express-urlrewrite-1.2.0.tgz"; + sha1 = "8e667b7761ff1c7ffdb0efa05d64035387c823eb"; + }; + }; + "ext-list-2.2.2" = { + name = "ext-list"; + packageName = "ext-list"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz"; + sha512 = "0a77zmipy5silq8yx7adj0hw82ccvshbs5alv3h8l0vk83lkm5m7pw6y2781wnbks8h98ixyn2q3q065l6m8pwbrhxa3bcvrf191r5v"; + }; + }; + "ext-name-3.0.0" = { + name = "ext-name"; + packageName = "ext-name"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ext-name/-/ext-name-3.0.0.tgz"; + sha1 = "07e4418737cb1f513c32c6ea48d8b8c8e0471abb"; + }; + }; + "extend-1.2.1" = { + name = "extend"; + packageName = "extend"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz"; + sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c"; + }; + }; + "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-1.1.1" = { + name = "external-editor"; + packageName = "external-editor"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/external-editor/-/external-editor-1.1.1.tgz"; + sha1 = "12d7b0db850f7ff7e7081baf4005700060c4600b"; + }; + }; + "external-editor-2.1.0" = { + name = "external-editor"; + packageName = "external-editor"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/external-editor/-/external-editor-2.1.0.tgz"; + sha512 = "366albydy3glqs8h6y7rdpdhmyffn7vaig5snw8cb1zmn22mgvfywr08jfbmqjiqc9pyjyaaqv6xz5sfy2j1y18590l4f8mji7j53hk"; + }; + }; + "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"; + }; + }; + "extract-opts-3.3.1" = { + name = "extract-opts"; + packageName = "extract-opts"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/extract-opts/-/extract-opts-3.3.1.tgz"; + sha1 = "5abbedc98c0d5202e3278727f9192d7e086c6be1"; + }; + }; + "extract-zip-1.5.0" = { + name = "extract-zip"; + packageName = "extract-zip"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.5.0.tgz"; + sha1 = "92ccf6d81ef70a9fa4c1747114ccef6d8688a6c4"; + }; + }; + "extract-zip-1.6.6" = { + name = "extract-zip"; + packageName = "extract-zip"; + version = "1.6.6"; + src = fetchurl { + url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.6.tgz"; + sha1 = "1290ede8d20d0872b429fd3f351ca128ec5ef85c"; + }; + }; + "extsprintf-1.0.0" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.0.tgz"; + sha1 = "4d58b815ace5bebfc4ebf03cf98b0a7604a99b86"; + }; + }; + "extsprintf-1.2.0" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.2.0.tgz"; + sha1 = "5ad946c22f5b32ba7f8cd7426711c6e8a3fc2529"; + }; + }; + "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"; + }; + }; + "extsprintf-1.4.0" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.0.tgz"; + sha1 = "e2689f8f356fad62cca65a3a91c5df5f9551692f"; + }; + }; + "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"; + }; + }; + "falafel-2.1.0" = { + name = "falafel"; + packageName = "falafel"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/falafel/-/falafel-2.1.0.tgz"; + sha1 = "96bb17761daba94f46d001738b3cedf3a67fe06c"; + }; + }; + "fancy-log-1.3.2" = { + name = "fancy-log"; + packageName = "fancy-log"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.2.tgz"; + sha1 = "f41125e3d84f2e7d89a43d06d958c8f78be16be1"; + }; + }; + "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-diff-1.1.2" = { + name = "fast-diff"; + packageName = "fast-diff"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz"; + sha512 = "2550z1qvyfv9js9vg2aaj57ji5d9hhg4f6zl4rf483d6xswv23ac6ipj8gbapv4sjx14dpcslqmnx1z78vvx4np4ad5mdrxwfvm98i9"; + }; + }; + "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/fast-json-parse/-/fast-json-parse-1.0.3.tgz"; + sha512 = "01vq6bwp36yjvywlw5jniq4ainn8jrwxsab76bv02j77ky26qm99097g7x6j8dqrjrhfgd0vs9q6nh2milhsnsk9529s42njilsq58m"; + }; + }; + "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/fast-json-patch/-/fast-json-patch-0.5.6.tgz"; + sha1 = "66e4028e381eaa002edeb280d10238f3a46c3402"; + }; + }; + "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/fast-json-patch/-/fast-json-patch-2.0.6.tgz"; + sha1 = "86fff8f8662391aa819722864d632e603e6ee605"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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/fast-safe-stringify/-/fast-safe-stringify-1.2.3.tgz"; + sha512 = "2bhxs6r2hxpjfxj7ycbs3blbwbmq9nmwar4swzvhbiwcbmn721l8wk0ndyw9n3i1508rlhhm70a8fn9bpy8mx8f0ncqhqhh5pz175j0"; + }; + }; + "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"; + }; + }; + "faye-websocket-0.11.1" = { + name = "faye-websocket"; + packageName = "faye-websocket"; + version = "0.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz"; + sha1 = "f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"; + }; + }; + "fbjs-0.8.16" = { + name = "fbjs"; + packageName = "fbjs"; + version = "0.8.16"; + src = fetchurl { + url = "https://registry.npmjs.org/fbjs/-/fbjs-0.8.16.tgz"; + sha1 = "5e67432f550dc41b572bf55847b8aca64e5337db"; + }; + }; + "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"; + }; + }; + "feedparser-1.1.3" = { + name = "feedparser"; + packageName = "feedparser"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/feedparser/-/feedparser-1.1.3.tgz"; + sha1 = "0b725f6b4cbe4b26d518baec0d010ad020156c8b"; + }; + }; + "fibers-1.0.15" = { + name = "fibers"; + packageName = "fibers"; + version = "1.0.15"; + src = fetchurl { + url = "https://registry.npmjs.org/fibers/-/fibers-1.0.15.tgz"; + sha1 = "22f039c8f18b856190fbbe4decf056154c1eae9c"; + }; + }; + "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"; + }; + }; + "fifo-0.1.4" = { + name = "fifo"; + packageName = "fifo"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/fifo/-/fifo-0.1.4.tgz"; + sha1 = "bf42d87c0ad07b00d0949d12388f6289606ece34"; + }; + }; + "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-entry-cache-2.0.0" = { + name = "file-entry-cache"; + packageName = "file-entry-cache"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz"; + sha1 = "c392990c3e684783d838b8c84a45d8a048458361"; + }; + }; + "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/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; + sha512 = "0px1qliabg53lwfq4izc9vdll68sd08nlczi2ms5nvg7frm3y6zgy07vdvxywazab26jc723qpmh9a6h3bdp685iddzsmgvfarpx6yi"; + }; + }; + "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"; + }; + }; + "filesize-3.5.11" = { + name = "filesize"; + packageName = "filesize"; + version = "3.5.11"; + src = fetchurl { + url = "https://registry.npmjs.org/filesize/-/filesize-3.5.11.tgz"; + sha512 = "3bg35im21jf6dhyrcajczdjl3rjm5mphdhansyfbpzm067vv3jp91n43nrzxf8q6nx3b5vkn2my1rskyp4pmg91xzdq01lawyifazk4"; + }; + }; + "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"; + }; + }; + "filled-array-1.1.0" = { + name = "filled-array"; + packageName = "filled-array"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz"; + sha1 = "c3c4f6c663b923459a9aa29912d2d031f1507f84"; + }; + }; + "filter-obj-1.1.0" = { + name = "filter-obj"; + packageName = "filter-obj"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz"; + sha1 = "9b311112bc6c6127a16e016c6c5d7f19e0805c5b"; + }; + }; + "finalhandler-0.3.3" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.3.3.tgz"; + sha1 = "b1a09aa1e6a607b3541669b09bcb727f460cd426"; + }; + }; + "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"; + }; + }; + "finalhandler-0.5.1" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz"; + sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd"; + }; + }; + "finalhandler-1.0.6" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.6.tgz"; + sha1 = "007aea33d1a4d3e42017f624848ad58d212f814f"; + }; + }; + "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"; + }; + }; + "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/find-elm-dependencies/-/find-elm-dependencies-1.0.2.tgz"; + sha512 = "2hpc7v115prqkr487hxh0gllwvf0xa90lsb3i1azmrpfclp37vahxvdsqkr9pwvbcr7znccvhfgp1xy26czrmdcxzfl250a63dywyw2"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "find-up-2.1.0" = { + name = "find-up"; + packageName = "find-up"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz"; + sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; + }; + }; + "find-versions-1.2.1" = { + name = "find-versions"; + packageName = "find-versions"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/find-versions/-/find-versions-1.2.1.tgz"; + sha1 = "cbde9f12e38575a0af1be1b9a2c5d5fd8f186b62"; + }; + }; + "findit-1.2.0" = { + name = "findit"; + packageName = "findit"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/findit/-/findit-1.2.0.tgz"; + sha1 = "f571a3a840749ae8b0cbf4bf43ced7659eec3ce8"; + }; + }; + "findit-2.0.0" = { + name = "findit"; + packageName = "findit"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/findit/-/findit-2.0.0.tgz"; + sha1 = "6509f0126af4c178551cfa99394e032e13a4d56e"; + }; + }; + "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"; + }; + }; + "findup-sync-2.0.0" = { + name = "findup-sync"; + packageName = "findup-sync"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz"; + sha1 = "9326b1488c22d1a6088650a86901b2d9a90a2cbc"; + }; + }; + "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"; + }; + }; + "firefox-client-0.3.0" = { + name = "firefox-client"; + packageName = "firefox-client"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/firefox-client/-/firefox-client-0.3.0.tgz"; + sha1 = "3794460f6eb6afcf41376addcbc7462e24a4cd8b"; + }; + }; + "firefox-profile-1.1.0" = { + name = "firefox-profile"; + packageName = "firefox-profile"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/firefox-profile/-/firefox-profile-1.1.0.tgz"; + sha512 = "2l8ynyw9d8c738q8m19qia09kaflqri5k8dx7z3rp3xv4aa338byrhqdmycxf4if11rr89zbssrib40jxlrks2nph3hm3w00zhh8hn1"; + }; + }; + "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"; + }; + }; + "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/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz"; + sha1 = "1bdecdb8e083c0664b91945581577a43a9f31d70"; + }; + }; + "firstline-1.2.0" = { + name = "firstline"; + packageName = "firstline"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/firstline/-/firstline-1.2.0.tgz"; + sha1 = "c9f4886e7f7fbf0afc12d71941dce06b192aea05"; + }; + }; + "firstline-1.2.1" = { + name = "firstline"; + packageName = "firstline"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/firstline/-/firstline-1.2.1.tgz"; + sha1 = "b88673c42009f8821fac2926e99720acee924fae"; + }; + }; + "flagged-respawn-1.0.0" = { + name = "flagged-respawn"; + packageName = "flagged-respawn"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.0.tgz"; + sha1 = "4e79ae9b2eb38bf86b3bb56bf3e0a56aa5fcabd7"; + }; + }; + "flat-cache-1.3.0" = { + name = "flat-cache"; + packageName = "flat-cache"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz"; + sha1 = "d3030b32b38154f4e3b7e9c709f490f7ef97c481"; + }; + }; + "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"; + }; + }; + "flatiron-0.4.3" = { + name = "flatiron"; + packageName = "flatiron"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/flatiron/-/flatiron-0.4.3.tgz"; + sha1 = "248cf79a3da7d7dc379e2a11c92a2719cbb540f6"; + }; + }; + "flatstr-1.0.5" = { + name = "flatstr"; + packageName = "flatstr"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/flatstr/-/flatstr-1.0.5.tgz"; + sha1 = "5b451b08cbd48e2eac54a2bbe0bf46165aa14be3"; + }; + }; + "flatten-0.0.1" = { + name = "flatten"; + packageName = "flatten"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/flatten/-/flatten-0.0.1.tgz"; + sha1 = "554440766da0a0d603999f433453f6c2fc6a75c1"; + }; + }; + "fluent-0.4.1" = { + name = "fluent"; + packageName = "fluent"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fluent/-/fluent-0.4.1.tgz"; + sha512 = "2hrbkg2399py60vsz1k5xydrm5kwfh1f6fpgpbkrs9nni1xpq4isy8aif5jq5dakyksbf0yjx3sh7jl9f54c3r6jkf3amm3grxlbaxx"; + }; + }; + "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"; + }; + }; + "follow-redirects-0.0.3" = { + name = "follow-redirects"; + packageName = "follow-redirects"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-0.0.3.tgz"; + sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65"; + }; + }; + "follow-redirects-1.0.0" = { + name = "follow-redirects"; + packageName = "follow-redirects"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.0.0.tgz"; + sha1 = "8e34298cbd2e176f254effec75a1c78cc849fd37"; + }; + }; + "follow-redirects-1.2.4" = { + name = "follow-redirects"; + packageName = "follow-redirects"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.2.4.tgz"; + sha512 = "2mxs6nll208xgqy9asgc0iq4k9ynd2aanig2qkfi3drd8axdafhhx36a58ssksmjgl6s1m2bh2j8igrlpm3k11cg58nhmqbxhlkmv2a"; + }; + }; + "follow-redirects-1.4.1" = { + name = "follow-redirects"; + packageName = "follow-redirects"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.4.1.tgz"; + sha512 = "2z7ai3f3g9j48z90kds4070nb8v2q02n7131c2zjplb0zfjxjrd1m2fm8ykg7psj8fiwc4iidn2g9rr2w09qijbssddr0p8acyiw5mv"; + }; + }; + "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-0.1.8" = { + name = "for-in"; + packageName = "for-in"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz"; + sha1 = "d8773908e31256109952b1fdb9b3fa867d2775e1"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "foreach-2.0.5" = { + name = "foreach"; + packageName = "foreach"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz"; + sha1 = "0bee005018aeb260d0a3af3ae658dd0136ec1b99"; + }; + }; + "foreachasync-3.0.0" = { + name = "foreachasync"; + packageName = "foreachasync"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz"; + sha1 = "5502987dc8714be3392097f32e0071c9dee07cf6"; + }; + }; + "forever-agent-0.2.0" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.2.0.tgz"; + sha1 = "e1c25c7ad44e09c38f233876c76fcc24ff843b1f"; + }; + }; + "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"; + }; + }; + "forever-monitor-1.7.1" = { + name = "forever-monitor"; + packageName = "forever-monitor"; + version = "1.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-monitor/-/forever-monitor-1.7.1.tgz"; + sha1 = "5d820f4a3a78db2d81ae2671f158b9e86a091bb8"; + }; + }; + "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"; + }; + }; + "form-data-0.1.3" = { + name = "form-data"; + packageName = "form-data"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz"; + sha1 = "4ee4346e6eb5362e8344a02075bd8dbd8c7373ea"; + }; + }; + "form-data-1.0.1" = { + name = "form-data"; + packageName = "form-data"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz"; + sha1 = "ae315db9a4907fa065502304a66d7733475ee37c"; + }; + }; + "form-data-2.0.0" = { + name = "form-data"; + packageName = "form-data"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz"; + sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "formidable-1.0.11" = { + name = "formidable"; + packageName = "formidable"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/formidable/-/formidable-1.0.11.tgz"; + sha1 = "68f63325a035e644b6f7bb3d11243b9761de1b30"; + }; + }; + "formidable-1.0.14" = { + name = "formidable"; + packageName = "formidable"; + version = "1.0.14"; + src = fetchurl { + url = "https://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz"; + sha1 = "2b3f4c411cbb5fdd695c44843e2a23514a43231a"; + }; + }; + "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.1.1" = { + name = "formidable"; + packageName = "formidable"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz"; + sha1 = "96b8886f7c3c3508b932d6bd70c4d3a88f35f1a9"; + }; + }; + "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"; + }; + }; + "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.1.0" = { + name = "fresh"; + packageName = "fresh"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz"; + sha1 = "03e4b0178424e4c2d5d19a54d8814cdc97934850"; + }; + }; + "fresh-0.2.0" = { + name = "fresh"; + packageName = "fresh"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.2.0.tgz"; + sha1 = "bfd9402cf3df12c4a4c310c79f99a3dde13d34a7"; + }; + }; + "fresh-0.2.4" = { + name = "fresh"; + packageName = "fresh"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"; + sha1 = "3582499206c9723714190edd74b4604feb4a614c"; + }; + }; + "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"; + }; + }; + "fresh-0.5.0" = { + name = "fresh"; + packageName = "fresh"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz"; + sha1 = "f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e"; + }; + }; + "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-1.3.0" = { + name = "from2"; + packageName = "from2"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/from2/-/from2-1.3.0.tgz"; + sha1 = "88413baaa5f9a597cfde9221d86986cd3c061dfd"; + }; + }; + "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-blob-store-5.2.1" = { + name = "fs-blob-store"; + packageName = "fs-blob-store"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-blob-store/-/fs-blob-store-5.2.1.tgz"; + sha1 = "2a7db7ef59a5ec548cce8564066508224c9b0457"; + }; + }; + "fs-chunk-store-1.6.5" = { + name = "fs-chunk-store"; + packageName = "fs-chunk-store"; + version = "1.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-1.6.5.tgz"; + sha1 = "fc42c2ff4c7f1688ab5fd41cf17c0f9ece4c6156"; + }; + }; + "fs-ext-0.6.0" = { + name = "fs-ext"; + packageName = "fs-ext"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-ext/-/fs-ext-0.6.0.tgz"; + sha1 = "27d32a72e2e7c3c8001712a0f307f5f8d91dfc66"; + }; + }; + "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-extra-0.30.0" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "0.30.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz"; + sha1 = "f233ffcc08d4da7d432daa449776989db1df93f0"; + }; + }; + "fs-extra-0.6.4" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "0.6.4"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz"; + sha1 = "f46f0c75b7841f8d200b3348cd4d691d5a099d15"; + }; + }; + "fs-extra-1.0.0" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz"; + sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950"; + }; + }; + "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"; + }; + }; + "fs-extra-4.0.3" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz"; + sha512 = "05bphjab1lk12dz3qf87dywgpsjsx0f59kpligxqph53yicigij2gsmvkppgyhpi70h3q3id3ymz30c02v3pphakn06k8vm6xsdpamb"; + }; + }; + "fs-extra-5.0.0" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz"; + sha512 = "1ssfaw678600iy330a73gqk65ns22sz4ng7jwndj1fxahj8qddrsy2w4mr4ikx28qhdj8rf49n428qnl657bbpag9r3g3qv2vhyd8zb"; + }; + }; + "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.extra-1.3.2" = { + name = "fs.extra"; + packageName = "fs.extra"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.extra/-/fs.extra-1.3.2.tgz"; + sha1 = "dd023f93013bee24531f1b33514c37b20fd93349"; + }; + }; + "fs.notify-0.0.4" = { + name = "fs.notify"; + packageName = "fs.notify"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.notify/-/fs.notify-0.0.4.tgz"; + sha1 = "63284d45a34b52ce60088a6ddbec5b776d3c013d"; + }; + }; + "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.2" = { + name = "fsevents"; + packageName = "fsevents"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz"; + sha512 = "25k3z64r4fhzjs1crh981lkkvkrhn2xv67k7y00zpnpsl571y5apg0r0kanddirms8kxf2xgf4yx9n2hzs9ml3v3p9qcnqhkh9khzja"; + }; + }; + "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-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"; + }; + }; + "fstream-1.0.11" = { + name = "fstream"; + packageName = "fstream"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz"; + sha1 = "5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"; + }; + }; + "fstream-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"; + }; + }; + "ftp-0.3.10" = { + name = "ftp"; + packageName = "ftp"; + version = "0.3.10"; + src = fetchurl { + url = "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz"; + sha1 = "9197d861ad8142f3e63d5a83bfe4c59f7330885d"; + }; + }; + "fullname-3.3.0" = { + name = "fullname"; + packageName = "fullname"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fullname/-/fullname-3.3.0.tgz"; + sha1 = "a08747d6921229610b8178b7614fce10cb185f5a"; + }; + }; + "function-bind-1.1.1" = { + name = "function-bind"; + packageName = "function-bind"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; + sha512 = "38chm1mh077ksx6hy2sssfz4q29hf0ncb9k6ila7si54zqcpl5fxd1rh6wi82blqp7jcspf4aynr7jqhbsg2yc9y42xpqqp6c1jz2n8"; + }; + }; + "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/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; + sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; + }; + }; + "fx-runner-1.0.8" = { + name = "fx-runner"; + packageName = "fx-runner"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/fx-runner/-/fx-runner-1.0.8.tgz"; + sha1 = "5ced3b04a8d51d634de20d1480f0dc5dd8325dec"; + }; + }; + "galaxy-0.1.12" = { + name = "galaxy"; + packageName = "galaxy"; + version = "0.1.12"; + src = fetchurl { + url = "https://registry.npmjs.org/galaxy/-/galaxy-0.1.12.tgz"; + sha1 = "0c989774f2870c69378aa665648cdc60f343aa53"; + }; + }; + "gauge-1.2.7" = { + name = "gauge"; + packageName = "gauge"; + version = "1.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/gauge/-/gauge-1.2.7.tgz"; + sha1 = "e9cec5483d3d4ee0ef44b60a7d99e4935e136d93"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "gelf-stream-1.1.1" = { + name = "gelf-stream"; + packageName = "gelf-stream"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gelf-stream/-/gelf-stream-1.1.1.tgz"; + sha1 = "9cea9b6386ac301c741838ca3cb91e66dbfbf669"; + }; + }; + "gelfling-0.3.1" = { + name = "gelfling"; + packageName = "gelfling"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gelfling/-/gelfling-0.3.1.tgz"; + sha1 = "336a98f81510f9ae0af2a494e17468a116a9dc04"; + }; + }; + "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"; + }; + }; + "generic-pool-2.2.0" = { + name = "generic-pool"; + packageName = "generic-pool"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/generic-pool/-/generic-pool-2.2.0.tgz"; + sha1 = "8b465c1a7588ea9dd2bb133bda0bb66bfef8a63e"; + }; + }; + "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/get-browser-rtc/-/get-browser-rtc-1.0.2.tgz"; + sha1 = "bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9"; + }; + }; + "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"; + }; + }; + "get-func-name-2.0.0" = { + name = "get-func-name"; + packageName = "get-func-name"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz"; + sha1 = "ead774abee72e20409433a066366023dd6887a41"; + }; + }; "get-pkg-repo-1.4.0" = { name = "get-pkg-repo"; packageName = "get-pkg-repo"; @@ -17703,6 +10014,87 @@ let sha1 = "c73b489c06d80cc5536c2c853f9e05232056972d"; }; }; + "get-port-3.2.0" = { + name = "get-port"; + packageName = "get-port"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz"; + sha1 = "dd7ce7de187c06c8bf353796ac71e099f0980ebc"; + }; + }; + "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"; + }; + }; + "get-stdin-5.0.1" = { + name = "get-stdin"; + packageName = "get-stdin"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz"; + sha1 = "122e161591e21ff4c52530305693f20e6393a398"; + }; + }; + "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-uri-2.0.1" = { + name = "get-uri"; + packageName = "get-uri"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-uri/-/get-uri-2.0.1.tgz"; + sha512 = "10bm7v59d4pv7pk0smv9qwl8rp1iq60d20jdybycdpjqv85gdirf00kci8m5fz16gja9i5l60yxgiqzafj1195disavn21anrbab9zd"; + }; + }; + "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"; + }; + }; + "getmac-1.2.1" = { + name = "getmac"; + packageName = "getmac"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/getmac/-/getmac-1.2.1.tgz"; + sha1 = "0d095fd0627850043eac1dcfa0b120bbdc1426d1"; + }; + }; + "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"; + }; + }; + "gettext-parser-1.1.0" = { + name = "gettext-parser"; + packageName = "gettext-parser"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gettext-parser/-/gettext-parser-1.1.0.tgz"; + sha1 = "2c5a6638d893934b9b55037d0ad82cb7004b2679"; + }; + }; "git-raw-commits-1.3.0" = { name = "git-raw-commits"; packageName = "git-raw-commits"; @@ -17721,6 +10113,15 @@ let sha1 = "5282659dae2107145a11126112ad3216ec5fa65f"; }; }; + "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/git-rev-sync/-/git-rev-sync-1.9.1.tgz"; + sha1 = "a0c2e3dd392abcf6b76962e27fc75fb3223449ce"; + }; + }; "git-semver-tags-1.2.3" = { name = "git-semver-tags"; packageName = "git-semver-tags"; @@ -17730,96 +10131,6 @@ let sha1 = "188b453882bf9d7a23afd31baba537dab7388d5d"; }; }; - "conventional-commits-filter-1.1.1" = { - name = "conventional-commits-filter"; - packageName = "conventional-commits-filter"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-1.1.1.tgz"; - sha512 = "0jrsm3hlyq0a425d320l1rghxmmb621r0bcvlsfbdichzbyimflwn7wz1mhw62kdnr3wxskdpaq11f5qpdsz5g2d5f7ha4d4jvrl33d"; - }; - }; - "is-subset-0.1.1" = { - name = "is-subset"; - packageName = "is-subset"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz"; - sha1 = "8a59117d932de1de00f245fcdd39ce43f1e939a6"; - }; - }; - "modify-values-1.0.0" = { - name = "modify-values"; - packageName = "modify-values"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/modify-values/-/modify-values-1.0.0.tgz"; - sha1 = "e2b6cdeb9ce19f99317a53722f3dbf5df5eaaab2"; - }; - }; - "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/is-text-path/-/is-text-path-1.0.1.tgz"; - sha1 = "4e1aa0fb51bfbcb3e92688001397202c1775b66e"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz"; - sha1 = "9e7d8bb252a6cb6ba42595060b7bf6df3dbc1f50"; - }; - }; - "dargs-4.1.0" = { - name = "dargs"; - packageName = "dargs"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dargs/-/dargs-4.1.0.tgz"; - sha1 = "03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"; - }; - }; - "lodash.template-4.4.0" = { - name = "lodash.template"; - packageName = "lodash.template"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz"; - sha1 = "e73a0385c8355591746e020b99679c690e68fba0"; - }; - }; - "lodash.templatesettings-4.1.0" = { - name = "lodash.templatesettings"; - packageName = "lodash.templatesettings"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz"; - sha1 = "2b4d4e95ba440d915ff08bc899e4553666713316"; - }; - }; "gitconfiglocal-1.0.0" = { name = "gitconfiglocal"; packageName = "gitconfiglocal"; @@ -17829,364 +10140,22 @@ let sha1 = "41d045f3851a5ea88f03f24ca1c6178114464b9b"; }; }; - "jsonfile-4.0.0" = { - name = "jsonfile"; - packageName = "jsonfile"; - version = "4.0.0"; + "github-0.1.6" = { + name = "github"; + packageName = "github"; + version = "0.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz"; - sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; + url = "https://registry.npmjs.org/github/-/github-0.1.6.tgz"; + sha1 = "1344e694f8d20ef9b29bcbfd1ca5eb4f7a287922"; }; }; - "path-dirname-1.0.2" = { - name = "path-dirname"; - packageName = "path-dirname"; - version = "1.0.2"; + "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/path-dirname/-/path-dirname-1.0.2.tgz"; - sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0"; - }; - }; - "parse-json-3.0.0" = { - name = "parse-json"; - packageName = "parse-json"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-json/-/parse-json-3.0.0.tgz"; - sha1 = "fa6f47b18e23826ead32f263e744d0e1e847fb13"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "load-json-file-2.0.0" = { - name = "load-json-file"; - packageName = "load-json-file"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz"; - sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8"; - }; - }; - "path-type-2.0.0" = { - name = "path-type"; - packageName = "path-type"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz"; - sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73"; - }; - }; - "byline-5.0.0" = { - name = "byline"; - packageName = "byline"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/byline/-/byline-5.0.0.tgz"; - sha1 = "741c5216468eadc457b03410118ad77de8c1ddb1"; - }; - }; - "minimist-0.1.0" = { - name = "minimist"; - packageName = "minimist"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz"; - sha1 = "99df657a52574c21c9057497df742790b2b4c0de"; - }; - }; - "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"; - }; - }; - "sort-keys-2.0.0" = { - name = "sort-keys"; - packageName = "sort-keys"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz"; - sha1 = "658535584861ec97d730d6cf41822e1f56684128"; - }; - }; - "read-pkg-up-2.0.0" = { - name = "read-pkg-up"; - packageName = "read-pkg-up"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz"; - sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; - }; - }; - "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"; - }; - }; - "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-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"; - }; - }; - "glob-stream-5.3.5" = { - name = "glob-stream"; - packageName = "glob-stream"; - version = "5.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz"; - sha1 = "a55665a9a8ccdc41915a87c701e32d4e016fad22"; - }; - }; - "gulp-sourcemaps-1.6.0" = { - name = "gulp-sourcemaps"; - packageName = "gulp-sourcemaps"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz"; - sha1 = "b86ff349d801ceb56e1d9e7dc7bbcb4b7dee600c"; - }; - }; - "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/is-valid-glob/-/is-valid-glob-0.3.0.tgz"; - sha1 = "d4b55c69f51886f9b65c70d6c2622d37e29f48fe"; - }; - }; - "merge-stream-1.0.1" = { - name = "merge-stream"; - packageName = "merge-stream"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz"; - sha1 = "4041202d508a342ba00174008df0c251b8c135e1"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz"; - sha1 = "7137e69b3298bb342247a1bbee3881c80e2fd78b"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "markdown-it-8.4.0" = { - name = "markdown-it"; - packageName = "markdown-it"; - version = "8.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.0.tgz"; - sha512 = "0c0jpdfbi4fmqyjc2ilwvinxyc8rn4p9j7fwshh2c00nkc0q2lh6yw2dgragvnpy8bjhcwa1hlfy2ih2ih3np78wrpqx7gf4w48xnxl"; - }; - }; - "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/markdown-it-emoji/-/markdown-it-emoji-1.4.0.tgz"; - sha1 = "9bee0e9a990a963ba96df6980c4fddb05dfb4dcc"; - }; - }; - "markdown-it-github-headings-1.1.0" = { - name = "markdown-it-github-headings"; - packageName = "markdown-it-github-headings"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/markdown-it-github-headings/-/markdown-it-github-headings-1.1.0.tgz"; - sha1 = "d6f73da5276ded956861337189addf3d52b93558"; - }; - }; - "markdown-it-task-checkbox-1.0.5" = { - name = "markdown-it-task-checkbox"; - packageName = "markdown-it-task-checkbox"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/markdown-it-task-checkbox/-/markdown-it-task-checkbox-1.0.5.tgz"; - sha512 = "0fcw45p4gcm7nqn091vj5bpds1qg866pqzrjr0l5br39nq26h7kl9h2c9ryz9f7g1kjfb8d5fnd57jpn9m46wnpl817f88q99ad7542"; - }; - }; - "socket.io-2.0.4" = { - 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"; - }; - }; - "linkify-it-2.0.3" = { - name = "linkify-it"; - packageName = "linkify-it"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/linkify-it/-/linkify-it-2.0.3.tgz"; - sha1 = "d94a4648f9b1c179d64fa97291268bdb6ce9434f"; - }; - }; - "mdurl-1.0.1" = { - name = "mdurl"; - packageName = "mdurl"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz"; - sha1 = "fe85b2ec75a59037f2adfec100fd6c601761152e"; - }; - }; - "uc.micro-1.0.3" = { - name = "uc.micro"; - packageName = "uc.micro"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.3.tgz"; - sha1 = "7ed50d5e0f9a9fb0a573379259f2a77458d50192"; + url = "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz"; + sha1 = "97fb5d96bfde8973313f20e8288ef9a167fa64ce"; }; }; "github-slugger-1.2.0" = { @@ -18198,364 +10167,401 @@ let sha512 = "3nya50972xq88vz4p5gqz63014dkwlp5f40cz1fgad4ifnhprpr4qlqvvi44qxs3arikyfm3ygmf3phyjq5lwkg7rr9ig9mk7prm1n0"; }; }; - "innertext-1.0.2" = { - name = "innertext"; - packageName = "innertext"; - version = "1.0.2"; + "glob-3.1.21" = { + name = "glob"; + packageName = "glob"; + version = "3.1.21"; src = fetchurl { - url = "https://registry.npmjs.org/innertext/-/innertext-1.0.2.tgz"; - sha1 = "11a197b3143a593636fba5d59213835e6954580a"; + url = "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz"; + sha1 = "d29e0a055dea5138f4d07ed40e8982e83c2066cd"; }; }; - "emoji-regex-6.1.1" = { - name = "emoji-regex"; - packageName = "emoji-regex"; - version = "6.1.1"; + "glob-3.2.11" = { + name = "glob"; + packageName = "glob"; + version = "3.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.1.1.tgz"; - sha1 = "c6cd0ec1b0642e2a3c67a1137efc5e796da4f88e"; + url = "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz"; + sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d"; }; }; - "html-entities-1.2.1" = { - name = "html-entities"; - packageName = "html-entities"; - version = "1.2.1"; + "glob-4.0.6" = { + name = "glob"; + packageName = "glob"; + version = "4.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz"; - sha1 = "0df29351f0721163515dfb9e5543e5f6eed5162f"; + url = "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz"; + sha1 = "695c50bdd4e2fb5c5d370b091f388d3707e291a7"; }; }; - "engine.io-3.1.4" = { - name = "engine.io"; - packageName = "engine.io"; - version = "3.1.4"; + "glob-4.5.3" = { + name = "glob"; + packageName = "glob"; + version = "4.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-3.1.4.tgz"; - sha1 = "3d0211b70a552ce841ffc7da8627b301a9a4162e"; + url = "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz"; + sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f"; }; }; - "socket.io-adapter-1.1.1" = { - name = "socket.io-adapter"; - packageName = "socket.io-adapter"; - version = "1.1.1"; + "glob-5.0.15" = { + name = "glob"; + packageName = "glob"; + version = "5.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz"; - sha1 = "2a805e8a14d6372124dd9159ad4502f8cb07f06b"; + url = "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"; + sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"; }; }; - "socket.io-client-2.0.4" = { - name = "socket.io-client"; - packageName = "socket.io-client"; - version = "2.0.4"; + "glob-6.0.4" = { + name = "glob"; + packageName = "glob"; + version = "6.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.0.4.tgz"; - sha1 = "0918a552406dc5e540b380dcd97afc4a64332f8e"; + url = "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz"; + sha1 = "0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"; }; }; - "socket.io-parser-3.1.2" = { - name = "socket.io-parser"; - packageName = "socket.io-parser"; - version = "3.1.2"; + "glob-7.0.6" = { + name = "glob"; + packageName = "glob"; + version = "7.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.1.2.tgz"; - sha1 = "dbc2282151fc4faebbe40aeedc0772eba619f7f2"; + url = "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz"; + sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a"; }; }; - "engine.io-parser-2.1.1" = { - name = "engine.io-parser"; - packageName = "engine.io-parser"; - version = "2.1.1"; + "glob-7.1.1" = { + name = "glob"; + packageName = "glob"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.1.tgz"; - sha1 = "e0fb3f0e0462f7f58bb77c1a52e9f5a7e26e4668"; + url = "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz"; + sha1 = "805211df04faaf1c63a3600306cdf5ade50b2ec8"; }; }; - "uws-0.14.5" = { - name = "uws"; - packageName = "uws"; - version = "0.14.5"; + "glob-7.1.2" = { + name = "glob"; + packageName = "glob"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/uws/-/uws-0.14.5.tgz"; - sha1 = "67aaf33c46b2a587a5f6666d00f7691328f149dc"; + url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"; + sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h"; }; }; - "has-binary2-1.0.2" = { - name = "has-binary2"; - packageName = "has-binary2"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.2.tgz"; - sha1 = "e83dba49f0b9be4d026d27365350d9f03f54be98"; - }; - }; - "isarray-2.0.1" = { - name = "isarray"; - packageName = "isarray"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz"; - sha1 = "a37d94ed9cda2d59865c9f76fe596ee1f338741e"; - }; - }; - "engine.io-client-3.1.4" = { - name = "engine.io-client"; - packageName = "engine.io-client"; - version = "3.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.4.tgz"; - sha1 = "4fcf1370b47163bd2ce9be2733972430350d4ea1"; - }; - }; - "xmlhttprequest-ssl-1.5.4" = { - name = "xmlhttprequest-ssl"; - packageName = "xmlhttprequest-ssl"; - version = "1.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.4.tgz"; - sha1 = "04f560915724b389088715cc0ed7813e9677bf57"; - }; - }; - "connect-3.5.1" = { - name = "connect"; - packageName = "connect"; - version = "3.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-3.5.1.tgz"; - sha1 = "6d30d7a63c7f170857a6b3aa6b363d973dca588e"; - }; - }; - "event-stream-3.3.4" = { - name = "event-stream"; - packageName = "event-stream"; - version = "3.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz"; - sha1 = "4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"; - }; - }; - "http-auth-3.1.3" = { - name = "http-auth"; - packageName = "http-auth"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/http-auth/-/http-auth-3.1.3.tgz"; - sha1 = "945cfadd66521eaf8f7c84913d377d7b15f24e31"; - }; - }; - "proxy-middleware-0.15.0" = { - name = "proxy-middleware"; - packageName = "proxy-middleware"; - version = "0.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.15.0.tgz"; - sha1 = "a3fdf1befb730f951965872ac2f6074c61477a56"; - }; - }; - "serve-index-1.9.1" = { - name = "serve-index"; - packageName = "serve-index"; - version = "1.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz"; - sha1 = "d3768d69b1e7d82e5ce050fff5b453bea12a9239"; - }; - }; - "finalhandler-0.5.1" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz"; - sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd"; - }; - }; - "apache-crypt-1.2.1" = { - name = "apache-crypt"; - packageName = "apache-crypt"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/apache-crypt/-/apache-crypt-1.2.1.tgz"; - sha1 = "d6fc72aa6d27d99c95a94fd188d731eefffa663c"; - }; - }; - "apache-md5-1.1.2" = { - name = "apache-md5"; - packageName = "apache-md5"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/apache-md5/-/apache-md5-1.1.2.tgz"; - sha1 = "ee49736b639b4f108b6e9e626c6da99306b41692"; - }; - }; - "bcryptjs-2.4.3" = { - name = "bcryptjs"; - packageName = "bcryptjs"; - version = "2.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz"; - sha1 = "9ab5627b93e60621ff7cdac5da9733027df1d0cb"; - }; - }; - "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"; - }; - }; - "batch-0.6.1" = { - name = "batch"; - packageName = "batch"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz"; - sha1 = "dc34314f4e679318093fc760272525f94bf25c16"; - }; - }; - "express-2.5.11" = { - name = "express"; - packageName = "express"; - version = "2.5.11"; - src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-2.5.11.tgz"; - sha1 = "4ce8ea1f3635e69e49f0ebb497b6a4b0a51ce6f0"; - }; - }; - "jade-0.27.0" = { - name = "jade"; - packageName = "jade"; - version = "0.27.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jade/-/jade-0.27.0.tgz"; - sha1 = "dc5ebed10d04a5e0eaf49ef0009bec473d1a6b31"; - }; - }; - "open-0.0.2" = { - name = "open"; - packageName = "open"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-0.0.2.tgz"; - sha1 = "0a620ba2574464742f51e69f8ba8eccfd97b5dfc"; - }; - }; - "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"; - }; - }; - "mkdirp-0.3.0" = { - name = "mkdirp"; - packageName = "mkdirp"; + "glob-base-0.3.0" = { + name = "glob-base"; + packageName = "glob-base"; version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"; - sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e"; + url = "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz"; + sha1 = "dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"; }; }; - "node.extend-1.0.0" = { - name = "node.extend"; - packageName = "node.extend"; - 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/node.extend/-/node.extend-1.0.0.tgz"; - sha1 = "ab83960c477280d01ba5554a0d8fd3acfe39336e"; + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz"; + sha1 = "81383d72db054fcccf5336daa902f182f6edbb28"; }; }; - "connect-1.9.2" = { - name = "connect"; - packageName = "connect"; - version = "1.9.2"; + "glob-parent-3.1.0" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-1.9.2.tgz"; - sha1 = "42880a22e9438ae59a8add74e437f58ae8e52807"; + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz"; + sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; }; }; - "mime-1.2.4" = { - name = "mime"; - packageName = "mime"; - version = "1.2.4"; + "glob-stream-3.1.18" = { + name = "glob-stream"; + packageName = "glob-stream"; + version = "3.1.18"; src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.2.4.tgz"; - sha1 = "11b5fdaf29c2509255176b80ad520294f5de92b7"; + url = "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz"; + sha1 = "9170a5f12b790306fdfe598f313f8f7954fd143b"; }; }; - "qs-0.4.2" = { - name = "qs"; - packageName = "qs"; - version = "0.4.2"; + "glob-stream-5.3.5" = { + name = "glob-stream"; + packageName = "glob-stream"; + version = "5.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-0.4.2.tgz"; - sha1 = "3cac4c861e371a8c9c4770ac23cda8de639b8e5f"; + url = "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz"; + sha1 = "a55665a9a8ccdc41915a87c701e32d4e016fad22"; }; }; - "formidable-1.0.17" = { - name = "formidable"; - packageName = "formidable"; - version = "1.0.17"; + "glob-stream-6.1.0" = { + name = "glob-stream"; + packageName = "glob-stream"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz"; - sha1 = "ef5491490f9433b705faa77249c99029ae348559"; + url = "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz"; + sha1 = "7045c99413b3eb94888d83ab46d0b404cc7bdde4"; }; }; - "async-0.1.22" = { - name = "async"; - packageName = "async"; - version = "0.1.22"; + "glob-watcher-0.0.6" = { + name = "glob-watcher"; + packageName = "glob-watcher"; + version = "0.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.1.22.tgz"; - sha1 = "0fc1aaa088a0e3ef0ebe2d8831bab0dcf8845061"; + url = "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz"; + sha1 = "b95b4a8df74b39c83298b0c05c978b4d9a3b710b"; }; }; - "pkginfo-0.2.3" = { - name = "pkginfo"; - packageName = "pkginfo"; + "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"; + }; + }; + "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"; + }; + }; + "global-https://github.com/component/global/archive/v2.0.1.tar.gz" = { + name = "global"; + packageName = "global"; + version = "2.0.1"; + src = fetchurl { + name = "global-2.0.1.tar.gz"; + url = https://codeload.github.com/component/global/tar.gz/v2.0.1; + sha256 = "42be02b7148745447f6ba21137c972ca82d2cad92d30d63bd4fc310623901785"; + }; + }; + "global-modules-0.2.3" = { + name = "global-modules"; + packageName = "global-modules"; version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"; - sha1 = "7239c42a5ef6c30b8f328439d9b9ff71042490f8"; + url = "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz"; + sha1 = "ea5a3bed42c6d6ce995a4f8a1269b5dae223828d"; }; }; - "request-2.9.203" = { - name = "request"; - packageName = "request"; - version = "2.9.203"; + "global-modules-1.0.0" = { + name = "global-modules"; + packageName = "global-modules"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.9.203.tgz"; - sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a"; + url = "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz"; + sha512 = "1pgpsvm0rm1fnqmblx77xs67gh8c80nf4dsgcgalhh9phmlp8ahn5w7vzx3xkwyxw3fg33h8vhh3plsycw6fd7c2r76mm7m8w9fkb5h"; }; }; - "browser-stdout-1.3.0" = { - name = "browser-stdout"; - packageName = "browser-stdout"; - version = "1.3.0"; + "global-paths-1.0.0" = { + name = "global-paths"; + packageName = "global-paths"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz"; - sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f"; + url = "https://registry.npmjs.org/global-paths/-/global-paths-1.0.0.tgz"; + sha1 = "3ffc84341594e47b32bfade5785355d4df7feac7"; }; }; - "commander-2.11.0" = { - name = "commander"; - packageName = "commander"; - version = "2.11.0"; + "global-prefix-0.1.5" = { + name = "global-prefix"; + packageName = "global-prefix"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz"; - sha512 = "2yi2hwf0bghfnv1fdgd4wvh7s0acjrgqbgww97ncm6i6s6ffs1zahnj48f6gqpqj6fsf0jigvnr0civ25k2160c38281r80wvg7jkkg"; + url = "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz"; + sha1 = "8d3bc6b8da3ca8112a160d8d496ff0462bfef78f"; }; }; - "diff-3.3.1" = { - name = "diff"; - packageName = "diff"; + "global-prefix-1.0.2" = { + name = "global-prefix"; + packageName = "global-prefix"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz"; + sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; + }; + }; + "globals-11.2.0" = { + name = "globals"; + packageName = "globals"; + version = "11.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-11.2.0.tgz"; + sha512 = "0ad39906l0grsfy2953m3c6jkhbwakd89vbqprzz9g0cafvikzfcp5azqch3zm8pmyhc29sbbcfgnays990jvwmq9xgw8vv7m7bnc24"; + }; + }; + "globals-9.18.0" = { + name = "globals"; + packageName = "globals"; + version = "9.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz"; + sha512 = "18psd5ig23apaw07k4mma3z1hi2ndfwsqkm05hxashnf5lf7mpfs6kjiircc0x3x3q15j2x2j4zfzsqacxvfsmw40zjchn44bfccjab"; + }; + }; + "globby-5.0.0" = { + name = "globby"; + packageName = "globby"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz"; + sha1 = "ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"; + }; + }; + "globby-6.1.0" = { + name = "globby"; + packageName = "globby"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz"; + sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; + }; + }; + "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"; + }; + }; + "glogg-1.0.1" = { + name = "glogg"; + packageName = "glogg"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/glogg/-/glogg-1.0.1.tgz"; + sha512 = "0vr9sdx0f84b9s5vy72ralm494844c0p9kqqgcvy25gcn9abv57y7hwwafdsswc3z283v8bqa50j8gp740dd4biyngi5f15p9f2lxna"; + }; + }; + "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"; + }; + }; + "got-3.3.1" = { + name = "got"; + packageName = "got"; version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz"; - sha512 = "31pj7v5gg5igmvwzk6zxw1wbvwjg6m9sfl0h3bs1x4q6idcw98vr8z8wcqk2603q0blpqkmkxp659kjj91wksr03yr8xlh16djcg8rh"; + url = "https://registry.npmjs.org/got/-/got-3.3.1.tgz"; + sha1 = "e5d0ed4af55fc3eef4d56007769d98192bcb2eca"; + }; + }; + "got-5.7.1" = { + name = "got"; + packageName = "got"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-5.7.1.tgz"; + sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35"; + }; + }; + "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"; + }; + }; + "got-7.1.0" = { + name = "got"; + packageName = "got"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-7.1.0.tgz"; + sha512 = "0phvycaq4yl6jjpyc9vwmgghfy7a6nnpynscpgpbx74zjaa5dbpl1ag0jf7jvimfk0vf6xfjqgh67xdlvi0ycgvp1kasajapjiqr5b3"; + }; + }; + "got-8.0.3" = { + name = "got"; + packageName = "got"; + version = "8.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-8.0.3.tgz"; + sha512 = "2bglci1j77rvr4z2klmnr6d2qfqk0f60nm1myj9m0g2rzh7pd68hzki9nm8f5dpaxqr98ncjbd4rfzw75j35nvsfcyb2i1l9jjailak"; + }; + }; + "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"; + }; + }; + "graceful-fs-2.0.3" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz"; + sha1 = "7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "grouped-queue-0.3.3" = { + name = "grouped-queue"; + packageName = "grouped-queue"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/grouped-queue/-/grouped-queue-0.3.3.tgz"; + sha1 = "c167d2a5319c5a0e0964ef6a25b7c2df8996c85c"; }; }; "growl-1.10.3" = { @@ -18567,373 +10573,67 @@ let sha512 = "3aibvz85l13j140w4jjdk8939q6r7dnf8ay2licxgkaaldk7wbm093c1p5g7k5cg80rl0xslmczyraawfgdr82hhxn7rfsm1rn6rac4"; }; }; - "supports-color-4.4.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "4.4.0"; + "growly-1.3.0" = { + name = "growly"; + packageName = "growly"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz"; - sha512 = "1flwwfdd7gg94xrc0b2ard3qjx4cpy600q49gx43y8pzvs7j56q78bjhv8mk18vgbggr4fd11jda8ck5cdrkc5jcjs04nlp7kwbg85c"; + url = "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz"; + sha1 = "f10748cbe76af964b7c96c93c6bcc28af120c081"; }; }; - "json-refs-2.1.7" = { - name = "json-refs"; - packageName = "json-refs"; - version = "2.1.7"; + "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/json-refs/-/json-refs-2.1.7.tgz"; - sha1 = "b9eb01fe29f5ea3e92878f15aea10ad38b5acf89"; + url = "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.0.tgz"; + sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; }; }; - "optparse-1.0.5" = { - name = "optparse"; - packageName = "optparse"; - version = "1.0.5"; + "gulp-sourcemaps-1.6.0" = { + name = "gulp-sourcemaps"; + packageName = "gulp-sourcemaps"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/optparse/-/optparse-1.0.5.tgz"; - sha1 = "75e75a96506611eb1c65ba89018ff08a981e2c16"; + url = "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz"; + sha1 = "b86ff349d801ceb56e1d9e7dc7bbcb4b7dee600c"; }; }; - "slasp-0.0.4" = { - name = "slasp"; - packageName = "slasp"; - version = "0.0.4"; + "gulp-util-3.0.8" = { + name = "gulp-util"; + packageName = "gulp-util"; + version = "3.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/slasp/-/slasp-0.0.4.tgz"; - sha1 = "9adc26ee729a0f95095851a5489f87a5258d57a9"; + url = "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz"; + sha1 = "0054e1e744502e27c04c187c3ecc505dd54bbb4f"; }; }; - "npm-registry-client-8.4.0" = { - name = "npm-registry-client"; - packageName = "npm-registry-client"; - version = "8.4.0"; + "gulplog-1.0.0" = { + name = "gulplog"; + packageName = "gulplog"; + version = "1.0.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/gulplog/-/gulplog-1.0.0.tgz"; + sha1 = "e28c4d45d05ecbbed818363ce8f9c5926229ffe5"; }; }; - "npmconf-2.1.2" = { - name = "npmconf"; - packageName = "npmconf"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz"; - sha1 = "66606a4a736f1e77a059aa071a79c94ab781853a"; - }; - }; - "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"; - }; - }; - "fs.extra-1.3.2" = { - name = "fs.extra"; - packageName = "fs.extra"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fs.extra/-/fs.extra-1.3.2.tgz"; - sha1 = "dd023f93013bee24531f1b33514c37b20fd93349"; - }; - }; - "findit-2.0.0" = { - name = "findit"; - packageName = "findit"; + "handlebars-2.0.0" = { + name = "handlebars"; + packageName = "handlebars"; version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/findit/-/findit-2.0.0.tgz"; - sha1 = "6509f0126af4c178551cfa99394e032e13a4d56e"; + url = "https://registry.npmjs.org/handlebars/-/handlebars-2.0.0.tgz"; + sha1 = "6e9d7f8514a3467fa5e9f82cc158ecfc1d5ac76f"; }; }; - "nijs-0.0.25" = { - name = "nijs"; - packageName = "nijs"; - version = "0.0.25"; + "handlebars-4.0.11" = { + name = "handlebars"; + packageName = "handlebars"; + version = "4.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/nijs/-/nijs-0.0.25.tgz"; - sha1 = "04b035cb530d46859d1018839a518c029133f676"; - }; - }; - "retry-0.10.1" = { - name = "retry"; - packageName = "retry"; - version = "0.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz"; - sha1 = "e76388d217992c252750241d3d3956fed98d8ff4"; - }; - }; - "ssri-4.1.6" = { - name = "ssri"; - packageName = "ssri"; - version = "4.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/ssri/-/ssri-4.1.6.tgz"; - sha512 = "283n1p781cl2pj3jk32blcvwjdlaixng0v5x2f9qi3ndxrmyg3hk4clsjpcfsszkymy40q426yz5skax4ivsmll2p9hhcc00ivc4ijr"; - }; - }; - "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"; - }; - }; - "fs-extra-0.6.4" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "0.6.4"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz"; - sha1 = "f46f0c75b7841f8d200b3348cd4d691d5a099d15"; - }; - }; - "walk-2.3.9" = { - name = "walk"; - packageName = "walk"; - version = "2.3.9"; - src = fetchurl { - url = "https://registry.npmjs.org/walk/-/walk-2.3.9.tgz"; - sha1 = "31b4db6678f2ae01c39ea9fb8725a9031e558a7b"; - }; - }; - "jsonfile-1.0.1" = { - name = "jsonfile"; - packageName = "jsonfile"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz"; - sha1 = "ea5efe40b83690b98667614a7392fc60e842c0dd"; - }; - }; - "foreachasync-3.0.0" = { - name = "foreachasync"; - packageName = "foreachasync"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz"; - sha1 = "5502987dc8714be3392097f32e0071c9dee07cf6"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "har-validator-4.2.1" = { - name = "har-validator"; - packageName = "har-validator"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz"; - sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a"; - }; - }; - "performance-now-0.2.0" = { - name = "performance-now"; - packageName = "performance-now"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz"; - sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"; - }; - }; - "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"; + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz"; + sha1 = "630a35dfe0294bc281edae6ffc5d329fc7982dcc"; }; }; "har-schema-1.0.5" = { @@ -18945,166 +10645,265 @@ let sha1 = "d263135f43307c02c602afc8fe95970c0151369e"; }; }; - "fstream-ignore-1.0.5" = { - name = "fstream-ignore"; - packageName = "fstream-ignore"; - version = "1.0.5"; + "har-schema-2.0.0" = { + name = "har-schema"; + packageName = "har-schema"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz"; - sha1 = "9c31dae34767018fe1d249b24dada67d092da105"; + url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; + sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; }; }; - "uid-number-0.0.6" = { - name = "uid-number"; - packageName = "uid-number"; - version = "0.0.6"; + "har-validator-2.0.6" = { + name = "har-validator"; + packageName = "har-validator"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"; - sha1 = "0ea10e8035e8eb5b8e4449f06da1c730663baa81"; + url = "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz"; + sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"; }; }; - "os-locale-1.4.0" = { - name = "os-locale"; - packageName = "os-locale"; - version = "1.4.0"; + "har-validator-4.2.1" = { + name = "har-validator"; + packageName = "har-validator"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz"; - sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9"; + url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz"; + sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a"; }; }; - "window-size-0.1.4" = { - name = "window-size"; - packageName = "window-size"; - version = "0.1.4"; + "har-validator-5.0.3" = { + name = "har-validator"; + packageName = "har-validator"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz"; - sha1 = "f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"; + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz"; + sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd"; }; }; - "ignore-by-default-1.0.1" = { - name = "ignore-by-default"; - packageName = "ignore-by-default"; + "has-1.0.1" = { + name = "has"; + packageName = "has"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz"; - sha1 = "48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"; + url = "https://registry.npmjs.org/has/-/has-1.0.1.tgz"; + sha1 = "8461733f538b0837c9361e39a9ab9e9704dc2f28"; }; }; - "pstree.remy-1.1.0" = { - name = "pstree.remy"; - packageName = "pstree.remy"; + "has-ansi-0.1.0" = { + name = "has-ansi"; + packageName = "has-ansi"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz"; + sha1 = "84f265aae8c0e6a88a12d7022894b7568894c62e"; + }; + }; + "has-ansi-1.0.3" = { + name = "has-ansi"; + packageName = "has-ansi"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz"; + sha1 = "c0b5b1615d9e382b0ff67169d967b425e48ca538"; + }; + }; + "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-ansi-3.0.0" = { + name = "has-ansi"; + packageName = "has-ansi"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-ansi/-/has-ansi-3.0.0.tgz"; + sha1 = "36077ef1d15f333484aa7fa77a28606f1c655b37"; + }; + }; + "has-binary-0.1.7" = { + name = "has-binary"; + packageName = "has-binary"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz"; + sha1 = "68e61eb16210c9545a0a5cce06a873912fe1e68c"; + }; + }; + "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/has-binary-data/-/has-binary-data-0.1.1.tgz"; + sha1 = "e10749fb87828a52df96f4086587eb4a03966439"; + }; + }; + "has-binary2-1.0.2" = { + name = "has-binary2"; + packageName = "has-binary2"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.2.tgz"; + sha1 = "e83dba49f0b9be4d026d27365350d9f03f54be98"; + }; + }; + "has-color-0.1.7" = { + name = "has-color"; + packageName = "has-color"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz"; + sha1 = "67144a5260c34fc3cca677d041daf52fe7b78b2f"; + }; + }; + "has-cors-1.0.3" = { + name = "has-cors"; + packageName = "has-cors"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/has-cors/-/has-cors-1.0.3.tgz"; + sha1 = "502acb9b3104dac33dd2630eaf2f888b0baf4cb3"; + }; + }; + "has-cors-1.1.0" = { + name = "has-cors"; + packageName = "has-cors"; version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.0.tgz"; - sha512 = "3jqj1qpjdy5lizvm5mir14vqzzqgaim2yl0iwa164ps6mlp20liyaid1mhr62k23dg0zbkk11zcnzk56d0xvzy9ddbdfmjcnjy3k4mb"; + url = "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz"; + sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39"; }; }; - "touch-3.1.0" = { - name = "touch"; - packageName = "touch"; - version = "3.1.0"; + "has-flag-1.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz"; - sha512 = "2a3sk3562y1ihbl06r5g1pzs37mwhhnz8f8vvcc0k8bhykczzgv9dyw71kkz4mbf81iq7wbf2nq7hpy6z6zhanj8s9d6bjk5r9pq72q"; + url = "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"; + sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa"; }; }; - "undefsafe-0.0.3" = { - name = "undefsafe"; - packageName = "undefsafe"; - version = "0.0.3"; + "has-flag-2.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/undefsafe/-/undefsafe-0.0.3.tgz"; - sha1 = "ecca3a03e56b9af17385baac812ac83b994a962f"; + url = "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz"; + sha1 = "e8207af1cc7b30d446cc70b734b5e8be18f88d51"; }; }; - "ps-tree-1.1.0" = { - name = "ps-tree"; - packageName = "ps-tree"; - version = "1.1.0"; + "has-gulplog-0.1.0" = { + name = "has-gulplog"; + packageName = "has-gulplog"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ps-tree/-/ps-tree-1.1.0.tgz"; - sha1 = "b421b24140d6203f1ed3c76996b4427b08e8c014"; + url = "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz"; + sha1 = "6414c82913697da51590397dafb12f22967811ce"; }; }; - "body-parser-1.17.2" = { - name = "body-parser"; - packageName = "body-parser"; - version = "1.17.2"; + "has-symbol-support-x-1.4.1" = { + name = "has-symbol-support-x"; + packageName = "has-symbol-support-x"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.17.2.tgz"; - sha1 = "f8892abc8f9e627d42aedafbca66bf5ab99104ee"; + url = "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.1.tgz"; + sha512 = "0qgqbqmrlx51w4ixcln9ljr5hs2jj8fvryq7i8cg9a739p7y2c5z8wpplp9jhnfn4a3xn6li2b2npmhfm2x80khm9di3vllyyv9wii6"; }; }; - "cheerio-0.22.0" = { - name = "cheerio"; - packageName = "cheerio"; - version = "0.22.0"; + "has-symbols-1.0.0" = { + name = "has-symbols"; + packageName = "has-symbols"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz"; - sha1 = "a9baa860a3f9b595a6b81b1a86873121ed3a269e"; + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz"; + sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44"; }; }; - "cookie-parser-1.4.3" = { - name = "cookie-parser"; - packageName = "cookie-parser"; - version = "1.4.3"; + "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/cookie-parser/-/cookie-parser-1.4.3.tgz"; - sha1 = "0fe31fa19d000b95f4aadf1f53fdc2b8a203baa5"; + url = "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz"; + sha512 = "0bqvhd628h3lrsydbp1xllh7jp23c58j7d4z0x0v9ddffindkk1zfrqmzm28z47ipjp0zxlmzvmlzk98zf9mzjsc47bmp1ydizcmmmx"; }; }; - "cors-2.8.3" = { - name = "cors"; - packageName = "cors"; - version = "2.8.3"; + "has-unicode-2.0.1" = { + name = "has-unicode"; + packageName = "has-unicode"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cors/-/cors-2.8.3.tgz"; - sha1 = "4cf78e1d23329a7496b2fc2225b77ca5bb5eb802"; + url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"; + sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; }; }; - "cron-1.2.1" = { - name = "cron"; - packageName = "cron"; - version = "1.2.1"; + "has-value-0.3.1" = { + name = "has-value"; + packageName = "has-value"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/cron/-/cron-1.2.1.tgz"; - sha1 = "3a86c09b41b8f261ac863a7cc85ea4735857eab2"; + url = "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz"; + sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f"; }; }; - "express-4.15.3" = { - name = "express"; - packageName = "express"; - version = "4.15.3"; + "has-value-1.0.0" = { + name = "has-value"; + packageName = "has-value"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.15.3.tgz"; - sha1 = "bab65d0f03aa80c358408972fc700f916944b662"; + url = "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz"; + sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177"; }; }; - "express-session-1.15.2" = { - name = "express-session"; - packageName = "express-session"; - version = "1.15.2"; + "has-values-0.1.4" = { + name = "has-values"; + packageName = "has-values"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.15.2.tgz"; - sha1 = "d98516443a4ccb8688e1725ae584c02daa4093d4"; + url = "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz"; + sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771"; }; }; - "follow-redirects-1.2.4" = { - name = "follow-redirects"; - packageName = "follow-redirects"; - version = "1.2.4"; + "has-values-1.0.0" = { + name = "has-values"; + packageName = "has-values"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.2.4.tgz"; - sha512 = "2mxs6nll208xgqy9asgc0iq4k9ynd2aanig2qkfi3drd8axdafhhx36a58ssksmjgl6s1m2bh2j8igrlpm3k11cg58nhmqbxhlkmv2a"; + url = "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz"; + sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; }; }; - "fs.notify-0.0.4" = { - name = "fs.notify"; - packageName = "fs.notify"; - version = "0.0.4"; + "hasbin-1.2.3" = { + name = "hasbin"; + packageName = "hasbin"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/fs.notify/-/fs.notify-0.0.4.tgz"; - sha1 = "63284d45a34b52ce60088a6ddbec5b776d3c013d"; + url = "https://registry.npmjs.org/hasbin/-/hasbin-1.2.3.tgz"; + sha1 = "78c5926893c80215c2b568ae1fd3fcab7a2696b0"; + }; + }; + "hash-base-2.0.2" = { + name = "hash-base"; + packageName = "hash-base"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz"; + sha1 = "66ea1d856db4e8a5470cadf6fce23ae5244ef2e1"; + }; + }; + "hash-base-3.0.4" = { + name = "hash-base"; + packageName = "hash-base"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz"; + sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918"; }; }; "hash-sum-1.0.2" = { @@ -19116,6 +10915,564 @@ let sha1 = "33b40777754c6432573c120cc3808bbd10d47f04"; }; }; + "hash.js-1.1.3" = { + name = "hash.js"; + packageName = "hash.js"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz"; + sha512 = "0f88i7rv3ib8lwdh5z5lwrml404frzb1a9n3g25y85jpfng82vzsv7m3c5fbyrpq5ki4c3pa8823z3s61xfigm45q469nqnzp416hgx"; + }; + }; + "hasha-2.2.0" = { + name = "hasha"; + packageName = "hasha"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz"; + sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1"; + }; + }; + "hasher-1.2.0" = { + name = "hasher"; + packageName = "hasher"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hasher/-/hasher-1.2.0.tgz"; + sha1 = "8b5341c3496124b0724ac8555fbb8ca363ebbb73"; + }; + }; + "hashring-3.2.0" = { + name = "hashring"; + packageName = "hashring"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hashring/-/hashring-3.2.0.tgz"; + sha1 = "fda4efde8aa22cdb97fb1d2a65e88401e1c144ce"; + }; + }; + "hat-0.0.3" = { + name = "hat"; + packageName = "hat"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/hat/-/hat-0.0.3.tgz"; + sha1 = "bb014a9e64b3788aed8005917413d4ff3d502d8a"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "help-me-1.1.0" = { + name = "help-me"; + packageName = "help-me"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/help-me/-/help-me-1.1.0.tgz"; + sha1 = "8f2d508d0600b4a456da2f086556e7e5c056a3c6"; + }; + }; + "highlight.js-8.9.1" = { + name = "highlight.js"; + packageName = "highlight.js"; + version = "8.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-8.9.1.tgz"; + sha1 = "b8a9c5493212a9392f0222b649c9611497ebfb88"; + }; + }; + "hipchat-notifier-1.1.0" = { + name = "hipchat-notifier"; + packageName = "hipchat-notifier"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hipchat-notifier/-/hipchat-notifier-1.1.0.tgz"; + sha1 = "b6d249755437c191082367799d3ba9a0f23b231e"; + }; + }; + "hiredis-0.4.1" = { + name = "hiredis"; + packageName = "hiredis"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hiredis/-/hiredis-0.4.1.tgz"; + sha1 = "aab4dcfd0fc4cbdb219d268005f2335a3c639e8f"; + }; + }; + "hmac-drbg-1.0.1" = { + name = "hmac-drbg"; + packageName = "hmac-drbg"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz"; + sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1"; + }; + }; + "hoek-0.7.6" = { + name = "hoek"; + packageName = "hoek"; + version = "0.7.6"; + src = fetchurl { + url = "https://registry.npmjs.org/hoek/-/hoek-0.7.6.tgz"; + sha1 = "60fbd904557541cd2b8795abf308a1b3770e155a"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "hogan.js-3.0.2" = { + name = "hogan.js"; + packageName = "hogan.js"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hogan.js/-/hogan.js-3.0.2.tgz"; + sha1 = "4cd9e1abd4294146e7679e41d7898732b02c7bfd"; + }; + }; + "home-or-tmp-2.0.0" = { + name = "home-or-tmp"; + packageName = "home-or-tmp"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz"; + sha1 = "e36c3f2d2cae7d746a857e38d18d5f32a7882db8"; + }; + }; + "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"; + }; + }; + "hooks-0.2.1" = { + name = "hooks"; + packageName = "hooks"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hooks/-/hooks-0.2.1.tgz"; + sha1 = "0f591b1b344bdcb3df59773f62fbbaf85bf4028b"; + }; + }; + "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"; + }; + }; + "hot-shots-4.8.0" = { + name = "hot-shots"; + packageName = "hot-shots"; + version = "4.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hot-shots/-/hot-shots-4.8.0.tgz"; + sha1 = "052be48430efc7d117ba7cc4d41f1833ba38c79f"; + }; + }; + "html-entities-1.2.1" = { + name = "html-entities"; + packageName = "html-entities"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz"; + sha1 = "0df29351f0721163515dfb9e5543e5f6eed5162f"; + }; + }; + "htmlescape-1.1.1" = { + name = "htmlescape"; + packageName = "htmlescape"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz"; + sha1 = "3a03edc2214bca3b66424a3e7959349509cb0351"; + }; + }; + "htmlparser2-3.7.3" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "3.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.7.3.tgz"; + sha1 = "6a64c77637c08c6f30ec2a8157a53333be7cb05e"; + }; + }; + "htmlparser2-3.8.3" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "3.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz"; + sha1 = "996c28b191516a8be86501a7d79757e5c70c1068"; + }; + }; + "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"; + }; + }; + "http-auth-2.0.7" = { + name = "http-auth"; + packageName = "http-auth"; + version = "2.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/http-auth/-/http-auth-2.0.7.tgz"; + sha1 = "aa1a61a4d6baae9d64436c6f0ef0f4de85c430e3"; + }; + }; + "http-auth-3.1.3" = { + name = "http-auth"; + packageName = "http-auth"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/http-auth/-/http-auth-3.1.3.tgz"; + sha1 = "945cfadd66521eaf8f7c84913d377d7b15f24e31"; + }; + }; + "http-basic-2.5.1" = { + name = "http-basic"; + packageName = "http-basic"; + version = "2.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-basic/-/http-basic-2.5.1.tgz"; + sha1 = "8ce447bdb5b6c577f8a63e3fa78056ec4bb4dbfb"; + }; + }; + "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/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz"; + sha512 = "3gsj16kpvygynld5ajbvg8ii3n3bka4waamdzx30wwhz72mdr6wvffm20rfnxwzid9fq49d5g333yjq5dz1qqbnk9bwcmrj9f5bda75"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "http-headers-3.0.2" = { + name = "http-headers"; + packageName = "http-headers"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/http-headers/-/http-headers-3.0.2.tgz"; + sha512 = "0xv0kpsablrjag5ci3qqwjf0hwvcp6yk0hgabv4im6ssanimgbr8yhzmyz4jd10sw5xhrimzhxp2xx34l8p6aryqxqqg0wnxlikbcgk"; + }; + }; + "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-parser-js-0.4.9" = { + name = "http-parser-js"; + packageName = "http-parser-js"; + version = "0.4.9"; + src = fetchurl { + url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.9.tgz"; + sha1 = "ea1a04fb64adff0242e9974f297dd4c3cad271e1"; + }; + }; + "http-proxy-1.0.2" = { + name = "http-proxy"; + packageName = "http-proxy"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.0.2.tgz"; + sha1 = "08060ff2edb2189e57aa3a152d3ac63ed1af7254"; + }; + }; + "http-proxy-1.16.2" = { + name = "http-proxy"; + packageName = "http-proxy"; + version = "1.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz"; + sha1 = "06dff292952bf64dbe8471fa9df73066d4f37742"; + }; + }; + "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/http-proxy-agent/-/http-proxy-agent-1.0.0.tgz"; + sha1 = "cc1ce38e453bf984a0f7702d2dd59c73d081284a"; + }; + }; + "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/http-proxy-middleware/-/http-proxy-middleware-0.17.4.tgz"; + sha1 = "642e8848851d66f09d4f124912846dbaeb41b833"; + }; + }; + "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/http-response-object/-/http-response-object-1.1.0.tgz"; + sha1 = "a7c4e75aae82f3bb4904e4f43f615673b4d518c3"; + }; + }; + "http-signature-0.11.0" = { + name = "http-signature"; + packageName = "http-signature"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz"; + sha1 = "1796cf67a001ad5cd6849dca0991485f09089fe6"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "httpntlm-1.6.1" = { + name = "httpntlm"; + packageName = "httpntlm"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/httpntlm/-/httpntlm-1.6.1.tgz"; + sha1 = "ad01527143a2e8773cfae6a96f58656bb52a34b2"; + }; + }; + "httpolyglot-0.1.2" = { + name = "httpolyglot"; + packageName = "httpolyglot"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/httpolyglot/-/httpolyglot-0.1.2.tgz"; + sha1 = "e4d347fe8984a62f467d4060df527f1851f6997b"; + }; + }; + "httpreq-0.4.24" = { + name = "httpreq"; + packageName = "httpreq"; + version = "0.4.24"; + src = fetchurl { + url = "https://registry.npmjs.org/httpreq/-/httpreq-0.4.24.tgz"; + sha1 = "4335ffd82cd969668a39465c929ac61d6393627f"; + }; + }; + "https-browserify-0.0.1" = { + name = "https-browserify"; + packageName = "https-browserify"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz"; + sha1 = "3f91365cabe60b77ed0ebba24b454e3e09d95a82"; + }; + }; + "https-browserify-1.0.0" = { + name = "https-browserify"; + packageName = "https-browserify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz"; + sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"; + }; + }; + "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/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz"; + sha1 = "35f7da6c48ce4ddbfa264891ac593ee5ff8671e6"; + }; + }; + "https-proxy-agent-2.1.1" = { + name = "https-proxy-agent"; + packageName = "https-proxy-agent"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.1.1.tgz"; + sha512 = "0rxbj60hs8fhs3i02lgb6ypcf9m9v8ybd4lfvfvpy0f1iyy54f1686lmv0rvkyxxihwvs4yizjgv8r8jksh385c4c9yjm3z8i0svbic"; + }; + }; + "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"; + }; + }; + "humanize-plus-1.8.2" = { + name = "humanize-plus"; + packageName = "humanize-plus"; + version = "1.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/humanize-plus/-/humanize-plus-1.8.2.tgz"; + sha1 = "a65b34459ad6367adbb3707a82a3c9f916167030"; + }; + }; + "humanize-string-1.0.1" = { + name = "humanize-string"; + packageName = "humanize-string"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/humanize-string/-/humanize-string-1.0.1.tgz"; + sha1 = "fce2d6c545efc25dea1f23235182c98da0180b42"; + }; + }; + "hypercore-6.12.0" = { + name = "hypercore"; + packageName = "hypercore"; + version = "6.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.12.0.tgz"; + sha512 = "00xsmbx8jcjzsibwwgknlpjvndb7zv6jdxik5skqnbizbdssvcwa2r5a7gd1cf7mpr2827067sxqqca9fmmknjnin2vvm16yb1pn5g8"; + }; + }; + "hypercore-protocol-6.5.2" = { + name = "hypercore-protocol"; + packageName = "hypercore-protocol"; + version = "6.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.5.2.tgz"; + sha512 = "03l77nma8ga06ywa469jzqgc13hjk9bg3w2cv95g3fwnqy2fvz8qpczcih65jscvk0ira5kpm3sk2vqh2whzzvnm19jlqrzi78v80n3"; + }; + }; + "hyperdrive-9.12.2" = { + name = "hyperdrive"; + packageName = "hyperdrive"; + version = "9.12.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-9.12.2.tgz"; + sha512 = "133iwkp8w88awfxffdjjfxl2wsrj99cdw1p2rvbv65q7mgficva14skid7vsd55r750lrvg0wbmlz0h4m44w6ypd7cvpb4hjvb2f815"; + }; + }; + "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.0.1" = { + name = "hyperdrive-network-speed"; + packageName = "hyperdrive-network-speed"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hyperdrive-network-speed/-/hyperdrive-network-speed-2.0.1.tgz"; + sha1 = "40daf82e31b9d753f2ae6dfaf0818661ed24fe15"; + }; + }; + "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"; + }; + }; "i18next-1.10.6" = { name = "i18next"; packageName = "i18next"; @@ -19125,184 +11482,31 @@ let sha1 = "fddd8b491502c48967a62963bc722ff897cddea0"; }; }; - "js-yaml-3.8.4" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "3.8.4"; + "i18next-client-1.10.3" = { + name = "i18next-client"; + packageName = "i18next-client"; + version = "1.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.4.tgz"; - sha1 = "520b4564f86573ba96662af85a8cafa7b4b5a6f6"; + url = "https://registry.npmjs.org/i18next-client/-/i18next-client-1.10.3.tgz"; + sha1 = "76d0353557ed90d1e7a87754d5004d3f7801fde9"; }; }; - "jsonata-1.2.6" = { - name = "jsonata"; - packageName = "jsonata"; - version = "1.2.6"; + "iconv-lite-0.4.11" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.11"; src = fetchurl { - url = "https://registry.npmjs.org/jsonata/-/jsonata-1.2.6.tgz"; - sha512 = "3bpyhs9imacbmpq0r7l65qvkx0dfnx92qz5vm59i983h2xvw2yrr1934i979accigkr33b65n51m5zx73glbi3pwl8n6zm5b3y74a8a"; + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.11.tgz"; + sha1 = "2ecb42fd294744922209a2e7c404dac8793d8ade"; }; }; - "mqtt-2.9.0" = { - name = "mqtt"; - packageName = "mqtt"; - version = "2.9.0"; + "iconv-lite-0.4.13" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.13"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-2.9.0.tgz"; - sha512 = "181qi8xb0lxxqvwq2xcslv35dbhphyr67w02bad6n4rlibcm6z0j055dyfpdh12mrrvgjzfj11cjylsj26y7vr17cvk1kbgkiqgzpb9"; - }; - }; - "multer-1.3.0" = { - name = "multer"; - packageName = "multer"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/multer/-/multer-1.3.0.tgz"; - sha1 = "092b2670f6846fa4914965efc8cf94c20fec6cd2"; - }; - }; - "mustache-2.3.0" = { - name = "mustache"; - packageName = "mustache"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mustache/-/mustache-2.3.0.tgz"; - sha1 = "4028f7778b17708a489930a6e52ac3bca0da41d0"; - }; - }; - "oauth2orize-1.8.0" = { - name = "oauth2orize"; - packageName = "oauth2orize"; - version = "1.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.8.0.tgz"; - sha1 = "f2ddc0115d635d0480746249c00f0ea1a9c51ba8"; - }; - }; - "passport-0.3.2" = { - name = "passport"; - packageName = "passport"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/passport/-/passport-0.3.2.tgz"; - sha1 = "9dd009f915e8fe095b0124a01b8f82da07510102"; - }; - }; - "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/passport-http-bearer/-/passport-http-bearer-1.0.1.tgz"; - sha1 = "147469ea3669e2a84c6167ef99dbb77e1f0098a8"; - }; - }; - "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/passport-oauth2-client-password/-/passport-oauth2-client-password-0.1.2.tgz"; - sha1 = "4f378b678b92d16dbbd233a6c706520093e561ba"; - }; - }; - "raw-body-2.2.0" = { - name = "raw-body"; - packageName = "raw-body"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.2.0.tgz"; - sha1 = "994976cf6a5096a41162840492f0bdc5d6e7fb96"; - }; - }; - "sentiment-2.1.0" = { - name = "sentiment"; - packageName = "sentiment"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sentiment/-/sentiment-2.1.0.tgz"; - sha1 = "33279100c35c38519ca5e435245186c512fe0fdc"; - }; - }; - "uglify-js-3.0.20" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "3.0.20"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.20.tgz"; - sha512 = "3apvpzjbs9vds18x8pxb8ysn94658xnajl5zfagr23xpbfhgbmlmajm0lnmz9h4jk99snzf51vcc1r0l0g4gmbdzcn574vvvzy3dxrv"; - }; - }; - "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"; - }; - }; - "ws-1.1.1" = { - name = "ws"; - packageName = "ws"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-1.1.1.tgz"; - sha1 = "082ddb6c641e85d4bb451f03d52f06eabdb1f018"; - }; - }; - "node-red-node-feedparser-0.1.8" = { - name = "node-red-node-feedparser"; - packageName = "node-red-node-feedparser"; - version = "0.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.8.tgz"; - sha1 = "56cf6f69bc6d23557f8627ee63b74c1caa85c65b"; - }; - }; - "node-red-node-email-0.1.24" = { - name = "node-red-node-email"; - packageName = "node-red-node-email"; - version = "0.1.24"; - src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.24.tgz"; - sha1 = "ba12c72b01b39e33f375ccbf4321b163425e8fb2"; - }; - }; - "node-red-node-twitter-0.1.12" = { - name = "node-red-node-twitter"; - packageName = "node-red-node-twitter"; - version = "0.1.12"; - src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.12.tgz"; - sha512 = "3h9isciksl33ajjzn4s0dp8s8m3zkijqc7rbw4v8glrhz5y3npbv8501sffak943jyd4k3dqalizv9giwaxqfd1760pkhbzh816y6j4"; - }; - }; - "node-red-node-rbe-0.1.14" = { - name = "node-red-node-rbe"; - packageName = "node-red-node-rbe"; - version = "0.1.14"; - src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.14.tgz"; - sha512 = "2xixj71payi14frjkb30lhnripprfcxzqaa9cbwh7w21s426y452ns0vpaycnbsbfwfcn5gcs4b2fjh0b6rxnbasd9hijqf6h3v26wa"; - }; - }; - "bcrypt-1.0.3" = { - name = "bcrypt"; - packageName = "bcrypt"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.3.tgz"; - sha512 = "1zfn87155w6q9fsv5ls3gxwih7yvarrh16kzpfrpppblzpmp1cy9gjkknsf9lkixacza39h51jd7varqfg19w3qkdic62zpirv86755"; - }; - }; - "debug-2.6.7" = { - name = "debug"; - packageName = "debug"; - version = "2.6.7"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz"; - sha1 = "92bad1f6d05bbb6bba22cca88bcd0ec894c2861e"; + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz"; + sha1 = "1f88aba4ab0b1508e8312acc39345f36e992e2f2"; }; }; "iconv-lite-0.4.15" = { @@ -19314,22 +11518,2813 @@ let sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb"; }; }; - "css-select-1.2.0" = { - name = "css-select"; - packageName = "css-select"; - version = "1.2.0"; + "iconv-lite-0.4.19" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.19"; src = fetchurl { - url = "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz"; - sha1 = "2b3a110539c5355f1cd8d314623e870b121ec858"; + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz"; + sha512 = "0jj1pdq3j9ak8cixn2kjp7ip8hf3xgnb85j4jr32yf9rry620v9072c0kk577mllfk1zl9wzs5ypwzbp7vbhf7j31d5rrqgwb0nldm1"; }; }; - "htmlparser2-3.9.2" = { - name = "htmlparser2"; - packageName = "htmlparser2"; - version = "3.9.2"; + "iconv-lite-0.4.8" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz"; - sha1 = "1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"; + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.8.tgz"; + sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20"; + }; + }; + "ieee754-1.1.8" = { + name = "ieee754"; + packageName = "ieee754"; + version = "1.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz"; + sha1 = "be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"; + }; + }; + "ignore-3.3.7" = { + name = "ignore"; + packageName = "ignore"; + version = "3.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz"; + sha512 = "0f6xhxww989yic6hwdm8mbylcyakfkrrn22a39wdcc9k842xxyyhzfxkmi79s9gjk3rp3h07n265lf4n51z8yafpdm78d617dxbfqb0"; + }; + }; + "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"; + }; + }; + "image-size-0.5.5" = { + name = "image-size"; + packageName = "image-size"; + version = "0.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz"; + sha1 = "09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"; + }; + }; + "imap-0.8.19" = { + name = "imap"; + packageName = "imap"; + version = "0.8.19"; + src = fetchurl { + url = "https://registry.npmjs.org/imap/-/imap-0.8.19.tgz"; + sha1 = "3678873934ab09cea6ba48741f284da2af59d8d5"; + }; + }; + "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/immediate-chunk-store/-/immediate-chunk-store-1.0.8.tgz"; + sha1 = "0ecdad0c546332672d7b5b511b26bb18ce56e73f"; + }; + }; + "import-jsx-1.3.0" = { + name = "import-jsx"; + packageName = "import-jsx"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-jsx/-/import-jsx-1.3.0.tgz"; + sha512 = "26xxz57vqm8p6mg0syr21risma4h5h9n8kn4zv4pcxqap4zxicc210w5m7vz6a4zldhd102sbi7giwzmw0wjlpr6rb1hycr8iv703b1"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "indent-string-3.2.0" = { + name = "indent-string"; + packageName = "indent-string"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz"; + sha1 = "4a5fd6d27cc332f37e5419a504dbb837105c9289"; + }; + }; + "indexof-0.0.1" = { + name = "indexof"; + packageName = "indexof"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"; + sha1 = "82dc336d232b9062179d05ab3293a66059fd435d"; + }; + }; + "infinity-agent-2.0.3" = { + name = "infinity-agent"; + packageName = "infinity-agent"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/infinity-agent/-/infinity-agent-2.0.3.tgz"; + sha1 = "45e0e2ff7a9eb030b27d62b74b3744b7a7ac4216"; + }; + }; + "inflection-1.10.0" = { + name = "inflection"; + packageName = "inflection"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/inflection/-/inflection-1.10.0.tgz"; + sha1 = "5bffcb1197ad3e81050f8e17e21668087ee9eb2f"; + }; + }; + "inflection-1.3.8" = { + name = "inflection"; + packageName = "inflection"; + version = "1.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/inflection/-/inflection-1.3.8.tgz"; + sha1 = "cbd160da9f75b14c3cc63578d4f396784bf3014e"; + }; + }; + "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-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"; + }; + }; + "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"; + }; + }; + "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.1.0" = { + name = "ini"; + packageName = "ini"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz"; + sha1 = "4e808c2ce144c6c1788918e034d6797bc6cf6281"; + }; + }; + "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"; + }; + }; + "init-package-json-1.10.1" = { + name = "init-package-json"; + packageName = "init-package-json"; + version = "1.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.10.1.tgz"; + sha1 = "cd873a167796befb99612b28762a0b6393fd8f6a"; + }; + }; + "ink-0.3.1" = { + name = "ink"; + packageName = "ink"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ink/-/ink-0.3.1.tgz"; + sha512 = "0km0z5smnzrh4c5386h3vbmvps6m45m6hbbf62as9wl4vw370q411gpxxhqz3i83n0qjds7py2ylgjx2y3915m5v77c1sf428w4wwkv"; + }; + }; + "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/ink-text-input/-/ink-text-input-1.1.1.tgz"; + sha512 = "3zdg79viy9vippnaj942c8scyk2nay9fqv3zbd681hfcvn082pxbhc7vszppd7k0fy74rd20s2ias98mi2qzhc6a6zm0p4vv6yybrkc"; + }; + }; + "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/inline-source-map/-/inline-source-map-0.6.2.tgz"; + sha1 = "f9393471c18a79d1724f863fa38b586370ade2a5"; + }; + }; + "innertext-1.0.2" = { + name = "innertext"; + packageName = "innertext"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/innertext/-/innertext-1.0.2.tgz"; + sha1 = "11a197b3143a593636fba5d59213835e6954580a"; + }; + }; + "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-0.12.0" = { + name = "inquirer"; + packageName = "inquirer"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz"; + sha1 = "1ef2bfd63504df0bc75785fff8c2c41df12f077e"; + }; + }; + "inquirer-0.8.5" = { + name = "inquirer"; + packageName = "inquirer"; + version = "0.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-0.8.5.tgz"; + sha1 = "dbd740cf6ca3b731296a63ce6f6d961851f336df"; + }; + }; + "inquirer-1.0.3" = { + name = "inquirer"; + packageName = "inquirer"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-1.0.3.tgz"; + sha1 = "ebe3a0948571bcc46ccccbe2f9bcec251e984bd0"; + }; + }; + "inquirer-1.2.3" = { + name = "inquirer"; + packageName = "inquirer"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-1.2.3.tgz"; + sha1 = "4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918"; + }; + }; + "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"; + }; + }; + "insert-module-globals-7.0.1" = { + name = "insert-module-globals"; + packageName = "insert-module-globals"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.0.1.tgz"; + sha1 = "c03bf4e01cb086d5b5e5ace8ad0afe7889d638c3"; + }; + }; + "insight-0.8.4" = { + name = "insight"; + packageName = "insight"; + version = "0.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/insight/-/insight-0.8.4.tgz"; + sha1 = "671caf65b47c9fe8c3d1b3206cf45bb211b75884"; + }; + }; + "int64-buffer-0.1.10" = { + name = "int64-buffer"; + packageName = "int64-buffer"; + version = "0.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/int64-buffer/-/int64-buffer-0.1.10.tgz"; + sha1 = "277b228a87d95ad777d07c13832022406a473423"; + }; + }; + "internal-ip-1.2.0" = { + name = "internal-ip"; + packageName = "internal-ip"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/internal-ip/-/internal-ip-1.2.0.tgz"; + sha1 = "ae9fbf93b984878785d50a8de1b356956058cf5c"; + }; + }; + "interpret-1.1.0" = { + name = "interpret"; + packageName = "interpret"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz"; + sha1 = "7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"; + }; + }; + "intersect-1.0.1" = { + name = "intersect"; + packageName = "intersect"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/intersect/-/intersect-1.0.1.tgz"; + sha1 = "332650e10854d8c0ac58c192bdc27a8bf7e7a30c"; + }; + }; + "into-stream-3.1.0" = { + name = "into-stream"; + packageName = "into-stream"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz"; + sha1 = "96fb0a936c12babd6ff1752a17d05616abd094c6"; + }; + }; + "invariant-2.2.2" = { + name = "invariant"; + packageName = "invariant"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz"; + sha1 = "9e1f56ac0acdb6bf303306f338be3b204ae60360"; + }; + }; + "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"; + }; + }; + "ip-1.0.1" = { + name = "ip"; + packageName = "ip"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ip/-/ip-1.0.1.tgz"; + sha1 = "c7e356cdea225ae71b36d70f2e71a92ba4e42590"; + }; + }; + "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"; + }; + }; + "ip-set-1.0.1" = { + name = "ip-set"; + packageName = "ip-set"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ip-set/-/ip-set-1.0.1.tgz"; + sha1 = "633b66d0bd6c8d0de968d053263c9120d3b6727e"; + }; + }; + "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"; + }; + }; + "ipaddr.js-1.4.0" = { + name = "ipaddr.js"; + packageName = "ipaddr.js"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.4.0.tgz"; + sha1 = "296aca878a821816e5b85d0a285a99bcff4582f0"; + }; + }; + "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"; + }; + }; + "ipaddr.js-1.5.4" = { + name = "ipaddr.js"; + packageName = "ipaddr.js"; + version = "1.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.4.tgz"; + sha1 = "962263d9d26132956fc5c630b638a30d3cdffc14"; + }; + }; + "irc-replies-2.0.1" = { + name = "irc-replies"; + packageName = "irc-replies"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/irc-replies/-/irc-replies-2.0.1.tgz"; + sha1 = "5bf4125fb6ec0f3929a89647b26e653232942b79"; + }; + }; + "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-absolute-0.1.7" = { + name = "is-absolute"; + packageName = "is-absolute"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz"; + sha1 = "847491119fccb5fb436217cc737f7faad50f603f"; + }; + }; + "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"; + }; + }; + "is-absolute-1.0.0" = { + name = "is-absolute"; + packageName = "is-absolute"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz"; + sha512 = "02g5p9wfcx3f1p0zq01ycrx5biwg79qg1mdw1cv6li7kxpny5hxsp34ynam7w2g6nvah73f0kzdkh6pxxmx1ymd8m02fwvgz6lsirbl"; + }; + }; + "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-alphabetical-1.0.1" = { + name = "is-alphabetical"; + packageName = "is-alphabetical"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.1.tgz"; + sha1 = "c77079cc91d4efac775be1034bf2d243f95e6f08"; + }; + }; + "is-alphanumerical-1.0.1" = { + name = "is-alphanumerical"; + packageName = "is-alphanumerical"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.1.tgz"; + sha1 = "dfb4aa4d1085e33bdb61c2dee9c80e9c6c19f53b"; + }; + }; + "is-arguments-1.0.2" = { + name = "is-arguments"; + packageName = "is-arguments"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.2.tgz"; + sha1 = "07e30ad79531844179b642d2d8399435182c8727"; + }; + }; + "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-arrayish-0.3.1" = { + name = "is-arrayish"; + packageName = "is-arrayish"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.1.tgz"; + sha1 = "c2dfc386abaa0c3e33c48db3fe87059e69065efd"; + }; + }; + "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-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"; + }; + }; + "is-callable-1.1.3" = { + name = "is-callable"; + packageName = "is-callable"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz"; + sha1 = "86eb75392805ddc33af71c92a0eedf74ee7604b2"; + }; + }; + "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-date-object-1.0.1" = { + name = "is-date-object"; + packageName = "is-date-object"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz"; + sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; + }; + }; + "is-decimal-1.0.1" = { + name = "is-decimal"; + packageName = "is-decimal"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.1.tgz"; + sha1 = "f5fb6a94996ad9e8e3761fbfbd091f1fca8c4e82"; + }; + }; + "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-docker-1.1.0" = { + name = "is-docker"; + packageName = "is-docker"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-docker/-/is-docker-1.1.0.tgz"; + sha1 = "f04374d4eee5310e9a8e113bf1495411e46176a1"; + }; + }; + "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-expression-2.1.0" = { + name = "is-expression"; + packageName = "is-expression"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-expression/-/is-expression-2.1.0.tgz"; + sha1 = "91be9d47debcfef077977e9722be6dcfb4465ef0"; + }; + }; + "is-expression-3.0.0" = { + name = "is-expression"; + packageName = "is-expression"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-expression/-/is-expression-3.0.0.tgz"; + sha1 = "39acaa6be7fd1f3471dc42c7416e61c24317ac9f"; + }; + }; + "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-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"; + }; + }; + "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-hexadecimal-1.0.1" = { + name = "is-hexadecimal"; + packageName = "is-hexadecimal"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.1.tgz"; + sha1 = "6e084bbc92061fbb0971ec58b6ce6d404e24da69"; + }; + }; + "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-my-json-valid-2.17.1" = { + name = "is-my-json-valid"; + packageName = "is-my-json-valid"; + version = "2.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.1.tgz"; + sha512 = "2qkjhj6i3y40j35y8k722kklm1j8dfwk9506csa3vxr16vv7125v8jzpmkl551gsif98bzn205yj3sb99xi1i4bd6p5a1m81wvj2sa3"; + }; + }; + "is-negated-glob-1.0.0" = { + name = "is-negated-glob"; + packageName = "is-negated-glob"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz"; + sha1 = "6910bca5da8c95e784b5751b976cf5a10fee36d2"; + }; + }; + "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-0.1.1" = { + name = "is-number"; + packageName = "is-number"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz"; + sha1 = "69a7af116963d47206ec9bd9b48a14216f1e3806"; + }; + }; + "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-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-1.0.0" = { + name = "is-odd"; + packageName = "is-odd"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-odd/-/is-odd-1.0.0.tgz"; + sha1 = "3b8a932eb028b3775c39bb09e91767accdb69088"; + }; + }; + "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/is-path-cwd/-/is-path-cwd-1.0.0.tgz"; + sha1 = "d225ec23132e89edd38fda767472e62e65f1106d"; + }; + }; + "is-path-in-cwd-1.0.0" = { + name = "is-path-in-cwd"; + packageName = "is-path-in-cwd"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz"; + sha1 = "6477582b8214d602346094567003be8a9eac04dc"; + }; + }; + "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-obj-1.1.0" = { + name = "is-plain-obj"; + packageName = "is-plain-obj"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; + sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e"; + }; + }; + "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-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"; + }; + }; + "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-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"; + }; + }; + "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-regex-1.0.4" = { + name = "is-regex"; + packageName = "is-regex"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz"; + sha1 = "5517489b547091b0930e095654ced25ee97e9491"; + }; + }; + "is-regexp-1.0.0" = { + name = "is-regexp"; + packageName = "is-regexp"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz"; + sha1 = "fd2d883545c46bac5a633e7b9a09e87fa2cb5069"; + }; + }; + "is-relative-0.1.3" = { + name = "is-relative"; + packageName = "is-relative"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz"; + sha1 = "905fee8ae86f45b3ec614bc3c15c869df0876e82"; + }; + }; + "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-relative-1.0.0" = { + name = "is-relative"; + packageName = "is-relative"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz"; + sha512 = "0c1pd4414iy40xq652p1zgqgmncmm7xcns96pfazd63v439vyc1z93bvzvbw5r2qc4fp24414ydnj4gdsqlq223pfg05ar2mmwd23rb"; + }; + }; + "is-resolvable-1.1.0" = { + name = "is-resolvable"; + packageName = "is-resolvable"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz"; + sha512 = "0r8v3dkj5qbfh2wlj4w1msyqsw6j5myvxi88wkw36isscb97yyc2yc1pwm64djrmh1css6jp9p08cx1zb479fg4gv26prciaifdh05a"; + }; + }; + "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-root-1.0.0" = { + name = "is-root"; + packageName = "is-root"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-root/-/is-root-1.0.0.tgz"; + sha1 = "07b6c233bc394cd9d02ba15c966bd6660d6342d5"; + }; + }; + "is-scoped-1.0.0" = { + name = "is-scoped"; + packageName = "is-scoped"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-scoped/-/is-scoped-1.0.0.tgz"; + sha1 = "449ca98299e713038256289ecb2b540dc437cb30"; + }; + }; + "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-subset-0.1.1" = { + name = "is-subset"; + packageName = "is-subset"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz"; + sha1 = "8a59117d932de1de00f245fcdd39ce43f1e939a6"; + }; + }; + "is-supported-regexp-flag-1.0.0" = { + name = "is-supported-regexp-flag"; + packageName = "is-supported-regexp-flag"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.0.tgz"; + sha1 = "8b520c85fae7a253382d4b02652e045576e13bb8"; + }; + }; + "is-symbol-1.0.1" = { + name = "is-symbol"; + packageName = "is-symbol"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz"; + sha1 = "3cc59f00025194b6ab2e38dbae6689256b660572"; + }; + }; + "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/is-text-path/-/is-text-path-1.0.1.tgz"; + sha1 = "4e1aa0fb51bfbcb3e92688001397202c1775b66e"; + }; + }; + "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-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"; + }; + }; + "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/is-unc-path/-/is-unc-path-1.0.0.tgz"; + sha512 = "2asak63h3kc1vackrpai7qfiv15ndr231w1yc753m1dy7fd6ywxsr0rvh88b9ppyxhmc373fqk89a0pw3dllv7m5nbbbcqzvmaskccs"; + }; + }; + "is-url-1.2.2" = { + name = "is-url"; + packageName = "is-url"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-url/-/is-url-1.2.2.tgz"; + sha1 = "498905a593bf47cc2d9e7f738372bbf7696c7f26"; + }; + }; + "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-glob-0.3.0" = { + name = "is-valid-glob"; + packageName = "is-valid-glob"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz"; + sha1 = "d4b55c69f51886f9b65c70d6c2622d37e29f48fe"; + }; + }; + "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"; + }; + }; + "is-windows-1.0.1" = { + name = "is-windows"; + packageName = "is-windows"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.1.tgz"; + sha1 = "310db70f742d259a16a369202b51af84233310d9"; + }; + }; + "is-wsl-1.1.0" = { + name = "is-wsl"; + packageName = "is-wsl"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz"; + sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d"; + }; + }; + "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"; + }; + }; + "isarray-2.0.1" = { + name = "isarray"; + packageName = "isarray"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz"; + sha1 = "a37d94ed9cda2d59865c9f76fe596ee1f338741e"; + }; + }; + "isbinaryfile-3.0.2" = { + name = "isbinaryfile"; + packageName = "isbinaryfile"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.2.tgz"; + sha1 = "4a3e974ec0cba9004d3fc6cde7209ea69368a621"; + }; + }; + "isemail-1.2.0" = { + name = "isemail"; + packageName = "isemail"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz"; + sha1 = "be03df8cc3e29de4d2c5df6501263f1fa4595e9a"; + }; + }; + "isexe-1.1.2" = { + name = "isexe"; + packageName = "isexe"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz"; + sha1 = "36f3e22e60750920f5e7241a476a8c6a42275ad0"; + }; + }; + "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"; + }; + }; + "isomorphic-fetch-2.2.1" = { + name = "isomorphic-fetch"; + packageName = "isomorphic-fetch"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz"; + sha1 = "611ae1acf14f5e81f729507472819fe9733558a9"; + }; + }; + "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"; + }; + }; + "iterare-0.0.8" = { + name = "iterare"; + packageName = "iterare"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/iterare/-/iterare-0.0.8.tgz"; + sha1 = "a969a80a1fbff6b78f28776594d7bc2bdfab6aad"; + }; + }; + "iterate-object-1.3.2" = { + name = "iterate-object"; + packageName = "iterate-object"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/iterate-object/-/iterate-object-1.3.2.tgz"; + sha1 = "24ec15affa5d0039e8839695a21c2cae1f45b66b"; + }; + }; + "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.27.0" = { + name = "jade"; + packageName = "jade"; + version = "0.27.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jade/-/jade-0.27.0.tgz"; + sha1 = "dc5ebed10d04a5e0eaf49ef0009bec473d1a6b31"; + }; + }; + "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"; + }; + }; + "jaeger-client-3.7.0" = { + name = "jaeger-client"; + packageName = "jaeger-client"; + version = "3.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.7.0.tgz"; + sha1 = "65ec79e33fc6aaeb5acf36064d08acf4ec47da96"; + }; + }; + "jed-1.1.1" = { + name = "jed"; + packageName = "jed"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jed/-/jed-1.1.1.tgz"; + sha1 = "7a549bbd9ffe1585b0cd0a191e203055bee574b4"; + }; + }; + "jetpack-id-1.0.0" = { + name = "jetpack-id"; + packageName = "jetpack-id"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jetpack-id/-/jetpack-id-1.0.0.tgz"; + sha1 = "2cf9fbae46d8074fc16b7de0071c8efebca473a6"; + }; + }; + "jju-1.3.0" = { + name = "jju"; + packageName = "jju"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jju/-/jju-1.3.0.tgz"; + sha1 = "dadd9ef01924bc728b03f2f7979bdbd62f7a2aaa"; + }; + }; + "jmespath-0.15.0" = { + name = "jmespath"; + packageName = "jmespath"; + version = "0.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz"; + sha1 = "a3f222a9aae9f966f5d27c796510e28091764217"; + }; + }; + "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"; + }; + }; + "joi-6.10.1" = { + name = "joi"; + packageName = "joi"; + version = "6.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/joi/-/joi-6.10.1.tgz"; + sha1 = "4d50c318079122000fe5f16af1ff8e1917b77e06"; + }; + }; + "js-select-0.6.0" = { + name = "js-select"; + packageName = "js-select"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-select/-/js-select-0.6.0.tgz"; + sha1 = "c284e22824d5927aec962dcdf247174aefb0d190"; + }; + }; + "js-stringify-1.0.2" = { + name = "js-stringify"; + packageName = "js-stringify"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz"; + sha1 = "1736fddfd9724f28a3682adc6230ae7e4e9679db"; + }; + }; + "js-tokens-3.0.2" = { + name = "js-tokens"; + packageName = "js-tokens"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz"; + sha1 = "9866df395102130e38f7f996bceb65443209c25b"; + }; + }; + "js-yaml-0.3.7" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "0.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-0.3.7.tgz"; + sha1 = "d739d8ee86461e54b354d6a7d7d1f2ad9a167f62"; + }; + }; + "js-yaml-2.1.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-2.1.0.tgz"; + sha1 = "a55a6e4706b01d06326259a6f4bfc42e6ae38b1f"; + }; + }; + "js-yaml-3.10.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz"; + sha512 = "0h26sq1bwxc45bm0hvlcadrbk4bizzaw729wvw690ya7mpys45bqfzdqwhjkdrnq0i44dzxckykz4bix22jfdyfg1asybg3yzczjsrv"; + }; + }; + "js-yaml-3.8.4" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.4.tgz"; + sha1 = "520b4564f86573ba96662af85a8cafa7b4b5a6f6"; + }; + }; + "js2xmlparser-1.0.0" = { + name = "js2xmlparser"; + packageName = "js2xmlparser"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-1.0.0.tgz"; + sha1 = "5a170f2e8d6476ce45405e04823242513782fe30"; + }; + }; + "js2xmlparser-3.0.0" = { + name = "js2xmlparser"; + packageName = "js2xmlparser"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-3.0.0.tgz"; + sha1 = "3fb60eaa089c5440f9319f51760ccd07e2499733"; + }; + }; + "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"; + }; + }; + "jsesc-1.3.0" = { + name = "jsesc"; + packageName = "jsesc"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz"; + sha1 = "46c3fec8c1892b12b0833db9bc7622176dbab34b"; + }; + }; + "jshint-2.8.0" = { + name = "jshint"; + packageName = "jshint"; + version = "2.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jshint/-/jshint-2.8.0.tgz"; + sha1 = "1d09a3bd913c4cadfa81bf18d582bd85bffe0d44"; + }; + }; + "json-buffer-3.0.0" = { + name = "json-buffer"; + packageName = "json-buffer"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz"; + sha1 = "5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"; + }; + }; + "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/json-edm-parser/-/json-edm-parser-0.1.2.tgz"; + sha1 = "1e60b0fef1bc0af67bc0d146dfdde5486cd615b4"; + }; + }; + "json-loader-0.5.7" = { + name = "json-loader"; + packageName = "json-loader"; + version = "0.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz"; + sha512 = "3iwy9jwca9hg6h1k7cmcdlsygn2qzjv7w72fsrfjfpdrcyd4xc5fb11sf664rvnzrfmz24f19kvi3qawif4n63lggvpg5pv73qfrcs0"; + }; + }; + "json-parse-better-errors-1.0.1" = { + name = "json-parse-better-errors"; + packageName = "json-parse-better-errors"; + 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"; + }; + }; + "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/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz"; + sha1 = "13f14ce02eed4e981297b64eb9e3b932e2dd13dc"; + }; + }; + "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-rpc2-0.8.1" = { + name = "json-rpc2"; + packageName = "json-rpc2"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-rpc2/-/json-rpc2-0.8.1.tgz"; + sha1 = "efe8c9834605b556c488d1ed7bcf24ee381eeeb2"; + }; + }; + "json-schema-0.2.2" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"; + sha1 = "50354f19f603917c695f70b85afa77c3b0f23506"; + }; + }; + "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-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-stable-stringify-0.0.1" = { + name = "json-stable-stringify"; + packageName = "json-stable-stringify"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz"; + sha1 = "611c23e814db375527df851193db59dd2af27f45"; + }; + }; + "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"; + }; + }; + "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/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; + sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; + }; + }; + "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/json-stringify-safe/-/json-stringify-safe-3.0.0.tgz"; + sha1 = "9db7b0e530c7f289c5e8c8432af191c2ff75a5b3"; + }; + }; + "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"; + }; + }; + "json3-3.2.6" = { + name = "json3"; + packageName = "json3"; + version = "3.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/json3/-/json3-3.2.6.tgz"; + sha1 = "f6efc93c06a04de9aec53053df2559bb19e2038b"; + }; + }; + "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"; + }; + }; + "json5-0.2.0" = { + name = "json5"; + packageName = "json5"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json5/-/json5-0.2.0.tgz"; + sha1 = "b6d7035c70c4570f883c7edc759de3ae03db3343"; + }; + }; + "json5-0.5.1" = { + name = "json5"; + packageName = "json5"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz"; + sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; + }; + }; + "jsonata-1.2.6" = { + name = "jsonata"; + packageName = "jsonata"; + version = "1.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonata/-/jsonata-1.2.6.tgz"; + sha512 = "3bpyhs9imacbmpq0r7l65qvkx0dfnx92qz5vm59i983h2xvw2yrr1934i979accigkr33b65n51m5zx73glbi3pwl8n6zm5b3y74a8a"; + }; + }; + "jsonfile-1.0.1" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz"; + sha1 = "ea5efe40b83690b98667614a7392fc60e842c0dd"; + }; + }; + "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"; + }; + }; + "jsonfile-4.0.0" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz"; + sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; + }; + }; + "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"; + }; + }; + "jsonlint-1.6.2" = { + name = "jsonlint"; + packageName = "jsonlint"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.2.tgz"; + sha1 = "5737045085f55eb455c68b1ff4ebc01bd50e8830"; + }; + }; + "jsonminify-0.4.1" = { + name = "jsonminify"; + packageName = "jsonminify"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonminify/-/jsonminify-0.4.1.tgz"; + sha1 = "805dafbb39395188cee9ab582c81ef959d7e710c"; + }; + }; + "jsonparse-0.0.5" = { + name = "jsonparse"; + packageName = "jsonparse"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz"; + sha1 = "330542ad3f0a654665b778f3eb2d9a9fa507ac64"; + }; + }; + "jsonparse-0.0.6" = { + name = "jsonparse"; + packageName = "jsonparse"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.6.tgz"; + sha1 = "ab599f19324d4ae178fa21a930192ab11ab61a4e"; + }; + }; + "jsonparse-1.2.0" = { + name = "jsonparse"; + packageName = "jsonparse"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.2.0.tgz"; + sha1 = "5c0c5685107160e72fe7489bddea0b44c2bc67bd"; + }; + }; + "jsonparse-1.3.1" = { + name = "jsonparse"; + packageName = "jsonparse"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz"; + sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280"; + }; + }; + "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"; + }; + }; + "jsonwebtoken-7.1.9" = { + name = "jsonwebtoken"; + packageName = "jsonwebtoken"; + version = "7.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.1.9.tgz"; + sha1 = "847804e5258bec5a9499a8dc4a5e7a3bae08d58a"; + }; + }; + "jspm-config-0.3.4" = { + name = "jspm-config"; + packageName = "jspm-config"; + version = "0.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/jspm-config/-/jspm-config-0.3.4.tgz"; + sha1 = "44c26902e4ae8ece2366cedc9ff16b10a5f391c6"; + }; + }; + "jsprim-0.3.0" = { + name = "jsprim"; + packageName = "jsprim"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsprim/-/jsprim-0.3.0.tgz"; + sha1 = "cd13466ea2480dbd8396a570d47d31dda476f8b1"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "jstransform-10.1.0" = { + name = "jstransform"; + packageName = "jstransform"; + version = "10.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jstransform/-/jstransform-10.1.0.tgz"; + sha1 = "b4c49bf63f162c108b0348399a8737c713b0a83a"; + }; + }; + "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"; + }; + }; + "jstransformer-1.0.0" = { + name = "jstransformer"; + packageName = "jstransformer"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz"; + sha1 = "ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3"; + }; + }; + "jszip-2.6.1" = { + name = "jszip"; + packageName = "jszip"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jszip/-/jszip-2.6.1.tgz"; + sha1 = "b88f3a7b2e67a2a048152982c7a3756d9c4828f0"; + }; + }; + "just-detect-adblock-1.0.0" = { + name = "just-detect-adblock"; + packageName = "just-detect-adblock"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/just-detect-adblock/-/just-detect-adblock-1.0.0.tgz"; + sha1 = "7bf8660cf15571fe7cf3b49c222e4716e1605a0c"; + }; + }; + "jwa-1.1.5" = { + name = "jwa"; + packageName = "jwa"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz"; + sha1 = "a0552ce0220742cd52e153774a32905c30e756e5"; + }; + }; + "jws-3.1.4" = { + name = "jws"; + packageName = "jws"; + version = "3.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz"; + sha1 = "f9e8b9338e8a847277d6444b1464f61880e050a2"; + }; + }; + "jwt-decode-2.2.0" = { + name = "jwt-decode"; + packageName = "jwt-decode"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jwt-decode/-/jwt-decode-2.2.0.tgz"; + sha1 = "7d86bd56679f58ce6a84704a657dd392bba81a79"; + }; + }; + "k-bucket-0.6.0" = { + name = "k-bucket"; + packageName = "k-bucket"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/k-bucket/-/k-bucket-0.6.0.tgz"; + sha1 = "afc532545f69d466293e887b00d5fc73377c3abb"; + }; + }; + "k-bucket-2.0.1" = { + name = "k-bucket"; + packageName = "k-bucket"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/k-bucket/-/k-bucket-2.0.1.tgz"; + sha1 = "58cccb244f563326ba893bf5c06a35f644846daa"; + }; + }; + "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-rpc-3.7.0" = { + name = "k-rpc"; + packageName = "k-rpc"; + version = "3.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/k-rpc/-/k-rpc-3.7.0.tgz"; + sha1 = "641f99b2825be34b6e7984f22b7962dc1a906c23"; + }; + }; + "k-rpc-4.2.1" = { + name = "k-rpc"; + packageName = "k-rpc"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/k-rpc/-/k-rpc-4.2.1.tgz"; + sha512 = "2nbjxg0x7jsa14zhvx68w1vri68hsxzbxz7b7ap76fdp0jkrgna2rq636yxnax04f3f8i2ambj2fpan6qli6vixmfryz78vrapdip8n"; + }; + }; + "k-rpc-socket-1.7.2" = { + name = "k-rpc-socket"; + packageName = "k-rpc-socket"; + version = "1.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.7.2.tgz"; + sha512 = "02w1ih1lh86i5ap7c3dy2ml7g5a11r0w300iyxdf6v02qr0j1x3vf78hx5q9dgg3drifab018mgm851m457zzzi05i2z2r1s3zlflc3"; + }; + }; + "kad-fs-0.0.4" = { + name = "kad-fs"; + packageName = "kad-fs"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/kad-fs/-/kad-fs-0.0.4.tgz"; + sha1 = "02ea5aa5cf22225725579627ccfd6d266372289a"; + }; + }; + "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"; + }; + }; + "kad-localstorage-0.0.7" = { + name = "kad-localstorage"; + packageName = "kad-localstorage"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/kad-localstorage/-/kad-localstorage-0.0.7.tgz"; + sha1 = "f7a2e780da53fb28b943c2c5a894c279aa810f17"; + }; + }; + "kad-memstore-0.0.1" = { + name = "kad-memstore"; + packageName = "kad-memstore"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/kad-memstore/-/kad-memstore-0.0.1.tgz"; + sha1 = "83cb748496ac491c7135104cbe56b88ca7392477"; + }; + }; + "keen.io-0.1.3" = { + name = "keen.io"; + packageName = "keen.io"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/keen.io/-/keen.io-0.1.3.tgz"; + sha1 = "5056f5c989ab14ccf62fc20ed7598115ae7d09e3"; + }; + }; + "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/keep-alive-agent/-/keep-alive-agent-0.0.1.tgz"; + sha1 = "44847ca394ce8d6b521ae85816bd64509942b385"; + }; + }; + "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"; + }; + }; + "kew-0.7.0" = { + name = "kew"; + packageName = "kew"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz"; + sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b"; + }; + }; + "keygrip-1.0.2" = { + name = "keygrip"; + packageName = "keygrip"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/keygrip/-/keygrip-1.0.2.tgz"; + sha1 = "ad3297c557069dea8bcfe7a4fa491b75c5ddeb91"; + }; + }; + "keypress-0.1.0" = { + name = "keypress"; + packageName = "keypress"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz"; + sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a"; + }; + }; + "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"; + }; + }; + "keyv-3.0.0" = { + name = "keyv"; + packageName = "keyv"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz"; + sha512 = "32ga97c763vprf4sjbb2f7gbngfppq9n1hy4cpq2h4yb1msrhh2zjimxib7p09mzgynm6askbigxlsqsm11p644avp4sf5nmng8f2vs"; + }; + }; + "kind-of-2.0.1" = { + name = "kind-of"; + packageName = "kind-of"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz"; + sha1 = "018ec7a4ce7e3a86cb9141be519d24c8faa981b5"; + }; + }; + "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"; + }; + }; + "klaw-2.0.0" = { + name = "klaw"; + packageName = "klaw"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/klaw/-/klaw-2.0.0.tgz"; + sha1 = "59c128e0dc5ce410201151194eeb9cbf858650f6"; + }; + }; + "knockout-3.5.0-beta" = { + name = "knockout"; + packageName = "knockout"; + version = "3.5.0-beta"; + src = fetchurl { + url = "https://registry.npmjs.org/knockout/-/knockout-3.5.0-beta.tgz"; + sha512 = "2qh1bqb9lj7l92pwcrwmpcanbyn65rmni3swyv6hrphn7xbaw8mkir3w67sf4ardk1iqvz9waalq2wf2rgpvvblhva2n2hssq6as6yr"; + }; + }; + "kuduscript-1.0.15" = { + name = "kuduscript"; + packageName = "kuduscript"; + version = "1.0.15"; + src = fetchurl { + url = "https://registry.npmjs.org/kuduscript/-/kuduscript-1.0.15.tgz"; + sha1 = "2721f05aa6876534cd30d6ded9418651cadfaa21"; + }; + }; + "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/labeled-stream-splicer/-/labeled-stream-splicer-2.0.0.tgz"; + sha1 = "a52e1d138024c00b86b1c0c91f677918b8ae0a59"; + }; + }; + "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-1.0.1" = { + name = "latest-version"; + packageName = "latest-version"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/latest-version/-/latest-version-1.0.1.tgz"; + sha1 = "72cfc46e3e8d1be651e1ebb54ea9f6ea96f374bb"; + }; + }; + "latest-version-2.0.0" = { + name = "latest-version"; + packageName = "latest-version"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz"; + sha1 = "56f8d6139620847b8017f8f1f4d78e211324168b"; + }; + }; + "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-1.0.11" = { + name = "lazy"; + packageName = "lazy"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy/-/lazy-1.0.11.tgz"; + sha1 = "daa068206282542c088288e975c297c1ae77b690"; + }; + }; + "lazy-cache-0.2.7" = { + name = "lazy-cache"; + packageName = "lazy-cache"; + version = "0.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz"; + sha1 = "7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65"; + }; + }; + "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"; + }; + }; + "lazy-cache-2.0.2" = { + name = "lazy-cache"; + packageName = "lazy-cache"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz"; + sha1 = "b9190a4f913354694840859f8a8f7084d8822264"; + }; + }; + "lazystream-1.0.0" = { + name = "lazystream"; + packageName = "lazystream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz"; + sha1 = "f6995fe0f820392f61396be89462407bb77168e4"; + }; + }; + "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"; + }; + }; + "leek-0.0.24" = { + name = "leek"; + packageName = "leek"; + version = "0.0.24"; + src = fetchurl { + url = "https://registry.npmjs.org/leek/-/leek-0.0.24.tgz"; + sha1 = "e400e57f0e60d8ef2bd4d068dc428a54345dbcda"; + }; + }; + "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"; + }; + }; + "less-2.7.3" = { + name = "less"; + packageName = "less"; + version = "2.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/less/-/less-2.7.3.tgz"; + sha512 = "04jbm6adzhknlcwjjdd94n8dhqwgsg0fyampis9854jf23z9g9lxs8593908ymwldl88bjipf9b9rw6xfibb29vv7s0c44wllj4ixr8"; + }; + }; + "less-middleware-2.2.1" = { + name = "less-middleware"; + packageName = "less-middleware"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/less-middleware/-/less-middleware-2.2.1.tgz"; + sha512 = "059c8rz6wkzc3fwd62a6f3lfw3h9sxj2fr0jjyr1i9kwfvk3737xyzndyshklllx5gnfri9z2g9a28c2ccnd6ka6adn6i7h4z5frw6m"; + }; + }; + "level-0.18.0" = { + name = "level"; + packageName = "level"; + version = "0.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/level/-/level-0.18.0.tgz"; + sha1 = "e1a3f4cad65fc02e25070a47d63d7b527361c1cf"; + }; + }; + "level-packager-0.18.0" = { + name = "level-packager"; + packageName = "level-packager"; + version = "0.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/level-packager/-/level-packager-0.18.0.tgz"; + sha1 = "c076b087646f1d7dedcc3442f58800dd0a0b45f5"; + }; + }; + "level-post-1.0.5" = { + name = "level-post"; + packageName = "level-post"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/level-post/-/level-post-1.0.5.tgz"; + sha1 = "2a66390409bf6a1621a444bab6f016444cc9802c"; + }; + }; + "level-sublevel-6.6.1" = { + name = "level-sublevel"; + packageName = "level-sublevel"; + version = "6.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/level-sublevel/-/level-sublevel-6.6.1.tgz"; + sha1 = "f9a77f7521ab70a8f8e92ed56f21a3c7886a4485"; + }; + }; + "leveldown-0.10.6" = { + name = "leveldown"; + packageName = "leveldown"; + version = "0.10.6"; + src = fetchurl { + url = "https://registry.npmjs.org/leveldown/-/leveldown-0.10.6.tgz"; + sha1 = "a1bb751c95263ff60f41bde0f973ff8c1e98bbe9"; + }; + }; + "levelup-0.18.6" = { + name = "levelup"; + packageName = "levelup"; + version = "0.18.6"; + src = fetchurl { + url = "https://registry.npmjs.org/levelup/-/levelup-0.18.6.tgz"; + sha1 = "e6a01cb089616c8ecc0291c2a9bd3f0c44e3e5eb"; + }; + }; + "levelup-0.19.1" = { + name = "levelup"; + packageName = "levelup"; + version = "0.19.1"; + src = fetchurl { + url = "https://registry.npmjs.org/levelup/-/levelup-0.19.1.tgz"; + sha1 = "f3a6a7205272c4b5f35e412ff004a03a0aedf50b"; + }; + }; + "leven-1.0.2" = { + name = "leven"; + packageName = "leven"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/leven/-/leven-1.0.2.tgz"; + sha1 = "9144b6eebca5f1d0680169f1a6770dcea60b75c3"; + }; + }; + "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"; + }; + }; + "lexical-scope-1.2.0" = { + name = "lexical-scope"; + packageName = "lexical-scope"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz"; + sha1 = "fcea5edc704a4b3a8796cdca419c3a0afaf22df4"; + }; + }; + "lexicographic-integer-1.1.0" = { + name = "lexicographic-integer"; + packageName = "lexicographic-integer"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lexicographic-integer/-/lexicographic-integer-1.1.0.tgz"; + sha1 = "52ca6d998a572e6322b515f5b80e396c6043e9b8"; + }; + }; + "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"; + }; + }; + "libmime-1.2.0" = { + name = "libmime"; + packageName = "libmime"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/libmime/-/libmime-1.2.0.tgz"; + sha1 = "8d84b4f3b225b3704410236ef494906436ba742b"; + }; + }; + "libmime-3.0.0" = { + name = "libmime"; + packageName = "libmime"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/libmime/-/libmime-3.0.0.tgz"; + sha1 = "51a1a9e7448ecbd32cda54421675bb21bc093da6"; + }; + }; + "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"; + }; + }; + "libquassel-2.1.9" = { + name = "libquassel"; + packageName = "libquassel"; + version = "2.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/libquassel/-/libquassel-2.1.9.tgz"; + sha1 = "e80ad2ef5c081ac677f66515d107537fdc0f5c64"; + }; + }; + "liftoff-2.5.0" = { + name = "liftoff"; + packageName = "liftoff"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/liftoff/-/liftoff-2.5.0.tgz"; + sha1 = "2009291bb31cea861bbf10a7c15a28caf75c31ec"; + }; + }; + "limitation-0.2.0" = { + name = "limitation"; + packageName = "limitation"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/limitation/-/limitation-0.2.0.tgz"; + sha1 = "70ce102a972a0b79d4ca13a3ab62b8e6fe682a62"; + }; + }; + "linewise-0.0.3" = { + name = "linewise"; + packageName = "linewise"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/linewise/-/linewise-0.0.3.tgz"; + sha1 = "bf967ba0dd31faaf09ab5bdb3676ad7f2aa18493"; + }; + }; + "linkify-it-1.2.4" = { + name = "linkify-it"; + packageName = "linkify-it"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/linkify-it/-/linkify-it-1.2.4.tgz"; + sha1 = "0773526c317c8fd13bd534ee1d180ff88abf881a"; + }; + }; + "linkify-it-2.0.3" = { + name = "linkify-it"; + packageName = "linkify-it"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/linkify-it/-/linkify-it-2.0.3.tgz"; + sha1 = "d94a4648f9b1c179d64fa97291268bdb6ce9434f"; + }; + }; + "listify-1.0.0" = { + name = "listify"; + packageName = "listify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/listify/-/listify-1.0.0.tgz"; + sha1 = "03ca7ba2d150d4267773f74e57558d1053d2bee3"; + }; + }; + "livereload-js-2.3.0" = { + name = "livereload-js"; + packageName = "livereload-js"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/livereload-js/-/livereload-js-2.3.0.tgz"; + sha512 = "0r82qh90jnyg6hlqn2yni36q942y4qn6rc0rydmbsy7x1lr00a0pddw2lg8xixcjh6wnrsfb5q76m51fac7vanrz0cawsw6azy78m4g"; + }; + }; + "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"; + }; + }; + "load-json-file-2.0.0" = { + name = "load-json-file"; + packageName = "load-json-file"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz"; + sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8"; + }; + }; + "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/load-json-file/-/load-json-file-4.0.0.tgz"; + sha1 = "2f5f45ab91e33216234fd53adab668eb4ec0993b"; + }; + }; + "loader-runner-2.3.0" = { + name = "loader-runner"; + packageName = "loader-runner"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz"; + sha1 = "f482aea82d543e07921700d5a46ef26fdac6b8a2"; + }; + }; + "loader-utils-1.1.0" = { + name = "loader-utils"; + packageName = "loader-utils"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz"; + sha1 = "c98aef488bcceda2ffb5e2de646d6a754429f5cd"; + }; + }; + "locate-path-2.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz"; + sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; + }; + }; + "lockfile-1.0.3" = { + name = "lockfile"; + packageName = "lockfile"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.3.tgz"; + sha1 = "2638fc39a0331e9cac1a04b71799931c9c50df79"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "lodash-3.1.0" = { + name = "lodash"; + packageName = "lodash"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-3.1.0.tgz"; + sha1 = "d41b8b33530cb3be088853208ad30092d2c27961"; + }; + }; + "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-3.7.0" = { + name = "lodash"; + packageName = "lodash"; + version = "3.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz"; + sha1 = "3678bd8ab995057c07ade836ed2ef087da811d45"; + }; + }; + "lodash-4.13.1" = { + name = "lodash"; + packageName = "lodash"; + version = "4.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz"; + sha1 = "83e4b10913f48496d4d16fec4a560af2ee744b68"; + }; + }; + "lodash-4.14.2" = { + name = "lodash"; + packageName = "lodash"; + version = "4.14.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz"; + sha1 = "bbccce6373a400fbfd0a8c67ca42f6d1ef416432"; + }; + }; + "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"; + }; + }; + "lodash-4.2.1" = { + name = "lodash"; + packageName = "lodash"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.2.1.tgz"; + sha1 = "171fdcfbbc30d689c544cd18c0529f56de6c1aa9"; + }; + }; + "lodash-id-0.14.0" = { + name = "lodash-id"; + packageName = "lodash-id"; + version = "0.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash-id/-/lodash-id-0.14.0.tgz"; + sha1 = "baf48934e543a1b5d6346f8c84698b1a8c803896"; + }; + }; + "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._baseclone-4.5.7" = { + name = "lodash._baseclone"; + packageName = "lodash._baseclone"; + version = "4.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.7.tgz"; + sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434"; + }; + }; + "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._bindcallback-3.0.1" = { + name = "lodash._bindcallback"; + packageName = "lodash._bindcallback"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz"; + sha1 = "e531c27644cf8b57a99e17ed95b35c748789392e"; + }; + }; + "lodash._createassigner-3.1.1" = { + name = "lodash._createassigner"; + packageName = "lodash._createassigner"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz"; + sha1 = "838a5bae2fdaca63ac22dee8e19fa4e6d6970b11"; + }; + }; + "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._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._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._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.assign-3.2.0" = { + name = "lodash.assign"; + packageName = "lodash.assign"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz"; + sha1 = "3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa"; + }; + }; + "lodash.assign-4.2.0" = { + name = "lodash.assign"; + packageName = "lodash.assign"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz"; + sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7"; }; }; "lodash.assignin-4.2.0" = { @@ -19350,6 +14345,42 @@ let sha1 = "7ae3017e939622ac31b7d7d7dcb1b34db1690d35"; }; }; + "lodash.clone-4.3.2" = { + name = "lodash.clone"; + packageName = "lodash.clone"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.3.2.tgz"; + sha1 = "e56b176b6823a7dde38f7f2bf58de7d5971200e9"; + }; + }; + "lodash.clonedeep-4.5.0" = { + name = "lodash.clonedeep"; + packageName = "lodash.clonedeep"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; + sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; + }; + }; + "lodash.debounce-3.1.1" = { + name = "lodash.debounce"; + packageName = "lodash.debounce"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-3.1.1.tgz"; + sha1 = "812211c378a94cc29d5aa4e3346cf0bfce3a7df5"; + }; + }; + "lodash.debounce-4.0.8" = { + name = "lodash.debounce"; + packageName = "lodash.debounce"; + version = "4.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; + sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af"; + }; + }; "lodash.defaults-4.2.0" = { name = "lodash.defaults"; packageName = "lodash.defaults"; @@ -19359,6 +14390,42 @@ let sha1 = "d09178716ffea4dde9e5fb7b37f6f0802274580c"; }; }; + "lodash.defaultsdeep-4.6.0" = { + name = "lodash.defaultsdeep"; + packageName = "lodash.defaultsdeep"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.0.tgz"; + sha1 = "bec1024f85b1bd96cbea405b23c14ad6443a6f81"; + }; + }; + "lodash.endswith-4.2.1" = { + name = "lodash.endswith"; + packageName = "lodash.endswith"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.endswith/-/lodash.endswith-4.2.1.tgz"; + sha1 = "fed59ac1738ed3e236edd7064ec456448b37bc09"; + }; + }; + "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.escaperegexp-4.1.2" = { + name = "lodash.escaperegexp"; + packageName = "lodash.escaperegexp"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz"; + sha1 = "64762c48618082518ac3df4ccf5d5886dae20347"; + }; + }; "lodash.filter-4.6.0" = { name = "lodash.filter"; packageName = "lodash.filter"; @@ -19377,6 +14444,15 @@ let sha1 = "f31c22225a9632d2bbf8e4addbef240aa765a61f"; }; }; + "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-4.5.0" = { name = "lodash.foreach"; packageName = "lodash.foreach"; @@ -19386,6 +14462,69 @@ let sha1 = "1a6a35eace401280c7f06dddec35165ab27e3e53"; }; }; + "lodash.groupby-4.6.0" = { + name = "lodash.groupby"; + packageName = "lodash.groupby"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.groupby/-/lodash.groupby-4.6.0.tgz"; + sha1 = "0b08a1dcf68397c397855c3239783832df7403d1"; + }; + }; + "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"; + }; + }; + "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-3.0.8" = { + name = "lodash.isfunction"; + packageName = "lodash.isfunction"; + version = "3.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.8.tgz"; + sha1 = "4db709fc81bc4a8fd7127a458a5346c5cdce2c6b"; + }; + }; + "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.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.map-4.6.0" = { name = "lodash.map"; packageName = "lodash.map"; @@ -19395,6 +14534,15 @@ let sha1 = "771ec7839e3473d9c4cde28b19394c3562f4f6d3"; }; }; + "lodash.memoize-3.0.4" = { + name = "lodash.memoize"; + packageName = "lodash.memoize"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz"; + sha1 = "2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"; + }; + }; "lodash.merge-4.6.0" = { name = "lodash.merge"; packageName = "lodash.merge"; @@ -19404,6 +14552,51 @@ let sha1 = "69884ba144ac33fe699737a6086deffadd0f89c5"; }; }; + "lodash.mergewith-4.6.0" = { + name = "lodash.mergewith"; + packageName = "lodash.mergewith"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz"; + sha1 = "150cf0a16791f5903b8891eab154609274bdea55"; + }; + }; + "lodash.once-4.1.1" = { + name = "lodash.once"; + packageName = "lodash.once"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz"; + sha1 = "0dd3971213c7c56df880977d504c88fb471a97ac"; + }; + }; + "lodash.pad-4.5.1" = { + name = "lodash.pad"; + packageName = "lodash.pad"; + version = "4.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.5.1.tgz"; + sha1 = "4330949a833a7c8da22cc20f6a26c4d59debba70"; + }; + }; + "lodash.padend-4.6.1" = { + name = "lodash.padend"; + packageName = "lodash.padend"; + version = "4.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz"; + sha1 = "53ccba047d06e158d311f45da625f4e49e6f166e"; + }; + }; + "lodash.padstart-4.6.1" = { + name = "lodash.padstart"; + packageName = "lodash.padstart"; + version = "4.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.padstart/-/lodash.padstart-4.6.1.tgz"; + sha1 = "d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b"; + }; + }; "lodash.pick-4.4.0" = { name = "lodash.pick"; packageName = "lodash.pick"; @@ -19431,6 +14624,15 @@ let sha1 = "80d6492dc1470864bbf583533b651f42a9f52415"; }; }; + "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.some-4.6.0" = { name = "lodash.some"; packageName = "lodash.some"; @@ -19440,391 +14642,391 @@ let sha1 = "1bb9f314ef6b8baded13b549169b2a945eb68e4d"; }; }; - "css-what-2.1.0" = { - name = "css-what"; - packageName = "css-what"; - version = "2.1.0"; + "lodash.sortby-4.7.0" = { + name = "lodash.sortby"; + packageName = "lodash.sortby"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz"; - sha1 = "9467d032c38cfaefb9f2d79501253062f87fa1bd"; + url = "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz"; + sha1 = "edd14c824e2cc9c1e0b0a1b42bb5210516a42438"; }; }; - "boolbase-1.0.0" = { - name = "boolbase"; - packageName = "boolbase"; - version = "1.0.0"; + "lodash.startswith-4.2.1" = { + name = "lodash.startswith"; + packageName = "lodash.startswith"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"; - sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"; + url = "https://registry.npmjs.org/lodash.startswith/-/lodash.startswith-4.2.1.tgz"; + sha1 = "c598c4adce188a27e53145731cdc6c0e7177600c"; }; }; - "nth-check-1.0.1" = { - name = "nth-check"; - packageName = "nth-check"; + "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"; + }; + }; + "lodash.template-4.4.0" = { + name = "lodash.template"; + packageName = "lodash.template"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz"; + sha1 = "e73a0385c8355591746e020b99679c690e68fba0"; + }; + }; + "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.templatesettings-4.1.0" = { + name = "lodash.templatesettings"; + packageName = "lodash.templatesettings"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz"; + sha1 = "2b4d4e95ba440d915ff08bc899e4553666713316"; + }; + }; + "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"; + }; + }; + "log-symbols-1.0.2" = { + name = "log-symbols"; + packageName = "log-symbols"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz"; + sha1 = "376ff7b58ea3086a0f09facc74617eca501e1a18"; + }; + }; + "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"; + }; + }; + "log-update-1.0.2" = { + name = "log-update"; + packageName = "log-update"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz"; + sha1 = "19929f64c4093d2d2e7075a1dad8af59c296b8d1"; + }; + }; + "log-update-2.3.0" = { + name = "log-update"; + packageName = "log-update"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/log-update/-/log-update-2.3.0.tgz"; + sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708"; + }; + }; + "log4js-2.5.2" = { + name = "log4js"; + packageName = "log4js"; + version = "2.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/log4js/-/log4js-2.5.2.tgz"; + sha512 = "3cr4zy75cf74ajn55xnidbz0m4848yyjyc2zrhlyksjdi0hsp0skwkq8ipgpahwfz1b7zlr9zg1blapz0nsn3h8kmz5w2cz036n2rij"; + }; + }; + "loggly-1.1.1" = { + name = "loggly"; + packageName = "loggly"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/loggly/-/loggly-1.1.1.tgz"; + sha1 = "0a0fc1d3fa3a5ec44fdc7b897beba2a4695cebee"; + }; + }; + "lokijs-1.5.1" = { + name = "lokijs"; + packageName = "lokijs"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lokijs/-/lokijs-1.5.1.tgz"; + sha512 = "1pi08ry0a4zvg7mqj14gl0vacka95k77bbvljmcf25whxxbkh2rprsxpd8pv6frqh4ix6vslk44silx83sk65xhaw7ia2zssf0vngiy"; + }; + }; + "long-2.4.0" = { + name = "long"; + packageName = "long"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/long/-/long-2.4.0.tgz"; + sha1 = "9fa180bb1d9500cdc29c4156766a1995e1f4524f"; + }; + }; + "longest-1.0.1" = { + name = "longest"; + packageName = "longest"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz"; - sha1 = "9929acdf628fc2c41098deab82ac580cf149aae4"; + url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"; + sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097"; }; }; - "domhandler-2.4.1" = { - name = "domhandler"; - packageName = "domhandler"; - version = "2.4.1"; + "longest-streak-1.0.0" = { + name = "longest-streak"; + packageName = "longest-streak"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz"; - sha1 = "892e47000a99be55bbf3774ffea0561d8879c259"; + url = "https://registry.npmjs.org/longest-streak/-/longest-streak-1.0.0.tgz"; + sha1 = "d06597c4d4c31b52ccb1f5d8f8fe7148eafd6965"; }; }; - "moment-timezone-0.5.14" = { - name = "moment-timezone"; - packageName = "moment-timezone"; - version = "0.5.14"; + "longjohn-0.2.11" = { + name = "longjohn"; + packageName = "longjohn"; + version = "0.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.14.tgz"; - sha1 = "4eb38ff9538b80108ba467a458f3ed4268ccfcb1"; + url = "https://registry.npmjs.org/longjohn/-/longjohn-0.2.11.tgz"; + sha1 = "83736a15ae5f48711b625153e98012f2de659e69"; }; }; - "fresh-0.5.0" = { - name = "fresh"; - packageName = "fresh"; - version = "0.5.0"; + "looper-2.0.0" = { + name = "looper"; + packageName = "looper"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz"; - sha1 = "f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e"; + url = "https://registry.npmjs.org/looper/-/looper-2.0.0.tgz"; + sha1 = "66cd0c774af3d4fedac53794f742db56da8f09ec"; }; }; - "proxy-addr-1.1.5" = { - name = "proxy-addr"; - packageName = "proxy-addr"; - version = "1.1.5"; + "looper-3.0.0" = { + name = "looper"; + packageName = "looper"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.5.tgz"; - sha1 = "71c0ee3b102de3f202f3b64f608d173fcba1a918"; + url = "https://registry.npmjs.org/looper/-/looper-3.0.0.tgz"; + sha1 = "2efa54c3b1cbaba9b94aee2e5914b0be57fbb749"; }; }; - "send-0.15.3" = { - name = "send"; - packageName = "send"; - version = "0.15.3"; + "loose-envify-1.3.1" = { + name = "loose-envify"; + packageName = "loose-envify"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.15.3.tgz"; - sha1 = "5013f9f99023df50d1bd9892c19e3defd1d53309"; + url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz"; + sha1 = "d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"; }; }; - "serve-static-1.12.3" = { - name = "serve-static"; - packageName = "serve-static"; - version = "1.12.3"; + "loud-rejection-1.6.0" = { + name = "loud-rejection"; + packageName = "loud-rejection"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.3.tgz"; - sha1 = "9f4ba19e2f3030c547f8af99107838ec38d5b1e2"; + url = "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz"; + sha1 = "5b46f80147edee578870f086d04821cf998e551f"; }; }; - "ipaddr.js-1.4.0" = { - name = "ipaddr.js"; - packageName = "ipaddr.js"; - version = "1.4.0"; + "lowdb-0.15.5" = { + name = "lowdb"; + packageName = "lowdb"; + version = "0.15.5"; src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.4.0.tgz"; - sha1 = "296aca878a821816e5b85d0a285a99bcff4582f0"; + url = "https://registry.npmjs.org/lowdb/-/lowdb-0.15.5.tgz"; + sha1 = "9ade105df8aa573692d1221622b85414fbf4fa96"; }; }; - "crc-3.4.4" = { - name = "crc"; - packageName = "crc"; - version = "3.4.4"; + "lower-case-1.1.4" = { + name = "lower-case"; + packageName = "lower-case"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz"; - sha1 = "9da1e980e3bd44fc5c93bf5ab3da3378d85e466b"; + url = "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz"; + sha1 = "9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"; }; }; - "debug-2.6.3" = { - name = "debug"; - packageName = "debug"; - version = "2.6.3"; + "lowercase-keys-1.0.0" = { + name = "lowercase-keys"; + packageName = "lowercase-keys"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.3.tgz"; - sha1 = "0f7eb8c30965ec08c72accfa0130c8b79984141d"; + url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz"; + sha1 = "4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"; }; }; - "uid-safe-2.1.5" = { - name = "uid-safe"; - packageName = "uid-safe"; - version = "2.1.5"; + "lru-2.0.1" = { + name = "lru"; + packageName = "lru"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz"; - sha512 = "2h6492mk9v9dzy26i5wfajinhi2pg729ksbcsmm0sp8s32hlr432q19g97qghfp5x98hsm77hmzwdzhgi3vhm2drz53ax7rabhydw98"; + url = "https://registry.npmjs.org/lru/-/lru-2.0.1.tgz"; + sha1 = "f979871e162e3f5ca254be46844c53d4c5364544"; }; }; - "retry-0.6.1" = { - name = "retry"; - packageName = "retry"; - version = "0.6.1"; + "lru-3.1.0" = { + name = "lru"; + packageName = "lru"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.6.1.tgz"; - sha1 = "fdc90eed943fde11b893554b8cc63d0e899ba918"; + url = "https://registry.npmjs.org/lru/-/lru-3.1.0.tgz"; + sha1 = "ea7fb8546d83733396a13091d76cfeb4c06837d5"; }; }; - "cookies-0.7.1" = { - name = "cookies"; - packageName = "cookies"; - version = "0.7.1"; + "lru-cache-2.2.0" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/cookies/-/cookies-0.7.1.tgz"; - sha1 = "7c8a615f5481c61ab9f16c833731bcb8f663b99b"; + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.0.tgz"; + sha1 = "ec2bba603f4c5bb3e7a1bf62ce1c1dbc1d474e08"; }; }; - "i18next-client-1.10.3" = { - name = "i18next-client"; - packageName = "i18next-client"; - version = "1.10.3"; + "lru-cache-2.2.4" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/i18next-client/-/i18next-client-1.10.3.tgz"; - sha1 = "76d0353557ed90d1e7a87754d5004d3f7801fde9"; + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz"; + sha1 = "6c658619becf14031d0d0b594b16042ce4dc063d"; }; }; - "json5-0.2.0" = { - name = "json5"; - packageName = "json5"; + "lru-cache-2.5.2" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "2.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.2.tgz"; + sha1 = "1fddad938aae1263ce138680be1b3f591c0ab41c"; + }; + }; + "lru-cache-2.6.5" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "2.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz"; + sha1 = "e56d6354148ede8d7707b58d143220fd08df0fd5"; + }; + }; + "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-3.2.0" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz"; + sha1 = "71789b3b7f5399bec8565dda38aa30d2a097efee"; + }; + }; + "lru-cache-4.1.1" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz"; + sha512 = "1xz91sizgyzh8plz5jx1labzpygapm6xy3qpxriaj00yvnhy4lnmhqcb20qln4lh80c5g3yzp4j5i6g63njq1r5sl9c0zlkh9xjk2xb"; + }; + }; + "lsmod-1.0.0" = { + name = "lsmod"; + packageName = "lsmod"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lsmod/-/lsmod-1.0.0.tgz"; + sha1 = "9a00f76dca36eb23fa05350afe1b585d4299e64b"; + }; + }; + "ltgt-1.0.2" = { + name = "ltgt"; + packageName = "ltgt"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ltgt/-/ltgt-1.0.2.tgz"; + sha1 = "e6817eb29ad204fc0c9e96ef8b0fee98ef6b9aa3"; + }; + }; + "ltgt-2.1.3" = { + name = "ltgt"; + packageName = "ltgt"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ltgt/-/ltgt-2.1.3.tgz"; + sha1 = "10851a06d9964b971178441c23c9e52698eece34"; + }; + }; + "lunr-0.7.2" = { + name = "lunr"; + packageName = "lunr"; + version = "0.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lunr/-/lunr-0.7.2.tgz"; + sha1 = "79a30e932e216cba163541ee37a3607c12cd7281"; + }; + }; + "lynx-0.2.0" = { + name = "lynx"; + packageName = "lynx"; version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-0.2.0.tgz"; - sha1 = "b6d7035c70c4570f883c7edc759de3ae03db3343"; + url = "https://registry.npmjs.org/lynx/-/lynx-0.2.0.tgz"; + sha1 = "79e6674530da4183e87953bd686171e070da50b9"; }; }; - "keygrip-1.0.2" = { - name = "keygrip"; - packageName = "keygrip"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/keygrip/-/keygrip-1.0.2.tgz"; - sha1 = "ad3297c557069dea8bcfe7a4fa491b75c5ddeb91"; - }; - }; - "esprima-3.1.3" = { - name = "esprima"; - packageName = "esprima"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz"; - sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; - }; - }; - "commist-1.0.0" = { - name = "commist"; - packageName = "commist"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commist/-/commist-1.0.0.tgz"; - sha1 = "c0c352501cf6f52e9124e3ef89c9806e2022ebef"; - }; - }; - "help-me-1.1.0" = { - name = "help-me"; - packageName = "help-me"; + "macos-release-1.1.0" = { + name = "macos-release"; + packageName = "macos-release"; version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/help-me/-/help-me-1.1.0.tgz"; - sha1 = "8f2d508d0600b4a456da2f086556e7e5c056a3c6"; + url = "https://registry.npmjs.org/macos-release/-/macos-release-1.1.0.tgz"; + sha512 = "260gwv2k1svhzfxs50g921jbhrqlbfr94mcs9ak0dip7i2331nqc7ip0fgdkfl3r1b30w1s87qh2ssq6wxzd08pbmkjwchqc6xdnqls"; }; }; - "mqtt-packet-5.4.0" = { - name = "mqtt-packet"; - packageName = "mqtt-packet"; - version = "5.4.0"; + "magnet-uri-2.0.1" = { + name = "magnet-uri"; + packageName = "magnet-uri"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.4.0.tgz"; - sha512 = "2d1hvibps8d4xlw8wm937ykc76yb02rp2065hd6186vygjx3wixjjzrn3fia4wfj7d38ic8gh5ij5rsi9389kl6gpxxjbdcbjwpn8yf"; + url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-2.0.1.tgz"; + sha1 = "d331d3dfcd3836565ade0fc3ca315e39217bb209"; }; }; - "reinterval-1.1.0" = { - name = "reinterval"; - packageName = "reinterval"; - version = "1.1.0"; + "magnet-uri-4.2.3" = { + name = "magnet-uri"; + packageName = "magnet-uri"; + version = "4.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/reinterval/-/reinterval-1.1.0.tgz"; - sha1 = "3361ecfa3ca6c18283380dd0bb9546f390f5ece7"; + url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-4.2.3.tgz"; + sha1 = "79cc6d65a00bb5b7ef5c25ae60ebbb5d9a7681a8"; }; }; - "websocket-stream-5.1.1" = { - name = "websocket-stream"; - packageName = "websocket-stream"; - version = "5.1.1"; + "magnet-uri-5.1.7" = { + name = "magnet-uri"; + packageName = "magnet-uri"; + version = "5.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-5.1.1.tgz"; - sha512 = "18iw90ncl6cpip9j7rxdf6mag5klhhn7fklhb5lz41dy3wk9vxp3lxxkmwsnldjk5zfx3fjww55xg47k5k1a4cpph92k7j26p9kk56a"; - }; - }; - "leven-1.0.2" = { - name = "leven"; - packageName = "leven"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/leven/-/leven-1.0.2.tgz"; - sha1 = "9144b6eebca5f1d0680169f1a6770dcea60b75c3"; - }; - }; - "callback-stream-1.1.0" = { - name = "callback-stream"; - packageName = "callback-stream"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/callback-stream/-/callback-stream-1.1.0.tgz"; - sha1 = "4701a51266f06e06eaa71fc17233822d875f4908"; - }; - }; - "glob-stream-6.1.0" = { - name = "glob-stream"; - packageName = "glob-stream"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz"; - sha1 = "7045c99413b3eb94888d83ab46d0b404cc7bdde4"; - }; - }; - "is-negated-glob-1.0.0" = { - name = "is-negated-glob"; - packageName = "is-negated-glob"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz"; - sha1 = "6910bca5da8c95e784b5751b976cf5a10fee36d2"; - }; - }; - "ordered-read-streams-1.0.1" = { - name = "ordered-read-streams"; - packageName = "ordered-read-streams"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz"; - sha1 = "77c0cb37c41525d64166d990ffad7ec6a0e1363e"; - }; - }; - "to-absolute-glob-2.0.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"; - }; - }; - "append-field-0.1.0" = { - name = "append-field"; - packageName = "append-field"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/append-field/-/append-field-0.1.0.tgz"; - sha1 = "6ddc58fa083c7bc545d3c5995b2830cc2366d44a"; - }; - }; - "busboy-0.2.14" = { - name = "busboy"; - packageName = "busboy"; - version = "0.2.14"; - src = fetchurl { - url = "https://registry.npmjs.org/busboy/-/busboy-0.2.14.tgz"; - sha1 = "6c2a622efcf47c57bbbe1e2a9c37ad36c7925453"; - }; - }; - "dicer-0.2.5" = { - name = "dicer"; - packageName = "dicer"; - version = "0.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz"; - sha1 = "5996c086bb33218c812c090bddc09cd12facb70f"; - }; - }; - "streamsearch-0.1.2" = { - name = "streamsearch"; - packageName = "streamsearch"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz"; - sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a"; - }; - }; - "feedparser-1.1.3" = { - name = "feedparser"; - packageName = "feedparser"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/feedparser/-/feedparser-1.1.3.tgz"; - sha1 = "0b725f6b4cbe4b26d518baec0d010ad020156c8b"; - }; - }; - "sax-0.6.1" = { - name = "sax"; - packageName = "sax"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"; - sha1 = "563b19c7c1de892e09bfc4f2fc30e3c27f0952b9"; - }; - }; - "addressparser-0.1.3" = { - name = "addressparser"; - packageName = "addressparser"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/addressparser/-/addressparser-0.1.3.tgz"; - sha1 = "9e9ab43d257e1ae784e1df5f580c9f5240f58874"; - }; - }; - "array-indexofobject-0.0.1" = { - name = "array-indexofobject"; - packageName = "array-indexofobject"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/array-indexofobject/-/array-indexofobject-0.0.1.tgz"; - sha1 = "aaa128e62c9b3c358094568c219ff64fe489d42a"; - }; - }; - "nodemailer-1.11.0" = { - name = "nodemailer"; - packageName = "nodemailer"; - version = "1.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-1.11.0.tgz"; - sha1 = "4e69cb39b03015b1d1ef0c78a815412b9e976f79"; - }; - }; - "poplib-0.1.7" = { - name = "poplib"; - packageName = "poplib"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/poplib/-/poplib-0.1.7.tgz"; - sha1 = "2f4b58b5592972350cd97f482aba68f8e05574bc"; - }; - }; - "mailparser-0.6.2" = { - name = "mailparser"; - packageName = "mailparser"; - version = "0.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/mailparser/-/mailparser-0.6.2.tgz"; - sha1 = "03c486039bdf4df6cd3b6adcaaac4107dfdbc068"; - }; - }; - "imap-0.8.19" = { - name = "imap"; - packageName = "imap"; - version = "0.8.19"; - src = fetchurl { - url = "https://registry.npmjs.org/imap/-/imap-0.8.19.tgz"; - sha1 = "3678873934ab09cea6ba48741f284da2af59d8d5"; - }; - }; - "libmime-1.2.0" = { - name = "libmime"; - packageName = "libmime"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/libmime/-/libmime-1.2.0.tgz"; - sha1 = "8d84b4f3b225b3704410236ef494906436ba742b"; + url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.7.tgz"; + sha1 = "8f8016ab74c415f274f4fb1943faaf7e92030eff"; }; }; "mailcomposer-2.1.0" = { @@ -19836,94 +15038,580 @@ let sha1 = "a6531822899614fee899c92226d81e2b9cbb183d"; }; }; - "needle-0.11.0" = { - name = "needle"; - packageName = "needle"; - version = "0.11.0"; + "mailcomposer-4.0.1" = { + name = "mailcomposer"; + packageName = "mailcomposer"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-0.11.0.tgz"; - sha1 = "02a71b008eaf7d55ae89fb9fd7685b7b88d7bc29"; + url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.1.tgz"; + sha1 = "0e1c44b2a07cf740ee17dc149ba009f19cadfeb4"; }; }; - "nodemailer-direct-transport-1.1.0" = { - name = "nodemailer-direct-transport"; - packageName = "nodemailer-direct-transport"; + "mailcomposer-4.0.2" = { + name = "mailcomposer"; + packageName = "mailcomposer"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.2.tgz"; + sha1 = "b635402cc7f2eedb10130d3d09ad88b1c2d7e101"; + }; + }; + "mailgun-js-0.7.15" = { + name = "mailgun-js"; + packageName = "mailgun-js"; + version = "0.7.15"; + src = fetchurl { + url = "https://registry.npmjs.org/mailgun-js/-/mailgun-js-0.7.15.tgz"; + sha1 = "ee366a20dac64c3c15c03d6c1b3e0ed795252abb"; + }; + }; + "mailparser-0.6.2" = { + name = "mailparser"; + packageName = "mailparser"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mailparser/-/mailparser-0.6.2.tgz"; + sha1 = "03c486039bdf4df6cd3b6adcaaac4107dfdbc068"; + }; + }; + "make-dir-1.1.0" = { + name = "make-dir"; + packageName = "make-dir"; version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer-direct-transport/-/nodemailer-direct-transport-1.1.0.tgz"; - sha1 = "a2f78708ee6f16ea0573fc82949d138ff172f624"; + url = "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz"; + sha512 = "1q7686aqgkxk9l6nqhzbil3599f9pxiz364kdbfy7pdr9sny7zylpm6yf4rwz4i0aa11lmf35mh8jmj7g7vxm37pvqvl9qbij5jxyfh"; }; }; - "nodemailer-smtp-transport-1.1.0" = { - name = "nodemailer-smtp-transport"; - packageName = "nodemailer-smtp-transport"; - version = "1.1.0"; + "make-error-1.3.2" = { + name = "make-error"; + packageName = "make-error"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer-smtp-transport/-/nodemailer-smtp-transport-1.1.0.tgz"; - sha1 = "e6c37f31885ab3080e7ded3cf528c4ad7e691398"; + url = "https://registry.npmjs.org/make-error/-/make-error-1.3.2.tgz"; + sha512 = "1sw30dxbwvv9pa0871cyshryjqam7d0pl4m1f6zww2r81qv3sgmx5qz7aimhz2xhxlihy9fglnwc1sy7hwfbfwcvg2n4mbrk7gxmnlp"; }; }; - "libbase64-0.1.0" = { - name = "libbase64"; - packageName = "libbase64"; + "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/make-error-cause/-/make-error-cause-1.2.2.tgz"; + sha1 = "df0388fcd0b37816dff0a5fb8108939777dcbc9d"; + }; + }; + "make-iterator-1.0.0" = { + name = "make-iterator"; + packageName = "make-iterator"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.0.tgz"; + sha1 = "57bef5dc85d23923ba23767324d8e8f8f3d9694b"; + }; + }; + "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-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"; + }; + }; + "map-stream-0.1.0" = { + name = "map-stream"; + packageName = "map-stream"; version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz"; - sha1 = "62351a839563ac5ff5bd26f12f60e9830bb751e6"; + url = "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz"; + sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194"; }; }; - "libqp-1.1.0" = { - name = "libqp"; - packageName = "libqp"; + "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"; + }; + }; + "markdown-it-4.4.0" = { + name = "markdown-it"; + packageName = "markdown-it"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-it/-/markdown-it-4.4.0.tgz"; + sha1 = "3df373dbea587a9a7fef3e56311b68908f75c414"; + }; + }; + "markdown-it-8.4.0" = { + name = "markdown-it"; + packageName = "markdown-it"; + version = "8.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.0.tgz"; + sha512 = "0c0jpdfbi4fmqyjc2ilwvinxyc8rn4p9j7fwshh2c00nkc0q2lh6yw2dgragvnpy8bjhcwa1hlfy2ih2ih3np78wrpqx7gf4w48xnxl"; + }; + }; + "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/markdown-it-emoji/-/markdown-it-emoji-1.4.0.tgz"; + sha1 = "9bee0e9a990a963ba96df6980c4fddb05dfb4dcc"; + }; + }; + "markdown-it-github-headings-1.1.0" = { + name = "markdown-it-github-headings"; + packageName = "markdown-it-github-headings"; version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz"; - sha1 = "f5e6e06ad74b794fb5b5b66988bf728ef1dedbe8"; + url = "https://registry.npmjs.org/markdown-it-github-headings/-/markdown-it-github-headings-1.1.0.tgz"; + sha1 = "d6f73da5276ded956861337189addf3d52b93558"; }; }; - "buildmail-2.0.0" = { - name = "buildmail"; - packageName = "buildmail"; - version = "2.0.0"; + "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/buildmail/-/buildmail-2.0.0.tgz"; - sha1 = "f0b7b0a59e9a4a1b5066bbfa051d248f3832eece"; + url = "https://registry.npmjs.org/markdown-it-task-checkbox/-/markdown-it-task-checkbox-1.0.6.tgz"; + sha512 = "0knj35b20bkc34hpfv73p4m855ysgdshml07fhj18j62p09y2066l7nl28g9kr2rwqm9x8j0bw20d32vqrrhih5ifvynk7axcg6977f"; }; }; - "addressparser-0.3.2" = { - name = "addressparser"; - packageName = "addressparser"; - version = "0.3.2"; + "markdown-table-0.4.0" = { + name = "markdown-table"; + packageName = "markdown-table"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/addressparser/-/addressparser-0.3.2.tgz"; - sha1 = "59873f35e8fcf6c7361c10239261d76e15348bb2"; + url = "https://registry.npmjs.org/markdown-table/-/markdown-table-0.4.0.tgz"; + sha1 = "890c2c1b3bfe83fb00e4129b8e4cfe645270f9d1"; }; }; - "needle-0.10.0" = { - name = "needle"; - packageName = "needle"; - version = "0.10.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/needle/-/needle-0.10.0.tgz"; - sha1 = "16a24d63f2a61152eb74cce1d12af85c507577d4"; + url = "https://registry.npmjs.org/markdown-to-ast/-/markdown-to-ast-3.4.0.tgz"; + sha1 = "0e2cba81390b0549a9153ec3b0d915b61c164be7"; }; }; - "smtp-connection-1.3.8" = { - name = "smtp-connection"; - packageName = "smtp-connection"; - version = "1.3.8"; + "marked-0.3.12" = { + name = "marked"; + packageName = "marked"; + version = "0.3.12"; src = fetchurl { - url = "https://registry.npmjs.org/smtp-connection/-/smtp-connection-1.3.8.tgz"; - sha1 = "55832c2160cfb3086e1dcd87fd1c19fa61b7f536"; + url = "https://registry.npmjs.org/marked/-/marked-0.3.12.tgz"; + sha512 = "2h8qj30y9n29m3xvbbg777kmxcdx57hf1ir6z3jyn94gj7s0kcz74203y1hazavwh60cfp69zdjv532vxyjc853kx82pvyjxddmm0wk"; }; }; - "nodemailer-wellknown-0.1.10" = { - name = "nodemailer-wellknown"; - packageName = "nodemailer-wellknown"; - version = "0.1.10"; + "matcher-collection-1.0.5" = { + name = "matcher-collection"; + packageName = "matcher-collection"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer-wellknown/-/nodemailer-wellknown-0.1.10.tgz"; - sha1 = "586db8101db30cb4438eb546737a41aad0cf13d5"; + url = "https://registry.npmjs.org/matcher-collection/-/matcher-collection-1.0.5.tgz"; + sha512 = "1hfvbsx85xqrw6g0k7rkqwngl8b2nwj92ax10ilx3b4lma2mcp8q6zpvam1sffgqsssa9d13cj7prrzg5c00mf0c8q92w59m36ach4x"; + }; + }; + "md5.js-1.3.4" = { + name = "md5.js"; + packageName = "md5.js"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz"; + sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d"; + }; + }; + "mdn-data-1.1.0" = { + name = "mdn-data"; + packageName = "mdn-data"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.0.tgz"; + sha512 = "3av1cblh8aix05jyfib9mhm57qx8fnkxgxs2g493mdm4815pisrn8rzgf9yxjiww6psa619aa8l62xigrbwfcag741bgls227f82blc"; + }; + }; + "mdns-js-1.0.1" = { + name = "mdns-js"; + packageName = "mdns-js"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mdns-js/-/mdns-js-1.0.1.tgz"; + sha512 = "0z9rixsyb1m6w2qjqimn0ga0qdcpnxnm0ci7zd0svzd9kivqds0zczf7r32064r8c32m94cs3lrcvwvg21d7x2s38f28r5874rjs0bp"; + }; + }; + "mdurl-1.0.1" = { + name = "mdurl"; + packageName = "mdurl"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz"; + sha1 = "fe85b2ec75a59037f2adfec100fd6c601761152e"; + }; + }; + "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"; + }; + }; + "mediawiki-title-0.6.5" = { + name = "mediawiki-title"; + packageName = "mediawiki-title"; + version = "0.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.6.5.tgz"; + sha512 = "3r94k4jgdj5ir5y2p0hvb860976fz2fnzjafjzmsf0pivsqgy0hgxsxg315zmzq69rv0lli8rfjwcjp097xya03aaa4s7xjppi0ixvw"; + }; + }; + "mem-1.1.0" = { + name = "mem"; + packageName = "mem"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz"; + sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76"; + }; + }; + "mem-fs-1.1.3" = { + name = "mem-fs"; + packageName = "mem-fs"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mem-fs/-/mem-fs-1.1.3.tgz"; + sha1 = "b8ae8d2e3fcb6f5d3f9165c12d4551a065d989cc"; + }; + }; + "memdown-0.10.2" = { + name = "memdown"; + packageName = "memdown"; + version = "0.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/memdown/-/memdown-0.10.2.tgz"; + sha1 = "a15ed0b6a8f216848d80a75c0fe8dd0bad89b608"; + }; + }; + "memory-fs-0.3.0" = { + name = "memory-fs"; + packageName = "memory-fs"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz"; + sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20"; + }; + }; + "memory-fs-0.4.1" = { + name = "memory-fs"; + packageName = "memory-fs"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz"; + sha1 = "3a9a20b8462523e447cfbc7e8bb80ed667bfc552"; + }; + }; + "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"; + }; + }; + "memorystore-1.6.0" = { + name = "memorystore"; + packageName = "memorystore"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/memorystore/-/memorystore-1.6.0.tgz"; + sha1 = "1fb5fb5f0b2edf1add184917e918f094a9ff3465"; + }; + }; + "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"; + }; + }; + "merge-1.2.0" = { + name = "merge"; + packageName = "merge"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz"; + sha1 = "7531e39d4949c281a66b8c5a6e0265e8b05894da"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "merge-stream-1.0.1" = { + name = "merge-stream"; + packageName = "merge-stream"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz"; + sha1 = "4041202d508a342ba00174008df0c251b8c135e1"; + }; + }; + "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"; + }; + }; + "mersenne-0.0.4" = { + name = "mersenne"; + packageName = "mersenne"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mersenne/-/mersenne-0.0.4.tgz"; + sha1 = "401fdec7ec21cdb9e03cd3d3021398da21b27085"; + }; + }; + "method-override-2.3.10" = { + name = "method-override"; + packageName = "method-override"; + version = "2.3.10"; + src = fetchurl { + url = "https://registry.npmjs.org/method-override/-/method-override-2.3.10.tgz"; + sha1 = "e3daf8d5dee10dd2dce7d4ae88d62bbee77476b4"; + }; + }; + "methods-0.0.1" = { + name = "methods"; + packageName = "methods"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/methods/-/methods-0.0.1.tgz"; + sha1 = "277c90f8bef39709645a8371c51c3b6c648e068c"; + }; + }; + "methods-0.1.0" = { + name = "methods"; + packageName = "methods"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/methods/-/methods-0.1.0.tgz"; + sha1 = "335d429eefd21b7bacf2e9c922a8d2bd14a30e4f"; + }; + }; + "methods-1.0.1" = { + name = "methods"; + packageName = "methods"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/methods/-/methods-1.0.1.tgz"; + sha1 = "75bc91943dffd7da037cf3eeb0ed73a0037cd14b"; + }; + }; + "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"; + }; + }; + "micro-9.1.0" = { + name = "micro"; + packageName = "micro"; + version = "9.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/micro/-/micro-9.1.0.tgz"; + sha512 = "232sjz2wv3xlfz5wf20jihj8avic507avydzwcf4d8zgy07ha9x3pqc6xkw0y8bjk8f8w30fmih38gsdvz7ph92c4kj4cxxfinph2nh"; + }; + }; + "micro-compress-1.0.0" = { + name = "micro-compress"; + packageName = "micro-compress"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/micro-compress/-/micro-compress-1.0.0.tgz"; + sha1 = "53f5a80b4ad0320ca165a559b6e3df145d4f704f"; + }; + }; + "microee-0.0.6" = { + name = "microee"; + packageName = "microee"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/microee/-/microee-0.0.6.tgz"; + sha1 = "a12bdb0103681e8b126a9b071eba4c467c78fffe"; + }; + }; + "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.5" = { + name = "micromatch"; + packageName = "micromatch"; + version = "3.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.5.tgz"; + sha512 = "2y22i8yrib7vcgpfcm5sq9g4fh4wxrn0f3z017vdbkvybvywa1axl3kym81k9ad6h3d4jmqkqyahcaj2c5qy5wpa17kvbyhnfn6sjya"; + }; + }; + "miller-rabin-4.0.1" = { + name = "miller-rabin"; + packageName = "miller-rabin"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz"; + sha512 = "12277knznlw4myxmgg6vgkrwmrhj9dyniscrlph3s08ndi2q25v3wrv6rwanvz29v5k5x756xa5yif4xllrghpn3jqaamnr3cp5ypnp"; + }; + }; + "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"; + }; + }; + "mime-1.2.4" = { + name = "mime"; + packageName = "mime"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.2.4.tgz"; + sha1 = "11b5fdaf29c2509255176b80ad520294f5de92b7"; + }; + }; + "mime-1.2.6" = { + name = "mime"; + packageName = "mime"; + version = "1.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.2.6.tgz"; + sha1 = "b1f86c768c025fa87b48075f1709f28aeaf20365"; + }; + }; + "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.12.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz"; + sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7"; + }; + }; + "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"; + }; + }; + "mime-db-1.32.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.32.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.32.0.tgz"; + sha512 = "1bl21q8acya2jj67757518bdy1yhc5d7ybn755wnikwcca3gq5akfg835nj5mp2kmd4f97yyy0qwx662jlwk1rgx7nl9qsd2vzsi5gr"; + }; + }; + "mime-types-2.0.14" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.0.14"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz"; + sha1 = "310e159db23e077f8bb22b748dabfa4957140aa6"; + }; + }; + "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"; }; }; "mimelib-0.3.1" = { @@ -19935,67 +15623,382 @@ let sha1 = "787add2415d827acb3af6ec4bca1ea9596418853"; }; }; - "uue-3.1.0" = { - name = "uue"; - packageName = "uue"; + "mimic-fn-1.1.0" = { + name = "mimic-fn"; + packageName = "mimic-fn"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz"; + sha1 = "e667783d92e89dbd342818b5230b9d62a672ad18"; + }; + }; + "mimic-response-1.0.0" = { + name = "mimic-response"; + packageName = "mimic-response"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.0.tgz"; + sha1 = "df3d3652a73fded6b9b0b24146e6fd052353458e"; + }; + }; + "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"; + }; + }; + "minilog-3.1.0" = { + name = "minilog"; + packageName = "minilog"; version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/uue/-/uue-3.1.0.tgz"; - sha1 = "5d67d37030e66efebbb4b8aac46daf9b55befbf6"; + url = "https://registry.npmjs.org/minilog/-/minilog-3.1.0.tgz"; + sha1 = "d2d0f1887ca363d1acf0ea86d5c4df293b3fb675"; }; }; - "addressparser-1.0.1" = { - name = "addressparser"; - packageName = "addressparser"; + "minimalistic-assert-1.0.0" = { + name = "minimalistic-assert"; + packageName = "minimalistic-assert"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"; + sha1 = "702be2dda6b37f4836bcb3f5db56641b64a1d3d3"; + }; + }; + "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/addressparser/-/addressparser-1.0.1.tgz"; - sha1 = "47afbe1a2a9262191db6838e4fd1d39b40821746"; + url = "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"; + sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"; }; }; - "utf7-1.0.2" = { - name = "utf7"; - packageName = "utf7"; - version = "1.0.2"; + "minimatch-0.2.14" = { + name = "minimatch"; + packageName = "minimatch"; + version = "0.2.14"; src = fetchurl { - url = "https://registry.npmjs.org/utf7/-/utf7-1.0.2.tgz"; - sha1 = "955f490aae653ba220b9456a0a8776c199360991"; + url = "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"; + sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a"; }; }; - "twitter-ng-0.6.2" = { - name = "twitter-ng"; - packageName = "twitter-ng"; - version = "0.6.2"; + "minimatch-0.3.0" = { + name = "minimatch"; + packageName = "minimatch"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/twitter-ng/-/twitter-ng-0.6.2.tgz"; - sha1 = "13707115dd04c9bd1f2c646da976589be4d64bc4"; + url = "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz"; + sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd"; }; }; - "oauth-0.9.14" = { - name = "oauth"; - packageName = "oauth"; - version = "0.9.14"; + "minimatch-1.0.0" = { + name = "minimatch"; + packageName = "minimatch"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/oauth/-/oauth-0.9.14.tgz"; - sha1 = "c5748883a40b53de30ade9cabf2100414b8a0971"; + url = "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz"; + sha1 = "e0dd2120b49e1b724ce8d714c520822a9438576d"; }; }; - "nan-2.6.2" = { - name = "nan"; - packageName = "nan"; - version = "2.6.2"; + "minimatch-2.0.10" = { + name = "minimatch"; + packageName = "minimatch"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz"; - sha1 = "e4ff34e6c95fdfb5aecc08de6596f43605a7db45"; + url = "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz"; + sha1 = "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"; }; }; - "node-pre-gyp-0.6.36" = { - name = "node-pre-gyp"; - packageName = "node-pre-gyp"; - version = "0.6.36"; + "minimatch-3.0.2" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz"; - sha1 = "db604112cb74e0d477554e9b505b17abddfab786"; + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz"; + sha1 = "0f398a7300ea441e9c348c83d98ab8c9dbf9c40a"; + }; + }; + "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.10" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; + sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; + }; + }; + "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.1.0" = { + name = "minimist"; + packageName = "minimist"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz"; + sha1 = "99df657a52574c21c9057497df742790b2b4c0de"; + }; + }; + "minimist-0.2.0" = { + name = "minimist"; + packageName = "minimist"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz"; + sha1 = "4dffe525dae2b864c66c2e23c6271d7afdecefce"; + }; + }; + "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.1" = { + name = "minipass"; + packageName = "minipass"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass/-/minipass-2.2.1.tgz"; + sha512 = "3yy9s65iwrx5hndcqbxrks88xi9cf8hra6zalgf8xfr4ahpp31s0i8lv6jpyb42p0y7z55ac3390sbqxcgcvan3xls449agbjb98mmv"; + }; + }; + "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.0" = { + name = "mixin-deep"; + packageName = "mixin-deep"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.0.tgz"; + sha512 = "016isy937hd503fn41ivc4j267cr1brp7f65waxkk2ijslc1gyh7r815xk4g27cjrgjzydwqbpwk5yj4nyjj085n3l5k2vsi2z841kn"; + }; + }; + "mixin-object-2.0.1" = { + name = "mixin-object"; + packageName = "mixin-object"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz"; + sha1 = "4fb949441dab182540f1fe035ba60e1947a5e57e"; + }; + }; + "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.3.5" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; + sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; + }; + }; + "mkdirp-0.5.0" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz"; + sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12"; + }; + }; + "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"; + }; + }; + "mkpath-0.1.0" = { + name = "mkpath"; + packageName = "mkpath"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz"; + sha1 = "7554a6f8d871834cc97b5462b122c4c124d6de91"; + }; + }; + "mkpath-1.0.0" = { + name = "mkpath"; + packageName = "mkpath"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mkpath/-/mkpath-1.0.0.tgz"; + sha1 = "ebb3a977e7af1c683ae6fda12b545a6ba6c5853d"; + }; + }; + "mksnapshot-0.3.1" = { + name = "mksnapshot"; + packageName = "mksnapshot"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mksnapshot/-/mksnapshot-0.3.1.tgz"; + sha1 = "2501c05657436d742ce958a4ff92c77e40dd37e6"; + }; + }; + "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.0" = { + name = "modify-values"; + packageName = "modify-values"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/modify-values/-/modify-values-1.0.0.tgz"; + sha1 = "e2b6cdeb9ce19f99317a53722f3dbf5df5eaaab2"; + }; + }; + "module-deps-4.1.1" = { + name = "module-deps"; + packageName = "module-deps"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/module-deps/-/module-deps-4.1.1.tgz"; + sha1 = "23215833f1da13fd606ccb8087b44852dcb821fd"; + }; + }; + "module-deps-5.0.1" = { + name = "module-deps"; + packageName = "module-deps"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/module-deps/-/module-deps-5.0.1.tgz"; + sha512 = "0jc7ysgbhwbj17j14vcl7aa6pn7pcp5bas2d5lb53rq3l7xkcxgvjqgrc9l4xvdhy2sdwyj1s9nssn7fhwhrdb841wycbxz37z2la5j"; + }; + }; + "moment-2.1.0" = { + name = "moment"; + packageName = "moment"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.1.0.tgz"; + sha1 = "1fd7b1134029a953c6ea371dbaee37598ac03567"; + }; + }; + "moment-2.14.1" = { + name = "moment"; + packageName = "moment"; + version = "2.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.14.1.tgz"; + sha1 = "b35b27c47e57ed2ddc70053d6b07becdb291741c"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "moment-2.20.1" = { + name = "moment"; + packageName = "moment"; + version = "2.20.1"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.20.1.tgz"; + sha512 = "2zc9qgzsrnp9g4jm4qsb1g1h7w5zmnkz8690br52l83yr9kwhch0mh7r2vdhc706jkrqczia9wbrgkscz0x6k8cwmb3r5jifbpp47v2"; + }; + }; + "moment-2.6.0" = { + name = "moment"; + packageName = "moment"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.6.0.tgz"; + sha1 = "0765b72b841dd213fa91914c0f6765122719f061"; + }; + }; + "moment-2.7.0" = { + name = "moment"; + packageName = "moment"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.7.0.tgz"; + sha1 = "359a19ec634cda3c706c8709adda54c0329aaec4"; + }; + }; + "moment-timezone-0.5.14" = { + name = "moment-timezone"; + packageName = "moment-timezone"; + version = "0.5.14"; + src = fetchurl { + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.14.tgz"; + sha1 = "4eb38ff9538b80108ba467a458f3ed4268ccfcb1"; + }; + }; + "mongodb-1.2.14" = { + name = "mongodb"; + packageName = "mongodb"; + version = "1.2.14"; + src = fetchurl { + url = "https://registry.npmjs.org/mongodb/-/mongodb-1.2.14.tgz"; + sha1 = "269665552066437308d0942036646e6795c3a9a3"; }; }; "mongoose-3.6.7" = { @@ -20016,157 +16019,22 @@ let sha1 = "3bac3f3924a845d147784fc6558dee900b0151e2"; }; }; - "express-3.2.0" = { - name = "express"; - packageName = "express"; - version = "3.2.0"; + "morgan-1.6.1" = { + name = "morgan"; + packageName = "morgan"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-3.2.0.tgz"; - sha1 = "7b66d6c66b038038eedf452804222b3077374ae0"; + url = "https://registry.npmjs.org/morgan/-/morgan-1.6.1.tgz"; + sha1 = "5fd818398c6819cba28a7cd6664f292fe1c0bbf2"; }; }; - "express-partials-0.0.6" = { - name = "express-partials"; - packageName = "express-partials"; - version = "0.0.6"; + "morgan-1.9.0" = { + name = "morgan"; + packageName = "morgan"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/express-partials/-/express-partials-0.0.6.tgz"; - sha1 = "b2664f15c636d5248e60fdbe29131c4440552eda"; - }; - }; - "connect-flash-0.1.0" = { - name = "connect-flash"; - packageName = "connect-flash"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/connect-flash/-/connect-flash-0.1.0.tgz"; - sha1 = "82b381d61a12b651437df1c259c1f1c841239b88"; - }; - }; - "ejs-0.8.3" = { - name = "ejs"; - packageName = "ejs"; - version = "0.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ejs/-/ejs-0.8.3.tgz"; - sha1 = "db8aac47ff80a7df82b4c82c126fe8970870626f"; - }; - }; - "config-0.4.15" = { - name = "config"; - packageName = "config"; - version = "0.4.15"; - src = fetchurl { - url = "https://registry.npmjs.org/config/-/config-0.4.15.tgz"; - sha1 = "d43ddf58b8df5637fdd1314fc816ccae7bfbcd18"; - }; - }; - "socket.io-0.9.14" = { - name = "socket.io"; - packageName = "socket.io"; - version = "0.9.14"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-0.9.14.tgz"; - sha1 = "81af80ebf3ee8f7f6e71b1495db91f8fa53ff667"; - }; - }; - "semver-1.1.0" = { - name = "semver"; - packageName = "semver"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-1.1.0.tgz"; - sha1 = "da9b9c837e31550a7c928622bc2381de7dd7a53e"; - }; - }; - "moment-2.1.0" = { - name = "moment"; - packageName = "moment"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.1.0.tgz"; - sha1 = "1fd7b1134029a953c6ea371dbaee37598ac03567"; - }; - }; - "nodemailer-0.3.35" = { - name = "nodemailer"; - packageName = "nodemailer"; - version = "0.3.35"; - src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-0.3.35.tgz"; - sha1 = "4d38cdc0ad230bdf88cc27d1256ef49fcb422e19"; - }; - }; - "net-ping-1.1.7" = { - name = "net-ping"; - packageName = "net-ping"; - version = "1.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/net-ping/-/net-ping-1.1.7.tgz"; - sha1 = "49f5bca55a30a3726d69253557f231135a637075"; - }; - }; - "js-yaml-2.1.0" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-2.1.0.tgz"; - sha1 = "a55a6e4706b01d06326259a6f4bfc42e6ae38b1f"; - }; - }; - "hooks-0.2.1" = { - name = "hooks"; - packageName = "hooks"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/hooks/-/hooks-0.2.1.tgz"; - sha1 = "0f591b1b344bdcb3df59773f62fbbaf85bf4028b"; - }; - }; - "mongodb-1.2.14" = { - name = "mongodb"; - packageName = "mongodb"; - version = "1.2.14"; - src = fetchurl { - url = "https://registry.npmjs.org/mongodb/-/mongodb-1.2.14.tgz"; - sha1 = "269665552066437308d0942036646e6795c3a9a3"; - }; - }; - "ms-0.1.0" = { - name = "ms"; - packageName = "ms"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.1.0.tgz"; - sha1 = "f21fac490daf1d7667fd180fe9077389cc9442b2"; - }; - }; - "sliced-0.0.3" = { - name = "sliced"; - packageName = "sliced"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/sliced/-/sliced-0.0.3.tgz"; - sha1 = "4f0bac2171eb17162c3ba6df81f5cf040f7c7e50"; - }; - }; - "muri-0.3.1" = { - name = "muri"; - packageName = "muri"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/muri/-/muri-0.3.1.tgz"; - sha1 = "861889c5c857f1a43700bee85d50731f61727c9a"; - }; - }; - "mpromise-0.2.1" = { - name = "mpromise"; - packageName = "mpromise"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mpromise/-/mpromise-0.2.1.tgz"; - sha1 = "fbbdc28cb0207e49b8a4eb1a4c0cea6c2de794c8"; + url = "https://registry.npmjs.org/morgan/-/morgan-1.9.0.tgz"; + sha1 = "d01fa6c65859b76fcf31b3cb53a3821a311d8051"; }; }; "mpath-0.1.1" = { @@ -20178,256 +16046,373 @@ let sha1 = "23da852b7c232ee097f4759d29c0ee9cd22d5e46"; }; }; - "bson-0.1.8" = { - name = "bson"; - packageName = "bson"; - version = "0.1.8"; + "mpromise-0.2.1" = { + name = "mpromise"; + packageName = "mpromise"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/bson/-/bson-0.1.8.tgz"; - sha1 = "cf34fdcff081a189b589b4b3e5e9309cd6506c81"; + url = "https://registry.npmjs.org/mpromise/-/mpromise-0.2.1.tgz"; + sha1 = "fbbdc28cb0207e49b8a4eb1a4c0cea6c2de794c8"; }; }; - "sliced-0.0.4" = { - name = "sliced"; - packageName = "sliced"; - version = "0.0.4"; + "mqtt-2.9.0" = { + name = "mqtt"; + packageName = "mqtt"; + version = "2.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/sliced/-/sliced-0.0.4.tgz"; - sha1 = "34f89a6db1f31fa525f5a570f5bcf877cf0955ee"; + url = "https://registry.npmjs.org/mqtt/-/mqtt-2.9.0.tgz"; + sha512 = "181qi8xb0lxxqvwq2xcslv35dbhphyr67w02bad6n4rlibcm6z0j055dyfpdh12mrrvgjzfj11cjylsj26y7vr17cvk1kbgkiqgzpb9"; }; }; - "connect-2.7.6" = { - name = "connect"; - packageName = "connect"; - version = "2.7.6"; + "mqtt-packet-5.4.0" = { + name = "mqtt-packet"; + packageName = "mqtt-packet"; + version = "5.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-2.7.6.tgz"; - sha1 = "b83b68fa6f245c5020e2395472cc8322b0060738"; + url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.4.0.tgz"; + sha512 = "2d1hvibps8d4xlw8wm937ykc76yb02rp2065hd6186vygjx3wixjjzrn3fia4wfj7d38ic8gh5ij5rsi9389kl6gpxxjbdcbjwpn8yf"; }; }; - "range-parser-0.0.4" = { - name = "range-parser"; - packageName = "range-parser"; - version = "0.0.4"; + "mri-1.1.0" = { + name = "mri"; + packageName = "mri"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz"; - sha1 = "c0427ffef51c10acba0782a46c9602e744ff620b"; + url = "https://registry.npmjs.org/mri/-/mri-1.1.0.tgz"; + sha1 = "5c0a3f29c8ccffbbb1ec941dcec09d71fa32f36a"; }; }; - "cookie-0.0.5" = { - name = "cookie"; - packageName = "cookie"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.0.5.tgz"; - sha1 = "f9acf9db57eb7568c9fcc596256b7bb22e307c81"; - }; - }; - "fresh-0.1.0" = { - name = "fresh"; - packageName = "fresh"; + "ms-0.1.0" = { + name = "ms"; + packageName = "ms"; version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz"; - sha1 = "03e4b0178424e4c2d5d19a54d8814cdc97934850"; + url = "https://registry.npmjs.org/ms/-/ms-0.1.0.tgz"; + sha1 = "f21fac490daf1d7667fd180fe9077389cc9442b2"; }; }; - "methods-0.0.1" = { - name = "methods"; - packageName = "methods"; - version = "0.0.1"; + "ms-0.7.0" = { + name = "ms"; + packageName = "ms"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/methods/-/methods-0.0.1.tgz"; - sha1 = "277c90f8bef39709645a8371c51c3b6c648e068c"; + url = "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz"; + sha1 = "865be94c2e7397ad8a57da6a633a6e2f30798b83"; }; }; - "send-0.1.0" = { - name = "send"; - packageName = "send"; - version = "0.1.0"; + "ms-0.7.1" = { + name = "ms"; + packageName = "ms"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.1.0.tgz"; - sha1 = "cfb08ebd3cec9b7fc1a37d9ff9e875a971cf4640"; + url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; + sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; }; }; - "cookie-signature-1.0.1" = { - name = "cookie-signature"; - packageName = "cookie-signature"; - version = "1.0.1"; + "ms-0.7.2" = { + name = "ms"; + packageName = "ms"; + version = "0.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.1.tgz"; - sha1 = "44e072148af01e6e8e24afbf12690d68ae698ecb"; + url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"; + sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765"; }; }; - "qs-0.5.1" = { - name = "qs"; - packageName = "qs"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-0.5.1.tgz"; - sha1 = "9f6bf5d9ac6c76384e95d36d15b48980e5e4add0"; - }; - }; - "formidable-1.0.11" = { - name = "formidable"; - packageName = "formidable"; - version = "1.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/formidable/-/formidable-1.0.11.tgz"; - sha1 = "68f63325a035e644b6f7bb3d11243b9761de1b30"; - }; - }; - "buffer-crc32-0.1.1" = { - name = "buffer-crc32"; - packageName = "buffer-crc32"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.1.1.tgz"; - sha1 = "7e110dc9953908ab7c32acdc70c9f945b1cbc526"; - }; - }; - "bytes-0.2.0" = { - name = "bytes"; - packageName = "bytes"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-0.2.0.tgz"; - sha1 = "aad33ec14e3dc2ca74e8e7d451f9ba053ad4f7a0"; - }; - }; - "mime-1.2.6" = { - name = "mime"; - packageName = "mime"; - version = "1.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.2.6.tgz"; - sha1 = "b1f86c768c025fa87b48075f1709f28aeaf20365"; - }; - }; - "js-yaml-0.3.7" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "0.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-0.3.7.tgz"; - sha1 = "d739d8ee86461e54b354d6a7d7d1f2ad9a167f62"; - }; - }; - "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"; - }; - }; - "diff-1.0.8" = { - name = "diff"; - packageName = "diff"; - version = "1.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-1.0.8.tgz"; - sha1 = "343276308ec991b7bc82267ed55bc1411f971666"; - }; - }; - "glob-4.0.6" = { - name = "glob"; - packageName = "glob"; - version = "4.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz"; - sha1 = "695c50bdd4e2fb5c5d370b091f388d3707e291a7"; - }; - }; - "minimatch-1.0.0" = { - name = "minimatch"; - packageName = "minimatch"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz"; - sha1 = "e0dd2120b49e1b724ce8d714c520822a9438576d"; - }; - }; - "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/socket.io-client/-/socket.io-client-0.9.11.tgz"; - sha1 = "94defc1b29e0d8a8fe958c1cf33300f68d8a19c7"; - }; - }; - "policyfile-0.0.4" = { - name = "policyfile"; - packageName = "policyfile"; - version = "0.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/policyfile/-/policyfile-0.0.4.tgz"; - sha1 = "d6b82ead98ae79ebe228e2daf5903311ec982e4d"; - }; - }; - "base64id-0.1.0" = { - name = "base64id"; - packageName = "base64id"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz"; - sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f"; - }; - }; - "redis-0.7.3" = { - name = "redis"; - packageName = "redis"; + "ms-0.7.3" = { + name = "ms"; + packageName = "ms"; version = "0.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/redis/-/redis-0.7.3.tgz"; - sha1 = "ee57b7a44d25ec1594e44365d8165fa7d1d4811a"; + url = "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz"; + sha1 = "708155a5e44e33f5fd0fc53e81d0d40a91be1fff"; }; }; - "uglify-js-1.2.5" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "1.2.5"; + "ms-2.0.0" = { + name = "ms"; + packageName = "ms"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-1.2.5.tgz"; - sha1 = "b542c2c76f78efb34b200b20177634330ff702b6"; + url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; }; }; - "ws-0.4.32" = { - name = "ws"; - packageName = "ws"; - version = "0.4.32"; + "ms-2.1.1" = { + name = "ms"; + packageName = "ms"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-0.4.32.tgz"; - sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32"; + url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"; + sha512 = "352z145jr1zx0w6kmlz2jxcaw6j2pwwg9va3x4gk731zw1agka2b213avw12zx6hgn071ibm0f3p80n5cdv896npay4s6jwbrv7w2mn"; }; }; - "xmlhttprequest-1.4.2" = { - name = "xmlhttprequest"; - packageName = "xmlhttprequest"; - version = "1.4.2"; + "ms-rest-1.15.7" = { + name = "ms-rest"; + packageName = "ms-rest"; + version = "1.15.7"; src = fetchurl { - url = "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.4.2.tgz"; - sha1 = "01453a1d9bed1e8f172f6495bbf4c8c426321500"; + url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.7.tgz"; + sha1 = "400515e05b1924889cb61a1ec6054290a68e1207"; }; }; - "active-x-obfuscator-0.0.1" = { - name = "active-x-obfuscator"; - packageName = "active-x-obfuscator"; - version = "0.0.1"; + "ms-rest-2.3.0" = { + name = "ms-rest"; + packageName = "ms-rest"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/active-x-obfuscator/-/active-x-obfuscator-0.0.1.tgz"; - sha1 = "089b89b37145ff1d9ec74af6530be5526cae1f1a"; + url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.3.0.tgz"; + sha512 = "2dfmfxr3xagmds2agz7g6rnj1s9lh29fgfwxbqsfpkkabh3qhcc7sznkaviilpzr59fks1401wy6sh9xyy3wsaqbm975vm5b2bj6cwf"; }; }; - "commander-2.1.0" = { - name = "commander"; - packageName = "commander"; - version = "2.1.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/commander/-/commander-2.1.0.tgz"; - sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781"; + url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.7.tgz"; + sha1 = "8bce09f053b1565dbaa8bd022ca40155c35b0fde"; + }; + }; + "ms-rest-azure-2.5.0" = { + name = "ms-rest-azure"; + packageName = "ms-rest-azure"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.5.0.tgz"; + sha512 = "22v7h9wa04laz1v40rq0wx3az880flfhz6xzjgk5pny3674kar5c0vj0ww1rjbsi891j9hvxvk9v51dykivirfjh5srqrjfmswzk3fw"; + }; + }; + "msgpack-1.0.2" = { + name = "msgpack"; + packageName = "msgpack"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/msgpack/-/msgpack-1.0.2.tgz"; + sha1 = "923e2c5cffa65c8418e9b228d1124793969c429c"; + }; + }; + "msgpack5-3.6.0" = { + name = "msgpack5"; + packageName = "msgpack5"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/msgpack5/-/msgpack5-3.6.0.tgz"; + sha512 = "3nr151ygx2w2pydaamcjrcn5ksl2rx09sdad8gh0rp1l07igigvfsw0xjjcnxrdws1rwy7g1j533qzhr7w25jisad6npv9rf1j84yz8"; + }; + }; + "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-4.0.1" = { + name = "multicast-dns"; + packageName = "multicast-dns"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-4.0.1.tgz"; + sha1 = "abf022fc866727055a9e0c2bc98097f5ebad97a2"; + }; + }; + "multicast-dns-6.2.2" = { + name = "multicast-dns"; + packageName = "multicast-dns"; + version = "6.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.2.tgz"; + sha512 = "06b9ps5a1ymag21szz55z4xzs2ncp0frcqsaldnggmz0m5ijhjv8f553cpkp9zkm37av1pm2y8pn70jbfzk888n1hap6i321babhcy5"; + }; + }; + "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/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz"; + sha1 = "899f11d9686e5e05cb91b35d5f0e63b773cfc901"; + }; + }; + "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"; + }; + }; + "multiparty-2.2.0" = { + name = "multiparty"; + packageName = "multiparty"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/multiparty/-/multiparty-2.2.0.tgz"; + sha1 = "a567c2af000ad22dc8f2a653d91978ae1f5316f4"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "muri-0.3.1" = { + name = "muri"; + packageName = "muri"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/muri/-/muri-0.3.1.tgz"; + sha1 = "861889c5c857f1a43700bee85d50731f61727c9a"; + }; + }; + "murl-0.4.1" = { + name = "murl"; + packageName = "murl"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/murl/-/murl-0.4.1.tgz"; + sha1 = "489fbcc7f1b2b77e689c84120a51339c3849c939"; + }; + }; + "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/murmur-hash-js/-/murmur-hash-js-1.0.0.tgz"; + sha1 = "5041049269c96633c866386960b2f4289e75e5b0"; + }; + }; + "mustache-2.3.0" = { + name = "mustache"; + packageName = "mustache"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mustache/-/mustache-2.3.0.tgz"; + sha1 = "4028f7778b17708a489930a6e52ac3bca0da41d0"; + }; + }; + "mutate.js-0.2.0" = { + name = "mutate.js"; + packageName = "mutate.js"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mutate.js/-/mutate.js-0.2.0.tgz"; + sha1 = "2e5cb1ac64c937dae28296e8f42af5eafd9bc7ef"; + }; + }; + "mute-stream-0.0.4" = { + name = "mute-stream"; + packageName = "mute-stream"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"; + sha1 = "a9219960a6d5d5d046597aee51252c6655f7177e"; + }; + }; + "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.6" = { + name = "mute-stream"; + packageName = "mute-stream"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz"; + sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "mz-2.7.0" = { + name = "mz"; + packageName = "mz"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz"; + sha512 = "3cpmwzmngnmxhklvicnsbl5dchvsy0yikzgf705cq1cplyps3waa03xbjp306bjf167wnplibwki0csnavz98dihq2877g7xqs4dkfg"; + }; + }; + "nan-0.3.2" = { + name = "nan"; + packageName = "nan"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-0.3.2.tgz"; + sha1 = "0df1935cab15369075ef160ad2894107aa14dc2d"; }; }; "nan-1.0.0" = { @@ -20439,58 +16424,738 @@ let sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38"; }; }; - "tinycolor-0.0.1" = { - name = "tinycolor"; - packageName = "tinycolor"; - version = "0.0.1"; + "nan-2.1.0" = { + name = "nan"; + packageName = "nan"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz"; - sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164"; + url = "https://registry.npmjs.org/nan/-/nan-2.1.0.tgz"; + sha1 = "020a7ccedc63fdee85f85967d5607849e74abbe8"; }; }; - "zeparser-0.0.5" = { - name = "zeparser"; - packageName = "zeparser"; + "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"; + }; + }; + "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"; + }; + }; + "nan-2.6.2" = { + name = "nan"; + packageName = "nan"; + version = "2.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz"; + sha1 = "e4ff34e6c95fdfb5aecc08de6596f43605a7db45"; + }; + }; + "nan-2.8.0" = { + name = "nan"; + packageName = "nan"; + version = "2.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz"; + sha1 = "ed715f3fe9de02b57a5e6252d90a96675e1f085a"; + }; + }; + "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"; + }; + }; + "nanoid-1.0.1" = { + name = "nanoid"; + packageName = "nanoid"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoid/-/nanoid-1.0.1.tgz"; + sha512 = "3dh8fdgynnii8rgdpyk69z99y49bnl60244wsaw8mk2lzhfhczgf7nxgmm0qakmgzbvqqqfngq03z3j8hp70smh7ka0il806w7ajxh5"; + }; + }; + "nanomatch-1.2.7" = { + name = "nanomatch"; + packageName = "nanomatch"; + version = "1.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.7.tgz"; + sha512 = "2m4xaq739s2r5bvh287d8zm8af9mxa706z1a7ila48yhvkspi4iimwyg0id1cl327i7kqssrcnc2nwdc2qw8s83xwqg3bmfgjr5v6gz"; + }; + }; + "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-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"; + }; + }; + "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"; + }; + }; + "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/native-dns-packet/-/native-dns-packet-0.1.1.tgz"; + sha1 = "97da90570b8438a00194701ce24d011fd3cc109a"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "natives-1.1.1" = { + name = "natives"; + packageName = "natives"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/natives/-/natives-1.1.1.tgz"; + sha512 = "08a9lf00d2pkqmdi6ipp00pjin0gwl6fh283cjdjbayaz834lppwrw19kn4s642kwa46bfcway3033j6rbqd96iy86qrzrfgz35mr7i"; + }; + }; + "natural-compare-1.4.0" = { + name = "natural-compare"; + packageName = "natural-compare"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"; + sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; + }; + }; + "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/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz"; + sha1 = "17b09581988979fddafe0201e931ba933c96cbb4"; + }; + }; + "ncname-1.0.0" = { + name = "ncname"; + packageName = "ncname"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ncname/-/ncname-1.0.0.tgz"; + sha1 = "5b57ad18b1ca092864ef62b0b1ed8194f383b71c"; + }; + }; + "nconf-0.6.9" = { + name = "nconf"; + packageName = "nconf"; + version = "0.6.9"; + src = fetchurl { + url = "https://registry.npmjs.org/nconf/-/nconf-0.6.9.tgz"; + sha1 = "9570ef15ed6f9ae6b2b3c8d5e71b66d3193cd661"; + }; + }; + "nconf-0.7.1" = { + name = "nconf"; + packageName = "nconf"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nconf/-/nconf-0.7.1.tgz"; + sha1 = "ee4b561dd979a3c58db122e38f196d49d61aeb5b"; + }; + }; + "nconf-0.7.2" = { + name = "nconf"; + packageName = "nconf"; + version = "0.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nconf/-/nconf-0.7.2.tgz"; + sha1 = "a05fdf22dc01c378dd5c4df27f2dc90b9aa8bb00"; + }; + }; + "ncp-0.4.2" = { + name = "ncp"; + packageName = "ncp"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"; + sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "ndjson-1.5.0" = { + name = "ndjson"; + packageName = "ndjson"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ndjson/-/ndjson-1.5.0.tgz"; + sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8"; + }; + }; + "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-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"; + }; + }; + "needle-0.11.0" = { + name = "needle"; + packageName = "needle"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/needle/-/needle-0.11.0.tgz"; + sha1 = "02a71b008eaf7d55ae89fb9fd7685b7b88d7bc29"; + }; + }; + "needle-2.1.1" = { + name = "needle"; + packageName = "needle"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/needle/-/needle-2.1.1.tgz"; + sha1 = "f3d501d633e661d34cd9648ca6c42f782a44d071"; + }; + }; + "negotiator-0.3.0" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.3.0.tgz"; + sha1 = "706d692efeddf574d57ea9fb1ab89a4fa7ee8f60"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "nested-error-stacks-1.0.2" = { + name = "nested-error-stacks"; + packageName = "nested-error-stacks"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-1.0.2.tgz"; + sha1 = "19f619591519f096769a5ba9a86e6eeec823c3cf"; + }; + }; + "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/net-browserify-alt/-/net-browserify-alt-1.1.0.tgz"; + sha1 = "02c9ecac88437be23f5948b208a1e65d8d138a73"; + }; + }; + "net-ping-1.1.7" = { + name = "net-ping"; + packageName = "net-ping"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/net-ping/-/net-ping-1.1.7.tgz"; + sha1 = "49f5bca55a30a3726d69253557f231135a637075"; + }; + }; + "netmask-1.0.6" = { + name = "netmask"; + packageName = "netmask"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/netmask/-/netmask-1.0.6.tgz"; + sha1 = "20297e89d86f6f6400f250d9f4f6b4c1945fcd35"; + }; + }; + "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-0.0.5" = { + name = "network-address"; + packageName = "network-address"; version = "0.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/zeparser/-/zeparser-0.0.5.tgz"; - sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2"; + url = "https://registry.npmjs.org/network-address/-/network-address-0.0.5.tgz"; + sha1 = "a400225438cacb67cd6108e8e826d5920a705dcc"; }; }; - "mailcomposer-4.0.2" = { - name = "mailcomposer"; - packageName = "mailcomposer"; - version = "4.0.2"; + "network-address-1.1.2" = { + name = "network-address"; + packageName = "network-address"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.2.tgz"; - sha1 = "b635402cc7f2eedb10130d3d09ad88b1c2d7e101"; + url = "https://registry.npmjs.org/network-address/-/network-address-1.1.2.tgz"; + sha1 = "4aa7bfd43f03f0b81c9702b13d6a858ddb326f3e"; }; }; - "simplesmtp-0.3.35" = { - name = "simplesmtp"; - packageName = "simplesmtp"; + "next-line-1.1.0" = { + name = "next-line"; + packageName = "next-line"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/next-line/-/next-line-1.1.0.tgz"; + sha1 = "fcae57853052b6a9bae8208e40dd7d3c2d304603"; + }; + }; + "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"; + }; + }; + "nijs-0.0.25" = { + name = "nijs"; + packageName = "nijs"; + version = "0.0.25"; + src = fetchurl { + url = "https://registry.npmjs.org/nijs/-/nijs-0.0.25.tgz"; + sha1 = "04b035cb530d46859d1018839a518c029133f676"; + }; + }; + "no-case-2.3.2" = { + name = "no-case"; + packageName = "no-case"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz"; + sha512 = "34msnfifpdmxl414b8rch1p1six59jd9251b7wkb37n78fa84xfa5f5f5cxxp477wb846nfrsg6b1py3rahz4xdpk17lzzy9kvdjr5f"; + }; + }; + "node-abi-2.1.2" = { + name = "node-abi"; + packageName = "node-abi"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/node-abi/-/node-abi-2.1.2.tgz"; + sha512 = "1sd6l8zqa18mlzackwy8vns51zjp8xyrd97nc514b0yvndd0y0wsyx2q9h8zr0k9kra5ys1yq75ggkv5av69cyzxji19rdvr5pjsrc6"; + }; + }; + "node-alias-1.0.4" = { + name = "node-alias"; + packageName = "node-alias"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/node-alias/-/node-alias-1.0.4.tgz"; + sha1 = "1f1b916b56b9ea241c0135f97ced6940f556f292"; + }; + }; + "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"; + }; + }; + "node-cache-4.1.1" = { + name = "node-cache"; + packageName = "node-cache"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-cache/-/node-cache-4.1.1.tgz"; + sha1 = "08524645ee4039dedc3dcc1dd7c6b979e0619e44"; + }; + }; + "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/node-elm-compiler/-/node-elm-compiler-4.3.3.tgz"; + sha512 = "2xwfrbx7s959y63gdiy54y86mp770vkxfgszp5xhwnxr29d3xavf8dnp0ab238732wh1121qwlx6k68wa4wkk4rm4qiswq5h5m9fjhd"; + }; + }; + "node-fetch-1.7.3" = { + name = "node-fetch"; + packageName = "node-fetch"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz"; + sha512 = "0lz5m15w7qaks0a0s3dm0crsjrsd123dy00pn6qwcp50zfjykxkp22i5ymh6smlc0ags38nmdxlxw9yyq509azlv8kcdvdiq857h5in"; + }; + }; + "node-firefox-connect-1.2.0" = { + name = "node-firefox-connect"; + packageName = "node-firefox-connect"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-firefox-connect/-/node-firefox-connect-1.2.0.tgz"; + sha1 = "42403848313240c98514ef14b3302816fe3b84e1"; + }; + }; + "node-forge-0.6.23" = { + name = "node-forge"; + packageName = "node-forge"; + version = "0.6.23"; + src = fetchurl { + url = "https://registry.npmjs.org/node-forge/-/node-forge-0.6.23.tgz"; + sha1 = "f03cf65ebd5d4d9dd2f7becb57ceaf78ed94a2bf"; + }; + }; + "node-forge-0.7.1" = { + name = "node-forge"; + packageName = "node-forge"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-forge/-/node-forge-0.7.1.tgz"; + sha1 = "9da611ea08982f4b94206b3beb4cc9665f20c300"; + }; + }; + "node-gyp-build-3.2.2" = { + name = "node-gyp-build"; + packageName = "node-gyp-build"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.2.2.tgz"; + sha512 = "34hwi28wvvh5nn8bv71n0fb83xjyk84jsn8j9zgkaqnfigpv2hk6fs9jaffsn7qi3yi4n7iwd9yjyagd1rh74ckzdf5s6l59b8vzidp"; + }; + }; + "node-int64-0.4.0" = { + name = "node-int64"; + packageName = "node-int64"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz"; + sha1 = "87a9065cdb355d3182d8f94ce11188b825c68a3b"; + }; + }; + "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/node-libs-browser/-/node-libs-browser-2.1.0.tgz"; + sha512 = "05d8rzfa0aihb9s1i3fm0dmdvlspfrxf4pxnsd3nms75mviv86llgg2r30l7b38a9l93yb00k7dy1vs8h4nd30ihhyvyc88vb6wa374"; + }; + }; + "node-notifier-5.2.1" = { + name = "node-notifier"; + packageName = "node-notifier"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-notifier/-/node-notifier-5.2.1.tgz"; + sha512 = "179bqs5pz252zanr7mca970h5748xj0fa6inw23x5g5fb0nk64wyh8d34jzah0x5s6wdw2lb0hnad2h257nqns999vd5s8x03w6r01h"; + }; + }; + "node-phantom-simple-2.2.4" = { + name = "node-phantom-simple"; + packageName = "node-phantom-simple"; + version = "2.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/node-phantom-simple/-/node-phantom-simple-2.2.4.tgz"; + sha1 = "4fc4effbb02f241fb5082bd4fbab398e4aecb64d"; + }; + }; + "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/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz"; + sha1 = "db604112cb74e0d477554e9b505b17abddfab786"; + }; + }; + "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"; + }; + }; + "node-red-node-email-0.1.24" = { + name = "node-red-node-email"; + packageName = "node-red-node-email"; + version = "0.1.24"; + src = fetchurl { + url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.24.tgz"; + sha1 = "ba12c72b01b39e33f375ccbf4321b163425e8fb2"; + }; + }; + "node-red-node-feedparser-0.1.8" = { + name = "node-red-node-feedparser"; + packageName = "node-red-node-feedparser"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.8.tgz"; + sha1 = "56cf6f69bc6d23557f8627ee63b74c1caa85c65b"; + }; + }; + "node-red-node-rbe-0.1.14" = { + name = "node-red-node-rbe"; + packageName = "node-red-node-rbe"; + version = "0.1.14"; + src = fetchurl { + url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.14.tgz"; + sha512 = "2xixj71payi14frjkb30lhnripprfcxzqaa9cbwh7w21s426y452ns0vpaycnbsbfwfcn5gcs4b2fjh0b6rxnbasd9hijqf6h3v26wa"; + }; + }; + "node-red-node-twitter-0.1.12" = { + name = "node-red-node-twitter"; + packageName = "node-red-node-twitter"; + version = "0.1.12"; + src = fetchurl { + url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.12.tgz"; + sha512 = "3h9isciksl33ajjzn4s0dp8s8m3zkijqc7rbw4v8glrhz5y3npbv8501sffak943jyd4k3dqalizv9giwaxqfd1760pkhbzh816y6j4"; + }; + }; + "node-static-0.7.10" = { + name = "node-static"; + packageName = "node-static"; + version = "0.7.10"; + src = fetchurl { + url = "https://registry.npmjs.org/node-static/-/node-static-0.7.10.tgz"; + sha512 = "3a22r0jr4112h0vr1smzrsaygc607v13arhjbjwzmy1jvmcrdlq9ydnw96ailkrlnwl3k0l65hjcgnrgkdwyc2qhbfnq2bgk0xz7pkd"; + }; + }; + "node-status-codes-1.0.0" = { + name = "node-status-codes"; + packageName = "node-status-codes"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz"; + sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"; + }; + }; + "node-swt-0.1.1" = { + name = "node-swt"; + packageName = "node-swt"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-swt/-/node-swt-0.1.1.tgz"; + sha1 = "af0903825784be553b93dbae57d99d59060585dd"; + }; + }; + "node-uuid-1.4.1" = { + name = "node-uuid"; + packageName = "node-uuid"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"; + sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "node-version-1.1.0" = { + name = "node-version"; + packageName = "node-version"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-version/-/node-version-1.1.0.tgz"; + sha512 = "0kc13ygbwm9zdjqv43ccb3mvfhmkwack6ziqcadw58b0f8ssv8h2gdr0br8xaqxpxp0h6pz9vm28yns03nl1vbqbgdankcsb127cmdp"; + }; + }; + "node-wsfederation-0.1.1" = { + name = "node-wsfederation"; + packageName = "node-wsfederation"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-wsfederation/-/node-wsfederation-0.1.1.tgz"; + sha1 = "9abf1dd3b20a3ab0a38f899c882c218d734e8a7b"; + }; + }; + "node.extend-1.0.0" = { + name = "node.extend"; + packageName = "node.extend"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node.extend/-/node.extend-1.0.0.tgz"; + sha1 = "ab83960c477280d01ba5554a0d8fd3acfe39336e"; + }; + }; + "node.extend-2.0.0" = { + name = "node.extend"; + packageName = "node.extend"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node.extend/-/node.extend-2.0.0.tgz"; + sha1 = "7525a2875677ea534784a5e10ac78956139614df"; + }; + }; + "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" = { @@ -20511,850 +17176,40 @@ 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"; - src = fetchurl { - url = "https://registry.npmjs.org/xoauth2/-/xoauth2-0.1.8.tgz"; - sha1 = "b916ff10ecfb54320f16f24a3e975120653ab0d2"; - }; - }; - "raw-socket-1.5.1" = { - name = "raw-socket"; - packageName = "raw-socket"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.5.1.tgz"; - sha1 = "a85466c7984c0f0c3842ee562dc61b9873977528"; - }; - }; - "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"; - }; - }; - "argparse-0.1.16" = { - name = "argparse"; - packageName = "argparse"; - version = "0.1.16"; - src = fetchurl { - url = "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz"; - sha1 = "cfd01e0fbba3d6caed049fbd758d40f65196f57c"; - }; - }; - "underscore-1.7.0" = { - name = "underscore"; - packageName = "underscore"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"; - sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209"; - }; - }; - "underscore.string-2.4.0" = { - name = "underscore.string"; - packageName = "underscore.string"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz"; - sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; - }; - }; - "argparse-0.1.15" = { - name = "argparse"; - packageName = "argparse"; - version = "0.1.15"; - src = fetchurl { - url = "https://registry.npmjs.org/argparse/-/argparse-0.1.15.tgz"; - sha1 = "28a1f72c43113e763220e5708414301c8840f0a1"; - }; - }; - "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/npm-registry-client/-/npm-registry-client-0.2.27.tgz"; - sha1 = "8f338189d32769267886a07ad7b7fd2267446adf"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "findit-1.2.0" = { - name = "findit"; - packageName = "findit"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/findit/-/findit-1.2.0.tgz"; - sha1 = "f571a3a840749ae8b0cbf4bf43ced7659eec3ce8"; - }; - }; - "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"; - }; - }; - "graceful-fs-2.0.3" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz"; - sha1 = "7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0"; - }; - }; - "semver-2.0.11" = { - name = "semver"; - packageName = "semver"; - version = "2.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-2.0.11.tgz"; - sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced"; - }; - }; - "chownr-0.0.2" = { - name = "chownr"; - packageName = "chownr"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/chownr/-/chownr-0.0.2.tgz"; - sha1 = "2f9aebf746f90808ce00607b72ba73b41604c485"; - }; - }; - "retry-0.6.0" = { - name = "retry"; - packageName = "retry"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.6.0.tgz"; - sha1 = "1c010713279a6fd1e8def28af0c3ff1871caa537"; - }; - }; - "couch-login-0.1.20" = { - name = "couch-login"; - packageName = "couch-login"; - version = "0.1.20"; - src = fetchurl { - url = "https://registry.npmjs.org/couch-login/-/couch-login-0.1.20.tgz"; - sha1 = "007c70ef80089dbae6f59eeeec37480799b39595"; - }; - }; - "once-1.1.1" = { - name = "once"; - packageName = "once"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.1.1.tgz"; - sha1 = "9db574933ccb08c3a7614d154032c09ea6f339e7"; - }; - }; - "osenv-0.0.3" = { - name = "osenv"; - packageName = "osenv"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz"; - sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6"; - }; - }; - "nopt-2.2.1" = { - name = "nopt"; - packageName = "nopt"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz"; - sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7"; - }; - }; - "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"; - }; - }; - "rimraf-2.1.4" = { - name = "rimraf"; - packageName = "rimraf"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz"; - sha1 = "5a6eb62eeda068f51ede50f29b3e5cd22f3d9bb2"; - }; - }; - "cint-8.2.1" = { - name = "cint"; - packageName = "cint"; - version = "8.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cint/-/cint-8.2.1.tgz"; - sha1 = "70386b1b48e2773d0d63166a55aff94ef4456a12"; - }; - }; - "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"; - }; - }; - "fast-diff-1.1.2" = { - name = "fast-diff"; - packageName = "fast-diff"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz"; - sha512 = "2550z1qvyfv9js9vg2aaj57ji5d9hhg4f6zl4rf483d6xswv23ac6ipj8gbapv4sjx14dpcslqmnx1z78vvx4np4ad5mdrxwfvm98i9"; - }; - }; - "node-alias-1.0.4" = { - name = "node-alias"; - packageName = "node-alias"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/node-alias/-/node-alias-1.0.4.tgz"; - sha1 = "1f1b916b56b9ea241c0135f97ced6940f556f292"; - }; - }; - "npm-3.10.10" = { - name = "npm"; - packageName = "npm"; - version = "3.10.10"; - src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-3.10.10.tgz"; - sha1 = "5b1d577e4c8869d6c8603bc89e9cd1637303e46e"; - }; - }; - "npmi-2.0.1" = { - name = "npmi"; - packageName = "npmi"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/npmi/-/npmi-2.0.1.tgz"; - sha1 = "32607657e1bd47ca857ab4e9d98f0a0cff96bcea"; - }; - }; - "semver-utils-1.1.1" = { - name = "semver-utils"; - packageName = "semver-utils"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/semver-utils/-/semver-utils-1.1.1.tgz"; - sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df"; - }; - }; - "snyk-1.61.2" = { - name = "snyk"; - packageName = "snyk"; - version = "1.61.2"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.61.2.tgz"; - sha1 = "c1426f84b68614999c6aec70ac6f08d8155a099b"; - }; - }; - "spawn-please-0.3.0" = { - name = "spawn-please"; - packageName = "spawn-please"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/spawn-please/-/spawn-please-0.3.0.tgz"; - sha1 = "db338ec4cff63abc69f1d0e08cee9eb8bebd9d11"; - }; - }; - "es6-promise-3.3.1" = { - name = "es6-promise"; - packageName = "es6-promise"; - version = "3.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz"; - sha1 = "a08cdde84ccdbf34d027a1451bc91d4bcd28a613"; - }; - }; - "hasbin-1.2.3" = { - name = "hasbin"; - packageName = "hasbin"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/hasbin/-/hasbin-1.2.3.tgz"; - sha1 = "78c5926893c80215c2b568ae1fd3fcab7a2696b0"; - }; - }; - "inquirer-1.0.3" = { - name = "inquirer"; - packageName = "inquirer"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-1.0.3.tgz"; - sha1 = "ebe3a0948571bcc46ccccbe2f9bcec251e984bd0"; - }; - }; - "needle-2.1.0" = { - name = "needle"; - packageName = "needle"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.1.0.tgz"; - sha1 = "54acebad9cc1a11822cd9ca522fb7c131c583fa4"; - }; - }; - "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/proxy-from-env/-/proxy-from-env-1.0.0.tgz"; - sha1 = "33c50398f70ea7eb96d21f7b817630a55791c7ee"; - }; - }; - "snyk-config-1.0.1" = { - name = "snyk-config"; - packageName = "snyk-config"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-config/-/snyk-config-1.0.1.tgz"; - sha1 = "f27aec2498b24027ac719214026521591111508f"; - }; - }; - "snyk-go-plugin-1.4.3" = { - name = "snyk-go-plugin"; - packageName = "snyk-go-plugin"; - version = "1.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.4.3.tgz"; - sha512 = "1g283c7pd9w1x0kr51i9rpgzks7l1lc5r73sj5zzl4mhwjpkx2w7lw2lps6g4raasa2c7gr2ifd79mcihcc896ws6z9ghldibxrfky5"; - }; - }; - "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/snyk-gradle-plugin/-/snyk-gradle-plugin-1.2.0.tgz"; - sha512 = "1b2bxvwl2v4prlj942i4jkz4mahgp39j7lvy91jzv00nsk59l76b1icn48zj4zk84s00jil3pnxnfzsclhcc612d70s4wwi3x2hrrqn"; - }; - }; - "snyk-module-1.8.1" = { - name = "snyk-module"; - packageName = "snyk-module"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-module/-/snyk-module-1.8.1.tgz"; - sha1 = "31d5080fb1c0dfd6fa8567dd34a523fd02bf1fca"; - }; - }; - "snyk-mvn-plugin-1.1.0" = { - name = "snyk-mvn-plugin"; - packageName = "snyk-mvn-plugin"; + "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/snyk-mvn-plugin/-/snyk-mvn-plugin-1.1.0.tgz"; - sha512 = "3ar9rk77y39sydnriw6k9p5s15qpv1in81365l0yjbvn6qis7v4na98xfibsmfnnkjyblnd5qs2q1j6fabdfx4g2x5yi7ld6hdm6r3r"; + url = "https://registry.npmjs.org/nodemailer-smtp-transport/-/nodemailer-smtp-transport-1.1.0.tgz"; + sha1 = "e6c37f31885ab3080e7ded3cf528c4ad7e691398"; }; }; - "snyk-nuget-plugin-1.3.6" = { - name = "snyk-nuget-plugin"; - packageName = "snyk-nuget-plugin"; - version = "1.3.6"; + "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/snyk-nuget-plugin/-/snyk-nuget-plugin-1.3.6.tgz"; - sha512 = "0wnflg1m0bsym4skxmjq8nsdxn4m1g7dqxix7yh2542azag7n6xhz9dc6r8l2cfg79rd7gcc9yyla2g0jpv2qqsls2mar9kq7aafbyz"; + url = "https://registry.npmjs.org/nodemailer-smtp-transport/-/nodemailer-smtp-transport-2.7.2.tgz"; + sha1 = "03d71c76314f14ac7dbc7bf033a6a6d16d67fb77"; }; }; - "snyk-php-plugin-1.3.0" = { - name = "snyk-php-plugin"; - packageName = "snyk-php-plugin"; - version = "1.3.0"; + "nodemailer-wellknown-0.1.10" = { + name = "nodemailer-wellknown"; + packageName = "nodemailer-wellknown"; + version = "0.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.3.0.tgz"; - sha512 = "2bx4gvqyyq8343l28f1l8mm20bsqc7kxjbhg7fmwrwmim42z4985pp4naclnxgf22l6xx852a1fyiyaz9npks8navb5mwss7fa17i7g"; - }; - }; - "snyk-policy-1.10.1" = { - name = "snyk-policy"; - packageName = "snyk-policy"; - version = "1.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.10.1.tgz"; - sha1 = "b1a26c8aef529c61604aca382111e535d511b763"; - }; - }; - "snyk-python-plugin-1.4.0" = { - name = "snyk-python-plugin"; - packageName = "snyk-python-plugin"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.4.0.tgz"; - sha512 = "3ayb4vqwvz9srv07xfrzwwni6aabbxmmxq8gx55qkzbc7x912k7cvd4r8v96ij8ck45r89xhm2j60knmjhv6xj1gm2x9vhz20s325vk"; - }; - }; - "snyk-recursive-readdir-2.0.0" = { - name = "snyk-recursive-readdir"; - packageName = "snyk-recursive-readdir"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-recursive-readdir/-/snyk-recursive-readdir-2.0.0.tgz"; - sha1 = "5cb59e94698169e0205a60e7d6a506d0b4d52ff3"; - }; - }; - "snyk-resolve-1.0.0" = { - name = "snyk-resolve"; - packageName = "snyk-resolve"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-resolve/-/snyk-resolve-1.0.0.tgz"; - sha1 = "bbe9196d37f57c39251e6be75ccdd5b2097e99a2"; - }; - }; - "snyk-resolve-deps-1.7.0" = { - name = "snyk-resolve-deps"; - packageName = "snyk-resolve-deps"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-1.7.0.tgz"; - sha1 = "13743a058437dff890baaf437c333c966a743cb6"; - }; - }; - "snyk-sbt-plugin-1.2.0" = { - name = "snyk-sbt-plugin"; - packageName = "snyk-sbt-plugin"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.2.0.tgz"; - sha512 = "002ibp199wy3pk8dldcfr83njcrgx7hk1c802hwa9skky7jw5c4infnaj9aignghi2l1w44p3cjk3xwbcrryldj3hh63vbyzpryg3qz"; - }; - }; - "snyk-tree-1.0.0" = { - name = "snyk-tree"; - packageName = "snyk-tree"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-tree/-/snyk-tree-1.0.0.tgz"; - sha1 = "0fb73176dbf32e782f19100294160448f9111cc8"; - }; - }; - "snyk-try-require-1.2.0" = { - name = "snyk-try-require"; - packageName = "snyk-try-require"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-1.2.0.tgz"; - sha1 = "30fc2b11c07064591ee35780c826be91312f2144"; - }; - }; - "then-fs-2.0.0" = { - name = "then-fs"; - packageName = "then-fs"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/then-fs/-/then-fs-2.0.0.tgz"; - sha1 = "72f792dd9d31705a91ae19ebfcf8b3f968c81da2"; - }; - }; - "mute-stream-0.0.6" = { - name = "mute-stream"; - packageName = "mute-stream"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz"; - sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db"; - }; - }; - "rx-4.1.0" = { - name = "rx"; - packageName = "rx"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz"; - sha1 = "a5f13ff79ef3b740fe30aa803fb09f98805d4782"; - }; - }; - "nconf-0.7.2" = { - name = "nconf"; - packageName = "nconf"; - version = "0.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/nconf/-/nconf-0.7.2.tgz"; - sha1 = "a05fdf22dc01c378dd5c4df27f2dc90b9aa8bb00"; - }; - }; - "yargs-3.15.0" = { - name = "yargs"; - packageName = "yargs"; - version = "3.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-3.15.0.tgz"; - sha1 = "3d9446ef21fb3791b3985690662e4b9683c7f181"; - }; - }; - "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"; - }; - }; - "clone-deep-0.3.0" = { - name = "clone-deep"; - packageName = "clone-deep"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/clone-deep/-/clone-deep-0.3.0.tgz"; - sha1 = "348c61ae9cdbe0edfe053d91ff4cc521d790ede8"; - }; - }; - "shallow-clone-0.1.2" = { - name = "shallow-clone"; - packageName = "shallow-clone"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz"; - sha1 = "5909e874ba77106d73ac414cfec1ffca87d97060"; - }; - }; - "kind-of-2.0.1" = { - name = "kind-of"; - packageName = "kind-of"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz"; - sha1 = "018ec7a4ce7e3a86cb9141be519d24c8faa981b5"; - }; - }; - "lazy-cache-0.2.7" = { - name = "lazy-cache"; - packageName = "lazy-cache"; - version = "0.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz"; - sha1 = "7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65"; - }; - }; - "mixin-object-2.0.1" = { - name = "mixin-object"; - packageName = "mixin-object"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz"; - sha1 = "4fb949441dab182540f1fe035ba60e1947a5e57e"; - }; - }; - "for-in-0.1.8" = { - name = "for-in"; - packageName = "for-in"; - version = "0.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz"; - sha1 = "d8773908e31256109952b1fdb9b3fa867d2775e1"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "base64-js-0.0.2" = { - name = "base64-js"; - packageName = "base64-js"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-0.0.2.tgz"; - sha1 = "024f0f72afa25b75f9c0ee73cd4f55ec1bed9784"; - }; - }; - "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"; - }; - }; - "email-validator-1.1.1" = { - name = "email-validator"; - packageName = "email-validator"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/email-validator/-/email-validator-1.1.1.tgz"; - sha512 = "3ydmy134p48c4zswbvjllak53h545dmzsz77bwpfxjf7aw510yyg4w58pazc2yz9agm93rphfgglrlj9cfkfdygcg1rbv0vj4jhjixy"; - }; - }; - "lodash.clonedeep-4.5.0" = { - name = "lodash.clonedeep"; - packageName = "lodash.clonedeep"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; - sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; - }; - }; - "minimatch-3.0.2" = { - name = "minimatch"; - packageName = "minimatch"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz"; - sha1 = "0f398a7300ea441e9c348c83d98ab8c9dbf9c40a"; - }; - }; - "ansicolors-0.3.2" = { - name = "ansicolors"; - packageName = "ansicolors"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz"; - sha1 = "665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"; - }; - }; - "clite-0.3.0" = { - name = "clite"; - packageName = "clite"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/clite/-/clite-0.3.0.tgz"; - sha1 = "e7fcbc8cc5bd3e7f8b84ed48db12e9474cc73441"; - }; - }; - "lodash.defaultsdeep-4.6.0" = { - name = "lodash.defaultsdeep"; - packageName = "lodash.defaultsdeep"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.0.tgz"; - sha1 = "bec1024f85b1bd96cbea405b23c14ad6443a6f81"; - }; - }; - "lodash.mergewith-4.6.0" = { - name = "lodash.mergewith"; - packageName = "lodash.mergewith"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz"; - sha1 = "150cf0a16791f5903b8891eab154609274bdea55"; - }; - }; - "update-notifier-0.6.3" = { - name = "update-notifier"; - packageName = "update-notifier"; - version = "0.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-0.6.3.tgz"; - sha1 = "776dec8daa13e962a341e8a1d98354306b67ae08"; - }; - }; - "yargs-4.8.1" = { - name = "yargs"; - packageName = "yargs"; - version = "4.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz"; - sha1 = "c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0"; - }; - }; - "boxen-0.3.1" = { - name = "boxen"; - packageName = "boxen"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/boxen/-/boxen-0.3.1.tgz"; - sha1 = "a7d898243ae622f7abb6bb604d740a76c6a5461b"; - }; - }; - "latest-version-2.0.0" = { - name = "latest-version"; - packageName = "latest-version"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz"; - sha1 = "56f8d6139620847b8017f8f1f4d78e211324168b"; - }; - }; - "filled-array-1.1.0" = { - name = "filled-array"; - packageName = "filled-array"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz"; - sha1 = "c3c4f6c663b923459a9aa29912d2d031f1507f84"; - }; - }; - "widest-line-1.0.0" = { - name = "widest-line"; - packageName = "widest-line"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz"; - sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c"; - }; - }; - "package-json-2.4.0" = { - name = "package-json"; - packageName = "package-json"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz"; - sha1 = "0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb"; - }; - }; - "got-5.7.1" = { - name = "got"; - packageName = "got"; - version = "5.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-5.7.1.tgz"; - sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35"; - }; - }; - "node-status-codes-1.0.0" = { - name = "node-status-codes"; - packageName = "node-status-codes"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz"; - sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"; - }; - }; - "timed-out-3.1.3" = { - name = "timed-out"; - packageName = "timed-out"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz"; - sha1 = "95860bfcc5c76c277f8f8326fd0f5b2e20eba217"; - }; - }; - "unzip-response-1.0.2" = { - name = "unzip-response"; - packageName = "unzip-response"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz"; - sha1 = "b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe"; - }; - }; - "lodash.assign-4.2.0" = { - name = "lodash.assign"; - packageName = "lodash.assign"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz"; - sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7"; - }; - }; - "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"; - }; - }; - "window-size-0.2.0" = { - name = "window-size"; - packageName = "window-size"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz"; - sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075"; - }; - }; - "yargs-parser-2.4.1" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz"; - sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4"; - }; - }; - "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"; - }; - }; - "cvss-1.0.2" = { - name = "cvss"; - packageName = "cvss"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cvss/-/cvss-1.0.2.tgz"; - sha1 = "df67e92bf12a796f49e928799c8db3ba74b9fcd6"; - }; - }; - "https-proxy-agent-2.1.1" = { - name = "https-proxy-agent"; - packageName = "https-proxy-agent"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.1.1.tgz"; - sha512 = "0rxbj60hs8fhs3i02lgb6ypcf9m9v8ybd4lfvfvpy0f1iyy54f1686lmv0rvkyxxihwvs4yizjgv8r8jksh385c4c9yjm3z8i0svbic"; + url = "https://registry.npmjs.org/nodemailer-wellknown/-/nodemailer-wellknown-0.1.10.tgz"; + sha1 = "586db8101db30cb4438eb546737a41aad0cf13d5"; }; }; "nodesecurity-npm-utils-6.0.0" = { @@ -21366,132 +17221,1706 @@ let sha512 = "0v36pqap4xw0z9h00v73nhxv2llz5gi0y6vww0yjyqb2qyfkgb7cjpjgzscc6bviw4xi4nk223s9nlcnvkpwymllbva8d98bixnbd1l"; }; }; - "wreck-12.5.1" = { - name = "wreck"; - packageName = "wreck"; - version = "12.5.1"; + "nomnom-1.8.1" = { + name = "nomnom"; + packageName = "nomnom"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/wreck/-/wreck-12.5.1.tgz"; - sha512 = "3s89p8x1i16wg1prbm40z7l00611hzk2s7kkvph6fw4cx049p3gpviqmhbgqxxi9pfjz32mx3aj7qsygmfcnvasgs43rj1ynwdd944p"; + url = "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz"; + sha1 = "2151f722472ba79e50a76fc125bb8c8f2e4dc2a7"; }; }; - "yargs-9.0.1" = { - name = "yargs"; - packageName = "yargs"; - version = "9.0.1"; + "noop-logger-0.1.1" = { + name = "noop-logger"; + packageName = "noop-logger"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-9.0.1.tgz"; - sha1 = "52acc23feecac34042078ee78c0c007f5085db4c"; + url = "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz"; + sha1 = "94a2b1633c4f1317553007d8966fd0e841b6a4c2"; }; }; - "agent-base-4.1.2" = { - name = "agent-base"; - packageName = "agent-base"; - version = "4.1.2"; + "nopt-1.0.10" = { + name = "nopt"; + packageName = "nopt"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/agent-base/-/agent-base-4.1.2.tgz"; - sha512 = "0vj8afdy0gk5q82i5zxx1ng4ylzipvyfnljbw948hvv1zr2653nr8jwiw73rp267a5c1rjl2xpxlc4rqvblc88sx0y0dfjs8yh90kjl"; + url = "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz"; + sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee"; }; }; - "es6-promisify-5.0.0" = { - name = "es6-promisify"; - packageName = "es6-promisify"; + "nopt-2.0.0" = { + name = "nopt"; + packageName = "nopt"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz"; + sha1 = "ca7416f20a5e3f9c3b86180f96295fa3d0b52e0d"; + }; + }; + "nopt-2.2.1" = { + name = "nopt"; + packageName = "nopt"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz"; + sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7"; + }; + }; + "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"; + }; + }; + "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-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"; + }; + }; + "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"; + }; + }; + "normalize-url-2.0.1" = { + name = "normalize-url"; + packageName = "normalize-url"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz"; + sha512 = "0rykwifg14xfgm9m6md48rkqqxa2cya4xdsv7jjciacis2nz6dzaccpzyldlpvy14rvihpxbdiysfn49a8x8x5jw84klmxzh9di98qg"; + }; + }; + "npm-3.10.10" = { + name = "npm"; + packageName = "npm"; + version = "3.10.10"; + src = fetchurl { + url = "https://registry.npmjs.org/npm/-/npm-3.10.10.tgz"; + sha1 = "5b1d577e4c8869d6c8603bc89e9cd1637303e46e"; + }; + }; + "npm-5.6.0" = { + name = "npm"; + packageName = "npm"; + version = "5.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm/-/npm-5.6.0.tgz"; + sha512 = "0nnr796ik5h8bsd3k9ygivivr3na2ksnf5iipf8dsnn20j10i9sgmhmsnzbimd2pqgjbrpp8gbpl2q7j5c7yjqjfirrh8xcc3v3gpws"; + }; + }; + "npm-keyword-5.0.0" = { + name = "npm-keyword"; + packageName = "npm-keyword"; version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz"; - sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; + url = "https://registry.npmjs.org/npm-keyword/-/npm-keyword-5.0.0.tgz"; + sha1 = "99b85aec29fcb388d2dd351f0013bf5268787e67"; }; }; - "lokijs-1.5.1" = { - name = "lokijs"; - packageName = "lokijs"; - version = "1.5.1"; + "npm-package-arg-5.1.2" = { + name = "npm-package-arg"; + packageName = "npm-package-arg"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/lokijs/-/lokijs-1.5.1.tgz"; - sha512 = "1pi08ry0a4zvg7mqj14gl0vacka95k77bbvljmcf25whxxbkh2rprsxpd8pv6frqh4ix6vslk44silx83sk65xhaw7ia2zssf0vngiy"; + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.1.2.tgz"; + sha512 = "36g1gm57qcvdgb4lm6ibl9pgma8lgx8l8i2jzap6w3v36wfzsqa7vb411zd26yp9rgcq23951vl5j6pac22qd5h9x7jm9raznnnr460"; }; }; - "vscode-languageclient-3.5.0" = { - name = "vscode-languageclient"; - packageName = "vscode-languageclient"; - version = "3.5.0"; + "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/vscode-languageclient/-/vscode-languageclient-3.5.0.tgz"; - sha1 = "36d02cc186a8365a4467719a290fb200a9ae490a"; + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.27.tgz"; + sha1 = "8f338189d32769267886a07ad7b7fd2267446adf"; }; }; - "babybird-0.0.1" = { - name = "babybird"; - packageName = "babybird"; - version = "0.0.1"; + "npm-registry-client-8.4.0" = { + name = "npm-registry-client"; + packageName = "npm-registry-client"; + version = "8.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/babybird/-/babybird-0.0.1.tgz"; - sha1 = "da80c79c6d7441cdfec7c2ff2dcbd7c13ebdbea2"; + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.4.0.tgz"; + sha512 = "20ka7w1mdgrazm20d5jihqam7gpiz0rnm2r6i91ax11mq96zn81ywwmmy3jr3yjddrc1bzcljxbs86wlwwrrzsgki2igj95mnm5ylrx"; }; }; - "connect-busboy-0.0.2" = { - name = "connect-busboy"; - packageName = "connect-busboy"; - version = "0.0.2"; + "npm-registry-client-8.5.0" = { + name = "npm-registry-client"; + packageName = "npm-registry-client"; + version = "8.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/connect-busboy/-/connect-busboy-0.0.2.tgz"; - sha1 = "ac5c9c96672171885e576c66b2bfd95d3bb11097"; + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.5.0.tgz"; + sha512 = "1nwp5cfjmy4k14g6ziz7zpia8f66ximhrdhw49cj2w173bibq1sgc4d5w951ql5dqf0hcmia956ld9y7qs2q1fx6s2j446zhvdk0irn"; }; }; - "content-type-git+https://github.com/wikimedia/content-type.git#master" = { - name = "content-type"; - packageName = "content-type"; + "npm-run-path-1.0.0" = { + name = "npm-run-path"; + packageName = "npm-run-path"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-1.0.0.tgz"; + sha1 = "f5c32bf595fe81ae927daec52e82f8b000ac3c8f"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "npmconf-0.1.16" = { + name = "npmconf"; + packageName = "npmconf"; + version = "0.1.16"; + src = fetchurl { + url = "https://registry.npmjs.org/npmconf/-/npmconf-0.1.16.tgz"; + sha1 = "0bdca78b8551419686b3a98004f06f0819edcd2a"; + }; + }; + "npmconf-2.1.2" = { + name = "npmconf"; + packageName = "npmconf"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz"; + sha1 = "66606a4a736f1e77a059aa071a79c94ab781853a"; + }; + }; + "npmi-2.0.1" = { + name = "npmi"; + packageName = "npmi"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npmi/-/npmi-2.0.1.tgz"; + sha1 = "32607657e1bd47ca857ab4e9d98f0a0cff96bcea"; + }; + }; + "npmlog-2.0.4" = { + name = "npmlog"; + packageName = "npmlog"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/npmlog/-/npmlog-2.0.4.tgz"; + sha1 = "98b52530f2514ca90d09ec5b22c8846722375692"; + }; + }; + "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"; + }; + }; + "nprogress-0.2.0" = { + name = "nprogress"; + packageName = "nprogress"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nprogress/-/nprogress-0.2.0.tgz"; + sha1 = "cb8f34c53213d895723fcbab907e9422adbcafb1"; + }; + }; + "nssocket-0.5.3" = { + name = "nssocket"; + packageName = "nssocket"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/nssocket/-/nssocket-0.5.3.tgz"; + sha1 = "883ca2ec605f5ed64a4d5190b2625401928f8f8d"; + }; + }; + "nth-check-1.0.1" = { + name = "nth-check"; + packageName = "nth-check"; version = "1.0.1"; - src = fetchgit { - url = "https://github.com/wikimedia/content-type.git"; - rev = "47b2632d0a2ee79a7d67268e2f6621becd95d05b"; - sha256 = "e583031138b98e2a09ce14dbd72afa0377201894092c941ef4cc07206c35ed04"; - }; - }; - "diff-1.4.0" = { - name = "diff"; - packageName = "diff"; - version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz"; - sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"; + url = "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz"; + sha1 = "9929acdf628fc2c41098deab82ac580cf149aae4"; }; }; - "domino-1.0.30" = { - name = "domino"; - packageName = "domino"; - version = "1.0.30"; + "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/domino/-/domino-1.0.30.tgz"; - sha512 = "1g3pbkg3gg3kjffah03vil47662ra58gckz5z8qymfgb9xq97k7vsd83410fmncbbll1p40rs0s4r0pgdypfvj9j2fq146j41dbqjla"; + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; }; }; - "express-handlebars-3.0.0" = { - name = "express-handlebars"; - packageName = "express-handlebars"; + "numeral-1.5.6" = { + name = "numeral"; + packageName = "numeral"; + version = "1.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/numeral/-/numeral-1.5.6.tgz"; + sha1 = "3831db968451b9cf6aff9bf95925f1ef8e37b33f"; + }; + }; + "oauth-0.9.14" = { + name = "oauth"; + packageName = "oauth"; + version = "0.9.14"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth/-/oauth-0.9.14.tgz"; + sha1 = "c5748883a40b53de30ade9cabf2100414b8a0971"; + }; + }; + "oauth-0.9.15" = { + name = "oauth"; + packageName = "oauth"; + version = "0.9.15"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth/-/oauth-0.9.15.tgz"; + sha1 = "bd1fefaf686c96b75475aed5196412ff60cfb9c1"; + }; + }; + "oauth-https://github.com/ciaranj/node-oauth/tarball/master" = { + name = "oauth"; + packageName = "oauth"; + version = "0.9.15"; + src = fetchurl { + name = "oauth-0.9.15.tar.gz"; + url = https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master; + sha256 = "9341c28772841acde618c778e85e381976f425824b816100792f697e68aec947"; + }; + }; + "oauth-sign-0.2.0" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.2.0.tgz"; + sha1 = "a0e6a1715daed062f322b622b7fe5afd1035b6e2"; + }; + }; + "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"; + }; + }; + "oauth2orize-1.8.0" = { + name = "oauth2orize"; + packageName = "oauth2orize"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.8.0.tgz"; + sha1 = "f2ddc0115d635d0480746249c00f0ea1a9c51ba8"; + }; + }; + "object-assign-1.0.0" = { + name = "object-assign"; + packageName = "object-assign"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz"; + sha1 = "e65dc8766d3b47b4b8307465c8311da030b070a6"; + }; + }; + "object-assign-3.0.0" = { + name = "object-assign"; + packageName = "object-assign"; version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/express-handlebars/-/express-handlebars-3.0.0.tgz"; - sha1 = "80a070bb819b09e4af2ca6d0780f75ce05e75c2f"; + url = "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz"; + sha1 = "9bedd5ca0897949bca47e7ff408062d549f587f2"; }; }; - "mediawiki-title-0.6.5" = { - name = "mediawiki-title"; - packageName = "mediawiki-title"; - version = "0.6.5"; + "object-assign-4.1.0" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.6.5.tgz"; - sha512 = "3r94k4jgdj5ir5y2p0hvb860976fz2fnzjafjzmsf0pivsqgy0hgxsxg315zmzq69rv0lli8rfjwcjp097xya03aaa4s7xjppi0ixvw"; + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz"; + sha1 = "7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"; }; }; - "negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" = { - name = "negotiator"; - packageName = "negotiator"; + "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-component-0.0.3" = { + name = "object-component"; + packageName = "object-component"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz"; + sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291"; + }; + }; + "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-hash-1.2.0" = { + name = "object-hash"; + packageName = "object-hash"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-hash/-/object-hash-1.2.0.tgz"; + sha512 = "19310wpjhfybr8gslg93qybbsrf3fjlmdgsgvn7d9yim1nmpcgjn5az280w4p8spvhq1djly7naa9434166gcmbavv0xirg75gmcr5j"; + }; + }; + "object-keys-1.0.11" = { + name = "object-keys"; + packageName = "object-keys"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz"; + sha1 = "c54601778ad560f1142ce0e01bcca8b56d13426d"; + }; + }; + "object-values-1.0.0" = { + name = "object-values"; + packageName = "object-values"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-values/-/object-values-1.0.0.tgz"; + sha1 = "72af839630119e5b98c3b02bb8c27e3237158105"; + }; + }; + "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.assign-4.1.0" = { + name = "object.assign"; + packageName = "object.assign"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz"; + sha512 = "3krdp08gvbxvipalq64qy7bm86znxxdb7ap6bjki235qs17i9fsn6hqd22ga31sqyqa6iyy5xjfnnqc7lsck1kaybwsh154mrxcj4bv"; + }; + }; + "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.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"; + }; + }; + "object.map-1.0.1" = { + name = "object.map"; + packageName = "object.map"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz"; + sha1 = "cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"; + }; + }; + "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"; + }; + }; + "object.values-1.0.4" = { + name = "object.values"; + packageName = "object.values"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/object.values/-/object.values-1.0.4.tgz"; + sha1 = "e524da09b4f66ff05df457546ec72ac99f13069a"; + }; + }; + "octicons-3.5.0" = { + name = "octicons"; + packageName = "octicons"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/octicons/-/octicons-3.5.0.tgz"; + sha1 = "f7ff5935674d8b114f6d80c454bfaa01797a4e30"; + }; + }; + "omelette-0.3.2" = { + name = "omelette"; + packageName = "omelette"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/omelette/-/omelette-0.3.2.tgz"; + sha1 = "68c1b3c57ced778b4e67d8637d2559b2c1b3ec26"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "once-1.1.1" = { + name = "once"; + packageName = "once"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.1.1.tgz"; + sha1 = "9db574933ccb08c3a7614d154032c09ea6f339e7"; + }; + }; + "once-1.2.0" = { + name = "once"; + packageName = "once"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.2.0.tgz"; + sha1 = "de1905c636af874a8fba862d9aabddd1f920461c"; + }; + }; + "once-1.3.0" = { + name = "once"; + packageName = "once"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.3.0.tgz"; + sha1 = "151af86bfc1f08c4b9f07d06ab250ffcbeb56581"; + }; + }; + "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"; + }; + }; + "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 = "https://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"; + }; + }; + "open-0.0.2" = { + name = "open"; + packageName = "open"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-0.0.2.tgz"; + sha1 = "0a620ba2574464742f51e69f8ba8eccfd97b5dfc"; + }; + }; + "open-0.0.5" = { + name = "open"; + packageName = "open"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-0.0.5.tgz"; + sha1 = "42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc"; + }; + }; + "opener-1.4.2" = { + name = "opener"; + packageName = "opener"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/opener/-/opener-1.4.2.tgz"; + sha1 = "b32582080042af8680c389a499175b4c54fff523"; + }; + }; + "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"; + }; + }; + "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/openssl-self-signed-certificate/-/openssl-self-signed-certificate-1.1.6.tgz"; + sha1 = "9d3a4776b1a57e9847350392114ad2f915a83dd4"; + }; + }; + "openssl-wrapper-0.2.1" = { + name = "openssl-wrapper"; + packageName = "openssl-wrapper"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/openssl-wrapper/-/openssl-wrapper-0.2.1.tgz"; + sha1 = "ff2d6552c83bb14437edc0371784704c75289473"; + }; + }; + "opentracing-0.13.0" = { + name = "opentracing"; + packageName = "opentracing"; + version = "0.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/opentracing/-/opentracing-0.13.0.tgz"; + sha1 = "6a341442f09d7d866bc11ed03de1e3828e3d6aab"; + }; + }; + "opentracing-0.14.1" = { + name = "opentracing"; + packageName = "opentracing"; + version = "0.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/opentracing/-/opentracing-0.14.1.tgz"; + sha1 = "40d278beea417660a35dd9d3ee76511ffa911dcd"; + }; + }; + "opn-4.0.2" = { + name = "opn"; + packageName = "opn"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/opn/-/opn-4.0.2.tgz"; + sha1 = "7abc22e644dff63b0a96d5ab7f2790c0f01abc95"; + }; + }; + "opn-5.1.0" = { + name = "opn"; + packageName = "opn"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/opn/-/opn-5.1.0.tgz"; + sha512 = "2k8g3x11xbm64r7bbyad08cjv27vaparkigq11w2v8kg8h73k2rzdr3q6f5i2klidgpaq9rbhfv45rf9dkqqv3d8vsbvw4c5knnbww8"; + }; + }; + "opn-5.2.0" = { + name = "opn"; + packageName = "opn"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/opn/-/opn-5.2.0.tgz"; + sha512 = "12iyalgghs3dj0pfb7rxa013x946169yfsjfd15fsfrx5kv80z2qh082x7v7d91hh7bf9vxcm4wqmyyj9ckk3gnvc7mw77j6fkwdpr5"; + }; + }; + "optimist-0.2.8" = { + name = "optimist"; + packageName = "optimist"; + version = "0.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/optimist/-/optimist-0.2.8.tgz"; + sha1 = "e981ab7e268b457948593b55674c099a815cac31"; + }; + }; + "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"; + }; + }; + "optimist-0.6.0" = { + name = "optimist"; + packageName = "optimist"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz"; + sha1 = "69424826f3405f79f142e6fc3d9ae58d4dbb9200"; + }; + }; + "optimist-0.6.1" = { + name = "optimist"; + packageName = "optimist"; version = "0.6.1"; - src = fetchgit { - url = "https://github.com/arlolra/negotiator.git"; - rev = "0418ab4e9a665772b7e233564a4525c9d9a8ec3a"; - sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394"; + src = fetchurl { + url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"; + sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "optjs-3.2.2" = { + name = "optjs"; + packageName = "optjs"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/optjs/-/optjs-3.2.2.tgz"; + sha1 = "69a6ce89c442a44403141ad2f9b370bd5bb6f4ee"; + }; + }; + "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.3.0" = { + name = "ora"; + packageName = "ora"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ora/-/ora-1.3.0.tgz"; + sha1 = "80078dd2b92a934af66a3ad72a5b910694ede51a"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz"; + sha1 = "7137e69b3298bb342247a1bbee3881c80e2fd78b"; + }; + }; + "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"; + }; + }; + "os-browserify-0.1.2" = { + name = "os-browserify"; + packageName = "os-browserify"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz"; + sha1 = "49ca0293e0b19590a5f5de10c7f265a617d8fe54"; + }; + }; + "os-browserify-0.3.0" = { + name = "os-browserify"; + packageName = "os-browserify"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz"; + sha1 = "854373c7f5c2315914fc9bfc6bd8238fdda1ec27"; + }; + }; + "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-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"; + }; + }; + "os-locale-2.1.0" = { + name = "os-locale"; + packageName = "os-locale"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz"; + sha512 = "0lafrp0i2ajapsnma0x74q7zscn97a56i5hh58a0nyig2igfx9fqn4ain9kvjrr06as5gzdrv2wdf52qc5m861fd0f4cv69ghdjbjyy"; + }; + }; + "os-name-1.0.3" = { + name = "os-name"; + packageName = "os-name"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/os-name/-/os-name-1.0.3.tgz"; + sha1 = "1b379f64835af7c5a7f498b357cb95215c159edf"; + }; + }; + "os-name-2.0.1" = { + name = "os-name"; + packageName = "os-name"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/os-name/-/os-name-2.0.1.tgz"; + sha1 = "b9a386361c17ae3a21736ef0599405c9a8c5dc5e"; + }; + }; + "os-shim-0.1.3" = { + name = "os-shim"; + packageName = "os-shim"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/os-shim/-/os-shim-0.1.3.tgz"; + sha1 = "6b62c3791cf7909ea35ed46e17658bb417cb3917"; + }; + }; + "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.0.3" = { + name = "osenv"; + packageName = "osenv"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz"; + sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6"; + }; + }; + "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"; + }; + }; + "osx-release-1.1.0" = { + name = "osx-release"; + packageName = "osx-release"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/osx-release/-/osx-release-1.1.0.tgz"; + sha1 = "f217911a28136949af1bf9308b241e2737d3cd6c"; + }; + }; + "p-any-1.1.0" = { + name = "p-any"; + packageName = "p-any"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-any/-/p-any-1.1.0.tgz"; + sha512 = "3da1hqkqhwx9xiw283nnq04pvsj1a69k7k0np5126v33dmpgxyhg19s99bz6djzd6sp713yg02h3h636wlgi9v2099rlrq2mrajvz8i"; + }; + }; + "p-cancelable-0.3.0" = { + name = "p-cancelable"; + packageName = "p-cancelable"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz"; + sha512 = "35jir2yjv2l3v8aj062w0hfinzgwpb1sbhmaym8h4xn78j498naj7mkf4rpv74n5bfkysxb7l893l2yw3dpqk5dgb2yiwr8pcydjmj5"; + }; + }; + "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"; + }; + }; + "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/p-is-promise/-/p-is-promise-1.1.0.tgz"; + sha1 = "9c9456989e9f6588017b0434d56097675c3da05e"; + }; + }; + "p-limit-1.2.0" = { + name = "p-limit"; + packageName = "p-limit"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz"; + sha512 = "2g0r6r6bbcdp6lrxbj2zbcihr1byd55kycm1ijz80l2zvmcvhqsbd7rhmfqylp004d61fibvmwzk4ig89dbyk4azpwgll7dllhsvwv3"; + }; + }; + "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"; + }; + }; + "p-some-2.0.1" = { + name = "p-some"; + packageName = "p-some"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/p-some/-/p-some-2.0.1.tgz"; + sha1 = "65d87c8b154edbcf5221d167778b6d2e150f6f06"; + }; + }; + "p-timeout-1.2.1" = { + name = "p-timeout"; + packageName = "p-timeout"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz"; + sha1 = "5eb3b353b7fce99f101a1038880bb054ebbea386"; + }; + }; + "p-timeout-2.0.1" = { + name = "p-timeout"; + packageName = "p-timeout"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz"; + sha512 = "0h1wg3bw3pyf3vlnxxfnrs3h33lwbx5n1lz4cz8ivh7bi8vjd6makxf6p1xz1d70ww3gj2ghryhbg6w1myxacgirk51ym23qzksdizk"; + }; + }; + "p-try-1.0.0" = { + name = "p-try"; + packageName = "p-try"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz"; + sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; + }; + }; + "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/pac-proxy-agent/-/pac-proxy-agent-1.1.0.tgz"; + sha512 = "30jd44ckpmfj9prfhzc8bjvn5b5adxk93g9saif813id8mrvl3g1asrhz9l0bc2rp0i779wnhg1rjw80h2y7zk8v02ghq4bdh4hn4a0"; + }; + }; + "pac-resolver-2.0.0" = { + name = "pac-resolver"; + packageName = "pac-resolver"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pac-resolver/-/pac-resolver-2.0.0.tgz"; + sha1 = "99b88d2f193fbdeefc1c9a529c1f3260ab5277cd"; + }; + }; + "package-json-1.2.0" = { + name = "package-json"; + packageName = "package-json"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/package-json/-/package-json-1.2.0.tgz"; + sha1 = "c8ecac094227cdf76a316874ed05e27cc939a0e0"; + }; + }; + "package-json-2.4.0" = { + name = "package-json"; + packageName = "package-json"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz"; + sha1 = "0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb"; + }; + }; + "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"; + }; + }; + "pad-0.0.5" = { + name = "pad"; + packageName = "pad"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/pad/-/pad-0.0.5.tgz"; + sha1 = "2219ab4db2ac74549a676164bc475d68cb87de05"; + }; + }; + "pad-component-0.0.1" = { + name = "pad-component"; + packageName = "pad-component"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pad-component/-/pad-component-0.0.1.tgz"; + sha1 = "ad1f22ce1bf0fdc0d6ddd908af17f351a404b8ac"; + }; + }; + "pako-0.2.9" = { + name = "pako"; + packageName = "pako"; + version = "0.2.9"; + src = fetchurl { + url = "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz"; + sha1 = "f3f7522f4ef782348da8161bad9ecfd51bf83a75"; + }; + }; + "pako-1.0.6" = { + name = "pako"; + packageName = "pako"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz"; + sha512 = "1r9hy37qsbhv5ipsydkbir2yl7qg3lbpgj4qzrnb903w8mhj9ibaww0zykbp0ak1nxxp6mpbws3xsrf7fgq39zchci90c7chgqvh1wm"; + }; + }; + "param-case-2.1.1" = { + name = "param-case"; + packageName = "param-case"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz"; + sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247"; + }; + }; + "parents-1.0.1" = { + name = "parents"; + packageName = "parents"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz"; + sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751"; + }; + }; + "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"; + }; + }; + "parse-entities-1.1.1" = { + name = "parse-entities"; + packageName = "parse-entities"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.1.tgz"; + sha1 = "8112d88471319f27abae4d64964b122fe4e1b890"; + }; + }; + "parse-filepath-1.0.2" = { + name = "parse-filepath"; + packageName = "parse-filepath"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz"; + sha1 = "a632127f53aaf3d15876f5872f3ffac763d6c891"; + }; + }; + "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/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz"; + sha1 = "9e7d8bb252a6cb6ba42595060b7bf6df3dbc1f50"; + }; + }; + "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"; + }; + }; + "parse-help-0.1.1" = { + name = "parse-help"; + packageName = "parse-help"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-help/-/parse-help-0.1.1.tgz"; + sha1 = "2f4df942e77a5581bba9967c0c3f48e4c66d7dda"; + }; + }; + "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"; + }; + }; + "parse-json-4.0.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz"; + sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; + }; + }; + "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"; + }; + }; + "parse-torrent-4.1.0" = { + name = "parse-torrent"; + packageName = "parse-torrent"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-4.1.0.tgz"; + sha1 = "a814bd8505e8b58e88eb8ff3e2daff5d19a711b7"; + }; + }; + "parse-torrent-5.8.3" = { + name = "parse-torrent"; + packageName = "parse-torrent"; + version = "5.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.8.3.tgz"; + sha1 = "f95ef23301239609de406794ad9f958a1bca1b6c"; + }; + }; + "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/parse-torrent-file/-/parse-torrent-file-2.1.4.tgz"; + sha1 = "32d4b6afde631420e5f415919a222b774b575707"; + }; + }; + "parse-torrent-file-4.0.3" = { + name = "parse-torrent-file"; + packageName = "parse-torrent-file"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.3.tgz"; + sha512 = "2shaz6cv4fgbmy1hq6hc59spkja51qg0vvx514r1nqsspdnsq6xzxabk0gs17x3n8s03y9mj8hx1xn5c0bkq9fvx59sxms2a4mlig9r"; + }; + }; + "parse5-3.0.3" = { + name = "parse5"; + packageName = "parse5"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz"; + sha512 = "005xscj5zlz7pkxa5ngys7i7pdb2f4pirj1zw7hr1145zhxxgg04nhykjh1csy2ncr5lyjw8phq8m2ylqhfhi2z4hgvjb2b1rkbs0xf"; + }; + }; + "parsejson-0.0.1" = { + name = "parsejson"; + packageName = "parsejson"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.1.tgz"; + sha1 = "9b10c6c0d825ab589e685153826de0a3ba278bcc"; + }; + }; + "parsejson-0.0.3" = { + name = "parsejson"; + packageName = "parsejson"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz"; + sha1 = "ab7e3759f209ece99437973f7d0f1f64ae0e64ab"; + }; + }; + "parseqs-0.0.2" = { + name = "parseqs"; + packageName = "parseqs"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.2.tgz"; + sha1 = "9dfe70b2cddac388bde4f35b1f240fa58adbe6c7"; + }; + }; + "parseqs-0.0.5" = { + name = "parseqs"; + packageName = "parseqs"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz"; + sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d"; + }; + }; + "parserlib-0.2.5" = { + name = "parserlib"; + packageName = "parserlib"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/parserlib/-/parserlib-0.2.5.tgz"; + sha1 = "85907dd8605aa06abb3dd295d50bb2b8fa4dd117"; + }; + }; + "parserlib-1.1.1" = { + name = "parserlib"; + packageName = "parserlib"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parserlib/-/parserlib-1.1.1.tgz"; + sha1 = "a64cfa724062434fdfc351c9a4ec2d92b94c06f4"; + }; + }; + "parseuri-0.0.2" = { + name = "parseuri"; + packageName = "parseuri"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.2.tgz"; + sha1 = "db41878f2d6964718be870b3140973d8093be156"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "passport-0.3.2" = { + name = "passport"; + packageName = "passport"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/passport/-/passport-0.3.2.tgz"; + sha1 = "9dd009f915e8fe095b0124a01b8f82da07510102"; + }; + }; + "passport-0.4.0" = { + name = "passport"; + packageName = "passport"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/passport/-/passport-0.4.0.tgz"; + sha1 = "c5095691347bd5ad3b5e180238c3914d16f05811"; + }; + }; + "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/passport-google-oauth/-/passport-google-oauth-1.0.0.tgz"; + sha1 = "65f50633192ad0627a18b08960077109d84eb76d"; + }; + }; + "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/passport-google-oauth1/-/passport-google-oauth1-1.0.0.tgz"; + sha1 = "af74a803df51ec646f66a44d82282be6f108e0cc"; + }; + }; + "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/passport-google-oauth20/-/passport-google-oauth20-1.0.0.tgz"; + sha1 = "3b960e8a1d70d1dbe794615c827c68c40392a5d0"; + }; + }; + "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/passport-http-bearer/-/passport-http-bearer-1.0.1.tgz"; + sha1 = "147469ea3669e2a84c6167ef99dbb77e1f0098a8"; + }; + }; + "passport-local-1.0.0" = { + name = "passport-local"; + packageName = "passport-local"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/passport-local/-/passport-local-1.0.0.tgz"; + sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee"; + }; + }; + "passport-oauth1-1.1.0" = { + name = "passport-oauth1"; + packageName = "passport-oauth1"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/passport-oauth1/-/passport-oauth1-1.1.0.tgz"; + sha1 = "a7de988a211f9cf4687377130ea74df32730c918"; + }; + }; + "passport-oauth2-1.4.0" = { + name = "passport-oauth2"; + packageName = "passport-oauth2"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.4.0.tgz"; + sha1 = "f62f81583cbe12609be7ce6f160b9395a27b86ad"; + }; + }; + "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/passport-oauth2-client-password/-/passport-oauth2-client-password-0.1.2.tgz"; + sha1 = "4f378b678b92d16dbbd233a6c706520093e561ba"; + }; + }; + "passport-strategy-1.0.0" = { + name = "passport-strategy"; + packageName = "passport-strategy"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz"; + sha1 = "b5539aa8fc225a3d1ad179476ddf236b440f52e4"; + }; + }; + "passwd-user-2.1.0" = { + name = "passwd-user"; + packageName = "passwd-user"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/passwd-user/-/passwd-user-2.1.0.tgz"; + sha1 = "fad9db6ae252f8b088e0c5decd20a7da0c5d9f1e"; + }; + }; + "path-browserify-0.0.0" = { + name = "path-browserify"; + packageName = "path-browserify"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz"; + sha1 = "a0b870729aae214005b7d5032ec2cbbb0fb4451a"; + }; + }; + "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-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"; + }; + }; + "path-exists-3.0.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz"; + sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; + }; + }; + "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-1.0.0" = { + name = "path-key"; + packageName = "path-key"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-key/-/path-key-1.0.0.tgz"; + sha1 = "5d53d578019646c0d68800db4e146e6bdc2ac7af"; + }; + }; + "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-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"; + }; + }; + "path-platform-0.11.15" = { + name = "path-platform"; + packageName = "path-platform"; + version = "0.11.15"; + src = fetchurl { + url = "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz"; + sha1 = "e864217f74c36850f0852b78dc7bf7d4a5721bf2"; + }; + }; + "path-proxy-1.0.0" = { + name = "path-proxy"; + packageName = "path-proxy"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-proxy/-/path-proxy-1.0.0.tgz"; + sha1 = "18e8a36859fc9d2f1a53b48dee138543c020de5e"; + }; + }; + "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"; + }; + }; + "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-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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "path-type-2.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz"; + sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73"; + }; + }; + "path-type-3.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz"; + sha512 = "2z1csf4c3fmlwl0ahk533z5zqkjdf36ccfx11kakl9xran9f5asxm4cxjq4lx1kwqdp8gki786cgpldvgrkvfc7pcvh07j5ssqm8rjg"; + }; + }; + "pathval-1.1.0" = { + name = "pathval"; + packageName = "pathval"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz"; + sha1 = "b942e6d4bde653005ef6b71361def8727d0645e0"; + }; + }; + "pause-0.0.1" = { + name = "pause"; + packageName = "pause"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz"; + sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "pbkdf2-3.0.14" = { + name = "pbkdf2"; + packageName = "pbkdf2"; + version = "3.0.14"; + src = fetchurl { + url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz"; + sha512 = "30bb7vx0m1k1m3d1i1khgvmgddx3ahqgprs421ssrh5plpx50k5bazsj67gdi7qiknircqy59yxbclq95s2rnmk8ysgkqdpsddijfw2"; + }; + }; + "peer-wire-protocol-0.7.0" = { + name = "peer-wire-protocol"; + packageName = "peer-wire-protocol"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/peer-wire-protocol/-/peer-wire-protocol-0.7.0.tgz"; + sha1 = "6c015abf24b4877ed9eca3822b22d996078011da"; + }; + }; + "peer-wire-swarm-0.12.1" = { + name = "peer-wire-swarm"; + packageName = "peer-wire-swarm"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/peer-wire-swarm/-/peer-wire-swarm-0.12.1.tgz"; + sha1 = "51b75da99c335c64c9ba9ef99fe27a4a5951ff42"; + }; + }; + "peerflix-0.34.0" = { + name = "peerflix"; + packageName = "peerflix"; + version = "0.34.0"; + src = fetchurl { + url = "https://registry.npmjs.org/peerflix/-/peerflix-0.34.0.tgz"; + sha1 = "748f7e401284bf8f2c620264d229223304199dbe"; + }; + }; + "pegjs-0.10.0" = { + name = "pegjs"; + packageName = "pegjs"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pegjs/-/pegjs-0.10.0.tgz"; + sha1 = "cf8bafae6eddff4b5a7efb185269eaaf4610ddbd"; }; }; "pegjs-git+https://github.com/tstarling/pegjs.git#fork" = { @@ -21504,806 +18933,301 @@ let sha256 = "df0bf31b132e63beae73a28f1edfe0a2e9edf01660632c72834c682e2b484905"; }; }; - "prfun-2.1.4" = { - name = "prfun"; - packageName = "prfun"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/prfun/-/prfun-2.1.4.tgz"; - sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0"; - }; - }; - "service-runner-2.4.8" = { - name = "service-runner"; - packageName = "service-runner"; - version = "2.4.8"; - src = fetchurl { - url = "https://registry.npmjs.org/service-runner/-/service-runner-2.4.8.tgz"; - sha1 = "5dd23353bc85bd128ed50b9d5f224ff99b5e8388"; - }; - }; - "simplediff-0.1.1" = { - name = "simplediff"; - packageName = "simplediff"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/simplediff/-/simplediff-0.1.1.tgz"; - sha1 = "b0caeeb093223370033c6c3aa1130dc86c6a087c"; - }; - }; - "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"; - }; - }; - "is-arguments-1.0.2" = { - name = "is-arguments"; - packageName = "is-arguments"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.2.tgz"; - sha1 = "07e30ad79531844179b642d2d8399435182c8727"; - }; - }; - "object.assign-4.0.4" = { - name = "object.assign"; - packageName = "object.assign"; - version = "4.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/object.assign/-/object.assign-4.0.4.tgz"; - sha1 = "b1c9cc044ef1b9fe63606fc141abbb32e14730cc"; - }; - }; - "define-properties-1.1.2" = { - name = "define-properties"; - packageName = "define-properties"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz"; - sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94"; - }; - }; - "bunyan-1.8.12" = { - name = "bunyan"; - packageName = "bunyan"; - version = "1.8.12"; - src = fetchurl { - url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.12.tgz"; - sha1 = "f150f0f6748abdd72aeae84f04403be2ef113797"; - }; - }; - "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/bunyan-syslog-udp/-/bunyan-syslog-udp-0.1.0.tgz"; - sha1 = "fbfaee03a81cd2a95abc18f92c99f2bb87e2429c"; - }; - }; - "gelf-stream-1.1.1" = { - name = "gelf-stream"; - packageName = "gelf-stream"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/gelf-stream/-/gelf-stream-1.1.1.tgz"; - sha1 = "9cea9b6386ac301c741838ca3cb91e66dbfbf669"; - }; - }; - "hot-shots-4.8.0" = { - name = "hot-shots"; - packageName = "hot-shots"; - version = "4.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hot-shots/-/hot-shots-4.8.0.tgz"; - sha1 = "052be48430efc7d117ba7cc4d41f1833ba38c79f"; - }; - }; - "limitation-0.2.0" = { - name = "limitation"; - packageName = "limitation"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/limitation/-/limitation-0.2.0.tgz"; - sha1 = "70ce102a972a0b79d4ca13a3ab62b8e6fe682a62"; - }; - }; - "dnscache-1.0.1" = { - name = "dnscache"; - packageName = "dnscache"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dnscache/-/dnscache-1.0.1.tgz"; - sha1 = "42cb2b9bfb5e8fbdfa395aac74e127fc05074d31"; - }; - }; - "dtrace-provider-0.8.5" = { - name = "dtrace-provider"; - packageName = "dtrace-provider"; - version = "0.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.5.tgz"; - sha1 = "98ebba221afac46e1c39fd36858d8f9367524b92"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "gelfling-0.3.1" = { - name = "gelfling"; - packageName = "gelfling"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/gelfling/-/gelfling-0.3.1.tgz"; - sha1 = "336a98f81510f9ae0af2a494e17468a116a9dc04"; - }; - }; - "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"; - }; - }; - "clarinet-0.11.0" = { - name = "clarinet"; - packageName = "clarinet"; - version = "0.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/clarinet/-/clarinet-0.11.0.tgz"; - sha1 = "6cc912b93138dc867fc273cd34ea90e83e054719"; - }; - }; - "kad-fs-0.0.4" = { - name = "kad-fs"; - packageName = "kad-fs"; - version = "0.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/kad-fs/-/kad-fs-0.0.4.tgz"; - sha1 = "02ea5aa5cf22225725579627ccfd6d266372289a"; - }; - }; - "kad-localstorage-0.0.7" = { - name = "kad-localstorage"; - packageName = "kad-localstorage"; - version = "0.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/kad-localstorage/-/kad-localstorage-0.0.7.tgz"; - sha1 = "f7a2e780da53fb28b943c2c5a894c279aa810f17"; - }; - }; - "kad-memstore-0.0.1" = { - name = "kad-memstore"; - packageName = "kad-memstore"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/kad-memstore/-/kad-memstore-0.0.1.tgz"; - sha1 = "83cb748496ac491c7135104cbe56b88ca7392477"; - }; - }; - "merge-1.2.0" = { - name = "merge"; - packageName = "merge"; + "pend-1.2.0" = { + name = "pend"; + packageName = "pend"; version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz"; - sha1 = "7531e39d4949c281a66b8c5a6e0265e8b05894da"; + url = "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz"; + sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; }; }; - "ms-0.7.3" = { - name = "ms"; - packageName = "ms"; - version = "0.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz"; - sha1 = "708155a5e44e33f5fd0fc53e81d0d40a91be1fff"; - }; - }; - "msgpack5-3.6.0" = { - name = "msgpack5"; - packageName = "msgpack5"; - version = "3.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/msgpack5/-/msgpack5-3.6.0.tgz"; - sha512 = "3nr151ygx2w2pydaamcjrcn5ksl2rx09sdad8gh0rp1l07igigvfsw0xjjcnxrdws1rwy7g1j533qzhr7w25jisad6npv9rf1j84yz8"; - }; - }; - "dom-storage-2.0.2" = { - name = "dom-storage"; - packageName = "dom-storage"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/dom-storage/-/dom-storage-2.0.2.tgz"; - sha1 = "ed17cbf68abd10e0aef8182713e297c5e4b500b0"; - }; - }; - "lodash.clone-4.3.2" = { - name = "lodash.clone"; - packageName = "lodash.clone"; - version = "4.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.3.2.tgz"; - sha1 = "e56b176b6823a7dde38f7f2bf58de7d5971200e9"; - }; - }; - "lodash._baseclone-4.5.7" = { - name = "lodash._baseclone"; - packageName = "lodash._baseclone"; - version = "4.5.7"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.7.tgz"; - sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434"; - }; - }; - "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"; - }; - }; - "airplayer-2.0.0" = { - name = "airplayer"; - packageName = "airplayer"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/airplayer/-/airplayer-2.0.0.tgz"; - sha1 = "7ab62d23b96d44234138aec1281d2e67ef190259"; - }; - }; - "clivas-0.2.0" = { - name = "clivas"; - packageName = "clivas"; + "performance-now-0.2.0" = { + name = "performance-now"; + packageName = "performance-now"; version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/clivas/-/clivas-0.2.0.tgz"; - sha1 = "b8d19188b3243e390f302410bd0cb1622db82649"; + url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz"; + sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"; }; }; - "inquirer-1.2.3" = { - name = "inquirer"; - packageName = "inquirer"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-1.2.3.tgz"; - sha1 = "4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918"; - }; - }; - "winreg-1.2.3" = { - name = "winreg"; - packageName = "winreg"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/winreg/-/winreg-1.2.3.tgz"; - sha1 = "93ad116b2696da87d58f7265a8fcea5254a965d5"; - }; - }; - "airplay-protocol-2.0.2" = { - name = "airplay-protocol"; - packageName = "airplay-protocol"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/airplay-protocol/-/airplay-protocol-2.0.2.tgz"; - sha1 = "b5b2a7137331f5545acbe196ba5693c13238fc5e"; - }; - }; - "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/appendable-cli-menu/-/appendable-cli-menu-2.0.0.tgz"; - sha1 = "dcfca9e509300e4c3b2d467965fe50c56fc75e66"; - }; - }; - "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"; - }; - }; - "bplist-creator-0.0.6" = { - name = "bplist-creator"; - packageName = "bplist-creator"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.0.6.tgz"; - sha1 = "fef069bee85975b2ddcc2264aaa7c50dc17a3c7e"; - }; - }; - "reverse-http-1.3.0" = { - name = "reverse-http"; - packageName = "reverse-http"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/reverse-http/-/reverse-http-1.3.0.tgz"; - sha1 = "61a9644bdea483aa281ffb62706e642f1a73a239"; - }; - }; - "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/consume-http-header/-/consume-http-header-1.0.0.tgz"; - sha1 = "95976d74f7f1b38dfb13fd9b3b68b91a0240556f"; - }; - }; - "consume-until-1.0.0" = { - name = "consume-until"; - packageName = "consume-until"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/consume-until/-/consume-until-1.0.0.tgz"; - sha1 = "75b91fa9f16663e51f98e863af995b9164068c1a"; - }; - }; - "http-headers-3.0.2" = { - name = "http-headers"; - packageName = "http-headers"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/http-headers/-/http-headers-3.0.2.tgz"; - sha512 = "0xv0kpsablrjag5ci3qqwjf0hwvcp6yk0hgabv4im6ssanimgbr8yhzmyz4jd10sw5xhrimzhxp2xx34l8p6aryqxqqg0wnxlikbcgk"; - }; - }; - "next-line-1.1.0" = { - name = "next-line"; - packageName = "next-line"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/next-line/-/next-line-1.1.0.tgz"; - sha1 = "fcae57853052b6a9bae8208e40dd7d3c2d304603"; - }; - }; - "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/single-line-log/-/single-line-log-1.1.2.tgz"; - sha1 = "c2f83f273a3e1a16edb0995661da0ed5ef033364"; - }; - }; - "array-flatten-2.1.1" = { - name = "array-flatten"; - packageName = "array-flatten"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.1.tgz"; - sha1 = "426bb9da84090c1838d812c8150af20a8331e296"; - }; - }; - "dns-equal-1.0.0" = { - name = "dns-equal"; - packageName = "dns-equal"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz"; - sha1 = "b39e7f1da6eb0a75ba9c17324b34753c47e0654d"; - }; - }; - "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/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz"; - sha1 = "899f11d9686e5e05cb91b35d5f0e63b773cfc901"; - }; - }; - "external-editor-1.1.1" = { - name = "external-editor"; - packageName = "external-editor"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/external-editor/-/external-editor-1.1.1.tgz"; - sha1 = "12d7b0db850f7ff7e7081baf4005700060c4600b"; - }; - }; - "spawn-sync-1.0.15" = { - name = "spawn-sync"; - packageName = "spawn-sync"; - version = "1.0.15"; - src = fetchurl { - url = "https://registry.npmjs.org/spawn-sync/-/spawn-sync-1.0.15.tgz"; - sha1 = "b00799557eb7fb0c8376c29d44e8a1ea67e57476"; - }; - }; - "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"; - }; - }; - "os-shim-0.1.3" = { - name = "os-shim"; - packageName = "os-shim"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/os-shim/-/os-shim-0.1.3.tgz"; - sha1 = "6b62c3791cf7909ea35ed46e17658bb417cb3917"; - }; - }; - "connect-multiparty-2.1.0" = { - name = "connect-multiparty"; - packageName = "connect-multiparty"; + "performance-now-2.1.0" = { + name = "performance-now"; + packageName = "performance-now"; version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/connect-multiparty/-/connect-multiparty-2.1.0.tgz"; - sha512 = "2im4bqk3xwxwilkg8gli3pblmalbhsd4wl5w10p63bvl0jd3m0qp5by840k5s7dr8wi0krixp2297bn76v38dwgznja4h4wp6my3g0c"; + url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; + sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; - "socket.io-1.7.4" = { - name = "socket.io"; - packageName = "socket.io"; - version = "1.7.4"; + "phantomjs-1.9.20" = { + name = "phantomjs"; + packageName = "phantomjs"; + version = "1.9.20"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-1.7.4.tgz"; - sha1 = "2f7ecedc3391bf2d5c73e291fe233e6e34d4dd00"; + url = "https://registry.npmjs.org/phantomjs/-/phantomjs-1.9.20.tgz"; + sha1 = "4424aca20e14d255c0b0889af6f6b8973da10e0d"; }; }; - "fluent-ffmpeg-2.1.2" = { - name = "fluent-ffmpeg"; - packageName = "fluent-ffmpeg"; - version = "2.1.2"; + "phantomjs-prebuilt-2.1.16" = { + name = "phantomjs-prebuilt"; + packageName = "phantomjs-prebuilt"; + version = "2.1.16"; src = fetchurl { - url = "https://registry.npmjs.org/fluent-ffmpeg/-/fluent-ffmpeg-2.1.2.tgz"; - sha1 = "c952de2240f812ebda0aa8006d7776ee2acf7d74"; + url = "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz"; + sha1 = "efd212a4a3966d3647684ea8ba788549be2aefef"; }; }; - "multiparty-4.1.3" = { - name = "multiparty"; - packageName = "multiparty"; - version = "4.1.3"; + "pify-2.3.0" = { + name = "pify"; + packageName = "pify"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/multiparty/-/multiparty-4.1.3.tgz"; - sha1 = "3c43c7fcb1896e17460436a9dd0b6ef1668e4f94"; + url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; + sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; }; }; - "engine.io-1.8.4" = { - name = "engine.io"; - packageName = "engine.io"; - version = "1.8.4"; + "pify-3.0.0" = { + name = "pify"; + packageName = "pify"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.4.tgz"; - sha1 = "77bce12b80e5d60429337fec3b0daf691ebc9003"; + url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"; + sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; }; }; - "socket.io-client-1.7.4" = { - name = "socket.io-client"; - packageName = "socket.io-client"; - version = "1.7.4"; + "pinkie-2.0.4" = { + name = "pinkie"; + packageName = "pinkie"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.4.tgz"; - sha1 = "ec9f820356ed99ef6d357f0756d648717bdd4281"; + url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"; + sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; }; }; - "ws-1.1.4" = { - name = "ws"; - packageName = "ws"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-1.1.4.tgz"; - sha1 = "57f40d036832e5f5055662a397c4de76ed66bf61"; - }; - }; - "engine.io-client-1.8.4" = { - name = "engine.io-client"; - packageName = "engine.io-client"; - version = "1.8.4"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.4.tgz"; - sha1 = "9fe85dee25853ca6babe25bd2ad68710863e91c2"; - }; - }; - "extract-zip-1.5.0" = { - name = "extract-zip"; - packageName = "extract-zip"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.5.0.tgz"; - sha1 = "92ccf6d81ef70a9fa4c1747114ccef6d8688a6c4"; - }; - }; - "request-2.67.0" = { - name = "request"; - packageName = "request"; - version = "2.67.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.67.0.tgz"; - sha1 = "8af74780e2bf11ea0ae9aa965c11f11afd272742"; - }; - }; - "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"; - }; - }; - "concat-stream-1.5.0" = { - name = "concat-stream"; - packageName = "concat-stream"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz"; - sha1 = "53f7d43c51c5e43f81c8fdd03321c631be68d611"; - }; - }; - "bl-1.0.3" = { - name = "bl"; - packageName = "bl"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz"; - sha1 = "fc5421a28fd4226036c3b3891a66a25bc64d226e"; - }; - }; - "qs-5.2.1" = { - name = "qs"; - packageName = "qs"; - version = "5.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-5.2.1.tgz"; - sha1 = "801fee030e0b9450d6385adc48a4cc55b44aedfc"; - }; - }; - "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"; - }; - }; - "browserify-13.3.0" = { - name = "browserify"; - packageName = "browserify"; - version = "13.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz"; - sha1 = "b5a9c9020243f0c70e4675bec8223bc627e415ce"; - }; - }; - "browserify-incremental-3.1.1" = { - name = "browserify-incremental"; - packageName = "browserify-incremental"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify-incremental/-/browserify-incremental-3.1.1.tgz"; - sha1 = "0713cb7587247a632a9f08cf1bd169b878b62a8a"; - }; - }; - "node-static-0.7.10" = { - name = "node-static"; - packageName = "node-static"; - version = "0.7.10"; - src = fetchurl { - url = "https://registry.npmjs.org/node-static/-/node-static-0.7.10.tgz"; - sha512 = "3a22r0jr4112h0vr1smzrsaygc607v13arhjbjwzmy1jvmcrdlq9ydnw96ailkrlnwl3k0l65hjcgnrgkdwyc2qhbfnq2bgk0xz7pkd"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "watchpack-1.4.0" = { - name = "watchpack"; - packageName = "watchpack"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-1.4.0.tgz"; - sha1 = "4a1472bcbb952bd0a9bb4036801f954dfb39faac"; - }; - }; - "https-browserify-0.0.1" = { - name = "https-browserify"; - packageName = "https-browserify"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz"; - sha1 = "3f91365cabe60b77ed0ebba24b454e3e09d95a82"; - }; - }; - "JSONStream-0.10.0" = { - name = "JSONStream"; - packageName = "JSONStream"; - version = "0.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/JSONStream/-/JSONStream-0.10.0.tgz"; - sha1 = "74349d0d89522b71f30f0a03ff9bd20ca6f12ac0"; - }; - }; - "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/browserify-cache-api/-/browserify-cache-api-3.0.1.tgz"; - sha1 = "96247e853f068fd6e0d45cc73f0bb2cd9778ef02"; - }; - }; - "less-2.7.3" = { - name = "less"; - packageName = "less"; - version = "2.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/less/-/less-2.7.3.tgz"; - sha512 = "04jbm6adzhknlcwjjdd94n8dhqwgsg0fyampis9854jf23z9g9lxs8593908ymwldl88bjipf9b9rw6xfibb29vv7s0c44wllj4ixr8"; - }; - }; - "less-middleware-2.2.1" = { - name = "less-middleware"; - packageName = "less-middleware"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/less-middleware/-/less-middleware-2.2.1.tgz"; - sha512 = "059c8rz6wkzc3fwd62a6f3lfw3h9sxj2fr0jjyr1i9kwfvk3737xyzndyshklllx5gnfri9z2g9a28c2ccnd6ka6adn6i7h4z5frw6m"; - }; - }; - "libquassel-2.1.9" = { - name = "libquassel"; - packageName = "libquassel"; - version = "2.1.9"; - src = fetchurl { - url = "https://registry.npmjs.org/libquassel/-/libquassel-2.1.9.tgz"; - sha1 = "e80ad2ef5c081ac677f66515d107537fdc0f5c64"; - }; - }; - "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/net-browserify-alt/-/net-browserify-alt-1.1.0.tgz"; - sha1 = "02c9ecac88437be23f5948b208a1e65d8d138a73"; - }; - }; - "pug-2.0.0-rc.4" = { - name = "pug"; - packageName = "pug"; - version = "2.0.0-rc.4"; - src = fetchurl { - url = "https://registry.npmjs.org/pug/-/pug-2.0.0-rc.4.tgz"; - sha512 = "1fbygi6jg8awam3agrc63yjlgxk8vfpnym1ql4dikclikp3kdrxfpfgdywadidzzic33b9fdqnwqy6ag82m4x6kmgl644zsz2ig3gj8"; - }; - }; - "httpolyglot-0.1.2" = { - name = "httpolyglot"; - packageName = "httpolyglot"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/httpolyglot/-/httpolyglot-0.1.2.tgz"; - sha1 = "e4d347fe8984a62f467d4060df527f1851f6997b"; - }; - }; - "image-size-0.5.5" = { - name = "image-size"; - packageName = "image-size"; - version = "0.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz"; - sha1 = "09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"; - }; - }; - "node.extend-2.0.0" = { - name = "node.extend"; - packageName = "node.extend"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node.extend/-/node.extend-2.0.0.tgz"; - sha1 = "7525a2875677ea534784a5e10ac78956139614df"; - }; - }; - "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"; - }; - }; - "eventemitter2-3.0.2" = { - name = "eventemitter2"; - packageName = "eventemitter2"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-3.0.2.tgz"; - sha1 = "81c0edb739ffa64fb9f21bbcb1d2b419a5133512"; - }; - }; - "qtdatastream-0.7.1" = { - name = "qtdatastream"; - packageName = "qtdatastream"; - version = "0.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/qtdatastream/-/qtdatastream-0.7.1.tgz"; - sha1 = "8085d390b4c19f7b02dee8a7cd873e2af58667b5"; - }; - }; - "int64-buffer-0.1.10" = { - name = "int64-buffer"; - packageName = "int64-buffer"; - version = "0.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/int64-buffer/-/int64-buffer-0.1.10.tgz"; - sha1 = "277b228a87d95ad777d07c13832022406a473423"; - }; - }; - "bufferutil-2.0.1" = { - name = "bufferutil"; - packageName = "bufferutil"; + "pinkie-promise-2.0.1" = { + name = "pinkie-promise"; + packageName = "pinkie-promise"; version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/bufferutil/-/bufferutil-2.0.1.tgz"; - sha1 = "8de37f5a300730c305fc3edd9f93348ee8a46288"; + url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; + sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; }; }; - "nan-2.5.1" = { - name = "nan"; - packageName = "nan"; - version = "2.5.1"; + "pino-4.10.3" = { + name = "pino"; + packageName = "pino"; + version = "4.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.5.1.tgz"; - sha1 = "d5b01691253326a97a2bbee9e61c55d8d60351e2"; + url = "https://registry.npmjs.org/pino/-/pino-4.10.3.tgz"; + sha512 = "2kg8qqb15pav0a2f16xmj5iqzkx28d0c6i1ydy3vzn71hfv7b7kvsbv917bwj68bh8m2mgy9j0kj8j4npy14hg2h09q4h85sz8wm990"; + }; + }; + "pkg-up-2.0.0" = { + name = "pkg-up"; + packageName = "pkg-up"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz"; + sha1 = "c819ac728059a461cab1c3889a2be3c49a004d7f"; + }; + }; + "pkginfo-0.2.3" = { + name = "pkginfo"; + packageName = "pkginfo"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"; + sha1 = "7239c42a5ef6c30b8f328439d9b9ff71042490f8"; + }; + }; + "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"; + }; + }; + "playerui-1.2.0" = { + name = "playerui"; + packageName = "playerui"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/playerui/-/playerui-1.2.0.tgz"; + sha1 = "2d59c8cb736e189cb2398cd809469ca47077f812"; + }; + }; + "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/please-upgrade-node/-/please-upgrade-node-3.0.1.tgz"; + sha1 = "0a681f2c18915e5433a5ca2cd94e0b8206a782db"; + }; + }; + "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"; + }; + }; + "plist-2.0.1" = { + name = "plist"; + packageName = "plist"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/plist/-/plist-2.0.1.tgz"; + sha1 = "0a32ca9481b1c364e92e18dc55c876de9d01da8b"; + }; + }; + "plist-2.1.0" = { + name = "plist"; + packageName = "plist"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/plist/-/plist-2.1.0.tgz"; + sha1 = "57ccdb7a0821df21831217a3cad54e3e146a1025"; + }; + }; + "pluralize-1.2.1" = { + name = "pluralize"; + packageName = "pluralize"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz"; + sha1 = "d1a21483fd22bb41e58a12fa3421823140897c45"; + }; + }; + "pluralize-7.0.0" = { + name = "pluralize"; + packageName = "pluralize"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz"; + sha512 = "2ihaln20qjx82jx73wgzirbyp8mfmhxr75am1h0w8n5hy2gsbgvw9dricv7h57ycxzax84bma96wjscmdszs5mr2lsyxpfjvhwl2601"; + }; + }; + "po2json-0.4.5" = { + name = "po2json"; + packageName = "po2json"; + version = "0.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/po2json/-/po2json-0.4.5.tgz"; + sha1 = "47bb2952da32d58a1be2f256a598eebc0b745118"; + }; + }; + "policyfile-0.0.4" = { + name = "policyfile"; + packageName = "policyfile"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/policyfile/-/policyfile-0.0.4.tgz"; + sha1 = "d6b82ead98ae79ebe228e2daf5903311ec982e4d"; + }; + }; + "pop-iterate-1.0.1" = { + name = "pop-iterate"; + packageName = "pop-iterate"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pop-iterate/-/pop-iterate-1.0.1.tgz"; + sha1 = "ceacfdab4abf353d7a0f2aaa2c1fc7b3f9413ba3"; + }; + }; + "poplib-0.1.7" = { + name = "poplib"; + packageName = "poplib"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/poplib/-/poplib-0.1.7.tgz"; + sha1 = "2f4b58b5592972350cd97f482aba68f8e05574bc"; + }; + }; + "popsicle-9.2.0" = { + name = "popsicle"; + packageName = "popsicle"; + version = "9.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/popsicle/-/popsicle-9.2.0.tgz"; + sha512 = "23p3a888k27q99lj4904nbcs8r51nlm4qdzs3m0xp9y4ci1rxzymzzckrblrmlmbzrlxx4i9zx7s56gcrhvi2jm3ypr3lvhgy7m3sx5"; + }; + }; + "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/popsicle-proxy-agent/-/popsicle-proxy-agent-3.0.0.tgz"; + sha1 = "b9133c55d945759ab7ee61b7711364620d3aeadc"; + }; + }; + "popsicle-retry-3.2.1" = { + name = "popsicle-retry"; + packageName = "popsicle-retry"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/popsicle-retry/-/popsicle-retry-3.2.1.tgz"; + sha1 = "e06e866533b42a7a123eb330cbe63a7cebcba10c"; + }; + }; + "popsicle-rewrite-1.0.0" = { + name = "popsicle-rewrite"; + packageName = "popsicle-rewrite"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/popsicle-rewrite/-/popsicle-rewrite-1.0.0.tgz"; + sha1 = "1dd4e8ea9c3182351fb820f87934d992f7fb9007"; + }; + }; + "popsicle-status-2.0.1" = { + name = "popsicle-status"; + packageName = "popsicle-status"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/popsicle-status/-/popsicle-status-2.0.1.tgz"; + sha1 = "8dd70c4fe7c694109add784ffe80eacac1e7b28d"; + }; + }; + "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"; + }; + }; + "postcss-6.0.14" = { + name = "postcss"; + packageName = "postcss"; + version = "6.0.14"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz"; + sha512 = "2id33g6232s35n25daqrkz0bvzm2zmhlkfzmigkgia5q4jy9xg38spppmsdg0qswjankyi28wrbjsdwhczqfkx7h71gg8dmzz8p779l"; + }; + }; + "postcss-6.0.16" = { + name = "postcss"; + packageName = "postcss"; + version = "6.0.16"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-6.0.16.tgz"; + sha512 = "2h2vfl4i770c41s6zy98za52jq23a0l5976rgh8x911znh1xsv8pcwvwnck8m1yrxfvpxnihs0myv9rsinwhck3zx3k2jp6cd2prglv"; }; }; "prebuild-install-2.1.2" = { @@ -22315,58 +19239,454 @@ let sha1 = "d9ae0ca85330e03962d93292f95a8b44c2ebf505"; }; }; - "expand-template-1.1.0" = { - name = "expand-template"; - packageName = "expand-template"; + "precond-0.2.3" = { + name = "precond"; + packageName = "precond"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/precond/-/precond-0.2.3.tgz"; + sha1 = "aa9591bcaa24923f1e0f4849d240f47efc1075ac"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "prepend-http-2.0.0" = { + name = "prepend-http"; + packageName = "prepend-http"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz"; + sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "prettyjson-1.2.1" = { + name = "prettyjson"; + packageName = "prettyjson"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prettyjson/-/prettyjson-1.2.1.tgz"; + sha1 = "fcffab41d19cab4dfae5e575e64246619b12d289"; + }; + }; + "prfun-2.1.5" = { + name = "prfun"; + packageName = "prfun"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/prfun/-/prfun-2.1.5.tgz"; + sha512 = "2x2535hml3hmhh6qbsl9r97mpa264mbpvmv0lbsqsfkv3sfd8wv7zw1b68555qsj5c6ma4b66qkgdsrr6355lhbmz052hqzq2qx082h"; + }; + }; + "private-0.1.8" = { + name = "private"; + packageName = "private"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/private/-/private-0.1.8.tgz"; + sha512 = "2dgznnpxsgy9bgp4kfby1is72blvca4lhmqb3nlja8yiig1v52c12p5yw0aag8jqazhkqvihpxmqf9gsjlg5dr1jb56jxzgnqrazy2n"; + }; + }; + "probe-image-size-3.2.0" = { + name = "probe-image-size"; + packageName = "probe-image-size"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/probe-image-size/-/probe-image-size-3.2.0.tgz"; + sha512 = "2ss74kxzba7k01p9fz756q4q9g6m29h49s5pp9wg1larrjmlcm1avhy7rwmqqkpd8azblwa3wk736xz1nrlvzc1h274g863ywifckic"; + }; + }; + "process-0.11.10" = { + name = "process"; + packageName = "process"; + version = "0.11.10"; + src = fetchurl { + url = "https://registry.npmjs.org/process/-/process-0.11.10.tgz"; + sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182"; + }; + }; + "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"; + }; + }; + "progress-1.1.8" = { + name = "progress"; + packageName = "progress"; + version = "1.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz"; + sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"; + }; + }; + "progress-2.0.0" = { + name = "progress"; + packageName = "progress"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz"; + sha1 = "8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"; + }; + }; + "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"; + }; + }; + "promiscuous-0.6.0" = { + name = "promiscuous"; + packageName = "promiscuous"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/promiscuous/-/promiscuous-0.6.0.tgz"; + sha1 = "54014cd3d62cafe831e3354990c05ff5b78c8892"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "promise-7.3.1" = { + name = "promise"; + packageName = "promise"; + version = "7.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz"; + sha512 = "17cn4nns2nxh9r0pdiqsqx3fpvaa82c1mhcr8r84k2a9hkpb0mj4bxzfbg3l9iy74yn9hj6mh2gsddsi3v939a1zp7ycbzqkxfm12cy"; + }; + }; + "promise-finally-3.0.0" = { + name = "promise-finally"; + packageName = "promise-finally"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-finally/-/promise-finally-3.0.0.tgz"; + sha1 = "ddd5d0f895432b1206ceb8da1275064d18e7aa23"; + }; + }; + "promise-phantom-3.1.6" = { + name = "promise-phantom"; + packageName = "promise-phantom"; + version = "3.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-phantom/-/promise-phantom-3.1.6.tgz"; + sha1 = "bbcfd248725259f2bb115a27bfa8d65dc420f931"; + }; + }; + "promised-temp-0.1.0" = { + name = "promised-temp"; + packageName = "promised-temp"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/promised-temp/-/promised-temp-0.1.0.tgz"; + sha1 = "5f8a704ccdf5f2ac23996fcafe2b301bc2a8d0eb"; + }; + }; + "prompt-0.2.14" = { + name = "prompt"; + packageName = "prompt"; + version = "0.2.14"; + src = fetchurl { + url = "https://registry.npmjs.org/prompt/-/prompt-0.2.14.tgz"; + sha1 = "57754f64f543fd7b0845707c818ece618f05ffdc"; + }; + }; + "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"; + }; + }; + "promzard-0.3.0" = { + name = "promzard"; + packageName = "promzard"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz"; + sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"; + }; + }; + "prop-types-15.6.0" = { + name = "prop-types"; + packageName = "prop-types"; + version = "15.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz"; + sha1 = "ceaf083022fc46b4a35f69e13ef75aed0d639856"; + }; + }; + "properties-1.2.1" = { + name = "properties"; + packageName = "properties"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/properties/-/properties-1.2.1.tgz"; + sha1 = "0ee97a7fc020b1a2a55b8659eda4aa8d869094bd"; + }; + }; + "properties-parser-0.3.1" = { + name = "properties-parser"; + packageName = "properties-parser"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/properties-parser/-/properties-parser-0.3.1.tgz"; + sha1 = "1316e9539ffbfd93845e369b211022abd478771a"; + }; + }; + "protein-0.5.0" = { + name = "protein"; + packageName = "protein"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/protein/-/protein-0.5.0.tgz"; + sha1 = "80ab4e919749351263ef14500d684e57c4202840"; + }; + }; + "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"; + }; + }; + "protobufjs-3.8.2" = { + name = "protobufjs"; + packageName = "protobufjs"; + version = "3.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/protobufjs/-/protobufjs-3.8.2.tgz"; + sha1 = "bc826e34c3af4697e8d0af7a669e4d612aedcd17"; + }; + }; + "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/expand-template/-/expand-template-1.1.0.tgz"; - sha512 = "34i2f4clwy5bpzgl137zwplybp5hn6ncxq0p794cx9m0crhgk31nfy0s8wp1v6hvw90h20c268r040g892dixy6zqq1xlm3ra8g0j4j"; + url = "https://registry.npmjs.org/protocol-buffers-encodings/-/protocol-buffers-encodings-1.1.0.tgz"; + sha512 = "28vhf9zv4h6gc3nia9pshzn16jm1h6r58nj2mwmkji35fjbscjwxrxigwy87j82y8wayn29qgc31939b1fyk6dmvvhwv1gp0ywc8s2a"; }; }; - "github-from-package-0.0.0" = { - name = "github-from-package"; - packageName = "github-from-package"; + "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"; + }; + }; + "proxy-addr-1.1.5" = { + name = "proxy-addr"; + packageName = "proxy-addr"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.5.tgz"; + sha1 = "71c0ee3b102de3f202f3b64f608d173fcba1a918"; + }; + }; + "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"; + }; + }; + "proxy-agent-2.0.0" = { + name = "proxy-agent"; + packageName = "proxy-agent"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-2.0.0.tgz"; + sha1 = "57eb5347aa805d74ec681cb25649dba39c933499"; + }; + }; + "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/proxy-from-env/-/proxy-from-env-1.0.0.tgz"; + sha1 = "33c50398f70ea7eb96d21f7b817630a55791c7ee"; + }; + }; + "proxy-middleware-0.15.0" = { + name = "proxy-middleware"; + packageName = "proxy-middleware"; + version = "0.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/proxy-middleware/-/proxy-middleware-0.15.0.tgz"; + sha1 = "a3fdf1befb730f951965872ac2f6074c61477a56"; + }; + }; + "prr-0.0.0" = { + name = "prr"; + packageName = "prr"; version = "0.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz"; - sha1 = "97fb5d96bfde8973313f20e8288ef9a167fa64ce"; + url = "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz"; + sha1 = "1a84b85908325501411853d0081ee3fa86e2926a"; }; }; - "node-abi-2.1.2" = { - name = "node-abi"; - packageName = "node-abi"; - version = "2.1.2"; + "prr-1.0.1" = { + name = "prr"; + packageName = "prr"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-2.1.2.tgz"; - sha512 = "1sd6l8zqa18mlzackwy8vns51zjp8xyrd97nc514b0yvndd0y0wsyx2q9h8zr0k9kra5ys1yq75ggkv5av69cyzxji19rdvr5pjsrc6"; + url = "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz"; + sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476"; }; }; - "noop-logger-0.1.1" = { - name = "noop-logger"; - packageName = "noop-logger"; - version = "0.1.1"; + "ps-tree-0.0.3" = { + name = "ps-tree"; + packageName = "ps-tree"; + version = "0.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz"; - sha1 = "94a2b1633c4f1317553007d8966fd0e841b6a4c2"; + url = "https://registry.npmjs.org/ps-tree/-/ps-tree-0.0.3.tgz"; + sha1 = "dbf8d752a7fe22fa7d58635689499610e9276ddc"; }; }; - "simple-get-1.4.3" = { - name = "simple-get"; - packageName = "simple-get"; - version = "1.4.3"; + "ps-tree-1.1.0" = { + name = "ps-tree"; + packageName = "ps-tree"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-get/-/simple-get-1.4.3.tgz"; - sha1 = "e9755eda407e96da40c5e5158c9ea37b33becbeb"; + url = "https://registry.npmjs.org/ps-tree/-/ps-tree-1.1.0.tgz"; + sha1 = "b421b24140d6203f1ed3c76996b4427b08e8c014"; }; }; - "tar-fs-1.16.0" = { - name = "tar-fs"; - packageName = "tar-fs"; - version = "1.16.0"; + "pseudomap-1.0.2" = { + name = "pseudomap"; + packageName = "pseudomap"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.0.tgz"; - sha512 = "1i39d75rgrl2a3v3x65w7bz6az06sg7xdvp7j9zk5bqilj5znclmr7r5n9l6la6nkqikn4lkhnfrgp4hzbvp6ph77nn53g6zvmdpni3"; + 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"; + }; + }; + "public-encrypt-4.0.0" = { + name = "public-encrypt"; + packageName = "public-encrypt"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz"; + sha1 = "39f699f3a46560dd5ebacbca693caf7c65c18cc6"; + }; + }; + "pug-2.0.0-rc.4" = { + name = "pug"; + packageName = "pug"; + version = "2.0.0-rc.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pug/-/pug-2.0.0-rc.4.tgz"; + sha512 = "1fbygi6jg8awam3agrc63yjlgxk8vfpnym1ql4dikclikp3kdrxfpfgdywadidzzic33b9fdqnwqy6ag82m4x6kmgl644zsz2ig3gj8"; + }; + }; + "pug-attrs-2.0.2" = { + name = "pug-attrs"; + packageName = "pug-attrs"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-attrs/-/pug-attrs-2.0.2.tgz"; + sha1 = "8be2b2225568ffa75d1b866982bff9f4111affcb"; }; }; "pug-code-gen-2.0.0" = { @@ -22378,6 +19698,15 @@ let sha512 = "1b9phnpcwd902482wvyql8a4h9wr1fw5idsjvg14bjvkmvxharb8m2ca25rj2f0s4i9sdldp2fj02i5933qys4921r9p7w97wjj52hk"; }; }; + "pug-error-1.3.2" = { + name = "pug-error"; + packageName = "pug-error"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-error/-/pug-error-1.3.2.tgz"; + sha1 = "53ae7d9d29bb03cf564493a026109f54c47f5f26"; + }; + }; "pug-filters-2.1.5" = { name = "pug-filters"; packageName = "pug-filters"; @@ -22441,78 +19770,6 @@ let sha1 = "d313afa01bcc374980e1399e23ebf2eb9bdc8513"; }; }; - "constantinople-3.1.0" = { - name = "constantinople"; - packageName = "constantinople"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/constantinople/-/constantinople-3.1.0.tgz"; - sha1 = "7569caa8aa3f8d5935d62e1fa96f9f702cd81c79"; - }; - }; - "doctypes-1.1.0" = { - name = "doctypes"; - packageName = "doctypes"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz"; - sha1 = "ea80b106a87538774e8a3a4a5afe293de489e0a9"; - }; - }; - "js-stringify-1.0.2" = { - name = "js-stringify"; - packageName = "js-stringify"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz"; - sha1 = "1736fddfd9724f28a3682adc6230ae7e4e9679db"; - }; - }; - "pug-attrs-2.0.2" = { - name = "pug-attrs"; - packageName = "pug-attrs"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-attrs/-/pug-attrs-2.0.2.tgz"; - sha1 = "8be2b2225568ffa75d1b866982bff9f4111affcb"; - }; - }; - "pug-error-1.3.2" = { - name = "pug-error"; - packageName = "pug-error"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pug-error/-/pug-error-1.3.2.tgz"; - sha1 = "53ae7d9d29bb03cf564493a026109f54c47f5f26"; - }; - }; - "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"; - }; - }; - "is-expression-2.1.0" = { - name = "is-expression"; - packageName = "is-expression"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-expression/-/is-expression-2.1.0.tgz"; - sha1 = "91be9d47debcfef077977e9722be6dcfb4465ef0"; - }; - }; - "acorn-globals-3.1.0" = { - name = "acorn-globals"; - packageName = "acorn-globals"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-3.1.0.tgz"; - sha1 = "fd8270f71fbb4996b004fa880ee5d46573a731bf"; - }; - }; "pug-walk-1.1.5" = { name = "pug-walk"; packageName = "pug-walk"; @@ -22522,283 +19779,211 @@ let sha512 = "1418rf52jpq3k5l26drb11156l945688pjpia6njqrxzgffjb2rric213vrqigglhmhwc0r57zsmlknnwvhg5w9nh025b6yapb4g6dc"; }; }; - "jstransformer-1.0.0" = { - name = "jstransformer"; - packageName = "jstransformer"; - version = "1.0.0"; + "pull-cat-1.1.11" = { + name = "pull-cat"; + packageName = "pull-cat"; + version = "1.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz"; - sha1 = "ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3"; + url = "https://registry.npmjs.org/pull-cat/-/pull-cat-1.1.11.tgz"; + sha1 = "b642dd1255da376a706b6db4fa962f5fdb74c31b"; }; }; - "character-parser-2.2.0" = { - name = "character-parser"; - packageName = "character-parser"; - version = "2.2.0"; + "pull-level-2.0.3" = { + name = "pull-level"; + packageName = "pull-level"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz"; - sha1 = "c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"; + url = "https://registry.npmjs.org/pull-level/-/pull-level-2.0.3.tgz"; + sha1 = "9500635e257945d6feede185f5d7a24773455b17"; }; }; - "is-expression-3.0.0" = { - name = "is-expression"; - packageName = "is-expression"; - version = "3.0.0"; + "pull-live-1.0.1" = { + name = "pull-live"; + packageName = "pull-live"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-expression/-/is-expression-3.0.0.tgz"; - sha1 = "39acaa6be7fd1f3471dc42c7416e61c24317ac9f"; + url = "https://registry.npmjs.org/pull-live/-/pull-live-1.0.1.tgz"; + sha1 = "a4ecee01e330155e9124bbbcf4761f21b38f51f5"; }; }; - "is-regex-1.0.4" = { - name = "is-regex"; - packageName = "is-regex"; - version = "1.0.4"; + "pull-pushable-2.1.2" = { + name = "pull-pushable"; + packageName = "pull-pushable"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz"; - sha1 = "5517489b547091b0930e095654ced25ee97e9491"; + url = "https://registry.npmjs.org/pull-pushable/-/pull-pushable-2.1.2.tgz"; + sha1 = "3fe15b8f7eec89f3972d238bc04890c9405a6dbb"; }; }; - "token-stream-0.0.1" = { - name = "token-stream"; - packageName = "token-stream"; - version = "0.0.1"; + "pull-stream-3.6.1" = { + name = "pull-stream"; + packageName = "pull-stream"; + version = "3.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/token-stream/-/token-stream-0.0.1.tgz"; - sha1 = "ceeefc717a76c4316f126d0b9dbaa55d7e7df01a"; + url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.1.tgz"; + sha1 = "c5c2ae4a51246efeebcc65c0412a3d725a92ce00"; }; }; - "commoner-0.10.8" = { - name = "commoner"; - packageName = "commoner"; - version = "0.10.8"; + "pull-window-2.1.4" = { + name = "pull-window"; + packageName = "pull-window"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/commoner/-/commoner-0.10.8.tgz"; - sha1 = "34fc3672cd24393e8bb47e70caa0293811f4f2c5"; + url = "https://registry.npmjs.org/pull-window/-/pull-window-2.1.4.tgz"; + sha1 = "fc3b86feebd1920c7ae297691e23f705f88552f0"; }; }; - "jstransform-10.1.0" = { - name = "jstransform"; - packageName = "jstransform"; - version = "10.1.0"; + "pump-0.3.5" = { + name = "pump"; + packageName = "pump"; + version = "0.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/jstransform/-/jstransform-10.1.0.tgz"; - sha1 = "b4c49bf63f162c108b0348399a8737c713b0a83a"; + url = "https://registry.npmjs.org/pump/-/pump-0.3.5.tgz"; + sha1 = "ae5ff8c1f93ed87adc6530a97565b126f585454b"; }; }; - "recast-0.11.23" = { - name = "recast"; - packageName = "recast"; - version = "0.11.23"; + "pump-1.0.3" = { + name = "pump"; + packageName = "pump"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.11.23.tgz"; - sha1 = "451fd3004ab1e4df9b4e4b66376b2a21912462d3"; + url = "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz"; + sha512 = "2mj8bx34brvh97wd2xcn5phgyd2wh3l1ma2xfd0m53yf68w1izp46pmz0s9az5f36mhlvl0mvfd6hp5abhi75fhyrz9wyx6jnx0jkgj"; }; }; - "ast-types-0.9.6" = { - name = "ast-types"; - packageName = "ast-types"; - version = "0.9.6"; + "pump-2.0.1" = { + name = "pump"; + packageName = "pump"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.6.tgz"; - sha1 = "102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9"; + url = "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz"; + sha512 = "288hcmlwdnqda84ylx9cv413ic0r59k0dp71hy7a200jsb7h1y63277jwdp1jdp13c1b3pl6g2gzr5gjv9p72f5sp7w3p0d34swrqxf"; }; }; - "base62-0.1.1" = { - name = "base62"; - packageName = "base62"; - version = "0.1.1"; + "pumpify-1.4.0" = { + name = "pumpify"; + packageName = "pumpify"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/base62/-/base62-0.1.1.tgz"; - sha1 = "7b4174c2f94449753b11c2651c083da841a7b084"; + url = "https://registry.npmjs.org/pumpify/-/pumpify-1.4.0.tgz"; + sha512 = "1h37biy199n445y10vpyiswwcxv8zigfqp0b1xwgbyjq51f2dhjn1pcggjc4j5ccbd64l1ivfi0bqinx4m5clcawvwggy7jv93qsjfs"; }; }; - "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/esprima-fb/-/esprima-fb-13001.1001.0-dev-harmony-fb.tgz"; - sha1 = "633acdb40d9bd4db8a1c1d68c06a942959fad2b0"; - }; - }; - "source-map-0.1.31" = { - name = "source-map"; - packageName = "source-map"; - version = "0.1.31"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.1.31.tgz"; - sha1 = "9f704d0d69d9e138a81badf6ebb4fde33d151c61"; - }; - }; - "aws-sdk-1.18.0" = { - name = "aws-sdk"; - packageName = "aws-sdk"; - version = "1.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-1.18.0.tgz"; - sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; - }; - }; - "commander-2.0.0" = { - name = "commander"; - packageName = "commander"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.0.0.tgz"; - sha1 = "d1b86f901f8b64bd941bdeadaf924530393be928"; - }; - }; - "http-auth-2.0.7" = { - name = "http-auth"; - packageName = "http-auth"; - version = "2.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/http-auth/-/http-auth-2.0.7.tgz"; - sha1 = "aa1a61a4d6baae9d64436c6f0ef0f4de85c430e3"; - }; - }; - "express-3.4.4" = { - name = "express"; - packageName = "express"; - version = "3.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-3.4.4.tgz"; - sha1 = "0b63ae626c96b71b78d13dfce079c10351635a86"; - }; - }; - "everyauth-0.4.5" = { - name = "everyauth"; - packageName = "everyauth"; - version = "0.4.5"; - src = fetchurl { - url = "https://registry.npmjs.org/everyauth/-/everyauth-0.4.5.tgz"; - sha1 = "282d358439d91c30fb4aa2320dc362edac7dd189"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "crypto-0.0.3" = { - name = "crypto"; - packageName = "crypto"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/crypto/-/crypto-0.0.3.tgz"; - sha1 = "470a81b86be4c5ee17acc8207a1f5315ae20dbb0"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "coffee-script-1.6.3" = { - name = "coffee-script"; - packageName = "coffee-script"; - version = "1.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz"; - sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be"; - }; - }; - "node-uuid-1.4.1" = { - name = "node-uuid"; - packageName = "node-uuid"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"; - sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048"; - }; - }; - "connect-2.11.0" = { - name = "connect"; - packageName = "connect"; - version = "2.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-2.11.0.tgz"; - sha1 = "9991ce09ff9b85d9ead27f9d41d0b2a2df2f9284"; - }; - }; - "commander-1.3.2" = { - name = "commander"; - packageName = "commander"; + "punycode-1.3.2" = { + name = "punycode"; + packageName = "punycode"; version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-1.3.2.tgz"; - sha1 = "8a8f30ec670a6fdd64af52f1914b907d79ead5b5"; + url = "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; + sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; }; }; - "cookie-0.1.0" = { - name = "cookie"; - packageName = "cookie"; - version = "0.1.0"; + "punycode-1.4.1" = { + name = "punycode"; + packageName = "punycode"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.1.0.tgz"; - sha1 = "90eb469ddce905c866de687efc43131d8801f9d0"; + url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; + sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; }; }; - "buffer-crc32-0.2.1" = { - name = "buffer-crc32"; - packageName = "buffer-crc32"; - version = "0.2.1"; + "punycode-2.1.0" = { + name = "punycode"; + packageName = "punycode"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz"; - sha1 = "be3e5382fc02b6d6324956ac1af98aa98b08534c"; + url = "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz"; + sha1 = "5f863edc89b96db09074bad7947bf09056ca4e7d"; }; }; - "fresh-0.2.0" = { - name = "fresh"; - packageName = "fresh"; - version = "0.2.0"; + "q-0.9.7" = { + name = "q"; + packageName = "q"; + version = "0.9.7"; src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.2.0.tgz"; - sha1 = "bfd9402cf3df12c4a4c310c79f99a3dde13d34a7"; + url = "https://registry.npmjs.org/q/-/q-0.9.7.tgz"; + sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75"; }; }; - "methods-0.1.0" = { - name = "methods"; - packageName = "methods"; - version = "0.1.0"; + "q-1.0.1" = { + name = "q"; + packageName = "q"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/methods/-/methods-0.1.0.tgz"; - sha1 = "335d429eefd21b7bacf2e9c922a8d2bd14a30e4f"; + url = "https://registry.npmjs.org/q/-/q-1.0.1.tgz"; + sha1 = "11872aeedee89268110b10a718448ffb10112a14"; }; }; - "send-0.1.4" = { - name = "send"; - packageName = "send"; - version = "0.1.4"; + "q-1.4.1" = { + name = "q"; + packageName = "q"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.1.4.tgz"; - sha1 = "be70d8d1be01de61821af13780b50345a4f71abd"; + url = "https://registry.npmjs.org/q/-/q-1.4.1.tgz"; + sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e"; + }; + }; + "q-1.5.1" = { + name = "q"; + packageName = "q"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/q/-/q-1.5.1.tgz"; + sha1 = "7e32f75b41381291d04611f1bf14109ac00651d7"; + }; + }; + "q-2.0.3" = { + name = "q"; + packageName = "q"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/q/-/q-2.0.3.tgz"; + sha1 = "75b8db0255a1a5af82f58c3f3aaa1efec7d0d134"; + }; + }; + "qap-3.3.1" = { + name = "qap"; + packageName = "qap"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/qap/-/qap-3.3.1.tgz"; + sha1 = "11f9e8fa8890fe7cb99210c0f44d0613b7372cac"; + }; + }; + "qjobs-1.1.5" = { + name = "qjobs"; + packageName = "qjobs"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/qjobs/-/qjobs-1.1.5.tgz"; + sha1 = "659de9f2cf8dcc27a1481276f205377272382e73"; + }; + }; + "qs-0.4.2" = { + name = "qs"; + packageName = "qs"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-0.4.2.tgz"; + sha1 = "3cac4c861e371a8c9c4770ac23cda8de639b8e5f"; + }; + }; + "qs-0.5.1" = { + name = "qs"; + packageName = "qs"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-0.5.1.tgz"; + sha1 = "9f6bf5d9ac6c76384e95d36d15b48980e5e4add0"; + }; + }; + "qs-0.5.6" = { + name = "qs"; + packageName = "qs"; + version = "0.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz"; + sha1 = "31b1ad058567651c526921506b9a8793911a0384"; }; }; "qs-0.6.5" = { @@ -22810,944 +19995,22 @@ let sha1 = "294b268e4b0d4250f6dde19b3b8b34935dff14ef"; }; }; - "bytes-0.2.1" = { - name = "bytes"; - packageName = "bytes"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-0.2.1.tgz"; - sha1 = "555b08abcb063f8975905302523e4cd4ffdfdf31"; - }; - }; - "raw-body-0.0.3" = { - name = "raw-body"; - packageName = "raw-body"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-0.0.3.tgz"; - sha1 = "0cb3eb22ced1ca607d32dd8fd94a6eb383f3eb8a"; - }; - }; - "negotiator-0.3.0" = { - name = "negotiator"; - packageName = "negotiator"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.3.0.tgz"; - sha1 = "706d692efeddf574d57ea9fb1ab89a4fa7ee8f60"; - }; - }; - "multiparty-2.2.0" = { - name = "multiparty"; - packageName = "multiparty"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/multiparty/-/multiparty-2.2.0.tgz"; - sha1 = "a567c2af000ad22dc8f2a653d91978ae1f5316f4"; - }; - }; - "oauth-https://github.com/ciaranj/node-oauth/tarball/master" = { - name = "oauth"; - packageName = "oauth"; - version = "0.9.15"; - src = fetchurl { - name = "oauth-0.9.15.tar.gz"; - url = https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master; - sha256 = "9341c28772841acde618c778e85e381976f425824b816100792f697e68aec947"; - }; - }; - "connect-2.3.9" = { - name = "connect"; - packageName = "connect"; - version = "2.3.9"; - src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-2.3.9.tgz"; - sha1 = "4d26ddc485c32e5a1cf1b35854823b4720d25a52"; - }; - }; - "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"; - src = fetchurl { - url = "https://registry.npmjs.org/node-swt/-/node-swt-0.1.1.tgz"; - sha1 = "af0903825784be553b93dbae57d99d59060585dd"; - }; - }; - "node-wsfederation-0.1.1" = { - name = "node-wsfederation"; - packageName = "node-wsfederation"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-wsfederation/-/node-wsfederation-0.1.1.tgz"; - sha1 = "9abf1dd3b20a3ab0a38f899c882c218d734e8a7b"; - }; - }; - "debug-0.5.0" = { - name = "debug"; - packageName = "debug"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-0.5.0.tgz"; - sha1 = "9d48c946fb7d7d59807ffe07822f515fd76d7a9e"; - }; - }; - "crc-0.2.0" = { - name = "crc"; - packageName = "crc"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-0.2.0.tgz"; - sha1 = "f4486b9bf0a12df83c3fca14e31e030fdabd9454"; - }; - }; - "cookie-0.0.4" = { - name = "cookie"; - packageName = "cookie"; - version = "0.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.0.4.tgz"; - sha1 = "5456bd47aee2666eac976ea80a6105940483fe98"; - }; - }; - "bytes-0.1.0" = { - name = "bytes"; - packageName = "bytes"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-0.1.0.tgz"; - sha1 = "c574812228126d6369d1576925a8579db3f8e5a2"; - }; - }; - "send-0.0.3" = { - name = "send"; - packageName = "send"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.0.3.tgz"; - sha1 = "4d5f843edf9d65dac31c8a5d2672c179ecb67184"; - }; - }; - "events.node-0.4.9" = { - name = "events.node"; - packageName = "events.node"; - version = "0.4.9"; - src = fetchurl { - url = "https://registry.npmjs.org/events.node/-/events.node-0.4.9.tgz"; - sha1 = "82998ea749501145fd2da7cf8ecbe6420fac02a4"; - }; - }; - "args-3.0.8" = { - name = "args"; - packageName = "args"; - version = "3.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/args/-/args-3.0.8.tgz"; - sha512 = "26h2nssgwzgc9y1mywgjcx2rbbkxlpx23zj9gh81bayjr8522zi78rwrhpkkqwh7dwqx6mv8gphcx8zyv3vm8hxw5s89kjlzm66k7y9"; - }; - }; - "detect-port-1.2.2" = { - name = "detect-port"; - packageName = "detect-port"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-port/-/detect-port-1.2.2.tgz"; - sha512 = "2q44vf4c9rqz21wc7a1pj1xz6pa2s7sp2fz9zxksmz679xh8sbfzyzhgkkbyznsgbnif013n0a6387dppcs370gdkc0dhh2jgsgv8fk"; - }; - }; - "filesize-3.5.11" = { - name = "filesize"; - packageName = "filesize"; - version = "3.5.11"; - src = fetchurl { - url = "https://registry.npmjs.org/filesize/-/filesize-3.5.11.tgz"; - sha512 = "3bg35im21jf6dhyrcajczdjl3rjm5mphdhansyfbpzm067vv3jp91n43nrzxf8q6nx3b5vkn2my1rskyp4pmg91xzdq01lawyifazk4"; - }; - }; - "fs-extra-5.0.0" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz"; - sha512 = "1ssfaw678600iy330a73gqk65ns22sz4ng7jwndj1fxahj8qddrsy2w4mr4ikx28qhdj8rf49n428qnl657bbpag9r3g3qv2vhyd8zb"; - }; - }; - "micro-9.0.2" = { - name = "micro"; - packageName = "micro"; - version = "9.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/micro/-/micro-9.0.2.tgz"; - sha512 = "1d0ybv5avz4np56a916wv9zwc42gn3y68hibiwg8ps0n23hp3x9zkb631mny9jn2i7imybhzh6fpic1hr6q08lwawf4wy03c4nl680n"; - }; - }; - "micro-compress-1.0.0" = { - name = "micro-compress"; - packageName = "micro-compress"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/micro-compress/-/micro-compress-1.0.0.tgz"; - sha1 = "53f5a80b4ad0320ca165a559b6e3df145d4f704f"; - }; - }; - "node-version-1.1.0" = { - name = "node-version"; - packageName = "node-version"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-version/-/node-version-1.1.0.tgz"; - sha512 = "0kc13ygbwm9zdjqv43ccb3mvfhmkwack6ziqcadw58b0f8ssv8h2gdr0br8xaqxpxp0h6pz9vm28yns03nl1vbqbgdankcsb127cmdp"; - }; - }; - "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/openssl-self-signed-certificate/-/openssl-self-signed-certificate-1.1.6.tgz"; - sha1 = "9d3a4776b1a57e9847350392114ad2f915a83dd4"; - }; - }; - "path-type-3.0.0" = { - name = "path-type"; - packageName = "path-type"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz"; - sha512 = "2z1csf4c3fmlwl0ahk533z5zqkjdf36ccfx11kakl9xran9f5asxm4cxjq4lx1kwqdp8gki786cgpldvgrkvfc7pcvh07j5ssqm8rjg"; - }; - }; - "mri-1.1.0" = { - name = "mri"; - packageName = "mri"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mri/-/mri-1.1.0.tgz"; - sha1 = "5c0a3f29c8ccffbbb1ec941dcec09d71fa32f36a"; - }; - }; - "address-1.0.3" = { - name = "address"; - packageName = "address"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/address/-/address-1.0.3.tgz"; - sha512 = "27dii2i2aw9z3pw09110914532z5dfywxp8gbrfr14737cwy8m0jysam3abmfsbp8g51sd02ys57j5snwly3zfd0vrbli4109rni7ng"; - }; - }; - "bcrypt-nodejs-0.0.3" = { - name = "bcrypt-nodejs"; - packageName = "bcrypt-nodejs"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-nodejs/-/bcrypt-nodejs-0.0.3.tgz"; - sha1 = "c60917f26dc235661566c681061c303c2b28842b"; - }; - }; - "cheerio-0.17.0" = { - name = "cheerio"; - packageName = "cheerio"; - version = "0.17.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cheerio/-/cheerio-0.17.0.tgz"; - sha1 = "fa5ae42cc60121133d296d0b46d983215f7268ea"; - }; - }; - "moment-2.7.0" = { - name = "moment"; - packageName = "moment"; - version = "2.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.7.0.tgz"; - sha1 = "359a19ec634cda3c706c8709adda54c0329aaec4"; - }; - }; - "slate-irc-0.7.3" = { - name = "slate-irc"; - packageName = "slate-irc"; - version = "0.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/slate-irc/-/slate-irc-0.7.3.tgz"; - sha1 = "8d01f2bc809e00a5b2faca7d8d3130d155422a77"; - }; - }; - "socket.io-1.0.6" = { - name = "socket.io"; - packageName = "socket.io"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-1.0.6.tgz"; - sha1 = "b566532888dae3ac9058a12f294015ebdfa8084a"; - }; - }; - "CSSselect-0.4.1" = { - name = "CSSselect"; - packageName = "CSSselect"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/CSSselect/-/CSSselect-0.4.1.tgz"; - sha1 = "f8ab7e1f8418ce63cda6eb7bd778a85d7ec492b2"; - }; - }; - "htmlparser2-3.7.3" = { - name = "htmlparser2"; - packageName = "htmlparser2"; - version = "3.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.7.3.tgz"; - sha1 = "6a64c77637c08c6f30ec2a8157a53333be7cb05e"; - }; - }; - "dom-serializer-0.0.1" = { - name = "dom-serializer"; - packageName = "dom-serializer"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.0.1.tgz"; - sha1 = "9589827f1e32d22c37c829adabd59b3247af8eaf"; - }; - }; - "CSSwhat-0.4.7" = { - name = "CSSwhat"; - packageName = "CSSwhat"; - version = "0.4.7"; - src = fetchurl { - url = "https://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.7.tgz"; - sha1 = "867da0ff39f778613242c44cfea83f0aa4ebdf9b"; - }; - }; - "domutils-1.4.3" = { - name = "domutils"; - packageName = "domutils"; - version = "1.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz"; - sha1 = "0865513796c6b306031850e175516baf80b72a6f"; - }; - }; - "domhandler-2.2.1" = { - name = "domhandler"; - packageName = "domhandler"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-2.2.1.tgz"; - sha1 = "59df9dcd227e808b365ae73e1f6684ac3d946fc2"; - }; - }; - "irc-replies-2.0.1" = { - name = "irc-replies"; - packageName = "irc-replies"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/irc-replies/-/irc-replies-2.0.1.tgz"; - sha1 = "5bf4125fb6ec0f3929a89647b26e653232942b79"; - }; - }; - "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/slate-irc-parser/-/slate-irc-parser-0.0.2.tgz"; - sha1 = "0c5f8f20d817bb85329da9fca135c66b05947d80"; - }; - }; - "linewise-0.0.3" = { - name = "linewise"; - packageName = "linewise"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/linewise/-/linewise-0.0.3.tgz"; - sha1 = "bf967ba0dd31faaf09ab5bdb3676ad7f2aa18493"; - }; - }; - "engine.io-1.3.1" = { - name = "engine.io"; - packageName = "engine.io"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-1.3.1.tgz"; - sha1 = "2d968308fffae5d17f5209b6775246e90d8a705e"; - }; - }; - "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/socket.io-parser/-/socket.io-parser-2.2.0.tgz"; - sha1 = "2609601f59e6a7fab436a53be3d333fbbfcbd30a"; - }; - }; - "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/socket.io-client/-/socket.io-client-1.0.6.tgz"; - sha1 = "c86cb3e507ab2f96da4500bd34fcf46a1e9dfe5e"; - }; - }; - "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/socket.io-adapter/-/socket.io-adapter-0.2.0.tgz"; - sha1 = "bd39329b8961371787e24f345b074ec9cf000e33"; - }; - }; - "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/has-binary-data/-/has-binary-data-0.1.1.tgz"; - sha1 = "e10749fb87828a52df96f4086587eb4a03966439"; - }; - }; - "debug-0.6.0" = { - name = "debug"; - packageName = "debug"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-0.6.0.tgz"; - sha1 = "ce9d5d025d5294b3f0748a494bebaf3c9fd8734f"; - }; - }; - "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"; - }; - }; - "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/engine.io-parser/-/engine.io-parser-1.0.6.tgz"; - sha1 = "d38813143a411cb3b914132ab05bf99e6f7a248e"; - }; - }; - "nan-0.3.2" = { - name = "nan"; - packageName = "nan"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-0.3.2.tgz"; - sha1 = "0df1935cab15369075ef160ad2894107aa14dc2d"; - }; - }; - "base64-arraybuffer-0.1.2" = { - name = "base64-arraybuffer"; - packageName = "base64-arraybuffer"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz"; - sha1 = "474df4a9f2da24e05df3158c3b1db3c3cd46a154"; - }; - }; - "after-0.8.1" = { - name = "after"; - packageName = "after"; - version = "0.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/after/-/after-0.8.1.tgz"; - sha1 = "ab5d4fb883f596816d3515f8f791c0af486dd627"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "json3-3.2.6" = { - name = "json3"; - packageName = "json3"; - version = "3.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/json3/-/json3-3.2.6.tgz"; - sha1 = "f6efc93c06a04de9aec53053df2559bb19e2038b"; - }; - }; - "emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" = { - name = "emitter"; - packageName = "emitter"; - version = "1.0.1"; - src = fetchurl { - name = "emitter-1.0.1.tar.gz"; - url = https://codeload.github.com/component/emitter/tar.gz/1.0.1; - sha256 = "0eae744826723877457f7a7ac7f31d68a5a060673b3a883f6a8e325bf48f313d"; - }; - }; - "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/engine.io-client/-/engine.io-client-1.3.1.tgz"; - sha1 = "1c5a65d5c5af6d04b44c22c3dbcd95c39ed1c989"; - }; - }; - "parseuri-0.0.2" = { - name = "parseuri"; - packageName = "parseuri"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.2.tgz"; - sha1 = "db41878f2d6964718be870b3140973d8093be156"; - }; - }; - "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"; - }; - }; - "has-cors-1.0.3" = { - name = "has-cors"; - packageName = "has-cors"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/has-cors/-/has-cors-1.0.3.tgz"; - sha1 = "502acb9b3104dac33dd2630eaf2f888b0baf4cb3"; - }; - }; - "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"; - }; - }; - "parsejson-0.0.1" = { - name = "parsejson"; - packageName = "parsejson"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.1.tgz"; - sha1 = "9b10c6c0d825ab589e685153826de0a3ba278bcc"; - }; - }; - "parseqs-0.0.2" = { - name = "parseqs"; - packageName = "parseqs"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.2.tgz"; - sha1 = "9dfe70b2cddac388bde4f35b1f240fa58adbe6c7"; - }; - }; - "global-https://github.com/component/global/archive/v2.0.1.tar.gz" = { - name = "global"; - packageName = "global"; - version = "2.0.1"; - src = fetchurl { - name = "global-2.0.1.tar.gz"; - url = https://codeload.github.com/component/global/tar.gz/v2.0.1; - sha256 = "42be02b7148745447f6ba21137c972ca82d2cad92d30d63bd4fc310623901785"; - }; - }; - "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/socket.io-parser/-/socket.io-parser-2.1.2.tgz"; - sha1 = "876655b9edd555c5bdf7301cedf30a436c67b8b0"; - }; - }; - "express-5.0.0-alpha.6" = { - name = "express"; - packageName = "express"; - version = "5.0.0-alpha.6"; - src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-5.0.0-alpha.6.tgz"; - sha1 = "85dc44d7e90d4809041407f388f239b5bd2f681e"; - }; - }; - "express-json5-0.1.0" = { - name = "express-json5"; - packageName = "express-json5"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/express-json5/-/express-json5-0.1.0.tgz"; - sha1 = "114a514bd734b319e018a1bde337923cc455b836"; - }; - }; - "es6-shim-0.21.1" = { - name = "es6-shim"; - packageName = "es6-shim"; - version = "0.21.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-shim/-/es6-shim-0.21.1.tgz"; - sha1 = "6621bce72e1ac80a6e1f002abd4e789f12489fd2"; - }; - }; - "handlebars-2.0.0" = { - name = "handlebars"; - packageName = "handlebars"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-2.0.0.tgz"; - sha1 = "6e9d7f8514a3467fa5e9f82cc158ecfc1d5ac76f"; - }; - }; - "highlight.js-8.9.1" = { - name = "highlight.js"; - packageName = "highlight.js"; - version = "8.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-8.9.1.tgz"; - sha1 = "b8a9c5493212a9392f0222b649c9611497ebfb88"; - }; - }; - "lunr-0.7.2" = { - name = "lunr"; - packageName = "lunr"; - version = "0.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lunr/-/lunr-0.7.2.tgz"; - sha1 = "79a30e932e216cba163541ee37a3607c12cd7281"; - }; - }; - "render-readme-1.3.1" = { - name = "render-readme"; - packageName = "render-readme"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/render-readme/-/render-readme-1.3.1.tgz"; - sha1 = "d2a98f9a87dd64fa73c6877ac5c45b0f6341a797"; - }; - }; - "sinopia-htpasswd-0.4.5" = { - name = "sinopia-htpasswd"; - packageName = "sinopia-htpasswd"; - version = "0.4.5"; - src = fetchurl { - url = "https://registry.npmjs.org/sinopia-htpasswd/-/sinopia-htpasswd-0.4.5.tgz"; - sha1 = "2af824ae20eccb8f902325b1a2c27dd6619805c9"; - }; - }; - "fs-ext-0.6.0" = { - name = "fs-ext"; - packageName = "fs-ext"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-ext/-/fs-ext-0.6.0.tgz"; - sha1 = "27d32a72e2e7c3c8001712a0f307f5f8d91dfc66"; - }; - }; - "crypt3-0.2.0" = { - name = "crypt3"; - packageName = "crypt3"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/crypt3/-/crypt3-0.2.0.tgz"; - sha1 = "4bd28e0770fad421fc807745c1ef3010905b2332"; - }; - }; - "qs-6.5.0" = { + "qs-1.2.0" = { name = "qs"; packageName = "qs"; - version = "6.5.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz"; - sha512 = "2d5w08p3vr4l6rjcn5n5ph8g5wr0nzpypg1b7axvz3q3r9pp5jxanhywvd76wk76nqjcqb4p6n4l4ifjw8164bcahhs71kjdy6ladby"; + url = "https://registry.npmjs.org/qs/-/qs-1.2.0.tgz"; + sha1 = "ed079be28682147e6fd9a34cc2b0c1e0ec6453ee"; }; }; - "router-1.3.2" = { - name = "router"; - packageName = "router"; - version = "1.3.2"; + "qs-2.3.3" = { + name = "qs"; + packageName = "qs"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/router/-/router-1.3.2.tgz"; - sha1 = "bfaa16888a5283d5ee40d999da7a9fa15296a60c"; - }; - }; - "send-0.15.6" = { - name = "send"; - packageName = "send"; - version = "0.15.6"; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.15.6.tgz"; - sha1 = "20f23a9c925b762ab82705fe2f9db252ace47e34"; - }; - }; - "serve-static-1.12.6" = { - name = "serve-static"; - packageName = "serve-static"; - version = "1.12.6"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.6.tgz"; - sha1 = "b973773f63449934da54e5beba5e31d9f4211577"; - }; - }; - "raw-body-1.3.4" = { - name = "raw-body"; - packageName = "raw-body"; - version = "1.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-1.3.4.tgz"; - sha1 = "ccc7ddfc46b72861cdd5bb433c840b70b6f27f54"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "markdown-it-4.4.0" = { - name = "markdown-it"; - packageName = "markdown-it"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/markdown-it/-/markdown-it-4.4.0.tgz"; - sha1 = "3df373dbea587a9a7fef3e56311b68908f75c414"; - }; - }; - "sanitize-html-1.16.3" = { - name = "sanitize-html"; - packageName = "sanitize-html"; - version = "1.16.3"; - src = fetchurl { - url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.16.3.tgz"; - sha512 = "35k1grf7gik1bf6rrxjzsmfdqd5if41gw40hrn44awhzshd3izirkxg734gfrrliwwd7qa4z83l3fg5nq6lgjrm0cxx6z0cg4d0k42y"; - }; - }; - "linkify-it-1.2.4" = { - name = "linkify-it"; - packageName = "linkify-it"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/linkify-it/-/linkify-it-1.2.4.tgz"; - sha1 = "0773526c317c8fd13bd534ee1d180ff88abf881a"; - }; - }; - "lodash.escaperegexp-4.1.2" = { - name = "lodash.escaperegexp"; - packageName = "lodash.escaperegexp"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz"; - sha1 = "64762c48618082518ac3df4ccf5d5886dae20347"; - }; - }; - "postcss-6.0.14" = { - name = "postcss"; - packageName = "postcss"; - version = "6.0.14"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-6.0.14.tgz"; - sha512 = "2id33g6232s35n25daqrkz0bvzm2zmhlkfzmigkgia5q4jy9xg38spppmsdg0qswjankyi28wrbjsdwhczqfkx7h71gg8dmzz8p779l"; - }; - }; - "srcset-1.0.0" = { - name = "srcset"; - packageName = "srcset"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/srcset/-/srcset-1.0.0.tgz"; - sha1 = "a5669de12b42f3b1d5e83ed03c71046fc48f41ef"; - }; - }; - "domutils-1.6.2" = { - name = "domutils"; - packageName = "domutils"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-1.6.2.tgz"; - sha1 = "1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"; - }; - }; - "async-2.1.5" = { - name = "async"; - packageName = "async"; - version = "2.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.1.5.tgz"; - sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc"; - }; - }; - "assert-plus-0.1.5" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; - sha1 = "ee74009413002d84cec7219c6ac811812e723160"; - }; - }; - "lru-cache-2.2.0" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.0.tgz"; - sha1 = "ec2bba603f4c5bb3e7a1bf62ce1c1dbc1d474e08"; - }; - }; - "nopt-2.0.0" = { - name = "nopt"; - packageName = "nopt"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz"; - sha1 = "ca7416f20a5e3f9c3b86180f96295fa3d0b52e0d"; - }; - }; - "restify-4.0.3" = { - name = "restify"; - packageName = "restify"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/restify/-/restify-4.0.3.tgz"; - sha1 = "e1e5b7ad9d4f6aeacd20e28f44a045f26c146dbc"; - }; - }; - "bunyan-1.5.1" = { - name = "bunyan"; - packageName = "bunyan"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bunyan/-/bunyan-1.5.1.tgz"; - sha1 = "5f6e7d44c43b952f56b0f41309e3ab12391b4e2d"; - }; - }; - "clone-0.1.6" = { - name = "clone"; - packageName = "clone"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-0.1.6.tgz"; - sha1 = "4af2296d4a23a64168c2f5fb0a2aa65e80517000"; - }; - }; - "smartdc-auth-2.3.1" = { - name = "smartdc-auth"; - packageName = "smartdc-auth"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/smartdc-auth/-/smartdc-auth-2.3.1.tgz"; - sha1 = "96568a565e9d9feb03b93a50651eee14d23adf44"; - }; - }; - "cmdln-3.2.1" = { - name = "cmdln"; - packageName = "cmdln"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cmdln/-/cmdln-3.2.1.tgz"; - sha1 = "8d21967625b25ee35fca8e8453ccf10fccd04e45"; - }; - }; - "dashdash-1.7.3" = { - name = "dashdash"; - packageName = "dashdash"; - version = "1.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/dashdash/-/dashdash-1.7.3.tgz"; - sha1 = "bf533fedaa455ed8fee11519ebfb9ad66170dcdf"; - }; - }; - "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"; - }; - }; - "backoff-2.5.0" = { - name = "backoff"; - packageName = "backoff"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/backoff/-/backoff-2.5.0.tgz"; - sha1 = "f616eda9d3e4b66b8ca7fca79f695722c5f8e26f"; - }; - }; - "csv-0.4.6" = { - name = "csv"; - packageName = "csv"; - version = "0.4.6"; - src = fetchurl { - url = "https://registry.npmjs.org/csv/-/csv-0.4.6.tgz"; - sha1 = "8dbae7ddfdbaae62c1ea987c3e0f8a9ac737b73d"; - }; - }; - "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/escape-regexp-component/-/escape-regexp-component-1.0.2.tgz"; - sha1 = "9c63b6d0b25ff2a88c3adbd18c5b61acc3b9faa2"; - }; - }; - "http-signature-0.11.0" = { - name = "http-signature"; - packageName = "http-signature"; - version = "0.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz"; - sha1 = "1796cf67a001ad5cd6849dca0991485f09089fe6"; - }; - }; - "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/keep-alive-agent/-/keep-alive-agent-0.0.1.tgz"; - sha1 = "44847ca394ce8d6b521ae85816bd64509942b385"; + url = "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"; + sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404"; }; }; "qs-3.1.0" = { @@ -23759,1570 +20022,706 @@ let sha1 = "d0e9ae745233a12dc43fb4f3055bba446261153c"; }; }; - "spdy-1.32.5" = { - name = "spdy"; - packageName = "spdy"; - version = "1.32.5"; + "qs-4.0.0" = { + name = "qs"; + packageName = "qs"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/spdy/-/spdy-1.32.5.tgz"; - sha1 = "70eff23cde4e97d52a445f65afddcc5695eb5edb"; + url = "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz"; + sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607"; }; }; - "vasync-1.6.3" = { - name = "vasync"; - packageName = "vasync"; - version = "1.6.3"; + "qs-5.2.1" = { + name = "qs"; + packageName = "qs"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/vasync/-/vasync-1.6.3.tgz"; - sha1 = "4a69d7052a47f4ce85503d7641df1cbf40432a94"; + url = "https://registry.npmjs.org/qs/-/qs-5.2.1.tgz"; + sha1 = "801fee030e0b9450d6385adc48a4cc55b44aedfc"; }; }; - "dtrace-provider-0.6.0" = { - name = "dtrace-provider"; - packageName = "dtrace-provider"; - version = "0.6.0"; + "qs-6.2.3" = { + name = "qs"; + packageName = "qs"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.6.0.tgz"; - sha1 = "0b078d5517937d873101452d9146737557b75e51"; + url = "https://registry.npmjs.org/qs/-/qs-6.2.3.tgz"; + sha1 = "1cfcb25c10a9b2b483053ff39f5dfc9233908cfe"; }; }; - "precond-0.2.3" = { - name = "precond"; - packageName = "precond"; - version = "0.2.3"; + "qs-6.3.2" = { + name = "qs"; + packageName = "qs"; + version = "6.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/precond/-/precond-0.2.3.tgz"; - sha1 = "aa9591bcaa24923f1e0f4849d240f47efc1075ac"; + url = "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz"; + sha1 = "e75bd5f6e268122a2a0e0bda630b2550c166502c"; }; }; - "csv-generate-0.0.6" = { - name = "csv-generate"; - packageName = "csv-generate"; - version = "0.0.6"; + "qs-6.4.0" = { + name = "qs"; + packageName = "qs"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/csv-generate/-/csv-generate-0.0.6.tgz"; - sha1 = "97e4e63ae46b21912cd9475bc31469d26f5ade66"; + url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"; + sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; }; }; - "csv-parse-1.3.3" = { - name = "csv-parse"; - packageName = "csv-parse"; - version = "1.3.3"; + "qs-6.5.0" = { + name = "qs"; + packageName = "qs"; + version = "6.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.3.3.tgz"; - sha1 = "d1cfd8743c2f849a0abb2fd544db56695d19a490"; + url = "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz"; + sha512 = "2d5w08p3vr4l6rjcn5n5ph8g5wr0nzpypg1b7axvz3q3r9pp5jxanhywvd76wk76nqjcqb4p6n4l4ifjw8164bcahhs71kjdy6ladby"; }; }; - "stream-transform-0.1.2" = { - name = "stream-transform"; - packageName = "stream-transform"; - version = "0.1.2"; + "qs-6.5.1" = { + name = "qs"; + packageName = "qs"; + version = "6.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/stream-transform/-/stream-transform-0.1.2.tgz"; - sha1 = "7d8e6b4e03ac4781778f8c79517501bfb0762a9f"; + url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz"; + sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r"; }; }; - "csv-stringify-0.0.8" = { - name = "csv-stringify"; - packageName = "csv-stringify"; - version = "0.0.8"; + "qtdatastream-0.7.1" = { + name = "qtdatastream"; + packageName = "qtdatastream"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/csv-stringify/-/csv-stringify-0.0.8.tgz"; - sha1 = "52cc3b3dfc197758c55ad325a95be85071f9e51b"; + url = "https://registry.npmjs.org/qtdatastream/-/qtdatastream-0.7.1.tgz"; + sha1 = "8085d390b4c19f7b02dee8a7cd873e2af58667b5"; }; }; - "ctype-0.5.3" = { - name = "ctype"; - packageName = "ctype"; - version = "0.5.3"; + "query-string-1.0.1" = { + name = "query-string"; + packageName = "query-string"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; - sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; + url = "https://registry.npmjs.org/query-string/-/query-string-1.0.1.tgz"; + sha1 = "63ac953352499ad670a9681a75680f6bf3dd1faf"; }; }; - "verror-1.6.0" = { - name = "verror"; - packageName = "verror"; - version = "1.6.0"; + "query-string-5.0.1" = { + name = "query-string"; + packageName = "query-string"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/verror/-/verror-1.6.0.tgz"; - sha1 = "7d13b27b1facc2e2da90405eb5ea6e5bdd252ea5"; + url = "https://registry.npmjs.org/query-string/-/query-string-5.0.1.tgz"; + sha512 = "0lcnspv96dv03600bgjxk2ypak8mysp77n47jkddpz6ldcgscwyan1akqjrddii4abb2brz6gr6yq9pcbdx63m9i16kk8m5028qrkv8"; }; }; - "extsprintf-1.2.0" = { - name = "extsprintf"; - packageName = "extsprintf"; - version = "1.2.0"; + "querystring-0.2.0" = { + name = "querystring"; + packageName = "querystring"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.2.0.tgz"; - sha1 = "5ad946c22f5b32ba7f8cd7426711c6e8a3fc2529"; + url = "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"; + sha1 = "b209849203bb25df820da756e747005878521620"; }; }; - "assert-plus-0.1.2" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "0.1.2"; + "querystring-es3-0.2.1" = { + name = "querystring-es3"; + packageName = "querystring-es3"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"; - sha1 = "d93ffdbb67ac5507779be316a7d65146417beef8"; + url = "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz"; + sha1 = "9ec61f79049875707d69414596fd907a4d711e73"; }; }; - "clone-0.1.5" = { - name = "clone"; - packageName = "clone"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-0.1.5.tgz"; - sha1 = "46f29143d0766d663dbd7f80b7520a15783d2042"; - }; - }; - "dashdash-1.10.1" = { - name = "dashdash"; - packageName = "dashdash"; - version = "1.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dashdash/-/dashdash-1.10.1.tgz"; - sha1 = "0abf1af89a8f5129a81f18c2b35b21df22622f60"; - }; - }; - "once-1.3.0" = { - name = "once"; - packageName = "once"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.3.0.tgz"; - sha1 = "151af86bfc1f08c4b9f07d06ab250ffcbeb56581"; - }; - }; - "sshpk-agent-1.2.1" = { - name = "sshpk-agent"; - packageName = "sshpk-agent"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sshpk-agent/-/sshpk-agent-1.2.1.tgz"; - sha1 = "62e143c18530fda103320b3403e8ad42786d9718"; - }; - }; - "sshpk-1.7.1" = { - name = "sshpk"; - packageName = "sshpk"; - version = "1.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.7.1.tgz"; - sha1 = "565e386c42a77e6062fbd14c0472ff21cd53398c"; - }; - }; - "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"; - }; - }; - "jodid25519-1.0.2" = { - name = "jodid25519"; - packageName = "jodid25519"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"; - sha1 = "06d4912255093419477d425633606e0e90782967"; - }; - }; - "jsprim-0.3.0" = { - name = "jsprim"; - packageName = "jsprim"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-0.3.0.tgz"; - sha1 = "cd13466ea2480dbd8396a570d47d31dda476f8b1"; - }; - }; - "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"; - }; - }; - "extsprintf-1.0.0" = { - name = "extsprintf"; - packageName = "extsprintf"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.0.tgz"; - sha1 = "4d58b815ace5bebfc4ebf03cf98b0a7604a99b86"; - }; - }; - "json-schema-0.2.2" = { - name = "json-schema"; - packageName = "json-schema"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"; - sha1 = "50354f19f603917c695f70b85afa77c3b0f23506"; - }; - }; - "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"; - }; - }; - "generic-pool-2.2.0" = { - name = "generic-pool"; - packageName = "generic-pool"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/generic-pool/-/generic-pool-2.2.0.tgz"; - sha1 = "8b465c1a7588ea9dd2bb133bda0bb66bfef8a63e"; - }; - }; - "modern-syslog-1.1.2" = { - name = "modern-syslog"; - packageName = "modern-syslog"; + "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/modern-syslog/-/modern-syslog-1.1.2.tgz"; - sha1 = "f1fa58899f3f452d788f1573401212a4ef898de5"; + url = "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-1.1.2.tgz"; + sha1 = "0ca581de3174becef25ac3c2e8956342381db698"; }; }; - "hashring-3.2.0" = { - name = "hashring"; - packageName = "hashring"; - version = "3.2.0"; + "r-json-1.2.8" = { + name = "r-json"; + packageName = "r-json"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/hashring/-/hashring-3.2.0.tgz"; - sha1 = "fda4efde8aa22cdb97fb1d2a65e88401e1c144ce"; + url = "https://registry.npmjs.org/r-json/-/r-json-1.2.8.tgz"; + sha1 = "7440560cc1edf00b9d8d94fa30bcad7dde94eae2"; }; }; - "winser-0.1.6" = { - name = "winser"; - packageName = "winser"; - version = "0.1.6"; + "rai-0.1.12" = { + name = "rai"; + packageName = "rai"; + version = "0.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/winser/-/winser-0.1.6.tgz"; - sha1 = "08663dc32878a12bbce162d840da5097b48466c9"; + url = "https://registry.npmjs.org/rai/-/rai-0.1.12.tgz"; + sha1 = "8ccfd014d0f9608630dd73c19b8e4b057754a6a6"; }; }; - "connection-parse-0.0.7" = { - name = "connection-parse"; - packageName = "connection-parse"; - version = "0.0.7"; + "random-access-file-1.8.1" = { + name = "random-access-file"; + packageName = "random-access-file"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz"; - sha1 = "18e7318aab06a699267372b10c5226d25a1c9a69"; + url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.8.1.tgz"; + sha512 = "3pvi9knrjp8krj1hsg8i2qmv5097fid3qnyz4wh2dvpr37x2ga6qqk7afh5f1i5sb9dsw169bara13knccdmjwnivb62xgywz868j7r"; }; }; - "simple-lru-cache-0.0.2" = { - name = "simple-lru-cache"; - packageName = "simple-lru-cache"; - version = "0.0.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/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz"; - sha1 = "d59cc3a193c1a5d0320f84ee732f6e4713e511dd"; + url = "https://registry.npmjs.org/random-access-memory/-/random-access-memory-2.4.0.tgz"; + sha1 = "72f3d865b4b55a259879473e2fb2de3569c69ee2"; }; }; - "sequence-2.2.1" = { - name = "sequence"; - packageName = "sequence"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz"; - sha1 = "7f5617895d44351c0a047e764467690490a16b03"; - }; - }; - "commander-1.3.1" = { - name = "commander"; - packageName = "commander"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-1.3.1.tgz"; - sha1 = "02443e02db96f4b32b674225451abb6e9510000e"; - }; - }; - "css-parse-1.7.0" = { - name = "css-parse"; - packageName = "css-parse"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz"; - sha1 = "321f6cf73782a6ff751111390fc05e2c657d8c9b"; - }; - }; - "glob-7.0.6" = { - name = "glob"; - packageName = "glob"; - version = "7.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz"; - sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a"; - }; - }; - "coa-2.0.0" = { - name = "coa"; - packageName = "coa"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/coa/-/coa-2.0.0.tgz"; - sha1 = "af881ebe214fc29bee4e9e76b4956b6132295546"; - }; - }; - "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/css-url-regex/-/css-url-regex-1.1.0.tgz"; - sha1 = "83834230cc9f74c457de59eebd1543feeb83b7ec"; - }; - }; - "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"; - }; - }; - "css-select-1.3.0-rc0" = { - name = "css-select"; - packageName = "css-select"; - version = "1.3.0-rc0"; - src = fetchurl { - url = "https://registry.npmjs.org/css-select/-/css-select-1.3.0-rc0.tgz"; - sha1 = "6f93196aaae737666ea1036a8cb14a8fcb7a9231"; - }; - }; - "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/css-select-base-adapter/-/css-select-base-adapter-0.1.0.tgz"; - sha1 = "0102b3d14630df86c3eb9fa9f5456270106cf990"; - }; - }; - "css-tree-1.0.0-alpha25" = { - name = "css-tree"; - packageName = "css-tree"; - version = "1.0.0-alpha25"; - src = fetchurl { - url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha25.tgz"; - sha512 = "3a7768nyac729dk372kmbf8f28j0pajy699g45bs8vrlx605wiad3i692a8y58x437bvnfy7015lx08sxhm2vknmsi83a69dwnv2bjw"; - }; - }; - "csso-3.4.0" = { - name = "csso"; - packageName = "csso"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/csso/-/csso-3.4.0.tgz"; - sha1 = "57b27ef553cccbf5aa964c641748641e9af113f3"; - }; - }; - "object.values-1.0.4" = { - name = "object.values"; - packageName = "object.values"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/object.values/-/object.values-1.0.4.tgz"; - sha1 = "e524da09b4f66ff05df457546ec72ac99f13069a"; - }; - }; - "stable-0.1.6" = { - name = "stable"; - packageName = "stable"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/stable/-/stable-0.1.6.tgz"; - sha1 = "910f5d2aed7b520c6e777499c1f32e139fdecb10"; - }; - }; - "util.promisify-1.0.0" = { - name = "util.promisify"; - packageName = "util.promisify"; + "random-bytes-1.0.0" = { + name = "random-bytes"; + packageName = "random-bytes"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz"; - sha512 = "28cvjkydplc2vpnqff8vylscx8851srnkl54y6i54pl6lhpr6548plvyj833jk2mfaf8h31gbn60s00azd28rzc5q5gm1hgcc1smvlb"; + url = "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz"; + sha1 = "4f68a1dc0ae58bd3fb95848c30324db75d64360b"; }; }; - "mdn-data-1.0.0" = { - name = "mdn-data"; - packageName = "mdn-data"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mdn-data/-/mdn-data-1.0.0.tgz"; - sha1 = "a69d9da76847b4d5834c1465ea25c0653a1fbf66"; - }; - }; - "es-abstract-1.10.0" = { - name = "es-abstract"; - packageName = "es-abstract"; - version = "1.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.10.0.tgz"; - sha512 = "04nd5ylkfffc08vn5kjhz0saqh44nj19f5j3ahrrhf3zvc9da5rf6snnh63xv4gfhacjbax1jajzgqv4zpm77v806jf883a2w77zs7y"; - }; - }; - "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/es-to-primitive/-/es-to-primitive-1.1.1.tgz"; - sha1 = "45355248a88979034b6792e19bb81f2b7975dd0d"; - }; - }; - "is-callable-1.1.3" = { - name = "is-callable"; - packageName = "is-callable"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz"; - sha1 = "86eb75392805ddc33af71c92a0eedf74ee7604b2"; - }; - }; - "is-date-object-1.0.1" = { - name = "is-date-object"; - packageName = "is-date-object"; + "random-iterate-1.0.1" = { + name = "random-iterate"; + packageName = "random-iterate"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz"; - sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; + url = "https://registry.npmjs.org/random-iterate/-/random-iterate-1.0.1.tgz"; + sha1 = "f7d97d92dee6665ec5f6da08c7f963cad4b2ac99"; }; }; - "is-symbol-1.0.1" = { - name = "is-symbol"; - packageName = "is-symbol"; - version = "1.0.1"; + "randomatic-1.1.7" = { + name = "randomatic"; + packageName = "randomatic"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz"; - sha1 = "3cc59f00025194b6ab2e38dbae6689256b660572"; + url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz"; + sha512 = "2is2kipfnz3hl4yxgqk07rll6956cq3zzf9cddai3f0lij5acq76v98qv14qkpljh1pqfsyb8p69xa9cyaww6p0j91s4vc9zj6594hg"; }; }; - "object.getownpropertydescriptors-2.0.3" = { - name = "object.getownpropertydescriptors"; - packageName = "object.getownpropertydescriptors"; - version = "2.0.3"; + "randombytes-2.0.6" = { + name = "randombytes"; + packageName = "randombytes"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz"; - sha1 = "8758c846f5b407adab0f236e0986f14b051caa16"; + url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz"; + sha512 = "3a0zyz736klfzzpd9vwag3gznq7lrj57igm474dq279gsnyqdgfm1brhrs78ky30gsdwz9rwnjjms00fpdpp2p3x8p9mq2zbhw3k108"; }; }; - "enhanced-resolve-2.3.0" = { - name = "enhanced-resolve"; - packageName = "enhanced-resolve"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-2.3.0.tgz"; - sha1 = "a115c32504b6302e85a76269d7a57ccdd962e359"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "memory-fs-0.3.0" = { - name = "memory-fs"; - packageName = "memory-fs"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz"; - sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20"; - }; - }; - "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"; - }; - }; - "listify-1.0.0" = { - name = "listify"; - packageName = "listify"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/listify/-/listify-1.0.0.tgz"; - sha1 = "03ca7ba2d150d4267773f74e57558d1053d2bee3"; - }; - }; - "promise-finally-3.0.0" = { - name = "promise-finally"; - packageName = "promise-finally"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/promise-finally/-/promise-finally-3.0.0.tgz"; - sha1 = "ddd5d0f895432b1206ceb8da1275064d18e7aa23"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "jspm-config-0.3.4" = { - name = "jspm-config"; - packageName = "jspm-config"; - version = "0.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/jspm-config/-/jspm-config-0.3.4.tgz"; - sha1 = "44c26902e4ae8ece2366cedc9ff16b10a5f391c6"; - }; - }; - "lockfile-1.0.3" = { - name = "lockfile"; - packageName = "lockfile"; + "randomfill-1.0.3" = { + name = "randomfill"; + packageName = "randomfill"; version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.3.tgz"; - sha1 = "2638fc39a0331e9cac1a04b71799931c9c50df79"; + url = "https://registry.npmjs.org/randomfill/-/randomfill-1.0.3.tgz"; + sha512 = "08l7hdx65kfxli7g9pcnlv84bdrccj7d267d1kfi93db6a4mihwyhvsipmx2n0yk9z45cs21isgpld6rib5saxg28s2g8nn3ap8dgk0"; }; }; - "make-error-cause-1.2.2" = { - name = "make-error-cause"; - packageName = "make-error-cause"; - version = "1.2.2"; + "range-parser-0.0.4" = { + name = "range-parser"; + packageName = "range-parser"; + version = "0.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/make-error-cause/-/make-error-cause-1.2.2.tgz"; - sha1 = "df0388fcd0b37816dff0a5fb8108939777dcbc9d"; + url = "https://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz"; + sha1 = "c0427ffef51c10acba0782a46c9602e744ff620b"; }; }; - "popsicle-9.2.0" = { - name = "popsicle"; - packageName = "popsicle"; - version = "9.2.0"; + "range-parser-1.0.3" = { + name = "range-parser"; + packageName = "range-parser"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/popsicle/-/popsicle-9.2.0.tgz"; - sha512 = "23p3a888k27q99lj4904nbcs8r51nlm4qdzs3m0xp9y4ci1rxzymzzckrblrmlmbzrlxx4i9zx7s56gcrhvi2jm3ypr3lvhgy7m3sx5"; + url = "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz"; + sha1 = "6872823535c692e2c2a0103826afd82c2e0ff175"; }; }; - "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/popsicle-proxy-agent/-/popsicle-proxy-agent-3.0.0.tgz"; - sha1 = "b9133c55d945759ab7ee61b7711364620d3aeadc"; - }; - }; - "popsicle-retry-3.2.1" = { - name = "popsicle-retry"; - packageName = "popsicle-retry"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/popsicle-retry/-/popsicle-retry-3.2.1.tgz"; - sha1 = "e06e866533b42a7a123eb330cbe63a7cebcba10c"; - }; - }; - "popsicle-rewrite-1.0.0" = { - name = "popsicle-rewrite"; - packageName = "popsicle-rewrite"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/popsicle-rewrite/-/popsicle-rewrite-1.0.0.tgz"; - sha1 = "1dd4e8ea9c3182351fb820f87934d992f7fb9007"; - }; - }; - "popsicle-status-2.0.1" = { - name = "popsicle-status"; - packageName = "popsicle-status"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/popsicle-status/-/popsicle-status-2.0.1.tgz"; - sha1 = "8dd70c4fe7c694109add784ffe80eacac1e7b28d"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "typescript-2.6.2" = { - name = "typescript"; - packageName = "typescript"; - version = "2.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz"; - sha1 = "3c5b6fd7f6de0914269027f03c0946758f7673a4"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "make-error-1.3.0" = { - name = "make-error"; - packageName = "make-error"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/make-error/-/make-error-1.3.0.tgz"; - sha1 = "52ad3a339ccf10ce62b4040b708fe707244b8b96"; - }; - }; - "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/http-proxy-agent/-/http-proxy-agent-1.0.0.tgz"; - sha1 = "cc1ce38e453bf984a0f7702d2dd59c73d081284a"; - }; - }; - "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/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz"; - sha1 = "35f7da6c48ce4ddbfa264891ac593ee5ff8671e6"; - }; - }; - "agent-base-2.1.1" = { - name = "agent-base"; - packageName = "agent-base"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz"; - sha1 = "d6de10d5af6132d5bd692427d46fc538539094c7"; - }; - }; - "semver-5.0.3" = { - name = "semver"; - packageName = "semver"; - version = "5.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"; - sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a"; - }; - }; - "blueimp-md5-2.10.0" = { - name = "blueimp-md5"; - packageName = "blueimp-md5"; - version = "2.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.10.0.tgz"; - sha512 = "18r5wdrfrrjip7xipgxyg673njbfkj46hkswp4bmb5n7zx6gmajrashp6w32rkvhanymnx6rd7mrlqgzm68ksd89sy5x9gd5qx58hqj"; - }; - }; - "color-2.0.1" = { - name = "color"; - packageName = "color"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/color/-/color-2.0.1.tgz"; - sha512 = "1gir7mfj6033amg78p7jvpj0nk2hw61hqd81r6x3a2qmgizbw3d89k0qk62680zhm9ypcx6c9p2cgwjvb8smxv0qgvblkwza9ah5ddr"; - }; - }; - "crossroads-0.12.2" = { - name = "crossroads"; - packageName = "crossroads"; - version = "0.12.2"; - src = fetchurl { - url = "https://registry.npmjs.org/crossroads/-/crossroads-0.12.2.tgz"; - sha1 = "b1d5f9c1d98af3bdd61f1bda6a86dd1aee4ff8f2"; - }; - }; - "diff2html-2.3.2" = { - name = "diff2html"; - packageName = "diff2html"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-2.3.2.tgz"; - sha1 = "1c5864266d437148bc66fdd66d4ad750102d7fed"; - }; - }; - "express-4.15.5" = { - name = "express"; - packageName = "express"; - version = "4.15.5"; - src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.15.5.tgz"; - sha1 = "670235ca9598890a5ae8170b83db722b842ed927"; - }; - }; - "express-session-1.15.6" = { - name = "express-session"; - packageName = "express-session"; - version = "1.15.6"; - src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.15.6.tgz"; - sha512 = "100j4z1046rpprbjyf9gkbq2nzj9z8g0a5sfkrdzxv929j11l2p1a3mz2isr4pi58fhvbymsfzbaxhiv4f90x062wmh7d4q60fynjdg"; - }; - }; - "getmac-1.2.1" = { - name = "getmac"; - packageName = "getmac"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/getmac/-/getmac-1.2.1.tgz"; - sha1 = "0d095fd0627850043eac1dcfa0b120bbdc1426d1"; - }; - }; - "hasher-1.2.0" = { - name = "hasher"; - packageName = "hasher"; + "range-parser-1.2.0" = { + name = "range-parser"; + packageName = "range-parser"; version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/hasher/-/hasher-1.2.0.tgz"; - sha1 = "8b5341c3496124b0724ac8555fbb8ca363ebbb73"; + url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz"; + sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e"; }; }; - "just-detect-adblock-1.0.0" = { - name = "just-detect-adblock"; - packageName = "just-detect-adblock"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/just-detect-adblock/-/just-detect-adblock-1.0.0.tgz"; - sha1 = "7bf8660cf15571fe7cf3b49c222e4716e1605a0c"; - }; - }; - "keen.io-0.1.3" = { - name = "keen.io"; - packageName = "keen.io"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/keen.io/-/keen.io-0.1.3.tgz"; - sha1 = "5056f5c989ab14ccf62fc20ed7598115ae7d09e3"; - }; - }; - "knockout-3.4.2" = { - name = "knockout"; - packageName = "knockout"; - version = "3.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/knockout/-/knockout-3.4.2.tgz"; - sha1 = "e87958de77ad1e936f7ce645bab8b5d7c456d937"; - }; - }; - "memorystore-1.6.0" = { - name = "memorystore"; - packageName = "memorystore"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/memorystore/-/memorystore-1.6.0.tgz"; - sha1 = "1fb5fb5f0b2edf1add184917e918f094a9ff3465"; - }; - }; - "node-cache-4.1.1" = { - name = "node-cache"; - packageName = "node-cache"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-cache/-/node-cache-4.1.1.tgz"; - sha1 = "08524645ee4039dedc3dcc1dd7c6b979e0619e44"; - }; - }; - "npm-5.4.2" = { - name = "npm"; - packageName = "npm"; - version = "5.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-5.4.2.tgz"; - sha512 = "28m9zjiynb24b8bxikdaya27j87am88x1y8l70pvmh9fk3pfq0y6xvqjmpy72ld4csnz9s1hik1ff8a19sx6pyi8f5ar27b044cp8hp"; - }; - }; - "octicons-3.5.0" = { - name = "octicons"; - packageName = "octicons"; - version = "3.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/octicons/-/octicons-3.5.0.tgz"; - sha1 = "f7ff5935674d8b114f6d80c454bfaa01797a4e30"; - }; - }; - "passport-local-1.0.0" = { - name = "passport-local"; - packageName = "passport-local"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/passport-local/-/passport-local-1.0.0.tgz"; - sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee"; - }; - }; - "raven-2.1.2" = { + "raven-2.3.0" = { name = "raven"; packageName = "raven"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/raven/-/raven-2.1.2.tgz"; - sha512 = "136ylazswrblh2b1kc29xsmzk3i3bhm6vcirl1zb60fv9h0nf3hipz7qm91vs6my1lry00xrzpy1x96y51siciwwq7k3fs0ynl2j6m4"; - }; - }; - "signals-1.0.0" = { - name = "signals"; - packageName = "signals"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/signals/-/signals-1.0.0.tgz"; - sha1 = "65f0c1599352b35372ecaae5a250e6107376ed69"; - }; - }; - "snapsvg-0.5.1" = { - name = "snapsvg"; - packageName = "snapsvg"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/snapsvg/-/snapsvg-0.5.1.tgz"; - sha1 = "0caf52c79189a290746fc446cc5e863f6bdddfe3"; - }; - }; - "superagent-3.5.2" = { - name = "superagent"; - packageName = "superagent"; - version = "3.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/superagent/-/superagent-3.5.2.tgz"; - sha1 = "3361a3971567504c351063abeaae0faa23dbf3f8"; - }; - }; - "winston-2.3.1" = { - name = "winston"; - packageName = "winston"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-2.3.1.tgz"; - sha1 = "0b48420d978c01804cf0230b648861598225a119"; - }; - }; - "color-string-1.5.2" = { - name = "color-string"; - packageName = "color-string"; - version = "1.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/color-string/-/color-string-1.5.2.tgz"; - sha1 = "26e45814bc3c9a7cbd6751648a41434514a773a9"; - }; - }; - "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"; - src = fetchurl { - url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.1.tgz"; - sha1 = "c2dfc386abaa0c3e33c48db3fe87059e69065efd"; - }; - }; - "hogan.js-3.0.2" = { - name = "hogan.js"; - packageName = "hogan.js"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/hogan.js/-/hogan.js-3.0.2.tgz"; - sha1 = "4cd9e1abd4294146e7679e41d7898732b02c7bfd"; - }; - }; - "extract-opts-3.3.1" = { - name = "extract-opts"; - packageName = "extract-opts"; - version = "3.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/extract-opts/-/extract-opts-3.3.1.tgz"; - sha1 = "5abbedc98c0d5202e3278727f9192d7e086c6be1"; - }; - }; - "eachr-3.2.0" = { - name = "eachr"; - packageName = "eachr"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eachr/-/eachr-3.2.0.tgz"; - sha1 = "2c35e43ea086516f7997cf80b7aa64d55a4a4484"; - }; - }; - "editions-1.3.3" = { - name = "editions"; - packageName = "editions"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/editions/-/editions-1.3.3.tgz"; - sha1 = "0907101bdda20fac3cbe334c27cbd0688dc99a5b"; - }; - }; - "typechecker-4.4.1" = { - name = "typechecker"; - packageName = "typechecker"; - version = "4.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/typechecker/-/typechecker-4.4.1.tgz"; - sha1 = "f97b95f51b038417212d677d45a373ee7bced7e6"; - }; - }; - "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"; - }; - }; - "lsmod-1.0.0" = { - name = "lsmod"; - packageName = "lsmod"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lsmod/-/lsmod-1.0.0.tgz"; - sha1 = "9a00f76dca36eb23fa05350afe1b585d4299e64b"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "eve-0.5.4" = { - name = "eve"; - packageName = "eve"; - version = "0.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/eve/-/eve-0.5.4.tgz"; - sha1 = "67d080b9725291d7e389e34c26860dd97f1debaa"; - }; - }; - "adm-zip-0.4.7" = { - name = "adm-zip"; - packageName = "adm-zip"; - version = "0.4.7"; - src = fetchurl { - url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz"; - sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1"; - }; - }; - "kew-0.1.7" = { - name = "kew"; - packageName = "kew"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/kew/-/kew-0.1.7.tgz"; - sha1 = "0a32a817ff1a9b3b12b8c9bacf4bc4d679af8e72"; - }; - }; - "npmconf-0.1.16" = { - name = "npmconf"; - packageName = "npmconf"; - version = "0.1.16"; - src = fetchurl { - url = "https://registry.npmjs.org/npmconf/-/npmconf-0.1.16.tgz"; - sha1 = "0bdca78b8551419686b3a98004f06f0819edcd2a"; - }; - }; - "phantomjs-1.9.20" = { - name = "phantomjs"; - packageName = "phantomjs"; - version = "1.9.20"; - src = fetchurl { - url = "https://registry.npmjs.org/phantomjs/-/phantomjs-1.9.20.tgz"; - sha1 = "4424aca20e14d255c0b0889af6f6b8973da10e0d"; - }; - }; - "follow-redirects-0.0.3" = { - name = "follow-redirects"; - packageName = "follow-redirects"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-0.0.3.tgz"; - sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65"; - }; - }; - "acorn-dynamic-import-2.0.2" = { - name = "acorn-dynamic-import"; - packageName = "acorn-dynamic-import"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz"; - sha1 = "c752bd210bef679501b6c6cb7fc84f8f47158cc4"; - }; - }; - "enhanced-resolve-3.4.1" = { - name = "enhanced-resolve"; - packageName = "enhanced-resolve"; - version = "3.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz"; - sha1 = "0421e339fd71419b3da13d129b3979040230476e"; - }; - }; - "escope-3.6.0" = { - name = "escope"; - packageName = "escope"; - version = "3.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz"; - sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3"; - }; - }; - "json-loader-0.5.7" = { - name = "json-loader"; - packageName = "json-loader"; - version = "0.5.7"; - src = fetchurl { - url = "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz"; - sha512 = "3iwy9jwca9hg6h1k7cmcdlsygn2qzjv7w72fsrfjfpdrcyd4xc5fb11sf664rvnzrfmz24f19kvi3qawif4n63lggvpg5pv73qfrcs0"; - }; - }; - "loader-runner-2.3.0" = { - name = "loader-runner"; - packageName = "loader-runner"; version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz"; - sha1 = "f482aea82d543e07921700d5a46ef26fdac6b8a2"; + url = "https://registry.npmjs.org/raven/-/raven-2.3.0.tgz"; + sha1 = "96f15346bdaa433b3b6d47130804506155833d69"; }; }; - "loader-utils-1.1.0" = { - name = "loader-utils"; - packageName = "loader-utils"; + "raw-body-0.0.3" = { + name = "raw-body"; + packageName = "raw-body"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-0.0.3.tgz"; + sha1 = "0cb3eb22ced1ca607d32dd8fd94a6eb383f3eb8a"; + }; + }; + "raw-body-1.1.7" = { + name = "raw-body"; + packageName = "raw-body"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz"; + sha1 = "1d027c2bfa116acc6623bca8f00016572a87d425"; + }; + }; + "raw-body-1.3.4" = { + name = "raw-body"; + packageName = "raw-body"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-1.3.4.tgz"; + sha1 = "ccc7ddfc46b72861cdd5bb433c840b70b6f27f54"; + }; + }; + "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"; + }; + }; + "raw-body-2.2.0" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.2.0.tgz"; + sha1 = "994976cf6a5096a41162840492f0bdc5d6e7fb96"; + }; + }; + "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"; + }; + }; + "raw-socket-1.5.2" = { + name = "raw-socket"; + packageName = "raw-socket"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.5.2.tgz"; + sha512 = "0afwhc6rx359xqdsjiyxdlj46kb8mq4lkwy9fhmgszkp8cai9pk8927vxvg4gpg522clwx3dv1xsbnx745pip7crbjdb7kn2i8p2iqy"; + }; + }; + "rc-0.4.0" = { + name = "rc"; + packageName = "rc"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rc/-/rc-0.4.0.tgz"; + sha1 = "ce24a2029ad94c3a40d09604a87227027d7210d3"; + }; + }; + "rc-1.2.4" = { + name = "rc"; + packageName = "rc"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/rc/-/rc-1.2.4.tgz"; + sha1 = "a0f606caae2a3b862bbd0ef85482c0125b315fa3"; + }; + }; + "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/rc-config-loader/-/rc-config-loader-2.0.1.tgz"; + sha512 = "2sp3cd5mzpc91g5c8k7xwdm9gnax4pf6wvg09scksc81bs5p0qpzjf6s7xi36b0lxfhs76jmm48jv23biy4b4q3d6ldx77vjvhgcyiq"; + }; + }; + "re-emitter-1.1.3" = { + name = "re-emitter"; + packageName = "re-emitter"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/re-emitter/-/re-emitter-1.1.3.tgz"; + sha1 = "fa9e319ffdeeeb35b27296ef0f3d374dac2f52a7"; + }; + }; + "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-all-stream-3.1.0" = { + name = "read-all-stream"; + packageName = "read-all-stream"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz"; + sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa"; + }; + }; + "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"; + }; + }; + "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/read-only-stream/-/read-only-stream-2.0.0.tgz"; + sha1 = "2724fd6a8113d73764ac288d4386270c1dbf17f0"; + }; + }; + "read-package-json-2.0.12" = { + name = "read-package-json"; + packageName = "read-package-json"; + version = "2.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.12.tgz"; + sha512 = "15w2z3m1iysjf0zwvyc5mix8nypx42shx90alil4sslq6caj3pgk59zsn2ppxn95nls6bs7yw7khl5rmlq9gljv27w3vs2gxg9wigwv"; + }; + }; + "read-pkg-1.1.0" = { + name = "read-pkg"; + packageName = "read-pkg"; version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz"; - sha1 = "c98aef488bcceda2ffb5e2de646d6a754429f5cd"; + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"; + sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"; }; }; - "memory-fs-0.4.1" = { - name = "memory-fs"; - packageName = "memory-fs"; - version = "0.4.1"; + "read-pkg-2.0.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz"; - sha1 = "3a9a20b8462523e447cfbc7e8bb80ed667bfc552"; + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz"; + sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"; }; }; - "node-libs-browser-2.1.0" = { - name = "node-libs-browser"; - packageName = "node-libs-browser"; + "read-pkg-3.0.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz"; + sha1 = "9cbc686978fee65d16c00e2b19c237fcf6e38389"; + }; + }; + "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"; + }; + }; + "read-pkg-up-2.0.0" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz"; + sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; + }; + }; + "read-torrent-1.3.0" = { + name = "read-torrent"; + packageName = "read-torrent"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-torrent/-/read-torrent-1.3.0.tgz"; + sha1 = "4e0ef5bea6cb24d31843eb6fa8543ad0232ab9f4"; + }; + }; + "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.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"; + }; + }; + "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.0.6" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"; + sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e"; + }; + }; + "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"; + }; + }; + "readdirp-2.1.0" = { + name = "readdirp"; + packageName = "readdirp"; version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz"; - sha512 = "05d8rzfa0aihb9s1i3fm0dmdvlspfrxf4pxnsd3nms75mviv86llgg2r30l7b38a9l93yb00k7dy1vs8h4nd30ihhyvyc88vb6wa374"; + url = "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz"; + sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78"; }; }; - "uglifyjs-webpack-plugin-0.4.6" = { - name = "uglifyjs-webpack-plugin"; - packageName = "uglifyjs-webpack-plugin"; - version = "0.4.6"; + "readline2-0.1.1" = { + name = "readline2"; + packageName = "readline2"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz"; - sha1 = "b951f4abb6bd617e66f63eb891498e391763e309"; + url = "https://registry.npmjs.org/readline2/-/readline2-0.1.1.tgz"; + sha1 = "99443ba6e83b830ef3051bfd7dc241a82728d568"; }; }; - "webpack-sources-1.1.0" = { - name = "webpack-sources"; - packageName = "webpack-sources"; - version = "1.1.0"; + "readline2-1.0.1" = { + name = "readline2"; + packageName = "readline2"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.1.0.tgz"; - sha512 = "19rska638yxsrpxavydnjckcljiy6ylh63b802hylac396p3mm6j9bj85rhyvi81jk48c33sq580ixwjkbghgwp7cl1i9hgr7bjk9ka"; + url = "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz"; + sha1 = "41059608ffc154757b715d9989d199ffbf372e35"; }; }; - "es6-map-0.1.5" = { - name = "es6-map"; - packageName = "es6-map"; - version = "0.1.5"; + "recast-0.11.23" = { + name = "recast"; + packageName = "recast"; + version = "0.11.23"; src = fetchurl { - url = "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz"; - sha1 = "9136e0503dcc06a301690f0bb14ff4e364e949f0"; + url = "https://registry.npmjs.org/recast/-/recast-0.11.23.tgz"; + sha1 = "451fd3004ab1e4df9b4e4b66376b2a21912462d3"; }; }; - "es6-weak-map-2.0.2" = { - name = "es6-weak-map"; - packageName = "es6-weak-map"; - version = "2.0.2"; + "rechoir-0.6.2" = { + name = "rechoir"; + packageName = "rechoir"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz"; - sha1 = "5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"; + url = "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz"; + sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; }; }; - "d-1.0.0" = { - name = "d"; - packageName = "d"; + "recursive-watch-1.1.2" = { + name = "recursive-watch"; + packageName = "recursive-watch"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/recursive-watch/-/recursive-watch-1.1.2.tgz"; + sha1 = "912e2d62a83c8b388d288c4343495f247bc43f8e"; + }; + }; + "redent-1.0.0" = { + name = "redent"; + packageName = "redent"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/d/-/d-1.0.0.tgz"; - sha1 = "754bb5bfe55451da69a58b94d45f4c5b0462d58f"; + url = "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz"; + sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"; }; }; - "es5-ext-0.10.37" = { - name = "es5-ext"; - packageName = "es5-ext"; - version = "0.10.37"; + "redis-0.10.3" = { + name = "redis"; + packageName = "redis"; + version = "0.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.37.tgz"; - sha1 = "0ee741d148b80069ba27d020393756af257defc3"; + url = "https://registry.npmjs.org/redis/-/redis-0.10.3.tgz"; + sha1 = "8927fe2110ee39617bcf3fd37b89d8e123911bb6"; }; }; - "es6-iterator-2.0.3" = { - name = "es6-iterator"; - packageName = "es6-iterator"; - version = "2.0.3"; + "redis-0.12.1" = { + name = "redis"; + packageName = "redis"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz"; - sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7"; + url = "https://registry.npmjs.org/redis/-/redis-0.12.1.tgz"; + sha1 = "64df76ad0fc8acebaebd2a0645e8a48fac49185e"; }; }; - "es6-set-0.1.5" = { - name = "es6-set"; - packageName = "es6-set"; - version = "0.1.5"; + "redis-0.7.3" = { + name = "redis"; + packageName = "redis"; + version = "0.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz"; - sha1 = "d2b3ec5d4d800ced818db538d28974db0a73ccb1"; + url = "https://registry.npmjs.org/redis/-/redis-0.7.3.tgz"; + sha1 = "ee57b7a44d25ec1594e44365d8165fa7d1d4811a"; }; }; - "es6-symbol-3.1.1" = { - name = "es6-symbol"; - packageName = "es6-symbol"; - version = "3.1.1"; + "redis-2.8.0" = { + name = "redis"; + packageName = "redis"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz"; - sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"; + url = "https://registry.npmjs.org/redis/-/redis-2.8.0.tgz"; + sha512 = "3a3044ax6qdvss83xgjfx10h5q91ls0mwgs3wpsnxcdsiipq3cnmqzsh6glyq0r7vsmpw49jp84c2jnfrhi2bgycrkd9hhhf6ia8lrk"; }; }; - "event-emitter-0.3.5" = { - name = "event-emitter"; - packageName = "event-emitter"; - version = "0.3.5"; + "redis-commands-1.3.1" = { + name = "redis-commands"; + packageName = "redis-commands"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz"; - sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39"; + url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.1.tgz"; + sha1 = "81d826f45fa9c8b2011f4cd7a0fe597d241d442b"; }; }; - "big.js-3.2.0" = { - name = "big.js"; - packageName = "big.js"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz"; - sha512 = "3qicqys1bg16slzbzjn3f0fir82r4d1h6lvy5y0cqqwzbs2iaxf93xgi6x47m7l87i102ifjn4qvjbf764gyncsxcqw7lw33mk7y4zs"; - }; - }; - "emojis-list-2.1.0" = { - name = "emojis-list"; - packageName = "emojis-list"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz"; - sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389"; - }; - }; - "timers-browserify-2.0.4" = { - name = "timers-browserify"; - packageName = "timers-browserify"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.4.tgz"; - sha512 = "2pddj1k7206wrs3q5z7dzwc657rbdd2m00llzz0h1241fp0y5i32qi2slmfys217hqszbqmvnmjr32msgbjgzh33nxw6py49p4j35mr"; - }; - }; - "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/source-list-map/-/source-list-map-2.0.0.tgz"; - sha512 = "3q09f2w67qqhl3lwiisj4422mj9nfldg4cxmidfrjcwn3k7spm9g46x4n1j6kv39bi9khmcpyvfa3fwski488ibivyg9bwijjw2cr93"; - }; - }; - "addons-linter-0.27.0" = { - name = "addons-linter"; - packageName = "addons-linter"; - version = "0.27.0"; - src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-0.27.0.tgz"; - sha512 = "1pj51znvw4qfcji454ykz9iwh33jkws8dq78aavxzjjyibsssamdlsw01j81v4xy93w33d4ckq72r3nn8v9q34vh19izb7s05hqhw4y"; - }; - }; - "babel-polyfill-6.20.0" = { - name = "babel-polyfill"; - packageName = "babel-polyfill"; - version = "6.20.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.20.0.tgz"; - sha1 = "de4a371006139e20990aac0be367d398331204e7"; - }; - }; - "babel-runtime-6.25.0" = { - name = "babel-runtime"; - packageName = "babel-runtime"; - version = "6.25.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.25.0.tgz"; - sha1 = "33b98eaa5d482bb01a8d1aa6b437ad2b01aec41c"; - }; - }; - "bunyan-1.8.10" = { - name = "bunyan"; - packageName = "bunyan"; - version = "1.8.10"; - src = fetchurl { - url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.10.tgz"; - sha1 = "201fedd26c7080b632f416072f53a90b9a52981c"; - }; - }; - "debounce-1.0.2" = { - name = "debounce"; - packageName = "debounce"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/debounce/-/debounce-1.0.2.tgz"; - sha1 = "503cc674d8d7f737099664fb75ddbd36b9626dc6"; - }; - }; - "es6-error-4.0.2" = { - name = "es6-error"; - packageName = "es6-error"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-error/-/es6-error-4.0.2.tgz"; - sha1 = "eec5c726eacef51b7f6b73c20db6e1b13b069c98"; - }; - }; - "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/event-to-promise/-/event-to-promise-0.8.0.tgz"; - sha1 = "4b84f11772b6f25f7752fc74d971531ac6f5b626"; - }; - }; - "firefox-profile-0.5.0" = { - name = "firefox-profile"; - packageName = "firefox-profile"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/firefox-profile/-/firefox-profile-0.5.0.tgz"; - sha1 = "036de91fe3ff218d9ed8252d924f49bca0b672bd"; - }; - }; - "fx-runner-1.0.8" = { - name = "fx-runner"; - packageName = "fx-runner"; - version = "1.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/fx-runner/-/fx-runner-1.0.8.tgz"; - sha1 = "5ced3b04a8d51d634de20d1480f0dc5dd8325dec"; - }; - }; - "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/git-rev-sync/-/git-rev-sync-1.9.1.tgz"; - sha1 = "a0c2e3dd392abcf6b76962e27fc75fb3223449ce"; - }; - }; - "mz-2.6.0" = { - name = "mz"; - packageName = "mz"; + "redis-parser-2.6.0" = { + name = "redis-parser"; + packageName = "redis-parser"; version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/mz/-/mz-2.6.0.tgz"; - sha1 = "c8b8521d958df0a4f2768025db69c719ee4ef1ce"; + url = "https://registry.npmjs.org/redis-parser/-/redis-parser-2.6.0.tgz"; + sha1 = "52ed09dacac108f1a631c07e9b69941e7a19504b"; }; }; - "node-firefox-connect-1.2.0" = { - name = "node-firefox-connect"; - packageName = "node-firefox-connect"; - version = "1.2.0"; + "reduce-component-1.0.1" = { + name = "reduce-component"; + packageName = "reduce-component"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-firefox-connect/-/node-firefox-connect-1.2.0.tgz"; - sha1 = "42403848313240c98514ef14b3302816fe3b84e1"; + url = "https://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz"; + sha1 = "e0c93542c574521bea13df0f9488ed82ab77c5da"; }; }; - "node-notifier-5.1.2" = { - name = "node-notifier"; - packageName = "node-notifier"; - version = "5.1.2"; + "regenerator-runtime-0.10.5" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/node-notifier/-/node-notifier-5.1.2.tgz"; - sha1 = "2fa9e12605fa10009d44549d6fcd8a63dde0e4ff"; + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz"; + sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658"; }; }; - "sign-addon-0.2.1" = { - name = "sign-addon"; - packageName = "sign-addon"; - version = "0.2.1"; + "regenerator-runtime-0.11.1" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/sign-addon/-/sign-addon-0.2.1.tgz"; - sha1 = "0172bdd9fdee7bdc636f3833b6977a556c75388e"; + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"; + sha512 = "03d4l8l8cyywh93wf5vw84lq56jh1b1d7jll4ny4z060j9hvx7w5q3q0b8q227jm93749k1c9h86r2pz0bm2xq5vp14g3r2kbvqc2rj"; }; }; - "source-map-support-0.5.0" = { - name = "source-map-support"; - packageName = "source-map-support"; - version = "0.5.0"; + "regenerator-runtime-0.9.6" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.0.tgz"; - sha512 = "3nwgpximc17yn0lfg8658fxkm2hwbpvnbx5x1g0qgqvjm3vzld96rh1gf6iw1srbkicp0m825sq92r9bnj2r2gl8ys0f7fzivf0sjmx"; + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz"; + sha1 = "d33eb95d0d2001a4be39659707c51b0cb71ce029"; }; }; - "stream-to-promise-2.2.0" = { - name = "stream-to-promise"; - packageName = "stream-to-promise"; - version = "2.2.0"; + "regex-cache-0.4.4" = { + name = "regex-cache"; + packageName = "regex-cache"; + version = "0.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/stream-to-promise/-/stream-to-promise-2.2.0.tgz"; - sha1 = "b1edb2e1c8cb11289d1b503c08d3f2aef51e650f"; + url = "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz"; + sha512 = "1crfmf19zkv0imnbbkj7bwrcyin3zxa88cs86b6apkxj8qrsmkxnydhsy2ia75q4ld10rhi2s2c36h7g77a997mh9c2z453s311jllx"; }; }; - "tmp-0.0.30" = { - name = "tmp"; - packageName = "tmp"; - version = "0.0.30"; + "regex-escape-3.4.8" = { + name = "regex-escape"; + packageName = "regex-escape"; + version = "3.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/tmp/-/tmp-0.0.30.tgz"; - sha1 = "72419d4a8be7d6ce75148fd8b324e593a711c2ed"; + url = "https://registry.npmjs.org/regex-escape/-/regex-escape-3.4.8.tgz"; + sha512 = "15ylzlxx4y88jldg7cgwv0dmw3ljpq27f9qf17d3g76dqh6ir1ig7dzvqv9nqpr3da1yd2r5ay8jqa6yk7ni5fbbrzgkhf3yha1av8c"; }; }; - "watchpack-1.3.0" = { - name = "watchpack"; - packageName = "watchpack"; - version = "1.3.0"; + "regex-not-1.0.0" = { + name = "regex-not"; + packageName = "regex-not"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-1.3.0.tgz"; - sha1 = "5164d4faabb88dcf277f17c8a3b16bfd3da8bee3"; + url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.0.tgz"; + sha1 = "42f83e39771622df826b02af176525d6a5f157f9"; }; }; - "update-notifier-2.2.0" = { - name = "update-notifier"; - packageName = "update-notifier"; - version = "2.2.0"; + "registry-auth-token-3.3.1" = { + name = "registry-auth-token"; + packageName = "registry-auth-token"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.2.0.tgz"; - sha1 = "1b5837cf90c0736d88627732b661c138f86de72f"; + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.1.tgz"; + sha1 = "fb0d3289ee0d9ada2cbb52af5dfe66cb070d3006"; }; }; - "yargs-6.6.0" = { - name = "yargs"; - packageName = "yargs"; - version = "6.6.0"; + "registry-url-3.1.0" = { + name = "registry-url"; + packageName = "registry-url"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz"; - sha1 = "782ec21ef403345f830a808ca3d513af56065208"; + url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz"; + sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; }; }; - "zip-dir-1.0.2" = { - name = "zip-dir"; - packageName = "zip-dir"; - version = "1.0.2"; + "reinterval-1.1.0" = { + name = "reinterval"; + packageName = "reinterval"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/zip-dir/-/zip-dir-1.0.2.tgz"; - sha1 = "253f907aead62a21acd8721d8b88032b2411c051"; + url = "https://registry.npmjs.org/reinterval/-/reinterval-1.1.0.tgz"; + sha1 = "3361ecfa3ca6c18283380dd0bb9546f390f5ece7"; }; }; - "ajv-5.2.3" = { - name = "ajv"; - packageName = "ajv"; - version = "5.2.3"; + "relateurl-0.2.7" = { + name = "relateurl"; + packageName = "relateurl"; + version = "0.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz"; - sha1 = "c06f598778c44c6b161abafe3466b81ad1814ed2"; + url = "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz"; + sha1 = "54dbf377e51440aca90a4cd274600d3ff2d888a9"; }; }; - "cheerio-1.0.0-rc.2" = { - name = "cheerio"; - packageName = "cheerio"; - version = "1.0.0-rc.2"; + "relative-date-1.1.3" = { + name = "relative-date"; + packageName = "relative-date"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.2.tgz"; - sha1 = "4b9f53a81b27e4d5dac31c0ffd0cfa03cc6830db"; - }; - }; - "common-tags-1.4.0" = { - name = "common-tags"; - packageName = "common-tags"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/common-tags/-/common-tags-1.4.0.tgz"; - sha1 = "1187be4f3d4cf0c0427d43f74eef1f73501614c0"; - }; - }; - "crx-parser-0.1.2" = { - name = "crx-parser"; - packageName = "crx-parser"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/crx-parser/-/crx-parser-0.1.2.tgz"; - sha1 = "7eeeed9eddc95e22c189382e34624044a89a5a6d"; - }; - }; - "doctoc-1.3.0" = { - name = "doctoc"; - packageName = "doctoc"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/doctoc/-/doctoc-1.3.0.tgz"; - sha1 = "7f0839851dd58c808a2cae55d9504e012d08ee30"; - }; - }; - "dispensary-0.10.19" = { - name = "dispensary"; - packageName = "dispensary"; - version = "0.10.19"; - src = fetchurl { - url = "https://registry.npmjs.org/dispensary/-/dispensary-0.10.19.tgz"; - sha1 = "457993df5f4a7e03f6fa00ec8ac4f8b21bebab69"; - }; - }; - "eslint-4.8.0" = { - name = "eslint"; - packageName = "eslint"; - version = "4.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.8.0.tgz"; - sha1 = "229ef0e354e0e61d837c7a80fdfba825e199815e"; - }; - }; - "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/eslint-plugin-no-unsafe-innerhtml/-/eslint-plugin-no-unsafe-innerhtml-1.0.16.tgz"; - sha1 = "7d02878c8e9bf7916b88836d5ac122b42f151932"; - }; - }; - "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/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz"; - sha1 = "1bdecdb8e083c0664b91945581577a43a9f31d70"; - }; - }; - "jed-1.1.1" = { - name = "jed"; - packageName = "jed"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jed/-/jed-1.1.1.tgz"; - sha1 = "7a549bbd9ffe1585b0cd0a191e203055bee574b4"; - }; - }; - "pino-4.10.2" = { - name = "pino"; - packageName = "pino"; - version = "4.10.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-4.10.2.tgz"; - sha512 = "2dvx5p741a807ch31jbaxsn1qkkqjnvv8zikzjrk6pnm9da0gayl7g0swpvf87limyi61d3xfhasjy0v4fmvai2wb54pngfx2047lw4"; - }; - }; - "postcss-6.0.11" = { - name = "postcss"; - packageName = "postcss"; - version = "6.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-6.0.11.tgz"; - sha512 = "1raf6rg2rp67ql9bgihz0b0laxjakl84aqf428a7d370fcq5hzfnb4gj7gkyqx5zafw6h9y1b5c666k0acjxh34n1mhlifd777wij8f"; + url = "https://registry.npmjs.org/relative-date/-/relative-date-1.1.3.tgz"; + sha1 = "120903040588ec7a4a399c6547fd01d0e3d2dc63"; }; }; "relaxed-json-1.0.1" = { @@ -25334,78 +20733,6 @@ let sha1 = "7c8d4aa2f095704cd020e32e8099bcae103f0bd4"; }; }; - "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"; - }; - }; - "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"; - }; - }; - "yauzl-2.8.0" = { - name = "yauzl"; - packageName = "yauzl"; - version = "2.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yauzl/-/yauzl-2.8.0.tgz"; - sha1 = "79450aff22b2a9c5a41ef54e02db907ccfbf9ee2"; - }; - }; - "parse5-3.0.3" = { - name = "parse5"; - packageName = "parse5"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz"; - sha512 = "005xscj5zlz7pkxa5ngys7i7pdb2f4pirj1zw7hr1145zhxxgg04nhykjh1csy2ncr5lyjw8phq8m2ylqhfhi2z4hgvjb2b1rkbs0xf"; - }; - }; - "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/anchor-markdown-header/-/anchor-markdown-header-0.5.7.tgz"; - sha1 = "045063d76e6a1f9cd327a57a0126aa0fdec371a7"; - }; - }; - "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/markdown-to-ast/-/markdown-to-ast-3.4.0.tgz"; - sha1 = "0e2cba81390b0549a9153ec3b0d915b61c164be7"; - }; - }; - "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"; - }; - }; - "emoji-regex-6.1.3" = { - name = "emoji-regex"; - packageName = "emoji-regex"; - version = "6.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.1.3.tgz"; - sha1 = "ec79a3969b02d2ecf2b72254279bf99bc7a83932"; - }; - }; "remark-5.1.0" = { name = "remark"; packageName = "remark"; @@ -25415,24 +20742,6 @@ let sha1 = "cb463bd3dbcb4b99794935eee1cf71d7a8e3068c"; }; }; - "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"; - }; - }; - "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"; - }; - }; "remark-parse-1.1.0" = { name = "remark-parse"; packageName = "remark-parse"; @@ -25451,733 +20760,463 @@ let sha1 = "a7105e25b9ee2bf9a49b75d2c423f11b06ae2092"; }; }; - "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"; - }; - }; - "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/collapse-white-space/-/collapse-white-space-1.0.3.tgz"; - sha1 = "4b906f670e5a963a87b76b0e1689643341b6023c"; - }; - }; - "parse-entities-1.1.1" = { - name = "parse-entities"; - packageName = "parse-entities"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.1.tgz"; - sha1 = "8112d88471319f27abae4d64964b122fe4e1b890"; - }; - }; - "trim-trailing-lines-1.1.0" = { - name = "trim-trailing-lines"; - packageName = "trim-trailing-lines"; + "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/trim-trailing-lines/-/trim-trailing-lines-1.1.0.tgz"; - sha1 = "7aefbb7808df9d669f6da2e438cac8c46ada7684"; + url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"; + sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; }; }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "character-entities-1.2.1" = { - name = "character-entities"; - packageName = "character-entities"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/character-entities/-/character-entities-1.2.1.tgz"; - sha1 = "f76871be5ef66ddb7f8f8e3478ecc374c27d6dca"; - }; - }; - "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/character-entities-legacy/-/character-entities-legacy-1.1.1.tgz"; - sha1 = "f40779df1a101872bb510a3d295e1fccf147202f"; - }; - }; - "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/character-reference-invalid/-/character-reference-invalid-1.1.1.tgz"; - sha1 = "942835f750e4ec61a308e60c2ef8cc1011202efc"; - }; - }; - "is-alphanumerical-1.0.1" = { - name = "is-alphanumerical"; - packageName = "is-alphanumerical"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.1.tgz"; - sha1 = "dfb4aa4d1085e33bdb61c2dee9c80e9c6c19f53b"; - }; - }; - "is-decimal-1.0.1" = { - name = "is-decimal"; - packageName = "is-decimal"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.1.tgz"; - sha1 = "f5fb6a94996ad9e8e3761fbfbd091f1fca8c4e82"; - }; - }; - "is-hexadecimal-1.0.1" = { - name = "is-hexadecimal"; - packageName = "is-hexadecimal"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.1.tgz"; - sha1 = "6e084bbc92061fbb0971ec58b6ce6d404e24da69"; - }; - }; - "is-alphabetical-1.0.1" = { - name = "is-alphabetical"; - packageName = "is-alphabetical"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.1.tgz"; - sha1 = "c77079cc91d4efac775be1034bf2d243f95e6f08"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "ccount-1.0.2" = { - name = "ccount"; - packageName = "ccount"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ccount/-/ccount-1.0.2.tgz"; - sha1 = "53b6a2f815bb77b9c2871f7b9a72c3a25f1d8e89"; - }; - }; - "longest-streak-1.0.0" = { - name = "longest-streak"; - packageName = "longest-streak"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/longest-streak/-/longest-streak-1.0.0.tgz"; - sha1 = "d06597c4d4c31b52ccb1f5d8f8fe7148eafd6965"; - }; - }; - "markdown-table-0.4.0" = { - name = "markdown-table"; - packageName = "markdown-table"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/markdown-table/-/markdown-table-0.4.0.tgz"; - sha1 = "890c2c1b3bfe83fb00e4129b8e4cfe645270f9d1"; - }; - }; - "stringify-entities-1.3.1" = { - name = "stringify-entities"; - packageName = "stringify-entities"; + "render-readme-1.3.1" = { + name = "render-readme"; + packageName = "render-readme"; version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.1.tgz"; - sha1 = "b150ec2d72ac4c1b5f324b51fb6b28c9cdff058c"; + url = "https://registry.npmjs.org/render-readme/-/render-readme-1.3.1.tgz"; + sha1 = "d2a98f9a87dd64fa73c6877ac5c45b0f6341a797"; }; }; - "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/character-entities-html4/-/character-entities-html4-1.1.1.tgz"; - sha1 = "359a2a4a0f7e29d3dc2ac99bdbe21ee39438ea50"; - }; - }; - "bail-1.0.2" = { - name = "bail"; - packageName = "bail"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bail/-/bail-1.0.2.tgz"; - sha1 = "f7d6c1731630a9f9f0d4d35ed1f962e2074a1764"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "array-from-2.1.1" = { - name = "array-from"; - packageName = "array-from"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz"; - sha1 = "cfe9d8c26628b9dc5aecc62a9f5d8f1f352c1195"; - }; - }; - "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/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz"; - sha1 = "17b09581988979fddafe0201e931ba933c96cbb4"; - }; - }; - "eslint-3.19.0" = { - name = "eslint"; - packageName = "eslint"; - version = "3.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz"; - sha1 = "c8fc6201c7f40dd08941b87c085767386a679acc"; - }; - }; - "inquirer-0.12.0" = { - name = "inquirer"; - packageName = "inquirer"; - version = "0.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz"; - sha1 = "1ef2bfd63504df0bc75785fff8c2c41df12f077e"; - }; - }; - "pluralize-1.2.1" = { - name = "pluralize"; - packageName = "pluralize"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz"; - sha1 = "d1a21483fd22bb41e58a12fa3421823140897c45"; - }; - }; - "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"; - }; - }; - "ajv-keywords-1.5.1" = { - name = "ajv-keywords"; - packageName = "ajv-keywords"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz"; - sha1 = "314dd0a4b3368fad3dfcdc54ede6171b886daf3c"; - }; - }; - "slice-ansi-0.0.4" = { - name = "slice-ansi"; - packageName = "slice-ansi"; - version = "0.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz"; - sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35"; - }; - }; - "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/fast-json-parse/-/fast-json-parse-1.0.3.tgz"; - sha512 = "01vq6bwp36yjvywlw5jniq4ainn8jrwxsab76bv02j77ky26qm99097g7x6j8dqrjrhfgd0vs9q6nh2milhsnsk9529s42njilsq58m"; - }; - }; - "fast-safe-stringify-1.2.1" = { - name = "fast-safe-stringify"; - packageName = "fast-safe-stringify"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-1.2.1.tgz"; - sha512 = "2in2h3qxnsgr2kvm4pk5hlgxgx9n4hnh83rzirgscbql55k3jwgvs9hksclxzi7il0i0qbj3iqk5qlka0rf71wq9b9qij9jxmw2lrc3"; - }; - }; - "flatstr-1.0.5" = { - name = "flatstr"; - packageName = "flatstr"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/flatstr/-/flatstr-1.0.5.tgz"; - sha1 = "5b451b08cbd48e2eac54a2bbe0bf46165aa14be3"; - }; - }; - "quick-format-unescaped-1.1.1" = { - name = "quick-format-unescaped"; - packageName = "quick-format-unescaped"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-1.1.1.tgz"; - sha1 = "e77555ef3e66e105d4039e13ef79201284fee916"; - }; - }; - "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"; - }; - }; - "lodash.sortby-4.7.0" = { - name = "lodash.sortby"; - packageName = "lodash.sortby"; - version = "4.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz"; - sha1 = "edd14c824e2cc9c1e0b0a1b42bb5210516a42438"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "archiver-1.3.0" = { - name = "archiver"; - packageName = "archiver"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/archiver/-/archiver-1.3.0.tgz"; - sha1 = "4f2194d6d8f99df3f531e6881f14f15d55faaf22"; - }; - }; - "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"; - }; - }; - "jetpack-id-1.0.0" = { - name = "jetpack-id"; - packageName = "jetpack-id"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jetpack-id/-/jetpack-id-1.0.0.tgz"; - sha1 = "2cf9fbae46d8074fc16b7de0071c8efebca473a6"; - }; - }; - "walkdir-0.0.11" = { - name = "walkdir"; - packageName = "walkdir"; - version = "0.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/walkdir/-/walkdir-0.0.11.tgz"; - sha1 = "a16d025eb931bd03b52f308caed0f40fcebe9532"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "is-absolute-0.1.7" = { - name = "is-absolute"; - packageName = "is-absolute"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz"; - sha1 = "847491119fccb5fb436217cc737f7faad50f603f"; - }; - }; - "isexe-1.1.2" = { - name = "isexe"; - packageName = "isexe"; + "repeat-element-1.1.2" = { + name = "repeat-element"; + packageName = "repeat-element"; version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz"; - sha1 = "36f3e22e60750920f5e7241a476a8c6a42275ad0"; + url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz"; + sha1 = "ef089a178d1483baae4d93eb98b4f9e4e11d990a"; }; }; - "is-relative-0.1.3" = { - name = "is-relative"; - packageName = "is-relative"; - version = "0.1.3"; + "repeat-string-0.2.2" = { + name = "repeat-string"; + packageName = "repeat-string"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz"; - sha1 = "905fee8ae86f45b3ec614bc3c15c869df0876e82"; + url = "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz"; + sha1 = "c7a8d3236068362059a7e4651fc6884e8b1fb4ae"; }; }; - "shelljs-0.7.7" = { - name = "shelljs"; - packageName = "shelljs"; - version = "0.7.7"; + "repeat-string-1.6.1" = { + name = "repeat-string"; + packageName = "repeat-string"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.7.tgz"; - sha1 = "b2f5c77ef97148f4b4f6e22682e10bba8667cff1"; + url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; + sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; }; }; - "es6-promise-2.3.0" = { - name = "es6-promise"; - packageName = "es6-promise"; - version = "2.3.0"; + "repeating-1.1.3" = { + name = "repeating"; + packageName = "repeating"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz"; - sha1 = "96edb9f2fdb01995822b263dd8aadab6748181bc"; + url = "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz"; + sha1 = "3d4114218877537494f97f77f9785fab810fa4ac"; }; }; - "firefox-client-0.3.0" = { - name = "firefox-client"; - packageName = "firefox-client"; - version = "0.3.0"; + "repeating-2.0.1" = { + name = "repeating"; + packageName = "repeating"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/firefox-client/-/firefox-client-0.3.0.tgz"; - sha1 = "3794460f6eb6afcf41376addcbc7462e24a4cd8b"; + url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"; + sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; }; }; - "colors-0.5.1" = { - name = "colors"; - packageName = "colors"; - version = "0.5.1"; + "replace-ext-0.0.1" = { + name = "replace-ext"; + packageName = "replace-ext"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-0.5.1.tgz"; - sha1 = "7d0023eaeb154e8ee9fce75dcb923d0ed1667774"; + url = "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz"; + sha1 = "29bbd92078a739f0bcce2b4ee41e837953522924"; }; }; - "js-select-0.6.0" = { - name = "js-select"; - packageName = "js-select"; - version = "0.6.0"; + "request-2.16.6" = { + name = "request"; + packageName = "request"; + version = "2.16.6"; src = fetchurl { - url = "https://registry.npmjs.org/js-select/-/js-select-0.6.0.tgz"; - sha1 = "c284e22824d5927aec962dcdf247174aefb0d190"; + url = "https://registry.npmjs.org/request/-/request-2.16.6.tgz"; + sha1 = "872fe445ae72de266b37879d6ad7dc948fa01cad"; }; }; - "traverse-0.4.6" = { - name = "traverse"; - packageName = "traverse"; - version = "0.4.6"; + "request-2.67.0" = { + name = "request"; + packageName = "request"; + version = "2.67.0"; src = fetchurl { - url = "https://registry.npmjs.org/traverse/-/traverse-0.4.6.tgz"; - sha1 = "d04b2280e4c792a5815429ef7b8b60c64c9ccc34"; + url = "https://registry.npmjs.org/request/-/request-2.67.0.tgz"; + sha1 = "8af74780e2bf11ea0ae9aa965c11f11afd272742"; }; }; - "JSONSelect-0.2.1" = { - name = "JSONSelect"; - packageName = "JSONSelect"; - version = "0.2.1"; + "request-2.74.0" = { + name = "request"; + packageName = "request"; + version = "2.74.0"; src = fetchurl { - url = "https://registry.npmjs.org/JSONSelect/-/JSONSelect-0.2.1.tgz"; - sha1 = "415418a526d33fe31d74b4defa3c836d485ec203"; + url = "https://registry.npmjs.org/request/-/request-2.74.0.tgz"; + sha1 = "7693ca768bbb0ea5c8ce08c084a45efa05b892ab"; }; }; - "growly-1.3.0" = { - name = "growly"; - packageName = "growly"; - version = "1.3.0"; + "request-2.75.0" = { + name = "request"; + packageName = "request"; + version = "2.75.0"; src = fetchurl { - url = "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz"; - sha1 = "f10748cbe76af964b7c96c93c6bcc28af120c081"; + url = "https://registry.npmjs.org/request/-/request-2.75.0.tgz"; + sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93"; }; }; - "shellwords-0.1.1" = { - name = "shellwords"; - packageName = "shellwords"; - version = "0.1.1"; + "request-2.79.0" = { + name = "request"; + packageName = "request"; + version = "2.79.0"; src = fetchurl { - url = "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz"; - sha512 = "31h1mksdbashjfpvj7xh8nqw7siqm5v1yj77pmcsbkzqi4hrpjqmzv2sifjlljjyx87sfqnmcn0yqh1hfgn669c43i2dargyi8i4p5w"; + url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz"; + sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de"; }; }; - "babel-polyfill-6.16.0" = { - name = "babel-polyfill"; - packageName = "babel-polyfill"; - version = "6.16.0"; + "request-2.81.0" = { + name = "request"; + packageName = "request"; + version = "2.81.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.16.0.tgz"; - sha1 = "2d45021df87e26a374b6d4d1a9c65964d17f2422"; + url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz"; + sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; }; }; - "deepcopy-0.6.3" = { - name = "deepcopy"; - packageName = "deepcopy"; - version = "0.6.3"; + "request-2.83.0" = { + name = "request"; + packageName = "request"; + version = "2.83.0"; src = fetchurl { - url = "https://registry.npmjs.org/deepcopy/-/deepcopy-0.6.3.tgz"; - sha1 = "634780f2f8656ab771af8fa8431ed1ccee55c7b0"; + url = "https://registry.npmjs.org/request/-/request-2.83.0.tgz"; + sha512 = "0by1djkn836sqd9pk2c777wcjvp34qbk1plx7s4lmykljrblpjc64dvn6ni2vyxsbyk33wnl6avym8vgw0ggr4226xakck8mw7y07cm"; }; }; - "es6-error-4.0.0" = { - name = "es6-error"; - packageName = "es6-error"; - version = "4.0.0"; + "request-2.9.203" = { + name = "request"; + packageName = "request"; + version = "2.9.203"; src = fetchurl { - url = "https://registry.npmjs.org/es6-error/-/es6-error-4.0.0.tgz"; - sha1 = "f094c7041f662599bb12720da059d6b9c7ff0f40"; + url = "https://registry.npmjs.org/request/-/request-2.9.203.tgz"; + sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a"; }; }; - "jsonwebtoken-7.1.9" = { - name = "jsonwebtoken"; - packageName = "jsonwebtoken"; - version = "7.1.9"; + "request-progress-2.0.1" = { + name = "request-progress"; + packageName = "request-progress"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.1.9.tgz"; - sha1 = "847804e5258bec5a9499a8dc4a5e7a3bae08d58a"; + url = "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz"; + sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08"; }; }; - "mz-2.5.0" = { - name = "mz"; - packageName = "mz"; - version = "2.5.0"; + "requestretry-1.13.0" = { + name = "requestretry"; + packageName = "requestretry"; + version = "1.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/mz/-/mz-2.5.0.tgz"; - sha1 = "2859025df03d46b57bb317174b196477ce64cec1"; + url = "https://registry.npmjs.org/requestretry/-/requestretry-1.13.0.tgz"; + sha512 = "2d6rk1gry4jlbd4i3ghm6vn9vjcjwsyb02w9f4jc5ximih9niq4javazp9hbm658zp2fz2zm8xy1dp2rxqv2c84301p0hg7rfl7ss1f"; }; }; - "source-map-support-0.4.6" = { - name = "source-map-support"; - packageName = "source-map-support"; - version = "0.4.6"; + "require-directory-2.1.1" = { + name = "require-directory"; + packageName = "require-directory"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.6.tgz"; - sha1 = "32552aa64b458392a85eab3b0b5ee61527167aeb"; + url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; }; }; - "regenerator-runtime-0.9.6" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.9.6"; + "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/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz"; - sha1 = "d33eb95d0d2001a4be39659707c51b0cb71ce029"; + url = "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz"; + sha1 = "529c9ccef27380adfec9a2f965b649bbee636418"; }; }; - "joi-6.10.1" = { - name = "joi"; - packageName = "joi"; - version = "6.10.1"; + "require-from-string-2.0.1" = { + name = "require-from-string"; + packageName = "require-from-string"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/joi/-/joi-6.10.1.tgz"; - sha1 = "4d50c318079122000fe5f16af1ff8e1917b77e06"; + url = "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.1.tgz"; + sha1 = "c545233e9d7da6616e9d59adfb39fc9f588676ff"; }; }; - "lodash.once-4.1.1" = { - name = "lodash.once"; - packageName = "lodash.once"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz"; - sha1 = "0dd3971213c7c56df880977d504c88fb471a97ac"; - }; - }; - "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"; - }; - }; - "isemail-1.2.0" = { - name = "isemail"; - packageName = "isemail"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz"; - sha1 = "be03df8cc3e29de4d2c5df6501263f1fa4595e9a"; - }; - }; - "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/end-of-stream/-/end-of-stream-1.1.0.tgz"; - sha1 = "e9353258baa9108965efc41cb0ef8ade2f3cfb07"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "jszip-2.6.1" = { - name = "jszip"; - packageName = "jszip"; - version = "2.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jszip/-/jszip-2.6.1.tgz"; - sha1 = "b88f3a7b2e67a2a048152982c7a3756d9c4828f0"; - }; - }; - "cli-list-0.2.0" = { - name = "cli-list"; - packageName = "cli-list"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-list/-/cli-list-0.2.0.tgz"; - sha1 = "7e673ee0dd39a611a486476e53f3c6b3941cb582"; - }; - }; - "fullname-3.3.0" = { - name = "fullname"; - packageName = "fullname"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fullname/-/fullname-3.3.0.tgz"; - sha1 = "a08747d6921229610b8178b7614fce10cb185f5a"; - }; - }; - "humanize-string-1.0.1" = { - name = "humanize-string"; - packageName = "humanize-string"; + "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/humanize-string/-/humanize-string-1.0.1.tgz"; - sha1 = "fce2d6c545efc25dea1f23235182c98da0180b42"; + url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"; + sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; }; }; - "npm-keyword-4.2.0" = { - name = "npm-keyword"; - packageName = "npm-keyword"; - version = "4.2.0"; + "require-uncached-1.0.3" = { + name = "require-uncached"; + packageName = "require-uncached"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/npm-keyword/-/npm-keyword-4.2.0.tgz"; - sha1 = "98ffebfdbb1336f27ef5fe1baca0dcacd0acf6c0"; + url = "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz"; + sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3"; }; }; - "opn-4.0.2" = { - name = "opn"; - packageName = "opn"; - version = "4.0.2"; + "requires-port-1.0.0" = { + name = "requires-port"; + packageName = "requires-port"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/opn/-/opn-4.0.2.tgz"; - sha1 = "7abc22e644dff63b0a96d5ab7f2790c0f01abc95"; + url = "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"; + sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; }; }; - "parse-help-0.1.1" = { - name = "parse-help"; - packageName = "parse-help"; - version = "0.1.1"; + "requizzle-0.2.1" = { + name = "requizzle"; + packageName = "requizzle"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/parse-help/-/parse-help-0.1.1.tgz"; - sha1 = "2f4df942e77a5581bba9967c0c3f48e4c66d7dda"; + url = "https://registry.npmjs.org/requizzle/-/requizzle-0.2.1.tgz"; + sha1 = "6943c3530c4d9a7e46f1cddd51c158fc670cdbde"; + }; + }; + "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-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"; + }; + }; + "resolve-dir-1.0.1" = { + name = "resolve-dir"; + packageName = "resolve-dir"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz"; + sha1 = "79a40644c362be82f26effe739c9bb5382046f43"; + }; + }; + "resolve-from-1.0.1" = { + name = "resolve-from"; + packageName = "resolve-from"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz"; + sha1 = "26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"; + }; + }; + "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"; + }; + }; + "resolve-from-3.0.0" = { + name = "resolve-from"; + packageName = "resolve-from"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz"; + sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "responselike-1.0.2" = { + name = "responselike"; + packageName = "responselike"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz"; + sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7"; + }; + }; + "restify-4.0.3" = { + name = "restify"; + packageName = "restify"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/restify/-/restify-4.0.3.tgz"; + sha1 = "e1e5b7ad9d4f6aeacd20e28f44a045f26c146dbc"; + }; + }; + "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"; + }; + }; + "resumer-0.0.0" = { + name = "resumer"; + packageName = "resumer"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz"; + sha1 = "f1e8f461e4064ba39e82af3cdc2a8c893d076759"; + }; + }; + "retry-0.10.1" = { + name = "retry"; + packageName = "retry"; + version = "0.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz"; + sha1 = "e76388d217992c252750241d3d3956fed98d8ff4"; + }; + }; + "retry-0.6.0" = { + name = "retry"; + packageName = "retry"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.6.0.tgz"; + sha1 = "1c010713279a6fd1e8def28af0c3ff1871caa537"; + }; + }; + "retry-0.6.1" = { + name = "retry"; + packageName = "retry"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.6.1.tgz"; + sha1 = "fdc90eed943fde11b893554b8cc63d0e899ba918"; + }; + }; + "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"; + }; + }; + "reverse-http-1.3.0" = { + name = "reverse-http"; + packageName = "reverse-http"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/reverse-http/-/reverse-http-1.3.0.tgz"; + sha1 = "61a9644bdea483aa281ffb62706e642f1a73a239"; + }; + }; + "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.1.4" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz"; + sha1 = "5a6eb62eeda068f51ede50f29b3e5cd22f3d9bb2"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "ripemd160-2.0.1" = { + name = "ripemd160"; + packageName = "ripemd160"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz"; + sha1 = "0f4584295c53a3628af7e6d79aca21ce57d1c6e7"; + }; + }; + "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"; + }; + }; + "root-2.0.0" = { + name = "root"; + packageName = "root"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/root/-/root-2.0.0.tgz"; + sha1 = "5cde3bc4ee9eb314c9dc64f97d9b9787df22e2f7"; }; }; "root-check-1.0.0" = { @@ -26189,6 +21228,1518 @@ let sha1 = "c52a794bf0db9fad567536e41898f0c9e0a86697"; }; }; + "router-0.6.2" = { + name = "router"; + packageName = "router"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/router/-/router-0.6.2.tgz"; + sha1 = "6f04063a2d04eba3303a1bbc6765eef63037cf3d"; + }; + }; + "router-1.3.2" = { + name = "router"; + packageName = "router"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/router/-/router-1.3.2.tgz"; + sha1 = "bfaa16888a5283d5ee40d999da7a9fa15296a60c"; + }; + }; + "rsvp-3.6.2" = { + name = "rsvp"; + packageName = "rsvp"; + version = "3.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz"; + sha512 = "2bjwzsigk7685syp50amryj0sx08l155azg1z4ldx95gadlwfm07y0iyv0vfwgfchbripn2a5r04qhv546djh0biw8prgpx6r0qdx9r"; + }; + }; + "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"; + }; + }; + "run-parallel-1.1.6" = { + name = "run-parallel"; + packageName = "run-parallel"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.6.tgz"; + sha1 = "29003c9a2163e01e2d2dfc90575f2c6c1d61a039"; + }; + }; + "run-series-1.1.4" = { + name = "run-series"; + packageName = "run-series"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/run-series/-/run-series-1.1.4.tgz"; + sha1 = "89a73ddc5e75c9ef8ab6320c0a1600d6a41179b9"; + }; + }; + "rusha-0.8.12" = { + name = "rusha"; + packageName = "rusha"; + version = "0.8.12"; + src = fetchurl { + url = "https://registry.npmjs.org/rusha/-/rusha-0.8.12.tgz"; + sha1 = "5d838ce1fce8b145674ee771eaad5bcb2575e64b"; + }; + }; + "rx-2.5.3" = { + name = "rx"; + packageName = "rx"; + version = "2.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/rx/-/rx-2.5.3.tgz"; + sha1 = "21adc7d80f02002af50dae97fd9dbf248755f566"; + }; + }; + "rx-4.1.0" = { + name = "rx"; + packageName = "rx"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz"; + sha1 = "a5f13ff79ef3b740fe30aa803fb09f98805d4782"; + }; + }; + "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"; + }; + }; + "rxjs-5.5.6" = { + name = "rxjs"; + packageName = "rxjs"; + version = "5.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.6.tgz"; + sha512 = "293yj2n5f5bj8b8y9czwgm5l3bqa0g3bbghnxsxwdpiz6s2mxiw6a79w3sqq3c1by3avmb5bgk8xgi0yss5y09pxw87055l60f3k15z"; + }; + }; + "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"; + }; + }; + "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-json-parse-1.0.1" = { + name = "safe-json-parse"; + packageName = "safe-json-parse"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-1.0.1.tgz"; + sha1 = "3e76723e38dfdda13c9b1d29a1e07ffee4b30b57"; + }; + }; + "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"; + }; + }; + "sanitize-html-1.17.0" = { + name = "sanitize-html"; + packageName = "sanitize-html"; + version = "1.17.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.17.0.tgz"; + sha512 = "1gnj506vfw53kv0d0y0v2cg4694lyq7fbcbpjllzmls3z3b8pdrh40nw3pp70bfs851c8sklh3f4zifaznd02jkbn62z089x7kbmgg6"; + }; + }; + "sax-0.3.5" = { + name = "sax"; + packageName = "sax"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz"; + sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d"; + }; + }; + "sax-0.5.2" = { + name = "sax"; + packageName = "sax"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-0.5.2.tgz"; + sha1 = "735ffaa39a1cff8ffb9598f0223abdb03a9fb2ea"; + }; + }; + "sax-0.5.8" = { + name = "sax"; + packageName = "sax"; + version = "0.5.8"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz"; + sha1 = "d472db228eb331c2506b0e8c15524adb939d12c1"; + }; + }; + "sax-0.6.1" = { + name = "sax"; + packageName = "sax"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz"; + sha1 = "563b19c7c1de892e09bfc4f2fc30e3c27f0952b9"; + }; + }; + "sax-1.1.4" = { + name = "sax"; + packageName = "sax"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz"; + sha1 = "74b6d33c9ae1e001510f179a91168588f1aedaa9"; + }; + }; + "sax-1.2.1" = { + name = "sax"; + packageName = "sax"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz"; + sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a"; + }; + }; + "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"; + }; + }; + "scoped-regex-1.0.0" = { + name = "scoped-regex"; + packageName = "scoped-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/scoped-regex/-/scoped-regex-1.0.0.tgz"; + sha1 = "a346bb1acd4207ae70bd7c0c7ca9e566b6baddb8"; + }; + }; + "semaphore-async-await-1.5.1" = { + name = "semaphore-async-await"; + packageName = "semaphore-async-await"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semaphore-async-await/-/semaphore-async-await-1.5.1.tgz"; + sha1 = "857bef5e3644601ca4b9570b87e9df5ca12974fa"; + }; + }; + "semver-1.1.0" = { + name = "semver"; + packageName = "semver"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-1.1.0.tgz"; + sha1 = "da9b9c837e31550a7c928622bc2381de7dd7a53e"; + }; + }; + "semver-2.0.11" = { + name = "semver"; + packageName = "semver"; + version = "2.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-2.0.11.tgz"; + sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced"; + }; + }; + "semver-2.3.2" = { + name = "semver"; + packageName = "semver"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-2.3.2.tgz"; + sha1 = "b9848f25d6cf36333073ec9ef8856d42f1233e52"; + }; + }; + "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"; + }; + }; + "semver-5.0.3" = { + name = "semver"; + packageName = "semver"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"; + sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a"; + }; + }; + "semver-5.1.1" = { + name = "semver"; + packageName = "semver"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.1.1.tgz"; + sha1 = "a3292a373e6f3e0798da0b20641b9a9c5bc47e19"; + }; + }; + "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.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"; + }; + }; + "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"; + }; + }; + "semver-regex-1.0.0" = { + name = "semver-regex"; + packageName = "semver-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver-regex/-/semver-regex-1.0.0.tgz"; + sha1 = "92a4969065f9c70c694753d55248fc68f8f652c9"; + }; + }; + "semver-truncate-1.1.2" = { + name = "semver-truncate"; + packageName = "semver-truncate"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/semver-truncate/-/semver-truncate-1.1.2.tgz"; + sha1 = "57f41de69707a62709a7e0104ba2117109ea47e8"; + }; + }; + "semver-utils-1.1.1" = { + name = "semver-utils"; + packageName = "semver-utils"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semver-utils/-/semver-utils-1.1.1.tgz"; + sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df"; + }; + }; + "send-0.0.3" = { + name = "send"; + packageName = "send"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.0.3.tgz"; + sha1 = "4d5f843edf9d65dac31c8a5d2672c179ecb67184"; + }; + }; + "send-0.1.0" = { + name = "send"; + packageName = "send"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.1.0.tgz"; + sha1 = "cfb08ebd3cec9b7fc1a37d9ff9e875a971cf4640"; + }; + }; + "send-0.1.4" = { + name = "send"; + packageName = "send"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.1.4.tgz"; + sha1 = "be70d8d1be01de61821af13780b50345a4f71abd"; + }; + }; + "send-0.11.1" = { + name = "send"; + packageName = "send"; + version = "0.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.11.1.tgz"; + sha1 = "1beabfd42f9e2709f99028af3078ac12b47092d5"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "send-0.15.3" = { + name = "send"; + packageName = "send"; + version = "0.15.3"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.15.3.tgz"; + sha1 = "5013f9f99023df50d1bd9892c19e3defd1d53309"; + }; + }; + "send-0.15.6" = { + name = "send"; + packageName = "send"; + version = "0.15.6"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.15.6.tgz"; + sha1 = "20f23a9c925b762ab82705fe2f9db252ace47e34"; + }; + }; + "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"; + }; + }; + "sentiment-2.1.0" = { + name = "sentiment"; + packageName = "sentiment"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sentiment/-/sentiment-2.1.0.tgz"; + sha1 = "33279100c35c38519ca5e435245186c512fe0fdc"; + }; + }; + "sequence-2.2.1" = { + name = "sequence"; + packageName = "sequence"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz"; + sha1 = "7f5617895d44351c0a047e764467690490a16b03"; + }; + }; + "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"; + }; + }; + "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-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"; + }; + }; + "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-index-1.9.1" = { + name = "serve-index"; + packageName = "serve-index"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz"; + sha1 = "d3768d69b1e7d82e5ce050fff5b453bea12a9239"; + }; + }; + "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"; + }; + }; + "serve-static-1.12.3" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.12.3"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.3.tgz"; + sha1 = "9f4ba19e2f3030c547f8af99107838ec38d5b1e2"; + }; + }; + "serve-static-1.12.6" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.12.6"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.6.tgz"; + sha1 = "b973773f63449934da54e5beba5e31d9f4211577"; + }; + }; + "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"; + }; + }; + "serve-static-1.8.1" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.8.1.tgz"; + sha1 = "08fabd39999f050fc311443f46d5888a77ecfc7c"; + }; + }; + "server-destroy-1.0.1" = { + name = "server-destroy"; + packageName = "server-destroy"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/server-destroy/-/server-destroy-1.0.1.tgz"; + sha1 = "f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"; + }; + }; + "service-runner-2.5.0" = { + name = "service-runner"; + packageName = "service-runner"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/service-runner/-/service-runner-2.5.0.tgz"; + sha1 = "78b347542c5c6ad2f31e78a10533045fc6414c1f"; + }; + }; + "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-getter-0.1.0" = { + name = "set-getter"; + packageName = "set-getter"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-getter/-/set-getter-0.1.0.tgz"; + sha1 = "d769c182c9d5a51f409145f2fba82e5e86e80376"; + }; + }; + "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.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"; + }; + }; + "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"; + }; + }; + "sha.js-2.4.10" = { + name = "sha.js"; + packageName = "sha.js"; + version = "2.4.10"; + src = fetchurl { + url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.10.tgz"; + sha512 = "2lfna0mg4mzdki4p3q29rsgywbghvy6f6jy6b61zj68d2d936wfqjgqpsdjchfcqkiim53qknpcnq9iiafyidfrw154qf75a2n2cz5y"; + }; + }; + "shallow-clone-0.1.2" = { + name = "shallow-clone"; + packageName = "shallow-clone"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz"; + sha1 = "5909e874ba77106d73ac414cfec1ffca87d97060"; + }; + }; + "shasum-1.0.2" = { + name = "shasum"; + packageName = "shasum"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz"; + sha1 = "e7012310d8f417f4deb5712150e5678b87ae565f"; + }; + }; + "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"; + }; + }; + "shell-quote-1.6.1" = { + name = "shell-quote"; + packageName = "shell-quote"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz"; + sha1 = "f4781949cce402697127430ea3b3c5476f481767"; + }; + }; + "shelljs-0.3.0" = { + name = "shelljs"; + packageName = "shelljs"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz"; + sha1 = "3596e6307a781544f591f37da618360f31db57b1"; + }; + }; + "shelljs-0.5.3" = { + name = "shelljs"; + packageName = "shelljs"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz"; + sha1 = "c54982b996c76ef0c1e6b59fbdc5825f5b713113"; + }; + }; + "shelljs-0.7.7" = { + name = "shelljs"; + packageName = "shelljs"; + version = "0.7.7"; + src = fetchurl { + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.7.tgz"; + sha1 = "b2f5c77ef97148f4b4f6e22682e10bba8667cff1"; + }; + }; + "shelljs-0.7.8" = { + name = "shelljs"; + packageName = "shelljs"; + version = "0.7.8"; + src = fetchurl { + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz"; + sha1 = "decbcf874b0d1e5fb72e14b164a9683048e9acb3"; + }; + }; + "shelljs-0.8.0" = { + name = "shelljs"; + packageName = "shelljs"; + version = "0.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.0.tgz"; + sha512 = "0z8im8zw5g4r44mf2iiy61kxi5idq41b4cs6d4c3lv9shh8ag2gnp25kvwawg899bczvh9g95b07gcpabik39md8q2vmnwcjjizdgn1"; + }; + }; + "shellwords-0.1.1" = { + name = "shellwords"; + packageName = "shellwords"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz"; + sha512 = "31h1mksdbashjfpvj7xh8nqw7siqm5v1yj77pmcsbkzqi4hrpjqmzv2sifjlljjyx87sfqnmcn0yqh1hfgn669c43i2dargyi8i4p5w"; + }; + }; + "shush-1.0.0" = { + name = "shush"; + packageName = "shush"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shush/-/shush-1.0.0.tgz"; + sha1 = "c27415a9e458f2fed39b27cf8eb37c003782b431"; + }; + }; + "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"; + }; + }; + "sign-addon-0.2.2" = { + name = "sign-addon"; + packageName = "sign-addon"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/sign-addon/-/sign-addon-0.2.2.tgz"; + sha512 = "3v5myvfbil1c5fsvqx32vqdv7mk62059isry4811avmkgzfv95scw8pnkwa77m6zg9g8vgsp3glqjm65k3rj8xfxnqv24mcmhjk78bz"; + }; + }; + "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"; + }; + }; + "signals-1.0.0" = { + name = "signals"; + packageName = "signals"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/signals/-/signals-1.0.0.tgz"; + sha1 = "65f0c1599352b35372ecaae5a250e6107376ed69"; + }; + }; + "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-concat-1.0.0" = { + name = "simple-concat"; + packageName = "simple-concat"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.0.tgz"; + sha1 = "7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6"; + }; + }; + "simple-get-1.4.3" = { + name = "simple-get"; + packageName = "simple-get"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-get/-/simple-get-1.4.3.tgz"; + sha1 = "e9755eda407e96da40c5e5158c9ea37b33becbeb"; + }; + }; + "simple-get-2.7.0" = { + name = "simple-get"; + packageName = "simple-get"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-get/-/simple-get-2.7.0.tgz"; + sha512 = "2r1w3cxxmd92r19mjrlzwn6xypjd5vrx0gk21l2bmxcp1x54pavhmifbhq8llxfk6z2lmzly7g3l8rrdl19m65nzlcicwy7cfn3sha6"; + }; + }; + "simple-git-1.89.0" = { + name = "simple-git"; + packageName = "simple-git"; + version = "1.89.0"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-git/-/simple-git-1.89.0.tgz"; + sha1 = "ef52fe734d5060566ce187b2bbace36c2323e34c"; + }; + }; + "simple-lru-cache-0.0.2" = { + name = "simple-lru-cache"; + packageName = "simple-lru-cache"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz"; + sha1 = "d59cc3a193c1a5d0320f84ee732f6e4713e511dd"; + }; + }; + "simple-peer-6.4.4" = { + name = "simple-peer"; + packageName = "simple-peer"; + version = "6.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.4.4.tgz"; + sha1 = "4e421f485ac7b13b08077a4476934d52c5ba3bb3"; + }; + }; + "simple-plist-0.2.1" = { + name = "simple-plist"; + packageName = "simple-plist"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-plist/-/simple-plist-0.2.1.tgz"; + sha1 = "71766db352326928cf3a807242ba762322636723"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "simple-websocket-4.3.1" = { + name = "simple-websocket"; + packageName = "simple-websocket"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.3.1.tgz"; + sha1 = "5d3d5751bb39aeba2f710d8eec78768df821f38d"; + }; + }; + "simplediff-0.1.1" = { + name = "simplediff"; + packageName = "simplediff"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/simplediff/-/simplediff-0.1.1.tgz"; + sha1 = "b0caeeb093223370033c6c3aa1130dc86c6a087c"; + }; + }; + "simplesmtp-0.3.35" = { + name = "simplesmtp"; + packageName = "simplesmtp"; + version = "0.3.35"; + src = fetchurl { + url = "https://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.35.tgz"; + sha1 = "017b1eb8b26317ac36d2a2a8a932631880736a03"; + }; + }; + "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/single-line-log/-/single-line-log-0.4.1.tgz"; + sha1 = "87a55649f749d783ec0dcd804e8140d9873c7cee"; + }; + }; + "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/single-line-log/-/single-line-log-1.1.2.tgz"; + sha1 = "c2f83f273a3e1a16edb0995661da0ed5ef033364"; + }; + }; + "sinopia-htpasswd-0.4.5" = { + name = "sinopia-htpasswd"; + packageName = "sinopia-htpasswd"; + version = "0.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/sinopia-htpasswd/-/sinopia-htpasswd-0.4.5.tgz"; + sha1 = "2af824ae20eccb8f902325b1a2c27dd6619805c9"; + }; + }; + "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"; + }; + }; + "skin-tone-1.0.0" = { + name = "skin-tone"; + packageName = "skin-tone"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/skin-tone/-/skin-tone-1.0.0.tgz"; + sha1 = "d4ba3e8e5e92760e4d1d3b603d772805c6cb256f"; + }; + }; + "slack-node-0.2.0" = { + name = "slack-node"; + packageName = "slack-node"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slack-node/-/slack-node-0.2.0.tgz"; + sha1 = "de4b8dddaa8b793f61dbd2938104fdabf37dfa30"; + }; + }; + "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"; + }; + }; + "slate-irc-0.7.3" = { + name = "slate-irc"; + packageName = "slate-irc"; + version = "0.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/slate-irc/-/slate-irc-0.7.3.tgz"; + sha1 = "8d01f2bc809e00a5b2faca7d8d3130d155422a77"; + }; + }; + "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/slate-irc-parser/-/slate-irc-parser-0.0.2.tgz"; + sha1 = "0c5f8f20d817bb85329da9fca135c66b05947d80"; + }; + }; + "slice-ansi-0.0.4" = { + name = "slice-ansi"; + packageName = "slice-ansi"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz"; + sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35"; + }; + }; + "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"; + }; + }; + "sliced-0.0.3" = { + name = "sliced"; + packageName = "sliced"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sliced/-/sliced-0.0.3.tgz"; + sha1 = "4f0bac2171eb17162c3ba6df81f5cf040f7c7e50"; + }; + }; + "sliced-0.0.4" = { + name = "sliced"; + packageName = "sliced"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sliced/-/sliced-0.0.4.tgz"; + sha1 = "34f89a6db1f31fa525f5a570f5bcf877cf0955ee"; + }; + }; + "slide-1.1.6" = { + name = "slide"; + packageName = "slide"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz"; + sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; + }; + }; + "smart-buffer-1.1.15" = { + name = "smart-buffer"; + packageName = "smart-buffer"; + version = "1.1.15"; + src = fetchurl { + url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-1.1.15.tgz"; + sha1 = "7f114b5b65fab3e2a35aa775bb12f0d1c649bf16"; + }; + }; + "smartdc-auth-2.3.1" = { + name = "smartdc-auth"; + packageName = "smartdc-auth"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/smartdc-auth/-/smartdc-auth-2.3.1.tgz"; + sha1 = "96568a565e9d9feb03b93a50651eee14d23adf44"; + }; + }; + "smtp-connection-1.3.8" = { + name = "smtp-connection"; + packageName = "smtp-connection"; + version = "1.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/smtp-connection/-/smtp-connection-1.3.8.tgz"; + sha1 = "55832c2160cfb3086e1dcd87fd1c19fa61b7f536"; + }; + }; + "smtp-connection-2.12.0" = { + name = "smtp-connection"; + packageName = "smtp-connection"; + version = "2.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/smtp-connection/-/smtp-connection-2.12.0.tgz"; + sha1 = "d76ef9127cb23c2259edb1e8349c2e8d5e2d74c1"; + }; + }; + "snapdragon-0.8.1" = { + name = "snapdragon"; + packageName = "snapdragon"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.1.tgz"; + sha1 = "e12b5487faded3e3dea0ac91e9400bf75b401370"; + }; + }; + "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"; + }; + }; + "snapsvg-0.5.1" = { + name = "snapsvg"; + packageName = "snapsvg"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snapsvg/-/snapsvg-0.5.1.tgz"; + sha1 = "0caf52c79189a290746fc446cc5e863f6bdddfe3"; + }; + }; + "sntp-0.1.4" = { + name = "sntp"; + packageName = "sntp"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sntp/-/sntp-0.1.4.tgz"; + sha1 = "5ef481b951a7b29affdf4afd7f26838fc1120f84"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "snyk-1.69.3" = { + name = "snyk"; + packageName = "snyk"; + version = "1.69.3"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk/-/snyk-1.69.3.tgz"; + sha1 = "c948a05982b206002a09d4e55fb16aee6d5e80e0"; + }; + }; + "snyk-config-1.0.1" = { + name = "snyk-config"; + packageName = "snyk-config"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-config/-/snyk-config-1.0.1.tgz"; + sha1 = "f27aec2498b24027ac719214026521591111508f"; + }; + }; + "snyk-go-plugin-1.4.5" = { + name = "snyk-go-plugin"; + packageName = "snyk-go-plugin"; + version = "1.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.4.5.tgz"; + sha512 = "0m7m3yjv33vq1p6gwn30vxmacrahvw08j432pva601fm2b48j9f5hq8v6zdrzna2yw6xqg1dnhd7gxskpivvl4rzs3fji23yfvxgqxs"; + }; + }; + "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/snyk-gradle-plugin/-/snyk-gradle-plugin-1.2.0.tgz"; + sha512 = "1b2bxvwl2v4prlj942i4jkz4mahgp39j7lvy91jzv00nsk59l76b1icn48zj4zk84s00jil3pnxnfzsclhcc612d70s4wwi3x2hrrqn"; + }; + }; + "snyk-module-1.8.1" = { + name = "snyk-module"; + packageName = "snyk-module"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-module/-/snyk-module-1.8.1.tgz"; + sha1 = "31d5080fb1c0dfd6fa8567dd34a523fd02bf1fca"; + }; + }; + "snyk-mvn-plugin-1.1.1" = { + name = "snyk-mvn-plugin"; + packageName = "snyk-mvn-plugin"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-1.1.1.tgz"; + sha512 = "3h9drys1g2wh3w072rn00zw57g5xy42ap38k05gvdryiphx8p9iksb4azg4dyf2vd616jzslqid45hjd6iphafdzpk4b90mws880hqa"; + }; + }; + "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/snyk-nuget-plugin/-/snyk-nuget-plugin-1.3.9.tgz"; + sha512 = "017qpf5cy1f0x8apjc1a3qp3aa9w7v7zlyy8jb8r7q4ilsnpdzvywrxhd6s1yy3b9fiylmgmldgdcz77srqq9pm2njvdi80pyd00zqp"; + }; + }; + "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/snyk-php-plugin/-/snyk-php-plugin-1.3.2.tgz"; + sha512 = "2fihlcs2qxdbdfy1pjnf7110l6h4r16vkp0q51wqsfd8fw5s1qgb34plii6yhbfbs8a1il93i6hfn93yclbv50m2129wg7naf57jlqi"; + }; + }; + "snyk-policy-1.10.1" = { + name = "snyk-policy"; + packageName = "snyk-policy"; + version = "1.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.10.1.tgz"; + sha1 = "b1a26c8aef529c61604aca382111e535d511b763"; + }; + }; + "snyk-python-plugin-1.5.3" = { + name = "snyk-python-plugin"; + packageName = "snyk-python-plugin"; + version = "1.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.5.3.tgz"; + sha512 = "1yln7fd9x5zayvnq5hrvh44k9f37vnpirvw6gk87aq560kslsq4p2hknq02iq6az58wbc6r69g5rrszmv689c0ky3wjbmb2hmc9q7c1"; + }; + }; + "snyk-recursive-readdir-2.0.0" = { + name = "snyk-recursive-readdir"; + packageName = "snyk-recursive-readdir"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-recursive-readdir/-/snyk-recursive-readdir-2.0.0.tgz"; + sha1 = "5cb59e94698169e0205a60e7d6a506d0b4d52ff3"; + }; + }; + "snyk-resolve-1.0.0" = { + name = "snyk-resolve"; + packageName = "snyk-resolve"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-resolve/-/snyk-resolve-1.0.0.tgz"; + sha1 = "bbe9196d37f57c39251e6be75ccdd5b2097e99a2"; + }; + }; + "snyk-resolve-deps-1.7.0" = { + name = "snyk-resolve-deps"; + packageName = "snyk-resolve-deps"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-1.7.0.tgz"; + sha1 = "13743a058437dff890baaf437c333c966a743cb6"; + }; + }; + "snyk-sbt-plugin-1.2.2" = { + name = "snyk-sbt-plugin"; + packageName = "snyk-sbt-plugin"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.2.2.tgz"; + sha512 = "1sq30kk2kq0flsak5759wylylzgm6ivd6di4lmbkahy858i26yf6kf86f2m86wvlz4fcmxsbcl7p0wkd498cx193v4nbr2hq39jyjlz"; + }; + }; + "snyk-tree-1.0.0" = { + name = "snyk-tree"; + packageName = "snyk-tree"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-tree/-/snyk-tree-1.0.0.tgz"; + sha1 = "0fb73176dbf32e782f19100294160448f9111cc8"; + }; + }; + "snyk-try-require-1.2.0" = { + name = "snyk-try-require"; + packageName = "snyk-try-require"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-1.2.0.tgz"; + sha1 = "30fc2b11c07064591ee35780c826be91312f2144"; + }; + }; + "socket.io-0.9.14" = { + name = "socket.io"; + packageName = "socket.io"; + version = "0.9.14"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io/-/socket.io-0.9.14.tgz"; + sha1 = "81af80ebf3ee8f7f6e71b1495db91f8fa53ff667"; + }; + }; + "socket.io-1.0.6" = { + name = "socket.io"; + packageName = "socket.io"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io/-/socket.io-1.0.6.tgz"; + sha1 = "b566532888dae3ac9058a12f294015ebdfa8084a"; + }; + }; + "socket.io-1.7.4" = { + name = "socket.io"; + packageName = "socket.io"; + version = "1.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io/-/socket.io-1.7.4.tgz"; + sha1 = "2f7ecedc3391bf2d5c73e291fe233e6e34d4dd00"; + }; + }; + "socket.io-2.0.4" = { + 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"; + }; + }; + "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/socket.io-adapter/-/socket.io-adapter-0.2.0.tgz"; + sha1 = "bd39329b8961371787e24f345b074ec9cf000e33"; + }; + }; + "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/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz"; + sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b"; + }; + }; + "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/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz"; + sha1 = "2a805e8a14d6372124dd9159ad4502f8cb07f06b"; + }; + }; + "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/socket.io-client/-/socket.io-client-0.9.11.tgz"; + sha1 = "94defc1b29e0d8a8fe958c1cf33300f68d8a19c7"; + }; + }; + "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/socket.io-client/-/socket.io-client-1.0.6.tgz"; + sha1 = "c86cb3e507ab2f96da4500bd34fcf46a1e9dfe5e"; + }; + }; + "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/socket.io-client/-/socket.io-client-1.7.4.tgz"; + sha1 = "ec9f820356ed99ef6d357f0756d648717bdd4281"; + }; + }; + "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/socket.io-client/-/socket.io-client-2.0.4.tgz"; + sha1 = "0918a552406dc5e540b380dcd97afc4a64332f8e"; + }; + }; + "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/socket.io-parser/-/socket.io-parser-2.1.2.tgz"; + sha1 = "876655b9edd555c5bdf7301cedf30a436c67b8b0"; + }; + }; + "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/socket.io-parser/-/socket.io-parser-2.2.0.tgz"; + sha1 = "2609601f59e6a7fab436a53be3d333fbbfcbd30a"; + }; + }; + "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/socket.io-parser/-/socket.io-parser-2.3.1.tgz"; + sha1 = "dd532025103ce429697326befd64005fcfe5b4a0"; + }; + }; + "socket.io-parser-3.1.2" = { + name = "socket.io-parser"; + packageName = "socket.io-parser"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.1.2.tgz"; + sha1 = "dbc2282151fc4faebbe40aeedc0772eba619f7f2"; + }; + }; + "socks-1.1.10" = { + name = "socks"; + packageName = "socks"; + version = "1.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/socks/-/socks-1.1.10.tgz"; + sha1 = "5b8b7fc7c8f341c53ed056e929b7bf4de8ba7b5a"; + }; + }; + "socks-1.1.9" = { + name = "socks"; + packageName = "socks"; + version = "1.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/socks/-/socks-1.1.9.tgz"; + sha1 = "628d7e4d04912435445ac0b6e459376cb3e6d691"; + }; + }; + "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/socks-proxy-agent/-/socks-proxy-agent-2.1.1.tgz"; + sha512 = "33yfj0m61wn7g9s59m7mxhm6w91nkdrd7hcnnbacrj58zqgykpyr7f6lsggvc9xzysrf951ncxh4malqi11yf8z6909fasllxi6cnxh"; + }; + }; + "sodium-javascript-0.5.4" = { + name = "sodium-javascript"; + packageName = "sodium-javascript"; + version = "0.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sodium-javascript/-/sodium-javascript-0.5.4.tgz"; + sha512 = "1dqdzm0qjk1rwq62b010b649wdpvlzdxpmwc972p0dcwsc86wqfcm8lbdcxlrwypkn2jq5df1xpbxhxfphnpr993ac543p9s212si30"; + }; + }; + "sodium-native-2.1.4" = { + name = "sodium-native"; + packageName = "sodium-native"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.4.tgz"; + sha512 = "3d3bbjycbpplxgjpfz78vqr8g8hp62j37hr4c3vym7ax36qzxqan73fmqw2i3wd8ix65ysdlzbnzhrs3634ngp840gfpmm9alarc80j"; + }; + }; + "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"; + }; + }; + "sort-keys-1.1.2" = { + name = "sort-keys"; + packageName = "sort-keys"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz"; + sha1 = "441b6d4d346798f1b4e49e8920adfba0e543f9ad"; + }; + }; + "sort-keys-2.0.0" = { + name = "sort-keys"; + packageName = "sort-keys"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz"; + sha1 = "658535584861ec97d730d6cf41822e1f56684128"; + }; + }; + "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/sort-keys-length/-/sort-keys-length-1.0.1.tgz"; + sha1 = "9cb6f4f4e9e48155a6aa0671edd336ff1479a188"; + }; + }; "sort-on-2.0.0" = { name = "sort-on"; packageName = "sort-on"; @@ -26198,6 +22749,1194 @@ let sha1 = "0df42a679d7ae4aed9c30ba2f55807d979910fcc"; }; }; + "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-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"; + }; + }; + "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/sorted-union-stream/-/sorted-union-stream-1.0.2.tgz"; + sha1 = "558e7f57a5bf6baf6501baf2ae2c9076c4502006"; + }; + }; + "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/source-list-map/-/source-list-map-2.0.0.tgz"; + sha512 = "3q09f2w67qqhl3lwiisj4422mj9nfldg4cxmidfrjcwn3k7spm9g46x4n1j6kv39bi9khmcpyvfa3fwski488ibivyg9bwijjw2cr93"; + }; + }; + "source-map-0.1.31" = { + name = "source-map"; + packageName = "source-map"; + version = "0.1.31"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.1.31.tgz"; + sha1 = "9f704d0d69d9e138a81badf6ebb4fde33d151c61"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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.0" = { + name = "source-map-support"; + packageName = "source-map-support"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.0.tgz"; + sha512 = "3nwgpximc17yn0lfg8658fxkm2hwbpvnbx5x1g0qgqvjm3vzld96rh1gf6iw1srbkicp0m825sq92r9bnj2r2gl8ys0f7fzivf0sjmx"; + }; + }; + "source-map-support-0.5.1" = { + name = "source-map-support"; + packageName = "source-map-support"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.1.tgz"; + sha512 = "276x5a16yv0nlzjdvspsnbkxqhv8lvfj7a0sfzkaasfcwa2rm1ni3h3c0fva63bfqnazbywvs4pzrnbwg43j7gpymjd9cbbndq5x4qi"; + }; + }; + "source-map-support-0.5.2" = { + name = "source-map-support"; + packageName = "source-map-support"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.2.tgz"; + sha512 = "3hgzhp5z7w8w0sadaa0m7sspd2ihnba3j1rd7l53l1mvx4wjblrbjq2642zz0xxkv4bag4hs4pms7dz5rc8hk5d61d49h6hjrwxqcgp"; + }; + }; + "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/sparkles/-/sparkles-1.0.0.tgz"; + sha1 = "1acbbfb592436d10bbe8f785b7cc6f82815012c3"; + }; + }; + "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"; + }; + }; + "spawn-please-0.3.0" = { + name = "spawn-please"; + packageName = "spawn-please"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spawn-please/-/spawn-please-0.3.0.tgz"; + sha1 = "db338ec4cff63abc69f1d0e08cee9eb8bebd9d11"; + }; + }; + "spawn-sync-1.0.15" = { + name = "spawn-sync"; + packageName = "spawn-sync"; + version = "1.0.15"; + src = fetchurl { + url = "https://registry.npmjs.org/spawn-sync/-/spawn-sync-1.0.15.tgz"; + sha1 = "b00799557eb7fb0c8376c29d44e8a1ea67e57476"; + }; + }; + "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"; + }; + }; + "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/speedometer/-/speedometer-1.0.0.tgz"; + sha1 = "cd671cb06752c22bca3370e2f334440be4fc62e2"; + }; + }; + "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/split/-/split-0.3.3.tgz"; + sha1 = "cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"; + }; + }; + "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/srcset/-/srcset-1.0.0.tgz"; + sha1 = "a5669de12b42f3b1d5e83ed03c71046fc48f41ef"; + }; + }; + "srt2vtt-1.3.1" = { + name = "srt2vtt"; + packageName = "srt2vtt"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/srt2vtt/-/srt2vtt-1.3.1.tgz"; + sha1 = "c2b5047c2c297b693d3bab518765e4b7c24d8173"; + }; + }; + "ssh-config-1.1.3" = { + name = "ssh-config"; + packageName = "ssh-config"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ssh-config/-/ssh-config-1.1.3.tgz"; + sha1 = "2b19630af85b1666688b9d68f6e4218900f81f8c"; + }; + }; + "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/ssh-key-to-pem/-/ssh-key-to-pem-0.11.0.tgz"; + sha1 = "512675a28f08f1e581779e1989ab1e13effb49e4"; + }; + }; + "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"; + }; + }; + "sshpk-1.7.1" = { + name = "sshpk"; + packageName = "sshpk"; + version = "1.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.7.1.tgz"; + sha1 = "565e386c42a77e6062fbd14c0472ff21cd53398c"; + }; + }; + "sshpk-agent-1.2.1" = { + name = "sshpk-agent"; + packageName = "sshpk-agent"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk-agent/-/sshpk-agent-1.2.1.tgz"; + sha1 = "62e143c18530fda103320b3403e8ad42786d9718"; + }; + }; + "ssri-4.1.6" = { + name = "ssri"; + packageName = "ssri"; + version = "4.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/ssri/-/ssri-4.1.6.tgz"; + sha512 = "283n1p781cl2pj3jk32blcvwjdlaixng0v5x2f9qi3ndxrmyg3hk4clsjpcfsszkymy40q426yz5skax4ivsmll2p9hhcc00ivc4ijr"; + }; + }; + "stable-0.1.6" = { + name = "stable"; + packageName = "stable"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/stable/-/stable-0.1.6.tgz"; + sha1 = "910f5d2aed7b520c6e777499c1f32e139fdecb10"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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.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"; + }; + }; + "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.0" = { + name = "stream-http"; + packageName = "stream-http"; + version = "2.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-http/-/stream-http-2.8.0.tgz"; + sha512 = "2ghzil78wsr29z8p1883i0vwx9gpsspha4wvdbpvqzbknrfiavwis010i5a7vy0xx8n486f6kwmjxsk3mg1w4bjy4whvizriz28b4xi"; + }; + }; + "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-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"; + }; + }; + "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.0" = { + name = "string.prototype.codepointat"; + packageName = "string.prototype.codepointat"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.0.tgz"; + sha1 = "6b26e9bd3afcaa7be3b4269b526de1b82000ac78"; + }; + }; + "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"; + }; + }; + "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-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-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"; + }; + }; + "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"; + }; + }; + "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.1.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz"; + sha512 = "04q31rfgx0r6jgs2r1k6kmzab1vw3qrikiv8wsl86rxll77vdalrag7r4ypww3qp6v8k3avsjc0jxd3ga45fb5f51akm30a9b100ba7"; + }; + }; + "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.3.0" = { + name = "syntax-error"; + packageName = "syntax-error"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.3.0.tgz"; + sha1 = "1ed9266c4d40be75dc55bf9bb1cb77062bb96ca1"; + }; + }; + "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"; @@ -26207,6 +23946,448 @@ let 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"; + }; + }; + "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.3.0" = { + name = "tar"; + packageName = "tar"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-4.3.0.tgz"; + sha512 = "1844acixnz54bqf6q85avzdgq39i30d6gridz084iff0f3fh670wag8gs72k8dhbvmhxs2czlax99bfwypyfxbhrq3w80xb2kl5gbjd"; + }; + }; + "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.1" = { + name = "thriftrw"; + packageName = "thriftrw"; + version = "3.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/thriftrw/-/thriftrw-3.11.1.tgz"; + sha1 = "5a2f5165d665bb195e665e5b5b9f8897dac23acc"; + }; + }; + "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"; + }; + }; + "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.0" = { + name = "tiny-lr"; + packageName = "tiny-lr"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.0.tgz"; + sha512 = "06rjm9vpcs6h1890gzzj8pbn5k70724dz61qnk2fjwgiva4klx9zzwds5iidlgc31p7q41x6qz81pbbh116ap3jznqw07camvqzm1bz"; + }; + }; + "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.0" = { name = "titleize"; packageName = "titleize"; @@ -26216,6 +24397,2923 @@ let sha1 = "7d350722061830ba6617631e0cfd3ea08398d95a"; }; }; + "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.1" = { + name = "to-regex"; + packageName = "to-regex"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.1.tgz"; + sha1 = "15358bee4a2c83bd76377ba1dc049d0f18837aae"; + }; + }; + "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-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.3" = { + name = "torrent-stream"; + packageName = "torrent-stream"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/torrent-stream/-/torrent-stream-1.0.3.tgz"; + sha1 = "d8c043b44c3c448c9397a3aec42d2df55887037b"; + }; + }; + "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.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"; + }; + }; + "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-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-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-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"; + }; + }; + "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"; + }; + }; + "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.7" = { + name = "type-detect"; + packageName = "type-detect"; + version = "4.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/type-detect/-/type-detect-4.0.7.tgz"; + sha512 = "06b3944s70gv2pdbdkqpxp88izg727825j0lpdl0pdgs6p6nvpkzb034lycqin3a3nydd0jaafd86a991c78pabrqbd6m8cj3p7a671"; + }; + }; + "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.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"; + }; + }; + "typechecker-4.4.1" = { + name = "typechecker"; + packageName = "typechecker"; + version = "4.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/typechecker/-/typechecker-4.4.1.tgz"; + sha1 = "f97b95f51b038417212d677d45a373ee7bced7e6"; + }; + }; + "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"; + }; + }; + "typescript-2.4.2" = { + name = "typescript"; + packageName = "typescript"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-2.4.2.tgz"; + sha1 = "f8395f85d459276067c988aa41837a8f82870844"; + }; + }; + "typescript-2.6.2" = { + name = "typescript"; + packageName = "typescript"; + version = "2.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz"; + sha1 = "3c5b6fd7f6de0914269027f03c0946758f7673a4"; + }; + }; + "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-first-array-1.1.8" = { + name = "uc-first-array"; + packageName = "uc-first-array"; + version = "1.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/uc-first-array/-/uc-first-array-1.1.8.tgz"; + sha512 = "3gmz15f5f5yn43v5gv1039pkhd3wwwjfd9jd4f501qz01bdlxj5f2vkg4ddy0lv4h7902n2hgw2vdlmc4a578hsr2bij1xzq5pjfc1d"; + }; + }; + "uc.micro-1.0.3" = { + name = "uc.micro"; + packageName = "uc.micro"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.3.tgz"; + sha1 = "7ed50d5e0f9a9fb0a573379259f2a77458d50192"; + }; + }; + "ucfirst-1.0.0" = { + name = "ucfirst"; + packageName = "ucfirst"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ucfirst/-/ucfirst-1.0.0.tgz"; + sha1 = "4e105b6448d05e264ecec435e0b919363c5f2f2f"; + }; + }; + "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.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"; + }; + }; + "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.0.20" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "3.0.20"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.20.tgz"; + sha512 = "3apvpzjbs9vds18x8pxb8ysn94658xnajl5zfagr23xpbfhgbmlmajm0lnmz9h4jk99snzf51vcc1r0l0g4gmbdzcn574vvvzy3dxrv"; + }; + }; + "uglify-js-3.3.8" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "3.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.8.tgz"; + sha512 = "1vxvyq08n6jidg18kiph7m0bjzr4v1dh188b7zgj60mkv4x1qkqrgc8756drldaj3awmn71mwsxja0zhvdm8nqqw5finrajv8dc0j2z"; + }; + }; + "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-0.4.6" = { + name = "uglifyjs-webpack-plugin"; + packageName = "uglifyjs-webpack-plugin"; + version = "0.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz"; + sha1 = "b951f4abb6bd617e66f63eb891498e391763e309"; + }; + }; + "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-2.0.1" = { + name = "uint64be"; + packageName = "uint64be"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uint64be/-/uint64be-2.0.1.tgz"; + sha1 = "a310d94e4e5e0b02a95d678e33323f802bdc8428"; + }; + }; + "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.1" = { + name = "umd"; + packageName = "umd"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/umd/-/umd-3.0.1.tgz"; + sha1 = "8ae556e11011f63c2596708a8837259f01b3d60e"; + }; + }; + "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.1" = { + name = "undefsafe"; + packageName = "undefsafe"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.1.tgz"; + sha1 = "03b2f2a16c94556e14b2edef326cd66aaf82707a"; + }; + }; + "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-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"; + }; + }; + "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.2" = { + name = "upath"; + packageName = "upath"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/upath/-/upath-1.0.2.tgz"; + sha512 = "19nv38v416yy515gbq0lvg549w1m48mg17ibl9jp6g0pzlzg6j3lzygbw3c4ia2i9vk0ij0g4fcwfvsa9snxpgdk4a7qbprnj7s4abw"; + }; + }; + "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-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"; + }; + }; + "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-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-2.0.2" = { + name = "use"; + packageName = "use"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/use/-/use-2.0.2.tgz"; + sha1 = "ae28a0d72f93bf22422a18a2e379993112dec8e8"; + }; + }; + "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.2.1" = { + name = "useragent"; + packageName = "useragent"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/useragent/-/useragent-2.2.1.tgz"; + sha1 = "cf593ef4f2d175875e8bb658ea92e18a4fd06d8e"; + }; + }; + "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.6.2" = { + name = "utp-native"; + packageName = "utp-native"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/utp-native/-/utp-native-1.6.2.tgz"; + sha512 = "2mcnn6w5as2dvz6rj4fb33174z3a1rl9bm2cfazrr4084gq7aal0bkmkwr1cjpkvy1zgni3zdk0570fx7cmnd0k0hg18wfb2hvbigfg"; + }; + }; + "uue-3.1.1" = { + name = "uue"; + packageName = "uue"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uue/-/uue-3.1.1.tgz"; + sha512 = "29ykgvcsrhwbifm7aa4mf8876c6z2ksc26cnpxf3ljwhg7vfrjz2asvl7ylkjj91alnp2d7n1xvi5qphmn0a1ci091a20mdmnbzg91i"; + }; + }; + "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-0.14.5" = { + name = "uws"; + packageName = "uws"; + version = "0.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/uws/-/uws-0.14.5.tgz"; + sha1 = "67aaf33c46b2a587a5f6666d00f7691328f149dc"; + }; + }; + "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.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"; + }; + }; + "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"; + }; + }; + "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-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"; + }; + }; + "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.0.0" = { + name = "voc"; + packageName = "voc"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/voc/-/voc-1.0.0.tgz"; + sha512 = "1zss1rcd373slj9qjmy4zp7ann95isbkvjlrgp2dirpazvn1sy23hgnw6p72w0mj8hcgqpxvs0ls035zmb8isilqhqqpkmya9d3234r"; + }; + }; + "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-languageclient-3.5.0" = { + name = "vscode-languageclient"; + packageName = "vscode-languageclient"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-3.5.0.tgz"; + sha1 = "36d02cc186a8365a4467719a290fb200a9ae490a"; + }; + }; + "vscode-languageserver-3.5.0" = { + name = "vscode-languageserver"; + packageName = "vscode-languageserver"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.5.0.tgz"; + sha1 = "d28099bc6ddda8c1dd16b707e454e1b1ddae0dba"; + }; + }; + "vscode-languageserver-protocol-3.5.0" = { + name = "vscode-languageserver-protocol"; + packageName = "vscode-languageserver-protocol"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.5.0.tgz"; + sha1 = "067c5cbe27709795398d119692c97ebba1452209"; + }; + }; + "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-uri-1.0.1" = { + name = "vscode-uri"; + packageName = "vscode-uri"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.1.tgz"; + sha1 = "11a86befeac3c4aa3ec08623651a3c81a6d0bbc8"; + }; + }; + "walk-2.3.9" = { + name = "walk"; + packageName = "walk"; + version = "2.3.9"; + src = fetchurl { + url = "https://registry.npmjs.org/walk/-/walk-2.3.9.tgz"; + sha1 = "31b4db6678f2ae01c39ea9fb8725a9031e558a7b"; + }; + }; + "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.4.0" = { + name = "watchpack"; + packageName = "watchpack"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/watchpack/-/watchpack-1.4.0.tgz"; + sha1 = "4a1472bcbb952bd0a9bb4036801f954dfb39faac"; + }; + }; + "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.1" = { + name = "websocket-stream"; + packageName = "websocket-stream"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-5.1.1.tgz"; + sha512 = "18iw90ncl6cpip9j7rxdf6mag5klhhn7fklhb5lz41dy3wk9vxp3lxxkmwsnldjk5zfx3fjww55xg47k5k1a4cpph92k7j26p9kk56a"; + }; + }; + "whatwg-fetch-2.0.3" = { + name = "whatwg-fetch"; + packageName = "whatwg-fetch"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz"; + sha1 = "9c84ec2dcf68187ff00bc64e1274b442176e1c84"; + }; + }; + "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"; + }; + }; + "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-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"; + }; + }; + "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.0" = { + name = "winston"; + packageName = "winston"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/winston/-/winston-2.4.0.tgz"; + sha1 = "808050b93d52661ed9fb6c26b3f0c826708b0aee"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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.1" = { + name = "ws"; + packageName = "ws"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-1.1.1.tgz"; + sha1 = "082ddb6c641e85d4bb451f03d52f06eabdb1f018"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "xml-char-classes-1.0.0" = { + name = "xml-char-classes"; + packageName = "xml-char-classes"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xml-char-classes/-/xml-char-classes-1.0.0.tgz"; + sha1 = "64657848a20ffc5df583a42ad8a277b4512bbc4d"; + }; + }; + "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.4" = { + name = "xmlbuilder"; + packageName = "xmlbuilder"; + version = "9.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.4.tgz"; + sha1 = "519cb4ca686d005a8420d3496f3f0caeecca580f"; + }; + }; + "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.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"; + }; + }; + "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"; + }; + }; + "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.0.3" = { + name = "yargs"; + packageName = "yargs"; + version = "10.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-10.0.3.tgz"; + sha512 = "1vn6jsqrhybxddyhmvkh0d43n2lk1z8081glfq80zpjfs4xgwpk0mmgdiry9zgsihmv9a2qidmp5hhyqqq8mzzkr037wla0qd1nk80f"; + }; + }; + "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-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"; + }; + }; + "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"; @@ -26252,391 +27350,58 @@ let sha512 = "1n6z65vkm1r31a1ms8wn32m9q61vrlz9isn43lm00qka1zvnich78zbnp29xwy72z361is2yimrpglmc55w97hbi9pas5pqlnvqbpw4"; }; }; - "execa-0.6.3" = { - name = "execa"; - packageName = "execa"; - version = "0.6.3"; + "zen-observable-0.5.2" = { + name = "zen-observable"; + packageName = "zen-observable"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.6.3.tgz"; - sha1 = "57b69a594f081759c69e5370f0d17b9cb11658fe"; + url = "https://registry.npmjs.org/zen-observable/-/zen-observable-0.5.2.tgz"; + sha512 = "3sy4za4hd6lczig5ah6ksh92i4ds0pk9b8nn4nwjwpsyyabywrnayf78zh41jf7amm6khqyjb3iknbp2mc3nfgvpkvphj3a993py6hf"; }; }; - "filter-obj-1.1.0" = { - name = "filter-obj"; - packageName = "filter-obj"; - version = "1.1.0"; + "zeparser-0.0.5" = { + name = "zeparser"; + packageName = "zeparser"; + version = "0.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz"; - sha1 = "9b311112bc6c6127a16e016c6c5d7f19e0805c5b"; + url = "https://registry.npmjs.org/zeparser/-/zeparser-0.0.5.tgz"; + sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2"; }; }; - "p-any-1.1.0" = { - name = "p-any"; - packageName = "p-any"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-any/-/p-any-1.1.0.tgz"; - sha512 = "3da1hqkqhwx9xiw283nnq04pvsj1a69k7k0np5126v33dmpgxyhg19s99bz6djzd6sp713yg02h3h636wlgi9v2099rlrq2mrajvz8i"; - }; - }; - "p-try-1.0.0" = { - name = "p-try"; - packageName = "p-try"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz"; - sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; - }; - }; - "passwd-user-2.1.0" = { - name = "passwd-user"; - packageName = "passwd-user"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/passwd-user/-/passwd-user-2.1.0.tgz"; - sha1 = "fad9db6ae252f8b088e0c5decd20a7da0c5d9f1e"; - }; - }; - "p-some-2.0.0" = { - name = "p-some"; - packageName = "p-some"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-some/-/p-some-2.0.0.tgz"; - sha512 = "23lpz1jyj01f06bndx53w1k931l6ki6m94mgf9lqpxka3366q0w1ql0igm7bj5nc0imzdjv3x5825c05mjnhkgahw99hd0h1kk5ri0a"; - }; - }; - "aggregate-error-1.0.0" = { - name = "aggregate-error"; - packageName = "aggregate-error"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-1.0.0.tgz"; - sha1 = "888344dad0220a72e3af50906117f48771925fac"; - }; - }; - "clean-stack-1.3.0" = { - name = "clean-stack"; - packageName = "clean-stack"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/clean-stack/-/clean-stack-1.3.0.tgz"; - sha1 = "9e821501ae979986c46b1d66d2d432db2fd4ae31"; - }; - }; - "execa-0.4.0" = { - name = "execa"; - packageName = "execa"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.4.0.tgz"; - sha1 = "4eb6467a36a095fabb2970ff9d5e3fb7bce6ebc3"; - }; - }; - "cross-spawn-async-2.2.5" = { - name = "cross-spawn-async"; - packageName = "cross-spawn-async"; - version = "2.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz"; - sha1 = "845ff0c0834a3ded9d160daca6d390906bb288cc"; - }; - }; - "npm-run-path-1.0.0" = { - name = "npm-run-path"; - packageName = "npm-run-path"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-1.0.0.tgz"; - sha1 = "f5c32bf595fe81ae927daec52e82f8b000ac3c8f"; - }; - }; - "path-key-1.0.0" = { - name = "path-key"; - packageName = "path-key"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-key/-/path-key-1.0.0.tgz"; - sha1 = "5d53d578019646c0d68800db4e146e6bdc2ac7af"; - }; - }; - "execall-1.0.0" = { - name = "execall"; - packageName = "execall"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/execall/-/execall-1.0.0.tgz"; - sha1 = "73d0904e395b3cab0658b08d09ec25307f29bb73"; - }; - }; - "clone-regexp-1.0.0" = { - name = "clone-regexp"; - packageName = "clone-regexp"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/clone-regexp/-/clone-regexp-1.0.0.tgz"; - sha1 = "eae0a2413f55c0942f818c229fefce845d7f3b1c"; - }; - }; - "is-regexp-1.0.0" = { - name = "is-regexp"; - packageName = "is-regexp"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz"; - sha1 = "fd2d883545c46bac5a633e7b9a09e87fa2cb5069"; - }; - }; - "is-supported-regexp-flag-1.0.0" = { - name = "is-supported-regexp-flag"; - packageName = "is-supported-regexp-flag"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.0.tgz"; - sha1 = "8b520c85fae7a253382d4b02652e045576e13bb8"; - }; - }; - "downgrade-root-1.2.2" = { - name = "downgrade-root"; - packageName = "downgrade-root"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/downgrade-root/-/downgrade-root-1.2.2.tgz"; - sha1 = "531319715b0e81ffcc22eb28478ba27643e12c6c"; - }; - }; - "sudo-block-1.2.0" = { - name = "sudo-block"; - packageName = "sudo-block"; + "zip-1.2.0" = { + name = "zip"; + packageName = "zip"; version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/sudo-block/-/sudo-block-1.2.0.tgz"; - sha1 = "cc539bf8191624d4f507d83eeb45b4cea27f3463"; + url = "https://registry.npmjs.org/zip/-/zip-1.2.0.tgz"; + sha1 = "ad0ad42265309be42eb56fc86194e17c24e66a9c"; }; }; - "default-uid-1.0.0" = { - name = "default-uid"; - packageName = "default-uid"; - version = "1.0.0"; + "zip-dir-1.0.2" = { + name = "zip-dir"; + packageName = "zip-dir"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/default-uid/-/default-uid-1.0.0.tgz"; - sha1 = "fcefa9df9f5ac40c8916d912dd1fe1146aa3c59e"; + url = "https://registry.npmjs.org/zip-dir/-/zip-dir-1.0.2.tgz"; + sha1 = "253f907aead62a21acd8721d8b88032b2411c051"; }; }; - "is-root-1.0.0" = { - name = "is-root"; - packageName = "is-root"; - version = "1.0.0"; + "zip-object-0.1.0" = { + name = "zip-object"; + packageName = "zip-object"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-root/-/is-root-1.0.0.tgz"; - sha1 = "07b6c233bc394cd9d02ba15c966bd6660d6342d5"; + url = "https://registry.npmjs.org/zip-object/-/zip-object-0.1.0.tgz"; + sha1 = "c1a0da04c88c837756e248680a03ff902ec3f53a"; }; }; - "is-docker-1.1.0" = { - name = "is-docker"; - packageName = "is-docker"; - version = "1.1.0"; + "zip-stream-1.2.0" = { + name = "zip-stream"; + packageName = "zip-stream"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-docker/-/is-docker-1.1.0.tgz"; - sha1 = "f04374d4eee5310e9a8e113bf1495411e46176a1"; - }; - }; - "npmlog-2.0.4" = { - name = "npmlog"; - packageName = "npmlog"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/npmlog/-/npmlog-2.0.4.tgz"; - sha1 = "98b52530f2514ca90d09ec5b22c8846722375692"; - }; - }; - "gauge-1.2.7" = { - name = "gauge"; - packageName = "gauge"; - version = "1.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/gauge/-/gauge-1.2.7.tgz"; - sha1 = "e9cec5483d3d4ee0ef44b60a7d99e4935e136d93"; - }; - }; - "lodash.pad-4.5.1" = { - name = "lodash.pad"; - packageName = "lodash.pad"; - version = "4.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.5.1.tgz"; - sha1 = "4330949a833a7c8da22cc20f6a26c4d59debba70"; - }; - }; - "lodash.padend-4.6.1" = { - name = "lodash.padend"; - packageName = "lodash.padend"; - version = "4.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz"; - sha1 = "53ccba047d06e158d311f45da625f4e49e6f166e"; - }; - }; - "lodash.padstart-4.6.1" = { - name = "lodash.padstart"; - packageName = "lodash.padstart"; - version = "4.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.padstart/-/lodash.padstart-4.6.1.tgz"; - sha1 = "d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b"; - }; - }; - "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/bin-version-check/-/bin-version-check-2.1.0.tgz"; - sha1 = "e4e5df290b9069f7d111324031efc13fdd11a5b0"; - }; - }; - "each-async-1.1.1" = { - name = "each-async"; - packageName = "each-async"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/each-async/-/each-async-1.1.1.tgz"; - sha1 = "dee5229bdf0ab6ba2012a395e1b869abf8813473"; - }; - }; - "object-values-1.0.0" = { - name = "object-values"; - packageName = "object-values"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-values/-/object-values-1.0.0.tgz"; - sha1 = "72af839630119e5b98c3b02bb8c27e3237158105"; - }; - }; - "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"; - }; - }; - "bin-version-1.0.4" = { - name = "bin-version"; - packageName = "bin-version"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/bin-version/-/bin-version-1.0.4.tgz"; - sha1 = "9eb498ee6fd76f7ab9a7c160436f89579435d78e"; - }; - }; - "semver-truncate-1.1.2" = { - name = "semver-truncate"; - packageName = "semver-truncate"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/semver-truncate/-/semver-truncate-1.1.2.tgz"; - sha1 = "57f41de69707a62709a7e0104ba2117109ea47e8"; - }; - }; - "find-versions-1.2.1" = { - name = "find-versions"; - packageName = "find-versions"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/find-versions/-/find-versions-1.2.1.tgz"; - sha1 = "cbde9f12e38575a0af1be1b9a2c5d5fd8f186b62"; - }; - }; - "semver-regex-1.0.0" = { - name = "semver-regex"; - packageName = "semver-regex"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/semver-regex/-/semver-regex-1.0.0.tgz"; - sha1 = "92a4969065f9c70c694753d55248fc68f8f652c9"; - }; - }; - "grouped-queue-0.3.3" = { - name = "grouped-queue"; - packageName = "grouped-queue"; - version = "0.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/grouped-queue/-/grouped-queue-0.3.3.tgz"; - sha1 = "c167d2a5319c5a0e0964ef6a25b7c2df8996c85c"; - }; - }; - "is-scoped-1.0.0" = { - name = "is-scoped"; - packageName = "is-scoped"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-scoped/-/is-scoped-1.0.0.tgz"; - sha1 = "449ca98299e713038256289ecb2b540dc437cb30"; - }; - }; - "log-symbols-2.1.0" = { - name = "log-symbols"; - packageName = "log-symbols"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/log-symbols/-/log-symbols-2.1.0.tgz"; - sha512 = "36h090zjf2rfivlbhl50iymid2wggwncngy539cylicpdwrc3jvyqpxs2mmmybqjir313xs70vliczq511zypjx8jphvm006fpqpdyc"; - }; - }; - "mem-fs-1.1.3" = { - name = "mem-fs"; - packageName = "mem-fs"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/mem-fs/-/mem-fs-1.1.3.tgz"; - sha1 = "b8ae8d2e3fcb6f5d3f9165c12d4551a065d989cc"; - }; - }; - "scoped-regex-1.0.0" = { - name = "scoped-regex"; - packageName = "scoped-regex"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/scoped-regex/-/scoped-regex-1.0.0.tgz"; - sha1 = "a346bb1acd4207ae70bd7c0c7ca9e566b6baddb8"; - }; - }; - "vinyl-file-2.0.0" = { - name = "vinyl-file"; - packageName = "vinyl-file"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vinyl-file/-/vinyl-file-2.0.0.tgz"; - sha1 = "a7ebf5ffbefda1b7d18d140fcb07b223efb6751a"; - }; - }; - "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"; - }; - }; - "pad-component-0.0.1" = { - name = "pad-component"; - packageName = "pad-component"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pad-component/-/pad-component-0.0.1.tgz"; - sha1 = "ad1f22ce1bf0fdc0d6ddd908af17f351a404b8ac"; - }; - }; - "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"; + url = "https://registry.npmjs.org/zip-stream/-/zip-stream-1.2.0.tgz"; + sha1 = "a8bc45f4c1b49699c6b90198baacaacdbcd4ba04"; }; }; }; @@ -26645,13 +27410,18 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.10.10"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.10.10.tgz"; - sha512 = "130wmdphlwj27xss7wi4n3ygmcsl265k5qhv81s6njlhc9gkvx7j31iz5h0dcyckjdyl8sqqyk8vfbc55kr5q6k4xjc1lbz5chk2jg7"; + url = "https://registry.npmjs.org/alloy/-/alloy-1.11.0.tgz"; + sha512 = "0ix07a7vxyrlkplb3wxfpflg7yhcb9csh1k8410rjkrqmshviiiw8iwysf36936mrm5qz66v8mx5r9r7ky46zwi82mgdn66w0ag0865"; }; 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" @@ -26662,104 +27432,99 @@ in 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.12" - sources."ejs-2.3.4" - sources."fs-extra-3.0.1" - sources."global-paths-0.1.2" - (sources."jsonlint-1.5.1" // { - dependencies = [ - sources."chalk-0.4.0" - sources."ansi-styles-1.0.0" - sources."strip-ansi-0.1.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.6.1" - 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.1" - 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-1.1.3" - sources."esutils-2.0.2" - sources."js-tokens-3.0.2" - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - sources."ansi-regex-2.1.1" - sources."core-js-2.5.3" - 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.1" - sources."ms-2.0.0" - sources."brace-expansion-1.1.8" + sources."babel-traverse-6.26.0" + sources."babel-types-6.26.0" + sources."babylon-6.18.0" 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.8.0" - sources."graceful-fs-4.1.11" - sources."jsonfile-3.0.1" - sources."universalify-0.1.1" - sources."array-unique-0.2.1" + sources."brace-expansion-1.1.8" + sources."chalk-1.1.3" + sources."chmodr-1.0.2" + sources."colors-1.1.2" + sources."commander-2.13.0" + sources."concat-map-0.0.1" + sources."convert-source-map-1.5.1" + sources."core-js-2.5.3" + sources."deasync-0.1.12" + 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."is-windows-0.1.1" + 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."which-1.3.0" - sources."parse-passwd-1.0.0" + sources."invariant-2.2.2" + sources."is-3.2.1" + sources."is-finite-1.0.2" + sources."is-windows-1.0.1" 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."ensure-posix-path-1.0.2" + 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.4" + sources."loose-envify-1.3.1" sources."matcher-collection-1.0.5" - sources."xml2js-0.2.8" + 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."nan-2.8.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.5.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 = { @@ -26779,106 +27544,106 @@ in sha512 = "149a2ndf9hbminr1y95b9l9p7pprrsw2j05w1mbmr0gbm07sqa6vk4x91ws7clnzc80mli1mgnw9xl5mllqfmiynjdrmss6k9zncvcp"; }; dependencies = [ - sources."chromium-pickle-js-0.2.0" - sources."commander-2.12.2" - sources."cuint-0.2.2" - sources."glob-6.0.4" - sources."minimatch-3.0.4" - sources."mkdirp-0.5.1" - (sources."mksnapshot-0.3.1" // { - dependencies = [ - sources."glob-7.1.2" - ]; - }) - sources."tmp-0.0.28" - 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."minimist-0.0.8" - sources."decompress-zip-0.3.0" - sources."fs-extra-0.26.7" - sources."request-2.83.0" - sources."binary-0.3.0" - sources."graceful-fs-4.1.11" - sources."mkpath-0.1.0" - sources."nopt-3.0.6" - sources."q-1.5.1" - sources."readable-stream-1.1.14" - (sources."touch-0.0.3" // { - dependencies = [ - sources."nopt-1.0.10" - ]; - }) - sources."chainsaw-0.1.0" - sources."buffers-0.1.1" - sources."traverse-0.3.9" sources."abbrev-1.1.1" - sources."core-util-is-1.0.2" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" - sources."jsonfile-2.4.0" - sources."klaw-1.3.1" - sources."rimraf-2.6.2" - sources."fs.realpath-1.0.0" + 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.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."safe-buffer-5.1.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.5.2" - 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."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.8" + 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.5" + sources."commander-2.13.0" + 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."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."cuint-0.2.2" sources."dashdash-1.14.1" - sources."getpass-0.1.7" - sources."jsbn-0.1.1" - sources."tweetnacl-0.14.5" + sources."decompress-zip-0.3.0" + sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.1" + sources."extend-3.0.1" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.1" + 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.0" + 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.30.0" - sources."punycode-1.4.1" + sources."mime-types-2.1.17" + 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.83.0" + sources."rimraf-2.6.2" + sources."safe-buffer-5.1.1" + sources."sntp-2.1.0" + sources."sshpk-1.13.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.3" + 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 = { @@ -26898,126 +27663,164 @@ in sha1 = "e991dfa17dc5d7d91731180851fd9cbfbadf73c3"; }; dependencies = [ + sources."@types/form-data-2.2.1" + sources."@types/node-8.5.9" + sources."@types/request-2.0.13" + 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."azure-common-0.9.18" // { - dependencies = [ - sources."xml2js-0.2.7" - sources."validator-3.22.2" - ]; - }) + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.6.0" sources."azure-arm-authorization-2.0.0" - (sources."azure-arm-cdn-1.0.3" // { + (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."ms-rest-azure-1.15.7" - sources."ms-rest-1.15.7" 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."async-0.2.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."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-4.0.1" - (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-2.0.0-preview" - (sources."azure-arm-website-0.11.4" // { - dependencies = [ - sources."ms-rest-1.15.7" - sources."ms-rest-azure-1.15.7" - sources."async-0.2.7" - ]; - }) - (sources."azure-arm-rediscache-0.2.3" // { - dependencies = [ - sources."ms-rest-1.15.7" - sources."ms-rest-azure-1.15.7" - sources."async-0.2.7" ]; }) (sources."azure-arm-devtestlabs-0.1.0" // { dependencies = [ + sources."async-0.2.7" sources."ms-rest-1.15.7" sources."ms-rest-azure-1.15.7" - sources."async-0.2.7" ]; }) - sources."azure-graph-2.1.0-preview" - sources."azure-gallery-2.0.0-pre.18" - (sources."azure-keyvault-0.11.0" // { + sources."azure-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-4.0.1" + (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-trafficmanager-0.10.3" 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-asm-network-0.13.0" - (sources."azure-arm-resource-1.6.1-preview" // { + (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."async-0.2.7" - ]; - }) - (sources."azure-arm-storage-0.15.0-preview" // { - dependencies = [ - sources."ms-rest-1.15.7" - sources."ms-rest-azure-1.15.7" - sources."async-0.2.7" - ]; - }) - sources."azure-asm-sb-0.10.1" - sources."azure-asm-sql-0.10.1" - sources."azure-asm-storage-0.12.0" - sources."azure-asm-subscription-0.10.1" - (sources."azure-asm-website-0.10.4" // { - dependencies = [ - sources."moment-2.14.1" ]; }) (sources."azure-storage-2.1.0" // { @@ -27027,84 +27830,169 @@ in sources."xml2js-0.2.7" ]; }) - (sources."azure-arm-batch-0.3.0" // { - dependencies = [ - sources."ms-rest-1.15.7" - sources."ms-rest-azure-1.15.7" - sources."async-0.2.7" - ]; - }) - (sources."azure-batch-0.5.2" // { - dependencies = [ - sources."ms-rest-1.15.7" - sources."ms-rest-azure-1.15.7" - sources."async-0.2.7" - ]; - }) - (sources."azure-servicefabric-0.1.5" // { - dependencies = [ - sources."ms-rest-1.15.7" - sources."ms-rest-azure-1.15.7" - sources."async-0.2.7" - ]; - }) - sources."applicationinsights-0.16.0" + sources."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.8" + sources."browserify-mime-1.2.9" + sources."buffer-equal-constant-time-1.0.1" sources."caller-id-0.1.0" + sources."caseless-0.12.0" + sources."chalk-0.4.0" + sources."clone-1.0.3" + sources."co-4.6.0" sources."colors-1.1.2" + sources."combined-stream-1.0.5" sources."commander-1.0.4" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.0" + 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."github-0.1.6" + sources."fast-deep-equal-1.0.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.1" + 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.0" + 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-json-valid-2.17.1" + 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.15" // { dependencies = [ sources."commander-1.1.1" sources."streamline-0.4.11" ]; }) + sources."lodash-4.17.4" + sources."map-stream-0.1.0" + sources."md5.js-1.3.4" + sources."mime-db-1.30.0" + sources."mime-types-2.1.17" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" sources."moment-2.20.1" (sources."ms-rest-2.3.0" // { dependencies = [ + sources."extend-3.0.1" sources."moment-2.18.1" sources."request-2.83.0" sources."through-2.3.8" sources."tunnel-0.0.5" - sources."extend-3.0.1" ]; }) - (sources."ms-rest-azure-2.4.5" // { + (sources."ms-rest-azure-2.5.0" // { dependencies = [ + sources."adal-node-0.1.27" sources."async-2.5.0" - sources."adal-node-0.1.26" sources."moment-2.18.1" + 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."async-0.2.10" - sources."colors-0.6.2" ]; }) + 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" @@ -27112,48 +28000,71 @@ in }) (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.13.0" + 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."tunnel-agent-0.4.3" sources."readable-stream-2.0.6" - sources."async-2.6.0" - sources."chalk-1.1.3" - sources."commander-2.12.2" - sources."ansi-styles-2.2.1" - sources."strip-ansi-3.0.1" - 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."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.13.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."readable-stream-2.3.3" sources."string_decoder-1.0.3" - sources."caseless-0.11.0" ]; }) + sources."then-request-2.2.0" sources."through-2.3.4" + sources."tough-cookie-2.3.3" 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."uuid-3.1.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" @@ -27162,156 +28073,12 @@ in ]; }) sources."wordwrap-0.0.2" + sources."wrappy-1.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-1.2.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-0.10.31" - 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-0.4.0" - sources."has-color-0.1.7" - sources."ansi-styles-1.0.0" - sources."strip-ansi-0.1.1" - sources."@types/node-8.5.2" - sources."@types/request-2.0.9" - 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."aws-sign2-0.7.0" - sources."aws4-1.6.0" - sources."caseless-0.12.0" - sources."combined-stream-1.0.5" - 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."delayed-stream-1.0.0" - sources."asynckit-0.4.0" - sources."ajv-5.5.2" - 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-4.3.1" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) - 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."lodash-4.17.4" - sources."debug-0.7.4" - sources."q-0.9.7" - sources."pkginfo-0.4.1" - 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."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."bl-1.1.2" - sources."is-my-json-valid-2.17.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."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 = { @@ -27349,104 +28116,104 @@ in }; dependencies = [ sources."argparse-1.0.4" + sources."array-find-index-1.0.2" + sources."balanced-match-1.0.0" 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."graceful-fs-4.1.11" - sources."glob-7.1.2" - ]; - }) - sources."lodash-4.2.1" - (sources."promised-temp-0.1.0" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - sources."semver-5.4.1" - (sources."temp-0.8.3" // { - dependencies = [ - sources."rimraf-2.2.8" - ]; - }) - sources."glob-6.0.4" - sources."sprintf-js-1.0.3" + sources."brace-expansion-1.1.8" + 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.5.0" + sources."indent-string-2.1.0" + sources."inflight-1.0.6" + sources."inherits-2.0.3" 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.32.0" - sources."camelcase-keys-2.1.0" - sources."decamelize-1.2.0" + 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.32.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.1" 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."trim-newlines-1.0.0" - sources."camelcase-2.1.1" - sources."currently-unhandled-0.4.1" + sources."repeating-2.0.1" + sources."rimraf-2.6.2" + sources."semver-5.5.0" 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."sort-keys-1.1.2" + sources."sort-keys-length-1.0.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."sprintf-js-1.0.3" 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.1" - sources."jsonfile-2.4.0" - sources."klaw-1.3.1" - sources."path-is-absolute-1.0.1" - sources."rimraf-2.6.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."temp-0.8.3" // { + dependencies = [ + sources."rimraf-2.2.8" + ]; + }) + sources."trim-newlines-1.0.0" + sources."validate-npm-package-license-3.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."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 = { @@ -27460,23 +28227,45 @@ in browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "14.5.0"; + version = "15.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-14.5.0.tgz"; - sha512 = "3p941rcrmn44115ylbnq53sdsnfm08rlvckdbkrnxvl00ibis5sxyhgrx33vm8sfyb5vgbk8x4b0fv3vwirvd7frwbdmzigsjqcx9w0"; + url = "https://registry.npmjs.org/browserify/-/browserify-15.2.0.tgz"; + sha512 = "353sai3zpq5rmqrw5xqkmvxpm866zpv2kiqmp90qp506vij6zvdjrk1zhlpvwmdvsyfjm07q3z2gk5z8ndx2mg55x134pmnz4a34xi0"; }; dependencies = [ + sources."@browserify/acorn5-object-spread-5.0.1" sources."JSONStream-1.3.2" + sources."acorn-4.0.13" + sources."array-filter-0.0.1" + sources."array-map-0.0.0" + sources."array-reduce-0.0.0" + sources."asn1.js-4.9.2" sources."assert-1.4.1" - sources."browser-pack-6.0.2" + sources."astw-2.2.0" + sources."balanced-match-1.0.0" + sources."base64-js-1.2.1" + sources."bn.js-4.11.8" + sources."brace-expansion-1.1.8" + sources."brorand-1.1.0" + sources."browser-pack-6.0.3" (sources."browser-resolve-1.11.2" // { dependencies = [ sources."resolve-1.1.7" ]; }) + 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.0.8" + 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.5.2" // { dependencies = [ sources."readable-stream-2.0.6" @@ -27485,51 +28274,116 @@ in }) 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.0.2" + 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."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.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.1" // { + dependencies = [ + sources."combine-source-map-0.7.2" + ]; + }) + 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."module-deps-4.1.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-5.0.1" // { dependencies = [ - sources."acorn-5.2.1" + sources."acorn-5.3.0" + sources."concat-stream-1.6.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-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.3" sources."read-only-stream-2.0.0" sources."readable-stream-2.3.3" 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.7.2" + 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" + (sources."subarg-1.0.0" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) sources."syntax-error-1.3.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.0" + sources."typedarray-0.0.6" + sources."umd-3.0.1" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" @@ -27540,91 +28394,15 @@ in sources."inherits-2.0.1" ]; }) - 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-3.0.4" - 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."vm-browserify-0.0.4" 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.7.1" - 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."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; @@ -27639,324 +28417,324 @@ in sha1 = "4ffd81c55f381a5aa10c637607683a196830bdd8"; }; dependencies = [ + sources."addr-to-ip-port-1.4.2" + 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.0" + sources."bencode-1.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.6" + sources."bn.js-4.11.8" + sources."bncode-0.5.3" + sources."boom-0.3.8" + sources."brace-expansion-1.1.8" + sources."buffer-alloc-unsafe-1.0.0" + sources."buffer-equal-0.0.1" + sources."buffer-equals-1.0.4" + 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.13.0" + sources."compact2string-1.4.0" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.0" + 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."diveSync-0.3.0" - sources."got-1.2.2" - (sources."internal-ip-1.2.0" // { - dependencies = [ - sources."object-assign-4.1.1" - ]; - }) - sources."keypress-0.2.1" - sources."mime-1.6.0" - sources."minimist-1.2.0" - (sources."peerflix-0.34.0" // { - dependencies = [ - sources."debug-3.1.0" - sources."object-assign-4.1.1" - sources."minimist-0.0.10" - sources."get-stdin-5.0.1" - sources."once-1.2.0" - sources."end-of-stream-0.1.5" - sources."thunky-1.0.2" - sources."magnet-uri-4.2.3" - sources."parse-torrent-file-2.1.4" - sources."thirty-two-0.0.2" - sources."bencode-0.7.0" - sources."readable-stream-2.3.3" - sources."isarray-1.0.0" - sources."string_decoder-1.0.3" - sources."safe-buffer-5.0.1" - sources."ultron-1.0.2" - ]; - }) - (sources."playerui-1.2.0" // { - dependencies = [ - sources."chalk-0.5.1" - sources."ansi-styles-1.1.0" - 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."query-string-1.0.1" - sources."range-parser-1.2.0" - (sources."read-torrent-1.3.0" // { - dependencies = [ - sources."magnet-uri-2.0.1" - (sources."parse-torrent-4.1.0" // { - dependencies = [ - sources."magnet-uri-4.2.3" - ]; - }) - sources."thirty-two-0.0.2" - sources."parse-torrent-file-2.1.4" - sources."bencode-0.7.0" - sources."mime-1.2.11" - ]; - }) - sources."router-0.6.2" - (sources."srt2vtt-1.3.1" // { - dependencies = [ - sources."readable-stream-2.3.3" - sources."isarray-1.0.0" - sources."string_decoder-1.0.3" - ]; - }) - sources."stream-transcoder-0.0.5" - (sources."xml2js-0.4.19" // { - dependencies = [ - sources."xmlbuilder-9.0.4" - ]; - }) - 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-2.2.1" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-1.0.3" - sources."strip-ansi-2.0.1" - sources."supports-color-1.3.1" - sources."ansi-regex-1.1.1" - sources."get-stdin-4.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-0.1.0" - sources."wrap-fn-0.1.5" - sources."co-3.1.0" - sources."ms-2.0.0" - sources."append-0.1.1" - sources."object-assign-1.0.0" - 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.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."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-5.8.3" - sources."pump-0.3.5" - sources."rc-0.4.0" - (sources."torrent-stream-1.0.3" // { - dependencies = [ - sources."parse-torrent-4.1.0" - sources."once-1.3.3" - sources."minimist-0.0.8" - sources."debug-2.6.9" - sources."bencode-0.8.0" - ]; - }) - sources."windows-no-runnable-0.0.6" - sources."mdns-js-1.0.1" - sources."plist-2.1.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."qap-3.3.1" - sources."base64-js-1.2.0" - sources."xmlbuilder-8.2.2" - 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-5.1.7" - sources."parse-torrent-file-4.0.3" - sources."simple-get-2.7.0" - sources."safe-buffer-5.1.1" - sources."thirty-two-1.0.2" - sources."uniq-1.0.1" - sources."bencode-1.0.0" - sources."simple-sha1-2.1.0" - sources."rusha-0.8.9" - sources."decompress-response-3.3.0" - sources."once-1.4.0" - sources."simple-concat-1.0.0" - sources."mimic-response-1.0.0" - sources."wrappy-1.0.2" (sources."end-of-stream-1.0.0" // { dependencies = [ sources."once-1.3.3" ]; }) - 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.5.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.6.5" // { 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.5.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.5.4" + 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-1.0.0" + sources."k-bucket-2.0.1" + ]; + }) + sources."k-rpc-socket-1.7.2" + 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.0.3" + 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.0" (sources."peer-wire-swarm-0.12.1" // { 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.3" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.3" + 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.2.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-2.1.0" + sources."process-nextick-args-1.0.7" + 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-1.8.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.6" + sources."run-series-1.1.4" + sources."rusha-0.8.12" + 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-1.0.2" + sources."spdx-expression-parse-1.0.4" + sources."spdx-license-ids-1.2.2" + sources."speedometer-0.1.4" + (sources."srt2vtt-1.3.1" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.3" + sources."string_decoder-1.0.3" + ]; + }) + 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."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-1.1.14" - sources."core-util-is-1.0.2" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" - 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-0.6.0" - (sources."k-rpc-3.7.0" // { + (sources."torrent-stream-1.0.3" // { dependencies = [ - sources."k-bucket-2.0.1" - sources."bencode-1.0.0" + 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."lru-2.0.1" - sources."buffer-equal-0.0.1" - sources."k-rpc-socket-1.7.2" - 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" // { - dependencies = [ - sources."ws-2.3.1" - ]; - }) - sources."string2compact-1.2.2" - sources."ws-1.1.5" - sources."ipaddr.js-1.5.4" - sources."get-browser-rtc-1.0.2" - sources."process-nextick-args-1.0.7" - sources."util-deprecate-1.0.2" - sources."ultron-1.1.1" - 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."trim-newlines-1.0.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.12.2" sources."typedarray-0.0.6" - sources."sax-1.2.4" + 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.1" + sources."voc-1.0.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" // { + dependencies = [ + sources."xmlbuilder-9.0.4" + ]; + }) + sources."xmlbuilder-8.2.2" + sources."xmldom-0.1.27" + sources."xspfr-0.3.1" + sources."xtend-4.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -27967,6 +28745,26 @@ in production = true; bypassCache = false; }; + clean-css = nodeEnv.buildNodePackage { + name = "clean-css"; + packageName = "clean-css"; + version = "4.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-css/-/clean-css-4.1.9.tgz"; + sha1 = "35cee8ae7687a49b98034f70de00c4edd3826301"; + }; + 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"; @@ -27987,84 +28785,49 @@ in coinmon = nodeEnv.buildNodePackage { name = "coinmon"; packageName = "coinmon"; - version = "0.0.9"; + version = "0.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/coinmon/-/coinmon-0.0.9.tgz"; - sha512 = "3hzlrghgwyf65qhz9hm1w3np5djhjjl8f1v9bpa7bmqi3593q3i0589c6lbd493i802ai74pvdkx3zp6qb6r224nyz2jx80kqi5bvp6"; + url = "https://registry.npmjs.org/coinmon/-/coinmon-0.0.13.tgz"; + sha512 = "2q865h8b8fks806q7qhdm728xhcw684xv37fmlphqv0rdy5y7zfj9nffcnzjmlg5b2qgfrybdpp25q27pm26c4mnxl6lq7jdk7hr6f5"; }; dependencies = [ - sources."axios-0.17.1" - (sources."cfonts-1.1.3" // { - dependencies = [ - sources."commander-2.9.0" - ]; - }) - (sources."cli-table2-0.2.0" // { - dependencies = [ - sources."strip-ansi-3.0.1" - sources."ansi-regex-2.1.1" - ]; - }) - sources."commander-2.12.2" - sources."humanize-plus-1.8.2" - (sources."ora-1.3.0" // { - dependencies = [ - sources."chalk-1.1.3" - 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."follow-redirects-1.2.6" - sources."is-buffer-1.1.6" - sources."debug-3.1.0" - sources."ms-2.0.0" - sources."babel-runtime-6.22.0" - sources."chalk-1.0.0" - sources."change-case-3.0.0" - sources."window-size-0.3.0" - sources."core-js-2.5.3" - sources."regenerator-runtime-0.10.5" + sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-1.0.3" - sources."strip-ansi-2.0.1" - sources."supports-color-1.3.1" - sources."ansi-regex-1.1.1" - sources."get-stdin-4.0.1" - sources."camel-case-3.0.0" - sources."constant-case-2.0.0" - sources."dot-case-2.1.1" - sources."header-case-1.0.1" - sources."is-lower-case-1.1.3" - sources."is-upper-case-1.1.2" - sources."lower-case-1.1.4" - sources."lower-case-first-1.0.2" - sources."no-case-2.3.2" - sources."param-case-2.1.1" - sources."pascal-case-2.0.1" - sources."path-case-2.1.1" - sources."sentence-case-2.1.1" - sources."snake-case-2.1.0" - sources."swap-case-1.1.2" - sources."title-case-2.1.1" - sources."upper-case-1.1.3" - sources."upper-case-first-1.1.2" - sources."graceful-readlink-1.0.1" - sources."lodash-3.10.1" - sources."string-width-1.0.2" - sources."colors-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."axios-0.17.1" + sources."camelo-1.1.11" + sources."chalk-1.1.3" sources."cli-cursor-2.1.0" sources."cli-spinners-1.1.0" + sources."cli-table2-0.2.0" + sources."code-point-at-1.1.0" + sources."colors-1.1.2" + sources."commander-2.13.0" + sources."debug-3.1.0" + sources."emojic-1.1.14" + sources."emojilib-2.2.12" + sources."escape-string-regexp-1.0.5" + sources."follow-redirects-1.4.1" + sources."has-ansi-2.0.0" + sources."humanize-plus-1.8.2" + sources."is-buffer-1.1.6" + sources."is-fullwidth-code-point-1.0.0" + sources."iterate-object-1.3.2" + sources."lodash-3.10.1" sources."log-symbols-1.0.2" - sources."restore-cursor-2.0.0" - sources."onetime-2.0.1" - sources."signal-exit-3.0.2" sources."mimic-fn-1.1.0" + sources."ms-2.0.0" + sources."number-is-nan-1.0.1" + sources."onetime-2.0.1" + sources."ora-1.3.0" + sources."r-json-1.2.8" + sources."regex-escape-3.4.8" + 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-2.0.0" + sources."uc-first-array-1.1.8" + sources."ucfirst-1.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -28075,6 +28838,40 @@ in 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.0" + ]; + 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"; @@ -28084,92 +28881,98 @@ in sha1 = "2e8446d9493caafd870b1090785e7f03e2ae6a43"; }; dependencies = [ - sources."configstore-2.1.0" - sources."cordova-common-2.2.1" - (sources."cordova-lib-8.0.0" // { - dependencies = [ - sources."glob-7.1.1" - sources."nopt-4.0.1" - (sources."plist-2.0.1" // { - dependencies = [ - sources."base64-js-1.1.2" - ]; - }) - sources."q-1.0.1" - sources."shelljs-0.3.0" - sources."base64-js-1.2.1" - sources."isarray-1.0.0" - sources."hash-base-2.0.2" - sources."acorn-4.0.13" - sources."minimist-1.2.0" - sources."xmlbuilder-8.2.2" - sources."qs-6.3.2" - sources."uuid-3.1.0" - ]; - }) - sources."editor-1.0.0" - (sources."insight-0.8.4" // { - dependencies = [ - (sources."configstore-1.4.0" // { - dependencies = [ - sources."uuid-2.0.3" - ]; - }) - sources."uuid-3.1.0" - sources."mute-stream-0.0.5" - sources."minimist-1.2.0" - ]; - }) - sources."nopt-3.0.1" - (sources."update-notifier-0.5.0" // { - dependencies = [ - sources."configstore-1.4.0" - sources."object-assign-3.0.0" - sources."minimist-1.2.0" - ]; - }) - sources."dot-prop-3.0.0" - sources."graceful-fs-4.1.11" - sources."mkdirp-0.5.1" - sources."object-assign-4.1.1" - sources."os-tmpdir-1.0.2" - sources."osenv-0.1.4" - sources."uuid-2.0.3" - sources."write-file-atomic-1.3.4" - sources."xdg-basedir-2.0.0" - sources."is-obj-1.0.1" - sources."minimist-0.0.8" - sources."os-homedir-1.0.2" - sources."imurmurhash-0.1.4" - sources."slide-1.1.6" - sources."ansi-0.3.1" - sources."bplist-parser-0.1.1" - sources."cordova-registry-mapper-1.1.15" - sources."elementtree-0.1.6" - sources."glob-5.0.15" - sources."minimatch-3.0.4" - sources."plist-1.2.0" - sources."q-1.5.1" - sources."semver-5.4.1" - sources."shelljs-0.5.3" - sources."underscore-1.8.3" - sources."unorm-1.4.1" - sources."big-integer-1.6.26" - sources."sax-0.3.5" - sources."inflight-1.0.6" - sources."inherits-2.0.3" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."wrappy-1.0.2" - sources."brace-expansion-1.1.8" - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - sources."base64-js-0.0.8" - sources."xmlbuilder-4.0.0" - sources."xmldom-0.1.27" - sources."util-deprecate-1.0.2" - sources."lodash-3.10.1" + sources."JSONStream-1.3.2" + sources."abbrev-1.1.1" + sources."accepts-1.3.4" + sources."acorn-5.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.9.2" + 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.6.0" + sources."balanced-match-1.0.0" + sources."base64-js-0.0.8" + sources."bcrypt-pbkdf-1.0.1" + sources."big-integer-1.6.26" + 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.8" + sources."brorand-1.1.0" + sources."browser-pack-6.0.3" + (sources."browser-resolve-1.11.2" // { + dependencies = [ + sources."resolve-1.1.7" + ]; + }) + (sources."browserify-14.4.0" // { + dependencies = [ + sources."acorn-4.0.13" + sources."isarray-1.0.0" + ]; + }) + 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-transform-tools-1.7.0" + sources."browserify-zlib-0.1.4" + sources."buffer-5.0.8" + 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.5" + sources."commander-2.13.0" + sources."compressible-2.0.12" + sources."compression-1.7.1" + 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 = [ @@ -28179,106 +28982,330 @@ in }) (sources."cordova-js-4.2.2" // { dependencies = [ + sources."acorn-5.3.0" sources."isarray-0.0.1" - sources."acorn-5.2.1" ]; }) + (sources."cordova-lib-8.0.0" // { + dependencies = [ + sources."acorn-4.0.13" + sources."base64-js-1.2.1" + sources."combine-source-map-0.7.2" + 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."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."detect-indent-5.0.0" + sources."depd-1.1.2" (sources."dependency-ls-1.1.1" // { dependencies = [ sources."q-1.4.1" ]; }) - sources."init-package-json-1.10.1" - 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-1.0.0" // { - dependencies = [ - sources."uuid-3.0.1" - ]; - }) - sources."browserify-transform-tools-1.7.0" - sources."falafel-2.1.0" - sources."through-2.3.8" - sources."acorn-5.2.1" - sources."foreach-2.0.5" - sources."isarray-0.0.1" - sources."object-keys-1.0.11" - sources."cordova-app-hello-world-3.12.0" - sources."hosted-git-info-2.5.0" - sources."is-url-1.2.2" - sources."interpret-1.1.0" - sources."rechoir-0.6.2" - sources."resolve-1.5.0" - sources."path-parse-1.0.5" - (sources."browserify-14.4.0" // { - dependencies = [ - sources."isarray-1.0.0" - sources."acorn-4.0.13" - ]; - }) - sources."JSONStream-1.3.2" - sources."assert-1.4.1" - sources."browser-pack-6.0.2" - (sources."browser-resolve-1.11.2" // { - dependencies = [ - sources."resolve-1.1.7" - ]; - }) - sources."browserify-zlib-0.1.4" - sources."buffer-5.0.8" - sources."cached-path-relative-1.0.1" - (sources."concat-stream-1.5.2" // { - dependencies = [ - sources."readable-stream-2.0.6" - sources."string_decoder-0.10.31" - ]; - }) - sources."console-browserify-1.1.0" - sources."constants-browserify-1.0.0" - sources."crypto-browserify-3.12.0" - sources."defined-1.0.0" 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.3" + 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.2" + sources."extend-3.0.1" + sources."extsprintf-1.3.0" + sources."falafel-2.1.0" + sources."figures-1.7.0" + sources."finalhandler-1.1.0" + 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.5.0" sources."htmlescape-1.1.1" + (sources."http-errors-1.6.2" // { + dependencies = [ + sources."depd-1.1.1" + ]; + }) + sources."http-signature-1.1.1" sources."https-browserify-1.0.0" + sources."iconv-lite-0.4.19" + sources."ieee754-1.1.8" + 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.1" + sources."inline-source-map-0.6.2" + sources."inquirer-0.10.1" sources."insert-module-globals-7.0.1" + (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.5.2" + 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-json-valid-2.17.1" + 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.2" + sources."isarray-0.0.1" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-parse-better-errors-1.0.1" + 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.0" + 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.0" + 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.30.0" + sources."mime-types-2.1.17" + 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-5.1.2" + 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.4" + 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.2" + 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.3" + sources."range-parser-1.2.0" + sources."raw-body-2.3.2" + sources."rc-1.2.4" + 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.12" sources."readable-stream-2.3.3" + 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.5.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.1" + sources."serve-static-1.13.1" + sources."setprototypeof-1.1.0" + sources."sha.js-2.4.10" 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-1.0.2" + sources."spdx-expression-parse-1.0.4" + sources."spdx-license-ids-1.2.2" + (sources."sshpk-1.13.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."statuses-1.3.1" sources."stream-browserify-2.0.1" - sources."stream-http-2.7.2" + sources."stream-buffers-2.2.0" + sources."stream-combiner2-1.1.1" + sources."stream-http-2.8.0" + sources."stream-shift-1.0.0" + sources."stream-splicer-2.0.0" + sources."string-length-1.0.1" + sources."string.prototype.codepointat-0.2.0" 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.3.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.3" sources."tty-browserify-0.0.0" + sources."tunnel-agent-0.4.3" + sources."tweetnacl-0.14.5" + sources."type-is-1.6.15" + sources."typedarray-0.0.6" + sources."umd-3.0.1" + 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" @@ -28289,252 +29316,27 @@ in sources."inherits-2.0.1" ]; }) - 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-3.0.4" - 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.7.1" - 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" // { - dependencies = [ - sources."setprototypeof-1.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."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.5.1" - sources."range-parser-1.2.0" - sources."send-0.16.1" - sources."serve-static-1.13.1" - sources."setprototypeof-1.1.0" - sources."statuses-1.3.1" - sources."type-is-1.6.15" + sources."util-deprecate-1.0.2" 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."fs.realpath-1.0.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."uuid-2.0.3" + sources."valid-identifier-0.0.1" sources."validate-npm-package-license-3.0.1" sources."validate-npm-package-name-3.0.0" - sources."mute-stream-0.0.7" - 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.12.2" - sources."is-my-json-valid-2.17.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-0.2.0" - (sources."jsprim-1.4.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - sources."extsprintf-1.3.0" - sources."json-schema-0.2.3" + sources."vary-1.1.2" 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."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."vm-browserify-0.0.4" 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.5" - sources."strip-json-comments-2.0.1" - sources."is-finite-1.0.2" + 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 = { @@ -28569,28 +29371,96 @@ in dat = nodeEnv.buildNodePackage { name = "dat"; packageName = "dat"; - version = "13.9.2"; + version = "13.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/dat/-/dat-13.9.2.tgz"; - sha512 = "05x3ij83al1f0r7fiaq788q4k81vlbmydsa1g829pq0q6795p57b12mmmx8nvc8khbbv1iphr065c7h3d7kc9ylps39xn1qdg64jz90"; + 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.0" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.0" + 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.6.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.8" + (sources."braces-1.8.5" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."buffer-alloc-unsafe-1.0.0" + sources."buffer-equals-1.0.4" + sources."buffer-indexof-1.1.1" + sources."bulk-write-stream-1.1.3" sources."bytes-3.0.0" + sources."call-me-maybe-1.0.1" + sources."caseless-0.12.0" sources."chalk-2.3.0" sources."cli-truncate-1.1.0" + sources."cliclopts-1.1.1" + sources."co-4.6.0" + sources."codecs-1.2.0" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."colors-1.1.2" + sources."combined-stream-1.0.5" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.0" + 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."lru-2.0.1" + sources."pump-1.0.3" ]; }) - sources."dat-encoding-4.0.2" + sources."dat-encoding-5.0.1" + sources."dat-ignore-2.0.0" (sources."dat-json-1.0.1" // { dependencies = [ + sources."dat-encoding-4.0.2" sources."debug-2.6.9" ]; }) - (sources."dat-link-resolve-1.1.1" // { + (sources."dat-link-resolve-2.1.0" // { dependencies = [ sources."debug-2.6.9" ]; @@ -28598,63 +29468,22 @@ in sources."dat-log-1.1.1" (sources."dat-node-3.5.6" // { dependencies = [ - (sources."dat-link-resolve-2.1.0" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."dat-encoding-5.0.1" - sources."varint-5.0.0" - sources."readable-stream-1.0.34" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" sources."minimist-0.0.8" - sources."esprima-1.0.4" - sources."estraverse-1.3.2" - sources."object-keys-0.4.0" + sources."pump-1.0.3" sources."unordered-set-2.0.0" + sources."varint-5.0.0" ]; }) sources."dat-registry-4.0.0" - sources."debug-3.1.0" - (sources."neat-log-1.1.2" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."prettier-bytes-1.0.4" - sources."progress-string-1.2.2" - (sources."prompt-1.0.0" // { - dependencies = [ - sources."async-1.0.0" - ]; - }) - sources."pump-1.0.3" - sources."rimraf-2.6.2" - sources."speedometer-1.0.0" - (sources."subcommand-2.1.0" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - (sources."throttle-1.0.3" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."xtend-4.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."slice-ansi-1.0.0" - sources."string-width-2.1.1" - sources."is-fullwidth-code-point-2.0.0" - sources."strip-ansi-4.0.0" - sources."ansi-regex-3.0.0" + sources."dat-secret-storage-4.0.0" + sources."dat-storage-1.0.3" + 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.4.7" (sources."discovery-swarm-4.4.2" // { dependencies = [ sources."thunky-0.1.0" @@ -28665,133 +29494,53 @@ in sources."thunky-0.1.0" ]; }) - sources."minimist-1.2.0" - sources."thunky-1.0.2" - sources."ms-2.0.0" - sources."buffer-equals-1.0.4" - sources."connections-1.4.2" - sources."discovery-channel-5.4.6" - sources."length-prefixed-message-3.0.3" - sources."to-buffer-1.1.0" - sources."utp-native-1.6.2" - (sources."bittorrent-dht-7.8.2" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) - sources."pretty-hash-1.0.1" - sources."bencode-1.0.0" - sources."inherits-2.0.3" - sources."k-bucket-3.3.1" - sources."k-rpc-4.2.1" - sources."lru-3.1.0" - sources."randombytes-2.0.5" - sources."safe-buffer-5.1.1" - sources."simple-sha1-2.1.0" - sources."k-rpc-socket-1.7.2" - sources."rusha-0.8.9" - sources."varint-3.0.1" - sources."nan-2.8.0" - sources."node-gyp-build-3.2.2" - 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."util-deprecate-1.0.2" - sources."dns-socket-1.6.2" + sources."dns-packet-1.3.1" + sources."dns-socket-1.6.3" sources."dns-txt-2.0.2" - sources."multicast-dns-6.2.1" - sources."network-address-1.1.2" - sources."unordered-set-1.1.0" - sources."dns-packet-1.2.2" - sources."ip-1.1.5" - sources."buffer-indexof-1.1.1" - sources."toiletdb-1.4.0" - sources."last-one-wins-1.0.4" - sources."dat-dns-1.3.2" - sources."nets-3.2.0" - sources."call-me-maybe-1.0.1" - sources."concat-stream-1.6.0" - sources."typedarray-0.0.6" - sources."request-2.83.0" - sources."xhr-2.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."dom-walk-0.1.1" + sources."duplexify-3.5.3" + 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."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.5.2" - sources."har-schema-2.0.0" - sources."co-4.6.0" + sources."extglob-0.3.2" + sources."extsprintf-1.3.0" + sources."eyes-0.1.8" 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-4.3.1" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) - 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."global-4.3.2" - sources."is-function-1.0.1" - sources."parse-headers-2.0.1" - sources."min-document-2.19.0" - sources."process-0.5.2" - sources."dom-walk-0.1.1" + 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."trim-0.0.1" - sources."random-access-memory-2.4.0" - sources."dat-ignore-2.0.0" - (sources."dat-storage-1.0.3" // { + sources."for-in-1.0.2" + sources."for-own-0.1.5" + sources."forever-agent-0.6.1" + sources."form-data-2.3.1" + 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-2.0.0" + sources."hawk-6.0.2" + sources."hoek-4.2.0" + sources."http-methods-0.1.0" + sources."http-signature-1.2.0" + (sources."hypercore-6.12.0" // { dependencies = [ - sources."xtend-2.1.2" - sources."readable-stream-2.3.3" - sources."isarray-1.0.0" - sources."string_decoder-1.0.3" + sources."varint-5.0.0" ]; }) - sources."dat-swarm-defaults-1.0.0" - (sources."hyperdrive-9.12.0" // { + sources."hypercore-protocol-6.5.2" + (sources."hyperdrive-9.12.2" // { dependencies = [ - sources."readable-stream-2.3.3" - sources."isarray-1.0.0" - sources."string_decoder-1.0.3" sources."varint-4.0.1" ]; }) @@ -28801,48 +29550,103 @@ in sources."debug-2.6.9" ]; }) - (sources."mirror-folder-2.1.1" // { + 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.2.1" + sources."k-rpc-socket-1.7.2" + 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.30.0" + sources."mime-types-2.1.17" + 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-6.2.2" + sources."multicb-1.2.2" + sources."mute-stream-0.0.7" + sources."mutexify-1.2.0" + sources."nan-2.8.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."readable-stream-2.3.3" - sources."isarray-1.0.0" - sources."string_decoder-1.0.3" + sources."ansi-regex-2.1.1" ]; }) - sources."multicb-1.2.2" + sources."nets-3.2.0" + sources."network-address-1.1.2" + sources."node-gyp-build-3.2.2" + 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-1.0.7" + 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-1.8.1" // { dependencies = [ sources."debug-2.6.9" ]; }) - sources."sparse-bitfield-3.0.3" - sources."stream-each-1.2.2" - sources."untildify-3.0.2" - sources."anymatch-1.3.2" - 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" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) - sources."expand-brackets-0.1.5" - sources."extglob-0.3.2" - sources."filename-regex-2.0.1" - sources."is-extglob-1.0.0" - sources."is-glob-2.0.1" - sources."kind-of-3.2.2" - sources."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-2.1.0" - sources."isobject-2.1.0" + sources."random-access-memory-2.4.0" (sources."randomatic-1.1.7" // { dependencies = [ (sources."is-number-3.0.0" // { @@ -28852,157 +29656,87 @@ in }) ]; }) - 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."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."randombytes-2.0.6" + sources."range-parser-1.2.0" + sources."read-1.0.7" + sources."readable-stream-2.3.3" + sources."recursive-watch-1.1.2" + sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" - (sources."append-tree-2.4.0" // { + sources."repeat-element-1.1.2" + sources."repeat-string-1.6.1" + sources."request-2.83.0" + sources."revalidator-0.1.8" + sources."rimraf-2.6.2" + sources."rusha-0.8.12" + 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.4" + sources."sodium-native-2.1.4" + 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.13.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.0.3" + sources."stringstream-0.0.5" + sources."strip-ansi-4.0.0" + (sources."subcommand-2.1.0" // { dependencies = [ - sources."xtend-4.0.1" + sources."debug-2.6.9" ]; }) - sources."dat-secret-storage-4.0.0" - sources."multi-random-access-2.1.1" - sources."array-lru-1.1.1" - sources."brfs-1.4.3" - sources."codecs-1.2.0" - sources."from2-2.3.0" - sources."mutexify-1.2.0" - sources."protocol-buffers-3.2.1" - sources."quote-stream-1.0.2" - sources."resolve-1.5.0" - (sources."static-module-1.5.0" // { + sources."supports-color-4.5.0" + (sources."throttle-1.0.3" // { dependencies = [ - sources."quote-stream-0.0.0" - sources."through2-0.4.2" + sources."debug-2.6.9" ]; }) sources."through2-2.0.3" - sources."buffer-equal-0.0.1" - sources."path-parse-1.0.5" - (sources."duplexer2-0.0.2" // { - dependencies = [ - sources."readable-stream-1.1.14" - ]; - }) - sources."escodegen-1.3.3" - sources."falafel-2.1.0" - sources."has-1.0.1" - sources."object-inspect-0.4.0" - sources."shallow-copy-0.0.1" - (sources."static-eval-0.2.4" // { - dependencies = [ - sources."escodegen-0.0.28" - ]; - }) - sources."esutils-1.0.0" - sources."estraverse-1.5.1" - sources."esprima-1.1.1" - sources."source-map-0.1.43" - sources."amdefine-1.0.1" - sources."acorn-5.2.1" - sources."foreach-2.0.5" - sources."object-keys-1.0.11" - sources."function-bind-1.1.1" - sources."generate-function-2.0.0" - sources."generate-object-property-1.2.0" - sources."protocol-buffers-schema-3.3.2" - sources."signed-varint-2.0.1" - sources."is-property-1.0.2" - sources."os-homedir-1.0.2" - sources."abstract-random-access-1.1.2" - sources."sorted-array-functions-1.0.0" - sources."duplexify-3.5.1" - (sources."hypercore-6.11.0" // { - dependencies = [ - sources."varint-5.0.0" - ]; - }) - sources."sodium-universal-2.0.0" - sources."stream-collector-1.0.1" + sources."thunky-1.0.2" + sources."to-buffer-1.1.0" + sources."toiletdb-1.4.1" + sources."tough-cookie-2.3.3" + 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.1" sources."unixify-1.0.0" - sources."end-of-stream-1.4.0" - sources."stream-shift-1.0.0" - sources."once-1.4.0" - sources."wrappy-1.0.2" - sources."atomic-batcher-1.0.2" - sources."bitfield-rle-2.1.0" - sources."bulk-write-stream-1.1.3" - sources."flat-tree-1.6.0" - sources."hypercore-protocol-6.4.2" - sources."memory-pager-1.1.0" - sources."merkle-tree-stream-3.0.3" sources."unordered-array-remove-1.0.2" - sources."sorted-indexof-1.0.0" - sources."sodium-javascript-0.5.4" - sources."sodium-native-2.1.2" - sources."blake2b-2.1.2" - sources."nanoassert-1.1.0" - sources."siphash24-1.1.0" - sources."xsalsa20-1.0.2" - sources."blake2b-wasm-1.1.4" - sources."base64-to-uint8array-1.0.0" - sources."corsify-2.1.0" - sources."directory-index-html-2.1.0" - sources."mime-1.6.0" - sources."range-parser-1.2.0" - sources."http-methods-0.1.0" - sources."content-types-0.1.0" - sources."body-0.1.0" - sources."iterators-0.1.0" - sources."ap-0.1.0" - sources."fd-read-stream-1.1.0" - sources."recursive-watch-1.1.2" - sources."ttl-1.3.1" - sources."buffer-alloc-unsafe-1.0.0" - sources."mkdirp-0.5.1" - sources."township-client-1.3.2" - sources."is-string-1.0.4" - sources."lodash.throttle-4.1.1" - sources."nanobus-3.3.0" - sources."status-logger-3.1.1" - sources."nanotiming-1.0.1" - sources."ansi-diff-stream-1.2.0" - sources."lodash.flattendeep-4.4.0" - sources."wrap-ansi-3.0.1" - sources."colors-1.1.2" - sources."pkginfo-0.4.1" - sources."read-1.0.7" - sources."revalidator-0.1.8" + 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.6.2" + 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."mute-stream-0.0.7" - sources."async-0.9.2" - sources."deep-equal-0.2.2" - sources."i-0.3.6" - sources."ncp-1.0.1" - sources."cycle-1.0.3" - sources."eyes-0.1.8" - sources."stack-trace-0.0.10" - 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."cliclopts-1.1.1" - sources."stream-parser-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 = { @@ -29042,16 +29776,58 @@ in 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-types-2.0.14" 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.9" + 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" @@ -29059,112 +29835,70 @@ in 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.30.0" + sources."mime-types-2.1.17" + sources."minimist-0.0.10" + sources."ms-0.7.0" + sources."nan-2.8.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-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" // { - dependencies = [ - sources."async-0.2.10" - ]; - }) - (sources."superagent-0.21.0" // { - dependencies = [ - sources."qs-1.2.0" - sources."methods-1.0.1" - ]; - }) - 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.1.3" - 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."media-typer-0.3.0" - sources."methods-1.1.2" - 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-2.3.3" - 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.1.17" - sources."negotiator-0.5.3" - sources."mime-db-1.30.0" - sources."ms-0.7.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.8.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" // { dependencies = [ sources."native-dns-packet-git+https://github.com/okTurtles/native-dns-packet.git#307e77a47ebba57a5ae9118a284e916e5ebb305a" ]; }) - 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.4.0" - sources."async-0.9.2" - sources."ini-1.3.5" + 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."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."parseurl-1.3.2" + sources."path-to-regexp-0.1.3" + sources."pause-stream-0.0.11" 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."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."combined-stream-0.0.7" - sources."delayed-stream-0.0.5" - sources."isarray-0.0.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."inherits-2.0.3" + (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 = { @@ -29185,20 +29919,39 @@ in }; dependencies = [ sources."JSONStream-0.8.4" + sources."abstract-leveldown-0.12.4" sources."basic-auth-1.1.0" - sources."cookie-signature-1.0.6" + 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."end-of-stream-1.4.0" + sources."duplexify-3.5.3" + sources."end-of-stream-1.4.1" + (sources."errno-0.1.6" // { + dependencies = [ + sources."prr-1.0.1" + ]; + }) sources."from2-1.3.0" (sources."fs-blob-store-5.2.1" // { dependencies = [ - sources."readable-stream-2.3.3" sources."isarray-1.0.0" + sources."readable-stream-2.3.3" sources."string_decoder-1.0.3" ]; }) + 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.5" (sources."level-sublevel-6.6.1" // { dependencies = [ (sources."levelup-0.19.1" // { @@ -29206,8 +29959,8 @@ in sources."xtend-3.0.0" ]; }) - sources."readable-stream-1.0.34" sources."looper-3.0.0" + sources."readable-stream-1.0.34" ]; }) sources."leveldown-0.10.6" @@ -29219,6 +29972,9 @@ in ]; }) 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" @@ -29230,87 +29986,69 @@ in sources."minimist-0.0.8" ]; }) + sources."murl-0.4.1" + sources."nan-2.1.0" (sources."ndjson-1.5.0" // { dependencies = [ - sources."minimist-1.2.0" - sources."split2-2.2.0" - sources."through2-2.0.3" - sources."readable-stream-2.3.3" sources."isarray-1.0.0" + sources."minimist-1.2.0" + sources."readable-stream-2.3.3" + sources."split2-2.2.0" sources."string_decoder-1.0.3" + 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-1.0.7" + sources."protein-0.5.0" + sources."prr-0.0.0" + sources."pull-cat-1.1.11" + sources."pull-level-2.0.3" + sources."pull-live-1.0.1" + sources."pull-pushable-2.1.2" + sources."pull-stream-3.6.1" + sources."pull-window-2.1.4" sources."pump-1.0.3" - sources."pumpify-1.3.5" + (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.1" - sources."readable-stream-2.3.3" sources."isarray-1.0.0" + sources."readable-stream-2.3.3" sources."string_decoder-1.0.3" ]; }) + sources."through-2.3.8" (sources."through2-0.6.5" // { dependencies = [ sources."readable-stream-1.0.34" ]; }) sources."thunky-0.1.0" - sources."xtend-4.0.1" - sources."jsonparse-0.0.5" - sources."through-2.3.8" - sources."object-assign-4.1.1" - sources."vary-1.1.2" - sources."once-1.4.0" - sources."wrappy-1.0.2" - sources."inherits-2.0.3" - 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."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-2.1.3" - 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-0.8.2" - sources."deferred-leveldown-0.2.0" - (sources."errno-0.1.6" // { - dependencies = [ - sources."prr-1.0.1" - ]; - }) - sources."prr-0.0.0" - sources."semver-5.1.1" - 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-2.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."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 = { @@ -29331,86 +30069,85 @@ in }; dependencies = [ sources."JSONStream-1.3.2" - sources."async-2.6.0" - sources."aws4-1.6.0" - sources."aws-sdk-2.173.0" - sources."ini-1.3.5" - sources."optimist-0.6.1" - (sources."request-2.83.0" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - 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.3.2" - 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.5.2" - 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."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."async-2.6.0" + sources."asynckit-0.4.0" + sources."aws-sdk-2.187.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.6.0" + sources."base64-js-1.2.1" + 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.5" + sources."core-util-is-1.0.2" (sources."cryptiles-3.1.2" // { dependencies = [ sources."boom-5.2.0" ]; }) - 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."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.1" + sources."events-1.1.1" + sources."extend-3.0.1" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.1" + 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.0" + 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.4" sources."mime-db-1.30.0" + sources."mime-types-2.1.17" + 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.83.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.13.1" + sources."stringstream-0.0.5" + sources."through-2.3.8" + sources."tough-cookie-2.3.3" + 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 = { @@ -29430,143 +30167,148 @@ in 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.6.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."supports-color-2.0.0" 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.8" + (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.0" ]; }) sources."chokidar-1.6.0" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."combined-stream-1.0.5" + sources."commander-2.13.0" + 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."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" // { - dependencies = [ - sources."lodash-4.14.2" - sources."firstline-1.2.0" - sources."rimraf-2.2.8" - ]; - }) - sources."split-1.0.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."for-in-1.0.2" + sources."for-own-0.1.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."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.12.2" - sources."is-my-json-valid-2.17.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."ansi-regex-2.1.1" + 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."jsonpointer-4.0.1" - sources."xtend-4.0.1" - sources."is-property-1.0.2" - sources."pinkie-2.0.4" + 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."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - sources."assert-plus-0.2.0" + 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-json-valid-2.17.1" + 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."sshpk-1.13.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - 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.6.2" - 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" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) - 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."klaw-1.3.1" + sources."lodash-4.13.1" + sources."lru-cache-4.1.1" + sources."micromatch-2.3.11" + sources."mime-db-1.30.0" + sources."mime-types-2.1.17" + 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.8.0" + (sources."node-elm-compiler-4.3.3" // { + dependencies = [ + sources."firstline-1.2.0" + sources."lodash-4.14.2" + sources."rimraf-2.2.8" + ]; + }) + 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."regex-cache-0.4.4" - sources."arr-flatten-1.1.0" - sources."expand-range-1.8.2" + sources."path-is-absolute-1.0.1" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" sources."preserve-0.2.0" - sources."repeat-element-1.1.2" - sources."fill-range-2.2.3" - sources."is-number-2.1.0" - sources."isobject-2.1.0" + sources."process-nextick-args-1.0.7" + sources."pseudomap-1.0.2" + sources."punycode-1.4.1" + sources."qs-6.3.2" (sources."randomatic-1.1.7" // { dependencies = [ (sources."is-number-3.0.0" // { @@ -29576,46 +30318,41 @@ in }) ]; }) - 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.11.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."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.13.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) 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.8.0" - sources."fs.realpath-1.0.0" - sources."inflight-1.0.6" - sources."once-1.4.0" - sources."wrappy-1.0.2" - sources."find-elm-dependencies-1.0.2" + 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."os-tmpdir-1.0.2" sources."through-2.3.8" - sources."has-flag-2.0.0" + sources."tough-cookie-2.3.3" + 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 = { @@ -29635,208 +30372,209 @@ in sha512 = "06w3hpcnxg63wg262ldhw4s2shyr1f1bvilqshy88i4svamgxk0qzdhhma2rwcwq7qpjwjlr8m1z2qbmqw9faff5f8hl45yj3jxrs3z"; }; dependencies = [ - sources."auto-bind-1.1.0" - sources."clipboardy-1.2.2" - 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."ansi-regex-2.1.1" - ]; - }) - (sources."ink-0.3.1" // { - dependencies = [ - sources."chalk-2.3.0" - sources."ansi-styles-3.2.0" - sources."supports-color-4.5.0" - sources."strip-ansi-4.0.0" - sources."core-js-1.2.7" - ]; - }) - sources."ink-text-input-1.1.1" - sources."lodash.debounce-4.0.8" - sources."mem-1.1.0" - (sources."meow-3.7.0" // { - dependencies = [ - sources."minimist-1.2.0" - sources."find-up-1.1.2" - sources."path-exists-2.1.0" - sources."pify-2.3.0" - sources."indent-string-2.1.0" - ]; - }) - sources."skin-tone-1.0.0" - sources."arch-2.1.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-3.0.0" - sources."find-up-2.1.0" - sources."locate-path-2.0.0" - sources."p-locate-2.0.0" - sources."path-exists-3.0.0" - sources."p-limit-1.1.0" - sources."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.1" - 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-escapes-3.0.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.0" + 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."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.1" - 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-1.1.3" - sources."esutils-2.0.2" - sources."js-tokens-3.0.2" - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.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-2.5.3" - 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.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-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."brace-expansion-1.1.8" + sources."builtin-modules-1.1.1" sources."caller-callsite-2.0.0" + sources."caller-path-2.0.0" sources."callsites-2.0.0" - sources."arrify-1.0.1" + 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.2" + 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.3" + 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-2.0.0" + sources."has-symbol-support-x-1.4.1" + sources."has-to-string-tag-x-1.4.1" + sources."home-or-tmp-2.0.0" + sources."hosted-git-info-2.5.0" + sources."iconv-lite-0.4.19" + (sources."import-jsx-1.3.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."has-ansi-2.0.0" + ]; + }) + sources."imurmurhash-0.1.4" sources."indent-string-3.2.0" + (sources."ink-0.3.1" // { + dependencies = [ + sources."ansi-styles-3.2.0" + sources."chalk-2.3.0" + sources."core-js-1.2.7" + sources."strip-ansi-4.0.0" + sources."supports-color-4.5.0" + ]; + }) + sources."ink-text-input-1.1.1" + sources."invariant-2.2.2" + 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.4" + 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."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."loose-envify-1.3.1" sources."loud-rejection-1.6.0" + sources."lowercase-keys-1.0.0" + sources."lru-cache-4.1.1" + sources."make-dir-1.1.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.1.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.0" + sources."pseudomap-1.0.2" + sources."read-pkg-1.1.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."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."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-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."string-width-2.1.1" + 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-eof-1.0.0" sources."strip-indent-1.0.1" - sources."get-stdin-4.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.1" + sources."whatwg-fetch-2.0.3" + 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 = { @@ -29850,160 +30588,161 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "4.13.1"; + version = "4.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.13.1.tgz"; - sha512 = "1zhzyi5ajjmgx37845pnkkvq366jzpnfsq3q52ai98xg3jmf813yrf919r28j7gh3irnm921r553yrh0aghsx8srkcb3d0ikmbma8jh"; + url = "https://registry.npmjs.org/eslint/-/eslint-4.16.0.tgz"; + sha512 = "330nda1zwh0sqsxsfmlmhbg903gz6n9n4zy870gc2k95wrg1bc7jysfyn98nk2bd8p821xszpygp1vs1i7csapxfb3q2dp1n3hxamb1"; }; dependencies = [ + sources."acorn-5.3.0" + (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.0.0" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."argparse-1.0.9" + 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.8" + sources."caller-path-0.1.0" + sources."callsites-0.2.0" (sources."chalk-2.3.0" // { dependencies = [ sources."ansi-styles-3.2.0" sources."supports-color-4.5.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.0" + sources."core-util-is-1.0.2" sources."cross-spawn-5.1.0" sources."debug-3.1.0" - sources."doctrine-2.0.2" + 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.2" + sources."esprima-4.0.0" sources."esquery-1.0.0" + sources."esrecurse-4.2.0" sources."estraverse-4.2.0" sources."esutils-2.0.2" + sources."external-editor-2.1.0" + sources."fast-deep-equal-1.0.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.1.0" + sources."globals-11.2.0" + sources."globby-5.0.0" + sources."graceful-fs-4.1.11" + sources."has-ansi-2.0.0" + sources."has-flag-2.0.0" + sources."iconv-lite-0.4.19" 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-resolvable-1.0.1" + sources."is-fullwidth-code-point-2.0.0" + sources."is-path-cwd-1.0.0" + sources."is-path-in-cwd-1.0.0" + 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.10.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.4" + sources."lru-cache-4.1.1" + sources."mimic-fn-1.1.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-1.0.7" sources."progress-2.0.0" + sources."pseudomap-1.0.2" + sources."readable-stream-2.3.3" sources."require-uncached-1.0.3" - sources."semver-5.4.1" + 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."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.0.3" (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."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-2.2.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."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."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."ms-2.0.0" - sources."esrecurse-4.2.0" - sources."object-assign-4.1.1" - sources."acorn-5.2.1" - (sources."acorn-jsx-3.0.1" // { - dependencies = [ - sources."acorn-3.3.0" - ]; - }) - 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.1" - 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.1.0" - 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."chardet-0.4.2" - sources."iconv-lite-0.4.19" 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."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."deep-is-0.1.3" + sources."typedarray-0.0.6" + sources."util-deprecate-1.0.2" + sources."which-1.3.0" 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" + sources."wrappy-1.0.2" + sources."write-0.2.1" + sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; meta = { @@ -30017,19 +30756,62 @@ in eslint_d = nodeEnv.buildNodePackage { name = "eslint_d"; packageName = "eslint_d"; - version = "5.2.1"; + version = "5.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/eslint_d/-/eslint_d-5.2.1.tgz"; - sha512 = "34bi29ay098nrgv3vqardbkc6w1q9g7bf8231919ivnr8br41w0s9r91j97chpx0mnqca8d41qlrqxy34mwd37qnlyk1iplzm7m38nl"; + url = "https://registry.npmjs.org/eslint_d/-/eslint_d-5.2.2.tgz"; + sha512 = "32h5278qn4pnlm2wl573mhg112diqpiazr07vxj0la2qwc3a1dlva5gsbyypnbnsis7r05kcx173qhb4wdl9w8spc7g3zk1575ciirc"; }; dependencies = [ + sources."acorn-5.3.0" + (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.0.0" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."argparse-1.0.9" + 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.8" + sources."caller-path-0.1.0" + sources."callsites-0.2.0" (sources."chalk-1.1.3" // { dependencies = [ sources."supports-color-2.0.0" ]; }) - (sources."eslint-4.13.1" // { + 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.0" + 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.16.0" // { dependencies = [ + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.0" (sources."chalk-2.3.0" // { dependencies = [ sources."supports-color-4.5.0" @@ -30037,154 +30819,112 @@ in }) sources."strip-ansi-4.0.0" sources."supports-color-2.0.0" - sources."ansi-styles-3.2.0" - sources."ansi-regex-3.0.0" ]; }) + sources."eslint-scope-3.7.1" + sources."eslint-visitor-keys-1.0.0" + sources."espree-3.5.2" + sources."esprima-4.0.0" + sources."esquery-1.0.0" + sources."esrecurse-4.2.0" + sources."estraverse-4.2.0" + sources."esutils-2.0.2" + sources."external-editor-2.1.0" + sources."fast-deep-equal-1.0.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.2.0" + sources."globby-5.0.0" + sources."graceful-fs-4.1.11" + sources."has-ansi-2.0.0" + sources."has-flag-2.0.0" + sources."iconv-lite-0.4.19" + 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.0" + 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.10.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.4" + sources."lru-cache-4.1.1" + sources."mimic-fn-1.1.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."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-1.0.7" + sources."progress-2.0.0" + sources."pseudomap-1.0.2" + sources."readable-stream-2.3.3" + sources."require-uncached-1.0.3" sources."resolve-1.5.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."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.0.3" + sources."strip-ansi-3.0.1" + sources."strip-json-comments-2.0.1" (sources."supports-color-3.2.3" // { dependencies = [ sources."has-flag-1.0.0" ]; }) - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."strip-ansi-3.0.1" - sources."ansi-regex-2.1.1" - sources."ajv-5.5.2" - (sources."babel-code-frame-6.26.0" // { - dependencies = [ - sources."chalk-1.1.3" - sources."strip-ansi-3.0.1" - ]; - }) - sources."concat-stream-1.6.0" - sources."cross-spawn-5.1.0" - sources."debug-3.1.0" - sources."doctrine-2.0.2" - 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-11.1.0" - sources."ignore-3.3.7" - sources."imurmurhash-0.1.4" - sources."inquirer-3.3.0" - sources."is-resolvable-1.0.1" - 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."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-2.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."ms-2.0.0" - sources."esrecurse-4.2.0" - sources."object-assign-4.1.1" - sources."acorn-5.2.1" - (sources."acorn-jsx-3.0.1" // { - dependencies = [ - sources."acorn-3.3.0" - ]; - }) - 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.1" - 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.1.0" - 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."chardet-0.4.2" - sources."iconv-lite-0.4.19" 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."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."typedarray-0.0.6" + sources."util-deprecate-1.0.2" + sources."which-1.3.0" sources."wordwrap-1.0.0" - sources."fast-levenshtein-2.0.6" - sources."path-parse-1.0.5" + sources."wrappy-1.0.2" + sources."write-0.2.1" + sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; meta = { @@ -30220,165 +30960,165 @@ in sha1 = "81f5f98043cc2517053f96ba5d61ef5db430c010"; }; dependencies = [ - sources."chalk-1.1.3" - sources."log-update-1.0.2" - sources."meow-3.7.0" - (sources."ora-1.3.0" // { - dependencies = [ - sources."cli-cursor-2.1.0" - sources."restore-cursor-2.0.0" - sources."onetime-2.0.1" - ]; - }) - (sources."phantomjs-prebuilt-2.1.16" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - 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."ajv-5.5.2" sources."ansi-escapes-1.4.0" - sources."cli-cursor-1.0.2" - sources."restore-cursor-1.0.1" - sources."exit-hook-1.1.1" - sources."onetime-1.1.0" - sources."camelcase-keys-2.1.0" - sources."decamelize-1.2.0" - sources."loud-rejection-1.6.0" - sources."map-obj-1.0.1" - sources."minimist-1.2.0" - sources."normalize-package-data-2.4.0" - sources."object-assign-4.1.1" - sources."read-pkg-up-1.0.1" - sources."redent-1.0.0" - sources."trim-newlines-1.0.0" - sources."camelcase-2.1.1" - sources."currently-unhandled-0.4.1" - sources."signal-exit-3.0.2" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.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."find-up-1.1.2" - sources."read-pkg-1.1.0" - sources."path-exists-2.1.0" - sources."pinkie-promise-2.0.1" - sources."pinkie-2.0.4" - sources."load-json-file-1.1.0" - sources."path-type-1.1.0" - sources."graceful-fs-4.1.11" - sources."parse-json-2.2.0" - sources."pify-2.3.0" - sources."strip-bom-2.0.0" - sources."error-ex-1.3.1" - sources."is-arrayish-0.2.1" - sources."is-utf8-0.2.1" - sources."indent-string-2.1.0" - sources."strip-indent-1.0.1" - sources."repeating-2.0.1" - sources."is-finite-1.0.2" - sources."number-is-nan-1.0.1" - sources."get-stdin-4.0.1" - sources."cli-spinners-1.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."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - sources."ms-2.0.0" - sources."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."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."asynckit-0.4.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."tunnel-agent-0.6.0" - sources."uuid-3.1.0" - sources."delayed-stream-1.0.0" - sources."asynckit-0.4.0" - sources."ajv-5.5.2" - 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."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.1.0" + sources."co-4.6.0" + sources."combined-stream-1.0.5" + sources."concat-stream-1.6.0" + sources."core-util-is-1.0.2" (sources."cryptiles-3.1.2" // { dependencies = [ sources."boom-5.2.0" ]; }) - 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."currently-unhandled-0.4.1" sources."dashdash-1.14.1" - sources."getpass-0.1.7" - sources."jsbn-0.1.1" - sources."tweetnacl-0.14.5" + sources."debug-2.6.9" + sources."decamelize-1.2.0" + sources."delayed-stream-1.0.0" 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."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.0.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.1" + 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."hasha-2.2.0" + sources."hawk-6.0.2" + sources."hoek-4.2.0" + sources."hosted-git-info-2.5.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-1.0.2" + 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.30.0" + sources."mime-types-2.1.17" + sources."mimic-fn-1.1.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."tmp-0.0.31" + 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.3.0" // { + dependencies = [ + sources."cli-cursor-2.1.0" + sources."onetime-2.0.1" + sources."restore-cursor-2.0.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."minimist-0.0.8" + ]; + }) + sources."pify-2.3.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."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.3" + sources."redent-1.0.0" + sources."repeating-2.0.1" + sources."request-2.83.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-1.0.2" + sources."spdx-expression-parse-1.0.4" + sources."spdx-license-ids-1.2.2" + sources."sshpk-1.13.1" + sources."string_decoder-1.0.3" + 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.3" + 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.1" + sources."verror-1.10.0" + sources."which-1.3.0" + sources."yauzl-2.4.1" + sources."zen-observable-0.5.2" ]; buildInputs = globalBuildInputs; meta = { @@ -30398,13 +31138,13 @@ in sha1 = "c027feb75a512001d1287bbfb3ffaafba67eb92f"; }; dependencies = [ + sources."bower-1.8.2" sources."bower-endpoint-parser-0.2.1" sources."bower-logger-0.2.1" - sources."bower-1.8.2" sources."glob-3.2.11" sources."inherits-2.0.3" - sources."minimatch-0.3.0" sources."lru-cache-2.7.3" + sources."minimatch-0.3.0" sources."sigmund-1.0.1" ]; buildInputs = globalBuildInputs; @@ -30424,6 +31164,23 @@ in 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.8" + (sources."braces-1.8.5" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."broadway-0.3.6" + sources."caller-0.0.1" + sources."chokidar-1.7.0" (sources."cliff-0.1.10" // { dependencies = [ sources."colors-1.0.3" @@ -30431,91 +31188,92 @@ in }) sources."clone-1.0.3" 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."filename-regex-2.0.1" + sources."fill-range-2.2.3" (sources."flatiron-0.4.3" // { dependencies = [ - sources."optimist-0.6.0" sources."cliff-0.1.9" + sources."optimist-0.6.0" sources."winston-0.8.0" ]; }) + sources."for-in-1.0.2" + sources."for-own-0.1.5" (sources."forever-monitor-1.7.1" // { dependencies = [ sources."optimist-0.2.8" ]; }) + 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.8.0" (sources."nconf-0.6.9" // { dependencies = [ sources."async-0.2.9" sources."optimist-0.6.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."colors-1.1.2" sources."minimist-1.2.0" ]; }) - sources."shush-1.0.0" - sources."timespan-2.3.0" - (sources."utile-0.2.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - sources."winston-0.8.3" - sources."eyes-0.1.8" - sources."broadway-0.3.6" + sources."process-nextick-args-1.0.7" sources."prompt-0.2.14" - sources."director-1.2.7" - sources."eventemitter2-0.4.14" - sources."async-0.2.10" - 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.10" - 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" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) - 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-2.1.0" - sources."isobject-2.1.0" (sources."randomatic-1.1.7" // { dependencies = [ (sources."is-number-3.0.0" // { @@ -30525,52 +31283,34 @@ in }) ]; }) - 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.11.0" - sources."graceful-fs-4.1.11" + sources."read-1.0.7" 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.8.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.5" - 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."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."i-0.3.6" - sources."mkdirp-0.5.1" - sources."ncp-0.4.2" + sources."revalidator-0.1.8" 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."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.0.3" + 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."isstream-0.1.2" ]; buildInputs = globalBuildInputs; meta = { @@ -30591,14 +31331,14 @@ in }; dependencies = [ sources."async-2.6.0" - sources."lodash.groupby-4.6.0" - sources."minilog-3.1.0" - sources."simple-git-1.85.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."lodash-4.17.4" + 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.89.0" + sources."tabtab-git+https://github.com/mixu/node-tabtab.git" ]; buildInputs = globalBuildInputs; meta = { @@ -30635,21 +31375,21 @@ in sha1 = "562b119ebb069ddb464ace2845501be97b35b6a8"; }; dependencies = [ + sources."abbrev-1.1.1" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.8" + sources."concat-map-0.0.1" 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."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."abbrev-1.1.1" ]; buildInputs = globalBuildInputs; meta = { @@ -30670,33 +31410,63 @@ in sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c"; }; dependencies = [ - sources."coffee-script-1.12.7" - (sources."jade-1.11.0" // { + sources."acorn-2.7.0" + (sources."acorn-globals-1.0.9" // { dependencies = [ - sources."promise-2.0.0" - sources."is-promise-1.0.1" - sources."source-map-0.1.43" - sources."wordwrap-0.0.2" - sources."acorn-1.2.2" + sources."acorn-2.7.0" ]; }) - (sources."q-2.0.3" // { - dependencies = [ - sources."asap-2.0.6" - ]; - }) - sources."xml2js-0.4.19" - sources."msgpack-1.0.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."commander-2.8.1" ]; }) + 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."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."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.8.0" + sources."optimist-0.3.7" + sources."pop-iterate-1.0.1" + sources."promise-6.1.0" + (sources."q-2.0.3" // { + dependencies = [ + sources."asap-2.0.6" + ]; + }) + 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" @@ -30707,45 +31477,15 @@ in sources."source-map-0.5.7" ]; }) - sources."void-elements-2.0.1" - sources."with-4.0.3" - sources."source-map-0.4.4" - sources."graceful-readlink-1.0.1" - sources."amdefine-1.0.1" - sources."acorn-2.7.0" - sources."is-promise-2.1.0" - sources."promise-6.1.0" - sources."asap-1.0.0" - 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.3" - 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."repeat-string-1.6.1" - sources."is-buffer-1.1.6" - (sources."acorn-globals-1.0.9" // { - dependencies = [ - sources."acorn-2.7.0" - ]; - }) - sources."pop-iterate-1.0.1" + sources."void-elements-2.0.1" sources."weak-map-1.0.5" - sources."sax-1.2.4" + 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.4" - sources."nan-2.8.0" + sources."yargs-3.10.0" ]; buildInputs = globalBuildInputs; meta = { @@ -30764,150 +31504,247 @@ in sha1 = "571ce45928dd40af6514fc4011866016c13845b4"; }; dependencies = [ + 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."chalk-1.1.3" - sources."deprecated-0.0.1" - (sources."gulp-util-3.0.8" // { + 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.0.3" + sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { dependencies = [ - sources."readable-stream-2.3.3" - sources."isarray-1.0.0" - sources."string_decoder-1.0.3" - ]; - }) - sources."interpret-1.1.0" - (sources."liftoff-2.5.0" // { - dependencies = [ - sources."is-extendable-0.1.1" - sources."is-descriptor-0.1.6" - sources."has-values-0.1.4" - sources."isarray-1.0.0" - sources."for-own-0.1.5" + (sources."define-property-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) sources."kind-of-3.2.2" ]; }) - 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" // { - dependencies = [ - (sources."through2-0.6.5" // { - dependencies = [ - sources."inherits-2.0.3" - ]; - }) - sources."vinyl-0.4.6" - sources."glob-3.1.21" - sources."minimatch-0.2.14" - sources."inherits-1.0.2" - sources."minimist-0.0.8" - sources."readable-stream-1.0.34" - sources."clone-0.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.2" - 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-2.0.3" - sources."vinyl-0.5.3" - sources."ansi-gray-0.1.1" - sources."color-support-1.1.3" - sources."time-stamp-1.1.0" - sources."ansi-wrap-0.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.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."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-1.0.3" - sources."clone-stats-0.0.1" - sources."extend-3.0.1" - (sources."findup-sync-2.0.0" // { - dependencies = [ - sources."is-descriptor-1.0.1" - sources."is-extendable-1.0.1" - ]; - }) - sources."fined-1.1.0" - sources."flagged-respawn-1.0.0" - sources."is-plain-object-2.0.4" - sources."object.map-1.0.0" - sources."rechoir-0.6.2" - sources."resolve-1.5.0" - sources."detect-file-1.0.0" - sources."is-glob-3.1.0" - (sources."micromatch-3.1.4" // { - dependencies = [ - sources."is-descriptor-0.1.6" - ]; - }) - sources."resolve-dir-1.0.1" - sources."is-extglob-2.1.1" - sources."arr-diff-4.0.0" - sources."array-unique-0.3.2" + sources."brace-expansion-1.1.8" (sources."braces-2.3.0" // { dependencies = [ sources."kind-of-3.2.2" ]; }) - (sources."define-property-1.0.0" // { + sources."cache-base-1.0.1" + sources."chalk-1.1.3" + (sources."class-utils-0.3.6" // { dependencies = [ - sources."kind-of-5.1.0" + sources."define-property-0.2.5" ]; }) + sources."clone-1.0.3" + 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-1.0.0" + 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."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-2.0.1" - (sources."extglob-2.0.2" // { + (sources."extglob-2.0.4" // { dependencies = [ 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-1.0.1" + ]; + }) + 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.3" + sources."string_decoder-1.0.3" + ]; + }) + 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-1.0.1" + sources."is-extglob-2.1.1" + sources."is-glob-3.1.0" + sources."is-number-3.0.0" + sources."is-odd-1.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."is-windows-1.0.1" + sources."isarray-0.0.1" + sources."isexe-2.0.0" + sources."isobject-3.0.1" sources."kind-of-6.0.2" - (sources."nanomatch-1.2.6" // { + sources."lazy-cache-2.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-0.1.1" + sources."isarray-1.0.0" + sources."kind-of-3.2.2" + ]; + }) + 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.0" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + (sources."micromatch-3.1.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."minimatch-2.0.10" + sources."minimist-1.2.0" + sources."mixin-deep-1.3.0" + sources."mkdirp-0.5.1" + sources."ms-2.0.0" + sources."multipipe-0.1.2" + (sources."nanomatch-1.2.7" // { dependencies = [ sources."kind-of-5.1.0" ]; }) + sources."natives-1.1.1" + 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-1.0.7" + sources."readable-stream-1.1.14" + sources."rechoir-0.6.2" sources."regex-not-1.0.0" + sources."repeat-element-1.1.2" + sources."repeat-string-1.6.1" + sources."replace-ext-0.0.1" + sources."resolve-1.5.0" + sources."resolve-dir-1.0.1" + sources."resolve-url-0.2.1" + sources."safe-buffer-5.1.1" + sources."semver-4.3.6" + sources."sequencify-0.0.7" + sources."set-getter-0.1.0" + sources."set-value-2.0.0" + sources."sigmund-1.0.1" (sources."snapdragon-0.8.1" // { dependencies = [ (sources."define-property-0.2.5" // { @@ -30918,81 +31755,40 @@ in sources."kind-of-4.0.0" ]; }) - (sources."to-regex-3.0.1" // { - dependencies = [ - sources."define-property-0.2.5" - ]; - }) - sources."arr-flatten-1.1.0" - sources."fill-range-4.0.0" - sources."isobject-3.0.1" - sources."repeat-element-1.1.2" 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."sparkles-1.0.0" (sources."split-string-3.1.0" // { dependencies = [ sources."extend-shallow-3.0.2" ]; }) - sources."is-number-3.0.0" - sources."repeat-string-1.6.1" - sources."to-regex-range-2.1.1" - sources."is-buffer-1.1.6" - sources."snapdragon-util-3.0.1" - sources."assign-symbols-1.0.0" - sources."is-extendable-1.0.1" - sources."is-descriptor-1.0.1" - (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."expand-brackets-2.1.4" // { - dependencies = [ - sources."define-property-0.2.5" - ]; - }) - sources."debug-2.6.9" - sources."posix-character-classes-0.1.1" - sources."ms-2.0.0" - sources."map-cache-0.2.2" - sources."is-odd-1.0.0" - (sources."base-0.11.2" // { - dependencies = [ - (sources."define-property-1.0.0" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - sources."kind-of-3.2.2" - ]; - }) - sources."source-map-0.5.7" - sources."source-map-resolve-0.5.1" - sources."use-2.0.2" - sources."cache-base-1.0.1" - (sources."class-utils-0.3.5" // { - dependencies = [ - sources."define-property-0.2.5" - ]; - }) - sources."component-emitter-1.2.1" - sources."mixin-deep-1.3.0" - sources."pascalcase-0.1.1" - sources."collection-visit-1.0.0" - sources."get-value-2.0.6" - sources."has-value-1.0.0" - sources."set-value-2.0.0" + sources."static-extend-0.1.2" + sources."stream-consume-0.1.0" + 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.1" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) + 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" // { @@ -31002,78 +31798,31 @@ in }) ]; }) - sources."map-visit-1.0.0" - sources."object-visit-1.0.1" - sources."has-values-1.0.0" - sources."arr-union-3.1.0" - sources."lazy-cache-2.0.2" - sources."static-extend-0.1.2" - sources."set-getter-0.1.0" - sources."object-copy-0.1.0" - sources."copy-descriptor-0.1.1" - sources."for-in-1.0.2" - sources."decode-uri-component-0.2.0" - sources."source-map-url-0.4.0" - sources."atob-2.0.3" sources."urix-0.1.0" - sources."resolve-url-0.2.1" - sources."expand-tilde-2.0.2" - sources."global-modules-1.0.0" - sources."homedir-polyfill-1.0.1" - sources."parse-passwd-1.0.0" - sources."global-prefix-1.0.2" - sources."is-windows-1.0.1" - sources."ini-1.3.5" - sources."which-1.3.0" - sources."isexe-2.0.0" - sources."object.defaults-1.1.0" - sources."parse-filepath-1.0.2" - sources."array-each-1.0.1" - sources."array-slice-1.1.0" - sources."for-own-1.0.0" - sources."is-absolute-1.0.0" - sources."path-root-0.1.1" - sources."is-relative-1.0.0" - sources."is-unc-path-1.0.0" - sources."unc-path-regex-0.1.2" - sources."path-root-regex-0.1.2" - sources."make-iterator-1.0.0" - 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."wrappy-1.0.2" - sources."os-homedir-1.0.2" + sources."use-2.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."util-deprecate-1.0.2" + sources."v8flags-2.1.1" + sources."vinyl-0.5.3" + (sources."vinyl-fs-0.3.14" // { dependencies = [ - sources."graceful-fs-1.2.3" + 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."graceful-fs-3.0.11" - sources."mkdirp-0.5.1" - sources."strip-bom-1.0.0" - sources."glob-4.5.3" - sources."minimatch-2.0.10" - 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.1" - sources."first-chunk-stream-1.0.0" - sources."is-utf8-0.2.1" + sources."which-1.3.0" + sources."wrappy-1.0.2" + sources."xtend-4.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -31093,11 +31842,11 @@ in sha1 = "e21764eafe6429ec8dc9377b55e1ca86799704d5"; }; dependencies = [ + sources."eventemitter3-3.0.0" sources."http-proxy-1.0.2" - sources."redis-0.10.3" sources."lru-cache-2.5.2" sources."minimist-0.0.8" - sources."eventemitter3-3.0.0" + sources."redis-0.10.3" ]; buildInputs = globalBuildInputs; meta = { @@ -31118,64 +31867,64 @@ in }; 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."minimatch-2.0.10" - 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-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."brace-expansion-1.1.8" (sources."cli-0.6.6" // { dependencies = [ sources."minimatch-0.3.0" ]; }) + sources."colors-1.0.3" + sources."commander-2.6.0" + sources."concat-map-0.0.1" 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."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."domelementtype-1.1.3" + ]; + }) + sources."domelementtype-1.3.0" sources."domhandler-2.3.0" (sources."domutils-1.5.1" // { dependencies = [ sources."entities-1.1.1" ]; }) - sources."domelementtype-1.3.0" - sources."readable-stream-1.1.14" sources."entities-1.0.0" - (sources."dom-serializer-0.1.0" // { - dependencies = [ - sources."domelementtype-1.1.3" - ]; - }) - sources."core-util-is-1.0.2" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" + 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."is-dotfile-1.0.3" sources."is-extglob-1.0.0" sources."is-glob-2.0.1" - sources."glob-parent-2.0.0" + sources."isarray-0.0.1" + (sources."jshint-2.8.0" // { + dependencies = [ + sources."glob-3.2.11" + sources."minimatch-2.0.10" + ]; + }) + 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 = { @@ -31189,28 +31938,29 @@ in html-minifier = nodeEnv.buildNodePackage { name = "html-minifier"; packageName = "html-minifier"; - version = "3.5.7"; + version = "3.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.7.tgz"; - sha512 = "31dxgy9vqkpkkmxi45mlnp7ijqigjx1s1z9j7ngvklwp6n4rck5cs3ilw3qxz0glsgj2k9n884wrcad9433ljjsh7z8w3hamagrg10q"; + url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.8.tgz"; + sha512 = "29sg4r25g8awvmlyzjip0c216bjcd0nq730jd5vihagf3vpxw070gi5nd7z7333givgislxfylv4jrxn4ngqxgnwns5lg3xy3lc6zjr"; }; dependencies = [ sources."camel-case-3.0.0" sources."clean-css-4.1.9" sources."commander-2.12.2" sources."he-1.1.1" + sources."lower-case-1.1.4" sources."ncname-1.0.0" + sources."no-case-2.3.2" sources."param-case-2.1.1" sources."relateurl-0.2.7" - (sources."uglify-js-3.2.2" // { + sources."source-map-0.5.7" + (sources."uglify-js-3.3.8" // { dependencies = [ + sources."commander-2.13.0" sources."source-map-0.6.1" ]; }) - sources."no-case-2.3.2" sources."upper-case-1.1.3" - sources."lower-case-1.1.4" - sources."source-map-0.5.7" sources."xml-char-classes-1.0.0" ]; buildInputs = globalBuildInputs; @@ -31225,157 +31975,204 @@ in ionic = nodeEnv.buildNodePackage { name = "ionic"; packageName = "ionic"; - version = "3.19.0"; + version = "3.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/ionic/-/ionic-3.19.0.tgz"; - sha512 = "34pv92cpzkfq8r6q0k2r47n2pj7v5n0hnldrjgh443cacc1ifbbh5n0xfgrd93l88w3pwk7gc64xnipw37d6cbk5zv9kawy88b1j6bs"; + url = "https://registry.npmjs.org/ionic/-/ionic-3.19.1.tgz"; + sha512 = "11hpd51qzi8fms87q1xqwc347dp9mxhvzci2jlw94ayvs1v2n3iaqwdic1g1213k91xwzp52z6y17a08via45l936bgda3pi6zfbmsk"; }; dependencies = [ sources."@ionic/cli-framework-0.1.2" - (sources."@ionic/cli-utils-1.19.0" // { + (sources."@ionic/cli-utils-1.19.1" // { dependencies = [ + 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.1.0" sources."statuses-1.3.1" - sources."mime-1.4.1" - sources."is-glob-3.1.0" - sources."is-extglob-2.1.1" - sources."yallist-3.0.2" - sources."raw-body-1.1.7" - sources."bytes-1.0.0" sources."string_decoder-0.10.31" + sources."yallist-3.0.2" ]; }) - sources."chalk-2.3.0" - sources."opn-5.1.0" - sources."semver-5.4.1" - sources."tslib-1.8.1" - sources."ncp-2.0.0" - sources."rimraf-2.6.2" - sources."strip-ansi-4.0.0" - sources."superagent-3.8.2" - 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."balanced-match-1.0.0" - 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-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.6.0" - 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."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."@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.2" - 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."http-proxy-middleware-0.17.4" - sources."inquirer-3.3.0" - sources."leek-0.0.24" - sources."lodash-4.17.4" - sources."minimist-1.2.0" - sources."os-name-2.0.1" - sources."slice-ansi-1.0.0" - sources."ssh-config-1.1.3" - sources."string-width-2.1.1" - (sources."tar-4.2.0" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - sources."tiny-lr-1.0.5" - sources."uuid-3.1.0" - sources."wrap-ansi-3.0.1" - sources."ws-3.3.3" - 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-3.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-2.3.2" - sources."type-is-1.6.15" - sources."setprototypeof-1.0.3" - sources."statuses-1.4.0" - sources."ee-first-1.1.1" - sources."unpipe-1.0.0" - sources."media-typer-0.3.0" + sources."accepts-1.3.4" + sources."ansi-escapes-3.0.0" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.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."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.1" + sources."body-5.1.0" + sources."body-parser-1.18.2" + sources."brace-expansion-1.1.8" (sources."braces-1.8.5" // { dependencies = [ sources."kind-of-4.0.0" ]; }) + sources."buffer-crc32-0.2.13" + sources."bytes-3.0.0" + sources."chalk-2.3.0" + sources."chardet-0.4.2" + sources."chokidar-1.7.0" + sources."chownr-1.0.1" + sources."ci-info-1.1.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."combined-stream-1.0.5" + 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.4.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."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."express-4.16.2" + sources."extend-3.0.1" + sources."external-editor-2.1.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.0" + sources."for-in-1.0.2" + sources."for-own-0.1.5" + sources."form-data-2.3.1" + sources."formidable-1.1.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-2.0.0" + (sources."http-errors-1.6.2" // { + dependencies = [ + sources."depd-1.1.1" + ]; + }) + sources."http-parser-js-0.4.9" + 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.5.2" + 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.4" + 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.1" + sources."macos-release-1.1.0" + 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.6.0" + sources."mime-db-1.30.0" + sources."mime-types-2.1.17" + sources."mimic-fn-1.1.0" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + sources."minipass-2.2.1" + sources."minizlib-1.1.0" + sources."mkdirp-0.5.1" + sources."ms-2.0.0" + sources."mute-stream-0.0.7" + sources."nan-2.8.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.2.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-1.0.7" + sources."proxy-addr-2.0.2" + sources."pseudomap-1.0.2" + sources."qs-6.5.1" (sources."randomatic-1.1.7" // { dependencies = [ (sources."is-number-3.0.0" // { @@ -31385,111 +32182,69 @@ in }) ]; }) - 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."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.11.0" - sources."set-immediate-shim-1.0.1" - sources."nan-2.8.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."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."http-proxy-1.16.2" - sources."eventemitter3-1.2.0" + sources."raw-body-2.3.2" + sources."readable-stream-2.3.3" + 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."ansi-escapes-3.0.0" - sources."cli-cursor-2.1.0" - sources."cli-width-2.2.0" - sources."external-editor-2.1.0" - sources."figures-2.0.0" - sources."mute-stream-0.0.7" + 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."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."chardet-0.4.2" - 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."macos-release-1.1.0" - sources."win-release-1.1.1" - sources."is-fullwidth-code-point-2.0.0" - sources."chownr-1.0.1" - sources."fs-minipass-1.2.3" - sources."minipass-2.2.1" - sources."minizlib-1.1.0" - sources."mkdirp-0.5.1" - sources."body-5.1.0" - sources."faye-websocket-0.10.0" - sources."livereload-js-2.2.2" - sources."object-assign-4.1.1" - sources."continuable-cache-0.3.1" - sources."error-7.0.2" + 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.1" + sources."serve-static-1.13.1" + sources."set-immediate-shim-1.0.1" + sources."setprototypeof-1.0.3" + 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.4.0" 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.1" - sources."ansi-styles-3.2.0" + sources."string-width-2.1.1" + sources."string_decoder-1.0.3" + sources."strip-ansi-4.0.0" + sources."superagent-3.8.2" 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."tar-4.3.0" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."tar-stream-1.5.5" + sources."through-2.3.8" + sources."tiny-lr-1.1.0" + sources."tmp-0.0.33" + sources."tslib-1.9.0" + sources."type-is-1.6.15" + 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 = { @@ -31527,9 +32282,23 @@ in }; dependencies = [ sources."abbrev-1.0.9" + sources."align-text-0.1.4" + sources."amdefine-1.0.1" + sources."argparse-1.0.9" sources."async-1.5.2" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.8" + 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 = [ @@ -31537,11 +32306,22 @@ in sources."wordwrap-0.0.3" ]; }) + 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.10.0" // { dependencies = [ sources."esprima-4.0.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" @@ -31549,54 +32329,29 @@ in }) 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.2.0" - 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."inherits-2.0.3" - sources."minimatch-3.0.4" - 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."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."source-map-0.5.7" sources."wordwrap-0.0.2" ]; }) - sources."minimist-0.0.10" - 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."which-1.3.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."argparse-1.0.9" - sources."sprintf-js-1.0.3" - sources."has-flag-1.0.0" - sources."isexe-2.0.0" + sources."wordwrap-1.0.0" + sources."wrappy-1.0.2" + sources."yargs-3.10.0" ]; buildInputs = globalBuildInputs; meta = { @@ -31616,12 +32371,32 @@ in sha512 = "080s545iykbb70x7xm0nqs6s7qs0slprxcqslpv47ffyz6gx7gb8kaa1dlk9lxvkm8pfhdyyj0f6qsx7d1ydscnnl0x1wmkzagbpmzm"; }; dependencies = [ + sources."ansi-color-0.2.1" + sources."ansi-styles-3.2.0" + sources."any-promise-1.3.0" + sources."assertion-error-1.1.0" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.8" + sources."bufrw-1.2.1" sources."chai-4.1.2" sources."chai-as-promised-7.1.1" sources."chalk-2.3.0" - sources."commander-2.12.2" + sources."check-error-1.0.2" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."commander-2.13.0" + 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-2.0.0" + sources."inflight-1.0.6" + sources."inherits-2.0.3" sources."iterare-0.0.8" (sources."jaeger-client-3.7.0" // { dependencies = [ @@ -31629,55 +32404,35 @@ in ]; }) sources."lodash-4.17.4" + 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."object-hash-1.2.0" + sources."once-1.4.0" sources."opentracing-0.14.1" - sources."rxjs-5.5.5" + sources."path-is-absolute-1.0.1" + sources."pathval-1.1.0" + sources."rxjs-5.5.6" sources."semaphore-async-await-1.5.1" sources."string-similarity-1.2.0" + sources."string-template-0.2.1" + sources."supports-color-4.5.0" + sources."symbol-observable-1.0.1" + sources."thenify-3.3.0" + sources."thenify-all-1.6.0" + sources."thriftrw-3.11.1" + sources."type-detect-4.0.7" 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."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."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."object-assign-4.1.1" - sources."thenify-all-1.6.0" - sources."thenify-3.3.0" - sources."symbol-observable-1.0.1" - sources."vscode-uri-1.0.1" sources."vscode-languageserver-protocol-3.5.0" + sources."vscode-languageserver-types-3.5.0" + sources."vscode-uri-1.0.1" + sources."wrappy-1.0.2" + sources."xorshift-0.2.1" + sources."xtend-4.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -31725,9 +32480,11 @@ in ]; }) 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.7" + sources."marked-0.3.12" + sources."minimist-0.0.8" sources."mkdirp-0.5.1" (sources."requizzle-0.2.1" // { dependencies = [ @@ -31739,8 +32496,6 @@ in sources."underscore-1.8.3" sources."underscore-contrib-0.3.0" sources."xmlcreate-1.0.2" - sources."graceful-fs-4.1.11" - sources."minimist-0.0.8" ]; buildInputs = globalBuildInputs; meta = { @@ -31760,42 +32515,42 @@ in sha1 = "1e7252915ce681b40827ee14248c46d34e9aa62c"; }; dependencies = [ + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.8" sources."cli-1.0.1" + sources."concat-map-0.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."fs.realpath-1.0.0" - 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."core-util-is-1.0.2" sources."date-now-0.1.4" + (sources."dom-serializer-0.1.0" // { + dependencies = [ + sources."domelementtype-1.1.3" + ]; + }) + sources."domelementtype-1.3.0" sources."domhandler-2.3.0" (sources."domutils-1.5.1" // { dependencies = [ sources."entities-1.1.1" ]; }) - sources."domelementtype-1.3.0" - sources."readable-stream-1.1.14" sources."entities-1.0.0" - (sources."dom-serializer-0.1.0" // { - dependencies = [ - sources."domelementtype-1.1.3" - ]; - }) - sources."core-util-is-1.0.2" + 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."brace-expansion-1.1.8" - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" + sources."strip-json-comments-1.0.4" + sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -31831,20 +32586,20 @@ in sha512 = "0x3s0bbw8f5d2i5jb08bd2dsxnf7w38fp7fj652cvp558b45mxyvy42zmghrmlyrmbk5d84d8maw4pqq3228jq0l7hkxb4fl415zs7l"; }; dependencies = [ + sources."abbrev-1.1.1" + sources."bluebird-3.5.1" + sources."commander-2.13.0" 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."nopt-3.0.6" sources."proto-list-1.2.4" - sources."ini-1.3.5" - sources."bluebird-3.5.1" - sources."commander-2.12.2" - 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."semver-5.5.0" + sources."sigmund-1.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -31864,13 +32619,13 @@ in sha1 = "5737045085f55eb455c68b1ff4ebc01bd50e8830"; }; dependencies = [ - sources."nomnom-1.8.1" sources."JSV-4.0.2" - sources."underscore-1.6.0" + sources."ansi-styles-1.0.0" sources."chalk-0.4.0" sources."has-color-0.1.7" - sources."ansi-styles-1.0.0" + sources."nomnom-1.8.1" sources."strip-ansi-0.1.1" + sources."underscore-1.6.0" ]; buildInputs = globalBuildInputs; meta = { @@ -31899,48 +32654,48 @@ in json-refs = nodeEnv.buildNodePackage { name = "json-refs"; packageName = "json-refs"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.2.tgz"; - sha512 = "0m7az6dvfn65fbak1y42663yxkachpj1fyyxxpdhkpny3bbsmgn0hpp8fb5sllmzbfyqspkqh1icpqb14pbsfnbsj7w665xmnj4a9g5"; + url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.3.tgz"; + sha512 = "3wagfrcaaj3vscma48jj349wbf838vi5fy0c02xfxd4k57qhf05mfw0i0624fvxfil9gfhx3sl35py85lfjx74hfkw6ra7kqw91p5cw"; }; dependencies = [ - sources."commander-2.12.2" - 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.2" + sources."asynckit-0.4.0" + sources."combined-stream-1.0.5" + 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.1" sources."formidable-1.1.1" - sources."methods-1.1.2" - sources."mime-1.6.0" - 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."core-util-is-1.0.2" + sources."graphlib-2.1.5" sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."js-yaml-3.10.0" + sources."lodash-4.17.4" + sources."methods-1.1.2" + sources."mime-1.6.0" + sources."mime-db-1.30.0" + sources."mime-types-2.1.17" + sources."ms-2.0.0" + sources."native-promise-only-0.8.1" + sources."path-loader-1.0.4" 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."qs-6.5.1" + sources."readable-stream-2.3.3" + sources."safe-buffer-5.1.1" + sources."slash-1.0.0" + sources."sprintf-js-1.0.3" + sources."string_decoder-1.0.3" + sources."superagent-3.8.2" + sources."uri-js-3.0.2" + sources."util-deprecate-1.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -31960,12 +32715,69 @@ in sha512 = "3isg3ph43vqfq6m6pg0d1iy7gj2gc6jgym0gp3ng7p9fv7bf1q43isf3wbc7bc9w5swsxqjc3v304ic8iinilwrkwxgks1alaxjs3si"; }; dependencies = [ + sources."accepts-1.3.4" + sources."ajv-5.5.2" + sources."ansi-align-2.0.0" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.0" + 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.6.0" + sources."basic-auth-2.0.0" + sources."bcrypt-pbkdf-1.0.1" sources."body-parser-1.18.2" + 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.0" + sources."cli-boxes-1.0.0" + sources."cliui-4.0.0" + 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.5" + sources."compressible-2.0.12" sources."compression-1.7.1" + sources."configstore-3.1.1" 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."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.2" // { dependencies = [ sources."setprototypeof-1.1.0" @@ -31977,225 +32789,173 @@ in sources."path-to-regexp-1.7.0" ]; }) + sources."extend-3.0.1" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" + sources."finalhandler-1.1.0" + sources."find-up-2.1.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.1" + 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-2.0.0" + sources."hawk-6.0.2" + sources."hoek-4.2.0" + (sources."http-errors-1.6.2" // { + dependencies = [ + sources."depd-1.1.1" + ]; + }) + 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.5.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-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.4" sources."lodash-id-0.14.0" sources."lowdb-0.15.5" + sources."lowercase-keys-1.0.0" + sources."lru-cache-4.1.1" + sources."make-dir-1.1.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.30.0" + sources."mime-types-2.1.17" + sources."mimic-fn-1.1.0" + sources."minimist-1.2.0" sources."morgan-1.9.0" + sources."ms-2.0.0" sources."nanoid-1.0.1" + 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."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."request-2.83.0" - sources."server-destroy-1.0.1" - sources."update-notifier-2.3.0" - (sources."yargs-10.0.3" // { - dependencies = [ - sources."strip-ansi-3.0.1" - sources."is-fullwidth-code-point-1.0.0" - sources."ansi-regex-2.1.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.4.0" - 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."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-0.1.7" + sources."prepend-http-1.0.4" 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."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."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.5.2" - 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-4.3.1" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) - 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.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-2.1.1" - sources."term-size-1.2.0" - sources."widest-line-2.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."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."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.1" - sources."is-path-inside-1.0.1" - sources."ini-1.3.5" - sources."path-is-inside-1.0.2" - sources."package-json-4.0.1" - sources."got-6.7.1" + sources."punycode-1.4.1" + sources."qs-6.5.1" + sources."range-parser-1.2.0" + sources."raw-body-2.3.2" + sources."rc-1.2.4" 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" // { - dependencies = [ - sources."string-width-1.0.2" - ]; - }) - 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."request-2.83.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.1" + sources."serve-static-1.13.1" + sources."server-destroy-1.0.1" sources."set-blocking-2.0.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."sntp-2.1.0" + sources."sshpk-1.13.1" + sources."statuses-1.4.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-4.5.0" + sources."term-size-1.2.0" + sources."timed-out-4.0.1" + sources."tough-cookie-2.3.3" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-is-1.6.15" + sources."unique-string-1.0.0" + sources."unpipe-1.0.0" + sources."unzip-response-2.0.1" + sources."update-notifier-2.3.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" - sources."wrap-ansi-2.1.0" - sources."code-point-at-1.1.0" - sources."number-is-nan-1.0.1" - 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" ]; buildInputs = globalBuildInputs; meta = { @@ -32231,19 +32991,123 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "1.7.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz"; - sha512 = "0g4s1b3k1485yxia2b8703zyw8dxjz9npijnkapv7q9jfw1piyaa2p4hsyqiajnc4n1djri6xk76q6y0jw0n9y7a5d4g6p1f26436lk"; + url = "https://registry.npmjs.org/karma/-/karma-2.0.0.tgz"; + sha512 = "0iyj9ic6sj94x4xdd6wy8zgabqbl2ydrsp8h76lwrcx27ns8pzd7bg8yibsjgddzkisb9p1gp6bn46b8g5m2lh3yj5vqx55q2ks7lib"; }; 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."JSONStream-1.3.2" + sources."accepts-1.3.3" + sources."acorn-4.0.13" + 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."lodash-4.17.4" + 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.9.2" + sources."assert-1.4.1" + sources."assert-plus-1.0.0" + sources."ast-types-0.10.1" + 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.6.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.1" + 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" + sources."boom-4.3.1" + sources."brace-expansion-1.1.8" + (sources."braces-1.8.5" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."brorand-1.1.0" + sources."browser-pack-6.0.3" + (sources."browser-resolve-1.11.2" // { + dependencies = [ + sources."resolve-1.1.7" + ]; + }) + (sources."browserify-14.5.0" // { + dependencies = [ + sources."acorn-5.3.0" + sources."combine-source-map-0.7.2" + sources."hash-base-2.0.2" + sources."isarray-0.0.1" + sources."source-map-0.5.7" + ]; + }) + 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.0.8" + 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.1.2" + sources."combine-lists-1.0.1" + sources."combine-source-map-0.8.0" + sources."combined-stream-1.0.5" + sources."commander-2.13.0" + 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.5" // { @@ -32251,9 +33115,59 @@ in 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.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-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.4" + sources."engine.io-client-3.1.4" + 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.0" + 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" @@ -32262,87 +33176,222 @@ in sources."repeat-string-0.2.2" ]; }) - sources."glob-7.1.2" - sources."graceful-fs-4.1.11" - sources."http-proxy-1.16.2" - sources."isbinaryfile-3.0.2" - sources."lodash-3.10.1" - (sources."log4js-0.6.38" // { - dependencies = [ - sources."readable-stream-1.0.34" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" - ]; - }) - sources."mime-1.6.0" - 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" // { - dependencies = [ - sources."debug-2.3.3" - sources."ms-0.7.2" - sources."isarray-0.0.1" - sources."component-emitter-1.1.2" - ]; - }) - 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.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.4.0" - 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" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) 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."extend-3.0.1" + sources."extglob-0.3.2" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.0.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.0.6" + 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.1" + 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.0" + sources."htmlescape-1.1.1" + (sources."http-errors-1.6.2" // { + dependencies = [ + sources."depd-1.1.1" + ]; + }) + 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.8" + 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.1" + 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-json-valid-2.17.1" 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.0" + 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.4" + sources."lodash.memoize-3.0.4" + (sources."log4js-2.5.2" // { + dependencies = [ + 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."source-map-0.5.7" + sources."string_decoder-0.10.31" + sources."tunnel-agent-0.4.3" + ]; + }) + sources."loggly-1.1.1" + sources."lru-cache-2.6.5" + sources."mailcomposer-4.0.1" + (sources."mailgun-js-0.7.15" // { + dependencies = [ + sources."debug-2.2.0" + sources."form-data-2.1.4" + sources."semver-5.0.3" + ]; + }) + 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.30.0" + sources."mime-types-2.1.17" + 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."module-deps-4.1.1" + sources."ms-2.0.0" + sources."nan-2.8.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."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."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" + 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."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."public-encrypt-4.0.0" + sources."punycode-1.4.1" + sources."q-1.4.1" + sources."qjobs-1.1.5" + 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" // { @@ -32352,91 +33401,119 @@ in }) ]; }) - 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.11.0" - sources."readable-stream-2.3.3" - sources."set-immediate-shim-1.0.1" - sources."core-util-is-1.0.2" - sources."process-nextick-args-1.0.7" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - sources."nan-2.8.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."randombytes-2.0.6" + sources."randomfill-1.0.3" + sources."range-parser-1.2.0" + sources."raw-body-2.3.2" + sources."read-only-stream-2.0.0" + (sources."readable-stream-2.3.3" // { dependencies = [ - sources."debug-2.2.0" - sources."ms-0.7.1" + sources."isarray-1.0.0" ]; }) - 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.2.1" - sources."engine.io-client-1.8.3" - sources."indexof-0.0.1" - sources."object-component-0.0.3" - sources."parseuri-0.0.5" + sources."readdirp-2.1.0" + sources."redis-2.8.0" + sources."redis-commands-1.3.1" + 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.83.0" + sources."requestretry-1.13.0" + sources."requires-port-1.0.0" + sources."resolve-1.5.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.0.3" + sources."sha.js-2.4.10" + 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.2" + sources."socks-1.1.10" + sources."socks-proxy-agent-2.1.1" + sources."source-map-0.6.1" + sources."sshpk-1.13.1" + sources."statuses-1.4.0" + sources."stream-browserify-2.0.1" + sources."stream-combiner2-1.1.1" + sources."stream-http-2.8.0" + sources."stream-splicer-2.0.0" + sources."streamroller-0.7.0" + sources."string_decoder-1.0.3" + sources."stringstream-0.0.5" + sources."strip-ansi-3.0.1" + sources."subarg-1.0.0" + sources."supports-color-2.0.0" + (sources."syntax-error-1.3.0" // { + dependencies = [ + sources."acorn-4.0.13" + ]; + }) + 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."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."to-arraybuffer-1.0.1" + sources."tough-cookie-2.3.3" + sources."tsscmp-1.0.5" + sources."tty-browserify-0.0.0" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-check-0.3.2" + sources."type-is-1.6.15" + sources."typedarray-0.0.6" + sources."ultron-1.1.1" + sources."umd-3.0.1" + sources."underscore-1.7.0" + sources."unpipe-1.0.0" + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + (sources."useragent-2.2.1" // { + dependencies = [ + sources."lru-cache-2.2.4" + ]; + }) + (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-0.14.5" + 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."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 = { @@ -32457,147 +33534,147 @@ in sha256 = "a282e834ff67715017f299468ff0d7e496d2bc0f1f7b075b557568b7feb3dba7"; }; dependencies = [ - (sources."express-3.21.2" // { - dependencies = [ - sources."accepts-1.3.4" - sources."negotiator-0.6.1" - sources."uid-safe-2.0.0" - sources."ms-2.0.0" - sources."statuses-1.2.1" - sources."destroy-1.0.3" - ]; - }) - (sources."passport-0.4.0" // { - dependencies = [ - sources."pause-0.0.1" - ]; - }) - sources."passport-google-oauth-1.0.0" - sources."connect-restreamer-1.0.3" - sources."xml2js-0.4.19" + 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.12" + sources."compression-1.5.2" (sources."connect-2.30.2" // { dependencies = [ - sources."escape-html-1.0.3" - sources."vary-1.1.2" - sources."ms-0.7.2" 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."commander-2.6.0" 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."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.0" // { + (sources."express-3.21.2" // { dependencies = [ - sources."ms-0.7.1" + sources."accepts-1.3.4" + 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."utils-merge-1.0.0" - sources."vary-1.0.1" - sources."basic-auth-connect-1.0.0" - sources."body-parser-1.13.3" - sources."bytes-2.1.0" - sources."cookie-parser-1.3.5" - sources."compression-1.5.2" - sources."connect-timeout-1.6.2" - sources."csurf-1.8.3" - sources."errorhandler-1.4.3" 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."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.30.0" + sources."mime-types-2.1.17" + 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."on-headers-1.0.1" - sources."pause-0.1.0" - sources."qs-4.0.0" - (sources."response-time-2.3.2" // { - dependencies = [ - sources."depd-1.1.1" - ]; - }) - sources."serve-favicon-2.3.2" - sources."serve-index-1.7.3" - (sources."serve-static-1.10.3" // { - dependencies = [ - sources."depd-1.1.1" - sources."ms-0.7.1" - ]; - }) - sources."type-is-1.6.15" - sources."vhost-3.0.2" - sources."iconv-lite-0.4.11" + 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."pause-0.0.1" + ]; + }) + 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."bytes-2.4.0" sources."iconv-lite-0.4.13" ]; }) - 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.1.4" - sources."random-bytes-1.0.0" - sources."crc-3.3.0" - sources."base64-url-1.2.1" - sources."inherits-2.0.3" - sources."statuses-1.4.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."batch-0.5.3" - sources."destroy-1.0.4" - 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."response-time-2.3.2" // { + dependencies = [ + sources."depd-1.1.2" + ]; + }) + sources."rndm-1.2.0" sources."sax-1.2.4" + (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."statuses-1.4.0" + sources."stream-counter-0.2.0" + sources."string_decoder-0.10.31" + sources."tsscmp-1.0.5" + sources."type-is-1.6.15" + 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.4" ]; buildInputs = globalBuildInputs; @@ -32611,129 +33688,66 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "2.5.1"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-2.5.1.tgz"; - sha512 = "0bh7a9asvl8vb6szbr8h4h55xzyqmqap0yjqbvyqc9n8yygv5p1s81i1kqgxcbq41p37gf63gyjbws76sa44l11w5gxcgl279m9yga3"; + url = "https://registry.npmjs.org/lerna/-/lerna-2.8.0.tgz"; + sha512 = "2admd5d0lmnck38apsqbblrk0pffnq52s25bb591q8sazykcfz68kz9pn534sgazjl26p57y23758n8n7xvw0ilb9hd5ri6j34i7kxn"; }; 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" // { - dependencies = [ - sources."read-pkg-1.1.0" - sources."yargs-3.10.0" - sources."wordwrap-0.0.2" - sources."load-json-file-1.1.0" - sources."find-up-1.1.2" - sources."path-exists-2.1.0" - sources."minimist-1.2.0" - sources."camelcase-2.1.1" - ]; - }) - sources."conventional-recommended-bump-1.1.0" - sources."dedent-0.7.0" - sources."execa-0.8.0" - sources."find-up-2.1.0" - sources."fs-extra-4.0.3" - sources."get-port-3.2.0" - sources."glob-7.1.2" - sources."glob-parent-3.1.0" - sources."globby-6.1.0" - sources."graceful-fs-4.1.11" - sources."hosted-git-info-2.5.0" - (sources."inquirer-3.3.0" // { - dependencies = [ - sources."strip-ansi-4.0.0" - sources."ansi-regex-3.0.0" - ]; - }) - sources."is-ci-1.0.10" - (sources."load-json-file-3.0.0" // { - dependencies = [ - sources."parse-json-3.0.0" - sources."strip-bom-3.0.0" - ]; - }) - sources."lodash-4.17.4" - sources."minimatch-3.0.4" - (sources."npmlog-4.1.2" // { - dependencies = [ - sources."string-width-1.0.2" - sources."is-fullwidth-code-point-1.0.0" - ]; - }) - sources."p-finally-1.0.0" - (sources."package-json-4.0.1" // { - dependencies = [ - sources."minimist-1.2.0" - ]; - }) - sources."path-exists-3.0.0" - sources."read-cmd-shim-1.0.1" - (sources."read-pkg-2.0.0" // { - dependencies = [ - sources."load-json-file-2.0.0" - sources."path-type-2.0.0" - sources."strip-bom-3.0.0" - ]; - }) - sources."rimraf-2.6.2" - sources."safe-buffer-5.1.1" - sources."semver-5.4.1" - sources."signal-exit-3.0.2" - (sources."strong-log-transformer-1.0.6" // { - dependencies = [ - sources."minimist-0.1.0" - ]; - }) - (sources."temp-write-3.3.0" // { - dependencies = [ - sources."uuid-3.1.0" - ]; - }) - sources."write-file-atomic-2.3.0" - (sources."write-json-file-2.3.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) - sources."write-pkg-3.1.0" - (sources."yargs-8.0.2" // { - dependencies = [ - sources."camelcase-4.1.0" - (sources."cliui-3.2.0" // { - dependencies = [ - sources."string-width-1.0.2" - ]; - }) - sources."read-pkg-up-2.0.0" - sources."is-fullwidth-code-point-1.0.0" - sources."execa-0.7.0" - ]; - }) + sources."JSONStream-1.3.2" + sources."add-stream-1.0.0" + sources."align-text-0.1.4" + sources."amdefine-1.0.1" + sources."ansi-escapes-3.0.0" + sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.0" - sources."escape-string-regexp-1.0.5" - sources."supports-color-4.5.0" + 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."async-1.5.2" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.8" + sources."builtin-modules-1.1.1" + sources."byline-5.0.0" + sources."camelcase-1.2.1" + sources."camelcase-keys-2.1.0" + sources."capture-stack-trace-1.0.0" + sources."center-align-0.1.3" + sources."chalk-2.3.0" + sources."chardet-0.4.2" + sources."ci-info-1.1.2" + sources."cli-cursor-2.1.0" + sources."cli-width-2.2.0" + sources."cliui-2.1.0" + sources."clone-1.0.3" + 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."has-flag-2.0.0" - sources."mkdirp-0.5.1" - sources."minimist-0.0.8" - sources."strip-ansi-3.0.1" - sources."wcwidth-1.0.1" - sources."ansi-regex-2.1.1" - sources."defaults-1.0.3" - sources."clone-1.0.3" - sources."add-stream-1.0.0" + 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.0" + sources."console-control-strings-1.1.0" sources."conventional-changelog-1.1.7" - sources."meow-3.7.0" - sources."tempfile-1.1.1" sources."conventional-changelog-angular-1.6.0" sources."conventional-changelog-atom-0.1.2" + (sources."conventional-changelog-cli-1.3.5" // { + dependencies = [ + sources."camelcase-2.1.1" + sources."find-up-1.1.2" + sources."load-json-file-1.1.0" + sources."minimist-1.2.0" + sources."path-exists-2.1.0" + sources."read-pkg-1.1.0" + sources."wordwrap-0.0.2" + sources."yargs-3.10.0" + ]; + }) sources."conventional-changelog-codemirror-0.2.1" sources."conventional-changelog-core-1.9.5" sources."conventional-changelog-ember-0.2.10" @@ -32742,203 +33756,270 @@ in 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.3" + sources."conventional-commits-filter-1.1.1" sources."conventional-commits-parser-2.1.0" + sources."conventional-recommended-bump-1.1.0" + sources."core-util-is-1.0.2" + 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-1.0.12" + sources."decamelize-1.2.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.1.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.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-1.0.1" - sources."through2-2.0.3" - sources."conventional-commits-filter-1.1.1" + sources."gitconfiglocal-1.0.0" + sources."glob-7.1.2" + sources."glob-parent-3.1.0" + sources."globby-6.1.0" + sources."got-6.7.1" + sources."graceful-fs-4.1.11" sources."handlebars-4.0.11" - sources."json-stringify-safe-5.0.1" - sources."split-1.0.1" + sources."has-flag-2.0.0" + sources."has-unicode-2.0.1" + sources."hosted-git-info-2.5.0" + sources."iconv-lite-0.4.19" + sources."imurmurhash-0.1.4" + sources."indent-string-2.1.0" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + 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.1" + sources."json-stringify-safe-5.0.1" + sources."jsonfile-4.0.0" + sources."jsonparse-1.3.1" + sources."kind-of-3.2.2" + 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."pify-3.0.0" + sources."strip-bom-3.0.0" + ]; + }) + sources."locate-path-2.0.0" + sources."lodash-4.17.4" + 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.0" + sources."lru-cache-4.1.1" + sources."make-dir-1.1.0" + sources."map-obj-1.0.1" + sources."mem-1.1.0" + sources."meow-3.7.0" + sources."mimic-fn-1.1.0" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" sources."modify-values-1.0.0" + sources."moment-2.20.1" + 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-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-1.0.7" + sources."pseudomap-1.0.2" + sources."q-1.5.1" + sources."rc-1.2.4" + sources."read-cmd-shim-1.0.1" + (sources."read-pkg-3.0.0" // { + dependencies = [ + sources."path-type-3.0.0" + sources."pify-3.0.0" + ]; + }) + sources."read-pkg-up-1.0.1" + sources."readable-stream-2.3.3" + sources."redent-1.0.0" + sources."registry-auth-token-3.3.1" + 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-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."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-1.0.2" + sources."spdx-expression-parse-1.0.4" + sources."spdx-license-ids-1.2.2" + sources."split-1.0.1" + sources."split2-2.2.0" + sources."string-width-2.1.1" + sources."string_decoder-1.0.3" + 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-4.5.0" + sources."temp-dir-1.0.0" + (sources."temp-write-3.4.0" // { + dependencies = [ + sources."pify-3.0.0" + 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."wordwrap-0.0.3" - sources."amdefine-1.0.1" 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."repeat-string-1.6.1" - sources."is-buffer-1.1.6" - sources."through-2.3.8" - sources."JSONStream-1.3.2" - 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-2.3.0" - sources."ini-1.3.5" - 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-1.1.0" - sources."parse-json-2.2.0" - sources."pinkie-promise-2.0.1" - sources."strip-bom-2.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."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-2.0.3" - 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.1.0" - 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."restore-cursor-2.0.0" - sources."onetime-2.0.1" - sources."mimic-fn-1.1.0" - sources."chardet-0.4.2" - sources."iconv-lite-0.4.19" - sources."tmp-0.0.33" - sources."is-promise-2.1.0" - sources."is-fullwidth-code-point-2.0.0" - sources."ci-info-1.1.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."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.20.1" - (sources."make-dir-1.1.0" // { + sources."util-deprecate-1.0.2" + sources."uuid-2.0.3" + sources."validate-npm-package-license-3.0.1" + sources."wcwidth-1.0.1" + sources."which-1.3.0" + 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."write-file-atomic-2.3.0" + (sources."write-json-file-2.3.0" // { dependencies = [ sources."pify-3.0.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."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."read-pkg-2.0.0" + sources."read-pkg-up-2.0.0" + sources."strip-bom-3.0.0" + ]; + }) 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 = { @@ -32949,6 +34030,116 @@ in production = true; bypassCache = false; }; + less = nodeEnv.buildNodePackage { + name = "less"; + packageName = "less"; + version = "2.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/less/-/less-2.7.3.tgz"; + sha512 = "04jbm6adzhknlcwjjdd94n8dhqwgsg0fyampis9854jf23z9g9lxs8593908ymwldl88bjipf9b9rw6xfibb29vv7s0c44wllj4ixr8"; + }; + dependencies = [ + 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.5" + 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.6" + 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.30.0" + sources."mime-types-2.1.17" + 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.13.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.3" + 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 = "Leaner CSS"; + homepage = http://lesscss.org/; + license = "Apache-2.0"; + }; + production = true; + bypassCache = false; + }; + 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/less-plugin-clean-css/-/less-plugin-clean-css-1.5.1.tgz"; + sha1 = "cc57af7aa3398957e56decebe63cb60c23429703"; + }; + dependencies = [ + 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 = "clean-css plugin for less.js"; + homepage = http://lesscss.org/; + }; + production = true; + bypassCache = false; + }; lcov-result-merger = nodeEnv.buildNodePackage { name = "lcov-result-merger"; packageName = "lcov-result-merger"; @@ -32958,93 +34149,84 @@ in sha1 = "5de1e6426f885929b77357f014de5fee1dad0553"; }; dependencies = [ - sources."through2-2.0.3" - sources."vinyl-1.2.0" - (sources."vinyl-fs-2.4.4" // { - dependencies = [ - sources."is-extglob-1.0.0" - sources."is-glob-2.0.1" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" - ]; - }) - sources."readable-stream-2.3.3" - sources."xtend-4.0.1" - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.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" // { - dependencies = [ - sources."through2-0.6.5" - sources."readable-stream-1.0.34" - ]; - }) - sources."graceful-fs-4.1.11" - sources."gulp-sourcemaps-1.6.0" - 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."vali-date-1.0.0" - sources."end-of-stream-1.4.0" - sources."stream-shift-1.0.0" - sources."once-1.4.0" - sources."wrappy-1.0.2" - sources."extend-3.0.1" - sources."glob-5.0.15" - sources."glob-parent-3.1.0" - (sources."micromatch-2.3.11" // { - dependencies = [ - sources."glob-parent-2.0.0" - ]; - }) - 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-3.1.0" - sources."path-dirname-1.0.2" - sources."is-extglob-2.1.1" 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.8" (sources."braces-1.8.5" // { dependencies = [ sources."kind-of-4.0.0" ]; }) + sources."clone-1.0.3" + sources."clone-stats-0.0.1" + sources."concat-map-0.0.1" + sources."convert-source-map-1.5.1" + sources."core-util-is-1.0.2" + sources."duplexify-3.5.3" + 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."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."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."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."normalize-path-2.1.1" + sources."object-assign-4.1.1" + 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-1.0.7" (sources."randomatic-1.1.7" // { dependencies = [ (sources."is-number-3.0.0" // { @@ -33054,25 +34236,34 @@ in }) ]; }) - sources."repeat-string-1.6.1" - sources."is-buffer-1.1.6" - sources."is-posix-bracket-0.1.1" + sources."readable-stream-2.3.3" + sources."regex-cache-0.4.4" 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.1" - sources."minimist-0.0.8" - sources."is-utf8-0.2.1" - sources."first-chunk-stream-1.0.0" + sources."repeat-element-1.1.2" + sources."repeat-string-1.6.1" + sources."replace-ext-0.0.1" + sources."safe-buffer-5.1.1" + sources."stream-shift-1.0.0" + sources."string_decoder-1.0.3" + 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-1.2.0" + (sources."vinyl-fs-2.4.4" // { + dependencies = [ + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + ]; + }) + sources."wrappy-1.0.2" + sources."xtend-4.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -33092,78 +34283,177 @@ in sha512 = "3pnrrz3blfy50s64c4wdj9gjl8zv3p72wd0vmrk86qjdd676g9sj4cwywp356r633csg568pczll7pfb6sxpm0x9fvbk4zhwvdpb70b"; }; dependencies = [ + sources."accepts-1.3.4" + sources."after-0.8.2" + sources."ajv-5.5.2" + sources."anymatch-1.3.2" + sources."argparse-1.0.9" + 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.6.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" + sources."boom-4.3.1" + sources."brace-expansion-1.1.8" + (sources."braces-1.8.5" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + 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.5" + 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.1.4" + sources."engine.io-client-3.1.4" + 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.2" // { dependencies = [ sources."setprototypeof-1.1.0" sources."statuses-1.3.1" ]; }) + sources."extend-3.0.1" + sources."extglob-0.3.2" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.0.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.0" + sources."for-in-1.0.2" + sources."for-own-0.1.5" + sources."forever-agent-0.6.1" + sources."form-data-2.3.1" + 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.0" + sources."html-entities-1.2.1" + (sources."http-errors-1.6.2" // { + dependencies = [ + sources."depd-1.1.1" + ]; + }) + 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.2" + sources."ipaddr.js-1.5.2" + 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.0" sources."markdown-it-emoji-1.4.0" sources."markdown-it-github-headings-1.1.0" - sources."markdown-it-task-checkbox-1.0.5" - sources."minimist-1.2.0" - sources."opn-5.1.0" - sources."request-2.83.0" - (sources."socket.io-2.0.4" // { - dependencies = [ - sources."accepts-1.3.3" - sources."isarray-2.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.4.0" - sources."ee-first-1.1.1" - sources."unpipe-1.0.0" + sources."markdown-it-task-checkbox-1.0.6" + sources."mdurl-1.0.1" 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."merge-descriptors-1.0.1" + sources."methods-1.1.2" sources."micromatch-2.3.11" + sources."mime-1.4.1" + sources."mime-db-1.30.0" + sources."mime-types-2.1.17" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + sources."ms-2.0.0" + sources."nan-2.8.0" + sources."negotiator-0.6.1" sources."normalize-path-2.1.1" - sources."arr-diff-2.0.0" - sources."array-unique-0.2.1" - (sources."braces-1.8.5" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) - 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."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.2.0" 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."parseqs-0.0.5" + sources."parseuri-0.0.5" + 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."preserve-0.2.0" - sources."repeat-element-1.1.2" - sources."fill-range-2.2.3" - sources."is-number-2.1.0" - sources."isobject-2.1.0" + sources."process-nextick-args-1.0.7" + sources."proxy-addr-2.0.2" + sources."punycode-1.4.1" + sources."qs-6.5.1" (sources."randomatic-1.1.7" // { dependencies = [ (sources."is-number-3.0.0" // { @@ -33173,147 +34463,52 @@ in }) ]; }) - 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.11.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."util-deprecate-1.0.2" - sources."nan-2.8.0" - 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."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."raw-body-2.3.2" + sources."readable-stream-2.3.3" + 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.83.0" + sources."safe-buffer-5.1.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."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."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."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.5.2" - 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-4.3.1" - (sources."cryptiles-3.1.2" // { + sources."set-immediate-shim-1.0.1" + sources."setprototypeof-1.0.3" + sources."sntp-2.1.0" + (sources."socket.io-2.0.4" // { dependencies = [ - sources."boom-5.2.0" + sources."accepts-1.3.3" + sources."isarray-2.0.1" ]; }) - 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.3" - 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.1" - 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."sprintf-js-1.0.3" + sources."sshpk-1.13.1" + sources."statuses-1.4.0" + sources."string_decoder-1.0.3" + sources."stringstream-0.0.5" sources."to-array-0.1.4" - sources."component-inherit-0.0.3" - sources."xmlhttprequest-ssl-1.5.4" + sources."tough-cookie-2.3.3" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-is-1.6.15" + sources."uc.micro-1.0.3" + 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."uws-0.14.5" + 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" - sources."better-assert-1.0.2" - sources."callsite-1.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -33333,22 +34528,122 @@ in sha1 = "4498644bbf81a66f18dd8dffdef61c4c1c374ca3"; }; dependencies = [ + sources."accepts-1.3.4" + 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.8" + (sources."braces-1.8.5" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) sources."chokidar-1.7.0" sources."colors-1.1.2" + 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.2" // { + dependencies = [ + sources."depd-1.1.1" + ]; + }) + sources."http-parser-js-0.4.9" + 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.30.0" + sources."mime-types-2.1.17" + sources."minimatch-3.0.4" (sources."morgan-1.9.0" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" ]; }) + sources."ms-0.7.1" + sources."nan-2.8.0" + sources."negotiator-0.6.1" + sources."normalize-path-2.1.1" sources."object-assign-4.1.1" - sources."opn-5.1.0" + sources."object.omit-2.0.1" + sources."on-finished-2.3.0" + sources."on-headers-1.0.1" + sources."opn-5.2.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-1.0.7" 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.3" + 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.1" // { dependencies = [ sources."debug-2.6.9" @@ -33361,117 +34656,21 @@ in sources."ms-2.0.0" ]; }) - 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" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) - 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-2.1.0" - sources."isobject-2.1.0" - (sources."randomatic-1.1.7" // { - dependencies = [ - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - ]; - }) - sources."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.11.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."util-deprecate-1.0.2" - sources."nan-2.8.0" - sources."debug-2.2.0" - sources."finalhandler-0.5.1" - sources."parseurl-1.3.2" - sources."utils-merge-1.0.0" - sources."ms-0.7.1" - 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" + sources."split-0.3.3" + sources."statuses-1.3.1" + sources."stream-combiner-0.0.4" + sources."string_decoder-1.0.3" + 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 = { @@ -33491,24 +34690,24 @@ in 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."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 = { @@ -33521,35 +34720,35 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "4.0.1"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-4.0.1.tgz"; - sha512 = "07hbr2w894az0s1hi6lglls00nwb941ymwm580q4917kwcmsg3ngagqf9cfxyjdwwivm956dpwzsrkbk4i7a404i56w1y809a3fdw3s"; + url = "https://registry.npmjs.org/mocha/-/mocha-5.0.0.tgz"; + sha512 = "3rxvm15qz9qdiyihc9pq4kc008iz89cqdqjlca43swmk3fc7bydlaqk1qyhaj19r5m8cxxrpiwxz5cwrp9im26fin4sgqdfbxs7ch5s"; }; dependencies = [ + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.8" sources."browser-stdout-1.3.0" sources."commander-2.11.0" + sources."concat-map-0.0.1" sources."debug-3.1.0" sources."diff-3.3.1" 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."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."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."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" ]; buildInputs = globalBuildInputs; meta = { @@ -33569,43 +34768,43 @@ in sha1 = "0161a13e2b3378759e36b9e05be34b46a06decd5"; }; dependencies = [ - sources."commander-2.12.2" - 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.2" + sources."asynckit-0.4.0" + sources."combined-stream-1.0.5" + sources."commander-2.13.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.1" sources."formidable-1.1.1" - sources."methods-1.1.2" - sources."mime-1.6.0" - 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."core-util-is-1.0.2" + sources."graphlib-2.1.5" sources."inherits-2.0.3" sources."isarray-1.0.0" + sources."js-yaml-3.10.0" + sources."json-refs-2.1.7" + sources."lodash-4.17.4" + sources."methods-1.1.2" + sources."mime-1.6.0" + sources."mime-db-1.30.0" + sources."mime-types-2.1.17" + sources."ms-2.0.0" + sources."native-promise-only-0.8.1" + sources."path-loader-1.0.4" 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."qs-6.5.1" + sources."readable-stream-2.3.3" + sources."safe-buffer-5.1.1" + sources."slash-1.0.0" + sources."sprintf-js-1.0.3" + sources."string_decoder-1.0.3" + sources."superagent-3.8.2" + sources."uri-js-3.0.2" + sources."util-deprecate-1.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -33639,14 +34838,92 @@ in node2nix = nodeEnv.buildNodePackage { name = "node2nix"; packageName = "node2nix"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/node2nix/-/node2nix-1.5.0.tgz"; - sha512 = "2nywjjmihrnbpbm29ipgxb3jbl2lbdnmm53vpr9b151k41xvfv74z43ldc79p15b58gdadh5gh3ilsgxxa6hqs6mbizfh4a3nkzj87i"; + url = "https://registry.npmjs.org/node2nix/-/node2nix-1.5.1.tgz"; + sha512 = "1iy5npqmbdgxjalbw73ybgd2pfhizi8jdg91w9dpcmj9hfz02wbl306bwia397njlz5ymcblbc700zp8qb2lvrpw7jnyfvmflpvvglp"; }; dependencies = [ - sources."optparse-1.0.5" - sources."semver-5.4.1" + 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.6.0" + sources."base64-js-1.2.1" + sources."bcrypt-pbkdf-1.0.1" + sources."boom-4.3.1" + 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.5" + sources."concat-stream-1.6.0" + 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.0.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.1" + 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.0" + sources."hosted-git-info-2.5.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.30.0" + sources."mime-types-2.1.17" + sources."minimist-0.0.8" + sources."minipass-2.2.1" + 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-5.1.2" sources."npm-registry-client-8.4.0" (sources."npmconf-2.1.2" // { dependencies = [ @@ -33654,134 +34931,56 @@ in sources."semver-4.3.6" ]; }) - sources."tar-3.1.15" - sources."temp-0.8.3" - (sources."fs.extra-1.3.2" // { - dependencies = [ - sources."mkdirp-0.3.5" - ]; - }) - 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."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.4" + sources."performance-now-2.1.0" + sources."process-nextick-args-1.0.7" + sources."proto-list-1.2.4" + sources."punycode-1.4.1" + sources."qs-6.5.1" + sources."readable-stream-2.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."rimraf-2.2.8" 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."builtin-modules-1.1.1" + sources."semver-5.4.1" + 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-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."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."sshpk-1.13.1" + sources."ssri-4.1.6" + sources."string-width-1.0.2" + sources."string_decoder-1.0.3" 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.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.5.2" - 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-4.3.1" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) - 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."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-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.5" - sources."mkdirp-0.5.1" - sources."nopt-3.0.6" + sources."typedarray-0.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.1.0" - sources."yallist-3.0.2" - sources."rimraf-2.2.8" - sources."fs-extra-0.6.4" + sources."util-deprecate-1.0.2" + sources."uuid-3.2.1" + sources."validate-npm-package-license-3.0.1" + sources."validate-npm-package-name-3.0.0" + sources."verror-1.10.0" sources."walk-2.3.9" - sources."ncp-0.4.2" - sources."jsonfile-1.0.1" - sources."foreachasync-3.0.0" + sources."wide-align-1.1.2" + sources."wrappy-1.0.2" + sources."yallist-3.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -33801,109 +35000,109 @@ in sha1 = "9bfbe54562286284838e750eac05295853fa1c60"; }; dependencies = [ - sources."fstream-1.0.11" - 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."inflight-1.0.6" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."wrappy-1.0.2" - sources."brace-expansion-1.1.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."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."ajv-5.5.2" sources."ansi-regex-2.1.1" - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" + 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.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.5.2" - 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."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.8" + sources."caseless-0.12.0" + sources."co-4.6.0" + sources."code-point-at-1.1.0" + sources."combined-stream-1.0.5" + 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."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."delayed-stream-1.0.0" + sources."delegates-1.0.0" 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."extend-3.0.1" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.1" + 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.0" + 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.30.0" + sources."mime-types-2.1.17" + 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.4" + sources."path-is-absolute-1.0.1" + sources."performance-now-2.1.0" + sources."process-nextick-args-1.0.7" + sources."punycode-1.4.1" + sources."qs-6.5.1" + sources."readable-stream-2.3.3" + sources."request-2.83.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.13.1" + sources."string-width-1.0.2" + sources."string_decoder-1.0.3" + sources."stringstream-0.0.5" + sources."strip-ansi-3.0.1" + sources."tar-2.2.1" + sources."tough-cookie-2.3.3" + 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 = { @@ -33940,258 +35139,262 @@ in sha1 = "e7851eb973f380543c058db564a9812055eac640"; }; dependencies = [ + sources."abbrev-1.1.1" + sources."accepts-1.3.4" + 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.6.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."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" // { - dependencies = [ - sources."rimraf-2.6.2" - sources."semver-5.4.1" - sources."qs-6.4.0" - sources."glob-7.1.2" - ]; - }) - 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" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - sources."minimist-1.2.0" - sources."x-default-browser-0.3.1" - sources."headless-0.1.7" - sources."lodash-2.4.2" - sources."mkdirp-0.5.1" - sources."osenv-0.1.4" - (sources."plist-1.2.0" // { - dependencies = [ - sources."lodash-3.10.1" - ]; - }) - sources."win-detect-browsers-1.0.2" - sources."uid-0.0.2" - sources."rimraf-2.2.8" - 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.26" - 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."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.8" + (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.5" + 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."depd-1.1.1" - sources."encodeurl-1.0.1" + 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."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."encodeurl-1.0.2" + sources."error-ex-1.3.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.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.1.0" - 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."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."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."deep-extend-0.4.2" - sources."ini-1.3.5" - sources."strip-json-comments-2.0.1" - sources."truncate-1.0.5" - sources."nan-2.8.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.3" - 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."express-4.16.2" sources."extend-3.0.1" + sources."extsprintf-1.3.0" + sources."finalhandler-1.1.0" + sources."find-up-1.1.2" 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."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."co-4.6.0" + 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.5.0" + (sources."http-errors-1.6.2" // { + dependencies = [ + sources."depd-1.1.1" + ]; + }) + 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.5.2" + 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."assert-plus-0.2.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.30.0" + sources."mime-types-2.1.17" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + sources."mkdirp-0.5.1" + sources."ms-2.0.0" + sources."nan-2.8.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."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.4" + 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-1.0.7" + sources."proxy-addr-2.0.2" + sources."punycode-1.4.1" + sources."qs-6.5.1" + sources."range-parser-1.2.0" + sources."raw-body-2.3.2" + sources."rc-1.2.4" + sources."read-pkg-1.1.0" + sources."read-pkg-up-1.0.1" + sources."readable-stream-2.3.3" + 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.1" + sources."serve-favicon-2.4.5" + sources."serve-static-1.13.1" + 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-1.0.2" + sources."spdx-expression-parse-1.0.4" + sources."spdx-license-ids-1.2.2" (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) - 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."statuses-1.3.1" + sources."string-width-1.0.2" + sources."string_decoder-1.0.3" + sources."stringstream-0.0.5" + 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.4" + sources."tar-2.2.1" + sources."tar-pack-3.4.1" + sources."tough-cookie-2.3.3" + sources."trim-newlines-1.0.0" + sources."truncate-1.0.5" + sources."tunnel-agent-0.6.0" 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."type-is-1.6.15" + sources."uid-0.0.2" sources."uid-number-0.0.6" - sources."isexe-2.0.0" - sources."options-0.0.6" sources."ultron-1.0.2" - sources."cliui-3.2.0" - sources."os-locale-1.4.0" + 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.1" + sources."vary-1.1.2" + sources."verror-1.10.0" + sources."which-1.3.0" + sources."wide-align-1.1.2" + sources."win-detect-browsers-1.0.2" 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."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 = { @@ -34210,124 +35413,124 @@ in sha512 = "2cwrivwc0ha272cly9r61bbb14kkl1s1hsmn53yr88b6pfjqj512nac6c5rphc6ak88v8gpl1f879qdd3v7386103zzr7miibpmbhis"; }; dependencies = [ - sources."mkdirp-0.5.1" - sources."nopt-4.0.1" - sources."npmlog-4.1.2" - (sources."rc-1.2.2" // { - dependencies = [ - sources."minimist-1.2.0" - ]; - }) - 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.3" - sources."tar-2.2.1" - sources."tar-pack-3.4.1" - sources."minimist-0.0.8" 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."ajv-4.11.8" sources."ansi-regex-2.1.1" - sources."deep-extend-0.4.2" - sources."ini-1.3.5" - sources."strip-json-comments-2.0.1" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.4" + 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."balanced-match-1.0.0" + sources."bcrypt-pbkdf-1.0.1" + sources."block-stream-0.0.9" + sources."boom-2.10.1" + sources."brace-expansion-1.1.8" sources."caseless-0.12.0" + sources."co-4.6.0" + sources."code-point-at-1.1.0" sources."combined-stream-1.0.5" + sources."concat-map-0.0.1" + sources."console-control-strings-1.1.0" + sources."core-util-is-1.0.2" + sources."cryptiles-2.0.5" + 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."detect-libc-1.0.3" + sources."ecc-jsbn-0.1.1" sources."extend-3.0.1" + sources."extsprintf-1.3.0" 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."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."graceful-fs-4.1.11" sources."har-schema-1.0.5" - sources."co-4.6.0" + sources."har-validator-4.2.1" + sources."has-unicode-2.0.1" + 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.3.5" + 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-stable-stringify-1.0.1" + sources."json-stringify-safe-5.0.1" sources."jsonify-0.0.0" - sources."assert-plus-0.2.0" (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) + sources."mime-db-1.30.0" + sources."mime-types-2.1.17" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."ms-2.0.0" + sources."nopt-4.0.1" + 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.4" + sources."path-is-absolute-1.0.1" + sources."performance-now-0.2.0" + sources."process-nextick-args-1.0.7" + sources."punycode-1.4.1" + sources."qs-6.4.0" + (sources."rc-1.2.4" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."readable-stream-2.3.3" + sources."request-2.81.0" + sources."rimraf-2.6.2" + sources."safe-buffer-5.1.1" + sources."semver-5.5.0" + sources."set-blocking-2.0.0" + sources."signal-exit-3.0.2" + sources."sntp-1.0.9" (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) - 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."string-width-1.0.2" + 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."tar-2.2.1" + sources."tar-pack-3.4.1" + sources."tough-cookie-2.3.3" + 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-1.4.1" - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - 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."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."util-deprecate-1.0.2" + sources."uuid-3.2.1" + sources."verror-1.10.0" + sources."wide-align-1.1.2" + sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -34341,170 +35544,301 @@ in nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "1.14.1"; + version = "1.14.11"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-1.14.1.tgz"; - sha512 = "16bny3b6b2rj8x1kskp3yviwxpz81pzs2v99pfxqjc0hjjl0dvpp6zn6227gkisvfrvszgf1bnxrq7w9bnbdm2aj4i5wv7y1ad17mry"; + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.14.11.tgz"; + sha512 = "11wlzxf5xjrdybvf0lr1acr7bqhdy7s66m1w5cm02g8pzbd567xziphv1pjx6i27s34qh18rjhp6prc1rapp68x1lr8gkaxi8zfwvfz"; }; dependencies = [ - sources."chokidar-1.7.0" - sources."debug-2.6.9" - sources."ignore-by-default-1.0.1" - sources."minimatch-3.0.4" - sources."pstree.remy-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."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."abbrev-1.1.1" + sources."ansi-align-2.0.0" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.0" + (sources."anymatch-2.0.0" // { dependencies = [ - sources."kind-of-4.0.0" + sources."is-accessor-descriptor-1.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" ]; }) - 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-diff-4.0.0" sources."arr-flatten-1.1.0" - sources."expand-range-1.8.2" - sources."preserve-0.2.0" - sources."repeat-element-1.1.2" - sources."fill-range-2.2.3" - sources."is-number-2.1.0" - sources."isobject-2.1.0" - (sources."randomatic-1.1.7" // { + 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.0.3" + sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { dependencies = [ - (sources."is-number-3.0.0" // { + (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.8" + sources."braces-2.3.0" + sources."cache-base-1.0.1" + sources."camelcase-4.1.0" + sources."capture-stack-trace-1.0.0" + sources."chalk-2.3.0" + (sources."chokidar-2.0.0" // { + dependencies = [ + sources."debug-2.6.9" + 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."kind-of-3.2.2" + ]; + }) + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" ]; }) - 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.11.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.8.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."ps-tree-1.1.0" - sources."event-stream-3.3.4" - 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.3.0" - 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-2.1.1" - sources."term-size-1.2.0" - sources."widest-line-2.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."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."ansi-styles-3.2.0" - sources."escape-string-regexp-1.0.5" - sources."supports-color-4.5.0" + sources."collection-visit-1.0.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.1" - sources."is-path-inside-1.0.1" - sources."ini-1.3.5" - 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."component-emitter-1.2.1" + sources."concat-map-0.0.1" + sources."configstore-3.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."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-1.0.0" + 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-2.0.1" + (sources."extglob-2.0.4" // { + dependencies = [ + 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."has-flag-2.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."ini-1.3.5" + 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-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-3.0.0" + sources."is-obj-1.0.1" + (sources."is-odd-1.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + 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."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."lazy-cache-2.0.2" 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."lru-cache-4.1.1" + sources."make-dir-1.1.0" + sources."map-cache-0.2.2" + sources."map-stream-0.1.0" + sources."map-visit-1.0.0" + (sources."micromatch-3.1.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."minimatch-3.0.4" sources."minimist-1.2.0" + sources."mixin-deep-1.3.0" + sources."ms-2.0.0" + sources."nan-2.8.0" + (sources."nanomatch-1.2.7" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + 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-1.0.7" + sources."ps-tree-1.1.0" + sources."pseudomap-1.0.2" + sources."pstree.remy-1.1.0" + sources."rc-1.2.4" + sources."readable-stream-2.3.3" + sources."readdirp-2.1.0" + sources."regex-not-1.0.0" + sources."registry-auth-token-3.3.1" + 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."safe-buffer-5.1.1" + sources."semver-5.5.0" + sources."semver-diff-2.1.0" + sources."set-getter-0.1.0" + sources."set-immediate-shim-1.0.1" + 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.1" // { + dependencies = [ + (sources."define-property-0.2.5" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + 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.0.3" + sources."strip-ansi-4.0.0" + sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" + sources."supports-color-4.5.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.1" // { + dependencies = [ + sources."define-property-0.2.5" + ]; + }) + sources."to-regex-range-2.1.1" + sources."touch-3.1.0" + (sources."undefsafe-2.0.1" // { + 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."update-notifier-2.3.0" + sources."urix-0.1.0" + sources."url-parse-lax-1.0.0" + sources."use-2.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 = { @@ -34524,19 +35858,114 @@ in sha1 = "1dcf3ead7902ce2df615cdfbe19f3cd9a50e28e2"; }; dependencies = [ + sources."abbrev-1.1.1" + sources."accepts-1.3.4" + sources."addressparser-0.1.3" + sources."ajv-5.5.2" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."append-field-0.1.0" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.4" + sources."argparse-1.0.9" + sources."array-flatten-1.1.1" + sources."array-indexofobject-0.0.1" + sources."asn1-0.2.3" + sources."assert-plus-0.2.0" + sources."async-0.1.22" + sources."async-limiter-1.0.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.6.0" + sources."aws4-1.6.0" + sources."balanced-match-1.0.0" sources."basic-auth-1.1.0" + (sources."bcrypt-1.0.3" // { + dependencies = [ + sources."assert-plus-1.0.0" + sources."aws-sign2-0.7.0" + sources."boom-4.3.1" + sources."caseless-0.12.0" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."hoek-4.2.0" + sources."http-signature-1.2.0" + sources."nopt-4.0.1" + sources."qs-6.5.1" + sources."request-2.83.0" + sources."sntp-2.1.0" + sources."tunnel-agent-0.6.0" + ]; + }) + sources."bcrypt-pbkdf-1.0.1" sources."bcryptjs-2.4.3" + sources."bl-1.2.1" + sources."block-stream-0.0.9" sources."body-parser-1.17.2" + sources."boolbase-1.0.0" + sources."boom-2.10.1" + sources."brace-expansion-1.1.8" + sources."buildmail-2.0.0" + sources."busboy-0.2.14" + sources."bytes-2.4.0" + sources."callback-stream-1.1.0" + sources."caseless-0.11.0" + sources."chalk-1.1.3" (sources."cheerio-0.22.0" // { dependencies = [ sources."domelementtype-1.1.3" ]; }) sources."clone-2.1.1" + sources."co-4.6.0" + sources."code-point-at-1.1.0" + sources."combined-stream-1.0.5" + sources."commander-2.9.0" + sources."commist-1.0.0" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.0" + 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.3" + sources."crc-3.4.4" sources."cron-1.2.1" + sources."cryptiles-2.0.5" + sources."css-select-1.2.0" + sources."css-what-2.1.0" + sources."dashdash-1.14.1" + sources."debug-2.6.7" + 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.3" + 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-3.1.3" + sources."etag-1.8.1" (sources."express-4.15.3" // { dependencies = [ sources."statuses-1.3.1" @@ -34548,139 +35977,103 @@ in sources."ms-0.7.2" ]; }) + sources."extend-3.0.1" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" + sources."feedparser-1.1.3" + (sources."finalhandler-1.0.6" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) sources."follow-redirects-1.2.4" + sources."forever-agent-0.6.1" + sources."form-data-1.0.1" + sources."forwarded-0.1.2" + sources."fresh-0.5.0" sources."fs-extra-1.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."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."getpass-0.1.7" + sources."glob-7.1.2" + sources."glob-parent-3.1.0" + sources."glob-stream-6.1.0" + sources."graceful-fs-4.1.11" + sources."graceful-readlink-1.0.1" + sources."har-schema-2.0.0" + sources."har-validator-2.0.6" + sources."has-ansi-2.0.0" + sources."has-unicode-2.0.1" 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" // { + sources."hawk-3.1.3" + (sources."help-me-1.1.0" // { dependencies = [ - sources."ws-3.3.3" + sources."pump-2.0.1" ]; }) - (sources."multer-1.3.0" // { - dependencies = [ - sources."object-assign-3.0.0" - sources."readable-stream-1.1.14" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" - sources."minimist-0.0.8" - ]; - }) - 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" // { - dependencies = [ - sources."ultron-1.0.2" - ]; - }) - sources."xml2js-0.4.17" - (sources."node-red-node-feedparser-0.1.8" // { - dependencies = [ - sources."sax-0.6.1" - sources."readable-stream-1.0.34" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" - sources."bl-1.1.2" - sources."qs-6.2.3" - sources."async-2.6.0" - ]; - }) - (sources."node-red-node-email-0.1.24" // { - dependencies = [ - sources."addressparser-0.3.2" - sources."clone-1.0.3" - sources."minimist-0.0.10" - sources."readable-stream-1.1.14" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" - ]; - }) - (sources."node-red-node-twitter-0.1.12" // { - dependencies = [ - sources."request-2.83.0" - sources."aws-sign2-0.7.0" - sources."caseless-0.12.0" - sources."form-data-2.3.1" - sources."har-validator-5.0.3" - sources."hawk-6.0.2" - sources."http-signature-1.2.0" - sources."qs-6.5.1" - sources."tunnel-agent-0.6.0" - 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."assert-plus-1.0.0" - ]; - }) - sources."node-red-node-rbe-0.1.14" - (sources."bcrypt-1.0.3" // { - dependencies = [ - sources."nopt-4.0.1" - sources."request-2.83.0" - sources."aws-sign2-0.7.0" - sources."caseless-0.12.0" - sources."form-data-2.3.1" - sources."har-validator-5.0.3" - sources."hawk-6.0.2" - sources."http-signature-1.2.0" - sources."qs-6.5.1" - sources."tunnel-agent-0.6.0" - 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."assert-plus-1.0.0" - ]; - }) - sources."bytes-2.4.0" - sources."content-type-1.0.4" - sources."debug-2.6.7" - 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.4.0" - sources."type-is-1.6.15" - sources."ms-2.0.0" - sources."inherits-2.0.3" - sources."setprototypeof-1.0.3" - sources."statuses-1.4.0" - 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."hoek-2.16.3" (sources."htmlparser2-3.9.2" // { dependencies = [ sources."domelementtype-1.3.0" ]; }) + (sources."http-errors-1.6.2" // { + dependencies = [ + sources."depd-1.1.1" + ]; + }) + sources."http-signature-1.1.1" + sources."i18next-1.10.6" + sources."i18next-client-1.10.3" + sources."iconv-lite-0.4.15" + sources."imap-0.8.19" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."ipaddr.js-1.4.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-my-json-valid-2.17.1" + sources."is-negated-glob-1.0.0" + sources."is-property-1.0.2" + 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.1" + sources."isarray-1.0.0" + sources."isstream-0.1.2" + sources."js-yaml-3.8.4" + 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.2.6" + 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."keygrip-1.0.2" + sources."klaw-1.3.1" + sources."leven-1.0.2" + sources."libbase64-0.1.0" + sources."libmime-1.2.0" + sources."libqp-1.1.0" + sources."lodash-4.17.4" sources."lodash.assignin-4.2.0" sources."lodash.bind-4.2.1" sources."lodash.defaults-4.2.0" @@ -34693,267 +36086,216 @@ in 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-signature-1.0.6" - sources."object-assign-4.1.1" - sources."vary-1.1.2" - sources."moment-timezone-0.5.14" - sources."moment-2.20.1" - 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.8.1" - (sources."finalhandler-1.0.6" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - 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-0.1.22" - 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.3" - 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."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.2" - 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."is-absolute-1.0.0" - sources."is-relative-1.0.0" - sources."is-windows-1.0.1" - sources."is-unc-path-1.0.0" - sources."unc-path-regex-0.1.2" - sources."json-stable-stringify-1.0.1" - sources."through2-filter-2.0.0" - sources."jsonify-0.0.0" - sources."bl-1.2.1" - sources."async-limiter-1.0.0" - sources."ultron-1.1.1" - 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-1.2.4" - sources."xmlbuilder-4.2.1" - sources."lodash-4.17.4" - sources."feedparser-1.1.3" - (sources."request-2.74.0" // { - dependencies = [ - sources."readable-stream-2.0.6" - sources."isarray-1.0.0" - ]; - }) - sources."addressparser-0.1.3" - sources."array-indexofobject-0.0.1" - 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-1.0.1" - sources."har-validator-2.0.6" - sources."hawk-3.1.3" - sources."http-signature-1.1.1" - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."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.4.3" - sources."delayed-stream-1.0.0" - sources."chalk-1.1.3" - sources."is-my-json-valid-2.17.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-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" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - 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."nodemailer-1.11.0" - sources."poplib-0.1.7" - (sources."mailparser-0.6.2" // { - dependencies = [ - sources."addressparser-1.0.1" - ]; - }) - sources."imap-0.8.19" - sources."libmime-1.2.0" (sources."mailcomposer-2.1.0" // { dependencies = [ sources."needle-0.10.0" ]; }) + (sources."mailparser-0.6.2" // { + dependencies = [ + sources."addressparser-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.30.0" + sources."mime-types-2.1.17" + sources."mimelib-0.3.1" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + sources."mkdirp-0.5.1" + sources."moment-2.20.1" + sources."moment-timezone-0.5.14" + (sources."mqtt-2.9.0" // { + dependencies = [ + sources."ws-3.3.3" + ]; + }) + sources."mqtt-packet-5.4.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.24" // { + dependencies = [ + sources."addressparser-0.3.2" + sources."clone-1.0.3" + sources."isarray-0.0.1" + sources."minimist-0.0.10" + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" + ]; + }) + (sources."node-red-node-feedparser-0.1.8" // { + dependencies = [ + sources."async-2.6.0" + sources."bl-1.1.2" + sources."isarray-0.0.1" + sources."qs-6.2.3" + sources."readable-stream-1.0.34" + sources."sax-0.6.1" + sources."string_decoder-0.10.31" + ]; + }) + sources."node-red-node-rbe-0.1.14" + (sources."node-red-node-twitter-0.1.12" // { + dependencies = [ + sources."assert-plus-1.0.0" + sources."aws-sign2-0.7.0" + sources."boom-4.3.1" + sources."caseless-0.12.0" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) + sources."form-data-2.3.1" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."hoek-4.2.0" + sources."http-signature-1.2.0" + sources."qs-6.5.1" + sources."request-2.83.0" + sources."sntp-2.1.0" + sources."tunnel-agent-0.6.0" + ]; + }) + sources."node-uuid-1.4.8" + sources."nodemailer-1.11.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.5.2" - 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."nopt-3.0.6" 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."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.8.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."are-we-there-yet-1.1.4" - sources."console-control-strings-1.1.0" - sources."gauge-2.7.4" + sources."osenv-0.1.4" + sources."parseurl-1.3.2" + sources."passport-0.3.2" + 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."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."poplib-0.1.7" + sources."process-nextick-args-1.0.7" + sources."proxy-addr-1.1.5" + sources."pump-1.0.3" + sources."pumpify-1.4.0" + sources."punycode-1.4.1" + sources."qs-6.4.0" + sources."random-bytes-1.0.0" + sources."range-parser-1.2.0" + sources."raw-body-2.2.0" + sources."rc-1.2.4" + sources."readable-stream-2.3.3" + sources."reinterval-1.1.0" + sources."remove-trailing-separator-1.1.0" + (sources."request-2.74.0" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.0.6" + ]; + }) + sources."retry-0.6.1" + sources."rimraf-2.6.2" + sources."safe-buffer-5.1.1" + sources."sax-1.2.4" + sources."semver-5.3.0" + sources."send-0.15.3" + sources."sentiment-2.1.0" + sources."serve-static-1.12.3" 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.0.3" sources."signal-exit-3.0.2" + sources."smtp-connection-1.3.8" + sources."sntp-1.0.9" + sources."source-map-0.5.7" + sources."split2-2.2.0" + sources."sprintf-js-1.0.3" + (sources."sshpk-1.13.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."statuses-1.4.0" + sources."stream-shift-1.0.0" + sources."streamsearch-0.1.2" sources."string-width-1.0.2" - sources."wide-align-1.1.2" - sources."code-point-at-1.1.0" - sources."is-fullwidth-code-point-1.0.0" - sources."number-is-nan-1.0.1" - sources."deep-extend-0.4.2" - sources."ini-1.3.5" + 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."block-stream-0.0.9" - sources."fstream-1.0.11" - sources."fstream-ignore-1.0.5" + sources."supports-color-2.0.0" + 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.3" + sources."tunnel-agent-0.4.3" + sources."tweetnacl-0.14.5" + sources."twitter-ng-0.6.2" + sources."type-is-1.6.15" + sources."typedarray-0.0.6" + sources."uglify-js-3.0.20" 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."unpipe-1.0.0" + sources."utf7-1.0.2" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.0" + sources."uue-3.1.1" + sources."uuid-3.2.1" + sources."vary-1.1.2" + sources."verror-1.10.0" + sources."websocket-stream-5.1.1" + 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.1" // { + dependencies = [ + sources."ultron-1.0.2" + ]; + }) + sources."xml2js-0.4.17" + sources."xmlbuilder-4.2.1" + sources."xtend-4.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -34974,114 +36316,114 @@ in sha256 = "46424d7f9553ce7313cc09995ab11d237dd02257c29f260cfb38d2799e7c7746"; }; dependencies = [ - sources."mongoose-3.6.7" - sources."mongoose-lifecycle-1.0.0" + 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."js-yaml-0.3.7" + ]; + }) + (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."connect-flash-0.1.0" - sources."ejs-0.8.3" - (sources."config-0.4.15" // { - dependencies = [ - sources."js-yaml-0.3.7" - ]; - }) - sources."async-0.1.22" - (sources."socket.io-0.9.14" // { - dependencies = [ - sources."commander-2.1.0" - ]; - }) - sources."semver-1.1.0" - sources."moment-2.1.0" - sources."nodemailer-0.3.35" - (sources."net-ping-1.1.7" // { - dependencies = [ - sources."nan-2.3.5" - ]; - }) - sources."js-yaml-2.1.0" + 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."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."ms-0.1.0" - sources."sliced-0.0.3" - sources."muri-0.3.1" + sources."mongoose-3.6.7" + sources."mongoose-lifecycle-1.0.0" + sources."mpath-0.1.1" (sources."mpromise-0.2.1" // { dependencies = [ sources."sliced-0.0.4" ]; }) - sources."mpath-0.1.1" - sources."bson-0.1.8" - (sources."connect-2.7.6" // { + sources."ms-0.1.0" + sources."muri-0.3.1" + sources."nan-1.0.0" + sources."natives-1.1.1" + (sources."net-ping-1.1.7" // { dependencies = [ - sources."buffer-crc32-0.1.1" + sources."nan-2.3.5" ]; }) - sources."commander-0.6.1" - sources."range-parser-0.0.4" - sources."mkdirp-0.3.5" - sources."cookie-0.0.5" - sources."buffer-crc32-0.2.13" - 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."once-1.4.0" - sources."natives-1.1.1" - sources."lru-cache-2.7.3" - sources."sigmund-1.0.1" - 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-1.0.0" - 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-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."iconv-lite-0.4.15" + sources."qs-0.5.1" 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."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."ws-0.4.32" + sources."xmlhttprequest-1.4.2" + sources."xoauth2-0.1.8" + sources."zeparser-0.0.5" ]; buildInputs = globalBuildInputs; meta = { @@ -35118,8 +36460,101 @@ in sha256 = "e1b252cd883fd8c5c4618b157d03b3fb869fa6aad4170ef51e34681069d50bf5"; }; dependencies = [ - sources."semver-4.3.6" + 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.6.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.8" + 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.5" + 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."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.0.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."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.0" + 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.30.0" + sources."mime-types-2.1.17" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.3.5" + sources."natives-1.1.1" + sources."ncp-0.4.2" + sources."nopt-2.2.1" (sources."npm-registry-client-0.2.27" // { dependencies = [ sources."semver-2.0.11" @@ -35132,150 +36567,57 @@ in 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-1.0.7" + sources."proto-list-1.2.4" + sources."punycode-1.4.1" + sources."qs-6.5.1" + sources."readable-stream-2.3.3" + sources."request-2.83.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.13.1" + sources."string-width-1.0.2" + sources."string_decoder-1.0.3" + sources."stringstream-0.0.5" + sources."strip-ansi-3.0.1" (sources."tar-0.1.17" // { dependencies = [ - sources."inherits-1.0.2" sources."graceful-fs-3.0.11" + sources."inherits-1.0.2" sources."mkdirp-0.5.1" ]; }) (sources."temp-0.6.0" // { dependencies = [ - sources."rimraf-2.1.4" sources."graceful-fs-1.2.3" + sources."rimraf-2.1.4" ]; }) - (sources."fs.extra-1.3.2" // { - dependencies = [ - sources."rimraf-2.2.8" - ]; - }) - 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-2.0.3" - sources."slide-1.1.6" - sources."chownr-0.0.2" - sources."mkdirp-0.3.5" - sources."rimraf-2.6.2" - 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."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."uuid-3.1.0" - sources."delayed-stream-1.0.0" - sources."asynckit-0.4.0" - sources."ajv-5.5.2" - 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-4.3.1" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) - 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.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."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."underscore-1.4.4" + sources."underscore.string-2.3.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" // { - dependencies = [ - sources."ini-1.3.5" - ]; - }) - sources."osenv-0.0.3" - sources."nopt-2.2.1" - sources."ini-1.1.0" - sources."proto-list-1.2.4" - sources."abbrev-1.1.1" - (sources."block-stream-0.0.9" // { - dependencies = [ - sources."inherits-2.0.3" - ]; - }) - (sources."fstream-0.1.31" // { - dependencies = [ - sources."inherits-2.0.3" - ]; - }) - sources."natives-1.1.1" - sources."minimist-0.0.8" - sources."fs-extra-0.6.4" + sources."uuid-3.2.1" + sources."verror-1.10.0" sources."walk-2.3.9" - sources."ncp-0.4.2" - sources."jsonfile-1.0.1" - sources."foreachasync-3.0.0" + sources."wide-align-1.1.2" + sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -35288,335 +36630,339 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "2.13.0"; + version = "2.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.13.0.tgz"; - sha512 = "3gqr04g6asacfpr7bmz0mqn3mga6vyq106wmjiyz7p4z1m58ia6zk3541s35hpf5g6wmkv52pmal8wnzxair9286jsr722lxrnn78f2"; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.14.0.tgz"; + sha512 = "1yk2hf3npvf7kjmiapbq8np5dsb9sx8iiinnfm69vabh55ahzxdv3m14s2sbbsx5q0n269jyz3qhiqx5krhvmbpgqpihas5nvwwlras"; }; dependencies = [ + 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.9" + 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.8" + 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."cint-8.2.1" + sources."cli-boxes-1.0.0" + sources."cli-cursor-1.0.2" sources."cli-table-0.3.1" - sources."commander-2.12.2" - 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" // { - dependencies = [ - sources."semver-4.3.6" - ]; - }) - sources."semver-5.4.1" - sources."semver-utils-1.1.1" - (sources."snyk-1.61.2" // { - dependencies = [ - sources."update-notifier-0.5.0" - sources."minimist-1.2.0" - sources."async-0.9.2" - sources."lazy-cache-0.2.7" - sources."for-in-0.1.8" - sources."yargs-4.8.1" - sources."cliui-3.2.0" - sources."window-size-0.2.0" - sources."camelcase-3.0.0" - sources."latest-version-1.0.1" - sources."repeating-1.1.3" - sources."package-json-1.2.0" - sources."got-3.3.1" - sources."object-assign-3.0.0" - sources."timed-out-2.0.0" - ]; - }) - sources."spawn-please-0.3.0" - (sources."update-notifier-2.3.0" // { - dependencies = [ - sources."boxen-1.3.0" - sources."chalk-2.3.0" - sources."configstore-3.1.1" - sources."latest-version-3.1.0" - sources."xdg-basedir-3.0.0" - sources."camelcase-4.1.0" - sources."string-width-2.1.1" - sources."widest-line-2.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."strip-ansi-4.0.0" - sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.0" - sources."supports-color-4.5.0" - sources."dot-prop-4.2.0" - sources."write-file-atomic-2.3.0" - sources."pify-3.0.0" - sources."package-json-4.0.1" - sources."got-6.7.1" - sources."timed-out-4.0.1" - sources."unzip-response-2.0.1" - ]; - }) - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - sources."ansi-regex-2.1.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."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."commander-2.13.0" + 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.3" + 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."hasbin-1.2.3" - sources."inquirer-1.0.3" - sources."needle-2.1.0" - sources."open-0.0.5" - sources."os-name-1.0.3" - sources."proxy-from-env-1.0.0" - sources."snyk-config-1.0.1" - sources."snyk-go-plugin-1.4.3" - 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.3.6" // { - dependencies = [ - sources."debug-3.1.0" - sources."es6-promise-4.1.1" - ]; - }) - (sources."snyk-php-plugin-1.3.0" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) - sources."snyk-policy-1.10.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" // { - dependencies = [ - sources."update-notifier-0.6.3" - sources."configstore-2.1.0" - sources."uuid-2.0.3" - ]; - }) - 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" // { - dependencies = [ - sources."uuid-2.0.3" - ]; - }) - sources."then-fs-2.0.0" - sources."undefsafe-0.0.3" - sources."url-0.11.0" - sources."uuid-3.1.0" + sources."escape-string-regexp-1.0.5" + 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-2.0.0" + sources."hasbin-1.2.3" + sources."hosted-git-info-2.5.0" + sources."iconv-lite-0.4.19" + 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-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.10.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.4" + 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.0" + sources."longest-1.0.1" + sources."lowercase-keys-1.0.0" + sources."lru-cache-4.1.1" + sources."make-dir-1.1.0" + sources."minimatch-3.0.2" + 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.1.1" + 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.4" - sources."write-file-atomic-1.3.4" - sources."xdg-basedir-2.0.0" - sources."minimist-0.0.8" - sources."os-homedir-1.0.2" - sources."imurmurhash-0.1.4" - sources."slide-1.1.6" - sources."ms-2.0.0" - sources."async-1.5.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."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-1.0.7" + 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.4" + 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.3" + sources."registry-auth-token-3.3.1" + 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.1" + 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."string-width-1.0.2" - 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-1.0.0" - sources."number-is-nan-1.0.1" - 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.5" - sources."yargs-3.15.0" - sources."camelcase-1.2.1" - sources."cliui-2.1.0" - sources."decamelize-1.2.0" - sources."window-size-0.1.4" - sources."center-align-0.1.3" - sources."right-align-0.1.3" - sources."wordwrap-0.0.2" - sources."align-text-0.1.4" - sources."lazy-cache-1.0.4" - sources."kind-of-3.2.2" - sources."longest-1.0.1" - sources."repeat-string-1.6.1" - sources."is-buffer-1.1.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."safe-buffer-5.1.1" + sources."sax-1.2.4" + sources."semver-5.5.0" + sources."semver-diff-2.1.0" + sources."semver-utils-1.1.1" + sources."set-blocking-2.0.0" (sources."shallow-clone-0.1.2" // { dependencies = [ sources."kind-of-2.0.1" ]; }) - sources."for-in-1.0.2" - 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."email-validator-1.1.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-0.3.1" - sources."is-npm-1.0.0" - sources."latest-version-2.0.0" - sources."semver-diff-2.1.0" - sources."filled-array-1.1.0" - sources."repeating-2.0.1" - sources."widest-line-1.0.0" - sources."is-finite-1.0.2" - sources."dot-prop-3.0.0" - sources."is-obj-1.0.1" - sources."package-json-2.4.0" - sources."got-5.7.1" - sources."registry-auth-token-3.3.1" - sources."registry-url-3.1.0" - sources."create-error-class-3.0.2" - sources."duplexer2-0.1.4" - sources."is-redirect-1.0.0" - sources."is-retry-allowed-1.1.0" - sources."is-stream-1.1.0" - sources."lowercase-keys-1.0.0" - sources."node-status-codes-1.0.0" - sources."parse-json-2.2.0" - sources."read-all-stream-3.1.0" - sources."readable-stream-2.3.3" - sources."timed-out-3.1.3" - sources."unzip-response-1.0.2" - sources."url-parse-lax-1.0.0" - sources."capture-stack-trace-1.0.0" - sources."error-ex-1.3.1" - sources."is-arrayish-0.2.1" - sources."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-2.3.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."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.69.3" // { + dependencies = [ + sources."async-0.9.2" + sources."camelcase-3.0.0" + sources."cliui-3.2.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" + sources."snyk-go-plugin-1.4.5" + sources."snyk-gradle-plugin-1.2.0" + sources."snyk-module-1.8.1" + sources."snyk-mvn-plugin-1.1.1" + (sources."snyk-nuget-plugin-1.3.9" // { + dependencies = [ + sources."debug-3.1.0" + sources."es6-promise-4.2.4" + ]; + }) + (sources."snyk-php-plugin-1.3.2" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + sources."snyk-policy-1.10.1" + sources."snyk-python-plugin-1.5.3" + sources."snyk-recursive-readdir-2.0.0" + sources."snyk-resolve-1.0.0" + (sources."snyk-resolve-deps-1.7.0" // { + dependencies = [ + sources."configstore-2.1.0" + sources."update-notifier-0.6.3" + sources."uuid-2.0.3" + ]; + }) + sources."snyk-sbt-plugin-1.2.2" + sources."snyk-tree-1.0.0" + sources."snyk-try-require-1.2.0" + sources."spawn-please-0.3.0" 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."sprintf-js-1.0.3" 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."npm-run-path-2.0.2" - sources."p-finally-1.0.0" - sources."signal-exit-3.0.2" + sources."string-length-1.0.1" + sources."string-width-1.0.2" + sources."string_decoder-1.0.3" + sources."strip-ansi-3.0.1" + sources."strip-bom-2.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."color-convert-1.9.1" - sources."color-name-1.1.3" - sources."has-flag-2.0.0" - sources."make-dir-1.1.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."crypto-random-string-1.0.0" - sources."global-dirs-0.1.1" - sources."is-path-inside-1.0.1" - sources."path-is-inside-1.0.2" - sources."duplexer3-0.1.4" + sources."unzip-response-1.0.2" + (sources."update-notifier-2.3.0" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.0" + sources."boxen-1.3.0" + sources."camelcase-4.1.0" + sources."chalk-2.3.0" + sources."configstore-3.1.1" + 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-4.5.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.1" + 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."write-file-atomic-1.3.4" + sources."xdg-basedir-2.0.0" + sources."xml2js-0.4.19" + sources."xmlbuilder-9.0.4" + 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 = { @@ -35636,127 +36982,128 @@ in sha512 = "0hbwm017cl5ybzw14l44mbinhnv38jrnbpg1ngkdibhc5hiimm8hqr2pi5dzh6flvxr0x6nym93029i7j41clr6rlvn1ab6r5cgdl4f"; }; dependencies = [ - sources."chalk-2.3.0" - sources."cli-table2-0.2.0" - sources."cvss-1.0.2" - sources."https-proxy-agent-2.1.1" - (sources."inquirer-3.3.0" // { - dependencies = [ - sources."lodash-4.17.4" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."ansi-regex-3.0.0" - ]; - }) - sources."nodesecurity-npm-utils-6.0.0" - sources."semver-5.4.1" - sources."wreck-12.5.1" - (sources."yargs-9.0.1" // { - dependencies = [ - sources."string-width-2.1.1" - sources."is-fullwidth-code-point-2.0.0" - sources."strip-ansi-4.0.0" - sources."ansi-regex-3.0.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."lodash-3.10.1" - sources."string-width-1.0.2" - sources."colors-1.1.2" - sources."code-point-at-1.1.0" - sources."is-fullwidth-code-point-1.0.0" - sources."strip-ansi-3.0.1" - sources."number-is-nan-1.0.1" - sources."ansi-regex-2.1.1" - sources."agent-base-4.1.2" - sources."debug-3.1.0" - sources."es6-promisify-5.0.0" - sources."es6-promise-4.1.1" - sources."ms-2.0.0" + sources."agent-base-4.2.0" sources."ansi-escapes-3.0.0" - sources."cli-cursor-2.1.0" - sources."cli-width-2.2.0" - sources."external-editor-2.1.0" - 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."chardet-0.4.2" - sources."iconv-lite-0.4.19" - sources."tmp-0.0.33" - sources."os-tmpdir-1.0.2" - sources."is-promise-2.1.0" + sources."ansi-regex-2.1.1" + sources."ansi-styles-3.2.0" sources."boom-5.2.0" - sources."hoek-4.2.0" + sources."builtin-modules-1.1.1" sources."camelcase-4.1.0" + sources."chalk-2.3.0" + 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.1.2" + sources."cross-spawn-5.1.0" + sources."cvss-1.0.2" + sources."debug-3.1.0" 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.1.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-2.0.0" + sources."hoek-4.2.0" + sources."hosted-git-info-2.5.0" + sources."https-proxy-agent-2.1.1" + sources."iconv-lite-0.4.19" + (sources."inquirer-3.3.0" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."lodash-4.17.4" + 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.1" + sources."mem-1.1.0" + sources."mimic-fn-1.1.0" + sources."ms-2.0.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."semver-5.5.0" sources."set-blocking-2.0.0" - 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."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."invert-kv-1.0.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."graceful-fs-4.1.11" - 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."validate-npm-package-license-3.0.1" - sources."builtin-modules-1.1.1" + sources."signal-exit-3.0.2" sources."spdx-correct-1.0.2" sources."spdx-expression-parse-1.0.4" sources."spdx-license-ids-1.2.2" + 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-4.5.0" + sources."through-2.3.8" + sources."tmp-0.0.33" + sources."validate-npm-package-license-3.0.1" + 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 = { @@ -35777,26 +37124,26 @@ in }; dependencies = [ sources."async-2.6.0" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.8" + 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."lodash-4.17.4" sources."lokijs-1.5.1" + 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.5.0" sources."vscode-languageclient-3.5.0" sources."vscode-languageserver-3.5.0" sources."vscode-languageserver-protocol-3.5.0" - sources."vscode-uri-1.0.1" - sources."fs.realpath-1.0.0" - sources."inflight-1.0.6" - sources."inherits-2.0.3" - sources."minimatch-3.0.4" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."wrappy-1.0.2" - sources."brace-expansion-1.1.8" - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" sources."vscode-languageserver-types-3.5.0" + sources."vscode-uri-1.0.1" + sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -35816,20 +37163,82 @@ in sha1 = "fbedac4c5c0b721f4c241287b81bdc3e4c7987c9"; }; dependencies = [ + sources."accepts-1.3.4" + 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.9" + 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.6.0" sources."babybird-0.0.1" + sources."balanced-match-1.0.0" + sources."bcrypt-pbkdf-1.0.1" + sources."bl-1.2.1" + sources."bluebird-3.5.1" (sources."body-parser-1.18.2" // { dependencies = [ sources."content-type-1.0.4" ]; }) + sources."boom-4.3.1" + sources."brace-expansion-1.1.8" + sources."builtin-modules-1.1.1" + 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."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.1.2" + sources."combined-stream-1.0.5" + sources."compressible-2.0.12" sources."compression-1.7.1" + 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.git#master" + sources."cookie-0.3.1" + sources."cookie-signature-1.0.6" sources."core-js-2.5.3" + 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.0.2" 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.2" // { dependencies = [ sources."content-type-1.0.4" @@ -35840,255 +37249,198 @@ in (sources."express-handlebars-3.0.0" // { dependencies = [ sources."async-1.5.2" - sources."yargs-3.10.0" 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.0.0" + sources."fast-json-stable-stringify-2.0.0" (sources."finalhandler-1.1.0" // { dependencies = [ sources."statuses-1.3.1" ]; }) - 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.8" // { + sources."find-up-1.1.2" + sources."foreach-2.0.5" + sources."forever-agent-0.6.1" + sources."form-data-2.3.1" + 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.0" + sources."hosted-git-info-2.5.0" + sources."hot-shots-4.8.0" + (sources."http-errors-1.6.2" // { + dependencies = [ + sources."depd-1.1.1" + ]; + }) + 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.5.2" + 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.10.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."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.30.0" + sources."mime-types-2.1.17" + sources."minimatch-3.0.4" + sources."minimist-0.0.10" + sources."mkdirp-0.5.1" + sources."moment-2.20.1" + sources."ms-2.0.0" + sources."msgpack5-3.6.0" + sources."mv-2.1.1" + sources."nan-2.8.0" + sources."ncp-2.0.0" + sources."negotiator-git+https://github.com/arlolra/negotiator.git#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.git#fork" + sources."performance-now-2.1.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-1.0.7" + sources."promise-7.3.1" + sources."proxy-addr-2.0.2" + sources."punycode-1.4.1" + sources."qs-6.5.1" + sources."range-parser-1.2.0" + sources."raw-body-2.3.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.83.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.0.4" + sources."semver-5.5.0" + sources."send-0.16.1" + sources."serve-favicon-2.4.5" + sources."serve-static-1.13.1" + (sources."service-runner-2.5.0" // { dependencies = [ - sources."minimist-0.0.8" - sources."readable-stream-2.3.3" - sources."ms-0.7.3" sources."isarray-1.0.0" + sources."minimist-0.0.8" + sources."ms-0.7.3" + sources."readable-stream-2.3.3" sources."string_decoder-1.0.3" ]; }) + sources."set-blocking-2.0.0" + sources."setprototypeof-1.0.3" sources."simplediff-0.1.1" - sources."uuid-3.1.0" + sources."sntp-2.1.0" + sources."source-map-0.4.4" + sources."spdx-correct-1.0.2" + sources."spdx-expression-parse-1.0.4" + sources."spdx-license-ids-1.2.2" + sources."sprintf-js-1.0.3" + sources."sshpk-1.13.1" + sources."statuses-1.4.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."strip-bom-2.0.0" + sources."tough-cookie-2.3.3" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-is-1.6.15" + (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.1" + 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."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-2.0.0" - sources."inherits-2.0.3" - sources."setprototypeof-1.0.3" - sources."statuses-1.4.0" - 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-1.1.14" - sources."streamsearch-0.1.2" - sources."core-util-is-1.0.2" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" - 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."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."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.4.4" - (sources."uglify-js-2.8.29" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) - sources."wordwrap-0.0.3" - sources."minimist-0.0.10" - sources."amdefine-1.0.1" - 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."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."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."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."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.5.2" - 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-4.3.1" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) - 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."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.20.1" - sources."nan-2.8.0" - sources."mkdirp-0.5.1" - 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."number-is-nan-1.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -36108,259 +37460,259 @@ in sha512 = "0i2j5pgw72bkg5s5crh3p534sz6m6yvbyg174kkgyj1l0sgaqmzj22xmh0dvxqk7r3rp79w2vs27gdqzb8azmlr6ag13m17h20cyhhf"; }; dependencies = [ + sources."addr-to-ip-port-1.4.2" + 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-1.0.0" + sources."big-integer-1.6.26" + sources."bitfield-0.1.0" + sources."bittorrent-dht-6.4.2" + sources."bittorrent-tracker-7.7.0" + sources."blob-to-buffer-1.2.6" + 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.8" + sources."buffer-alloc-unsafe-1.0.0" + sources."buffer-equal-0.0.1" + sources."buffer-equals-1.0.4" + 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.0" + 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.6.5" // { + 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."has-ansi-2.0.0" + sources."hat-0.0.3" + sources."hosted-git-info-2.5.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.4" ]; }) + sources."internal-ip-1.2.0" + sources."ip-1.1.5" + sources."ip-set-1.0.1" + sources."ipaddr.js-1.5.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-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-1.0.0" + sources."k-bucket-2.0.1" + ]; + }) + sources."k-rpc-socket-1.7.2" 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.2" + 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."pump-1.0.3" - sources."range-parser-1.2.0" - sources."rc-1.2.2" - (sources."torrent-stream-1.0.3" // { - dependencies = [ - sources."end-of-stream-0.1.5" - sources."parse-torrent-4.1.0" - sources."once-1.3.3" - sources."thunky-1.0.2" - sources."minimist-0.0.8" - sources."magnet-uri-4.2.3" - sources."parse-torrent-file-2.1.4" - sources."thirty-two-0.0.2" - sources."bencode-0.7.0" - sources."readable-stream-1.1.14" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" - sources."safe-buffer-5.0.1" - sources."ultron-1.0.2" - ]; - }) - 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.26" - 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."base64-js-0.0.8" - sources."xmlbuilder-4.0.0" - sources."xmldom-0.1.27" - sources."lodash-3.10.1" - sources."consume-http-header-1.0.0" - sources."once-1.4.0" - sources."consume-until-1.0.0" - sources."http-headers-3.0.2" - 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.2.1" - sources."multicast-dns-service-types-1.1.0" - sources."dns-packet-1.2.2" - sources."thunky-0.1.0" - 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-4.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-5.1.7" sources."parse-torrent-file-4.0.3" - sources."simple-get-2.7.0" - sources."thirty-two-1.0.2" - sources."uniq-1.0.1" - sources."bencode-1.0.0" - sources."simple-sha1-2.1.0" - sources."rusha-0.8.9" - sources."decompress-response-3.3.0" - sources."simple-concat-1.0.0" - sources."mimic-response-1.0.0" - sources."end-of-stream-1.4.0" - sources."deep-extend-0.4.2" - sources."ini-1.3.5" - sources."strip-json-comments-2.0.1" - sources."bitfield-0.1.0" - sources."bncode-0.5.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."mkdirp-0.3.5" + 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.0" (sources."peer-wire-swarm-0.12.1" // { dependencies = [ sources."bncode-0.2.3" ]; }) - sources."rimraf-2.6.2" - (sources."torrent-discovery-5.4.0" // { - dependencies = [ - sources."bencode-0.8.0" - sources."minimist-1.2.0" - sources."readable-stream-2.3.3" - sources."isarray-1.0.0" - sources."string_decoder-1.0.3" - ]; - }) - sources."torrent-piece-1.1.1" + 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-1.0.7" + sources."pump-1.0.3" 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."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-0.6.0" - (sources."k-rpc-3.7.0" // { - dependencies = [ - sources."k-bucket-2.0.1" - sources."bencode-1.0.0" - ]; - }) - sources."lru-2.0.1" - sources."buffer-equal-0.0.1" - sources."k-rpc-socket-1.7.2" - sources."bn.js-4.11.8" - sources."compact2string-1.4.0" sources."random-iterate-1.0.1" + sources."randombytes-2.0.6" + sources."range-parser-1.2.0" + sources."rc-1.2.4" + sources."re-emitter-1.1.3" + sources."read-pkg-1.1.0" + sources."read-pkg-up-1.0.1" + sources."readable-stream-2.3.3" + 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.6" sources."run-series-1.1.4" + sources."rusha-0.8.12" + sources."rx-4.1.0" + sources."safe-buffer-5.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-1.0.2" + sources."spdx-expression-parse-1.0.4" + sources."spdx-license-ids-1.2.2" + sources."speedometer-0.1.4" + sources."stream-buffers-2.2.0" + sources."string-width-1.0.2" sources."string2compact-1.2.2" - sources."ws-1.1.5" - sources."ipaddr.js-1.5.4" - sources."get-browser-rtc-1.0.2" + sources."string_decoder-1.0.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."supports-color-2.0.0" + sources."thirty-two-1.0.2" + sources."through-2.3.8" + sources."thunky-0.1.0" + 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.3" + sources."string_decoder-1.0.3" + ]; + }) + sources."torrent-piece-1.1.1" + (sources."torrent-stream-1.0.3" // { + 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."thunky-1.0.2" + sources."ultron-1.0.2" + ]; + }) + sources."trim-newlines-1.0.0" + sources."typedarray-0.0.6" sources."ultron-1.1.1" - sources."addr-to-ip-port-1.4.2" - sources."options-0.0.6" + sources."uniq-1.0.1" + sources."util-deprecate-1.0.2" + sources."utp-0.0.7" + sources."validate-npm-package-license-3.0.1" + 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 = { @@ -36380,209 +37732,264 @@ in sha1 = "1848fdc14036f013af7489a39e8a5f0f9da48b87"; }; dependencies = [ - sources."connect-multiparty-2.1.0" - (sources."express-3.21.2" // { - dependencies = [ - sources."range-parser-1.0.3" - sources."multiparty-3.3.2" - sources."qs-4.0.0" - sources."accepts-1.3.4" - sources."negotiator-0.6.1" - sources."uid-safe-2.0.0" - sources."ms-2.0.0" - sources."statuses-1.2.1" - sources."destroy-1.0.3" - ]; - }) - sources."lodash-2.4.2" - sources."mkdirp-0.5.1" - sources."pump-1.0.3" - sources."range-parser-1.2.0" - (sources."read-torrent-1.3.0" // { - dependencies = [ - sources."mime-1.2.11" - sources."qs-0.5.6" - ]; - }) - (sources."socket.io-1.7.4" // { - dependencies = [ - sources."debug-2.3.3" - sources."ms-0.7.2" - sources."accepts-1.3.3" - sources."cookie-0.3.1" - sources."negotiator-0.6.1" - sources."ws-1.1.2" - sources."component-emitter-1.1.2" - ]; - }) - (sources."torrent-stream-1.0.3" // { - dependencies = [ - sources."end-of-stream-0.1.5" - sources."mkdirp-0.3.5" - sources."once-1.3.3" - sources."debug-2.6.9" - sources."ms-2.0.0" - sources."bencode-0.8.0" - sources."minimist-1.2.0" - sources."readable-stream-2.3.3" - sources."isarray-1.0.0" - sources."string_decoder-1.0.3" - sources."safe-buffer-5.0.1" - sources."ultron-1.1.1" - ]; - }) - sources."fluent-ffmpeg-2.1.2" - sources."multiparty-4.1.3" - sources."on-finished-2.3.0" - sources."qs-6.5.1" - 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."accepts-1.2.13" + sources."addr-to-ip-port-1.4.2" + 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.8" + sources."buffer-alloc-unsafe-1.0.0" + sources."buffer-equal-0.0.1" + sources."buffer-equals-1.0.4" + 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.12" + sources."compression-1.5.2" + sources."concat-map-0.0.1" (sources."connect-2.30.2" // { dependencies = [ - sources."escape-html-1.0.3" - sources."vary-1.1.2" - sources."ms-0.7.2" 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-multiparty-2.1.0" + sources."connect-timeout-1.6.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-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."ms-0.7.1" ]; }) + 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."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.0" // { + (sources."express-3.21.2" // { dependencies = [ - sources."ms-0.7.1" + sources."accepts-1.3.4" + 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."utils-merge-1.0.0" - sources."vary-1.0.1" - sources."basic-auth-connect-1.0.0" - sources."body-parser-1.13.3" - sources."bytes-2.1.0" - sources."cookie-parser-1.3.5" - sources."compression-1.5.2" - sources."connect-timeout-1.6.2" - sources."csurf-1.8.3" - sources."errorhandler-1.4.3" 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."fresh-0.3.0" + (sources."fs-chunk-store-1.6.5" // { + 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-1.0.0" + sources."k-bucket-2.0.1" + ]; + }) + sources."k-rpc-socket-1.7.2" + 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.30.0" + sources."mime-types-2.1.17" + 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."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."response-time-2.3.2" // { + sources."peer-wire-protocol-0.7.0" + (sources."peer-wire-swarm-0.12.1" // { dependencies = [ - sources."depd-1.1.1" + sources."bncode-0.2.3" ]; }) - sources."serve-favicon-2.3.2" - sources."serve-index-1.7.3" - (sources."serve-static-1.10.3" // { - dependencies = [ - sources."depd-1.1.1" - sources."ms-0.7.1" - ]; - }) - sources."vhost-3.0.2" - sources."iconv-lite-0.4.11" + sources."pend-1.2.0" + sources."process-nextick-args-1.0.7" + sources."proxy-addr-1.0.10" + sources."pump-1.0.3" + sources."qs-6.5.1" + sources."random-access-file-1.8.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."unpipe-1.0.0" - sources."accepts-1.2.13" - sources."compressible-2.0.12" - sources."negotiator-0.5.3" - sources."ms-0.7.1" - sources."csrf-3.0.6" - sources."rndm-1.2.0" - sources."tsscmp-1.0.5" - sources."uid-safe-2.1.4" - sources."random-bytes-1.0.0" - sources."crc-3.3.0" - sources."base64-url-1.2.1" - sources."inherits-2.0.3" - sources."statuses-1.4.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."batch-0.5.3" - sources."destroy-1.0.4" - sources."mime-1.3.4" - sources."forwarded-0.1.2" - sources."ipaddr.js-1.0.5" - sources."minimist-0.0.8" - sources."end-of-stream-1.4.0" - sources."once-1.4.0" - sources."wrappy-1.0.2" - sources."magnet-uri-2.0.1" - (sources."parse-torrent-4.1.0" // { + sources."re-emitter-1.1.3" + (sources."read-torrent-1.3.0" // { dependencies = [ - sources."magnet-uri-4.2.3" + sources."mime-1.2.11" + sources."qs-0.5.6" ]; }) + sources."readable-stream-1.1.14" 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.7.0" + (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.6" + sources."run-series-1.1.4" + sources."rusha-0.8.12" + 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."rusha-0.8.9" - 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."simple-websocket-4.3.1" // { + dependencies = [ + sources."ws-2.3.1" + ]; + }) 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-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" // { @@ -36591,107 +37998,51 @@ in sources."ms-0.7.1" ]; }) - sources."base64id-1.0.0" - sources."engine.io-parser-1.3.2" - sources."ws-1.1.4" - 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.2.1" - sources."engine.io-client-1.8.4" - sources."indexof-0.0.1" - sources."object-component-0.0.3" - sources."parseuri-0.0.5" + sources."speedometer-0.1.4" + sources."statuses-1.4.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."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."bitfield-0.1.0" - sources."bncode-0.5.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" // { - dependencies = [ - sources."bncode-0.2.3" - ]; - }) - 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.1.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-0.6.0" - (sources."k-rpc-3.7.0" // { + (sources."torrent-stream-1.0.3" // { dependencies = [ - sources."k-bucket-2.0.1" - sources."bencode-1.0.0" + sources."bencode-0.8.0" + sources."debug-2.6.9" + sources."end-of-stream-0.1.5" + sources."isarray-1.0.0" + sources."minimist-1.2.0" + sources."mkdirp-0.3.5" + sources."ms-2.0.0" + sources."once-1.3.3" + sources."readable-stream-2.3.3" + sources."safe-buffer-5.0.1" + sources."string_decoder-1.0.3" + sources."ultron-1.1.1" ]; }) - sources."lru-2.0.1" - sources."buffer-equal-0.0.1" - sources."k-rpc-socket-1.7.2" - 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" // { - dependencies = [ - sources."ws-2.3.1" - ]; - }) - sources."string2compact-1.2.2" + sources."tsscmp-1.0.5" + sources."tunnel-agent-0.2.0" + sources."type-is-1.6.15" + sources."uid-safe-2.1.4" + sources."ultron-1.0.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."unpipe-1.0.0" sources."util-deprecate-1.0.2" - sources."addr-to-ip-port-1.4.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."isexe-2.0.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 = { @@ -36711,111 +38062,111 @@ in sha1 = "c6910f67935c37285b6114329fc2f27d5f3e3134"; }; 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."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."concat-map-0.0.1" - sources."is-stream-1.1.0" - sources."pinkie-promise-2.0.1" - sources."pinkie-2.0.4" + sources."bcrypt-pbkdf-1.0.1" sources."bl-1.0.3" + sources."boom-2.10.1" + sources."brace-expansion-1.1.8" sources."caseless-0.11.0" + sources."chalk-1.1.3" + sources."combined-stream-1.0.5" + sources."commander-2.13.0" + 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."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."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."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."async-2.6.0" - sources."lodash-4.17.4" - sources."mime-db-1.30.0" - sources."assert-plus-0.2.0" + 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-json-valid-2.17.1" + 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.4" + sources."mime-db-1.30.0" + sources."mime-types-2.1.17" + 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.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) - 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.12.2" - sources."is-my-json-valid-2.17.1" - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.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."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" + 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."xtend-4.0.1" + sources."yauzl-2.4.1" ]; buildInputs = globalBuildInputs; meta = { @@ -36829,10 +38180,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "1.9.2"; + version = "1.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-1.9.2.tgz"; - sha512 = "1pvilmcyqqmcfmdawrcjkg09bylz68l4lkvm7k9g2554f2migg337d51m95rk4p2xylbj84i5a8j2wlc1ynvhdkdxbchkwnvpsg29d6"; + url = "https://registry.npmjs.org/prettier/-/prettier-1.10.2.tgz"; + sha512 = "1k0h7nzg4lg3lf86xy0z7adx2z7nhj8r1y7c5s0gwhfb7qn4qp0845w5agq9zy48ll7sldv7ak2haypkm7akspajvdq25hn0ahlvisd"; }; buildInputs = globalBuildInputs; meta = { @@ -36852,8 +38203,41 @@ in sha512 = "3n09lgnyd4p3h3jlhgcvbh6n6m9h89hwvbhli5ic32fkl5y4g7yi61m1vw483479jxkif2zyqs89l6j6hq4iy15jdknx1lcp9qbyvwy"; }; dependencies = [ + sources."JSONStream-1.3.2" + sources."acorn-4.0.13" + 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-unique-0.2.1" + sources."asn1.js-4.9.2" + sources."assert-1.4.1" + sources."astw-2.2.0" + sources."async-1.5.2" + sources."async-each-1.0.1" + sources."balanced-match-1.0.0" + sources."base64-js-1.2.1" + sources."binary-extensions-1.11.0" + sources."bn.js-4.11.8" + sources."brace-expansion-1.1.8" + (sources."braces-1.8.5" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."brorand-1.1.0" + sources."browser-pack-6.0.3" + (sources."browser-resolve-1.11.2" // { + dependencies = [ + sources."resolve-1.1.7" + ]; + }) (sources."browserify-13.3.0" // { dependencies = [ + sources."acorn-5.3.0" + sources."combine-source-map-0.7.2" (sources."concat-stream-1.5.2" // { dependencies = [ sources."readable-stream-2.0.6" @@ -36861,68 +38245,148 @@ in }) sources."hash-base-2.0.2" sources."isarray-0.0.1" - sources."acorn-5.2.1" ]; }) + sources."browserify-aes-1.1.1" + 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."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."minimist-0.0.10" - ]; - }) - 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" // { - dependencies = [ - sources."async-2.6.0" - ]; - }) - sources."which-1.3.0" - sources."wordwrap-1.0.0" - sources."JSONStream-1.3.2" - sources."assert-1.4.1" - sources."browser-pack-6.0.2" - (sources."browser-resolve-1.11.2" // { - dependencies = [ - sources."resolve-1.1.7" - ]; - }) + 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-xor-1.0.3" + sources."builtin-status-codes-3.0.0" sources."cached-path-relative-1.0.1" + sources."chokidar-1.7.0" + sources."cipher-base-1.0.4" + sources."colors-1.1.2" + sources."combine-source-map-0.8.0" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.0" 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" + 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-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-0.1.5" + sources."expand-range-1.8.2" + sources."extglob-0.3.2" + sources."filename-regex-2.0.1" + sources."fill-range-2.2.3" + sources."for-in-1.0.2" + sources."for-own-0.1.5" + sources."fs.realpath-1.0.0" + sources."fsevents-1.1.3" + sources."function-bind-1.1.1" + 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-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."ieee754-1.1.8" + 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.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-number-2.1.0" + sources."is-posix-bracket-0.1.1" + sources."is-primitive-2.0.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-2.1.0" + sources."json-stable-stringify-0.0.1" + sources."jsonify-0.0.0" + sources."jsonparse-1.3.1" + sources."kind-of-3.2.2" sources."labeled-stream-splicer-2.0.0" + sources."lexical-scope-1.2.0" + sources."lodash-4.17.4" + sources."lodash.memoize-3.0.4" + sources."md5.js-1.3.4" + sources."micromatch-2.3.11" + 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."module-deps-4.1.1" + sources."mute-stream-0.0.7" + sources."nan-2.8.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.omit-2.0.1" + 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."parse-glob-3.0.4" 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."preserve-0.2.0" 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."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.3" + sources."read-1.0.7" sources."read-only-stream-2.0.0" (sources."readable-stream-2.3.3" // { dependencies = [ @@ -36930,11 +38394,25 @@ in sources."string_decoder-1.0.3" ]; }) + 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."resolve-1.5.0" + sources."rimraf-2.2.8" + sources."ripemd160-2.0.1" + sources."safe-buffer-5.1.1" + sources."set-immediate-shim-1.0.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.7.2" + sources."stream-combiner2-1.1.1" + sources."stream-http-2.8.0" + 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.3.0" // { @@ -36942,9 +38420,15 @@ in sources."acorn-4.0.13" ]; }) + sources."temp-0.8.3" + sources."through-2.3.8" sources."through2-2.0.3" sources."timers-browserify-1.4.2" + sources."to-arraybuffer-1.0.1" + sources."tree-kill-1.2.0" sources."tty-browserify-0.0.0" + sources."typedarray-0.0.6" + sources."umd-3.0.1" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" @@ -36955,149 +38439,17 @@ in sources."inherits-2.0.1" ]; }) - 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."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-3.0.4" - 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.7.1" - 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."browserify-cache-api-3.0.1" - sources."async-1.5.2" - sources."fs.realpath-1.0.0" - sources."inflight-1.0.6" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" + sources."vm-browserify-0.0.4" + (sources."watchpack-1.4.0" // { + dependencies = [ + sources."async-2.6.0" + ]; + }) + sources."which-1.3.0" + sources."wordwrap-1.0.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.6.1" - sources."colors-1.1.2" - sources."mime-1.6.0" - 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" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) - 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-2.1.0" - sources."isobject-2.1.0" - (sources."randomatic-1.1.7" // { - dependencies = [ - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - ]; - }) - sources."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.11.0" - sources."set-immediate-shim-1.0.1" - sources."nan-2.8.0" - sources."isexe-2.0.0" + sources."xtend-4.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -37117,15 +38469,133 @@ in sha1 = "195a2a5b6dd76e4a244a807002678b037d70eeaa"; }; dependencies = [ + sources."accepts-1.3.4" + sources."acorn-3.3.0" + (sources."acorn-globals-3.1.0" // { + dependencies = [ + sources."acorn-4.0.13" + ]; + }) + sources."ajv-4.11.8" + sources."align-text-0.1.4" + sources."amdefine-1.0.1" + 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.6.0" + sources."basic-auth-2.0.0" + sources."bcrypt-pbkdf-1.0.1" + sources."bindings-1.2.1" + sources."bl-1.2.1" sources."body-parser-1.18.2" - sources."commander-2.12.2" + 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-3.4.28" + sources."cliui-2.1.0" + sources."co-4.6.0" + sources."code-point-at-1.1.0" + sources."combined-stream-1.0.5" + sources."commander-2.13.0" + sources."console-control-strings-1.1.0" + sources."constantinople-3.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."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.6" + sources."escape-html-1.0.3" + sources."etag-1.8.1" + sources."eventemitter2-3.0.2" + sources."expand-template-1.1.0" (sources."express-4.16.2" // { dependencies = [ sources."setprototypeof-1.1.0" sources."statuses-1.3.1" ]; }) + sources."extend-3.0.1" + sources."extsprintf-1.3.0" + sources."finalhandler-1.1.0" + sources."forever-agent-0.6.1" + 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."graceful-readlink-1.0.1" + 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.2" // { + dependencies = [ + sources."depd-1.1.1" + ]; + }) + 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.5.2" + sources."is-3.2.1" + sources."is-buffer-1.1.6" + sources."is-expression-2.1.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."js-stringify-1.0.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."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" @@ -37133,195 +38603,57 @@ in }) sources."less-middleware-2.2.1" sources."libquassel-2.1.9" + 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.30.0" + sources."mime-types-2.1.17" + 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."tunnel-agent-0.4.3" sources."safe-buffer-5.0.1" + sources."tunnel-agent-0.4.3" ]; }) - (sources."pug-2.0.0-rc.4" // { - dependencies = [ - sources."commander-2.8.1" - sources."source-map-0.4.4" - sources."is-expression-3.0.0" - sources."acorn-4.0.13" - ]; - }) - (sources."serve-favicon-2.3.2" // { - dependencies = [ - sources."etag-1.7.0" - sources."fresh-0.3.0" - sources."ms-0.7.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.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.4.0" - 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.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."safe-buffer-5.1.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.6" - 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-1.0.1" - sources."minimist-0.0.8" - 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.6.0" - sources."uuid-3.1.0" - sources."delayed-stream-1.0.0" - sources."asynckit-0.4.0" - sources."ajv-4.11.8" - sources."har-schema-1.0.5" - sources."co-4.6.0" - sources."json-stable-stringify-1.0.1" - sources."jsonify-0.0.0" - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - sources."assert-plus-0.2.0" - (sources."jsprim-1.4.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."sshpk-1.13.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - 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.10" - 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."node.extend-2.0.0" sources."noop-logger-0.1.1" sources."npmlog-4.1.2" - sources."os-homedir-1.0.2" - sources."pump-1.0.3" - 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."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."wrappy-1.0.2" - sources."deep-extend-0.4.2" - sources."ini-1.3.5" - 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.1" + sources."os-homedir-1.0.2" + 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-1.0.7" + sources."promise-7.3.1" + sources."proxy-addr-2.0.2" + sources."prr-1.0.1" + (sources."pug-2.0.0-rc.4" // { + dependencies = [ + sources."acorn-4.0.13" + sources."commander-2.8.1" + sources."is-expression-3.0.0" + sources."source-map-0.4.4" + ]; + }) + sources."pug-attrs-2.0.2" sources."pug-code-gen-2.0.0" + sources."pug-error-1.3.2" (sources."pug-filters-2.1.5" // { dependencies = [ sources."source-map-0.5.7" @@ -37333,49 +38665,73 @@ in 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-3.3.0" - sources."is-expression-2.1.0" - (sources."acorn-globals-3.1.0" // { + sources."pug-walk-1.1.5" + 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" + sources."rc-1.2.4" + sources."readable-stream-2.3.3" + sources."repeat-string-1.6.1" + sources."request-2.81.0" + sources."resolve-1.5.0" + sources."right-align-0.1.3" + sources."safe-buffer-5.1.1" + sources."semver-5.5.0" + sources."send-0.16.1" + (sources."serve-favicon-2.3.2" // { dependencies = [ - sources."acorn-4.0.13" + sources."etag-1.7.0" + sources."fresh-0.3.0" + sources."ms-0.7.2" ]; }) - 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."function-bind-1.1.1" + sources."serve-static-1.13.1" + sources."set-blocking-2.0.0" + sources."setprototypeof-1.0.3" + 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.13.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."statuses-1.4.0" + sources."string-width-1.0.2" + 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."tar-fs-1.16.0" + sources."tar-stream-1.5.5" sources."token-stream-0.0.1" + sources."tough-cookie-2.3.3" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-is-1.6.15" + 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 = { @@ -37395,39 +38751,39 @@ in sha1 = "da6ac7d4d7777a59a5e951cf46e72fd4b6b40a2c"; }; dependencies = [ + sources."acorn-5.3.0" + 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.8" + sources."commander-2.13.0" 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.19" + sources."inflight-1.0.6" + sources."inherits-2.0.3" (sources."jstransform-10.1.0" // { dependencies = [ sources."source-map-0.1.31" ]; }) - sources."commander-2.12.2" - sources."detective-4.7.1" - sources."glob-5.0.15" - sources."graceful-fs-4.1.11" - sources."iconv-lite-0.4.19" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" sources."mkdirp-0.5.1" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" sources."private-0.1.8" sources."q-1.5.1" sources."recast-0.11.23" - sources."acorn-5.2.1" - sources."defined-1.0.0" - sources."inflight-1.0.6" - sources."inherits-2.0.3" - sources."minimatch-3.0.4" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."wrappy-1.0.2" - sources."brace-expansion-1.1.8" - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - sources."minimist-0.0.8" - sources."ast-types-0.9.6" - sources."esprima-3.1.3" sources."source-map-0.5.7" - sources."base62-0.1.1" - sources."esprima-fb-13001.1001.0-dev-harmony-fb" - sources."amdefine-1.0.1" + sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -37438,6 +38794,71 @@ in production = true; bypassCache = false; }; + react-native-cli = nodeEnv.buildNodePackage { + name = "react-native-cli"; + packageName = "react-native-cli"; + version = "2.0.1"; + src = fetchurl { + 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.8" + 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 = "The React Native CLI tools"; + homepage = "https://github.com/facebook/react-native#readme"; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = false; + }; s3http = nodeEnv.buildNodePackage { name = "s3http"; packageName = "s3http"; @@ -37447,129 +38868,129 @@ in sha1 = "c8fa1fffb8258ce68adf75df73f90fbb6f23d198"; }; dependencies = [ + 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."commander-2.0.0" - sources."http-auth-2.0.7" - (sources."express-3.4.4" // { - dependencies = [ - sources."commander-1.3.2" - ]; - }) - (sources."everyauth-0.4.5" // { - dependencies = [ - sources."connect-2.3.9" - sources."debug-0.5.0" - sources."qs-0.4.2" - sources."cookie-0.0.4" - sources."bytes-0.1.0" - sources."send-0.0.3" - sources."fresh-0.1.0" - sources."mime-1.2.6" - ]; - }) - 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."aws-sign2-0.7.0" + sources."aws4-1.6.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."node-uuid-1.4.1" + sources."combined-stream-1.0.5" + sources."commander-2.0.0" (sources."connect-2.11.0" // { dependencies = [ sources."methods-0.0.1" ]; }) - sources."range-parser-0.0.4" - sources."mkdirp-0.3.5" sources."cookie-0.1.0" - sources."buffer-crc32-0.2.1" - sources."fresh-0.2.0" - sources."methods-0.1.0" - sources."send-0.1.4" sources."cookie-signature-1.0.1" - sources."debug-3.1.0" - sources."qs-0.6.5" - sources."bytes-0.2.1" - 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.11" - sources."ms-2.0.0" - sources."oauth-https://github.com/ciaranj/node-oauth/tarball/master" - sources."request-2.9.203" - (sources."openid-2.0.6" // { - dependencies = [ - sources."request-2.83.0" - sources."qs-6.5.1" - ]; - }) - 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."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."safe-buffer-5.1.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.5.2" - 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-4.3.1" (sources."cryptiles-3.1.2" // { dependencies = [ sources."boom-5.2.0" ]; }) - 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."crypto-0.0.3" sources."dashdash-1.14.1" - sources."getpass-0.1.7" - sources."jsbn-0.1.1" - sources."tweetnacl-0.14.5" + sources."debug-3.1.0" + sources."delayed-stream-1.0.0" 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."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."extend-3.0.1" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.1" + 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.0" + 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."jsprim-1.4.1" + sources."keypress-0.1.0" + sources."methods-0.1.0" + sources."mime-1.2.11" + sources."mime-db-1.30.0" + sources."mime-types-2.1.17" + 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.83.0" + ]; + }) + sources."pause-0.0.1" + sources."performance-now-2.1.0" + 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.13.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."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + 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 = { @@ -37580,10 +39001,10 @@ in semver = nodeEnv.buildNodePackage { name = "semver"; packageName = "semver"; - version = "5.4.1"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz"; - sha512 = "2r13vwvb5ick34k6flr7vgbjfsdka8zbj5a74rd0ba4bp0nqmhppbaw3qlwn7f4smpifpa4iy4hxj137y598rbvsmy3h0d8vxgvzwar"; + url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz"; + sha512 = "0h32zh035y8m6dzcqhcymbhwgmc8839fa1hhj0jfh9ivp9kmqfj1sbwnsnkzcn9qm3sqn38sa8ys2g4c638lpnmzjr0a0qndmv7f8p1"; }; buildInputs = globalBuildInputs; meta = { @@ -37597,189 +39018,192 @@ in serve = nodeEnv.buildNodePackage { name = "serve"; packageName = "serve"; - version = "6.4.3"; + version = "6.4.9"; src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-6.4.3.tgz"; - sha512 = "037w1bp1q8k6vpswkrpkmcngz1rj1bqq5migw33qxr9x1r7p0r4sfhq1kcs024lwmqf1iynrjavsmr466zh6r37hkilpriasxwsqgd0"; + url = "https://registry.npmjs.org/serve/-/serve-6.4.9.tgz"; + sha512 = "2241nrhci4lgj15pxzvspx6m3vjdpcsih532sz1mi17fby8yiadv33d84v05z1465cszh35xhzf7kx3yirwzq5zbi7zvzhw13ddsqy0"; }; dependencies = [ + sources."@zeit/check-updates-1.0.5" + sources."accepts-1.3.4" + 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.0" + sources."arch-2.1.0" (sources."args-3.0.8" // { dependencies = [ sources."chalk-2.1.0" ]; }) + 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."capture-stack-trace-1.0.0" + sources."center-align-0.1.3" sources."chalk-2.3.0" + sources."cli-boxes-1.0.0" (sources."clipboardy-1.2.2" // { dependencies = [ sources."execa-0.8.0" ]; }) + sources."cliui-2.1.0" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."compressible-2.0.12" + sources."compression-1.7.1" + sources."configstore-3.1.1" + sources."content-type-1.0.4" + sources."create-error-class-3.0.2" + sources."cross-spawn-5.1.0" + sources."crypto-random-string-1.0.0" sources."dargs-5.1.0" - sources."detect-port-1.2.2" + sources."debug-2.6.9" + 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" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) + sources."dot-prop-4.2.0" + 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."etag-1.8.1" + sources."execa-0.7.0" sources."filesize-3.5.11" + sources."fresh-0.5.2" sources."fs-extra-5.0.0" + sources."get-stream-3.0.0" + sources."global-dirs-0.1.1" + sources."got-6.7.1" + sources."graceful-fs-4.1.11" (sources."handlebars-4.0.11" // { dependencies = [ sources."camelcase-1.2.1" + sources."minimist-0.0.10" sources."wordwrap-0.0.2" ]; }) + sources."has-flag-2.0.0" + sources."http-errors-1.6.2" + 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."ip-1.1.5" - sources."micro-9.0.2" + sources."is-buffer-1.1.6" + 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-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" + sources."is-wsl-1.1.0" + sources."isexe-2.0.0" + sources."jsonfile-4.0.0" + sources."kind-of-3.2.2" + sources."latest-version-3.1.0" + sources."lazy-cache-1.0.4" + sources."lodash-4.17.4" + sources."longest-1.0.1" + sources."lowercase-keys-1.0.0" + sources."lru-cache-4.1.1" + sources."make-dir-1.1.0" + sources."micro-9.1.0" sources."micro-compress-1.0.0" + sources."mime-1.4.1" + sources."mime-db-1.32.0" (sources."mime-types-2.1.17" // { dependencies = [ sources."mime-db-1.30.0" ]; }) + sources."minimist-1.2.0" + sources."mri-1.1.0" + sources."ms-2.1.1" + 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.1.0" + sources."optimist-0.6.1" + sources."p-finally-1.0.0" + sources."package-json-4.0.1" + 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."prepend-http-1.0.4" + sources."pseudomap-1.0.2" + sources."range-parser-1.2.0" + sources."raw-body-2.3.2" + sources."rc-1.2.4" + sources."registry-auth-token-3.3.1" + 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."semver-5.5.0" + sources."semver-diff-2.1.0" (sources."send-0.16.1" // { dependencies = [ + sources."ms-2.0.0" sources."statuses-1.3.1" ]; }) - (sources."update-notifier-2.3.0" // { - dependencies = [ - sources."minimist-1.2.0" - ]; - }) - sources."camelcase-4.1.0" - 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."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-2.1.1" - sources."term-size-1.2.0" - sources."widest-line-2.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."setprototypeof-1.0.3" 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."arch-2.1.0" - sources."address-1.0.3" - sources."debug-2.6.9" - sources."ms-2.0.0" - 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."signal-exit-3.0.2" sources."source-map-0.4.4" + sources."statuses-1.4.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."strip-json-comments-2.0.1" + sources."supports-color-4.5.0" + sources."term-size-1.2.0" + sources."timed-out-4.0.1" (sources."uglify-js-2.8.29" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."wordwrap-0.0.3" - sources."minimist-0.0.10" - 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."content-type-1.0.4" - 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.4.0" - 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.32.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."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."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.1" - sources."is-path-inside-1.0.1" - sources."ini-1.3.5" - 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."universalify-0.1.1" + sources."unpipe-1.0.0" sources."unzip-response-2.0.1" + sources."update-notifier-2.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."vary-1.1.2" + sources."which-1.3.0" + sources."widest-line-2.0.0" + sources."window-size-0.1.0" + sources."wordwrap-0.0.3" + sources."write-file-atomic-2.3.0" + sources."xdg-basedir-3.0.0" + sources."yallist-2.1.2" + sources."yargs-3.10.0" ]; buildInputs = globalBuildInputs; meta = { @@ -37799,201 +39223,205 @@ in sha1 = "13ebfcb3b741759d2475db96107776c81d308ae8"; }; dependencies = [ - sources."bcrypt-nodejs-0.0.3" - (sources."cheerio-0.17.0" // { - dependencies = [ - sources."domutils-1.5.1" - sources."domelementtype-1.1.3" - ]; - }) - sources."commander-2.12.2" - 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" // { - dependencies = [ - sources."debug-0.7.4" - sources."commander-0.6.1" - sources."emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" - ]; - }) sources."CSSselect-0.4.1" - sources."entities-1.1.1" - (sources."htmlparser2-3.7.3" // { - dependencies = [ - sources."entities-1.0.0" - ]; - }) - sources."dom-serializer-0.0.1" sources."CSSwhat-0.4.7" - sources."domutils-1.4.3" - sources."domelementtype-1.3.0" - 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."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.6.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.5" + sources."commander-2.13.0" + 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."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.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.1.0" - 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."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."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.5.2" - 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-4.3.1" + sources."core-util-is-1.0.2" (sources."cryptiles-3.1.2" // { dependencies = [ sources."boom-5.2.0" ]; }) - 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."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."bcrypt-pbkdf-1.0.1" - sources."punycode-1.4.1" - sources."irc-replies-2.0.1" - (sources."slate-irc-parser-0.0.2" // { - dependencies = [ - sources."debug-0.7.4" - ]; - }) - sources."linewise-0.0.3" + 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."socket.io-parser-2.2.0" - sources."socket.io-client-1.0.6" + 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.2" + sources."extend-3.0.1" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" + sources."finalhandler-1.1.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.1" + 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.0" + (sources."htmlparser2-3.7.3" // { + dependencies = [ + sources."entities-1.0.0" + ]; + }) + (sources."http-errors-1.6.2" // { + dependencies = [ + sources."depd-1.1.1" + ]; + }) + sources."http-signature-1.2.0" + sources."iconv-lite-0.4.19" + sources."indexof-0.0.1" + sources."inherits-2.0.3" + sources."ipaddr.js-1.5.2" + 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.30.0" + sources."mime-types-2.1.17" + 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.2" + sources."punycode-1.4.1" + sources."qs-6.5.1" + sources."range-parser-1.2.0" + sources."raw-body-2.3.2" + sources."read-1.0.7" + sources."readable-stream-1.1.14" + sources."request-2.83.0" + sources."safe-buffer-5.1.1" + sources."send-0.16.1" + sources."serve-static-1.13.1" + 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."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."socket.io-client-1.0.6" + sources."socket.io-parser-2.2.0" + sources."split-0.3.3" + sources."sshpk-1.13.1" + sources."statuses-1.3.1" + 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."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."tough-cookie-2.3.3" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-is-1.6.15" + 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" - 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 = { @@ -38013,8 +39441,22 @@ in sha1 = "36bf5209356facbf6cef18fa32274d116043ed24"; }; dependencies = [ - sources."express-5.0.0-alpha.6" - sources."express-json5-0.1.0" + sources."JSONStream-1.3.2" + sources."accepts-1.3.4" + sources."ajv-5.5.2" + sources."amdefine-1.0.1" + sources."ansi-styles-3.2.0" + sources."argparse-1.0.9" + 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."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.6.0" + sources."balanced-match-1.0.0" + sources."bcrypt-pbkdf-1.0.1" (sources."body-parser-1.18.2" // { dependencies = [ sources."bytes-3.0.0" @@ -38023,219 +39465,210 @@ in sources."raw-body-2.3.2" ]; }) - (sources."compression-1.7.1" // { - dependencies = [ - sources."bytes-3.0.0" - ]; - }) - sources."commander-2.12.2" - sources."js-yaml-3.10.0" - sources."cookies-0.7.1" - (sources."request-2.83.0" // { - dependencies = [ - sources."qs-6.5.1" - ]; - }) - sources."async-0.9.2" - sources."es6-shim-0.21.1" - sources."semver-4.3.6" - sources."minimatch-1.0.0" + sources."boom-4.3.1" + sources."brace-expansion-1.1.8" (sources."bunyan-1.8.12" // { dependencies = [ sources."minimatch-3.0.4" ]; }) + sources."bytes-1.0.0" + sources."caseless-0.12.0" + sources."chalk-2.3.0" + sources."co-4.6.0" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."combined-stream-1.0.5" + sources."commander-2.13.0" + sources."compressible-2.0.12" + (sources."compression-1.7.1" // { + dependencies = [ + sources."bytes-3.0.0" + ]; + }) + 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."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."dom-serializer-0.1.0" // { + dependencies = [ + sources."domelementtype-1.1.3" + ]; + }) + sources."domelementtype-1.3.0" + sources."domhandler-2.4.1" + sources."domutils-1.6.2" + 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."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.0.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."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-2.0.0" + sources."hawk-6.0.2" sources."highlight.js-8.9.1" - sources."lunr-0.7.2" - (sources."render-readme-1.3.1" // { + sources."hoek-4.2.0" + sources."htmlparser2-3.9.2" + (sources."http-errors-1.6.2" // { dependencies = [ - sources."readable-stream-2.3.3" - sources."source-map-0.6.1" + sources."depd-1.1.1" ]; }) + 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."jju-1.3.0" - sources."JSONStream-1.3.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-stringify-safe-5.0.1" + sources."jsonparse-1.3.1" + sources."jsprim-1.4.1" + 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.mergewith-4.6.0" + 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.30.0" + sources."mime-types-2.1.17" + sources."minimatch-1.0.0" + sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."sinopia-htpasswd-0.4.5" - sources."http-errors-1.6.2" + sources."moment-2.20.1" + sources."ms-2.0.0" + sources."mv-2.1.1" + sources."nan-2.8.0" + sources."ncp-2.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.16" + sources."process-nextick-args-1.0.7" + 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."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."on-finished-2.3.0" - sources."parseurl-1.3.2" - sources."path-is-absolute-1.0.1" - sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.5" - sources."qs-6.5.0" - sources."range-parser-1.2.0" + (sources."render-readme-1.3.1" // { + dependencies = [ + sources."readable-stream-2.3.3" + sources."source-map-0.6.1" + sources."supports-color-5.1.0" + ]; + }) + (sources."request-2.83.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.0.4" + sources."sanitize-html-1.17.0" + sources."semver-4.3.6" 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."utils-merge-1.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-1.3.4" - sources."bytes-1.0.0" - sources."iconv-lite-0.4.8" - sources."compressible-2.0.12" - sources."on-headers-1.0.1" - sources."safe-buffer-5.1.1" - sources."argparse-1.0.9" - sources."esprima-4.0.0" + 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."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."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."oauth-sign-0.8.2" - sources."performance-now-2.1.0" + sources."srcset-1.0.0" + sources."sshpk-1.13.1" + sources."statuses-1.3.1" + sources."string_decoder-1.0.3" sources."stringstream-0.0.5" + sources."supports-color-4.5.0" + sources."through-2.3.8" 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.5.2" - 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-4.3.1" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) - 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.20.1" - sources."nan-2.8.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."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.16.3" - sources."entities-1.1.1" - sources."linkify-it-1.2.4" - sources."mdurl-1.0.1" + sources."type-is-1.6.15" sources."uc.micro-1.0.3" - sources."htmlparser2-3.9.2" - sources."lodash.clonedeep-4.5.0" - sources."lodash.escaperegexp-4.1.2" - sources."lodash.mergewith-4.6.0" - sources."postcss-6.0.14" - sources."srcset-1.0.0" - sources."xtend-4.0.1" - sources."domelementtype-1.3.0" - sources."domhandler-2.4.1" - sources."domutils-1.6.2" - (sources."dom-serializer-0.1.0" // { - dependencies = [ - sources."domelementtype-1.1.3" - ]; - }) - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."string_decoder-1.0.3" + sources."uglify-js-2.3.6" + sources."unpipe-1.0.0" sources."util-deprecate-1.0.2" - sources."chalk-2.3.0" - sources."supports-color-4.5.0" - sources."ansi-styles-3.2.0" - sources."escape-string-regexp-1.0.5" - sources."color-convert-1.9.1" - sources."color-name-1.1.3" - sources."has-flag-2.0.0" - 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."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 = { @@ -38259,24 +39692,24 @@ in }; 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."balanced-match-1.0.0" + sources."brace-expansion-1.1.8" + 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.4" + sources."minimatch-3.0.4" sources."process-nextick-args-1.0.7" + sources."readable-stream-2.3.3" + sources."readdirp-2.1.0" sources."safe-buffer-5.1.1" + sources."set-immediate-shim-1.0.1" sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" ]; @@ -38298,9 +39731,55 @@ in sha1 = "c8dba4694307a0070b84a67ced76da6de73f3585"; }; dependencies = [ + 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.8" + 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.1.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.8.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-1.0.7" + sources."qs-3.1.0" + sources."readable-stream-2.3.3" (sources."restify-4.0.3" // { dependencies = [ sources."lru-cache-2.7.3" @@ -38311,111 +39790,65 @@ in }) ]; }) - sources."bunyan-1.5.1" - sources."clone-0.1.6" + sources."rimraf-2.4.5" + sources."safe-buffer-5.1.1" + sources."safe-json-stringify-1.0.4" + sources."semver-4.3.6" (sources."smartdc-auth-2.3.1" // { dependencies = [ + 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."extsprintf-1.3.0" - sources."asn1-0.2.3" - (sources."jsprim-0.3.0" // { - dependencies = [ - sources."verror-1.3.3" - ]; - }) sources."verror-1.1.0" - sources."json-schema-0.2.2" ]; }) - sources."cmdln-3.2.1" - sources."dashdash-1.7.3" - (sources."vasync-1.6.2" // { - dependencies = [ - sources."verror-1.1.0" - sources."extsprintf-1.0.0" - ]; - }) - 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-0.11.0" - sources."keep-alive-agent-0.0.1" - sources."mime-1.6.0" - sources."negotiator-0.5.3" - sources."node-uuid-1.4.8" - sources."once-1.4.0" - sources."qs-3.1.0" - sources."semver-4.3.6" sources."spdy-1.32.5" - sources."tunnel-agent-0.4.3" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.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.1.11" - sources."ctype-0.5.3" - sources."wrappy-1.0.2" - sources."extsprintf-1.2.0" - sources."core-util-is-1.0.2" - sources."nan-2.8.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" // { - dependencies = [ - sources."assert-plus-0.1.5" - ]; - }) (sources."sshpk-1.7.1" // { dependencies = [ sources."assert-plus-0.2.0" ]; }) - sources."jsprim-1.4.1" - sources."json-schema-0.2.3" - 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."sshpk-agent-1.2.1" // { + dependencies = [ + sources."assert-plus-0.1.5" + ]; + }) + sources."stream-transform-0.1.2" sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - sources."jsbn-0.1.1" + sources."tunnel-agent-0.4.3" sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" - sources."ecc-jsbn-0.1.1" + 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."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -38434,45 +39867,45 @@ in 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.3" - 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."arraybuffer.slice-0.0.7" sources."async-limiter-1.0.0" - sources."safe-buffer-5.1.1" - sources."ultron-1.1.1" 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."callsite-1.0.0" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" + sources."component-inherit-0.0.3" + sources."cookie-0.3.1" + sources."debug-2.6.9" + sources."engine.io-3.1.4" sources."engine.io-client-3.1.4" + 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.30.0" + sources."mime-types-2.1.17" + 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.0.4" + sources."socket.io-parser-3.1.2" sources."to-array-0.1.4" - sources."component-inherit-0.0.3" - sources."xmlhttprequest-ssl-1.5.4" + sources."ultron-1.1.1" + sources."uws-0.14.5" + 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" ]; buildInputs = globalBuildInputs; meta = { @@ -38509,16 +39942,16 @@ in 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.8.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."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.8.0" + sources."sequence-2.2.1" + sources."simple-lru-cache-0.0.2" + sources."winser-0.1.6" ]; buildInputs = globalBuildInputs; meta = { @@ -38575,25 +40008,25 @@ in sha1 = "42b9560931ca7090ce8515a798ba9e6aa3d6dc79"; }; dependencies = [ + sources."amdefine-1.0.1" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.8" + sources."concat-map-0.0.1" 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."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."amdefine-1.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -38613,50 +40046,54 @@ in sha512 = "1f9s0zk5rrb842w5gibjarlc9qw8bmjcxnbxc8jjn8is4d6c9l66ajwvifw87yx3pis6dcinyjwvvkxvzpyp326nl72vjv9rw5ndxnp"; }; dependencies = [ - sources."coa-2.0.0" + sources."argparse-1.0.9" + sources."boolbase-1.0.0" + sources."coa-2.0.1" sources."colors-1.1.2" - sources."css-url-regex-1.1.0" - sources."unquote-1.1.1" - 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-url-regex-1.1.0" sources."css-what-2.1.0" - sources."domutils-1.5.1" - sources."nth-check-1.0.1" + (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."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.10.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."esprima-4.0.0" + sources."foreach-2.0.5" + sources."function-bind-1.1.1" + sources."has-1.0.1" sources."is-callable-1.1.3" - sources."is-regex-1.0.4" 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 = { @@ -38677,32 +40114,32 @@ in }; 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."object-assign-4.1.1" - sources."errno-0.1.6" - sources."readable-stream-2.3.3" - sources."prr-1.0.1" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.8" + sources."concat-map-0.0.1" sources."core-util-is-1.0.2" + sources."enhanced-resolve-2.3.0" + sources."errno-0.1.6" + 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."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."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-1.0.7" + sources."prr-1.0.1" + sources."readable-stream-2.3.3" + sources."resolve-from-2.0.0" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" + 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" ]; buildInputs = globalBuildInputs; meta = { @@ -38713,6 +40150,159 @@ in production = true; bypassCache = false; }; + 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."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.6.0" + sources."bcrypt-pbkdf-1.0.1" + sources."boom-2.10.1" + sources."camelcase-1.2.1" + sources."caseless-0.11.0" + sources."center-align-0.1.3" + sources."chalk-1.1.3" + sources."cliui-2.1.0" + sources."colors-1.1.2" + sources."combined-stream-1.0.5" + sources."commander-2.13.0" + 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."colors-0.6.2" + ]; + }) + sources."forever-agent-0.6.1" + 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-validator-2.0.6" + 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-json-valid-2.17.1" + 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-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."keypress-0.2.1" + sources."kind-of-3.2.2" + sources."lazy-cache-1.0.4" + sources."lodash-4.17.4" + sources."longest-1.0.1" + sources."longjohn-0.2.11" + sources."mime-db-1.30.0" + sources."mime-types-2.1.17" + sources."minimist-0.0.10" + sources."moment-2.16.0" + (sources."node-appc-0.2.41" // { + dependencies = [ + sources."async-2.1.4" + sources."source-map-0.5.7" + sources."wordwrap-0.0.2" + ]; + }) + sources."node-uuid-1.4.7" + sources."oauth-sign-0.8.2" + sources."optimist-0.6.1" + sources."os-tmpdir-1.0.2" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."pkginfo-0.3.1" + sources."punycode-1.4.1" + sources."qs-6.3.2" + sources."repeat-string-1.6.1" + sources."request-2.79.0" + sources."right-align-0.1.3" + sources."rimraf-2.2.8" + 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.13.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."stack-trace-0.0.10" + sources."stringstream-0.0.5" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."temp-0.8.3" + sources."tough-cookie-2.3.3" + sources."tunnel-agent-0.4.3" + sources."tweetnacl-0.14.5" + (sources."uglify-js-2.7.5" // { + dependencies = [ + sources."async-0.2.10" + ]; + }) + sources."uglify-to-browserify-1.0.2" + sources."uuid-3.2.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."wrench-1.5.9" + sources."xmldom-0.1.27" + 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; + }; typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; @@ -38739,195 +40329,195 @@ in sha1 = "bacc69d255970a478e09f76c7f689975d535a78a"; }; dependencies = [ + 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.8" + sources."camelcase-4.1.0" + sources."capture-stack-trace-1.0.0" sources."chalk-1.1.3" + sources."cli-boxes-1.0.0" + sources."cli-cursor-1.0.2" (sources."cli-truncate-1.1.0" // { dependencies = [ - sources."strip-ansi-4.0.0" sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.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" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - (sources."update-notifier-2.3.0" // { - dependencies = [ - sources."chalk-2.3.0" - sources."ansi-styles-3.2.0" - sources."supports-color-4.5.0" - sources."semver-5.4.1" - ]; - }) - sources."wordwrap-1.0.0" - sources."xtend-4.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."slice-ansi-1.0.0" - sources."string-width-2.1.1" - sources."is-fullwidth-code-point-2.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."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."columnify-1.5.4" + sources."combined-stream-1.0.5" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.0" sources."configstore-3.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-2.6.9" + 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.1" + 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."has-1.0.1" + sources."has-ansi-2.0.0" + sources."has-flag-2.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.2" sources."is-absolute-0.2.6" + sources."is-arrayish-0.2.1" + 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-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."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.0" + sources."lru-cache-4.1.1" + sources."make-dir-1.1.0" + sources."make-error-1.3.2" sources."make-error-cause-1.2.2" + sources."mime-db-1.30.0" + sources."mime-types-2.1.17" + 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."rc-1.2.2" // { + sources."prepend-http-1.0.4" + sources."process-nextick-args-1.0.7" + sources."promise-finally-3.0.0" + sources."pseudomap-1.0.2" + sources."punycode-1.4.1" + (sources."rc-1.2.4" // { dependencies = [ sources."minimist-1.2.0" ]; }) - 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.2" - 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.0.3" - sources."deep-extend-0.4.2" - sources."ini-1.3.5" - 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.3.0" - 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-2.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."color-convert-1.9.1" - sources."color-name-1.1.3" - sources."has-flag-2.0.0" - sources."global-dirs-0.1.1" - sources."is-path-inside-1.0.1" - 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."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.0.3" + 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.3" + sources."typedarray-0.0.6" + sources."typescript-2.6.2" + (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.3.0" // { + dependencies = [ + sources."ansi-styles-3.2.0" + sources."chalk-2.3.0" + sources."semver-5.5.0" + sources."supports-color-4.5.0" + ]; + }) sources."url-parse-lax-1.0.0" - sources."capture-stack-trace-1.0.0" - sources."prepend-http-1.0.4" + 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 = { @@ -38941,13 +40531,13 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.2.2"; + version = "3.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.2.2.tgz"; - sha512 = "22ibn4zyyrqi1gxr94xs4kaq1y402sxwp68z9w87r4g66wgkashr3fvgrp19w01aidqma2jgmghz5283rkj00x7gxb4f86rzhxlvvgv"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.8.tgz"; + sha512 = "1vxvyq08n6jidg18kiph7m0bjzr4v1dh188b7zgj60mkv4x1qkqrgc8756drldaj3awmn71mwsxja0zhvdm8nqqw5finrajv8dc0j2z"; }; dependencies = [ - sources."commander-2.12.2" + sources."commander-2.13.0" sources."source-map-0.6.1" ]; buildInputs = globalBuildInputs; @@ -38962,108 +40552,330 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.3.3"; + version = "1.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.3.3.tgz"; - sha512 = "2ddzxzxfrgv9ihk65g4jj0qkfnr5g4akc5snb9xrhk5fmlglkas8b5bjbzvr6aazmp1idgmwqdwjsyiwd4v5s1pggkzyd605f4n03dq"; + url = "https://registry.npmjs.org/ungit/-/ungit-1.4.7.tgz"; + sha512 = "1fg2pwdf3d1qnlly7y0kpm8ghx56kc35993ww9v4xgpkdn7ga1s53190yjsifi6dj6j3v6602y8dnr5y0jyp4qm6v4rdb385dw5p2xs"; }; dependencies = [ - sources."async-2.5.0" + sources."abbrev-1.1.1" + sources."accepts-1.3.4" + 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.6.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" + sources."boom-4.3.1" + sources."brace-expansion-1.1.8" + 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."cliui-4.0.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."clone-2.1.1" + sources."co-4.6.0" + sources."code-point-at-1.1.0" sources."color-2.0.1" + 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.0" + 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."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."diff2html-2.3.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.4.0" + (sources."diff2html-2.3.3" // { dependencies = [ sources."mkdirp-0.3.0" ]; }) - (sources."express-4.15.5" // { + sources."eachr-3.2.0" + sources."ecc-jsbn-0.1.1" + sources."editions-1.3.3" + sources."ee-first-1.1.1" + sources."encodeurl-1.0.2" + sources."engine.io-3.1.4" + sources."engine.io-client-3.1.4" + sources."engine.io-parser-2.1.2" + sources."escape-html-1.0.3" + sources."etag-1.8.1" + sources."eve-0.5.4" + sources."execa-0.7.0" + (sources."express-4.16.2" // { dependencies = [ - sources."qs-6.5.0" + sources."setprototypeof-1.1.0" sources."statuses-1.3.1" ]; }) - (sources."express-session-1.15.6" // { + 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.0.0" + sources."fast-json-stable-stringify-2.0.0" + sources."finalhandler-1.1.0" + sources."find-up-2.1.0" + sources."forever-agent-0.6.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.2.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.0" + sources."hogan.js-3.0.2" + sources."hosted-git-info-2.5.0" + (sources."http-errors-1.6.2" // { dependencies = [ - sources."utils-merge-1.0.1" + sources."depd-1.1.1" ]; }) - sources."getmac-1.2.1" - sources."hasher-1.2.0" + 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.5.2" + sources."is-arrayish-0.3.1" + 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."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."just-detect-adblock-1.0.0" (sources."keen.io-0.1.3" // { dependencies = [ - sources."superagent-0.21.0" - sources."qs-1.2.0" - sources."mime-1.2.11" - sources."methods-1.0.1" sources."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."knockout-3.4.2" + sources."knockout-3.5.0-beta" + sources."lcid-1.0.0" + sources."locate-path-2.0.0" sources."lodash-4.17.4" + sources."lru-cache-4.1.1" + sources."lsmod-1.0.0" + sources."media-typer-0.3.0" + sources."mem-1.1.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.30.0" + sources."mime-types-2.1.17" + sources."mimic-fn-1.1.0" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.18.1" + sources."moment-2.20.1" + sources."ms-2.0.0" + sources."negotiator-0.6.1" sources."node-cache-4.1.1" - sources."npm-5.4.2" - (sources."npm-registry-client-8.4.0" // { + sources."nopt-1.0.10" + sources."normalize-package-data-2.4.0" + sources."npm-5.6.0" + sources."npm-package-arg-5.1.2" + (sources."npm-registry-client-8.5.0" // { dependencies = [ - sources."readable-stream-2.3.3" - sources."isarray-1.0.0" - sources."string_decoder-1.0.3" sources."combined-stream-1.0.5" + sources."delayed-stream-1.0.0" sources."extend-3.0.1" sources."form-data-2.3.1" - sources."delayed-stream-1.0.0" + sources."isarray-1.0.0" + sources."readable-stream-2.3.3" + sources."string_decoder-1.0.3" ]; }) + 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.4" + 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."raven-2.1.2" // { + 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."pause-0.0.1" + sources."performance-now-2.1.0" + sources."process-nextick-args-1.0.7" + sources."proxy-addr-2.0.2" + 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."raven-2.3.0" // { dependencies = [ sources."uuid-3.0.0" ]; }) - (sources."rc-1.2.2" // { + sources."raw-body-2.3.2" + (sources."rc-1.2.4" // { dependencies = [ sources."minimist-1.2.0" ]; }) + sources."readable-stream-1.0.27-1" + sources."reduce-component-1.0.1" + sources."request-2.83.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.4.1" - sources."serve-static-1.12.6" + sources."send-0.16.1" + sources."serve-static-1.13.1" + sources."set-blocking-2.0.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."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.0.4" // { dependencies = [ sources."accepts-1.3.3" - sources."isarray-2.0.1" sources."component-emitter-1.2.1" + sources."isarray-2.0.1" ]; }) - (sources."superagent-3.5.2" // { + sources."socket.io-adapter-1.1.1" + sources."socket.io-client-2.0.4" + sources."socket.io-parser-3.1.2" + sources."spdx-correct-1.0.2" + sources."spdx-expression-parse-1.0.4" + sources."spdx-license-ids-1.2.2" + sources."sshpk-1.13.1" + sources."ssri-4.1.6" + sources."stack-trace-0.0.9" + sources."statuses-1.4.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.5" 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.1" sources."formidable-1.1.1" - sources."readable-stream-2.3.3" - sources."combined-stream-1.0.5" - sources."delayed-stream-1.0.0" sources."isarray-1.0.0" + sources."readable-stream-2.3.3" sources."string_decoder-1.0.3" ]; }) @@ -39072,285 +40884,62 @@ in sources."rimraf-2.2.8" ]; }) - (sources."winston-2.3.1" // { + sources."timed-out-4.0.1" + sources."to-array-0.1.4" + sources."tough-cookie-2.3.3" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-is-1.6.15" + sources."typechecker-4.4.1" + 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."uws-0.14.5" + sources."validate-npm-package-license-3.0.1" + sources."validate-npm-package-name-3.0.0" + sources."vary-1.1.2" + sources."verror-1.10.0" + sources."whatwg-fetch-2.0.3" + sources."which-1.3.0" + sources."which-module-2.0.0" + sources."wide-align-1.1.2" + (sources."winston-2.4.0" // { dependencies = [ sources."async-1.0.0" ]; }) - (sources."yargs-9.0.1" // { - dependencies = [ - sources."string-width-2.1.1" - sources."is-arrayish-0.2.1" - sources."is-fullwidth-code-point-2.0.0" - sources."strip-ansi-4.0.0" - sources."ansi-regex-3.0.0" - ]; - }) - 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.4.0" - 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.3.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.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.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.0" - 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.3.4" - 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.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."core-util-is-1.0.2" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" - sources."lru-cache-4.1.1" - sources."pseudomap-1.0.2" - sources."yallist-2.1.2" - sources."minimist-0.0.8" - 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."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."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.1.0" - sources."asynckit-0.4.0" - sources."ajv-5.5.2" - 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-4.3.1" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) - 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-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."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.5" - 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."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.3" - 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.1" - 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."wrap-ansi-2.1.0" // { dependencies = [ sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" ]; }) - 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."wrappy-1.0.2" + sources."ws-3.3.3" + sources."xmlhttprequest-ssl-1.5.5" 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."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."error-ex-1.3.1" + sources."yallist-2.1.2" + (sources."yargs-10.1.2" // { + 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-8.1.0" + sources."yeast-0.1.2" ]; buildInputs = globalBuildInputs; meta = { description = "Git made easy"; homepage = "https://github.com/FredrikNoren/ungit#readme"; - license = "SEE LICENSE IN LICENSE.md"; + license = "MIT"; }; production = true; bypassCache = false; @@ -39364,134 +40953,134 @@ in sha1 = "17c442b94c0a6a3a68293d6ea4deb408f8cb9225"; }; dependencies = [ + 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.8" + sources."caseless-0.11.0" + sources."chalk-1.1.3" + sources."combined-stream-1.0.5" + sources."commander-2.13.0" + 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-json-valid-2.17.1" + 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.4" + sources."mime-db-1.30.0" + sources."mime-types-2.1.17" + 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."tmp-0.0.33" - sources."follow-redirects-0.0.3" - (sources."config-chain-1.1.11" // { - dependencies = [ - sources."ini-1.3.5" - ]; - }) - 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.1.0" - 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."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."process-nextick-args-1.0.7" 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."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."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."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-0.2.0" - (sources."jsprim-1.4.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."semver-2.3.2" + sources."sntp-1.0.9" (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) - 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.12.2" - sources."is-my-json-valid-2.17.1" - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.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."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" - sources."os-tmpdir-1.0.2" + 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 = { @@ -39511,7 +41100,7 @@ in sha512 = "0n3rl5qq259csi0x5qh12wzyaypfds5wy0zrzky19wqsa0mjibrn19fdfgbabply2l576vlj8j69nzkb23jqfy6a36xb3cwi1g4l73z"; }; dependencies = [ - sources."acorn-5.2.1" + sources."acorn-5.3.0" (sources."acorn-dynamic-import-2.0.2" // { dependencies = [ sources."acorn-4.0.13" @@ -39519,193 +41108,185 @@ in }) sources."ajv-5.5.2" sources."ajv-keywords-2.1.1" + sources."align-text-0.1.4" + sources."ansi-regex-2.1.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.js-4.9.2" + sources."assert-1.4.1" sources."async-2.6.0" + sources."async-each-1.0.1" + sources."balanced-match-1.0.0" + sources."base64-js-1.2.1" + sources."big.js-3.2.0" + sources."binary-extensions-1.11.0" + sources."bn.js-4.11.8" + sources."brace-expansion-1.1.8" + (sources."braces-1.8.5" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."brorand-1.1.0" + 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-4.9.1" + sources."buffer-xor-1.0.3" + sources."builtin-modules-1.1.1" + sources."builtin-status-codes-3.0.0" + sources."camelcase-1.2.1" + sources."center-align-0.1.3" + sources."chokidar-1.7.0" + sources."cipher-base-1.0.4" + sources."cliui-2.1.0" + sources."co-4.6.0" + sources."code-point-at-1.1.0" + sources."concat-map-0.0.1" + sources."console-browserify-1.1.0" + sources."constants-browserify-1.0.0" + 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."cross-spawn-5.1.0" + sources."crypto-browserify-3.12.0" + sources."d-1.0.0" + sources."date-now-0.1.4" + sources."decamelize-1.2.0" + sources."des.js-1.0.0" + sources."diffie-hellman-5.0.2" + sources."domain-browser-1.2.0" + sources."elliptic-6.4.0" + sources."emojis-list-2.1.0" sources."enhanced-resolve-3.4.1" + sources."errno-0.1.6" + sources."error-ex-1.3.1" + sources."es5-ext-0.10.38" + 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."es6-weak-map-2.0.2" sources."escope-3.6.0" + sources."esrecurse-4.2.0" + sources."estraverse-4.2.0" + sources."event-emitter-0.3.5" + sources."events-1.1.1" + sources."evp_bytestokey-1.0.3" + sources."execa-0.7.0" + sources."expand-brackets-0.1.5" + sources."expand-range-1.8.2" + sources."extglob-0.3.2" + sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" + sources."filename-regex-2.0.1" + sources."fill-range-2.2.3" + sources."find-up-2.1.0" + sources."for-in-1.0.2" + sources."for-own-0.1.5" + sources."fsevents-1.1.3" + sources."get-caller-file-1.0.2" + sources."get-stream-3.0.0" + sources."glob-base-0.3.0" + sources."glob-parent-2.0.0" + sources."graceful-fs-4.1.11" + sources."has-flag-2.0.0" + sources."hash-base-3.0.4" + sources."hash.js-1.1.3" + sources."hmac-drbg-1.0.1" + sources."hosted-git-info-2.5.0" + sources."https-browserify-1.0.0" + sources."ieee754-1.1.8" + sources."indexof-0.0.1" + sources."inherits-2.0.3" sources."interpret-1.1.0" + sources."invert-kv-1.0.0" + 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-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-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-stream-1.1.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-2.1.0" sources."json-loader-0.5.7" + sources."json-schema-traverse-0.3.1" sources."json5-0.5.1" + sources."kind-of-3.2.2" + sources."lazy-cache-1.0.4" + sources."lcid-1.0.0" + sources."load-json-file-2.0.0" sources."loader-runner-2.3.0" sources."loader-utils-1.1.0" + sources."locate-path-2.0.0" + sources."lodash-4.17.4" + sources."longest-1.0.1" + sources."lru-cache-4.1.1" + sources."md5.js-1.3.4" + sources."mem-1.1.0" sources."memory-fs-0.4.1" + sources."micromatch-2.3.11" + sources."miller-rabin-4.0.1" + sources."mimic-fn-1.1.0" + 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."nan-2.8.0" (sources."node-libs-browser-2.1.0" // { dependencies = [ sources."hash-base-2.0.2" sources."inherits-2.0.1" ]; }) - sources."source-map-0.5.7" - sources."supports-color-4.5.0" - sources."tapable-0.2.8" - (sources."uglifyjs-webpack-plugin-0.4.6" // { - dependencies = [ - sources."yargs-3.10.0" - ]; - }) - sources."watchpack-1.4.0" - (sources."webpack-sources-1.1.0" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - (sources."yargs-8.0.2" // { - dependencies = [ - sources."camelcase-4.1.0" - (sources."cliui-3.2.0" // { - dependencies = [ - sources."string-width-1.0.2" - ]; - }) - sources."is-fullwidth-code-point-2.0.0" - sources."strip-ansi-4.0.0" - sources."ansi-regex-3.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."lodash-4.17.4" - sources."graceful-fs-4.1.11" - sources."object-assign-4.1.1" - sources."es6-map-0.1.5" - sources."es6-weak-map-2.0.2" - sources."esrecurse-4.2.0" - sources."estraverse-4.2.0" - sources."d-1.0.0" - sources."es5-ext-0.10.37" - 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.6" - sources."readable-stream-2.3.3" - sources."prr-1.0.1" - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - sources."minimist-0.0.8" - sources."assert-1.4.1" - sources."browserify-zlib-0.2.0" - 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-1.0.0" - sources."os-browserify-0.3.0" - sources."path-browserify-0.0.0" - sources."process-0.11.10" - sources."punycode-1.4.1" - sources."querystring-es3-0.2.1" - sources."stream-browserify-2.0.1" - sources."stream-http-2.7.2" - sources."timers-browserify-2.0.4" - sources."tty-browserify-0.0.0" - (sources."url-0.11.0" // { - dependencies = [ - sources."punycode-1.3.2" - ]; - }) - sources."util-0.10.3" - sources."vm-browserify-0.0.4" - sources."pako-1.0.6" - 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-3.0.4" - 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-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."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."path-is-absolute-1.0.1" - sources."readdirp-2.1.0" - sources."fsevents-1.1.3" - sources."micromatch-2.3.11" + sources."normalize-package-data-2.4.0" sources."normalize-path-2.1.1" - sources."arr-diff-2.0.0" - sources."array-unique-0.2.1" - (sources."braces-1.8.5" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) - sources."expand-brackets-0.1.5" - sources."extglob-0.3.2" - sources."filename-regex-2.0.1" - sources."is-extglob-1.0.0" + sources."npm-run-path-2.0.2" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" sources."object.omit-2.0.1" + sources."os-browserify-0.3.0" + 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."pako-1.0.6" + sources."parse-asn1-5.1.0" 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."parse-json-2.2.0" + sources."path-browserify-0.0.0" + sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."path-type-2.0.0" + sources."pbkdf2-3.0.14" + sources."pify-2.3.0" sources."preserve-0.2.0" - sources."repeat-element-1.1.2" - sources."fill-range-2.2.3" - sources."is-number-2.1.0" - sources."isobject-2.1.0" + sources."process-0.11.10" + sources."process-nextick-args-1.0.7" + sources."prr-1.0.1" + sources."pseudomap-1.0.2" + sources."public-encrypt-4.0.0" + sources."punycode-1.4.1" + sources."querystring-0.2.0" + sources."querystring-es3-0.2.1" (sources."randomatic-1.1.7" // { dependencies = [ (sources."is-number-3.0.0" // { @@ -39715,81 +41296,90 @@ in }) ]; }) - 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.11.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.8.0" - sources."source-list-map-2.0.0" - sources."get-caller-file-1.0.2" - sources."os-locale-2.1.0" + sources."randombytes-2.0.6" + sources."randomfill-1.0.3" + sources."read-pkg-2.0.0" sources."read-pkg-up-2.0.0" + sources."readable-stream-2.3.3" + 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."require-directory-2.1.1" sources."require-main-filename-1.0.1" + sources."right-align-0.1.3" + sources."ripemd160-2.0.1" + sources."safe-buffer-5.1.1" + sources."semver-5.5.0" sources."set-blocking-2.0.0" - sources."string-width-2.1.1" - sources."which-module-2.0.0" - sources."y18n-3.2.1" - sources."yargs-parser-7.0.0" - sources."strip-ansi-3.0.1" - sources."wrap-ansi-2.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."ansi-regex-2.1.1" - 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."setimmediate-1.0.5" + sources."sha.js-2.4.10" 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."signal-exit-3.0.2" + sources."source-list-map-2.0.0" + sources."source-map-0.5.7" sources."spdx-correct-1.0.2" sources."spdx-expression-parse-1.0.4" sources."spdx-license-ids-1.2.2" + sources."stream-browserify-2.0.1" + sources."stream-http-2.8.0" + sources."string-width-2.1.1" + sources."string_decoder-1.0.3" + sources."strip-ansi-3.0.1" + sources."strip-bom-3.0.0" + sources."strip-eof-1.0.0" + sources."supports-color-4.5.0" + sources."tapable-0.2.8" + sources."timers-browserify-2.0.6" + sources."to-arraybuffer-1.0.1" + sources."tty-browserify-0.0.0" + sources."uglify-js-2.8.29" + sources."uglify-to-browserify-1.0.2" + (sources."uglifyjs-webpack-plugin-0.4.6" // { + dependencies = [ + sources."yargs-3.10.0" + ]; + }) + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + sources."util-0.10.3" + sources."util-deprecate-1.0.2" + sources."validate-npm-package-license-3.0.1" + sources."vm-browserify-0.0.4" + sources."watchpack-1.4.0" + (sources."webpack-sources-1.1.0" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."which-1.3.0" + sources."which-module-2.0.0" + sources."window-size-0.1.0" + sources."wordwrap-0.0.2" + sources."wrap-ansi-2.1.0" + sources."xtend-4.0.1" + sources."y18n-3.2.1" + sources."yallist-2.1.2" + (sources."yargs-8.0.2" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."camelcase-4.1.0" + (sources."cliui-3.2.0" // { + dependencies = [ + sources."string-width-1.0.2" + ]; + }) + sources."is-fullwidth-code-point-2.0.0" + sources."strip-ansi-4.0.0" + ]; + }) + sources."yargs-parser-7.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -39803,671 +41393,553 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "2.2.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-2.2.2.tgz"; - sha1 = "5c54be1d5b2e9da3092f5f03ef55d6db372c37e1"; + url = "https://registry.npmjs.org/web-ext/-/web-ext-2.3.2.tgz"; + sha1 = "45c7cb50cbea90d6127a3c4bb128802a67f67c93"; }; dependencies = [ - (sources."addons-linter-0.27.0" // { + sources."@types/node-9.3.0" + sources."JSONSelect-0.2.1" + sources."acorn-5.3.0" + (sources."acorn-jsx-3.0.1" // { dependencies = [ - (sources."yargs-8.0.2" // { - dependencies = [ - sources."string-width-2.1.1" - ]; - }) - sources."babel-runtime-6.26.0" - sources."regenerator-runtime-0.11.1" - sources."ansi-styles-3.2.0" - sources."supports-color-4.5.0" - sources."domelementtype-1.1.3" - sources."is-fullwidth-code-point-2.0.0" - sources."strip-ansi-4.0.0" + sources."acorn-3.3.0" + ]; + }) + sources."adbkit-2.11.0" + sources."adbkit-logcat-1.1.0" + sources."adbkit-monkey-1.0.1" + (sources."addons-linter-0.33.0" // { + dependencies = [ + sources."ajv-keywords-1.5.1" + sources."ansi-escapes-1.4.0" sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.0" + sources."async-2.6.0" + sources."cli-cursor-1.0.2" sources."debug-3.1.0" - sources."tmp-0.0.33" + sources."decamelize-1.2.0" + sources."domelementtype-1.1.3" + sources."figures-1.7.0" + sources."globals-11.2.0" sources."inquirer-0.12.0" + sources."is-fullwidth-code-point-1.0.0" + sources."mute-stream-0.0.5" + sources."onetime-1.1.0" sources."pluralize-1.2.1" sources."progress-1.1.8" - sources."table-3.8.3" - sources."ansi-escapes-1.4.0" - sources."cli-cursor-1.0.2" - sources."figures-1.7.0" + sources."punycode-2.1.0" + sources."restore-cursor-1.0.1" sources."run-async-0.1.0" sources."rx-lite-3.1.2" - sources."string-width-1.0.2" - sources."restore-cursor-1.0.1" - sources."onetime-1.1.0" - sources."mute-stream-0.0.5" - sources."ajv-keywords-1.5.1" sources."slice-ansi-0.0.4" - sources."punycode-2.1.0" - ]; - }) - sources."babel-polyfill-6.20.0" - sources."babel-runtime-6.25.0" - (sources."bunyan-1.8.10" // { - dependencies = [ - sources."rimraf-2.4.5" - sources."glob-6.0.4" - ]; - }) - 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" // { - dependencies = [ - sources."async-2.1.5" - ]; - }) - (sources."fx-runner-1.0.8" // { - dependencies = [ - sources."commander-2.9.0" - sources."lodash-3.10.1" - sources."which-1.2.4" - sources."isexe-1.1.2" - ]; - }) - (sources."git-rev-sync-1.9.1" // { - dependencies = [ - sources."shelljs-0.7.7" - ]; - }) - sources."minimatch-3.0.4" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - sources."mz-2.6.0" - (sources."node-firefox-connect-1.2.0" // { - dependencies = [ - sources."es6-promise-2.3.0" - sources."traverse-0.4.6" - ]; - }) - 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" // { - dependencies = [ - sources."babel-polyfill-6.16.0" - sources."es6-error-4.0.0" - sources."mz-2.5.0" - sources."request-2.79.0" - sources."source-map-support-0.4.6" - sources."regenerator-runtime-0.9.6" - sources."ms-0.7.3" - sources."hoek-2.16.3" - sources."aws-sign2-0.6.0" - sources."caseless-0.11.0" - sources."form-data-2.1.4" - sources."har-validator-2.0.6" - sources."hawk-3.1.3" - sources."http-signature-1.1.1" - sources."qs-6.3.2" - sources."tunnel-agent-0.4.3" - sources."chalk-1.1.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - sources."assert-plus-0.2.0" - ]; - }) - (sources."source-map-support-0.5.0" // { - dependencies = [ sources."source-map-0.6.1" - ]; - }) - (sources."stream-to-promise-2.2.0" // { - dependencies = [ - sources."end-of-stream-1.1.0" - sources."once-1.3.3" - ]; - }) - sources."tmp-0.0.30" - sources."watchpack-1.3.0" - (sources."update-notifier-2.2.0" // { - dependencies = [ - (sources."chalk-1.1.3" // { + sources."source-map-support-0.5.1" + sources."string-width-1.0.2" + sources."strip-ansi-4.0.0" + sources."supports-color-4.5.0" + sources."table-3.8.3" + sources."underscore-1.6.0" + (sources."yargs-10.0.3" // { dependencies = [ - sources."ansi-styles-2.2.1" - sources."supports-color-2.0.0" + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-2.0.0" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" + ]; + }) + sources."strip-ansi-3.0.1" ]; }) - sources."ansi-styles-3.2.0" - sources."supports-color-4.5.0" - sources."pify-3.0.0" ]; }) - (sources."yargs-6.6.0" // { + sources."adm-zip-0.4.7" + sources."ajv-5.5.2" + sources."ajv-keywords-2.1.1" + sources."anchor-markdown-header-0.5.7" + sources."ansi-align-2.0.0" + sources."ansi-escapes-3.0.0" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."any-promise-1.3.0" + sources."anymatch-1.3.2" + sources."archiver-2.1.1" + sources."archiver-utils-1.3.0" + sources."argparse-1.0.9" + sources."arr-diff-2.0.0" + sources."arr-flatten-1.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.2.1" + sources."arrify-1.0.1" + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."async-0.2.10" + sources."async-each-1.0.1" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.6.0" + sources."babel-code-frame-6.26.0" + sources."babel-core-6.26.0" + sources."babel-generator-6.26.0" + sources."babel-helpers-6.24.1" + sources."babel-messages-6.23.0" + (sources."babel-polyfill-6.26.0" // { dependencies = [ - sources."camelcase-3.0.0" - sources."os-locale-1.4.0" - sources."read-pkg-up-1.0.1" - sources."string-width-1.0.2" - sources."which-module-1.0.0" - sources."yargs-parser-4.2.1" - sources."find-up-1.1.2" - sources."read-pkg-1.1.0" - sources."path-exists-2.1.0" - sources."load-json-file-1.1.0" - sources."path-type-1.1.0" - sources."strip-bom-2.0.0" + sources."regenerator-runtime-0.10.5" ]; }) - (sources."zip-dir-1.0.2" // { - dependencies = [ - sources."async-1.5.2" - ]; - }) - sources."ajv-5.2.3" (sources."babel-register-6.26.0" // { dependencies = [ - sources."source-map-support-0.4.18" sources."chalk-1.1.3" + sources."source-map-support-0.4.18" ]; }) - sources."chalk-2.1.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."bail-1.0.2" + sources."balanced-match-1.0.0" + sources."base64url-2.0.0" + sources."bcrypt-pbkdf-1.0.1" + sources."binary-extensions-1.11.0" + sources."bl-1.2.1" + sources."bluebird-2.9.34" + sources."boolbase-1.0.0" + sources."boom-4.3.1" + sources."boundary-1.0.1" + sources."boxen-1.3.0" + sources."brace-expansion-1.1.8" + (sources."braces-1.8.5" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."buffer-crc32-0.2.13" + sources."buffer-equal-constant-time-1.0.1" + sources."builtin-modules-1.1.1" + (sources."bunyan-1.8.12" // { + dependencies = [ + sources."glob-6.0.4" + sources."rimraf-2.4.5" + ]; + }) + 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."ccount-1.0.2" + sources."chalk-2.3.0" + 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."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."chokidar-1.7.0" + sources."circular-json-0.3.3" + sources."cli-boxes-1.0.0" + sources."cli-cursor-2.1.0" + sources."cli-width-2.2.0" + (sources."cliui-3.2.0" // { dependencies = [ - sources."yargs-9.0.1" + sources."string-width-1.0.2" ]; }) - (sources."eslint-4.8.0" // { + sources."clone-1.0.3" + sources."co-4.6.0" + sources."code-point-at-1.1.0" + sources."collapse-white-space-1.0.3" + 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.5" + sources."commander-2.13.0" + sources."common-tags-1.7.2" + sources."compress-commons-1.2.2" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.0" + sources."configstore-3.1.1" + sources."convert-source-map-1.5.1" + sources."core-js-2.5.3" + 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."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."deep-extend-0.4.2" + sources."deep-is-0.1.3" + sources."deepcopy-0.6.3" + sources."deepmerge-1.5.2" + sources."defaults-1.0.3" + sources."del-2.2.2" + sources."delayed-stream-1.0.0" + sources."detect-indent-4.0.0" + (sources."dispensary-0.12.0" // { + dependencies = [ + sources."source-map-support-0.5.0" + ]; + }) + sources."doctoc-1.3.0" + 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-4.2.0" + sources."dtrace-provider-0.8.6" + sources."duplexer3-0.1.4" + sources."ecc-jsbn-0.1.1" + sources."ecdsa-sig-formatter-1.0.9" + 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" + sources."es5-ext-0.10.38" + sources."es6-error-4.1.1" + sources."es6-iterator-2.0.3" + sources."es6-map-0.1.5" + sources."es6-promise-4.2.4" + sources."es6-promisify-5.0.0" + 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.15.0" // { dependencies = [ sources."esprima-4.0.0" ]; }) (sources."eslint-plugin-no-unsafe-innerhtml-1.0.16" // { dependencies = [ - (sources."eslint-3.19.0" // { - dependencies = [ - sources."is-fullwidth-code-point-2.0.0" - sources."strip-ansi-4.0.0" - sources."ansi-regex-3.0.0" - ]; - }) + 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."ansi-styles-2.2.1" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - sources."ansi-regex-2.1.1" - sources."is-fullwidth-code-point-1.0.0" - sources."ajv-4.11.8" + (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."esprima-3.1.3" - sources."first-chunk-stream-2.0.0" - sources."jed-1.1.1" - (sources."pino-4.10.2" // { - dependencies = [ - sources."chalk-2.3.0" - ]; - }) - sources."postcss-6.0.11" - (sources."relaxed-json-1.0.1" // { - dependencies = [ - sources."chalk-1.1.3" - sources."ansi-styles-2.2.1" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" - sources."ansi-regex-2.1.1" ]; }) - sources."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.3" - sources."home-or-tmp-2.0.0" - sources."lodash-4.17.4" - 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.1" - 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.5.7" + sources."eslint-scope-3.7.1" + sources."eslint-visitor-keys-1.0.0" + sources."espree-3.5.2" + sources."esprima-3.1.3" + sources."esquery-1.0.0" + sources."esrecurse-4.2.0" + sources."estraverse-4.2.0" sources."esutils-2.0.2" - sources."js-tokens-3.0.2" - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - sources."ansi-regex-2.1.1" - sources."detect-indent-4.0.0" - sources."jsesc-1.3.0" - sources."trim-right-1.0.1" - sources."repeating-2.0.1" - sources."is-finite-1.0.2" - sources."number-is-nan-1.0.1" - sources."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."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.5.2" - 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."structured-source-3.0.2" - sources."traverse-0.6.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."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-0.1.5" + sources."expand-range-1.8.2" sources."extend-3.0.1" - sources."parse-entities-1.1.1" - sources."repeat-string-1.6.1" - sources."trim-0.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.3.0" - sources."unist-util-is-2.1.1" - 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.4.0" - 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-2.6.0" - sources."natural-compare-lite-1.4.0" - sources."request-2.83.0" - sources."sha.js-2.4.9" - sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" - sources."caseless-0.12.0" - sources."combined-stream-1.0.5" + sources."external-editor-2.1.0" + sources."extglob-0.3.2" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.0.0" + sources."fast-json-parse-1.0.3" + 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."figures-2.0.0" + sources."file-entry-cache-2.0.0" + sources."filename-regex-2.0.1" + sources."fill-range-2.2.3" + sources."find-up-2.1.0" + sources."firefox-client-0.3.0" + (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-0.4.1" + sources."for-in-1.0.2" + sources."for-own-0.1.5" 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."har-schema-2.0.0" - 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."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."cliui-3.2.0" // { - dependencies = [ - sources."string-width-1.0.2" - ]; - }) - 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."set-blocking-2.0.0" - sources."string-width-2.1.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."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-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."graceful-fs-4.1.11" - sources."pify-2.3.0" - sources."strip-bom-3.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.2" - 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-3.3.0" - sources."is-resolvable-1.0.1" - 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-7.0.0" - sources."progress-2.0.0" - sources."strip-json-comments-2.0.1" - sources."table-4.0.2" - sources."text-table-0.2.0" - sources."typedarray-0.0.6" - sources."esrecurse-4.2.0" - sources."object-assign-4.1.1" - sources."acorn-5.2.1" - (sources."acorn-jsx-3.0.1" // { - dependencies = [ - sources."acorn-3.3.0" - ]; - }) - 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.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.1" - sources."pinkie-2.0.4" + sources."fs-extra-4.0.3" sources."fs.realpath-1.0.0" - sources."inflight-1.0.6" - sources."ansi-escapes-3.0.0" - sources."cli-cursor-2.1.0" - sources."cli-width-2.2.0" - sources."external-editor-2.1.0" - 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."chardet-0.4.2" - sources."iconv-lite-0.4.19" - sources."is-promise-2.1.0" - 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-2.1.1" - sources."slice-ansi-1.0.0" - sources."escope-3.6.0" - sources."is-my-json-valid-2.17.1" - sources."shelljs-0.7.8" - 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.37" - 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."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."jsonpointer-4.0.1" - sources."is-property-1.0.2" - sources."interpret-1.1.0" - 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.3" - sources."quick-format-unescaped-1.1.1" - sources."split2-2.2.0" - sources."end-of-stream-1.4.0" - sources."through2-2.0.3" - sources."commander-2.12.2" - 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."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.20.1" - sources."nan-2.8.0" - sources."ncp-2.0.0" - sources."es6-promise-4.1.1" - sources."adm-zip-0.4.7" - sources."archiver-1.3.0" - sources."fs-extra-2.1.2" - sources."ini-1.3.5" - 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."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."get-caller-file-1.0.2" + sources."get-stream-3.0.0" + sources."getpass-0.1.7" + sources."gettext-parser-1.1.0" + (sources."git-rev-sync-1.9.1" // { dependencies = [ - sources."kind-of-4.0.0" + sources."shelljs-0.7.7" ]; }) - sources."expand-brackets-0.1.5" - sources."extglob-0.3.2" - sources."filename-regex-2.0.1" + sources."glob-7.1.2" + sources."glob-base-0.3.0" + sources."glob-parent-2.0.0" + sources."global-dirs-0.1.1" + sources."globals-9.18.0" + sources."globby-5.0.0" + sources."got-6.7.1" + sources."graceful-fs-4.1.11" + sources."graceful-readlink-1.0.1" + 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-2.0.0" + sources."hawk-6.0.2" + sources."hoek-4.2.0" + sources."home-or-tmp-2.0.0" + sources."hosted-git-info-2.5.0" + sources."htmlparser2-3.9.2" + sources."http-signature-1.2.0" + sources."iconv-lite-0.4.19" + sources."ignore-3.3.7" + 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-3.3.0" + sources."interpret-1.1.0" + sources."invariant-2.2.2" + sources."invert-kv-1.0.0" + sources."is-absolute-0.1.7" + 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-decimal-1.0.1" + 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."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-finite-1.0.2" + sources."is-fullwidth-code-point-2.0.0" + sources."is-glob-2.0.1" + sources."is-hexadecimal-1.0.1" + sources."is-installed-globally-0.1.0" + sources."is-my-json-valid-2.17.1" + sources."is-npm-1.0.0" sources."is-number-2.1.0" + sources."is-obj-1.0.1" + sources."is-path-cwd-1.0.0" + sources."is-path-in-cwd-1.0.0" + sources."is-path-inside-1.0.1" + sources."is-posix-bracket-0.1.1" + sources."is-primitive-2.0.0" + 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."is-typedarray-1.0.0" + sources."is-utf8-0.2.1" + sources."isarray-1.0.0" + sources."isemail-1.2.0" + sources."isexe-2.0.0" sources."isobject-2.1.0" + 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.10.0" + sources."jsbn-0.1.1" + sources."jsesc-1.3.0" + sources."json-parse-better-errors-1.0.1" + 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."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-3.1.0" + 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.4" + sources."lodash.endswith-4.2.1" + sources."lodash.isfunction-3.0.8" + sources."lodash.isstring-4.0.1" + sources."lodash.once-4.1.1" + sources."lodash.sortby-4.7.0" + sources."lodash.startswith-4.2.1" + sources."longest-streak-1.0.0" + sources."loose-envify-1.3.1" + sources."lowercase-keys-1.0.0" + sources."lru-cache-4.1.1" + sources."make-dir-1.1.0" + sources."markdown-table-0.4.0" + sources."markdown-to-ast-3.4.0" + sources."mem-1.1.0" + sources."micromatch-2.3.11" + sources."mime-db-1.30.0" + sources."mime-types-2.1.17" + sources."mimic-fn-1.1.0" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."moment-2.20.1" + sources."ms-2.0.0" + sources."mute-stream-0.0.7" + sources."mv-2.1.1" + sources."mz-2.7.0" + sources."nan-2.8.0" + sources."natural-compare-1.4.0" + sources."natural-compare-lite-1.4.0" + sources."ncp-2.0.0" + sources."next-tick-1.0.0" + (sources."node-firefox-connect-1.2.0" // { + dependencies = [ + sources."es6-promise-2.3.0" + sources."traverse-0.4.6" + ]; + }) + sources."node-forge-0.7.1" + sources."node-notifier-5.2.1" + 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."object.omit-2.0.1" + 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-shim-0.1.3" + 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" + sources."pako-1.0.6" + sources."parse-entities-1.1.1" + sources."parse-glob-3.0.4" + sources."parse-json-4.0.0" + sources."parse5-3.0.3" + sources."path-exists-3.0.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.10.3" + 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."postcss-6.0.14" + sources."prelude-ls-1.1.2" + sources."prepend-http-1.0.4" + sources."preserve-0.2.0" + sources."private-0.1.8" + (sources."probe-image-size-3.2.0" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."process-nextick-args-1.0.7" + sources."progress-2.0.0" + sources."pseudomap-1.0.2" + sources."pump-2.0.1" + sources."punycode-1.4.1" + sources."qs-6.5.1" + sources."quick-format-unescaped-1.1.2" (sources."randomatic-1.1.7" // { dependencies = [ (sources."is-number-3.0.0" // { @@ -40477,56 +41949,217 @@ in }) ]; }) - 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.11.0" - sources."set-immediate-shim-1.0.1" - (sources."boxen-1.3.0" // { - dependencies = [ - sources."chalk-2.3.0" - ]; - }) - 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."widest-line-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."crypto-random-string-1.0.0" - sources."package-json-4.0.1" - sources."got-6.7.1" + sources."rc-1.2.4" + sources."read-pkg-1.1.0" + sources."read-pkg-up-1.0.1" + sources."readable-stream-2.3.3" + sources."readdirp-2.1.0" + sources."readline2-1.0.1" + sources."rechoir-0.6.2" + sources."regenerator-runtime-0.11.1" + sources."regex-cache-0.4.4" 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."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."repeat-element-1.1.2" + sources."repeat-string-1.6.1" + sources."repeating-2.0.1" + sources."request-2.83.0" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."require-uncached-1.0.3" + sources."resolve-1.5.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."safe-json-stringify-1.0.4" + sources."sax-1.2.4" + sources."semver-5.4.1" + sources."semver-diff-2.1.0" + sources."set-blocking-2.0.0" + sources."set-immediate-shim-1.0.1" + sources."sha.js-2.4.10" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."shell-quote-1.6.1" + sources."shelljs-0.8.0" + sources."shellwords-0.1.1" + (sources."sign-addon-0.2.2" // { + 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."sntp-2.1.0" + sources."source-map-0.5.7" + (sources."source-map-support-0.5.2" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."spawn-sync-1.0.15" + sources."spdx-correct-1.0.2" + sources."spdx-expression-parse-1.0.4" + sources."spdx-license-ids-1.2.2" + sources."split-0.3.3" + sources."split2-2.2.0" + sources."sprintf-js-1.0.3" + sources."sshpk-1.13.1" + sources."stream-parser-0.3.1" + 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-width-2.1.1" + sources."string_decoder-1.0.3" + sources."stringify-entities-1.3.1" + sources."stringstream-0.0.5" + sources."strip-ansi-3.0.1" + 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."term-size-1.2.0" + sources."text-table-0.2.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-4.0.1" + sources."tmp-0.0.33" + sources."to-fast-properties-1.0.3" + sources."topo-1.1.0" + sources."tosource-1.0.0" + sources."tough-cookie-2.3.3" + sources."tr46-1.0.1" + sources."traverse-0.6.6" + sources."trim-0.0.1" + sources."trim-right-1.0.1" + sources."trim-trailing-lines-1.1.0" + sources."trough-1.0.1" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-check-0.3.2" + sources."typedarray-0.0.6" + sources."underscore-1.8.3" + sources."unherit-1.1.0" + sources."unified-4.2.1" + 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."unzip-response-2.0.1" + sources."upath-1.0.2" + (sources."update-notifier-2.3.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."update-section-0.3.3" 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."user-home-2.0.0" + sources."util-deprecate-1.0.2" + sources."uuid-3.2.1" + sources."validate-npm-package-license-3.0.1" + sources."verror-1.10.0" + sources."vfile-1.4.0" + sources."vfile-location-2.0.2" + (sources."watchpack-1.4.0" // { + dependencies = [ + sources."async-2.6.0" + ]; + }) + sources."wcwidth-1.0.1" + sources."webidl-conversions-4.0.2" + sources."whatwg-url-6.3.0" + sources."when-3.7.7" + sources."which-1.3.0" + sources."which-module-2.0.0" + sources."widest-line-2.0.0" + 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-2.3.0" + sources."xdg-basedir-3.0.0" + sources."xml2js-0.4.19" + sources."xmlbuilder-9.0.4" + 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."decamelize-1.2.0" + sources."find-up-1.1.2" + sources."is-fullwidth-code-point-1.0.0" + sources."os-locale-1.4.0" + sources."parse-json-2.2.0" + sources."path-exists-2.1.0" + sources."string-width-1.0.2" + sources."strip-bom-2.0.0" + sources."which-module-1.0.0" + sources."yargs-parser-4.2.1" + ]; + }) + sources."yargs-parser-8.1.0" + sources."yauzl-2.9.1" + (sources."zip-dir-1.0.2" // { + dependencies = [ + sources."async-1.5.2" + ]; + }) + sources."zip-stream-1.2.0" ]; buildInputs = globalBuildInputs; meta = { @@ -40574,130 +42207,450 @@ in 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.0.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."chalk-1.1.3" - sources."cli-list-0.2.0" - sources."configstore-3.1.1" - sources."cross-spawn-5.1.0" - sources."figures-2.0.0" - (sources."fullname-3.3.0" // { + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.6.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."pify-2.3.0" - sources."npm-run-path-1.0.0" - sources."path-key-1.0.0" + sources."semver-4.3.6" ]; }) - sources."got-6.7.1" + sources."boom-4.3.1" + sources."boxen-1.3.0" + sources."brace-expansion-1.1.8" + sources."builtin-modules-1.1.1" + sources."cacheable-request-2.1.4" + 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."clean-stack-1.3.0" + sources."cli-boxes-1.0.0" + sources."cli-cursor-2.1.0" + sources."cli-list-0.2.0" + sources."cli-width-2.2.0" + sources."clone-1.0.3" + sources."clone-regexp-1.0.0" + 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.5" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.0" + sources."configstore-3.1.1" + 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.4.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.1.0" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" + sources."figures-2.0.0" + 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.1" + 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.0.3" + 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-2.0.0" + sources."has-symbol-support-x-1.4.1" + sources."has-to-string-tag-x-1.4.1" + sources."has-unicode-2.0.1" + sources."hawk-6.0.2" + sources."hoek-4.2.0" + sources."hosted-git-info-2.5.0" + sources."http-cache-semantics-3.8.1" + sources."http-signature-1.2.0" sources."humanize-string-1.0.1" + sources."iconv-lite-0.4.19" + 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."ansi-regex-3.0.0" + sources."ansi-styles-3.2.0" sources."chalk-2.3.0" sources."strip-ansi-4.0.0" - sources."ansi-styles-3.2.0" sources."supports-color-4.5.0" - sources."ansi-regex-3.0.0" ]; }) (sources."insight-0.8.4" // { dependencies = [ + sources."ansi-escapes-1.4.0" sources."async-1.5.2" + sources."cli-cursor-1.0.2" + sources."cli-width-1.1.1" (sources."configstore-1.4.0" // { dependencies = [ sources."uuid-2.0.3" ]; }) - sources."inquirer-0.10.1" - sources."write-file-atomic-1.3.4" - sources."xdg-basedir-2.0.0" - sources."minimist-0.0.8" - sources."ansi-escapes-1.4.0" - sources."cli-cursor-1.0.2" - sources."cli-width-1.1.1" 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."restore-cursor-1.0.1" - sources."onetime-1.1.0" - sources."is-fullwidth-code-point-1.0.0" - sources."mute-stream-0.0.5" + sources."write-file-atomic-1.3.4" + sources."xdg-basedir-2.0.0" ]; }) + sources."into-stream-3.1.0" + sources."is-arrayish-0.2.1" + sources."is-builtin-module-1.0.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.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."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.4" + 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.0" + sources."lru-cache-4.1.1" + sources."make-dir-1.1.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."read-pkg-up-1.0.1" - sources."pify-2.3.0" 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.30.0" + sources."mime-types-2.1.17" + sources."mimic-fn-1.1.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."timed-out-3.1.3" - sources."unzip-response-1.0.2" + sources."got-7.1.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."got-5.7.1" - sources."timed-out-3.1.3" - sources."unzip-response-1.0.2" + sources."minimist-1.2.0" ]; }) + sources."os-shim-0.1.3" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.4" + sources."osx-release-1.1.0" + sources."p-any-1.1.0" + sources."p-cancelable-0.3.0" + 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-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."parse-json-2.2.0" + (sources."passwd-user-2.1.0" // { + dependencies = [ + sources."execa-0.4.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-1.0.7" + sources."pseudomap-1.0.2" + sources."punycode-1.4.1" + sources."qs-6.5.1" + sources."query-string-5.0.1" + sources."rc-1.2.4" + sources."read-pkg-1.1.0" (sources."read-pkg-up-2.0.0" // { dependencies = [ sources."find-up-2.1.0" - sources."read-pkg-2.0.0" - sources."path-exists-3.0.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."readable-stream-2.3.3" + sources."readline2-1.0.1" + sources."redent-1.0.0" + sources."registry-auth-token-3.3.1" + sources."registry-url-3.1.0" + sources."repeating-2.0.1" + sources."replace-ext-0.0.1" + sources."request-2.83.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."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."semver-5.5.0" + ]; + }) + sources."set-immediate-shim-1.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."sntp-2.1.0" + sources."sort-keys-2.0.0" sources."sort-on-2.0.0" + sources."spawn-sync-1.0.15" + sources."spdx-correct-1.0.2" + sources."spdx-expression-parse-1.0.4" + sources."spdx-license-ids-1.2.2" + sources."sshpk-1.13.1" + sources."strict-uri-encode-1.1.0" sources."string-length-1.0.1" + sources."string-width-2.1.1" + sources."string_decoder-1.0.3" + sources."stringstream-0.0.5" + sources."strip-ansi-3.0.1" + sources."strip-bom-2.0.0" + sources."strip-bom-stream-2.0.0" + sources."strip-eof-1.0.0" + sources."strip-indent-1.0.1" + sources."strip-json-comments-2.0.1" + sources."sudo-block-1.2.0" + sources."supports-color-2.0.0" (sources."tabtab-1.3.2" // { dependencies = [ - sources."inquirer-1.2.3" sources."ansi-escapes-1.4.0" sources."cli-cursor-1.0.2" sources."external-editor-1.1.1" sources."figures-1.7.0" - sources."mute-stream-0.0.6" - sources."string-width-1.0.2" - sources."restore-cursor-1.0.1" - sources."onetime-1.1.0" - sources."tmp-0.0.29" + 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."text-table-0.2.0" + sources."through-2.3.8" + sources."through2-2.0.3" + sources."timed-out-4.0.1" sources."titleize-1.0.0" + sources."tmp-0.0.33" + sources."tough-cookie-2.3.3" + 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.3.0" // { dependencies = [ - sources."chalk-2.3.0" - sources."camelcase-4.1.0" - sources."execa-0.7.0" sources."ansi-styles-3.2.0" + sources."camelcase-4.1.0" + sources."chalk-2.3.0" + sources."execa-0.7.0" sources."supports-color-4.5.0" - sources."package-json-4.0.1" ]; }) + 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.1" + sources."verror-1.10.0" + sources."vinyl-1.2.0" + sources."vinyl-file-2.0.0" + sources."walk-2.3.9" + 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."yallist-2.1.2" (sources."yeoman-character-1.1.0" // { dependencies = [ - sources."supports-color-3.2.3" sources."has-flag-1.0.0" + sources."supports-color-3.2.3" ]; }) (sources."yeoman-doctor-2.1.0" // { @@ -40707,12 +42660,12 @@ in }) (sources."yeoman-environment-2.0.5" // { dependencies = [ + sources."ansi-styles-3.2.0" sources."chalk-2.3.0" sources."debug-3.1.0" - sources."log-symbols-2.1.0" - sources."ansi-styles-3.2.0" - sources."supports-color-4.5.0" + sources."log-symbols-2.2.0" sources."pify-2.3.0" + sources."supports-color-4.5.0" ]; }) (sources."yosay-2.0.1" // { @@ -40721,304 +42674,6 @@ in sources."is-fullwidth-code-point-1.0.0" ]; }) - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.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-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."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."execa-0.6.3" - sources."filter-obj-1.1.0" - sources."mem-1.1.0" - sources."p-any-1.1.0" - sources."p-try-1.0.0" - (sources."passwd-user-2.1.0" // { - dependencies = [ - sources."execa-0.4.0" - ]; - }) - sources."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-3.2.0" - sources."cross-spawn-async-2.2.5" - sources."object-assign-4.1.1" - sources."deep-extend-0.4.2" - sources."ini-1.3.5" - 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-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."decamelize-1.2.0" - sources."ansi-escapes-3.0.0" - sources."cli-cursor-2.1.0" - sources."cli-width-2.2.0" - sources."external-editor-2.1.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."color-convert-1.9.1" - sources."color-name-1.1.3" - sources."has-flag-2.0.0" - sources."restore-cursor-2.0.0" - sources."onetime-2.0.1" - sources."chardet-0.4.2" - sources."iconv-lite-0.4.19" - 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."lodash.debounce-3.1.1" - (sources."os-name-1.0.3" // { - dependencies = [ - sources."minimist-1.2.0" - ]; - }) - 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."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.5.2" - 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-4.3.1" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) - 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-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."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."strip-bom-2.0.0" - sources."error-ex-1.3.1" - sources."is-arrayish-0.2.1" - sources."is-utf8-0.2.1" - sources."strip-indent-1.0.1" - sources."repeating-2.0.1" - sources."is-finite-1.0.2" - sources."get-stdin-4.0.1" - sources."registry-url-3.1.0" - sources."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."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-2.6.9" - 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.3.0" - 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."term-size-1.2.0" - sources."widest-line-2.0.0" - sources."global-dirs-0.1.1" - sources."is-path-inside-1.0.1" - sources."path-is-inside-1.0.2" - (sources."bin-version-check-2.1.0" // { - dependencies = [ - sources."semver-4.3.6" - ]; - }) - sources."each-async-1.1.1" - sources."log-symbols-1.0.2" - sources."object-values-1.0.0" - sources."twig-0.8.9" - sources."bin-version-1.0.4" - (sources."semver-truncate-1.1.2" // { - dependencies = [ - sources."semver-5.4.1" - ]; - }) - 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."through2-2.0.3" - sources."vinyl-1.2.0" - sources."vinyl-file-2.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" // { - dependencies = [ - sources."string-width-1.0.2" - ]; - }) ]; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/development/node-packages/node-packages-v8.json b/pkgs/development/node-packages/node-packages-v8.json index d7f05456989..744894de4ff 100644 --- a/pkgs/development/node-packages/node-packages-v8.json +++ b/pkgs/development/node-packages/node-packages-v8.json @@ -8,6 +8,7 @@ , "node-gyp" , "node-gyp-build" , "node-pre-gyp" +, "pnpm" , "semver" , "sloc" ] diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index 8c7ab1d7a2e..7397866ccea 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -1,9 +1,1188 @@ -# This file has been generated by node2nix 1.5.0. Do not edit! +# This file has been generated by node2nix 1.5.1. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: let sources = { + "@most/multicast-1.3.0" = { + name = "_at_most_slash_multicast"; + packageName = "@most/multicast"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@most/multicast/-/multicast-1.3.0.tgz"; + sha512 = "2zs8n5gpgl9frbw960m4q63svcgvqkbb9iay3klw3qcj4c0hwbw6llbkj9h4v13s1fh5gc4k6zg2cxpz4vipbp6kzbrd9v0500zqq8d"; + }; + }; + "@most/prelude-1.7.0" = { + name = "_at_most_slash_prelude"; + packageName = "@most/prelude"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@most/prelude/-/prelude-1.7.0.tgz"; + sha512 = "0cdx6nag042jl38sm34c4cpc70wya0xns7f5j9i3hs8kwca8lkgbss9db6jkgd090hpvxq2qh5fzxnfnw705ph1zklgmnxf9wgw4l1s"; + }; + }; + "@pnpm/check-package-1.0.0" = { + name = "_at_pnpm_slash_check-package"; + packageName = "@pnpm/check-package"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@pnpm/check-package/-/check-package-1.0.0.tgz"; + sha512 = "1hg0g5snqp1lkmnmis335fpvg7xz93snvlbzqmyxxmyl0ab2d4wdlar6rwl7gr59113cpsyn2k3sawh656zrp6fp8q1rdy6x24a3pxc"; + }; + }; + "@pnpm/default-fetcher-0.3.2" = { + name = "_at_pnpm_slash_default-fetcher"; + packageName = "@pnpm/default-fetcher"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@pnpm/default-fetcher/-/default-fetcher-0.3.2.tgz"; + sha512 = "25lb4pf7sqsw31h5rdaqii969bl19ypip4l3x19i28p3c2174zi1hk152y3r6z36rfp66sfwq0p6f6gvnx10lf46vigw02ppv7szk49"; + }; + }; + "@pnpm/default-resolver-0.1.2" = { + name = "_at_pnpm_slash_default-resolver"; + packageName = "@pnpm/default-resolver"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@pnpm/default-resolver/-/default-resolver-0.1.2.tgz"; + sha512 = "3smnd8xcmslnba22i9p10f7a724whjm2wvjz3l9fvw23fw8d5nwn78xdkgrvpraqb7xw75xwq8cxj3nvmvib1iqpmp3pcx7j4px5fhx"; + }; + }; + "@pnpm/fs-locker-1.0.1" = { + name = "_at_pnpm_slash_fs-locker"; + packageName = "@pnpm/fs-locker"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@pnpm/fs-locker/-/fs-locker-1.0.1.tgz"; + sha512 = "3nadpl6sinl2h484m7nnn1vsry8pp0kfxgw8apbnyhajqsq00chx3f2v93hl26xnxri2wlhz0s2pc15617xb0xlpln9n1lzrr43fqw2"; + }; + }; + "@pnpm/git-fetcher-0.2.0" = { + name = "_at_pnpm_slash_git-fetcher"; + packageName = "@pnpm/git-fetcher"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@pnpm/git-fetcher/-/git-fetcher-0.2.0.tgz"; + sha512 = "2ax9drzzzrc2c7risivkxbv76nxdxafhfckl5g481b3k92gc8r8hl4j6kwrq8vl62sav010ssd7giadxs0b0h0nxqgwppsf0v942492"; + }; + }; + "@pnpm/git-resolver-0.3.0" = { + name = "_at_pnpm_slash_git-resolver"; + packageName = "@pnpm/git-resolver"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@pnpm/git-resolver/-/git-resolver-0.3.0.tgz"; + sha512 = "3xh8kq7pykgpp39g7pjd7x9f834q2dj3jxw3fcrikim1vpn0xiim3g17mz9s87ci0cxrgxcrn2sd4qcap99z9jg5s577af64z4pj6qw"; + }; + }; + "@pnpm/local-resolver-0.1.1" = { + name = "_at_pnpm_slash_local-resolver"; + packageName = "@pnpm/local-resolver"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@pnpm/local-resolver/-/local-resolver-0.1.1.tgz"; + sha512 = "3i66qx6iw71i07pg21k5j044r807ysq2ijy8q4a92jdg2a17w55ah2j59rs2mxsljl9kkxvp06852q8x00j2g8bbw2v5iivl5191h7y"; + }; + }; + "@pnpm/logger-1.0.0" = { + name = "_at_pnpm_slash_logger"; + packageName = "@pnpm/logger"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@pnpm/logger/-/logger-1.0.0.tgz"; + sha512 = "2yi5y7s91gz8dhv7gjqar4mp7j6mr2m05irm9l85v2xlzsaqx7mcjw0gap3xmpfmbi1di5rb1g57l7k3zh4nrh0mzcixfd2ykkq86jm"; + }; + }; + "@pnpm/npm-resolver-0.3.11" = { + name = "_at_pnpm_slash_npm-resolver"; + packageName = "@pnpm/npm-resolver"; + version = "0.3.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@pnpm/npm-resolver/-/npm-resolver-0.3.11.tgz"; + sha512 = "1mjzlk9hv180r3igrcg3kmgvkp5wkv2ipsr4aqmcjzky8sgz152g22292ps6sndcggri71a8ivjzi61f36bxcz60vz55zvmi6mnawdz"; + }; + }; + "@pnpm/outdated-0.2.5" = { + name = "_at_pnpm_slash_outdated"; + packageName = "@pnpm/outdated"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@pnpm/outdated/-/outdated-0.2.5.tgz"; + sha512 = "08y7lv6gzw8yyzj24djya1pzh8r41rciz102lhb3nq279dyg5sgzr18z6fqlff8krdw160a8adx5s4csmlmfah2akawpczz9h8zy609"; + }; + }; + "@pnpm/package-requester-0.7.1" = { + name = "_at_pnpm_slash_package-requester"; + packageName = "@pnpm/package-requester"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@pnpm/package-requester/-/package-requester-0.7.1.tgz"; + sha512 = "09azfnn5831bniyy2va2bjwaxx2pvgbxwqzd82f4p4y4610b26ii3mpyhpd5l19via1il1ylxc73na8ih2ihgv8xi9x9jd4dv6lfnfz"; + }; + }; + "@pnpm/pkgid-to-filename-1.0.0" = { + name = "_at_pnpm_slash_pkgid-to-filename"; + packageName = "@pnpm/pkgid-to-filename"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@pnpm/pkgid-to-filename/-/pkgid-to-filename-1.0.0.tgz"; + sha512 = "17f44ay160i8pd1sl26v7ph8vdbx6bhydp0jhdc6mslhlyp4bwd1i9220hjvpiyiqkx4hwb4pa5b6hqzq3nyz8ldmna084wfz5q6x8y"; + }; + }; + "@pnpm/server-0.7.1" = { + name = "_at_pnpm_slash_server"; + packageName = "@pnpm/server"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@pnpm/server/-/server-0.7.1.tgz"; + sha512 = "0y2h510ps6kg1ssdwfpi0wrb4ps7jr28qrng2hfwh01r969f2j1nskajzvn6wa68hnfjq2ysajl66nwccrqydsj24w6dn2kl1jbl0b6"; + }; + }; + "@pnpm/tarball-fetcher-0.3.4" = { + name = "_at_pnpm_slash_tarball-fetcher"; + packageName = "@pnpm/tarball-fetcher"; + version = "0.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@pnpm/tarball-fetcher/-/tarball-fetcher-0.3.4.tgz"; + sha512 = "1mpgr0ywrzkxq013ci9rjc9w9jdmr4lp5x121wwnnlybnzsxb98vzkh9mhmlrm77i98sb2drv880d82wgkdxkzx2d445pcmcsmf4z0w"; + }; + }; + "@pnpm/tarball-resolver-0.1.0" = { + name = "_at_pnpm_slash_tarball-resolver"; + packageName = "@pnpm/tarball-resolver"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@pnpm/tarball-resolver/-/tarball-resolver-0.1.0.tgz"; + sha512 = "3rdjpckjhhcamkin62ycyqqssvjxd1kx7k927z8m7ing9sqgsf2ascpg2wpp2kh1shbgl5kkldgbalnqm41xv09fqa9ka9rd3saxrr1"; + }; + }; + "@pnpm/types-1.7.0" = { + name = "_at_pnpm_slash_types"; + packageName = "@pnpm/types"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@pnpm/types/-/types-1.7.0.tgz"; + sha512 = "2bww115m0q5d4m69xvm0kn8xmidncrp3xc8rn2sj03xpkhnd78mcn3m0ib13sq0mlhl4fgq3abvdhlhmxicdp3g6j9zb8awxkif0zm6"; + }; + }; + "@sindresorhus/is-0.7.0" = { + name = "_at_sindresorhus_slash_is"; + packageName = "@sindresorhus/is"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz"; + sha512 = "2ilygr40l2yqbk6lix4xnnnqsq6fxa6sysdxg49bg1ax5gzhwy3bcjbdlk7lndgh9055slpx6fybs3p8mhvbsnnjkmkqzrfy8l5mn1q"; + }; + }; + "@types/archy-0.0.31" = { + name = "_at_types_slash_archy"; + packageName = "@types/archy"; + version = "0.0.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/archy/-/archy-0.0.31.tgz"; + sha512 = "08lzn97gp9rbcmfs592xib111b3fn7nlvmnkn3vpxm2ins5as3p3s3447d5y22lgx6zr6696q9dv27mjgm1cabi1zh2amq57f5p3rxz"; + }; + }; + "@types/byline-4.2.31" = { + name = "_at_types_slash_byline"; + packageName = "@types/byline"; + version = "4.2.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/byline/-/byline-4.2.31.tgz"; + sha1 = "0e61fcb9c03e047d21c4496554c7116297ab60cd"; + }; + }; + "@types/chalk-0.4.31" = { + name = "_at_types_slash_chalk"; + packageName = "@types/chalk"; + version = "0.4.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/chalk/-/chalk-0.4.31.tgz"; + sha1 = "a31d74241a6b1edbb973cf36d97a2896834a51f9"; + }; + }; + "@types/common-tags-1.4.0" = { + name = "_at_types_slash_common-tags"; + packageName = "@types/common-tags"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/common-tags/-/common-tags-1.4.0.tgz"; + sha512 = "1s47pidf7gs7k79gxz1yy0rwhamf147h9ylvg9b6wfc8p3ixpzsq2xlj2w99mq9pi2j1g2flia2z21babjhrdzln1snggivxx46v38w"; + }; + }; + "@types/get-port-3.2.0" = { + name = "_at_types_slash_get-port"; + packageName = "@types/get-port"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/get-port/-/get-port-3.2.0.tgz"; + sha512 = "3axab8z99gfcfzqvrqs2dq6qa24abjxblh17grpqxxgcz0wyg5xrabj5ss8zzcn7ybpgx2n2gy401hbdxgz96zvwig3g3343pqn08sf"; + }; + }; + "@types/got-7.1.6" = { + name = "_at_types_slash_got"; + packageName = "@types/got"; + version = "7.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/got/-/got-7.1.6.tgz"; + sha512 = "0l95rpnrhc6n7khfjm4cl59206f387xap0j2qrk1j6z5gginkxfnkps2l0jw4jq842ii0hzdcakgxnllc2zxmdzsdg2z1wkm28jqf1i"; + }; + }; + "@types/load-json-file-2.0.7" = { + name = "_at_types_slash_load-json-file"; + packageName = "@types/load-json-file"; + version = "2.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/load-json-file/-/load-json-file-2.0.7.tgz"; + sha512 = "1gwn4lafk2nq3nrxl8vjbndpb1ky25hkj4h7hjxh8kyxzlqmhk8258ah4a5g4fdv5yap970nkpsn8vsss3iwh7qah1b9vsmz66gmc9n"; + }; + }; + "@types/mem-1.1.2" = { + name = "_at_types_slash_mem"; + packageName = "@types/mem"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/mem/-/mem-1.1.2.tgz"; + sha1 = "e3c8b095f2f2563b518f0aad59df9fe6a8b82065"; + }; + }; + "@types/mz-0.0.32" = { + name = "_at_types_slash_mz"; + packageName = "@types/mz"; + version = "0.0.32"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/mz/-/mz-0.0.32.tgz"; + sha512 = "3i9s14bzsibxc5700404s654iygj7j301kvrkmyf1wy5ncglr1m9rcgysfy5zhmsjpp96g009fm66hy1py92imjfa77pb51n9wz4bbk"; + }; + }; + "@types/node-7.0.52" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "7.0.52"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-7.0.52.tgz"; + sha512 = "3jzvdqsd0pgl0ax2vbn9h8iawx4m6pjf21wb8lqz34glnacjz5l4qv2b3h53j2dbs497g6aqdvkxfahrwvkc9a1q5zy3c46q9174flf"; + }; + }; + "@types/node-8.5.9" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "8.5.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-8.5.9.tgz"; + sha512 = "2j38fqqziiv6m51w16lz6lgivrkycvn4nwch7sdpg32hbl5kv5m2ngg4y4jrf0v1s7iryi5gyh9729b8l1p48cf9hf0gj567h13grxk"; + }; + }; + "@types/node-9.3.0" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "9.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-9.3.0.tgz"; + sha512 = "0mhmzddyv8rhkha7ibpbsa5dfygzaa90438aqzpg9w7d31n093a7spx2zg4zfki4qrab71xrfb381hmqajn826cnrw9kc7kv2y5zl60"; + }; + }; + "@types/nopt-3.0.29" = { + name = "_at_types_slash_nopt"; + packageName = "@types/nopt"; + version = "3.0.29"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/nopt/-/nopt-3.0.29.tgz"; + sha1 = "f19df3db4c97ee1459a2740028320a71d70964ce"; + }; + }; + "@types/npm-2.0.29" = { + name = "_at_types_slash_npm"; + packageName = "@types/npm"; + version = "2.0.29"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/npm/-/npm-2.0.29.tgz"; + sha512 = "1ccspslp1mil7f8w4dj3khyxxv5fpakkky4s4bnvvsd2b1hgvwahpv8bk83rr9aq2as2q6hi3143g3b6aynh3ybpf6d9mlksw6qdjii"; + }; + }; + "@types/p-limit-1.1.2" = { + name = "_at_types_slash_p-limit"; + packageName = "@types/p-limit"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/p-limit/-/p-limit-1.1.2.tgz"; + sha512 = "21nzl33ss5mcflc6p0b0wgfhijb97nf1zr3s52ffvq8xy1l0svqwy3alqpj8g1ycsjisblh4xrcigrn2bzak702z4jnpxpbss02jx96"; + }; + }; + "@types/p-queue-1.1.0" = { + name = "_at_types_slash_p-queue"; + packageName = "@types/p-queue"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/p-queue/-/p-queue-1.1.0.tgz"; + sha512 = "1881hys9v61yxxzjmwckxgf0z5i562ix7xb6ibzfb6qmf40hl1ah8l2dlbqiq3vsglmy56vbjcndsx7skjnzrcapamdnhwapfcazdwl"; + }; + }; + "@types/p-series-1.0.1" = { + name = "_at_types_slash_p-series"; + packageName = "@types/p-series"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/p-series/-/p-series-1.0.1.tgz"; + sha512 = "0vpq52z9kblmkbqdp6icimy1qiyklhjarryn4n4svpa96srz4q7k98496rf3dcgy1wpn79jfvg4ddibvw88x7rbbb2jkrhz9gmzs2vp"; + }; + }; + "@types/ramda-0.25.16" = { + name = "_at_types_slash_ramda"; + packageName = "@types/ramda"; + version = "0.25.16"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/ramda/-/ramda-0.25.16.tgz"; + sha512 = "1an84z8hbgidxn2dbkg8ln94z7si3a6a4cchv3ax86ci9bryiqm6q576m1chfbfag5zjm2pxk2h7s16n0b6qgd3i5y9wj541w95mp4c"; + }; + }; + "@types/rc-0.0.1" = { + name = "_at_types_slash_rc"; + packageName = "@types/rc"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/rc/-/rc-0.0.1.tgz"; + sha1 = "1f5b8a1b3b1ac6d1fee137c53fac5fa0f28ae0d7"; + }; + }; + "@types/retry-0.10.2" = { + name = "_at_types_slash_retry"; + packageName = "@types/retry"; + version = "0.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/retry/-/retry-0.10.2.tgz"; + sha512 = "18ksn4fqz03wac8179aagjcfibm1k6lrzlpy8nzig47jn083sr64bsw1mdzbdwfxypi8flimg2l1g9prq6r0fqjbqyjvvahhmin98if"; + }; + }; + "@types/semver-5.4.0" = { + name = "_at_types_slash_semver"; + packageName = "@types/semver"; + version = "5.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/semver/-/semver-5.4.0.tgz"; + sha512 = "256379swd2mh4gi5vxsgk9pf7387g32xkw1vsj1jhs7q4njds107nmkkxpaddjv5w5cqwbiwl64sil7bgqdcg8fyjfdg13wxyyc449w"; + }; + }; + "@types/update-notifier-1.0.3" = { + name = "_at_types_slash_update-notifier"; + packageName = "@types/update-notifier"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/update-notifier/-/update-notifier-1.0.3.tgz"; + sha512 = "0fivfj3sqfmhj3z8sp11iqc0hgzyyn50pximpbx56jk7rkvvw40pl0qzdlzcf97vm5c6yvdsixasgm0vh24gh79grxm237n2cvavd04"; + }; + }; + "@types/uuid-3.4.3" = { + name = "_at_types_slash_uuid"; + packageName = "@types/uuid"; + version = "3.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.3.tgz"; + sha512 = "1psrs8sjpmhz8sz2zjkkd7743vzdi7q7vcj8p219q1pkfawr619rl1m5pczp69hbm1769kn8zwlbayjylhl7an5hkvkdd2bi04lpx75"; + }; + }; + "@types/write-json-file-2.2.1" = { + name = "_at_types_slash_write-json-file"; + packageName = "@types/write-json-file"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/write-json-file/-/write-json-file-2.2.1.tgz"; + sha512 = "2sasn3m49kqb3y62b2k4avvmb5536z98sq6rkmq7wb441pxaxvqj1ajfxn08jxgg7d4bznfc7gf7knwdnbp2m8k83nimxg6jd9bzlr5"; + }; + }; + "@zkochan/cmd-shim-2.2.4" = { + name = "_at_zkochan_slash_cmd-shim"; + packageName = "@zkochan/cmd-shim"; + version = "2.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@zkochan/cmd-shim/-/cmd-shim-2.2.4.tgz"; + sha512 = "0s6wbip576kwjkjcvgf3l6fszrbp1n7ijpjhwjy02hvdfb0hj9ynfi92ninp5blfd1mdhfp361cb76c2y4z1dbyxyc8q5cs7sivag04"; + }; + }; + "@zkochan/libnpx-9.6.1" = { + name = "_at_zkochan_slash_libnpx"; + packageName = "@zkochan/libnpx"; + version = "9.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@zkochan/libnpx/-/libnpx-9.6.1.tgz"; + sha512 = "3lwjqxnqxn1jq5fnsdh31mvy9q4y5i000qd7xmra7wlmalxag1py7903f36s1l8bxfxh8j409vpnrz8pkhnc5vwipdn91kdzl8qvxj7"; + }; + }; + "@zkochan/npm-package-arg-1.0.0" = { + name = "_at_zkochan_slash_npm-package-arg"; + packageName = "@zkochan/npm-package-arg"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@zkochan/npm-package-arg/-/npm-package-arg-1.0.0.tgz"; + sha512 = "2v87vqr2pjg6phz5h8mngbymf3b4fmqawisjfng2c424qib6bwldhfvkwqxqfla4s2bzry1qb5dm89if3lddvi3dbp2xqvy9k1h3wxr"; + }; + }; + "JSONStream-1.3.2" = { + name = "JSONStream"; + packageName = "JSONStream"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz"; + sha1 = "c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "add-subtract-date-1.0.13" = { + name = "add-subtract-date"; + packageName = "add-subtract-date"; + version = "1.0.13"; + src = fetchurl { + url = "https://registry.npmjs.org/add-subtract-date/-/add-subtract-date-1.0.13.tgz"; + sha512 = "1jpp2jqxqm1ljj8a6xs15yl579jc48fdx4kflfd0faa78gy91gda0svy4jdv5dqqj1c5ccssq24kyz1ck5c3g4qykia2x32qmc2rc5x"; + }; + }; + "agent-base-4.2.0" = { + name = "agent-base"; + packageName = "agent-base"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/agent-base/-/agent-base-4.2.0.tgz"; + sha512 = "0i6q0c347f7z5c56gi1cggjiwvdhl3p9zfsysq66gqggk3prlqildnpva900rz8f8gfc8rav8jk7m51z9dhias0z7v3rnzyjm9pzr3k"; + }; + }; + "agentkeepalive-3.3.0" = { + name = "agentkeepalive"; + packageName = "agentkeepalive"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.3.0.tgz"; + sha512 = "0svpj8gbh57a1l3zcds9kd8dkh4r2fyacpkrxvffbpj5pgvbf26h93q31niqbqsciswdxlx0fhikljqwg40lvmwxl299nb2gfjmqa7p"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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.0" = { + name = "ansi-diff-stream"; + packageName = "ansi-diff-stream"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-diff-stream/-/ansi-diff-stream-1.2.0.tgz"; + sha1 = "eb325c20ac3623ecd592011a9295d76d97de460e"; + }; + }; + "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.0.0" = { + name = "ansi-escapes"; + packageName = "ansi-escapes"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz"; + sha512 = "06szfav8g7xywvqsis16nnkjqs2snhv37r4m53l1ax8k2sahvqv9id2klam32jajqd08ylw8g9wbcjr971igx6vh8idan76drrjby9v"; + }; + }; + "ansi-parser-2.0.0" = { + name = "ansi-parser"; + packageName = "ansi-parser"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-parser/-/ansi-parser-2.0.0.tgz"; + sha1 = "433498af32fee8c2a1df2c4e47941bc029bcf407"; + }; + }; + "ansi-parser-3.0.0" = { + name = "ansi-parser"; + packageName = "ansi-parser"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-parser/-/ansi-parser-3.0.0.tgz"; + sha1 = "945c0e7232caf5675217375b3eb8892008c14629"; + }; + }; + "ansi-parser-3.2.8" = { + name = "ansi-parser"; + packageName = "ansi-parser"; + version = "3.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-parser/-/ansi-parser-3.2.8.tgz"; + sha1 = "ad80a6351ac5e58cc7e8a761abc037b5505041d0"; + }; + }; + "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.0" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz"; + sha512 = "2x19fs1qvg7ifsdvii4g8kqpa5hir1lm0k0y0fz6dhm5c8gh4z9il4wqczl078p2ikmrav23dmj86cxy8y1j22k4mv59d8qq6c8wx1n"; + }; + }; + "ansicolors-0.3.2" = { + name = "ansicolors"; + packageName = "ansicolors"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz"; + sha1 = "665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"; + }; + }; + "ansistyles-0.1.3" = { + name = "ansistyles"; + packageName = "ansistyles"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz"; + sha1 = "5de60415bda071bb37127854c864f41b23254539"; + }; + }; + "ansy-1.0.13" = { + name = "ansy"; + packageName = "ansy"; + version = "1.0.13"; + src = fetchurl { + url = "https://registry.npmjs.org/ansy/-/ansy-1.0.13.tgz"; + sha512 = "1a13d7ws8k5vnckqfbrlmmmdxxmj0fjlsgs4h1g8ymmm6fz019gykr01kr479dsqzikgcbmz56jnfj1jjknllij7b840w7mzhvpxvyc"; + }; + }; + "any-promise-1.3.0" = { + name = "any-promise"; + packageName = "any-promise"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz"; + sha1 = "abc6afeedcea52e809cdc0376aed3ce39635d17f"; + }; + }; + "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"; + }; + }; + "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-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"; + }; + }; + "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"; + }; + }; + "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.9" = { + name = "argparse"; + packageName = "argparse"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz"; + sha1 = "73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"; + }; + }; + "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-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"; + }; + }; + "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"; + }; + }; + "array-flatten-2.1.1" = { + name = "array-flatten"; + packageName = "array-flatten"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.1.tgz"; + sha1 = "426bb9da84090c1838d812c8150af20a8331e296"; + }; + }; + "array-includes-3.0.3" = { + name = "array-includes"; + packageName = "array-includes"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz"; + sha1 = "184b48f62d92d7452bb31b323165c7f8bd02266d"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "as-table-1.0.31" = { + name = "as-table"; + packageName = "as-table"; + version = "1.0.31"; + src = fetchurl { + url = "https://registry.npmjs.org/as-table/-/as-table-1.0.31.tgz"; + sha1 = "d00180024ecbb6d1a747150df751d3716aea8166"; + }; + }; + "asap-2.0.6" = { + name = "asap"; + packageName = "asap"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz"; + sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46"; + }; + }; + "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-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"; + }; + }; + "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"; + }; + }; + "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-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"; + }; + }; + "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"; + }; + }; + "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.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"; + }; + }; + "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"; + }; + }; + "babel-runtime-6.26.0" = { + name = "babel-runtime"; + packageName = "babel-runtime"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz"; + sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "bindings-1.3.0" = { + name = "bindings"; + packageName = "bindings"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz"; + sha512 = "15lvjac4av3h7xmks8jgd56vryz5xb27r8xcpfwhfyr9dv305lms5llc1x6nx6nfvha873d4vg04nfi89aj4jkxplrnjiyc9kjf34hf"; + }; + }; + "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.1" = { + name = "bl"; + packageName = "bl"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz"; + sha1 = "cac328f7bee45730d404b692203fcb590e172d5e"; + }; + }; + "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"; + }; + }; + "bole-3.0.2" = { + name = "bole"; + packageName = "bole"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bole/-/bole-3.0.2.tgz"; + sha1 = "bc8a483ca94049da9b837c1ad11cdfebee6e0514"; + }; + }; + "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"; + }; + }; + "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.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"; + }; + }; + "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"; + }; + }; + "browser-stdout-1.3.0" = { + name = "browser-stdout"; + packageName = "browser-stdout"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz"; + sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f"; + }; + }; + "browserify-zlib-0.1.4" = { + name = "browserify-zlib"; + packageName = "browserify-zlib"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz"; + sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d"; + }; + }; + "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-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-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-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"; + }; + }; + "bug-killer-4.4.4" = { + name = "bug-killer"; + packageName = "bug-killer"; + version = "4.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/bug-killer/-/bug-killer-4.4.4.tgz"; + sha1 = "96e0322b9437a2b0672d78aacd1ed2bef11f945a"; + }; + }; + "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"; + }; + }; + "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.3" = { + name = "bulk-write-stream"; + packageName = "bulk-write-stream"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bulk-write-stream/-/bulk-write-stream-1.1.3.tgz"; + sha1 = "d29ca385fbd53f357aee5bd3d3028732b62ae275"; + }; + }; + "byline-5.0.0" = { + name = "byline"; + packageName = "byline"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/byline/-/byline-5.0.0.tgz"; + sha1 = "741c5216468eadc457b03410118ad77de8c1ddb1"; + }; + }; "bytes-3.0.0" = { name = "bytes"; packageName = "bytes"; @@ -13,6 +1192,96 @@ let sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; }; }; + "bzip2-maybe-1.0.0" = { + name = "bzip2-maybe"; + packageName = "bzip2-maybe"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bzip2-maybe/-/bzip2-maybe-1.0.0.tgz"; + sha1 = "c9aef7008a6b943cbe99cc617125eb4bd478296b"; + }; + }; + "cacache-10.0.2" = { + name = "cacache"; + packageName = "cacache"; + version = "10.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cacache/-/cacache-10.0.2.tgz"; + sha512 = "1nn7is7pd6vgcf96b9hym6ia3a0adgw2r4a4ckbb9ykm6risqsnw16kgqfrwvi37mpkzizricfnkns7d0d7agh1laws73imv7nxnn3n"; + }; + }; + "cacache-9.2.9" = { + name = "cacache"; + packageName = "cacache"; + version = "9.2.9"; + src = fetchurl { + url = "https://registry.npmjs.org/cacache/-/cacache-9.2.9.tgz"; + sha512 = "11qjza6qy62lkvynngcvx7nf2vhxvvp4g0l07a8zw5pzqc5iy0zznxzgs0dw1bb2i10dr2v7i624x6v9pkzp55snam9wk5jjf7ka642"; + }; + }; + "cacheable-request-2.1.4" = { + name = "cacheable-request"; + packageName = "cacheable-request"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz"; + sha1 = "0d808801b6342ad33c91df9d0b44dc09b91e5c3d"; + }; + }; + "call-limit-1.1.0" = { + name = "call-limit"; + packageName = "call-limit"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/call-limit/-/call-limit-1.1.0.tgz"; + sha1 = "6fd61b03f3da42a2cd0ec2b60f02bd0e71991fea"; + }; + }; + "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-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"; + }; + }; + "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.0" = { name = "chalk"; packageName = "chalk"; @@ -22,6 +1291,87 @@ let sha512 = "3fj8njcdcvyplivm2fj19lqw8qv7gb8v7gd6a223pmn8f3di4zwkhyb09vzlmw3pnk4ib88kp4cg8r9i5k5rskalzdfh1l23ljp6gh3"; }; }; + "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.2" = { + name = "ci-info"; + packageName = "ci-info"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ci-info/-/ci-info-1.1.2.tgz"; + sha512 = "1jbmihk48iby72h0b6k4rvhrnaydml49qyjcb83ix310ivjzd4zmdk3yxx1ssn6ryjblm7xzaswnwj53rxwcyn1fr0jm7bzvhy8hcdr"; + }; + }; + "cidr-regex-1.0.6" = { + name = "cidr-regex"; + packageName = "cidr-regex"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/cidr-regex/-/cidr-regex-1.0.6.tgz"; + sha1 = "74abfd619df370b9d54ab14475568e97dd64c0c1"; + }; + }; + "class-methods-1.0.10" = { + name = "class-methods"; + packageName = "class-methods"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/class-methods/-/class-methods-1.0.10.tgz"; + sha512 = "2j59qyqmhdcldp2k34mrcfx2rqblcv1c2902zzin1fzqamys2jxs32q341k4faclld17w96w7x3hnv2vjinn0jq0b6a7ld1icaay2wv"; + }; + }; + "cli-box-5.0.0" = { + name = "cli-box"; + packageName = "cli-box"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-box/-/cli-box-5.0.0.tgz"; + sha1 = "870ea8aa77e7c25179416ceccfe5ed0690804602"; + }; + }; + "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-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-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-table2-0.2.0" = { + name = "cli-table2"; + packageName = "cli-table2"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-table2/-/cli-table2-0.2.0.tgz"; + sha1 = "2d1ef7f218a0e786e214540562d4bd177fe32d97"; + }; + }; "cli-truncate-1.1.0" = { name = "cli-truncate"; packageName = "cli-truncate"; @@ -31,6 +1381,402 @@ let sha512 = "1h48346i2bsfvj3h0qfxmyh1770cxb3d9ibk75yjag1xgzk021yqbmkiv30k5c0qgyb0sxkvjc3sckmakf4i7q1d2gh1nmw9fimj2vc"; }; }; + "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-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"; + }; + }; + "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-response-1.0.2" = { + name = "clone-response"; + packageName = "clone-response"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz"; + sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b"; + }; + }; + "clp-3.2.1" = { + name = "clp"; + packageName = "clp"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/clp/-/clp-3.2.1.tgz"; + sha1 = "af1ed66db895a5c9ce9b6d32e9c33dee02b3edf2"; + }; + }; + "cmd-shim-2.0.2" = { + name = "cmd-shim"; + packageName = "cmd-shim"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.2.tgz"; + sha1 = "6fcbda99483a8fd15d7d30a196ca69d688a2efdb"; + }; + }; + "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"; + }; + }; + "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.0" = { + name = "codecs"; + packageName = "codecs"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/codecs/-/codecs-1.2.0.tgz"; + sha1 = "5148549e3d156c5fa053d7cbb419715a0cf43d16"; + }; + }; + "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.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"; + }; + }; + "columnify-1.5.4" = { + name = "columnify"; + packageName = "columnify"; + version = "1.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/columnify/-/columnify-1.5.4.tgz"; + sha1 = "4737ddf1c7b69a8a7c340570782e947eec8e78bb"; + }; + }; + "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"; + }; + }; + "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.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"; + }; + }; + "common-tags-1.7.2" = { + name = "common-tags"; + packageName = "common-tags"; + version = "1.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/common-tags/-/common-tags-1.7.2.tgz"; + sha512 = "0jx2cncv7x5ms1gg2vks5bhxi9c5jbwymfk42dzmp9vrxrmhrl9vaw4wsh4lvf65shxmq1v8f8s0i3rkyk2x8mrfpq2m30famkgv24f"; + }; + }; + "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.0" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz"; + sha1 = "0aac662fd52be78964d5532f694784e70110acf7"; + }; + }; + "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.1" = { + name = "configstore"; + packageName = "configstore"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz"; + sha512 = "2zmidvkp20q25yv6a5d7k1daawdg0w6ppgayxzpwfhyvmgwybkkv7ni0j4b2j9c8wjn8z33zf5d4bjr8jywb5qixc75vypyy87n90z6"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "copy-concurrently-1.0.5" = { + name = "copy-concurrently"; + packageName = "copy-concurrently"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz"; + sha512 = "3c1ggiqqnjgqlwdnimx94gm176c8rjsrih5qw2lbm642l8x7grx07v065k4j89c1p0adkm7v6sz11drb6j6sp51np2m1cazvycnhrvz"; + }; + }; + "core-js-2.5.3" = { + name = "core-js"; + packageName = "core-js"; + version = "2.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz"; + sha1 = "8acc38345824f16d8365b7c9b4259168e8ed603e"; + }; + }; + "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"; + }; + }; + "couleurs-5.0.0" = { + name = "couleurs"; + packageName = "couleurs"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/couleurs/-/couleurs-5.0.0.tgz"; + sha1 = "1cd3ace5cca1bec0041578b27464b2676387f6db"; + }; + }; + "couleurs-6.0.9" = { + name = "couleurs"; + packageName = "couleurs"; + version = "6.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/couleurs/-/couleurs-6.0.9.tgz"; + sha1 = "b2b2a3ee37dae51875c9efd243ec7e7894afbc9e"; + }; + }; + "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"; + }; + }; + "credentials-by-uri-1.0.0" = { + name = "credentials-by-uri"; + packageName = "credentials-by-uri"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/credentials-by-uri/-/credentials-by-uri-1.0.0.tgz"; + sha512 = "3c5r91jgf91szpxfh7rh0c5wi3xzck43b8kzgmxi3ppw29hj9v9is6a3jh5divbgg7dr5diw6zysri7mpvji5jagh2ain0mcj81knjs"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "csv-parser-1.12.0" = { + name = "csv-parser"; + packageName = "csv-parser"; + version = "1.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/csv-parser/-/csv-parser-1.12.0.tgz"; + sha512 = "3amd2y4wd86nqpmj4ngich00g73ldp4di353338vjdsgch52zgc7fl6mgh1yfm9n46nlifh7p0c6y8i8p5al90crkbfnsxw561m9lli"; + }; + }; + "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"; + }; + }; + "custom-return-1.0.10" = { + name = "custom-return"; + packageName = "custom-return"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/custom-return/-/custom-return-1.0.10.tgz"; + sha512 = "3pk09pi85idb0ycy2hmh3k2cbphacc3hr7rdv157gb93vvk9hfgjnc9dv0k1qvb11h46zpya9njb07f9whrmn31zbx8cf1hchmknpaq"; + }; + }; + "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"; + }; + }; + "cyclist-0.2.2" = { + name = "cyclist"; + packageName = "cyclist"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz"; + sha1 = "1b33792e11e914a2fd6d6ed6447464444e5fa640"; + }; + }; + "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"; @@ -49,6 +1795,24 @@ let 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.0.0" = { + name = "dat-ignore"; + packageName = "dat-ignore"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dat-ignore/-/dat-ignore-2.0.0.tgz"; + sha512 = "1s78mv3ngs1v1cgpcp97y1xmns97m2r6gjkkrksl63j5d870vpsmmrhsfm1vw4q0dz4c1yfnfcpijlgbqai9c5d2zj1lz56rih0kxk8"; + }; + }; "dat-json-1.0.1" = { name = "dat-json"; packageName = "dat-json"; @@ -58,13 +1822,13 @@ let sha512 = "13nn20vg6jx1h8ypazv9zn236hvv29wwq52mdbbfl77zrg8d7syni933v2mm3y1jsk25c7dc2gs1876fz0yblniryncnbjxrf0aq0nq"; }; }; - "dat-link-resolve-1.1.1" = { + "dat-link-resolve-2.1.0" = { name = "dat-link-resolve"; packageName = "dat-link-resolve"; - version = "1.1.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/dat-link-resolve/-/dat-link-resolve-1.1.1.tgz"; - sha512 = "3a3rmwv687r07qnzdp4k15ng7xbbgibssjiqjvhhhrxq5mc22m34g7hi1h15rqjs3zzlajn291j3xv9af22j3fynpygky13zzvxj367"; + url = "https://registry.npmjs.org/dat-link-resolve/-/dat-link-resolve-2.1.0.tgz"; + sha512 = "0dzpf71lpzr1z3g6m3v29xvcs9r12sgjpzzmg2viy3azkgpscl7p2v8im2ibsa22q64abifkibb4nc3nshs19wvai67m3gdqx15qzvn"; }; }; "dat-log-1.1.1" = { @@ -94,1219 +1858,13 @@ let sha512 = "0h84fdzm556p412p1xr0nl6ldf5xjd0qnd37im41bq78zm7lg4j4klcahg9pix1f0qdyd6gqz2a2j67z6vpb776v1bd0n1hr67pp988"; }; }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "ansi-styles-3.2.0" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz"; - sha512 = "2x19fs1qvg7ifsdvii4g8kqpa5hir1lm0k0y0fz6dhm5c8gh4z9il4wqczl078p2ikmrav23dmj86cxy8y1j22k4mv59d8qq6c8wx1n"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "strip-ansi-4.0.0" = { - name = "strip-ansi"; - packageName = "strip-ansi"; + "dat-secret-storage-4.0.0" = { + name = "dat-secret-storage"; + packageName = "dat-secret-storage"; version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"; - sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; - }; - }; - "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"; - }; - }; - "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.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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "discovery-channel-5.4.6" = { - name = "discovery-channel"; - packageName = "discovery-channel"; - version = "5.4.6"; - src = fetchurl { - url = "https://registry.npmjs.org/discovery-channel/-/discovery-channel-5.4.6.tgz"; - sha1 = "1b0f25e58124507e861b6dc3ecb744366bb53cad"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "utp-native-1.6.2" = { - name = "utp-native"; - packageName = "utp-native"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/utp-native/-/utp-native-1.6.2.tgz"; - sha512 = "2mcnn6w5as2dvz6rj4fb33174z3a1rl9bm2cfazrr4084gq7aal0bkmkwr1cjpkvy1zgni3zdk0570fx7cmnd0k0hg18wfb2hvbigfg"; - }; - }; - "bittorrent-dht-7.8.2" = { - name = "bittorrent-dht"; - packageName = "bittorrent-dht"; - version = "7.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-7.8.2.tgz"; - sha512 = "33jcwf8rh9r7m810lw75s1ij9k0bv1kjmnc24488i6nd1ri9a1p2gmci5z1xdfriyb8j7x8h1ch3aj5a1chdglwn6pbsll7cx4j6wd4"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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-rpc-4.2.1" = { - name = "k-rpc"; - packageName = "k-rpc"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/k-rpc/-/k-rpc-4.2.1.tgz"; - sha512 = "2nbjxg0x7jsa14zhvx68w1vri68hsxzbxz7b7ap76fdp0jkrgna2rq636yxnax04f3f8i2ambj2fpan6qli6vixmfryz78vrapdip8n"; - }; - }; - "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"; - }; - }; - "randombytes-2.0.5" = { - name = "randombytes"; - packageName = "randombytes"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz"; - sha512 = "293m4ffiafbjg0b99a2k78wiffmlwc2v7cigrn5l3n7555x7qxyr34sp0s4p713vwlaf0ny5n57iysgkz08slld3hzw8ci1a2gxjgpi"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "k-rpc-socket-1.7.2" = { - name = "k-rpc-socket"; - packageName = "k-rpc-socket"; - version = "1.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.7.2.tgz"; - sha512 = "02w1ih1lh86i5ap7c3dy2ml7g5a11r0w300iyxdf6v02qr0j1x3vf78hx5q9dgg3drifab018mgm851m457zzzi05i2z2r1s3zlflc3"; - }; - }; - "rusha-0.8.9" = { - name = "rusha"; - packageName = "rusha"; - version = "0.8.9"; - src = fetchurl { - url = "https://registry.npmjs.org/rusha/-/rusha-0.8.9.tgz"; - sha1 = "77bd0951608bf81cedb948cec9c44d8ce5662219"; - }; - }; - "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"; - }; - }; - "nan-2.8.0" = { - name = "nan"; - packageName = "nan"; - version = "2.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz"; - sha1 = "ed715f3fe9de02b57a5e6252d90a96675e1f085a"; - }; - }; - "node-gyp-build-3.2.2" = { - name = "node-gyp-build"; - packageName = "node-gyp-build"; - version = "3.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.2.2.tgz"; - sha512 = "34hwi28wvvh5nn8bv71n0fb83xjyk84jsn8j9zgkaqnfigpv2hk6fs9jaffsn7qi3yi4n7iwd9yjyagd1rh74ckzdf5s6l59b8vzidp"; - }; - }; - "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"; - }; - }; - "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-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"; - }; - }; - "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"; - }; - }; - "dns-socket-1.6.2" = { - name = "dns-socket"; - packageName = "dns-socket"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/dns-socket/-/dns-socket-1.6.2.tgz"; - sha512 = "0ibd2ndmlqbk96vdcimsl4w1njplh9gplvqa5f7653km79f9kqpd6d7f0f3lq1sz548lqcbjfcgcr7fc9159b4gzzk1g86kjxzxmmk6"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "multicast-dns-6.2.1" = { - name = "multicast-dns"; - packageName = "multicast-dns"; - version = "6.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.1.tgz"; - sha512 = "3gm760icxiv0bkil78dgsjkss4vwg3ya76jl3v8a5fa86wdv0ksvi1n7lnzisk4x4sa8chxnfxasyfpgay45ilaykqz2zbc8xrgypdr"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "dns-packet-1.2.2" = { - name = "dns-packet"; - packageName = "dns-packet"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.2.2.tgz"; - sha512 = "0770ymyc0rv6a11mj3990d0z1jl1b2qxp4bapqa819y269sszfd96wn2y7pb6aw8bdgsn3bvpr7bmig5lcmkrxya13d5vc5y66q7pwh"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "toiletdb-1.4.0" = { - name = "toiletdb"; - packageName = "toiletdb"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/toiletdb/-/toiletdb-1.4.0.tgz"; - sha1 = "6c6f871834b22178c5490f9f832b58c3c7cba852"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "concat-stream-1.6.0" = { - name = "concat-stream"; - packageName = "concat-stream"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz"; - sha1 = "0aac662fd52be78964d5532f694784e70110acf7"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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.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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "dat-ignore-2.0.0" = { - name = "dat-ignore"; - packageName = "dat-ignore"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dat-ignore/-/dat-ignore-2.0.0.tgz"; - sha512 = "1s78mv3ngs1v1cgpcp97y1xmns97m2r6gjkkrksl63j5d870vpsmmrhsfm1vw4q0dz4c1yfnfcpijlgbqai9c5d2zj1lz56rih0kxk8"; - }; - }; - "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"; + url = "https://registry.npmjs.org/dat-secret-storage/-/dat-secret-storage-4.0.0.tgz"; + sha1 = "01b219a5bc1619efc0f58122a3c6cebb1eb8b40a"; }; }; "dat-storage-1.0.3" = { @@ -1327,13 +1885,1408 @@ let sha1 = "ba7d58c309cf60c3924afad869b75192b61fe354"; }; }; - "hyperdrive-9.12.0" = { + "data-uri-to-buffer-2.0.0" = { + name = "data-uri-to-buffer"; + packageName = "data-uri-to-buffer"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-2.0.0.tgz"; + sha512 = "1pvmcndfngvwy1z5x3vhy8jvrcpaahgc8jhq7cpnjcb2zfacai445afjpykxyzy8s6css19p1rl3ab91vz22fa1ffkqhgygncs85ck1"; + }; + }; + "date-unit-ms-1.1.12" = { + name = "date-unit-ms"; + packageName = "date-unit-ms"; + version = "1.1.12"; + src = fetchurl { + url = "https://registry.npmjs.org/date-unit-ms/-/date-unit-ms-1.1.12.tgz"; + sha512 = "39jwcz9i3f80f9sqx06abcpk9zs9dw90gyy2pb603h1h5q0ph2qpx005wzmmn0phfg83d4nx2d14p3lgfn1ywa6yfcc71rnnbw3l3f3"; + }; + }; + "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"; + }; + }; + "daty-1.1.4" = { + name = "daty"; + packageName = "daty"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/daty/-/daty-1.1.4.tgz"; + sha512 = "0a8n1f6rfaa6k4r76b2rqgvfp9qvw5xj7w0lzjfv1g4fxcjllk519vj3jfrx540jiv2mbpky6jv17d3zhwc0jg0a9rbnc0k1m4m5dgs"; + }; + }; + "days-1.1.1" = { + name = "days"; + packageName = "days"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/days/-/days-1.1.1.tgz"; + sha512 = "13wlz4m9gk0wf2w3x44y2gph1mmqmj8z1mfkhxpxhjk3rs7h28gj6lc8x0b6i966w00dvrws86da672vmizmy31whvj08q4bg0qhdxz"; + }; + }; + "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"; + }; + }; + "debuglog-1.0.1" = { + name = "debuglog"; + packageName = "debuglog"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz"; + sha1 = "aa24ffb9ac3df9a2351837cfb2d279360cd78492"; + }; + }; + "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-maybe-1.0.0" = { + name = "decompress-maybe"; + packageName = "decompress-maybe"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-maybe/-/decompress-maybe-1.0.0.tgz"; + sha1 = "adfe78c66cc069e64e824bd1405b85e75e6d1cbb"; + }; + }; + "decompress-response-3.3.0" = { + name = "decompress-response"; + packageName = "decompress-response"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz"; + sha1 = "80a4dd323748384bfa248083622aedec982adff3"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "deffy-2.0.0" = { + name = "deffy"; + packageName = "deffy"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/deffy/-/deffy-2.0.0.tgz"; + sha1 = "f82e08eea518c4a0a30b1f03ec504d248af28932"; + }; + }; + "deffy-2.2.2" = { + name = "deffy"; + packageName = "deffy"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/deffy/-/deffy-2.2.2.tgz"; + sha1 = "088f40913cb47078653fa6f697c206e03471d523"; + }; + }; + "define-properties-1.1.2" = { + name = "define-properties"; + packageName = "define-properties"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz"; + sha1 = "83a73f2fea569898fb737193c8f873caf6d45c94"; + }; + }; + "delay-2.0.0" = { + name = "delay"; + packageName = "delay"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delay/-/delay-2.0.0.tgz"; + sha1 = "9112eadc03e4ec7e00297337896f273bbd91fae5"; + }; + }; + "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"; + }; + }; + "dependencies-hierarchy-2.0.1" = { + name = "dependencies-hierarchy"; + packageName = "dependencies-hierarchy"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dependencies-hierarchy/-/dependencies-hierarchy-2.0.1.tgz"; + sha512 = "1sfyf5x0ffhb2yh04wcwd0szfknjfrf21ibabzk780m31ww4fnzm01ddr9h3j1wfn4ib15pjvg24kylhs2l9g5fg9gnkirpa7zphyxz"; + }; + }; + "dependency-path-1.2.0" = { + name = "dependency-path"; + packageName = "dependency-path"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dependency-path/-/dependency-path-1.2.0.tgz"; + sha512 = "3fx4g67dcmnhggas6gyk3qd0376f5ff9imzi9n3npqjdbnxqd0niagdl591n64mlk8l8rrnkp39fj7cgbd05az9k5b2ir5pr73lf9aq"; + }; + }; + "detect-indent-5.0.0" = { + name = "detect-indent"; + packageName = "detect-indent"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz"; + sha1 = "3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"; + }; + }; + "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"; + }; + }; + "dezalgo-1.0.3" = { + name = "dezalgo"; + packageName = "dezalgo"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz"; + sha1 = "7f742de066fc748bc8db820569dddce49bf0d456"; + }; + }; + "diable-4.0.1" = { + name = "diable"; + packageName = "diable"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/diable/-/diable-4.0.1.tgz"; + sha512 = "3xs7mj78f1pz54n7lgqczhksnznrsj1bz0733lnrsarqshqci89980q25yms1iva430jfxsjd9kgk4f1f30y3xpyi8krd0vkb57xkl6"; + }; + }; + "diff-3.3.1" = { + name = "diff"; + packageName = "diff"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz"; + sha512 = "31pj7v5gg5igmvwzk6zxw1wbvwjg6m9sfl0h3bs1x4q6idcw98vr8z8wcqk2603q0blpqkmkxp659kjj91wksr03yr8xlh16djcg8rh"; + }; + }; + "diff-dates-1.0.11" = { + name = "diff-dates"; + packageName = "diff-dates"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/diff-dates/-/diff-dates-1.0.11.tgz"; + sha512 = "3n24i042lak0xiwsf39kqkmgfjpk3yy7b7s5j4yli6a41h438lh8khdn0zg71jz30vmz0iil8bpjbm0amy24mmbyf4vz5jwp7z312fj"; + }; + }; + "dint-2.0.2" = { + name = "dint"; + packageName = "dint"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dint/-/dint-2.0.2.tgz"; + sha512 = "1kj5zqj3mz3jr7624dszj4qnypqa6z1ll8ysn56mibmchrdfb6x82ncfr8jl1h2igla24kp7kbivpmzzjp1zbb29s2gwj9y0zzrmf9v"; + }; + }; + "dir-glob-2.0.0" = { + name = "dir-glob"; + packageName = "dir-glob"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz"; + sha512 = "1m705yfirf97v4w87gfvylhhq9jlwjsgfp5x0p0cp33mc180ldmvgbs06zmr7by48d7r01n3awx4xz3m3vzba99gqww1wgka2na5fnz"; + }; + }; + "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.4.7" = { + name = "discovery-channel"; + packageName = "discovery-channel"; + version = "5.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/discovery-channel/-/discovery-channel-5.4.7.tgz"; + sha512 = "3c8npbdr7r6725kkj76h5zy72l3gd8ndb3dy4dwbapxapfzccl9f6iy0zdy3wxywcfb6cc64w4mf089v00rcr1aqcjdlvn483pnzs78"; + }; + }; + "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-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-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-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"; + }; + }; + "dotenv-4.0.0" = { + name = "dotenv"; + packageName = "dotenv"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dotenv/-/dotenv-4.0.0.tgz"; + sha1 = "864ef1379aced55ce6f95debecdce179f7a0cd1d"; + }; + }; + "drive-by-path-1.0.0" = { + name = "drive-by-path"; + packageName = "drive-by-path"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/drive-by-path/-/drive-by-path-1.0.0.tgz"; + sha512 = "2qa8hminmq4ccas79iblr6bhpi5db7pr4wprwabf3b26mzky20grbamh8w91x0305gr9ab0hg314dqbhk7fjqylrzc5f8aq21mkl9hm"; + }; + }; + "drivelist-5.2.12" = { + name = "drivelist"; + packageName = "drivelist"; + version = "5.2.12"; + src = fetchurl { + url = "https://registry.npmjs.org/drivelist/-/drivelist-5.2.12.tgz"; + sha512 = "16zzhdm5j9sxfgcgh547v4s5y3han38a5iwj8ap8glp5ql6vbrl01jj6dsjpiqlbjf56pxla8shnz64yjngvnq0zcdkabns4cr1i0lp"; + }; + }; + "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.3" = { + name = "duplexify"; + packageName = "duplexify"; + version = "3.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.3.tgz"; + sha512 = "0c611ik2kv5wiqwfi5zjyx70dnw117lbr0wwqxqxc0hldnnfigiqyh5xr7x6267vs63jgvqkzvvwb3b1g37zkk3nx5dh5z8xbs07hl3"; + }; + }; + "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"; + }; + }; + "editor-1.0.0" = { + name = "editor"; + packageName = "editor"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/editor/-/editor-1.0.0.tgz"; + sha1 = "60c7f87bd62bcc6a894fa8ccd6afb7823a24f742"; + }; + }; + "encode-registry-1.1.0" = { + name = "encode-registry"; + packageName = "encode-registry"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/encode-registry/-/encode-registry-1.1.0.tgz"; + sha512 = "0s849n20b958rnb9r35b9i0l6zvpk0vx49c6xap06fy5iq1zz0ls0wqc1bdskw1v39z5xz4a8sfaigsw0rjfckic6xlxmw4ybvn9vf1"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "err-code-1.1.2" = { + name = "err-code"; + packageName = "err-code"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz"; + sha1 = "06e0116d3028f6aef4806849eb0ea6a748ae6960"; + }; + }; + "errno-0.1.6" = { + name = "errno"; + packageName = "errno"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/errno/-/errno-0.1.6.tgz"; + sha512 = "0vny3xisd56kx193rhv6vpccjxlajjn9ss5wk96l1ya8zbpkwbjrrgrm9wpfm3xc8apx8z9xb0kjkw0y5qnc6gy1hf2qsas79093hr2"; + }; + }; + "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"; + }; + }; + "es-abstract-1.10.0" = { + name = "es-abstract"; + packageName = "es-abstract"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.10.0.tgz"; + sha512 = "04nd5ylkfffc08vn5kjhz0saqh44nj19f5j3ahrrhf3zvc9da5rf6snnh63xv4gfhacjbax1jajzgqv4zpm77v806jf883a2w77zs7y"; + }; + }; + "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/es-to-primitive/-/es-to-primitive-1.1.1.tgz"; + sha1 = "45355248a88979034b6792e19bb81f2b7975dd0d"; + }; + }; + "es6-promise-4.2.4" = { + name = "es6-promise"; + packageName = "es6-promise"; + version = "4.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz"; + sha512 = "10hlgvxhshjxlbwvm1gnf1b01sv1fmh191a97l0h5gmcs9am1b6x937wnhkvvj5fkin10qscii8pcwnp9rlnpkgnrhfdyk0a9jlvmzw"; + }; + }; + "es6-promisify-5.0.0" = { + name = "es6-promisify"; + packageName = "es6-promisify"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz"; + sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; + }; + }; + "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"; + }; + }; + "exclude-arr-1.0.9" = { + name = "exclude-arr"; + packageName = "exclude-arr"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/exclude-arr/-/exclude-arr-1.0.9.tgz"; + sha512 = "1j9b7mbjp9g840wwzgq7jmqx66qv2xwxl3z3330891qd1a4yrm1x3jsig1g0adx6q1lj9d9f6dsb0snm564f4ff8lxhiag0k645vap7"; + }; + }; + "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"; + }; + }; + "execa-0.8.0" = { + name = "execa"; + packageName = "execa"; + version = "0.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-0.8.0.tgz"; + sha1 = "d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da"; + }; + }; + "execa-0.9.0" = { + name = "execa"; + packageName = "execa"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-0.9.0.tgz"; + sha512 = "2c2sw5624513vxbr2q2ay9x3qc80zfnwyr60n8cw35m1ji76yxhxv4nrk47iqd2wj1rv5l07klmncr2lfdzhfa0cn3si1pq4l30rd85"; + }; + }; + "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-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"; + }; + }; + "expand-template-1.1.0" = { + name = "expand-template"; + packageName = "expand-template"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-template/-/expand-template-1.1.0.tgz"; + sha512 = "34i2f4clwy5bpzgl137zwplybp5hn6ncxq0p794cx9m0crhgk31nfy0s8wp1v6hvw90h20c268r040g892dixy6zqq1xlm3ra8g0j4j"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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.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"; + }; + }; + "fast-safe-stringify-1.1.13" = { + name = "fast-safe-stringify"; + packageName = "fast-safe-stringify"; + version = "1.1.13"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-1.1.13.tgz"; + sha1 = "a01e9cd9c9e491715c98a75a42d5f0bbd107ff76"; + }; + }; + "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"; + }; + }; + "fetch-from-npm-registry-0.1.0" = { + name = "fetch-from-npm-registry"; + packageName = "fetch-from-npm-registry"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fetch-from-npm-registry/-/fetch-from-npm-registry-0.1.0.tgz"; + sha512 = "1264ixqa9c8kzm56hlq6y91d7rhzfkvbjy0asvj4xkdspwb5sy363n9g9frai3w415j9xyqfw8k73rcpw295gmhp790rnl5p1w0m88g"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "fillo-1.0.11" = { + name = "fillo"; + packageName = "fillo"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/fillo/-/fillo-1.0.11.tgz"; + sha512 = "36l602p8x6jkfpk75skz4dwjlpy9bna1zqpx7jgfjlalqbwa7b67wb8rv23cd6m5saklalf77irgvly60b5ziy611a4477idbrrr1fx"; + }; + }; + "find-packages-2.1.2" = { + name = "find-packages"; + packageName = "find-packages"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/find-packages/-/find-packages-2.1.2.tgz"; + sha512 = "18j6pnfzxysg3ylhx9npp90infzxgczn174pd3mvy8mw13cshll2rzf6i9b27qfyzgq4chk7wbwy8wr1flmzlpll5g22c0ryp6dq2rh"; + }; + }; + "find-up-2.1.0" = { + name = "find-up"; + packageName = "find-up"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz"; + sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; + }; + }; + "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-colors-3.0.0" = { + name = "flat-colors"; + packageName = "flat-colors"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/flat-colors/-/flat-colors-3.0.0.tgz"; + sha1 = "253ab1a23989c321f13b0acd4bf73fff4072ecb7"; + }; + }; + "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"; + }; + }; + "flush-write-stream-1.0.2" = { + name = "flush-write-stream"; + packageName = "flush-write-stream"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.2.tgz"; + sha1 = "c81b90d8746766f1a609a46809946c45dd8ae417"; + }; + }; + "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"; + }; + }; + "foreach-2.0.5" = { + name = "foreach"; + packageName = "foreach"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz"; + sha1 = "0bee005018aeb260d0a3af3ae658dd0136ec1b99"; + }; + }; + "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.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"; + }; + }; + "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"; + }; + }; + "formatoid-1.2.2" = { + name = "formatoid"; + packageName = "formatoid"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/formatoid/-/formatoid-1.2.2.tgz"; + sha512 = "3z818q9sgzw7jky4kc4gfmx15k3hhh7lj1dy17j30vcyzmx1p14k38d0a8nvl23f2sfm4bszam36wzz8niwkznr4m992wz009ipr6yy"; + }; + }; + "from2-1.3.0" = { + name = "from2"; + packageName = "from2"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/from2/-/from2-1.3.0.tgz"; + sha1 = "88413baaa5f9a597cfde9221d86986cd3c061dfd"; + }; + }; + "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-vacuum-1.2.10" = { + name = "fs-vacuum"; + packageName = "fs-vacuum"; + version = "1.2.10"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.10.tgz"; + sha1 = "b7629bec07a4031a2548fdf99f5ecf1cc8b31e36"; + }; + }; + "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/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz"; + sha1 = "b47df53493ef911df75731e70a9ded0189db40c9"; + }; + }; + "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"; + }; + }; + "fstream-1.0.11" = { + name = "fstream"; + packageName = "fstream"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz"; + sha1 = "5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"; + }; + }; + "fstream-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"; + }; + }; + "function-bind-1.1.1" = { + name = "function-bind"; + packageName = "function-bind"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; + sha512 = "38chm1mh077ksx6hy2sssfz4q29hf0ncb9k6ila7si54zqcpl5fxd1rh6wi82blqp7jcspf4aynr7jqhbsg2yc9y42xpqqp6c1jz2n8"; + }; + }; + "function.name-1.0.10" = { + name = "function.name"; + packageName = "function.name"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/function.name/-/function.name-1.0.10.tgz"; + sha512 = "02zis7zxfkwajdf08z58mr0z2axddibclbk8xd849mkz7pq3y29s781fjycqigp3fdnwmy2mlvcnsg4z5hrfm44sr7gw30wx2p41x10"; + }; + }; + "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"; + }; + }; + "generate-function-1.1.0" = { + name = "generate-function"; + packageName = "generate-function"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/generate-function/-/generate-function-1.1.0.tgz"; + sha1 = "54c21b080192b16d9877779c5bb81666e772365f"; + }; + }; + "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"; + }; + }; + "genfun-4.0.1" = { + name = "genfun"; + packageName = "genfun"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/genfun/-/genfun-4.0.1.tgz"; + sha1 = "ed10041f2e4a7f1b0a38466d17a5c3e27df1dfc1"; + }; + }; + "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"; + }; + }; + "get-npm-tarball-url-2.0.1" = { + name = "get-npm-tarball-url"; + packageName = "get-npm-tarball-url"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-npm-tarball-url/-/get-npm-tarball-url-2.0.1.tgz"; + sha512 = "051jj5v45fys9v10fpvga4wby8aq0wjydhfgynfip8bgyl7db3zkjzssqn4rv264br9b04mdc25hr9479zgqyffzdq7xxcjdi2dbsiw"; + }; + }; + "get-port-3.2.0" = { + name = "get-port"; + packageName = "get-port"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz"; + sha1 = "dd7ce7de187c06c8bf353796ac71e099f0980ebc"; + }; + }; + "get-source-1.0.24" = { + name = "get-source"; + packageName = "get-source"; + version = "1.0.24"; + src = fetchurl { + url = "https://registry.npmjs.org/get-source/-/get-source-1.0.24.tgz"; + sha1 = "898dcc7b5592adba02e8bb82b8d2cda60cdae5c5"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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/github-from-package/-/github-from-package-0.0.0.tgz"; + sha1 = "97fb5d96bfde8973313f20e8288ef9a167fa64ce"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "globby-7.1.1" = { + name = "globby"; + packageName = "globby"; + version = "7.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz"; + sha1 = "fb2ccff9401f8600945dfada97440cca972b8680"; + }; + }; + "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"; + }; + }; + "got-8.0.3" = { + name = "got"; + packageName = "got"; + version = "8.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-8.0.3.tgz"; + sha512 = "2bglci1j77rvr4z2klmnr6d2qfqk0f60nm1myj9m0g2rzh7pd68hzki9nm8f5dpaxqr98ncjbd4rfzw75j35nvsfcyb2i1l9jjailak"; + }; + }; + "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-git-1.0.1" = { + name = "graceful-git"; + packageName = "graceful-git"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-git/-/graceful-git-1.0.1.tgz"; + sha512 = "31ajgk1zmq4zym3ckmr9n1x6n7sidg8naa3n8d2v6p8vr67g4gl7xxij5la1dxp6c9475pbrzq5vab7psp2dbjxvwdrzrlb8xwq83xp"; + }; + }; + "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"; + }; + }; + "graph-sequencer-2.0.0" = { + name = "graph-sequencer"; + packageName = "graph-sequencer"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/graph-sequencer/-/graph-sequencer-2.0.0.tgz"; + sha1 = "bfb809b8af584f6f5287cdce507a30d4aea6ee70"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "gunzip-maybe-1.4.1" = { + name = "gunzip-maybe"; + packageName = "gunzip-maybe"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.1.tgz"; + sha512 = "3d6jyhcq21cxy2n6mnalnxcdxl9i00n8qka7awrqamggss8yllz57msx7c480knv037snkzkymq6npl36wlpl71h54x511dlchavnxa"; + }; + }; + "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"; + }; + }; + "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-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"; + }; + }; + "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-1.0.1" = { + name = "has"; + packageName = "has"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has/-/has-1.0.1.tgz"; + sha1 = "8461733f538b0837c9361e39a9ab9e9704dc2f28"; + }; + }; + "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-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"; + }; + }; + "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-symbol-support-x-1.4.1" = { + name = "has-symbol-support-x"; + packageName = "has-symbol-support-x"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.1.tgz"; + sha512 = "0qgqbqmrlx51w4ixcln9ljr5hs2jj8fvryq7i8cg9a739p7y2c5z8wpplp9jhnfn4a3xn6li2b2npmhfm2x80khm9di3vllyyv9wii6"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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-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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz"; + sha512 = "3gsj16kpvygynld5ajbvg8ii3n3bka4waamdzx30wwhz72mdr6wvffm20rfnxwzid9fq49d5g333yjq5dz1qqbnk9bwcmrj9f5bda75"; + }; + }; + "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-proxy-agent-2.0.0" = { + name = "http-proxy-agent"; + packageName = "http-proxy-agent"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.0.0.tgz"; + sha1 = "46482a2f0523a4d6082551709f469cb3e4a85ff4"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "https-proxy-agent-2.1.1" = { + name = "https-proxy-agent"; + packageName = "https-proxy-agent"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.1.1.tgz"; + sha512 = "0rxbj60hs8fhs3i02lgb6ypcf9m9v8ybd4lfvfvpy0f1iyy54f1686lmv0rvkyxxihwvs4yizjgv8r8jksh385c4c9yjm3z8i0svbic"; + }; + }; + "humanize-ms-1.2.1" = { + name = "humanize-ms"; + packageName = "humanize-ms"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz"; + sha1 = "c46e3159a293f6b896da29316d8b6fe8bb79bbed"; + }; + }; + "hypercore-6.12.0" = { + name = "hypercore"; + packageName = "hypercore"; + version = "6.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.12.0.tgz"; + sha512 = "00xsmbx8jcjzsibwwgknlpjvndb7zv6jdxik5skqnbizbdssvcwa2r5a7gd1cf7mpr2827067sxqqca9fmmknjnin2vvm16yb1pn5g8"; + }; + }; + "hypercore-protocol-6.5.2" = { + name = "hypercore-protocol"; + packageName = "hypercore-protocol"; + version = "6.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.5.2.tgz"; + sha512 = "03l77nma8ga06ywa469jzqgc13hjk9bg3w2cv95g3fwnqy2fvz8qpczcih65jscvk0ira5kpm3sk2vqh2whzzvnm19jlqrzi78v80n3"; + }; + }; + "hyperdrive-9.12.2" = { name = "hyperdrive"; packageName = "hyperdrive"; - version = "9.12.0"; + version = "9.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-9.12.0.tgz"; - sha512 = "285nxd3xfdr51r8av9d7dal8hqa3lfrac1m46gn9b73ljwivlhhsxpbrqyhdf80v7bnmw8vpy61x77gm8cfmwv5z8pffmmnla2p8l5y"; + url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-9.12.2.tgz"; + sha512 = "133iwkp8w88awfxffdjjfxl2wsrj99cdw1p2rvbv65q7mgficva14skid7vsd55r750lrvg0wbmlz0h4m44w6ypd7cvpb4hjvb2f815"; }; }; "hyperdrive-http-4.2.2" = { @@ -1354,292 +3307,166 @@ let sha1 = "40daf82e31b9d753f2ae6dfaf0818661ed24fe15"; }; }; - "mirror-folder-2.1.1" = { - name = "mirror-folder"; - packageName = "mirror-folder"; - version = "2.1.1"; + "i-0.3.6" = { + name = "i"; + packageName = "i"; + version = "0.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-2.1.1.tgz"; - sha1 = "1ad3b777b39e403cc27bf52086c23e41ef4c9604"; + url = "https://registry.npmjs.org/i/-/i-0.3.6.tgz"; + sha1 = "d96c92732076f072711b6b10fd7d4f65ad8ee23d"; }; }; - "multicb-1.2.2" = { - name = "multicb"; - packageName = "multicb"; - version = "1.2.2"; + "iconv-lite-0.4.19" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.19"; src = fetchurl { - url = "https://registry.npmjs.org/multicb/-/multicb-1.2.2.tgz"; - sha512 = "2liv9lhcxrlp21524jzp1hxzbd07xmb7qlzma5qfn98bgn63ga0i5jalrhlz6qc08fd4jxh3hj2mi9wm14s95lip5x236052rv3i4rx"; + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz"; + sha512 = "0jj1pdq3j9ak8cixn2kjp7ip8hf3xgnb85j4jr32yf9rry620v9072c0kk577mllfk1zl9wzs5ypwzbp7vbhf7j31d5rrqgwb0nldm1"; }; }; - "random-access-file-1.8.1" = { - name = "random-access-file"; - packageName = "random-access-file"; - version = "1.8.1"; + "ieee754-1.1.8" = { + name = "ieee754"; + packageName = "ieee754"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.8.1.tgz"; - sha512 = "3pvi9knrjp8krj1hsg8i2qmv5097fid3qnyz4wh2dvpr37x2ga6qqk7afh5f1i5sb9dsw169bara13knccdmjwnivb62xgywz868j7r"; + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz"; + sha1 = "be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"; }; }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; + "iferr-0.1.5" = { + name = "iferr"; + packageName = "iferr"; version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz"; - sha1 = "df07284e342a807cd733ac5af72411e581d1177b"; + url = "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz"; + sha1 = "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"; }; }; - "extglob-0.3.2" = { - name = "extglob"; - packageName = "extglob"; - version = "0.3.2"; + "ignore-3.3.7" = { + name = "ignore"; + packageName = "ignore"; + version = "3.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz"; - sha1 = "2e18ff3d2f49ab2765cec9023f011daa8d8349a1"; + url = "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz"; + sha512 = "0f6xhxww989yic6hwdm8mbylcyakfkrrn22a39wdcc9k842xxyyhzfxkmi79s9gjk3rp3h07n265lf4n51z8yafpdm78d617dxbfqb0"; }; }; - "filename-regex-2.0.1" = { - name = "filename-regex"; - packageName = "filename-regex"; - version = "2.0.1"; + "ignore-walk-3.0.1" = { + name = "ignore-walk"; + packageName = "ignore-walk"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz"; - sha1 = "c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"; + url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz"; + sha512 = "2ajgs5klg786rkdxs37mbxn0p8ah2ai0nj0bjv5vbrfir4y0pvrhxxadv46s8g1hqkq5p3fjssys3n6qvz60p4jzjsgfq683lrnad8d"; }; }; - "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-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"; - }; - }; - "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"; - }; - }; - "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"; + "import-lazy-2.1.0" = { + name = "import-lazy"; + packageName = "import-lazy"; version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz"; - sha1 = "01fcbbb393463a548f2f466cce16dece49db908f"; + url = "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz"; + sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43"; }; }; - "isobject-2.1.0" = { - name = "isobject"; - packageName = "isobject"; - version = "2.1.0"; + "imurmurhash-0.1.4" = { + name = "imurmurhash"; + packageName = "imurmurhash"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"; - sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; + url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; }; }; - "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"; + "individual-3.0.0" = { + name = "individual"; + packageName = "individual"; version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz"; - sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; + url = "https://registry.npmjs.org/individual/-/individual-3.0.0.tgz"; + sha1 = "e7ca4f85f8957b018734f285750dc22ec2f9862d"; }; }; - "kind-of-4.0.0" = { - name = "kind-of"; - packageName = "kind-of"; - version = "4.0.0"; + "inflight-1.0.6" = { + name = "inflight"; + packageName = "inflight"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz"; - sha1 = "20813df3d712928b207378691a45066fae72dd57"; + 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"; + }; + }; + "init-package-json-1.10.1" = { + name = "init-package-json"; + packageName = "init-package-json"; + version = "1.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.10.1.tgz"; + sha1 = "cd873a167796befb99612b28762a0b6393fd8f6a"; + }; + }; + "into-stream-2.0.1" = { + name = "into-stream"; + packageName = "into-stream"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/into-stream/-/into-stream-2.0.1.tgz"; + sha1 = "db9b003694453eae091d8a5c84cc11507b781d31"; + }; + }; + "into-stream-3.1.0" = { + name = "into-stream"; + packageName = "into-stream"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz"; + sha1 = "96fb0a936c12babd6ff1752a17d05616abd094c6"; + }; + }; + "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"; + }; + }; + "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-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-buffer-1.1.6" = { @@ -1651,49 +3478,67 @@ let sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm"; }; }; - "is-posix-bracket-0.1.1" = { - name = "is-posix-bracket"; - packageName = "is-posix-bracket"; - version = "0.1.1"; + "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-posix-bracket/-/is-posix-bracket-0.1.1.tgz"; - sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"; + url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"; + sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe"; }; }; - "for-own-0.1.5" = { - name = "for-own"; - packageName = "for-own"; - version = "0.1.5"; + "is-bzip2-1.0.0" = { + name = "is-bzip2"; + packageName = "is-bzip2"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz"; - sha1 = "5265c681a4f294dabbf17c9509b6763aa84510ce"; + url = "https://registry.npmjs.org/is-bzip2/-/is-bzip2-1.0.0.tgz"; + sha1 = "5ee58eaa5a2e9c80e21407bedf23ae5ac091b3fc"; }; }; - "is-extendable-0.1.1" = { - name = "is-extendable"; - packageName = "is-extendable"; - version = "0.1.1"; + "is-callable-1.1.3" = { + name = "is-callable"; + packageName = "is-callable"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"; - sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz"; + sha1 = "86eb75392805ddc33af71c92a0eedf74ee7604b2"; }; }; - "for-in-1.0.2" = { - name = "for-in"; - packageName = "for-in"; - version = "1.0.2"; + "is-ci-1.1.0" = { + name = "is-ci"; + packageName = "is-ci"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz"; - sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; + url = "https://registry.npmjs.org/is-ci/-/is-ci-1.1.0.tgz"; + sha512 = "0m66alrh568wj40xwshf8q99gsjfk1jr0czp4jc2sm519wfzzzprkl5zjvw2r5h49p72d50ywj9qg67dnyazq0ijy4flgny2b1ygd3k"; }; }; - "glob-base-0.3.0" = { - name = "glob-base"; - packageName = "glob-base"; - version = "0.3.0"; + "is-cidr-1.0.0" = { + name = "is-cidr"; + packageName = "is-cidr"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz"; - sha1 = "dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"; + url = "https://registry.npmjs.org/is-cidr/-/is-cidr-1.0.0.tgz"; + sha1 = "fb5aacf659255310359da32cae03e40c6a1c2afc"; + }; + }; + "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/is-date-object/-/is-date-object-1.0.1.tgz"; + sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; + }; + }; + "is-deflate-1.0.0" = { + name = "is-deflate"; + packageName = "is-deflate"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-deflate/-/is-deflate-1.0.0.tgz"; + sha1 = "c862901c3c161fb09dac7cdc7e784f80e98f2f14"; }; }; "is-dotfile-1.0.3" = { @@ -1705,15 +3550,6 @@ let 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"; @@ -1723,6 +3559,159 @@ let 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-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-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-gzip-1.0.0" = { + name = "is-gzip"; + packageName = "is-gzip"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz"; + sha1 = "6ca8b07b99c77998025900e555ced8ed80879a83"; + }; + }; + "is-inner-link-2.0.2" = { + name = "is-inner-link"; + packageName = "is-inner-link"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-inner-link/-/is-inner-link-2.0.2.tgz"; + sha512 = "2xbj75av7s092kdl27ic28ckwnfnxvl4wr3x879djhamp0waw1js8c0zrakfnbjbsp5vh087brimykngrg319zfzhgwjvni994m2bv1"; + }; + }; + "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-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-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-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-obj-1.1.0" = { + name = "is-plain-obj"; + packageName = "is-plain-obj"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; + sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e"; + }; + }; + "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"; @@ -1732,265 +3721,103 @@ let sha1 = "207bab91638499c07b2adf240a41a87210034575"; }; }; - "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"; - }; - }; - "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"; - }; - }; - "append-tree-2.4.0" = { - name = "append-tree"; - packageName = "append-tree"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/append-tree/-/append-tree-2.4.0.tgz"; - sha512 = "1ym9wsmz3fjv0wf675xclbnjp825cyvxp3a9x8af96yms45dbk8c79jrx5vgdii1zimcnr2pg305g9sw79k5yqah9267k71lsz5vv35"; - }; - }; - "dat-secret-storage-4.0.0" = { - name = "dat-secret-storage"; - packageName = "dat-secret-storage"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dat-secret-storage/-/dat-secret-storage-4.0.0.tgz"; - sha1 = "01b219a5bc1619efc0f58122a3c6cebb1eb8b40a"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "brfs-1.4.3" = { - name = "brfs"; - packageName = "brfs"; - version = "1.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/brfs/-/brfs-1.4.3.tgz"; - sha1 = "db675d6f5e923e6df087fca5859c9090aaed3216"; - }; - }; - "codecs-1.2.0" = { - name = "codecs"; - packageName = "codecs"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/codecs/-/codecs-1.2.0.tgz"; - sha1 = "5148549e3d156c5fa053d7cbb419715a0cf43d16"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "protocol-buffers-3.2.1" = { - name = "protocol-buffers"; - packageName = "protocol-buffers"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/protocol-buffers/-/protocol-buffers-3.2.1.tgz"; - sha1 = "37258e17e24a082f06ebb17731e92851d1c76889"; - }; - }; - "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"; - }; - }; - "quote-stream-1.0.2" = { - name = "quote-stream"; - packageName = "quote-stream"; + "is-property-1.0.2" = { + name = "is-property"; + packageName = "is-property"; version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/quote-stream/-/quote-stream-1.0.2.tgz"; - sha1 = "84963f8c9c26b942e153feeb53aae74652b7e0b2"; + url = "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"; + sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; }; }; - "resolve-1.5.0" = { - name = "resolve"; - packageName = "resolve"; - version = "1.5.0"; + "is-redirect-1.0.0" = { + name = "is-redirect"; + packageName = "is-redirect"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz"; - sha512 = "25scf9zkhf5yc9x3d7mfq2im5vyxmq3ih939na6jzblal7mgfcijmadl2maz501mkccykj714gvdhhmlzi86hbk7k03r9ipnwd142l6"; + url = "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz"; + sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"; }; }; - "static-module-1.5.0" = { - name = "static-module"; - packageName = "static-module"; - version = "1.5.0"; + "is-regex-1.0.4" = { + name = "is-regex"; + packageName = "is-regex"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/static-module/-/static-module-1.5.0.tgz"; - sha1 = "27da9883c41a8cd09236f842f0c1ebc6edf63d86"; + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz"; + sha1 = "5517489b547091b0930e095654ced25ee97e9491"; }; }; - "through2-2.0.3" = { - name = "through2"; - packageName = "through2"; - version = "2.0.3"; + "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/through2/-/through2-2.0.3.tgz"; - sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be"; + url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz"; + sha1 = "11a060568b67339444033d0125a61a20d564fb34"; }; }; - "buffer-equal-0.0.1" = { - name = "buffer-equal"; - packageName = "buffer-equal"; - version = "0.0.1"; + "is-ssh-1.3.0" = { + name = "is-ssh"; + packageName = "is-ssh"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz"; - sha1 = "91bc74b11ea405bc916bc6aa908faafa5b4aac4b"; + url = "https://registry.npmjs.org/is-ssh/-/is-ssh-1.3.0.tgz"; + sha1 = "ebea1169a2614da392a63740366c3ce049d8dff6"; }; }; - "path-parse-1.0.5" = { - name = "path-parse"; - packageName = "path-parse"; - version = "1.0.5"; + "is-stream-1.1.0" = { + name = "is-stream"; + packageName = "is-stream"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz"; - sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"; + url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; + sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; }; }; - "duplexer2-0.0.2" = { - name = "duplexer2"; - packageName = "duplexer2"; - version = "0.0.2"; + "is-string-1.0.4" = { + name = "is-string"; + packageName = "is-string"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz"; - sha1 = "c614dcf67e2fb14995a91711e5a617e8a60a31db"; + url = "https://registry.npmjs.org/is-string/-/is-string-1.0.4.tgz"; + sha1 = "cc3a9b69857d621e963725a24caeec873b826e64"; }; }; - "escodegen-1.3.3" = { - name = "escodegen"; - packageName = "escodegen"; - version = "1.3.3"; + "is-subdir-1.0.2" = { + name = "is-subdir"; + packageName = "is-subdir"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz"; - sha1 = "f024016f5a88e046fd12005055e939802e6c5f23"; + url = "https://registry.npmjs.org/is-subdir/-/is-subdir-1.0.2.tgz"; + sha512 = "2czdnl66p1ls8xjwh0vx5ydk118b9m1zhnc4khf16v7bh9n8nwjhafr4aigvd6kj2igl0ylbzznc181pf0ppxm4bgiv9kwyvlryyzfq"; }; }; - "falafel-2.1.0" = { - name = "falafel"; - packageName = "falafel"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/falafel/-/falafel-2.1.0.tgz"; - sha1 = "96bb17761daba94f46d001738b3cedf3a67fe06c"; - }; - }; - "has-1.0.1" = { - name = "has"; - packageName = "has"; + "is-symbol-1.0.1" = { + name = "is-symbol"; + packageName = "is-symbol"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/has/-/has-1.0.1.tgz"; - sha1 = "8461733f538b0837c9361e39a9ab9e9704dc2f28"; + url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz"; + sha1 = "3cc59f00025194b6ab2e38dbae6689256b660572"; }; }; - "object-inspect-0.4.0" = { - name = "object-inspect"; - packageName = "object-inspect"; - version = "0.4.0"; + "is-typedarray-1.0.0" = { + name = "is-typedarray"; + packageName = "is-typedarray"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-0.4.0.tgz"; - sha1 = "f5157c116c1455b243b06ee97703392c5ad89fec"; + url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; }; }; - "quote-stream-0.0.0" = { - name = "quote-stream"; - packageName = "quote-stream"; - version = "0.0.0"; + "is-windows-1.0.1" = { + name = "is-windows"; + packageName = "is-windows"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/quote-stream/-/quote-stream-0.0.0.tgz"; - sha1 = "cde29e94c409b16e19dc7098b89b6658f9721d3b"; - }; - }; - "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"; - }; - }; - "shallow-copy-0.0.1" = { - name = "shallow-copy"; - packageName = "shallow-copy"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz"; - sha1 = "415f42702d73d810330292cc5ee86eae1a11a170"; - }; - }; - "static-eval-0.2.4" = { - name = "static-eval"; - packageName = "static-eval"; - version = "0.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/static-eval/-/static-eval-0.2.4.tgz"; - sha1 = "b7d34d838937b969f9641ca07d48f8ede263ea7b"; - }; - }; - "through2-0.4.2" = { - name = "through2"; - packageName = "through2"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz"; - sha1 = "dbf5866031151ec8352bb6c4db64a2292a840b9b"; - }; - }; - "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"; + url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.1.tgz"; + sha1 = "310db70f742d259a16a369202b51af84233310d9"; }; }; "isarray-0.0.1" = { @@ -2002,355 +3829,535 @@ let 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"; - }; - }; - "esutils-1.0.0" = { - name = "esutils"; - packageName = "esutils"; + "isarray-1.0.0" = { + name = "isarray"; + packageName = "isarray"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz"; - sha1 = "8151d358e20c8acc7fb745e7472c0025fe496570"; + url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; }; }; - "estraverse-1.5.1" = { - name = "estraverse"; - packageName = "estraverse"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz"; - sha1 = "867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71"; - }; - }; - "esprima-1.1.1" = { - name = "esprima"; - packageName = "esprima"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz"; - sha1 = "5b6f1547f4d102e670e140c509be6771d6aeb549"; - }; - }; - "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"; - }; - }; - "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-5.2.1" = { - name = "acorn"; - packageName = "acorn"; - version = "5.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz"; - sha512 = "3ryzhy30vzfnn2a0crafh3qsrx145ali8i88q1bc0lzl1dz0ycmjmmwh2yn9xfjs3vmjxl7nphpwcs4imgz3da5jb8fvjqbrvnjwvcc"; - }; - }; - "foreach-2.0.5" = { - name = "foreach"; - packageName = "foreach"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz"; - sha1 = "0bee005018aeb260d0a3af3ae658dd0136ec1b99"; - }; - }; - "object-keys-1.0.11" = { - name = "object-keys"; - packageName = "object-keys"; - version = "1.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz"; - sha1 = "c54601778ad560f1142ce0e01bcca8b56d13426d"; - }; - }; - "function-bind-1.1.1" = { - name = "function-bind"; - packageName = "function-bind"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; - sha512 = "38chm1mh077ksx6hy2sssfz4q29hf0ncb9k6ila7si54zqcpl5fxd1rh6wi82blqp7jcspf4aynr7jqhbsg2yc9y42xpqqp6c1jz2n8"; - }; - }; - "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"; - }; - }; - "escodegen-0.0.28" = { - name = "escodegen"; - packageName = "escodegen"; - version = "0.0.28"; - src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-0.0.28.tgz"; - sha1 = "0e4ff1715f328775d6cab51ac44a406cd7abffd3"; - }; - }; - "esprima-1.0.4" = { - name = "esprima"; - packageName = "esprima"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz"; - sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"; - }; - }; - "estraverse-1.3.2" = { - name = "estraverse"; - packageName = "estraverse"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-1.3.2.tgz"; - sha1 = "37c2b893ef13d723f276d878d60d8535152a6c42"; - }; - }; - "xtend-2.1.2" = { - name = "xtend"; - packageName = "xtend"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz"; - sha1 = "6efecc2a4dad8e6962c4901b337ce7ba87b5d28b"; - }; - }; - "object-keys-0.4.0" = { - name = "object-keys"; - packageName = "object-keys"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz"; - sha1 = "28a6aae7428dd2c3a92f3d95f21335dd204e0336"; - }; - }; - "generate-function-2.0.0" = { - name = "generate-function"; - packageName = "generate-function"; + "isexe-2.0.0" = { + name = "isexe"; + packageName = "isexe"; version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"; - sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74"; + url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; }; }; - "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"; - }; - }; - "protocol-buffers-schema-3.3.2" = { - name = "protocol-buffers-schema"; - packageName = "protocol-buffers-schema"; - version = "3.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.3.2.tgz"; - sha512 = "3rvq2xsb9y9vfy8vgf6ja08362bjcg132kxcwcfdik1j6j17dvlk535agpwiqzj47g1d7shcwq5h6zk5jy1ny25n4z6bzh1rfkv5mjx"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "sorted-array-functions-1.0.0" = { - name = "sorted-array-functions"; - packageName = "sorted-array-functions"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sorted-array-functions/-/sorted-array-functions-1.0.0.tgz"; - sha1 = "c0b554d9e709affcbe56d34c1b2514197fd38279"; - }; - }; - "duplexify-3.5.1" = { - name = "duplexify"; - packageName = "duplexify"; - version = "3.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz"; - sha512 = "0cyjpkdqc1lkh2fh7z9p2i6va4fvwazvpn4153ndpb2ng8w0q9x9kb0hk07yy0baj50s1kl58m7f7zmx8fqdfcp2vsl0m7hfk22i64g"; - }; - }; - "hypercore-6.11.0" = { - name = "hypercore"; - packageName = "hypercore"; - version = "6.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-6.11.0.tgz"; - sha512 = "0q0972kpj73qndhwb3msk3xkfpx1zldfw1ld815kncb0lbr7mdhawjz701y230zji0lamnznrv61cmcnx2zlqjhvcyrf9fyyr93r6ds"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "uint64be-2.0.1" = { - name = "uint64be"; - packageName = "uint64be"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uint64be/-/uint64be-2.0.1.tgz"; - sha1 = "a310d94e4e5e0b02a95d678e33323f802bdc8428"; - }; - }; - "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"; - }; - }; - "end-of-stream-1.4.0" = { - name = "end-of-stream"; - packageName = "end-of-stream"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz"; - sha1 = "7a90d833efda6cfa6eac0f4949dbb0fad3a63206"; - }; - }; - "stream-shift-1.0.0" = { - name = "stream-shift"; - packageName = "stream-shift"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz"; - sha1 = "d5c752825e5367e786f78e18e445ea223a155952"; - }; - }; - "once-1.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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "bitfield-rle-2.1.0" = { - name = "bitfield-rle"; - packageName = "bitfield-rle"; + "isobject-2.1.0" = { + name = "isobject"; + packageName = "isobject"; version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/bitfield-rle/-/bitfield-rle-2.1.0.tgz"; - sha1 = "ae29e9382a7ba4898de9f48bb23fd338c4fbdcf8"; + url = "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"; + sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; }; }; - "bulk-write-stream-1.1.3" = { - name = "bulk-write-stream"; - packageName = "bulk-write-stream"; - version = "1.1.3"; + "isstream-0.1.2" = { + name = "isstream"; + packageName = "isstream"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/bulk-write-stream/-/bulk-write-stream-1.1.3.tgz"; - sha1 = "d29ca385fbd53f357aee5bd3d3028732b62ae275"; + url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; }; }; - "flat-tree-1.6.0" = { - name = "flat-tree"; - packageName = "flat-tree"; + "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"; + }; + }; + "iterate-object-1.3.2" = { + name = "iterate-object"; + packageName = "iterate-object"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/iterate-object/-/iterate-object-1.3.2.tgz"; + sha1 = "24ec15affa5d0039e8839695a21c2cae1f45b66b"; + }; + }; + "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"; + }; + }; + "js-yaml-3.10.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz"; + sha512 = "0h26sq1bwxc45bm0hvlcadrbk4bizzaw729wvw690ya7mpys45bqfzdqwhjkdrnq0i44dzxckykz4bix22jfdyfg1asybg3yzczjsrv"; + }; + }; + "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-buffer-3.0.0" = { + name = "json-buffer"; + packageName = "json-buffer"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz"; + sha1 = "5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"; + }; + }; + "json-parse-better-errors-1.0.1" = { + name = "json-parse-better-errors"; + packageName = "json-parse-better-errors"; + 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"; + }; + }; + "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-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-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"; + }; + }; + "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"; + }; + }; + "json2yaml-1.1.0" = { + name = "json2yaml"; + packageName = "json2yaml"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json2yaml/-/json2yaml-1.1.0.tgz"; + sha1 = "5414d907f9816586b80c513ec2e3aeb2ab819a6c"; + }; + }; + "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"; + }; + }; + "jsonparse-1.3.1" = { + name = "jsonparse"; + packageName = "jsonparse"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz"; + sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280"; + }; + }; + "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-rpc-4.2.1" = { + name = "k-rpc"; + packageName = "k-rpc"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/k-rpc/-/k-rpc-4.2.1.tgz"; + sha512 = "2nbjxg0x7jsa14zhvx68w1vri68hsxzbxz7b7ap76fdp0jkrgna2rq636yxnax04f3f8i2ambj2fpan6qli6vixmfryz78vrapdip8n"; + }; + }; + "k-rpc-socket-1.7.2" = { + name = "k-rpc-socket"; + packageName = "k-rpc-socket"; + version = "1.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.7.2.tgz"; + sha512 = "02w1ih1lh86i5ap7c3dy2ml7g5a11r0w300iyxdf6v02qr0j1x3vf78hx5q9dgg3drifab018mgm851m457zzzi05i2z2r1s3zlflc3"; + }; + }; + "keyv-3.0.0" = { + name = "keyv"; + packageName = "keyv"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz"; + sha512 = "32ga97c763vprf4sjbb2f7gbngfppq9n1hy4cpq2h4yb1msrhh2zjimxib7p09mzgynm6askbigxlsqsm11p644avp4sf5nmng8f2vs"; + }; + }; + "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"; + }; + }; + "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-property-1.0.0" = { + name = "lazy-property"; + packageName = "lazy-property"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy-property/-/lazy-property-1.0.0.tgz"; + sha1 = "84ddc4b370679ba8bd4cdcfa4c06b43d57111147"; + }; + }; + "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"; + }; + }; + "le-table-4.0.0" = { + name = "le-table"; + packageName = "le-table"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/le-table/-/le-table-4.0.0.tgz"; + sha1 = "3bfeb72d24cbfc37752f01539f9006d711d9be93"; + }; + }; + "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"; + }; + }; + "libnpx-9.6.0" = { + name = "libnpx"; + packageName = "libnpx"; + version = "9.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/libnpx/-/libnpx-9.6.0.tgz"; + sha512 = "28v6bsd92dcqj92yr2bk9r29ajwbqx46fd46mriva2934nr7s6hhkxy6f7xbf4nd7p93fxsbpzfx0ghq0y788x1zj8gnh1iswgd89sz"; + }; + }; + "load-json-file-2.0.0" = { + name = "load-json-file"; + packageName = "load-json-file"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz"; + sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8"; + }; + }; + "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/load-json-file/-/load-json-file-4.0.0.tgz"; + sha1 = "2f5f45ab91e33216234fd53adab668eb4ec0993b"; + }; + }; + "load-yaml-file-0.1.0" = { + name = "load-yaml-file"; + packageName = "load-yaml-file"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-yaml-file/-/load-yaml-file-0.1.0.tgz"; + sha1 = "f680066e691b3eeb45017672e4a3956af5b83b89"; + }; + }; + "locate-path-2.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz"; + sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; + }; + }; + "lockfile-1.0.3" = { + name = "lockfile"; + packageName = "lockfile"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.3.tgz"; + sha1 = "2638fc39a0331e9cac1a04b71799931c9c50df79"; + }; + }; + "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.4" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"; + sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae"; + }; + }; + "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._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.clonedeep-4.5.0" = { + name = "lodash.clonedeep"; + packageName = "lodash.clonedeep"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; + sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; + }; + }; + "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.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.union-4.6.0" = { + name = "lodash.union"; + packageName = "lodash.union"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz"; + sha1 = "48bb5088409f16f1821666641c44dd1aaae3cd88"; + }; + }; + "lodash.uniq-4.5.0" = { + name = "lodash.uniq"; + packageName = "lodash.uniq"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; + sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; + }; + }; + "lodash.without-4.4.0" = { + name = "lodash.without"; + packageName = "lodash.without"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.4.0.tgz"; + sha1 = "3cd4574a00b67bae373a94b748772640507b7aac"; + }; + }; + "log-update-2.3.0" = { + name = "log-update"; + packageName = "log-update"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/log-update/-/log-update-2.3.0.tgz"; + sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708"; + }; + }; + "loud-rejection-1.6.0" = { + name = "loud-rejection"; + packageName = "loud-rejection"; version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/flat-tree/-/flat-tree-1.6.0.tgz"; - sha1 = "fca30cddb9006fb656eb5ebc79aeb274e7fde9ed"; + url = "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz"; + sha1 = "5b46f80147edee578870f086d04821cf998e551f"; }; }; - "hypercore-protocol-6.4.2" = { - name = "hypercore-protocol"; - packageName = "hypercore-protocol"; - version = "6.4.2"; + "lowercase-keys-1.0.0" = { + name = "lowercase-keys"; + packageName = "lowercase-keys"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore-protocol/-/hypercore-protocol-6.4.2.tgz"; - sha512 = "07lwyavmways0q0ljrvpgvdii96f96a692m4x8dwmdwlfgh604gjz47vs95zk2ryfs9qm5j9msvy955bgyqns2az3ypysi76k51n7y7"; + url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz"; + sha1 = "4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"; + }; + }; + "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-4.1.1" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz"; + sha512 = "1xz91sizgyzh8plz5jx1labzpygapm6xy3qpxriaj00yvnhy4lnmhqcb20qln4lh80c5g3yzp4j5i6g63njq1r5sl9c0zlkh9xjk2xb"; + }; + }; + "make-dir-1.1.0" = { + name = "make-dir"; + packageName = "make-dir"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz"; + sha512 = "1q7686aqgkxk9l6nqhzbil3599f9pxiz364kdbfy7pdr9sny7zylpm6yf4rwz4i0aa11lmf35mh8jmj7g7vxm37pvqvl9qbij5jxyfh"; + }; + }; + "make-fetch-happen-2.6.0" = { + name = "make-fetch-happen"; + packageName = "make-fetch-happen"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.6.0.tgz"; + sha512 = "1kmyri7r2lpf3fjzwbbdramk86mhplv53x5pl535frn1vryq9xl7hmzkb3awxw6c31n19w0i20mv0h3zj8mmcw5yjkiysrlsaab8nhl"; + }; + }; + "meant-1.0.1" = { + name = "meant"; + packageName = "meant"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/meant/-/meant-1.0.1.tgz"; + sha512 = "2b6yi25bkxg4hd38w2cpfjy0xyka4iqiyzhsnkklx3nxwbgnzr4hfl07xxpflccjvnb03zvnssw0y9fspxdk2fmq3abd4fab0n1baai"; + }; + }; + "mem-1.1.0" = { + name = "mem"; + packageName = "mem"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz"; + sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76"; + }; + }; + "mem-3.0.0" = { + name = "mem"; + packageName = "mem"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mem/-/mem-3.0.0.tgz"; + sha1 = "84e58ad4dfbdf5d105b26b6548a398b2b3aa8a21"; }; }; "memory-pager-1.1.0" = { @@ -2371,130 +4378,13 @@ let sha1 = "f8a064760d37e7978ad5f9f6d3c119a494f57081"; }; }; - "unordered-array-remove-1.0.2" = { - name = "unordered-array-remove"; - packageName = "unordered-array-remove"; - version = "1.0.2"; + "micromatch-2.3.11" = { + name = "micromatch"; + packageName = "micromatch"; + version = "2.3.11"; src = fetchurl { - url = "https://registry.npmjs.org/unordered-array-remove/-/unordered-array-remove-1.0.2.tgz"; - sha1 = "c546e8f88e317a0cf2644c97ecb57dba66d250ef"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "sodium-javascript-0.5.4" = { - name = "sodium-javascript"; - packageName = "sodium-javascript"; - version = "0.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/sodium-javascript/-/sodium-javascript-0.5.4.tgz"; - sha512 = "1dqdzm0qjk1rwq62b010b649wdpvlzdxpmwc972p0dcwsc86wqfcm8lbdcxlrwypkn2jq5df1xpbxhxfphnpr993ac543p9s212si30"; - }; - }; - "sodium-native-2.1.2" = { - name = "sodium-native"; - packageName = "sodium-native"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.2.tgz"; - sha512 = "3rkm9fyndric0yxx4qsrxmj1wbz7q4ixm6735jlsvkyi8gvibszsc017660p4gdypcikwbzfyvcxl1bpjwnbcd60gbri5xnxqd1m0yl"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "blake2b-wasm-1.1.4" = { - name = "blake2b-wasm"; - packageName = "blake2b-wasm"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/blake2b-wasm/-/blake2b-wasm-1.1.4.tgz"; - sha512 = "3hgcz1c3h2hxgavmlf5r4dwk0wy2sg9y4lfs5ifj4spdlwyy3ki9i1i4hjaw0029c896d6yw424mw2j1nf4qyibkz2lbh1ws6z6rdlg"; - }; - }; - "base64-to-uint8array-1.0.0" = { - name = "base64-to-uint8array"; - packageName = "base64-to-uint8array"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-to-uint8array/-/base64-to-uint8array-1.0.0.tgz"; - sha512 = "01a4ip2ivflpjsx4flnww5fqvdcsy2sqnjgp2cii6b2gnkkccr02vbf2y8r2wlcab4pb8x47qb3jpahca61v584bmz9xcwyqx0xdf3n"; - }; - }; - "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"; - }; - }; - "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"; + url = "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz"; + sha1 = "86677c97d1720b363431d04d0d15293bd38c1565"; }; }; "mime-1.6.0" = { @@ -2506,373 +4396,49 @@ let sha512 = "1x901mk5cdib4xp27v4ivwwr7mhy64r4rk953bzivi5p9lf2bhw88ra2rhkd254xkdx2d3q30zkq239vc4yx4pfsj4hpys8rbr6fif7"; }; }; - "range-parser-1.2.0" = { - name = "range-parser"; - packageName = "range-parser"; - version = "1.2.0"; + "mime-db-1.30.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz"; - sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz"; + sha1 = "74c643da2dd9d6a45399963465b26d5ca7d71f01"; }; }; - "http-methods-0.1.0" = { - name = "http-methods"; - packageName = "http-methods"; - version = "0.1.0"; + "mime-types-2.1.17" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.17"; src = fetchurl { - url = "https://registry.npmjs.org/http-methods/-/http-methods-0.1.0.tgz"; - sha1 = "29691b6fc58f4f7e81a3605dca82682b068e4430"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz"; + sha1 = "09d7a393f03e995a79f8af857b70a9e0ab16557a"; }; }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "fd-read-stream-1.1.0" = { - name = "fd-read-stream"; - packageName = "fd-read-stream"; + "mimic-fn-1.1.0" = { + name = "mimic-fn"; + packageName = "mimic-fn"; version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fd-read-stream/-/fd-read-stream-1.1.0.tgz"; - sha1 = "d303ccbfee02a9a56a3493fb08bcb59691aa53b1"; + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz"; + sha1 = "e667783d92e89dbd342818b5230b9d62a672ad18"; }; }; - "recursive-watch-1.1.2" = { - name = "recursive-watch"; - packageName = "recursive-watch"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/recursive-watch/-/recursive-watch-1.1.2.tgz"; - sha1 = "912e2d62a83c8b388d288c4343495f247bc43f8e"; - }; - }; - "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"; - }; - }; - "buffer-alloc-unsafe-1.0.0" = { - name = "buffer-alloc-unsafe"; - packageName = "buffer-alloc-unsafe"; + "mimic-response-1.0.0" = { + name = "mimic-response"; + packageName = "mimic-response"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.0.0.tgz"; - sha1 = "474aa88f34e7bc75fa311d2e6457409c5846c3fe"; + url = "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.0.tgz"; + sha1 = "df3d3652a73fded6b9b0b24146e6fd052353458e"; }; }; - "mkdirp-0.5.1" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.1"; + "min-document-2.19.0" = { + name = "min-document"; + packageName = "min-document"; + version = "2.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "ansi-diff-stream-1.2.0" = { - name = "ansi-diff-stream"; - packageName = "ansi-diff-stream"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-diff-stream/-/ansi-diff-stream-1.2.0.tgz"; - sha1 = "eb325c20ac3623ecd592011a9295d76d97de460e"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; + url = "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz"; + sha1 = "7bd282e3f5842ed295bb748cdd9f1ffa2c824685"; }; }; "minimatch-3.0.4" = { @@ -2884,76 +4450,346 @@ let sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8"; }; }; - "path-is-absolute-1.0.1" = { - name = "path-is-absolute"; - packageName = "path-is-absolute"; - version = "1.0.1"; + "minimist-0.0.8" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; }; }; - "brace-expansion-1.1.8" = { - name = "brace-expansion"; - packageName = "brace-expansion"; - version = "1.1.8"; + "minimist-1.2.0" = { + name = "minimist"; + packageName = "minimist"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz"; - sha1 = "c07b211c7c952ec1f8efd51a77ef0d1d3990a292"; + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; + sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; }; - "balanced-match-1.0.0" = { - name = "balanced-match"; - packageName = "balanced-match"; - version = "1.0.0"; + "minipass-2.2.1" = { + name = "minipass"; + packageName = "minipass"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; - sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + url = "https://registry.npmjs.org/minipass/-/minipass-2.2.1.tgz"; + sha512 = "3yy9s65iwrx5hndcqbxrks88xi9cf8hra6zalgf8xfr4ahpp31s0i8lv6jpyb42p0y7z55ac3390sbqxcgcvan3xls449agbjb98mmv"; }; }; - "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"; - }; - }; - "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"; - }; - }; - "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"; - }; - }; - "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"; + "minizlib-1.1.0" = { + name = "minizlib"; + packageName = "minizlib"; version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.0.tgz"; - sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; + 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"; + }; + }; + "mississippi-1.3.1" = { + name = "mississippi"; + packageName = "mississippi"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mississippi/-/mississippi-1.3.1.tgz"; + sha512 = "2vfagk7xiqrqmyp78yz1cpnjsaibgix7q22cgxggwzf5kqr7y1p21dbi67vcvsvip1g2s6mrvskw7d8a2288sala5n0nv65hpqw3apz"; + }; + }; + "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"; + }; + }; + "mkdirp-promise-5.0.1" = { + name = "mkdirp-promise"; + packageName = "mkdirp-promise"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp-promise/-/mkdirp-promise-5.0.1.tgz"; + sha1 = "e9b8f68e552c68a9c1713b84883f7a1dd039b8a1"; + }; + }; + "months-1.2.0" = { + name = "months"; + packageName = "months"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/months/-/months-1.2.0.tgz"; + sha512 = "0wl48vfgi3c46vwy8cfa0j4z65rbar2j8cwgns9jcgi3cc3n79fm7yjg6wlbd90y3jhhfj03i2xs0as0sv3kkb0jc32d2bk9a2knlyc"; + }; + }; + "most-1.7.2" = { + name = "most"; + packageName = "most"; + version = "1.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/most/-/most-1.7.2.tgz"; + sha512 = "1jxsiagsdkjmd2h0ys7kkc34rw79bswfdlyijd2fv434d0sxk8i8j055fhmpfs4ca1j9wgi6pj9k4b2cyq7di528vykwgf7mr8v6d4c"; + }; + }; + "most-last-1.0.0" = { + name = "most-last"; + packageName = "most-last"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/most-last/-/most-last-1.0.0.tgz"; + sha1 = "4e3f0b289c24cf90b9d8384676de90a26e376171"; + }; + }; + "move-concurrently-1.0.1" = { + name = "move-concurrently"; + packageName = "move-concurrently"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz"; + sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; + }; + }; + "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"; + }; + }; + "ms-2.1.1" = { + name = "ms"; + packageName = "ms"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"; + sha512 = "352z145jr1zx0w6kmlz2jxcaw6j2pwwg9va3x4gk731zw1agka2b213avw12zx6hgn071ibm0f3p80n5cdv896npay4s6jwbrv7w2mn"; + }; + }; + "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.2" = { + name = "multicast-dns"; + packageName = "multicast-dns"; + version = "6.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.2.tgz"; + sha512 = "06b9ps5a1ymag21szz55z4xzs2ncp0frcqsaldnggmz0m5ijhjv8f553cpkp9zkm37av1pm2y8pn70jbfzk888n1hap6i321babhcy5"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "mz-2.7.0" = { + name = "mz"; + packageName = "mz"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz"; + sha512 = "3cpmwzmngnmxhklvicnsbl5dchvsy0yikzgf705cq1cplyps3waa03xbjp306bjf167wnplibwki0csnavz98dihq2877g7xqs4dkfg"; + }; + }; + "nan-2.8.0" = { + name = "nan"; + packageName = "nan"; + version = "2.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz"; + sha1 = "ed715f3fe9de02b57a5e6252d90a96675e1f085a"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "ndjson-1.5.0" = { + name = "ndjson"; + packageName = "ndjson"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ndjson/-/ndjson-1.5.0.tgz"; + sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8"; + }; + }; + "neat-csv-2.1.0" = { + name = "neat-csv"; + packageName = "neat-csv"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/neat-csv/-/neat-csv-2.1.0.tgz"; + sha1 = "06f58360c4c3b955bd467ddc85ae4511a3907a4c"; + }; + }; + "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"; + }; + }; + "nerf-dart-1.0.0" = { + name = "nerf-dart"; + packageName = "nerf-dart"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nerf-dart/-/nerf-dart-1.0.0.tgz"; + sha1 = "e6dab7febf5ad816ea81cf5c629c5a0ebde72c1a"; + }; + }; + "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"; + }; + }; + "node-abi-2.1.2" = { + name = "node-abi"; + packageName = "node-abi"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/node-abi/-/node-abi-2.1.2.tgz"; + sha512 = "1sd6l8zqa18mlzackwy8vns51zjp8xyrd97nc514b0yvndd0y0wsyx2q9h8zr0k9kra5ys1yq75ggkv5av69cyzxji19rdvr5pjsrc6"; + }; + }; + "node-fetch-npm-2.0.2" = { + name = "node-fetch-npm"; + packageName = "node-fetch-npm"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz"; + sha512 = "0bw6m444q0jc2gmw1yb0im1jv6vhky6d071p72c26ajvf2a7710jq8cp5ampf8j7kdbki7j0mbsi15dh93vrhkpvqpkw0i6ajdk34lw"; + }; + }; + "node-gyp-3.6.2" = { + 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"; + }; + }; + "node-gyp-build-3.2.2" = { + name = "node-gyp-build"; + packageName = "node-gyp-build"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.2.2.tgz"; + sha512 = "34hwi28wvvh5nn8bv71n0fb83xjyk84jsn8j9zgkaqnfigpv2hk6fs9jaffsn7qi3yi4n7iwd9yjyagd1rh74ckzdf5s6l59b8vzidp"; + }; + }; + "noop-logger-0.1.1" = { + name = "noop-logger"; + packageName = "noop-logger"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz"; + sha1 = "94a2b1633c4f1317553007d8966fd0e841b6a4c2"; + }; + }; + "noop6-1.0.7" = { + name = "noop6"; + packageName = "noop6"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/noop6/-/noop6-1.0.7.tgz"; + sha1 = "96767bf2058ba59ca8cb91559347ddc80239fa8e"; }; }; "nopt-3.0.6" = { @@ -2965,121 +4801,184 @@ let sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; }; }; - "resolve-1.1.7" = { - name = "resolve"; - packageName = "resolve"; - version = "1.1.7"; + "nopt-4.0.1" = { + name = "nopt"; + packageName = "nopt"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz"; - sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; + url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz"; + sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; }; }; - "glob-5.0.15" = { - name = "glob"; - packageName = "glob"; - version = "5.0.15"; + "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/glob/-/glob-5.0.15.tgz"; - sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"; + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; + sha512 = "01wzws79ps84ylshjb7rfpjykgiqxnpr89s52p2yyzfx8nfvyh5flvf1almiiavsi75xgi8g3s5davc1mmgz7gn8yvlqz6gnhax8f7n"; }; }; - "abbrev-1.1.1" = { - name = "abbrev"; - packageName = "abbrev"; - version = "1.1.1"; + "normalize-path-2.1.1" = { + name = "normalize-path"; + packageName = "normalize-path"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; - sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy"; + url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz"; + sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; }; }; - "browser-stdout-1.3.0" = { - name = "browser-stdout"; - packageName = "browser-stdout"; - version = "1.3.0"; + "normalize-registry-url-1.0.0" = { + name = "normalize-registry-url"; + packageName = "normalize-registry-url"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz"; - sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f"; + url = "https://registry.npmjs.org/normalize-registry-url/-/normalize-registry-url-1.0.0.tgz"; + sha512 = "3s6mrnn04pf7i9gqc04l6c4mnwdwy08235c4rd1rzw080z1a27bs1xwh2fcbzc8p1lbm4xjbby1g11pd38i4wsfjarbsvvmrvir7znj"; }; }; - "commander-2.11.0" = { - name = "commander"; - packageName = "commander"; - version = "2.11.0"; + "normalize-ssh-1.0.0" = { + name = "normalize-ssh"; + packageName = "normalize-ssh"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz"; - sha512 = "2yi2hwf0bghfnv1fdgd4wvh7s0acjrgqbgww97ncm6i6s6ffs1zahnj48f6gqpqj6fsf0jigvnr0civ25k2160c38281r80wvg7jkkg"; + url = "https://registry.npmjs.org/normalize-ssh/-/normalize-ssh-1.0.0.tgz"; + sha1 = "22a8308fa7cd932bdb49af74ecac644cf4a6196b"; }; }; - "diff-3.3.1" = { - name = "diff"; - packageName = "diff"; - version = "3.3.1"; + "normalize-url-2.0.1" = { + name = "normalize-url"; + packageName = "normalize-url"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz"; - sha512 = "31pj7v5gg5igmvwzk6zxw1wbvwjg6m9sfl0h3bs1x4q6idcw98vr8z8wcqk2603q0blpqkmkxp659kjj91wksr03yr8xlh16djcg8rh"; + url = "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz"; + sha512 = "0rykwifg14xfgm9m6md48rkqqxa2cya4xdsv7jjciacis2nz6dzaccpzyldlpvy14rvihpxbdiysfn49a8x8x5jw84klmxzh9di98qg"; }; }; - "growl-1.10.3" = { - name = "growl"; - packageName = "growl"; - version = "1.10.3"; + "not-bundled-npm-5.5.1" = { + name = "not-bundled-npm"; + packageName = "not-bundled-npm"; + version = "5.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz"; - sha512 = "3aibvz85l13j140w4jjdk8939q6r7dnf8ay2licxgkaaldk7wbm093c1p5g7k5cg80rl0xslmczyraawfgdr82hhxn7rfsm1rn6rac4"; + url = "https://registry.npmjs.org/not-bundled-npm/-/not-bundled-npm-5.5.1.tgz"; + sha512 = "1mzbw8sibjcs0c9ldxq90v7z5nrni5jz1khkbv7yvxf2gxqdp12b85fzs9qw3lrxjjcxk5w32rzadaz0q0llpqs72ikxcpi3i4wak9a"; }; }; - "he-1.1.1" = { - name = "he"; - packageName = "he"; - version = "1.1.1"; + "npm-bundled-1.0.3" = { + name = "npm-bundled"; + packageName = "npm-bundled"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/he/-/he-1.1.1.tgz"; - sha1 = "93410fd21b009735151f8868c2f271f3427e23fd"; + url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz"; + sha512 = "0xk8ky1cjf8q2wkbgfzplpn04sm9xnl6i71dwnc29rfh8m2glan5nd6l4k3q7ikci7xpwfpcmyy3frr873zndjmhbr344grkyh3f907"; }; }; - "supports-color-4.4.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "4.4.0"; + "npm-cache-filename-1.0.2" = { + name = "npm-cache-filename"; + packageName = "npm-cache-filename"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz"; - sha512 = "1flwwfdd7gg94xrc0b2ard3qjx4cpy600q49gx43y8pzvs7j56q78bjhv8mk18vgbggr4fd11jda8ck5cdrkc5jcjs04nlp7kwbg85c"; + url = "https://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz"; + sha1 = "ded306c5b0bfc870a9e9faf823bc5f283e05ae11"; }; }; - "optparse-1.0.5" = { - name = "optparse"; - packageName = "optparse"; - version = "1.0.5"; + "npm-install-checks-3.0.0" = { + name = "npm-install-checks"; + packageName = "npm-install-checks"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/optparse/-/optparse-1.0.5.tgz"; - sha1 = "75e75a96506611eb1c65ba89018ff08a981e2c16"; + url = "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-3.0.0.tgz"; + sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7"; }; }; - "slasp-0.0.4" = { - name = "slasp"; - packageName = "slasp"; - version = "0.0.4"; + "npm-lifecycle-1.0.3" = { + name = "npm-lifecycle"; + packageName = "npm-lifecycle"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/slasp/-/slasp-0.0.4.tgz"; - sha1 = "9adc26ee729a0f95095851a5489f87a5258d57a9"; + url = "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-1.0.3.tgz"; + sha512 = "0iapgirmdb46ia3apm6fsb9qv9c0hi4k9jflrxlgnrm0jhliqgas49lmpz06xafncx1sxgjngl0fw3gr472c7kapzdvpivf0fp5miqa"; }; }; - "fstream-1.0.11" = { - name = "fstream"; - packageName = "fstream"; - version = "1.0.11"; + "npm-lifecycle-2.0.0" = { + name = "npm-lifecycle"; + packageName = "npm-lifecycle"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz"; - sha1 = "5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"; + url = "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-2.0.0.tgz"; + sha512 = "1rwl5baayxqs7bcgbrjjbrl8lj46p9r4b4k9ad9gnkvgcs5ghsdr9fi6s4xmd0a9dlli0hfwf5mrd9h0rxmlh9zbn553lwfbp9wfkk8"; }; }; - "graceful-fs-4.1.11" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "4.1.11"; + "npm-package-arg-5.1.2" = { + name = "npm-package-arg"; + packageName = "npm-package-arg"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; - sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.1.2.tgz"; + sha512 = "36g1gm57qcvdgb4lm6ibl9pgma8lgx8l8i2jzap6w3v36wfzsqa7vb411zd26yp9rgcq23951vl5j6pac22qd5h9x7jm9raznnnr460"; + }; + }; + "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/npm-package-arg/-/npm-package-arg-6.0.0.tgz"; + sha512 = "15a1x3fjip5waxap8dbjkm88j0c2bcnay8pw14p74h1499wznynw2if91shrqlrbzwia09x4xiphp6wkxga5z8vf9k08bjarn1vn047"; + }; + }; + "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-pick-manifest-1.0.4" = { + name = "npm-pick-manifest"; + packageName = "npm-pick-manifest"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-1.0.4.tgz"; + sha512 = "02pmkjkn2nbr1ypwzwybyd6bfckdwr8cr0nah5bwadz21yd7cd9fbvxqalfdc41n88p1zv8qbgp149knkaixnrl8l7jnrwfxislvb1h"; + }; + }; + "npm-profile-2.0.5" = { + name = "npm-profile"; + packageName = "npm-profile"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-profile/-/npm-profile-2.0.5.tgz"; + sha512 = "2325avpmbzxl4vi1hxnxv96rw9j0y712ym3mph3hrsvgq4p8d0yh44vnja22plnw9vplskcx661j2spzqka65zsszzngvwm806skfdl"; + }; + }; + "npm-registry-client-8.5.0" = { + name = "npm-registry-client"; + packageName = "npm-registry-client"; + version = "8.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.5.0.tgz"; + sha512 = "1nwp5cfjmy4k14g6ziz7zpia8f66ximhrdhw49cj2w173bibq1sgc4d5w951ql5dqf0hcmia956ld9y7qs2q1fx6s2j446zhvdk0irn"; + }; + }; + "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"; + }; + }; + "npm-user-validate-1.0.0" = { + name = "npm-user-validate"; + packageName = "npm-user-validate"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-1.0.0.tgz"; + sha1 = "8ceca0f5cea04d4e93519ef72d0557a75122e951"; }; }; "npmlog-4.1.2" = { @@ -3091,103 +4990,22 @@ let sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs"; }; }; - "osenv-0.1.4" = { - name = "osenv"; - packageName = "osenv"; - version = "0.1.4"; + "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/osenv/-/osenv-0.1.4.tgz"; - sha1 = "42fe6d5953df06c8064be6f176c3d05aaaa34644"; + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; }; }; - "semver-5.3.0" = { - name = "semver"; - packageName = "semver"; - version = "5.3.0"; + "oauth-sign-0.8.2" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.8.2"; 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"; - }; - }; - "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"; - }; - }; - "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"; + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"; + sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; }; }; "object-assign-4.1.1" = { @@ -3199,67 +5017,94 @@ let sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; }; }; - "signal-exit-3.0.2" = { - name = "signal-exit"; - packageName = "signal-exit"; - version = "3.0.2"; + "object-keys-1.0.11" = { + name = "object-keys"; + packageName = "object-keys"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; - sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + url = "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz"; + sha1 = "c54601778ad560f1142ce0e01bcca8b56d13426d"; }; }; - "string-width-1.0.2" = { - name = "string-width"; - packageName = "string-width"; - version = "1.0.2"; + "object.getownpropertydescriptors-2.0.3" = { + name = "object.getownpropertydescriptors"; + packageName = "object.getownpropertydescriptors"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; - sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz"; + sha1 = "8758c846f5b407adab0f236e0986f14b051caa16"; }; }; - "strip-ansi-3.0.1" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "3.0.1"; + "object.omit-2.0.1" = { + name = "object.omit"; + packageName = "object.omit"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; - sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + url = "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz"; + sha1 = "1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"; }; }; - "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"; + "observatory-1.0.0" = { + name = "observatory"; + packageName = "observatory"; 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/observatory/-/observatory-1.0.0.tgz"; + sha1 = "2baa606e8299e6866914ec9c8a4db6a41136e59b"; }; }; - "number-is-nan-1.0.1" = { - name = "number-is-nan"; - packageName = "number-is-nan"; - version = "1.0.1"; + "once-1.4.0" = { + name = "once"; + packageName = "once"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha1 = "097b602b53422a522c1afb8790318336941a011d"; + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + }; + "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"; + }; + }; + "opener-1.4.3" = { + name = "opener"; + packageName = "opener"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/opener/-/opener-1.4.3.tgz"; + sha1 = "5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"; + }; + }; + "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"; + }; + }; + "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-locale-2.1.0" = { + name = "os-locale"; + packageName = "os-locale"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz"; + sha512 = "0lafrp0i2ajapsnma0x74q7zscn97a56i5hh58a0nyig2igfx9fqn4ain9kvjrr06as5gzdrv2wdf52qc5m861fd0f4cv69ghdjbjyy"; }; }; "os-tmpdir-1.0.2" = { @@ -3271,148 +5116,337 @@ let sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; }; }; - "block-stream-0.0.9" = { - name = "block-stream"; - packageName = "block-stream"; - version = "0.0.9"; + "osenv-0.1.4" = { + name = "osenv"; + packageName = "osenv"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz"; - sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a"; + url = "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz"; + sha1 = "42fe6d5953df06c8064be6f176c3d05aaaa34644"; }; }; - "isexe-2.0.0" = { - name = "isexe"; - packageName = "isexe"; + "overlap-2.0.0" = { + name = "overlap"; + packageName = "overlap"; version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; - sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + url = "https://registry.npmjs.org/overlap/-/overlap-2.0.0.tgz"; + sha1 = "b29b6bb2ad7569c4e66faef28cb5d74361179cb4"; }; }; - "nopt-4.0.1" = { - name = "nopt"; - packageName = "nopt"; - version = "4.0.1"; + "p-cancelable-0.3.0" = { + name = "p-cancelable"; + packageName = "p-cancelable"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz"; - sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; + url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz"; + sha512 = "35jir2yjv2l3v8aj062w0hfinzgwpb1sbhmaym8h4xn78j498naj7mkf4rpv74n5bfkysxb7l893l2yw3dpqk5dgb2yiwr8pcydjmj5"; }; }; - "rc-1.2.2" = { - name = "rc"; - packageName = "rc"; - version = "1.2.2"; + "p-defer-1.0.0" = { + name = "p-defer"; + packageName = "p-defer"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.2.2.tgz"; - sha1 = "d8ce9cb57e8d64d9c7badd9876c7c34cbe3c7077"; + url = "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz"; + sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"; }; }; - "request-2.81.0" = { - name = "request"; - packageName = "request"; - version = "2.81.0"; + "p-every-1.0.2" = { + name = "p-every"; + packageName = "p-every"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz"; - sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; + url = "https://registry.npmjs.org/p-every/-/p-every-1.0.2.tgz"; + sha1 = "4e01d85c23da19ed71a4afba319bdb4d94c85e00"; }; }; - "hawk-3.1.3" = { - name = "hawk"; - packageName = "hawk"; - version = "3.1.3"; + "p-filter-1.0.0" = { + name = "p-filter"; + packageName = "p-filter"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"; - sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4"; + url = "https://registry.npmjs.org/p-filter/-/p-filter-1.0.0.tgz"; + sha1 = "629d317150209c8fd508ba137713ef4bb920e9db"; }; }; - "semver-5.4.1" = { - name = "semver"; - packageName = "semver"; - version = "5.4.1"; + "p-finally-1.0.0" = { + name = "p-finally"; + packageName = "p-finally"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz"; - sha512 = "2r13vwvb5ick34k6flr7vgbjfsdka8zbj5a74rd0ba4bp0nqmhppbaw3qlwn7f4smpifpa4iy4hxj137y598rbvsmy3h0d8vxgvzwar"; + url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; + sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; }; }; - "detect-libc-1.0.3" = { - name = "detect-libc"; - packageName = "detect-libc"; - version = "1.0.3"; + "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/detect-libc/-/detect-libc-1.0.3.tgz"; - sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; + url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz"; + sha1 = "9c9456989e9f6588017b0434d56097675c3da05e"; }; }; - "tar-pack-3.4.1" = { - name = "tar-pack"; - packageName = "tar-pack"; - version = "3.4.1"; + "p-limit-1.2.0" = { + name = "p-limit"; + packageName = "p-limit"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.1.tgz"; - sha512 = "0mgk8jd55vr7i3i29r1skhxwwbqkqfz6mbr32r5nn8h6v5xns8d2rc7835y7wj0zmppckxai7nm8r4s65kkg6yhirnwx33yixn75x1w"; + url = "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz"; + sha512 = "2g0r6r6bbcdp6lrxbj2zbcihr1byd55kycm1ijz80l2zvmcvhqsbd7rhmfqylp004d61fibvmwzk4ig89dbyk4azpwgll7dllhsvwv3"; }; }; - "deep-extend-0.4.2" = { - name = "deep-extend"; - packageName = "deep-extend"; - version = "0.4.2"; + "p-locate-2.0.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz"; - sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f"; + url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz"; + sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43"; }; }; - "ini-1.3.5" = { - name = "ini"; - packageName = "ini"; - version = "1.3.5"; + "p-map-1.2.0" = { + name = "p-map"; + packageName = "p-map"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; - sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5"; + url = "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz"; + sha512 = "084pyivsr35xi3fdmpznf0c0nc9jz15hak8iyh3v24n25b376blg13ngb4mgpm71zdnfp9b17zbyn728z0jjz1r674k71hd4c0cmb5g"; }; }; - "strip-json-comments-2.0.1" = { - name = "strip-json-comments"; - packageName = "strip-json-comments"; + "p-queue-2.3.0" = { + name = "p-queue"; + packageName = "p-queue"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-queue/-/p-queue-2.3.0.tgz"; + sha1 = "65d55e71bc1500fc413122da98ae457ff8a7c038"; + }; + }; + "p-reduce-1.0.0" = { + name = "p-reduce"; + packageName = "p-reduce"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-reduce/-/p-reduce-1.0.0.tgz"; + sha1 = "18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"; + }; + }; + "p-series-1.0.0" = { + name = "p-series"; + packageName = "p-series"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-series/-/p-series-1.0.0.tgz"; + sha1 = "7ec9e7b4406cc32066298a6f9860e55e91b36e07"; + }; + }; + "p-timeout-2.0.1" = { + name = "p-timeout"; + packageName = "p-timeout"; version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; - sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + url = "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz"; + sha512 = "0h1wg3bw3pyf3vlnxxfnrs3h33lwbx5n1lz4cz8ivh7bi8vjd6makxf6p1xz1d70ww3gj2ghryhbg6w1myxacgirk51ym23qzksdizk"; }; }; - "aws-sign2-0.6.0" = { - name = "aws-sign2"; - packageName = "aws-sign2"; - version = "0.6.0"; + "p-try-1.0.0" = { + name = "p-try"; + packageName = "p-try"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"; - sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f"; + url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz"; + sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; }; }; - "form-data-2.1.4" = { - name = "form-data"; - packageName = "form-data"; - version = "2.1.4"; + "package-json-4.0.1" = { + name = "package-json"; + packageName = "package-json"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz"; - sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1"; + url = "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz"; + sha1 = "8869a0401253661c4c4ca3da6c2121ed555f5eed"; }; }; - "har-validator-4.2.1" = { - name = "har-validator"; - packageName = "har-validator"; - version = "4.2.1"; + "package-store-0.15.2" = { + name = "package-store"; + packageName = "package-store"; + version = "0.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz"; - sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a"; + url = "https://registry.npmjs.org/package-store/-/package-store-0.15.2.tgz"; + sha512 = "074xsl6ca8j68cvbh8gj3h846g9rxgcxwxhbryab9f72brc5lmcq3dcj80kbjbykkzgpikzxj4qdmvxzwrhj3bilgncbbm0ladlv17r"; }; }; - "http-signature-1.1.1" = { - name = "http-signature"; - packageName = "http-signature"; - version = "1.1.1"; + "pacote-6.0.4" = { + name = "pacote"; + packageName = "pacote"; + version = "6.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"; - sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf"; + url = "https://registry.npmjs.org/pacote/-/pacote-6.0.4.tgz"; + sha512 = "36bx0mnsvm3fvq0vbcl05j6fsjf4v4gks1hlxqyga0jxz491cis9y38j8q9cmmfdfbx9xaz3n3h93h0ik4bkn82rb3nz2413wk7xfxi"; + }; + }; + "pako-0.2.9" = { + name = "pako"; + packageName = "pako"; + version = "0.2.9"; + src = fetchurl { + url = "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz"; + sha1 = "f3f7522f4ef782348da8161bad9ecfd51bf83a75"; + }; + }; + "parallel-transform-1.1.0" = { + name = "parallel-transform"; + packageName = "parallel-transform"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz"; + sha1 = "d410f065b05da23081fcd10f28854c29bda33b06"; + }; + }; + "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"; + }; + }; + "parse-it-1.0.8" = { + name = "parse-it"; + packageName = "parse-it"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-it/-/parse-it-1.0.8.tgz"; + sha1 = "e9a53bde18c8049e7bb415b73e16d3292df8eae7"; + }; + }; + "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"; + }; + }; + "parse-json-4.0.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz"; + sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; + }; + }; + "parse-npm-tarball-url-1.0.2" = { + name = "parse-npm-tarball-url"; + packageName = "parse-npm-tarball-url"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-npm-tarball-url/-/parse-npm-tarball-url-1.0.2.tgz"; + sha512 = "26zvr85a2wbbkqrwzyy3226waj0p5z3vrh19gxxvkgxf98qgvl1jdz20hvsr20x5f1viwqm9n2yr8yi61kkb9h0cd1kszw2yv8542cs"; + }; + }; + "parse-url-1.3.11" = { + name = "parse-url"; + packageName = "parse-url"; + version = "1.3.11"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-url/-/parse-url-1.3.11.tgz"; + sha1 = "57c15428ab8a892b1f43869645c711d0e144b554"; + }; + }; + "path-absolute-1.0.0" = { + name = "path-absolute"; + packageName = "path-absolute"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-absolute/-/path-absolute-1.0.0.tgz"; + sha512 = "2fjzk70izrnlxrvqprakq310j8b1zcvsln7aji0qfljcl5is8c7aip8bc6ly07v8qg6l4rsrgzyj411rlbzyhmgnsiwzlnlhkr1lk5k"; + }; + }; + "path-exists-3.0.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz"; + sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; + }; + }; + "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-name-1.0.0" = { + name = "path-name"; + packageName = "path-name"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-name/-/path-name-1.0.0.tgz"; + sha1 = "8ca063a63de7982dfa95760edaffd10214494f24"; + }; + }; + "path-type-2.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz"; + sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73"; + }; + }; + "path-type-3.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz"; + sha512 = "2z1csf4c3fmlwl0ahk533z5zqkjdf36ccfx11kakl9xran9f5asxm4cxjq4lx1kwqdp8gki786cgpldvgrkvfc7pcvh07j5ssqm8rjg"; + }; + }; + "peek-stream-1.1.2" = { + name = "peek-stream"; + packageName = "peek-stream"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/peek-stream/-/peek-stream-1.1.2.tgz"; + sha1 = "97eb76365bcfd8c89e287f55c8b69d4c3e9bcc52"; }; }; "performance-now-0.2.0" = { @@ -3424,6 +5458,402 @@ let sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"; }; }; + "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"; + }; + }; + "pkgs-graph-2.0.0-0" = { + name = "pkgs-graph"; + packageName = "pkgs-graph"; + version = "2.0.0-0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkgs-graph/-/pkgs-graph-2.0.0-0.tgz"; + sha512 = "3p1llv78shph6qwba9p8vd14hxanjdp1zmzivmn94dzfff2diqkvsc0zar9pj40pl2fwkbqg3p266ilcjbj6ajhzn8kcpmir5fx2f0c"; + }; + }; + "pnpm-default-reporter-0.11.8" = { + name = "pnpm-default-reporter"; + packageName = "pnpm-default-reporter"; + version = "0.11.8"; + src = fetchurl { + url = "https://registry.npmjs.org/pnpm-default-reporter/-/pnpm-default-reporter-0.11.8.tgz"; + sha512 = "2x14yf0yi5q5dvq1777khbvah4wpcm92l4il946nq0f7nyra450llgp09q56161rk6qk6x7gr9hffii97c25b98a35pr7gwgc8yfrwz"; + }; + }; + "pnpm-file-reporter-0.0.1" = { + name = "pnpm-file-reporter"; + packageName = "pnpm-file-reporter"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pnpm-file-reporter/-/pnpm-file-reporter-0.0.1.tgz"; + sha1 = "f7c3e2164c5cc955a0b3ed661314e6357b3f2e63"; + }; + }; + "pnpm-install-checks-1.1.0" = { + name = "pnpm-install-checks"; + packageName = "pnpm-install-checks"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pnpm-install-checks/-/pnpm-install-checks-1.1.0.tgz"; + sha1 = "741d9979762fdfad93f3e469deb4a814d3430008"; + }; + }; + "pnpm-list-2.0.1" = { + name = "pnpm-list"; + packageName = "pnpm-list"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pnpm-list/-/pnpm-list-2.0.1.tgz"; + sha512 = "0rrmch43p1dncghmvb6mwv59c0gan88d87fdbvzsmg4lj6j5l4bkfrr5x6gmi9z8f4nf3lqddf5b5wg8l7bb5if6c5wknim1w3l2vlb"; + }; + }; + "pnpm-logger-0.0.0" = { + name = "pnpm-logger"; + packageName = "pnpm-logger"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pnpm-logger/-/pnpm-logger-0.0.0.tgz"; + sha1 = "28701b97618a1fc32d2fee1bf410746588bb1a85"; + }; + }; + "pnpm-shrinkwrap-5.1.1" = { + name = "pnpm-shrinkwrap"; + packageName = "pnpm-shrinkwrap"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pnpm-shrinkwrap/-/pnpm-shrinkwrap-5.1.1.tgz"; + sha512 = "0nrnbsdiq01q2383pib07a7hrc602bpl9sf2j05pmjk5xn7hipicp90jdwlzf36wln2bqjzi1zgv5a5fhw41zx3zfad6affppkf8c5d"; + }; + }; + "prebuild-install-2.5.0" = { + name = "prebuild-install"; + packageName = "prebuild-install"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-2.5.0.tgz"; + sha512 = "137vbrb6szyda92qg093yp1l6d2l4s1nb7c0dznjgbyrzsm252spxnrdpmj8nmf170fcq404pgsn0p65sxm4z74p2fyqyd415k742fz"; + }; + }; + "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"; + }; + }; + "prepend-http-2.0.0" = { + name = "prepend-http"; + packageName = "prepend-http"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz"; + sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897"; + }; + }; + "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-bytes-4.0.2" = { + name = "pretty-bytes"; + packageName = "pretty-bytes"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-4.0.2.tgz"; + sha1 = "b2bf82e7350d65c6c33aa95aaa5a4f6327f61cd9"; + }; + }; + "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"; + }; + }; + "printable-characters-1.0.38" = { + name = "printable-characters"; + packageName = "printable-characters"; + version = "1.0.38"; + src = fetchurl { + url = "https://registry.npmjs.org/printable-characters/-/printable-characters-1.0.38.tgz"; + sha1 = "76ef84accfd7f8366fb7138fb92466a916d599bc"; + }; + }; + "proc-output-1.0.6" = { + name = "proc-output"; + packageName = "proc-output"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/proc-output/-/proc-output-1.0.6.tgz"; + sha1 = "9ffcfb3ac6a156ee32b7ebd69f024a4f6d896350"; + }; + }; + "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-exists-3.0.0" = { + name = "process-exists"; + packageName = "process-exists"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/process-exists/-/process-exists-3.0.0.tgz"; + sha512 = "3lwxdzkx3bzfvb8qvrjccjdk90advh7p3j52d1b4hn3v2d7cf780k7wbvy94w6chgpq6lrrs6m0n122463q7g8z06aajbjqncq0db9h"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "promise-inflight-1.0.1" = { + name = "promise-inflight"; + packageName = "promise-inflight"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz"; + sha1 = "98472870bf228132fcbdd868129bad12c3c029e3"; + }; + }; + "promise-retry-1.1.1" = { + name = "promise-retry"; + packageName = "promise-retry"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz"; + sha1 = "6739e968e3051da20ce6497fb2b50f6911df3d6d"; + }; + }; + "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"; + }; + }; + "promzard-0.3.0" = { + name = "promzard"; + packageName = "promzard"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz"; + sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"; + }; + }; + "proper-lockfile-2.0.1" = { + name = "proper-lockfile"; + packageName = "proper-lockfile"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-2.0.1.tgz"; + sha1 = "159fb06193d32003f4b3691dd2ec1a634aa80d1d"; + }; + }; + "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"; + }; + }; + "protocols-1.4.6" = { + name = "protocols"; + packageName = "protocols"; + version = "1.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/protocols/-/protocols-1.4.6.tgz"; + sha1 = "f8bb263ea1b5fd7a7604d26b8be39bd77678bf8a"; + }; + }; + "protoduck-4.0.0" = { + name = "protoduck"; + packageName = "protoduck"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/protoduck/-/protoduck-4.0.0.tgz"; + sha1 = "fe4874d8c7913366cfd9ead12453a22cd3657f8e"; + }; + }; + "prr-1.0.1" = { + name = "prr"; + packageName = "prr"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz"; + sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476"; + }; + }; + "ps-list-4.0.0" = { + name = "ps-list"; + packageName = "ps-list"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ps-list/-/ps-list-4.0.0.tgz"; + sha1 = "57c8b3d38161ee8977811cd32a5dc52237fdb299"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "pumpify-1.4.0" = { + name = "pumpify"; + packageName = "pumpify"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pumpify/-/pumpify-1.4.0.tgz"; + sha512 = "1h37biy199n445y10vpyiswwcxv8zigfqp0b1xwgbyjq51f2dhjn1pcggjc4j5ccbd64l1ivfi0bqinx4m5clcawvwggy7jv93qsjfs"; + }; + }; + "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"; + }; + }; + "qrcode-terminal-0.11.0" = { + name = "qrcode-terminal"; + packageName = "qrcode-terminal"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qrcode-terminal/-/qrcode-terminal-0.11.0.tgz"; + sha1 = "ffc6c28a2fc0bfb47052b47e23f4f446a5fbdb9e"; + }; + }; "qs-6.4.0" = { name = "qs"; packageName = "qs"; @@ -3433,130 +5863,202 @@ let sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; }; }; - "ajv-4.11.8" = { - name = "ajv"; - packageName = "ajv"; - version = "4.11.8"; + "qs-6.5.1" = { + name = "qs"; + packageName = "qs"; + version = "6.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz"; - sha1 = "82ffb02b29e662ae53bdc20af15947706739c536"; + url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz"; + sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r"; }; }; - "har-schema-1.0.5" = { - name = "har-schema"; - packageName = "har-schema"; - version = "1.0.5"; + "query-string-5.0.1" = { + name = "query-string"; + packageName = "query-string"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz"; - sha1 = "d263135f43307c02c602afc8fe95970c0151369e"; + url = "https://registry.npmjs.org/query-string/-/query-string-5.0.1.tgz"; + sha512 = "0lcnspv96dv03600bgjxk2ypak8mysp77n47jkddpz6ldcgscwyan1akqjrddii4abb2brz6gr6yq9pcbdx63m9i16kk8m5028qrkv8"; }; }; - "json-stable-stringify-1.0.1" = { - name = "json-stable-stringify"; - packageName = "json-stable-stringify"; + "qw-1.0.1" = { + name = "qw"; + packageName = "qw"; 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/qw/-/qw-1.0.1.tgz"; + sha1 = "efbfdc740f9ad054304426acb183412cc8b996d4"; }; }; - "jsonify-0.0.0" = { - name = "jsonify"; - packageName = "jsonify"; - version = "0.0.0"; + "ramda-0.24.1" = { + name = "ramda"; + packageName = "ramda"; + version = "0.24.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"; - sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; + url = "https://registry.npmjs.org/ramda/-/ramda-0.24.1.tgz"; + sha1 = "c3b7755197f35b8dc3502228262c4c91ddb6b857"; }; }; - "assert-plus-0.2.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "0.2.0"; + "ramda-0.25.0" = { + name = "ramda"; + packageName = "ramda"; + version = "0.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"; - sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; + url = "https://registry.npmjs.org/ramda/-/ramda-0.25.0.tgz"; + sha512 = "1qixam46hr8jsw2f4g0rvhn8jf493dpjqhi65ggacz83ndqwnal1m8kiy18d3ak9x4lapcjb1fvrx18zj26jfhlxp51vhsghnnmyyhr"; }; }; - "hoek-2.16.3" = { - name = "hoek"; - packageName = "hoek"; - version = "2.16.3"; + "random-access-file-1.8.1" = { + name = "random-access-file"; + packageName = "random-access-file"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"; - sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; + url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.8.1.tgz"; + sha512 = "3pvi9knrjp8krj1hsg8i2qmv5097fid3qnyz4wh2dvpr37x2ga6qqk7afh5f1i5sb9dsw169bara13knccdmjwnivb62xgywz868j7r"; }; }; - "boom-2.10.1" = { - name = "boom"; - packageName = "boom"; - version = "2.10.1"; + "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/boom/-/boom-2.10.1.tgz"; - sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; + url = "https://registry.npmjs.org/random-access-memory/-/random-access-memory-2.4.0.tgz"; + sha1 = "72f3d865b4b55a259879473e2fb2de3569c69ee2"; }; }; - "cryptiles-2.0.5" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "2.0.5"; + "randomatic-1.1.7" = { + name = "randomatic"; + packageName = "randomatic"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"; - sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8"; + url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz"; + sha512 = "2is2kipfnz3hl4yxgqk07rll6956cq3zzf9cddai3f0lij5acq76v98qv14qkpljh1pqfsyb8p69xa9cyaww6p0j91s4vc9zj6594hg"; }; }; - "sntp-1.0.9" = { - name = "sntp"; - packageName = "sntp"; - version = "1.0.9"; + "randombytes-2.0.6" = { + name = "randombytes"; + packageName = "randombytes"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; - sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; + url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz"; + sha512 = "3a0zyz736klfzzpd9vwag3gznq7lrj57igm474dq279gsnyqdgfm1brhrs78ky30gsdwz9rwnjjms00fpdpp2p3x8p9mq2zbhw3k108"; }; }; - "fstream-ignore-1.0.5" = { - name = "fstream-ignore"; - packageName = "fstream-ignore"; - version = "1.0.5"; + "range-parser-1.2.0" = { + name = "range-parser"; + packageName = "range-parser"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz"; - sha1 = "9c31dae34767018fe1d249b24dada67d092da105"; + url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz"; + sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e"; }; }; - "uid-number-0.0.6" = { - name = "uid-number"; - packageName = "uid-number"; - version = "0.0.6"; + "rc-1.2.4" = { + name = "rc"; + packageName = "rc"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"; - sha1 = "0ea10e8035e8eb5b8e4449f06da1c730663baa81"; + url = "https://registry.npmjs.org/rc/-/rc-1.2.4.tgz"; + sha1 = "a0f606caae2a3b862bbd0ef85482c0125b315fa3"; }; }; - "async-2.1.5" = { - name = "async"; - packageName = "async"; - version = "2.1.5"; + "read-1.0.7" = { + name = "read"; + packageName = "read"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.1.5.tgz"; - sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc"; + url = "https://registry.npmjs.org/read/-/read-1.0.7.tgz"; + sha1 = "b3da19bd052431a97671d44a42634adf710b40c4"; }; }; - "cli-table-0.3.1" = { - name = "cli-table"; - packageName = "cli-table"; - version = "0.3.1"; + "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/cli-table/-/cli-table-0.3.1.tgz"; - sha1 = "f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"; + url = "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz"; + sha1 = "2d5d157786a37c055d22077c32c53f8329e91c7b"; }; }; - "commander-2.9.0" = { - name = "commander"; - packageName = "commander"; - version = "2.9.0"; + "read-installed-4.0.3" = { + name = "read-installed"; + packageName = "read-installed"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; - sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; + url = "https://registry.npmjs.org/read-installed/-/read-installed-4.0.3.tgz"; + sha1 = "ff9b8b67f187d1e4c29b9feb31f6b223acd19067"; + }; + }; + "read-package-json-2.0.12" = { + name = "read-package-json"; + packageName = "read-package-json"; + version = "2.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.12.tgz"; + sha512 = "15w2z3m1iysjf0zwvyc5mix8nypx42shx90alil4sslq6caj3pgk59zsn2ppxn95nls6bs7yw7khl5rmlq9gljv27w3vs2gxg9wigwv"; + }; + }; + "read-package-tree-5.1.6" = { + name = "read-package-tree"; + packageName = "read-package-tree"; + version = "5.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.1.6.tgz"; + sha512 = "0v1k32zqj8bnqzyp5h0jxnkvpgpzpa6z7iyqbpm3p0ylqafbb2zm656mw6gs16zf98l7y218ygpx2kzks00qcycwwx2cny67mlza98l"; + }; + }; + "read-pkg-2.0.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz"; + sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"; + }; + }; + "read-pkg-3.0.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz"; + sha1 = "9cbc686978fee65d16c00e2b19c237fcf6e38389"; + }; + }; + "read-pkg-up-2.0.0" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz"; + sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; + }; + }; + "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.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"; + }; + }; + "readdir-scoped-modules-1.0.2" = { + name = "readdir-scoped-modules"; + packageName = "readdir-scoped-modules"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz"; + sha1 = "9fafa37d286be5d92cbaebdee030dc9b5f406747"; }; }; "readdirp-2.1.0" = { @@ -3568,22 +6070,328 @@ let sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78"; }; }; - "lodash-4.17.4" = { - name = "lodash"; - packageName = "lodash"; - version = "4.17.4"; + "recursive-watch-1.1.2" = { + name = "recursive-watch"; + packageName = "recursive-watch"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"; - sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae"; + url = "https://registry.npmjs.org/recursive-watch/-/recursive-watch-1.1.2.tgz"; + sha1 = "912e2d62a83c8b388d288c4343495f247bc43f8e"; }; }; - "graceful-readlink-1.0.1" = { - name = "graceful-readlink"; - packageName = "graceful-readlink"; + "regenerator-runtime-0.11.1" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"; + sha512 = "03d4l8l8cyywh93wf5vw84lq56jh1b1d7jll4ny4z060j9hvx7w5q3q0b8q227jm93749k1c9h86r2pz0bm2xq5vp14g3r2kbvqc2rj"; + }; + }; + "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-escape-3.4.8" = { + name = "regex-escape"; + packageName = "regex-escape"; + version = "3.4.8"; + src = fetchurl { + url = "https://registry.npmjs.org/regex-escape/-/regex-escape-3.4.8.tgz"; + sha512 = "15ylzlxx4y88jldg7cgwv0dmw3ljpq27f9qf17d3g76dqh6ir1ig7dzvqv9nqpr3da1yd2r5ay8jqa6yk7ni5fbbrzgkhf3yha1av8c"; + }; + }; + "registry-auth-token-3.3.1" = { + name = "registry-auth-token"; + packageName = "registry-auth-token"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.1.tgz"; + sha1 = "fb0d3289ee0d9ada2cbb52af5dfe66cb070d3006"; + }; + }; + "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"; + }; + }; + "remedial-1.0.7" = { + name = "remedial"; + packageName = "remedial"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/remedial/-/remedial-1.0.7.tgz"; + sha1 = "d6674413a65676007be00dd400980987b2c300c1"; + }; + }; + "remove-all-except-outer-links-1.0.3" = { + name = "remove-all-except-outer-links"; + packageName = "remove-all-except-outer-links"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/remove-all-except-outer-links/-/remove-all-except-outer-links-1.0.3.tgz"; + sha512 = "27mlgakm2rw58mad07fnzfmjk893mr23qqi393b30qsqv2wyng86j0mqn1d06wi2cjzhlcq86zxzz1i3rvd58ajhq71crrm27dyblw7"; + }; + }; + "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"; + }; + }; + "rename-overwrite-1.0.0" = { + name = "rename-overwrite"; + packageName = "rename-overwrite"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rename-overwrite/-/rename-overwrite-1.0.0.tgz"; + sha1 = "b45a74ceb93d1073e31c5b701c428de5796523d8"; + }; + }; + "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"; + }; + }; + "replace-string-1.1.0" = { + name = "replace-string"; + packageName = "replace-string"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/replace-string/-/replace-string-1.1.0.tgz"; + sha1 = "87062117f823fe5800c306bacb2cfa359b935fea"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; - sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; + url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"; + sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; + }; + }; + "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-from-4.0.0" = { + name = "resolve-from"; + packageName = "resolve-from"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"; + sha512 = "3i345pdv74jb3xbprqb38xq1zfhsbxzm6b1h0mbcvhfpzz907m4amq35s0spijdj3phs508sha4cnr3incg4w8in4r0kd7ccmicrgx5"; + }; + }; + "resolve-link-target-1.0.1" = { + name = "resolve-link-target"; + packageName = "resolve-link-target"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-link-target/-/resolve-link-target-1.0.1.tgz"; + sha512 = "144pdhsw05w6zrwzh2daxd63x0qv6qgf5cimbkbvz9m4ncclp5z9xj6ym5ayhd6xvc2s7pwymj4x439k00czm5jz2h7z1dhgzipf9xs"; + }; + }; + "responselike-1.0.2" = { + name = "responselike"; + packageName = "responselike"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz"; + sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7"; + }; + }; + "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"; + }; + }; + "retry-0.10.1" = { + name = "retry"; + packageName = "retry"; + version = "0.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz"; + sha1 = "e76388d217992c252750241d3d3956fed98d8ff4"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "rimraf-then-1.0.1" = { + name = "rimraf-then"; + packageName = "rimraf-then"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf-then/-/rimraf-then-1.0.1.tgz"; + sha1 = "bd4458a79eb561b7548aaec0ac3753ef429fe70b"; + }; + }; + "run-queue-1.0.3" = { + name = "run-queue"; + packageName = "run-queue"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz"; + sha1 = "e848396f057d223f24386924618e25694161ec47"; + }; + }; + "rusha-0.8.12" = { + name = "rusha"; + packageName = "rusha"; + version = "0.8.12"; + src = fetchurl { + url = "https://registry.npmjs.org/rusha/-/rusha-0.8.12.tgz"; + sha1 = "5d838ce1fce8b145674ee771eaad5bcb2575e64b"; + }; + }; + "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"; + }; + }; + "sec-1.0.0" = { + name = "sec"; + packageName = "sec"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sec/-/sec-1.0.0.tgz"; + sha1 = "033d60a3ad20ecf2e00940d14f97823465774335"; + }; + }; + "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.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"; + }; + }; + "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"; + }; + }; + "semver-regex-1.0.0" = { + name = "semver-regex"; + packageName = "semver-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver-regex/-/semver-regex-1.0.0.tgz"; + sha1 = "92a4969065f9c70c694753d55248fc68f8f652c9"; + }; + }; + "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" = { @@ -3595,6 +6403,1455 @@ let sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"; }; }; + "sha-2.0.1" = { + name = "sha"; + packageName = "sha"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sha/-/sha-2.0.1.tgz"; + sha1 = "6030822fbd2c9823949f8f72ed6411ee5cf25aae"; + }; + }; + "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"; + }; + }; + "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-get-1.4.3" = { + name = "simple-get"; + packageName = "simple-get"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-get/-/simple-get-1.4.3.tgz"; + sha1 = "e9755eda407e96da40c5e5158c9ea37b33becbeb"; + }; + }; + "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"; + }; + }; + "slide-1.1.6" = { + name = "slide"; + packageName = "slide"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz"; + sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; + }; + }; + "smart-buffer-1.1.15" = { + name = "smart-buffer"; + packageName = "smart-buffer"; + version = "1.1.15"; + src = fetchurl { + url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-1.1.15.tgz"; + sha1 = "7f114b5b65fab3e2a35aa775bb12f0d1c649bf16"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "socks-1.1.10" = { + name = "socks"; + packageName = "socks"; + version = "1.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/socks/-/socks-1.1.10.tgz"; + sha1 = "5b8b7fc7c8f341c53ed056e929b7bf4de8ba7b5a"; + }; + }; + "socks-proxy-agent-3.0.1" = { + name = "socks-proxy-agent"; + packageName = "socks-proxy-agent"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-3.0.1.tgz"; + sha512 = "2a5lsw4fry6nqk3jdxvwqrnpasypvl8c4d0kg32912820lc72l7s9jzidfsrn2an9c66xqicspxb2vnir5cjspprs9qklxnd75060b7"; + }; + }; + "sodium-javascript-0.5.4" = { + name = "sodium-javascript"; + packageName = "sodium-javascript"; + version = "0.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sodium-javascript/-/sodium-javascript-0.5.4.tgz"; + sha512 = "1dqdzm0qjk1rwq62b010b649wdpvlzdxpmwc972p0dcwsc86wqfcm8lbdcxlrwypkn2jq5df1xpbxhxfphnpr993ac543p9s212si30"; + }; + }; + "sodium-native-2.1.4" = { + name = "sodium-native"; + packageName = "sodium-native"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.4.tgz"; + sha512 = "3d3bbjycbpplxgjpfz78vqr8g8hp62j37hr4c3vym7ax36qzxqan73fmqw2i3wd8ix65ysdlzbnzhrs3634ngp840gfpmm9alarc80j"; + }; + }; + "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"; + }; + }; + "sort-keys-2.0.0" = { + name = "sort-keys"; + packageName = "sort-keys"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz"; + sha1 = "658535584861ec97d730d6cf41822e1f56684128"; + }; + }; + "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-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"; + }; + }; + "sorted-object-2.0.1" = { + name = "sorted-object"; + packageName = "sorted-object"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sorted-object/-/sorted-object-2.0.1.tgz"; + sha1 = "7d631f4bd3a798a24af1dffcfbfe83337a5df5fc"; + }; + }; + "sorted-union-stream-2.1.3" = { + name = "sorted-union-stream"; + packageName = "sorted-union-stream"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sorted-union-stream/-/sorted-union-stream-2.1.3.tgz"; + sha1 = "c7794c7e077880052ff71a8d4a2dbb4a9a638ac7"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "spawno-2.0.7" = { + name = "spawno"; + packageName = "spawno"; + version = "2.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/spawno/-/spawno-2.0.7.tgz"; + sha512 = "0h8xflvrqwdvz8gadif970wlj5mby4vxhar40h0g96ld6qv6b696msspl89rs2l6n8zv3d9yd5lm85v1g5qk7fpjhqiai2862anzyrc"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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-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.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"; + }; + }; + "ssri-4.1.6" = { + name = "ssri"; + packageName = "ssri"; + version = "4.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/ssri/-/ssri-4.1.6.tgz"; + sha512 = "283n1p781cl2pj3jk32blcvwjdlaixng0v5x2f9qi3ndxrmyg3hk4clsjpcfsszkymy40q426yz5skax4ivsmll2p9hhcc00ivc4ijr"; + }; + }; + "ssri-5.0.0" = { + name = "ssri"; + packageName = "ssri"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssri/-/ssri-5.0.0.tgz"; + sha512 = "0g0vz6pdy8f13fqnadimwxx39hq1ix1my6gv0cm308vpv7i06f7gk4ywp7q9aw5sbhrakf86x37ai9fn2y4jvw6lashjw8h5bih6vzg"; + }; + }; + "ssri-5.1.0" = { + name = "ssri"; + packageName = "ssri"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssri/-/ssri-5.1.0.tgz"; + sha512 = "11f7imn7d4s1vs4z45yk8gkis18gbb5qn1z4v5liidy6vwairj5426xciyk10yh3gnxj77bkamzffip8v7v9mjr8ggs8h1iz3qw5ssd"; + }; + }; + "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"; + }; + }; + "stacktracey-1.2.100" = { + name = "stacktracey"; + packageName = "stacktracey"; + version = "1.2.100"; + src = fetchurl { + url = "https://registry.npmjs.org/stacktracey/-/stacktracey-1.2.100.tgz"; + sha1 = "9e32c7a7fa643eaf69a8f9572361339a8afb6b59"; + }; + }; + "static-methods-1.0.10" = { + name = "static-methods"; + packageName = "static-methods"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/static-methods/-/static-methods-1.0.10.tgz"; + sha512 = "2vn92wnri9w5d8san58a7nyyz1ai56gl2qaic9w430bbyyscw98k0a89h3nhk3fkpg9p47hdizwmgp4cnx2g6kxjgk7la5mclk7vb2y"; + }; + }; + "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"; + }; + }; + "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-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-iterate-1.2.0" = { + name = "stream-iterate"; + packageName = "stream-iterate"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-iterate/-/stream-iterate-1.2.0.tgz"; + sha1 = "2bd7c77296c1702a46488b8ad41f79865eecd4e1"; + }; + }; + "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"; + }; + }; + "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-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.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-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-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-color-0.1.0" = { + name = "strip-color"; + packageName = "strip-color"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-color/-/strip-color-0.1.0.tgz"; + sha1 = "106f65d3d3e6a2d9401cac0eb0ce8b8a702b4f7b"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "supi-0.12.1" = { + name = "supi"; + packageName = "supi"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/supi/-/supi-0.12.1.tgz"; + sha512 = "1fb6fkng687rhx89agz3mqa854p424b8nwj1ix6ckfv40gnkz3saydxs0di4nildpccn2rgwf01flxk922pj2rap6wqg8fdr2c8crz7"; + }; + }; + "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.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"; + }; + }; + "symbol-observable-1.1.0" = { + name = "symbol-observable"; + packageName = "symbol-observable"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.1.0.tgz"; + sha512 = "19pk4fk1ddq50all5c15bb58iwchzck5lvmsvlx5va17sfrq89pda0qrrnlma34m1kzay4q3k3ghmfp32hlqvk8njlfnhvavdvj42km"; + }; + }; + "symlink-dir-1.1.2" = { + name = "symlink-dir"; + packageName = "symlink-dir"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/symlink-dir/-/symlink-dir-1.1.2.tgz"; + sha512 = "2bzpdrkxnd1iysdlc7n6i5pqwqm98s2m2srfp9br9872qdvv8pbnm3i7r27rqxbad6pypj2lzhkxf8zghfzp3psl9psk9bkbp02yw8r"; + }; + }; + "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.0.2" = { + name = "tar"; + packageName = "tar"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-4.0.2.tgz"; + sha512 = "1mm9s6jly4lwfv9cak7kpiagqx3j6n1dh50k7nlnqy761ckfvn394asfgq1vdnxpjr164h5ybgcfysr8wgm70bwd0y3qnq4w3i8smg2"; + }; + }; + "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"; + }; + }; + "tasklist-3.1.0" = { + name = "tasklist"; + packageName = "tasklist"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tasklist/-/tasklist-3.1.0.tgz"; + sha1 = "873a98a4e45cbdecfa2c2ee18865353057e63696"; + }; + }; + "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-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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "timeout-then-1.1.0" = { + name = "timeout-then"; + packageName = "timeout-then"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/timeout-then/-/timeout-then-1.1.0.tgz"; + sha1 = "0145b06070159c17e2146fd292b01a1bd81e5fbc"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "typpy-2.0.0" = { + name = "typpy"; + packageName = "typpy"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/typpy/-/typpy-2.0.0.tgz"; + sha1 = "adef3bacc12ff47aff920fab03a8ff3279d737d6"; + }; + }; + "typpy-2.3.10" = { + name = "typpy"; + packageName = "typpy"; + version = "2.3.10"; + src = fetchurl { + url = "https://registry.npmjs.org/typpy/-/typpy-2.3.10.tgz"; + sha512 = "2m116608xyx0v7pl2hwvw0z7gw1yyxqx7yhp0l3a2nxrlsn7xav33rnys72xrc6jr0dwsg0r71f7qj42pdzgza15fz8l5wphycr5a0c"; + }; + }; + "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"; + }; + }; + "uint64be-2.0.1" = { + name = "uint64be"; + packageName = "uint64be"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uint64be/-/uint64be-2.0.1.tgz"; + sha1 = "a310d94e4e5e0b02a95d678e33323f802bdc8428"; + }; + }; + "ul-5.0.0" = { + name = "ul"; + packageName = "ul"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ul/-/ul-5.0.0.tgz"; + sha1 = "ca80d793025f3fd5dc9bf83469818d310a7c9a62"; + }; + }; + "ul-5.2.13" = { + name = "ul"; + packageName = "ul"; + version = "5.2.13"; + src = fetchurl { + url = "https://registry.npmjs.org/ul/-/ul-5.2.13.tgz"; + sha1 = "9ff0504ea35ca1f74c0bf59e6480def009bad7b5"; + }; + }; + "umask-1.1.0" = { + name = "umask"; + packageName = "umask"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/umask/-/umask-1.1.0.tgz"; + sha1 = "f29cebf01df517912bb58ff9c4e50fde8e33320d"; + }; + }; + "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"; + }; + }; + "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-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"; + }; + }; + "unpack-stream-3.0.1" = { + name = "unpack-stream"; + packageName = "unpack-stream"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unpack-stream/-/unpack-stream-3.0.1.tgz"; + sha512 = "3m37z48fshadh46ay1hibdw9fawz3rgx1c16wx63mgplka0bs71364xnn72awwzc83dns0gkhnv3slmk071k1mdrm1bzvbi8z1br8f9"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "update-notifier-2.2.0" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.2.0.tgz"; + sha1 = "1b5837cf90c0736d88627732b661c138f86de72f"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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-extend-1.0.3" = { + name = "util-extend"; + packageName = "util-extend"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/util-extend/-/util-extend-1.0.3.tgz"; + sha1 = "a7c216d267545169637b3b6edc6ca9119e2ff93f"; + }; + }; + "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.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"; + }; + }; + "utp-native-1.6.2" = { + name = "utp-native"; + packageName = "utp-native"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/utp-native/-/utp-native-1.6.2.tgz"; + sha512 = "2mcnn6w5as2dvz6rj4fb33174z3a1rl9bm2cfazrr4084gq7aal0bkmkwr1cjpkvy1zgni3zdk0570fx7cmnd0k0hg18wfb2hvbigfg"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "version-selector-type-2.0.0" = { + name = "version-selector-type"; + packageName = "version-selector-type"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/version-selector-type/-/version-selector-type-2.0.0.tgz"; + sha512 = "3n7bidjd5r4lph1qq3sz6kyjk3isb2hjvvaccsqqsspphm2in151xgga6lzjimydbvl9a6cr9jy8q06qdgvalq4nxyggs1v49i150qm"; + }; + }; + "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"; + }; + }; + "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-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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "worker-farm-1.5.2" = { + name = "worker-farm"; + packageName = "worker-farm"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.5.2.tgz"; + sha512 = "28xgfshjpa79hz7v39axfrfnjhhjl371w30vy7dhs0kdzsdd42xi8lz85yjs2m0fp481iydiwscsy61gr99igkmkak7xrjd8vv9062z"; + }; + }; + "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"; + }; + }; + "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-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.1.0" = { + name = "write-file-atomic"; + packageName = "write-file-atomic"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.1.0.tgz"; + sha512 = "0jpbx5znf640m7icywa21hdgyss5h6c811z27mzk7mh1yhv8sqcqd2y0cwgkrnigx57k2chv5cqwv0z8ff8z32gpdw8jw5imz8pcdni"; + }; + }; + "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"; + }; + }; + "write-yaml-file-1.0.0" = { + name = "write-yaml-file"; + packageName = "write-yaml-file"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/write-yaml-file/-/write-yaml-file-1.0.0.tgz"; + sha1 = "7b4bd0df72ca13fbe9d6b0178fd83c077b8ea86b"; + }; + }; + "x256-0.0.2" = { + name = "x256"; + packageName = "x256"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/x256/-/x256-0.0.2.tgz"; + sha1 = "c9af18876f7a175801d564fe70ad9e8317784934"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "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-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"; + }; + }; + "zen-observable-0.7.1" = { + name = "zen-observable"; + packageName = "zen-observable"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/zen-observable/-/zen-observable-0.7.1.tgz"; + sha512 = "134nwk2ggcx46rx0n2cy1fqmlixar7c4sygxkym7kpd8wkqvdnlg1win4kns4zcxx99mxmbpr57jppq8bkva5z2ladfmjdl4wqrb3iq"; + }; + }; + "zen-push-0.2.1" = { + name = "zen-push"; + packageName = "zen-push"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/zen-push/-/zen-push-0.2.1.tgz"; + sha512 = "3bx83jgamf9vq3n0150j5h8ndbxck5psnhw21fwifmq7jz37vcmlm7wmirbxh824jhq3kv16lc4h6iki1kwxx0zsjwyf8hrryyjmzj2"; + }; + }; }; in { @@ -3635,28 +7892,96 @@ in dat = nodeEnv.buildNodePackage { name = "dat"; packageName = "dat"; - version = "13.9.2"; + version = "13.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/dat/-/dat-13.9.2.tgz"; - sha512 = "05x3ij83al1f0r7fiaq788q4k81vlbmydsa1g829pq0q6795p57b12mmmx8nvc8khbbv1iphr065c7h3d7kc9ylps39xn1qdg64jz90"; + 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.0" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.0" + 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.6.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.8" + (sources."braces-1.8.5" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."buffer-alloc-unsafe-1.0.0" + sources."buffer-equals-1.0.4" + sources."buffer-indexof-1.1.1" + sources."bulk-write-stream-1.1.3" sources."bytes-3.0.0" + sources."call-me-maybe-1.0.1" + sources."caseless-0.12.0" sources."chalk-2.3.0" sources."cli-truncate-1.1.0" + sources."cliclopts-1.1.1" + sources."co-4.6.0" + sources."codecs-1.2.0" + sources."color-convert-1.9.1" + sources."color-name-1.1.3" + sources."colors-1.1.2" + sources."combined-stream-1.0.5" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.0" + 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."lru-2.0.1" + sources."pump-1.0.3" ]; }) - sources."dat-encoding-4.0.2" + sources."dat-encoding-5.0.1" + sources."dat-ignore-2.0.0" (sources."dat-json-1.0.1" // { dependencies = [ + sources."dat-encoding-4.0.2" sources."debug-2.6.9" ]; }) - (sources."dat-link-resolve-1.1.1" // { + (sources."dat-link-resolve-2.1.0" // { dependencies = [ sources."debug-2.6.9" ]; @@ -3664,63 +7989,22 @@ in sources."dat-log-1.1.1" (sources."dat-node-3.5.6" // { dependencies = [ - (sources."dat-link-resolve-2.1.0" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."dat-encoding-5.0.1" - sources."varint-5.0.0" - sources."readable-stream-1.0.34" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" sources."minimist-0.0.8" - sources."esprima-1.0.4" - sources."estraverse-1.3.2" - sources."object-keys-0.4.0" + sources."pump-1.0.3" sources."unordered-set-2.0.0" + sources."varint-5.0.0" ]; }) sources."dat-registry-4.0.0" - sources."debug-3.1.0" - (sources."neat-log-1.1.2" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."prettier-bytes-1.0.4" - sources."progress-string-1.2.2" - (sources."prompt-1.0.0" // { - dependencies = [ - sources."async-1.0.0" - ]; - }) - sources."pump-1.0.3" - sources."rimraf-2.6.2" - sources."speedometer-1.0.0" - (sources."subcommand-2.1.0" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - (sources."throttle-1.0.3" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."xtend-4.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."slice-ansi-1.0.0" - sources."string-width-2.1.1" - sources."is-fullwidth-code-point-2.0.0" - sources."strip-ansi-4.0.0" - sources."ansi-regex-3.0.0" + sources."dat-secret-storage-4.0.0" + sources."dat-storage-1.0.3" + 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.4.7" (sources."discovery-swarm-4.4.2" // { dependencies = [ sources."thunky-0.1.0" @@ -3731,133 +8015,53 @@ in sources."thunky-0.1.0" ]; }) - sources."minimist-1.2.0" - sources."thunky-1.0.2" - sources."ms-2.0.0" - sources."buffer-equals-1.0.4" - sources."connections-1.4.2" - sources."discovery-channel-5.4.6" - sources."length-prefixed-message-3.0.3" - sources."to-buffer-1.1.0" - sources."utp-native-1.6.2" - (sources."bittorrent-dht-7.8.2" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) - sources."pretty-hash-1.0.1" - sources."bencode-1.0.0" - sources."inherits-2.0.3" - sources."k-bucket-3.3.1" - sources."k-rpc-4.2.1" - sources."lru-3.1.0" - sources."randombytes-2.0.5" - sources."safe-buffer-5.1.1" - sources."simple-sha1-2.1.0" - sources."k-rpc-socket-1.7.2" - sources."rusha-0.8.9" - sources."varint-3.0.1" - sources."nan-2.8.0" - sources."node-gyp-build-3.2.2" - 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."util-deprecate-1.0.2" - sources."dns-socket-1.6.2" + sources."dns-packet-1.3.1" + sources."dns-socket-1.6.3" sources."dns-txt-2.0.2" - sources."multicast-dns-6.2.1" - sources."network-address-1.1.2" - sources."unordered-set-1.1.0" - sources."dns-packet-1.2.2" - sources."ip-1.1.5" - sources."buffer-indexof-1.1.1" - sources."toiletdb-1.4.0" - sources."last-one-wins-1.0.4" - sources."dat-dns-1.3.2" - sources."nets-3.2.0" - sources."call-me-maybe-1.0.1" - sources."concat-stream-1.6.0" - sources."typedarray-0.0.6" - sources."request-2.83.0" - sources."xhr-2.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."dom-walk-0.1.1" + sources."duplexify-3.5.3" + 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."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.5.2" - sources."har-schema-2.0.0" - sources."co-4.6.0" + sources."extglob-0.3.2" + sources."extsprintf-1.3.0" + sources."eyes-0.1.8" 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-4.3.1" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) - 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."global-4.3.2" - sources."is-function-1.0.1" - sources."parse-headers-2.0.1" - sources."min-document-2.19.0" - sources."process-0.5.2" - sources."dom-walk-0.1.1" + 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."trim-0.0.1" - sources."random-access-memory-2.4.0" - sources."dat-ignore-2.0.0" - (sources."dat-storage-1.0.3" // { + sources."for-in-1.0.2" + sources."for-own-0.1.5" + sources."forever-agent-0.6.1" + sources."form-data-2.3.1" + 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-2.0.0" + sources."hawk-6.0.2" + sources."hoek-4.2.0" + sources."http-methods-0.1.0" + sources."http-signature-1.2.0" + (sources."hypercore-6.12.0" // { dependencies = [ - sources."xtend-2.1.2" - sources."readable-stream-2.3.3" - sources."isarray-1.0.0" - sources."string_decoder-1.0.3" + sources."varint-5.0.0" ]; }) - sources."dat-swarm-defaults-1.0.0" - (sources."hyperdrive-9.12.0" // { + sources."hypercore-protocol-6.5.2" + (sources."hyperdrive-9.12.2" // { dependencies = [ - sources."readable-stream-2.3.3" - sources."isarray-1.0.0" - sources."string_decoder-1.0.3" sources."varint-4.0.1" ]; }) @@ -3867,48 +8071,103 @@ in sources."debug-2.6.9" ]; }) - (sources."mirror-folder-2.1.1" // { + 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.2.1" + sources."k-rpc-socket-1.7.2" + 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.30.0" + sources."mime-types-2.1.17" + 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-6.2.2" + sources."multicb-1.2.2" + sources."mute-stream-0.0.7" + sources."mutexify-1.2.0" + sources."nan-2.8.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."readable-stream-2.3.3" - sources."isarray-1.0.0" - sources."string_decoder-1.0.3" + sources."ansi-regex-2.1.1" ]; }) - sources."multicb-1.2.2" + sources."nets-3.2.0" + sources."network-address-1.1.2" + sources."node-gyp-build-3.2.2" + 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-1.0.7" + 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-1.8.1" // { dependencies = [ sources."debug-2.6.9" ]; }) - sources."sparse-bitfield-3.0.3" - sources."stream-each-1.2.2" - sources."untildify-3.0.2" - sources."anymatch-1.3.2" - 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" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) - sources."expand-brackets-0.1.5" - sources."extglob-0.3.2" - sources."filename-regex-2.0.1" - sources."is-extglob-1.0.0" - sources."is-glob-2.0.1" - sources."kind-of-3.2.2" - sources."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-2.1.0" - sources."isobject-2.1.0" + sources."random-access-memory-2.4.0" (sources."randomatic-1.1.7" // { dependencies = [ (sources."is-number-3.0.0" // { @@ -3918,157 +8177,87 @@ in }) ]; }) - 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."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."randombytes-2.0.6" + sources."range-parser-1.2.0" + sources."read-1.0.7" + sources."readable-stream-2.3.3" + sources."recursive-watch-1.1.2" + sources."regex-cache-0.4.4" sources."remove-trailing-separator-1.1.0" - (sources."append-tree-2.4.0" // { + sources."repeat-element-1.1.2" + sources."repeat-string-1.6.1" + sources."request-2.83.0" + sources."revalidator-0.1.8" + sources."rimraf-2.6.2" + sources."rusha-0.8.12" + 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.4" + sources."sodium-native-2.1.4" + 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.13.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.0.3" + sources."stringstream-0.0.5" + sources."strip-ansi-4.0.0" + (sources."subcommand-2.1.0" // { dependencies = [ - sources."xtend-4.0.1" + sources."debug-2.6.9" ]; }) - sources."dat-secret-storage-4.0.0" - sources."multi-random-access-2.1.1" - sources."array-lru-1.1.1" - sources."brfs-1.4.3" - sources."codecs-1.2.0" - sources."from2-2.3.0" - sources."mutexify-1.2.0" - sources."protocol-buffers-3.2.1" - sources."quote-stream-1.0.2" - sources."resolve-1.5.0" - (sources."static-module-1.5.0" // { + sources."supports-color-4.5.0" + (sources."throttle-1.0.3" // { dependencies = [ - sources."quote-stream-0.0.0" - sources."through2-0.4.2" + sources."debug-2.6.9" ]; }) sources."through2-2.0.3" - sources."buffer-equal-0.0.1" - sources."path-parse-1.0.5" - (sources."duplexer2-0.0.2" // { - dependencies = [ - sources."readable-stream-1.1.14" - ]; - }) - sources."escodegen-1.3.3" - sources."falafel-2.1.0" - sources."has-1.0.1" - sources."object-inspect-0.4.0" - sources."shallow-copy-0.0.1" - (sources."static-eval-0.2.4" // { - dependencies = [ - sources."escodegen-0.0.28" - ]; - }) - sources."esutils-1.0.0" - sources."estraverse-1.5.1" - sources."esprima-1.1.1" - sources."source-map-0.1.43" - sources."amdefine-1.0.1" - sources."acorn-5.2.1" - sources."foreach-2.0.5" - sources."object-keys-1.0.11" - sources."function-bind-1.1.1" - sources."generate-function-2.0.0" - sources."generate-object-property-1.2.0" - sources."protocol-buffers-schema-3.3.2" - sources."signed-varint-2.0.1" - sources."is-property-1.0.2" - sources."os-homedir-1.0.2" - sources."abstract-random-access-1.1.2" - sources."sorted-array-functions-1.0.0" - sources."duplexify-3.5.1" - (sources."hypercore-6.11.0" // { - dependencies = [ - sources."varint-5.0.0" - ]; - }) - sources."sodium-universal-2.0.0" - sources."stream-collector-1.0.1" + sources."thunky-1.0.2" + sources."to-buffer-1.1.0" + sources."toiletdb-1.4.1" + sources."tough-cookie-2.3.3" + 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.1" sources."unixify-1.0.0" - sources."end-of-stream-1.4.0" - sources."stream-shift-1.0.0" - sources."once-1.4.0" - sources."wrappy-1.0.2" - sources."atomic-batcher-1.0.2" - sources."bitfield-rle-2.1.0" - sources."bulk-write-stream-1.1.3" - sources."flat-tree-1.6.0" - sources."hypercore-protocol-6.4.2" - sources."memory-pager-1.1.0" - sources."merkle-tree-stream-3.0.3" sources."unordered-array-remove-1.0.2" - sources."sorted-indexof-1.0.0" - sources."sodium-javascript-0.5.4" - sources."sodium-native-2.1.2" - sources."blake2b-2.1.2" - sources."nanoassert-1.1.0" - sources."siphash24-1.1.0" - sources."xsalsa20-1.0.2" - sources."blake2b-wasm-1.1.4" - sources."base64-to-uint8array-1.0.0" - sources."corsify-2.1.0" - sources."directory-index-html-2.1.0" - sources."mime-1.6.0" - sources."range-parser-1.2.0" - sources."http-methods-0.1.0" - sources."content-types-0.1.0" - sources."body-0.1.0" - sources."iterators-0.1.0" - sources."ap-0.1.0" - sources."fd-read-stream-1.1.0" - sources."recursive-watch-1.1.2" - sources."ttl-1.3.1" - sources."buffer-alloc-unsafe-1.0.0" - sources."mkdirp-0.5.1" - sources."township-client-1.3.2" - sources."is-string-1.0.4" - sources."lodash.throttle-4.1.1" - sources."nanobus-3.3.0" - sources."status-logger-3.1.1" - sources."nanotiming-1.0.1" - sources."ansi-diff-stream-1.2.0" - sources."lodash.flattendeep-4.4.0" - sources."wrap-ansi-3.0.1" - sources."colors-1.1.2" - sources."pkginfo-0.4.1" - sources."read-1.0.7" - sources."revalidator-0.1.8" + 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.6.2" + 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."mute-stream-0.0.7" - sources."async-0.9.2" - sources."deep-equal-0.2.2" - sources."i-0.3.6" - sources."ncp-1.0.1" - sources."cycle-1.0.3" - sources."eyes-0.1.8" - sources."stack-trace-0.0.10" - 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."cliclopts-1.1.1" - sources."stream-parser-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 = { @@ -4088,21 +8277,21 @@ in sha1 = "562b119ebb069ddb464ace2845501be97b35b6a8"; }; dependencies = [ + sources."abbrev-1.1.1" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.8" + sources."concat-map-0.0.1" 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."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."abbrev-1.1.1" ]; buildInputs = globalBuildInputs; meta = { @@ -4116,35 +8305,35 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "4.0.1"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-4.0.1.tgz"; - sha512 = "07hbr2w894az0s1hi6lglls00nwb941ymwm580q4917kwcmsg3ngagqf9cfxyjdwwivm956dpwzsrkbk4i7a404i56w1y809a3fdw3s"; + url = "https://registry.npmjs.org/mocha/-/mocha-5.0.0.tgz"; + sha512 = "3rxvm15qz9qdiyihc9pq4kc008iz89cqdqjlca43swmk3fc7bydlaqk1qyhaj19r5m8cxxrpiwxz5cwrp9im26fin4sgqdfbxs7ch5s"; }; dependencies = [ + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.8" sources."browser-stdout-1.3.0" sources."commander-2.11.0" + sources."concat-map-0.0.1" sources."debug-3.1.0" sources."diff-3.3.1" 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."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."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."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" ]; buildInputs = globalBuildInputs; meta = { @@ -4185,109 +8374,109 @@ in sha1 = "9bfbe54562286284838e750eac05295853fa1c60"; }; dependencies = [ - sources."fstream-1.0.11" - 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."inflight-1.0.6" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."wrappy-1.0.2" - sources."brace-expansion-1.1.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."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."ajv-5.5.2" sources."ansi-regex-2.1.1" - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" + 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.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.5.2" - 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."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.8" + sources."caseless-0.12.0" + sources."co-4.6.0" + sources."code-point-at-1.1.0" + sources."combined-stream-1.0.5" + 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."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."delayed-stream-1.0.0" + sources."delegates-1.0.0" 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."extend-3.0.1" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.1" + 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.0" + 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.30.0" + sources."mime-types-2.1.17" + 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.4" + sources."path-is-absolute-1.0.1" + sources."performance-now-2.1.0" + sources."process-nextick-args-1.0.7" + sources."punycode-1.4.1" + sources."qs-6.5.1" + sources."readable-stream-2.3.3" + sources."request-2.83.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.13.1" + sources."string-width-1.0.2" + sources."string_decoder-1.0.3" + sources."stringstream-0.0.5" + sources."strip-ansi-3.0.1" + sources."tar-2.2.1" + sources."tough-cookie-2.3.3" + 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 = { @@ -4324,124 +8513,124 @@ in sha512 = "2cwrivwc0ha272cly9r61bbb14kkl1s1hsmn53yr88b6pfjqj512nac6c5rphc6ak88v8gpl1f879qdd3v7386103zzr7miibpmbhis"; }; dependencies = [ - sources."mkdirp-0.5.1" - sources."nopt-4.0.1" - sources."npmlog-4.1.2" - (sources."rc-1.2.2" // { - dependencies = [ - sources."minimist-1.2.0" - ]; - }) - 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.3" - sources."tar-2.2.1" - sources."tar-pack-3.4.1" - sources."minimist-0.0.8" 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."ajv-4.11.8" sources."ansi-regex-2.1.1" - sources."deep-extend-0.4.2" - sources."ini-1.3.5" - sources."strip-json-comments-2.0.1" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.4" + 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."balanced-match-1.0.0" + sources."bcrypt-pbkdf-1.0.1" + sources."block-stream-0.0.9" + sources."boom-2.10.1" + sources."brace-expansion-1.1.8" sources."caseless-0.12.0" + sources."co-4.6.0" + sources."code-point-at-1.1.0" sources."combined-stream-1.0.5" + sources."concat-map-0.0.1" + sources."console-control-strings-1.1.0" + sources."core-util-is-1.0.2" + sources."cryptiles-2.0.5" + 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."detect-libc-1.0.3" + sources."ecc-jsbn-0.1.1" sources."extend-3.0.1" + sources."extsprintf-1.3.0" 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."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."graceful-fs-4.1.11" sources."har-schema-1.0.5" - sources."co-4.6.0" + sources."har-validator-4.2.1" + sources."has-unicode-2.0.1" + 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.3.5" + 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-stable-stringify-1.0.1" + sources."json-stringify-safe-5.0.1" sources."jsonify-0.0.0" - sources."assert-plus-0.2.0" (sources."jsprim-1.4.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) + sources."mime-db-1.30.0" + sources."mime-types-2.1.17" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."ms-2.0.0" + sources."nopt-4.0.1" + 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.4" + sources."path-is-absolute-1.0.1" + sources."performance-now-0.2.0" + sources."process-nextick-args-1.0.7" + sources."punycode-1.4.1" + sources."qs-6.4.0" + (sources."rc-1.2.4" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."readable-stream-2.3.3" + sources."request-2.81.0" + sources."rimraf-2.6.2" + sources."safe-buffer-5.1.1" + sources."semver-5.5.0" + sources."set-blocking-2.0.0" + sources."signal-exit-3.0.2" + sources."sntp-1.0.9" (sources."sshpk-1.13.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) - 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."string-width-1.0.2" + 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."tar-2.2.1" + sources."tar-pack-3.4.1" + sources."tough-cookie-2.3.3" + 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-1.4.1" - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - 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."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."util-deprecate-1.0.2" + sources."uuid-3.2.1" + sources."verror-1.10.0" + sources."wide-align-1.1.2" + sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -4452,13 +8641,837 @@ in production = true; bypassCache = true; }; + pnpm = nodeEnv.buildNodePackage { + name = "pnpm"; + packageName = "pnpm"; + version = "1.31.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pnpm/-/pnpm-1.31.0.tgz"; + sha1 = "7d971bb0e48c25d4e04db420eee8ee0bcb4c66d4"; + }; + dependencies = [ + sources."@most/multicast-1.3.0" + sources."@most/prelude-1.7.0" + sources."@pnpm/check-package-1.0.0" + (sources."@pnpm/default-fetcher-0.3.2" // { + dependencies = [ + sources."@types/node-9.3.0" + sources."debug-3.1.0" + sources."ms-2.0.0" + sources."ssri-5.0.0" + ]; + }) + (sources."@pnpm/default-resolver-0.1.2" // { + dependencies = [ + sources."@types/node-9.3.0" + ]; + }) + sources."@pnpm/fs-locker-1.0.1" + sources."@pnpm/git-fetcher-0.2.0" + sources."@pnpm/git-resolver-0.3.0" + sources."@pnpm/local-resolver-0.1.1" + (sources."@pnpm/logger-1.0.0" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."@pnpm/npm-resolver-0.3.11" + (sources."@pnpm/outdated-0.2.5" // { + dependencies = [ + sources."@types/node-9.3.0" + sources."pify-2.3.0" + ]; + }) + sources."@pnpm/package-requester-0.7.1" + sources."@pnpm/pkgid-to-filename-1.0.0" + (sources."@pnpm/server-0.7.1" // { + dependencies = [ + sources."@types/node-9.3.0" + ]; + }) + sources."@pnpm/tarball-fetcher-0.3.4" + (sources."@pnpm/tarball-resolver-0.1.0" // { + dependencies = [ + sources."@types/node-8.5.9" + ]; + }) + sources."@pnpm/types-1.7.0" + sources."@sindresorhus/is-0.7.0" + sources."@types/archy-0.0.31" + sources."@types/byline-4.2.31" + sources."@types/chalk-0.4.31" + sources."@types/common-tags-1.4.0" + sources."@types/get-port-3.2.0" + sources."@types/got-7.1.6" + sources."@types/load-json-file-2.0.7" + sources."@types/mem-1.1.2" + sources."@types/mz-0.0.32" + sources."@types/node-8.5.9" + sources."@types/nopt-3.0.29" + sources."@types/npm-2.0.29" + sources."@types/p-limit-1.1.2" + sources."@types/p-queue-1.1.0" + sources."@types/p-series-1.0.1" + sources."@types/ramda-0.25.16" + sources."@types/rc-0.0.1" + sources."@types/retry-0.10.2" + sources."@types/semver-5.4.0" + sources."@types/update-notifier-1.0.3" + sources."@types/uuid-3.4.3" + sources."@types/write-json-file-2.2.1" + sources."@zkochan/cmd-shim-2.2.4" + (sources."@zkochan/libnpx-9.6.1" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."execa-0.7.0" + sources."is-fullwidth-code-point-2.0.0" + sources."load-json-file-2.0.0" + sources."mem-1.1.0" + sources."pify-2.3.0" + sources."strip-ansi-4.0.0" + ]; + }) + sources."@zkochan/npm-package-arg-1.0.0" + sources."JSONStream-1.3.2" + sources."abbrev-1.1.1" + sources."add-subtract-date-1.0.13" + sources."agent-base-4.2.0" + sources."agentkeepalive-3.3.0" + sources."ajv-5.5.2" + sources."ansi-align-2.0.0" + sources."ansi-escapes-3.0.0" + sources."ansi-parser-3.2.8" + sources."ansi-regex-2.1.1" + sources."ansi-styles-3.2.0" + sources."ansicolors-0.3.2" + sources."ansistyles-0.1.3" + sources."ansy-1.0.13" + sources."any-promise-1.3.0" + sources."aproba-1.2.0" + sources."archy-1.0.0" + sources."are-we-there-yet-1.1.4" + sources."argparse-1.0.9" + sources."arr-flatten-1.1.0" + sources."array-find-index-1.0.2" + sources."array-flatten-2.1.1" + sources."array-includes-3.0.3" + sources."array-union-1.0.2" + sources."array-uniq-1.0.3" + sources."arrify-1.0.1" + sources."as-table-1.0.31" + sources."asap-2.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.6.0" + sources."babel-runtime-6.26.0" + sources."balanced-match-1.0.0" + sources."base64-js-0.0.8" + sources."bcrypt-pbkdf-1.0.1" + sources."bindings-1.3.0" + sources."bl-1.2.1" + sources."block-stream-0.0.9" + sources."bluebird-3.5.1" + sources."bole-3.0.2" + sources."boom-4.3.1" + (sources."boxen-1.3.0" // { + dependencies = [ + sources."chalk-2.3.0" + ]; + }) + sources."brace-expansion-1.1.8" + sources."browserify-zlib-0.1.4" + sources."buffer-3.6.0" + sources."bug-killer-4.4.4" + sources."builtin-modules-1.1.1" + sources."builtins-1.0.3" + sources."byline-5.0.0" + sources."bzip2-maybe-1.0.0" + sources."cacache-10.0.2" + sources."cacheable-request-2.1.4" + sources."call-limit-1.1.0" + sources."camelcase-4.1.0" + sources."capture-stack-trace-1.0.0" + sources."caseless-0.12.0" + sources."chalk-2.3.0" + sources."chownr-1.0.1" + sources."ci-info-1.1.2" + sources."cidr-regex-1.0.6" + sources."class-methods-1.0.10" + sources."cli-box-5.0.0" + sources."cli-boxes-1.0.0" + sources."cli-cursor-2.1.0" + (sources."cli-table2-0.2.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."strip-ansi-3.0.1" + ]; + }) + (sources."cliui-3.2.0" // { + dependencies = [ + sources."string-width-1.0.2" + ]; + }) + sources."clone-1.0.3" + sources."clone-response-1.0.2" + (sources."clp-3.2.1" // { + dependencies = [ + sources."typpy-2.0.0" + sources."ul-5.0.0" + ]; + }) + sources."cmd-shim-2.0.2" + 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."colors-1.1.2" + (sources."columnify-1.5.4" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."strip-ansi-3.0.1" + ]; + }) + sources."combined-stream-1.0.5" + sources."common-tags-1.7.2" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.0" + sources."config-chain-1.1.11" + sources."configstore-3.1.1" + sources."console-control-strings-1.1.0" + sources."copy-concurrently-1.0.5" + sources."core-js-2.5.3" + sources."core-util-is-1.0.2" + sources."couleurs-6.0.9" + sources."create-error-class-3.0.2" + sources."credentials-by-uri-1.0.0" + 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."csv-parser-1.12.0" + sources."currently-unhandled-0.4.1" + sources."custom-return-1.0.10" + sources."cyclist-0.2.2" + sources."dashdash-1.14.1" + sources."data-uri-to-buffer-2.0.0" + sources."date-unit-ms-1.1.12" + sources."daty-1.1.4" + sources."days-1.1.1" + sources."debug-2.6.9" + sources."debuglog-1.0.1" + sources."decamelize-1.2.0" + sources."decode-uri-component-0.2.0" + sources."decompress-maybe-1.0.0" + sources."decompress-response-3.3.0" + sources."deep-extend-0.4.2" + sources."defaults-1.0.3" + sources."deffy-2.2.2" + sources."define-properties-1.1.2" + sources."delay-2.0.0" + sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" + sources."dependencies-hierarchy-2.0.1" + sources."dependency-path-1.2.0" + sources."detect-indent-5.0.0" + sources."detect-libc-1.0.3" + sources."dezalgo-1.0.3" + (sources."diable-4.0.1" // { + dependencies = [ + sources."ansi-parser-2.0.0" + sources."couleurs-5.0.0" + sources."deffy-2.0.0" + sources."has-flag-1.0.0" + sources."supports-color-3.2.3" + ]; + }) + sources."diff-dates-1.0.11" + sources."dint-2.0.2" + sources."dir-glob-2.0.0" + sources."dot-prop-4.2.0" + sources."dotenv-4.0.0" + (sources."drive-by-path-1.0.0" // { + dependencies = [ + sources."ramda-0.24.1" + ]; + }) + sources."drivelist-5.2.12" + sources."duplexer3-0.1.4" + sources."duplexify-3.5.3" + sources."ecc-jsbn-0.1.1" + sources."editor-1.0.0" + sources."encode-registry-1.1.0" + sources."encoding-0.1.12" + sources."end-of-stream-1.4.1" + sources."err-code-1.1.2" + sources."errno-0.1.6" + sources."error-ex-1.3.1" + sources."es-abstract-1.10.0" + sources."es-to-primitive-1.1.1" + sources."es6-promise-4.2.4" + sources."es6-promisify-5.0.0" + sources."escape-string-regexp-1.0.5" + sources."esprima-4.0.0" + sources."exclude-arr-1.0.9" + sources."execa-0.8.0" + sources."expand-template-1.1.0" + sources."extend-3.0.1" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.0.0" + sources."fast-json-stable-stringify-2.0.0" + sources."fast-safe-stringify-1.1.13" + (sources."fetch-from-npm-registry-0.1.0" // { + dependencies = [ + sources."@types/node-8.5.9" + ]; + }) + sources."fillo-1.0.11" + (sources."find-packages-2.1.2" // { + dependencies = [ + sources."path-type-3.0.0" + sources."read-pkg-3.0.0" + ]; + }) + sources."find-up-2.1.0" + sources."flat-colors-3.0.0" + sources."flush-write-stream-1.0.2" + sources."foreach-2.0.5" + sources."forever-agent-0.6.1" + sources."form-data-2.3.1" + sources."formatoid-1.2.2" + sources."from2-2.3.0" + sources."fs-vacuum-1.2.10" + sources."fs-write-stream-atomic-1.0.10" + sources."fs.realpath-1.0.0" + sources."fstream-1.0.11" + sources."function-bind-1.1.1" + sources."function.name-1.0.10" + sources."gauge-2.7.4" + sources."generate-function-1.1.0" + sources."generate-object-property-1.2.0" + sources."genfun-4.0.1" + sources."get-caller-file-1.0.2" + sources."get-npm-tarball-url-2.0.1" + sources."get-port-3.2.0" + sources."get-source-1.0.24" + sources."get-stream-3.0.0" + sources."getpass-0.1.7" + sources."github-from-package-0.0.0" + sources."glob-7.1.2" + sources."global-dirs-0.1.1" + sources."globby-7.1.1" + sources."got-8.0.3" + sources."graceful-fs-4.1.11" + sources."graceful-git-1.0.1" + sources."graph-sequencer-2.0.0" + sources."gunzip-maybe-1.4.1" + 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-flag-2.0.0" + sources."has-symbol-support-x-1.4.1" + sources."has-to-string-tag-x-1.4.1" + sources."has-unicode-2.0.1" + sources."hawk-6.0.2" + sources."hoek-4.2.0" + sources."hosted-git-info-2.5.0" + sources."http-cache-semantics-3.8.1" + sources."http-proxy-agent-2.0.0" + sources."http-signature-1.2.0" + sources."https-proxy-agent-2.1.1" + sources."humanize-ms-1.2.1" + sources."iconv-lite-0.4.19" + sources."ieee754-1.1.8" + sources."iferr-0.1.5" + sources."ignore-3.3.7" + sources."ignore-walk-3.0.1" + sources."import-lazy-2.1.0" + sources."imurmurhash-0.1.4" + sources."individual-3.0.0" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."init-package-json-1.10.1" + sources."into-stream-3.1.0" + sources."invert-kv-1.0.0" + sources."ip-1.1.5" + sources."is-arrayish-0.2.1" + sources."is-builtin-module-1.0.0" + sources."is-bzip2-1.0.0" + sources."is-callable-1.1.3" + sources."is-ci-1.1.0" + sources."is-cidr-1.0.0" + sources."is-date-object-1.0.1" + sources."is-deflate-1.0.0" + sources."is-fullwidth-code-point-1.0.0" + sources."is-gzip-1.0.0" + sources."is-inner-link-2.0.2" + 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-property-1.0.2" + sources."is-redirect-1.0.0" + sources."is-regex-1.0.4" + sources."is-retry-allowed-1.1.0" + sources."is-ssh-1.3.0" + sources."is-stream-1.1.0" + sources."is-subdir-1.0.2" + sources."is-symbol-1.0.1" + sources."is-typedarray-1.0.0" + sources."is-windows-1.0.1" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isstream-0.1.2" + sources."isurl-1.0.0" + sources."iterate-object-1.3.2" + sources."js-yaml-3.10.0" + sources."jsbn-0.1.1" + sources."json-buffer-3.0.0" + sources."json-parse-better-errors-1.0.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.3.1" + sources."json-stringify-safe-5.0.1" + sources."json2yaml-1.1.0" + sources."jsonparse-1.3.1" + sources."jsprim-1.4.1" + sources."keyv-3.0.0" + sources."latest-version-3.1.0" + sources."lazy-property-1.0.0" + sources."lcid-1.0.0" + (sources."le-table-4.0.0" // { + dependencies = [ + sources."ansi-parser-3.0.0" + ]; + }) + sources."libnpx-9.6.0" + (sources."load-json-file-4.0.0" // { + dependencies = [ + sources."parse-json-4.0.0" + ]; + }) + sources."load-yaml-file-0.1.0" + sources."locate-path-2.0.0" + sources."lockfile-1.0.3" + sources."lodash-3.10.1" + sources."lodash._baseuniq-4.6.0" + sources."lodash._createset-4.0.3" + sources."lodash._root-3.0.1" + sources."lodash.clonedeep-4.5.0" + sources."lodash.union-4.6.0" + sources."lodash.uniq-4.5.0" + sources."lodash.without-4.4.0" + sources."log-update-2.3.0" + sources."loud-rejection-1.6.0" + sources."lowercase-keys-1.0.0" + sources."lru-cache-4.1.1" + sources."make-dir-1.1.0" + sources."make-fetch-happen-2.6.0" + sources."meant-1.0.1" + sources."mem-3.0.0" + sources."mime-db-1.30.0" + sources."mime-types-2.1.17" + sources."mimic-fn-1.1.0" + sources."mimic-response-1.0.0" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."minipass-2.2.1" + sources."minizlib-1.1.0" + sources."mississippi-1.3.1" + sources."mkdirp-0.5.1" + sources."mkdirp-promise-5.0.1" + sources."months-1.2.0" + sources."most-1.7.2" + sources."most-last-1.0.0" + sources."move-concurrently-1.0.1" + sources."ms-2.1.1" + sources."mute-stream-0.0.7" + sources."mz-2.7.0" + sources."nan-2.8.0" + sources."ncp-2.0.0" + sources."ndjson-1.5.0" + sources."neat-csv-2.1.0" + sources."nerf-dart-1.0.0" + sources."node-abi-2.1.2" + sources."node-fetch-npm-2.0.2" + (sources."node-gyp-3.6.2" // { + dependencies = [ + sources."nopt-3.0.6" + sources."semver-5.3.0" + sources."tar-2.2.1" + ]; + }) + sources."noop-logger-0.1.1" + sources."noop6-1.0.7" + sources."nopt-4.0.1" + sources."normalize-package-data-2.4.0" + sources."normalize-path-2.1.1" + sources."normalize-registry-url-1.0.0" + sources."normalize-ssh-1.0.0" + sources."normalize-url-2.0.1" + (sources."not-bundled-npm-5.5.1" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."ansi-styles-2.2.1" + sources."cacache-9.2.9" + sources."chalk-1.1.3" + sources."execa-0.7.0" + sources."from2-1.3.0" + sources."got-6.7.1" + sources."is-fullwidth-code-point-2.0.0" + sources."isarray-0.0.1" + sources."minimist-1.2.0" + sources."prepend-http-1.0.4" + sources."semver-5.4.1" + sources."ssri-4.1.6" + sources."string-width-1.0.2" + sources."string_decoder-0.10.31" + sources."strip-ansi-4.0.0" + sources."supports-color-2.0.0" + (sources."update-notifier-2.2.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."string-width-2.1.1" + sources."strip-ansi-3.0.1" + ]; + }) + sources."url-parse-lax-1.0.0" + sources."uuid-3.1.0" + sources."write-file-atomic-2.1.0" + sources."yallist-3.0.2" + ]; + }) + sources."npm-bundled-1.0.3" + sources."npm-cache-filename-1.0.2" + sources."npm-install-checks-3.0.0" + sources."npm-lifecycle-1.0.3" + sources."npm-package-arg-5.1.2" + sources."npm-packlist-1.1.10" + sources."npm-pick-manifest-1.0.4" + sources."npm-profile-2.0.5" + sources."npm-registry-client-8.5.0" + sources."npm-run-path-2.0.2" + sources."npm-user-validate-1.0.0" + (sources."npmlog-4.1.2" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."strip-ansi-3.0.1" + ]; + }) + 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."object.getownpropertydescriptors-2.0.3" + sources."observatory-1.0.0" + sources."once-1.4.0" + sources."onetime-2.0.1" + sources."opener-1.4.3" + sources."os-homedir-1.0.2" + sources."os-locale-2.1.0" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.4" + sources."overlap-2.0.0" + sources."p-cancelable-0.3.0" + sources."p-defer-1.0.0" + sources."p-every-1.0.2" + sources."p-filter-1.0.0" + 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-map-1.2.0" + sources."p-queue-2.3.0" + sources."p-reduce-1.0.0" + sources."p-series-1.0.0" + sources."p-timeout-2.0.1" + sources."p-try-1.0.0" + sources."package-json-4.0.1" + (sources."package-store-0.15.2" // { + dependencies = [ + sources."@types/node-9.3.0" + sources."debug-3.1.0" + sources."minimist-1.2.0" + sources."ms-2.0.0" + sources."unzip-response-1.0.2" + ]; + }) + sources."pacote-6.0.4" + sources."pako-0.2.9" + sources."parallel-transform-1.1.0" + sources."parse-it-1.0.8" + sources."parse-json-2.2.0" + sources."parse-npm-tarball-url-1.0.2" + sources."parse-url-1.3.11" + sources."path-absolute-1.0.0" + sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" + sources."path-is-inside-1.0.2" + sources."path-key-2.0.1" + sources."path-name-1.0.0" + sources."path-type-2.0.0" + sources."peek-stream-1.1.2" + sources."performance-now-2.1.0" + sources."pify-3.0.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + (sources."pkgs-graph-2.0.0-0" // { + dependencies = [ + sources."npm-package-arg-6.0.0" + ]; + }) + (sources."pnpm-default-reporter-0.11.8" // { + dependencies = [ + sources."@types/node-9.3.0" + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" + sources."wrap-ansi-3.0.1" + ]; + }) + (sources."pnpm-file-reporter-0.0.1" // { + dependencies = [ + sources."@types/node-7.0.52" + sources."ansi-escapes-1.4.0" + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."supports-color-2.0.0" + ]; + }) + sources."pnpm-install-checks-1.1.0" + (sources."pnpm-list-2.0.1" // { + dependencies = [ + sources."@types/node-9.3.0" + sources."npm-package-arg-6.0.0" + ]; + }) + sources."pnpm-logger-0.0.0" + sources."pnpm-shrinkwrap-5.1.1" + sources."prebuild-install-2.5.0" + sources."prepend-http-2.0.0" + sources."pretty-bytes-4.0.2" + sources."printable-characters-1.0.38" + sources."proc-output-1.0.6" + (sources."process-exists-3.0.0" // { + dependencies = [ + sources."get-stream-2.3.1" + sources."into-stream-2.0.1" + sources."minimist-1.2.0" + ]; + }) + sources."process-nextick-args-1.0.7" + sources."promise-inflight-1.0.1" + sources."promise-retry-1.1.1" + sources."promzard-0.3.0" + sources."proper-lockfile-2.0.1" + sources."proto-list-1.2.4" + sources."protocols-1.4.6" + sources."protoduck-4.0.0" + sources."prr-1.0.1" + sources."ps-list-4.0.0" + sources."pseudomap-1.0.2" + sources."pump-1.0.3" + (sources."pumpify-1.4.0" // { + dependencies = [ + sources."pump-2.0.1" + ]; + }) + sources."punycode-1.4.1" + sources."qrcode-terminal-0.11.0" + sources."qs-6.5.1" + sources."query-string-5.0.1" + sources."qw-1.0.1" + sources."ramda-0.25.0" + sources."rc-1.2.4" + sources."read-1.0.7" + sources."read-cmd-shim-1.0.1" + sources."read-installed-4.0.3" + sources."read-package-json-2.0.12" + sources."read-package-tree-5.1.6" + sources."read-pkg-2.0.0" + sources."read-pkg-up-2.0.0" + sources."readable-stream-2.3.3" + sources."readdir-scoped-modules-1.0.2" + sources."regenerator-runtime-0.11.1" + sources."regex-escape-3.4.8" + sources."registry-auth-token-3.3.1" + sources."registry-url-3.1.0" + sources."remedial-1.0.7" + sources."remove-all-except-outer-links-1.0.3" + sources."remove-trailing-separator-1.1.0" + sources."rename-overwrite-1.0.0" + sources."replace-string-1.1.0" + sources."request-2.83.0" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."resolve-from-4.0.0" + sources."resolve-link-target-1.0.1" + sources."responselike-1.0.2" + sources."restore-cursor-2.0.0" + sources."retry-0.10.1" + sources."rimraf-2.6.2" + sources."rimraf-then-1.0.1" + sources."run-queue-1.0.3" + sources."safe-buffer-5.1.1" + sources."sec-1.0.0" + sources."semver-5.5.0" + sources."semver-diff-2.1.0" + sources."semver-regex-1.0.0" + sources."set-blocking-2.0.0" + sources."sha-2.0.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" + sources."simple-get-1.4.3" + sources."slash-1.0.0" + sources."slide-1.1.6" + sources."smart-buffer-1.1.15" + sources."sntp-2.1.0" + sources."socks-1.1.10" + sources."socks-proxy-agent-3.0.1" + sources."sort-keys-2.0.0" + sources."sorted-object-2.0.1" + (sources."sorted-union-stream-2.1.3" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-1.1.14" + sources."string_decoder-1.0.3" + ]; + }) + sources."source-map-0.6.1" + sources."spawno-2.0.7" + sources."spdx-correct-1.0.2" + sources."spdx-expression-parse-1.0.4" + sources."spdx-license-ids-1.2.2" + sources."split2-2.2.0" + sources."sprintf-js-1.0.3" + sources."sshpk-1.13.1" + sources."ssri-5.1.0" + (sources."stacktracey-1.2.100" // { + dependencies = [ + sources."@types/node-8.5.9" + ]; + }) + sources."static-methods-1.0.10" + sources."stream-each-1.2.2" + (sources."stream-iterate-1.2.0" // { + dependencies = [ + sources."readable-stream-2.3.3" + ]; + }) + sources."stream-shift-1.0.0" + sources."strict-uri-encode-1.1.0" + sources."string-width-2.1.1" + sources."string_decoder-1.0.3" + sources."stringstream-0.0.5" + sources."strip-ansi-3.0.1" + sources."strip-bom-3.0.0" + sources."strip-color-0.1.0" + sources."strip-eof-1.0.0" + sources."strip-json-comments-2.0.1" + (sources."supi-0.12.1" // { + dependencies = [ + sources."@types/node-9.3.0" + sources."execa-0.9.0" + sources."npm-lifecycle-2.0.0" + sources."pify-2.3.0" + sources."write-file-atomic-1.3.4" + ]; + }) + sources."supports-color-4.5.0" + sources."symbol-observable-1.1.0" + sources."symlink-dir-1.1.2" + sources."tar-4.0.2" + sources."tar-fs-1.16.0" + sources."tar-stream-1.5.5" + (sources."tasklist-3.1.0" // { + dependencies = [ + sources."pify-2.3.0" + ]; + }) + sources."term-size-1.2.0" + sources."text-table-0.2.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-4.0.1" + sources."timeout-then-1.1.0" + sources."tough-cookie-2.3.3" + sources."tree-kill-1.2.0" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."typedarray-0.0.6" + sources."typpy-2.3.10" + sources."uid-number-0.0.6" + (sources."ul-5.2.13" // { + dependencies = [ + sources."deffy-2.2.2" + ]; + }) + sources."umask-1.1.0" + sources."unbzip2-stream-1.2.5" + sources."unique-filename-1.1.0" + sources."unique-slug-2.0.0" + sources."unique-string-1.0.0" + sources."unpack-stream-3.0.1" + sources."unpipe-1.0.0" + sources."unzip-response-2.0.1" + sources."update-notifier-2.3.0" + sources."url-parse-lax-3.0.0" + sources."url-to-options-1.0.1" + sources."util-deprecate-1.0.2" + sources."util-extend-1.0.3" + sources."util.promisify-1.0.0" + sources."uuid-3.2.1" + sources."validate-npm-package-license-3.0.1" + sources."validate-npm-package-name-3.0.0" + sources."verror-1.10.0" + sources."version-selector-type-2.0.0" + sources."wcwidth-1.0.1" + sources."which-1.3.0" + sources."which-module-2.0.0" + sources."wide-align-1.1.2" + sources."widest-line-2.0.0" + sources."worker-farm-1.5.2" + sources."wrap-ansi-2.1.0" + sources."wrappy-1.0.2" + sources."write-file-atomic-2.3.0" + sources."write-json-file-2.3.0" + sources."write-pkg-3.1.0" + sources."write-yaml-file-1.0.0" + sources."x256-0.0.2" + sources."xdg-basedir-3.0.0" + sources."xtend-4.0.1" + sources."y18n-3.2.1" + sources."yallist-2.1.2" + sources."yargs-8.0.2" + sources."yargs-parser-7.0.0" + sources."zen-observable-0.7.1" + sources."zen-push-0.2.1" + ]; + 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.4.1"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz"; - sha512 = "2r13vwvb5ick34k6flr7vgbjfsdka8zbj5a74rd0ba4bp0nqmhppbaw3qlwn7f4smpifpa4iy4hxj137y598rbvsmy3h0d8vxgvzwar"; + url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz"; + sha512 = "0h32zh035y8m6dzcqhcymbhwgmc8839fa1hhj0jfh9ivp9kmqfj1sbwnsnkzcn9qm3sqn38sa8ys2g4c638lpnmzjr0a0qndmv7f8p1"; }; buildInputs = globalBuildInputs; meta = { @@ -4479,24 +9492,24 @@ in }; 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."balanced-match-1.0.0" + sources."brace-expansion-1.1.8" + 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.4" + sources."minimatch-3.0.4" sources."process-nextick-args-1.0.7" + sources."readable-stream-2.3.3" + sources."readdirp-2.1.0" sources."safe-buffer-5.1.1" + sources."set-immediate-shim-1.0.1" sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" ]; diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix index 65a310c9cf0..78102b9c673 100644 --- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix +++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix @@ -1,8 +1,22 @@ -{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib, cstruct, zarith, ounit, result, topkg }: +{ 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"; @@ -10,13 +24,11 @@ buildOcaml rec { owner = "mirleft"; repo = "ocaml-asn1-combinators"; rev = "v${version}"; - sha256 = "0hpn049i46sdnv2i6m7r6m6ch0jz8argybh71wykbvcqdby08zxj"; + inherit (param) sha256; }; buildInputs = [ ocaml findlib ounit topkg ]; - propagatedBuildInputs = [ result cstruct zarith ]; - - createFindlibDestdir = true; + propagatedBuildInputs = [ result cstruct zarith ] ++ param.propagatedBuildInputs; buildPhase = "${topkg.run} build --tests true"; diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix index 07909d1a465..dc6cf491eb4 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/dtoa/default.nix b/pkgs/development/ocaml-modules/dtoa/default.nix new file mode 100644 index 00000000000..9b6e5626614 --- /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 096d8f8bf63..9868ab93f79 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/git-http/default.nix b/pkgs/development/ocaml-modules/git-http/default.nix index fc5591483d2..5b93b960765 100644 --- a/pkgs/development/ocaml-modules/git-http/default.nix +++ b/pkgs/development/ocaml-modules/git-http/default.nix @@ -15,6 +15,5 @@ stdenv.mkDerivation rec { meta = { description = "Client implementation of the “Smart” HTTP Git protocol in pure OCaml"; inherit (git.meta) homepage license maintainers platforms; - broken = true; }; } diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix index 4d4f86e57eb..9347c6ad00c 100644 --- a/pkgs/development/ocaml-modules/git/default.nix +++ b/pkgs/development/ocaml-modules/git/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "1.11.2"; + version = "1.11.4"; name = "ocaml${ocaml.version}-git-${version}"; src = fetchFromGitHub { owner = "mirage"; repo = "ocaml-git"; rev = version; - sha256 = "1z5b0g4vck1sh1w076i2p3ppxrmb9h30q3nip5snw2r9prkm6y1j"; + sha256 = "182b6shcfcq50r5snm01hwalnmck43x1xgdd4fvjb6q78pbwag2x"; }; buildInputs = [ ocaml findlib jbuilder ]; diff --git a/pkgs/development/ocaml-modules/mstruct/default.nix b/pkgs/development/ocaml-modules/mstruct/default.nix index 958cbdc554e..5aa57ba8fbb 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/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix index 3fa8e9d46b4..5482d7ac87c 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/notty/default.nix b/pkgs/development/ocaml-modules/notty/default.nix index dcc57fddaf6..2dffb472f3e 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, ocb-stubblr +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ocb-stubblr , result, uucp, uuseg, uutf , lwt ? null }: with stdenv.lib; +if !versionAtLeast ocaml.version "4.03" +then throw "notty is not available for OCaml ${ocaml.version}" +else + let withLwt = lwt != null; in -buildOcaml rec { - version = "0.1.1a"; - name = "notty"; +stdenv.mkDerivation rec { + version = "0.2.1"; + name = "ocaml${ocaml.version}-notty-${version}"; - minimumSupportedOcamlVersion = "4.02"; - - 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 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/ocamlmake/setup-hook.sh b/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh index a93a7250beb..6d950437016 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/otr/default.nix b/pkgs/development/ocaml-modules/otr/default.nix index 189b3adf873..ac853c94094 100644 --- a/pkgs/development/ocaml-modules/otr/default.nix +++ b/pkgs/development/ocaml-modules/otr/default.nix @@ -1,22 +1,25 @@ -{ stdenv, buildOcaml, fetchFromGitHub, ocamlbuild, findlib, topkg, ocaml -, ppx_tools, ppx_sexp_conv, cstruct, ppx_cstruct, sexplib, result, nocrypto, astring +{ stdenv, fetchFromGitHub, ocaml, ocamlbuild, findlib, topkg +, ppx_tools, ppx_sexp_conv, cstruct, ppx_cstruct, sexplib, rresult, nocrypto +, astring }: -buildOcaml rec { - name = "otr"; - version = "0.3.3"; +if !stdenv.lib.versionAtLeast ocaml.version "4.03" +then throw "otr is not available for OCaml ${ocaml.version}" +else - 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 ppx_cstruct ]; - 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 = "${topkg.run} build --tests true"; @@ -26,6 +29,7 @@ buildOcaml rec { 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/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix index 8c146102ad1..39f82772ffc 100644 --- a/pkgs/development/ocaml-modules/tls/default.nix +++ b/pkgs/development/ocaml-modules/tls/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildOcaml, fetchFromGitHub, findlib, ocamlbuild, ocaml_oasis +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg , ppx_tools, ppx_sexp_conv, result, x509, nocrypto, cstruct, ppx_cstruct, cstruct-unix, ounit , lwt ? null}: @@ -6,31 +6,27 @@ 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 ppx_cstruct cstruct-unix ]; + 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/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix index f08ee7fc2fc..5059ef24aa3 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 00000000000..f08ee7fc2fc --- /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/wtf8/default.nix b/pkgs/development/ocaml-modules/wtf8/default.nix new file mode 100644 index 00000000000..4cde95c0c4c --- /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 316035b4054..44a25865c1a 100644 --- a/pkgs/development/ocaml-modules/x509/default.nix +++ b/pkgs/development/ocaml-modules/x509/default.nix @@ -1,29 +1,28 @@ -{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib, asn1-combinators, nocrypto -, ounit, ocaml_oasis, ppx_sexp_conv, cstruct-unix +{ 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 cstruct-unix ]; - propagatedBuildInputs = [ asn1-combinators nocrypto ]; + unpackCmd = "tar -xjf $curSrc"; - configureFlags = "--enable-tests"; - configurePhase = "./configure --prefix $out $configureFlags"; + buildInputs = [ ocaml findlib ocamlbuild topkg ppx_sexp_conv ounit cstruct-unix ]; + propagatedBuildInputs = [ asn1-combinators astring nocrypto ]; + + 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/perl-modules/DBD-mysql/default.nix b/pkgs/development/perl-modules/DBD-mysql/default.nix index 7302516d542..12ddcf166e2 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/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index 74fa75e7aa5..b72b1851024 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -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; }; @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ bash unzip glibc openssl gcc48 mesa freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share libuuid ]; - meta = { + meta = with stdenv.lib; { description = "Clean and innovative Smalltalk-inspired environment"; longDescription = '' Pharo's goal is to deliver a clean, innovative, free open-source @@ -122,8 +122,8 @@ stdenv.mkDerivation rec { packaging (ppa:pharo/stable)' project. ''; homepage = http://pharo.org; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.lukego ]; - platforms = [ "i686-linux" "x86_64-linux" "i686-darwin" "x86_64-darwin" ]; + license = licenses.mit; + maintainers = [ maintainers.lukego ]; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/development/pure-modules/glpk/default.nix b/pkgs/development/pure-modules/glpk/default.nix index 4927ac445f4..e86f08b57ca 100644 --- a/pkgs/development/pure-modules/glpk/default.nix +++ b/pkgs/development/pure-modules/glpk/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, - pkgconfig, pure, glpk, gmp, libtool, libmysql, libiodbc, zlib }: + pkgconfig, pure, glpk, gmp, libtool, mysql, libiodbc, zlib }: stdenv.mkDerivation rec { baseName = "glpk"; @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { }; glpkWithExtras = lib.overrideDerivation glpk (attrs: { - propagatedBuildInputs = [ gmp libtool libmysql libiodbc ]; + propagatedBuildInputs = [ gmp libtool mysql.connector-c libiodbc ]; CPPFLAGS = "-I${gmp.dev}/include"; preConfigure = '' substituteInPlace configure \ - --replace /usr/include/mysql ${lib.getDev libmysql}/include/mysql + --replace /usr/include/mysql ${mysql.connector-c}/include/mysql ''; configureFlags = [ "--enable-dl" "--enable-odbc" diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix index 5acb6cd5785..8af07ece687 100644 --- a/pkgs/development/python-modules/APScheduler/default.nix +++ b/pkgs/development/python-modules/APScheduler/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { pname = "APScheduler"; - version = "3.4.0"; + version = "3.5.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "b51118a8ed014104f7e440456dcbd90f2015aea7bcc34c57e307fb34bc746316"; + sha256 = "952c8f46a11f32b9d5bfbe3e347dac2cdf0680d8b4799590dc9c3a9865b73b65"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix new file mode 100644 index 00000000000..f3f1eed265d --- /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 56e2cf501ed..b5d202af50a 100644 --- a/pkgs/development/python-modules/MechanicalSoup/default.nix +++ b/pkgs/development/python-modules/MechanicalSoup/default.nix @@ -1,5 +1,5 @@ { fetchPypi, buildPythonPackage, lib -, requests, beautifulsoup4, six +, requests, beautifulsoup4, six, lxml , pytestrunner, requests-mock, pytestcov, pytest }: @@ -7,23 +7,23 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "MechanicalSoup"; - version = "0.8.0"; + version = "0.9.0.post4"; src = fetchPypi { inherit pname version; - sha256 = "38a6ca35428196be94f87f8f036ee4a88b1418d1f77e5634ad92acfaa22c28da"; + sha256 = "ce8f822afbc9bef1499be417e8d5deecd0cd32606420165700e89477955f03ab"; }; 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 f281a02d49b..8f8d91c64d2 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Nikola"; - version = "7.8.10"; + version = "7.8.11"; # 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 @@ -47,7 +47,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "e242c3d0dd175d95a0baf5268b108081ba160b83ceafec8c9bc2ec0a24a56537"; + sha256 = "10d95b3af84e61496ef729665eafa2235fd0fd4cc6c57644dd0f2c19a968dd0f"; }; meta = { diff --git a/pkgs/development/python-modules/Pygments/default.nix b/pkgs/development/python-modules/Pygments/default.nix index 11a6fc96eb2..8ab846986f0 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/Theano/default.nix b/pkgs/development/python-modules/Theano/default.nix index e0ff839ce1b..03dc825218e 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/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix index 1c9fa3d786f..5e295bb9516 100644 --- a/pkgs/development/python-modules/absl-py/default.nix +++ b/pkgs/development/python-modules/absl-py/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "absl-py"; - version = "0.1.5"; + version = "0.1.9"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "94943ed0cd77077fe2d18e79b2f28d3e92f585f7d1c6edc75e640121f3c5d580"; + sha256 = "1c787e3bc7ef8fea7a8a79cf36b0c550b4bd66e13c05d1352fbc5786488befb0"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix index 3aa03aaa599..466c20e19ca 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.0.9"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "3209fa41b8c41345442e8d9b5158a57d3e96d84c3d5ebbe8e521e1e2eff1598d"; + sha256 = "d98bc55136d696fcf323760c3db0de489da9e41fd51283fa6f90205deb85bf6a"; }; - 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 ca00477d408..00000000000 --- a/pkgs/development/python-modules/afew/default.nix +++ /dev/null @@ -1,34 +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; - - 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 andir flokli ]; - }; -} diff --git a/pkgs/development/python-modules/aiohttp/cors.nix b/pkgs/development/python-modules/aiohttp/cors.nix index ab9595ec2b9..9da239b524a 100644 --- a/pkgs/development/python-modules/aiohttp/cors.nix +++ b/pkgs/development/python-modules/aiohttp/cors.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "aiohttp-cors"; version = "0.6.0"; - name = "${pname}-${version}"; + src = fetchPypi { inherit pname version; sha256 = "1r0mb4dw0dc1lpi54dk5vxqs06nyhvagp76lyrvk7rd94z5mjkd4"; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 53443b3b32f..bea839f49e3 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -6,31 +6,33 @@ , multidict , async-timeout , yarl +, idna-ssl , pytest , gunicorn , pytest-raisesregexp +, pytest-mock }: buildPythonPackage rec { pname = "aiohttp"; - version = "2.3.3"; - name = "${pname}-${version}"; + version = "2.3.10"; src = fetchPypi { inherit pname version; - sha256 = "0a2e33e90560dacb819b095b9d9611597925d75d1b93dd9490055d3826d98a82"; + sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964"; }; disabled = pythonOlder "3.4"; - doCheck = false; # Too many tests fail. + checkInputs = [ pytest gunicorn pytest-raisesregexp pytest-mock ]; - checkInputs = [ pytest gunicorn pytest-raisesregexp ]; - propagatedBuildInputs = [ async-timeout chardet multidict yarl ]; + propagatedBuildInputs = [ async-timeout chardet multidict yarl ] + ++ lib.optional (pythonOlder "3.7") idna-ssl; - meta = { - description = "Http client/server for asyncio"; - license = with lib.licenses; [ asl20 ]; + meta = with lib; { + description = "Asynchronous HTTP Client/Server for Python and asyncio"; + license = licenses.asl20; homepage = https://github.com/KeepSafe/aiohttp/; + maintainers = with maintainers; [ dotlambda ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 364f4cf9a3a..54e1a753597 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.7"; src = fetchPypi { inherit pname version; - sha256 = "042851ebe9efa07be6dc1395b1793b6c1d8964a39b73a0ce1649e2bcd41ea732"; + sha256 = "46f4849c6dce69f54dd5001b3215b6a983dee6b17512efee10e237fa11f20cfa"; }; buildInputs = [ pytest pytestcov mock coverage ]; diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix index 6e61e84a5d5..ba60922856e 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 = "2.0.0"; name = "${pname}-${version}"; meta = with stdenv.lib; { @@ -16,6 +16,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "c3b5246f5601b6ae5671911bc4ee5b3e3fe94752e8afab5ce074d8b1232952f1"; + sha256 = "085786415d3550e89785ffbedaa9bb37d41de0707a1268bdbba11249064b71d1"; }; } diff --git a/pkgs/development/python-modules/ansicolors/default.nix b/pkgs/development/python-modules/ansicolors/default.nix index 9192186cd71..a737cb06ea2 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/argon2_cffi/default.nix b/pkgs/development/python-modules/argon2_cffi/default.nix index 80985f868c7..f46efd9f496 100644 --- a/pkgs/development/python-modules/argon2_cffi/default.nix +++ b/pkgs/development/python-modules/argon2_cffi/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "argon2_cffi"; - version = "16.3.0"; + version = "18.1.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1ap3il3j1pjyprrhpfyhc21izpmhzhfb5s69vlzc65zvd1nj99cr"; + sha256 = "7e4b75611b73f53012117ad21cdde7a17b32d1e99ff6799f22d827eb83a2a59b"; }; propagatedBuildInputs = [ cffi six ]; diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index a85987a95b1..65f4ae79f4b 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/asana/default.nix b/pkgs/development/python-modules/asana/default.nix index 41a111c3167..7990ece749b 100644 --- a/pkgs/development/python-modules/asana/default.nix +++ b/pkgs/development/python-modules/asana/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "asana"; - version = "0.6.5"; + version = "0.6.7"; name = "${pname}-${version}"; meta = { @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "eab8d24c2a4670b541b75da2f4bf5b995fe71559c1338da53ce9039f7b19c9a0"; + sha256 = "d576601116764050c4cf63b417f1c24700b76cf6686f0e51e6b0b77d450e7973"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix index 1b5112fb335..d88f44149bf 100644 --- a/pkgs/development/python-modules/asgiref/default.nix +++ b/pkgs/development/python-modules/asgiref/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchurl, six }: buildPythonPackage rec { - version = "1.1.2"; + version = "2.1.0"; pname = "asgiref"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/a/asgiref/${name}.tar.gz"; - sha256 = "8b46c3d6e2ad354d9da3cfb9873f9bd46fe1b768fbc11065275ba5430a46700c"; + sha256 = "2bfd70fcc51df4036768b91d7b13524090dc8f366d79fa44ba2b0aeb47306344"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/asn1crypto/default.nix b/pkgs/development/python-modules/asn1crypto/default.nix index eedaac50fac..5f512fcd6f8 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 965bf37d520..9fb92b860a1 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 00000000000..76dba87f964 --- /dev/null +++ b/pkgs/development/python-modules/astral/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytz, pytest }: + +buildPythonPackage rec { + pname = "astral"; + version = "1.4"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1zm1ypc6w279gh7lbgsfbzfxk2x4gihlq3rfh59hj70hmhjwiwp7"; + }; + + propagatedBuildInputs = [ pytz ]; + + checkInputs = [ pytest ]; + checkPhase = '' + py.test -k "not test_GoogleLocator" + ''; + + 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 86a0daa0456..862157f686a 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.0"; src = fetchPypi { inherit pname version; - sha256 = "492c2a2044adbf6a84a671b7522e9295ad2f6a7c781b899014308db25312dd35"; + sha256 = "71dadba2110008e2c03f9fde662ddd2053db3c0489d0e03c94e828a0399edd4f"; }; 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 12f00be0cb7..514762b7a37 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "astropy"; - version = "2.0.2"; + version = "2.0.3"; name = "${pname}-${version}"; doCheck = false; #Some tests are failing. More importantly setup.py hangs on completion. Needs fixing with a proper shellhook. src = fetchPypi { inherit pname version; - sha256 = "4544a422b1173d79b2d65ba74c627f04a5fd8530d97fb604752d657d754e103d"; + sha256 = "fdfc0248f6250798ed6d1327be609cb901db89ae01fc768cfbc9e263bdf56f4f"; }; propagatedBuildInputs = [ pytest numpy ]; # yes it really has pytest in install_requires diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix index e58bf3846dc..8ef2b5989f4 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/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix new file mode 100644 index 00000000000..dae88b34900 --- /dev/null +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, jsonpickle +, wrapt +, requests +}: + +buildPythonPackage rec { + pname = "aws-xray-sdk"; + version = "0.95"; + + src = fetchPypi { + inherit pname version; + sha256 = "9e7ba8dd08fd2939376c21423376206bff01d0deaea7d7721c6b35921fed1943"; + }; + + propagatedBuildInputs = [ + jsonpickle wrapt requests + ]; + + 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/backports_abc/default.nix b/pkgs/development/python-modules/backports_abc/default.nix new file mode 100644 index 00000000000..ab34d376de0 --- /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_functools_lru_cache/default.nix b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix new file mode 100644 index 00000000000..2442e132f1b --- /dev/null +++ b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools_scm +}: + +buildPythonPackage rec { + pname = "backports.functools_lru_cache"; + version = "1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "31f235852f88edc1558d428d890663c49eb4514ffec9f3650e7f3c9e4a12e36f"; + }; + + 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 00000000000..6f7a45a4fe8 --- /dev/null +++ b/pkgs/development/python-modules/backports_lzma/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, lzma +, python +}: + +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/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix new file mode 100644 index 00000000000..ea09a003c66 --- /dev/null +++ b/pkgs/development/python-modules/biopython/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +}: + +buildPythonPackage rec { + pname = "biopython"; + version = "1.70"; + + src = fetchPypi { + inherit pname version; + sha256 = "4a7c5298f03d1a45523f32bae1fffcff323ea9dce007fb1241af092f5ab2e45b"; + }; + + 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/blaze/default.nix b/pkgs/development/python-modules/blaze/default.nix index 017b85cacc7..74e327fd342 100644 --- a/pkgs/development/python-modules/blaze/default.nix +++ b/pkgs/development/python-modules/blaze/default.nix @@ -25,12 +25,11 @@ 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"; + sha256 = "075gqc9d7g284z4nfwv5zbq99ln22w25l4lcndjg3v10kmsjadww"; }; checkInputs = [ pytest ]; @@ -56,13 +55,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 00000000000..e4ccb0c92d6 --- /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.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "38fc8cbebea4e787d8db55d6f324820c7f74362b70db9142c1ac7920452d1a19"; + }; + + 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 ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 244ee43d0aa..e3c77fa65cf 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.13"; src = fetchPypi { inherit pname version; - sha256 = "6465fae82e94223f16584645b38d34a73d95712870f29c0244649c2cbf2c8393"; + sha256 = "6e28cbfd88de0c459435278b75f9982591ec0aaa3d37a195052645e1c62e89e3"; }; disabled = isPyPy; diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index ef12e39f23b..88209ad3fd1 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -9,9 +9,9 @@ let }; setuptools_source = fetchPypi { pname = "setuptools"; - version = "38.2.3"; + version = "38.4.0"; format = "wheel"; - sha256 = "0c4j3jiiwc0h1bdv4xklinp90spgvgiv5fsxp119hif9934nfxfs"; + sha256 = "155c2ec9fdcc00c3973d966b416e1cf3a1e7ce75f4c09fb760b23f94b935926e"; }; # TODO: Shouldn't be necessary anymore for pip > 9.0.1! diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix new file mode 100644 index 00000000000..eaab0031205 --- /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.4.8"; + + src = fetchFromGitHub { + owner = "boto"; + repo = "boto3"; + rev = version; + sha256 = "11ysd7a9l5y98q7b7az56phsj2m7w90abf4jabwrknp2c43sq9bi"; + }; + + 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 fe3fe06f4e7..8f9c0fd74e6 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.8.10"; + version = "1.8.33"; src = fetchPypi { inherit pname version; - sha256 = "16dznd0mxxs8imsl228vx5s9bz9v7ggajs496jy21n5a19cadkch"; + sha256 = "fa29ea54f26b1193682332d3b4cdde7aa79b4eaccb23f70e88672509c24546f4"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix index 515494b5f93..f9ab331a3f6 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}"; - # 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 = "1mbah208jhd7bsfaa17fwpi55f7fvif0ghjwgrjmpmx8w1vqab9l"; }; 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 00000000000..1dd2a070480 --- /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/cached-property/default.nix b/pkgs/development/python-modules/cached-property/default.nix new file mode 100644 index 00000000000..6ab5015a1e7 --- /dev/null +++ b/pkgs/development/python-modules/cached-property/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +, freezegun +}: + +buildPythonPackage rec { + pname = "cached-property"; + version = "1.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "6562f0be134957547421dda11640e8cadfa7c23238fc4e0821ab69efdb1095f3"; + }; + + checkInputs = [ freezegun ]; + + 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 ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix index 79eea057454..d36f0f308d3 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 27674edb58b..00000000000 --- 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 f8e313d660e..28d4a36aca7 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -2,16 +2,14 @@ if isPyPy then null else buildPythonPackage rec { pname = "cffi"; - version = "1.11.2"; + version = "1.11.4"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "ab87dd91c0c4073758d07334c1e5f712ce8fe48f007b86f8238773963ee700a6"; + sha256 = "df9083a992b17a28cd4251a3f5c879e0198bb26c9e808c4647e0a18739f1d11d"; }; - patches = stdenv.lib.optional (isPy27 && stdenv.cc.isClang) ./clang.patch; - outputs = [ "out" "dev" ]; propagatedBuildInputs = [ libffi pycparser ]; @@ -39,7 +37,7 @@ if isPyPy then null else buildPythonPackage rec { ''; 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/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix new file mode 100644 index 00000000000..06a455176a2 --- /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.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0mbc8kwk7pvg03bf0j57a48gr6rsdg4lzmyj0dak8y2l4lmyskpw"; + }; + + 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/click-threading/default.nix b/pkgs/development/python-modules/click-threading/default.nix new file mode 100644 index 00000000000..5be41007c6a --- /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.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "400b0bb63d9096b6bf2806efaf742a1cc8b6c88e0484f0afe7d7a7f0e9870609"; + }; + + 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/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix new file mode 100644 index 00000000000..e737b884897 --- /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/conda/default.nix b/pkgs/development/python-modules/conda/default.nix new file mode 100644 index 00000000000..a240ea21e3e --- /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/crayons/default.nix b/pkgs/development/python-modules/crayons/default.nix new file mode 100644 index 00000000000..16b3998eb85 --- /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/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix index 810a6a7bd8e..6a9e1240b86 100644 --- a/pkgs/development/python-modules/credstash/default.nix +++ b/pkgs/development/python-modules/credstash/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "credstash"; - version = "1.13.4"; + version = "1.14.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "676cc03a6143dec260c78aeef09d08a64faf27c411f8a94f6d9338e985879f81"; + sha256 = "718b337f7a6fa001e014386071f05c59900525d0507009126d2fe8d75fe0761d"; }; propagatedBuildInputs = [ cryptography boto3 pyyaml docutils ]; diff --git a/pkgs/development/python-modules/csscompressor/default.nix b/pkgs/development/python-modules/csscompressor/default.nix index a9aad8d40e5..8d0e7a58e76 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/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix new file mode 100644 index 00000000000..6ac91c0aa25 --- /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.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0si0ri8azxvxh3lpm4l4g60jf4nwzibi53yldbdbzb1svlqq060r"; + }; + + 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 a1e5f235235..d9505b384af 100644 --- a/pkgs/development/python-modules/curtsies/default.nix +++ b/pkgs/development/python-modules/curtsies/default.nix @@ -3,8 +3,6 @@ buildPythonPackage rec { pname = "curtsies"; version = "0.2.11"; - name = "${pname}-${version}"; - src = fetchPypi { inherit pname version; sha256 = "1vljmw3sy6lrqahhpyg4gk13mzcx3mwhvg8s41698ms3cpgkjipc"; diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix index 3d937debe58..69a5e8c11d4 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/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix index dcb4e9474c3..9c5a2b2110c 100644 --- a/pkgs/development/python-modules/cytoolz/default.nix +++ b/pkgs/development/python-modules/cytoolz/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "cytoolz"; - version = "0.8.2"; + version = "0.9.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "476a2ad176de5eaef80499b7b43d4f72ba6d23df33d349088dae315e9b31c552"; + sha256 = "5ebb55855a8bb7800afa58e52408763935527e0305f35600c71b43c86013dec2"; }; # Extension types @@ -23,6 +23,12 @@ buildPythonPackage rec { checkInputs = [ nose ]; propagatedBuildInputs = [ toolz ]; + # File as accidentally included in release + # See https://github.com/pytoolz/cytoolz/issues/116#issuecomment-355770073 + postPatch = '' + rm cytoolz/tests/test_curried_doctests.py + ''; + # Disable failing test https://github.com/pytoolz/cytoolz/issues/97 checkPhase = '' NOSE_EXCLUDE=test_curried_exceptions nosetests -v $out/${python.sitePackages} diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix index c90fb61ce03..f819a234146 100644 --- a/pkgs/development/python-modules/daphne/default.nix +++ b/pkgs/development/python-modules/daphne/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "daphne"; name = "${pname}-${version}"; - version = "1.3.0"; + version = "1.4.2"; src = fetchPypi { inherit pname version; - sha256 = "1xmmjp21m1w88ljsgnkf6cbzw5nxamh9cfmfgzxffpn4cdmvn96i"; + sha256 = "302725f223853b05688f28c361e050f8db9568b1ce27340c76272c26b49e6d72"; }; buildInputs = [ hypothesis ]; diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 70647b6377f..79e423d4847 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.16.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "cb93b8260f5f854ccf26b52bdc700600a08e6b7527085c7b7d63c04238bab9ea"; + sha256 = "07a0609ce053c8c2675037e6d5242899f90ecfb5262e1d0b2d7264fe8814099c"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/datashape/default.nix b/pkgs/development/python-modules/datashape/default.nix index 81ead843169..9177e9f0ff4 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,14 +8,24 @@ , dateutil }: -buildPythonPackage rec { - pname = "datashape"; - version = "0.5.2"; - name = "${pname}-${version}"; +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; + }; - src = fetchPypi { +in buildPythonPackage rec { + pname = "datashape"; + version = "0.5.4"; + + src = fetcher { inherit pname version; - sha256 = "2356ea690c3cf003c1468a243a9063144235de45b080b3652de4f3d44e57d783"; + sha256 = "0rhlj2kjj1vx5m73wnc5518rd6cs1zsbgpsvzk893n516k69shcf"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/decorator/default.nix b/pkgs/development/python-modules/decorator/default.nix new file mode 100644 index 00000000000..e852ac0385c --- /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/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix index f2be8ec5638..c43d34a9b55 100644 --- a/pkgs/development/python-modules/devpi-common/default.nix +++ b/pkgs/development/python-modules/devpi-common/default.nix @@ -2,12 +2,12 @@ with pythonPackages;buildPythonPackage rec { pname = "devpi-common"; - version = "3.2.0"; + version = "3.2.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0rh119iw5hk41gsvbjr0wixvl1i4f0b1vcnw9ym35rmcp517z0wb"; + sha256 = "e9afa277a9b227d92335c49fab40be2e9bb112c0f4dda84906c14addb1ded2f7"; }; propagatedBuildInputs = [ requests py ]; 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 00000000000..b8286e7d6b1 --- /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 }: + +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 ]; + + 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/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index e11ee54f1a6..e548781fde6 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 49349839331..36264921f64 100644 --- a/pkgs/development/python-modules/distro/default.nix +++ b/pkgs/development/python-modules/distro/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "distro"; - version = "1.0.4"; + version = "1.2.0"; buildInputs = [ pytest pytestcov tox]; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "9b000b0d637bb0cbd130a7a4835681e6993e309a85564dfea9d884825fe46954"; + sha256 = "d94370e43b676ac44fbe1ab68ca903a6147eaba3a9e8eff85b2c05556a455b76"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/django-ipware/default.nix b/pkgs/development/python-modules/django-ipware/default.nix index c4d993ac03b..1f3aedab810 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 aabfecfcacc..b8b632e1a18 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/1_11.nix b/pkgs/development/python-modules/django/1_11.nix index 9079fd86e1c..ca0322cf607 100644 --- a/pkgs/development/python-modules/django/1_11.nix +++ b/pkgs/development/python-modules/django/1_11.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "Django"; name = "${pname}-${version}"; - version = "1.11.8"; + version = "1.11.9"; disabled = pythonOlder "2.7"; src = fetchurl { url = "http://www.djangoproject.com/m/releases/1.11/${name}.tar.gz"; - sha256 = "04gphaarwj1yrhhpi9im6gsg77i2vv0iwyjc0pmxba53nndyglzy"; + sha256 = "0d0hh9sh2rwazi7z2lnqvz1424bq6ps6c5h6ss04klp14agi4g9m"; }; 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 00000000000..c1f935e51c6 --- /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.1"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0by1gswkrzxn594fa26llkzsc410999fq8s0b5d1598jwi5q0syr"; + }; + + 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 a92a7038cd3..d2f8361bc7d 100644 --- a/pkgs/development/python-modules/django_guardian/default.nix +++ b/pkgs/development/python-modules/django_guardian/default.nix @@ -16,7 +16,7 @@ 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; { diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index e2c8acd1a0b..b11847beaa9 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.3"; + version = "3.7.7"; pname = "djangorestframework"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/d/djangorestframework/${name}.tar.gz"; - sha256 = "067960e5e9e5586d3b2d53a1d626c4800dc33cd8309487d404fc63355674556f"; + sha256 = "9f9e94e8d22b100ed3a43cee8c47a7ff7b185e778a1f2da9ec5c73fc4e081b87"; }; # Test settings are missing diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index 88d85dad91a..4ce013ac797 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -3,13 +3,13 @@ , ipaddress, backports_ssl_match_hostname, docker_pycreds }: buildPythonPackage rec { - version = "2.5.1"; + version = "2.7.0"; pname = "docker"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/d/docker/${name}.tar.gz"; - sha256 = "b876e6909d8d2360e0540364c3a952a62847137f4674f2439320ede16d6db880"; + sha256 = "144248308e8ea31c4863c6d74e1b55daf97cc190b61d0fe7b7313ab920d6a76c"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/docker_compose/default.nix b/pkgs/development/python-modules/docker_compose/default.nix index 78e733c1b9d..e6be57c8b52 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.18.0"; pname = "docker-compose"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0yg58m5kk22kihbra0h40miqnbdmkirjr9y47wns613sdikrymmg"; + sha256 = "2930cbfe2685018fbb75377600ab6288861d9955717b3f14212f63950351d379"; }; # 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 diff --git a/pkgs/development/python-modules/dyn/default.nix b/pkgs/development/python-modules/dyn/default.nix index 881f51b69aa..efb9cab8048 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 38e201849c1..fbe5c02771d 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/ecpy/default.nix b/pkgs/development/python-modules/ecpy/default.nix index 25ca8dabf2b..84830e7f2b8 100644 --- a/pkgs/development/python-modules/ecpy/default.nix +++ b/pkgs/development/python-modules/ecpy/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "ECPy"; - version = "0.8.2"; + version = "0.8.3"; src = fetchPypi { inherit pname version; - sha256 = "0509a90714448ef47ef727cb7aee3415995c883c945e972521b5838fa4c50e24"; + sha256 = "ef3d95419d53368f52fb7d4b883b8df0dfc2dd19a76243422d24981c3e5f27bd"; }; buildInputs = [ hidapi pycrypto pillow protobuf future ]; diff --git a/pkgs/development/python-modules/elasticsearch-curator/default.nix b/pkgs/development/python-modules/elasticsearch-curator/default.nix index bbd2904fd9e..bdace922084 100644 --- a/pkgs/development/python-modules/elasticsearch-curator/default.nix +++ b/pkgs/development/python-modules/elasticsearch-curator/default.nix @@ -16,7 +16,6 @@ buildPythonPackage rec { pname = "elasticsearch-curator"; version = "5.4.1"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix new file mode 100644 index 00000000000..88399d31697 --- /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.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "8d91a3fce12123a187b673f18c23bcffa6e7b49ba057555d59eeeded0ba15dce"; + }; + + # 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/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix new file mode 100644 index 00000000000..250a2f55932 --- /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.7.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "188ahmqnh5y1f46m7pyjdmi9zfxswaggn6xga65za554d72azvap"; + }; + + 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 1a9b684a9f3..fe6daf73339 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.6"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0xihl5w2m4vkp0515qjibiy88pk380n5jmj8n9hh7q40b1vx1kwb"; + sha256 = "1ba84ab471bc2203a728fe4707a9279c44420224180b418601778125f51577ff"; }; patches = [ diff --git a/pkgs/development/python-modules/extras/default.nix b/pkgs/development/python-modules/extras/default.nix new file mode 100644 index 00000000000..adcc43f2650 --- /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/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 3c95a26881e..2d459d625d0 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -8,12 +8,12 @@ assert pythonOlder "3.3" -> ipaddress != null; buildPythonPackage rec { pname = "Faker"; - version = "0.8.7"; + version = "0.8.8"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "bf7dabcd6807c8829da28a4de491adf7998af506b8571db6a6eb58161157248a"; + sha256 = "e928cf853ef69d7471421f2a3716a1239e43de0fa9855f4016ee0c9f1057328a"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/fastimport/default.nix b/pkgs/development/python-modules/fastimport/default.nix index ee1048ec5fa..44f7bcdab06 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 00000000000..848f01d6e16 --- /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 f8d877f0655..ee2a65e981c 100644 --- a/pkgs/development/python-modules/faulthandler/default.nix +++ b/pkgs/development/python-modules/faulthandler/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "faulthandler"; - version = "2.6"; + version = "3.0"; src = fetchPypi { inherit pname version; - sha256 = "0zywq3jaznddvqc3hnfrlv24wmpyq4xgajk9xhv6578qw1rpfj2r"; + sha256 = "acc10e10909f0f956ba1b42b6c450ea0bdaaa27b3942899f65931396cfcdd36a"; }; meta = { diff --git a/pkgs/development/python-modules/fedpkg/default.nix b/pkgs/development/python-modules/fedpkg/default.nix index c3aeed0abbe..0230466e6e3 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 00000000000..5d617ba9369 --- /dev/null +++ b/pkgs/development/python-modules/filelock/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "filelock"; + version = "3.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "b3ad481724adfb2280773edd95ce501e497e88fa4489c6e41e637ab3fd9a456c"; + }; + + 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 5c150844c84..1fc7ae5aa58 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"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "fc4c8996be3131f36c791d66273317d38b72b19dc24c2afc332fd734752eb7a8"; + sha256 = "5e9c68ea71e9d79fcfb68c9a101c0b133301e233c9bcca7b7c65f33cc7636ef5"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/flake8-debugger/default.nix b/pkgs/development/python-modules/flake8-debugger/default.nix index c00bf0c8551..aab91433088 100644 --- a/pkgs/development/python-modules/flake8-debugger/default.nix +++ b/pkgs/development/python-modules/flake8-debugger/default.nix @@ -3,10 +3,10 @@ buildPythonPackage rec { pname = "flake8-debugger"; name = "${pname}-${version}"; - version = "1.4.0"; + version = "3.0.0"; src = fetchurl { url = "mirror://pypi/f/flake8-debugger/${name}.tar.gz"; - sha256 = "0chjfa6wvnqjnx778qzahhwvjx1j0rc8ax0ipp5bn70gf47lj62r"; + sha256 = "e5c8ac980d819db2f3fbb89fe0e43a2fe6c127edd6ce4984a3f7e0bbdac3d2d4"; }; buildInputs = [ nose ]; propagatedBuildInputs = [ flake8 ]; 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 00000000000..31fe2a677c3 --- /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 00000000000..a60c5a993ea --- /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-testing/default.nix b/pkgs/development/python-modules/flask-testing/default.nix index 178e000a32e..5f843138eae 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 298da4a85bf..3a73b464a46 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,25 +21,22 @@ buildPythonPackage rec { pname = "flit"; - version = "0.11.4"; - name = "${pname}-${version}"; - -# format = "wheel"; + version = "0.13"; src = fetchPypi { inherit pname version; -# url = https://files.pythonhosted.org/packages/24/98/50a090112a04d9e29155c31a222637668b0a4dd778fefcd3132adc50e877/flit-0.10-py3-none-any.whl; - sha256 = "8ba7603cc3bf4149d81811d40fe331abc45ff37a207c63f5f712a0fdb69297bb"; + sha256 = "8f558351bf4bb82b872d3bdbea7055cbb2e33ed2bdf809284bf927d4c78bf0ee"; }; 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 = { diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 1dfc22f769b..80fc3893f17 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "fonttools"; - version = "3.17.0"; + version = "3.21.2"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1c4f26bf32cd58d5881bfe1f42e5f0a1637a58452a60ae1623999f3ae7da0e24"; + sha256 = "96b636793c806206b1925e21224f4ab2ce5bea8ae0990ed181b8ac8d30848f47"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix new file mode 100644 index 00000000000..ced7d7bdcd4 --- /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 b1ba77ab868..e54531017f4 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "ftfy"; # latest is 5.1.1, buy spaCy requires 4.4.3 - version = "5.1.1"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - sha256 = "67a29a2fad5f72aec2d8a0a7084e4f499ed040455133ee96b1c458609fc29e78"; + sha256 = "b9f84a1437f68ad0bb964fd9da9f6b88d090113ec9e78f290f6d6d0221468e38"; }; propagatedBuildInputs = [ html5lib wcwidth]; diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index ea5fc12e432..4edd9ac3e55 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.2.0"; src = fetchPypi { inherit pname version; - sha256 = "4827012f6f020ac4f4067c2a2a88542391917113faaa417505e1ee8a1e7e2650"; + sha256 = "db00b68c6567ba0598d400b917c889e8801adf249170ce0a80ec38187d1b0797"; }; propagatedBuildInputs = [ smart_open numpy six scipy diff --git a/pkgs/development/python-modules/gflags/default.nix b/pkgs/development/python-modules/gflags/default.nix index 6fe4b7fcab8..9eb8e3b2d6c 100644 --- a/pkgs/development/python-modules/gflags/default.nix +++ b/pkgs/development/python-modules/gflags/default.nix @@ -2,16 +2,14 @@ buildPythonPackage rec { version = "3.1.2"; - pname = "gflags"; - name = pname + "-" + 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/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix new file mode 100644 index 00000000000..2899eeb4a8a --- /dev/null +++ b/pkgs/development/python-modules/google_api_core/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi +, google_auth, protobuf, googleapis_common_protos, requests, grpcio, setuptools, mock, pytest }: + +buildPythonPackage rec { + pname = "google-api-core"; + version = "0.1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0144d467083ed54d2e8ccb4212d42c3724fe0b844b7d3a0ff85aea54b7ae8347"; + }; + + propagatedBuildInputs = [ google_auth protobuf googleapis_common_protos requests grpcio ]; + checkInputs = [ setuptools mock pytest ]; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.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 00000000000..2076f3c3444 --- /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.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "d119b5954393d81c4a986ab420cf2c8129fc95ff5c4c6bb8ab5c8f3e6446394f"; + }; + + 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 00000000000..c0ccef3c959 --- /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.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1h8bx99ksla48zkb7bhkqy66b8prg49dp15alh851vzi9ii2zii7"; + }; + + 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 00000000000..796bd26febd --- /dev/null +++ b/pkgs/development/python-modules/google_cloud_speech/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi +, setuptools, google_api_core, google_gax, google_cloud_core, pytest, mock }: + +buildPythonPackage rec { + pname = "google-cloud-speech"; + version = "0.30.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ckigh6bfzhflhllqdnfygm8w0r6ncp0myf1midifx7sn880g4pa"; + }; + + propagatedBuildInputs = [ setuptools google_api_core google_gax google_cloud_core ]; + checkInputs = [ pytest mock ]; + + checkPhase = '' + py.test + ''; + + 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 00000000000..24000161338 --- /dev/null +++ b/pkgs/development/python-modules/google_gax/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi +, google_auth, ply, protobuf, grpcio, requests, googleapis_common_protos, dill, future, pytest, mock, unittest2 }: + +buildPythonPackage rec { + pname = "google-gax"; + version = "0.15.16"; + + src = fetchPypi { + inherit pname version; + sha256 = "0p1ribd2xy7a04wnjv12agkcdi6f9cpj838884hayx07p5g8v3ji"; + }; + + 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 00000000000..28e84f4846e --- /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/gpy/default.nix b/pkgs/development/python-modules/gpy/default.nix index bc48a7490aa..bb39746d296 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.8.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "38c1202f1790952b88c298224139ee5b14d4518e3ddc6186c60db2ece016d8c1"; + sha256 = "1562e34629192f209273f454e41614a127c6ef04144cd0eb5992d484721d55d3"; }; # 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 a3de4d3f7bc..485c5b5ef07 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/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix new file mode 100644 index 00000000000..c22f2c2f4d7 --- /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.8.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "88d87aab9c7889b3ab29dd74aac1a5493ed78b9bf5afba1c069c9dd5531f951d"; + }; + + 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 index 3b13f8a2049..b075db5ae98 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -3,12 +3,12 @@ nose, shouldbe, gss, krb5Full, which, darwin }: buildPythonPackage rec { pname = "gssapi"; - version = "1.2.0"; + version = "1.3.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1q6ccpz6anl9vggwxdq32wp6xjh2lyfbf7av6jqnmvmyqdfwh3b9"; + sha256 = "765205082a9490c8e8be88ac16a6249d124396a671665edeec9927a7f244d712"; }; # It's used to locate headers diff --git a/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix b/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix index e0b36de5672..08b42b80799 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/hbmqtt/default.nix b/pkgs/development/python-modules/hbmqtt/default.nix new file mode 100644 index 00000000000..379aa1c3cf4 --- /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.1"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "04lqqcy84f9gcwqhrlvzp689r3mkdd8ipsnfzw8gryfny4lh8wrx"; + }; + + 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/html5lib/default.nix b/pkgs/development/python-modules/html5lib/default.nix new file mode 100644 index 00000000000..97d2854ca22 --- /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 2206b3559ba..8df4b3813c4 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/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix index d11d6b3668f..77dc27f1096 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/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index ab56cde9c13..91939d14688 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 +, doCheck ? true, pytest, pytest_xdist, flake8, flaky, mock }: buildPythonPackage rec { # http://hypothesis.readthedocs.org/en/latest/packaging.html @@ -9,7 +9,7 @@ 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.27.0"; pname = "hypothesis"; name = "${pname}-${version}"; @@ -18,10 +18,10 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis-python"; rev = "${version}"; - sha256 = "0damf6zbm0db2a3gfwrbbj92yal576wpmhhchc0w0np8vdnax70n"; - }; + sha256 = "1lvhd8jrwajyc5w1alb9vinsi97fjfqpkxkh8g8j527831lig0j0"; + }; - checkInputs = stdenv.lib.optionals doCheck [ pytest pytest_xdist flake8 flaky ]; + checkInputs = stdenv.lib.optionals doCheck [ pytest pytest_xdist flake8 flaky mock]; propagatedBuildInputs = stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ]; inherit doCheck; @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with stdenv.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/idna-ssl/default.nix b/pkgs/development/python-modules/idna-ssl/default.nix new file mode 100644 index 00000000000..177e68f6295 --- /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.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1227e44039bd31e02adaeafdbba61281596d623d222643fb021f87f2144ea147"; + }; + + 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 00000000000..635f8b33d3c --- /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 = "http://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/intervaltree/default.nix b/pkgs/development/python-modules/intervaltree/default.nix index 69b35df2973..feccdff683e 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/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index a77f6ac9c2f..330141fcd06 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.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "2e1825aca4e2585b5adb7953ea16e53f53a62159ed49952a564b1e23507205db"; + sha256 = "dedc199df6a38725c732986dfa606c245fb8fe0fe999b33a0c305b73d80c6774"; }; buildInputs = [ nose ] ++ lib.optional isPy27 mock; diff --git a/pkgs/development/python-modules/ipython/5.nix b/pkgs/development/python-modules/ipython/5.nix index b25039cc71e..808853891e9 100644 --- a/pkgs/development/python-modules/ipython/5.nix +++ b/pkgs/development/python-modules/ipython/5.nix @@ -27,12 +27,12 @@ buildPythonPackage rec { pname = "ipython"; - version = "5.3.0"; + version = "5.5.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "bf5e615e7d96dac5a61fbf98d9e2926d98aa55582681bea7e9382992a3f43c1d"; + sha256 = "66469e894d1f09d14a1f23b971a410af131daa9ad2a19922082e02e0ddfd150f"; }; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index 3d156323491..f77c3570c02 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.5"; + version = "7.1.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "321be3dc48193130ba16e8080172bb5cd052eb65e3ad0ea7b5f80ff73e24bc54"; + sha256 = "3e2be7dea4f97c9a4df71ef065cad9f2e420dd901127bf7cb690fb56d2b34ea3"; }; # 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 00000000000..4f9ff70556b --- /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/jdcal/default.nix b/pkgs/development/python-modules/jdcal/default.nix new file mode 100644 index 00000000000..d3ed32c0882 --- /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 bf9f9f9c082..df8a287ea09 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -2,12 +2,12 @@ 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 = '' diff --git a/pkgs/development/python-modules/jellyfish/default.nix b/pkgs/development/python-modules/jellyfish/default.nix new file mode 100644 index 00000000000..db83e6cb299 --- /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/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index ca286ae06aa..cb0eb130a2f 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -1,20 +1,24 @@ -{ stdenv, buildPythonPackage, fetchPypi -, markupsafe }: +{ stdenv, buildPythonPackage, fetchFromGitHub +, pytest, markupsafe }: buildPythonPackage rec { pname = "Jinja2"; version = "2.9.6"; name = "${pname}-${version}"; - src = fetchPypi { - inherit pname version; - sha256 = "1zzrkywhziqffrzks14kzixz7nd4yh2vc0fb04a68vfd2ai03anx"; + src = fetchFromGitHub { + owner = "pallets"; + repo = "jinja"; + rev = version; + sha256 = "1xxc5vdhz214aawmllv0fi4ak6d7zac662yb7gn1xfgqfz392pg5"; }; + checkInputs = [ pytest ]; propagatedBuildInputs = [ markupsafe ]; - # No tests included - doCheck = false; + checkPhase = '' + pytest -v + ''; meta = with stdenv.lib; { homepage = http://jinja.pocoo.org/; @@ -24,7 +28,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 00000000000..5f80f4e4b20 --- /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/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index a2278566c6d..19b1eeefa53 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/jsondiff/default.nix b/pkgs/development/python-modules/jsondiff/default.nix new file mode 100644 index 00000000000..9d4331c8ea8 --- /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 39f36b1d949..8d238b4746d 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.21"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "f025c28a08ce747429ee746bb21796c3b6417ec82288f8fe6514db7398f2af8a"; + sha256 = "11f5ffdf543a83047a2f54ac28f8caad7f34724cb1ea26b27547fd974f1a2153"; }; # 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 00000000000..2d9f02a5aff --- /dev/null +++ b/pkgs/development/python-modules/jsonpickle/default.nix @@ -0,0 +1,23 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "jsonpickle"; + version = "0.9.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "cc25dc79571d4ad7db59d05ddb7de0d76a8d598cf6136e1dbeaa9361ebcfe749"; + }; + + 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/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix index 3782d313df8..42d7752eda3 100644 --- a/pkgs/development/python-modules/jupyter_client/default.nix +++ b/pkgs/development/python-modules/jupyter_client/default.nix @@ -1,30 +1,32 @@ { lib , buildPythonPackage , fetchPypi -, nose , traitlets , jupyter_core , pyzmq , dateutil , isPyPy , py +, ipykernel +, ipython +, mock +, pytest }: buildPythonPackage rec { pname = "jupyter_client"; - version = "5.1.0"; - name = "${pname}-${version}"; + version = "5.2.1"; src = fetchPypi { inherit pname version; - sha256 = "08756b021765c97bc5665390700a4255c2df31666ead8bff116b368d09912aba"; + sha256 = "462790d46b244f0a631ea5e3cd5cdbad6874d5d24cc0ff512deb7c16cdf8653d"; }; - buildInputs = [ nose ]; + checkInputs = [ ipykernel ipython mock pytest ]; propagatedBuildInputs = [traitlets jupyter_core pyzmq dateutil] ++ 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 4db36cf7b37..403f7c047d5 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 61415b756ab..7e7e9ae93a0 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/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix new file mode 100644 index 00000000000..dbd2e36b7b8 --- /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/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index d88b6e4999b..8ef263cdfa8 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.1.1"; + version = "2.1.3"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "f0ca2458c60d9711edf4291230b31795307ad3781cb6232ff4792b53c8f55123"; + sha256 = "7ca3a381523bad40a6922e88951a316664cb088fd01cea07e5ec8ada3327e3c7"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index ca7a518665c..0f99152766a 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -1,23 +1,23 @@ { stdenv, buildPythonPackage, fetchPypi , secretstorage , fs, gdata, python_keyczar, pyasn1, pycrypto, six, setuptools_scm -, mock, pytest_28, pytestrunner }: +, mock, pytest, pytestrunner }: buildPythonPackage rec { name = "${pname}-${version}"; pname = "keyring"; - version = "10.4.0"; + version = "10.6.0"; src = fetchPypi { inherit pname version; - sha256 = "09iv50c14mdmdk7sjd6bb47yg7347gymh6r8c0q4gfnzs173y6lh"; + sha256 = "69c2b69d66a0db1165c6875c1833c52f4dc62179959692b30c8c4a4b8390d895"; }; buildInputs = [ fs gdata python_keyczar pyasn1 pycrypto six setuptools_scm ]; - checkInputs = [ mock pytest_28 pytestrunner ]; + checkInputs = [ mock pytest pytestrunner ]; propagatedBuildInputs = [ secretstorage ]; diff --git a/pkgs/development/python-modules/kitchen/default.nix b/pkgs/development/python-modules/kitchen/default.nix index a35737e69ba..b4b6c48201b 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/koji/default.nix b/pkgs/development/python-modules/koji/default.nix index 56865b336be..f2073a48c58 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/lark-parser/default.nix b/pkgs/development/python-modules/lark-parser/default.nix index b81cc132a2d..a1b58a4eb05 100644 --- a/pkgs/development/python-modules/lark-parser/default.nix +++ b/pkgs/development/python-modules/lark-parser/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "lark-parser"; # PyPI name - version = "2017-12-10"; + version = "2017-12-18"; src = fetchFromGitHub { owner = "erezsh"; repo = "lark"; - rev = "852607b978584ecdec68ac115dd8554cdb0a2305"; - sha256 = "1clzmvbp1b4zamcm6ldak0hkw46n3lhw4b28qq9xdl0n4va6zig7"; + rev = "9d6cde9b1ba971f02ea8106fa3b71a934e83d6fa"; + sha256 = "0nv6nxd8wx9dwhn37m94fkc10gknckrjs1hzajxygla3dpql455j"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/ldap/default.nix b/pkgs/development/python-modules/ldap/default.nix index 635308f3760..32f25eeda42 100644 --- a/pkgs/development/python-modules/ldap/default.nix +++ b/pkgs/development/python-modules/ldap/default.nix @@ -1,18 +1,18 @@ { lib, writeText, buildPythonPackage, isPy3k, fetchPypi -, openldap, cyrus_sasl, openssl, pytest }: +, openldap, cyrus_sasl, openssl, pytest, pyasn1 }: buildPythonPackage rec { pname = "python-ldap"; - version = "2.4.45"; + version = "2.5.2"; name = "${pname}-${version}"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "824fde180a53772e23edc031c4dd64ac1af4a3eade78f00d9d510937d562f64e"; + sha256 = "b8c134dfedaef0e6ff4a4b94277708dcadb758b448905a83b8946df077356ed2"; }; - buildInputs = [ pytest ]; + checkInputs = [ pytest pyasn1 ]; checkPhase = '' # Needed by tests to setup a mockup ldap server. diff --git a/pkgs/development/python-modules/ldap3/default.nix b/pkgs/development/python-modules/ldap3/default.nix index 895272f351d..a58090680cd 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/ldaptor/default.nix b/pkgs/development/python-modules/ldaptor/default.nix new file mode 100644 index 00000000000..4eab700ff14 --- /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/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index e8cecda7589..d6c96534d74 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.7"; src = fetchPypi{ inherit pname version; - sha256 = "982b81c19dc9ee1158dc32fedbe1c36aff2b6872fa0dd42173b639b965ccfb2e"; + sha256 = "3ae14dc14859f7b4b92583ab0d40884ac07f26dbe00c7b747df2d50f4b1af098"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index 57f8d2c8114..3fe0b3911c2 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -1,7 +1,6 @@ -{ stdenv, fetchPypi, buildPythonPackage, pytest_29 }: +{ stdenv, fetchPypi, buildPythonPackage, pytest }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "libtmux"; version = "0.7.7"; @@ -10,11 +9,14 @@ buildPythonPackage rec { sha256 = "5670c8da8d0192d932ac1e34f010e0eeb098cdb2af6daad0307b5418e7a37733"; }; - 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 00000000000..f3b48eaa576 --- /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/limits/default.nix b/pkgs/development/python-modules/limits/default.nix new file mode 100644 index 00000000000..672cad5bfe1 --- /dev/null +++ b/pkgs/development/python-modules/limits/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchPypi, buildPythonPackage, six }: + +buildPythonPackage rec { + pname = "limits"; + version = "1.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0dfbrmqixsvhvzqgd4s8rfj933k1w5q4bm23pp9zyp70xlb0mfmd"; + }; + + 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 570bba2a8c4..26dfda613f7 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/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index 4c4c89d8f19..ef4d9fb5d02 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "llfuse"; - version = "1.0"; + version = "1.3.2"; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/l/llfuse/${name}.tar.bz2"; - sha256 = "1li7q04ljrvwharw4fblcbfhvk6s0l3lnv8yqb4c22lcgbkiqlps"; + sha256 = "96252a286a2be25810904d969b330ef2a57c2b9c18c5b503bbfbae40feb2bb63"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index 57deaf3caf3..d702d8f95b0 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.21.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 = "3a5dd0695fdfb9fd47464cd71791b84935bf9642e11f4811d57aa1f2da8cdaa8"; }; 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/ltc_scrypt/default.nix b/pkgs/development/python-modules/ltc_scrypt/default.nix deleted file mode 100644 index 273571c66e1..00000000000 --- 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/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix new file mode 100644 index 00000000000..bfd0c8227ee --- /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.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e"; + }; + + 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/marionette-harness/default.nix b/pkgs/development/python-modules/marionette-harness/default.nix index fbdd13a7f38..f909974db6b 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 d3eab83eea8..4315b08e016 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/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix new file mode 100644 index 00000000000..515dee0e766 --- /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/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index afb60801dc9..a9db6ef1e84 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 345a21ecddf..33505b5f618 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -20,13 +20,13 @@ assert enableTk -> (tcl != null) assert enableQt -> pyqt4 != null; buildPythonPackage rec { - version = "2.1.0"; + version = "2.1.1"; pname = "matplotlib"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://pypi/m/matplotlib/${name}.tar.gz"; - sha256 = "4b5f16c9cefde553ea79975305dcaa67c8e13d927b6e55aa14b4a8d867e25387"; + sha256 = "659f5e1aa0e0f01488c61eff47560c43b8be511c6a29293d7f3896ae17bd8b23"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; diff --git a/pkgs/development/python-modules/maya/default.nix b/pkgs/development/python-modules/maya/default.nix new file mode 100644 index 00000000000..9c6cb241fea --- /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 28f6057e563..9fbaced9b65 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/meinheld/default.nix b/pkgs/development/python-modules/meinheld/default.nix new file mode 100644 index 00000000000..526cd3ed4ee --- /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/mistune/default.nix b/pkgs/development/python-modules/mistune/default.nix index 14aef5b00d1..7ab4a184263 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/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index cf74e1dc134..84096d8aa92 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -1,17 +1,20 @@ -{ 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.2.0"; + src = fetchPypi { inherit pname version; - sha256 = "19s8hfz4mzzzdksa0ddlvrga5mxdaqahk89p5l29a5id8127shr8"; + sha256 = "c42b894cdf35412c95f0c6b40309cf802436e049cd172dc5db7516c7b845191b"; }; propagatedBuildInputs = [ + aws-xray-sdk boto + boto3 dateutil flask httpretty @@ -21,6 +24,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/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 614157542b1..7eaa0962b44 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -1,20 +1,18 @@ { lib -, fetchurl +, fetchPypi , buildPythonPackage , cython , pytest, psutil, 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 ]; @@ -22,9 +20,10 @@ in buildPythonPackage rec { 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/mygpoclient/default.nix b/pkgs/development/python-modules/mygpoclient/default.nix new file mode 100644 index 00000000000..097898a2d84 --- /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/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index 4fc1f7255c6..8e81f923b91 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -39,9 +39,7 @@ buildPythonPackage rec { sha256 = "9ffbfb74bf3fc3905be1b9b052ed865675651e38fcd972ed1ed5c64a02f93cbd"; }; - # 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; + patches = lib.optional (isPy35 || isPy36) ./python-3.6.3-test-failures.patch; # testing based on project's tox.ini checkPhase = '' diff --git a/pkgs/development/python-modules/natsort/setup.patch b/pkgs/development/python-modules/natsort/setup.patch deleted file mode 100644 index 4c52b740152..00000000000 --- 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 index 964b42fe4ee..26525adb1c9 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "nbxmpp"; - version = "0.6.0"; + version = "0.6.2"; src = fetchPypi { inherit pname version; - sha256 = "0x495yb0abkdspyziw7dyyjwxx6ivnv5zznk92wa3mcind5s9757"; + sha256 = "10bfb12b083a7509779298c31b4b61e2ed7e78d1960cbcfb3de8d38f3b830991"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/netdisco/default.nix b/pkgs/development/python-modules/netdisco/default.nix new file mode 100644 index 00000000000..96de3ee2836 --- /dev/null +++ b/pkgs/development/python-modules/netdisco/default.nix @@ -0,0 +1,32 @@ +{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, requests, zeroconf, netifaces, pytest }: + +buildPythonPackage rec { + pname = "netdisco"; + version = "1.2.4"; + + disabled = !isPy3k; + + # PyPI is missing tests/ directory + src = fetchFromGitHub { + owner = "home-assistant"; + repo = pname; + rev = version; + sha256 = "170s9py8rw07cfgwvv7mf69g8jjg32m2rgw8x3kbvjqlmrdijxmm"; + }; + + 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 00000000000..f6fc4139c85 --- /dev/null +++ b/pkgs/development/python-modules/networkx/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, decorator +, isPy36 +, isPyPy +}: + +buildPythonPackage rec { + pname = "networkx"; + version = "1.11"; + + # Currently broken on PyPy. + # https://github.com/networkx/networkx/pull/1361 + disabled = isPyPy; + + src = fetchPypi { + inherit pname version; + sha256 = "1f74s56xb4ggixiq0vxyfxsfk8p20c7a099lpcf60izv1php03hd"; + }; + + checkInputs = [ nose ]; + propagatedBuildInputs = [ decorator ]; + + # 17 failures with 3.6 https://github.com/networkx/networkx/issues/2396#issuecomment-304437299 + doCheck = !(isPy36); + + meta = { + homepage = "https://networkx.github.io/"; + description = "Library for the creation, manipulation, and study of the structure, dynamics, and functions of complex networks"; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix new file mode 100644 index 00000000000..7db4378a6e6 --- /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 16036a69179..6133abac705 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"; + version = "0.4.0"; name = pname + "-" + version; src = fetchPypi { inherit pname version; - sha256 = "0kkarh5cdcd2czs0bf0s1g51qas84mfxfq0dzd7k5h5l0qr4zy06"; + sha256 = "bb692254bde35d7e1d3d1534d9b3117810b35a744724625f150fbbc64d519c02"; }; 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 00000000000..26f1ea3294b --- /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 00000000000..8ee6eeb104b --- /dev/null +++ b/pkgs/development/python-modules/nipype/default.nix @@ -0,0 +1,68 @@ +{ 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 +# other dependencies +, which +}: + +assert !isPy3k -> configparser != null; + +buildPythonPackage rec { + pname = "nipype"; + version = "0.14.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0airdrh93vwmbfkqxp5cqfzm0zzqcvjnvphv3zhg197y39xxpl1k"; + }; + + doCheck = false; # fails with TypeError: None is not callable + checkInputs = [ which ]; + buildInputs = [ pytest mock ]; # required in installPhase + propagatedBuildInputs = [ + click + dateutil + funcsigs + future + networkx + nibabel + numpy + packaging + prov + psutil + pydot + scipy + simplejson + traits + xvfbwrapper + ] ++ stdenv.lib.optional (!isPy3k) [ + configparser + ]; + + 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/node-semver/default.nix b/pkgs/development/python-modules/node-semver/default.nix index 8c518f9b7ff..7351d2edfd3 100644 --- a/pkgs/development/python-modules/node-semver/default.nix +++ b/pkgs/development/python-modules/node-semver/default.nix @@ -2,14 +2,14 @@ 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/nose-parameterized/default.nix b/pkgs/development/python-modules/nose-parameterized/default.nix new file mode 100644 index 00000000000..3c7cd077cdc --- /dev/null +++ b/pkgs/development/python-modules/nose-parameterized/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchPypi, buildPythonPackage, nose, six, glibcLocales, isPy3k }: + +buildPythonPackage rec { + pname = "nose-parameterized"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1khlabgib4161vn6alxsjaa8javriywgx9vydddi659gp9x6fpnk"; + }; + + # Tests require some python3-isms but code works without. + doCheck = isPy3k; + + buildInputs = [ nose glibcLocales ]; + propagatedBuildInputs = [ six ]; + + checkPhase = '' + LC_ALL="en_US.UTF-8" nosetests -v + ''; + + meta = with stdenv.lib; { + description = "Parameterized testing with any Python test framework"; + homepage = https://pypi.python.org/pypi/nose-parameterized; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 2a23ff4de78..77ff31934c3 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -17,17 +17,17 @@ , ipykernel , terminado , requests +, send2trash , pexpect }: buildPythonPackage rec { pname = "notebook"; - version = "5.2.1"; - name = "${pname}-${version}"; + version = "5.3.1"; src = fetchPypi { inherit pname version; - sha256 = "4ae5b81dd39b37cdd99dcffe83a5182c849947b92d46ac4d2b5093af2bb9f224"; + sha256 = "12vk3shylx61whdchxbg71mdlwiw2l31vl227sqwpb0p67bbw2rq"; }; LC_ALL = "en_US.utf8"; @@ -36,7 +36,7 @@ buildPythonPackage rec { ++ (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 ]; diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index b0d7ae72c95..97aad8c0928 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.36.2"; pname = "numba"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/n/numba/${name}.tar.gz"; - sha256 = "11564937757605bee590c5758c73cfe9fd6d569726b56d970316a6228971ecc3"; + src = fetchPypi { + inherit pname version; + sha256 = "d61597808ce511e81b64e32da664f52beb7d947bf834dde8b8b60b29d205e5c2"; }; 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 00000000000..e6fc5888fea --- /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} <=2" "" + ''; + # gcc: error: pygpu_language_opencl.cpp: No such file or directory doCheck = false; diff --git a/pkgs/development/python-modules/pysc2/default.nix b/pkgs/development/python-modules/pysc2/default.nix index a2dfd53b795..89799988fa1 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/pysigset/default.nix b/pkgs/development/python-modules/pysigset/default.nix new file mode 100644 index 00000000000..85bcf56f062 --- /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 e855b952f27..41b42bb63ec 100644 --- a/pkgs/development/python-modules/pyslurm/default.nix +++ b/pkgs/development/python-modules/pyslurm/default.nix @@ -2,18 +2,16 @@ buildPythonPackage rec { pname = "pyslurm"; - version = "unstable-69e4f4f"; + version = "20171102"; name = pname + "-" + version; src = fetchFromGitHub { repo = "pyslurm"; owner = "PySlurm"; - rev = "69e4f4fd66003b98ddb7da25613fe641d4ae160d"; - sha256 = "051kafkndbniklxyf0drb360aiblnqcf9rqjbvmqh66zrfya1m28"; + rev = "a2acbc820da419e308c5817998d2abe78a7b75e6"; + sha256 = "1wmlx5fh1xzjyksvmq7i083hmyvs7id61ysk2d9hbmf8rza498as"; }; - 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 2b3798a3070..00000000000 --- 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 ef67ed85cc0..aa7d23c5fcb 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"; - version = "0.8.1"; + version = "0.9.0.post1"; name = pname + "-" + version; src = fetchPypi { inherit pname version; - sha256 = "72c3e23b7c9998460ec78176084ea101e3439596ab29df476bc8508708df84df"; + sha256 = "43dd46a2afc0484c26930a7e59eef9365cee81bce7a4aadc5699f788f60d32c3"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pyte/default.nix b/pkgs/development/python-modules/pyte/default.nix index 2bd71070581..ed408feec81 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 00000000000..afdc085aa9f --- /dev/null +++ b/pkgs/development/python-modules/pytest-aiohttp/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest, aiohttp }: + +buildPythonPackage rec { + pname = "pytest-aiohttp"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0kx4mbs9bflycd8x9af0idcjhdgnzri3nw1qb0vpfyb3751qaaf9"; + }; + + propagatedBuildInputs = [ pytest aiohttp ]; + + 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-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix index 2b615e5820e..d79f32a6766 100644 --- a/pkgs/development/python-modules/pytest-flake8/default.nix +++ b/pkgs/development/python-modules/pytest-flake8/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; checkPhase = '' - pytest --ignore=nix_run_setup.py . + pytest . ''; meta = { diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix index 6f6f79109d9..caa2c27e3f8 100644 --- a/pkgs/development/python-modules/pytest-httpbin/default.nix +++ b/pkgs/development/python-modules/pytest-httpbin/default.nix @@ -11,21 +11,17 @@ 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 ]; meta = { diff --git a/pkgs/development/python-modules/pytest-localserver/default.nix b/pkgs/development/python-modules/pytest-localserver/default.nix index fdd1986c04f..c98370ed938 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-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix new file mode 100644 index 00000000000..9c906fe2fa4 --- /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-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index e993a67c49f..d671fd9654a 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "pytest-xdist"; - version = "1.20.1"; + version = "1.22.0"; src = fetchPypi { inherit pname version; - sha256 = "433e82f9b34986a4e4b2be38c60e82cca3ac64b7e1b38f4d8e3e118292939712"; + sha256 = "65228a859191f2c74ee68c127317eefe35eedd3d43fc1431f19240663b0cafcd"; }; buildInputs = [ pytest setuptools_scm pytest-forked]; 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 e63c3f5ebbd..00000000000 --- a/pkgs/development/python-modules/pytest/2_7.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, pkgs, buildPythonPackage, fetchurl, isPy26, argparse, py, selenium }: -buildPythonPackage rec { - pname = "pytest"; - version = "2.7.3"; - name = pname + "-" + version; - - 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 963154b11ce..00000000000 --- a/pkgs/development/python-modules/pytest/2_8.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, pkgs, buildPythonPackage, fetchurl, isPy26, argparse, py, selenium }: -buildPythonPackage rec { - pname = "pytest"; - version = "2.8.7"; - name = pname + "-" + version; - - 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 2d28517441b..00000000000 --- a/pkgs/development/python-modules/pytest/2_9.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, pkgs, buildPythonPackage, fetchurl, isPy26, argparse, py, selenium }: -buildPythonPackage rec { - pname = "pytest"; - version = "2.9.2"; - name = pname + "-" + version; - - 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 487fe1b73c7..00000000000 --- 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 8e280b8fd0d..91e22baa4ad 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, hypothesis, py -, setuptools_scm, setuptools +{ stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, attrs, hypothesis, py +, setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k }: buildPythonPackage rec { - version = "3.2.5"; + version = "3.3.2"; pname = "pytest"; preCheck = '' @@ -12,16 +12,18 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "6d5bd4f7113b444c55a3bbb5c738a3dd80d43563d063fc42dcb0aaefbdd78b81"; + sha256 = "53548280ede7818f4dc2ad96608b9f08ae2cc2ca3874f2ceb6f97e3583f25bc4"; }; checkInputs = [ hypothesis ]; buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ py setuptools ] + propagatedBuildInputs = [ attrs py setuptools six pluggy ] + ++ (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/pytestrunner/default.nix b/pkgs/development/python-modules/pytestrunner/default.nix new file mode 100644 index 00000000000..67af195b68a --- /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 = "3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "00v7pi09q60yx0l1kzyklnmr5bp597mir85a9gsi7bdfyly3lz0g"; + }; + + 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-fuse/default.nix b/pkgs/development/python-modules/python-fuse/default.nix index d9debce6aec..02b86b3b33a 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-oauth2/default.nix b/pkgs/development/python-modules/python-oauth2/default.nix new file mode 100644 index 00000000000..38649ca1985 --- /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.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0a1d0qnlgm07wq9r9bbm5jqkqry73w34m87p0141bk76lg7bb0sm"; + }; + # 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-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix index a78b1ffbee2..44a6b522a4e 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-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix index 37c15c07537..654b851b663 100644 --- a/pkgs/development/python-modules/python-utils/default.nix +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -14,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 e7c3630f42f..f476d0d4d44 100644 --- a/pkgs/development/python-modules/python_fedora/default.nix +++ b/pkgs/development/python-modules/python_fedora/default.nix @@ -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/pythonix/default.nix b/pkgs/development/python-modules/pythonix/default.nix new file mode 100644 index 00000000000..dacc27c53a0 --- /dev/null +++ b/pkgs/development/python-modules/pythonix/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, ninja, meson, pkgconfig, gcc7, 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 gcc7 ]; + + 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/pytoml/default.nix b/pkgs/development/python-modules/pytoml/default.nix index 55479e76daf..91661a1fb51 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 00000000000..2bf7413c600 --- /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 = "2017.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "80f1bba4469d473c1b3969bc8e188c03bcc94d35807a889ceebbfc78e3208115"; + }; + + 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/pytzdata/default.nix b/pkgs/development/python-modules/pytzdata/default.nix new file mode 100644 index 00000000000..6de0431edb3 --- /dev/null +++ b/pkgs/development/python-modules/pytzdata/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchPypi, buildPythonPackage }: + +buildPythonPackage rec { + pname = "pytzdata"; + version = "2017.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1wi3jh39zsa9iiyyhynhj7w5b2p9wdyd0ppavpsrmf3wxvr7cwz8"; + }; + + # 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/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix index 8e10fbb2258..d09a9bbd6d8 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 ecd46bb1ff5..10150259ef5 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/raven/default.nix b/pkgs/development/python-modules/raven/default.nix index 66e2595f8d2..b6cc70ed787 100644 --- a/pkgs/development/python-modules/raven/default.nix +++ b/pkgs/development/python-modules/raven/default.nix @@ -1,20 +1,19 @@ -{ lib, buildPythonPackage, fetchurl, isPy3k, contextlib2 }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, contextlib2, blinker }: buildPythonPackage rec { pname = "raven"; - version = "6.4.0"; - name = pname + "-" + version; + version = "6.5.0"; - src = fetchurl { - url = "mirror://pypi/r/raven/${name}.tar.gz"; - sha256 = "00m985w9fja2jf8dpvdhygcr26rwabxkgvcc2v5j6v7d6lrvpvdq"; + src = fetchPypi { + inherit pname version; + sha256 = "84da75114739191bdf2388f296ffd6177e83567a7fbaf2701e034ad6026e4f3b"; }; # 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 00000000000..cdbba180673 --- /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/regex/default.nix b/pkgs/development/python-modules/regex/default.nix new file mode 100644 index 00000000000..c6279f5e7c4 --- /dev/null +++ b/pkgs/development/python-modules/regex/default.nix @@ -0,0 +1,23 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + + +buildPythonPackage rec { + pname = "regex"; + version = "2018.01.10"; + + src = fetchPypi { + inherit pname version; + sha256 = "139678fc013b75e486e580c39b4c52d085ed7362e400960f8be1711a414f16b5"; + }; + + meta = { + description = "Alternative regular expression module, to replace re"; + homepage = "https://bitbucket.org/mrabarnett/mrab-regex"; + license = lib.licenses.psfl; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ abbradar ]; + }; +} \ 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 5e1ea8b4642..5c5f2578fbf 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/restview/default.nix b/pkgs/development/python-modules/restview/default.nix index 0f2ce45c885..3c61ea4ded2 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.0"; src = fetchPypi { inherit pname version; - sha256 = "e7842100f3de179c68cfe7c2cf56c61509cd6068bc6dd58ab42c0ade5d5f97ec"; + sha256 = "5f6f1523228eab3269f59dd03ac560f7d370cd81df6fdbcb4914b5e6bd896a11"; }; propagatedBuildInputs = [ docutils readme_renderer pygments ]; diff --git a/pkgs/development/python-modules/robomachine/default.nix b/pkgs/development/python-modules/robomachine/default.nix index 8f71bab9c25..72407131cb1 100644 --- a/pkgs/development/python-modules/robomachine/default.nix +++ b/pkgs/development/python-modules/robomachine/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "robomachine"; - version = "0.6"; + version = "0.8.0"; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/R/RoboMachine/RoboMachine-0.6.tar.gz"; - sha256 = "6c9a9bae7bffa272b2a09b05df06c29a3a776542c70cae8041a8975a061d2e54"; + sha256 = "242cfd9be0f7591138eaeba03c9c190f894ce045e1767ab7b90eca330259fc45"; }; propagatedBuildInputs = [ pyparsing argparse robotframework ]; diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix index f7ef16b02bb..b35145872dd 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.3"; src = fetchPypi { inherit pname version; - sha256 = "1676e07947a19df9d17002307a7555c2647a4224d6f2869949e8fc4bd18f2e87"; + sha256 = "77d9b03083d0a098261a1d2856cd330ea3db520511a78472e421a00526aa220c"; }; # 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 1e8baa553bd..3164be5aa86 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/rx/default.nix b/pkgs/development/python-modules/rx/default.nix new file mode 100644 index 00000000000..6945d7486f6 --- /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/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix new file mode 100644 index 00000000000..37c7b157ea5 --- /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/salmon/default.nix b/pkgs/development/python-modules/salmon/default.nix deleted file mode 100644 index f9d7f79164a..00000000000 --- a/pkgs/development/python-modules/salmon/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, nose, dnspython -, chardet, lmtpd, pythondaemon, six, jinja2, mock }: - -buildPythonPackage rec { - pname = "salmon"; - # NOTE: The latest release version 2 is over 3 years old. So let's use some - # recent commit from master. There will be a new release at some point, then - # one can change this to use PyPI. See: - # https://github.com/moggers87/salmon/issues/52 - version = "bec795cdab744be4f103d8e35584dfee622ddab2"; - name = "${pname}-${version}"; - - src = fetchFromGitHub { - owner = "moggers87"; - repo = "salmon"; - rev = version; - sha256 = "0nx8pyxy7n42nsqqvhd85ycm1i5wlacsi7lwb4rrs9d416bpd300"; - }; - - 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/schema/default.nix b/pkgs/development/python-modules/schema/default.nix index 2c57ce29582..2c8e63e5ed2 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 b2826588a28..6d32b056a0a 100644 --- a/pkgs/development/python-modules/scikitlearn/default.nix +++ b/pkgs/development/python-modules/scikitlearn/default.nix @@ -20,8 +20,9 @@ buildPythonPackage rec { LC_ALL="en_US.UTF-8"; + # Disable doctests on OSX: https://github.com/scikit-learn/scikit-learn/issues/10213 checkPhase = '' - HOME=$TMPDIR OMP_NUM_THREADS=1 nosetests $out/${python.sitePackages}/sklearn/ + HOME=$TMPDIR OMP_NUM_THREADS=1 nosetests ${stdenv.lib.optionalString stdenv.isDarwin "--doctest-options=+SKIP"} $out/${python.sitePackages}/sklearn/ ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 5b40c74a181..005d02e6047 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 1647e6cfc14..20ad32b3261 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 00000000000..6b9f00783fd --- /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/send2trash/default.nix b/pkgs/development/python-modules/send2trash/default.nix new file mode 100644 index 00000000000..379f5677bd1 --- /dev/null +++ b/pkgs/development/python-modules/send2trash/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest +, configparser +}: + +buildPythonPackage rec { + pname = "Send2Trash"; + version = "1.4.2"; + + src = fetchFromGitHub { + owner = "hsoft"; + repo = "send2trash"; + rev = version; + sha256 = "1w502i5h8xaqf03g6h95h4vs1wqfv6kg925dn63phrwmg1hfz2xx"; + }; + + checkPhase = "HOME=. py.test"; + checkInputs = [ pytest 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/serpy/default.nix b/pkgs/development/python-modules/serpy/default.nix index 2414b97e94a..610a75fa317 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 00000000000..40a580877af --- /dev/null +++ b/pkgs/development/python-modules/serversyncstorage/default.nix @@ -0,0 +1,38 @@ +{ 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 + ]; +} diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 1c53f3cd437..5535a80fd4a 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -8,13 +8,13 @@ # Should use buildPythonPackage here somehow stdenv.mkDerivation rec { pname = "setuptools"; - version = "38.2.3"; + version = "38.4.0"; name = "${python.libPrefix}-${pname}-${version}"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "124jlg72bbk2xxv5wqbwcl4h5cdslslzk92rxjxiplg79l499hv3"; + sha256 = "6501fc32f505ec5b3ed36ec65ba48f1b975f52cf2ea101c7b73a08583fd12f75"; }; buildInputs = [ python wrapPython unzip ]; diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index e8e92818ecf..dab3542b809 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.3"; src = fetchPypi { inherit pname version; - sha256 = "07fba518e76b3276558f62a5829bdfa476f790cdef752383ccdc8c66b04b0899"; + sha256 = "14152f111c7711fc6756fd538ec12fc8cdde7419f869b244922f71f61b2a6c6b"; }; buildInputs = [ geos glibcLocales cython ]; diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index 846e8dc21a1..25dbecac949 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/six/default.nix b/pkgs/development/python-modules/six/default.nix index 00fbbbc01eb..6921b3590e4 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/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix index 436d85102d8..2e2020f61f0 100644 --- a/pkgs/development/python-modules/smart_open/default.nix +++ b/pkgs/development/python-modules/smart_open/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "smart_open"; name = "${pname}-${version}"; - version = "1.5.3"; + version = "1.5.6"; src = fetchPypi { inherit pname version; - sha256 = "0m5j71f7f36s17v4mwv0bxg4azknvcy82rbjp28b4vifrjd6dm7s"; + sha256 = "8fd2de1c359bd0074bd6d334a5b9820ae1c5b6ba563970b95052bace4b71baeb"; }; propagatedBuildInputs = [ boto bz2file requests responses moto ]; diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 40df45616e9..6c7c3c8400c 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -19,23 +19,12 @@ , ftfy , thinc , pip +, regex }: -let - enableDebugging = true; - regexLocked = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "regex"; - version = "2017.04.05"; - src = fetchPypi { - inherit pname version; - sha256 = "0c95gf3jzz8mv52lkgq0h7sbasjwvdhghm4s0phmy5k9sr78f4fq"; - }; - }; -in buildPythonPackage rec { +buildPythonPackage rec { pname = "spacy"; version = "1.8.2"; - name = pname + "-" + version; src = fetchFromGitHub { owner = "explosion"; @@ -56,7 +45,7 @@ in buildPythonPackage rec { ujson dill requests - regexLocked + regex ftfy thinc pytest diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index e83ab1c724a..6f3d0b3c117 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.6.6"; src = fetchPypi { inherit pname version; - sha256 = "c6de5dbdbb7a0d7d2757f4389cc00e8f6eb3c49e1772378967a12cfcf2cfe098"; + sha256 = "c39a6fa41bd3ec6fc10064329a664ed3a3ca2e27640a823dc520c682e4433cdb"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/splinter/default.nix b/pkgs/development/python-modules/splinter/default.nix new file mode 100644 index 00000000000..abd9bd230d4 --- /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/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 9b3a5fa2039..175aa4a6c3a 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.1"; src = fetchPypi { inherit pname version; - sha256 = "8b79a5ed91cdcb5abe97b0045664c55c140aec09e5dd5c01303e23de5fe7a95a"; + sha256 = "9ede7070d6fd18f28058be88296ed67893e2637465516d6a596cd9afea97b154"; }; 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 2c85bdbe3d1..dd7fdc173e5 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"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "bb5297df9cd97316b3c7ca64f8e31cae5cc6b94c015afd84c546877f1f77d6e4"; + sha256 = "18ac6392a710f0cc106c28c4e27e43e8f1b25cb46fb8b6714836212607c07b10"; }; # No tests in archive diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix index 326282a39c3..9639ce96194 100644 --- a/pkgs/development/python-modules/stevedore/default.nix +++ b/pkgs/development/python-modules/stevedore/default.nix @@ -2,12 +2,12 @@ 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; diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 7edfb9c4f0e..22c047fc54e 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "1.70.0"; + version = "1.77.1"; name = "${pname}-${version}"; # Tests require network connectivity and there's no easy way to disable @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "ee77103d2d18fe6369f23c40c93067425c5ed67e08b1a7678e681217e8fa8062"; + sha256 = "d1c638b417301849ff4ee0327332cfdec96edda83c79b08af307339138077d59"; }; buildInputs = [ unittest2 mock ]; diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix new file mode 100644 index 00000000000..4dc9c3c79bc --- /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 5b98aa3415b..f1631013152 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.3.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1pqqlw80cjdgrlpvdmydkyhsrr4s531mn6bfkshm68j9gk4kq6px"; + sha256 = "13gy2m14zh6lbdm45b40ffjnw8y3dapz9hvzpwk8vyvbxj4f1vaf"; }; - propagatedBuildInputs = [ supervise ]; + propagatedBuildInputs = [ + supervise + ] ++ lib.optionals ( !isPy3k ) [ + whichcraft + ]; # no tests doCheck = false; diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix index b1fe22df476..1370c59ace8 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.6"; src = fetchPypi { inherit pname version; - sha256 = "0x8qd5p5qliv8wmdglda2iy3f70i4jg8zqyk8yhklm5hrxm8jdl6"; + sha256 = "5bd7dd09eff68cbec9062e6950124fadfaaccbc0f50b23c1037f4d70ae86f0f1"; }; checkInputs = [ pytest nose ]; diff --git a/pkgs/development/python-modules/syncserver/default.nix b/pkgs/development/python-modules/syncserver/default.nix new file mode 100644 index 00000000000..e050bcf5404 --- /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/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix index 9ddc2a0e08b..db7f43c1ea4 100644 --- a/pkgs/development/python-modules/tabulate/default.nix +++ b/pkgs/development/python-modules/tabulate/default.nix @@ -5,13 +5,13 @@ }: 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 ]; diff --git a/pkgs/development/python-modules/terminado/default.nix b/pkgs/development/python-modules/terminado/default.nix new file mode 100644 index 00000000000..7ebd2f1c967 --- /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/testtools/default.nix b/pkgs/development/python-modules/testtools/default.nix index e786cb84329..eb6a6694b05 100644 --- a/pkgs/development/python-modules/testtools/default.nix +++ b/pkgs/development/python-modules/testtools/default.nix @@ -12,19 +12,18 @@ , pyrsistent }: -# 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}"; + version = "2.3.0"; # Python 2 only judging from SyntaxError # disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b46eec2ad3da6e83d53f2b0eca9a8debb687b4f71343a074f83a16bbdb3c0644"; + sha256 = "5827ec6cf8233e0f29f51025addd713ca010061204fdea77484a2934690a0559"; }; propagatedBuildInputs = [ pbr python_mimeparse extras lxml unittest2 pyrsistent ]; @@ -33,6 +32,11 @@ buildPythonPackage rec { # No tests in archive doCheck = false; + # 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; diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix index 1647b837d97..333c4825f0f 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.5.0"; src = fetchPypi { inherit pname version; - sha256 = "04wf3a7zgzz83nmgkh488wkl50zm9yfdpv3sl12sm2zj685plqcz"; + sha256 = "6fc4603fd52c386081b063ef7aa15ca77e5e937a3064b197359659fccfdeb406"; }; 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 00000000000..fc97297c010 --- /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 index 7a6ff3cc53d..1a2aced6858 100644 --- a/pkgs/development/python-modules/thespian/default.nix +++ b/pkgs/development/python-modules/thespian/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchPypi, buildPythonPackage, lib }: buildPythonPackage rec { - version = "3.8.3"; + version = "3.9.1"; pname = "thespian"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0vvwsh3waxd5ldrayr86kdcshv07bp361fl7p16g9i044vklwly4"; + sha256 = "0b303bv85176xd5mf3q5j549s28wi70ck2xxgj1cvpydh23dzipb"; }; - # Do not run the test suite: it takes a long type and uses + # 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 it's Travis + # network operations. Thespian tests are performed via its Travis # CI configuration and do not need to be duplicated here. doCheck = false; diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix new file mode 100644 index 00000000000..b0c3131785f --- /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.13.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "43d3903e8ea4542aaa4759ec3683641555d3a15e68fa5a41aaf14cce4110641a"; + }; + + 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/tiros/default.nix b/pkgs/development/python-modules/tiros/default.nix index a620c6eb58d..7bf21b02521 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.40"; + version = "1.0.42"; src = fetchPypi { inherit pname version; - sha256 = "841ca13564e3cddfd1404cbc60b3433bcc1e31c2753ecea20d0ad68173b80169"; + sha256 = "d0f9bc6d463654c971a78e02a3159ec62a2db684a217a7e940e66d4a381bdd52"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/tokenserver/default.nix b/pkgs/development/python-modules/tokenserver/default.nix new file mode 100644 index 00000000000..af7acbc0218 --- /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/toolz/default.nix b/pkgs/development/python-modules/toolz/default.nix index 36b85bce3ac..0fc14024903 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 bc39745945d..db513d1c614 100644 --- a/pkgs/development/python-modules/tornado/default.nix +++ b/pkgs/development/python-modules/tornado/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tornado"; - version = "4.5.2"; + version = "4.5.3"; name = "${pname}-${version}"; propagatedBuildInputs = [ backports_abc backports_ssl_match_hostname certifi singledispatch ]; @@ -23,6 +23,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1fb8e494cd46c674d86fac5885a3ff87b0e283937a47d74eb3c02a48c9e89ad0"; + sha256 = "6d14e47eab0e15799cf3cdcc86b0b98279da68522caace2bd7ce644287685f0a"; }; } diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix new file mode 100644 index 00000000000..bc70d65cc1f --- /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 = "2.9.1"; + + buildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ py virtualenv pluggy six ]; + + doCheck = false; + + src = fetchPypi { + inherit pname version; + sha256 = "752f5ec561c6c08c5ecb167d3b20f4f4ffc158c0ab78855701a75f5cef05f4b8"; + }; +} \ 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 2392a4a9968..209ee8ccd6b 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.19.4"; + version = "4.19.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "7ca803c2ea268c6bdb541e2dac74a3af23cf4bf7b4132a6a78926d255f8c8df1"; + sha256 = "df32e6f127dc0ccbc675eadb33f749abbcb8f174c5cb9ec49c0cdb73aa737377"; }; buildInputs = [ nose coverage glibcLocales flake8 ]; diff --git a/pkgs/development/python-modules/transitions/default.nix b/pkgs/development/python-modules/transitions/default.nix new file mode 100644 index 00000000000..edf13782b07 --- /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/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index faca6edace5..5a32a64c296 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/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index b441ad8052c..0af8c47e35c 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/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix index 2277cb7c4ca..1c61d0afab3 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/ua-parser/default.nix b/pkgs/development/python-modules/ua-parser/default.nix new file mode 100644 index 00000000000..1b397f6c737 --- /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/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix index e60ed958223..d90ada60632 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 ]; diff --git a/pkgs/development/python-modules/unidecode/default.nix b/pkgs/development/python-modules/unidecode/default.nix index 9b81a28f085..3cffe380490 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/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index 2e4a232f1f1..24eecf82311 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.1.0"; pname = "uranium"; name = "${pname}-${version}"; - + src = fetchFromGitHub { owner = "Ultimaker"; repo = "Uranium"; rev = version; - sha256 = "1pyzpcdb6kb0basvhgpjdiws8x0bwl71k7nkf3j3s9wk1dvyw824"; + sha256 = "1wz2nk973g8227r9v6j7gry3m0b0ikirkws8sfhysvgj0vgak9yk"; }; - + buildInputs = [ python gettext ]; propagatedBuildInputs = [ pyqt5 numpy scipy libarcus ]; nativeBuildInputs = [ cmake doxygen ]; diff --git a/pkgs/development/python-modules/us/default.nix b/pkgs/development/python-modules/us/default.nix new file mode 100644 index 00000000000..eb001410ce5 --- /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/user-agents/default.nix b/pkgs/development/python-modules/user-agents/default.nix new file mode 100644 index 00000000000..6b14eebb310 --- /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/versioneer/default.nix b/pkgs/development/python-modules/versioneer/default.nix new file mode 100644 index 00000000000..a3328671417 --- /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/voluptuous/default.nix b/pkgs/development/python-modules/voluptuous/default.nix index 250a0951d96..00c13cba066 100644 --- a/pkgs/development/python-modules/voluptuous/default.nix +++ b/pkgs/development/python-modules/voluptuous/default.nix @@ -3,7 +3,6 @@ buildPythonPackage rec { pname = "voluptuous"; version = "0.10.5"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index 8c980cf2b2c..f2b5e06baaa 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.4.0"; src = fetchurl{ url = "mirror://pypi/v/vowpalwabbit/${name}.tar.gz"; - sha256 = "0qm8rlrs2gfgamqnpx4lapxakpzgh0yh3kp1lbd7lhb0r748m3k7"; + sha256 = "abd22bfae99fb102cf8a6aec49e8c278cb7317d3a7eb60f70cd102be9c336fd5"; }; # 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/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index 48803655258..f24f10675f8 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/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index 5979d895a74..58be98f183b 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/whitenoise/default.nix b/pkgs/development/python-modules/whitenoise/default.nix new file mode 100644 index 00000000000..d2359b2195f --- /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 b9ab1dfbc1d..ab63b444af6 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.8"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "a57e29e733b989e68fdd0f3d6927a3691763b39792591d573b95a89a5a12ec15"; + sha256 = "67fc28c3b9fede955d69bccbd92784e3f0c6d0dee3a71532cd3367c257feb178"; }; propagatedBuildInputs = [ notebook ]; diff --git a/pkgs/development/python-modules/ws4py/default.nix b/pkgs/development/python-modules/ws4py/default.nix index 648ab1cff08..5e65940e846 100644 --- a/pkgs/development/python-modules/ws4py/default.nix +++ b/pkgs/development/python-modules/ws4py/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "ws4py"; - version = "0.4.2"; + version = "0.4.3"; src = fetchPypi { inherit pname version; - sha256 = "0zr3254ky6r7q15l3dhdczfa8i723055zdkqssjifsgcwvirriks"; + sha256 = "ee12b58384bab8bfdcd1c76dcd6852047aec163af17175fc0f73e255d107dd7a"; }; checkInputs = [ pytest mock git ]; diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 1215e613f6f..afde3f3b45b 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.0"; src = fetchPypi { inherit pname version; - sha256 = "f649a41d43b5a6c64bdcbd57e994932656b689f9593a86dd0be95778a2b47494"; + sha256 = "af1449e8df84a6eb09eb1d56c1dc5ac7f24a9563d4f2b9391ff364dc0c62344c"; }; - # 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 00000000000..9b136531a4b --- /dev/null +++ b/pkgs/development/python-modules/xcffib/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, xorg +, cffi +, six +}: + +buildPythonPackage rec { + version = "0.5.1"; + pname = "xcffib"; + + src = fetchPypi { + inherit pname version; + sha256 = "09gbnmr5vn58mm8xi3fmd7fz6743cks6c46dphnxzwax6zsxmy60"; + }; + + 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/xvfbwrapper/default.nix b/pkgs/development/python-modules/xvfbwrapper/default.nix new file mode 100644 index 00000000000..4ba9cd61d4c --- /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/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix index 2ded73d5250..05913ab61c5 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.20.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "701b076a4916e3cfbba345e0297dcd54a02fd0fdcae1f43346f8a043c3bbd052"; + sha256 = "bd19f246be7193ad2acdc04702b92315f1ae28d49c82f6671afdeefe9d32f468"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index 1275178d5d0..e40aa9d05f9 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.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "162630v7f98l27h11msk9416lqwm2mpgxh4s636594nlbfs9by3a"; }; - buildInputs = [ pytest pytestrunner ]; - propagatedBuildInputs = [ multidict ]; + 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/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index e00d6c7e24b..64b2874ef62 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/zope_copy/default.nix b/pkgs/development/python-modules/zope_copy/default.nix new file mode 100644 index 00000000000..305928c1846 --- /dev/null +++ b/pkgs/development/python-modules/zope_copy/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, zope_interface +, zope_location +, zope_schema +}: + + +buildPythonPackage rec { + pname = "zope_copy"; + version = "4.0.2"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "eb2a95866df1377741876a3ee62d8600e80089e6246e1a235e86791b29534457"; + }; + + propagatedBuildInputs = [ zope_interface ]; + + checkInputs = [ zope_location zope_schema ]; + + meta = { + maintainers = with lib.maintainers; [ domenkozar ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 76c0e522777..4510308d3e5 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; @@ -246,6 +246,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 ]; @@ -320,7 +321,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 ]; @@ -744,6 +745,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"; }); @@ -798,10 +804,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: { @@ -912,9 +918,7 @@ 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: { diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index 64a88d8f7b8..1f31aec886a 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 == "path" + 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 b17a4639e77..85e93959e4b 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-env/default.nix b/pkgs/development/ruby-modules/bundler-env/default.nix index 2e2653621a7..5d1489ba200 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 9251c4d2a41..6ba1d5f10ec 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 05415b88968..5361c3ce65e 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -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"; }; @@ -109,7 +108,7 @@ in gio2 = attrs: { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 pcre ]; + buildInputs = [ gtk2 pcre gobjectIntrospection ]; }; gitlab-markup = attrs: { meta.priority = 1; }; @@ -167,11 +166,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: { diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index 62a9d60686f..5bde59eab04 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -41,7 +41,6 @@ lib.makeOverridable ( , 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 +55,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,7 +77,7 @@ let in -stdenv.mkDerivation (attrs // { +stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { inherit ruby; inherit doCheck; inherit dontBuild; @@ -83,7 +86,8 @@ stdenv.mkDerivation (attrs // { 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; @@ -158,14 +162,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 8eac766554e..142d2da9bee 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 - 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}") +if type == "git" + Bundler::Source::Git.class_eval do + def allow_git_ops? + true 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}") + 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 + + 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/stm32/betaflight/default.nix b/pkgs/development/stm32/betaflight/default.nix new file mode 100644 index 00000000000..8d4d0d7f4a2 --- /dev/null +++ b/pkgs/development/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/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix index fbf784db0cc..c965e5a937a 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/analysis/coan/default.nix b/pkgs/development/tools/analysis/coan/default.nix index 3ce5f23f645..2b4a87ffcb8 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/egypt/default.nix b/pkgs/development/tools/analysis/egypt/default.nix index 572e2f74471..a7f29017fbe 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 539a8ef59b7..f90893ee79d 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, ocaml_lwt }: +{ stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices, + findlib, camlp4, sedlex, ocamlbuild, ocaml_lwt, wtf8, dtoa }: with lib; stdenv.mkDerivation rec { - version = "0.61.0"; + version = "0.64.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "0742hcg97gw6zsvm5j30rfyj71n71pfag3vcmjdh7yamn8gpn8ga"; + sha256 = "1jvx2vx1d3n5z689zqm0gylmmjxim176avinwn3q8xla3gz3srp8"; }; installPhase = '' @@ -18,8 +19,9 @@ stdenv.mkDerivation rec { cp bin/flow $out/bin/ ''; - buildInputs = [ ocaml libelf findlib camlp4 sedlex ocamlbuild ocaml_lwt ] - ++ optionals stdenv.isDarwin [ cf-private CoreServices ]; + buildInputs = [ + ocaml libelf findlib camlp4 sedlex ocamlbuild ocaml_lwt 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/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix index 7f34ec0fd63..f2481013fbb 100644 --- a/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -30,6 +30,5 @@ stdenv.mkDerivation rec { homepage = http://include-what-you-use.org; license = licenses.bsd3; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix index ad887baf23e..000e5e3393b 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/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix index 395f720906c..8db532d2feb 100644 --- a/pkgs/development/tools/analysis/qcachegrind/default.nix +++ b/pkgs/development/tools/analysis/qcachegrind/default.nix @@ -1,13 +1,12 @@ -{ stdenv, fetchurl, cmake, qmake, qtbase, perl, python, php }: +{ stdenv, fetchurl, cmake, qmake, qtbase, perl, python, php, kcachegrind }: -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 ]; @@ -28,8 +27,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/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index c7338212bdb..49f6aeb7279 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -13,14 +13,14 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { - version = "2.1.0"; + version = "2.2.0"; name = "radare2-${version}"; src = fetchFromGitHub { owner = "radare"; repo = "radare2"; rev = version; - sha256 = "1mny0iw2dgszvvx0yb0z5vlygz4f3jblzi9byybczm8wdqs1vhb1"; + sha256 = "0rd1dfgwdpn3x1pzi67sw040vxywbg5h6yw0mj317p0p1cvlyihl"; }; postPatch = let @@ -36,6 +36,8 @@ stdenv.mkDerivation rec { ''; + enableParallelBuilding = true; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ readline libusb libewf perl zlib openssl] ++ optional useX11 [gtkdialog vte gtk2] diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index b993a22ccd4..84bcac18b0f 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkgconfig, python2Packages, which, procps, gdb, capnproto }: stdenv.mkDerivation rec { - version = "5.0.0"; + version = "5.1.0"; name = "rr-${version}"; src = fetchFromGitHub { owner = "mozilla"; repo = "rr"; rev = version; - sha256 = "1cc1dbq129qlmrysk7cmaihcd9c93csi79dv3kqsnnprbz480z9i"; + sha256 = "16v08irycb295jjw5yrcjdagvkgcgg4hl5qz215hrw1ff4g7sazy"; }; postPatch = '' diff --git a/pkgs/development/tools/analysis/snowman/default.nix b/pkgs/development/tools/analysis/snowman/default.nix index 2caadfc6266..fba7d3d5cd4 100644 --- a/pkgs/development/tools/analysis/snowman/default.nix +++ b/pkgs/development/tools/analysis/snowman/default.nix @@ -1,23 +1,19 @@ -{ stdenv, fetchFromGitHub, cmake, boost, qt4 ? null, qtbase ? null }: - -# Only one qt -assert qt4 != null -> 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 9d361aced32..284bf26782f 100644 --- a/pkgs/development/tools/analysis/spin/default.nix +++ b/pkgs/development/tools/analysis/spin/default.nix @@ -35,6 +35,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/build-managers/bazel/0.4.nix b/pkgs/development/tools/build-managers/bazel/0.4.nix index f8c1f01d446..d131232e96d 100644 --- a/pkgs/development/tools/build-managers/bazel/0.4.nix +++ b/pkgs/development/tools/build-managers/bazel/0.4.nix @@ -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 41861a6142e..67d186c5a25 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.8.0"; + version = "0.9.0"; 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 = "0y50fhwh135fim39ra4szwzzgyb4ibls3i0hpv3d7asns0hh715a"; + sha256 = "0aiifrp6g1d3ilhg8111wdhsrjy41x8gcmq67rjyxypw9znqzcpg"; }; 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 00000000000..563fe635e6b --- /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 563fe635e6b..da3f6248f22 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/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index a2d77f0321a..d62ccd0c9fd 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 = "0.9.15.post1"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1s3y218wry7502xp4zxccf3z996xm8cnp3dcxl7m5ldmmb055qwv"; + sha256 = "01m5x4lpz90lqf8j0s2c26gqb5yzan6x9d1ffgmrklwf0bljkwni"; }; 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 00000000000..8b23f8a2488 --- /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 = "0.9.15.post1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0gsa5fi1gkwnz8dsrl2s5kzcfawnj3nl8g8h6z1winz627l9n8sh"; + }; + + 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 ec4bf161562..40aaad2efd2 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 = "19cnzp5prima3jrk525xspw7vqc5pjln2nihj4kc3w90dhzllj8x"; }; meta = with stdenv.lib; { @@ -50,7 +29,7 @@ in { src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "16wxgnh35916c2gw34971ynx319lnm9addhqvii885vid44pqim0"; + sha256 = "1j6aw2j2sl7ix8rb67pbs6nfvv8v3smgkvqzsjsyh5sdfr2663cg"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; @@ -70,7 +49,7 @@ in { src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1hcr8xsc0ajfg2vz2h8g5s8ypsp32kdplgqp21jh8z5y0a6nzqsl"; + sha256 = "0k0wd4rq034bij2flfjv60h8czkfn836bnaa7hwsrl58gxds39m4"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; @@ -90,7 +69,7 @@ in { src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0aw1073xq549q5jkjk31zhqpasp8jiy4gch0fjyw8qy0dax8hc7r"; + sha256 = "08ng56jmy50s3zyn6wxizji1zhgzhi65z7w3wljg02qrbd5688gj"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; @@ -110,7 +89,7 @@ in { src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0x99mdmn1ngcnmkxr40hwqafsq48jybdz45y5kpc0yw68n0bfwmv"; + sha256 = "15fm72yymv873n3vsw9kprypcf6jzln18v4lb062n8lqw9pykwb1"; }; 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 4fe728b9ce6..51d6a5b5695 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 = "0.9.15.post1"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0lb8kwg3m9jgrww929d5nrjs4rj489mb4dnsdxcbdb358jbbym22"; + sha256 = "12zscqb218w88y9fd1jwfn4cr2sw35j998d0jlgd22bch020sy65"; }; buildInputs = with pythonPackages; [ setuptoolsTrial mock ]; diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix index fb38e52811c..b4b2a4210d2 100644 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -77,6 +77,6 @@ stdenv.mkDerivation rec { homepage = http://www.cmake.org/; description = "Cross-Platform Makefile Generator"; platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ mornfall ]; + 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 b04b38e3048..a2f5ee0325b 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -78,6 +78,6 @@ stdenv.mkDerivation rec { homepage = http://www.cmake.org/; description = "Cross-Platform Makefile Generator"; platforms = if useQt4 then qt4.meta.platforms else platforms.all; - maintainers = with maintainers; [ 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 614e0031421..a0f1cf00814 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -43,7 +43,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" @@ -72,11 +72,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/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix index 15e801c1dff..8af11f05738 100644 --- a/pkgs/development/tools/build-managers/dub/default.nix +++ b/pkgs/development/tools/build-managers/dub/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }: +{ stdenv, fetchFromGitHub, fetchpatch, curl, dmd, libevent, rsync }: let dubBuild = stdenv.mkDerivation rec { name = "dubBuild-${version}"; - version = "1.6.0"; + version = "1.7.1"; enableParallelBuilding = true; @@ -12,9 +12,17 @@ let owner = "dlang"; repo = "dub"; rev = "v${version}"; - sha256 = "1xjr5pp263lbcd4harxy1ybh7q0kzj9iyy63ji6pn66fizrgm7zk"; + sha256 = "09bcc9bq2z1rbm8sdip1l81y5p8q13r30k02lzifyasiplrnpvlv"; }; + patches = [ + # TODO Remove with next release which contains https://github.com/dlang/dub/pull/1354 + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/dlang/dub/pull/1354.patch"; + sha256 = "01alky8a91qwjmlnfjbrn8kiivwr69f3j4c84cjlxrzfp1ph20ah"; + }) + ]; + postPatch = '' # Avoid that the version file is overwritten substituteInPlace build.sh \ @@ -59,6 +67,8 @@ let outputHash = builtins.hashString "sha256" inputString; src = dubBuild.src; + + patches = dubBuild.patches; postPatch = dubBuild.postPatch; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 77f2e561317..bdf446d4d12 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.4"; + name = "gradle-4.5"; nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "0bqaksrxrshqjwba0wj72gbcxvcchjavlj39xh18qpkz5jp76j7s"; + sha256 = "1qxmb4mki2gjhfwmy7lwak283l86iq3nivw57a2gpw2g64xa9wh3"; }; }; diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix index 11caff8ddab..2744dac2500 100644 --- a/pkgs/development/tools/build-managers/icmake/default.nix +++ b/pkgs/development/tools/build-managers/icmake/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "icmake-${version}"; - version = "9.02.03"; + version = "9.02.04"; src = fetchFromGitHub { - sha256 = "1g3pdcd2i8n29rqwrdg6bd7qnsii55hi0rnma86hy0pm5cshpwi5"; + sha256 = "0dkqdm7nc3l9kgwkkf545hfbxj7ibkxl7n49wz9m1rcq9pvpmrw3"; rev = version; repo = "icmake"; owner = "fbb-git"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { 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 05bf8e76db7..30531c980b0 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/setup-hook.sh b/pkgs/development/tools/build-managers/meson/setup-hook.sh index 25e2e69ef31..8f96e6146be 100644 --- a/pkgs/development/tools/build-managers/meson/setup-hook.sh +++ b/pkgs/development/tools/build-managers/meson/setup-hook.sh @@ -25,3 +25,15 @@ if [ -z "$dontUseMesonConfigure" -a -z "$configurePhase" ]; then setOutputFlags= configurePhase=mesonConfigurePhase fi + +mesonCheckPhase() { + runHook preCheck + + meson test + + runHook postCheck +} + +if [ -z "$dontUseMesonCheck" -a -z "$checkPhase" ]; then + checkPhase=mesonCheckPhase +fi diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix index 8ce495557e7..abb32f25760 100644 --- a/pkgs/development/tools/build-managers/pants/default.nix +++ b/pkgs/development/tools/build-managers/pants/default.nix @@ -32,7 +32,7 @@ in buildPythonApplication rec { 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/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index bea20863e7f..d501a795384 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, 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; diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index abfa578f387..4ea85eca213 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "sbt-${version}"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { urls = [ @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz" "https://cocl.us/sbt-${version}.tgz" ]; - sha256 = "0gz2akifi842y8av2hh7w2z6fd6z400nvk8ip87rkyhx3gw7cdw1"; + sha256 = "1mz2aiwb3ha8dnx9fzbykz1y5ax01l2x6xml956fs1vm555v534x"; }; patchPhase = '' diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 46cee51e0e6..ab090e6dc12 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -44,6 +44,6 @@ buildGoPackage { homepage = https://buildkite.com/docs/agent; license = licenses.mit; maintainers = with maintainers; [ pawelpacana zimbatm ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 369f2f86bee..e7c2509ce77 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.2.0"; + version = "10.4.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 = "191yzh9k6ivj7mdfi5mv7wgbdcclb5q99rcbry70h064vzwfgkp6"; + sha256 = "0fcddi1mwgj831abn628zcpwsah3mmvrbdi851pjf8vraynwr2xa"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; - sha256 = "1xvfsffwks5z74kxba6f4cilbabcsxhr0kskbxwczi90pn0rxsnn"; + sha256 = "1zlk3i9jzmsqz5r3kzg08z9hyhidw9dpv5ji46bnbjis8q3dlw54"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "1psnajn4b3ym2fpvn6rizxqb093s78lvxcs3bysgrmf9q1ivf3a6"; + sha256 = "0kp6h53d1q652i4wp94hydy1ixlgmqh92sjsc6pqicnfc7nvwgfq"; }; 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 f44187a0ac1..642a6a97bc0 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.95"; + version = "2.103"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "08pmsxsk5qbs7h3m1ya7xbik95n58ak8m4p01y97l49kc70bj2hv"; + sha256 = "1d771q4xjjji7ydh6xjz3j6hz2mszxh0m3zqjh4khlzqhnvydlha"; }; buildCommand = '' diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index 2f220001070..79a077f4a75 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "coursier-${version}"; - version = "1.0.0-RC13"; + version = "1.0.0"; src = fetchurl { url = "https://github.com/coursier/coursier/raw/v${version}/coursier"; - sha256 = "18i7imd6lqkvpzhx1m72g6jwsqq7h6aisfny5aiccgnyg6jpag6i"; + sha256 = "0167cgp3kqx336p8dmlxx57bi3lhzyp6ncly28v1s7r2sjxj9krj"; }; nativeBuildInputs = [ makeWrapper ]; 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 00000000000..b7d960d5af4 --- /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 bcb0cf1d5e4..4ea3589476b 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 00000000000..20123a0600e --- /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 = http://perseas.github.io/; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ pmeunier ]; + }; +} diff --git a/pkgs/development/tools/database/shmig/default.nix b/pkgs/development/tools/database/shmig/default.nix index a397ba69697..49e90ce64c8 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 d5acd487e6b..72c0aaabf85 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.0.355.2349"; 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 = "70add9b5c998583416e3d127aeb63dde8e3d0489036982026b930c85496c7850"; }; buildInputs = [ makeWrapper unzip ]; diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix index fe4ec06322f..91037e6dfaa 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 06b6a0993be..3671a3dcca9 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 = "0.12.2"; 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 = "1241zqyimgqil4qd72f0yiw935lkdmfr88kvqbkn9n05k7xhdg30"; }; - 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 e22be524f02..477c874af01 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}"); diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix index 0d639875da5..daa25de9508 100644 --- a/pkgs/development/tools/dtools/default.nix +++ b/pkgs/development/tools/dtools/default.nix @@ -2,14 +2,31 @@ stdenv.mkDerivation rec { name = "dtools-${version}"; - version = "2.075.1"; + version = "2.078.1"; - src = fetchFromGitHub { - owner = "dlang"; - repo = "tools"; - rev = "v${version}"; - sha256 = "0lxn400s9las9hq6h9vj4mis2jr662k2yw0zcrvqcm1yg9pd245d"; - }; + srcs = [ + (fetchFromGitHub { + owner = "dlang"; + repo = "dmd"; + rev = "v${version}"; + sha256 = "0b9lphh4g3r9cyzv4wcfppv9j3w952vvwv615za23acgwav3mqg2"; + name = "dmd"; + }) + (fetchFromGitHub { + owner = "dlang"; + repo = "tools"; + rev = "v${version}"; + sha256 = "1cydhn8g0h9i9mygzi80fb5fz3z1f6m8b9gypdvmyhkkzg63kf12"; + name = "dtools"; + }) + ]; + + sourceRoot = "."; + + postUnpack = '' + mv dmd dtools + cd dtools + ''; postPatch = '' substituteInPlace posix.mak \ @@ -26,27 +43,22 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dmd ]; buildInputs = [ curl ]; + makeCmd = '' + make -f posix.mak DMD=${dmd.out}/bin/dmd DMD_DIR=dmd + ''; + 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/fac/default.nix b/pkgs/development/tools/fac/default.nix new file mode 100644 index 00000000000..c587505600c --- /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/flootty/default.nix b/pkgs/development/tools/flootty/default.nix new file mode 100644 index 00000000000..9535ba86dd0 --- /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/gauge/default.nix b/pkgs/development/tools/gauge/default.nix new file mode 100644 index 00000000000..f1533f551b2 --- /dev/null +++ b/pkgs/development/tools/gauge/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "gauge-${version}"; + version = "0.9.6"; + + goPackagePath = "github.com/getgauge/gauge"; + + src = fetchFromGitHub { + owner = "getgauge"; + repo = "gauge"; + rev = "v${version}"; + sha256 = "0p2bnrzgx616jbyr9h4h9azaq7ry63z4qkwgy0ivwrpmhfqfqwmh"; + }; + + 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/go-protobuf/default.nix b/pkgs/development/tools/go-protobuf/default.nix new file mode 100644 index 00000000000..361fc74c729 --- /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/goconvey/default.nix b/pkgs/development/tools/goconvey/default.nix new file mode 100644 index 00000000000..e4ef9d26da2 --- /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 00000000000..d329359da70 --- /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 fdb53dd288f..6644c8fcfc4 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/gpp/default.nix b/pkgs/development/tools/gpp/default.nix new file mode 100644 index 00000000000..461110b63d7 --- /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/haskell/intero-nix-shim/default.nix b/pkgs/development/tools/haskell/intero-nix-shim/default.nix deleted file mode 100644 index a7ea5b9d577..00000000000 --- a/pkgs/development/tools/haskell/intero-nix-shim/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ mkDerivation, base, cabal-install, directory, fetchFromGitHub -, filepath, intero, optparse-applicative, posix-escape, split -, stdenv, unix -}: -mkDerivation { - pname = "intero-nix-shim"; - version = "0.1.2"; - src = fetchFromGitHub { - owner = "michalrus"; - repo = "intero-nix-shim"; - rev = "0.1.2"; - sha256 = "0p1h3w15bgvsbzi7f1n2dxxxz9yq7vmbxmww5igc5d3dm76skgzg"; - }; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base directory filepath optparse-applicative posix-escape split - unix - ]; - postInstall = '' - mkdir -p $out/libexec - ln -s ${cabal-install}/bin/cabal $out/libexec - ln -s ${intero }/bin/intero $out/libexec - ''; - homepage = https://github.com/michalrus/intero-nix-shim; - license = stdenv.lib.licenses.asl20; -} diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix index 8f9095fae13..c21d5595708 100644 --- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix +++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix @@ -1,29 +1,28 @@ -{ stdenv, ghc, fetchFromGitHub }: - -stdenv.mkDerivation rec { - name = "multi-ghc-travis-${version}"; - version = "20170728-git"; - - buildInputs = [ ghc ]; - +{ mkDerivation, base, bytestring, Cabal, containers, deepseq, Diff +, directory, filepath, ShellCheck, stdenv, tasty, tasty-golden +, transformers, fetchFromGitHub +}: +mkDerivation { + pname = "make-travis-yml"; + version = "0"; src = fetchFromGitHub { owner = "hvr"; repo = "multi-ghc-travis"; - rev = "437739986fc81ca8c010e5d889348ba74171e680"; - sha256 = "05fbc7ab9c25k19xj0iax72gv62l89dw2m4bci7h76y9hcajs5v4"; - }; - - installPhase = '' - mkdir -p $out/bin - ghc -O --make make_travis_yml.hs -o $out/bin/make-travis-yml - ghc -O --make make_travis_yml_2.hs -o $out/bin/make-travis-yml-2 - ''; - - meta = with stdenv.lib; { - description = "Generate .travis.yml for multiple ghc versions"; - homepage = https://github.com/hvr/multi-ghc-travis; - license = licenses.bsd3; - platforms = ghc.meta.platforms; - maintainers = with maintainers; [ jb55 peti ]; + rev = "0d1b4089f6829659149747c9551712d24fd0b124"; + sha256 = "00dbg8hbncv74c2baskyhg4h0yv8wrz0fnkvw2bzcn0cjrz7xqwr"; }; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base Cabal containers deepseq directory filepath ShellCheck + transformers + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring Diff directory filepath tasty tasty-golden + transformers + ]; + homepage = "https://github.com/hvr/multi-ghc-travis"; + description = "Script generator for Travis-CI"; + license = stdenv.lib.licenses.bsd3; } diff --git a/pkgs/development/tools/haskell/tinc/default.nix b/pkgs/development/tools/haskell/tinc/default.nix deleted file mode 100644 index 5a69b887588..00000000000 --- a/pkgs/development/tools/haskell/tinc/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ mkDerivation, aeson, base, bytestring, Cabal, containers -, directory, exceptions, filelock, filepath, gitrev, graph-wrapper -, hpack, hspec, HUnit, language-dot, mockery, parsec, process -, QuickCheck, safe, stdenv, temporary, time, transformers, unix -, unix-compat, with-location, yaml, fetchFromGitHub -, cabal2nix, cabal-install, makeWrapper -}: -mkDerivation { - pname = "tinc"; - version = "20170624"; - src = fetchFromGitHub { - owner = "sol"; - repo = "tinc"; - rev = "70881515693fd83d381fe045ae76d5257774f5e3"; - sha256 = "0c6sx3vbcnq69dhqhpi01a4p4qss24rwxiz6jmw65rj73adhj4mw"; - }; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson base bytestring Cabal containers directory exceptions - filelock filepath gitrev graph-wrapper hpack language-dot parsec - process temporary time transformers unix-compat with-location yaml - ]; - testHaskellDepends = [ - aeson base bytestring Cabal containers directory exceptions - filelock filepath gitrev graph-wrapper hpack hspec HUnit - language-dot mockery parsec process QuickCheck safe temporary time - transformers unix unix-compat with-location yaml - ]; - postInstall = '' - source ${makeWrapper}/nix-support/setup-hook - wrapProgram $out/bin/tinc \ - --prefix PATH : '${cabal2nix}/bin' \ - --prefix PATH : '${cabal-install}/bin' - ''; - description = "A dependency manager for Haskell"; - homepage = "https://github.com/sol/tinc#readme"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "x86_64-linux" ]; - maintainers = [ stdenv.lib.maintainers.robbinch ]; - broken = true; -} diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix index 9b5a19700ff..b607cc5604c 100644 --- a/pkgs/development/tools/haskell/vaultenv/default.nix +++ b/pkgs/development/tools/haskell/vaultenv/default.nix @@ -1,17 +1,20 @@ -{ mkDerivation, fetchurl, async, base, bytestring, http-conduit, lens -, lens-aeson, optparse-applicative, retry, stdenv, text, unix +{ mkDerivation, fetchzip, async, base, bytestring, hpack, http-conduit +, lens, lens-aeson, optparse-applicative, retry, stdenv, text, unix , unordered-containers, utf8-string }: mkDerivation rec { pname = "vaultenv"; - version = "0.5.0"; + version = "0.5.3"; - src = fetchurl { + src = fetchzip { url = "https://github.com/channable/vaultenv/archive/v${version}.tar.gz"; - sha256 = "0hdcxq88cf3ygnikkppyg3fcf7xmwm9zif7274j3n34p9vd8xci3"; + sha256 = "1kxq2pp8l8xf7xwjyd9cwyi7z192013s6psq5fk8jrkkhrk8z3li"; }; + buildTools = [ hpack ]; + preConfigure = "hpack ."; + isLibrary = false; isExecutable = true; executableHaskellDepends = [ diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix index 20f5f8d17e8..efd4265443b 100644 --- a/pkgs/development/tools/icestorm/default.nix +++ b/pkgs/development/tools/icestorm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "icestorm-${version}"; - version = "2017.12.06"; + version = "2018.01.10"; src = fetchFromGitHub { owner = "cliffordwolf"; repo = "icestorm"; - rev = "14b44ca866665352e7146778bb932e45b5fdedbd"; - sha256 = "18qy7gylnydgzmqry1b4r0ilm6lkjdcyn0wj03syxdig9dbjiacm"; + rev = "bca8c3c88f5707213a6cc55ec7b06b576ab98809"; + sha256 = "00g1xd70dlgvyfyk5ivj71dpk0vzx3xka60f6x3hm4frl9ahyhj7"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/irony-server/default.nix b/pkgs/development/tools/irony-server/default.nix index b52cbf21168..e2aa27a96eb 100644 --- a/pkgs/development/tools/irony-server/default.nix +++ b/pkgs/development/tools/irony-server/default.nix @@ -5,13 +5,14 @@ stdenv.mkDerivation rec { inherit (irony) version; nativeBuildInputs = [ cmake ]; + buildInputs = [ llvmPackages.libclang ]; dontUseCmakeBuildDir = true; cmakeDir = "server"; cmakeFlags = [ - ''-DCMAKE_PREFIX_PATH=${llvmPackages.clang.cc}'' + "-DCMAKE_PREFIX_PATH=${llvmPackages.clang-unwrapped}" ]; src = irony.src; diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix index 46170341437..bfb37fc5f03 100644 --- a/pkgs/development/tools/java/cfr/default.nix +++ b/pkgs/development/tools/java/cfr/default.nix @@ -35,6 +35,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/jbake/default.nix b/pkgs/development/tools/jbake/default.nix new file mode 100644 index 00000000000..9762926ddf5 --- /dev/null +++ b/pkgs/development/tools/jbake/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchzip, jre }: + +stdenv.mkDerivation rec { + version = "2.5.1"; + name = "jbake-${version}"; + + src = fetchzip { + url = "http://jbake.org/files/jbake-${version}-bin.zip"; + sha256 = "1ib5gvz6sl7k0ywx22anhz69i40wc6jj5lxjxj2aa14qf4lrw912"; + }; + + buildInputs = [ jre ]; + + installPhase = '' + substituteInPlace bin/jbake --replace "java" "${jre}/bin/java" + mkdir -p $out + cp -vr * $out + ''; + + meta = with stdenv.lib; { + description = "JBake is a Java based, open source, static site/blog generator for developers & designers"; + homepage = "http://jbake.org/"; + license = licenses.mit; + maintainers = with maintainers; [ moaxcp ]; + }; +} 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 00000000000..4bc3e77dbaa --- /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/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index 760ad521cef..15b8f82d0ab 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/automake/setup-hook.sh b/pkgs/development/tools/misc/automake/setup-hook.sh index 5cd8c6229f6..292632b7cbc 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/bin_replace_string/default.nix b/pkgs/development/tools/misc/bin_replace_string/default.nix index fda527ee905..ac7eb557f2e 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 00000000000..2e9956e6b6e --- /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/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 7628e37ae1c..05d0d21a179 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -53,11 +53,20 @@ stdenv.mkDerivation rec { # 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 ]; outputs = [ "out" "info" "man" ]; - nativeBuildInputs = [ bison buildPackages.stdenv.cc ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ bison ]; buildInputs = [ zlib ]; inherit noSysDirs; @@ -84,7 +93,7 @@ stdenv.mkDerivation rec { # 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"; diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 65c7e633f8e..ff4ad83b642 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -2,10 +2,10 @@ let ccache = stdenv.mkDerivation rec { name = "ccache-${version}"; - version = "3.3.4"; + version = "3.3.5"; src = fetchurl { - sha256 = "0ks0vk408mdppfbk8v38p46fqx3p30r9a9cwiia43373i7rmpw94"; + sha256 = "1iih5d171rq29366c1z90dri2h8173yyc8rm2740wxiqx6k7c18r"; url = "mirror://samba/ccache/${name}.tar.xz"; }; @@ -69,7 +69,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/skip-fs-dependent-test.patch b/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch index ecd3c4c9a74..3bc3a95e420 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.sh ++++ b/test.sh +@@ -2669,23 +2669,6 @@ SUITE_cleanup() { + $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/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index 6006c83c0cd..b20f63e2625 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -1,5 +1,5 @@ { stdenv, pkgconfig, fetchurl, itstool, intltool, libxml2, glib, gtk3 -, python3Packages, wrapGAppsHook, gnome3, libwnck3 }: +, python3Packages, wrapGAppsHook, gnome3, libwnck3, gobjectIntrospection }: let version = "${major}.13"; @@ -14,7 +14,7 @@ in python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook libxml2 ]; - buildInputs = [ glib gtk3 gnome3.defaultIconTheme libwnck3 ]; + buildInputs = [ glib gtk3 gnome3.defaultIconTheme libwnck3 gobjectIntrospection ]; propagatedBuildInputs = with python3Packages; [ pygobject3 pep8 ]; diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix index 76d34bfd564..8c236597484 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/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index d1148ad48d8..e068b908caf 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -18,7 +18,7 @@ let basename = "gdb-${version}"; - version = "8.0.1"; + version = "8.1"; in assert targetPlatform.isHurd -> mig != null && hurd != null; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/gdb/${basename}.tar.xz"; - sha256 = "1qwmcbaxf0jc7yjl0fimgcfj2yqcrl6h7azgs1d838kbwf9mzg9x"; + sha256 = "0d2bpqk58fqlx21rbnk8mbcjlggzc9kb5sjirrfrrrjq70ka0qdg"; }; patches = [ ./debug-info-from-env.patch ]; diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix index 3562af7a6b8..64b87300cbe 100644 --- a/pkgs/development/tools/misc/gdbgui/default.nix +++ b/pkgs/development/tools/misc/gdbgui/default.nix @@ -5,14 +5,14 @@ in python27Packages.buildPythonApplication rec { name = "${pname}-${version}"; pname = "gdbgui"; - version = "0.9.1.0"; + version = "0.10.1.0"; buildInputs = [ gdb ]; propagatedBuildInputs = builtins.attrValues deps.packages; src = python27Packages.fetchPypi { inherit pname version; - sha256 = "0ybgkk4h9zwhbx5d0j0fmfzxxgg8f6apm8v7djavm0ldpr6f5z26"; + sha256 = "1585vjbrc8r0a7069aism66c0kkj91yklpdblb9c34570zbpabvs"; }; postPatch = '' diff --git a/pkgs/development/tools/misc/gdbgui/requirements.nix b/pkgs/development/tools/misc/gdbgui/requirements.nix index d3c7f31eaeb..13978645c29 100644 --- a/pkgs/development/tools/misc/gdbgui/requirements.nix +++ b/pkgs/development/tools/misc/gdbgui/requirements.nix @@ -113,13 +113,12 @@ let "Flask-SocketIO" = python.mkDerivation { - name = "Flask-SocketIO-2.9.2"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/e7/e0/c50a1b47498897b228764667cd006ca7d45374b79a8e5e2fa3e03ba4717c/Flask-SocketIO-2.9.2.tar.gz"; sha256 = "0fb686f9d85f4f34dc6609f62fa96fe15176a6ea7e6179149d319fabc54c543b"; }; + 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-engineio" self."python-socketio" ]; meta = with pkgs.stdenv.lib; { @@ -179,15 +178,15 @@ let "Werkzeug" = python.mkDerivation { - name = "Werkzeug-0.12.2"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/56/41/c095a77eb2dd69bf278dd664a97d3416af04e9ba1a00b8c138f772741d31/Werkzeug-0.12.2.tar.gz"; sha256 = "903a7b87b74635244548b30d30db4c8947fe64c5198f58899ddcd3a13c23bb26"; }; + 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 = "http://werkzeug.pocoo.org/"; + homepage = "https://www.palletsprojects.org/p/werkzeug/"; license = licenses.bsdOriginal; - description = "The Swiss Army knife of Python web development"; + description = "The comprehensive WSGI web application library."; }; }; @@ -208,56 +207,6 @@ let - "enum-compat" = python.mkDerivation { - name = "enum-compat-0.0.2"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/95/6e/26bdcba28b66126f66cf3e4cd03bcd63f7ae330d29ee68b1f6b623550bfa/enum-compat-0.0.2.tar.gz"; sha256 = "939ceff18186a5762ae4db9fa7bfe017edbd03b66526b798dd8245394c8a4192"; }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ - self."enum34" - ]; - meta = with pkgs.stdenv.lib; { - homepage = "https://github.com/jstasiak/enum-compat"; - license = licenses.mit; - description = "enum/enum34 compatibility package"; - }; - }; - - - - "enum34" = python.mkDerivation { - name = "enum34-1.1.6"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/bf/3e/31d502c25302814a7c2f1d3959d2a3b3f78e509002ba91aea64993936876/enum34-1.1.6.tar.gz"; sha256 = "8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1"; }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { - homepage = "https://bitbucket.org/stoneleaf/enum34"; - license = licenses.bsdOriginal; - description = "Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4"; - }; - }; - - - - "eventlet" = python.mkDerivation { - name = "eventlet-0.21.0"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/cb/ec/eae487c106a7e38f86ac4cadafb3eec77d29996f64ca0c7015067538069b/eventlet-0.21.0.tar.gz"; sha256 = "08faffab88c1b08bd53ea28bf084a572c89f7e7648bd9d71e6116ac17a51a15d"; }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ - self."enum-compat" - self."greenlet" - ]; - meta = with pkgs.stdenv.lib; { - homepage = "http://eventlet.net"; - license = licenses.mit; - description = "Highly concurrent networking library"; - }; - }; - - - "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"; }; @@ -306,8 +255,8 @@ let "pygdbmi" = python.mkDerivation { - name = "pygdbmi-0.7.4.4"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/bb/1c/8c8cbd0bb5cf513a905e3ca461cfad578e708a74417182f2a00943136f83/pygdbmi-0.7.4.4.tar.gz"; sha256 = "34cd00925ca98aed87decb6a0451fa094cf31386dc457b47a62bcbf8d905a3d3"; }; + 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 = [ ]; @@ -320,26 +269,9 @@ let - "pypugjs" = python.mkDerivation { - name = "pypugjs-4.2.2"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/21/bb/d541110bd5a5c1ecd9dab2778dc9a39ca5a5e9962845e9d3e598962ee3ca/pypugjs-4.2.2.tar.gz"; sha256 = "c99a72a78766d9462d94379a6b489f9864ecdeeeeaf8d0f34b2ce04963f6ec8c"; }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ - self."six" - ]; - meta = with pkgs.stdenv.lib; { - homepage = "http://github.com/matannoam/pypugjs"; - license = licenses.mit; - description = "PugJS syntax template adapter for Django, Jinja2, Mako and Tornado templates - copy of PyJade with the name changed"; - }; - }; - - - "python-engineio" = python.mkDerivation { - name = "python-engineio-2.0.1"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/ae/61/199d5693cb077d12fb82baa9505215e0654e50e3cd4d5f3331029312b55f/python-engineio-2.0.1.tar.gz"; sha256 = "266fca0c4ed4576c873458ef06fdc7ae20942210f5e9c5f9bd039debcc672c30"; }; + 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 = [ @@ -355,8 +287,8 @@ let "python-socketio" = python.mkDerivation { - name = "python-socketio-1.8.3"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/39/23/b0955fe05bed6d6621754d3b5043e5478cf57646e1e4c1cf55a6fc3f2acb/python-socketio-1.8.3.tar.gz"; sha256 = "822433bcda86924367bccfc64083bae60bd64c89c8fc07f79530458ce5a6dcea"; }; + 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 = [ diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/development/tools/misc/inotify-tools/default.nix index 4c1cd5bd7bd..8bc35ba01a6 100644 --- a/pkgs/development/tools/misc/inotify-tools/default.nix +++ b/pkgs/development/tools/misc/inotify-tools/default.nix @@ -1,14 +1,18 @@ -{ stdenv, fetchurl }: +{ stdenv, autoreconfHook, fetchFromGitHub }: stdenv.mkDerivation rec { name = "inotify-tools-${version}"; - version = "3.14"; + version = "3.20.1"; - src = fetchurl { - url = "http://github.com/downloads/rvoicilas/inotify-tools/inotify-tools-${version}.tar.gz"; - sha256 = "0by9frv1k59f76cx08sn06sk6lmdxsfb6zr0rshzhyrxi6lcqar2"; + src = fetchFromGitHub { + repo = "inotify-tools"; + owner = "rvoicilas"; + rev = version; + sha256 = "14dci1i4mhsd5sa33k8h3ayphk19kizynh5ql9ryibdpmcanfiyq"; }; + nativeBuildInputs = [ autoreconfHook ]; + meta = with stdenv.lib; { homepage = https://github.com/rvoicilas/inotify-tools/wiki; license = licenses.gpl2; diff --git a/pkgs/development/tools/misc/kibana/5.x.nix b/pkgs/development/tools/misc/kibana/5.x.nix index 735f85f7456..78b5df21fde 100644 --- a/pkgs/development/tools/misc/kibana/5.x.nix +++ b/pkgs/development/tools/misc/kibana/5.x.nix @@ -11,9 +11,9 @@ let elasticArch = archOverrides."${arch}" or arch; plat = elemAt info 1; shas = { - "x86_64-linux" = "02dhhp16pmkrpi2dfrca9qzz1q7jrxhaw6l3cfflgxx77hz0hlnw"; - "i686-linux" = "1h1zr342dq7nngvzpf9pn9mvwsi7aksa3qjyqpcc4yvbmmyrlk0m"; - "x86_64-darwin" = "0van8cnir6s520crc20bf2clbkf822c3ylpk7iiq7da8hwvsypp9"; + "x86_64-linux" = "1a9n7s9r0klqvpyr5d3a410cchbsb0syx6cqwbhhnihqyw8dcx1i"; + "i686-linux" = "0snnm5jwynvk6ahgl42yzl2jhld0ykn79rlcq9dsv2gpqnjb2mmv"; + "x86_64-darwin" = "0qw3xkj3n3aja8s8n9r4hbr65jm9m6dgfjhhnrln434648rx7z4v"; }; in stdenv.mkDerivation rec { name = "kibana-${version}"; diff --git a/pkgs/development/tools/misc/kibana/6.x.nix b/pkgs/development/tools/misc/kibana/6.x.nix new file mode 100644 index 00000000000..d7013ef46eb --- /dev/null +++ b/pkgs/development/tools/misc/kibana/6.x.nix @@ -0,0 +1,40 @@ +{ stdenv, makeWrapper, fetchurl, elk6Version, nodejs, coreutils, which }: + +with stdenv.lib; +let + inherit (builtins) elemAt; + info = splitString "-" stdenv.system; + arch = elemAt info 0; + plat = elemAt info 1; + shas = { + "x86_64-linux" = "0kgsafjn8wzrmiklfc8jg0h3cx25lhlkby8yz35wgpx4wbk3vfjx"; + "x86_64-darwin" = "0i2kq9vyjv151kk7h3dl3hjrqqgxsg0qqxdqwjwlz9ja5axzlxhd"; + }; +in stdenv.mkDerivation rec { + name = "kibana-${version}"; + version = elk6Version; + + src = fetchurl { + url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${arch}.tar.gz"; + sha256 = shas."${stdenv.system}" or (throw "Unknown architecture"); + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/libexec/kibana $out/bin + mv * $out/libexec/kibana/ + rm -r $out/libexec/kibana/node + makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \ + --prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}" + sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana + ''; + + meta = { + description = "Visualize logs and time-stamped data"; + homepage = http://www.elasticsearch.org/overview/kibana; + license = licenses.asl20; + maintainers = with maintainers; [ offline rickynils basvandijk ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/development/tools/misc/lit/default.nix b/pkgs/development/tools/misc/lit/default.nix index af792c0c6b9..05229e4be7b 100644 --- a/pkgs/development/tools/misc/lit/default.nix +++ b/pkgs/development/tools/misc/lit/default.nix @@ -2,12 +2,12 @@ python2.pkgs.buildPythonApplication rec { pname = "lit"; - version = "0.5.0"; + version = "0.5.1"; name = "${pname}-${version}"; src = python2.pkgs.fetchPypi { inherit pname version; - sha256 = "3ea4251e78ebeb2e07be2feb33243d1f8931d956efc96ccc2b0846ced212b58c"; + sha256 = "0z651m3vkbk85y41larnsjxrszkbi58x9gzml3lb6ga7qwcrsg97"; }; # Non-standard test suite. Needs custom checkPhase. diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index 774734a895c..76c83e2dbeb 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { socket (IPv6/IPv4/UNIX local), or partition (by opening a file from it). ''; - maintainers = [ stdenv.lib.maintainers.mornfall ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix index c2268ba8da2..cdfa51d6f2b 100644 --- a/pkgs/development/tools/misc/opengrok/default.nix +++ b/pkgs/development/tools/misc/opengrok/default.nix @@ -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/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index cde8eae0f7f..62647879865 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -1,13 +1,13 @@ { 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"; }; setupHook = [ ./setup-hook.sh ]; diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix index 5be42855a9c..7cfd78a39a2 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -24,7 +24,15 @@ stdenv.mkDerivation rec { 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 1c153976a34..34a9b9f1173 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/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix index cf143f7d9e9..28500ee08ee 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/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index eff849744ac..4c02b4daf1e 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { 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 45a31ad66f2..612df55471b 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, vim, libmysql, - libaio }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, vim, mysql +, libaio }: stdenv.mkDerivation rec { name = "sysbench-1.0.6"; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ vim libmysql libaio ]; + buildInputs = [ vim mysql.connector-c libaio ]; src = fetchFromGitHub { owner = "akopytov"; diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/tools/misc/teensy-loader-cli/default.nix index 7b360655c4f..4263b80789a 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/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index 2759b18e35c..d1f6cc4ea29 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/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index 2a77fc42602..eb51abe0321 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/xxdiff/tip.nix b/pkgs/development/tools/misc/xxdiff/tip.nix index d3b69901ed8..844758c0f06 100644 --- a/pkgs/development/tools/misc/xxdiff/tip.nix +++ b/pkgs/development/tools/misc/xxdiff/tip.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase ]; + # Fixes build with Qt 5.9 + NIX_CFLAGS_COMPILE = [ "-std=c++11" ]; + preConfigure = '' cd src make -f Makefile.bootstrap diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index 4c60067c48e..5f90525feca 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 e0bf9eac696..06588e60a5e 100644 --- a/pkgs/development/tools/misc/yodl/default.nix +++ b/pkgs/development/tools/misc/yodl/default.nix @@ -43,7 +43,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 6dc57afb51e..f06f9c6828c 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.560"; # Tests not included in pip package. doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "5d82f51e228a88e5de6ac1d6699dd09e250ce7de217a5ff1256e317266e738ec"; + sha256 = "1jja0xlwqajxzab8sabiycax8060zikg89dnl9a7lkqcrwprl35x"; }; - 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/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 846546ae769..186b78ce3f3 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { fi } - envHooks+=(addOCamlPath) + addEnvHooks "$targetOffset" addOCamlPath ''; meta = { diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix index e9331d078cf..3cf70d66ddb 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/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix index 2a9a634d0a4..8da0f781a8b 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/packer/default.nix b/pkgs/development/tools/packer/default.nix index f8dc96c2394..d97d67c9851 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.1.3"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "09hwq6dxyzhpl97akwbb02bjrisz9rf296avg5zj2p5qdsf4y777"; + sha256 = "0bfjv4sqci10jzy11qg6q1xyik36v98vd6ck91sarawvgbaprsp2"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index c34eb9fc708..612196cba77 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/flexc++/default.nix b/pkgs/development/tools/parsing/flexc++/default.nix index c782df50758..681f90bbe5a 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/lemon/default.nix b/pkgs/development/tools/parsing/lemon/default.nix index 480ee5b88f6..108576d0b11 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/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix index 1a6a4ca890c..3c062dbe1ab 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 01433a6ce4d..b017b1dc24b 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 = "9.0.1"; src = fetchPypi { inherit pname version; - sha256 = "08wkxs6qqgzxamym523bjv7zahg8p9v18x0yi9vwclij5k91iyzm"; + sha256 = "16k77iy1apbc1s5j78aimhjrcw89vbkq5irs80dmm70wayi0myz1"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/tools/profiling/pyprof2calltree/default.nix b/pkgs/development/tools/profiling/pyprof2calltree/default.nix new file mode 100644 index 00000000000..b2497633a68 --- /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/remarshal/default.nix b/pkgs/development/tools/remarshal/default.nix index ac4a39f0692..baba4fd75ea 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 32f9f6eb0bb..00000000000 --- 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/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index 6c30768d900..d50b1435b73 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -2,7 +2,7 @@ let baseName = "scalafmt"; - version = "1.3.0"; + version = "1.4.0"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -13,7 +13,7 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "0q1vw6drpdrfifbm3266igpml0phdk6pl0gd3b5amysigx83m251"; + outputHash = "12hsix3b7qnyr9x2v7i6jgqljdqxpfj4bfvhjdl99ijr793g3lnp"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index d05706a7fad..0f720f1f7e3 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; buildGoPackage rec { name = "skopeo-${version}"; - version = "0.1.23"; + version = "0.1.27"; rev = "v${version}"; goPackagePath = "github.com/projectatomic/skopeo"; @@ -17,7 +17,7 @@ buildGoPackage rec { inherit rev; owner = "projectatomic"; repo = "skopeo"; - sha256 = "1axxnm87fpsd7q28v951ilhmzd42k8wyh741gdfdcajjwglfj0nn"; + sha256 = "1xwwzxjczz8qdk1rf0h78qd3vk9mxxb8yi6f8kfqvcdcsvkajd5g"; }; patches = [ diff --git a/pkgs/development/tools/skopeo/path.patch b/pkgs/development/tools/skopeo/path.patch index eb3c54ae66c..fe456b58e54 100644 --- a/pkgs/development/tools/skopeo/path.patch +++ b/pkgs/development/tools/skopeo/path.patch @@ -22,17 +22,4 @@ index 50e29b2..7108df5 100644 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/tora/default.nix b/pkgs/development/tools/tora/default.nix index 578e759548a..5b46b975cf7 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/vagrant/Gemfile b/pkgs/development/tools/vagrant/Gemfile new file mode 100644 index 00000000000..d32951f1c05 --- /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 00000000000..208aab0a207 --- /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.1) + childprocess (~> 0.6.0) + erubis (~> 2.7.0) + hashicorp-checkpoint (~> 0.1.1) + 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.1.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.4) + 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.12.2) + 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) + netrc (0.11.0) + nori (2.6.0) + public_suffix (3.0.1) + rake (12.0.0) + rb-fsevent (0.10.2) + 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.4) + 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.1.1) + 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 e72520d61b3..5d967ba8127 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -1,141 +1,58 @@ -{ 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 = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; + sha256 = "1fjfl00n4rsq6khypm56g0vq6l153q128r35zky2ba30bz292ar1"; - 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"; + deps = bundlerEnv rec { + name = "${pname}-${version}"; + pname = "vagrant"; + inherit version; - sha256 = { - "x86_64-linux" = "0kyqchjsy747vbvhqiynz81kik8g0xqpkv70rz7hyr9x7fl9i51g"; - "i686-linux" = "0p3xhxy6shkd0393wjyj8qycdn3zqv60vnyz1b6zclz0kfah07zs"; - "x86_64-darwin" = "01hr5j9k31hsdlcwv3srzk0lphd8w0n9z95jvfkschdyjm9clpwm"; - }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + inherit ruby; + gemdir = ./.; + gemset = lib.recursiveUpdate (import ./gemset.nix) { + vagrant = { + source = { + type = "url"; + inherit url sha256; + }; + inherit version; + }; + }; + }; - arch = builtins.replaceStrings ["-linux" "-darwin"] ["" ""] stdenv.system; - -in stdenv.mkDerivation rec { - name = "vagrant-${version}"; +in buildRubyGem rec { + name = "${gemName}-${version}"; + gemName = "vagrant"; inherit version; - src = fetchurl { - inherit url sha256; + doCheck = true; + dontBuild = false; + src = fetchurl { inherit url sha256; }; + + patches = [ + ./unofficial-installation-nowarn.patch + ]; + + # 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" + ''; + + passthru = { + inherit ruby deps; }; - meta = with stdenv.lib; { + meta = with 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; + homepage = https://www.vagrantup.com/; + license = licenses.mit; + maintainers = with maintainers; [ aneeshusa ]; + platforms = with platforms; linux ++ darwin; }; - - 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 - - # libffi - ln -s ${libffi}/lib/libffi.so.6 opt/vagrant/embedded/lib/libffi.so.6 - - '') + '' - mkdir -p "$out" - cp -r opt "$out" - cp -r usr/bin "$out" - wrapProgram "$out/bin/vagrant" --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libxml2 libxslt ]}" \ - --prefix LD_LIBRARY_PATH : "$out/opt/vagrant/embedded/lib" - - install -D "opt/vagrant/embedded/gems/gems/vagrant-$version/contrib/bash/completion.sh" \ - "$out/share/bash-completion/completions/vagrant" - ''; - - preFixup = '' - # 'hide' the template file from shebang-patching - chmod -x "$out/opt/vagrant/embedded/gems/gems/vagrant-$version/plugins/provisioners/salt/bootstrap-salt.sh" - ''; - - 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 - ''); } diff --git a/pkgs/development/tools/vagrant/gemset.nix b/pkgs/development/tools/vagrant/gemset.nix new file mode 100644 index 00000000000..3dd517388d2 --- /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 = "15shgckjnxqpz1n9z6y4ax1dcnn5vdqcva29gdg2l7ny0g1w7c7m"; + type = "gem"; + }; + version = "0.1.4"; + }; + 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 = "1raim9ddjh672m32psaa9niw67ywzjbxbdb8iijx3wv9k5b0pk2x"; + type = "gem"; + }; + version = "1.12.2"; + }; + 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 = "013p5jb4wy0cq7x7036piw2a3s1i9p752ki1srx2m289mpz4ml3q"; + type = "gem"; + }; + version = "4.1.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 = "1fbpmjypwxkb8r7y1kmhmyp6gawa4byw0yb3jc3dn9ly4ld9lizf"; + type = "gem"; + }; + version = "0.10.2"; + }; + 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 = "14hr2dzqh33kqc0xchs8l05pf3kjcayvad4z1ip5rdjxrkfk8glb"; + type = "gem"; + }; + version = "0.0.7.4"; + }; + 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 = "03bpxlliyiny062p8a8vxyb1hymxpgfwliky4vlqn7lbm6z7n6kr"; + 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 = "0vax34qbr3n6jifxyzr4nngaz8vrmzw6ydw21cnnrhidfkqgh7ja"; + type = "gem"; + }; + version = "1.1.1"; + }; +} \ 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 00000000000..88595942895 --- /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/vndr/default.nix b/pkgs/development/tools/vndr/default.nix index 66fdb1841e4..2a4ddaf8039 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 e351a75db4b..9230d99efcc 100644 --- a/pkgs/development/tools/vogl/default.nix +++ b/pkgs/development/tools/vogl/default.nix @@ -4,6 +4,7 @@ , libdwarf, libjpeg_turbo, libunwind, lzma, tinyxml, libX11 , SDL2, SDL2_gfx, SDL2_image, SDL2_ttf , freeglut, mesa_glu +, 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 = [ diff --git a/pkgs/development/tools/vultr/default.nix b/pkgs/development/tools/vultr/default.nix index 29fedde9080..8e17c531547 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/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index 9dfd3b7e728..674b172b371 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -25,6 +25,9 @@ let ''; ini = writeText "wp-cli.ini" '' + [PHP] + memory_limit = -1 ; 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 00000000000..b99780d4138 --- /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 00000000000..82988437145 --- /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/sdk.nix b/pkgs/development/tools/xcbuild/sdk.nix index 169fd5f6ec6..87bbedd5788 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/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index 2f6b42e7a00..3a1547440fd 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 ]; diff --git a/pkgs/development/tools/yq/default.nix b/pkgs/development/tools/yq/default.nix index 6ddea86f1a7..6fb7f8440ef 100644 --- a/pkgs/development/tools/yq/default.nix +++ b/pkgs/development/tools/yq/default.nix @@ -2,9 +2,8 @@ buildPythonApplication rec { - name = "${pname}-${version}"; pname = "yq"; - version = "2.3.3"; + version = "2.3.4"; propagatedBuildInputs = [ pyyaml jq ]; @@ -13,7 +12,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "14ywdi464z68qclsqzb8r50rzmypknaz74zmpppkahjigfcfppm3"; + sha256 = "04ckrlmin8m176iicyfhddp4r0yry5hx306vhfglf8mcp1jkga78"; }; meta = with lib; { diff --git a/pkgs/development/web/nodejs/setup-hook.sh b/pkgs/development/web/nodejs/setup-hook.sh index e1f4d9089f3..18368588c2a 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/v4.nix b/pkgs/development/web/nodejs/v4.nix index 08fd91aaf8d..64674066b29 100644 --- a/pkgs/development/web/nodejs/v4.nix +++ b/pkgs/development/web/nodejs/v4.nix @@ -5,7 +5,7 @@ let in buildNodejs { inherit enableNpm; - version = "4.8.5"; - sha256 = "0lqdnnihmc2wpl1v1shj60i49wka2354b00a86k0xbjg5gyfx2m4"; + version = "4.8.7"; + sha256 = "1y21wq092d3gmccm2zldbflbbbx7a71wi9l0bpkxvzmgws69liq3"; 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 c703377d5a0..3688ee0b7ef 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"; + version = "6.12.2"; + sha256 = "1z6sn4b973sxw0h9hd38rjq6cqdkzl5gsd48f793abvarwgpqrrk"; patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ]; } diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix index 14dfb8164f4..fa5f10e8f7b 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"; + version = "8.9.4"; + sha256 = "0vy8rlg58kg75j4sw3xadmbrwxfa56iaykmjl18g9a8wkjfdxp3c"; patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; } diff --git a/pkgs/development/web/nodejs/v9.nix b/pkgs/development/web/nodejs/v9.nix index 1a2184d4cb9..f93dba1aec4 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.3.0"; - sha256 = "1kap1hi4am5advfp6yb3bd5nhd2wx2j72cjq8qqg7yh95xg0g25j"; + version = "9.4.0"; + sha256 = "035j44xkji9dxddlqws6ykkbyphbkhwhz700arpgz20jz3qf20vm"; patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; } diff --git a/pkgs/development/web/woff2/default.nix b/pkgs/development/web/woff2/default.nix new file mode 100644 index 00000000000..3480924370e --- /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 ]; + + buildInputs = [ 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/2048-in-terminal/default.nix b/pkgs/games/2048-in-terminal/default.nix index 30e930c294a..288c852b11e 100644 --- a/pkgs/games/2048-in-terminal/default.nix +++ b/pkgs/games/2048-in-terminal/default.nix @@ -2,11 +2,11 @@ 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"; }; @@ -18,13 +18,12 @@ stdenv.mkDerivation rec { 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/bzflag/default.nix b/pkgs/games/bzflag/default.nix index 1269b434634..9962e0e7105 100644 --- a/pkgs/games/bzflag/default.nix +++ b/pkgs/games/bzflag/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "bzflag"; - version = "2.4.10"; + version = "2.4.12"; src = fetchurl { url = "https://download.bzflag.org/${pname}/source/${version}/${name}.tar.bz2"; - sha256 = "1ylyd5safpraaym9fvnrqj2506dqrraaaqhrb2aa9zmjwi54aiqa"; + sha256 = "0380y47kgl97ld3dybjgjr2zwxqky8f938k9z7vad647cic3m8d8"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix index b46114ec62b..be6f3265430 100644 --- a/pkgs/games/cataclysm-dda/default.nix +++ b/pkgs/games/cataclysm-dda/default.nix @@ -1,5 +1,5 @@ -{ 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 }: stdenv.mkDerivation rec { version = "0.C"; @@ -12,25 +12,47 @@ stdenv.mkDerivation rec { sha256 = "03sdzsk4qdq99qckq0axbsvg1apn6xizscd8pwp5w6kq2fyj5xkv"; }; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ pkgconfig ] + ++ stdenv.lib.optionals stdenv.isDarwin [ libicns ]; - buildInputs = [ ncurses lua SDL2 SDL2_image SDL2_ttf SDL2_mixer freetype gettext ]; + buildInputs = [ ncurses lua SDL2 SDL2_image SDL2_ttf SDL2_mixer freetype gettext ] + ++ stdenv.lib.optionals 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' + -e 's,-Werror,,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 = [ + "PREFIX=$(out) LUA=1 TILES=1 SOUND=1 RELEASE=1 USE_HOME_DIR=1" + # "LANGUAGES=all" # vanilla C:DDA installs all translations even without this flag! + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + "NATIVE=osx CLANG=1" + "OSX_MIN=10.6" # SDL for macOS only supports deploying on 10.6 and above + ]; - postInstall = '' - wrapProgram $out/bin/cataclysm-tiles \ - --add-flags "--datadir $out/share/" + postBuild = stdenv.lib.optionalString stdenv.isDarwin '' + # iconutil on macOS is not available in nixpkgs + png2icns data/osx/AppIcon.icns data/osx/AppIcon.iconset/* + ''; + + postInstall = stdenv.lib.optionalString 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 @@ -64,6 +86,6 @@ stdenv.mkDerivation rec { homepage = http://en.cataclysmdda.com/; 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 0437a1b130f..3d8ec7d6844 100644 --- a/pkgs/games/cataclysm-dda/git.nix +++ b/pkgs/games/cataclysm-dda/git.nix @@ -1,5 +1,5 @@ -{ 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 }: stdenv.mkDerivation rec { version = "2017-12-09"; @@ -12,25 +12,40 @@ stdenv.mkDerivation rec { sha256 = "1a7kdmx76na4g65zra01qaq98lxp9j2dl9ddv09r0p5yxaizw68z"; }; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ncurses lua SDL2 SDL2_image SDL2_ttf SDL2_mixer freetype gettext ]; + buildInputs = [ ncurses lua SDL2 SDL2_image SDL2_ttf SDL2_mixer freetype gettext ] + ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation 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' + -e 's,-Werror,,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 = [ + "PREFIX=$(out) LUA=1 TILES=1 SOUND=1 RELEASE=1 USE_HOME_DIR=1" + "LANGUAGES=all" + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + "NATIVE=osx CLANG=1" + ]; - postInstall = '' - wrapProgram $out/bin/cataclysm-tiles \ - --add-flags "--datadir $out/share/cataclysm-dda/" + postInstall = stdenv.lib.optionalString 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 ''; # https://hydra.nixos.org/build/65193254 @@ -65,6 +80,6 @@ stdenv.mkDerivation rec { ''; homepage = http://en.cataclysmdda.com/; 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 00000000000..775a8ec6007 --- /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 00000000000..c3140af03c8 --- /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/crrcsim/default.nix b/pkgs/games/crrcsim/default.nix index 23980c5842b..5d387e19928 100644 --- a/pkgs/games/crrcsim/default.nix +++ b/pkgs/games/crrcsim/default.nix @@ -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 index 19fcbb2443d..253a7fcbf30 100644 --- a/pkgs/games/cutemaze/default.nix +++ b/pkgs/games/cutemaze/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cutemaze-${version}"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { url = "https://gottcode.org/cutemaze/${name}-src.tar.bz2"; - sha256 = "841f2a208770c9de6009fed64e24a059a878686c444c4b572c56b564e4cfa66e"; + sha256 = "1a2jmkm7fjzdrvzgvbqfq20k0vvpwfcycagsm0haxb3fpv86950y"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/games/d1x-rebirth/default.nix b/pkgs/games/d1x-rebirth/default.nix deleted file mode 100644 index 52aec1b8a59..00000000000 --- 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 566b6f8cc82..00000000000 --- 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/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 698d2924bfe..71938874057 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -4,13 +4,13 @@ }: let - dfVersion = "0.44.02"; + dfVersion = "0.44.05"; version = "${dfVersion}-alpha1"; rev = "refs/tags/${version}"; - sha256 = "1cdp2jwhxl54ym92jm58xyrz942ajp6idl31qrmzcqzawp2fl620"; + sha256 = "1hr3qsx7rd36syw7dfp4lh8kpmz1pvva757za2yn34hj1jm4nh52"; # revision of library/xml submodule - xmlRev = "e2e256066cc4a5c427172d9d27db25b7823e4e86"; + xmlRev = "3a9f401d196ee8ebc53edb9e15a13bfcb0879b4e"; arch = if stdenv.system == "x86_64-linux" then "64" diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index c330471f430..20f7502f27d 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "dwarf-therapist-original-${version}"; - version = "39.0.0"; + version = "39.2.0"; src = fetchFromGitHub { owner = "Dwarf-Therapist"; repo = "Dwarf-Therapist"; - rev = "8ae293a6b45333bbf30644d11d1987651e53a307"; - sha256 = "0p1127agr2a97gp5chgdkaa0wf02hqgx82yid1cvqpyj8amal6yg"; + rev = "v${version}"; + sha256 = "1ddy9b9ly1231pnjs43gj7pvc77wjvs4j2rlympal81vyabaphmy"; }; outputs = [ "out" "layouts" ]; diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index 54666e86cc1..8a85578172a 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -4,7 +4,7 @@ let baseVersion = "44"; - patchVersion = "02"; + patchVersion = "05"; dfVersion = "0.${baseVersion}.${patchVersion}"; libpath = lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc dwarf-fortress-unfuck SDL ]; platform = @@ -12,8 +12,8 @@ let else if stdenv.system == "i686-linux" then "linux32" else throw "Unsupported platform"; sha256 = - if stdenv.system == "x86_64-linux" then "1w2b6sxjxb5cvmv15fxmzfkxvby4kdcf4kj4w35687filyg0skah" - else if stdenv.system == "i686-linux" then "1yqzkgyl1adwysqskc2v4wlp1nkgxc7w6m37nwllghgwfzaiqwnh" + if stdenv.system == "x86_64-linux" then "18bjyhjp5458bfbizm8vq4s00pqpfs097qp6pv76m84kgbc4ghg3" + else if stdenv.system == "i686-linux" then "1b9i4kf4c8s6bhqwn8jx100mg7fqp8nmswrai5w8dsma01py4amr" else throw "Unsupported platform"; in diff --git a/pkgs/games/dwarf-fortress/soundsense.nix b/pkgs/games/dwarf-fortress/soundsense.nix index 17448d87f40..def3a09a4ba 100644 --- a/pkgs/games/dwarf-fortress/soundsense.nix +++ b/pkgs/games/dwarf-fortress/soundsense.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { version = "2016-1_196"; - dfVersion = "0.44.02"; + dfVersion = "0.44.05"; inherit soundPack; name = "soundsense-${version}"; src = fetchzip { diff --git a/pkgs/games/dwarf-fortress/themes/cla.nix b/pkgs/games/dwarf-fortress/themes/cla.nix index 78ebd430727..7c3eb0b63e3 100644 --- a/pkgs/games/dwarf-fortress/themes/cla.nix +++ b/pkgs/games/dwarf-fortress/themes/cla.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "cla-theme-${version}"; - version = "44.01-v24"; + version = "44.xx-v25"; src = fetchFromGitHub { owner = "DFgraphics"; repo = "CLA"; rev = version; - sha256 = "1lyazrls2vr8z58vfk5nvaffyv048j5xkr4wjvp6vrqxxvrxyrfd"; + sha256 = "1h8nwa939qzqklbi8vwsq9p2brvv7sc0pbzzrdjnb221lr9p58zk"; }; installPhase = '' @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cp -r data raw $out ''; - passthru.dfVersion = "0.44.02"; + passthru.dfVersion = "0.44.05"; preferLocalBuild = true; diff --git a/pkgs/games/dwarf-fortress/themes/phoebus.nix b/pkgs/games/dwarf-fortress/themes/phoebus.nix index 57881686eaa..d9490271920 100644 --- a/pkgs/games/dwarf-fortress/themes/phoebus.nix +++ b/pkgs/games/dwarf-fortress/themes/phoebus.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "phoebus-theme-${version}"; - version = "44.02a"; + version = "44.05"; src = fetchFromGitHub { owner = "DFgraphics"; repo = "Phoebus"; rev = version; - sha256 = "10qd8fbn75fvhkyxqljn4w52kbhfp9xh1ybanjzc57bz79sdzvfp"; + sha256 = "06mhr6dpbvwp9dxn70kyr6dwyql2k6x5zba2zf6awjah7idys0xr"; }; installPhase = '' @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cp -r data raw $out ''; - passthru.dfVersion = "0.44.02"; + passthru.dfVersion = "0.44.05"; preferLocalBuild = true; diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index 3b0df3ce28c..8d7a5a0d1a9 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -3,7 +3,7 @@ , ncurses, glib, gtk2, libsndfile, zlib }: -let dfVersion = "0.44.02"; in +let dfVersion = "0.44.05"; in stdenv.mkDerivation { name = "dwarf_fortress_unfuck-${dfVersion}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "svenstaro"; repo = "dwarf_fortress_unfuck"; rev = dfVersion; - sha256 = "0gfchfqrzx0h59mdv01hik8q2a2yx170q578agfck0nv39yhi6i5"; + sha256 = "00yj4l4gazxg4i6fj9rwri6vm17i6bviy2mpkx0z5c0mvsr7s14b"; }; cmakeFlags = [ diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix new file mode 100644 index 00000000000..9645a89b3b2 --- /dev/null +++ b/pkgs/games/dxx-rebirth/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, scons, pkgconfig +, SDL, SDL_mixer, mesa, physfs +}: + +let + music = fetchurl { + url = "http://www.dxx-rebirth.com/download/dxx/res/d2xr-sc55-music.dxa"; + sha256 = "05mz77vml396mff43dbs50524rlm4fyds6widypagfbh5hc55qdc"; + }; + +in stdenv.mkDerivation rec { + name = "dxx-rebirth-${version}"; + version = "0.59.100"; + + src = fetchurl { + url = "http://www.dxx-rebirth.com/download/dxx/dxx-rebirth_v${version}-src.tar.gz"; + sha256 = "0m9k34zyr8bbni9szip407mffdpwbqszgfggavgqjwq0k9c1w7ka"; + }; + + nativeBuildInputs = [ pkgconfig scons ]; + + buildInputs = [ mesa physfs SDL SDL_mixer ]; + + enableParallelBuilding = true; + + 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 = http://www.dxx-rebirth.com/; + license = licenses.free; + maintainers = with maintainers; [ viric ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/games/easyrpg-player/default.nix b/pkgs/games/easyrpg-player/default.nix new file mode 100644 index 00000000000..be45866a7dd --- /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 185295a20b6..42a3339594a 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -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/factorio/fetch.nix b/pkgs/games/factorio/fetch.nix index 439f2478a66..7dbe2064a5c 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/freeciv/default.nix b/pkgs/games/freeciv/default.nix index d60c4c7d0de..82d573e47a2 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.10"; 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 = "00mkzhfcbc27d8m7hj644h8lyc9mb8nhqfcngc52zkidarb438f8"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/games/lincity/ng.nix b/pkgs/games/lincity/ng.nix index 28fd6fe6e50..8004aa9931d 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, mesa, 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 mesa SDL SDL_mixer SDL_image SDL_ttf SDL_gfx physfs ]; - preConfigure = '' - ./autogen.sh - ''; + autoreconfPhase = '' + ./autogen.sh + ''; - installPhase = '' - touch CREDITS - AR='ar r' jam install - ''; + buildPhase = '' + runHook preBuild - meta = { - description = ''City building game''; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [stdenv.lib.maintainers.raskin]; + AR='ar r' jam -j $NIX_BUILD_CORES + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + touch CREDITS + AR='ar r' jam install + + runHook postInstall + ''; + + 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 00000000000..3b0aca6df28 --- /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/megaglest/default.nix b/pkgs/games/megaglest/default.nix index 3fafcfddcbf..d43904bca6c 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -1,12 +1,13 @@ -{ 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 +, 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 ]; }; @@ -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 + buildInputs = [ cmake git curl SDL2 xercesc openal lua libpng libjpeg vlc wxGTK glib cppunit fontconfig freetype ftgl glew libogg libvorbis makeWrapper mesa_glu ]; 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/minetest/default.nix b/pkgs/games/minetest/default.nix index b40083bedba..49750997a90 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -4,19 +4,19 @@ }: 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 { diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix index 03052c52f7f..02bd0ba78d1 100644 --- a/pkgs/games/mnemosyne/default.nix +++ b/pkgs/games/mnemosyne/default.nix @@ -26,7 +26,7 @@ in pythonPackages.buildPythonApplication rec { rm -r $out/lib/python2.7/site-packages/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 8ea8dfccb16..d0c07b71e2e 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/neverball/default.nix b/pkgs/games/neverball/default.nix index 0006f895809..62d89c7c31e 100644 --- a/pkgs/games/neverball/default.nix +++ b/pkgs/games/neverball/default.nix @@ -4,7 +4,7 @@ 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"; }; @@ -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/openttd/default.nix b/pkgs/games/openttd/default.nix index 2ecff1c835e..d0a8469dd1d 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.7.2"; src = fetchurl { url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz"; - sha256 = "0dhv5bbbg1dmmq7fi3xss0a9jq2rqgb5sf9fsqzlsjcdm590j6b1"; + sha256 = "1m29s6shnp7c9qh7pzdbvhy7i5awyzn1hr39xkinrpwgvsxa0lgy"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/games/qgo/default.nix b/pkgs/games/qgo/default.nix index 4848d1a3e21..924101c2d4a 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/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 00000000000..63f31d7ef9e --- /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 00000000000..db32cb70d41 --- /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/scummvm/default.nix b/pkgs/games/scummvm/default.nix index 893055fa6e9..29b44f9d857 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -1,5 +1,5 @@ -{ stdenv, nasm -, fetchurl, SDL2, SDL2_net, freetype, zlib, libmpeg2, libjpeg, libmad, libogg, libvorbis, flac, alsaLib, mesa +{ stdenv, fetchurl, nasm +, alsaLib, flac, fluidsynth, freetype, libjpeg, libmad, libmpeg2, libogg, libvorbis, mesa, SDL2, zlib , hostPlatform }: @@ -15,8 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ nasm ]; buildInputs = [ - SDL2 SDL2_net - freetype libjpeg libmpeg2 libmad libogg libvorbis flac alsaLib mesa zlib + alsaLib freetype flac fluidsynth libjpeg libmad libmpeg2 libogg libvorbis mesa SDL2 zlib ]; enableParallelBuilding = true; diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index 9ea23423673..ada2520a097 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -163,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 9fcab8b1ec9..96a38a10c6c 100644 --- a/pkgs/games/soi/default.nix +++ b/pkgs/games/soi/default.nix @@ -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/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index a7392bbc34e..49d786284da 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -69,6 +69,9 @@ in buildFHSUserEnv rec { xlibs.libX11 xlibs.libXfixes + # Needed to properly check for libGL.so.1 in steam-wrapper.sh + pkgsi686Linux.glxinfo + # Not formally in runtime but needed by some games gst_all_1.gstreamer gst_all_1.gst-plugins-ugly @@ -103,7 +106,26 @@ in buildFHSUserEnv rec { export TZDIR=/etc/zoneinfo ''; - runScript = "steam"; + runScript = writeScript "steam-wrapper.sh" '' + #!${stdenv.shell} + if [ -f /host/etc/NIXOS ]; then # Check only useful on NixOS + 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 + steam + ''; passthru.run = buildFHSUserEnv { name = "steam-run"; diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix index 5ca0de6a773..d51d1bb154d 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/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index e05f5a92a33..df5d7e7b4fa 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -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 mesa 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/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index 504353afebe..bd37ba0f01f 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -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/tome4/default.nix b/pkgs/games/tome4/default.nix index ad9b5f7dc6c..f07fd88fbaf 100644 --- a/pkgs/games/tome4/default.nix +++ b/pkgs/games/tome4/default.nix @@ -4,7 +4,7 @@ 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"; + url = "https://te4.org/dl/t-engine/t-engine4-src-${version}.tar.bz2"; sha256 = "0c82m0g1ps64zghgdrp78m6bvfngcb75whhknqiailld7kz1g9xl"; }; nativeBuildInputs = [ premake4 ]; @@ -34,7 +34,7 @@ EOF cp -r game $out/opt/tome4 ''; meta = with stdenv.lib; { - homepage = http://te4.org/; + homepage = https://te4.org/; description = "Tales of Maj'eyal (rogue-like game)"; maintainers = [ maintainers.chattered ]; license = licenses.gpl3; diff --git a/pkgs/games/unnethack/default.nix b/pkgs/games/unnethack/default.nix index 57749c4f228..a1a8272fd0f 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/vdrift/0001-Ignore-missing-data-for-installation.patch b/pkgs/games/vdrift/0001-Ignore-missing-data-for-installation.patch new file mode 100644 index 00000000000..6794e8018af --- /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 27eef261426..81b95ddb9e1 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, mesa, 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}"; + + src = fetchFromGitHub { + owner = "vdrift"; + repo = "vdrift"; + rev = "12d444ed18395be8827a21b96cc7974252fce6d1"; + sha256 = "001wq3c4n9wzxqfpq40b1jcl16sxbqv2zbkpy9rq2wf9h417q6hg"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ scons mesa SDL2 SDL2_image libvorbis bullet curl gettext ]; + + 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; + }; }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ scons mesa SDL2 SDL2_image libvorbis bullet curl gettext ]; - - 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 + wrappedName = "vdrift-${version}-with-data-${toString data.rev}"; +in writeTextFile { + name = wrappedName; + text = '' + export VDRIFT_DATA_DIRECTORY="${data}" + exec ${bin}/bin/vdrift "$@" ''; - 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; + 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/zod/default.nix b/pkgs/games/zod/default.nix index f795a2ea3a2..da2f256aeb7 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/cups/drivers/samsung/4.00.39/default.nix b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix index 16b40798a5d..18dd6c14822 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 556c408012d..e8da0541f6c 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/filters.nix b/pkgs/misc/cups/filters.nix index be788f9add4..f80f2ddf03e 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.0"; src = fetchurl { url = "http://openprinting.org/download/cups-filters/${name}.tar.xz"; - sha256 = "1kcndzpbbcaxafnz1wa6acy3p3r5likfqmf057i5q0q6i176lz5k"; + sha256 = "0g6npicm1cwmxqi6ymfvf9wkplp4z2rzvjjl9v4yfvqdjq85gxnp"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index 114568fdd52..1c79be712b0 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/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix index f538066e75c..37f2361b45e 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 66ed1d44adc..f8f8d16d142 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -73,17 +73,17 @@ pythonPackages.buildPythonApplication { 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 +96,8 @@ pythonPackages.buildPythonApplication { --with-systraydir=$out/xdg/autostart --with-mimedir=$out/etc/cups --enable-policykit + --disable-qt4 + ${stdenv.lib.optionals withQt5 "--enable-qt5"} " export makeFlags=" @@ -140,9 +142,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 ''; diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix new file mode 100644 index 00000000000..bbb0d1523df --- /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.0.1"; + + src = fetchFromGitHub { + owner = "kozec"; + repo = "sc-controller"; + rev = "v${version}"; + sha256 = "0vhgiqg4r4bnn004ql80rvi23y05wlax80sj8qsr91pvqsxwv3yl"; + }; + + 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 = [ maintainers.orivej ]; + }; +} diff --git a/pkgs/misc/drivers/steamcontroller/default.nix b/pkgs/misc/drivers/steamcontroller/default.nix new file mode 100644 index 00000000000..d44c90d198a --- /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/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix index ffb2052ca0c..8262eea48b4 100644 --- a/pkgs/misc/drivers/xboxdrv/default.nix +++ b/pkgs/misc/drivers/xboxdrv/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { 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/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix index 56f63e74734..081846f78e3 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" ]; diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix index 97f61e452ff..2eebe089de3 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-01-24"; # Submodules src = fetchgit { url = "https://github.com/citra-emu/citra"; - rev = "a724fb365787718f9e44adedc14e59d0854905a6"; - sha256 = "0lkrwhxvq85c0smix27xvj8m463bxa67qhy8m8r43g39n0h8d5sf"; + rev = "33b0b5163fdb08bc8aa1d7eb83e0931a14ed3046"; + sha256 = "07z32d8lj84yy3l5iqpk37mnmvzjmppqhyqr64kbx14dh5hb6cbj"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/misc/emulators/gens-gs/default.nix index bfe43403bc6..74aa29e84ef 100644 --- a/pkgs/misc/emulators/gens-gs/default.nix +++ b/pkgs/misc/emulators/gens-gs/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { 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/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index f14608fd93e..64e29f59a18 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -1,21 +1,34 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, fetchpatch , pkgconfig, cmake, libzip, epoxy, ffmpeg, imagemagick, SDL2 , qtbase, qtmultimedia }: stdenv.mkDerivation rec { name = "mgba-${version}"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "mgba-emu"; repo = "mgba"; rev = version; - sha256 = "1kzb6zj2lxfaiyfq9h7q26fh7xh1ggybmh5pin5rcgs7jyygrsjb"; + sha256 = "1fgxn3j6wc5mcgb81sc6fzy5m4saz02jz4zlms51dgycvy0flbz7"; }; nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ libzip epoxy ffmpeg imagemagick SDL2 qtbase qtmultimedia ]; + patches = [ + (fetchpatch { + url = "https://github.com/mgba-emu/mgba/commit/e31373560535203d826687044290a4994706c2dd.patch"; + sha256 = "07582vj0fqgsgryx28pnshiwri9dn88l1rr4vkraib7bzx7cs4f9"; + }) + + (fetchpatch { + url = "https://github.com/mgba-emu/mgba/commit/baabe0090bb1fd5997e531fd9568c2de09b5fc21.patch"; + sha256 = "1kv9dxxna35s050q9af9nzskplz2x1aq8avg0ihbznhxjl8vmxz9"; + }) + ]; + meta = with stdenv.lib; { homepage = https://mgba.io; description = "A modern GBA emulator with a focus on accuracy"; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 64bb8b4e356..82e2384cf0b 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { ((map (links "share/wine/gecko") geckos) ++ (map (links "share/wine/mono") monos))} '' + lib.optionalString supportFlags.gstreamerSupport '' - for i in wine wine64; do + for i in wine ; do if [ -e "$out/bin/$i" ]; then wrapProgram "$out/bin/$i" \ --argv0 "" \ diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 91fb0da82d8..928e692df6b 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -56,9 +56,12 @@ let wine-build = build: release: }); in if wineRelease == "staging" then - callPackage ./staging.nix { - inherit libtxc_dxtn_Name; - wineUnstable = wine-build wineBuild "unstable"; - } + let wineUnstable = wine-build wineBuild "unstable"; in + # wine staging is not yet at 3.0, using unstable + # FIXME update winestaging sources + wineUnstable + # callPackage ./staging.nix { + # inherit libtxc_dxtn_Name wineUnstable; + # } else wine-build wineBuild wineRelease diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 39bd26714e7..c276a24b183 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -1,4 +1,11 @@ { pkgs ? import {} }: +## 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,14 +39,17 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "2.21"; - url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz"; - sha256 = "1vxbnikdpsmca3nx064mqrm83xpjsfshy25mdfxmyg5vrzl09yms"; + version = "3.0"; + url = "https://dl.winehq.org/wine/source/3.0/wine-${version}.tar.xz"; + sha256 = "1v7vq9iinkscbq6wg85fb0d2137660fg2nk5iabxkl2wr850asil"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { + # https://github.com/wine-compholio/wine-staging/releases inherit (unstable) version; + # FIXME update winestaging sources, when 3.0 is released + # FIXME then revert the staging derivation in ./default.nix sha256 = "1qznp4kgss4mhk1vvr91jmszsi47xg312r64l76jkgwijhypmvb7"; owner = "wine-compholio"; repo = "wine-staging"; @@ -47,8 +57,9 @@ in rec { }; winetricks = fetchFromGitHub rec { - version = "20171018"; - sha256 = "0qlnxyaydpqx87kfyrkkmwg0jv9dfh3mkq27g224a8v1kf9z3r3h"; + # https://github.com/Winetricks/winetricks/releases + version = "20171222"; + sha256 = "04risg44kqq8z9nsflw7m7dqykw2aii8m8j495z6fgb7p0pi8ny9"; owner = "Winetricks"; repo = "winetricks"; rev = version; diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 20da91efede..a242f0261c7 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -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 ]; diff --git a/pkgs/misc/logging/beats/default.nix b/pkgs/misc/logging/beats/5.x.nix similarity index 95% rename from pkgs/misc/logging/beats/default.nix rename to pkgs/misc/logging/beats/5.x.nix index e3333fa5caa..ba2a8b2448e 100644 --- a/pkgs/misc/logging/beats/default.nix +++ b/pkgs/misc/logging/beats/5.x.nix @@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec { owner = "elastic"; repo = "beats"; rev = "v${version}"; - sha256 = "1lbdi4c0y4bfkmim9q98ravknv4yw0dl3z57c3w5aqhi2sx0w23h"; + sha256 = "0ri2l8pyl1fnx0zypliwprkk1wkaxz8ywkgz8h2f08v7h1zgq1m6"; }; goPackagePath = "github.com/elastic/beats"; diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix new file mode 100644 index 00000000000..2883604491c --- /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 = "05ay6hdc1jgi6b00bd998zc39ca8jhnk7i6m3mw70s0baqv1scik"; + }; + + 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 2d210ca0098..d0b7458bf57 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/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index 72fb7b41c69..4a51facb4aa 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -5,13 +5,13 @@ 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 ]; diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 87b55e3948b..b07c11a23dd 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "5.37"; + version = "5.38"; 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 = "1f58h5rgjbxr4hh40m6zkpkzbzg68l7nqzjwal0b17yysafbmsf6"; }; buildInputs = @@ -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; 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/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix index ade47704bae..9d63e9c3aaf 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.1"; src = fetchFromGitHub { owner = "adapta-project"; repo = "adapta-gtk-theme"; rev = version; - sha256 = "19kav8m6aj4h7qg0z92k09lppzdgy6h9lxxv3qqqrl3hmg7bn0sx"; + sha256 = "0l662l66ja8dsakcgwg6ab69lkl0va0r5h74dr6yjdsy0q4h2m7h"; }; preferLocalBuild = true; @@ -40,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 00000000000..42ff954a46b --- /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/blackbird/default.nix b/pkgs/misc/themes/blackbird/default.nix index 5eead87b1c7..4b7702ed635 100644 --- a/pkgs/misc/themes/blackbird/default.nix +++ b/pkgs/misc/themes/blackbird/default.nix @@ -2,14 +2,14 @@ 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 ]; diff --git a/pkgs/misc/themes/deepin/default.nix b/pkgs/misc/themes/deepin/default.nix index 670a02c85d9..bdddc28cc44 100644 --- a/pkgs/misc/themes/deepin/default.nix +++ b/pkgs/misc/themes/deepin/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "deepin-gtk-theme-${version}"; - version = "17.10.4"; + version = "17.10.5"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "deepin-gtk-theme"; rev = version; - sha256 = "1hb0y72fzmcj2yl6q7mbc0c7yxkd1qgnyw4vixdqxnxk2c82sxzw"; + sha256 = "0ff1yg4gz4p7nd0qg3dcbsiw8yqlvqccm55kxi998w8j1wrg6pq3"; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; diff --git a/pkgs/misc/themes/kde2/default.nix b/pkgs/misc/themes/kde2/default.nix new file mode 100644 index 00000000000..1d281b3ac90 --- /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 753188ed007..f8437f6d681 100644 --- a/pkgs/misc/themes/materia-theme/default.nix +++ b/pkgs/misc/themes/materia-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "materia-theme-${version}"; - version = "20171213"; + version = "20180110"; src = fetchFromGitHub { owner = "nana-4"; repo = "materia-theme"; rev = "v${version}"; - sha256 = "1dn458r8ca97xz4pqyxy2rqigs97dg3k868l4yvlsdy732mspm0h"; + sha256 = "1knfcc4bqibshbk5s4461brzw780gj7c1i42b168c6jw9p6br6bf"; }; nativeBuildInputs = [ gnome3.glib libxml2 ]; diff --git a/pkgs/misc/themes/plano/default.nix b/pkgs/misc/themes/plano/default.nix new file mode 100644 index 00000000000..64d4e807e42 --- /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/zuki/default.nix b/pkgs/misc/themes/zuki/default.nix index 00743a345c9..1d5b7ad311c 100644 --- a/pkgs/misc/themes/zuki/default.nix +++ b/pkgs/misc/themes/zuki/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "zuki-themes-${version}"; - version = "3.24-2"; + version = "3.24-3"; src = fetchFromGitHub { owner = "lassekongo83"; repo = "zuki-themes"; rev = "v${version}"; - sha256 = "1js92qq1zi3iq40nl6n0m52hhhn9ql9i7y8ycg8vw3w0v8xyb4km"; + sha256 = "02zallh1kwxp3sarz6nxm6j7v1rf6wwz7gf8gn81xslqjg188dq6"; }; buildInputs = [ gdk_pixbuf gtk_engines ]; @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { 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; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 05bcf62beec..d041d6de4f6 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -127,6 +127,17 @@ rec { # --- generated packages bellow this line --- + Auto_Pairs = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "Auto_Pairs-2017-07-03"; + src = fetchgit { + url = "git://github.com/jiangmiao/auto-pairs"; + rev = "f0019fc6423e7ce7bbd01d196a7e027077687fda"; + sha256 = "1kzrdq3adwxwm3fw65g05ww9405lwqi368win5kayamyj9i0z7r6"; + }; + dependencies = []; + + }; + CSApprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "CSApprox-2013-07-26"; src = fetchgit { @@ -149,6 +160,17 @@ rec { }; + Cosco = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "Cosco-2017-07-26"; + src = fetchgit { + url = "git://github.com/lfilho/cosco.vim"; + rev = "4a2a080415860196c936a32679d9032f41ba21e4"; + sha256 = "0gljxy6shr7kmm8vvj6rm4c0lr0ydbny9lrsp64c3d4d0b2wnmig"; + }; + dependencies = []; + + }; + Gist = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "Gist-2016-10-10"; src = fetchgit { @@ -194,11 +216,22 @@ rec { }; Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Syntastic-2017-11-17"; + name = "Syntastic-2018-01-12"; src = fetchgit { url = "git://github.com/scrooloose/syntastic"; - rev = "96cc251075f3f9d290c5afd4adf1b64c1542d469"; - sha256 = "1c2nch9037565n3mrpxf17dnn4c6j7w8wwzfj3fw9anwzr1m5kwl"; + rev = "937d77d1f3ba8de08ad275e052e38d0e680a175b"; + sha256 = "10qrq1fs53srp4inxmcm8zq5kjdl56hh1lwh2jhda9mfwrbhg3fp"; + }; + dependencies = []; + + }; + + SyntaxRange = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "SyntaxRange-2017-07-03"; + src = fetchgit { + url = "git://github.com/inkarkat/vim-SyntaxRange"; + rev = "213cfda0a0f11505665dbfe1e58c803f498761a6"; + sha256 = "1dg9n3zll3a79lv96kdlxxs141binb8w79zdisj7djxc5y2k48qs"; }; dependencies = []; @@ -297,6 +330,17 @@ rec { sourceRoot = "."; }; + caw = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "caw-2018-01-01"; + src = fetchgit { + url = "git://github.com/tyru/caw.vim"; + rev = "50efcd94e00dc3e814bcc0d3d8ccfa3ff324ea42"; + sha256 = "06hpby2amh2pb4dlfd7s6wybzc8rh8wa3jz0gyv6xx3l91agfari"; + }; + dependencies = []; + + }; + clang_complete = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "clang_complete-2017-09-25"; src = fetchgit { @@ -329,6 +373,17 @@ rec { }; + csv = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "csv-2018-01-03"; + src = fetchgit { + url = "git://github.com/chrisbra/csv.vim"; + rev = "a50b977fa25a854e7d099198bfa65e2dc680898b"; + sha256 = "02a6289rbjw8r0l668ala5abfr2rls3slrnk4yrsfc6ka550zj9y"; + }; + dependencies = []; + + }; + ctrlp-cmatcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "ctrlp-cmatcher-2015-10-15"; src = fetchgit { @@ -366,6 +421,17 @@ rec { }; + easygit = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "easygit-2017-08-11"; + src = fetchgit { + url = "git://github.com/chemzqm/vim-easygit"; + rev = "8f66da54da627395309548efee6d8705b7f50768"; + sha256 = "013jl330k9yjcvzzqhwz93adm4349gkl3q1c55m1zfkg3afmvnwd"; + }; + dependencies = []; + + }; + extradite = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "extradite-2015-09-22"; src = fetchgit { @@ -378,11 +444,11 @@ rec { }; fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fugitive-2017-11-30"; + name = "fugitive-2017-12-16"; src = fetchgit { url = "git://github.com/tpope/vim-fugitive"; - rev = "5032d9ee72361dc3cfaae1a9b3353211203e443f"; - sha256 = "1zx5l8lx7440l3pvs2bx81r3wmpvbmq7qs8ziz9lvlp91s7dqy88"; + rev = "f3ccb0c12ee4985b8808f83059830a24cc92821c"; + sha256 = "1ry67wi5dci4jy54jyf3lsf0yq13a42z9w5qh39rwv5w9wiab2fb"; }; dependencies = []; @@ -444,11 +510,11 @@ rec { }; deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-nvim-2017-12-06"; + name = "deoplete-nvim-2018-01-14"; src = fetchgit { url = "https://github.com/Shougo/deoplete.nvim"; - rev = "9d048047807b7bfacd7406ebe85acdb1dc019018"; - sha256 = "15b881j6f54ykljqhbpl9ajjbhjlgqywr963a7g0d35qnyxzidb8"; + rev = "b164eb8c36ddbb8835434e013358de29b9c8f1f2"; + sha256 = "0k3zmpdlg4y4f0y3pgfcqmglrrs1iagw8iaaz131nyswz0m2pf6x"; }; dependencies = []; @@ -711,11 +777,11 @@ rec { }; vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-elixir-2017-10-20"; + name = "vim-elixir-2018-02-01"; src = fetchgit { url = "https://github.com/elixir-lang/vim-elixir"; - rev = "3066d5fb5e1c694e607b2bb5d8277266ca524262"; - sha256 = "1j5sic3rssh2kaj73lv4m5sck3irn1jzgkpdr5qw7qi0gyfgpg81"; + rev = "8ca41c1f02208dd5ca68c7bcb6c71b3b92f46af6"; + sha256 = "0dp9cqflbwc3h1hzgn9fyaxhcn6q9bclgfy9kkgywp8zk5kwzb7p"; }; dependencies = []; @@ -1030,11 +1096,11 @@ rec { }; fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fzf-vim-2017-12-06"; + name = "fzf-vim-2018-01-09"; src = fetchgit { url = "https://github.com/junegunn/fzf.vim"; - rev = "11b7fb91e152258c59b0bb0526c3fb04469cf38c"; - sha256 = "1p6p557bg56763vq49lfhyr8h30kf1gwiqz1jf6j0mqg46w4q77j"; + rev = "c0a5fee7071ed89602b9b59fb67e83d6cd23addc"; + sha256 = "0biqq9g116zziv9k0axgn8wasgwb57fwaxwjj8vsajrmq5phdl4z"; }; dependencies = []; @@ -1786,7 +1852,7 @@ rec { meta = { description = "Fastest non utf-8 aware word and C completion engine for Vim"; - homepage = http://github.com/Valloric/YouCompleteMe; + homepage = https://github.com/Valloric/YouCompleteMe; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [marcweber jagajaga]; platforms = stdenv.lib.platforms.unix; @@ -2089,6 +2155,18 @@ rec { }; + gitv = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "gitv-2017-11-26"; + src = fetchgit { + url = "https://github.com/gregsexton/gitv"; + rev = "4b7ecf354726a3d31d0ad9090efd27a79c850a35"; + sha256 = "0n2ddq0kicl2xjrhxi5pqvpikxa7vbf0hp3lzwmpapmvx146wi3w"; + }; + dependencies = ["fugitive"]; + + }; + + matchit-zip = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "matchit-zip"; src = fetchurl { @@ -2111,6 +2189,17 @@ rec { ''; }; + neco-look = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "neco-look-2018-01-07"; + src = fetchgit { + url = "git://github.com/ujihisa/neco-look"; + rev = "ff3de2731177694d0e85f1227b6cfd51c8e2bc8d"; + sha256 = "0zpny9sj7alzsbrjbph71b44zf575hij1ky8pwgba0ygp2p2fxd4"; + }; + dependencies = []; + + }; + pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "pathogen-2017-08-04"; src = fetchgit { @@ -2122,6 +2211,17 @@ rec { }; + prettyprint = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "prettyprint-2016-07-16"; + src = fetchgit { + url = "git://github.com/thinca/vim-prettyprint"; + rev = "d6060d2b1ff1cff71714e126addd3b10883ade12"; + sha256 = "0mb1ylsq4023ik9wd9iwzlynra2c320xp9h2i79bspapglgd5gk9"; + }; + dependencies = []; + + }; + quickfixstatus = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "quickfixstatus-2011-09-02"; src = fetchgit { @@ -2144,6 +2244,17 @@ rec { }; + riv = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "riv-2017-02-07"; + src = fetchgit { + url = "git://github.com/Rykka/riv.vim"; + rev = "d1efdd92fbb51dc452c61eec54a0ec084f011b4b"; + sha256 = "18qcglbrixgqk05x34dy2cksaw0dg7n51p48i6zkh5sqspv98zz3"; + }; + dependencies = []; + + }; + sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "sensible-2017-05-09"; src = fetchgit { @@ -2188,6 +2299,17 @@ rec { }; + sparkup = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "sparkup-2012-06-10"; + src = fetchgit { + url = "git://github.com/chrisgeo/sparkup"; + rev = "6fbfceef890e705c47b42b27be743ffed6f9296e"; + sha256 = "17jgpvl879ik53rr3razfnbpfx63mzpp1rlvxxjsvvrk4g45dssm"; + }; + dependencies = []; + + }; + surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "surround-2016-06-01"; src = fetchgit { @@ -2200,11 +2322,22 @@ rec { }; table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "table-mode-2017-10-26"; + name = "table-mode-2018-01-04"; src = fetchgit { url = "git://github.com/dhruvasagar/vim-table-mode"; - rev = "40fe641708c58476c3a1b9aeafb68dd888d4920b"; - sha256 = "1rb2jq81965gpziqxlljr2bqjyfbikqa9ncxaaak3x61prn4z084"; + rev = "b25fe6f9f0f0b704d05ebd05edbbf0be3038cef9"; + sha256 = "14ykj2yrwi8k6mkzg0vi4favwg88l8c7zf7m6qzvndpjqw8jggdy"; + }; + dependencies = []; + + }; + + tabpagecd = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "tabpagecd-2013-11-29"; + src = fetchgit { + url = "git://github.com/kana/vim-tabpagecd"; + rev = "8b71a03a037608fa5918f5096812577cec6355e4"; + sha256 = "1mr6s2hvsf2a2nkjjvq78c9isfxk2k1ih890w740srbq6ssj0npm"; }; dependencies = []; @@ -2484,6 +2617,28 @@ rec { }; + vim-cursorword = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-cursorword-2017-10-19"; + src = fetchgit { + url = "git://github.com/itchyny/vim-cursorword"; + rev = "4878d6185b99131c5f610cc6ad0e223439ac4601"; + sha256 = "170nf0w7i5k3cr72dkvraq2p0lzsvb3cmdvslyz7cmxnz611n6bf"; + }; + dependencies = []; + + }; + + vim-dirdiff = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-dirdiff-2017-01-19"; + src = fetchgit { + url = "https://github.com/will133/vim-dirdiff"; + rev = "db1fe77dcefa7a5b1089c8a84d1b401a4bd780bc"; + sha256 = "1540h5skh8rcpzj0vp8sr53hg9jmmknj155pxs4z5w6gvzk7nx0p"; + }; + dependencies = []; + + }; + vim-easy-align = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-easy-align-2017-06-03"; src = fetchgit { @@ -2495,6 +2650,17 @@ rec { }; + vim-ft-diff_fold = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-ft-diff_fold-2013-02-10"; + src = fetchgit { + url = "git://github.com/thinca/vim-ft-diff_fold"; + rev = "89771dffd3682ef82a4b3b3e9c971b9909f08e87"; + sha256 = "0bk95cxkfzamlgv1x2jb1bnfas2pmvvqgpn5fvxddf0andm8sfma"; + }; + dependencies = []; + + }; + vim-gista = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-gista-2017-02-20"; src = fetchgit { @@ -2517,6 +2683,17 @@ rec { }; + vim-dashboard = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-dashboard-2017-08-08"; + src = fetchgit { + url = "git://github.com/junegunn/vim-github-dashboard"; + rev = "054d7c69d9882a6ffccedd6e43623e184958d3b6"; + sha256 = "1ns6dd8719hqrkqnxd52ssi7gxjxni7w4l1ih7ag72d62qzw0p8y"; + }; + dependencies = []; + + }; + vim-iced-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-iced-coffee-script-2013-12-27"; src = fetchgit { @@ -2528,6 +2705,28 @@ rec { }; + vim-javascript = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-javascript-2018-01-10"; + src = fetchgit { + url = "git://github.com/pangloss/vim-javascript"; + rev = "4c0a554423df72ecb8d13b143afa7a4cfcb994ec"; + sha256 = "01lbkcfjqwrn2pbxz1jj8g2vxasc2i7s6nc7665s1warn066ykjr"; + }; + dependencies = []; + + }; + + vim-jsbeautify = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-jsbeautify-2017-05-20"; + src = fetchgit { + url = "git://github.com/maksimr/vim-jsbeautify"; + rev = "e83f749c3de7e958e7bc285e80e484707b6f1e12"; + sha256 = "0dy9ljqp6shac406xgawzrqcapm80rjxmbzwy93ypzlhi8b67w0a"; + }; + dependencies = []; + + }; + vim-latex-live-preview = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-latex-live-preview-2017-11-09"; src = fetchgit { @@ -2539,6 +2738,17 @@ rec { }; + vim-logreview = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-logreview-2017-07-08"; + src = fetchgit { + url = "git://github.com/andreshazard/vim-logreview"; + rev = "b7b66ab338e904127d796af49235b8c29742f18f"; + sha256 = "09lyymq0f3ybqdzhbpia7b0wcjbcyg5nkqd72qk8jkvc42da2af3"; + }; + dependencies = []; + + }; + vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-multiple-cursors-2017-08-04"; src = fetchgit { @@ -2550,6 +2760,28 @@ rec { }; + vim-ruby = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-ruby-2017-06-22"; + src = fetchgit { + url = "git://github.com/vim-ruby/vim-ruby"; + rev = "074200ffa39b19baf9d9750d399d53d97f21ee07"; + sha256 = "1w2d12cl40nf73f3hcpqc4sqma8h1a557fy8kds2x143gq7s5vx6"; + }; + dependencies = []; + + }; + + vim-scouter = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-scouter-2014-08-10"; + src = fetchgit { + url = "git://github.com/thinca/vim-scouter"; + rev = "5221901d4ad6b2ef8b370b336db2aa7f69f2b6dc"; + sha256 = "0fx64hj1kzrsxz96195d5lm3x88zyycbcr78819mcbgfzyxis6b8"; + }; + dependencies = []; + + }; + vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-signature-2017-09-24"; src = fetchgit { @@ -2637,4 +2869,26 @@ rec { dependencies = []; }; + + xterm-color-table = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "xterm-color-table-2013-12-31"; + src = fetchgit { + url = "git://github.com/guns/xterm-color-table.vim"; + rev = "9754e857e5f4fe1f8727106dcc682d21c29a51e4"; + sha256 = "08a1d9428xwrjp40qgi34cb5fwgc239qf3agxl32k7bqbn08pq19"; + }; + dependencies = []; + + }; + + zeavim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "zeavim-2017-12-20"; + src = fetchgit { + url = "git://github.com/KabbAmine/zeavim.vim"; + rev = "88f81078059d98d7637a93b90730897a3af231a4"; + sha256 = "1p43f6bbs9fcvvp1i90kzx1xj7k6c5w3ajf9wlrplpkz6hsiv2wv"; + }; + dependencies = []; + + }; } diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 268888b08ec..661917c955b 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -1,10 +1,12 @@ "CSApprox" "CheckAttach" +"Cosco" "Gist" "Hoogle" "Solarized" "Supertab" "Syntastic" +"SyntaxRange" "Tabular" "Tagbar" "The_NERD_Commenter" @@ -13,11 +15,14 @@ "VimOutliner" "WebAPI" "YankRing" +"caw" "clang_complete" "commentary" +"csv" "ctrlp-cmatcher" "ctrlp-py-matcher" "ctrlp-z" +"easygit" "extradite" "fugitive" "ghcmod" @@ -62,6 +67,7 @@ "github:google/vim-codefmt" "github:google/vim-jsonnet" "github:google/vim-maktaba" +"github:gregsexton/gitv" "github:heavenshell/vim-jsdoc" "github:hecal3/vim-leader-guide" "github:idris-hackers/idris-vim" @@ -160,6 +166,7 @@ "github:w0rp/ale" "github:wakatime/vim-wakatime" "github:wincent/command-t" +"github:will133/vim-dirdiff" "github:xolox/vim-easytags" "github:xolox/vim-misc" "github:zah/nim.vim" @@ -168,16 +175,22 @@ "github:zig-lang/zig.vim" "goyo" "gruvbox" +"jiangmiao-auto-pairs" "matchit.zip" +"neco-look" "pathogen" +"prettyprint" "quickfixstatus" "rainbow_parentheses" +"riv" "sensible" "sleuth" "snipmate" "sourcemap" +"sparkup" "surround" "table-mode" +"tabpagecd" "taglist" "tlib" "undotree" @@ -202,12 +215,20 @@ "vim-addon-xdebug" "vim-airline" "vim-coffee-script" +"vim-cursorword" +"vim-dashboard" "vim-easy-align" +"vim-ft-diff_fold" "vim-gista" "vim-gitgutter" "vim-iced-coffee-script" +"vim-javascript" +"vim-jsbeautify" "vim-latex-live-preview" +"vim-logreview" "vim-multiple-cursors" +"vim-ruby" +"vim-scouter" "vim-signature" "vim-signify" "vim-snippets" @@ -216,3 +237,5 @@ "vimwiki" "vinegar" "vundle" +"xterm-color-table" +"zeavim" 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 04d8e878f4f..b0d5915fc1f 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/security-setup-hook.sh b/pkgs/os-specific/darwin/apple-sdk/security-setup-hook.sh index f31adaa0d74..ed9bdbd912d 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/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 478f9e7e303..cca729016c2 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -186,7 +186,7 @@ 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" {}; 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 a74198e8ddd..a565971a6fa 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/ghc-standalone-archive/default.nix b/pkgs/os-specific/darwin/ghc-standalone-archive/default.nix index d23328d362e..46ba6828186 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/maloader/default.nix b/pkgs/os-specific/darwin/maloader/default.nix index 1684c0e92ce..5f4306ec0c1 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 = '' diff --git a/pkgs/os-specific/darwin/trash/default.nix b/pkgs/os-specific/darwin/trash/default.nix new file mode 100644 index 00000000000..4104d0d455a --- /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 00000000000..546c760b10e --- /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 a04d1decbd8..bd12373da88 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 6dae0f6bb38..37de98780b6 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 95efbab5be4..c209cf6e316 100644 --- a/pkgs/os-specific/linux/acpid/default.nix +++ b/pkgs/os-specific/linux/acpid/default.nix @@ -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/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index b576ca71d58..29e1357d38a 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -2,15 +2,18 @@ , pkgconfig, which , flex, bison , linuxHeaders ? stdenv.cc.libc.linuxHeaders -, pythonPackages +, python +, gawk , perl , swig +, ncurses , pam }: 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,8 +24,8 @@ 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 = '' @@ -44,12 +47,13 @@ let flex pkgconfig swig + ncurses which ]; buildInputs = [ perl - pythonPackages.python + python ]; # required to build apparmor-parser @@ -59,7 +63,6 @@ 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" ''; - postPatch = "cd ./libraries/libapparmor"; configureFlags = "--with-python --with-perl"; @@ -81,7 +84,7 @@ let buildInputs = [ perl - pythonPackages.python + python libapparmor libapparmor.python ]; @@ -93,10 +96,10 @@ let 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 +107,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; @@ -170,6 +196,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/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index 7bec6cadcfc..0558b42dda3 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -6,11 +6,11 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { - name = "audit-2.8.1"; + name = "audit-2.8.2"; src = fetchurl { url = "http://people.redhat.com/sgrubb/audit/${name}.tar.gz"; - sha256 = "0v1vng43fjsh158zb5k5d81ngn4p4jmj1247m27pk0bfzy9dxv0v"; + sha256 = "1fmw8whraz1q3y3z5mgdpgsa3wz6r3zq0kgsgbc9xvmgfwmrpdb7"; }; outputs = [ "bin" "dev" "out" "man" ]; diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index 002e458b24d..f41278b1f7c 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 = "2017.4"; 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 = "126wfmng4x19k8n4930v03qbjhwrikq9bvhl7mlng1k2fpx1msn4"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 6ff3903c4f2..17776f1ad21 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 = "2017.4"; 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 = "0r742krc9mn677wmfwbhwhqq9739n74vpw0xfasvy7d59nn6lz84"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 4f8a85d5d88..db56c8d0412 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-2017.4"; 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 = "0k4sf52sbk39m25w6plk8spwcf4kzc3axckyk2r6anxxsangyl4a"; }; + 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 67b843fac4d..ade9b8f750f 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 = '' diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 75b7802772d..23e8c1ca7d7 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, makeWrapper, cmake, llvmPackages_5, kernel -, flex, bison, elfutils, python, pythonPackages, luajit, netperf, iperf }: +{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, llvmPackages_5, kernel +, flex, bison, elfutils, python, pythonPackages, luajit, netperf, iperf, libelf }: 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 = [ @@ -17,7 +17,17 @@ stdenv.mkDerivation rec { elfutils python pythonPackages.netaddr luajit netperf iperf ]; - 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"; diff --git a/pkgs/os-specific/linux/beegfs/default.nix b/pkgs/os-specific/linux/beegfs/default.nix new file mode 100644 index 00000000000..6cf233694cd --- /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.17"; + + 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 = "10xs7gzdmlg23k6zn1b7jij3lljn7rr1j6h476hq4lbg981qk3n3"; + }; + + 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 00000000000..4525d156159 --- /dev/null +++ b/pkgs/os-specific/linux/beegfs/kernel-module.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, which +, kmod, kernel +} : + +let + version = "6.17"; +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 = "10xs7gzdmlg23k6zn1b7jij3lljn7rr1j6h476hq4lbg981qk3n3"; + }; + + 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 ]; + broken = versionAtLeast kernel.version "4.14"; + }; +} diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index e9a1f314abc..62c3986569d 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -5,15 +5,15 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "bluez-5.47"; + name = "bluez-5.48"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${name}.tar.xz"; - sha256 = "1j22hfjz0fp4pgclgz9mfcwjbr4wqgah3gd2qhfg4r6msmybyxfg"; + sha256 = "140fjyxa2q4y35d9n52vki649jzb094pf71hxkkvlrpgf8q75a5r"; }; pythonPath = with pythonPackages; - [ dbus pygobject2 pygobject3 recursivePthLoader ]; + [ dbus-python pygobject2 pygobject3 recursivePthLoader ]; buildInputs = [ pkgconfig dbus glib alsaLib pythonPackages.python pythonPackages.wrapPython diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 8a42e5a0b26..9423e7a33f4 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation { 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 00000000000..523fa291d52 --- /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 6cc4dc6f6d5..83c442618b8 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 0de7348c44f..2d356b66b3a 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 bcb24d127cc..a8d5ab48ac2 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -27,35 +27,20 @@ let in stdenv.mkDerivation rec { - name = "busybox-1.27.2"; + name = "busybox-1.28.0"; # 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 = "1701carjf02y7r3djm1yvyd5kzrcxm4szinp7agfv7fmvfvm6ib0"; }; 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"; - }) - (fetchpatch { - name = "CVE-2017-16544.patch"; - url = "https://git.busybox.net/busybox/patch/?id=c3797d40a1c57352192c6106cc0f435e7d9c11e8"; - sha256 = "1q3lkc4xczxrzhz73x2r0w7kmd6y33zhcnz3478nk5xi0qr66mcy"; - }) + ./busybox-in-store.patch ]; configurePhase = '' @@ -95,7 +80,7 @@ stdenv.mkDerivation rec { makeFlagsArray+=("CC=${stdenv.cc.targetPrefix}gcc -isystem ${musl}/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/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index 08c6d997795..8c9e7a9ade5 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -18,6 +18,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 b7a8dc23a78..93681b2e18c 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -64,25 +64,15 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "conky-${version}"; - version = "1.10.6"; + version = "1.10.7"; src = fetchFromGitHub { owner = "brndnmtthws"; repo = "conky"; rev = "v${version}"; - sha256 = "15j8h251v9jpdg6h6wn1vb45pkk806pf9s5n3rdrps9r185w8hn8"; + sha256 = "1qx47m4c1j3wh1hmbn2h8wyvg0ncr3kz1zcdj9si2bdyz3s0i9w7"; }; - patches = [ - # Patch to fix compilation on gcc-7 from conky PR - # https://github.com/brndnmtthws/conky/pull/402 - (fetchpatch { - name = "gcc7.patch"; - url = "https://github.com/brndnmtthws/conky/commit/6140122b82d50acc333e5d2a813cc1933ecc6d21.patch"; - sha256 = "1fblfj1w2kc0gshc2pq9lc1pxxsgmgh8byb1xs2v6amx15kj11k7"; - }) - ]; - postPatch = '' sed -i -e '/include.*CheckIncludeFile)/i include(CheckIncludeFiles)' \ cmake/ConkyPlatformChecks.cmake @@ -95,8 +85,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 diff --git a/pkgs/os-specific/linux/conntrack-tools/default.nix b/pkgs/os-specific/linux/conntrack-tools/default.nix index ea09050fc60..9736d7a8f4b 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/crda/default.nix b/pkgs/os-specific/linux/crda/default.nix index 63330020afe..940913d6a6c 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/criu-2.12.1-glibc-2.26.patch b/pkgs/os-specific/linux/criu/criu-2.12.1-glibc-2.26.patch deleted file mode 100644 index 916161e35a4..00000000000 --- a/pkgs/os-specific/linux/criu/criu-2.12.1-glibc-2.26.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/criu/cr-restore.c -+++ b/criu/cr-restore.c -@@ -650,3 +650,2 @@ static void zombie_prepare_signals(void) - (1 << SIGSYS) |\ -- (1 << SIGUNUSED)|\ - (1 << SIGSTKFLT)|\ ---- a/test/zdtm/static/pthread01.c -+++ b/test/zdtm/static/pthread01.c -@@ -45,3 +45,3 @@ static char *decode_signal(const sigset_t *s, char *buf) - COLLECT(SIGXFSZ); COLLECT(SIGVTALRM); COLLECT(SIGPROF); COLLECT(SIGWINCH); COLLECT(SIGIO); -- COLLECT(SIGPOLL); COLLECT(SIGPWR); COLLECT(SIGSYS); COLLECT(SIGUNUSED); -+ COLLECT(SIGPOLL); COLLECT(SIGPWR); COLLECT(SIGSYS); - #undef COLLECT diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 4ceb397d9f8..4ef162e56c7 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -4,30 +4,23 @@ stdenv.mkDerivation rec { name = "criu-${version}"; - version = "2.12.1"; + version = "3.7"; src = fetchurl { url = "http://download.openvz.org/criu/${name}.tar.bz2"; - sha256 = "18m0sjgcfvzc86w49fd3kxw145nmrsvc5w7zf42nxdiklmszbr1k"; + sha256 = "0qrpz7pvnks34v7d8lb73flz3mb7qwnib94pdwaxh0mskn8470fq"; }; - patches = [ ./criu-2.12.1-glibc-2.26.patch ]; - enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig docbook_xsl ]; buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet python ]; postPatch = '' - chmod +w ./scripts/gen-offsets.sh - substituteInPlace ./scripts/gen-offsets.sh --replace hexdump ${utillinux}/bin/hexdump 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/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index e44a50233c3..4bd50fdae40 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 366cc9787f2..81cc6b4fbd8 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 363ecf4fc41..9ed691d69f0 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.0"; name = "ena-${version}-${kernel.version}"; src = fetchFromGitHub { owner = "amzn"; repo = "amzn-drivers"; rev = "ena_linux_${version}"; - sha256 = "0m0jqd6gyk4r43w6p5dvp1djg2qgvyhnzmg53sszlh55mlgla714"; + sha256 = "1h3vnwa2129advyws69n0sqyra4nz68mng6g84whbvhzjyx810sj"; }; 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} - ''; + 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 - ''; + installPhase = '' + strip -S ena.ko + dest=$out/lib/modules/${kernel.modDirVersion}/misc + mkdir -p $dest + cp ena.ko $dest/ + xz $dest/ena.ko + ''; - meta = { + 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/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index 11d0a461da0..5db64e15e04 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -2,15 +2,17 @@ stdenv.mkDerivation rec { name = "evdi-${version}"; - version = "1.4.1+git2017-06-12"; + version = "unstable-2018-01-12"; src = fetchFromGitHub { owner = "DisplayLink"; repo = "evdi"; - rev = "ee1c578774e62fe4b08d92750620ed3094642160"; - sha256 = "1m3wkmw4hjpjax7rvhmpicz09d7vxcxklq797ddjg6ljvf12671b"; + rev = "e7a08d08e3876efba8007e91df1b296f2447b8de"; + sha256 = "01z7bx5rgpb5lc4c6dxfiv52ni25564djxmvmgy3d7r1x1mqhxgs"; }; + nativeBuildInputs = kernel.moduleBuildDependencies; + buildInputs = [ kernel libdrm ]; makeFlags = [ "KVER=${kernel.modDirVersion}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; @@ -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"; }; } diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix index ee6249ce040..56da5b0f16f 100644 --- a/pkgs/os-specific/linux/exfat/default.nix +++ b/pkgs/os-specific/linux/exfat/default.nix @@ -17,6 +17,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/facetimehd/default.nix b/pkgs/os-specific/linux/facetimehd/default.nix index 720bc34c419..d65018c600e 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 f68856f6b86..fd955676775 100644 --- a/pkgs/os-specific/linux/fatrace/default.nix +++ b/pkgs/os-specific/linux/fatrace/default.nix @@ -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/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index 5ee8ab564b0..1c7ebce9f87 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 4f09410c75e..2637beb517a 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 0044a3f6f4a..acdba5987bb 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "firmware-linux-nonfree-${version}"; - version = "2017-12-06-${src.iwlRev}"; + version = "2018-01-04-${src.iwlRev}"; # The src runCommand automates the process of building a merged repository of both # @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { src = runCommand "firmware-linux-nonfree-src-merged-${version}" { shallowSince = "2017-10-01"; - baseRev = "7f93c9deb484c0a8f4cf59780e77dc7b0c14abe3"; + baseRev = "65b1c68c63f974d72610db38dfae49861117cae2"; iwlRev = "iwlwifi-fw-2017-11-15"; # When updating this, you need to let it run with a wrong hash, in order to find out the desired hash # randomly mutate the hash to break out of fixed hash, when updating - outputHash = "007ncka33vkyaxnih3a36w5pnhn19wdzjl95ig7lhznzvf1bnc1w"; + outputHash = "1anr7fblxfcrfrrgq98kzy64yrwygc2wdgi47skdmjxhi3wbrvxz"; outputHashAlgo = "sha256"; outputHashMode = "recursive"; @@ -32,8 +32,7 @@ stdenv.mkDerivation rec { # traffic, so don't do that. preferLocalBuild = true; - buildInputs = [ git gnupg ]; - NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + nativeBuildInputs = [ cacert git gnupg ]; } '' git init src && ( cd src @@ -55,12 +54,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/freefall/default.nix b/pkgs/os-specific/linux/freefall/default.nix index 54be786d10d..a091b2f17c5 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/ftop/default.nix b/pkgs/os-specific/linux/ftop/default.nix index 73a6d18fc8b..915431c0cb1 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/default.nix b/pkgs/os-specific/linux/fuse/default.nix index 7856f6389c7..97744968d7b 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -9,7 +9,7 @@ in { fuse_2 = mkFuse { version = "2.9.7"; sha256Hash = "1wyjjfb7p4jrkk15zryzv33096a5fmsdyr2p4b00dd819wnly2n2"; - maintainers = [ maintainers.mornfall ]; + maintainers = [ ]; }; fuse_3 = mkFuse { diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/os-specific/linux/hdparm/default.nix index 0f0eab1fa20..0f794c315e5 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.53"; src = fetchurl { url = "mirror://sourceforge/hdparm/${name}.tar.gz"; - sha256 = "1djgxhfadd865dcrl6dp7dvjxpaisy7mk17mbdbglwg24ga9qhn3"; + sha256 = "1rb5086gp4l1h1fn2nk10ziqxjxigsd0c1zczahwc5k9vy8zawr6"; }; 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 00000000000..f89747dc200 --- /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 ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ perl ]; extraIncludeDirs = lib.optional hostPlatform.isPowerPC ["ppc"]; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 64f8163369b..82a092cd539 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -51,7 +51,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 ''} @@ -343,15 +343,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 +371,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 diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 0d2b7655edb..e00bda692b3 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, perl, buildLinux +{ stdenv, buildPackages, perl, buildLinux , # The kernel source tarball. src @@ -23,7 +23,8 @@ # 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 , ... @@ -43,14 +44,12 @@ let netfilterRPFilter = true; } // features) kernelPatches; - configWithPlatform = kernelPlatform: import ./common-config.nix { - inherit stdenv version kernelPlatform extraConfig; + config = import ./common-config.nix { + inherit stdenv version extraConfig; + kernelPlatform = hostPlatform; features = kernelFeatures; # Ensure we know of all extra patches, etc. }; - config = configWithPlatform stdenv.platform; - configCross = configWithPlatform hostPlatform.platform; - kernelConfigFun = baseConfig: let configFromPatches = @@ -65,31 +64,15 @@ let kernelConfig = kernelConfigFun config; + depsBuildBuild = [ buildPackages.stdenv.cc ]; 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; - - inherit (kernel.crossDrv) src patches preUnpack; - }; + platformName = hostPlatform.platform.name; + kernelBaseConfig = hostPlatform.platform.kernelBaseConfig; + kernelTarget = hostPlatform.platform.kernelTarget; + autoModules = hostPlatform.platform.kernelAutoModules; + preferBuiltin = hostPlatform.platform.kernelPreferBuiltin or false; + arch = hostPlatform.platform.kernelArch; prePatch = kernel.prePatch + '' # Patch kconfig to print "###" after every question so that @@ -103,7 +86,7 @@ let cd $buildRoot # 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 ../$sourceRoot O=$PWD $kernelBaseConfig ARCH=$arch # Create the config file. echo "generating kernel configuration..." @@ -118,15 +101,9 @@ let }; kernel = buildLinux { - inherit version modDirVersion src kernelPatches stdenv extraMeta; - - configfile = configfile.nativeDrv or configfile; - - crossConfigfile = configfile.crossDrv or configfile; + inherit version modDirVersion src kernelPatches stdenv extraMeta configfile; config = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; }; - - crossConfig = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; }; }; passthru = { @@ -134,10 +111,4 @@ let 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 a859a3cefbd..3a82c00c501 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 index 767f7e35422..506682479c7 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.13.nix @@ -1,4 +1,4 @@ -{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: +{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { version = "4.13.16"; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index ffb0974e052..0a3ad3ef84f 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.8"; - - # modDirVersion needs to be x.y.z, will automatically add .0 if needed - modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); + version = "4.14.16"; # 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 = "0cwk9liv79hw5l34xvwnf05spx1jvv8q8w9lfbw4lw8xldxwbg3f"; + sha256 = "095c2cjmjfsgnmml4f3lzc0pbhjy8nv8w07rywgpp5s5494dn2q7"; }; } // (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 00000000000..0f1aae1aa1b --- /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; + +import ./generic.nix (args // rec { + version = "4.15"; + + # 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 = "0sd7l9n9h7vf9c6gd6ciji28hawda60yj0llh17my06m0s4lf9js"; + }; +} // (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 7731407bee8..ec6141c3d20 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.107"; + version = "4.4.114"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "05qsi0rhbacx317vq5ls0h2zhi6kiik073z6xlc4blq5icyc4pfj"; + sha256 = "1nag129dv3krn9b3f958fv2ns56x1nlgf8fy3mx74pkzqm6hnh4m"; }; } // (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 ef3265c7c30..314ba6827c3 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.71"; + version = "4.9.79"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "173nvdshckhdlisn08pf6cal9bhlj8ra569y26013hsfzd09gzgi"; + sha256 = "0kf2zh7gf8jsm11vmp2hx2bji54ndsaj74ma405rj0qyxdchd45i"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-beagleboard.nix b/pkgs/os-specific/linux/kernel/linux-beagleboard.nix index 33885a082d6..097408d61d9 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.61"; - tag = "r76"; + modDirVersion = "4.14.12"; + tag = "r23"; in -import ./generic.nix (args // rec { +stdenv.lib.overrideDerivation (import ./generic.nix (args // rec { version = "${modDirVersion}-ti-${tag}"; inherit modDirVersion; @@ -12,7 +12,7 @@ import ./generic.nix (args // rec { owner = "beagleboard"; repo = "linux"; rev = "${version}"; - sha256 = "0hcz4fwjyic42mrn8qsvzm4jq1g5k51awjj3d2das7k8frjalaby"; + 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-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix index eb3d43a8cce..c449d632ba8 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix @@ -1,11 +1,11 @@ -{ stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: +{ stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: with stdenv.lib; let - version = "4.14.8"; - revision = "b"; - sha256 = "02wf94bg2kbn63ivnnd3qqflhjq49902s80l3hpr96v9kfdk4p4x"; + version = "4.15"; + revision = "a"; + sha256 = "1jia6isz4mi7a76rg7nd5iqll6py5kjz0myp4z0dx17xm9axcgqm"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix index 92b202100a6..9720e3c0e4a 100644 --- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix +++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix @@ -1,4 +1,4 @@ -{ stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: +{ stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: import ./generic.nix (rec { mptcpVersion = "0.93"; diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index fb97aa579df..1efb11435e2 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -1,4 +1,4 @@ -{ stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: +{ stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: let modDirVersion = "4.9.59"; 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 f262dfe34b7..c65182271dc 100644 --- a/pkgs/os-specific/linux/kernel/linux-samus-4.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-samus-4.12.nix @@ -1,6 +1,4 @@ -{ stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ncurses, ... } @ args: - -assert stdenv.is64bit; +{ stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ncurses, ... } @ args: import ./generic.nix (args // rec { version = "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 a104cc5393c..ac13835afdd 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,4 +1,4 @@ -{ stdenv, hostPlatform, fetchgit, perl, buildLinux, ... } @ args: +{ stdenv, buildPackages, hostPlatform, fetchgit, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { version = "4.11.2017.08.23"; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index e4dac2932bc..1a309ff6376 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, libelf, utillinux, ... } @ args: +{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.15-rc4"; - modDirVersion = "4.15.0-rc4"; + version = "4.15-rc9"; + modDirVersion = "4.15.0-rc9"; extraMeta.branch = "4.15"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "13mz21pdqk17hrwga9246cj9bkcz3xmmg0cb4mrbsrb1nv4niv0k"; + sha256 = "18xhy38fqyzg9yiljhdj2y0skjf2yhxvhzbija3is75wyv7g55l6"; }; # 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 9124559ef7a..9a7e9609410 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,6 +1,6 @@ -{ runCommand, nettools, bc, perl, gmp, libmpc, mpfr, kmod, openssl -, libelf ? null -, utillinux ? null +{ buildPackages, runCommand, nettools, bc, perl, gmp, libmpc, mpfr, openssl +, libelf +, utillinux , writeTextFile, ubootTools , hostPlatform }: @@ -26,19 +26,11 @@ 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 @@ -49,6 +41,9 @@ let inherit (stdenv.lib) hasAttr getAttr optional optionalString optionalAttrs maintainers platforms; + # Dependencies that are required to build kernel modules + moduleBuildDependencies = stdenv.lib.optional (stdenv.lib.versionAtLeast version "4.14") libelf; + installkernel = writeTextFile { name = "installkernel"; executable=true; text = '' #!${stdenv.shell} -e mkdir -p $4 @@ -58,8 +53,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 @@ -85,7 +80,7 @@ let (isModular || (config.isDisabled "FIRMWARE_IN_KERNEL")); in (optionalAttrs isModular { outputs = [ "out" "dev" ]; }) // { passthru = { - inherit version modDirVersion config kernelPatches configfile; + inherit version modDirVersion config kernelPatches configfile moduleBuildDependencies; }; inherit src; @@ -102,7 +97,7 @@ 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 = '' @@ -208,7 +203,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[@]}" @@ -234,36 +229,28 @@ let }; in -assert stdenv.lib.versionAtLeast version "4.15" -> libelf != null; +assert stdenv.lib.versionAtLeast version "4.14" -> libelf != null; assert stdenv.lib.versionAtLeast version "4.15" -> utillinux != null; -stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKernelPatches) configfile) // { +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.lib.versionAtLeast version "4.15") libelf + ++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools + ++ optional (stdenv.lib.versionAtLeast version "4.14") libelf ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux ; hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" ]; makeFlags = commonMakeFlags ++ [ - "ARCH=${stdenv.platform.kernelArch}" + "HOSTCC=${buildPackages.stdenv.cc.targetPrefix}gcc" + "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/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index 4bcf6e037e0..1936f6578b6 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -1,6 +1,6 @@ { 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 +, libiberty, libaudit, libbfd , zlib, withGtk ? false, gtk2 ? null }: with lib; @@ -11,7 +11,7 @@ assert versionAtLeast kernel.version "3.12"; stdenv.mkDerivation { name = "perf-linux-${kernel.version}"; - inherit (kernel) src; + inherit (kernel) src makeFlags; preConfigure = '' cd tools/perf @@ -21,10 +21,9 @@ stdenv.mkDerivation { ''; # perf refers both to newt and slang - # binutils is required for libbfd. nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt - flex bison libiberty libaudit makeWrapper pkgconfig ]; - buildInputs = [ elfutils python perl newt slang libunwind binutils zlib ] ++ + flex bison libiberty libaudit makeWrapper pkgconfig python perl ]; + buildInputs = [ elfutils newt slang libunwind libbfd zlib ] ++ stdenv.lib.optional withGtk gtk2; # Note: we don't add elfutils to buildInputs, since it provides a @@ -47,15 +46,6 @@ stdenv.mkDerivation { --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.targetPrefix}"; - 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/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix index 3c5a0694a5d..021353c4709 100644 --- a/pkgs/os-specific/linux/kexectools/default.nix +++ b/pkgs/os-specific/linux/kexectools/default.nix @@ -20,6 +20,5 @@ stdenv.mkDerivation rec { homepage = http://horms.net/projects/kexec/kexec-tools; description = "Tools related to the kexec Linux feature"; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index c55ebffa829..f9be8225570 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/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 435a11f1599..ff6db1b41ee 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"; + sha256 = "07rs01zwr4bmjamplix5qz1c6mb6wdawb68vyn0w6wx68ppbpnxq"; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 310ce51936c..d6c1504fdf4 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -2,7 +2,7 @@ , thin-provisioning-tools, enable_dmeventd ? false }: let - version = "2.02.176"; + 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 = "0wx4rvy4frdmb66znh2xms2j2n06sm361ki6l5ks4y1ciii87kny"; + sha256 = "1wl0isn0yz5wvglwylnlqkppafwmvhliq5bd92vjqp5ir4za49a0"; }; configureFlags = [ diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 2660f299262..2e2ef610de6 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -12,11 +12,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "lxc-${version}"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "1qld0gi19mximxm0qyr6vzav32gymhc7fvp0bzwv37j0b8q0fi1r"; + sha256 = "1xpghrinxhm2072fwmn42pxhjwh7qx6cbsipw4s6g38a8mkklrk8"; }; nativeBuildInputs = [ @@ -29,12 +29,6 @@ stdenv.mkDerivation rec { patches = [ ./support-db2x.patch - # Fix build error against glibc 2.26 - (fetchpatch { - url = "https://github.com/lxc/lxc/commit/" - + "180c477a326ce85632249ff16990e8c29db1b6fa.patch"; - sha256 = "05jkiiixxk9ibj1fwzmy56rkkign28bd9mrmgiz12g92r2qahm2z"; - }) ]; postPatch = '' diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index c23457c6b5f..4f62b7eb128 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -1,19 +1,24 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, fuse, pam }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, fuse, pam +, enableDebugBuild ? false }: with stdenv.lib; stdenv.mkDerivation rec { - name = "lxcfs-2.0.7"; + name = "lxcfs-2.0.8"; src = fetchFromGitHub { owner = "lxc"; repo = "lxcfs"; rev = name; - sha256 = "1z6d52dc12rcplgc9jdgi3lbxm6ahlsjgs1k8v8kvn261xsq1m0a"; + sha256 = "04dzn6snqgw0znf7a7qdm64400jirip6q8amcx5fmz4705qdqahc"; }; nativeBuildInputs = [ pkgconfig help2man autoreconfHook ]; buildInputs = [ fuse pam ]; + preConfigure = stdenv.lib.optionalString enableDebugBuild '' + sed -i 's,#AM_CFLAGS += -DDEBUG,AM_CFLAGS += -DDEBUG,' Makefile.am + ''; + configureFlags = [ "--with-init-script=systemd" "--sysconfdir=/etc" diff --git a/pkgs/os-specific/linux/mba6x_bl/default.nix b/pkgs/os-specific/linux/mba6x_bl/default.nix index a656db30645..0a6fc3c977c 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/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index a7f5ffaae4a..a65f983bb36 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -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 f9c2a5e09af..00000000000 --- 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.targetPrefix}" - ]; - - 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 1e2c1dafb2d..85a65b8f824 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -6,16 +6,16 @@ assert stdenv.isLinux; 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 ]; patches = [ ./no-self-references.patch ]; @@ -29,9 +29,6 @@ stdenv.mkDerivation rec { 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 @ @' \ diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix index 322d0260f7b..e2abbd7335e 100644 --- a/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/pkgs/os-specific/linux/mwprocapture/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { sha256 = "1ri7c4l4xgkhpz0f15jra1p7mpzi8ir6lpwjm7q7hc9m4cvxcs1g"; }; + nativeBuildInputs = [ kernel.moduleBuildDependencies ]; + patches = [ ./linux_4_14_fix.patch ]; preConfigure = diff --git a/pkgs/os-specific/linux/netatop/default.nix b/pkgs/os-specific/linux/netatop/default.nix index 0498f5cf37e..8dbacc46154 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/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index c06de7ea6f2..9d645fb1d84 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -2,11 +2,11 @@ , flex, bison, libmnl, libnftnl, gmp, readline }: stdenv.mkDerivation rec { - name = "nftables-0.7"; + name = "nftables-0.8"; src = fetchurl { url = "http://netfilter.org/projects/nftables/files/${name}.tar.bz2"; - sha256 = "0hzdqigdx4i6jbpxbdyq4zy4p4waqn8l6vvz7685ikh1v0wr4qzy"; + sha256 = "16iq9x0qxikdhp1nan500rk33ycqddl1k57876m4dfv3n7kqhnrz"; }; configureFlags = [ diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 22d415213c4..a4d1629a684 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -17,11 +17,11 @@ in { # Policy: use the highest stable version as the default (on our master). stable = generic { - version = "387.34"; - sha256_32bit = "1haqk5h1fcmwp7kn9644k280wn409kh0xbivrj1ks8r8f4nbvfmq"; - sha256_64bit = "06w8dw6hb40ymz6ax7v82j29ihmp3d7yxsi8ah9ch10jldl973z4"; - settingsSha256 = "0dpm22ggpr93ypz24ap9vgx43ik7lw6cxcb29v8ys2iinhs7zm7s"; - persistencedSha256 = "02lf9b6j85amc1vr84lj98q74a680nrx4fmpxj17cz597yq8s200"; + version = "390.25"; + sha256_32bit = "0fkbpx01l46pprrd4nlc2y6hfmkb55ddlwm1r84kr6j08qmmb0qi"; + sha256_64bit = "0whsls1mm6vkll5qmxnyz8vjgspp1rmqpsampgi83k62n514c08r"; + settingsSha256 = "1jhbr68z36s3fr9vx3ga2f6yrzlwpc0j5mw8h12g65p7wdsbk6y7"; + persistencedSha256 = "033azbhi50f1b0lw759sncgf7ckh2m2c0khj5v15sch9kl1fzk8i"; }; beta = generic { diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 0d19079fe66..bde8ad361dc 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -62,7 +62,8 @@ 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 ]; diff --git a/pkgs/os-specific/linux/pagemon/default.nix b/pkgs/os-specific/linux/pagemon/default.nix index 414338702cc..aec6e57e914 100644 --- a/pkgs/os-specific/linux/pagemon/default.nix +++ b/pkgs/os-specific/linux/pagemon/default.nix @@ -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_krb5/default.nix b/pkgs/os-specific/linux/pam_krb5/default.nix index 40e7e1216a6..3f8c3c28f31 100644 --- a/pkgs/os-specific/linux/pam_krb5/default.nix +++ b/pkgs/os-specific/linux/pam_krb5/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { 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/perf-tools/default.nix b/pkgs/os-specific/linux/perf-tools/default.nix index 873cb7b2b7d..31f86965ee8 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 356939fe294..81db8a9f26d 100644 --- a/pkgs/os-specific/linux/phc-intel/default.nix +++ b/pkgs/os-specific/linux/phc-intel/default.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { name = "phc-intel-pack-${revbump}.tar.bz2"; }; - buildInputs = [ which ]; + nativeBuildInputs = [ which ] ++ kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; @@ -49,6 +49,5 @@ in stdenv.mkDerivation rec { downloadPage = "http://www.linux-phc.org/forum/viewtopic.php?f=7&t=267"; license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/os-specific/linux/radeontop/default.nix index cb720c20634..c87bec3a526 100644 --- a/pkgs/os-specific/linux/radeontop/default.nix +++ b/pkgs/os-specific/linux/radeontop/default.nix @@ -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 00000000000..77f94e544a0 --- /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 = "16.1"; + +in stdenv.mkDerivation { + name = "rdma-core-${version}"; + + src = fetchFromGitHub { + owner = "linux-rdma"; + repo = "rdma-core"; + rev = "v${version}"; + sha256 = "1fixw6hpf732vzlpczx0b2y84jrhgfjr3cljqxky7makzgh2s7ng"; + }; + + 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/rewritefs/default.nix b/pkgs/os-specific/linux/rewritefs/default.nix index 5b16799a89c..8c7b75a881f 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/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 4ea6b35e377..c79de39d5da 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { }) ]; + buildInputs = kernel.moduleBuildDependencies; + hardeningDisable = [ "pic" ]; NIX_CFLAGS_COMPILE="-Wno-error=incompatible-pointer-types"; diff --git a/pkgs/os-specific/linux/rtlwifi_new/default.nix b/pkgs/os-specific/linux/rtlwifi_new/default.nix index 25548e0f962..4bf3ef82978 100644 --- a/pkgs/os-specific/linux/rtlwifi_new/default.nix +++ b/pkgs/os-specific/linux/rtlwifi_new/default.nix @@ -17,6 +17,8 @@ in stdenv.mkDerivation rec { 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 39bec26e07f..a8d5112c63b 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/sinit/default.nix b/pkgs/os-specific/linux/sinit/default.nix index 9207a6b3511..46abb6ccc66 100644 --- a/pkgs/os-specific/linux/sinit/default.nix +++ b/pkgs/os-specific/linux/sinit/default.nix @@ -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; + homepage = https://tools.suckless.org/sinit; downloadPage = "http://git.suckless.org/sinit"; }; } diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 387dc2b7c67..e0d1754dd74 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -1,21 +1,18 @@ { 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 } @ args : stdenv.mkDerivation rec { - name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; + name = "spl-${version}-${kernel.version}"; src = fetchFromGitHub { owner = "zfsonlinux"; @@ -25,7 +22,7 @@ let patches = [ ./const.patch ./install_prefix.patch ]; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ] ++ kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; @@ -37,8 +34,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,17 +58,16 @@ let }; }; in - assert any (n: n == configFile) [ "kernel" "user" "all" ]; - assert buildKernel -> kernel != null; + assert kernel != null; { splStable = common { - version = "0.7.4"; - sha256 = "0vmakqi3zm8ka5cglif45ll2m6ynq7r55mhk8d1rzjkgi191cddh"; + version = "0.7.5"; + sha256 = "0njb3274bc5pfr80pzj94sljq457pr71n50s0gsccbz8ghk28rlr"; }; splUnstable = common { - version = "2017-11-16"; - rev = "ed19bccfb651843fa208232b3a2d3d22a4152bc8"; - sha256 = "08ihjbf5fhcnhq9zavcwswg9djlbalbx1bil4rcv6i3d617wammb"; + version = "2017-12-21"; + rev = "c9821f1ccc647dfbd506f381b736c664d862d126"; + sha256 = "08r6sa36jaj6n54ap18npm6w85v5yn3x8ljg792h37f49b8kir6c"; }; } diff --git a/pkgs/os-specific/linux/statifier/default.nix b/pkgs/os-specific/linux/statifier/default.nix index 3cb9179f535..67df9dd2f11 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 18d473e2194..5c7b2e69edf 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.20.0"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "1hmkjvfg3371hp873mnkjq9cirqszw2ji4p7mb6jcn9ihwxil2z2"; + sha256 = "0nbsfm2jh5gjy2wh79f35rqk3c3z15lymmcz3gviw0jaxdv6drzw"; }; 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/thunderbolt/default.nix b/pkgs/os-specific/linux/thunderbolt/default.nix new file mode 100644 index 00000000000..3189872ca3b --- /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/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix index 2ef5d53b066..a43c53e02bb 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 4fc14a04eea..9c8bf559751 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 = "unstable-2017-12-04"; src = fetchFromGitHub { owner = "evgeni"; repo = "tp_smapi"; - rev = "tp-smapi/${version}"; - sha256 = "12lnig90lrmkmqwl386q7ssqs9p0jikqhwl2wsmcmii1gn92hzfy"; + rev = "76c5120f7be4880cf2c6801f872327e4e70c449f"; + sha256 = "0g8l7rmylspl17qnqpa2h4yj7h3zvy6xlmj5nlnixds9avnbz2vy"; 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/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 490df3e1abe..c46ed2d0c01 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -6,11 +6,11 @@ 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 = @@ -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/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index f54f3ab311a..e8a2b342849 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 = [ diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix index 57f4b9ab674..920c8c0bdee 100644 --- a/pkgs/os-specific/linux/v4l2loopback/default.nix +++ b/pkgs/os-specific/linux/v4l2loopback/default.nix @@ -17,6 +17,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 5bec71a1090..72d7690d2f8 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 e1decf1d13d..db8a510bb59 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.20180118"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "0mqix3v4qqwwa7hcd0h5rcwhc7yvm9jcl8b3v1vc4sj0m637fd6r"; + sha256 = "18x8ndnr4lvl3in5sian6f9q69pk8h4xbwldmk7bfrpb5m03ngs6"; }; 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/xf86-video-nested/default.nix b/pkgs/os-specific/linux/xf86-video-nested/default.nix index 8d3e490db87..54d16473770 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 5ede0a91b29..5489bc5abbe 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -38,7 +38,8 @@ let patches = extraPatches; - nativeBuildInputs = [ autoreconfHook nukeReferences ]; + nativeBuildInputs = [ autoreconfHook nukeReferences ] + ++ optional buildKernel kernel.moduleBuildDependencies; buildInputs = optionals buildKernel [ spl ] ++ optionals buildUser [ zlib libuuid python attr ] @@ -140,9 +141,9 @@ in { incompatibleKernelVersion = null; # this package should point to the latest release. - version = "0.7.4"; + version = "0.7.5"; - sha256 = "1djm97nlipn0fch1vcvpw94bnfvg9ylv9i2hp46dzaxhdh7bm265"; + sha256 = "086g4xjx05sy4fwn5709sm46m2yv35wb915xfmqjvpry46245nig"; extraPatches = [ (fetchpatch { @@ -159,10 +160,10 @@ in { incompatibleKernelVersion = null; # this package should point to a version / git revision compatible with the latest kernel release - version = "2017-11-16"; + version = "2018-01-10"; - rev = "d4a72f23863382bdf6d0ae33196f5b5decbc48fd"; - sha256 = "0q2gkkj11hy8m8cjd70g99bs69ldxvc17ym0x1pgwvs4722hzpha"; + rev = "1d53657bf561564162e2ad6449f80fa0140f1dd6"; + sha256 = "0ibkhfz06cypgl2c869dzdbdx2i3m8ywwdmnzscv0cin5gm31vhx"; isUnstable = true; extraPatches = [ diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index 6e21826381b..53050435256 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 c585ab54ff8..1a33e8db07e 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/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index aad2f69bfa6..a5d89b493e8 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 b99cf57e08b..b90e68ed3bc 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.7.0"; src = fetchurl { url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "00x00q6k4sb89aipqd28lgn8l7k7w33dpg18r1dn6l7rws1mazfx"; + sha256 = "1np1zf6yxras15ambf92g8snnvph9pp2dk4yw6w58yfil5kzp70l"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index f9b7a24273f..f4a6b47a45a 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/default.nix b/pkgs/servers/computing/slurm/default.nix index 3b695c46e77..59d62790113 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -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 = diff --git a/pkgs/servers/dict/default.nix b/pkgs/servers/dict/default.nix index 2093d54b065..6868c0f8166 100644 --- a/pkgs/servers/dict/default.nix +++ b/pkgs/servers/dict/default.nix @@ -29,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 8637d043836..13e4757fe89 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 b6680e8b21c..8bed7f160f7 100644 --- a/pkgs/servers/dict/dictd-wordnet.nix +++ b/pkgs/servers/dict/dictd-wordnet.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = http://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 833aaa95b0c..d35a9a68303 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/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 3d8b825cc92..fa00e3edf97 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -3,14 +3,14 @@ assert enableSeccomp -> libseccomp != null; -let version = "9.11.2"; in +let version = "9.11.2-P1"; in stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "0yn7wgi2y8mpmvbjbkl4va7p0xsnn48m4yjx6ynb1hzp423asikz"; + sha256 = "04hjvwvs7ssgj69lqparx0wj0w3xkc0x8y2iv62kzjighd41bhyf"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; @@ -58,7 +58,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/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index d3fffe12da4..478fcb9aad7 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { name = "knot-dns-${version}"; - version = "2.6.3"; + version = "2.6.4"; src = fetchurl { url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "2fb27a4006865fc12873cbadc5b4a870ec65d3293a284972c031522282987790"; + sha256 = "1d0d37b5047ecd554d927519d5565c29c1ba9b501c100eb5f3a5af184d75386a"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 531d88b78be..2ec12b81f84 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -1,63 +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.1"; + version = "2.0.0"; src = fetchurl { url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; - sha256 = "146dcb24422ef685fb4167e3c536a838cf4101acaa85fcfa0c150eebdba78f81"; + sha256 = "b40d9dbef05031464dfff57712f476e7cddc0fda26b41daf660c5a33ea203ce0"; }; outputs = [ "out" "dev" ]; configurePhase = ":"; - 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; doCheck = true; - doInstallCheck = true; + doInstallCheck = false; # FIXME preInstallCheck = '' 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"; @@ -67,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 6cf98daab5b..d14233016d8 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.19"; src = fetchurl { url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz"; - sha256 = "1cmaddfjb7yr87gjd5yv4d0qng0j97sy5rw5m3zxsp6c4fnng0vz"; + sha256 = "1i82kvgxv4vz79dqd0ckz6syr1fdf6q60r4b926qh5klnnwjqy5h"; }; 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 1750a574af7..25b333a4618 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.8"; + version = "4.1.1"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "04v5y6mfdhn8ikigqmm3k5k0zz5l8d3k1a7ih464n1161q7z0vww"; + sha256 = "0srrw726qpwg69v75dwbxab9hk73x1wia4rcnmf7g5qr2k3h7swg"; }; 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 d7556a39ee9..79fff80b0b8 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, boost, libyamlcpp, libsodium, sqlite, protobuf, - libmysql, postgresql, lua, openldap, geoip, curl + mysql57, postgresql, lua, openldap, geoip, curl }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; 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 ]; # nix destroy with-modules arguments, when using configureFlags preConfigure = '' diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 745ed18c00f..05d53d44462 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.2.60.0"; src = fetchurl { url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip"; - sha256 = "0b75v6g7qm03jqm5za70z4x5lqks3a4cd84vblqr35zrla9vs83b"; + sha256 = "0yrbwq5dzzq5047vdpar4vkwzcgd9dj2v9basaw413hzncf2q8gj"; }; buildInputs = with pkgs; [ diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index db9d1121992..c6ec3d46dda 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.16"; src = fetchurl { url = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.gz"; - sha256 = "1qygf5if2xjzl7kfzwl428ydz5q1m0j5sx077n12v7znlgnwaagx"; + sha256 = "062dw4ckaa7k2br16l3naz9dr7hvzqhpxdwam3klq1i44v4hvl1b"; }; 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/games/ghost-one/default.nix b/pkgs/servers/games/ghost-one/default.nix deleted file mode 100644 index 63a71633923..00000000000 --- 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/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix new file mode 100644 index 00000000000..679ca2afd43 --- /dev/null +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -0,0 +1,431 @@ +# Generated from parse-requirements.py +# Do not edit! + +{ + version = "0.62.1"; + components = { + "nuimo_controller" = ps: with ps; [ ]; + "bbb_gpio" = ps: with ps; [ ]; + "doorbird" = ps: with ps; [ ]; + "isy994" = ps: with ps; [ ]; + "notify.html5" = ps: with ps; [ pyjwt ]; + "sensor.mvglive" = ps: with ps; [ ]; + "arduino" = ps: with ps; [ ]; + "xiaomi_aqara" = ps: with ps; [ ]; + "rpi_gpio" = ps: with ps; [ ]; + "remember_the_milk" = ps: with ps; [ httplib2 ]; + "media_player.sonos" = ps: with ps; [ ]; + "sensor.travisci" = ps: with ps; [ ]; + "notify.twitter" = ps: with ps; [ ]; + "notify.yessssms" = ps: with ps; [ ]; + "abode" = ps: with ps; [ ]; + "device_tracker.automatic" = ps: with ps; [ ]; + "sensor.dnsip" = ps: with ps; [ aiodns ]; + "emulated_hue" = ps: with ps; [ aiohttp-cors ]; + "http" = ps: with ps; [ aiohttp-cors ]; + "sensor.imap" = ps: with ps; [ ]; + "light.lifx" = ps: with ps; [ ]; + "scene.hunterdouglas_powerview" = ps: with ps; [ ]; + "alarmdecoder" = ps: with ps; [ ]; + "sensor.alpha_vantage" = ps: with ps; [ ]; + "amcrest" = ps: with ps; [ ]; + "media_player.anthemav" = ps: with ps; [ ]; + "apcupsd" = ps: with ps; [ ]; + "notify.apns" = ps: with ps; [ ]; + "asterisk_mbox" = ps: with ps; [ ]; + "light.avion" = ps: with ps; [ ]; + "axis" = ps: with ps; [ ]; + "tts.baidu" = ps: with ps; [ ]; + "sensor.modem_callerid" = ps: with ps; [ ]; + "sensor.linux_battery" = ps: with ps; [ batinfo ]; + "sensor.eddystone_temperature" = ps: with ps; [ ]; + "device_tracker.linksys_ap" = ps: with ps; [ beautifulsoup4 ]; + "sensor.geizhals" = ps: with ps; [ beautifulsoup4 ]; + "sensor.scrape" = ps: with ps; [ beautifulsoup4 ]; + "sensor.sytadin" = ps: with ps; [ beautifulsoup4 ]; + "zha" = ps: with ps; [ ]; + "blink" = ps: with ps; [ ]; + "light.blinksticklight" = ps: with ps; [ BlinkStick ]; + "light.blinkt" = ps: with ps; [ ]; + "sensor.bitcoin" = ps: with ps; [ ]; + "light.decora" = ps: with ps; [ ]; + "sensor.bme680" = ps: with ps; [ ]; + "notify.aws_lambda" = ps: with ps; [ boto3 ]; + "notify.aws_sns" = ps: with ps; [ boto3 ]; + "notify.aws_sqs" = ps: with ps; [ boto3 ]; + "tts.amazon_polly" = ps: with ps; [ boto3 ]; + "sensor.broadlink" = ps: with ps; [ ]; + "switch.broadlink" = ps: with ps; [ ]; + "sensor.buienradar" = ps: with ps; [ ]; + "weather.buienradar" = ps: with ps; [ ]; + "calendar.caldav" = ps: with ps; [ ]; + "notify.ciscospark" = ps: with ps; [ ]; + "coinbase" = ps: with ps; [ ]; + "sensor.coinmarketcap" = ps: with ps; [ ]; + "alarm_control_panel.concord232" = ps: with ps; [ ]; + "binary_sensor.concord232" = ps: with ps; [ ]; + "sensor.crimereports" = ps: with ps; [ ]; + "datadog" = ps: with ps; [ datadog ]; + "sensor.metoffice" = ps: with ps; [ ]; + "weather.metoffice" = ps: with ps; [ ]; + "light.decora_wifi" = ps: with ps; [ ]; + "device_tracker.upc_connect" = ps: with ps; [ defusedxml ]; + "sensor.deluge" = ps: with ps; [ ]; + "switch.deluge" = ps: with ps; [ ]; + "media_player.denonavr" = ps: with ps; [ ]; + "media_player.directv" = ps: with ps; [ ]; + "sensor.discogs" = ps: with ps; [ discogs_client ]; + "notify.discord" = ps: with ps; [ ]; + "updater" = ps: with ps; [ distro ]; + "switch.digitalloggers" = ps: with ps; [ ]; + "notify.xmpp" = ps: with ps; [ pyasn1-modules pyasn1 sleekxmpp ]; + "sensor.dovado" = ps: with ps; [ ]; + "sensor.dsmr" = ps: with ps; [ ]; + "dweet" = ps: with ps; [ ]; + "sensor.dweet" = ps: with ps; [ ]; + "sensor.eliqonline" = ps: with ps; [ ]; + "enocean" = ps: with ps; [ ]; + "sensor.envirophat" = ps: with ps; [ ]; + "sensor.season" = ps: with ps; [ ephem ]; + "keyboard_remote" = ps: with ps; [ ]; + "climate.honeywell" = ps: with ps; [ ]; + "image_processing.dlib_face_detect" = ps: with ps; [ ]; + "image_processing.dlib_face_identify" = ps: with ps; [ ]; + "sensor.fastdotcom" = ps: with ps; [ ]; + "sensor.fedex" = ps: with ps; [ ]; + "feedreader" = ps: with ps; [ feedparser ]; + "sensor.geo_rss_events" = ps: with ps; [ feedparser ]; + "sensor.fitbit" = ps: with ps; [ ]; + "sensor.fixer" = ps: with ps; [ ]; + "light.flux_led" = ps: with ps; [ ]; + "notify.free_mobile" = ps: with ps; [ ]; + "device_tracker.fritz" = ps: with ps; [ ]; + "sensor.fritzbox_callmonitor" = ps: with ps; [ ]; + "sensor.fritzbox_netmonitor" = ps: with ps; [ ]; + "switch.fritzdect" = ps: with ps; [ ]; + "media_player.frontier_silicon" = ps: with ps; [ ]; + "conversation" = ps: with ps; [ ]; + "tts.google" = ps: with ps; [ ]; + "device_tracker.bluetooth_le_tracker" = ps: with ps; [ ]; + "sensor.gearbest" = ps: with ps; [ ]; + "sensor.gitter" = ps: with ps; [ ]; + "notify.gntp" = ps: with ps; [ ]; + "google" = ps: with ps; [ google_api_python_client oauth2client ]; + "sensor.google_travel_time" = ps: with ps; [ ]; + "sensor.gpsd" = ps: with ps; [ ]; + "light.greenwave" = ps: with ps; [ ]; + "media_player.gstreamer" = ps: with ps; [ ]; + "ffmpeg" = ps: with ps; [ ]; + "media_player.philips_js" = ps: with ps; [ ]; + "mqtt.server" = ps: with ps; [ hbmqtt ]; + "climate.heatmiser" = ps: with ps; [ ]; + "switch.hikvisioncam" = ps: with ps; [ ]; + "notify.hipchat" = ps: with ps; [ ]; + "binary_sensor.workday" = ps: with ps; [ ]; + "frontend" = ps: with ps; [ user-agents ]; + "camera.onvif" = ps: with ps; [ ]; + "sensor.dht" = ps: with ps; [ ]; + "media_player.braviatv" = ps: with ps; [ ]; + "media_player.spotify" = ps: with ps; [ ]; + "netatmo" = ps: with ps; [ ]; + "neato" = ps: with ps; [ ]; + "sensor.sabnzbd" = ps: with ps; [ ]; + "switch.anel_pwrctrl" = ps: with ps; [ ]; + "switch.edimax" = ps: with ps; [ ]; + "sensor.gtfs" = ps: with ps; [ ]; + "binary_sensor.flic" = ps: with ps; [ ]; + "media_player.lg_netcast" = ps: with ps; [ ]; + "sensor.bh1750" = ps: with ps; [ ]; + "sensor.bme280" = ps: with ps; [ ]; + "sensor.htu21d" = ps: with ps; [ ]; + "light.iglo" = ps: with ps; [ ]; + "ihc" = ps: with ps; [ ]; + "influxdb" = ps: with ps; [ influxdb ]; + "sensor.influxdb" = ps: with ps; [ influxdb ]; + "insteon_local" = ps: with ps; [ ]; + "insteon_plm" = ps: with ps; [ ]; + "verisure" = ps: with ps; [ ]; + "media_player.kodi" = ps: with ps; [ ]; + "notify.kodi" = ps: with ps; [ ]; + "device_tracker.owntracks" = ps: with ps; [ libnacl ]; + "device_tracker.owntracks_http" = ps: with ps; [ libnacl ]; + "dyson" = ps: with ps; [ ]; + "camera.foscam" = ps: with ps; [ ]; + "device_tracker.mikrotik" = ps: with ps; [ ]; + "media_player.soundtouch" = ps: with ps; [ libsoundtouch ]; + "light.lifx_legacy" = ps: with ps; [ ]; + "light.osramlightify" = ps: with ps; [ ]; + "light.limitlessled" = ps: with ps; [ ]; + "linode" = ps: with ps; [ linode-api ]; + "media_player.liveboxplaytv" = ps: with ps; [ ]; + "lametric" = ps: with ps; [ ]; + "notify.lametric" = ps: with ps; [ ]; + "sensor.luftdaten" = ps: with ps; [ ]; + "sensor.lyft" = ps: with ps; [ ]; + "notify.matrix" = ps: with ps; [ matrix-client ]; + "maxcube" = ps: with ps; [ ]; + "notify.message_bird" = ps: with ps; [ ]; + "sensor.mfi" = ps: with ps; [ ]; + "switch.mfi" = ps: with ps; [ ]; + "sensor.miflora" = ps: with ps; [ ]; + "upnp" = ps: with ps; [ ]; + "sensor.mopar" = ps: with ps; [ ]; + "tts" = ps: with ps; [ mutagen ]; + "mychevy" = ps: with ps; [ ]; + "mycroft" = ps: with ps; [ ]; + "usps" = ps: with ps; [ ]; + "media_player.nad" = ps: with ps; [ ]; + "media_player.nadtcp" = ps: with ps; [ ]; + "discovery" = ps: with ps; [ netdisco ]; + "sensor.neurio_energy" = ps: with ps; [ ]; + "sensor.nederlandse_spoorwegen" = ps: with ps; [ ]; + "nuheat" = ps: with ps; [ ]; + "binary_sensor.trend" = ps: with ps; [ numpy ]; + "image_processing.opencv" = ps: with ps; [ numpy ]; + "climate.oem" = ps: with ps; [ ]; + "media_player.onkyo" = ps: with ps; [ ]; + "sensor.openevse" = ps: with ps; [ ]; + "media_player.openhome" = ps: with ps; [ ]; + "switch.orvibo" = ps: with ps; [ ]; + "mqtt" = ps: with ps; [ paho-mqtt ]; + "shiftr" = ps: with ps; [ paho-mqtt ]; + "media_player.panasonic_viera" = ps: with ps; [ ]; + "media_player.dunehd" = ps: with ps; [ ]; + "device_tracker.aruba" = ps: with ps; [ pexpect ]; + "device_tracker.asuswrt" = ps: with ps; [ pexpect ]; + "device_tracker.cisco_ios" = ps: with ps; [ pexpect ]; + "device_tracker.unifi_direct" = ps: with ps; [ pexpect ]; + "media_player.pandora" = ps: with ps; [ pexpect ]; + "hue" = ps: with ps; [ ]; + "rpi_pfio" = ps: with ps; [ ]; + "light.piglow" = ps: with ps; [ ]; + "pilight" = ps: with ps; [ ]; + "dominos" = ps: with ps; [ ]; + "media_player.plex" = ps: with ps; [ ]; + "sensor.plex" = ps: with ps; [ ]; + "sensor.mhz19" = ps: with ps; [ ]; + "sensor.serial_pm" = ps: with ps; [ ]; + "sensor.pocketcasts" = ps: with ps; [ ]; + "climate.proliphix" = ps: with ps; [ ]; + "prometheus" = ps: with ps; [ ]; + "sensor.systemmonitor" = ps: with ps; [ psutil ]; + "wink" = ps: with ps; [ ]; + "notify.pushbullet" = ps: with ps; [ pushbullet ]; + "sensor.pushbullet" = ps: with ps; [ pushbullet ]; + "notify.pushetta" = ps: with ps; [ ]; + "light.rpi_gpio_pwm" = ps: with ps; [ ]; + "canary" = ps: with ps; [ ]; + "sensor.cpuspeed" = ps: with ps; [ ]; + "camera.synology" = ps: with ps; [ ]; + "hdmi_cec" = ps: with ps; [ ]; + "light.tplink" = ps: with ps; [ ]; + "switch.tplink" = ps: with ps; [ ]; + "rfxtrx" = ps: with ps; [ ]; + "sensor.tibber" = ps: with ps; [ ]; + "switch.dlink" = ps: with ps; [ ]; + "ads" = ps: with ps; [ ]; + "sensor.airvisual" = ps: with ps; [ ]; + "alarm_control_panel.alarmdotcom" = ps: with ps; [ ]; + "arlo" = ps: with ps; [ ]; + "apple_tv" = ps: with ps; [ ]; + "device_tracker.bbox" = ps: with ps; [ ]; + "sensor.bbox" = ps: with ps; [ ]; + "device_tracker.bluetooth_tracker" = ps: with ps; [ ]; + "media_player.cast" = ps: with ps; [ PyChromecast ]; + "media_player.cmus" = ps: with ps; [ ]; + "comfoconnect" = ps: with ps; [ ]; + "tts.microsoft" = ps: with ps; [ ]; + "sensor.cups" = ps: with ps; [ ]; + "daikin" = ps: with ps; [ ]; + "climate.daikin" = ps: with ps; [ ]; + "deconz" = ps: with ps; [ ]; + "zwave" = ps: with ps; [ pydispatcher ]; + "android_ip_webcam" = ps: with ps; [ ]; + "sensor.ebox" = ps: with ps; [ ]; + "climate.econet" = ps: with ps; [ ]; + "eight_sleep" = ps: with ps; [ ]; + "media_player.emby" = ps: with ps; [ ]; + "envisalink" = ps: with ps; [ ]; + "climate.ephember" = ps: with ps; [ ]; + "sensor.fido" = ps: with ps; [ ]; + "climate.flexit" = ps: with ps; [ ]; + "ifttt" = ps: with ps; [ ]; + "remote.harmony" = ps: with ps; [ ]; + "binary_sensor.hikvision" = ps: with ps; [ ]; + "hive" = ps: with ps; [ ]; + "homematic" = ps: with ps; [ pyhomematic ]; + "sensor.hydroquebec" = ps: with ps; [ ]; + "alarm_control_panel.ialarm" = ps: with ps; [ ]; + "device_tracker.icloud" = ps: with ps; [ ]; + "sensor.irish_rail_transport" = ps: with ps; [ ]; + "binary_sensor.iss" = ps: with ps; [ ]; + "remote.itach" = ps: with ps; [ ]; + "kira" = ps: with ps; [ ]; + "sensor.kwb" = ps: with ps; [ ]; + "sensor.lacrosse" = ps: with ps; [ ]; + "sensor.lastfm" = ps: with ps; [ pylast ]; + "media_player.webostv" = ps: with ps; [ websockets ]; + "notify.webostv" = ps: with ps; [ ]; + "litejet" = ps: with ps; [ ]; + "sensor.loopenergy" = ps: with ps; [ ]; + "lutron_caseta" = ps: with ps; [ ]; + "lutron" = ps: with ps; [ ]; + "notify.mailgun" = ps: with ps; [ ]; + "mochad" = ps: with ps; [ ]; + "modbus" = ps: with ps; [ ]; + "media_player.monoprice" = ps: with ps; [ ]; + "media_player.yamaha_musiccast" = ps: with ps; [ ]; + "cover.myq" = ps: with ps; [ ]; + "mysensors" = ps: with ps; [ ]; + "lock.nello" = ps: with ps; [ ]; + "device_tracker.netgear" = ps: with ps; [ ]; + "switch.netio" = ps: with ps; [ ]; + "lock.nuki" = ps: with ps; [ ]; + "sensor.nut" = ps: with ps; [ ]; + "alarm_control_panel.nx584" = ps: with ps; [ ]; + "binary_sensor.nx584" = ps: with ps; [ ]; + "iota" = ps: with ps; [ ]; + "sensor.otp" = ps: with ps; [ ]; + "sensor.openweathermap" = ps: with ps; [ ]; + "weather.openweathermap" = ps: with ps; [ ]; + "qwikswitch" = ps: with ps; [ ]; + "rainbird" = ps: with ps; [ ]; + "climate.sensibo" = ps: with ps; [ ]; + "sensor.serial" = ps: with ps; [ ]; + "switch.acer_projector" = ps: with ps; [ pyserial ]; + "lock.sesame" = ps: with ps; [ ]; + "sensor.sma" = ps: with ps; [ ]; + "device_tracker.snmp" = ps: with ps; [ pysnmp ]; + "sensor.snmp" = ps: with ps; [ pysnmp ]; + "switch.snmp" = ps: with ps; [ pysnmp ]; + "sensor.thinkingcleaner" = ps: with ps; [ ]; + "switch.thinkingcleaner" = ps: with ps; [ ]; + "sensor.blockchain" = ps: with ps; [ ]; + "media_player.clementine" = ps: with ps; [ ]; + "digital_ocean" = ps: with ps; [ digital-ocean ]; + "ecobee" = ps: with ps; [ ]; + "climate.eq3btsmart" = ps: with ps; [ ]; + "sensor.etherscan" = ps: with ps; [ ]; + "sensor.darksky" = ps: with ps; [ ]; + "weather.darksky" = ps: with ps; [ ]; + "gc100" = ps: with ps; [ ]; + "sensor.hp_ilo" = ps: with ps; [ ]; + "joaoapps_join" = ps: with ps; [ ]; + "notify.joaoapps_join" = ps: with ps; [ ]; + "juicenet" = ps: with ps; [ ]; + "lirc" = ps: with ps; [ ]; + "fan.xiaomi_miio" = ps: with ps; [ ]; + "light.xiaomi_miio" = ps: with ps; [ ]; + "switch.xiaomi_miio" = ps: with ps; [ ]; + "vacuum.xiaomi_miio" = ps: with ps; [ ]; + "media_player.mpd" = ps: with ps; [ ]; + "light.mystrom" = ps: with ps; [ ]; + "switch.mystrom" = ps: with ps; [ ]; + "nest" = ps: with ps; [ ]; + "device_tracker.nmap_tracker" = ps: with ps; [ ]; + "notify.pushover" = ps: with ps; [ ]; + "sensor.ripple" = ps: with ps; [ ]; + "media_player.roku" = ps: with ps; [ ]; + "sensor.sochain" = ps: with ps; [ ]; + "sensor.synologydsm" = ps: with ps; [ ]; + "tado" = ps: with ps; [ ]; + "telegram_bot" = ps: with ps; [ ]; + "sensor.twitch" = ps: with ps; [ ]; + "velbus" = ps: with ps; [ ]; + "media_player.vlc" = ps: with ps; [ ]; + "sensor.swiss_public_transport" = ps: with ps; [ ]; + "alarm_control_panel.egardia" = ps: with ps; [ ]; + "sensor.whois" = ps: with ps; [ ]; + "device_tracker.tile" = ps: with ps; [ ]; + "climate.touchline" = ps: with ps; [ ]; + "device_tracker.trackr" = ps: with ps; [ ]; + "tradfri" = ps: with ps; [ ]; + "device_tracker.unifi" = ps: with ps; [ ]; + "keyboard" = ps: with ps; [ ]; + "vera" = ps: with ps; [ ]; + "media_player.vizio" = ps: with ps; [ ]; + "velux" = ps: with ps; [ ]; + "wemo" = ps: with ps; [ ]; + "camera.xeoma" = ps: with ps; [ ]; + "zabbix" = ps: with ps; [ ]; + "sensor.qnap" = ps: with ps; [ ]; + "switch.rachio" = ps: with ps; [ ]; + "climate.radiotherm" = ps: with ps; [ ]; + "raincloud" = ps: with ps; [ ]; + "raspihats" = ps: with ps; [ ]; + "switch.rainmachine" = ps: with ps; [ ]; + "python_script" = ps: with ps; [ ]; + "rflink" = ps: with ps; [ ]; + "ring" = ps: with ps; [ ]; + "notify.rocketchat" = ps: with ps; [ ]; + "vacuum.roomba" = ps: with ps; [ ]; + "switch.rpi_rf" = ps: with ps; [ ]; + "media_player.russound_rnet" = ps: with ps; [ ]; + "media_player.russound_rio" = ps: with ps; [ ]; + "media_player.yamaha" = ps: with ps; [ ]; + "media_player.samsungtv" = ps: with ps; [ ]; + "satel_integra" = ps: with ps; [ ]; + "sensor.deutsche_bahn" = ps: with ps; [ ]; + "scsgate" = ps: with ps; [ ]; + "notify.sendgrid" = ps: with ps; [ ]; + "light.sensehat" = ps: with ps; [ ]; + "sensor.sensehat" = ps: with ps; [ ]; + "media_player.aquostv" = ps: with ps; [ ]; + "sensor.shodan" = ps: with ps; [ ]; + "notify.simplepush" = ps: with ps; [ ]; + "alarm_control_panel.simplisafe" = ps: with ps; [ ]; + "skybell" = ps: with ps; [ ]; + "notify.slack" = ps: with ps; [ ]; + "sleepiq" = ps: with ps; [ ]; + "media_player.snapcast" = ps: with ps; [ ]; + "sensor.speedtest" = ps: with ps; [ ]; + "recorder" = ps: with ps; [ sqlalchemy ]; + "statsd" = ps: with ps; [ statsd ]; + "sensor.steam_online" = ps: with ps; [ ]; + "tahoma" = ps: with ps; [ ]; + "sensor.tank_utility" = ps: with ps; [ ]; + "binary_sensor.tapsaff" = ps: with ps; [ ]; + "tellstick" = ps: with ps; [ ]; + "tellduslive" = ps: with ps; [ ]; + "sensor.temper" = ps: with ps; [ ]; + "tesla" = ps: with ps; [ ]; + "thingspeak" = ps: with ps; [ ]; + "light.tikteck" = ps: with ps; [ ]; + "calendar.todoist" = ps: with ps; [ todoist ]; + "toon" = ps: with ps; [ ]; + "alarm_control_panel.totalconnect" = ps: with ps; [ ]; + "sensor.transmission" = ps: with ps; [ transmissionrpc ]; + "switch.transmission" = ps: with ps; [ transmissionrpc ]; + "twilio" = ps: with ps; [ twilio ]; + "sensor.uber" = ps: with ps; [ ]; + "sensor.ups" = ps: with ps; [ ]; + "camera.uvc" = ps: with ps; [ ]; + "climate.venstar" = ps: with ps; [ ]; + "volvooncall" = ps: with ps; [ ]; + "sensor.vasttrafik" = ps: with ps; [ ]; + "vultr" = ps: with ps; [ vultr ]; + "wake_on_lan" = ps: with ps; [ ]; + "switch.wake_on_lan" = ps: with ps; [ ]; + "sensor.waqi" = ps: with ps; [ ]; + "cloud" = ps: with ps; [ ]; + "waterfurnace" = ps: with ps; [ ]; + "media_player.gpmdp" = ps: with ps; [ ]; + "spc" = ps: with ps; [ websockets ]; + "zigbee" = ps: with ps; [ ]; + "sensor.xbox_live" = ps: with ps; [ ]; + "knx" = ps: with ps; [ ]; + "media_player.bluesound" = ps: with ps; [ xmltodict ]; + "sensor.swiss_hydrological_data" = ps: with ps; [ xmltodict ]; + "sensor.ted5000" = ps: with ps; [ xmltodict ]; + "sensor.yr" = ps: with ps; [ xmltodict ]; + "sensor.yahoo_finance" = ps: with ps; [ ]; + "sensor.yweather" = ps: with ps; [ ]; + "weather.yweather" = ps: with ps; [ ]; + "light.yeelight" = ps: with ps; [ ]; + "light.yeelightsunflower" = ps: with ps; [ ]; + "media_extractor" = ps: with ps; [ ]; + "light.zengge" = ps: with ps; [ ]; + "zeroconf" = ps: with ps; [ zeroconf ]; + "media_player.ziggo_mediabox_xl" = ps: with ps; [ ]; + }; +} diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix new file mode 100644 index 00000000000..bce0369cb52 --- /dev/null +++ b/pkgs/servers/home-assistant/default.nix @@ -0,0 +1,84 @@ +{ stdenv, fetchFromGitHub, python3 +, extraComponents ? [] +, extraPackages ? ps: [] +, skipPip ? true }: + +let + + py = python3.override { + packageOverrides = self: super: { + yarl = super.yarl.overridePythonAttrs (oldAttrs: rec { + version = "0.18.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "11j8symkxh0ngvpddqpj85qmk6p70p20jca3alxc181gk3vx785s"; + }; + }); + aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec { + version = "2.3.7"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0fzfpx5ny7559xrxaawnylq20dvrkjiag0ypcd13frwwivrlsagy"; + }; + }); + hass-frontend = super.callPackage ./frontend.nix { }; + }; + }; + + componentPackages = import ./component-packages.nix; + + availableComponents = builtins.attrNames componentPackages.components; + + getPackages = component: builtins.getAttr component componentPackages.components; + + componentBuildInputs = map (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.62.1"; + +in with py.pkgs; buildPythonApplication rec { + pname = "homeassistant"; + version = assert (componentPackages.version == hassVersion); hassVersion; + + inherit availableComponents; + + # PyPI tarball is missing tests/ directory + src = fetchFromGitHub { + owner = "home-assistant"; + repo = "home-assistant"; + rev = version; + sha256 = "0151prwk2ci6bih0mdmc3r328nrvazn9jwk0w26wmd4cpvnb5h26"; + }; + + propagatedBuildInputs = [ + # From setup.py + requests pyyaml pytz pip jinja2 voluptuous typing aiohttp yarl async-timeout chardet astral certifi + # From the components that are part of the default configuration.yaml + sqlalchemy aiohttp-cors hass-frontend user-agents distro mutagen xmltodict netdisco + ] ++ 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 + py.test \ + tests/components/{group,http} \ + tests/components/test_{api,configurator,demo,discovery,frontend,init,introduction,logger,script,shell_command,system_log,websocket_api}.py + ''; + + makeWrapperArgs = [] ++ stdenv.lib.optional skipPip [ "--add-flags --skip-pip" ]; + + meta = with stdenv.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 00000000000..6e1a789012f --- /dev/null +++ b/pkgs/servers/home-assistant/frontend.nix @@ -0,0 +1,11 @@ +{ stdenv, fetchPypi, buildPythonPackage }: + +buildPythonPackage rec { + pname = "home-assistant-frontend"; + version = "20180130.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0b9klisl7hh30rml8qlrp9gpz33z9b825pd1vxbck48k0s98z1zi"; + }; +} diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py new file mode 100755 index 00000000000..aa293921e87 --- /dev/null +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -0,0 +1,97 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ setuptools ])" +# +# 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 +import subprocess +import os +import sys +import json +import re +from pkg_resources import Requirement, RequirementParseError + +PREFIX = '# homeassistant.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(PREFIX)] == PREFIX: + component = line[len(PREFIX):] + components.append(component) + if component not in requirements: + requirements[component] = [] + elif line[0] != '#': + 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 = [] + pattern = re.compile('python3\\.6-{}-\\d'.format(req), 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() +requirements = fetch_reqs(version=version) +build_inputs = {} +for component, reqs in requirements.items(): + attr_paths = [] + for req in reqs: + try: + name = Requirement.parse(req).project_name + 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 25097a31416..41e65b588e1 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; @@ -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/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 05722f141ed..181e3bf134f 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { 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" ] diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 0eb8979c3ac..3ec493d67da 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.8"; + sha256 = "1ib4hkngj9z7pl73lnn96d85m7v2wwb56nkypwx7d6pm3z1vc444"; }) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 454818675d2..36d0ea6b1e8 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -47,12 +47,12 @@ ''; }; - modsecurity-beta = { + modsecurity-nginx = { src = fetchFromGitHub { owner = "SpiderLabs"; repo = "ModSecurity-nginx"; - rev = "a2a5858d249222938c2f5e48087a922c63d7f9d8"; - sha256 = "1zj0fq35hddzf7b3x40xlbss866lg7w2vd1bbm8g1hcq1ny2s84n"; + rev = "v1.0.0"; + sha256 = "0zzpdqhbdqqy8kjkszv0mrq6136ah9v3zwr1jbh312j8izmzdyi7"; }; inputs = [ pkgs.curl pkgs.geoip pkgs.libmodsecurity pkgs.libxml2 pkgs.lmdb pkgs.yajl ]; }; @@ -153,7 +153,7 @@ owner = "pagespeed"; repo = "ngx_pagespeed"; rev = "v${version}-beta"; - sha256 = "03dvzf1lgsjxcs1jjxq95n2rhgq0wy0f9ahvgascy0fak7qx4xj9"; + sha256 = "176skx7zmi7islc1hmdxcynix4lkvgmr78lknn13s9gskc7qi25w"; }; ngx_pagespeed = pkgs.runCommand @@ -172,6 +172,7 @@ ''; in { src = ngx_pagespeed; + inputs = [ pkgs.zlib pkgs.libuuid ]; # psol deps }; shibboleth = { diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 6a29ecaad56..098825d59ce 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/irker/default.nix b/pkgs/servers/irker/default.nix index 6ad233593a3..002760ff0fd 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/mail/clamsmtp/default.nix b/pkgs/servers/mail/clamsmtp/default.nix new file mode 100644 index 00000000000..9386be321b4 --- /dev/null +++ b/pkgs/servers/mail/clamsmtp/default.nix @@ -0,0 +1,20 @@ +{ 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"; + }; + + 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/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index ab1808c0647..6b2adf57217 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.33.2"; + name = "dovecot-2.3.0"; 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 = "117f9i62liz2pm96zi2lpldzlj2knzj7g410zhifwmlsc1w3n7py"; + url = "http://dovecot.org/releases/2.3/${name}.tar.gz"; + sha256 = "10c5myzgys866c3x6jdr1s9x9pqnjd5vpyz8z384sph21m3wnq6y"; }; preConfigure = '' @@ -46,6 +47,16 @@ stdenv.mkDerivation rec { # so we can symlink plugins from several packages there. # The symlinking needs to be done in NixOS. ./2.2.x-module_dir.patch + (fetchpatch { + name = "CVE-2017-14132_part1.patch"; + url = https://github.com/dovecot/core/commit/1a29ed2f96da1be22fa5a4d96c7583aa81b8b060.patch; + sha256 = "1pcfzxr8xlwbpa7z19grp7mlvdnan6ln8zw74dj4pdmynmlk4aw9"; + }) + (fetchpatch { + name = "CVE-2017-14132_part2.patch"; + url = https://github.com/dovecot/core/commit/a9b135760aea6d1790d447d351c56b78889dac22.patch; + sha256 = "0082iid5rvjmh003xi9s09jld2rb31hbvni0yai1h1ggbmd5zf8l"; + }) ]; configureFlags = [ @@ -58,6 +69,7 @@ stdenv.mkDerivation rec { "--with-ssl=openssl" "--with-zlib" "--with-bzlib" + "--with-lz4" "--with-ldap" "--with-lucene" "--with-icu" @@ -68,9 +80,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 1a1ba1ad448..00000000000 --- 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 67094228a5e..92b404d0f65 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.21"; + version = "0.5.0.1"; src = fetchurl { - url = "http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-${version}.tar.gz"; - sha256 = "0snxrx9lk3j0rrcd4jlhwlqk4v31n1qfx2asgwb4scy5i2vrrq2a"; + url = "http://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${version}.tar.gz"; + sha256 = "1lpsdqh9pwqx917z5v23bahhhbrcb3y5ps3l413sli8cn4a6sdan"; }; buildInputs = [ dovecot openssl ]; diff --git a/pkgs/servers/mail/dspam/default.nix b/pkgs/servers/mail/dspam/default.nix index 623f0a2b0e2..b63390bb247 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/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix index 5e5170afbc7..5e87a1fb099 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,7 +68,8 @@ 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/; diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index c92507b4167..f8b36e816e0 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.4"; + version = "3.2.5"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz"; - sha256 = "1xn782bvzbrdwkz04smkq8ns89wbnqz11vnmz0m7jr545amfnmgc"; + sha256 = "0xpky04a5xnzbcizqj4y1gyxqjrzvpjlvk1g757wdrs678fq82vx"; }; 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/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 99045570a71..e499dc5de04 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -10,27 +10,29 @@ 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.26.0"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - sha256 = "110558l147n1dqpylzrdzp8spj36nack88c5kknsxn69gr8yb7j2"; + sha256 = "1ggdnb4c8y835j9lxsglxry6fqy7d190s70rccjrc3rj0p5vwlyj"; }; patches = [ ./matrix-synapse.patch ]; diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix index 5b2335c73f6..eb8275b9402 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.6.3"; goPackagePath = "github.com/42wim/matterbridge"; src = fetchurl { url = "https://github.com/42wim/matterbridge/archive/v${version}.tar.gz"; - sha256 = "0m0phv8rngrp9gfn71gd2z184n60rng1fmvmv5nkmzsclr2y7x8b"; + sha256 = "1d2wrfq07kk5l19w2d6yyjcdvn9b39cji1k5vzsfq0xkdb6b8spb"; }; meta = with stdenv.lib; { diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index fabd5b83724..c625ce575f2 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.4"; + name = "memcached-${version}"; src = fetchurl { url = "http://memcached.org/files/${name}.tar.gz"; - sha256 = "0dfpmx0fqgp55j4vl06cz63fwx5kzhzipdm7n2kxjkvyg1ybzi13"; + sha256 = "1m03fhzq1f9byk2agccsr0x458niqqjpips5mbcgzhm4kylczhz0"; }; buildInputs = [cyrus_sasl libevent]; diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index c9dfe9136df..b553a202286 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-01-18T20-33-21Z"; - 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 = "102rilh1kjf9y6g6y83ikk42w7g1sbld11md3wm54hynyh956xrs"; }; - 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.x86_64 ++ ["aarch64-linux"]; + license = licenses.asl20; }; } diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index cb9e43a5c88..695e5aa4558 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.28.3"; src = fetchFromGitHub { owner = "google"; repo = "cadvisor"; rev = "v${version}"; - sha256 = "0rv245acz2r12c6ga2ln01961sh36w15ay0nfpfcg8inz679dnvg"; + sha256 = "1rdw09cbhs4il63lv1f92dw8pav9rjnkbrqx37lqij8x6xmv01gy"; }; - buildInputs = [ go ]; + nativeBuildInputs = [ go ]; buildPhase = '' mkdir -p Godeps/_workspace/src/github.com/google/ diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index 5d7becb1652..b0e2f29a3b4 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -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/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index 444aa92ec2e..f3d6a8d8776 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.13.0"; rev = "v${version}"; goPackagePath = "github.com/prometheus/alertmanager"; @@ -11,31 +11,25 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "alertmanager"; - sha256 = "1lkfj63pp4jf58xmn015r7s42p1wyj6fryihpmdn0k76b0ccwqzj"; + sha256 = "170q5fynwa3g3wm77g61610n1lf5kqirhrgak6slqzn52ji870nc"; }; # 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 c5aa7f91bd6..047585e2fc0 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.11.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 = "1zwhyvjkf222bwvgim28yizk2vq0777dviqfkkc3vdhiwl9amr8v"; }; meta = with stdenv.lib; { 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 00000000000..d19d595f066 --- /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 = "c65a0412e71e8b9b3bfd22925720d23c0f054237"; + sha256 = "1ch3czyzq5abl6zm1l0dfsi09xj43ql9jcbmbhfhxz954pw03v3v"; + }; + } + { + 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 = "06bc6e01f4baf4ee783ffcd23abfcb0b0f9dfada"; + sha256 = "0dvv21214sn702kc25y5l0gd9d11358976d3w31fgwx7456mjx26"; + }; + } + { + 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 = "89604d197083d4781071d3c65855d24ecfb0a563"; + sha256 = "169rdlaf2mk9z4fydz7ajmngyhmf3q1lk96yhvx46bn986x5xkyn"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "cb4147076ac75738c9a7d279075a253c0cc5acbd"; + sha256 = "0zhlrik0f9q1lj6cisgnxgbz4darbcix52hm5abi24l2ahchf5ca"; + }; + } + { + 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 00000000000..e7cdfa616b4 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "dovecot_exporter-unstable-${version}"; + version = "2018-01-18"; + rev = "4e831356533e2321031df73ebd25dd55dbd8d385"; + + goPackagePath = "github.com/kumina/dovecot_exporter"; + + src = fetchFromGitHub { + owner = "kumina"; + repo = "dovecot_exporter"; + inherit rev; + sha256 = "0iky1i7m5mlknkhlpsxpjgigssg5m02nx5y7i4biddkqilfic74n"; + }; + + 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 c89574e3fff..59314f1f282 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 562d77f3a2f..1993975e2bf 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"; }; } { @@ -54,22 +54,13 @@ sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; }; } - { - goPackagePath = "github.com/minio/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/minio/go-homedir"; - rev = "21304a94172ae3a09dee2cd86a12fb6f842138c7"; - sha256 = "1kvz91gvdrpzddlpcbf0a2kf75bfqzd40kwzq29jwhf1y5ii6cq4"; - }; - } { goPackagePath = "github.com/minio/minio-go"; fetch = { type = "git"; url = "https://github.com/minio/minio-go"; - rev = "cb3571b7d8d904c4714033deb984d0a0b66955be"; - sha256 = "165filzwslnqdgsp8wf5k1zm8wcpnsffsaffw25igy0ik8swr06w"; + rev = "d218e4cb1bfc13dcef0eb5c3e74507a35be0dd3a"; + sha256 = "0d3am33xaavdffz791qi2s0vnkpjw9vlr5p5g4lw7h5vhmy1sjb4"; }; } { @@ -77,8 +68,17 @@ fetch = { type = "git"; url = "https://github.com/minio/minio"; - rev = "60cc6184d253efee4a3120683517028342229e21"; - sha256 = "0n2l163v45jraylv43jwqm0cxin68vw8cw7k21qniahhr46y4dqf"; + rev = "bb73c84b104bc447eb603d63481cdc54b8ab3c83"; + sha256 = "1gjkgdf59yxfr2a7pl3f7z3iid86zsd85xqxcv1s0d46v7j07iga"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + 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/postfix-exporter-deps.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter-deps.nix new file mode 100644 index 00000000000..ff35c033427 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/postfix-exporter-deps.nix @@ -0,0 +1,66 @@ +# 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 = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; + sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "c65a0412e71e8b9b3bfd22925720d23c0f054237"; + sha256 = "1ch3czyzq5abl6zm1l0dfsi09xj43ql9jcbmbhfhxz954pw03v3v"; + }; + } + { + 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 = "06bc6e01f4baf4ee783ffcd23abfcb0b0f9dfada"; + sha256 = "0dvv21214sn702kc25y5l0gd9d11358976d3w31fgwx7456mjx26"; + }; + } + { + 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 = "89604d197083d4781071d3c65855d24ecfb0a563"; + sha256 = "169rdlaf2mk9z4fydz7ajmngyhmf3q1lk96yhvx46bn986x5xkyn"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "cb4147076ac75738c9a7d279075a253c0cc5acbd"; + sha256 = "0zhlrik0f9q1lj6cisgnxgbz4darbcix52hm5abi24l2ahchf5ca"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix new file mode 100644 index 00000000000..5438f8271d9 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "postfix_exporter-unstable-${version}"; + version = "2017-06-01"; + rev = "a8b4bed735a03f234fcfffba85302f51025e6b1d"; + + goPackagePath = "github.com/kumina/postfix_exporter"; + + src = fetchFromGitHub { + owner = "kumina"; + repo = "postfix_exporter"; + inherit rev; + sha256 = "0rxvjpyjcvr1y8k8skq5f1bnl0mpgvaa04dn8c44v7afqnv78riy"; + }; + + goDeps = ./postfix-exporter-deps.nix; + + 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 00000000000..34120ad3fda --- /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 00000000000..7a15a6a7b68 --- /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/sensu/default.nix b/pkgs/servers/monitoring/sensu/default.nix index c0a2c3ca49e..dba0c32b353 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 d5411e40a39..65a95c021c4 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.5.0"; + version = "1.5.1"; goPackagePath = "github.com/influxdata/telegraf"; diff --git a/pkgs/servers/monitoring/telegraf/deps-1.5.0.nix b/pkgs/servers/monitoring/telegraf/deps-1.5.1.nix similarity index 100% rename from pkgs/servers/monitoring/telegraf/deps-1.5.0.nix rename to pkgs/servers/monitoring/telegraf/deps-1.5.1.nix diff --git a/pkgs/servers/monitoring/uchiwa/bower-packages.nix b/pkgs/servers/monitoring/uchiwa/bower-packages.nix index 6108f01e0b9..618c3a33cd7 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" "1.1.0" "1.1.0" "0nv7csb38vx93yk08nwa9wj4x0b5icx9nl56d4v5azndcck2py30") - (fetchbower "angular" "1.6.7" "~1.6.3" "0sg9mqh94za8rv5ip9hmxyji6cmsb26sg3v60ppy6rld62f7gfj9") + (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.7" "~1.6.3" "0v5sqrxi411vjjz6m817pkh20vrw8lxdhxj30l4lhqws9cxj289z") + (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.7" "~1.6.3" "0qrr1rxksfw0ynrs23kbrcnwswrqaa6pymx3z3cfgawzq85fp4hh") - (fetchbower "angular-route" "1.6.7" "~1.6.3" "0k7bizyihpna0542j6d219df4x0rbb7s8z2kmjnv3l7f2p8ghy83") - (fetchbower "angular-sanitize" "1.6.7" "~1.6.3" "1kzr57cb5irxs2mpv6kaxhfryr556y0dy2d84k5bk8rm0c0jnnl8") + (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 51d3dfc0ffc..3e0ead7b495 100644 --- a/pkgs/servers/monitoring/uchiwa/src.nix +++ b/pkgs/servers/monitoring/uchiwa/src.nix @@ -1,4 +1,4 @@ { - version = "1.1.0-1"; - sha256 = "1ljrqz3ads5nn1alw4pa6lz7mbwhs09w498bpgg2hlcf8vklxg1y"; + 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 00000000000..10da7f8adbf --- /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/default.nix b/pkgs/servers/monitoring/zabbix/default.nix index cd541f82d23..be52698ed83 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 d9adc0f3102..dab63a5bad8 100644 --- a/pkgs/servers/mpd/clientlib.nix +++ b/pkgs/servers/mpd/clientlib.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja }: +{ stdenv, fetchFromGitHub, meson, ninja, fixDarwinDylibNames }: stdenv.mkDerivation rec { version = "2.13"; @@ -11,13 +11,14 @@ stdenv.mkDerivation rec { sha256 = "1g1n6rk8kn87mbjqxxj0vi7haj8xx21xmqlzbrx2fvyp5357zvsq"; }; - 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 a323cd4802c..da192f70bfe 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 = "15"; 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 = "0idlz9y7gn1yqk5x4igp060wvspzsf446b6ybhbb0swi035qpd2x"; }; patches = [ ./x86.patch ]; diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix index f5f29bcdac7..50b56213b30 100644 --- a/pkgs/servers/nosql/cassandra/generic.nix +++ b/pkgs/servers/nosql/cassandra/generic.nix @@ -65,6 +65,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/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 969cd183c5c..b9e850e8dfd 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/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 9ef0987d9b9..745376f61e4 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.7"; name = "redis-${version}"; src = fetchurl { url = "http://download.redis.io/releases/${name}.tar.gz"; - sha256 = "04s8cgvwjj1979s3hg8zkwc9pyn3jkjpz5zidp87kfcipifr385i"; + sha256 = "1lgcc5k6bg7f34lxbfx0xv74nj66khd5x8g1igyy2h7v8inm9fhv"; }; - 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/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix index 661888c5c5c..232fb135bd8 100644 --- a/pkgs/servers/openafs-client/default.nix +++ b/pkgs/servers/openafs-client/default.nix @@ -3,39 +3,19 @@ stdenv.mkDerivation rec { name = "openafs-${version}-${kernel.version}"; - version = "1.6.21.1"; + version = "1.6.22.1"; src = fetchurl { url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; - sha256 = "0nisxnfl8nllcfmi7mxj1gngkpxd4jp1wapbkhz07qwqynq9dn5f"; + sha256 = "19nfbksw7b34jc3mxjk7cbz26zg9k5myhzpv2jf0fnmznr47jqaw"; }; - nativeBuildInputs = [ autoconf automake flex yacc perl which ]; + nativeBuildInputs = [ autoconf automake flex yacc perl which ] ++ kernel.moduleBuildDependencies; 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"; - }) - # linux 4.14 - (fetchpatch { - name = "test-for-__vfs_write-rather-than-__vfs_read.patch"; - url = "http://git.openafs.org/?p=openafs.git;a=patch;h=929e77a886fc9853ee292ba1aa52a920c454e94b"; - sha256 = "0g4jxqzvyrjy2q7mhxc5ikhypj3ljw1wri4lipzm66crsvycp9x5"; - }) - # linux 4.14 - (fetchpatch { - name = "use-kernel_read-kernel_write-when-__vfs-variants-are-unavailable.patch"; - url = "http://git.openafs.org/?p=openafs.git;a=patch;h=5ee516b3789d3545f3d78fb3aba2480308359945"; - sha256 = "1vx55qb120y857mn1l00i58fj9cckschp86ch3g6hqrdc5q5bxv2"; - }) - ]; - preConfigure = '' ln -s "${kernel.dev}/lib/modules/"*/build $TMP/linux diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index 7ade52b2ee7..14f422f9610 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -2,16 +2,17 @@ stdenv.mkDerivation rec { name = "osrm-backend-${version}"; - version = "5.14.1"; + version = "5.15.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "Project-OSRM"; repo = "osrm-backend"; - sha256 = "0n7fpm8m5r93dxciagp2n8ij1wg483yb9srbzdzjqf1zzyh637sz"; + sha256 = "1vdy7j1k1brgd5jgvi5pm3flfw70v48d4rwfq404iiyipkjdy3kz"; }; - buildInputs = [ cmake pkgconfig bzip2 libxml2 libzip boost lua luabind tbb expat]; + 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"; diff --git a/pkgs/servers/p910nd/default.nix b/pkgs/servers/p910nd/default.nix index 0f7cc19339d..bcf1255ff4a 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/prayer/default.nix b/pkgs/servers/prayer/default.nix index e4b457d0c17..7997d0ebcd8 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/radarr/default.nix b/pkgs/servers/radarr/default.nix index 3b86cf1758c..3eba04f44fb 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.910"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz"; - sha256 = "1lpr05aaf6a9p2msmsh0j8krxk83sf5d3avrh5qpyjap5j3phvky"; + sha256 = "0c4msk6hvlqyy81xkjhsvsy4igpc01s4a00zwhqnds2gj4y9yplk"; }; buildInputs = [ 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 00000000000..7e3652dbe7b --- /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 efb539bfaea..1c360f6b2c7 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 7e1ae7f6032..90b00169a51 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -19,17 +19,19 @@ with lib; stdenv.mkDerivation rec { name = "samba-${version}"; - version = "4.6.11"; + version = "4.7.4"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${name}.tar.gz"; - sha256 = "07gd41y4ajdiansfqa8c5wvrincgddfzyfgh1pf7g388zaq7l6q5"; + sha256 = "0iw290n0q4l5s92d0f9yz27yp3rdfr6bvsmvg1xvd19g8p2d04pv"; }; 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 = diff --git a/pkgs/servers/samba/master.nix b/pkgs/servers/samba/master.nix new file mode 100644 index 00000000000..f1dd7fe7b14 --- /dev/null +++ b/pkgs/servers/samba/master.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchFromGitHub +, samba4 +, nettle +} : + + (samba4.overrideAttrs(oldAttrs: rec { + name = "samba-master${version}"; + version = "4.8.0_2018-01-25"; + + src = fetchFromGitHub { + owner = "samba-team"; + repo = "samba"; + rev = "849169a7b6ed0beb78bbddf25537521c1ed2f8e1"; + sha256 = "1535w787cy1x5ia9arjrg6hhf926wi8wm9qj0k0jgydy3600zpbv"; + }; + + # 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 00000000000..9f6577c65c1 --- /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/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix index fb988b54630..0d27e4fefcc 100644 --- a/pkgs/servers/search/elasticsearch/5.x.nix +++ b/pkgs/servers/search/elasticsearch/5.x.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; - sha256 = "0pvi6akicg0i3bz3lbc6k9rznxw7d25flg9wbs2dyxv8i2rrqvq0"; + sha256 = "0wjjvzjbdgdv9qznk1b8dx63zgs7s6jnrrbrnd5dn27lhymxiwpl"; }; patches = [ ./es-home-5.x.patch ./es-classpath-5.x.patch ]; diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix new file mode 100644 index 00000000000..6057c2dee82 --- /dev/null +++ b/pkgs/servers/search/elasticsearch/6.x.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, elk6Version, makeWrapper, jre_headless, utillinux, getopt }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + version = elk6Version; + name = "elasticsearch-${version}"; + + src = fetchurl { + url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; + sha256 = "03xwd8r0l0a29wl6wrp4bh7xr1b79q2rqfmsq3d5k35pv85sw3lw"; + }; + + 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 ] ++ + (if (!stdenv.isDarwin) then [utillinux] else [getopt]); + + installPhase = '' + mkdir -p $out + cp -R bin config lib modules plugins $out + + chmod -x $out/bin/*.* + + wrapProgram $out/bin/elasticsearch \ + ${if (!stdenv.isDarwin) + then ''--prefix PATH : "${utillinux}/bin/"'' + else ''--prefix PATH : "${getopt}/bin"''} \ + --set JAVA_HOME "${jre_headless}" \ + --set ES_JVM_OPTIONS "$out/config/jvm.options" + + 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/es-home-6.x.patch b/pkgs/servers/search/elasticsearch/es-home-6.x.patch new file mode 100644 index 00000000000..aba8d396a69 --- /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 950056ccb1d..25cd46aa98b 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 = "7.1.0"; src = fetchurl { url = "http://packages.groonga.org/source/groonga/${name}.tar.gz"; - sha256 = "1j5biji86dicm8whbqjgjmyycxsfl5qfyxqfc4bxaspd6w18vj87"; + sha256 = "1v0dyahlq7801bgcyvawj8waw6z84r0sr90x2b8nnrisrac3b8m7"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index f41676a79bc..635fd96b06f 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.5085"; src = fetchurl { url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; - sha256 = "15qr8hwv89zv71h4q94nrxl8625viip7m185wqcyzma8wrx5i1zi"; + sha256 = "1m6gdgsxk1d50kf4wnq6zyhbyf6rc0ma86l8m65am08xb0pihldz"; }; buildInputs = [ diff --git a/pkgs/servers/sql/mariadb/clang-isfinite.patch b/pkgs/servers/sql/mariadb/clang-isfinite.patch new file mode 100644 index 00000000000..8da527d5784 --- /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 00000000000..0c4fe7d321e --- /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 d6731a5b7dc..88d2ae3d68a 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.12"; 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 = "1v21sc1y5qndwdbr921da1s009bkn6pshwcgw47w7aygp9zjvcia"; 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" @@ -72,7 +73,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 +84,6 @@ common = rec { # attributes common to both builds }; }; - client = stdenv.mkDerivation (common // { name = "mariadb-client-${common.version}"; @@ -97,21 +97,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 +122,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 +135,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 +155,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 28e7824cd42..5a747fb85ab 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"; @@ -59,11 +60,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 687993e0dc5..0b277821876 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" @@ -50,15 +56,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.so $out/lib/libmysqlclient_r.so ''; - passthru.mysqlVersion = "5.7"; + passthru = { + client = self; + connector-c = self; + server = self; + mysqlVersion = "5.7"; + }; meta = { homepage = http://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/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index cf3349dc166..1a721e90a8d 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -58,13 +58,15 @@ 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) @@ -91,33 +93,33 @@ let in { postgresql93 = common { - version = "9.3.19"; + version = "9.3.20"; psqlSchema = "9.3"; - sha256 = "1d9gmi1psg4aa6h6ylvsrdm5jnnb7p36pn4h2qrvl9z9v4n8g7pv"; + sha256 = "1jp6lac4b0q6hb28yrdsl0ymzn75gg59hvp5zasarf3mf3b8l4zb"; }; postgresql94 = common { - version = "9.4.14"; + version = "9.4.15"; psqlSchema = "9.4"; - sha256 = "0szc0navrcjnpyafw2sai8cmwr3znsy0w6031lv7n1ab20xg4zcf"; + sha256 = "1i5c67gg4fj38hk07h6w6m4mqak84bhnblqsjbpiamg4x33v7gqj"; }; postgresql95 = common { - version = "9.5.9"; + version = "9.5.10"; psqlSchema = "9.5"; - sha256 = "1m6d4y3m3ir20dzl6q3s3yvmr0a7hq3si2v1hg5hanmbck3db379"; + sha256 = "10gjfn16bhzkmlqfsn384w49db0j39bg3n4majwxdpjd17g7lpcl"; }; postgresql96 = common { - version = "9.6.5"; + version = "9.6.6"; psqlSchema = "9.6"; - sha256 = "0k3ls2x182jz6djjiqj9kycddabdl2gk1y1ajq1vipnxwfki5nh6"; + sha256 = "0m417h30s18rwa7yzkqqcdb22ifpcda2fpg2cyx8bxvjp3ydz71r"; }; postgresql100 = common { - version = "10.0"; + version = "10.1"; psqlSchema = "10.0"; - sha256 = "1lbzwpmdxmk5bh0ix0rn72qbd52dq5cb55nzajscb0bvwa95abvi"; + sha256 = "04z7lm4h94625vbncwv98svycqr942n3q47ailqaczkszqjlxjrw"; }; } diff --git a/pkgs/servers/squid/4.nix b/pkgs/servers/squid/4.nix index 9f43af418e6..f0429475be2 100644 --- a/pkgs/servers/squid/4.nix +++ b/pkgs/servers/squid/4.nix @@ -10,8 +10,8 @@ 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 ]; configureFlags = [ "--enable-ipv6" @@ -19,11 +19,12 @@ 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.optionals stdenv.isLinux [ + "--enable-linux-netfilter" ]; meta = with stdenv.lib; { diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index 2da0316483b..7f1c97bd642 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -10,8 +10,8 @@ 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 ]; configureFlags = [ "--enable-ipv6" @@ -19,11 +19,12 @@ 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.optionals stdenv.isLinux [ + "--enable-linux-netfilter" ]; meta = with stdenv.lib; { diff --git a/pkgs/servers/sslh/default.nix b/pkgs/servers/sslh/default.nix index 7b98ded5dc1..c8ac6ed9db0 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.19"; src = fetchurl { url = "http://www.rutschle.net/tech/sslh/sslh-v${version}.tar.gz"; - sha256 = "1ba5fxd2s6jh9n3wbp2a782q7syc4m6qvfrggnscdbywfyrsa08n"; + sha256 = "17362d3srrr49c3vvyg69maynpxac92wvi5j0nvlnh6sjs1v377g"; }; 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 00000000000..0c6a197b1da --- /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.0"; + + # This repo has a private submodule "e" which fetchgit cannot handle without failing. + src = fetchFromGitHub { + owner = "gravitational"; + repo = "teleport"; + rev = "v${version}"; + sha256 = "1x4xnqjyb87pzmn2c59fwmzfx1f2k0xhqn2xgki3722qmj2ss846"; + }; + + 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 d0d0efa9aa6..72f5d3aa9d8 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "traefik-${version}"; - version = "1.4.4"; + version = "1.5.0"; goPackagePath = "github.com/containous/traefik"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "containous"; repo = "traefik"; rev = "v${version}"; - sha256 = "114861v8kg77zwnf742n25h7c4fly3i52inqx1kcpqs074rqm1wn"; + sha256 = "0yvmw99knjdfgaa3snk4fmrbf3bqnj78ix5hr0mcqj5pwjx1dihb"; }; buildInputs = [ go-bindata bash ]; diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix index 8724adfdad6..a6c75439ca9 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-01-05"; + rev = "c30f5e18119d1935e8fe6d422053b127e8f4f1b3"; - 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 = "18pc1l0dbjr7d5grcrb70y6j7cr2zb9575yqmy6zfwzrlvw0pa0l"; }; 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/unifi/default.nix b/pkgs/servers/unifi/default.nix index 71bc0de6d91..d4a0145e9b9 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.29"; src = fetchurl { url = "https://dl.ubnt.com/unifi/${version}/unifi_sysvinit_all.deb"; - sha256 = "1ffphdi4df3jhlcl68amb90f5pj7cwyrql4qwbswynh9d623880l"; + sha256 = "05na94mrd1dy95vnwd1ycqx4i38wf0lg67sjg263ilq5l1prdmz8"; }; buildInputs = [ dpkg ]; diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index d30129d93d9..4614a9768b0 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" ]; }) ]; @@ -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/web-apps/fileshelter/default.nix b/pkgs/servers/web-apps/fileshelter/default.nix new file mode 100644 index 00000000000..1adb3a70ccf --- /dev/null +++ b/pkgs/servers/web-apps/fileshelter/default.nix @@ -0,0 +1,28 @@ +{ 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"; + }; + + 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 530c54ebd89..06502ef59ad 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 9f881579f42..449fbf1a5b6 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/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix index 1c5f52d4938..28eeeb11259 100644 --- a/pkgs/servers/web-apps/searx/default.nix +++ b/pkgs/servers/web-apps/searx/default.nix @@ -1,34 +1,43 @@ { lib, pythonPackages, fetchFromGitHub }: -pythonPackages.buildPythonApplication rec { - name = "searx-${version}"; - version = "0.12.0"; - namePrefix = ""; +with pythonPackages; +buildPythonApplication rec { + pname = "searx"; + version = "0.13.1"; + + # Can not use PyPI because certain test files are missing. src = fetchFromGitHub { owner = "asciimoo"; repo = "searx"; rev = "v${version}"; - sha256 = "196lk8dpv8fsjgmwlqik6j6rabvfid41fir6lzqy03hv7ydcw1k0"; + sha256 = "0nizxq9ggf9g8f8pxn2hfm0kn20356v65h4cj9s73n742nkv6ani"; }; 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"; diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index 215e9fade0a..e6137a2db7c 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "wallabag-${version}"; - version = "2.2.3"; + version = "2.3.1"; # 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 = "1qk7jicni5g8acpjybrwnwf7zknk3b0mxiv5876lrsajcxdxwnf4"; }; - outputs = [ "out" "doc" ]; + outputs = [ "out" ]; patchPhase = '' rm Makefile # use the "shared hosting" package with bundled dependencies @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { ''; # exposes $WALLABAG_DATA installPhase = '' - mkdir -p $doc/share/doc - mv docs $doc/share/doc/wallabag mkdir $out/ cp -R * $out/ ''; diff --git a/pkgs/servers/x11/xorg/builder.sh b/pkgs/servers/x11/xorg/builder.sh index bb3e5ac4283..5a832cb14d5 100644 --- a/pkgs/servers/x11/xorg/builder.sh +++ b/pkgs/servers/x11/xorg/builder.sh @@ -16,13 +16,8 @@ postInstall() { echo "propagating requisites $requires" - if test -n "$crossConfig"; then - local pkgs=("${crossPkgs[@]}") - else - local pkgs=("${nativePkgs[@]}") - fi for r in $requires; do - for p in "${pkgs[@]}"; do + for p in "${pkgsHostHost[@]}" "${pkgsHostTarget[@]}"; do if test -e $p/lib/pkgconfig/$r.pc; then echo " found requisite $r in $p" propagatedBuildInputs+=" $p" diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index d1c7c81c101..cc2cade8ba1 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2588,11 +2588,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/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index ca1a773c4a2..f56d22d7b7e 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -546,7 +546,7 @@ in "--with-sha1=CommonCrypto" ]; preConfigure = '' - ensureDir $out/Applications + mkdir -p $out/Applications export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error" substituteInPlace hw/xquartz/pbproxy/Makefile.in --replace -F/System -F${args.apple_sdk.frameworks.ApplicationServices} ''; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 4ea77fee443..dd48748dceb 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -186,7 +186,7 @@ mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2 mirror://xorg/individual/app/xmag-1.0.6.tar.bz2 mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2 mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.19.5.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.19.6.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2 diff --git a/pkgs/servers/x11/xorg/xcb-util-xrm.nix b/pkgs/servers/x11/xorg/xcb-util-xrm.nix index dfc90feeb33..c38d4e80143 100644 --- a/pkgs/servers/x11/xorg/xcb-util-xrm.nix +++ b/pkgs/servers/x11/xorg/xcb-util-xrm.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, pkgconfig, m4, libxcb, xcbutil, libX11 }: stdenv.mkDerivation rec { - version = "1.0"; + version = "1.2"; name = "xcb-util-xrm-${version}"; src = fetchurl { url = "https://github.com/Airblader/xcb-util-xrm/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "1h5vxwpd37dqfw9yj1l4zd9c5dj30r3g0szgysr6kd7xrqgaq04l"; + sha256 = "0vbqhag51i0njc8d5fc8c6aa12496cwrc3s6s7sa5kfc17cwhppp"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ m4 libxcb xcbutil ] + nativeBuildInputs = [ pkgconfig m4 ]; + buildInputs = [ libxcb xcbutil ] ++ stdenv.lib.optional doCheck libX11; doCheck = true; diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 2799241fa99..3cde8307cb0 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -50,7 +50,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"; diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix index b4a2ba55388..5635c6a73be 100644 --- a/pkgs/shells/bash/4.4.nix +++ b/pkgs/shells/bash/4.4.nix @@ -68,10 +68,10 @@ stdenv.mkDerivation rec { ]; # 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.isDarwin binutils; buildInputs = optional interactive readline70; diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index a598d57808c..5a00a1ee419 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/mksh/default.nix b/pkgs/shells/mksh/default.nix index 96939230983..28d60eb6128 100644 --- a/pkgs/shells/mksh/default.nix +++ b/pkgs/shells/mksh/default.nix @@ -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 index f9cd97e9735..bb945f40421 100644 --- a/pkgs/shells/nix-bash-completions/default.nix +++ b/pkgs/shells/nix-bash-completions/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "0.6.1"; + version = "0.6.2"; name = "nix-bash-completions-${version}"; src = fetchFromGitHub { owner = "hedning"; repo = "nix-bash-completions"; rev = "v${version}"; - sha256 = "10nzdn249f0cw6adgpbpg4x90ysvxm7vs9jjbbwynfh9kngijp64"; + sha256 = "0w6mimi70drjkdpx5pcw66xy2a4kysjfzmank0kc5vbhrjgkjwyp"; }; # To enable lazy loading via. bash-completion we need a symlink to the script @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://github.com/hedning/nix-bash-completions; + homepage = https://github.com/hedning/nix-bash-completions; description = "Bash completions for Nix, NixOS, and NixOps"; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/shells/nix-zsh-completions/default.nix b/pkgs/shells/nix-zsh-completions/default.nix index 61ff3783209..29fb065a6f8 100644 --- a/pkgs/shells/nix-zsh-completions/default.nix +++ b/pkgs/shells/nix-zsh-completions/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: let - version = "0.3.6"; + version = "0.3.7"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "spwhitt"; repo = "nix-zsh-completions"; rev = "${version}"; - sha256 = "193yd0c3j62lhy7n7y9l0viwdiymvrfbqcgki69dm2414n3mlh05"; + sha256 = "164x8awia56z481r898pbywjgrx8fv8gfw8pxp4qgbxzp3gwq9iy"; }; installPhase = '' diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix index 8b8a67c2452..3374f32738c 100644 --- a/pkgs/shells/oh-my-zsh/default.nix +++ b/pkgs/shells/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2017-09-24"; + version = "2017-12-14"; name = "oh-my-zsh-${version}"; src = fetchgit { url = "https://github.com/robbyrussell/oh-my-zsh"; - rev = "accdcb2f1c3cca40527fef1fe4ab2d39eb6cf897"; - sha256 = "0jrixz02mdab63yr0s16sr8gzwzhf9xnhad852swnfp3c7qlq06z"; + rev = "c3b072eace1ce19a48e36c2ead5932ae2d2e06d9"; + sha256 = "14nmql4527l4qs4rxb5gczb8cklz8s682ly0l0nmqh36cmvaqx8y"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 1a55b06ef36..f7d2c49a66d 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -74,8 +74,7 @@ rec { }; in stdenv // { mkDerivation = - { buildInputs ? [], nativeBuildInputs ? [] - , propagatedBuildInputs ? [], propagatedNativeBuildInputs ? [] + { nativeBuildInputs ? [] , selfNativeBuildInput ? args.crossAttrs.selfNativeBuildInput or false , ... } @ args: @@ -98,14 +97,6 @@ rec { ++ stdenv.lib.optional hostPlatform.isAarch64 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/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index d202186c29b..28b2f203dae 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -58,6 +58,7 @@ in rec { extraPreHook ? "", extraNativeBuildInputs, extraBuildInputs, + libcxx, allowedRequisites ? null}: let buildPackages = lib.optionalAttrs (last ? stdenv) { @@ -82,6 +83,8 @@ in rec { inherit shell; inherit (last) stdenvNoCC; + extraPackages = lib.optional (libcxx != null) libcxx; + nativeTools = false; nativeLibc = false; inherit buildPackages coreutils gnugrep bintools; @@ -115,8 +118,8 @@ in rec { initialPath = [ bootstrapTools ]; fetchurlBoot = import ../../build-support/fetchurl { - stdenv = stage0.stdenv; - curl = bootstrapTools; + stdenvNoCC = stage0.stdenv; + curl = bootstrapTools; }; # The stdenvs themselves don't use mkDerivation, so I need to specify this here @@ -176,6 +179,7 @@ in rec { extraNativeBuildInputs = []; extraBuildInputs = []; + libcxx = null; }; stage1 = prevStage: let @@ -183,7 +187,8 @@ in rec { 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 ]; @@ -210,7 +215,8 @@ in rec { ''; extraNativeBuildInputs = [ pkgs.xz ]; - extraBuildInputs = with pkgs; [ darwin.CF libcxx ]; + extraBuildInputs = [ pkgs.darwin.CF ]; + libcxx = pkgs.libcxx; allowedRequisites = [ bootstrapTools ] ++ @@ -242,7 +248,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 @@ -277,7 +284,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 ''; @@ -347,10 +356,11 @@ in rec { 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; @@ -365,7 +375,7 @@ 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 gettext + gnugrep llvmPackages.clang-unwrapped llvmPackages.clang-unwrapped.lib patch pcre.out gettext binutils-raw.bintools binutils binutils.bintools cc.expand-response-params ]) ++ (with pkgs.darwin; [ diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index cd20c4a3cef..745ad14bc08 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -1,6 +1,5 @@ -# 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 }: @@ -154,15 +153,17 @@ let # 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; + evaluates = bool; repositories = attrsOf str; isBuildPythonPackage = platforms; - schedulingPriority = str; + schedulingPriority = int; downloadURLRegexp = str; isFcitxEngine = bool; isIbusEngine = bool; @@ -196,13 +197,11 @@ let { 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 handleEvalIssue (removeAttrs v ["valid"]) - else true; + validity = checkValidity attrs; -in - assert validityCondition; - derivationArg +in validity // { + # Throw an error if trying to evaluate an non-valid derivation + handled = if !validity.valid + then handleEvalIssue (removeAttrs validity ["valid"]) + else true; +} diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index eb8545c6999..e021b284a12 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,69 @@ 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 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; + }; # 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. + } // { + evaluates = validity.valid + && (if config.checkMetaRecursively or false + then lib.all (d: d.meta.evaluates 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 686ed68cede..dbbe45e45f3 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. @@ -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"; shift - local var="$1"; shift - local propagatedBuildInputsFiles=("$@") + 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,21 +386,106 @@ findInputs() { exit 1 fi - local file - for file in "${propagatedBuildInputsFiles[@]}"; do - file="$pkg/nix-support/$file" - [[ -f "$file" ]] || continue + # 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" + } - local pkgNext - for pkgNext in $(< "$file"); do - findInputs "$pkgNext" "$var" "${propagatedBuildInputsFiles[@]}" + # 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)" @@ -347,11 +494,18 @@ activatePackage() { 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" @@ -359,67 +513,72 @@ activatePackage() { 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 propagated-build-inputs - done -else - for i in ${nativeBuildInputs:-} ${defaultNativeBuildInputs:-} ${propagatedNativeBuildInputs:-}; do - findInputs "$i" nativePkgs propagated-native-build-inputs - done - for i in ${buildInputs:-} ${defaultBuildInputs:-} ${propagatedBuildInputs:-}; do - findInputs "$i" crossPkgs propagated-build-inputs - done -fi +_activatePkgs() { + local -i hostOffset targetOffset + local pkg -for i in ${nativePkgs+"${nativePkgs[@]}"} ${crossPkgs+"${crossPkgs[@]}"}; do - activatePackage "$i" -done + 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 +} +# 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. +# 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 -_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" + 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 ${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" -} - -# 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" @@ -882,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 @@ -895,19 +1055,35 @@ 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[@]}" + ) + + local propagatedInputsIndex + for propagatedInputsIndex in "${!flatVars[@]}"; do + local propagatedInputsSlice="${flatVars[$propagatedInputsIndex]}[@]" + local propagatedInputsFile="${flatFiles[$propagatedInputsIndex]}" + + [[ "${!propagatedInputsSlice}" ]] || continue - if [ -n "${propagatedBuildInputs:-}" ]; then mkdir -p "${!outputDev}/nix-support" # shellcheck disable=SC2086 - printWords $propagatedBuildInputs > "${!outputDev}/nix-support/propagated-build-inputs" - fi - - if [ -n "${propagatedNativeBuildInputs:-}" ]; then - mkdir -p "${!outputDev}/nix-support" - # shellcheck disable=SC2086 - printWords $propagatedNativeBuildInputs > "${!outputDev}/nix-support/propagated-native-build-inputs" - fi + printWords ${!propagatedInputsSlice} > "${!outputDev}/nix-support/$propagatedInputsFile" + done if [ -n "${setupHook:-}" ]; then diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 8aaf4993108..ac1d57a2275 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -1,232 +1,16 @@ {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.bintools.out}/bin/$i $out/bin - done - - 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; } diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 15be64a22a9..f51a39d5820 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -1,8 +1,13 @@ -{ system ? builtins.currentSystem }: +{ localSystem ? { system = builtins.currentSystem; } +, crossSystem ? null +}: -with import ../../.. {inherit system;}; - -rec { +let + pkgs = import ../../.. { inherit localSystem crossSystem; }; + glibc = if pkgs.hostPlatform != pkgs.buildPlatform + then pkgs.glibcCross + else pkgs.glibc; +in with pkgs; rec { coreutilsMinimal = coreutils.override (args: { @@ -35,7 +40,7 @@ rec { stdenv.mkDerivation { name = "stdenv-bootstrap-tools"; - buildInputs = [nukeReferences cpio]; + nativeBuildInputs = [ buildPackages.nukeReferences buildPackages.cpio ]; buildCommand = '' set -x @@ -118,10 +123,17 @@ 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 != 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_14.out}/lib/libisl*.so* $out/lib + + '' + '' cp -d ${bzip2.out}/lib/libbz2.so* $out/lib # Copy binutils. @@ -135,13 +147,14 @@ 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 @@ -176,11 +189,14 @@ rec { bootstrapTools = runCommand "bootstrap-tools.tar.xz" {} "cp ${build}/on-server/bootstrap-tools.tar.xz $out"; }; - bootstrapTools = import ./bootstrap-tools { inherit system bootstrapFiles; }; + bootstrapTools = import ./bootstrap-tools { + inherit (hostPlatform) system; + inherit bootstrapFiles; + }; test = derivation { name = "test-bootstrap-tools"; - inherit system; + inherit (hostPlatform) system; builder = bootstrapFiles.busybox; args = [ "ash" "-e" "-c" "eval \"$buildCommand\"" ]; diff --git a/pkgs/test/macos-sierra-shared/default.nix b/pkgs/test/macos-sierra-shared/default.nix index 51e8ae53736..73b359ffe6a 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/tools/X11/sselp/default.nix b/pkgs/tools/X11/sselp/default.nix index 33a0deedafa..10b0dfff9bf 100644 --- a/pkgs/tools/X11/sselp/default.nix +++ b/pkgs/tools/X11/sselp/default.nix @@ -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/xcalib/default.nix b/pkgs/tools/X11/xcalib/default.nix index 65868a3b6b0..2f925b11ba5 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-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index 717ad327c67..f71bcdef9f4 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://portland.freedesktop.org/wiki/; + homepage = https://portland.freedesktop.org/wiki/; 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/admin/ansible/2.1.nix b/pkgs/tools/admin/ansible/2.1.nix index d4a349c5e47..b8b335bd618 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 { diff --git a/pkgs/tools/admin/ansible/2.2.nix b/pkgs/tools/admin/ansible/2.2.nix index 4ef35fa5d9e..ccca64b86b6 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 { diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix new file mode 100644 index 00000000000..4f8b1bc1368 --- /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/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index b0e142a6d1d..bad9ccae799 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -18,21 +18,20 @@ let name = "${pname}-${version}"; pname = "colorama"; version = "0.3.7"; - src = fetchPypi { - inherit pname version; + src = old.src.override { + inherit version; sha256 = "0avqkn6362v7k2kg3afb35g4sfdvixjgy890clip4q174p9whhz0"; }; }); in buildPythonPackage rec { - name = "${pname}-${version}"; pname = "awscli"; - version = "1.14.6"; + version = "1.14.29"; namePrefix = ""; src = fetchPypi { inherit pname version; - sha256 = "1lhv8vb3bkjfjg4jm3hgfjssxgqy50gb6vbkh4lxiy8cn3y2dxp1"; + sha256 = "96edb1dd72fbc13638967fe07c436e95133169759cc962b973bb79ba959bc652"; }; # No tests included diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock index babef61311e..5dddccfe78a 100644 --- a/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (2.3.5) + CFPropertyList (2.3.6) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) babosa (1.0.2) @@ -15,7 +15,7 @@ GEM domain_name (0.5.20170404) unf (>= 0.0.5, < 1.0.0) dotenv (2.2.1) - excon (0.59.0) + excon (0.60.0) faraday (0.13.1) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) @@ -23,8 +23,8 @@ GEM http-cookie (~> 1.0.0) faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) - fastimage (2.1.0) - fastlane (2.68.2) + fastimage (2.1.1) + fastlane (2.75.1) CFPropertyList (>= 2.3, < 3.0.0) addressable (>= 2.3, < 3.0.0) babosa (>= 1.0.2, < 2.0.0) @@ -52,7 +52,8 @@ GEM slack-notifier (>= 1.3, < 2.0.0) terminal-notifier (>= 1.6.2, < 2.0.0) terminal-table (>= 1.4.5, < 2.0.0) - tty-screen (~> 0.6.2) + tty-screen (>= 0.6.3, < 1.0.0) + tty-spinner (>= 0.7.0, < 1.0.0) word_wrap (~> 1.0.0) xcodeproj (>= 1.5.2, < 2.0.0) xcpretty (>= 0.2.4, < 1.0.0) @@ -88,12 +89,12 @@ 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.0) multi_xml (0.6.0) multipart-post (2.0.0) nanaimo (0.2.3) 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) @@ -112,14 +113,17 @@ GEM terminal-notifier (1.8.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) - tty-screen (0.6.3) + tty-cursor (0.5.0) + tty-screen (0.6.4) + tty-spinner (0.7.0) + tty-cursor (>= 0.5.0) uber (0.1.0) unf (0.1.4) unf_ext unf_ext (0.0.7.4) unicode-display_width (1.3.0) word_wrap (1.0.0) - xcodeproj (1.5.3) + xcodeproj (1.5.4) CFPropertyList (~> 2.3.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix index 39f7be68255..a309de07a11 100644 --- a/pkgs/tools/admin/fastlane/gemset.nix +++ b/pkgs/tools/admin/fastlane/gemset.nix @@ -19,10 +19,10 @@ CFPropertyList = { source = { remotes = ["https://rubygems.org"]; - sha256 = "06dddgcai6nay552h8wmnb2m93xx5hni48s16vkbf9vbym4nfw5x"; + sha256 = "0hadm41xr1fq3qp74jd9l5q8l0j9083rgklgzsilllwaav7qrrid"; type = "gem"; }; - version = "2.3.5"; + version = "2.3.6"; }; claide = { source = { @@ -93,10 +93,10 @@ excon = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0mnc9lqlzwqj5ayp0lh7impisqm55mdg3mw5q4gi9yjic5sidc40"; + sha256 = "1rxwlfs7dq4r3bi9avgn7j6bz4hq1a3hdlr9xwdiyp4dp4286xfc"; type = "gem"; }; - version = "0.59.0"; + version = "0.60.0"; }; faraday = { dependencies = ["multipart-post"]; @@ -128,19 +128,19 @@ 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" "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" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dgpr6rdg0bc8fxv0ysf4pw6p1by03jw8bwzqxkyai5fsl6hggpf"; + sha256 = "0v5i9wnbmsmvz3xhbkvs1w5qj9b0ib5431i3zlimfasf8h138l9y"; type = "gem"; }; - version = "2.68.2"; + version = "2.75.1"; }; gh_inspector = { source = { @@ -262,10 +262,10 @@ multi_json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1raim9ddjh672m32psaa9niw67ywzjbxbdb8iijx3wv9k5b0pk2x"; + sha256 = "05rrhxl08qvd37g5q13v6k8qqbr1ixn6g53ld6rxrvj4lxrjvxns"; type = "gem"; }; - version = "1.12.2"; + version = "1.13.0"; }; multi_xml = { source = { @@ -302,10 +302,10 @@ plist = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0k0pyqrjcz9kn1b3ahsfs9aqym7s7yzz0vavya0zn0mca3jw2zqc"; + sha256 = "1f27kj49v76psqxgcwvwc63cf7va2bszmmw2qrrd281qzi2if79l"; type = "gem"; }; - version = "3.3.0"; + version = "3.4.0"; }; public_suffix = { source = { @@ -390,13 +390,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 = "0582kwz0y0h5pn67gh36cds6b087i0jh622vw6f85gnqzmynilcv"; + sha256 = "19iq03prqjbm0nr7yn0181lph52d994jwbcsqss3lwpwkl20s6bv"; type = "gem"; }; - version = "0.6.3"; + version = "0.6.4"; + }; + tty-spinner = { + dependencies = ["tty-cursor"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sblbhnscgchnxpbsxa5xmnxnpw13nd4lgsykazm9mhsxmjmhggw"; + type = "gem"; + }; + version = "0.7.0"; }; uber = { source = { @@ -443,10 +460,10 @@ dependencies = ["CFPropertyList" "claide" "colored2" "nanaimo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gvnd5ixa4wbn1cpc6jp6i9z0dxhcwlxny47irzbr6zr8wpj3ww7"; + sha256 = "04kv04y5yz2zniwwywh5ik29gpnjpsp23yr6w07qn3m243icvi76"; type = "gem"; }; - version = "1.5.3"; + version = "1.5.4"; }; xcpretty = { dependencies = ["rouge"]; diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 4588a6f7fb4..d6425ede4f4 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -19,23 +19,23 @@ let sources = name: system: { i686-linux = { url = "${baseUrl}/${name}-linux-x86.tar.gz"; - sha256 = "127f98a25293d537d5a64d0df559d4053e6a8c77bbdc13566896ff7e6c2ceede"; + sha256 = "0fq8zw1a5c0mnmw6f7j9j80y6kq0f0v2wn1d7b8mfq8ih5x53a85"; }; x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "7b0f037db60b6ebde89afd80ba7c96f036637dd5cba77201952d1137801d5060"; + sha256 = "1h4m70fk3hri4lgm9lh2pm0v196nc2r3hpf42h3xx5k7sqklsns2"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "3cae8a7b021f3c9eaab6c0b59a1301eb7cda3a422e645b3b0c6ccfe89b1e0332"; + sha256 = "1ynvllxzjr3y4qflw06njj7qqcf7539mbp06rs03i8hargsgbamx"; }; }.${system}; in stdenv.mkDerivation rec { name = "google-cloud-sdk-${version}"; - version = "182.0.0"; + version = "184.0.0"; src = fetchurl (sources name stdenv.system); @@ -64,6 +64,13 @@ in stdenv.mkDerivation rec { mkdir -p $out/bin 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/" diff --git a/pkgs/tools/admin/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix index cebe90855fa..bee9c53d02a 100644 --- a/pkgs/tools/admin/nxproxy/default.nix +++ b/pkgs/tools/admin/nxproxy/default.nix @@ -25,6 +25,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/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index f66fd6b00af..ce416e7cd25 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -20,7 +20,7 @@ pythonPackages.buildPythonApplication rec { 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 ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 5ba53c75371..e4b206f5448 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -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 ''; diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/tools/archivers/cromfs/default.nix index 00de2c2ec46..77536a7ad30 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/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 3550b7d7de3..886ed817909 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 9f161ac7525..02281468942 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/unarj/default.nix b/pkgs/tools/archivers/unarj/default.nix index f3c566596c4..9537701ebe7 100644 --- a/pkgs/tools/archivers/unarj/default.nix +++ b/pkgs/tools/archivers/unarj/default.nix @@ -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/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index 30b05b2b234..309604999ba 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 5e63c7cfaab..3004c7e2132 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 b750f40ab40..6d50a849a77 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.18"; + version = "8.13.19"; src = fetchFromGitHub { owner = "leesavide"; repo = "abcm2ps"; rev = "v${version}"; - sha256 = "0fzhk43fidyflqj8wd7m3m4pibzrbr1c120xi9wskzb3627pgyh1"; + sha256 = "0iv8fzl601rkww9dplajwzlfdb8r7142qdsj8xmvrbwqkaval51f"; }; 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 8113b67db88..941c5e343b9 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,12 +2,11 @@ stdenv.mkDerivation rec { name = "abcMIDI-${version}"; - version = "2017.12.20"; + version = "2018.01.25"; - # You can find new releases on http://ifdo.ca/~seymour/runabc/top.html src = fetchzip { url = "http://ifdo.ca/~seymour/runabc/${name}.zip"; - sha256 = "0lkbwrh701djbyqmybvx860p8csy25i6p3p7hr0cpndpa496nm07"; + sha256 = "18h6gqhh75qdi8krpp0m2pxbxi0n08wrh8xay477jm3vaggyr8s9"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase @@ -15,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 = "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 00000000000..652e0e4a94b --- /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 27be81733d3..f808e90281e 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 7e9d0ff9d86..899845a044c 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 ''; diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix index 385021b7354..9906fa449dd 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/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index c3256713832..4af20f76449 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 @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { 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 00000000000..8ef846a8dca --- /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.all; + maintainers = with maintainers; [ jluttine ]; + }; + +} diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 2dc84069d62..eb40dfefb83 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "borgbackup-${version}"; - version = "1.1.3"; + version = "1.1.4"; namePrefix = ""; src = fetchurl { url = "https://github.com/borgbackup/borg/releases/download/" + "${version}/${name}.tar.gz"; - sha256 = "1rvn8b6clzd1r317r9jkvk34r31risi0dxfjc7jffhnwasck4anc"; + sha256 = "1cicqwh85wfp65y00qaq6q4i4jcyy9b66qz5gpl80qc880wab912"; }; nativeBuildInputs = with python3Packages; [ @@ -41,14 +41,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 1ebb34ded9e..00000000000 --- 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 050f1a6c430..00000000000 --- 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 f9feaf40ec2..3565d8cbeb2 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.0"; src = fetchurl { url = "http://digint.ch/download/btrbk/releases/${name}.tar.xz"; - sha256 = "02qc9vbd5l0ywnv01p60v9q3dcx2z92dfaf95qf7ccxqaa9zxfr5"; + sha256 = "1brnh5x3fd91j3v8rz3van08m9i0ym4lv4hqz274s86v1kx4k330"; }; - 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 d7c14a91efb..f24e89fcc84 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/mydumper/default.nix b/pkgs/tools/backup/mydumper/default.nix index 5b1f8f3fd5c..da8805bc226 100644 --- a/pkgs/tools/backup/mydumper/default.nix +++ b/pkgs/tools/backup/mydumper/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig -, glib, zlib, pcre, mariadb, libressl, }: +, glib, zlib, pcre, mysql, libressl }: stdenv.mkDerivation rec { version = "0.9.3"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ glib zlib pcre mariadb.client.dev libressl ]; + buildInputs = [ glib zlib pcre mysql.connector-c libressl ]; meta = with stdenv.lib; { description = ''High-perfomance MySQL backup tool''; diff --git a/pkgs/tools/backup/percona-xtrabackup/default.nix b/pkgs/tools/backup/percona-xtrabackup/default.nix new file mode 100644 index 00000000000..6899ba88a22 --- /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/restic/default.nix b/pkgs/tools/backup/restic/default.nix index cad43773e16..40d8e0a4fbc 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.8.0"; + version = "0.8.1"; goPackagePath = "github.com/restic/restic"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "restic"; repo = "restic"; rev = "v${version}"; - sha256 = "10r2p4mkspkkzmj41jskqii02qkliwz2zfhvsabkg8clr8lzfkv9"; + sha256 = "13pawz031pzyc4ap5kk229cmzj0qjx5x0j1mw7jhwhc4w4ximvl3"; }; buildPhase = '' diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 9027bdf9c5f..71df4a1b5a5 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 @@ -15,7 +15,10 @@ in stdenv.mkDerivation rec { sha256 = "03s305mbc57nl3sq5ywh9casz926k4aqnylgaidli8bmgz1djbg9"; }; - 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 ] ++ pythonPath diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix index 74ea097d2f3..f305cff0ea2 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 ada58e87fd0..63a429e50de 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/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix index 7e3c2cda48b..e70d259df68 100644 --- a/pkgs/tools/cd-dvd/dvdisaster/default.nix +++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix @@ -84,6 +84,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ jgeerds nckx ]; + maintainers = with maintainers; [ jgeerds ]; }; } diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index bd33eb4d437..45af74b0b3e 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 = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "google"; repo = "brotli"; rev = "v" + version; - sha256 = "1rqgp8xi1k4sjy9sngg1vw0v8q2mm46dhyya4d35n3k6yk7pk0qv"; + sha256 = "1rpg16zpr7h6vs7qr6npmqhyw4w5nkp24iq70s4dryn77m0r4mcv"; }; - 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-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/bsdiff/default.nix b/pkgs/tools/compression/bsdiff/default.nix index 1d693f781e6..095bd5f7d9a 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/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index bc8666a2690..04c83fa03fc 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/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix index 8bc5e464ee7..32de493ec77 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 dd7277c4e8f..c870e501209 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 48c58434acd..05cc672ab15 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"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { 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 cc4edf64c4f..2697d22a0e0 100644 --- a/pkgs/tools/compression/zopfli/default.nix +++ b/pkgs/tools/compression/zopfli/default.nix @@ -55,6 +55,6 @@ stdenv.mkDerivation rec { ''; 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 b28311657a1..457170013ce 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { license = with licenses; [ gpl2Plus bsd2 ]; platforms = platforms.unix; - maintainers = with maintainers; [ nckx orivej ]; + maintainers = with maintainers; [ orivej ]; }; } diff --git a/pkgs/tools/filesystems/boxfs/default.nix b/pkgs/tools/filesystems/boxfs/default.nix index 99a118160b7..9c9dbede83f 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 a37659aa871..46c5bc6071f 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -2,14 +2,14 @@ , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd }: -let version = "4.14"; in +let version = "4.14.1"; in stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "1bwirg6hz6gyfj5r3xkj4lfwadvl9pxlccf916fsmdn27fy5q289"; + sha256 = "1palnddw3d50kyflwk1j4xapbc6jniid6j5i9dsr8l8a7nkv7ich"; }; nativeBuildInputs = [ pkgconfig ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { 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/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix index 0469ad54eb1..7bbfafef819 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.8"; src = fetchFromGitHub { owner = "cryfs"; repo = "cryfs"; rev = "${version}"; - sha256 = "1wsv4cyjkyg3cyr6vipw1mj41bln2m69123l3miav8r4mvmkfq8w"; + sha256 = "1lrzmzjakv08qjq09a3krllfw5vrgblfxzijpf3lm3yjgih63r1k"; }; prePatch = '' diff --git a/pkgs/tools/filesystems/duff/default.nix b/pkgs/tools/filesystems/duff/default.nix index 078c80a8b70..e1b11a37055 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 22dc9e74723..e6a83e32632 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libuuid, gettext, texinfo }: stdenv.mkDerivation rec { - name = "e2fsprogs-1.43.7"; + name = "e2fsprogs-1.43.8"; src = fetchurl { url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; - sha256 = "1i51w5l45zhz3i98k92xbbvkqklvjrvw3zvqky3gk9cdmqp5y0w7"; + sha256 = "1pn33rap3lcjm3gx07pmgyhx4j634gja63phmi4g5dq8yj0z8ciz"; }; outputs = [ "bin" "dev" "out" "man" "info" ]; diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index 3df76d82831..e415f57e707 100644 --- a/pkgs/tools/filesystems/encfs/default.nix +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -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 aba0418e9de..831594973e2 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.7"; src = fetchFromGitHub { - sha256 = "0x8wjvvlqmp0g2361m6d24csi1p4df8za2cqhyys03s1hv1qmy0k"; - rev = "v${version}"; - repo = "exfat"; owner = "relan"; + repo = "exfat"; + rev = "v${version}"; + sha256 = "1sk4z133djh8sdvx2vvmd8kf4qfly2i3hdar4zpg0s41jpbzdx69"; }; - 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/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 87356fd3483..494fd7036e2 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.3"; + version = "3.12.4"; name="${baseName}-${version}"; url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz"; - sha256 = "16ra4qr4ds011mmxaqdhdj7slcx8yv0xh6ww7bwsz7f1gn9sr10h"; + 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 b0e4d5029e0..ca2d0a627ab 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/mp3fs/default.nix b/pkgs/tools/filesystems/mp3fs/default.nix index 77207cb8b3a..cc8ca841124 100644 --- a/pkgs/tools/filesystems/mp3fs/default.nix +++ b/pkgs/tools/filesystems/mp3fs/default.nix @@ -25,9 +25,8 @@ stdenv.mkDerivation rec { which only understands the MP3 format, or transcode files through simple drag-and-drop in a file browser. ''; - homepage = http://khenriks.github.io/mp3fs/; + homepage = https://khenriks.github.io/mp3fs/; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index 0cf439c9fe9..6acf5e221d4 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.tuxera.com/community/open-source-ntfs-3g/; + homepage = https://www.tuxera.com/community/open-source-ntfs-3g/; description = "FUSE-based NTFS driver with full write support"; maintainers = with maintainers; [ dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix index b39be214d89..1007d04036e 100644 --- a/pkgs/tools/filesystems/s3backer/default.nix +++ b/pkgs/tools/filesystems/s3backer/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/archiecobbs/s3backer; description = "FUSE-based single file backing store via Amazon S3"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ nckx ]; platforms = with platforms; linux; }; } diff --git a/pkgs/tools/filesystems/securefs/default.nix b/pkgs/tools/filesystems/securefs/default.nix index 0cd1d818f8c..233034792e1 100644 --- a/pkgs/tools/filesystems/securefs/default.nix +++ b/pkgs/tools/filesystems/securefs/default.nix @@ -33,6 +33,5 @@ stdenv.mkDerivation rec { ''; license = with licenses; [ bsd2 mit ]; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/filesystems/sshfs-fuse/build-man-pages.patch b/pkgs/tools/filesystems/sshfs-fuse/build-man-pages.patch deleted file mode 100644 index fba1d250c42..00000000000 --- a/pkgs/tools/filesystems/sshfs-fuse/build-man-pages.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/meson.build 2017-09-23 22:02:57.770555382 +0200 -+++ b/meson.build 2017-09-23 23:11:28.258095182 +0200 -@@ -25,7 +25,7 @@ - endif - - --rst2man = find_program('rst2man', required: false) -+rst2man = find_program('rst2man.py', required: true) - - cfg = configuration_data() - diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index eebe3076c98..6fd55c369d5 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, meson, pkgconfig, ninja, glib, fuse3 -, buildManPages ? true, docutils +, docutils }: let @@ -15,10 +15,8 @@ in stdenv.mkDerivation rec { sha256 = "15z1mlad09llckkadvjfzmbv14fbq218xmb4axkmi7kzixbi41hv"; }; - patches = optional buildManPages ./build-man-pages.patch; - - nativeBuildInputs = [ meson pkgconfig ninja ]; - buildInputs = [ fuse3 glib ] ++ optional buildManPages docutils; + nativeBuildInputs = [ meson pkgconfig ninja docutils ]; + buildInputs = [ fuse3 glib ]; NIX_CFLAGS_COMPILE = stdenv.lib.optional (stdenv.system == "i686-linux") diff --git a/pkgs/tools/filesystems/tmsu/default.nix b/pkgs/tools/filesystems/tmsu/default.nix index 03d5bd145ac..89e5c0f35f0 100644 --- a/pkgs/tools/filesystems/tmsu/default.nix +++ b/pkgs/tools/filesystems/tmsu/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "tmsu-${version}"; - version = "0.6.1"; + version = "0.7.0"; go-sqlite3 = fetchgit { url = "git://github.com/mattn/go-sqlite3"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "oniony"; repo = "tmsu"; rev = "v${version}"; - sha256 = "08mz08pw59zaljp7dcndklnfdbn36ld27capivq3ifbq96nnqdf3"; + sha256 = "0vccxb8mlr7wf92xawnqpvzwlw2xs3b962hjn09dnd6yxqscql64"; }; buildInputs = [ go fuse ]; diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index 2a0796699fb..d0f78f80c3e 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -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/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 8aa14220250..a177f33bb37 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { postPatch = '' # lrelease is in qttools, not in qtbase. - substituteInPlace configure --replace '$'{QT5LOC}/lrelease lrelease + sed -i configure -e 's|''${QT5LOC}/lrelease|lrelease|' ''; configureFlags = [ diff --git a/pkgs/tools/graphics/optar/default.nix b/pkgs/tools/graphics/optar/default.nix new file mode 100644 index 00000000000..bc141907075 --- /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 f9b82a38344..fd0b0caea4c 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/plotutils/debian-patches.nix b/pkgs/tools/graphics/plotutils/debian-patches.nix index 0615d1f52e1..d7c60a11eb6 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 8694be8edd7..c28d96fdd5b 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 219bfdf8c14..85685e0b048 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 3bcbc5d5ead..fce1f3f913c 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 93f57f95e3e..992e66965f8 100644 --- a/pkgs/tools/graphics/pngquant/default.nix +++ b/pkgs/tools/graphics/pngquant/default.nix @@ -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/scanbd/default.nix b/pkgs/tools/graphics/scanbd/default.nix index 86b4cb91de0..ba376af1c3c 100644 --- a/pkgs/tools/graphics/scanbd/default.nix +++ b/pkgs/tools/graphics/scanbd/default.nix @@ -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 7beb3767b26..266221de173 100644 --- a/pkgs/tools/graphics/svgcleaner/default.nix +++ b/pkgs/tools/graphics/svgcleaner/default.nix @@ -1,19 +1,17 @@ { 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"; diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix index b513115c68f..3ecd91aaca1 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 87bb4923b8a..b8bf73fda64 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 6022bcebc3b..f2610efd2eb 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/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix index b0da0034ef9..7617d544d29 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 = http://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 c489b3e4ed7..27eb35ce6ae 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 = http://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-libpinyin/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix index 6293fa30d7a..85399bffd3f 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.2"; src = fetchFromGitHub { owner = "libpinyin"; repo = "ibus-libpinyin"; rev = version; - sha256 = "1d85kzlhav0ay798i88yqyrjbkv3y7w2aiadpmcjgscyd5ccsnnz"; + sha256 = "067w926gcf0kwwn71yshhjmyzkad0qsdm1dsi2xwz1j633qd4xlb"; }; buildInputs = [ ibus glib sqlite libpinyin python3 gtk3 db ]; diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 3fd29d65f36..f71a21b914f 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"; }; - in stdenv.mkDerivation { + 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"; + }; + }; + 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 { - name = "ibus-${version}"; - version = "1.5.16"; +in - src = fetchurl { - url = "https://github.com/ibus/ibus/releases/download/${version}/${name}.tar.gz"; - sha256 = "07py16jb81kd7vkqhcia9cb2avsbg5jswp2kzf0k4bprwkxppd9n"; +stdenv.mkDerivation rec { + name = "ibus-${version}"; + version = "1.5.17"; + + 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/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix index bba55acc060..96b88714178 100644 --- a/pkgs/tools/inputmethods/uim/default.nix +++ b/pkgs/tools/inputmethods/uim/default.nix @@ -6,10 +6,7 @@ , withGtk3 ? withGtk, gtk3 ? null , withQt ? true , withQt4 ? withQt, qt4 ? null -, withKde ? withQt -, withKde4 ? withKde && withQt4, kdelibs4 ? null, automoc4 ? null -, withKNotify4 ? false -, withLibnotify ? !withKNotify4, libnotify ? null +, withLibnotify ? true, libnotify ? null , withSqlite ? true, sqlite ? null , withNetworking ? true, curl ? null, openssl ? null , withFFI ? true, libffi ? null @@ -24,9 +21,7 @@ assert withAnthy -> anthy != null; assert withGtk2 -> gtk2 != null; assert withGtk3 -> gtk3 != null; assert withQt4 -> qt4 != null; -assert withKde4 -> withQt4 && kdelibs4 != null && automoc4 != null; -assert withKNotify4 -> withKde4 && !withLibnotify; -assert withLibnotify -> !withKNotify4 && libnotify != null; +assert withLibnotify -> libnotify != null; assert withSqlite -> sqlite != null; assert withNetworking -> curl != null && openssl != null; assert withFFI -> libffi != null; @@ -49,9 +44,6 @@ stdenv.mkDerivation rec { ++ optional withGtk2 gtk2 ++ optional withGtk3 gtk3 ++ optional withQt4 qt4 - ++ optionals withKde4 [ - kdelibs4 automoc4 - ] ++ optional withLibnotify libnotify ++ optional withSqlite sqlite ++ optionals withNetworking [ @@ -76,8 +68,6 @@ stdenv.mkDerivation rec { "--with-qt4" "--with-qt4-immodule" ] - ++ optional withKde4 "--enable-kde4-applet" - ++ optional withKNotify4 "--enable-notify=knotify4" ++ optional withLibnotify "--enable-notify=libnotify" ++ optional withSqlite "--with-sqlite3" ++ optionals withNetworking [ diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix index 143918baa9c..899fb5f643a 100644 --- a/pkgs/tools/misc/bandwidth/default.nix +++ b/pkgs/tools/misc/bandwidth/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { description = "Artificial benchmark for identifying weaknesses in the memory subsystem"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ nckx wkennington ]; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index b8b01a7c0fc..7ea3b1fd279 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bdf2psf-${version}"; - version = "1.170"; + version = "1.175"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "0xh743cr21qk8cmc6ijp59d61dqra4ggdlgbin9v991xqa0mqdxb"; + sha256 = "1bbj6wxdpjhy7n2614z0qx2310vhaxlvism6v6lxancb5bwwgdnf"; }; buildInputs = [ dpkg ]; diff --git a/pkgs/tools/misc/bonfire/default.nix b/pkgs/tools/misc/bonfire/default.nix index 7937a212951..16b2169769f 100644 --- a/pkgs/tools/misc/bonfire/default.nix +++ b/pkgs/tools/misc/bonfire/default.nix @@ -19,7 +19,7 @@ buildPythonApplication rec { postPatch = '' # https://github.com/blue-yonder/bonfire/pull/24 substituteInPlace requirements.txt \ - --replace "arrow>=0.5.4,<0.8" "arrow>=0.5.4,<0.11" \ + --replace "arrow>=0.5.4,<0.8" "arrow>=0.5.4,<0.13" \ --replace "keyring>=9,<10" "keyring>=9,<11" # pip fails when encountering the git hash for the package version substituteInPlace setup.py \ diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix index ea1ac6d116b..8dbcd08fba6 100644 --- a/pkgs/tools/misc/brltty/default.nix +++ b/pkgs/tools/misc/brltty/default.nix @@ -1,35 +1,37 @@ -{ stdenv, fetchurl, pkgconfig, alsaSupport, alsaLib ? null, bluez, systemdSupport, systemd ? null }: +{ stdenv, fetchurl, pkgconfig, python3, alsaSupport, alsaLib ? null, bluez, systemdSupport, systemd ? null }: assert alsaSupport -> alsaLib != null; assert systemdSupport -> systemd != null; stdenv.mkDerivation rec { name = "brltty-5.5"; - + src = fetchurl { url = "http://brltty.com/archive/${name}.tar.gz"; sha256 = "0slrqanwj9cm7ql0rpb296xq676zrc1sjyr13lh5lygp4b8qfpci"; }; - - nativeBuildInputs = [ pkgconfig ]; + + nativeBuildInputs = [ pkgconfig python3.pkgs.cython ]; buildInputs = [ bluez ] ++ stdenv.lib.optional alsaSupport alsaLib ++ stdenv.lib.optional systemdSupport systemd; - + meta = { description = "Access software for a blind person using a braille display"; longDescription = '' BRLTTY is a background process (daemon) which provides access to the Linux/Unix console (when in text mode) for a blind person using a refreshable braille display. It drives the braille display, and provides complete screen review functionality. - Some speech capability has also been incorporated. + Some speech capability has also been incorporated. ''; homepage = http://www.brltty.com/; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bramd ]; platforms = stdenv.lib.platforms.all; }; - + + makeFlags = [ "PYTHON_PREFIX=$(out)" ]; + preConfigurePhases = [ "preConfigure" ]; preConfigure = '' diff --git a/pkgs/tools/misc/ckb/ckb-modprobe.patch b/pkgs/tools/misc/ckb/ckb-modprobe.patch new file mode 100644 index 00000000000..8024151159c --- /dev/null +++ b/pkgs/tools/misc/ckb/ckb-modprobe.patch @@ -0,0 +1,13 @@ +diff --git a/src/ckb-daemon/usb_linux.c b/src/ckb-daemon/usb_linux.c +index 8673f86..4714305 100644 +--- a/src/ckb-daemon/usb_linux.c ++++ b/src/ckb-daemon/usb_linux.c +@@ -440,7 +440,7 @@ static void udev_enum(){ + + int usbmain(){ + // Load the uinput module (if it's not loaded already) +- if(system("modprobe uinput") != 0) ++ if(system("@kmod@/bin/modprobe uinput") != 0) + ckb_warn("Failed to load uinput module\n"); + + // Create the udev object diff --git a/pkgs/tools/misc/ckb/default.nix b/pkgs/tools/misc/ckb/default.nix index a0dbc6fd4fe..0af90ae2bf2 100644 --- a/pkgs/tools/misc/ckb/default.nix +++ b/pkgs/tools/misc/ckb/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, libudev, pkgconfig, qtbase, qmake, zlib }: +{ stdenv, fetchFromGitHub, substituteAll, libudev, pkgconfig, qtbase, qmake, zlib, kmod }: stdenv.mkDerivation rec { - version = "0.2.8"; + version = "0.2.9"; name = "ckb-next-${version}"; src = fetchFromGitHub { - owner = "mattanger"; + owner = "ckb-next"; repo = "ckb-next"; rev = "v${version}"; - sha256 = "0b3h1d54mdyfcx46zvsd7dfqf2656h4jjkiw044170gnfdzxjb3w"; + sha256 = "0hl41znyhp3k5l9rcgz0gig36gsg95ivrs1dyngv45q9jkr6fchm"; }; buildInputs = [ @@ -24,6 +24,11 @@ stdenv.mkDerivation rec { patches = [ ./ckb-animations-location.patch + (substituteAll { + name = "ckb-modprobe.patch"; + src = ./ckb-modprobe.patch; + inherit kmod; + }) ]; doCheck = false; @@ -39,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Driver and configuration tool for Corsair keyboards and mice"; - homepage = https://github.com/mattanger/ckb-next; + homepage = https://github.com/ckb-next/ckb-next; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ kierdavis ]; diff --git a/pkgs/tools/misc/clex/default.nix b/pkgs/tools/misc/clex/default.nix index b9e3fc179d5..2f442a7a9c1 100644 --- a/pkgs/tools/misc/clex/default.nix +++ b/pkgs/tools/misc/clex/default.nix @@ -25,6 +25,5 @@ stdenv.mkDerivation rec { homepage = http://www.clex.sk; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix index a70cba3f3d0..2181e1cb916 100644 --- a/pkgs/tools/misc/clipster/default.nix +++ b/pkgs/tools/misc/clipster/default.nix @@ -1,27 +1,25 @@ -{fetchFromGitHub , stdenv, makeWrapper, python3, gtk3, libwnck3 }: +{fetchFromGitHub , stdenv, python3, gtk3, libwnck3, + gobjectIntrospection, wrapGAppsHook }: stdenv.mkDerivation rec { name = "clipster-${version}"; - version = "1.2.5"; + version = "1.5.0"; src = fetchFromGitHub { owner = "mrichar1"; repo = "clipster"; rev = "${version}"; - sha256 = "0yjljpqpcbi84ibbrxbm5cbgs16ada4cmvir744hygrdl948zzk3"; + sha256 = "0bj7fk19z3c29vxm3mcp3s7vggkigmz3hrn4pcsqgfh96i5i5203"; }; pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]); - buildInputs = [ pythonEnv gtk3 libwnck3 ]; - nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ pythonEnv gtk3 libwnck3 gobjectIntrospection wrapGAppsHook ]; installPhase = '' sed -i 's/python/python3/g' clipster mkdir -p $out/bin/ cp clipster $out/bin/ - wrapProgram "$out/bin/clipster" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix index 9894813d955..fd6df64e5e7 100644 --- a/pkgs/tools/misc/cloud-utils/default.nix +++ b/pkgs/tools/misc/cloud-utils/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { # NOTICE: if you bump this, make sure to run # $ nix-build nixos/release-combined.nix -A nixos.tests.ec2-nixops - # growpart is needed in initrd in nixos/modules/virtualisation/grow-partition.nix + # growpart is needed in initrd in nixos/system/boot/grow-partition.nix name = "cloud-utils-${version}"; version = "0.30"; src = fetchurl { diff --git a/pkgs/tools/misc/colord-kde/default.nix b/pkgs/tools/misc/colord-kde/default.nix index a91cd627bda..12821cf864c 100644 --- a/pkgs/tools/misc/colord-kde/default.nix +++ b/pkgs/tools/misc/colord-kde/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { sha256 = "0brdnpflm95vf4l41clrqxwvjrdwhs859n7401wxcykkmw4m0m3c"; }; - nativeBuildInputs = [ extra-cmake-modules ki18n ]; + nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes - kcmutils kio knotifications plasma-framework kwidgetsaddons + kcmutils ki18n kio knotifications plasma-framework kwidgetsaddons kwindowsystem kitemviews lcms2 libXrandr qtx11extras ]; diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 9a422a96d70..589c58d0acc 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -14,11 +14,11 @@ assert selinuxSupport -> libselinux != null && libsepol != null; with lib; stdenv.mkDerivation rec { - name = "coreutils-8.28"; + name = "coreutils-8.29"; src = fetchurl { url = "mirror://gnu/coreutils/${name}.tar.xz"; - sha256 = "0r8c1bgm68kl70j1lgd0rv12iykw6143k4m9a56xip9rc2hv25qi"; + sha256 = "0plm1zs9il6bb5mk881qvbghq4glc8ybbgakk2lfzb0w64fgml4j"; }; patches = optional hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch; diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index db966959785..45995f02c68 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { description = "A program used to control monitor parameters by software"; homepage = http://ddccontrol.sourceforge.net/; license = licenses.gpl2; - platforms = platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = [ stdenv.lib.maintainers.pakhfn ]; }; } diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index 3a243f9fdef..ec9ca37c082 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ddcutil-${version}"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "rockowitz"; repo = "ddcutil"; rev = "v${version}"; - sha256 = "1w9bkrlxlgc58rpf03xfd2qbkj73rlbiqrhy8nhwxqqhsj1kkdb0"; + sha256 = "127a5v545gvfgxqqjxqafsg1p8i4qd5wnpdwccr38jbsphl6yzl4"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/misc/debianutils/default.nix b/pkgs/tools/misc/debianutils/default.nix index 6575c19391c..d93cc479a80 100644 --- a/pkgs/tools/misc/debianutils/default.nix +++ b/pkgs/tools/misc/debianutils/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "4.8.2"; + version = "4.8.4"; name = "debianutils-${version}"; src = fetchurl { url = "mirror://debian/pool/main/d/debianutils/debianutils_${version}.tar.xz"; - sha256 = "0s3w3svcsh984zinkxvpzxi7dc0ginqk0nk299fkrr6k7wlmzssd"; + sha256 = "1chypq3dbkgvl16lgzdvqvlr7cdm3814nqmp8ch8j7x6mscsnqf0"; }; meta = { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { longDescription = '' This package provides a number of small utilities which are used primarily by the installation scripts of Debian packages, although you may use them directly. - The specific utilities included are: add-shell installkernel ischroot remove-shell run-parts savelog tempfile which + The specific utilities included are: add-shell installkernel ischroot remove-shell run-parts savelog tempfile which ''; downloadPage = https://packages.debian.org/sid/debianutils; license = with stdenv.lib.licenses; [ gpl2Plus publicDomain smail ]; diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index a65862a7845..bd5678c651f 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -4,13 +4,13 @@ # There is also cdebootstrap now. Is that easier to maintain? stdenv.mkDerivation rec { name = "debootstrap-${version}"; - version = "1.0.92"; + version = "1.0.93"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz"; - sha256 = "06gp6ivmfh0ks4mibx1mz0pwzjyxqas319s741pp9b3k091jkip1"; + sha256 = "1nyp9fwb7xrk1vin81dmgx2g9rb52yg4gwz4rcx97gamw4mlvbfd"; }; buildInputs = [ dpkg gettext gawk perl ]; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 5b42c811bd2..418d5e38fd7 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, python3Packages, docutils +{ lib, stdenv, fetchgit, python3Packages, docutils, help2man , acl, apktool, libbfd, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, diffutils, dtc , e2fsprogs, file, findutils, fontforge-fonttools, fpc, gettext, ghc, ghostscriptX, giflib, gnupg1, gnutar , gzip, imagemagick, jdk, libarchive, libcaca, llvm, mono, openssh, pdftk, pgpdump, poppler_utils, sng, sqlite @@ -8,12 +8,12 @@ python3Packages.buildPythonApplication rec { name = "diffoscope-${version}"; - version = "87"; + version = "90"; src = fetchgit { url = "git://anonscm.debian.org/reproducible/diffoscope.git"; rev = "refs/tags/${version}"; - sha256 = "0j3pljwmggrpaghbamvr24x4cg5yj7hl2ll27405p7970scnpngv"; + sha256 = "1w16667j6ag2iim1xcy8y9v9965mq50k64wnf693mivddll62704"; }; patches = [ @@ -25,6 +25,8 @@ python3Packages.buildPythonApplication rec { sed -i setup.py -e "/'rpm-python',/d" ''; + nativeBuildInputs = [ docutils help2man ]; + # Still missing these tools: docx2txt enjarify js-beautify oggDump Rscript # Also these libraries: python3-guestfs pythonPath = with python3Packages; [ debian libarchive-c python_magic tlsh rpm ] ++ [ @@ -37,10 +39,12 @@ python3Packages.buildPythonApplication rec { ]; doCheck = false; # Calls 'mknod' in squashfs tests, which needs root + checkInputs = with python3Packages; [ pytest ]; postInstall = '' + make -C doc mkdir -p $out/share/man/man1 - ${docutils}/bin/rst2man.py debian/diffoscope.1.rst $out/share/man/man1/diffoscope.1 + cp doc/diffoscope.1 $out/share/man/man1/diffoscope.1 ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index 85672619d61..2527c34feeb 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ethtool-${version}"; - version = "4.13"; + version = "4.15"; src = fetchurl { url = "mirror://kernel/software/network/ethtool/${name}.tar.xz"; - sha256 = "1flwz4x76ajxigadq9knxgwr778g03y3qfx6c7rflc3x020a7hdp"; + sha256 = "06pr3s7wg2pbvfbf7js61bgh3caff4qf50nqqk3cgz9z90rgvxvi"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 6a7c2cc095d..2681d14665c 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "fd-${version}"; - version = "6.1.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "1md6k531ymsg99zc6y8lni4cpfz4rcklwgibq1i5xdam3hs1n2jg"; + sha256 = "1l1p7jlrryd54jwwrwgvs4njr3r59m8xsh31z7db0bzpw3dk7n5k"; }; - cargoSha256 = "00n2j0mjmd4lrfygnv90mixv3hfv1z56zyqcm957cwq08qavqzf1"; + cargoSha256 = "1dikix9d46f0ydi81ray2vdvsy6y326w8ql6c89zx0p9cjm8m83r"; preFixup = '' mkdir -p "$out/man/man1" diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix new file mode 100644 index 00000000000..55aa146d301 --- /dev/null +++ b/pkgs/tools/misc/flameshot/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, qtbase, qmake, qttools }: + +stdenv.mkDerivation rec { + name = "flameshot-${version}"; + version = "0.5.0"; + + nativeBuildInputs = [ qmake qttools ]; + buildInputs = [ qtbase ]; + + qmakeFlags = [ + # flameshot.pro assumes qmake is being run in a git checkout and uses it + # to determine the version being built. Let's replace that. + "VERSION=${version}" + "PREFIX=/" + ]; + patchPhase = '' + sed -i 's/VERSION =/#VERSION =/g' flameshot.pro + sed -i 's,USRPATH = /usr/local,USRPATH = /,g' flameshot.pro + ''; + + installFlags = [ "INSTALL_ROOT=$(out)" ]; + + src = fetchFromGitHub { + owner = "lupoDharkael"; + repo = "flameshot"; + rev = "v${version}"; + sha256 = "1fy4il7rdj294l9cs642hx23bry25j9phn37274r2b87hwzy1rrv"; + }; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Powerful yet simple to use screenshot software"; + homepage = https://github.com/lupoDharkael/flameshot; + maintainers = [ maintainers.scode ]; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index 2047b77144a..b1e09312658 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, libftdi, pciutils }: +{ lib, stdenv, fetchurl, pkgconfig, libftdi, pciutils }: -let version = "0.9.9"; in +let version = "1.0"; in stdenv.mkDerivation rec { name = "flashrom-${version}"; @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { preConfigure = "export PREFIX=$out"; - meta = { + meta = with lib; { homepage = http://www.flashrom.org; description = "Utility for reading, writing, erasing and verifying flash ROM chips"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.funfunctor ]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl2; + maintainers = with maintainers; [ funfunctor fpletz ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/tools/misc/fpp/default.nix b/pkgs/tools/misc/fpp/default.nix index 2f43dd40f13..6271eb599b5 100644 --- a/pkgs/tools/misc/fpp/default.nix +++ b/pkgs/tools/misc/fpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "fpp-${version}"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "facebook"; repo = "PathPicker"; rev = version; - sha256 = "1mfyr9k5s3l1sg3c9vlyiqg8n1wwppzb981az2xaxqyk95wwl1sa"; + sha256 = "03n8sc2fvs2vk46jv6qfkjbyqz85yxnphvabji7qnmd3jv631w47"; }; postPatch = '' diff --git a/pkgs/tools/misc/fsmon/default.nix b/pkgs/tools/misc/fsmon/default.nix index d3a1a712466..f9e40b6b786 100644 --- a/pkgs/tools/misc/fsmon/default.nix +++ b/pkgs/tools/misc/fsmon/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "fsmon-${version}"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "nowsecure"; repo = "fsmon"; rev = "${version}"; - sha256 = "0sqld41jn142d4zbqmylzrnx1km7xs6r8dnmf453gyhi3yzdbr1j"; + sha256 = "1b99cd5k2zh30sagp3f55jvj1r48scxibv7aqqc2sp82sci59npg"; }; installPhase = '' diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index be002a8c3ad..71cfedcaec7 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -33,6 +33,5 @@ stdenv.mkDerivation rec { homepage = http://gparted.org; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index 11cbd87024f..d4acc063b4d 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "2.3.2"; + version = "2.4.1"; name = "graylog-${version}"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "0mzrhzbyblspia3qp85hvv5kdc7v3aird02q2pxrxbwca6wjlxcs"; + sha256 = "1dps1vvv8b154ayamhjxdgiq101qs4w0nk79j3zb41pdyn2fji4j"; }; dontBuild = true; diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index dfaefc2b2e2..21a624c9d25 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -139,19 +139,6 @@ in { description = "Graylog input plugin that reads MongoDB profiler data"; }; }; - netflow = glPlugin rec { - name = "graylog-netflow-${version}"; - pluginName = "graylog-plugin-netflow"; - version = "0.1.1"; - src = fetchurl { - url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "1pdv12f9dca1rxf62ds51n79cjhkkyj0gjny8kj1cq64vlayc9x9"; - }; - meta = { - homepage = https://github.com/Graylog2/graylog-plugin-netflow; - description = "Graylog NetFlow plugin"; - }; - }; pagerduty = glPlugin rec { name = "graylog-pagerduty-${version}"; pluginName = "graylog-plugin-pagerduty"; @@ -204,19 +191,6 @@ in { description = "Correlate proton density to the response time of your app and the ion temperature to your exception rate."; }; }; - threatintel = glPlugin rec { - name = "graylog-threatintel-${version}"; - pluginName = "graylog-plugin-threatintel"; - version = "0.10.0"; - src = fetchurl { - url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "0clg0vy8aipw122rfqww1lnjriazlnnh77pqiy5vnmv6ycjw0y4i"; - }; - meta = { - homepage = https://github.com/Graylog2/graylog-plugin-threatintel; - description = "Graylog Processing Pipeline functions to enrich log messages with IoC information from threat intelligence databases"; - }; - }; twiliosms = glPlugin rec { name = "graylog-twiliosms-${version}"; pluginName = "graylog-plugin-twiliosms"; diff --git a/pkgs/tools/misc/hakuneko/default.nix b/pkgs/tools/misc/hakuneko/default.nix index e50df02a118..be5e1371cd4 100644 --- a/pkgs/tools/misc/hakuneko/default.nix +++ b/pkgs/tools/misc/hakuneko/default.nix @@ -21,5 +21,8 @@ stdenv.mkDerivation rec { homepage = https://sourceforge.net/projects/hakuneko/; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; + + # This project was abandoned upstream. + broken = true; }; } diff --git a/pkgs/tools/misc/ipad_charge/default.nix b/pkgs/tools/misc/ipad_charge/default.nix index 9fbc915ad2e..9b09fb35cf5 100644 --- a/pkgs/tools/misc/ipad_charge/default.nix +++ b/pkgs/tools/misc/ipad_charge/default.nix @@ -36,6 +36,5 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix index 35d93a3d57c..4410d1e3cd4 100644 --- a/pkgs/tools/misc/jdupes/default.nix +++ b/pkgs/tools/misc/jdupes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "jdupes-${version}"; - version = "1.8"; + version = "1.9"; src = fetchFromGitHub { owner = "jbruchon"; repo = "jdupes"; rev = "v${version}"; - sha256 = "17cgh3j6z4rl8ay06s8387a2c49awfv1w3b2a11z4hidwry37aiq"; + sha256 = "0z6hb4jva0pnk5fb1p59qwyglgrpxgpnz4djq3g00y5yxv3sj9z9"; # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The testdir # directories have such files and will be removed. diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index f5b1b950c13..b8b7666934b 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "Keychain management tool"; - homepage = http://www.funtoo.org/Keychain; + homepage = https://www.funtoo.org/Keychain; license = stdenv.lib.licenses.gpl2; # other platforms are untested (AFAIK) platforms = diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index 10eca3d7002..1f52d83f120 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -3,18 +3,19 @@ , gnupg ? null , goobook ? null , khard ? null +, mu ? null }: let - version = "0.45.3"; + version = "0.46"; in with stdenv.lib; with perlPackages; stdenv.mkDerivation { name = "lbdb-${version}"; src = fetchurl { - url = "http://www.spinnaker.de/debian/lbdb_${version}.tar.gz"; - sha256 = "01lx1nb5nlhwz663v35gg7crd36c78hnipq4z0dqyb9wjigwwg9k"; + url = "http://www.spinnaker.de/lbdb/download/lbdb_${version}.tar.gz"; + sha256 = "16fx02xk98k3friigq2lcgk535xagp3kfnmngni5kw61f7yj6gxi"; }; buildInputs = [ goobook makeWrapper perl ConvertASN1 NetLDAP AuthenSASL ] @@ -22,12 +23,14 @@ stdenv.mkDerivation { ++ optional (abook != null) abook ++ optional (gnupg != null) gnupg ++ optional (goobook != null) goobook - ++ optional (khard != null) khard; + ++ optional (khard != null) khard + ++ optional (mu != null) mu; configureFlags = [ ] ++ optional (abook != null) "--with-abook" ++ optional (gnupg != null) "--with-gpg" ++ optional (goobook != null) "--with-goobook" - ++ optional (khard != null) "--with-khard"; + ++ optional (khard != null) "--with-khard" + ++ optional (mu != null) "--with-mu"; patches = [ ./add-methods-to-rc.patch ]; postFixup = "wrapProgram $out/lib/mutt_ldap_query --prefix PERL5LIB : " diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index f8b687a5c8b..7e5a464764a 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "lf-unstable-${version}"; - version = "2017-10-30"; + version = "2018-01-11"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; - rev = "3f7bd0a62d1a243562e182d9051ebb54f3414aaa"; # nightly - sha256 = "0g6wf4j3dfy3yfkby3wlqajryv4kffqvhljq2q0x482fsrl4vipz"; + rev = "58538c802044a3a2590ebe4979f3c85d807ea2d9"; # nightly + sha256 = "0xp5accliwz1d0nbsc6cnsv38czcfqn5nyxfndkpw8jkh8w2pm9p"; }; goPackagePath = "github.com/gokcehan/lf"; diff --git a/pkgs/tools/misc/lf/deps.nix b/pkgs/tools/misc/lf/deps.nix index 91a0c368d5f..6c1e07667b3 100644 --- a/pkgs/tools/misc/lf/deps.nix +++ b/pkgs/tools/misc/lf/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://github.com/nsf/termbox-go"; - rev = "10cefba34bc5e7a6e5df0836a42513c28a10e074"; # master - sha256 = "05jy6dpva2a1xfsv3yajavbx41gx8hhh5k3k901dnk0118hnyd0w"; + rev = "aa4a75b1c20a2b03751b1a9f7e41d58bd6f71c43"; # master + sha256 = "1xfd0mq6jkq55dx14nksyyfc66qla7cz0xxscpw07b25qmww9518"; }; } { diff --git a/pkgs/tools/misc/loadlibrary/default.nix b/pkgs/tools/misc/loadlibrary/default.nix index 8540a3f785a..bc52598ff80 100644 --- a/pkgs/tools/misc/loadlibrary/default.nix +++ b/pkgs/tools/misc/loadlibrary/default.nix @@ -1,4 +1,4 @@ -{ cabextract, glibc_multi, fetchFromGitHub, readline, stdenv_32bit }: +{ cabextract, fetchFromGitHub, readline, stdenv_32bit }: # stdenv_32bit is needed because the program depends upon 32-bit libraries and does not have # support for 64-bit yet: it requires libc6-dev:i386, libreadline-dev:i386. @@ -14,7 +14,7 @@ stdenv_32bit.mkDerivation rec { sha256 = "01hb7wzfh1s5b8cvmrmr1gqknpq5zpzj9prq3wrpsgg129jpsjkb"; }; - buildInputs = [ glibc_multi cabextract readline stdenv_32bit.cc.libc ]; + buildInputs = [ cabextract readline ]; installPhase = '' mkdir -p $out/bin/ diff --git a/pkgs/tools/misc/logstash/5.x.nix b/pkgs/tools/misc/logstash/5.x.nix index 4ecc0be783e..e528e3e0285 100644 --- a/pkgs/tools/misc/logstash/5.x.nix +++ b/pkgs/tools/misc/logstash/5.x.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; - sha256 = "11qg8i0svsccr1wd0yj0ivfzpza2hd68221g38v88shvj0bb737f"; + sha256 = "0cpim121ydxdjr251by9jw6pidh5b52jl5ldcm7gp015q49x1nl7"; }; dontBuild = true; diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix new file mode 100644 index 00000000000..3eb2648a441 --- /dev/null +++ b/pkgs/tools/misc/logstash/6.x.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, elk6Version, makeWrapper, jre }: + +stdenv.mkDerivation rec { + version = elk6Version; + name = "logstash-${version}"; + + src = fetchurl { + url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; + sha256 = "18680qpdvhr16dx66jfia1zrg52005sgdy9yhl7vdhm4gcr7pxwc"; + }; + + dontBuild = true; + dontPatchELF = true; + dontStrip = true; + dontPatchShebangs = true; + + buildInputs = [ + makeWrapper jre + ]; + + installPhase = '' + mkdir -p $out + cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out + + wrapProgram $out/bin/logstash \ + --set JAVA_HOME "${jre}" + + wrapProgram $out/bin/logstash-plugin \ + --set JAVA_HOME "${jre}" + ''; + + meta = with stdenv.lib; { + description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems"; + homepage = https://www.elastic.co/products/logstash; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ wjlroe offline basvandijk ]; + }; +} diff --git a/pkgs/tools/misc/lolcat/Gemfile.lock b/pkgs/tools/misc/lolcat/Gemfile.lock index 4b318ea1473..a97f1eb9c87 100644 --- a/pkgs/tools/misc/lolcat/Gemfile.lock +++ b/pkgs/tools/misc/lolcat/Gemfile.lock @@ -1,14 +1,17 @@ GEM remote: http://rubygems.org/ specs: - lolcat (42.1.0) - paint (~> 0.8.3) - trollop (~> 1.16.2) - paint (0.8.7) - trollop (1.16.2) + lolcat (90.8.8) + paint (~> 2.0.0) + trollop (~> 2.1.2) + paint (2.0.1) + trollop (2.1.2) PLATFORMS ruby DEPENDENCIES lolcat + +BUNDLED WITH + 1.14.6 diff --git a/pkgs/tools/misc/lolcat/default.nix b/pkgs/tools/misc/lolcat/default.nix index 21377d7bfa4..827484e885f 100644 --- a/pkgs/tools/misc/lolcat/default.nix +++ b/pkgs/tools/misc/lolcat/default.nix @@ -1,16 +1,19 @@ -{ stdenv, lib, bundlerEnv, gpgme, ruby, ncurses, writeText, zlib, xapian -, pkgconfig, which }: +{ lib, bundlerEnv, ruby }: + +bundlerEnv rec { + name = "${pname}-${version}"; + pname = "lolcat"; + version = (import ./gemset.nix).lolcat.version; -bundlerEnv { inherit ruby; - pname = "lolcat"; + # expects Gemfile, Gemfile.lock and gemset.nix in the same directory gemdir = ./.; meta = with lib; { description = "A rainbow version of cat"; homepage = https://github.com/busyloop/lolcat; - license = licenses.wtfpl; - maintainers = with maintainers; [ pSub ]; + license = licenses.bsd3; + maintainers = with maintainers; [ StillerHarpo ]; }; } diff --git a/pkgs/tools/misc/lolcat/gemset.nix b/pkgs/tools/misc/lolcat/gemset.nix index 85acf7767a8..6d0962780f4 100644 --- a/pkgs/tools/misc/lolcat/gemset.nix +++ b/pkgs/tools/misc/lolcat/gemset.nix @@ -1,27 +1,27 @@ { - "lolcat" = { - version = "42.1.0"; + lolcat = { + dependencies = ["paint" "trollop"]; source = { + remotes = ["http://rubygems.org"]; + sha256 = "1q031wq8wvp09llb39w0ql5k1zkblvkbmhlvrkc3ym832pibk06f"; type = "gem"; - sha256 = "1jp0g7k958dg709dm1qs7nr8dmi4vlgvmcvqcr1zhk8ygx89rwgc"; }; - dependencies = [ - "paint" - "trollop" - ]; + version = "90.8.8"; }; - "paint" = { - version = "0.8.7"; + paint = { source = { + remotes = ["http://rubygems.org"]; + sha256 = "1gnh9cihc84w4xbw51pg15crjvhblbq6nkzljrp7kmn3434nsg0d"; type = "gem"; - sha256 = "0nl1x0190d44bfczlxdy16gxsvm95y14kxv3k9n92h9ap2zvdyd8"; }; + version = "2.0.1"; }; - "trollop" = { - version = "1.16.2"; + trollop = { source = { + remotes = ["http://rubygems.org"]; + sha256 = "0415y63df86sqj43c0l82and65ia5h64if7n0znkbrmi6y0jwhl8"; type = "gem"; - sha256 = "0frrp90dw266h3kf9g925dppir9l7p8jxknw6dn5nz6fa6c4g5lg"; }; + version = "2.1.2"; }; } \ No newline at end of file diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix index 4c4204badb1..e81fa7958b5 100644 --- a/pkgs/tools/misc/mbuffer/default.nix +++ b/pkgs/tools/misc/mbuffer/default.nix @@ -3,12 +3,12 @@ } : stdenv.mkDerivation rec { - version = "20170806"; + version = "20171011"; name = "mbuffer-${version}"; src = fetchurl { url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz"; - sha256 = "0kbvxrd1k0509whgyl7w20cmqn5q16vjjh7d9glpl2j4lfd66ljw"; + sha256 = "1z6is359dnlf61n6ida9ivghafzz5m8cf4hzdhma8nxv12brfbzb"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index dbb80067e6d..a8d08018c74 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "moreutils-${version}"; - version = "0.61"; + version = "0.62"; src = fetchgit { url = "git://git.joeyh.name/moreutils"; rev = "refs/tags/${version}"; - sha256 = "1qvwlq0a2zs7qkjqc9c842979axkjfdr7nic1gsm4zc6jd72y7pr"; + sha256 = "0sk7rgqsqbdwr69mh7y4v9lv4v0nfmsrqgvbpy2gvy82snhfzar2"; }; preBuild = '' diff --git a/pkgs/tools/misc/mrtg/default.nix b/pkgs/tools/misc/mrtg/default.nix index 5a427888857..7657b072aa8 100644 --- a/pkgs/tools/misc/mrtg/default.nix +++ b/pkgs/tools/misc/mrtg/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "mrtg-${version}"; src = fetchurl { - url = "http://oss.oetiker.ch/mrtg/pub/${name}.tar.gz"; + url = "https://oss.oetiker.ch/mrtg/pub/${name}.tar.gz"; sha256 = "0r93ipscfp7py0b1dcx65s58q7dlwndqhprf8w4945a0h2p7zyjy"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "The Multi Router Traffic Grapher"; - homepage = http://oss.oetiker.ch/mrtg/; + homepage = https://oss.oetiker.ch/mrtg/; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.robberer ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/misc/ms-sys/default.nix b/pkgs/tools/misc/ms-sys/default.nix index 744e5d99ef5..4a50f7200bb 100644 --- a/pkgs/tools/misc/ms-sys/default.nix +++ b/pkgs/tools/misc/ms-sys/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ms-sys-${version}"; version = "2.5.3"; - + src = fetchurl { url = "mirror://sourceforge/ms-sys/${name}.tar.gz"; sha256 = "0mijf82cbji4laip6hiy3l5ka5mzq5sivjvyv7wxnc2fd3v7hgp0"; }; - buildInputs = [ gettext ]; + nativeBuildInputs = [ gettext ]; enableParallelBuilding = true; @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { description = "A program for writing Microsoft-compatible boot records"; homepage = http://ms-sys.sourceforge.net/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ nckx ]; platforms = with platforms; linux; }; } diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index 1cb71ce9dd6..330210269d5 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ncdu-${version}"; - version = "1.12"; + version = "1.13"; src = fetchurl { url = "http://dev.yorhel.nl/download/${name}.tar.gz"; - sha256 = "16j9fyw73y1lk05a35i4q9i66laklgsx41lz5rxfr8m28x3lw3l2"; + sha256 = "0ni56ymlii577src4dzfbrq1mznbf6i0nka4bvh2sb1971f2ingl"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/parallel-rust/default.nix b/pkgs/tools/misc/parallel-rust/default.nix new file mode 100644 index 00000000000..699fe4cf971 --- /dev/null +++ b/pkgs/tools/misc/parallel-rust/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + name = "parallel-rust-${version}"; + version = "0.11.3"; + + src = fetchFromGitHub { + owner = "mmstick"; + repo = "parallel"; + rev = version; + sha256 = "1bb1m3ckkrxlnw9w24ig70bd1zwyrbaw914q3xz5yv43c0l6pn9c"; + }; + + cargoSha256 = "0p3wpjz3jrqjasi39zq6q54dhpymc5jp0mfsnzbq6dvz18s8m588"; + + patches = [ ./fix_cargo_lock_version.patch ]; + + meta = with stdenv.lib; { + description = "A command-line CPU load balancer written in Rust"; + homepage = https://github.com/mmstick/parallel; + license = licenses.mit; + maintainers = []; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/parallel-rust/fix_cargo_lock_version.patch b/pkgs/tools/misc/parallel-rust/fix_cargo_lock_version.patch new file mode 100644 index 00000000000..75a1ba35e12 --- /dev/null +++ b/pkgs/tools/misc/parallel-rust/fix_cargo_lock_version.patch @@ -0,0 +1,12 @@ +diff --git a/Cargo.lock b/Cargo.lock +index c01308d..dba3927 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1,6 +1,6 @@ + [root] + name = "parallel" +-version = "0.11.2" ++version = "0.11.3" + dependencies = [ + "arrayvec 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", + "itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 676db3ab69c..e85d26fb058 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20171022"; + name = "parallel-20180122"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "18pq10npl7g764ww7cy9r5n5s3kiy984jclf932qfgndcxsbpqpp"; + sha256 = "1wkbppb4mc56grl6jsp803sf0hm7mg5ff7qmxalp7sd0vxqw41p9"; }; nativeBuildInputs = [ makeWrapper perl ]; diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix index bfafe0151a0..dfd81bd9742 100644 --- a/pkgs/tools/misc/picocom/default.nix +++ b/pkgs/tools/misc/picocom/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "picocom-${version}"; - version = "2.2"; + version = "3.0"; src = fetchFromGitHub { owner = "npat-efault"; repo = "picocom"; rev = version; - sha256 = "06b2ic34dnxc73cprc5imi3iamlhsv623sbg9vj5h5rvs586dwjx"; + sha256 = "1i75ksm44la8kn82v71hzq0q5642y108rascdb94zilhagdhilk2"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/profile-cleaner/default.nix b/pkgs/tools/misc/profile-cleaner/default.nix index 4ee33df716b..0417c8ed0b7 100644 --- a/pkgs/tools/misc/profile-cleaner/default.nix +++ b/pkgs/tools/misc/profile-cleaner/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, parallel, sqlite, bc }: +{ stdenv, fetchFromGitHub, makeWrapper, parallel, sqlite, bc, file }: stdenv.mkDerivation rec { version = "2.36"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = '' PREFIX=\"\" DESTDIR=$out make install wrapProgram $out/bin/profile-cleaner \ - --prefix PATH : "${stdenv.lib.makeBinPath [ parallel sqlite bc ]}" + --prefix PATH : "${stdenv.lib.makeBinPath [ parallel sqlite bc file ]}" ''; meta = { diff --git a/pkgs/tools/misc/pubs/default.nix b/pkgs/tools/misc/pubs/default.nix new file mode 100644 index 00000000000..aa8c43b7cdd --- /dev/null +++ b/pkgs/tools/misc/pubs/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonApplication rec { + name = "pubs-${version}"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "pubs"; + repo = "pubs"; + rev = "v${version}"; + sha256 = "0n5wbjx9wqy6smfg625mhma739jyg7c92766biaiffp0a2bzr475"; + }; + + propagatedBuildInputs = with python3Packages; [ + dateutil configobj bibtexparser pyyaml requests beautifulsoup4 + pyfakefs ddt + ]; + + preCheck = '' + # API tests require networking + rm tests/test_apis.py + + # pyfakefs works weirdly in the sandbox + export HOME=/ + ''; + + meta = with stdenv.lib; { + description = "Command-line bibliography manager"; + homepage = https://github.com/pubs/pubs; + license = licenses.lgpl3; + maintainers = with maintainers; [ gebner ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/scanmem/default.nix b/pkgs/tools/misc/scanmem/default.nix index 132012de123..bd760adecf7 100644 --- a/pkgs/tools/misc/scanmem/default.nix +++ b/pkgs/tools/misc/scanmem/default.nix @@ -1,26 +1,26 @@ { stdenv, autoconf, automake, intltool, libtool, fetchFromGitHub, readline }: stdenv.mkDerivation rec { - version = "0.16"; + version = "0.17"; name = "scanmem-${version}"; - + src = fetchFromGitHub { owner = "scanmem"; repo = "scanmem"; rev = "v${version}"; - sha256 = "131rx6cpnlz2x36r0ry80gqapmxpz2qc3h0040xhvp7ydmd4fyjd"; + sha256 = "17p8sh0rj8yqz36ria5bp48c8523zzw3y9g8sbm2jwq7sc27i7s9"; }; nativeBuildInputs = [ autoconf automake intltool libtool ]; buildInputs = [ readline ]; - + preConfigure = '' ./autogen.sh ''; meta = with stdenv.lib; { homepage = https://github.com/scanmem/scanmem; description = "Memory scanner for finding and poking addresses in executing processes"; - maintainers = [ maintainers.chattered ]; + maintainers = [ maintainers.chattered ]; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index 4b7857d60e7..52a57629cd1 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -70,6 +70,6 @@ stdenv.mkDerivation rec { homepage = http://snapper.io; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ nckx tstrobel ]; + maintainers = with maintainers; [ tstrobel ]; }; } diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 5999fa31622..f0fa1c19888 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -5,13 +5,13 @@ let inherit (pythonPackages) python nose pycrypto requests mock; in stdenv.mkDerivation rec { name = "svtplay-dl-${version}"; - version = "1.9.6"; + version = "1.9.7"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "11xw4whh60k61i8akd7avb254mmffaig72kb7w6prk1kjq05js2s"; + sha256 = "0zj102ir08s9knqqv8y6vy9rkrgk77xs7kqp00v9fzrlqyspf68r"; }; pythonPaths = [ pycrypto requests ]; @@ -34,7 +34,12 @@ in stdenv.mkDerivation rec { ''; doCheck = true; - checkPhase = "sh scripts/run-tests.sh -2"; + checkPhase = '' + sed -i "/def test_parse_m3u8/i\\ + @unittest.skip('requires internet')" lib/svtplay_dl/tests/hls.py + + sh scripts/run-tests.sh -2 + ''; meta = with stdenv.lib; { homepage = https://github.com/spaam/svtplay-dl; diff --git a/pkgs/tools/misc/testdisk/default.nix b/pkgs/tools/misc/testdisk/default.nix index 312c0ae6db5..80cbf3661da 100644 --- a/pkgs/tools/misc/testdisk/default.nix +++ b/pkgs/tools/misc/testdisk/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, libjpeg, e2fsprogs, zlib, openssl, libuuid, ntfs3g }: stdenv.mkDerivation { - name = "testdisk-7.0"; + name = "testdisk-7.1"; src = fetchurl { url = http://www.cgsecurity.org/testdisk-7.0.tar.bz2; - sha256 = "00bb3b6b22e6aba88580eeb887037aef026968c21a87b5f906c6652cbee3442d"; + sha256 = "0ba4wfz2qrf60vwvb1qsq9l6j0pgg81qgf7fh22siaz649mkpfq0"; }; buildInputs = [ ncurses libjpeg zlib openssl libuuid ] @@ -14,7 +14,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { - homepage = http://www.cgsecurity.org/wiki/TestDisk; + homepage = https://www.cgsecurity.org/wiki/TestDisk; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.eelco ]; diff --git a/pkgs/tools/misc/tewisay/default.nix b/pkgs/tools/misc/tewisay/default.nix new file mode 100644 index 00000000000..2d713ae3821 --- /dev/null +++ b/pkgs/tools/misc/tewisay/default.nix @@ -0,0 +1,36 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper }: + +buildGoPackage rec { + name = "tewisay-unstable-${version}"; + version = "2017-04-14"; + + goPackagePath = "github.com/lucy/tewisay"; + + src = fetchFromGitHub { + owner = "lucy"; + repo = "tewisay"; + rev = "e3fc38737cedb79d93b8cee07207c6c86db4e488"; + sha256 = "1na3xi4z90v8qydcvd3454ia9jg7qhinciy6kvgyz61q837cw5dk"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + goDeps = ./deps.nix; + + postInstall = '' + install -D -t $bin/share/tewisay/cows go/src/${goPackagePath}/cows/*.cow + ''; + + preFixup = '' + wrapProgram $bin/bin/tewisay \ + --prefix COWPATH : $bin/share/tewisay/cows + ''; + + meta = { + homepage = https://github.com/lucy/tewisay; + description = "Cowsay replacement with unicode and partial ansi escape support"; + license = stdenv.lib.licenses.cc0; + maintainers = [ stdenv.lib.maintainers.chiiruno ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/tools/misc/tewisay/deps.nix b/pkgs/tools/misc/tewisay/deps.nix new file mode 100644 index 00000000000..b6b1356dcf8 --- /dev/null +++ b/pkgs/tools/misc/tewisay/deps.nix @@ -0,0 +1,21 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "97311d9f7767e3d6f422ea06661bc2c7a19e8a5d"; + sha256 = "0dxlrzn570xl7gb11hjy1v4p3gw3r41yvqhrffgw95ha3q9p50cg"; + }; + } + { + goPackagePath = "github.com/ogier/pflag"; + fetch = { + type = "git"; + url = "https://github.com/ogier/pflag"; + rev = "45c278ab3607870051a2ea9040bb85fcb8557481"; + sha256 = "0620v75wppfd84d95n312wpngcb73cph4q3ivs1h0waljfnsrd5l"; + }; + } +] diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix index 5cf29c5cd42..bb03b9a809b 100644 --- a/pkgs/tools/misc/tldr/default.nix +++ b/pkgs/tools/misc/tldr/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; homepage = http://tldr-pages.github.io; license = licenses.mit; - maintainers = with maintainers; [ taeer nckx ]; + maintainers = with maintainers; [ taeer ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index 3614ec3bc68..91eeb6b0a51 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -14,13 +14,13 @@ let in stdenv.mkDerivation rec { name = "tlp-${version}"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "linrunner"; repo = "TLP"; rev = "${version}"; - sha256 = "0gq1y1qnzwyv7cw32g4ymlfssi2ayrbnd04y4l242k6n41d05bij"; + sha256 = "01bhb9hdsck1g2s5jvafr3ywml9k2qz7x2cf42a3z8g5d23pdfpy"; }; makeFlags = [ "DESTDIR=$(out)" diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix index a528f5f394f..de6c1612396 100644 --- a/pkgs/tools/misc/tmate/default.nix +++ b/pkgs/tools/misc/tmate/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://tmate.io/; + homepage = https://tmate.io/; description = "Instant Terminal Sharing"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix index b41f3890538..938092c2387 100644 --- a/pkgs/tools/misc/tmuxinator/default.nix +++ b/pkgs/tools/misc/tmuxinator/default.nix @@ -8,23 +8,23 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "tmuxinator"; - version = "0.10.0"; - sha256 = "199pq15qknpcafw8ryb9kk1jsrwnncg6k5l9d4n0nmms4knxlqlf"; + version = "0.10.1"; + source.sha256 = "0rjy2glqwbz07ci0snycq19myfczd2pry2iw4g0nqsw37wclm1vi"; erubis = buildRubyGem rec { inherit ruby; name = "ruby${ruby.version}-${gemName}-${version}"; gemName = "erubis"; version = "2.7.0"; - sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; + source.sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; }; thor = buildRubyGem rec { inherit ruby; name = "ruby${ruby.version}-${gemName}-${version}"; gemName = "thor"; - version = "0.19.1"; - sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; + version = "0.20.0"; + source.sha256 = "0nmqpyj642sk4g16nkbq6pj856adpv91lp4krwhqkh2iw63aszdl"; }; xdg = buildRubyGem rec { @@ -32,7 +32,7 @@ buildRubyGem rec { name = "ruby${ruby.version}-${gemName}-${version}"; gemName = "xdg"; version = "2.2.3"; - sha256 = "1bn47fdbwxqbdvjcfg86i32hmwm36k0xl876kb85f5da5v84lzmq"; + source.sha256 = "1bn47fdbwxqbdvjcfg86i32hmwm36k0xl876kb85f5da5v84lzmq"; }; propagatedBuildInputs = [ erubis thor xdg ]; diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index 24486980b4b..33a4ebd70b3 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -1,26 +1,29 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchurl, python }: -pythonPackages.buildPythonApplication rec { - name = "tmuxp-${version}"; - version = "1.3.4"; +with python.pkgs; - namePrefix = ""; +buildPythonApplication rec { + pname = "tmuxp"; + version = "1.3.5"; - src = fetchurl { - url = "mirror://pypi/t/tmuxp/${name}.tar.gz"; - sha256 = "149n35rr27n2c6yna1bla20x3w1zz9gxnjj3m3xxdfp4fbsd2y31"; + src = fetchPypi { + inherit pname version; + sha256 = "bdbbbf5980d6ec21838396a46cd5b599787e8540782b8e2e3f20d2135560a5d3"; }; - patchPhase = '' + postPatch = '' sed -i 's/==.*$//' requirements/base.txt requirements/test.txt ''; - buildInputs = with pythonPackages; [ - pytest_29 + checkInputs = [ + pytest pytest-rerunfailures ]; - propagatedBuildInputs = with pythonPackages; [ + # No tests in archive + doCheck = false; + + propagatedBuildInputs = [ click colorama kaptan libtmux ]; diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/pkgs/tools/misc/ttfautohint/default.nix index 5dcaea3ec1e..decbddcd477 100644 --- a/pkgs/tools/misc/ttfautohint/default.nix +++ b/pkgs/tools/misc/ttfautohint/default.nix @@ -1,23 +1,27 @@ -{ stdenv, lib, fetchurl, pkgconfig, freetype, harfbuzz, libiconv, qtbase, enableGUI ? true }: +{ + stdenv, lib, fetchurl, pkgconfig, autoreconfHook +, freetype, harfbuzz, libiconv, qtbase +, enableGUI ? true +}: stdenv.mkDerivation rec { - version = "1.7"; + version = "1.8.1"; name = "ttfautohint-${version}"; src = fetchurl { url = "mirror://savannah/freetype/${name}.tar.gz"; - sha256 = "1wh783pyg79ks5qbni61x7qngdhyfc33swrkcl5r1czdwhhlif9x"; + sha256 = "1yflnydzdfkr8bi29yf42hb6h6525a4rdid3w8qjfk8rpqh53pqj"; }; - postPatch = '' + postAutoreconf = '' substituteInPlace configure --replace "macx-g++" "macx-clang" ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ freetype harfbuzz libiconv ] ++ lib.optional enableGUI qtbase; - configureFlags = lib.optional (!enableGUI) "--with-qt=no"; + configureFlags = [ ''--with-qt=${if enableGUI then "${qtbase}/lib" else "no"}'' ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/ttwatch/default.nix b/pkgs/tools/misc/ttwatch/default.nix index 3ea58546ace..d7e1171064c 100644 --- a/pkgs/tools/misc/ttwatch/default.nix +++ b/pkgs/tools/misc/ttwatch/default.nix @@ -1,19 +1,22 @@ -{ stdenv, fetchFromGitHub, cmake, perl, openssl, curl, libusb1 }: +{ stdenv, fetchFromGitHub, cmake, perl, openssl, curl, libusb1 +, enableUnsafe ? false }: stdenv.mkDerivation rec { name = "ttwatch-${version}"; - version = "2017-10-31"; + version = "2018-02-01"; src = fetchFromGitHub { owner = "ryanbinns"; repo = "ttwatch"; - rev = "f4103bdeb612a216ac21747941b3df943d67c48c"; - sha256 = "0fylycdi0g119d21l11yz23cjjhr3qdxjv02vz86zkc15kyvgsas"; + rev = "b5c54647ed9b640584e53c4c15ee12d210790021"; + sha256 = "136sskz9hnbwp49gxp983mswzgpl8yfc25ni79csbsnwp0k4lb94"; }; nativeBuildInputs = [ cmake perl ]; buildInputs = [ openssl curl libusb1 ]; + cmakeFlags = stdenv.lib.optional enableUnsafe [ "-Dunsafe=on" ]; + preFixup = '' chmod +x $out/bin/ttbin2mysports ''; diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix index 90758e909e5..f66f6c3642e 100644 --- a/pkgs/tools/misc/units/default.nix +++ b/pkgs/tools/misc/units/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "units-${version}"; - version = "2.14"; + version = "2.16"; src = fetchurl { url = "mirror://gnu/units/${name}.tar.gz"; - sha256 = "9d33893d82f3ddd831d5822992007c40bcd0826ae67d3cbc96539951fb0a82e8"; + sha256 = "11hnp3gcmcc5kci2caxw4hs6m08h2mhqs3xzqq7iafx1ha2ggwyw"; }; buildInputs = [ readline ]; diff --git a/pkgs/tools/misc/vmtouch/default.nix b/pkgs/tools/misc/vmtouch/default.nix index 9fea1b85f6a..820c5a65c74 100644 --- a/pkgs/tools/misc/vmtouch/default.nix +++ b/pkgs/tools/misc/vmtouch/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Portable file system cache diagnostics and control"; longDescription = "vmtouch is a tool for learning about and controlling the file system cache of unix and unix-like systems."; - homepage = http://hoytech.com/vmtouch/; + homepage = https://hoytech.com/vmtouch/; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.garrison ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index c1091d47c5a..9899e38c854 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -1,16 +1,27 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub }: +{ stdenv, python3Packages, fetchFromGitHub, glibcLocales }: +with python3Packages; buildPythonApplication rec { name = "wakatime-${version}"; - version = "10.0.1"; + version = "10.1.0"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime"; rev = version; - sha256 = "1bg8fzd3rdc6na0a7z1d55m2gbnfq6d72mf2jlyzc817r6dr4bfx"; + sha256 = "0mq1b5hwm03jz1mhlfiwi8k5r6556r1nfv9h7qs3y32zrj9mvifv"; }; + # needs more dependencies from https://github.com/wakatime/wakatime/blob/191b302bfb5f272ae928c6d3867d06f3dfcba4a8/dev-requirements.txt + # especially nose-capturestderr, which we do not package yet. + doCheck = false; + checkInputs = [ mock testfixtures pytest glibcLocales ]; + + checkPhase = '' + export HOME=$(mktemp -d) LC_ALL=en_US.utf-8 + pytest tests + ''; + meta = with stdenv.lib; { inherit (src.meta) homepage; description = "WakaTime command line interface"; @@ -21,6 +32,5 @@ buildPythonApplication rec { to install the wakatime CLI interface manually. ''; license = licenses.bsd3; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/misc/woof/default.nix b/pkgs/tools/misc/woof/default.nix new file mode 100644 index 00000000000..1fd9f456705 --- /dev/null +++ b/pkgs/tools/misc/woof/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, python }: + +stdenv.mkDerivation rec { + version = "2012-05-31"; + name = "woof-${version}"; + + src = fetchurl { + url = "http://www.home.unix-ag.org/simon/woof-${version}.py"; + sha256 = "d84353d07f768321a1921a67193510bf292cf0213295e8c7689176f32e945572"; + }; + + buildInputs = [ python ]; + + unpackPhase = "true"; + + installPhase = + '' + mkdir -p $out/bin + cp $src $out/bin/woof + chmod +x $out/bin/woof + ''; + + meta = with stdenv.lib; { + homepage = http://www.home.unix-ag.org/simon/woof.html; + description = "Web Offer One File - Command-line utility to easily exchange files over a local network"; + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.unix; + maintainers = with maintainers; [ lschuermann ]; + }; +} + diff --git a/pkgs/tools/misc/xmonad-log/default.nix b/pkgs/tools/misc/xmonad-log/default.nix new file mode 100644 index 00000000000..c39da71e179 --- /dev/null +++ b/pkgs/tools/misc/xmonad-log/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "xmonad-log-${version}"; + version = "0.1.0"; + + goPackagePath = "github.com/xintron/xmonad-log"; + + src = fetchFromGitHub { + owner = "xintron"; + repo = "xmonad-log"; + rev = version; + sha256 = "1il6v0zcjw0pfb1hjj198y94jmlcx255h422ph0f1zr7afqkzmaw"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "xmonad DBus monitoring solution"; + homepage = https://github.com/xintron/xmonad-log; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ joko ]; + }; +} diff --git a/pkgs/tools/misc/xmonad-log/deps.nix b/pkgs/tools/misc/xmonad-log/deps.nix new file mode 100644 index 00000000000..f5a7c7e5dd1 --- /dev/null +++ b/pkgs/tools/misc/xmonad-log/deps.nix @@ -0,0 +1,12 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/godbus/dbus"; + fetch = { + type = "git"; + url = "https://github.com/godbus/dbus"; + rev = "a389bdde4dd695d414e47b755e95e72b7826432c"; + sha256 = "1ckvg15zdsgmbn4mi36cazkb407ixc9mmyf7vwj8b8wi3d00rgn9"; + }; + } +] diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix index 34ac4cb7366..2967892521c 100644 --- a/pkgs/tools/misc/yle-dl/default.nix +++ b/pkgs/tools/misc/yle-dl/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, rtmpdump, php, pythonPackages }: +{ stdenv, fetchFromGitHub, rtmpdump, php, pythonPackages, ffmpeg }: pythonPackages.buildPythonApplication rec { name = "yle-dl-${version}"; - version = "2.28"; + version = "2.30"; src = fetchFromGitHub { owner = "aajanki"; repo = "yle-dl"; rev = version; - sha256 = "1nb3gmkizgkd09slihc2iaf3rh1s7bdhy9zydkfghmqi7nv4mmq0"; + sha256 = "08qqsg0rmp4xfzmla81f0a4vblqfw3rh90wvxm91vbm6937b4i7i"; }; - propagatedBuildInputs = with pythonPackages; [ lxml pyamf pycrypto requests ]; + propagatedBuildInputs = with pythonPackages; [ lxml pyamf pycrypto requests future ffmpeg ]; pythonPath = [ rtmpdump php ]; doCheck = false; # tests require network access diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix new file mode 100644 index 00000000000..3a917040863 --- /dev/null +++ b/pkgs/tools/misc/you-get/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonApplication, fetchPypi }: + +buildPythonApplication rec { + pname = "you-get"; + version = "0.4.1011"; + + # Tests aren't packaged, but they all hit the real network so + # probably aren't suitable for a build environment anyway. + doCheck = false; + + src = fetchPypi { + inherit pname version; + sha256 = "0h6aspnfic30s89xsv6qss1jfka9px4ll60bqrjbds4y0k3h818g"; + }; + + meta = with stdenv.lib; { + description = "A tiny command line utility to download media contents from the web"; + homepage = https://you-get.org; + license = licenses.mit; + maintainers = with maintainers; [ ryneeverett ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index d8af8169a18..c4595a1a94e 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, buildPythonApplication -, zip, ffmpeg, rtmpdump, atomicparsley, pycryptodome, pandoc +{ stdenv, targetPlatform, fetchurl, buildPythonApplication +, zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc # Pandoc is required to build the package's man page. Release tarballs contain a # formatted man page already, though, it will still be installed. We keep the # manpage argument in place in case someone wants to use this derivation to @@ -8,6 +8,7 @@ , generateManPage ? false , ffmpegSupport ? true , rtmpSupport ? true +, phantomjsSupport ? !targetPlatform.isDarwin # phantomjs2 is broken on darwin , hlsEncryptedSupport ? true , makeWrapper }: @@ -15,11 +16,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2017.12.23"; + version = "2018.01.27"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "12m1bjdqm9bsc1f5psnzc203avzwr070xpdr6fqr728am536q845"; + sha256 = "14vbm8pr6xdrdbk8j9k4v82rnalbdpk2lcm7n9wj6z6d441ymji9"; }; nativeBuildInputs = [ makeWrapper ]; @@ -29,14 +30,13 @@ buildPythonApplication rec { # Ensure ffmpeg is available in $PATH for post-processing & transcoding support. # rtmpdump is required to download files over RTMP # atomicparsley for embedding thumbnails - postInstall = let - packagesToBinPath = - [ atomicparsley ] - ++ optional ffmpegSupport ffmpeg - ++ optional rtmpSupport rtmpdump; - in '' - wrapProgram $out/bin/youtube-dl --prefix PATH : "${makeBinPath packagesToBinPath}" - ''; + makeWrapperArgs = let + packagesToBinPath = + [ atomicparsley ] + ++ optional ffmpegSupport ffmpeg + ++ optional rtmpSupport rtmpdump + ++ optional phantomjsSupport phantomjs2; + in [ ''--prefix PATH : "${makeBinPath packagesToBinPath}"'' ]; # Requires network doCheck = false; diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix index 36dd8339f26..c3bb28bc1a5 100644 --- a/pkgs/tools/misc/yubikey-personalization/default.nix +++ b/pkgs/tools/misc/yubikey-personalization/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yubikey-personalization-${version}"; - version = "1.18.0"; + version = "1.18.1"; src = fetchurl { url = "https://developers.yubico.com/yubikey-personalization/Releases/ykpers-${version}.tar.gz"; - sha256 = "1bc2z6y2x7bbqn7ink2dg3wrgqzlcq2zxxg0cdcxy6jm7c9kwcyg"; + sha256 = "0mjjkk6p8d0kblj6vzld4v188y40ynprvd2hnfh7m1hs28wbkzcz"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index 5a56430c20e..2e982d0f912 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, libpcap, openssl, zlib, wirelesstools, libnl, pkgconfig }: +{ stdenv, fetchurl, libpcap, openssl, zlib, wirelesstools +, iw, ethtool, pciutils, libnl, pkgconfig, makeWrapper }: stdenv.mkDerivation rec { name = "aircrack-ng-1.2-rc4"; @@ -8,19 +9,25 @@ stdenv.mkDerivation rec { sha256 = "0dpzx9kddxpgzmgvdpl3rxn0jdaqhm5wxxndp1xd7d75mmmc2fnr"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libpcap openssl zlib libnl ]; + nativeBuildInputs = [ pkgconfig makeWrapper ]; + buildInputs = [ libpcap openssl zlib libnl iw ethtool pciutils ]; patchPhase = '' sed -e 's@^prefix.*@prefix = '$out@ -i common.mak sed -e 's@/usr/local/bin@'${wirelesstools}@ -i src/osdep/linux.c - ''; + ''; + + postFixup = '' + wrapProgram $out/bin/airmon-ng --prefix PATH : ${stdenv.lib.makeBinPath [ + ethtool iw pciutils + ]} + ''; meta = with stdenv.lib; { description = "Wireless encryption cracking tools"; homepage = http://www.aircrack-ng.org/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ domenkozar viric garbas chaoflow nckx ]; + maintainers = with maintainers; [ domenkozar viric garbas chaoflow ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 079beedcc07..29186906d27 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "aria2-${version}"; - version = "1.33.0"; + version = "1.33.1"; src = fetchFromGitHub { owner = "aria2"; repo = "aria2"; rev = "release-${version}"; - sha256 = "07i9wrj7bs9770ppx943zgn8j9zvffxg2pib4w5ljxapqldhwrsq"; + sha256 = "0ai84ijgsvnixwhxkj8if2mj9hcg2a41w81vy8bdvi89h3bmq9zf"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/tools/networking/bud/default.nix b/pkgs/tools/networking/bud/default.nix index 48ae772e127..c0383b7c822 100644 --- a/pkgs/tools/networking/bud/default.nix +++ b/pkgs/tools/networking/bud/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { buildInputs = [ python gyp ] ++ lib.optional stdenv.isLinux utillinux; - + buildPhase = '' python ./gyp_bud -f make make -C out ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp out/Release/bud $out/bin ''; diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index 0dc3d02d154..f40b1ce6f4c 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { "--enable-datafiles" "--enable-pptp" "--with-pptp=${pptp}/sbin/pptp" + "--enable-iwd" ]; postInstall = '' diff --git a/pkgs/tools/networking/darkstat/default.nix b/pkgs/tools/networking/darkstat/default.nix index ce371e74ee0..4ec23862522 100644 --- a/pkgs/tools/networking/darkstat/default.nix +++ b/pkgs/tools/networking/darkstat/default.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { ''; homepage = http://unix4lyfe.org/darkstat; license = licenses.gpl2; - maintainers = with maintainers; [ nckx ]; platforms = with platforms; unix; }; } diff --git a/pkgs/tools/networking/dhcping/default.nix b/pkgs/tools/networking/dhcping/default.nix index 19c2383c1c2..2599e822529 100644 --- a/pkgs/tools/networking/dhcping/default.nix +++ b/pkgs/tools/networking/dhcping/default.nix @@ -28,6 +28,5 @@ stdenv.mkDerivation rec { homepage = http://www.mavetju.org/unix/general.php; license = licenses.bsd2; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix index 5edeee715c2..95bfdca6315 100644 --- a/pkgs/tools/networking/dnscrypt-proxy/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "1.9.5"; src = fetchurl { - url = "https://download.dnscrypt.org/dnscrypt-proxy/${name}.tar.bz2"; + url = "https://launchpad.net/ubuntu/+archive/primary/+files/${name}.orig.tar.gz"; sha256 = "1dhvklr4dg2vlw108n11xbamacaryyg3dbrg629b76lp7685p7z8"; }; diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix new file mode 100644 index 00000000000..8941494e316 --- /dev/null +++ b/pkgs/tools/networking/eternal-terminal/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, cmake, gflags, glog, libsodium, protobuf }: + +stdenv.mkDerivation rec { + name = "eternal-terminal-${version}"; + version = "4.1.2"; + + src = fetchFromGitHub { + owner = "MisterTea"; + repo = "EternalTCP"; + rev = "refs/tags/et-v${version}"; + sha256 = "1zy30ccsddgs2wqwxphnx5i00j4gf69lr68mzg9x6imqfz0sbcjz"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ gflags glog libsodium protobuf ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Remote shell that automatically reconnects without interrupting the session"; + license = licenses.asl20; + homepage = https://mistertea.github.io/EternalTCP/; + platforms = platforms.linux; + maintainers = [ maintainers.dezgeg ]; + }; +} diff --git a/pkgs/tools/networking/gandi-cli/default.nix b/pkgs/tools/networking/gandi-cli/default.nix index c2bf6702c5f..be488e788b4 100644 --- a/pkgs/tools/networking/gandi-cli/default.nix +++ b/pkgs/tools/networking/gandi-cli/default.nix @@ -22,7 +22,6 @@ buildPythonPackage rec { description = "Command-line interface to the public Gandi.net API"; homepage = http://cli.gandi.net/; license = licenses.gpl3Plus; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/networking/hans/default.nix b/pkgs/tools/networking/hans/default.nix index 2e84aa96007..82e105c3a3b 100644 --- a/pkgs/tools/networking/hans/default.nix +++ b/pkgs/tools/networking/hans/default.nix @@ -34,6 +34,5 @@ stdenv.mkDerivation rec { homepage = http://code.gerade.org/hans/; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/networking/hss/default.nix b/pkgs/tools/networking/hss/default.nix index cfc9986b0db..913e76c0f4b 100644 --- a/pkgs/tools/networking/hss/default.nix +++ b/pkgs/tools/networking/hss/default.nix @@ -13,7 +13,7 @@ buildRubyGem rec { inherit ruby; gemName = "hss"; version = "1.0.1"; - sha256 = "0hdfpxxqsh6gisn8mm0knsl1aig9fir0h2x9sirk3gr36qbz5xa4"; + source.sha256 = "0hdfpxxqsh6gisn8mm0knsl1aig9fir0h2x9sirk3gr36qbz5xa4"; postInstall = '' substituteInPlace $GEM_HOME/gems/${gemName}-${version}/bin/hss \ diff --git a/pkgs/tools/networking/httping/default.nix b/pkgs/tools/networking/httping/default.nix index ce58da880d6..bfe9f115133 100644 --- a/pkgs/tools/networking/httping/default.nix +++ b/pkgs/tools/networking/httping/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { latency of the webserver + network. It supports IPv6. ''; license = licenses.agpl3; - maintainers = with maintainers; [ nckx rickynils ]; + maintainers = with maintainers; [ rickynils ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index d66ff70180a..ec268d5d77f 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -27,10 +27,10 @@ let wrapper = stdenv.mkDerivation rec { in stdenv.mkDerivation rec { - name = "i2p-0.9.32"; + name = "i2p-0.9.33"; src = fetchurl { url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz"; - sha256 = "1c82yckwzp51wqrr8qhww3sifm1a9nzrymsf9qv99ngsxq4n5l6i"; + sha256 = "1hlildi34p34xgpm0gqh09r2jb6nsa7a52gr074r6203xkl2racw"; }; buildInputs = [ jdk ant gettext which ]; patches = [ ./i2p.patch ]; diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 66057e5c76e..dad00cfd9ee 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -1,20 +1,33 @@ -{ stdenv, fetchFromGitHub, fetchpatch, boost, zlib, openssl }: +{ stdenv, fetchFromGitHub, fetchpatch +, boost, zlib, openssl +, upnpSupport ? true, miniupnpc ? null +, aesniSupport ? false +, avxSupport ? false +}: + +assert upnpSupport -> miniupnpc != null; stdenv.mkDerivation rec { name = pname + "-" + version; pname = "i2pd"; - version = "2.15.0"; + version = "2.18.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "02nyk76q2ag0495ph62i0jij27nxpy6qvryjp25wah8f69k7bgfs"; + sha256 = "019psm86n4k7nzxhw7cnbw144gqni59sf35wiy58a6x6dabmvq8h"; }; - buildInputs = [ boost zlib openssl ]; - makeFlags = [ "USE_AESNI=no" "USE_AVX=no" ]; + buildInputs = with stdenv.lib; [ boost zlib openssl ] + ++ optional upnpSupport miniupnpc; + makeFlags = + let ynf = a: b: a + "=" + (if b then "yes" else "no"); in + [ (ynf "USE_AESNI" aesniSupport) + (ynf "USE_AVX" avxSupport) + (ynf "USE_UPNP" upnpSupport) + ]; installPhase = '' install -D i2pd $out/bin/i2pd diff --git a/pkgs/tools/networking/iftop/default.nix b/pkgs/tools/networking/iftop/default.nix index 9e432c946cf..96723146ad4 100644 --- a/pkgs/tools/networking/iftop/default.nix +++ b/pkgs/tools/networking/iftop/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; homepage = http://ex-parrot.com/pdw/iftop/; platforms = platforms.unix; - maintainers = [ maintainers.mornfall ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index 219a993b8a2..99997eb927f 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "inadyn-${version}"; - version = "2.2.1"; + version = "2.3"; src = fetchFromGitHub { owner = "troglobit"; diff --git a/pkgs/tools/networking/ip2location/default.nix b/pkgs/tools/networking/ip2location/default.nix index 22eb31384a1..0506c858029 100644 --- a/pkgs/tools/networking/ip2location/default.nix +++ b/pkgs/tools/networking/ip2location/default.nix @@ -24,6 +24,5 @@ stdenv.mkDerivation rec { homepage = http://www.ip2location.com/free/applications; license = with licenses; [ gpl3Plus lgpl3Plus ]; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/networking/iperf/2.nix b/pkgs/tools/networking/iperf/2.nix index 6f2ca96d120..94be3c25d1f 100644 --- a/pkgs/tools/networking/iperf/2.nix +++ b/pkgs/tools/networking/iperf/2.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "iperf-2.0.9"; + name = "iperf-2.0.10"; src = fetchurl { url = "mirror://sourceforge/iperf2/files/${name}.tar.gz"; - sha256 = "1gzh8dk2myqgxznxrryib4zsw23ffvx0s5j7sa780vk86lgr20nv"; + sha256 = "1whyi7lxrkllmbs7i1avc6jq8fvirn64mhx9197bf4x3rj6k9r3z"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix index b28ea0dbbe5..f28c75774db 100644 --- a/pkgs/tools/networking/ipv6calc/default.nix +++ b/pkgs/tools/networking/ipv6calc/default.nix @@ -51,6 +51,5 @@ stdenv.mkDerivation rec { homepage = http://www.deepspace6.net/projects/ipv6calc.html; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index 68fb72ff7d9..67428664556 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "kea"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { url = "https://ftp.isc.org/isc/${pname}/${version}/${name}.tar.gz"; - sha256 = "0afiab6c8cw0w3m0l4hrc4g8bs9y3z59fdr16xnba01nn52mkl92"; + sha256 = "14f32lsdd1824cx9a4l4pfbhq1d4jik6l6hxd911ihi64nzwvpvf"; }; patches = [ ./dont-create-var.patch ]; @@ -21,12 +21,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" "--with-dhcp-pgsql=${postgresql}/bin/pg_config" - "--with-dhcp-mysql=${mysql.client.dev}/bin/mysql_config" + "--with-dhcp-mysql=${mysql.connector-c}/bin/mysql_config" ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ - openssl log4cplus boost python3 mysql.client + openssl log4cplus boost python3 mysql.connector-c botan2 gmp bzip2 ]; diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix index 1ce9f7cb323..20e65c5ea3c 100644 --- a/pkgs/tools/networking/lldpd/default.nix +++ b/pkgs/tools/networking/lldpd/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "lldpd-${version}"; - version = "0.9.8"; + version = "0.9.9"; src = fetchurl { url = "https://media.luffy.cx/files/lldpd/${name}.tar.gz"; - sha256 = "0kwck17cr2f1a395a8bfmj7fz1n4i1hv429cbdbkhff33glr9r4y"; + sha256 = "1nq2z03hbs5qc3kdk3rdxcwcsrxilhcqx7xw3iipc4yj03shi7jy"; }; configureFlags = [ diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index aee5302405a..6f47b4b5576 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -1,11 +1,10 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, dejagnu, gettext, libtool, pkgconfig +{ stdenv, fetchurl, fetchpatch, autoreconfHook, dejagnu, gettext, pkgconfig , gdbm, pam, readline, ncurses, gnutls, guile, texinfo, gnum4, sasl, fribidi, nettools -, gss, mysql }: +, python, gss, mysql }: let p = "https://raw.githubusercontent.com/gentoo/gentoo/9c921e89d51876fd876f250324893fd90c019326/net-mail/mailutils/files"; -in -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { name = "${project}-${version}"; project = "mailutils"; version = "3.2"; @@ -16,11 +15,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - autoreconfHook gettext libtool pkgconfig + autoreconfHook gettext pkgconfig ] ++ stdenv.lib.optional doCheck dejagnu; buildInputs = [ gdbm pam readline ncurses gnutls guile texinfo gnum4 sasl fribidi nettools - gss mysql.lib + gss mysql.connector-c python ]; patches = [ @@ -52,14 +51,20 @@ stdenv.mkDerivation rec { ]; postPatch = '' - sed -e '/AM_GNU_GETTEXT_VERSION/s/0.18/0.19/' -i configure.ac sed -i -e '/chown root:mail/d' \ -e 's/chmod [24]755/chmod 0755/' \ */Makefile{.in,.am} + sed -i 's:/usr/lib/mysql:${mysql.connector-c}/lib/mysql:' configure.ac + sed -i 's/0\.18/0.19/' configure.ac + sed -i -e 's:mysql/mysql.h:mysql.h:' \ + -e 's:mysql/errmsg.h:errmsg.h:' \ + sql/mysql.c ''; + NIX_CFLAGS_COMPILE = "-L${mysql.connector-c}/lib/mysql -I${mysql.connector-c}/include/mysql"; + preCheck = '' - # Add missing files. + # Add missing test files cp ${builtins.toString readmsg-tests} readmsg/tests/ for f in hdr.at nohdr.at twomsg.at weed.at; do mv readmsg/tests/*-$f readmsg/tests/$f diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix index 7c7c63ef230..a59aee83b93 100644 --- a/pkgs/tools/networking/megatools/default.nix +++ b/pkgs/tools/networking/megatools/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "1.9.98"; src = fetchurl { - url = "http://megatools.megous.com/builds/${name}.tar.gz"; + url = "https://megatools.megous.com/builds/${name}.tar.gz"; sha256 = "0vx1farp0dpg4zwvxdbfdnzjk9qx3sn109p1r1zl3g3xsaj221cv"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command line client for Mega.co.nz"; - homepage = http://megatools.megous.com/; + homepage = https://megatools.megous.com/; license = licenses.gpl2Plus; maintainers = [ maintainers.viric maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/minissdpd/default.nix b/pkgs/tools/networking/minissdpd/default.nix index 307b17a7a7c..e81297e6dd8 100644 --- a/pkgs/tools/networking/minissdpd/default.nix +++ b/pkgs/tools/networking/minissdpd/default.nix @@ -31,6 +31,5 @@ stdenv.mkDerivation rec { downloadPage = http://miniupnp.free.fr/files/; license = licenses.bsd3; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index 2cca57121e9..fe3568c3a83 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -27,8 +27,8 @@ let }; in { miniupnpc_2 = generic { - version = "2.0.20170509"; - sha256 = "0spi75q6nafxp3ndnrhrlqagzmjlp8wwlr5x7rnvdpswgxi6ihyk"; + version = "2.0.20171212"; + sha256 = "0za7pr6hrr3ajkifirhhxfn3hlhl06f622g8hnj5h8y18sp3bwff"; }; miniupnpc_1 = generic { version = "1.9.20160209"; diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 6003471bed9..a623b9fbfe9 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -3,11 +3,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "miniupnpd-2.0"; + name = "miniupnpd-2.0.20171212"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "1dxzhvkylrnbkd5srb9rb2g4f9ydd1zbjg5sdf190m0g1sha6snr"; + sha256 = "0jdcll1nd8jf356fpl0n2yw8sww58nfz6hkx052d77l34afq6sn7"; name = "${name}.tar.gz"; }; @@ -24,6 +24,5 @@ stdenv.mkDerivation rec { homepage = http://miniupnp.free.fr/; description = "A daemon that implements the UPnP Internet Gateway Device (IGD) specification"; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/networking/miredo/default.nix b/pkgs/tools/networking/miredo/default.nix index efe2847ae35..a1a2b79b86a 100644 --- a/pkgs/tools/networking/miredo/default.nix +++ b/pkgs/tools/networking/miredo/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Teredo IPv6 Tunneling Daemon"; - homepage = http://www.remlab.net/miredo/; + homepage = https://www.remlab.net/miredo/; license = licenses.gpl2; maintainers = [ maintainers.volth ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix index f96987a1300..131021704a2 100644 --- a/pkgs/tools/networking/mitmproxy/default.nix +++ b/pkgs/tools/networking/mitmproxy/default.nix @@ -1,6 +1,28 @@ { stdenv, fetchpatch, fetchFromGitHub, fetchurl, python3, glibcLocales }: -python3.pkgs.buildPythonPackage rec { +let + # When overrides are not needed, then only remove the contents of this set. + packageOverrides = self: super: { + ldap3 = super.ldap3.overridePythonAttrs (oldAttrs: rec { + version = "2.3"; + src = oldAttrs.src.override { + inherit version; + sha256 = "c056b3756076e15aa71c963c7c5a44d5d9bbd430263ee49598d4454223a766ac"; + }; + }); + pyasn1 = super.pyasn1.overridePythonAttrs (oldAttrs: rec { + version = "0.3.7"; + src = oldAttrs.src.override { + inherit version; + sha256 = "187f2a66d617683f8e82d5c00033b7c8a0287e1da88a9d577aebec321cad4965"; + }; + }); + }; + + pythonPackages = (python3.override {inherit packageOverrides; }).pkgs; +in with pythonPackages; + +buildPythonPackage rec { baseName = "mitmproxy"; name = "${baseName}-unstable-2017-10-31"; @@ -17,7 +39,7 @@ python3.pkgs.buildPythonPackage rec { LC_CTYPE=en_US.UTF-8 pytest -k 'not test_echo and not test_find_unclaimed_URLs ' ''; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ blinker click certifi cryptography h2 hyperframe kaitaistruct passlib pyasn1 pyopenssl @@ -25,13 +47,13 @@ python3.pkgs.buildPythonPackage rec { urwid brotlipy sortedcontainers ldap3 ]; - buildInputs = with python3.pkgs; [ + buildInputs = [ beautifulsoup4 flask pytest pytestrunner glibcLocales ]; meta = with stdenv.lib; { description = "Man-in-the-middle proxy"; - homepage = http://mitmproxy.org/; + homepage = https://mitmproxy.org/; license = licenses.mit; maintainers = with maintainers; [ fpletz kamilchm ]; }; diff --git a/pkgs/tools/networking/ncftp/default.nix b/pkgs/tools/networking/ncftp/default.nix index c83bc61bbcd..4c632899ac2 100644 --- a/pkgs/tools/networking/ncftp/default.nix +++ b/pkgs/tools/networking/ncftp/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ncurses, coreutils }: -let version = "3.2.5"; in +let version = "3.2.6"; in stdenv.mkDerivation { name = "ncftp-${version}"; src = fetchurl { - url = "ftp://ftp.ncftp.com/ncftp/ncftp-${version}-src.tar.bz2"; - sha256 = "0hlx12i0lwi99qsrx7nccf4nvwjj2gych4yks5y179b1ax0y5sxl"; + url = "ftp://ftp.ncftp.com/ncftp/ncftp-${version}-src.tar.xz"; + sha256 = "1389657cwgw5a3kljnqmhvfh4vr2gcr71dwz1mlhf22xq23hc82z"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/networking/netcat-openbsd/default.nix b/pkgs/tools/networking/netcat-openbsd/default.nix index 7c22891ab7a..8c924701377 100644 --- a/pkgs/tools/networking/netcat-openbsd/default.nix +++ b/pkgs/tools/networking/netcat-openbsd/default.nix @@ -1,18 +1,18 @@ {stdenv, fetchurl, pkgconfig, libbsd}: stdenv.mkDerivation rec { - version = "1.130"; - deb-version = "${version}-3"; + version = "1.187"; + deb-version = "${version}-1"; name = "netcat-openbsd-${version}"; srcs = [ (fetchurl { url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${version}.orig.tar.gz"; - sha256 = "0nqy14yvclgzs98gv0fwp6jlfpfy2kk367zka648jiqbbl30awpx"; + sha256 = "0sxsxl7n7hnxz931jqsp86cdwiq2lm4h3w0i2a67935pki924gxw"; }) (fetchurl { url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${deb-version}.debian.tar.xz"; - sha256 = "0f9409vjm6v8a7m1zf5sr7wj6v5v8414i5vvxx1r45c11h69hh9a"; + sha256 = "0jwbdis6avxdjzg8bcab1bdz296rkzzkdlv50fr3q0277fxjs49q"; }) ]; @@ -20,11 +20,18 @@ stdenv.mkDerivation rec { buildInputs = [ libbsd ]; sourceRoot = name; - patches = [ "../debian/patches/*.patch" ]; + + prePatch = '' + for i in $(cat ../debian/patches/series); do + patch -p1 < "../debian/patches/$i" + done + ''; installPhase = '' + runHook preInstall install -Dm0755 nc $out/bin/nc install -Dm0644 nc.1 $out/share/man/man1/nc.1 + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/netrw/default.nix b/pkgs/tools/networking/netrw/default.nix index e19b8ba7f64..bd5190767d1 100644 --- a/pkgs/tools/networking/netrw/default.nix +++ b/pkgs/tools/networking/netrw/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple tool for transporting data over the network"; license = stdenv.lib.licenses.gpl2; - homepage = http://mamuti.net/netrw/index.en.html; + homepage = https://mamuti.net/netrw/index.en.html; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index b0921375849..aca7643e7ac 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -1,24 +1,24 @@ -{ stdenv, fetchFromGitHub, bison, flex, geoip, geolite-legacy, libcli, libnet -, libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl -, pkgconfig, zlib }: +{ stdenv, fetchFromGitHub, makeWrapper, bison, flex, geoip, geolite-legacy +, libcli, libnet, libnetfilter_conntrack, libnl, libpcap, libsodium +, liburcu, ncurses, perl, pkgconfig, zlib }: stdenv.mkDerivation rec { name = "netsniff-ng-${version}"; - version = "0.6.2"; + version = "0.6.3"; # Upstream recommends and supports git src = fetchFromGitHub rec { repo = "netsniff-ng"; owner = repo; rev = "v${version}"; - sha256 = "1lz4hwgwdq3znlqjmvl7cw3g3ilbayn608h0hwqdf7v2jq6n67kg"; + sha256 = "0g3105c5ha897bpwsnrp72gx4n61gspxmld594i37g8k7vwzny4l"; }; patches = [ ./glibc-2.26.patch ]; buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl libnetfilter_conntrack libpcap libsodium liburcu ncurses perl - pkgconfig zlib ]; + pkgconfig zlib makeWrapper ]; # ./configure is not autoGNU but some home-brewn magic configurePhase = '' @@ -33,6 +33,10 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" ]; postInstall = '' + # trafgen and bpfc can call out to cpp to process config files. + wrapProgram "$out/sbin/trafgen" --prefix PATH ":" "${stdenv.cc}/bin" + wrapProgram "$out/sbin/bpfc" --prefix PATH ":" "${stdenv.cc}/bin" + ln -sv ${geolite-legacy}/share/GeoIP/GeoIP.dat $out/etc/netsniff-ng/country4.dat ln -sv ${geolite-legacy}/share/GeoIP/GeoIPv6.dat $out/etc/netsniff-ng/country6.dat ln -sv ${geolite-legacy}/share/GeoIP/GeoIPCity.dat $out/etc/netsniff-ng/city4.dat @@ -54,6 +58,5 @@ stdenv.mkDerivation rec { homepage = http://netsniff-ng.org/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index d0881c5ac5e..f2c0bb13afe 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { name = "${pname}-${major}.${minor}"; pname = "network-manager-applet"; major = "1.8"; - minor = "2"; + minor = "6"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${major}/${name}.tar.xz"; - sha256 = "09f9hjpn9nkhw57mk6pi7q1bq3lhf5hvmwas0fknscssak7yjmry"; + sha256 = "0c4wxwxpa7wlskvnqaqfa7mmc0c6a2pj7jcvymcchjnq4wn9wx01"; }; configureFlags = [ diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 6005314ea97..b6201e308d9 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "network-manager-${version}"; pname = "NetworkManager"; major = "1.10"; - version = "${major}.0"; + version = "${major}.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz"; - sha256 = "1ph45rqpl8p9k4rirhss0hpf104clm8fp322p6kh6q75y06ddfwa"; + sha256 = "0nv2jm2lsidlrzn4dkbc5rpj8ma4cpzjqz8z8dmwkqvh0zsk970n"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/tools/networking/network-manager/iodine.nix b/pkgs/tools/networking/network-manager/iodine.nix index 154b54952f2..0cfc8bbba7d 100644 --- a/pkgs/tools/networking/network-manager/iodine.nix +++ b/pkgs/tools/networking/network-manager/iodine.nix @@ -18,6 +18,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig ]; + # Fixes deprecation errors with networkmanager 1.10.2 + NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; + configureFlags = [ "${if withGnome then "--with-gnome" else "--without-gnome"}" "--disable-static" diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix index f2657187464..365aec88a7d 100644 --- a/pkgs/tools/networking/network-manager/strongswan.nix +++ b/pkgs/tools/networking/network-manager/strongswan.nix @@ -21,6 +21,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig ]; + # Fixes deprecation errors with networkmanager 1.10.2 + NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; + preConfigure = '' substituteInPlace "configure" \ --replace "/sbin/sysctl" "${procps}/bin/sysctl" diff --git a/pkgs/tools/networking/ngrep/default.nix b/pkgs/tools/networking/ngrep/default.nix index dcc0e8596e9..ca5e0b7c4f5 100644 --- a/pkgs/tools/networking/ngrep/default.nix +++ b/pkgs/tools/networking/ngrep/default.nix @@ -1,39 +1,35 @@ -{ stdenv, fetchurl, fetchpatch, libpcap, gnumake3, pcre }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, libpcap, gnumake3, pcre }: stdenv.mkDerivation rec { - name = "ngrep-1.45"; + name = "ngrep-${version}"; + version = "1.47"; - src = fetchurl { - url = "mirror://sourceforge/ngrep/${name}.tar.bz2"; - sha256 = "19rg8339z5wscw877mz0422wbsadds3mnfsvqx3ihy58glrxv9mf"; + src = fetchFromGitHub { + owner = "jpr5"; + repo = "ngrep"; + rev = "V${lib.replaceStrings ["."] ["_"] version}"; + sha256 = "1x2fyd7wdqlj1r76ilal06cl2wmbz0ws6i3ys204sbjh1cj6dcl7"; }; patches = [ (fetchpatch { - url = "https://anonscm.debian.org/cgit/users/rfrancoise/ngrep.git/plain/debian/patches/10_debian-build.diff?h=debian/1.45.ds2-14"; - sha256 = "1p359k54xjbh6r0d0lv1l679n250wxk6j8yyz23gn54kwdc29zfy"; - }) - (fetchpatch { - url = "https://anonscm.debian.org/cgit/users/rfrancoise/ngrep.git/plain/debian/patches/10_man-fixes.diff?h=debian/1.45.ds2-14"; - sha256 = "1b66zfbsrsvg60j988i6ga9iif1c34fsbq3dp1gi993xy4va8m5k"; - }) - (fetchpatch { - url = "https://anonscm.debian.org/cgit/users/rfrancoise/ngrep.git/plain/debian/patches/20_setlocale.diff?h=debian/1.45.ds2-14"; - sha256 = "16xbmnmvw5sjidz2qhay68k3xad05g74nrccflavxbi0jba52fdq"; - }) - (fetchpatch { - url = "https://anonscm.debian.org/cgit/users/rfrancoise/ngrep.git/plain/debian/patches/40_ipv6-offsets.diff?h=debian/1.45.ds2-14"; - sha256 = "0fjlk1sav5nnjapvsa8mvdwjkhgm3kgc6dw7r9h1qx6d3b8cgl76"; + url = "https://patch-diff.githubusercontent.com/raw/jpr5/ngrep/pull/11.patch"; + sha256 = "0k5qzvj8j3r1409qwwvzp7m3clgs2g7hs4q68bhrqbrsvvb2h5dh"; }) ]; - buildInputs = [ gnumake3 libpcap pcre ]; + nativeBuildInputs = [ autoreconfHook gnumake3 ]; + buildInputs = [ libpcap pcre ]; + + configureFlags = [ + "--enable-ipv6" + "--enable-pcre" + "--disable-pcap-restart" + "--with-pcap-includes=${libpcap}/include" + ]; preConfigure = '' - # Fix broken test for BPF header file sed -i "s|BPF=.*|BPF=${libpcap}/include/pcap/bpf.h|" configure - - configureFlags="$configureFlags --enable-ipv6 --enable-pcre --disable-pcap-restart --with-pcap-includes=${libpcap}/include" ''; meta = with stdenv.lib; { @@ -47,7 +43,7 @@ stdenv.mkDerivation rec { null interfaces, and understands BPF filter logic in the same fashion as more common packet sniffing tools, such as tcpdump and snoop. ''; - homepage = http://ngrep.sourceforge.net/; + homepage = https://github.com/jpr5/ngrep/; # /doc/README.txt says that ngrep itself is licensed under a # 'BSD-like' license but that the 'regex' library (in the ngrep tarball) is # GPLv2. diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix index 93646d58cd3..e5fde0f8038 100644 --- a/pkgs/tools/networking/nss-pam-ldapd/default.nix +++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.9.7"; src = fetchurl { - url = "http://arthurdejong.org/nss-pam-ldapd/${name}.tar.gz"; + url = "https://arthurdejong.org/nss-pam-ldapd/${name}.tar.gz"; sha256 = "1sw36w6zkzvabvjckqick032j5p5xi0qi3sgnh0znzxz31jqvf0d"; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "LDAP identity and authentication for NSS/PAM"; - homepage = http://arthurdejong.org/nss-pam-ldapd/; + homepage = https://arthurdejong.org/nss-pam-ldapd/; license = licenses.lgpl21; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index c167851086e..86a029bcb3d 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -2,7 +2,7 @@ asciidoc, libxml2, libxslt, docbook_xml_xslt }: pythonPackages.buildPythonApplication rec { - version = "7.1.2"; + version = "7.1.5"; name = "offlineimap-${version}"; namePrefix = ""; @@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec { owner = "OfflineIMAP"; repo = "offlineimap"; rev = "v${version}"; - sha256 = "1bvlbw3bsx3qs8np1qdqbhpdr9qykzsql9684gm7gg84gw51i667"; + sha256 = "0qm5vhzm8hkab2zs2l8ffg754wkws2nyd4pwb332v3zckf11flzd"; }; postPatch = '' diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix index f22ad32aaa4..209e1f64c72 100644 --- a/pkgs/tools/networking/openresolv/default.nix +++ b/pkgs/tools/networking/openresolv/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "A program to manage /etc/resolv.conf"; - homepage = http://roy.marples.name/projects/openresolv; + homepage = https://roy.marples.name/projects/openresolv; license = stdenv.lib.licenses.bsd2; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index ddcdfd31c26..272900e0e5b 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -1,7 +1,9 @@ -{ stdenv, fetchurl, iproute, lzo, openssl, pam, systemd, pkgconfig +{ stdenv, fetchurl, iproute, lzo, openssl, pam, pkgconfig +, useSystemd ? stdenv.isLinux, systemd ? null , pkcs11Support ? false, pkcs11helper ? null, }: +assert useSystemd -> (systemd != null); assert pkcs11Support -> (pkcs11helper != null); with stdenv.lib; @@ -17,13 +19,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ lzo openssl ] - ++ optionals stdenv.isLinux [ pam systemd iproute ] + ++ optionals stdenv.isLinux [ pam iproute ] + ++ optional useSystemd systemd ++ optional pkcs11Support pkcs11helper; configureFlags = optionals stdenv.isLinux [ - "--enable-systemd" "--enable-iproute2" "IPROUTE=${iproute}/sbin/ip" ] + ++ optional useSystemd "--enable-systemd" ++ optional pkcs11Support "--enable-pkcs11" ++ optional stdenv.isDarwin "--disable-plugin-auth-pam"; diff --git a/pkgs/tools/networking/pcapc/default.nix b/pkgs/tools/networking/pcapc/default.nix index 28b1c961a3f..71d1e6fa6d6 100644 --- a/pkgs/tools/networking/pcapc/default.nix +++ b/pkgs/tools/networking/pcapc/default.nix @@ -25,6 +25,5 @@ stdenv.mkDerivation rec { description = "Compile libpcap filter expressions into BPF opcodes"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/networking/pingtcp/default.nix b/pkgs/tools/networking/pingtcp/default.nix index 484eab3a221..8fb9b066bf1 100644 --- a/pkgs/tools/networking/pingtcp/default.nix +++ b/pkgs/tools/networking/pingtcp/default.nix @@ -26,6 +26,5 @@ stdenv.mkDerivation rec { homepage = https://github.com/LanetNetwork/pingtcp; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/networking/pykms/default.nix b/pkgs/tools/networking/pykms/default.nix index 97780d546e4..a0bac7854c1 100644 --- a/pkgs/tools/networking/pykms/default.nix +++ b/pkgs/tools/networking/pykms/default.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchFromGitHub, python2Packages, writeText, writeScript +{ stdenv, fetchFromGitHub, python3Packages, writeText, writeScript , coreutils, sqlite }: +with python3Packages; + let dbSql = writeText "create_pykms_db.sql" '' CREATE TABLE clients( @@ -27,21 +29,21 @@ let fi ''); -in python2Packages.buildPythonApplication rec { +in buildPythonApplication rec { name = "pykms-${version}"; - version = "20170719"; + version = "20171224"; src = fetchFromGitHub { owner = "ThunderEX"; repo = "py-kms"; - rev = "27355d88affd740330174a7c2bae9f50b9efce56"; - sha256 = "0cpywj73jmyijjc5hs3b00argjsdwpqzmhawbxkx3mc2l4sgzc88"; + rev = "885f67904f002042d7758e38f9c5426461c5cdc7"; + sha256 = "155khy1285f8xkzi6bsqm9vzz043jsjmp039va1qsh675gz3q9ha"; }; - propagatedBuildInputs = with python2Packages; [ argparse pytz ]; + propagatedBuildInputs = [ argparse pytz ]; prePatch = '' - siteDir=$out/${python2Packages.python.sitePackages} + siteDir=$out/${python.sitePackages} substituteInPlace kmsBase.py \ --replace "'KmsDataBase.xml'" "'$siteDir/KmsDataBase.xml'" @@ -60,7 +62,7 @@ in python2Packages.buildPythonApplication rec { mv * $siteDir for b in client server ; do chmod 0755 $siteDir/$b.py - makeWrapper ${python2Packages.python.interpreter} $out/bin/$b.py \ + makeWrapper ${python.interpreter} $out/bin/$b.py \ --add-flags $siteDir/$b.py done @@ -68,7 +70,7 @@ in python2Packages.buildPythonApplication rec { mv $siteDir/README.md $out/share/doc/pykms/ - ${python2Packages.python.interpreter} -m compileall $siteDir + ${python.interpreter} -m compileall $siteDir runHook postInstall ''; diff --git a/pkgs/tools/networking/quicktun/default.nix b/pkgs/tools/networking/quicktun/default.nix index 6332d6c8577..ceee8cca1aa 100644 --- a/pkgs/tools/networking/quicktun/default.nix +++ b/pkgs/tools/networking/quicktun/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1ydvwasj84qljfbzh6lmhyzjc20yw24a0v2mykp8afsm97zzlqgx"; }; + patches = [ ./tar-1.30.diff ]; # quicktun master seems not to need this + buildInputs = [ libsodium ]; buildPhase = "bash build.sh"; diff --git a/pkgs/tools/networking/quicktun/tar-1.30.diff b/pkgs/tools/networking/quicktun/tar-1.30.diff new file mode 100644 index 00000000000..88498e54280 --- /dev/null +++ b/pkgs/tools/networking/quicktun/tar-1.30.diff @@ -0,0 +1,19 @@ +Fix build with gnutar-1.30 + +Creating source archive... +tar: The following options were used after any non-optional arguments in archive create or update mode. These options are positional and affect only arguments that follow them. Please, rearrange them properly. +tar: --exclude 'debian/data' has no effect +tar: Exiting with failure status due to previous errors +diff --git a/build.sh b/build.sh +index 0ea0403..725178c 100755 +--- a/build.sh ++++ b/build.sh +@@ -25,7 +25,7 @@ rm -rf out/ obj/ tmp/ + mkdir -p out + if [ "$1" != "debian" ]; then + echo Creating source archive... +- $tar --transform "s,^,quicktun-`cat version`/," -czf "out/quicktun-`cat version`.tgz" build.sh clean.sh debian src version --exclude "debian/data" ++ $tar --transform "s,^,quicktun-`cat version`/," -czf "out/quicktun-`cat version`.tgz" --exclude "debian/data" build.sh clean.sh debian src version + fi + + mkdir -p obj tmp tmp/include tmp/lib diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix index c188dd477fe..93fc28b48bf 100644 --- a/pkgs/tools/networking/siege/default.nix +++ b/pkgs/tools/networking/siege/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, zlib }: stdenv.mkDerivation rec { - name = "siege-4.0.2"; + name = "siege-4.0.4"; src = fetchurl { url = "http://download.joedog.org/siege/${name}.tar.gz"; - sha256 = "0ivc6ah9n2888qgh8dicszhr3mjs42538lfx7dlhxvvvakwq3yvy"; + sha256 = "0vzaj5nzb0fir2a4l7ghv3wa5d1nk2ss8gmwjb6bjavjplccyzcg"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix index f3baddd2653..46580c0b802 100644 --- a/pkgs/tools/networking/snabb/default.nix +++ b/pkgs/tools/networking/snabb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, bash, makeWrapper, git, mariadb, diffutils, which, coreutils, procps, nettools }: +{ stdenv, lib, fetchFromGitHub, bash, makeWrapper, git, mysql, diffutils, which, coreutils, procps, nettools }: stdenv.mkDerivation rec { name = "snabb-${version}"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { done # We need a way to pass $PATH to the scripts - sed -i '2iexport PATH=${stdenv.lib.makeBinPath [ git mariadb which procps coreutils ]}' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc + sed -i '2iexport PATH=${stdenv.lib.makeBinPath [ git mysql.client which procps coreutils ]}' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc sed -i '2iexport PATH=${stdenv.lib.makeBinPath [ git coreutils diffutils nettools ]}' src/program/snabbnfv/neutron_sync_agent/neutron_sync_agent.sh.inc ''; diff --git a/pkgs/tools/networking/stun/default.nix b/pkgs/tools/networking/stun/default.nix index 8f9636041ff..7ba4a0d8936 100644 --- a/pkgs/tools/networking/stun/default.nix +++ b/pkgs/tools/networking/stun/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Stun server and test client"; - homepage = http://sourceforge.net/projects/stun/; + homepage = https://sourceforge.net/projects/stun/; license = licenses.vsl10; maintainers = with maintainers; [ marcweber obadz ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index fbebba21dbd..deac3746836 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "stunnel-${version}"; - version = "5.41"; + version = "5.44"; src = fetchurl { url = "http://www.stunnel.org/downloads/${name}.tar.gz"; - sha256 = "13qld0b8w2yfs2kfwnqvhcg98warh8hcyk13rjxdwv8zxqhn6p7h"; + sha256 = "1692y69wl7j6yjgnrrzclgzb34bxsaxjzl1dfy47vms7pdfk42lr"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/networking/swec/default.nix b/pkgs/tools/networking/swec/default.nix index 5b7f8f114df..4af7e1eb5ba 100644 --- a/pkgs/tools/networking/swec/default.nix +++ b/pkgs/tools/networking/swec/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { checkPhase = "make test"; meta = { - homepage = http://random.zerodogg.org/swec/; + homepage = https://random.zerodogg.org/swec/; description = "Simple Web Error Checker (SWEC)"; diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 8dba4b373a3..324a58cf7ed 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { crossAttrs = { LDFLAGS = if enableStatic then "-static" else ""; configureFlags = [ "ac_cv_linux_vers=2" ] ++ (stdenv.lib.optional - (hostPlatform.platform.kernelMajor == "2.4") "--disable-ipv6"); + (hostPlatform.platform.kernelMajor or null == "2.4") "--disable-ipv6"); }; meta = { description = "Network sniffer"; homepage = http://www.tcpdump.org/; license = "BSD-style"; - maintainers = with stdenv.lib.maintainers; [ mornfall jgeerds ]; + maintainers = with stdenv.lib.maintainers; [ jgeerds ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/trickle/default.nix b/pkgs/tools/networking/trickle/default.nix index 1c8829a07b2..52bb418fc0d 100644 --- a/pkgs/tools/networking/trickle/default.nix +++ b/pkgs/tools/networking/trickle/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight userspace bandwidth shaper"; license = stdenv.lib.licenses.bsd3; - homepage = http://monkey.org/~marius/pages/?page=trickle; + homepage = https://monkey.org/~marius/pages/?page=trickle; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/tools/networking/uget/default.nix index 7d3e4ba1c61..620584ab1df 100644 --- a/pkgs/tools/networking/uget/default.nix +++ b/pkgs/tools/networking/uget/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "uget-${version}"; - version = "2.0.10"; + version = "2.2.0"; src = fetchurl { url = "mirror://sourceforge/urlget/${name}.tar.gz"; - sha256 = "1zldsiy83xxpm8jdh1i9h7zrh8ak52srgy38fiyszysfapl8nx8a"; + sha256 = "0rg2mr2cndxvnjib8zm5dp7y2hgbvnqkz2j2jmg0xlzfh9d34b2m"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index 6a322f649ac..0c37043de9b 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urlwatch-${version}"; - version = "2.7"; + version = "2.8"; src = fetchFromGitHub { owner = "thp"; repo = "urlwatch"; rev = version; - sha256 = "0fx964z73yv08b1lpymmjsigf6929zx9ax5bp34rcf2c5gk11l5m"; + sha256 = "1nja7n6pc45azd3l1xyvav89855lvcgwabrvf34rps81dbl8cnl4"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix index c2c707fbc77..7cb489a3f21 100644 --- a/pkgs/tools/networking/uwimap/default.nix +++ b/pkgs/tools/networking/uwimap/default.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation { "-I${openssl.dev}/include/openssl"; installPhase = '' - mkdir -p $out/bin $out/lib $out/include - cp c-client/*.h c-client/linkage.c $out/include + mkdir -p $out/bin $out/lib $out/include/c-client + cp c-client/*.h osdep/unix/*.h c-client/linkage.c c-client/auths.c $out/include/c-client/ cp c-client/c-client.a $out/lib/libc-client.a cp mailutil/mailutil imapd/imapd dmail/dmail mlock/mlock mtest/mtest tmail/tmail \ tools/{an,ua} $out/bin diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix index 496c01c02fc..86e483114a3 100644 --- a/pkgs/tools/networking/vpnc/default.nix +++ b/pkgs/tools/networking/vpnc/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.unix-ag.uni-kl.de/~massar/vpnc/; + homepage = https://www.unix-ag.uni-kl.de/~massar/vpnc/; description = "Virtual private network (VPN) client for Cisco's VPN concentrators"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index b6bbae65e69..b31ae93066e 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -5,11 +5,11 @@ , openssl ? null }: stdenv.mkDerivation rec { - name = "wget-1.19.2"; + name = "wget-1.19.4"; src = fetchurl { url = "mirror://gnu/wget/${name}.tar.lz"; - sha256 = "01yzal7xm85543x02bij3capnigr063d6c5vc039f8n5s9d796nm"; + sha256 = "16jmcqcasx3q9k4azssryli9qyxfq0sfijw998g8zp58cnwzzh1g"; }; patches = [ diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index ed8f2eebc75..6f37e88f4f6 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,27 +1,31 @@ -{ stdenv, fetchFromGitHub, perl, gettext }: +{ stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2, libiconv }: stdenv.mkDerivation rec { - version = "5.2.18"; + version = "5.3.0"; name = "whois-${version}"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - sha256 = "0jzyq1rj6balc6a28swzgspv55xhkc75dw6wsn159in4ap61bzmi"; + sha256 = "01pfl1ap62hc27574sx1a4yaaf7hr2zkksspn5z97sgacl6h1rnf"; }; - buildInputs = [ perl gettext ]; + nativeBuildInputs = [ perl gettext pkgconfig ]; + buildInputs = [ libidn2 libiconv ]; preConfigure = '' for i in Makefile po/Makefile; do substituteInPlace $i --replace "prefix = /usr" "prefix = $out" done + + substituteInPlace Makefile --replace "DEFS += HAVE_ICONV" "DEFS += HAVE_ICONV\nwhois_LDADD += -liconv" ''; - buildPhase = "make whois"; + makeFlags = [ "HAVE_ICONV=1" ]; + buildFlags = [ "whois" ]; - installPhase = "make install-whois"; + installTargets = [ "install-whois" ]; meta = with stdenv.lib; { description = "Intelligent WHOIS client from Debian"; diff --git a/pkgs/tools/nix/info/default.nix b/pkgs/tools/nix/info/default.nix index e60c4eecbaf..cfdef4dd561 100644 --- a/pkgs/tools/nix/info/default.nix +++ b/pkgs/tools/nix/info/default.nix @@ -38,6 +38,8 @@ stdenv.mkDerivation { cp ./nix-info $out/bin/nix-info ''; + preferLocalBuild = true; + meta = { platforms = lib.platforms.all; }; diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 63431e29fac..99d59ae65de 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "dpkg-${version}"; - version = "1.19.0.4"; + version = "1.19.0.5"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "02lrwrkl2g1jwj71088rwswx07a1zq1jkq7193lbvy8jj2qnp9lq"; + sha256 = "1dc5kp3fqy1k66fly6jfxkkg7w6d0jy8szddpfyc2xvzga94d041"; }; configureFlags = [ @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { homepage = https://wiki.debian.org/Teams/Dpkg; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ mornfall nckx ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix new file mode 100644 index 00000000000..8eb266a9e65 --- /dev/null +++ b/pkgs/tools/package-management/home-manager/default.nix @@ -0,0 +1,38 @@ +#Adapted from +#https://github.com/rycee/home-manager/blob/9c1b3735b402346533449efc741f191d6ef578dd/home-manager/default.nix + +{ bash, coreutils, less, stdenv, makeWrapper, fetchFromGitHub }: + +stdenv.mkDerivation rec { + + name = "home-manager-${version}"; + version = "2017-12-7"; + + src = fetchFromGitHub{ + owner = "rycee"; + repo = "home-manager"; + rev = "0be32c9d42e3a8739263ae7886dc2448c833c19c"; + sha256 = "06lmnzlf5fmiicbgai27ad9m3bj980xf8ifdpc5lzbsy77pfcfap"; + }; + + nativeBuildInputs = [ makeWrapper ]; + dontBuild = true; + + installPhase = '' + install -v -D -m755 ${src}/home-manager/home-manager $out/bin/home-manager + + substituteInPlace $out/bin/home-manager \ + --subst-var-by bash "${bash}" \ + --subst-var-by coreutils "${coreutils}" \ + --subst-var-by less "${less}" \ + --subst-var-by HOME_MANAGER_PATH '${src}' + ''; + + meta = with stdenv.lib; { + description = "A user environment configurator"; + maintainers = with maintainers; [ rycee ]; + platforms = platforms.linux; + license = licenses.mit; + }; + +} diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 33f132ae74f..81031c0a547 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -26,7 +26,7 @@ let inherit name src; version = lib.getVersion name; - is112 = lib.versionAtLeast version "1.12pre"; + is20 = lib.versionAtLeast version "2.0pre"; VERSION_SUFFIX = lib.optionalString fromGit suffix; @@ -34,14 +34,14 @@ let nativeBuildInputs = [ pkgconfig ] - ++ lib.optionals (!is112) [ perl ] + ++ lib.optionals (!is20) [ perl ] ++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook5_xsl ]; buildInputs = [ curl openssl sqlite xz ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium ++ lib.optionals fromGit [ brotli ] # Since 1.12 ++ lib.optional stdenv.isLinux libseccomp - ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is112) + ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is20) (aws-sdk-cpp.override { apis = ["s3"]; customMemoryManagement = false; @@ -65,11 +65,11 @@ let "--disable-init-state" "--enable-gc" ] - ++ lib.optionals (!is112) [ + ++ lib.optionals (!is20) [ "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}" "--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}" "--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}" - ] ++ lib.optionals (is112 && stdenv.isLinux) [ + ] ++ lib.optionals (is20 && stdenv.isLinux) [ "--with-sandbox-shell=${sh}/bin/busybox" ]; @@ -160,13 +160,13 @@ in rec { }) // { perl-bindings = nixStable; }; nixUnstable = (lib.lowPrio (common rec { - name = "nix-unstable-1.12${suffix}"; - suffix = "pre5810_5d5b931f"; + name = "nix-2.0${suffix}"; + suffix = "pre5889_c287d731"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "5d5b931fb178046ba286b8ef2b56a00b3a85c51c"; - sha256 = "0sspf8np53j335dvgxw03lid0w43wzjkcbx6fqym2kqdcvbzw57j"; + rev = "c287d7312103bae5e154c0c4dd493371a22ea207"; + sha256 = "1dwhz93dlk62prh3wfwf8vxfcqjdn21wk0ms65kf5r8ahkfgpgq4"; }; fromGit = true; })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; }; diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index d4e6885d8f3..78ef19706d1 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { homepage = http://www.packagekit.org/; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx matthewbauer ]; + maintainers = with maintainers; [ matthewbauer ]; }; } diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 25fcb8bc27e..57581091f92 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { homepage = http://www.rpm.org/; license = licenses.gpl2; description = "The RPM Package Manager"; - maintainers = with maintainers; [ mornfall copumpkin ]; + maintainers = with maintainers; [ copumpkin ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/apg/default.nix b/pkgs/tools/security/apg/default.nix index 24d88517b6a..04b29bcf8f7 100644 --- a/pkgs/tools/security/apg/default.nix +++ b/pkgs/tools/security/apg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { name = "apg-2.3.0b"; src = fetchurl { @@ -8,9 +8,14 @@ stdenv.mkDerivation rec { configurePhase = '' substituteInPlace Makefile --replace /usr/local "$out" ''; + makeFlags = stdenv.lib.optionals stdenv.isDarwin ["CC=cc"]; patches = [ ./apg.patch ]; + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i -e 's|APG_CLIBS += -lcrypt|APG_CLIBS += -L${openssl.out}/lib -lcrypto|' Makefile + ''; + meta = { description = "Tools for random password generation"; longDescription = '' diff --git a/pkgs/tools/security/bettercap/Gemfile b/pkgs/tools/security/bettercap/Gemfile new file mode 100644 index 00000000000..8fb2a1c300a --- /dev/null +++ b/pkgs/tools/security/bettercap/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'bettercap' diff --git a/pkgs/tools/security/bettercap/Gemfile.lock b/pkgs/tools/security/bettercap/Gemfile.lock new file mode 100644 index 00000000000..9260d1fd5ab --- /dev/null +++ b/pkgs/tools/security/bettercap/Gemfile.lock @@ -0,0 +1,42 @@ +GEM + remote: https://rubygems.org/ + specs: + bettercap (1.6.2) + colorize (~> 0.8.0) + em-proxy (~> 0.1, >= 0.1.8) + net-dns (~> 0.8, >= 0.8.0) + network_interface (~> 0.0, >= 0.0.1) + packetfu (~> 1.1, >= 1.1.10) + pcaprub (~> 0.12, >= 0.12.0, <= 1.1.11) + rubydns (~> 1.0, >= 1.0.3) + celluloid (0.16.0) + timers (~> 4.0.0) + celluloid-io (0.16.2) + celluloid (>= 0.16.0) + nio4r (>= 1.1.0) + colorize (0.8.1) + em-proxy (0.1.9) + eventmachine + eventmachine (1.2.5) + hitimes (1.2.6) + net-dns (0.8.0) + network_interface (0.0.2) + nio4r (2.2.0) + packetfu (1.1.13) + pcaprub + pcaprub (0.12.4) + rubydns (1.0.3) + celluloid (= 0.16.0) + celluloid-io (= 0.16.2) + timers (~> 4.0.1) + timers (4.0.4) + hitimes + +PLATFORMS + ruby + +DEPENDENCIES + bettercap + +BUNDLED WITH + 1.14.6 diff --git a/pkgs/tools/security/bettercap/default.nix b/pkgs/tools/security/bettercap/default.nix new file mode 100644 index 00000000000..46832e83ac9 --- /dev/null +++ b/pkgs/tools/security/bettercap/default.nix @@ -0,0 +1,23 @@ +{ lib, bundlerEnv, ruby, libpcap}: + +bundlerEnv rec { + name = "bettercap-${version}"; + + version = (import gemset).bettercap.version; + inherit ruby; + gemdir = ./.; + gemset = ./gemset.nix; + + buildInputs = [ libpcap ruby ]; + + meta = with lib; { + description = "A man in the middle tool"; + longDescription = '' + BetterCAP is a powerful, flexible and portable tool created to perform various types of MITM attacks against a network, manipulate HTTP, HTTPS and TCP traffic in realtime, sniff for credentials and much more. + '' ; + homepage = https://www.bettercap.org/; + license = with licenses; gpl3; + maintainers = with maintainers; [ y0no ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/security/bettercap/gemset.nix b/pkgs/tools/security/bettercap/gemset.nix new file mode 100644 index 00000000000..bd5c33ba22c --- /dev/null +++ b/pkgs/tools/security/bettercap/gemset.nix @@ -0,0 +1,121 @@ +{ + bettercap = { + dependencies = ["colorize" "em-proxy" "net-dns" "network_interface" "packetfu" "pcaprub" "rubydns"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mns96yfyfnksk720p8k83qkwwsid4sicwgrzxaa9gbc53aalll0"; + type = "gem"; + }; + version = "1.6.2"; + }; + celluloid = { + dependencies = ["timers"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "044xk0y7i1xjafzv7blzj5r56s7zr8nzb619arkrl390mf19jxv3"; + type = "gem"; + }; + version = "0.16.0"; + }; + celluloid-io = { + dependencies = ["celluloid" "nio4r"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l1x0p6daa5vskywrvaxdlanwib3k5pps16axwyy4p8d49pn9rnx"; + type = "gem"; + }; + version = "0.16.2"; + }; + colorize = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "133rqj85n400qk6g3dhf2bmfws34mak1wqihvh3bgy9jhajw580b"; + type = "gem"; + }; + version = "0.8.1"; + }; + em-proxy = { + dependencies = ["eventmachine"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yzkg6jkmcg859b5mf13igpf8q2bjhsmqjsva05948fi733w5n2j"; + type = "gem"; + }; + version = "0.1.9"; + }; + eventmachine = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "075hdw0fgzldgss3xaqm2dk545736khcvv1fmzbf1sgdlkyh1v8z"; + type = "gem"; + }; + version = "1.2.5"; + }; + hitimes = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06222h9236jw9jgmdlpi0q7psac1shvxqxqx905qkvabmxdxlfar"; + type = "gem"; + }; + version = "1.2.6"; + }; + net-dns = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12nal6vhdyg0pbcqpsxqr59h7mbgdhcqp3v0xnzvy167n40gabf9"; + type = "gem"; + }; + version = "0.8.0"; + }; + network_interface = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xh4knfq77ii4pjzsd2z1p3nd6nrcdjhb2vi5gw36jqj43ffw0zp"; + type = "gem"; + }; + version = "0.0.2"; + }; + nio4r = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jjrj7vs29w6dfgsxq08226jfbi2j0x62lf4p9zmvyp19dj4z00a"; + type = "gem"; + }; + version = "2.2.0"; + }; + packetfu = { + dependencies = ["pcaprub"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16ppq9wfxq4x2hss61l5brs3s6fmi8gb50mnp1nnnzb1asq4g8ll"; + type = "gem"; + }; + version = "1.1.13"; + }; + pcaprub = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pl4lqy7308185pfv0197n8b4v20fhd0zb3wlpz284rk8ssclkvz"; + type = "gem"; + }; + version = "0.12.4"; + }; + rubydns = { + dependencies = ["celluloid" "celluloid-io" "timers"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cvj8li8shz7zn1rc5hdrkqmvr9j187g4y28mvkfvmv1j9hdln62"; + type = "gem"; + }; + version = "1.0.3"; + }; + timers = { + dependencies = ["hitimes"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jx4wb0x182gmbcs90vz0wzfyp8afi1mpl9w5ippfncyk4kffvrz"; + type = "gem"; + }; + version = "4.0.4"; + }; +} \ No newline at end of file diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix index 7230d30c795..edebd95303a 100644 --- a/pkgs/tools/security/browserpass/default.nix +++ b/pkgs/tools/security/browserpass/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { name = "browserpass-${version}"; - version = "2.0.7"; + version = "2.0.10"; goPackagePath = "github.com/dannyvankooten/browserpass"; @@ -13,7 +13,7 @@ buildGoPackage rec { repo = "browserpass"; owner = "dannyvankooten"; rev = version; - sha256 = "1dbp5za5qh6xmgh3w2cx5fbw13mh1szgj2y7ilmq0jh2ik09fbnd"; + sha256 = "0clkalw2wz2zs0p5hsq57iqp2bdp7y17zf5l2d0y7xfddff9sd82"; }; postInstall = '' diff --git a/pkgs/tools/security/browserpass/deps.nix b/pkgs/tools/security/browserpass/deps.nix index 4a86966a9fc..763317aafc7 100644 --- a/pkgs/tools/security/browserpass/deps.nix +++ b/pkgs/tools/security/browserpass/deps.nix @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-zglob"; - rev = "4b74c24375b3b1ee226867156e01996f4e19a8d6"; - sha256 = "1qc502an4q3wgvrd9zw6zprgm28d90d2f98bdamdf4js03jj22xn"; + rev = "4959821b481786922ac53e7ef25c61ae19fb7c36"; + sha256 = "0rwkdw143kphpmingsrw1zp030zf3p08f64h347jpdm4lz8z5449"; }; } { diff --git a/pkgs/tools/security/bruteforce-luks/default.nix b/pkgs/tools/security/bruteforce-luks/default.nix index 7b505722efa..bcd0593e88f 100644 --- a/pkgs/tools/security/bruteforce-luks/default.nix +++ b/pkgs/tools/security/bruteforce-luks/default.nix @@ -31,6 +31,5 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/security/chkrootkit/default.nix b/pkgs/tools/security/chkrootkit/default.nix index 54aeb32cabd..0cc026f0c87 100644 --- a/pkgs/tools/security/chkrootkit/default.nix +++ b/pkgs/tools/security/chkrootkit/default.nix @@ -1,16 +1,21 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "chkrootkit-0.51"; + name = "chkrootkit-0.52"; src = fetchurl { url = "ftp://ftp.pangeia.com.br/pub/seg/pac/${name}.tar.gz"; - sha256 = "0y0kbhy8156y8zli0wcqbakb9rprzl1w7jn0kw3xjfgzrgsncqgn"; + sha256 = "04d2yxpy99y90rvrlc9fqmlffs6iyfbghxbhvv12j1xfr2ww0y65"; }; # TODO: a lazy work-around for linux build failure ... makeFlags = [ "STATIC=" ]; + postPatch = '' + substituteInPlace chkrootkit \ + --replace " ./" " $out/bin/" + ''; + installPhase = '' mkdir -p $out/sbin cp check_wtmpx chkdirs chklastlog chkproc chkrootkit chkutmp chkwtmp ifpromisc strings-static $out/sbin diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index 506d6fc3fce..976c58eb1e3 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -1,44 +1,35 @@ -{ stdenv, fetchurl, fetchpatch, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl -, libmilter, pcre }: +{ stdenv, fetchurl, fetchpatch, pkgconfig +, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl, libmilter, pcre +}: stdenv.mkDerivation rec { name = "clamav-${version}"; - version = "0.99.2"; + version = "0.99.3"; src = fetchurl { url = "https://www.clamav.net/downloads/production/${name}.tar.gz"; - sha256 = "0yh2q318bnmf2152g2h1yvzgqbswn0wvbzb8p4kf7v057shxcyqn"; + sha256 = "114f7qk3h0klgm0zzn2394n5spcn91vjc9mq6m03l2p0ls955yh0"; }; - patches = [ - (fetchpatch { - name = "CVE-2017-6420.patch"; - url = "https://github.com/vrtadmin/clamav-devel/commit/dfc00cd3301a42b571454b51a6102eecf58407bc.patch"; - sha256 = "08w3p3a4pmi0cmcmyxkagsbn3g0jgx1jqlc34pn141x0qzrlqr60"; - }) - ]; - # don't install sample config files into the absolute sysconfdir folder postPatch = '' substituteInPlace Makefile.in --replace ' etc ' ' ' ''; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre ]; + patches = [ ./fd-leak.patch ]; + configureFlags = [ "--sysconfdir=/etc/clamav" - "--with-zlib=${zlib.dev}" - "--disable-zlib-vcheck" # it fails to recognize that 1.2.10 >= 1.2.2 "--disable-llvm" # enabling breaks the build at the moment - "--with-libbz2-prefix=${bzip2.dev}" - "--with-iconv-dir=${libiconv}" + "--with-zlib=${zlib.dev}" "--with-xml=${libxml2.dev}" "--with-openssl=${openssl.dev}" - "--with-libncurses-prefix=${ncurses.dev}" "--with-libcurl=${curl.dev}" - "--with-pcre=${pcre.dev}" "--enable-milter" ]; @@ -51,7 +42,7 @@ stdenv.mkDerivation rec { homepage = http://www.clamav.net; description = "Antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats"; license = licenses.gpl2; - maintainers = with maintainers; [ phreedom robberer qknight ]; + maintainers = with maintainers; [ phreedom robberer qknight fpletz ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/clamav/fd-leak.patch b/pkgs/tools/security/clamav/fd-leak.patch new file mode 100644 index 00000000000..2c147901e44 --- /dev/null +++ b/pkgs/tools/security/clamav/fd-leak.patch @@ -0,0 +1,49 @@ +--- a/libclamav/scanners.c 2018-01-26 16:59:00.820231425 +0100 ++++ b/libclamav/scanners.c 2018-01-26 17:39:07.523633805 +0100 +@@ -1366,12 +1366,14 @@ + + if ((ret = cli_ac_initdata(&tmdata, troot?troot->ac_partsigs:0, troot?troot->ac_lsigs:0, troot?troot->ac_reloff_num:0, CLI_DEFAULT_AC_TRACKLEN))) { + free(tmpname); ++ free(normalized); + return ret; + } + + if ((ret = cli_ac_initdata(&gmdata, groot->ac_partsigs, groot->ac_lsigs, groot->ac_reloff_num, CLI_DEFAULT_AC_TRACKLEN))) { + cli_ac_freedata(&tmdata); + free(tmpname); ++ free(normalized); + return ret; + } + +@@ -1390,6 +1392,7 @@ + cli_errmsg("cli_scanscript: can't write to file %s\n",tmpname); + close(ofd); + free(tmpname); ++ free(normalized); + return CL_EWRITE; + } + text_normalize_reset(&state); +@@ -1424,6 +1427,8 @@ + if (ret) { + cli_ac_freedata(&tmdata); + free(tmpname); ++ free(normalized); ++ close(ofd); + return ret; + } + } +@@ -1466,11 +1471,9 @@ + + } + +- if(ctx->engine->keeptmp) { +- free(tmpname); +- if (ofd >= 0) +- close(ofd); +- } ++ if (ofd >= 0) ++ close(ofd); ++ free(tmpname); + free(normalized); + + if(ret != CL_VIRUS || SCAN_ALL) { diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index f26b2d3308b..a11b70917c8 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -57,7 +57,6 @@ stdenv.mkDerivation rec { and remove all ~/.pki and/or /etc/pki directories no longer needed. ''; - maintainers = with maintainers; [ nckx ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/eid-viewer/default.nix b/pkgs/tools/security/eid-viewer/default.nix index d1b29e137df..10cc314fe1d 100644 --- a/pkgs/tools/security/eid-viewer/default.nix +++ b/pkgs/tools/security/eid-viewer/default.nix @@ -37,7 +37,6 @@ stdenv.mkDerivation rec { Belgian electronic identity cards. Independent of the eid-mw package, which is required to actually use your eID for authentication or signing. ''; - maintainers = with maintainers; [ nckx ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/enchive/default.nix b/pkgs/tools/security/enchive/default.nix index d045450f948..8d4cc6ec3ca 100644 --- a/pkgs/tools/security/enchive/default.nix +++ b/pkgs/tools/security/enchive/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "enchive-${version}"; - version = "3.3"; + version = "3.4"; src = fetchFromGitHub { owner = "skeeto"; repo = "enchive"; rev = version; - sha256 = "0i3b0v5dqz56m5ppzm3332yxkw17dxs2zpvf48769ljgjy74irfl"; + sha256 = "0ssxbnsjx4mvaqimp5nzfixpxinhmi12z8lxdd8cj2361wbb54yk"; }; makeFlags = ["PREFIX=$(out)"]; diff --git a/pkgs/tools/security/enpass/data.json b/pkgs/tools/security/enpass/data.json index 28d568d30ae..accb92b13ea 100644 --- a/pkgs/tools/security/enpass/data.json +++ b/pkgs/tools/security/enpass/data.json @@ -1,12 +1,12 @@ { "amd64": { - "path": "pool/main/e/enpass/enpass_5.6.0_amd64.deb", - "sha256": "129ae4b4bfb8e0b4fa9acdfb3aebac3dd894364f2f31e9cd3bd5d3567e3a13b7", - "version": "5.6.0" + "path": "pool/main/e/enpass/enpass_5.6.5_amd64.deb", + "sha256": "c7529b745aa462b56eac17af6fe88d4c1610fd2f446d222aaad9510f19212a7d", + "version": "5.6.5" }, "i386": { - "path": "pool/main/e/enpass/enpass_5.6.0_i386.deb", - "sha256": "c456002194c0be08a2c0da68ecf224425e35c46de5292098208e4e2b1f6d88ae", - "version": "5.6.0" + "path": "pool/main/e/enpass/enpass_5.6.5_i386.deb", + "sha256": "de46e27d5552dcd9d72abac8e5c3b6161ad551ce191a2ee689c67367b63ff8f9", + "version": "5.6.5" } } \ No newline at end of file diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 31f2262cd9f..a8de8742dd5 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, python, pythonPackages, gamin }: -let version = "0.9.7"; in +let version = "0.10.2"; in pythonPackages.buildPythonApplication { name = "fail2ban-${version}"; @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication { owner = "fail2ban"; repo = "fail2ban"; rev = version; - sha256 = "07l5pz93mz1r3g59xiyyznlpjfpv2zgvh3h9w0cbn79v7njim8kb"; + sha256 = "1asn9gp0ybz6fak991vki9vln4ijramvr13rbwpxyj5wfmnh05r5"; }; propagatedBuildInputs = [ gamin ] diff --git a/pkgs/tools/security/fpm2/default.nix b/pkgs/tools/security/fpm2/default.nix index 69b4b36fb9b..66a50e268a5 100644 --- a/pkgs/tools/security/fpm2/default.nix +++ b/pkgs/tools/security/fpm2/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "0.79"; src = fetchurl { - url = "http://als.regnet.cz/fpm2/download/fpm2-${version}.tar.bz2"; + url = "https://als.regnet.cz/fpm2/download/fpm2-${version}.tar.bz2"; sha256 = "d55e9ce6be38a44fc1053d82db2d117cf3991a51898bd86d7913bae769f04da7"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "FPM2 is GTK2 port from Figaro's Password Manager originally developed by John Conneely, with some new enhancements."; - homepage = http://als.regnet.cz/fpm2/; + homepage = https://als.regnet.cz/fpm2/; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ hce ]; diff --git a/pkgs/tools/security/gnupg/1.nix b/pkgs/tools/security/gnupg/1.nix index 6acaacd1467..fa4555dcafb 100644 --- a/pkgs/tools/security/gnupg/1.nix +++ b/pkgs/tools/security/gnupg/1.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, readline, bzip2 }: stdenv.mkDerivation rec { - name = "gnupg-1.4.21"; + name = "gnupg-1.4.22"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "0xi2mshq8f6zbarb5f61c9w2qzwrdbjm4q8fqsrwlzc51h8a6ivb"; + sha256 = "1d1hz4szh1kvwhsw7w2zxa6q5ndrk3qy6hj289l1b8k3xi5s554m"; }; buildInputs = [ readline bzip2 ]; diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 0519902308a..89fee90364e 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null; stdenv.mkDerivation rec { name = "gnupg-${version}"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1d4482c4pbi0p1k8cc0f9c4q51k56v8navrbz5samxrrs42p3lyb"; + sha256 = "1v7j8v2ww1knknbrhw3svfrqkmf9ll58iq0dczbsdpqgg1j3w6j0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index d03c08211c2..abe7aa1fc7c 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, git, gnupg, makeWrapper }: buildGoPackage rec { - version = "1.6.6"; + version = "1.6.7"; name = "gopass-${version}"; goPackagePath = "github.com/justwatchcom/gopass"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "justwatchcom"; repo = "gopass"; rev = "v${version}"; - sha256 = "0n3isjrjpn2cnlwfdkjdcz5j8n16dhyaw4zyjpmis51nl0bqd3jw"; + sha256 = "0al2avdvmnnz7h21hnvlacr20k50my5l67plgf4cphy52p9461vp"; }; wrapperPath = with stdenv.lib; makeBinPath ([ diff --git a/pkgs/tools/security/haveged/default.nix b/pkgs/tools/security/haveged/default.nix index 8d032f51413..81f627179a2 100644 --- a/pkgs/tools/security/haveged/default.nix +++ b/pkgs/tools/security/haveged/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "haveged-${version}"; - version = "1.9.1"; + version = "1.9.2"; src = fetchurl { url = "http://www.issihosts.com/haveged/haveged-${version}.tar.gz"; - sha256 = "059pxlfd4l5dqhd6r3lynzfz4wby2f17294fy17pi9j2jpnn68ww"; + sha256 = "0w5ypz6451msckivjriwyw8djydlwffam7x23xh626s2vzdrlzgp"; }; meta = { diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix index 37946b940cf..7552b21ed33 100644 --- a/pkgs/tools/security/john/default.nix +++ b/pkgs/tools/security/john/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, openssl, nss, nspr, kerberos, gmp, zlib, libpcap, re2 -, writeText, gcc +, writeText, gcc, pythonPackages, perl, perlPackages, makeWrapper }: with stdenv.lib; @@ -35,7 +35,11 @@ stdenv.mkDerivation rec { ''; configureFlags = [ "--disable-native-macro" ]; - buildInputs = [ openssl nss nspr kerberos gmp zlib libpcap re2 gcc ]; + buildInputs = [ openssl nss nspr kerberos gmp zlib libpcap re2 gcc pythonPackages.wrapPython perl makeWrapper ]; + propagatedBuildInputs = (with pythonPackages; [ dpkt scapy lxml ]) ++ # For pcap2john.py + (with perlPackages; [ DigestMD4 DigestMD5 DigestSHA1 GetoptLong MIMEBase64 # For pass_gen.pl + NetLDAP ]); # For sha-dump.pl + # TODO: Get dependencies for radius2john.pl and lion2john-alt.pl # gcc -DAC_BUILT -Wall vncpcap2john.o memdbg.o -g -lpcap -fopenmp -o ../run/vncpcap2john # gcc: error: memdbg.o: No such file or directory @@ -43,18 +47,23 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-DJOHN_SYSTEMWIDE=1" ]; - installPhase = '' - mkdir -p "$out/etc/john" "$out/share/john" "$out/share/doc/john" - find ../run -mindepth 1 -maxdepth 1 -type f -executable \ - -exec "${stdenv.shell}" "${writeText "john-binary-install.sh" '' - filename="$(basename "$1")" - install -vD "$1" "$out/bin/''${filename%.*}" - ''}" {} \; + postInstall = '' + mkdir -p "$out/bin" "$out/etc/john" "$out/share/john" "$out/share/doc/john" + find -L ../run -mindepth 1 -maxdepth 1 -type f -executable \ + -exec cp -d {} "$out/bin" \; cp -vt "$out/etc/john" ../run/*.conf cp -vt "$out/share/john" ../run/*.chr ../run/password.lst cp -vrt "$out/share/doc/john" ../doc/* ''; + postFixup = '' + wrapPythonPrograms + + for i in $out/bin/*.pl; do + wrapProgram "$i" --prefix PERL5LIB : $PERL5LIB + done + ''; + meta = { description = "John the Ripper password cracker"; license = licenses.gpl2; diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 7f095a3225b..a0fc788a69e 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "keybase-${version}"; - version = "1.0.33"; + version = "1.0.39"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/keybase" ]; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "1zgvriyir2ga0p4ah9ia1sbl9ydnrnw5ggq4c1ya8gcfgn8vzdsf"; + sha256 = "0b64h536xp8r1q7fa23mf1p8ybnh0fz1n468fp56mvh98vmqys5b"; }; buildFlags = [ "-tags production" ]; diff --git a/pkgs/tools/security/kpcli/default.nix b/pkgs/tools/security/kpcli/default.nix index 8d2ac2af010..3776c883ac7 100644 --- a/pkgs/tools/security/kpcli/default.nix +++ b/pkgs/tools/security/kpcli/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { chmod +x $out/bin/kpcli wrapProgram $out/bin/kpcli --set PERL5LIB \ - "${with perlPackages; stdenv.lib.makePerlPath [ + "${with perlPackages; stdenv.lib.makePerlPath ([ CaptureTiny Clipboard Clone CryptRijndael SortNaturally TermReadKey TermShellUI FileKeePass TermReadLineGnu XMLParser - ]}" + ] ++ stdenv.lib.optional stdenv.isDarwin MacPasteboard)}" ''; diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix index ce59ddca7c0..9395d4acb8b 100644 --- a/pkgs/tools/security/lastpass-cli/default.nix +++ b/pkgs/tools/security/lastpass-cli/default.nix @@ -1,24 +1,29 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig -, openssl, curl, libxml2, libxslt, asciidoc, docbook_xsl }: +{ stdenv, lib, fetchFromGitHub, asciidoc, cmake, docbook_xsl, pkgconfig +, bash-completion, openssl, curl, libxml2, libxslt }: stdenv.mkDerivation rec { name = "lastpass-cli-${version}"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "lastpass"; repo = "lastpass-cli"; rev = "v${version}"; - sha256 = "0nrsrd5cqyv2zydzzl1vryrnj1p0x17cx1rmrp4kmzh83bzgcfvv"; + sha256 = "0041z2awpmwq2fk8lbgp4fcia0r6wss2csvq5bxps0cx7fq69wc1"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ asciidoc cmake docbook_xsl pkgconfig ]; + buildInputs = [ - openssl curl libxml2 asciidoc docbook_xsl libxslt + bash-completion curl openssl libxml2 libxslt ]; - makeFlags = "PREFIX=$(out)"; + enableParallelBuilding = true; + + cmakeFlags = [ + "-DBASH_COMPLETION_COMPLETIONSDIR=./share/bash-completion/completions" + ]; installTargets = "install install-doc"; @@ -26,7 +31,7 @@ stdenv.mkDerivation rec { description = "Stores, retrieves, generates, and synchronizes passwords securely"; homepage = "https://github.com/lastpass/lastpass-cli"; license = licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; maintainers = with maintainers; [ cstrahan ]; }; } diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix index 88aa71810dc..b8da305c36d 100644 --- a/pkgs/tools/security/mkpasswd/default.nix +++ b/pkgs/tools/security/mkpasswd/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { installPhase = "make install-mkpasswd"; meta = with stdenv.lib; { - homepage = http://packages.qa.debian.org/w/whois.html; + homepage = https://packages.qa.debian.org/w/whois.html; description = "Overfeatured front-end to crypt, from the Debian whois package"; license = licenses.gpl2; maintainers = with maintainers; [ cstrahan fpletz ]; diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix index 1443409c022..1aced2cd427 100644 --- a/pkgs/tools/security/nitrokey-app/default.nix +++ b/pkgs/tools/security/nitrokey-app/default.nix @@ -1,16 +1,18 @@ -{ stdenv, cmake, fetchgit, hidapi, libusb1, pkgconfig, qt5 }: +{ stdenv, bash-completion, cmake, fetchgit, hidapi, libusb1, pkgconfig, qt5 }: stdenv.mkDerivation rec { name = "nitrokey-app"; - version = "1.1"; + version = "1.2"; + # We use fetchgit instead of fetchFromGitHub because of necessary git submodules src = fetchgit { url = "https://github.com/Nitrokey/nitrokey-app.git"; rev = "refs/tags/v${version}"; - sha256 = "11pz1p5qgghkr5f8s2wg34zqhxk2vq465i73w1h479j88x35rdp0"; + sha256 = "0mm6vlgxlmpahmmcn4awnfpx5rx5bj8m44cywhgxlmz012x73hzi"; }; buildInputs = [ + bash-completion hidapi libusb1 qt5.qtbase @@ -20,7 +22,7 @@ stdenv.mkDerivation rec { cmake pkgconfig ]; - cmakeFlags = "-DHAVE_LIBAPPINDICATOR=NO"; + cmakeFlags = "-DCMAKE_BUILD_TYPE=Release"; meta = with stdenv.lib; { description = "Provides extra functionality for the Nitrokey Pro and Storage"; diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index 45f995a5935..3d31596a43f 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -58,6 +58,6 @@ in stdenv.mkDerivation rec { homepage = http://www.nmap.org; license = licenses.gpl2; platforms = platforms.all; - maintainers = with maintainers; [ mornfall thoughtpolice fpletz ]; + maintainers = with maintainers; [ thoughtpolice fpletz ]; }; } diff --git a/pkgs/tools/security/notary/default.nix b/pkgs/tools/security/notary/default.nix new file mode 100644 index 00000000000..36685b1d1e4 --- /dev/null +++ b/pkgs/tools/security/notary/default.nix @@ -0,0 +1,55 @@ +{ stdenv, fetchFromGitHub, buildGoPackage, git, libtool }: + +buildGoPackage rec { + name = "notary-${version}"; + version = "0.5.1"; + gitcommit = "9211198"; + + src = fetchFromGitHub { + owner = "theupdateframework"; + repo = "notary"; + rev = "v${version}"; + sha256 = "0z9nsb1mrl0q5j02jkyzbc6xqsm83qzacsckypsxcrijhw935rs5"; + }; + + buildInputs = [ libtool ]; + + goPackagePath = "github.com/docker/notary"; + + buildPhase = '' + cd go/src/github.com/docker/notary + make GITCOMMIT=${gitcommit} GITUNTRACKEDCHANGES= client + ''; + + installPhase = '' + install -D bin/notary $bin/bin/notary + ''; + + meta = with stdenv.lib; { + description = " Notary is a project that allows anyone to have trust over arbitrary collections of data"; + longDescription = '' + The Notary project comprises a server and a client for running and + interacting with trusted collections. See the service architecture + documentation for more information. + + Notary aims to make the internet more secure by making it easy for people + to publish and verify content. We often rely on TLS to secure our + communications with a web server which is inherently flawed, as any + compromise of the server enables malicious content to be substituted for + the legitimate content. + + With Notary, publishers can sign their content offline using keys kept + highly secure. Once the publisher is ready to make the content available, + they can push their signed trusted collection to a Notary Server. + + Consumers, having acquired the publisher's public key through a secure + channel, can then communicate with any notary server or (insecure) mirror, + relying only on the publisher's key to determine the validity and + integrity of the received content. + ''; + license = licenses.asl20; + homepage = https://github.com/theupdateframework/notary; + maintainers = with maintainers; [ vdemeester ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/tools/security/onioncircuits/default.nix new file mode 100644 index 00000000000..24840426fd4 --- /dev/null +++ b/pkgs/tools/security/onioncircuits/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchgit, pythonPackages, intltool, gtk3, gobjectIntrospection, defaultIconTheme }: + +pythonPackages.buildPythonApplication rec { + name = "onioncircuits-${version}"; + version = "0.5"; + + src = fetchgit { + url = "https://git-tails.immerda.ch/onioncircuits/"; + rev = version; + sha256 = "13mqif9b9iajpkrl9ijspdnvy82kxhprxd5mw3njk68rcn4z2pcm"; + }; + + buildInputs = [ intltool gtk3 gobjectIntrospection ]; + propagatedBuildInputs = with pythonPackages; [ stem distutils_extra pygobject3 ]; + + postFixup = '' + wrapProgram "$out/bin/onioncircuits" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix XDG_DATA_DIRS : "$out/share:${defaultIconTheme}/share" + ''; + + meta = with stdenv.lib; { + homepage = https://tails.boum.org; + description = "GTK application to display Tor circuits and streams"; + license = licenses.gpl3; + maintainers = [ maintainers.phreedom ]; + }; +} + diff --git a/pkgs/tools/security/pass-otp/default.nix b/pkgs/tools/security/pass-otp/default.nix new file mode 100644 index 00000000000..327a9680f98 --- /dev/null +++ b/pkgs/tools/security/pass-otp/default.nix @@ -0,0 +1,29 @@ +{ stdenv, pass, fetchFromGitHub, oathToolkit }: +stdenv.mkDerivation { + name = "pass-otp"; + + src = fetchFromGitHub { + owner = "tadfisher"; + repo = "pass-otp"; + rev = "f2feb3082324a91089782af9b7fbb71d34aa213d"; + sha256 = "0iklvcfgw1320dggdr02lq3bc7xvnd2934l1w9kkjpbsfmhs955c"; + }; + + buildInputs = [ pass oathToolkit ]; + + patchPhase = '' + sed -i -e 's|OATH=\$(which oathtool)|OATH=${oathToolkit}/bin/oathtool|' otp.bash + ''; + + installPhase = '' + make PREFIX=$out install + ''; + + meta = with stdenv.lib; { + description = "A pass extension for managing one-time-password (OTP) tokens"; + homepage = https://github.com/tadfisher/pass-otp; + license = licenses.gpl3; + maintainers = with maintainers; [ jwiegley ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 74bb5cc5819..589316b1d1c 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "pcsclite-${version}"; - version = "1.8.22"; + version = "1.8.23"; src = fetchurl { # This URL changes in unpredictable ways, so it is not sensible # to put a version variable in there. - url = "https://alioth.debian.org/frs/download.php/file/4225/pcsc-lite-1.8.22.tar.bz2"; - sha256 = "01flkdyqs7kr6c63dv2qg8dwir3v9jlr9rzlw7vafrivxmhqydba"; + url = "https://alioth.debian.org/frs/download.php/file/4235/pcsc-lite-1.8.23.tar.bz2"; + sha256 = "1jc9ws5ra6v3plwraqixin0w0wfxj64drahrbkyrrwzghqjjc9ss"; }; patches = [ ./no-dropdir-literals.patch ]; @@ -20,7 +20,9 @@ stdenv.mkDerivation rec { "--enable-confdir=/etc" "--enable-ipcdir=/run/pcscd" ] ++ stdenv.lib.optional stdenv.isLinux - "--with-systemdsystemunitdir=\${out}/etc/systemd/system"; + "--with-systemdsystemunitdir=\${out}/etc/systemd/system" + ++ stdenv.lib.optional (!stdenv.isLinux) + "--disable-libsystemd"; postConfigure = '' sed -i -re '/^#define *PCSCLITE_HP_DROPDIR */ { diff --git a/pkgs/tools/security/polkit-gnome/default.nix b/pkgs/tools/security/polkit-gnome/default.nix index e8709130015..bfb3fb63b14 100644 --- a/pkgs/tools/security/polkit-gnome/default.nix +++ b/pkgs/tools/security/polkit-gnome/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { ''; meta = { - homepage = http://hal.freedesktop.org/docs/PolicyKit/; + homepage = https://hal.freedesktop.org/docs/PolicyKit/; description = "A dbus session bus service that is used to bring up authentication dialogs"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ phreedom ]; diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix index 3ec6abc3eb1..fc7639b1d5a 100644 --- a/pkgs/tools/security/signing-party/default.nix +++ b/pkgs/tools/security/signing-party/default.nix @@ -14,12 +14,12 @@ let ]; in stdenv.mkDerivation rec { pname = "signing-party"; - version = "2.6"; + version = "2.7"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://debian/pool/main/s/${pname}/${pname}_${version}.orig.tar.gz"; - sha256 = "1n5bpcfpl9vg1xp6r1jhbyahrgdyxp05b5pria1rh4m0qnv8sifr"; + sha256 = "0znklgvxn7k7p6q7r8chcj86zmzildjamr3qlqfxkj5m7yziqr21"; }; sourceRoot = "."; diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/tools/security/spectre-meltdown-checker/default.nix new file mode 100644 index 00000000000..d03c387a7c6 --- /dev/null +++ b/pkgs/tools/security/spectre-meltdown-checker/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, makeWrapper, coreutils, binutils-unwrapped }: + +stdenv.mkDerivation rec { + name = "spectre-meltdown-checker-${version}"; + version = "0.34"; + + src = fetchFromGitHub { + owner = "speed47"; + repo = "spectre-meltdown-checker"; + rev = "v${version}"; + sha256 = "0jlqxzii883yl5iqmywqqqjlhgswn033566a3vpspycj3sr8zrd2"; + }; + + prePatch = '' + substituteInPlace spectre-meltdown-checker.sh \ + --replace /bin/echo ${coreutils}/bin/echo + ''; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = with stdenv.lib; '' + install -Dt $out/lib spectre-meltdown-checker.sh + makeWrapper $out/lib/spectre-meltdown-checker.sh $out/bin/spectre-meltdown-checker \ + --prefix PATH : ${makeBinPath [ binutils-unwrapped ]} + ''; + + meta = with stdenv.lib; { + description = "Spectre & Meltdown vulnerability/mitigation checker for Linux"; + homepage = https://github.com/speed47/spectre-meltdown-checker; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index 960d11521a7..8674de1fcee 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -44,7 +44,7 @@ python3Packages.buildPythonApplication rec { target network (though it does require Python 2 at both ends). Works with Linux and Mac OS and supports DNS tunneling. ''; - maintainers = with maintainers; [ domenkozar nckx ]; + maintainers = with maintainers; [ domenkozar ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix index 87fda1467f0..782341923fa 100644 --- a/pkgs/tools/security/sslscan/default.nix +++ b/pkgs/tools/security/sslscan/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "sslscan-${version}"; - version = "1.11.10"; + version = "1.11.11"; src = fetchFromGitHub { owner = "rbsec"; repo = "sslscan"; rev = "${version}-rbsec"; - sha256 = "1bxr7p7nhg4b8wkcm7j2xk10gf370sqcvl06vbgnqd3azp55fhpf"; + sha256 = "0k1agdz52pdgihwfwbygp0mlwkf757vcwhvwc0mrz606l2wbmwmr"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 26311cce73c..5192f57582c 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - name = "sudo-1.8.21p2"; + name = "sudo-1.8.22"; src = fetchurl { urls = [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz" "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz" ]; - sha256 = "0s33szq6q59v5s377l4v6ybsdy7pfq6sz7y364j4x09ssdn79ibl"; + sha256 = "00pxp74xkwdcmrjwy55j0k8p684jk1zx3nzdc11v30q8q8kwnmkj"; }; prePatch = '' @@ -70,9 +70,9 @@ stdenv.mkDerivation rec { providing an audit trail of the commands and their arguments. ''; - homepage = http://www.sudo.ws/; + homepage = https://www.sudo.ws/; - license = http://www.sudo.ws/sudo/license.html; + license = https://www.sudo.ws/sudo/license.html; maintainers = [ stdenv.lib.maintainers.eelco ]; diff --git a/pkgs/tools/security/tboot/default.nix b/pkgs/tools/security/tboot/default.nix index 534ff3fd0ff..a07a374c5d8 100644 --- a/pkgs/tools/security/tboot/default.nix +++ b/pkgs/tools/security/tboot/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A pre-kernel/VMM module that uses Intel(R) TXT to perform a measured and verified launch of an OS kernel/VMM"; - homepage = http://sourceforge.net/projects/tboot/; + homepage = https://sourceforge.net/projects/tboot/; license = licenses.bsd3; maintainers = with maintainers; [ ak ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix index e8eb3aacd3e..9a7a245b813 100644 --- a/pkgs/tools/security/thc-hydra/default.nix +++ b/pkgs/tools/security/thc-hydra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, zlib, openssl, ncurses, libidn, pcre, libssh, libmysql, postgresql +{ stdenv, lib, fetchurl, zlib, openssl, ncurses, libidn, pcre, libssh, mysql, postgresql , withGUI ? false, makeWrapper, pkgconfig, gtk2 }: let @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { ''; nativeBuildInputs = lib.optionals withGUI [ pkgconfig makeWrapper ]; - buildInputs = [ zlib openssl ncurses libidn pcre libssh libmysql postgresql ] + buildInputs = [ zlib openssl ncurses libidn pcre libssh mysql.connector-c postgresql ] ++ lib.optional withGUI gtk2; postInstall = lib.optionalString withGUI '' diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index a60cea1a738..4d355bd86b8 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tor-0.3.1.9"; + name = "tor-0.3.2.9"; src = fetchurl { url = "https://dist.torproject.org/${name}.tar.gz"; - sha256 = "09ixizsr635qyshvrn1m5asjkaz4fm8dx80lc3ajyy0fi7vh86vf"; + sha256 = "03qn55c969zynnx71r82iaqnadpzq0qclq0zmjhb3n4qma8pnnj3"; }; outputs = [ "out" "geoip" ]; diff --git a/pkgs/tools/security/tpm-tools/default.nix b/pkgs/tools/security/tpm-tools/default.nix index 8c68787db25..1944cf236e1 100644 --- a/pkgs/tools/security/tpm-tools/default.nix +++ b/pkgs/tools/security/tpm-tools/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { application enablement of Trusted Computing using a Trusted Platform Module (TPM), similar to a smart card environment. ''; - homepage = http://sourceforge.net/projects/trousers/files/tpm-tools/; + homepage = https://sourceforge.net/projects/trousers/files/tpm-tools/; license = licenses.cpl10; maintainers = [ maintainers.ak ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix index ee1b9d84470..166f20dd7d6 100644 --- a/pkgs/tools/security/yara/default.nix +++ b/pkgs/tools/security/yara/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - version = "3.7.0"; + version = "3.7.1"; name = "yara-${version}"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara"; rev = "v${version}"; - sha256 = "1giq5677j0vh5vw0nsv5qcqddcif6jckqaxyqg13j0j54n1p6xyj"; + sha256 = "05smkn4ii8irx6ccnzrhwa39pkmrjyxjmfrwh6mhdd8iz51v5cgz"; }; # FIXME: this is probably not the right way to make it work diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix index cc4ccdd40f0..eda2197b9f6 100644 --- a/pkgs/tools/system/at/default.nix +++ b/pkgs/tools/system/at/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, bison, flex, pam +{ stdenv, fetchurl, fetchpatch, bison, flex, pam , sendmailPath ? "/run/wrappers/bin/sendmail" , atWrapperPath ? "/run/wrappers/bin/at" }: @@ -13,10 +13,17 @@ stdenv.mkDerivation rec { sha256 = "1fgsrqpx0r6qcjxmlsqnwilydhfxn976c870mjc0n1bkmcy94w88"; }; - patches = [ ./install.patch ]; + patches = [ + ./install.patch + (fetchpatch { + url = "https://raw.githubusercontent.com/riscv/riscv-poky/master/meta/recipes-extended/at/at/0001-remove-glibc-assumption.patch"; + sha256 = "1rk4hskp0c1jqkanzdxf873i6jgki3xhrm609fsam8an8sl1njnm"; + }) + ]; - buildInputs = - [ bison flex pam ]; + nativeBuildInputs = [ bison flex ]; + + buildInputs = [ pam ]; preConfigure = '' diff --git a/pkgs/tools/system/at/install.patch b/pkgs/tools/system/at/install.patch index 35be4af875a..41a35a78953 100644 --- a/pkgs/tools/system/at/install.patch +++ b/pkgs/tools/system/at/install.patch @@ -20,7 +20,7 @@ + $(INSTALL) -m 755 -d $(IROOT)$(sbindir) + $(INSTALL) -m 755 -d $(IROOT)$(docdir) + $(INSTALL) -m 755 -d $(IROOT)$(atdocdir) -+ $(INSTALL) -m 0755 -s at $(IROOT)$(bindir) ++ $(INSTALL) -m 0755 at $(IROOT)$(bindir) $(LN_S) -f at $(IROOT)$(bindir)/atq $(LN_S) -f at $(IROOT)$(bindir)/atrm - $(INSTALL) -g root -o root -m 755 batch $(IROOT)$(bindir) @@ -34,7 +34,7 @@ + $(INSTALL) -d -m 755 $(IROOT)$(man1dir) + $(INSTALL) -d -m 755 $(IROOT)$(man5dir) + $(INSTALL) -d -m 755 $(IROOT)$(man8dir) -+ $(INSTALL) -m 755 -s atd $(IROOT)$(sbindir) ++ $(INSTALL) -m 755 atd $(IROOT)$(sbindir) + $(INSTALL) -m 755 atrun $(IROOT)$(sbindir) + $(INSTALL) -m 644 at.1 $(IROOT)$(man1dir)/ cd $(IROOT)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1 diff --git a/pkgs/tools/system/augeas/default.nix b/pkgs/tools/system/augeas/default.nix index fb1806b850e..dca6d37d9af 100644 --- a/pkgs/tools/system/augeas/default.nix +++ b/pkgs/tools/system/augeas/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "augeas-${version}"; - version = "1.8.1"; + version = "1.10.0"; src = fetchurl { url = "http://download.augeas.net/${name}.tar.gz"; - sha256 = "1yf93fqwav1zsl8dpyfkf0g11w05mmfckqy6qsjy5zkklnspbkv5"; + sha256 = "04q2hr3xj71rdbjdj3jiygi8dbiq1x4szlyavxj1xjiw9jcgd41a"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ readline libxml2 ]; diff --git a/pkgs/tools/system/awstats/default.nix b/pkgs/tools/system/awstats/default.nix index 1b3b694bf78..aaf5bf136cb 100644 --- a/pkgs/tools/system/awstats/default.nix +++ b/pkgs/tools/system/awstats/default.nix @@ -2,11 +2,11 @@ perlPackages.buildPerlPackage rec { name = "awstats-${version}"; - version = "7.4"; + version = "7.7"; src = fetchurl { url = "mirror://sourceforge/awstats/${name}.tar.gz"; - sha256 = "0mdbilsl8g9a84qgyws4pakhqr3mfhs5g5dqbgsn9gn285rzxas3"; + sha256 = "0z3p77jnpjilajs9yv87r8xla2x1gjqlvrhpbgbh5ih73386v3j2"; }; postPatch = '' @@ -41,6 +41,9 @@ perlPackages.buildPerlPackage rec { mv wwwroot "$out/wwwroot" rm -r "$out/wwwroot/classes/src/" + mkdir -p "$out/share/awstats" + mv tools "$out/share/awstats/tools" + mkdir -p "$bin/bin" ln -s "$out/wwwroot/cgi-bin/awstats.pl" "$bin/bin/awstats" diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index ddfd8cbbc01..e9ce2913a6c 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -20,12 +20,12 @@ , libtool ? null , lm_sensors ? null , lvm2 ? null -, libmysql ? null +, mysql ? null , postgresql ? null , protobufc ? null , python ? null , rabbitmq-c ? null -, riemann ? null +, riemann_c_client ? null , rrdtool ? null , udev ? null , varnish ? null @@ -33,25 +33,30 @@ , net_snmp ? null , hiredis ? null , libmnl ? null +, mosquitto ? null +, rdkafka ? null +, mongoc ? null }: stdenv.mkDerivation rec { - version = "5.7.2"; + version = "5.8.0"; name = "collectd-${version}"; src = fetchurl { url = "http://collectd.org/files/${name}.tar.bz2"; - sha256 = "14p5cc3ys3qfg71xzxfvmxdmz5l4brpbhlmw1fwdda392lia084x"; + sha256 = "1j8mxgfq8039js2bscphd6cnriy35hk4jrxfjz5k6mghpdvg8vxh"; }; - # on 5.7.2: lvm2app.h:21:2: error: #warning "liblvm2app is deprecated, use D-Bus API instead." [-Werror=cpp] - NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + # on 5.8.0: lvm2app.h:21:2: error: #warning "liblvm2app is deprecated, use D-Bus API instead." [-Werror=cpp] + NIX_CFLAGS_COMPILE = [ "-Wno-error=cpp" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ curl libdbi libgcrypt libmemcached cyrus_sasl libnotify gdk_pixbuf liboping libpcap libvirt - libxml2 libmysql postgresql protobufc rrdtool + libxml2 postgresql protobufc rrdtool varnish yajl jdk libtool python hiredis libmicrohttpd + riemann_c_client mosquitto rdkafka mongoc + ] ++ stdenv.lib.optionals (mysql != null) [ mysql.connector-c ] ++ stdenv.lib.optionals stdenv.isLinux [ iptables libatasmart libcredis libmodbus libsigrok lm_sensors lvm2 rabbitmq-c udev net_snmp libmnl @@ -60,11 +65,7 @@ stdenv.mkDerivation rec { darwin.apple_sdk.frameworks.ApplicationServices ]; - # for some reason libsigrok isn't auto-detected - configureFlags = - [ "--localstatedir=/var" ] ++ - stdenv.lib.optional (stdenv.isLinux && libsigrok != null) "--with-libsigrok" ++ - stdenv.lib.optional (python != null) "--with-python=${python}/bin/python"; + configureFlags = [ "--localstatedir=/var" ]; # do not create directories in /var during installPhase postConfigure = '' @@ -77,6 +78,8 @@ stdenv.mkDerivation rec { fi ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Daemon which collects system performance statistics periodically"; homepage = https://collectd.org; diff --git a/pkgs/tools/system/ctop/default.nix b/pkgs/tools/system/ctop/default.nix index 5ff4e7220ab..533f0ab11e4 100644 --- a/pkgs/tools/system/ctop/default.nix +++ b/pkgs/tools/system/ctop/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Concise commandline monitoring for containers"; - homepage = http://ctop.sh/; + homepage = https://ctop.sh/; license = licenses.mit; maintainers = with maintainers; [ apeyroux ]; }; diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix index 5f439ccdb53..e6af7abeda2 100644 --- a/pkgs/tools/system/ddrescue/default.nix +++ b/pkgs/tools/system/ddrescue/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ lzip ]; - doCheck = hostPlatform == buildPlatform; + doCheck = true; # not cross; + configureFlags = [ "CXX=${stdenv.cc.targetPrefix}c++" ]; meta = with stdenv.lib; { description = "GNU ddrescue, a data recovery tool"; diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index 963c383b66e..89fb5f05ac9 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, libaio, python, zlib }: let - version = "3.2"; - sha256 = "1sp83lxhrwg4627bma3pkcfg8yd1w3r6p02rdldv083962ljkinm"; + version = "3.3"; + sha256 = "0ipdpdn6rlsbppqjddyyk8c6rg1dl17d62dwwm0ijybi0m7imy1p"; in stdenv.mkDerivation rec { diff --git a/pkgs/tools/system/foremost/default.nix b/pkgs/tools/system/foremost/default.nix index 0114c1d41ff..b3048f2fcb7 100644 --- a/pkgs/tools/system/foremost/default.nix +++ b/pkgs/tools/system/foremost/default.nix @@ -35,6 +35,5 @@ stdenv.mkDerivation rec { homepage = http://foremost.sourceforge.net/; license = licenses.publicDomain; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index de6c9151865..03839339926 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, libgcrypt, readline }: stdenv.mkDerivation rec { - version = "1.5.5"; + version = "1.5.7"; name = "freeipmi-${version}"; src = fetchurl { url = "mirror://gnu/freeipmi/${name}.tar.gz"; - sha256 = "0lzzvhzbdl1cxin4xz3lirqxsjwmjr5ac0qr4g21cqsv2j6vj85f"; + sha256 = "1rdxs33klk6956rg8mn2dxwkk43y5yilvgvbcka8g6v4x0r98v5l"; }; buildInputs = [ libgcrypt readline ]; diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index f5ab6276c81..f9fba2dde91 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { description = "Set of text-mode partitioning tools for Globally Unique Identifier (GUID) Partition Table (GPT) disks"; license = licenses.gpl2; homepage = http://www.rodsbooks.com/gdisk/; - maintainers = with maintainers; [ nckx ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index 76d659efc52..750ff8e59ef 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = https://hisham.hm/htop/; license = licenses.gpl2Plus; platforms = with platforms; linux ++ freebsd ++ openbsd ++ darwin; - maintainers = with maintainers; [ rob relrod nckx ]; + maintainers = with maintainers; [ rob relrod ]; }; } diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/tools/system/lshw/default.nix index 499f7c46154..f6e09b6816f 100644 --- a/pkgs/tools/system/lshw/default.nix +++ b/pkgs/tools/system/lshw/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://ezix.org/project/wiki/HardwareLiSter; + homepage = https://ezix.org/project/wiki/HardwareLiSter; description = "Provide detailed information on the hardware configuration of the machine"; license = licenses.gpl2; maintainers = with maintainers; [ phreedom jgeerds ]; diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index ed177820b64..7bb98e8e80c 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook, zlib, pkgconfig, libuuid }: stdenv.mkDerivation rec{ - version = "1.7.0"; + version = "1.9.0"; name = "netdata-${version}"; src = fetchFromGitHub { rev = "v${version}"; owner = "firehol"; repo = "netdata"; - sha256 = "1fv01jnbgwbafsxavlji90zdqizn8m4nfg9ivc4sbi05j036bg6n"; + sha256 = "1vy0jz5lxw63b830l9jgf1qqhp41gzapyhdr5k1gwg3zghvlg10w"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index 8cf7f81381f..d75be0ff5bc 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -40,7 +40,7 @@ description = "User-space implementation of chroot, mount --bind and binfmt_misc"; platforms = platforms.linux; license = licenses.gpl2; - maintainers = with maintainers; [ ianwookim nckx makefu ]; + maintainers = with maintainers; [ ianwookim makefu ]; }; }) (if stdenv.isAarch64 then rec { diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index e642b91c3d9..a6999942e0c 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, autoreconfHook, libestr, json_c, zlib, pythonPackages, fastJson -, libkrb5 ? null, systemd ? null, jemalloc ? null, libmysql ? null, postgresql ? null +, libkrb5 ? null, systemd ? null, jemalloc ? null, mysql ? null, postgresql ? null , libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null , libgt ? null, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null @@ -22,11 +22,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ - fastJson libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc libmysql + fastJson libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl librelp libgt libksi liblogging libnet hadoop rdkafka libmongo-client czmq rabbitmq-c hiredis - ] ++ stdenv.lib.optional stdenv.isLinux systemd; + ] ++ stdenv.lib.optional (mysql != null) mysql.connector-c + ++ stdenv.lib.optional stdenv.isLinux systemd; hardeningDisable = [ "format" ]; @@ -49,7 +50,7 @@ stdenv.mkDerivation rec { (mkFlag false "valgrind") (mkFlag false "diagtools") (mkFlag true "usertools") - (mkFlag (libmysql != null) "mysql") + (mkFlag (mysql != null) "mysql") (mkFlag (postgresql != null) "pgsql") (mkFlag (libdbi != null) "libdbi") (mkFlag (net_snmp != null) "snmp") diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/tools/system/sleuthkit/default.nix index b63d60633c3..c4347da4460 100644 --- a/pkgs/tools/system/sleuthkit/default.nix +++ b/pkgs/tools/system/sleuthkit/default.nix @@ -1,16 +1,23 @@ -{ stdenv, fetchurl, libewf, afflib, openssl, zlib }: +{ stdenv, fetchFromGitHub, autoreconfHook, libewf, afflib, openssl, zlib }: stdenv.mkDerivation rec { - version = "4.2.0"; + version = "4.5.0"; name = "sleuthkit-${version}"; - src = fetchurl { - url = "mirror://sourceforge/sleuthkit/${name}.tar.gz"; - sha256 = "08s7c1jwn2rjq2jm8859ywaiq12adrl02m61hc04iblqjzqqgcli"; + src = fetchFromGitHub { + owner = "sleuthkit"; + repo = "sleuthkit"; + rev = name; + sha256 = "0h9l9yl5ibbgriq12gizg8k0r6jw6bnii3iljjp4p963wc0ms9b9"; }; + postPatch = '' + substituteInPlace tsk/img/ewf.c --replace libewf_handle_read_random libewf_handle_read_buffer_at_offset + ''; + enableParallelBuilding = true; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libewf afflib openssl zlib ]; # Hack to fix the RPATH. @@ -18,6 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "A forensic/data recovery tool"; + homepage = https://www.sleuthkit.org/; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.ipl10; diff --git a/pkgs/tools/system/sleuthkit/default.upstream b/pkgs/tools/system/sleuthkit/default.upstream deleted file mode 100644 index f8ffe9352ed..00000000000 --- a/pkgs/tools/system/sleuthkit/default.upstream +++ /dev/null @@ -1,5 +0,0 @@ -url http://sourceforge.net/projects/sleuthkit/files/sleuthkit/ -SF_version_dir -SF_version_tarball -SF_redirect -minimize_overwrite diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index cdc7122fcc4..22080db908c 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -40,6 +40,5 @@ stdenv.mkDerivation rec { downloadPage = http://kernel.ubuntu.com/~cking/tarballs/stress-ng/; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/system/suid-chroot/default.nix b/pkgs/tools/system/suid-chroot/default.nix index ebedf5f544e..f407be7c585 100644 --- a/pkgs/tools/system/suid-chroot/default.nix +++ b/pkgs/tools/system/suid-chroot/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Setuid-safe wrapper for chroot"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ nckx ]; platforms = with platforms; unix; }; } diff --git a/pkgs/tools/system/supervise/default.nix b/pkgs/tools/system/supervise/default.nix index 838663c3072..c264b73b502 100644 --- a/pkgs/tools/system/supervise/default.nix +++ b/pkgs/tools/system/supervise/default.nix @@ -1,22 +1,15 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchzip }: stdenv.mkDerivation rec { name = "supervise-${version}"; - version = "1.0.0"; + version = "1.2.0"; - src = fetchFromGitHub { - owner = "catern"; - repo = "supervise"; - rev = "v${version}"; - sha256 = "1cjdxgns3gh2ir4kcmjdmc480w8sm49inws0ihhjmnisjy4100lg"; + src = fetchzip { + url = "https://github.com/catern/supervise/releases/download/v${version}/supervise-${version}.tar.gz"; + sha256 = "07v3197nf3jbx2w6jxzyk9b8p5qjj9irpr4jvv5lkfbi7s6rav3k"; }; - installPhase = '' - mkdir -p $out/bin - cp supervise unlinkwait -t $out/bin - ''; - meta = with stdenv.lib; { homepage = https://github.com/catern/supervise; description = "A minimal unprivileged process supervisor making use of modern Linux features"; diff --git a/pkgs/tools/system/symlinks/default.nix b/pkgs/tools/system/symlinks/default.nix index ec2f90876b3..240ad9de19d 100644 --- a/pkgs/tools/system/symlinks/default.nix +++ b/pkgs/tools/system/symlinks/default.nix @@ -2,27 +2,26 @@ stdenv.mkDerivation rec { name = "symlinks-${version}"; - version = "1.4"; + version = "1.4.3"; src = fetchurl { - url = "http://www.ibiblio.org/pub/Linux/utils/file/${name}.tar.gz"; - sha256 = "1683psyi8jwq6anhnkwwyaf7pfksf19v04fignd6vi52s2fnifxh"; + url = "https://github.com/brandt/symlinks/archive/v${version}.tar.gz"; + sha256 = "1cihrd3dap52z1msdhhgda7b7wy1l5ysfvyba8yxb3zjk0l5n417"; }; + buildFlags = [ "CC=${stdenv.cc}/bin/cc" ]; + installPhase = '' - mkdir -p $out/bin - mkdir -p $out/share/man - cp symlinks $out/bin/ - cp symlinks.8 $out/share/man/ + mkdir -p $out/bin $out/share/man/man8 + cp symlinks $out/bin + cp symlinks.8 $out/share/man/man8 ''; - # No license is mentioned in the code but - # http://www.ibiblio.org/pub/Linux/utils/file/symlinks.lsm - # and other package managers list it as - # "(c) Mark Lord, freely distributable" meta = with stdenv.lib; { - description = "A symbolic link maintenance utility"; - maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; + description = "Find and remedy problematic symbolic links on a system"; + homepage = "https://github.com/brandt/symlinks"; + license = licenses.mit; + maintainers = with maintainers; [ goibhniu ckauhaus ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix index 11066dfd593..b9467902c1f 100644 --- a/pkgs/tools/system/thinkfan/default.nix +++ b/pkgs/tools/system/thinkfan/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { license = stdenv.lib.licenses.gpl3; homepage = http://thinkfan.sourceforge.net/; - maintainers = with stdenv.lib.maintainers; [ domenkozar nckx ]; + maintainers = with stdenv.lib.maintainers; [ domenkozar ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix index 7382078f114..d8c42a0f20d 100644 --- a/pkgs/tools/text/aha/default.nix +++ b/pkgs/tools/text/aha/default.nix @@ -23,6 +23,5 @@ stdenv.mkDerivation rec { homepage = https://github.com/theZiz/aha; license = with licenses; [ lgpl2Plus mpl11 ]; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix index 381dc8dd457..c46f9624155 100644 --- a/pkgs/tools/text/colordiff/default.nix +++ b/pkgs/tools/text/colordiff/default.nix @@ -22,6 +22,5 @@ stdenv.mkDerivation rec { homepage = https://www.colordiff.org/; license = licenses.gpl3; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/text/diffstat/default.nix b/pkgs/tools/text/diffstat/default.nix index cfc1d4badbd..d106d140a67 100644 --- a/pkgs/tools/text/diffstat/default.nix +++ b/pkgs/tools/text/diffstat/default.nix @@ -4,7 +4,10 @@ stdenv.mkDerivation rec { name = "diffstat-1.61"; src = fetchurl { - url = "ftp://invisible-island.net/diffstat/${name}.tgz"; + urls = [ + "ftp://ftp.invisible-island.net/diffstat/${name}.tgz" + "https://invisible-mirror.net/archives/diffstat/${name}.tgz" + ]; sha256 = "1vjmda2zfjxg0qkaj8hfqa8g6bfwnn1ja8696rxrjgqq4w69wd95"; }; diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index cd64bd1566b..60628e2139c 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { configureFlags = # "pr" need not be on the PATH as a run-time dep, so we need to tell # configure where it is. Covers the cross and native case alike. - stdenv.lib.optional (coreutils != null) "PR_PROGRAM=${coreutils}/bin/pr"; + stdenv.lib.optional (coreutils != null) "PR_PROGRAM=${coreutils}/bin/pr" + ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "gl_cv_func_getopt_gnu=yes"; meta = { homepage = http://www.gnu.org/software/diffutils/diffutils.html; diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix index 338967e5b9a..59697891b6a 100644 --- a/pkgs/tools/text/dos2unix/default.nix +++ b/pkgs/tools/text/dos2unix/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "dos2unix-${version}"; - version = "7.3.4"; + version = "7.4.0"; src = fetchurl { - url = "http://waterlan.home.xs4all.nl/dos2unix/${name}.tar.gz"; - sha256 = "1i9hbxn0br7xa18z4bjpkdv7mrzmbfxhm44mzpd07yd2qnxsgkcc"; + url = "https://waterlan.home.xs4all.nl/dos2unix/${name}.tar.gz"; + sha256 = "12h4c61g376bhq03y5g2xszkrkrj5hwd928rly3xsp6rvfmnbixs"; }; configurePhase = '' @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { description = "Tools to transform text files from dos to unix formats and vicervesa"; license = licenses.bsd2; maintainers = with maintainers; [viric ndowens ]; - + }; } diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index 65d0a1e4c00..6783158ca77 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -41,6 +41,8 @@ stdenv.mkDerivation rec { (if interactive then "--with-readline=${readline.dev}" else "--without-readline") ]; + makeFlags = "AR=${stdenv.cc.targetPrefix}ar"; + inherit doCheck; postInstall = '' diff --git a/pkgs/tools/text/gist/default.nix b/pkgs/tools/text/gist/default.nix index 11fcae85528..cf4b90643d7 100644 --- a/pkgs/tools/text/gist/default.nix +++ b/pkgs/tools/text/gist/default.nix @@ -5,7 +5,7 @@ buildRubyGem rec { name = "${gemName}-${version}"; gemName = "gist"; version = "4.6.1"; - sha256 = "16qvmn7syvcf4lnblngzvq8xynvb62h1xhfc7xfb0c1sjh166hff"; + source.sha256 = "16qvmn7syvcf4lnblngzvq8xynvb62h1xhfc7xfb0c1sjh166hff"; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix index 13579b57e79..dfdb25438cf 100644 --- a/pkgs/tools/text/gnupatch/default.nix +++ b/pkgs/tools/text/gnupatch/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { "ac_cv_func_strnlen_working=yes" ]; - doCheck = hostPlatform == buildPlatform; + doCheck = true; # not cross; meta = { description = "GNU Patch, a program to apply differences to files"; diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 90d7c2f4aa8..1fcfdd85e7a 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "highlight-${version}"; - version = "3.41"; + version = "3.42"; src = fetchFromGitHub { owner = "andre-simon"; repo = "highlight"; rev = "${version}"; - sha256 = "163ghkyv3v6v200pskajlsz6sbq3hi31qx7abjcbwc0dajqfngvj"; + sha256 = "1fxx827igzqjn5rri57b8980hnd3ixz3j7smfxwi1ivfhlfznzgr"; }; nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin gcc ; diff --git a/pkgs/tools/text/hyx/default.nix b/pkgs/tools/text/hyx/default.nix new file mode 100644 index 00000000000..1ba3534e3f8 --- /dev/null +++ b/pkgs/tools/text/hyx/default.nix @@ -0,0 +1,22 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "hyx-0.1.4"; + + src = fetchurl { + url = "https://yx7.cc/code/hyx/${name}.tar.xz"; + sha256 = "049r610hyrrfa62vpiqyb3rh99bpy8cnqy4nd4sih01733cmdhyx"; + }; + + installPhase = '' + install -vD hyx $out/bin/hyx + ''; + + meta = with lib; { + description = "minimalistic but powerful Linux console hex editor"; + homepage = https://yx7.cc/code/; + license = licenses.mit; + maintainers = with maintainers; [ fpletz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/text/icdiff/default.nix b/pkgs/tools/text/icdiff/default.nix index e2be6e9aca3..85888dbbf0d 100644 --- a/pkgs/tools/text/icdiff/default.nix +++ b/pkgs/tools/text/icdiff/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { name = "icdiff-${version}"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "jeffkaufman"; repo = "icdiff"; rev = "release-${version}"; - sha256 = "03gcgj3xsqasvgkr8r0q1ljbw2kd2xmfb21qpxhk9lqqm2gl11sv"; + sha256 = "0ffn5kq7dwvrimxgpj9ksym36c18md8nsdps82qzhm1xq7p9w9yb"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/text/mawk/default.nix b/pkgs/tools/text/mawk/default.nix index a8657c3ea2f..ed54f9d349e 100644 --- a/pkgs/tools/text/mawk/default.nix +++ b/pkgs/tools/text/mawk/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ + "ftp://ftp.invisible-island.net/mawk/${name}.tgz" "https://invisible-mirror.net/archives/mawk/${name}.tgz" - "ftp://invisible-island.net/mawk/${name}.tgz" ]; sha256 = "0nwyxhipn4jx7j695lih1xggxm6cp4fjk4wbgihd33ni3rfi25yv"; }; diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/tools/text/miller/default.nix new file mode 100644 index 00000000000..a17c348c4cc --- /dev/null +++ b/pkgs/tools/text/miller/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, flex, libtool }: + +stdenv.mkDerivation rec { + name = "miller-${version}"; + + version = "5.3.0"; + + src = fetchFromGitHub { + owner = "johnkerl"; + repo = "miller"; + rev = "${version}"; + sha256 = "0abw2n6mi4wbgwihcv3y2xccqx4sj0gdgwvdrg2jkcgraa78sw8v"; + }; + + nativeBuildInputs = [ autoreconfHook flex libtool ]; + + meta = with stdenv.lib; { + description = "Miller is like awk, sed, cut, join, and sort for name-indexed data such as CSV, TSV, and tabular JSON."; + homepage = "http://johnkerl.org/miller/"; + license = licenses.bsd2; + maintainers = with maintainers; [ mstarzyk ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/text/replace/default.nix b/pkgs/tools/text/replace/default.nix index 18ef074c8a5..2719a4c8191 100644 --- a/pkgs/tools/text/replace/default.nix +++ b/pkgs/tools/text/replace/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { patches = [./malloc.patch]; meta = { - homepage = http://replace.richardlloyd.org.uk/; + homepage = https://replace.richardlloyd.org.uk/; description = "A tool to replace verbatim strings"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/text/sgml/opensp/setup-hook.sh b/pkgs/tools/text/sgml/opensp/setup-hook.sh index 52da517a8cb..753a3ea6428 100644 --- a/pkgs/tools/text/sgml/opensp/setup-hook.sh +++ b/pkgs/tools/text/sgml/opensp/setup-hook.sh @@ -18,5 +18,5 @@ if test -z "$sgmlHookDone"; then export ftp_proxy=http://nodtd.invalid/ export SGML_CATALOG_FILES - envHooks+=(addSGMLCatalogs) + addEnvHooks "$targetOffset" addSGMLCatalogs fi diff --git a/pkgs/tools/text/txt2tags/default.nix b/pkgs/tools/text/txt2tags/default.nix index 6aad3c7b23d..592f9b8f188 100644 --- a/pkgs/tools/text/txt2tags/default.nix +++ b/pkgs/tools/text/txt2tags/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://txt2tags.org/; + homepage = https://txt2tags.org/; description = "A KISS markup language"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ kovirobi ]; diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix index aeef86331f3..f4edc02b9fa 100644 --- a/pkgs/tools/text/wdiff/default.nix +++ b/pkgs/tools/text/wdiff/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { description = "Comparing files on a word by word basis"; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/typesetting/kindlegen/default.nix b/pkgs/tools/typesetting/kindlegen/default.nix index 159119a8a71..4e9a40239bf 100644 --- a/pkgs/tools/typesetting/kindlegen/default.nix +++ b/pkgs/tools/typesetting/kindlegen/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, stdenv, unzip }: let version = "2.9"; @@ -32,6 +32,8 @@ in stdenv.mkDerivation rec { sourceRoot = "."; + nativeBuildInputs = stdenv.lib.optional (stdenv.lib.hasSuffix ".zip" url) unzip; + installPhase = '' mkdir -p $out/bin $out/share/kindlegen/doc install -m755 kindlegen $out/bin/kindlegen diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix index 84747780940..9a7dac0a0ca 100644 --- a/pkgs/tools/typesetting/pdf2djvu/default.nix +++ b/pkgs/tools/typesetting/pdf2djvu/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }: stdenv.mkDerivation rec { - version = "0.9.7"; + version = "0.9.8"; name = "pdf2djvu-${version}"; src = fetchurl { url = "https://github.com/jwilk/pdf2djvu/releases/download/${version}/${name}.tar.xz"; - sha256 = "1h92f9prx69wz9h57lncxj8ddh2xg6q7hjhlqqzzf30k59il4zcy"; + sha256 = "0kc3n4lm9dd13w66ng7l637ha241q89xrv9da0wzsdg6v0gp6ifg"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/typesetting/pdf2odt/default.nix b/pkgs/tools/typesetting/pdf2odt/default.nix index 902cf9a5f83..3e40c9caf28 100644 --- a/pkgs/tools/typesetting/pdf2odt/default.nix +++ b/pkgs/tools/typesetting/pdf2odt/default.nix @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PDF to ODT format converter"; - homepage = http://github.com/gutschke/pdf2odt; + homepage = https://github.com/gutschke/pdf2odt; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/tools/typesetting/pdftk/default.nix b/pkgs/tools/typesetting/pdftk/default.nix index 11baa176b88..71cc1738837 100644 --- a/pkgs/tools/typesetting/pdftk/default.nix +++ b/pkgs/tools/typesetting/pdftk/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1hdq6zm2dx2f9h7bjrp6a1hfa1ywgkwydp14i2sszjiszljnm3qi"; }; - buildInputs = [ gcj unzip ]; + nativeBuildInputs = [ gcj unzip ]; hardeningDisable = [ "fortify" "format" ]; diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix index 7ffccde2c03..c4eaf4e1df4 100644 --- a/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -21,11 +21,11 @@ assert enableAllFeatures -> ghostscript != null; stdenv.mkDerivation rec { - name = "dblatex-0.3.7"; + name = "dblatex-0.3.10"; src = fetchurl { url = "mirror://sourceforge/dblatex/${name}.tar.bz2"; - sha256 = "0bkjgrn03dy5c7438s429wnv6z5ynxkr4pbhp2z49kynskgkzkjr"; + sha256 = "1yicd861rqz78i2khl35j7nvc0ccv4jx4hzqrbhll17082vrdmkg"; }; buildInputs = [ python2 libxslt tex ] diff --git a/pkgs/tools/typesetting/tex/tetex/setup-hook.sh b/pkgs/tools/typesetting/tex/tetex/setup-hook.sh index 9c5424e881e..5faef7fe5df 100644 --- a/pkgs/tools/typesetting/tex/tetex/setup-hook.sh +++ b/pkgs/tools/typesetting/tex/tetex/setup-hook.sh @@ -4,4 +4,4 @@ addTeXMFPath () { fi } -envHooks+=(addTeXMFPath) +addEnvHooks "$targetOffset" addTeXMFPath diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 38642b815f8..dc8f0908ea8 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -4,7 +4,7 @@ */ { stdenv, lib, fetchurl, runCommand, writeText, buildEnv , callPackage, ghostscriptX, harfbuzz, poppler_min -, makeWrapper, perl522, python, ruby +, makeWrapper, python, ruby, perl , useFixedHashes ? true , recurseIntoAttrs }: @@ -28,8 +28,7 @@ let # function for creating a working environment from a set of TL packages combine = import ./combine.nix { inherit bin combinePkgs buildEnv fastUnique lib makeWrapper writeText - stdenv python ruby; - perl = perl522; # avoid issues like #26890, probably remove after texlive upgrade + stdenv python ruby perl; ghostscript = ghostscriptX; # could be without X, probably, but we use X above }; @@ -38,8 +37,10 @@ let /* # beware: the URL below changes contents continuously curl http://mirror.ctan.org/tex-archive/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz \ | xzcat | uniq -u | sed -rn -f ./tl2nix.sed > ./pkgs.nix */ - orig = import ./pkgs.nix tl; # XXX XXX XXX FIXME: the file is probably too big now XXX XXX XXX XXX XXX XXX - removeSelfDep = lib.mapAttrs (n: p: if p ? deps then p // { deps = lib.filterAttrs (dn: _: n != dn) p.deps; } else p); + orig = import ./pkgs.nix tl; + removeSelfDep = lib.mapAttrs + (n: p: if p ? deps then p // { deps = lib.filterAttrs (dn: _: n != dn) p.deps; } + else p); clean = removeSelfDep (orig // { # overrides of texlive.tlpdb @@ -113,6 +114,10 @@ let urls = args.urls or (if args ? url then [ args.url ] else map (up: "${up}/${urlName}.tar.xz") urlPrefixes ); + + # Upstream refuses to distribute stable tarballs, so we host snapshots on IPFS. + # Common packages should get served from the binary cache anyway. + # See discussions, e.g. https://github.com/NixOS/nixpkgs/issues/24683 urlPrefixes = args.urlPrefixes or [ http://146.185.144.154/texlive-2017 # IPFS GW is second, as it doesn't have a good time-outing behavior diff --git a/pkgs/tools/typesetting/tex/texlive/setup-hook.sh b/pkgs/tools/typesetting/tex/texlive/setup-hook.sh index 9c5424e881e..5faef7fe5df 100644 --- a/pkgs/tools/typesetting/tex/texlive/setup-hook.sh +++ b/pkgs/tools/typesetting/tex/texlive/setup-hook.sh @@ -4,4 +4,4 @@ addTeXMFPath () { fi } -envHooks+=(addTeXMFPath) +addEnvHooks "$targetOffset" addTeXMFPath diff --git a/pkgs/tools/video/flvtool2/default.nix b/pkgs/tools/video/flvtool2/default.nix index 65bc240af00..9a60ebf17be 100644 --- a/pkgs/tools/video/flvtool2/default.nix +++ b/pkgs/tools/video/flvtool2/default.nix @@ -5,7 +5,7 @@ buildRubyGem rec { name = "${gemName}-${version}"; gemName = "flvtool2"; version = "1.0.6"; - sha256 = "0xsla1061pi4ryh3jbvwsbs8qchprchbqjy7652g2g64v37i74qj"; + source.sha256 = "0xsla1061pi4ryh3jbvwsbs8qchprchbqjy7652g2g64v37i74qj"; meta = { homepage = https://github.com/unnu/flvtool2; diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index 72e3cb0ed2d..25752afd995 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -101,7 +101,7 @@ in with localPython.pkgs; buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = http://aws.amazon.com/elasticbeanstalk/; + homepage = https://aws.amazon.com/elasticbeanstalk/; description = "A command line interface for Elastic Beanstalk."; maintainers = with maintainers; [ eqyiel ]; license = licenses.asl20; diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix new file mode 100644 index 00000000000..120727f3873 --- /dev/null +++ b/pkgs/tools/virtualization/cri-tools/default.nix @@ -0,0 +1,15 @@ +{ buildGoPackage, fetchurl }: + +buildGoPackage + { name = "cri-tools-1.0.0-alpha.0"; + src = fetchurl + { url = "https://github.com/kubernetes-incubator/cri-tools/archive/v1.0.0-alpha.0.tar.gz"; + sha256 = "1la26f38xafb7g9hrppjq7gmajiyr8idcwbian7n412q9m0lb3ic"; + }; + + goPackagePath = "github.com/kubernetes-incubator/cri-tools"; + subPackages = [ "cmd/crictl" "cmd/critest" ]; + + goDeps = ./deps.nix; + } + diff --git a/pkgs/tools/virtualization/cri-tools/deps.nix b/pkgs/tools/virtualization/cri-tools/deps.nix new file mode 100644 index 00000000000..796e335c0f8 --- /dev/null +++ b/pkgs/tools/virtualization/cri-tools/deps.nix @@ -0,0 +1,48 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/docker/docker"; + fetch = { + type = "git"; + url = "https://github.com/docker/docker"; + rev = "94b8a116fbf1cd90e68d8f5361b520d326a66f9b"; + sha256 = "0winmx2dx9chrv9ab4cl1i00z2vag2swy2lfwiy8jx73qhaf9g4d"; + }; + } + { + goPackagePath = "k8s.io/api"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/api"; + rev = "57d7f151236665c12202a51c21bc939eb5d5ba91"; + sha256 = "0sdpymjw6wqs1fc2q3h0v60slbd0p5qqr23ssff72wprn8520q37"; + }; + } + { + goPackagePath = "k8s.io/apimachinery"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/apimachinery"; + rev = "91d8586aac31d9086939d077ba556d2c7fb157b4"; + sha256 = "1672igw8c0hp8qkwns69n5k8qgr1rzjaah9gjh37am34v172vgl7"; + }; + } + { + goPackagePath = "k8s.io/client-go"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/client-go"; + rev = "109fef42a850b1af9d332a4ba433f65436be66c7"; + sha256 = "1yspxap56fgk0vh2n8jxl3j870yig7swpv8w4w7l92jawrfxv1zf"; + }; + } + { + goPackagePath = "k8s.io/kubernetes"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/kubernetes"; + rev = "ea2fbd4de4b38aae93ec397cb5ea4d9eb6aefef8"; + sha256 = "1108d2h7px0b4gqc9xrwb0w5dhs5kxxbbvbcr938ipgln250qrpz"; + }; + } +] diff --git a/pkgs/tools/virtualization/udocker/default.nix b/pkgs/tools/virtualization/udocker/default.nix new file mode 100644 index 00000000000..cad6b986617 --- /dev/null +++ b/pkgs/tools/virtualization/udocker/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, proot, patchelf, fakechroot, runc, simplejson, pycurl, coreutils, nose, mock, buildPythonApplication }: + +buildPythonApplication rec { + + version = "1.1.1"; + pname = "udocker"; + + src = fetchFromGitHub rec { + owner = "indigo-dc"; + repo = "udocker" ; + rev = "v${version}"; + sha256 = "134xk7rfj0xki9znryk5qf1nsfa318ahrrsi1k6ia7kipp7i3hb4"; + }; + + buildInputs = [ proot patchelf fakechroot runc simplejson pycurl coreutils nose mock ]; + + postPatch = '' + substituteInPlace udocker.py --replace /usr/sbin:/sbin:/usr/bin:/bin $PATH + substituteInPlace udocker.py --replace /bin/chmod ${coreutils}/bin/chmod + substituteInPlace udocker.py --replace /bin/rm ${coreutils}/bin/rm + substituteInPlace tests/unit_tests.py --replace /bin/rm ${coreutils}/bin/rm + substituteInPlace udocker.py --replace "autoinstall = True" "autoinstall = False" + ''; + + checkPhase = '' + NOSE_EXCLUDE=test_03_create_repo,test_04_is_repo,test_02__get_group_from_host nosetests -v tests/unit_tests.py + ''; + + meta = with stdenv.lib; { + description = "basic user tool to execute simple docker containers in user space without root privileges"; + homepage = https://www.gitbook.com/book/indigo-dc/udocker; + license = licenses.asl20; + maintainers = [ maintainers.bzizou ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 37d76420509..4542411b150 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -24,7 +24,11 @@ in ### Deprecated aliases - for backward compatibility mapAliases (rec { - accounts-qt = libsForQt5.accounts-qt; # added 2015-12-19 + _2048-in-terminal = "2048-in-terminal"; # added 2017-01-16 + _2bwm = "2bwm"; # added 2017-01-16 + _389-ds-base = "389-ds-base"; # added 2017-01-16 + _90secondportraits = "90secondsportraits"; # added 2017-01-16 + accounts-qt = libsForQt5.accounts-qt; # added 2015-12-19 adobeReader = adobe-reader; # added 2013-11-04 aircrackng = aircrack-ng; # added 2016-01-14 ammonite-repl = ammonite; # added 2017-05-02 @@ -79,7 +83,6 @@ mapAliases (rec { htmlTidy = html-tidy; # added 2014-12-06 iana_etc = iana-etc; # added 2017-03-08 idea = jetbrains; # added 2017-04-03 - inherit (haskell.compiler) jhc uhc; # 2015-05-15 inotifyTools = inotify-tools; joseki = apache-jena-fuseki; # added 2016-02-28 jquery_ui = jquery-ui; # added 2014-09-07 @@ -94,7 +97,9 @@ mapAliases (rec { libcap_manpages = libcap.doc; # added 2016-04-29 libcap_pam = if stdenv.isLinux then libcap.pam else null; # added 2016-04-29 libcap_progs = libcap.out; # added 2016-04-29 + libgumbo = gumbo; # added 2018-01-21 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 + libmysql = mysql.connector-c; # added # 2017-12-28, this was a misnomer refering to libmysqlclient libtidy = html-tidy; # added 2014-12-21 links = links2; # added 2016-01-31 lttngTools = lttng-tools; # added 2014-07-31 @@ -120,7 +125,13 @@ mapAliases (rec { owncloudclient = owncloud-client; # added 2016-08 pgp-tools = signing-party; # added 2017-03-26 pidgin-with-plugins = pidgin; # added 2016-06 - pidginlatexSF = pidginlatex; # added 2014-11-02 + pidginlatexSF = pidgin-latex; # added 2014-11-02 + pidginlatex = pidgin-latex; # added 2018-01-08 + pidginmsnpecan = pidgin-msn-pecan; # added 2018-01-08 + pidginotr = pidgin-otr; # added 2018-01-08 + pidginosd = pidgin-osd; # added 2018-01-08 + pidginsipe = pidgin-sipe; # added 2018-01-08 + pidginwindowmerge = pidgin-window-merge; # added 2018-01-08 postage = pgmanage; # added 2017-11-03 poppler_qt5 = libsForQt5.poppler; # added 2015-12-19 PPSSPP = ppsspp; # added 2017-10-01 @@ -153,6 +164,8 @@ mapAliases (rec { system_config_printer = system-config-printer; # added 2016-01-03 telepathy_qt5 = libsForQt5.telepathy; # added 2015-12-19 tftp_hpa = tftp-hpa; # added 2015-04-03 + transmission_gtk = transmission-gtk; # added 2018-01-06 + transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06 ucsFonts = ucs-fonts; # added 2016-07-15 ultrastardx-beta = ultrastardx; # added 2017-08-12 usb_modeswitch = usb-modeswitch; # added 2016-05-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 547e0704d39..aea485da5e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34,11 +34,7 @@ with pkgs; # A stdenv capable of building 32-bit binaries. On x86_64-linux, # it uses GCC compiled with multilib support; on i686-linux, it's # just the plain stdenv. - stdenv_32bit = lowPrio ( - if system == "x86_64-linux" then - overrideCC stdenv gcc_multi - else - stdenv); + stdenv_32bit = lowPrio (if hostPlatform.is32bit then stdenv else multiStdenv); stdenvNoCC = stdenv.override { cc = null; }; @@ -184,10 +180,10 @@ with pkgs; # `fetchurl' downloads a file from the network. fetchurl = import ../build-support/fetchurl { - inherit stdenv; + inherit stdenvNoCC; # On darwin, libkrb5 needs bootstrap_cmds which would require # converting many packages to fetchurl_boot to avoid evaluation cycles. - curl = curl.override (lib.optionalAttrs stdenv.isDarwin { gssSupport = false; }); + curl = buildPackages.curl.override (lib.optionalAttrs stdenv.isDarwin { gssSupport = false; }); }; fetchRepoProject = callPackage ../build-support/fetchrepoproject { }; @@ -418,6 +414,8 @@ with pkgs; aescrypt = callPackage ../tools/misc/aescrypt { }; + afew = callPackage ../applications/networking/mailreaders/afew { pythonPackages = python3Packages; }; + afio = callPackage ../tools/archivers/afio { }; afl = callPackage ../tools/security/afl { @@ -489,7 +487,7 @@ with pkgs; withGui = false; }; - apitrace = libsForQt56.callPackage ../applications/graphics/apitrace {}; + apitrace = libsForQt5.callPackage ../applications/graphics/apitrace {}; argus = callPackage ../tools/networking/argus {}; @@ -545,6 +543,8 @@ with pkgs; aws_shell = pythonPackages.callPackage ../tools/admin/aws_shell { }; + aws-vault = callPackage ../tools/admin/aws-vault { }; + azure-cli = nodePackages.azure-cli; azure-vhd-utils = callPackage ../tools/misc/azure-vhd-utils { }; @@ -630,6 +630,7 @@ with pkgs; lastpass-cli = callPackage ../tools/security/lastpass-cli { }; pass = callPackage ../tools/security/pass { }; + pass-otp = callPackage ../tools/security/pass-otp { }; gopass = callPackage ../tools/security/gopass { }; @@ -671,6 +672,8 @@ with pkgs; arc-theme = callPackage ../misc/themes/arc { }; + arc-kde-theme = callPackage ../misc/themes/arc-kde { }; + adapta-gtk-theme = callPackage ../misc/themes/adapta { }; aria2 = callPackage ../tools/networking/aria2 { @@ -745,12 +748,23 @@ with pkgs; bchunk = callPackage ../tools/cd-dvd/bchunk { }; - inherit (callPackages ../misc/logging/beats { }) + inherit (callPackages ../misc/logging/beats/5.x.nix { }) filebeat heartbeat metricbeat packetbeat; + inherit (let beats6 = callPackages ../misc/logging/beats/6.x.nix { }; in { + filebeat6 = beats6.filebeat; + heartbeat6 = beats6.heartbeat; + metricbeat6 = beats6.metricbeat; + packetbeat6 = beats6.packetbeat; + }) + filebeat6 + heartbeat6 + metricbeat6 + packetbeat6; + bfr = callPackage ../tools/misc/bfr { }; bibtool = callPackage ../tools/misc/bibtool { }; @@ -829,6 +843,8 @@ with pkgs; buildtorrent = callPackage ../tools/misc/buildtorrent { }; + bustle = haskellPackages.bustle; + bwm_ng = callPackage ../tools/networking/bwm-ng { }; byobu = callPackage ../tools/misc/byobu { @@ -976,6 +992,8 @@ with pkgs; coursier = callPackage ../development/tools/coursier {}; + cri-tools = callPackage ../tools/virtualization/cri-tools {}; + crunch = callPackage ../tools/security/crunch { }; crudini = callPackage ../tools/misc/crudini { }; @@ -1089,8 +1107,12 @@ with pkgs; et = callPackage ../applications/misc/et {}; + eternal-terminal = callPackage ../tools/networking/eternal-terminal {}; + f3 = callPackage ../tools/filesystems/f3 { }; + fac = callPackage ../development/tools/fac { }; + facedetect = callPackage ../tools/graphics/facedetect { }; facter = callPackage ../tools/system/facter { }; @@ -1105,6 +1127,8 @@ with pkgs; filebench = callPackage ../tools/misc/filebench { }; + fileshelter = callPackage ../servers/web-apps/fileshelter { }; + fsmon = callPackage ../tools/misc/fsmon { }; fsql = callPackage ../tools/misc/fsql { }; @@ -1177,10 +1201,14 @@ with pkgs; hid-listen = callPackage ../tools/misc/hid-listen { }; + home-manager = callPackage ../tools/package-management/home-manager {}; + hostsblock = callPackage ../tools/misc/hostsblock { }; hr = callPackage ../applications/misc/hr { }; + hyx = callPackage ../tools/text/hyx { }; + icdiff = callPackage ../tools/text/icdiff {}; interlock = callPackage ../servers/interlock {}; @@ -1201,6 +1229,8 @@ with pkgs; iio-sensor-proxy = callPackage ../os-specific/linux/iio-sensor-proxy { }; + ipvsadm = callPackage ../os-specific/linux/ipvsadm { }; + lynis = callPackage ../tools/security/lynis { }; mathics = pythonPackages.mathics; @@ -1220,17 +1250,21 @@ with pkgs; mpdris2 = callPackage ../tools/audio/mpdris2 { }; nfdump = callPackage ../tools/networking/nfdump { }; - + nrsc5 = callPackage ../applications/misc/nrsc5 { }; onboard = callPackage ../applications/misc/onboard { }; + optar = callPackage ../tools/graphics/optar {}; + patdiff = callPackage ../tools/misc/patdiff { }; playerctl = callPackage ../tools/audio/playerctl { }; ps_mem = callPackage ../tools/system/ps_mem { }; + parallel-rust = callPackage ../tools/misc/parallel-rust { }; + socklog = callPackage ../tools/system/socklog { }; staccato = callPackage ../tools/text/staccato { }; @@ -1258,7 +1292,7 @@ with pkgs; libkrb5 = null; systemd = null; jemalloc = null; - libmysql = null; + mysql = null; postgresql = null; libdbi = null; net_snmp = null; @@ -1338,14 +1372,20 @@ with pkgs; bats = callPackage ../development/interpreters/bats { }; + bdsync = callPackage ../tools/backup/bdsync { }; + beanstalkd = callPackage ../servers/beanstalkd { }; + beegfs = callPackage ../os-specific/linux/beegfs { }; + beets = callPackage ../tools/audio/beets { pythonPackages = python2Packages; }; bepasty = callPackage ../tools/misc/bepasty { }; + bettercap = callPackage ../tools/security/bettercap { }; + bfg-repo-cleaner = gitAndTools.bfg-repo-cleaner; bgs = callPackage ../tools/X11/bgs { }; @@ -1477,7 +1517,8 @@ with pkgs; # Use Citrix Receiver 13.4.0 below if you get "A network error occured (SSL error 4)" # See https://discussions.citrix.com/topic/385459-ssl-error-with-135-works-with-134/?p=1977735 - citrix_receiver = hiPrio citrix_receiver_13_7_0; + citrix_receiver = hiPrio citrix_receiver_13_8_0; + citrix_receiver_13_8_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.8.0"; }; citrix_receiver_13_7_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.7.0"; }; citrix_receiver_13_6_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.6.0"; }; citrix_receiver_13_5_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.5.0"; }; @@ -1512,7 +1553,6 @@ with pkgs; convertlit = callPackage ../tools/text/convertlit { }; collectd = callPackage ../tools/system/collectd { - libmysql = mysql.lib; libsigrok = libsigrok-0-3-0; # not compatible with >= 0.4.0 yet }; @@ -1551,7 +1591,7 @@ with pkgs; skk-dicts = callPackage ../tools/inputmethods/skk/skk-dicts { }; ibus = callPackage ../tools/inputmethods/ibus { - inherit (gnome3) dconf glib; + inherit (gnome3) dconf gconf glib; }; ibus-qt = callPackage ../tools/inputmethods/ibus/ibus-qt.nix { }; @@ -1566,7 +1606,6 @@ with pkgs; m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { }; mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc rec { - clangStdenv = libcxxStdenv; # workaround for https://github.com/NixOS/nixpkgs/issues/28223 python = python2; inherit (python2Packages) gyp; protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); @@ -1635,7 +1674,7 @@ with pkgs; convoy = callPackage ../tools/filesystems/convoy { }; - cool-retro-term = libsForQt56.callPackage ../applications/misc/cool-retro-term { }; + cool-retro-term = libsForQt5.callPackage ../applications/misc/cool-retro-term { }; coreutils = callPackage ../tools/misc/coreutils { aclSupport = stdenv.isLinux; @@ -1720,6 +1759,8 @@ with pkgs; davfs2 = callPackage ../tools/filesystems/davfs2 { }; + dbeaver = callPackage ../applications/misc/dbeaver { }; + dbench = callPackage ../development/tools/misc/dbench { }; dclxvi = callPackage ../development/libraries/dclxvi { }; @@ -1947,11 +1988,13 @@ with pkgs; evemu = callPackage ../tools/system/evemu { }; # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. - elk5Version = "5.6.1"; + elk5Version = "5.6.6"; + elk6Version = "6.1.2"; elasticsearch = callPackage ../servers/search/elasticsearch { }; elasticsearch2 = callPackage ../servers/search/elasticsearch/2.x.nix { }; elasticsearch5 = callPackage ../servers/search/elasticsearch/5.x.nix { }; + elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix { }; elasticsearchPlugins = recurseIntoAttrs ( callPackage ../servers/search/elasticsearch/plugins.nix { } @@ -2032,6 +2075,8 @@ with pkgs; pillow; }; + fastpbkdf2 = callPackage ../development/libraries/fastpbkdf2 { }; + fanficfare = callPackage ../tools/text/fanficfare { }; fastd = callPackage ../tools/networking/fastd { }; @@ -2057,7 +2102,6 @@ with pkgs; m17n = callPackage ../tools/inputmethods/fcitx-engines/fcitx-m17n { }; mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc rec { - clangStdenv = libcxxStdenv; # workaround for https://github.com/NixOS/nixpkgs/issues/28223 python = python2; inherit (python2Packages) gyp; protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); @@ -2067,7 +2111,7 @@ with pkgs; cloudpinyin = callPackage ../tools/inputmethods/fcitx-engines/fcitx-cloudpinyin { }; - libpinyin = callPackage ../tools/inputmethods/fcitx-engines/fcitx-libpinyin { }; + libpinyin = libsForQt5.callPackage ../tools/inputmethods/fcitx-engines/fcitx-libpinyin { }; skk = callPackage ../tools/inputmethods/fcitx-engines/fcitx-skk { }; }; @@ -2236,6 +2280,8 @@ with pkgs; garmintools = callPackage ../development/libraries/garmintools {}; + gauge = callPackage ../development/tools/gauge { }; + gawk = callPackage ../tools/text/gawk { inherit (darwin) locale; }; @@ -2430,6 +2476,8 @@ with pkgs; gpodder = callPackage ../applications/audio/gpodder { }; + gpp = callPackage ../development/tools/gpp { }; + gpredict = callPackage ../applications/science/astronomy/gpredict { }; gptfdisk = callPackage ../tools/system/gptfdisk { }; @@ -2443,10 +2491,7 @@ with pkgs; callPackage ../tools/misc/graylog/plugins.nix { } ); - gprof2dot = callPackage ../development/tools/profiling/gprof2dot { - # Using pypy provides significant performance improvements (~2x) - pythonPackages = pypyPackages; - }; + gprof2dot = callPackage ../development/tools/profiling/gprof2dot { }; graphviz = callPackage ../tools/graphics/graphviz { inherit (darwin.apple_sdk.frameworks) ApplicationServices; @@ -2652,6 +2697,13 @@ with pkgs; inherit gfortran; }); + hdf5-threadsafe = appendToName "threadsafe" (hdf5.overrideAttrs (oldAttrs: { + # Threadsafe hdf5 + # However, hdf5 hl (High Level) library is not considered stable + # with thread safety and should be disabled. + configureFlags = oldAttrs.configureFlags ++ ["--enable-threadsafe" "--disable-hl" ]; + })); + hdfview = callPackage ../tools/misc/hdfview { javac = jdk; }; @@ -2696,7 +2748,7 @@ with pkgs; hotpatch = callPackage ../development/libraries/hotpatch { }; - hotspot = libsForQt56.callPackage ../development/tools/analysis/hotspot { }; + hotspot = libsForQt5.callPackage ../development/tools/analysis/hotspot { }; hping = callPackage ../tools/networking/hping { }; @@ -2722,7 +2774,9 @@ with pkgs; i2p = callPackage ../tools/networking/i2p {}; - i2pd = callPackage ../tools/networking/i2pd {}; + i2pd = callPackage ../tools/networking/i2pd { + boost = boost165; + }; i-score = libsForQt5.callPackage ../applications/audio/i-score { }; @@ -2786,6 +2840,8 @@ with pkgs; inadyn = callPackage ../tools/networking/inadyn { }; + inboxer = callPackage ../applications/networking/mailreaders/inboxer { }; + inetutils = callPackage ../tools/networking/inetutils { }; inform7 = callPackage ../development/compilers/inform7 { }; @@ -2936,6 +2992,8 @@ with pkgs; kdbplus = callPackage_i686 ../applications/misc/kdbplus { }; + kde2-decoration = libsForQt5.callPackage ../misc/themes/kde2 { }; + keepalived = callPackage ../tools/networking/keepalived { }; kexectools = callPackage ../os-specific/linux/kexectools { }; @@ -2952,6 +3010,7 @@ with pkgs; kibana = callPackage ../development/tools/misc/kibana { }; kibana5 = callPackage ../development/tools/misc/kibana/5.x.nix { }; + kibana6 = callPackage ../development/tools/misc/kibana/6.x.nix { }; kismet = callPackage ../applications/networking/sniffers/kismet { }; @@ -2965,10 +3024,6 @@ with pkgs; kpcli = callPackage ../tools/security/kpcli { }; - # kget is part of kde-applications but the released version is still for KDE 4 - # This needs to move to the proper place when the "frameworks" branch is released - kget = libsForQt5.callPackage ../applications/networking/kget { }; - krename = libsForQt5.callPackage ../applications/misc/krename { }; kronometer = libsForQt5.callPackage ../tools/misc/kronometer { }; @@ -3022,6 +3077,7 @@ with pkgs; logstash = callPackage ../tools/misc/logstash { }; logstash5 = callPackage ../tools/misc/logstash/5.x.nix { }; + logstash6 = callPackage ../tools/misc/logstash/6.x.nix { }; logstash-contrib = callPackage ../tools/misc/logstash/contrib.nix { }; @@ -3156,7 +3212,9 @@ with pkgs; npm2nix = nodePackages.npm2nix; - kea = callPackage ../tools/networking/kea { }; + kea = callPackage ../tools/networking/kea { + boost = boost165; + }; kindlegen = callPackage ../tools/typesetting/kindlegen { }; @@ -3236,6 +3294,8 @@ with pkgs; libibverbs = callPackage ../development/libraries/libibverbs { }; + libxc = callPackage ../development/libraries/libxc { }; + libxcomp = callPackage ../development/libraries/libxcomp { }; libxl = callPackage ../development/libraries/libxl {}; @@ -3287,7 +3347,9 @@ with pkgs; ltris = callPackage ../games/ltris { }; lxc = callPackage ../os-specific/linux/lxc { }; - lxcfs = callPackage ../os-specific/linux/lxcfs { }; + lxcfs = callPackage ../os-specific/linux/lxcfs { + enableDebugBuild = config.lxcfs.enableDebugBuild or false; + }; lxd = callPackage ../tools/admin/lxd { }; lzfse = callPackage ../tools/compression/lzfse { }; @@ -3408,6 +3470,8 @@ with pkgs; memo = callPackage ../applications/misc/memo/default.nix { }; + mencal = callPackage ../applications/misc/mencal/default.nix { } ; + metamorphose2 = callPackage ../applications/misc/metamorphose2 { }; metar = callPackage ../applications/misc/metar { }; @@ -3473,6 +3537,8 @@ with pkgs; modsecurity_standalone = callPackage ../tools/security/modsecurity { }; + molden = callPackage ../applications/science/chemistry/molden { }; + molly-guard = callPackage ../os-specific/linux/molly-guard { }; moneyplex = callPackage ../applications/office/moneyplex { }; @@ -3555,6 +3621,10 @@ with pkgs; nbd = callPackage ../tools/networking/nbd { }; + nccl = callPackage ../development/libraries/science/math/nccl { + cudatoolkit = cudatoolkit8; + }; + ndjbdns = callPackage ../tools/networking/ndjbdns { }; ndppd = callPackage ../applications/networking/ndppd { }; @@ -3632,6 +3702,8 @@ with pkgs; newsbeuter = callPackage ../applications/networking/feedreaders/newsbeuter { }; + newsboat = callPackage ../applications/networking/feedreaders/newsboat { }; + nextcloud = callPackage ../servers/nextcloud { }; nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; @@ -3652,6 +3724,8 @@ with pkgs; nomad = callPackage ../applications/networking/cluster/nomad { }; + miller = callPackage ../tools/text/miller { }; + milu = callPackage ../applications/misc/milu { }; mpack = callPackage ../tools/networking/mpack { }; @@ -3697,6 +3771,8 @@ with pkgs; nnn = callPackage ../applications/misc/nnn { }; + notary = callPackage ../tools/security/notary { }; + notify-osd = callPackage ../applications/misc/notify-osd { }; nox = callPackage ../tools/package-management/nox { @@ -3766,6 +3842,10 @@ with pkgs; ola = callPackage ../applications/misc/ola { }; + onioncircuits = callPackage ../tools/security/onioncircuits { + inherit (gnome3) defaultIconTheme; + }; + opencc = callPackage ../tools/text/opencc { }; opencl-info = callPackage ../tools/system/opencl-info { }; @@ -3865,7 +3945,7 @@ with pkgs; owncloud90 owncloud91; - owncloud-client = libsForQt56.callPackage ../applications/networking/owncloud-client { }; + owncloud-client = libsForQt5.callPackage ../applications/networking/owncloud-client { }; p2pvc = callPackage ../applications/video/p2pvc {}; @@ -3885,7 +3965,7 @@ with pkgs; pandoc = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.pandoc) (drv: { configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"]; - buildTools = drv.buildTools or [] ++ [haskellPackages.file-embed]; + buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed]; }); pamtester = callPackage ../tools/security/pamtester { }; @@ -3910,6 +3990,10 @@ with pkgs; pepper = callPackage ../tools/admin/salt/pepper { }; + percona-xtrabackup = callPackage ../tools/backup/percona-xtrabackup { + boost = boost159; + }; + pick = callPackage ../tools/misc/pick { }; pitivi = callPackage ../applications/video/pitivi { @@ -4154,6 +4238,8 @@ with pkgs; libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; }; + pubs = callPackage ../tools/misc/pubs {}; + pv = callPackage ../tools/misc/pv { }; pwgen = callPackage ../tools/security/pwgen { }; @@ -4249,6 +4335,8 @@ with pkgs; rc = callPackage ../shells/rc { }; + rdma-core = callPackage ../os-specific/linux/rdma-core { }; + read-edid = callPackage ../os-specific/linux/read-edid { }; redir = callPackage ../tools/networking/redir { }; @@ -4484,7 +4572,11 @@ with pkgs; siege = callPackage ../tools/networking/siege {}; - sigil = libsForQt56.callPackage ../applications/editors/sigil { }; + sigal = callPackage ../applications/misc/sigal { + inherit (pythonPackages) buildPythonApplication fetchPypi; + }; + + sigil = libsForQt5.callPackage ../applications/editors/sigil { }; signal-desktop = callPackage ../applications/networking/instant-messengers/signal-desktop { }; @@ -4569,6 +4661,8 @@ with pkgs; sparsehash = callPackage ../development/libraries/sparsehash { }; + spectre-meltdown-checker = callPackage ../tools/security/spectre-meltdown-checker { }; + spiped = callPackage ../tools/networking/spiped { }; sqliteman = callPackage ../applications/misc/sqliteman { }; @@ -4740,8 +4834,12 @@ with pkgs; telegraf = callPackage ../servers/monitoring/telegraf { }; + teleport = callPackage ../servers/teleport {}; + telepresence = callPackage ../tools/networking/telepresence { }; + tewisay = callPackage ../tools/misc/tewisay { }; + texmacs = callPackage ../applications/editors/texmacs { tex = texlive.combined.scheme-small; extraFonts = true; @@ -5037,6 +5135,10 @@ with pkgs; whois = callPackage ../tools/networking/whois { }; + woff2 = callPackage ../development/web/woff2 { }; + + woof = callPackage ../tools/misc/woof { }; + wsmancli = callPackage ../tools/system/wsmancli {}; wolfebin = callPackage ../tools/networking/wolfebin { @@ -5115,7 +5217,7 @@ with pkgs; uhttpmock = callPackage ../development/libraries/uhttpmock { }; - uim = kde4.callPackage ../tools/inputmethods/uim { }; + uim = callPackage ../tools/inputmethods/uim { }; uhub = callPackage ../servers/uhub { }; @@ -5273,10 +5375,8 @@ with pkgs; # Ben Nanonote system crossSystem = { config = crossPrefix; - bigEndian = true; arch = "mips"; float = "soft"; - withTLS = true; libc = "uclibc"; platform = { name = "ben_nanonote"; @@ -5370,6 +5470,8 @@ with pkgs; yle-dl = callPackage ../tools/misc/yle-dl {}; + you-get = python3Packages.callPackage ../tools/misc/you-get { }; + zbackup = callPackage ../tools/backup/zbackup {}; zbar = callPackage ../tools/graphics/zbar { }; @@ -5541,13 +5643,7 @@ with pkgs; clang_38 = llvmPackages_38.clang; clang_37 = llvmPackages_37.clang; clang_35 = wrapCC llvmPackages_35.clang; - clang_34 = (wrapCC llvmPackages_34.clang).override { - # Default cc-wrapper's hardening flags don't work with clang-3.4, - # so just remove it entirely for this wrapper. - extraBuildCommands = '' - :> $out/nix-support/add-hardening.sh - ''; - }; + clang_34 = wrapCC llvmPackages_34.clang; clang-tools = callPackage ../development/tools/clang-tools { }; @@ -5568,7 +5664,7 @@ with pkgs; }; #Use this instead of stdenv to build with clang - clangStdenv = if stdenv.isDarwin then stdenv else lowPrio llvmPackages.stdenv; + clangStdenv = if stdenv.cc.isClang then stdenv else lowPrio llvmPackages.stdenv; clang-sierraHack-stdenv = overrideCC stdenv clang-sierraHack; libcxxStdenv = if stdenv.isDarwin then stdenv else lowPrio llvmPackages.libcxxStdenv; @@ -5625,11 +5721,12 @@ with pkgs; gcc = gcc6; gcc-unwrapped = gcc.cc; - gccStdenv = if (!stdenv.isDarwin) then stdenv else stdenv.override { + gccStdenv = if stdenv.cc.isGNU then stdenv else stdenv.override { allowedRequisites = null; cc = gcc; - # Include unwrapped binaries like AS, etc. and remove libcxx/libcxxabi - extraBuildInputs = [ stdenv.cc.cc ]; + # Remove libcxx/libcxxabi, and add clang for AS if on darwin (it uses + # clang's internal assembler). + extraBuildInputs = lib.optional hostPlatform.isDarwin clang.cc; }; wrapCCMulti = cc: @@ -5669,6 +5766,7 @@ with pkgs; gccMultiStdenv = overrideCC stdenv gcc_multi; clangMultiStdenv = overrideCC stdenv clang_multi; + multiStdenv = if stdenv.cc.isClang then clangMultiStdenv else gccMultiStdenv; gcc_debug = lowPrio (wrapCC (gcc.cc.override { stripped = false; @@ -5963,6 +6061,13 @@ with pkgs; psc-package = haskell.lib.justStaticExecutables (haskellPackages.callPackage ../development/compilers/purescript/psc-package { }); + tamarin-prover = + (haskellPackages.callPackage ../applications/science/logic/tamarin-prover { + # NOTE: do not use the haskell packages 'graphviz' and 'maude' + inherit maude which sapic; + graphviz = graphviz-nox; + }); + inherit (ocamlPackages.haxe) haxe_3_2 haxe_3_4; haxe = haxe_3_4; haxePackages = recurseIntoAttrs (callPackage ./haxe-packages.nix { }); @@ -6277,6 +6382,13 @@ with pkgs; mitscheme = callPackage ../development/compilers/mit-scheme { texLive = texlive.combine { inherit (texlive) scheme-small; }; texinfo = texinfo5; + xlibsWrapper = null; + }; + + mitschemeX11 = callPackage ../development/compilers/mit-scheme { + texLive = texlive.combine { inherit (texlive) scheme-small; }; + texinfo = texinfo5; + enableX11 = true; }; mkcl = callPackage ../development/compilers/mkcl {}; @@ -6310,6 +6422,11 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }); + mono54 = lowPrio (callPackage ../development/compilers/mono/5.4.nix { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) Foundation; + }); + monoDLLFixer = callPackage ../build-support/mono-dll-fixer { }; mozart-binary = callPackage ../development/compilers/mozart/binary.nix { }; @@ -6371,7 +6488,11 @@ with pkgs; buildRustCrate = callPackage ../build-support/rust/build-rust-crate.nix { }; - carnix = (callPackage ../build-support/rust/carnix.nix { }).carnix_0_5_0; + carnix = + let carnix = callPackage ../build-support/rust/carnix.nix { }; + carnixFeatures = carnix.carnix_0_6_0_features {}; + in + carnix.carnix_0_6_0 carnixFeatures; defaultCrateOverrides = callPackage ../build-support/rust/default-crate-overrides.nix { }; @@ -6476,6 +6597,7 @@ with pkgs; vala_0_28 vala_0_32 vala_0_34 + vala_0_36 vala_0_38 vala; @@ -6578,7 +6700,7 @@ with pkgs; inherit (beam.interpreters) erlang erlangR18 erlangR19 erlangR20 erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02 - elixir elixir_1_5 elixir_1_4 elixir_1_3 + elixir elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3 lfe lfe_1_2; inherit (beam.packages.erlang) @@ -6748,10 +6870,16 @@ with pkgs; php = php71; }); + php72Packages = recurseIntoAttrs (callPackage ./php-packages.nix { + php = php72; + }); + + inherit (callPackages ../development/interpreters/php { }) php56 php70 - php71; + php71 + php72; php-embed = php71-embed; @@ -6888,20 +7016,22 @@ with pkgs; bundlerEnv = callPackage ../development/ruby-modules/bundler-env { }; bundlerApp = callPackage ../development/ruby-modules/bundler-app { }; - inherit (callPackage ../development/interpreters/ruby {}) + inherit (callPackage ../development/interpreters/ruby { inherit (darwin.apple_sdk.frameworks) Foundation; }) ruby_2_0_0 ruby_2_1_10 - ruby_2_2_8 - ruby_2_3_5 - ruby_2_4_2; + ruby_2_2_9 + ruby_2_3_6 + ruby_2_4_3 + ruby_2_5_0; # Ruby aliases ruby = ruby_2_3; ruby_2_0 = ruby_2_0_0; ruby_2_1 = ruby_2_1_10; - ruby_2_2 = ruby_2_2_8; - ruby_2_3 = ruby_2_3_5; - ruby_2_4 = ruby_2_4_2; + ruby_2_2 = ruby_2_2_9; + ruby_2_3 = ruby_2_3_6; + ruby_2_4 = ruby_2_4_3; + ruby_2_5 = ruby_2_5_0; scsh = callPackage ../development/interpreters/scsh { }; @@ -6910,8 +7040,7 @@ with pkgs; self = callPackage_i686 ../development/interpreters/self { }; spark = spark_22; - spark_16 = callPackage ../applications/networking/cluster/spark { version = "1.6.3"; }; - spark_22 = callPackage ../applications/networking/cluster/spark { version = "2.2.0"; }; + spark_22 = callPackage ../applications/networking/cluster/spark { version = "2.2.1"; }; spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix { }; @@ -6922,7 +7051,7 @@ with pkgs; ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { }; - supercollider = libsForQt56.callPackage ../development/interpreters/supercollider { + supercollider = libsForQt5.callPackage ../development/interpreters/supercollider { fftw = fftwSinglePrec; }; @@ -6970,6 +7099,8 @@ with pkgs; avr8burnomat = callPackage ../development/misc/avr8-burn-omat { }; + betaflight = callPackage ../development/stm32/betaflight { }; + sourceFromHead = callPackage ../build-support/source-from-head-fun.nix {}; ecj = callPackage ../development/eclipse/ecj { }; @@ -7100,8 +7231,8 @@ with pkgs; bam = callPackage ../development/tools/build-managers/bam {}; bazel_0_4 = callPackage ../development/tools/build-managers/bazel/0.4.nix { }; - bazel_0_5 = callPackage ../development/tools/build-managers/bazel { }; - bazel = bazel_0_5; + bazel_0_9 = callPackage ../development/tools/build-managers/bazel { }; + bazel = bazel_0_9; bear = callPackage ../development/tools/build-managers/bear { }; @@ -7147,6 +7278,9 @@ with pkgs; buildbot-worker = callPackage ../development/tools/build-managers/buildbot/worker.nix { pythonPackages = python2Packages; }; + buildbot-pkg = callPackage ../development/tools/build-managers/buildbot/pkg.nix { + inherit (python2Packages) buildPythonPackage fetchPypi setuptools; + }; buildbot-plugins = callPackages ../development/tools/build-managers/buildbot/plugins.nix { pythonPackages = python2Packages; }; @@ -7211,7 +7345,7 @@ with pkgs; cide = callPackage ../development/tools/continuous-integration/cide { }; - "cl-launch" = callPackage ../development/tools/misc/cl-launch {}; + cl-launch = callPackage ../development/tools/misc/cl-launch {}; cloudfoundry-cli = callPackage ../development/tools/cloudfoundry-cli { }; @@ -7381,14 +7515,17 @@ with pkgs; findbugs = callPackage ../development/tools/analysis/findbugs { }; - foreman = callPackage ../tools/system/foreman { }; + flootty = callPackage ../development/tools/flootty { }; flow = callPackage ../development/tools/analysis/flow { inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin) cf-private; - inherit (ocamlPackages) ocaml findlib camlp4 sedlex ocamlbuild ocaml_lwt; + inherit (ocamlPackages) ocaml findlib camlp4 sedlex ocamlbuild ocaml_lwt + wtf8 dtoa; }; + foreman = callPackage ../tools/system/foreman { }; + framac = callPackage ../development/tools/analysis/frama-c { }; frame = callPackage ../development/libraries/frame { }; @@ -7504,6 +7641,8 @@ with pkgs; jamomacore = callPackage ../development/libraries/audio/jamomacore { }; + jbake = callPackage ../development/tools/jbake { }; + jikespg = callPackage ../development/tools/parsing/jikespg { }; jenkins = callPackage ../development/tools/continuous-integration/jenkins { }; @@ -7522,6 +7661,8 @@ with pkgs; kube-aws = callPackage ../development/tools/kube-aws { }; + Literate = callPackage ../development/tools/literate-programming/Literate {}; + lcov = callPackage ../development/tools/analysis/lcov { }; leiningen = callPackage ../development/tools/build-managers/leiningen { }; @@ -7571,7 +7712,7 @@ with pkgs; msitools = callPackage ../development/tools/misc/msitools { }; - multi-ghc-travis = callPackage ../development/tools/haskell/multi-ghc-travis { ghc = haskell.compiler.ghc802; }; + multi-ghc-travis = haskell.lib.justStaticExecutables haskellPackages.multi-ghc-travis; neoload = callPackage ../development/tools/neoload { licenseAccepted = (config.neoload.accept_license or false); @@ -7658,6 +7799,8 @@ with pkgs; pprof = callPackage ../development/tools/profiling/pprof { }; + pyprof2calltree = pythonPackages.callPackage ../development/tools/profiling/pyprof2calltree { }; + prelink = callPackage ../development/tools/misc/prelink { }; premake3 = callPackage ../development/tools/misc/premake/3.nix { }; @@ -7674,6 +7817,8 @@ with pkgs; pup = callPackage ../development/tools/pup { }; + pyrseas = callPackage ../development/tools/database/pyrseas { }; + qtcreator = libsForQt5.callPackage ../development/qtcreator { }; r10k = callPackage ../tools/system/r10k { }; @@ -7774,9 +7919,7 @@ with pkgs; smc = callPackage ../tools/misc/smc { }; - snowman_qt4 = callPackage ../development/tools/analysis/snowman { }; - snowman_qt5 = qt5.callPackage ../development/tools/analysis/snowman { qt4 = null; }; - snowman = snowman_qt5; + snowman = qt5.callPackage ../development/tools/analysis/snowman { }; sparse = callPackage ../development/tools/analysis/sparse { }; @@ -7833,7 +7976,9 @@ with pkgs; tweak = callPackage ../applications/editors/tweak { }; - uhd = callPackage ../development/tools/misc/uhd { }; + uhd = callPackage ../development/tools/misc/uhd { + boost = boost165; + }; uisp = callPackage ../development/tools/misc/uisp { }; @@ -7841,9 +7986,7 @@ with pkgs; universal-ctags = callPackage ../development/tools/misc/universal-ctags { }; - vagrant = callPackage ../development/tools/vagrant { - ruby = ruby_2_4; - }; + vagrant = callPackage ../development/tools/vagrant {}; bashdb = callPackage ../development/tools/misc/bashdb { }; @@ -7861,7 +8004,7 @@ with pkgs; valkyrie = callPackage ../development/tools/analysis/valkyrie { }; - qcachegrind = libsForQt56.callPackage ../development/tools/analysis/qcachegrind {}; + qcachegrind = libsForQt5.callPackage ../development/tools/analysis/qcachegrind {}; verasco = ocaml-ng.ocamlPackages_4_02.verasco.override { coq = coq_8_4; @@ -7892,7 +8035,7 @@ with pkgs; xxdiff = callPackage ../development/tools/misc/xxdiff { bison = bison2; }; - xxdiff-tip = qt56.callPackage ../development/tools/misc/xxdiff/tip.nix { }; + xxdiff-tip = libsForQt5.callPackage ../development/tools/misc/xxdiff/tip.nix { }; yacc = bison; @@ -7912,9 +8055,7 @@ with pkgs; grabserial = callPackage ../development/tools/grabserial { }; - mypy = callPackage ../development/tools/mypy { - inherit (python3Packages) fetchPypi buildPythonApplication lxml typed-ast; - }; + mypy = python3Packages.callPackage ../development/tools/mypy { }; ### DEVELOPMENT / LIBRARIES @@ -8030,7 +8171,8 @@ with pkgs; boost163 = callPackage ../development/libraries/boost/1.63.nix { }; boost164 = callPackage ../development/libraries/boost/1.64.nix { }; boost165 = callPackage ../development/libraries/boost/1.65.nix { }; - boost16x = boost165; + boost166 = callPackage ../development/libraries/boost/1.66.nix { }; + boost16x = boost166; boost = boost16x; boost_process = callPackage ../development/libraries/boost-process { }; @@ -8467,6 +8609,8 @@ with pkgs; gettext = callPackage ../development/libraries/gettext { }; + gflags = callPackage ../development/libraries/gflags { }; + gf2x = callPackage ../development/libraries/gf2x {}; gd = callPackage ../development/libraries/gd { @@ -8610,6 +8754,8 @@ with pkgs; grib-api = callPackage ../development/libraries/grib-api { }; + grpc = callPackage ../development/libraries/grpc { }; + gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { callPackage = pkgs.newScope (pkgs // { libav = pkgs.ffmpeg; }); }); @@ -8664,6 +8810,8 @@ with pkgs; qt-gstreamer1 = callPackage ../development/libraries/gstreamer/qt-gstreamer { boost = boost155;}; + qtstyleplugin-kvantum-qt4 = callPackage ../development/libraries/qtstyleplugin-kvantum-qt4 { }; + gnet = callPackage ../development/libraries/gnet { }; gnu-config = callPackage ../development/libraries/gnu-config { }; @@ -8808,6 +8956,8 @@ with pkgs; gts = callPackage ../development/libraries/gts { }; + gumbo = callPackage ../development/libraries/gumbo { }; + gvfs = callPackage ../development/libraries/gvfs { gnome = self.gnome3; }; @@ -8981,8 +9131,6 @@ with pkgs; in recurseIntoAttrs (makeOverridable mkFrameworks attrs); - kdelibs4 = kdeApplications.kdelibs; - keybinder = callPackage ../development/libraries/keybinder { automake = automake111x; lua = lua5_1; @@ -9181,12 +9329,12 @@ with pkgs; libdbi = callPackage ../development/libraries/libdbi { }; libdbiDriversBase = callPackage ../development/libraries/libdbi-drivers { - libmysql = null; + mysql = null; sqlite = null; }; libdbiDrivers = libdbiDriversBase.override { - inherit sqlite libmysql; + inherit sqlite mysql; }; libdbusmenu-glib = callPackage ../development/libraries/libdbusmenu { }; @@ -9388,8 +9536,6 @@ with pkgs; inherit (perlPackages) libintlperl GetoptLong SysVirt; }; - libgumbo = callPackage ../development/libraries/libgumbo { }; - libhangul = callPackage ../development/libraries/libhangul { }; libharu = callPackage ../development/libraries/libharu { }; @@ -9426,6 +9572,8 @@ with pkgs; liblastfm = callPackage ../development/libraries/liblastfm { }; + liblcf = callPackage ../development/libraries/liblcf { }; + liblqr1 = callPackage ../development/libraries/liblqr-1 { }; liblockfile = callPackage ../development/libraries/liblockfile { }; @@ -9752,6 +9900,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon AudioToolbox; }; + libsnark = callPackage ../development/libraries/libsnark { }; + libsodium = callPackage ../development/libraries/libsodium { }; libsoup = callPackage ../development/libraries/libsoup { }; @@ -9764,6 +9914,8 @@ with pkgs; libstartup_notification = callPackage ../development/libraries/startup-notification { }; + libstemmer = callPackage ../development/libraries/libstemmer { }; + libstroke = callPackage ../development/libraries/libstroke { }; libstrophe = callPackage ../development/libraries/libstrophe { }; @@ -9796,8 +9948,6 @@ with pkgs; libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar { }; - libtorrentRasterbar_1_0 = callPackage ../development/libraries/libtorrent-rasterbar/1.0.nix { }; - libtoxcore-new = callPackage ../development/libraries/libtoxcore/new-api.nix { }; libtoxcore = callPackage ../development/libraries/libtoxcore { }; @@ -10143,7 +10293,9 @@ with pkgs; mygpoclient = pythonPackages.mygpoclient; - mygui = callPackage ../development/libraries/mygui {}; + mygui = callPackage ../development/libraries/mygui { + ogre = ogre1_9; + }; mysocketw = callPackage ../development/libraries/mysocketw { }; @@ -10161,7 +10313,7 @@ with pkgs; ncurses5 = callPackage ../development/libraries/ncurses { abiVersion = "5"; }; ncurses6 = callPackage ../development/libraries/ncurses { abiVersion = "6"; }; - ncurses = if stdenv.isDarwin then ncurses5 else ncurses6; + ncurses = ncurses6; neardal = callPackage ../development/libraries/neardal { }; @@ -10218,6 +10370,7 @@ with pkgs; ode = callPackage ../development/libraries/ode { }; ogre = callPackage ../development/libraries/ogre {}; + ogre1_9 = callPackage ../development/libraries/ogre/1.9.x.nix {}; ogrepaged = callPackage ../development/libraries/ogrepaged { }; @@ -10258,7 +10411,7 @@ with pkgs; opencv3 = callPackage ../development/libraries/opencv/3.x.nix { enableCuda = config.cudaSupport or false; cudatoolkit = cudatoolkit8; - inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit; + inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa QTKit VideoDecodeAcceleration; }; # this ctl version is needed by openexr_viewers @@ -10371,6 +10524,8 @@ with pkgs; pg_similarity = callPackage ../servers/sql/postgresql/pg_similarity {}; + pg_tmp = callPackage ../development/tools/database/pg_tmp { }; + pgroonga = callPackage ../servers/sql/postgresql/pgroonga {}; plv8 = callPackage ../servers/sql/postgresql/plv8 { @@ -10383,7 +10538,9 @@ with pkgs; phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix {}; - physfs = callPackage ../development/libraries/physfs { }; + inherit (callPackage ../development/libraries/physfs { }) + physfs_2 + physfs; pipelight = callPackage ../tools/misc/pipelight { stdenv = stdenv_32bit; @@ -10432,6 +10589,13 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AudioToolbox AudioUnit CoreAudio CoreServices Carbon; }; + portaudio2014 = portaudio.overrideAttrs (oldAttrs: { + src = fetchurl { + url = http://www.portaudio.com/archives/pa_stable_v19_20140130.tgz; + sha256 = "0mwddk4qzybaf85wqfhxqlf0c5im9il8z03rd4n127k8y2jj9q4g"; + }; + }); + portmidi = callPackage ../development/libraries/portmidi {}; prison = callPackage ../development/libraries/prison { }; @@ -10518,7 +10682,7 @@ with pkgs; inherit (gst_all_1) gstreamer gst-plugins-base; }); - libsForQt56 = recurseIntoAttrs (lib.makeScope qt56.newScope mkLibsForQt5); + libsForQt56 = lib.makeScope qt56.newScope mkLibsForQt5; qt59 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.9) { @@ -10533,10 +10697,25 @@ with pkgs; inherit (gnome3) gtk3 dconf; }); - libsForQt59 = recurseIntoAttrs (lib.makeScope qt59.newScope mkLibsForQt5); + libsForQt59 = lib.makeScope qt59.newScope mkLibsForQt5; - qt5 = qt59; - libsForQt5 = libsForQt59; + qt510 = recurseIntoAttrs (makeOverridable + (import ../development/libraries/qt-5/5.10) { + inherit newScope; + inherit stdenv fetchurl makeSetupHook makeWrapper; + bison = bison2; # error: too few arguments to function 'int yylex(... + inherit cups; + harfbuzz = harfbuzz-icu; + mesa = mesa_noglu; + inherit perl; + inherit (gst_all_1) gstreamer gst-plugins-base; + inherit (gnome3) gtk3 dconf; + }); + + libsForQt510 = recurseIntoAttrs (lib.makeScope qt510.newScope mkLibsForQt5); + + qt5 = qt510; + libsForQt5 = libsForQt510; qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { }; @@ -10651,6 +10830,8 @@ with pkgs; qtstyleplugins = callPackage ../development/libraries/qtstyleplugins { }; + qtstyleplugin-kvantum = libsForQt5.callPackage ../development/libraries/qtstyleplugin-kvantum { }; + quazip = callPackage ../development/libraries/quazip { }; qwt = callPackage ../development/libraries/qwt/6.nix { }; @@ -10813,7 +10994,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }; - SDL2_mixer = callPackage ../development/libraries/SDL2_mixer { }; + SDL2_mixer = callPackage ../development/libraries/SDL2_mixer { + inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox; + }; SDL2_net = callPackage ../development/libraries/SDL2_net { }; @@ -10842,6 +11025,7 @@ with pkgs; simp_le = callPackage ../tools/admin/simp_le { }; sfml = callPackage ../development/libraries/sfml { }; + csfml = callPackage ../development/libraries/csfml { }; shapelib = callPackage ../development/libraries/shapelib { }; @@ -11215,7 +11399,10 @@ with pkgs; wiredtiger = callPackage ../development/libraries/wiredtiger { }; - wt = callPackage ../development/libraries/wt { }; + wt = wt4; + inherit (callPackages ../development/libraries/wt {}) + wt3 + wt4; wxGTK = wxGTK28; @@ -11256,8 +11443,8 @@ with pkgs; x265 = callPackage ../development/libraries/x265 { }; inherit (callPackages ../development/libraries/xapian { }) - xapian_1_2_22 xapian_1_4_4; - xapian = xapian_1_4_4; + xapian_1_2_22 xapian_1_4; + xapian = xapian_1_4; xapian-omega = callPackage ../development/libraries/xapian/tools/omega { libmagic = file; @@ -11498,6 +11685,8 @@ with pkgs; leaps = callPackage ../development/tools/leaps { }; + ws = callPackage ../development/tools/ws { }; + ### DEVELOPMENT / JAVA MODULES javaPackages = recurseIntoAttrs (callPackage ./java-packages.nix { }); @@ -11596,7 +11785,7 @@ with pkgs; ### SERVERS - "389-ds-base" = callPackage ../servers/ldap/389 { + _389-ds-base = callPackage ../servers/ldap/389 { kerberos = libkrb5; }; @@ -11676,7 +11865,9 @@ with pkgs; cayley = callPackage ../servers/cayley { }; - charybdis = callPackage ../servers/irc/charybdis {}; + charybdis = callPackage ../servers/irc/charybdis { }; + + clamsmtp = callPackage ../servers/mail/clamsmtp { }; clickhouse = callPackage ../servers/clickhouse { }; @@ -11715,7 +11906,6 @@ with pkgs; dovecot = callPackage ../servers/mail/dovecot { }; dovecot_pigeonhole = callPackage ../servers/mail/dovecot/plugins/pigeonhole { }; - dovecot_antispam = callPackage ../servers/mail/dovecot/plugins/antispam { }; dspam = callPackage ../servers/mail/dspam { inherit (perlPackages) NetSMTP; @@ -11790,6 +11980,8 @@ with pkgs; hiawatha = callPackage ../servers/http/hiawatha {}; + home-assistant = callPackage ../servers/home-assistant { }; + ircdHybrid = callPackage ../servers/irc/ircd-hybrid { }; jboss = callPackage ../servers/http/jboss { }; @@ -11996,7 +12188,6 @@ with pkgs; }; mysql = mariadb; - libmysql = mysql.client; # `libmysql` is a slight misnomer ATM mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; @@ -12078,6 +12269,7 @@ with pkgs; prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { }; prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { }; prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { }; + prometheus-dovecot-exporter = callPackage ../servers/monitoring/prometheus/dovecot-exporter.nix { }; prometheus-fritzbox-exporter = callPackage ../servers/monitoring/prometheus/fritzbox-exporter.nix { }; prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { }; prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { }; @@ -12087,7 +12279,9 @@ with pkgs; prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { }; prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node-exporter.nix { }; prometheus-openvpn-exporter = callPackage ../servers/monitoring/prometheus/openvpn-exporter.nix { }; + prometheus-postfix-exporter = callPackage ../servers/monitoring/prometheus/postfix-exporter.nix { }; prometheus-pushgateway = callPackage ../servers/monitoring/prometheus/pushgateway.nix { }; + prometheus-rabbitmq-exporter = callPackage ../servers/monitoring/prometheus/rabbitmq-exporter.nix { }; prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { }; prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-bridge.nix { }; prometheus-unifi-exporter = callPackage ../servers/monitoring/prometheus/unifi-exporter { }; @@ -12155,9 +12349,10 @@ with pkgs; samba4 = callPackage ../servers/samba/4.x.nix { python = python2; - # enableLDAP }; + sambaMaster = callPackage ../servers/samba/master.nix { }; + samba = samba4; smbclient = samba; @@ -12236,7 +12431,7 @@ with pkgs; tomcat7 tomcat8 tomcat85 - tomcatUnstable; + tomcat9; tomcat_mysql_jdbc = callPackage ../servers/http/tomcat/jdbc/mysql { }; @@ -12349,8 +12544,9 @@ with pkgs; microcodeIntel = callPackage ../os-specific/linux/microcode/intel.nix { }; - inherit (callPackages ../os-specific/linux/apparmor { pythonPackages = python27Packages; swig = swig2; }) - libapparmor apparmor-pam apparmor-parser apparmor-profiles apparmor-utils; + inherit (callPackages ../os-specific/linux/apparmor { python = python3; }) + libapparmor apparmor-utils apparmor-bin-utils apparmor-parser apparmor-pam + apparmor-profiles apparmor-kernel-patches; atop = callPackage ../os-specific/linux/atop { }; @@ -12644,8 +12840,7 @@ with pkgs; linux_beagleboard = callPackage ../os-specific/linux/kernel/linux-beagleboard.nix { kernelPatches = [ kernelPatches.bridge_stp_helper - kernelPatches.p9_fixes - kernelPatches.cpu-cgroup-v2."4.9" + kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long ]; }; @@ -12654,7 +12849,6 @@ with pkgs; kernelPatches = with kernelPatches; [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long - kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.tag_hardened ]; extraConfig = import ../os-specific/linux/kernel/hardened-config.nix { @@ -12741,6 +12935,21 @@ with pkgs; ]; }; + linux_4_15 = callPackage ../os-specific/linux/kernel/linux-4.15.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md + # when adding a new linux version + # kernelPatches.cpu-cgroup-v2."4.11" + kernelPatches.modinst_arg_list_too_long + ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -12802,6 +13011,8 @@ with pkgs; bbswitch = callPackage ../os-specific/linux/bbswitch {}; + beegfs-module = callPackage ../os-specific/linux/beegfs/kernel-module.nix { }; + ati_drivers_x11 = callPackage ../os-specific/linux/ati-drivers { }; blcr = callPackage ../os-specific/linux/blcr { }; @@ -12818,6 +13029,8 @@ with pkgs; pktgen = callPackage ../os-specific/linux/pktgen { }; + hyperv-daemons = callPackage ../os-specific/linux/hyperv-daemons { }; + odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { }; ofp = callPackage ../os-specific/linux/ofp { }; @@ -12879,14 +13092,10 @@ with pkgs; prl-tools = callPackage ../os-specific/linux/prl-tools { }; - seturgent = callPackage ../os-specific/linux/seturgent { }; - sch_cake = callPackage ../os-specific/linux/sch_cake { }; - inherit (callPackage ../os-specific/linux/spl { - configFile = "kernel"; - inherit kernel; - }) splStable splUnstable; + inherit (callPackage ../os-specific/linux/spl {}) + splStable splUnstable; spl = splStable; @@ -12927,7 +13136,7 @@ with pkgs; linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = linuxPackages_4_14; + linuxPackages_latest = linuxPackages_4_15; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -12939,6 +13148,7 @@ with pkgs; linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_13); linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); + linuxPackages_4_15 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_15); # Don't forget to update linuxPackages_latest! # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. @@ -13025,8 +13235,8 @@ with pkgs; mbpfan = callPackage ../os-specific/linux/mbpfan { }; - mdadm = callPackage ../os-specific/linux/mdadm { }; - mdadm4 = callPackage ../os-specific/linux/mdadm/4.nix { }; + mdadm = mdadm4; + mdadm4 = callPackage ../os-specific/linux/mdadm { }; mingetty = callPackage ../os-specific/linux/mingetty { }; @@ -13068,9 +13278,11 @@ with pkgs; go-bindata-assetfs = callPackage ../development/tools/go-bindata-assetfs { }; + go-protobuf = callPackage ../development/tools/go-protobuf { }; + gocode = callPackage ../development/tools/gocode { }; - kgocode = callPackage ../applications/misc/kgocode { }; + goconvey = callPackage ../development/tools/goconvey { }; gotags = callPackage ../development/tools/gotags { }; @@ -13206,6 +13418,8 @@ with pkgs; setools = callPackage ../os-specific/linux/setools { }; + seturgent = callPackage ../os-specific/linux/seturgent { }; + shadow = callPackage ../os-specific/linux/shadow { }; sinit = callPackage ../os-specific/linux/sinit { @@ -13219,10 +13433,6 @@ with pkgs; statifier = callPackage ../os-specific/linux/statifier { }; - inherit (callPackage ../os-specific/linux/spl { - configFile = "user"; - }) splStable splUnstable; - sysdig = callPackage ../os-specific/linux/sysdig { kernel = null; }; # pkgs.sysdig is a client, for a driver look at linuxPackagesFor @@ -13850,6 +14060,11 @@ with pkgs; ttf-envy-code-r = callPackage ../data/fonts/ttf-envy-code-r {}; + twemoji-color-font = callPackage ../data/fonts/twemoji-color-font { + inherit (nodePackages) svgo; + inherit (pythonPackages) scfbuild; + }; + tzdata = callPackage ../data/misc/tzdata { }; ubuntu_font_family = callPackage ../data/fonts/ubuntu-font-family { }; @@ -13895,7 +14110,7 @@ with pkgs; ### APPLICATIONS - "2bwm" = callPackage ../applications/window-managers/2bwm { + _2bwm = callPackage ../applications/window-managers/2bwm { patches = config."2bwm".patches or []; }; @@ -13976,11 +14191,6 @@ with pkgs; msgviewer = callPackage ../applications/networking/mailreaders/msgviewer { }; - amarok = kde4.callPackage ../applications/audio/amarok { - ffmpeg = ffmpeg_2; - stdenv = overrideCC stdenv gcc5; - }; - amarok-kf5 = libsForQt5.callPackage ../applications/audio/amarok/kf5.nix { }; AMB-plugins = callPackage ../applications/audio/AMB-plugins { }; @@ -14061,6 +14271,7 @@ with pkgs; go-ethereum = self.altcoins.go-ethereum; + ethsign = self.altcoins.ethsign; ethabi = self.altcoins.ethabi; ethrun = self.altcoins.ethrun; seth = self.altcoins.seth; @@ -14156,15 +14367,25 @@ with pkgs; bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { }; bitlbee-plugins = callPackage ../applications/networking/instant-messengers/bitlbee/plugins.nix { }; + bitlbee-discord = callPackage ../applications/networking/instant-messengers/bitlbee-discord { }; + bitlbee-facebook = callPackage ../applications/networking/instant-messengers/bitlbee-facebook { }; bitlbee-steam = callPackage ../applications/networking/instant-messengers/bitlbee-steam { }; bitmeter = callPackage ../applications/audio/bitmeter { }; - bitwig-studio = callPackage ../applications/audio/bitwig-studio { + bitscope = recurseIntoAttrs + (callPackage ../applications/science/electronics/bitscope/packages.nix { }); + + bitwig-studio1 = callPackage ../applications/audio/bitwig-studio/bitwig-studio1.nix { inherit (gnome2) zenity; }; + bitwig-studio2 = callPackage ../applications/audio/bitwig-studio/bitwig-studio2.nix { + inherit (gnome2) zenity; + inherit (self) bitwig-studio1; + }; + bitwig-studio = bitwig-studio2; bgpdump = callPackage ../tools/networking/bgpdump { }; @@ -14218,10 +14439,6 @@ with pkgs; calibre = libsForQt5.callPackage ../applications/misc/calibre { }; - calligra2 = kde4.callPackage ../applications/office/calligra/2.nix { - vc = vc_0_7; - }; - calligra = libsForQt5.callPackage ../applications/office/calligra { inherit (kdeApplications) akonadi-calendar akonadi-contacts; openjpeg = openjpeg_1; @@ -14386,12 +14603,13 @@ with pkgs; cyclone = callPackage ../applications/audio/pd-plugins/cyclone { }; - darcs = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.darcs) (drv: { + darcs = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskell.packages.ghc802.darcs) (drv: { configureFlags = (stdenv.lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"]; }); darktable = callPackage ../applications/graphics/darktable { inherit (gnome2) GConf libglade; + lua = lua5_3; pugixml = pugixml.override { shared = true; }; }; @@ -14450,11 +14668,11 @@ with pkgs; }; inherit (callPackage ../applications/virtualization/docker { }) - docker_17_09 - docker_17_11; + docker_17_12 + docker_18_01; - docker = docker_17_09; - docker-edge = docker_17_11; + docker = docker_17_12; + docker-edge = docker_18_01; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; @@ -14484,6 +14702,10 @@ with pkgs; devede = callPackage ../applications/video/devede { }; + denemo = callPackage ../applications/audio/denemo { + inherit (gnome3) gtksourceview; + }; + dvb_apps = callPackage ../applications/video/dvb-apps { }; dvdauthor = callPackage ../applications/video/dvdauthor { }; @@ -14745,6 +14967,8 @@ with pkgs; enhanced-ctorrent = callPackage ../applications/networking/enhanced-ctorrent { }; + eolie = callPackage ../applications/networking/browsers/eolie { }; + epdfview = callPackage ../applications/misc/epdfview { }; inherit (gnome3) epiphany; @@ -14782,6 +15006,8 @@ with pkgs; gpg-mdp = callPackage ../applications/misc/gpg-mdp { }; + icesl = callPackage ../applications/misc/icesl { }; + keepassx = callPackage ../applications/misc/keepassx { }; keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { }; keepassxc = libsForQt5.callPackage ../applications/misc/keepassx/community.nix { }; @@ -14789,7 +15015,9 @@ with pkgs; inherit (gnome3) evince; evolution_data_server = gnome3.evolution_data_server; - keepass = callPackage ../applications/misc/keepass { }; + keepass = callPackage ../applications/misc/keepass { + buildDotnetPackage = buildDotnetPackage.override { mono = mono54; }; + }; keepass-keeagent = callPackage ../applications/misc/keepass-plugins/keeagent { }; @@ -14893,6 +15121,8 @@ with pkgs; gopherclient = libsForQt5.callPackage ../applications/networking/gopher/gopherclient { }; + goxel = callPackage ../applications/graphics/goxel { }; + gpa = callPackage ../applications/misc/gpa { }; gpicview = callPackage ../applications/graphics/gpicview { @@ -15032,6 +15262,8 @@ with pkgs; flac = callPackage ../applications/audio/flac { }; + flameshot = libsForQt5.callPackage ../tools/misc/flameshot { }; + flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer { debug = config.flashplayer.debug or false; }; @@ -15206,11 +15438,11 @@ with pkgs; inherit (darwin) IOKit; }; + gmtk = callPackage ../development/libraries/gmtk { }; + gmu = callPackage ../applications/audio/gmu { }; - gnome_mplayer = callPackage ../applications/video/gnome-mplayer { - inherit (gnome2) GConf; - }; + gnome_mplayer = callPackage ../applications/video/gnome-mplayer { }; gnumeric = callPackage ../applications/office/gnumeric { }; @@ -15339,6 +15571,7 @@ with pkgs; hipchat = callPackage ../applications/networking/instant-messengers/hipchat { }; hledger = haskell.lib.justStaticExecutables haskellPackages.hledger; + hledger-ui = haskell.lib.justStaticExecutables haskellPackages.hledger-ui; hledger-web = haskell.lib.justStaticExecutables haskellPackages.hledger-web; homebank = callPackage ../applications/office/homebank { @@ -15362,9 +15595,7 @@ with pkgs; hyper = callPackage ../applications/misc/hyper { inherit (gnome2) GConf; }; hyperterm = self.hyper; - jackline = callPackage ../applications/networking/instant-messengers/jackline { - ocamlPackages = ocaml-ng.ocamlPackages_4_02; - }; + jackline = callPackage ../applications/networking/instant-messengers/jackline { }; slack = callPackage ../applications/networking/instant-messengers/slack { }; @@ -15577,8 +15808,6 @@ with pkgs; k9copy = libsForQt5.callPackage ../applications/video/k9copy {}; - kadu = kde4.callPackage ../applications/networking/instant-messengers/kadu { }; - kanboard = callPackage ../applications/misc/kanboard { }; kdeApplications = @@ -15594,8 +15823,8 @@ with pkgs; inherit (kdeApplications) akonadi akregator ark dolphin ffmpegthumbs filelight gwenview k3b - kaddressbook kate kcachegrind kcalc kcolorchooser kcontacts kdenlive kdf keditbookmarks - kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole + kaddressbook kate kcachegrind kcalc kcolorchooser kcontacts kdenlive kdf kdialog keditbookmarks + kget kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole kontact korganizer krdc krfb kwalletmanager marble minuet okteta okular spectacle; kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { }; @@ -15691,7 +15920,7 @@ with pkgs; lastfmsubmitd = callPackage ../applications/audio/lastfmsubmitd { }; - lbdb = callPackage ../tools/misc/lbdb { abook = null; gnupg = null; goobook = null; khard = null; }; + lbdb = callPackage ../tools/misc/lbdb { abook = null; gnupg = null; goobook = null; khard = null; mu = null; }; lbzip2 = callPackage ../tools/compression/lbzip2 { }; @@ -15757,7 +15986,9 @@ with pkgs; inherit (gnome3) libpeas gsettings_desktop_schemas dconf; }; - lightworks = callPackage ../applications/video/lightworks { }; + lightworks = callPackage ../applications/video/lightworks { + portaudio = portaudio2014; + }; lingot = callPackage ../applications/audio/lingot { inherit (gnome2) libglade; @@ -15796,7 +16027,7 @@ with pkgs; lrzsz = callPackage ../tools/misc/lrzsz { }; - luminanceHDR = libsForQt56.callPackage ../applications/graphics/luminance-hdr { }; + luminanceHDR = libsForQt5.callPackage ../applications/graphics/luminance-hdr { }; lxdvdrip = callPackage ../applications/video/lxdvdrip { }; @@ -15812,6 +16043,8 @@ with pkgs; flavour = "git"; }; + looking-glass-client = callPackage ../applications/virtualization/looking-glass-client { }; + lumail = callPackage ../applications/networking/mailreaders/lumail { }; lv2bm = callPackage ../applications/audio/lv2bm { }; @@ -15844,6 +16077,8 @@ with pkgs; matchbox = callPackage ../applications/window-managers/matchbox { }; + mblaze = callPackage ../applications/networking/mailreaders/mblaze { }; + mcpp = callPackage ../development/compilers/mcpp { }; mda_lv2 = callPackage ../applications/audio/mda-lv2 { }; @@ -15856,10 +16091,11 @@ with pkgs; meld = callPackage ../applications/version-management/meld { }; + meme = callPackage ../applications/graphics/meme { }; + mcomix = callPackage ../applications/graphics/mcomix { }; - mendeley = callPackage ../applications/office/mendeley { - qt5 = qt56; + mendeley = libsForQt5.callPackage ../applications/office/mendeley { gconf = pkgs.gnome2.GConf; }; @@ -15924,7 +16160,9 @@ with pkgs; mod-distortion = callPackage ../applications/audio/mod-distortion { }; - monero = callPackage ../applications/misc/monero { }; + monero = callPackage ../applications/altcoins/monero { }; + + monero-gui = libsForQt5.callPackage ../applications/altcoins/monero-gui { }; xmr-stak = callPackage ../applications/misc/xmr-stak { hwloc = hwloc-nox; @@ -16047,7 +16285,6 @@ with pkgs; avahi = avahi.override { withLibdnssdCompat = true; }; - qt5 = qt56; # Mumble doesn't work with Qt > 5.5 jackSupport = config.mumble.jackSupport or false; speechdSupport = config.mumble.speechdSupport or false; pulseSupport = config.pulseaudio or false; @@ -16058,7 +16295,6 @@ with pkgs; avahi = avahi.override { withLibdnssdCompat = true; }; - qt5 = qt56; # Mumble doesn't work with Qt > 5.5 jackSupport = config.mumble.jackSupport or false; speechdSupport = config.mumble.speechdSupport or false; pulseSupport = config.pulseaudio or false; @@ -16141,7 +16377,7 @@ with pkgs; smplayer = libsForQt5.callPackage ../applications/video/smplayer { }; - smtube = libsForQt56.callPackage ../applications/video/smtube {}; + smtube = libsForQt5.callPackage ../applications/video/smtube {}; sudolikeaboss = callPackage ../tools/security/sudolikeaboss { }; @@ -16198,6 +16434,8 @@ with pkgs; mythtv = callPackage ../applications/video/mythtv { }; + micro = callPackage ../applications/editors/micro { }; + nano = callPackage ../applications/editors/nano { }; nanoblogger = callPackage ../applications/misc/nanoblogger { }; @@ -16218,7 +16456,9 @@ with pkgs; nomacs = libsForQt5.callPackage ../applications/graphics/nomacs { }; - notepadqq = libsForQt56.callPackage ../applications/editors/notepadqq { }; + notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { }; + + notbit = callPackage ../applications/networking/mailreaders/notbit { }; notmuch = callPackage ../applications/networking/mailreaders/notmuch { gmime = gmime3; @@ -16279,6 +16519,10 @@ with pkgs; opera = callPackage ../applications/networking/browsers/opera {}; + orca = python3Packages.callPackage ../applications/misc/orca { + inherit (gnome3) yelp_tools; + }; + osmctools = callPackage ../applications/misc/osmctools { }; vivaldi = callPackage ../applications/networking/browsers/vivaldi {}; @@ -16379,11 +16623,11 @@ with pkgs; plugins = []; }; - pidginlatex = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex { + pidgin-latex = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex { texLive = texlive.combined.scheme-basic; }; - pidginmsnpecan = callPackage ../applications/networking/instant-messengers/pidgin-plugins/msn-pecan { }; + pidgin-msn-pecan = callPackage ../applications/networking/instant-messengers/pidgin-plugins/msn-pecan { }; pidgin-mra = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-mra { }; @@ -16393,13 +16637,13 @@ with pkgs; pidgin-xmpp-receipts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts { }; - pidginotr = callPackage ../applications/networking/instant-messengers/pidgin-plugins/otr { }; + pidgin-otr = callPackage ../applications/networking/instant-messengers/pidgin-plugins/otr { }; - pidginosd = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-osd { }; + pidgin-osd = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-osd { }; - pidginsipe = callPackage ../applications/networking/instant-messengers/pidgin-plugins/sipe { }; + pidgin-sipe = callPackage ../applications/networking/instant-messengers/pidgin-plugins/sipe { }; - pidginwindowmerge = callPackage ../applications/networking/instant-messengers/pidgin-plugins/window-merge { }; + pidgin-window-merge = callPackage ../applications/networking/instant-messengers/pidgin-plugins/window-merge { }; purple-hangouts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-hangouts { }; @@ -16474,7 +16718,7 @@ with pkgs; python = python3; }; - psi = kde4.callPackage ../applications/networking/instant-messengers/psi { }; + psi = callPackage ../applications/networking/instant-messengers/psi { }; psi-plus = callPackage ../applications/networking/instant-messengers/psi-plus { }; @@ -16497,9 +16741,7 @@ with pkgs; pythonmagick = callPackage ../applications/graphics/PythonMagick { }; - qbittorrent = libsForQt5.callPackage ../applications/networking/p2p/qbittorrent { - libtorrentRasterbar = libtorrentRasterbar_1_0; - }; + qbittorrent = libsForQt5.callPackage ../applications/networking/p2p/qbittorrent { }; eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp { lua5 = lua5_1; @@ -16515,7 +16757,7 @@ with pkgs; qgis = callPackage ../applications/gis/qgis {}; - qgroundcontrol = libsForQt56.callPackage ../applications/science/robotics/qgroundcontrol { }; + qgroundcontrol = libsForQt5.callPackage ../applications/science/robotics/qgroundcontrol { }; qjackctl = libsForQt5.callPackage ../applications/audio/qjackctl { }; @@ -16618,10 +16860,7 @@ with pkgs; quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; }; - qutebrowser = libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { - inherit (python3Packages) buildPythonApplication pyqt5 jinja2 pygments pyyaml pypeg2 cssutils pyopengl attrs; - inherit (gst_all_1) gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav; - }; + qutebrowser = libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { }; rabbitvcs = callPackage ../applications/version-management/rabbitvcs {}; @@ -16635,9 +16874,11 @@ with pkgs; renoise = callPackage ../applications/audio/renoise {}; - radiotray-ng = callPackage ../applications/audio/radiotray-ng { }; + radiotray-ng = callPackage ../applications/audio/radiotray-ng { + wxGTK = wxGTK30; + }; - rapcad = libsForQt56.callPackage ../applications/graphics/rapcad { boost = boost159; }; + rapcad = libsForQt5.callPackage ../applications/graphics/rapcad { boost = boost159; }; rapidsvn = callPackage ../applications/version-management/rapidsvn { }; @@ -16674,7 +16915,7 @@ with pkgs; retroshare = libsForQt5.callPackage ../applications/networking/p2p/retroshare { }; retroshare06 = retroshare; - ricochet = libsForQt56.callPackage ../applications/networking/instant-messengers/ricochet { }; + ricochet = libsForQt5.callPackage ../applications/networking/instant-messengers/ricochet { }; ripser = callPackage ../applications/science/math/ripser { }; @@ -16736,7 +16977,7 @@ with pkgs; udevil = callPackage ../applications/misc/udevil {}; - udiskie = callPackage ../applications/misc/udiskie { }; + udiskie = python3Packages.callPackage ../applications/misc/udiskie { }; sakura = callPackage ../applications/misc/sakura { vte = gnome3.vte; @@ -16888,12 +17129,14 @@ with pkgs; curaengine = callPackage ../applications/misc/curaengine { inherit (python3.pkgs) libarcus; }; - cura = qt56.callPackage ../applications/misc/cura { }; + cura = qt5.callPackage ../applications/misc/cura { }; curaLulzbot = callPackage ../applications/misc/cura/lulzbot.nix { }; peru = callPackage ../applications/version-management/peru {}; + pmidi = callPackage ../applications/audio/pmidi { }; + printrun = callPackage ../applications/misc/printrun { }; sddm = libsForQt5.callPackage ../applications/display-managers/sddm { }; @@ -17013,6 +17256,8 @@ with pkgs; syncthing013 = callPackage ../applications/networking/syncthing013 { }; + syncthing-gtk = python2Packages.callPackage ../applications/networking/syncthing-gtk { }; + syncthing-inotify = callPackage ../applications/networking/syncthing/inotify.nix { }; syncthing-tray = callPackage ../applications/misc/syncthing-tray { }; @@ -17040,7 +17285,7 @@ with pkgs; gconf = gnome2.GConf; }; - teamspeak_client = libsForQt56.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; + teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { }; taskjuggler = callPackage ../applications/misc/taskjuggler { ruby = ruby_2_0; }; @@ -17079,6 +17324,10 @@ with pkgs; vte = gnome2.vte.override { pythonSupport = true; }; }; + lxterminal = callPackage ../applications/misc/lxterminal { + vte = gnome2.vte; + }; + deepin-terminal = callPackage ../applications/misc/deepin-terminal { inherit (gnome3) libgee vte; wnck = libwnck3; @@ -17103,6 +17352,8 @@ with pkgs; enableGTK3 = true; }; + thunderbolt = callPackage ../os-specific/linux/thunderbolt {}; + thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin { gconf = pkgs.gnome2.GConf; inherit (pkgs.gnome2) libgnome libgnomeui; @@ -17116,7 +17367,9 @@ with pkgs; gtk = gtk3; }; - timbreid = callPackage ../applications/audio/pd-plugins/timbreid { }; + timbreid = callPackage ../applications/audio/pd-plugins/timbreid { + fftw = fftwSinglePrec; + }; timescaledb = callPackage ../servers/sql/postgresql/timescaledb {}; @@ -17174,10 +17427,10 @@ with pkgs; transcribe = callPackage ../applications/audio/transcribe { }; transmission = callPackage ../applications/networking/p2p/transmission { }; - transmission_gtk = transmission.override { enableGTK3 = true; }; + transmission-gtk = transmission.override { enableGTK3 = true; }; transmission-remote-cli = callPackage ../applications/networking/p2p/transmission-remote-cli {}; - transmission_remote_gtk = callPackage ../applications/networking/p2p/transmission-remote-gtk {}; + transmission-remote-gtk = callPackage ../applications/networking/p2p/transmission-remote-gtk {}; transgui = callPackage ../applications/networking/p2p/transgui { }; @@ -17191,7 +17444,7 @@ with pkgs; tribler = callPackage ../applications/networking/p2p/tribler { }; - trojita = libsForQt56.callPackage ../applications/networking/mailreaders/trojita { }; + trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { }; tsearch_extras = callPackage ../servers/sql/postgresql/tsearch_extras { }; @@ -17208,6 +17461,8 @@ with pkgs; testssl = callPackage ../applications/networking/testssl { }; umurmur = callPackage ../applications/networking/umurmur { }; + + udocker = pythonPackages.callPackage ../tools/virtualization/udocker { }; unigine-valley = callPackage ../applications/graphics/unigine-valley { }; @@ -17217,6 +17472,8 @@ with pkgs; urh = callPackage ../applications/misc/urh { }; + uuagc = haskell.lib.justStaticExecutables haskellPackages.uuagc; + uucp = callPackage ../tools/misc/uucp { }; uvccapture = callPackage ../applications/video/uvccapture { }; @@ -17285,10 +17542,14 @@ with pkgs; vimpc = callPackage ../applications/audio/vimpc { }; - neovim = callPackage ../applications/editors/neovim { + wrapNeovim = callPackage ../applications/editors/neovim/wrapper.nix { }; + + neovim-unwrapped = callPackage ../applications/editors/neovim { luaPackages = luajitPackages; }; + neovim = wrapNeovim neovim-unwrapped { }; + neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { }; neovim-pygui = pythonPackages.neovim_gui; @@ -17314,7 +17575,9 @@ with pkgs; system-libvirt = libvirt; }; - virtmanager-qt = libsForQt5.callPackage ../applications/virtualization/virt-manager/qt.nix { }; + virtmanager-qt = libsForQt5.callPackage ../applications/virtualization/virt-manager/qt.nix { + qtermwidget = lxqt.qtermwidget; + }; virtinst = callPackage ../applications/virtualization/virtinst {}; @@ -17389,7 +17652,7 @@ with pkgs; vnstat = callPackage ../applications/networking/vnstat { }; - vogl = qt56.callPackage ../development/tools/vogl { }; + vogl = libsForQt5.callPackage ../development/tools/vogl { }; volnoti = callPackage ../applications/misc/volnoti { }; @@ -17685,6 +17948,8 @@ with pkgs; xkbset = callPackage ../tools/X11/xkbset { }; + xkbmon = callPackage ../applications/misc/xkbmon { }; + win-spice = callPackage ../applications/virtualization/driver/win-spice { }; win-virtio = callPackage ../applications/virtualization/driver/win-virtio { }; win-qemu = callPackage ../applications/virtualization/driver/win-qemu { }; @@ -17734,6 +17999,8 @@ with pkgs; xkblayout-state = callPackage ../applications/misc/xkblayout-state { }; + xmonad-log = callPackage ../tools/misc/xmonad-log { }; + xmonad-with-packages = callPackage ../applications/window-managers/xmonad/wrapper.nix { inherit (haskellPackages) ghcWithPackages; packages = self: []; @@ -17834,8 +18101,6 @@ with pkgs; yoshimi = callPackage ../applications/audio/yoshimi { }; - inherit (python3Packages) you-get; - inherit (pythonPackages) youtube-dl; youtube-viewer = perlPackages.WWWYoutubeViewer; @@ -17881,9 +18146,9 @@ with pkgs; ### GAMES - "2048-in-terminal" = callPackage ../games/2048-in-terminal { }; + _2048-in-terminal = callPackage ../games/2048-in-terminal { }; - "90secondportraits" = callPackage ../games/90secondportraits { love = love_0_10; }; + _90secondportraits = callPackage ../games/90secondportraits { love = love_0_10; }; adom = callPackage ../games/adom { }; @@ -17907,6 +18172,7 @@ with pkgs; asc = callPackage ../games/asc { lua = lua5_1; libsigcxx = libsigcxx12; + physfs = physfs_2; }; astromenace = callPackage ../games/astromenace { }; @@ -17951,9 +18217,13 @@ with pkgs; bzflag = callPackage ../games/bzflag { }; - cataclysm-dda = callPackage ../games/cataclysm-dda { }; + cataclysm-dda = callPackage ../games/cataclysm-dda { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; - cataclysm-dda-git = callPackage ../games/cataclysm-dda/git.nix { }; + cataclysm-dda-git = callPackage ../games/cataclysm-dda/git.nix { + inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa; + }; chessdb = callPackage ../games/chessdb { }; @@ -17999,6 +18269,7 @@ with pkgs; digikam = libsForQt5.callPackage ../applications/graphics/digikam { inherit (plasma5) oxygen; inherit (kdeApplications) kcalcore; + opencv3 = opencv3.override { enableContrib = true; }; }; displaycal = (newScope pythonPackages) ../applications/graphics/displaycal {}; @@ -18013,9 +18284,15 @@ with pkgs; dwarf-therapist = dwarf-fortress-packages.dwarf-therapist; - d1x_rebirth = callPackage ../games/d1x-rebirth { }; + dxx-rebirth = callPackage ../games/dxx-rebirth { + physfs = physfs_2; + }; - d2x_rebirth = callPackage ../games/d2x-rebirth { }; + d1x_rebirth = dxx-rebirth; + + d2x_rebirth = dxx-rebirth; + + easyrpg-player = callPackage ../games/easyrpg-player { }; eboard = callPackage ../games/eboard { }; @@ -18088,8 +18365,6 @@ with pkgs; gemrb = callPackage ../games/gemrb { }; - ghostOne = callPackage ../servers/games/ghost-one { }; - gl117 = callPackage ../games/gl-117 {}; globulation2 = callPackage ../games/globulation { @@ -18151,7 +18426,10 @@ with pkgs; lincity = callPackage ../games/lincity {}; - lincity_ng = callPackage ../games/lincity/ng.nix {}; + lincity_ng = callPackage ../games/lincity/ng.nix { + # https://github.com/lincity-ng/lincity-ng/issues/25 + physfs = physfs_2; + }; liquidwar = callPackage ../games/liquidwar { guile = guile_1_8; @@ -18214,7 +18492,9 @@ with pkgs; openarena = callPackage ../games/openarena { }; - opendungeons = callPackage ../games/opendungeons { }; + opendungeons = callPackage ../games/opendungeons { + ogre = ogre1_9; + }; openlierox = callPackage ../games/openlierox { }; @@ -18298,6 +18578,10 @@ with pkgs; rigsofrods = callPackage ../games/rigsofrods { angelscript = angelscript_2_22; + ogre = ogre1_9; + ogrepaged = ogrepaged.override { + ogre = ogre1_9; + }; mygui = mygui.override { withOgre = true; }; @@ -18328,6 +18612,11 @@ with pkgs; tk = tk-8_5; }; + scid-vs-pc = callPackage ../games/scid-vs-pc { + tcl = tcl-8_6; + tk = tk-8_6; + }; + scummvm = callPackage ../games/scummvm { }; scorched3d = callPackage ../games/scorched3d { }; @@ -18383,11 +18672,16 @@ with pkgs; nativeOnly = true; }).run; + linux-steam-integration = callPackage ../games/linux-steam-integration { + gtk = pkgs.gtk3; + }; + stepmania = callPackage ../games/stepmania { ffmpeg = ffmpeg_2; }; stuntrally = callPackage ../games/stuntrally { + ogre = ogre1_9; mygui = mygui.override { withOgre = true; }; @@ -18479,6 +18773,9 @@ with pkgs; vdrift = callPackage ../games/vdrift { }; + # To ensure vdrift's code is built on hydra + vdrift-bin = vdrift.bin; + vectoroids = callPackage ../games/vectoroids { }; vessel = callPackage_i686 ../games/vessel { }; @@ -18586,7 +18883,13 @@ with pkgs; gnomeExtensions = { caffeine = callPackage ../desktops/gnome-3/extensions/caffeine { }; + clipboard-indicator = callPackage ../desktops/gnome-3/extensions/clipboard-indicator { }; dash-to-dock = callPackage ../desktops/gnome-3/extensions/dash-to-dock { }; + dash-to-panel = callPackage ../desktops/gnome-3/extensions/dash-to-panel { }; + icon-hider = callPackage ../desktops/gnome-3/extensions/icon-hider { }; + mediaplayer = callPackage ../desktops/gnome-3/extensions/mediaplayer { }; + nohotcorner = callPackage ../desktops/gnome-3/extensions/nohotcorner { }; + pixel-saver = callPackage ../desktops/gnome-3/extensions/pixel-saver { }; topicons-plus = callPackage ../desktops/gnome-3/extensions/topicons-plus { }; }; @@ -18594,24 +18897,6 @@ with pkgs; kakasi = callPackage ../tools/text/kakasi { }; - kde4 = - let - deps = lib.makeScope newScope (self: { - inherit (python2Packages) python; - kdelibs = kdelibs4; - boost = boost155; - ffmpeg = ffmpeg_2; # ffmpegthumb doesn't build otherwise - }); - - self = lib.makeScope deps.newScope (self: with self; - import ../desktops/kde-4.14 { - callPackageOrig = pkgs.callPackage; - inherit (self) callPackage; - inherit stdenv qt48 kdelibs; - } - ); - in recurseIntoAttrs self; - lumina = libsForQt5.callPackage ../desktops/lumina { }; lxqt = recurseIntoAttrs (import ../desktops/lxqt { @@ -18629,7 +18914,7 @@ with pkgs; }; redshift = callPackage ../applications/misc/redshift { - inherit (python3Packages) python pygobject3 pyxdg; + inherit (python3Packages) python pygobject3 pyxdg wrapPython; }; redshift-plasma-applet = libsForQt5.callPackage ../applications/misc/redshift-plasma-applet { }; @@ -18684,7 +18969,7 @@ with pkgs; inherit (kdeFrameworks) kded kinit frameworkintegration; inherit (plasma5) - bluedevil breeze-gtk breeze-qt4 breeze-qt5 breeze-grub breeze-plymouth + bluedevil breeze-gtk breeze-qt5 breeze-grub breeze-plymouth kactivitymanagerd kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5 kinfocenter kmenuedit kscreen kscreenlocker ksshaskpass ksysguard kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-desktop @@ -18718,6 +19003,8 @@ with pkgs; bcftools = callPackage ../applications/science/biology/bcftools { }; + dcm2niix = callPackage ../applications/science/biology/dcm2niix { }; + diamond = callPackage ../applications/science/biology/diamond { }; ecopcr = callPackage ../applications/science/biology/ecopcr { }; @@ -18732,6 +19019,10 @@ with pkgs; neuron-version = neuron.version; }; + kallisto = callPackage ../applications/science/biology/kallisto { }; + + muscle = callPackage ../applications/science/biology/muscle/default.nix { }; + neuron = callPackage ../applications/science/biology/neuron { python = null; }; @@ -18762,6 +19053,8 @@ with pkgs; snpeff = callPackage ../applications/science/biology/snpeff/default.nix { }; + star = callPackage ../applications/science/biology/star { }; + varscan = callPackage ../applications/science/biology/varscan/default.nix { }; bwa = callPackage ../applications/science/biology/bwa/default.nix { }; @@ -18774,6 +19067,8 @@ with pkgs; ### SCIENCE/MATH + almonds = pythonPackages.callPackage ../applications/science/math/almonds { }; + arpack = callPackage ../development/libraries/science/math/arpack { }; atlas = callPackage ../development/libraries/science/math/atlas { @@ -19028,6 +19323,8 @@ with pkgs; proverif = callPackage ../applications/science/logic/proverif { }; + sapic = callPackage ../applications/science/logic/sapic { }; + satallax = callPackage ../applications/science/logic/satallax { ocaml = ocamlPackages_4_01_0.ocaml; }; @@ -19093,6 +19390,8 @@ with pkgs; boost = boost160; }; + librepcb = libsForQt5.callPackage ../applications/science/electronics/librepcb { }; + ngspice = callPackage ../applications/science/electronics/ngspice { }; pcb = callPackage ../applications/science/electronics/pcb { }; @@ -19404,7 +19703,7 @@ with pkgs; faust1 = callPackage ../applications/audio/faust/faust1.nix { }; faust2 = callPackage ../applications/audio/faust/faust2.nix { - llvm = llvm_38; + llvm = llvm_4; }; faust2alqt = callPackage ../applications/audio/faust/faust2alqt.nix { }; @@ -19546,6 +19845,10 @@ with pkgs; nix-bundle = callPackage ../tools/package-management/nix-bundle { nix = nixUnstable; }; + nix-delegate = haskell.lib.justStaticExecutables haskellPackages.nix-delegate; + nix-deploy = haskell.lib.justStaticExecutables haskellPackages.nix-deploy; + nix-diff = haskell.lib.justStaticExecutables haskellPackages.nix-diff; + nix-info = callPackage ../tools/nix/info { }; nix-info-tested = callPackage ../tools/nix/info { doCheck = true; }; @@ -19640,6 +19943,8 @@ with pkgs; pjsip = callPackage ../applications/networking/pjsip { }; + plano-theme = callPackage ../misc/themes/plano { }; + ppsspp = libsForQt5.callPackage ../misc/emulators/ppsspp { }; pt = callPackage ../applications/misc/pt { }; @@ -19721,6 +20026,11 @@ with pkgs; sane-frontends = callPackage ../applications/graphics/sane/frontends.nix { }; + sc-controller = pythonPackages.callPackage ../misc/drivers/sc-controller { + inherit libusb1; # Shadow python.pkgs.libusb1. + librsvg = librsvg.override { enableIntrospection = true; }; + }; + sct = callPackage ../tools/X11/sct {}; seafile-shared = callPackage ../misc/seafile-shared { }; @@ -19746,6 +20056,8 @@ with pkgs; splix = callPackage ../misc/cups/drivers/splix { }; + steamcontroller = callPackage ../misc/drivers/steamcontroller { }; + streamripper = callPackage ../applications/audio/streamripper { }; sqsh = callPackage ../development/tools/sqsh { }; @@ -19755,14 +20067,13 @@ with pkgs; terraform_0_8 terraform_0_9 terraform_0_10 + terraform_0_10-full terraform_0_11 + terraform_0_11-full ; - # Terraform with all the plugins, both to get Hydra to build all plugins for us and for - # convenience if someone doesn't want to have to think about which plugins to use. - terraform_0_10-full = terraform_0_10.withPlugins lib.attrValues; - terraform = terraform_0_11; + terraform-full = terraform_0_11-full; terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {}; @@ -19844,7 +20155,7 @@ with pkgs; vimprobable2 = wrapFirefox vimprobable2-unwrapped { }; vimb-unwrapped = callPackage ../applications/networking/browsers/vimb { - webkit = webkitgtk24x-gtk2; + webkit = webkitgtk218x; }; vimb = wrapFirefox vimb-unwrapped { }; @@ -20018,6 +20329,8 @@ with pkgs; zsnes = callPackage_i686 ../misc/emulators/zsnes { }; + zxcvbn-c = callPackage ../development/libraries/zxcvbn-c { }; + snes9x-gtk = callPackage ../misc/emulators/snes9x-gtk { }; openmsx = callPackage ../misc/emulators/openmsx { @@ -20141,4 +20454,6 @@ with pkgs; wal-g = callPackage ../tools/backup/wal-g {}; tlwg = callPackage ../data/fonts/tlwg { }; + + safeDiscardStringContext = callPackage ../build-support/safe-discard-string-context.nix { }; } diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 7c07c34b2fe..765f69c1b14 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -52,7 +52,7 @@ rec { # Other Beam languages. These are built with `beam.interpreters.erlang`. To # access for example elixir built with different version of Erlang, use # `beam.packages.erlangR19.elixir`. - inherit (packages.erlang) elixir elixir_1_5 elixir_1_4 elixir_1_3; + inherit (packages.erlang) elixir elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3; inherit (packages.erlang) lfe lfe_1_2; }; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index fd6fc21c680..c27a2e7d39d 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -36,6 +36,7 @@ let paco = callPackage ../development/coq-modules/paco {}; QuickChick = callPackage ../development/coq-modules/QuickChick {}; ssreflect = callPackage ../development/coq-modules/ssreflect { }; + tlc = callPackage ../development/coq-modules/tlc {}; }; filterCoqPackages = coq: diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 7540a47ef6d..e75c9338f8d 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -57,6 +57,8 @@ in swift-corefoundation = callPackage ../os-specific/darwin/swift-corefoundation { }; + trash = callPackage ../os-specific/darwin/trash { inherit (darwin.apple_sdk) frameworks; }; + usr-include = callPackage ../os-specific/darwin/usr-include { }; xcode = callPackage ../os-specific/darwin/xcode { }; diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 96d5e1fe283..9cf9eb4db65 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -49,7 +49,7 @@ in let # { /* the config */ } and # { pkgs, ... } : { /* the config */ } config = - if builtins.isFunction configExpr + if lib.isFunction configExpr then configExpr { inherit pkgs; } else configExpr; diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index b082bce11b7..1a37d58c70d 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -715,7 +715,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { meta = { description = "Math.NET Numerics is an opensource numerical library for .Net, Silverlight and Mono"; - homepage = http://numerics.mathdotnet.com/; + homepage = https://numerics.mathdotnet.com/; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ obadz ]; platforms = with stdenv.lib.platforms; linux; @@ -872,7 +872,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { meta = { description = "Popular high-performance JSON framework for .NET"; - homepage = "http://www.newtonsoft.com/json"; + homepage = "https://www.newtonsoft.com/json"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ obadz ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 661c6d8bf76..51726ca730d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1,20 +1,21 @@ -{ pkgs, lib, newScope, stdenv, buildPlatform, targetPlatform }: +{ buildPackages, pkgs +, newScope, stdenv +, buildPlatform, targetPlatform +}: let # These are attributes in compiler and packages that don't support integer-simple. integerSimpleExcludes = [ - "ghc6102Binary" "ghc704Binary" "ghc742Binary" - "ghc6104" - "ghc6123" + "ghc784Binary" + "ghc7103Binary" + "ghc821Binary" "ghc704" "ghc763" "ghcjs" "ghcjsHEAD" "ghcCross" - "jhc" - "uhc" "integer-simple" ]; @@ -30,178 +31,140 @@ in rec { compiler = { - ghc6102Binary = callPackage ../development/compilers/ghc/6.10.2-binary.nix { gmp = pkgs.gmp4; }; - ghc704Binary = callPackage ../development/compilers/ghc/7.0.4-binary.nix { - gmp = pkgs.gmp4; - }; - ghc742Binary = callPackage ../development/compilers/ghc/7.4.2-binary.nix { - gmp = pkgs.gmp4; - }; + ghc704Binary = callPackage ../development/compilers/ghc/7.0.4-binary.nix { gmp = pkgs.gmp4; }; + ghc742Binary = callPackage ../development/compilers/ghc/7.4.2-binary.nix { gmp = pkgs.gmp4; }; + ghc784Binary = callPackage ../development/compilers/ghc/7.8.4-binary.nix { }; + ghc7103Binary = callPackage ../development/compilers/ghc/7.10.3-binary.nix { }; + ghc821Binary = callPackage ../development/compilers/ghc/8.2.1-binary.nix { }; - ghc6104 = callPackage ../development/compilers/ghc/6.10.4.nix { ghc = compiler.ghc6102Binary; }; - ghc6123 = callPackage ../development/compilers/ghc/6.12.3.nix { ghc = compiler.ghc6102Binary; }; ghc704 = callPackage ../development/compilers/ghc/7.0.4.nix { ghc = compiler.ghc704Binary; }; - ghc722 = callPackage ../development/compilers/ghc/7.2.2.nix { - ghc = compiler.ghc704Binary; - }; ghc742 = callPackage ../development/compilers/ghc/7.4.2.nix { ghc = compiler.ghc704Binary; }; ghc763 = callPackage ../development/compilers/ghc/7.6.3.nix { ghc = compiler.ghc704Binary; }; - ghc783 = callPackage ../development/compilers/ghc/7.8.3.nix { - ghc = compiler.ghc742Binary; - }; ghc784 = callPackage ../development/compilers/ghc/7.8.4.nix { ghc = compiler.ghc742Binary; }; - ghc7102 = callPackage ../development/compilers/ghc/7.10.2.nix rec { - bootPkgs = packages.ghc784; - inherit (bootPkgs) hscolour; - }; ghc7103 = callPackage ../development/compilers/ghc/7.10.3.nix rec { - bootPkgs = packages.ghc784; + bootPkgs = packages.ghc7103Binary; inherit (bootPkgs) hscolour; + buildLlvmPackages = buildPackages.llvmPackages_35; + llvmPackages = pkgs.llvmPackages_35; }; ghc802 = callPackage ../development/compilers/ghc/8.0.2.nix rec { - bootPkgs = packages.ghc7103; + bootPkgs = packages.ghc7103Binary; inherit (bootPkgs) hscolour; sphinx = pkgs.python27Packages.sphinx; + buildLlvmPackages = buildPackages.llvmPackages_37; + llvmPackages = pkgs.llvmPackages_37; }; ghc822 = callPackage ../development/compilers/ghc/8.2.2.nix rec { - bootPkgs = packages.ghc802; + bootPkgs = packages.ghc821Binary; inherit (bootPkgs) hscolour alex happy; inherit buildPlatform targetPlatform; sphinx = pkgs.python3Packages.sphinx; - selfPkgs = packages.ghc822; + buildLlvmPackages = buildPackages.llvmPackages_39; + llvmPackages = pkgs.llvmPackages_39; + }; + ghc841 = callPackage ../development/compilers/ghc/8.4.1.nix rec { + bootPkgs = packages.ghc821Binary; + inherit (bootPkgs) alex happy; + buildLlvmPackages = buildPackages.llvmPackages_5; + llvmPackages = pkgs.llvmPackages_5; }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec { - bootPkgs = packages.ghc822; + bootPkgs = packages.ghc821Binary; inherit (bootPkgs) alex happy; - inherit buildPlatform targetPlatform; - selfPkgs = packages.ghcHEAD; + buildLlvmPackages = buildPackages.llvmPackages_5; + llvmPackages = pkgs.llvmPackages_5; }; ghcjs = packages.ghc7103.callPackage ../development/compilers/ghcjs { bootPkgs = packages.ghc7103; + inherit (pkgs) cabal-install; }; ghcjsHEAD = packages.ghc802.callPackage ../development/compilers/ghcjs/head.nix { bootPkgs = packages.ghc802; + inherit (pkgs) cabal-install; }; - ghcHaLVM240 = callPackage ../development/compilers/halvm/2.4.0.nix rec { - bootPkgs = packages.ghc802; - inherit (bootPkgs) hscolour alex happy; - }; - - jhc = callPackage ../development/compilers/jhc { - inherit (packages.ghc763) ghcWithPackages; - }; - - uhc = callPackage ../development/compilers/uhc/default.nix ({ - stdenv = pkgs.clangStdenv; - inherit (pkgs.haskellPackages) ghcWithPackages; - }); # The integer-simple attribute set contains all the GHC compilers # build with integer-simple instead of integer-gmp. - integer-simple = - let integerSimpleGhcNames = - pkgs.lib.filter (name: ! builtins.elem name integerSimpleExcludes) - (pkgs.lib.attrNames compiler); - integerSimpleGhcs = pkgs.lib.genAttrs integerSimpleGhcNames - (name: compiler."${name}".override { enableIntegerSimple = true; }); - in pkgs.recurseIntoAttrs (integerSimpleGhcs // { - ghcHEAD = integerSimpleGhcs.ghcHEAD.override { selfPkgs = packages.integer-simple.ghcHEAD; }; - }); - + integer-simple = let + integerSimpleGhcNames = pkgs.lib.filter + (name: ! builtins.elem name integerSimpleExcludes) + (pkgs.lib.attrNames compiler); + in pkgs.recurseIntoAttrs (pkgs.lib.genAttrs + integerSimpleGhcNames + (name: compiler."${name}".override { enableIntegerSimple = true; })); }; - packages = { + # Always get compilers from `buildPackages` + packages = let bh = buildPackages.haskell; in { - # Support for this compiler is broken, because it can't deal with directory-based package databases. - # ghc6104 = callPackage ../development/haskell-modules { ghc = compiler.ghc6104; }; - ghc6123 = callPackage ../development/haskell-modules { - ghc = compiler.ghc6123; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-6.12.x.nix { }; - }; - ghc704 = callPackage ../development/haskell-modules { - ghc = compiler.ghc704; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.0.x.nix { }; - }; - ghc722 = callPackage ../development/haskell-modules { - ghc = compiler.ghc722; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.2.x.nix { }; - }; - ghc742 = callPackage ../development/haskell-modules { - ghc = compiler.ghc742; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.4.x.nix { }; - }; - ghc763 = callPackage ../development/haskell-modules { - ghc = compiler.ghc763; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.6.x.nix { }; - }; - ghc783 = callPackage ../development/haskell-modules { - ghc = compiler.ghc783; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { }; - }; - ghc784 = callPackage ../development/haskell-modules { - ghc = compiler.ghc784; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { }; - }; - ghc7102 = callPackage ../development/haskell-modules { - ghc = compiler.ghc7102; + ghc7103 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc7103; + ghc = bh.compiler.ghc7103; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; }; - ghc7103 = callPackage ../development/haskell-modules { - ghc = compiler.ghc7103; + ghc7103Binary = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc7103Binary; + ghc = bh.compiler.ghc7103Binary; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; }; ghc802 = callPackage ../development/haskell-modules { - ghc = compiler.ghc802; + buildHaskellPackages = bh.packages.ghc802; + ghc = bh.compiler.ghc802; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { }; }; - ghc822 = callPackage ../development/haskell-modules { - ghc = compiler.ghc822; + ghc821Binary = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc821Binary; + ghc = bh.compiler.ghc821Binary; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; }; + ghc822 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc822; + ghc = bh.compiler.ghc822; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; + }; + ghc841 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc841; + ghc = bh.compiler.ghc841; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { }; + }; ghcHEAD = callPackage ../development/haskell-modules { - ghc = compiler.ghcHEAD; + buildHaskellPackages = bh.packages.ghcHEAD; + ghc = bh.compiler.ghcHEAD; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; }; - # TODO Support for multiple variants here - ghcCross = callPackage ../development/haskell-modules { - ghc = compiler.ghcHEAD.crossCompiler; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; - }; - ghcjs = callPackage ../development/haskell-modules { - ghc = compiler.ghcjs; + ghcjs = callPackage ../development/haskell-modules rec { + buildHaskellPackages = ghc.bootPkgs; + ghc = bh.compiler.ghcjs; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; }; - ghcjsHEAD = callPackage ../development/haskell-modules { - ghc = compiler.ghcjsHEAD; + ghcjsHEAD = callPackage ../development/haskell-modules rec { + buildHaskellPackages = ghc.bootPkgs; + ghc = bh.compiler.ghcjsHEAD; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { }; packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; }; - ghcHaLVM240 = callPackage ../development/haskell-modules { - ghc = compiler.ghcHaLVM240; - compilerConfig = callPackage ../development/haskell-modules/configuration-halvm-2.4.0.nix { }; - }; # The integer-simple attribute set contains package sets for all the GHC compilers # using integer-simple instead of integer-gmp. - integer-simple = - let integerSimpleGhcNames = - pkgs.lib.filter (name: ! builtins.elem name integerSimpleExcludes) - (pkgs.lib.attrNames packages); - in pkgs.lib.genAttrs integerSimpleGhcNames (name: packages."${name}".override { - ghc = compiler.integer-simple."${name}"; - overrides = _self : _super : { - integer-simple = null; - integer-gmp = null; - }; + integer-simple = let + integerSimpleGhcNames = pkgs.lib.filter + (name: ! builtins.elem name integerSimpleExcludes) + (pkgs.lib.attrNames packages); + in pkgs.lib.genAttrs integerSimpleGhcNames (name: packages."${name}".override { + ghc = compiler.integer-simple."${name}"; + overrides = _self : _super : { + integer-simple = null; + integer-gmp = null; + }; }); }; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index c83e62fd89a..b91f9dae9f0 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -8,7 +8,7 @@ { fetchurl, fetchzip, stdenv, lua, callPackage, unzip, zziplib, pkgconfig, libtool , pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo , perl, gtk2, python, glib, gobjectIntrospection, libevent, zlib, autoreconfHook -, libmysql, postgresql, cyrus_sasl +, mysql, postgresql, cyrus_sasl , fetchFromGitHub, libmpack, which }: @@ -210,7 +210,7 @@ let }; sourceRoot = "."; - buildInputs = [ libmysql postgresql sqlite ]; + buildInputs = [ mysql.connector-c postgresql sqlite ]; preConfigure = '' substituteInPlace Makefile --replace CC=gcc CC=cc @@ -220,7 +220,8 @@ let ''; NIX_CFLAGS_COMPILE = [ - "-I${libmysql.dev}/include/mysql" + "-I${mysql.connector-c}/include/mysql" + "-L${mysql.connector-c}/lib/mysql" "-I${postgresql}/include/server" ]; @@ -401,7 +402,7 @@ let description = "Network support for Lua"; homepage = "http://w3.impa.br/~diego/software/luasocket/"; license = licenses.mit; - maintainers = with maintainers; [ mornfall ]; + maintainers = with maintainers; [ ]; platforms = with platforms; darwin ++ linux ++ freebsd ++ illumos; }; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 67d77c570fa..c44124c3fff 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -208,6 +208,8 @@ let dolog = callPackage ../development/ocaml-modules/dolog { }; + dtoa = callPackage ../development/ocaml-modules/dtoa { }; + easy-format = callPackage ../development/ocaml-modules/easy-format { }; eff = callPackage ../development/interpreters/eff { }; @@ -665,8 +667,12 @@ let uucp = callPackage ../development/ocaml-modules/uucp { }; uunf = callPackage ../development/ocaml-modules/uunf { }; - uri = callPackage ../development/ocaml-modules/uri { }; - uri_p4 = callPackage ../development/ocaml-modules/uri { + uri = + if lib.versionAtLeast ocaml.version "4.3" + then callPackage ../development/ocaml-modules/uri { } + else callPackage ../development/ocaml-modules/uri/legacy.nix { }; + + uri_p4 = callPackage ../development/ocaml-modules/uri/legacy.nix { legacyVersion = true; }; @@ -679,6 +685,8 @@ let wasm = callPackage ../development/ocaml-modules/wasm { }; + wtf8 = callPackage ../development/ocaml-modules/wtf8 { }; + x509 = callPackage ../development/ocaml-modules/x509 { }; xmlm = callPackage ../development/ocaml-modules/xmlm { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ea76c82d822..006794fa56d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -25,10 +25,10 @@ let self = _self // overrides; _self = with self; { ack = buildPerlPackage rec { - name = "ack-2.16"; + name = "ack-2.22"; src = fetchurl { url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz"; - sha256 = "0ifbmbfvagfi76i7vjpggs2hrbqqisd14f5zizan6cbdn8dl5z2g"; + sha256 = "0v0gdv1ja12ks4yp1nb93z1lh14s869dr4mfjb3nkgw6pkdl3i02"; }; outputs = ["out" "man"]; # use gnused so that the preCheck command passes @@ -925,7 +925,6 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://gtk2-perl.sourceforge.net/; description = "Perl interface to the cairo 2D vector graphics library"; - maintainers = with maintainers; [ nckx ]; license = stdenv.lib.licenses.lgpl21Plus; }; }; @@ -2184,6 +2183,12 @@ let self = _self // overrides; _self = with self; { description = "Clipboard - Copy and Paste with any OS"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin MacPasteboard; + # Disable test on darwin because MacPasteboard fails when not logged in interactively. + # Mac OS error -4960 (coreFoundationUnknownErr): The unknown error at lib/Clipboard/MacPasteboard.pm line 3. + # Mac-Pasteboard-0.009.readme: 'NOTE that Mac OS X appears to restrict pasteboard access to processes that are logged in interactively. + # Ssh sessions and cron jobs can not create the requisite pasteboard handles, giving coreFoundationUnknownErr (-4960)' + doCheck = !stdenv.isDarwin; }; @@ -2539,10 +2544,10 @@ let self = _self // overrides; _self = with self; { }; CpanelJSONXS = buildPerlPackage rec { - name = "Cpanel-JSON-XS-3.0237"; + name = "Cpanel-JSON-XS-4.00"; src = fetchurl { url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; - sha256 = "da86fffdbe6c1b7a023e95e2b8db7d6b45a08871c8312f23e45253c78e662d07"; + sha256 = "4dedf770cab3009b08bca108266b941097ae1c55c674c500e3145e2f23a628ac"; }; meta = { description = "CPanel fork of JSON::XS, fast and correct serializing"; @@ -2717,10 +2722,10 @@ let self = _self // overrides; _self = with self; { }; CryptJWT = buildPerlPackage rec { - name = "Crypt-JWT-0.018"; + name = "Crypt-JWT-0.019"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz"; - sha256 = "90e78f7f0ced17e5c2080ad8c7008ce3badd05186e2ff20cf9c7232ed863cdaf"; + sha256 = "26aaaaedc153b04bdaaba7df7ac2f7ce3bdf672c8d7111d09347a8d0c794725c"; }; propagatedBuildInputs = [ CryptX JSONMaybeXS ]; meta = { @@ -3830,15 +3835,12 @@ let self = _self // overrides; _self = with self; { }; DBIxClass = buildPerlPackage rec { - # tests broken again - doCheck = false; - name = "DBIx-Class-0.082840"; + name = "DBIx-Class-0.082841"; src = fetchurl { url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz"; - sha256 = "4049afd175e315ebcab945b19030aec40bcec46cc5611b0286a5a267ca7181ef"; + sha256 = "d705f85825aced299020534349778537524526d64f524217ca362787f683c3bd"; }; - patches = [ ../development/perl-modules/dbiclassx-fix.patch ]; # Remove after next release - buildInputs = [ DBDSQLite PackageStash SQLTranslator TestDeep TestException TestWarn ]; + buildInputs = [ DBDSQLite PackageStash TestDeep TestException TestWarn ]; propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ClassInspector ConfigAny ContextPreserve DBI DataDumperConcise DataPage DevelGlobalDestruction HashMerge MROCompat ModuleFind Moo PathClass SQLAbstract ScopeGuard SubName TryTiny namespaceclean ]; meta = { homepage = http://www.dbix-class.org/; @@ -5652,10 +5654,10 @@ let self = _self // overrides; _self = with self; { }; FileNext = buildPerlPackage rec { - name = "File-Next-1.12"; + name = "File-Next-1.16"; src = fetchurl { url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz"; - sha256 = "cc3afd8eaf6294aba93b8152a269cc36a9df707c6dc2c149aaa04dabd869e60a"; + sha256 = "0nfp84p63a5xm6iwlckh3f6cy9bdpjw5fazplskhnb8k5ifg4rb9"; }; }; @@ -5882,10 +5884,10 @@ let self = _self // overrides; _self = with self; { }; FinanceQuote = buildPerlPackage rec { - name = "Finance-Quote-1.38"; + name = "Finance-Quote-1.47"; src = fetchurl { url = "mirror://cpan/authors/id/E/EC/ECOCODE/${name}.tar.gz"; - sha256 = "0zhqb27y4vdxn476s2kwm9zl2f970yjcyyybnjm9b406krr2fm59"; + sha256 = "0gzbq85738f299jaw4nj3ljnka380j2y6yspmyl71rgfypqjvbr7"; }; propagatedBuildInputs = [ CGI CryptSSLeay HTMLTableExtract HTMLTree HTTPMessage LWP LWPProtocolHttps MozillaCA @@ -6048,10 +6050,10 @@ let self = _self // overrides; _self = with self; { }; GetoptLongDescriptive = buildPerlPackage rec { - name = "Getopt-Long-Descriptive-0.100"; + name = "Getopt-Long-Descriptive-0.101"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "1451e79310d1630de37690e3aba5c38ea5f01a486c5a43f0cd95bef2a02dffb6"; + sha256 = "752e898ea6eb8706ceb836668ca645704f5dcbc3124b6d1b21d04007dbc46948"; }; buildInputs = [ CPANMetaCheck TestFatal TestWarnings ]; propagatedBuildInputs = [ ParamsValidate SubExporter ]; @@ -6059,7 +6061,6 @@ let self = _self // overrides; _self = with self; { homepage = https://github.com/rjbs/Getopt-Long-Descriptive; description = "Getopt::Long, but simpler and more powerful"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -6096,7 +6097,6 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://gtk2-perl.sourceforge.net/; description = "Perl wrappers for the GLib utility and Object libraries"; - maintainers = with maintainers; [ nckx ]; license = stdenv.lib.licenses.lgpl21Plus; }; }; @@ -6288,7 +6288,6 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://gtk2-perl.sourceforge.net/; description = "Perl interface to the 2.x series of the Gimp Toolkit library"; - maintainers = with maintainers; [ nckx ]; license = stdenv.lib.licenses.lgpl21Plus; }; }; @@ -8049,10 +8048,10 @@ let self = _self // overrides; _self = with self; { }; LogAny = buildPerlPackage rec { - name = "Log-Any-1.704"; + name = "Log-Any-1.705"; src = fetchurl { url = "mirror://cpan/authors/id/P/PR/PREACTION/${name}.tar.gz"; - sha256 = "57289d17b83bb5ce1d44148fd4e31a82b0d27e9104706ddc1ec5bb15461d0dd9"; + sha256 = "85c7c5189a8bfc2ffb6f879b4cd04dd77f94bc5abc3800b4330f42f43fb9a696"; }; # Syslog test fails. preCheck = "rm t/syslog.t"; @@ -8065,10 +8064,10 @@ let self = _self // overrides; _self = with self; { }; LogContextual = buildPerlPackage rec { - name = "Log-Contextual-0.008000"; + name = "Log-Contextual-0.008001"; src = fetchurl { url = "mirror://cpan/authors/id/F/FR/FREW/${name}.tar.gz"; - sha256 = "acd804508740e35c208e0cff575f3dbca2e01b8e64ec00eec3f88c7c4e3d656c"; + sha256 = "b93cbcfbb8796d51c836e3b00243cda5630808c152c14eee5f20ca09c9451993"; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ DataDumperConcise ExporterDeclare Moo ]; @@ -8320,6 +8319,20 @@ let self = _self // overrides; _self = with self; { inherit fetchurl buildPerlPackage stdenv DBDmysql; }; + MacPasteboard = buildPerlPackage rec { + name = "Mac-Pasteboard-0.009"; + src = fetchurl { + url = "mirror://cpan/authors/id/W/WY/WYANT/${name}.tar.gz"; + sha256 = "85b1d5e9630973b997c3c1634e2df964d6a8d6cb57d9abe1f7093385cf26cf54"; + }; + meta = with stdenv.lib; { + description = "Manipulate Mac OS X pasteboards"; + license = with licenses; [ artistic1 gpl1Plus ]; + platforms = platforms.darwin; + }; + buildInputs = [ pkgs.darwin.apple_sdk.frameworks.ApplicationServices ]; + }; + MailMaildir = buildPerlPackage rec { version = "1.0.0"; name = "Mail-Maildir-${version}"; @@ -8385,6 +8398,18 @@ let self = _self // overrides; _self = with self; { buildInputs = [ParseRecDescent]; }; + MailPOP3Client = buildPerlPackage rec { + name = "Mail-POP3Client-2.19"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SD/SDOWD/${name}.tar.gz"; + sha256 = "1142d6247a93cb86b23ed8835553bb2d227ff8213ee2743e4155bb93f47acb59"; + }; + meta = { + description = "Perl 5 module to talk to a POP3 (RFC1939) server"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + MailRFC822Address = buildPerlPackage { name = "Mail-RFC822-Address-0.3"; src = fetchurl { @@ -10758,7 +10783,6 @@ let self = _self // overrides; _self = with self; { meta = { homepage = http://gtk2-perl.sourceforge.net/; description = "Layout and render international text"; - maintainers = with maintainers; [ nckx ]; license = stdenv.lib.licenses.lgpl21Plus; }; }; @@ -10859,7 +10883,6 @@ let self = _self // overrides; _self = with self; { meta = with stdenv.lib; { homepage = http://search.cpan.org/~jaybonci/Parse-DebControl; license = with licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ nckx ]; }; }; @@ -12286,17 +12309,16 @@ let self = _self // overrides; _self = with self; { }; SQLAbstract = buildPerlPackage rec { - name = "SQL-Abstract-1.81"; + name = "SQL-Abstract-1.85"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz"; - sha256 = "5f4d5618ce2424d62bbfdb5228b382e8be0e0ccedbb273d6d850e25d07e64f9f"; + url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz"; + sha256 = "9f44afe031a0cc63a6ccabaa46ba7ec58ef4db940559cee7fbc2dfbbf37bccab"; }; buildInputs = [ TestDeep TestException TestWarn ]; - propagatedBuildInputs = [ HashMerge MROCompat Moo ]; + propagatedBuildInputs = [ HashMerge MROCompat Moo SubQuote ]; meta = { description = "Generate SQL from Perl data structures"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -15505,10 +15527,10 @@ let self = _self // overrides; _self = with self; { }; URI = buildPerlPackage rec { - name = "URI-1.72"; + name = "URI-1.73"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "35f14431d4b300de4be1163b0b5332de2d7fbda4f05ff1ed198a8e9330d40a32"; + sha256 = "cca7ab4a6f63f3ccaacae0f2e1337e8edf84137e73f18548ec7d659f23efe413"; }; buildInputs = [ TestNeeds ]; meta = { @@ -15645,6 +15667,25 @@ let self = _self // overrides; _self = with self; { }; }; + vidir = buildPerlPackage rec { + name = "vidir-0.040"; + src = fetchurl { + url = "mirror://cpan/authors/id/W/WO/WOLDRICH/App-${name}-woldrich.tar.gz"; + sha256 = "0c97yx33pyhskbmwpqbwlkxr85awd6kg1baibvqkarhhvc8v7l0h"; + }; + # NB: This preInstall a workaround for a problem that is fixed in HEAD. + preInstall = '' + sed -i -e '/^use encoding/d' bin/vidir + ''; + outputs = [ "out" ]; + meta = { + maintainers = [ maintainers.chreekat ]; + homepage = "http://search.cpan.org/~woldrich/App-vidir/bin/vidir"; + description = "Edit a directory in $EDITOR"; + license = with stdenv.lib.licenses; [ gpl1 ]; + }; + }; + VMEC2 = buildPerlModule rec { name = "VM-EC2-1.28"; src = fetchurl { diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 5af4b6f0c09..80cc5ba05db 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -8,6 +8,8 @@ let }; isPhpOlder55 = pkgs.lib.versionOlder php.version "5.5"; isPhp7 = pkgs.lib.versionAtLeast php.version "7.0"; + isPhp72 = pkgs.lib.versionAtLeast php.version "7.2"; + isPhpOlder7 = pkgs.lib.versionOlder php.version "7.0"; apcu = if isPhp7 then apcu51 else apcu40; @@ -179,7 +181,7 @@ let buildInputs = [ pkgs.spidermonkey_1_8_5 ]; }; - xdebug = if isPhp7 then xdebug25 else xdebug23; + xdebug = if isPhp72 then xdebug26 else if isPhp7 then xdebug25 else xdebug23; xdebug23 = assert !isPhp7; buildPecl { name = "xdebug-2.3.1"; @@ -190,7 +192,7 @@ let checkTarget = "test"; }; - xdebug25 = buildPecl { + xdebug25 = assert !isPhp72; buildPecl { name = "xdebug-2.5.0"; sha256 = "03c9y25a3gc3kpav0cdgmhjixcaly6974hx7wgihi0wlchgavmlb"; @@ -199,6 +201,15 @@ let checkTarget = "test"; }; + xdebug26 = assert !isPhpOlder7; buildPecl { + name = "xdebug-2.6.0beta1"; + + sha256 = "0zaj821jbpaqqcbr9a64sa27my9n980pmyy9kxrvvjqq3qg6dpj9"; + + doCheck = true; + checkTarget = "test"; + }; + yaml = if isPhp7 then yaml20 else yaml13; yaml13 = assert !isPhp7; buildPecl { @@ -328,12 +339,13 @@ let composer = pkgs.stdenv.mkDerivation rec { name = "composer-${version}"; - version = "1.5.1"; + version = "1.6.2"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "107v8hdgmi2s15zsd9ffrr3jyw01qkwv174y9gw9fbpdrjwffi97"; + sha256 = "0xjjnbpzar6ybpad77r0b4a96bwrayza8s1s9vz6s634ir98dhvf"; }; + unpackPhase = ":"; buildInputs = [ pkgs.makeWrapper ]; @@ -382,11 +394,11 @@ let php-cs-fixer = pkgs.stdenv.mkDerivation rec { name = "php-cs-fixer-${version}"; - version = "2.9.0"; + version = "2.10.0"; src = pkgs.fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "12z1fan4yyxll03an51zhx6npr1d49s84dvmrvnzzf9jhckl5mqd"; + sha256 = "0mi72sg0gms2lg1r1b6qxhsxgi3v07kczmr1hnk7pwa47jb6572q"; }; phases = [ "installPhase" ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2f0bbdd9dc7..c5f6ac1fb2c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -40,7 +40,7 @@ let makeOverridablePythonPackage = f: origArgs: let ff = f origArgs; - overrideWith = newArgs: origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs); + overrideWith = newArgs: origArgs // (if pkgs.lib.isFunction newArgs then newArgs origArgs else newArgs); in if builtins.isAttrs ff then (ff // { overridePythonAttrs = newArgs: makeOverridablePythonPackage f (overrideWith newArgs); @@ -165,6 +165,8 @@ in { asn1crypto = callPackage ../development/python-modules/asn1crypto { }; + astral = callPackage ../development/python-modules/astral { }; + astropy = callPackage ../development/python-modules/astropy { }; augeas = callPackage ../development/python-modules/augeas { @@ -173,6 +175,8 @@ in { automat = callPackage ../development/python-modules/automat { }; + aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { }; + # packages defined elsewhere backports_csv = callPackage ../development/python-modules/backports_csv {}; @@ -203,6 +207,8 @@ in { dkimpy = callPackage ../development/python-modules/dkimpy { }; + diff_cover = callPackage ../development/python-modules/diff_cover { }; + emcee = callPackage ../development/python-modules/emcee { }; email_validator = callPackage ../development/python-modules/email-validator { }; @@ -279,10 +285,14 @@ in { pydbus = callPackage ../development/python-modules/pydbus { }; + pydocstyle = callPackage ../development/python-modules/pydocstyle { }; + pyexiv2 = disabledIf isPy3k (callPackage ../development/python-modules/pyexiv2 {}); py3exiv2 = callPackage ../development/python-modules/py3exiv2 { }; + pyfakefs = callPackage ../development/python-modules/pyfakefs {}; + pygame = callPackage ../development/python-modules/pygame { }; pygame-git = callPackage ../development/python-modules/pygame/git.nix { }; @@ -303,11 +313,12 @@ in { pyjwkest = callPackage ../development/python-modules/pyjwkest { }; - pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { - pythonPackages = self; + pykde4 = callPackage ../development/python-modules/pykde4/default.nix { + inherit (self) pyqt4; + callPackage = pkgs.callPackage; }; - pyqt56 = pkgs.libsForQt56.callPackage ../development/python-modules/pyqt/5.x.nix { + pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { pythonPackages = self; }; @@ -349,7 +360,11 @@ in { rhpl = disabledIf isPy3k (callPackage ../development/python-modules/rhpl {}); - salmon = callPackage ../development/python-modules/salmon { }; + rx = callPackage ../development/python-modules/rx { }; + + salmon-mail = callPackage ../development/python-modules/salmon-mail { }; + + serversyncstorage = callPackage ../development/python-modules/serversyncstorage {}; simpleeval = callPackage ../development/python-modules/simpleeval { }; @@ -357,10 +372,14 @@ in { supervise_api = callPackage ../development/python-modules/supervise_api { }; + syncserver = callPackage ../development/python-modules/syncserver {}; + tables = callPackage ../development/python-modules/tables { hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; }; + tokenserver = callPackage ../development/python-modules/tokenserver {}; + unifi = callPackage ../development/python-modules/unifi { }; pyunbound = callPackage ../tools/networking/unbound/python.nix { }; @@ -381,8 +400,6 @@ in { adal = callPackage ../development/python-modules/adal { }; - afew = callPackage ../development/python-modules/afew { }; - aiodns = callPackage ../development/python-modules/aiodns { }; aiofiles = callPackage ../development/python-modules/aiofiles { }; @@ -477,25 +494,6 @@ in { }; }; - amqp_1 = buildPythonPackage rec { - name = "amqp-${version}"; - version = "1.4.9"; - disabled = pythonOlder "2.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/amqp/${name}.tar.gz"; - sha256 = "06n6q0kxhjnbfz3vn8x9yz09lwmn1xi9d6wxp31h5jbks0b4vsid"; - }; - - buildInputs = with self; [ mock coverage nose-cover3 unittest2 ]; - - meta = { - 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; - }; - }; - amqp = buildPythonPackage rec { name = "amqp-${version}"; version = "2.1.4"; @@ -606,7 +604,7 @@ in { async = buildPythonPackage rec { name = "async-0.6.1"; disabled = isPy3k; - meta.maintainers = with maintainers; [ mornfall ]; + meta.maintainers = with maintainers; [ ]; buildInputs = with self; [ pkgs.zlib ]; doCheck = false; @@ -1015,44 +1013,9 @@ in { }; }; - backports_abc = buildPythonPackage rec { - name = "backports_abc-${version}"; - version = "0.4"; + backports_abc = callPackage ../development/python-modules/backports_abc { }; - src = pkgs.fetchurl { - url = "mirror://pypi/b/backports_abc/${name}.tar.gz"; - sha256 = "8b3e4092ba3d541c7a2f9b7d0d9c0275b21c6a01c53a61c731eba6686939d0a5"; - }; - - checkPhase = '' - ${python.interpreter} -m unittest discover - ''; - - meta = { - homepage = https://github.com/cython/backports_abc; - license = licenses.psfl; - description = "A backport of recent additions to the 'collections.abc' module"; - }; - }; - - backports_functools_lru_cache = buildPythonPackage rec { - name = "backports.functools_lru_cache-${version}"; - version = "1.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/backports_functools_lru_cache/${name}.tar.gz"; - sha256 = "444a21bcec4ae177da554321f81a78dc879eaa8f6ea9920cb904830585d31e95"; - }; - - buildInputs = with self; [ setuptools_scm ]; - doCheck = false; # No proper test - - meta = { - description = "Backport of functools.lru_cache"; - homepage = https://github.com/jaraco/backports.functools_lru_cache; - license = licenses.mit; - }; - }; + backports_functools_lru_cache = callPackage ../development/python-modules/backports_functools_lru_cache { }; backports_shutil_get_terminal_size = callPackage ../development/python-modules/backports_shutil_get_terminal_size { }; @@ -1085,23 +1048,7 @@ in { }; }; - backports_lzma = self.buildPythonPackage rec { - name = "backports.lzma-0.0.3"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/backports.lzma/${name}.tar.gz"; - sha256 = "bac58aec8d39ac3d22250840fb24830d0e4a0ef05ad8f3f09172dc0cc80cdbca"; - }; - - buildInputs = [ pkgs.lzma ]; - - meta = { - description = "Backport of Python 3.3's 'lzma' module for XZ/LZMA compressed files"; - homepage = https://github.com/peterjc/backports.lzma; - license = licenses.bsd3; - }; - }; + backports_lzma = callPackage ../development/python-modules/backports_lzma { }; backports_tempfile = callPackage ../development/python-modules/backports_tempfile { }; @@ -1302,33 +1249,7 @@ in { }; }; - biopython = buildPythonPackage rec { - name = "biopython-${version}"; - version = "1.68"; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/biopython/${name}.tar.gz"; - sha256 = "07qc7nz0k77y8hf8s18rscvibvm91zw0kkq7ylrhisf8vp8hkp6i"; - }; - - propagatedBuildInputs = with self; [ 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 maintainers; [ luispedro ]; - }; - }; + biopython = callPackage ../development/python-modules/biopython { }; bedup = buildPythonPackage rec { version = "0.10.1"; @@ -1395,31 +1316,12 @@ in { homepage = https://github.com/AmesCornish/buttersink/wiki; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; propagatedBuildInputs = with self; [ boto crcmod psutil ]; }; - cached-property = buildPythonPackage rec { - version = "1.3.0"; - name = "cached-property-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/cached-property/${name}.tar.gz"; - sha256 = "10dwi3s6f154ag9dvqy5jiwp31fs57lbxjcjgn4cwvi8qyqpi3j5"; - }; - - buildInputs = with self; [ freezegun ]; - - meta = { - description = "A decorator for caching properties in classes"; - homepage = https://github.com/pydanny/cached-property; - license = licenses.bsd3; - platforms = platforms.unix; - maintainers = with maintainers; [ ericsagnes ]; - }; - }; + cached-property = callPackage ../development/python-modules/cached-property { }; caffe = pkgs.caffe.override { python = self.python; @@ -1462,6 +1364,9 @@ in { substituteInPlace setup.py --replace "argparse" "" ''; + chainer = callPackage ../development/python-modules/chainer { + cudaSupport = pkgs.config.cudaSupport or false; + }; channels = callPackage ../development/python-modules/channels {}; @@ -1500,24 +1405,7 @@ in { }; }; - colorlog = buildPythonPackage rec { - name = "colorlog-${version}"; - version = "2.6.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/colorlog/${name}.tar.gz"; - sha256 = "0djv6ky1yk28s1l093w8plg19kp88q4nyrm1vfxyq0s9j4pix29l"; - }; - - # No tests included - doCheck = false; - - meta = { - description = "Log formatting with colors"; - homepage = https://github.com/borntyping/python-colorlog; - license = licenses.free; # BSD-like - }; - }; + colorlog = callPackage ../development/python-modules/colorlog { }; colour = buildPythonPackage rec { name = "${pname}-${version}"; @@ -1562,6 +1450,12 @@ in { cufflinks = callPackage ../development/python-modules/cufflinks { }; + cupy = callPackage ../development/python-modules/cupy { + cudatoolkit = pkgs.cudatoolkit8; + cudnn = pkgs.cudnn6_cudatoolkit8; + nccl = pkgs.nccl; + }; + cx_Freeze = callPackage ../development/python-modules/cx_freeze {}; cvxopt = buildPythonPackage rec { @@ -1843,38 +1737,7 @@ in { httpserver = callPackage ../development/python-modules/httpserver {}; - bleach = buildPythonPackage rec { - pname = "bleach"; - version = "2.0.0"; - name = "${pname}-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "0c5w7hh70lqzca7ir71j891csvch1899r8q09zgswk1y00q22lmr"; - }; - - buildInputs = with self; [ pytest pytestrunner ]; - propagatedBuildInputs = with self; [ six html5lib ]; - - 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 = licenses.asl20; - maintainers = with maintainers; [ prikhi ]; - }; - }; + bleach = callPackage ../development/python-modules/bleach { }; # needed for tensorflow-tensorboard bleach_1_5_0 = self.bleach.overridePythonAttrs rec { @@ -1980,43 +1843,7 @@ in { }; }; - boto3 = buildPythonPackage rec { - name = "boto3-${version}"; - version = "1.4.8"; - - src = pkgs.fetchFromGitHub { - owner = "boto"; - repo = "boto3"; - rev = version; - sha256 = "11ysd7a9l5y98q7b7az56phsj2m7w90abf4jabwrknp2c43sq9bi"; - }; - - propagatedBuildInputs = [ self.botocore self.jmespath self.s3transfer ] ++ - (if isPy3k then [] else [self.futures]); - buildInputs = [ self.docutils self.nose self.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 = stdenv.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. - ''; - }; - }; + boto3 = callPackage ../development/python-modules/boto3 { }; botocore = callPackage ../development/python-modules/botocore { }; @@ -2184,7 +2011,7 @@ in { bunch = buildPythonPackage (rec { name = "bunch-1.0.1"; - meta.maintainers = with maintainers; [ mornfall ]; + meta.maintainers = with maintainers; [ ]; src = pkgs.fetchurl { url = "mirror://pypi/b/bunch/${name}.tar.gz"; @@ -2529,7 +2356,6 @@ in { composable way, with as little code as necessary. ''; license = licenses.bsd3; - maintainers = with maintainers; [ nckx ]; }; }; @@ -2574,32 +2400,7 @@ in { click-plugins = callPackage ../development/python-modules/click-plugins {}; - click-threading = buildPythonPackage rec { - version = "0.4.2"; - name = "click-threading-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/click-threading/${name}.tar.gz"; - sha256 = "400b0bb63d9096b6bf2806efaf742a1cc8b6c88e0484f0afe7d7a7f0e9870609"; - }; - - checkInputs = with self; [ pytest_29 ]; - propagatedBuildInputs = with self; [ click ] ++ 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 = licenses.mit; - maintainers = with maintainers; [ ]; - }; - }; + click-threading = callPackage ../development/python-modules/click-threading {}; cligj = callPackage ../development/python-modules/cligj { }; @@ -2828,6 +2629,7 @@ in { }; }; + conda = callPackage ../development/python-modules/conda { }; configobj = buildPythonPackage (rec { name = "configobj-5.0.6"; @@ -3050,15 +2852,15 @@ in { tablib = buildPythonPackage rec { name = "tablib-${version}"; - version = "0.10.0"; + version = "0.12.1"; src = pkgs.fetchurl { url = "mirror://pypi/t/tablib/tablib-${version}.tar.gz"; - sha256 = "14wc8bmz60g35r6gsyhdzfvgfqpd3gw9lfkq49z5bxciykbxmhj1"; + sha256 = "11wxchj0qz77dn79yiq30k4b4gsm429f4bizk4lm4rb63nk51kxq"; }; - buildInputs = with self; [ pytest ]; - + buildInputs = with self; [ pytest unicodecsv pandas ]; + propagatedBuildInputs = with self; [ xlwt openpyxl pyyaml xlrd odfpy ]; meta = with stdenv.lib; { description = "Tablib: format-agnostic tabular dataset library"; homepage = "http://python-tablib.org"; @@ -3110,22 +2912,7 @@ in { openidc-client = callPackage ../development/python-modules/openidc-client/default.nix {}; - idna = buildPythonPackage rec { - pname = "idna"; - version = "2.5"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "3cb5ce08046c4e3a560fc02f138d0ac63e00f8ce5901a56b32ec8b7994082aab"; - }; - - meta = { - homepage = "http://github.com/kjd/idna/"; - description = "Internationalized Domain Names in Applications (IDNA)"; - license = "licenses.bsd3"; - }; - }; + idna = callPackage ../development/python-modules/idna { }; mahotas = buildPythonPackage rec { name = "python-mahotas-${version}"; @@ -3422,22 +3209,9 @@ in { }; }; - pytest = self.pytest_32; + pytest = self.pytest_33; - pytest_27 = callPackage ../development/python-modules/pytest/2_7.nix {}; - - pytest_28 = callPackage ../development/python-modules/pytest/2_8.nix {}; - - pytest_29 = callPackage ../development/python-modules/pytest/2_9.nix {}; - - pytest_30 = callPackage ../development/python-modules/pytest/3_0.nix { - hypothesis = self.hypothesis.override { - # hypothesis requires pytest that causes dependency cycle - doCheck = false; - pytest = null; - }; - }; - pytest_32 = callPackage ../development/python-modules/pytest{ + pytest_33 = callPackage ../development/python-modules/pytest/default.nix{ hypothesis = self.hypothesis.override { # hypothesis requires pytest that causes dependency cycle doCheck = false; @@ -3449,6 +3223,8 @@ in { pytest-asyncio = callPackage ../development/python-modules/pytest-asyncio { }; + pytest-aiohttp = callPackage ../development/python-modules/pytest-aiohttp { }; + pytestcache = buildPythonPackage rec { name = "pytest-cache-1.0"; src = pkgs.fetchurl { @@ -3528,30 +3304,7 @@ in { pytest-forked = callPackage ../development/python-modules/pytest-forked { }; - pytest-rerunfailures = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "pytest-rerunfailures"; - version = "2.0.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/${pname}/${name}.tar.gz"; - sha256 = "1zzxlswbny8dp3c1sbhpyms1xkknxb6qfji3y3azc7gc95324xsv"; - }; - - buildInputs = with self; [ pytest ]; - - checkPhase = '' - py.test - ''; - - meta = { - 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 ]; - platforms = platforms.all; - }; - }; + pytest-rerunfailures = callPackage ../development/python-modules/pytest-rerunfailures { }; pytest-flake8 = callPackage ../development/python-modules/pytest-flake8 { }; @@ -3654,26 +3407,7 @@ in { }; }; - pytestrunner = buildPythonPackage rec { - version = "2.6.2"; - name = "pytest-runner-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pytest-runner/${name}.tar.gz"; - sha256 = "e775a40ee4a3a1d45018b199c44cc20bbe7f3df2dc8882f61465bb4141c78cdb"; - }; - - buildInputs = with self; [setuptools_scm pytest]; - - meta = { - description = "Invoke py.test as distutils command with dependency resolution"; - homepage = https://bitbucket.org/pytest-dev/pytest-runner; - license = licenses.mit; - }; - - # Trying to run tests fails with # RuntimeError: dictionary changed size during iteration - doCheck = false; - }; + pytestrunner = callPackage ../development/python-modules/pytestrunner { }; pytestquickcheck = callPackage ../development/python-modules/pytest-quickcheck { }; @@ -4002,6 +3736,8 @@ in { libtmux = callPackage ../development/python-modules/libtmux { }; + libusb1 = callPackage ../development/python-modules/libusb1 { inherit (pkgs) libusb1; }; + linuxfd = callPackage ../development/python-modules/linuxfd { }; locket = buildPythonPackage rec { @@ -4109,33 +3845,7 @@ in { }; }); - nose-parameterized = buildPythonPackage (rec { - name = "nose-parameterized-${version}"; - version = "0.5.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/nose-parameterized/${name}.tar.gz"; - sha256 = "a11c41b0cf8218e7cdc19ab7a1bdf5c141d161cd2350daee819473cc63cd0685"; - }; - - # Tests require some python3-isms but code works without. - doCheck = isPy3k; - - LC_ALL = "en_US.UTF-8"; - buildInputs = with self; [ nose pkgs.glibcLocales ]; - propagatedBuildInputs = with self; [ self.six ]; - - checkPhase = '' - nosetests -v - ''; - - - meta = { - description = "Parameterized testing with any Python test framework"; - homepage = https://pypi.python.org/pypi/nose-parameterized; - license = licenses.bsd3; - }; - }); + nose-parameterized = callPackage ../development/python-modules/nose-parameterized {}; neurotools = buildPythonPackage (rec { name = "NeuroTools-${version}"; @@ -4239,21 +3949,7 @@ in { }; }; - decorator = buildPythonPackage rec { - name = "decorator-${version}"; - version = "4.0.11"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/decorator/${name}.tar.gz"; - sha256 = "953d6bf082b100f43229cf547f4f97f97e970f5ad645ee7601d55ff87afdfe76"; - }; - - meta = { - homepage = https://pypi.python.org/pypi/decorator; - description = "Better living through Python with decorators"; - license = licenses.mit; - }; - }; + decorator = callPackage ../development/python-modules/decorator { }; deform = buildPythonPackage rec { name = "deform-2.0a2"; @@ -4599,29 +4295,7 @@ in { edward = callPackage ../development/python-modules/edward { }; - elasticsearch = buildPythonPackage (rec { - pname = "elasticsearch"; - version = "6.0.0"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "029q603g95fzkh87xkbxxmjfq5s9xkr9y27nfik6d4prsl0zxmlz"; - }; - - # Check is disabled because running them destroy the content of the local cluster! - # https://github.com/elasticsearch/elasticsearch-py/tree/master/test_elasticsearch - doCheck = false; - propagatedBuildInputs = with self; [ urllib3 requests ]; - buildInputs = with self; [ nosexcover mock ]; - - meta = { - description = "Official low-level client for Elasticsearch"; - homepage = https://github.com/elasticsearch/elasticsearch-py; - license = licenses.asl20; - maintainers = with maintainers; [ desiderius ]; - }; - }); + elasticsearch = callPackage ../development/python-modules/elasticsearch { }; elasticsearchdsl = buildPythonPackage (rec { name = "elasticsearch-dsl-0.0.9"; @@ -4697,30 +4371,7 @@ in { }; }; - evdev = buildPythonPackage rec { - version = "0.6.4"; - name = "evdev-${version}"; - disabled = isPy34; # see http://bugs.python.org/issue21121 - - src = pkgs.fetchurl { - url = "mirror://pypi/e/evdev/${name}.tar.gz"; - sha256 = "1wkag91s8j0f45jx5n619z354n8pz8in9krn81hp7hlkhi6p8s2j"; - }; - - buildInputs = with self; [ pkgs.linuxHeaders ]; - - patchPhase = "sed -e 's#/usr/include/linux/#${pkgs.linuxHeaders}/include/linux/#g' -i setup.py"; - - doCheck = false; - - meta = { - 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; - }; - }; + evdev = callPackage ../development/python-modules/evdev {}; eve = callPackage ../development/python-modules/eve {}; @@ -4953,6 +4604,8 @@ in { }; }; + fritzconnection = callPackage ../development/python-modules/fritzconnection { }; + frozendict = buildPythonPackage rec { name = "frozendict-0.5"; @@ -5251,7 +4904,7 @@ in { meta = { description = "Git Object Database"; - maintainers = with maintainers; [ mornfall ]; + maintainers = with maintainers; [ ]; homepage = https://github.com/gitpython-developers/gitdb; license = licenses.bsd3; }; @@ -5277,7 +4930,7 @@ in { meta = { description = "Python Git Library"; - maintainers = with maintainers; [ mornfall ]; + maintainers = with maintainers; [ ]; homepage = https://github.com/gitpython-developers/GitPython; license = licenses.bsd3; }; @@ -5430,6 +5083,8 @@ in { then callPackage ../development/python-modules/gurobipy/linux.nix {} else throw "gurobipy not yet supported on ${stdenv.system}"; + hbmqtt = callPackage ../development/python-modules/hbmqtt { }; + helper = buildPythonPackage rec { pname = "helper"; version = "2.4.1"; @@ -5566,6 +5221,8 @@ in { }; }; + idna-ssl = callPackage ../development/python-modules/idna-ssl/default.nix { }; + ijson = callPackage ../development/python-modules/ijson/default.nix {}; imagesize = buildPythonPackage rec { @@ -5693,25 +5350,7 @@ in { }; }; - jdcal = buildPythonPackage rec { - version = "1.0"; - name = "jdcal-${version}"; - - src = pkgs.fetchFromGitHub { - owner = "phn"; - repo = "jdcal"; - rev = "v${version}"; - sha256 = "0jjgrrylraqzk3n97hay4gj00ky6vlvkfaapfgqlbcxyq30j24vq"; - }; - - meta = { - description = "A module containing functions for converting between Julian dates and calendar dates"; - homepage = "https://github.com/phn/jdcal"; - license = licenses.bsd2; - maintainers = with maintainers; [ lihop ]; - platforms = platforms.all; - }; - }; + jdcal = callPackage ../development/python-modules/jdcal { }; internetarchive = callPackage ../development/python-modules/internetarchive {}; @@ -5723,6 +5362,8 @@ in { jsonpatch = callPackage ../development/python-modules/jsonpatch { }; + jsonpickle = callPackage ../development/python-modules/jsonpickle { }; + jsonpointer = buildPythonPackage rec { name = "jsonpointer-1.9"; @@ -5919,35 +5560,7 @@ in { }; }; - PyLTI = buildPythonPackage rec { - version = "0.4.1"; - name = "PyLTI-${version}"; - - 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 = with self; [ httplib2 oauth oauth2 semantic-version ]; - buildInputs = with self; [ - flask httpretty oauthlib pyflakes pytest_27 pytestcache pytestcov covCore - pytestflakes pytestpep8 sphinx mock - ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/P/PyLTI/${name}.tar.gz"; - sha256 = "076llj10j85zw3zq2gygx2pcfqi9rgcld5m4vq1iai1fk15x60fz"; - }; - - meta = { - description = "Implementation of IMS LTI interface that works with edX"; - homepage = "https://github.com/mitodl/pylti"; - license = licenses.bsdOriginal; - maintainers = with maintainers; [ layus ]; - }; - }; + PyLTI = callPackage ../development/python-modules/pylti { }; lmdb = buildPythonPackage rec { pname = "lmdb"; @@ -6187,6 +5800,8 @@ in { netcdf4 = callPackage ../development/python-modules/netcdf4 { }; + netdisco = callPackage ../development/python-modules/netdisco { }; + Nikola = callPackage ../development/python-modules/Nikola { }; nxt-python = buildPythonPackage rec { @@ -6228,6 +5843,12 @@ in { sha256 = "0ssxbqsshrm8p642g3h6wsq20z1fsqhpdvqdm827gn6dlr38868y"; }; + postUnpack = '' + substituteInPlace $sourceRoot/pamela.py --replace \ + 'find_library("pam")' \ + '"${getLib pkgs.pam}/lib/libpam.so"' + ''; + doCheck = false; meta = { @@ -6431,6 +6052,8 @@ in { }; }; + prov = callPackage ../development/python-modules/prov { }; + pudb = buildPythonPackage rec { name = "pudb-2016.2"; @@ -6528,6 +6151,10 @@ in { inherit (pkgs.stdenv) mkDerivation; }; + pydotplus = callPackage ../development/python-modules/pydotplus { }; + + pyhomematic = callPackage ../development/python-modules/pyhomematic { }; + pyphen = callPackage ../development/python-modules/pyphen {}; pypoppler = buildPythonPackage rec { @@ -6632,6 +6259,8 @@ in { }; }; + pythonix = toPythonModule (callPackage ../development/python-modules/pythonix { }); + pypolicyd-spf = buildPythonPackage rec { name = "pypolicyd-spf-${version}"; majorVersion = "2.0"; @@ -6826,37 +6455,7 @@ in { pysrt = callPackage ../development/python-modules/pysrt { }; - pytools = buildPythonPackage rec { - name = "pytools-${version}"; - version = "2017.4"; - - src = pkgs.fetchFromGitHub { - owner = "inducer"; - repo = "pytools"; - rev = "8078e74265bb5a3c9676c698595ab5450cd2bfe7"; - sha256 = "17q61l79fcxkj5jxg3fnymi652sdjp5s6kpsabgxp22kma9crr28"; - }; - - buildInputs = with self; [ - decorator - appdirs - six - numpy - pytest - ]; - - checkPhase = '' - py.test -k 'not test_persistent_dict' - ''; - - meta = { - homepage = https://github.com/inducer/pytools/; - description = "Miscellaneous Python lifesavers."; - license = licenses.mit; - maintainers = with maintainers; [ artuuge ]; - }; - - }; + pytools = callPackage ../development/python-modules/pytools { }; pytun = buildPythonPackage rec { name = "pytun-${version}"; @@ -7010,21 +6609,7 @@ in { hyperlink = callPackage ../development/python-modules/hyperlink {}; - zope_copy = buildPythonPackage rec { - name = "zope.copy-4.0.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zope.copy/${name}.zip"; - sha256 = "eb2a95866df1377741876a3ee62d8600e80089e6246e1a235e86791b29534457"; - }; - - buildInputs = with self; [ zope_interface zope_location zope_schema ]; - - meta = { - maintainers = with maintainers; [ domenkozar ]; - }; - }; - + zope_copy = callPackage ../development/python-modules/zope_copy {}; ssdeep = buildPythonPackage rec { name = "ssdeep-3.1.1"; @@ -7193,6 +6778,24 @@ in { schema = callPackage ../development/python-modules/schema {}; + stem = buildPythonPackage rec { + name = "stem-${version}"; + version = "1.6.0"; + + src = pkgs.fetchurl { + url = "mirror://pypi/s/stem/${name}.tar.gz"; + sha256 = "1va9p3ij7lxg6ixfsvaql06dn11l3fgpxmss1dhlvafm7sqizznp"; + }; + + meta = { + description = "Controller library that allows applications to interact with Tor (https://www.torproject.org/"; + homepage = https://stem.torproject.org/; + license = licenses.gpl3; + maintainers = with maintainers; [ phreedom ]; + }; + + }; + svg-path = buildPythonPackage rec { name = "svg.path-${version}"; version = "2.0b1"; @@ -7210,23 +6813,7 @@ in { }; }; - regex = buildPythonPackage rec { - name = "regex-${version}"; - version = "2016.11.18"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/regex/${name}.tar.gz"; - sha256 = "126ds2b355n3pgl7brshhscpxn14ycs0yznzl8k4akj4sps1i6c6"; - }; - - meta = { - description = "Alternative regular expression module, to replace re"; - homepage = "https://bitbucket.org/mrabarnett/mrab-regex"; - license = licenses.psfl; - platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; - }; - }; + regex = callPackage ../development/python-modules/regex { }; repoze_lru = buildPythonPackage rec { name = "repoze.lru-0.6"; @@ -7242,8 +6829,6 @@ in { }; }; - - repoze_sphinx_autointerface = buildPythonPackage rec { name = "repoze.sphinx.autointerface-0.7.1"; @@ -7448,12 +7033,18 @@ in { chardet = callPackage ../development/python-modules/chardet { }; + crayons = callPackage ../development/python-modules/crayons{ }; + django = self.django_1_11; django_1_11 = callPackage ../development/python-modules/django/1_11.nix { gdal = self.gdal; }; + django_2_0 = callPackage ../development/python-modules/django/2_0.nix { + gdal = self.gdal; + }; + django_1_8 = buildPythonPackage rec { name = "Django-${version}"; version = "1.8.18"; @@ -7905,15 +7496,25 @@ in { docutils = buildPythonPackage rec { name = "docutils-${version}"; - version = "0.13.1"; + version = "0.14"; src = pkgs.fetchurl { url = "mirror://sourceforge/docutils/${name}.tar.gz"; - sha256 = "1gkma47i609jfs7dssxn4y9vsz06qi0l5q41nws0zgkpnrghz33i"; + sha256 = "0x22fs3pdmr42kvz6c654756wja305qv6cx1zbhwlagvxgr4xrji"; }; - # error: invalid command 'test' - doCheck = false; + checkPhase = if isPy3k then '' + ${python.interpreter} test3/alltests.py + '' else '' + ${python.interpreter} test/alltests.py + ''; + + # Create symlinks lacking a ".py" suffix, many programs depend on these names + postFixup = '' + (cd $out/bin && for f in *.py; do + ln -s $f $(echo $f | sed -e 's/\.py$//') + done) + ''; meta = { description = "An open-source text processing system for processing plaintext documentation into useful formats, such as HTML or LaTeX"; @@ -8133,6 +7734,8 @@ in { fastimport = callPackage ../development/python-modules/fastimport { }; + fastrlock = callPackage ../development/python-modules/fastrlock {}; + feedgen = callPackage ../development/python-modules/feedgen { }; feedgenerator = callPackage ../development/python-modules/feedgenerator { @@ -8251,6 +7854,8 @@ in { }; }; + filelock = callPackage ../development/python-modules/filelock {}; + fiona = callPackage ../development/python-modules/fiona { gdal = pkgs.gdal; }; flake8 = callPackage ../development/python-modules/flake8 { }; @@ -8320,12 +7925,16 @@ in { }; }; + flask-common = callPackage ../development/python-modules/flask-common { }; + flask-compress = callPackage ../development/python-modules/flask-compress { }; flask-cors = callPackage ../development/python-modules/flask-cors { }; flask_elastic = callPackage ../development/python-modules/flask-elastic { }; + flask-limiter = callPackage ../development/python-modules/flask-limiter { }; + flask_login = callPackage ../development/python-modules/flask-login { }; flask_ldap_login = callPackage ../development/python-modules/flask-ldap-login { }; @@ -8681,7 +8290,6 @@ in { homepage = https://github.com/terencehonles/fusepy; license = licenses.isc; platforms = platforms.unix; - maintainers = with maintainers; [ nckx ]; }; }; @@ -8743,14 +8351,14 @@ in { }); gdrivefs = buildPythonPackage rec { - version = "0.14.8"; + version = "0.14.9"; name = "gdrivefs-${version}"; namePrefix = ""; disabled = !isPy27; src = pkgs.fetchurl { url = "https://github.com/dsoprea/GDriveFS/archive/${version}.tar.gz"; - sha256 = "1dch10ajkp567pwvssvz1v5c0hxfyd8wf9qd7j1gfybh7f7hyzvw"; + sha256 = "1mc2r35nf5k8vzwdcdhi0l9rb97amqd5xb53lhydj8v8f4rndk7a"; }; buildInputs = with self; [ gipc greenlet httplib2 six ]; @@ -8775,7 +8383,6 @@ in { homepage = https://github.com/dsoprea/GDriveFS; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ nckx ]; }; }; @@ -8908,7 +8515,6 @@ in { ''; homepage = http://gehrcke.de/gipc; license = licenses.mit; - maintainers = with maintainers; [ nckx ]; }; }; @@ -9037,6 +8643,10 @@ in { propagatedBuildInputs = with self; [ oauth2client gdata simplejson httplib2 keyring six rsa ]; }; + googleapis_common_protos = callPackage ../development/python-modules/googleapis_common_protos { }; + + google_api_core = callPackage ../development/python-modules/google_api_core { }; + google_api_python_client = buildPythonPackage rec { name = "google-api-python-client-${version}"; version = "1.5.1"; @@ -9085,6 +8695,14 @@ in { }; }; + google_auth = callPackage ../development/python-modules/google_auth { }; + + google_cloud_core = callPackage ../development/python-modules/google_cloud_core { }; + + google_cloud_speech = callPackage ../development/python-modules/google_cloud_speech { }; + + google_gax = callPackage ../development/python-modules/google_gax { }; + grammalecte = callPackage ../development/python-modules/grammalecte { }; greenlet = buildPythonPackage rec { @@ -9118,6 +8736,8 @@ in { pythonPackages = self; })); + grpcio = callPackage ../development/python-modules/grpcio { }; + gspread = buildPythonPackage rec { version = "0.2.3"; name = "gspread-${version}"; @@ -9231,37 +8851,7 @@ in { }; - html5lib = buildPythonPackage (rec { - version = "0.999999999"; - name = "html5lib-${version}"; - - src = pkgs.fetchurl { - url = "http://github.com/html5lib/html5lib-python/archive/${version}.tar.gz"; - sha256 = "09j6194f5mlnd5xwbavwvnndwl1x91jw74shxl6hcxjp4fxg3h05"; - }; - - buildInputs = with self; [ flake8 pytest pytest-expect mock ]; - propagatedBuildInputs = with self; [ - six webencodings - ] ++ optionals isPy26 [ ordereddict ]; - - 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 = licenses.mit; - maintainers = with maintainers; [ domenkozar prikhi ]; - }; - }); + html5lib = callPackage ../development/python-modules/html5lib { }; http_signature = buildPythonPackage (rec { name = "http_signature-0.1.4"; @@ -9700,26 +9290,7 @@ in { iso3166 = callPackage ../development/python-modules/iso3166 {}; - iso8601 = buildPythonPackage rec { - name = "iso8601-${version}"; - version = "0.1.11"; - src = pkgs.fetchurl { - url = "mirror://pypi/i/iso8601/${name}.tar.gz"; - sha256 = "e8fb52f78880ae063336c94eb5b87b181e6a0cc33a6c008511bac9a6e980ef30"; - }; - - buildInputs = [ self.pytest ]; - - checkPhase = '' - py.test iso8601 - ''; - - meta = { - homepage = https://bitbucket.org/micktwomey/pyiso8601/; - description = "Simple module to parse ISO 8601 dates"; - maintainers = with maintainers; [ phreedom ]; - }; - }; + iso8601 = callPackage ../development/python-modules/iso8601 { }; isort = buildPythonPackage rec { name = "${pname}-${version}"; @@ -9744,23 +9315,7 @@ in { jedi = callPackage ../development/python-modules/jedi { }; - jellyfish = buildPythonPackage rec { - version = "0.5.2"; - name = "jellyfish-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/j/jellyfish/${name}.tar.gz"; - sha256 = "15xk0kbr1gig9r1mp22lk9mk3jyi886h8ywn9diixhnyl4q6dacn"; - }; - - buildInputs = with self; [ pytest unicodecsv ]; - - meta = { - homepage = https://github.com/sunlightlabs/jellyfish; - description = "Approximate and phonetic matching of strings"; - maintainers = with maintainers; [ koral ]; - }; - }; + jellyfish = callPackage ../development/python-modules/jellyfish { }; j2cli = buildPythonPackage rec { name = "j2cli-${version}"; @@ -9810,6 +9365,8 @@ in { }; }; + jinja2_pluralize = callPackage ../development/python-modules/jinja2_pluralize { }; + jmespath = buildPythonPackage rec { name = "jmespath-0.9.0"; @@ -9834,16 +9391,18 @@ in { jsondate = callPackage ../development/python-modules/jsondate { }; + jsondiff = callPackage ../development/python-modules/jsondiff { }; + jsonnet = buildPythonPackage { inherit (pkgs.jsonnet) name src; - # Python 3 is not yet supported https://github.com/google/jsonnet/pull/335 - disabled = isPy3k; }; jupyter_client = callPackage ../development/python-modules/jupyter_client { }; jupyter_core = callPackage ../development/python-modules/jupyter_core { }; + jupyterhub = callPackage ../development/python-modules/jupyterhub { }; + jsonpath_rw = buildPythonPackage rec { name = "jsonpath-rw-${version}"; version = "1.4.0"; @@ -9932,33 +9491,6 @@ in { koji = callPackage ../development/python-modules/koji { }; - kombu_3 = buildPythonPackage rec { - name = "kombu-${version}"; - version = "3.0.35"; - - disabled = pythonOlder "2.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/k/kombu/${name}.tar.gz"; - sha256 = "09xpxpjz9nk8d14dj361dqdwyjwda3jlf1a7v6jif9wn2xm37ar2"; - }; - - # most of these are simply to allow the test suite to do its job - buildInputs = with self; optionals isPy27 [ mock unittest2 nose redis qpid-python pymongo sqlalchemy pyyaml msgpack boto ]; - - propagatedBuildInputs = with self; [ amqp_1 anyjson ] ++ - (optionals (pythonOlder "2.7") [ importlib ordereddict ]); - - # tests broken on python 2.6? https://github.com/nose-devs/nose/issues/806 - doCheck = isPy27; - - meta = { - description = "Messaging library for Python"; - homepage = "http://github.com/celery/kombu"; - license = licenses.bsd3; - }; - }; - kombu = buildPythonPackage rec { name = "kombu-${version}"; version = "4.0.2"; @@ -10075,6 +9607,8 @@ in { }; + ldaptor = callPackage ../development/python-modules/ldaptor { }; + le = buildPythonPackage rec { name = "le-${version}"; version = "1.4.29"; @@ -10125,6 +9659,8 @@ in { ]; }; + python-oauth2 = callPackage ../development/python-modules/python-oauth2 { }; + python-Levenshtein = buildPythonPackage rec { name = "python-Levenshtein-${version}"; version = "0.12.0"; @@ -10189,6 +9725,8 @@ in { libxslt = disabledIf isPy3k (toPythonModule (pkgs.libxslt.override{pythonSupport=true; python2=python; inherit (self) libxml2;})).py; + limits = callPackage ../development/python-modules/limits { }; + limnoria = buildPythonPackage rec { name = "limnoria-${version}"; version = "2016.05.06"; @@ -10245,7 +9783,7 @@ in { locustio = callPackage ../development/python-modules/locustio { }; - llvmlite = callPackage ../development/python-modules/llvmlite {llvm=pkgs.llvm_4;}; + llvmlite = callPackage ../development/python-modules/llvmlite {llvm=pkgs.llvm_5;}; lockfile = buildPythonPackage rec { pname = "lockfile"; @@ -10275,25 +9813,7 @@ in { logilab-constraint = callPackage ../development/python-modules/logilab/constraint.nix {}; - lxml = buildPythonPackage ( rec { - name = "lxml-3.8.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/l/lxml/${name}.tar.gz"; - sha256 = "15nvf6n285n282682qyw3wihsncb0x5amdhyi4b83bfa2nz74vvk"; - }; - - buildInputs = with self; [ pkgs.libxml2 pkgs.libxslt ]; - - hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format"; - - meta = { - description = "Pythonic binding for the libxml2 and libxslt libraries"; - homepage = http://lxml.de; - license = licenses.bsd3; - maintainers = with maintainers; [ sjourdois ]; - }; - }); + lxml = callPackage ../development/python-modules/lxml {inherit (pkgs) libxml2 libxslt;}; lxc = buildPythonPackage (rec { name = "python-lxc-unstable-2016-08-25"; @@ -10316,7 +9836,7 @@ in { }; }); - ltc_scrypt = callPackage ../development/python-modules/ltc_scrypt/default.nix { }; + py_scrypt = callPackage ../development/python-modules/py_scrypt/default.nix { }; python_magic = buildPythonPackage rec { name = "python-magic-0.4.10"; @@ -10390,28 +9910,7 @@ in { }; }; - - Mako = buildPythonPackage rec { - name = "Mako-1.0.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/M/Mako/${name}.tar.gz"; - sha256 = "0nchpw6akfcsg8w6irjlx0gyzadc123hv4g47sijgnqd9nz9vngy"; - }; - - buildInputs = with self; [ markupsafe nose mock pytest ]; - propagatedBuildInputs = with self; [ 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 = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ domenkozar ]; - }; - }; + Mako = callPackage ../development/python-modules/Mako { }; manifestparser = callPackage ../development/python-modules/marionette-harness/manifestparser.nix {}; marionette_driver = callPackage ../development/python-modules/marionette-harness/marionette_driver.nix {}; @@ -10468,23 +9967,28 @@ in { }; }; - markdown = buildPythonPackage rec { - version = "2.6.8"; - name = "markdown-${version}"; + mapsplotlib = buildPythonPackage rec { + name = "mapsplotlib-${version}"; + version = "1.0.6"; + + disabled = isPy3k; src = pkgs.fetchurl { - url = "mirror://pypi/M/Markdown/Markdown-${version}.tar.gz"; - sha256 = "0cqfhr1km2s5d8jm6hbwgkrrj9hvkjf2gab3s2axlrw1clgaij0a"; + url = "mirror://pypi/m/mapsplotlib/${name}.tar.gz"; + sha256 = "09gpws3x0jd88n636baxx5izjffrpjy4j6jl8l7vj29yzvrdr2bp"; }; - # error: invalid command 'test' - doCheck = false; + propagatedBuildInputs = with self; [ matplotlib scipy pandas requests pillow ]; meta = { - homepage = http://www.freewisdom.org/projects/python-markdown; + description = "Custom Python plots on a Google Maps background"; + homepage = https://github.com/tcassou/mapsplotlib; + maintainers = [ maintainers.rob ]; }; }; + markdown = callPackage ../development/python-modules/markdown { }; + markdownsuperscript = callPackage ../development/python-modules/markdownsuperscript {}; markdown-macros = buildPythonPackage rec { @@ -10574,6 +10078,8 @@ in { matrix-client = callPackage ../development/python-modules/matrix-client/default.nix { }; + maya = callPackage ../development/python-modules/maya { }; + mccabe = callPackage ../development/python-modules/mccabe { }; mechanize = buildPythonPackage (rec { @@ -10619,6 +10125,8 @@ in { meliae = callPackage ../development/python-modules/meliae {}; + meinheld = callPackage ../development/python-modules/meinheld { }; + memcached = buildPythonPackage rec { name = "memcached-1.51"; @@ -10818,6 +10326,8 @@ in { }; }; + pendulum = callPackage ../development/python-modules/pendulum { }; + pocket = buildPythonPackage rec { name = "pocket-${version}"; version = "0.3.6"; @@ -10841,23 +10351,7 @@ in { mistune = callPackage ../development/python-modules/mistune { }; - brotlipy = buildPythonPackage rec { - name = "brotlipy-${version}"; - version = "0.6.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/b/brotlipy/${name}.tar.gz"; - sha256 = "10s2y19zywfkf3sksrw81czhva759aki0clld2pnnlgf64sz7016"; - }; - - propagatedBuildInputs = with self; [ cffi enum34 construct ]; - - meta = { - description = "Python bindings for the reference Brotli encoder/decoder"; - homepage = "https://github.com/python-hyper/brotlipy/"; - license = licenses.mit; - }; - }; + brotlipy = callPackage ../development/python-modules/brotlipy { }; sortedcontainers = buildPythonPackage rec { name = "sortedcontainers-${version}"; @@ -11253,14 +10747,6 @@ in { ]; LC_ALL = "en_US.UTF-8"; - # Remove test that fails due to missing encoding in nix_run_setup.py, a - # file that buildPythonPackage copies to source trees at build time. - # PR with fix: https://github.com/NixOS/nixpkgs/pull/17430 - # ("python: add file encoding to run_setup.py") - preBuild = '' - rm tests/test_encoding.py - ''; - meta = { description = "Python multimedia tagging library"; homepage = http://code.google.com/p/mutagen; @@ -11288,35 +10774,7 @@ in { }; }); - mygpoclient = buildPythonPackage rec { - name = "mygpoclient-${version}"; - version = "1.7"; - - src = pkgs.fetchurl { - url = "https://thp.io/2010/mygpoclient/${name}.tar.gz"; - sha256 = "6a0b7b1fe2b046875456e14eda3e42430e493bf2251a64481cf4fd1a1e21a80e"; - }; - - buildInputs = with self; [ nose minimock ]; - - checkPhase = '' - nosetests - ''; - - disabled = isPy3k; - - meta = { - 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://thp.io/2010/mygpoclient/; - license = with licenses; [ gpl3 ]; - platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ skeidel ]; - }; - }; + mygpoclient = callPackage ../development/python-modules/mygpoclient { }; mwclient = buildPythonPackage rec { version = "0.8.3"; @@ -11524,9 +10982,9 @@ in { sha256 = "0x0c2jg0bb3pp84njaqiic050qkyd7ymwhfvhipnimg58yv40441"; }; - buildInputs = with self; [ nose pkgs.openssl ]; + buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ pkgs.mysql.lib pkgs.zlib ]; + propagatedBuildInputs = with self; [ pkgs.mysql.connector-c ]; meta = { description = "MySQL database binding for Python"; @@ -11766,34 +11224,12 @@ in { }; }); - nibabel = buildPythonPackage rec { - version = "2.0.2"; - name = "nibabel-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/nibabel/${name}.tar.gz"; - sha256 = "0k8mv5zmwb6vc8kwrydl3pp0pnw937rf5mz10figkxczrw6dkk7h"; - }; - - propagatedBuildInputs = with self; [ - numpy - nose - ]; - - # Failing tests - # nibabel.tests.test_minc1.test_old_namespace - # nisext.tests.test_testers.test_back_tick - doCheck = false; - - meta = { - homepage = http://nipy.org/nibabel/; - description = "Access a multitude of neuroimaging data formats"; - license = licenses.mit; - }; - }; + nibabel = callPackage ../development/python-modules/nibabel {}; nilearn = callPackage ../development/python-modules/nilearn {}; + nimfa = callPackage ../development/python-modules/nimfa {}; + nipy = buildPythonPackage rec { version = "0.4.0"; name = "nipy-${version}"; @@ -11837,36 +11273,8 @@ in { }; }; - nipype = buildPythonPackage rec { - version = "0.10.0"; - name = "nipype-${version}"; - - # Uses python 2 print. Master seems to be Py3 compatible. - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/nipype/${name}.tar.gz"; - sha256 = "7fb143cd4d05f18db1cb7f0b83dba13d3dcf55b4eb3d16df08c97033ccae507b"; - }; - - # Tests fail due to getcwd returning ENOENT??? - doCheck = false; - - propagatedBuildInputs = with self; [ - numpy - dateutil - nose - traits - scipy - nibabel - networkx - ]; - - meta = { - homepage = http://nipy.org/nipype/; - description = "Neuroimaging in Python: Pipelines and Interfaces"; - license = licenses.bsd3; - }; + nipype = callPackage ../development/python-modules/nipype { + inherit (pkgs) which; }; nose = buildPythonPackage rec { @@ -12075,42 +11483,7 @@ in { numba = callPackage ../development/python-modules/numba { }; - numexpr = buildPythonPackage rec { - version = "2.6.2"; - name = "numexpr-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/numexpr/${name}.tar.gz"; - sha256 = "6ab8ff5c19e7f452966bf5a3220b845cf3244fe0b96544f7f9acedcc2db5c705"; - }; - - propagatedBuildInputs = with self; [ numpy ]; - - # Run the test suite. - # It requires the build path to be in the python search path. - checkPhase = '' - ${python}/bin/${python.executable} <