diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml index 3b90596bcc2c..c7187d86d1b3 100644 --- a/doc/cross-compilation.xml +++ b/doc/cross-compilation.xml @@ -47,13 +47,9 @@ In Nixpkgs, these three platforms are defined as attribute sets under the - names buildPlatform, hostPlatform, - and targetPlatform. All three are always defined as - attributes in the standard environment, and at the top level. That means - one can get at them just like a dependency in a function that is imported - with callPackage: -{ stdenv, buildPlatform, hostPlatform, fooDep, barDep, .. }: ...buildPlatform... - , or just off stdenv: + names buildPlatform, hostPlatform, and + targetPlatform. They are always defined as attributes in + the standard environment. That means one can access them like: { stdenv, fooDep, barDep, .. }: ...stdenv.buildPlatform... . diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index 1d6a4fe8da8d..f0a6559c3d51 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -5,11 +5,16 @@ date: 2016-06-25 --- # User's Guide to Vim Plugins/Addons/Bundles/Scripts in Nixpkgs -You'll get a vim(-your-suffix) in PATH also loading the plugins you want. +Both Neovim and Vim can be configured to include your favorite plugins +and additional libraries. + Loading can be deferred; see examples. -Vim packages, VAM (=vim-addon-manager) and Pathogen are supported to load -packages. +At the moment we support three different methods for managing plugins: + +- Vim packages (*recommend*) +- VAM (=vim-addon-manager) +- Pathogen ## Custom configuration @@ -25,7 +30,19 @@ vim_configurable.customize { } ``` -## Vim packages +For Neovim the `configure` argument can be overridden to achieve the same: + +``` +neovim.override { + configure = { + customRC = '' + # here your custom configuration goes! + ''; + }; +} +``` + +## Managing plugins with Vim packages To store you plugins in Vim packages the following example can be used: @@ -38,13 +55,50 @@ vim_configurable.customize { opt = [ phpCompletion elm-vim ]; # To automatically load a plugin when opening a filetype, add vimrc lines like: # autocmd FileType php :packadd phpCompletion - } -}; + }; +} ``` -## VAM +For Neovim the syntax is -### dependencies by Vim plugins +``` +neovim.override { + configure = { + customRC = '' + # here your custom configuration goes! + ''; + packages.myVimPackage = with pkgs.vimPlugins; { + # see examples below how to use custom packages + start = [ ]; + opt = [ ]; + }; + }; +} +``` + +The resulting package can be added to `packageOverrides` in `~/.nixpkgs/config.nix` to make it installable: + +``` +{ + packageOverrides = pkgs: with pkgs; { + myVim = vim_configurable.customize { + name = "vim-with-plugins"; + # add here code from the example section + }; + myNeovim = neovim.override { + configure = { + # add here code from the example section + }; + }; + }; +} +``` + +After that you can install your special grafted `myVim` or `myNeovim` packages. + +## Managing plugins with VAM + +### Handling dependencies of Vim plugins VAM introduced .json files supporting dependencies without versioning assuming that "using latest version" is ok most of the time. @@ -125,6 +179,18 @@ Sample output2: ] +## Adding new plugins to nixpkgs + +In `pkgs/misc/vim-plugins/vim-plugin-names` we store the plugin names +for all vim plugins we automatically generate plugins for. +The format of this file `github username/github repository`: +For example https://github.com/scrooloose/nerdtree becomes `scrooloose/nerdtree`. +After adding your plugin to this file run the `./update.py` in the same folder. +This will updated a file called `generated.nix` and make your plugin accessible in the +`vimPlugins` attribute set (`vimPlugins.nerdtree` in our example). +If additional steps to the build process of the plugin are required, add an +override to the `pkgs/misc/vim-plugins/default.nix` in the same directory. + ## Important repositories - [vim-pi](https://bitbucket.org/vimcommunity/vim-pi) is a plugin repository diff --git a/doc/package-notes.xml b/doc/package-notes.xml index c2aef8937b06..1f088e8aaa0e 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -671,6 +671,8 @@ overrides = super: self: rec { plugins = with availablePlugins; [ python perl ]; } } + If the configure function returns an attrset without the plugins + attribute, availablePlugins will be used automatically. @@ -704,6 +706,55 @@ overrides = super: self: rec { }; } + + WeeChat allows to set defaults on startup using the --run-command. + The configure method can be used to pass commands to the program: +weechat.override { + configure = { availablePlugins, ... }: { + init = '' + /set foo bar + /server add freenode chat.freenode.org + ''; + }; +} + Further values can be added to the list of commands when running + weechat --run-command "your-commands". + + + Additionally it's possible to specify scripts to be loaded when starting weechat. + These will be loaded before the commands from init: +weechat.override { + configure = { availablePlugins, ... }: { + scripts = with pkgs.weechatScripts; [ + weechat-xmpp weechat-matrix-bridge wee-slack + ]; + init = '' + /set plugins.var.python.jabber.key "val" + '': + }; +} + + + In nixpkgs there's a subpackage which contains derivations for + WeeChat scripts. Such derivations expect a passthru.scripts attribute + which contains a list of all scripts inside the store path. Furthermore all scripts + have to live in $out/share. An exemplary derivation looks like this: +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "exemplary-weechat-script"; + src = fetchurl { + url = "https://scripts.tld/your-scripts.tar.gz"; + sha256 = "..."; + }; + passthru.scripts = [ "foo.py" "bar.lua" ]; + installPhase = '' + mkdir $out/share + cp foo.py $out/share + cp bar.lua $out/share + ''; +} +
Citrix Receiver diff --git a/lib/asserts.nix b/lib/asserts.nix new file mode 100644 index 000000000000..8a5f1fb3feb7 --- /dev/null +++ b/lib/asserts.nix @@ -0,0 +1,44 @@ +{ lib }: + +rec { + + /* Print a trace message if pred is false. + Intended to be used to augment asserts with helpful error messages. + + Example: + assertMsg false "nope" + => false + stderr> trace: nope + + assert (assertMsg ("foo" == "bar") "foo is not bar, silly"); "" + stderr> trace: foo is not bar, silly + stderr> assert failed at … + + Type: + assertMsg :: Bool -> String -> Bool + */ + # TODO(Profpatsch): add tests that check stderr + assertMsg = pred: msg: + if pred + then true + else builtins.trace msg false; + + /* Specialized `assertMsg` for checking if val is one of the elements + of a list. Useful for checking enums. + + Example: + let sslLibrary = "libressl" + in assertOneOf "sslLibrary" sslLibrary [ "openssl" "bearssl" ] + => false + stderr> trace: sslLibrary must be one of "openssl", "bearssl", but is: "libressl" + + Type: + assertOneOf :: String -> ComparableVal -> List ComparableVal -> Bool + */ + assertOneOf = name: val: xs: assertMsg + (lib.elem val xs) + "${name} must be one of ${ + lib.generators.toPretty {} xs}, but is: ${ + lib.generators.toPretty {} val}"; + +} diff --git a/lib/default.nix b/lib/default.nix index dd6fcec75e21..d7a05fec8338 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -38,10 +38,11 @@ let systems = callLibs ./systems; # misc + asserts = callLibs ./asserts.nix; debug = callLibs ./debug.nix; - generators = callLibs ./generators.nix; misc = callLibs ./deprecated.nix; + # domain-specific fetchers = callLibs ./fetchers.nix; @@ -60,7 +61,6 @@ let boolToString mergeAttrs flip mapNullable inNixShell min max importJSON warn info nixpkgsVersion version mod compare splitByAndCompare functionArgs setFunctionArgs isFunction; - inherit (fixedPoints) fix fix' extends composeExtensions makeExtensible makeExtensibleWithCustomName; inherit (attrsets) attrByPath hasAttrByPath setAttrByPath @@ -117,6 +117,8 @@ let unknownModule mkOption; inherit (types) isType setType defaultTypeMerge defaultFunctor isOptionType mkOptionType; + inherit (asserts) + assertMsg assertOneOf; inherit (debug) addErrorContextToAttrs traceIf traceVal traceValFn traceXMLVal traceXMLValMarked traceSeq traceSeqN traceValSeq traceValSeqFn traceValSeqN traceValSeqNFn traceShowVal diff --git a/lib/licenses.nix b/lib/licenses.nix index 6f0e4217c196..c4db280645a4 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -355,6 +355,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Independent JPEG Group License"; }; + imagemagick = spdx { + fullName = "ImageMagick License"; + spdxId = "imagemagick"; + }; + inria-compcert = { fullName = "INRIA Non-Commercial License Agreement for the CompCert verified compiler"; url = "http://compcert.inria.fr/doc/LICENSE"; diff --git a/lib/lists.nix b/lib/lists.nix index 288882924fff..9ecd8f220038 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -509,7 +509,8 @@ rec { => 3 */ last = list: - assert list != []; elemAt list (length list - 1); + assert lib.assertMsg (list != []) "lists.last: list must not be empty!"; + elemAt list (length list - 1); /* Return all elements but the last @@ -517,7 +518,9 @@ rec { init [ 1 2 3 ] => [ 1 2 ] */ - init = list: assert list != []; take (length list - 1) list; + init = list: + assert lib.assertMsg (list != []) "lists.init: list must not be empty!"; + take (length list - 1) list; /* return the image of the cross product of some lists by a function diff --git a/lib/strings.nix b/lib/strings.nix index af932ce6ecff..0c4095bb55cd 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -410,7 +410,7 @@ rec { components = splitString "/" url; filename = lib.last components; name = builtins.head (splitString sep filename); - in assert name != filename; name; + in assert name != filename; name; /* Create an --{enable,disable}- string that can be passed to standard GNU Autoconf scripts. @@ -468,7 +468,10 @@ rec { strw = lib.stringLength str; reqWidth = width - (lib.stringLength filler); in - assert strw <= width; + assert lib.assertMsg (strw <= width) + "fixedWidthString: requested string length (${ + toString width}) must not be shorter than actual length (${ + toString strw})"; if strw == width then str else filler + fixedWidthString reqWidth filler str; /* Format a number adding leading zeroes up to fixed width. @@ -501,7 +504,7 @@ rec { isStorePath = x: isCoercibleToString x && builtins.substring 0 1 (toString x) == "/" - && dirOf (builtins.toPath x) == builtins.storeDir; + && dirOf x == builtins.storeDir; /* Convert string to int Obviously, it is a bit hacky to use fromJSON that way. @@ -537,11 +540,10 @@ rec { */ readPathsFromFile = rootPath: file: let - root = toString rootPath; lines = lib.splitString "\n" (builtins.readFile file); removeComments = lib.filter (line: line != "" && !(lib.hasPrefix "#" line)); relativePaths = removeComments lines; - absolutePaths = builtins.map (path: builtins.toPath (root + "/" + path)) relativePaths; + absolutePaths = builtins.map (path: rootPath + "/${path}") relativePaths; in absolutePaths; diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index cf99aca58c09..d3bd7746d89c 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -112,7 +112,7 @@ runTests { storePathAppendix = isStorePath "${goodPath}/bin/python"; nonAbsolute = isStorePath (concatStrings (tail (stringToCharacters goodPath))); - asPath = isStorePath (builtins.toPath goodPath); + asPath = isStorePath goodPath; otherPath = isStorePath "/something/else"; otherVals = { attrset = isStorePath {}; @@ -357,7 +357,7 @@ runTests { int = 42; bool = true; string = ''fno"rd''; - path = /. + "/foo"; # toPath returns a string + path = /. + "/foo"; null_ = null; function = x: x; functionArgs = { arg ? 4, foo }: arg; diff --git a/lib/trivial.nix b/lib/trivial.nix index e702b8cdcc9f..b1eea0bf1247 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -171,7 +171,7 @@ rec { builtins.fromJSON (builtins.readFile path); - ## Warnings and asserts + ## Warnings /* See https://github.com/NixOS/nix/issues/749. Eventually we'd like these to expand to Nix builtins that carry metadata so that Nix can filter out diff --git a/lib/types.nix b/lib/types.nix index 4d6ac51c8988..4e44e7521c4b 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -119,7 +119,9 @@ rec { let betweenDesc = lowest: highest: "${toString lowest} and ${toString highest} (both inclusive)"; - between = lowest: highest: assert lowest <= highest; + between = lowest: highest: + assert lib.assertMsg (lowest <= highest) + "ints.between: lowest must be smaller than highest"; addCheck int (x: x >= lowest && x <= highest) // { name = "intBetween"; description = "integer between ${betweenDesc lowest highest}"; @@ -439,7 +441,9 @@ rec { # Either value of type `finalType` or `coercedType`, the latter is # converted to `finalType` using `coerceFunc`. coercedTo = coercedType: coerceFunc: finalType: - assert coercedType.getSubModules == null; + assert lib.assertMsg (coercedType.getSubModules == null) + "coercedTo: coercedType must not have submodules (it’s a ${ + coercedType.description})"; mkOptionType rec { name = "coercedTo"; description = "${finalType.description} or ${coercedType.description} convertible to it"; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bd266dda300c..5397845d728a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3893,6 +3893,11 @@ github = "StillerHarpo"; name = "Florian Engel"; }; + stites = { + email = "sam@stites.io"; + github = "stites"; + name = "Sam Stites"; + }; stumoss = { email = "samoss@gmail.com"; github = "stumoss"; @@ -4158,6 +4163,11 @@ github = "tomsmeets"; name = "Tom Smeets"; }; + toonn = { + email = "nnoot@toonn.io"; + github = "toonn"; + name = "Toon Nolten"; + }; travisbhartwell = { email = "nafai@travishartwell.net"; github = "travisbhartwell"; diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index 30e98a23bdfa..9ec465d8955e 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -283,6 +283,14 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' from your config without any issues. + + + stdenv.system and system in nixpkgs now refer to the host platform instead of the build platform. + For native builds this is not change, let alone a breaking one. + For cross builds, it is a breaking change, and stdenv.buildPlatform.system can be used instead for the old behavior. + They should be using that anyways for clarity. + +
@@ -536,6 +544,13 @@ inherit (pkgs.nixos { a new paragraph. + + + Top-level buildPlatform, hostPlatform, and targetPlatform in Nixpkgs are deprecated. + Please use their equivalents in stdenv instead: + stdenv.buildPlatform, stdenv.hostPlatform, and stdenv.targetPlatform. + + diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index 97c79487df4c..f71e264c3478 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -28,7 +28,7 @@ let extraArgs_ = extraArgs; pkgs_ = pkgs; extraModules = let e = builtins.getEnv "NIXOS_EXTRA_MODULE_PATH"; - in if e == "" then [] else [(import (builtins.toPath e))]; + in if e == "" then [] else [(import e)]; in let @@ -36,7 +36,11 @@ let _file = ./eval-config.nix; key = _file; config = { - nixpkgs.localSystem = lib.mkDefault { inherit system; }; + # Explicit `nixpkgs.system` or `nixpkgs.localSystem` should override + # this. Since the latter defaults to the former, the former should + # default to the argument. That way this new default could propagate all + # they way through, but has the last priority behind everything else. + nixpkgs.system = lib.mkDefault system; _module.args.pkgs = lib.mkIf (pkgs_ != null) (lib.mkForce pkgs_); }; }; diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index 31adc9b82620..555db459f57a 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -163,15 +163,24 @@ in /bin/sh ''; + # For resetting environment with `. /etc/set-environment` when needed + # and discoverability (see motivation of #30418). + environment.etc."set-environment".source = config.system.build.setEnvironment; + system.build.setEnvironment = pkgs.writeText "set-environment" - '' - ${exportedEnvVars} + '' + # DO NOT EDIT -- this file has been generated automatically. - ${cfg.extraInit} + # Prevent this file from being sourced by child shells. + export __NIXOS_SET_ENVIRONMENT_DONE=1 - # ~/bin if it exists overrides other bin directories. - export PATH="$HOME/bin:$PATH" - ''; + ${exportedEnvVars} + + ${cfg.extraInit} + + # ~/bin if it exists overrides other bin directories. + export PATH="$HOME/bin:$PATH" + ''; system.activationScripts.binsh = stringAfter [ "stdio" ] '' diff --git a/nixos/modules/config/xdg/mime.nix b/nixos/modules/config/xdg/mime.nix index f1b672234a34..4323a49ea1dd 100644 --- a/nixos/modules/config/xdg/mime.nix +++ b/nixos/modules/config/xdg/mime.nix @@ -7,7 +7,7 @@ with lib; type = types.bool; default = true; description = '' - Whether to install files to support the + Whether to install files to support the XDG Shared MIME-info specification and the XDG MIME Applications specification. ''; @@ -17,18 +17,18 @@ with lib; config = mkIf config.xdg.mime.enable { environment.pathsToLink = [ "/share/mime" ]; - environment.systemPackages = [ - # this package also installs some useful data, as well as its utilities - pkgs.shared-mime-info + environment.systemPackages = [ + # this package also installs some useful data, as well as its utilities + pkgs.shared-mime-info ]; environment.extraSetup = '' - if [ -w $out/share/mime ]; then - XDG_DATA_DIRS=$out/share ${pkgs.shared-mime-info}/bin/update-mime-database -V $out/share/mime > /dev/null + if [ -w $out/share/mime ] && [ -d $out/share/mime/packages ]; then + XDG_DATA_DIRS=$out/share ${pkgs.shared-mime-info}/bin/update-mime-database -V $out/share/mime > /dev/null fi if [ -w $out/share/applications ]; then - ${pkgs.desktop-file-utils}/bin/update-desktop-database $out/share/applications + ${pkgs.desktop-file-utils}/bin/update-desktop-database $out/share/applications fi ''; }; diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 8fbe218b232a..7f9833e184ab 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -62,12 +62,11 @@ in pkgs = mkOption { defaultText = literalExample ''import "''${nixos}/.." { - inherit (config.nixpkgs) config overlays localSystem crossSystem; + inherit (cfg) config overlays localSystem crossSystem; } ''; default = import ../../.. { - localSystem = { inherit (cfg) system; } // cfg.localSystem; - inherit (cfg) config overlays crossSystem; + inherit (cfg) config overlays localSystem crossSystem; }; type = pkgsType; example = literalExample ''import {}''; @@ -140,8 +139,11 @@ in localSystem = mkOption { type = types.attrs; # TODO utilize lib.systems.parsedPlatform - default = { system = builtins.currentSystem; }; + default = { inherit (cfg) system; }; example = { system = "aarch64-linux"; config = "aarch64-unknown-linux-gnu"; }; + # Make sure that the final value has all fields for sake of other modules + # referring to this. TODO make `lib.systems` itself use the module system. + apply = lib.systems.elaborate; defaultText = literalExample ''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform''; description = '' @@ -180,6 +182,7 @@ in system = mkOption { type = types.str; example = "i686-linux"; + default = { system = builtins.currentSystem; }; description = '' Specifies the Nix platform type on which NixOS should be built. It is better to specify nixpkgs.localSystem instead. @@ -196,6 +199,7 @@ in See nixpkgs.localSystem for more information. + Ignored when nixpkgs.localSystem is set. Ignored when nixpkgs.pkgs is set. ''; }; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 4795922abcfb..3f3123798f59 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -245,6 +245,7 @@ ./services/desktops/gnome3/gnome-user-share.nix ./services/desktops/gnome3/gpaste.nix ./services/desktops/gnome3/gvfs.nix + ./services/desktops/gnome3/rygel.nix ./services/desktops/gnome3/seahorse.nix ./services/desktops/gnome3/sushi.nix ./services/desktops/gnome3/tracker.nix @@ -406,6 +407,7 @@ ./services/misc/taskserver ./services/misc/tzupdate.nix ./services/misc/uhub.nix + ./services/misc/weechat.nix ./services/misc/xmr-stak.nix ./services/misc/zookeeper.nix ./services/monitoring/apcupsd.nix @@ -518,6 +520,7 @@ ./services/networking/i2pd.nix ./services/networking/i2p.nix ./services/networking/iodine.nix + ./services/networking/iperf3.nix ./services/networking/ircd-hybrid/default.nix ./services/networking/iwd.nix ./services/networking/keepalived/default.nix diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index 69a1a482d074..424e1506b4c5 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -126,7 +126,9 @@ in programs.bash = { shellInit = '' - ${config.system.build.setEnvironment.text} + if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then + . ${config.system.build.setEnvironment} + fi ${cfge.shellInit} ''; @@ -166,11 +168,11 @@ in # Read system-wide modifications. if test -f /etc/profile.local; then - . /etc/profile.local + . /etc/profile.local fi if [ -n "''${BASH_VERSION:-}" ]; then - . /etc/bashrc + . /etc/bashrc fi ''; @@ -191,12 +193,12 @@ in # We are not always an interactive shell. if [ -n "$PS1" ]; then - ${cfg.interactiveShellInit} + ${cfg.interactiveShellInit} fi # Read system-wide modifications. if test -f /etc/bashrc.local; then - . /etc/bashrc.local + . /etc/bashrc.local fi ''; diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix index c8d94a47be28..c3f742acde2e 100644 --- a/nixos/modules/programs/fish.nix +++ b/nixos/modules/programs/fish.nix @@ -27,7 +27,7 @@ in ''; type = types.bool; }; - + vendor.config.enable = mkOption { type = types.bool; default = true; @@ -43,7 +43,7 @@ in Whether fish should use completion files provided by other packages. ''; }; - + vendor.functions.enable = mkOption { type = types.bool; default = true; @@ -107,9 +107,11 @@ in # This happens before $__fish_datadir/config.fish sets fish_function_path, so it is currently # unset. We set it and then completely erase it, leaving its configuration to $__fish_datadir/config.fish set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $__fish_datadir/functions - + # source the NixOS environment config - fenv source ${config.system.build.setEnvironment} + if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ] + fenv source ${config.system.build.setEnvironment} + end # clear fish_function_path so that it will be correctly set when we return to $__fish_datadir/config.fish set -e fish_function_path @@ -123,7 +125,7 @@ in set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path fenv source /etc/fish/foreign-env/shellInit > /dev/null set -e fish_function_path[1] - + ${cfg.shellInit} # and leave a note so we don't source this config section again from @@ -137,7 +139,7 @@ in set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path fenv source /etc/fish/foreign-env/loginShellInit > /dev/null set -e fish_function_path[1] - + ${cfg.loginShellInit} # and leave a note so we don't source this config section again from @@ -149,12 +151,11 @@ in status --is-interactive; and not set -q __fish_nixos_interactive_config_sourced and begin ${fishAliases} - set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path fenv source /etc/fish/foreign-env/interactiveShellInit > /dev/null set -e fish_function_path[1] - + ${cfg.promptInit} ${cfg.interactiveShellInit} @@ -170,7 +171,7 @@ in ++ optional cfg.vendor.config.enable "/share/fish/vendor_conf.d" ++ optional cfg.vendor.completions.enable "/share/fish/vendor_completions.d" ++ optional cfg.vendor.functions.enable "/share/fish/vendor_functions.d"; - + environment.systemPackages = [ pkgs.fish ]; environment.shells = [ diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index d30b3415411f..b4ca8730958c 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -70,7 +70,7 @@ in promptInit = mkOption { default = '' if [ "$TERM" != dumb ]; then - autoload -U promptinit && promptinit && prompt walters + autoload -U promptinit && promptinit && prompt walters fi ''; description = '' @@ -116,7 +116,9 @@ in if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi export __ETC_ZSHENV_SOURCED=1 - ${config.system.build.setEnvironment.text} + if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then + . ${config.system.build.setEnvironment} + fi ${cfge.shellInit} @@ -124,7 +126,7 @@ in # Read system-wide modifications. if test -f /etc/zshenv.local; then - . /etc/zshenv.local + . /etc/zshenv.local fi ''; @@ -143,7 +145,7 @@ in # Read system-wide modifications. if test -f /etc/zprofile.local; then - . /etc/zprofile.local + . /etc/zprofile.local fi ''; @@ -169,7 +171,7 @@ in # Tell zsh how to find installed completions for p in ''${(z)NIX_PROFILES}; do - fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions $p/share/zsh/vendor-completions) + fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions $p/share/zsh/vendor-completions) done ${optionalString cfg.enableGlobalCompInit "autoload -U compinit && compinit"} @@ -184,7 +186,7 @@ in # Read system-wide modifications. if test -f /etc/zshrc.local; then - . /etc/zshrc.local + . /etc/zshrc.local fi ''; diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix index 1e1c5bc9f035..09174ed39f5e 100644 --- a/nixos/modules/services/computing/slurm/slurm.nix +++ b/nixos/modules/services/computing/slurm/slurm.nix @@ -8,6 +8,7 @@ let # configuration file can be generated by http://slurm.schedmd.com/configurator.html configFile = pkgs.writeTextDir "slurm.conf" '' + ClusterName=${cfg.clusterName} ${optionalString (cfg.controlMachine != null) ''controlMachine=${cfg.controlMachine}''} ${optionalString (cfg.controlAddr != null) ''controlAddr=${cfg.controlAddr}''} ${optionalString (cfg.nodeName != null) ''nodeName=${cfg.nodeName}''} @@ -105,6 +106,15 @@ in ''; }; + clusterName = mkOption { + type = types.str; + default = "default"; + example = "myCluster"; + description = '' + Necessary to distinguish accounting records in a multi-cluster environment. + ''; + }; + nodeName = mkOption { type = types.nullOr types.str; default = null; diff --git a/nixos/modules/services/desktops/gnome3/rygel.nix b/nixos/modules/services/desktops/gnome3/rygel.nix new file mode 100644 index 000000000000..55d5e703aa19 --- /dev/null +++ b/nixos/modules/services/desktops/gnome3/rygel.nix @@ -0,0 +1,30 @@ +# rygel service. +{ config, lib, pkgs, ... }: + +with lib; + +{ + ###### interface + options = { + services.gnome3.rygel = { + enable = mkOption { + default = false; + description = '' + Whether to enable Rygel UPnP Mediaserver. + + You will need to also allow UPnP connections in firewall, see the following comment. + ''; + type = types.bool; + }; + }; + }; + + ###### implementation + config = mkIf config.services.gnome3.rygel.enable { + environment.systemPackages = [ pkgs.gnome3.rygel ]; + + services.dbus.packages = [ pkgs.gnome3.rygel ]; + + systemd.packages = [ pkgs.gnome3.rygel ]; + }; +} diff --git a/nixos/modules/services/misc/weechat.nix b/nixos/modules/services/misc/weechat.nix new file mode 100644 index 000000000000..1fcfb440485d --- /dev/null +++ b/nixos/modules/services/misc/weechat.nix @@ -0,0 +1,56 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.weechat; +in + +{ + options.services.weechat = { + enable = mkEnableOption "weechat"; + root = mkOption { + description = "Weechat state directory."; + type = types.str; + default = "/var/lib/weechat"; + }; + sessionName = mkOption { + description = "Name of the `screen' session for weechat."; + default = "weechat-screen"; + type = types.str; + }; + binary = mkOption { + description = "Binary to execute (by default \${weechat}/bin/weechat)."; + example = literalExample '' + ''${pkgs.weechat}/bin/weechat-headless + ''; + default = "${pkgs.weechat}/bin/weechat"; + }; + }; + + config = mkIf cfg.enable { + users = { + groups.weechat = {}; + users.weechat = { + createHome = true; + group = "weechat"; + home = cfg.root; + isSystemUser = true; + }; + }; + + systemd.services.weechat = { + environment.WEECHAT_HOME = cfg.root; + serviceConfig = { + User = "weechat"; + Group = "weechat"; + RemainAfterExit = "yes"; + }; + script = "exec ${pkgs.screen}/bin/screen -Dm -S ${cfg.sessionName} ${cfg.binary}"; + wantedBy = [ "multi-user.target" ]; + wants = [ "network.target" ]; + }; + }; + + meta.doc = ./weechat.xml; +} diff --git a/nixos/modules/services/misc/weechat.xml b/nixos/modules/services/misc/weechat.xml new file mode 100644 index 000000000000..de86dede2eb5 --- /dev/null +++ b/nixos/modules/services/misc/weechat.xml @@ -0,0 +1,61 @@ + + +WeeChat +WeeChat is a fast and extensible IRC client. + +
Basic Usage + +By default, the module creates a +systemd unit +which runs the chat client in a detached +screen session. + + + + +This can be done by enabling the weechat service: + + +{ ... }: + +{ + services.weechat.enable = true; +} + + + +The service is managed by a dedicated user +named weechat in the state directory +/var/lib/weechat. + +
+
Re-attaching to WeeChat + +WeeChat runs in a screen session owned by a dedicated user. To explicitly +allow your another user to attach to this session, the screenrc needs to be tweaked +by adding multiuser support: + + +{ + programs.screen.screenrc = '' + multiuser on + acladd normal_user + ''; +} + + +Now, the session can be re-attached like this: + + +screen -r weechat-screen + + + +The session name can be changed using services.weechat.sessionName. + +
+ diff --git a/nixos/modules/services/monitoring/riemann.nix b/nixos/modules/services/monitoring/riemann.nix index 237de53456f9..13d2b1cc0602 100644 --- a/nixos/modules/services/monitoring/riemann.nix +++ b/nixos/modules/services/monitoring/riemann.nix @@ -17,9 +17,9 @@ let launcher = writeScriptBin "riemann" '' #!/bin/sh - exec ${jdk}/bin/java ${concatStringsSep "\n" cfg.extraJavaOpts} \ + exec ${jdk}/bin/java ${concatStringsSep " " cfg.extraJavaOpts} \ -cp ${classpath} \ - riemann.bin ${writeText "riemann-config.clj" riemannConfig} + riemann.bin ${cfg.configFile} ''; in { @@ -37,7 +37,8 @@ in { config = mkOption { type = types.lines; description = '' - Contents of the Riemann configuration file. + Contents of the Riemann configuration file. For more complicated + config you should use configFile. ''; }; configFiles = mkOption { @@ -47,7 +48,15 @@ in { Extra files containing Riemann configuration. These files will be loaded at runtime by Riemann (with Clojure's load-file function) at the end of the - configuration. + configuration if you use the config option, this is ignored if you + use configFile. + ''; + }; + configFile = mkOption { + type = types.str; + description = '' + A Riemann config file. Any files in the same directory as this file + will be added to the classpath by Riemann. ''; }; extraClasspathEntries = mkOption { @@ -77,6 +86,10 @@ in { group = "riemann"; }; + services.riemann.configFile = mkDefault ( + writeText "riemann-config.clj" riemannConfig + ); + systemd.services.riemann = { wantedBy = [ "multi-user.target" ]; path = [ inetutils ]; @@ -84,6 +97,7 @@ in { User = "riemann"; ExecStart = "${launcher}/bin/riemann"; }; + serviceConfig.LimitNOFILE = 65536; }; }; diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index 3afafaf3fed5..0e9b354cfcaf 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -8,6 +8,17 @@ let homeDir = "/var/lib/i2pd"; + strOpt = k: v: k + " = " + v; + boolOpt = k: v: k + " = " + boolToString v; + intOpt = k: v: k + " = " + toString v; + lstOpt = k: xs: k + " = " + concatStringsSep "," xs; + optionalNullString = o: s: optional (! isNull s) (strOpt o s); + optionalNullBool = o: b: optional (! isNull b) (boolOpt o b); + optionalNullInt = o: i: optional (! isNull i) (intOpt o i); + optionalEmptyList = o: l: optional ([] != l) (lstOpt o l); + + mkEnableTrueOption = name: mkEnableOption name // { default = true; }; + mkEndpointOpt = name: addr: port: { enable = mkEnableOption name; name = mkOption { @@ -18,42 +29,54 @@ let address = mkOption { type = types.str; default = addr; - description = "Bind address for ${name} endpoint. Default: " + addr; + description = "Bind address for ${name} endpoint."; }; port = mkOption { type = types.int; default = port; - description = "Bind port for ${name} endoint. Default: " + toString port; + description = "Bind port for ${name} endoint."; }; }; - mkKeyedEndpointOpt = name: addr: port: keyFile: + i2cpOpts = name: { + length = mkOption { + type = types.int; + description = "Guaranteed minimum hops for ${name} tunnels."; + default = 3; + }; + quantity = mkOption { + type = types.int; + description = "Number of simultaneous ${name} tunnels."; + default = 5; + }; + }; + + mkKeyedEndpointOpt = name: addr: port: keyloc: (mkEndpointOpt name addr port) // { keys = mkOption { - type = types.str; - default = ""; + type = with types; nullOr str; + default = keyloc; description = '' File to persist ${lib.toUpper name} keys. ''; }; + inbound = i2cpOpts name; + outbound = i2cpOpts name; + latency.min = mkOption { + type = with types; nullOr int; + description = "Min latency for tunnels."; + default = null; + }; + latency.max = mkOption { + type = with types; nullOr int; + description = "Max latency for tunnels."; + default = null; + }; }; - commonTunOpts = let - i2cpOpts = { - length = mkOption { - type = types.int; - description = "Guaranteed minimum hops."; - default = 3; - }; - quantity = mkOption { - type = types.int; - description = "Number of simultaneous tunnels."; - default = 5; - }; - }; - in name: { - outbound = i2cpOpts; - inbound = i2cpOpts; + commonTunOpts = name: { + outbound = i2cpOpts name; + inbound = i2cpOpts name; crypto.tagsToSend = mkOption { type = types.int; description = "Number of ElGamal/AES tags to send."; @@ -70,94 +93,142 @@ let }; } // mkEndpointOpt name "127.0.0.1" 0; - i2pdConf = pkgs.writeText "i2pd.conf" '' - # DO NOT EDIT -- this file has been generated automatically. - loglevel = ${cfg.logLevel} - - ipv4 = ${boolToString cfg.enableIPv4} - ipv6 = ${boolToString cfg.enableIPv6} - notransit = ${boolToString cfg.notransit} - floodfill = ${boolToString cfg.floodfill} - netid = ${toString cfg.netid} - ${if isNull cfg.bandwidth then "" else "bandwidth = ${toString cfg.bandwidth}" } - ${if isNull cfg.port then "" else "port = ${toString cfg.port}"} - - [limits] - transittunnels = ${toString cfg.limits.transittunnels} - - [upnp] - enabled = ${boolToString cfg.upnp.enable} - name = ${cfg.upnp.name} - - [precomputation] - elgamal = ${boolToString cfg.precomputation.elgamal} - - [reseed] - verify = ${boolToString cfg.reseed.verify} - file = ${cfg.reseed.file} - urls = ${builtins.concatStringsSep "," cfg.reseed.urls} - - [addressbook] - defaulturl = ${cfg.addressbook.defaulturl} - subscriptions = ${builtins.concatStringsSep "," cfg.addressbook.subscriptions} - - ${flip concatMapStrings + sec = name: "\n[" + name + "]"; + notice = "# DO NOT EDIT -- this file has been generated automatically."; + i2pdConf = let + opts = [ + notice + (strOpt "loglevel" cfg.logLevel) + (boolOpt "logclftime" cfg.logCLFTime) + (boolOpt "ipv4" cfg.enableIPv4) + (boolOpt "ipv6" cfg.enableIPv6) + (boolOpt "notransit" cfg.notransit) + (boolOpt "floodfill" cfg.floodfill) + (intOpt "netid" cfg.netid) + ] ++ (optionalNullInt "bandwidth" cfg.bandwidth) + ++ (optionalNullInt "port" cfg.port) + ++ (optionalNullString "family" cfg.family) + ++ (optionalNullString "datadir" cfg.dataDir) + ++ (optionalNullInt "share" cfg.share) + ++ (optionalNullBool "ssu" cfg.ssu) + ++ (optionalNullBool "ntcp" cfg.ntcp) + ++ (optionalNullString "ntcpproxy" cfg.ntcpProxy) + ++ (optionalNullString "ifname" cfg.ifname) + ++ (optionalNullString "ifname4" cfg.ifname4) + ++ (optionalNullString "ifname6" cfg.ifname6) + ++ [ + (sec "limits") + (intOpt "transittunnels" cfg.limits.transittunnels) + (intOpt "coresize" cfg.limits.coreSize) + (intOpt "openfiles" cfg.limits.openFiles) + (intOpt "ntcphard" cfg.limits.ntcpHard) + (intOpt "ntcpsoft" cfg.limits.ntcpSoft) + (intOpt "ntcpthreads" cfg.limits.ntcpThreads) + (sec "upnp") + (boolOpt "enabled" cfg.upnp.enable) + (sec "precomputation") + (boolOpt "elgamal" cfg.precomputation.elgamal) + (sec "reseed") + (boolOpt "verify" cfg.reseed.verify) + ] ++ (optionalNullString "file" cfg.reseed.file) + ++ (optionalEmptyList "urls" cfg.reseed.urls) + ++ (optionalNullString "floodfill" cfg.reseed.floodfill) + ++ (optionalNullString "zipfile" cfg.reseed.zipfile) + ++ (optionalNullString "proxy" cfg.reseed.proxy) + ++ [ + (sec "trust") + (boolOpt "enabled" cfg.trust.enable) + (boolOpt "hidden" cfg.trust.hidden) + ] ++ (optionalEmptyList "routers" cfg.trust.routers) + ++ (optionalNullString "family" cfg.trust.family) + ++ [ + (sec "websockets") + (boolOpt "enabled" cfg.websocket.enable) + (strOpt "address" cfg.websocket.address) + (intOpt "port" cfg.websocket.port) + (sec "exploratory") + (intOpt "inbound.length" cfg.exploratory.inbound.length) + (intOpt "inbound.quantity" cfg.exploratory.inbound.quantity) + (intOpt "outbound.length" cfg.exploratory.outbound.length) + (intOpt "outbound.quantity" cfg.exploratory.outbound.quantity) + (sec "ntcp2") + (boolOpt "enabled" cfg.ntcp2.enable) + (boolOpt "published" cfg.ntcp2.published) + (intOpt "port" cfg.ntcp2.port) + (sec "addressbook") + (strOpt "defaulturl" cfg.addressbook.defaulturl) + ] ++ (optionalEmptyList "subscriptions" cfg.addressbook.subscriptions) + ++ (flip map (collect (proto: proto ? port && proto ? address && proto ? name) cfg.proto) - (proto: '' - [${proto.name}] - enabled = ${boolToString proto.enable} - address = ${proto.address} - port = ${toString proto.port} - ${if proto ? keys then "keys = ${proto.keys}" else ""} - ${if proto ? auth then "auth = ${boolToString proto.auth}" else ""} - ${if proto ? user then "user = ${proto.user}" else ""} - ${if proto ? pass then "pass = ${proto.pass}" else ""} - ${if proto ? outproxy then "outproxy = ${proto.outproxy}" else ""} - ${if proto ? outproxyPort then "outproxyport = ${toString proto.outproxyPort}" else ""} - '') - } - ''; + (proto: let protoOpts = [ + (sec proto.name) + (boolOpt "enabled" proto.enable) + (strOpt "address" proto.address) + (intOpt "port" proto.port) + ] ++ (if proto ? keys then optionalNullString "keys" proto.keys else []) + ++ (if proto ? auth then optionalNullBool "auth" proto.auth else []) + ++ (if proto ? user then optionalNullString "user" proto.user else []) + ++ (if proto ? pass then optionalNullString "pass" proto.pass else []) + ++ (if proto ? strictHeaders then optionalNullBool "strictheaders" proto.strictHeaders else []) + ++ (if proto ? hostname then optionalNullString "hostname" proto.hostname else []) + ++ (if proto ? outproxy then optionalNullString "outproxy" proto.outproxy else []) + ++ (if proto ? outproxyPort then optionalNullInt "outproxyport" proto.outproxyPort else []) + ++ (if proto ? outproxyEnable then optionalNullBool "outproxy.enabled" proto.outproxyEnable else []); + in (concatStringsSep "\n" protoOpts) + )); + in + pkgs.writeText "i2pd.conf" (concatStringsSep "\n" opts); - i2pdTunnelConf = pkgs.writeText "i2pd-tunnels.conf" '' - # DO NOT EDIT -- this file has been generated automatically. - ${flip concatMapStrings + tunnelConf = let opts = [ + notice + (flip map (collect (tun: tun ? port && tun ? destination) cfg.outTunnels) - (tun: '' - [${tun.name}] - type = client - destination = ${tun.destination} - destinationport = ${toString tun.destinationPort} - keys = ${tun.keys} - address = ${tun.address} - port = ${toString tun.port} - inbound.length = ${toString tun.inbound.length} - outbound.length = ${toString tun.outbound.length} - inbound.quantity = ${toString tun.inbound.quantity} - outbound.quantity = ${toString tun.outbound.quantity} - crypto.tagsToSend = ${toString tun.crypto.tagsToSend} - '') - } - ${flip concatMapStrings + (tun: let outTunOpts = [ + (sec tun.name) + "type = client" + (intOpt "port" tun.port) + (strOpt "destination" tun.destination) + ] ++ (if tun ? destinationPort then optionalNullInt "destinationport" tun.destinationPort else []) + ++ (if tun ? keys then + optionalNullString "keys" tun.keys else []) + ++ (if tun ? address then + optionalNullString "address" tun.address else []) + ++ (if tun ? inbound.length then + optionalNullInt "inbound.length" tun.inbound.length else []) + ++ (if tun ? inbound.quantity then + optionalNullInt "inbound.quantity" tun.inbound.quantity else []) + ++ (if tun ? outbound.length then + optionalNullInt "outbound.length" tun.outbound.length else []) + ++ (if tun ? outbound.quantity then + optionalNullInt "outbound.quantity" tun.outbound.quantity else []) + ++ (if tun ? crypto.tagsToSend then + optionalNullInt "crypto.tagstosend" tun.crypto.tagsToSend else []); + in concatStringsSep "\n" outTunOpts)) + (flip map (collect (tun: tun ? port && tun ? address) cfg.inTunnels) - (tun: '' - [${tun.name}] - type = server - destination = ${tun.destination} - keys = ${tun.keys} - host = ${tun.address} - port = ${toString tun.port} - inport = ${toString tun.inPort} - accesslist = ${builtins.concatStringsSep "," tun.accessList} - '') - } - ''; + (tun: let inTunOpts = [ + (sec tun.name) + "type = server" + (intOpt "port" tun.port) + (strOpt "host" tun.address) + ] ++ (if tun ? destination then + optionalNullString "destination" tun.destination else []) + ++ (if tun ? keys then + optionalNullString "keys" tun.keys else []) + ++ (if tun ? inPort then + optionalNullInt "inport" tun.inPort else []) + ++ (if tun ? accessList then + optionalEmptyList "accesslist" tun.accessList else []); + in concatStringsSep "\n" inTunOpts))]; + in pkgs.writeText "i2pd-tunnels.conf" opts; i2pdSh = pkgs.writeScriptBin "i2pd" '' #!/bin/sh exec ${pkgs.i2pd}/bin/i2pd \ ${if isNull cfg.address then "" else "--host="+cfg.address} \ + --service \ --conf=${i2pdConf} \ - --tunconf=${i2pdTunnelConf} + --tunconf=${tunnelConf} ''; in @@ -170,9 +241,7 @@ in services.i2pd = { - enable = mkOption { - type = types.bool; - default = false; + enable = mkEnableOption "I2Pd daemon" // { description = '' Enables I2Pd as a running service upon activation. Please read http://i2pd.readthedocs.io/en/latest/ for further @@ -192,6 +261,8 @@ in ''; }; + logCLFTime = mkEnableOption "Full CLF-formatted date and time to log"; + address = mkOption { type = with types; nullOr str; default = null; @@ -200,17 +271,72 @@ in ''; }; - notransit = mkOption { - type = types.bool; - default = false; + family = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Specify a family the router belongs to. + ''; + }; + + dataDir = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Alternative path to storage of i2pd data (RI, keys, peer profiles, ...) + ''; + }; + + share = mkOption { + type = types.int; + default = 100; + description = '' + Limit of transit traffic from max bandwidth in percents. + ''; + }; + + ifname = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Network interface to bind to. + ''; + }; + + ifname4 = mkOption { + type = with types; nullOr str; + default = null; + description = '' + IPv4 interface to bind to. + ''; + }; + + ifname6 = mkOption { + type = with types; nullOr str; + default = null; + description = '' + IPv6 interface to bind to. + ''; + }; + + ntcpProxy = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Proxy URL for NTCP transport. + ''; + }; + + ntcp = mkEnableTrueOption "ntcp"; + ssu = mkEnableTrueOption "ssu"; + + notransit = mkEnableOption "notransit" // { description = '' Tells the router to not accept transit tunnels during startup. ''; }; - floodfill = mkOption { - type = types.bool; - default = false; + floodfill = mkEnableOption "floodfill" // { description = '' If the router is declared to be unreachable and needs introduction nodes. ''; @@ -241,51 +367,20 @@ in ''; }; - enableIPv4 = mkOption { - type = types.bool; - default = true; + enableIPv4 = mkEnableTrueOption "IPv4 connectivity"; + enableIPv6 = mkEnableOption "IPv6 connectivity"; + nat = mkEnableTrueOption "NAT bypass"; + + upnp.enable = mkEnableOption "UPnP service discovery"; + upnp.name = mkOption { + type = types.str; + default = "I2Pd"; description = '' - Enables IPv4 connectivity. Enabled by default. + Name i2pd appears in UPnP forwardings list. ''; }; - enableIPv6 = mkOption { - type = types.bool; - default = false; - description = '' - Enables IPv6 connectivity. Disabled by default. - ''; - }; - - nat = mkOption { - type = types.bool; - default = true; - description = '' - Assume router is NATed. Enabled by default. - ''; - }; - - upnp = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Enables UPnP. - ''; - }; - - name = mkOption { - type = types.str; - default = "I2Pd"; - description = '' - Name i2pd appears in UPnP forwardings list. - ''; - }; - }; - - precomputation.elgamal = mkOption { - type = types.bool; - default = true; + precomputation.elgamal = mkEnableTrueOption "Precomputed ElGamal tables" // { description = '' Whenever to use precomputated tables for ElGamal. i2pd defaults to false @@ -296,76 +391,154 @@ in ''; }; - reseed = { - verify = mkOption { - type = types.bool; - default = false; - description = '' - Request SU3 signature verification - ''; - }; + reseed.verify = mkEnableOption "SU3 signature verification"; - file = mkOption { - type = types.str; - default = ""; - description = '' - Full path to SU3 file to reseed from - ''; - }; - - urls = mkOption { - type = with types; listOf str; - default = [ - "https://reseed.i2p-project.de/" - "https://i2p.mooo.com/netDb/" - "https://netdb.i2p2.no/" - "https://us.reseed.i2p2.no:444/" - "https://uk.reseed.i2p2.no:444/" - "https://i2p.manas.ca:8443/" - ]; - description = '' - Reseed URLs - ''; - }; + reseed.file = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Full path to SU3 file to reseed from. + ''; }; - addressbook = { - defaulturl = mkOption { - type = types.str; - default = "http://joajgazyztfssty4w2on5oaqksz6tqoxbduy553y34mf4byv6gpq.b32.i2p/export/alive-hosts.txt"; - description = '' - AddressBook subscription URL for initial setup - ''; - }; - subscriptions = mkOption { - type = with types; listOf str; - default = [ - "http://inr.i2p/export/alive-hosts.txt" - "http://i2p-projekt.i2p/hosts.txt" - "http://stats.i2p/cgi-bin/newhosts.txt" - ]; - description = '' - AddressBook subscription URLs - ''; - }; + reseed.urls = mkOption { + type = with types; listOf str; + default = []; + description = '' + Reseed URLs. + ''; + }; + + reseed.floodfill = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Path to router info of floodfill to reseed from. + ''; + }; + + reseed.zipfile = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Path to local .zip file to reseed from. + ''; + }; + + reseed.proxy = mkOption { + type = with types; nullOr str; + default = null; + description = '' + URL for reseed proxy, supports http/socks. + ''; + }; + + addressbook.defaulturl = mkOption { + type = types.str; + default = "http://joajgazyztfssty4w2on5oaqksz6tqoxbduy553y34mf4byv6gpq.b32.i2p/export/alive-hosts.txt"; + description = '' + AddressBook subscription URL for initial setup + ''; + }; + addressbook.subscriptions = mkOption { + type = with types; listOf str; + default = [ + "http://inr.i2p/export/alive-hosts.txt" + "http://i2p-projekt.i2p/hosts.txt" + "http://stats.i2p/cgi-bin/newhosts.txt" + ]; + description = '' + AddressBook subscription URLs + ''; + }; + + trust.enable = mkEnableOption "Explicit trust options"; + + trust.family = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Router Familiy to trust for first hops. + ''; + }; + + trust.routers = mkOption { + type = with types; listOf str; + default = []; + description = '' + Only connect to the listed routers. + ''; + }; + + trust.hidden = mkEnableOption "Router concealment."; + + websocket = mkEndpointOpt "websockets" "127.0.0.1" 7666; + + exploratory.inbound = i2cpOpts "exploratory"; + exploratory.outbound = i2cpOpts "exploratory"; + + ntcp2.enable = mkEnableTrueOption "NTCP2."; + ntcp2.published = mkEnableOption "NTCP2 publication."; + ntcp2.port = mkOption { + type = types.int; + default = 0; + description = '' + Port to listen for incoming NTCP2 connections (0=auto). + ''; }; limits.transittunnels = mkOption { type = types.int; default = 2500; description = '' - Maximum number of active transit sessions + Maximum number of active transit sessions. + ''; + }; + + limits.coreSize = mkOption { + type = types.int; + default = 0; + description = '' + Maximum size of corefile in Kb (0 - use system limit). + ''; + }; + + limits.openFiles = mkOption { + type = types.int; + default = 0; + description = '' + Maximum number of open files (0 - use system default). + ''; + }; + + limits.ntcpHard = mkOption { + type = types.int; + default = 0; + description = '' + Maximum number of active transit sessions. + ''; + }; + + limits.ntcpSoft = mkOption { + type = types.int; + default = 0; + description = '' + Threshold to start probabalistic backoff with ntcp sessions (default: use system limit). + ''; + }; + + limits.ntcpThreads = mkOption { + type = types.int; + default = 1; + description = '' + Maximum number of threads used by NTCP DH worker. ''; }; proto.http = (mkEndpointOpt "http" "127.0.0.1" 7070) // { - auth = mkOption { - type = types.bool; - default = false; - description = '' - Enable authentication for webconsole. - ''; - }; + + auth = mkEnableOption "Webconsole authentication"; + user = mkOption { type = types.str; default = "i2pd"; @@ -373,6 +546,7 @@ in Username for webconsole access ''; }; + pass = mkOption { type = types.str; default = "i2pd"; @@ -380,11 +554,35 @@ in Password for webconsole access. ''; }; + + strictHeaders = mkOption { + type = with types; nullOr bool; + default = null; + description = '' + Enable strict host checking on WebUI. + ''; + }; + + hostname = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Expected hostname for WebUI. + ''; + }; }; - proto.httpProxy = mkKeyedEndpointOpt "httpproxy" "127.0.0.1" 4444 ""; - proto.socksProxy = (mkKeyedEndpointOpt "socksproxy" "127.0.0.1" 4447 "") + proto.httpProxy = (mkKeyedEndpointOpt "httpproxy" "127.0.0.1" 4444 "httpproxy-keys.dat") // { + outproxy = mkOption { + type = with types; nullOr str; + default = null; + description = "Upstream outproxy bind address."; + }; + }; + proto.socksProxy = (mkKeyedEndpointOpt "socksproxy" "127.0.0.1" 4447 "socksproxy-keys.dat") + // { + outproxyEnable = mkEnableOption "SOCKS outproxy"; outproxy = mkOption { type = types.str; default = "127.0.0.1"; @@ -408,8 +606,8 @@ in { name, ... }: { options = { destinationPort = mkOption { - type = types.int; - default = 0; + type = with types; nullOr int; + default = null; description = "Connect to particular port at destination."; }; } // commonTunOpts name; diff --git a/nixos/modules/services/networking/iperf3.nix b/nixos/modules/services/networking/iperf3.nix new file mode 100644 index 000000000000..742404a5692f --- /dev/null +++ b/nixos/modules/services/networking/iperf3.nix @@ -0,0 +1,87 @@ +{ config, lib, pkgs, ... }: with lib; +let + cfg = config.services.iperf3; + + api = { + enable = mkEnableOption "iperf3 network throughput testing server"; + port = mkOption { + type = types.ints.u16; + default = 5201; + description = "Server port to listen on for iperf3 client requsts."; + }; + affinity = mkOption { + type = types.nullOr types.ints.unsigned; + default = null; + description = "CPU affinity for the process."; + }; + bind = mkOption { + type = types.nullOr types.str; + default = null; + description = "Bind to the specific interface associated with the given address."; + }; + verbose = mkOption { + type = types.bool; + default = false; + description = "Give more detailed output."; + }; + forceFlush = mkOption { + type = types.bool; + default = false; + description = "Force flushing output at every interval."; + }; + debug = mkOption { + type = types.bool; + default = false; + description = "Emit debugging output."; + }; + rsaPrivateKey = mkOption { + type = types.nullOr types.path; + default = null; + description = "Path to the RSA private key (not password-protected) used to decrypt authentication credentials from the client."; + }; + authorizedUsersFile = mkOption { + type = types.nullOr types.path; + default = null; + description = "Path to the configuration file containing authorized users credentials to run iperf tests."; + }; + extraFlags = mkOption { + type = types.listOf types.str; + default = [ ]; + description = "Extra flags to pass to iperf3(1)."; + }; + }; + + imp = { + systemd.services.iperf3 = { + description = "iperf3 daemon"; + unitConfig.Documentation = "man:iperf3(1) https://iperf.fr/iperf-doc.php"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + Restart = "on-failure"; + RestartSec = 2; + DynamicUser = true; + PrivateDevices = true; + CapabilityBoundingSet = ""; + NoNewPrivileges = true; + ExecStart = '' + ${pkgs.iperf3}/bin/iperf \ + --server \ + --port ${toString cfg.port} \ + ${optionalString (cfg.affinity != null) "--affinity ${toString cfg.affinity}"} \ + ${optionalString (cfg.bind != null) "--bind ${cfg.bind}"} \ + ${optionalString (cfg.rsaPrivateKey != null) "--rsa-private-key-path ${cfg.rsaPrivateKey}"} \ + ${optionalString (cfg.authorizedUsersFile != null) "--authorized-users-path ${cfg.authorizedUsersFile}"} \ + ${optionalString cfg.verbose "--verbose"} \ + ${optionalString cfg.debug "--debug"} \ + ${optionalString cfg.forceFlush "--forceflush"} \ + ${escapeShellArgs cfg.extraFlags} + ''; + }; + }; + }; +in { + options.services.iperf3 = api; + config = mkIf cfg.enable imp; +} diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index d5af4648e8f9..2d76e0676b24 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -406,25 +406,25 @@ in { { source = configFile; target = "NetworkManager/NetworkManager.conf"; } - { source = "${networkmanager-openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name"; + { source = "${networkmanager-openvpn}/lib/NetworkManager/VPN/nm-openvpn-service.name"; target = "NetworkManager/VPN/nm-openvpn-service.name"; } - { source = "${networkmanager-vpnc}/etc/NetworkManager/VPN/nm-vpnc-service.name"; + { source = "${networkmanager-vpnc}/lib/NetworkManager/VPN/nm-vpnc-service.name"; target = "NetworkManager/VPN/nm-vpnc-service.name"; } - { source = "${networkmanager-openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name"; + { source = "${networkmanager-openconnect}/lib/NetworkManager/VPN/nm-openconnect-service.name"; target = "NetworkManager/VPN/nm-openconnect-service.name"; } - { source = "${networkmanager-fortisslvpn}/etc/NetworkManager/VPN/nm-fortisslvpn-service.name"; + { source = "${networkmanager-fortisslvpn}/lib/NetworkManager/VPN/nm-fortisslvpn-service.name"; target = "NetworkManager/VPN/nm-fortisslvpn-service.name"; } - { source = "${networkmanager-l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name"; + { source = "${networkmanager-l2tp}/lib/NetworkManager/VPN/nm-l2tp-service.name"; target = "NetworkManager/VPN/nm-l2tp-service.name"; } - { source = "${networkmanager_strongswan}/etc/NetworkManager/VPN/nm-strongswan-service.name"; + { source = "${networkmanager_strongswan}/lib/NetworkManager/VPN/nm-strongswan-service.name"; target = "NetworkManager/VPN/nm-strongswan-service.name"; } - { source = "${networkmanager-iodine}/etc/NetworkManager/VPN/nm-iodine-service.name"; + { source = "${networkmanager-iodine}/lib/NetworkManager/VPN/nm-iodine-service.name"; target = "NetworkManager/VPN/nm-iodine-service.name"; } ] ++ optional (cfg.appendNameservers == [] || cfg.insertNameservers == []) diff --git a/nixos/modules/services/security/sks.nix b/nixos/modules/services/security/sks.nix index 62308428f326..9f0261038d5b 100644 --- a/nixos/modules/services/security/sks.nix +++ b/nixos/modules/services/security/sks.nix @@ -3,78 +3,112 @@ with lib; let - cfg = config.services.sks; - sksPkg = cfg.package; -in - -{ +in { + meta.maintainers = with maintainers; [ primeos calbrecht jcumming ]; options = { services.sks = { - enable = mkEnableOption "sks"; + enable = mkEnableOption '' + SKS (synchronizing key server for OpenPGP) and start the database + server. You need to create "''${dataDir}/dump/*.gpg" for the initial + import''; package = mkOption { default = pkgs.sks; defaultText = "pkgs.sks"; type = types.package; - description = " - Which sks derivation to use. - "; + description = "Which SKS derivation to use."; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/db/sks"; + example = "/var/lib/sks"; + # TODO: The default might change to "/var/lib/sks" as this is more + # common. There's also https://github.com/NixOS/nixpkgs/issues/26256 + # and "/var/db" is not FHS compliant (seems to come from BSD). + description = '' + Data directory (-basedir) for SKS, where the database and all + configuration files are located (e.g. KDB, PTree, membership and + sksconf). + ''; }; hkpAddress = mkOption { default = [ "127.0.0.1" "::1" ]; type = types.listOf types.str; - description = " - Wich ip addresses the sks-keyserver is listening on. - "; + description = '' + Domain names, IPv4 and/or IPv6 addresses to listen on for HKP + requests. + ''; }; hkpPort = mkOption { default = 11371; - type = types.int; - description = " - Which port the sks-keyserver is listening on. - "; + type = types.ints.u16; + description = "HKP port to listen on."; + }; + + webroot = mkOption { + type = types.nullOr types.path; + default = "${sksPkg.webSamples}/OpenPKG"; + defaultText = "\${pkgs.sks.webSamples}/OpenPKG"; + description = '' + Source directory (will be symlinked, if not null) for the files the + built-in webserver should serve. SKS (''${pkgs.sks.webSamples}) + provides the following examples: "HTML5", "OpenPKG", and "XHTML+ES". + The index file can be named index.html, index.htm, index.xhtm, or + index.xhtml. Files with the extensions .css, .es, .js, .jpg, .jpeg, + .png, or .gif are supported. Subdirectories and filenames with + anything other than alphanumeric characters and the '.' character + will be ignored. + ''; }; }; }; config = mkIf cfg.enable { - environment.systemPackages = [ sksPkg ]; - - users.users.sks = { - createHome = true; - home = "/var/db/sks"; - isSystemUser = true; - shell = "${pkgs.coreutils}/bin/true"; + users = { + users.sks = { + isSystemUser = true; + description = "SKS user"; + home = cfg.dataDir; + createHome = true; + group = "sks"; + useDefaultShell = true; + packages = [ sksPkg pkgs.db ]; + }; + groups.sks = { }; }; systemd.services = let hkpAddress = "'" + (builtins.concatStringsSep " " cfg.hkpAddress) + "'" ; hkpPort = builtins.toString cfg.hkpPort; - home = config.users.users.sks.home; - user = config.users.users.sks.name; in { - sks-keyserver = { + "sks-db" = { + description = "SKS database server"; + after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; preStart = '' - mkdir -p ${home}/dump - ${pkgs.sks}/bin/sks build ${home}/dump/*.gpg -n 10 -cache 100 || true #*/ - ${pkgs.sks}/bin/sks cleandb || true - ${pkgs.sks}/bin/sks pbuild -cache 20 -ptree_cache 70 || true + ${lib.optionalString (cfg.webroot != null) + "ln -sfT \"${cfg.webroot}\" web"} + mkdir -p dump + ${sksPkg}/bin/sks build dump/*.gpg -n 10 -cache 100 || true #*/ + ${sksPkg}/bin/sks cleandb || true + ${sksPkg}/bin/sks pbuild -cache 20 -ptree_cache 70 || true ''; serviceConfig = { - WorkingDirectory = home; - User = user; + WorkingDirectory = "~"; + User = "sks"; + Group = "sks"; Restart = "always"; - ExecStart = "${pkgs.sks}/bin/sks db -hkp_address ${hkpAddress} -hkp_port ${hkpPort}"; + ExecStart = "${sksPkg}/bin/sks db -hkp_address ${hkpAddress} -hkp_port ${hkpPort}"; }; }; }; diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 6fa3ec3b9255..04e380b61530 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -66,7 +66,7 @@ in ''; }]; - security.wrappers = (import (builtins.toPath "${e.enlightenment}/e-wrappers.nix")).security.wrappers; + security.wrappers = (import "${e.enlightenment}/e-wrappers.nix").security.wrappers; environment.etc = singleton { source = xcfg.xkbDir; diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index faf5214130db..eb86f7b53bb6 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -110,6 +110,7 @@ in { services.gnome3.gnome-terminal-server.enable = mkDefault true; services.gnome3.gnome-user-share.enable = mkDefault true; services.gnome3.gvfs.enable = true; + services.gnome3.rygel.enable = mkDefault true; services.gnome3.seahorse.enable = mkDefault true; services.gnome3.sushi.enable = mkDefault true; services.gnome3.tracker.enable = mkDefault true; diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 4bacf0f126a4..63a6f7fbe099 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -208,7 +208,6 @@ let "InitialCongestionWindow" "InitialAdvertisedReceiveWindow" "QuickAck" "MTUBytes" ]) - (assertHasField "Gateway") ]; checkDhcp = checkUnitConfig "DHCP" [ @@ -249,13 +248,14 @@ let # .network files have a [Link] section with different options than in .netlink files checkNetworkLink = checkUnitConfig "Link" [ (assertOnlyFields [ - "MACAddress" "MTUBytes" "ARP" "Unmanaged" "RequiredForOnline" + "MACAddress" "MTUBytes" "ARP" "Multicast" "Unmanaged" "RequiredForOnline" ]) (assertMacAddress "MACAddress") (assertByteFormat "MTUBytes") (assertValueOneOf "ARP" boolValues) + (assertValueOneOf "Multicast" boolValues) (assertValueOneOf "Unmanaged" boolValues) - (assertValueOneOf "RquiredForOnline" boolValues) + (assertValueOneOf "RequiredForOnline" boolValues) ]; diff --git a/pkgs/applications/altcoins/btc1.nix b/pkgs/applications/altcoins/btc1.nix index 95e03ee6a213..2f85a8947972 100644 --- a/pkgs/applications/altcoins/btc1.nix +++ b/pkgs/applications/altcoins/btc1.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost -, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent -, withGui }: +{ stdenv, fetchurl, pkgconfig, autoreconfHook, hexdump, openssl, db48 +, boost, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent +, AppKit +, withGui ? !stdenv.isDarwin +}: with stdenv.lib; stdenv.mkDerivation rec{ @@ -12,11 +14,10 @@ stdenv.mkDerivation rec{ sha256 = "0v0g2wb4nsnhddxzb63vj2bc1mgyj05vqm5imicjfz8prvgc0si8"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ openssl db48 boost zlib - miniupnpc protobuf libevent] - ++ optionals stdenv.isLinux [ utillinux ] - ++ optionals withGui [ qt4 qrencode ]; + nativeBuildInputs = [ pkgconfig autoreconfHook hexdump ]; + buildInputs = [ openssl db48 boost zlib miniupnpc protobuf libevent ] + ++ optionals withGui [ qt4 qrencode ] + ++ optional stdenv.isDarwin AppKit; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] ++ optionals withGui [ "--with-gui=qt4" ]; diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 95d79a8650fd..4236cd7910bc 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -32,8 +32,11 @@ rec { boost = boost165; withGui = false; }; - btc1 = callPackage ./btc1.nix { boost = boost165; withGui = true; }; - btc1d = callPackage ./btc1.nix { boost = boost165; withGui = false; }; + btc1 = callPackage ./btc1.nix { + inherit (darwin.apple_sdk.frameworks) AppKit; + boost = boost165; + }; + btc1d = btc1.override { withGui = false; }; cryptop = python3.pkgs.callPackage ./cryptop { }; diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix new file mode 100644 index 000000000000..e3d07fcc2457 --- /dev/null +++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix @@ -0,0 +1,63 @@ +{ stdenv +, runCommand +, fetchFromGitHub +, libpulseaudio +, pulseaudio +, pkgconfig +, libtool +, cmake +, bluez +, dbus +, sbc +}: + +let + pulseSources = runCommand "pulseaudio-sources" {} '' + mkdir $out + tar -xf ${pulseaudio.src} + mv pulseaudio*/* $out/ + ''; + +in stdenv.mkDerivation rec { + name = "pulseaudio-modules-bt-${version}"; + version = "unstable-2018-09-11"; + + src = fetchFromGitHub { + owner = "EHfive"; + repo = "pulseaudio-modules-bt"; + rev = "9c6ad75382f3855916ad2feaa6b40e37356d80cc"; + sha256 = "1iz4m3y6arsvwcyvqc429w252dl3apnhvl1zhyvfxlbg00d2ii0h"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + pkgconfig + cmake + ]; + + buildInputs = [ + libpulseaudio + pulseaudio + libtool + bluez + dbus + sbc + ]; + + NIX_CFLAGS_COMPILE = [ + "-L${pulseaudio}/lib/pulseaudio" + ]; + + prePatch = '' + rm -r pa + ln -s ${pulseSources} pa + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/EHfive/pulseaudio-modules-bt; + description = "SBC, Sony LDAC codec (A2DP Audio) support for Pulseaudio"; + platforms = platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ adisbladis ]; + }; +} diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index dc12baefed14..f58e75c9e263 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -29,11 +29,11 @@ # handle that. stdenv.mkDerivation rec { - name = "qmmp-1.2.2"; + name = "qmmp-1.2.3"; src = fetchurl { url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2"; - sha256 = "01nnyg8m3p3px1fj3lfsqqv9zh1388dwx1bm2qv4v87jywimgp79"; + sha256 = "05lqmj22vr5ch1i0928d64ybdnn3qc66s9lgarx5s6x6ffr6589j"; }; buildInputs = diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 199793a44fb7..38d252b345d1 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,9 +13,9 @@ let sha256Hash = "0xx6yprylmcb32ipmwdcfkgddlm1nrxi1w68miclvgrbk015brf2"; }; betaVersion = { - version = "3.2.0.24"; # "Android Studio 3.2 RC 2" - build = "181.4974118"; - sha256Hash = "0sj848pzpsbmnfi2692gg73v6m72hr1pwlk5x8q912w60iypi3pz"; + version = "3.2.0.25"; # "Android Studio 3.2 RC 3" + build = "181.4987877"; + sha256Hash = "0mriakxxchc0wbqkl236pp4fsqbq3gb2qrkdg5hx9zz763dc59gp"; }; latestVersion = { # canary & dev version = "3.3.0.7"; # "Android Studio 3.3 Canary 8" diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix index 429b2430fce2..7af3742349a6 100644 --- a/pkgs/applications/editors/aseprite/default.nix +++ b/pkgs/applications/editors/aseprite/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig -, curl, freetype, giflib, libjpeg, libpng, libwebp, pixman, tinyxml, zlib +{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, pkgconfig +, curl, freetype, giflib, harfbuzz, libjpeg, libpng, libwebp, pixman, tinyxml, zlib , libX11, libXext, libXcursor, libXxf86vm , unfree ? false , cmark @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { name = "aseprite-${version}"; - version = if unfree then "1.2.4" else "1.1.7"; + version = if unfree then "1.2.9" else "1.1.7"; src = fetchFromGitHub { owner = "aseprite"; @@ -19,16 +19,27 @@ stdenv.mkDerivation rec { rev = "v${version}"; fetchSubmodules = true; sha256 = if unfree - then "1rnf4a8vgddz8x55rpqaihlxmqip1kgpdhqb4d3l71h1zmidg5k3" + then "0a9xk163j0984n8nn6pqf27n83gr6w7g25wkiv591zx88pa6cpbd" else "0gd49lns2bpzbkwax5jf9x1xmg1j8ij997kcxr2596cwiswnw4di"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - curl freetype giflib libjpeg libpng libwebp pixman tinyxml zlib + curl freetype giflib harfbuzz libjpeg libpng libwebp pixman tinyxml zlib libX11 libXext libXcursor libXxf86vm - ] ++ lib.optionals unfree [ cmark ]; + ] ++ lib.optionals unfree [ cmark harfbuzz ]; + + patches = lib.optionals unfree [ + (fetchpatch { + url = "https://github.com/aseprite/aseprite/commit/cfb4dac6feef1f39e161c23c886055a8f9acfd0d.patch"; + sha256 = "1qhjfpngg8b1vvb9w26lhjjfamfx57ih0p31km3r5l96nm85l7f9"; + }) + (fetchpatch { + url = "https://github.com/orivej/aseprite/commit/ea87e65b357ad0bd65467af5529183b5a48a8c17.patch"; + sha256 = "1vwn8ivap1pzdh444sdvvkndp55iz146nhmd80xbm8cyzn3qmg91"; + }) + ]; postPatch = '' sed -i src/config.h -e "s-\\(#define VERSION\\) .*-\\1 \"$version\"-" @@ -49,6 +60,7 @@ stdenv.mkDerivation rec { "-DWITH_WEBP_SUPPORT=ON" ] ++ lib.optionals unfree [ "-DUSE_SHARED_CMARK=ON" + "-DUSE_SHARED_HARFBUZZ=ON" # Aseprite needs internal freetype headers. "-DUSE_SHARED_FREETYPE=OFF" # Disable libarchive programs. diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 0a304fabe600..c1bfdf8157da 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -4,8 +4,9 @@ , alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf , systemd ? null , withX ? !stdenv.isDarwin -, withGTK2 ? false, gtk2 ? null -, withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null +, withNS ? stdenv.isDarwin +, withGTK2 ? false, gtk2-x11 ? null +, withGTK3 ? true, gtk3-x11 ? null, gsettings-desktop-schemas ? null , withXwidgets ? false, webkitgtk ? null, wrapGAppsHook ? null, glib-networking ? null , withCsrc ? true , srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null @@ -13,10 +14,12 @@ assert (libXft != null) -> libpng != null; # probably a bug assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise -assert withGTK2 -> withX || stdenv.isDarwin; -assert withGTK3 -> withX || stdenv.isDarwin; -assert withGTK2 -> !withGTK3 && gtk2 != null; -assert withGTK3 -> !withGTK2 && gtk3 != null; +assert withNS -> !withX; +assert withNS -> stdenv.isDarwin; +assert (withGTK2 && !withNS) -> withX; +assert (withGTK3 && !withNS) -> withX; +assert withGTK2 -> !withGTK3 && gtk2-x11 != null; +assert withGTK3 -> !withGTK2 && gtk3-x11 != null; assert withXwidgets -> withGTK3 && webkitgtk != null; let @@ -56,19 +59,22 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isLinux [ dbus libselinux systemd ] ++ lib.optionals withX [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft - imagemagick gconf m17n_lib libotf ] - ++ lib.optional (withX && withGTK2) gtk2 - ++ lib.optionals (withX && withGTK3) [ gtk3 gsettings-desktop-schemas ] + imagemagick gconf ] + ++ lib.optionals (stdenv.isLinux && withX) [ m17n_lib libotf ] + ++ lib.optional (withX && withGTK2) gtk2-x11 + ++ lib.optionals (withX && withGTK3) [ gtk3-x11 gsettings-desktop-schemas ] ++ lib.optional (stdenv.isDarwin && withX) cairo ++ lib.optionals (withX && withXwidgets) [ webkitgtk ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ]; + propagatedBuildInputs = lib.optionals withNS [ AppKit GSS ImageIO ]; hardeningDisable = [ "format" ]; configureFlags = [ "--with-modules" ] ++ - (if stdenv.isDarwin - then [ "--with-ns" "--disable-ns-self-contained" ] + (lib.optional stdenv.isDarwin + (lib.withFeature withNS "ns")) ++ + (if withNS + then [ "--disable-ns-self-contained" ] else if withX then [ "--with-x-toolkit=${toolkit}" "--with-xft" ] else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no" @@ -103,7 +109,7 @@ stdenv.mkDerivation rec { cp $srcdir/TAGS $dstdir echo '((nil . ((tags-file-name . "TAGS"))))' > $dstdir/.dir-locals.el done - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString withNS '' mkdir -p $out/Applications mv nextstep/Emacs.app $out/Applications ''; diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 64b8e48b2881..9c50d8e8b78e 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -14,17 +14,17 @@ let nixSyntaxHighlight = fetchFromGitHub { owner = "seitz"; repo = "nanonix"; - rev = "7483fd8b79f1f3f2179dbbd46aa400df4320ba10"; - sha256 = "10pv75kfrgnziz8sr83hdbb0c3klm2fmsdw3i5cpqqf5va1fzb8h"; + rev = "bf8d898efaa10dce3f7972ff765b58c353b4b4ab"; + sha256 = "0773s5iz8aw9npgyasb0r2ybp6gvy2s9sq51az8w7h52bzn5blnn"; }; in stdenv.mkDerivation rec { name = "nano-${version}"; - version = "2.9.8"; + version = "3.0"; src = fetchurl { url = "mirror://gnu/nano/${name}.tar.xz"; - sha256 = "122lm0z97wk3mgnbn8m4d769d4j9rxyc9z7s89xd4gsdp8qsrpn2"; + sha256 = "1868hg9s584fwjrh0fzdrixmxc2qhw520z4q5iv68kjiajivr9g0"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; diff --git a/pkgs/applications/editors/nano/nanorc/default.nix b/pkgs/applications/editors/nano/nanorc/default.nix new file mode 100644 index 000000000000..fb30036e146f --- /dev/null +++ b/pkgs/applications/editors/nano/nanorc/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "nanorc-${version}"; + version = "2018-09-05"; + + src = fetchFromGitHub { + owner = "scopatz"; + repo = "nanorc"; + rev = "1e589cb729d24fba470228d429e6dde07973d597"; + sha256 = "136yxr38lzrfv8bar0c6c56rh54q9s94zpwa19f425crh44drppl"; + }; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/share + + install *.nanorc $out/share/ + ''; + + meta = { + description = "Improved Nano Syntax Highlighting Files"; + homepage = https://github.com/scopatz/nanorc; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ nequissimus ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index efe728f68494..a2337483bf1f 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "okteta-${version}"; - version = "0.25.2"; + version = "0.25.3"; src = fetchurl { url = "mirror://kde/stable/okteta/${version}/src/${name}.tar.xz"; - sha256 = "00mw8gdqvn6vn6ir6kqnp7xi3lpn6iyp4f5aknxwq6mdcxgjmh1p"; + sha256 = "0mm6pmk7k9c581b12a3wl0ayhadvyymfzmscy9x32b391qy9inai"; }; nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix index 9456ea3150a4..8b37f0b74d5b 100644 --- a/pkgs/applications/editors/rednotebook/default.nix +++ b/pkgs/applications/editors/rednotebook/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "rednotebook"; - version = "2.3"; + version = "2.6.1"; src = fetchFromGitHub { owner = "jendrikseipp"; repo = "rednotebook"; rev = "v${version}"; - sha256 = "0zkfid104hcsf20r6829v11wxdghqkd3j1zbgyvd1s7q4nxjn5lj"; + sha256 = "1x6acx0hagsawx84cv55qz17p8qjpq1v1zaf8rmm6ifsslsxw91h"; }; # We have not packaged tests. diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix new file mode 100644 index 000000000000..a4ea354ebf69 --- /dev/null +++ b/pkgs/applications/editors/thonny/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromBitbucket, python3 }: + +with python3.pkgs; + +buildPythonApplication rec { + pname = "thonny"; + version = "3.0.0b3"; + + src = fetchFromBitbucket { + owner = "plas"; + repo = pname; + rev = "a511d4539c532b6dddf6d7f1586d30e1ac35bd86"; + sha256 = "1s3pp97r6p3j81idglnml4faxryk7saszxmv3gys1agdfj75qczr"; + }; + + propagatedBuildInputs = with python3.pkgs; [ jedi pyserial tkinter docutils pylint ]; + + preInstall = '' + export HOME=$(mktemp -d) + ''; + + preFixup = '' + wrapProgram "$out/bin/thonny" \ + --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath ${python3.pkgs.jedi}) + ''; + + # Tests need a DISPLAY + doCheck = false; + + meta = with stdenv.lib; { + description = "Python IDE for beginners"; + longDescription = '' + Thonny is a Python IDE for beginners. It supports different ways + of stepping through the code, step-by-step expression + evaluation, detailed visualization of the call stack and a mode + for explaining the concepts of references and heap. + ''; + homepage = https://www.thonny.org/; + license = licenses.mit; + maintainers = with maintainers; [ leenaars ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/PythonMagick/default.nix b/pkgs/applications/graphics/PythonMagick/default.nix index f0b4a991f74a..938df76e2572 100644 --- a/pkgs/applications/graphics/PythonMagick/default.nix +++ b/pkgs/applications/graphics/PythonMagick/default.nix @@ -1,6 +1,6 @@ # This expression provides Python bindings to ImageMagick. Python libraries are supposed to be called via `python-packages.nix`. -{stdenv, fetchurl, python, boost, pkgconfig, imagemagick}: +{ stdenv, fetchurl, python, pkgconfig, imagemagick, autoreconfHook }: stdenv.mkDerivation rec { name = "pythonmagick-${version}"; @@ -11,10 +11,18 @@ stdenv.mkDerivation rec { sha256 = "137278mfb5079lns2mmw73x8dhpzgwha53dyl00mmhj2z25varpn"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [python boost imagemagick]; + postPatch = '' + rm configure + ''; - meta = { + configureFlags = [ "--with-boost=${python.pkgs.boost}" ]; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ python python.pkgs.boost imagemagick ]; + + meta = with stdenv.lib; { homepage = http://www.imagemagick.org/script/api.php; + license = licenses.imagemagick; + description = "PythonMagick provides object oriented bindings for the ImageMagick Library."; }; } diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix index 334a5a33dadf..aa6305ce8311 100644 --- a/pkgs/applications/graphics/antimony/default.nix +++ b/pkgs/applications/graphics/antimony/default.nix @@ -1,29 +1,34 @@ -{ stdenv, fetchFromGitHub, libpng, python3, boost, libGLU_combined, qtbase, ncurses, cmake, flex, lemon }: +{ stdenv, fetchFromGitHub, libpng, python3 +, libGLU_combined, qtbase, ncurses +, cmake, flex, lemon +}: let - gitRev = "020910c25614a3752383511ede5a1f5551a8bd39"; - gitBranch = "master"; + gitRev = "60a58688e552f12501980c4bdab034ab0f2ba059"; + gitBranch = "develop"; gitTag = "0.9.3"; in stdenv.mkDerivation rec { name = "antimony-${version}"; - version = gitTag; + version = "2018-07-17"; src = fetchFromGitHub { - owner = "mkeeter"; - repo = "antimony"; - rev = gitTag; - sha256 = "1vm5h5py8l3b8h4pbmm8s3wlxvlw492xfwnlwx0nvl0cjs8ba6r4"; + owner = "mkeeter"; + repo = "antimony"; + rev = gitRev; + sha256 = "0pgf6kr23xw012xsil56j5gq78mlirmrlqdm09m5wlgcf4vr6xnl"; }; patches = [ ./paths-fix.patch ]; postPatch = '' - sed -i "s,/usr/local,$out,g" app/CMakeLists.txt app/app/app.cpp app/app/main.cpp + sed -i "s,/usr/local,$out,g" \ + app/CMakeLists.txt app/app/app.cpp app/app/main.cpp + sed -i "s,python-py35,python36," CMakeLists.txt ''; buildInputs = [ - libpng python3 (boost.override { python = python3; }) + libpng python3 python3.pkgs.boost libGLU_combined qtbase ncurses ]; @@ -41,6 +46,7 @@ in description = "A computer-aided design (CAD) tool from a parallel universe"; homepage = "https://github.com/mkeeter/antimony"; license = licenses.mit; + maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix index 9def3f16ad03..cdbf5f446875 100644 --- a/pkgs/applications/graphics/imv/default.nix +++ b/pkgs/applications/graphics/imv/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/eXeC64/imv; license = licenses.gpl2; maintainers = with maintainers; [ rnhmjoj ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/applications/graphics/kipi-plugins/default.nix b/pkgs/applications/graphics/kipi-plugins/default.nix index 48a94a5253d0..f7faba7c41a5 100644 --- a/pkgs/applications/graphics/kipi-plugins/default.nix +++ b/pkgs/applications/graphics/kipi-plugins/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "kipi-plugins-${version}"; - version = "5.2.0"; + version = "5.9.0"; src = fetchurl { url = "http://download.kde.org/stable/digikam/digikam-${version}.tar.xz"; - sha256 = "0q4j7iv20cxgfsr14qwzx05wbp2zkgc7cg2pi7ibcnwba70ky96g"; + sha256 = "06qdalf2mwx2f43p3bljy3vn5bk8n3x539kha6ky2vzxvkp343b6"; }; prePatch = '' diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index c7cc617f163c..d4830a9e2390 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/applications/18.08.0/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/applications/18.08.1/ -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index decf0f4a314f..bc7b7407d6ab 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -3,1715 +3,1715 @@ { akonadi = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/akonadi-18.08.0.tar.xz"; - sha256 = "06a1n84w4bfljyariyajzpn1sajkn4dwpsrr47pz38vf1m6dp7mz"; - name = "akonadi-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/akonadi-18.08.1.tar.xz"; + sha256 = "0fipz3xnbgqk7f9pxfm3p38fniddb76scpb80fvb2v6gn0snlabi"; + name = "akonadi-18.08.1.tar.xz"; }; }; akonadi-calendar = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/akonadi-calendar-18.08.0.tar.xz"; - sha256 = "1qlqvsv4gs50v9dd3nbw8wyq0vgvxvslhnk1hnqpyvh0skcwslh5"; - name = "akonadi-calendar-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/akonadi-calendar-18.08.1.tar.xz"; + sha256 = "1knwr8s1qn13fan1pq31pr3dk219cmv96mwvd36ir0bd2l7vkmcs"; + name = "akonadi-calendar-18.08.1.tar.xz"; }; }; akonadi-calendar-tools = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/akonadi-calendar-tools-18.08.0.tar.xz"; - sha256 = "1d5kr7nxfy7y9ybi4qnfbfci5kc44ya916j9wgb18r6rfdhdwsxr"; - name = "akonadi-calendar-tools-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/akonadi-calendar-tools-18.08.1.tar.xz"; + sha256 = "1l4idxwi9h0bff1cwwsm7s4m9bcw4vp4ip5r87vc7687hhphc27l"; + name = "akonadi-calendar-tools-18.08.1.tar.xz"; }; }; akonadiconsole = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/akonadiconsole-18.08.0.tar.xz"; - sha256 = "0qrwgjdmqa5jj8vcbs6n733v462sxnf4jcmh2khjddf2h5na6q86"; - name = "akonadiconsole-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/akonadiconsole-18.08.1.tar.xz"; + sha256 = "031garrv2q3rv6qjjkzm3rmmd25f6j17sz2yv4hn3zgzydkjjskn"; + name = "akonadiconsole-18.08.1.tar.xz"; }; }; akonadi-contacts = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/akonadi-contacts-18.08.0.tar.xz"; - sha256 = "0jqs0llpxq34j4glgzsfifk5yd24x6smky550s66bjzkyg3j2s2m"; - name = "akonadi-contacts-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/akonadi-contacts-18.08.1.tar.xz"; + sha256 = "1p7192f7n6g7ihj05f7zzqpzl33sbvzsg479lkl120rmvzbjhfxn"; + name = "akonadi-contacts-18.08.1.tar.xz"; }; }; akonadi-import-wizard = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/akonadi-import-wizard-18.08.0.tar.xz"; - sha256 = "00my9ja8clz758s3x2jjlsxlpc8zfs8vlq4vh9i2vmsacqwrfy24"; - name = "akonadi-import-wizard-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/akonadi-import-wizard-18.08.1.tar.xz"; + sha256 = "0x80nfa04ffwdvv861ahpgrbnx48ad28ii5glcg5pp5a840jx72s"; + name = "akonadi-import-wizard-18.08.1.tar.xz"; }; }; akonadi-mime = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/akonadi-mime-18.08.0.tar.xz"; - sha256 = "0jj9l1zjh72crj8gfifpn73c5xiyycjgv0cm1qalf370cd1sdx80"; - name = "akonadi-mime-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/akonadi-mime-18.08.1.tar.xz"; + sha256 = "04xf5kbf30y5g4amx1x3nvkfypid232l4jamx3lnhia5x4kn2q5g"; + name = "akonadi-mime-18.08.1.tar.xz"; }; }; akonadi-notes = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/akonadi-notes-18.08.0.tar.xz"; - sha256 = "0x2v8ylnli29ld6y9vqj18a4bph4zm34zymdmrp3swll1j6xib7q"; - name = "akonadi-notes-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/akonadi-notes-18.08.1.tar.xz"; + sha256 = "1ib7a7y37mq0dj0arxg2f41a30d8i637359ixhcf9sgpcs3xysns"; + name = "akonadi-notes-18.08.1.tar.xz"; }; }; akonadi-search = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/akonadi-search-18.08.0.tar.xz"; - sha256 = "0fsn7mm1h9m9h3zm2z2fdghbw7m6wdbgfhg7b4iish2br375qh1s"; - name = "akonadi-search-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/akonadi-search-18.08.1.tar.xz"; + sha256 = "0r7bwfjq9z6ky3riap5gnffzb9k7hwslfprk0jad63dl0djj4qzw"; + name = "akonadi-search-18.08.1.tar.xz"; }; }; akregator = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/akregator-18.08.0.tar.xz"; - sha256 = "1s044m9l8z6safqcarjplmlksappjkx7iry3k8s2p6ld4w377w3c"; - name = "akregator-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/akregator-18.08.1.tar.xz"; + sha256 = "1js6fbz7hhj0pyjgaz5zhi5bbyw2l9v2gkpj8f8jw4ria2hiz4w8"; + name = "akregator-18.08.1.tar.xz"; }; }; analitza = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/analitza-18.08.0.tar.xz"; - sha256 = "1sqr94mbblqry9a1nkmg6py2w0p1wlnbim99kadmp56ypf483rw7"; - name = "analitza-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/analitza-18.08.1.tar.xz"; + sha256 = "11zzrgjl2fjbpjagzpzff0aq83ss5037pj4g83wi3qqvlkhphzf2"; + name = "analitza-18.08.1.tar.xz"; }; }; ark = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ark-18.08.0.tar.xz"; - sha256 = "0dp7lrc0nqwwshcsi1408lqyycqhxgx18bmnf1sq7ysh6d1w6i75"; - name = "ark-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ark-18.08.1.tar.xz"; + sha256 = "1k95qnjn4xgi0dnypfiwa86n0zwckkh5qnc54mv9g1xvvzah04cq"; + name = "ark-18.08.1.tar.xz"; }; }; artikulate = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/artikulate-18.08.0.tar.xz"; - sha256 = "12bkfxpaz352823c639q3bal9j6fcaamypv2ql08rn44h9zdjvk8"; - name = "artikulate-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/artikulate-18.08.1.tar.xz"; + sha256 = "1cvd6sm45j2gg0ga7j3vyz89lrl1ghlwq6516rsxrvsy3vg7vdmy"; + name = "artikulate-18.08.1.tar.xz"; }; }; audiocd-kio = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/audiocd-kio-18.08.0.tar.xz"; - sha256 = "0mh1cfz0dn28i9hqyjmz2cm50qkxzj0qkrvar59p03i2r8vqybf8"; - name = "audiocd-kio-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/audiocd-kio-18.08.1.tar.xz"; + sha256 = "11wz5glih8jf9l85ncfhg91nyvh7s6q25gfy0vnqk8k0a98h0ghi"; + name = "audiocd-kio-18.08.1.tar.xz"; }; }; baloo-widgets = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/baloo-widgets-18.08.0.tar.xz"; - sha256 = "026lm8m7bp8q1akwgfvzsyyam7jknndif3vmij4x5ra7yy5xa0s9"; - name = "baloo-widgets-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/baloo-widgets-18.08.1.tar.xz"; + sha256 = "1ab86j0akmz8vqkg3xhx1qlp27ndsg183irhfap313maw88bzwxp"; + name = "baloo-widgets-18.08.1.tar.xz"; }; }; blinken = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/blinken-18.08.0.tar.xz"; - sha256 = "0ivpv27vgzchm0r8zlb02w6l0a8xsi7q173660bjv1ynwalgn3bm"; - name = "blinken-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/blinken-18.08.1.tar.xz"; + sha256 = "0xzk8ddgr55sil00dl6b00m0x5az81yhd1cklr6mahjgg7w822br"; + name = "blinken-18.08.1.tar.xz"; }; }; bomber = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/bomber-18.08.0.tar.xz"; - sha256 = "0z83hkvs7h0pg91sczmvkkn7yc8xfch5hl7l25b7kac4c9qznzix"; - name = "bomber-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/bomber-18.08.1.tar.xz"; + sha256 = "0x4z8fa2klhabr99al3iyyf9aq3pm8rk1gi6cjghjgwrrcav7an7"; + name = "bomber-18.08.1.tar.xz"; }; }; bovo = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/bovo-18.08.0.tar.xz"; - sha256 = "0bbkm0c801rcvk8z0idbasn1m7cdd2mpbpb1ap9ghgv2vjbln7va"; - name = "bovo-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/bovo-18.08.1.tar.xz"; + sha256 = "1jwq9wjkdhy8bvkxg4lvb1m4qqw0zr84ws096nk6pccqk7xlkpr2"; + name = "bovo-18.08.1.tar.xz"; }; }; calendarsupport = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/calendarsupport-18.08.0.tar.xz"; - sha256 = "0ps4963c2wbmlwp7aks16jw2pz74fqlxarhsnjj3r339575inzw2"; - name = "calendarsupport-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/calendarsupport-18.08.1.tar.xz"; + sha256 = "0hh8jr81hcqyhm9fp0s27g52077d9li8x8rrg3bd18lw3flib0fq"; + name = "calendarsupport-18.08.1.tar.xz"; }; }; cantor = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/cantor-18.08.0.tar.xz"; - sha256 = "08sqr1nxn9a24z4jicmjn9zn64xv3yyy054rzblr2h2hi3n6fqdy"; - name = "cantor-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/cantor-18.08.1.tar.xz"; + sha256 = "05cvyrf17lvh85qrcg1yf8x2c9d3l9wgbvnlhw4idx06crhvwvbb"; + name = "cantor-18.08.1.tar.xz"; }; }; cervisia = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/cervisia-18.08.0.tar.xz"; - sha256 = "1avc18vv2lb27w5ybiajsr65c65zpvbv43ihz4gcjv7awqf754w7"; - name = "cervisia-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/cervisia-18.08.1.tar.xz"; + sha256 = "1hir8ssr2yjjkly8kh8qdxqlgaa29q94kpsrk1crcdl67vrc8pph"; + name = "cervisia-18.08.1.tar.xz"; }; }; dolphin = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/dolphin-18.08.0.tar.xz"; - sha256 = "1r3g3qssawhav3dx9a9qdd7dqcjj1ynm6ravj5wx39h4qdflrysy"; - name = "dolphin-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/dolphin-18.08.1.tar.xz"; + sha256 = "1f8w1315kg5mnz0jfdbynw5kapg529kwr3qc98nh83q4vfrjr7yj"; + name = "dolphin-18.08.1.tar.xz"; }; }; dolphin-plugins = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/dolphin-plugins-18.08.0.tar.xz"; - sha256 = "1j96bkc3xah4ca3a9asplpf152dp234r2bzs5wg25b3aw7zp5siv"; - name = "dolphin-plugins-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/dolphin-plugins-18.08.1.tar.xz"; + sha256 = "0wa09n3x255d3rn5sndvyybawj2aq0sm0fdvqz7sbnm1c67g6akd"; + name = "dolphin-plugins-18.08.1.tar.xz"; }; }; dragon = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/dragon-18.08.0.tar.xz"; - sha256 = "020vnnzd7crvrv8dbcf41h04hpr2ayrfk6ayxhxpazrzic1sxxx6"; - name = "dragon-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/dragon-18.08.1.tar.xz"; + sha256 = "1r9zdia4r1g77c456zi1yv3vjrccww6lqrhplwg90bw8091isc7s"; + name = "dragon-18.08.1.tar.xz"; }; }; eventviews = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/eventviews-18.08.0.tar.xz"; - sha256 = "1ca499dzqsy2n6c0s0vrwvjykc4vd5s4m2bkn0vdg2dbyyx9fncj"; - name = "eventviews-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/eventviews-18.08.1.tar.xz"; + sha256 = "0h5aqjncsmhgjqsj65j12bx4rb5rf4604fs6h04lda8jrk2qla3y"; + name = "eventviews-18.08.1.tar.xz"; }; }; ffmpegthumbs = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ffmpegthumbs-18.08.0.tar.xz"; - sha256 = "1rbfbwnyync4j15qzdhn47gksr6jm97pgkld2x3p564gi98w0vrn"; - name = "ffmpegthumbs-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ffmpegthumbs-18.08.1.tar.xz"; + sha256 = "11gwrw3fm6di4z5a04jqxfvm176mh20h8pfpv0c0zq9qipr1khkc"; + name = "ffmpegthumbs-18.08.1.tar.xz"; }; }; filelight = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/filelight-18.08.0.tar.xz"; - sha256 = "1wx6q0gq4zlg95a93sg7zqkbaka1pcn99jsjkdncq1z4lfphppk9"; - name = "filelight-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/filelight-18.08.1.tar.xz"; + sha256 = "03sz1bnz7w3b4227hvfidi225ci5i83z022fgkb632b0dp2l9m8p"; + name = "filelight-18.08.1.tar.xz"; }; }; granatier = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/granatier-18.08.0.tar.xz"; - sha256 = "06nzgpwvgvbh6hf5yxmcxigh3n72qa0mbiv7k56157yyvxigk62q"; - name = "granatier-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/granatier-18.08.1.tar.xz"; + sha256 = "062qh639n1k919n67k2xn5h829gr0ncczif9mffw8ggvqqrzh560"; + name = "granatier-18.08.1.tar.xz"; }; }; grantlee-editor = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/grantlee-editor-18.08.0.tar.xz"; - sha256 = "06m2n5rcgp63xgnr5jdzly7fda8zx5r3ki07ldxz1xivd985zmfp"; - name = "grantlee-editor-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/grantlee-editor-18.08.1.tar.xz"; + sha256 = "0wl8ii23wh1xakf6vcsv7n259kw0b3lpz7qnfmhz8nwj3k890g9q"; + name = "grantlee-editor-18.08.1.tar.xz"; }; }; grantleetheme = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/grantleetheme-18.08.0.tar.xz"; - sha256 = "1mk80hfra4nmrcb0ff3n7l33pbw6j5lypb3ip7g4c1p8qik6imfv"; - name = "grantleetheme-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/grantleetheme-18.08.1.tar.xz"; + sha256 = "1ydi89smsim4lvgwclm9xsnldimsy45b69qsipz9vhhck4pccd7n"; + name = "grantleetheme-18.08.1.tar.xz"; }; }; gwenview = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/gwenview-18.08.0.tar.xz"; - sha256 = "1nv9a7pj0h2m3wxzy03jw3pi5ps3xqvq9sx7mblq8p4klga2pcnl"; - name = "gwenview-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/gwenview-18.08.1.tar.xz"; + sha256 = "0p32v9y2gz5q4j1vz0yqw90qg8l7nbyzxqn7pqwrzbhlycsx7mp9"; + name = "gwenview-18.08.1.tar.xz"; }; }; incidenceeditor = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/incidenceeditor-18.08.0.tar.xz"; - sha256 = "1s88i1l30b30an8lwc8sdlzfm1cvmb9n5786bs9y0jfgw01wdl7j"; - name = "incidenceeditor-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/incidenceeditor-18.08.1.tar.xz"; + sha256 = "0da1jba66pvjar5wxcx2q9dhfwj2mlwk17h0j9xc9kgxj2y0bzx9"; + name = "incidenceeditor-18.08.1.tar.xz"; }; }; juk = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/juk-18.08.0.tar.xz"; - sha256 = "1lzw9ih4771vdxqngc0ja57v9y6wlgf8dbmnjax74ryi232py1d9"; - name = "juk-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/juk-18.08.1.tar.xz"; + sha256 = "17mylgsw11nc64y0if3imrs2hsxwfdflnn1a4f5p64awrzid04mc"; + name = "juk-18.08.1.tar.xz"; }; }; k3b = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/k3b-18.08.0.tar.xz"; - sha256 = "1lm9140xc5mq1szyc4vkms6b3qhl4b3yn74kqp942b8k9djn17md"; - name = "k3b-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/k3b-18.08.1.tar.xz"; + sha256 = "1vv7pr1i3vj778m763mv1bzrq29kaqm02hnllhgq4dcci3hafn6a"; + name = "k3b-18.08.1.tar.xz"; }; }; kaccounts-integration = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kaccounts-integration-18.08.0.tar.xz"; - sha256 = "0wvqhf9br8nqqacyn6j4k2323w6nixkfzlajkmx872d31d7aqf11"; - name = "kaccounts-integration-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kaccounts-integration-18.08.1.tar.xz"; + sha256 = "18nbj4vyakhxvzy35j4b7iap06lp7zwhfpylfpnshjbcrb724qzs"; + name = "kaccounts-integration-18.08.1.tar.xz"; }; }; kaccounts-providers = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kaccounts-providers-18.08.0.tar.xz"; - sha256 = "1zxyqwdrf9pp5b1vnd8p4wz21ciavffjxd68vcjjyj8bba30c51l"; - name = "kaccounts-providers-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kaccounts-providers-18.08.1.tar.xz"; + sha256 = "0ygiyv5fxf6b62sfibm621cz5cxin6qa1mnjpdxfj72xj8p7dbd7"; + name = "kaccounts-providers-18.08.1.tar.xz"; }; }; kaddressbook = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kaddressbook-18.08.0.tar.xz"; - sha256 = "1wgqqnikv9qyrb4nvkm7h91r1iqfkmbpdp67lcw4jkglqghnn2qc"; - name = "kaddressbook-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kaddressbook-18.08.1.tar.xz"; + sha256 = "0917d7m2nvgadkns8im7fzzqp2m5i21m4nrw75hv6bil7v0cshnn"; + name = "kaddressbook-18.08.1.tar.xz"; }; }; kajongg = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kajongg-18.08.0.tar.xz"; - sha256 = "0dfrwzq1p9ikff52qi50ckb769pfij7gzn61r6pdkkfjgy86364y"; - name = "kajongg-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kajongg-18.08.1.tar.xz"; + sha256 = "0apjydg0q9yvvnlirhhvri2bqwzrkrq85fzphi49pr5ki3ah03dz"; + name = "kajongg-18.08.1.tar.xz"; }; }; kalarm = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kalarm-18.08.0.tar.xz"; - sha256 = "0415yq61q700slmm6vskd92pc2sp1027flghgans80i29617zgaq"; - name = "kalarm-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kalarm-18.08.1.tar.xz"; + sha256 = "1558nls14a22pwjnk59fpgmb4ddrdvzf3rdhl0nf6kkgr0ma0p1w"; + name = "kalarm-18.08.1.tar.xz"; }; }; kalarmcal = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kalarmcal-18.08.0.tar.xz"; - sha256 = "0ss56dy451lbbq872sarqcyapf4g6kgw78s88hgs7z5mlyj8xnll"; - name = "kalarmcal-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kalarmcal-18.08.1.tar.xz"; + sha256 = "02shp4m85frjs4kp5n2kv3nz5frjfrckm7zkjlnwn6lrg6jz7q0f"; + name = "kalarmcal-18.08.1.tar.xz"; }; }; kalgebra = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kalgebra-18.08.0.tar.xz"; - sha256 = "0fv4v7xnspqjbc7x6n2gcyjssm15apszbvj4gs1w2lwlbbr3i224"; - name = "kalgebra-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kalgebra-18.08.1.tar.xz"; + sha256 = "1996vbcvbpkvmya291w2kxfjwkm3baqflx04drrglildsrn6q07w"; + name = "kalgebra-18.08.1.tar.xz"; }; }; kalzium = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kalzium-18.08.0.tar.xz"; - sha256 = "0bjpiir1xxwvhs4xgnvbhphw24iif9g4kj9zg61bqcvq5zxf821x"; - name = "kalzium-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kalzium-18.08.1.tar.xz"; + sha256 = "0sp89xi94xpix1gpz1s7qya1ki7lbbx93yr17bmhlp4dhyfqbzw5"; + name = "kalzium-18.08.1.tar.xz"; }; }; kamera = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kamera-18.08.0.tar.xz"; - sha256 = "169vsxnpcgxws27hcap2l5wjbfyxxi30321c8r3p8fm2klvbc8nw"; - name = "kamera-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kamera-18.08.1.tar.xz"; + sha256 = "03p94azchdgr19mbgpgkvb3rlddik3bjl6iy3j0yd99frlns15ck"; + name = "kamera-18.08.1.tar.xz"; }; }; kamoso = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kamoso-18.08.0.tar.xz"; - sha256 = "1a8azx7rdbzznh9qwzg0x6w50vb5bc6cmd442j2hhdwkl15dqpwd"; - name = "kamoso-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kamoso-18.08.1.tar.xz"; + sha256 = "11hm8q2v3x1rhm2smiqm9gmscbpdkyfb6x4sl0xrnm36m7ps54qb"; + name = "kamoso-18.08.1.tar.xz"; }; }; kanagram = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kanagram-18.08.0.tar.xz"; - sha256 = "02v3xlkfphkk86y8yrw10lq7f4wc7gmh02ms2w00aqrllkpja4vn"; - name = "kanagram-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kanagram-18.08.1.tar.xz"; + sha256 = "0mq8qrvvn30axhizzlzhzp5vl9q1ys7s7p5v525flyyz9fs011dz"; + name = "kanagram-18.08.1.tar.xz"; }; }; kapman = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kapman-18.08.0.tar.xz"; - sha256 = "03fhxn8zckidkab56fzgwai0d1ac5k3il32w881gq5z012ms013h"; - name = "kapman-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kapman-18.08.1.tar.xz"; + sha256 = "0grq9yllpaa267lx654n39mj7ll0g2pj6s42fq7b7236naqyna3d"; + name = "kapman-18.08.1.tar.xz"; }; }; kapptemplate = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kapptemplate-18.08.0.tar.xz"; - sha256 = "10fyvwxf6xmn8jdc4p3m3jpb8ykaga1jmwx2hzhf8c6a3rrcxvvb"; - name = "kapptemplate-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kapptemplate-18.08.1.tar.xz"; + sha256 = "1dp9831hzmh9gd3qwvfyb2ihindl5c42jvmmrhnmfbz1j199z98w"; + name = "kapptemplate-18.08.1.tar.xz"; }; }; kate = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kate-18.08.0.tar.xz"; - sha256 = "1licprflzcsrfap7klr1ia2kl2z2cp16zgznphrqkkn9n6x7xz67"; - name = "kate-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kate-18.08.1.tar.xz"; + sha256 = "1jsdk6jfff36fcb1x0vxl0iqa1xrl0400bm7fhp1gv9m553pkysa"; + name = "kate-18.08.1.tar.xz"; }; }; katomic = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/katomic-18.08.0.tar.xz"; - sha256 = "07d9irgqrawll18fi3b2mrjj416gpkn43bsriifkraqf8yrn3m4s"; - name = "katomic-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/katomic-18.08.1.tar.xz"; + sha256 = "0cd8l7hn89xr5spq107nqxz7dx12drvv70siqx896d8lfpkmh96d"; + name = "katomic-18.08.1.tar.xz"; }; }; kbackup = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kbackup-18.08.0.tar.xz"; - sha256 = "14nmk7dwrmkfv7kz4r64vzy46n48g3l1iqj0937qnpbqk12yvak9"; - name = "kbackup-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kbackup-18.08.1.tar.xz"; + sha256 = "15x75biiwixiw0j329pcxhh5sfyqm82x2rdfb0nqp0zz01cwicv6"; + name = "kbackup-18.08.1.tar.xz"; }; }; kblackbox = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kblackbox-18.08.0.tar.xz"; - sha256 = "0nd4nsx7yyiy1g1g4v0gaw0m6r3kb07gnn8236bch6xxy9xcdzhb"; - name = "kblackbox-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kblackbox-18.08.1.tar.xz"; + sha256 = "00xd6k9ndm1jbr1j2mhi8xfcxqdiwzwnb1cvr35a22r414lbc3cw"; + name = "kblackbox-18.08.1.tar.xz"; }; }; kblocks = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kblocks-18.08.0.tar.xz"; - sha256 = "1pnxzfp3bd089bjbdsi0iwjpw60p36lb110yb61cv0vb54g1sia1"; - name = "kblocks-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kblocks-18.08.1.tar.xz"; + sha256 = "0y9hfxb9rpijpkm1r697v1w5q3gny8pa3ax5y0qq6695j2h7c52p"; + name = "kblocks-18.08.1.tar.xz"; }; }; kblog = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kblog-18.08.0.tar.xz"; - sha256 = "00q7266lx29bfgzhfmb192l8h3qwgpj3yyfc0lykkbhjf6d9w783"; - name = "kblog-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kblog-18.08.1.tar.xz"; + sha256 = "0ickxhz7y098zx88308774kkz8wf6v51ydlnbmnayb8lyaw8ms8i"; + name = "kblog-18.08.1.tar.xz"; }; }; kbounce = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kbounce-18.08.0.tar.xz"; - sha256 = "0x07lxqip9l2k9mdpan03yh17ammkd1f242l2p3qq3j1s71bpznm"; - name = "kbounce-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kbounce-18.08.1.tar.xz"; + sha256 = "1k2qmdhm3sllxhsz6hhs94fndm1lrifhh7md2lmws2l2977ymkpi"; + name = "kbounce-18.08.1.tar.xz"; }; }; kbreakout = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kbreakout-18.08.0.tar.xz"; - sha256 = "1jrix92p48zcpgwvfxn484bw1k8ynfacm4iww14splx2d9skj489"; - name = "kbreakout-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kbreakout-18.08.1.tar.xz"; + sha256 = "06mxh67pyg7fv8x152kd79xzrfnlw22x4x3iklhbngsk1cqsg62r"; + name = "kbreakout-18.08.1.tar.xz"; }; }; kbruch = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kbruch-18.08.0.tar.xz"; - sha256 = "1gkij27hl847bc2jdnjqvigncdmb11spj2rsy825rsnpiqxbqv8f"; - name = "kbruch-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kbruch-18.08.1.tar.xz"; + sha256 = "0m4m1xqp2aqkqs7cgj8z5c6b3s64d330bfgsq7mnm2wakmc69x9g"; + name = "kbruch-18.08.1.tar.xz"; }; }; kcachegrind = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kcachegrind-18.08.0.tar.xz"; - sha256 = "13nqcxh21apxpzg51alsgn34hps21nr7aqyh60kd4fbmmsxrqll0"; - name = "kcachegrind-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kcachegrind-18.08.1.tar.xz"; + sha256 = "0llqmziq0h6wx3inxc2rmph1qs68fb34q09fvhfasg43l8y8a6cm"; + name = "kcachegrind-18.08.1.tar.xz"; }; }; kcalc = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kcalc-18.08.0.tar.xz"; - sha256 = "04bdbdyc9lky6i0dkm6w9f2k3gvr9zq5b9yc6qhl4smdiivlqjb6"; - name = "kcalc-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kcalc-18.08.1.tar.xz"; + sha256 = "139pjh31k9cy608h7yl9kxq48x6dsm5c0gcbndqc6nsjwd88ck04"; + name = "kcalc-18.08.1.tar.xz"; }; }; kcalcore = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kcalcore-18.08.0.tar.xz"; - sha256 = "0sdzx0ygq89np2cj22v06m9j00nwbqn97rm43nffgixwvrlf1wy5"; - name = "kcalcore-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kcalcore-18.08.1.tar.xz"; + sha256 = "0kf92imqm9lqisfy3i25qn0g588p35w23xl0vmx75i67pzr3jcjn"; + name = "kcalcore-18.08.1.tar.xz"; }; }; kcalutils = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kcalutils-18.08.0.tar.xz"; - sha256 = "12s2anmwi3q95kjl197jis90vi5gzpxs0b4xj4m6n4lzmnyjvfxl"; - name = "kcalutils-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kcalutils-18.08.1.tar.xz"; + sha256 = "1z346k9aniv3bq9c1dak3x5hzymi71ygns773r4agzm4kdn8ghwh"; + name = "kcalutils-18.08.1.tar.xz"; }; }; kcharselect = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kcharselect-18.08.0.tar.xz"; - sha256 = "1gfzzzk5admdclw75qhnsf3271p2lr0fgqzxvclcxppwmv5j56aq"; - name = "kcharselect-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kcharselect-18.08.1.tar.xz"; + sha256 = "06r9q03rs00zqs0dpb0wxa9663pc2i51hsf83c0z9jnkpq6sjijb"; + name = "kcharselect-18.08.1.tar.xz"; }; }; kcolorchooser = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kcolorchooser-18.08.0.tar.xz"; - sha256 = "1sxlx6cnpm0yfbrbk1pqaf0lsf1mgzdnkszr30hwz6z5lvvzj73l"; - name = "kcolorchooser-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kcolorchooser-18.08.1.tar.xz"; + sha256 = "027afkj0mllvnwdrrfjnpp4769dp5ixrdmd17r59q2hja0wz6cpf"; + name = "kcolorchooser-18.08.1.tar.xz"; }; }; kcontacts = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kcontacts-18.08.0.tar.xz"; - sha256 = "0cil96cd383gvqa2dw1lhaw3vi3m04y4rpjqmiapzwnn4ck0v1ii"; - name = "kcontacts-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kcontacts-18.08.1.tar.xz"; + sha256 = "1y0drw7n9mhyq84brqxz4rr666pqj5ww94f2i8k34chdzkcqsr52"; + name = "kcontacts-18.08.1.tar.xz"; }; }; kcron = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kcron-18.08.0.tar.xz"; - sha256 = "14lkaz1b6hnpwvxnnx3mgv3fg86vm1g45fggfx25x6x72kiihhzq"; - name = "kcron-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kcron-18.08.1.tar.xz"; + sha256 = "1blalii8b6i8b1cknwcarbj84m6rrffsjamgnzyz6l81l43b0j9m"; + name = "kcron-18.08.1.tar.xz"; }; }; kdav = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kdav-18.08.0.tar.xz"; - sha256 = "13jwc4623f9mx64i7fb3ha5gwbqgfd54dirbvcyyglrzipxmgja1"; - name = "kdav-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kdav-18.08.1.tar.xz"; + sha256 = "046h72gvcc9wxq0rn5ribf3lr03q6zq6acz2c3kxsbdw6kbypb2x"; + name = "kdav-18.08.1.tar.xz"; }; }; kdebugsettings = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kdebugsettings-18.08.0.tar.xz"; - sha256 = "1ddqcfq2icsk2xmfr02jawdgxyydhx4yyhrfd7pk8cfw66rm23br"; - name = "kdebugsettings-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kdebugsettings-18.08.1.tar.xz"; + sha256 = "0n6lvccm803g9ilwwdka0srvak14i8lk5g149c6qmd73wywqdk84"; + name = "kdebugsettings-18.08.1.tar.xz"; }; }; kde-dev-scripts = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kde-dev-scripts-18.08.0.tar.xz"; - sha256 = "1glnm91wn3xdd6zqqy2p178f05z5wn3gr1i6jyqb0zkl8ansy3yi"; - name = "kde-dev-scripts-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kde-dev-scripts-18.08.1.tar.xz"; + sha256 = "1y162wn5mpi0c3wa8vjb2al2mizz292jzj22wvdzp19vliy32j95"; + name = "kde-dev-scripts-18.08.1.tar.xz"; }; }; kde-dev-utils = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kde-dev-utils-18.08.0.tar.xz"; - sha256 = "1dk510kgjgvycdyzr5mwq9z1b3xr8hlpm4ahfwlfn299gl563fwf"; - name = "kde-dev-utils-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kde-dev-utils-18.08.1.tar.xz"; + sha256 = "1w5r7w7s5iaaxaxicd42nh2dhmc7anfqpv9n92rrk1hwpmjbphg5"; + name = "kde-dev-utils-18.08.1.tar.xz"; }; }; kdeedu-data = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kdeedu-data-18.08.0.tar.xz"; - sha256 = "1ph3bw4xgmgh28j9vnj9v1amgisy3f44whpwwhzin9zgzz0cw3gw"; - name = "kdeedu-data-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kdeedu-data-18.08.1.tar.xz"; + sha256 = "0gpg1haawwi1d1p1pwzx2127kkdpg4i833312cl637v5qgvg7xhc"; + name = "kdeedu-data-18.08.1.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kdegraphics-mobipocket-18.08.0.tar.xz"; - sha256 = "0p3bci612qbqnbps4g4yb2kd1rs6kx2ppcls6vpfb035c28ygf7a"; - name = "kdegraphics-mobipocket-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kdegraphics-mobipocket-18.08.1.tar.xz"; + sha256 = "13jw2gn3wc946zdgr2hi1nsd6m518idn4q5wq0ym715mfbfs17zn"; + name = "kdegraphics-mobipocket-18.08.1.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kdegraphics-thumbnailers-18.08.0.tar.xz"; - sha256 = "0dwfphz70y0g43a9nxfda78qwsv7y4llx1f51x6n8jl64kpxnijw"; - name = "kdegraphics-thumbnailers-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kdegraphics-thumbnailers-18.08.1.tar.xz"; + sha256 = "0h9h5d81bjmjcgbxh3sy776rddpxxcwyj0jjix67q37kndbap4k0"; + name = "kdegraphics-thumbnailers-18.08.1.tar.xz"; }; }; kdenetwork-filesharing = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kdenetwork-filesharing-18.08.0.tar.xz"; - sha256 = "0l5f9ffwsk0s9r87kid9k1a7j2v4lcdzbn2w4qb2pg22k92k8p67"; - name = "kdenetwork-filesharing-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kdenetwork-filesharing-18.08.1.tar.xz"; + sha256 = "1bfqk57d1xfqbig1r8cymlp0pgsfmrix5nr4m1a015rmpqnvb92d"; + name = "kdenetwork-filesharing-18.08.1.tar.xz"; }; }; kdenlive = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kdenlive-18.08.0.tar.xz"; - sha256 = "06d0viqma7kivzv3hbsiirkfhbj28mdr2nr3f5ic56381q3ps923"; - name = "kdenlive-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kdenlive-18.08.1.tar.xz"; + sha256 = "1ampvjlxn3q8l3mi4nap4lq3hgxzmp6ic88hzmkdj41vpm01flpf"; + name = "kdenlive-18.08.1.tar.xz"; }; }; kdepim-addons = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kdepim-addons-18.08.0.tar.xz"; - sha256 = "05141013jdaascsb7ihbmd4f1lh1r6ah5w39wp5vky6ma35zv2l1"; - name = "kdepim-addons-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kdepim-addons-18.08.1.tar.xz"; + sha256 = "0fgggq0dl4qy0wha4jjarxgjly54s9fpqkm2macfq2bgvdbsjrgj"; + name = "kdepim-addons-18.08.1.tar.xz"; }; }; kdepim-apps-libs = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kdepim-apps-libs-18.08.0.tar.xz"; - sha256 = "0zpx3nilrsvgmgx5visppyx3kn2g5k8fnhfy649k6wa35p846495"; - name = "kdepim-apps-libs-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kdepim-apps-libs-18.08.1.tar.xz"; + sha256 = "0v4vvrjh1amlrvmf61cjfb2yr1j4j0qypf5349spnnlwjjrxn2hw"; + name = "kdepim-apps-libs-18.08.1.tar.xz"; }; }; kdepim-runtime = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kdepim-runtime-18.08.0.tar.xz"; - sha256 = "0b1jbksxks32s8gjzrjhh4nja089j5dq75yaiil99w11f7nfpkar"; - name = "kdepim-runtime-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kdepim-runtime-18.08.1.tar.xz"; + sha256 = "0133d86z1fggzg15jk2p8pg42zcv3khikpgdlyvz4si3canmvkwj"; + name = "kdepim-runtime-18.08.1.tar.xz"; }; }; kdesdk-kioslaves = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kdesdk-kioslaves-18.08.0.tar.xz"; - sha256 = "1fpg4sdbgzvlc9z7wwxxbp466fhybphvmcdpplbr7ws3588792cb"; - name = "kdesdk-kioslaves-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kdesdk-kioslaves-18.08.1.tar.xz"; + sha256 = "1nn4bzywd42ijbzlcnkdlr84n1p6argrd1gz91yyyrhqark7ma76"; + name = "kdesdk-kioslaves-18.08.1.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kdesdk-thumbnailers-18.08.0.tar.xz"; - sha256 = "047rnzn2lsbhfll0fp4vdf4jsyixg7vmpl2xyvi1y85df5nvv2pc"; - name = "kdesdk-thumbnailers-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kdesdk-thumbnailers-18.08.1.tar.xz"; + sha256 = "1c133n4qf9jkgzhccipspwk3r8mbja0k8556ng0wxnhayzmv2sx9"; + name = "kdesdk-thumbnailers-18.08.1.tar.xz"; }; }; kdf = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kdf-18.08.0.tar.xz"; - sha256 = "1flv6qjb936fcj5crshy26qy9y2p7j9i3hlidr9lsk81wsyjkqqg"; - name = "kdf-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kdf-18.08.1.tar.xz"; + sha256 = "1m5hwfhzvikh7isakbvzyc3y98zdky4iz8vdsi7nnyb6d8n2hbrr"; + name = "kdf-18.08.1.tar.xz"; }; }; kdialog = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kdialog-18.08.0.tar.xz"; - sha256 = "04xhp4pdn7gv69gwydz9afml27qj9mrqz2hnrhcsf29pw3vq0hli"; - name = "kdialog-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kdialog-18.08.1.tar.xz"; + sha256 = "0s8a3y8sjhyq8lf3i8r6ligg1s9nbhxsd34vncw3lkbq60xkyhrr"; + name = "kdialog-18.08.1.tar.xz"; }; }; kdiamond = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kdiamond-18.08.0.tar.xz"; - sha256 = "14c5i2fj9scvkqffz95lrqj49vfg7yh7gfc4s3zzg2sl91j7hwzq"; - name = "kdiamond-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kdiamond-18.08.1.tar.xz"; + sha256 = "0vcqdadb9kbmxnycaba6g9hiiyxqybqiw1i4zldlw5x4gnj7dcv2"; + name = "kdiamond-18.08.1.tar.xz"; }; }; keditbookmarks = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/keditbookmarks-18.08.0.tar.xz"; - sha256 = "1zsfmcyb9s782k6knlv56mrssazdid6i70g74is46s59sgfdd9fl"; - name = "keditbookmarks-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/keditbookmarks-18.08.1.tar.xz"; + sha256 = "10nzhsyia1q0m26icqb20qh8s8n6r5vlb5q498gw8dv3rzsmh6sf"; + name = "keditbookmarks-18.08.1.tar.xz"; }; }; kfind = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kfind-18.08.0.tar.xz"; - sha256 = "1bvln7iq2ikcrzaa53wskpqwzmndjvc84a2jdjqzirmh6pqzlf3h"; - name = "kfind-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kfind-18.08.1.tar.xz"; + sha256 = "15w4cdvz35yyfyfaxb4mnxynlbryixydkwmx7lkmhlwnk3zjmskr"; + name = "kfind-18.08.1.tar.xz"; }; }; kfloppy = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kfloppy-18.08.0.tar.xz"; - sha256 = "1clz5651d11pm77mi57nzr274zwshx2qhglfn6jxiif9yz6s9dfp"; - name = "kfloppy-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kfloppy-18.08.1.tar.xz"; + sha256 = "07v3q4jiw728s9akwhy27hczp4hxhp7f8c6g59gdqm0ply0vgxk6"; + name = "kfloppy-18.08.1.tar.xz"; }; }; kfourinline = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kfourinline-18.08.0.tar.xz"; - sha256 = "1agmzlwy4izrmi58cf08cg34h155inmws3ghp524jz1li6rqvzfr"; - name = "kfourinline-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kfourinline-18.08.1.tar.xz"; + sha256 = "03g8g0s2214fqkqp4lyh9m8f382s8xwzi0yqz0yigyq1w5igcl9p"; + name = "kfourinline-18.08.1.tar.xz"; }; }; kgeography = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kgeography-18.08.0.tar.xz"; - sha256 = "0nj3lg8q84wvh1pypix619bdr9xm6s9s5vywciq8ggskqa2qrdc5"; - name = "kgeography-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kgeography-18.08.1.tar.xz"; + sha256 = "1pqs2sk88idzc8xr85qy689palkf5y5l4pfqkd9xfkb87041rl93"; + name = "kgeography-18.08.1.tar.xz"; }; }; kget = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kget-18.08.0.tar.xz"; - sha256 = "0vpphsfgqa4h1bsj0k6lz591ymd5zy3ng86fl4l1qv36kh5b3sr4"; - name = "kget-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kget-18.08.1.tar.xz"; + sha256 = "1ax6sdkpvzg37sp05fx083h0nn78a2zpfpr2l74j3qwq2yssy298"; + name = "kget-18.08.1.tar.xz"; }; }; kgoldrunner = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kgoldrunner-18.08.0.tar.xz"; - sha256 = "13i3b8z2pbvh90ykv365s30az9r33is8wp8ys33kz88z26260rsv"; - name = "kgoldrunner-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kgoldrunner-18.08.1.tar.xz"; + sha256 = "1wbdranw0fq8qynn13d0wkb7fckfzqbz2g920gyx2igw0bblcj0y"; + name = "kgoldrunner-18.08.1.tar.xz"; }; }; kgpg = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kgpg-18.08.0.tar.xz"; - sha256 = "12d6vqfcrgmqajk383p9gx9l49digm51km00slwkb15yjzgsjckx"; - name = "kgpg-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kgpg-18.08.1.tar.xz"; + sha256 = "1i3g7x18khnyvwnvgpnv6xdfbv29w65x8d8ml60zb8siipbnlwb5"; + name = "kgpg-18.08.1.tar.xz"; }; }; khangman = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/khangman-18.08.0.tar.xz"; - sha256 = "0vcyak1pqq894d10jn4s8948fz8py6kjhgrbvjk2ksp28fzsb1q2"; - name = "khangman-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/khangman-18.08.1.tar.xz"; + sha256 = "1nc9lbjxlwr4aqsl6idjyhqxd5wampcz7a6zgq6py03n8mr811qy"; + name = "khangman-18.08.1.tar.xz"; }; }; khelpcenter = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/khelpcenter-18.08.0.tar.xz"; - sha256 = "1ykw91s1w5953646ylxm49bq0bjgxd8yp29r09644q12qmi1w9ay"; - name = "khelpcenter-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/khelpcenter-18.08.1.tar.xz"; + sha256 = "1k60yqnpkplj0k0b8h27zyhviqs6ddwhygmv7cpmnwa1d7kvhdwi"; + name = "khelpcenter-18.08.1.tar.xz"; }; }; kidentitymanagement = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kidentitymanagement-18.08.0.tar.xz"; - sha256 = "1rrdxbil0z0vmv0h0d6jdlwa3sfs3nncq39wmydhwx09phk7db85"; - name = "kidentitymanagement-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kidentitymanagement-18.08.1.tar.xz"; + sha256 = "0w1lmfcjq2fb65l3vd9qzq037j7r3dd49aqh8bnrwkjslshy7iwz"; + name = "kidentitymanagement-18.08.1.tar.xz"; }; }; kig = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kig-18.08.0.tar.xz"; - sha256 = "0kgsar7sp3a7x72gnagi2hwajbl1yaaj493qjnwzlwidjjrlzmhb"; - name = "kig-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kig-18.08.1.tar.xz"; + sha256 = "1haf21widyfi0afixyfczk944l048w8dvlmgkwvfqhmgiiz52g72"; + name = "kig-18.08.1.tar.xz"; }; }; kigo = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kigo-18.08.0.tar.xz"; - sha256 = "1ws0diq3kb8f15v30cj0hc0ii4d14dca7fb3p8vvm8r4ly7gqbdr"; - name = "kigo-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kigo-18.08.1.tar.xz"; + sha256 = "1dmb3cmbi473wpkbnv895nyxxhqmp09ihghvxir77khjpmask04a"; + name = "kigo-18.08.1.tar.xz"; }; }; killbots = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/killbots-18.08.0.tar.xz"; - sha256 = "165g1zll7wq6gyz1lzaf1x17j2nagd66lj015qxifjpn9fd475mm"; - name = "killbots-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/killbots-18.08.1.tar.xz"; + sha256 = "184glirpf8jzy91769d13rck3vnh96s171h6sfqab755857wj960"; + name = "killbots-18.08.1.tar.xz"; }; }; kimagemapeditor = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kimagemapeditor-18.08.0.tar.xz"; - sha256 = "1r3hngzvidv1yz7kd7l8l78gqdhjvw9smciv1vkzf7dk9qarlyfq"; - name = "kimagemapeditor-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kimagemapeditor-18.08.1.tar.xz"; + sha256 = "1w0yinp58f7x4ss2m069736faagwil7ay8gd5w79a5frqizsj36d"; + name = "kimagemapeditor-18.08.1.tar.xz"; }; }; kimap = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kimap-18.08.0.tar.xz"; - sha256 = "12lslmprwmibijlpwng4acmmhdfhm1dgvqsazbyvsr8jagkryxmq"; - name = "kimap-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kimap-18.08.1.tar.xz"; + sha256 = "0na135np2li231kzxfjy4wb5bbgkkyll66x8jd4y0lxvc4cwipfd"; + name = "kimap-18.08.1.tar.xz"; }; }; kio-extras = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kio-extras-18.08.0.tar.xz"; - sha256 = "1k5azz26zwsflnsgv4r0i8z8jph060wpksyqfpkz0vfsf3lv0k3n"; - name = "kio-extras-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kio-extras-18.08.1.tar.xz"; + sha256 = "03q68bc53q656pw733g2j2wkbag6hbqpwszkap2h4pn011cihgyw"; + name = "kio-extras-18.08.1.tar.xz"; }; }; kiriki = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kiriki-18.08.0.tar.xz"; - sha256 = "1fciiq490iwcz86g9pqp8g0s40zf7a3zan132iqmscpl71hsv01b"; - name = "kiriki-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kiriki-18.08.1.tar.xz"; + sha256 = "1kc2flpfqvfijrazvnk7mk03myy7f7lqia1r9lxg1g3xx095jqhz"; + name = "kiriki-18.08.1.tar.xz"; }; }; kiten = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kiten-18.08.0.tar.xz"; - sha256 = "1gzgfj0p0s5yjhwx6hldc8s0cs6p2bn5gd8sy29sicg13wjvhkmj"; - name = "kiten-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kiten-18.08.1.tar.xz"; + sha256 = "1i1pgfxvcqh5jbbk39b6rlc0s67z2naw5glxhkg3nrvxy9yxw9n2"; + name = "kiten-18.08.1.tar.xz"; }; }; kitinerary = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kitinerary-18.08.0.tar.xz"; - sha256 = "14jwlkfy9z6q2pnjmlcy5gihc75n6qnsck05zycs4qsxa4srpn0l"; - name = "kitinerary-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kitinerary-18.08.1.tar.xz"; + sha256 = "0bv1nwwi2mc0l3vfvx29d46l7b876qf4bch9g84zmdcas37w786l"; + name = "kitinerary-18.08.1.tar.xz"; }; }; kjumpingcube = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kjumpingcube-18.08.0.tar.xz"; - sha256 = "001a2ayl74hi89j8i3553qx0cs8w7f4myskq3qa01rg3w4pb3wl2"; - name = "kjumpingcube-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kjumpingcube-18.08.1.tar.xz"; + sha256 = "1qfzydbpd86zsb0yfy5xdaqlbh1awm70lg1nzbqn99rl47vsm85b"; + name = "kjumpingcube-18.08.1.tar.xz"; }; }; kldap = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kldap-18.08.0.tar.xz"; - sha256 = "1825146vi1lq1383qmn8ix70d2rc2cfwp95vpn4divf9aqwmc4x0"; - name = "kldap-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kldap-18.08.1.tar.xz"; + sha256 = "1knf61whi1raj66z55a8535rj911na15zkq0vcb8djz6cg3xw29r"; + name = "kldap-18.08.1.tar.xz"; }; }; kleopatra = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kleopatra-18.08.0.tar.xz"; - sha256 = "1wwjn2p2vblr6fdfcy1s5gf3h5cnclc4lj5vsi5cxyp7d86ij49c"; - name = "kleopatra-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kleopatra-18.08.1.tar.xz"; + sha256 = "0g65qxz6v1glh86fvgpb89ay1221qbnz97mnzw8fb26aar838s8y"; + name = "kleopatra-18.08.1.tar.xz"; }; }; klettres = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/klettres-18.08.0.tar.xz"; - sha256 = "1g84swzlynyl7r2ln52n7w9q0yf6540dd9hj3j0zsp1y2hb9fns8"; - name = "klettres-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/klettres-18.08.1.tar.xz"; + sha256 = "0k5c9j9w0d95fzs7103nx13cxz9q5ivn34wq8px0ma9jaig1w1j9"; + name = "klettres-18.08.1.tar.xz"; }; }; klickety = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/klickety-18.08.0.tar.xz"; - sha256 = "1jrxabmnv0s38i255x7xycn12fgpkmr4p1y0ydk5x98zrv4vn8y0"; - name = "klickety-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/klickety-18.08.1.tar.xz"; + sha256 = "1zx7f4hpcgfrfbgmmhfj9p9l604bzhg06zznfgq40774m4d5m992"; + name = "klickety-18.08.1.tar.xz"; }; }; klines = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/klines-18.08.0.tar.xz"; - sha256 = "14ks53xh6hhlrmiqa7a1f7z42i035qw3v72dpbc8bw20vg53bzpy"; - name = "klines-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/klines-18.08.1.tar.xz"; + sha256 = "1wwvzvwshxj03s3ywpg65lfj32xcd3yj4y7fhdms8xjn0b341grc"; + name = "klines-18.08.1.tar.xz"; }; }; kmag = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kmag-18.08.0.tar.xz"; - sha256 = "00ni6clpgwcr6b2yanmgplsb5jqmqxjiymd3572fkj7q8m17ak7f"; - name = "kmag-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kmag-18.08.1.tar.xz"; + sha256 = "1a1xml73yhfrqzw37apgmf1f88x58ws09vfdrp8zchawskcm3yi2"; + name = "kmag-18.08.1.tar.xz"; }; }; kmahjongg = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kmahjongg-18.08.0.tar.xz"; - sha256 = "0lflx8jxk2yv7bsywwmbk5l54gyhbyv65996fg82z6lw9hrr5wrb"; - name = "kmahjongg-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kmahjongg-18.08.1.tar.xz"; + sha256 = "1rdimx9kdm9n3g4856672z0spwsj5ihd40yx17vbzc3lhyqnk0w1"; + name = "kmahjongg-18.08.1.tar.xz"; }; }; kmail = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kmail-18.08.0.tar.xz"; - sha256 = "1xj2z4ix9zba6k3cdnakr7f0nfij1z925j3vp0gimkgyvbcb28vr"; - name = "kmail-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kmail-18.08.1.tar.xz"; + sha256 = "12097jncdx5zdsr99lmsvhiymarymgbd004vmxm6rni0hq1aqzkl"; + name = "kmail-18.08.1.tar.xz"; }; }; kmail-account-wizard = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kmail-account-wizard-18.08.0.tar.xz"; - sha256 = "1hc6zqys2qncljvsl9j48ns77kkq5zabj5a2kzg953dgcdv5x25r"; - name = "kmail-account-wizard-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kmail-account-wizard-18.08.1.tar.xz"; + sha256 = "0jzqqn07q0jsggss2r5pjgp0fhfgngvv0rjzyh12lzsn4l8iyd6z"; + name = "kmail-account-wizard-18.08.1.tar.xz"; }; }; kmailtransport = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kmailtransport-18.08.0.tar.xz"; - sha256 = "0dfws0pzq3jf1h6j5qzjm96fz1ci4v57j4s9fbry10vyn4racpq8"; - name = "kmailtransport-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kmailtransport-18.08.1.tar.xz"; + sha256 = "196cjbnzqcp1ayqpn4vy8ah55nskhv07xrfrm8h0baxj90jd01xn"; + name = "kmailtransport-18.08.1.tar.xz"; }; }; kmbox = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kmbox-18.08.0.tar.xz"; - sha256 = "11dh1lgjhiy4bvpvrk1rw23fgjil45ch3lazqc4jp21d1skrr1v4"; - name = "kmbox-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kmbox-18.08.1.tar.xz"; + sha256 = "0sjl64cjr2dxvjklpdl2p25vjbvzi0w42m5s3fzlqam9avmckfia"; + name = "kmbox-18.08.1.tar.xz"; }; }; kmime = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kmime-18.08.0.tar.xz"; - sha256 = "0kci9b2c67hzbl4hjwkkzk9j7g1l5wy1d8qrm1jwk8s7ccndindw"; - name = "kmime-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kmime-18.08.1.tar.xz"; + sha256 = "00jxsnwkx4c9x1cm7w6r5z39d4962d0w6b8irdczix4r660xf56x"; + name = "kmime-18.08.1.tar.xz"; }; }; kmines = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kmines-18.08.0.tar.xz"; - sha256 = "0z0fidlcp0kf9vmdgfyzrwi9yk5mfwhkzlqlbfy1631xisz158yn"; - name = "kmines-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kmines-18.08.1.tar.xz"; + sha256 = "0csjr16s6jjj6z0963kc5jqwywjf9mvsa8c7x751h76kci1x53b0"; + name = "kmines-18.08.1.tar.xz"; }; }; kmix = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kmix-18.08.0.tar.xz"; - sha256 = "084l5dpms26jwd894xnqr054hxjzlxcp2wm2rq37y3cbriia2xgh"; - name = "kmix-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kmix-18.08.1.tar.xz"; + sha256 = "1i5wgdmr8sml9cqjlgmi2i4v8lgksa7pnp91cgj75bmcy68sv0gj"; + name = "kmix-18.08.1.tar.xz"; }; }; kmousetool = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kmousetool-18.08.0.tar.xz"; - sha256 = "0lcr8hpflaw5lrfydwi5sf069hfb19qifb7wh7qxh7j1b2z8w4gf"; - name = "kmousetool-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kmousetool-18.08.1.tar.xz"; + sha256 = "0drpzdsry3xj4wm50850wf9rg3banbfaspbrmj1vwinbyz6f7pwz"; + name = "kmousetool-18.08.1.tar.xz"; }; }; kmouth = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kmouth-18.08.0.tar.xz"; - sha256 = "0naqn9pl7jldfna9l3i3kdv8rkw0nky4ppsvqghlrb9jf4dy8lfm"; - name = "kmouth-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kmouth-18.08.1.tar.xz"; + sha256 = "0ywadz614w308vsss7b25xx4ddqyabr15miz9x7izffh67dhvm97"; + name = "kmouth-18.08.1.tar.xz"; }; }; kmplot = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kmplot-18.08.0.tar.xz"; - sha256 = "0lvw351iz2gdzkphrf8hxgqbjqi4pqvxqk2zjbly4fzwbgk261bd"; - name = "kmplot-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kmplot-18.08.1.tar.xz"; + sha256 = "1287pk524lfqvadq2rc8226v9qiwqh80fj1gjhsw6y3vhj88dpvg"; + name = "kmplot-18.08.1.tar.xz"; }; }; knavalbattle = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/knavalbattle-18.08.0.tar.xz"; - sha256 = "0b21z3qqhsyafsa6rx9mc560hrw0046npqjmi5jpmczl6y9mr78q"; - name = "knavalbattle-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/knavalbattle-18.08.1.tar.xz"; + sha256 = "0jxzgv06mysjalm0gfig3h6a9b84nkrq1qchi47h9x8cfaspba9r"; + name = "knavalbattle-18.08.1.tar.xz"; }; }; knetwalk = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/knetwalk-18.08.0.tar.xz"; - sha256 = "04yfxxihfdqhrs126796k498v8valhd73q2bagcx59lj7iymxszj"; - name = "knetwalk-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/knetwalk-18.08.1.tar.xz"; + sha256 = "1bg4jaijvhb312cpwrfr4chmxj3fcj3k9caw5xwzrgdgw7prrbax"; + name = "knetwalk-18.08.1.tar.xz"; }; }; knotes = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/knotes-18.08.0.tar.xz"; - sha256 = "0dvjafmf57z10lx8fb4y4na73qq3dfmqfa2w01b3sdzns0nzaqig"; - name = "knotes-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/knotes-18.08.1.tar.xz"; + sha256 = "1cihancavh5z5781gy6h8cikwbsw2p5hb2wbwakzjs3ld31nsjcv"; + name = "knotes-18.08.1.tar.xz"; }; }; kolf = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kolf-18.08.0.tar.xz"; - sha256 = "0bcd4k7v5sid98h95xbqm5l0dcjkv367mdgzhr6yizlqpyg6c132"; - name = "kolf-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kolf-18.08.1.tar.xz"; + sha256 = "1ngzjmlhx471rfy486fpglpihydskrvwiqnl6xrp6fw1wg9pbd6b"; + name = "kolf-18.08.1.tar.xz"; }; }; kollision = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kollision-18.08.0.tar.xz"; - sha256 = "029pwgwmsm9m284m1sbi2zzhhwbz6rlq68jd783ir6cq2z3llvjp"; - name = "kollision-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kollision-18.08.1.tar.xz"; + sha256 = "0is63m9zw8s53pf73c2a7f2wkvrsg70wk49x6rpzb28jmsgm1xi2"; + name = "kollision-18.08.1.tar.xz"; }; }; kolourpaint = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kolourpaint-18.08.0.tar.xz"; - sha256 = "0p08xc8ai1cllbdwmv46xzcpv70mn6zwd4f62xsh71hhpg8fbqpi"; - name = "kolourpaint-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kolourpaint-18.08.1.tar.xz"; + sha256 = "101vz981kl006q8kirs9d9bsp1bpjzcl22bbswgjny6niqlzd5lm"; + name = "kolourpaint-18.08.1.tar.xz"; }; }; kompare = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kompare-18.08.0.tar.xz"; - sha256 = "0md4qw29q5mnsz0k4a3dl6fdgff33w4kg59qy02kp3pvqav9r1zx"; - name = "kompare-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kompare-18.08.1.tar.xz"; + sha256 = "0ksdf5c6a3rhq0r8g8hiai53pzk37jiicislfik6y8f71rq0crqv"; + name = "kompare-18.08.1.tar.xz"; }; }; konqueror = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/konqueror-18.08.0.tar.xz"; - sha256 = "12zw4bgmmc35vghi8phm93x9lmhfgpxxfvz0grxa4gxcxqjyzzcq"; - name = "konqueror-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/konqueror-18.08.1.tar.xz"; + sha256 = "0bz9vyagcrm7yihrx464hkf30y5rx6p9cvx8hq0sblvb7m4308y7"; + name = "konqueror-18.08.1.tar.xz"; }; }; konquest = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/konquest-18.08.0.tar.xz"; - sha256 = "0pvx4ss8dpxd6q4jnxim3pwyxjvhcy1xihn7s3513hy0h4wabv6s"; - name = "konquest-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/konquest-18.08.1.tar.xz"; + sha256 = "1y3afkna2xg47qk9iwh3gsxbp1plf5y7k87svk8nzbh6aa8pillx"; + name = "konquest-18.08.1.tar.xz"; }; }; konsole = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/konsole-18.08.0.tar.xz"; - sha256 = "1p119ky78zxi8l08xnfklrg21c6124q1fbjvbybf6l0qq3mzwy77"; - name = "konsole-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/konsole-18.08.1.tar.xz"; + sha256 = "05i9mkw4ygpy6ilqkkm5s7m9kva9ds0gr5gszci7z52m7y67s27d"; + name = "konsole-18.08.1.tar.xz"; }; }; kontact = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kontact-18.08.0.tar.xz"; - sha256 = "0027zinl9s92vxhlzv9mak9fgzygqw5ml6i6x659pl3mc889fr7j"; - name = "kontact-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kontact-18.08.1.tar.xz"; + sha256 = "136sfr6gwf2cdlc54hc5p1wzcrjpnan0rzmzs21cwpp9gsvmsjvq"; + name = "kontact-18.08.1.tar.xz"; }; }; kontactinterface = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kontactinterface-18.08.0.tar.xz"; - sha256 = "0mcvpmvczqpsqj83vqfv9zwz7jj3az65nq45xg1l476j8sva278n"; - name = "kontactinterface-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kontactinterface-18.08.1.tar.xz"; + sha256 = "1w96wyr5kinaghnaima1pcq5hz8qyzvvyjpsk3dg8h3is86npvkb"; + name = "kontactinterface-18.08.1.tar.xz"; }; }; kopete = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kopete-18.08.0.tar.xz"; - sha256 = "0g79zv187pj7c2p33qsnkpmvrxpcx1iiy9lcrdz3acgzgvpfh5dk"; - name = "kopete-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kopete-18.08.1.tar.xz"; + sha256 = "0i38hvnp1qiwva6gd3p7zs962bhi5fviysr8wzm7296f1hv1rz4k"; + name = "kopete-18.08.1.tar.xz"; }; }; korganizer = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/korganizer-18.08.0.tar.xz"; - sha256 = "0qifd6l93jjj7sxf3kllm3dq13p738zlvbpxg24wzc3gllyq4ip1"; - name = "korganizer-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/korganizer-18.08.1.tar.xz"; + sha256 = "0wdpcjar64f8bii3xbbj08dfnd0290xwdvlr09p1pfmlllp09l0v"; + name = "korganizer-18.08.1.tar.xz"; }; }; kpat = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kpat-18.08.0.tar.xz"; - sha256 = "0dm9alimp2ibf5fpgbafiaz3lh9irvq2539jp6l61jqcv7801fml"; - name = "kpat-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kpat-18.08.1.tar.xz"; + sha256 = "0cmdfmd8pcwwwq4hjcfjscdl36p9gmw9shmqimjnqm60i5ivlz65"; + name = "kpat-18.08.1.tar.xz"; }; }; kpimtextedit = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kpimtextedit-18.08.0.tar.xz"; - sha256 = "0ciivvpfcsjzpc620zalx7k5ybh6bf53y19lvr1dgad29j6j871q"; - name = "kpimtextedit-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kpimtextedit-18.08.1.tar.xz"; + sha256 = "0v47hb9nvx3bq3ybsqng6546qxk5yi66kd0mm2g7bdx9iq060x0j"; + name = "kpimtextedit-18.08.1.tar.xz"; }; }; kpkpass = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kpkpass-18.08.0.tar.xz"; - sha256 = "1wgycyx8nn9kaqbxvlps44g1nzr2qpr6mb7m22q5qcykly0i5wzl"; - name = "kpkpass-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kpkpass-18.08.1.tar.xz"; + sha256 = "11d125rd35p44phksxrbzaixasgrsa4z9ym98h69ylyk2mm8h9lk"; + name = "kpkpass-18.08.1.tar.xz"; }; }; kqtquickcharts = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kqtquickcharts-18.08.0.tar.xz"; - sha256 = "0ykf5xfzjsanj5rmn5qrhhqfb93i19mrwzsqq8pngaimcqb70cdk"; - name = "kqtquickcharts-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kqtquickcharts-18.08.1.tar.xz"; + sha256 = "1qki34i42hzr0zg0hydg4axsakfl7fydl23sn2xlvxyixw8yvcwi"; + name = "kqtquickcharts-18.08.1.tar.xz"; }; }; krdc = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/krdc-18.08.0.tar.xz"; - sha256 = "03j3cn088mr8cd6vjkv19k5ayrhgh9mbyr0lkj9rr16z6861avmr"; - name = "krdc-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/krdc-18.08.1.tar.xz"; + sha256 = "05fkpwcl1ivprvqy8x1h8akc2fxqnfh80vbis1k1gy8wanizigg9"; + name = "krdc-18.08.1.tar.xz"; }; }; kreversi = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kreversi-18.08.0.tar.xz"; - sha256 = "18qqfaxb34b0z6cdz9h2z0hkmr1vv85j7ra8gzhy35k40dgvhgqm"; - name = "kreversi-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kreversi-18.08.1.tar.xz"; + sha256 = "1srn6czbhmlglnmnkg9pl9qs1b98ckfralydivk14y40m24s4j0b"; + name = "kreversi-18.08.1.tar.xz"; }; }; krfb = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/krfb-18.08.0.tar.xz"; - sha256 = "1zaran8lbhrnlr2nz12xis4b7q0krynzqyix14diiiysrfsmnwqm"; - name = "krfb-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/krfb-18.08.1.tar.xz"; + sha256 = "0p4jyl8dya1xvhisv30h86hnjyjc9sqaqj0d2zx447nqm479k9kw"; + name = "krfb-18.08.1.tar.xz"; }; }; kross-interpreters = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kross-interpreters-18.08.0.tar.xz"; - sha256 = "1g3fgva8h0s1ld38m38iawjr04bsh572lazizr9a460nwk60nmsi"; - name = "kross-interpreters-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kross-interpreters-18.08.1.tar.xz"; + sha256 = "1vkai4v553anbbdb38rccfg65zww93gw2v05kmr0hk62n13lqbh2"; + name = "kross-interpreters-18.08.1.tar.xz"; }; }; kruler = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kruler-18.08.0.tar.xz"; - sha256 = "0fv3186xhyvfi9zz48r4facy9x8m8y53qfl7x1rs0y1hq2d2k3nh"; - name = "kruler-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kruler-18.08.1.tar.xz"; + sha256 = "13gksm8mpnlvsi5v4a4fpbqb4mxq3l6giycwryi0qrh6bw33xak9"; + name = "kruler-18.08.1.tar.xz"; }; }; kshisen = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kshisen-18.08.0.tar.xz"; - sha256 = "11q717m7m37902bchbgpdgsward4w2c9bwjns3xs4c3pyx1w7mg4"; - name = "kshisen-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kshisen-18.08.1.tar.xz"; + sha256 = "07w7rps4wh8ibhjnk1s80x9p1mvnl5yw37fnjz3byknk2a10lcm4"; + name = "kshisen-18.08.1.tar.xz"; }; }; ksirk = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ksirk-18.08.0.tar.xz"; - sha256 = "1wxf1g5vfcnvz9n28ja17iawc1997vhz6p75bq84jmls51pxjkzn"; - name = "ksirk-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ksirk-18.08.1.tar.xz"; + sha256 = "0rqjxfrnbbmcx07l0rlyfv8mlka5hm4a59q8zsk6x2vii18yhi49"; + name = "ksirk-18.08.1.tar.xz"; }; }; ksmtp = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ksmtp-18.08.0.tar.xz"; - sha256 = "13jkxrlycgk9qqw5v16i1rax8lwany7fd1n6m2875saxmjm9qi0s"; - name = "ksmtp-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ksmtp-18.08.1.tar.xz"; + sha256 = "0kznmx1qbv3kf0cqxwqgfwy1k79awrf6v46ni97h2fwrw90af9w9"; + name = "ksmtp-18.08.1.tar.xz"; }; }; ksnakeduel = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ksnakeduel-18.08.0.tar.xz"; - sha256 = "0ixbv4b9ngb82f4s58hzjvmmifkjy5v59g76kpb5dv9nqb9x8833"; - name = "ksnakeduel-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ksnakeduel-18.08.1.tar.xz"; + sha256 = "0l0b94mx948zas3q27qn2dpvwfiqyd08zv2izl947prwg4mvmb0q"; + name = "ksnakeduel-18.08.1.tar.xz"; }; }; kspaceduel = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kspaceduel-18.08.0.tar.xz"; - sha256 = "0qw3lkiwwrzicyqqr6fs78ljhn5z4vsvcvcn9l5j18qkmi2fd2dk"; - name = "kspaceduel-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kspaceduel-18.08.1.tar.xz"; + sha256 = "1fjk0i2f72kzzg321w96989nqw0zfvv9iyv28ywg2pjb62nj9z2x"; + name = "kspaceduel-18.08.1.tar.xz"; }; }; ksquares = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ksquares-18.08.0.tar.xz"; - sha256 = "01g9jkd5cq1ga9k9brr8yiny3idmj88c4n1cm2qi10d9n1vd4fja"; - name = "ksquares-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ksquares-18.08.1.tar.xz"; + sha256 = "0m30yw3hwh9jmwfwabnmjg2l19q4c4b8qcxp2ywp2xzxggvs3ssd"; + name = "ksquares-18.08.1.tar.xz"; }; }; ksudoku = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ksudoku-18.08.0.tar.xz"; - sha256 = "0fc7d6bs0ba51nypx4bn5hylfx9h6xlam7wjw1i7fr2yr8fdv9id"; - name = "ksudoku-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ksudoku-18.08.1.tar.xz"; + sha256 = "1ma0009prjmi59jym0qbfqan7iyp3h4pa7q5sdqykk77mlqm1z81"; + name = "ksudoku-18.08.1.tar.xz"; }; }; ksystemlog = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ksystemlog-18.08.0.tar.xz"; - sha256 = "1m5y8rawhi03vnpdw75npdd7hc830a5b2kkrz1112g959psv00ah"; - name = "ksystemlog-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ksystemlog-18.08.1.tar.xz"; + sha256 = "0c05gzqn51mg7ag6nyir1z3jdy5wd4bfka8lx2gigf6kjqyq4yny"; + name = "ksystemlog-18.08.1.tar.xz"; }; }; kteatime = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kteatime-18.08.0.tar.xz"; - sha256 = "18pm15s7q4xwzi61m2l8k6qplf948lq36iv9nh5sf4p6vp6syay2"; - name = "kteatime-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kteatime-18.08.1.tar.xz"; + sha256 = "0przpgn2kwvnmfsqxncb1wx4xxr696j6zpgwwx3bhqfd89dc0bgm"; + name = "kteatime-18.08.1.tar.xz"; }; }; ktimer = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ktimer-18.08.0.tar.xz"; - sha256 = "0g81daqdmfsmbnzjq74zxrbnjxjbi6nd6kl0acmjg7832l30m4js"; - name = "ktimer-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ktimer-18.08.1.tar.xz"; + sha256 = "0bwkxl619d4gar2piyk63lds85sz43gghg02cifsjvdvjfqfqbhp"; + name = "ktimer-18.08.1.tar.xz"; }; }; ktnef = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ktnef-18.08.0.tar.xz"; - sha256 = "007gjmjyi5r8110w4fv7n5gl67ddn1dg0pb119qr3r82iba8qiqi"; - name = "ktnef-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ktnef-18.08.1.tar.xz"; + sha256 = "184isgr9c5amwrlzlkji9q0dhl06936r2axdn5kjy2shbn7j7hz2"; + name = "ktnef-18.08.1.tar.xz"; }; }; ktouch = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ktouch-18.08.0.tar.xz"; - sha256 = "0pgckza5cn52aapa39d12dighx698jzb877iiml2n9870whifkms"; - name = "ktouch-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ktouch-18.08.1.tar.xz"; + sha256 = "1z23i7h6s31b3az6fk22whp1zs7np20wji5bcwvck1cv5a0nlpvc"; + name = "ktouch-18.08.1.tar.xz"; }; }; ktp-accounts-kcm = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ktp-accounts-kcm-18.08.0.tar.xz"; - sha256 = "16k7dprj75g2lgsmnnmn9n6zgwnp64zsjci5y2vk0cp8ndlr1j54"; - name = "ktp-accounts-kcm-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ktp-accounts-kcm-18.08.1.tar.xz"; + sha256 = "1pnq61vjvzs3lnxf52ski36arxyy5930gdh3858d7nq66dqcvw19"; + name = "ktp-accounts-kcm-18.08.1.tar.xz"; }; }; ktp-approver = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ktp-approver-18.08.0.tar.xz"; - sha256 = "1nh75yzprhbn0af33qsrs81vxk1brlxjf1jal7p8fpr47qdwhzvd"; - name = "ktp-approver-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ktp-approver-18.08.1.tar.xz"; + sha256 = "0sxp79rscfph5iscbpcqyp08szfipnsb0a3k4idlxfxp8bxv1kr2"; + name = "ktp-approver-18.08.1.tar.xz"; }; }; ktp-auth-handler = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ktp-auth-handler-18.08.0.tar.xz"; - sha256 = "0akmbrn9z0ind3jmz2azixyvr9glai66j6dynszn59svvjxp0fiz"; - name = "ktp-auth-handler-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ktp-auth-handler-18.08.1.tar.xz"; + sha256 = "18lnffiq0wh02j140ya3474sbq6nbb5yj6yavhm1dl0y0pap4mxl"; + name = "ktp-auth-handler-18.08.1.tar.xz"; }; }; ktp-call-ui = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ktp-call-ui-18.08.0.tar.xz"; - sha256 = "0z23vcvz6nyc6klqqys4ivh33j21kww4fgcm5dvvlf940cc9gr3h"; - name = "ktp-call-ui-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ktp-call-ui-18.08.1.tar.xz"; + sha256 = "1mqgwblz86qbdfhlzncc5wzvqwhki4kx5afbihgynjr13d4jjldp"; + name = "ktp-call-ui-18.08.1.tar.xz"; }; }; ktp-common-internals = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ktp-common-internals-18.08.0.tar.xz"; - sha256 = "1sj1k8x8d2lk8xsqckjzg6zz01gqh3yj52yar56lngn1cjnnf6ak"; - name = "ktp-common-internals-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ktp-common-internals-18.08.1.tar.xz"; + sha256 = "1r4ac7q8hpsldwagz4hsslsx962vxq8hmlhjs5r5h5c89r2qhpil"; + name = "ktp-common-internals-18.08.1.tar.xz"; }; }; ktp-contact-list = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ktp-contact-list-18.08.0.tar.xz"; - sha256 = "0yx64rz6k5dv6s4wsadjqc0fcx6j7blhy15cbnh8r2pbwf0ilk2w"; - name = "ktp-contact-list-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ktp-contact-list-18.08.1.tar.xz"; + sha256 = "09zfmqhpm907x1fcd3v7cvbgxx8sy1krjyidand77adl8ayiq59c"; + name = "ktp-contact-list-18.08.1.tar.xz"; }; }; ktp-contact-runner = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ktp-contact-runner-18.08.0.tar.xz"; - sha256 = "0i4zc6bksnb4iajz91wbw140dh7p0rg3hzhi563pn3siy9id442s"; - name = "ktp-contact-runner-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ktp-contact-runner-18.08.1.tar.xz"; + sha256 = "0cv65v2kkfqg6kny3zl3k0kg5af3wbi42jjni0r37rsgaknmg45x"; + name = "ktp-contact-runner-18.08.1.tar.xz"; }; }; ktp-desktop-applets = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ktp-desktop-applets-18.08.0.tar.xz"; - sha256 = "0i5sniidcgkvq2scf76pkshrj89gvkzjjslgqaxvqrgvyagsaski"; - name = "ktp-desktop-applets-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ktp-desktop-applets-18.08.1.tar.xz"; + sha256 = "04pkknx46zkn5v7946s23n4m1gr28w1cwpsyz8mkww8xfxk52x2y"; + name = "ktp-desktop-applets-18.08.1.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ktp-filetransfer-handler-18.08.0.tar.xz"; - sha256 = "15mifrbxxr8lvq7nflxwsz46ywnqmjv1d3irzq1xfcpl47907qhg"; - name = "ktp-filetransfer-handler-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ktp-filetransfer-handler-18.08.1.tar.xz"; + sha256 = "07m25ydhpa92d6pqgrhj6mvhirsf6c1i1xnxjmybrmf8v4cy1z8v"; + name = "ktp-filetransfer-handler-18.08.1.tar.xz"; }; }; ktp-kded-module = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ktp-kded-module-18.08.0.tar.xz"; - sha256 = "12rnnf2nm2kn2904b475qh9ql50yx583jga31389l012whm4gqqf"; - name = "ktp-kded-module-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ktp-kded-module-18.08.1.tar.xz"; + sha256 = "0f8m3avph7w8yrlgpwsf6ykgbzzj7mrh973v2w6gw2iwz2ps0bbm"; + name = "ktp-kded-module-18.08.1.tar.xz"; }; }; ktp-send-file = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ktp-send-file-18.08.0.tar.xz"; - sha256 = "0m8p8w4hqanccf7g0za5yh30z2nxv8dxi09mg1fniypqaw4cp2n7"; - name = "ktp-send-file-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ktp-send-file-18.08.1.tar.xz"; + sha256 = "1d9k2xmyrxk4s6dr1a0dgi4j4j5y5f73r57aldr5k821w425ssmg"; + name = "ktp-send-file-18.08.1.tar.xz"; }; }; ktp-text-ui = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ktp-text-ui-18.08.0.tar.xz"; - sha256 = "04ygny9m823h30hi5qgjz1nk7dj44hdqa9ga0ai9cazxnavvsx57"; - name = "ktp-text-ui-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ktp-text-ui-18.08.1.tar.xz"; + sha256 = "07ydrwsg2xv6vxsp6n2li6d5dfc92bdikdjqq266dqb35mb6wbx4"; + name = "ktp-text-ui-18.08.1.tar.xz"; }; }; ktuberling = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/ktuberling-18.08.0.tar.xz"; - sha256 = "1m9mdv7hdsrnzjcdnmqrl82mafa9psbr5k7b6m3llh95f61b4jpn"; - name = "ktuberling-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/ktuberling-18.08.1.tar.xz"; + sha256 = "176fdw99ni02nz3kv62dbiw7887a5kvmxsm8bg3viwyymcs8aay8"; + name = "ktuberling-18.08.1.tar.xz"; }; }; kturtle = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kturtle-18.08.0.tar.xz"; - sha256 = "0mwhnsbwj92zrgyjdfi18pxsfyaxa8pzdmh5k20m0jrh76gkhjr0"; - name = "kturtle-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kturtle-18.08.1.tar.xz"; + sha256 = "1r3w5hbzw2f4794j690wgm7x3dfxfyqnaylhjcrxqmqydkc54w2c"; + name = "kturtle-18.08.1.tar.xz"; }; }; kubrick = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kubrick-18.08.0.tar.xz"; - sha256 = "1affzpwq45r1cqb9ra8w24rrszvvzxiik4ng6jf54dik8sk7wrnn"; - name = "kubrick-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kubrick-18.08.1.tar.xz"; + sha256 = "0nwd0n8rx7dzbwjvkhnmvb2g4g7lasng7745klcdwk40ww223b60"; + name = "kubrick-18.08.1.tar.xz"; }; }; kwalletmanager = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kwalletmanager-18.08.0.tar.xz"; - sha256 = "10yri44d68n6hc4dn78wgqzw394krwjqr6azwd6qgxjp6asc8n69"; - name = "kwalletmanager-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kwalletmanager-18.08.1.tar.xz"; + sha256 = "08hr7ii6dybbmipppay2gxiwak8rqbrxrwbjz0206cyav16bbp7q"; + name = "kwalletmanager-18.08.1.tar.xz"; }; }; kwave = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kwave-18.08.0.tar.xz"; - sha256 = "0aimhn8hgjnwhv0j2hiyiqgh5bslm7rs13yc8sk0kh1vix6909mp"; - name = "kwave-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kwave-18.08.1.tar.xz"; + sha256 = "1gsxzpf8ij7bw6s4dbdl8kvyz21wy76dxi4wqwdggi29gvxzpi76"; + name = "kwave-18.08.1.tar.xz"; }; }; kwordquiz = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/kwordquiz-18.08.0.tar.xz"; - sha256 = "1aghybg72anwj6vz3s3zr5i5wflackvfwl9n39mvxddm4ajnw1km"; - name = "kwordquiz-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/kwordquiz-18.08.1.tar.xz"; + sha256 = "0bkxvw2g64r2k87m05mdxwh25lbixcga406x9i64z5dmgpsb7d9m"; + name = "kwordquiz-18.08.1.tar.xz"; }; }; libgravatar = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/libgravatar-18.08.0.tar.xz"; - sha256 = "0yqd99lax1w5r1fy4rmbv9lk988zvq2yydkrdgh8vymxjljg5xa4"; - name = "libgravatar-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/libgravatar-18.08.1.tar.xz"; + sha256 = "0axmf5ph5ahs4124fi016hjj559472k2apgfsbnf9q80d6y25lgf"; + name = "libgravatar-18.08.1.tar.xz"; }; }; libkcddb = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/libkcddb-18.08.0.tar.xz"; - sha256 = "1ns90vcbp21mwsbvndmk97fpd8n7152iw783q7bqfy1n3ggzkz5x"; - name = "libkcddb-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/libkcddb-18.08.1.tar.xz"; + sha256 = "1qy3zid9n7irkiz6vizmhwljrg3wcxxgcch58nmacg7fdxwcnnn1"; + name = "libkcddb-18.08.1.tar.xz"; }; }; libkcompactdisc = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/libkcompactdisc-18.08.0.tar.xz"; - sha256 = "0pgn65knay7fgk2zdgqd29wfhqk9x4zlpp4ywjwb2zsvzz51j9f8"; - name = "libkcompactdisc-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/libkcompactdisc-18.08.1.tar.xz"; + sha256 = "075i81gpb4c1wgzbv6nnvhgkz2sww0y5zqh8sxw67r46rz4rjwak"; + name = "libkcompactdisc-18.08.1.tar.xz"; }; }; libkdcraw = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/libkdcraw-18.08.0.tar.xz"; - sha256 = "0xpkkgxsmvrldnprzqrxaz67jb5cv6vndg8flbkagvp0s7mnw56x"; - name = "libkdcraw-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/libkdcraw-18.08.1.tar.xz"; + sha256 = "0fp01s9fw3m9li5v8cd2zmvy6xrysdqddzcal1xm5df2qj6xnk1d"; + name = "libkdcraw-18.08.1.tar.xz"; }; }; libkdegames = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/libkdegames-18.08.0.tar.xz"; - sha256 = "1jl3snqyg3p3l4hddg7ag2mkgi49qvzml8p82zdn3sf5fhka1g70"; - name = "libkdegames-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/libkdegames-18.08.1.tar.xz"; + sha256 = "05xqmg0g08gd45d1q1wblyj5002fvcs72iazif6j7lj9zy60x3qw"; + name = "libkdegames-18.08.1.tar.xz"; }; }; libkdepim = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/libkdepim-18.08.0.tar.xz"; - sha256 = "1gfwfmr5iqkwb490d3mm32892q47pc73b6c8zygm7mn5cjb5376l"; - name = "libkdepim-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/libkdepim-18.08.1.tar.xz"; + sha256 = "0rq7y5r15d1r8s9v1mip780xyh11011j1w2id0cbll9a3fhjfgy9"; + name = "libkdepim-18.08.1.tar.xz"; }; }; libkeduvocdocument = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/libkeduvocdocument-18.08.0.tar.xz"; - sha256 = "1i5vmjfczd71654cpxd11djwk852aqg5lkn98pa8qvjy7v85jynn"; - name = "libkeduvocdocument-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/libkeduvocdocument-18.08.1.tar.xz"; + sha256 = "1nchaip5rcgvazbn3bsiycsa5wcvqj3c0xz48isaz1rmirw4dkan"; + name = "libkeduvocdocument-18.08.1.tar.xz"; }; }; libkexiv2 = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/libkexiv2-18.08.0.tar.xz"; - sha256 = "0cdh5wd2lvm9m4nyz2yv5ksszk1pc8ajzwq9c467m74lvb1p2had"; - name = "libkexiv2-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/libkexiv2-18.08.1.tar.xz"; + sha256 = "0v0g626hjpksb8kxgp0kzx84a6hf3qq66if2hxh82kis5xdzbj4l"; + name = "libkexiv2-18.08.1.tar.xz"; }; }; libkgapi = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/libkgapi-18.08.0.tar.xz"; - sha256 = "1aax7djyp1104b8sbrpfhf5c8j30g3hac973lpblfqg0yhkd9lw0"; - name = "libkgapi-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/libkgapi-18.08.1.tar.xz"; + sha256 = "0rsfk8n4z67m371vnglin16l33ankv0i60l07c8znr7jllkyzf7r"; + name = "libkgapi-18.08.1.tar.xz"; }; }; libkgeomap = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/libkgeomap-18.08.0.tar.xz"; - sha256 = "00hjz7amg2rf5s74465s44ac6kd33q4mvsa9ynpljisll5avlhan"; - name = "libkgeomap-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/libkgeomap-18.08.1.tar.xz"; + sha256 = "1mnf43bpklyxh1schphndc7izknnzn3ymwppq4anysb9k603s7n4"; + name = "libkgeomap-18.08.1.tar.xz"; }; }; libkipi = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/libkipi-18.08.0.tar.xz"; - sha256 = "1g34ryzr4vx5657c4j4w3b57n5ir6miwp1k60qk7av73qsik7a7d"; - name = "libkipi-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/libkipi-18.08.1.tar.xz"; + sha256 = "166njf2w6qy30xiccagnpsb7ggcvqmdkp1djahfwmvjwqqxqq9ic"; + name = "libkipi-18.08.1.tar.xz"; }; }; libkleo = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/libkleo-18.08.0.tar.xz"; - sha256 = "0vscfz794yp9hnrn4r4phbip2mqi3jvi41m5mpjd5pw11644d66c"; - name = "libkleo-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/libkleo-18.08.1.tar.xz"; + sha256 = "1q1s335rmh2k2hmx4k67ik9wy2wa4n271fv21k6sg0l3h58z3fc6"; + name = "libkleo-18.08.1.tar.xz"; }; }; libkmahjongg = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/libkmahjongg-18.08.0.tar.xz"; - sha256 = "0xzv7vawwq0gm10h9mfrsy5m5zpk1n3s338al0h9vskvhznphy83"; - name = "libkmahjongg-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/libkmahjongg-18.08.1.tar.xz"; + sha256 = "0vvmm0mp2s5bl28vn7nq49b3izfy1myxx7c55qq6h3pmml70alp9"; + name = "libkmahjongg-18.08.1.tar.xz"; }; }; libkomparediff2 = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/libkomparediff2-18.08.0.tar.xz"; - sha256 = "0nx66198vn6zrv012i4p2ghc2slxqccfb3fhd9zszzpnyd08zs27"; - name = "libkomparediff2-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/libkomparediff2-18.08.1.tar.xz"; + sha256 = "114w3xcd31i0y5fk4cr9d075mmvx746hsnm6grc8mkhi6diplxs1"; + name = "libkomparediff2-18.08.1.tar.xz"; }; }; libksane = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/libksane-18.08.0.tar.xz"; - sha256 = "09wx6haaw0rjcjdh2c05b2zrpz57zlhx9x9jy9hw28byrf71i0k0"; - name = "libksane-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/libksane-18.08.1.tar.xz"; + sha256 = "0vi0kph8klnm3br9f9ifs5zgnncw83wrvk3kmxc412i28216qgf1"; + name = "libksane-18.08.1.tar.xz"; }; }; libksieve = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/libksieve-18.08.0.tar.xz"; - sha256 = "0xnjw2q1hlmrlzdi776459v5w3l88bxpzzpqc93xmq39xh7xqq7b"; - name = "libksieve-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/libksieve-18.08.1.tar.xz"; + sha256 = "06agi9wkj455sx0inn6hiahmqlfjaa3ffr8i7zfs2rfzw78qvg20"; + name = "libksieve-18.08.1.tar.xz"; }; }; lokalize = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/lokalize-18.08.0.tar.xz"; - sha256 = "17h634abxzg3kx182qxdx6gyz0knl61yn32nlf76l0cv0bqc2xz5"; - name = "lokalize-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/lokalize-18.08.1.tar.xz"; + sha256 = "1k5vn3jnvqvdc4bn1hdfjjp3snfcpc5i3925kns760vpvdm4a9in"; + name = "lokalize-18.08.1.tar.xz"; }; }; lskat = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/lskat-18.08.0.tar.xz"; - sha256 = "05ckhh8270hjj94ks9zg6pypa2dm1d2r4l219gq456rrhyj9zv13"; - name = "lskat-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/lskat-18.08.1.tar.xz"; + sha256 = "11snjlsmcsh4nkcfdzjdl0jia8g350xj2hgilqk5b9jir0j8rsyp"; + name = "lskat-18.08.1.tar.xz"; }; }; mailcommon = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/mailcommon-18.08.0.tar.xz"; - sha256 = "06j66326wbvgnmacmbhvszbhdcw6h3pzxwcnbbz66n0zz2y4m5gd"; - name = "mailcommon-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/mailcommon-18.08.1.tar.xz"; + sha256 = "1791ph0r5b9a0k2qgjrbxsz8drg23v5bdn832d695yy9q9rgxvwx"; + name = "mailcommon-18.08.1.tar.xz"; }; }; mailimporter = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/mailimporter-18.08.0.tar.xz"; - sha256 = "0gywzd882mkjf9q07wg2hi4js4gqvyjxf3y0lgq22k5bd5gpfxbs"; - name = "mailimporter-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/mailimporter-18.08.1.tar.xz"; + sha256 = "1rnmhfi54a9vlmvqjv2hsj967q886dkbv6nqn5imz11s8a97anb9"; + name = "mailimporter-18.08.1.tar.xz"; }; }; marble = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/marble-18.08.0.tar.xz"; - sha256 = "1ylcdnf0rw0a51jcy183p9xcir4j7jlm6dmhk4k13zvzv16pcwvf"; - name = "marble-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/marble-18.08.1.tar.xz"; + sha256 = "1vc6l68fvqdncvpmd8995v4hawi4w4zn3yjfpnghgvmvs30bak4p"; + name = "marble-18.08.1.tar.xz"; }; }; mbox-importer = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/mbox-importer-18.08.0.tar.xz"; - sha256 = "08n46q2xxvjbbcr4754x7qw4p3yffmrpvzxi7k2i48ifxhs2awqj"; - name = "mbox-importer-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/mbox-importer-18.08.1.tar.xz"; + sha256 = "1sqn11404xc9k76kz9zmm526dkzlk1ywnf15128plvyj6576wwaq"; + name = "mbox-importer-18.08.1.tar.xz"; }; }; messagelib = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/messagelib-18.08.0.tar.xz"; - sha256 = "0d1bb0n9izwlk9fbwyf1hvwkrng1b6im574fxpkgk73ivb72ppfx"; - name = "messagelib-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/messagelib-18.08.1.tar.xz"; + sha256 = "17z8c60dnhwzgpls3b6hsvyjgjpjybw7cfkc05xn1yihi5gr2rxs"; + name = "messagelib-18.08.1.tar.xz"; }; }; minuet = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/minuet-18.08.0.tar.xz"; - sha256 = "0gvla9ig912wrg6vvdmqv2hyybr08a45crx69l31hcd13h9pmyg6"; - name = "minuet-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/minuet-18.08.1.tar.xz"; + sha256 = "06jwrra25v2al0jw7dvp7h41jmw48d784ky74xi9lx4ma4h4vsvg"; + name = "minuet-18.08.1.tar.xz"; }; }; okular = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/okular-18.08.0.tar.xz"; - sha256 = "11wwh0vb1l2dw2zhcg6f92y7vb5i5kaqwi8kszz8sd874ydpp8pn"; - name = "okular-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/okular-18.08.1.tar.xz"; + sha256 = "1in053a3ir4qw2fabrv69g6kxr2hmdwq360kikmwdgsb6a7a8sjk"; + name = "okular-18.08.1.tar.xz"; }; }; palapeli = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/palapeli-18.08.0.tar.xz"; - sha256 = "1a1k44q62raw1kxkyg8cspvwxzr1islbwzcb7sj63cmzsmwfhkg1"; - name = "palapeli-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/palapeli-18.08.1.tar.xz"; + sha256 = "17c6xlmjz8nnnvp4xa27yzrx2vrsjlznjm2awj70z923js5kzfhl"; + name = "palapeli-18.08.1.tar.xz"; }; }; parley = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/parley-18.08.0.tar.xz"; - sha256 = "1cy58fs1jaz1zga4dwfr80m0p6cgzc5ip26ds2x2lpygx7pbjcc6"; - name = "parley-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/parley-18.08.1.tar.xz"; + sha256 = "1bwj806qm2g3n57f1svaz6x5y238xl0b3pmp4cg29a9c090gcj0r"; + name = "parley-18.08.1.tar.xz"; }; }; picmi = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/picmi-18.08.0.tar.xz"; - sha256 = "1x2ya0vwxwc56rfskl3l83nw0vpdh1lzshh0sdal3rfw0s8w895x"; - name = "picmi-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/picmi-18.08.1.tar.xz"; + sha256 = "0bc3zs5ql1yfriq3pbxc0cb010n8rygqglpz8c2qinnsgf9wb305"; + name = "picmi-18.08.1.tar.xz"; }; }; pimcommon = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/pimcommon-18.08.0.tar.xz"; - sha256 = "1j6pj7f52ya0jgzq97g65zl3mpv7hn002flv35qlg5srzdllm3pd"; - name = "pimcommon-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/pimcommon-18.08.1.tar.xz"; + sha256 = "0h8g374bdnf9nm43flz9wg1ddcdppqxng1vq58vqlviiy32qf86p"; + name = "pimcommon-18.08.1.tar.xz"; }; }; pim-data-exporter = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/pim-data-exporter-18.08.0.tar.xz"; - sha256 = "1spbkwv9kqzky958nymr5plz8rgzxbn6xzgy7k9pkpvynd1a54hz"; - name = "pim-data-exporter-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/pim-data-exporter-18.08.1.tar.xz"; + sha256 = "01spb3lfs3rsl1h6d6lrszssj1rnbv1p21np75x4rm7qxzdn7wy7"; + name = "pim-data-exporter-18.08.1.tar.xz"; }; }; pim-sieve-editor = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/pim-sieve-editor-18.08.0.tar.xz"; - sha256 = "0nqv530rlamlngxwy3cpbyjj75akx3k9lcifgymlbm4ipp9k125c"; - name = "pim-sieve-editor-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/pim-sieve-editor-18.08.1.tar.xz"; + sha256 = "09npw10dgzk7z3022d1np4qvmbwb07lxjj2nd4k1hxnkcjaz242d"; + name = "pim-sieve-editor-18.08.1.tar.xz"; }; }; poxml = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/poxml-18.08.0.tar.xz"; - sha256 = "04sy8v3n12asz8hfh107y5irhxzlpkzgc3zjw8qfygflzg9a48cz"; - name = "poxml-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/poxml-18.08.1.tar.xz"; + sha256 = "1zazxxh4j8ihlb5v33b5wgj4ddqqhd809lzhxq28dq0mg7wvqcm8"; + name = "poxml-18.08.1.tar.xz"; }; }; print-manager = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/print-manager-18.08.0.tar.xz"; - sha256 = "1mi2aqsh5irlnlgkajkkxhazyafhpndrxckcc2kmrh00d4cxhivn"; - name = "print-manager-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/print-manager-18.08.1.tar.xz"; + sha256 = "0ixamp14m3p13j1c6nc9x6043600k2anfw12mn1yg4f8q5fb6dnf"; + name = "print-manager-18.08.1.tar.xz"; }; }; rocs = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/rocs-18.08.0.tar.xz"; - sha256 = "1c3i11mg6xs64wjyph51hqr6j428hh71ljdq4ajhysql7l5kbhhx"; - name = "rocs-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/rocs-18.08.1.tar.xz"; + sha256 = "1kchipj3q29zfp60l81q52m6gb4fcmawcl42rvzr4mxf4h7dw72n"; + name = "rocs-18.08.1.tar.xz"; }; }; signon-kwallet-extension = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/signon-kwallet-extension-18.08.0.tar.xz"; - sha256 = "024ay0z9inbf7k54iq5v78cxh4q8x1ypvd8r3w80dyygjw2dw743"; - name = "signon-kwallet-extension-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/signon-kwallet-extension-18.08.1.tar.xz"; + sha256 = "1wf9xffjxyqn5vwwnp4wbn22lby5vc396snc3imdp1bx4z5ffck4"; + name = "signon-kwallet-extension-18.08.1.tar.xz"; }; }; spectacle = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/spectacle-18.08.0.tar.xz"; - sha256 = "1gc2qza529jld1zngzs98zmd3734h13phviswqpg93qnbr9hxskr"; - name = "spectacle-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/spectacle-18.08.1.tar.xz"; + sha256 = "0xvw6l0712gmb3dvq9hnyp7r160rvmvmm3mvgapj4z5c00m8a1d7"; + name = "spectacle-18.08.1.tar.xz"; }; }; step = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/step-18.08.0.tar.xz"; - sha256 = "15hjbisv3adsn0vavlcl3iy3vz6mf1fv0qj4ykmxckblcyhm1mgg"; - name = "step-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/step-18.08.1.tar.xz"; + sha256 = "1b7cvrhdbfkqg72phbgbl15v8c4nr6b1b9fw8i1vam028a97bq8z"; + name = "step-18.08.1.tar.xz"; }; }; svgpart = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/svgpart-18.08.0.tar.xz"; - sha256 = "0q71nn1xsdh7ag60szl836lif9ywnv3dlv8w0sn3zfa7yv0cbraa"; - name = "svgpart-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/svgpart-18.08.1.tar.xz"; + sha256 = "07mm5vzd5lslr5x7r71ac3hp3s779i89nz4d84550pk0qdn3qpmb"; + name = "svgpart-18.08.1.tar.xz"; }; }; sweeper = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/sweeper-18.08.0.tar.xz"; - sha256 = "1j87cb9bbfn42f2xn9k6j8ailgn18b5ribjf4sgglx2h1l3vpq51"; - name = "sweeper-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/sweeper-18.08.1.tar.xz"; + sha256 = "1vmdk38j03qj0l5gc27dc242j0cj7k2c5zfq2xrvjb44rxfirdy4"; + name = "sweeper-18.08.1.tar.xz"; }; }; syndication = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/syndication-18.08.0.tar.xz"; - sha256 = "17j3ks7bmr3p71lvrm8bzbfai5sw3frwrwl0ckbg1rwhkbsi3d71"; - name = "syndication-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/syndication-18.08.1.tar.xz"; + sha256 = "0lirbr8zb1j5kalki6v98wmcg5z25xj1wamszd81h9wlkgk5aqd0"; + name = "syndication-18.08.1.tar.xz"; }; }; umbrello = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/umbrello-18.08.0.tar.xz"; - sha256 = "0rs92l6disjha8w5nx05qjbidib4a9yyab7f4cd4sjnjfcw3i1px"; - name = "umbrello-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/umbrello-18.08.1.tar.xz"; + sha256 = "16p283jz5v5j40i1i7c9fk36bhs2k30rk17l3nikmf0qd7j5n6ir"; + name = "umbrello-18.08.1.tar.xz"; }; }; zeroconf-ioslave = { - version = "18.08.0"; + version = "18.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/18.08.0/src/zeroconf-ioslave-18.08.0.tar.xz"; - sha256 = "05j8k8la4gcydazzhhxq8700w1l4q57yylcar1wzs108icp03rkm"; - name = "zeroconf-ioslave-18.08.0.tar.xz"; + url = "${mirror}/stable/applications/18.08.1/src/zeroconf-ioslave-18.08.1.tar.xz"; + sha256 = "0m1yhm17chz49xs6nh1n8dqdkbnr8kkig9p2f9nmvypnfagygpsi"; + name = "zeroconf-ioslave-18.08.1.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 35698a323319..77cad142d41d 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "5.1.6"; + version = "5.2.0"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "1zypadnyhinm6mfv91s7zs2s55bhzgkqhl6ai6x3yqwhvayc02nn"; + sha256 = "13j2qc4g24d2gmkxj9zpqrcbai9aq8rassrq3c9mp9ir6sf4q0jf"; }; installPhase = '' diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index e753c5ded95c..fc10bc852e5c 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 = "14066"; + version = "14178"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "06mhaz5vr19ydqc5irhgcbl0s8fifwvaq60iz2nsnlxb1pw89xia"; + sha256 = "08an4s8vbcd8vyinnvd7cxmgnrsy47j78a94nk6vq244gp7v5n0r"; }; buildInputs = [ jre10 makeWrapper ]; diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index ede85aeada5a..f9c929c21bfb 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -46,6 +46,10 @@ in with python.pkgs; buildPythonApplication rec { nativeBuildInputs = [ setuptools_scm pkgs.glibcLocales ]; checkInputs = [ pytest ]; + postInstall = '' + install -D misc/__khal $out/share/zsh/site-functions/__khal + ''; + checkPhase = '' py.test ''; diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix index 72cb1e85802a..948ae7b14a11 100644 --- a/pkgs/applications/misc/lilyterm/default.nix +++ b/pkgs/applications/misc/lilyterm/default.nix @@ -1,13 +1,12 @@ -{ stdenv, fetchurl, fetchFromGitHub +{ stdenv, lib, fetchurl, fetchFromGitHub , pkgconfig , autoconf, automake, intltool, gettext , gtk, vte -# "stable" or "git" , flavour ? "stable" }: -assert flavour == "stable" || flavour == "git"; +assert lib.assertOneOf "flavour" flavour [ "stable" "git" ]; let stuff = diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index b6ec3305cb3a..3ff07ba20084 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -2,11 +2,11 @@ , desktop-file-utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "18.05"; + version = "18.08"; name = "mediainfo-gui-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "0rgsfplisf729n1j3fyg82wpw88aahisrddn5wq9yx8hz6m96h6r"; + sha256 = "0l4bhrgwfn3da6cr0jz5vs17sk7k0bc26nk7hymv04xifns5999n"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index 5b2f8125f72c..d222ad1e53e0 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 = "18.05"; + version = "18.08"; name = "mediainfo-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "0rgsfplisf729n1j3fyg82wpw88aahisrddn5wq9yx8hz6m96h6r"; + sha256 = "0l4bhrgwfn3da6cr0jz5vs17sk7k0bc26nk7hymv04xifns5999n"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 33b8c33033ea..6d883d89de31 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -7,13 +7,13 @@ assert imagePreviewSupport -> w3m != null; python3Packages.buildPythonApplication rec { name = "ranger-${version}"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "ranger"; repo = "ranger"; rev = "v${version}"; - sha256= "1zhds37j1scxa9b183qbrjwxqldrdk581c5xiy81vg17sndb1kqj"; + sha256= "1ws6g8z1m1hfp8bv4msvbaa9f7948p687jmc8h69yib4jkv3qyax"; }; checkInputs = with python3Packages; [ pytest ]; @@ -51,6 +51,6 @@ python3Packages.buildPythonApplication rec { homepage = http://ranger.github.io/; license = licenses.gpl3; platforms = platforms.unix; - maintainers = [ maintainers.magnetophon ]; + maintainers = [ maintainers.toonn maintainers.magnetophon ]; }; } diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix index cc676bb28e2e..ba4984a0f155 100644 --- a/pkgs/applications/misc/sequeler/default.nix +++ b/pkgs/applications/misc/sequeler/default.nix @@ -4,7 +4,7 @@ let - version = "0.6.0"; + version = "0.6.1"; sqlGda = libgda.override { mysqlSupport = true; postgresSupport = true; @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { owner = "Alecaddd"; repo = "sequeler"; rev = "v${version}"; - sha256 = "04x3fg665201g3zy66sicfna4vac4n1pmrahbra90gvfzaia1cai"; + sha256 = "1gafd8bmwpby7gjzfr7q25rrdmyh1f175fxc1yrcr5nplfyzwfnb"; }; nativeBuildInputs = [ meson ninja pkgconfig vala gobjectIntrospection gettext wrapGAppsHook python3 desktop-file-utils ]; diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix index afe944e868e7..e26071dd3612 100644 --- a/pkgs/applications/misc/solaar/default.nix +++ b/pkgs/applications/misc/solaar/default.nix @@ -1,5 +1,5 @@ -{fetchFromGitHub, stdenv, gtk3, python34Packages, gobjectIntrospection}: -python34Packages.buildPythonApplication rec { +{fetchFromGitHub, stdenv, gtk3, pythonPackages, gobjectIntrospection}: +pythonPackages.buildPythonApplication rec { name = "solaar-unstable-${version}"; version = "2018-02-02"; namePrefix = ""; @@ -10,7 +10,7 @@ python34Packages.buildPythonApplication rec { sha256 = "0zy5vmjzdybnjf0mpp8rny11sc43gmm8172svsm9s51h7x0v83y3"; }; - propagatedBuildInputs = [python34Packages.pygobject3 python34Packages.pyudev gobjectIntrospection gtk3]; + propagatedBuildInputs = [pythonPackages.pygobject3 pythonPackages.pyudev gobjectIntrospection gtk3]; postInstall = '' wrapProgram "$out/bin/solaar" \ --prefix PYTHONPATH : "$PYTHONPATH" \ diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index ebc700a7f37c..6b9f7225c84f 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -1,4 +1,4 @@ -{ stdenv, ninja, which, nodejs, fetchurl, fetchpatch, gnutar +{ stdenv, gn, ninja, which, nodejs, fetchurl, fetchpatch, gnutar # default dependencies , bzip2, flac, speex, libopus @@ -139,11 +139,6 @@ let # (gentooPatch "" "0000000000000000000000000000000000000000000000000000000000000000") ./patches/fix-freetype.patch ./patches/nix_plugin_paths_68.patch - ] ++ optionals (versionRange "68" "69") [ - ./patches/remove-webp-include-68.patch - (githubPatch "4d10424f9e2a06978cdd6cdf5403fcaef18e49fc" "11la1jycmr5b5rw89mzcdwznmd2qh28sghvz9klr1qhmsmw1vzjc") - (githubPatch "56cb5f7da1025f6db869e840ed34d3b98b9ab899" "04mp5r1yvdvdx6m12g3lw3z51bzh7m3gr73mhblkn4wxdbvi3dcs") - ] ++ optionals (versionAtLeast version "69") [ ./patches/remove-webp-include-69.patch ] ++ optional enableWideVine ./patches/widevine.patch; @@ -243,15 +238,11 @@ let configurePhase = '' runHook preConfigure - # Build gn - python tools/gn/bootstrap/bootstrap.py -v -s --no-clean - PATH="$PWD/out/Release:$PATH" - # This is to ensure expansion of $out. libExecPath="${libExecPath}" python build/linux/unbundle/replace_gn_files.py \ --system-libraries ${toString gnSystemLibraries} - gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt + ${gn}/bin/gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt # Fail if `gn gen` contains a WARNING. grep -o WARNING gn-gen-outputs.txt && echo "Found gn WARNING, exiting nix build" && exit 1 diff --git a/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-68.patch b/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-68.patch deleted file mode 100644 index 1995bf1fa8f5..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-68.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/third_party/blink/renderer/platform/image-encoders/image_encoder.h -+++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.h -@@ -8,7 +8,7 @@ - #include "third_party/blink/renderer/platform/platform_export.h" - #include "third_party/blink/renderer/platform/wtf/vector.h" - #include "third_party/libjpeg/jpeglib.h" // for JPEG_MAX_DIMENSION --#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION -+#define WEBP_MAX_DIMENSION 16383 - #include "third_party/skia/include/core/SkStream.h" - #include "third_party/skia/include/encode/SkJpegEncoder.h" - #include "third_party/skia/include/encode/SkPngEncoder.h" - diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 89b6a7ce3121..ebf730129079 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 = "0w5k1446j45796vj8p6kv5cdrkrxyr7rh8d8vavplfldbvg36bdw"; - sha256bin64 = "0a7gmbcps3b85rhwgrvg41m9db2n3igwr4hncm7kcqnq5hr60v8s"; - version = "69.0.3497.32"; + sha256 = "0i3iz6c05ykqxbq58sx954nky0gd0schl7ik2r56p3jqsk8cfnhn"; + sha256bin64 = "03k5y1nyzx26mxwxmdijkl2kj49vm5vhbxhakfxxjg3r1v0rsqrs"; + version = "69.0.3497.81"; }; dev = { - sha256 = "15gk2jbjv3iy4hg4xm1f66x5jqfqh9f98wfzrcsd5ix3ki3f9g3c"; - sha256bin64 = "1lir6q31dnjsbrz99bfx74r5j6f0c1a443ky1k0idbx6ysvr8nnm"; - version = "70.0.3521.2"; + sha256 = "1lx6dfd6w675b4kyrci8ikc8rfmjc1aqmm7bimxp3h4p97j5wml1"; + sha256bin64 = "0fsxj9h25glp3akw0x2rc488w5zr5v5yvl6ry7fy8w70fqgynffj"; + version = "70.0.3538.9"; }; stable = { - sha256 = "1676y2axl5ihvv8jid2i9wp4i4awxzij5nwvd5zx98506l3088bh"; - sha256bin64 = "0d352maw1630g0hns3c0g0n95bp5iqh7nzs8bnv48kxz87snmpdj"; - version = "68.0.3440.106"; + sha256 = "0i3iz6c05ykqxbq58sx954nky0gd0schl7ik2r56p3jqsk8cfnhn"; + sha256bin64 = "1f3shb85jynxq37vjxxkkxrjayqgvpss1zws5i28x6i9nygfzay7"; + version = "69.0.3497.81"; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 13808fca99fe..594cf175e9eb 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,985 +1,995 @@ { - version = "61.0.2"; + version = "62.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ach/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ach/firefox-62.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "572696944414358a50dcf8e647f22f4d3172bf5ac846cd29bcb4baeb0ac5a351f361632ee87dacc1214633848f9970f93cbb25a6e9cfbd9ee796e30e06f34715"; + sha512 = "68a0802cccd72ffd36bc9188fb96b819b6357b889630173294f92af4dcf719389d678232b986ff6aeb258d2cd149d670d70c2bc90309dc61fb359b1d3011cc6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/af/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/af/firefox-62.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "dc4b22a8df99c3519f3a8001d0bdbcfdf4fc5d4dd13d18bd15892fb29e928126d46e2ccb9b512dca0c5395852a3c918a5aacd2b9a7b7f2cdb982052e915d5413"; + sha512 = "afdb463bc4bb5f0f3ba95a0af9430d5407a707b7cdd181c44ba0d343230d75e16a3078bc1f412dce8248991b8e752480be885355e394c1e4a4465c7c1929075e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/an/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/an/firefox-62.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "2d57784a18278bac69c08e81fafbdc3530d17a112d3f1e7d407e2590935c87058641498c74300950d3f151bf5fd67065133d91c83e1e500c72b60ebc91a4572d"; + sha512 = "c54b5365a97c44559aeac1c50a5d22250eabb94180987e3745bc875e7f2d7a843fd1282946cf5f27e53f4e0e6958a00376e6f761333e9bd5fd9ae7f6c081e1a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ar/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ar/firefox-62.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "e397f8d276c115105afcbab6fb71afd7bcc93778e79ec86a4274e10a6a039ad3107cbaabc9dd4bd197ce6be7add3cc0af954f029c179a6972ad2ba15ff2e3eb9"; + sha512 = "08d5c5aefa22408c15a44646ef1b82ec3100a8bd69beb68a1d34029d2b0b554e110092ea5ee905bd866393cf506cd658591bba2e6f670943b21187015d99a836"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/as/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/as/firefox-62.0.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "9869e76e004c1e77d976f01f9a4cafe29c253ad3c85b1119d67a65c784b5f65dd7a4927ccd535ee80fd63a6a47127e614478effbd0455a227e200ca31c846acb"; + sha512 = "c403ca739506adc934e3453bff0e282ed514580895dcab70d41ac92499feabaa0d811a821b4441b988a3c12320735794d891620e06c8f081f13882f3bb6a56e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ast/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ast/firefox-62.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "5b298cce253df9c8a072fdc93df894fdb4218c720ded3260f282c711270086104eca08e2d5afe1be4960beb274017eb4e0ae7313ceb5d6e596d0591f026f78fc"; + sha512 = "8d0e1c648c9eb8ddf8987360be83238eb6daf578f090687071ad5a63ff76028ebb4a988115a8ff9f7c40dc3522f06b4f79626f2ec8371040c76501457b93bcc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/az/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/az/firefox-62.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "cd8df2a19e10d5445ac0970814ad245e25f6ea695ec9590344c1a4e261b6fd7d15534028f6a8abf1943fb97f0e127ed55774e2cc2bf7cf85be525503bbb69f1e"; + sha512 = "2cc58aa3833572ae3a97e0d2b70caf19f5429d360da8d3587399a3ef71b48bd1565b0a6eb560c032c45984930e74ad072ca6806686a18cbd7a0ee24805524a64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/be/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/be/firefox-62.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "94947ee7b7477b467016cd21daa8134bf28ab289ea29c0905e04291b7560da895124be2ab7403d2b9874291b7e33f5a92d36f9c0ed9d58ccc3306ecd7723305c"; + sha512 = "fa196010cf483c3f8a4bf63934cb54f543fd00bf8cee45d76aac29675a2b95757f687f8584e7f9122fa1e82b007aa13ef06f0c8fed7dcdea059223f3607db0ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/bg/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/bg/firefox-62.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "9b0bce62c85282c79708245fa792207dccd7bf939ebc23ddb2e6bb7bc3f6fdbfdeecf69d1ba599b2ec8d10fe2d79bab5dd229cf9fa7b79e076797267df39c54b"; + sha512 = "e0f107ab8248ee3e1bdb30ed081e415f03dba9068599f9596706dc4fb907be7737a9f2378e347aeedd667f2526a5b5753c4f35b004da6db6dfc9ca1593e9c91e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/bn-BD/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/bn-BD/firefox-62.0.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "4de95899462eafed03464fd054b7ee12cf53d004fbcb58ad18bd462e57f5c50c31d3b50f689a7d54f973228a2877e6c77c47740280daf7d6db4f7ba5988b9484"; + sha512 = "794d93fa5bc61186b3cc1d7866a13d155420d6f829e9b20377c8bd8ed66418b92eac08e843170893a23249fefd7fb4c5a93df89fc9249b8de00ad803b9aad0ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/bn-IN/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/bn-IN/firefox-62.0.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "2ecbf2ae7d1296dcfd6e2268dbc27060ce07bb4b3d9d62f6bf27fc8874f114dfcca73672adb4d411d2c1eca7ffac22f7832bc5cdad12a492c3bc4406e3a6746a"; + sha512 = "1ba17cf852e267f1adf9192d0081e03b7d96f4a23cb83ff1a67f31d7340b234037a6def0c821fb4a872fd011999b14b464a3041d308cf5135382c2164f9832c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/br/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/br/firefox-62.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "a92abcb1aaec11ae3b0eee75b5b5610157f8ca64627a20018925431ac09cc4295d14357e63ea0fa2b66bb415039c659f53292b8133558d591a16cbb5772f875f"; + sha512 = "7ff933244cabb95fbdad1a64ae900f6fd694dacf1d76621865b4a2066624c31f0686c4dff53add7523749d6f5befe6ec7bbf0160e426e1a02457f8d3d5e15016"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/bs/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/bs/firefox-62.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "15dda8914e02198a9b6efdf0ba9dd4f37e41ec7c6674b8b32189ccc368ab6ee671e401cd668c5ed57157634220c176be543c277342e708baf7b0110cbbb4fe64"; + sha512 = "dfd9a7b8f2f355f274dca7941349512339aeaa9da4412681a4e933cf0e1e9396d57d60887fca59c341e70496dd7073647794fbb4c8bcd1abd7b5062ee6809b53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ca/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ca/firefox-62.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "230591cd45dd9d3644313b96ea304d33e9c87d6968c37b73ac3c701132bf13a3869672317b135f31d8082f39298c978c07d614f5055555ba9079afc6e17a489e"; + sha512 = "3785649ca22ab7882f751d0c2223589b7c8b5fa04bb0786ba5f64be405ba89a665244e7f4882d77a85569c46da9f6bc1d3fc95f0ff77e57f02cb8a7dc22f5b67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/cak/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/cak/firefox-62.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "c622e622cc199b8a9946276afdf03f006403bd302d2c62a5076403e6764dfdcd121c1e15fc56d45bdb1751131326babdc9be96e6425fcab9e55d6c689e5959ca"; + sha512 = "e367d02bf8c743f7a5c42b6ca19521813ba31f6a6525f4fbd4ecf418c9927a083d218ded1ae8b11084d4cc5707f97312b327a40735d638e1d3ea07056dce7070"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/cs/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/cs/firefox-62.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "8e4d452a75befcb6c2a6e7ed0b4b1aaa8f18d4d61302ddf6b8143e024352a060621c375742748db5981efecb8075268f56811702586189a116698a669408dee2"; + sha512 = "cfa21baf935d6e325b6ea13d19796ae7adb51bfa6923f7f13e5138628f8064154bbfc5a4a0131a147383b2bf723e1abc46a79b698b2682602faa9a8f80b5e6cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/cy/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/cy/firefox-62.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "349f73f43be8dad527549ff158b267c62be7c0d828c2adcfc635e419ac9840076549a7a51396b306bc042d1d7697c8d6caea3bf0b4e3f42e7c0efbd5b8d92e1e"; + sha512 = "0a9ad3a8ba02b863194fe4ba347be568fdb92bd72352251220f673349b77ebdb2b2c6e828e98c1c757fe3d4484783528e5f0129ae994a2f0226a17040a2f8c7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/da/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/da/firefox-62.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "187bec61e1218fa6c2fe79b3e80066a617ee3c26f83aa16b61a21e3fc76a64c2c821120f9206240642dd10175b6976c352b13a5b2e5514126a3840524fdd1de6"; + sha512 = "21ce01d959f36084dacdcd52cd26440a67e724c79361ed1897371fe4b33a853c72fc4feec6fee446ef47c1ce29c4a88392266bfca08189f1d99127ca637b8be1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/de/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/de/firefox-62.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "8aaa8aeecf1a2dff922b785ed3a4cbf248454cf010ea9c188a4ac70f0550813944a8e9265c2edb13bdbdfbe20ec5a0dda3168d2dcd529d082bafcfaef6271913"; + sha512 = "cae69bd2193db9888ed3a415ed7147dc3002c05029a6cf3e7a010259919dfb0f209055b20e259459f008b99317a215cf6962ab173fac0f1e57c86341571d0eae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/dsb/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/dsb/firefox-62.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "c821eae950e48de43580c9dd4af7fc609927e3fd27ea876fca909bb3319574663120688e442ba83acf1d273e1fd22a87d0cd934e68151edd9a8561015e58a47c"; + sha512 = "4583f05b675973a2818b06baf771474b7bff9ec741c2e606cce13f6e4b153f92fadfb0c15d91c4a25d492a38fc3c48180cb6c7ea5e433aa774a9fffe26f4e593"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/el/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/el/firefox-62.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "afa286bd1ac48a6007b6e5072bce0a26482a0eefdb00aee824de8c4dd06688d16731252933cb71b9f3bf6d30f951c6df68c2ede85733edc81facbb628118c72c"; + sha512 = "4419885f9b6510edbf2797a047a08c97008731ce4fad19cda1fde4ab70b8912c9aa96df533f9b138d843303e549baa30ff9338bd9531b3044bdcc521cff14678"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-GB/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/en-CA/firefox-62.0.tar.bz2"; + locale = "en-CA"; + arch = "linux-x86_64"; + sha512 = "86cf4dda9c21faea5d5031f423c7badb1876b225ad618fa8c1dd49803d65aec1032bedfded3278dc19d84c1f88688cd4ba31a27ad6f706ad55e9b407e3151f9a"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/en-GB/firefox-62.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "c2ca0c9a72503ac5817ed9ff3736b812005037c51534ef9a159b7914b974a356f3f1bc89d0669d05bde8dde124f2fcc3ff3a91cb412ec0329c2e6def875219fc"; + sha512 = "278d00ec48c2d88d3aa5bedbc9443e82f367a2c9f8261f624eef42fcbfb83d74a3f35d6ad450ef3974ca8a19f7e654c93c40c1941264a2372fafdbb803c08f40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-US/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/en-US/firefox-62.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "9f32b33727e5877bfdeb186420a02f185896a2a5803565a811203d86e84d51ede06f27d63a88a482028c36b65ed92ac4c17196aa2069370d6cae09b74bf482a5"; + sha512 = "f4dfc51d6c8f9ccac869691ea4efb0f5fd8257d661698dba4eb7cc9fb7d28314e00a09ec595d424186cc928c8a6f9f93af0efcb3651eaa4fa40f81cfda73770d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-ZA/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/en-ZA/firefox-62.0.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "e41b7ea34f193bbcd892030b5feb2f117bb5f3f9dfbe69560ea64b7936bcdc47a55e878c645786999a2e52c4333c033320eb1ed9aace3481a9f37d87c9ae9ccb"; + sha512 = "f6036fe984da3057e76d324c76a2cfb17903d73f3e6bc7884338bb0ef0f9f68ef69e94ee93331f81e17a8eacc40827263c74e5aeb9a70420c7cf0670a205c61c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/eo/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/eo/firefox-62.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "e0850feb028cf0644340d2842b054e49608cdc1afbb9487ee744f6fe1ce0662874f0f96de2da52de2e0abbe39d7ea430efc70392d555e7cbff7a46f9029ba9fd"; + sha512 = "011a742e57cdc2134115ea294782716bdc49ac4d2d7b06bfed048f75d18a5780cb93a16cd0ec6b8017e6b8299a5b260015adfcb3f093883703ed9403768555f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/es-AR/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/es-AR/firefox-62.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "72bde05493e4c140f6022e24cccf0ca580ed3c423840d2631cb28ce8a20be92837f78cfaa3b09a324bbc0fcb064ced351fc66a0edf2c56d972f629aed6662dcb"; + sha512 = "f86be240d21d47eda8bb04ff6b502ccee3c94afd6763239c5a79e094532facb8e8beefdf024c089d35ecffbd687febde5a4f10f362fd3c4d71bdabdc3ef1ce04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/es-CL/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/es-CL/firefox-62.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "4bb298e184263edff9100e1e7f58cbbd405dbc73a265a5dc1d78e8cd25e538d34ef0994b6b5e79082fc12f1c0b2035c944e17eccaa7e1bd92eee8d27d8f50400"; + sha512 = "e6be4bff771e5c64d35fdce320fcd80283c964e16fa938824adfa6dff9c69c721ee9184a1f37de86ac42f730ebc7b4c8355d151306e761bc96308868d6d349a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/es-ES/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/es-ES/firefox-62.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "13d7f54f7899eda53add9dc4a1bc27fd30e0caaa9c5a95d716c1ef8382c2317733cc7a71aba9aa4f2a024717eeb09be7fdd55dbf6183d1679e61e3b57964e61e"; + sha512 = "32473438f9d39f53249faef39e467546db58b3dce905cc1f4c0250b5fcf5ff2eb671baef0ab179b27ea47bd85bc5684f9bd4846c785f2454076035711642a7d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/es-MX/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/es-MX/firefox-62.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "66c24cd9a80da6137a94bf9cf2bad4ad3ef0141bc10c8d92435f9d89e11712afc08018d7e1b4f17fe03e4ac62b2f6ed1cec638dc7d0726bf27453e1741a1ba06"; + sha512 = "e81563bd3cc51241b129f084d4d9f5e8b7f34c1f5517f041bbf6992b50e0ad4fdf33fb36f0d1cc22d2bf9eb0bcbd0515a1b21b5cbb8d084cadd0f5d9d80c7b3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/et/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/et/firefox-62.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "a7a686b1e16b616a3aff8901148a2818cbbe2459851660a23610ddfb4b8109aac159fe80986744bdc4124a10ab160d2703b2e8f65def0c86977bfa3fcb3ab020"; + sha512 = "5827c7dac8e12610e731e92128ed66f8f107c19de99937a730e7439b26dc404cf518145467cb702fb395d9cb3a0f4ad45c92484ffb053d88dc7ac858781f4ed0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/eu/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/eu/firefox-62.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "0760621f5d053fb802a46151f6283fb7a0b7de5c22ba0a55ae0f3056b0d43cf16c6da79af8a2217a665825a840b9c83134128f455dfe6e83f473290e425ad396"; + sha512 = "c59ad7413f47ac19e9cd3a267150066099f561a455913714a18afd1b0e284202364f009cbe0361f5941b96d57b43c3d7d778235c9b9123133f864e75479556da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/fa/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/fa/firefox-62.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "29e8466e754900b63704206b5b650ea60aea841aebfa58187013a495a95dd32d939308253b0f856ef5e04d3ddf320c289e74cb03830a16374e9fe2c03214a1b4"; + sha512 = "fc3a1caac599a418ab0ce2208fa921dd40912e80ff075bf7d90ef64379057e83332483c1a7a44dece95a38be523d0ea2f92a57b45c300f032b174dde4812e5f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ff/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ff/firefox-62.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "240232a8dd4556c5c4df872b60b3352176490b7afd4388c26322008c7dca489f48f679c21d148016965ea81d850eaffe9fb7887b97cbbbac955f9cc29f28b4f6"; + sha512 = "629c2b79571980bfdbf9bece6760d1553cc002f91f26fe46d58d4fa5040f437b6a8b9b6ff41cdcb3d615c479c66a17d87d878fca65025070a31073165098ed26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/fi/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/fi/firefox-62.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "63c7d4ede5e02c9d4b2e59234b57d4f539c0cd3666a053b127cc18d080900bcf488f8d3d7f2dfb98399a1cec5ec6780d86d93ad9dd2ce7612e84604481562a64"; + sha512 = "4393019f9dec44bc62985d84f95585de0a26736a923f873b92d87f7d46d11f8f3e8af53812696ed4d312fad51c3bdd34026cd7ef933fd047f771441245b30213"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/fr/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/fr/firefox-62.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "3a4263e78c62faaab850c743660e633269dd9e625f03f94459b34ede41989cbaf498755fb8c2f507e4f4b88b633c29a3eae837ffce0572ee03afdf67c53d4ed1"; + sha512 = "9d9afd43288fe6719b8d4f76c4542a26dd4b36376abcc8a0d8111c701bf397345451ccec5bc5ed1f2c2927549c62a429d4d97470d850d0c83ef8362c40531f0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/fy-NL/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/fy-NL/firefox-62.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "e8c7760f3f64b4c525bd0521cb66ed11bdd9142deee986fd6a5f6a322685633aa3539f819e3ec886884906998d37dd6401b77e4790a246cd098c47cd49f929d3"; + sha512 = "12050decaa38a27ead08d67130d43ba36666728d3920cf40ad2dc0eb18de6a204e81dfff72cc0a33022b0d96097ec83fb36c88b463707f04669e5c907b8cac15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ga-IE/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ga-IE/firefox-62.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "8f59620f30767cd58babc163b803b2c8b174562e5a6a686c5a586d24db0da4c4ecf180c13673a6a434faee02c2b7ef746c1f10e45055d42327044a945925e514"; + sha512 = "fb028d4b55cb5758eddb89a506b68d322c758d2e8ce01151a30678dd01c4ce625c9a051650a2e115705dbe02967f0db5894a4476d6460ff08313d4767dad9b7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/gd/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/gd/firefox-62.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "ba496ad0daec76e2c6e4f3c2dbb8219d1f3234893acb09602e51b7bfab4ef84d9f49104a021b206ff528bb323e2255c97e92a6949b3949098e5863f48e9fefa7"; + sha512 = "a1173104e4be1fdb6cf3a0c8c997075d40e5eb950dc2482107b5795adb2590575c1c79f50daca87227de6426f4ad9d756233f95a0ddd3aa6e949ab773d319db2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/gl/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/gl/firefox-62.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "3ef33eda5d7a88fb6f67f91983ab2db11404f58686ecbe30dcbc27dd1358660b4c88ab8e678184cdd3fd4102f93120e0d0a4d75435812b047ec2bcb74cb52a83"; + sha512 = "b6b46ec64e4386c9196d1f5362674667e46b5006b756cdc164e6c1c42ebff417c57cacceee949d2e9a5f55c76b82471ed9cfa01cbddd8ab74d6669c6870864d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/gn/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/gn/firefox-62.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "5e86c34b627b66872a7f07e30ee6285e61d041e69b0e2355eec142b23ceac8ea5ef7e257adfd1ae877b442f7171381cb013fddd7593d1b6e42f3a22e2267a5df"; + sha512 = "3c35f52d34d57dfbfe43d8df6be4f04bc10c79b3b9e08949525a503952ebecb90e59d99565c44adf25addff6f713088bce3034513eea3108a37c02b0921e2f01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/gu-IN/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/gu-IN/firefox-62.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "72e43c4dbc3db08473d96d0686fa2df56f82ebdbee064a152ebb2a49cb4fa7a9a80135fa9b7106ffdb64d3342b38400de5351a3b225360d5a730f0f4991418f3"; + sha512 = "0bdaed369d5318c59b929193686960ea2ed2173027c2cdb0384936d724585a9f8db058cd00d5a9d4b5ff8182a59c65066a9daf70e1e0b0d6013b3753e6f36adf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/he/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/he/firefox-62.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "d3b5a43aff6e76264eec6d211a5a9dd0b7fb89e41bbb265f31091ce3261f4a160e1ddaf59432bc3771bc5afacf1a3e12e42e0d08107727b0e8b5941ff29174c6"; + sha512 = "07074488f2b83055b66300b357e8fd4cd94dea52c359227cf33908a0abdfcf1bb969dbc8d00454c42e5b83f35651aadfd8492507deb5a229d3e70b329753a86d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hi-IN/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/hi-IN/firefox-62.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "7b568bad470b3fa069b44bc0d69fbae51408ab44751a99fc36a7c220548d0200ec57d8362dbe1dca7370e587d5aadb45b5c9dc91e6d267f2421fe5a2260d29fa"; + sha512 = "8e6b126bbd13b6ca9ecdf088a049e28328942c5153937198b851ddfdf1705211a03c6dbe71e95b3afd8f7d3889705d2c6a1bb0b135e34ba389830cff519dfbf3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hr/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/hr/firefox-62.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "c69df1a2226a967dbc0cbd3813ced6ae36b696389187489ec62b78b3180800175d3c33b07bc84c45112947348e160cbcd6db2e68d5e4b6f07e0a2f6adfc8fd2a"; + sha512 = "d1c36d8cff63d070a827d24d3e95a823a1e302cd42a48ec50edd34ca3f76678f65897f060ff5365a677525e938baca6df512f27b0fa039eac6b78fcfd347b440"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hsb/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/hsb/firefox-62.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "080ad8f1bf263f96294e3e6178dd64d30a7fda50d229081b14e54bfaa183c6efeb0ba3aa66cd23c8541a622382e415a12e3e063cb3aace5619d3c8c212ea3078"; + sha512 = "384393359093655a50c6052cf25ba413fcc02000685fc6e97f15e3668cd93421dfd3fe95d266bd4ae5e687105ce7a4c364aef92faec9a5c01f6f5336c134fa21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hu/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/hu/firefox-62.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "44f07968bb89c3c0e2d365f9cfd45d89b138a269cdff48542124a34f9d9ba9df5103e4613934c504f90b494fe20bbc6f71a12c210799e689e8f69405ea22e4a1"; + sha512 = "05c76472230f7ca011fd5f936568b50cfb646ce7efdde65d1640f0d4ccb31196873a8e5aa32ca6bc796e80400d52ea4c191e334270c04ed92354b6744ff4cb50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hy-AM/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/hy-AM/firefox-62.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "8d3ee8a030ad60ae2de062b21437e8d512ff3feaf614b91da71ff6af9d3994be79aab1753e3d46a94237d7e0a49eb670781c2567f96662b6057ee7172a0363c7"; + sha512 = "cd3f20095f0c31e20fb383089141f1aa22ba8f8e7734370fd377ba900cb71ba1f2e76e196bf30cf3e3a8139bd667575d139b03969ca3ceb3f2e1c231e70431bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ia/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ia/firefox-62.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "448e543b5f7075e2e1b984c808dded1ee67dcefb600058635c87d0c226eb02aa8dd7f59c624ebec60c9c0b334f98607eba88e111f2b03a1aa579b74b1398511e"; + sha512 = "834d2f397c3eefa2da5b184dcb4537ff28d26ade5ba985f916c4921473774d79a63cc97f3c72e49e19f37b4285a6efbc0bfd8ca78159b4a9e643027fbc4fc830"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/id/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/id/firefox-62.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "a1f8eceb53485ac41a685f98b1e9dcf57ac094c0911ed8f9a862d4b3a5fa8072c16fa6a4cef3e06d15b07b3866397fcf9ead7b4b43143e0f5dccf93acb2f7676"; + sha512 = "25b18c83fa9899f54a6fea9c617582c06b6ace769deb95e2ee6d1f3f4d32ce1654041605072096fb434c483b2f47913a35b4cdf392989db108f48ac9376d62ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/is/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/is/firefox-62.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "43d6ff785394bdfb6c376588531a9fe043b18fe44ae83f481b11d71a2422b5d5022356cf960d92f55fb3d0ee103e6534bc0299a3d84e9ca7e6b3a5544e11ad45"; + sha512 = "596a5ae84a71ee3a5f1ba4896b794cd103d2bce08a505faa38ea6df9cdc5380d7b97b2c4b3c80cb525007bc2f08dfa2bccc2634a135e653c79b913c1624f56ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/it/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/it/firefox-62.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "460385b5854565f4ca33431c573ac355baddd7a35a2fbf631b3748b02102a749e56fb1128ec3e9f6b721b1123578060641bc3b783ece271a1708656626b10a13"; + sha512 = "46bb6c5d0e575acdd510b72375677fefc3feba3c7ca2d1ad4a84f82ebfb3e7d14a9b419964850f6b640adad0970b105b3ae45bdee4a8a47200c5ac7f290c204e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ja/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ja/firefox-62.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "682430030d87391692170bc81d759d806f4667b66b4e3df84e836e65678f274720038d0556f5338d8eb18e281b64249e758b5265b3ce30e6f272ca9d84ac1496"; + sha512 = "031a4aebd4d676f724c95812dab0fa4ca289fe4144417ffb28c6c4579580666bfa690737f544a3b09f5e07c7661200c334c4a336ea45700b6e8fbf5bbe5cd81c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ka/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ka/firefox-62.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "e8c9e6a61867efdb9d021aaa8f059e3ac9896444448b08b7d90f70fb2847d46d1950a24e6fa2db0b947cf3ec628bba1c230ee7d8d53a959928122018a9e5c7da"; + sha512 = "14979e42ecff3c9005fd229a5516d36a72958ef810766a64963c2a6028c31e0717ca9079abe6103ece951c5ade140adbd35227dcb73c6101a145f1bc9e241721"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/kab/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/kab/firefox-62.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "17636e7157d6cf3ab73b7e36eeb7ad5bcc35e756fe6d369b98305c58b88208b5b11f673f52425363425d18c2a7fe79274a6e5babeb926adc9cea22afe3e55e5a"; + sha512 = "16189c288a8807afc94b1d781a3afad833a52c16ad8a805787b7ba5603ed6988bffe34d9c9a98ea3db0eda25341ff24430ab68b59a1cf9724bd16246a52c1847"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/kk/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/kk/firefox-62.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "4eeb48f250c617ea8eefd99fb44159170311becc229f77ca014e801594260ea23ce46ae11e0526ad620dd830b857b73de8a3a90c18764ab2a8f71cebfecfa143"; + sha512 = "c4a35a83e41df1149c1ab38d8f243753865a50d6d896b89499bee42db45c8237b9b8d6599fb3c932717977c5e460ce7adc6c93d561fa69a4704e1931fc11d21f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/km/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/km/firefox-62.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "57a0bb58ced30d8743c30d288250328568758674e55127d51e99485f5c85e8b0b300aeeec4d34526f53d1d538189b75925eb907e3b5fb2d455e0546e179dfe04"; + sha512 = "dadea116c3bce18f18f2bfb3652ee1d26b3cd11442b8e941565772d202d2a8a2e7d6277a1737f39c63947b2972ed8a84680b4c7dc351563c5ff11abeebd6205f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/kn/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/kn/firefox-62.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "c40e9f5906cf3968bc92932f45d4d0b712322e6efd9a5d1f3b48a7b94a162c6390142081a8a4fd2f0fb8737869723432eeb5a4b44c3161aa38a4d506bff8a3d8"; + sha512 = "dd6109e92bdc9a7b3c8e08d9e104691a1ee449f9f915b5a4090ca471089ea000da34dda44883f10f72f4a5ca21078263663444a413ab1f1e7599f85f01f3700a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ko/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ko/firefox-62.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "3f6104ed9b2fb9f1b0e3f49b06aaaf513ecf7e31b417af90c11403bca7a3ad51a87b448fa0a2ae6a01462b57dfd21f90376421ca8cd9ea62b0e3a1c7462aa9db"; + sha512 = "1dc4383f48dc1aedb80c373398a5539649397f1660664181c97ecfaa17eac2c503a976ae15b1e7607a83ed90e3b4f6c3b15d1bd60e13e22b8f071d91d373fab6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/lij/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/lij/firefox-62.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "46c8eb64b30455ed97618d67215510b22acb6cf5946ba492c5938d879e656d983accfcd7ff2e93cebe7ea5a52e9fca348ebb9ba02e70ffb4196a9d9edf5abc51"; + sha512 = "a26d5e50807efe3d4e3e01d10b0131ecbde0ef141f13310db4b01adcbac63d003db073ee24620745ab551ecba92965a5055e553b31fcfbd2df9af0a8913c7823"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/lt/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/lt/firefox-62.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "54470adc31bdab9745f72598d402fc961d6b407b6f8fabc8e0c6b785a5a5f3e9922e06a922688c6bd1ba43be81ed37bbab216fe2182bdd0b32befabc55fa1a48"; + sha512 = "dd99282b5eea3a1e4518644acdd9bebdcb1532cde148f8c60fc83177fd39757e98e7fe3cc54c681305c699a085788a14cd44e93e5f10e11a6812afae10b2db8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/lv/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/lv/firefox-62.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "376ded474c9c8a898bab54b66a4a9e9cb598dee114d9a156b9e7fb925250511e610d2e17a5decf4c2db44f227065cb2840265d6955364a1405060ff022b04d07"; + sha512 = "4be6a61d0ccf424ced36aad978f6419d00afb3db93751c1cd9f6d1ec0c2db8530e77099efbdd8883b333fc2dcb315143088423c359debdc7da5808853aa99268"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/mai/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/mai/firefox-62.0.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "21643b1b723a42d81bb4476b16282d2550100278a221b5538d5666c8fd7f3e96f242393c4b175cf6431e82458e199fa80a51ef0f5bd6a9b691d0150bf1d4c8c6"; + sha512 = "71aa1872d28a5f741df79e4f1490b110fd9bc13e9f6c4f2aea8d5028b434d02f0bff859613dcac258e0af7e8840b5a5b37fe80eb6d94d4712e83b96d971a46bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/mk/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/mk/firefox-62.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "452571329b805586a1218dd5fcd5b48f7f20fc914ba006441ec3642ef8653537b764a98b7916c0e440888d60d41b290826114c3a37083ec098fcd6c86a6adc15"; + sha512 = "5b9e7e8f865675c0488fb9f7e965dc37b35ff53f0ab84c3cc0d37f9baab0084bf5981e4a1dc65557a02f83de7a92302c5cc72c7c25c20baa484fc6abc552c279"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ml/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ml/firefox-62.0.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "8d2c850525f9ffab96c4d02908440a9a5f4b6fffc49e5505d5eb33d35d3690fd7a81ef73aac810d0c52e0deca5b69dff9eb3f0eaf508b7c866442943f7cf9547"; + sha512 = "d3ea17e668e021f9f002d775df1117c51e7b5bd92780b014bbdd869f93e50400e290a35e4f056c4ce8a235fc2851b630d24ddb3b8e6ccce7c21b65a94fe9816b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/mr/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/mr/firefox-62.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "1eedeaa3a2b6362c460e468b28bf7efc9bb5c960c766ec9f0e423834aaa67248c5bea0fe9b4fc0a8e62b0a40d8dfd1e7ff31adfebf6d1d6405daa02879977015"; + sha512 = "9022898d857eae94054ed357cc5d06bae72ea38fe2f1efb6d09baa6b18d55cb8a75a5c0f2b312458366e2146b36d12407373e8862278ef348e588a893c068a17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ms/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ms/firefox-62.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "fe2d5ae09b8921d366616eaee49c240ff529050e1b3f97c915d91c23dd67b22d78a75e14e2f192963f0fcb05eb812da2c5f68313599111d85c1abc0ac9dbb676"; + sha512 = "c81f40e528ec7f141de902432f1f367023a39889794a46de8b271e9c4bebcfbb4b6124dc8e0b86c560214c493d650389829a04c3f4a4d121b3243ae66092a100"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/my/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/my/firefox-62.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "631a6059d38a64c24e1f7d2b9a27aa2e405fe413471ac1e1d7ab337f614df9a1470a091de35904c39664d679c06eaddcd239c4a392c1e2ee548ce0be7fd5e416"; + sha512 = "ba942bcab35045de32a2d7914bf7f953dd1f683ff0d142246035df830d4528b47f195b8a6b96c95b62e2d03e89215c938072ae23b19af41bbbbc40bed3d0212e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/nb-NO/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/nb-NO/firefox-62.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "90d0c3c696ada86b47e9a6ce8aa9a8d0939eedf5746ccef79ae170a935e6b97906b187d7839af158a6008a9022cc50467febaf0617f3a3b1e8e21fd648805d13"; + sha512 = "dc86c87a0e51105bd89ee579711aea9e61904f17afae27236ad12bf754831dd592f9ef938ab35d037b2da884aa301044eb71462a6c4ad26af97e9911e6356bd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ne-NP/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ne-NP/firefox-62.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "b5e13e214cbea0d541aa8c29d53afa4ae952970a64bb5695be62ce19c829df901dba4c66cfd03d5d3a31f69041c9c700553b2689dcc4ac4ef254d155700bf5fc"; + sha512 = "9bb1e18c015696ee9b17853a942537bf462101e687107771d34c4f62d3cb3f7d9debbbba9efdcf7acafd8a9f8c4f8c197b2df15c80b9c5a562ca1ee765867b3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/nl/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/nl/firefox-62.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "44470b1cc4e95a05b4198ac3458125651de9bf9548dcfbcab5850c519fea01a3e8c6161e4a66271af68d7f1a1b37456d2ae1e51ca890307e6185a531c8cbfe74"; + sha512 = "2fa2082a1a9cd71f0ae7019507055e6109292bdacc9ad4c860aa5ca9ea6896c37609a083981df309d2c53811674261147053ee6247908ec1ce7a2e030d320443"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/nn-NO/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/nn-NO/firefox-62.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "5e49d30ed8fb64e367ea3f5b472baf0caff6c4b880d811cba5db969d21f8e5dd0d8ae4c01a151fd495eab1eef817b35b6a6e14441a860059b8f20453dbe86116"; + sha512 = "4665302f9850b93c4cf178c3e2397e299716ccf92e4fbec9762892b17960f275c1167396de4073b899d4bdbd73bf06f87f10c36be7eda22934faaaa78925e8dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/oc/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/oc/firefox-62.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "bd75cdbb1bcbe24347f35b748ec5d62da6bb20fb0f58f17a348f8bbe19e92ec3d08da3148d41f56e0b42a8e49e1c1b70b40770c737e626239b5b538bac6d42e0"; + sha512 = "d0b9a462b7157a1452a54e2fd3d9d0c38ab478eb6c6391350c8c7c9c581e425262f42d33fdd0ac9e50eb8cf77f0d8b71372cf15b079254c2294f5bb613337bd2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/or/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/or/firefox-62.0.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "e88f706c60e93b205484411bde177fd9b1ea921372669b5665ecebd795d7abcef5d2caee16a8605bf7f3f23e8d0ebf8036c156097318e7f8d3a22517e1fdf017"; + sha512 = "555135a96975771bc9bef17601f1e2a2e308e07ba3681164512f2939da1892ac592a8f69264a365dfad36a473306d6d33712fc6868bc809ad5d5a3ef16eaf5e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/pa-IN/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/pa-IN/firefox-62.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "81af24b8ab70e373339ed4fd7116e1c4f2bc7a2ee14b46e2af29860add01ab492ec692ee2653de81856d04a465860e4cfda0af4928a237bc0c8469c4899136d5"; + sha512 = "a1d01ebf734b6357ecdddb3601b9062216c040966d633e282d61a28ecb830b5edb5152dff4c46a3cc273034fdc7110cc56858cbf31c6e90ada6efeb4130c510a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/pl/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/pl/firefox-62.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "f7b6b21ab27b58ab1bdaaac012dc035e7cb1226f46da43fa3de37c7e4fac73f5303dac02332510eae7a8bcec0172769b620acfbaab8b383a64404bb294d6df66"; + sha512 = "701b496e7d20e8eff7484db6bf5e15f1bac769fc97f69de028a0dcbfe0f681d0a9031242b30367833f8cf1f8fbb1acd6d469a225152bf5b220a38b369c740381"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/pt-BR/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/pt-BR/firefox-62.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "c17c0e7990b4192f10f7269a5c5c6c74cd6e6353b8649a0417c537197c5f853085948e9d0c50f08afbb16e242f3d8e9eaa1e9657bfb6c40075e5f4e640771d2f"; + sha512 = "c4b3be3a9483ed76f7b8334998d75b293db031329852ec59ce8ae13e1184a541f2f35b5d1bce413ecf525d482277d27d7470444e477f297e361751d07cf64920"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/pt-PT/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/pt-PT/firefox-62.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "2a5db6053556c75d399bbad5ffbfe51505f6b25bcd73008d85f7dba66d89fdf56ee0ba2cfce6e2617b463cb8db087a1700507051322fdd2ea8f732be5bfadb9c"; + sha512 = "389ffbbd4dfeb1c7149a02cdbcb70479be32ac8e91683570093f99e38b4c541f145ec27fc3cbe54f70ec3ebc21e5c0ded3b18124307976befd8f2ae1839c5dc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/rm/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/rm/firefox-62.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "94e95e037ea9f924363aa5b80298f67ecc678bb2e22d552c2207af1cdfdcd9ef5b85fa4a6b42ed08167a4b482859658ef6a946adb7462c2e2519c4685428bb90"; + sha512 = "cf9b89f1828bec694147528a0db8a8ec4530fb60e8a1957b77c8202e95459217c95bea2f104ec303922074c3528321f775fd955080b5e012b8941bb7f6575bdb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ro/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ro/firefox-62.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "dc901a8b6ea913f976c915807bc4ab5fd4a756c98a78498ef52fa8577cb9e3a047e2a38240bf675d72644d975ac70d720f693db056e764218151431de572a37b"; + sha512 = "44e3ac3e35af41616c1dfab41edb172b4dd92bc622aa53b8626375d782235ce3e9540e72e14b1d25dc19f4e44db5717fede7429b1fb245b644c20f2e13c0d7e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ru/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ru/firefox-62.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "dcaddf1072b19f714e9f50eb1d5e8e15bce98bf96bbbc13e7a4a82581e76339818766e389279fb33d212afa6cea947185de130a3eb72c0f6079e159ff2f18e9d"; + sha512 = "7b38581a552ae9df2222ef9bd8f2c272cd98458d4a11c55a8f942870411d08c72da0c1dc5c4354b8e2e17d0a97794e4f2d59446a394e3c95376f5e7ee296d57b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/si/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/si/firefox-62.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "5544833432d6b41efdff96fcc8d2d322f5c158764320ae6345e9183b2d48817afd796685bb87998e5e6fd227b1753f503bedda5f6fdfa9dcad2083cc9b7df9fd"; + sha512 = "dbb7cc9c9efd5c1305cb7c770db67ace1b10c2afa55d2dc9b8de896629e4e69e79bdc5d06cf3d7900635d03420c32e0dcb1b0b8ead25ab8fb3cd12a154eaf0c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sk/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/sk/firefox-62.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "d4702ea94482a276ecafaeb7e991ab850a432158009c95489b2b87a82402c92a84c33ce43b27ebf58367e20d63bc444e656f32cb957ad0ad03b1d9f793157052"; + sha512 = "04f9b7c1977aff8144ad53a2bb7bc5aaaa11054cb8bd00b1747ab7ec34e3664d1fb3adf65b49b5d5acbbde2e1ab45ee642033e3ab57e99d5973ec853a1a6194c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sl/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/sl/firefox-62.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "6103a4d340e45af988d17b93c4e8951a656ace095c9e13f5b0d6bcfd55d51e27f9f26614223d40dc19733aee34606a80a221838be86a1f91417a1c6f00a7771f"; + sha512 = "3202a009f73fab2326611c65ee97a8249f5ccf047365874db92da588c5cb8693ad1a7b7852511bbab10a9146d0beb7cefdc79d3269c3b7404205d616a7394dfa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/son/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/son/firefox-62.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "ea04aee1c01d4d545ab4a370e4be4bd23b9f1a698bc660877a754f42995334446bbc08412bc9f8ec92a2a69a6fb8bd0caee40f622813d9ac18b43773c3111029"; + sha512 = "a4f718670b73af088e87910197a78dace22d9e04bf268e4653709eebfa499ffa4a97b4048e4ac80c6a847afa598b0e19bdff07c6a7d6e164dfbf3d09f1070593"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sq/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/sq/firefox-62.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "6789f071e366dfb3300cf5057d690c89daafe969a8b8b4e5a3ddee6683caa1426e62901d2288da61b8e8c59ac19d9764521b82f2d0d4fbe375d4e4eecd5751fb"; + sha512 = "8b67dfcd41328b677bb33a640c1045b3643368b8c0004cb55027d36ac2f3fb9cc99c272d132c355567ab0505a50d34fab80f6fdb8598cef09ea9806e19d6107e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sr/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/sr/firefox-62.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "2d079c315d0c66d2e1530cf2d30a357d62f9bb6517abe7313911bcfb5c42ac95c47b3f12f654ea61d2fdb74d44ed0b090443f6ec66ec22cbd51c674084a8c4e1"; + sha512 = "51834193c037ca0e23f2c73800a351debd8327908f7c6b378a89424ea86b01a272bed893df59b1102760303592604812794c7ac70effcd50c20fbd676f4b5640"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sv-SE/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/sv-SE/firefox-62.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "c78e06de0834a84bf0cdd22a46e80901db3dec7d5d9e0dcb6ad850a040e8df6d3ba2c6e68f8a3da118dd9306c7af7f352d9b56e839cf74afd3730b2d8ddbd38b"; + sha512 = "8763a55b6a3f7ffb75afe854aaa54bd7bd5a5ee8dbd741f4348fd29ce015603f81cd98bed3547c628dafe98dfa800a97b64e281606223fbb400c03a0af332018"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ta/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ta/firefox-62.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "d996633ce2cfc9d5766840d5198900a341c8158f4bc00c32ef168ac57a1c1d89dc10e9ebfcb2a504273d1722ed319acb9d9aca8d30257a7a6a01361ae7acbc4a"; + sha512 = "82d687d98f2e75b637e76416ed1b749d1af18c7ac140eab32f8fdf99238fec76f3f926caaf212fb42f054d51d8c807536da8cb0ac5354ad123a3030fdf46690d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/te/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/te/firefox-62.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "81b745184db9c550a135efd9b085e074a0dbbce24d81a16a39fb51166233d84da6c61b556e39b2ec68365ded627b31065d367c224721bf9e99338456aec07698"; + sha512 = "2a690bbaf6f8ba90f98c2761d6ac6030fe17d384478a3bf7c07875bc6e3e6285f154e3e21db4b639602f205cc03360fb36bcfe26473ec48cb1749a65b781875d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/th/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/th/firefox-62.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "a6ba250aa390005ce6830f14a4f7518062b3a98444da87e36f515fe29d3408b7efe9947a9d865a220b9f60ce57dadc12099c5742012981ca9c4d3fcc0ff4c877"; + sha512 = "ebc344d1439fc4fdb71d772b047466e5bc19a04a83de09e64e9c820d19bc057f3deeff5d0ec9bd9cb11ed2079f4bff459f3727b0ba92fb7426e2e186bd0cb4f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/tr/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/tr/firefox-62.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "55eef864538b70b8d6e7fc2e6af2c73853a48860dfdb1ac5e4471675ebd2d9f089793c1c6cee713654caaa253b059e9e01acb12aa0f6f4efedd09632d10315d6"; + sha512 = "9096da5a647463a3643e3e5f21dc51ee9be87d857004285de7dab164255103bca4ceb9d8474fce587ae497397c753803b8157c40d05dd8d3310d59e97965ca0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/uk/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/uk/firefox-62.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "2bf67d7523c9b07acbef099dee48902d19a5b542ffe9eb65283524ce2cbcf853b1e3e862fa2a7640160cf5dec8ad884a237f4bddf215304a458a4d9575af8137"; + sha512 = "f9f609eb7f3050e95bff33de4b88d8e17949c4c167d3bbd7a9901cb0d19926a37f72e40a6bdde1f6c7610a3ffc67d7fbcfaf298659e519aca16592714c70bb4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ur/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/ur/firefox-62.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "4127578edad2690915aae81fac45cbc90694b68d593562f4c55a1545cd1b8cdcf3eda18fbfb2dc9fb3e0dd3119fad09db68d65e6fdc09d96aa65440750fcf380"; + sha512 = "35a755f1c1d93d9d8e4bd813c83a332a1cee74989d993921f987e023da90a851863f83b56a41c58878f5aed07b4e08e0ca9d3f4d4ccc8610544516bf903855c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/uz/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/uz/firefox-62.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "7b0257e2bf2edf26afaf6bff2a06f9fc81bbf5397c8823a65ee63e54cd32bd2329ddd858a5e1374df64bd188d3d3392434d83e05d0fcb4a71d0a73bb6da224dc"; + sha512 = "d957def873388aa5f5051ed3ab5cf51196f8b5fc83e2fc4b56476f63357ff26ef38e6f3d469cf4f117b094c3e31a0f561b1f5c0a90c85e827436ecfe0d61e98d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/vi/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/vi/firefox-62.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "071e162e6919168fa4858aa98d68a2c6ff8ceeb10e5968a2dff55040613ecd7e7290f3acc929f8f2faf3fa4b97cdfbe4fd8b464f7df0c3d1d530af5a9ca8fd71"; + sha512 = "e7f10deacc80f55928f3f6ea4dff80142e790cf9dc814c38f173cd03ea59de45438fda5cce1073b0c9e1b528870c7d979d16254b038bd351834def51944193f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/xh/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/xh/firefox-62.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "7e12d3e453216ce6ef2dd56980a130c52e273b23543a3df0b5fb11c69d1366533eb4875814e5084682c54f86d2cb8a304b95b08a66c8595c8dada69d4e97af71"; + sha512 = "0e64c9a9c1ebada345f02d6dd40d2ab1ae157ee238b8716b011aeddfb18775c1594ae0f7706c4ddda97ca01c44304391570f526524f4f19d3eb5580a1839c19a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/zh-CN/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/zh-CN/firefox-62.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "1b98d214d15d0163aa91316fc6f507bda61169701a8accac3aa79dc8b6d7260d58813d87ce25d7083f6fc2d2a16519464267feaa3981e2e556298d3cc3f1abf0"; + sha512 = "cf1381aeb00f19fa6f8665ffbda8a9c6c19939a29e16fb49a2cf9097dbb2674eaf4e32b658dfb126645540582c52ad86e87a9679c1dabe03757d57032e0d3d4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/zh-TW/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-x86_64/zh-TW/firefox-62.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "f466df89dcc7a4b72ef7b41800961828012fe913b2eecdf68f442b492109467ee69a95738db2afc1ff39fac0b6376598e8ae5b050aeddd6fe3d40d0dc8d424b6"; + sha512 = "9d28b0b773227d7efc611e300250d518b303b9e03396092420e8195872c6e8c78aed6f9985e491bb01f75c541299bb7f0cf78abdf25d3a8587b085e3f6489e0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ach/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ach/firefox-62.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "6aafc9db497700c6c91087e2477b707a162447199f26c87a4921b278d81828e868214501e8b89deb387c097d5768faa18eab83076ed84aa59799b24f62a3663a"; + sha512 = "6de54e5cde101eff5c1edd43b7f3286f10cd631398f646608e0d6f22c9dc6d8dc2a3346c8d5fa9caf6ab1a82af8708ba3ee17fcf605d0404e2beb5d10b623ca9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/af/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/af/firefox-62.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "5cfe6413a70265360661dce8555941703feaf9045604313361553769b4738e3febf21a79c8be66e24272fef72b41dbf0c3a2e8e76e5b992789250d4b04fda45e"; + sha512 = "29c5898b88cda4a1f365b8792789c854b954b4d6533ed7a556f7d0e3dde3f7705adf5a6c3bf14444268648ad3b3002eef49dac200d5eb89cbda5ee33e1cb4d4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/an/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/an/firefox-62.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "cdd9509e49d563ed3d26f58fe957375357fcee36fca7526a20dbd09e9f4f2867c81508cb637cb8d35572bd730b13ed34fceb0af4aefcff631e632bb78a6713f3"; + sha512 = "484a8277cca9e437d8372f750403c71c5e4923b28b776b5809f58debb8d0d3ceb5d523df05691f326d06efba5970e27bb06abffcefc500748b04e99ee41664bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ar/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ar/firefox-62.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "906d0020510eb911d7b2709c55cca0e4a69638c685bda7e7b406fb41f385b97ed95ee97515693d72f722a619d13583d227264d0819ef973f01e67427a269225f"; + sha512 = "7e3deb89acab69012c5f1aa99219ec0ff0cb380ae5f1dd71eea078bee4434855c612c808a574bcf46512d2eb77b3e8f9c26ea524ece97b02699b2434d8cacf45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/as/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/as/firefox-62.0.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "2fce0d7c990c7e2039a601ec5b5feafa7da368e24f363489c1cdae831bf36a11e2bf967ec4f74512f6ca06095ee3a59982b0a5ea3bd003bba9c3f4c763b9771e"; + sha512 = "0836d6d22d13096db35f5ee3da13cd4a8504a55de73ce24897a8e4903eca5b7d56f244321d2b6b623a357b1741d419957f67ee65e71d1c71606db24bbbd95631"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ast/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ast/firefox-62.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "872e0b0962b7d6f86663c0cdf5fed6f4927f4a24bfe1848debb605e7c19bc574d98bdcfb74a2e5a4362c27ed1b9372881fc1418c742e4cfa75d15d838cad6f87"; + sha512 = "247817ddfd24b97b991ac916311e01871a831197c92025d3a2ea97937fe993869c7a12e118b32baa3aaca49ae469dfaa8e892150731b6dfdca1c4e0929c2ba08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/az/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/az/firefox-62.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "dd92dcd6f0c32d5487525cd88832fb567ef0e8fda5cf7f401399992243146bc2690881839d5752ebafb4e7e099c6594c71ef99d5509d94753256507216a2532a"; + sha512 = "4f0977cc5ce9e01c311d256d239a3e89dcc1db5b78b4c08f08999d7c52731fd58fce08c9f77a80fde1176a0a5289b5c59f06eb790cedd3625d96928dbdec46da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/be/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/be/firefox-62.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "1eda2b0945a4d8e70c0e61b187abce6873b9a8a578c089cb66b2728bfc71b90aab71b57599417ce775b4d5fa1c0fd908fa4b9b3183a3aa570da95d4fd726ba84"; + sha512 = "294adf3029076f9dceb32a54330d63b10ba9219d9f688e3c7246e04fdff2ff10bdc24b577f48b18935c35b8d9acb2437a7d6cc3533fd6441b9027ca67e7cacc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/bg/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/bg/firefox-62.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "597dc8972c670f67f34ac23ffb57506b896efc9436d36270dbcdab484dcacab174aba53671f5462ffc7b54b9718c0280a66734e789edeb7710cd7c2b9fd602a8"; + sha512 = "41b78104367cd25e67a38b71d3db6054995caa28fd0c4dfa0ebb494d2293c92c20a347fd763f88b65d31a514987c607102206390b2dc41335d00aabd9d5d589d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/bn-BD/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/bn-BD/firefox-62.0.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "79989196e4647c035d4af9f24dc9edfceebf9d90afb1efe894e0a54e940ffcf32e3746b9e07b486bd89a11ef8f35cfaf2e61992071352a561a535bb058c0396b"; + sha512 = "79241d9dc44b5ad35ed76f7b33bc8be8bf7f5da09855df9e34354994554aff2ddd2dfe8a2a3410916887568fc92a70927b8cae4747f20d0dacb067206eec3d7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/bn-IN/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/bn-IN/firefox-62.0.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "25b3d138308e0667d62e41a8384619fea548dfe441cec761c82e238c1f0467300d6abc89d265f22f1d9699ffa2165bbb7dceab76169a78acaa4bb1c46396182e"; + sha512 = "5194de3d21783d335a11c824cd46b0e01ea512f900a7e3fb45ed2567501acd27d5f5bf8dd68f146ff550f6ae4c70089d539f56823cf7280f02b67d5111715760"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/br/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/br/firefox-62.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "8f18a08ed64cf071462b2eb65e0965f4b3825857e867da2898f959fbe84ea55cf19fbed289a4c4e739e5c4fc5392f1f496feb6b4f383e86a753f5041dfa333ee"; + sha512 = "59dfe19ea10c4698067a8ca70143b160ed5a73c38e0f6ed3a14d9a60209378acfaa1f8b09647a1a96d519e6fd6a34cb7e2a8bc3cc276653842c2bb3a6ee3cbe3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/bs/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/bs/firefox-62.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "2cd2a33ff71b4a471d694912f8c102b53327f1bdf005316e16d32ef17a510784cfeac972f9a854304b07d6c9d19459b19bf3f7e47caae2e58a635fa555115039"; + sha512 = "7e6069ecc137c1b0b479159fc8eb323a8c417c81edd8c7d54498c47cea4f1a2fd4a1cc52bed17b899ca72df8b0fbaf88e1794b17f86086d249011ccb592ce5d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ca/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ca/firefox-62.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "78649a90b8e890adb271fc57328669afb49f70e9f323a2849a2071b83125f3f1f40e13beb353336a9c5aebd930979889c719075b49ce4099715951164d979926"; + sha512 = "932ce6517bd55ddbd927eb28935bc99ff5576ee924d239dc490fa79b3d90dd77f579a7b16c0b4fe4ddf8fedb4e825664aee7fe246145ebbe19c8f8841d098464"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/cak/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/cak/firefox-62.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "8e66b6ed5b20efda281350535f2b08892763c2dcb62ba4fc764b598606a36b4a6f3d5960919a8f2967f736add11132252449efc4bef827653534b45566ff69ce"; + sha512 = "38c4ed4be2e79145056bfbc5a476e3a03c4f1f6aed1ccb834a7ddb2576f99fc52305b93939145ee1e7ae9144b656e857bfcc6b084ea4b501c3a574e10d7438a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/cs/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/cs/firefox-62.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "5e81414b8411fda775b35704de90d006be40cffbb51b495171b9f69896b9d486e4438bcc2bd2f3775ab5f998b7b41599f44f92ee150ddbbb2a84f64058657938"; + sha512 = "1d569ba50f84ada02f0962e0418ee7f26e79fe19cc09f50dee4350a59262ddc87440dabbf10129d73172e512eff5904062f60561f4bd2d4eda395bc67af90dd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/cy/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/cy/firefox-62.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "8f4c5db5c760e16ef258bf2da401e51c2cf3d75808d83eb4b7adfaea4c2b69bfca0cd92c9cf69d7e4de188a2c43574d37c49b3c641dd9c8edb7bb6aefd2e4755"; + sha512 = "9294f39bf32de7eb2a1bc2480cf7f7e51dcdd124d3281f9e45c4729b6926002f8ac99c30403ea53a5c6857077633ec08e0c35f5160ea8e08a7f5f881e8a90748"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/da/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/da/firefox-62.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "4aceadbf8cd2ced63f15aed369d98f4234faef18560e767aab1026c876fd3d6a069cbba49139eea60a78e0e42c063451918ce4090e850fc5528a93f527067335"; + sha512 = "77bde4fc9cacdec311b513045f3f026c44d7c199cfe0520cde20ed711c1cdb40d6b64483944f4da47b8fb280764899ff5931a8e5639bd0a8a4e03425835d8f2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/de/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/de/firefox-62.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "327c8b22f3ff3c11061b5ee58d1ea2311743e53d804bcff6e66615eeae3aada694c8adbba58f3521b6bcd8f54513bcff1d50ac952ffe5f1ff3f22b52264bdb68"; + sha512 = "b2bf1a5fc4536c3c0822d84c7f0138f04f6bf4597804eff101502d3d782f2b22fc54dff966c2f32821471622cb1602050de1c51aaf9f64c63314f8ba002ea201"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/dsb/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/dsb/firefox-62.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "5a964d9c25326d2a97730723be2a999bcd8a1bc91b2d0d7ebb4aee9bd773fe93cdfdd94c70cb2f9c0ef10f84474c28726c21c23e19a1fb9b55e6db5c2a74b6b9"; + sha512 = "812842664c8b0088f33acc42ae1581a33cb2527d3aaea0ed102fdc27a088c06008b96a3a052f95a900694d869591311dd986bea2e828a02238aaff854a77aaf6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/el/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/el/firefox-62.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "ed1eceba7d5bae11af3a916902a55c66ed97ca6da9f1a6421e4be76c65b25111e2ca7c979c55f920d5fa30146016980fde273c643a5ff4996ed32b82f0b9087e"; + sha512 = "f1116c938bed2333309d32c13ef69f806418c14fb8a2fc10f63c932d8d8ae169aa76a8e3835eb6bb2d61cde7c8d8dfec56240b8280695f1c2273899bb7c8aa4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/en-GB/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/en-CA/firefox-62.0.tar.bz2"; + locale = "en-CA"; + arch = "linux-i686"; + sha512 = "ba07c206a4b4ee0bf27ff82e8ea14e3ddff262fec11e088a114253ef4a4a81951cd5c85cf6eb9f6e1ba06f97be0bf5787f5e26c65b7f2aadfedf27f968146efe"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/en-GB/firefox-62.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "019be53a2e1bafbc4ea77730545c40be314d7e4a370e5cadaffd735a2dcb3dbca14e4d23b88dd2e34aa4518a57aae1b37ca561e8e62d7acd3417227f0d18d344"; + sha512 = "558c10ec35144d696e1458a4b70de954ed3c8d3f05d5d1ae492374ee3b90752a93d55e6e41de30a64a3ee3b9e68bab88aa479066b849971d78121961ce2aaab9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/en-US/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/en-US/firefox-62.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "ee88e6d55855a9e2fccf2a362f26177393447dd1210eb8f78992a7760bd0e8245267c4143eb5309a7ac5826b345b8c9637bcc504bb7214d1f7897db70e9c7697"; + sha512 = "51d606c5d9fdc2d6b611b1fea06c54ee4a6ac7666b4dce0a26dbaec99d110a2e304f88108d307b011f27312f8b935fcbf473f87b52056a465b667f8ecff9a48f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/en-ZA/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/en-ZA/firefox-62.0.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "877cb9d50e95a8b0789660d871f263497279ea229b11218bc9398facb23d78200db4ad19e0030ca44cf36ae3913f8a119abddc3278e85a4c89d298c59a3443fb"; + sha512 = "b88ea68f4eabf086ff2f3fa6752cc42bd19391029d4c0565342bf24d90817717e5f07f774e164df234eeb735e426491adf35784dd9096475635365912e57ba62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/eo/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/eo/firefox-62.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "5c78af15b977019cf7402e88b823ab2488b08ba9e8dd27a55caac7570392e78afd8aa972f0f95f21dfb1239936ba23272ed5b84cf24578cda5e7bb1048ce7d67"; + sha512 = "b97c269786efad57ff954d27ec69a4983e18a7ee4e0ffdc6925268830104103a99a31247359eba915be0710455f0626379b801d5fbcf501f30e3cc0b9736eb32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/es-AR/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/es-AR/firefox-62.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "8328fef71e94c07c37491a331ac362d142d44e93404c0a3ea883426c8f11ebf6f5bf6584237b7fa75439c7312bd1f33a2ddcfcb8882c3cf3c526abfae48a620e"; + sha512 = "a5fd087a8852f39e1208b388a2507981af3d989a8b86b1b0e2e83adcc9f6a494116050ff811e8b2225fd113ef1e689bace73a617c0e569df627df7e9c655a14e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/es-CL/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/es-CL/firefox-62.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "ef4e96123acde3a3ed75d8d93868894f859349613b556d44056009d55a3794e78824928eb04afe8746e291fb3d443b7a1b6f63376ebeb65102f7e03067480b86"; + sha512 = "bdf7aeb5fbb80711d7b8dd7ac30e544847e00f015f7bb8835315f5ee3023458bf781a368f0dcf11c57737fb1d0f077352c0eab28d32e801861bba36bce5e52cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/es-ES/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/es-ES/firefox-62.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "934e92d37b920ccb715a411509905c150501eb14d11aefd084f2639afb8ee1a4ce3e869d682ec9f9db4b70a795875f09ca3d7d997f0e621ef99cffeeb1675f04"; + sha512 = "47bf0dbb55435016312a6f6650033f28710471e7aaf14e0dc83488f1ff87e559de552fd95d5a58864420032392f84de06d8a1916efb8128423826c7e4577ab44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/es-MX/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/es-MX/firefox-62.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "57e7bacb006bd079554670fc216ab2c1912a252b7966b32cc25a7d6735f7b0928ae0911b666c2810c63031d57513a4ff800cf92906a95868aa32608eb927e2f6"; + sha512 = "79e42f01744b05df6c1c7928743914ac28f3dd696a6918a08000a531b050fda95ca621ce0484c216f2eadf728db867707c1ec45188c70bb91ee611eaff7ac565"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/et/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/et/firefox-62.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "b357f29c0f77e7ed4ac764f7feab6588cf322a1807210052359402e5d1092d3d8cf515e04beac86d32a6ddac43b4be8b92d88a1437f6899b4007d2c9faeb7fc2"; + sha512 = "8489f6dcc733debebe1acbaa86cd093e5dcbdb4c8d60480414ec1e27710bf57590fef3a29fb208e9eeaa5d8858e5807d7cf0be5130d57bfe308b7653de431db4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/eu/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/eu/firefox-62.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "61b4a7b767e62b1a1b4eee4cb024e869969b5623de658ca2a3762c271a6519fb4869c9398e7a3cbb987f01799961021fff6f8634b78dc62770ca1f345e56d061"; + sha512 = "92f49ebaf7777962eb2d1b13043a10e82cebcad1a0f43a3527d7e7a5a31e720b812febda86051125e64d5f0355225dcb6cb496df5ace1ed10c2c6a4cfbe16cf8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/fa/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/fa/firefox-62.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "4eec6e7231fa548c0a24b8904b55311058dfc89b2ffb87142859b994aa0a31a07c48107495cfa66bb4a65094328f6bbd7f33e0ca33632457f620ecd90678552d"; + sha512 = "1bf258264b77fc9cece834363a12c34be719121afd55378e23fb2af9cf20da2a7ef4ffdb2d39c34c9970ea5d259a47c894b6f9d703ecf75834a2239844d783e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ff/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ff/firefox-62.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "0a17ac2aa0a855c97b613741d7933dffc4569da9fef9f753a4e404847e683cf10a4444ff4cee5b5d1f86ef069525d0f2635433e8249ef029bfa2c247ed605386"; + sha512 = "0b60ade68d6f4b9f1fda4a3ce36fe54e69583efa5ecb41443f0f92d394257449c2d5ca7124d1e194fc7394ba0daeb67f828de4aaf13f78c89aff8dc273213ea5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/fi/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/fi/firefox-62.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "32526703d86dcd74739f419518974ba7f43083a8b3f971d0dd7446caf787c5ed4be82710e3bd53f2d1e9e5dcb67f46735bb55f60ec7d9c49c62cfc2857866fc2"; + sha512 = "f5cd4ed69914705a01765cce884e3f3fd66cea53e85d33da378087ac7ccbc9afcb1b2ebaa78bb4ffbdca2fc34b2ce4aebad6d55fdff44b8740a815265026d2dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/fr/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/fr/firefox-62.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "b7e00691c8a1a5f0c1a6312a79eb40ae17e455e156f66da2f4e43beaad5ec35d770b783aba83c500db1fa885b1038095effe69f936e17d69bd320f41b71d4b2f"; + sha512 = "3dc1eda7eba9e0112b246a370a296c6f5e11f318e514d08fc800d198afa5fc692f13ba66fa7b2ec891929c53572ade6caed21f967b880262cb36718fd76e18c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/fy-NL/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/fy-NL/firefox-62.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "d8d70ed1d04686cabc9862c5cad06dffa6fa8b975a2a61f0154a6c1c6b182a173abe4563b727de30f414a4d04311744917a82158665883697d26589b29a25263"; + sha512 = "576b0645bb3c2367138e3f385282f77c72040b0a4c75ac5f39163a7f1e23a34e7702305857ae2250c96adcebd587c1cb83b1e7d129667307089b38842bc4e175"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ga-IE/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ga-IE/firefox-62.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "352620fb58ed1fc024e8633e70ce3a705fa518cb8f600b3bbcf1c50c440812ab8f04608bb5a3582f96dfb2a19b0d52debe6c4947dff2f06f426710d8f927977c"; + sha512 = "416cad5b5859bf1565f7e68fd3a53ca8b180609a488e2201f70d42eda3186fb1e22c647016c67fd3068d67b50af678bc6dcd96194001511844afff43e31611bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/gd/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/gd/firefox-62.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "90923e5ecaa85d21d7d6de57c79a3f35b329faa14a74e8b210cc2024f1d48f3aa5c4930c63e8e1688778bdbe998f06c72b5bdce8287ffd7ae05fe62845ba2bfd"; + sha512 = "167ac1a9411d1cc3ab052d3b206de6a119e8b56854b7e9588ed68815e7c9b9e1722210951a8b731e944aeb8b2890095cdfa7d73b03b473a5ac99a90095de6917"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/gl/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/gl/firefox-62.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "339f8ebd6d714945e50be0d18be3af010e2f00924a84df2fe5641b06842278550bc76b01474ad2b2a0feda734f6f2ac9254c008c3a6f942714c684504bdd47b9"; + sha512 = "efefb9e9d53be16fda773e8f40073c357c4b46cedecedcfd311e890a45810b7fbfb368ea3e93b07efd0f9111b9fa7a67808298c0ce98be2c8bc7eff354f7efb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/gn/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/gn/firefox-62.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "35de07bd227904bf0372555d81ead164d993410d963e0e733f536ec445112652c04d3bce8f910d0b3daa3d9ef2ff956d24ed680916a5e86c3e9a6f9366d0dda9"; + sha512 = "044c8e610d639ac8830b00ba2e4e2ff8e1bf827c3f91101edd45a6d478b5b8b99c1100c9fb2273a6fd378826f0bcbaf8817cdf1e3303bdb1b9b0e0c01cf095ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/gu-IN/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/gu-IN/firefox-62.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "20b1b40d84264f0e98ab91a4e5943da078b7c37816b24443f8936933d779453d640b26ae04eca1b24b3a68134a29e7853bbd544c4cd725b934660574c6381284"; + sha512 = "433bc4b580bb3d164ad78a21ef8894e053b4c6d972d5e4aa46a9b8ac27cdf38e395164eb46e24815cc645d8048c237371a3abbd1bb639e69b65efbeff00a30b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/he/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/he/firefox-62.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "f8652f2cdc19827a7f2a92e6ec251c5f0bd8448d3dfaa3bd930a4ba116dbdcdd7f2a9c083c5fa93ba2a24395147782146c5443221c6183622248e54d0687f287"; + sha512 = "d6acd3b06216d4b0f0856cb6576c36381dd9f48bfbd3543e410eb0e0e5aa11977cf3d68b38b0be7b6700831c1561e2a8dc75eb5193637bbd2484673d83bd3a1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hi-IN/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/hi-IN/firefox-62.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "7051302d9315dc30fc8f6ebebaa587b49d17823aae7a542133d2f82a1d5a18e3062ff02880f347518e5f88a0de913568d9f6b4ab72bf7dd20cff5812cea65ebe"; + sha512 = "49856be15be3ab0ca687f8d6616c481d61bc0380133b043d394cdcd21d1f7cd8816b2bca5538f2e601a32ffa8c51745e89f537f62bfa853da42759db70186ee1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hr/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/hr/firefox-62.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "acc1297166057cdac0015758d6556bc870481d96951e7a14704792e39010938a6c0bafab2cb28e9a23bf24695813e8dc1a80512c1c5fc75bfb8a0d29f7091c93"; + sha512 = "0040ba7333a13820e4c0a85fb24c30131d4b477da3da9e4e04296088d1c0e938fd495777aedbe3bec22533a6c4766be902adbd8b470a81380fe4dd23f831d0f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hsb/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/hsb/firefox-62.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "2ec761ce5eaa14cf5fa114524f70b93998d76971de7b8d001e656cd6331c32252ef3ae78f54906f5dd416896b2cf8b6f5afcb5e3a02d017d9c8a33835655718e"; + sha512 = "715d14b52fb82f255300dbc828ab05fd578f61325cdf4d4cf86f1a47e22fc1856b57bb459941a4bfa8d325b7168fb0e39c075122b56de3455933fa89927f025f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hu/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/hu/firefox-62.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "160d7307aeb834f9ac15ad77c0cced4cf7abb855264e10d8a62eea1b1ef85aa3b0a00fa9221052bf4a3df010e54fa198d7033d8450d59212ff36c936d99a1469"; + sha512 = "deac0b43865960d665f13a2f0a77cd9413ba9b3172fd2660695464b5f72944f4013f6d9a47801e528db63c3e05496aa7df890624a39ddc6651ff5e8d0d02883e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hy-AM/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/hy-AM/firefox-62.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "09950c9536fa0bdbad207b84ccc83088b23a7f2f960d094ea0615de566ac1bd9cf55acbe01c0f574114dd9246bc74e582e67706ec0c34a2c9ed6dea3d30bae17"; + sha512 = "22e134785777ea4e4fd72cdc7f17765d5bf8e943be33a0991baada71fb254f60f9ce9b68b4ba5640dc807a6db0e4ac3c81784a7a33e5096cda1833b22336f9de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ia/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ia/firefox-62.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "e6c1b00971dce7387e183a8328234ba65722c69c7d48e328223eb7e490af3706298d43c11844505ba2ea5aaf21a1fcf7b3cc8ec8946862fe7aed8128e6c6d5cb"; + sha512 = "91112a783ed4402cec7ce357e68806609b202bd1553c649271ccf4cb90a724ec612951b3acfe0eb64646957870726cb40f66b4a233cc0b73fdeed51083d6894a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/id/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/id/firefox-62.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "85506ef07ecdd1d466fbb261d46bca8cc4ac8b3a707f27db9083dfe1996e5214cc0e78080f33c2b3198e27e044c6a6d13717d69b43c3ad98a1c43f50b12bb69b"; + sha512 = "8b87e2f13550334a96bde04fb7d61ac963548e35de2717b8738fd14fafb015944403a1bf175e2c13ceb7d4f482f5a6d56b57b44cf015b6dabfac3fed77d86f81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/is/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/is/firefox-62.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "973b863ef94121836f472f5450f8a1a2d3329306f289b8ba09ff811b336196a157cfc966fdffecd54e78f4f48508ca1f8284f0c2d3804579ef82be4e1adda48d"; + sha512 = "8ea8972b5dc06bd12844fbafff92f6f493f604ebe03139043435fb5f761098cee81c0ccd42b67bcf3c7d1b370f3382858c08d4c14eb24a75fb851e78c51c296c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/it/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/it/firefox-62.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "fbb8e899b2aac3f4c64ccde0fffa11f8609ca3b7ea8bc05e062d207b46234b2414746822e0fad8d24fe8ae43e3bd8ebf2fc5d26a02365012a95a4070de002274"; + sha512 = "b50a422dcd94d6ea69ab22426d6f79b3997313bf4e0e17f2af31d8b64ee85d603cde1768a730b279a10ff87639ba2af26185bdb81ea4bcb7b61947b1836ab700"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ja/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ja/firefox-62.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "c6585b28baaeffcdedeb1167aae4d20874755e970f53aafb351a31acd3933e6b805cde1e22ce0c2ade58984ad940a5d8b6857116f11ea6070bfa88c8232bbae8"; + sha512 = "f52d31f997b291e2a0c9cedaafbcb5bc3ffd2148b52700eb5c140846f2809613c9061f339728b1810bc5f899fd208a3eedad06ace984dad41fac0a057c101ec1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ka/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ka/firefox-62.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "136f49750c33d72e7aee3fd5733730f1b78d6656fd45b2aa2299d8e9d01adf13f9debe1d08d8fb9149107e96ce5f5fefce81b5d9a2d9a1e1896cb8df3c588829"; + sha512 = "e155d5c70de47d6f96f3f0e34ee317e90ac1aaeee4be68ed265d4bec46d52e6d67d7a140f3fb135dd086d9d6cfb5e8f80063a85f07e8b2197b23233a122efbb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/kab/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/kab/firefox-62.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "2a0fd4952c493a4c22e76135efbf155962fb51444328726f29660cb97586ba76c1903d28c7baed9bb4815e57747b5a009649e179971b3c7aafd19fb96be23c75"; + sha512 = "153ed4ce1692e6691222779860a066b27dc9a5e747d79f4e1bd3273541d849d4b093062b3ff8d702786542fe99caefcde13f63cada7d0f67f461531aa32603a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/kk/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/kk/firefox-62.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "0cad124b5e3d995124057fe0d818121be4f7f186c7cd4ada4d13b89ca5d505a8830525ffcda9a27a0f5f2241fb65b44b8433d95221220740ab8643f374c938ad"; + sha512 = "dd88ca465251b9489e766c268755a66babdcaa5962d40ddb4ebdc3f100a31f34b9b962bcf5fb5a0e46b2871e7ebb8d4169982a3a7174bbdaf5e6716274321ae3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/km/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/km/firefox-62.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "06a58d8d54bf641e3ddc7fdb3417f8a5a2aaa16e8c11f961321c939e803249edb7dd3e08027a4b20ea840298b4a12da20c2771364d2b9caaba496d1eba863e15"; + sha512 = "ccb473d36522f34c889ae3d211a1cd4ebf4e60da341c51c34cf05d9d8d75615b91eb4b00e327409c6fe406aaeaa07f8eec53c364bec50ae87c48c37ac1602e69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/kn/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/kn/firefox-62.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "92a9d9e4fc65472200f408238ade4ed23321d4e25b0c7eff9096f23f76e480cea0031159b53e509cc6d3d6b2c0c0c8396742c81f2fc3e9825c1d5e45a35a12f3"; + sha512 = "e1c718690141b6e89f4df017d5804efe07a1dfa838f1c23ca14b90438458278bfe90e178abb5ad6c52d43a993b6a65664c0e801a9f58ac57f9300a9bb6f9679a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ko/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ko/firefox-62.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "dd9d7674f6261a94cb00fb823a02cec12758476c1ca1cf6a973eae78dbc1c94ebfcc14155c035966781398e1d3262e000da4291e90ec434756c8c3ba0de7b7b4"; + sha512 = "e916fddce4044fd924f7aded0b0c082f82bb50fe0f7587d7aed4782d545be8b0dad67ed4d2c41bc75360f6ed7c236bd7c40cb3503b472792f1b27c8f0742f597"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/lij/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/lij/firefox-62.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "1d01c34ab89ff1122147685b0551aa650f5b751deec35a5e7d64d6ba46272e929d7f1c49601fb2b1f5514b840ba6554af892c79c1a3f71af392216271d206cd5"; + sha512 = "ab86bf8a92b05bc5defee073afa19ab00be704ce49a2d26f032edcbb60d9e5ef4e7a6196d31bec8d6e090c586a88d6e9b69f576ed5e587ca09dcfb60a0661b3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/lt/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/lt/firefox-62.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "93d3dfaca37a668eb7c43bdc74ba521bee0344fff43ff9cefad5e4746b7c3ccdba445f97577338606951a15fc5e629bcd4b8cb979842fbe550d3e7e88169b3a4"; + sha512 = "d716f7fc2c4015f97962d07ba7ffd6903675a6c36416765f2e81da43f9e4aba759b3ff31bd82bb7cf64c7d8b99f9d7454716f4ce6daa022f9fa31f4a49d9efee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/lv/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/lv/firefox-62.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "0037d16778bccde9146965d7553513a21a443960cabca4a65b6f58ca2ea9f243b3405d3993e8ed078c1a2b7bd636deb86ed829f8f699400fd755f35cf048c463"; + sha512 = "453e0bbf9eb2e9678ed029ecb797b701b4b39e030f9555bcca7eb6d56676bb44366e2d1ccc613b12a09f95d99ed08f9d3f34cfc9dd16cf38c9ab8e162dbae3e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/mai/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/mai/firefox-62.0.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "d8025e4c4ab5b7e9b2d8dd8afbc221e1765eddf878943c4daece0e27b7443e7e17de3e400d99a5ef5b62a5ba9e3f2a4c27112551c8c0ea1f81136d6d74b7e91e"; + sha512 = "75e863c56d68cf2304f0c6c2f1861ce025d934d033341c23d3b95a70e73bfe66334c3beb77d9fd597f7b4091baf70729419ce452131009ccf03d2d33d16621c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/mk/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/mk/firefox-62.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "6ed44201501bd8336615b29078de4e52374712f857e2816732277cc37b6f8b305af0861894f3f70fa62fe2de6476d689bc5b79bd245b4dd750dcbab0b448c69e"; + sha512 = "bb87f94a4de4984544477837cde4186a55309eec70b85f0cffaf0cfe747b7c761d9a6553adfa1ab1fba72d732be855e2bb46e4c7f22a0f25529207b42b6da396"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ml/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ml/firefox-62.0.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "5b7272acc37c4dffc2421824b86c5f0192b7a92535f193a0b567fff8e79129f41bdb336bfc1c742ea0f106739eca47339d9f550b785951364233e612b035f94b"; + sha512 = "5754b4a0a3c6c67191f4ef3dda7bc208766ed8171de772d4250033039b2b39dddc3bee800a28fffe41c68cfca82a5c9c6005625fc6bb5bf232b256d7bd58de71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/mr/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/mr/firefox-62.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "fff73ffc6f080aa064df90a2f19c85364a09c831a095bf3722a5bc0760e04e305be8683804883968a492589a652d705f1cfbbed617de2f00348a723babf60a86"; + sha512 = "04e40c1d060b848cf957af34079f6d1cdd12589b0f31932f15b5ebf837e37d84d332fe3ee4a54c501ac47050233f891ec6617802d03472ae9d7e45baca809adc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ms/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ms/firefox-62.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "a7574ce597a12b92aec0e88ca72d544cca1ec1a5def40b034a8cb25a24a3672c42e2fbe7ebcf0b5293f55fa12216856503af5514c3ab2b3cea551a8a43900b04"; + sha512 = "1b84fd0960c4952ff42bc50595683da47545fec9ab10d7b3fee3e3541b2a47aee084526766fb2bbf17dad413f4dd2dc458cb0c3e8153b7ef897a9573292abe2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/my/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/my/firefox-62.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "0bb892e7ab8126f2f946b1d3c9b8b00119dde0a165832ed211265be4f698087ab83970b1c1d47171913db7e01f43036e90b4aea135accb91c33beea1031d545c"; + sha512 = "95fd60b8c2e9b0add3163c67a5b46e794f0105621293017838fdce48cf90a0b0bd62bcefec2693fa16b0616260b39587bf3c619b506d56b072f0c715398307ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/nb-NO/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/nb-NO/firefox-62.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "184130d826eda76da820974a4f729de6eb569bbc7f36ffe2d4599b7c142d75c5537546511770db38abaf28b9d3866937fc6d51c7fbcffb074432da3d98310b06"; + sha512 = "05c83c17e5470f009ab369d0c8a1c64cb8ecc008161fe1ced3ca85e9065f36f7ee4e220f8ed7a0320305ac31b35a035b5c8f7525b3b04c6b96e95e4044418f33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ne-NP/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ne-NP/firefox-62.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "2428dc2175f0da8e4fa66ac11810467306a59b181c34165e4a54dfe5f3bebc182f0fbcb117f15707e72baf97f4d75131a3ec97d03d0fc1109229caf83519dd51"; + sha512 = "2ad4756b8800554c54aa1f47effe512de332a61fcd7571e27ae83bd5e0100cd8b60fd5d8381764f9bc2b1d925ec4b53fc3c6c6a88840cb12f57e9acba892dc5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/nl/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/nl/firefox-62.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "96bd92c9979e02a13db550f7f3a795585baa1017691371c5e5bc99825d730d535c63ddbf805ebf8a0e6406ae80ec644d0f715d04f913935f845ad89467c01832"; + sha512 = "a3ba32bb48a6bc386d49e4ec703f51cda3bf917673e23965d7f5e7977dc8ae0696b375535aa04d1a416b6b5655cb3302cb9738a238d9cc8a6bcb78dda52afae6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/nn-NO/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/nn-NO/firefox-62.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "26f35cd02873ba061cd0f38cca18947e2c05589d3b399c55fb4d0f356c26d399848467a20fc542c7f51c67c912ab7c8fe5fae25c97d942260276faba40d24c89"; + sha512 = "35bac6119415eaca5c8d9fd2d57e0a550abcd7d069454202a02ce6418f9e47ae59563224763008f23d49604cde09ad251dc8785d2205d4e9623c138a97b69533"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/oc/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/oc/firefox-62.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "711b260ac771280d795d6e3746df07bed4b9357b7261e83e8b17934ab027d77bfa1781d3d9d1923724f49f16136468c1fef40d1809d6a020d5b49b7767030f85"; + sha512 = "40d3e74b204da461cdd79163cc838e538a5dbb8c4e693a59d801202363cfba4bf48e01bcc87d247dce6b1fdad0a24f2bdd15272399e407b26293156698f7bf7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/or/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/or/firefox-62.0.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "dcd1d7068c75428533d268b50d3d1e7324dba2709abe4049c9cfea4fd4413b09c3c7dd9f944f5f54f57454d8d2aa8471b8ba5871e73cbeae6fa357c8c68e90fc"; + sha512 = "2220ecdcb26b459ebb0fb3380bb8b9430c1a09aa899418b18a765a4ba76c8d35480f59b71edaf6047e0eae04146ec6dd6bf25ccb619f559a260ff6f2828a0db0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/pa-IN/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/pa-IN/firefox-62.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "f34c32479a92cce9fc6564899b5477fdbdbdc868b17904f8d7ae338c2924fb7cb8335b038378a805a2119ff5ad13e349c7b80efe7a29add706bbaf1466d623a6"; + sha512 = "91425dba14c27a3bbb744cf5added1545c071f466c6cfb77d7b2ff0b0b5ab289ffcb56821023e50d12deb4ff29cc5ae490c028420384da84811c661d277017f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/pl/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/pl/firefox-62.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "d62822aa991cd30cb6c5e47dc211bd4018de427b243543bd83bd166601e40e3bed35dfc073660573dc500ae19ead2dca858041a3b80bd616def3c2b3f72aee11"; + sha512 = "a5581c2e2d7de1187967af10802c4a6577a5bbf9a0ab56448b0695ca3fdee845117fa364ea53149b81a5aeb3ddab22c58ff65863fc981445bd34858766fb438c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/pt-BR/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/pt-BR/firefox-62.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "5a2ea1494423a5ce1afc60c2d1a4e53ef084a02050ca61a688ecf18ff9d99e43d6bd334683937c12965767e7e5b0bd1a32708f1f2c2a241db1f68271633ace66"; + sha512 = "70a9cc592980afbaa3efa37b57e190f6bd6c76fe975ee16b3a3b2e3498c65e792a83870f569836fe79fabc289c201b7f6764d4d512f9d561058eb496d1bc1cf8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/pt-PT/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/pt-PT/firefox-62.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "83cff834812ad238b103fcee8b801e46ae542eba3475709e04848f18df0bee68075b2834ee871bfa5eb58ad1ec7fb34239d661a27d0dcba17e6c39de8428cef6"; + sha512 = "8e1d94b4b3e01e684387b4e3c9439ee1df9712cef607f370d63ff0072876c2ad9e22a978fcaba14c03802c8fd5b559c6dc412fdadaa6a01425bb491852c4ce02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/rm/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/rm/firefox-62.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "c4190e7e2007805b2c7507dd26b0695bc5d3c007eabd6a592c283a99cf0495ce1dfcd6dbb1e753a990f64466f24618d3b84df617f99fb266ceadf32fcd990af8"; + sha512 = "77500b96558c055ea90750d99aeb096d789a920fac4fd368b95a032cfa565ea0ee1259503ef0d198c4802bbeeb847a3ca22f06ae79b6e554c54d336a99f61687"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ro/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ro/firefox-62.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "292112e0af6bad96b97bb0a1d58d0b7c9d4cb476cf531b1caaffcfd54c2f0ecd72a4311f98b614d7f834ffe2779261f77eb43d4d7ab724378dc6b7ad83bb1840"; + sha512 = "e3cfec0059f0372d2b3764a4c3809b7a8c9ee6e795bb1d8eccf663feb1d054be58c15569b8dcad55b5ad37a1332d950f5286ad88ca5db55441c1cb3dd879bb8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ru/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ru/firefox-62.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "3d6fa0994fba5ff988e281ac4feff8655a5353ebf0d99df5ac7412cff2d19d478a912851d27f2af5bd78fdbc68030878682bb7ffa912180d2c4aa9bafcd77cd5"; + sha512 = "91077e66da0403828807fe1a3ee274ac162898efafd651b3c243c315c9f0f1cfb88925e738b9bf25fa7fc0c7b747f2a9f2a5a1c77b87cb83d3aa620475239822"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/si/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/si/firefox-62.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "e6d3c4049f267e68216e9824743b123539e5445a5d53297eb8af33af95a418e492a655a456970d02049f8969c81c0ab8c5be1471a5ab8e01b4744995b799158a"; + sha512 = "f770321771e965776b55d7681783e3782b7ce4df3c3d7cce581a3de1db0f8fc8c3ded3d606fc7f7f61e62b33986e8e05ff64e49427a8cb85b68b7b6fe43f6c3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sk/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/sk/firefox-62.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "66fc1f3f4fb7dec1c261db144243dc0647b4dbc4257de93c5fb017ae616d31d6825fdfafc30d3fc299a278d5fd51731f24e6033cb3807c69ccd1512527029063"; + sha512 = "150792fbeebcd0969fdbef0827b617f83383bcaaf3eed9dac0790aa0ffb893d4498dae29eb480fda05a2feaca0428cf600bfb3398dfbcc921e92cf2ca01c7a1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sl/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/sl/firefox-62.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "e089b96b77a60c2c8e96f107cd26f37e681f8a8c702cf32ee3592344900c81daba274516c32ac856609917a30f8d60d853fd649fe575c3a2915072e45908126b"; + sha512 = "d423c10683ba690a8d8eec50e4e966b7233d565e2c35b5fdd70aa917908daab5d01f847c32f7e24c604aa19ab941ca70c6e6613b39271d01f1370dbd974800fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/son/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/son/firefox-62.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "00eecadab36816ae5e977dd50f335222e1fd8253b98daa1f14920e48678afb22b0e619ae4a86e6a45c8d2973f83f614f16a1f860e6ed1ed488851032075d6c72"; + sha512 = "7f1d638cbd729b51d959b0b1ee0e4ec5473f5478bf315c890fd9df20e3065861a5c8447399e973cac78bd078d2a1f0e1bad829f6b462ec6ffc55e7748760677a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sq/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/sq/firefox-62.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "ebd8ed00c12288a3ae4f6a113bbac8595ea9c0fbc35575115fd019c6158857ad083588100d4cae440822780bf25789501d0dd800bbe2baef5f037fb43aeabb74"; + sha512 = "823b4b5043e3fd8fcf0bcb345d00dbfa38e6e03fdf172a30c272f51eee7f9057ec99423c7117ab8d21e9037bcc1e19a7082401a0b25514e2258542aef4c4af80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sr/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/sr/firefox-62.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "bfce8265755adbc3c30d56a1e4bbbbb14385ddd3d2434b6404b04e3fa3120d58b32cb9e598aeb1540f23d2757c23fe903fd5c9d5167db305a88077e98d9a39b2"; + sha512 = "a08ef0de87e4f01c11b20301e45e98d3bf10bbd4d2699de56f66470d7f4298aec3744f44888ba46ec1293fb713487f6df20bb9f5682a57827993f0ddd28cdde3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sv-SE/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/sv-SE/firefox-62.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "518b28e8f88a763aa09c5aed12eb0f2b582f84770401f3e11e5083fe69d176ce1483a81c2345a7fae2473551bf41db6a35f341495eb59c559a99398b93a7195a"; + sha512 = "e3e65e32e5e11547e220bb34d0009257f3c4f18aec0fe961f310ef4b76311d8d885a01d6bc4420c2b97687b886c3d00c09d43af0c6c7eaca8e6a804d78d4bfe7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ta/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ta/firefox-62.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "a4d5960e0b60cf03c0ecf7f0d2b697dbb68dbfb4e0f3c77548c020d574f60c0fe7cc032a81215f34108a11651800deb1b1533efad3e238fd32780f22bd5524fc"; + sha512 = "47753ccbe4471ab3d3de3ea11992cd332251868ae3a7772e860531d013c657f5ff559d34592fedf7b52ecf3a54476dc2e0fc68119170afb9c482fccd04a36776"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/te/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/te/firefox-62.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "8bf1510077ce86f50c668cb8d931d6d0899d1b7559736312c86acfdc3149da75f8c8f750393e02023a9b063c27c03adcc6bd5c29c950fc0a6055392a2e0eb2d4"; + sha512 = "90327dd95f3a597692cf5ea54258c31ed813261f102a7f668f5bc5062499a6bfe64d2d241dc33ffdc5cd152802e7d462c7ffdbe4498825ad88be48d21031919b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/th/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/th/firefox-62.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "af32b002380fee3b147b2cc44831c3d2ee29d784b8c935fe1be464b302992aebba73a39929ca23b35b9b6a8475e909a73622f70810e0a4a21bc7db74a8b4da46"; + sha512 = "652a7bf7f2a7c6fa27edbd5e78cfecd2df661e1a7a01cc532b1caaed53bd40025aaee2126dd1116e77ef9e050777e78e96537ed2decfe493caa1d03c7bbb0646"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/tr/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/tr/firefox-62.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "4216a4e126a41f26b344804e4222535aee43c9f52fafbb6e1d019cc743fe18c0cdeed7fc04dd06fb921efc0431256ed2f09ed21fafff8a1132d097082b849388"; + sha512 = "f98d45b831f51a0caa47fcaaaf1ed37f267035e1f1ab95ae0cfbafa06f03b89f99b7a7accb9812644f862b819c2bb294f5a3454ece80f775359ac77734a99d44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/uk/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/uk/firefox-62.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "dfe75bb618097d0a96066dd65ba0da7e9d3ce91c14075023c48aedfb88c6d30b83c8ab503666c7581783baf347beac58e81d49e7f9b671bedcdb6827f0843b35"; + sha512 = "6c67554c87c7941fec8193bfcdd9d5d0af906d13ab237e0ddd97733816d2df27fee5e11eb450e85f9143f71049219e8ef9c6cd4d327faf3e335247130cdd26f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ur/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/ur/firefox-62.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "0a1a8cae5f364b5e0e2570ef6e06870efd136322082e2fb7690b381f05195eee48787ac679916cd7508f9f51458c038798c9e73f982992dd5b0de8d596e83ca4"; + sha512 = "0c90e5575d057d9f32c18a102d2db7848f8821d71edb3cb9ae4f2565a1cc2851da7fb1bd493e81dca003a50a9f26454af8cf0ef7f947ea42aa22baf20abc06d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/uz/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/uz/firefox-62.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "153e781c6e4a530fad7631168afaaed74b0c8323317b1b4104cfffd8ee9250ae9af0ed9a0a0f157fc6745dfef7889402426c3d5e13d0c1b234fdaf952c9cb3aa"; + sha512 = "fc35bb30011063bda8c256b6c405bffae55ae7d67ce5809367aaadaddb1094acfe0186f2cd84b2dceb55a76358ee46e29ec013058e035123a7797b5ac49b6e4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/vi/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/vi/firefox-62.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "1cc2e611316137b1d569d3c2617d41bddc48a8618a8937eab643ebdf94727139743b8bc6e1d18a7487e9d30f867ae1b7f77bfd528e0b535d122a4e8f9fcd311c"; + sha512 = "0c6a94f811ba509dc468b31f9448eba7f1004e6652a418db8ef84d03d79ff850237bd7555b8f73d515f8a0c546df371a18bc51ccd3dad069bc481f58f9a4c989"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/xh/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/xh/firefox-62.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "b0c4a093950fe90ad2249a5259843e7b3b4bdf2179b0c7ee61e1f965a4104636a53d7db0b91aaff3047cc7252855970f12e1b3bc4aa9e4f85d301652cb53c6c0"; + sha512 = "b113f1f4a81a7cac63a8604a8152bf651ebee3ad48eaabef84d09d3576b37b529f56c04fc9fd1b3326364aeaefad77cc123a97b662c85665c7f239384f5c6d7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/zh-CN/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/zh-CN/firefox-62.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "b3d1ea1e74ce5c7779bd1c7299197d0143688cc6bd9c4ae0b391e3849fec40c3142a9b7db19d3805616fa885deb16a6fdbe2fd23ddf0eac0fb0094498917d356"; + sha512 = "7c3da83ebdfbcaf8a67ac8cf953d648dd3eb54d1c9f6e74680b00ef94e01a0384a53d27c4a78312e25e284209f3e4c53661958347e3250eb820a20873e66c3fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/zh-TW/firefox-61.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0/linux-i686/zh-TW/firefox-62.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "cda9d835f282746cb711054f1ed2f137e0f7e89c27429af12f470ed8984ea0c9a4f28e5cd403aa2f37fe0c06271c7651f794009ec11ddc64a96c4c661ca9ecb6"; + sha512 = "659ea2bbd51d99a0c3573043a55ee580839e5f0323c57bb7b086ebc41a19f493baadecf67b64443b5abcf5db69e7e82e0c965a40b151d141557cda04b3ce6d52"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 984d80167c39..11222cc65ba3 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -20,10 +20,10 @@ rec { firefox = common rec { pname = "firefox"; - version = "61.0.2"; + version = "62.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "3zzcxqjpsn2m5z4l66rxrq7yf58aii370jj8pcl50smcd55sfsyknnc20agbppsw4k4pnwycfn57im33swwkjzg0hk0h2ng4rvi42x2"; + sha512 = "0byxslbgr37sm1ra3wywl5c2a39qbkjwc227yp4j2l930m5j86m5g7rmv8zm944vv5vnyzmwhym972si229fm2lwq74p4xam5rfv948"; }; patches = nixpkgsPatches ++ [ @@ -60,6 +60,7 @@ rec { meta = firefox.meta // { description = "A web browser built from Firefox Extended Support Release source tree"; + knownVulnerabilities = [ "Support ended in August 2018." ]; }; updateScript = callPackage ./update.nix { attrPath = "firefox-esr-52-unwrapped"; @@ -69,10 +70,10 @@ rec { firefox-esr-60 = common rec { pname = "firefox-esr"; - version = "60.1.0esr"; + version = "60.2.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "2bg7zvkpy1x2ryiazvk4nn5m94v0addbhrcrlcf9djnqjf14rp5q50lbiymhxxz0988vgpicsvizifb8gb3hi7b8g17rdw6438ddhh6"; + sha512 = "1nf7nsycvzafvy4jjli5xh59d2mac17gfx91a1jh86f41w6qcsi3lvkfa8xhxsq8wfdsmqk1f4hmqzyx63h4m691qji7838g2nk49k7"; }; patches = nixpkgsPatches ++ [ diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index d09e65a4caae..bd00404b536b 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -5,10 +5,10 @@ let then "linux-amd64" else "darwin-amd64"; checksum = if isLinux - then "1fk6w6sajdi6iphxrzi9r7xfyaf923nxcqnl01s6x3f611fjvbjn" - else "1jzgy641hm3khj0bakfbr5wd5zl3s7w5jb622fjv2jxwmnv7dxiv"; + then "1zig6ihmxcaw2wsbdd85yf1zswqcifw0hvbp1zws7r5ihd4yv8hg" + else "1l8y9i8vhibhwbn5kn5qp722q4dcx464kymlzy2bkmhiqbxnnkkw"; pname = "helm"; - version = "2.9.1"; + version = "2.10.0"; in stdenv.mkDerivation { name = "${pname}-${version}"; diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 5f7a2e8e2843..6ffe40d6a3de 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { name = "kops-${version}"; - version = "1.9.0"; + version = "1.10.0"; goPackagePath = "k8s.io/kops"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = version; owner = "kubernetes"; repo = "kops"; - sha256 = "03avkm7gk2dqyvd7245qsca1sbhwk41j9yhc208gcmjgjhkx2vn7"; + sha256 = "1ga83sbhvhcazran6xfwgv95sg8ygg2w59vql0yjicj8r2q01vqp"; }; buildInputs = [go-bindata]; diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index cf9558b4b955..6716305df8b5 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -1,39 +1,9 @@ -{ - lib, stdenv, fetchFromGitHub, fetchurl, - cmake, doxygen, lmdb, qt5, qtmacextras +{ lib, stdenv, fetchFromGitHub, fetchurl +, cmake, lmdb, qt5, qtmacextras, mtxclient +, boost, spdlog, olm, pkgconfig }: let - json_hpp = fetchurl { - url = https://github.com/nlohmann/json/releases/download/v3.1.2/json.hpp; - sha256 = "fbdfec4b4cf63b3b565d09f87e6c3c183bdd45c5be1864d3fcb338f6f02c1733"; - }; - - variant_hpp = fetchurl { - url = https://github.com/mpark/variant/releases/download/v1.3.0/variant.hpp; - sha256 = "1vjiz1x5l8ynqqyb5l9mlrzgps526v45hbmwjilv4brgyi5445fq"; - }; - - matrix-structs = stdenv.mkDerivation rec { - name = "matrix-structs-git"; - - src = fetchFromGitHub { - owner = "mujx"; - repo = "matrix-structs"; - rev = "5e57c2385a79b6629d1998fec4a7c0baee23555e"; - sha256 = "112b7gnvr04g1ak7fnc7ch7w2n825j4qkw0jb49xx06ag93nb6m6"; - }; - - postUnpack = '' - cp ${json_hpp} "$sourceRoot/include/json.hpp" - cp ${variant_hpp} "$sourceRoot/include/variant.hpp" - ''; - - patches = [ ./fetchurls.patch ]; - - nativeBuildInputs = [ cmake doxygen ]; - }; - tweeny = fetchFromGitHub { owner = "mobius3"; repo = "tweeny"; @@ -50,19 +20,15 @@ let in stdenv.mkDerivation rec { name = "nheko-${version}"; - version = "0.4.3"; + version = "0.5.5"; src = fetchFromGitHub { owner = "mujx"; repo = "nheko"; rev = "v${version}"; - sha256 = "0qjia42nam3hj835k2jb5b6j6n56rdkb8rn67yqf45xdz8ypmbmv"; + sha256 = "0k5gmfwmisfavliyz0nfsmwy317ps8a4r3l1d831giqp9pvqvi0i"; }; - # This patch is likely not strictly speaking needed, but will help detect when - # a dependency is updated, so that the fetches up there can be updated too - patches = [ ./external-deps.patch ]; - # If, on Darwin, you encounter the error # error: must specify at least one argument for '...' parameter of variadic # macro [-Werror,-Wgnu-zero-variadic-macro-arguments] @@ -79,25 +45,30 @@ stdenv.mkDerivation rec { # export CFLAGS=-Wno-error=gnu-zero-variadic-macro-arguments #''; + postPatch = '' + mkdir -p .deps/include/ + ln -s ${tweeny}/include .deps/include/tweeny + ln -s ${spdlog} .deps/spdlog + ''; + cmakeFlags = [ - "-DMATRIX_STRUCTS_LIBRARY=${matrix-structs}/lib/static/libmatrix_structs.a" - "-DMATRIX_STRUCTS_INCLUDE_DIR=${matrix-structs}/include/matrix_structs" - "-DTWEENY_INCLUDE_DIR=${tweeny}/include" + "-DTWEENY_INCLUDE_DIR=.deps/include" "-DLMDBXX_INCLUDE_DIR=${lmdbxx}" ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - lmdb lmdbxx matrix-structs qt5.qtbase qt5.qtmultimedia qt5.qttools tweeny + mtxclient olm boost lmdb spdlog + qt5.qtbase qt5.qtmultimedia qt5.qttools ] ++ lib.optional stdenv.isDarwin qtmacextras; enableParallelBuilding = true; meta = with stdenv.lib; { description = "Desktop client for the Matrix protocol"; - maintainers = with maintainers; [ ekleog ]; - platforms = platforms.all; + maintainers = with maintainers; [ ekleog fpletz ]; + platforms = platforms.unix; license = licenses.gpl3Plus; }; } diff --git a/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch b/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch deleted file mode 100644 index fa388edfb75a..000000000000 --- a/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff --git a/cmake/LMDBXX.cmake b/cmake/LMDBXX.cmake -index 3b9817d..e69de29 100644 ---- a/cmake/LMDBXX.cmake -+++ b/cmake/LMDBXX.cmake -@@ -1,23 +0,0 @@ --include(ExternalProject) -- --# --# Build lmdbxx. --# -- --set(THIRD_PARTY_ROOT ${CMAKE_SOURCE_DIR}/.third-party) --set(LMDBXX_ROOT ${THIRD_PARTY_ROOT}/lmdbxx) -- --set(LMDBXX_INCLUDE_DIR ${LMDBXX_ROOT}) -- --ExternalProject_Add( -- lmdbxx -- -- GIT_REPOSITORY https://github.com/bendiken/lmdbxx -- GIT_TAG 0b43ca87d8cfabba392dfe884eb1edb83874de02 -- -- BUILD_IN_SOURCE 1 -- SOURCE_DIR ${LMDBXX_ROOT} -- CONFIGURE_COMMAND "" -- BUILD_COMMAND "" -- INSTALL_COMMAND "" --) -diff --git a/cmake/MatrixStructs.cmake b/cmake/MatrixStructs.cmake -index cef00f6..e69de29 100644 ---- a/cmake/MatrixStructs.cmake -+++ b/cmake/MatrixStructs.cmake -@@ -1,33 +0,0 @@ --include(ExternalProject) -- --# --# Build matrix-structs. --# -- --set(THIRD_PARTY_ROOT ${CMAKE_SOURCE_DIR}/.third-party) --set(MATRIX_STRUCTS_ROOT ${THIRD_PARTY_ROOT}/matrix_structs) --set(MATRIX_STRUCTS_INCLUDE_DIR ${MATRIX_STRUCTS_ROOT}/include) --set(MATRIX_STRUCTS_LIBRARY matrix_structs) -- --link_directories(${MATRIX_STRUCTS_ROOT}) -- --set(WINDOWS_FLAGS "") -- --if(MSVC) -- set(WINDOWS_FLAGS "-DCMAKE_GENERATOR_PLATFORM=x64") --endif() -- --ExternalProject_Add( -- MatrixStructs -- -- GIT_REPOSITORY https://github.com/mujx/matrix-structs -- GIT_TAG 5e57c2385a79b6629d1998fec4a7c0baee23555e -- -- BUILD_IN_SOURCE 1 -- SOURCE_DIR ${MATRIX_STRUCTS_ROOT} -- CONFIGURE_COMMAND ${CMAKE_COMMAND} -- -DCMAKE_BUILD_TYPE=Release ${MATRIX_STRUCTS_ROOT} -- ${WINDOWS_FLAGS} -- BUILD_COMMAND ${CMAKE_COMMAND} --build ${MATRIX_STRUCTS_ROOT} --config Release -- INSTALL_COMMAND "" --) -diff --git a/cmake/Tweeny.cmake b/cmake/Tweeny.cmake -index 537ac92..e69de29 100644 ---- a/cmake/Tweeny.cmake -+++ b/cmake/Tweeny.cmake -@@ -1,23 +0,0 @@ --include(ExternalProject) -- --# --# Build tweeny --# -- --set(THIRD_PARTY_ROOT ${CMAKE_SOURCE_DIR}/.third-party) --set(TWEENY_ROOT ${THIRD_PARTY_ROOT}/tweeny) -- --set(TWEENY_INCLUDE_DIR ${TWEENY_ROOT}/include) -- --ExternalProject_Add( -- Tweeny -- -- GIT_REPOSITORY https://github.com/mobius3/tweeny -- GIT_TAG b94ce07cfb02a0eb8ac8aaf66137dabdaea857cf -- -- BUILD_IN_SOURCE 1 -- SOURCE_DIR ${TWEENY_ROOT} -- CONFIGURE_COMMAND "" -- BUILD_COMMAND "" -- INSTALL_COMMAND "" --) diff --git a/pkgs/applications/networking/instant-messengers/nheko/fetchurls.patch b/pkgs/applications/networking/instant-messengers/nheko/fetchurls.patch deleted file mode 100644 index e2f72f600ed8..000000000000 --- a/pkgs/applications/networking/instant-messengers/nheko/fetchurls.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 077ac37..c639d71 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -18,16 +18,6 @@ include(Doxygen) - # - include(CompilerFlags) - --file(DOWNLOAD -- "https://github.com/nlohmann/json/releases/download/v3.1.2/json.hpp" -- ${PROJECT_SOURCE_DIR}/include/json.hpp -- EXPECTED_HASH SHA256=fbdfec4b4cf63b3b565d09f87e6c3c183bdd45c5be1864d3fcb338f6f02c1733) -- --file(DOWNLOAD -- "https://github.com/mpark/variant/releases/download/v1.3.0/variant.hpp" -- ${PROJECT_SOURCE_DIR}/include/variant.hpp -- EXPECTED_MD5 "be0ce322cdd408e1b347b9f1d59ea67a") -- - include_directories(include) - - set(SRC diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 516abb4c9c00..99cd8371aa94 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -55,11 +55,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.15.5"; + version = "1.16.0"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1a63kyxbhdaz6izprg8wryvscmvfjii50xi1v5pxlf74x2pkxs8k"; + sha256 = "0hw5h1m8fijhqybx0xijrkifn5wl50qibaxkn2mxqf4mjwlvaw9a"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/applications/networking/irc/weechat/aggregate-commands.patch b/pkgs/applications/networking/irc/weechat/aggregate-commands.patch new file mode 100644 index 000000000000..41e3c54a2d57 --- /dev/null +++ b/pkgs/applications/networking/irc/weechat/aggregate-commands.patch @@ -0,0 +1,110 @@ +diff --git a/src/core/wee-command.c b/src/core/wee-command.c +index 91c3c068d..8105e4171 100644 +--- a/src/core/wee-command.c ++++ b/src/core/wee-command.c +@@ -8345,10 +8345,20 @@ command_exec_list (const char *command_list) + void + command_startup (int plugins_loaded) + { ++ int i; ++ + if (plugins_loaded) + { + command_exec_list (CONFIG_STRING(config_startup_command_after_plugins)); +- command_exec_list (weechat_startup_commands); ++ if (weechat_startup_commands) ++ { ++ for (i = 0; i < weelist_size (weechat_startup_commands); i++) ++ { ++ command_exec_list ( ++ weelist_string ( ++ weelist_get (weechat_startup_commands, i))); ++ } ++ } + } + else + command_exec_list (CONFIG_STRING(config_startup_command_before_plugins)); +diff --git a/src/core/weechat.c b/src/core/weechat.c +index f74598ad5..ff2e539d1 100644 +--- a/src/core/weechat.c ++++ b/src/core/weechat.c +@@ -60,6 +60,7 @@ + #include "wee-eval.h" + #include "wee-hdata.h" + #include "wee-hook.h" ++#include "wee-list.h" + #include "wee-log.h" + #include "wee-network.h" + #include "wee-proxy.h" +@@ -102,7 +103,8 @@ int weechat_no_gnutls = 0; /* remove init/deinit of gnutls */ + /* (useful with valgrind/electric-f.)*/ + int weechat_no_gcrypt = 0; /* remove init/deinit of gcrypt */ + /* (useful with valgrind) */ +-char *weechat_startup_commands = NULL; /* startup commands (-r flag) */ ++struct t_weelist *weechat_startup_commands = NULL; /* startup commands */ ++ /* (option -r) */ + + + /* +@@ -152,9 +154,13 @@ weechat_display_usage () + " -h, --help display this help\n" + " -l, --license display WeeChat license\n" + " -p, --no-plugin don't load any plugin at startup\n" +- " -r, --run-command run command(s) after startup\n" +- " (many commands can be separated by " +- "semicolons)\n" ++ " -P, --plugins load only these plugins at startup\n" ++ " (see /help weechat.plugin.autoload)\n" ++ " -r, --run-command run command(s) after startup;\n" ++ " many commands can be separated by " ++ "semicolons,\n" ++ " this option can be given multiple " ++ "times\n" + " -s, --no-script don't load any script at startup\n" + " --upgrade upgrade WeeChat using session files " + "(see /help upgrade in WeeChat)\n" +@@ -276,9 +282,10 @@ weechat_parse_args (int argc, char *argv[]) + { + if (i + 1 < argc) + { +- if (weechat_startup_commands) +- free (weechat_startup_commands); +- weechat_startup_commands = strdup (argv[++i]); ++ if (!weechat_startup_commands) ++ weechat_startup_commands = weelist_new (); ++ weelist_add (weechat_startup_commands, argv[++i], ++ WEECHAT_LIST_POS_END, NULL); + } + else + { +@@ -616,6 +623,8 @@ weechat_shutdown (int return_code, int crash) + free (weechat_home); + if (weechat_local_charset) + free (weechat_local_charset); ++ if (weechat_startup_commands) ++ weelist_free (weechat_startup_commands); + + if (crash) + abort (); +diff --git a/src/core/weechat.h b/src/core/weechat.h +index 9420ff415..cbb565a03 100644 +--- a/src/core/weechat.h ++++ b/src/core/weechat.h +@@ -96,6 +96,8 @@ + /* name of environment variable with an extra lib dir */ + #define WEECHAT_EXTRA_LIBDIR "WEECHAT_EXTRA_LIBDIR" + ++struct t_weelist; ++ + /* global variables and functions */ + extern int weechat_headless; + extern int weechat_debug_core; +@@ -112,7 +114,7 @@ extern char *weechat_local_charset; + extern int weechat_plugin_no_dlclose; + extern int weechat_no_gnutls; + extern int weechat_no_gcrypt; +-extern char *weechat_startup_commands; ++extern struct t_weelist *weechat_startup_commands; + + extern void weechat_term_check (); + extern void weechat_shutdown (int return_code, int crash); diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 16162435e09a..a9de275559db 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -12,7 +12,8 @@ , tclSupport ? true, tcl , extraBuildInputs ? [] , configure ? { availablePlugins, ... }: { plugins = builtins.attrValues availablePlugins; } -, runCommand }: +, runCommand, buildEnv +}: let inherit (pythonPackages) python; @@ -29,12 +30,12 @@ let weechat = assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "2.1"; + version = "2.2"; name = "weechat-${version}"; src = fetchurl { url = "http://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "0fq68wgynv2c3319gmzi0lz4ln4yrrk755y5mbrlr7fc1sx7ffd8"; + sha256 = "0p4nhh7f7w4q77g7jm9i6fynndqlgjkc9dk5g1xb4gf9imiisqlg"; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; @@ -69,6 +70,13 @@ let done ''; + # remove when bumping to the latest version. + # This patch basically rebases `fcf7469d7664f37e94d5f6d0b3fe6fce6413f88c` + # from weechat upstream to weechat-2.2. + patches = [ + ./aggregate-commands.patch + ]; + meta = { homepage = http://www.weechat.org/; description = "A fast, light and extensible chat client"; @@ -78,38 +86,38 @@ let on https://nixos.org/nixpkgs/manual/#sec-weechat . ''; license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny lheckemann ]; + maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny lheckemann ma27 ]; platforms = stdenv.lib.platforms.unix; }; }; in if configure == null then weechat else let perlInterpreter = perl; - config = configure { - availablePlugins = let - simplePlugin = name: {pluginFile = "${weechat.${name}}/lib/weechat/plugins/${name}.so";}; - in rec { - python = { - pluginFile = "${weechat.python}/lib/weechat/plugins/python.so"; - withPackages = pkgsFun: (python // { - extraEnv = '' - export PYTHONHOME="${pythonPackages.python.withPackages pkgsFun}" - ''; - }); - }; - perl = (simplePlugin "perl") // { + availablePlugins = let + simplePlugin = name: {pluginFile = "${weechat.${name}}/lib/weechat/plugins/${name}.so";}; + in rec { + python = { + pluginFile = "${weechat.python}/lib/weechat/plugins/python.so"; + withPackages = pkgsFun: (python // { extraEnv = '' - export PATH="${perlInterpreter}/bin:$PATH" + export PYTHONHOME="${pythonPackages.python.withPackages pkgsFun}" ''; - }; - tcl = simplePlugin "tcl"; - ruby = simplePlugin "ruby"; - guile = simplePlugin "guile"; - lua = simplePlugin "lua"; + }); }; + perl = (simplePlugin "perl") // { + extraEnv = '' + export PATH="${perlInterpreter}/bin:$PATH" + ''; + }; + tcl = simplePlugin "tcl"; + ruby = simplePlugin "ruby"; + guile = simplePlugin "guile"; + lua = simplePlugin "lua"; }; - inherit (config) plugins; + config = configure { inherit availablePlugins; }; + + plugins = config.plugins or (builtins.attrValues availablePlugins); pluginsDir = runCommand "weechat-plugins" {} '' mkdir -p $out/plugins @@ -117,13 +125,29 @@ in if configure == null then weechat else ln -s $plugin $out/plugins done ''; - in (writeScriptBin "weechat" '' - #!${stdenv.shell} - export WEECHAT_EXTRA_LIBDIR=${pluginsDir} - ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins} - exec ${weechat}/bin/weechat "$@" - '') // { - name = weechat.name; - unwrapped = weechat; - meta = weechat.meta; + + init = let + init = builtins.replaceStrings [ "\n" ] [ ";" ] (config.init or ""); + + mkScript = drv: lib.flip map drv.scripts (script: "/script load ${drv}/share/${script}"); + + scripts = builtins.concatStringsSep ";" (lib.foldl (scripts: drv: scripts ++ mkScript drv) + [ ] (config.scripts or [])); + in "${scripts};${init}"; + + mkWeechat = bin: (writeScriptBin bin '' + #!${stdenv.shell} + export WEECHAT_EXTRA_LIBDIR=${pluginsDir} + ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins} + exec ${weechat}/bin/${bin} "$@" --run-command ${lib.escapeShellArg init} + '') // { + inherit (weechat) name meta; + unwrapped = weechat; + }; + in buildEnv { + name = "weechat-bin-env"; + paths = [ + (mkWeechat "weechat") + (mkWeechat "weechat-headless") + ]; } diff --git a/pkgs/applications/networking/irc/weechat/scripts/default.nix b/pkgs/applications/networking/irc/weechat/scripts/default.nix new file mode 100644 index 000000000000..21038a2fa966 --- /dev/null +++ b/pkgs/applications/networking/irc/weechat/scripts/default.nix @@ -0,0 +1,13 @@ +{ callPackage, luaPackages, pythonPackages }: + +{ + weechat-xmpp = callPackage ./weechat-xmpp { + inherit (pythonPackages) pydns; + }; + + weechat-matrix-bridge = callPackage ./weechat-matrix-bridge { + inherit (luaPackages) cjson; + }; + + wee-slack = callPackage ./wee-slack { }; +} diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix new file mode 100644 index 000000000000..1b6e52157449 --- /dev/null +++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "wee-slack-${version}"; + version = "2.1.1"; + + src = fetchFromGitHub { + repo = "wee-slack"; + owner = "wee-slack"; + rev = "v${version}"; + sha256 = "05caackz645aw6kljmiihiy7xz9jld8b9blwpmh0cnaihavgj1wc"; + }; + + passthru.scripts = [ "wee_slack.py" ]; + + installPhase = '' + mkdir -p $out/share + cp wee_slack.py $out/share/wee_slack.py + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/wee-slack/wee-slack; + license = licenses.mit; + maintainers = with maintainers; [ ma27 ]; + description = '' + A WeeChat plugin for Slack.com. Synchronizes read markers, provides typing notification, search, etc.. + ''; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix similarity index 96% rename from pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix rename to pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix index 4a8ffaaa261a..1018e46ec625 100644 --- a/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation { --replace "__NIX_LIB_PATH__" "$out/lib/?.so" ''; + passthru.scripts = [ "olm.lua" "matrix.lua" ]; + installPhase = '' mkdir -p $out/{share,lib} diff --git a/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/library-path.patch b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/library-path.patch similarity index 100% rename from pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/library-path.patch rename to pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/library-path.patch diff --git a/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/default.nix similarity index 95% rename from pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix rename to pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/default.nix index 4b92d1212c55..dad5b9c5e02a 100644 --- a/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation { }) ]; + passthru.scripts = [ "jabber.py" ]; + meta = with stdenv.lib; { description = "A fork of the jabber plugin for weechat"; homepage = "https://github.com/sleduc/weechat-xmpp"; diff --git a/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch b/pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/libpath.patch similarity index 100% rename from pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch rename to pkgs/applications/networking/irc/weechat/scripts/weechat-xmpp/libpath.patch diff --git a/pkgs/applications/networking/p2p/opentracker/default.nix b/pkgs/applications/networking/p2p/opentracker/default.nix index abddc22c285c..46c482818f8b 100644 --- a/pkgs/applications/networking/p2p/opentracker/default.nix +++ b/pkgs/applications/networking/p2p/opentracker/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchgit, libowfat, zlib }: stdenv.mkDerivation { - name = "opentracker-2016-10-02"; + name = "opentracker-2018-05-26"; src = fetchgit { - url = "git://erdgeist.org/opentracker"; - rev = "0ebc0ed6a3e3b7acc9f9e338cc23cea5f4f22f61"; - sha256 = "0qi0a8fygjwgs3yacramfn53jdabfgrlzid7q597x9lr94anfpyl"; + url = "https://erdgeist.org/gitweb/opentracker"; + rev = "6411f1567f64248b0d145493c2e61004d2822623"; + sha256 = "110nfb6n4clykwdzpk54iccsfjawq0krjfqhg114i1z0ri5dyl8j"; }; buildInputs = [ libowfat zlib ]; installPhase = '' - mkdir -p $out/bin $out/share/doc - cp opentracker $out/bin - cp opentracker.conf.sample $out/share/doc + runHook preInstall + install -D opentracker $out/bin/opentracker + install -D opentracker.conf.sample $out/share/doc/opentracker.conf.sample runHook postInstall ''; diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 54d612387ac4..13e69427aa48 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "rclone-${version}"; - version = "1.43"; + version = "1.43.1"; goPackagePath = "github.com/ncw/rclone"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "ncw"; repo = "rclone"; rev = "v${version}"; - sha256 = "1khg5jsrjmnblv8zg0zqs1n0hmjv05pjj94m9d7jbp9d936lxsxx"; + sha256 = "0iz427gdm8cxx3kbjmhw7jsvi9j0ppb5aqcq4alwf72fvpvql3mx"; }; outputs = [ "bin" "out" "man" ]; diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix index 5a548d5ff65f..cc0cffb6e3b3 100644 --- a/pkgs/applications/networking/testssl/default.nix +++ b/pkgs/applications/networking/testssl/default.nix @@ -2,7 +2,7 @@ , dnsutils, coreutils, openssl, nettools, utillinux, procps }: let - version = "2.9.5-5"; + version = "2.9.5-6"; in stdenv.mkDerivation rec { name = "testssl.sh-${version}"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { owner = "drwetter"; repo = "testssl.sh"; rev = "v${version}"; - sha256 = "0zgj9vhd8fv3a1cn8dxqmjd8qmgryc867gq7zbvbr41lkqc06a1r"; + sha256 = "0wn7lxz0ibv59v0acbsk5z3rsmr65zr1q7n4kxva1cw5xzq9ya6k"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index d74eee4190df..82575d9c6ff0 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -12,7 +12,10 @@ stdenv.mkDerivation rec { name = "gildas-${version}"; src = fetchurl { - url = "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.gz"; + # For each new release, the upstream developers of Gildas move the + # source code of the previous release to a different directory + urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.gz" + "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.gz" ]; sha256 = "0mg3wijrj8x1p912vkgrhxbypjx7aj9b1492yxvq2y3fxban6bj1"; }; diff --git a/pkgs/applications/science/biology/hisat2/default.nix b/pkgs/applications/science/biology/hisat2/default.nix new file mode 100644 index 000000000000..9ccf54a81133 --- /dev/null +++ b/pkgs/applications/science/biology/hisat2/default.nix @@ -0,0 +1,49 @@ +{stdenv, fetchurl, unzip, which, python}: + +stdenv.mkDerivation rec { + name = "hisat2-${version}"; + version = "2.1.0"; + + src = fetchurl { + url = "ftp://ftp.ccb.jhu.edu/pub/infphilo/hisat2/downloads/hisat2-${version}-source.zip"; + sha256 = "10g73sdf6vqqfhhd92hliw7bbpkb8v4pp5012r5l21zws7p7d8l9"; + }; + + buildInputs = [ unzip which python ]; + + installPhase = '' + mkdir -p $out/bin + cp hisat2 \ + hisat2-inspect-l \ + hisat2-build-s \ + hisat2-align-l \ + hisat2-inspect \ + hisat2-align-s \ + hisat2-inspect-s \ + hisat2-build-l \ + hisat2-build \ + extract_exons.py \ + extract_splice_sites.py \ + hisat2_extract_exons.py \ + hisat2_extract_snps_haplotypes_UCSC.py \ + hisat2_extract_snps_haplotypes_VCF.py \ + hisat2_extract_splice_sites.py \ + hisat2_simulate_reads.py \ + hisatgenotype_build_genome.py \ + hisatgenotype_extract_reads.py \ + hisatgenotype_extract_vars.py \ + hisatgenotype_hla_cyp.py \ + hisatgenotype_locus.py \ + hisatgenotype.py \ + $out/bin + ''; + + meta = with stdenv.lib; { + description = "Graph based aligner"; + license = licenses.gpl3; + homepage = https://ccb.jhu.edu/software/hisat2/index.shtml; + maintainers = with maintainers; [ jbedo ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; + +} diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 0ddbdab4c1b1..c141e6087bfc 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.18.11"; + version = "2.18.12"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "03wkyz3bjx3n8bwambhz9lr09271r1wxycmx4p7m2naqs4afxb89"; + sha256 = "0r5w71fcji4j3xjdhip9jlvmqi66x52af8b7mfxp4nz6xxl9ilxm"; }; buildInputs = [ jre makeWrapper ]; diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index d5dae364cc3d..80415189d457 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,7 +17,7 @@ let }; in stdenv.mkDerivation rec { - version = "14.29.17"; + version = "14.29.19"; pname = "jmol"; name = "${pname}-${version}"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "1dnxbvi8ha9z2ldymkjpxydd216afv6k7fdp3j70sql10zgy0isk"; + sha256 = "0sfbbi6mgj9hqzvcz19cr5s96rna2f2b1nc1d4j28xvva7qaqjm5"; }; patchPhase = '' diff --git a/pkgs/applications/science/geometry/drgeo/default.nix b/pkgs/applications/science/geometry/drgeo/default.nix index 8db1beedebbb..e233b91bbc91 100644 --- a/pkgs/applications/science/geometry/drgeo/default.nix +++ b/pkgs/applications/science/geometry/drgeo/default.nix @@ -20,8 +20,10 @@ stdenv.mkDerivation rec { cp drgeo.desktop.in drgeo.desktop ''; - meta = { + meta = with stdenv.lib; { description = "Interactive geometry program"; - platforms = stdenv.lib.platforms.linux; + homepage = https://sourceforge.net/projects/ofset; + license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix index 01dfc35f6e0d..2d5fcfd2d261 100644 --- a/pkgs/applications/science/logic/prooftree/default.nix +++ b/pkgs/applications/science/logic/prooftree/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (rec { dontAddPrefix = true; configureFlags = [ "--prefix" "$(out)" ]; - meta = { + meta = with stdenv.lib; { description = "A program for proof-tree visualization"; longDescription = '' Prooftree is a program for proof-tree visualization during interactive @@ -35,7 +35,8 @@ stdenv.mkDerivation (rec { shift-click). ''; homepage = http://askra.de/software/prooftree; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.jwiegley ]; + platforms = platforms.unix; + maintainers = [ maintainers.jwiegley ]; + license = licenses.gpl3; }; }) diff --git a/pkgs/applications/science/math/almonds/default.nix b/pkgs/applications/science/math/almonds/default.nix index 96613f4e38a6..b5d9632c551d 100644 --- a/pkgs/applications/science/math/almonds/default.nix +++ b/pkgs/applications/science/math/almonds/default.nix @@ -20,8 +20,7 @@ with python3.pkgs; buildPythonApplication rec { meta = with stdenv.lib; { description = "Terminal Mandelbrot fractal viewer"; homepage = https://github.com/Tenchi2xh/Almonds; - # No license has been specified - license = licenses.unfree; + license = licenses.mit; maintainers = with maintainers; [ infinisil ]; }; } diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix index 1a059aeb1670..9bbb695a331b 100644 --- a/pkgs/applications/science/math/pynac/default.nix +++ b/pkgs/applications/science/math/pynac/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { of the full GiNaC, and it is *only* meant to be used as a Python library. ''; homepage = http://pynac.org; + license = licenses.gpl3; maintainers = with maintainers; [ timokau ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/science/math/ripser/default.nix b/pkgs/applications/science/math/ripser/default.nix index 21948a279d07..5e0b7fc300ba 100644 --- a/pkgs/applications/science/math/ripser/default.nix +++ b/pkgs/applications/science/math/ripser/default.nix @@ -8,7 +8,8 @@ with stdenv.lib; -assert elem fileFormat ["lowerTriangularCsv" "upperTriangularCsv" "dipha"]; +assert assertOneOf "fileFormat" fileFormat + ["lowerTriangularCsv" "upperTriangularCsv" "dipha"]; assert useGoogleHashmap -> sparsehash != null; let diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index 08e3a752b8b6..7e62f0cf75ee 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -21,7 +21,7 @@ let sagelib = self.callPackage ./sagelib.nix { inherit flint ecl arb; - inherit sage-src pynac singular; + inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular; linbox = nixpkgs.linbox.override { withSage = true; }; }; @@ -41,13 +41,13 @@ let }; sage-env = self.callPackage ./sage-env.nix { - inherit sage-src python rWrapper ecl singular palp flint pynac pythonEnv; + inherit sage-src python rWrapper openblas-cblas-pc ecl singular palp flint pynac pythonEnv; pkg-config = nixpkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig }; sage-with-env = self.callPackage ./sage-with-env.nix { inherit pythonEnv; - inherit sage-src pynac singular; + inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular; pkg-config = nixpkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig three = nodePackages_8_x.three; }; @@ -60,6 +60,10 @@ let }; }; + openblas-blas-pc = callPackage ./openblas-pc.nix { name = "blas"; }; + openblas-cblas-pc = callPackage ./openblas-pc.nix { name = "cblas"; }; + openblas-lapack-pc = callPackage ./openblas-pc.nix { name = "lapack"; }; + sage-src = callPackage ./sage-src.nix {}; pythonRuntimeDeps = with python.pkgs; [ diff --git a/pkgs/applications/science/math/sage/openblas-pc.nix b/pkgs/applications/science/math/sage/openblas-pc.nix new file mode 100644 index 000000000000..f4669a6557e9 --- /dev/null +++ b/pkgs/applications/science/math/sage/openblas-pc.nix @@ -0,0 +1,17 @@ +{ openblasCompat +, writeTextFile +, name +}: + +writeTextFile { + name = "openblas-${name}-pc-${openblasCompat.version}"; + destination = "/lib/pkgconfig/${name}.pc"; + text = '' + Name: ${name} + Version: ${openblasCompat.version} + + Description: ${name} for SageMath, provided by the OpenBLAS package. + Cflags: -I${openblasCompat}/include + Libs: -L${openblasCompat}/lib -lopenblas + ''; +} diff --git a/pkgs/applications/science/math/sage/patches/numpy-1.14.3.patch b/pkgs/applications/science/math/sage/patches/numpy-1.15.1.patch similarity index 78% rename from pkgs/applications/science/math/sage/patches/numpy-1.14.3.patch rename to pkgs/applications/science/math/sage/patches/numpy-1.15.1.patch index 5927bc116096..9e855ba4ad94 100644 --- a/pkgs/applications/science/math/sage/patches/numpy-1.14.3.patch +++ b/pkgs/applications/science/math/sage/patches/numpy-1.15.1.patch @@ -1,5 +1,5 @@ diff --git a/src/doc/en/faq/faq-usage.rst b/src/doc/en/faq/faq-usage.rst -index 79b4205fd3..9a89bd2136 100644 +index 2347a1190d..f5b0fe71a4 100644 --- a/src/doc/en/faq/faq-usage.rst +++ b/src/doc/en/faq/faq-usage.rst @@ -338,7 +338,7 @@ ints. For example:: @@ -174,7 +174,7 @@ index 5b89cd75ee..e50b2ea5d4 100644 This creates a random 5x5 matrix ``A``, and solves `Ax=b` where ``b=[0.0,1.0,2.0,3.0,4.0]``. There are many other routines in the :mod:`numpy.linalg` diff --git a/src/sage/calculus/riemann.pyx b/src/sage/calculus/riemann.pyx -index df85cce43d..34ea164be0 100644 +index 60f37f7557..4ac3dedf1d 100644 --- a/src/sage/calculus/riemann.pyx +++ b/src/sage/calculus/riemann.pyx @@ -1191,30 +1191,30 @@ cpdef complex_to_spiderweb(np.ndarray[COMPLEX_T, ndim = 2] z_values, @@ -248,7 +248,7 @@ index df85cce43d..34ea164be0 100644 TESTS:: diff --git a/src/sage/combinat/fully_packed_loop.py b/src/sage/combinat/fully_packed_loop.py -index 61b1003002..4baee9cbbd 100644 +index 0a9bd61267..d2193cc2d6 100644 --- a/src/sage/combinat/fully_packed_loop.py +++ b/src/sage/combinat/fully_packed_loop.py @@ -72,11 +72,11 @@ def _make_color_list(n, colors=None, color_map=None, randomize=False): @@ -269,10 +269,10 @@ index 61b1003002..4baee9cbbd 100644 ['blue', 'blue', 'red', 'blue', 'red', 'red', 'red', 'blue'] """ diff --git a/src/sage/finance/time_series.pyx b/src/sage/finance/time_series.pyx -index c37700d14e..49b7298d0b 100644 +index 28779365df..3ab0282861 100644 --- a/src/sage/finance/time_series.pyx +++ b/src/sage/finance/time_series.pyx -@@ -109,8 +109,8 @@ cdef class TimeSeries: +@@ -111,8 +111,8 @@ cdef class TimeSeries: sage: import numpy sage: v = numpy.array([[1,2], [3,4]], dtype=float); v @@ -283,7 +283,7 @@ index c37700d14e..49b7298d0b 100644 sage: finance.TimeSeries(v) [1.0000, 2.0000, 3.0000, 4.0000] sage: finance.TimeSeries(v[:,0]) -@@ -2098,14 +2098,14 @@ cdef class TimeSeries: +@@ -2100,14 +2100,14 @@ cdef class TimeSeries: sage: w[0] = 20 sage: w @@ -301,7 +301,7 @@ index c37700d14e..49b7298d0b 100644 sage: v [20.0000, -3.0000, 4.5000, -2.0000] diff --git a/src/sage/functions/hyperbolic.py b/src/sage/functions/hyperbolic.py -index 931a4b41e4..bf33fc483d 100644 +index aff552f450..7a6df931e7 100644 --- a/src/sage/functions/hyperbolic.py +++ b/src/sage/functions/hyperbolic.py @@ -214,7 +214,7 @@ class Function_coth(GinacFunction): @@ -341,7 +341,7 @@ index 931a4b41e4..bf33fc483d 100644 return arctanh(1.0 / x) diff --git a/src/sage/functions/orthogonal_polys.py b/src/sage/functions/orthogonal_polys.py -index 017c85a96f..33fbb499c5 100644 +index ed6365bef4..99b8b04dad 100644 --- a/src/sage/functions/orthogonal_polys.py +++ b/src/sage/functions/orthogonal_polys.py @@ -810,12 +810,12 @@ class Func_chebyshev_T(ChebyshevFunction): @@ -379,10 +379,10 @@ index 017c85a96f..33fbb499c5 100644 array([ 0.2 , -0.96]) """ diff --git a/src/sage/functions/other.py b/src/sage/functions/other.py -index 679384c907..d63b295a4c 100644 +index 1883daa3e6..9885222817 100644 --- a/src/sage/functions/other.py +++ b/src/sage/functions/other.py -@@ -390,7 +390,7 @@ class Function_ceil(BuiltinFunction): +@@ -389,7 +389,7 @@ class Function_ceil(BuiltinFunction): sage: import numpy sage: a = numpy.linspace(0,2,6) sage: ceil(a) @@ -391,7 +391,7 @@ index 679384c907..d63b295a4c 100644 Test pickling:: -@@ -539,7 +539,7 @@ class Function_floor(BuiltinFunction): +@@ -553,7 +553,7 @@ class Function_floor(BuiltinFunction): sage: import numpy sage: a = numpy.linspace(0,2,6) sage: floor(a) @@ -400,7 +400,7 @@ index 679384c907..d63b295a4c 100644 sage: floor(x)._sympy_() floor(x) -@@ -840,7 +840,7 @@ def sqrt(x, *args, **kwds): +@@ -869,7 +869,7 @@ def sqrt(x, *args, **kwds): sage: import numpy sage: a = numpy.arange(2,5) sage: sqrt(a) @@ -409,11 +409,35 @@ index 679384c907..d63b295a4c 100644 """ if isinstance(x, float): return math.sqrt(x) +diff --git a/src/sage/functions/spike_function.py b/src/sage/functions/spike_function.py +index 1e021de3fe..56635ca98f 100644 +--- a/src/sage/functions/spike_function.py ++++ b/src/sage/functions/spike_function.py +@@ -157,7 +157,7 @@ class SpikeFunction: + sage: S = spike_function([(-3,4),(-1,1),(2,3)]); S + A spike function with spikes at [-3.0, -1.0, 2.0] + sage: P = S.plot_fft_abs(8) +- sage: p = P[0]; p.ydata ++ sage: p = P[0]; p.ydata # abs tol 1e-8 + [5.0, 5.0, 3.367958691924177, 3.367958691924177, 4.123105625617661, 4.123105625617661, 4.759921664218055, 4.759921664218055] + """ + w = self.vector(samples = samples, xmin=xmin, xmax=xmax) +@@ -176,8 +176,8 @@ class SpikeFunction: + sage: S = spike_function([(-3,4),(-1,1),(2,3)]); S + A spike function with spikes at [-3.0, -1.0, 2.0] + sage: P = S.plot_fft_arg(8) +- sage: p = P[0]; p.ydata +- [0.0, 0.0, -0.211524990023434..., -0.211524990023434..., 0.244978663126864..., 0.244978663126864..., -0.149106180027477..., -0.149106180027477...] ++ sage: p = P[0]; p.ydata # abs tol 1e-8 ++ [0.0, 0.0, -0.211524990023434, -0.211524990023434, 0.244978663126864, 0.244978663126864, -0.149106180027477, -0.149106180027477] + """ + w = self.vector(samples = samples, xmin=xmin, xmax=xmax) + xmin, xmax = self._ranges(xmin, xmax) diff --git a/src/sage/functions/trig.py b/src/sage/functions/trig.py -index e7e7a311cd..e7ff78a9de 100644 +index 501e7ff6b6..5f760912f0 100644 --- a/src/sage/functions/trig.py +++ b/src/sage/functions/trig.py -@@ -731,7 +731,7 @@ class Function_arccot(GinacFunction): +@@ -724,7 +724,7 @@ class Function_arccot(GinacFunction): sage: import numpy sage: a = numpy.arange(2, 5) sage: arccot(a) @@ -422,7 +446,7 @@ index e7e7a311cd..e7ff78a9de 100644 """ return math.pi/2 - arctan(x) -@@ -787,7 +787,7 @@ class Function_arccsc(GinacFunction): +@@ -780,7 +780,7 @@ class Function_arccsc(GinacFunction): sage: import numpy sage: a = numpy.arange(2, 5) sage: arccsc(a) @@ -431,7 +455,7 @@ index e7e7a311cd..e7ff78a9de 100644 """ return arcsin(1.0/x) -@@ -845,7 +845,7 @@ class Function_arcsec(GinacFunction): +@@ -838,7 +838,7 @@ class Function_arcsec(GinacFunction): sage: import numpy sage: a = numpy.arange(2, 5) sage: arcsec(a) @@ -440,7 +464,7 @@ index e7e7a311cd..e7ff78a9de 100644 """ return arccos(1.0/x) -@@ -920,13 +920,13 @@ class Function_arctan2(GinacFunction): +@@ -913,13 +913,13 @@ class Function_arctan2(GinacFunction): sage: a = numpy.linspace(1, 3, 3) sage: b = numpy.linspace(3, 6, 3) sage: atan2(a, b) @@ -458,10 +482,10 @@ index e7e7a311cd..e7ff78a9de 100644 TESTS:: diff --git a/src/sage/matrix/constructor.pyx b/src/sage/matrix/constructor.pyx -index 19a1d37df0..5780dfae1c 100644 +index 12136f1773..491bf22e62 100644 --- a/src/sage/matrix/constructor.pyx +++ b/src/sage/matrix/constructor.pyx -@@ -494,8 +494,8 @@ class MatrixFactory(object): +@@ -503,8 +503,8 @@ def matrix(*args, **kwds): [7 8 9] Full MatrixSpace of 3 by 3 dense matrices over Integer Ring sage: n = matrix(QQ, 2, 2, [1, 1/2, 1/3, 1/4]).numpy(); n @@ -473,10 +497,31 @@ index 19a1d37df0..5780dfae1c 100644 [ 1 1/2] [1/3 1/4] diff --git a/src/sage/matrix/matrix_double_dense.pyx b/src/sage/matrix/matrix_double_dense.pyx -index 48e0a8a97f..1be5d35b19 100644 +index 66e54a79a4..0498334f4b 100644 --- a/src/sage/matrix/matrix_double_dense.pyx +++ b/src/sage/matrix/matrix_double_dense.pyx -@@ -2546,7 +2546,7 @@ cdef class Matrix_double_dense(Matrix_dense): +@@ -606,6 +606,9 @@ cdef class Matrix_double_dense(Matrix_dense): + [ 3.0 + 9.0*I 4.0 + 16.0*I 5.0 + 25.0*I] + [6.0 + 36.0*I 7.0 + 49.0*I 8.0 + 64.0*I] + sage: B.condition() ++ doctest:warning ++ ... ++ ComplexWarning: Casting complex values to real discards the imaginary part + 203.851798... + sage: B.condition(p='frob') + 203.851798... +@@ -654,9 +657,7 @@ cdef class Matrix_double_dense(Matrix_dense): + True + sage: B = A.change_ring(CDF) + sage: B.condition() +- Traceback (most recent call last): +- ... +- LinAlgError: Singular matrix ++ +Infinity + + Improper values of ``p`` are caught. :: + +@@ -2519,7 +2520,7 @@ cdef class Matrix_double_dense(Matrix_dense): sage: P.is_unitary(algorithm='orthonormal') Traceback (most recent call last): ... @@ -485,7 +530,7 @@ index 48e0a8a97f..1be5d35b19 100644 TESTS:: -@@ -3662,8 +3662,8 @@ cdef class Matrix_double_dense(Matrix_dense): +@@ -3635,8 +3636,8 @@ cdef class Matrix_double_dense(Matrix_dense): [0.0 1.0 2.0] [3.0 4.0 5.0] sage: m.numpy() @@ -496,7 +541,7 @@ index 48e0a8a97f..1be5d35b19 100644 Alternatively, numpy automatically calls this function (via the magic :meth:`__array__` method) to convert Sage matrices -@@ -3674,16 +3674,16 @@ cdef class Matrix_double_dense(Matrix_dense): +@@ -3647,16 +3648,16 @@ cdef class Matrix_double_dense(Matrix_dense): [0.0 1.0 2.0] [3.0 4.0 5.0] sage: numpy.array(m) @@ -518,10 +563,10 @@ index 48e0a8a97f..1be5d35b19 100644 dtype('complex128') diff --git a/src/sage/matrix/special.py b/src/sage/matrix/special.py -index c698ba5e97..b743bab354 100644 +index ccbd208810..c3f9a65093 100644 --- a/src/sage/matrix/special.py +++ b/src/sage/matrix/special.py -@@ -705,7 +705,7 @@ def diagonal_matrix(arg0=None, arg1=None, arg2=None, sparse=True): +@@ -706,7 +706,7 @@ def diagonal_matrix(arg0=None, arg1=None, arg2=None, sparse=True): sage: import numpy sage: entries = numpy.array([1.2, 5.6]); entries @@ -530,7 +575,7 @@ index c698ba5e97..b743bab354 100644 sage: A = diagonal_matrix(3, entries); A [1.2 0.0 0.0] [0.0 5.6 0.0] -@@ -715,7 +715,7 @@ def diagonal_matrix(arg0=None, arg1=None, arg2=None, sparse=True): +@@ -716,7 +716,7 @@ def diagonal_matrix(arg0=None, arg1=None, arg2=None, sparse=True): sage: j = numpy.complex(0,1) sage: entries = numpy.array([2.0+j, 8.1, 3.4+2.6*j]); entries @@ -540,10 +585,10 @@ index c698ba5e97..b743bab354 100644 [2.0 + 1.0*I 0.0 0.0] [ 0.0 8.1 0.0] diff --git a/src/sage/modules/free_module_element.pyx b/src/sage/modules/free_module_element.pyx -index 230f142117..2ab1c0ae68 100644 +index 37d92c1282..955d083b34 100644 --- a/src/sage/modules/free_module_element.pyx +++ b/src/sage/modules/free_module_element.pyx -@@ -982,7 +982,7 @@ cdef class FreeModuleElement(Vector): # abstract base class +@@ -988,7 +988,7 @@ cdef class FreeModuleElement(Vector): # abstract base class sage: v.numpy() array([1, 2, 5/6], dtype=object) sage: v.numpy(dtype=float) @@ -552,7 +597,7 @@ index 230f142117..2ab1c0ae68 100644 sage: v.numpy(dtype=int) array([1, 2, 0]) sage: import numpy -@@ -993,7 +993,7 @@ cdef class FreeModuleElement(Vector): # abstract base class +@@ -999,7 +999,7 @@ cdef class FreeModuleElement(Vector): # abstract base class be more efficient but may have unintended consequences:: sage: v.numpy(dtype=None) @@ -596,22 +641,6 @@ index 39fc2970de..2badf98284 100644 """ if dtype is None or dtype is self._vector_numpy.dtype: from copy import copy -diff --git a/src/sage/numerical/optimize.py b/src/sage/numerical/optimize.py -index 17b5ebb84b..92ce35c502 100644 ---- a/src/sage/numerical/optimize.py -+++ b/src/sage/numerical/optimize.py -@@ -486,9 +486,9 @@ def minimize_constrained(func,cons,x0,gradient=None,algorithm='default', **args) - else: - min = optimize.fmin_tnc(f, x0, approx_grad=True, bounds=cons, messages=0, **args)[0] - elif isinstance(cons[0], function_type) or isinstance(cons[0], Expression): -- min = optimize.fmin_cobyla(f, x0, cons, iprint=0, **args) -+ min = optimize.fmin_cobyla(f, x0, cons, disp=0, **args) - elif isinstance(cons, function_type) or isinstance(cons, Expression): -- min = optimize.fmin_cobyla(f, x0, cons, iprint=0, **args) -+ min = optimize.fmin_cobyla(f, x0, cons, disp=0, **args) - return vector(RDF, min) - - diff --git a/src/sage/plot/complex_plot.pyx b/src/sage/plot/complex_plot.pyx index ad9693da62..758fb709b7 100644 --- a/src/sage/plot/complex_plot.pyx @@ -649,6 +678,76 @@ index ad9693da62..758fb709b7 100644 """ import numpy cdef unsigned int i, j, imax, jmax +diff --git a/src/sage/plot/histogram.py b/src/sage/plot/histogram.py +index 5d28473731..fc4b2046c0 100644 +--- a/src/sage/plot/histogram.py ++++ b/src/sage/plot/histogram.py +@@ -53,10 +53,17 @@ class Histogram(GraphicPrimitive): + """ + import numpy as np + self.datalist=np.asarray(datalist,dtype=float) ++ if 'normed' in options: ++ from sage.misc.superseded import deprecation ++ deprecation(25260, "the 'normed' option is deprecated. Use 'density' instead.") + if 'linestyle' in options: + from sage.plot.misc import get_matplotlib_linestyle + options['linestyle'] = get_matplotlib_linestyle( + options['linestyle'], return_type='long') ++ if options.get('range', None): ++ # numpy.histogram performs type checks on "range" so this must be ++ # actual floats ++ options['range'] = [float(x) for x in options['range']] + GraphicPrimitive.__init__(self, options) + + def get_minmax_data(self): +@@ -80,10 +87,14 @@ class Histogram(GraphicPrimitive): + {'xmax': 4.0, 'xmin': 0, 'ymax': 2, 'ymin': 0} + + TESTS:: +- + sage: h = histogram([10,3,5], normed=True)[0] +- sage: h.get_minmax_data() # rel tol 1e-15 +- {'xmax': 10.0, 'xmin': 3.0, 'ymax': 0.4761904761904765, 'ymin': 0} ++ doctest:warning...: ++ DeprecationWarning: the 'normed' option is deprecated. Use 'density' instead. ++ See https://trac.sagemath.org/25260 for details. ++ sage: h.get_minmax_data() ++ doctest:warning ...: ++ VisibleDeprecationWarning: Passing `normed=True` on non-uniform bins has always been broken, and computes neither the probability density function nor the probability mass function. The result is only correct if the bins are uniform, when density=True will produce the same result anyway. The argument will be removed in a future version of numpy. ++ {'xmax': 10.0, 'xmin': 3.0, 'ymax': 0.476190476190..., 'ymin': 0} + """ + import numpy + +@@ -152,7 +163,7 @@ class Histogram(GraphicPrimitive): + 'rwidth': 'The relative width of the bars as a fraction of the bin width', + 'cumulative': '(True or False) If True, then a histogram is computed in which each bin gives the counts in that bin plus all bins for smaller values. Negative values give a reversed direction of accumulation.', + 'range': 'A list [min, max] which define the range of the histogram. Values outside of this range are treated as outliers and omitted from counts.', +- 'normed': 'Deprecated alias for density', ++ 'normed': 'Deprecated. Use density instead.', + 'density': '(True or False) If True, the counts are normalized to form a probability density. (n/(len(x)*dbin)', + 'weights': 'A sequence of weights the same length as the data list. If supplied, then each value contributes its associated weight to the bin count.', + 'stacked': '(True or False) If True, multiple data are stacked on top of each other.', +@@ -199,7 +210,7 @@ class Histogram(GraphicPrimitive): + subplot.hist(self.datalist.transpose(), **options) + + +-@options(aspect_ratio='automatic',align='mid', weights=None, range=None, bins=10, edgecolor='black') ++@options(aspect_ratio='automatic', align='mid', weights=None, range=None, bins=10, edgecolor='black') + def histogram(datalist, **options): + """ + Computes and draws the histogram for list(s) of numerical data. +@@ -231,8 +242,9 @@ def histogram(datalist, **options): + - ``linewidth`` -- (float) width of the lines defining the bars + - ``linestyle`` -- (default: 'solid') Style of the line. One of 'solid' + or '-', 'dashed' or '--', 'dotted' or ':', 'dashdot' or '-.' +- - ``density`` -- (boolean - default: False) If True, the counts are +- normalized to form a probability density. ++ - ``density`` -- (boolean - default: False) If True, the result is the ++ value of the probability density function at the bin, normalized such ++ that the integral over the range is 1. + - ``range`` -- A list [min, max] which define the range of the + histogram. Values outside of this range are treated as outliers and + omitted from counts diff --git a/src/sage/plot/line.py b/src/sage/plot/line.py index 23f5e61446..3b1b51d7cf 100644 --- a/src/sage/plot/line.py @@ -718,7 +817,7 @@ index f3da57c370..3806f4b32f 100644 TESTS: diff --git a/src/sage/probability/probability_distribution.pyx b/src/sage/probability/probability_distribution.pyx -index f66cd898b9..35995886d5 100644 +index 1b119e323f..3290b00695 100644 --- a/src/sage/probability/probability_distribution.pyx +++ b/src/sage/probability/probability_distribution.pyx @@ -130,7 +130,17 @@ cdef class ProbabilityDistribution: @@ -741,10 +840,10 @@ index f66cd898b9..35995886d5 100644 import pylab l = [float(self.get_random_element()) for _ in range(num_samples)] diff --git a/src/sage/rings/rational.pyx b/src/sage/rings/rational.pyx -index a0bfe080f5..7d95e7a1a8 100644 +index 12ca1b222b..9bad7dae0c 100644 --- a/src/sage/rings/rational.pyx +++ b/src/sage/rings/rational.pyx -@@ -1056,7 +1056,7 @@ cdef class Rational(sage.structure.element.FieldElement): +@@ -1041,7 +1041,7 @@ cdef class Rational(sage.structure.element.FieldElement): dtype('O') sage: numpy.array([1, 1/2, 3/4]) @@ -754,10 +853,10 @@ index a0bfe080f5..7d95e7a1a8 100644 if mpz_cmp_ui(mpq_denref(self.value), 1) == 0: if mpz_fits_slong_p(mpq_numref(self.value)): diff --git a/src/sage/rings/real_mpfr.pyx b/src/sage/rings/real_mpfr.pyx -index 4c630867a4..64e2187f5b 100644 +index 9b90c8833e..1ce05b937d 100644 --- a/src/sage/rings/real_mpfr.pyx +++ b/src/sage/rings/real_mpfr.pyx -@@ -1438,7 +1438,7 @@ cdef class RealNumber(sage.structure.element.RingElement): +@@ -1439,7 +1439,7 @@ cdef class RealNumber(sage.structure.element.RingElement): sage: import numpy sage: numpy.arange(10.0) @@ -767,10 +866,10 @@ index 4c630867a4..64e2187f5b 100644 dtype('float64') sage: numpy.array([1.000000000000000000000000000000000000]).dtype diff --git a/src/sage/schemes/elliptic_curves/height.py b/src/sage/schemes/elliptic_curves/height.py -index 3d270ebf9d..1144f168e3 100644 +index de31fe9883..7a33ea6f5b 100644 --- a/src/sage/schemes/elliptic_curves/height.py +++ b/src/sage/schemes/elliptic_curves/height.py -@@ -1623,18 +1623,18 @@ class EllipticCurveCanonicalHeight: +@@ -1627,18 +1627,18 @@ class EllipticCurveCanonicalHeight: even:: sage: H.wp_on_grid(v,4) @@ -798,10 +897,10 @@ index 3d270ebf9d..1144f168e3 100644 tau = self.tau(v) fk, err = self.fk_intervals(v, 15, CDF) diff --git a/src/sage/symbolic/ring.pyx b/src/sage/symbolic/ring.pyx -index 2dcb0492b9..2b1a06385c 100644 +index 9da38002e8..d61e74bf82 100644 --- a/src/sage/symbolic/ring.pyx +++ b/src/sage/symbolic/ring.pyx -@@ -1135,7 +1135,7 @@ cdef class NumpyToSRMorphism(Morphism): +@@ -1136,7 +1136,7 @@ cdef class NumpyToSRMorphism(Morphism): sage: cos(numpy.int('2')) cos(2) sage: numpy.cos(numpy.int('2')) diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix index 74c2e0aa0360..317eb6e16c49 100644 --- a/pkgs/applications/science/math/sage/sage-env.nix +++ b/pkgs/applications/science/math/sage/sage-env.nix @@ -37,7 +37,7 @@ , lcalc , rubiks , flintqs -, openblasCompat +, openblas-cblas-pc , flint , gmp , mpfr @@ -98,9 +98,9 @@ writeTextFile rec { export PKG_CONFIG_PATH='${lib.concatStringsSep ":" (map (pkg: "${pkg}/lib/pkgconfig") [ # This is only needed in the src/sage/misc/cython.py test and I'm not sure if there's really a use-case # for it outside of the tests. However since singular and openblas are runtime dependencies anyways - # it doesn't really hurt to include. + # and openblas-cblas-pc is tiny, it doesn't really hurt to include. singular - openblasCompat + openblas-cblas-pc ]) }' export SAGE_ROOT='${sage-src}' diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 7fd49fe205cc..f74da33f4026 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -94,9 +94,20 @@ stdenv.mkDerivation rec { stripLen = 1; }) - # Only formatting changes. + (fetchpatch { + name = "matplotlib-2.2.2"; + url = "https://git.sagemath.org/sage.git/patch?id=0d6244ed53b71aba861ce3d683d33e542c0bf0b0"; + sha256 = "15x4cadxxlsdfh2sblgagqjj6ir13fgdzixxnwnvzln60saahb34"; + }) + + (fetchpatch { + name = "scipy-1.1.0"; + url = "https://git.sagemath.org/sage.git/patch?id=e0db968a51678b34ebd8d34906c7042900272378"; + sha256 = "0kq5zxqphhrmavrmg830wdr7hwp1bkzdqlf3jfqfr8r8xq12qwf7"; + }) + # https://trac.sagemath.org/ticket/25260 - ./patches/numpy-1.14.3.patch + ./patches/numpy-1.15.1.patch # https://trac.sagemath.org/ticket/25862 ./patches/eclib-20180710.patch diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix index 8ccf8b5a4938..63b9772b8231 100644 --- a/pkgs/applications/science/math/sage/sage-with-env.nix +++ b/pkgs/applications/science/math/sage/sage-with-env.nix @@ -4,6 +4,9 @@ , sage-env , sage-src , openblasCompat +, openblas-blas-pc +, openblas-cblas-pc +, openblas-lapack-pc , pkg-config , three , singular @@ -29,6 +32,9 @@ let makeWrapper pkg-config openblasCompat # lots of segfaults with regular (64 bit) openblas + openblas-blas-pc + openblas-cblas-pc + openblas-lapack-pc singular three pynac diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix index c1dbcf38304e..abcefba5e260 100644 --- a/pkgs/applications/science/math/sage/sagelib.nix +++ b/pkgs/applications/science/math/sage/sagelib.nix @@ -3,6 +3,9 @@ , buildPythonPackage , arb , openblasCompat +, openblas-blas-pc +, openblas-cblas-pc +, openblas-lapack-pc , brial , cliquer , cypari2 @@ -56,7 +59,9 @@ buildPythonPackage rec { nativeBuildInputs = [ iml perl - openblasCompat + openblas-blas-pc + openblas-cblas-pc + openblas-lapack-pc jupyter_core ]; diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index e966e798ae6d..2ec1ded68a26 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -67,10 +67,11 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - meta = { + meta = with stdenv.lib; { homepage = https://root.cern.ch/; description = "A data analysis framework"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; + platforms = platforms.unix; + maintainers = [ maintainers.veprbl ]; + license = licenses.lgpl21; }; } diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix index fea6fb358303..097c1e86a897 100644 --- a/pkgs/applications/version-management/bazaar/default.nix +++ b/pkgs/applications/version-management/bazaar/default.nix @@ -27,9 +27,10 @@ python2Packages.buildPythonApplication rec { --subst-var-by certPath /etc/ssl/certs/ca-certificates.crt ''; - meta = { + meta = with stdenv.lib; { homepage = http://bazaar-vcs.org/; description = "A distributed version control system that Just Works"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/applications/version-management/bazaar/tools.nix b/pkgs/applications/version-management/bazaar/tools.nix index 0ad3c6079acd..82c87f30b711 100644 --- a/pkgs/applications/version-management/bazaar/tools.nix +++ b/pkgs/applications/version-management/bazaar/tools.nix @@ -3,7 +3,7 @@ python2Packages.buildPythonApplication rec { name = "bzr-tools-${version}"; version = "2.6.0"; - + src = fetchurl { url = "http://launchpad.net/bzrtools/stable/${version}/+download/bzrtools-${version}.tar.gz"; sha256 = "0n3zzc6jf5866kfhmrnya1vdr2ja137a45qrzsz8vz6sc6xgn5wb"; @@ -11,9 +11,10 @@ python2Packages.buildPythonApplication rec { doCheck = false; - meta = { + meta = with stdenv.lib; { description = "Bazaar plugins"; homepage = http://wiki.bazaar.canonical.com/BzrTools; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.gpl2; }; } diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix index 90a9f26045f3..5dc0c48b0f78 100644 --- a/pkgs/applications/version-management/cvs2svn/default.nix +++ b/pkgs/applications/version-management/cvs2svn/default.nix @@ -23,10 +23,11 @@ stdenv.mkDerivation rec { /* !!! maybe we should absolutise the program names in $out/lib/python2.4/site-packages/cvs2svn_lib/config.py. */ - meta = { + meta = with stdenv.lib; { description = "A tool to convert CVS repositories to Subversion repositories"; homepage = http://cvs2svn.tigris.org/; - maintainers = [ lib.maintainers.makefu ]; - platforms = stdenv.lib.platforms.unix; + maintainers = [ maintainers.makefu ]; + platforms = platforms.unix; + license = licenses.asl20; }; } diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 3fb227909040..5bfd74344e8c 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt , docbook_xsl, pkgconfig, luajit -, gzip, bzip2, xz +, groff, gzip, bzip2, xz , python, wrapPython, pygments, markdown }: @@ -32,6 +32,9 @@ stdenv.mkDerivation rec { -e 's|"bzip2"|"${bzip2.bin}/bin/bzip2"|' \ -e 's|"xz"|"${xz.bin}/bin/xz"|' \ -i ui-snapshot.c + + substituteInPlace filters/html-converters/man2html \ + --replace 'groff' '${groff}/bin/groff' ''; # Give cgit a git source tree and pass configuration parameters (as make diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix index 17fb74945dc4..35c6d33d74da 100644 --- a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, qmake, qtbase, qttools, subversion, apr }: let - version = "1.0.12"; + version = "1.0.13"; in stdenv.mkDerivation { name = "svn-all-fast-export-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { owner = "svn-all-fast-export"; repo = "svn2git"; rev = version; - sha256 = "158w2ynz16dlp992g8nfk7v2f5962z88b4xyv5dyjvbl4l1v7r0v"; + sha256 = "0f1qj0c4cdq46mz54wcy17g7rq1fy2q0bq3sswhr7r5a2s433x4f"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix index 88074a0862c1..33d2eb89ad08 100644 --- a/pkgs/applications/version-management/guitone/default.nix +++ b/pkgs/applications/version-management/guitone/default.nix @@ -25,8 +25,9 @@ stdenv.mkDerivation rec { meta = { description = "Qt4 based GUI for monotone"; - homepage = http://guitone.thomaskeller.biz; + homepage = https://guitone.thomaskeller.biz; downloadPage = https://code.monotone.ca/p/guitone/; + license = stdenv.lib.licenses.gpl3; inherit (qt4.meta) platforms; }; } diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix index 4282f48654e6..0606c58c09d5 100644 --- a/pkgs/applications/version-management/monotone/default.nix +++ b/pkgs/applications/version-management/monotone/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { patches = [ ./monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ boost zlib botan libidn lua pcre sqlite expect + buildInputs = [ boost zlib botan libidn lua pcre sqlite expect openssl gmp bzip2 ]; postInstall = '' @@ -33,9 +33,10 @@ stdenv.mkDerivation rec { #doCheck = true; # some tests fail (and they take VERY long) - meta = { + meta = with stdenv.lib; { description = "A free distributed version control system"; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; + maintainers = [ maintainers.raskin ]; + platforms = platforms.unix; + license = licenses.gpl2; }; } diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 5a37857fa479..71369709b5da 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -2,11 +2,11 @@ python2Packages.buildPythonApplication rec { name = "tortoisehg-${version}"; - version = "4.6.1"; + version = "4.7"; src = fetchurl { url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz"; - sha256 = "1argpi5h0fv4ilahi52c98xgvsvz27lvqi41hzw1f81mhjgyhqik"; + sha256 = "1s99dmz8izsyj5mpnqlx9dasw8ar2lr68r3m1wyafzbqlqmbjbqm"; }; pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ]; diff --git a/pkgs/applications/version-management/vcprompt/default.nix b/pkgs/applications/version-management/vcprompt/default.nix index 4afb1b20e32c..c2bf0a4183c1 100644 --- a/pkgs/applications/version-management/vcprompt/default.nix +++ b/pkgs/applications/version-management/vcprompt/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { homepage = http://hg.gerg.ca/vcprompt; maintainers = with maintainers; [ cstrahan ]; platforms = with platforms; linux ++ darwin; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/applications/video/kodi/commons.nix b/pkgs/applications/video/kodi/commons.nix deleted file mode 100644 index eff9b7871069..000000000000 --- a/pkgs/applications/video/kodi/commons.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ stdenv, fetchFromGitHub -, cmake, kodiPlain, libcec_platform, tinyxml }: - -rec { - - pluginDir = "/share/kodi/addons"; - - kodi-platform = stdenv.mkDerivation rec { - project = "kodi-platform"; - version = "17.1"; - name = "${project}-${version}"; - - src = fetchFromGitHub { - owner = "xbmc"; - repo = project; - rev = "c8188d82678fec6b784597db69a68e74ff4986b5"; - sha256 = "1r3gs3c6zczmm66qcxh9mr306clwb3p7ykzb70r3jv5jqggiz199"; - }; - - buildInputs = [ cmake kodiPlain libcec_platform tinyxml ]; - - }; - - mkKodiAPIPlugin = { plugin, namespace, version, src, meta, sourceDir ? null, ... }: - stdenv.lib.makeOverridable stdenv.mkDerivation rec { - - inherit src meta sourceDir; - - name = "kodi-plugin-${plugin}-${version}"; - - passthru = { - kodiPlugin = pluginDir; - namespace = namespace; - }; - - dontStrip = true; - - installPhase = '' - ${if isNull sourceDir then "" else "cd $src/$sourceDir"} - d=$out${pluginDir}/${namespace} - mkdir -p $d - sauce="." - [ -d ${namespace} ] && sauce=${namespace} - cp -R "$sauce/"* $d - ''; - - }; - - mkKodiPlugin = mkKodiAPIPlugin; - - mkKodiABIPlugin = { plugin, namespace, version, src, meta - , extraBuildInputs ? [], sourceDir ? null, ... }: - stdenv.lib.makeOverridable stdenv.mkDerivation rec { - - inherit src meta sourceDir; - - name = "kodi-plugin-${plugin}-${version}"; - - passthru = { - kodiPlugin = pluginDir; - namespace = namespace; - }; - - dontStrip = true; - - buildInputs = [ cmake kodiPlain kodi-platform libcec_platform ] - ++ extraBuildInputs; - - # disables check ensuring install prefix is that of kodi - cmakeFlags = [ - "-DOVERRIDE_PATHS=1" - ]; - - # kodi checks for plugin .so libs existance in the addon folder (share/...) - # and the non-wrapped kodi lib/... folder before even trying to dlopen - # them. Symlinking .so, as setting LD_LIBRARY_PATH is of no use - installPhase = let n = namespace; in '' - make install - ln -s $out/lib/addons/${n}/${n}.so.${version} $out/${pluginDir}/${n}/${n}.so.${version} - ''; - - }; -} diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 454665455c51..9272d3c8e269 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper -, pkgconfig, cmake, gnumake, yasm, python2 +, pkgconfig, cmake, gnumake, yasm, python2Packages , libgcrypt, libgpgerror, libunistring , boost, avahi, lame, autoreconfHook , gettext, pcre-cpp, yajl, fribidi, which @@ -119,7 +119,7 @@ in stdenv.mkDerivation rec { buildInputs = [ gnutls libidn libtasn1 nasm p11-kit - libxml2 yasm python2 + libxml2 yasm python2Packages.python boost libmicrohttpd gettext pcre-cpp yajl fribidi libva libdrm openssl gperf tinyxml2 taglib libssh swig jre @@ -187,7 +187,7 @@ in stdenv.mkDerivation rec { postInstall = '' for p in $(ls $out/bin/) ; do wrapProgram $out/bin/$p \ - --prefix PATH ":" "${lib.makeBinPath [ python2 glxinfo xdpyinfo ]}" \ + --prefix PATH ":" "${lib.makeBinPath [ python2Packages.python glxinfo xdpyinfo ]}" \ --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath ([ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass ] ++ lib.optional nfsSupport libnfs)}" done @@ -200,6 +200,10 @@ in stdenv.mkDerivation rec { installCheckPhase = "$out/bin/kodi --version"; + passthru = { + pythonPackages = python2Packages; + }; + meta = with stdenv.lib; { description = "Media center"; homepage = https://kodi.tv/; diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 5a0583202e6d..f2ceacdd799f 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -1,9 +1,90 @@ { stdenv, callPackage, fetchurl, fetchFromGitHub, unzip +, cmake, kodiPlain, libcec_platform, tinyxml , steam, libusb, pcre-cpp, jsoncpp, libhdhomerun, zlib }: -with (callPackage ./commons.nix {}); +with stdenv.lib; -rec { +let self = rec { + + pluginDir = "/share/kodi/addons"; + + kodi = kodiPlain; + + # Convert derivation to a kodi module. Stolen from ../../../top-level/python-packages.nix + toKodiPlugin = drv: drv.overrideAttrs(oldAttrs: { + # Use passthru in order to prevent rebuilds when possible. + passthru = (oldAttrs.passthru or {})// { + kodiPluginFor = kodi; + requiredKodiPlugins = requiredKodiPlugins drv.propagatedBuildInputs; + }; + }); + + # Check whether a derivation provides a Kodi plugin. + hasKodiPlugin = drv: drv ? kodiPluginFor && drv.kodiPluginFor == kodi; + + # Get list of required Kodi plugins given a list of derivations. + requiredKodiPlugins = drvs: let + modules = filter hasKodiPlugin drvs; + in unique (modules ++ concatLists (catAttrs "requiredKodiPlugins" modules)); + + kodiWithPlugins = func: callPackage ./wrapper.nix { + inherit kodi; + plugins = requiredKodiPlugins (func self); + }; + + kodi-platform = stdenv.mkDerivation rec { + project = "kodi-platform"; + version = "17.1"; + name = "${project}-${version}"; + + src = fetchFromGitHub { + owner = "xbmc"; + repo = project; + rev = "c8188d82678fec6b784597db69a68e74ff4986b5"; + sha256 = "1r3gs3c6zczmm66qcxh9mr306clwb3p7ykzb70r3jv5jqggiz199"; + }; + + buildInputs = [ cmake kodiPlain libcec_platform tinyxml ]; + }; + + mkKodiPlugin = { plugin, namespace, version, sourceDir ? null, ... }@args: + toKodiPlugin (stdenv.mkDerivation (rec { + name = "kodi-plugin-${plugin}-${version}"; + + dontStrip = true; + + installPhase = '' + ${if isNull sourceDir then "" else "cd $src/$sourceDir"} + d=$out${pluginDir}/${namespace} + mkdir -p $d + sauce="." + [ -d ${namespace} ] && sauce=${namespace} + cp -R "$sauce/"* $d + ''; + } // args)); + + mkKodiABIPlugin = { plugin, namespace, version, extraBuildInputs ? [], ... }@args: + toKodiPlugin (stdenv.mkDerivation (rec { + name = "kodi-plugin-${plugin}-${version}"; + + dontStrip = true; + + buildInputs = [ cmake kodiPlain kodi-platform libcec_platform ] + ++ extraBuildInputs; + + # disables check ensuring install prefix is that of kodi + cmakeFlags = [ + "-DOVERRIDE_PATHS=1" + ]; + + # kodi checks for plugin .so libs existance in the addon folder (share/...) + # and the non-wrapped kodi lib/... folder before even trying to dlopen + # them. Symlinking .so, as setting LD_LIBRARY_PATH is of no use + installPhase = let n = namespace; in '' + make install + ln -s $out/lib/addons/${n}/${n}.so.${version} $out${pluginDir}/${n}/${n}.so.${version} + ''; + } // args)); advanced-launcher = mkKodiPlugin rec { @@ -18,7 +99,7 @@ rec { sha256 = "142vvgs37asq5m54xqhjzqvgmb0xlirvm0kz6lxaqynp0vvgrkx2"; }; - meta = with stdenv.lib; { + meta = { homepage = https://forum.kodi.tv/showthread.php?tid=85724; description = "A program launcher for Kodi"; longDescription = '' @@ -48,7 +129,7 @@ rec { sha256 = "1sv9z77jj6bam6llcnd9b3dgkbvhwad2m1v541rv3acrackms2z2"; }; - meta = with stdenv.lib; { + meta = { homepage = https://forum.kodi.tv/showthread.php?tid=287826; description = "A program launcher for Kodi"; longDescription = '' @@ -75,7 +156,7 @@ rec { sha256 = "0sbc0w0fwbp7rbmbgb6a1kglhnn5g85hijcbbvf5x6jdq9v3f1qb"; }; - meta = with stdenv.lib; { + meta = { description = "Add support for different gaming controllers."; platforms = platforms.all; maintainers = with maintainers; [ edwtjo ]; @@ -99,7 +180,7 @@ rec { // (mkController "ps") // (mkController "snes"); - exodus = (mkKodiPlugin rec { + exodus = mkKodiPlugin rec { plugin = "exodus"; namespace = "plugin.video.exodus"; @@ -110,13 +191,14 @@ rec { sha256 = "1zyay7cinljxmpzngzlrr4pnk2a7z9wwfdcsk6a4p416iglyggdj"; }; - meta = with stdenv.lib; { + buildInputs = [ unzip ]; + + meta = { description = "A streaming plugin for Kodi"; platforms = platforms.all; maintainers = with maintainers; [ edwtjo ]; }; - - }).override { buildInputs = [ unzip ]; }; + }; hyper-launcher = let pname = "hyper-launcher"; @@ -128,7 +210,7 @@ rec { rev = "f958ba93fe85b9c9025b1745d89c2db2e7dd9bf6"; sha256 = "1dvff24fbas25k5kvca4ssks9l1g5rfa3hl8lqxczkaqi3pp41j5"; }; - meta = with stdenv.lib; { + meta = { homepage = https://forum.kodi.tv/showthread.php?tid=258159; description = "A ROM launcher for Kodi that uses HyperSpin assets."; maintainers = with maintainers; [ edwtjo ]; @@ -159,7 +241,7 @@ rec { sha256 = "18m61v8z9fbh4imvzhh4g9629r9df49g2yk9ycaczirg131dhfbh"; }; - meta = with stdenv.lib; { + meta = { description = "Binary addon for raw joystick input."; platforms = platforms.all; maintainers = with maintainers; [ edwtjo ]; @@ -183,7 +265,7 @@ rec { sha256 = "0klk1jpjc243ak306k94mag4b4s17w68v69yb8lzzydszqkaqa7x"; }; - meta = with stdenv.lib; { + meta = { homepage = https://forum.kodi.tv/showthread.php?tid=67110; description = "Watch content from SVT Play"; longDescription = '' @@ -212,7 +294,7 @@ rec { extraBuildInputs = [ libusb ]; - meta = with stdenv.lib; { + meta = { description = "Binary addon for steam controller."; platforms = platforms.all; maintainers = with maintainers; [ edwtjo ]; @@ -220,7 +302,7 @@ rec { }; - steam-launcher = (mkKodiPlugin rec { + steam-launcher = mkKodiPlugin rec { plugin = "steam-launcher"; namespace = "script.steam.launcher"; @@ -233,7 +315,9 @@ rec { sha256 = "001a7zs3a4jfzj8ylxv2klc33mipmqsd5aqax7q81fbgwdlndvbm"; }; - meta = with stdenv.lib; { + propagatedBuildInputs = [ steam ]; + + meta = { homepage = https://forum.kodi.tv/showthread.php?tid=157499; description = "Launch Steam in Big Picture Mode from Kodi"; longDescription = '' @@ -245,8 +329,6 @@ rec { ''; maintainers = with maintainers; [ edwtjo ]; }; - }).override { - propagatedBuildinputs = [ steam ]; }; pdfreader = mkKodiPlugin rec { @@ -262,7 +344,7 @@ rec { sha256 = "1iv7d030z3xvlflvp4p5v3riqnwg9g0yvzxszy63v1a6x5kpjkqa"; }; - meta = with stdenv.lib; { + meta = { homepage = https://forum.kodi.tv/showthread.php?tid=187421; description = "A comic book reader"; maintainers = with maintainers; [ edwtjo ]; @@ -282,7 +364,7 @@ rec { sha256 = "0pmlgqr4kd0gvckz77mj6v42kcx6lb23anm8jnf2fbn877snnijx"; }; - meta = with stdenv.lib; { + meta = { homepage = https://github.com/kodi-pvr/pvr.hts; description = "Kodi's Tvheadend HTSP client addon"; platforms = platforms.all; @@ -304,7 +386,7 @@ rec { sha256 = "0dvdv0vk2q12nj0i5h51iaypy3i7jfsxjyxwwpxfy82y8260ragy"; }; - meta = with stdenv.lib; { + meta = { homepage = https://github.com/kodi-pvr/pvr.hdhomerun; description = "Kodi's HDHomeRun PVR client addon"; platforms = platforms.all; @@ -328,7 +410,7 @@ rec { sha256 = "1f1im2gachrxnr3z96h5cg2c13vapgkvkdwvrbl4hxlnyp1a6jyz"; }; - meta = with stdenv.lib; { + meta = { homepage = https://github.com/kodi-pvr/pvr.iptvsimple; description = "Kodi's IPTV Simple client addon"; platforms = platforms.all; @@ -352,7 +434,7 @@ rec { sha256 = "1b3fm02annsq58pcfc985glrmh21rmqksdj3q8wn6gyza06jdf3v"; }; - meta = with stdenv.lib; { + meta = { homepage = https://github.com/osmc/skin.osmc; description = "The default skin for OSMC"; platforms = platforms.all; @@ -360,4 +442,5 @@ rec { license = licenses.cc-by-nc-sa-30; }; }; -} + +}; in self diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix index e6d3fbb090fc..d0dc9274a105 100644 --- a/pkgs/applications/video/kodi/wrapper.nix +++ b/pkgs/applications/video/kodi/wrapper.nix @@ -1,54 +1,25 @@ -{ stdenv, lib, makeWrapper, kodi, plugins }: +{ stdenv, lib, makeWrapper, buildEnv, kodi, plugins }: -let +buildEnv { + name = "kodi-with-plugins-${(builtins.parseDrvName kodi.name).version}"; - p = builtins.parseDrvName kodi.name; - -in - -stdenv.mkDerivation { - - name = "kodi-" + p.version; - version = p.version; + paths = [ kodi ] ++ plugins; + pathsToLink = [ "/share" ]; buildInputs = [ makeWrapper ]; - buildCommand = '' - mkdir -p $out/share/kodi/addons - ${stdenv.lib.concatMapStrings - (plugin: "ln -s ${plugin.out - + plugin.kodiPlugin - + "/" + plugin.namespace - } $out/share/kodi/addons/.;") plugins} - $(for plugin in ${kodi}/share/kodi/addons/* + postBuild = '' + mkdir $out/bin + for exe in kodi{,-standalone} do - $(ln -s $plugin/ $out/share/kodi/addons/.) - done) - $(for share in ${kodi}/share/kodi/* - do - $(ln -s $share $out/share/kodi/.) - done) - $(for passthrough in icons xsessions applications - do - ln -s ${kodi}/share/$passthrough $out/share/ - done) - $(for exe in kodi{,-standalone} - do - makeWrapper ${kodi}/bin/$exe $out/bin/$exe \ - --prefix KODI_HOME : $out/share/kodi; - done) + makeWrapper ${kodi}/bin/$exe $out/bin/$exe \ + --prefix PYTHONPATH : ${kodi.pythonPackages.makePythonPath plugins} \ + --prefix KODI_HOME : $out/share/kodi + done ''; - preferLocalBuild = true; - - meta = with kodi.meta; { - inherit license homepage; - description = description - + " (with plugins: " - + lib.concatStrings (lib.intersperse ", " (map (x: ""+x.name) plugins)) - + ")"; - - platforms = stdenv.lib.platforms.linux; + meta = kodi.meta // { + description = kodi.meta.description + + " (with plugins: ${lib.concatMapStringsSep ", " (x: x.name) plugins})"; }; - } diff --git a/pkgs/applications/video/tivodecode/default.nix b/pkgs/applications/video/tivodecode/default.nix index b158bc924605..83ca41e201c9 100644 --- a/pkgs/applications/video/tivodecode/default.nix +++ b/pkgs/applications/video/tivodecode/default.nix @@ -13,9 +13,10 @@ stdenv.mkDerivation { sha256 = "1pww5r2iygscqn20a1cz9xbfh18p84a6a5ifg4h5nvyn9b63k23q"; }; - meta = { + meta = with stdenv.lib; { description = "Converts a .TiVo file (produced by TiVoToGo) to a normal MPEG file"; homepage = http://tivodecode.sourceforge.net; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.bsd3; }; } diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 69fc68a69deb..4dfc3fd052a2 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "xine-ui-0.99.10"; - + src = fetchurl { url = "mirror://sourceforge/xine/${name}.tar.xz"; sha256 = "0i3jzhiipfs5p1jbxviwh42zcfzag6iqc6yycaan0vrqm90an86a"; }; - + nativeBuildInputs = [ pkgconfig shared-mime-info ]; buildInputs = @@ -20,14 +20,15 @@ stdenv.mkDerivation rec { patchPhase = ''sed -e '/curl\/types\.h/d' -i src/xitk/download.c''; configureFlags = [ "--with-readline=${readline.dev}" ]; - + LIRC_CFLAGS="-I${lirc}/include"; LIRC_LIBS="-L ${lirc}/lib -llirc_client"; #NIX_LDFLAGS = "-lXext -lgcc_s"; - meta = { + meta = with stdenv.lib; { homepage = http://www.xine-project.org/; description = "Xlib-based interface to Xine, a video player"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.gpl2; }; } diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index bbb2a099666b..596bc9dd9e09 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -84,10 +84,7 @@ stdenv.mkDerivation rec { url = https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/musl-F_SHLCK-and-F_EXLCK.patch; sha256 = "1gm67v41gw6apzgz7jr3zv9z80wvkv0jaxd2w4d16hmipa8bhs0k"; }) - (fetchpatch { - url = https://raw.githubusercontent.com/alpinelinux/aports/61a7a1b77a868e3b940c0b25e6c2b2a6c32caf20/main/qemu/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch; - sha256 = "1ar6r1vpmhnbs72v6mhgyahcjcf7b9b4xi7asx17sy68m171d2g6"; - }) + ./sigrtminmax.patch (fetchpatch { url = https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/fix-sigevent-and-sigval_t.patch; sha256 = "0wk0rrcqywhrw9hygy6ap0lfg314m9z1wr2hn8338r5gfcw75mav"; diff --git a/pkgs/applications/virtualization/qemu/sigrtminmax.patch b/pkgs/applications/virtualization/qemu/sigrtminmax.patch new file mode 100644 index 000000000000..41050447ac64 --- /dev/null +++ b/pkgs/applications/virtualization/qemu/sigrtminmax.patch @@ -0,0 +1,30 @@ +From 2697fcc42546e814a2d2617671cb8398b15256fb Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Fri, 17 Aug 2018 00:22:35 -0500 +Subject: [PATCH] quick port __SIGRTMIN/__SIGRTMAX patch for qemu 3.0 + +--- + linux-user/signal.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/linux-user/signal.c b/linux-user/signal.c +index 602b631b92..87f9240134 100644 +--- a/linux-user/signal.c ++++ b/linux-user/signal.c +@@ -26,6 +26,13 @@ + #include "trace.h" + #include "signal-common.h" + ++#ifndef __SIGRTMIN ++#define __SIGRTMIN 32 ++#endif ++#ifndef __SIGRTMAX ++#define __SIGRTMAX (NSIG-1) ++#endif ++ + struct target_sigaltstack target_sigaltstack_used = { + .ss_sp = 0, + .ss_size = 0, +-- +2.18.0 + diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/applications/window-managers/fbpanel/default.nix index b521240b48f5..0c13691a36ac 100644 --- a/pkgs/applications/window-managers/fbpanel/default.nix +++ b/pkgs/applications/window-managers/fbpanel/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { description = "A stand-alone panel"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; + license = licenses.mit; }; passthru = { diff --git a/pkgs/build-support/fetchdocker/default.nix b/pkgs/build-support/fetchdocker/default.nix index 3556df32d926..bbd2bae46df5 100644 --- a/pkgs/build-support/fetchdocker/default.nix +++ b/pkgs/build-support/fetchdocker/default.nix @@ -22,8 +22,8 @@ assert null == lib.findFirst (c: "/"==c) null (lib.stringToCharacters repository assert null == lib.findFirst (c: "/"==c) null (lib.stringToCharacters imageName); let - # Abuse `builtins.toPath` to collapse possible double slashes - repoTag0 = builtins.toString (builtins.toPath "/${stripScheme registry}/${repository}/${imageName}"); + # Abuse paths to collapse possible double slashes + repoTag0 = builtins.toString (/. + "/${stripScheme registry}/${repository}/${imageName}"); repoTag1 = lib.removePrefix "/" repoTag0; layers = builtins.map stripNixStore imageLayers; diff --git a/pkgs/build-support/skaware/build-skaware-package.nix b/pkgs/build-support/skaware/build-skaware-package.nix new file mode 100644 index 000000000000..51921fdfbdc7 --- /dev/null +++ b/pkgs/build-support/skaware/build-skaware-package.nix @@ -0,0 +1,127 @@ +{ stdenv, fetchurl, writeScript, file }: +let lib = stdenv.lib; +in { + # : string + pname + # : string +, version + # : string +, sha256 + # : string +, description + # : list Platform +, platforms ? lib.platforms.all + # : list string +, outputs ? [ "bin" "lib" "dev" "doc" "out" ] + # TODO(Profpatsch): automatically infer most of these + # : list string +, configureFlags + # mostly for moving and deleting files from the build directory + # : lines +, postInstall + # : list Maintainer +, maintainers ? [] + + +}: + +let + + # File globs that can always be deleted + commonNoiseFiles = [ + ".gitignore" + "Makefile" + "INSTALL" + "configure" + "patch-for-solaris" + "src/**/*" + "tools/**/*" + "package/**/*" + "config.mak" + ]; + + # File globs that should be moved to $doc + commonMetaFiles = [ + "COPYING" + "AUTHORS" + "NEWS" + "CHANGELOG" + "README" + "README.*" + ]; + + globWith = stdenv.lib.concatMapStringsSep "\n"; + rmNoise = globWith (f: + ''rm -rf ${f}'') commonNoiseFiles; + mvMeta = globWith + (f: ''mv ${f} "$DOCDIR" 2>/dev/null || true'') + commonMetaFiles; + + # Move & remove actions, taking the package doc directory + commonFileActions = writeScript "common-file-actions.sh" '' + #!${stdenv.shell} + set -e + DOCDIR="$1" + shopt -s globstar extglob nullglob + ${rmNoise} + mkdir -p "$DOCDIR" + ${mvMeta} + ''; + + +in stdenv.mkDerivation { + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://skarnet.org/software/${pname}/${pname}-${version}.tar.gz"; + inherit sha256; + }; + + inherit outputs; + + dontDisableStatic = true; + enableParallelBuilding = true; + + configureFlags = configureFlags ++ [ + "--enable-absolute-paths" + (if stdenv.isDarwin + then "--disable-shared" + else "--enable-shared") + ] + # On darwin, the target triplet from -dumpmachine includes version number, + # but skarnet.org software uses the triplet to test binary compatibility. + # Explicitly setting target ensures code can be compiled against a skalibs + # binary built on a different version of darwin. + # http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph + ++ (lib.optional stdenv.isDarwin + "--build=${stdenv.hostPlatform.system}"); + + # TODO(Profpatsch): ensure that there is always a $doc output! + postInstall = '' + echo "Cleaning & moving common files" + mkdir -p $doc/share/doc/${pname} + ${commonFileActions} $doc/share/doc/${pname} + + ${postInstall} + ''; + + postFixup = '' + echo "Checking for remaining source files" + rem=$(find -mindepth 1 -xtype f -print0 \ + | tee $TMP/remaining-files) + if [[ "$rem" != "" ]]; then + echo "ERROR: These files should be either moved or deleted:" + cat $TMP/remaining-files | xargs -0 ${file}/bin/file + exit 1 + fi + ''; + + meta = { + homepage = "https://skarnet.org/software/${pname}/"; + inherit description platforms; + license = stdenv.lib.licenses.isc; + maintainers = with lib.maintainers; + [ pmahoney Profpatsch ] ++ maintainers; + }; + +} diff --git a/pkgs/data/fonts/medio/default.nix b/pkgs/data/fonts/medio/default.nix index 8b484b3b5efd..aa805b6f0825 100644 --- a/pkgs/data/fonts/medio/default.nix +++ b/pkgs/data/fonts/medio/default.nix @@ -18,7 +18,7 @@ fetchzip rec { ''; meta = with stdenv.lib; { - homepage = "http://dotcolon.net/font/{pname}/"; + homepage = "http://dotcolon.net/font/${pname}/"; description = "Serif font designed by Sora Sagano"; longDescription = '' Medio is a serif font designed by Sora Sagano, based roughly diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix index b57cf22569d2..a90ff42a8e2a 100644 --- a/pkgs/data/fonts/pecita/default.nix +++ b/pkgs/data/fonts/pecita/default.nix @@ -1,18 +1,24 @@ -{stdenv, fetchzip}: +{ stdenv, fetchurl }: let + version = "5.4"; -in fetchzip rec { + +in + +fetchurl rec { name = "pecita-${version}"; - url = "http://archive.rycee.net/pecita/${name}.tar.xz"; + url = "http://pecita.eu/b/Pecita.otf"; + + downloadToTemp = true; postFetch = '' - tar xJvf $downloadedFile --strip-components=1 mkdir -p $out/share/fonts/opentype - cp -v Pecita.otf $out/share/fonts/opentype/Pecita.otf + cp -v $downloadedFile $out/share/fonts/opentype/Pecita.otf ''; + recursiveHash = true; sha256 = "0pwm20f38lcbfkdqkpa2ydpc9kvmdg0ifc4h2dmipsnwbcb5rfwm"; meta = with stdenv.lib; { diff --git a/pkgs/data/fonts/penna/default.nix b/pkgs/data/fonts/penna/default.nix index 893553a62ce2..b1244c47bf1b 100644 --- a/pkgs/data/fonts/penna/default.nix +++ b/pkgs/data/fonts/penna/default.nix @@ -18,7 +18,7 @@ fetchzip rec { ''; meta = with stdenv.lib; { - homepage = "http://dotcolon.net/font/{pname}/"; + homepage = "http://dotcolon.net/font/${pname}/"; description = "Geometric sans serif designed by Sora Sagano"; longDescription = '' Penna is a geometric sans serif designed by Sora Sagano, diff --git a/pkgs/data/fonts/route159/default.nix b/pkgs/data/fonts/route159/default.nix index 7e2480a77dc5..892078a1151b 100644 --- a/pkgs/data/fonts/route159/default.nix +++ b/pkgs/data/fonts/route159/default.nix @@ -18,7 +18,7 @@ fetchzip rec { ''; meta = with stdenv.lib; { - homepage = "http://dotcolon.net/font/{pname}/"; + homepage = "http://dotcolon.net/font/${pname}/"; description = "A weighted sans serif font"; platforms = platforms.all; maintainers = with maintainers; [ leenaars ]; diff --git a/pkgs/data/fonts/seshat/default.nix b/pkgs/data/fonts/seshat/default.nix index 36e4f2fa10ff..6b22716f1ebb 100644 --- a/pkgs/data/fonts/seshat/default.nix +++ b/pkgs/data/fonts/seshat/default.nix @@ -18,7 +18,7 @@ fetchzip rec { ''; meta = with stdenv.lib; { - homepage = "http://dotcolon.net/font/{pname}/"; + homepage = "http://dotcolon.net/font/${pname}/"; description = "Roman body font designed for main text by Sora Sagano"; longDescription = '' Seshat is a Roman body font designed for the main text. By diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 5ac0998fb291..68b967e715d4 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Numix icon theme (circle version)"; - homepage = https://numixproject.org; + homepage = https://numixproject.github.io; license = licenses.gpl3; # darwin cannot deal with file names differing only in case platforms = platforms.linux; diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 875e10259276..ec6972c4cac7 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Numix icon theme (square version)"; - homepage = https://numixproject.org; + homepage = https://numixproject.github.io; license = licenses.gpl3; # darwin cannot deal with file names differing only in case platforms = platforms.linux; diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index 35f624a00f5b..9aaed97dc273 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Numix icon theme"; - homepage = https://numixproject.org; + homepage = https://numixproject.github.io; license = licenses.gpl3; # darwin cannot deal with file names differing only in case platforms = platforms.linux; diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index c0f4727f48fb..1efd4145ce03 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "papirus-icon-theme-${version}"; - version = "20180401"; + version = "20180816"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "papirus-icon-theme"; rev = version; - sha256 = "1cbzv3igc6j05h0mq2850fwfd8sxxwixzgmhh85mc1k326rvncil"; + sha256 = "0rmf5hvp6711pyqdq5sdxkrjr21nbk6113r4a7d8735ynvm8znkk"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index fce8f44bd3ff..a2d04640d591 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/d5c89ad106556f7890c89c50a2b4d3fbdcea7616.tar.gz"; - sha256 = "0j8r88wwf0qvqxcnwmcs6xcn4vi0189c9f5chfl80941ggxfbpxk"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/22cb611adaf63739fc7e3956d83d450154ec766b.tar.gz"; + sha256 = "0wxggabwz8qs2hmnr3k3iwy9rmvicx4a1n22l7f6krk1hym5bkpl"; } diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 9919fb57f7cc..93ee6d38c7c3 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }: stdenv.mkDerivation rec { - name = "osinfo-db-20180531"; + name = "osinfo-db-20180903"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${name}.tar.xz"; - sha256 = "0vw6hn7xdfj0q7wc3k9b0nvbghdp1b9dl63xz2v7frr55qv59m5x"; + sha256 = "0xkxqyn2b03d4rd91f5rw3xar5vnv2n8l5pp8sm3hqm1wm5z5my9"; }; nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; diff --git a/pkgs/desktops/deepin/dbus-factory/default.nix b/pkgs/desktops/deepin/dbus-factory/default.nix new file mode 100644 index 000000000000..66d28cbcaf3e --- /dev/null +++ b/pkgs/desktops/deepin/dbus-factory/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, jq, libxml2, go-dbus-generator }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "dbus-factory"; + version = "3.1.17"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "1llq8wzgikgpzj7z36fyzk8kjych2h9nzi3x6zv53z0xc1xn4256"; + }; + + nativeBuildInputs = [ + jq + libxml2 + go-dbus-generator + ]; + + makeFlags = [ "GOPATH=$(out)/share/gocode" ]; + + meta = with stdenv.lib; { + description = "Generates static DBus bindings for Golang and QML at build-time"; + homepage = https://github.com/linuxdeepin/dbus-factory; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/dde-calendar/default.nix b/pkgs/desktops/deepin/dde-calendar/default.nix new file mode 100644 index 000000000000..ad6b0f1912a6 --- /dev/null +++ b/pkgs/desktops/deepin/dde-calendar/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, + deepin-gettext-tools, dtkcore, dtkwidget +}: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "dde-calendar"; + version = "1.2.5"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "1a5zxpz7zncw6mrzv8zmn0j1vk0c8fq0m1xhmnwllffzybrhn4y7"; + }; + + nativeBuildInputs = [ + pkgconfig + qmake + qttools + deepin-gettext-tools + ]; + + buildInputs = [ + dtkcore + dtkwidget + ]; + + postPatch = '' + patchShebangs . + sed -i translate_desktop.sh \ + -e "s,/usr/bin/deepin-desktop-ts-convert,deepin-desktop-ts-convert," + sed -i com.deepin.Calendar.service \ + -e "s,/usr,$out," + ''; + + meta = with stdenv.lib; { + description = "Calendar for Deepin Desktop Environment"; + homepage = https://github.com/linuxdeepin/dde-calendar; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/deepin-mutter/default.nix b/pkgs/desktops/deepin/deepin-mutter/default.nix new file mode 100644 index 000000000000..e397ab53576d --- /dev/null +++ b/pkgs/desktops/deepin/deepin-mutter/default.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, xorg, + libcanberra-gtk3, upower, xkeyboard_config, libxkbcommon, + libstartup_notification, libinput, cogl, clutter, systemd +}: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "deepin-mutter"; + version = "3.20.34"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "0s427fmj806ljpdg6jdvpfislk5m1xvxpnnyrq3l8b7pkhjvp8wd"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + libtool + gnome3.gnome-common + ]; + + buildInputs = [ + gnome3.gtk + gnome3.gnome-desktop + gnome3.gsettings-desktop-schemas + gnome3.libgudev + gnome3.zenity + upower + xorg.libxkbfile + libxkbcommon + libcanberra-gtk3 + libstartup_notification + libinput + xkeyboard_config + cogl + clutter + systemd + ]; + + enableParallelBuilding = true; + + configureFlags = [ + "--enable-native-backend" + "--enable-compile-warnings=minimum" + ]; + + preConfigure = '' + NOCONFIGURE=1 ./autogen.sh + ''; + + meta = with stdenv.lib; { + description = "Base window manager for deepin, fork of gnome mutter"; + homepage = https://github.com/linuxdeepin/deepin-mutter; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/deepin-sound-theme/default.nix b/pkgs/desktops/deepin/deepin-sound-theme/default.nix new file mode 100644 index 000000000000..f12419a615b3 --- /dev/null +++ b/pkgs/desktops/deepin/deepin-sound-theme/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "deepin-sound-theme-${version}"; + version = "15.10.3"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = "deepin-sound-theme"; + rev = version; + sha256 = "1sw4nrn7q7wk1hpicm05apyc0mihaw42iqm52wb8ib8gm1qiylr9"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "Deepin sound theme"; + homepage = https://github.com/linuxdeepin/deepin-sound-theme; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index d8fc63e4f912..d2e5536a74aa 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -3,18 +3,27 @@ let packages = self: with self; { + dbus-factory = callPackage ./dbus-factory { }; + dde-calendar = callPackage ./dde-calendar { }; dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { }; deepin-gettext-tools = callPackage ./deepin-gettext-tools { }; deepin-gtk-theme = callPackage ./deepin-gtk-theme { }; deepin-icon-theme = callPackage ./deepin-icon-theme { }; deepin-menu = callPackage ./deepin-menu { }; + deepin-mutter = callPackage ./deepin-mutter { }; deepin-shortcut-viewer = callPackage ./deepin-shortcut-viewer { }; + deepin-sound-theme = callPackage ./deepin-sound-theme { }; deepin-terminal = callPackage ./deepin-terminal { inherit (pkgs.gnome3) libgee vte; wnck = pkgs.libwnck3; }; dtkcore = callPackage ./dtkcore { }; + dtkwm = callPackage ./dtkwm { }; dtkwidget = callPackage ./dtkwidget { }; + go-dbus-factory = callPackage ./go-dbus-factory { }; + go-dbus-generator = callPackage ./go-dbus-generator { }; + go-gir-generator = callPackage ./go-gir-generator { }; + go-lib = callPackage ./go-lib { }; qt5dxcb-plugin = callPackage ./qt5dxcb-plugin { }; qt5integration = callPackage ./qt5integration { }; diff --git a/pkgs/desktops/deepin/dtkwm/default.nix b/pkgs/desktops/deepin/dtkwm/default.nix new file mode 100644 index 000000000000..46ed7bcc3bef --- /dev/null +++ b/pkgs/desktops/deepin/dtkwm/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, dtkcore }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "dtkwm"; + version = "2.0.9"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "0vkx6vlz83pgawhdwqkwpq3dy8whxmjdzfpgrvm2m6jmspfk9bab"; + }; + + nativeBuildInputs = [ + pkgconfig + qmake + ]; + + buildInputs = [ + dtkcore + qtx11extras + ]; + + preConfigure = '' + qmakeFlags="$qmakeFlags \ + QT_HOST_DATA=$out \ + INCLUDE_INSTALL_DIR=$out/include \ + LIB_INSTALL_DIR=$out/lib" + ''; + + meta = with stdenv.lib; { + description = "Deepin graphical user interface library"; + homepage = https://github.com/linuxdeepin/dtkwm; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/go-dbus-factory/default.nix b/pkgs/desktops/deepin/go-dbus-factory/default.nix new file mode 100644 index 000000000000..a488bd7202cb --- /dev/null +++ b/pkgs/desktops/deepin/go-dbus-factory/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "go-dbus-factory"; + version = "0.0.7.1"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "0gj2xxv45gh7wr5ry3mcsi46kdsyq9nbd7znssn34kapiv40ixcx"; + }; + + makeFlags = [ + "PREFIX=$(out)" + ]; + + meta = with stdenv.lib; { + description = "GoLang DBus factory for the Deepin Desktop Environment"; + homepage = https://github.com/linuxdeepin/go-dbus-factory; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/go-dbus-generator/default.nix b/pkgs/desktops/deepin/go-dbus-generator/default.nix new file mode 100644 index 000000000000..2933c58f8d95 --- /dev/null +++ b/pkgs/desktops/deepin/go-dbus-generator/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, go, go-lib }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "go-dbus-generator"; + version = "0.6.6"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "17rzicqizyyrhjjf4rild7py1cyd07b2zdcd9nabvwn4gvj6lhfb"; + }; + + nativeBuildInputs = [ + go + go-lib + ]; + + makeFlags = [ + "PREFIX=$(out)" + "GOPATH=$(GGOPATH):${go-lib}/share/gocode" + "HOME=$(TMP)" + ]; + + meta = with stdenv.lib; { + description = "Convert dbus interfaces to go-lang or qml wrapper code"; + homepage = https://github.com/linuxdeepin/go-dbus-generator; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-gir-generator/default.nix new file mode 100644 index 000000000000..cc05f6f055b0 --- /dev/null +++ b/pkgs/desktops/deepin/go-gir-generator/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, pkgconfig, go, gobjectIntrospection, libgudev }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "go-gir-generator"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "0yi3lsgkxi8ghz2c7msf2df20jxkvzj8s47slvpzz4m57i82vgzl"; + }; + + nativeBuildInputs = [ + pkgconfig + go + ]; + + buildInputs = [ + gobjectIntrospection + libgudev + ]; + + makeFlags = [ + "PREFIX=$(out)" + "HOME=$(TMP)" + ]; + + meta = with stdenv.lib; { + description = "Generate static golang bindings for GObject"; + homepage = https://github.com/linuxdeepin/go-gir-generator; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/go-lib/default.nix b/pkgs/desktops/deepin/go-lib/default.nix new file mode 100644 index 000000000000..44de8889df28 --- /dev/null +++ b/pkgs/desktops/deepin/go-lib/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, glib, xorg, gdk_pixbuf, pulseaudio, + mobile-broadband-provider-info +}: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "go-lib"; + version = "1.2.16.1"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "0nl35dm0bdca38qhnzdpsv6b0vds9ccvm4c86rs42a7c6v655b1q"; + }; + + buildInputs = [ + glib + xorg.libX11 + gdk_pixbuf + pulseaudio + mobile-broadband-provider-info + ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "Go bindings for Deepin Desktop Environment development"; + homepage = https://github.com/linuxdeepin/go-lib; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/gnome-3/core/rygel/default.nix b/pkgs/desktops/gnome-3/core/rygel/default.nix new file mode 100644 index 000000000000..ef0886328974 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/rygel/default.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchurl, pkgconfig, vala, gettext, libxml2, gobjectIntrospection, gtk-doc, wrapGAppsHook, glib, gssdp, gupnp, gupnp-av, gupnp-dlna, gst_all_1, libgee, libsoup, gtk3, libmediaart, sqlite, systemd, tracker, shared-mime-info, gnome3 }: + +let + pname = "rygel"; + version = "0.36.2"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + # TODO: split out lib + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "0i12z6bzfzgcjidhxa2jsvpm4hqpab0s032z13jy2vbifrncfcnk"; + }; + + nativeBuildInputs = [ + pkgconfig vala gettext libxml2 gobjectIntrospection gtk-doc wrapGAppsHook + ]; + buildInputs = [ + glib gssdp gupnp gupnp-av gupnp-dlna libgee libsoup gtk3 libmediaart sqlite systemd tracker shared-mime-info + ] ++ (with gst_all_1; [ + gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly + ]); + + configureFlags = [ + "--with-systemduserunitdir=$(out)/lib/systemd/user" + "--enable-apidocs" + "--sysconfdir=/etc" + ]; + + installFlags = [ + "sysconfdir=$(out)/etc" + ]; + + doCheck = true; + + enableParallelBuilding = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + + meta = with stdenv.lib; { + description = "A home media solution (UPnP AV MediaServer) that allows you to easily share audio, video and pictures to other devices"; + homepage = https://wiki.gnome.org/Projects/Rygel; + license = licenses.lgpl21Plus; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index d90440d5f557..5112f8b496f5 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -216,6 +216,8 @@ lib.makeScope pkgs.newScope (self: with self; { rest = callPackage ./core/rest { }; + rygel = callPackage ./core/rygel { }; + simple-scan = callPackage ./core/simple-scan { }; sushi = callPackage ./core/sushi { }; diff --git a/pkgs/desktops/lxqt/optional/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix similarity index 100% rename from pkgs/desktops/lxqt/optional/compton-conf/default.nix rename to pkgs/desktops/lxqt/compton-conf/default.nix diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 015807ec684e..62b8aaf25abe 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -7,44 +7,44 @@ let # - https://github.com/lxqt/lxqt/wiki/Building-from-source ### BASE - libqtxdg = callPackage ./base/libqtxdg { }; - lxqt-build-tools = callPackage ./base/lxqt-build-tools { }; - libsysstat = callPackage ./base/libsysstat { }; - liblxqt = callPackage ./base/liblxqt { }; + libqtxdg = callPackage ./libqtxdg { }; + lxqt-build-tools = callPackage ./lxqt-build-tools { }; + libsysstat = callPackage ./libsysstat { }; + liblxqt = callPackage ./liblxqt { }; ### CORE 1 - libfm-qt = callPackage ./core/libfm-qt { }; - lxqt-about = callPackage ./core/lxqt-about { }; - lxqt-admin = callPackage ./core/lxqt-admin { }; - lxqt-config = callPackage ./core/lxqt-config { }; - lxqt-globalkeys = callPackage ./core/lxqt-globalkeys { }; - lxqt-l10n = callPackage ./core/lxqt-l10n { }; - lxqt-notificationd = callPackage ./core/lxqt-notificationd { }; - lxqt-openssh-askpass = callPackage ./core/lxqt-openssh-askpass { }; - lxqt-policykit = callPackage ./core/lxqt-policykit { }; - lxqt-powermanagement = callPackage ./core/lxqt-powermanagement { }; - lxqt-qtplugin = callPackage ./core/lxqt-qtplugin { }; - lxqt-session = callPackage ./core/lxqt-session { }; - lxqt-sudo = callPackage ./core/lxqt-sudo { }; - lxqt-themes = callPackage ./core/lxqt-themes { }; - pavucontrol-qt = libsForQt5.callPackage ./core/pavucontrol-qt { }; - qtermwidget = callPackage ./core/qtermwidget { }; + libfm-qt = callPackage ./libfm-qt { }; + lxqt-about = callPackage ./lxqt-about { }; + lxqt-admin = callPackage ./lxqt-admin { }; + lxqt-config = callPackage ./lxqt-config { }; + lxqt-globalkeys = callPackage ./lxqt-globalkeys { }; + lxqt-l10n = callPackage ./lxqt-l10n { }; + lxqt-notificationd = callPackage ./lxqt-notificationd { }; + lxqt-openssh-askpass = callPackage ./lxqt-openssh-askpass { }; + lxqt-policykit = callPackage ./lxqt-policykit { }; + lxqt-powermanagement = callPackage ./lxqt-powermanagement { }; + lxqt-qtplugin = callPackage ./lxqt-qtplugin { }; + lxqt-session = callPackage ./lxqt-session { }; + lxqt-sudo = callPackage ./lxqt-sudo { }; + lxqt-themes = callPackage ./lxqt-themes { }; + pavucontrol-qt = libsForQt5.callPackage ./pavucontrol-qt { }; + qtermwidget = callPackage ./qtermwidget { }; # for now keep version 0.7.1 because virt-manager-qt currently does not compile with qtermwidget-0.8.0 - qtermwidget_0_7_1 = callPackage ./core/qtermwidget/0.7.1.nix { }; + qtermwidget_0_7_1 = callPackage ./qtermwidget/0.7.1.nix { }; ### CORE 2 - lxqt-panel = callPackage ./core/lxqt-panel { }; - lxqt-runner = callPackage ./core/lxqt-runner { }; - pcmanfm-qt = callPackage ./core/pcmanfm-qt { }; + lxqt-panel = callPackage ./lxqt-panel { }; + lxqt-runner = callPackage ./lxqt-runner { }; + pcmanfm-qt = callPackage ./pcmanfm-qt { }; ### OPTIONAL - qterminal = callPackage ./optional/qterminal { }; - compton-conf = pkgs.qt5.callPackage ./optional/compton-conf { }; - obconf-qt = callPackage ./optional/obconf-qt { }; - lximage-qt = callPackage ./optional/lximage-qt { }; - qps = callPackage ./optional/qps { }; - screengrab = callPackage ./optional/screengrab { }; - qlipper = callPackage ./optional/qlipper { }; + qterminal = callPackage ./qterminal { }; + compton-conf = pkgs.qt5.callPackage ./compton-conf { }; + obconf-qt = callPackage ./obconf-qt { }; + lximage-qt = callPackage ./lximage-qt { }; + qps = callPackage ./qps { }; + screengrab = callPackage ./screengrab { }; + qlipper = callPackage ./qlipper { }; preRequisitePackages = [ pkgs.gvfs # virtual file systems support for PCManFM-QT diff --git a/pkgs/desktops/lxqt/core/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/libfm-qt/default.nix rename to pkgs/desktops/lxqt/libfm-qt/default.nix diff --git a/pkgs/desktops/lxqt/base/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix similarity index 100% rename from pkgs/desktops/lxqt/base/liblxqt/default.nix rename to pkgs/desktops/lxqt/liblxqt/default.nix diff --git a/pkgs/desktops/lxqt/base/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix similarity index 100% rename from pkgs/desktops/lxqt/base/libqtxdg/default.nix rename to pkgs/desktops/lxqt/libqtxdg/default.nix diff --git a/pkgs/desktops/lxqt/base/libsysstat/default.nix b/pkgs/desktops/lxqt/libsysstat/default.nix similarity index 100% rename from pkgs/desktops/lxqt/base/libsysstat/default.nix rename to pkgs/desktops/lxqt/libsysstat/default.nix diff --git a/pkgs/desktops/lxqt/optional/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix similarity index 100% rename from pkgs/desktops/lxqt/optional/lximage-qt/default.nix rename to pkgs/desktops/lxqt/lximage-qt/default.nix diff --git a/pkgs/desktops/lxqt/core/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/lxqt-about/default.nix rename to pkgs/desktops/lxqt/lxqt-about/default.nix diff --git a/pkgs/desktops/lxqt/core/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/lxqt-admin/default.nix rename to pkgs/desktops/lxqt/lxqt-admin/default.nix diff --git a/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix similarity index 100% rename from pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix rename to pkgs/desktops/lxqt/lxqt-build-tools/default.nix diff --git a/pkgs/desktops/lxqt/core/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/lxqt-config/default.nix rename to pkgs/desktops/lxqt/lxqt-config/default.nix diff --git a/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix rename to pkgs/desktops/lxqt/lxqt-globalkeys/default.nix diff --git a/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix b/pkgs/desktops/lxqt/lxqt-l10n/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/lxqt-l10n/default.nix rename to pkgs/desktops/lxqt/lxqt-l10n/default.nix diff --git a/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix rename to pkgs/desktops/lxqt/lxqt-notificationd/default.nix diff --git a/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix rename to pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix diff --git a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/lxqt-panel/default.nix rename to pkgs/desktops/lxqt/lxqt-panel/default.nix diff --git a/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/lxqt-policykit/default.nix rename to pkgs/desktops/lxqt/lxqt-policykit/default.nix diff --git a/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix rename to pkgs/desktops/lxqt/lxqt-powermanagement/default.nix diff --git a/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix rename to pkgs/desktops/lxqt/lxqt-qtplugin/default.nix diff --git a/pkgs/desktops/lxqt/core/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/lxqt-runner/default.nix rename to pkgs/desktops/lxqt/lxqt-runner/default.nix diff --git a/pkgs/desktops/lxqt/core/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/lxqt-session/default.nix rename to pkgs/desktops/lxqt/lxqt-session/default.nix diff --git a/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/lxqt-sudo/default.nix rename to pkgs/desktops/lxqt/lxqt-sudo/default.nix diff --git a/pkgs/desktops/lxqt/core/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/lxqt-themes/default.nix rename to pkgs/desktops/lxqt/lxqt-themes/default.nix diff --git a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix similarity index 100% rename from pkgs/desktops/lxqt/optional/obconf-qt/default.nix rename to pkgs/desktops/lxqt/obconf-qt/default.nix diff --git a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix rename to pkgs/desktops/lxqt/pavucontrol-qt/default.nix diff --git a/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix rename to pkgs/desktops/lxqt/pcmanfm-qt/default.nix diff --git a/pkgs/desktops/lxqt/optional/qlipper/default.nix b/pkgs/desktops/lxqt/qlipper/default.nix similarity index 100% rename from pkgs/desktops/lxqt/optional/qlipper/default.nix rename to pkgs/desktops/lxqt/qlipper/default.nix diff --git a/pkgs/desktops/lxqt/optional/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix similarity index 100% rename from pkgs/desktops/lxqt/optional/qps/default.nix rename to pkgs/desktops/lxqt/qps/default.nix diff --git a/pkgs/desktops/lxqt/optional/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix similarity index 100% rename from pkgs/desktops/lxqt/optional/qterminal/default.nix rename to pkgs/desktops/lxqt/qterminal/default.nix diff --git a/pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix b/pkgs/desktops/lxqt/qtermwidget/0.7.1.nix similarity index 100% rename from pkgs/desktops/lxqt/core/qtermwidget/0.7.1.nix rename to pkgs/desktops/lxqt/qtermwidget/0.7.1.nix diff --git a/pkgs/desktops/lxqt/core/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix similarity index 100% rename from pkgs/desktops/lxqt/core/qtermwidget/default.nix rename to pkgs/desktops/lxqt/qtermwidget/default.nix diff --git a/pkgs/desktops/lxqt/optional/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix similarity index 100% rename from pkgs/desktops/lxqt/optional/screengrab/default.nix rename to pkgs/desktops/lxqt/screengrab/default.nix diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index 47657375bbab..38881e425762 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "mate-session-manager-${version}"; - version = "1.20.1"; + version = "1.21.0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0gdxa46ps0fxspri08kpp99vzx06faw6x30k6vbjg5m7x1xfq7i5"; + sha256 = "1556kn4sk41x70m8cx200g4c9q3wndnhdxj4vp93sw262yqmk9mn"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index acf769f02e33..fc1850b3c2a4 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.13.4/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.13.5/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 752493b1a70d..a6c3cb66f6a2 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,363 +3,363 @@ { bluedevil = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/bluedevil-5.13.4.tar.xz"; - sha256 = "1f7bjj3p5n8pvmqqgqz5xgjjhq1mjwknd36hrr5jn3klhbyahqkk"; - name = "bluedevil-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/bluedevil-5.13.5.tar.xz"; + sha256 = "0am708cb6jfccx1jfbriwc2jgwd4ajqllirc9i0bg4jz5ydxbjxg"; + name = "bluedevil-5.13.5.tar.xz"; }; }; breeze = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/breeze-5.13.4.tar.xz"; - sha256 = "1kxcd8zkk79mjh1j0lzw2nf0v0w2qc4zzb68nw61k1ca8v9mgq84"; - name = "breeze-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/breeze-5.13.5.tar.xz"; + sha256 = "09jkkfdmngvbp8i2y6irlv6yvrzpc86mw6apmqvphiaqsilyxaw0"; + name = "breeze-5.13.5.tar.xz"; }; }; breeze-grub = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/breeze-grub-5.13.4.tar.xz"; - sha256 = "1vxy24b2ndjkljw5ipwl8nl8nqckxr64sq6v4p690wib9j1nly09"; - name = "breeze-grub-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/breeze-grub-5.13.5.tar.xz"; + sha256 = "03hsq77gi75chgyq9pzh3ry6k6bi78pfm33zn8gx784k9fx7gvqr"; + name = "breeze-grub-5.13.5.tar.xz"; }; }; breeze-gtk = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/breeze-gtk-5.13.4.tar.xz"; - sha256 = "0sa0v9irimqhh17c1nykzkbhr6n3agam8y0idfr26xg7jblch3s0"; - name = "breeze-gtk-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/breeze-gtk-5.13.5.tar.xz"; + sha256 = "1knh0b27b81rnd87s31s2mawqcl1yzwjcakk5npzfm3nj23xakv3"; + name = "breeze-gtk-5.13.5.tar.xz"; }; }; breeze-plymouth = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/breeze-plymouth-5.13.4.tar.xz"; - sha256 = "1v02bh3xwcx5vixcp21a4wq04nn3wsgip5ycrgsb2bn013mspv20"; - name = "breeze-plymouth-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/breeze-plymouth-5.13.5.tar.xz"; + sha256 = "0xsjl602wsb5ak1xg19w8y0fv9404cwbj1rcrm0hgjv735m32c57"; + name = "breeze-plymouth-5.13.5.tar.xz"; }; }; discover = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/discover-5.13.4.tar.xz"; - sha256 = "1n7wd9w1r9a5ncgqc2s0aywivzqc3115wr93hrf1lqxpk0qskkyc"; - name = "discover-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/discover-5.13.5.tar.xz"; + sha256 = "1q3nc5lih95vs5masd8z897hvfvpwidiisj8bg62iq0cblsgwz6d"; + name = "discover-5.13.5.tar.xz"; }; }; drkonqi = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/drkonqi-5.13.4.tar.xz"; - sha256 = "1ddqisah98qd0hqg6pz5jk1pmisji2c6mj3i5w7df57zi7kpj4wz"; - name = "drkonqi-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/drkonqi-5.13.5.tar.xz"; + sha256 = "02kbmymzzhsf9slaf64xlp8sfv59gl7qf1g2ahcq58sqry5bqjnk"; + name = "drkonqi-5.13.5.tar.xz"; }; }; kactivitymanagerd = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/kactivitymanagerd-5.13.4.tar.xz"; - sha256 = "0iq5bxnszdndbvrqi8xm80d7i67xw0z45yq3qdsdlx80zzgb9g9d"; - name = "kactivitymanagerd-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/kactivitymanagerd-5.13.5.tar.xz"; + sha256 = "0zfvypxh748vsl270l8wn6inmp8shi2m051yy699qdqbyb039wjq"; + name = "kactivitymanagerd-5.13.5.tar.xz"; }; }; kde-cli-tools = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/kde-cli-tools-5.13.4.tar.xz"; - sha256 = "1dznj0jni4bm5z0hy644pcf7iavfd9yp8hfx87af3xhxxrifws37"; - name = "kde-cli-tools-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/kde-cli-tools-5.13.5.tar.xz"; + sha256 = "0p1az420p4ldinmxnkdwl69542ddm0r4f3wmdysfird7d68yw2hp"; + name = "kde-cli-tools-5.13.5.tar.xz"; }; }; kdecoration = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/kdecoration-5.13.4.tar.xz"; - sha256 = "1clf939g7qpnxxxw8iv3i4l9330dayzhg0cfrx6mffm2ywny67wd"; - name = "kdecoration-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/kdecoration-5.13.5.tar.xz"; + sha256 = "04p77fs5c9b4mbpcl4a2c1wc0i09g51b7c1v7n9fd4nfkm7z8sqs"; + name = "kdecoration-5.13.5.tar.xz"; }; }; kde-gtk-config = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/kde-gtk-config-5.13.4.tar.xz"; - sha256 = "03x5yvgk6kjy12qh3xblv90rsf8g5nsrc9573zd3rzz74pjql605"; - name = "kde-gtk-config-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/kde-gtk-config-5.13.5.tar.xz"; + sha256 = "06j64y7p5kxnrc3407hma0drh3sb8jvjp3mx6na6b86z4xxf1kj6"; + name = "kde-gtk-config-5.13.5.tar.xz"; }; }; kdeplasma-addons = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/kdeplasma-addons-5.13.4.tar.xz"; - sha256 = "1kgnmkykma14vinabal747hpvnrahccksgb68pxb4lxgylbcvy04"; - name = "kdeplasma-addons-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/kdeplasma-addons-5.13.5.tar.xz"; + sha256 = "1a4f61bbwhc2y0lnrglbq3sas16bxff0ga3im9d15nq5a5q637i1"; + name = "kdeplasma-addons-5.13.5.tar.xz"; }; }; kgamma5 = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/kgamma5-5.13.4.tar.xz"; - sha256 = "0hcnflk7zzpx00w6ifidrwxjmr99xrisfz2206fggal5j7y5w6yw"; - name = "kgamma5-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/kgamma5-5.13.5.tar.xz"; + sha256 = "08brmdi5y69iwhj7506q2l0bfm92c9l9ds9w4d1ipcgnbydrhfyn"; + name = "kgamma5-5.13.5.tar.xz"; }; }; khotkeys = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/khotkeys-5.13.4.tar.xz"; - sha256 = "1nq2afb06y3383gh3n5b1b4sbry5nicy3znid6p7b0jch1a0v73x"; - name = "khotkeys-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/khotkeys-5.13.5.tar.xz"; + sha256 = "16kp5ck6zfpnmnvspdnqklix54np3sxvj5ixs9saqf3gd5rk49mp"; + name = "khotkeys-5.13.5.tar.xz"; }; }; kinfocenter = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/kinfocenter-5.13.4.tar.xz"; - sha256 = "1vnch4ic1ppsrnp1w6rjcmn3c9ni91b3dgk0z91aw2x8c77cvji9"; - name = "kinfocenter-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/kinfocenter-5.13.5.tar.xz"; + sha256 = "15r9j33z3l31gip9q3fw015s4mxakgy5wqfs04w5p0aq8x9xkpzl"; + name = "kinfocenter-5.13.5.tar.xz"; }; }; kmenuedit = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/kmenuedit-5.13.4.tar.xz"; - sha256 = "0jyb4dc42dnpb6v4hkfb9m97yim767z0dc0i0hxqvznd87n5nk98"; - name = "kmenuedit-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/kmenuedit-5.13.5.tar.xz"; + sha256 = "0zha39cd3p5nmrbkhkbcavxns2n2wnb6chc5kcsk5km9wn4laxz0"; + name = "kmenuedit-5.13.5.tar.xz"; }; }; kscreen = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/kscreen-5.13.4.tar.xz"; - sha256 = "0labhlwdar6iibixal48bkk777hpyaibszv9mshlmhd7riaqrxs3"; - name = "kscreen-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/kscreen-5.13.5.tar.xz"; + sha256 = "0kf1cf88n46b4js7x9r504605v68wp5hwpwid6phvfqdyqrvbb77"; + name = "kscreen-5.13.5.tar.xz"; }; }; kscreenlocker = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/kscreenlocker-5.13.4.tar.xz"; - sha256 = "01b6y0wwclhni6ansg3avkml4qsq93rrg254ihy18bd1h05jxg4r"; - name = "kscreenlocker-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/kscreenlocker-5.13.5.tar.xz"; + sha256 = "171zjk9r333kbkb9pashw0rdmiwq11nzfin4wnmqzwp7rrclxs18"; + name = "kscreenlocker-5.13.5.tar.xz"; }; }; ksshaskpass = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/ksshaskpass-5.13.4.tar.xz"; - sha256 = "1f1567ac8qlgjgbqbksxqm969shydw3nizhn3ixvzr0n81lvab36"; - name = "ksshaskpass-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/ksshaskpass-5.13.5.tar.xz"; + sha256 = "1znhj8x8kag1jrw0j1kfvqgprdayrcfbmawz2jap1ik2bjq7dp81"; + name = "ksshaskpass-5.13.5.tar.xz"; }; }; ksysguard = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/ksysguard-5.13.4.tar.xz"; - sha256 = "1pg5687mlf5h4wb65my0v6scrj1zkxm5755wlq1jdasqr6zffdw0"; - name = "ksysguard-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/ksysguard-5.13.5.tar.xz"; + sha256 = "1qjqhqc23rbimz3qj8gr3dhp0griwgbiajhvjngh1jl55fb3q29j"; + name = "ksysguard-5.13.5.tar.xz"; }; }; kwallet-pam = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/kwallet-pam-5.13.4.tar.xz"; - sha256 = "0f9pg73710adr8p7m9qmync2lc86yl6hxmvr854lqzrp9mm2an0p"; - name = "kwallet-pam-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/kwallet-pam-5.13.5.tar.xz"; + sha256 = "145daahh8qjpbfcvjk2zyd6k3sr22npgnv3n23j9aim75qiwz1ac"; + name = "kwallet-pam-5.13.5.tar.xz"; }; }; kwayland-integration = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/kwayland-integration-5.13.4.tar.xz"; - sha256 = "0mhsidzpv5wg59d3v5z3a4n27fgfpdcr6y33zvib9k67isgx39h1"; - name = "kwayland-integration-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/kwayland-integration-5.13.5.tar.xz"; + sha256 = "1qhkrs8md36z5gndkm88pyv6mspqsdsdavjz8klfwfv1hii6qyds"; + name = "kwayland-integration-5.13.5.tar.xz"; }; }; kwin = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/kwin-5.13.4.tar.xz"; - sha256 = "1inh20xh80nv1vn0154jqsn6cn1xqfgjvvdvng6k2v330sd15dc6"; - name = "kwin-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/kwin-5.13.5.tar.xz"; + sha256 = "0ld1pclni1axrh7jww3gxlfwkbjsfbqb9z7gygj2ff3nmc6khgfm"; + name = "kwin-5.13.5.tar.xz"; }; }; kwrited = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/kwrited-5.13.4.tar.xz"; - sha256 = "1j9gl6d3j5mzydb4r9xmzxs313f2pj5phnh2n74nia672fn5kpqb"; - name = "kwrited-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/kwrited-5.13.5.tar.xz"; + sha256 = "150nhjk4vcigs2r2bxqk309g81lxpnkkv8l44hiyivcbmwvc3aya"; + name = "kwrited-5.13.5.tar.xz"; }; }; libkscreen = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/libkscreen-5.13.4.tar.xz"; - sha256 = "1azcpc3jm006s8zswv1w22gcajyvs800xc77l6das5jrl4ddk309"; - name = "libkscreen-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/libkscreen-5.13.5.tar.xz"; + sha256 = "04719va15i66qn1xqx318v6risxhp8bfcnhxh9mqm5h9qx5c6c4k"; + name = "libkscreen-5.13.5.tar.xz"; }; }; libksysguard = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/libksysguard-5.13.4.tar.xz"; - sha256 = "0k8q5bxk9zyv7c3nny1c399v8acqs618nw39q20pj2qdijl9ibvh"; - name = "libksysguard-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/libksysguard-5.13.5.tar.xz"; + sha256 = "0pccjjjzk8dxgmkj5vrq20nwb3qpf9isjd1zmg5nc127jld924x6"; + name = "libksysguard-5.13.5.tar.xz"; }; }; milou = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/milou-5.13.4.tar.xz"; - sha256 = "0rqwjb91a5x7piwdfh4xy8f2nhkfzdaja0ifpm7hrkysq6d9yzad"; - name = "milou-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/milou-5.13.5.tar.xz"; + sha256 = "0rhgj10l2iik1mgnv2bixxqjyc3pl731bs1bqz9gsa3wiazspwrv"; + name = "milou-5.13.5.tar.xz"; }; }; oxygen = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/oxygen-5.13.4.tar.xz"; - sha256 = "0035z94v4fbdl5jcaggv1vqjxk9z1marf4vs8zm7fkz6hhcn4vj2"; - name = "oxygen-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/oxygen-5.13.5.tar.xz"; + sha256 = "0wm2mngh0gb0lqvx8g82ml2sdv0kbkx14mpb8c6aw3hslcwma7yd"; + name = "oxygen-5.13.5.tar.xz"; }; }; plasma-browser-integration = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/plasma-browser-integration-5.13.4.tar.xz"; - sha256 = "19vqn3wbkfzsbf5rl61zaqgp10q83zxjmvvbn9325rp3dsv3i0jb"; - name = "plasma-browser-integration-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/plasma-browser-integration-5.13.5.tar.xz"; + sha256 = "0bhpbq4n29x8m0nmxlli5ljmgpw9da7sfbmf3j5c3wnxqja16sgy"; + name = "plasma-browser-integration-5.13.5.tar.xz"; }; }; plasma-desktop = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/plasma-desktop-5.13.4.tar.xz"; - sha256 = "1wmyms3bjka9kgjc6zp17j8w707lnmr2kxqzqznm78c16h34lfdx"; - name = "plasma-desktop-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/plasma-desktop-5.13.5.tar.xz"; + sha256 = "14isrq3n9lm1nzmyv8zdgq6pwnv2zmg4dwxyp7fvqjxfls8851vp"; + name = "plasma-desktop-5.13.5.tar.xz"; }; }; plasma-integration = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/plasma-integration-5.13.4.tar.xz"; - sha256 = "0p5wqj0jdvwq7blj7j1va00jlkqkwcxfkcj7gpnjmnsggp25mpsq"; - name = "plasma-integration-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/plasma-integration-5.13.5.tar.xz"; + sha256 = "0j57ra79p5lkj81d05hhb87mrxgyj6qikkpzcb0p2dr2x8cmkng2"; + name = "plasma-integration-5.13.5.tar.xz"; }; }; plasma-nm = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/plasma-nm-5.13.4.tar.xz"; - sha256 = "0qadmxzmw8a4r43ri2xxj4i884vraxlyxmwqkkn540x0aysyj4rq"; - name = "plasma-nm-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/plasma-nm-5.13.5.tar.xz"; + sha256 = "1z8f5iybgra72vhpiayiwpysvv2z8x2r5xal8rhgf7y24xcjwxmi"; + name = "plasma-nm-5.13.5.tar.xz"; }; }; plasma-pa = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/plasma-pa-5.13.4.tar.xz"; - sha256 = "1xqmp19dkggfzapns94jr0jz03aphdlz31iw888w2qj730zdx97k"; - name = "plasma-pa-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/plasma-pa-5.13.5.tar.xz"; + sha256 = "0p54x4zr3w009nn7g00qmxh7xil35x7b48d0l0flz5d7hvkk6nd8"; + name = "plasma-pa-5.13.5.tar.xz"; }; }; plasma-sdk = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/plasma-sdk-5.13.4.tar.xz"; - sha256 = "13ddin88ila3imkhn9bgaf1i0bbbmcb4xigk2cps74s8vl98jpfa"; - name = "plasma-sdk-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/plasma-sdk-5.13.5.tar.xz"; + sha256 = "1x8hq343xzwlcsdvf0jy0qgn64xw8l11lawhknbjrf90qq58axga"; + name = "plasma-sdk-5.13.5.tar.xz"; }; }; plasma-tests = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/plasma-tests-5.13.4.tar.xz"; - sha256 = "0fzqw3ix9sa3m492xjz46wsaqs7cgfpcprdx3z05ww4217k5d4sf"; - name = "plasma-tests-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/plasma-tests-5.13.5.tar.xz"; + sha256 = "00nm0d0c4zccbwnhy8sc1qb4sf7bs5vfky3n7lihwyng3syqwz3d"; + name = "plasma-tests-5.13.5.tar.xz"; }; }; plasma-vault = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/plasma-vault-5.13.4.tar.xz"; - sha256 = "1acpn49vb645a30xnxxf0rylihb7n838l0ky5169n6dq96swam4j"; - name = "plasma-vault-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/plasma-vault-5.13.5.tar.xz"; + sha256 = "1045zb58pmcyn0cznb81bmcpd4hkhxm6509rznrjykkhcfcrbf8z"; + name = "plasma-vault-5.13.5.tar.xz"; }; }; plasma-workspace = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/plasma-workspace-5.13.4.tar.xz"; - sha256 = "1kvl6pbhqw7llv8llq020qvbk7glynix8c4dsh3dfp170xpg3qnh"; - name = "plasma-workspace-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/plasma-workspace-5.13.5.tar.xz"; + sha256 = "1qcmw60lyp966rhvw9raaqrvxdv09pr8zc7x3fx1vpm9kphh3lv3"; + name = "plasma-workspace-5.13.5.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/plasma-workspace-wallpapers-5.13.4.tar.xz"; - sha256 = "11z8isy01vbgzb5jkbslin30himy5072wwrb010jw9ls9j5dz1cm"; - name = "plasma-workspace-wallpapers-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/plasma-workspace-wallpapers-5.13.5.tar.xz"; + sha256 = "1wbnm6bzvgx2ssig4dk3plhrsjiw3lq1yhr2dfga6vvlyi6wg9mg"; + name = "plasma-workspace-wallpapers-5.13.5.tar.xz"; }; }; plymouth-kcm = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/plymouth-kcm-5.13.4.tar.xz"; - sha256 = "1f18ys2b80smd975a18qkhxb3ipr31wx8g0pmbfscqclc6kma506"; - name = "plymouth-kcm-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/plymouth-kcm-5.13.5.tar.xz"; + sha256 = "0flgr68rms40acgl2f4539mvp53m36ifignxix27raqmibaf38s1"; + name = "plymouth-kcm-5.13.5.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.13.4"; + version = "1-5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/polkit-kde-agent-1-5.13.4.tar.xz"; - sha256 = "0wgj9pawwcgznqg7shp3zh65ag9cscnmamgr29x2lq9wwxqw2836"; - name = "polkit-kde-agent-1-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/polkit-kde-agent-1-5.13.5.tar.xz"; + sha256 = "00f05ii3www8knn2ycgkc6izc8ydb3vjy4f657k38hkzl2sjnhl6"; + name = "polkit-kde-agent-1-5.13.5.tar.xz"; }; }; powerdevil = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/powerdevil-5.13.4.tar.xz"; - sha256 = "10zhm5z0hwh75fmcp7cz5c35zcywm7an73x2dh4fyl42cczfb0zl"; - name = "powerdevil-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/powerdevil-5.13.5.tar.xz"; + sha256 = "1k7ilcvm5nvx6sd43j0djar9ay6ag84g4m8f420yf7q4yryp76yn"; + name = "powerdevil-5.13.5.tar.xz"; }; }; sddm-kcm = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/sddm-kcm-5.13.4.tar.xz"; - sha256 = "0g6alnlg8waxgf3cbzx838062qsdcfisxsw67zxykyp77spq00f0"; - name = "sddm-kcm-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/sddm-kcm-5.13.5.tar.xz"; + sha256 = "122g83ajh0xqylvmicrhgw0fm8bmzpw26v7fjckfk9if5zqzk8ch"; + name = "sddm-kcm-5.13.5.tar.xz"; }; }; systemsettings = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/systemsettings-5.13.4.tar.xz"; - sha256 = "1z6c6kaz0ib76qsiq5cj6ya4mrdgmv3xa71hnwd2fbmv45agk8q4"; - name = "systemsettings-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/systemsettings-5.13.5.tar.xz"; + sha256 = "14029a3mf2d6cw87lyffnwy88yvj0n3jmi0glr69zwi8lmz0cbsv"; + name = "systemsettings-5.13.5.tar.xz"; }; }; user-manager = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/user-manager-5.13.4.tar.xz"; - sha256 = "1s968hf7p9rrv3b0bq47s1387cbl6iq5313m34xfv5h7rqr2cw3m"; - name = "user-manager-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/user-manager-5.13.5.tar.xz"; + sha256 = "12550xvl084rab0y331r8dm3qwpcvm83k3j02gxrwrigv1vckas8"; + name = "user-manager-5.13.5.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.13.4"; + version = "5.13.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.4/xdg-desktop-portal-kde-5.13.4.tar.xz"; - sha256 = "02fv1v778rh512wcm2zqgn6q61459bjbcjj2xz63lp3iycl7avqi"; - name = "xdg-desktop-portal-kde-5.13.4.tar.xz"; + url = "${mirror}/stable/plasma/5.13.5/xdg-desktop-portal-kde-5.13.5.tar.xz"; + sha256 = "0i9pcbdxfh2cbv9ybk9i11l7vcm2ifx0zm3gkj3ry3bjxxbphn4f"; + name = "xdg-desktop-portal-kde-5.13.5.tar.xz"; }; }; } diff --git a/pkgs/development/compilers/julia/shared.nix b/pkgs/development/compilers/julia/shared.nix index 41c9c57bd034..e07c2c04b92d 100644 --- a/pkgs/development/compilers/julia/shared.nix +++ b/pkgs/development/compilers/julia/shared.nix @@ -211,7 +211,7 @@ stdenv.mkDerivation rec { description = "High-level performance-oriented dynamical language for technical computing"; homepage = https://julialang.org/; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ raskin rob ]; + maintainers = with stdenv.lib.maintainers; [ raskin rob garrison ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; broken = stdenv.isi686; }; diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index a860aa7dc734..34855838fe8b 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.7"; + version = "1.4.10"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "1wmxly94pn8527092hyzg5mq58mg7qlc46nm31f268wb2dm67rvm"; + sha256 = "1j9wb608pkihpwgzl4qvnr4jl6mb7ngfqy559pxnvmnn1zlyfklh"; }; patchPhase = '' diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index 35cf63af8627..fc88a1c33eed 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = git://github.com/QuickChick/QuickChick.git; + homepage = https://github.com/QuickChick/QuickChick; description = "Randomized property-based testing plugin for Coq; a clone of Haskell QuickCheck"; maintainers = with maintainers; [ jwiegley ]; platforms = coq.meta.platforms; diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix index 795c177bc80d..c707fcdbd6be 100644 --- a/pkgs/development/coq-modules/category-theory/default.nix +++ b/pkgs/development/coq-modules/category-theory/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = git://github.com/jwiegley/category-theory.git; + homepage = https://github.com/jwiegley/category-theory; description = "A formalization of category theory in Coq for personal study and practical work"; maintainers = with maintainers; [ jwiegley ]; platforms = coq.meta.platforms; diff --git a/pkgs/development/coq-modules/coq-haskell/default.nix b/pkgs/development/coq-modules/coq-haskell/default.nix index a66e941a8c9c..9d9a4cb5f1a1 100644 --- a/pkgs/development/coq-modules/coq-haskell/default.nix +++ b/pkgs/development/coq-modules/coq-haskell/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = git://github.com/jwiegley/coq-haskell.git; + homepage = https://github.com/jwiegley/coq-haskell; description = "A library for formalizing Haskell types and functions in Coq"; maintainers = with maintainers; [ jwiegley ]; platforms = coq.meta.platforms; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ef55272d6e97..2e293f1031b0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1130,4 +1130,12 @@ self: super: { # https://github.com/snapframework/xmlhtml/pull/37 xmlhtml = doJailbreak super.xmlhtml; + + # https://github.com/NixOS/nixpkgs/issues/46467 + safe-money-aeson = super.safe-money-aeson.override { safe-money = self.safe-money_0_7; }; + safe-money-store = super.safe-money-store.override { safe-money = self.safe-money_0_7; }; + safe-money-cereal = super.safe-money-cereal.override { safe-money = self.safe-money_0_7; }; + safe-money-serialise = super.safe-money-serialise.override { safe-money = self.safe-money_0_7; }; + safe-money-xmlbf = super.safe-money-xmlbf.override { safe-money = self.safe-money_0_7; }; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 3aee4857f993..4a26fcbffc17 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -9054,12 +9054,6 @@ dont-distribute-packages: temporary-resourcet: [ i686-linux, x86_64-linux, x86_64-darwin ] tempus: [ i686-linux, x86_64-linux, x86_64-darwin ] tensor: [ i686-linux, x86_64-linux, x86_64-darwin ] - tensorflow-core-ops: [ i686-linux, x86_64-linux, x86_64-darwin ] - tensorflow-logging: [ i686-linux, x86_64-linux, x86_64-darwin ] - tensorflow-opgen: [ i686-linux, x86_64-linux, x86_64-darwin ] - tensorflow-ops: [ i686-linux, x86_64-linux, x86_64-darwin ] - tensorflow-proto: [ i686-linux, x86_64-linux, x86_64-darwin ] - tensorflow: [ i686-linux, x86_64-linux, x86_64-darwin ] term-rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] termbox-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] termcolor: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/configuration-tensorflow.nix b/pkgs/development/haskell-modules/configuration-tensorflow.nix index dfc93686405c..43a3b82923ba 100644 --- a/pkgs/development/haskell-modules/configuration-tensorflow.nix +++ b/pkgs/development/haskell-modules/configuration-tensorflow.nix @@ -55,13 +55,29 @@ in tensorflow-logging = super.tensorflow-logging.override { inherit proto-lens; }; - tensorflow-mnist = super.tensorflow-mnist.override { + tensorflow-mnist = overrideCabal (super.tensorflow-mnist.override { inherit proto-lens; - }; + # https://github.com/tensorflow/haskell/issues/215 + tensorflow-mnist-input-data = self.tensorflow-mnist-input-data; + }) (_drv: { broken = false; }); tensorflow-mnist-input-data = setSourceRoot "tensorflow-mnist-input-data" (super.callPackage ( { mkDerivation, base, bytestring, Cabal, cryptonite, directory , filepath, HTTP, network-uri, stdenv }: + + let + fileInfos = { + "train-images-idx3-ubyte.gz" = "440fcabf73cc546fa21475e81ea370265605f56be210a4024d2ca8f203523609"; + "train-labels-idx1-ubyte.gz" = "3552534a0a558bbed6aed32b30c495cca23d567ec52cac8be1a0730e8010255c"; + "t10k-images-idx3-ubyte.gz" = "8d422c7b0a1c1c79245a5bcf07fe86e33eeafee792b84584aec276f5a2dbc4e6"; + "t10k-labels-idx1-ubyte.gz" = "f7ae60f92e00ec6debd23a6088c31dbd2371eca3ffa0defaefb259924204aec6"; + }; + downloads = with pkgs.lib; flip mapAttrsToList fileInfos (name: sha256: + pkgs.fetchurl { + url = "http://yann.lecun.com/exdb/mnist/${name}"; + inherit sha256; + }); + in mkDerivation { pname = "tensorflow-mnist-input-data"; version = "0.1.0.0"; @@ -71,6 +87,9 @@ in base bytestring Cabal cryptonite directory filepath HTTP network-uri ]; + preConfigure = pkgs.lib.strings.concatStringsSep "\n" ( + map (x: "ln -s ${x} data/$(stripHash ${x})") downloads + ); libraryHaskellDepends = [ base ]; homepage = "https://github.com/tensorflow/haskell#readme"; description = "Downloader of input data for training MNIST"; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index e8b6cc93c2c1..1f2a28cb8fb8 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { name = "racket-${version}"; - version = "7.0"; + version = "7.0"; # always change at once with ./minimal.nix src = (stdenv.lib.makeOverridable ({ name, sha256 }: fetchurl rec { diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix index ecbb1abb40ca..7c6844fdec09 100644 --- a/pkgs/development/interpreters/spidermonkey/52.nix +++ b/pkgs/development/interpreters/spidermonkey/52.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { "--with-intl-api" "--enable-readline" "--enable-shared-js" - ]; + ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-jemalloc"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index 4d94faa9566a..fca5e8d70a3b 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, libGLU_combined, freeglut, darwin }: +{ stdenv, fetchFromGitHub, cmake, libGLU_combined, freeglut +, Cocoa, OpenGL +}: stdenv.mkDerivation rec { name = "bullet-${version}"; @@ -11,10 +13,9 @@ stdenv.mkDerivation rec { sha256 = "1msp7w3563vb43w70myjmqsdb97kna54dcfa7yvi9l3bvamb92w3"; }; - buildInputs = [ cmake ] ++ - (if stdenv.isDarwin - then with darwin.apple_sdk.frameworks; [ Cocoa OpenGL ] - else [libGLU_combined freeglut]); + nativeBuildInputs = [ cmake ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ libGLU_combined freeglut ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; patches = [ ./gwen-narrowing.patch ]; @@ -28,25 +29,26 @@ stdenv.mkDerivation rec { "-DBUILD_CPU_DEMOS=OFF" "-DINSTALL_EXTRA_LIBS=ON" ] ++ stdenv.lib.optionals stdenv.isDarwin [ - "-DMACOSX_DEPLOYMENT_TARGET=\"10.9\"" "-DOPENGL_FOUND=true" - "-DOPENGL_LIBRARIES=${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework" - "-DOPENGL_INCLUDE_DIR=${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework" - "-DOPENGL_gl_LIBRARY=${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework" - "-DCOCOA_LIBRARY=${darwin.apple_sdk.frameworks.Cocoa}/Library/Frameworks/Cocoa.framework" + "-DOPENGL_LIBRARIES=${OpenGL}/Library/Frameworks/OpenGL.framework" + "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks/OpenGL.framework" + "-DOPENGL_gl_LIBRARY=${OpenGL}/Library/Frameworks/OpenGL.framework" + "-DCOCOA_LIBRARY=${Cocoa}/Library/Frameworks/Cocoa.framework" + "-DBUILD_BULLET2_DEMOS=OFF" + "-DBUILD_UNIT_TESTS=OFF" ]; enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "A professional free 3D Game Multiphysics Library"; longDescription = '' Bullet 3D Game Multiphysics Library provides state of the art collision detection, soft body and rigid body dynamics. ''; homepage = http://bulletphysics.org; - license = stdenv.lib.licenses.zlib; - maintainers = with stdenv.lib.maintainers; [ aforemny ]; - platforms = with stdenv.lib.platforms; unix; + license = licenses.zlib; + maintainers = with maintainers; [ aforemny ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 705aa7252d1f..d8150fd11508 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, libGLU_combined, libX11, libXext, libXfixes -, libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json-glib, -gobjectIntrospection, gtk3, gnome3 +, libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json-glib +, gobjectIntrospection, gtk3, gnome3, libinput, libgudev, libxkbcommon }: let @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ libX11 libGLU_combined libXext libXfixes libXdamage libXcomposite libXi cogl pango - atk json-glib gobjectIntrospection libxcb + atk json-glib gobjectIntrospection libxcb libinput libgudev libxkbcommon ]; configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index e06c71c15db4..c624f9537fb3 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libGL, glib, gdk_pixbuf, xorg, libintl +{ stdenv, fetchurl, fetchpatch, pkgconfig, libGL, glib, gdk_pixbuf, xorg, libintl , pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland, gnome3 , mesa_noglu , gstreamerSupport ? true, gst_all_1 }: @@ -14,6 +14,23 @@ in stdenv.mkDerivation rec { sha256 = "03f0ha3qk7ca0nnkkcr1garrm1n1vvfqhkz9lwjm592fnv6ii9rr"; }; + patches = [ + # Some deepin packages need the following patches. They have been + # submitted by Fedora on the GNOME Bugzilla + # (https://bugzilla.gnome.org/787443). Upstream thinks the patch + # could be merged, but dev can not make a new release. + + (fetchpatch { + url = https://bug787443.bugzilla-attachments.gnome.org/attachment.cgi?id=359589; + sha256 = "0f0d9iddg8zwy853phh7swikg4yzhxxv71fcag36f8gis0j5p998"; + }) + + (fetchpatch { + url = https://bug787443.bugzilla-attachments.gnome.org/attachment.cgi?id=361056; + sha256 = "09fyrdci4727fg6qm5aaapsbv71sf4wgfaqz8jqlyy61dibgg490"; + }) + ]; + nativeBuildInputs = [ pkgconfig libintl ]; configureFlags = [ diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index d48ba9082af2..0d77018eee5f 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -1,22 +1,30 @@ -{ stdenv, fetchurl, pkgconfig, libsoup, glib }: +{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, libsoup, gtk3, glib }: stdenv.mkDerivation rec { name = "gssdp-${version}"; version = "1.0.2"; + outputs = [ "out" "bin" "dev" "devdoc" ]; + src = fetchurl { - url = "mirror://gnome/sources/gssdp/1.0/${name}.tar.xz"; + url = "mirror://gnome/sources/gssdp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "1p1m2m3ndzr2whipqw4vfb6s6ia0g7rnzzc4pnq8b8g1qw4prqd1"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libsoup ]; + nativeBuildInputs = [ pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ]; + buildInputs = [ libsoup gtk3 ]; propagatedBuildInputs = [ glib ]; + configureFlags = [ + "--enable-gtk-doc" + ]; + + doCheck = true; + meta = with stdenv.lib; { description = "GObject-based API for handling resource discovery and announcement over SSDP"; homepage = http://www.gupnp.org/; - license = licenses.lgpl2; + license = licenses.lgpl2Plus; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix index 9b61f4b648e1..7491da7c3e2f 100644 --- a/pkgs/development/libraries/gupnp-av/default.nix +++ b/pkgs/development/libraries/gupnp-av/default.nix @@ -1,22 +1,29 @@ -{ stdenv, fetchurl, pkgconfig, gupnp, glib, libxml2 }: +{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, gupnp, glib, libxml2 }: stdenv.mkDerivation rec { name = "gupnp-av-${version}"; - majorVersion = "0.12"; - version = "${majorVersion}.10"; + version = "0.12.10"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/gupnp-av/${majorVersion}/${name}.tar.xz"; + url = "mirror://gnome/sources/gupnp-av/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "0nmq6wlbfsssanv3jgv2z0nhfkv8vzfr3gq5qa8svryvvn2fyf40"; }; - - nativeBuildInputs = [ pkgconfig ]; + + nativeBuildInputs = [ pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ]; buildInputs = [ gupnp glib libxml2 ]; - meta = { + configureFlags = [ + "--enable-gtk-doc" + ]; + + doCheck = true; + + meta = with stdenv.lib; { homepage = http://gupnp.org/; description = "A collection of helpers for building AV (audio/video) applications using GUPnP"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = licenses.lgpl2Plus; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gupnp-dlna/default.nix b/pkgs/development/libraries/gupnp-dlna/default.nix index 75818f756921..aba95889b698 100644 --- a/pkgs/development/libraries/gupnp-dlna/default.nix +++ b/pkgs/development/libraries/gupnp-dlna/default.nix @@ -1,22 +1,34 @@ -{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, gupnp, gst-plugins-base }: +{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, gupnp, gst_all_1 }: stdenv.mkDerivation rec { name = "gupnp-dlna-${version}"; - majorVersion = "0.10"; - version = "${majorVersion}.5"; + version = "0.10.5"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/gupnp-dlna/${majorVersion}/${name}.tar.xz"; + url = "mirror://gnome/sources/gupnp-dlna/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "0spzd2saax7w776p5laixdam6d7smyynr9qszhbmq7f14y13cghj"; }; - nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; - buildInputs = [ gupnp gst-plugins-base ]; + nativeBuildInputs = [ pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ]; + buildInputs = [ gupnp gst_all_1.gst-plugins-base ]; - meta = { + configureFlags = [ + "--enable-gtk-doc" + ]; + + doCheck = true; + + postPatch = '' + chmod +x tests/test-discoverer.sh.in + patchShebangs tests/test-discoverer.sh.in + ''; + + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GUPnP/; description = "Library to ease DLNA-related bits for applications using GUPnP"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = licenses.lgpl2Plus; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/development/libraries/gupnp-igd/default.nix index 182905e9546a..50107959786d 100644 --- a/pkgs/development/libraries/gupnp-igd/default.nix +++ b/pkgs/development/libraries/gupnp-igd/default.nix @@ -1,22 +1,29 @@ -{ stdenv, fetchurl, pkgconfig, glib, gupnp }: - +{ stdenv, fetchurl, pkgconfig, gettext, gobjectIntrospection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gupnp }: + stdenv.mkDerivation rec { name = "gupnp-igd-${version}"; - majorVersion = "0.2"; - version = "${majorVersion}.4"; + version = "0.2.5"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/gupnp-igd/${majorVersion}/${name}.tar.xz"; - sha256 = "38c4a6d7718d17eac17df95a3a8c337677eda77e58978129ad3182d769c38e44"; + url = "mirror://gnome/sources/gupnp-igd/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "081v1vhkbz3wayv49xfiskvrmvnpx93k25am2wnarg5cifiiljlb"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection gtk-doc docbook_xsl docbook_xml_dtd_412 ]; propagatedBuildInputs = [ glib gupnp ]; - meta = { + configureFlags = [ + "--enable-gtk-doc" + ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Library to handle UPnP IGD port mapping"; homepage = http://www.gupnp.org/; - license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.linux; + license = licenses.lgpl21; + platforms = platforms.linux; }; } - diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index 963b93ef6917..45adf46ff36f 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -1,28 +1,39 @@ -{ stdenv, fetchurl, pkgconfig, glib, gssdp, libsoup, libxml2, libuuid }: - +{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44, glib, gssdp, libsoup, libxml2, libuuid }: + stdenv.mkDerivation rec { name = "gupnp-${version}"; - majorVersion = "1.0"; - version = "${majorVersion}.2"; + version = "1.0.3"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/gupnp/${majorVersion}/gupnp-${version}.tar.xz"; - sha256 = "043nqxlj030a3wvd6x4c9z8fjarjjjsl2pjarl0nn70ig6kzswsi"; + url = "mirror://gnome/sources/gupnp/${stdenv.lib.versions.majorMinor version}/gupnp-${version}.tar.xz"; + sha256 = "1fyb6yn75vf2y1b8nbc1df572swzr74yiwy3v3g5xn36wlp1cjvr"; }; - nativeBuildInputs = [ pkgconfig ]; + patches = [ + # Nix’s pkg-config ignores Requires.private + # https://github.com/NixOS/nixpkgs/commit/1e6622f4d5d500d6e701bd81dd4a22977d10637d + # We are essentialy reverting the following patch for now + # https://bugzilla.gnome.org/show_bug.cgi?id=685477 + # at least until Requires.internal or something is implemented + # https://gitlab.freedesktop.org/pkg-config/pkg-config/issues/7 + ./fix-requires.patch + ]; + + nativeBuildInputs = [ pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_44 ]; propagatedBuildInputs = [ glib gssdp libsoup libxml2 libuuid ]; - postInstall = '' - ln -sv ${libsoup.dev}/include/libsoup-2*/libsoup $out/include - ln -sv ${libxml2.dev}/include/*/libxml $out/include - ln -sv ${gssdp}/include/*/libgssdp $out/include - ''; + configureFlags = [ + "--enable-gtk-doc" + ]; - meta = { + doCheck = true; + + meta = with stdenv.lib; { homepage = http://www.gupnp.org/; description = "An implementation of the UPnP specification"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = licenses.lgpl2Plus; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gupnp/fix-requires.patch b/pkgs/development/libraries/gupnp/fix-requires.patch new file mode 100644 index 000000000000..4538fc55460f --- /dev/null +++ b/pkgs/development/libraries/gupnp/fix-requires.patch @@ -0,0 +1,9 @@ +--- a/gupnp-1.0.pc.in ++++ b/gupnp-1.0.pc.in +@@ -8,4 +8,5 @@ + Version: @VERSION@ + Libs: -L${libdir} -lgupnp-1.0 + Cflags: -I${includedir}/gupnp-1.0 +-Requires.private: gssdp-1.0 libxml-2.0 libsoup-2.4 @UUID_LIBS@ ++Requires: glib-2.0 gobject-2.0 gssdp-1.0 libxml-2.0 libsoup-2.4 ++Requires.private: @UUID_LIBS@ diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 3ba513f90781..c4f41663c848 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "18.05"; + version = "18.08"; name = "libmediainfo-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "08ajrmbvqn2cvfq3jjdh64lma77kx4di5vg632c6bmbir89rcxbn"; + sha256 = "0h9fkfkil9y5xjxa7q4gxxihkn9kv9hak6ral2isvks5x3sy0ca8"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libtensorflow/default.nix b/pkgs/development/libraries/libtensorflow/default.nix index b4e616409c4f..e6cd140c4e4b 100644 --- a/pkgs/development/libraries/libtensorflow/default.nix +++ b/pkgs/development/libraries/libtensorflow/default.nix @@ -31,19 +31,19 @@ let in stdenv.mkDerivation rec { pname = "libtensorflow"; - version = "1.10.0"; + version = "1.9.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://storage.googleapis.com/tensorflow/${pname}/${pname}-${tfType}-${system}-${version}.tar.gz"; sha256 = if system == "linux-x86_64" then if cudaSupport - then "0v66sscxpyixjrf9yjshl001nix233i6chc61akx0kx7ial4l1wn" - else "11sbpcbgdzj8v17mdppfv7v1fn3nbzkdad60gc42y2j6knjbmwxb" + then "1q3mh06x344im25z7r3vgrfksfdsi8fh8ldn6y2mf86h4d11yxc3" + else "0l9ps115ng5ffzdwphlqmj3jhidps2v5afppdzrbpzmy41xz0z21" else if system == "darwin-x86_64" then if cudaSupport then unavailable - else "11p0f77m4wycpc024mh7jx0kbdhgm0wp6ir6dsa8lkcpdb59bn59" + else "1qj0v1706w6mczycdsh38h2glyv5d25v62kdn98wxd5rw8f9v657" else unavailable; }; diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index a0ace84bc67d..50b43c4e043d 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -41,6 +41,10 @@ stdenv.mkDerivation rec { "multiple_listen" "delayed_accept" "shutdown_close_tcp" "shutdown_eof" "shutdown_twice" "callback_stack" "tty_pty" + ] ++ stdenv.lib.optionals stdenv.isAarch32 [ + # I observe this test failing with some regularity on ARMv7: + # https://github.com/libuv/libuv/issues/1871 + "shutdown_close_pipe" ]; tdRegexp = lib.concatStringsSep "\\|" toDisable; in lib.optionalString doCheck '' diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/development/libraries/mono-addins/default.nix index e68661b44ec3..780f68e7d485 100644 --- a/pkgs/development/libraries/mono-addins/default.nix +++ b/pkgs/development/libraries/mono-addins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono, gtk-sharp-2_0 }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono48, gtk-sharp-2_0 }: stdenv.mkDerivation rec { name = "mono-addins-${version}"; @@ -13,7 +13,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ mono gtk-sharp-2_0 ]; + + # Use msbuild when https://github.com/NixOS/nixpkgs/pull/43680 is merged + buildInputs = [ mono48 gtk-sharp-2_0 ]; dontStrip = true; diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix new file mode 100644 index 000000000000..465a70576356 --- /dev/null +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, boost, openssl, zlib, libsodium, olm, gtest, spdlog, nlohmann_json }: + +stdenv.mkDerivation rec { + name = "mtxclient-${version}"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "mujx"; + repo = "mtxclient"; + rev = "v${version}"; + sha256 = "0i58y45diysayjzy5ick15356972z67dfxm0w41ay88nm42x1imp"; + }; + + postPatch = '' + ln -s ${nlohmann_json}/include/nlohmann/json.hpp include/json.hpp + ''; + + cmakeFlags = [ "-DBUILD_LIB_TESTS=OFF" "-DBUILD_LIB_EXAMPLES=OFF" ]; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ boost openssl zlib libsodium olm ]; + + meta = with stdenv.lib; { + description = "Client API library for Matrix, built on top of Boost.Asio"; + homepage = https://github.com/mujx/mtxclient; + license = licenses.mit; + maintainers = with maintainers; [ fpletz ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index ff8a54f87f2a..d3a4b21b4b61 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, nix, cmake, pkgconfig, boost }: -let version = "4.0.5"; in +let version = "5.0.0"; in stdenv.mkDerivation { name = "nix-plugins-${version}"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { owner = "shlevy"; repo = "nix-plugins"; rev = version; - sha256 = "170f365rnik62fp9wllbqlspr8lf1yb96pmn2z708i2wjlkdnrny"; + sha256 = "0231j92504vx0f4wax9hwjdni1j4z0g8bx9wbakg6rbghl4svmdv"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/nsss/default.nix b/pkgs/development/libraries/nsss/default.nix new file mode 100644 index 000000000000..6c4a23ccaf28 --- /dev/null +++ b/pkgs/development/libraries/nsss/default.nix @@ -0,0 +1,33 @@ +{ stdenv, skawarePackages }: + +with skawarePackages; + +buildPackage { + pname = "nsss"; + version = "0.0.1.0"; + sha256 = "0f285bvpvhk40cqjpkc1jb36il0fkzzzjmc89gbbq3awl3w4r1i0"; + + description = "An implementation of a subset of the pwd.h, group.h and shadow.h family of functions."; + + # TODO: nsss support + configureFlags = [ + "--libdir=\${lib}/lib" + "--dynlibdir=\${lib}/lib" + "--bindir=\${bin}/bin" + "--includedir=\${dev}/include" + "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps" + "--with-include=${skalibs.dev}/include" + "--with-lib=${skalibs.lib}/lib" + "--with-dynlib=${skalibs.lib}/lib" + ]; + + postInstall = '' + # remove all nsss executables from build directory + rm $(find -name "nsssd-*" -type f -mindepth 1 -maxdepth 1 -executable) + rm libnsss.* libnsssd.* + + mv doc $doc/share/doc/nsss/html + mv examples $doc/share/doc/nsss/examples + ''; + +} diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix index f9a75801e101..956c8b58ffc1 100644 --- a/pkgs/development/libraries/oniguruma/default.nix +++ b/pkgs/development/libraries/oniguruma/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "onig-${version}"; - version = "6.8.2"; + version = "6.9.0"; src = fetchFromGitHub { owner = "kkos"; repo = "oniguruma"; rev = "v${version}"; - sha256 = "00ly5i26n7wajhyhq3xadsc7dxrf7qllhwilk8dza2qj5dhld4nd"; + sha256 = "064nk8nxygqrk5b6n7zvrksf5shrsapn12zdi6crbbfbw0s7pn8h"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/openbsm/default.nix b/pkgs/development/libraries/openbsm/default.nix index a9559c6abfba..136665425280 100644 --- a/pkgs/development/libraries/openbsm/default.nix +++ b/pkgs/development/libraries/openbsm/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0b98359hd8mm585sh145ss828pg2y8vgz38lqrb7nypapiyqdnd1"; }; - patches = [ ./bsm-add-audit_token_to_pid.patch ]; + patches = lib.optional stdenv.isDarwin [ ./bsm-add-audit_token_to_pid.patch ]; meta = { homepage = http://www.openbsm.org/; diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 87af069c18a5..7123858b8edc 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -1,128 +1,101 @@ -{ enableMultiThreading ? false +{ enableMultiThreading ? true , enableG3toG4 ? false , enableInventor ? false , enableGDML ? false , enableQT ? false , enableXM ? false -, enableOpenGLX11 ? false +, enableOpenGLX11 ? true , enableRaytracerX11 ? false # Standard build environment with cmake. , stdenv, fetchurl, cmake # Optional system packages, otherwise internal GEANT4 packages are used. -, clhep ? null -, expat ? null -, zlib ? null +, clhep ? null # not packaged currently +, expat +, zlib # For enableGDML. -, xercesc ? null +, xercesc # For enableQT. -, qt ? null # qt4SDK or qt5SDK +, qtbase # For enableXM. -, motif ? null # motif or lesstif +, motif # For enableInventor , coin3d , soxt -, libXpm ? null +, libXpm # For enableQT, enableXM, enableOpenGLX11, enableRaytracerX11. -, libGLU_combined ? null -, xlibsWrapper ? null -, libXmu ? null +, libGLU_combined +, xlibsWrapper +, libXmu }: -# G4persistency library with support for GDML -assert enableGDML -> xercesc != null; +stdenv.mkDerivation rec { + version = "10.4.1"; + name = "geant4-${version}"; -# If enableQT, Qt4/5 User Interface and Visualization drivers. -assert enableQT -> qt != null; - -# Motif User Interface and Visualisation drivers. -assert enableXM -> motif != null; - -# OpenGL/X11 User Interface and Visualisation drivers. -assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libGLU_combined != null; -assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> xlibsWrapper != null; -assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libXmu != null; -assert enableInventor -> libXpm != null; - -let - buildGeant4 = - { version, src, multiThreadingCapable ? false }: - - stdenv.mkDerivation rec { - inherit version src; - name = "geant4-${version}"; - - multiThreadingFlag = if multiThreadingCapable then "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}" else ""; - - cmakeFlags = '' - ${multiThreadingFlag} - -DGEANT4_INSTALL_DATA=OFF - -DGEANT4_USE_GDML=${if enableGDML then "ON" else "OFF"} - -DGEANT4_USE_G3TOG4=${if enableG3toG4 then "ON" else "OFF"} - -DGEANT4_USE_QT=${if enableQT then "ON" else "OFF"} - -DGEANT4_USE_XM=${if enableXM then "ON" else "OFF"} - -DGEANT4_USE_OPENGL_X11=${if enableOpenGLX11 then "ON" else "OFF"} - -DGEANT4_USE_INVENTOR=${if enableInventor then "ON" else "OFF"} - -DGEANT4_USE_RAYTRACER_X11=${if enableRaytracerX11 then "ON" else "OFF"} - -DGEANT4_USE_SYSTEM_CLHEP=${if clhep != null then "ON" else "OFF"} - -DGEANT4_USE_SYSTEM_EXPAT=${if expat != null then "ON" else "OFF"} - -DGEANT4_USE_SYSTEM_ZLIB=${if zlib != null then "ON" else "OFF"} - -DINVENTOR_INCLUDE_DIR=${coin3d}/include - -DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so - ''; - - enableParallelBuilding = true; - buildInputs = [ cmake clhep expat zlib xercesc qt motif libGLU_combined xlibsWrapper libXmu libXpm coin3d soxt ]; - propagatedBuildInputs = [ clhep expat zlib xercesc qt motif libGLU_combined xlibsWrapper libXmu libXpm coin3d soxt ]; - - postFixup = '' - # Don't try to export invalid environment variables. - sed -i 's/export G4\([A-Z]*\)DATA/#export G4\1DATA/' "$out"/bin/geant4.sh - ''; - - setupHook = ./geant4-hook.sh; - - passthru = { - data = import ./datasets.nix { inherit stdenv fetchurl; }; - }; - - # Set the myriad of envars required by Geant4 if we use a nix-shell. - shellHook = '' - source $out/nix-support/setup-hook - ''; - - meta = with stdenv.lib; { - description = "A toolkit for the simulation of the passage of particles through matter"; - longDescription = '' - Geant4 is a toolkit for the simulation of the passage of particles through matter. - Its areas of application include high energy, nuclear and accelerator physics, as well as studies in medical and space science. - The two main reference papers for Geant4 are published in Nuclear Instruments and Methods in Physics Research A 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 (2006) 270-278. - ''; - homepage = http://www.geant4.org; - license = licenses.g4sl; - maintainers = with maintainers; [ tmplt ]; - platforms = platforms.all; - }; - }; - - fetchGeant4 = import ./fetch.nix { - inherit stdenv fetchurl; + src = fetchurl{ + url = "http://cern.ch/geant4-data/releases/geant4.10.04.p01.tar.gz"; + sha256 = "a3eb13e4f1217737b842d3869dc5b1fb978f761113e74bd4eaf6017307d234dd"; }; -in { - v10_0_2 = buildGeant4 { - inherit (fetchGeant4.v10_0_2) version src; - multiThreadingCapable = true; + cmakeFlags = [ + "-DGEANT4_INSTALL_DATA=OFF" + "-DGEANT4_USE_GDML=${if enableGDML then "ON" else "OFF"}" + "-DGEANT4_USE_G3TOG4=${if enableG3toG4 then "ON" else "OFF"}" + "-DGEANT4_USE_QT=${if enableQT then "ON" else "OFF"}" + "-DGEANT4_USE_XM=${if enableXM then "ON" else "OFF"}" + "-DGEANT4_USE_OPENGL_X11=${if enableOpenGLX11 then "ON" else "OFF"}" + "-DGEANT4_USE_INVENTOR=${if enableInventor then "ON" else "OFF"}" + "-DGEANT4_USE_RAYTRACER_X11=${if enableRaytracerX11 then "ON" else "OFF"}" + "-DGEANT4_USE_SYSTEM_CLHEP=${if clhep != null then "ON" else "OFF"}" + "-DGEANT4_USE_SYSTEM_EXPAT=${if expat != null then "ON" else "OFF"}" + "-DGEANT4_USE_SYSTEM_ZLIB=${if zlib != null then "ON" else "OFF"}" + "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}" + ] ++ stdenv.lib.optionals enableInventor [ + "-DINVENTOR_INCLUDE_DIR=${coin3d}/include" + "-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so" + ]; + + enableParallelBuilding = true; + nativeBuildInputs = [ cmake ]; + buildInputs = [ clhep expat zlib libGLU_combined xlibsWrapper libXmu ] + ++ stdenv.lib.optionals enableGDML [ xercesc ] + ++ stdenv.lib.optionals enableXM [ motif ] + ++ stdenv.lib.optionals enableQT [ qtbase ] + ++ stdenv.lib.optionals enableInventor [ libXpm coin3d soxt ]; + + postFixup = '' + # Don't try to export invalid environment variables. + sed -i 's/export G4\([A-Z]*\)DATA/#export G4\1DATA/' "$out"/bin/geant4.sh + ''; + + setupHook = ./geant4-hook.sh; + + passthru = { + data = import ./datasets.nix { inherit stdenv fetchurl; }; }; - v10_4_1 = buildGeant4 { - inherit (fetchGeant4.v10_4_1) version src; - multiThreadingCapable = true; + # Set the myriad of envars required by Geant4 if we use a nix-shell. + shellHook = '' + source $out/nix-support/setup-hook + ''; + + meta = with stdenv.lib; { + description = "A toolkit for the simulation of the passage of particles through matter"; + longDescription = '' + Geant4 is a toolkit for the simulation of the passage of particles through matter. + Its areas of application include high energy, nuclear and accelerator physics, as well as studies in medical and space science. + The two main reference papers for Geant4 are published in Nuclear Instruments and Methods in Physics Research A 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 (2006) 270-278. + ''; + homepage = http://www.geant4.org; + license = licenses.g4sl; + maintainers = with maintainers; [ tmplt ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/physics/geant4/fetch.nix b/pkgs/development/libraries/physics/geant4/fetch.nix deleted file mode 100644 index 5d539b480d7d..000000000000 --- a/pkgs/development/libraries/physics/geant4/fetch.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl }: - -let - fetch = { version, src ? builtins.getAttr stdenv.hostPlatform.system sources, sources ? null }: - { - inherit version src; - }; - -in { - v10_0_2 = fetch { - version = "10.0.2"; - - src = fetchurl{ - url = "http://geant4.cern.ch/support/source/geant4.10.00.p02.tar.gz"; - sha256 = "9d615200901f1a5760970e8f5970625ea146253e4f7c5ad9df2a9cf84549e848"; - }; - }; - - v10_4_1 = fetch { - version = "10.4.1"; - - src = fetchurl{ - url = "http://cern.ch/geant4-data/releases/geant4.10.04.p01.tar.gz"; - sha256 = "a3eb13e4f1217737b842d3869dc5b1fb978f761113e74bd4eaf6017307d234dd"; - }; - }; - -} - diff --git a/pkgs/development/libraries/physics/geant4/g4py/configure.patch b/pkgs/development/libraries/physics/geant4/g4py/configure.patch deleted file mode 100644 index 886618abd34a..000000000000 --- a/pkgs/development/libraries/physics/geant4/g4py/configure.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- environments/g4py/configure 2014-03-17 22:47:05.000000000 +1100 -+++ environments/g4py/configure 2014-09-01 15:33:46.523637686 +1000 -@@ -4,9 +4,6 @@ - # ====================================================================== - export LANG=C - --PATH=/bin:/usr/bin --export PATH -- - # ====================================================================== - # testing the echo features - # ====================================================================== diff --git a/pkgs/development/libraries/physics/geant4/g4py/default.nix b/pkgs/development/libraries/physics/geant4/g4py/default.nix index ee332171158d..551d61af3ada 100644 --- a/pkgs/development/libraries/physics/geant4/g4py/default.nix +++ b/pkgs/development/libraries/physics/geant4/g4py/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, fetchurl, cmake, xercesc # The target version of Geant4 , geant4 @@ -9,66 +9,55 @@ }: let - buildG4py = - { version, src, geant4}: + # g4py does not support MT and will fail to build against MT geant + geant4_nomt = geant4.override { enableMultiThreading = false; }; + boost_python = boost.override { enablePython = true; inherit python; }; +in - stdenv.mkDerivation rec { - inherit version src geant4; - name = "g4py-${version}"; +stdenv.mkDerivation rec { + inherit (geant4_nomt) version src; + name = "g4py-${version}"; - # ./configure overwrites $PATH, which clobbers everything. - patches = [ ./configure.patch ]; - patchFlags = "-p0"; + sourceRoot = "geant4.10.04.p01/environments/g4py"; - configurePhase = '' - export PYTHONPATH=$PYTHONPATH:${geant4}/lib64:$prefix + nativeBuildInputs = [ cmake ]; + buildInputs = [ geant4_nomt xercesc boost_python python ]; - source ${geant4}/share/Geant4-*/geant4make/geant4make.sh - cd environments/g4py + GEANT4_INSTALL = geant4_nomt; - ./configure linux64 --prefix=$prefix \ - --with-g4install-dir=${geant4} \ - --with-python-incdir=${python}/include/python${python.majorVersion} \ - --with-python-libdir=${python}/lib \ - --with-boost-incdir=${boost.dev}/include \ - --with-boost-libdir=${boost.out}/lib - ''; + preConfigure = '' + # Fix for boost 1.67+ + substituteInPlace CMakeLists.txt \ + --replace "find_package(Boost)" "find_package(Boost 1.40 REQUIRED COMPONENTS python${builtins.replaceStrings ["."] [""] python.majorVersion})" + for f in `find . -name CMakeLists.txt`; do + substituteInPlace "$f" \ + --replace "boost_python" "\''${Boost_LIBRARIES}" + done + ''; - enableParallelBuilding = true; - buildInputs = [ geant4 boost python ]; + enableParallelBuilding = true; - setupHook = ./setup-hook.sh; + setupHook = ./setup-hook.sh; - # Make sure we set PYTHONPATH - shellHook = '' - source $out/nix-support/setup-hook - ''; + # Make sure we set PYTHONPATH + shellHook = '' + source $out/nix-support/setup-hook + ''; - meta = { - description = "Python bindings and utilities for Geant4"; - longDescription = '' - Geant4 is a toolkit for the simulation of the passage of particles - through matter. Its areas of application include high energy, - nuclear and accelerator physics, as well as studies in medical and - space science. The two main reference papers for Geant4 are - published in Nuclear Instruments and Methods in Physics Research A - 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 - (2006) 270-278. - ''; - homepage = http://www.geant4.org; - license = stdenv.lib.licenses.g4sl; - maintainers = [ ]; - platforms = stdenv.lib.platforms.all; - }; - }; - - fetchGeant4 = import ../fetch.nix { - inherit stdenv fetchurl; - }; - -in { - v10_0_2 = buildG4py { - inherit (fetchGeant4.v10_0_2) version src; - geant4 = geant4.v10_0_2; + meta = { + description = "Python bindings and utilities for Geant4"; + longDescription = '' + Geant4 is a toolkit for the simulation of the passage of particles + through matter. Its areas of application include high energy, + nuclear and accelerator physics, as well as studies in medical and + space science. The two main reference papers for Geant4 are + published in Nuclear Instruments and Methods in Physics Research A + 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 + (2006) 270-278. + ''; + homepage = http://www.geant4.org; + license = stdenv.lib.licenses.g4sl; + maintainers = [ ]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix index 9d5bd170e20d..0667e1265b34 100644 --- a/pkgs/development/libraries/skalibs/default.nix +++ b/pkgs/development/libraries/skalibs/default.nix @@ -1,51 +1,30 @@ -{ stdenv, fetchgit }: +{ stdenv, skawarePackages }: -let +with skawarePackages; - version = "2.6.4.0"; +buildPackage { + pname = "skalibs"; + version = "2.7.0.0"; + sha256 = "0mnprdf4w4ami0db22rwd111m037cdmn2p8xa4i8cbwxcrv4sjcn"; -in stdenv.mkDerivation rec { - - name = "skalibs-${version}"; - - src = fetchgit { - url = "git://git.skarnet.org/skalibs"; - rev = "refs/tags/v${version}"; - sha256 = "13icrwxxb7k3cj37dl07h0apk6lwyrg1qrwjwh4l82i8f32bnjz2"; - }; + description = "A set of general-purpose C programming libraries"; outputs = [ "lib" "dev" "doc" "out" ]; - dontDisableStatic = true; - - enableParallelBuilding = true; - configureFlags = [ - "--enable-force-devr" # assume /dev/random works + # assume /dev/random works + "--enable-force-devr" "--libdir=\${lib}/lib" "--dynlibdir=\${lib}/lib" "--includedir=\${dev}/include" "--sysdepdir=\${lib}/lib/skalibs/sysdeps" - ] - ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) - # On darwin, the target triplet from -dumpmachine includes version number, but - # skarnet.org software uses the triplet to test binary compatibility. - # Explicitly setting target ensures code can be compiled against a skalibs - # binary built on a different version of darwin. - # http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph - ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.hostPlatform.system}"); + ]; postInstall = '' - mkdir -p $doc/share/doc/skalibs + rm -rf sysdeps.cfg + rm libskarnet.* + mv doc $doc/share/doc/skalibs/html ''; - meta = { - homepage = http://skarnet.org/software/skalibs/; - description = "A set of general-purpose C programming libraries"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ]; - }; - } diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index 1c9e67f87675..a96cd455f554 100644 --- a/pkgs/development/libraries/spdlog/default.nix +++ b/pkgs/development/libraries/spdlog/default.nix @@ -1,32 +1,46 @@ { stdenv, fetchFromGitHub, cmake }: -stdenv.mkDerivation rec { - name = "spdlog-${version}"; - version = "0.14.0"; +let + generic = { version, sha256 }: + stdenv.mkDerivation { + name = "spdlog-${version}"; + inherit version; - src = fetchFromGitHub { - owner = "gabime"; - repo = "spdlog"; - rev = "v${version}"; + src = fetchFromGitHub { + owner = "gabime"; + repo = "spdlog"; + rev = "v${version}"; + inherit sha256; + }; + + nativeBuildInputs = [ cmake ]; + + # cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLES=ON" ]; + + outputs = [ "out" "doc" ]; + + postInstall = '' + mkdir -p $out/share/doc/spdlog + cp -rv ../example $out/share/doc/spdlog + ''; + + meta = with stdenv.lib; { + description = "Very fast, header only, C++ logging library."; + homepage = https://github.com/gabime/spdlog; + license = licenses.mit; + maintainers = with maintainers; [ obadz ]; + platforms = platforms.all; + }; + }; +in +{ + spdlog_1 = generic { + version = "1.1.0"; + sha256 = "0yckz5w02v8193jhxihk9v4i8f6jafyg2a33amql0iclhk17da8f"; + }; + + spdlog_0 = generic { + version = "0.14.0"; sha256 = "13730429gwlabi432ilpnja3sfvy0nn2719vnhhmii34xcdyc57q"; }; - - nativeBuildInputs = [ cmake ]; - - # cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLES=ON" ]; - - outputs = [ "out" "doc" ]; - - postInstall = '' - mkdir -p $out/share/doc/spdlog - cp -rv ../example $out/share/doc/spdlog - ''; - - meta = with stdenv.lib; { - description = "Very fast, header only, C++ logging library."; - homepage = https://github.com/gabime/spdlog; - license = licenses.mit; - maintainers = with maintainers; [ obadz ]; - platforms = platforms.all; - }; } diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix index 1a17ae53313b..7b62de69123d 100644 --- a/pkgs/development/libraries/webkitgtk/2.4.nix +++ b/pkgs/development/libraries/webkitgtk/2.4.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, perl, python, ruby, bison, gperf, flex -, pkgconfig, which, gettext, gobjectIntrospection +, pkgconfig, which, gettext, gobjectIntrospection, pruneLibtoolFiles , gtk2, gtk3, wayland, libwebp, enchant, sqlite , libxml2, libsoup, libsecret, libxslt, harfbuzz, xorg , gst-plugins-base, libobjc @@ -77,13 +77,16 @@ stdenv.mkDerivation rec { "--disable-credential-storage" ]; - NIX_CFLAGS_COMPILE = "-DU_NOEXCEPT="; + NIX_CFLAGS_COMPILE = [ + "-DU_NOEXCEPT=" + "-Wno-expansion-to-defined" + ]; dontAddDisableDepTrack = true; nativeBuildInputs = [ perl python ruby bison gperf flex - pkgconfig which gettext gobjectIntrospection + pkgconfig which gettext gobjectIntrospection pruneLibtoolFiles ]; buildInputs = [ diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index 3ccdb237f894..dc693accbf4b 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -1,96 +1,110 @@ { stdenv, fetchurl, zlib, ncurses5, unzip, lib, makeWrapper , coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which -, platformTools, python3, libcxx, version, sha256 +, platformTools, python3, libcxx, version, sha256, bash, runCommand , fullNDK ? false # set to true if you want other parts of the NDK # that is not used by Nixpkgs like sources, # examples, docs, or LLVM toolchains }: -stdenv.mkDerivation rec { - name = "android-ndk-r${version}"; - inherit version; +let + makeStandaloneToolchain = api: arch: let + full_ndk = (ndk true); + in runCommand "makeStandaloneToolchain-${version}" {} '' + ${full_ndk}/libexec/${full_ndk.name}/build/tools/make_standalone_toolchain.py --api ${toString api} --arch ${arch} --install-dir $out + ''; + ndk = fullNDK: stdenv.mkDerivation rec { + name = "android-ndk-r${version}"; + inherit version; - src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { + src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://dl.google.com/android/repository/${name}-linux-x86_64.zip"; inherit sha256; } else throw "platform ${stdenv.hostPlatform.system} not supported!"; - phases = "buildPhase"; + phases = "buildPhase"; - nativeBuildInputs = [ unzip makeWrapper file ]; + nativeBuildInputs = [ unzip makeWrapper file ]; - buildCommand = let - bin_path = "$out/bin"; - pkg_path = "$out/libexec/${name}"; - sed_script_1 = - "'s|^PROGDIR=`dirname $0`" + - "|PROGDIR=`dirname $(readlink -f $(which $0))`|'"; - runtime_paths = (lib.makeBinPath [ - coreutils file findutils - gawk gnugrep gnused - jdk python3 which - ]) + ":${platformTools}/platform-tools"; - in '' - mkdir -pv $out/libexec - cd $out/libexec - unzip -qq $src + buildCommand = let + bin_path = "$out/bin"; + pkg_path = "$out/libexec/${name}"; + sed_script_1 = + "'s|^PROGDIR=`dirname $0`" + + "|PROGDIR=`dirname $(readlink -f $(which $0))`|'"; + runtime_paths = (lib.makeBinPath [ + coreutils file findutils + gawk gnugrep gnused + jdk python3 which + ]) + ":${platformTools}/platform-tools"; + in '' + mkdir -pv $out/libexec + cd $out/libexec + unzip -qq $src - patchShebangs ${pkg_path} + # so that it doesn't fail because of read-only permissions set + cd - + ${if (version == "10e") then + '' + patch -p1 \ + --no-backup-if-mismatch \ + -d $out/libexec/${name} < ${ ./make-standalone-toolchain_r10e.patch } + '' + else + '' + patch -p1 \ + --no-backup-if-mismatch \ + -d $out/libexec/${name} < ${ ./. + "/make_standalone_toolchain.py_" + "${version}" + ".patch" } - # so that it doesn't fail because of read-only permissions set - cd - - ${if (version == "10e") then - '' - patch -p1 \ - --no-backup-if-mismatch \ - -d $out/libexec/${name} < ${ ./make-standalone-toolchain_r10e.patch } - '' - else - '' - patch -p1 \ - --no-backup-if-mismatch \ - -d $out/libexec/${name} < ${ ./. + builtins.toPath ("/make_standalone_toolchain.py_" + "${version}" + ".patch") } - wrapProgram ${pkg_path}/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}" - '' - } - cd ${pkg_path} + sed -i 's,#!/usr/bin/env python,#!${python3}/bin/python,g' ${pkg_path}/build/tools/make_standalone_toolchain.py + sed -i 's,#!/bin/bash,#!${bash}/bin/bash,g' ${pkg_path}/build/tools/make_standalone_toolchain.py + wrapProgram ${pkg_path}/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}" + '' + } - '' + lib.optionalString (!fullNDK) '' - # Steps to reduce output size - rm -rf docs sources tests - # We only support cross compiling with gcc for now - rm -rf toolchains/*-clang* toolchains/llvm* - '' + + patchShebangs ${pkg_path} - '' - find ${pkg_path}/toolchains \( \ - \( -type f -a -name "*.so*" \) -o \ - \( -type f -a -perm -0100 \) \ - \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libcxx zlib ncurses5 ]} {} \; - # fix ineffective PROGDIR / MYNDKDIR determination - for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py"} - do - sed -i -e ${sed_script_1} $i - done + cd ${pkg_path} - # wrap - for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py ndk-which"} - do - wrapProgram "$(pwd)/$i" --prefix PATH : "${runtime_paths}" - done - # make some executables available in PATH - mkdir -pv ${bin_path} - for i in \ - ndk-build ${lib.optionalString (version == "10e") "ndk-depends ndk-gdb ndk-gdb-py ndk-gdb.py ndk-stack ndk-which"} - do - ln -sf ${pkg_path}/$i ${bin_path}/$i - done - ''; + '' + lib.optionalString (!fullNDK) '' + # Steps to reduce output size + rm -rf docs sources tests + # We only support cross compiling with gcc for now + rm -rf toolchains/*-clang* toolchains/llvm* + '' + - meta = { - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - license = stdenv.lib.licenses.asl20; + '' + find ${pkg_path}/toolchains \( \ + \( -type f -a -name "*.so*" \) -o \ + \( -type f -a -perm -0100 \) \ + \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \ + --set-rpath ${stdenv.lib.makeLibraryPath [ libcxx zlib ncurses5 ]} {} \; + # fix ineffective PROGDIR / MYNDKDIR determination + for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py"} + do + sed -i -e ${sed_script_1} $i + done + + # wrap + for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py ndk-which"} + do + wrapProgram "$(pwd)/$i" --prefix PATH : "${runtime_paths}" + done + # make some executables available in PATH + mkdir -pv ${bin_path} + for i in \ + ndk-build ${lib.optionalString (version == "10e") "ndk-depends ndk-gdb ndk-gdb-py ndk-gdb.py ndk-stack ndk-which"} + do + ln -sf ${pkg_path}/$i ${bin_path}/$i + done + ''; + + meta = { + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; + license = stdenv.lib.licenses.asl20; + }; }; -} + passthru = { + inherit makeStandaloneToolchain; + }; +in lib.extendDerivation true passthru (ndk fullNDK) diff --git a/pkgs/development/node-packages/node-packages-v8.json b/pkgs/development/node-packages/node-packages-v8.json index 6ac941eb7c48..38d5008ad8c5 100644 --- a/pkgs/development/node-packages/node-packages-v8.json +++ b/pkgs/development/node-packages/node-packages-v8.json @@ -30,6 +30,7 @@ , "fetch-bower" , "forever" , "git-run" +, "git-ssb" , "git-standup" , "graphql-cli" , "grunt-cli" @@ -95,6 +96,7 @@ , "react-tools" , "react-native-cli" , "s3http" +, "scuttlebot" , "semver" , "serve" , "shout" diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index 0e6970dbea18..3efef820a9b5 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -31,6 +31,15 @@ let sha512 = "QAZIFrfVRkjvMkUHIQKZXZ3La0V5t12w5PWrhihYEabHwzIZV/txQd/kSYHgYPXC4s5OURxsXZop9f0BzI2QIQ=="; }; }; + "@babel/code-frame-7.0.0" = { + name = "_at_babel_slash_code-frame"; + packageName = "@babel/code-frame"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz"; + sha512 = "OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA=="; + }; + }; "@babel/generator-7.0.0-beta.38" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; @@ -40,6 +49,15 @@ let sha512 = "aOHQPhsEyaB6p2n+AK981+onHoc+Ork9rcAQVSUJR33wUkGiWRpu6/C685knRyIZVsKeSdG5Q4xMiYeFUhuLzA=="; }; }; + "@babel/highlight-7.0.0" = { + name = "_at_babel_slash_highlight"; + packageName = "@babel/highlight"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz"; + sha512 = "UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw=="; + }; + }; "@babel/runtime-7.0.0" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; @@ -193,13 +211,13 @@ let sha512 = "CNVsCrMge/jq6DCT5buNZ8PACY9RTvPJbCNoIcndfkJOCsNxOx9dnc5qw4pHZdHi8GS6l3qlgkuFKp33iD8J2Q=="; }; }; - "@lerna/add-3.1.4" = { + "@lerna/add-3.2.0" = { name = "_at_lerna_slash_add"; packageName = "@lerna/add"; - version = "3.1.4"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/add/-/add-3.1.4.tgz"; - sha512 = "jC4k1EkniPA003Fj8NQkRjdue29BJRRPfbnTqPCmhjmwQKy2dj71256o28eBYoWcouUivA0voz+r+H9sLMqbfA=="; + url = "https://registry.npmjs.org/@lerna/add/-/add-3.2.0.tgz"; + sha512 = "qGA7agAWcKlrXZR3FwFJXTr26Q2rqjOVMNhtm8uyawImqfdKp4WJXuGdioiWOSW20jMvzLIFhWZh5lCh0UyMBw=="; }; }; "@lerna/batch-packages-3.1.2" = { @@ -211,22 +229,22 @@ let sha512 = "HAkpptrYeUVlBYbLScXgeCgk6BsNVXxDd53HVWgzzTWpXV4MHpbpeKrByyt7viXlNhW0w73jJbipb/QlFsHIhQ=="; }; }; - "@lerna/bootstrap-3.1.4" = { + "@lerna/bootstrap-3.2.0" = { name = "_at_lerna_slash_bootstrap"; packageName = "@lerna/bootstrap"; - version = "3.1.4"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.1.4.tgz"; - sha512 = "GN3/ll73hXQzsFEKW1d6xgMKf6t4kxTXDGhiMF1uc8DdbrK1arA1MMWhXrjMYJAaMldMzNnGeE3Kb1MxKxXWPw=="; + url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.2.0.tgz"; + sha512 = "xh6dPpdzsAEWF7lqASaym5AThkmP3ArR7Q+P/tiPWCT+OT7QT5QI2IQAz1aAYEBQL3ACzpE6kq+VOGi0m+9bxw=="; }; }; - "@lerna/changed-3.1.3" = { + "@lerna/changed-3.2.0" = { name = "_at_lerna_slash_changed"; packageName = "@lerna/changed"; - version = "3.1.3"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.1.3.tgz"; - sha512 = "6KyyAl/qcxFeKOfuTDJlgh3aNOf6KQDxckEitmOFRi9scIZd7Igj/V9DQSvKoMORGk8wBwbpeLNJ9TN9xbm4qw=="; + url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.2.0.tgz"; + sha512 = "R+vGzzXPN5s5lJT0v1zSTLw43O2ek2yekqCqvw7p9UFqgqYSbxUsyWXMdhku/mOIFWTc6DzrsOi+U7CX3TXmHg=="; }; }; "@lerna/check-working-tree-3.1.0" = { @@ -256,13 +274,13 @@ let sha512 = "XVdcIOjhudXlk5pTXjrpsnNLqeVi2rBu2oWzPH2GHrxWGBZBW8thGIFhQf09da/RbRT3uzBWXpUv+sbL2vbX3g=="; }; }; - "@lerna/cli-3.1.4" = { + "@lerna/cli-3.2.0" = { name = "_at_lerna_slash_cli"; packageName = "@lerna/cli"; - version = "3.1.4"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/cli/-/cli-3.1.4.tgz"; - sha512 = "e63YpwIgXU87gGDpqxr2mQnkxwIIt03FtgWlAId7uySVwTLT7j5u0yMbFR1CVkWvUSBY76JSCsX5u/Z1CfJUpQ=="; + url = "https://registry.npmjs.org/@lerna/cli/-/cli-3.2.0.tgz"; + sha512 = "JdbLyTxHqxUlrkI+Ke+ltXbtyA+MPu9zR6kg/n8Fl6uaez/2fZWtReXzYi8MgLxfUFa7+1OHWJv4eAMZlByJ+Q=="; }; }; "@lerna/collect-updates-3.1.0" = { @@ -463,13 +481,13 @@ let sha512 = "e0sspVUfzEKhqsRIxzWqZ/uMBHzZSzOa4HCeORErEZu+dmDoI145XYhqvCVn7EvbAb407FV2H9GVeoP0JeG8GQ=="; }; }; - "@lerna/npm-publish-3.0.6" = { + "@lerna/npm-publish-3.2.0" = { name = "_at_lerna_slash_npm-publish"; packageName = "@lerna/npm-publish"; - version = "3.0.6"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.0.6.tgz"; - sha512 = "PlvKr958TowEOOe2yNtmUi/Ot42TS/edlmA7rj+XtDUR51AN3RB9G6b25TElyrnDksj1ayb3mOF7I2uf1gbyOw=="; + url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.2.0.tgz"; + sha512 = "x13EGrjZk9w8gCQAE44aKbeO1xhLizLJ4tKjzZmQqKEaUCugF4UU8ZRGshPMRFBdsHTEWh05dkKx2oPMoaf0dw=="; }; }; "@lerna/npm-run-script-3.0.0" = { @@ -526,13 +544,13 @@ let sha512 = "EzvNexDTh//GlpOz68zRo16NdOIqWqiiXMs9tIxpELQubH+kUGKvBSiBrZ2Zyrfd8pQhIf+8qARtkCG+G7wzQQ=="; }; }; - "@lerna/publish-3.1.3" = { + "@lerna/publish-3.2.1" = { name = "_at_lerna_slash_publish"; packageName = "@lerna/publish"; - version = "3.1.3"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.1.3.tgz"; - sha512 = "vlHs1ll3HEbTVgO0hVFo9dMKixV9XO3T7OBCK835j8fw4TL/0y+YjmNjH5Y5Uyh02hZxcy/iosZNyGccu/fG3w=="; + url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.2.1.tgz"; + sha512 = "SnSBstK/G9qLt5rS56pihNacgsu3UgxXiCexWb57GGEp2eDguQ7rFzxVs4JMQQWmVG97EMJQxfFV54tW2sqtIw=="; }; }; "@lerna/resolve-symlink-3.0.0" = { @@ -562,13 +580,13 @@ let sha512 = "O26WdR+sQFSG2Fpc67nw+m8oVq3R+H6jsscKuB6VJafU+V4/hPURSbuFZIcmnD9MLmzAIhlQiCf0Fy6s/1MPPA=="; }; }; - "@lerna/run-lifecycle-3.0.0" = { + "@lerna/run-lifecycle-3.2.0" = { name = "_at_lerna_slash_run-lifecycle"; packageName = "@lerna/run-lifecycle"; - version = "3.0.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.0.0.tgz"; - sha512 = "kfq6eC5mCreTk7GusZyvF0/BfU9FDEt8JaUgzNKLrK1Sj6z2RO8uSpFsUlj+7OuV4wo0I+rdTdJOAFoW8C0GZw=="; + url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-3.2.0.tgz"; + sha512 = "kGGdHJRyeZF+VTtal1DBptg6qwIsOLg3pKtmRm1rCMNN7j4kgrA9L07ZoRar8LjQXvfuheB1LSKHd5d04pr4Tg=="; }; }; "@lerna/run-parallel-batches-3.0.0" = { @@ -607,13 +625,13 @@ let sha512 = "5wjkd2PszV0kWvH+EOKZJWlHEqCTTKrWsvfHnHhcUaKBe/NagPZFWs+0xlsDPZ3DJt5FNfbAPAnEBQ05zLirFA=="; }; }; - "@lerna/version-3.1.3" = { + "@lerna/version-3.2.0" = { name = "_at_lerna_slash_version"; packageName = "@lerna/version"; - version = "3.1.3"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/version/-/version-3.1.3.tgz"; - sha512 = "cKJc0FbSEJWdVLBpWgK1tM4nzwpVJ4IC3ESzEvTWYB0fIU/SAcf+m8x7d/kl8XtlybsKGegdMEgBWvzooaDQ9A=="; + url = "https://registry.npmjs.org/@lerna/version/-/version-3.2.0.tgz"; + sha512 = "1AVDMpeecSMiG1cacduE+f2KO0mC7F/9MvWsHtp+rjkpficMcsVme7IMtycuvu/F07wY4Xr9ioFKYTwTcybbIA=="; }; }; "@lerna/write-log-file-3.0.0" = { @@ -967,31 +985,31 @@ let sha512 = "TeiJ7uvv/92ugSqZ0v9l0eNXzutlki0aK+R1K5bfA5SYUil46ITlxLW4iNTCf55P4L5weCmaOdtxGeGWvudwPg=="; }; }; - "@types/node-10.9.2" = { + "@types/node-10.9.4" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.9.2"; + version = "10.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.9.2.tgz"; - sha512 = "pwZnkVyCGJ3LsQ0/3flQK5lCFao4esIzwUVzzk5NvL9vnkEyDhNf4fhHzUMHvyr56gNZywWTS2MR0euabMSz4A=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.9.4.tgz"; + sha512 = "fCHV45gS+m3hH17zgkgADUSi2RR1Vht6wOZ0jyHP8rjiQra9f+mIcgwPQHllmDocYOstIEbKlxbFDYlgrTPYqw=="; }; }; - "@types/node-6.0.116" = { + "@types/node-6.0.117" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "6.0.116"; + version = "6.0.117"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-6.0.116.tgz"; - sha512 = "vToa8YEeulfyYg1gSOeHjvvIRqrokng62VMSj2hoZrwZNcYrp2h3AWo6KeBVuymIklQUaY5zgVJvVsC4KiiLkQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-6.0.117.tgz"; + sha512 = "sihk0SnN8PpiS5ihu5xJQ5ddnURNq4P+XPmW+nORlKkHy21CoZO/IVHK/Wq/l3G8fFW06Fkltgnqx229uPlnRg=="; }; }; - "@types/node-8.10.28" = { + "@types/node-8.10.29" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.10.28"; + version = "8.10.29"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.10.28.tgz"; - sha512 = "iHsAzDg3OLH7JP+wipniUULHoDSWLgEDYOvsar6/mpAkTJd9/n23Ap8ikruMlvRTqMv/LXrflH9v/AfiEqaBGg=="; + url = "https://registry.npmjs.org/@types/node/-/node-8.10.29.tgz"; + sha512 = "zbteaWZ2mdduacm0byELwtRyhYE40aK+pAanQk415gr1eRuu67x7QGOLmn8jz5zI8LDK7d0WI/oT6r5Trz4rzQ=="; }; }; "@types/range-parser-1.2.2" = { @@ -1543,6 +1561,15 @@ let sha1 = "29e18e632e60e4e221d5810247852a63d7b2e410"; }; }; + "abstract-leveldown-4.0.3" = { + name = "abstract-leveldown"; + packageName = "abstract-leveldown"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-4.0.3.tgz"; + sha512 = "qsIHFQy0u17JqSY+3ZUT+ykqxYY17yOfvAsLkFkw8kSQqi05d1jyj0bCuSX6sjYlXuY9cKpgUt5EudQdP4aXyA=="; + }; + }; "abstract-random-access-1.1.2" = { name = "abstract-random-access"; packageName = "abstract-random-access"; @@ -1732,13 +1759,13 @@ let sha1 = "f291be701a2efc567a63fc7aa6afcded31430be1"; }; }; - "addons-linter-1.2.6" = { + "addons-linter-1.3.1" = { name = "addons-linter"; packageName = "addons-linter"; - version = "1.2.6"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.2.6.tgz"; - sha512 = "8WjSUoleic9x3gS8SZF0kIvffrX7WkiRPF8Xs8CZi7Yu/Xq0qX9LOYG2Q66t9ThmTeMItt/24FxirqqdyFLGgw=="; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.3.1.tgz"; + sha512 = "Oaj8q8hXWwGhrzlMTM7LUxj5ZUxi8k8/pg0V/NlA3usgClngl7jXW4GRlobdoOao8KEnW95y/WNNMeoTbxYe4w=="; }; }; "addr-to-ip-port-1.5.1" = { @@ -1957,6 +1984,15 @@ let sha1 = "0cd90a561093f35d0a99256c22b7069433fad117"; }; }; + "aligned-block-file-1.1.3" = { + name = "aligned-block-file"; + packageName = "aligned-block-file"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/aligned-block-file/-/aligned-block-file-1.1.3.tgz"; + sha512 = "ai/S+nZ9XMjC0ReZfq94OLGCICVBJyhNiKWmF1J+/GVZZaXtYV805plMi9obaWjfNl/QljB+VOsT+wQ7R858xA=="; + }; + }; "almond-0.3.3" = { name = "almond"; packageName = "almond"; @@ -2236,13 +2272,13 @@ let sha512 = "gVWKYyXF0SlpMyZ/i//AthzyPjjmAVYciEjwepLqMzIf0+7bzIwekpHDuzME8jf4XQepXcNNY571+BRyYHysmg=="; }; }; - "apollo-cache-control-0.2.2" = { + "apollo-cache-control-0.2.3" = { name = "apollo-cache-control"; packageName = "apollo-cache-control"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.2.2.tgz"; - sha512 = "N5A1hO6nHZBCR+OCV58IlE7k6hZrFJZTf/Ab2WD8wduLSa0qLLRlCp3rXvD05+jpWa6sdKw03whW2omJ+SyT+w=="; + url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.2.3.tgz"; + sha512 = "W/SJouLRv1VqVd79yeMbDNrv77zJ+8vKbZW2aDjbzMUEyA1nODdJhsrxqlxlh+naK5L4i12DEEG/YhfQjnzM2w=="; }; }; "apollo-cache-inmemory-1.2.9" = { @@ -2272,22 +2308,22 @@ let sha512 = "jlxz/b5iinRWfh48hXdmMtrjTPn/rDok0Z3b7icvkiaD6I30w4sq9B+JDkFbLnkldzsFLV2BZtBDa/dkZhx8Ng=="; }; }; - "apollo-datasource-0.1.2" = { + "apollo-datasource-0.1.3" = { name = "apollo-datasource"; packageName = "apollo-datasource"; - version = "0.1.2"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.1.2.tgz"; - sha512 = "AbUxS7Qkz9+T+g19zKRJiA+tBVGVVunzXwd4ftDSYGx1VrF5LJJO7Gc57bk719gWIZneZ02HsVCEZd6NxFF8RQ=="; + url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.1.3.tgz"; + sha512 = "yEGEe5Cjzqqu5ml1VV3O8+C+thzdknZri9Ny0P3daTGNO+45J3vBOMcmaANeeI2+OOeWxdqUNa5aPOx/35kniw=="; }; }; - "apollo-engine-reporting-0.0.2" = { + "apollo-engine-reporting-0.0.3" = { name = "apollo-engine-reporting"; packageName = "apollo-engine-reporting"; - version = "0.0.2"; + version = "0.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-0.0.2.tgz"; - sha512 = "Fe/1oxC8rUXRrBTMUiqs5PSb6hnMOJHuttJMhs83u5POfplc4QrKJZtEEU4Ui8mxeJGaGNWbWf+D4q645xdQLA=="; + url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-0.0.3.tgz"; + sha512 = "zkgPDB5w5/v450xOqqcV0/lJuaD1vk0cCeS7pAvaaTPGBGUVpSbZaGcsHUhmh1AJOL0it81u/i/6WVwWS3TJXQ=="; }; }; "apollo-engine-reporting-protobuf-0.0.1" = { @@ -2380,22 +2416,22 @@ let sha512 = "jBRnsTgXN0m8yVpumoelaUq9mXR7YpJ3EE+y/alI7zgXY+0qFDqksRApU8dEfg3q6qUnO7rFxRhdG5eyc0+1ig=="; }; }; - "apollo-server-core-2.0.4" = { + "apollo-server-core-2.0.5" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.0.4.tgz"; - sha512 = "6kNaQYZfX2GvAT1g9ih0rodfRl4hPL1jXb7b+FvQ1foFR5Yyb3oqL2DOcP65gQi/7pGhyNRUAncPU18Vo3u9rQ=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.0.5.tgz"; + sha512 = "bGeutygUhajJoc1hcuVWbZfHMn6eh0XBZK8evrnZkzG9zwuPSiJRdEu/sXPIeJ2iX7HbhOpHuMVImbhkPq+Haw=="; }; }; - "apollo-server-env-2.0.2" = { + "apollo-server-env-2.0.3" = { name = "apollo-server-env"; packageName = "apollo-server-env"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.0.2.tgz"; - sha512 = "LsSh2TSF1Sh+TnKxCv2To+UNTnoPpBGCXn6fPsmiNqVaBaSagfZEU/aaSu3ftMlmfXr4vXAfYNUDMKEi+7E6Bg=="; + url = "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.0.3.tgz"; + sha512 = "uIfKFH8n8xKO0eLb9Fa79+s2DdMuVethgznvW6SrOYq5VzgkIIobqKEuZPKa5wObw9CkCyju/+Sr7b7WWMFxUQ=="; }; }; "apollo-server-errors-2.0.2" = { @@ -2407,22 +2443,22 @@ let sha512 = "zyWDqAVDCkj9espVsoUpZr9PwDznM8UW6fBfhV+i1br//s2AQb07N6ektZ9pRIEvkhykDZW+8tQbDwAO0vUROg=="; }; }; - "apollo-server-express-2.0.4" = { + "apollo-server-express-2.0.5" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.0.4.tgz"; - sha512 = "9mxcFpnTgQTmrsvVRRofEY7N1bJYholjv99IfN8puu5lhNqj8ZbOPZYrw+zd+Yh4rZSonwx76ZzTRzM00Yllfw=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.0.5.tgz"; + sha512 = "0Bun2wVflgMMhp9+LKz7tuJXIGmnNbWjvNHwxOtLfz3L6tmG+1Y+dLYBPLA7h1bzwYsACFP+glNTYn6/ErL/tA=="; }; }; - "apollo-tracing-0.2.2" = { + "apollo-tracing-0.2.3" = { name = "apollo-tracing"; packageName = "apollo-tracing"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.2.2.tgz"; - sha512 = "zrpLRvaAqtzGufc1GfV+691xQtzq5elfBydg/7wzuaFszlMH66hkLas5Dw36drUX21CbCljOuGYvYzqSiKykuQ=="; + url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.2.3.tgz"; + sha512 = "N3CwLGSiTms4BqEz1IpjaJWLNdWiEmdfowU2+vPvvCQj8SN/HuAwK9BxRnr6BH8PD3i5Gzq7tFiMB0D0sN1+LA=="; }; }; "apollo-upload-client-8.1.0" = { @@ -2452,6 +2488,15 @@ let sha1 = "7e5dd327747078d877286fbb624b1e8f4d2b396b"; }; }; + "append-batch-0.0.1" = { + name = "append-batch"; + packageName = "append-batch"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/append-batch/-/append-batch-0.0.1.tgz"; + sha1 = "9224858e556997ccc07f11f1ee9a128532aa0d25"; + }; + }; "append-buffer-1.0.2" = { name = "append-buffer"; packageName = "append-buffer"; @@ -2493,7 +2538,7 @@ let packageName = "applicationinsights"; version = "0.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.16.0.tgz"; + url = "http://registry.npmjs.org/applicationinsights/-/applicationinsights-0.16.0.tgz"; sha1 = "e02dafb10cf573c19b429793c87797d6404f0ee3"; }; }; @@ -3163,6 +3208,24 @@ let sha512 = "FadV8UDcyZDjzb6eV7MCJj0bfrNjwKw7/X0QHPFCbYP6T20FXgZCYXpJKlQC8RxEQP1E6Xs8pNHdh3bcrZAuAw=="; }; }; + "async-single-1.0.5" = { + name = "async-single"; + packageName = "async-single"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/async-single/-/async-single-1.0.5.tgz"; + sha1 = "125dd09de95d3ea30a378adbed021092179b03c9"; + }; + }; + "async-write-2.1.0" = { + name = "async-write"; + packageName = "async-write"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/async-write/-/async-write-2.1.0.tgz"; + sha1 = "1e762817d849ce44bfac07925a42036787061b15"; + }; + }; "asynckit-0.4.0" = { name = "asynckit"; packageName = "asynckit"; @@ -3172,6 +3235,15 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; + "asyncmemo-1.0.0" = { + name = "asyncmemo"; + packageName = "asyncmemo"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/asyncmemo/-/asyncmemo-1.0.0.tgz"; + sha1 = "ef249dc869d6c07e7dfd4a22c8a18850bb39d7f1"; + }; + }; "atob-2.1.2" = { name = "atob"; packageName = "atob"; @@ -3190,6 +3262,33 @@ let sha1 = "d16901d10ccec59516c197b9ccd8930689b813b4"; }; }; + "atomic-file-0.0.1" = { + name = "atomic-file"; + packageName = "atomic-file"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/atomic-file/-/atomic-file-0.0.1.tgz"; + sha1 = "6c36658f6c4ece33fba3877731e7c25fc82999bb"; + }; + }; + "atomic-file-1.1.5" = { + name = "atomic-file"; + packageName = "atomic-file"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/atomic-file/-/atomic-file-1.1.5.tgz"; + sha512 = "TG+5YFiaKQ6CZiSQsosGMJ/IJzwMZ4V/rSdEXlD6+DwKyv8OyeUcprq34kp4yuS6bfQYXhxBC2Vm8PWo+iKBGQ=="; + }; + }; + "attach-ware-1.1.1" = { + name = "attach-ware"; + packageName = "attach-ware"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/attach-ware/-/attach-ware-1.1.1.tgz"; + sha1 = "28f51393dd8bb8bdaad972342519bf09621a35a3"; + }; + }; "auto-bind-1.2.1" = { name = "auto-bind"; packageName = "auto-bind"; @@ -3204,17 +3303,17 @@ let packageName = "aws-sdk"; version = "1.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-1.18.0.tgz"; + url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.18.0.tgz"; sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.303.0" = { + "aws-sdk-2.307.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.303.0"; + version = "2.307.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.303.0.tgz"; - sha512 = "3AMEO/+aKNKvnIg1StF30Itbhs1SdUrUirCqlggS4bhLLOvyJVTrY+tJwASnPGsye4ffD6Qw8LRnaCytvDKkoQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.307.0.tgz"; + sha512 = "+RTDZvmn2tlyCUCUQvbj7XN3ZtSiqoSuxvQQCqXlrGxUvGbQ9wO4I3zcKQRlSsp1OGBgr5+jgBVjzEPLPGlxOg=="; }; }; "aws-sign-0.2.1" = { @@ -3384,7 +3483,7 @@ let packageName = "azure-arm-network"; version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-5.3.0.tgz"; + url = "http://registry.npmjs.org/azure-arm-network/-/azure-arm-network-5.3.0.tgz"; sha512 = "juitxBWofPBZ+kcmLB8OjW5qPD6+/Ncdq86WjDTIUcH+cyb/GWktdDymv6adbOyz4xZ9/wbThFL7AHgq8cHBig=="; }; }; @@ -3447,7 +3546,7 @@ let packageName = "azure-arm-website"; version = "0.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.11.5.tgz"; + url = "http://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.11.5.tgz"; sha1 = "51942423e1238ec19e551926353a8e9f73bc534a"; }; }; @@ -3672,7 +3771,7 @@ let 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"; + url = "http://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz"; sha1 = "0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"; }; }; @@ -3681,7 +3780,7 @@ let 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"; + url = "http://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz"; sha1 = "fd6536f2bce13836ffa3a5458c4903a597bb3bf5"; }; }; @@ -3717,7 +3816,7 @@ let packageName = "babel-polyfill"; version = "6.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.16.0.tgz"; + url = "http://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.16.0.tgz"; sha1 = "2d45021df87e26a374b6d4d1a9c65964d17f2422"; }; }; @@ -3829,6 +3928,15 @@ let sha1 = "f616eda9d3e4b66b8ca7fca79f695722c5f8e26f"; }; }; + "bail-1.0.3" = { + name = "bail"; + packageName = "bail"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bail/-/bail-1.0.3.tgz"; + sha512 = "1X8CnjFVQ+a+KW36uBNMTU5s8+v5FzeqrP7hTG5aTb4aPreSbZJlhwPon9VKMuEVgV++JM+SQrALY3kr7eswdg=="; + }; + }; "balanced-match-1.0.0" = { name = "balanced-match"; packageName = "balanced-match"; @@ -3928,6 +4036,15 @@ let sha1 = "199fd661702a0e7b7dcae6e0698bb089c52f6d78"; }; }; + "base64-url-2.2.0" = { + name = "base64-url"; + packageName = "base64-url"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-url/-/base64-url-2.2.0.tgz"; + sha512 = "Y4qHHAE+rWjmAFPQmHPiiD+hWwM/XvuFLlP6kVxlwZJK7rjiE2uIQR9tZ37iEr1E6iCj9799yxMAmiXzITb3lQ=="; + }; + }; "base64id-0.1.0" = { name = "base64id"; packageName = "base64id"; @@ -3946,6 +4063,15 @@ let sha1 = "47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"; }; }; + "bash-color-0.0.4" = { + name = "bash-color"; + packageName = "bash-color"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/bash-color/-/bash-color-0.0.4.tgz"; + sha1 = "e9be8ce33540cada4881768c59bd63865736e913"; + }; + }; "basic-auth-1.0.4" = { name = "basic-auth"; packageName = "basic-auth"; @@ -4108,13 +4234,13 @@ let sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4"; }; }; - "big-integer-1.6.34" = { + "big-integer-1.6.35" = { name = "big-integer"; packageName = "big-integer"; - version = "1.6.34"; + version = "1.6.35"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.34.tgz"; - sha512 = "+w6B0Uo0ZvTSzDkXjoBCTNK0oe+aVL+yPi7kwGZm8hd8+Nj1AFPoxoq1Bl/mEu/G/ivOkUc1LRqVR0XeWFUzuA=="; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.35.tgz"; + sha512 = "jqLsX6dzmPHOhApAUyGwrpzqn3DXpdTqbOM6baPys7A423ys7IsTpcucDVGP0PmzxGsPYbW3xVOJ4SxAzI0vqQ=="; }; }; "big.js-3.2.0" = { @@ -4248,7 +4374,7 @@ let packageName = "bittorrent-dht"; version = "6.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-6.4.2.tgz"; + url = "http://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-6.4.2.tgz"; sha1 = "8b40f8cee6bea87f2b34fd2ae0bd367a8b1247a6"; }; }; @@ -4261,13 +4387,13 @@ let sha512 = "fvb6M58Ceiv/S94nu6zeaiMoJvUYOeIqRbgaClm+kJTzCAqJPtAR/31pXNYB5iEReOoKqQB5zY33gY0W6ZRWQQ=="; }; }; - "bittorrent-dht-8.4.0" = { + "bittorrent-dht-9.0.0" = { name = "bittorrent-dht"; packageName = "bittorrent-dht"; - version = "8.4.0"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-8.4.0.tgz"; - sha512 = "FRe/+MYBePev7Yb+BXSclkVuDxb/w+gUbao6nVHYQRaKO7aXE+ARRlL3phqm6Rdhw5CRVoLMbLd49nxmCuUhUQ=="; + url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-9.0.0.tgz"; + sha512 = "X5ax4G/PLtEPfqOUjqDZ2nmPENndWRMK4sT2jcQ4sXor904zhR40r4KqTyTvWYAljh5/hPPqM9DCUUtqWzRXoQ=="; }; }; "bittorrent-peerid-1.3.0" = { @@ -4360,6 +4486,15 @@ let sha512 = "oFIHvXhlz/DUgF0kq5B1CqxIDjIJwh9iDeUUGQUcvgiGz7Wdw03McEO7CfLBy7QKGdsydcMCgO9jFNBAFCtFcA=="; }; }; + "blake2s-1.0.1" = { + name = "blake2s"; + packageName = "blake2s"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/blake2s/-/blake2s-1.0.1.tgz"; + sha1 = "1598822a320ece6aa401ba982954f82f61b0cd7b"; + }; + }; "blob-0.0.2" = { name = "blob"; packageName = "blob"; @@ -4410,7 +4545,7 @@ let packageName = "bluebird"; version = "2.9.34"; src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-2.9.34.tgz"; + url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.34.tgz"; sha1 = "2f7b4ec80216328a9fddebdf69c8d4942feff7d8"; }; }; @@ -4419,17 +4554,17 @@ let packageName = "bluebird"; version = "2.9.9"; src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-2.9.9.tgz"; + url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.9.tgz"; sha1 = "61a26904d43d7f6b19dff7ed917dbc92452ad6d3"; }; }; - "bluebird-3.5.1" = { + "bluebird-3.5.2" = { name = "bluebird"; packageName = "bluebird"; - version = "3.5.1"; + version = "3.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz"; - sha512 = "MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="; + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.2.tgz"; + sha512 = "dhHTWMI7kMx5whMQntl7Vr9C6BvV10lFXDAasnqnrMYhXVCzzk6IO9Fo2L75jXHT07WrOngL1WDXOp+yYS91Yg=="; }; }; "blueimp-md5-2.10.0" = { @@ -4684,6 +4819,15 @@ let sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w=="; }; }; + "broadcast-stream-0.2.2" = { + name = "broadcast-stream"; + packageName = "broadcast-stream"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/broadcast-stream/-/broadcast-stream-0.2.2.tgz"; + sha1 = "79e7bb14a9abba77f72ac9258220242a8fd3919d"; + }; + }; "broadway-0.3.6" = { name = "broadway"; packageName = "broadway"; @@ -4878,7 +5022,7 @@ let packageName = "buffer"; version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz"; + url = "http://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz"; sha1 = "a72c936f77b96bf52f5f7e7b467180628551defb"; }; }; @@ -4887,17 +5031,17 @@ let packageName = "buffer"; version = "4.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz"; + url = "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz"; sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; }; }; - "buffer-5.2.0" = { + "buffer-5.2.1" = { name = "buffer"; packageName = "buffer"; - version = "5.2.0"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.2.0.tgz"; - sha512 = "nUJyfChH7PMJy75eRDCCKtszSEFokUNXC1hNVSe+o+VdcgvDPLs20k3v8UXI8ruRYAJiYtyRea8mYyqPxoHWDw=="; + url = "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz"; + sha512 = "c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg=="; }; }; "buffer-alloc-1.2.0" = { @@ -5476,13 +5620,13 @@ let sha1 = "a2aa5fb1af688758259c32c141426d78923b9b77"; }; }; - "capture-stack-trace-1.0.0" = { + "capture-stack-trace-1.0.1" = { name = "capture-stack-trace"; packageName = "capture-stack-trace"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz"; - sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d"; + url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz"; + sha512 = "mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw=="; }; }; "caseless-0.11.0" = { @@ -5539,6 +5683,15 @@ let sha512 = "Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA=="; }; }; + "ccount-1.0.3" = { + name = "ccount"; + packageName = "ccount"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ccount/-/ccount-1.0.3.tgz"; + sha512 = "Jt9tIBkRc9POUof7QA/VwWd+58fKkEEfI+/t1/eOlxKM7ZhrczNzMFefge7Ai+39y1pR/pP6cI19guHy3FSLmw=="; + }; + }; "center-align-0.1.3" = { name = "center-align"; packageName = "center-align"; @@ -5580,7 +5733,7 @@ let packageName = "chalk"; version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz"; + url = "http://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz"; sha1 = "5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"; }; }; @@ -5589,7 +5742,7 @@ let packageName = "chalk"; version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz"; + url = "http://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz"; sha1 = "663b3a648b68b55d04690d49167aa837858f2174"; }; }; @@ -5598,7 +5751,7 @@ let packageName = "chalk"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz"; + url = "http://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz"; sha1 = "b3cf4ed0ff5397c99c75b8f679db2f52831f96dc"; }; }; @@ -5607,7 +5760,7 @@ let packageName = "chalk"; version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; + url = "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; }; }; @@ -5625,7 +5778,7 @@ let packageName = "chalk"; version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz"; + url = "http://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz"; sha512 = "QUU4ofkDoMIVO7hcx1iPTISs88wsO8jA92RQIm4JAwZvFGGAV2hSAA1NX7oVj2Ej2Q6NDTcRDjPTFrMCRZoJ6g=="; }; }; @@ -5656,6 +5809,33 @@ let sha512 = "Mww+SLF6MZ0U6kdg11algyKd5BARbyM4TbFBepwowYSR5ClfQGCGtxNXgykpN0uF/bstWeaGDT4JWaDh8zWAHA=="; }; }; + "character-entities-1.2.2" = { + name = "character-entities"; + packageName = "character-entities"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/character-entities/-/character-entities-1.2.2.tgz"; + sha512 = "sMoHX6/nBiy3KKfC78dnEalnpn0Az0oSNvqUWYTtYrhRI5iUIYsROU48G+E+kMFQzqXaJ8kHJZ85n7y6/PHgwQ=="; + }; + }; + "character-entities-html4-1.1.2" = { + name = "character-entities-html4"; + packageName = "character-entities-html4"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.2.tgz"; + sha512 = "sIrXwyna2+5b0eB9W149izTPJk/KkJTg6mEzDGibwBUkyH1SbDa+nf515Ppdi3MaH35lW0JFJDWeq9Luzes1Iw=="; + }; + }; + "character-entities-legacy-1.1.2" = { + name = "character-entities-legacy"; + packageName = "character-entities-legacy"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.2.tgz"; + sha512 = "9NB2VbXtXYWdXzqrvAHykE/f0QJxzaKIpZ5QzNZrrgQ7Iyxr2vnfS8fCBNVW9nUEZE0lo57nxKRqnzY/dKrwlA=="; + }; + }; "character-parser-1.2.1" = { name = "character-parser"; packageName = "character-parser"; @@ -5674,6 +5854,15 @@ let sha1 = "c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"; }; }; + "character-reference-invalid-1.1.2" = { + name = "character-reference-invalid"; + packageName = "character-reference-invalid"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.2.tgz"; + sha512 = "7I/xceXfKyUJmSAn/jw8ve/9DyOP7XxufNYLI9Px7CmsKgEUaZLUTax6nZxGQtaoiZCjpu6cHPj20xC/vqRReQ=="; + }; + }; "chardet-0.4.2" = { name = "chardet"; packageName = "chardet"; @@ -5683,13 +5872,13 @@ let sha1 = "b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"; }; }; - "chardet-0.5.0" = { + "chardet-0.7.0" = { name = "chardet"; packageName = "chardet"; - version = "0.5.0"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/chardet/-/chardet-0.5.0.tgz"; - sha512 = "9ZTaoBaePSCFvNlNGrsyI8ZVACP2svUtq0DkM7t4K2ClAa96sqOIRjAzDTc8zXzFt1cZR46rRzLTiHFSJ+Qw0g=="; + url = "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz"; + sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="; }; }; "charenc-0.0.2" = { @@ -5701,6 +5890,15 @@ let sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"; }; }; + "charwise-3.0.1" = { + name = "charwise"; + packageName = "charwise"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/charwise/-/charwise-3.0.1.tgz"; + sha512 = "RcdumNsM6fJZ5HHbYunqj2bpurVRGsXour3OR+SlLEHFhG6ALm54i6Osnh+OvO7kEoSBzwExpblYFH8zKQiEPw=="; + }; + }; "check-error-1.0.2" = { name = "check-error"; packageName = "check-error"; @@ -5746,6 +5944,24 @@ let sha1 = "4b9f53a81b27e4d5dac31c0ffd0cfa03cc6830db"; }; }; + "chloride-2.2.10" = { + name = "chloride"; + packageName = "chloride"; + version = "2.2.10"; + src = fetchurl { + url = "https://registry.npmjs.org/chloride/-/chloride-2.2.10.tgz"; + sha512 = "CbU1ISGiB2JBV6PDXx7hkl8D94d2TPD1BANUMFbr8rZYKJi8De2d3Hu2XDIOLAhXf+8yhoFOdjtLG6fxz3QByQ=="; + }; + }; + "chloride-test-1.2.2" = { + name = "chloride-test"; + packageName = "chloride-test"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chloride-test/-/chloride-test-1.2.2.tgz"; + sha1 = "178686a85e9278045112e96e8c791793f9a10aea"; + }; + }; "chmodr-1.0.2" = { name = "chmodr"; packageName = "chmodr"; @@ -5953,15 +6169,6 @@ let 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" = { name = "cli"; packageName = "cli"; @@ -6412,6 +6619,15 @@ let sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be"; }; }; + "collapse-white-space-1.0.4" = { + name = "collapse-white-space"; + packageName = "collapse-white-space"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.4.tgz"; + sha512 = "YfQ1tAUZm561vpYD+5eyWN8+UsceQbSrqqlc/6zDY2gtAE+uZLSdkkovhnGpmCThsvKBFakq4EdY/FF93E8XIw=="; + }; + }; "collection-visit-1.0.0" = { name = "collection-visit"; packageName = "collection-visit"; @@ -7177,6 +7393,15 @@ let sha1 = "75b91fa9f16663e51f98e863af995b9164068c1a"; }; }; + "cont-1.0.3" = { + name = "cont"; + packageName = "cont"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cont/-/cont-1.0.3.tgz"; + sha1 = "6874f1e935fca99d048caeaaad9a0aeb020bcce0"; + }; + }; "content-disposition-0.5.0" = { name = "content-disposition"; packageName = "content-disposition"; @@ -7223,6 +7448,60 @@ let sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578"; }; }; + "continuable-1.1.8" = { + name = "continuable"; + packageName = "continuable"; + version = "1.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/continuable/-/continuable-1.1.8.tgz"; + sha1 = "dc877b474160870ae3bcde87336268ebe50597d5"; + }; + }; + "continuable-1.2.0" = { + name = "continuable"; + packageName = "continuable"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/continuable/-/continuable-1.2.0.tgz"; + sha1 = "08277468d41136200074ccf87294308d169f25b6"; + }; + }; + "continuable-hash-0.1.4" = { + name = "continuable-hash"; + packageName = "continuable-hash"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/continuable-hash/-/continuable-hash-0.1.4.tgz"; + sha1 = "81c74d41771d8c92783e1e00e5f11b34d6dfc78c"; + }; + }; + "continuable-list-0.1.6" = { + name = "continuable-list"; + packageName = "continuable-list"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/continuable-list/-/continuable-list-0.1.6.tgz"; + sha1 = "87cf06ec580716e10dff95fb0b84c5f0e8acac5f"; + }; + }; + "continuable-para-1.2.0" = { + name = "continuable-para"; + packageName = "continuable-para"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/continuable-para/-/continuable-para-1.2.0.tgz"; + sha1 = "445510f649459dd0fc35c872015146122731c583"; + }; + }; + "continuable-series-1.2.0" = { + name = "continuable-series"; + packageName = "continuable-series"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/continuable-series/-/continuable-series-1.2.0.tgz"; + sha1 = "3243397ae93a71d655b3026834a51590b958b9e8"; + }; + }; "conventional-changelog-angular-1.6.6" = { name = "conventional-changelog-angular"; packageName = "conventional-changelog-angular"; @@ -7718,13 +7997,13 @@ let sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg=="; }; }; - "create-torrent-3.32.1" = { + "create-torrent-3.33.0" = { name = "create-torrent"; packageName = "create-torrent"; - version = "3.32.1"; + version = "3.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-torrent/-/create-torrent-3.32.1.tgz"; - sha512 = "8spZUeFyVc+2mGnWBRTuLOhuHmHrmUomFWf7QvxztCEvTpn5SIrvF8F+HKdkzBPM9B7v/2w+f/65jqLWBXSndg=="; + url = "https://registry.npmjs.org/create-torrent/-/create-torrent-3.33.0.tgz"; + sha512 = "KMd0KuvwVUg1grlRd5skG9ZkSbBYDDkAjDUMLnvxdRn0rL7ph3IwoOk7I8u1yLX4HYjGiLVlWYO55YWNNPjJFA=="; }; }; "cron-1.3.0" = { @@ -8006,13 +8285,13 @@ let sha1 = "a6602dff7e04a8306dc0db9a551e92e8b5662ad8"; }; }; - "csslint-0.10.0" = { + "csslint-1.0.5" = { name = "csslint"; packageName = "csslint"; - version = "0.10.0"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/csslint/-/csslint-0.10.0.tgz"; - sha1 = "3a6a04e7565c8e9d19beb49767c7ec96e8365805"; + url = "https://registry.npmjs.org/csslint/-/csslint-1.0.5.tgz"; + sha1 = "19cc3eda322160fd3f7232af1cb2a360e898a2e9"; }; }; "csso-3.5.1" = { @@ -8798,6 +9077,15 @@ let sha1 = "2cef1f111e1c57870d8bbb8af2650e587cd2f5b4"; }; }; + "deferred-leveldown-3.0.0" = { + name = "deferred-leveldown"; + packageName = "deferred-leveldown"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-3.0.0.tgz"; + sha512 = "ajbXqRPMXRlcdyt0TuWqknOJkp1JgQjGB7xOl2V+ebol7/U11E9h3/nCZAtN1M7djmAJEIhypCUc1tIWxdQAuQ=="; + }; + }; "define-properties-1.1.3" = { name = "define-properties"; packageName = "define-properties"; @@ -9014,6 +9302,15 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; + "detab-1.0.2" = { + name = "detab"; + packageName = "detab"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/detab/-/detab-1.0.2.tgz"; + sha1 = "01bc2a4abe7bc7cc67c3039808edbae47049a0ee"; + }; + }; "detect-file-1.0.0" = { name = "detect-file"; packageName = "detect-file"; @@ -9221,13 +9518,13 @@ let sha1 = "57ddacb47324ae5f58d2cc0da886db4ce9eeb718"; }; }; - "dispensary-0.21.0" = { + "dispensary-0.22.0" = { name = "dispensary"; packageName = "dispensary"; - version = "0.21.0"; + version = "0.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/dispensary/-/dispensary-0.21.0.tgz"; - sha512 = "p7qK1sLukrOGYVVcea63lN9CSiE8wO61cweOjtG6MnKoeC9uKHRIO1iJuE5izcX0BeimhkqrQwEMrFWC1yOyAw=="; + url = "https://registry.npmjs.org/dispensary/-/dispensary-0.22.0.tgz"; + sha512 = "iwpIOQ4T+fJ55PAPE4G7b8MubUN8dGyZa78VrD6A+XqSnqs844npoGvpwSEETnn064JaaS4gqLcgAfTGR4p2+g=="; }; }; "diveSync-0.3.0" = { @@ -9716,13 +10013,22 @@ let sha1 = "1c595000f04a8897dfb85000892a0f4c33af86c3"; }; }; - "ecstatic-3.2.1" = { + "ecstatic-3.3.0" = { name = "ecstatic"; packageName = "ecstatic"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ecstatic/-/ecstatic-3.2.1.tgz"; - sha512 = "BAdHx9LOCG1fwxY8MIydUBskl8UUQrYeC3WE14FA1DPlBzqoG1aOgEkypcSpmiiel8RAj8gW1s40RrclfrpGUg=="; + url = "https://registry.npmjs.org/ecstatic/-/ecstatic-3.3.0.tgz"; + sha512 = "EblWYTd+wPIAMQ0U4oYJZ7QBypT9ZUIwpqli0bKDjeIIQnXDBK2dXtZ9yzRCOlkW1HkO8gn7/FxLK1yPIW17pw=="; + }; + }; + "ed2curve-0.1.4" = { + name = "ed2curve"; + packageName = "ed2curve"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ed2curve/-/ed2curve-0.1.4.tgz"; + sha1 = "94a44248bb87da35db0eff7af0aa576168117f59"; }; }; "editions-1.3.4" = { @@ -9734,13 +10040,13 @@ let sha512 = "gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg=="; }; }; - "editions-2.0.1" = { + "editions-2.0.2" = { name = "editions"; packageName = "editions"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/editions/-/editions-2.0.1.tgz"; - sha512 = "GNBqG7eF4lxz/jPGM1A/oazdRW9D86OMeggfvCXuA9kcxBJ8fcWO1O8q73pepQlwR8+KecxrgGduwdNeZJ0R9Q=="; + url = "https://registry.npmjs.org/editions/-/editions-2.0.2.tgz"; + sha512 = "0B8aSTWUu9+JW99zHoeogavCi+lkE5l35FK0OKe0pCobixJYoeof3ZujtqYzSsU2MskhRadY5V9oWUuyG4aJ3A=="; }; }; "editor-1.0.0" = { @@ -9861,6 +10167,15 @@ let sha256 = "0eae744826723877457f7a7ac7f31d68a5a060673b3a883f6a8e325bf48f313d"; }; }; + "emoji-named-characters-1.0.2" = { + name = "emoji-named-characters"; + packageName = "emoji-named-characters"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-named-characters/-/emoji-named-characters-1.0.2.tgz"; + sha1 = "cdeb36d0e66002c4b9d7bf1dfbc3a199fb7d409b"; + }; + }; "emoji-regex-6.1.1" = { name = "emoji-regex"; packageName = "emoji-regex"; @@ -9870,6 +10185,15 @@ let sha1 = "c6cd0ec1b0642e2a3c67a1137efc5e796da4f88e"; }; }; + "emoji-server-1.0.0" = { + name = "emoji-server"; + packageName = "emoji-server"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-server/-/emoji-server-1.0.0.tgz"; + sha1 = "d063cfee9af118cc5aeefbc2e9b3dd5085815c63"; + }; + }; "emojis-list-2.1.0" = { name = "emojis-list"; packageName = "emojis-list"; @@ -9906,6 +10230,15 @@ let sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb"; }; }; + "encoding-down-4.0.1" = { + name = "encoding-down"; + packageName = "encoding-down"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/encoding-down/-/encoding-down-4.0.1.tgz"; + sha512 = "AlSE+ugBIpLL0i9if2SlnOZ4oWj/XvBb8tw2Ie/pFB73vdYs5O/6plRyqIgjbZbz8onaL20AAuMP87LWbP56IQ=="; + }; + }; "end-of-stream-0.1.5" = { name = "end-of-stream"; packageName = "end-of-stream"; @@ -10113,6 +10446,15 @@ let sha512 = "yqKl+qfQ849zLua/aRGIs4TzNah6ypvdX6KPmK9LPP54Ea+Hqx2gFzSBmGhka8HvWcmCmffGIshG4INSh0ku6g=="; }; }; + "epidemic-broadcast-trees-6.3.4" = { + name = "epidemic-broadcast-trees"; + packageName = "epidemic-broadcast-trees"; + version = "6.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/epidemic-broadcast-trees/-/epidemic-broadcast-trees-6.3.4.tgz"; + sha512 = "ucs3AI3ebPCDFGw8B0SUBwzcY2WqKrbJeqYeeX9KF+XvsO7GFEe0L+1hXPfJcEScfGPByXJNACkYwUFnNaOueQ=="; + }; + }; "err-code-1.1.2" = { name = "err-code"; packageName = "err-code"; @@ -10437,13 +10779,13 @@ let sha512 = "D5nG2rErquLUstgUaxJlWB5+gu+U/3VDY0fk/Iuq8y9CUFy/7Y6oF4N2cR1tV8knzQvciIbfqfohd359xTLIKQ=="; }; }; - "eslint-5.4.0" = { + "eslint-5.5.0" = { name = "eslint"; packageName = "eslint"; - version = "5.4.0"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-5.4.0.tgz"; - sha512 = "UIpL91XGex3qtL6qwyCQJar2j3osKxK9e3ano3OcGEIRM4oWIpCkDg9x95AXEC2wMs7PnxzOkPZ2gq+tsMS9yg=="; + url = "https://registry.npmjs.org/eslint/-/eslint-5.5.0.tgz"; + sha512 = "m+az4vYehIJgl1Z0gb25KnFXeqQRdNreYsei1jdvkd9bB+UNQD3fsuiC2AWSQ56P+/t++kFSINZXFbfai+krOw=="; }; }; "eslint-plugin-no-unsafe-innerhtml-1.0.16" = { @@ -10694,7 +11036,7 @@ let packageName = "eventemitter2"; version = "0.4.14"; src = fetchurl { - url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz"; + url = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz"; sha1 = "8f61b75cde012b2e9eb284d4545583b5643b61ab"; }; }; @@ -10950,6 +11292,15 @@ let sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; }; }; + "explain-error-1.0.4" = { + name = "explain-error"; + packageName = "explain-error"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/explain-error/-/explain-error-1.0.4.tgz"; + sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929"; + }; + }; "express-2.5.11" = { name = "express"; packageName = "express"; @@ -11157,12 +11508,21 @@ let sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; }; }; + "extend.js-0.0.2" = { + name = "extend.js"; + packageName = "extend.js"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extend.js/-/extend.js-0.0.2.tgz"; + sha1 = "0f9c7a81a1f208b703eb0c3131fe5716ac6ecd15"; + }; + }; "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"; + url = "http://registry.npmjs.org/external-editor/-/external-editor-1.1.1.tgz"; sha1 = "12d7b0db850f7ff7e7081baf4005700060c4600b"; }; }; @@ -11171,17 +11531,17 @@ let packageName = "external-editor"; version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz"; + url = "http://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz"; sha512 = "bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A=="; }; }; - "external-editor-3.0.1" = { + "external-editor-3.0.3" = { name = "external-editor"; packageName = "external-editor"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/external-editor/-/external-editor-3.0.1.tgz"; - sha512 = "e1neqvSt5pSwQcFnYc6yfGuJD2Q4336cdbHs5VeUO0zTkqPbrHMyw2q1r47fpfLWbvIG8H8A6YO3sck7upTV6Q=="; + url = "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz"; + sha512 = "bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA=="; }; }; "extglob-0.3.2" = { @@ -11346,6 +11706,15 @@ let sha512 = "KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig=="; }; }; + "fast-future-1.0.2" = { + name = "fast-future"; + packageName = "fast-future"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-future/-/fast-future-1.0.2.tgz"; + sha1 = "8435a9aaa02d79248d17d704e76259301d99280a"; + }; + }; "fast-glob-2.2.2" = { name = "fast-glob"; packageName = "fast-glob"; @@ -11369,17 +11738,17 @@ let 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"; + url = "http://registry.npmjs.org/fast-json-patch/-/fast-json-patch-0.5.6.tgz"; sha1 = "66e4028e381eaa002edeb280d10238f3a46c3402"; }; }; - "fast-json-patch-2.0.6" = { + "fast-json-patch-2.0.7" = { name = "fast-json-patch"; packageName = "fast-json-patch"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.0.6.tgz"; - sha1 = "86fff8f8662391aa819722864d632e603e6ee605"; + url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.0.7.tgz"; + sha512 = "DQeoEyPYxdTtfmB3yDlxkLyKTdbJ6ABfFGcMynDqjvGhPYLto/pZyb/dG2Nyd/n9CArjEWN9ZST++AFmgzgbGw=="; }; }; "fast-json-stable-stringify-2.0.0" = { @@ -11823,13 +12192,13 @@ let sha1 = "b37dc844b76a2f5e7081e884f7c0ae344f153476"; }; }; - "firefox-profile-1.1.0" = { + "firefox-profile-1.2.0" = { name = "firefox-profile"; packageName = "firefox-profile"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/firefox-profile/-/firefox-profile-1.1.0.tgz"; - sha512 = "wUIE4QeAjwoHvFbomWmXgKyYtV4/oZxDcJG4znxtGGa/0BhKkd3HzeOf3tAsMWPq1ExARZxCRRiNw1BL3FuPqA=="; + url = "https://registry.npmjs.org/firefox-profile/-/firefox-profile-1.2.0.tgz"; + sha512 = "TTEFfPOkyaz4EWx/5ZDQC1mJAe3a+JgVcchpIfD4Tvx1UspwlTJRJxOYA35x/z2iJcxaF6aW2rdh6oj6qwgd2g=="; }; }; "first-chunk-stream-1.0.0" = { @@ -11949,6 +12318,88 @@ let sha512 = "T0iqfhC40jrs3aDjYOKgzIQjjhsH2Fa6LnXB6naPv0ymW3DeYMUFa89y9aLKMpi1P9nl2vEimK7blx4tVnUWBg=="; }; }; + "flumecodec-0.0.0" = { + name = "flumecodec"; + packageName = "flumecodec"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/flumecodec/-/flumecodec-0.0.0.tgz"; + sha1 = "36ce06abe2e0e01c44dd69f2a165305a2320649b"; + }; + }; + "flumecodec-0.0.1" = { + name = "flumecodec"; + packageName = "flumecodec"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/flumecodec/-/flumecodec-0.0.1.tgz"; + sha1 = "ae049a714386bb83e342657a82924b70364a90d6"; + }; + }; + "flumedb-0.4.9" = { + name = "flumedb"; + packageName = "flumedb"; + version = "0.4.9"; + src = fetchurl { + url = "https://registry.npmjs.org/flumedb/-/flumedb-0.4.9.tgz"; + sha512 = "z932cCXHteJXKcwoev8/RfJ9tQ10FeRCZ6Jh55UnxN/ayZraYZvNYObl8ujbho7xQZB1CDt2WTHCN5gEYGBqGw=="; + }; + }; + "flumelog-offset-3.3.1" = { + name = "flumelog-offset"; + packageName = "flumelog-offset"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/flumelog-offset/-/flumelog-offset-3.3.1.tgz"; + sha512 = "4yYdr8tTL0qOkKqhxAxvNnIwDBaBcLEsJWbyc2wU4Ycaewts9xxcBaxNbORp2KBbTwFaqZAV13HVpfZcO1X/AA=="; + }; + }; + "flumeview-hashtable-1.0.4" = { + name = "flumeview-hashtable"; + packageName = "flumeview-hashtable"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/flumeview-hashtable/-/flumeview-hashtable-1.0.4.tgz"; + sha512 = "4L52hBelX7dYVAQQ9uPjksqxOCxLwI4NsfEG/+sTM423axT2Poq5cnfdvGm3HzmNowzwDIKtdy429r6PbfKEIw=="; + }; + }; + "flumeview-level-3.0.5" = { + name = "flumeview-level"; + packageName = "flumeview-level"; + version = "3.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/flumeview-level/-/flumeview-level-3.0.5.tgz"; + sha512 = "LKW+YdJGemOo7TnUwpFHq4cBBiYAIKtWk+G2CK7zrxbCIiAHemBRudohBOUKuSUZZ0CReR5fJ73peBHW02VerA=="; + }; + }; + "flumeview-query-6.3.0" = { + name = "flumeview-query"; + packageName = "flumeview-query"; + version = "6.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/flumeview-query/-/flumeview-query-6.3.0.tgz"; + sha512 = "8QBannTFLICARmflhHpXNeR5hh6IzIyJz4XhKTofzmxq/hXEn1un7aF6P6dRQkOwthENDTbSB07eWKqwnYDKtw=="; + }; + }; + "flumeview-query-git://github.com/mmckegg/flumeview-query#map" = { + name = "flumeview-query"; + packageName = "flumeview-query"; + version = "6.2.0"; + src = fetchgit { + url = "git://github.com/mmckegg/flumeview-query"; + rev = "59afdf210dbd8bdf53aeea7dcfaaec1c77e7d733"; + sha256 = "e6f1f768a0911a52c7a4d7f1ee0d60531d174fe30a96879a030a019ff3cb069f"; + }; + }; + "flumeview-reduce-1.3.13" = { + name = "flumeview-reduce"; + packageName = "flumeview-reduce"; + version = "1.3.13"; + src = fetchurl { + url = "https://registry.npmjs.org/flumeview-reduce/-/flumeview-reduce-1.3.13.tgz"; + sha512 = "QN/07+ia3uXpfy8/xWjLI2XGIG67Aiwp9VaOTIqYt6NHP6OfdGfl8nGRPkJRHlkfFbzEouRvJcQBFohWEXMdNQ=="; + }; + }; "flush-write-stream-1.0.3" = { name = "flush-write-stream"; packageName = "flush-write-stream"; @@ -12606,13 +13057,13 @@ let sha1 = "336a98f81510f9ae0af2a494e17468a116a9dc04"; }; }; - "generate-function-2.2.0" = { + "generate-function-2.3.1" = { name = "generate-function"; packageName = "generate-function"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/generate-function/-/generate-function-2.2.0.tgz"; - sha512 = "EYWRyUEUdNSsmfMZ2udk1AaxEmJQBaCNgfh+FJo0lcUvP42nyR/Xe30kCyxZs7e6t47bpZw0HftWF+KFjD/Lzg=="; + url = "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz"; + sha512 = "eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ=="; }; }; "generate-object-property-1.2.0" = { @@ -12768,13 +13219,13 @@ let sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; }; }; - "getmac-1.4.5" = { + "getmac-1.4.6" = { name = "getmac"; packageName = "getmac"; - version = "1.4.5"; + version = "1.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/getmac/-/getmac-1.4.5.tgz"; - sha512 = "Y4Zu6i3zXAnH+Q2zSdnV8SSmyu3BisdfQhsH8YLsC/7vTxgNTTT/JzHWmU3tZEim8hvaCtZLaE5E95wo8P4oGQ=="; + url = "https://registry.npmjs.org/getmac/-/getmac-1.4.6.tgz"; + sha512 = "3JPwiIr4P6Sgr6y6SVXX0+l2mrB6pyf4Cdyua7rvEV7SveWQkAp11vrkNym8wvRxzLrBenKRcwe93asdghuwWg=="; }; }; "getpass-0.1.6" = { @@ -12822,6 +13273,15 @@ let sha1 = "6d33f7ed63db0d0e118131503bab3aca47d54664"; }; }; + "git-packidx-parser-1.0.0" = { + name = "git-packidx-parser"; + packageName = "git-packidx-parser"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/git-packidx-parser/-/git-packidx-parser-1.0.0.tgz"; + sha1 = "c57d1145eec16465ab9bfbdf575262b1691624d6"; + }; + }; "git-raw-commits-1.3.6" = { name = "git-raw-commits"; packageName = "git-raw-commits"; @@ -12840,6 +13300,15 @@ let sha1 = "5282659dae2107145a11126112ad3216ec5fa65f"; }; }; + "git-remote-ssb-2.0.4" = { + name = "git-remote-ssb"; + packageName = "git-remote-ssb"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/git-remote-ssb/-/git-remote-ssb-2.0.4.tgz"; + sha1 = "7f51b804924d6c603fc142e3302998d4e0b4d906"; + }; + }; "git-rev-sync-1.9.1" = { name = "git-rev-sync"; packageName = "git-rev-sync"; @@ -12858,6 +13327,15 @@ let sha512 = "2jHlJnln4D/ECk9FxGEBh3k44wgYdWjWDtMmJPaecjoRmxKo3Y1Lh8GMYuOPu04CHw86NTAODchYjC5pnpMQig=="; }; }; + "git-ssb-web-2.8.0" = { + name = "git-ssb-web"; + packageName = "git-ssb-web"; + version = "2.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/git-ssb-web/-/git-ssb-web-2.8.0.tgz"; + sha512 = "8mqO63M60lCiNR+6ROvXuX4VI6pVAru4wMn3uUfxq0xmpNwrZYC4Rkrt5rSGUPumJ43ZUJyeMXXq60v03PUY/g=="; + }; + }; "gitconfiglocal-1.0.0" = { name = "gitconfiglocal"; packageName = "gitconfiglocal"; @@ -13156,6 +13634,15 @@ let sha512 = "S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ=="; }; }; + "globby-4.1.0" = { + name = "globby"; + packageName = "globby"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-4.1.0.tgz"; + sha1 = "080f54549ec1b82a6c60e631fc82e1211dbe95f8"; + }; + }; "globby-5.0.0" = { name = "globby"; packageName = "globby"; @@ -13206,7 +13693,7 @@ let packageName = "got"; version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-1.2.2.tgz"; + url = "http://registry.npmjs.org/got/-/got-1.2.2.tgz"; sha1 = "d9430ba32f6a30218243884418767340aafc0400"; }; }; @@ -13215,7 +13702,7 @@ let packageName = "got"; version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-3.3.1.tgz"; + url = "http://registry.npmjs.org/got/-/got-3.3.1.tgz"; sha1 = "e5d0ed4af55fc3eef4d56007769d98192bcb2eca"; }; }; @@ -13224,7 +13711,7 @@ let packageName = "got"; version = "6.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-6.7.1.tgz"; + url = "http://registry.npmjs.org/got/-/got-6.7.1.tgz"; sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0"; }; }; @@ -13332,7 +13819,7 @@ let packageName = "graphql"; version = "0.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/graphql/-/graphql-0.13.2.tgz"; + url = "http://registry.npmjs.org/graphql/-/graphql-0.13.2.tgz"; sha512 = "QZ5BL8ZO/B20VA8APauGBg3GyEgZ19eduvpLWoq5x7gMmWnHoy8rlQWPLmWgFvo1yNgjSEFMesmS4R6pPr7xog=="; }; }; @@ -13408,13 +13895,13 @@ let sha512 = "Mlj/VYshHbwDrVHgNyNAl2cBU7+Rh503S43UYXcBtR9Am2KNvmPPPccXEeP6yist0yY2WM0WTwL8JoIGrWeFOw=="; }; }; - "graphql-extensions-0.1.2" = { + "graphql-extensions-0.1.3" = { name = "graphql-extensions"; packageName = "graphql-extensions"; - version = "0.1.2"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.1.2.tgz"; - sha512 = "A81kfGtOKG0/1sDQGm23u60bkTuk9VDof0SrQrz7yNpPLY48JF11b8+4LNlYfEBVvceDbLAs1KRfyLQskJjJSg=="; + url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.1.3.tgz"; + sha512 = "q+d1bTR7GW4qRiZP17SXN0TZo+k/I1FEKYd6H4JMbxzpY8mqTLbg8MzrLu7LxafF+mPEJwRfipcEcA375k3eXA=="; }; }; "graphql-import-0.4.5" = { @@ -13507,6 +13994,15 @@ let sha1 = "d2c177e2f1b17d87f81072cd05311c0754baa420"; }; }; + "graphreduce-3.0.4" = { + name = "graphreduce"; + packageName = "graphreduce"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/graphreduce/-/graphreduce-3.0.4.tgz"; + sha1 = "bf442d0a878e83901e5ef3e652d23ffb5b831ed7"; + }; + }; "gray-matter-2.1.1" = { name = "gray-matter"; packageName = "gray-matter"; @@ -13849,6 +14345,15 @@ let sha1 = "6414c82913697da51590397dafb12f22967811ce"; }; }; + "has-network-0.0.1" = { + name = "has-network"; + packageName = "has-network"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-network/-/has-network-0.0.1.tgz"; + sha1 = "3eea7b44caa9601797124be8ba89d228c4101499"; + }; + }; "has-symbol-support-x-1.4.2" = { name = "has-symbol-support-x"; packageName = "has-symbol-support-x"; @@ -13975,6 +14480,15 @@ let sha1 = "8b5341c3496124b0724ac8555fbb8ca363ebbb73"; }; }; + "hashlru-2.2.1" = { + name = "hashlru"; + packageName = "hashlru"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hashlru/-/hashlru-2.2.1.tgz"; + sha1 = "10f2099a0d7c05a40f2beaf5c1d39cf2f7dabf36"; + }; + }; "hashring-3.2.0" = { name = "hashring"; packageName = "hashring"; @@ -14020,6 +14534,15 @@ let sha512 = "miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ=="; }; }; + "he-0.5.0" = { + name = "he"; + packageName = "he"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/he/-/he-0.5.0.tgz"; + sha1 = "2c05ffaef90b68e860f3fd2b54ef580989277ee2"; + }; + }; "he-1.1.1" = { name = "he"; packageName = "he"; @@ -14074,6 +14597,15 @@ let sha1 = "b8a9c5493212a9392f0222b649c9611497ebfb88"; }; }; + "highlight.js-9.12.0" = { + name = "highlight.js"; + packageName = "highlight.js"; + version = "9.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.12.0.tgz"; + sha1 = "e6d9dbe57cbefe60751f02af336195870c90c01e"; + }; + }; "hiredis-0.4.1" = { name = "hiredis"; packageName = "hiredis"; @@ -14164,6 +14696,15 @@ let sha1 = "0f591b1b344bdcb3df59773f62fbbaf85bf4028b"; }; }; + "hoox-0.0.1" = { + name = "hoox"; + packageName = "hoox"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hoox/-/hoox-0.0.1.tgz"; + sha1 = "08a74d9272a9cc83ae8e6bbe0303f0ee76432094"; + }; + }; "hosted-git-info-2.7.1" = { name = "hosted-git-info"; packageName = "hosted-git-info"; @@ -14785,6 +15326,15 @@ let sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; }; }; + "increment-buffer-1.0.1" = { + name = "increment-buffer"; + packageName = "increment-buffer"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/increment-buffer/-/increment-buffer-1.0.1.tgz"; + sha1 = "65076d75189d808b39ad13ab5b958e05216f9e0d"; + }; + }; "indent-string-2.1.0" = { name = "indent-string"; packageName = "indent-string"; @@ -15046,6 +15596,15 @@ let sha512 = "vtI2YXBRZBkU6DlfHfd0GtZENfiEiTacAXUd0ZY6HA+X7aPznpFfPmzSC+tHKXAkz9KDSdI4AYfwAMXR5t+isg=="; }; }; + "int53-0.2.4" = { + name = "int53"; + packageName = "int53"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/int53/-/int53-0.2.4.tgz"; + sha1 = "5ed8d7aad6c5c6567cae69aa7ffc4a109ee80f86"; + }; + }; "int64-buffer-0.1.10" = { name = "int64-buffer"; packageName = "int64-buffer"; @@ -15109,6 +15668,24 @@ let sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; }; }; + "invert-kv-2.0.0" = { + name = "invert-kv"; + packageName = "invert-kv"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz"; + sha512 = "wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA=="; + }; + }; + "ip-0.3.3" = { + name = "ip"; + packageName = "ip"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ip/-/ip-0.3.3.tgz"; + sha1 = "8ee8309e92f0b040d287f72efaca1a21702d3fb4"; + }; + }; "ip-1.1.5" = { name = "ip"; packageName = "ip"; @@ -15181,6 +15758,15 @@ let sha1 = "5bf4125fb6ec0f3929a89647b26e653232942b79"; }; }; + "irregular-plurals-1.4.0" = { + name = "irregular-plurals"; + packageName = "irregular-plurals"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-1.4.0.tgz"; + sha1 = "2ca9b033651111855412f16be5d77c62a458a766"; + }; + }; "is-3.2.1" = { name = "is"; packageName = "is"; @@ -15235,6 +15821,24 @@ let sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="; }; }; + "is-alphabetical-1.0.2" = { + name = "is-alphabetical"; + packageName = "is-alphabetical"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.2.tgz"; + sha512 = "V0xN4BYezDHcBSKb1QHUFMlR4as/XEuCZBzMJUU4n7+Cbt33SmUnSol+pnXFvLxSHNq2CemUXNdaXV6Flg7+xg=="; + }; + }; + "is-alphanumerical-1.0.2" = { + name = "is-alphanumerical"; + packageName = "is-alphanumerical"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.2.tgz"; + sha512 = "pyfU/0kHdISIgslFfZN9nfY1Gk3MquQgUm1mJTjdkEPpkAKNWuBTSqFwewOpR7N351VkErCiyV71zX7mlQQqsg=="; + }; + }; "is-arguments-1.0.2" = { name = "is-arguments"; packageName = "is-arguments"; @@ -15343,6 +15947,15 @@ let sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; }; }; + "is-decimal-1.0.2" = { + name = "is-decimal"; + packageName = "is-decimal"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.2.tgz"; + sha512 = "TRzl7mOCchnhchN+f3ICUCzYvL9ul7R+TYOsZ8xia++knyZAJfv/uA1FvQXsAnYIl1T3B2X5E/J7Wb1QXiIBXg=="; + }; + }; "is-descriptor-0.1.6" = { name = "is-descriptor"; packageName = "is-descriptor"; @@ -15388,6 +16001,15 @@ let sha1 = "a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"; }; }; + "is-electron-2.1.0" = { + name = "is-electron"; + packageName = "is-electron"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-electron/-/is-electron-2.1.0.tgz"; + sha512 = "dkg5xT383+M6zIbbXW/z7n2nz4SFUi2OSyhntnFYkRdtV+HVEfdjEK+5AWisfYgkpe3WYjTIuh7toaKmSfFVWw=="; + }; + }; "is-equal-shallow-0.1.3" = { name = "is-equal-shallow"; packageName = "is-equal-shallow"; @@ -15514,6 +16136,15 @@ let sha1 = "9521c76845cc2610a85203ddf080a958c2ffabc0"; }; }; + "is-hexadecimal-1.0.2" = { + name = "is-hexadecimal"; + packageName = "is-hexadecimal"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.2.tgz"; + sha512 = "but/G3sapV3MNyqiDBLrOi4x8uCIw0RY3o/Vb5GT0sMFHrVV7731wFSVy41T5FO1og7G0gXLJh0MkgPRouko/A=="; + }; + }; "is-installed-globally-0.1.0" = { name = "is-installed-globally"; packageName = "is-installed-globally"; @@ -15955,6 +16586,15 @@ let sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; }; }; + "is-valid-domain-0.0.5" = { + name = "is-valid-domain"; + packageName = "is-valid-domain"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/is-valid-domain/-/is-valid-domain-0.0.5.tgz"; + sha1 = "48e70319fcb43009236e96b37f9843889ce7b513"; + }; + }; "is-valid-glob-1.0.0" = { name = "is-valid-glob"; packageName = "is-valid-glob"; @@ -16423,13 +17063,22 @@ let sha1 = "e421a2a8e20d6b0819df28908f782526b96dd1fe"; }; }; - "jshint-2.8.0" = { + "jshint-2.9.6" = { name = "jshint"; packageName = "jshint"; - version = "2.8.0"; + version = "2.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/jshint/-/jshint-2.8.0.tgz"; - sha1 = "1d09a3bd913c4cadfa81bf18d582bd85bffe0d44"; + url = "https://registry.npmjs.org/jshint/-/jshint-2.9.6.tgz"; + sha512 = "KO9SIAKTlJQOM4lE64GQUtGBRpTOuvbrRrSZw3AhUxMNG266nX9hK2cKA4SBhXOj0irJGyNyGSLT62HGOVDEOA=="; + }; + }; + "json-buffer-2.0.11" = { + name = "json-buffer"; + packageName = "json-buffer"; + version = "2.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/json-buffer/-/json-buffer-2.0.11.tgz"; + sha1 = "3e441fda3098be8d1e3171ad591bc62a33e2d55f"; }; }; "json-buffer-3.0.0" = { @@ -16905,7 +17554,7 @@ let packageName = "k-bucket"; version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/k-bucket/-/k-bucket-0.6.0.tgz"; + url = "http://registry.npmjs.org/k-bucket/-/k-bucket-0.6.0.tgz"; sha1 = "afc532545f69d466293e887b00d5fc73377c3abb"; }; }; @@ -16914,7 +17563,7 @@ let packageName = "k-bucket"; version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/k-bucket/-/k-bucket-2.0.1.tgz"; + url = "http://registry.npmjs.org/k-bucket/-/k-bucket-2.0.1.tgz"; sha1 = "58cccb244f563326ba893bf5c06a35f644846daa"; }; }; @@ -16936,6 +17585,15 @@ let sha512 = "YvDpmY3waI999h1zZoW1rJ04fZrgZ+5PAlVmvwDHT6YO/Q1AOhdel07xsKy9eAvJjQ9xZV1wz3rXKqEfaWvlcQ=="; }; }; + "k-bucket-5.0.0" = { + name = "k-bucket"; + packageName = "k-bucket"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/k-bucket/-/k-bucket-5.0.0.tgz"; + sha512 = "r/q+wV/Kde62/tk+rqyttEJn6h0jR7x+incdMVSYTqK73zVxVrzJa70kJL49cIKen8XjIgUZKSvk8ktnrQbK4w=="; + }; + }; "k-rpc-3.7.0" = { name = "k-rpc"; packageName = "k-rpc"; @@ -17189,6 +17847,24 @@ let sha512 = "++ulra2RtdutmJhZZFohhF+kbccz2XdFTf23857x8X1M9Jfm54ZKY4kXPJKgPdMz6eTH1MBXWXh17RvGWxLNrw=="; }; }; + "kvgraph-0.1.0" = { + name = "kvgraph"; + packageName = "kvgraph"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kvgraph/-/kvgraph-0.1.0.tgz"; + sha1 = "068eed75b8d9bae75c1219da41eea0e433cd748c"; + }; + }; + "kvset-1.0.0" = { + name = "kvset"; + packageName = "kvset"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kvset/-/kvset-1.0.0.tgz"; + sha1 = "24f68db8ecb155498c9ecb56aef40ae24509872f"; + }; + }; "labeled-stream-splicer-2.0.1" = { name = "labeled-stream-splicer"; packageName = "labeled-stream-splicer"; @@ -17279,6 +17955,15 @@ let sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; }; }; + "lcid-2.0.0" = { + name = "lcid"; + packageName = "lcid"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz"; + sha512 = "avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA=="; + }; + }; "lead-1.0.0" = { name = "lead"; packageName = "lead"; @@ -17333,6 +18018,51 @@ let sha1 = "e1a3f4cad65fc02e25070a47d63d7b527361c1cf"; }; }; + "level-3.0.2" = { + name = "level"; + packageName = "level"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/level/-/level-3.0.2.tgz"; + sha512 = "2qYbbiptPsPWGUI+AgB1gTNXqIjPpALRqrQyNx1zWYNZxhhuzEj/IE4Unu9weEBnsUEocfYe56xOGlAceb8/Fg=="; + }; + }; + "level-codec-6.2.0" = { + name = "level-codec"; + packageName = "level-codec"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/level-codec/-/level-codec-6.2.0.tgz"; + sha1 = "a4b5244bb6a4c2f723d68a1d64e980c53627d9d4"; + }; + }; + "level-codec-8.0.0" = { + name = "level-codec"; + packageName = "level-codec"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/level-codec/-/level-codec-8.0.0.tgz"; + sha512 = "gNZlo1HRHz0BWxzGCyNf7xntAs2HKOPvvRBWtXsoDvEX4vMYnSTBS6ZnxoaiX7nhxSBPpegRa8CQ/hnfGBKk3Q=="; + }; + }; + "level-errors-1.1.2" = { + name = "level-errors"; + packageName = "level-errors"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/level-errors/-/level-errors-1.1.2.tgz"; + sha512 = "Sw/IJwWbPKF5Ai4Wz60B52yj0zYeqzObLh8k1Tk88jVmD51cJSKWSYpRyhVIvFzZdvsPqlH5wfhp/yxdsaQH4w=="; + }; + }; + "level-iterator-stream-2.0.3" = { + name = "level-iterator-stream"; + packageName = "level-iterator-stream"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-2.0.3.tgz"; + sha512 = "I6Heg70nfF+e5Y3/qfthJFexhRw/Gi3bIymCoXAlijZdAcLaPuWSJs3KXyTYf23ID6g0o2QF62Yh+grOXY3Rig=="; + }; + }; "level-packager-0.18.0" = { name = "level-packager"; packageName = "level-packager"; @@ -17342,6 +18072,15 @@ let sha1 = "c076b087646f1d7dedcc3442f58800dd0a0b45f5"; }; }; + "level-packager-2.1.1" = { + name = "level-packager"; + packageName = "level-packager"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/level-packager/-/level-packager-2.1.1.tgz"; + sha512 = "6l3G6dVkmdvHwOJrEA9d9hL6SSFrzwjQoLP8HsvohOgfY/8Z9LyTKNCM5Gc84wtsUWCuIHu6r+S6WrCtTWUJCw=="; + }; + }; "level-post-1.0.7" = { name = "level-post"; packageName = "level-post"; @@ -17369,6 +18108,15 @@ let sha1 = "a1bb751c95263ff60f41bde0f973ff8c1e98bbe9"; }; }; + "leveldown-3.0.2" = { + name = "leveldown"; + packageName = "leveldown"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/leveldown/-/leveldown-3.0.2.tgz"; + sha512 = "+ANRScj1npQQzv6e4DYAKRjVQZZ+ahMoubKrNP68nIq+l9bYgb+WiXF+14oTcQTg2f7qE9WHGW7rBG9nGSsA+A=="; + }; + }; "levelup-0.18.6" = { name = "levelup"; packageName = "levelup"; @@ -17387,6 +18135,15 @@ let sha1 = "f3a6a7205272c4b5f35e412ff004a03a0aedf50b"; }; }; + "levelup-2.0.2" = { + name = "levelup"; + packageName = "levelup"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/levelup/-/levelup-2.0.2.tgz"; + sha512 = "us+nTLUyd/eLnclYYddOCdAVw1hnymGx/9p4Jr5ThohStsjLqMVmbYiz6/SYFZEPXNF+AKQSvh6fA2e2KZpC8w=="; + }; + }; "leven-1.0.2" = { name = "leven"; packageName = "leven"; @@ -17459,6 +18216,24 @@ let sha1 = "e80ad2ef5c081ac677f66515d107537fdc0f5c64"; }; }; + "libsodium-0.7.3" = { + name = "libsodium"; + packageName = "libsodium"; + version = "0.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/libsodium/-/libsodium-0.7.3.tgz"; + sha512 = "ld+deUNqSsZYbAobUs63UyduPq8ICp/Ul/5lbvBIYpuSNWpPRU0PIxbW+xXipVZtuopR6fIz9e0tTnNuPMNeqw=="; + }; + }; + "libsodium-wrappers-0.7.3" = { + name = "libsodium-wrappers"; + packageName = "libsodium-wrappers"; + version = "0.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/libsodium-wrappers/-/libsodium-wrappers-0.7.3.tgz"; + sha512 = "dw5Jh6TZ5qc5rQVZe3JrSO/J05CE+DmAPnqD7Q2glBUE969xZ6o3fchnUxyPlp6ss3x0MFxmdJntveFN+XTg1g=="; + }; + }; "lie-3.1.1" = { name = "lie"; packageName = "lie"; @@ -17626,7 +18401,7 @@ let packageName = "lodash"; version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"; + url = "http://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"; sha1 = "8f57560c83b59fc270bd3d561b690043430e2551"; }; }; @@ -17635,7 +18410,7 @@ let packageName = "lodash"; version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"; + url = "http://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"; sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e"; }; }; @@ -17644,7 +18419,7 @@ let packageName = "lodash"; version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-3.1.0.tgz"; + url = "http://registry.npmjs.org/lodash/-/lodash-3.1.0.tgz"; sha1 = "d41b8b33530cb3be088853208ad30092d2c27961"; }; }; @@ -17653,25 +18428,16 @@ let packageName = "lodash"; version = "3.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"; + url = "http://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"; + url = "http://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz"; sha1 = "83e4b10913f48496d4d16fec4a560af2ee744b68"; }; }; @@ -17680,7 +18446,7 @@ let packageName = "lodash"; version = "4.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz"; + url = "http://registry.npmjs.org/lodash/-/lodash-4.14.2.tgz"; sha1 = "bbccce6373a400fbfd0a8c67ca42f6d1ef416432"; }; }; @@ -17707,7 +18473,7 @@ let packageName = "lodash"; version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.2.1.tgz"; + url = "http://registry.npmjs.org/lodash/-/lodash-4.2.1.tgz"; sha1 = "171fdcfbbc30d689c544cd18c0529f56de6c1aa9"; }; }; @@ -18647,6 +19413,15 @@ let sha1 = "a3a17bbf62eeb6240f491846e97c1c4e2a5e1e21"; }; }; + "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"; @@ -18737,6 +19512,15 @@ let sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097"; }; }; + "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"; + }; + }; "longjohn-0.2.12" = { name = "longjohn"; packageName = "longjohn"; @@ -18764,6 +19548,15 @@ let sha1 = "2efa54c3b1cbaba9b94aee2e5914b0be57fbb749"; }; }; + "looper-4.0.0" = { + name = "looper"; + packageName = "looper"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/looper/-/looper-4.0.0.tgz"; + sha1 = "7706aded59a99edca06e6b54bb86c8ec19c95155"; + }; + }; "loose-envify-1.4.0" = { name = "loose-envify"; packageName = "loose-envify"; @@ -18782,6 +19575,15 @@ let sha512 = "r4w0WrhIHV1lOTVGbTg4Toqwso5x6C8pM7Q/Nto2vy4c7yUSdTYVYlj16uHVX3MT1StpSELDv8yrqGx41MBsDA=="; }; }; + "lossy-store-1.2.3" = { + name = "lossy-store"; + packageName = "lossy-store"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lossy-store/-/lossy-store-1.2.3.tgz"; + sha1 = "562e2a9203d8661f60e8712de407fbdadf275dc9"; + }; + }; "loud-rejection-1.6.0" = { name = "loud-rejection"; packageName = "loud-rejection"; @@ -18917,6 +19719,15 @@ let sha1 = "2738bd9f0d3cf4f84490c5736c48699ac632cda3"; }; }; + "lrucache-1.0.3" = { + name = "lrucache"; + packageName = "lrucache"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lrucache/-/lrucache-1.0.3.tgz"; + sha1 = "3b1ded0d1ba82e188b9bdaba9eee6486f864a434"; + }; + }; "lstream-0.0.4" = { name = "lstream"; packageName = "lstream"; @@ -18944,6 +19755,15 @@ let sha1 = "10851a06d9964b971178441c23c9e52698eece34"; }; }; + "ltgt-2.2.1" = { + name = "ltgt"; + packageName = "ltgt"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ltgt/-/ltgt-2.2.1.tgz"; + sha1 = "f35ca91c493f7b73da0e07495304f17b31f87ee5"; + }; + }; "lunr-0.7.2" = { name = "lunr"; packageName = "lunr"; @@ -18976,7 +19796,7 @@ let packageName = "magnet-uri"; version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-2.0.1.tgz"; + url = "http://registry.npmjs.org/magnet-uri/-/magnet-uri-2.0.1.tgz"; sha1 = "d331d3dfcd3836565ade0fc3ca315e39217bb209"; }; }; @@ -18985,17 +19805,17 @@ let packageName = "magnet-uri"; version = "4.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-4.2.3.tgz"; + url = "http://registry.npmjs.org/magnet-uri/-/magnet-uri-4.2.3.tgz"; sha1 = "79cc6d65a00bb5b7ef5c25ae60ebbb5d9a7681a8"; }; }; - "magnet-uri-5.2.3" = { + "magnet-uri-5.2.4" = { name = "magnet-uri"; packageName = "magnet-uri"; - version = "5.2.3"; + version = "5.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.2.3.tgz"; - sha512 = "INWVwcpWfZTVM+Yb4EXVBpm0FTd8Q98Fn5x7nuHv1hkFDRELgdIM+eJ3zYLbNTFpFPYtHs6B+sx8exs29IYwgA=="; + url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.2.4.tgz"; + sha512 = "VYaJMxhr8B9BrCiNINUsuhaEe40YnG+AQBwcqUKO66lSVaI9I3A1iH/6EmEwRI8OYUg5Gt+4lLE7achg676lrg=="; }; }; "mailcomposer-2.1.0" = { @@ -19034,13 +19854,13 @@ let sha512 = "2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ=="; }; }; - "make-error-1.3.4" = { + "make-error-1.3.5" = { name = "make-error"; packageName = "make-error"; - version = "1.3.4"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/make-error/-/make-error-1.3.4.tgz"; - sha512 = "0Dab5btKVPhibSalc9QGXb559ED7G7iLjFXBaj9Wq8O3vorueR5K5jaE3hkG6ZQINyhA/JgG6Qk4qdFQjsYV6g=="; + url = "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz"; + sha512 = "c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g=="; }; }; "make-error-cause-1.2.2" = { @@ -19088,6 +19908,33 @@ let sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; }; }; + "map-filter-reduce-2.2.1" = { + name = "map-filter-reduce"; + packageName = "map-filter-reduce"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/map-filter-reduce/-/map-filter-reduce-2.2.1.tgz"; + sha1 = "632b127c3ae5d6ad9e21cfdd9691b63b8944fcd2"; + }; + }; + "map-filter-reduce-3.1.0" = { + name = "map-filter-reduce"; + packageName = "map-filter-reduce"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/map-filter-reduce/-/map-filter-reduce-3.1.0.tgz"; + sha512 = "os2GlG1lEWRSAvAb9iqfapQ0I1GRXSA+alSjQl0DB7XxNyDx2/VOVAEVhK7EMsqwDDCWNTBSstoo1roc7U5H0w=="; + }; + }; + "map-merge-1.1.0" = { + name = "map-merge"; + packageName = "map-merge"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/map-merge/-/map-merge-1.1.0.tgz"; + sha1 = "6a6fc58c95d8aab46c2bdde44d515b6ee06fce34"; + }; + }; "map-obj-1.0.1" = { name = "map-obj"; packageName = "map-obj"; @@ -19169,6 +20016,15 @@ let sha512 = "7pxkHuvqTOu3iwVGmDPeYjQg+AIS9VQxzyLP9JCg9lBjgPAJXGEkChK6A2iFuj3tS0GV3HG2u5AMNhcQqwxpJw=="; }; }; + "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"; + }; + }; "marked-0.3.19" = { name = "marked"; packageName = "marked"; @@ -19214,6 +20070,15 @@ let sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d"; }; }; + "mdmanifest-1.0.8" = { + name = "mdmanifest"; + packageName = "mdmanifest"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/mdmanifest/-/mdmanifest-1.0.8.tgz"; + sha1 = "c04891883c28c83602e1d06b05a11037e359b4c8"; + }; + }; "mdn-data-1.1.4" = { name = "mdn-data"; packageName = "mdn-data"; @@ -19304,6 +20169,15 @@ let sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76"; }; }; + "mem-3.0.1" = { + name = "mem"; + packageName = "mem"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mem/-/mem-3.0.1.tgz"; + sha512 = "QKs47bslvOE0NbXOqG6lMxn6Bk0Iuw0vfrIeLykmQle2LkCw1p48dZDdzE+D88b/xqRJcZGcMNeDvSVma+NuIQ=="; + }; + }; "mem-fs-1.1.3" = { name = "mem-fs"; packageName = "mem-fs"; @@ -19795,7 +20669,7 @@ let packageName = "minimist"; version = "0.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; + url = "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; }; }; @@ -19804,7 +20678,7 @@ let packageName = "minimist"; version = "0.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; }; }; @@ -19813,7 +20687,7 @@ let packageName = "minimist"; version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz"; + url = "http://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz"; sha1 = "99df657a52574c21c9057497df742790b2b4c0de"; }; }; @@ -19822,7 +20696,7 @@ let packageName = "minimist"; version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz"; + url = "http://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz"; sha1 = "4dffe525dae2b864c66c2e23c6271d7afdecefce"; }; }; @@ -19831,7 +20705,7 @@ let packageName = "minimist"; version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; + url = "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; }; @@ -19912,7 +20786,7 @@ let packageName = "mkdirp"; version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"; + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"; sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e"; }; }; @@ -19921,7 +20795,7 @@ let packageName = "mkdirp"; version = "0.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; }; }; @@ -19930,7 +20804,7 @@ let packageName = "mkdirp"; version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz"; + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz"; sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12"; }; }; @@ -19939,7 +20813,7 @@ let packageName = "mkdirp"; version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; }; }; @@ -19975,7 +20849,7 @@ let packageName = "mocha"; version = "2.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-2.5.3.tgz"; + url = "http://registry.npmjs.org/mocha/-/mocha-2.5.3.tgz"; sha1 = "161be5bdeb496771eb9b35745050b622b5aefc58"; }; }; @@ -20029,7 +20903,7 @@ let packageName = "moment"; version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.1.0.tgz"; + url = "http://registry.npmjs.org/moment/-/moment-2.1.0.tgz"; sha1 = "1fd7b1134029a953c6ea371dbaee37598ac03567"; }; }; @@ -20056,7 +20930,7 @@ let packageName = "moment"; version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.7.0.tgz"; + url = "http://registry.npmjs.org/moment/-/moment-2.7.0.tgz"; sha1 = "359a19ec634cda3c706c8709adda54c0329aaec4"; }; }; @@ -20083,7 +20957,7 @@ let packageName = "mongoose"; version = "3.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/mongoose/-/mongoose-3.6.7.tgz"; + url = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.7.tgz"; sha1 = "aa6c9f4dfb740c7721dbe734fbb97714e5ab0ebc"; }; }; @@ -20096,6 +20970,15 @@ let sha1 = "3bac3f3924a845d147784fc6558dee900b0151e2"; }; }; + "monotonic-timestamp-0.0.9" = { + name = "monotonic-timestamp"; + packageName = "monotonic-timestamp"; + version = "0.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/monotonic-timestamp/-/monotonic-timestamp-0.0.9.tgz"; + sha1 = "5ba5adc7aac85e1d7ce77be847161ed246b39603"; + }; + }; "mooremachine-2.2.1" = { name = "mooremachine"; packageName = "mooremachine"; @@ -20110,7 +20993,7 @@ let packageName = "morgan"; version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/morgan/-/morgan-1.6.1.tgz"; + url = "http://registry.npmjs.org/morgan/-/morgan-1.6.1.tgz"; sha1 = "5fd818398c6819cba28a7cd6664f292fe1c0bbf2"; }; }; @@ -20155,7 +21038,7 @@ let packageName = "mpath"; version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/mpath/-/mpath-0.1.1.tgz"; + url = "http://registry.npmjs.org/mpath/-/mpath-0.1.1.tgz"; sha1 = "23da852b7c232ee097f4759d29c0ee9cd22d5e46"; }; }; @@ -20164,7 +21047,7 @@ let packageName = "mpath"; version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/mpath/-/mpath-0.2.1.tgz"; + url = "http://registry.npmjs.org/mpath/-/mpath-0.2.1.tgz"; sha1 = "3a4e829359801de96309c27a6b2e102e89f9e96e"; }; }; @@ -20339,6 +21222,24 @@ let sha1 = "6462f1b204109ccc644601650110a828443d66e2"; }; }; + "multiblob-1.13.0" = { + name = "multiblob"; + packageName = "multiblob"; + version = "1.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/multiblob/-/multiblob-1.13.0.tgz"; + sha1 = "e284d5e4a944e724bee2e3896cb3007f069a41bb"; + }; + }; + "multiblob-http-0.4.2" = { + name = "multiblob-http"; + packageName = "multiblob-http"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/multiblob-http/-/multiblob-http-0.4.2.tgz"; + sha512 = "hVaXryaqJ3vvKjRNcOCEadzgO99nR+haxlptswr3vRvgavbK/Y/I7/Nat12WIQno2/A8+nkbE+ZcrsN3UDbtQw=="; + }; + }; "multicast-dns-4.0.1" = { name = "multicast-dns"; packageName = "multicast-dns"; @@ -20429,6 +21330,15 @@ let sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"; }; }; + "multiserver-1.13.3" = { + name = "multiserver"; + packageName = "multiserver"; + version = "1.13.3"; + src = fetchurl { + url = "https://registry.npmjs.org/multiserver/-/multiserver-1.13.3.tgz"; + sha512 = "9x0bO59YVcfT1jNIBcqz1SUI+mPxQWjjPOTzmLew/VS17yot3JOXLloK6g1+ky+uj+AHqRhKfm1zUFMKhlfqWg=="; + }; + }; "multistream-2.1.1" = { name = "multistream"; packageName = "multistream"; @@ -20528,6 +21438,33 @@ let sha512 = "oprzxd2zhfrJqEuB98qc1dRMMonClBQ57UPDjnbcrah4orEMTq1jq3+AcdFe5ePzdbJXI7zmdhfftIdMnhYFoQ=="; }; }; + "muxrpc-6.4.1" = { + name = "muxrpc"; + packageName = "muxrpc"; + version = "6.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/muxrpc/-/muxrpc-6.4.1.tgz"; + sha512 = "r8+tucKMmQiYd8NWGQqAA5r+SlYuU30D/WbYo7E/PztG/jmizQJY5NfmLIJ+GWo+dEC6kIxkr0eY+U0uZexTNg=="; + }; + }; + "muxrpc-validation-2.0.1" = { + name = "muxrpc-validation"; + packageName = "muxrpc-validation"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/muxrpc-validation/-/muxrpc-validation-2.0.1.tgz"; + sha1 = "cd650d172025fe9d064230aab38ca6328dd16f2f"; + }; + }; + "muxrpcli-1.1.0" = { + name = "muxrpcli"; + packageName = "muxrpcli"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/muxrpcli/-/muxrpcli-1.1.0.tgz"; + sha1 = "4ae9ba986ab825c4a5c12fcb71c6daa81eab5158"; + }; + }; "mv-2.1.1" = { name = "mv"; packageName = "mv"; @@ -20627,13 +21564,13 @@ let sha512 = "4/uzl+LkMGoVv/9eMzH2QFvefmlJErT0KR7EmuYbmht2QvxSEqTjhFFOZ/KHE6chH58fKL3njrOcEwbYV0h9Yw=="; }; }; - "nanoid-1.2.1" = { + "nanoid-1.2.2" = { name = "nanoid"; packageName = "nanoid"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-1.2.1.tgz"; - sha512 = "S1QSG+TQtsqr2/ujHZcNT0OxygffUaUT755qTc/SPKfQ0VJBlOO6qb1425UYoHXPvCZ3pWgMVCuy1t7+AoCxnQ=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-1.2.2.tgz"; + sha512 = "o4eK+NomkjYEn6cN9rImXMz1st/LdRP+tricKyoH834ikDwp/M/PJlYWTd7E7/OhvObzLJpuuVvwjg+jDpD4hA=="; }; }; "nanolru-1.0.0" = { @@ -21114,7 +22051,7 @@ let packageName = "node-fetch"; version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.1.2.tgz"; + url = "http://registry.npmjs.org/node-fetch/-/node-fetch-2.1.2.tgz"; sha1 = "ab884e8e7e57e38a944753cec706f788d1768bb5"; }; }; @@ -21217,6 +22154,15 @@ let sha1 = "4fc4effbb02f241fb5082bd4fbab398e4aecb64d"; }; }; + "node-polyglot-1.0.0" = { + name = "node-polyglot"; + packageName = "node-polyglot"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-polyglot/-/node-polyglot-1.0.0.tgz"; + sha1 = "25b4d1d9d8eb02b48271c96000c4e6d366eef689"; + }; + }; "node-pre-gyp-0.6.39" = { name = "node-pre-gyp"; packageName = "node-pre-gyp"; @@ -21415,13 +22361,13 @@ let sha1 = "586db8101db30cb4438eb546737a41aad0cf13d5"; }; }; - "nodemon-1.18.3" = { + "nodemon-1.18.4" = { name = "nodemon"; packageName = "nodemon"; - version = "1.18.3"; + version = "1.18.4"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-1.18.3.tgz"; - sha512 = "XdVfAjGlDKU2nqoGgycxTndkJ5fdwvWJ/tlMGk2vHxMZBrSPVh86OM6z7viAv8BBJWjMgeuYQBofzr6LUoi+7g=="; + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.18.4.tgz"; + sha512 = "hyK6vl65IPnky/ee+D3IWvVGgJa/m3No2/Xc/3wanS6Ce1MWjCzH6NnhPJ/vZM+6JFym16jtHx51lmCMB9HDtg=="; }; }; "nodesecurity-npm-utils-6.0.0" = { @@ -21442,6 +22388,15 @@ let sha1 = "2151f722472ba79e50a76fc125bb8c8f2e4dc2a7"; }; }; + "non-private-ip-1.4.4" = { + name = "non-private-ip"; + packageName = "non-private-ip"; + version = "1.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/non-private-ip/-/non-private-ip-1.4.4.tgz"; + sha512 = "K9nTVFOGUOYutaG8ywiKpCdVu458RFxSgSJ0rribUxtf5iLM9B2+raFJgkID3p5op0+twmoQqFaPnu9KYz6qzg=="; + }; + }; "noop-logger-0.1.1" = { name = "noop-logger"; packageName = "noop-logger"; @@ -21532,6 +22487,15 @@ let sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; }; }; + "normalize-uri-1.1.1" = { + name = "normalize-uri"; + packageName = "normalize-uri"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-uri/-/normalize-uri-1.1.1.tgz"; + sha512 = "bui9/kzRGymbkxJsZEBZgDHK2WJWGOHzR0pCr404EpkpVFTkCOYaRwQTlehUE+7oI70mWNENncCWqUxT/icfHw=="; + }; + }; "normalize-url-2.0.1" = { name = "normalize-url"; packageName = "normalize-url"; @@ -21555,7 +22519,7 @@ let packageName = "npm"; version = "3.10.10"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-3.10.10.tgz"; + url = "http://registry.npmjs.org/npm/-/npm-3.10.10.tgz"; sha1 = "5b1d577e4c8869d6c8603bc89e9cd1637303e46e"; }; }; @@ -21649,6 +22613,15 @@ let sha512 = "q9zLP8cTr8xKPmMZN3naxp1k/NxVFsjxN6uWuO1tiw9gxg7wZWQ/b5UTfzD0ANw2q1lQxdLKTeCCksq+bPSgbQ=="; }; }; + "npm-prefix-1.2.0" = { + name = "npm-prefix"; + packageName = "npm-prefix"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-prefix/-/npm-prefix-1.2.0.tgz"; + sha1 = "e619455f7074ba54cc66d6d0d37dd9f1be6bcbc0"; + }; + }; "npm-registry-client-0.2.27" = { name = "npm-registry-client"; packageName = "npm-registry-client"; @@ -21807,7 +22780,7 @@ let packageName = "numeral"; version = "1.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/numeral/-/numeral-1.5.6.tgz"; + url = "http://registry.npmjs.org/numeral/-/numeral-1.5.6.tgz"; sha1 = "3831db968451b9cf6aff9bf95925f1ef8e37b33f"; }; }; @@ -21947,6 +22920,15 @@ let sha512 = "05KzQ70lSeGSrZJQXE5wNDiTkBJDlUT/myi6RX9dVIvz7a7Qh4oH93BQdiPMn27nldYvVQCKMUaM83AfizZlsQ=="; }; }; + "object-inspect-1.6.0" = { + name = "object-inspect"; + packageName = "object-inspect"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz"; + sha512 = "GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ=="; + }; + }; "object-keys-1.0.12" = { name = "object-keys"; packageName = "object-keys"; @@ -22046,12 +23028,48 @@ let sha1 = "e524da09b4f66ff05df457546ec72ac99f13069a"; }; }; + "observ-0.2.0" = { + name = "observ"; + packageName = "observ"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/observ/-/observ-0.2.0.tgz"; + sha1 = "0bc39b3e29faa5f9e6caa5906cb8392df400aa68"; + }; + }; + "observ-debounce-1.1.1" = { + name = "observ-debounce"; + packageName = "observ-debounce"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/observ-debounce/-/observ-debounce-1.1.1.tgz"; + sha1 = "304e97c85adda70ecd7f08da450678ef90f0b707"; + }; + }; + "obv-0.0.0" = { + name = "obv"; + packageName = "obv"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/obv/-/obv-0.0.0.tgz"; + sha1 = "edeab8468f91d4193362ed7f91d0b96dd39a79c1"; + }; + }; + "obv-0.0.1" = { + name = "obv"; + packageName = "obv"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/obv/-/obv-0.0.1.tgz"; + sha1 = "cb236106341536f0dac4815e06708221cad7fb5e"; + }; + }; "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"; + url = "http://registry.npmjs.org/octicons/-/octicons-3.5.0.tgz"; sha1 = "f7ff5935674d8b114f6d80c454bfaa01797a4e30"; }; }; @@ -22064,6 +23082,15 @@ let sha1 = "68c1b3c57ced778b4e67d8637d2559b2c1b3ec26"; }; }; + "on-change-network-0.0.2" = { + name = "on-change-network"; + packageName = "on-change-network"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/on-change-network/-/on-change-network-0.0.2.tgz"; + sha1 = "d977249477f91726949d80e82346dab6ef45216b"; + }; + }; "on-finished-2.2.1" = { name = "on-finished"; packageName = "on-finished"; @@ -22091,6 +23118,15 @@ let sha1 = "928f5d0f470d49342651ea6794b0857c100693f7"; }; }; + "on-wakeup-1.0.1" = { + name = "on-wakeup"; + packageName = "on-wakeup"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/on-wakeup/-/on-wakeup-1.0.1.tgz"; + sha1 = "00d79d987dde7c8117bee74bb4903f6f6dafa52b"; + }; + }; "once-1.1.1" = { name = "once"; packageName = "once"; @@ -22163,13 +23199,13 @@ let sha1 = "067428230fd67443b2794b22bba528b6867962d4"; }; }; - "ono-4.0.6" = { + "ono-4.0.7" = { name = "ono"; packageName = "ono"; - version = "4.0.6"; + version = "4.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/ono/-/ono-4.0.6.tgz"; - sha512 = "fJc3tfcgNzIEpDmZIyPRZkYrhoSoexXNnEN4I0QyVQ9l7NMw3sBFeG26/UpCdSXyAOr4wqr9+/ym/769sZakSw=="; + url = "https://registry.npmjs.org/ono/-/ono-4.0.7.tgz"; + sha512 = "FJiGEETwfSVyOwVTwQZD7XN69FRekvgtlobtvPwtilc7PxIHg3gKUykdNP7E9mC/VTF2cxqKZxUZfNKA3MuQLA=="; }; }; "open-0.0.2" = { @@ -22190,6 +23226,15 @@ let sha1 = "42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc"; }; }; + "opencollective-postinstall-2.0.0" = { + name = "opencollective-postinstall"; + packageName = "opencollective-postinstall"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.0.tgz"; + sha512 = "XAe80GycLe2yRGnJsUtt+EO5lk06XYRQt4kJJe53O2kJHPZJOZ+XMF/b47HW96e6LhfKVpwnXVr/s56jhV98jg=="; + }; + }; "opener-1.4.2" = { name = "opener"; packageName = "opener"; @@ -22393,7 +23438,7 @@ let packageName = "os-locale"; version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz"; + url = "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz"; sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9"; }; }; @@ -22406,6 +23451,15 @@ let sha512 = "3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA=="; }; }; + "os-locale-3.0.0" = { + name = "os-locale"; + packageName = "os-locale"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-locale/-/os-locale-3.0.0.tgz"; + sha512 = "4mi6ZXIp4OtcV/Bwzl9p9Cvae7KJv/czGIm/HK0iaXCuRh7BMpy4l4o4CLjN+atsRQpCW9Rs4FdhfnK0zaR1Jg=="; + }; + }; "os-name-1.0.3" = { name = "os-name"; packageName = "os-name"; @@ -22568,6 +23622,15 @@ let sha1 = "bf98fe575705658a9e1351befb85ae4c1f07bdca"; }; }; + "p-pipe-1.2.0" = { + name = "p-pipe"; + packageName = "p-pipe"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-pipe/-/p-pipe-1.2.0.tgz"; + sha1 = "4b1a11399a11520a67790ee5a0c1d5881d6befe9"; + }; + }; "p-reduce-1.0.0" = { name = "p-reduce"; packageName = "p-reduce"; @@ -22685,6 +23748,24 @@ let sha1 = "5860587a944873a6b7e6d26e8e51ffb22315bf17"; }; }; + "packet-stream-2.0.4" = { + name = "packet-stream"; + packageName = "packet-stream"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/packet-stream/-/packet-stream-2.0.4.tgz"; + sha512 = "7+oxHdMMs6VhLvvbrDUc8QNuelE9fPKLDdToXBIKLPKOlnoBeMim+/35edp+AnFTLzk3xcogVvQ/jrZyyGsEiw=="; + }; + }; + "packet-stream-codec-1.1.2" = { + name = "packet-stream-codec"; + packageName = "packet-stream-codec"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/packet-stream-codec/-/packet-stream-codec-1.1.2.tgz"; + sha1 = "79b302fc144cdfbb4ab6feba7040e6a5d99c79c7"; + }; + }; "pacote-9.1.0" = { name = "pacote"; packageName = "pacote"; @@ -22766,6 +23847,15 @@ let sha512 = "KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw=="; }; }; + "parse-entities-1.1.2" = { + name = "parse-entities"; + packageName = "parse-entities"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.2.tgz"; + sha512 = "5N9lmQ7tmxfXf+hO3X6KRG6w7uYO/HL9fHalSySTdyn63C3WNvTM/1R8tn1u1larNcEbo3Slcy2bsVDQqvEpUg=="; + }; + }; "parse-filepath-1.0.2" = { name = "parse-filepath"; packageName = "parse-filepath"; @@ -22964,15 +24054,6 @@ let 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"; @@ -23225,13 +24306,13 @@ let sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; }; }; - "path-loader-1.0.7" = { + "path-loader-1.0.8" = { name = "path-loader"; packageName = "path-loader"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.7.tgz"; - sha512 = "FIorK5Wwz8LzyklCCsPnHI2ieelYbnnGvEtBC4DxW8MkdzBbGKKhxoDH1pDPnQN5ll+gT7t77fac/VD7Vi1kFA=="; + url = "https://registry.npmjs.org/path-loader/-/path-loader-1.0.8.tgz"; + sha512 = "/JQCrTcrteaPB8IHefEAQbmBQReKj51A+yTyc745TBbO4FOySw+/l3Rh0zyad0Nrd87TMROlmFANQwCRsuvN4w=="; }; }; "path-parse-1.0.6" = { @@ -23523,22 +24604,13 @@ let sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; }; }; - "pino-4.17.6" = { + "pino-5.0.4" = { name = "pino"; packageName = "pino"; - version = "4.17.6"; + version = "5.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-4.17.6.tgz"; - sha512 = "LFDwmhyWLBnmwO/2UFbWu1jEGVDzaPupaVdx0XcZ3tIAx1EDEBauzxXf2S0UcFK7oe+X9MApjH0hx9U1XMgfCA=="; - }; - }; - "pino-5.0.0-rc.4" = { - name = "pino"; - packageName = "pino"; - version = "5.0.0-rc.4"; - src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-5.0.0-rc.4.tgz"; - sha512 = "n5aJmABDjzZbwrB0AEbUeugz1Rh55c9T62yVGv6YL1vP1GuqpjIcLgwZIM1SI8E4Nfmcoo46SSmPgSSA9mPdog=="; + url = "https://registry.npmjs.org/pino/-/pino-5.0.4.tgz"; + sha512 = "w7UohXesFggN77UyTnt0A7FqkEiq6TbeXgTvY7g1wFGXoGbxmF780uFm8oQKaWlFi7vnzDRkBnYHNaaHFUKEoQ=="; }; }; "pino-std-serializers-2.2.1" = { @@ -23676,6 +24748,15 @@ let sha512 = "L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA=="; }; }; + "plur-2.1.2" = { + name = "plur"; + packageName = "plur"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz"; + sha1 = "7482452c1a0f508e3e344eaec312c91c29dc655a"; + }; + }; "pluralize-1.2.1" = { name = "pluralize"; packageName = "pluralize"; @@ -23811,6 +24892,15 @@ let sha1 = "d9ae0ca85330e03962d93292f95a8b44c2ebf505"; }; }; + "prebuild-install-4.0.0" = { + name = "prebuild-install"; + packageName = "prebuild-install"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-4.0.0.tgz"; + sha512 = "7tayxeYboJX0RbVzdnKyGl2vhQRWr6qfClEXDhOkXjuaOKCw2q8aiuFhONRYVsG/czia7KhpykIlI2S2VaPunA=="; + }; + }; "precond-0.2.3" = { name = "precond"; packageName = "precond"; @@ -23906,7 +24996,7 @@ let packageName = "printf"; version = "0.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/printf/-/printf-0.2.5.tgz"; + url = "http://registry.npmjs.org/printf/-/printf-0.2.5.tgz"; sha1 = "c438ca2ca33e3927671db4ab69c0e52f936a4f0f"; }; }; @@ -23946,6 +25036,15 @@ let sha512 = "VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="; }; }; + "private-box-0.2.1" = { + name = "private-box"; + packageName = "private-box"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/private-box/-/private-box-0.2.1.tgz"; + sha1 = "1df061afca5b3039c7feaadd0daf0f56f07e3ec0"; + }; + }; "probe-image-size-4.0.0" = { name = "probe-image-size"; packageName = "probe-image-size"; @@ -24450,6 +25549,60 @@ let sha1 = "c00d5c5128bac5806bec15d2b7e7cdabe42531f3"; }; }; + "pull-abortable-4.0.0" = { + name = "pull-abortable"; + packageName = "pull-abortable"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-abortable/-/pull-abortable-4.0.0.tgz"; + sha1 = "7017a984c3b834de77bac38c10b776f22dfc1843"; + }; + }; + "pull-abortable-4.1.1" = { + name = "pull-abortable"; + packageName = "pull-abortable"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-abortable/-/pull-abortable-4.1.1.tgz"; + sha1 = "b3ad5aefb4116b25916d26db89393ac98d0dcea1"; + }; + }; + "pull-block-filter-1.0.0" = { + name = "pull-block-filter"; + packageName = "pull-block-filter"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-block-filter/-/pull-block-filter-1.0.0.tgz"; + sha1 = "cf4ef3bbb91ec8b97e1ed31889a6691271e603a7"; + }; + }; + "pull-box-stream-1.0.13" = { + name = "pull-box-stream"; + packageName = "pull-box-stream"; + version = "1.0.13"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-box-stream/-/pull-box-stream-1.0.13.tgz"; + sha1 = "c3e240398eab3f5951b2ed1078c5988bf7a0a2b9"; + }; + }; + "pull-buffered-0.3.4" = { + name = "pull-buffered"; + packageName = "pull-buffered"; + version = "0.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-buffered/-/pull-buffered-0.3.4.tgz"; + sha512 = "rs5MtSaB1LQfXyer2uderwS4ypsTdmh9VC4wZC0WZsIBKqHiy7tFqNZ0QP1ln544N+yQGXEBRbwYn59iO6Ub9w=="; + }; + }; + "pull-cache-0.0.0" = { + name = "pull-cache"; + packageName = "pull-cache"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-cache/-/pull-cache-0.0.0.tgz"; + sha1 = "f9b81fa689ecf2a2d8f10f78ace63bd58980e7bb"; + }; + }; "pull-cat-1.1.11" = { name = "pull-cat"; packageName = "pull-cat"; @@ -24459,6 +25612,42 @@ let sha1 = "b642dd1255da376a706b6db4fa962f5fdb74c31b"; }; }; + "pull-cont-0.0.0" = { + name = "pull-cont"; + packageName = "pull-cont"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-cont/-/pull-cont-0.0.0.tgz"; + sha1 = "3fac48b81ac97b75ba01332088b0ce7af8c1be0e"; + }; + }; + "pull-cont-0.1.1" = { + name = "pull-cont"; + packageName = "pull-cont"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-cont/-/pull-cont-0.1.1.tgz"; + sha1 = "df1d580e271757ba9acbaeba20de2421d660d618"; + }; + }; + "pull-core-1.1.0" = { + name = "pull-core"; + packageName = "pull-core"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-core/-/pull-core-1.1.0.tgz"; + sha1 = "3d8127d6dac1475705c9800961f59d66c8046c8a"; + }; + }; + "pull-cursor-3.0.0" = { + name = "pull-cursor"; + packageName = "pull-cursor"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-cursor/-/pull-cursor-3.0.0.tgz"; + sha512 = "95lZVSF2eSEdOmUtlOBaD9p5YOvlYeCr5FBv2ySqcj/4rpaXI6d8OH+zPHHjKAf58R8QXJRZuyfHkcCX8TZbAg=="; + }; + }; "pull-defer-0.2.3" = { name = "pull-defer"; packageName = "pull-defer"; @@ -24468,6 +25657,159 @@ let sha512 = "/An3KE7mVjZCqNhZsr22k1Tx8MACnUnHZZNPSJ0S62td8JtYr/AiRG42Vz7Syu31SoTLUzVIe61jtT/pNdjVYA=="; }; }; + "pull-file-0.5.0" = { + name = "pull-file"; + packageName = "pull-file"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-file/-/pull-file-0.5.0.tgz"; + sha1 = "b3ca405306e082f9d4528288933badb2b656365b"; + }; + }; + "pull-file-1.1.0" = { + name = "pull-file"; + packageName = "pull-file"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-file/-/pull-file-1.1.0.tgz"; + sha1 = "1dd987605d6357a0d23c1e4b826f7915a215129c"; + }; + }; + "pull-flatmap-0.0.1" = { + name = "pull-flatmap"; + packageName = "pull-flatmap"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-flatmap/-/pull-flatmap-0.0.1.tgz"; + sha1 = "13d494453e8f6d478e7bbfade6f8fe0197fa6bb7"; + }; + }; + "pull-fs-1.1.6" = { + name = "pull-fs"; + packageName = "pull-fs"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-fs/-/pull-fs-1.1.6.tgz"; + sha1 = "f184f6a7728bb4d95641376bead69f6f66df47cd"; + }; + }; + "pull-git-pack-1.0.2" = { + name = "pull-git-pack"; + packageName = "pull-git-pack"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-git-pack/-/pull-git-pack-1.0.2.tgz"; + sha512 = "WZzAAs9ap+QBHliP3E7sCn9kRfMNbdtFVOU0wRRtbY8x6+SUGeCpIkeYUcl9K/KgkL+2XZeyKXzPZ688IyfMbQ=="; + }; + }; + "pull-git-pack-concat-0.2.1" = { + name = "pull-git-pack-concat"; + packageName = "pull-git-pack-concat"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-git-pack-concat/-/pull-git-pack-concat-0.2.1.tgz"; + sha1 = "b7c8334c3a4961fc5b595a34d1d4224da6082d55"; + }; + }; + "pull-git-packidx-parser-1.0.0" = { + name = "pull-git-packidx-parser"; + packageName = "pull-git-packidx-parser"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-git-packidx-parser/-/pull-git-packidx-parser-1.0.0.tgz"; + sha1 = "2d8bf0afe4824897ee03840bfe4f5a86afecca21"; + }; + }; + "pull-git-remote-helper-2.0.0" = { + name = "pull-git-remote-helper"; + packageName = "pull-git-remote-helper"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-git-remote-helper/-/pull-git-remote-helper-2.0.0.tgz"; + sha1 = "7285269ca0968466e3812431ddc2ac357df141be"; + }; + }; + "pull-git-repo-1.2.1" = { + name = "pull-git-repo"; + packageName = "pull-git-repo"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-git-repo/-/pull-git-repo-1.2.1.tgz"; + sha512 = "nHOicXiFryxuO9J+EhYY0cFC4n4mvsDabj6ts6BYgRbWAbp/gQUa+Hzfy05uey+HLz7XaR7N8XC+xGBgsYCmsg=="; + }; + }; + "pull-glob-1.0.7" = { + name = "pull-glob"; + packageName = "pull-glob"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-glob/-/pull-glob-1.0.7.tgz"; + sha1 = "eef915dde644bddbea8dd2e0106d544aacbcd5c2"; + }; + }; + "pull-goodbye-0.0.2" = { + name = "pull-goodbye"; + packageName = "pull-goodbye"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-goodbye/-/pull-goodbye-0.0.2.tgz"; + sha1 = "8d8357db55e22a710dfff0f16a8c90b45efe4171"; + }; + }; + "pull-handshake-1.1.4" = { + name = "pull-handshake"; + packageName = "pull-handshake"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-handshake/-/pull-handshake-1.1.4.tgz"; + sha1 = "6000a0fd018884cdfd737254f8cc60ab2a637791"; + }; + }; + "pull-hash-1.0.0" = { + name = "pull-hash"; + packageName = "pull-hash"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-hash/-/pull-hash-1.0.0.tgz"; + sha1 = "fcad4d2507bf2c2b3231f653dc9bfb2db4f0d88c"; + }; + }; + "pull-hyperscript-0.2.2" = { + name = "pull-hyperscript"; + packageName = "pull-hyperscript"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-hyperscript/-/pull-hyperscript-0.2.2.tgz"; + sha1 = "ca4a65833631854f575a4e2985568c9901f56383"; + }; + }; + "pull-identify-filetype-1.1.0" = { + name = "pull-identify-filetype"; + packageName = "pull-identify-filetype"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-identify-filetype/-/pull-identify-filetype-1.1.0.tgz"; + sha1 = "5f99af15e8846d48ecf625edc248ec2cf57f6b0d"; + }; + }; + "pull-inactivity-2.1.2" = { + name = "pull-inactivity"; + packageName = "pull-inactivity"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-inactivity/-/pull-inactivity-2.1.2.tgz"; + sha1 = "37a3d6ebbfac292cd435f5e481e5074c8c1fad75"; + }; + }; + "pull-kvdiff-0.0.0" = { + name = "pull-kvdiff"; + packageName = "pull-kvdiff"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-kvdiff/-/pull-kvdiff-0.0.0.tgz"; + sha1 = "9b6627d0e332d98288e47d471602161f41ff1353"; + }; + }; "pull-level-2.0.4" = { name = "pull-level"; packageName = "pull-level"; @@ -24486,6 +25828,78 @@ let sha1 = "a4ecee01e330155e9124bbbcf4761f21b38f51f5"; }; }; + "pull-looper-1.0.0" = { + name = "pull-looper"; + packageName = "pull-looper"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-looper/-/pull-looper-1.0.0.tgz"; + sha512 = "djlD60A6NGe5goLdP5pgbqzMEiWmk1bInuAzBp0QOH4vDrVwh05YDz6UP8+pOXveKEk8wHVP+rB2jBrK31QMPA=="; + }; + }; + "pull-many-1.0.8" = { + name = "pull-many"; + packageName = "pull-many"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-many/-/pull-many-1.0.8.tgz"; + sha1 = "3dadd9b6d156c545721bda8d0003dd8eaa06293e"; + }; + }; + "pull-next-1.0.1" = { + name = "pull-next"; + packageName = "pull-next"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-next/-/pull-next-1.0.1.tgz"; + sha1 = "03f4d7d19872fc1114161e88db6ecf4c65e61e56"; + }; + }; + "pull-notify-0.1.1" = { + name = "pull-notify"; + packageName = "pull-notify"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-notify/-/pull-notify-0.1.1.tgz"; + sha1 = "6f86ff95d270b89c3ebf255b6031b7032dc99cca"; + }; + }; + "pull-paginate-1.0.0" = { + name = "pull-paginate"; + packageName = "pull-paginate"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-paginate/-/pull-paginate-1.0.0.tgz"; + sha1 = "63ad58efa1066bc701aa581a98a3c41e6aec7fc2"; + }; + }; + "pull-pair-1.1.0" = { + name = "pull-pair"; + packageName = "pull-pair"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-pair/-/pull-pair-1.1.0.tgz"; + sha1 = "7ee427263fdf4da825397ac0a05e1ab4b74bd76d"; + }; + }; + "pull-paramap-1.2.2" = { + name = "pull-paramap"; + packageName = "pull-paramap"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-paramap/-/pull-paramap-1.2.2.tgz"; + sha1 = "51a4193ce9c8d7215d95adad45e2bcdb8493b23a"; + }; + }; + "pull-ping-2.0.2" = { + name = "pull-ping"; + packageName = "pull-ping"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-ping/-/pull-ping-2.0.2.tgz"; + sha1 = "7bc4a340167dad88f682a196c63485735c7a0894"; + }; + }; "pull-pushable-2.2.0" = { name = "pull-pushable"; packageName = "pull-pushable"; @@ -24495,6 +25909,69 @@ let sha1 = "5f2f3aed47ad86919f01b12a2e99d6f1bd776581"; }; }; + "pull-rate-1.0.2" = { + name = "pull-rate"; + packageName = "pull-rate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-rate/-/pull-rate-1.0.2.tgz"; + sha1 = "17b231ad5f359f675826670172b0e590c8964e8d"; + }; + }; + "pull-reader-1.3.1" = { + name = "pull-reader"; + packageName = "pull-reader"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-reader/-/pull-reader-1.3.1.tgz"; + sha512 = "CBkejkE5nX50SiSEzu0Qoz4POTJMS/mw8G6aj3h3M/RJoKgggLxyF0IyTZ0mmpXFlXRcLmLmIEW4xeYn7AeDYw=="; + }; + }; + "pull-sink-through-0.0.0" = { + name = "pull-sink-through"; + packageName = "pull-sink-through"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-sink-through/-/pull-sink-through-0.0.0.tgz"; + sha1 = "d3c0492f3a80b4ed204af67c4b4f935680fc5b1f"; + }; + }; + "pull-skip-footer-0.1.0" = { + name = "pull-skip-footer"; + packageName = "pull-skip-footer"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-skip-footer/-/pull-skip-footer-0.1.0.tgz"; + sha1 = "95d0c60ce6ea9c8bab8ca0b16e1f518352ed4e4f"; + }; + }; + "pull-stream-2.27.0" = { + name = "pull-stream"; + packageName = "pull-stream"; + version = "2.27.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-stream/-/pull-stream-2.27.0.tgz"; + sha1 = "fdf0eb910cdc4041d65956c00bee30dbbd00a068"; + }; + }; + "pull-stream-2.28.4" = { + name = "pull-stream"; + packageName = "pull-stream"; + version = "2.28.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-stream/-/pull-stream-2.28.4.tgz"; + sha1 = "7ea97413c1619c20bc3bdf9e10e91347b03253e4"; + }; + }; + "pull-stream-3.5.0" = { + name = "pull-stream"; + packageName = "pull-stream"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.5.0.tgz"; + sha1 = "1ee5b6f76fd3b3a49a5afb6ded5c0320acb3cfc7"; + }; + }; "pull-stream-3.6.9" = { name = "pull-stream"; packageName = "pull-stream"; @@ -24504,6 +25981,51 @@ let sha512 = "hJn4POeBrkttshdNl0AoSCVjMVSuBwuHocMerUdoZ2+oIUzrWHFTwJMlbHND7OiKLVgvz6TFj8ZUVywUMXccbw=="; }; }; + "pull-stream-to-stream-1.3.4" = { + name = "pull-stream-to-stream"; + packageName = "pull-stream-to-stream"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-stream-to-stream/-/pull-stream-to-stream-1.3.4.tgz"; + sha1 = "3f81d8216bd18d2bfd1a198190471180e2738399"; + }; + }; + "pull-stringify-1.2.2" = { + name = "pull-stringify"; + packageName = "pull-stringify"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-stringify/-/pull-stringify-1.2.2.tgz"; + sha1 = "5a1c34e0075faf2f2f6d46004e36dccd33bd7c7c"; + }; + }; + "pull-through-1.0.18" = { + name = "pull-through"; + packageName = "pull-through"; + version = "1.0.18"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-through/-/pull-through-1.0.18.tgz"; + sha1 = "8dd62314263e59cf5096eafbb127a2b6ef310735"; + }; + }; + "pull-traverse-1.0.3" = { + name = "pull-traverse"; + packageName = "pull-traverse"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-traverse/-/pull-traverse-1.0.3.tgz"; + sha1 = "74fb5d7be7fa6bd7a78e97933e199b7945866938"; + }; + }; + "pull-utf8-decoder-1.0.2" = { + name = "pull-utf8-decoder"; + packageName = "pull-utf8-decoder"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-utf8-decoder/-/pull-utf8-decoder-1.0.2.tgz"; + sha1 = "a7afa2384d1e6415a5d602054126cc8de3bcbce7"; + }; + }; "pull-window-2.1.4" = { name = "pull-window"; packageName = "pull-window"; @@ -24513,6 +26035,33 @@ let sha1 = "fc3b86feebd1920c7ae297691e23f705f88552f0"; }; }; + "pull-write-1.1.4" = { + name = "pull-write"; + packageName = "pull-write"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-write/-/pull-write-1.1.4.tgz"; + sha1 = "dddea31493b48f6768b84a281d01eb3b531fe0b8"; + }; + }; + "pull-write-file-0.2.4" = { + name = "pull-write-file"; + packageName = "pull-write-file"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-write-file/-/pull-write-file-0.2.4.tgz"; + sha1 = "437344aeb2189f65e678ed1af37f0f760a5453ef"; + }; + }; + "pull-ws-3.3.1" = { + name = "pull-ws"; + packageName = "pull-ws"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-ws/-/pull-ws-3.3.1.tgz"; + sha512 = "kJodbLQT+oKjcRIQO+vQNw6xWBuEo7Kxp51VMOvb6cvPvHYA+aNLzm+NmkB/5dZwbuTRYGMal9QPvH52tzM1ZA=="; + }; + }; "pump-0.3.5" = { name = "pump"; packageName = "pump"; @@ -24585,6 +26134,24 @@ let sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; + "push-stream-10.0.3" = { + name = "push-stream"; + packageName = "push-stream"; + version = "10.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/push-stream/-/push-stream-10.0.3.tgz"; + sha1 = "13d6aef4b506c65bbc3aa62409a8da6ce147ef87"; + }; + }; + "push-stream-to-pull-stream-1.0.3" = { + name = "push-stream-to-pull-stream"; + packageName = "push-stream-to-pull-stream"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/push-stream-to-pull-stream/-/push-stream-to-pull-stream-1.0.3.tgz"; + sha512 = "pdE/OKi/jnp9DqGgNRzLY0oVHffn/8TXJmBPzv+ikdvpkeA0J//l5d7TZk1yWwZj9P0JcOIEVDOuHzhXaeBlmw=="; + }; + }; "q-1.0.1" = { name = "q"; packageName = "q"; @@ -24828,15 +26395,6 @@ let sha1 = "9ec61f79049875707d69414596fd907a4d711e73"; }; }; - "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/quick-format-unescaped/-/quick-format-unescaped-1.1.2.tgz"; - sha1 = "0ca581de3174becef25ac3c2e8956342381db698"; - }; - }; "quick-format-unescaped-3.0.0" = { name = "quick-format-unescaped"; packageName = "quick-format-unescaped"; @@ -25071,6 +26629,15 @@ let sha1 = "ce24a2029ad94c3a40d09604a87227027d7210d3"; }; }; + "rc-0.5.5" = { + name = "rc"; + packageName = "rc"; + version = "0.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/rc/-/rc-0.5.5.tgz"; + sha1 = "541cc3300f464b6dfe6432d756f0f2dd3e9eb199"; + }; + }; "rc-1.2.8" = { name = "rc"; packageName = "rc"; @@ -25557,6 +27124,15 @@ let sha1 = "120903040588ec7a4a399c6547fd01d0e3d2dc63"; }; }; + "relative-url-1.0.2" = { + name = "relative-url"; + packageName = "relative-url"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/relative-url/-/relative-url-1.0.2.tgz"; + sha1 = "d21c52a72d6061018bcee9f9c9fc106bf7d65287"; + }; + }; "relaxed-json-1.0.1" = { name = "relaxed-json"; packageName = "relaxed-json"; @@ -25566,6 +27142,24 @@ let sha1 = "7c8d4aa2f095704cd020e32e8099bcae103f0bd4"; }; }; + "remark-3.2.3" = { + name = "remark"; + packageName = "remark"; + version = "3.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/remark/-/remark-3.2.3.tgz"; + sha1 = "802a38c3aa98c9e1e3ea015eeba211d27cb65e1f"; + }; + }; + "remark-html-2.0.2" = { + name = "remark-html"; + packageName = "remark-html"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-html/-/remark-html-2.0.2.tgz"; + sha1 = "592a347bdd3d5881f4f080c98b5b152fb1407a92"; + }; + }; "remove-array-items-1.0.0" = { name = "remove-array-items"; packageName = "remove-array-items"; @@ -25593,6 +27187,15 @@ let sha1 = "05f1a593f16e42e1fb90ebf59de8e569525f9523"; }; }; + "remove-markdown-0.1.0" = { + name = "remove-markdown"; + packageName = "remove-markdown"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remove-markdown/-/remove-markdown-0.1.0.tgz"; + sha1 = "cf8b66e9e6fcb4acc9721048adeee7a357698ba9"; + }; + }; "remove-trailing-separator-1.1.0" = { name = "remove-trailing-separator"; packageName = "remove-trailing-separator"; @@ -25697,7 +27300,7 @@ let packageName = "request"; version = "2.16.6"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.16.6.tgz"; + url = "http://registry.npmjs.org/request/-/request-2.16.6.tgz"; sha1 = "872fe445ae72de266b37879d6ad7dc948fa01cad"; }; }; @@ -25706,7 +27309,7 @@ let packageName = "request"; version = "2.67.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.67.0.tgz"; + url = "http://registry.npmjs.org/request/-/request-2.67.0.tgz"; sha1 = "8af74780e2bf11ea0ae9aa965c11f11afd272742"; }; }; @@ -25715,7 +27318,7 @@ let packageName = "request"; version = "2.74.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.74.0.tgz"; + url = "http://registry.npmjs.org/request/-/request-2.74.0.tgz"; sha1 = "7693ca768bbb0ea5c8ce08c084a45efa05b892ab"; }; }; @@ -25724,7 +27327,7 @@ let packageName = "request"; version = "2.79.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz"; + url = "http://registry.npmjs.org/request/-/request-2.79.0.tgz"; sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de"; }; }; @@ -25769,7 +27372,7 @@ let packageName = "request"; version = "2.9.203"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.9.203.tgz"; + url = "http://registry.npmjs.org/request/-/request-2.9.203.tgz"; sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a"; }; }; @@ -25890,6 +27493,15 @@ let sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; }; }; + "resolve-1.7.1" = { + name = "resolve"; + packageName = "resolve"; + version = "1.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz"; + sha512 = "c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw=="; + }; + }; "resolve-1.8.1" = { name = "resolve"; packageName = "resolve"; @@ -26129,7 +27741,7 @@ let packageName = "rimraf"; version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz"; + url = "http://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz"; sha1 = "5a6eb62eeda068f51ede50f29b3e5cd22f3d9bb2"; }; }; @@ -26138,7 +27750,7 @@ let packageName = "rimraf"; version = "2.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; + url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; }; }; @@ -26147,7 +27759,7 @@ let packageName = "rimraf"; version = "2.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz"; + url = "http://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz"; sha1 = "b528ce2ebe0e6d89fb03b265de11d61da0dbcf82"; }; }; @@ -26156,7 +27768,7 @@ let packageName = "rimraf"; version = "2.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz"; + url = "http://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz"; sha1 = "ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da"; }; }; @@ -26340,22 +27952,22 @@ let sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be"; }; }; - "rxjs-5.5.11" = { + "rxjs-5.5.12" = { name = "rxjs"; packageName = "rxjs"; - version = "5.5.11"; + version = "5.5.12"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.11.tgz"; - sha512 = "3bjO7UwWfA2CV7lmwYMBzj4fQ6Cq+ftHc2MvUe+WMS7wcdJ1LosDWmdjPQanYp2dBRj572p7PeU81JUxHKOcBA=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.12.tgz"; + sha512 = "xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw=="; }; }; - "rxjs-6.2.2" = { + "rxjs-6.3.1" = { name = "rxjs"; packageName = "rxjs"; - version = "6.2.2"; + version = "6.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz"; - sha512 = "0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.3.1.tgz"; + sha512 = "hRVfb1Mcf8rLXq1AZEjYpzBnQbO7Duveu1APXkWRTvqzhmkoQ40Pl2F9Btacx+gJCOqsMiugCGG4I2HPQgJRtA=="; }; }; "safe-buffer-5.0.1" = { @@ -26520,6 +28132,24 @@ let sha512 = "MuCAyrGZcTLfQoH2XoBlQ8C6bzwN88XT/0slOGz0pn8+gIP85BOAfYa44ZXQUTOwRwPU0QvgU+V+OSajl/59Xg=="; }; }; + "secret-handshake-1.1.13" = { + name = "secret-handshake"; + packageName = "secret-handshake"; + version = "1.1.13"; + src = fetchurl { + url = "https://registry.npmjs.org/secret-handshake/-/secret-handshake-1.1.13.tgz"; + sha512 = "jDpA1kPJGg+jEUOZGvqksQFGPWIx0aA96HpjU+AqIBKIKzmvZeOq0Lfl/XqVC5jviWTVZZM2B8+NqYR38Blz8A=="; + }; + }; + "secret-stack-4.1.0" = { + name = "secret-stack"; + packageName = "secret-stack"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/secret-stack/-/secret-stack-4.1.0.tgz"; + sha512 = "tCxjylkvEvUqxlWSVALtPMGKGyed225oDf7zoxCOsvj5SaVolUzOaixS07IK74mjcq7D1TvEJ4kofcaTMhQq1w=="; + }; + }; "secure-keys-1.0.0" = { name = "secure-keys"; packageName = "secure-keys"; @@ -26529,6 +28159,15 @@ let sha1 = "f0c82d98a3b139a8776a8808050b824431087fca"; }; }; + "secure-scuttlebutt-18.2.0" = { + name = "secure-scuttlebutt"; + packageName = "secure-scuttlebutt"; + version = "18.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/secure-scuttlebutt/-/secure-scuttlebutt-18.2.0.tgz"; + sha512 = "rBK6P3A4MsZI4lrzaf/dbJJDIxuJXO6y3GUeNngb5IJlcagCNJ+zNZcd19rDURfU8tMgOyw+rEwGIs2ExLQTdg=="; + }; + }; "seek-bzip-1.0.5" = { name = "seek-bzip"; packageName = "seek-bzip"; @@ -26781,6 +28420,15 @@ let sha1 = "33279100c35c38519ca5e435245186c512fe0fdc"; }; }; + "separator-escape-0.0.0" = { + name = "separator-escape"; + packageName = "separator-escape"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/separator-escape/-/separator-escape-0.0.0.tgz"; + sha1 = "e433676932020454e3c14870c517ea1de56c2fa4"; + }; + }; "sequence-2.2.1" = { name = "sequence"; packageName = "sequence"; @@ -26988,6 +28636,15 @@ let sha512 = "QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ=="; }; }; + "sha.js-2.4.5" = { + name = "sha.js"; + packageName = "sha.js"; + version = "2.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.5.tgz"; + sha1 = "27d171efcc82a118b99639ff581660242b506e7c"; + }; + }; "shallow-clone-0.1.2" = { name = "shallow-clone"; packageName = "shallow-clone"; @@ -27078,6 +28735,15 @@ let sha512 = "pRXeNrCA2Wd9itwhvLp5LZQvPJ0wU6bcjaTMywHHGX5XWhVN2nzSu7WV0q+oUY7mGK3mgSkDDzP3MgjqdyIgbQ=="; }; }; + "shellsubstitute-1.2.0" = { + name = "shellsubstitute"; + packageName = "shellsubstitute"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shellsubstitute/-/shellsubstitute-1.2.0.tgz"; + sha1 = "e4f702a50c518b0f6fe98451890d705af29b6b70"; + }; + }; "shellwords-0.1.1" = { name = "shellwords"; packageName = "shellwords"; @@ -27888,6 +29554,33 @@ let sha512 = "Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw=="; }; }; + "sodium-browserify-1.2.4" = { + name = "sodium-browserify"; + packageName = "sodium-browserify"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sodium-browserify/-/sodium-browserify-1.2.4.tgz"; + sha512 = "IYcxKje/uf/c3a7VhZYJLlUxWMcktfbD4AjqHjUD1/VWKjj0Oq5wNbX8wjJOWVO9UhUMqJQiOn2xFbzKWBmy5w=="; + }; + }; + "sodium-browserify-tweetnacl-0.2.3" = { + name = "sodium-browserify-tweetnacl"; + packageName = "sodium-browserify-tweetnacl"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sodium-browserify-tweetnacl/-/sodium-browserify-tweetnacl-0.2.3.tgz"; + sha1 = "b5537ffcbb9f74ebc443b8b6a211b291e8fcbc8e"; + }; + }; + "sodium-chloride-1.1.0" = { + name = "sodium-chloride"; + packageName = "sodium-chloride"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sodium-chloride/-/sodium-chloride-1.1.0.tgz"; + sha1 = "247a234b88867f6dff51332b605f193a65bf6839"; + }; + }; "sodium-javascript-0.5.5" = { name = "sodium-javascript"; packageName = "sodium-javascript"; @@ -27915,13 +29608,13 @@ let sha512 = "csdVyakzHJRyCevY4aZC2Eacda8paf+4nmRGF2N7KxCLKY2Ajn72JsExaQlJQ2BiXJncp44p3T+b80cU+2TTsg=="; }; }; - "sonic-boom-0.5.0" = { + "sonic-boom-0.6.1" = { name = "sonic-boom"; packageName = "sonic-boom"; - version = "0.5.0"; + version = "0.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-0.5.0.tgz"; - sha512 = "IqUrLNxgsUQGVyMLW8w8vELMa1BZIQ/uBjBuxLK0jg7HqWwedCgmBLqvgMFGihhXCoQ8w5m2vcnMs47C4KYxuQ=="; + url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-0.6.1.tgz"; + sha512 = "3qx6XXDeG+hPNa+jla1H6BMBLcjLl8L8NRERLVeIf/EuPqoqmq4K8owG29Xu7OypT/7/YT/0uKW6YitsKA+nLQ=="; }; }; "sorcery-0.10.0" = { @@ -28275,6 +29968,15 @@ let sha512 = "mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg=="; }; }; + "split-buffer-1.0.0" = { + name = "split-buffer"; + packageName = "split-buffer"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/split-buffer/-/split-buffer-1.0.0.tgz"; + sha1 = "b7e8e0ab51345158b72c1f6dbef2406d51f1d027"; + }; + }; "split-string-3.1.0" = { name = "split-string"; packageName = "split-string"; @@ -28347,6 +30049,195 @@ let sha1 = "c2b5047c2c297b693d3bab518765e4b7c24d8173"; }; }; + "ssb-avatar-0.2.0" = { + name = "ssb-avatar"; + packageName = "ssb-avatar"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-avatar/-/ssb-avatar-0.2.0.tgz"; + sha1 = "06cd70795ee58d1462d100a45c660df3179d3b39"; + }; + }; + "ssb-blobs-1.1.5" = { + name = "ssb-blobs"; + packageName = "ssb-blobs"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-blobs/-/ssb-blobs-1.1.5.tgz"; + sha512 = "DeeInkFU8oN1mYlPVrqrm9tupf6wze4HuowK7N2vv/O+UeSLuYPU1p4HrxSqdAPvUabr0OtvbFA6z1T4nw+9fw=="; + }; + }; + "ssb-client-4.6.0" = { + name = "ssb-client"; + packageName = "ssb-client"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-client/-/ssb-client-4.6.0.tgz"; + sha512 = "LyH5Y/U7xvafmAuG1puyhNv4G3Ew9xC67dYgRX0wwbUf5iT422WB1Cvat9qGFAu3/BQbdctXtdEQPxaAn0+hYA=="; + }; + }; + "ssb-config-2.2.0" = { + name = "ssb-config"; + packageName = "ssb-config"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-config/-/ssb-config-2.2.0.tgz"; + sha1 = "41cad038a8575af4062d3fd57d3b167be85b03bc"; + }; + }; + "ssb-ebt-5.2.2" = { + name = "ssb-ebt"; + packageName = "ssb-ebt"; + version = "5.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-ebt/-/ssb-ebt-5.2.2.tgz"; + sha512 = "De3dUnmgs/8aYl2fmi/MtJljR9qw1mUmpdM4qeCf+4uniqlNNhfn1Ux+M5A8XYVuI+TD4GkgmIDeZH6miey2kw=="; + }; + }; + "ssb-friends-2.4.0" = { + name = "ssb-friends"; + packageName = "ssb-friends"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-2.4.0.tgz"; + sha1 = "0d40cd96a12f2339c9064a8ad1d5a713e91c57ae"; + }; + }; + "ssb-git-0.5.0" = { + name = "ssb-git"; + packageName = "ssb-git"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-git/-/ssb-git-0.5.0.tgz"; + sha1 = "5f4f712e42a23b895b128d61bc70dfb3bd5b40b4"; + }; + }; + "ssb-git-repo-2.8.3" = { + name = "ssb-git-repo"; + packageName = "ssb-git-repo"; + version = "2.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-git-repo/-/ssb-git-repo-2.8.3.tgz"; + sha512 = "7GVq5Ael/get+3Ot5exLdRWU8psSQNv/SkyO0KUhjoc4VfTdz8XuN1K195LKiyL/7u31A50KmkG9U9twb+1rGQ=="; + }; + }; + "ssb-issues-1.0.0" = { + name = "ssb-issues"; + packageName = "ssb-issues"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-issues/-/ssb-issues-1.0.0.tgz"; + sha1 = "9e857d170dff152c53a273eb9004a0a914a106e5"; + }; + }; + "ssb-keys-7.0.16" = { + name = "ssb-keys"; + packageName = "ssb-keys"; + version = "7.0.16"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-keys/-/ssb-keys-7.0.16.tgz"; + sha512 = "EhLkRzgF7YaRc47L8YZb+TcxEXZy9DPWCF+vCt5nSNm8Oj+Pz8pBVSOlrLKZVbcAKFjIJhqY32oTjknu3E1KVQ=="; + }; + }; + "ssb-links-3.0.3" = { + name = "ssb-links"; + packageName = "ssb-links"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-links/-/ssb-links-3.0.3.tgz"; + sha512 = "x09ShIMjwvdZI7aDZm8kc1v5YCGZa9ulCOoxrf/RYJ98s5gbTfO9CBCzeMBAeQ5kRwSuKjiOxJHdeEBkj4Y6hw=="; + }; + }; + "ssb-marked-0.5.4" = { + name = "ssb-marked"; + packageName = "ssb-marked"; + version = "0.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-marked/-/ssb-marked-0.5.4.tgz"; + sha1 = "e2f0a17854d968a41e707dee6161c783f907330f"; + }; + }; + "ssb-marked-0.6.0" = { + name = "ssb-marked"; + packageName = "ssb-marked"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-marked/-/ssb-marked-0.6.0.tgz"; + sha1 = "8171472058673e4e76ec187c40c88c1e484bc544"; + }; + }; + "ssb-mentions-0.1.2" = { + name = "ssb-mentions"; + packageName = "ssb-mentions"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-mentions/-/ssb-mentions-0.1.2.tgz"; + sha1 = "d0442708e3af5e245a7af9c1abd8f89ab03c80c0"; + }; + }; + "ssb-msg-schemas-6.3.0" = { + name = "ssb-msg-schemas"; + packageName = "ssb-msg-schemas"; + version = "6.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-msg-schemas/-/ssb-msg-schemas-6.3.0.tgz"; + sha1 = "23c12443d4e5a0c4817743638ee0ca93ce6ddc85"; + }; + }; + "ssb-msgs-5.2.0" = { + name = "ssb-msgs"; + packageName = "ssb-msgs"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-msgs/-/ssb-msgs-5.2.0.tgz"; + sha1 = "c681da5cd70c574c922dca4f03c521538135c243"; + }; + }; + "ssb-pull-requests-1.0.0" = { + name = "ssb-pull-requests"; + packageName = "ssb-pull-requests"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-pull-requests/-/ssb-pull-requests-1.0.0.tgz"; + sha1 = "dfd30cd50eecd8546bd4aa7f06e7c8f501c08118"; + }; + }; + "ssb-query-2.2.1" = { + name = "ssb-query"; + packageName = "ssb-query"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-query/-/ssb-query-2.2.1.tgz"; + sha512 = "eAbTVPHYLJ/Cp8jO7uFFXY7L3RhYKlGIhTEM1xjbz3p4/Dysl6DPyWTz7JF+lXhz5AznfjzZNfZjMnX3GJtIbA=="; + }; + }; + "ssb-ref-2.11.2" = { + name = "ssb-ref"; + packageName = "ssb-ref"; + version = "2.11.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-ref/-/ssb-ref-2.11.2.tgz"; + sha512 = "40A+o3iNAgr/sMH4V6/f3l2dhzUb5ZhTwZdrlKFu1ti+uZrKNUkH/E8j5NIZpj2rDq0PDXkACSVJgPGwltfQRA=="; + }; + }; + "ssb-validate-3.0.10" = { + name = "ssb-validate"; + packageName = "ssb-validate"; + version = "3.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-validate/-/ssb-validate-3.0.10.tgz"; + sha512 = "9wJE1i+4vW/F/TYQQl15BVoiZb9kaqIRBhl2I/TXyhjngfx/yBzXFAuiXhaiDfqJ3YnUXzY4JMUSx0gIvpePnQ=="; + }; + }; + "ssb-ws-2.1.1" = { + name = "ssb-ws"; + packageName = "ssb-ws"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-ws/-/ssb-ws-2.1.1.tgz"; + sha512 = "1fK/jXI6lKZadRJDr49t+6yMmWynp6PFrADs3Whmy8IslnYGl83ujhlpRIBvCn1EuVHjV7yLsIiJ8a0X2Kg0DQ=="; + }; + }; "ssh-config-1.1.3" = { name = "ssh-config"; packageName = "ssh-config"; @@ -28437,6 +30328,15 @@ let sha512 = "ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="; }; }; + "stack-0.1.0" = { + name = "stack"; + packageName = "stack"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stack/-/stack-0.1.0.tgz"; + sha1 = "e923598a9be51e617682cb21cf1b2818a449ada2"; + }; + }; "stack-trace-0.0.10" = { name = "stack-trace"; packageName = "stack-trace"; @@ -28464,6 +30364,15 @@ let sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; }; }; + "statistics-3.3.0" = { + name = "statistics"; + packageName = "statistics"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/statistics/-/statistics-3.3.0.tgz"; + sha1 = "ec7b4750ff03ab24a64dd9b357a78316bead78aa"; + }; + }; "statsd-parser-0.0.4" = { name = "statsd-parser"; packageName = "statsd-parser"; @@ -28896,6 +30805,15 @@ let sha1 = "5bcfad39f4649bb2d031292e19bcf0b510d4b242"; }; }; + "string.prototype.trim-1.1.2" = { + name = "string.prototype.trim"; + packageName = "string.prototype.trim"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz"; + sha1 = "d04de2c89e137f4d7d206f086b5ed2fae6be8cea"; + }; + }; "string2compact-1.3.0" = { name = "string2compact"; packageName = "string2compact"; @@ -28932,6 +30850,15 @@ let sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; }; + "stringify-entities-1.3.2" = { + name = "stringify-entities"; + packageName = "stringify-entities"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.2.tgz"; + sha512 = "nrBAQClJAPN2p+uGCVJRPIPakKeKWZ9GtBCmormE7pWOSlHat7+x5A8gx85M7HM5Dt0BP3pP5RhVW77WdbJJ3A=="; + }; + }; "stringstream-0.0.6" = { name = "stringstream"; packageName = "stringstream"; @@ -29189,7 +31116,7 @@ let packageName = "superagent"; version = "0.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/superagent/-/superagent-0.21.0.tgz"; + url = "http://registry.npmjs.org/superagent/-/superagent-0.21.0.tgz"; sha1 = "fb15027984751ee7152200e6cd21cd6e19a5de87"; }; }; @@ -29198,7 +31125,7 @@ let packageName = "superagent"; version = "1.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/superagent/-/superagent-1.8.5.tgz"; + url = "http://registry.npmjs.org/superagent/-/superagent-1.8.5.tgz"; sha1 = "1c0ddc3af30e80eb84ebc05cb2122da8fe940b55"; }; }; @@ -29500,6 +31427,15 @@ let sha1 = "2e7ce0a31df09f8d6851664a71842e0ca5057af7"; }; }; + "tape-4.9.1" = { + name = "tape"; + packageName = "tape"; + version = "4.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tape/-/tape-4.9.1.tgz"; + sha512 = "6fKIXknLpoe/Jp4rzHKFPpJUHDHDqn8jus99IfPnHIjyz78HYlefTGD3b5EkbQzuLfaEvmfPK3IolLgq2xT3kw=="; + }; + }; "tar-0.1.17" = { name = "tar"; packageName = "tar"; @@ -30085,6 +32021,15 @@ let sha1 = "fc92adaba072647bc0b67d6b03664aa195093af6"; }; }; + "to-vfile-1.0.0" = { + name = "to-vfile"; + packageName = "to-vfile"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-vfile/-/to-vfile-1.0.0.tgz"; + sha1 = "88defecd43adb2ef598625f0e3d59f7f342941ba"; + }; + }; "toidentifier-1.0.0" = { name = "toidentifier"; packageName = "toidentifier"; @@ -30135,17 +32080,17 @@ let packageName = "torrent-discovery"; version = "5.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-5.4.0.tgz"; + url = "http://registry.npmjs.org/torrent-discovery/-/torrent-discovery-5.4.0.tgz"; sha1 = "2d17d82cf669ada7f9dfe75db4b31f7034b71e29"; }; }; - "torrent-discovery-9.0.2" = { + "torrent-discovery-9.1.1" = { name = "torrent-discovery"; packageName = "torrent-discovery"; - version = "9.0.2"; + version = "9.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.0.2.tgz"; - sha512 = "UpkOyi/QUXRAwts8vSsFu/jRQ1mwGkaqv2OxLTJGr4DJKCiXpLHZ1+A4rxabcOWinM9RiqmS5mAjDuFfPHiJvw=="; + url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.1.1.tgz"; + sha512 = "3mHf+bxVCVLrlkPJdAoMbPMY1hpTZVeWw5hNc2pPFm+HCc2DS0HgVFTBTSWtB8vQPWA1hSEZpqJ+3QfdXxDE1g=="; }; }; "torrent-piece-1.1.2" = { @@ -30328,6 +32273,15 @@ let sha1 = "5858547f6b290757ee95cccc666fb50084c460dd"; }; }; + "trim-lines-1.1.1" = { + name = "trim-lines"; + packageName = "trim-lines"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-lines/-/trim-lines-1.1.1.tgz"; + sha512 = "X+eloHbgJGxczUk1WSjIvn7aC9oN3jVE3rQfRVKcgpavi3jxtCn0VVKtjOBj64Yop96UYn/ujJRpTbCdAF1vyg=="; + }; + }; "trim-newlines-1.0.0" = { name = "trim-newlines"; packageName = "trim-newlines"; @@ -30373,6 +32327,15 @@ let sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003"; }; }; + "trim-trailing-lines-1.1.1" = { + name = "trim-trailing-lines"; + packageName = "trim-trailing-lines"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.1.tgz"; + sha512 = "bWLv9BbWbbd7mlqqs2oQYnLD/U/ZqeJeJwbO0FG2zA1aTq+HTvxfHNKFa/HGCVyJpDiioUYaBhfiT6rgk+l4mg=="; + }; + }; "truncate-2.0.1" = { name = "truncate"; packageName = "truncate"; @@ -30490,6 +32453,15 @@ let sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; }; + "tweetnacl-auth-0.3.1" = { + name = "tweetnacl-auth"; + packageName = "tweetnacl-auth"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl-auth/-/tweetnacl-auth-0.3.1.tgz"; + sha1 = "b75bc2df15649bb84e8b9aa3c0669c6c4bce0d25"; + }; + }; "twig-1.12.0" = { name = "twig"; packageName = "twig"; @@ -30576,7 +32548,7 @@ let packageName = "typescript"; version = "2.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz"; + url = "http://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz"; sha512 = "p5TCYZDAO0m4G344hD+wx/LATebLWZNkkh2asWUFqSsD2OrDNhbAHuSjobrmsUmdzjJjEeZVU9g1h3O6vpstnw=="; }; }; @@ -30657,7 +32629,7 @@ let packageName = "uglify-js"; version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-1.2.5.tgz"; + url = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.2.5.tgz"; sha1 = "b542c2c76f78efb34b200b20177634330ff702b6"; }; }; @@ -30666,7 +32638,7 @@ let packageName = "uglify-js"; version = "2.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz"; + url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz"; sha1 = "a6e02a70d839792b9780488b7b8b184c095c99c7"; }; }; @@ -30675,7 +32647,7 @@ let packageName = "uglify-js"; version = "2.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz"; + url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz"; sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a"; }; }; @@ -30697,6 +32669,15 @@ let sha512 = "WatYTD84gP/867bELqI2F/2xC9PQBETn/L+7RGq9MQOA/7yFBNvY1UwXqvtILeE6n0ITwBXxp34M0/o70dzj6A=="; }; }; + "uglify-js-3.4.9" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "3.4.9"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz"; + sha512 = "8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q=="; + }; + }; "uglify-to-browserify-1.0.2" = { name = "uglify-to-browserify"; packageName = "uglify-to-browserify"; @@ -30778,6 +32759,15 @@ let sha1 = "483126e11774df2f71b8b639dcd799c376162b82"; }; }; + "uint48be-1.0.2" = { + name = "uint48be"; + packageName = "uint48be"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uint48be/-/uint48be-1.0.2.tgz"; + sha512 = "jNn1eEi81BLiZfJkjbiAKPDMj7iFrturKazqpBu0aJYLr6evgkn+9rgkX/gUwPBj5j2Ri5oUelsqC/S1zmpWBA=="; + }; + }; "uint64be-2.0.2" = { name = "uint64be"; packageName = "uint64be"; @@ -30949,6 +32939,15 @@ let sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; }; }; + "unherit-1.1.1" = { + name = "unherit"; + packageName = "unherit"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unherit/-/unherit-1.1.1.tgz"; + sha512 = "+XZuV691Cn4zHsK0vkKYwBEwB74T3IZIcxrgn2E4rKwTfFyI1zCh7X7grwh9Re08fdPlarIdyWgI8aVB3F5A5g=="; + }; + }; "unicode-5.2.0-0.7.5" = { name = "unicode-5.2.0"; packageName = "unicode-5.2.0"; @@ -30967,6 +32966,15 @@ let sha1 = "dbbd5b54ba30f287e2a8d5a249da6c0cef369459"; }; }; + "unified-2.1.4" = { + name = "unified"; + packageName = "unified"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/unified/-/unified-2.1.4.tgz"; + sha1 = "14bc6cd40d98ffff75b405506bad873ecbbac3ba"; + }; + }; "union-value-1.0.0" = { name = "union-value"; packageName = "union-value"; @@ -31030,6 +33038,33 @@ let sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a"; }; }; + "unist-util-is-2.1.2" = { + name = "unist-util-is"; + packageName = "unist-util-is"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.2.tgz"; + sha512 = "YkXBK/H9raAmG7KXck+UUpnKiNmUdB+aBGrknfQ4EreE1banuzrKABx3jP6Z5Z3fMSPMQQmeXBlKpCbMwBkxVw=="; + }; + }; + "unist-util-visit-1.4.0" = { + name = "unist-util-visit"; + packageName = "unist-util-visit"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.0.tgz"; + sha512 = "FiGu34ziNsZA3ZUteZxSFaczIjGmksfSgdKqBfOejrrfzyUy5b7YrlzT1Bcvi+djkYDituJDy2XB7tGTeBieKw=="; + }; + }; + "unist-util-visit-parents-2.0.1" = { + name = "unist-util-visit-parents"; + packageName = "unist-util-visit-parents"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-2.0.1.tgz"; + sha512 = "6B0UTiMfdWql4cQ03gDTCSns+64Zkfo2OCbK31Ov0uMizEz+CJeAp0cgZVb5Fhmcd7Bct2iRNywejT0orpbqUA=="; + }; + }; "universalify-0.1.2" = { name = "universalify"; packageName = "universalify"; @@ -31381,13 +33416,13 @@ let sha1 = "cf593ef4f2d175875e8bb658ea92e18a4fd06d8e"; }; }; - "ut_metadata-3.2.2" = { + "ut_metadata-3.3.0" = { name = "ut_metadata"; packageName = "ut_metadata"; - version = "3.2.2"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.2.2.tgz"; - sha512 = "PltK6kZ85DMscFl1gwyvOyja6UGROdyLI1ufWCTLsYnLfBaMyhtOEcbtgEgOwYEz8QuchR49qgHXTdJ2H05VHA=="; + url = "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.3.0.tgz"; + sha512 = "IK+ke9yL6a4oPLz/3oSW9TW7m9Wr4RG+5kW5aS2YulzEU1QDGAtago/NnOlno91fo3fSO7mnsqzn3NXNXdv8nA=="; }; }; "ut_pex-1.2.1" = { @@ -31678,13 +33713,13 @@ let sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e"; }; }; - "validator-10.7.0" = { + "validator-10.7.1" = { name = "validator"; packageName = "validator"; - version = "10.7.0"; + version = "10.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/validator/-/validator-10.7.0.tgz"; - sha512 = "7Z4kif6HeMLroCQZvh8lwCtmPOqBTkTkt5ibXtJR8sOkzWdjW+YIJOZUpPFlfq59zYvnpSPVd4UX5QYnSCLWgA=="; + url = "https://registry.npmjs.org/validator/-/validator-10.7.1.tgz"; + sha512 = "tbB5JrTczfeHKLw3PnFRzGFlF1xUAwSgXEDb66EuX1ffCirspYpDEZo3Vc9j38gPdL4JKrDc5UPFfgYiw1IWRQ=="; }; }; "validator-5.2.0" = { @@ -31692,7 +33727,7 @@ let packageName = "validator"; version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/validator/-/validator-5.2.0.tgz"; + url = "http://registry.npmjs.org/validator/-/validator-5.2.0.tgz"; sha1 = "e66fb3ec352348c1f7232512328738d8d66a9689"; }; }; @@ -31701,7 +33736,7 @@ let packageName = "validator"; version = "9.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/validator/-/validator-9.4.1.tgz"; + url = "http://registry.npmjs.org/validator/-/validator-9.4.1.tgz"; sha512 = "YV5KjzvRmSyJ1ee/Dm5UED0G+1L4GZnLN3w6/T+zZm8scVua4sOhYKWTUrKa0H/tMiJyO9QLHMPN+9mB/aMunA=="; }; }; @@ -31840,6 +33875,51 @@ let 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-find-down-1.0.0" = { + name = "vfile-find-down"; + packageName = "vfile-find-down"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile-find-down/-/vfile-find-down-1.0.0.tgz"; + sha1 = "84a4d66d03513f6140a84e0776ef0848d4f0ad95"; + }; + }; + "vfile-find-up-1.0.0" = { + name = "vfile-find-up"; + packageName = "vfile-find-up"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile-find-up/-/vfile-find-up-1.0.0.tgz"; + sha1 = "5604da6fe453b34350637984eb5fe4909e280390"; + }; + }; + "vfile-reporter-1.5.0" = { + name = "vfile-reporter"; + packageName = "vfile-reporter"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-1.5.0.tgz"; + sha1 = "21a7009bfe55e24df8ff432aa5bf6f6efa74e418"; + }; + }; + "vfile-sort-1.0.0" = { + name = "vfile-sort"; + packageName = "vfile-sort"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile-sort/-/vfile-sort-1.0.0.tgz"; + sha1 = "17ee491ba43e8951bb22913fcff32a7dc4d234d4"; + }; + }; "vhost-3.0.2" = { name = "vhost"; packageName = "vhost"; @@ -31939,13 +34019,13 @@ let sha1 = "ab6549d61d172c2b1b87be5c508d239c8ef87705"; }; }; - "vlc-command-1.1.1" = { + "vlc-command-1.1.2" = { name = "vlc-command"; packageName = "vlc-command"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/vlc-command/-/vlc-command-1.1.1.tgz"; - sha1 = "349b85def831f980cd6eec560b1990fd989eaf92"; + url = "https://registry.npmjs.org/vlc-command/-/vlc-command-1.1.2.tgz"; + sha512 = "KZ15RTHz96OEiQDA8oNFn1edYDWyKJIWI4gF74Am9woZo5XmVYryk5RYXSwOMvsaAgL5ejICEGCl0suQyDBu+Q=="; }; }; "vm-browserify-0.0.4" = { @@ -32191,13 +34271,13 @@ let sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; }; }; - "webpack-sources-1.1.0" = { + "webpack-sources-1.2.0" = { name = "webpack-sources"; packageName = "webpack-sources"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.1.0.tgz"; - sha512 = "aqYp18kPphgoO5c/+NaUvEeACtZjMESmDChuD3NBciVpah3XpMEU9VAAtIaB1BsfJWWTSdv8Vv1m3T0aRk2dUw=="; + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.2.0.tgz"; + sha512 = "9BZwxR85dNsjWz3blyxdOhTgtnQvv3OEs5xofI0wPYTwu5kaWxS08UuD1oI7WLBLpRO+ylf0ofnXLXWmGb2WMw=="; }; }; "websocket-driver-0.7.0" = { @@ -32227,13 +34307,13 @@ let sha512 = "lchLOk435iDWs0jNuL+hiU14i3ERSrMA0IKSiJh7z6X/i4XNsutBZrtqu2CPOZuA4G/zabiqVAos0vW+S7GEVw=="; }; }; - "webtorrent-0.102.2" = { + "webtorrent-0.102.4" = { name = "webtorrent"; packageName = "webtorrent"; - version = "0.102.2"; + version = "0.102.4"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.102.2.tgz"; - sha512 = "9+thCKf9zfs9OTMkNqSp3whqKlYd4f/VkBCsx+HkD5dh9O5oWf2lxfAMq1P411WiSY0PqBS77jxjQilYeYYskw=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.102.4.tgz"; + sha512 = "Oa7NatbPlESqf5ETwgVUOXAbUjiZr7XNFbHhd88BRm+4vN9u3JgeIbF9Gnuxb5s26cHxPYpGJRVTtBsc6Z6w9Q=="; }; }; "whatwg-fetch-2.0.4" = { @@ -32335,6 +34415,15 @@ let sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; }; }; + "which-pm-runs-1.0.0" = { + name = "which-pm-runs"; + packageName = "which-pm-runs"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz"; + sha1 = "670b3afbc552e0b55df6b7780ca74615f23ad1cb"; + }; + }; "wide-align-1.1.3" = { name = "wide-align"; packageName = "wide-align"; @@ -32506,6 +34595,15 @@ let sha1 = "fa4daa92daf32c4ea94ed453c81f04686b575dfe"; }; }; + "word-wrap-1.2.3" = { + name = "word-wrap"; + packageName = "word-wrap"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"; + sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; + }; + }; "wordwrap-0.0.2" = { name = "wordwrap"; packageName = "wordwrap"; @@ -32547,7 +34645,7 @@ let packageName = "wrap-ansi"; version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; + url = "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; }; }; @@ -32758,13 +34856,13 @@ let sha512 = "4nlO/14t3BNUZRXIXfXe+3N6w3s1KoxcJUUURctd64BLRe67E4gRwp4PjywtDY72fXpZ1y6Ch0VZQRY/gMPzzQ=="; }; }; - "xml-1.0.0" = { + "xml-1.0.1" = { name = "xml"; packageName = "xml"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/xml/-/xml-1.0.0.tgz"; - sha1 = "de3ee912477be2f250b60f612f34a8c4da616efe"; + url = "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz"; + sha1 = "78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"; }; }; "xml-name-validator-2.0.1" = { @@ -33353,13 +35451,13 @@ let sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2"; }; }; - "zero-fill-2.2.3" = { - name = "zero-fill"; - packageName = "zero-fill"; - version = "2.2.3"; + "zerr-1.0.4" = { + name = "zerr"; + packageName = "zerr"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/zero-fill/-/zero-fill-2.2.3.tgz"; - sha1 = "a3def06ba5e39ae644850bb4ca2ad4112b4855e9"; + url = "https://registry.npmjs.org/zerr/-/zerr-1.0.4.tgz"; + sha1 = "62814dd799eff8361f2a228f41f705c5e19de4c9"; }; }; "zip-dir-1.0.2" = { @@ -33654,7 +35752,7 @@ in sha512 = "9OBihy+L53g9ALssKTY/vTWEiz8mGEJ1asWiCdfPdQ1Uf++tewiNrN7Fq2Eb6ZYtvK0BYvPZlh3bHguKmKO3yA=="; }; dependencies = [ - sources."@types/node-8.10.28" + sources."@types/node-8.10.29" sources."JSV-4.0.2" sources."adal-node-0.1.28" sources."ajv-5.5.2" @@ -33854,7 +35952,7 @@ in sources."from-0.1.7" sources."fs.realpath-1.0.0" sources."galaxy-0.1.12" - sources."generate-function-2.2.0" + sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" (sources."getpass-0.1.7" // { dependencies = [ @@ -34259,7 +36357,7 @@ in sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" - sources."buffer-5.2.0" + sources."buffer-5.2.1" sources."buffer-from-1.1.1" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" @@ -34546,7 +36644,7 @@ in sources."long-2.4.0" sources."loud-rejection-1.6.0" sources."lru-2.0.1" - sources."magnet-uri-5.2.3" + sources."magnet-uri-5.2.4" sources."map-obj-1.0.1" (sources."mdns-js-1.0.1" // { dependencies = [ @@ -34925,7 +37023,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-1.2.0" sources."bcrypt-pbkdf-1.0.2" - sources."big-integer-1.6.34" + sources."big-integer-1.6.35" sources."block-stream-0.0.9" sources."bn.js-4.11.8" sources."body-parser-1.18.2" @@ -34952,7 +37050,7 @@ in sources."browserify-sign-4.0.4" sources."browserify-transform-tools-1.7.0" sources."browserify-zlib-0.1.4" - sources."buffer-5.2.0" + sources."buffer-5.2.1" sources."buffer-from-1.1.1" sources."buffer-xor-1.0.3" sources."builtin-modules-1.1.1" @@ -35083,7 +37181,7 @@ in sources."fs.realpath-1.0.0" sources."fstream-1.0.11" sources."function-bind-1.1.1" - sources."generate-function-2.2.0" + sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" sources."get-assigned-identifiers-1.2.0" (sources."getpass-0.1.7" // { @@ -35439,7 +37537,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.0" - sources."@types/node-10.9.2" + sources."@types/node-10.9.4" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" @@ -35787,7 +37885,7 @@ in sources."bytes-3.0.0" sources."call-me-maybe-1.0.1" sources."camelcase-4.1.0" - sources."capture-stack-trace-1.0.0" + sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" sources."chalk-2.4.1" sources."ci-info-1.4.0" @@ -36522,7 +38620,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.1" sources."asynckit-0.4.0" - sources."aws-sdk-2.303.0" + sources."aws-sdk-2.307.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."base64-js-1.3.0" @@ -36624,10 +38722,10 @@ in elm-test = nodeEnv.buildNodePackage { name = "elm-test"; packageName = "elm-test"; - version = "0.18.12"; + version = "0.18.13-beta"; src = fetchurl { - url = "https://registry.npmjs.org/elm-test/-/elm-test-0.18.12.tgz"; - sha512 = "5n1uNviCRxXIx5ciaFuzJd3fshcyicbYvTwyGh/L5t05bfBeq/3FZ5a3mLTz+zRZhp18dul2Oz8WoZmcn8PHcg=="; + url = "https://registry.npmjs.org/elm-test/-/elm-test-0.18.13-beta.tgz"; + sha512 = "bD2euTGjq4GFHqG2AWOrXXYidqYgz/NU3RVZB3d0qvDwZ8GItlv2ReCtU4D2RuqY40+sCTUT4Tiq2gpV13GThg=="; }; dependencies = [ sources."ansi-regex-2.1.1" @@ -36696,7 +38794,7 @@ in sources."fs.realpath-1.0.0" sources."fsevents-1.1.2" sources."fstream-1.0.11" - sources."generate-function-2.2.0" + sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" (sources."getpass-0.1.7" // { dependencies = [ @@ -37083,40 +39181,31 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "5.4.0"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-5.4.0.tgz"; - sha512 = "UIpL91XGex3qtL6qwyCQJar2j3osKxK9e3ano3OcGEIRM4oWIpCkDg9x95AXEC2wMs7PnxzOkPZ2gq+tsMS9yg=="; + url = "https://registry.npmjs.org/eslint/-/eslint-5.5.0.tgz"; + sha512 = "m+az4vYehIJgl1Z0gb25KnFXeqQRdNreYsei1jdvkd9bB+UNQD3fsuiC2AWSQ56P+/t++kFSINZXFbfai+krOw=="; }; dependencies = [ + sources."@babel/code-frame-7.0.0" + sources."@babel/highlight-7.0.0" sources."acorn-5.7.2" sources."acorn-jsx-4.1.1" sources."ajv-6.5.3" sources."ajv-keywords-3.2.0" sources."ansi-escapes-3.1.0" - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."array-union-1.0.2" sources."array-uniq-1.0.3" sources."arrify-1.0.1" - (sources."babel-code-frame-6.26.0" // { - dependencies = [ - sources."chalk-1.1.3" - sources."strip-ansi-3.0.1" - ]; - }) sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."caller-path-0.1.0" sources."callsites-0.2.0" - (sources."chalk-2.4.1" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."supports-color-5.5.0" - ]; - }) - sources."chardet-0.4.2" + sources."chalk-2.4.1" + sources."chardet-0.7.0" sources."circular-json-0.3.3" sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" @@ -37138,7 +39227,7 @@ in sources."esrecurse-4.2.1" sources."estraverse-4.2.0" sources."esutils-2.0.2" - sources."external-editor-2.2.0" + sources."external-editor-3.0.3" sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" @@ -37151,14 +39240,13 @@ in sources."globals-11.7.0" sources."globby-5.0.0" sources."graceful-fs-4.1.11" - sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."iconv-lite-0.4.24" sources."ignore-4.0.6" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."inquirer-5.2.0" + sources."inquirer-6.2.0" sources."is-fullwidth-code-point-2.0.0" sources."is-path-cwd-1.0.0" sources."is-path-in-cwd-1.0.1" @@ -37166,7 +39254,7 @@ in sources."is-promise-2.1.0" sources."is-resolvable-1.1.0" sources."isexe-2.0.0" - sources."js-tokens-3.0.2" + sources."js-tokens-4.0.0" sources."js-yaml-3.12.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" @@ -37201,7 +39289,7 @@ in sources."restore-cursor-2.0.0" sources."rimraf-2.6.2" sources."run-async-2.3.0" - sources."rxjs-5.5.11" + sources."rxjs-6.3.1" sources."safer-buffer-2.1.2" sources."semver-5.5.1" sources."shebang-command-1.2.0" @@ -37210,18 +39298,14 @@ in sources."slice-ansi-1.0.0" sources."sprintf-js-1.0.3" sources."string-width-2.1.1" - (sources."strip-ansi-4.0.0" // { - dependencies = [ - sources."ansi-regex-3.0.0" - ]; - }) + sources."strip-ansi-4.0.0" sources."strip-json-comments-2.0.1" - sources."supports-color-2.0.0" - sources."symbol-observable-1.0.1" + sources."supports-color-5.5.0" sources."table-4.0.3" sources."text-table-0.2.0" sources."through-2.3.8" sources."tmp-0.0.33" + sources."tslib-1.9.3" sources."type-check-0.3.2" sources."uri-js-4.2.2" sources."which-1.3.1" @@ -37247,34 +39331,25 @@ in sha512 = "NjFiFcKPEjDlleLlngMyVcD6oLu6L8BctLJ3saPZfC4yLD+AJteII5E8meGqTislKxiVMMWHWXed61siXz3mCA=="; }; dependencies = [ + sources."@babel/code-frame-7.0.0" + sources."@babel/highlight-7.0.0" sources."acorn-5.7.2" sources."acorn-jsx-4.1.1" sources."ajv-6.5.3" sources."ajv-keywords-3.2.0" sources."ansi-escapes-3.1.0" - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."array-union-1.0.2" sources."array-uniq-1.0.3" sources."arrify-1.0.1" - (sources."babel-code-frame-6.26.0" // { - dependencies = [ - sources."chalk-1.1.3" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - ]; - }) sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."caller-path-0.1.0" sources."callsites-0.2.0" - (sources."chalk-2.4.1" // { - dependencies = [ - sources."ansi-styles-3.2.1" - ]; - }) - sources."chardet-0.4.2" + sources."chalk-2.4.1" + sources."chardet-0.7.0" sources."circular-json-0.3.3" sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" @@ -37287,7 +39362,7 @@ in sources."del-2.2.2" sources."doctrine-2.1.0" sources."escape-string-regexp-1.0.5" - sources."eslint-5.4.0" + sources."eslint-5.5.0" sources."eslint-scope-4.0.0" sources."eslint-utils-1.3.1" sources."eslint-visitor-keys-1.0.0" @@ -37297,7 +39372,7 @@ in sources."esrecurse-4.2.1" sources."estraverse-4.2.0" sources."esutils-2.0.2" - sources."external-editor-2.2.0" + sources."external-editor-3.0.3" sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" @@ -37310,14 +39385,13 @@ in sources."globals-11.7.0" sources."globby-5.0.0" sources."graceful-fs-4.1.11" - sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."iconv-lite-0.4.24" sources."ignore-4.0.6" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."inquirer-5.2.0" + sources."inquirer-6.2.0" sources."is-fullwidth-code-point-2.0.0" sources."is-path-cwd-1.0.0" sources."is-path-in-cwd-1.0.1" @@ -37325,7 +39399,7 @@ in sources."is-promise-2.1.0" sources."is-resolvable-1.1.0" sources."isexe-2.0.0" - sources."js-tokens-3.0.2" + sources."js-tokens-4.0.0" sources."js-yaml-3.12.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" @@ -37363,7 +39437,7 @@ in sources."restore-cursor-2.0.0" sources."rimraf-2.6.2" sources."run-async-2.3.0" - sources."rxjs-5.5.11" + sources."rxjs-6.3.1" sources."safer-buffer-2.1.2" sources."semver-5.5.1" sources."shebang-command-1.2.0" @@ -37372,18 +39446,14 @@ in sources."slice-ansi-1.0.0" sources."sprintf-js-1.0.3" sources."string-width-2.1.1" - (sources."strip-ansi-4.0.0" // { - dependencies = [ - sources."ansi-regex-3.0.0" - ]; - }) + sources."strip-ansi-4.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" - sources."symbol-observable-1.0.1" sources."table-4.0.3" sources."text-table-0.2.0" sources."through-2.3.8" sources."tmp-0.0.33" + sources."tslib-1.9.3" sources."type-check-0.3.2" sources."uri-js-4.2.2" sources."which-1.3.1" @@ -37403,10 +39473,10 @@ in emojione = nodeEnv.buildNodePackage { name = "emojione"; packageName = "emojione"; - version = "3.1.7"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/emojione/-/emojione-3.1.7.tgz"; - sha1 = "2d3c725c696f179c9dde3acb655c621ee9429b1e"; + url = "https://registry.npmjs.org/emojione/-/emojione-4.0.0.tgz"; + sha512 = "ATFSRHrK838NoTUE96j9rpmS1R4a/qpK1maQURGdFtarpWloEttjjIBBWbSFqsUxC0Vot6P2WXmSlotvZoegxw=="; }; buildInputs = globalBuildInputs; meta = { @@ -37817,6 +39887,181 @@ in production = true; bypassCache = true; }; + git-ssb = nodeEnv.buildNodePackage { + name = "git-ssb"; + packageName = "git-ssb"; + version = "2.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/git-ssb/-/git-ssb-2.3.6.tgz"; + sha512 = "xH6KEeJaUJDB8FAov4OdYxb4GuMOTcKdJ+xW5SUGLEuXfBLgyS0zUeeYVIUS8qvM3gf7w+W35WRwwK4d0InqxQ=="; + }; + dependencies = [ + sources."asyncmemo-1.0.0" + sources."chloride-2.2.10" + sources."chloride-test-1.2.2" + sources."deep-equal-1.0.1" + sources."deep-extend-0.4.2" + sources."diff-3.5.0" + sources."ed2curve-0.1.4" + sources."emoji-named-characters-1.0.2" + sources."explain-error-1.0.4" + sources."generate-function-2.3.1" + sources."generate-object-property-1.2.0" + sources."git-packidx-parser-1.0.0" + sources."git-remote-ssb-2.0.4" + sources."git-ssb-web-2.8.0" + sources."hashlru-2.2.1" + sources."highlight.js-9.12.0" + sources."increment-buffer-1.0.1" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."ip-1.1.5" + sources."is-electron-2.1.0" + sources."is-my-ip-valid-1.0.0" + sources."is-my-json-valid-2.19.0" + sources."is-property-1.0.2" + sources."is-valid-domain-0.0.5" + sources."json-buffer-2.0.11" + sources."jsonpointer-4.0.1" + sources."kvgraph-0.1.0" + sources."kvset-1.0.0" + sources."libsodium-0.7.3" + sources."libsodium-wrappers-0.7.3" + sources."looper-4.0.0" + sources."lrucache-1.0.3" + sources."mime-db-1.36.0" + sources."mime-types-2.1.20" + sources."minimist-1.2.0" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."moment-2.22.2" + sources."multicb-1.2.2" + sources."multiserver-1.13.3" + sources."muxrpc-6.4.1" + sources."nan-2.11.0" + sources."node-gyp-build-3.4.0" + sources."node-polyglot-1.0.0" + sources."non-private-ip-1.4.4" + sources."options-0.0.6" + sources."os-homedir-1.0.2" + sources."packet-stream-2.0.4" + sources."packet-stream-codec-1.1.2" + sources."pako-1.0.6" + sources."private-box-0.2.1" + sources."progress-1.1.8" + sources."pull-block-filter-1.0.0" + sources."pull-box-stream-1.0.13" + sources."pull-buffered-0.3.4" + sources."pull-cache-0.0.0" + sources."pull-cat-1.1.11" + sources."pull-core-1.1.0" + sources."pull-git-pack-1.0.2" + (sources."pull-git-pack-concat-0.2.1" // { + dependencies = [ + sources."looper-3.0.0" + ]; + }) + sources."pull-git-packidx-parser-1.0.0" + sources."pull-git-remote-helper-2.0.0" + sources."pull-git-repo-1.2.1" + (sources."pull-goodbye-0.0.2" // { + dependencies = [ + sources."pull-stream-3.5.0" + ]; + }) + sources."pull-handshake-1.1.4" + sources."pull-hash-1.0.0" + sources."pull-hyperscript-0.2.2" + (sources."pull-identify-filetype-1.1.0" // { + dependencies = [ + sources."pull-stream-2.28.4" + ]; + }) + sources."pull-kvdiff-0.0.0" + sources."pull-looper-1.0.0" + sources."pull-many-1.0.8" + sources."pull-paginate-1.0.0" + sources."pull-pair-1.1.0" + sources."pull-paramap-1.2.2" + sources."pull-pushable-2.2.0" + sources."pull-reader-1.3.1" + sources."pull-skip-footer-0.1.0" + sources."pull-stream-3.6.9" + (sources."pull-through-1.0.18" // { + dependencies = [ + sources."looper-3.0.0" + ]; + }) + sources."pull-ws-3.3.1" + (sources."rc-1.2.8" // { + dependencies = [ + sources."deep-extend-0.6.0" + ]; + }) + sources."relative-url-1.0.2" + sources."remove-markdown-0.1.0" + sources."safe-buffer-5.1.2" + sources."secret-handshake-1.1.13" + sources."semver-5.5.1" + sources."separator-escape-0.0.0" + sources."sha.js-2.4.5" + sources."smart-buffer-4.0.1" + sources."socks-2.2.1" + sources."sodium-browserify-1.2.4" + (sources."sodium-browserify-tweetnacl-0.2.3" // { + dependencies = [ + sources."sha.js-2.4.11" + ]; + }) + sources."sodium-chloride-1.1.0" + sources."sodium-native-2.2.1" + sources."split-buffer-1.0.0" + sources."ssb-avatar-0.2.0" + sources."ssb-client-4.6.0" + sources."ssb-config-2.2.0" + sources."ssb-git-0.5.0" + sources."ssb-git-repo-2.8.3" + sources."ssb-issues-1.0.0" + sources."ssb-keys-7.0.16" + sources."ssb-marked-0.6.0" + (sources."ssb-mentions-0.1.2" // { + dependencies = [ + sources."ssb-marked-0.5.4" + ]; + }) + (sources."ssb-msg-schemas-6.3.0" // { + dependencies = [ + sources."pull-stream-2.27.0" + ]; + }) + sources."ssb-msgs-5.2.0" + sources."ssb-pull-requests-1.0.0" + sources."ssb-ref-2.11.2" + (sources."stream-to-pull-stream-1.7.2" // { + dependencies = [ + sources."looper-3.0.0" + ]; + }) + sources."strip-json-comments-2.0.1" + sources."through-2.2.7" + sources."tweetnacl-0.14.5" + sources."tweetnacl-auth-0.3.1" + sources."ultron-1.0.2" + sources."ws-1.1.5" + sources."xtend-4.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "git hosting on secure-scuttlebutt (ssb)"; + homepage = https://git-ssb.celehner.com/%25n92DiQh7ietE%2BR%2BX%2FI403LQoyf2DtR3WQfCkDKlheQU%3D.sha256; + license = "Fair"; + }; + production = true; + bypassCache = true; + }; git-standup = nodeEnv.buildNodePackage { name = "git-standup"; packageName = "git-standup"; @@ -37885,7 +40130,7 @@ in sources."babel-runtime-6.26.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" - sources."bluebird-3.5.1" + sources."bluebird-3.5.2" (sources."body-parser-1.18.2" // { dependencies = [ sources."iconv-lite-0.4.19" @@ -37900,7 +40145,7 @@ in sources."call-me-maybe-1.0.1" sources."camel-case-3.0.0" sources."camelcase-4.1.0" - sources."capture-stack-trace-1.0.0" + sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" sources."chalk-2.4.1" sources."change-case-3.0.2" @@ -38203,7 +40448,7 @@ in sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-2.0.1" - sources."ono-4.0.6" + sources."ono-4.0.7" sources."open-0.0.5" sources."opn-5.3.0" sources."ora-1.4.0" @@ -38285,7 +40530,7 @@ in sources."restore-cursor-2.0.0" sources."rimraf-2.6.2" sources."run-async-2.3.0" - sources."rxjs-5.5.11" + sources."rxjs-5.5.12" sources."safe-buffer-5.1.1" sources."safer-buffer-2.1.2" sources."scuid-1.1.0" @@ -38357,7 +40602,7 @@ in sources."utils-merge-1.0.1" sources."uuid-3.3.2" sources."validate-npm-package-license-3.0.4" - sources."validator-10.7.0" + sources."validator-10.7.1" sources."vary-1.1.2" sources."verror-1.10.0" sources."wcwidth-1.0.1" @@ -39173,28 +41418,46 @@ in htmlhint = nodeEnv.buildNodePackage { name = "htmlhint"; packageName = "htmlhint"; - version = "0.9.13"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.9.13.tgz"; - sha1 = "08163cb1e6aa505048ebb0b41063a7ca07dc6c88"; + url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.10.0.tgz"; + sha512 = "g/bNE3G7D8N1pgfGeL8FTgv4lhA04cWiCTofi8F20f4s+tkcIAL/j2FsD8iVlRCzVpNDYbXCmYtGmQzQe0FKGw=="; }; dependencies = [ - sources."async-1.4.2" + sources."ajv-5.5.2" + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" + sources."async-2.6.1" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.8.0" sources."balanced-match-1.0.0" + sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" - (sources."cli-0.6.6" // { + sources."buffer-from-1.1.1" + sources."caseless-0.12.0" + sources."cli-1.0.1" + sources."clone-2.1.2" + sources."co-4.6.0" + sources."colors-1.3.2" + sources."combined-stream-1.0.6" + sources."commander-2.17.1" + sources."concat-map-0.0.1" + (sources."concat-stream-1.6.2" // { dependencies = [ - sources."glob-3.2.11" - sources."minimatch-0.3.0" + sources."isarray-1.0.0" + sources."readable-stream-2.3.6" + sources."string_decoder-1.1.1" ]; }) - sources."colors-1.0.3" - sources."commander-2.6.0" - sources."concat-map-0.0.1" sources."console-browserify-1.1.0" sources."core-util-is-1.0.2" - sources."csslint-0.10.0" + sources."csslint-1.0.5" + sources."cycle-1.0.3" + sources."dashdash-1.14.1" sources."date-now-0.1.4" + sources."debug-2.6.9" + sources."delayed-stream-1.0.0" (sources."dom-serializer-0.1.0" // { dependencies = [ sources."domelementtype-1.1.3" @@ -39204,42 +41467,114 @@ in sources."domelementtype-1.3.0" sources."domhandler-2.3.0" sources."domutils-1.5.1" + sources."ecc-jsbn-0.1.2" sources."entities-1.0.0" + sources."es6-promise-4.2.4" sources."exit-0.1.2" - sources."glob-5.0.15" + sources."extend-3.0.2" + sources."extract-zip-1.6.7" + sources."extsprintf-1.3.0" + sources."eyes-0.1.8" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" + sources."fd-slicer-1.0.1" + sources."forever-agent-0.6.1" + sources."form-data-2.3.2" + sources."fs-extra-1.0.0" + sources."fs.realpath-1.0.0" + sources."getpass-0.1.7" + sources."glob-7.1.3" 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.1.0" + sources."hasha-2.2.0" sources."htmlparser2-3.8.3" + sources."http-signature-1.2.0" 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."is-stream-1.1.0" + sources."is-typedarray-1.0.0" sources."isarray-0.0.1" - (sources."jshint-2.8.0" // { + sources."isexe-2.0.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + (sources."jshint-2.9.6" // { dependencies = [ - sources."minimatch-2.0.10" + sources."strip-json-comments-1.0.4" ]; }) - sources."lodash-3.7.0" - sources."lru-cache-2.7.3" + 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."lodash-4.17.10" + sources."mime-db-1.36.0" + sources."mime-types-2.1.20" sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + sources."ms-2.0.0" + sources."oauth-sign-0.9.0" sources."once-1.4.0" sources."parse-glob-3.0.4" - sources."parserlib-0.2.5" + sources."parserlib-1.1.1" sources."path-is-absolute-1.0.1" + sources."path-parse-1.0.6" + sources."pend-1.2.0" + sources."performance-now-2.1.0" + sources."phantom-4.0.12" + sources."phantomjs-prebuilt-2.1.16" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."process-nextick-args-2.0.0" + sources."progress-1.1.8" + sources."psl-1.1.29" + sources."punycode-1.4.1" + sources."qs-6.5.2" sources."readable-stream-1.1.14" + sources."request-2.88.0" + sources."request-progress-2.0.1" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" sources."shelljs-0.3.0" - sources."sigmund-1.0.1" + sources."split-1.0.1" + sources."sshpk-1.14.2" + sources."stack-trace-0.0.10" sources."string_decoder-0.10.31" - sources."strip-json-comments-1.0.4" + sources."strip-json-comments-2.0.1" + sources."throttleit-1.0.0" + sources."through-2.3.8" + sources."tough-cookie-2.4.3" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."typedarray-0.0.6" + sources."unicode-5.2.0-0.7.5" + sources."util-deprecate-1.0.2" + sources."uuid-3.3.2" + sources."verror-1.10.0" + sources."which-1.3.1" + (sources."winston-2.4.4" // { + dependencies = [ + sources."async-1.0.0" + sources."colors-1.0.3" + ]; + }) sources."wrappy-1.0.2" - sources."xml-1.0.0" + sources."xml-1.0.1" + sources."yauzl-2.4.1" ]; buildInputs = globalBuildInputs; meta = { - description = "A Static Code Analysis Tool for HTML"; - homepage = "https://github.com/yaniswang/HTMLHint#readme"; + description = "The Static Code Analysis Tool for your HTML"; + homepage = "https://github.com/thedaviddias/HTMLHint#readme"; license = "MIT"; }; production = true; @@ -39263,7 +41598,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.4.8" + sources."uglify-js-3.4.9" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -39298,7 +41633,7 @@ in sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" sources."@types/ncp-2.0.1" - sources."@types/node-6.0.116" + sources."@types/node-6.0.117" sources."@types/rimraf-2.0.2" sources."@types/rx-4.1.1" sources."@types/rx-core-4.0.3" @@ -39332,9 +41667,9 @@ in sources."brace-expansion-1.1.11" sources."bytes-3.0.0" sources."camelcase-4.1.0" - sources."capture-stack-trace-1.0.0" + sources."capture-stack-trace-1.0.1" sources."chalk-2.4.1" - sources."chardet-0.5.0" + sources."chardet-0.7.0" sources."chownr-1.0.1" sources."ci-info-1.4.0" sources."cli-boxes-1.0.0" @@ -39373,7 +41708,7 @@ in sources."esutils-2.0.2" sources."execa-0.7.0" sources."extend-3.0.2" - sources."external-editor-3.0.1" + sources."external-editor-3.0.3" sources."fast-levenshtein-2.0.6" sources."figures-2.0.0" sources."file-uri-to-path-1.0.0" @@ -39504,7 +41839,7 @@ in sources."rimraf-2.6.2" sources."rsvp-3.6.2" sources."run-async-2.3.0" - sources."rxjs-6.2.2" + sources."rxjs-6.3.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.1.4" @@ -39812,7 +42147,7 @@ in 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."fast-json-patch-2.0.7" sources."fs.realpath-1.0.0" sources."get-func-name-2.0.0" sources."glob-7.1.3" @@ -39841,7 +42176,7 @@ in sources."opentracing-0.14.3" sources."path-is-absolute-1.0.1" sources."pathval-1.1.0" - sources."rxjs-5.5.11" + sources."rxjs-5.5.12" sources."semaphore-async-await-1.5.1" sources."string-similarity-1.2.1" sources."string-template-0.2.1" @@ -39901,7 +42236,7 @@ in }; dependencies = [ sources."babylon-7.0.0-beta.19" - sources."bluebird-3.5.1" + sources."bluebird-3.5.2" sources."catharsis-0.8.9" sources."escape-string-regexp-1.0.5" sources."graceful-fs-4.1.11" @@ -40199,10 +42534,10 @@ in json-refs = nodeEnv.buildNodePackage { name = "json-refs"; packageName = "json-refs"; - version = "3.0.9"; + version = "3.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.9.tgz"; - sha512 = "7N8yDNktol+fIQBQmCoaHwAxvga102kgil/awf8TrGHIhQh2o788inzS6QygfY0B++Z7v5NCAAmCddU+qJf6hA=="; + url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.10.tgz"; + sha512 = "hTBuXx9RKpyhNhCEh7AUm0Emngxf9f1caw4BzH9CQSPlTqxSJG/X5W0di8AHSeePu+ZqSYjlXLU6u2+Q/6wFmw=="; }; dependencies = [ sources."argparse-1.0.10" @@ -40229,7 +42564,7 @@ in sources."mime-types-2.1.20" sources."ms-2.0.0" sources."native-promise-only-0.8.1" - sources."path-loader-1.0.7" + sources."path-loader-1.0.8" sources."process-nextick-args-2.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" @@ -40281,7 +42616,7 @@ in sources."boxen-1.3.0" sources."bytes-3.0.0" sources."camelcase-4.1.0" - sources."capture-stack-trace-1.0.0" + sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" sources."chalk-2.4.1" sources."ci-info-1.4.0" @@ -40417,7 +42752,7 @@ in sources."minimist-1.2.0" sources."morgan-1.9.0" sources."ms-2.0.0" - sources."nanoid-1.2.1" + sources."nanoid-1.2.2" sources."negotiator-0.6.1" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" @@ -40577,7 +42912,7 @@ in sources."better-assert-1.0.2" sources."binary-extensions-1.11.0" sources."blob-0.0.4" - sources."bluebird-3.5.1" + sources."bluebird-3.5.2" sources."body-parser-1.18.3" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { @@ -41471,20 +43806,20 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "3.1.4"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-3.1.4.tgz"; - sha512 = "DetcjFPZmClvHbTOUX3ynBEfzWPLIRhwnoCMw57iNV1lWyW3ERLj6B2Iz6XtWOwW6E+fBrmK5tYV9t0OXuSF6A=="; + url = "https://registry.npmjs.org/lerna/-/lerna-3.2.1.tgz"; + sha512 = "nHa/TgRLOHlBm+NfeW62ffVO7hY7wJxnu6IJmZA3lrSmRlqrXZk2BPvnq0FSaCinVYjW0w0XeSNZdRKR//HAwQ=="; }; dependencies = [ - sources."@lerna/add-3.1.4" + sources."@lerna/add-3.2.0" sources."@lerna/batch-packages-3.1.2" - sources."@lerna/bootstrap-3.1.4" - sources."@lerna/changed-3.1.3" + sources."@lerna/bootstrap-3.2.0" + sources."@lerna/changed-3.2.0" sources."@lerna/check-working-tree-3.1.0" sources."@lerna/child-process-3.0.0" sources."@lerna/clean-3.1.3" - sources."@lerna/cli-3.1.4" + sources."@lerna/cli-3.2.0" sources."@lerna/collect-updates-3.1.0" sources."@lerna/command-3.1.3" sources."@lerna/conventional-commits-3.0.2" @@ -41507,23 +43842,23 @@ in sources."@lerna/npm-conf-3.0.0" sources."@lerna/npm-dist-tag-3.0.0" sources."@lerna/npm-install-3.0.0" - sources."@lerna/npm-publish-3.0.6" + sources."@lerna/npm-publish-3.2.0" sources."@lerna/npm-run-script-3.0.0" sources."@lerna/output-3.0.0" sources."@lerna/package-3.0.0" sources."@lerna/package-graph-3.1.2" sources."@lerna/project-3.0.0" sources."@lerna/prompt-3.0.0" - sources."@lerna/publish-3.1.3" + sources."@lerna/publish-3.2.1" sources."@lerna/resolve-symlink-3.0.0" sources."@lerna/rimraf-dir-3.0.0" sources."@lerna/run-3.1.3" - sources."@lerna/run-lifecycle-3.0.0" + sources."@lerna/run-lifecycle-3.2.0" sources."@lerna/run-parallel-batches-3.0.0" sources."@lerna/symlink-binary-3.1.4" sources."@lerna/symlink-dependencies-3.1.4" sources."@lerna/validation-error-3.0.0" - sources."@lerna/version-3.1.3" + sources."@lerna/version-3.2.0" sources."@lerna/write-log-file-3.0.0" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.1" @@ -41571,7 +43906,7 @@ in }) sources."bcrypt-pbkdf-1.0.2" sources."block-stream-0.0.9" - sources."bluebird-3.5.1" + sources."bluebird-3.5.2" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ @@ -41613,9 +43948,10 @@ in }) sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" - (sources."cliui-2.1.0" // { + (sources."cliui-4.1.0" // { dependencies = [ - sources."wordwrap-0.0.2" + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" ]; }) sources."clone-1.0.4" @@ -41665,9 +44001,10 @@ in sources."dateformat-3.0.3" sources."debug-2.6.9" sources."debuglog-1.0.1" - sources."decamelize-1.2.0" + sources."decamelize-2.0.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ + sources."decamelize-1.2.0" sources."map-obj-1.0.1" ]; }) @@ -41739,7 +44076,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."find-up-2.1.0" + sources."find-up-3.0.0" sources."flush-write-stream-1.0.3" sources."for-in-1.0.2" sources."forever-agent-0.6.1" @@ -41763,6 +44100,7 @@ in dependencies = [ sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" + sources."decamelize-1.2.0" sources."indent-string-2.1.0" sources."map-obj-1.0.1" sources."meow-3.7.0" @@ -41883,7 +44221,7 @@ in sources."lazy-cache-1.0.4" sources."lcid-1.0.0" sources."load-json-file-4.0.0" - sources."locate-path-2.0.0" + sources."locate-path-3.0.0" sources."lodash-4.17.10" sources."lodash._reinterpolate-3.0.0" sources."lodash.sortby-4.7.0" @@ -41900,7 +44238,12 @@ in sources."mem-1.1.0" (sources."meow-4.0.1" // { dependencies = [ + sources."find-up-2.1.0" + sources."locate-path-2.0.0" sources."minimist-1.2.0" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" sources."read-pkg-up-3.0.0" ]; }) @@ -41989,12 +44332,13 @@ in sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."p-finally-1.0.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" + sources."p-limit-2.0.0" + sources."p-locate-3.0.0" sources."p-map-1.2.0" sources."p-map-series-1.0.0" + sources."p-pipe-1.2.0" sources."p-reduce-1.0.0" - sources."p-try-1.0.0" + sources."p-try-2.0.0" sources."p-waterfall-1.0.0" sources."pacote-9.1.0" sources."parallel-transform-1.1.0" @@ -42010,7 +44354,15 @@ in sources."pify-3.0.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."pkg-dir-2.0.0" + (sources."pkg-dir-2.0.0" // { + dependencies = [ + sources."find-up-2.1.0" + sources."locate-path-2.0.0" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + ]; + }) sources."posix-character-classes-0.1.1" sources."process-nextick-args-2.0.0" sources."promise-inflight-1.0.1" @@ -42071,7 +44423,7 @@ in sources."rimraf-2.6.2" sources."run-async-2.3.0" sources."run-queue-1.0.3" - sources."rxjs-5.5.11" + sources."rxjs-5.5.12" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -42197,6 +44549,9 @@ in (sources."uglify-js-2.8.29" // { dependencies = [ sources."camelcase-1.2.1" + sources."cliui-2.1.0" + sources."decamelize-1.2.0" + sources."wordwrap-0.0.2" sources."yargs-3.10.0" ]; }) @@ -42251,19 +44606,7 @@ in sources."xtend-4.0.1" sources."y18n-4.0.0" sources."yallist-2.1.2" - (sources."yargs-12.0.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."cliui-4.1.0" - sources."decamelize-2.0.0" - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."p-limit-2.0.0" - sources."p-locate-3.0.0" - sources."p-try-2.0.0" - sources."strip-ansi-4.0.0" - ]; - }) + sources."yargs-12.0.1" sources."yargs-parser-10.1.0" ]; buildInputs = globalBuildInputs; @@ -43317,7 +45660,7 @@ in sources."longest-1.0.1" sources."lru-cache-2.7.3" sources."lru-queue-0.1.0" - sources."make-error-1.3.4" + sources."make-error-1.3.5" sources."make-error-cause-1.2.2" sources."make-iterator-1.0.1" sources."map-cache-0.2.2" @@ -43529,7 +45872,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typescript-2.7.2" - (sources."uglify-js-3.4.8" // { + (sources."uglify-js-3.4.9" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -43674,7 +46017,7 @@ in sources."mime-types-2.1.20" sources."ms-2.0.0" sources."native-promise-only-0.8.1" - sources."path-loader-1.0.7" + sources."path-loader-1.0.8" sources."process-nextick-args-2.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" @@ -44029,7 +46372,7 @@ in sources."base64-js-0.0.8" sources."bcrypt-pbkdf-1.0.2" sources."biased-opener-0.2.8" - sources."big-integer-1.6.34" + sources."big-integer-1.6.35" sources."block-stream-0.0.9" sources."body-parser-1.18.2" sources."boom-2.10.1" @@ -44389,10 +46732,10 @@ in nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "1.18.3"; + version = "1.18.4"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-1.18.3.tgz"; - sha512 = "XdVfAjGlDKU2nqoGgycxTndkJ5fdwvWJ/tlMGk2vHxMZBrSPVh86OM6z7viAv8BBJWjMgeuYQBofzr6LUoi+7g=="; + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.18.4.tgz"; + sha512 = "hyK6vl65IPnky/ee+D3IWvVGgJa/m3No2/Xc/3wanS6Ce1MWjCzH6NnhPJ/vZM+6JFym16jtHx51lmCMB9HDtg=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -44424,7 +46767,7 @@ in }) sources."cache-base-1.0.1" sources."camelcase-4.1.0" - sources."capture-stack-trace-1.0.0" + sources."capture-stack-trace-1.0.1" sources."chalk-2.4.1" sources."chokidar-2.0.4" sources."ci-info-1.4.0" @@ -45279,10 +47622,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.4.0.tgz"; - sha512 = "k0VteQaxRuI1mREBxCtLUksesD2ZmX5gxjXNEjTmTrxQ3SHW22InkCKyX4NzoeGAYtgmDg5MuE7rcXYod7xgug=="; + url = "https://registry.npmjs.org/npm/-/npm-6.4.1.tgz"; + sha512 = "mXJL1NTVU136PtuopXCUQaNWuHlXCTp4McwlSW8S9/Aj8OEPAlSBgo8og7kJ01MjCDrkmqFQTvN5tTEhBMhXQg=="; }; buildInputs = globalBuildInputs; meta = { @@ -45470,7 +47813,7 @@ in sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."argparse-1.0.10" - sources."bluebird-3.5.1" + sources."bluebird-3.5.2" (sources."boxen-1.3.0" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -45479,7 +47822,7 @@ in ]; }) sources."camelcase-4.1.0" - sources."capture-stack-trace-1.0.0" + sources."capture-stack-trace-1.0.1" sources."chalk-1.1.3" sources."ci-info-1.4.0" sources."cint-8.2.1" @@ -45822,7 +48165,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."bluebird-3.5.1" + sources."bluebird-3.5.2" (sources."body-parser-1.18.3" // { dependencies = [ sources."content-type-1.0.4" @@ -46154,7 +48497,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-0.0.8" sources."bencode-2.0.0" - sources."big-integer-1.6.34" + sources."big-integer-1.6.35" sources."bitfield-0.1.0" (sources."bittorrent-dht-6.4.2" // { dependencies = [ @@ -46272,7 +48615,7 @@ in sources."lodash-3.10.1" sources."loud-rejection-1.6.0" sources."lru-2.0.1" - sources."magnet-uri-5.2.3" + sources."magnet-uri-5.2.4" sources."map-obj-1.0.1" sources."meow-3.7.0" sources."mime-2.3.1" @@ -46354,7 +48697,7 @@ in sources."run-parallel-1.1.9" sources."run-series-1.1.8" sources."rusha-0.8.13" - sources."rxjs-5.5.11" + sources."rxjs-5.5.12" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-5.5.1" @@ -46476,7 +48819,7 @@ in }) sources."boom-0.3.8" sources."brace-expansion-1.1.11" - sources."buffer-5.2.0" + sources."buffer-5.2.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -46883,7 +49226,7 @@ in sources."form-data-1.0.1" sources."fs-extra-0.26.7" sources."fs.realpath-1.0.0" - sources."generate-function-2.2.0" + sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" (sources."getpass-0.1.7" // { dependencies = [ @@ -46979,10 +49322,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "2.13.6"; + version = "2.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-2.13.6.tgz"; - sha512 = "X8zmtUzmEIa/QMg0t0eeq6hSd7kmL5Zvneqpj3Tcbyn2g/FEFTPb9kaghR+DW1WdViOE51eo4ECLK7uY9oogkA=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-2.15.0.tgz"; + sha512 = "bMS1ShnuwRtg1SRrauo9gYFXn4CxO+tyYNRe40DsY4cDpycbLs3Lr54ulQrFZtE4Yn6m3keu3sft7f36eg0gbw=="; }; buildInputs = globalBuildInputs; meta = { @@ -48047,6 +50390,583 @@ in production = true; bypassCache = true; }; + scuttlebot = nodeEnv.buildNodePackage { + name = "scuttlebot"; + packageName = "scuttlebot"; + version = "11.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/scuttlebot/-/scuttlebot-11.4.2.tgz"; + sha512 = "JbOKdMFCyoALwpiK5FM8qikpFvEqCdRycbFGiOdhhQT0VrTWCO1PXDFuDAHnCBTDYvjjO88M9njq2BOXVypvAg=="; + }; + dependencies = [ + sources."abstract-leveldown-4.0.3" + (sources."aligned-block-file-1.1.3" // { + dependencies = [ + sources."obv-0.0.0" + ]; + }) + sources."ansi-escapes-1.4.0" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."anymatch-1.3.2" + sources."append-batch-0.0.1" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.5" + sources."arr-diff-2.0.0" + sources."arr-flatten-1.1.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."async-each-1.0.1" + sources."async-single-1.0.5" + sources."async-write-2.1.0" + sources."atomic-file-0.0.1" + sources."attach-ware-1.1.1" + sources."bail-1.0.3" + sources."balanced-match-1.0.0" + sources."base64-url-2.2.0" + sources."bash-color-0.0.4" + sources."binary-extensions-1.11.0" + sources."binary-search-1.3.4" + sources."bindings-1.3.0" + sources."bl-1.2.2" + sources."blake2s-1.0.1" + sources."brace-expansion-1.1.11" + sources."braces-1.8.5" + sources."broadcast-stream-0.2.2" + sources."buffer-alloc-1.2.0" + sources."buffer-alloc-unsafe-1.1.0" + sources."buffer-fill-1.0.0" + sources."buffer-from-1.1.1" + sources."bytewise-1.1.0" + sources."bytewise-core-1.2.3" + sources."camelcase-2.1.1" + sources."ccount-1.0.3" + sources."chalk-1.1.3" + sources."character-entities-1.2.2" + sources."character-entities-html4-1.1.2" + sources."character-entities-legacy-1.1.2" + sources."character-reference-invalid-1.1.2" + sources."charwise-3.0.1" + sources."chloride-2.2.10" + sources."chloride-test-1.2.2" + sources."chokidar-1.7.0" + sources."chownr-1.0.1" + sources."cli-cursor-1.0.2" + sources."co-3.1.0" + sources."code-point-at-1.1.0" + sources."collapse-white-space-1.0.4" + sources."commander-2.17.1" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."console-control-strings-1.1.0" + sources."cont-1.0.3" + sources."continuable-1.2.0" + (sources."continuable-hash-0.1.4" // { + dependencies = [ + sources."continuable-1.1.8" + ]; + }) + (sources."continuable-list-0.1.6" // { + dependencies = [ + sources."continuable-1.1.8" + ]; + }) + sources."continuable-para-1.2.0" + sources."continuable-series-1.2.0" + sources."core-util-is-1.0.2" + sources."cross-spawn-5.1.0" + sources."debug-2.6.9" + sources."decompress-response-3.3.0" + sources."deep-equal-1.0.1" + sources."deep-extend-0.6.0" + sources."deferred-leveldown-3.0.0" + sources."define-properties-1.1.3" + sources."defined-1.0.0" + sources."delegates-1.0.0" + sources."detab-1.0.2" + sources."detect-libc-1.0.3" + sources."ed2curve-0.1.4" + sources."elegant-spinner-1.0.1" + sources."emoji-named-characters-1.0.2" + sources."emoji-server-1.0.0" + (sources."encoding-down-4.0.1" // { + dependencies = [ + sources."level-codec-8.0.0" + ]; + }) + sources."end-of-stream-1.4.1" + sources."epidemic-broadcast-trees-6.3.4" + sources."errno-0.1.7" + sources."es-abstract-1.12.0" + sources."es-to-primitive-1.1.1" + sources."escape-string-regexp-1.0.5" + sources."exit-hook-1.1.1" + sources."expand-brackets-0.1.5" + sources."expand-range-1.8.2" + sources."expand-template-1.1.1" + sources."explain-error-1.0.4" + sources."extend-3.0.2" + sources."extend.js-0.0.2" + sources."extglob-0.3.2" + sources."fast-future-1.0.2" + sources."filename-regex-2.0.1" + sources."fill-range-2.2.4" + sources."flumecodec-0.0.1" + sources."flumedb-0.4.9" + (sources."flumelog-offset-3.3.1" // { + dependencies = [ + sources."looper-4.0.0" + ]; + }) + (sources."flumeview-hashtable-1.0.4" // { + dependencies = [ + sources."atomic-file-1.1.5" + ]; + }) + (sources."flumeview-level-3.0.5" // { + dependencies = [ + sources."obv-0.0.0" + ]; + }) + (sources."flumeview-query-6.3.0" // { + dependencies = [ + sources."map-filter-reduce-3.1.0" + ]; + }) + (sources."flumeview-reduce-1.3.13" // { + dependencies = [ + sources."atomic-file-1.1.5" + sources."flumecodec-0.0.0" + sources."obv-0.0.0" + ]; + }) + sources."for-each-0.3.3" + sources."for-in-1.0.2" + sources."for-own-0.1.5" + sources."fs-constants-1.0.0" + sources."fs.realpath-1.0.0" + sources."fsevents-1.2.4" + sources."function-bind-1.1.1" + sources."gauge-2.7.4" + sources."github-from-package-0.0.0" + sources."glob-6.0.4" + sources."glob-base-0.3.0" + sources."glob-parent-2.0.0" + sources."globby-4.1.0" + sources."graceful-fs-4.1.11" + sources."graphreduce-3.0.4" + sources."has-1.0.3" + sources."has-ansi-2.0.0" + sources."has-network-0.0.1" + sources."has-unicode-2.0.1" + sources."hashlru-2.2.1" + sources."he-0.5.0" + sources."hoox-0.0.1" + sources."increment-buffer-1.0.1" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."int53-0.2.4" + sources."ip-0.3.3" + sources."irregular-plurals-1.4.0" + sources."is-alphabetical-1.0.2" + sources."is-alphanumerical-1.0.2" + sources."is-binary-path-1.0.1" + sources."is-buffer-1.1.6" + sources."is-callable-1.1.4" + sources."is-date-object-1.0.1" + sources."is-decimal-1.0.2" + sources."is-dotfile-1.0.3" + sources."is-electron-2.1.0" + 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-hexadecimal-1.0.2" + sources."is-number-2.1.0" + sources."is-posix-bracket-0.1.1" + sources."is-primitive-2.0.0" + sources."is-regex-1.0.4" + sources."is-symbol-1.0.1" + sources."is-valid-domain-0.0.5" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-2.1.0" + sources."json-buffer-2.0.11" + sources."kind-of-3.2.2" + sources."level-3.0.2" + sources."level-codec-6.2.0" + sources."level-errors-1.1.2" + sources."level-iterator-stream-2.0.3" + sources."level-packager-2.1.1" + sources."level-post-1.0.7" + (sources."level-sublevel-6.6.5" // { + dependencies = [ + (sources."abstract-leveldown-0.12.4" // { + dependencies = [ + sources."xtend-3.0.0" + ]; + }) + sources."bl-0.8.2" + sources."deferred-leveldown-0.2.0" + sources."isarray-0.0.1" + (sources."levelup-0.19.1" // { + dependencies = [ + sources."xtend-3.0.0" + ]; + }) + sources."ltgt-2.1.3" + sources."prr-0.0.0" + sources."readable-stream-1.0.34" + sources."semver-5.1.1" + sources."string_decoder-0.10.31" + ]; + }) + (sources."leveldown-3.0.2" // { + dependencies = [ + sources."nan-2.10.0" + ]; + }) + sources."levelup-2.0.2" + sources."libsodium-0.7.3" + sources."libsodium-wrappers-0.7.3" + sources."log-symbols-1.0.2" + sources."log-update-1.0.2" + sources."longest-streak-1.0.0" + sources."looper-3.0.0" + sources."lossy-store-1.2.3" + sources."lru-cache-4.1.3" + sources."ltgt-2.2.1" + sources."map-filter-reduce-2.2.1" + sources."map-merge-1.1.0" + sources."markdown-table-0.4.0" + sources."math-random-1.0.1" + sources."mdmanifest-1.0.8" + sources."micromatch-2.3.11" + sources."mimic-response-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."monotonic-timestamp-0.0.9" + sources."ms-2.0.0" + (sources."multiblob-1.13.0" // { + dependencies = [ + sources."deep-extend-0.2.11" + sources."minimist-0.0.10" + sources."pull-file-0.5.0" + sources."rc-0.5.5" + sources."rimraf-2.2.8" + sources."strip-json-comments-0.1.3" + ]; + }) + sources."multiblob-http-0.4.2" + sources."multicb-1.2.2" + sources."multiserver-1.13.3" + sources."muxrpc-6.4.1" + (sources."muxrpc-validation-2.0.1" // { + dependencies = [ + sources."pull-stream-2.28.4" + ]; + }) + (sources."muxrpcli-1.1.0" // { + dependencies = [ + sources."pull-stream-2.28.4" + ]; + }) + (sources."mv-2.1.1" // { + dependencies = [ + sources."rimraf-2.4.5" + ]; + }) + sources."nan-2.11.0" + sources."ncp-2.0.0" + sources."node-abi-2.4.3" + sources."node-gyp-build-3.4.0" + (sources."non-private-ip-1.4.4" // { + dependencies = [ + sources."ip-1.1.5" + ]; + }) + sources."noop-logger-0.1.1" + sources."normalize-path-2.1.1" + sources."normalize-uri-1.1.1" + sources."npm-prefix-1.2.0" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + sources."object-inspect-1.6.0" + sources."object-keys-1.0.12" + sources."object.omit-2.0.1" + sources."observ-0.2.0" + sources."observ-debounce-1.1.1" + sources."obv-0.0.1" + sources."on-change-network-0.0.2" + sources."on-wakeup-1.0.1" + sources."once-1.4.0" + sources."onetime-1.1.0" + sources."opencollective-postinstall-2.0.0" + sources."options-0.0.6" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."packet-stream-2.0.4" + sources."packet-stream-codec-1.1.2" + sources."parse-entities-1.1.2" + sources."parse-glob-3.0.4" + sources."path-is-absolute-1.0.1" + sources."path-parse-1.0.6" + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."plur-2.1.2" + sources."prebuild-install-4.0.0" + sources."preserve-0.2.0" + sources."private-box-0.2.1" + sources."process-nextick-args-2.0.0" + sources."prr-1.0.1" + sources."pseudomap-1.0.2" + sources."pull-abortable-4.1.1" + sources."pull-box-stream-1.0.13" + sources."pull-cat-1.1.11" + sources."pull-cont-0.0.0" + sources."pull-core-1.1.0" + (sources."pull-cursor-3.0.0" // { + dependencies = [ + sources."looper-4.0.0" + ]; + }) + sources."pull-defer-0.2.3" + sources."pull-file-1.1.0" + sources."pull-flatmap-0.0.1" + (sources."pull-fs-1.1.6" // { + dependencies = [ + sources."pull-file-0.5.0" + ]; + }) + sources."pull-glob-1.0.7" + (sources."pull-goodbye-0.0.2" // { + dependencies = [ + sources."pull-stream-3.5.0" + ]; + }) + sources."pull-handshake-1.1.4" + sources."pull-hash-1.0.0" + (sources."pull-inactivity-2.1.2" // { + dependencies = [ + sources."pull-abortable-4.0.0" + ]; + }) + sources."pull-level-2.0.4" + sources."pull-live-1.0.1" + (sources."pull-looper-1.0.0" // { + dependencies = [ + sources."looper-4.0.0" + ]; + }) + sources."pull-many-1.0.8" + sources."pull-next-1.0.1" + sources."pull-notify-0.1.1" + sources."pull-pair-1.1.0" + (sources."pull-paramap-1.2.2" // { + dependencies = [ + sources."looper-4.0.0" + ]; + }) + sources."pull-ping-2.0.2" + sources."pull-pushable-2.2.0" + sources."pull-rate-1.0.2" + sources."pull-reader-1.3.1" + sources."pull-sink-through-0.0.0" + sources."pull-stream-3.6.9" + sources."pull-stream-to-stream-1.3.4" + sources."pull-stringify-1.2.2" + sources."pull-through-1.0.18" + sources."pull-traverse-1.0.3" + sources."pull-utf8-decoder-1.0.2" + (sources."pull-window-2.1.4" // { + dependencies = [ + sources."looper-2.0.0" + ]; + }) + (sources."pull-write-1.1.4" // { + dependencies = [ + sources."looper-4.0.0" + ]; + }) + sources."pull-write-file-0.2.4" + sources."pull-ws-3.3.1" + sources."pump-2.0.1" + sources."push-stream-10.0.3" + sources."push-stream-to-pull-stream-1.0.3" + (sources."randomatic-3.1.0" // { + dependencies = [ + sources."is-number-4.0.0" + sources."kind-of-6.0.2" + ]; + }) + sources."rc-1.2.8" + sources."readable-stream-2.3.6" + sources."readdirp-2.1.0" + sources."regex-cache-0.4.4" + sources."relative-url-1.0.2" + sources."remark-3.2.3" + sources."remark-html-2.0.2" + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.3" + sources."repeat-string-1.6.1" + sources."resolve-1.7.1" + sources."restore-cursor-1.0.1" + sources."resumer-0.0.0" + (sources."rimraf-2.6.2" // { + dependencies = [ + sources."glob-7.1.3" + ]; + }) + sources."safe-buffer-5.1.2" + sources."secret-handshake-1.1.13" + (sources."secret-stack-4.1.0" // { + dependencies = [ + sources."ip-1.1.5" + ]; + }) + (sources."secure-scuttlebutt-18.2.0" // { + dependencies = [ + sources."deep-equal-0.2.2" + ]; + }) + sources."semver-5.5.1" + sources."separator-escape-0.0.0" + sources."set-blocking-2.0.0" + sources."set-immediate-shim-1.0.1" + sources."sha.js-2.4.5" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."shellsubstitute-1.2.0" + sources."signal-exit-3.0.2" + sources."simple-concat-1.0.0" + sources."simple-get-2.8.1" + sources."smart-buffer-4.0.1" + (sources."socks-2.2.1" // { + dependencies = [ + sources."ip-1.1.5" + ]; + }) + sources."sodium-browserify-1.2.4" + (sources."sodium-browserify-tweetnacl-0.2.3" // { + dependencies = [ + sources."sha.js-2.4.11" + ]; + }) + sources."sodium-chloride-1.1.0" + sources."sodium-native-2.2.1" + sources."split-buffer-1.0.0" + sources."ssb-blobs-1.1.5" + sources."ssb-client-4.6.0" + (sources."ssb-config-2.2.0" // { + dependencies = [ + sources."deep-extend-0.4.2" + ]; + }) + sources."ssb-ebt-5.2.2" + (sources."ssb-friends-2.4.0" // { + dependencies = [ + sources."pull-cont-0.1.1" + ]; + }) + sources."ssb-keys-7.0.16" + sources."ssb-links-3.0.3" + sources."ssb-msgs-5.2.0" + (sources."ssb-query-2.2.1" // { + dependencies = [ + sources."flumeview-query-git://github.com/mmckegg/flumeview-query#map" + sources."map-filter-reduce-3.1.0" + ]; + }) + (sources."ssb-ref-2.11.2" // { + dependencies = [ + sources."ip-1.1.5" + ]; + }) + sources."ssb-validate-3.0.10" + sources."ssb-ws-2.1.1" + sources."stack-0.1.0" + sources."statistics-3.3.0" + sources."stream-to-pull-stream-1.7.2" + sources."string-width-1.0.2" + sources."string.prototype.trim-1.1.2" + sources."string_decoder-1.1.1" + sources."stringify-entities-1.3.2" + sources."strip-ansi-3.0.1" + sources."strip-json-comments-2.0.1" + sources."supports-color-2.0.0" + (sources."tape-4.9.1" // { + dependencies = [ + sources."glob-7.1.3" + ]; + }) + (sources."tar-fs-1.16.3" // { + dependencies = [ + sources."pump-1.0.3" + ]; + }) + sources."tar-stream-1.6.1" + sources."text-table-0.2.0" + sources."through-2.3.8" + sources."to-buffer-1.1.1" + sources."to-vfile-1.0.0" + sources."trim-0.0.1" + sources."trim-lines-1.1.1" + sources."trim-trailing-lines-1.1.1" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."tweetnacl-auth-0.3.1" + sources."typedarray-0.0.6" + sources."typewise-1.0.3" + sources."typewise-core-1.2.0" + sources."typewiselite-1.0.0" + sources."uint48be-1.0.2" + sources."ultron-1.0.2" + sources."unherit-1.1.1" + sources."unified-2.1.4" + sources."unist-util-is-2.1.2" + sources."unist-util-visit-1.4.0" + sources."unist-util-visit-parents-2.0.1" + sources."untildify-2.1.0" + sources."user-home-2.0.0" + sources."util-deprecate-1.0.2" + sources."vfile-1.4.0" + sources."vfile-find-down-1.0.0" + sources."vfile-find-up-1.0.0" + sources."vfile-reporter-1.5.0" + sources."vfile-sort-1.0.0" + sources."ware-1.3.0" + sources."which-1.3.1" + sources."which-pm-runs-1.0.0" + sources."wide-align-1.1.3" + sources."word-wrap-1.2.3" + sources."wrap-fn-0.1.5" + sources."wrappy-1.0.2" + sources."ws-1.1.5" + sources."xtend-4.0.1" + sources."yallist-2.1.2" + sources."zerr-1.0.4" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "network protocol layer for secure-scuttlebutt"; + homepage = https://github.com/ssbc/scuttlebot; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; semver = nodeEnv.buildNodePackage { name = "semver"; packageName = "semver"; @@ -49148,7 +52068,7 @@ in sources."bytes-1.0.0" sources."cache-base-1.0.1" sources."camelcase-4.1.0" - sources."capture-stack-trace-1.0.0" + sources."capture-stack-trace-1.0.1" sources."center-align-0.1.3" sources."chalk-1.1.3" sources."charenc-0.0.2" @@ -49444,7 +52364,7 @@ in sources."nan-2.11.0" sources."nanomatch-1.2.13" sources."native-promise-only-0.8.1" - (sources."nodemon-1.18.3" // { + (sources."nodemon-1.18.4" // { dependencies = [ sources."debug-3.1.0" sources."supports-color-5.5.0" @@ -49482,7 +52402,7 @@ in sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" - (sources."path-loader-1.0.7" // { + (sources."path-loader-1.0.8" // { dependencies = [ sources."debug-3.1.0" sources."qs-6.5.2" @@ -49701,7 +52621,7 @@ in sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."valid-url-1.0.9" - sources."validator-10.7.0" + sources."validator-10.7.1" sources."which-1.3.1" sources."widest-line-2.0.0" sources."window-size-0.1.0" @@ -49776,10 +52696,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.95.0"; + version = "0.96.0"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.95.0.tgz"; - sha512 = "vy6jMYs7CDwn47CejYHNi+++OdQue7xGIBhbLfekQ/G6MDxKRm0QB0/xWScz46/JvQAvF6pJAS5Q907l0i5iQA=="; + url = "https://registry.npmjs.org/three/-/three-0.96.0.tgz"; + sha512 = "tS+A5kelQgBblElc/E1G5zR3m6wNjbqmrf6OAjijuNJM7yoYQjOktPoa+Lglx73OTiTOJ3+Ff+pgWdOFt7cOhQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -49897,7 +52817,7 @@ in sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.4.8" + sources."uglify-js-3.4.9" sources."universalify-0.1.2" sources."uuid-3.3.2" sources."verror-1.10.0" @@ -50105,10 +53025,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.0.1.tgz"; - sha512 = "zQIMOmC+372pC/CCVLqnQ0zSBiY7HHodU7mpQdjiZddek4GMj31I3dUJ7gAs9o65X7mnRma6OokOkc6f9jjfBg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-3.0.3.tgz"; + sha512 = "kk80vLW9iGtjMnIv11qyxLqZm20UklzuR2tL0QAnDIygIUIemcZMxlMWudl9OOt76H3ntVzcTiddQ1/pAAJMYg=="; }; buildInputs = globalBuildInputs; meta = { @@ -50139,7 +53059,7 @@ in sources."array-uniq-1.0.3" sources."asynckit-0.4.0" sources."balanced-match-1.0.0" - sources."bluebird-3.5.1" + sources."bluebird-3.5.2" (sources."boxen-1.3.0" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -50150,7 +53070,7 @@ in sources."brace-expansion-1.1.11" sources."buffer-from-1.1.1" sources."camelcase-4.1.0" - sources."capture-stack-trace-1.0.0" + sources."capture-stack-trace-1.0.1" sources."chalk-1.1.3" sources."ci-info-1.4.0" sources."cli-boxes-1.0.0" @@ -50229,7 +53149,7 @@ in sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.3" sources."make-dir-1.3.0" - sources."make-error-1.3.4" + sources."make-error-1.3.5" sources."make-error-cause-1.2.2" sources."mime-db-1.36.0" sources."mime-types-2.1.20" @@ -50339,10 +53259,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.4.8"; + version = "3.4.9"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.8.tgz"; - sha512 = "WatYTD84gP/867bELqI2F/2xC9PQBETn/L+7RGq9MQOA/7yFBNvY1UwXqvtILeE6n0ITwBXxp34M0/o70dzj6A=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz"; + sha512 = "8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q=="; }; dependencies = [ sources."commander-2.17.1" @@ -50395,7 +53315,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."better-assert-1.0.2" sources."blob-0.0.4" - sources."bluebird-3.5.1" + sources."bluebird-3.5.2" sources."blueimp-md5-2.10.0" sources."body-parser-1.18.3" sources."brace-expansion-1.1.11" @@ -50463,7 +53383,7 @@ in ]; }) sources."ecc-jsbn-0.1.2" - sources."editions-2.0.1" + sources."editions-2.0.2" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" (sources."engine.io-3.2.0" // { @@ -50532,7 +53452,7 @@ in sources."gauge-2.7.4" sources."get-caller-file-1.0.3" sources."get-stream-3.0.0" - sources."getmac-1.4.5" + sources."getmac-1.4.6" sources."getpass-0.1.7" sources."glob-7.1.3" sources."graceful-fs-4.1.11" @@ -50845,7 +53765,7 @@ in sources."base64-js-0.0.8" sources."bcrypt-pbkdf-1.0.2" sources."bl-1.2.2" - sources."bluebird-3.5.1" + sources."bluebird-3.5.2" sources."brace-expansion-1.1.11" sources."buffer-3.6.0" sources."buffer-alloc-1.2.0" @@ -50854,12 +53774,12 @@ in sources."buffer-fill-1.0.0" sources."builtins-1.0.3" sources."camelcase-1.2.1" - sources."capture-stack-trace-1.0.0" + sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" sources."caw-2.0.1" sources."center-align-0.1.3" sources."chalk-2.4.1" - sources."chardet-0.5.0" + sources."chardet-0.7.0" sources."cli-cursor-2.1.0" sources."cli-spinners-1.3.1" sources."cli-width-2.2.0" @@ -50910,7 +53830,7 @@ in sources."esprima-4.0.1" sources."extend-3.0.2" sources."extend-shallow-2.0.1" - sources."external-editor-3.0.1" + sources."external-editor-3.0.3" sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.0.0" @@ -51041,7 +53961,7 @@ in sources."right-align-0.1.3" sources."rimraf-2.6.2" sources."run-async-2.3.0" - sources."rxjs-6.2.2" + sources."rxjs-6.3.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" (sources."seek-bzip-1.0.5" // { @@ -51149,7 +54069,7 @@ in sources."@types/graphql-0.12.6" sources."@types/long-4.0.0" sources."@types/mime-2.0.0" - sources."@types/node-10.9.2" + sources."@types/node-10.9.4" sources."@types/range-parser-1.2.2" sources."@types/serve-static-1.13.2" sources."@types/ws-5.1.2" @@ -51170,11 +54090,11 @@ in sources."ansi-styles-3.2.1" sources."anymatch-2.0.0" sources."apollo-cache-1.1.16" - sources."apollo-cache-control-0.2.2" + sources."apollo-cache-control-0.2.3" sources."apollo-cache-inmemory-1.2.9" sources."apollo-client-2.4.1" - sources."apollo-datasource-0.1.2" - sources."apollo-engine-reporting-0.0.2" + sources."apollo-datasource-0.1.3" + sources."apollo-engine-reporting-0.0.3" sources."apollo-engine-reporting-protobuf-0.0.1" sources."apollo-link-1.2.2" sources."apollo-link-context-1.0.8" @@ -51185,11 +54105,11 @@ in sources."apollo-link-state-0.4.1" sources."apollo-link-ws-1.0.8" sources."apollo-server-caching-0.1.2" - sources."apollo-server-core-2.0.4" - sources."apollo-server-env-2.0.2" + sources."apollo-server-core-2.0.5" + sources."apollo-server-env-2.0.3" sources."apollo-server-errors-2.0.2" - sources."apollo-server-express-2.0.4" - sources."apollo-tracing-0.2.2" + sources."apollo-server-express-2.0.5" + sources."apollo-tracing-0.2.3" sources."apollo-upload-client-8.1.0" sources."apollo-utilities-1.0.20" sources."argparse-1.0.10" @@ -51256,11 +54176,11 @@ in sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."camelcase-4.1.0" - sources."capture-stack-trace-1.0.0" + sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" sources."caw-2.0.1" sources."chalk-2.4.1" - sources."chardet-0.5.0" + sources."chardet-0.7.0" sources."chokidar-2.0.4" sources."ci-info-1.4.0" (sources."class-utils-0.3.6" // { @@ -51410,7 +54330,11 @@ in sources."express-history-api-fallback-2.2.1" sources."extend-3.0.2" sources."extend-shallow-2.0.1" - sources."external-editor-3.0.1" + (sources."external-editor-3.0.3" // { + dependencies = [ + sources."iconv-lite-0.4.24" + ]; + }) (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" @@ -51472,7 +54396,7 @@ in sources."graceful-readlink-1.0.1" sources."graphql-0.13.2" sources."graphql-anywhere-4.1.18" - sources."graphql-extensions-0.1.2" + sources."graphql-extensions-0.1.3" sources."graphql-subscriptions-0.5.8" sources."graphql-tag-2.9.2" sources."graphql-tools-3.1.1" @@ -51608,7 +54532,7 @@ in sources."ms-2.0.0" sources."mute-stream-0.0.7" sources."nan-2.11.0" - sources."nanoid-1.2.1" + sources."nanoid-1.2.2" (sources."nanomatch-1.2.13" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -51620,7 +54544,7 @@ in sources."node-fetch-2.2.0" sources."node-ipc-9.1.1" sources."node-notifier-5.2.1" - sources."nodemon-1.18.3" + sources."nodemon-1.18.4" sources."nopt-1.0.10" sources."normalize-path-2.1.1" sources."npm-conf-1.1.3" @@ -51731,7 +54655,7 @@ in sources."retry-0.10.1" sources."rimraf-2.6.2" sources."run-async-2.3.0" - sources."rxjs-6.2.2" + sources."rxjs-6.3.1" sources."safe-buffer-5.1.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -52000,7 +54924,7 @@ in sources."form-data-1.0.1" sources."fs-extra-0.26.7" sources."fs.realpath-1.0.0" - sources."generate-function-2.2.0" + sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" (sources."getpass-0.1.7" // { dependencies = [ @@ -52167,7 +55091,7 @@ in sources."base64-js-1.3.0" sources."big.js-3.2.0" sources."binary-extensions-1.11.0" - sources."bluebird-3.5.1" + sources."bluebird-3.5.2" sources."bn.js-4.11.8" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { @@ -52550,7 +55474,7 @@ in sources."util-deprecate-1.0.2" sources."vm-browserify-0.0.4" sources."watchpack-1.6.0" - (sources."webpack-sources-1.1.0" // { + (sources."webpack-sources-1.2.0" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -52587,7 +55511,7 @@ in sources."bencode-2.0.0" sources."binary-search-1.3.4" sources."bitfield-2.0.0" - (sources."bittorrent-dht-8.4.0" // { + (sources."bittorrent-dht-9.0.0" // { dependencies = [ sources."debug-3.1.0" ]; @@ -52596,6 +55520,7 @@ in (sources."bittorrent-protocol-3.0.1" // { dependencies = [ sources."debug-3.1.0" + sources."readable-stream-2.3.6" ]; }) (sources."bittorrent-tracker-9.10.1" // { @@ -52605,7 +55530,11 @@ in ]; }) sources."blob-to-buffer-1.2.8" - sources."block-stream2-1.1.0" + (sources."block-stream2-1.1.0" // { + dependencies = [ + sources."readable-stream-2.3.6" + ]; + }) sources."bn.js-4.11.8" sources."brace-expansion-1.1.11" sources."browserify-package-json-1.0.1" @@ -52625,15 +55554,23 @@ in sources."mime-1.6.0" ]; }) - sources."chunk-store-stream-3.0.1" + (sources."chunk-store-stream-3.0.1" // { + dependencies = [ + sources."readable-stream-2.3.6" + ]; + }) sources."clivas-0.2.0" sources."closest-to-2.0.0" sources."colour-0.7.1" sources."compact2string-1.4.0" sources."concat-map-0.0.1" - sources."concat-stream-1.6.2" + (sources."concat-stream-1.6.2" // { + dependencies = [ + sources."readable-stream-2.3.6" + ]; + }) sources."core-util-is-1.0.2" - sources."create-torrent-3.32.1" + sources."create-torrent-3.33.0" sources."debug-2.6.9" sources."decompress-response-3.3.0" sources."defined-1.0.0" @@ -52644,7 +55581,7 @@ in }) sources."dns-packet-1.3.1" sources."dns-txt-2.0.2" - (sources."ecstatic-3.2.1" // { + (sources."ecstatic-3.3.0" // { dependencies = [ sources."mime-1.6.0" ]; @@ -52652,7 +55589,11 @@ in sources."elementtree-0.1.7" sources."end-of-stream-1.4.1" sources."executable-4.1.1" - sources."filestream-4.1.3" + (sources."filestream-4.1.3" // { + dependencies = [ + sources."readable-stream-2.3.6" + ]; + }) sources."flatten-1.0.2" (sources."fs-chunk-store-1.7.0" // { dependencies = [ @@ -52675,8 +55616,12 @@ in sources."is-typedarray-1.0.0" sources."isarray-1.0.0" sources."junk-2.1.0" - sources."k-bucket-4.0.1" - sources."k-rpc-5.0.0" + sources."k-bucket-5.0.0" + (sources."k-rpc-5.0.0" // { + dependencies = [ + sources."k-bucket-4.0.1" + ]; + }) sources."k-rpc-socket-1.8.0" sources."last-one-wins-1.0.4" (sources."load-ip-set-2.1.0" // { @@ -52686,10 +55631,14 @@ in }) sources."long-2.4.0" sources."lru-3.1.0" - sources."magnet-uri-5.2.3" + sources."magnet-uri-5.2.4" sources."mdns-js-0.5.0" sources."mdns-js-packet-0.2.0" - sources."mediasource-2.2.2" + (sources."mediasource-2.2.2" // { + dependencies = [ + sources."readable-stream-2.3.6" + ]; + }) sources."memory-chunk-store-1.3.0" sources."mime-2.3.1" sources."mimic-response-1.0.1" @@ -52702,14 +55651,22 @@ in }) sources."moment-2.22.2" sources."mp4-box-encoding-1.3.0" - sources."mp4-stream-2.0.3" + (sources."mp4-stream-2.0.3" // { + dependencies = [ + sources."readable-stream-2.3.6" + ]; + }) sources."ms-2.0.0" (sources."multicast-dns-6.2.3" // { dependencies = [ sources."thunky-1.0.2" ]; }) - sources."multistream-2.1.1" + (sources."multistream-2.1.1" // { + dependencies = [ + sources."readable-stream-2.3.6" + ]; + }) sources."netmask-1.0.6" sources."network-address-1.1.2" sources."next-event-1.0.0" @@ -52744,8 +55701,12 @@ in sources."random-iterate-1.0.1" sources."randombytes-2.0.6" sources."range-parser-1.2.0" - sources."range-slice-stream-1.2.0" - sources."readable-stream-2.3.6" + (sources."range-slice-stream-1.2.0" // { + dependencies = [ + sources."readable-stream-2.3.6" + ]; + }) + sources."readable-stream-3.0.2" sources."record-cache-1.1.0" (sources."render-media-3.1.3" // { dependencies = [ @@ -52765,12 +55726,14 @@ in (sources."simple-peer-9.1.2" // { dependencies = [ sources."debug-3.1.0" + sources."readable-stream-2.3.6" ]; }) sources."simple-sha1-2.1.1" (sources."simple-websocket-7.2.0" // { dependencies = [ sources."debug-3.1.0" + sources."readable-stream-2.3.6" ]; }) sources."speedometer-1.1.0" @@ -52784,7 +55747,7 @@ in sources."through-2.3.8" sources."thunky-0.1.0" sources."to-arraybuffer-1.0.1" - (sources."torrent-discovery-9.0.2" // { + (sources."torrent-discovery-9.1.1" // { dependencies = [ sources."debug-3.1.0" ]; @@ -52798,7 +55761,7 @@ in sources."upnp-device-client-1.0.2" sources."upnp-mediarenderer-client-1.2.4" sources."url-join-2.0.5" - (sources."ut_metadata-3.2.2" // { + (sources."ut_metadata-3.3.0" // { dependencies = [ sources."debug-3.1.0" ]; @@ -52807,11 +55770,10 @@ in sources."utf-8-validate-5.0.1" sources."util-deprecate-1.0.2" sources."videostream-2.5.1" - sources."vlc-command-1.1.1" - (sources."webtorrent-0.102.2" // { + sources."vlc-command-1.1.2" + (sources."webtorrent-0.102.4" // { dependencies = [ sources."debug-3.1.0" - sources."readable-stream-3.0.2" sources."simple-get-3.0.3" ]; }) @@ -52822,7 +55784,6 @@ in sources."xmlbuilder-9.0.7" sources."xmldom-0.1.27" sources."xtend-4.0.1" - sources."zero-fill-2.2.3" ]; buildInputs = globalBuildInputs; meta = { @@ -52836,27 +55797,35 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "2.8.0"; + version = "2.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-2.8.0.tgz"; - sha512 = "3JuPYU3yrefysm3pvGwRP5k9plRMPUeLo5KLp2TSnE9g4t7x6SeIWZEWWG3jwVeFsPQuIj3sAuVHEDO5ai9mCw=="; + url = "https://registry.npmjs.org/web-ext/-/web-ext-2.9.1.tgz"; + sha512 = "sK5ebAiUNJFG+KfFjjvWks9ihecy0TdVCrrnSW/tZ15QFO6u4LCIQKCuBr7FyGMjC+IOGJFB7pS1ZbyPNJ72GQ=="; }; dependencies = [ sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" - sources."@types/node-10.9.2" + sources."@types/node-10.9.4" sources."JSONSelect-0.2.1" sources."abbrev-1.1.1" sources."acorn-5.7.2" - sources."acorn-jsx-4.1.1" + (sources."acorn-jsx-3.0.1" // { + dependencies = [ + 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-1.2.6" // { + (sources."addons-linter-1.3.1" // { dependencies = [ sources."source-map-0.6.1" sources."source-map-support-0.5.6" - sources."yargs-12.0.1" + (sources."yargs-12.0.1" // { + dependencies = [ + sources."os-locale-2.1.0" + ]; + }) ]; }) sources."adm-zip-0.4.11" @@ -52945,7 +55914,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."buffer-5.2.0" + sources."buffer-5.2.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -52959,7 +55928,7 @@ in sources."caller-path-0.1.0" sources."callsites-0.2.0" sources."camelcase-4.1.0" - sources."capture-stack-trace-1.0.0" + sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" (sources."chalk-2.4.0" // { dependencies = [ @@ -53021,7 +55990,7 @@ in sources."crc-3.8.0" sources."crc32-stream-2.0.0" sources."create-error-class-3.0.2" - sources."cross-spawn-6.0.5" + sources."cross-spawn-5.1.0" sources."crx-parser-0.1.2" sources."crypto-random-string-1.0.0" sources."css-select-1.2.0" @@ -53050,15 +56019,12 @@ in sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."detect-indent-4.0.0" - (sources."dispensary-0.21.0" // { + (sources."dispensary-0.22.0" // { dependencies = [ - sources."ansi-styles-3.2.1" sources."async-2.6.1" - sources."chalk-2.4.1" - sources."pino-4.17.6" + sources."os-locale-2.1.0" sources."source-map-0.6.1" sources."source-map-support-0.5.9" - sources."supports-color-5.5.0" sources."yargs-12.0.1" ]; }) @@ -53106,6 +56072,7 @@ in (sources."eslint-5.0.1" // { dependencies = [ sources."ansi-regex-3.0.0" + sources."cross-spawn-6.0.5" sources."debug-3.1.0" sources."globals-11.7.0" sources."strip-ansi-4.0.0" @@ -53113,8 +56080,6 @@ in }) (sources."eslint-plugin-no-unsafe-innerhtml-1.0.16" // { dependencies = [ - sources."acorn-3.3.0" - sources."acorn-jsx-3.0.1" sources."ajv-4.11.8" sources."ajv-keywords-1.5.1" sources."ansi-escapes-1.4.0" @@ -53144,7 +56109,11 @@ in }) sources."eslint-scope-4.0.0" sources."eslint-visitor-keys-1.0.0" - sources."espree-4.0.0" + (sources."espree-4.0.0" // { + dependencies = [ + sources."acorn-jsx-4.1.1" + ]; + }) sources."esprima-3.1.3" sources."esquery-1.0.1" sources."esrecurse-4.2.1" @@ -53152,11 +56121,7 @@ in sources."esutils-2.0.2" sources."event-emitter-0.3.5" sources."event-to-promise-0.8.0" - (sources."execa-0.7.0" // { - dependencies = [ - sources."cross-spawn-5.1.0" - ]; - }) + sources."execa-0.7.0" sources."exit-hook-1.1.1" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -53192,11 +56157,11 @@ in sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" sources."fast-json-parse-1.0.3" - sources."fast-json-patch-2.0.6" + sources."fast-json-patch-2.0.7" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" sources."fast-redact-1.1.14" - sources."fast-safe-stringify-1.2.3" + sources."fast-safe-stringify-2.0.6" sources."fd-slicer-1.1.0" sources."figures-2.0.0" sources."file-entry-cache-2.0.0" @@ -53207,7 +56172,7 @@ in ]; }) sources."find-up-3.0.0" - (sources."firefox-profile-1.1.0" // { + (sources."firefox-profile-1.2.0" // { dependencies = [ sources."async-2.5.0" sources."fs-extra-4.0.3" @@ -53242,7 +56207,7 @@ in sources."which-1.2.4" ]; }) - sources."generate-function-2.2.0" + sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" sources."get-caller-file-1.0.3" sources."get-stream-3.0.0" @@ -53270,7 +56235,7 @@ in sources."graphlib-2.1.5" sources."growly-1.3.0" sources."har-schema-2.0.0" - (sources."har-validator-5.0.3" // { + (sources."har-validator-5.1.0" // { dependencies = [ sources."ajv-5.5.2" sources."fast-deep-equal-1.1.0" @@ -53539,7 +56504,7 @@ in 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."oauth-sign-0.9.0" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { dependencies = [ @@ -53561,11 +56526,20 @@ in sources."opn-5.3.0" sources."optionator-0.8.2" sources."os-homedir-1.0.2" - sources."os-locale-2.1.0" + (sources."os-locale-3.0.0" // { + dependencies = [ + sources."cross-spawn-6.0.5" + sources."execa-0.10.0" + sources."invert-kv-2.0.0" + sources."lcid-2.0.0" + sources."mem-3.0.1" + ]; + }) sources."os-name-2.0.1" sources."os-shim-0.1.3" sources."os-tmpdir-1.0.2" sources."p-finally-1.0.0" + sources."p-is-promise-1.1.0" sources."p-limit-2.0.0" sources."p-locate-3.0.0" sources."p-try-2.0.0" @@ -53593,12 +56567,7 @@ in sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - (sources."pino-5.0.0-rc.4" // { - dependencies = [ - sources."fast-safe-stringify-2.0.6" - sources."quick-format-unescaped-3.0.0" - ]; - }) + sources."pino-5.0.4" sources."pino-std-serializers-2.2.1" sources."pluralize-7.0.0" sources."po2json-0.4.5" @@ -53626,10 +56595,11 @@ in }) sources."proxy-from-env-1.0.0" sources."pseudomap-1.0.2" + sources."psl-1.1.29" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."quick-format-unescaped-1.1.2" + sources."quick-format-unescaped-3.0.0" (sources."raw-body-2.3.3" // { dependencies = [ sources."iconv-lite-0.4.23" @@ -53667,7 +56637,7 @@ in sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" sources."repeating-2.0.1" - sources."request-2.87.0" + sources."request-2.88.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."require-uncached-1.0.3" @@ -53680,7 +56650,7 @@ in sources."run-async-2.3.0" sources."rx-lite-3.1.2" sources."rx-lite-aggregates-4.0.8" - sources."rxjs-5.5.11" + sources."rxjs-5.5.12" sources."safe-buffer-5.1.2" sources."safe-json-stringify-1.2.0" sources."safe-regex-1.1.0" @@ -53710,11 +56680,19 @@ in sources."shellwords-0.1.1" (sources."sign-addon-0.3.1" // { dependencies = [ + sources."ajv-5.5.2" sources."babel-polyfill-6.16.0" sources."es6-error-4.0.0" + sources."fast-deep-equal-1.1.0" + sources."har-validator-5.0.3" + sources."json-schema-traverse-0.3.1" sources."mz-2.5.0" + sources."oauth-sign-0.8.2" + sources."punycode-1.4.1" sources."regenerator-runtime-0.9.6" + sources."request-2.87.0" sources."source-map-support-0.4.6" + sources."tough-cookie-2.3.4" ]; }) sources."signal-exit-3.0.2" @@ -53824,7 +56802,7 @@ in }) sources."socks-1.1.10" sources."socks-proxy-agent-3.0.1" - sources."sonic-boom-0.5.0" + sources."sonic-boom-0.6.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.2" (sources."source-map-support-0.5.3" // { @@ -53840,7 +56818,6 @@ in sources."spdx-license-ids-3.0.0" sources."split-0.3.3" sources."split-string-3.1.0" - sources."split2-2.2.0" sources."sprintf-js-1.0.3" sources."sshpk-1.14.2" (sources."static-extend-0.1.2" // { @@ -53896,7 +56873,6 @@ in sources."thenify-3.3.0" sources."thenify-all-1.6.0" sources."through-2.3.8" - sources."through2-2.0.3" sources."thunkify-2.1.2" sources."timed-out-4.0.1" sources."tmp-0.0.33" @@ -53907,7 +56883,7 @@ in sources."to-regex-range-2.1.1" sources."toml-2.3.3" sources."tosource-1.0.0" - (sources."tough-cookie-2.3.4" // { + (sources."tough-cookie-2.4.3" // { dependencies = [ sources."punycode-1.4.1" ]; @@ -54118,10 +57094,10 @@ in sources."call-me-maybe-1.0.1" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."capture-stack-trace-1.0.0" + sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" sources."chalk-2.4.1" - sources."chardet-0.5.0" + sources."chardet-0.7.0" sources."ci-info-1.4.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -54227,7 +57203,7 @@ in sources."is-extendable-1.0.1" ]; }) - sources."external-editor-3.0.1" + sources."external-editor-3.0.3" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" @@ -54309,7 +57285,7 @@ in sources."chardet-0.4.2" sources."external-editor-2.2.0" sources."inquirer-5.2.0" - sources."rxjs-5.5.11" + sources."rxjs-5.5.12" ]; }) sources."into-stream-3.1.0" @@ -54547,7 +57523,7 @@ in sources."root-check-1.0.0" sources."run-async-2.3.0" sources."rx-4.1.0" - sources."rxjs-6.2.2" + sources."rxjs-6.3.1" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix index c6f1b6d17581..4994ceca7fb3 100644 --- a/pkgs/development/ocaml-modules/re/default.nix +++ b/pkgs/development/ocaml-modules/re/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, jbuilder, ounit }: +{ stdenv, fetchzip, ocaml, findlib, jbuilder, ounit, seq }: if !stdenv.lib.versionAtLeast ocaml.version "4.02" then throw "re is not available for OCaml ${ocaml.version}" @@ -6,14 +6,15 @@ else stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-re-${version}"; - version = "1.7.3"; + version = "1.8.0"; src = fetchzip { url = "https://github.com/ocaml/ocaml-re/archive/${version}.tar.gz"; - sha256 = "1pb6w9wqg6gzcfaaw6ckv1bqjgjpmrzzqz7r0mp9w16qbf3i54zr"; + sha256 = "0ch6hvmm4ym3w2vghjxf3ka5j1023a37980fqi4zcb7sx756z20i"; }; buildInputs = [ ocaml findlib jbuilder ounit ]; + propagatedBuildInputs = [ seq ]; doCheck = true; checkPhase = "jbuilder runtest"; diff --git a/pkgs/development/ocaml-modules/seq/default.nix b/pkgs/development/ocaml-modules/seq/default.nix new file mode 100644 index 000000000000..f4918b420c40 --- /dev/null +++ b/pkgs/development/ocaml-modules/seq/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }: + +stdenv.mkDerivation rec { + version = "0.1"; + name = "ocaml${ocaml.version}-seq-${version}"; + + src = fetchFromGitHub { + owner = "c-cube"; + repo = "seq"; + rev = version; + sha256 = "1cjpsc7q76yfgq9iyvswxgic4kfq2vcqdlmxjdjgd4lx87zvcwrv"; + }; + + buildInputs = [ ocaml findlib ocamlbuild ]; + + createFindlibDestdir = true; + + meta = { + description = "Compatibility package for OCaml’s standard iterator type starting from 4.07"; + license = stdenv.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix index dd06d4dde7a6..7c4e15f85683 100644 --- a/pkgs/development/python-modules/alot/default.nix +++ b/pkgs/development/python-modules/alot/default.nix @@ -47,6 +47,8 @@ buildPythonPackage rec { mkdir -p $out/share/{applications,alot} cp -r extra/themes $out/share/alot + install -D extra/completion/alot-completion.zsh $out/share/zsh/site-functions/_alot + sed "s,/usr/bin,$out/bin,g" extra/alot.desktop > $out/share/applications/alot.desktop ''; diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index 0638ea3a36d2..a0183e4595c4 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro}: +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro, futures}: buildPythonPackage rec { version = "0.11.5"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "bfb5807bfb5effd74f2cfe65e4e3e8564a9e72b25e099f655d8ad0d362a63b9f"; }; - buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ avro ]) ; + buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ avro futures ]) ; # Tests fail for python3 under this pypi release doCheck = if isPy3k then false else true; diff --git a/pkgs/development/python-modules/cozy/default.nix b/pkgs/development/python-modules/cozy/default.nix index 0feca2773b37..7515891456e9 100644 --- a/pkgs/development/python-modules/cozy/default.nix +++ b/pkgs/development/python-modules/cozy/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchFromGitHub, lib, +{ buildPythonPackage, isPy3k, fetchFromGitHub, lib, z3, ply, python-igraph, oset, ordered-set, dictionaries }: buildPythonPackage { @@ -29,6 +29,8 @@ buildPythonPackage { $out/bin/cozy --help ''; + disabled = !isPy3k; + meta = { description = "The collection synthesizer"; homepage = https://cozy.uwplse.org/; diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix index 19ef783fe759..39634b8d293a 100644 --- a/pkgs/development/python-modules/django-raster/default.nix +++ b/pkgs/development/python-modules/django-raster/default.nix @@ -1,11 +1,13 @@ -{ stdenv, buildPythonPackage, fetchPypi, +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, numpy, django_colorful, pillow, psycopg2, - pyparsing, django, celery + pyparsing, django_2_1, celery, boto3 }: buildPythonPackage rec { version = "0.6"; pname = "django-raster"; + disabled = !isPy3k; + src = fetchPypi { inherit pname version; sha256 = "9a0f8e71ebeeeb5380c6ca68e027e9de335f43bc15e89dd22e7a470c4eb7aeb8"; @@ -15,7 +17,7 @@ buildPythonPackage rec { doCheck = false; propagatedBuildInputs = [ numpy django_colorful pillow psycopg2 - pyparsing django celery ]; + pyparsing django_2_1 celery boto3 ]; meta = with stdenv.lib; { description = "Basic raster data integration for Django"; diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index e6d347b440d3..0e6ab256d0d8 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -12,6 +12,8 @@ buildPythonPackage rec { sha256 = "a156129f0904cb7eb24aa0745b6075da54f2c31db168ed3bcac8a4bd716d77b2"; }; + CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; + buildInputs = [ gdal ]; diff --git a/pkgs/development/python-modules/flask-ldap-login/default.nix b/pkgs/development/python-modules/flask-ldap-login/default.nix index b95e694a232f..99b57dac816f 100644 --- a/pkgs/development/python-modules/flask-ldap-login/default.nix +++ b/pkgs/development/python-modules/flask-ldap-login/default.nix @@ -1,16 +1,27 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch , flask, flask_wtf, flask_testing, ldap , mock, nose }: buildPythonPackage rec { pname = "flask-ldap-login"; - version = "0.3.0"; + version = "0.3.4"; + disabled = isPy3k; - src = fetchPypi { - inherit pname version; - sha256 = "085rik7q8xrp5g95346p6jcp9m2yr8kamwb2kbiw4q0b0fpnnlgq"; + src = fetchFromGitHub { + owner = "ContinuumIO"; + repo = "flask-ldap-login"; + rev = version; + sha256 = "1l6zahqhwn5g9fmhlvjv80288b5h2fk5mssp7amdkw5ysk570wzp"; }; + patches = [ + # Fix flask_wtf>=0.9.0 incompatibility. See https://github.com/ContinuumIO/flask-ldap-login/issues/41 + (fetchpatch { + url = https://github.com/ContinuumIO/flask-ldap-login/commit/ed08c03c818dc63b97b01e2e7c56862eaa6daa43.patch; + sha256 = "19pkhbldk8jq6m10kdylvjf1c8m84fvvj04v5qda4cjyks15aq48"; + }) + ]; + checkInputs = [ nose mock flask_testing ]; propagatedBuildInputs = [ flask flask_wtf ldap ]; diff --git a/pkgs/development/python-modules/genanki/default.nix b/pkgs/development/python-modules/genanki/default.nix new file mode 100644 index 000000000000..bcc462e7237d --- /dev/null +++ b/pkgs/development/python-modules/genanki/default.nix @@ -0,0 +1,38 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k +, cached-property, frozendict, pystache, pyyaml, pytest, pytestrunner +}: + +buildPythonPackage rec { + pname = "genanki"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0xj8yd3acl8h457sh42balvcd0z4mg5idd4q63f7qlfzc5wgbb74"; + }; + + propagatedBuildInputs = [ + pytestrunner + cached-property + frozendict + pystache + pyyaml + ]; + + checkInputs = [ pytest ]; + + disabled = !isPy3k; + + # relies on upstream anki + doCheck = false; + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + homepage = http://github.com/kerrickstaley/genanki; + description = "Generate Anki decks programmatically"; + license = licenses.mit; + maintainers = with maintainers; [ teto ]; + }; +} diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix index cab25a60f3b4..976df0952615 100644 --- a/pkgs/development/python-modules/geopandas/default.nix +++ b/pkgs/development/python-modules/geopandas/default.nix @@ -1,23 +1,23 @@ { stdenv, buildPythonPackage, fetchFromGitHub , pandas, shapely, fiona, descartes, pyproj -, pytest }: +, pytest, Rtree }: buildPythonPackage rec { pname = "geopandas"; - version = "0.3.0"; + version = "0.4.0"; name = pname + "-" + version; src = fetchFromGitHub { owner = "geopandas"; repo = "geopandas"; rev = "v${version}"; - sha256 = "0maafafr7sjjmlg2f19bizg06c8a5z5igmbcgq6kgmi7rklx8xxz"; + sha256 = "025zpgck5pnmidvzk0805pr345rd7k6z66qb2m34gjh1814xjkhv"; }; - checkInputs = [ pytest ]; + checkInputs = [ pytest Rtree ]; checkPhase = '' - py.test geopandas + py.test geopandas -m "not web" ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gmpy/default.nix b/pkgs/development/python-modules/gmpy/default.nix new file mode 100644 index 000000000000..81af4b5e5501 --- /dev/null +++ b/pkgs/development/python-modules/gmpy/default.nix @@ -0,0 +1,24 @@ +{ buildPythonPackage, fetchurl, isPyPy, gmp } : + +let + pname = "gmpy"; + version = "1.17"; +in + +buildPythonPackage { + inherit pname version; + + disabled = isPyPy; + + src = fetchurl { + url = "mirror://pypi/g/gmpy/${pname}-${version}.zip"; + sha256 = "1a79118a5332b40aba6aa24b051ead3a31b9b3b9642288934da754515da8fa14"; + }; + + buildInputs = [ gmp ]; + + meta = { + description = "GMP or MPIR interface to Python 2.4+ and 3.x"; + homepage = http://code.google.com/p/gmpy/; + }; +} diff --git a/pkgs/development/python-modules/gmpy2/default.nix b/pkgs/development/python-modules/gmpy2/default.nix new file mode 100644 index 000000000000..5d1f82356a01 --- /dev/null +++ b/pkgs/development/python-modules/gmpy2/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchurl, isPyPy, gmp, mpfr, libmpc } : + +let + pname = "gmpy2"; + version = "2.0.8"; +in + +buildPythonPackage { + inherit pname version; + + disabled = isPyPy; + + src = fetchurl { + url = "mirror://pypi/g/gmpy2/${pname}-${version}.zip"; + sha256 = "0grx6zmi99iaslm07w6c2aqpnmbkgrxcqjrqpfq223xri0r3w8yx"; + }; + + buildInputs = [ gmp mpfr libmpc ]; + + meta = with stdenv.lib; { + description = "GMP/MPIR, MPFR, and MPC interface to Python 2.6+ and 3.x"; + homepage = http://code.google.com/p/gmpy/; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/development/python-modules/jupyterlab_launcher/default.nix b/pkgs/development/python-modules/jupyterlab_launcher/default.nix index 1831b47ee792..af29b9155a58 100644 --- a/pkgs/development/python-modules/jupyterlab_launcher/default.nix +++ b/pkgs/development/python-modules/jupyterlab_launcher/default.nix @@ -1,7 +1,8 @@ -{ lib, buildPythonPackage, fetchPypi, jsonschema, notebook }: +{ lib, buildPythonPackage, fetchPypi, jsonschema, notebook, pythonOlder }: buildPythonPackage rec { pname = "jupyterlab_launcher"; version = "0.13.1"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index 030766eb6982..55d29729db83 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi, pythonAtLeast, - ipaddress, websocket_client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google_auth, + ipaddress, websocket_client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google_auth, adal, isort, pytest, coverage, mock, sphinx, autopep8, pep8, codecov, recommonmark, nose }: buildPythonPackage rec { @@ -27,7 +27,7 @@ buildPythonPackage rec { }; checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ]; - propagatedBuildInputs = [ ipaddress websocket_client urllib3 pyyaml requests_oauthlib python-dateutil google_auth ]; + propagatedBuildInputs = [ ipaddress websocket_client urllib3 pyyaml requests_oauthlib python-dateutil google_auth adal ]; meta = with stdenv.lib; { description = "Kubernetes python client"; diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix index 245ea90038ea..8a9b5da68ef9 100644 --- a/pkgs/development/python-modules/libusb1/default.nix +++ b/pkgs/development/python-modules/libusb1/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, python, libusb1 }: +{ stdenv, lib, buildPythonPackage, fetchPypi, python, libusb1, pytest }: buildPythonPackage rec { pname = "libusb1"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "a49917a2262cf7134396f6720c8be011f14aabfc5cdc53f880cc672c0f39d271"; }; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = '' substituteInPlace usb1/libusb1.py --replace \ "ctypes.util.find_library(base_name)" \ "'${libusb1}/lib/libusb-1.0${stdenv.hostPlatform.extensions.sharedLibrary}'" @@ -17,8 +17,12 @@ buildPythonPackage rec { buildInputs = [ libusb1 ]; + checkInputs = [ pytest ]; + checkPhase = '' - ${python.interpreter} -m usb1.testUSB1 + # USBPollerThread is unreliable. Let's not test it. + # See: https://github.com/vpelletier/python-libusb1/issues/16 + py.test -k 'not testUSBPollerThreadExit' usb1/testUSB1.py ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/locustio/default.nix b/pkgs/development/python-modules/locustio/default.nix index c3e27c8b36a0..18875f840644 100644 --- a/pkgs/development/python-modules/locustio/default.nix +++ b/pkgs/development/python-modules/locustio/default.nix @@ -1,8 +1,8 @@ { buildPythonPackage -, fetchPypi +, fetchFromGitHub , mock , unittest2 -, msgpack-python +, msgpack , requests , flask , gevent @@ -11,18 +11,16 @@ buildPythonPackage rec { pname = "locustio"; - version = "0.8.1"; + version = "0.9.0"; - src = fetchPypi { - inherit pname version; - sha256 = "64583987ba1c330bb071aee3e29d2eedbfb7c8b342fa064bfb74fafcff660d61"; + src = fetchFromGitHub { + owner = "locustio"; + repo = "locust"; + rev = "${version}"; + sha256 = "1645d63ig4ymw716b6h53bhmjqqc13p9r95k1xfx66ck6vdqnisd"; }; - patchPhase = '' - sed -i s/"pyzmq=="/"pyzmq>="/ setup.py - ''; - - propagatedBuildInputs = [ msgpack-python requests flask gevent pyzmq ]; + propagatedBuildInputs = [ msgpack requests flask gevent pyzmq ]; buildInputs = [ mock unittest2 ]; meta = { diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix new file mode 100644 index 000000000000..a7e92e0b5b8e --- /dev/null +++ b/pkgs/development/python-modules/mahotas/default.nix @@ -0,0 +1,33 @@ +{ buildPythonPackage, fetchFromGitHub, nose, pillow, scipy, numpy, imread, stdenv }: + +buildPythonPackage rec { + pname = "mahotas"; + version = "1.4.2"; + + src = fetchFromGitHub { + owner = "luispedro"; + repo = "mahotas"; + rev = "v${version}"; + sha256 = "1d2hciag5sxw00qj7qz7lbna477ifzmpgl0cv3xqzjkhkn5m4d7r"; + }; + + # remove this as soon as https://github.com/luispedro/mahotas/issues/97 is fixed + patches = [ ./disable-impure-tests.patch ]; + + propagatedBuildInputs = [ numpy imread pillow scipy ]; + checkInputs = [ nose ]; + + checkPhase= '' + python setup.py test + ''; + + disabled = stdenv.isi686; # Failing tests + + meta = with stdenv.lib; { + description = "Computer vision package based on numpy"; + homepage = http://mahotas.readthedocs.io/; + maintainers = with maintainers; [ luispedro ]; + license = licenses.mit; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/mahotas/disable-impure-tests.patch b/pkgs/development/python-modules/mahotas/disable-impure-tests.patch new file mode 100644 index 000000000000..a61503f9522e --- /dev/null +++ b/pkgs/development/python-modules/mahotas/disable-impure-tests.patch @@ -0,0 +1,34 @@ +diff --git a/mahotas/tests/test_colors.py b/mahotas/tests/test_colors.py +index 8a8183b..0d34c9f 100644 +--- a/mahotas/tests/test_colors.py ++++ b/mahotas/tests/test_colors.py +@@ -2,7 +2,9 @@ import mahotas + import numpy as np + from mahotas.tests.utils import luispedro_jpg + from mahotas.colors import rgb2xyz, rgb2lab, xyz2rgb, rgb2grey, rgb2sepia ++from nose.tools import nottest + ++@nottest + def test_colors(): + f = luispedro_jpg() + lab = rgb2lab(f) +diff --git a/mahotas/tests/test_features_shape.py b/mahotas/tests/test_features_shape.py +index 462f467..2381793 100644 +--- a/mahotas/tests/test_features_shape.py ++++ b/mahotas/tests/test_features_shape.py +@@ -2,6 +2,7 @@ import mahotas.features.shape + import numpy as np + import mahotas as mh + from mahotas.features.shape import roundness, eccentricity ++from nose.tools import nottest + + def test_eccentricity(): + D = mh.disk(32, 2) +@@ -29,6 +30,7 @@ def test_zeros(): + I[8:4:12] = 1 + assert eccentricity(I) == 0 + ++@nottest + def test_ellipse_axes(): + Y,X = np.mgrid[:1024,:1024] + Y = Y/1024. diff --git a/pkgs/development/python-modules/markerlib/default.nix b/pkgs/development/python-modules/markerlib/default.nix new file mode 100644 index 000000000000..640b11a6f280 --- /dev/null +++ b/pkgs/development/python-modules/markerlib/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, setuptools +, nose +}: + +buildPythonPackage rec { + version = "0.6.0"; + pname = "markerlib"; + + src = fetchPypi { + inherit pname version; + sha256 = "2fdb3939441f5bf4f090b1979a34f84a11d33eed6c0e3995de88ae5c06b6e3ae"; + }; + + buildInputs = [ setuptools ]; + checkInputs = [ nose ]; + + checkPhase = '' + nosetests + ''; + + meta = with stdenv.lib; { + homepage = https://bitbucket.org/dholth/markerlib/; + description = "A compiler for PEP 345 environment markers"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix index 9dc7710ff28f..9933e849d0be 100644 --- a/pkgs/development/python-modules/ncclient/default.nix +++ b/pkgs/development/python-modules/ncclient/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , paramiko +, selectors2 , lxml , libxml2 , libxslt @@ -21,7 +22,7 @@ buildPythonPackage rec { checkInputs = [ nose rednose ]; propagatedBuildInputs = [ - paramiko lxml libxml2 libxslt + paramiko lxml libxml2 libxslt selectors2 ]; checkPhase = '' diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 8b0ee06b3495..a092123da826 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -18,6 +18,8 @@ , psutil , pydot , pytest +, pytest_xdist +, pytest-forked , scipy , simplejson , traits @@ -47,8 +49,6 @@ buildPythonPackage rec { postPatch = '' substituteInPlace nipype/interfaces/base/tests/test_core.py \ --replace "/usr/bin/env bash" "${bash}/bin/bash" - - rm pytest.ini ''; propagatedBuildInputs = [ @@ -56,7 +56,6 @@ buildPythonPackage rec { dateutil funcsigs future - futures networkx nibabel numpy @@ -70,9 +69,10 @@ buildPythonPackage rec { xvfbwrapper ] ++ stdenv.lib.optional (!isPy3k) [ configparser + futures ]; - checkInputs = [ pytest mock pytestcov codecov which glibcLocales ]; + checkInputs = [ pytest mock pytestcov pytest_xdist pytest-forked codecov which glibcLocales ]; checkPhase = '' LC_ALL="en_US.UTF-8" py.test -v --doctest-modules nipype diff --git a/pkgs/development/python-modules/ordered-set/default.nix b/pkgs/development/python-modules/ordered-set/default.nix index bf20f7827be3..4044ad3f2fd1 100644 --- a/pkgs/development/python-modules/ordered-set/default.nix +++ b/pkgs/development/python-modules/ordered-set/default.nix @@ -1,10 +1,10 @@ -{ buildPythonPackage, fetchPypi, lib, pytest }: +{ buildPythonPackage, fetchPypi, lib, pytest, pytestrunner }: buildPythonPackage rec { pname = "ordered-set"; version = "3.0.1"; - buildInputs = [ pytest ]; + buildInputs = [ pytest pytestrunner ]; src = fetchPypi { inherit pname version; @@ -21,6 +21,3 @@ buildPythonPackage rec { maintainers = [ lib.maintainers.MostAwesomeDude ]; }; } - - - diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix index 542a68728af1..721385f3ed6a 100644 --- a/pkgs/development/python-modules/persistent/default.nix +++ b/pkgs/development/python-modules/persistent/default.nix @@ -1,12 +1,14 @@ { buildPythonPackage , fetchPypi , zope_interface +, sphinx, manuel }: buildPythonPackage rec { pname = "persistent"; version = "4.4.2"; + nativeBuildInputs = [ sphinx manuel ]; propagatedBuildInputs = [ zope_interface ]; src = fetchPypi { diff --git a/pkgs/development/python-modules/phe/default.nix b/pkgs/development/python-modules/phe/default.nix new file mode 100644 index 000000000000..b016a9bd92c3 --- /dev/null +++ b/pkgs/development/python-modules/phe/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy3k, click, gmpy2, numpy } : + +let + pname = "phe"; + version = "1.4.0"; +in + +buildPythonPackage { + inherit pname version; + + # https://github.com/n1analytics/python-paillier/issues/51 + disabled = isPyPy || ! isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0wzlk7d24kp0f5kpm0kvvc88mm42144f5cg9pcpb1dsfha75qy5m"; + }; + + buildInputs = [ click gmpy2 numpy ]; + + # 29/233 tests fail + doCheck = false; + + meta = with stdenv.lib; { + description = "A library for Partially Homomorphic Encryption in Python"; + homepage = https://github.com/n1analytics/python-paillier; + license = licenses.gpl3; + }; +} diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index cf15ccc18fce..903b2b90c300 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -10,9 +10,12 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ numpy pyyaml matplotlib h5py ]; - + checkPhase = '' - cd test/phonopy + cd test + # dynamic structure factor test ocassionally fails do to roundoff + # see issue https://github.com/atztogo/phonopy/issues/79 + rm spectrum/test_dynamic_structure_factor.py ${python.interpreter} -m unittest discover -b cd ../.. ''; @@ -24,4 +27,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ psyanticy ]; }; } - diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix index d4ed6088409b..468011e2a807 100644 --- a/pkgs/development/python-modules/pycaption/default.nix +++ b/pkgs/development/python-modules/pycaption/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { prePatch = '' substituteInPlace setup.py \ --replace 'beautifulsoup4>=4.2.1,<4.5.0' \ - 'beautifulsoup4>=4.2.1,<=4.6.0' + 'beautifulsoup4>=4.2.1,<=4.6.3' ''; # don't require enum34 on python >= 3.4 diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index d810a5d6b4df..523e7f808064 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -1,17 +1,17 @@ -{ stdenv, buildPythonPackage, fetchPypi, glibcLocales, numpy, pydispatcher, sympy, requests, monty, ruamel_yaml, six, scipy, tabulate, enum34, matplotlib, palettable, spglib, pandas }: +{ stdenv, buildPythonPackage, fetchPypi, glibcLocales, numpy, pydispatcher, sympy, requests, monty, ruamel_yaml, six, scipy, tabulate, enum34, matplotlib, palettable, spglib, pandas, networkx }: buildPythonPackage rec { pname = "pymatgen"; - version = "2018.8.10"; + version = "2018.9.1"; src = fetchPypi { inherit pname version; - sha256 = "9bb3b170ca8654c956fa2efdd31107570c0610f7585d90e4a541eb99cee41603"; + sha256 = "dee5dbd8008081de9f27759c20c550d09a07136eeebfe941e3d05fd88ccace18"; }; nativeBuildInputs = [ glibcLocales ]; - propagatedBuildInputs = [ numpy pydispatcher sympy requests monty ruamel_yaml six scipy tabulate enum34 matplotlib palettable spglib pandas ]; - + propagatedBuildInputs = [ numpy pydispatcher sympy requests monty ruamel_yaml six scipy tabulate enum34 matplotlib palettable spglib pandas networkx ]; + # No tests in pypi tarball. doCheck = false; @@ -22,4 +22,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ psyanticy ]; }; } - diff --git a/pkgs/development/python-modules/pymetar/default.nix b/pkgs/development/python-modules/pymetar/default.nix index a918528bdf87..339ddcbc7910 100644 --- a/pkgs/development/python-modules/pymetar/default.nix +++ b/pkgs/development/python-modules/pymetar/default.nix @@ -1,20 +1,30 @@ -{ stdenv, buildPythonPackage, isPy3k, fetchPypi }: +{ stdenv, python, buildPythonPackage, isPy3k, fetchPypi }: buildPythonPackage rec { pname = "pymetar"; - version = "0.21"; + version = "1.0"; - disabled = isPy3k; + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1sh3nm5ilnsgpnzbb2wv4xndnizjayw859qp72798jadqpcph69k"; + sha256 = "1n4k5aic4sgp43ki6j3zdw9b21r3biqqws8ah57b77n44b8wzrap"; }; + checkPhase = '' + cd testing/smoketest + tar xzf reports.tgz + mkdir logs + patchShebangs runtests.sh + substituteInPlace runtests.sh --replace "break" "exit 1" # fail properly + export PYTHONPATH="$PYTHONPATH:$out/${python.sitePackages}" + ./runtests.sh + ''; + meta = with stdenv.lib; { description = "A command-line tool to show the weather report by a given station ID"; homepage = http://www.schwarzvogel.de/software/pymetar.html; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ erosennin ]; }; } diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index 9057c3970e15..f004ab1054dd 100644 --- a/pkgs/development/python-modules/pyslurm/default.nix +++ b/pkgs/development/python-modules/pyslurm/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyslurm"; - version = "20180604"; + version = "20180908"; src = fetchFromGitHub { repo = "pyslurm"; owner = "PySlurm"; - rev = "9dd4817e785fee138a9e29c3d71d2ea44898eedc"; - sha256 = "14ivwc27sjnk0z0jpfgyy9bd91m2bhcz11lzp1kk9xn4495i7wvj"; + rev = "50dc113e99d82e70e84fc2e812333733708be4ed"; + sha256 = "1j2i4rvhmk2ihhcvsjdlqlxqb5a05jg8k9bqkv3zrvdj71yn4z9k"; }; buildInputs = [ cython slurm ]; diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix index e690b7e3e253..6b9522460ba1 100644 --- a/pkgs/development/python-modules/pytest-timeout/default.nix +++ b/pkgs/development/python-modules/pytest-timeout/default.nix @@ -10,21 +10,11 @@ buildPythonPackage rec { pname = "pytest-timeout"; version = "1.3.2"; - # remove after version 1.3.1 - patches = [ - (fetchpatch { - name = "fix-installation-27-3-with-encoding-issue.patch"; - url = "https://bitbucket.org/pytest-dev/pytest-timeout/commits/9de81d3fc57a71a36d418d4aa181c241a7c5350f/raw"; - sha256 = "0g081j6iyc9825f63ssmmi40rkcgk4p9vvhy9g0lqd0gc6xzwa2p"; - }) - ]; - src = fetchPypi { inherit pname version; sha256 = "1117fc0536e1638862917efbdc0895e6b62fa61e6cf4f39bb655686af7af9627"; }; - buildInputs = [ pytest ]; checkInputs = [ pytest pexpect ]; checkPhase = ''pytest -ra''; diff --git a/pkgs/development/python-modules/selectors2/default.nix b/pkgs/development/python-modules/selectors2/default.nix new file mode 100644 index 000000000000..030178fef830 --- /dev/null +++ b/pkgs/development/python-modules/selectors2/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchPypi +, nose, psutil, mock }: + +buildPythonPackage rec { + version = "2.0.1"; + pname = "selectors2"; + + src = fetchPypi { + inherit pname version; + sha256 = "81b77c4c6f607248b1d6bbdb5935403fef294b224b842a830bbfabb400c81884"; + }; + + checkInputs = [ nose psutil mock ]; + + checkPhase = '' + # https://github.com/NixOS/nixpkgs/pull/46186#issuecomment-419450064 + # Trick to disable certain tests that depend on timing which + # will always fail on hydra + export TRAVIS="" + nosetests tests/test_selectors2.py + ''; + + meta = with stdenv.lib; { + homepage = https://www.github.com/SethMichaelLarson/selectors2; + description = "Back-ported, durable, and portable selectors"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/sniffio/default.nix b/pkgs/development/python-modules/sniffio/default.nix new file mode 100644 index 000000000000..9893bc5828a0 --- /dev/null +++ b/pkgs/development/python-modules/sniffio/default.nix @@ -0,0 +1,30 @@ +{ buildPythonPackage, lib, fetchPypi, glibcLocales, isPy3k, contextvars +, pythonOlder +}: + +buildPythonPackage rec { + pname = "sniffio"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1dzb0nx3m1hpjgsv6s6w5ac2jcmywcz6gqnfkw8rwz1vkr1836rf"; + }; + + # breaks with the following error: + # > TypeError: 'encoding' is an invalid keyword argument for this function + disabled = !isPy3k; + + buildInputs = [ glibcLocales ]; + + propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ contextvars ]; + + # no tests distributed with PyPI + doCheck = false; + + meta = with lib; { + homepage = https://github.com/python-trio/sniffio; + license = licenses.asl20; + description = "Sniff out which async library your code is running under"; + }; +} diff --git a/pkgs/development/python-modules/spacy/models.json b/pkgs/development/python-modules/spacy/models.json index e9c163c65259..34b8082872b7 100644 --- a/pkgs/development/python-modules/spacy/models.json +++ b/pkgs/development/python-modules/spacy/models.json @@ -1,42 +1,78 @@ [{ - "pname": "es_core_web_md", - "version": "1.0.0", - "sha256": "0ikyakdhnj6rrfpr8k83695d1gd3z9n60a245hwwchv94jmr7r6s", + "pname": "de_core_news_sm", + "version": "2.0.0", + "sha256": "13fs4f46qg9mlxd9ynmh81gxizm11kfq3g52pk8d2m7wp89xfc6a", "license": "cc-by-sa-40" }, { - "pname": "fr_depvec_web_lg", - "version": "1.0.0", - "sha256": "0nxmdszs1s5by2874cz37azrmwamh1ngdsiylffkfihzq6s8bhka", - "license": "cc-by-nc-sa-40" + "pname": "en_core_web_lg", + "version": "2.0.0", + "sha256": "1r33l02jrkzjn78nd0bzzzd6rwjlz7qfgs3bg5yr2ki6q0m7qxvw", + "license": "cc-by-sa-40" }, { "pname": "en_core_web_md", - "version": "1.2.1", - "sha256": "12prr4hcbfdaky9rcna1y1ykr417jkhkks2r8l06g8fb7am3pvp3", - "license": "cc-by-sa-40" -}, -{ - "pname": "en_depent_web_md", - "version": "1.2.1", - "sha256": "0giyr35q5lpp5drpcamyvb5gsjnhj62mk3ndfr49nm1s6d5f6m52", + "version": "2.0.0", + "sha256": "1b5g5gma1gzm8ffj0pgli1pllccx5jpjvb7a19n7c8bfswpifxzc", "license": "cc-by-sa-40" }, { "pname": "en_core_web_sm", - "version": "1.2.0", - "sha256": "0vc4l77dcwa9lmzyqdci8ikjc0m2rhasl2zvyba547vf76qb0528", + "version": "2.0.0", + "sha256": "161298pl6kzc0cgf2g7ji84xbqv8ayrgsrmmg0hxiflwghfj77cx", "license": "cc-by-sa-40" }, { - "pname": "de_core_news_md", - "version": "1.0.0", - "sha256": "072jz2rdi1nckny7k16avp86vjg4didfdsw816kfl9zwr88iny6g", + "pname": "en_vectors_web_lg", + "version": "2.0.0", + "sha256": "15qfd8vzdv56x41fzghy7k5x1c8ql92ds70r37b6a8hkb87z9byw", "license": "cc-by-sa-40" }, { - "pname": "en_vectors_glove_md", - "version": "1.0.0", - "sha256": "1jbr27xnh5fdww8yphpvk2brfnzb174wfnxkzdqwv3iyi02zsin6", + "pname": "es_core_news_md", + "version": "2.0.0", + "sha256": "03056qz866r641q4nagymw6pc78qnn5vdvcp7p1ph2cvxh7081kp", + "license": "cc-by-sa-40" +}, +{ + "pname": "es_core_news_sm", + "version": "2.0.0", + "sha256": "1b91lcmw2kyqmcrxlfq7m5vlj1a57i3bb9a5h4y31smjgzmsr81s", + "license": "cc-by-sa-40" +}, +{ + "pname": "fr_core_news_md", + "version": "2.0.0", + "sha256": "06kva46l1nw819bidzj2vks69ap1a9fa7rnvpd28l3z2haci38ls", + "license": "cc-by-sa-40" +}, +{ + "pname": "fr_core_news_sm", + "version": "2.0.0", + "sha256": "1zlhm9646g3cwcv4cs33160f3v8gxmzdr02x8hx7jpw1fbnmc5mx", + "license": "cc-by-sa-40" +}, +{ + "pname": "it_core_news_sm", + "version": "2.0.0", + "sha256": "0fs68rdq19migb3x3hb510b96aabibsi01adlk1fipll1x48msaz", + "license": "cc-by-sa-40" +}, +{ + "pname": "nl_core_news_sm", + "version": "2.0.0", + "sha256": "0n5x61jp8rdxa3ki250ipbd68rjpp9li6xwbx3fbzycpngffwy8z", + "license": "cc-by-sa-40" +}, +{ + "pname": "pt_core_news_sm", + "version": "2.0.0", + "sha256": "1sg500b3f3qnx1ga32hbq9p4qfynqhpdzhlmdjrxgqw8i58ys23g", + "license": "cc-by-sa-40" +}, +{ + "pname": "xx_ent_wiki_sm", + "version": "2.0.0", + "sha256": "0mc3mm6nfjp31wbjysdj2x72akyi52hgprm1g54djxfypm3pmn35", "license": "cc-by-sa-40" }] diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index 159051b9a6a8..3910ddf07256 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchPypi, buildPythonPackage, isPy27, pythonOlder -, numpy, nose, enum34, futures }: +, numpy, nose, enum34, futures, pathlib }: buildPythonPackage rec { pname = "tifffile"; @@ -16,7 +16,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ numpy ] - ++ lib.optional isPy27 futures + ++ lib.optional isPy27 [ futures pathlib ] ++ lib.optional (pythonOlder "3.0") enum34; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index 4924fa527c62..89addb377dc4 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -8,6 +8,7 @@ , pytest , pyopenssl , trustme +, sniffio }: buildPythonPackage rec { @@ -31,6 +32,7 @@ buildPythonPackage rec { async_generator idna outcome + sniffio ] ++ lib.optionals (pythonOlder "3.7") [ contextvars ]; meta = { diff --git a/pkgs/development/python-modules/urlgrabber/default.nix b/pkgs/development/python-modules/urlgrabber/default.nix index f399f4d426ee..528846d72381 100644 --- a/pkgs/development/python-modules/urlgrabber/default.nix +++ b/pkgs/development/python-modules/urlgrabber/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pycurl ]; meta = with stdenv.lib; { - homepage = "urlgrabber.baseurl.org"; + homepage = http://urlgrabber.baseurl.org; license = licenses.lgpl2Plus; description = "Python module for downloading files"; maintainers = with maintainers; [ qknight ]; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 9bbab76d4a2f..a2c586c06a96 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -906,6 +906,14 @@ let TCLLIBPATH = "${pkgs.bwidget}/lib/bwidget${pkgs.bwidget.version}"; }); + RPostgres = old.RPostgres.overrideDerivation (attrs: { + preConfigure = '' + export INCLUDE_DIR=${pkgs.postgresql}/include + export LIB_DIR=${pkgs.postgresql.lib}/lib + patchShebangs configure + ''; + }); + OpenMx = old.OpenMx.overrideDerivation (attrs: { preConfigure = '' patchShebangs configure diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index 78dd57789622..187b2d7b03f9 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pmd-${version}"; - version = "6.5.0"; + version = "6.7.0"; buildInputs = [ unzip ]; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "10jdgps1ikx75ljp2gi76ff7payg28pmiy5y3vp17gg47mv991aw"; + sha256 = "0bnbr8zq28dgvwka563g5lbya5jhmjrahnbwagcs4afpsrm7zj6c"; }; installPhase = '' diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 6a25aef8b36a..49d6abdc0098 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,11 +1,13 @@ { stdenv, lib, fetchurl, fetchpatch, runCommand, makeWrapper , jdk, zip, unzip, bash, writeCBin, coreutils , which, python, perl, gnused, gnugrep, findutils +# Apple dependencies +, cctools, clang, libcxx, CoreFoundation, CoreServices, Foundation +# Allow to independently override the jdks used to build and run respectively +, buildJdk ? jdk, runJdk ? jdk # Always assume all markers valid (don't redownload dependencies). # Also, don't clean up environment variables. , enableNixHacks ? false -# Apple dependencies -, cctools, clang, libcxx, CoreFoundation, CoreServices, Foundation }: let @@ -152,7 +154,7 @@ stdenv.mkDerivation rec { + genericPatches; buildInputs = [ - jdk + buildJdk ]; nativeBuildInputs = [ @@ -190,7 +192,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin mv output/bazel $out/bin - wrapProgram "$out/bin/bazel" --set JAVA_HOME "${jdk}" + wrapProgram "$out/bin/bazel" --set JAVA_HOME "${runJdk}" mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions mv output/bazel-complete.bash $out/share/bash-completion/completions/bazel cp scripts/zsh_completion/_bazel $out/share/zsh/site-functions/ diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index fb12b5a9c14a..51e8d12d3147 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "bear-${version}"; - version = "2.3.12"; + version = "2.3.13"; src = fetchFromGitHub { owner = "rizsotto"; repo = "Bear"; rev = version; - sha256 = "1zzz2yiiny9pm4h6ayb82xzxc2j5djcpf8va2wagcw92m7w6miqw"; + sha256 = "0imvvs22gyr1v6ydgp5yn2nq8fb8llmz0ra1m733ikjaczl3jm7z"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/development/tools/castxml/default.nix index 603b155ee4f9..aea94633bae3 100644 --- a/pkgs/development/tools/castxml/default.nix +++ b/pkgs/development/tools/castxml/default.nix @@ -17,6 +17,11 @@ stdenv.mkDerivation rec { sha256 = "1hjh8ihjyp1m2jb5yypp5c45bpbz8k004f4p1cjw4gc7pxhjacdj"; }; + cmakeFlags = [ + "-DCLANG_RESOURCE_DIR=${llvmPackages.clang-unwrapped}" + "-DSPHINX_MAN=${if withMan then "ON" else "OFF"}" + ]; + buildInputs = [ cmake llvmPackages.clang-unwrapped @@ -25,11 +30,6 @@ stdenv.mkDerivation rec { propagatedbuildInputs = [ llvmPackages.libclang ]; - preConfigure = '' - cmakeFlagsArray+=( - ${if withMan then "-DSPHINX_MAN=ON" else ""} - )''; - # 97% tests passed, 96 tests failed out of 2866 # mostly because it checks command line and nix append -isystem and all doCheck=false; diff --git a/pkgs/development/tools/govendor/default.nix b/pkgs/development/tools/govendor/default.nix new file mode 100644 index 000000000000..2030c8ba444a --- /dev/null +++ b/pkgs/development/tools/govendor/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "govendor-${version}"; + version = "1.0.9"; + + goPackagePath = "github.com/kardianos/govendor"; + + src = fetchFromGitHub { + owner = "kardianos"; + repo = "govendor"; + rev = "v${version}"; + sha256 = "0g02cd25chyijg0rzab4xr627pkvk5k33mscd6r0gf1v5xvadcfq"; + }; + + meta = with stdenv.lib; { + homepage = "https://github.com/kardianos/govendor"; + description = "Go vendor tool that works with the standard vendor file"; + license = licenses.bsd3; + maintainers = with maintainers; [ zimbatm ]; + }; +} diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index 877080508d40..b3fa6f852f76 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -14,6 +14,19 @@ buildGoPackage rec { buildFlagsArray = [ "-ldflags=" "-w -X github.com/hetznercloud/cli/cli.Version=${version}" ]; + postInstall = '' + mkdir -p \ + $bin/etc/bash_completion.d \ + $bin/share/zsh/vendor-completions + + # Add bash completions + $bin/bin/hcloud completion bash > "$bin/etc/bash_completion.d/hcloud" + + # Add zsh completions + echo "#compdef hcloud" > "$bin/share/zsh/vendor-completions/_hcloud" + $bin/bin/hcloud completion zsh >> "$bin/share/zsh/vendor-completions/_hcloud" + ''; + meta = { description = "A command-line interface for Hetzner Cloud, a provider for cloud virtual private servers"; homepage = https://github.com/hetznercloud/cli; diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix index 152cddc101d6..9c3094fb4fec 100644 --- a/pkgs/development/tools/jbake/default.nix +++ b/pkgs/development/tools/jbake/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper jre ]; + postPatch = "patchShebangs ."; + installPhase = '' mkdir -p $out cp -vr * $out diff --git a/pkgs/development/tools/misc/kconfig-frontends/default.nix b/pkgs/development/tools/misc/kconfig-frontends/default.nix index d1415569ca33..bceb15f11659 100644 --- a/pkgs/development/tools/misc/kconfig-frontends/default.nix +++ b/pkgs/development/tools/misc/kconfig-frontends/default.nix @@ -1,24 +1,26 @@ -{ stdenv, fetchurl, pkgconfig, bison, flex, gperf, ncurses }: +{ stdenv, fetchurl, pkgconfig, bison, flex, gperf, ncurses, pythonPackages }: stdenv.mkDerivation rec { basename = "kconfig-frontends"; - version = "3.12.0.0"; + version = "4.11.0.1"; name = "${basename}-${version}"; src = fetchurl { - sha256 = "01zlph9bq2xzznlpmfpn0zrmhf2iqw02yh1q7g7adgkl5jk1a9pa"; + sha256 = "1xircdw3k7aaz29snf96q2fby1cs48bidz5l1kkj0a5gbivw31i3"; url = "http://ymorin.is-a-geek.org/download/${basename}/${name}.tar.xz"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bison flex gperf ncurses ]; - - hardeningDisable = [ "format" ]; + buildInputs = [ bison flex gperf ncurses pythonPackages.python pythonPackages.wrapPython ]; configureFlags = [ "--enable-frontends=conf,mconf,nconf" ]; + postInstall = '' + wrapPythonPrograms + ''; + meta = with stdenv.lib; { description = "Out of Linux tree packaging of the kconfig infrastructure"; longDescription = '' diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix index b708ce490d29..039e5b1ec542 100644 --- a/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/pkgs/development/tools/misc/lttng-ust/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { name = "lttng-ust-${version}"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2"; - sha256 = "17gfi1dn6bgg59qn4ihf8hag96lalx0g7dym2ccpzdz7f45krk07"; + sha256 = "0if0hrs32r98sp85c8c63zpgy5xjw6cx8wrs65xq227b0jwj5jn4"; }; buildInputs = [ python ]; diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index 101298cd3052..c6877ed4d1a1 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -17,6 +17,9 @@ stdenv.mkDerivation rec { inherit sha256; }; + # TODO: fix on mass rebuild + ${if interactive then "patches" else null} = optional (version == "6.5") ./perl.patch; + # We need a native compiler to build perl XS extensions # when cross-compiling. depsBuildBuild = [ buildPackages.stdenv.cc perl ]; diff --git a/pkgs/development/tools/misc/texinfo/perl.patch b/pkgs/development/tools/misc/texinfo/perl.patch new file mode 100644 index 000000000000..e651b37371c7 --- /dev/null +++ b/pkgs/development/tools/misc/texinfo/perl.patch @@ -0,0 +1,43 @@ +Adapted from http://svn.savannah.gnu.org/viewvc/texinfo/ +Author: gavin +--- trunk/tp/Texinfo/Parser.pm 2018-06-04 19:51:36 UTC (rev 8006) ++++ trunk/tp/Texinfo/Parser.pm 2018-07-13 15:31:28 UTC (rev 8007) +@@ -5531,11 +5531,11 @@ + } + } elsif ($command eq 'clickstyle') { + # REMACRO +- if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*/) { ++ if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*/) { + $args = ['@'.$1]; + $self->{'clickstyle'} = $1; + $remaining = $line; +- $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*(\@(c|comment)((\@|\s+).*)?)?//; ++ $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*(\@(c|comment)((\@|\s+).*)?)?//; + $has_comment = 1 if (defined($4)); + } else { + $self->line_error (sprintf($self->__( +--- trunk/tp/Texinfo/Convert/XSParagraph/xspara.c 2018-07-13 15:31:28 UTC (rev 8007) ++++ trunk/tp/Texinfo/Convert/XSParagraph/xspara.c 2018-07-13 15:39:29 UTC (rev 8008) +@@ -248,6 +248,11 @@ + + dTHX; + ++#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8) ++ /* needed due to thread-safe locale handling in newer perls */ ++ switch_to_global_locale(); ++#endif ++ + if (setlocale (LC_CTYPE, "en_US.UTF-8") + || setlocale (LC_CTYPE, "en_US.utf8")) + goto success; +@@ -320,6 +325,10 @@ + { + success: ; + free (utf8_locale); ++#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8) ++ /* needed due to thread-safe locale handling in newer perls */ ++ sync_locale(); ++#endif + /* + fprintf (stderr, "tried to set LC_CTYPE to UTF-8.\n"); + fprintf (stderr, "character encoding is: %s\n", diff --git a/pkgs/development/tools/ocaml/opam/1.2.2.nix b/pkgs/development/tools/ocaml/opam/1.2.2.nix new file mode 100644 index 000000000000..7e84719ae47d --- /dev/null +++ b/pkgs/development/tools/ocaml/opam/1.2.2.nix @@ -0,0 +1,92 @@ +{ stdenv, lib, fetchurl, makeWrapper, + ocaml, unzip, ncurses, curl, aspcud +}: + +assert lib.versionAtLeast ocaml.version "3.12.1"; + +let + srcs = { + cudf = fetchurl { + url = "https://gforge.inria.fr/frs/download.php/file/33593/cudf-0.7.tar.gz"; + sha256 = "92c8a9ed730bbac73f3513abab41127d966c9b9202ab2aaffcd02358c030a701"; + }; + extlib = fetchurl { + url = "http://ocaml-extlib.googlecode.com/files/extlib-1.5.3.tar.gz"; + sha256 = "c095eef4202a8614ff1474d4c08c50c32d6ca82d1015387785cf03d5913ec021"; + }; + ocaml_re = fetchurl { + url = "https://github.com/ocaml/ocaml-re/archive/ocaml-re-1.2.0.tar.gz"; + sha256 = "a34dd9d6136731436a963bbab5c4bbb16e5d4e21b3b851d34887a3dec451999f"; + }; + ocamlgraph = fetchurl { + url = "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.5.tar.gz"; + sha256 = "d167466435a155c779d5ec25b2db83ad851feb42ebc37dca8ffa345ddaefb82f"; + }; + dose3 = fetchurl { + url = "https://gforge.inria.fr/frs/download.php/file/34277/dose3-3.3.tar.gz"; + sha256 = "8dc4dae9b1a81bb3a42abb283df785ba3eb00ade29b13875821c69f03e00680e"; + }; + cmdliner = fetchurl { + url = "http://erratique.ch/software/cmdliner/releases/cmdliner-0.9.7.tbz"; + sha256 = "9c19893cffb5d3c3469ee0cce85e3eeeba17d309b33b9ace31aba06f68f0bf7a"; + }; + uutf = fetchurl { + url = "http://erratique.ch/software/uutf/releases/uutf-0.9.3.tbz"; + sha256 = "1f364f89b1179e5182a4d3ad8975f57389d45548735d19054845e06a27107877"; + }; + jsonm = fetchurl { + url = "http://erratique.ch/software/jsonm/releases/jsonm-0.9.1.tbz"; + sha256 = "3fd4dca045d82332da847e65e981d8b504883571d299a3f7e71447d46bc65f73"; + }; + opam = fetchurl { + url = "https://github.com/ocaml/opam/archive/1.2.2.zip"; + sha256 = "c590ce55ae69ec74f46215cf16a156a02b23c5f3ecb22f23a3ad9ba3d91ddb6e"; + }; + }; +in stdenv.mkDerivation rec { + name = "opam-${version}"; + version = "1.2.2"; + + buildInputs = [ unzip curl ncurses ocaml makeWrapper ]; + + src = srcs.opam; + + postUnpack = '' + ln -sv ${srcs.cudf} $sourceRoot/src_ext/${srcs.cudf.name} + ln -sv ${srcs.extlib} $sourceRoot/src_ext/${srcs.extlib.name} + ln -sv ${srcs.ocaml_re} $sourceRoot/src_ext/${srcs.ocaml_re.name} + ln -sv ${srcs.ocamlgraph} $sourceRoot/src_ext/${srcs.ocamlgraph.name} + ln -sv ${srcs.dose3} $sourceRoot/src_ext/${srcs.dose3.name} + ln -sv ${srcs.cmdliner} $sourceRoot/src_ext/${srcs.cmdliner.name} + ln -sv ${srcs.uutf} $sourceRoot/src_ext/${srcs.uutf.name} + ln -sv ${srcs.jsonm} $sourceRoot/src_ext/${srcs.jsonm.name} + ''; + + preConfigure = '' + substituteInPlace ./src_ext/Makefile --replace "%.stamp: %.download" "%.stamp:" + ''; + + postConfigure = "make lib-ext"; + + # Dirty, but apparently ocp-build requires a TERM + makeFlags = ["TERM=screen"]; + + # change argv0 to "opam" as a workaround for + # https://github.com/ocaml/opam/issues/2142 + postInstall = '' + mv $out/bin/opam $out/bin/.opam-wrapped + makeWrapper $out/bin/.opam-wrapped $out/bin/opam \ + --argv0 "opam" \ + --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin + ''; + + doCheck = false; + + meta = with stdenv.lib; { + description = "A package manager for OCaml"; + homepage = http://opam.ocamlpro.com/; + maintainers = [ maintainers.henrytill ]; + platforms = platforms.all; + license = licenses.lgpl21Plus; + }; +} diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index 7e84719ae47d..8e89dd3fadd2 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -1,69 +1,87 @@ -{ stdenv, lib, fetchurl, makeWrapper, - ocaml, unzip, ncurses, curl, aspcud +{ stdenv, lib, fetchurl, makeWrapper, getconf, + ocaml, unzip, ncurses, curl, aspcud, bubblewrap }: -assert lib.versionAtLeast ocaml.version "3.12.1"; +assert lib.versionAtLeast ocaml.version "4.02.3"; let srcs = { + cmdliner = fetchurl { + url = "http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.2.tbz"; + sha256 = "18jqphjiifljlh9jg8zpl6310p3iwyaqphdkmf89acyaix0s4kj1"; + }; + cppo = fetchurl { + url = "https://github.com/mjambon/cppo/archive/v1.6.4.tar.gz"; + sha256 = "0jdb7d21lfa3ck4k59mrqs5pljzq5rb504jq57nnrc6klljm42j7"; + }; cudf = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/33593/cudf-0.7.tar.gz"; - sha256 = "92c8a9ed730bbac73f3513abab41127d966c9b9202ab2aaffcd02358c030a701"; - }; - extlib = fetchurl { - url = "http://ocaml-extlib.googlecode.com/files/extlib-1.5.3.tar.gz"; - sha256 = "c095eef4202a8614ff1474d4c08c50c32d6ca82d1015387785cf03d5913ec021"; - }; - ocaml_re = fetchurl { - url = "https://github.com/ocaml/ocaml-re/archive/ocaml-re-1.2.0.tar.gz"; - sha256 = "a34dd9d6136731436a963bbab5c4bbb16e5d4e21b3b851d34887a3dec451999f"; - }; - ocamlgraph = fetchurl { - url = "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.5.tar.gz"; - sha256 = "d167466435a155c779d5ec25b2db83ad851feb42ebc37dca8ffa345ddaefb82f"; + url = "https://gforge.inria.fr/frs/download.php/36602/cudf-0.9.tar.gz"; + sha256 = "0771lwljqwwn3cryl0plny5a5dyyrj4z6bw66ha5n8yfbpcy8clr"; }; dose3 = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/34277/dose3-3.3.tar.gz"; - sha256 = "8dc4dae9b1a81bb3a42abb283df785ba3eb00ade29b13875821c69f03e00680e"; + url = "https://gforge.inria.fr/frs/download.php/file/36063/dose3-5.0.1.tar.gz"; + sha256 = "00yvyfm4j423zqndvgc1ycnmiffaa2l9ab40cyg23pf51qmzk2jm"; }; - cmdliner = fetchurl { - url = "http://erratique.ch/software/cmdliner/releases/cmdliner-0.9.7.tbz"; - sha256 = "9c19893cffb5d3c3469ee0cce85e3eeeba17d309b33b9ace31aba06f68f0bf7a"; + extlib = fetchurl { + url = "http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.5.tar.gz"; + sha256 = "19slqf5bdj0rrph2w41giwmn6df2qm07942jn058pjkjrnk30d4s"; }; - uutf = fetchurl { - url = "http://erratique.ch/software/uutf/releases/uutf-0.9.3.tbz"; - sha256 = "1f364f89b1179e5182a4d3ad8975f57389d45548735d19054845e06a27107877"; + jbuilder = fetchurl { + url = "https://github.com/ocaml/dune/releases/download/1.0+beta20/jbuilder-1.0.beta20.tbz"; + sha256 = "07hl9as5llffgd6hbw41rs76i1ibgn3n9r0dba5h0mdlkapcwb10"; }; - jsonm = fetchurl { - url = "http://erratique.ch/software/jsonm/releases/jsonm-0.9.1.tbz"; - sha256 = "3fd4dca045d82332da847e65e981d8b504883571d299a3f7e71447d46bc65f73"; + mccs = fetchurl { + url = "https://github.com/AltGr/ocaml-mccs/archive/1.1+8.tar.gz"; + sha256 = "0xavfvxfrcf3lmry8ymma1yzy0hw3ijbx94c9zq3pzlwnylrapa4"; + }; + ocamlgraph = fetchurl { + url = "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.8.tar.gz"; + sha256 = "0m9g16wrrr86gw4fz2fazrh8nkqms0n863w7ndcvrmyafgxvxsnr"; + }; + opam-file-format = fetchurl { + url = "https://github.com/ocaml/opam-file-format/archive/2.0.0-rc2.tar.gz"; + sha256 = "1mgk08msp7hxn0hs0m82vky3yv6hcq4pw5402b3vhx4c49431jsb"; + }; + re = fetchurl { + url = "https://github.com/ocaml/ocaml-re/releases/download/1.7.3/re-1.7.3.tbz"; + sha256 = "0nv933qfl8y9i19cqvhsalwzif3dkm28vg478rpnr4hgfqjlfryr"; + }; + result = fetchurl { + url = "https://github.com/janestreet/result/releases/download/1.3/result-1.3.tbz"; + sha256 = "1lrnbxdq80gbhnp85mqp1kfk0bkh6q1c93sfz2qgnq2qyz60w4sk"; }; opam = fetchurl { - url = "https://github.com/ocaml/opam/archive/1.2.2.zip"; - sha256 = "c590ce55ae69ec74f46215cf16a156a02b23c5f3ecb22f23a3ad9ba3d91ddb6e"; + url = "https://github.com/ocaml/opam/archive/2.0.0.zip"; + sha256 = "0m4ilsldrfkkn0vlvl119bk76j2pwvqvdi8mpg957z4kqflfbfp8"; }; }; in stdenv.mkDerivation rec { name = "opam-${version}"; - version = "1.2.2"; + version = "2.0.0"; - buildInputs = [ unzip curl ncurses ocaml makeWrapper ]; + buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap; src = srcs.opam; postUnpack = '' - ln -sv ${srcs.cudf} $sourceRoot/src_ext/${srcs.cudf.name} - ln -sv ${srcs.extlib} $sourceRoot/src_ext/${srcs.extlib.name} - ln -sv ${srcs.ocaml_re} $sourceRoot/src_ext/${srcs.ocaml_re.name} - ln -sv ${srcs.ocamlgraph} $sourceRoot/src_ext/${srcs.ocamlgraph.name} - ln -sv ${srcs.dose3} $sourceRoot/src_ext/${srcs.dose3.name} - ln -sv ${srcs.cmdliner} $sourceRoot/src_ext/${srcs.cmdliner.name} - ln -sv ${srcs.uutf} $sourceRoot/src_ext/${srcs.uutf.name} - ln -sv ${srcs.jsonm} $sourceRoot/src_ext/${srcs.jsonm.name} + ln -sv ${srcs.cmdliner} $sourceRoot/src_ext/cmdliner.tbz + ln -sv ${srcs.cppo} $sourceRoot/src_ext/cppo.tar.gz + ln -sv ${srcs.cudf} $sourceRoot/src_ext/cudf.tar.gz + ln -sv ${srcs.dose3} $sourceRoot/src_ext/dose3.tar.gz + ln -sv ${srcs.extlib} $sourceRoot/src_ext/extlib.tar.gz + ln -sv ${srcs.jbuilder} $sourceRoot/src_ext/jbuilder.tbz + ln -sv ${srcs.mccs} $sourceRoot/src_ext/mccs.tar.gz + ln -sv ${srcs.ocamlgraph} $sourceRoot/src_ext/ocamlgraph.tar.gz + ln -sv ${srcs.opam-file-format} $sourceRoot/src_ext/opam-file-format.tar.gz + ln -sv ${srcs.re} $sourceRoot/src_ext/re.tbz + ln -sv ${srcs.result} $sourceRoot/src_ext/result.tbz ''; + patches = [ ./opam-pull-3487.patch ./opam-shebangs.patch ./opam-mccs-darwin.patch ]; + preConfigure = '' substituteInPlace ./src_ext/Makefile --replace "%.stamp: %.download" "%.stamp:" + patchShebangs src/state/shellscripts ''; postConfigure = "make lib-ext"; @@ -71,13 +89,17 @@ in stdenv.mkDerivation rec { # Dirty, but apparently ocp-build requires a TERM makeFlags = ["TERM=screen"]; + outputs = [ "out" "installer" ]; + setOutputFlags = false; + # change argv0 to "opam" as a workaround for # https://github.com/ocaml/opam/issues/2142 postInstall = '' mv $out/bin/opam $out/bin/.opam-wrapped makeWrapper $out/bin/.opam-wrapped $out/bin/opam \ --argv0 "opam" \ - --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin + --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin + $out/bin/opam-installer --prefix=$installer opam-installer.install ''; doCheck = false; @@ -87,6 +109,6 @@ in stdenv.mkDerivation rec { homepage = http://opam.ocamlpro.com/; maintainers = [ maintainers.henrytill ]; platforms = platforms.all; - license = licenses.lgpl21Plus; }; } +# Generated by: ./opam.nix.pl -v 2.0.0 -p opam-pull-3487.patch,opam-shebangs.patch,opam-mccs-darwin.patch diff --git a/pkgs/development/tools/ocaml/opam/opam-mccs-darwin.patch b/pkgs/development/tools/ocaml/opam/opam-mccs-darwin.patch new file mode 100644 index 000000000000..501242c40a01 --- /dev/null +++ b/pkgs/development/tools/ocaml/opam/opam-mccs-darwin.patch @@ -0,0 +1,18 @@ +diff --git a/src_ext/patches/mccs/build-on-darwin.patch b/src_ext/patches/mccs/build-on-darwin.patch +new file mode 100644 +index 00000000..157e2094 +--- /dev/null ++++ b/src_ext/patches/mccs/build-on-darwin.patch +@@ -0,0 +1,12 @@ ++diff --git a/src/context_flags.ml b/src/context_flags.ml ++index 7470030..6e07370 100644 ++--- a/src/context_flags.ml +++++ b/src/context_flags.ml ++@@ -24,6 +24,7 @@ let ifc c x = if c then x else [] ++ ++ let cxxflags = ++ let flags = +++ (ifc (Config.system = "macosx") ["-x"; "c++"]) @ ++ (ifc (Sys.win32 && Config.ccomp_type = "msvc") ["/EHsc"]) @ ++ (ifc useGLPK ["-DUSEGLPK"]) @ ++ (ifc useCOIN ["-DUSECOIN"]) @ diff --git a/pkgs/development/tools/ocaml/opam/opam-pull-3487.patch b/pkgs/development/tools/ocaml/opam/opam-pull-3487.patch new file mode 100644 index 000000000000..e047c8298bc3 --- /dev/null +++ b/pkgs/development/tools/ocaml/opam/opam-pull-3487.patch @@ -0,0 +1,23 @@ +diff --git a/src/state/shellscripts/bwrap.sh b/src/state/shellscripts/bwrap.sh +index 6f5d7dbea..3e1a3e1b4 100755 +--- a/src/state/shellscripts/bwrap.sh ++++ b/src/state/shellscripts/bwrap.sh +@@ -1,4 +1,6 @@ +-#!/bin/bash -ue ++#!/usr/bin/env bash ++ ++set -ue + + if ! command -v bwrap >/dev/null; then + echo "The 'bwrap' command was not found. Install 'bubblewrap' on your system, or" >&2 +@@ -11,7 +13,9 @@ fi + + ARGS=(--unshare-net --new-session) + ARGS=("${ARGS[@]}" --proc /proc --dev /dev) +-ARGS=("${ARGS[@]}" --bind /tmp /tmp --tmpfs /run --tmpfs /var) ++ARGS=("${ARGS[@]}" --bind "${TMPDIR:-/tmp}" /tmp) ++ARGS=("${ARGS[@]}" --setenv TMPDIR /tmp --setenv TMP /tmp --setenv TEMPDIR /tmp --setenv TEMP /tmp) ++ARGS=("${ARGS[@]}" --tmpfs /run --tmpfs /var) + + add_mounts() { + case "$1" in diff --git a/pkgs/development/tools/ocaml/opam/opam-shebangs.patch b/pkgs/development/tools/ocaml/opam/opam-shebangs.patch new file mode 100644 index 000000000000..f74ac84ca6b2 --- /dev/null +++ b/pkgs/development/tools/ocaml/opam/opam-shebangs.patch @@ -0,0 +1,128 @@ +diff --git a/src/client/opamInitDefaults.ml b/src/client/opamInitDefaults.ml +index eca13a7c..1fd66f43 100644 +--- a/src/client/opamInitDefaults.ml ++++ b/src/client/opamInitDefaults.ml +@@ -35,11 +35,15 @@ let eval_variables = [ + let os_filter os = + FOp (FIdent ([], OpamVariable.of_string "os", None), `Eq, FString os) + ++let os_distribution_filter distro = ++ FOp (FIdent ([], OpamVariable.of_string "os-distribution", None), `Eq, FString distro) ++ + let linux_filter = os_filter "linux" + let macos_filter = os_filter "macos" + let openbsd_filter = os_filter "openbsd" + let freebsd_filter = os_filter "freebsd" + let sandbox_filter = FOr (linux_filter, macos_filter) ++let nixos_filter = os_distribution_filter "nixos" + + let gpatch_filter = FOr (openbsd_filter, freebsd_filter) + let patch_filter = FNot gpatch_filter +@@ -50,6 +54,11 @@ let wrappers ~sandboxing () = + CString t, None; + ] in + let w = OpamFile.Wrappers.empty in ++ let w = { w with ++ OpamFile.Wrappers. ++ pre_build = [[CString "%{hooks}%/shebangs.sh", None], Some nixos_filter]; ++ } ++ in + if sandboxing then + { w with + OpamFile.Wrappers. +@@ -113,6 +122,7 @@ let required_tools ~sandboxing () = + let init_scripts () = [ + ("sandbox.sh", OpamScript.bwrap), Some bwrap_filter; + ("sandbox.sh", OpamScript.sandbox_exec), Some macos_filter; ++ ("shebangs.sh", OpamScript.patch_shebangs), Some nixos_filter; + ] + + module I = OpamFile.InitConfig +diff --git a/src/state/opamScript.mli b/src/state/opamScript.mli +index 03449970..83de0b53 100644 +--- a/src/state/opamScript.mli ++++ b/src/state/opamScript.mli +@@ -20,3 +20,4 @@ val env_hook : string + val env_hook_zsh : string + val env_hook_csh : string + val env_hook_fish : string ++val patch_shebangs : string +diff --git a/src/state/shellscripts/patch_shebangs.sh b/src/state/shellscripts/patch_shebangs.sh +new file mode 100755 +index 00000000..3ea84e2d +--- /dev/null ++++ b/src/state/shellscripts/patch_shebangs.sh +@@ -0,0 +1,73 @@ ++#!/usr/bin/env bash ++# This setup hook causes the fixup phase to rewrite all script ++# interpreter file names (`#! /path') to paths found in $PATH. E.g., ++# /bin/sh will be rewritten to /nix/store/-some-bash/bin/sh. ++# /usr/bin/env gets special treatment so that ".../bin/env python" is ++# rewritten to /nix/store//bin/python. Interpreters that are ++# already in the store are left untouched. ++ ++header() { echo "$1"; } ++stopNest() { true; } ++ ++fixupOutputHooks+=('if [ -z "$dontPatchShebangs" -a -e "$prefix" ]; then patchShebangs "$prefix"; fi') ++ ++patchShebangs() { ++ local dir="$1" ++ header "patching script interpreter paths in $dir" ++ local f ++ local oldPath ++ local newPath ++ local arg0 ++ local args ++ local oldInterpreterLine ++ local newInterpreterLine ++ ++ 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 ++ newPath="$(command -v "$arg0" || true)" ++ 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 ++ newPath="$(command -v "$(basename "$oldPath")" || true)" ++ args="$arg0 $args" ++ 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: interpreter directive changed from \"$oldInterpreterLine\" to \"$newInterpreterLine\"" ++ # escape the escape chars so that sed doesn't interpret them ++ escapedInterpreterLine=$(echo "$newInterpreterLine" | sed 's|\\|\\\\|g') ++ # Preserve times, see: https://github.com/NixOS/nixpkgs/pull/33281 ++ touch -r "$f" "$f.timestamp" ++ sed -i -e "1 s|.*|#\!$escapedInterpreterLine|" "$f" ++ touch -r "$f.timestamp" "$f" ++ rm "$f.timestamp" ++ fi ++ fi ++ done ++ ++ stopNest ++} ++ ++patchShebangs . diff --git a/pkgs/development/tools/ocaml/opam/opam.nix.pl b/pkgs/development/tools/ocaml/opam/opam.nix.pl new file mode 100755 index 000000000000..1862add452d6 --- /dev/null +++ b/pkgs/development/tools/ocaml/opam/opam.nix.pl @@ -0,0 +1,130 @@ +#!/usr/bin/env perl + +use strict; +use warnings qw; +use Getopt::Std; + +my $gencmd = "# Generated by: " . join(" ", $0, @ARGV) . "\n"; + +our $opt_v; +our $opt_p; +our $opt_r; +our $opt_t; +getopts "v:p:t:r:"; + +my $OPAM_RELEASE = $opt_v // "2.0.0"; +my $OPAM_TAG = $opt_t // $OPAM_RELEASE; +my $OPAM_GITHUB_REPO = $opt_r // "ocaml/opam"; +my $OPAM_RELEASE_URL = "https://github.com/$OPAM_GITHUB_REPO/archive/$OPAM_TAG.zip"; +my $OPAM_RELEASE_SHA256 = `nix-prefetch-url \Q$OPAM_RELEASE_URL\E`; +chomp $OPAM_RELEASE_SHA256; + +my $OPAM_BASE_URL = "https://raw.githubusercontent.com/$OPAM_GITHUB_REPO/$OPAM_TAG"; +my $OPAM_OPAM = `curl -L --url \Q$OPAM_BASE_URL\E/opam-devel.opam`; +my($OCAML_MIN_VERSION) = $OPAM_OPAM =~ /^available: ocaml-version >= "(.*)"$/m + or die "could not parse ocaml version bound\n"; + +print <<"EOF"; +{ stdenv, lib, fetchurl, makeWrapper, getconf, + ocaml, unzip, ncurses, curl, aspcud, bubblewrap +}: + +assert lib.versionAtLeast ocaml.version "$OCAML_MIN_VERSION"; + +let + srcs = { +EOF + +my %urls = (); +my %md5s = (); + +open(SOURCES, "-|", "curl", "-L", "--url", "$OPAM_BASE_URL/src_ext/Makefile.sources"); +while () { + if (/^URL_(?!PKG_)([-\w]+)\s*=\s*(\S+)$/) { + $urls{$1} = $2; + } elsif (/^MD5_(?!PKG_)([-\w]+)\s*=\s*(\S+)$/) { + $md5s{$1} = $2; + } +} +for my $src (sort keys %urls) { + my ($sha256,$store_path) = split /\n/, `nix-prefetch-url --print-path \Q$urls{$src}\E`; + system "echo \Q$md5s{$src}\E' *'\Q$store_path\E | md5sum -c 1>&2"; + die "md5 check failed for $urls{$src}\n" if $?; + print <<"EOF"; + $src = fetchurl { + url = "$urls{$src}"; + sha256 = "$sha256"; + }; +EOF +} + +print <<"EOF"; + opam = fetchurl { + url = "$OPAM_RELEASE_URL"; + sha256 = "$OPAM_RELEASE_SHA256"; + }; + }; +in stdenv.mkDerivation rec { + name = "opam-\${version}"; + version = "$OPAM_RELEASE"; + + buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap; + + src = srcs.opam; + + postUnpack = '' +EOF +for my $src (sort keys %urls) { + my($ext) = $urls{$src} =~ /(\.(?:t(?:ar\.|)|)(?:gz|bz2?))$/ + or die "could not find extension for $urls{$src}\n"; + print <<"EOF"; + ln -sv \${srcs.$src} \$sourceRoot/src_ext/$src$ext +EOF +} +print <<'EOF'; + ''; + +EOF +if (defined $opt_p) { + print " patches = [ "; + for my $patch (split /[, ]/, $opt_p) { + $patch =~ s/^(?=[^\/]*$)/.\//; + print "$patch "; + } + print "];\n\n"; +} +print <<'EOF'; + preConfigure = '' + substituteInPlace ./src_ext/Makefile --replace "%.stamp: %.download" "%.stamp:" + patchShebangs src/state/shellscripts + ''; + + postConfigure = "make lib-ext"; + + # Dirty, but apparently ocp-build requires a TERM + makeFlags = ["TERM=screen"]; + + outputs = [ "out" "installer" ]; + setOutputFlags = false; + + # change argv0 to "opam" as a workaround for + # https://github.com/ocaml/opam/issues/2142 + postInstall = '' + mv $out/bin/opam $out/bin/.opam-wrapped + makeWrapper $out/bin/.opam-wrapped $out/bin/opam \ + --argv0 "opam" \ + --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin + $out/bin/opam-installer --prefix=$installer opam-installer.install + ''; + + doCheck = false; + + meta = with stdenv.lib; { + description = "A package manager for OCaml"; + homepage = http://opam.ocamlpro.com/; + maintainers = [ maintainers.henrytill ]; + platforms = platforms.all; + }; +} +EOF +print $gencmd; diff --git a/pkgs/development/tools/pyre/default.nix b/pkgs/development/tools/pyre/default.nix index 1d7f8025bb0e..b51f6344c9b7 100644 --- a/pkgs/development/tools/pyre/default.nix +++ b/pkgs/development/tools/pyre/default.nix @@ -1,24 +1,30 @@ -{ stdenv, fetchFromGitHub, ocamlPackages, makeWrapper, writeScript }: +{ stdenv, fetchFromGitHub, ocamlPackages, makeWrapper, writeScript +, jbuilder, python3, rsync, fetchpatch }: let # Manually set version - the setup script requires # hg and git + keeping the .git directory around. - version = "0.0.10"; + pyre-version = "0.0.11"; versionFile = writeScript "version.ml" '' cat > "./version.ml" < Makefile + cp Makefile.template Makefile + sed "s/%VERSION%/external/" dune.in > dune cp ${versionFile} ./scripts/generate-version-number.sh mkdir $(pwd)/build export OCAMLFIND_DESTDIR=$(pwd)/build export OCAMLPATH=$OCAMLPATH:$(pwd)/build + make release ''; @@ -60,7 +70,7 @@ in stdenv.mkDerivation { # Improvement for a future version. installPhase = '' mkdir -p $out/bin - cp _build/all/main.native $out/bin/pyre.bin + cp ./_build/default/main.exe $out/bin/pyre.bin ''; meta = with stdenv.lib; { @@ -70,4 +80,54 @@ in stdenv.mkDerivation { platforms = with platforms; linux; maintainers = with maintainers; [ teh ]; }; +}; +typeshed = stdenv.mkDerivation { + name = "typeshed"; + # typeshed doesn't have versions, it seems to be synchronized with + # mypy relases. I'm assigning a random version here (same as pyre). + version = pyre-version; + src = fetchFromGitHub { + owner = "python"; + repo = "typeshed"; + rev = "a08c6ea"; + sha256 = "0wy8yh43vhyyc4g7iqnmlj66kz5in02y5qc0c4jdckhpa3mchaqk"; + }; + phases = [ "unpackPhase" "installPhase" ]; + installPhase = "cp -r $src $out"; +}; +in python3.pkgs.buildPythonApplication rec { + pname = "pyre-check"; + version = pyre-version; + src = fetchFromGitHub { + owner = "facebook"; + repo = "pyre-check"; + rev = "v${pyre-version}"; + sha256 = "0ig7bx2kfn2kbxw74wysh5365yp5gyby42l9l29iclrzdghgk32l"; + }; + patches = [ + (fetchpatch { + url = "https://github.com/facebook/pyre-check/commit/b473d2ed9fc11e7c1cd0c7b8c42f521e5cdc2003.patch"; + sha256 = "05xvyp7j4n6z92bxf64rxfq5pvaadxgx1c8c5qziy75vdz72lkcy"; + }) + ./pyre-bdist-wheel.patch + ]; + + # The build-pypi-package script does some funky stuff with build + # directories - easier to patch it a bit than to replace it + # completely though: + postPatch = '' + mkdir ./build + substituteInPlace scripts/build-pypi-package.sh \ + --replace 'NIX_BINARY_FILE' '${pyre-bin}/bin/pyre.bin' \ + --replace 'BUILD_ROOT="$(mktemp -d)"' "BUILD_ROOT=$(pwd)/build" + ''; + + buildInputs = [ pyre-bin rsync ]; + propagatedBuildInputs = with python3.pkgs; [ docutils typeshed ]; + buildPhase = '' + bash scripts/build-pypi-package.sh --version ${pyre-version} --bundle-typeshed ${typeshed} + cp -r build/dist dist + ''; + + doCheck = false; # can't open file 'nix_run_setup': } diff --git a/pkgs/development/tools/pyre/pyre-bdist-wheel.patch b/pkgs/development/tools/pyre/pyre-bdist-wheel.patch new file mode 100644 index 000000000000..1b6fea024e03 --- /dev/null +++ b/pkgs/development/tools/pyre/pyre-bdist-wheel.patch @@ -0,0 +1,43 @@ +diff --git a/scripts/build-pypi-package.sh b/scripts/build-pypi-package.sh +index 1035591..bb8cbae 100755 +--- a/scripts/build-pypi-package.sh ++++ b/scripts/build-pypi-package.sh +@@ -98,7 +98,7 @@ rsync -avm --filter='- tests/' --filter='+ */' --filter='-! *.py' "${SCRIPTS_DIR + sed -i -e "/__version__/s/= \".*\"/= \"${PACKAGE_VERSION}\"/" "${BUILD_ROOT}/${MODULE_NAME}/version.py" + + # Copy binary files. +-BINARY_FILE="${SCRIPTS_DIRECTORY}/../_build/default/main.exe" ++BINARY_FILE="NIX_BINARY_FILE" + if [[ ! -f "${BINARY_FILE}" ]]; then + echo "The binary file ${BINARY_FILE} does not exist." + echo "Have you run 'make' in the toplevel directory?" +@@ -146,7 +146,7 @@ def find_typeshed_files(base): + result.append((target, files)) + return result + +-with open('README.md') as f: ++with open('README.md', encoding='utf8') as f: + long_description = f.read() + + setup( +@@ -205,20 +205,3 @@ fi + + # Build. + python3 setup.py bdist_wheel +- +-# Move artifact outside the build directory. +-mkdir -p "${SCRIPTS_DIRECTORY}/dist" +-files_count="$(find "${BUILD_ROOT}/dist/" -type f | wc -l | tr -d ' ')" +-[[ "${files_count}" == '1' ]] || \ +- die "${files_count} files created in ${BUILD_ROOT}/dist, but only one was expected" +-source_file="$(find "${BUILD_ROOT}/dist/" -type f)" +-destination="$(basename "${source_file}")" +-destination="${destination/%-any.whl/-${WHEEL_DISTRIBUTION_PLATFORM}.whl}" +-mv "${source_file}" "${SCRIPTS_DIRECTORY}/dist/${destination}" +- +-# Cleanup. +-cd "${SCRIPTS_DIRECTORY}" +-rm -rf "${BUILD_ROOT}" +- +-printf '\nAll done. Build artifact available at:\n %s\n' "${SCRIPTS_DIRECTORY}/dist/${destination}" +-exit 0 diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index 2f5552945714..e2250297c8eb 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -1,42 +1,46 @@ { stdenv, lib, fetchurl, writeScript, writeText, php }: let - name = "wp-cli-${version}"; - version = "2.0.0"; - - src = fetchurl { - url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar"; - sha256 = "1s8pv8vdjwiwknpwsxc59l1zxc2np7nrp6bjd0s8jwsrv5fgjzsp"; - }; + version = "2.0.1"; completion = fetchurl { url = "https://raw.githubusercontent.com/wp-cli/wp-cli/v${version}/utils/wp-completion.bash"; sha256 = "15d330x6d3fizrm6ckzmdknqg6wjlx5fr87bmkbd5s6a1ihs0g24"; }; - bin = writeScript "wp" '' - #! ${stdenv.shell} - - set -euo pipefail - - exec ${lib.getBin php}/bin/php \ - -c ${ini} \ - -f ${src} -- "$@" - ''; - - ini = writeText "wp-cli.ini" '' - [PHP] - memory_limit = -1 ; no limit as composer uses a lot of memory - - [Phar] - phar.readonly = Off - ''; - in stdenv.mkDerivation rec { - inherit name version; + name = "wp-cli-${version}"; + inherit version; + + src = fetchurl { + url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar"; + sha256 = "05lbay4c0477465vv4h8d2j94pk3haz1a7f0ncb127fvxz3a2pcg"; + }; buildCommand = '' - install -Dm755 ${bin} $out/bin/wp + dir=$out/share/wp-cli + mkdir -p $out/bin $dir + + cat <<_EOF > $out/bin/wp +#!${stdenv.shell} + +set -euo pipefail + +exec ${lib.getBin php}/bin/php \\ + -c $dir/php.ini \\ + -f $dir/wp-cli -- "\$@" +_EOF + chmod 0755 $out/bin/wp + + cat <<_EOF > $dir/php.ini +[PHP] +memory_limit = -1 ; no limit as composer uses a lot of memory + +[Phar] +phar.readonly = Off +_EOF + + install -Dm644 ${src} $dir/wp-cli install -Dm644 ${completion} $out/share/bash-completion/completions/wp # this is a very basic run test diff --git a/pkgs/development/tools/ydiff/default.nix b/pkgs/development/tools/ydiff/default.nix new file mode 100644 index 000000000000..c2f72138db5f --- /dev/null +++ b/pkgs/development/tools/ydiff/default.nix @@ -0,0 +1,45 @@ +{ stdenv, lib, pythonPackages, python3Packages, less, patchutils, git +, subversion, coreutils, which }: + +with pythonPackages; + +buildPythonApplication rec { + pname = "ydiff"; + version = "1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0mxcl17sx1d4vaw22ammnnn3y19mm7r6ljbarcjzi519klz26bnf"; + }; + + patchPhase = '' + substituteInPlace tests/test_ydiff.py \ + --replace /bin/rm ${coreutils}/bin/rm \ + --replace /bin/sh ${stdenv.shell} + substituteInPlace Makefile \ + --replace "pep8 --ignore" "# pep8 --ignore" \ + --replace "python3 \`which coverage\`" "${python3Packages.coverage}/bin/coverage3" \ + --replace /bin/sh ${stdenv.shell} \ + --replace tests/regression.sh "${stdenv.shell} tests/regression.sh" + patchShebangs tests/*.sh + ''; + + buildInputs = [ docutils pygments ]; + propagatedBuildInputs = [ less patchutils ]; + checkInputs = [ coverage coreutils git subversion which ]; + + checkTarget = if isPy3k then "test3" else "test"; + + meta = { + homepage = https://github.com/ymattw/ydiff; + description = "View colored, incremental diff in workspace or from stdin"; + longDescription = '' + Term based tool to view colored, incremental diff in a version + controlled workspace (supports Git, Mercurial, Perforce and Svn + so far) or from stdin, with side by side (similar to diff -y) + and auto pager support. + ''; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ leenaars ]; + }; +} diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix index e000f743173b..1ac5ce5007d9 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/games/arx-libertatis/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "arx-libertatis-${version}"; - version = "2017-10-30"; + version = "2018-08-26"; src = fetchFromGitHub { owner = "arx"; repo = "ArxLibertatis"; - rev = "e5ea4e8f0f7e86102cfc9113c53daeb0bdee6dd3"; - sha256 = "11z0ndhk802jr3w3z5gfqw064g98v99xin883q1qd36jw96s27p5"; + rev = "7b551739cc22fa25dae83bcc1a2b784ddecc729c"; + sha256 = "1ybv3p74rywn0ajdbw7pyk7pd7py1db9h6x2pav2d28ndkkj4z8n"; }; buildInputs = [ diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix index c8d23fcc9de6..e4ec4dffa1db 100644 --- a/pkgs/games/chessx/default.nix +++ b/pkgs/games/chessx/default.nix @@ -1,30 +1,41 @@ -{ stdenv, pkgconfig, zlib, qtbase, qtsvg, qttools, qtmultimedia, qmake, fetchurl }: +{ stdenv, pkgconfig, zlib, qtbase, qtsvg, qttools, qtmultimedia, qmake, fetchurl, makeWrapper +, lib +}: + stdenv.mkDerivation rec { name = "chessx-${version}"; version = "1.4.6"; + src = fetchurl { url = "mirror://sourceforge/chessx/chessx-${version}.tgz"; sha256 = "1vb838byzmnyglm9mq3khh3kddb9g4g111cybxjzalxxlc81k5dd"; }; + buildInputs = [ - qtbase - qtsvg - qttools - qtmultimedia - zlib + qtbase + qtsvg + qttools + qtmultimedia + zlib ]; - nativeBuildInputs = [ pkgconfig qmake ]; + + nativeBuildInputs = [ pkgconfig qmake makeWrapper ]; # RCC: Error in 'resources.qrc': Cannot find file 'i18n/chessx_da.qm' enableParallelBuilding = false; installPhase = '' - runHook preInstall - mkdir -p "$out/bin" - mkdir -p "$out/share/applications" - cp -pr release/chessx "$out/bin" - cp -pr unix/chessx.desktop "$out/share/applications" - runHook postInstall + runHook preInstall + + mkdir -p "$out/bin" + mkdir -p "$out/share/applications" + cp -pr release/chessx "$out/bin" + cp -pr unix/chessx.desktop "$out/share/applications" + + wrapProgram $out/bin/chessx \ + --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-5.${lib.versions.minor qtbase.version}/plugins + + runHook postInstall ''; meta = with stdenv.lib; { @@ -32,5 +43,6 @@ stdenv.mkDerivation rec { description = "ChessX allows you to browse and analyse chess games"; license = licenses.gpl2; maintainers = [maintainers.luispedro]; + platforms = platforms.linux; }; } diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index aa4ff210812b..88a6d72bc485 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -5,67 +5,112 @@ # This directory menaces with spikes of Nix code. It is terrifying. # # If this is your first time here, you should probably install the dwarf-fortress-full package, -# for instance with `environment.systempackages = [ pkgs.dwarf-fortress.dwarf-fortress-full ];`. +# for instance with: +# +# environment.systemPackages = [ pkgs.dwarf-fortress-packages.dwarf-fortress-full ]; # # You can adjust its settings by using override, or compile your own package by -# using the other packages here. Take a look at lazy-pack.nix to get an idea of -# how. +# using the other packages here. +# +# For example, you can enable the FPS indicator, disable the intro, pick a +# theme other than phoebus (the default for dwarf-fortress-full), _and_ use +# an older version with something like: +# +# environment.systemPackages = [ +# (pkgs.dwarf-fortress-packages.dwarf-fortress-full.override { +# dfVersion = "0.44.11"; +# theme = "cla"; +# enableIntro = false; +# enableFPS = true; +# }) +# ] +# +# Take a look at lazy-pack.nix to see all the other options. # # You will find the configuration files in ~/.local/share/df_linux/data/init. If # you un-symlink them and edit, then the scripts will avoid overwriting your # changes on later launches, but consider extending the wrapper with your # desired options instead. -# -# Although both dfhack and dwarf therapist are included in the lazy pack, you -# can only use one at a time. DFHack does have therapist-like features, so this -# may or may not be a problem. + +with lib; let callPackage = pkgs.newScope self; + # The latest Dwarf Fortress version. Maintainers: when a new version comes + # out, ensure that (unfuck|dfhack|twbt) are all up to date before changing + # this. + latestVersion = "0.44.12"; + + # Converts a version to a package name. + versionToName = version: "dwarf-fortress_${lib.replaceStrings ["."] ["_"] version}"; + + # A map of names to each Dwarf Fortress package we know about. df-games = lib.listToAttrs (map (dfVersion: { - name = "dwarf-fortress_${lib.replaceStrings ["."] ["_"] dfVersion}"; - value = callPackage ./wrapper { - inherit (self) themes; - dwarf-fortress = callPackage ./game.nix { inherit dfVersion; }; - }; + name = versionToName dfVersion; + value = + let + # I can't believe this syntax works. Spikes of Nix code indeed... + dwarf-fortress = callPackage ./game.nix { + inherit dfVersion; + inherit dwarf-fortress-unfuck; + }; + + # unfuck is linux-only right now, we will only use it there. + dwarf-fortress-unfuck = if stdenv.isLinux then callPackage ./unfuck.nix { inherit dfVersion; } + else null; + + twbt = callPackage ./twbt { inherit dfVersion; }; + + dfhack = callPackage ./dfhack { + inherit (pkgs.perlPackages) XMLLibXML XMLLibXSLT; + inherit dfVersion twbt; + stdenv = gccStdenv; + }; + + dwarf-therapist = callPackage ./dwarf-therapist/wrapper.nix { + inherit dwarf-fortress; + dwarf-therapist = pkgs.qt5.callPackage ./dwarf-therapist { + texlive = pkgs.texlive.combine { + inherit (pkgs.texlive) scheme-basic float caption wrapfig adjmulticol sidecap preprint enumitem; + }; + }; + }; + in + callPackage ./wrapper { + inherit (self) themes; + + dwarf-fortress = dwarf-fortress; + dwarf-fortress-unfuck = dwarf-fortress-unfuck; + twbt = twbt; + dfhack = dfhack; + dwarf-therapist = dwarf-therapist; + }; }) (lib.attrNames self.df-hashes)); self = rec { df-hashes = builtins.fromJSON (builtins.readFile ./game.json); - dwarf-fortress = df-games.dwarf-fortress_0_44_12; - dwarf-fortress-full = callPackage ./lazy-pack.nix { }; + # Aliases for the latest Dwarf Fortress and the selected Therapist install + dwarf-fortress = getAttr (versionToName latestVersion) df-games; + dwarf-therapist = dwarf-fortress.dwarf-therapist; + dwarf-fortress-original = dwarf-fortress.dwarf-fortress; - dfhack = callPackage ./dfhack { - inherit (pkgs.perlPackages) XMLLibXML XMLLibXSLT; - stdenv = gccStdenv; + dwarf-fortress-full = callPackage ./lazy-pack.nix { + inherit df-games versionToName latestVersion; }; - + soundSense = callPackage ./soundsense.nix { }; - # unfuck is linux-only right now, we will only use it there. - dwarf-fortress-unfuck = if stdenv.isLinux then callPackage ./unfuck.nix { } - else null; - - dwarf-therapist = callPackage ./dwarf-therapist/wrapper.nix { - inherit (dwarf-fortress) dwarf-fortress; - dwarf-therapist = pkgs.qt5.callPackage ./dwarf-therapist { - texlive = pkgs.texlive.combine { - inherit (pkgs.texlive) scheme-basic float caption wrapfig adjmulticol sidecap preprint enumitem; - }; - }; - }; - legends-browser = callPackage ./legends-browser {}; - twbt = callPackage ./twbt {}; - themes = recurseIntoAttrs (callPackage ./themes { }); + themes = recurseIntoAttrs (callPackage ./themes { + stdenv = stdenvNoCC; + }); - # aliases + # Theme aliases phoebus-theme = themes.phoebus; cla-theme = themes.cla; - dwarf-fortress-original = dwarf-fortress.dwarf-fortress; }; in self // df-games diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 4a8c84cf92dc..d65bdab84911 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -3,14 +3,62 @@ , enableStoneSense ? false, allegro5, libGLU_combined , enableTWBT ? true, twbt , SDL +, dfVersion }: +with lib; + let - dfVersion = "0.44.12"; - version = "${dfVersion}-r1"; + dfhack-releases = { + "0.43.05" = { + dfHackRelease = "0.43.05-r3.1"; + sha256 = "1ds366i0qcfbn62w9qv98lsqcrm38npzgvcr35hf6ihqa6nc6xrl"; + xmlRev = "860a9041a75305609643d465123a4b598140dd7f"; + prerelease = false; + }; + "0.44.05" = { + dfHackRelease = "0.44.05-r2"; + sha256 = "1cwifdhi48a976xc472nf6q2k0ibwqffil5a4llcymcxdbgxdcc9"; + xmlRev = "2794f8a6d7405d4858bac486a0bb17b94740c142"; + prerelease = false; + }; + "0.44.09" = { + dfHackRelease = "0.44.09-r1"; + sha256 = "1nkfaa43pisbyik5inj5q2hja2vza5lwidg5z02jyh136jm64hwk"; + xmlRev = "3c0bf63674d5430deadaf7befaec42f0ec1e8bc5"; + prerelease = false; + }; + "0.44.10" = { + dfHackRelease = "0.44.10-r2"; + sha256 = "19bxsghxzw3bilhr8sm4axz7p7z8lrvbdsd1vdjf5zbg04rs866i"; + xmlRev = "321bd48b10c4c3f694cc801a7dee6be392c09b7b"; + prerelease = false; + }; + "0.44.11" = { + dfHackRelease = "0.44.11-beta2.1"; + sha256 = "1jgwcqg9m1ybv3szgnklp6zfpiw5mswla464dlj2gfi5v82zqbv2"; + xmlRev = "f27ebae6aa8fb12c46217adec5a812cd49a905c8"; + prerelease = true; + }; + "0.44.12" = { + dfHackRelease = "0.44.12-r1"; + sha256 = "0j03lq6j6w378z6cvm7jspxc7hhrqm8jaszlq0mzfvap0k13fgyy"; + xmlRev = "23500e4e9bd1885365d0a2ef1746c321c1dd5094"; + prerelease = false; + }; + }; + + release = if hasAttr dfVersion dfhack-releases + then getAttr dfVersion dfhack-releases + else throw "[DFHack] Unsupported Dwarf Fortress version: ${dfVersion}"; + + version = release.dfHackRelease; + + warning = if release.prerelease then builtins.trace "[DFHack] Version ${version} is a prerelease. Careful!" + else null; # revision of library/xml submodule - xmlRev = "23500e4e9bd1885365d0a2ef1746c321c1dd5094"; + xmlRev = release.xmlRev; arch = if stdenv.hostPlatform.system == "x86_64-linux" then "64" @@ -21,6 +69,10 @@ let #! ${stdenv.shell} if [ "$*" = "describe --tags --long" ]; then echo "${version}-unknown" + elif [ "$*" = "describe --tags --abbrev=8 --long" ]; then + echo "${version}-unknown" + elif [ "$*" = "describe --tags --abbrev=8 --exact-match" ]; then + echo "${version}" elif [ "$*" = "rev-parse HEAD" ]; then if [ "$(dirname "$(pwd)")" = "xml" ]; then echo "${xmlRev}" @@ -41,8 +93,8 @@ let src = fetchFromGitHub { owner = "DFHack"; repo = "dfhack"; - sha256 = "0j03lq6j6w378z6cvm7jspxc7hhrqm8jaszlq0mzfvap0k13fgyy"; - rev = version; + rev = release.dfHackRelease; + sha256 = release.sha256; fetchSubmodules = true; }; diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/dwarf-therapist.in b/pkgs/games/dwarf-fortress/dwarf-therapist/dwarf-therapist.in new file mode 100644 index 000000000000..77936c430e2b --- /dev/null +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/dwarf-therapist.in @@ -0,0 +1,26 @@ +#!@stdenv_shell@ -e + +[ -z "$DT_DIR" ] && DT_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/dwarftherapist" + +install_dir="@install@" +therapist_dir="@therapist@" + +cat <&2 +Using $DT_DIR as Dwarf Therapist overlay directory. +EOF + +update_path() { + local path="$1" + + mkdir -p "$DT_DIR/$(dirname "$path")" + if [ ! -e "$DT_DIR/$path" ] || [ -L "$DT_DIR/$path" ]; then + rm -f "$DT_DIR/$path" + ln -s "$install_dir/share/dwarftherapist/$path" "$DT_DIR/$path" + fi +} + +cd "$install_dir/share/dwarftherapist" +update_path memory_layouts + +QT_QPA_PLATFORM_PLUGIN_PATH="@qt_plugin_path@" \ + exec "$therapist_dir/bin/dwarftherapist" "$@" diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index 322a21ec3ad9..071ab2af0c5c 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -1,12 +1,16 @@ -{ stdenv, symlinkJoin, dwarf-therapist, dwarf-fortress, makeWrapper }: +{ pkgs, stdenv, symlinkJoin, lib, dwarf-therapist, dwarf-fortress, makeWrapper }: let platformSlug = if stdenv.targetPlatform.is32bit then "linux32" else "linux64"; inifile = "linux/v0.${dwarf-fortress.baseVersion}.${dwarf-fortress.patchVersion}_${platformSlug}.ini"; -in symlinkJoin { +in + +stdenv.mkDerivation rec { name = "dwarf-therapist-${dwarf-therapist.version}"; + + wrapper = ./dwarf-therapist.in; paths = [ dwarf-therapist ]; @@ -14,20 +18,33 @@ in symlinkJoin { passthru = { inherit dwarf-fortress dwarf-therapist; }; - postBuild = '' - # DwarfTherapist assumes it's run in $out/share/dwarftherapist and - # therefore uses many relative paths. - wrapProgram $out/bin/dwarftherapist \ - --run "cd $out/share/dwarftherapist" + buildCommand = '' + mkdir -p $out/bin ln -s $out/bin/dwarftherapist $out/bin/DwarfTherapist + substitute $wrapper $out/bin/dwarftherapist \ + --subst-var-by stdenv_shell ${stdenv.shell} \ + --subst-var-by install $out \ + --subst-var-by therapist ${dwarf-therapist} \ + --subst-var-by qt_plugin_path "${pkgs.qt5.qtbase}/lib/qt-${pkgs.qt5.qtbase.qtCompatVersion}/plugins/platforms" + chmod 755 $out/bin/dwarftherapist + + # Fix up memory layouts rm -rf $out/share/dwarftherapist/memory_layouts/linux mkdir -p $out/share/dwarftherapist/memory_layouts/linux - origmd5=$(cat "${dwarf-fortress}/hash.md5.orig" | cut -c1-8) - patchedmd5=$(cat "${dwarf-fortress}/hash.md5" | cut -c1-8) - substitute \ - ${dwarf-therapist}/share/dwarftherapist/memory_layouts/${inifile} \ - $out/share/dwarftherapist/memory_layouts/${inifile} \ - --replace "$origmd5" "$patchedmd5" + orig_md5=$(cat "${dwarf-fortress}/hash.md5.orig" | cut -c1-8) + patched_md5=$(cat "${dwarf-fortress}/hash.md5" | cut -c1-8) + input_file="${dwarf-therapist}/share/dwarftherapist/memory_layouts/${inifile}" + output_file="$out/share/dwarftherapist/memory_layouts/${inifile}" + + echo "[Dwarf Therapist Wrapper] Fixing Dwarf Fortress MD5 prefix:" + echo " Input: $input_file" + echo " Search: $orig_md5" + echo " Output: $output_file" + echo " Replace: $patched_md5" + + substitute "$input_file" "$output_file" --replace "$orig_md5" "$patched_md5" ''; + + preferLocalBuild = true; } diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index 2547bb83f3f5..b5c80a0a56dc 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -42,9 +42,6 @@ let in -assert dwarf-fortress-unfuck != null -> - dwarf-fortress-unfuck.dfVersion == dfVersion; - stdenv.mkDerivation { name = "dwarf-fortress-${dfVersion}"; diff --git a/pkgs/games/dwarf-fortress/lazy-pack.nix b/pkgs/games/dwarf-fortress/lazy-pack.nix index 3e0d3dcc6d73..3a81dcc9c931 100644 --- a/pkgs/games/dwarf-fortress/lazy-pack.nix +++ b/pkgs/games/dwarf-fortress/lazy-pack.nix @@ -1,13 +1,14 @@ -{ stdenvNoCC, lib, buildEnv -, dwarf-fortress, themes +{ stdenvNoCC, lib, buildEnv, callPackage +, df-games, themes, latestVersion, versionToName +, dfVersion ? latestVersion # This package should, at any given time, provide an opinionated "optimal" # DF experience. It's the equivalent of the Lazy Newbie Pack, that is, and - # should contain every utility available. + # should contain every utility available unless you disable them. , enableDFHack ? stdenvNoCC.isLinux , enableTWBT ? enableDFHack , enableSoundSense ? true -, enableStoneSense ? false # StoneSense is currently broken. -, enableDwarfTherapist ? true, dwarf-therapist +, enableStoneSense ? true +, enableDwarfTherapist ? true , enableLegendsBrowser ? true, legends-browser , theme ? themes.phoebus # General config options: @@ -16,6 +17,15 @@ , enableFPS ? false }: +with lib; + +let + dfGame = versionToName dfVersion; + dwarf-fortress = if hasAttr dfGame df-games + then getAttr dfGame df-games + else throw "Unknown Dwarf Fortress version: ${dfVersion}"; + dwarf-therapist = dwarf-fortress.dwarf-therapist; +in buildEnv { name = "dwarf-fortress-full"; paths = [ @@ -28,7 +38,7 @@ buildEnv { meta = with stdenvNoCC.lib; { description = "An opinionated wrapper for Dwarf Fortress"; - maintainers = with maintainers; [ Baughn ]; + maintainers = with maintainers; [ Baughn numinit ]; license = licenses.mit; platforms = platforms.all; homepage = https://github.com/NixOS/nixpkgs/; diff --git a/pkgs/games/dwarf-fortress/themes/default.nix b/pkgs/games/dwarf-fortress/themes/default.nix index 0b8eb23a7b9d..feb4782d7c32 100644 --- a/pkgs/games/dwarf-fortress/themes/default.nix +++ b/pkgs/games/dwarf-fortress/themes/default.nix @@ -1,4 +1,4 @@ -{lib, fetchFromGitHub}: +{lib, fetchFromGitHub, ...}: with builtins; diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/pkgs/games/dwarf-fortress/twbt/default.nix index d90812f5d05e..7c80c1012462 100644 --- a/pkgs/games/dwarf-fortress/twbt/default.nix +++ b/pkgs/games/dwarf-fortress/twbt/default.nix @@ -1,14 +1,59 @@ -{ stdenvNoCC, fetchurl, unzip }: +{ stdenvNoCC, lib, fetchurl, unzip +, dfVersion +}: +with lib; + +let + twbt-releases = { + "0.43.05" = { + twbtRelease = "6.22"; + sha256 = "0di5d38f6jj9smsz0wjcs1zav4zba6hrk8cbn59kwpb1wamsh5c7"; + prerelease = false; + }; + "0.44.05" = { + twbtRelease = "6.35"; + sha256 = "0qjkgl7dsqzsd7pdq8a5bihhi1wplfkv1id7sj6dp3swjpsfxp8g"; + prerelease = false; + }; + "0.44.09" = { + twbtRelease = "6.41"; + sha256 = "0nsq15z05pbhqjvw2xqs1a9b1n2ma0aalhc3vh3mi4cd4k7lxh44"; + prerelease = false; + }; + "0.44.10" = { + twbtRelease = "6.49"; + sha256 = "1qjkc7k33qhxj2g18njzasccjqsis5y8zrw5vl90h4rs3i8ld9xz"; + prerelease = false; + }; + "0.44.11" = { + twbtRelease = "6.51"; + sha256 = "1yclqmarjd97ch054h425a12r8a5ailmflsd7b39cg4qhdr1nii5"; + prerelease = true; + }; + "0.44.12" = { + twbtRelease = "6.54"; + sha256 = "10gfd6vv0vk4v1r5hjbz7vf1zqys06dsad695gysc7fbcik2dakh"; + prerelease = false; + }; + }; + + release = if hasAttr dfVersion twbt-releases + then getAttr dfVersion twbt-releases + else throw "[TWBT] Unsupported Dwarf Fortress version: ${dfVersion}"; + + warning = if release.prerelease then builtins.trace "[TWBT] Version ${version} is a prerelease. Careful!" + else null; + +in stdenvNoCC.mkDerivation rec { name = "twbt-${version}"; - version = "6.54"; - dfVersion = "0.44.12"; + version = release.twbtRelease; src = fetchurl { url = "https://github.com/mifki/df-twbt/releases/download/v${version}/twbt-${version}-linux.zip"; - sha256 = "10gfd6vv0vk4v1r5hjbz7vf1zqys06dsad695gysc7fbcik2dakh"; + sha256 = release.sha256; }; sourceRoot = "."; @@ -24,10 +69,9 @@ stdenvNoCC.mkDerivation rec { cp -a *.png $art/data/art/ ''; - meta = with stdenvNoCC.lib; { description = "A plugin for Dwarf Fortress / DFHack that improves various aspects the game interface."; - maintainers = with maintainers; [ Baughn ]; + maintainers = with maintainers; [ Baughn numinit ]; license = licenses.mit; platforms = platforms.linux; homepage = https://github.com/mifki/df-twbt; diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index 0c5a81a52f0f..c4d01b3ff392 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -1,18 +1,52 @@ -{ stdenv, fetchFromGitHub, cmake +{ stdenv, lib, fetchFromGitHub, cmake , libGL, libSM, SDL, SDL_image, SDL_ttf, glew, openalSoft , ncurses, glib, gtk2, libsndfile, zlib +, dfVersion }: -let dfVersion = "0.44.12"; in +with lib; + +let + unfuck-releases = { + "0.43.05" = { + unfuckRelease = "0.43.05"; + sha256 = "173dyrbxlzqvjf1j3n7vpns4gfjkpyvk9z16430xnmd5m6nda8p2"; + }; + "0.44.05" = { + unfuckRelease = "0.44.05"; + sha256 = "00yj4l4gazxg4i6fj9rwri6vm17i6bviy2mpkx0z5c0mvsr7s14b"; + }; + "0.44.09" = { + unfuckRelease = "0.44.09"; + sha256 = "138p0v8z2x47f0fk9k6g75ikw5wb3vxldwv5ggbkf4hhvlw6lvzm"; + }; + "0.44.10" = { + unfuckRelease = "0.44.10"; + sha256 = "0vb19qx2ibc79j4bgbk9lskb883qfb0815zw1dfz9k7rqwal8mzj"; + }; + "0.44.11" = { + unfuckRelease = "0.44.11.1"; + sha256 = "1kszkb1d1vll8p04ja41nangsaxb5lv4p3xh2jhmsmipfixw7nvz"; + }; + "0.44.12" = { + unfuckRelease = "0.44.12"; + sha256 = "1kszkb1d1vll8p04ja41nangsaxb5lv4p3xh2jhmsmipfixw7nvz"; + }; + }; + + release = if hasAttr dfVersion unfuck-releases + then getAttr dfVersion unfuck-releases + else throw "[unfuck] Unknown Dwarf Fortress version: ${dfVersion}"; +in stdenv.mkDerivation { - name = "dwarf_fortress_unfuck-${dfVersion}"; + name = "dwarf_fortress_unfuck-${release.unfuckRelease}"; src = fetchFromGitHub { owner = "svenstaro"; repo = "dwarf_fortress_unfuck"; - rev = dfVersion; - sha256 = "1kszkb1d1vll8p04ja41nangsaxb5lv4p3xh2jhmsmipfixw7nvz"; + rev = release.unfuckRelease; + sha256 = release.sha256; }; cmakeFlags = [ @@ -20,23 +54,12 @@ stdenv.mkDerivation { "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" ]; - makeFlags = [ - ''CFLAGS="-fkeep-inline-functions"'' - ''CXXFLAGS="-fkeep-inline-functions"'' - ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ libSM SDL SDL_image SDL_ttf glew openalSoft ncurses gtk2 libsndfile zlib libGL ]; - postPatch = '' - substituteInPlace CMakeLists.txt --replace \ - 'set(CMAKE_BUILD_TYPE Release)' \ - 'set(CMAKE_BUILD_TYPE Debug)' - ''; - # Don't strip unused symbols; dfhack hooks into some of them. dontStrip = true; @@ -56,6 +79,6 @@ stdenv.mkDerivation { homepage = https://github.com/svenstaro/dwarf_fortress_unfuck; license = licenses.free; platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar numinit ]; }; } diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 6efe004fa9e8..8d9f06ffe143 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, buildEnv, dwarf-fortress, substituteAll +{ stdenv, lib, buildEnv, substituteAll +, dwarf-fortress, dwarf-fortress-unfuck +, dwarf-therapist , enableDFHack ? false, dfhack , enableSoundSense ? false, soundSense, jdk , enableStoneSense ? false @@ -36,18 +38,29 @@ let paths = themePkg ++ pkgs; pathsToLink = [ "/" "/hack" "/hack/scripts" ]; - ignoreCollisions = true; postBuild = '' # De-symlink init.txt cp $out/data/init/init.txt init.txt - rm $out/data/init/init.txt + rm -f $out/data/init/init.txt mv init.txt $out/data/init/init.txt '' + lib.optionalString enableDFHack '' + # De-symlink symbols.xml rm $out/hack/symbols.xml - substitute ${dfhack_}/hack/symbols.xml $out/hack/symbols.xml \ - --replace $(cat ${dwarf-fortress}/hash.md5.orig) \ - $(cat ${dwarf-fortress}/hash.md5) + + # Patch the MD5 + orig_md5=$(cat "${dwarf-fortress}/hash.md5.orig") + patched_md5=$(cat "${dwarf-fortress}/hash.md5") + input_file="${dfhack_}/hack/symbols.xml" + output_file="$out/hack/symbols.xml" + + echo "[DFHack Wrapper] Fixing Dwarf Fortress MD5:" + echo " Input: $input_file" + echo " Search: $orig_md5" + echo " Output: $output_file" + echo " Replace: $patched_md5" + + substitute "$input_file" "$output_file" --replace "$orig_md5" "$patched_md5" '' + lib.optionalString enableTWBT '' substituteInPlace $out/data/init/init.txt \ --replace '[PRINT_MODE:2D]' '[PRINT_MODE:TWBT]' @@ -57,14 +70,14 @@ let --replace '[TRUETYPE:YES]' '[TRUETYPE:${unBool enableTruetype}]' \ --replace '[FPS:NO]' '[FPS:${unBool enableFPS}]' ''; + + ignoreCollisions = true; }; in stdenv.mkDerivation rec { name = "dwarf-fortress-${dwarf-fortress.dfVersion}"; - compatible = lib.all (x: assert (x.dfVersion == dwarf-fortress.dfVersion); true) pkgs; - dfInit = substituteAll { name = "dwarf-fortress-init"; src = ./dwarf-fortress-init.in; @@ -77,7 +90,7 @@ stdenv.mkDerivation rec { runDFHack = ./dfhack.in; runSoundSense = ./soundSense.in; - passthru = { inherit dwarf-fortress; }; + passthru = { inherit dwarf-fortress dwarf-therapist; }; buildCommand = '' mkdir -p $out/bin diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index e5783ec5396f..e41caa3db978 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -5,20 +5,20 @@ let name = "openrct2-${version}"; - version = "0.2.0"; + version = "0.2.1"; openrct2-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "OpenRCT2"; rev = "v${version}"; - sha256 = "1nmz8war8b49iicpc70gk7zlqizrvvwpidqm70lfpa0p68m7m3px"; + sha256 = "0dl1f0gvq0ifaii66c7bwp8k822krcdn9l44prnyds6smrdmd3dq"; }; objects-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "objects"; - rev = "v1.0.2"; - sha256 = "1gl37fmhhrfgd6gilw0n7hfdq80a9b31bi5r0xhxg7d579jccb04"; + rev = "v1.0.6"; + sha256 = "1yhyafsk2lyasgj1r7h2n4k7vp5q792aj86ggpbmd6bcp4kk6hbm"; }; title-sequences-src = fetchFromGitHub { diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix index 2cf09e2ec938..6f69c6469503 100644 --- a/pkgs/games/quakespasm/vulkan.nix +++ b/pkgs/games/quakespasm/vulkan.nix @@ -1,4 +1,5 @@ -{ stdenv, SDL2, fetchFromGitHub, makeWrapper, gzip, libvorbis, libmad, vulkan-loader }: +{ stdenv, SDL2, fetchFromGitHub, makeWrapper, gzip, libvorbis, libmad, vulkan-headers, vulkan-loader }: + stdenv.mkDerivation rec { name = "vkquake-${version}"; majorVersion = "1.00"; @@ -13,8 +14,12 @@ stdenv.mkDerivation rec { sourceRoot = "source/Quake"; + nativeBuildInputs = [ + makeWrapper vulkan-headers + ]; + buildInputs = [ - makeWrapper gzip SDL2 libvorbis libmad vulkan-loader.dev + gzip SDL2 libvorbis libmad vulkan-loader ]; buildFlags = [ "DO_USERDIRS=1" ]; diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index e8a911bebd5e..5aab54b83221 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -19,6 +19,7 @@ let then pkgs.pkgsi686Linux.steamPackages.steam-runtime-wrapped else null; }; + steamcmd = callPackage ./steamcmd.nix { }; }; in self diff --git a/pkgs/games/steam/steamcmd.nix b/pkgs/games/steam/steamcmd.nix new file mode 100644 index 000000000000..6a2c7fe01b4f --- /dev/null +++ b/pkgs/games/steam/steamcmd.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, steam-run, bash +, steamRoot ? "~/.local/share/Steam" +}: + +stdenv.mkDerivation rec { + name = "steamcmd-${version}"; + version = "20180104"; # According to steamcmd_linux.tar.gz mtime + + src = fetchurl { + url = https://steamcdn-a.akamaihd.net/client/installer/steamcmd_linux.tar.gz; + sha256 = "0z0y0zqvhydmfc9y9vg5am0vz7m3gbj4l2dwlrfz936hpx301gyf"; + }; + + # The source tarball does not have a single top-level directory. + preUnpack = '' + mkdir $name + cd $name + sourceRoot=. + ''; + + buildInputs = [ bash steam-run ]; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/share/steamcmd/linux32 + install -Dm755 steamcmd.sh $out/share/steamcmd/steamcmd.sh + install -Dm755 linux32/* $out/share/steamcmd/linux32 + + mkdir -p $out/bin + substitute ${./steamcmd.sh} $out/bin/steamcmd \ + --subst-var shell \ + --subst-var out \ + --subst-var-by steamRoot "${steamRoot}" \ + --subst-var-by steamRun ${steam-run} + chmod 0755 $out/bin/steamcmd + ''; + + meta = with stdenv.lib; { + description = "Steam command-line tools"; + homepage = "https://developer.valvesoftware.com/wiki/SteamCMD"; + platforms = platforms.linux; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ tadfisher ]; + }; +} diff --git a/pkgs/games/steam/steamcmd.sh b/pkgs/games/steam/steamcmd.sh new file mode 100644 index 000000000000..e092a4fedbe9 --- /dev/null +++ b/pkgs/games/steam/steamcmd.sh @@ -0,0 +1,24 @@ +#!@bash@/bin/bash -e + +# Always run steamcmd in the user's Steam root. +STEAMROOT=@steamRoot@ + +# Create a facsimile Steam root if it doesn't exist. +if [ ! -e "$STEAMROOT" ]; then + mkdir -p "$STEAMROOT"/{appcache,config,logs,Steamapps/common} + mkdir -p ~/.steam + ln -sf "$STEAMROOT" ~/.steam/root + ln -sf "$STEAMROOT" ~/.steam/steam +fi + +# Copy the system steamcmd install to the Steam root. If we don't do +# this, steamcmd assumes the path to `steamcmd` is the Steam root. +# Note that symlinks don't work here. +if [ ! -e "$STEAMROOT/steamcmd.sh" ]; then + mkdir -p "$STEAMROOT/linux32" + # steamcmd.sh will replace these on first use + cp @out@/share/steamcmd/steamcmd.sh "$STEAMROOT/." + cp @out@/share/steamcmd/linux32/* "$STEAMROOT/linux32/." +fi + +@steamRun@/bin/steam-run "$STEAMROOT/steamcmd.sh" "$@" diff --git a/pkgs/misc/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch b/pkgs/misc/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch new file mode 100644 index 000000000000..43539ef4ca58 --- /dev/null +++ b/pkgs/misc/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch @@ -0,0 +1,67 @@ +From 3140afd6fb7dad7a25296526a71b005fb9eae048 Mon Sep 17 00:00:00 2001 +From: Samuel Dionne-Riel +Date: Sat, 8 Sep 2018 00:44:08 -0400 +Subject: [PATCH] Fixes for Qt 5.11 upgrade + +--- + src/qt/ui/UICheatRaw.cpp | 2 -- + src/qt/ui/UICheatRaw.h | 2 +- + src/qt/ui/UICheats.cpp | 2 ++ + src/qt/ui/UIHexInput.h | 2 ++ + 4 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/qt/ui/UICheatRaw.cpp b/src/qt/ui/UICheatRaw.cpp +index 4ad82d77..3f78486b 100755 +--- a/src/qt/ui/UICheatRaw.cpp ++++ b/src/qt/ui/UICheatRaw.cpp +@@ -20,8 +20,6 @@ + #include "UIHexInput.h" + #include "../QtYabause.h" + +-#include +- + UICheatRaw::UICheatRaw( QWidget* p ) + : QDialog( p ) + { +diff --git a/src/qt/ui/UICheatRaw.h b/src/qt/ui/UICheatRaw.h +index d97b429d..20318c67 100755 +--- a/src/qt/ui/UICheatRaw.h ++++ b/src/qt/ui/UICheatRaw.h +@@ -21,7 +21,7 @@ + + #include "ui_UICheatRaw.h" + +-class QButtonGroup; ++#include + + class UICheatRaw : public QDialog, public Ui::UICheatRaw + { +diff --git a/src/qt/ui/UICheats.cpp b/src/qt/ui/UICheats.cpp +index c6027972..44d341c3 100755 +--- a/src/qt/ui/UICheats.cpp ++++ b/src/qt/ui/UICheats.cpp +@@ -21,6 +21,8 @@ + #include "UICheatRaw.h" + #include "../CommonDialogs.h" + ++#include ++ + UICheats::UICheats( QWidget* p ) + : QDialog( p ) + { +diff --git a/src/qt/ui/UIHexInput.h b/src/qt/ui/UIHexInput.h +index f333b016..4bd8aed4 100644 +--- a/src/qt/ui/UIHexInput.h ++++ b/src/qt/ui/UIHexInput.h +@@ -22,6 +22,8 @@ + #include "ui_UIHexInput.h" + #include "../QtYabause.h" + ++#include ++ + class HexValidator : public QValidator + { + Q_OBJECT +-- +2.16.4 + diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/misc/emulators/yabause/default.nix index e7237fd4454c..a2d462fd990e 100644 --- a/pkgs/misc/emulators/yabause/default.nix +++ b/pkgs/misc/emulators/yabause/default.nix @@ -1,21 +1,24 @@ -{ stdenv, fetchurl, cmake, pkgconfig, qtbase, libGLU_combined +{ stdenv, fetchurl, cmake, pkgconfig, qtbase, qt5, libGLU_combined , freeglut ? null, openal ? null, SDL2 ? null }: stdenv.mkDerivation rec { name = "yabause-${version}"; - # 0.9.15 only works with OpenGL 3.2 or later: - # https://github.com/Yabause/yabause/issues/349 - version = "0.9.14"; + version = "0.9.15"; src = fetchurl { url = "https://download.tuxfamily.org/yabause/releases/${version}/${name}.tar.gz"; - sha256 = "0nkpvnr599g0i2mf19sjvw5m0rrvixdgz2snav4qwvzgfc435rkm"; + sha256 = "1cn2rjjb7d9pkr4g5bqz55vd4pzyb7hg94cfmixjkzzkw0zw8d23"; }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ qtbase libGLU_combined freeglut openal SDL2 ]; + buildInputs = [ qtbase qt5.qtmultimedia libGLU_combined freeglut openal SDL2 ]; - patches = [ ./emu-compatibility.com.patch ./linkage-rwx-linux-elf.patch ]; + patches = [ + ./linkage-rwx-linux-elf.patch + # Fixes derived from + # https://github.com/Yabause/yabause/commit/06a816c032c6f7fd79ced6e594dd4b33571a0e73 + ./0001-Fixes-for-Qt-5.11-upgrade.patch + ]; cmakeFlags = [ "-DYAB_NETWORK=ON" diff --git a/pkgs/misc/emulators/yabause/emu-compatibility.com.patch b/pkgs/misc/emulators/yabause/emu-compatibility.com.patch deleted file mode 100644 index 5f13d2ee1837..000000000000 --- a/pkgs/misc/emulators/yabause/emu-compatibility.com.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/qt/ui/UIYabause.ui 2017-09-28 13:23:04.636014753 +0000 -+++ b/src/qt/ui/UIYabause.ui 2017-09-28 13:23:21.945763537 +0000 -@@ -230,7 +230,6 @@ - - &Help - -- - - - diff --git a/pkgs/misc/themes/numix/default.nix b/pkgs/misc/themes/numix/default.nix index f7b5f3d91af4..4fb412481095 100644 --- a/pkgs/misc/themes/numix/default.nix +++ b/pkgs/misc/themes/numix/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Modern flat theme with a combination of light and dark elements (GNOME, Unity, Xfce and Openbox)"; - homepage = https://numixproject.org; + homepage = https://numixproject.github.io; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index d251b2da45c6..4507b1125df8 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1,5 +1,6 @@ # TODO check that no license information gets lost -{ config, lib, stdenv, python, cmake, vim, vimUtils, ruby +{ callPackage, config, lib, stdenv +, python, cmake, vim, vimUtils, ruby , which, fetchgit, llvmPackages, rustPlatform , xkb_switch, fzf, skim , python3, boost, icu, ncurses @@ -16,43 +17,24 @@ let inherit (vimUtils.override {inherit vim;}) buildVimPluginFrom2Nix; + generated = callPackage ./generated.nix { + inherit buildVimPluginFrom2Nix; + }; # TL;DR # * Add your plugin to ./vim-plugin-names -# * sort -df ./vim-plugin-names > sorted && mv sorted vim-plugin-names -# * Regenerate via `nix-shell -I nixpkgs=/path/to/your/local/fork -p vimPlugins.pluginnames2nix --command "vim-plugin-names-to-nix +silent +'x! result'"` -# Note: pluginnames2nix will fetch any plugins in the file; to speed up the process, -# update ./vim-plugin-names to contain only plugins which need generation -# Copy the generated expression(s) into this file from the ./result file. -# If plugin is complicated then make changes to ./vim2nix/additional-nix-code - -# This attrs contains two sections: -# The first contains plugins added manually, the second contains plugins -# generated by call nix#ExportPluginsForNix. -# Documentation & usage see vim-utils.nix. -# attribute names should be the same as used by vim-pi to make dependency -# resolution work -self = rec { - # This is not a plugin, it provides bin/vim-open-buffer-with-plugins-derivations - # which recreates this the following derivations based on ./vim-plugin-names - pluginnames2nix = vimUtils.pluginnames2Nix { - name = "vim-plugin-names-to-nix"; - namefiles = [./vim-plugin-names]; - }; - - # Section I - vim-addon-vim2nix = vim2nix; - - vim2nix = buildVimPluginFrom2Nix { # use it to update plugins +# * sort -udf ./vim-plugin-names > sorted && mv sorted vim-plugin-names +# * run ./update.py +# +# If additional modifications to the build process are required, +# use add an override to this file. +self = generated // (with generated; { + vim2nix = buildVimPluginFrom2Nix { name = "vim2nix"; src = ./vim2nix; dependencies = ["vim-addon-manager"]; }; - - # Section II - # Update with vimUtils.vimPlugins.pluginnames2Nix command - fzfWrapper = buildVimPluginFrom2Nix { name = fzf.name; src = fzf.src; @@ -108,328 +90,7 @@ self = rec { dependencies = []; }; - # missing dependency, using additional-nix-code results in an invalid expression - vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimshell-vim-2018-06-02"; - src = fetchgit { - url = "https://github.com/shougo/vimshell.vim"; - rev = "03bf7673a5098918a533000d67dca97546695237"; - sha256 = "1ckxjap9kz8skbjchg561sqyd5y5qwacg8mabmniy78qa7i3qdzi"; - }; - dependencies = [ "vimproc-vim" ]; - }; - - # --- generated packages bellow this line --- - - vim-auto-save = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-auto-save-2017-11-08"; - src = fetchgit { - url = "https://github.com/907th/vim-auto-save"; - rev = "66643afb55a1fcd3a9b4336f868f58da45bff397"; - sha256 = "1qnsj520j2hm6znpqpdqmz11vw45avgj8g9djx3alqbnab8ryw0p"; - }; - dependencies = []; - - }; - - vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-autoformat-2018-05-28"; - src = fetchgit { - url = "https://github.com/Chiel92/vim-autoformat"; - rev = "3c50ddb50635f7899b4339a64bc02333cdd24a4b"; - sha256 = "1zw7b3zxgsmj149z238qx2palqysdywqgsxgj2z37kc8is8dpdpy"; - }; - dependencies = []; - - }; - - ctrlp-py-matcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-py-matcher-2017-11-01"; - src = fetchgit { - url = "https://github.com/FelikZ/ctrlp-py-matcher"; - rev = "cf63fd546f1e80dd4db3db96afbeaad301d21f13"; - sha256 = "0hs829x3vxv12y78hz5g4a5qpw05xf42dk0hxxk3ind77mnl1ir1"; - }; - dependencies = []; - - }; - - ctrlp-cmatcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-cmatcher-2015-10-15"; - src = fetchgit { - url = "https://github.com/JazzCore/ctrlp-cmatcher"; - rev = "6c36334f106b6fd981d23e724e9a618734cab43a"; - sha256 = "1573kd6xf3n8sxlz2j4zadai4rnc7k3s9c54648yfzickwn57d8q"; - }; - dependencies = []; - buildInputs = [ python ]; - buildPhase = '' - patchShebangs . - ./install.sh - ''; - }; - - julia-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "julia-vim-2018-07-01"; - src = fetchgit { - url = "https://github.com/JuliaEditorSupport/julia-vim"; - rev = "c49d4d39fa7f54387ec20b8bbf006700b1e01fe2"; - sha256 = "14wib4768vi7681iclihlj94dlqq1apkynma8n7p9nh3jfzd4d06"; - }; - dependencies = []; - - }; - - zeavim-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "zeavim-vim-2018-03-22"; - src = fetchgit { - url = "https://github.com/KabbAmine/zeavim.vim"; - rev = "6db8d84528d66ce6638db03c2864abfa8afa02aa"; - sha256 = "1xw8d3ap6n31rh0a4413784sx4ki7wcz8qlwm2vf9in475vvznxj"; - }; - dependencies = []; - - }; - - vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-nix-2018-08-19"; - src = fetchgit { - url = "https://github.com/LnL7/vim-nix"; - rev = "ab3c4d52d08e9e8d2a0919e38f98ba25a2b8ad18"; - sha256 = "1waan5vgba8qx3107hdrnmbnq5kr1n49q43p7m2g7wmj81v050yb"; - }; - dependencies = []; - - }; - - vim-addon-actions = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-actions-2018-01-18"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-actions"; - rev = "540cae09832ba6abf9fc63c55781bf86584c33ac"; - sha256 = "011w5k09i01r9x64j20qj0f7d057m9wki2m8l2wds47l57hr3vz6"; - }; - dependencies = ["vim-addon-mw-utils" "tlib"]; - - }; - - vim-addon-async = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-async-2017-03-20"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-async"; - rev = "eca316a4480f68c2cb62128f3187dc7b2002afde"; - sha256 = "1lk8ma51dd0syi73vq5r4qk9cpy6cq3llizvh94hmxblfjpvrs7q"; - }; - dependencies = ["vim-addon-signs"]; - - }; - - vim-addon-background-cmd = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-background-cmd-2015-12-11"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-background-cmd"; - rev = "abf2abf339652d2bc79da81f9d131edfe2755f5a"; - sha256 = "0csy68x686l3x5ancidxb5b6prg9k7ikybqzq3klx0gs5rmksfy4"; - }; - dependencies = ["vim-addon-mw-utils"]; - - }; - - vim-addon-commenting = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-commenting-2013-06-10"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-commenting"; - rev = "b7cf748ac1c9bf555cbd347589e3b7196030d20b"; - sha256 = "0alak8h33vada2ckb0v06y82qlib5mhyc2yswlv1rqh8ypzhq3mc"; - }; - dependencies = []; - - }; - - vim-addon-completion = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-completion-2015-02-10"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-completion"; - rev = "021c449a5ce1ce4ac0af5955e05b0279c1cc0e75"; - sha256 = "1ld059y2qwlc5bdfjm2p314s1qh31lxs54g944pw49r46s5nlslr"; - }; - dependencies = ["tlib"]; - - }; - - vim-addon-errorformats = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-errorformats-2014-11-05"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-errorformats"; - rev = "dcbb203ad5f56e47e75fdee35bc92e2ba69e1d28"; - sha256 = "159zqm69fxbxcv3b2y99g57bf20qrzsijcvb5rzy2njxah3049m1"; - }; - dependencies = []; - - }; - - vim-addon-goto-thing-at-cursor = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-goto-thing-at-cursor-2012-01-11"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-goto-thing-at-cursor"; - rev = "f052e094bdb351829bf72ae3435af9042e09a6e4"; - sha256 = "1ksm2b0j80zn8sz2y227bpcx4jsv76lwgr2gpgy2drlyqhn2vlv0"; - }; - dependencies = ["tlib"]; - - }; - - vim-addon-local-vimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-local-vimrc-2015-03-19"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-local-vimrc"; - rev = "6a27f95b35befa70cd0d049329cd0920566c764b"; - sha256 = "0n8lwl1gyak149p7jpgm0qbmfj8hcg8hirx3dxdhizw0yc47ws7h"; - }; - dependencies = []; - - }; - - vim-addon-manager = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-manager-2017-05-07"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-manager"; - rev = "2434225ae48e608c2b6ac86c8da1c62209da746f"; - sha256 = "1fczkd05gir994614qmgscx131isr71bn0rwa6n3vgdbnhasz6bb"; - }; - dependencies = []; - buildInputs = stdenv.lib.optional stdenv.isDarwin Cocoa; - }; - - vim-addon-mru = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-mru-2013-08-08"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-mru"; - rev = "e41e39bd9d1bf78ccfd8d5e1bc05ae5e1026c2bb"; - sha256 = "0q6rxr9nrp63kidr3m3c2z5sda4g813pzshg0scxkjr8dxwhzdqm"; - }; - dependencies = ["vim-addon-other" "vim-addon-mw-utils"]; - - }; - - vim-addon-mw-utils = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-mw-utils-2018-03-09"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-mw-utils"; - rev = "295862ba6be47ec3b11b6c85c10d982ffd9bc0b2"; - sha256 = "0ylvhmx0cnj2x38plwqlq4pqyqyxxhf4s08hknnl7qhrr5kd533f"; - }; - dependencies = []; - - }; - - vim-addon-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-nix-2017-09-11"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-nix"; - rev = "3001a9db5f816dd7af11384f15415bddd146ef86"; - sha256 = "195z2yz09wirpqjpsha8x7qcr9is1q8qph4j0svws6qbqrkh8ryy"; - }; - dependencies = ["vim-addon-completion" "vim-addon-goto-thing-at-cursor" "vim-addon-errorformats" "vim-addon-actions" "vim-addon-mw-utils" "tlib"]; - - }; - - vim-addon-other = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-other-2014-07-15"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-other"; - rev = "f78720c9cb5bf871cabb13c7cbf94378dbf0163b"; - sha256 = "0cjz7mlyfkkncas4ss7rwxb0q38ls1qw1p15hac1imscscsvyjc6"; - }; - dependencies = ["vim-addon-actions" "vim-addon-mw-utils"]; - - }; - - vim-addon-php-manual = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-php-manual-2015-01-01"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-php-manual"; - rev = "5f9810dd1f6e9f36a45f637ae6260ccff09256ff"; - sha256 = "1kc67f12wccqdza069b75lpcbqp4kv4r23i4mfz0ihwif5mfnhir"; - }; - dependencies = []; - - }; - - vim-addon-signs = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-signs-2013-04-19"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-signs"; - rev = "17a49f293d18174ff09d1bfff5ba86e8eee8e8ae"; - sha256 = "0i4gfp30hmw1vqjl6zxjrgkca3ikdkcnjmma2mncjmcr6f59kjzy"; - }; - dependencies = []; - - }; - - vim-addon-sql = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-sql-2017-02-11"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-sql"; - rev = "048a139af36829fce670c8ff80d3aad927557ee6"; - sha256 = "0ihm157sby6csdwsnw2gwh3jmm3prm1mxwgkx2hsfwlmpb1vwwm3"; - }; - dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"]; - - }; - - vim-addon-syntax-checker = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-syntax-checker-2017-06-26"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-syntax-checker"; - rev = "739e5719b77c6aea3299c27fc1f4238ac54a8344"; - sha256 = "1rcn1ps06156nyglvxg6m7pn3vhvmnv5ad6kidp59hggyr5332i9"; - }; - dependencies = ["vim-addon-mw-utils" "tlib"]; - - }; - - vim-addon-toggle-buffer = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-toggle-buffer-2012-01-13"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-toggle-buffer"; - rev = "a1b38b9c5709cba666ed2d84ef06548f675c6b0b"; - sha256 = "1xq38kfdm36c34ln66znw841q797w5gm8bpq1x64bsf2h6n3ml03"; - }; - dependencies = ["vim-addon-mw-utils" "tlib"]; - - }; - - vim-addon-xdebug = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-xdebug-2014-08-29"; - src = fetchgit { - url = "https://github.com/MarcWeber/vim-addon-xdebug"; - rev = "45f26407305b4ce6f8f5f37d2b5e6e4354104172"; - sha256 = "1i64ppdfp2qqq7vw1jf160mj4ikc04v39iazdab83xmiqjsh8ixw"; - }; - dependencies = ["WebAPI" "vim-addon-mw-utils" "vim-addon-signs" "vim-addon-async"]; - - }; - - tsuquyomi = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tsuquyomi-2018-07-04"; - src = fetchgit { - url = "https://github.com/Quramy/tsuquyomi"; - rev = "9247e0f1ad0e1ae7d350ad5b27ef92269955cc65"; - sha256 = "09mihjiqg407n14gb4kr60fnyp3rpi18fr9nhnpg1ym2ly0nsa1l"; - }; - dependencies = []; - - }; - - clang_complete = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "clang_complete-2018-01-18"; - src = fetchgit { - url = "https://github.com/Rip-Rip/clang_complete"; - rev = "0918788ea0b9dc4c753ffd162c95f890ae57a275"; - sha256 = "19hf7xrx1lsvn5rhwmc0qc1qzpb365j1d0jzvihd99p0zkgzgj1p"; - }; - dependencies = []; + clang_complete = clang_complete.overrideAttrs(old: { # In addition to the arguments you pass to your compiler, you also need to # specify the path of the C++ std header (if you are using C++). # These usually implicitly set by cc-wrapper around clang (pkgs/build-support/cc-wrapper). @@ -441,1591 +102,24 @@ self = rec { substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/clang_complete.vim \ --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.clang.cc}/lib/libclang.so'" ''; - }; + }); - riv-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "riv-vim-2018-06-21"; - src = fetchgit { - url = "https://github.com/Rykka/riv.vim"; - rev = "fb6d6f8c9d85128fd69c74f11bb7413addc002e8"; - sha256 = "1mjp90lz6jf3w9j4h1sidz7kfxhi9hk27pdnvb0hrvxw0q3bj9ch"; - }; - dependencies = []; - - }; - - ultisnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ultisnips-2018-04-30"; - src = fetchgit { - url = "https://github.com/SirVer/ultisnips"; - rev = "6fdc3647f72e0a1f321ea6bd092ecd01f7c187ba"; - sha256 = "1zp3xcmxk6cn38zmxxy5s2wnw9djskwkmspq2s9vqliyhprf9sy3"; - }; - dependencies = []; - - }; - - vim-hoogle = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-hoogle-2018-03-04"; - src = fetchgit { - url = "https://github.com/Twinside/vim-hoogle"; - rev = "871d104c92e33cb238506f2805f1652561978cc8"; - sha256 = "17qvi57g72ijgk7nczczli3kcphvdf625fzqbqcmqpsawgvfd07n"; - }; - dependencies = []; - - }; - - vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gitgutter-2018-07-06"; - src = fetchgit { - url = "https://github.com/airblade/vim-gitgutter"; - rev = "6076c9678643a8b2fc9973f16ec9efcd5dbe1aca"; - sha256 = "1dyrll5rm61qdmzkym67hfyw80qnw10s1qrz9ryw3zvh1s2ad43l"; - }; - dependencies = []; - - }; - - Spacegray-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Spacegray-vim-2018-06-20"; - src = fetchgit { - url = "https://github.com/ajh17/Spacegray.vim"; - rev = "f9e5205319cbb5c598bbf02b16c3d05277817f81"; - sha256 = "1s32zf75ybqs9jjjvqk5z4x9a6lr43gjbwlgw8k01qf4lsxkzkn9"; - }; - dependencies = []; - - }; - - nerdtree-git-plugin = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "nerdtree-git-plugin-2017-03-12"; - src = fetchgit { - url = "https://github.com/albfan/nerdtree-git-plugin"; - rev = "d79a5d5a1b3bc5fab3ba94db44a8b2e5a211d61d"; - sha256 = "0i77wijbr021zfv096ja15f5l52phvsd5gziqn1m3k60qkmb9gkj"; - }; - dependencies = []; - - }; - - vim-colors-solarized = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-colors-solarized-2011-05-09"; - src = fetchgit { - url = "https://github.com/altercation/vim-colors-solarized"; - rev = "528a59f26d12278698bb946f8fb82a63711eec21"; - sha256 = "05d3lmd1shyagvr3jygqghxd3k8a4vp32723fvxdm57fdrlyzcm1"; - }; - dependencies = []; - - }; - - vim-closetag = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-closetag-2018-05-15"; - src = fetchgit { - url = "https://github.com/alvan/vim-closetag"; - rev = "17367f433e095a66a8a885ab628033ce2a635aa1"; - sha256 = "11qkk1vsihw2sv1vdn94xjwm2p5hvisjv5h1arpdyxpnz45rs6vh"; - }; - dependencies = []; - - }; - - ctrlp-z = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-z-2015-10-17"; - src = fetchgit { - url = "https://github.com/amiorin/ctrlp-z"; - rev = "d1a69ec623ce24b9a30fc8fe3cd468c322b03026"; - sha256 = "16nsj1g8lqmyizlb5ijwhf4dsmh0xv1kwqq6jxvhaf55vfga82yl"; - }; - dependencies = []; - - }; - - vim-logreview = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-logreview-2017-07-08"; - src = fetchgit { - url = "https://github.com/andreshazard/vim-logreview"; - rev = "b7b66ab338e904127d796af49235b8c29742f18f"; - sha256 = "09lyymq0f3ybqdzhbpia7b0wcjbcyg5nkqd72qk8jkvc42da2af3"; - }; - dependencies = []; - - }; - - peskcolor-vim-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "peskcolor-vim-git-2016-06-11"; - src = fetchgit { - url = "https://github.com/andsild/peskcolor.vim.git"; - rev = "cba4fc739bbebacd503158f6509d9c226651f363"; - sha256 = "15hw3casr5y3ckgcn6aq8vhk6g2hym41w51nvgf34hbj9fx1nvkq"; - }; - dependencies = []; - - }; - - flake8-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "flake8-vim-2017-02-17"; - src = fetchgit { - url = "https://github.com/andviro/flake8-vim"; - rev = "01c4af4c68f33b2b3785314bfbf5b3d8d1451795"; - sha256 = "14rv0p1vx4njlplkc72gz7r8sy9vc6n8x9l00zc777x5zzrhgz3g"; - }; - dependencies = []; - - }; - - vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-css-color-2018-03-06"; - src = fetchgit { - url = "https://github.com/ap/vim-css-color"; - rev = "afaacf50e65b7d30b170e70ee13c1518dce1e032"; - sha256 = "1ck8qv3wfmc7rdddzd7zh2dsnb0rx69grmc0laz7n1358xg0i4vx"; - }; - dependencies = []; - - }; - - vim-bazel = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-bazel-2018-01-10"; - src = fetchgit { - url = "https://github.com/bazelbuild/vim-bazel"; - rev = "ecafb17d5d1d3756e5ac0bd9f4812a450b8c91a3"; - sha256 = "0ixhx9ssfygjy2v2ss02w28rcjxnvhj0caffj32cv3snwnpcz6fy"; - }; - dependencies = ["maktaba"]; - - }; - - clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "clighter8-2018-07-25"; - src = fetchgit { - url = "https://github.com/bbchung/clighter8"; - rev = "839993b60dc4a19a58e4c7e7db1df04d911bb181"; - sha256 = "01r92idbym2p1hiqszrprrl1hrqzz2yhzv8n08m8gycd7m227cwg"; - }; - dependencies = []; + clighter8 = clighter8.overrideAttrs(old: { preFixup = '' sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc}/lib/libclang.so')|" \ -i "$out"/share/vim-plugins/clighter8/plugin/clighter8.vim ''; - }; + }); - neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neomake-2018-07-23"; - src = fetchgit { - url = "https://github.com/benekastah/neomake"; - rev = "b24cac5f6aa1d8f8e8bcfae52ed255f277f4f163"; - sha256 = "00hmbip0r3l0h6fk0bxs9rqbfj0vn246804s2s7shdjsvn6a3pa0"; - }; - dependencies = []; - - }; - - vim-hdevtools = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-hdevtools-2017-03-11"; - src = fetchgit { - url = "https://github.com/bitc/vim-hdevtools"; - rev = "4ffdace7002915cb10d663a2c56386286c5b8e37"; - sha256 = "0s7qd72962sc56j8xzpzikjs9k5s89d5p0j541abl8zm0mavmyka"; - }; - dependencies = []; - - }; - - vim-trailing-whitespace = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-trailing-whitespace-2017-09-22"; - src = fetchgit { - url = "https://github.com/bronson/vim-trailing-whitespace"; - rev = "4c596548216b7c19971f8fc94e38ef1a2b55fee6"; - sha256 = "0f1cpnp1nxb4i5hgymjn2yn3k1jwkqmlgw1g02sq270lavp2dzs9"; - }; - dependencies = []; - - }; - - vim-toml = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-toml-2018-06-15"; - src = fetchgit { - url = "https://github.com/cespare/vim-toml"; - rev = "85ba8277a6e331a56fce920d62bfdacce5bc5a80"; - sha256 = "0nnm4ja5j9gcsl9cv7ra30slrlpjpy4dsl0ykg0yhdq1vbby3m6n"; - }; - dependencies = []; - - }; - - denite-extra = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "denite-extra-2018-07-19"; - src = fetchgit { - url = "https://github.com/chemzqm/denite-extra"; - rev = "10836562703ebfe6552204e63b9b4293236d6d0f"; - sha256 = "1jq6wv6vhjpkd9xy8i6rjd0l69djvxg8395ylclr2dv21carx5z6"; - }; - dependencies = []; - - }; - - denite-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "denite-git-2018-07-19"; - src = fetchgit { - url = "https://github.com/chemzqm/denite-git"; - rev = "edd2c202e05c3f84e31b94a841fef236b923d559"; - sha256 = "0x8nf4x49859lgyi83vhqvpdhb1mxv55a9l8vbdflfagagj0gnzd"; - }; - dependencies = []; - - }; - - concealedyank-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "concealedyank-vim-2013-03-24"; - src = fetchgit { - url = "https://github.com/chikatoike/concealedyank.vim"; - rev = "e7e65a395e0e6a266f3a808bc07441aa7d03ebbd"; - sha256 = "0z7i8dmwfjh6mcrmgrxv3j86ic867617fas9mv4gqsrhhvrrkzsb"; - }; - dependencies = []; - - }; - - sourcemap-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "sourcemap-vim-2012-09-19"; - src = fetchgit { - url = "https://github.com/chikatoike/sourcemap.vim"; - rev = "0dd82d40faea2fdb0771067f46c01deb41610ba1"; - sha256 = "1gcgnynallz420911fdfm0ccbv3zs78p69nnh2ls1r4vlfp7g350"; - }; - dependencies = []; - - }; - - CheckAttach = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "CheckAttach-2018-07-18"; - src = fetchgit { - url = "https://github.com/chrisbra/CheckAttach"; - rev = "0f1f2e78071d7f805a0a679955cb4486f692b753"; - sha256 = "11skk275ijq8hwpp0zxsdgr08brq08v1syvyawck8vzrnqrq71sc"; - }; - dependencies = []; - - }; - - csv-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "csv-vim-2018-06-24"; - src = fetchgit { - url = "https://github.com/chrisbra/csv.vim"; - rev = "918be3bd15920fd9bc79fca5e6870b8055742a1a"; - sha256 = "01fhw55s5q23ny3n7ldg53n3raysr2wnnkpfybbba2wv55w5vpdy"; - }; - dependencies = []; - - }; - - sparkup = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "sparkup-2012-06-10"; - src = fetchgit { - url = "https://github.com/chrisgeo/sparkup"; - rev = "6fbfceef890e705c47b42b27be743ffed6f9296e"; - sha256 = "17jgpvl879ik53rr3razfnbpfx63mzpp1rlvxxjsvvrk4g45dssm"; - }; - dependencies = []; - - }; - - base16-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "base16-vim-2018-05-24"; - src = fetchgit { - url = "https://github.com/chriskempson/base16-vim"; - rev = "fcce6bce6a2f4b14eea7ea388031c0aa65e4b67d"; - sha256 = "0wi8k80v2brmxqbkk0lrvl4v2sslkjfwpvflm55b3n0ii8qy39nk"; - }; - dependencies = []; - - }; - - vim-sort-motion = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-sort-motion-2018-07-15"; - src = fetchgit { - url = "https://github.com/christoomey/vim-sort-motion"; - rev = "49dfcabeee2bf3a85a6cc0774b35f687b6c9d0e5"; - sha256 = "02v12iqy3gjhvh5aza6b6b3pfv2qkyyw83bxqjgbjj002f71ydkb"; - }; - dependencies = []; - - }; - - vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-tmux-navigator-2018-07-13"; - src = fetchgit { - url = "https://github.com/christoomey/vim-tmux-navigator"; - rev = "18b775fbccde5ff02e516c014290650bb40e257d"; - sha256 = "09v8amrdk8h4hsr9va8v9wdgzvj89z04y4j71l94rd7r6smxinbj"; - }; - dependencies = []; - - }; - - spacevim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "spacevim-2018-03-29"; - src = fetchgit { - url = "https://github.com/ctjhoa/spacevim"; - rev = "30142a518ba77feb22791b5cb2387d88b70c58f2"; - sha256 = "0m389cnpg17ca8s7vb9yrs40sxb56zg32lcpilnd63zfi7awgscg"; - }; - dependencies = []; - - }; - - ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-vim-2018-06-28"; - src = fetchgit { - url = "https://github.com/ctrlpvim/ctrlp.vim"; - rev = "43cc73b8e7d4ab45f17118573eb81fd45704b989"; - sha256 = "16jn9n6vavwiwh6l2av2i3livan72saaz0d0v8vmznrrs2ngi1gk"; - }; - dependencies = []; - - }; - - vim2hs = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim2hs-2014-04-16"; - src = fetchgit { - url = "https://github.com/dag/vim2hs"; - rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664"; - sha256 = "18lqrl3hqb6cmizc04bbnsh8j0g761w2q8wascbzzfw80dmxy36b"; - }; - dependencies = []; - - }; - - quickfixstatus = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "quickfixstatus-2011-09-02"; - src = fetchgit { - url = "https://github.com/dannyob/quickfixstatus"; - rev = "fd3875b914fc51bbefefa8c4995588c088163053"; - sha256 = "16vxhvyxq51y7wnx0c1fmdi2yb6kfr1pxijq65gxj8qwvbak2s3v"; - }; - dependencies = []; - - }; - - agda-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "agda-vim-2018-05-23"; - src = fetchgit { - url = "https://github.com/derekelkins/agda-vim"; - rev = "24169e70c1dbd784349b1551b6a3753680d9bb87"; - sha256 = "1bn2g89dvwccfl4ki07jb8iydb3d0s4rm7z5gv5q1bv3lccndax6"; - }; - dependencies = []; - - }; - - vim-scala = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-scala-2017-11-10"; - src = fetchgit { - url = "https://github.com/derekwyatt/vim-scala"; - rev = "0b909e24f31d94552eafae610da0f31040c08f2b"; - sha256 = "1lqqapimgjr7k4imr26ap0lgx6k4qjl5gmgb1knvh5kz100bsjl5"; - }; - dependencies = []; - - }; - - vim-table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-table-mode-2018-05-16"; - src = fetchgit { - url = "https://github.com/dhruvasagar/vim-table-mode"; - rev = "5483e163bd0a67e729e0e8436315f33f9e126baf"; - sha256 = "0mmpa7zhrj8mqf4931ldf6n9jlpfxc4kg8xdhqlp7srlnq4h8siw"; - }; - dependencies = []; - - }; - - vim-jade = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-jade-2017-04-07"; - src = fetchgit { - url = "https://github.com/digitaltoad/vim-jade"; - rev = "ddc5592f8c36bf4bd915c16b38b8c76292c2b975"; - sha256 = "069pha18g1nlzg44k742vjxm4zwjd1qjzhfllkr35qaiflvjm84y"; - }; - dependencies = []; - - }; - - pony-vim-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "pony-vim-syntax-2017-09-26"; - src = fetchgit { - url = "https://github.com/dleonard0/pony-vim-syntax"; - rev = "caa34b3d7a15d9bfbfbb2f5944c85eb1eddcfafc"; - sha256 = "0r2lv99hkm95dv8wy9rkrkcwz5wkmwggfwi5vakgw497l3a9jskr"; - }; - dependencies = []; - - }; - - vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-2018-07-23"; - src = fetchgit { - url = "https://github.com/dracula/vim"; - rev = "d329d61c1752807059aef388c4e9629296760a35"; - sha256 = "06f5jg194w1fzh4bfj7cbibn94a1zx987f8iiaylkqzj3h0fn3fm"; - }; - dependencies = []; - - }; - - xptemplate = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "xptemplate-2017-12-06"; - src = fetchgit { - url = "https://github.com/drmingdrmer/xptemplate"; - rev = "74aac3aebaf9c67c12c21d6b25295b9bec9c93b3"; - sha256 = "01yvas50hg7iwwrdh61407mc477byviccksgi0fkaz89p78bbd1p"; - }; - dependencies = []; - - }; - - ghcmod-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ghcmod-vim-2016-06-19"; - src = fetchgit { - url = "https://github.com/eagletmt/ghcmod-vim"; - rev = "1d192d13d68ab59f9f46497a0909bf24a7b7dfff"; - sha256 = "0bzahgzagnf0a9zv86jhdf8nc3p0yfz9izv5n3lc8gc12cp47d0a"; - }; - dependencies = []; - - }; - - neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neco-ghc-2018-05-13"; - src = fetchgit { - url = "https://github.com/eagletmt/neco-ghc"; - rev = "682869aca5dd0bde71a09ba952acb59c543adf7d"; - sha256 = "1v7ibi4fp99s4lswz3v0gf4i0h5i5gpj05xpsf4cixwj2zgh206h"; - }; - dependencies = []; - - }; - - editorconfig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "editorconfig-vim-2018-07-25"; - src = fetchgit { - url = "https://github.com/editorconfig/editorconfig-vim"; - rev = "2c3e5323609d97ad7bda6fc22ae1f7746caab3d4"; - sha256 = "0a1nszrhxh9ixp5n47w89ijkvjk3rf29ypiz5blf4pnja39r336x"; - }; - dependencies = []; - - }; - - vim-cute-python-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-cute-python-git-2016-04-04"; - src = fetchgit { - url = "https://github.com/ehamberg/vim-cute-python.git"; - rev = "d7a6163f794500447242df2bedbe20bd751b92da"; - sha256 = "1jrfd6z84cdzn3yxdfp0xfxygscq7s8kbzxk37hf9cf5pl9ln0qf"; - }; - dependencies = []; - - }; - - acp = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "acp-2013-02-05"; - src = fetchgit { - url = "https://github.com/eikenb/acp"; - rev = "5c627cec37d0d3b1670cb250d84e176e8b0c644e"; - sha256 = "0h7s4nvxin7m2caka7g1hhlxj1bbiwsvw8s2lqwlh7nq43v23ghg"; - }; - dependencies = []; - - }; - - vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-elixir-2018-05-25"; - src = fetchgit { - url = "https://github.com/elixir-lang/vim-elixir"; - rev = "b916c00a7cdb6099dbebb6096eab55794751e2b3"; - sha256 = "1scg80j7kjjqfcswddwsig166zmipa9q6rm0kh8779i7qflgg4g0"; - }; - dependencies = []; - - }; - - elm-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "elm-vim-2018-06-18"; - src = fetchgit { - url = "https://github.com/elmcast/elm-vim"; - rev = "e51e2e43ad617c26205a84453481d3ac152c8fec"; - sha256 = "09bgfjnpa1s25x5wnxry9lmsly92s0mazn1sl0vg2wfgphf67m6b"; - }; - dependencies = []; - - }; - - vim-json = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-json-2018-01-10"; - src = fetchgit { - url = "https://github.com/elzr/vim-json"; - rev = "3727f089410e23ae113be6222e8a08dd2613ecf2"; - sha256 = "1c19pqrys45pzflj5jyrm4q6hcvs977lv6qsfvbnk7nm4skxrqp1"; - }; - dependencies = []; - - }; - - vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-localvimrc-2018-07-23"; - src = fetchgit { - url = "https://github.com/embear/vim-localvimrc"; - rev = "a3cb22a68625e022df1da402361801cc817bcec5"; - sha256 = "0n3fl4wh5bhppxwkpd69jmnck2js08dgzfxcpfqrvx22zr22m8kc"; - }; - dependencies = []; - - }; - - vim-haskellConcealPlus = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-haskellConcealPlus-2016-05-13"; - src = fetchgit { - url = "https://github.com/enomsg/vim-haskellConcealPlus"; - rev = "81dfb51ff8e471fb1f30659a10daaf1bdd65fb03"; - sha256 = "0vm76gxw62lkyxccrlnn8sblfl3d51svwfra9wfixq4h51jdggyr"; - }; - dependencies = []; - - }; - - ensime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ensime-vim-2018-04-21"; - src = fetchgit { - url = "https://github.com/ensime/ensime-vim"; - rev = "634cce6eae10a31cd6eec259890bdcda326ee3c2"; - sha256 = "03sr53680kcwxaa5xbqzdfbsgday3bkzja33wym49w9gjmlaa320"; - }; - dependencies = ["vimproc" "vimshell" "self" "forms"]; - passthru.python3Dependencies = ps: with ps; [ sexpdata websocket_client ]; - }; - - supertab = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "supertab-2017-11-14"; - src = fetchgit { - url = "https://github.com/ervandew/supertab"; - rev = "40fe711e088e2ab346738233dd5adbb1be355172"; - sha256 = "0l5labq68kyprv63k1q35hz5ly0dd06mf2z202mccnix4mlxf0db"; - }; - dependencies = []; - - }; - - YUNOcommit-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "YUNOcommit-vim-2014-11-26"; - src = fetchgit { - url = "https://github.com/esneider/YUNOcommit.vim"; - rev = "981082055a73ef076d7e27477874d2303153a448"; - sha256 = "0mjc7fn405vcx1n7vadl98p5wgm6jxrlbdbkqgjq8f1m1ir81zab"; - }; - dependencies = []; - - }; - - vim-lastplace = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-lastplace-2017-06-13"; - src = fetchgit { - url = "https://github.com/farmergreg/vim-lastplace"; - rev = "102b68348eff0d639ce88c5094dab0fdbe4f7c55"; - sha256 = "1d0mjjyissjvl80wgmn7z1gsjs3fhk0vnmx84l9q7g04ql4l9pja"; - }; - dependencies = []; - - }; - - vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-go-2018-07-22"; - src = fetchgit { - url = "https://github.com/fatih/vim-go"; - rev = "5e26ce6bfa9400f645aaa5898f802f46275b9585"; - sha256 = "1m380n3sdsqydn5dbjj1cafslbr1426ihz1a7rxr980z5jd43hj1"; - }; - dependencies = []; - - }; - - vim-isort = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-isort-2017-03-12"; - src = fetchgit { - url = "https://github.com/fisadev/vim-isort"; - rev = "65bd9fecd5412c8c127de86f8dcf6cfe4dd70fda"; - sha256 = "0d9r2p557czrqhn3z35jsrzp3iw6n0vjhxcgkk6l0y79ni3dar1m"; - }; - dependencies = []; - postPatch = '' - substituteInPlace ftplugin/python_vimisort.vim \ - --replace 'import vim' 'import vim; import sys; sys.path.append("${pythonPackages.isort}/${python.sitePackages}")' - ''; - }; - - vim-colorschemes = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-colorschemes-2017-08-22"; - src = fetchgit { - url = "https://github.com/flazz/vim-colorschemes"; - rev = "eab315701f4627967fd62582eefc4e37a3745786"; - sha256 = "12jfqfs6lqd6jijxrdx3k76bzxrh9517zwczb73qjaqbg286fh5k"; - }; - dependencies = []; - - }; - - floobits-neovim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "floobits-neovim-2017-08-02"; - src = fetchgit { - url = "https://github.com/floobits/floobits-neovim"; - rev = "9ccd5a8d5d28261b9686717d61a32b756f38f189"; - sha256 = "02njg49qz9bfzggpn7z5c7w1wa1k5hxly66904wizl601fa6c664"; - }; - dependencies = []; - - }; - - psc-ide-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "psc-ide-vim-2018-03-11"; - src = fetchgit { - url = "https://github.com/frigoeu/psc-ide-vim"; - rev = "6d4a3cc27e9782b703f6dd61ef5fdf27054bac0f"; - sha256 = "19w0cvrka3klxbh9z1yq873v92rhmxdj68bdnqxzwybf24hgsk9g"; - }; - dependencies = []; - - }; - - vim-snipmate = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snipmate-2017-04-20"; - src = fetchgit { - url = "https://github.com/garbas/vim-snipmate"; - rev = "a9802f2351910f64b70fb10b63651e6ff6b8125e"; - sha256 = "1l7sc6lf66pkiy18aq9s3wk1dmvvvsy1063cc0bxich9xa8m34bj"; - }; - dependencies = ["vim-addon-mw-utils" "tlib"]; - - }; - - vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vundle-2018-02-02"; - src = fetchgit { - url = "https://github.com/gmarik/vundle"; - rev = "9a38216a1c0c597f978d73547d37681fc689c90d"; - sha256 = "1695glma8zf2lnp0w713sdvwqagf1s127p4i60114nk6gx5g5x2c"; - }; - dependencies = []; - - }; - - csapprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "csapprox-2013-07-26"; - src = fetchgit { - url = "https://github.com/godlygeek/csapprox"; - rev = "7981dac51d8b6776985aa08cb7b5ee98ea7f2ddd"; - sha256 = "08g4x6nnd6hkgm2daa5ihhz75pcdx3jzzv8rfjls80qajlhx5rf6"; - }; - dependencies = []; - - }; - - tabular = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tabular-2016-05-04"; - src = fetchgit { - url = "https://github.com/godlygeek/tabular"; - rev = "00e1e7fcdbc6d753e0bc8043e0d2546fa81bf367"; - sha256 = "185jpisk9hamcwb6aiavdzjdbbigzdra8f4mgs98r9cm9j448xkz"; - }; - dependencies = []; - - }; - - vim-codefmt = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-codefmt-2018-06-06"; - src = fetchgit { - url = "https://github.com/google/vim-codefmt"; - rev = "78f646545c4e1254fc413242e5c204a2dc79665d"; - sha256 = "0ysnjsc7nybm374k039655y1wijkh8p2m0hsfxf9cxf79yjinyql"; - }; - dependencies = ["maktaba"]; - - }; - - vim-jsonnet = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-jsonnet-2018-04-10"; - src = fetchgit { - url = "https://github.com/google/vim-jsonnet"; - rev = "1425166887329363381194adc457b02b663b1354"; - sha256 = "0kkpvp1r06l3glhgw4wv3ihqisjhs5m0x7mxgy388hy4r73fx08j"; - }; - dependencies = []; - - }; - - vim-maktaba = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-maktaba-2018-05-06"; - src = fetchgit { - url = "https://github.com/google/vim-maktaba"; - rev = "ffdb1a5a9921f7fd722c84d0f60e166f9916b67d"; - sha256 = "1cmhgd9xvx09l6ypks09gxqs1vad1bddinf4cx2jmd516bv8qss3"; - }; - dependencies = []; - - }; - - gitv = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "gitv-2018-06-10"; - src = fetchgit { - url = "https://github.com/gregsexton/gitv"; - rev = "41e4ffdbdb02374412d03c5680906ebee84dd5a2"; - sha256 = "1wfp3kkcvrccq0dqplg3ymyz9vdwn1c5wabh6mwfzbs2zx01vwcn"; - }; - dependencies = ["fugitive"]; - - }; - - xterm-color-table-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "xterm-color-table-vim-2013-12-31"; - src = fetchgit { - url = "https://github.com/guns/xterm-color-table.vim"; - rev = "9754e857e5f4fe1f8727106dcc682d21c29a51e4"; - sha256 = "08a1d9428xwrjp40qgi34cb5fwgc239qf3agxl32k7bqbn08pq19"; - }; - dependencies = []; - - }; - - vim-jsdoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-jsdoc-2018-05-05"; - src = fetchgit { - url = "https://github.com/heavenshell/vim-jsdoc"; - rev = "5ef086789f5ac431d1d5aab53e771f00f1c25503"; - sha256 = "0f0dbcvbmha2nfadvf27crxkkxc1ps1inss5n66vy1p5bffv0bpm"; - }; - dependencies = []; - - }; - - vim-leader-guide = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-leader-guide-2017-03-18"; - src = fetchgit { - url = "https://github.com/hecal3/vim-leader-guide"; - rev = "6ac8c663e65c9c0ded70417b84f66ee59457893e"; - sha256 = "1hqha3ig40ls15bnb10xpbl91swn0gxqnhmz5frkvvdzj4wq55fw"; - }; - dependencies = []; - - }; - - vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets-2018-07-19"; - src = fetchgit { - url = "https://github.com/honza/vim-snippets"; - rev = "1143432afdb3a97b606b081700eead5b4f499d4d"; - sha256 = "1z0pgpsv8y1zhxlm6w76wgd4wx378wbq44mvgxxfxi0mfvb6vywf"; - }; - dependencies = []; - - }; - - idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "idris-vim-2017-12-04"; - src = fetchgit { - url = "https://github.com/idris-hackers/idris-vim"; - rev = "091ed6b267749927777423160eeab520109dd9c1"; - sha256 = "1zibar2vxcmai0k37ricwnimfdv1adxfbbvz871rc4l6h3q85if1"; - }; - dependencies = []; - - }; - - vim-SyntaxRange = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-SyntaxRange-2018-03-09"; - src = fetchgit { - url = "https://github.com/inkarkat/vim-SyntaxRange"; - rev = "dc33d8f84ebbf4c9fa03ce00b8adeb83e05249d3"; - sha256 = "0nf0hkgl5fm0laxb5253br894259kz33zyiwxzrry6w3108alasr"; - }; - dependencies = []; - - }; - - vim-extradite = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-extradite-2015-09-22"; - src = fetchgit { - url = "https://github.com/int3/vim-extradite"; - rev = "52326f6d333cdbb9e9c6d6772af87f4f39c00526"; - sha256 = "0c89i0spvdm9vi65q15qcmsfmwa9rds2wmaq1kf6s7q7ywvs6w8i"; - }; - dependencies = []; - - }; - - calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "calendar-vim-2018-07-04"; - src = fetchgit { - url = "https://github.com/itchyny/calendar.vim"; - rev = "f27fcf52c8a516f55ede5cff468f0a3e4014ae1b"; - sha256 = "07gg83bgj9c43jn66zlvyc1avqjyidb9cjwdv1ln3965zkl47b5r"; - }; - dependencies = []; - - }; - - lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "lightline-vim-2018-07-05"; - src = fetchgit { - url = "https://github.com/itchyny/lightline.vim"; - rev = "0532dff598abca9975d3f80128eaadadbf1d91d4"; - sha256 = "1wvhl2wc2p4vqi7zzj7wdyq0cnbfq8s7g5ifcchj8f5s8c4h4lfc"; - }; - dependencies = []; - - }; - - thumbnail-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "thumbnail-vim-2017-04-24"; - src = fetchgit { - url = "https://github.com/itchyny/thumbnail.vim"; - rev = "71cb5d48e59fc77149c1d1036ecd9e39f0b46a00"; - sha256 = "0b25n28ri6n5rrvgfynv8rm5pzzxpnrnj1l3647pf2fjxd2z2rv5"; - }; - dependencies = []; - - }; - - vim-cursorword = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-cursorword-2017-10-19"; - src = fetchgit { - url = "https://github.com/itchyny/vim-cursorword"; - rev = "4878d6185b99131c5f610cc6ad0e223439ac4601"; - sha256 = "170nf0w7i5k3cr72dkvraq2p0lzsvb3cmdvslyz7cmxnz611n6bf"; - }; - dependencies = []; - - }; - - vim-gitbranch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gitbranch-2017-05-28"; - src = fetchgit { - url = "https://github.com/itchyny/vim-gitbranch"; - rev = "8118dc1cdd387bd609852be4bf350360ce881193"; - sha256 = "01gvd96mnzfc5s0951zzq122birg5svnximkldgb9kv5bmsnmh3j"; - }; - dependencies = []; - - }; - - vim-ipython = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-ipython-2015-06-23"; - src = fetchgit { - url = "https://github.com/ivanov/vim-ipython"; - rev = "42499f094b805b90b683afa5009cee99abd0bb75"; - sha256 = "10wpfvfs8yv1bvzra4d5zy5glp62gbalpayxx7mkalhr2ccppy3x"; - }; - dependencies = []; - - }; - - tender-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tender-vim-2017-03-14"; - src = fetchgit { - url = "https://github.com/jacoborus/tender.vim"; - rev = "6b0497a59233b3e67fb528a498069eb1d24743f9"; - sha256 = "1iqijk7xq0g6p3j8jgzgrhqizw87fnfryx73iaqqx5iyq1k8i9mn"; - }; - dependencies = []; - - }; - - vim-test-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-test-git-2018-07-10"; - src = fetchgit { - url = "https://github.com/janko-m/vim-test.git"; - rev = "e24477e81e91fe90c5d914849848027cb09a7c86"; - sha256 = "1kkfzs0bmbg4kjips1jylrsd5rqd39ab2x2z1a64pjkx1fvl703b"; - }; - dependencies = []; - - }; - - vim-hier = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-hier-2011-08-27"; - src = fetchgit { - url = "https://github.com/jceb/vim-hier"; - rev = "0b8c365263551a67404ebd7e528c55e17c1d3de7"; - sha256 = "118pd9sx1bl9vfr89xrf536hfx4l162a43a1qpwpkqxzb9a3ca7n"; - }; - dependencies = []; - buildInputs = [ vim ]; - }; - - vim-orgmode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-orgmode-2018-07-25"; - src = fetchgit { - url = "https://github.com/jceb/vim-orgmode"; - rev = "35e94218c12a0c063b4b3a9b48e7867578e1e13c"; - sha256 = "0j6zfqqysnky4z54413l87q7wxbskg0zb221zbz48ry4l1anilhx"; - }; - dependencies = []; - - }; - - vim-buffergator = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-buffergator-2018-05-02"; - src = fetchgit { - url = "https://github.com/jeetsukumaran/vim-buffergator"; - rev = "947b60dca4d4fc6a041a6ec84b17ca6736d1b916"; - sha256 = "1b6sw5858h3v7p46v1fiy06jnfwiwqsfqwhr46ia12d0rfdm538c"; - }; - dependencies = []; - - }; - - tslime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tslime-vim-2018-07-23"; - src = fetchgit { - url = "https://github.com/jgdavey/tslime.vim"; - rev = "28e9eba642a791c6a6b044433dce8e5451b26fb0"; - sha256 = "1y5xikryv6851d0rjk9c64agawshp5208mwym6ma9ngs7s3s1l4x"; - }; - dependencies = []; - - }; - - vim-docbk = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-docbk-2015-04-01"; - src = fetchgit { - url = "https://github.com/jhradilek/vim-docbk"; - rev = "6ac0346ce96dbefe982b9e765a81c072997f2e9e"; - sha256 = "1jnx39m152hf9j620ygagaydg6h8m8gxkr1fmxj6kgqf71jr0n9d"; - }; - dependencies = []; - - }; - - auto-pairs = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "auto-pairs-2017-07-03"; - src = fetchgit { - url = "https://github.com/jiangmiao/auto-pairs"; - rev = "f0019fc6423e7ce7bbd01d196a7e027077687fda"; - sha256 = "1kzrdq3adwxwm3fw65g05ww9405lwqi368win5kayamyj9i0z7r6"; - }; - dependencies = []; - - }; - - vim-nerdtree-tabs = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-nerdtree-tabs-2018-05-05"; - src = fetchgit { - url = "https://github.com/jistr/vim-nerdtree-tabs"; - rev = "5fc6c6857028a07e8fe50f0adef28fb20218776b"; - sha256 = "051m4jb8jcc9rbafp995hmf4q6zn07bwh7anra6k1cr14i9lasaa"; - }; - dependencies = []; - - }; - - zenburn = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "zenburn-2018-04-29"; - src = fetchgit { - url = "https://github.com/jnurmine/zenburn"; - rev = "2cacfcb222d9db34a8d1a13bb8bb814f039b98cd"; - sha256 = "0m5d5sjckirfpdhg9sf1nl5xywvzdx6y04r13m47jlavf79hhimi"; - }; - dependencies = []; - - }; - - vim-colorstepper = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-colorstepper-2016-01-28"; - src = fetchgit { - url = "https://github.com/jonbri/vim-colorstepper"; - rev = "f23ba0d995d41508a2dc9471cf31d3d01a4b5f05"; - sha256 = "05ykxn0gmh8liz0zv5hb8df1ajggxp88izq3825m0yb3ma3k1jqs"; - }; - dependencies = []; - - }; - - vim-xdebug = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-xdebug-2012-08-15"; - src = fetchgit { - url = "https://github.com/joonty/vim-xdebug"; - rev = "a4980fa65f7f159780593ee37c178281691ba2c4"; - sha256 = "1qh18r0sm4gh95sjbi2hnflvxdl4gk00jyy3n7z4i1gnx9ihxjqw"; - }; - dependencies = []; - postInstall = false; - }; - - fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fzf-vim-2018-07-22"; - src = fetchgit { - url = "https://github.com/junegunn/fzf.vim"; - rev = "6ce58caad320be3cf9ff5d275191f88524edf326"; - sha256 = "02s6ky1mnb18iy91p6syy3qnp55zwg2d52ybm6cic2gwvj1az1sf"; - }; - dependencies = []; - - }; - - goyo-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "goyo-vim-2017-06-01"; - src = fetchgit { - url = "https://github.com/junegunn/goyo.vim"; - rev = "5b8bd0378758c1d9550d8429bef24b3d6d78b592"; - sha256 = "0jh2gyf6v1vl12hygzwylzsj1ivx7r6xrd75k2wfsy91b2pm9srj"; - }; - dependencies = []; - - }; - - limelight-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "limelight-vim-2016-06-24"; - src = fetchgit { - url = "https://github.com/junegunn/limelight.vim"; - rev = "106fb5749d227a0de72e36068ed72798c6fd48e6"; - sha256 = "0fp4yp50n5v5zx3a7afh9wip4nwcfhmdgdzwpnl79jvild1z9fgh"; - }; - dependencies = []; - - }; - - vim-easy-align = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easy-align-2017-06-03"; - src = fetchgit { - url = "https://github.com/junegunn/vim-easy-align"; - rev = "1cd724dc239c3a0f7a12e0fac85945cc3dbe07b0"; - sha256 = "0bqk1sdqamfgagh31a60c7gvvsvjpg1xys7ivqh62iqlny5i9774"; - }; - dependencies = []; - - }; - - vim-dashboard = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-dashboard-2017-08-08"; - src = fetchgit { - url = "https://github.com/junegunn/vim-github-dashboard"; - rev = "054d7c69d9882a6ffccedd6e43623e184958d3b6"; - sha256 = "1ns6dd8719hqrkqnxd52ssi7gxjxni7w4l1ih7ag72d62qzw0p8y"; - }; - dependencies = []; - - }; - - vim-peekaboo = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-peekaboo-2017-03-20"; - src = fetchgit { - url = "https://github.com/junegunn/vim-peekaboo"; - rev = "a7c940b15b008afdcea096d3fc4d25e3e431eb49"; - sha256 = "1rc4hr6vwj2mmrgz8lifxf9rvcw1rb5dahq649yn8ccw03x8zn6m"; - }; - dependencies = []; - - }; - - vim-eighties = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-eighties-2016-12-15"; - src = fetchgit { - url = "https://github.com/justincampbell/vim-eighties"; - rev = "1a6ea42ead1e31524ec94cfefb6afc1d8dacd170"; - sha256 = "1yh1kny28c7f5qm52y7xd5aj4mycksfb0x1zvcb37c73ycdxc1v2"; - }; - dependencies = []; - - }; - - vim-niceblock = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-niceblock-2018-01-30"; - src = fetchgit { - url = "https://github.com/kana/vim-niceblock"; - rev = "178629a8b81da2fa614bd6c19e7797e325ee9153"; - sha256 = "1bz8qjnwk3gz9h0194g3qqga91i4k78r9s1xymn2fv35llrfsdx0"; - }; - dependencies = []; - - }; - - vim-operator-replace = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-operator-replace-2015-02-25"; - src = fetchgit { - url = "https://github.com/kana/vim-operator-replace"; - rev = "1345a556a321a092716e149d4765a5e17c0e9f0f"; - sha256 = "07cibp61zwbzpjfxqdc77fzrgnz8jhimmdhhyjr0lvgrjgvsnv6q"; - }; - dependencies = []; - - }; - - vim-operator-user = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-operator-user-2015-02-17"; - src = fetchgit { - url = "https://github.com/kana/vim-operator-user"; - rev = "c3dfd41c1ed516b4b901c97562e644de62c367aa"; - sha256 = "16y2fyrmwg4vkcl85i8xg8s6m39ca2jvgi9qm36b3vzbnkcifafb"; - }; - dependencies = []; - - }; - - vim-tabpagecd = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-tabpagecd-2013-11-29"; - src = fetchgit { - url = "https://github.com/kana/vim-tabpagecd"; - rev = "8b71a03a037608fa5918f5096812577cec6355e4"; - sha256 = "1mr6s2hvsf2a2nkjjvq78c9isfxk2k1ih890w740srbq6ssj0npm"; - }; - dependencies = []; - - }; - - vim-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-coffee-script-2018-02-27"; - src = fetchgit { - url = "https://github.com/kchmck/vim-coffee-script"; - rev = "9e3b4de2a476caeb6ff21b5da20966d7c67a98bb"; - sha256 = "1yzhyi12r508r2yjkzbcnddv3q4whjf3kchp23xs0snhwd9b981x"; - }; - dependencies = []; - - }; - - swift-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "swift-vim-2018-07-21"; - src = fetchgit { - url = "https://github.com/keith/swift.vim"; - rev = "40d53b215fd455e4b7fd413eaf14d1a028a504ab"; - sha256 = "1lbxi0n5x5xnskfylbcpazch00lxbfhnc2h70x196yc4fhwz9153"; - }; - dependencies = []; - - }; - - rainbow_parentheses-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "rainbow_parentheses-vim-2013-03-04"; - src = fetchgit { - url = "https://github.com/kien/rainbow_parentheses.vim"; - rev = "eb8baa5428bde10ecc1cb14eed1d6e16f5f24695"; - sha256 = "1qw84imlhq4654mxazj7j3sp5g1j3yjxi496i08iix06dm15m5s7"; - }; - dependencies = []; - - }; - - fastfold = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fastfold-2018-06-02"; - src = fetchgit { - url = "https://github.com/konfekt/fastfold"; - rev = "4150ebdc6e226e8797d42dcabb7463952de9dc30"; - sha256 = "0mdb77np2vf564q18fvj1klr99pwrx2sw0jhxify9g7i0177qs4r"; - }; - dependencies = []; - - }; - - vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signature-2018-07-06"; - src = fetchgit { - url = "https://github.com/kshenoy/vim-signature"; - rev = "6bc3dd1294a22e897f0dcf8dd72b85f350e306bc"; - sha256 = "08m5dg77yavria7n7iajkj4kqaw848763680003j2gbrjlhpprpm"; - }; - dependencies = []; - - }; - - vim-gista = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gista-2017-02-20"; - src = fetchgit { - url = "https://github.com/lambdalisue/vim-gista"; - rev = "b6cd41d0eb480cd79e84f3da3703613d0cf94a6c"; - sha256 = "0bkzbppd3jdci4yvifb4sh05q20qn8cr3j9kqhxyc703s0l0lk2s"; - }; - dependencies = []; - - }; - - latex-box = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "latex-box-2015-06-01"; - src = fetchgit { - url = "https://github.com/latex-box-team/latex-box"; - rev = "3c2901e12cb78bfb2be58ba4c62a488612550fe1"; - sha256 = "1z4mdy47cpwcdhvy8mr72vhlybxn1y59yd3ixf6ids1bzpkrd7zl"; - }; - dependencies = []; - - }; - - typescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "typescript-vim-2018-03-08"; - src = fetchgit { - url = "https://github.com/leafgarland/typescript-vim"; - rev = "e25636b44211a4be7b089bfed7cf09aa7dd086f5"; - sha256 = "1i422j4za5xwcv3zz7cjw523nnh5q652c04phqp681lgdmgqszh4"; - }; - dependencies = []; - - }; - - vim-ledger = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-ledger-2017-12-12"; - src = fetchgit { - url = "https://github.com/ledger/vim-ledger"; - rev = "6eb3bb21aa979cc295d0480b2179938c12b33d0d"; - sha256 = "0rbwyaanvl2bqk8xm4kq8fkv8y92lpf9xx5n8gw54iij7xxhnj01"; - }; - dependencies = []; - - }; - - vim-jinja = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-jinja-2016-11-16"; - src = fetchgit { - url = "https://github.com/lepture/vim-jinja"; - rev = "8d330a7aaf0763d080dc82204b4aaba6ac0605c6"; - sha256 = "1n62ga02rcj7jjgzvwr46pckj59dc1zqahjgampjcwdd8vf4mg3q"; - }; - dependencies = []; - - }; - - vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimtex-2018-07-25"; - src = fetchgit { - url = "https://github.com/lervag/vimtex"; - rev = "5c5cd72b680bca8c3b5b45ee790f3f6f5890e77c"; - sha256 = "1pahrkf536ay56jdiqdda1bq0q5d788bvf099r0wvxwgqk77hr6n"; - }; - dependencies = []; - - }; - - cosco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "cosco-vim-2018-02-15"; - src = fetchgit { - url = "https://github.com/lfilho/cosco.vim"; - rev = "434dc68b93b8f42babe1887a269145ce39c97edf"; - sha256 = "1ng91nkkd9rgyihp4dvzrj7drm31d9r2vx4id1n8v6gc1rx3qasv"; - }; - dependencies = []; - - }; - - vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easymotion-2018-06-05"; - src = fetchgit { - url = "https://github.com/lokaltog/vim-easymotion"; - rev = "1a0244c90c3ff46219cf9597bb13662be4232407"; - sha256 = "1gsfn4fgivfg821wmnrdzpmqdimjkvkqi3gwr0nwf07ygjbr2csy"; - }; - dependencies = []; - - }; - - vim-lawrencium = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-lawrencium-2017-01-10"; - src = fetchgit { - url = "https://github.com/ludovicchabant/vim-lawrencium"; - rev = "88077183e1f5a9a1f741aeab7a1374cfed9e917f"; - sha256 = "0z31v93wjycq4lqvbl1jzxi7i5i1vl919m4dyyzphybcqrjjpnab"; - }; - dependencies = []; - - }; - - rainbow = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "rainbow-2018-06-19"; - src = fetchgit { - url = "https://github.com/luochen1990/rainbow"; - rev = "549724c2123c5a06834676963be0d76d5c37abc1"; - sha256 = "0hh0w337qw5yk9flk4iz4vfpa4q13blvyv10hgbfrqy72s30gpdf"; - }; - dependencies = []; - - }; - - vim-xkbswitch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-xkbswitch-2017-03-27"; - src = fetchgit { - url = "https://github.com/lyokha/vim-xkbswitch"; - rev = "a85ebddb9038e6b05138c48868a319a9e13d1868"; - sha256 = "0v0wckkvsj3pd3a5lj35dqwlvgr1kfz0x6rpnx28mzrcg05p19fr"; - }; - dependencies = []; - patchPhase = '' - substituteInPlace plugin/xkbswitch.vim \ - --replace /usr/local/lib/libxkbswitch.so ${xkb_switch}/lib/libxkbswitch.so - ''; - buildInputs = [ xkb_switch ]; - }; - - vim-highlightedyank = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-highlightedyank-2018-06-01"; - src = fetchgit { - url = "https://github.com/machakann/vim-highlightedyank"; - rev = "eafae05916e670da8bc99e44b1534cd8c7f87c7a"; - sha256 = "1z6xjb9244fgnhmw21m7y3bd9vs9gvxbb9ig73iwy0ny886hjlnk"; - }; - dependencies = []; - - }; - - tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tagbar-2017-12-17"; - src = fetchgit { - url = "https://github.com/majutsushi/tagbar"; - rev = "387bbadda98e1376ff3871aa461b1f0abd4ece70"; - sha256 = "0srmslg0v1a7zhzz0wgzgv7jyr0j3q9m766qzb7zimkkb32fcbx9"; - }; - dependencies = []; - - }; - - vim-jsbeautify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-jsbeautify-2018-01-31"; - src = fetchgit { - url = "https://github.com/maksimr/vim-jsbeautify"; - rev = "7a55bffa7d87e4f1ed11650e56a1361779b39624"; - sha256 = "01jvc3nkvmhw9n7m9x96ax1ndzw78ryjmgrvkqb7gja1xb8i8jqq"; - }; - dependencies = []; - - }; - - Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Jenkinsfile-vim-syntax-2018-04-03"; - src = fetchgit { - url = "https://github.com/martinda/Jenkinsfile-vim-syntax"; - rev = "45418b171e06f63e0814cac6a656832384708aba"; - sha256 = "0vfx22fzp0894lclmbsp6l8apvw0znd3cbah8r7r5la9qzyiwi4p"; - }; - dependencies = []; - - }; - - gist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "gist-vim-2016-10-10"; - src = fetchgit { - url = "https://github.com/mattn/gist-vim"; - rev = "f0d63579eab7548cf12f979dc52ef5a370ecbe63"; - sha256 = "06nix49j4inxy3rkcv32f4ka89g4crqwfqnrm3b76iwwky8m2p17"; - }; - dependencies = []; - - }; - - webapi-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "webapi-vim-2018-03-14"; - src = fetchgit { - url = "https://github.com/mattn/webapi-vim"; - rev = "252250381a9509257bfb06b9f95441e41e3e23b5"; - sha256 = "0g37d1i6rxsj6f31g9jy2bhr8ng3jwmnvqqcmw19vbql4v56zq6a"; - }; - dependencies = []; - - }; - - undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "undotree-2018-07-02"; - src = fetchgit { - url = "https://github.com/mbbill/undotree"; - rev = "a80159c9f5c238575b63984b8bc610bc5de6b233"; - sha256 = "10l091qbigcj053l65bs3cdnysasl7f2qdbsk8bk6k0xj7rrpgzl"; - }; - dependencies = []; - - }; - - forms = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "forms-2012-11-28"; - src = fetchgit { - url = "https://github.com/megaannum/forms"; - rev = "b601e03fe0a3b8a43766231f4a6217e4492b4f75"; - sha256 = "19kp1i5c6jmnpbsap9giayqbzlv7vh02mp4mjvicqj9n0nfyay74"; - }; - dependencies = ["self"]; - - }; - - self = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "self-2014-05-28"; - src = fetchgit { - url = "https://github.com/megaannum/self"; - rev = "2ed666b547eddee6ae1fcc63babca4ba0b66a59f"; - sha256 = "1gcwn6i5i3msg7hrlzsnv1bs6pm4jz9cff8ppaz2xdj8xv9qy6fn"; - }; - dependencies = []; - - }; - - robotframework-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "robotframework-vim-2017-04-14"; - src = fetchgit { - url = "https://github.com/mfukar/robotframework-vim"; - rev = "75d5b371a4da2a090a2872d55bd0dead013f334e"; - sha256 = "091ac5rq6f1a7j2q3dy9rc00vckv21m4wd29ijj63jannr02v5ad"; - }; - dependencies = []; - - }; - - vim-grepper-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-grepper-git-2018-04-24"; - src = fetchgit { - url = "https://github.com/mhinz/vim-grepper.git"; - rev = "04d659c9e0a57e0c3e989069601d2a98df0386c4"; - sha256 = "16k5ahcn9i4wvlhw16j0gfgxw0clry72l78lk28qmx9p2gh1ka3g"; - }; - dependencies = []; - - }; - - vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signify-2018-07-25"; - src = fetchgit { - url = "https://github.com/mhinz/vim-signify"; - rev = "a9fc705b9bdffaac46f13e47d6565c904102dedc"; - sha256 = "0hk24anfhh1v62zn03cbqrf8c260q6g5cka8dpq8c5943v6kln59"; - }; - dependencies = []; - - }; - - vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-startify-2018-07-21"; - src = fetchgit { - url = "https://github.com/mhinz/vim-startify"; - rev = "8cde338d1f35057fd64146090c960a55b953dcd9"; - sha256 = "01aali5s946589cxy8k5qb0qzhxwlgwv4grri3x60h2520fc1z29"; - }; - dependencies = []; - - }; - - vim-indent-object = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-indent-object-2018-04-08"; - src = fetchgit { - url = "https://github.com/michaeljsmith/vim-indent-object"; - rev = "5c5b24c959478929b54a9e831a8e2e651a465965"; - sha256 = "1kmwnz0jxjkvfzy06r7r73pcxfcyjp8p8m2d6qrhjfvzidgfhw19"; - }; - dependencies = []; - - }; - - ack-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ack-vim-2018-02-28"; - src = fetchgit { - url = "https://github.com/mileszs/ack.vim"; - rev = "36e40f9ec91bdbf6f1adf408522a73a6925c3042"; - sha256 = "0yppr89hd1jyp0pj56hxdjbn32sr7pj3mihd18wxispvl5dqd6fm"; - }; - dependencies = []; - - }; - - vim-yapf = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-yapf-2018-06-05"; - src = fetchgit { - url = "https://github.com/mindriot101/vim-yapf"; - rev = "cae79733a1a39732c5305d4a89cd093d17cb917d"; - sha256 = "16bmzvzks6kbqm6dk908k23b9wj7qf3x8bz3kikrzj27s0p7s9cc"; - }; - dependencies = []; + command_T = command_T.overrideAttrs(old: { + buildInputs = [ ruby rake ]; buildPhase = '' - substituteInPlace ftplugin/python_yapf.vim \ - --replace '"yapf"' '"${python3Packages.yapf}/bin/yapf"' + rake make + rm ruby/command-t/ext/command-t/*.o ''; - }; + }); - lushtags = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "lushtags-2017-04-19"; - src = fetchgit { - url = "https://github.com/mkasa/lushtags"; - rev = "fd7fa5a0162d9aa159559880d5ba4731e180eeaf"; - sha256 = "1si5n07k4r8kji4whglav9q59ksv6bi5v58xbpc2l5bavlk8kn6n"; - }; - dependencies = []; - - }; - - gruvbox = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "gruvbox-2018-02-25"; - src = fetchgit { - url = "https://github.com/morhetz/gruvbox"; - rev = "cb4e7a5643f7d2dd40e694bcbd28c4b89b185e86"; - sha256 = "12qkq1x96bm1cmqfg6sb8jxpl2b6gwvhc5qn3gva6vl4nx3ianqi"; - }; - dependencies = []; - - }; - - hlint-refactor-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "hlint-refactor-vim-2015-12-05"; - src = fetchgit { - url = "https://github.com/mpickering/hlint-refactor-vim"; - rev = "fffb044ecef854a82c5c2efda252e09044ba03e0"; - sha256 = "0z8d31arfy9aidg1dwj5msnnx799d9r7njkgh51z695w6ayxn6p8"; - }; - dependencies = []; - - }; - - vim-indent-guides = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-indent-guides-2018-05-14"; - src = fetchgit { - url = "https://github.com/nathanaelkane/vim-indent-guides"; - rev = "54d889a63716ee2f1818aa2ec5082db47147147b"; - sha256 = "0ahlbjv2ibhhnf9zqn85b2sh3wf9l0kmg2qmavz3z5fmf8sqljj2"; - }; - dependencies = []; - - }; - - vim-stylish-haskell = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-stylish-haskell-2015-05-10"; - src = fetchgit { - url = "https://github.com/nbouscal/vim-stylish-haskell"; - rev = "c664376ba814de3f87cb7641f90b2c6a9dd53671"; - sha256 = "1xm5ark2mwphznv3xsyzgcldnr52i5jzk1pfqdh0080j07aama8j"; - }; - dependencies = []; - - }; - - vim-easygit = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easygit-2018-07-08"; - src = fetchgit { - url = "https://github.com/neoclide/vim-easygit"; - rev = "9770370a35838f70eda91d0c3006d0563ccc8d2a"; - sha256 = "1a42s0nymakz20rjrpwmiqpnlndrkdakzbm53aclzcs61i9zq2k8"; - }; - dependencies = []; - - }; - - haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "haskell-vim-2018-05-22"; - src = fetchgit { - url = "https://github.com/neovimhaskell/haskell-vim"; - rev = "b1ac46807835423c4a4dd063df6d5b613d89c731"; - sha256 = "1vqj3r2v8skffywwgv4093ww7fm540437j5qz7n8q8787bs5w0br"; - }; - dependencies = []; - - }; - - cpsm = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "cpsm-2018-02-01"; - src = fetchgit { - url = "https://github.com/nixprime/cpsm"; - rev = "8a4a0a05162762b857b656d51b59a5bf01850877"; - sha256 = "0v44gf9ygrqc6rpfpiq329jija4icy0iy240yk30c0r04mjahc0b"; - }; - dependencies = []; + cpsm = cpsm.overrideAttrs(old: { buildInputs = [ python3 stdenv @@ -2039,170 +133,119 @@ self = rec { export PY3=ON ./install.sh ''; - }; + }); - vim-iced-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-iced-coffee-script-2013-12-27"; - src = fetchgit { - url = "https://github.com/noc7c9/vim-iced-coffee-script"; - rev = "e42e0775fa4b1f8840c55cd36ac3d1cedbc1dea2"; - sha256 = "14yfirny359rlrr082il2ys3hxiyrbbk794rdxrs2lasjy8rb1f7"; - }; - dependencies = []; + ctrlp-cmatcher = ctrlp-cmatcher.overrideAttrs(old: { + buildInputs = [ python ]; + buildPhase = '' + patchShebangs . + ./install.sh + ''; + }); - }; + deoplete-go = deoplete-go.overrideAttrs(old: { + buildInputs = [ python3 ]; + buildPhase = '' + pushd ./rplugin/python3/deoplete/ujson + python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build + popd + find ./rplugin/ -name "ujson*.so" -exec mv -v {} ./rplugin/python3/ \; + ''; + }); - shabadou-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "shabadou-vim-2016-07-19"; - src = fetchgit { - url = "https://github.com/osyo-manga/shabadou.vim"; - rev = "7d4bfed1ea8985ae125df3d1403cc19e252443e1"; - sha256 = "1kvik1yf7yjg9jdmdw38yhkksxg0n3nry02banwik7wgjnpvg870"; - }; - dependencies = []; + ensime-vim = ensime-vim.overrideAttrs(old: { + passthru.python3Dependencies = ps: with ps; [ sexpdata websocket_client ]; + dependencies = ["vimproc" "vimshell" "self" "forms"]; + }); - }; + forms = forms.overrideAttrs(old: { + dependencies = ["self"]; + }); - vim-textobj-multiblock = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-textobj-multiblock-2014-06-02"; - src = fetchgit { - url = "https://github.com/osyo-manga/vim-textobj-multiblock"; - rev = "670a5ba57d73fcd793f480e262617c6eb0103355"; - sha256 = "1s71hdr73cl8yg9mrdflvzrdccpiv7qrlainai7gqw30r1hfhfzf"; - }; - dependencies = []; + gitv = gitv.overrideAttrs(old: { + dependencies = ["gitv"]; + }); - }; + taglist = taglist.overrideAttrs(old: { + setSourceRoot = '' + export sourceRoot=taglist + mkdir taglist + mv doc taglist + mv plugin taglist + ''; + }); - vim-watchdogs = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-watchdogs-2017-12-03"; - src = fetchgit { - url = "https://github.com/osyo-manga/vim-watchdogs"; - rev = "a6415c2d928af8c1aacdbce9b1ed8d315891eb03"; - sha256 = "0n6aqsgn0q1qgpj4yznqwbsbbk2a077gnjlq86ii3jhkzh5fzcff"; - }; - dependencies = []; + vimshell-vim = vimshell-vim.overrideAttrs(old: { + dependencies = [ "vimproc-vim" ]; + }); - }; + vim-addon-manager = vim-addon-manager.overrideAttrs(old: { + buildInputs = stdenv.lib.optional stdenv.isDarwin Cocoa; + }); - vim-javascript = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-javascript-2018-07-14"; - src = fetchgit { - url = "https://github.com/pangloss/vim-javascript"; - rev = "39e332a3c36c0115e1eab85c34cf121b7585869d"; - sha256 = "04ycwh298i213zw0zvj99igfmxf36swycryapsgp9jrh9jjd9hmw"; - }; - dependencies = []; + vim-addon-actions = vim-addon-actions.overrideAttrs(old: { + dependencies = [ "vim-addon-mw-utils" "tlib" ]; + }); - }; + vim-addon-async = vim-addon-async.overrideAttrs(old: { + dependencies = [ "vim-addon-signs" ]; + }); - vim-qml = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-qml-2018-07-22"; - src = fetchgit { - url = "https://github.com/peterhoeg/vim-qml"; - rev = "8af43da6950ce5483704bb97f5b24471d8ffda1a"; - sha256 = "1y1xvbfr1ffxyyk3zzf50xn87a85i1zszj4fqlq5ka8zhgdrnhvc"; - }; - dependencies = []; + vim-addon-background-cmd = vim-addon-background-cmd.overrideAttrs(old: { + dependencies = [ "vim-addon-mw-utils" ]; + }); - }; + vim-addon-completion = vim-addon-completion.overrideAttrs(old: { + dependencies = [ "tlib" ]; + }); - vim-markdown = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-markdown-2018-06-05"; - src = fetchgit { - url = "https://github.com/plasticboy/vim-markdown"; - rev = "6d2cb3c06cd546fd4bee4136679db3a3d5de97fa"; - sha256 = "17izjzgpwpl6i1vvz2hcd7ympgxyjmsb0k62rhvl15jmx06c3ysz"; - }; - dependencies = []; + vim-addon-goto-thing-at-cursor = vim-addon-goto-thing-at-cursor.overrideAttrs(old: { + dependencies = [ "tlib" ]; + }); - }; + vim-addon-mru = vim-addon-mru.overrideAttrs(old: { + dependencies = ["vim-addon-other" "vim-addon-mw-utils"]; + }); - python-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "python-mode-2018-07-23"; - src = fetchgit { - url = "https://github.com/python-mode/python-mode"; - rev = "d241974f40e8d206f9970e51fb0069951862ba35"; - sha256 = "1cjhlbk71785zy0g0lf2bmsdsnvqwx03v8lxq7i7j2qazalszxci"; - }; - dependencies = []; + vim-addon-nix = vim-addon-nix.overrideAttrs(old: { + dependencies = [ + "vim-addon-completion" + "vim-addon-goto-thing-at-cursor" + "vim-addon-errorformats" + "vim-addon-actions" + "vim-addon-mw-utils" "tlib" + ]; + }); - }; + vim-addon-sql = vim-addon-sql.overrideAttrs(old: { + dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"]; + }); - vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-racer-2018-05-13"; - src = fetchgit { - url = "https://github.com/racer-rust/vim-racer"; - rev = "cd663ddacc89fb3cbbb9649f7cd36528960b1fe9"; - sha256 = "1k75ypgiy13l28mndi6p95lc818k04imlm7xk0y9sck8bsny1vhi"; - }; - dependencies = []; + vim-addon-syntax-checker = vim-addon-syntax-checker.overrideAttrs(old: { + dependencies = ["vim-addon-mw-utils" "tlib"]; + }); - }; + vim-addon-toggle-buffer = vim-addon-toggle-buffer.overrideAttrs(old: { + dependencies = [ "vim-addon-mw-utils" "tlib" ]; + }); - awesome-vim-colorschemes = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "awesome-vim-colorschemes-2018-01-20"; - src = fetchgit { - url = "https://github.com/rafi/awesome-vim-colorschemes"; - rev = "8d2b6657bdbe4f7253e320c741bc4c1fc2f2f41d"; - sha256 = "1wfm6rsmyqldxwcz0ic4rq7kf00fgsx00rg42cl9yya35nqiri2z"; - }; - dependencies = []; + vim-addon-xdebug = vim-addon-xdebug.overrideAttrs(old: { + dependencies = [ "WebAPI" "vim-addon-mw-utils" "vim-addon-signs" "vim-addon-async" ]; + }); - }; + vim-bazel = vim-bazel.overrideAttrs(old: { + dependencies = ["maktaba"]; + }); - purescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "purescript-vim-2018-07-05"; - src = fetchgit { - url = "https://github.com/raichoo/purescript-vim"; - rev = "ab8547cef5827f046d43ba57203acb6692b7ef06"; - sha256 = "1pp7h77qqhgshf2x3hh73gnb4ya8jamqm75spbnn95piznd03k33"; - }; - dependencies = []; + vim-codefmt = vim-codefmt.overrideAttrs(old: { + dependencies = ["maktaba"]; + }); - }; + vim-easytags = vim-easytags.overrideAttrs(old: { + dependencies = ["vim-misc"]; + }); - vim-pencil = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pencil-2017-06-14"; - src = fetchgit { - url = "https://github.com/reedes/vim-pencil"; - rev = "2dcd974b7255e4af83cf79a208f04a3489065e22"; - sha256 = "0swc6sszj1f4h5hgi7z7j1xw54d69mg7f18rk2kf5y453qwg4jc0"; - }; - dependencies = []; - - }; - - vim-wordy = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-wordy-2018-03-10"; - src = fetchgit { - url = "https://github.com/reedes/vim-wordy"; - rev = "14b9dbf76a82e29273a74768573900361200467f"; - sha256 = "0qx3ngw4k7bgzmxpv1x4lkq3njm3zcb1j5ph6fx26wgagxhiaqhk"; - }; - dependencies = []; - - }; - - committia-vim-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "committia-vim-git-2018-07-14"; - src = fetchgit { - url = "https://github.com/rhysd/committia.vim.git"; - rev = "6aa77b9161e75828d0be2ba40ed420cbf7a55279"; - sha256 = "0sr7wzccj805fnc48qgcshp8rypz3vb8507pkc1r3pn7wbxqkni1"; - }; - dependencies = []; - - }; - - vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-grammarous-2018-06-22"; - src = fetchgit { - url = "https://github.com/rhysd/vim-grammarous"; - rev = "0d8a0272389a32bd49e74bb00527c02f9aca19a8"; - sha256 = "0ji18hjhp1gx147z682b4xy1w02kqcr8rb5frccyqn4kdpqhqvbk"; - }; - dependencies = []; + vim-grammarous = vim-grammarous.overrideAttrs(old: { # use `:GrammarousCheck` to initialize checking # In neovim, you also want to use set # let g:grammarous#show_first_error = 1 @@ -2213,302 +256,48 @@ self = rec { inherit languagetool; }) ]; - }; + }); - vim-operator-surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-operator-surround-2017-12-23"; - src = fetchgit { - url = "https://github.com/rhysd/vim-operator-surround"; - rev = "001c0da077b5b38a723151b19760d220e02363db"; - sha256 = "0c6w6id57faw6sjf5wvw9qp2a4i7xj65q0c4hjs0spgzycv2wpkh"; - }; - dependencies = []; + vim-hier = vim-hier.overrideAttrs(old: { + buildInputs = [ vim ]; + }); - }; + vim-isort = vim-isort.overrideAttrs(old: { + postPatch = '' + substituteInPlace ftplugin/python_vimisort.vim \ + --replace 'import vim' 'import vim; import sys; sys.path.append("${pythonPackages.isort}/${python.sitePackages}")' + ''; + }); - vim-puppet = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-puppet-2018-04-12"; - src = fetchgit { - url = "https://github.com/rodjek/vim-puppet"; - rev = "dc1f681045c4d8bd126063ce000f7cc7b2f95097"; - sha256 = "18z2d2wpn5c3g857wprmdwp5pdb719dciyy0682hqpw8lfjn6zhv"; - }; - dependencies = []; + vim-snipmate = vim-snipmate.overrideAttrs(old: { + dependencies = ["vim-addon-mw-utils" "tlib"]; + }); - }; - nvim-cm-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "nvim-cm-racer-2017-07-27"; - src = fetchgit { - url = "https://github.com/roxma/nvim-cm-racer"; - rev = "2a8a4a49fa58c5dac9e0bed9511f6928930cacd2"; - sha256 = "1yljxwypgn91084yyicbc2qprn31ld7s4drvnddzczyhzq5m2gpx"; - }; - dependencies = []; + vim-wakatime = vim-wakatime.overrideAttrs(old: { + buildInputs = [ python ]; + }); - }; + vim-xdebug = vim-xdebug.overrideAttrs(old: { + postInstall = false; + }); - nvim-completion-manager = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "nvim-completion-manager-2018-04-18"; - src = fetchgit { - url = "https://github.com/roxma/nvim-completion-manager"; - rev = "3ef5ade36e7321aace4e9e22da216202bdcd65f1"; - sha256 = "0vfcnvdcxhs3in4pwcqjb5h3ns7ik53n4xb1h9r94w1gfw00lh1l"; - }; - dependencies = []; + vim-xkbswitch = vim-xkbswitch.overrideAttrs(old: { + patchPhase = '' + substituteInPlace plugin/xkbswitch.vim \ + --replace /usr/local/lib/libxkbswitch.so ${xkb_switch}/lib/libxkbswitch.so + ''; + buildInputs = [ xkb_switch ]; + }); - }; + vim-yapf = vim-yapf.overrideAttrs(old: { + buildPhase = '' + substituteInPlace ftplugin/python_yapf.vim \ + --replace '"yapf"' '"${python3Packages.yapf}/bin/yapf"' + ''; + }); - rust-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "rust-vim-2018-07-17"; - src = fetchgit { - url = "https://github.com/rust-lang/rust.vim"; - rev = "2fa74427456a68e9e90f542567f851df50d48a8c"; - sha256 = "0vqvw5czwy3v99dv5gbgy8ljg31qhsnhqjfl0a4dfij6p66xyi46"; - }; - dependencies = []; - - }; - - vim-devicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-devicons-2018-06-21"; - src = fetchgit { - url = "https://github.com/ryanoasis/vim-devicons"; - rev = "ea5bbf0e2a960965accfa50a516773406a5b6b26"; - sha256 = "1v365j4an1k82gk06ikgqy2dw0ir80kj0svs1fymgklc117xgqsg"; - }; - dependencies = []; - - }; - - neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neoformat-2018-07-16"; - src = fetchgit { - url = "https://github.com/sbdchd/neoformat"; - rev = "f20e73193f2260d4437d160759d6b623a74a5a35"; - sha256 = "0460v5h82zsgslqxkiwf2qbkah15hf3p33ddvcipfqg0rnrbwynp"; - }; - dependencies = []; - - }; - - nerdcommenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "nerdcommenter-2018-06-21"; - src = fetchgit { - url = "https://github.com/scrooloose/nerdcommenter"; - rev = "9a32fd2534427f7a1dcfe22e9c0ea6b67b6dbe78"; - sha256 = "0s862kzhvv9qpr7gxd3h52hczjvm55zyff5qn0z5095072pr3wjx"; - }; - dependencies = []; - - }; - - nerdtree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "nerdtree-2018-06-15"; - src = fetchgit { - url = "https://github.com/scrooloose/nerdtree"; - rev = "d6032c876c6d6932ab7f07e262a16c9a85a31d5b"; - sha256 = "0s7z60rcdkziqqjc45adfqykpznv7aagfyfi5ybsxi5w4b8f2b9s"; - }; - dependencies = []; - - }; - - syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "syntastic-2018-07-16"; - src = fetchgit { - url = "https://github.com/scrooloose/syntastic"; - rev = "0dde090ed41b383b1fa56f8db49d89e0735b1ca9"; - sha256 = "027g3wmfdrhb65krlfs89xk3imbm2mgzb2ddv7xwrhch736nvb2q"; - }; - dependencies = []; - - }; - - deoplete-rust = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-rust-2017-07-18"; - src = fetchgit { - url = "https://github.com/sebastianmarkow/deoplete-rust"; - rev = "0a86e502113910c33448b337c4d50cabea120d25"; - sha256 = "0wsck83jns40ny3740vwjhc8g5bh6zl71hkirbjxy6n4xgixa54h"; - }; - dependencies = []; - - }; - - vim-polyglot = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-polyglot-2018-07-08"; - src = fetchgit { - url = "https://github.com/sheerun/vim-polyglot"; - rev = "055f7710b65dfa2df52fc0b5be2486ae36ac5751"; - sha256 = "1q1aw0sapr2zgrxbh97g6hj22f2xym3apzfxw5xxmqzmjc0kiq4p"; - }; - dependencies = []; - - }; - - context_filetype-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "context_filetype-vim-2018-04-01"; - src = fetchgit { - url = "https://github.com/shougo/context_filetype.vim"; - rev = "9ed76080795ef76f52b8c9ae4432df7cd81abc5a"; - sha256 = "137ki4104j4ch54k9n1l1xd75vbxqssi1fdckzv8kd07m5i159i2"; - }; - dependencies = []; - - }; - - denite-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "denite-nvim-2018-07-22"; - src = fetchgit { - url = "https://github.com/shougo/denite.nvim"; - rev = "93d8eb0bf21eb6db3f6a0bf6a84a98bd578176c8"; - sha256 = "0bhvg9rynqr2nkj7h2h8ws6mm1s7wmgif8avwbirq4pxby5j5f8r"; - }; - dependencies = []; - - }; - - deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-nvim-2018-07-22"; - src = fetchgit { - url = "https://github.com/shougo/deoplete.nvim"; - rev = "59fbd61d492b0a1728f34b8958d8e4dbce165c73"; - sha256 = "06x46dhyy9bix0svl2c0jxxk7rs8ahzl18yq6hmfb1j45jlv5qiz"; - }; - dependencies = []; - - }; - - echodoc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "echodoc-vim-2018-03-26"; - src = fetchgit { - url = "https://github.com/shougo/echodoc.vim"; - rev = "f1f711bc814165cf5b09b56fd5d733917ed1c015"; - sha256 = "0l0sm862fbr8p8m4wykx1riidxgp233cq6r2zdm2l7gvmqyj3zcr"; - }; - dependencies = []; - - }; - - neco-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neco-syntax-2017-10-01"; - src = fetchgit { - url = "https://github.com/shougo/neco-syntax"; - rev = "98cba4a98a4f44dcff80216d0b4aa6f41c2ce3e3"; - sha256 = "1cjcbgx3h00g91ifgw30q5n97x4nprsr4kwirydws79fcs4vkgip"; - }; - dependencies = []; - - }; - - neco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neco-vim-2017-10-01"; - src = fetchgit { - url = "https://github.com/shougo/neco-vim"; - rev = "f5397c5e800d65a58c56d8f1b1b92686b05f4ca9"; - sha256 = "0yb7ja6qgrazszk4i01cwjj00j9vd43zs2r11b08iy8n10jnzr73"; - }; - dependencies = []; - - }; - - neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neocomplete-vim-2018-03-28"; - src = fetchgit { - url = "https://github.com/shougo/neocomplete.vim"; - rev = "4be617947f3fcf2d725fab20b0e12f8b46c9e2f3"; - sha256 = "00ns46gy726w74nmnzhqnyh10jnpr04453v3rclswxgcvgma82b8"; - }; - dependencies = []; - - }; - - neoinclude-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neoinclude-vim-2018-05-22"; - src = fetchgit { - url = "https://github.com/shougo/neoinclude.vim"; - rev = "2fa77b9211d3f10c29559b715b6863da67ae7d3a"; - sha256 = "0pdahb2z9q4dk67xkwvaqrlpai86slhncfb4gn88x40dlnd7rkbg"; - }; - dependencies = []; - - }; - - neomru-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neomru-vim-2017-10-01"; - src = fetchgit { - url = "https://github.com/shougo/neomru.vim"; - rev = "97540f54fa20b94daf306f0c1f3cce983bbf7a1d"; - sha256 = "15d5hmh5v3hnjnfb5736n45rh5nyq41vqjp1cz4ls2rxmmfi3xa7"; - }; - dependencies = []; - - }; - - neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-snippets-2018-06-17"; - src = fetchgit { - url = "https://github.com/shougo/neosnippet-snippets"; - rev = "e5946e9ec4c68965dbabfaaf2584b1c057738afd"; - sha256 = "114w2vm28075bz85867lz0rzam1m0wk7dkbkm1lm0jbknbpk606n"; - }; - dependencies = []; - - }; - - neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-vim-2018-07-19"; - src = fetchgit { - url = "https://github.com/shougo/neosnippet.vim"; - rev = "2959ae99f6e8f422e7d9062fd0a3cd692d2221fb"; - sha256 = "0zdyfc9lrp8g76b6qigci6dlxz0zqpqf5y9887x2zdy631dksfi4"; - }; - dependencies = []; - - }; - - neoyank-vim-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neoyank-vim-git-2018-03-26"; - src = fetchgit { - url = "https://github.com/shougo/neoyank.vim.git"; - rev = "ea3cd47ccb40cb2e26cb607d28475aa0fdb26fef"; - sha256 = "1zbf8062rpk56nd1zxqhwa8bdpxl9zp887l9nm4s9hc4ndsk4928"; - }; - dependencies = []; - - }; - - tabpagebuffer-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tabpagebuffer-vim-2014-09-30"; - src = fetchgit { - url = "https://github.com/shougo/tabpagebuffer.vim"; - rev = "4d95c3e6fa5ad887498f4cbe486c11e39d4a1fbc"; - sha256 = "1z6zlpzkhwy1p2pmx9qrwb91dp9v4yi8jrdvm1if2k79ij4sl08f"; - }; - dependencies = []; - - }; - - unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "unite-vim-2018-06-17"; - src = fetchgit { - url = "https://github.com/shougo/unite.vim"; - rev = "c175ba7df239a5971e4c189ecbc9486b160fbde2"; - sha256 = "16j5vhmqs04y5rps5g86bgpf91w067gyw9rz47hf0y0a52niy436"; - }; - dependencies = []; - - }; - - vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimproc-vim-2018-01-07"; - src = fetchgit { - url = "https://github.com/shougo/vimproc.vim"; - rev = "2300224d366642f4f8d6f88861535d4ccbe20143"; - sha256 = "0b8ljqnix8bs667bpymg3s0g5f49fnphgddl6196dj6jvdfn1xia"; - }; - dependencies = []; + vimproc-vim = vimproc-vim.overrideAttrs(old: { buildInputs = [ which ]; buildPhase = '' @@ -2518,907 +307,34 @@ self = rec { --replace vimproc_linux32.so vimproc_unix.so make -f make_unix.mak ''; - }; + }); - fugitive-gitlab-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fugitive-gitlab-vim-2018-07-04"; - src = fetchgit { - url = "https://github.com/shumphrey/fugitive-gitlab.vim"; - rev = "b8e7b6986c5d13f3e2de2163816af06f74a6f838"; - sha256 = "1lvll9hjqsm79f0ls84d8b8s12043b9p5qa4i6iwf3v1qbq7kb8d"; - }; - dependencies = []; + yankring = yankring.overrideAttrs(old: { + sourceRoot = "."; + }); - }; - - gundo-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "gundo-vim-2017-05-09"; - src = fetchgit { - url = "https://github.com/sjl/gundo.vim"; - rev = "46c443ee9d5854320eb965a1fdee781ba83a070e"; - sha256 = "0adk7agzmbfv342zw6lc8jad6yjs1wap4c0ca98s0qm2bs0r1hl2"; - }; - dependencies = []; - - }; - - splice-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "splice-vim-2017-09-03"; - src = fetchgit { - url = "https://github.com/sjl/splice.vim"; - rev = "b31cb25eea8a92a037e9da9a98b2e6147294c37d"; - sha256 = "0mqnrmkyms2z5lqy90cy076x3fr9xmd63962wd8n6n6mbin97ihx"; - }; - dependencies = []; - - }; - - last256 = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "last256-2017-06-11"; - src = fetchgit { - url = "https://github.com/sk1418/last256"; - rev = "d29320c1fe715b47edaa1be068201ea5a54ab0c0"; - sha256 = "16njh0p1j166dnf92110vlrj7gmrbsfkbkd8k6s9gfqjzbgd25jv"; - }; - dependencies = []; - - }; - - alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "alchemist-vim-2018-06-25"; - src = fetchgit { - url = "https://github.com/slashmili/alchemist.vim"; - rev = "5575fc8e18695b050b1c4d51623ae37f12ff7648"; - sha256 = "0s1x0avshxfrqj9vd8bahkw10sn9hmajwch285zib9aynqp5x2ma"; - }; - dependencies = []; - - }; - - vim-smalls = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-smalls-2015-05-02"; - src = fetchgit { - url = "https://github.com/t9md/vim-smalls"; - rev = "9619eae81626bd63f88165e0520c467698264e34"; - sha256 = "0s5z3zv220cg95yky2av6w0jmpc56ysyhsx0596ksvgz5jwhpbad"; - }; - dependencies = []; - - }; - - vim-hardtime = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-hardtime-2017-03-31"; - src = fetchgit { - url = "https://github.com/takac/vim-hardtime"; - rev = "d9128568afa62947b7ac8f12c22d88e3de526a6b"; - sha256 = "097wzfh4n4fnsq2gx4hbmyr731ciky8qcai5aiyh2baybvwshmr5"; - }; - dependencies = []; - - }; - - vim-expand-region = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-expand-region-2013-08-19"; - src = fetchgit { - url = "https://github.com/terryma/vim-expand-region"; - rev = "966513543de0ddc2d673b5528a056269e7917276"; - sha256 = "0l30wjlk4vxr16f1njnvf8aw9yg9p9jisvcxbcg3znsq5q8ix6zv"; - }; - dependencies = []; - - }; - - vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-multiple-cursors-2018-07-16"; - src = fetchgit { - url = "https://github.com/terryma/vim-multiple-cursors"; - rev = "b9e17a51bb2d857f6a5099363232c4fc7715115d"; - sha256 = "0dd9m0a33r4diwykk5nxya199zimn0n4gmp2mi8fnwk6m1f8fwnw"; - }; - dependencies = []; - - }; - - vimpreviewpandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimpreviewpandoc-2018-05-12"; - src = fetchgit { - url = "https://github.com/tex/vimpreviewpandoc"; - rev = "266d14d362f6c069863b2d63edb683e802e7e3ee"; - sha256 = "1qhc5vyk7vxrgq11dh1iwkz2a3zd7wfjvyirhhlpx1zx12d6l0ly"; - }; - dependencies = []; - - }; - - vim-ft-diff_fold = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-ft-diff_fold-2013-02-10"; - src = fetchgit { - url = "https://github.com/thinca/vim-ft-diff_fold"; - rev = "89771dffd3682ef82a4b3b3e9c971b9909f08e87"; - sha256 = "0bk95cxkfzamlgv1x2jb1bnfas2pmvvqgpn5fvxddf0andm8sfma"; - }; - dependencies = []; - - }; - - vim-prettyprint = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-prettyprint-2016-07-16"; - src = fetchgit { - url = "https://github.com/thinca/vim-prettyprint"; - rev = "d6060d2b1ff1cff71714e126addd3b10883ade12"; - sha256 = "0mb1ylsq4023ik9wd9iwzlynra2c320xp9h2i79bspapglgd5gk9"; - }; - dependencies = []; - - }; - - vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-quickrun-2018-06-19"; - src = fetchgit { - url = "https://github.com/thinca/vim-quickrun"; - rev = "825f9f195521646f7001f10cad8627c48017311f"; - sha256 = "0ckcwij5y71dxrga34jxgvf41hs44p4mrd31hbmkz1qrq1i7glpa"; - }; - dependencies = []; - - }; - - vim-scouter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-scouter-2014-08-10"; - src = fetchgit { - url = "https://github.com/thinca/vim-scouter"; - rev = "5221901d4ad6b2ef8b370b336db2aa7f69f2b6dc"; - sha256 = "0fx64hj1kzrsxz96195d5lm3x88zyycbcr78819mcbgfzyxis6b8"; - }; - dependencies = []; - - }; - - vim-themis = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-themis-2017-12-28"; - src = fetchgit { - url = "https://github.com/thinca/vim-themis"; - rev = "691cd3912ba318dbd8d9fa0035fee629b424766d"; - sha256 = "1mrdaah3iyg35v6cgvr3jav3386czialfcinwa3y9jy14basbqhd"; - }; - dependencies = []; - - }; - - molokai = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "molokai-2015-11-11"; - src = fetchgit { - url = "https://github.com/tomasr/molokai"; - rev = "c67bdfcdb31415aa0ade7f8c003261700a885476"; - sha256 = "1piszjr5kyw43ac1f0jh9z88g824xknshrkchbys9qxlz7pd831s"; - }; - dependencies = []; - - }; - - vim-solidity = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-solidity-2018-04-17"; - src = fetchgit { - url = "https://github.com/tomlion/vim-solidity"; - rev = "569bbbedc3898236d5912fed0caf114936112ae4"; - sha256 = "1qpfbbrm4gjgvbkimhpxyl4fsdqkyw4raf17nw0ibqillz2d3pxx"; - }; - dependencies = []; - - }; - - tlib_vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tlib_vim-2018-04-08"; - src = fetchgit { - url = "https://github.com/tomtom/tlib_vim"; - rev = "ced8f3ebe85b50da2ec0e6d593e6b2e8e6bd243b"; - sha256 = "08vvd1wpa9k5bid2hh279jjkir2c59ga3527qzinxngmlx8wsbhx"; - }; - dependencies = []; - - }; - - vim-abolish = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-abolish-2017-03-10"; - src = fetchgit { - url = "https://github.com/tpope/vim-abolish"; - rev = "b6a8b49e2173ba5a1b34d00e68e0ed8addac3ebd"; - sha256 = "0i9q3l7r5p8mk4in3c1j4x0jbln7ir9lg1cqjxci0chjjzfzc53m"; - }; - dependencies = []; - - }; - - vim-commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-commentary-2018-07-11"; - src = fetchgit { - url = "https://github.com/tpope/vim-commentary"; - rev = "8295187ea1210138c0b171d8e3ec3569936f4c1a"; - sha256 = "1zgbpgl0n11b4jlgx7h7rr1jbgdib7yf8vmh62cxrdj5hrngb6h6"; - }; - dependencies = []; - - }; - - vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-dispatch-2018-07-25"; - src = fetchgit { - url = "https://github.com/tpope/vim-dispatch"; - rev = "dbb9320d000caa56dfada5f99fe0b5209ef0590b"; - sha256 = "1yqc8fwyf66jckvjf8z8h62399kzgfdzcbnnd9ax8q3wjyk3lfsh"; - }; - dependencies = []; - - }; - - vim-eunuch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-eunuch-2018-07-13"; - src = fetchgit { - url = "https://github.com/tpope/vim-eunuch"; - rev = "e5f4f955d53e07192fb330ff272604c1b8290532"; - sha256 = "0cv3j3bkapb45ywlfiz8csxmz7gnsdngwgmkrgfg6sljnsgav2za"; - }; - dependencies = []; - - }; - - vim-fireplace = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-fireplace-2018-06-01"; - src = fetchgit { - url = "https://github.com/tpope/vim-fireplace"; - rev = "1ef0f0726cadd96547a5f79103b66339f170da02"; - sha256 = "0ihhd34bl98xssa602386ji013pjj6xnkgww3y2wg73sx2nk6qc4"; - }; - dependencies = []; - - }; - - vim-flagship = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-flagship-2018-07-24"; - src = fetchgit { - url = "https://github.com/tpope/vim-flagship"; - rev = "5e70829913900eb3a37dd6c055ac660c33fa6bff"; - sha256 = "1v2kaisydi1vjfy66bwq2whllbickr3ppp9wqxjqv2qhfsnqny8f"; - }; - dependencies = []; - - }; - - vim-fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-fugitive-2018-07-25"; - src = fetchgit { - url = "https://github.com/tpope/vim-fugitive"; - rev = "6bab1a0c398a9a6aaef607a5361709393eba79ac"; - sha256 = "1rsiha7a0k7ib455dvxrl46zl7x386i70rhwnbmy8lk6wa32mz7v"; - }; - dependencies = []; - - }; - - vim-pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pathogen-2018-04-05"; - src = fetchgit { - url = "https://github.com/tpope/vim-pathogen"; - rev = "06da921608b971fb47603671bcafdb2843992eb3"; - sha256 = "1mxkp2yqqmfl0lq6kmkl716y9x8cdm7aibb376azydxlsbqv4qmi"; - }; - dependencies = []; - - }; - - vim-projectionist = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-projectionist-2018-07-24"; - src = fetchgit { - url = "https://github.com/tpope/vim-projectionist"; - rev = "873e492b4bb92834beb186028fbf6d4e5edfca5a"; - sha256 = "0np7vm97y5ga8gz6qma15awcmgxi41hljp50bgy49sz62z8h0psz"; - }; - dependencies = []; - - }; - - vim-repeat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-repeat-2018-07-02"; - src = fetchgit { - url = "https://github.com/tpope/vim-repeat"; - rev = "43d2678fa59d068c815d8298331c195e850ff5a7"; - sha256 = "0nb20503ka95qbx0mwhhni15drc86gfcd6kg92nf65llrvyfivk0"; - }; - dependencies = []; - - }; - - vim-rhubarb = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-rhubarb-2018-07-21"; - src = fetchgit { - url = "https://github.com/tpope/vim-rhubarb"; - rev = "848841083d5d4550b5ebbd3bd67dfb3e5146b64a"; - sha256 = "19b36lbsry994y78lnnnjl83q2laz7j6xvk6h6xbl8kj10v6m4l9"; - }; - dependencies = []; - - }; - - vim-scriptease = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-scriptease-2018-07-18"; - src = fetchgit { - url = "https://github.com/tpope/vim-scriptease"; - rev = "baea08bb5fff63cd2adf6e46429cad1f75bc7300"; - sha256 = "01xfnda5paywfsb6ziq00zcgia7ls0v2924i1mcnvnqg4md890x4"; - }; - dependencies = []; - - }; - - vim-sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-sensible-2018-07-16"; - src = fetchgit { - url = "https://github.com/tpope/vim-sensible"; - rev = "c82c6d4978be28adcf85dc1e61fa428e801bd525"; - sha256 = "0w87wic0qx20h36k075lvmj53glxkcyv8hkrx5aw4xqxvbq5fk6q"; - }; - dependencies = []; - - }; - - vim-sleuth = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-sleuth-2018-05-24"; - src = fetchgit { - url = "https://github.com/tpope/vim-sleuth"; - rev = "478e495d40434fb42c655ea2881c8c6b114ecd49"; - sha256 = "1dicdxxfd5sywk02hbpknbr100n96qggy3zy5v520dxdknq0sccz"; - }; - dependencies = []; - - }; - - vim-speeddating = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-speeddating-2017-05-24"; - src = fetchgit { - url = "https://github.com/tpope/vim-speeddating"; - rev = "a418667791f03694065948342f2d6c5cca8d0f32"; - sha256 = "1wm33izawazh0dy70zjk6rkg30yrlldba5r1gypnr4barps702gw"; - }; - dependencies = []; - - }; - - vim-surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-surround-2018-07-23"; - src = fetchgit { - url = "https://github.com/tpope/vim-surround"; - rev = "597068870b8f093a8b2d11536c62ff31222ee8d0"; - sha256 = "080kcgb5ayxs49q1p1cms6k1byf2fzzy8bglnspr511m9fql5a9x"; - }; - dependencies = []; - - }; - - vim-tbone = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-tbone-2018-06-27"; - src = fetchgit { - url = "https://github.com/tpope/vim-tbone"; - rev = "8bc7348f658c32bea57365aa6acf3a7dde12e737"; - sha256 = "17s2b66xxkvv17pzf3xrw6ba7y9awpd2k2d21v0pag924c5hi6d4"; - }; - dependencies = []; - - }; - - vim-vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-vinegar-2018-06-20"; - src = fetchgit { - url = "https://github.com/tpope/vim-vinegar"; - rev = "7b9dff85aec34a0be1a6980b2e686a5d27d70f63"; - sha256 = "033w3wsg5ijwmkq5l1d5r7l0mqfy784sbh8mbjcsx13ndl8fc2g8"; - }; - dependencies = []; - - }; - - hasksyn = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "hasksyn-2014-09-03"; - src = fetchgit { - url = "https://github.com/travitch/hasksyn"; - rev = "c434040bf13a17ca20a551223021b3ace7e453b9"; - sha256 = "09998lnfcshqis5m062wlag6y476imq9jday9gp4ayjjl1cp3cwx"; - }; - dependencies = []; - - }; - - vim-haskellconceal = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-haskellconceal-2017-06-15"; - src = fetchgit { - url = "https://github.com/twinside/vim-haskellconceal"; - rev = "802f82a5afee56e9e1251e6f756104a3bd114234"; - sha256 = "1kh6853hi4rgl4z1xs8kz9l1q9w7lh0r42y2m0rabfpr6yh3091r"; - }; - dependencies = []; - - }; - - caw-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "caw-vim-2018-06-16"; - src = fetchgit { - url = "https://github.com/tyru/caw.vim"; - rev = "e82ae00f3fc03289d4054b44f100025a1bc81939"; - sha256 = "16sbrc34nxbrgpj8gyi1drwh52qg3z2nq4frd5f2nfgxsgjrjjjc"; - }; - dependencies = []; - - }; - - open-browser-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "open-browser-vim-2018-04-26"; - src = fetchgit { - url = "https://github.com/tyru/open-browser.vim"; - rev = "de4eeb085051e9b56dd5574eba7c7e72feb21246"; - sha256 = "1fgp4wwizpknfwscxraqqaxrhvwp9l1mnjwj3llk2x0n9qcqf1db"; - }; - dependencies = []; - - }; - - neco-look = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neco-look-2018-01-21"; - src = fetchgit { - url = "https://github.com/ujihisa/neco-look"; - rev = "4ead88e70f359fb9cef6537ed9c336b7673c1b4c"; - sha256 = "1lszbif7ymdjch1ypnr1nihs6gfbhb86sj6nz3dwrbgsl454nnrj"; - }; - dependencies = []; - - }; - - youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2018-07-25"; - src = fetchgit { - url = "https://github.com/valloric/youcompleteme"; - rev = "15362d9cb8ec054c929e9a202252825eabe47e58"; - sha256 = "0nk3wqlz15pvm6hbla8shd3sskbdmwd1x9cq85la223h6s138hwy"; - }; - dependencies = []; + youcompleteme = youcompleteme.overrideAttrs(old: { buildPhase = '' substituteInPlace plugin/youcompleteme.vim \ --replace "'ycm_path_to_python_interpreter', '''" \ - "'ycm_path_to_python_interpreter', '${python}/bin/python'" + "'ycm_path_to_python_interpreter', '${python}/bin/python'" rm -r third_party/ycmd ln -s ${ycmd}/lib/ycmd third_party ''; meta = { - description = "Fastest non utf-8 aware word and C completion engine for Vim"; + description = "A code-completion engine for Vim"; homepage = https://github.com/Valloric/YouCompleteMe; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [marcweber jagajaga]; platforms = stdenv.lib.platforms.unix; }; - }; - - vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-2018-07-24"; - src = fetchgit { - url = "https://github.com/vim-airline/vim-airline"; - rev = "59f3669a42728406da6d1b948608cae120d1453f"; - sha256 = "12rgvaqfqh0mfv85qdqpr5zn3q3v6npbk11al62fzpa9s55q0025"; - }; - dependencies = []; - - }; - - vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-themes-2018-06-14"; - src = fetchgit { - url = "https://github.com/vim-airline/vim-airline-themes"; - rev = "b35f952a6ae6768ae2c6a9f4febc7945cc311f74"; - sha256 = "1j9y9irrzsq1bwp3b22ls016byi0yc9ymigzhw0n180rk6nb36c7"; - }; - dependencies = []; - - }; - - vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-2018-07-23"; - src = fetchgit { - url = "https://github.com/vim-pandoc/vim-pandoc"; - rev = "0060e5c6ac9e4a2391e8a36359dcbbb5827978cb"; - sha256 = "0y0ppy1imy4kjkyflxwh5hfp6vcs93xia6myyd5sc6l3gbcg1lrk"; - }; - dependencies = []; - - }; - - vim-pandoc-after = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-after-2017-11-22"; - src = fetchgit { - url = "https://github.com/vim-pandoc/vim-pandoc-after"; - rev = "844f27debf4d72811049167f97191a3b551ddfd5"; - sha256 = "0i99g9lnk1xzarw3vzbc47i4bg4iybaywkjvd2krln4q426a6saf"; - }; - dependencies = []; - - }; - - vim-pandoc-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-syntax-2017-04-13"; - src = fetchgit { - url = "https://github.com/vim-pandoc/vim-pandoc-syntax"; - rev = "56e8e41ef863a0a7d33d85c3c0c895aa6e9e62d3"; - sha256 = "19ll4zrw5yd0frgsbi7pg9b68lmy4bfiwbnwgzii7inifrqsykfw"; - }; - dependencies = []; - - }; - - vim-ruby = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-ruby-2018-07-08"; - src = fetchgit { - url = "https://github.com/vim-ruby/vim-ruby"; - rev = "3e0f241b544c63d44ac925ec557ce6735b24d9cf"; - sha256 = "16ywzvb78pxinls0za1bzcds9aznsgvds8q2l4wimp4q9wrs1scs"; - }; - dependencies = []; - - }; - - Colour-Sampler-Pack = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Colour-Sampler-Pack-2012-11-29"; - src = fetchgit { - url = "https://github.com/vim-scripts/Colour-Sampler-Pack"; - rev = "05cded87b2ef29aaa9e930230bb88e23abff4441"; - sha256 = "03v2r18sfgs0xbgy9p56pxfdg0lsk6m7wyr5hw63wm1nzpwiipg3"; - }; - dependencies = []; - - }; - - Improved-AnsiEsc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Improved-AnsiEsc-2015-08-25"; - src = fetchgit { - url = "https://github.com/vim-scripts/Improved-AnsiEsc"; - rev = "e1c59a8e9203fab6b9150721f30548916da73351"; - sha256 = "1smjs4kz2kmzprzp9az4957675nakb43146hshbby39j5xz4jsbz"; - }; - dependencies = []; - - }; - - Rename = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Rename-2011-08-30"; - src = fetchgit { - url = "https://github.com/vim-scripts/Rename"; - rev = "b240f28d2ede65fa77cd99fe045efe79202f7a34"; - sha256 = "1d1myg4zyc281zcc1ba9idbgcgxndb4a0jwqr4yqxhhzdgszw46r"; - }; - dependencies = []; - - }; - - ReplaceWithRegister = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ReplaceWithRegister-2014-10-30"; - src = fetchgit { - url = "https://github.com/vim-scripts/ReplaceWithRegister"; - rev = "832efc23111d19591d495dc72286de2fb0b09345"; - sha256 = "0mb0sx85j1k59b1zz95r4vkq4kxlb4krhncq70mq7fxrs5bnhq8g"; - }; - dependencies = []; - - }; - - YankRing-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "YankRing-vim-2015-07-28"; - src = fetchgit { - url = "https://github.com/vim-scripts/YankRing.vim"; - rev = "28854abef8fa4ebd3cb219aefcf22566997d8f65"; - sha256 = "0zdp8pdsqgrh6lfw8ipjhrig6psvmdxkim9ik801y3r373sk2hxw"; - }; - dependencies = []; - - }; - - a-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "a-vim-2010-11-06"; - src = fetchgit { - url = "https://github.com/vim-scripts/a.vim"; - rev = "2cbe946206ec622d9d8cf2c99317f204c4d41885"; - sha256 = "0h62v9z5bh9xmaq22pqdb3z79i84a5rknqm68mjpy7nq7s3q42fa"; - }; - dependencies = []; - - }; - - align = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "align-2012-08-07"; - src = fetchgit { - url = "https://github.com/vim-scripts/align"; - rev = "787662fe90cd057942bc5b682fd70c87e1a9dd77"; - sha256 = "0acacr572kfh7jvavbw61q5pkwrpi1albgancma063rpax1pddgp"; - }; - dependencies = []; - - }; - - argtextobj-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "argtextobj-vim-2010-10-17"; - src = fetchgit { - url = "https://github.com/vim-scripts/argtextobj.vim"; - rev = "f3fbe427f7b4ec436416a5816d714dc917dc530b"; - sha256 = "1l4jh5hdmky1qj5z26jpnk49a6djjcvzyyr6pknrrgb8rzkiln48"; - }; - dependencies = []; - - }; - - bats-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "bats-vim-2013-07-03"; - src = fetchgit { - url = "https://github.com/vim-scripts/bats.vim"; - rev = "3c283f594ff8bc7fb0c25cd07ebef0f17385f94a"; - sha256 = "06f3hdf7y5gpwmc6inrhk938qmn7cr6mbk00amrnl1qjvk09givx"; - }; - dependencies = []; - - }; - - changeColorScheme-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "changeColorScheme-vim-2010-10-17"; - src = fetchgit { - url = "https://github.com/vim-scripts/changeColorScheme.vim"; - rev = "b041d49f828629d72f2232531a230d1ec5de2405"; - sha256 = "0pybhsg9k9252d4ifdc4gsar8lkmfzbvs6xkzqq1m6f35l9wqk09"; - }; - dependencies = []; - - }; - - matchit-zip = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "matchit-zip-2010-10-17"; - src = fetchgit { - url = "https://github.com/vim-scripts/matchit.zip"; - rev = "ced6c409c9beeb0b4142d21906606bd194411d1d"; - sha256 = "1s9c4lnsmbfm97bp22jrmcp5lga5ihx23lzqqncvv7rcizkvr3dm"; - }; - dependencies = []; - - }; - - mayansmoke-git = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "mayansmoke-git-2010-10-17"; - src = fetchgit { - url = "https://github.com/vim-scripts/mayansmoke.git"; - rev = "168883af7aec05f139af251f47eadd5dfb802c9d"; - sha256 = "1xxcky7i6sx7f1q8xka4gd2xg78w6sqjvqrdwgrdzv93fhf82rpd"; - }; - dependencies = []; - - }; - - random-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "random-vim-2010-10-17"; - src = fetchgit { - url = "https://github.com/vim-scripts/random.vim"; - rev = "b2d85eb24a38074eab37a5acf2a295e1f2ad8989"; - sha256 = "1lzy2cq4jcrsqyxlnbnd0y6j4mabm09bi7q22lf6vinqlb84w7sp"; - }; - dependencies = []; - - }; - - tabmerge = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tabmerge-2010-10-17"; - src = fetchgit { - url = "https://github.com/vim-scripts/tabmerge"; - rev = "074e5f06f26e7108a0570071a0f938a821768c06"; - sha256 = "0prkyza1n49cdaslcr57w8zv15vw78mlqbzib2xipmawzjq02idq"; - }; - dependencies = []; - - }; - - taglist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "taglist-vim-2010-10-17"; - src = fetchgit { - url = "https://github.com/vim-scripts/taglist.vim"; - rev = "53041fbc45398a9af631a20657e109707a455339"; - sha256 = "07aa2gfc73lznyi7w7cybzanspza3p67cv5hxr21g43zhs5k9izd"; - }; - dependencies = []; - - }; - - wombat256-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "wombat256-vim-2010-10-17"; - src = fetchgit { - url = "https://github.com/vim-scripts/wombat256.vim"; - rev = "8734ba45dcf5e38c4d2686b35c94f9fcb30427e2"; - sha256 = "01fdvfwdfqn5xi88lfanb4lb6jmn1ma6wq6d9jj2x7qamdbpvsrg"; - }; - dependencies = []; - - }; - - vimoutliner = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimoutliner-2018-07-04"; - src = fetchgit { - url = "https://github.com/vimoutliner/vimoutliner"; - rev = "aad0a213069b8a1b5de91cca07d153fc8352c957"; - sha256 = "0pgkgs6xky0skhpp3s9vrw3h48j80im0j39q4vc2b3pd1ydy6rx2"; - }; - dependencies = []; - - }; - - vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimwiki-2018-07-21"; - src = fetchgit { - url = "https://github.com/vimwiki/vimwiki"; - rev = "9f797f6ad9fd2a5e943bc99b5f9cd44b2cbd0fb4"; - sha256 = "0snqxbfpc9jy9zy3n0g2xc01kgxznnnd0g00v2nb17vs3m1b7arc"; - }; - dependencies = []; - - }; - - dhall-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "dhall-vim-2018-07-23"; - src = fetchgit { - url = "https://github.com/vmchale/dhall-vim"; - rev = "5bdddb86e660f172841109a28e2a98efb76448ce"; - sha256 = "0rkzgn5ny84624q7phc8wdm4nvkq2ypkq5lkbmahhm26cxvlkqlq"; - }; - dependencies = []; - - }; - - ale = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ale-2018-07-25"; - src = fetchgit { - url = "https://github.com/w0rp/ale"; - rev = "79ffdde267323a206a96227904549c370f27decf"; - sha256 = "02np0jnz50qs3fl6n0wh1xfzgq8lbfgagf2mw8cbj8a4gmzx67fg"; - }; - dependencies = []; - - }; - - vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-wakatime-2018-07-14"; - src = fetchgit { - url = "https://github.com/wakatime/vim-wakatime"; - rev = "25aa400fd1f1e3d689c721605a65e015024dc4cf"; - sha256 = "11lk5k8wl3kxp6p2i0nnp56f4wcaniy40kzs3anjdwlzya631rg2"; - }; - dependencies = []; - buildInputs = [ python ]; - }; - - targets-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "targets-vim-2018-05-27"; - src = fetchgit { - url = "https://github.com/wellle/targets.vim"; - rev = "c3042dc18acc0dfcee479310d3efc6aefe92db75"; - sha256 = "0shnlgwrxzrd0m3k6hnmr66i2l4zknp0pn7f71d2frx937gih34q"; - }; - dependencies = []; - - }; - - vim-dirdiff = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-dirdiff-2018-01-30"; - src = fetchgit { - url = "https://github.com/will133/vim-dirdiff"; - rev = "b5a3d59bfbeb5cef7dbadbe69c455b470988b58c"; - sha256 = "16hc88k00xa757k0h53r1sbqwxdxdy0118yl2vsigd6rqk474nw1"; - }; - dependencies = []; - - }; - - command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "command-t-2017-11-16"; - src = fetchgit { - url = "https://github.com/wincent/command-t"; - rev = "7147ba92c9c1eef8269fd47d47ba636ce7f365a6"; - sha256 = "171z1jjjv1l15rh3i2hc400vjf4zns8sjvda0vcjkx2717ax658r"; - }; - dependencies = []; - buildInputs = [ ruby rake ]; - buildPhase = '' - rake make - rm ruby/command-t/ext/command-t/*.o - ''; - }; - - vim-easytags = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easytags-2015-07-01"; - src = fetchgit { - url = "https://github.com/xolox/vim-easytags"; - rev = "72a8753b5d0a951e547c51b13633f680a95b5483"; - sha256 = "0i8ha1fa5d860b1mi0xp8kwsgb0b9vbzcg1bldzv6s5xd9yyi12i"; - }; - dependencies = ["vim-misc"]; - - }; - - vim-misc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-misc-2015-05-21"; - src = fetchgit { - url = "https://github.com/xolox/vim-misc"; - rev = "3e6b8fb6f03f13434543ce1f5d24f6a5d3f34f0b"; - sha256 = "0rd9788dyfc58py50xbiaz5j7nphyvf3rpp3yal7yq2dhf0awwfi"; - }; - dependencies = []; - - }; - - vim-latex-live-preview = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-latex-live-preview-2017-11-09"; - src = fetchgit { - url = "https://github.com/xuhdev/vim-latex-live-preview"; - rev = "9855f084d0751dbd40a8cb56518f239e5eb1a624"; - sha256 = "0linzdq2zrz5yfpqa51n2i9vrwr0x2r93ckx6n1ngyiw535ddafy"; - }; - dependencies = []; - - }; - - nim-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "nim-vim-2018-05-20"; - src = fetchgit { - url = "https://github.com/zah/nim.vim"; - rev = "704dd5d63cac54c22fe25c6efbcf18796df412e7"; - sha256 = "0azk3m33c47ja24iirlrjqphmd8rzlivinqkx69izmd7l150ds2m"; - }; - dependencies = []; - - }; - - deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-go-2018-07-03"; - src = fetchgit { - url = "https://github.com/zchee/deoplete-go"; - rev = "2d402d856d98d4a351fdcf40d837da0cf52ccdfd"; - sha256 = "0hj5bhfhd9am11ixaxad370p982bjig53mbm74fi6slhjpikdrdq"; - }; - dependencies = []; - buildInputs = [ python3 ]; - buildPhase = '' - pushd ./rplugin/python3/deoplete/ujson - python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build - popd - find ./rplugin/ -name "ujson*.so" -exec mv -v {} ./rplugin/python3/ \; - ''; - }; - - deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-jedi-2018-07-10"; - src = fetchgit { - url = "https://github.com/zchee/deoplete-jedi"; - rev = "5540e76ee3194f2eaa2df51945297cb847a1dfa8"; - sha256 = "0mqq42v4l2y0hkcs83j0cp7hxamv6gn5g8z4bccrbssgrsv61cg6"; - }; - dependencies = []; - - }; - - zig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "zig-vim-2018-07-18"; - src = fetchgit { - url = "https://github.com/zig-lang/zig.vim"; - rev = "2dc38afd6af04ea563a0d0d6f61891b5c820e8fe"; - sha256 = "1nyrg87biwq6b3jk40fyjd5mlnl4pbvwsqi9095y8gjanf9a9dck"; - }; - dependencies = []; - - }; - -} // lib.optionalAttrs (config.allowAliases or true) (with self; { - - # aliasess + }); +}) // lib.optionalAttrs (config.allowAliases or true) (with self; { + # aliases airline = vim-airline; - alternative = a-vim; # backwards compat, added 2014-10-21 + a-vim = alternative; # backwards compat, added 2018-09-10 bats = bats-vim; calendar = calendar-vim; coffee-script = vim-coffee-script; @@ -3427,11 +343,10 @@ self = rec { solarized = vim-colors-solarized; colors-solarized = vim-colors-solarized; caw = caw-vim; - colorsamplerpack = Colour_Sampler_Pack; - Colour_Sampler_Pack = Colour-Sampler-Pack; - command_T = command-t; # backwards compat, added 2014-10-18 + Colour_Sampler_Pack = colorsamplerpack; + command-t = command_T; # backwards compat, added 2018-09-10 commentary = vim-commentary; - committia = committia-vim-git; + committia = committia-vim; concealedyank = concealedyank-vim; context-filetype = context_filetype-vim; Cosco = cosco-vim; @@ -3439,7 +354,7 @@ self = rec { CSApprox = csapprox; csv = csv-vim; ctrlp = ctrlp-vim; - cute-python = vim-cute-python-git; + cute-python = vim-cute-python; denite = denite-nvim; easy-align = vim-easy-align; easygit = vim-easygit; @@ -3465,19 +380,16 @@ self = rec { ipython = vim-ipython; latex-live-preview = vim-latex-live-preview; maktaba = vim-maktaba; - mayansmoke = mayansmoke-git; multiple-cursors = vim-multiple-cursors; - necoGhc = neco-ghc; # backwards compat, added 2014-10-18 + neco-ghc = necoGhc; # backwards compat, added 2018-09-10 neocomplete = neocomplete-vim; neoinclude = neoinclude-vim; neomru = neomru-vim; neosnippet = neosnippet-vim; - neoyank = neoyank-vim-git; The_NERD_Commenter = nerdcommenter; The_NERD_tree = nerdtree; open-browser = open-browser-vim; pathogen = vim-pathogen; - peskcolor = peskcolor-vim-git; polyglot = vim-polyglot; prettyprint = vim-prettyprint; quickrun = vim-quickrun; @@ -3511,18 +423,18 @@ self = rec { tslime = tslime-vim; unite = unite-vim; UltiSnips = ultisnips; - vim-grepper = vim-grepper-git; - vim-test = vim-test-git; + vim-addon-vim2nix = vim2nix; vimproc = vimproc-vim; vimshell = vimshell-vim; - vinegar = vim-vinegar; - watchdogs = vim-watchdogs; + vim-vinegar = vinegar; # backwards compat, added 2018-09-10 + vim-watchdogs = watchdogs; # backwards compat, added 2018-09-10 WebAPI = webapi-vim; wombat256 = wombat256-vim; # backwards compat, added 2015-7-8 - yankring = YankRing-vim; - Yankring = YankRing-vim; + YankRing-vim = yankring; + Yankring = yankring; YouCompleteMe = youcompleteme; xterm-color-table = xterm-color-table-vim; zeavim = zeavim-vim; + }); in self diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix new file mode 100644 index 000000000000..88a91824ea06 --- /dev/null +++ b/pkgs/misc/vim-plugins/generated.nix @@ -0,0 +1,3172 @@ +# This file has been generated by ./pkgs/misc/vim-plugins/update.py. Do not edit! +{ buildVimPluginFrom2Nix, fetchFromGitHub }: + +{ + ack-vim = buildVimPluginFrom2Nix { + name = "ack-vim-2018-02-27"; + src = fetchFromGitHub { + owner = "mileszs"; + repo = "ack.vim"; + rev = "36e40f9ec91bdbf6f1adf408522a73a6925c3042"; + sha256 = "0yppr89hd1jyp0pj56hxdjbn32sr7pj3mihd18wxispvl5dqd6fm"; + }; + }; + + acp = buildVimPluginFrom2Nix { + name = "acp-2013-02-05"; + src = fetchFromGitHub { + owner = "eikenb"; + repo = "acp"; + rev = "5c627cec37d0d3b1670cb250d84e176e8b0c644e"; + sha256 = "0h7s4nvxin7m2caka7g1hhlxj1bbiwsvw8s2lqwlh7nq43v23ghg"; + }; + }; + + agda-vim = buildVimPluginFrom2Nix { + name = "agda-vim-2018-05-23"; + src = fetchFromGitHub { + owner = "derekelkins"; + repo = "agda-vim"; + rev = "24169e70c1dbd784349b1551b6a3753680d9bb87"; + sha256 = "1bn2g89dvwccfl4ki07jb8iydb3d0s4rm7z5gv5q1bv3lccndax6"; + }; + }; + + alchemist-vim = buildVimPluginFrom2Nix { + name = "alchemist-vim-2018-09-02"; + src = fetchFromGitHub { + owner = "slashmili"; + repo = "alchemist.vim"; + rev = "35e7e3062d1661b1c081765ed05bd8f0f5265183"; + sha256 = "08i2nzsaq73iz8wkryq5nly3hl0xb3zy16zk7k28bslvyj3ricnc"; + }; + }; + + ale = buildVimPluginFrom2Nix { + name = "ale-2018-09-10"; + src = fetchFromGitHub { + owner = "w0rp"; + repo = "ale"; + rev = "99e9417ef901824200040c6a2d3e84f2e0ff4b8e"; + sha256 = "1y7yp1wyghhgvmylkbdi3wbvqcw026mfaajhgna53xd3fl7z3bgd"; + }; + }; + + align = buildVimPluginFrom2Nix { + name = "align-2012-08-08"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "align"; + rev = "787662fe90cd057942bc5b682fd70c87e1a9dd77"; + sha256 = "0acacr572kfh7jvavbw61q5pkwrpi1albgancma063rpax1pddgp"; + }; + }; + + alternative = buildVimPluginFrom2Nix { + name = "alternative-2010-11-06"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "a.vim"; + rev = "2cbe946206ec622d9d8cf2c99317f204c4d41885"; + sha256 = "0h62v9z5bh9xmaq22pqdb3z79i84a5rknqm68mjpy7nq7s3q42fa"; + }; + }; + + argtextobj-vim = buildVimPluginFrom2Nix { + name = "argtextobj-vim-2010-10-18"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "argtextobj.vim"; + rev = "f3fbe427f7b4ec436416a5816d714dc917dc530b"; + sha256 = "1l4jh5hdmky1qj5z26jpnk49a6djjcvzyyr6pknrrgb8rzkiln48"; + }; + }; + + auto-pairs = buildVimPluginFrom2Nix { + name = "auto-pairs-2017-07-03"; + src = fetchFromGitHub { + owner = "jiangmiao"; + repo = "auto-pairs"; + rev = "f0019fc6423e7ce7bbd01d196a7e027077687fda"; + sha256 = "1kzrdq3adwxwm3fw65g05ww9405lwqi368win5kayamyj9i0z7r6"; + }; + }; + + awesome-vim-colorschemes = buildVimPluginFrom2Nix { + name = "awesome-vim-colorschemes-2018-01-20"; + src = fetchFromGitHub { + owner = "rafi"; + repo = "awesome-vim-colorschemes"; + rev = "8d2b6657bdbe4f7253e320c741bc4c1fc2f2f41d"; + sha256 = "1wfm6rsmyqldxwcz0ic4rq7kf00fgsx00rg42cl9yya35nqiri2z"; + }; + }; + + base16-vim = buildVimPluginFrom2Nix { + name = "base16-vim-2018-05-24"; + src = fetchFromGitHub { + owner = "chriskempson"; + repo = "base16-vim"; + rev = "fcce6bce6a2f4b14eea7ea388031c0aa65e4b67d"; + sha256 = "0wi8k80v2brmxqbkk0lrvl4v2sslkjfwpvflm55b3n0ii8qy39nk"; + }; + }; + + bats-vim = buildVimPluginFrom2Nix { + name = "bats-vim-2013-07-03"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "bats.vim"; + rev = "3c283f594ff8bc7fb0c25cd07ebef0f17385f94a"; + sha256 = "06f3hdf7y5gpwmc6inrhk938qmn7cr6mbk00amrnl1qjvk09givx"; + }; + }; + + calendar-vim = buildVimPluginFrom2Nix { + name = "calendar-vim-2018-08-05"; + src = fetchFromGitHub { + owner = "itchyny"; + repo = "calendar.vim"; + rev = "1f20b779171d4d3a20abd47508692fbae32e3188"; + sha256 = "01aiaslaww117kdwf7qxjc647g6bxcqr694mi3l0llblq549ih5l"; + }; + }; + + caw-vim = buildVimPluginFrom2Nix { + name = "caw-vim-2018-06-15"; + src = fetchFromGitHub { + owner = "tyru"; + repo = "caw.vim"; + rev = "e82ae00f3fc03289d4054b44f100025a1bc81939"; + sha256 = "16sbrc34nxbrgpj8gyi1drwh52qg3z2nq4frd5f2nfgxsgjrjjjc"; + }; + }; + + changeColorScheme-vim = buildVimPluginFrom2Nix { + name = "changeColorScheme-vim-2010-10-18"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "changeColorScheme.vim"; + rev = "b041d49f828629d72f2232531a230d1ec5de2405"; + sha256 = "0pybhsg9k9252d4ifdc4gsar8lkmfzbvs6xkzqq1m6f35l9wqk09"; + }; + }; + + CheckAttach = buildVimPluginFrom2Nix { + name = "CheckAttach-2018-09-02"; + src = fetchFromGitHub { + owner = "chrisbra"; + repo = "CheckAttach"; + rev = "e9167ad91e85d401441b8ac64b8dcbe3d0cf4df7"; + sha256 = "1xif7lplm35scb36pzh2mq24j2khyzriiaqa2lzhwfilb7nq9c91"; + }; + }; + + clang_complete = buildVimPluginFrom2Nix { + name = "clang_complete-2018-01-18"; + src = fetchFromGitHub { + owner = "Rip-Rip"; + repo = "clang_complete"; + rev = "0918788ea0b9dc4c753ffd162c95f890ae57a275"; + sha256 = "19hf7xrx1lsvn5rhwmc0qc1qzpb365j1d0jzvihd99p0zkgzgj1p"; + }; + }; + + clighter8 = buildVimPluginFrom2Nix { + name = "clighter8-2018-07-25"; + src = fetchFromGitHub { + owner = "bbchung"; + repo = "clighter8"; + rev = "839993b60dc4a19a58e4c7e7db1df04d911bb181"; + sha256 = "01r92idbym2p1hiqszrprrl1hrqzz2yhzv8n08m8gycd7m227cwg"; + }; + }; + + colorsamplerpack = buildVimPluginFrom2Nix { + name = "colorsamplerpack-2012-11-30"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "Colour-Sampler-Pack"; + rev = "05cded87b2ef29aaa9e930230bb88e23abff4441"; + sha256 = "03v2r18sfgs0xbgy9p56pxfdg0lsk6m7wyr5hw63wm1nzpwiipg3"; + }; + }; + + command_T = buildVimPluginFrom2Nix { + name = "command_T-2017-11-17"; + src = fetchFromGitHub { + owner = "wincent"; + repo = "command-t"; + rev = "7147ba92c9c1eef8269fd47d47ba636ce7f365a6"; + sha256 = "171z1jjjv1l15rh3i2hc400vjf4zns8sjvda0vcjkx2717ax658r"; + fetchSubmodules = true; + }; + }; + + committia-vim = buildVimPluginFrom2Nix { + name = "committia-vim-2018-08-16"; + src = fetchFromGitHub { + owner = "rhysd"; + repo = "committia.vim"; + rev = "293a0078ec8fc6e302fa49f48db5fd609d27ab20"; + sha256 = "12s0976agvxkayvxm86ppk97x1sbdrgg8gkc97fpac83vah7lc1r"; + }; + }; + + concealedyank-vim = buildVimPluginFrom2Nix { + name = "concealedyank-vim-2013-03-24"; + src = fetchFromGitHub { + owner = "chikatoike"; + repo = "concealedyank.vim"; + rev = "e7e65a395e0e6a266f3a808bc07441aa7d03ebbd"; + sha256 = "0z7i8dmwfjh6mcrmgrxv3j86ic867617fas9mv4gqsrhhvrrkzsb"; + }; + }; + + context_filetype-vim = buildVimPluginFrom2Nix { + name = "context_filetype-vim-2018-08-30"; + src = fetchFromGitHub { + owner = "shougo"; + repo = "context_filetype.vim"; + rev = "5392e3f0f3ff82b7149818a5700680f4bbcfea45"; + sha256 = "0xnqn96qnlvpvqc4sx8vmnryfqgcxrgczlmadgkms18gd3ib6i0z"; + }; + }; + + cosco-vim = buildVimPluginFrom2Nix { + name = "cosco-vim-2018-08-07"; + src = fetchFromGitHub { + owner = "lfilho"; + repo = "cosco.vim"; + rev = "5752622192d9b27b3a5a274a5455613b56df6386"; + sha256 = "01byd7j4gl7zb1bh61p839ka04x2sm0rgwvbb126az7dr6gpclyf"; + }; + }; + + cpsm = buildVimPluginFrom2Nix { + name = "cpsm-2018-09-08"; + src = fetchFromGitHub { + owner = "nixprime"; + repo = "cpsm"; + rev = "900023c56dfdd200841d5c2f2f7000f332d2614f"; + sha256 = "1p1ry11f39fcz32i3b3p0p8n99qrnvrx4d7p0123123dj7wbxk3p"; + }; + }; + + csapprox = buildVimPluginFrom2Nix { + name = "csapprox-2013-07-27"; + src = fetchFromGitHub { + owner = "godlygeek"; + repo = "csapprox"; + rev = "7981dac51d8b6776985aa08cb7b5ee98ea7f2ddd"; + sha256 = "08g4x6nnd6hkgm2daa5ihhz75pcdx3jzzv8rfjls80qajlhx5rf6"; + }; + }; + + csv-vim = buildVimPluginFrom2Nix { + name = "csv-vim-2018-08-21"; + src = fetchFromGitHub { + owner = "chrisbra"; + repo = "csv.vim"; + rev = "23bc07d2f6b755f2194210dcebf912093849404d"; + sha256 = "0c2m2nvm5j6hsyhhjqlh9g1df7zhxwxsb9n2mamicncaqay7kx9x"; + }; + }; + + ctrlp-cmatcher = buildVimPluginFrom2Nix { + name = "ctrlp-cmatcher-2015-10-15"; + src = fetchFromGitHub { + owner = "JazzCore"; + repo = "ctrlp-cmatcher"; + rev = "6c36334f106b6fd981d23e724e9a618734cab43a"; + sha256 = "1573kd6xf3n8sxlz2j4zadai4rnc7k3s9c54648yfzickwn57d8q"; + }; + }; + + ctrlp-py-matcher = buildVimPluginFrom2Nix { + name = "ctrlp-py-matcher-2017-11-01"; + src = fetchFromGitHub { + owner = "FelikZ"; + repo = "ctrlp-py-matcher"; + rev = "cf63fd546f1e80dd4db3db96afbeaad301d21f13"; + sha256 = "0hs829x3vxv12y78hz5g4a5qpw05xf42dk0hxxk3ind77mnl1ir1"; + }; + }; + + ctrlp-vim = buildVimPluginFrom2Nix { + name = "ctrlp-vim-2018-06-28"; + src = fetchFromGitHub { + owner = "ctrlpvim"; + repo = "ctrlp.vim"; + rev = "43cc73b8e7d4ab45f17118573eb81fd45704b989"; + sha256 = "16jn9n6vavwiwh6l2av2i3livan72saaz0d0v8vmznrrs2ngi1gk"; + }; + }; + + ctrlp-z = buildVimPluginFrom2Nix { + name = "ctrlp-z-2015-10-17"; + src = fetchFromGitHub { + owner = "amiorin"; + repo = "ctrlp-z"; + rev = "d1a69ec623ce24b9a30fc8fe3cd468c322b03026"; + sha256 = "16nsj1g8lqmyizlb5ijwhf4dsmh0xv1kwqq6jxvhaf55vfga82yl"; + }; + }; + + denite-extra = buildVimPluginFrom2Nix { + name = "denite-extra-2018-08-13"; + src = fetchFromGitHub { + owner = "chemzqm"; + repo = "denite-extra"; + rev = "8e46f87ceb619d0db93bac58120fe01584e565fd"; + sha256 = "0pm63yi1qv1r4s098skr8pqx956d87f34cvj4vly67gj59lfyzzz"; + }; + }; + + denite-git = buildVimPluginFrom2Nix { + name = "denite-git-2018-07-19"; + src = fetchFromGitHub { + owner = "chemzqm"; + repo = "denite-git"; + rev = "edd2c202e05c3f84e31b94a841fef236b923d559"; + sha256 = "0x8nf4x49859lgyi83vhqvpdhb1mxv55a9l8vbdflfagagj0gnzd"; + }; + }; + + denite-nvim = buildVimPluginFrom2Nix { + name = "denite-nvim-2018-09-05"; + src = fetchFromGitHub { + owner = "shougo"; + repo = "denite.nvim"; + rev = "2771c7ae323c2a24341e0f6a83b81f1a1559df0c"; + sha256 = "07gmrsn815i91wzw9d326kwlph9bqcli75dzg6c8gl0r5vib2v5b"; + }; + }; + + deol-nvim = buildVimPluginFrom2Nix { + name = "deol-nvim-2018-06-07"; + src = fetchFromGitHub { + owner = "Shougo"; + repo = "deol.nvim"; + rev = "195e63e10f320c0dc5c7e6372fe4f6ba96e93dd8"; + sha256 = "0zb0pa1z847hpbb726i2vmryqap0yvdwnib4r8v1a7h06vvj17qy"; + }; + }; + + deoplete-clang = buildVimPluginFrom2Nix { + name = "deoplete-clang-2018-07-01"; + src = fetchFromGitHub { + owner = "zchee"; + repo = "deoplete-clang"; + rev = "3c4f14127b363ba9eac43d3506a563e2c8da0f97"; + sha256 = "1qi8flm0pbxw19fwj8nh4wpcmmzpwlqy5pmn4cmhn6j7b5vsm32i"; + fetchSubmodules = true; + }; + }; + + deoplete-go = buildVimPluginFrom2Nix { + name = "deoplete-go-2018-08-21"; + src = fetchFromGitHub { + owner = "zchee"; + repo = "deoplete-go"; + rev = "c1bdcfa71dcdaec8a1be8f396fc681e104e93a05"; + sha256 = "0v9i6gz150m7dl7hwk1jzk8f0l23rbagfwwmvhn45akgjyxk4dmq"; + fetchSubmodules = true; + }; + }; + + deoplete-jedi = buildVimPluginFrom2Nix { + name = "deoplete-jedi-2018-08-10"; + src = fetchFromGitHub { + owner = "zchee"; + repo = "deoplete-jedi"; + rev = "12e6d8f745efd64e08d474fa3b3d35c8c1fa0305"; + sha256 = "1ni1sfnh2bnl42m4fvwcc003b7ng501j21njk3wx5d395g5p4w81"; + fetchSubmodules = true; + }; + }; + + deoplete-julia = buildVimPluginFrom2Nix { + name = "deoplete-julia-2018-06-11"; + src = fetchFromGitHub { + owner = "JuliaEditorSupport"; + repo = "deoplete-julia"; + rev = "d60b976910685c99ca773c974e91c44eeda03a19"; + sha256 = "0x5cc9g1g1w9myr6p1ahb9gpn2abpbggjdk2bc903f62pkrapvjf"; + }; + }; + + deoplete-nvim = buildVimPluginFrom2Nix { + name = "deoplete-nvim-2018-09-02"; + src = fetchFromGitHub { + owner = "shougo"; + repo = "deoplete.nvim"; + rev = "8c2117b966a7f05091cd49609f8ee3641f260997"; + sha256 = "0pklmb89g3hqxilv0546c21yjav26frsxb5g24ma49pii8lmzgjg"; + }; + }; + + deoplete-rust = buildVimPluginFrom2Nix { + name = "deoplete-rust-2017-07-18"; + src = fetchFromGitHub { + owner = "sebastianmarkow"; + repo = "deoplete-rust"; + rev = "0a86e502113910c33448b337c4d50cabea120d25"; + sha256 = "0wsck83jns40ny3740vwjhc8g5bh6zl71hkirbjxy6n4xgixa54h"; + }; + }; + + deoplete-ternjs = buildVimPluginFrom2Nix { + name = "deoplete-ternjs-2018-06-05"; + src = fetchFromGitHub { + owner = "carlitux"; + repo = "deoplete-ternjs"; + rev = "4b6276019a1491cc5003a0b007ca1aaeab671f57"; + sha256 = "0v5033r75qxnhgmm0czxgwps0khbx1sn2dc7nsrscp441h5sgz6i"; + }; + }; + + dhall-vim = buildVimPluginFrom2Nix { + name = "dhall-vim-2018-07-30"; + src = fetchFromGitHub { + owner = "vmchale"; + repo = "dhall-vim"; + rev = "2693bfaf9167ac69ee96c1165b4354f03f4d8b24"; + sha256 = "0qm6z8z70cxqqlmxgq497w96nv5sn2gbxnc74balbhpk17bms4m0"; + }; + }; + + echodoc-vim = buildVimPluginFrom2Nix { + name = "echodoc-vim-2018-09-09"; + src = fetchFromGitHub { + owner = "shougo"; + repo = "echodoc.vim"; + rev = "781b1622029cd89350e6383da8ead834fb0cedd2"; + sha256 = "018xrql2prik0v9g0099k883r5gdgnip36vidnzmkr0b0h5bgw6a"; + }; + }; + + editorconfig-vim = buildVimPluginFrom2Nix { + name = "editorconfig-vim-2018-07-25"; + src = fetchFromGitHub { + owner = "editorconfig"; + repo = "editorconfig-vim"; + rev = "2c3e5323609d97ad7bda6fc22ae1f7746caab3d4"; + sha256 = "0a1nszrhxh9ixp5n47w89ijkvjk3rf29ypiz5blf4pnja39r336x"; + fetchSubmodules = true; + }; + }; + + elm-vim = buildVimPluginFrom2Nix { + name = "elm-vim-2018-06-18"; + src = fetchFromGitHub { + owner = "elmcast"; + repo = "elm-vim"; + rev = "e51e2e43ad617c26205a84453481d3ac152c8fec"; + sha256 = "09bgfjnpa1s25x5wnxry9lmsly92s0mazn1sl0vg2wfgphf67m6b"; + }; + }; + + ensime-vim = buildVimPluginFrom2Nix { + name = "ensime-vim-2018-04-20"; + src = fetchFromGitHub { + owner = "ensime"; + repo = "ensime-vim"; + rev = "634cce6eae10a31cd6eec259890bdcda326ee3c2"; + sha256 = "03sr53680kcwxaa5xbqzdfbsgday3bkzja33wym49w9gjmlaa320"; + }; + }; + + fastfold = buildVimPluginFrom2Nix { + name = "fastfold-2018-06-03"; + src = fetchFromGitHub { + owner = "konfekt"; + repo = "fastfold"; + rev = "4150ebdc6e226e8797d42dcabb7463952de9dc30"; + sha256 = "0mdb77np2vf564q18fvj1klr99pwrx2sw0jhxify9g7i0177qs4r"; + }; + }; + + flake8-vim = buildVimPluginFrom2Nix { + name = "flake8-vim-2017-02-17"; + src = fetchFromGitHub { + owner = "andviro"; + repo = "flake8-vim"; + rev = "01c4af4c68f33b2b3785314bfbf5b3d8d1451795"; + sha256 = "14rv0p1vx4njlplkc72gz7r8sy9vc6n8x9l00zc777x5zzrhgz3g"; + fetchSubmodules = true; + }; + }; + + floobits-neovim = buildVimPluginFrom2Nix { + name = "floobits-neovim-2018-08-01"; + src = fetchFromGitHub { + owner = "floobits"; + repo = "floobits-neovim"; + rev = "29ab2ed4bd5c879df0bd6df313a776155eb98ad8"; + sha256 = "0bnncn3waw9birpd51j27hrzlriz8dk4naxdajmbwznwcnbkkgwx"; + }; + }; + + forms = buildVimPluginFrom2Nix { + name = "forms-2012-11-28"; + src = fetchFromGitHub { + owner = "megaannum"; + repo = "forms"; + rev = "b601e03fe0a3b8a43766231f4a6217e4492b4f75"; + sha256 = "19kp1i5c6jmnpbsap9giayqbzlv7vh02mp4mjvicqj9n0nfyay74"; + }; + }; + + fugitive-gitlab-vim = buildVimPluginFrom2Nix { + name = "fugitive-gitlab-vim-2018-07-04"; + src = fetchFromGitHub { + owner = "shumphrey"; + repo = "fugitive-gitlab.vim"; + rev = "b8e7b6986c5d13f3e2de2163816af06f74a6f838"; + sha256 = "1lvll9hjqsm79f0ls84d8b8s12043b9p5qa4i6iwf3v1qbq7kb8d"; + }; + }; + + fzf-vim = buildVimPluginFrom2Nix { + name = "fzf-vim-2018-09-07"; + src = fetchFromGitHub { + owner = "junegunn"; + repo = "fzf.vim"; + rev = "8fa84e0fdf97842d94caee8d50584836edf5b509"; + sha256 = "0di5xmd3i9m034npr6zc1f793jcj1vsy95wdyhpf55b6hclm7bbd"; + }; + }; + + ghcmod-vim = buildVimPluginFrom2Nix { + name = "ghcmod-vim-2016-06-19"; + src = fetchFromGitHub { + owner = "eagletmt"; + repo = "ghcmod-vim"; + rev = "1d192d13d68ab59f9f46497a0909bf24a7b7dfff"; + sha256 = "0bzahgzagnf0a9zv86jhdf8nc3p0yfz9izv5n3lc8gc12cp47d0a"; + }; + }; + + gist-vim = buildVimPluginFrom2Nix { + name = "gist-vim-2016-10-10"; + src = fetchFromGitHub { + owner = "mattn"; + repo = "gist-vim"; + rev = "f0d63579eab7548cf12f979dc52ef5a370ecbe63"; + sha256 = "06nix49j4inxy3rkcv32f4ka89g4crqwfqnrm3b76iwwky8m2p17"; + }; + }; + + gitv = buildVimPluginFrom2Nix { + name = "gitv-2018-06-10"; + src = fetchFromGitHub { + owner = "gregsexton"; + repo = "gitv"; + rev = "41e4ffdbdb02374412d03c5680906ebee84dd5a2"; + sha256 = "1wfp3kkcvrccq0dqplg3ymyz9vdwn1c5wabh6mwfzbs2zx01vwcn"; + }; + }; + + goyo-vim = buildVimPluginFrom2Nix { + name = "goyo-vim-2017-05-31"; + src = fetchFromGitHub { + owner = "junegunn"; + repo = "goyo.vim"; + rev = "5b8bd0378758c1d9550d8429bef24b3d6d78b592"; + sha256 = "10racxq8zfj2fpl09vbvv5hbnr4xmm4ba75kgyp9byjapzkbq1pi"; + }; + }; + + gruvbox = buildVimPluginFrom2Nix { + name = "gruvbox-2018-02-25"; + src = fetchFromGitHub { + owner = "morhetz"; + repo = "gruvbox"; + rev = "cb4e7a5643f7d2dd40e694bcbd28c4b89b185e86"; + sha256 = "12qkq1x96bm1cmqfg6sb8jxpl2b6gwvhc5qn3gva6vl4nx3ianqi"; + }; + }; + + gundo-vim = buildVimPluginFrom2Nix { + name = "gundo-vim-2017-05-09"; + src = fetchFromGitHub { + owner = "sjl"; + repo = "gundo.vim"; + rev = "46c443ee9d5854320eb965a1fdee781ba83a070e"; + sha256 = "0adk7agzmbfv342zw6lc8jad6yjs1wap4c0ca98s0qm2bs0r1hl2"; + }; + }; + + haskell-vim = buildVimPluginFrom2Nix { + name = "haskell-vim-2018-05-22"; + src = fetchFromGitHub { + owner = "neovimhaskell"; + repo = "haskell-vim"; + rev = "b1ac46807835423c4a4dd063df6d5b613d89c731"; + sha256 = "1vqj3r2v8skffywwgv4093ww7fm540437j5qz7n8q8787bs5w0br"; + }; + }; + + hasksyn = buildVimPluginFrom2Nix { + name = "hasksyn-2014-09-04"; + src = fetchFromGitHub { + owner = "travitch"; + repo = "hasksyn"; + rev = "c434040bf13a17ca20a551223021b3ace7e453b9"; + sha256 = "09998lnfcshqis5m062wlag6y476imq9jday9gp4ayjjl1cp3cwx"; + }; + }; + + hlint-refactor-vim = buildVimPluginFrom2Nix { + name = "hlint-refactor-vim-2015-12-05"; + src = fetchFromGitHub { + owner = "mpickering"; + repo = "hlint-refactor-vim"; + rev = "fffb044ecef854a82c5c2efda252e09044ba03e0"; + sha256 = "0z8d31arfy9aidg1dwj5msnnx799d9r7njkgh51z695w6ayxn6p8"; + }; + }; + + idris-vim = buildVimPluginFrom2Nix { + name = "idris-vim-2017-12-04"; + src = fetchFromGitHub { + owner = "idris-hackers"; + repo = "idris-vim"; + rev = "091ed6b267749927777423160eeab520109dd9c1"; + sha256 = "1zibar2vxcmai0k37ricwnimfdv1adxfbbvz871rc4l6h3q85if1"; + }; + }; + + Improved-AnsiEsc = buildVimPluginFrom2Nix { + name = "Improved-AnsiEsc-2015-08-26"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "Improved-AnsiEsc"; + rev = "e1c59a8e9203fab6b9150721f30548916da73351"; + sha256 = "1smjs4kz2kmzprzp9az4957675nakb43146hshbby39j5xz4jsbz"; + }; + }; + + incsearch-easymotion-vim = buildVimPluginFrom2Nix { + name = "incsearch-easymotion-vim-2016-01-18"; + src = fetchFromGitHub { + owner = "haya14busa"; + repo = "incsearch-easymotion.vim"; + rev = "fcdd3aee6f4c0eef1a515727199ece8d6c6041b5"; + sha256 = "1bscr3xs1zggm9qzk1mb88fkc8qj6yrnkxmqwwyr75sf1xzy74mk"; + }; + }; + + incsearch-vim = buildVimPluginFrom2Nix { + name = "incsearch-vim-2017-11-24"; + src = fetchFromGitHub { + owner = "haya14busa"; + repo = "incsearch.vim"; + rev = "25e2547fb0566460f5999024f7a0de7b3775201f"; + sha256 = "05v0d9b5sm4d1bvhb01jk6s7brlli2xc16hvzr6gik1nm1ks6ai1"; + }; + }; + + intero-neovim = buildVimPluginFrom2Nix { + name = "intero-neovim-2018-08-07"; + src = fetchFromGitHub { + owner = "parsonsmatt"; + repo = "intero-neovim"; + rev = "9bb546e37adc1ffda28ff33922c506c15ed67b10"; + sha256 = "173kc8xrbmkhrc9ssaz6h5w1zisxsgz4bibihgj9bx60ibn4kaa7"; + }; + }; + + Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix { + name = "Jenkinsfile-vim-syntax-2018-04-04"; + src = fetchFromGitHub { + owner = "martinda"; + repo = "Jenkinsfile-vim-syntax"; + rev = "45418b171e06f63e0814cac6a656832384708aba"; + sha256 = "0vfx22fzp0894lclmbsp6l8apvw0znd3cbah8r7r5la9qzyiwi4p"; + }; + }; + + julia-vim = buildVimPluginFrom2Nix { + name = "julia-vim-2018-09-09"; + src = fetchFromGitHub { + owner = "JuliaEditorSupport"; + repo = "julia-vim"; + rev = "3018668f89ca4bf125d1d57effdea88b07a3b466"; + sha256 = "13fn3566ql4fcqzh6lfb6qj2xyqyvz70psc67k184k88arqm3y55"; + }; + }; + + last256 = buildVimPluginFrom2Nix { + name = "last256-2017-06-10"; + src = fetchFromGitHub { + owner = "sk1418"; + repo = "last256"; + rev = "d29320c1fe715b47edaa1be068201ea5a54ab0c0"; + sha256 = "16njh0p1j166dnf92110vlrj7gmrbsfkbkd8k6s9gfqjzbgd25jv"; + }; + }; + + latex-box = buildVimPluginFrom2Nix { + name = "latex-box-2015-06-01"; + src = fetchFromGitHub { + owner = "latex-box-team"; + repo = "latex-box"; + rev = "3c2901e12cb78bfb2be58ba4c62a488612550fe1"; + sha256 = "1z4mdy47cpwcdhvy8mr72vhlybxn1y59yd3ixf6ids1bzpkrd7zl"; + }; + }; + + lightline-vim = buildVimPluginFrom2Nix { + name = "lightline-vim-2018-09-01"; + src = fetchFromGitHub { + owner = "itchyny"; + repo = "lightline.vim"; + rev = "166f179cf89320b1b6f95def3a49fda448f4f711"; + sha256 = "04vcv5ig854n5yaibhwjbqwjiw0rbk7laiysn8s5lj1abycg92qq"; + }; + }; + + limelight-vim = buildVimPluginFrom2Nix { + name = "limelight-vim-2016-06-23"; + src = fetchFromGitHub { + owner = "junegunn"; + repo = "limelight.vim"; + rev = "106fb5749d227a0de72e36068ed72798c6fd48e6"; + sha256 = "0fp4yp50n5v5zx3a7afh9wip4nwcfhmdgdzwpnl79jvild1z9fgh"; + }; + }; + + lushtags = buildVimPluginFrom2Nix { + name = "lushtags-2017-04-19"; + src = fetchFromGitHub { + owner = "mkasa"; + repo = "lushtags"; + rev = "fd7fa5a0162d9aa159559880d5ba4731e180eeaf"; + sha256 = "03saw1w5pybj6yywzi8hinciv18znimm7k0h34k4pqp5gi1jfaql"; + }; + }; + + matchit-zip = buildVimPluginFrom2Nix { + name = "matchit-zip-2010-10-18"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "matchit.zip"; + rev = "ced6c409c9beeb0b4142d21906606bd194411d1d"; + sha256 = "1s9c4lnsmbfm97bp22jrmcp5lga5ihx23lzqqncvv7rcizkvr3dm"; + }; + }; + + mayansmoke = buildVimPluginFrom2Nix { + name = "mayansmoke-2010-10-18"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "mayansmoke"; + rev = "168883af7aec05f139af251f47eadd5dfb802c9d"; + sha256 = "1xxcky7i6sx7f1q8xka4gd2xg78w6sqjvqrdwgrdzv93fhf82rpd"; + }; + }; + + molokai = buildVimPluginFrom2Nix { + name = "molokai-2015-11-11"; + src = fetchFromGitHub { + owner = "tomasr"; + repo = "molokai"; + rev = "c67bdfcdb31415aa0ade7f8c003261700a885476"; + sha256 = "1piszjr5kyw43ac1f0jh9z88g824xknshrkchbys9qxlz7pd831s"; + }; + }; + + neco-look = buildVimPluginFrom2Nix { + name = "neco-look-2018-01-21"; + src = fetchFromGitHub { + owner = "ujihisa"; + repo = "neco-look"; + rev = "4ead88e70f359fb9cef6537ed9c336b7673c1b4c"; + sha256 = "1lszbif7ymdjch1ypnr1nihs6gfbhb86sj6nz3dwrbgsl454nnrj"; + }; + }; + + neco-syntax = buildVimPluginFrom2Nix { + name = "neco-syntax-2017-10-01"; + src = fetchFromGitHub { + owner = "shougo"; + repo = "neco-syntax"; + rev = "98cba4a98a4f44dcff80216d0b4aa6f41c2ce3e3"; + sha256 = "1cjcbgx3h00g91ifgw30q5n97x4nprsr4kwirydws79fcs4vkgip"; + }; + }; + + neco-vim = buildVimPluginFrom2Nix { + name = "neco-vim-2017-10-01"; + src = fetchFromGitHub { + owner = "shougo"; + repo = "neco-vim"; + rev = "f5397c5e800d65a58c56d8f1b1b92686b05f4ca9"; + sha256 = "0yb7ja6qgrazszk4i01cwjj00j9vd43zs2r11b08iy8n10jnzr73"; + }; + }; + + necoGhc = buildVimPluginFrom2Nix { + name = "necoGhc-2018-05-13"; + src = fetchFromGitHub { + owner = "eagletmt"; + repo = "neco-ghc"; + rev = "682869aca5dd0bde71a09ba952acb59c543adf7d"; + sha256 = "1v7ibi4fp99s4lswz3v0gf4i0h5i5gpj05xpsf4cixwj2zgh206h"; + }; + }; + + neocomplete-vim = buildVimPluginFrom2Nix { + name = "neocomplete-vim-2018-03-28"; + src = fetchFromGitHub { + owner = "shougo"; + repo = "neocomplete.vim"; + rev = "4be617947f3fcf2d725fab20b0e12f8b46c9e2f3"; + sha256 = "00ns46gy726w74nmnzhqnyh10jnpr04453v3rclswxgcvgma82b8"; + }; + }; + + neoformat = buildVimPluginFrom2Nix { + name = "neoformat-2018-09-05"; + src = fetchFromGitHub { + owner = "sbdchd"; + repo = "neoformat"; + rev = "c8bc4ec044a0d8c96291426b5ce10f741d63e6b6"; + sha256 = "140f1q1wbn7d7mxb2q08421a8qgxii3ffd8lmhsjj7mjsdvxmcks"; + }; + }; + + neoinclude-vim = buildVimPluginFrom2Nix { + name = "neoinclude-vim-2018-05-21"; + src = fetchFromGitHub { + owner = "shougo"; + repo = "neoinclude.vim"; + rev = "2fa77b9211d3f10c29559b715b6863da67ae7d3a"; + sha256 = "0pdahb2z9q4dk67xkwvaqrlpai86slhncfb4gn88x40dlnd7rkbg"; + }; + }; + + neomake = buildVimPluginFrom2Nix { + name = "neomake-2018-09-09"; + src = fetchFromGitHub { + owner = "benekastah"; + repo = "neomake"; + rev = "11c6797b258dfe1c0b4ee8536f2bb961003a3f76"; + sha256 = "0lsrz6m29ghhz57m1ay2v26i0838czhmm6a06yfy39dy99sa02il"; + }; + }; + + neomru-vim = buildVimPluginFrom2Nix { + name = "neomru-vim-2017-10-01"; + src = fetchFromGitHub { + owner = "shougo"; + repo = "neomru.vim"; + rev = "97540f54fa20b94daf306f0c1f3cce983bbf7a1d"; + sha256 = "15d5hmh5v3hnjnfb5736n45rh5nyq41vqjp1cz4ls2rxmmfi3xa7"; + }; + }; + + neosnippet-snippets = buildVimPluginFrom2Nix { + name = "neosnippet-snippets-2018-08-30"; + src = fetchFromGitHub { + owner = "shougo"; + repo = "neosnippet-snippets"; + rev = "a2e90c49850fff72e923f92f1672c3dc18e2f99b"; + sha256 = "0qfmiamy3y3h2dqpg965g801bfi9c7cnqgal3ybb66xs79afgi99"; + }; + }; + + neosnippet-vim = buildVimPluginFrom2Nix { + name = "neosnippet-vim-2018-07-30"; + src = fetchFromGitHub { + owner = "shougo"; + repo = "neosnippet.vim"; + rev = "70700ddef65f8f0639b336d04a0d2dbdc4eb0830"; + sha256 = "0szhmdqqgpfy6shwiw7wnsd06cz8c7v5zmpaa3hzs32gyrx49rza"; + }; + }; + + neoyank-vim = buildVimPluginFrom2Nix { + name = "neoyank-vim-2018-03-26"; + src = fetchFromGitHub { + owner = "shougo"; + repo = "neoyank.vim"; + rev = "ea3cd47ccb40cb2e26cb607d28475aa0fdb26fef"; + sha256 = "1zbf8062rpk56nd1zxqhwa8bdpxl9zp887l9nm4s9hc4ndsk4928"; + }; + }; + + nerdcommenter = buildVimPluginFrom2Nix { + name = "nerdcommenter-2018-07-31"; + src = fetchFromGitHub { + owner = "scrooloose"; + repo = "nerdcommenter"; + rev = "fdf950f20b3907c6a6fa0bc5c7ac0aeb567841dd"; + sha256 = "17b742fzybdcsf623n6xz21kb11xk2wz6w24iwdh8pkmqqh5mgzp"; + }; + }; + + nerdtree = buildVimPluginFrom2Nix { + name = "nerdtree-2018-09-10"; + src = fetchFromGitHub { + owner = "scrooloose"; + repo = "nerdtree"; + rev = "15d06b676dfcd92ac9a0bc375668d127f9822539"; + sha256 = "1v1w4yg6mgmz0q00in0y46wcmcgh6gxx8szws5cmvwv43d5c18qs"; + }; + }; + + nerdtree-git-plugin = buildVimPluginFrom2Nix { + name = "nerdtree-git-plugin-2017-03-12"; + src = fetchFromGitHub { + owner = "albfan"; + repo = "nerdtree-git-plugin"; + rev = "d79a5d5a1b3bc5fab3ba94db44a8b2e5a211d61d"; + sha256 = "0i77wijbr021zfv096ja15f5l52phvsd5gziqn1m3k60qkmb9gkj"; + }; + }; + + nim-vim = buildVimPluginFrom2Nix { + name = "nim-vim-2018-08-16"; + src = fetchFromGitHub { + owner = "zah"; + repo = "nim.vim"; + rev = "7d1211cc1588d8970e44435c612405f41ab5a36b"; + sha256 = "1s28sk7d73vckh37xhld99i8kkx2dxcvsiv8ixlkhgg1pdcchd6d"; + }; + }; + + nvim-cm-racer = buildVimPluginFrom2Nix { + name = "nvim-cm-racer-2017-07-27"; + src = fetchFromGitHub { + owner = "roxma"; + repo = "nvim-cm-racer"; + rev = "2a8a4a49fa58c5dac9e0bed9511f6928930cacd2"; + sha256 = "1yljxwypgn91084yyicbc2qprn31ld7s4drvnddzczyhzq5m2gpx"; + }; + }; + + nvim-completion-manager = buildVimPluginFrom2Nix { + name = "nvim-completion-manager-2018-07-27"; + src = fetchFromGitHub { + owner = "roxma"; + repo = "nvim-completion-manager"; + rev = "45a026afb8b309b3b80f2c1b5910f72a54a9b563"; + sha256 = "0znwgry4ill0nxm096hc8s9vf20rf9xcq3dz8y8h7xlqzzsycl7a"; + }; + }; + + open-browser-vim = buildVimPluginFrom2Nix { + name = "open-browser-vim-2018-04-26"; + src = fetchFromGitHub { + owner = "tyru"; + repo = "open-browser.vim"; + rev = "de4eeb085051e9b56dd5574eba7c7e72feb21246"; + sha256 = "1fgp4wwizpknfwscxraqqaxrhvwp9l1mnjwj3llk2x0n9qcqf1db"; + }; + }; + + peskcolor-vim = buildVimPluginFrom2Nix { + name = "peskcolor-vim-2016-06-11"; + src = fetchFromGitHub { + owner = "andsild"; + repo = "peskcolor.vim"; + rev = "cba4fc739bbebacd503158f6509d9c226651f363"; + sha256 = "15hw3casr5y3ckgcn6aq8vhk6g2hym41w51nvgf34hbj9fx1nvkq"; + }; + }; + + pony-vim-syntax = buildVimPluginFrom2Nix { + name = "pony-vim-syntax-2017-09-26"; + src = fetchFromGitHub { + owner = "dleonard0"; + repo = "pony-vim-syntax"; + rev = "caa34b3d7a15d9bfbfbb2f5944c85eb1eddcfafc"; + sha256 = "0r2lv99hkm95dv8wy9rkrkcwz5wkmwggfwi5vakgw497l3a9jskr"; + }; + }; + + psc-ide-vim = buildVimPluginFrom2Nix { + name = "psc-ide-vim-2018-03-11"; + src = fetchFromGitHub { + owner = "frigoeu"; + repo = "psc-ide-vim"; + rev = "6d4a3cc27e9782b703f6dd61ef5fdf27054bac0f"; + sha256 = "19w0cvrka3klxbh9z1yq873v92rhmxdj68bdnqxzwybf24hgsk9g"; + }; + }; + + purescript-vim = buildVimPluginFrom2Nix { + name = "purescript-vim-2018-07-05"; + src = fetchFromGitHub { + owner = "raichoo"; + repo = "purescript-vim"; + rev = "ab8547cef5827f046d43ba57203acb6692b7ef06"; + sha256 = "1pp7h77qqhgshf2x3hh73gnb4ya8jamqm75spbnn95piznd03k33"; + }; + }; + + python-mode = buildVimPluginFrom2Nix { + name = "python-mode-2018-04-29"; + src = fetchFromGitHub { + owner = "python-mode"; + repo = "python-mode"; + rev = "f94b0d7b21714f950f5878b430fbfde21c3b7ad9"; + sha256 = "0zxsa1agigzb9adrwq54pdyl984drdqzz3kkixaijkq77kkdvj0n"; + }; + }; + + quickfixstatus = buildVimPluginFrom2Nix { + name = "quickfixstatus-2011-09-03"; + src = fetchFromGitHub { + owner = "dannyob"; + repo = "quickfixstatus"; + rev = "fd3875b914fc51bbefefa8c4995588c088163053"; + sha256 = "16vxhvyxq51y7wnx0c1fmdi2yb6kfr1pxijq65gxj8qwvbak2s3v"; + }; + }; + + rainbow = buildVimPluginFrom2Nix { + name = "rainbow-2018-07-31"; + src = fetchFromGitHub { + owner = "luochen1990"; + repo = "rainbow"; + rev = "d7bb89e6a6fae25765ee16020ea7a85d43bd6e41"; + sha256 = "0zh2x1bm0sq00gq6350kckjl1fhwqdxl3b8d3k9lb1736xggd1p8"; + }; + }; + + rainbow_parentheses-vim = buildVimPluginFrom2Nix { + name = "rainbow_parentheses-vim-2013-03-05"; + src = fetchFromGitHub { + owner = "kien"; + repo = "rainbow_parentheses.vim"; + rev = "eb8baa5428bde10ecc1cb14eed1d6e16f5f24695"; + sha256 = "1qw84imlhq4654mxazj7j3sp5g1j3yjxi496i08iix06dm15m5s7"; + }; + }; + + random-vim = buildVimPluginFrom2Nix { + name = "random-vim-2010-10-18"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "random.vim"; + rev = "b2d85eb24a38074eab37a5acf2a295e1f2ad8989"; + sha256 = "1lzy2cq4jcrsqyxlnbnd0y6j4mabm09bi7q22lf6vinqlb84w7sp"; + }; + }; + + Rename = buildVimPluginFrom2Nix { + name = "Rename-2011-08-31"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "Rename"; + rev = "b240f28d2ede65fa77cd99fe045efe79202f7a34"; + sha256 = "1d1myg4zyc281zcc1ba9idbgcgxndb4a0jwqr4yqxhhzdgszw46r"; + }; + }; + + ReplaceWithRegister = buildVimPluginFrom2Nix { + name = "ReplaceWithRegister-2014-10-31"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "ReplaceWithRegister"; + rev = "832efc23111d19591d495dc72286de2fb0b09345"; + sha256 = "0mb0sx85j1k59b1zz95r4vkq4kxlb4krhncq70mq7fxrs5bnhq8g"; + }; + }; + + riv-vim = buildVimPluginFrom2Nix { + name = "riv-vim-2018-06-20"; + src = fetchFromGitHub { + owner = "Rykka"; + repo = "riv.vim"; + rev = "fb6d6f8c9d85128fd69c74f11bb7413addc002e8"; + sha256 = "1mjp90lz6jf3w9j4h1sidz7kfxhi9hk27pdnvb0hrvxw0q3bj9ch"; + }; + }; + + robotframework-vim = buildVimPluginFrom2Nix { + name = "robotframework-vim-2017-04-14"; + src = fetchFromGitHub { + owner = "mfukar"; + repo = "robotframework-vim"; + rev = "75d5b371a4da2a090a2872d55bd0dead013f334e"; + sha256 = "091ac5rq6f1a7j2q3dy9rc00vckv21m4wd29ijj63jannr02v5ad"; + }; + }; + + rtorrent-syntax-file = buildVimPluginFrom2Nix { + name = "rtorrent-syntax-file-2016-03-19"; + src = fetchFromGitHub { + owner = "ccarpita"; + repo = "rtorrent-syntax-file"; + rev = "885ca182c02bbbed4b62a3fcfe6fe62fa5b419ca"; + sha256 = "1vhvmwnwi6862cckl8dqr8pgy0inrr0c31lic89826yv7mfl9mbz"; + }; + }; + + rust-vim = buildVimPluginFrom2Nix { + name = "rust-vim-2018-09-09"; + src = fetchFromGitHub { + owner = "rust-lang"; + repo = "rust.vim"; + rev = "1eb6598a72ff2746118451147817c718e40b5769"; + sha256 = "114xhwn1bdykh6vzic4k3xfpmkm7myfhixxw98qbxsnb2i068wl5"; + }; + }; + + self = buildVimPluginFrom2Nix { + name = "self-2014-05-28"; + src = fetchFromGitHub { + owner = "megaannum"; + repo = "self"; + rev = "2ed666b547eddee6ae1fcc63babca4ba0b66a59f"; + sha256 = "1gcwn6i5i3msg7hrlzsnv1bs6pm4jz9cff8ppaz2xdj8xv9qy6fn"; + }; + }; + + shabadou-vim = buildVimPluginFrom2Nix { + name = "shabadou-vim-2016-07-19"; + src = fetchFromGitHub { + owner = "osyo-manga"; + repo = "shabadou.vim"; + rev = "7d4bfed1ea8985ae125df3d1403cc19e252443e1"; + sha256 = "1kvik1yf7yjg9jdmdw38yhkksxg0n3nry02banwik7wgjnpvg870"; + }; + }; + + sourcemap-vim = buildVimPluginFrom2Nix { + name = "sourcemap-vim-2012-09-19"; + src = fetchFromGitHub { + owner = "chikatoike"; + repo = "sourcemap.vim"; + rev = "0dd82d40faea2fdb0771067f46c01deb41610ba1"; + sha256 = "1gcgnynallz420911fdfm0ccbv3zs78p69nnh2ls1r4vlfp7g350"; + }; + }; + + Spacegray-vim = buildVimPluginFrom2Nix { + name = "Spacegray-vim-2018-06-21"; + src = fetchFromGitHub { + owner = "ajh17"; + repo = "Spacegray.vim"; + rev = "f9e5205319cbb5c598bbf02b16c3d05277817f81"; + sha256 = "1s32zf75ybqs9jjjvqk5z4x9a6lr43gjbwlgw8k01qf4lsxkzkn9"; + }; + }; + + spacevim = buildVimPluginFrom2Nix { + name = "spacevim-2018-03-29"; + src = fetchFromGitHub { + owner = "ctjhoa"; + repo = "spacevim"; + rev = "30142a518ba77feb22791b5cb2387d88b70c58f2"; + sha256 = "0m389cnpg17ca8s7vb9yrs40sxb56zg32lcpilnd63zfi7awgscg"; + }; + }; + + sparkup = buildVimPluginFrom2Nix { + name = "sparkup-2012-06-11"; + src = fetchFromGitHub { + owner = "chrisgeo"; + repo = "sparkup"; + rev = "6fbfceef890e705c47b42b27be743ffed6f9296e"; + sha256 = "17jgpvl879ik53rr3razfnbpfx63mzpp1rlvxxjsvvrk4g45dssm"; + }; + }; + + splice-vim = buildVimPluginFrom2Nix { + name = "splice-vim-2017-09-03"; + src = fetchFromGitHub { + owner = "sjl"; + repo = "splice.vim"; + rev = "b31cb25eea8a92a037e9da9a98b2e6147294c37d"; + sha256 = "0mqnrmkyms2z5lqy90cy076x3fr9xmd63962wd8n6n6mbin97ihx"; + }; + }; + + supertab = buildVimPluginFrom2Nix { + name = "supertab-2017-11-14"; + src = fetchFromGitHub { + owner = "ervandew"; + repo = "supertab"; + rev = "40fe711e088e2ab346738233dd5adbb1be355172"; + sha256 = "0l5labq68kyprv63k1q35hz5ly0dd06mf2z202mccnix4mlxf0db"; + }; + }; + + swift-vim = buildVimPluginFrom2Nix { + name = "swift-vim-2018-07-22"; + src = fetchFromGitHub { + owner = "keith"; + repo = "swift.vim"; + rev = "40d53b215fd455e4b7fd413eaf14d1a028a504ab"; + sha256 = "1lbxi0n5x5xnskfylbcpazch00lxbfhnc2h70x196yc4fhwz9153"; + }; + }; + + syntastic = buildVimPluginFrom2Nix { + name = "syntastic-2018-08-27"; + src = fetchFromGitHub { + owner = "scrooloose"; + repo = "syntastic"; + rev = "0295d8241db23e24b120e0360a899cb375793a1e"; + sha256 = "1fpfsc8snmkkbsjb4j1l872sgr840q73rdykr29w1q68q4m06vbc"; + }; + }; + + tabmerge = buildVimPluginFrom2Nix { + name = "tabmerge-2010-10-18"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "tabmerge"; + rev = "074e5f06f26e7108a0570071a0f938a821768c06"; + sha256 = "0prkyza1n49cdaslcr57w8zv15vw78mlqbzib2xipmawzjq02idq"; + }; + }; + + tabpagebuffer-vim = buildVimPluginFrom2Nix { + name = "tabpagebuffer-vim-2014-09-30"; + src = fetchFromGitHub { + owner = "shougo"; + repo = "tabpagebuffer.vim"; + rev = "4d95c3e6fa5ad887498f4cbe486c11e39d4a1fbc"; + sha256 = "1z6zlpzkhwy1p2pmx9qrwb91dp9v4yi8jrdvm1if2k79ij4sl08f"; + }; + }; + + tabular = buildVimPluginFrom2Nix { + name = "tabular-2016-05-04"; + src = fetchFromGitHub { + owner = "godlygeek"; + repo = "tabular"; + rev = "00e1e7fcdbc6d753e0bc8043e0d2546fa81bf367"; + sha256 = "185jpisk9hamcwb6aiavdzjdbbigzdra8f4mgs98r9cm9j448xkz"; + }; + }; + + tagbar = buildVimPluginFrom2Nix { + name = "tagbar-2017-12-17"; + src = fetchFromGitHub { + owner = "majutsushi"; + repo = "tagbar"; + rev = "387bbadda98e1376ff3871aa461b1f0abd4ece70"; + sha256 = "130rxvlkqzlqh09w6fpmq7x3b7s4s56qxly9m4jh6s2jrab1cxak"; + }; + }; + + taglist-vim = buildVimPluginFrom2Nix { + name = "taglist-vim-2010-10-18"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "taglist.vim"; + rev = "53041fbc45398a9af631a20657e109707a455339"; + sha256 = "07aa2gfc73lznyi7w7cybzanspza3p67cv5hxr21g43zhs5k9izd"; + }; + }; + + targets-vim = buildVimPluginFrom2Nix { + name = "targets-vim-2018-05-27"; + src = fetchFromGitHub { + owner = "wellle"; + repo = "targets.vim"; + rev = "c3042dc18acc0dfcee479310d3efc6aefe92db75"; + sha256 = "0shnlgwrxzrd0m3k6hnmr66i2l4zknp0pn7f71d2frx937gih34q"; + }; + }; + + tender-vim = buildVimPluginFrom2Nix { + name = "tender-vim-2017-03-14"; + src = fetchFromGitHub { + owner = "jacoborus"; + repo = "tender.vim"; + rev = "6b0497a59233b3e67fb528a498069eb1d24743f9"; + sha256 = "1iqijk7xq0g6p3j8jgzgrhqizw87fnfryx73iaqqx5iyq1k8i9mn"; + }; + }; + + tern_for_vim = buildVimPluginFrom2Nix { + name = "tern_for_vim-2017-11-27"; + src = fetchFromGitHub { + owner = "ternjs"; + repo = "tern_for_vim"; + rev = "3cffc28f280fc599d3f997b1c8c00ddc78d8fc21"; + sha256 = "0idzkc65lw9zg4xq60w2nnvdgbdhngqccqwh1bzkvkzlmr7s43cl"; + }; + }; + + thumbnail-vim = buildVimPluginFrom2Nix { + name = "thumbnail-vim-2017-04-24"; + src = fetchFromGitHub { + owner = "itchyny"; + repo = "thumbnail.vim"; + rev = "71cb5d48e59fc77149c1d1036ecd9e39f0b46a00"; + sha256 = "0b25n28ri6n5rrvgfynv8rm5pzzxpnrnj1l3647pf2fjxd2z2rv5"; + }; + }; + + tlib_vim = buildVimPluginFrom2Nix { + name = "tlib_vim-2018-04-08"; + src = fetchFromGitHub { + owner = "tomtom"; + repo = "tlib_vim"; + rev = "ced8f3ebe85b50da2ec0e6d593e6b2e8e6bd243b"; + sha256 = "08vvd1wpa9k5bid2hh279jjkir2c59ga3527qzinxngmlx8wsbhx"; + }; + }; + + tslime-vim = buildVimPluginFrom2Nix { + name = "tslime-vim-2018-07-23"; + src = fetchFromGitHub { + owner = "jgdavey"; + repo = "tslime.vim"; + rev = "28e9eba642a791c6a6b044433dce8e5451b26fb0"; + sha256 = "1y5xikryv6851d0rjk9c64agawshp5208mwym6ma9ngs7s3s1l4x"; + }; + }; + + tsuquyomi = buildVimPluginFrom2Nix { + name = "tsuquyomi-2018-08-03"; + src = fetchFromGitHub { + owner = "Quramy"; + repo = "tsuquyomi"; + rev = "05e6515f6d21545959ac4eb570c917e1d225b1f1"; + sha256 = "0hbd2d8zb86c8ncrrm4zyj92j523xay2lwk2k9arwacn8fj42hir"; + }; + }; + + typescript-vim = buildVimPluginFrom2Nix { + name = "typescript-vim-2018-08-15"; + src = fetchFromGitHub { + owner = "leafgarland"; + repo = "typescript-vim"; + rev = "db131b8cd42973ed26928e9e445c1a745a98cff8"; + sha256 = "1l7wbwv3xirl9nvjb2f693knxsif5qanjknd9lija8m7gnwagzm4"; + }; + }; + + ultisnips = buildVimPluginFrom2Nix { + name = "ultisnips-2018-04-30"; + src = fetchFromGitHub { + owner = "SirVer"; + repo = "ultisnips"; + rev = "6fdc3647f72e0a1f321ea6bd092ecd01f7c187ba"; + sha256 = "1zp3xcmxk6cn38zmxxy5s2wnw9djskwkmspq2s9vqliyhprf9sy3"; + }; + }; + + undotree = buildVimPluginFrom2Nix { + name = "undotree-2018-09-07"; + src = fetchFromGitHub { + owner = "mbbill"; + repo = "undotree"; + rev = "364c73dae83bbaa552fa901dbcb082be22f846f4"; + sha256 = "1swjgdgbr63a5xp9nlmcpa5f31r1jc9n4wqz4sgmhrcdc4xxq8ah"; + }; + }; + + unite-vim = buildVimPluginFrom2Nix { + name = "unite-vim-2018-08-06"; + src = fetchFromGitHub { + owner = "shougo"; + repo = "unite.vim"; + rev = "7ed231f2dbceb82b3ed81dc5ef999c94c2528586"; + sha256 = "0p2xfsyflds74lrpk14nb388nh2rc3hmqg3i9kgzxqns4i6w5s8v"; + }; + }; + + verilog_systemverilog-vim = buildVimPluginFrom2Nix { + name = "verilog_systemverilog-vim-2018-09-06"; + src = fetchFromGitHub { + owner = "vhda"; + repo = "verilog_systemverilog.vim"; + rev = "2cb0da6a325f19bf662c60c5363bb59e98442c33"; + sha256 = "1gyyaqj7assryaprxm9a3zcnappr3lvqmgphapa53qq6s6vmljw5"; + }; + }; + + vim = buildVimPluginFrom2Nix { + name = "vim-2018-09-09"; + src = fetchFromGitHub { + owner = "dracula"; + repo = "vim"; + rev = "fa16b1f1e04933aa9a28312e566d54040b8f4c3b"; + sha256 = "0v73f327gn0zpgpgl4f9pim35y4qmkrqgyh1zg2z5ivdvns5yyif"; + }; + }; + + vim-abolish = buildVimPluginFrom2Nix { + name = "vim-abolish-2018-08-02"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-abolish"; + rev = "40e8b973971beb5da279a499231464ae1d959c8b"; + sha256 = "0ibhd9d57cwb2kls99wmbyl49w7v2niwqrf3pp7191pj46157720"; + }; + }; + + vim-addon-actions = buildVimPluginFrom2Nix { + name = "vim-addon-actions-2018-01-18"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-actions"; + rev = "540cae09832ba6abf9fc63c55781bf86584c33ac"; + sha256 = "011w5k09i01r9x64j20qj0f7d057m9wki2m8l2wds47l57hr3vz6"; + }; + }; + + vim-addon-async = buildVimPluginFrom2Nix { + name = "vim-addon-async-2017-03-20"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-async"; + rev = "eca316a4480f68c2cb62128f3187dc7b2002afde"; + sha256 = "1lk8ma51dd0syi73vq5r4qk9cpy6cq3llizvh94hmxblfjpvrs7q"; + }; + }; + + vim-addon-background-cmd = buildVimPluginFrom2Nix { + name = "vim-addon-background-cmd-2015-12-11"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-background-cmd"; + rev = "abf2abf339652d2bc79da81f9d131edfe2755f5a"; + sha256 = "0csy68x686l3x5ancidxb5b6prg9k7ikybqzq3klx0gs5rmksfy4"; + }; + }; + + vim-addon-commenting = buildVimPluginFrom2Nix { + name = "vim-addon-commenting-2013-06-10"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-commenting"; + rev = "b7cf748ac1c9bf555cbd347589e3b7196030d20b"; + sha256 = "0alak8h33vada2ckb0v06y82qlib5mhyc2yswlv1rqh8ypzhq3mc"; + }; + }; + + vim-addon-completion = buildVimPluginFrom2Nix { + name = "vim-addon-completion-2015-02-10"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-completion"; + rev = "021c449a5ce1ce4ac0af5955e05b0279c1cc0e75"; + sha256 = "1ld059y2qwlc5bdfjm2p314s1qh31lxs54g944pw49r46s5nlslr"; + }; + }; + + vim-addon-errorformats = buildVimPluginFrom2Nix { + name = "vim-addon-errorformats-2014-11-05"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-errorformats"; + rev = "dcbb203ad5f56e47e75fdee35bc92e2ba69e1d28"; + sha256 = "159zqm69fxbxcv3b2y99g57bf20qrzsijcvb5rzy2njxah3049m1"; + }; + }; + + vim-addon-goto-thing-at-cursor = buildVimPluginFrom2Nix { + name = "vim-addon-goto-thing-at-cursor-2012-01-10"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-goto-thing-at-cursor"; + rev = "f052e094bdb351829bf72ae3435af9042e09a6e4"; + sha256 = "1ksm2b0j80zn8sz2y227bpcx4jsv76lwgr2gpgy2drlyqhn2vlv0"; + }; + }; + + vim-addon-local-vimrc = buildVimPluginFrom2Nix { + name = "vim-addon-local-vimrc-2015-03-19"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-local-vimrc"; + rev = "6a27f95b35befa70cd0d049329cd0920566c764b"; + sha256 = "0n8lwl1gyak149p7jpgm0qbmfj8hcg8hirx3dxdhizw0yc47ws7h"; + }; + }; + + vim-addon-manager = buildVimPluginFrom2Nix { + name = "vim-addon-manager-2018-07-27"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-manager"; + rev = "d9e865f3c2de5d9b7eabbc976f606cf1b89e29ea"; + sha256 = "0mgm2dqw8js9gajkrvm5n3k9m1grjxcrfc9xdzb3jxw1c0njdhcy"; + }; + }; + + vim-addon-mru = buildVimPluginFrom2Nix { + name = "vim-addon-mru-2013-08-08"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-mru"; + rev = "e41e39bd9d1bf78ccfd8d5e1bc05ae5e1026c2bb"; + sha256 = "0q6rxr9nrp63kidr3m3c2z5sda4g813pzshg0scxkjr8dxwhzdqm"; + }; + }; + + vim-addon-mw-utils = buildVimPluginFrom2Nix { + name = "vim-addon-mw-utils-2018-03-09"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-mw-utils"; + rev = "295862ba6be47ec3b11b6c85c10d982ffd9bc0b2"; + sha256 = "0ylvhmx0cnj2x38plwqlq4pqyqyxxhf4s08hknnl7qhrr5kd533f"; + }; + }; + + vim-addon-nix = buildVimPluginFrom2Nix { + name = "vim-addon-nix-2017-09-11"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-nix"; + rev = "3001a9db5f816dd7af11384f15415bddd146ef86"; + sha256 = "195z2yz09wirpqjpsha8x7qcr9is1q8qph4j0svws6qbqrkh8ryy"; + }; + }; + + vim-addon-other = buildVimPluginFrom2Nix { + name = "vim-addon-other-2014-07-15"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-other"; + rev = "f78720c9cb5bf871cabb13c7cbf94378dbf0163b"; + sha256 = "0cjz7mlyfkkncas4ss7rwxb0q38ls1qw1p15hac1imscscsvyjc6"; + }; + }; + + vim-addon-php-manual = buildVimPluginFrom2Nix { + name = "vim-addon-php-manual-2015-01-01"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-php-manual"; + rev = "5f9810dd1f6e9f36a45f637ae6260ccff09256ff"; + sha256 = "1kc67f12wccqdza069b75lpcbqp4kv4r23i4mfz0ihwif5mfnhir"; + }; + }; + + vim-addon-signs = buildVimPluginFrom2Nix { + name = "vim-addon-signs-2013-04-19"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-signs"; + rev = "17a49f293d18174ff09d1bfff5ba86e8eee8e8ae"; + sha256 = "0i4gfp30hmw1vqjl6zxjrgkca3ikdkcnjmma2mncjmcr6f59kjzy"; + }; + }; + + vim-addon-sql = buildVimPluginFrom2Nix { + name = "vim-addon-sql-2017-02-11"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-sql"; + rev = "048a139af36829fce670c8ff80d3aad927557ee6"; + sha256 = "0ihm157sby6csdwsnw2gwh3jmm3prm1mxwgkx2hsfwlmpb1vwwm3"; + }; + }; + + vim-addon-syntax-checker = buildVimPluginFrom2Nix { + name = "vim-addon-syntax-checker-2017-06-26"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-syntax-checker"; + rev = "739e5719b77c6aea3299c27fc1f4238ac54a8344"; + sha256 = "1rcn1ps06156nyglvxg6m7pn3vhvmnv5ad6kidp59hggyr5332i9"; + }; + }; + + vim-addon-toggle-buffer = buildVimPluginFrom2Nix { + name = "vim-addon-toggle-buffer-2012-01-13"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-toggle-buffer"; + rev = "a1b38b9c5709cba666ed2d84ef06548f675c6b0b"; + sha256 = "1xq38kfdm36c34ln66znw841q797w5gm8bpq1x64bsf2h6n3ml03"; + }; + }; + + vim-addon-xdebug = buildVimPluginFrom2Nix { + name = "vim-addon-xdebug-2014-08-29"; + src = fetchFromGitHub { + owner = "MarcWeber"; + repo = "vim-addon-xdebug"; + rev = "45f26407305b4ce6f8f5f37d2b5e6e4354104172"; + sha256 = "1i64ppdfp2qqq7vw1jf160mj4ikc04v39iazdab83xmiqjsh8ixw"; + }; + }; + + vim-airline = buildVimPluginFrom2Nix { + name = "vim-airline-2018-09-10"; + src = fetchFromGitHub { + owner = "vim-airline"; + repo = "vim-airline"; + rev = "da8035d8a83c85197d27a258465d8373ec6d5cd4"; + sha256 = "1c2lh1w6qjgkian7ml5krwfc2m3g79bpz8rvpk1c93bn9zfz82h7"; + }; + }; + + vim-airline-themes = buildVimPluginFrom2Nix { + name = "vim-airline-themes-2018-09-05"; + src = fetchFromGitHub { + owner = "vim-airline"; + repo = "vim-airline-themes"; + rev = "725789c110fbab52f8c18021f9d043839d7e31ed"; + sha256 = "15k5s8yysnvm0swfi27g2yhrnkb8kzvswb58k1jbzb65nwdw139z"; + }; + }; + + vim-android = buildVimPluginFrom2Nix { + name = "vim-android-2018-07-31"; + src = fetchFromGitHub { + owner = "hsanson"; + repo = "vim-android"; + rev = "c5647d65b4413c1a91712a80044e034aa705b858"; + sha256 = "0b70m6yv1w103zdya966r0632q7djmfcp78mw19y9sca0p2d0gm9"; + }; + }; + + vim-anzu = buildVimPluginFrom2Nix { + name = "vim-anzu-2018-02-28"; + src = fetchFromGitHub { + owner = "osyo-manga"; + repo = "vim-anzu"; + rev = "45b60d37cb9de90f6c89f7ddeacb7ae430ebcae2"; + sha256 = "1p5lh4xsv9xsl8kx0h1bg6iy0if4a69hvairq69p50ffka83pv00"; + }; + }; + + vim-auto-save = buildVimPluginFrom2Nix { + name = "vim-auto-save-2017-11-08"; + src = fetchFromGitHub { + owner = "907th"; + repo = "vim-auto-save"; + rev = "66643afb55a1fcd3a9b4336f868f58da45bff397"; + sha256 = "1qnsj520j2hm6znpqpdqmz11vw45avgj8g9djx3alqbnab8ryw0p"; + }; + }; + + vim-autoformat = buildVimPluginFrom2Nix { + name = "vim-autoformat-2018-09-08"; + src = fetchFromGitHub { + owner = "Chiel92"; + repo = "vim-autoformat"; + rev = "98233b8f353fa5d237e89859a8f1b91c14c21397"; + sha256 = "18xb803vx11wx9yhxvp6aq8kh0vbidxmwhwrjfcslrw0k1zis3yl"; + }; + }; + + vim-bazel = buildVimPluginFrom2Nix { + name = "vim-bazel-2018-01-11"; + src = fetchFromGitHub { + owner = "bazelbuild"; + repo = "vim-bazel"; + rev = "ecafb17d5d1d3756e5ac0bd9f4812a450b8c91a3"; + sha256 = "0ixhx9ssfygjy2v2ss02w28rcjxnvhj0caffj32cv3snwnpcz6fy"; + }; + }; + + vim-buffergator = buildVimPluginFrom2Nix { + name = "vim-buffergator-2018-05-02"; + src = fetchFromGitHub { + owner = "jeetsukumaran"; + repo = "vim-buffergator"; + rev = "947b60dca4d4fc6a041a6ec84b17ca6736d1b916"; + sha256 = "0g7ymflzfdsj5793s32gc83bidqys5dxmw455viwpqgmgjxnar5c"; + }; + }; + + vim-bufferline = buildVimPluginFrom2Nix { + name = "vim-bufferline-2016-02-09"; + src = fetchFromGitHub { + owner = "bling"; + repo = "vim-bufferline"; + rev = "651fd010aa9613a4b8636a4af8a2db0d22800262"; + sha256 = "0zls47a3v8dv3h63drbak1mxf3j2x3scvclk7bjwzlk2yp447das"; + }; + }; + + vim-closetag = buildVimPluginFrom2Nix { + name = "vim-closetag-2018-09-03"; + src = fetchFromGitHub { + owner = "alvan"; + repo = "vim-closetag"; + rev = "8c71d524d98be4f3c6c1e4ff6ddf6b9f422220bb"; + sha256 = "1w42qzcw33akycgqj8v60l2yfilhhy9j0zw6rifa66d58xaiv6jy"; + }; + }; + + vim-codefmt = buildVimPluginFrom2Nix { + name = "vim-codefmt-2018-08-17"; + src = fetchFromGitHub { + owner = "google"; + repo = "vim-codefmt"; + rev = "18fe8fbd7a6c0875f922aa682f5dec81b9f4e554"; + sha256 = "0fzhwxcg4yx6zm1ndzp4vmrsi4za9kxymqbrrsj9zk46lm4bv74h"; + }; + }; + + vim-coffee-script = buildVimPluginFrom2Nix { + name = "vim-coffee-script-2018-02-27"; + src = fetchFromGitHub { + owner = "kchmck"; + repo = "vim-coffee-script"; + rev = "9e3b4de2a476caeb6ff21b5da20966d7c67a98bb"; + sha256 = "1yzhyi12r508r2yjkzbcnddv3q4whjf3kchp23xs0snhwd9b981x"; + }; + }; + + vim-colors-solarized = buildVimPluginFrom2Nix { + name = "vim-colors-solarized-2011-05-09"; + src = fetchFromGitHub { + owner = "altercation"; + repo = "vim-colors-solarized"; + rev = "528a59f26d12278698bb946f8fb82a63711eec21"; + sha256 = "05d3lmd1shyagvr3jygqghxd3k8a4vp32723fvxdm57fdrlyzcm1"; + }; + }; + + vim-colorschemes = buildVimPluginFrom2Nix { + name = "vim-colorschemes-2017-08-22"; + src = fetchFromGitHub { + owner = "flazz"; + repo = "vim-colorschemes"; + rev = "eab315701f4627967fd62582eefc4e37a3745786"; + sha256 = "12jfqfs6lqd6jijxrdx3k76bzxrh9517zwczb73qjaqbg286fh5k"; + }; + }; + + vim-colorstepper = buildVimPluginFrom2Nix { + name = "vim-colorstepper-2016-01-28"; + src = fetchFromGitHub { + owner = "jonbri"; + repo = "vim-colorstepper"; + rev = "f23ba0d995d41508a2dc9471cf31d3d01a4b5f05"; + sha256 = "05ykxn0gmh8liz0zv5hb8df1ajggxp88izq3825m0yb3ma3k1jqs"; + }; + }; + + vim-commentary = buildVimPluginFrom2Nix { + name = "vim-commentary-2018-07-27"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-commentary"; + rev = "141d9d32a9fb58fe474fcc89cd7221eb2dd57b3a"; + sha256 = "0nncs32ayfhr557aiynq7b0sc7rxqwv7xanram53x1wvmfy14zf0"; + }; + }; + + vim-css-color = buildVimPluginFrom2Nix { + name = "vim-css-color-2018-08-11"; + src = fetchFromGitHub { + owner = "ap"; + repo = "vim-css-color"; + rev = "22211783b5bcc052748c80fad7d2916b595da09c"; + sha256 = "12z965xij9393m6jkwkn32ykfgnjqjdhy7571cihmvhknvhd0dsk"; + }; + }; + + vim-cursorword = buildVimPluginFrom2Nix { + name = "vim-cursorword-2017-10-19"; + src = fetchFromGitHub { + owner = "itchyny"; + repo = "vim-cursorword"; + rev = "4878d6185b99131c5f610cc6ad0e223439ac4601"; + sha256 = "170nf0w7i5k3cr72dkvraq2p0lzsvb3cmdvslyz7cmxnz611n6bf"; + }; + }; + + vim-cute-python = buildVimPluginFrom2Nix { + name = "vim-cute-python-2016-04-04"; + src = fetchFromGitHub { + owner = "ehamberg"; + repo = "vim-cute-python"; + rev = "d7a6163f794500447242df2bedbe20bd751b92da"; + sha256 = "1jrfd6z84cdzn3yxdfp0xfxygscq7s8kbzxk37hf9cf5pl9ln0qf"; + }; + }; + + vim-devicons = buildVimPluginFrom2Nix { + name = "vim-devicons-2018-06-21"; + src = fetchFromGitHub { + owner = "ryanoasis"; + repo = "vim-devicons"; + rev = "ea5bbf0e2a960965accfa50a516773406a5b6b26"; + sha256 = "1v365j4an1k82gk06ikgqy2dw0ir80kj0svs1fymgklc117xgqsg"; + }; + }; + + vim-dirdiff = buildVimPluginFrom2Nix { + name = "vim-dirdiff-2018-01-31"; + src = fetchFromGitHub { + owner = "will133"; + repo = "vim-dirdiff"; + rev = "b5a3d59bfbeb5cef7dbadbe69c455b470988b58c"; + sha256 = "16hc88k00xa757k0h53r1sbqwxdxdy0118yl2vsigd6rqk474nw1"; + }; + }; + + vim-dirvish = buildVimPluginFrom2Nix { + name = "vim-dirvish-2018-06-20"; + src = fetchFromGitHub { + owner = "justinmk"; + repo = "vim-dirvish"; + rev = "c273c462d774ed2db5f6d382265cf5897e554de0"; + sha256 = "1fv1kk7y280kx8c0iy9rg43i8gr0h8308al8sm85qvmfx5fcbi9d"; + }; + }; + + vim-dispatch = buildVimPluginFrom2Nix { + name = "vim-dispatch-2018-08-20"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-dispatch"; + rev = "4566b8892715361f9952fa4c29c05035fdede09d"; + sha256 = "1v1wmvasymllvjgg8kfh8zag99mlbaf366v9byvp8fpskzaza1nz"; + }; + }; + + vim-docbk = buildVimPluginFrom2Nix { + name = "vim-docbk-2015-04-01"; + src = fetchFromGitHub { + owner = "jhradilek"; + repo = "vim-docbk"; + rev = "6ac0346ce96dbefe982b9e765a81c072997f2e9e"; + sha256 = "1jnx39m152hf9j620ygagaydg6h8m8gxkr1fmxj6kgqf71jr0n9d"; + }; + }; + + vim-easy-align = buildVimPluginFrom2Nix { + name = "vim-easy-align-2017-06-03"; + src = fetchFromGitHub { + owner = "junegunn"; + repo = "vim-easy-align"; + rev = "1cd724dc239c3a0f7a12e0fac85945cc3dbe07b0"; + sha256 = "16yis2wlgi8v0h04hiqmnkm9qrby4kbc2fvkw4szfsbg5m3qx0fc"; + }; + }; + + vim-easygit = buildVimPluginFrom2Nix { + name = "vim-easygit-2018-07-08"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "vim-easygit"; + rev = "9770370a35838f70eda91d0c3006d0563ccc8d2a"; + sha256 = "1a42s0nymakz20rjrpwmiqpnlndrkdakzbm53aclzcs61i9zq2k8"; + }; + }; + + vim-easymotion = buildVimPluginFrom2Nix { + name = "vim-easymotion-2018-06-04"; + src = fetchFromGitHub { + owner = "easymotion"; + repo = "vim-easymotion"; + rev = "1a0244c90c3ff46219cf9597bb13662be4232407"; + sha256 = "1gsfn4fgivfg821wmnrdzpmqdimjkvkqi3gwr0nwf07ygjbr2csy"; + }; + }; + + vim-easytags = buildVimPluginFrom2Nix { + name = "vim-easytags-2015-07-01"; + src = fetchFromGitHub { + owner = "xolox"; + repo = "vim-easytags"; + rev = "72a8753b5d0a951e547c51b13633f680a95b5483"; + sha256 = "0i8ha1fa5d860b1mi0xp8kwsgb0b9vbzcg1bldzv6s5xd9yyi12i"; + }; + }; + + vim-eighties = buildVimPluginFrom2Nix { + name = "vim-eighties-2016-12-15"; + src = fetchFromGitHub { + owner = "justincampbell"; + repo = "vim-eighties"; + rev = "1a6ea42ead1e31524ec94cfefb6afc1d8dacd170"; + sha256 = "1yh1kny28c7f5qm52y7xd5aj4mycksfb0x1zvcb37c73ycdxc1v2"; + }; + }; + + vim-elixir = buildVimPluginFrom2Nix { + name = "vim-elixir-2018-08-17"; + src = fetchFromGitHub { + owner = "elixir-lang"; + repo = "vim-elixir"; + rev = "0a847f0faed5ba2d94bb3d51f355c50f37ba025b"; + sha256 = "1jl85wpgywhcvhgw02y8zpvqf0glr4i8522kxpvhsiacb1v1xh04"; + }; + }; + + vim-eunuch = buildVimPluginFrom2Nix { + name = "vim-eunuch-2018-09-09"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-eunuch"; + rev = "10da325fb032a1acfa9222d273459f53bad30ba4"; + sha256 = "125n4amz3vmc83yv76vidsnma5w2braa69dcpj858ahnzhh329qj"; + }; + }; + + vim-expand-region = buildVimPluginFrom2Nix { + name = "vim-expand-region-2013-08-19"; + src = fetchFromGitHub { + owner = "terryma"; + repo = "vim-expand-region"; + rev = "966513543de0ddc2d673b5528a056269e7917276"; + sha256 = "0l30wjlk4vxr16f1njnvf8aw9yg9p9jisvcxbcg3znsq5q8ix6zv"; + }; + }; + + vim-extradite = buildVimPluginFrom2Nix { + name = "vim-extradite-2015-09-22"; + src = fetchFromGitHub { + owner = "int3"; + repo = "vim-extradite"; + rev = "52326f6d333cdbb9e9c6d6772af87f4f39c00526"; + sha256 = "0c89i0spvdm9vi65q15qcmsfmwa9rds2wmaq1kf6s7q7ywvs6w8i"; + }; + }; + + vim-fireplace = buildVimPluginFrom2Nix { + name = "vim-fireplace-2018-06-01"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-fireplace"; + rev = "1ef0f0726cadd96547a5f79103b66339f170da02"; + sha256 = "0ihhd34bl98xssa602386ji013pjj6xnkgww3y2wg73sx2nk6qc4"; + }; + }; + + vim-flagship = buildVimPluginFrom2Nix { + name = "vim-flagship-2018-08-15"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-flagship"; + rev = "66abd2fc519f4339ec751874279c14da7833dd99"; + sha256 = "0ijfa076a5jr6gi11j2zcgh5c7kj0vlwipzk1myjc1a77pss7nlg"; + }; + }; + + vim-ft-diff_fold = buildVimPluginFrom2Nix { + name = "vim-ft-diff_fold-2013-02-10"; + src = fetchFromGitHub { + owner = "thinca"; + repo = "vim-ft-diff_fold"; + rev = "89771dffd3682ef82a4b3b3e9c971b9909f08e87"; + sha256 = "0bk95cxkfzamlgv1x2jb1bnfas2pmvvqgpn5fvxddf0andm8sfma"; + }; + }; + + vim-fugitive = buildVimPluginFrom2Nix { + name = "vim-fugitive-2018-09-09"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-fugitive"; + rev = "d4fb2a2f5c2023f477beae6aef47cf0457351e6e"; + sha256 = "1m2pa29rf44ykmiy9za511v1cla8kb071yly7h2yyfmw7600swwq"; + }; + }; + + vim-ghost = buildVimPluginFrom2Nix { + name = "vim-ghost-2018-08-23"; + src = fetchFromGitHub { + owner = "raghur"; + repo = "vim-ghost"; + rev = "666a76c0783270eeb1ac1e0027df6f801a067bfd"; + sha256 = "1c5jyipcj4hi703dcdim1123p2yp4h67ci4f9kgaz9h65lmz4xn5"; + }; + }; + + vim-gista = buildVimPluginFrom2Nix { + name = "vim-gista-2017-02-20"; + src = fetchFromGitHub { + owner = "lambdalisue"; + repo = "vim-gista"; + rev = "b6cd41d0eb480cd79e84f3da3703613d0cf94a6c"; + sha256 = "0bkzbppd3jdci4yvifb4sh05q20qn8cr3j9kqhxyc703s0l0lk2s"; + }; + }; + + vim-gitbranch = buildVimPluginFrom2Nix { + name = "vim-gitbranch-2017-05-27"; + src = fetchFromGitHub { + owner = "itchyny"; + repo = "vim-gitbranch"; + rev = "8118dc1cdd387bd609852be4bf350360ce881193"; + sha256 = "01gvd96mnzfc5s0951zzq122birg5svnximkldgb9kv5bmsnmh3j"; + }; + }; + + vim-gitgutter = buildVimPluginFrom2Nix { + name = "vim-gitgutter-2018-08-15"; + src = fetchFromGitHub { + owner = "airblade"; + repo = "vim-gitgutter"; + rev = "50a7062909d91a290fae04219887b1b45f3138db"; + sha256 = "1bgpy85dxvn40ybzxih25gysy941jvylxm0fmkd5qpwkf7xm26wq"; + }; + }; + + vim-github-dashboard = buildVimPluginFrom2Nix { + name = "vim-github-dashboard-2018-09-03"; + src = fetchFromGitHub { + owner = "junegunn"; + repo = "vim-github-dashboard"; + rev = "8012a2016a9e39a50081c9d5db2deb09ae4a6010"; + sha256 = "0jkr6mz5zcpbyswmiyprcbm8l93lkg5sr46r8kyds1n2vz19cf7x"; + }; + }; + + vim-go = buildVimPluginFrom2Nix { + name = "vim-go-2018-09-10"; + src = fetchFromGitHub { + owner = "fatih"; + repo = "vim-go"; + rev = "5b9058e1232786c682be79b8a00510d3bd63eba9"; + sha256 = "14jcjdq48cnpdvp6k2lanr1chvkgky7xnz8zbcqhw2ma27zy16jf"; + }; + }; + + vim-grammarous = buildVimPluginFrom2Nix { + name = "vim-grammarous-2018-08-05"; + src = fetchFromGitHub { + owner = "rhysd"; + repo = "vim-grammarous"; + rev = "d52086d0f99e8008be9fa717bfaa0ee028f09e29"; + sha256 = "1p48p2ml284ssylnd6dr7dwb5kpq6arkfzg0d8y94317cmzagpkx"; + }; + }; + + vim-grepper = buildVimPluginFrom2Nix { + name = "vim-grepper-2018-09-10"; + src = fetchFromGitHub { + owner = "mhinz"; + repo = "vim-grepper"; + rev = "f61a745c1e19c80427a251f556f28fc31e962f6d"; + sha256 = "0l465qpphyi2c53hfwhc6fvj1s7vs2yc2l2spw387av6yqw83m9g"; + }; + }; + + vim-gutentags = buildVimPluginFrom2Nix { + name = "vim-gutentags-2018-06-13"; + src = fetchFromGitHub { + owner = "ludovicchabant"; + repo = "vim-gutentags"; + rev = "b1eb744786ec3e55c1c8ed8ab3221157b426f62e"; + sha256 = "0bx690n6zn28bzw99sis1q177x3s4yzdh6avsv49qpwwdg73s3c4"; + }; + }; + + vim-hardtime = buildVimPluginFrom2Nix { + name = "vim-hardtime-2017-03-31"; + src = fetchFromGitHub { + owner = "takac"; + repo = "vim-hardtime"; + rev = "d9128568afa62947b7ac8f12c22d88e3de526a6b"; + sha256 = "097wzfh4n4fnsq2gx4hbmyr731ciky8qcai5aiyh2baybvwshmr5"; + }; + }; + + vim-haskellconceal = buildVimPluginFrom2Nix { + name = "vim-haskellconceal-2017-06-15"; + src = fetchFromGitHub { + owner = "twinside"; + repo = "vim-haskellconceal"; + rev = "802f82a5afee56e9e1251e6f756104a3bd114234"; + sha256 = "1kh6853hi4rgl4z1xs8kz9l1q9w7lh0r42y2m0rabfpr6yh3091r"; + }; + }; + + vim-haskellConcealPlus = buildVimPluginFrom2Nix { + name = "vim-haskellConcealPlus-2018-08-07"; + src = fetchFromGitHub { + owner = "enomsg"; + repo = "vim-haskellConcealPlus"; + rev = "12608ecab20c3eda9a89a55931397b5e020f38a4"; + sha256 = "0i75casdf20l22s1p669nfk67f10d6ry0i76bbwbn0anq66hn7n0"; + }; + }; + + vim-hdevtools = buildVimPluginFrom2Nix { + name = "vim-hdevtools-2017-03-11"; + src = fetchFromGitHub { + owner = "bitc"; + repo = "vim-hdevtools"; + rev = "4ffdace7002915cb10d663a2c56386286c5b8e37"; + sha256 = "0s7qd72962sc56j8xzpzikjs9k5s89d5p0j541abl8zm0mavmyka"; + }; + }; + + vim-hier = buildVimPluginFrom2Nix { + name = "vim-hier-2011-08-27"; + src = fetchFromGitHub { + owner = "jceb"; + repo = "vim-hier"; + rev = "0b8c365263551a67404ebd7e528c55e17c1d3de7"; + sha256 = "118pd9sx1bl9vfr89xrf536hfx4l162a43a1qpwpkqxzb9a3ca7n"; + }; + }; + + vim-highlightedyank = buildVimPluginFrom2Nix { + name = "vim-highlightedyank-2018-06-01"; + src = fetchFromGitHub { + owner = "machakann"; + repo = "vim-highlightedyank"; + rev = "eafae05916e670da8bc99e44b1534cd8c7f87c7a"; + sha256 = "1z6xjb9244fgnhmw21m7y3bd9vs9gvxbb9ig73iwy0ny886hjlnk"; + }; + }; + + vim-hindent = buildVimPluginFrom2Nix { + name = "vim-hindent-2018-07-31"; + src = fetchFromGitHub { + owner = "alx741"; + repo = "vim-hindent"; + rev = "f8e84c199fd00a3ccaf5bbbc97786bde9a4faa13"; + sha256 = "1y4nnz38zal1ffs5n751dn9p9apk8q7pq3cw79r5z6fsdp942ai6"; + }; + }; + + vim-hoogle = buildVimPluginFrom2Nix { + name = "vim-hoogle-2018-03-04"; + src = fetchFromGitHub { + owner = "Twinside"; + repo = "vim-hoogle"; + rev = "871d104c92e33cb238506f2805f1652561978cc8"; + sha256 = "17qvi57g72ijgk7nczczli3kcphvdf625fzqbqcmqpsawgvfd07n"; + }; + }; + + vim-iced-coffee-script = buildVimPluginFrom2Nix { + name = "vim-iced-coffee-script-2013-12-26"; + src = fetchFromGitHub { + owner = "noc7c9"; + repo = "vim-iced-coffee-script"; + rev = "e42e0775fa4b1f8840c55cd36ac3d1cedbc1dea2"; + sha256 = "14yfirny359rlrr082il2ys3hxiyrbbk794rdxrs2lasjy8rb1f7"; + }; + }; + + vim-indent-guides = buildVimPluginFrom2Nix { + name = "vim-indent-guides-2018-05-14"; + src = fetchFromGitHub { + owner = "nathanaelkane"; + repo = "vim-indent-guides"; + rev = "54d889a63716ee2f1818aa2ec5082db47147147b"; + sha256 = "0ahlbjv2ibhhnf9zqn85b2sh3wf9l0kmg2qmavz3z5fmf8sqljj2"; + }; + }; + + vim-indent-object = buildVimPluginFrom2Nix { + name = "vim-indent-object-2018-04-08"; + src = fetchFromGitHub { + owner = "michaeljsmith"; + repo = "vim-indent-object"; + rev = "5c5b24c959478929b54a9e831a8e2e651a465965"; + sha256 = "1kmwnz0jxjkvfzy06r7r73pcxfcyjp8p8m2d6qrhjfvzidgfhw19"; + }; + }; + + vim-ipython = buildVimPluginFrom2Nix { + name = "vim-ipython-2015-06-23"; + src = fetchFromGitHub { + owner = "ivanov"; + repo = "vim-ipython"; + rev = "42499f094b805b90b683afa5009cee99abd0bb75"; + sha256 = "10wpfvfs8yv1bvzra4d5zy5glp62gbalpayxx7mkalhr2ccppy3x"; + }; + }; + + vim-isort = buildVimPluginFrom2Nix { + name = "vim-isort-2018-08-22"; + src = fetchFromGitHub { + owner = "fisadev"; + repo = "vim-isort"; + rev = "2fbab3401b7f81ac7f629e34e4f40a7e52934a99"; + sha256 = "09vq27jqmzp01qg5zssxcr93nmhly7cnc728qa4ivvmqkgg4myz1"; + }; + }; + + vim-jade = buildVimPluginFrom2Nix { + name = "vim-jade-2018-09-10"; + src = fetchFromGitHub { + owner = "digitaltoad"; + repo = "vim-jade"; + rev = "3f341b48e46a84891e19d449a5e336bcfc5a57a0"; + sha256 = "15gpb1a9d80gz8nzgl0w6wpnlxnrxd4qra2xj56jmmywsabkvqxk"; + }; + }; + + vim-javacomplete2 = buildVimPluginFrom2Nix { + name = "vim-javacomplete2-2018-08-20"; + src = fetchFromGitHub { + owner = "artur-shaik"; + repo = "vim-javacomplete2"; + rev = "2567a4f3ba2b1b902fd85ca24726aba3bf61aaa5"; + sha256 = "17mlip2mxv9sj2pxmj3clb7ax6m545pa5ynbr80vxww99537gxpr"; + }; + }; + + vim-javascript = buildVimPluginFrom2Nix { + name = "vim-javascript-2018-08-29"; + src = fetchFromGitHub { + owner = "pangloss"; + repo = "vim-javascript"; + rev = "dd84369d731bcb8feee0901cbb9b63a2b219bf28"; + sha256 = "1ca0dd4niy0lkdslgzfjp8pbr7szx6mgzax451r1c479dkmhh4cl"; + }; + }; + + vim-jinja = buildVimPluginFrom2Nix { + name = "vim-jinja-2016-11-16"; + src = fetchFromGitHub { + owner = "lepture"; + repo = "vim-jinja"; + rev = "8d330a7aaf0763d080dc82204b4aaba6ac0605c6"; + sha256 = "1n62ga02rcj7jjgzvwr46pckj59dc1zqahjgampjcwdd8vf4mg3q"; + }; + }; + + vim-jsbeautify = buildVimPluginFrom2Nix { + name = "vim-jsbeautify-2018-01-31"; + src = fetchFromGitHub { + owner = "maksimr"; + repo = "vim-jsbeautify"; + rev = "7a55bffa7d87e4f1ed11650e56a1361779b39624"; + sha256 = "01jvc3nkvmhw9n7m9x96ax1ndzw78ryjmgrvkqb7gja1xb8i8jqq"; + fetchSubmodules = true; + }; + }; + + vim-jsdoc = buildVimPluginFrom2Nix { + name = "vim-jsdoc-2018-05-05"; + src = fetchFromGitHub { + owner = "heavenshell"; + repo = "vim-jsdoc"; + rev = "5ef086789f5ac431d1d5aab53e771f00f1c25503"; + sha256 = "0f0dbcvbmha2nfadvf27crxkkxc1ps1inss5n66vy1p5bffv0bpm"; + }; + }; + + vim-json = buildVimPluginFrom2Nix { + name = "vim-json-2018-01-10"; + src = fetchFromGitHub { + owner = "elzr"; + repo = "vim-json"; + rev = "3727f089410e23ae113be6222e8a08dd2613ecf2"; + sha256 = "1c19pqrys45pzflj5jyrm4q6hcvs977lv6qsfvbnk7nm4skxrqp1"; + }; + }; + + vim-jsonnet = buildVimPluginFrom2Nix { + name = "vim-jsonnet-2018-04-11"; + src = fetchFromGitHub { + owner = "google"; + repo = "vim-jsonnet"; + rev = "1425166887329363381194adc457b02b663b1354"; + sha256 = "0kkpvp1r06l3glhgw4wv3ihqisjhs5m0x7mxgy388hy4r73fx08j"; + }; + }; + + vim-lastplace = buildVimPluginFrom2Nix { + name = "vim-lastplace-2017-06-13"; + src = fetchFromGitHub { + owner = "farmergreg"; + repo = "vim-lastplace"; + rev = "102b68348eff0d639ce88c5094dab0fdbe4f7c55"; + sha256 = "1d0mjjyissjvl80wgmn7z1gsjs3fhk0vnmx84l9q7g04ql4l9pja"; + }; + }; + + vim-latex-live-preview = buildVimPluginFrom2Nix { + name = "vim-latex-live-preview-2017-11-09"; + src = fetchFromGitHub { + owner = "xuhdev"; + repo = "vim-latex-live-preview"; + rev = "9855f084d0751dbd40a8cb56518f239e5eb1a624"; + sha256 = "0linzdq2zrz5yfpqa51n2i9vrwr0x2r93ckx6n1ngyiw535ddafy"; + }; + }; + + vim-lawrencium = buildVimPluginFrom2Nix { + name = "vim-lawrencium-2017-01-11"; + src = fetchFromGitHub { + owner = "ludovicchabant"; + repo = "vim-lawrencium"; + rev = "88077183e1f5a9a1f741aeab7a1374cfed9e917f"; + sha256 = "0z31v93wjycq4lqvbl1jzxi7i5i1vl919m4dyyzphybcqrjjpnab"; + }; + }; + + vim-leader-guide = buildVimPluginFrom2Nix { + name = "vim-leader-guide-2017-03-18"; + src = fetchFromGitHub { + owner = "hecal3"; + repo = "vim-leader-guide"; + rev = "6ac8c663e65c9c0ded70417b84f66ee59457893e"; + sha256 = "1hqha3ig40ls15bnb10xpbl91swn0gxqnhmz5frkvvdzj4wq55fw"; + }; + }; + + vim-ledger = buildVimPluginFrom2Nix { + name = "vim-ledger-2017-12-12"; + src = fetchFromGitHub { + owner = "ledger"; + repo = "vim-ledger"; + rev = "6eb3bb21aa979cc295d0480b2179938c12b33d0d"; + sha256 = "0rbwyaanvl2bqk8xm4kq8fkv8y92lpf9xx5n8gw54iij7xxhnj01"; + }; + }; + + vim-localvimrc = buildVimPluginFrom2Nix { + name = "vim-localvimrc-2018-08-21"; + src = fetchFromGitHub { + owner = "embear"; + repo = "vim-localvimrc"; + rev = "7f8fbfedaaf217488bbc9ae3fbd2539a5d825623"; + sha256 = "1q12lxblymv0j594161lpy5a6dlsg4510gmsdf2p70kbd8jfp1ar"; + }; + }; + + vim-logreview = buildVimPluginFrom2Nix { + name = "vim-logreview-2017-07-08"; + src = fetchFromGitHub { + owner = "andreshazard"; + repo = "vim-logreview"; + rev = "b7b66ab338e904127d796af49235b8c29742f18f"; + sha256 = "09lyymq0f3ybqdzhbpia7b0wcjbcyg5nkqd72qk8jkvc42da2af3"; + }; + }; + + vim-maktaba = buildVimPluginFrom2Nix { + name = "vim-maktaba-2018-05-07"; + src = fetchFromGitHub { + owner = "google"; + repo = "vim-maktaba"; + rev = "ffdb1a5a9921f7fd722c84d0f60e166f9916b67d"; + sha256 = "1cmhgd9xvx09l6ypks09gxqs1vad1bddinf4cx2jmd516bv8qss3"; + }; + }; + + vim-markdown = buildVimPluginFrom2Nix { + name = "vim-markdown-2018-07-30"; + src = fetchFromGitHub { + owner = "plasticboy"; + repo = "vim-markdown"; + rev = "f19506b1bfe5e60c39581dd53f6913a09385f5dd"; + sha256 = "0x0lsynmwg41fq8zf7149a2anj2b7fnm0d7b0vqnj3dwdwrjj5a1"; + }; + }; + + vim-misc = buildVimPluginFrom2Nix { + name = "vim-misc-2015-05-21"; + src = fetchFromGitHub { + owner = "xolox"; + repo = "vim-misc"; + rev = "3e6b8fb6f03f13434543ce1f5d24f6a5d3f34f0b"; + sha256 = "0rd9788dyfc58py50xbiaz5j7nphyvf3rpp3yal7yq2dhf0awwfi"; + }; + }; + + vim-multiple-cursors = buildVimPluginFrom2Nix { + name = "vim-multiple-cursors-2018-08-10"; + src = fetchFromGitHub { + owner = "terryma"; + repo = "vim-multiple-cursors"; + rev = "dd9289af03abafa76b28c503e20747ff7d7d89e5"; + sha256 = "082y4xsvsq2psllds7bncshzjsvh48l4200mri9vkv3f5mydz985"; + }; + }; + + vim-nerdtree-tabs = buildVimPluginFrom2Nix { + name = "vim-nerdtree-tabs-2018-05-05"; + src = fetchFromGitHub { + owner = "jistr"; + repo = "vim-nerdtree-tabs"; + rev = "5fc6c6857028a07e8fe50f0adef28fb20218776b"; + sha256 = "051m4jb8jcc9rbafp995hmf4q6zn07bwh7anra6k1cr14i9lasaa"; + }; + }; + + vim-niceblock = buildVimPluginFrom2Nix { + name = "vim-niceblock-2018-09-06"; + src = fetchFromGitHub { + owner = "kana"; + repo = "vim-niceblock"; + rev = "9302f527eefc0fde8df983cbb9710ad52c4213b5"; + sha256 = "1d0rx7s10jl1q9y5s4235imizbyxrgkm4dxh5ankcr8s617l7mz2"; + }; + }; + + vim-nix = buildVimPluginFrom2Nix { + name = "vim-nix-2018-08-27"; + src = fetchFromGitHub { + owner = "LnL7"; + repo = "vim-nix"; + rev = "be0c6bb409732b79cc86c177ca378b0b334e1efe"; + sha256 = "1ivkwlm6lz43xk1m7aii0bgn2p3225dixck0qyhxw4zxhp2xiz06"; + }; + }; + + vim-operator-replace = buildVimPluginFrom2Nix { + name = "vim-operator-replace-2015-02-24"; + src = fetchFromGitHub { + owner = "kana"; + repo = "vim-operator-replace"; + rev = "1345a556a321a092716e149d4765a5e17c0e9f0f"; + sha256 = "07cibp61zwbzpjfxqdc77fzrgnz8jhimmdhhyjr0lvgrjgvsnv6q"; + }; + }; + + vim-operator-surround = buildVimPluginFrom2Nix { + name = "vim-operator-surround-2017-12-22"; + src = fetchFromGitHub { + owner = "rhysd"; + repo = "vim-operator-surround"; + rev = "001c0da077b5b38a723151b19760d220e02363db"; + sha256 = "0c6w6id57faw6sjf5wvw9qp2a4i7xj65q0c4hjs0spgzycv2wpkh"; + }; + }; + + vim-operator-user = buildVimPluginFrom2Nix { + name = "vim-operator-user-2015-02-17"; + src = fetchFromGitHub { + owner = "kana"; + repo = "vim-operator-user"; + rev = "c3dfd41c1ed516b4b901c97562e644de62c367aa"; + sha256 = "16y2fyrmwg4vkcl85i8xg8s6m39ca2jvgi9qm36b3vzbnkcifafb"; + }; + }; + + vim-orgmode = buildVimPluginFrom2Nix { + name = "vim-orgmode-2018-07-25"; + src = fetchFromGitHub { + owner = "jceb"; + repo = "vim-orgmode"; + rev = "35e94218c12a0c063b4b3a9b48e7867578e1e13c"; + sha256 = "0j6zfqqysnky4z54413l87q7wxbskg0zb221zbz48ry4l1anilhx"; + }; + }; + + vim-pager = buildVimPluginFrom2Nix { + name = "vim-pager-2015-08-26"; + src = fetchFromGitHub { + owner = "lambdalisue"; + repo = "vim-pager"; + rev = "a657d508b4d5a23aada7585c9f1e0063914c0c45"; + sha256 = "10xm77pia916zf9i2llyhs89s653r98l6zq8cswm7cw61bjfxvv6"; + }; + }; + + vim-pandoc = buildVimPluginFrom2Nix { + name = "vim-pandoc-2018-08-13"; + src = fetchFromGitHub { + owner = "vim-pandoc"; + repo = "vim-pandoc"; + rev = "d0911146c68512defcf9d947542b06d7f7eed37e"; + sha256 = "13qqwpmnzida7bm57r306w3fpb397h6b2gxclq9in0ccq5h92xid"; + }; + }; + + vim-pandoc-after = buildVimPluginFrom2Nix { + name = "vim-pandoc-after-2017-11-21"; + src = fetchFromGitHub { + owner = "vim-pandoc"; + repo = "vim-pandoc-after"; + rev = "844f27debf4d72811049167f97191a3b551ddfd5"; + sha256 = "0i99g9lnk1xzarw3vzbc47i4bg4iybaywkjvd2krln4q426a6saf"; + }; + }; + + vim-pandoc-syntax = buildVimPluginFrom2Nix { + name = "vim-pandoc-syntax-2017-04-13"; + src = fetchFromGitHub { + owner = "vim-pandoc"; + repo = "vim-pandoc-syntax"; + rev = "56e8e41ef863a0a7d33d85c3c0c895aa6e9e62d3"; + sha256 = "19ll4zrw5yd0frgsbi7pg9b68lmy4bfiwbnwgzii7inifrqsykfw"; + }; + }; + + vim-pathogen = buildVimPluginFrom2Nix { + name = "vim-pathogen-2018-04-05"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-pathogen"; + rev = "06da921608b971fb47603671bcafdb2843992eb3"; + sha256 = "1mxkp2yqqmfl0lq6kmkl716y9x8cdm7aibb376azydxlsbqv4qmi"; + }; + }; + + vim-peekaboo = buildVimPluginFrom2Nix { + name = "vim-peekaboo-2017-03-20"; + src = fetchFromGitHub { + owner = "junegunn"; + repo = "vim-peekaboo"; + rev = "a7c940b15b008afdcea096d3fc4d25e3e431eb49"; + sha256 = "1rc4hr6vwj2mmrgz8lifxf9rvcw1rb5dahq649yn8ccw03x8zn6m"; + }; + }; + + vim-pencil = buildVimPluginFrom2Nix { + name = "vim-pencil-2017-06-14"; + src = fetchFromGitHub { + owner = "reedes"; + repo = "vim-pencil"; + rev = "2dcd974b7255e4af83cf79a208f04a3489065e22"; + sha256 = "0swc6sszj1f4h5hgi7z7j1xw54d69mg7f18rk2kf5y453qwg4jc0"; + }; + }; + + vim-plugin-AnsiEsc = buildVimPluginFrom2Nix { + name = "vim-plugin-AnsiEsc-2018-05-10"; + src = fetchFromGitHub { + owner = "powerman"; + repo = "vim-plugin-AnsiEsc"; + rev = "9df135fd4a564559aad0f6d28ae6975678cedcaf"; + sha256 = "06s6fz3jw6pmy08nqzlvzhcgnv2d2p0vs863hqvd39amhg1xa5nf"; + }; + }; + + vim-polyglot = buildVimPluginFrom2Nix { + name = "vim-polyglot-2018-07-08"; + src = fetchFromGitHub { + owner = "sheerun"; + repo = "vim-polyglot"; + rev = "055f7710b65dfa2df52fc0b5be2486ae36ac5751"; + sha256 = "1yyqsy3q1kjvlqffc10zn3kl0k468xj8mycc22xp1hp1zrkxcf5x"; + }; + }; + + vim-prettyprint = buildVimPluginFrom2Nix { + name = "vim-prettyprint-2016-07-16"; + src = fetchFromGitHub { + owner = "thinca"; + repo = "vim-prettyprint"; + rev = "d6060d2b1ff1cff71714e126addd3b10883ade12"; + sha256 = "0mb1ylsq4023ik9wd9iwzlynra2c320xp9h2i79bspapglgd5gk9"; + }; + }; + + vim-projectionist = buildVimPluginFrom2Nix { + name = "vim-projectionist-2018-09-09"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-projectionist"; + rev = "ee68be42d26a8879b871c051e85ce0dfae7364f0"; + sha256 = "1x1v6q6gqw1f5h0rshj8q7x5cip78x2p6xdj05dglqdq1wz4w28i"; + }; + }; + + vim-puppet = buildVimPluginFrom2Nix { + name = "vim-puppet-2018-04-12"; + src = fetchFromGitHub { + owner = "rodjek"; + repo = "vim-puppet"; + rev = "dc1f681045c4d8bd126063ce000f7cc7b2f95097"; + sha256 = "18z2d2wpn5c3g857wprmdwp5pdb719dciyy0682hqpw8lfjn6zhv"; + }; + }; + + vim-qml = buildVimPluginFrom2Nix { + name = "vim-qml-2018-07-22"; + src = fetchFromGitHub { + owner = "peterhoeg"; + repo = "vim-qml"; + rev = "8af43da6950ce5483704bb97f5b24471d8ffda1a"; + sha256 = "1y1xvbfr1ffxyyk3zzf50xn87a85i1zszj4fqlq5ka8zhgdrnhvc"; + }; + }; + + vim-quickrun = buildVimPluginFrom2Nix { + name = "vim-quickrun-2018-09-06"; + src = fetchFromGitHub { + owner = "thinca"; + repo = "vim-quickrun"; + rev = "0a78a3fe79b3607e01543cd33d8f2d8aceb35909"; + sha256 = "1alpirkl6gi840ja21wn62gfmcyri6669p8r2c0qyjsajwx8gm8y"; + }; + }; + + vim-racer = buildVimPluginFrom2Nix { + name = "vim-racer-2018-08-26"; + src = fetchFromGitHub { + owner = "racer-rust"; + repo = "vim-racer"; + rev = "9c0a05e8b97700ee5d3e742fab889cf40e9e7b88"; + sha256 = "1gywh4xqbc7z15nvqr0v3h0n51fpaik8z1is0pxvpmj0fwzds0b3"; + }; + }; + + vim-repeat = buildVimPluginFrom2Nix { + name = "vim-repeat-2018-07-02"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-repeat"; + rev = "43d2678fa59d068c815d8298331c195e850ff5a7"; + sha256 = "0nb20503ka95qbx0mwhhni15drc86gfcd6kg92nf65llrvyfivk0"; + }; + }; + + vim-rhubarb = buildVimPluginFrom2Nix { + name = "vim-rhubarb-2018-08-22"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-rhubarb"; + rev = "b6cbbb0ad3e22870a3cd8d79a22722c63d98d18b"; + sha256 = "13mndz5p7slhn7ba8nnmzkh20ixhsq5rsy07y61sm5fxnb128r4n"; + }; + }; + + vim-ruby = buildVimPluginFrom2Nix { + name = "vim-ruby-2018-08-13"; + src = fetchFromGitHub { + owner = "vim-ruby"; + repo = "vim-ruby"; + rev = "68aa43c524b20aaaa269265d315a87b89e6d0148"; + sha256 = "027lyy5wjgi0p23qxiaxssbargdv81ip2z04l7c2wgx4lgs5mi86"; + }; + }; + + vim-scala = buildVimPluginFrom2Nix { + name = "vim-scala-2017-11-10"; + src = fetchFromGitHub { + owner = "derekwyatt"; + repo = "vim-scala"; + rev = "0b909e24f31d94552eafae610da0f31040c08f2b"; + sha256 = "1lqqapimgjr7k4imr26ap0lgx6k4qjl5gmgb1knvh5kz100bsjl5"; + }; + }; + + vim-scouter = buildVimPluginFrom2Nix { + name = "vim-scouter-2014-08-10"; + src = fetchFromGitHub { + owner = "thinca"; + repo = "vim-scouter"; + rev = "5221901d4ad6b2ef8b370b336db2aa7f69f2b6dc"; + sha256 = "0fx64hj1kzrsxz96195d5lm3x88zyycbcr78819mcbgfzyxis6b8"; + }; + }; + + vim-scriptease = buildVimPluginFrom2Nix { + name = "vim-scriptease-2018-07-27"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-scriptease"; + rev = "2619a1f5f63b670578ed0a504a6f844807804436"; + sha256 = "0mmrkbxi6gzv8q94cps010nbw95v9f3cc87l77klslg57hl515pl"; + }; + }; + + vim-sensible = buildVimPluginFrom2Nix { + name = "vim-sensible-2018-07-16"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-sensible"; + rev = "c82c6d4978be28adcf85dc1e61fa428e801bd525"; + sha256 = "0w87wic0qx20h36k075lvmj53glxkcyv8hkrx5aw4xqxvbq5fk6q"; + }; + }; + + vim-signature = buildVimPluginFrom2Nix { + name = "vim-signature-2018-07-06"; + src = fetchFromGitHub { + owner = "kshenoy"; + repo = "vim-signature"; + rev = "6bc3dd1294a22e897f0dcf8dd72b85f350e306bc"; + sha256 = "08m5dg77yavria7n7iajkj4kqaw848763680003j2gbrjlhpprpm"; + }; + }; + + vim-signify = buildVimPluginFrom2Nix { + name = "vim-signify-2018-08-05"; + src = fetchFromGitHub { + owner = "mhinz"; + repo = "vim-signify"; + rev = "40d1a4ee19ac61ad772dfcedc4d4bd21810f1c0b"; + sha256 = "1gvj2dqq96mf8h2jdyxr21jrvhr6r9bq9lsxgagvzi4ab81fm507"; + }; + }; + + vim-sleuth = buildVimPluginFrom2Nix { + name = "vim-sleuth-2018-08-19"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-sleuth"; + rev = "7a104e34c10c6f3581c6e98da7834d765d0b067c"; + sha256 = "0i147vhrrkarir36ysyaic42d22hk38cnpaqzqck7b2zdwnqrvbv"; + }; + }; + + vim-smalls = buildVimPluginFrom2Nix { + name = "vim-smalls-2015-05-02"; + src = fetchFromGitHub { + owner = "t9md"; + repo = "vim-smalls"; + rev = "9619eae81626bd63f88165e0520c467698264e34"; + sha256 = "0s5z3zv220cg95yky2av6w0jmpc56ysyhsx0596ksvgz5jwhpbad"; + }; + }; + + vim-snipmate = buildVimPluginFrom2Nix { + name = "vim-snipmate-2017-04-20"; + src = fetchFromGitHub { + owner = "garbas"; + repo = "vim-snipmate"; + rev = "a9802f2351910f64b70fb10b63651e6ff6b8125e"; + sha256 = "1l7sc6lf66pkiy18aq9s3wk1dmvvvsy1063cc0bxich9xa8m34bj"; + }; + }; + + vim-snippets = buildVimPluginFrom2Nix { + name = "vim-snippets-2018-09-03"; + src = fetchFromGitHub { + owner = "honza"; + repo = "vim-snippets"; + rev = "1a08e283d48b4a1ada1fbcc7c363ee040aeec0c9"; + sha256 = "0ska56i77dd2n2c428c9hsl2zskyag41xfsl5dg00dyjv4amvnin"; + }; + }; + + vim-solidity = buildVimPluginFrom2Nix { + name = "vim-solidity-2018-04-17"; + src = fetchFromGitHub { + owner = "tomlion"; + repo = "vim-solidity"; + rev = "569bbbedc3898236d5912fed0caf114936112ae4"; + sha256 = "1qpfbbrm4gjgvbkimhpxyl4fsdqkyw4raf17nw0ibqillz2d3pxx"; + }; + }; + + vim-sort-motion = buildVimPluginFrom2Nix { + name = "vim-sort-motion-2018-07-15"; + src = fetchFromGitHub { + owner = "christoomey"; + repo = "vim-sort-motion"; + rev = "49dfcabeee2bf3a85a6cc0774b35f687b6c9d0e5"; + sha256 = "02v12iqy3gjhvh5aza6b6b3pfv2qkyyw83bxqjgbjj002f71ydkb"; + }; + }; + + vim-speeddating = buildVimPluginFrom2Nix { + name = "vim-speeddating-2017-05-24"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-speeddating"; + rev = "a418667791f03694065948342f2d6c5cca8d0f32"; + sha256 = "1wm33izawazh0dy70zjk6rkg30yrlldba5r1gypnr4barps702gw"; + }; + }; + + vim-startify = buildVimPluginFrom2Nix { + name = "vim-startify-2018-08-02"; + src = fetchFromGitHub { + owner = "mhinz"; + repo = "vim-startify"; + rev = "187e46aea30e242ef214cbfb20afc0ad49d38171"; + sha256 = "15gmqm5qscnj70icibdjlw68r5zk1p5xzbznbzhar8l1yd5kkqgk"; + }; + }; + + vim-stylish-haskell = buildVimPluginFrom2Nix { + name = "vim-stylish-haskell-2018-08-31"; + src = fetchFromGitHub { + owner = "nbouscal"; + repo = "vim-stylish-haskell"; + rev = "0df8a2dd397f232a9ee0e56bc57071ccf29e21bf"; + sha256 = "05f2ms2c914ycxjjd7csga89mpsk3wzyhi56vikg3nd7a8z54gzw"; + }; + }; + + vim-stylishask = buildVimPluginFrom2Nix { + name = "vim-stylishask-2018-07-05"; + src = fetchFromGitHub { + owner = "alx741"; + repo = "vim-stylishask"; + rev = "62608c70af8fafbbc9712238dafd2c5a433ed179"; + sha256 = "12vj2kf82kvmd6smimgnz9yy97n7bvrji063ig3wlicxwmz62fdr"; + }; + }; + + vim-surround = buildVimPluginFrom2Nix { + name = "vim-surround-2018-07-23"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-surround"; + rev = "597068870b8f093a8b2d11536c62ff31222ee8d0"; + sha256 = "080kcgb5ayxs49q1p1cms6k1byf2fzzy8bglnspr511m9fql5a9x"; + }; + }; + + vim-SyntaxRange = buildVimPluginFrom2Nix { + name = "vim-SyntaxRange-2018-03-09"; + src = fetchFromGitHub { + owner = "inkarkat"; + repo = "vim-SyntaxRange"; + rev = "dc33d8f84ebbf4c9fa03ce00b8adeb83e05249d3"; + sha256 = "0nf0hkgl5fm0laxb5253br894259kz33zyiwxzrry6w3108alasr"; + }; + }; + + vim-table-mode = buildVimPluginFrom2Nix { + name = "vim-table-mode-2018-05-16"; + src = fetchFromGitHub { + owner = "dhruvasagar"; + repo = "vim-table-mode"; + rev = "5483e163bd0a67e729e0e8436315f33f9e126baf"; + sha256 = "0mmpa7zhrj8mqf4931ldf6n9jlpfxc4kg8xdhqlp7srlnq4h8siw"; + }; + }; + + vim-tabpagecd = buildVimPluginFrom2Nix { + name = "vim-tabpagecd-2013-11-29"; + src = fetchFromGitHub { + owner = "kana"; + repo = "vim-tabpagecd"; + rev = "8b71a03a037608fa5918f5096812577cec6355e4"; + sha256 = "1mr6s2hvsf2a2nkjjvq78c9isfxk2k1ih890w740srbq6ssj0npm"; + }; + }; + + vim-tbone = buildVimPluginFrom2Nix { + name = "vim-tbone-2018-06-28"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-tbone"; + rev = "8bc7348f658c32bea57365aa6acf3a7dde12e737"; + sha256 = "17s2b66xxkvv17pzf3xrw6ba7y9awpd2k2d21v0pag924c5hi6d4"; + }; + }; + + vim-test = buildVimPluginFrom2Nix { + name = "vim-test-2018-08-30"; + src = fetchFromGitHub { + owner = "janko-m"; + repo = "vim-test"; + rev = "0941cfc91cdaa896f16f5e32d20940aab902f88c"; + sha256 = "0zggwjyiyiipykw42b5qxgz8zhh10vi5ci3ywj1rh5h7kl858bwb"; + }; + }; + + vim-textobj-multiblock = buildVimPluginFrom2Nix { + name = "vim-textobj-multiblock-2014-06-02"; + src = fetchFromGitHub { + owner = "osyo-manga"; + repo = "vim-textobj-multiblock"; + rev = "670a5ba57d73fcd793f480e262617c6eb0103355"; + sha256 = "1s71hdr73cl8yg9mrdflvzrdccpiv7qrlainai7gqw30r1hfhfzf"; + }; + }; + + vim-themis = buildVimPluginFrom2Nix { + name = "vim-themis-2017-12-27"; + src = fetchFromGitHub { + owner = "thinca"; + repo = "vim-themis"; + rev = "691cd3912ba318dbd8d9fa0035fee629b424766d"; + sha256 = "1mrdaah3iyg35v6cgvr3jav3386czialfcinwa3y9jy14basbqhd"; + }; + }; + + vim-tmux-navigator = buildVimPluginFrom2Nix { + name = "vim-tmux-navigator-2018-07-13"; + src = fetchFromGitHub { + owner = "christoomey"; + repo = "vim-tmux-navigator"; + rev = "18b775fbccde5ff02e516c014290650bb40e257d"; + sha256 = "09v8amrdk8h4hsr9va8v9wdgzvj89z04y4j71l94rd7r6smxinbj"; + }; + }; + + vim-toml = buildVimPluginFrom2Nix { + name = "vim-toml-2018-06-15"; + src = fetchFromGitHub { + owner = "cespare"; + repo = "vim-toml"; + rev = "85ba8277a6e331a56fce920d62bfdacce5bc5a80"; + sha256 = "0nnm4ja5j9gcsl9cv7ra30slrlpjpy4dsl0ykg0yhdq1vbby3m6n"; + }; + }; + + vim-trailing-whitespace = buildVimPluginFrom2Nix { + name = "vim-trailing-whitespace-2017-09-23"; + src = fetchFromGitHub { + owner = "bronson"; + repo = "vim-trailing-whitespace"; + rev = "4c596548216b7c19971f8fc94e38ef1a2b55fee6"; + sha256 = "0f1cpnp1nxb4i5hgymjn2yn3k1jwkqmlgw1g02sq270lavp2dzs9"; + }; + }; + + vim-unimpaired = buildVimPluginFrom2Nix { + name = "vim-unimpaired-2018-07-26"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-unimpaired"; + rev = "d6325994b3c16ce36fd494c47dae4dab8d21a3da"; + sha256 = "0l5g3xq0azplaq3i2rblg8d61czpj47k0126zi8x48na9sj0aslv"; + }; + }; + + vim-visualstar = buildVimPluginFrom2Nix { + name = "vim-visualstar-2015-08-27"; + src = fetchFromGitHub { + owner = "thinca"; + repo = "vim-visualstar"; + rev = "a18cd0e7a03311ac709595c1d261ed44b45c9098"; + sha256 = "0yz6ci4i84xxrgazjfa5nsj3q8733p0b6vwcljk1l7ghdfiflvy4"; + }; + }; + + vim-wakatime = buildVimPluginFrom2Nix { + name = "vim-wakatime-2018-07-14"; + src = fetchFromGitHub { + owner = "wakatime"; + repo = "vim-wakatime"; + rev = "25aa400fd1f1e3d689c721605a65e015024dc4cf"; + sha256 = "11lk5k8wl3kxp6p2i0nnp56f4wcaniy40kzs3anjdwlzya631rg2"; + }; + }; + + vim-wordy = buildVimPluginFrom2Nix { + name = "vim-wordy-2018-03-10"; + src = fetchFromGitHub { + owner = "reedes"; + repo = "vim-wordy"; + rev = "14b9dbf76a82e29273a74768573900361200467f"; + sha256 = "0qx3ngw4k7bgzmxpv1x4lkq3njm3zcb1j5ph6fx26wgagxhiaqhk"; + }; + }; + + vim-xdebug = buildVimPluginFrom2Nix { + name = "vim-xdebug-2012-08-15"; + src = fetchFromGitHub { + owner = "joonty"; + repo = "vim-xdebug"; + rev = "a4980fa65f7f159780593ee37c178281691ba2c4"; + sha256 = "1qh18r0sm4gh95sjbi2hnflvxdl4gk00jyy3n7z4i1gnx9ihxjqw"; + }; + }; + + vim-xkbswitch = buildVimPluginFrom2Nix { + name = "vim-xkbswitch-2017-03-27"; + src = fetchFromGitHub { + owner = "lyokha"; + repo = "vim-xkbswitch"; + rev = "a85ebddb9038e6b05138c48868a319a9e13d1868"; + sha256 = "0v0wckkvsj3pd3a5lj35dqwlvgr1kfz0x6rpnx28mzrcg05p19fr"; + }; + }; + + vim-yapf = buildVimPluginFrom2Nix { + name = "vim-yapf-2018-06-05"; + src = fetchFromGitHub { + owner = "mindriot101"; + repo = "vim-yapf"; + rev = "cae79733a1a39732c5305d4a89cd093d17cb917d"; + sha256 = "16bmzvzks6kbqm6dk908k23b9wj7qf3x8bz3kikrzj27s0p7s9cc"; + }; + }; + + vim2hs = buildVimPluginFrom2Nix { + name = "vim2hs-2014-04-16"; + src = fetchFromGitHub { + owner = "dag"; + repo = "vim2hs"; + rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664"; + sha256 = "18lqrl3hqb6cmizc04bbnsh8j0g761w2q8wascbzzfw80dmxy36b"; + }; + }; + + vimoutliner = buildVimPluginFrom2Nix { + name = "vimoutliner-2018-07-04"; + src = fetchFromGitHub { + owner = "vimoutliner"; + repo = "vimoutliner"; + rev = "aad0a213069b8a1b5de91cca07d153fc8352c957"; + sha256 = "0pgkgs6xky0skhpp3s9vrw3h48j80im0j39q4vc2b3pd1ydy6rx2"; + }; + }; + + vimpreviewpandoc = buildVimPluginFrom2Nix { + name = "vimpreviewpandoc-2018-05-12"; + src = fetchFromGitHub { + owner = "tex"; + repo = "vimpreviewpandoc"; + rev = "266d14d362f6c069863b2d63edb683e802e7e3ee"; + sha256 = "1qhc5vyk7vxrgq11dh1iwkz2a3zd7wfjvyirhhlpx1zx12d6l0ly"; + }; + }; + + vimproc-vim = buildVimPluginFrom2Nix { + name = "vimproc-vim-2018-01-07"; + src = fetchFromGitHub { + owner = "shougo"; + repo = "vimproc.vim"; + rev = "2300224d366642f4f8d6f88861535d4ccbe20143"; + sha256 = "0b8ljqnix8bs667bpymg3s0g5f49fnphgddl6196dj6jvdfn1xia"; + }; + }; + + vimshell-vim = buildVimPluginFrom2Nix { + name = "vimshell-vim-2018-06-02"; + src = fetchFromGitHub { + owner = "shougo"; + repo = "vimshell.vim"; + rev = "03bf7673a5098918a533000d67dca97546695237"; + sha256 = "1ckxjap9kz8skbjchg561sqyd5y5qwacg8mabmniy78qa7i3qdzi"; + }; + }; + + vimtex = buildVimPluginFrom2Nix { + name = "vimtex-2018-09-09"; + src = fetchFromGitHub { + owner = "lervag"; + repo = "vimtex"; + rev = "cad3b43eca41b75cedab9ac86241f006aa3202ea"; + sha256 = "1nnn2xri8n6j34nq4l4b11m2n7aglj61ks156caqhkgdkskf0ks4"; + }; + }; + + vimwiki = buildVimPluginFrom2Nix { + name = "vimwiki-2018-09-03"; + src = fetchFromGitHub { + owner = "vimwiki"; + repo = "vimwiki"; + rev = "f55ec31675e372e2f59d51322b445ea91191ec2b"; + sha256 = "1qjczzj35nwhv1lrl9cf1bdpisr5vlwhf444apzj9c9pcjymc00z"; + }; + }; + + vinegar = buildVimPluginFrom2Nix { + name = "vinegar-2018-08-06"; + src = fetchFromGitHub { + owner = "tpope"; + repo = "vim-vinegar"; + rev = "c38ea2195a43747aedf0bb4b7eb5aa8870260296"; + sha256 = "1bcpi4m7ng9jaipf8xjf74469lgk34bs5ajjpv9dnkcrsalm28nf"; + }; + }; + + vundle = buildVimPluginFrom2Nix { + name = "vundle-2018-02-03"; + src = fetchFromGitHub { + owner = "gmarik"; + repo = "vundle"; + rev = "9a38216a1c0c597f978d73547d37681fc689c90d"; + sha256 = "1695glma8zf2lnp0w713sdvwqagf1s127p4i60114nk6gx5g5x2c"; + }; + }; + + watchdogs = buildVimPluginFrom2Nix { + name = "watchdogs-2017-12-03"; + src = fetchFromGitHub { + owner = "osyo-manga"; + repo = "vim-watchdogs"; + rev = "a6415c2d928af8c1aacdbce9b1ed8d315891eb03"; + sha256 = "0n6aqsgn0q1qgpj4yznqwbsbbk2a077gnjlq86ii3jhkzh5fzcff"; + }; + }; + + webapi-vim = buildVimPluginFrom2Nix { + name = "webapi-vim-2018-03-14"; + src = fetchFromGitHub { + owner = "mattn"; + repo = "webapi-vim"; + rev = "252250381a9509257bfb06b9f95441e41e3e23b5"; + sha256 = "0g37d1i6rxsj6f31g9jy2bhr8ng3jwmnvqqcmw19vbql4v56zq6a"; + }; + }; + + wombat256-vim = buildVimPluginFrom2Nix { + name = "wombat256-vim-2010-10-18"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "wombat256.vim"; + rev = "8734ba45dcf5e38c4d2686b35c94f9fcb30427e2"; + sha256 = "01fdvfwdfqn5xi88lfanb4lb6jmn1ma6wq6d9jj2x7qamdbpvsrg"; + }; + }; + + xptemplate = buildVimPluginFrom2Nix { + name = "xptemplate-2017-12-06"; + src = fetchFromGitHub { + owner = "drmingdrmer"; + repo = "xptemplate"; + rev = "74aac3aebaf9c67c12c21d6b25295b9bec9c93b3"; + sha256 = "01yvas50hg7iwwrdh61407mc477byviccksgi0fkaz89p78bbd1p"; + }; + }; + + xterm-color-table-vim = buildVimPluginFrom2Nix { + name = "xterm-color-table-vim-2014-01-01"; + src = fetchFromGitHub { + owner = "guns"; + repo = "xterm-color-table.vim"; + rev = "9754e857e5f4fe1f8727106dcc682d21c29a51e4"; + sha256 = "08a1d9428xwrjp40qgi34cb5fwgc239qf3agxl32k7bqbn08pq19"; + }; + }; + + yankring = buildVimPluginFrom2Nix { + name = "yankring-2015-07-29"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "YankRing.vim"; + rev = "28854abef8fa4ebd3cb219aefcf22566997d8f65"; + sha256 = "0zdp8pdsqgrh6lfw8ipjhrig6psvmdxkim9ik801y3r373sk2hxw"; + }; + }; + + youcompleteme = buildVimPluginFrom2Nix { + name = "youcompleteme-2018-09-09"; + src = fetchFromGitHub { + owner = "valloric"; + repo = "youcompleteme"; + rev = "487b8ab2b4d5bcaece29a17a26818a62616e21b5"; + sha256 = "1r0sdcllnqgi376hbj1f31irppqw1qqx7rna1jvj5qvi5d81s2nr"; + fetchSubmodules = true; + }; + }; + + YUNOcommit-vim = buildVimPluginFrom2Nix { + name = "YUNOcommit-vim-2014-11-26"; + src = fetchFromGitHub { + owner = "esneider"; + repo = "YUNOcommit.vim"; + rev = "981082055a73ef076d7e27477874d2303153a448"; + sha256 = "0mjc7fn405vcx1n7vadl98p5wgm6jxrlbdbkqgjq8f1m1ir81zab"; + }; + }; + + zeavim-vim = buildVimPluginFrom2Nix { + name = "zeavim-vim-2018-03-22"; + src = fetchFromGitHub { + owner = "KabbAmine"; + repo = "zeavim.vim"; + rev = "6db8d84528d66ce6638db03c2864abfa8afa02aa"; + sha256 = "1xw8d3ap6n31rh0a4413784sx4ki7wcz8qlwm2vf9in475vvznxj"; + }; + }; + + zenburn = buildVimPluginFrom2Nix { + name = "zenburn-2018-04-29"; + src = fetchFromGitHub { + owner = "jnurmine"; + repo = "zenburn"; + rev = "2cacfcb222d9db34a8d1a13bb8bb814f039b98cd"; + sha256 = "0m5d5sjckirfpdhg9sf1nl5xywvzdx6y04r13m47jlavf79hhimi"; + }; + }; + + zig-vim = buildVimPluginFrom2Nix { + name = "zig-vim-2018-08-02"; + src = fetchFromGitHub { + owner = "zig-lang"; + repo = "zig.vim"; + rev = "c10a46c0b960c9e0b7ea9a7286b0ff9abccd19f3"; + sha256 = "1vk9ny3jrk175srkbcxhj5jl2lvq5y98ms9mwl90ry49cqk9ciaj"; + }; + }; +} \ No newline at end of file diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py new file mode 100755 index 000000000000..c19b439493c6 --- /dev/null +++ b/pkgs/misc/vim-plugins/update.py @@ -0,0 +1,327 @@ +#!/usr/bin/env nix-shell +#!nix-shell -p python3 nix -i python3 + +# format: +# $ nix run nixpkgs.python3Packages.black -c black update.py +# type-check: +# $ nix run nixpkgs.python3Packages.mypy -c mypy update.py +# linted: +# $ nix run nixpkgs.python3Packages.flake8 -c flake8 --ignore E501,E265 update.py + +import functools +import json +import os +import subprocess +import sys +import traceback +import urllib.error +import urllib.request +import xml.etree.ElementTree as ET +from datetime import datetime +from multiprocessing.dummy import Pool +from pathlib import Path +from typing import Dict, List, Optional, Tuple, Union +from urllib.parse import urljoin, urlparse + +ATOM_ENTRY = "{http://www.w3.org/2005/Atom}entry" +ATOM_LINK = "{http://www.w3.org/2005/Atom}link" +ATOM_UPDATED = "{http://www.w3.org/2005/Atom}updated" + +ROOT = Path(__file__).parent + + +class Repo: + def __init__(self, owner: str, name: str) -> None: + self.owner = owner + self.name = name + + def url(self, path: str) -> str: + return urljoin(f"https://github.com/{self.owner}/{self.name}/", path) + + def __repr__(self) -> str: + return f"Repo({self.owner}, {self.name})" + + def has_submodules(self) -> bool: + try: + urllib.request.urlopen(self.url("blob/master/.gitmodules")).close() + except urllib.error.HTTPError as e: + if e.code == 404: + return False + else: + raise + return True + + def latest_commit(self) -> Tuple[str, datetime]: + with urllib.request.urlopen(self.url("commits/master.atom")) as req: + xml = req.read() + root = ET.fromstring(xml) + latest_entry = root.find(ATOM_ENTRY) + assert latest_entry is not None, f"No commits found in repository {self}" + commit_link = latest_entry.find(ATOM_LINK) + assert commit_link is not None, f"No link tag found feed entry {xml}" + url = urlparse(commit_link.get("href")) + updated_tag = latest_entry.find(ATOM_UPDATED) + assert ( + updated_tag is not None and updated_tag.text is not None + ), f"No updated tag found feed entry {xml}" + updated = datetime.strptime(updated_tag.text, "%Y-%m-%dT%H:%M:%SZ") + return Path(url.path).name, updated + + def prefetch_git(self, ref: str) -> str: + data = subprocess.check_output( + ["nix-prefetch-git", "--fetch-submodules", self.url(""), ref] + ) + return json.loads(data)["sha256"] + + def prefetch_github(self, ref: str) -> str: + data = subprocess.check_output( + ["nix-prefetch-url", "--unpack", self.url(f"archive/{ref}.tar.gz")] + ) + return data.strip().decode("utf-8") + + +class Plugin: + def __init__( + self, + name: str, + commit: str, + has_submodules: bool, + sha256: str, + date: Optional[datetime] = None, + ) -> None: + self.name = name + self.commit = commit + self.has_submodules = has_submodules + self.sha256 = sha256 + self.date = date + + @property + def normalized_name(self) -> str: + return self.name.replace(".", "-") + + @property + def version(self) -> str: + assert self.date is not None + return self.date.strftime("%Y-%m-%d") + + def as_json(self) -> Dict[str, str]: + copy = self.__dict__.copy() + del copy["date"] + return copy + + +GET_PLUGINS = """(with import {}; +let + hasChecksum = value: lib.isAttrs value && lib.hasAttrByPath ["src" "outputHash"] value; + getChecksum = name: value: + if hasChecksum value then { + submodules = value.src.fetchSubmodules or false; + sha256 = value.src.outputHash; + rev = value.src.rev; + } else null; + checksums = lib.mapAttrs getChecksum vimPlugins; +in lib.filterAttrs (n: v: v != null) checksums)""" + + +def get_current_plugins() -> List[Plugin]: + out = subprocess.check_output(["nix", "eval", "--json", GET_PLUGINS]) + data = json.loads(out) + plugins = [] + for name, attr in data.items(): + p = Plugin(name, attr["rev"], attr["submodules"], attr["sha256"]) + plugins.append(p) + return plugins + + +def prefetch_plugin(user: str, repo_name: str, cache: "Cache") -> Plugin: + repo = Repo(user, repo_name) + commit, date = repo.latest_commit() + has_submodules = repo.has_submodules() + cached_plugin = cache[commit] + if cached_plugin is not None: + cached_plugin.date = date + return cached_plugin + + print(f"prefetch {user}/{repo_name}") + if has_submodules: + sha256 = repo.prefetch_git(commit) + else: + sha256 = repo.prefetch_github(commit) + + return Plugin(repo_name, commit, has_submodules, sha256, date=date) + + +def print_download_error(plugin: str, ex: Exception): + print(f"{plugin}: {ex}", file=sys.stderr) + ex_traceback = ex.__traceback__ + tb_lines = [ + line.rstrip("\n") + for line in traceback.format_exception(ex.__class__, ex, ex_traceback) + ] + print("\n".join(tb_lines)) + + +def check_results( + results: List[Tuple[str, str, Union[Exception, Plugin]]] +) -> List[Tuple[str, str, Plugin]]: + failures: List[Tuple[str, Exception]] = [] + plugins = [] + for (owner, name, result) in results: + if isinstance(result, Exception): + failures.append((name, result)) + else: + plugins.append((owner, name, result)) + + print(f"{len(results) - len(failures)} plugins were checked", end="") + if len(failures) == 0: + print() + else: + print(f", {len(failures)} plugin(s) could not be downloaded:\n") + + for (plugin, exception) in failures: + print_download_error(plugin, exception) + return plugins + + +def load_plugin_spec() -> List[Tuple[str, str]]: + plugin_file = ROOT.joinpath("vim-plugin-names") + plugins = [] + with open(plugin_file) as f: + for line in f: + spec = line.strip() + parts = spec.split("/") + if len(parts) != 2: + msg = f"Invalid repository {spec}, must be in the format owner/repo" + print(msg, file=sys.stderr) + sys.exit(1) + plugins.append((parts[0], parts[1])) + return plugins + + +def get_cache_path() -> Optional[Path]: + xdg_cache = os.environ.get("XDG_CACHE_HOME", None) + if xdg_cache is None: + home = os.environ.get("HOME", None) + if home is None: + return None + xdg_cache = str(Path(home, ".cache")) + + return Path(xdg_cache, "vim-plugin-cache.json") + + +class Cache: + def __init__(self, initial_plugins: List[Plugin]) -> None: + self.cache_file = get_cache_path() + + downloads = {} + for plugin in initial_plugins: + downloads[plugin.commit] = plugin + downloads.update(self.load()) + self.downloads = downloads + + def load(self) -> Dict[str, Plugin]: + if self.cache_file is None or not self.cache_file.exists(): + return {} + + downloads: Dict[str, Plugin] = {} + with open(self.cache_file) as f: + data = json.load(f) + for attr in data.values(): + p = Plugin( + attr["name"], attr["commit"], attr["has_submodules"], attr["sha256"] + ) + downloads[attr["commit"]] = p + return downloads + + def store(self) -> None: + if self.cache_file is None: + return + + os.makedirs(self.cache_file.parent, exist_ok=True) + with open(self.cache_file, "w+") as f: + data = {} + for name, attr in self.downloads.items(): + data[name] = attr.as_json() + json.dump(data, f, indent=4, sort_keys=True) + + def __getitem__(self, key: str) -> Optional[Plugin]: + return self.downloads.get(key, None) + + def __setitem__(self, key: str, value: Plugin) -> None: + self.downloads[key] = value + + +def prefetch( + args: Tuple[str, str], cache: Cache +) -> Tuple[str, str, Union[Exception, Plugin]]: + assert len(args) == 2 + owner, repo = args + try: + plugin = prefetch_plugin(owner, repo, cache) + cache[plugin.commit] = plugin + return (owner, repo, plugin) + except Exception as e: + return (owner, repo, e) + + +header = ( + "# This file has been generated by ./pkgs/misc/vim-plugins/update.py. Do not edit!" +) + + +def generate_nix(plugins: List[Tuple[str, str, Plugin]]): + sorted_plugins = sorted(plugins, key=lambda v: v[2].name.lower()) + + with open(ROOT.joinpath("generated.nix"), "w+") as f: + f.write(header) + f.write( + """ +{ buildVimPluginFrom2Nix, fetchFromGitHub }: + +{""" + ) + for owner, repo, plugin in sorted_plugins: + if plugin.has_submodules: + submodule_attr = "\n fetchSubmodules = true;" + else: + submodule_attr = "" + + f.write( + f""" + {plugin.normalized_name} = buildVimPluginFrom2Nix {{ + name = "{plugin.normalized_name}-{plugin.version}"; + src = fetchFromGitHub {{ + owner = "{owner}"; + repo = "{repo}"; + rev = "{plugin.commit}"; + sha256 = "{plugin.sha256}";{submodule_attr} + }}; + }}; +""" + ) + f.write("}") + print("updated generated.nix") + + +def main() -> None: + plugin_names = load_plugin_spec() + current_plugins = get_current_plugins() + cache = Cache(current_plugins) + + prefetch_with_cache = functools.partial(prefetch, cache=cache) + + try: + # synchronous variant for debugging + # results = map(prefetch_with_cache, plugins) + pool = Pool(processes=30) + results = pool.map(prefetch_with_cache, plugin_names) + finally: + cache.store() + + plugins = check_results(results) + + generate_nix(plugins) + + +if __name__ == "__main__": + main() diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index f2a46ee8a806..8bcfc667da34 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -1,293 +1,316 @@ -"github:907th/vim-auto-save" -"github:airblade/vim-gitgutter" -"github:ajh17/Spacegray.vim" -"github:albfan/nerdtree-git-plugin" -"github:altercation/vim-colors-solarized" -"github:alvan/vim-closetag" -"github:amiorin/ctrlp-z" -"github:andreshazard/vim-logreview" -"github:andsild/peskcolor.vim.git" -"github:andviro/flake8-vim" -"github:ap/vim-css-color" -"github:bazelbuild/vim-bazel" -"github:bbchung/clighter8" -"github:benekastah/neomake" -"github:bitc/vim-hdevtools" -"github:bronson/vim-trailing-whitespace" -"github:cespare/vim-toml" -"github:chemzqm/denite-extra" -"github:chemzqm/denite-git" -"github:Chiel92/vim-autoformat" -"github:chikatoike/concealedyank.vim" -"github:chikatoike/sourcemap.vim" -"github:chrisbra/CheckAttach" -"github:chrisbra/csv.vim" -"github:chrisgeo/sparkup" -"github:chriskempson/base16-vim" -"github:christoomey/vim-sort-motion" -"github:christoomey/vim-tmux-navigator" -"github:ctjhoa/spacevim" -"github:ctrlpvim/ctrlp.vim" -"github:dag/vim2hs" -"github:dannyob/quickfixstatus" -"github:derekelkins/agda-vim" -"github:derekwyatt/vim-scala" -"github:dhruvasagar/vim-table-mode" -"github:digitaltoad/vim-jade" -"github:dleonard0/pony-vim-syntax" -"github:dracula/vim" -"github:drmingdrmer/xptemplate" -"github:eagletmt/ghcmod-vim" -"github:eagletmt/neco-ghc" -"github:editorconfig/editorconfig-vim" -"github:ehamberg/vim-cute-python.git" -"github:eikenb/acp" -"github:elixir-lang/vim-elixir" -"github:elmcast/elm-vim" -"github:elzr/vim-json" -"github:embear/vim-localvimrc" -"github:enomsg/vim-haskellConcealPlus" -"github:ensime/ensime-vim" -"github:ervandew/supertab" -"github:esneider/YUNOcommit.vim" -"github:farmergreg/vim-lastplace" -"github:fatih/vim-go" -"github:FelikZ/ctrlp-py-matcher" -"github:fisadev/vim-isort" -"github:flazz/vim-colorschemes" -"github:floobits/floobits-neovim" -"github:frigoeu/psc-ide-vim" -"github:garbas/vim-snipmate" -"github:gmarik/vundle" -"github:godlygeek/csapprox" -"github:godlygeek/tabular" -"github:google/vim-codefmt" -"github:google/vim-jsonnet" -"github:google/vim-maktaba" -"github:gregsexton/gitv" -"github:guns/xterm-color-table.vim" -"github:heavenshell/vim-jsdoc" -"github:hecal3/vim-leader-guide" -"github:honza/vim-snippets" -"github:idris-hackers/idris-vim" -"github:inkarkat/vim-SyntaxRange" -"github:int3/vim-extradite" -"github:itchyny/calendar.vim" -"github:itchyny/lightline.vim" -"github:itchyny/thumbnail.vim" -"github:itchyny/vim-cursorword" -"github:itchyny/vim-gitbranch" -"github:ivanov/vim-ipython" -"github:jacoborus/tender.vim" -"github:janko-m/vim-test.git" -"github:JazzCore/ctrlp-cmatcher" -"github:jceb/vim-hier" -"github:jceb/vim-orgmode" -"github:jeetsukumaran/vim-buffergator" -"github:jgdavey/tslime.vim" -"github:jhradilek/vim-docbk" -"github:jiangmiao/auto-pairs" -"github:jistr/vim-nerdtree-tabs" -"github:jnurmine/zenburn" -"github:jonbri/vim-colorstepper" -"github:joonty/vim-xdebug" -"github:JuliaEditorSupport/julia-vim" -"github:junegunn/fzf.vim" -"github:junegunn/goyo.vim" -"github:junegunn/limelight.vim" -"github:junegunn/vim-easy-align" -"github:junegunn/vim-github-dashboard" -"github:junegunn/vim-peekaboo" -"github:justincampbell/vim-eighties" -"github:KabbAmine/zeavim.vim" -"github:kana/vim-niceblock" -"github:kana/vim-operator-replace" -"github:kana/vim-operator-user" -"github:kana/vim-tabpagecd" -"github:kchmck/vim-coffee-script" -"github:keith/swift.vim" -"github:kien/rainbow_parentheses.vim" -"github:konfekt/fastfold" -"github:kshenoy/vim-signature" -"github:lambdalisue/vim-gista" -"github:latex-box-team/latex-box" -"github:leafgarland/typescript-vim" -"github:ledger/vim-ledger" -"github:lepture/vim-jinja" -"github:lervag/vimtex" -"github:lfilho/cosco.vim" -"github:LnL7/vim-nix" -"github:lokaltog/vim-easymotion" -"github:ludovicchabant/vim-lawrencium" -"github:luochen1990/rainbow" -"github:lyokha/vim-xkbswitch" -"github:machakann/vim-highlightedyank" -"github:majutsushi/tagbar" -"github:maksimr/vim-jsbeautify" -"github:MarcWeber/vim-addon-actions" -"github:MarcWeber/vim-addon-async" -"github:MarcWeber/vim-addon-background-cmd" -"github:MarcWeber/vim-addon-commenting" -"github:MarcWeber/vim-addon-completion" -"github:MarcWeber/vim-addon-errorformats" -"github:MarcWeber/vim-addon-goto-thing-at-cursor" -"github:MarcWeber/vim-addon-local-vimrc" -"github:MarcWeber/vim-addon-manager" -"github:MarcWeber/vim-addon-mru" -"github:MarcWeber/vim-addon-mw-utils" -"github:MarcWeber/vim-addon-nix" -"github:MarcWeber/vim-addon-other" -"github:MarcWeber/vim-addon-php-manual" -"github:MarcWeber/vim-addon-signs" -"github:MarcWeber/vim-addon-sql" -"github:MarcWeber/vim-addon-syntax-checker" -"github:MarcWeber/vim-addon-toggle-buffer" -"github:MarcWeber/vim-addon-xdebug" -"github:martinda/Jenkinsfile-vim-syntax" -"github:mattn/gist-vim" -"github:mattn/webapi-vim" -"github:mbbill/undotree" -"github:megaannum/forms" -"github:megaannum/self" -"github:mfukar/robotframework-vim" -"github:mhinz/vim-grepper.git" -"github:mhinz/vim-signify" -"github:mhinz/vim-startify" -"github:michaeljsmith/vim-indent-object" -"github:mileszs/ack.vim" -"github:mindriot101/vim-yapf" -"github:mkasa/lushtags" -"github:morhetz/gruvbox" -"github:mpickering/hlint-refactor-vim" -"github:nathanaelkane/vim-indent-guides" -"github:nbouscal/vim-stylish-haskell" -"github:neoclide/vim-easygit" -"github:neovimhaskell/haskell-vim" -"github:nixprime/cpsm" -"github:noc7c9/vim-iced-coffee-script" -"github:osyo-manga/shabadou.vim" -"github:osyo-manga/vim-textobj-multiblock" -"github:osyo-manga/vim-watchdogs" -"github:pangloss/vim-javascript" -"github:peterhoeg/vim-qml" -"github:plasticboy/vim-markdown" -"github:python-mode/python-mode" -"github:Quramy/tsuquyomi" -"github:racer-rust/vim-racer" -"github:rafi/awesome-vim-colorschemes" -"github:raichoo/purescript-vim" -"github:reedes/vim-pencil" -"github:reedes/vim-wordy" -"github:rhysd/committia.vim.git" -"github:rhysd/vim-grammarous" -"github:rhysd/vim-operator-surround" -"github:Rip-Rip/clang_complete" -"github:rodjek/vim-puppet" -"github:roxma/nvim-cm-racer" -"github:roxma/nvim-completion-manager" -"github:rust-lang/rust.vim" -"github:ryanoasis/vim-devicons" -"github:ryanoasis/vim-devicons" -"github:Rykka/riv.vim" -"github:sbdchd/neoformat" -"github:scrooloose/nerdcommenter" -"github:scrooloose/nerdtree" -"github:scrooloose/syntastic" -"github:sebastianmarkow/deoplete-rust" -"github:sheerun/vim-polyglot" -"github:shougo/context_filetype.vim" -"github:shougo/denite.nvim" -"github:shougo/deoplete.nvim" -"github:shougo/echodoc.vim" -"github:shougo/neco-syntax" -"github:shougo/neco-vim" -"github:shougo/neocomplete.vim" -"github:shougo/neoinclude.vim" -"github:shougo/neomru.vim" -"github:shougo/neosnippet-snippets" -"github:shougo/neosnippet.vim" -"github:shougo/neoyank.vim.git" -"github:shougo/tabpagebuffer.vim" -"github:shougo/unite.vim" -"github:shougo/vimproc.vim" -"github:shumphrey/fugitive-gitlab.vim" -"github:SirVer/ultisnips" -"github:sjl/gundo.vim" -"github:sjl/splice.vim" -"github:sk1418/last256" -"github:slashmili/alchemist.vim" -"github:t9md/vim-smalls" -"github:takac/vim-hardtime" -"github:terryma/vim-expand-region" -"github:terryma/vim-multiple-cursors" -"github:tex/vimpreviewpandoc" -"github:thinca/vim-ft-diff_fold" -"github:thinca/vim-prettyprint" -"github:thinca/vim-quickrun" -"github:thinca/vim-scouter" -"github:thinca/vim-themis" -"github:tomasr/molokai" -"github:tomlion/vim-solidity" -"github:tomtom/tlib_vim" -"github:tpope/vim-abolish" -"github:tpope/vim-commentary" -"github:tpope/vim-dispatch" -"github:tpope/vim-eunuch" -"github:tpope/vim-fireplace" -"github:tpope/vim-flagship" -"github:tpope/vim-fugitive" -"github:tpope/vim-pathogen" -"github:tpope/vim-projectionist" -"github:tpope/vim-repeat" -"github:tpope/vim-rhubarb" -"github:tpope/vim-scriptease" -"github:tpope/vim-sensible" -"github:tpope/vim-sleuth" -"github:tpope/vim-speeddating" -"github:tpope/vim-surround" -"github:tpope/vim-tbone" -"github:tpope/vim-vinegar" -"github:travitch/hasksyn" -"github:twinside/vim-haskellconceal" -"github:Twinside/vim-hoogle" -"github:tyru/caw.vim" -"github:tyru/open-browser.vim" -"github:ujihisa/neco-look" -"github:valloric/youcompleteme" -"github:vim-airline/vim-airline" -"github:vim-airline/vim-airline-themes" -"github:vimoutliner/vimoutliner" -"github:vim-pandoc/vim-pandoc" -"github:vim-pandoc/vim-pandoc-after" -"github:vim-pandoc/vim-pandoc-syntax" -"github:vim-ruby/vim-ruby" -"github:vim-scripts/align" -"github:vim-scripts/argtextobj.vim" -"github:vim-scripts/a.vim" -"github:vim-scripts/bats.vim" -"github:vim-scripts/changeColorScheme.vim" -"github:vim-scripts/Colour-Sampler-Pack" -"github:vim-scripts/Improved-AnsiEsc" -"github:vim-scripts/matchit.zip" -"github:vim-scripts/mayansmoke.git" -"github:vim-scripts/random.vim" -"github:vim-scripts/Rename" -"github:vim-scripts/ReplaceWithRegister" -"github:vim-scripts/tabmerge" -"github:vim-scripts/taglist.vim" -"github:vim-scripts/wombat256.vim" -"github:vim-scripts/YankRing.vim" -"github:vimwiki/vimwiki" -"github:vmchale/dhall-vim" -"github:w0rp/ale" -"github:wakatime/vim-wakatime" -"github:wellle/targets.vim" -"github:will133/vim-dirdiff" -"github:wincent/command-t" -"github:xolox/vim-easytags" -"github:xolox/vim-misc" -"github:xuhdev/vim-latex-live-preview" -"github:zah/nim.vim" -"github:zchee/deoplete-go" -"github:zchee/deoplete-jedi" -"github:zig-lang/zig.vim" +907th/vim-auto-save +airblade/vim-gitgutter +ajh17/Spacegray.vim +albfan/nerdtree-git-plugin +altercation/vim-colors-solarized +alvan/vim-closetag +alx741/vim-hindent +alx741/vim-stylishask +amiorin/ctrlp-z +andreshazard/vim-logreview +andsild/peskcolor.vim +andviro/flake8-vim +ap/vim-css-color +artur-shaik/vim-javacomplete2 +bazelbuild/vim-bazel +bbchung/clighter8 +benekastah/neomake +bitc/vim-hdevtools +bling/vim-bufferline +bronson/vim-trailing-whitespace +carlitux/deoplete-ternjs +ccarpita/rtorrent-syntax-file +cespare/vim-toml +chemzqm/denite-extra +chemzqm/denite-git +Chiel92/vim-autoformat +chikatoike/concealedyank.vim +chikatoike/sourcemap.vim +chrisbra/CheckAttach +chrisbra/csv.vim +chrisgeo/sparkup +chriskempson/base16-vim +christoomey/vim-sort-motion +christoomey/vim-tmux-navigator +ctjhoa/spacevim +ctrlpvim/ctrlp.vim +dag/vim2hs +dannyob/quickfixstatus +derekelkins/agda-vim +derekwyatt/vim-scala +dhruvasagar/vim-table-mode +digitaltoad/vim-jade +dleonard0/pony-vim-syntax +dracula/vim +drmingdrmer/xptemplate +eagletmt/ghcmod-vim +eagletmt/neco-ghc +easymotion/vim-easymotion +editorconfig/editorconfig-vim +ehamberg/vim-cute-python +eikenb/acp +elixir-lang/vim-elixir +elmcast/elm-vim +elzr/vim-json +embear/vim-localvimrc +enomsg/vim-haskellConcealPlus +ensime/ensime-vim +ervandew/supertab +esneider/YUNOcommit.vim +farmergreg/vim-lastplace +fatih/vim-go +FelikZ/ctrlp-py-matcher +fisadev/vim-isort +flazz/vim-colorschemes +floobits/floobits-neovim +frigoeu/psc-ide-vim +garbas/vim-snipmate +gmarik/vundle +godlygeek/csapprox +godlygeek/tabular +google/vim-codefmt +google/vim-jsonnet +google/vim-maktaba +gregsexton/gitv +guns/xterm-color-table.vim +haya14busa/incsearch-easymotion.vim +haya14busa/incsearch.vim +heavenshell/vim-jsdoc +hecal3/vim-leader-guide +honza/vim-snippets +hsanson/vim-android +idris-hackers/idris-vim +inkarkat/vim-SyntaxRange +int3/vim-extradite +itchyny/calendar.vim +itchyny/lightline.vim +itchyny/thumbnail.vim +itchyny/vim-cursorword +itchyny/vim-gitbranch +ivanov/vim-ipython +jacoborus/tender.vim +janko-m/vim-test +JazzCore/ctrlp-cmatcher +jceb/vim-hier +jceb/vim-orgmode +jeetsukumaran/vim-buffergator +jgdavey/tslime.vim +jhradilek/vim-docbk +jiangmiao/auto-pairs +jistr/vim-nerdtree-tabs +jnurmine/zenburn +jonbri/vim-colorstepper +joonty/vim-xdebug +JuliaEditorSupport/deoplete-julia +JuliaEditorSupport/julia-vim +junegunn/fzf.vim +junegunn/goyo.vim +junegunn/limelight.vim +junegunn/vim-easy-align +junegunn/vim-github-dashboard +junegunn/vim-peekaboo +justincampbell/vim-eighties +justinmk/vim-dirvish +KabbAmine/zeavim.vim +kana/vim-niceblock +kana/vim-operator-replace +kana/vim-operator-user +kana/vim-tabpagecd +kchmck/vim-coffee-script +keith/swift.vim +kien/rainbow_parentheses.vim +konfekt/fastfold +kshenoy/vim-signature +lambdalisue/vim-gista +lambdalisue/vim-pager +latex-box-team/latex-box +leafgarland/typescript-vim +ledger/vim-ledger +lepture/vim-jinja +lervag/vimtex +lfilho/cosco.vim +LnL7/vim-nix +ludovicchabant/vim-gutentags +ludovicchabant/vim-lawrencium +luochen1990/rainbow +lyokha/vim-xkbswitch +machakann/vim-highlightedyank +majutsushi/tagbar +maksimr/vim-jsbeautify +MarcWeber/vim-addon-actions +MarcWeber/vim-addon-async +MarcWeber/vim-addon-background-cmd +MarcWeber/vim-addon-commenting +MarcWeber/vim-addon-completion +MarcWeber/vim-addon-errorformats +MarcWeber/vim-addon-goto-thing-at-cursor +MarcWeber/vim-addon-local-vimrc +MarcWeber/vim-addon-manager +MarcWeber/vim-addon-mru +MarcWeber/vim-addon-mw-utils +MarcWeber/vim-addon-nix +MarcWeber/vim-addon-other +MarcWeber/vim-addon-php-manual +MarcWeber/vim-addon-signs +MarcWeber/vim-addon-sql +MarcWeber/vim-addon-syntax-checker +MarcWeber/vim-addon-toggle-buffer +MarcWeber/vim-addon-xdebug +martinda/Jenkinsfile-vim-syntax +mattn/gist-vim +mattn/webapi-vim +mbbill/undotree +megaannum/forms +megaannum/self +mfukar/robotframework-vim +mhinz/vim-grepper +mhinz/vim-signify +mhinz/vim-startify +michaeljsmith/vim-indent-object +mileszs/ack.vim +mindriot101/vim-yapf +mkasa/lushtags +morhetz/gruvbox +mpickering/hlint-refactor-vim +nathanaelkane/vim-indent-guides +nbouscal/vim-stylish-haskell +neoclide/vim-easygit +neovimhaskell/haskell-vim +nixprime/cpsm +noc7c9/vim-iced-coffee-script +osyo-manga/shabadou.vim +osyo-manga/vim-anzu +osyo-manga/vim-textobj-multiblock +osyo-manga/vim-watchdogs +pangloss/vim-javascript +parsonsmatt/intero-neovim +peterhoeg/vim-qml +plasticboy/vim-markdown +powerman/vim-plugin-AnsiEsc +python-mode/python-mode +Quramy/tsuquyomi +racer-rust/vim-racer +rafi/awesome-vim-colorschemes +raghur/vim-ghost +raichoo/purescript-vim +reedes/vim-pencil +reedes/vim-wordy +rhysd/committia.vim +rhysd/vim-grammarous +rhysd/vim-operator-surround +Rip-Rip/clang_complete +rodjek/vim-puppet +roxma/nvim-cm-racer +roxma/nvim-completion-manager +rust-lang/rust.vim +ryanoasis/vim-devicons +Rykka/riv.vim +sbdchd/neoformat +scrooloose/nerdcommenter +scrooloose/nerdtree +scrooloose/syntastic +sebastianmarkow/deoplete-rust +sheerun/vim-polyglot +shougo/context_filetype.vim +shougo/denite.nvim +Shougo/deol.nvim +shougo/deoplete.nvim +shougo/echodoc.vim +shougo/neco-syntax +shougo/neco-vim +shougo/neocomplete.vim +shougo/neoinclude.vim +shougo/neomru.vim +shougo/neosnippet-snippets +shougo/neosnippet.vim +shougo/neoyank.vim +shougo/tabpagebuffer.vim +shougo/unite.vim +shougo/vimproc.vim +shougo/vimshell.vim +shumphrey/fugitive-gitlab.vim +SirVer/ultisnips +sjl/gundo.vim +sjl/splice.vim +sk1418/last256 +slashmili/alchemist.vim +t9md/vim-smalls +takac/vim-hardtime +ternjs/tern_for_vim +terryma/vim-expand-region +terryma/vim-multiple-cursors +tex/vimpreviewpandoc +thinca/vim-ft-diff_fold +thinca/vim-prettyprint +thinca/vim-quickrun +thinca/vim-scouter +thinca/vim-themis +thinca/vim-visualstar +tomasr/molokai +tomlion/vim-solidity +tomtom/tlib_vim +tpope/vim-abolish +tpope/vim-commentary +tpope/vim-dispatch +tpope/vim-eunuch +tpope/vim-fireplace +tpope/vim-flagship +tpope/vim-fugitive +tpope/vim-pathogen +tpope/vim-projectionist +tpope/vim-repeat +tpope/vim-rhubarb +tpope/vim-scriptease +tpope/vim-sensible +tpope/vim-sleuth +tpope/vim-speeddating +tpope/vim-surround +tpope/vim-tbone +tpope/vim-unimpaired +tpope/vim-vinegar +travitch/hasksyn +twinside/vim-haskellconceal +Twinside/vim-hoogle +tyru/caw.vim +tyru/open-browser.vim +ujihisa/neco-look +valloric/youcompleteme +vhda/verilog_systemverilog.vim +vim-airline/vim-airline +vim-airline/vim-airline-themes +vimoutliner/vimoutliner +vim-pandoc/vim-pandoc +vim-pandoc/vim-pandoc-after +vim-pandoc/vim-pandoc-syntax +vim-ruby/vim-ruby +vim-scripts/align +vim-scripts/argtextobj.vim +vim-scripts/a.vim +vim-scripts/bats.vim +vim-scripts/changeColorScheme.vim +vim-scripts/Colour-Sampler-Pack +vim-scripts/Improved-AnsiEsc +vim-scripts/matchit.zip +vim-scripts/mayansmoke +vim-scripts/random.vim +vim-scripts/Rename +vim-scripts/ReplaceWithRegister +vim-scripts/tabmerge +vim-scripts/taglist.vim +vim-scripts/wombat256.vim +vim-scripts/YankRing.vim +vimwiki/vimwiki +vmchale/dhall-vim +w0rp/ale +wakatime/vim-wakatime +wellle/targets.vim +will133/vim-dirdiff +wincent/command-t +xolox/vim-easytags +xolox/vim-misc +xuhdev/vim-latex-live-preview +zah/nim.vim +zchee/deoplete-clang +zchee/deoplete-go +zchee/deoplete-jedi +zig-lang/zig.vim diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix index 7986706cb647..fe68ee78d1f0 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix @@ -1,7 +1,7 @@ { appleDerivation_, applePackage, pkgs, stdenv }: name: version: sha256: args: let n = stdenv.lib.removePrefix "lib" name; - makeFile = ../. + builtins.toPath "/${name}/GNUmakefile"; + makeFile = ../. + "/${name}/GNUmakefile"; appleDerivation = appleDerivation_ name version sha256; in applePackage name version sha256 (args // { appleDerivation = a: diff --git a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix index 969168fa54ba..1dea55cccc9e 100644 --- a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix +++ b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix @@ -1,32 +1,78 @@ -{ stdenv, fetchFromGitHub, python, ninja, libxml2 }: +{ stdenv, fetchFromGitHub, fetchurl, python, ninja, libxml2, objc4, ICU, curl }: -stdenv.mkDerivation { +let + # 10.12 adds a new sysdir.h that our version of CF in the main derivation depends on, but + # isn't available publicly, so instead we grab an older version of the same file that did + # not use sysdir.h, but provided the same functionality. Luckily it's simple :) hack hack + sysdir-free-system-directories = fetchurl { + url = "https://raw.githubusercontent.com/apple/swift-corelibs-foundation/9a5d8420f7793e63a8d5ec1ede516c4ebec939f0/CoreFoundation/Base.subproj/CFSystemDirectories.c"; + sha256 = "0krfyghj4f096arvvpf884ra5czqlmbrgf8yyc0b3avqmb613pcc"; + }; +in stdenv.mkDerivation { name = "swift-corefoundation"; src = fetchFromGitHub { owner = "apple"; repo = "swift-corelibs-foundation"; - rev = "dce4233f583ec15190b240d6116396bf9641cd57"; - sha256 = "0i2ldvy14x05k2vgl5z0g5l2i5llifdfbij5zwfdwb8jmmq215qr"; + rev = "85c640e7ce50e6ca61a134c72270e214bc63fdba"; # https://github.com/apple/swift-corelibs-foundation/pull/1686 + sha256 = "0z2v278wy7jh0c92g1dszd8hj8naxari660sqx6yab5dwapd46qc"; }; - buildInputs = [ ninja python libxml2 ]; + buildInputs = [ ninja python libxml2 objc4 ICU curl ]; + + sourceRoot = "source/CoreFoundation"; patchPhase = '' - substituteInPlace CoreFoundation/build.py \ - --replace '-I''${SYSROOT}/usr/include/libxml2' '-I${libxml2.dev}/include/libxml2' \ + cp ${sysdir-free-system-directories} Base.subproj/CFSystemDirectories.c + + # In order, since I can't comment individual lines: + # 1. Disable dispatch support for now + # 2. For the linker too + # 3. Use the legit CoreFoundation.h, not the one telling you not to use it because of Swift + substituteInPlace build.py \ + --replace "cf.CFLAGS += '-DDEPLOYMENT" '#' \ + --replace "cf.LDFLAGS += '-ldispatch" '#' \ + --replace "Base.subproj/SwiftRuntime/CoreFoundation.h" 'Base.subproj/CoreFoundation.h' + + # Includes xpc for some initialization routine that they don't define anyway, so no harm here + substituteInPlace PlugIn.subproj/CFBundlePriv.h \ + --replace '#if (TARGET_OS_MAC' '#if (0' + + # Why do we define __GNU__? Is that normal? + substituteInPlace Base.subproj/CFAsmMacros.h \ + --replace '#if defined(__GNU__) ||' '#if 0 &&' + + # The MIN macro doesn't seem to be defined sensibly for us. Not sure if our stdenv or their bug + substituteInPlace Base.subproj/CoreFoundation_Prefix.h \ + --replace '#if DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX' '#if 1' + + # Somehow our ICU doesn't have this, probably because it's too old (we'll update it soon when we update the rest of the SDK) + substituteInPlace Locale.subproj/CFLocale.c \ + --replace '#if U_ICU_VERSION_MAJOR_NUM' '#if 0 //' ''; - configurePhase = ":"; + BUILD_DIR = "./Build"; + CFLAGS = "-DINCLUDE_OBJC -I${libxml2.dev}/include/libxml2"; # They seem to assume we include objc in some places and not in others, make a PR; also not sure why but libxml2 include path isn't getting picked up from buildInputs + LDFLAGS = "-install_name ${placeholder "out"}/Frameworks/CoreFoundation.framework/CoreFoundation -current_version 1234.56.7 -compatibility_version 150.0.0 -init ___CFInitialize"; + configurePhase = "../configure --sysroot unused"; - buildPhase = '' - cd CoreFoundation - ../configure --sysroot unused - ninja - ''; + enableParallelBuilding = true; + buildPhase = "ninja -j $NIX_BUILD_CORES"; + # TODO: their build system sorta kinda can do this, but it doesn't seem to work right now + # Also, this includes a bunch of private headers in the framework, which is not what we want installPhase = '' - mkdir -p $out/lib - cp ../Build/CoreFoundation/libCoreFoundation.a $out/lib + base="$out/Library/Frameworks/CoreFoundation.framework" + mkdir -p $base/Versions/A/{Headers,PrivateHeaders,Modules} + + cp ./Build/CoreFoundation/libCoreFoundation.dylib $base/Versions/A/CoreFoundation + cp ./Build/CoreFoundation/usr/include/CoreFoundation/*.h $base/Versions/A/Headers + cp ./Build/CoreFoundation/usr/include/CoreFoundation/module.modulemap $base/Versions/A/Modules + + ln -s A $base/Versions/Current + + for i in CoreFoundation Headers Modules; do + ln -s Versions/Current/$i $base/$i + done ''; } diff --git a/pkgs/os-specific/darwin/swift-corelibs/default.nix b/pkgs/os-specific/darwin/swift-corelibs/default.nix index dd652dc56273..0d96b8fd008e 100644 --- a/pkgs/os-specific/darwin/swift-corelibs/default.nix +++ b/pkgs/os-specific/darwin/swift-corelibs/default.nix @@ -1,7 +1,7 @@ -{callPackage, darwin}: +{ callPackage, darwin }: rec { - corefoundation = callPackage ./corefoundation.nix {}; + corefoundation = callPackage ./corefoundation.nix { inherit (darwin) objc4 ICU; }; libdispatch = callPackage ./libdispatch.nix { inherit (darwin) apple_sdk_sierra xnu; }; diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index a02127ab7989..5a40368f3ceb 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -4,14 +4,14 @@ }: python.pkgs.buildPythonApplication rec { - version = "0.6.1"; + version = "0.7.0"; name = "bcc-${version}"; src = fetchFromGitHub { owner = "iovisor"; repo = "bcc"; rev = "v${version}"; - sha256 = "1rfqjbq8ah8zrsnpbx0h5irq3h2snncfvi4pvaxl7574kciprjxj"; + sha256 = "1ww7l0chx2ivw9d2ahxjyhxmh6hz3w5z69r4lz02f0361rnrvk7f"; }; format = "other"; diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 69fe94a1fe47..71ad6203e325 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -32,14 +32,14 @@ let in stdenv.mkDerivation rec { - name = "busybox-1.29.2"; + name = "busybox-1.29.3"; # Note to whoever is updating busybox: please verify that: # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test # still builds after the update. src = fetchurl { url = "https://busybox.net/downloads/${name}.tar.bz2"; - sha256 = "0qax9926qx9lpxiw75f4hkknz1pg0zcn5pkjx5gqfibs2ipgmlk7"; + sha256 = "1dzg45vgy2w1xcd3p6h8d76ykhabbvk1h0lf8yb24ikrwlv8cr4p"; }; hardeningDisable = [ "format" ] ++ lib.optionals enableStatic [ "fortify" ]; diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 178fc7d91408..4eec4754ca9a 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -14,8 +14,19 @@ stdenv.mkDerivation rec { sha256 = "0d2p9g2wqcv6l3671gvw96p16jadbgyh21ddy2bhqgi96dq3qflx"; }; + # Disable 4 test cases that fail in a sandbox + patches = [ ./disable-failing-tests.patch ]; + postPatch = '' patchShebangs tests + ${stdenv.lib.optionalString enablePython '' + patchShebangs ./python/pycryptsetup-test.py + ''} + + # O_DIRECT is filesystem dependent and fails in a sandbox (on tmpfs) + # and on several filesystem types (btrfs, zfs) without sandboxing. + # Remove it, see discussion in #46151 + substituteInPlace tests/unit-utils-io.c --replace "| O_DIRECT" "" ''; NIX_LDFLAGS = "-lgcc_s"; @@ -30,6 +41,8 @@ stdenv.mkDerivation rec { buildInputs = [ lvm2 json_c openssl libuuid popt ] ++ stdenv.lib.optional enablePython python2; + doCheck = true; + meta = { homepage = https://gitlab.com/cryptsetup/cryptsetup/; description = "LUKS for dm-crypt"; diff --git a/pkgs/os-specific/linux/cryptsetup/disable-failing-tests.patch b/pkgs/os-specific/linux/cryptsetup/disable-failing-tests.patch new file mode 100644 index 000000000000..1504bf3e1511 --- /dev/null +++ b/pkgs/os-specific/linux/cryptsetup/disable-failing-tests.patch @@ -0,0 +1,19 @@ +diff -ur a/tests/blockwise-compat b/tests/blockwise-compat +--- a/tests/blockwise-compat 2018-09-08 12:23:11.706555098 +0200 ++++ b/tests/blockwise-compat 2018-09-08 12:24:24.444393460 +0200 +@@ -148,15 +148,11 @@ + # device/file fn_name length + RUN "P" $1 read_buffer $BSIZE + RUN "P" $1 read_buffer $((2*BSIZE)) +- RUN "F" $1 read_buffer $((BSIZE-1)) +- RUN "F" $1 read_buffer $((BSIZE+1)) + RUN "P" $1 read_buffer 0 + + RUN "P" $1 write_buffer $BSIZE + RUN "P" $1 write_buffer $((2*BSIZE)) + +- RUN "F" $1 write_buffer $((BSIZE-1)) +- RUN "F" $1 write_buffer $((BSIZE+1)) + RUN "F" $1 write_buffer 0 + + # basic blockwise functions diff --git a/pkgs/os-specific/linux/earlyoom/default.nix b/pkgs/os-specific/linux/earlyoom/default.nix index 081996dfd42b..52333c109ee0 100644 --- a/pkgs/os-specific/linux/earlyoom/default.nix +++ b/pkgs/os-specific/linux/earlyoom/default.nix @@ -1,19 +1,19 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "earlyoom-${version}"; - version = "0.11"; + name = "earlyoom-${VERSION}"; + # This environment variable is read by make to set the build version. + VERSION = "0.11"; src = fetchFromGitHub { owner = "rfjakob"; repo = "earlyoom"; - rev = "08b7ed8e72feed2eec2e558ba2cfacbf6d469594"; + rev = "v${VERSION}"; sha256 = "1k3xslb70fzk80wlka32l0k2v45qn1xgwyjkjiz85gv6v4mv92vl"; }; installPhase = '' - mkdir -p $out/bin - cp earlyoom $out/bin + install -D earlyoom $out/bin/earlyoom ''; meta = { diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index eee2b132ae29..58cc1ab25da4 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.68"; + version = "4.14.69"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1446sbyysrv6hws35nnippa1mz4g31w7sc433svg4fq3jwavy7br"; + sha256 = "1w0r7g04q9ac14krm5dmvl8sv88avsmdirvnfk964cz3n3xxbgb1"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.18.nix b/pkgs/os-specific/linux/kernel/linux-4.18.nix index 22bbd73f9859..f6f92d65938b 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.18.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.18.6"; + version = "4.18.7"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1518q822fs28sfdqwsibj3bpibzj5r2dqfr0skv7l8cid3yrgnq5"; + sha256 = "0cgpb8zx7ckd9lmmaas6r1vszbz9lhrn4w1njw3yaw9a4rg44fzh"; }; } // (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 0872856c1190..66df462f5960 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, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.154"; + version = "4.4.155"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1j00y6hgj4c82y3j0gaqj68kf46fwxz1y5wx6ry5sgxnr3xp12z0"; + sha256 = "1nbd88x3m4w2ffwgjnf8ry5p2z7al54q1lvl2kv3fz8hmr5qq28q"; }; } // (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 068cf25f0053..1bd29569e011 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, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.125"; + version = "4.9.126"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1jqi25ld83l57lzcbhrzdnmsj4isz686ivdj0wfsrgxyc7pxwr57"; + sha256 = "1davk0c760if20h3f9r18lcvb7lqzlx0chxlph7ld5nlaz3ncskd"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 1f45348824a0..3be377205824 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.19-rc2"; - modDirVersion = "4.19.0-rc2"; + version = "4.19-rc3"; + modDirVersion = "4.19.0-rc3"; extraMeta.branch = "4.19"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0a5ip4dxv5y1mdi03m5rnz2l9k6kv30gciss6fag41lwsfwwln3z"; + sha256 = "0n372r1j3m2q47hwl8b1r57jq1b4fdhmadgvcvik6fpsvcw74w27"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index 9628ec516763..a24900ce337a 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { name = "musl-${version}"; - version = "1.1.19"; + version = "1.1.20"; src = fetchurl { url = "https://www.musl-libc.org/releases/musl-${version}.tar.gz"; - sha256 = "1nf1wh44bhm8gdcfr75ayib29b99vpq62zmjymrq7f96h9bshnfv"; + sha256 = "0q8dsjxl41dccscv9a0r78bs7jap57mn4mni5pwbbip6s1qqggj4"; }; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix index dbef7c41c067..0d208a6eb55f 100644 --- a/pkgs/os-specific/linux/s6-linux-utils/default.nix +++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix @@ -1,24 +1,19 @@ -{ stdenv, fetchurl, skalibs }: +{ stdenv, skawarePackages }: -let +with skawarePackages; - version = "2.4.0.2"; +buildPackage { + pname = "s6-linux-utils"; + version = "2.5.0.0"; + sha256 = "04q2z71dkzahd2ppga2zikclz2qk014c23gm7rigqxjc8rs1amvq"; -in stdenv.mkDerivation rec { - - name = "s6-linux-utils-${version}"; - - src = fetchurl { - url = "https://www.skarnet.org/software/s6-linux-utils/${name}.tar.gz"; - sha256 = "0245rmk7wfyyfsi4g7f0niprwlvqlwkbyjxflb8kkbvhwfdavqip"; - }; + description = "A set of minimalistic Linux-specific system utilities"; + platforms = stdenv.lib.platforms.linux; outputs = [ "bin" "dev" "doc" "out" ]; - dontDisableStatic = true; - + # TODO: nsss support configureFlags = [ - "--enable-absolute-paths" "--bindir=\${bin}/bin" "--includedir=\${dev}/include" "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps" @@ -28,16 +23,10 @@ in stdenv.mkDerivation rec { ]; postInstall = '' - mkdir -p $doc/share/doc/s6-networking/ - mv doc $doc/share/doc/s6-networking/html + # remove all s6 executables from build directory + rm $(find -name "s6-*" -type f -mindepth 1 -maxdepth 1 -executable) + + mv doc $doc/share/doc/s6-linux-utils/html ''; - meta = { - homepage = http://www.skarnet.org/software/s6-linux-utils/; - description = "A set of minimalistic Linux-specific system utilities"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ]; - }; - } diff --git a/pkgs/os-specific/linux/semodule-utils/default.nix b/pkgs/os-specific/linux/semodule-utils/default.nix new file mode 100644 index 000000000000..10ba1a3c7d07 --- /dev/null +++ b/pkgs/os-specific/linux/semodule-utils/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, libsepol }: + +stdenv.mkDerivation rec { + name = "semodule-utils-${version}"; + version = "2.7"; + + inherit (libsepol) se_release se_url; + + src = fetchurl { + url = "${se_url}/${se_release}/${name}.tar.gz"; + sha256 = "1fl60x4w8rn5bcwy68sy48aydwsn1a17d48slni4sfx4c8rqpjch"; + }; + + buildInputs = [ libsepol ]; + + makeFlags = [ + "PREFIX=$(out)" + "LIBSEPOLA=${stdenv.lib.getLib libsepol}/lib/libsepol.a" + ]; + + meta = with stdenv.lib; { + description = "SELinux policy core utilities (packaging additions)"; + license = licenses.gpl2; + inherit (libsepol.meta) homepage platforms; + maintainers = [ maintainers.e-user ]; + }; +} diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 9b0f3ff767c2..20ecdb5b5773 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -3,13 +3,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "sysdig-${version}"; - version = "0.22.1"; + version = "0.23.1"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "1wbvpsalm2ccwh8xz6fa4gqviilvjd8lnwvdryixhsdsf7j8w0j0"; + sha256 = "0q52yfag97n6cvrnzgx7inx11zdg7bgwkvqn2idsg9874fd2wkzh"; }; buildInputs = [ diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index fc7acc35c19a..5683da5e8e3f 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -17,7 +17,7 @@ let buildInputs = [ readline ]; patches = [ - (./. + (builtins.toPath "/dont-create-sysconfdir-${builtins.substring 0 1 version}.patch")) + (./. + "/dont-create-sysconfdir-${builtins.substring 0 1 version}.patch") ]; configureFlags = [ diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index a191d7a721d5..ba0e57bb2be8 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "slurm-${version}"; - version = "17.11.9-2"; + version = "18.08.0-1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${builtins.replaceStrings ["."] ["-"] name}"; - sha256 = "1lq4ac6yjai6wh979dciw8v3d99zbd3w36rfh0vpncqm672fg1qy"; + sha256 = "0mnaynnpz0cyd1lspcln6h6w5d7brcw3yiqsfxqrfhlmygyp21wq"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 12b96b3da125..a67de2dab1aa 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.77.2"; + version = "0.77.3"; components = { "abode" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index ccc9bee51b99..e6bbd4ab259d 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -75,7 +75,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.77.2"; + hassVersion = "0.77.3"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -90,7 +90,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "0lqm8n54cs4ji9bqp1z70qswgqv8n9vl8jbip7c2f3icqx19zg10"; + sha256 = "1c459iqbkhs6dv563zld6qb9avpx3h0fnxng476zahj9x9m5rzk6"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index b14d76050f90..e04de7effcd4 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "home-assistant-frontend"; - version = "20180831.0"; + version = "20180903.0"; src = fetchPypi { inherit pname version; - sha256 = "d0f897bed934bc2d557db04f8c76ad143db9514ea71943a0038c5bfb3b2151ec"; + sha256 = "54ba2ad2d1043952885f432d900025bd3eb11de180ac5147342cff585f44d4f9"; }; propagatedBuildInputs = [ user-agents ]; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 774f8df94a7d..49f7b59ddc6f 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jackett-${version}"; - version = "0.9.41"; + version = "0.10.160"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "0ndzn1p876rkj56g6vscgkmyzi1k0gmqby4rmrb4ilxzjpskii8m"; + sha256 = "1msy11s89r63vcan6d8mjn2jic1zwvl2j852mjj06bfb3yldx6vq"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 74cd233710cd..2aea521611c4 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -26,13 +26,13 @@ let }; in python2Packages.buildPythonApplication rec { name = "matrix-synapse-${version}"; - version = "0.33.3"; + version = "0.33.3.1"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - sha256 = "0yxxrs8yrrkp3pffdfab8apdmyhdcl90wgmglryy4q8vsksxn7d4"; + sha256 = "0q7rjh2qwj1ym5alnv9dvgw07bm7kk7igfai9ix72c6n7qb4z4i3"; }; patches = [ diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 5387a93b5e62..ac6dd44a8441 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "metabase-${version}"; - version = "0.30.0"; + version = "0.30.1"; src = fetchurl { url = "http://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "1wnzd2g1qxqpqjsqq1kfr0zrvjvqg54dvznbhf3637b0iqq3ahkh"; + sha256 = "13035yhbhsr4xg48hanbf8qchwyk6j59c90qkbjr914xcyvj6scc"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 031ba423cc40..99380fbae9cb 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { -X main.version=${version} '' ]; - goDeps = ./. + builtins.toPath "/deps-${version}.nix"; + goDeps = ./. + "/deps-${version}.nix"; meta = with lib; { description = "The plugin-driven server agent for collecting & reporting metrics."; diff --git a/pkgs/servers/nats-streaming-server/default.nix b/pkgs/servers/nats-streaming-server/default.nix new file mode 100644 index 000000000000..8270fa398214 --- /dev/null +++ b/pkgs/servers/nats-streaming-server/default.nix @@ -0,0 +1,26 @@ +{ buildGoPackage, fetchFromGitHub, lib }: + +with lib; + +buildGoPackage rec { + name = "nats-streaming-server-${version}"; + version = "0.11.0"; + rev = "v${version}"; + + goPackagePath = "github.com/nats-io/nats-streaming-server"; + + src = fetchFromGitHub { + inherit rev; + owner = "nats-io"; + repo = "nats-streaming-server"; + sha256 = "0skkx3f7dpbf6nqpsbsk8ssn8hl55s9k76a5y5ksyqar5bdxvds5"; + }; + + meta = { + description = "NATS Streaming System Server"; + license = licenses.asl20; + maintainers = [ maintainers.swdunlop ]; + homepage = https://nats.io/; + platforms = platforms.all; + }; +} diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 3245666d8ec3..8a0a848aa5d6 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name= "nextcloud-${version}"; - version = "13.0.5"; + version = "13.0.6"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; - sha256 = "1sl0kvn52m6p7rglwhgfb737y1897897hc5g2fcbg6i594ld6451"; + sha256 = "1m38k5jafz2lniy6fmq17xffkgaqs6rl4w789sqpniva1fb9xz4h"; }; installPhase = '' diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index 0c549e2b7e9e..e73233bd1447 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { excludedPackages = "test"; # Generated with the nix2go - goDeps = ./. + builtins.toPath "/deps-${version}.nix"; + goDeps = ./. + "/deps-${version}.nix"; meta = with lib; { description = "An open-source distributed time series database"; diff --git a/pkgs/servers/sks/adapt-to-nixos.patch b/pkgs/servers/sks/adapt-to-nixos.patch new file mode 100644 index 000000000000..b4403e8c7bc7 --- /dev/null +++ b/pkgs/servers/sks/adapt-to-nixos.patch @@ -0,0 +1,27 @@ +--- a/version.ml 2018-09-08 15:56:18.919154257 +0200 ++++ b/version.ml 2018-09-08 15:56:07.544028575 +0200 +@@ -24,16 +24,6 @@ + + let run () = + let bdb_version = Bdb.version () in +- let dbstats_dir = +- let split = Str.regexp_string "." in +- let major_minor_string major minor = +- sprintf "Further details about the BDB environment can be seen by \ +- executing\ndb%s.%s_stat -x in the KDB and Ptree directories\n" major minor +- in +- match Str.split split bdb_version with +- | major :: minor :: _ -> major_minor_string major minor +- | [] | _ :: [] -> major_minor_string "X" "Y" +- in + printf "SKS version %s%s\n" + Common.version Common.version_suffix; + +@@ -44,5 +34,6 @@ + requirement for recon of SKS %s\n" + Common.compatible_version_string; + +- printf "%s" dbstats_dir ++ printf "Further details about the BDB environment can be seen by executing\n\ ++ db_stat -x in the KDB and PTree directories\n" + diff --git a/pkgs/servers/sks/default.nix b/pkgs/servers/sks/default.nix index fe4029db1c14..deeeabda7451 100644 --- a/pkgs/servers/sks/default.nix +++ b/pkgs/servers/sks/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { sha256 = "00q5ma5rvl10rkc6cdw8d69bddgrmvy0ckqj3hbisy65l4idj2zm"; }; + # pkgs.db provides db_stat, not db$major.$minor_stat + patches = [ ./adapt-to-nixos.patch ]; + + outputs = [ "out" "webSamples" ]; + buildInputs = [ ocaml zlib db perl camlp4 ]; makeFlags = [ "PREFIX=$(out)" "MANDIR=$(out)/share/man" ]; @@ -26,6 +31,9 @@ stdenv.mkDerivation rec { doCheck = true; checkPhase = "./sks unit_test"; + # Copy the web examples for the NixOS module + postInstall = "cp -R sampleWeb $webSamples"; + meta = with stdenv.lib; { description = "An easily deployable & decentralized OpenPGP keyserver"; longDescription = '' diff --git a/pkgs/servers/x11/xorg/xcb-util-xrm.nix b/pkgs/servers/x11/xorg/xcb-util-xrm.nix index 5a315b99b08b..0a008227b9fb 100644 --- a/pkgs/servers/x11/xorg/xcb-util-xrm.nix +++ b/pkgs/servers/x11/xorg/xcb-util-xrm.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, m4, libxcb, xcbutil, libX11 }: stdenv.mkDerivation rec { - version = "1.2"; + version = "1.3"; name = "xcb-util-xrm-${version}"; src = fetchurl { url = "https://github.com/Airblader/xcb-util-xrm/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "0vbqhag51i0njc8d5fc8c6aa12496cwrc3s6s7sa5kfc17cwhppp"; + sha256 = "118cj1ybw86pgw0l5whn9vbg5n5b0ijcpx295mwahzi004vz671h"; }; nativeBuildInputs = [ pkgconfig m4 ]; diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index ac727034b8e7..be9d38f9780a 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -127,6 +127,9 @@ let "`stdenv.isArm` is deprecated after 18.03. Please use `stdenv.isAarch32` instead" hostPlatform.isAarch32; + # The derivation's `system` is `buildPlatform.system`. + inherit (buildPlatform) system; + # Whether we should run paxctl to pax-mark binaries. needsPax = isLinux; diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix index f53ab38672bd..eda5703d6a86 100644 --- a/pkgs/tools/X11/nitrogen/default.nix +++ b/pkgs/tools/X11/nitrogen/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { multi-head with Xinerama. Wallpapers are browsable with a convenient GUI, and settings are stored in a human-readable config file. ''; - homepage = http://projects.l3ib.org/nitrogen/; + homepage = https://github.com/l3ib/nitrogen; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.auntie ]; diff --git a/pkgs/tools/X11/x2x/default.nix b/pkgs/tools/X11/x2x/default.nix index dd529011557a..24cf4f6b2e16 100644 --- a/pkgs/tools/X11/x2x/default.nix +++ b/pkgs/tools/X11/x2x/default.nix @@ -24,10 +24,10 @@ stdenv.mkDerivation { cp x2x.1 $out/man/man1/ ''; - meta = { + meta = with stdenv.lib; { description = "Allows the keyboard, mouse on one X display to be used to control another X display"; - homepage = http://x2x.dottedmag.net; - license = "BSD"; - platforms = stdenv.lib.platforms.linux; + homepage = https://github.com/dottedmag/x2x; + license = licenses.bsd3; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/X11/xsettingsd/default.nix b/pkgs/tools/X11/xsettingsd/default.nix index 239b01e1345d..2f84711e61c4 100644 --- a/pkgs/tools/X11/xsettingsd/default.nix +++ b/pkgs/tools/X11/xsettingsd/default.nix @@ -1,39 +1,38 @@ -{ stdenv, fetchFromGitHub, scons, libX11, pkgconfig }: +{ stdenv, fetchFromGitHub, scons, pkgconfig, libX11 }: stdenv.mkDerivation rec { name = "xsettingsd-${version}"; - version = "git-2015-06-14"; + version = "1.0.0"; src = fetchFromGitHub { owner = "derat"; repo = "xsettingsd"; - rev = "b4999f5e9e99224caf97d09f25ee731774ecd7be"; - sha256 = "18cp6a66ji483lrvf0vq855idwmcxd0s67ijpydgjlsr70c65j7s"; + rev = "v${version}"; + sha256 = "05m4jlw0mgwp24cvyklncpziq1prr2lg0cq9c055sh4n9d93d07v"; }; patches = [ ./SConstruct.patch ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 scons ]; + nativeBuildInputs = [ scons pkgconfig ]; + + buildInputs = [ libX11 ]; + buildPhase = '' - mkdir -p "$out" - scons \ - -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \ - "prefix=$out" + scons -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES ''; installPhase = '' - mkdir -p "$out"/bin - install xsettingsd "$out"/bin - install dump_xsettings "$out"/bin + install -D -t "$out"/bin xsettingsd dump_xsettings + install -D -t "$out"/usr/share/man/man1 xsettingsd.1 dump_xsettings.1 ''; meta = with stdenv.lib; { description = "Provides settings to X11 applications via the XSETTINGS specification"; homepage = https://github.com/derat/xsettingsd; - license = licenses.bsd2; + license = licenses.bsd3; platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/tools/X11/xvkbd/default.nix index 7221555ed33f..06824f882a44 100644 --- a/pkgs/tools/X11/xvkbd/default.nix +++ b/pkgs/tools/X11/xvkbd/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { facility to enter characters onto other clients (softwares) by clicking on a keyboard displayed on the screen. ''; - homepage = http://homepage3.nifty.com/tsato/xvkbd/; + homepage = http://t-sato.in.coocan.jp/xvkbd; license = licenses.gpl2Plus; maintainers = [ maintainers.bennofs ]; platforms = platforms.linux; diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 8b98636b3475..016ea957f6c7 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -19,18 +19,18 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "0fdcd5d63e231443b9e032de4e2c2be9e4f1c766a25054ad93410f5213e45645"; + sha256 = "1d5z575vw07jk7528bsqgdd875b3zwayrdnidvxpd2n8j4bip654"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "d39293914b2e969bfe18dd19eb77ba96d283995f8cf1e5d7ba6ac712a3c9479a"; + sha256 = "0ljslvp68ml5mglrl7kakgkqskbzglf3i5jv5d7jld28d0kbzj2c"; }; }.${system}; in stdenv.mkDerivation rec { name = "google-cloud-sdk-${version}"; - version = "206.0.0"; + version = "215.0.0"; src = fetchurl (sources name stdenv.hostPlatform.system); diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index e0c3ea4cf018..9fbe05c725ef 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -2,11 +2,11 @@ python2Packages.buildPythonApplication rec { name = "duplicity-${version}"; - version = "0.7.18"; + version = "0.7.18.1"; src = fetchurl { url = "http://code.launchpad.net/duplicity/${stdenv.lib.versions.majorMinor version}-series/${version}/+download/${name}.tar.gz"; - sha256 = "1qlika4l1k1nx8zr657ihcy0yzr1c1cdnjlbs325l5krvc3zbc5b"; + sha256 = "17c0203y5qz9w8iyhs26l44qf6a1vp26b5ykz1ypdr2kv6g02df9"; }; buildInputs = [ librsync makeWrapper python2Packages.wrapPython ]; diff --git a/pkgs/tools/backup/wal-g/default.nix b/pkgs/tools/backup/wal-g/default.nix index 9c2fb0c0b002..0cd18dae1c27 100644 --- a/pkgs/tools/backup/wal-g/default.nix +++ b/pkgs/tools/backup/wal-g/default.nix @@ -2,18 +2,18 @@ buildGoPackage rec { name = "wal-g-${version}"; - version = "0.1.10"; + version = "0.1.12"; src = fetchFromGitHub { owner = "wal-g"; repo = "wal-g"; rev = "v${version}"; - sha256 = "0klqnrrjzzxcj3clg7vapmbga1vqsfh8mkci5r2ir1bjp0z1xfnp"; + sha256 = "06k71xz96jpg6966xj48a8j07v0vk37b5v2k1bnqrbin4sma3s0c"; }; goPackagePath = "github.com/wal-g/wal-g"; meta = { - homepage = https://github.com/wal-g/wal-g; + inherit (src.meta) homepage; license = stdenv.lib.licenses.asl20; description = "An archival restoration tool for Postgres"; maintainers = [ stdenv.lib.maintainers.ocharles ]; diff --git a/pkgs/tools/cd-dvd/bchunk/default.nix b/pkgs/tools/cd-dvd/bchunk/default.nix index 6828ef7d61d3..aa47edcb96c4 100644 --- a/pkgs/tools/cd-dvd/bchunk/default.nix +++ b/pkgs/tools/cd-dvd/bchunk/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { homepage = http://he.fi/bchunk/; description = "A program that converts CD images in BIN/CUE format into a set of ISO and CDR tracks"; platforms = platforms.unix; + license = licenses.gpl2; }; } diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix index 25d94593f5ef..a17b03025032 100644 --- a/pkgs/tools/cd-dvd/cdrdao/default.nix +++ b/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -28,9 +28,10 @@ stdenv.mkDerivation { # Needed on gcc >= 6. NIX_CFLAGS_COMPILE = "-Wno-narrowing"; - meta = { + meta = with stdenv.lib; { description = "A tool for recording audio or data CD-Rs in disk-at-once (DAO) mode"; homepage = http://cdrdao.sourceforge.net/; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.gpl2; }; } diff --git a/pkgs/tools/cd-dvd/lsdvd/default.nix b/pkgs/tools/cd-dvd/lsdvd/default.nix index 6a3f92a57c2d..56ec8e19f54e 100644 --- a/pkgs/tools/cd-dvd/lsdvd/default.nix +++ b/pkgs/tools/cd-dvd/lsdvd/default.nix @@ -13,9 +13,10 @@ stdenv.mkDerivation { buildInputs = [ libdvdread ]; nativeBuildInputs = [ pkgconfig ]; - meta = { + meta = with stdenv.lib; { homepage = https://sourceforge.net/projects/lsdvd/; description = "Display information about audio, video, and subtitle tracks on a DVD"; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix index a2668f73ceb2..7d4cdc2df86d 100644 --- a/pkgs/tools/compression/pigz/default.nix +++ b/pkgs/tools/compression/pigz/default.nix @@ -28,9 +28,10 @@ stdenv.mkDerivation { install -Dm755 pigz.pdf "$out/share/doc/pigz/pigz.pdf" ''; - meta = { + meta = with stdenv.lib; { homepage = http://www.zlib.net/pigz/; description = "A parallel implementation of gzip for multi-core machines"; - platforms = stdenv.lib.platforms.unix; + license = licenses.zlib; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/compression/zdelta/default.nix b/pkgs/tools/compression/zdelta/default.nix index 01050c5ee821..20748c31ab81 100644 --- a/pkgs/tools/compression/zdelta/default.nix +++ b/pkgs/tools/compression/zdelta/default.nix @@ -8,8 +8,9 @@ stdenv.mkDerivation rec { sha256 = "0k6y0r9kv5qiglnr2j4a0yvfynjkvm0pyv8ly28j0pr3w6rbxrh3"; }; - meta = { + meta = with stdenv.lib; { homepage = http://cis.poly.edu/zdelta; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.zlib; }; } diff --git a/pkgs/tools/filesystems/bashmount/default.nix b/pkgs/tools/filesystems/bashmount/default.nix index 579258f63f98..cd0f3ea23229 100644 --- a/pkgs/tools/filesystems/bashmount/default.nix +++ b/pkgs/tools/filesystems/bashmount/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/jamielinux/bashmount; description = "A menu-driven bash script for the management of removable media with udisks"; maintainers = [ maintainers.koral ]; + license = licenses.gpl2; platforms = platforms.all; }; } diff --git a/pkgs/tools/filesystems/curlftpfs/default.nix b/pkgs/tools/filesystems/curlftpfs/default.nix index 4af7c9fb8c26..5636909093e6 100644 --- a/pkgs/tools/filesystems/curlftpfs/default.nix +++ b/pkgs/tools/filesystems/curlftpfs/default.nix @@ -11,7 +11,11 @@ stdenv.mkDerivation { doCheck = false; # fails, doesn't work well too, btw - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "Filesystem for accessing FTP hosts based on FUSE and libcurl"; + homepage = http://curlftpfs.sourceforge.net; + license = licenses.gpl2; + platforms = platforms.linux; + }; } diff --git a/pkgs/tools/filesystems/fatresize/default.nix b/pkgs/tools/filesystems/fatresize/default.nix index 9af14b051261..7bb5dd415a6a 100644 --- a/pkgs/tools/filesystems/fatresize/default.nix +++ b/pkgs/tools/filesystems/fatresize/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, parted, utillinux }: stdenv.mkDerivation rec { - + version = "1.0.2"; name = "fatresize-${version}"; @@ -9,31 +9,32 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/fatresize/fatresize-${version}.tar.bz2"; sha256 = "04wp48jpdvq4nn0dgbw5za07g842rnxlh9mig4mslz70zqs0izjm"; }; - + buildInputs = [ parted utillinux ]; - + # This patch helps this unmantained piece of software to be built against recent parted # It basically modifies the detection scheme for parted version (the current one has no micro version defined) # The second change is to include a header for a moved function since 1.6+ to current 3.1+ parted # The third change is to modify the call to PED_ASSERT that is no longer defined with 2 params patches = [ ./fatresize_parted_nix.patch ]; - + preConfigure = '' echo "Replacing calls to ped_free with free ..." substituteInPlace ./fatresize.c --replace ped_free free ''; - + # Filesystem resize functions were reintroduced in parted 3.1 due to no other available free alternatives # but in a sepparate library -> libparted-fs-resize --- that's why the added LDFLAG makeFlags = '' LDFLAGS=-lparted-fs-resize ''; - + propagatedBuildInputs = [ parted utillinux ]; - - meta = { + + meta = with stdenv.lib; { description = "The FAT16/FAT32 non-destructive resizer"; homepage = https://sourceforge.net/projects/fatresize; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.gpl2; }; } diff --git a/pkgs/tools/filesystems/jfsutils/default.nix b/pkgs/tools/filesystems/jfsutils/default.nix index 244f3e294a86..acc7a91d93f5 100644 --- a/pkgs/tools/filesystems/jfsutils/default.nix +++ b/pkgs/tools/filesystems/jfsutils/default.nix @@ -12,8 +12,10 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid ]; - meta = { + meta = with stdenv.lib; { description = "IBM JFS utilities"; - platforms = stdenv.lib.platforms.linux; + homepage = http://jfs.sourceforge.net; + license = licenses.gpl3; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index e7a9963f6501..f153e59019e3 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -17,10 +17,10 @@ stdenv.mkDerivation rec { doCheck = true; - meta = { + meta = with stdenv.lib; { homepage = http://www.gnu.org/software/mtools/; description = "Utilities to access MS-DOS disks"; - platforms = stdenv.lib.platforms.unix; - maintainers = [ ]; + platforms = platforms.unix; + license = licenses.gpl3; }; } diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/pkgs/tools/filesystems/mtpfs/default.nix index afe51caa8772..bf048113714f 100644 --- a/pkgs/tools/filesystems/mtpfs/default.nix +++ b/pkgs/tools/filesystems/mtpfs/default.nix @@ -18,10 +18,11 @@ stdenv.mkDerivation rec { sha256 = "07acrqb17kpif2xcsqfqh5j4axvsa4rnh6xwnpqab5b9w5ykbbqv"; }; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/cjd/mtpfs; description = "FUSE Filesystem providing access to MTP devices"; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.qknight ]; + platforms = platforms.all; + license = licenses.gpl3; + maintainers = [ maintainers.qknight ]; }; } diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix index 6b56a8aadfa0..eccd72ceb238 100644 --- a/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -46,14 +46,11 @@ stdenv.mkDerivation rec { find . -name .libs | xargs rm -rf ''; - meta = { + meta = with stdenv.lib; { description = "NILFS utilities"; - maintainers = with stdenv.lib.maintainers; - [ - raskin - ]; - platforms = with stdenv.lib.platforms; - linux; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; + license = with licenses; [ gpl2 lgpl21 ]; downloadPage = "http://nilfs.sourceforge.net/en/download.html"; updateWalker = true; }; diff --git a/pkgs/tools/filesystems/reiser4progs/default.nix b/pkgs/tools/filesystems/reiser4progs/default.nix index 59d8e8aa4389..967a8ee43bef 100644 --- a/pkgs/tools/filesystems/reiser4progs/default.nix +++ b/pkgs/tools/filesystems/reiser4progs/default.nix @@ -21,10 +21,11 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace ./run-ldconfig true ''; - meta = { + meta = with stdenv.lib; { inherit version; - homepage = http://www.namesys.com/; + homepage = https://sourceforge.net/projects/reiser4/; description = "Reiser4 utilities"; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/relfs/default.nix b/pkgs/tools/filesystems/relfs/default.nix index 9a8c3ecb0fc8..04a15dfa22be 100644 --- a/pkgs/tools/filesystems/relfs/default.nix +++ b/pkgs/tools/filesystems/relfs/default.nix @@ -40,10 +40,12 @@ stdenv.mkDerivation rec { chmod a+x \$out/bin/relfs_grant; ''; - meta = { + meta = with stdenv.lib; { description = "A relational filesystem on top of FUSE"; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + homepage = http://relfs.sourceforge.net; + license = licenses.gpl2; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; broken = true; }; } diff --git a/pkgs/tools/filesystems/wdfs/default.nix b/pkgs/tools/filesystems/wdfs/default.nix index dc725b5078f0..135373e09f42 100644 --- a/pkgs/tools/filesystems/wdfs/default.nix +++ b/pkgs/tools/filesystems/wdfs/default.nix @@ -9,9 +9,11 @@ stdenv.mkDerivation rec }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [fuse glib neon]; - meta = { + + meta = with stdenv.lib; { homepage = http://noedler.de/projekte/wdfs/; + license = licenses.gpl2; description = "User-space filesystem that allows to mount a webdav share"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix index 3ecd91aaca14..14ba0f8c2a9a 100644 --- a/pkgs/tools/graphics/wkhtmltopdf/default.nix +++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix @@ -1,113 +1,21 @@ -{ stdenv, fetchFromGitHub, fetchpatch, qt4, fontconfig, freetype, libpng, zlib, libjpeg -, openssl, libX11, libXext, libXrender, overrideDerivation }: +{ stdenv, fetchFromGitHub, qt5, fontconfig, freetype, libpng, zlib, libjpeg +, openssl, libX11, libXext, libXrender }: stdenv.mkDerivation rec { - version = "0.12.4"; + version = "0.12.5"; name = "wkhtmltopdf-${version}"; src = fetchFromGitHub { owner = "wkhtmltopdf"; repo = "wkhtmltopdf"; rev = version; - sha256 = "09yzj9ylc6ci4a1qlhz60cgxi1nm9afwjrjxfikf8wwjd3i24vp2"; + sha256 = "0i6b6z3f4szspbbi23qr3hv22j9bhmcj7c1jizr7y0ra43mrgws1"; }; - wkQt = overrideDerivation qt4 (deriv: { - name = "qt-mod-4.8.7"; - enableParallelBuilding = true; - src = fetchFromGitHub { - owner = "wkhtmltopdf"; - repo = "qt"; - rev = "fe194f9dac0b515757392a18f7fc9527c91d45ab"; # From git submodule spec in wkhtml repo. - sha256 = "1j2ld2bfacnn3vm2l1870v55sj82bq4y8zkawmlx2y5j63d8vr23"; - }; - configureFlags = - '' - -dbus-linked - -glib - -no-separate-debug-info - -openssl-linked - -qdbus - -v - '' - + # This is taken from the wkhtml build script that we don't run - '' - -confirm-license - -exceptions - -fast - -graphicssystem raster - -iconv - -largefile - -no-3dnow - -no-accessibility - -no-audio-backend - -no-avx - -no-cups - -no-dbus - -no-declarative - -no-glib - -no-gstreamer - -no-gtkstyle - -no-icu - -no-javascript-jit - -no-libmng - -no-libtiff - -nomake demos - -nomake docs - -nomake examples - -nomake tests - -nomake tools - -nomake translations - -no-mitshm - -no-mmx - -no-multimedia - -no-nas-sound - -no-neon - -no-nis - -no-opengl - -no-openvg - -no-pch - -no-phonon - -no-phonon-backend - -no-qt3support - -no-rpath - -no-scripttools - -no-sm - -no-sql-ibase - -no-sql-mysql - -no-sql-odbc - -no-sql-psql - -no-sql-sqlite - -no-sql-sqlite2 - -no-sse - -no-sse2 - -no-sse3 - -no-sse4.1 - -no-sse4.2 - -no-ssse3 - -no-stl - -no-xcursor - -no-xfixes - -no-xinerama - -no-xinput - -no-xkb - -no-xrandr - -no-xshape - -no-xsync - -opensource - -release - -static - -system-libjpeg - -system-libpng - -system-zlib - -webkit - -xmlpatterns - ''; - }); - buildInputs = [ - wkQt fontconfig freetype libpng zlib libjpeg openssl + fontconfig freetype libpng zlib libjpeg openssl libX11 libXext libXrender + qt5.qtwebkit qt5.qtsvg ]; prePatch = '' @@ -116,14 +24,6 @@ stdenv.mkDerivation rec { done ''; - patches = [ - (fetchpatch { - name = "make-0.12.4-compile.patch"; - url = "https://github.com/efx/aports/raw/eb9f8e6bb9a488460929db747b15b8fceddd7abd/testing/wkhtmltopdf/10-patch1.patch"; - sha256 = "1c136jz0klr2rmhmy13gdbgsgkpjfdp2sif8bnw8d23mr9pym3s1"; - }) - ]; - configurePhase = "qmake wkhtmltopdf.pro INSTALLBASE=$out"; enableParallelBuilding = true; diff --git a/pkgs/tools/graphics/wkhtmltopdf/makefix.patch b/pkgs/tools/graphics/wkhtmltopdf/makefix.patch deleted file mode 100644 index 0642a23afa9e..000000000000 --- a/pkgs/tools/graphics/wkhtmltopdf/makefix.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur a/src/image/image.pro b/src/image/image.pro ---- a/src/image/image.pro 2014-08-28 14:07:51.024561967 +0200 -+++ b/src/image/image.pro 2014-08-28 14:08:22.383623390 +0200 -@@ -25,7 +25,7 @@ - - unix { - man.path=$$INSTALLBASE/share/man/man1 -- man.extra=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltoimage --manpage | gzip > $(INSTALL_ROOT)/share/man/man1/wkhtmltoimage.1.gz -+ man.extra=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltoimage --manpage | gzip > $$INSTALLBASE/share/man/man1/wkhtmltoimage.1.gz - - QMAKE_EXTRA_TARGETS += man - INSTALLS += man -diff -Naur a/src/pdf/pdf.pro b/src/pdf/pdf.pro ---- a/src/pdf/pdf.pro 2014-08-28 14:10:02.305818775 +0200 -+++ b/src/pdf/pdf.pro 2014-08-28 14:09:47.360789555 +0200 -@@ -25,7 +25,7 @@ - - unix { - man.path=$$INSTALLBASE/share/man/man1 -- man.extra=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltopdf --manpage | gzip > $(INSTALL_ROOT)/share/man/man1/wkhtmltopdf.1.gz -+ man.extra=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltopdf --manpage | gzip > $$INSTALLBASE/share/man/man1/wkhtmltopdf.1.gz - - QMAKE_EXTRA_TARGETS += man - INSTALLS += man diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index e154e217e951..c799b08bd446 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "calamares"; - version = "3.2.1"; + version = "3.2.2"; # release including submodule src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.gz"; - sha256 = "06i1fivcdzdf6fzj4db3izqcgy5q4wwgsmlx24szi88rd2j6prx9"; + sha256 = "14hsv2m0jza33kf68l3rhqfjj7224fmvgvk1kg2qwhvplpjdn16v"; }; buildInputs = [ diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix index 97c0251d9d64..0eff3f0c3916 100644 --- a/pkgs/tools/misc/cloc/default.nix +++ b/pkgs/tools/misc/cloc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "cloc-${version}"; - version = "1.76"; + version = "1.78"; src = fetchFromGitHub { owner = "AlDanial"; repo = "cloc"; - rev = "v${version}"; - sha256 = "03z4ar959ximsddd92zchi013lh82ganzisk309y3b09q10hl9k7"; + rev = version; + sha256 = "030cnvl83hgynri3jimhhqp238375m1g6liqfiggl0habrnlbck2"; }; setSourceRoot = '' diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index 360808f4280b..f0dc3ab64604 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -1,27 +1,18 @@ -{ stdenv, fetchgit, skalibs }: +{ stdenv, skawarePackages }: -let +with skawarePackages; - version = "2.5.0.0"; +buildPackage { + pname = "execline"; + version = "2.5.0.1"; + sha256 = "0j8hwdw8wn0rv8njdza8fbgmvyjg7hqp3qlbw00i7fwskr7d21wd"; -in stdenv.mkDerivation rec { - - name = "execline-${version}"; - - src = fetchgit { - url = "git://git.skarnet.org/execline"; - rev = "refs/tags/v${version}"; - sha256 = "19vd8252g5bmzm4i9gybpj7i2mhsflcgfl4ns5k3g1vv7f69i1dn"; - }; + description = "A small scripting language, to be used in place of a shell in non-interactive scripts"; outputs = [ "bin" "lib" "dev" "doc" "out" ]; - dontDisableStatic = true; - - enableParallelBuilding = true; - + # TODO: nsss support configureFlags = [ - "--enable-absolute-paths" "--libdir=\${lib}/lib" "--dynlibdir=\${lib}/lib" "--bindir=\${bin}/bin" @@ -30,22 +21,15 @@ in stdenv.mkDerivation rec { "--with-include=${skalibs.dev}/include" "--with-lib=${skalibs.lib}/lib" "--with-dynlib=${skalibs.lib}/lib" - ] - ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) - ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.hostPlatform.system}"); + ]; postInstall = '' - mkdir -p $doc/share/doc/execline + # remove all execline executables from build directory + rm $(find -type f -mindepth 1 -maxdepth 1 -executable) + rm libexecline.* + mv doc $doc/share/doc/execline/html mv examples $doc/share/doc/execline/examples ''; - meta = { - homepage = http://skarnet.org/software/execline/; - description = "A small scripting language, to be used in place of a shell in non-interactive scripts"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ]; - }; - } diff --git a/pkgs/tools/misc/kdecoration-viewer/default.nix b/pkgs/tools/misc/kdecoration-viewer/default.nix index 62783bb30dff..5c2e410cd930 100644 --- a/pkgs/tools/misc/kdecoration-viewer/default.nix +++ b/pkgs/tools/misc/kdecoration-viewer/default.nix @@ -2,13 +2,13 @@ , cmake, extra-cmake-modules, qtquickcontrols, kconfigwidgets, kdeclarative, kdecoration }: stdenv.mkDerivation rec { - name = "kdecoration-viewer-2015-08-20"; + name = "kdecoration-viewer-2018-07-24"; src = fetchFromGitHub { owner = "KDE"; repo = "kdecoration-viewer"; - rev = "d7174acee01475fbdb71cfd48ca49d487a141701"; - sha256 = "1cc4xxv72a82p1w9r76090xba7g069r41bi4zx32k4gz3vyl1am6"; + rev = "6e50b39c651bbf92fd7e7116d43bf57288254288"; + sha256 = "01v6i081vx0mydqvnj05xli86m52v6bxxc3z1zlyyap9cfhag7lj"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/tools/misc/noti/default.nix new file mode 100644 index 000000000000..ac5b4199c216 --- /dev/null +++ b/pkgs/tools/misc/noti/default.nix @@ -0,0 +1,38 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "noti-${version}"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "variadico"; + repo = "noti"; + rev = "${version}"; + sha256 = "1chsqfqk0pnhx5k2nr4c16cpb8m6zv69l1jvv4v4903zgfzcm823"; + }; + + goPackagePath = "github.com/variadico/noti"; + + preBuild = '' + buildFlagsArray+=("-ldflags" "-X ${goPackagePath}/internal/command.Version=${version}") + ''; + + postInstall = '' + mkdir -p $out/share/man/man{1,5}/ + cp $src/docs/man/noti.1 $out/share/man/man1/ + cp $src/docs/man/noti.yaml.5 $out/share/man/man5/ + ''; + + meta = with stdenv.lib; { + description = "Monitor a process and trigger a notification."; + longDescription = '' + Monitor a process and trigger a notification. + + Never sit and wait for some long-running process to finish. Noti can alert you when it's done. You can receive messages on your computer or phone. + ''; + homepage = https://github.com/variadico/noti; + license = licenses.mit; + maintainers = [ maintainers.stites ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 51844c8e5faa..08df665aede6 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2018.9"; + version = "1.2018.10"; name = "plantuml-${version}"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "0g5wd80brwqb0v9rbs66y3clv9jsccc8937jzz4r9gzp38rkvzmn"; + sha256 = "19s3zrfri388nfykcs67sfk0dhmiw0rcv0dvj1j4c0fkyhl41bjs"; }; # It's only a .jar file and a shell wrapper diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index 5f56daf3a48d..ae4385a0048a 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -1,47 +1,35 @@ -{ stdenv, fetchurl, skalibs }: +{ stdenv, skawarePackages }: -with stdenv.lib; +with skawarePackages; -stdenv.mkDerivation rec { - name = "s6-portable-utils-${version}"; - version = "2.2.1.1"; +let + pname = "s6-portable-utils"; - src = fetchurl { - url = "https://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz"; - sha256 = "0ca5iiq3n6isj64jb81xpwjzjx1q8jg145nnnn91ra2qqk93kqka"; - }; +in buildPackage { + pname = pname; + version = "2.2.1.2"; + sha256 = "0if77z07rfygd1yk9d2abxkdbx3dg52vcjhb20isb8kvqxhkg8ih"; + + description = "A set of tiny general Unix utilities optimized for simplicity and small size"; outputs = [ "bin" "dev" "doc" "out" ]; - dontDisableStatic = true; - configureFlags = [ - "--enable-absolute-paths" "--bindir=\${bin}/bin" "--includedir=\${dev}/include" "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps" "--with-include=${skalibs.dev}/include" "--with-lib=${skalibs.lib}/lib" "--with-dynlib=${skalibs.lib}/lib" - ] - # On darwin, the target triplet from -dumpmachine includes version number, but - # skarnet.org software uses the triplet to test binary compatibility. - # Explicitly setting target ensures code can be compiled against a skalibs - # binary built on a different version of darwin. - # http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph - ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.hostPlatform.system}"); + ]; postInstall = '' - mkdir -p $doc/share/doc/s6-portable-utils/ - mv doc $doc/share/doc/s6-portable-utils/html + # remove all s6 executables from build directory + rm $(find -name "s6-*" -type f -mindepth 1 -maxdepth 1 -executable) + rm seekablepipe + + mv doc $doc/share/doc/${pname}/html ''; - meta = { - homepage = http://www.skarnet.org/software/s6-portable-utils/; - description = "A set of tiny general Unix utilities optimized for simplicity and small size"; - platforms = platforms.all; - license = licenses.isc; - maintainers = with maintainers; [ pmahoney Profpatsch ]; - }; } diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/tools/misc/smenu/default.nix index 30475047c4f7..b5c963307dfd 100644 --- a/pkgs/tools/misc/smenu/default.nix +++ b/pkgs/tools/misc/smenu/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - version = "0.9.13"; + version = "0.9.14"; name = "smenu-${version}"; src = fetchFromGitHub { owner = "p-gen"; repo = "smenu"; rev = "v${version}"; - sha256 = "0ixfl1dxkvmzb3xy6zs1x94hlf8y7zmd14gmb50rp7gb7ff1ivm5"; + sha256 = "1q2jvzia5ggkifkawm791p2nkmnpm6cmd5x3al7zf76gpdm6j87d"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix index 9c6211b13dfe..e75baac669a3 100644 --- a/pkgs/tools/misc/woeusb/default.nix +++ b/pkgs/tools/misc/woeusb/default.nix @@ -3,14 +3,14 @@ , wxGTK30 }: stdenv.mkDerivation rec { - version = "3.2.1"; + version = "3.2.2"; name = "woeusb-${version}"; src = fetchFromGitHub { owner = "slacka"; repo = "WoeUSB"; rev = "v${version}"; - sha256 = "0qymdc216ws6adkzmzxz6hx43dim0hpwab9c4qmgg8jnkhnpvnj1"; + sha256 = "08spc7r5zgn483y7jmnlqi5417p6h1v6izyx10jnk39md6lv8pb3"; }; buildInputs = [ wxGTK30 autoreconfHook makeWrapper ]; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 7ed8f3bfd71b..e497f2a698c7 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,5 +1,6 @@ { lib, fetchurl, buildPythonPackage , zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc +, fetchpatch # 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 @@ -15,13 +16,22 @@ buildPythonPackage rec { pname = "youtube-dl"; - version = "2018.08.28"; + version = "2018.09.01"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1swdp4czvm0752psbi8a4qw5i9x18s7nhivh7iw92274pmqxq9wi"; + sha256 = "0h8x8agl4s5cnfzwmshbcg4pxcgg3iyb86w8krs21y2k9d1ng036"; }; + patches = [ + # https://github.com/rg3/youtube-dl/pull/17464 + (fetchpatch { + name = "youtube-js-player-fix.patch"; + url = "https://github.com/rg3/youtube-dl/pull/17464/commits/6d7359775ae4eef1d1213aae81e092467a2c675c.patch"; + sha256 = "12mwfmp7iwlawpx6r4rhz546b3anxrx6zc4nyjs8grbh5vxhj9yg"; + }) + ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ zip ] ++ lib.optional generateManPage pandoc; propagatedBuildInputs = lib.optional hlsEncryptedSupport pycryptodome; diff --git a/pkgs/tools/networking/bsd-finger/default.nix b/pkgs/tools/networking/bsd-finger/default.nix index 25f795d52c2c..d011665a492b 100644 --- a/pkgs/tools/networking/bsd-finger/default.nix +++ b/pkgs/tools/networking/bsd-finger/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { preInstall = '' mkdir -p $out/man/man1 $out/bin ''; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + platforms = platforms.linux; + license = licenses.bsdOriginal; }; } diff --git a/pkgs/tools/networking/carddav-util/default.nix b/pkgs/tools/networking/carddav-util/default.nix index 86a13ba90e65..7cc89bebf477 100644 --- a/pkgs/tools/networking/carddav-util/default.nix +++ b/pkgs/tools/networking/carddav-util/default.nix @@ -31,9 +31,10 @@ stdenv.mkDerivation rec { --prefix PATH : "$prefix/bin:$PATH" ''; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/ljanyst/carddav-util; description = "A CardDAV import/export utility"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.isc; }; } diff --git a/pkgs/tools/networking/cksfv/default.nix b/pkgs/tools/networking/cksfv/default.nix index c14770fb32be..3098b091dc64 100644 --- a/pkgs/tools/networking/cksfv/default.nix +++ b/pkgs/tools/networking/cksfv/default.nix @@ -2,15 +2,16 @@ stdenv.mkDerivation rec { name = "cksfv-1.3.14"; - + src = fetchurl { url = "http://zakalwe.fi/~shd/foss/cksfv/files/${name}.tar.bz2"; sha256 = "0lnz0z57phl6s52hjvlryn96xrlph9b0h89ahhv027sa79pj8g4g"; }; - meta = { + meta = with stdenv.lib; { homepage = http://zakalwe.fi/~shd/foss/cksfv/; description = "A tool for verifying files against a SFV checksum file"; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.gpl2; }; } diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 1fe29b8b96ff..a03d2a123932 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -34,10 +34,11 @@ stdenv.mkDerivation rec { find $out -type f -print0 | xargs --null sed -i 's|${stdenv.shellPackage}|${runtimeShellPackage}|' ''; - meta = { + meta = with stdenv.lib; { description = "A client for the Dynamic Host Configuration Protocol (DHCP)"; homepage = https://roy.marples.name/projects/dhcpcd; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ eelco fpletz ]; + platforms = platforms.linux; + license = licenses.bsd2; + maintainers = with maintainers; [ eelco fpletz ]; }; } diff --git a/pkgs/tools/networking/dhcpdump/default.nix b/pkgs/tools/networking/dhcpdump/default.nix index af4b03ab700b..8ed9d1d1d706 100644 --- a/pkgs/tools/networking/dhcpdump/default.nix +++ b/pkgs/tools/networking/dhcpdump/default.nix @@ -17,9 +17,10 @@ stdenv.mkDerivation rec { cp dhcpdump $out/bin ''; - meta = { + meta = with stdenv.lib; { description = "A tool for visualization of DHCP packets as recorded and output by tcpdump to analyze DHCP server responses"; - homepage = https://packages.ubuntu.com/ru/lucid/dhcpdump; - platforms = stdenv.lib.platforms.linux; + homepage = http://www.mavetju.org/unix/dhcpdump-man.php; + platforms = platforms.linux; + license = licenses.bsd2; }; } diff --git a/pkgs/tools/networking/driftnet/default.nix b/pkgs/tools/networking/driftnet/default.nix index 5b39ca464601..bf0a43ce5153 100644 --- a/pkgs/tools/networking/driftnet/default.nix +++ b/pkgs/tools/networking/driftnet/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/deiv/driftnet; maintainers = with maintainers; [ offline ]; platforms = platforms.linux; + license = licenses.gpl2; }; } diff --git a/pkgs/tools/networking/fdm/default.nix b/pkgs/tools/networking/fdm/default.nix index 3984922abe28..54e205390666 100644 --- a/pkgs/tools/networking/fdm/default.nix +++ b/pkgs/tools/networking/fdm/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { platforms = with platforms; linux; homepage = https://github.com/nicm/fdm; downloadPage = https://github.com/nicm/fdm/releases; + license = licenses.isc; }; } diff --git a/pkgs/tools/networking/gvpe/default.nix b/pkgs/tools/networking/gvpe/default.nix index 07676cb18712..bcc68a2a19f7 100644 --- a/pkgs/tools/networking/gvpe/default.nix +++ b/pkgs/tools/networking/gvpe/default.nix @@ -24,9 +24,11 @@ stdenv.mkDerivation rec { sed -e 's@/sbin/ifconfig@${nettools}/sbin/ifconfig@g' -i src/device-*.C ''; - meta = { + meta = with stdenv.lib; { description = "A protected multinode virtual network"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = with stdenv.lib.platforms; linux ++ freebsd; + homepage = http://software.schmorp.de/pkg/gvpe.html; + maintainers = [ maintainers.raskin ]; + platforms = with platforms; linux ++ freebsd; + license = licenses.gpl2; }; } diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix index fd2461f51719..9a0b8c9ebf54 100644 --- a/pkgs/tools/networking/libreswan/default.nix +++ b/pkgs/tools/networking/libreswan/default.nix @@ -76,10 +76,11 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { homepage = https://libreswan.org; description = "A free software implementation of the VPN protocol based on IPSec and the Internet Key Exchange"; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin ++ stdenv.lib.platforms.freebsd; - maintainers = [ stdenv.lib.maintainers.afranchuk ]; + platforms = platforms.linux ++ platforms.darwin ++ platforms.freebsd; + license = licenses.gpl2; + maintainers = [ maintainers.afranchuk ]; }; } diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index 902055e0d798..b4c2a6ea3970 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -19,10 +19,11 @@ let makeFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)"; - meta = { + meta = with stdenv.lib; { homepage = http://miniupnp.free.fr/; description = "A client that implements the UPnP Internet Gateway Device (IGD) specification"; - platforms = with stdenv.lib.platforms; linux ++ freebsd ++ darwin; + platforms = with platforms; linux ++ freebsd ++ darwin; + license = licenses.bsd3; }; }; in { diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 07112d1497af..f794a4e27c7a 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { homepage = http://miniupnp.free.fr/; description = "A daemon that implements the UPnP Internet Gateway Device (IGD) specification"; platforms = platforms.linux; + license = licenses.bsd3; }; } diff --git a/pkgs/tools/networking/ncftp/default.nix b/pkgs/tools/networking/ncftp/default.nix index 0a0eadbfcba4..90ac44aa375a 100644 --- a/pkgs/tools/networking/ncftp/default.nix +++ b/pkgs/tools/networking/ncftp/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { homepage = https://www.ncftp.com/ncftp/; maintainers = with maintainers; [ bjornfor ]; platforms = platforms.unix; + license = licenses.clArtistic; }; } diff --git a/pkgs/tools/networking/netselect/default.nix b/pkgs/tools/networking/netselect/default.nix index 6015ff9fbc7c..ef00d8602feb 100644 --- a/pkgs/tools/networking/netselect/default.nix +++ b/pkgs/tools/networking/netselect/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "netselect-0.3"; - + src = fetchurl { url = http://alumnit.ca/~apenwarr/netselect/netselect-0.3.tar.gz; sha256 = "0y69z59vylj9x9nk5jqn6ihx7dkzg09gpv2w1q1rs8fmi4jr90gy"; @@ -15,11 +15,11 @@ stdenv.mkDerivation { --replace "-g root" "" \ --replace "4755" "0755" ''; - - meta = { - homepage = http://alumnit.ca/~apenwarr/netselect/; + + meta = with stdenv.lib; { + homepage = https://github.com/apenwarr/netselect; description = "An ultrafast intelligent parallelizing binary-search implementation of \"ping\""; - license = "BSD"; - platforms = stdenv.lib.platforms.linux; + license = licenses.bsd3; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/philter/default.nix b/pkgs/tools/networking/philter/default.nix index f8f37e05a72e..5dff64e27c5c 100644 --- a/pkgs/tools/networking/philter/default.nix +++ b/pkgs/tools/networking/philter/default.nix @@ -18,8 +18,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Mail sorter for Maildirs"; + homepage = http://philter.sourceforge.net; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; + license = licenses.gpl2; }; passthru = { diff --git a/pkgs/tools/networking/polygraph/default.nix b/pkgs/tools/networking/polygraph/default.nix index c05e44fb1c07..0b679bc60b53 100644 --- a/pkgs/tools/networking/polygraph/default.nix +++ b/pkgs/tools/networking/polygraph/default.nix @@ -9,11 +9,12 @@ stdenv.mkDerivation rec { }; buildInputs = [ openssl zlib ncurses ]; - + meta = with stdenv.lib; { homepage = http://www.web-polygraph.org; description = "Performance testing tool for caching proxies, origin server accelerators, L4/7 switches, content filters, and other Web intermediaries"; platforms = platforms.linux; + license = licenses.asl20; maintainers = [ maintainers.lethalman ]; }; } diff --git a/pkgs/tools/networking/polysh/default.nix b/pkgs/tools/networking/polysh/default.nix index b94ec8e429fa..2a70218f2879 100644 --- a/pkgs/tools/networking/polysh/default.nix +++ b/pkgs/tools/networking/polysh/default.nix @@ -11,14 +11,15 @@ buildPythonApplication rec { sha256 = "0kxhp38c8a8hc8l86y53l2z5zpzxc4b8lx5zyzmq1badcrfc4mh4"; }; - meta = { + meta = with stdenv.lib; { description = "A tool to aggregate several remote shells into one"; longDescription = '' Polysh is a tool to aggregate several remote shells into one. It is used to launch an interactive remote shell on many machines at once. ''; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + maintainers = [ maintainers.astsmtl ]; homepage = http://guichaz.free.fr/polysh/; + license = licenses.gpl2; }; } diff --git a/pkgs/tools/networking/pptpd/default.nix b/pkgs/tools/networking/pptpd/default.nix index d5464b97a335..4c29cd949ee6 100644 --- a/pkgs/tools/networking/pptpd/default.nix +++ b/pkgs/tools/networking/pptpd/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { description = "The PPTP Server for Linux"; platforms = platforms.linux; maintainers = with maintainers; [ obadz ]; + license = licenses.gpl2; }; } diff --git a/pkgs/tools/networking/quicktun/default.nix b/pkgs/tools/networking/quicktun/default.nix index ceee8cca1aae..3d7dc68e3578 100644 --- a/pkgs/tools/networking/quicktun/default.nix +++ b/pkgs/tools/networking/quicktun/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { homepage = http://wiki.ucis.nl/QuickTun; maintainers = [ maintainers.fpletz ]; platforms = platforms.unix; + license = licenses.bsd2; }; } diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/pkgs/tools/networking/rp-pppoe/default.nix index b2584a4f4974..2beb8aec3893 100644 --- a/pkgs/tools/networking/rp-pppoe/default.nix +++ b/pkgs/tools/networking/rp-pppoe/default.nix @@ -21,9 +21,10 @@ stdenv.mkDerivation rec { sed -i Makefile -e 's@PPPOESERVER_PPPD_OPTIONS=@&$(out)@' ''; - meta = { + meta = with stdenv.lib; { description = "Roaring Penguin Point-to-Point over Ethernet tool"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; homepage = https://www.roaringpenguin.com/products/pppoe; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix index 29d66e4be2ce..f422dabaff64 100644 --- a/pkgs/tools/networking/s6-dns/default.nix +++ b/pkgs/tools/networking/s6-dns/default.nix @@ -1,27 +1,17 @@ -{ stdenv, fetchgit, skalibs }: +{ stdenv, skawarePackages }: -let +with skawarePackages; - version = "2.3.0.0"; +buildPackage { + pname = "s6-dns"; + version = "2.3.0.1"; + sha256 = "16ymalc4yxbwc0kapwmissxlw2bdk4sx3b33zp1gwx3n6hkcgh8c"; -in stdenv.mkDerivation rec { - - name = "s6-dns-${version}"; - - src = fetchgit { - url = "git://git.skarnet.org/s6-dns"; - rev = "refs/tags/v${version}"; - sha256 = "1hczdg3dzi9z6f0wicm2qa2239fiax915zp66xspdz6qd23nqrxb"; - }; + description = "A suite of DNS client programs and libraries for Unix systems"; outputs = [ "bin" "lib" "dev" "doc" "out" ]; - dontDisableStatic = true; - - enableParallelBuilding = true; - configureFlags = [ - "--enable-absolute-paths" "--libdir=\${lib}/lib" "--libexecdir=\${lib}/libexec" "--dynlibdir=\${lib}/lib" @@ -31,21 +21,15 @@ in stdenv.mkDerivation rec { "--with-include=${skalibs.dev}/include" "--with-lib=${skalibs.lib}/lib" "--with-dynlib=${skalibs.lib}/lib" - ] - ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) - ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.hostPlatform.system}"); + ]; postInstall = '' - mkdir -p $doc/share/doc/s6-dns/ + # remove all s6-dns executables from build directory + rm $(find -type f -mindepth 1 -maxdepth 1 -executable) + rm libs6dns.* + rm libskadns.* + mv doc $doc/share/doc/s6-dns/html ''; - meta = { - homepage = http://www.skarnet.org/software/s6-dns/; - description = "A suite of DNS client programs and libraries for Unix systems"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ]; - }; - } diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix index f7278d5c6a24..3f0e83ad9ce0 100644 --- a/pkgs/tools/networking/s6-networking/default.nix +++ b/pkgs/tools/networking/s6-networking/default.nix @@ -1,4 +1,4 @@ -{ stdenv, execline, fetchgit, s6, s6-dns, skalibs +{ stdenv, skawarePackages # Whether to build the TLS/SSL tools and what library to use # acceptable values: "libressl", false @@ -6,11 +6,9 @@ , sslSupport ? "libressl" , libressl }: +with skawarePackages; let inherit (stdenv) lib; - - version = "2.3.0.2"; - sslSupportEnabled = sslSupport != false; sslLibs = { "libressl" = libressl; @@ -19,24 +17,18 @@ let in assert sslSupportEnabled -> sslLibs ? ${sslSupport}; -stdenv.mkDerivation rec { - name = "s6-networking-${version}"; +buildPackage { + pname = "s6-networking"; + version = "2.3.0.3"; + sha256 = "1kfjl7da6wkmyq1mvq9irkbzk2wbi0axjfbcw5cym5y11mqswsjs"; - src = fetchgit { - url = "git://git.skarnet.org/s6-networking"; - rev = "refs/tags/v${version}"; - sha256 = "1qrhca8yjaysrqf7nx3yjfyfi9yly3rxpgrd2sqj0a0ckk73rv42"; - }; + description = "A suite of small networking utilities for Unix systems"; outputs = [ "bin" "lib" "dev" "doc" "out" ]; - dontDisableStatic = true; - - enableParallelBuilding = true; - + # TODO: nsss support configureFlags = [ - "--enable-absolute-paths" "--libdir=\${lib}/lib" "--libexecdir=\${lib}/libexec" "--dynlibdir=\${lib}/lib" @@ -60,20 +52,16 @@ stdenv.mkDerivation rec { "--enable-ssl=${sslSupport}" "--with-include=${lib.getDev sslLibs.${sslSupport}}/include" "--with-lib=${lib.getLib sslLibs.${sslSupport}}/lib" - ]) - ++ (lib.optional stdenv.isDarwin "--build=${stdenv.hostPlatform.system}"); + "--with-dynlib=${lib.getLib sslLibs.${sslSupport}}/lib" + ]); postInstall = '' - mkdir -p $doc/share/doc/s6-networking/ + # remove all s6 executables from build directory + rm $(find -name "s6-*" -type f -mindepth 1 -maxdepth 1 -executable) + rm minidentd + rm libs6net.* libstls.* + mv doc $doc/share/doc/s6-networking/html ''; - meta = { - homepage = http://www.skarnet.org/software/s6-networking/; - description = "A suite of small networking utilities for Unix systems"; - platforms = lib.platforms.all; - license = lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ]; - }; - } diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 2f19294784ec..d176c08829e5 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -78,7 +78,10 @@ stdenv.mkDerivation rec { "--with-tss=trousers" "--enable-aikgen" "--enable-sqlite" ] - ++ optional enableNetworkManager "--enable-nm"; + ++ optionals enableNetworkManager [ + "--enable-nm" + "--with-nm-ca-dir=/etc/ssl/certs" + ]; postInstall = '' # this is needed for l2tp diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index bbef1f285c33..d2b9a54183d0 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.46"; + version = "5.49"; src = fetchurl { url = "https://www.stunnel.org/downloads/${name}.tar.gz"; - sha256 = "1iw4gap9ysag8iww2ik029scmdllk7jdzcpnnbj7hgbl526b9akn"; + sha256 = "0plmdnwmhjjganhprsw9a8w3h5w43hyirpizy8cmq5w278hl2rix"; # please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256", # not the output of `nix-prefetch-url` }; diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix index 39674d22aa1d..ac87a5c10e9f 100644 --- a/pkgs/tools/networking/vde2/default.nix +++ b/pkgs/tools/networking/vde2/default.nix @@ -20,9 +20,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = { + meta = with stdenv.lib; { homepage = http://vde.sourceforge.net/; description = "Virtual Distributed Ethernet, an Ethernet compliant virtual network"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.gpl2; }; } diff --git a/pkgs/tools/networking/vlan/default.nix b/pkgs/tools/networking/vlan/default.nix index 41ece0537ab4..1684da45ccc3 100644 --- a/pkgs/tools/networking/vlan/default.nix +++ b/pkgs/tools/networking/vlan/default.nix @@ -25,8 +25,9 @@ stdenv.mkDerivation rec { cp vconfig.8 $out/share/man/man8/ ''; - meta = { + meta = with stdenv.lib; { description = "User mode programs to enable VLANs on Ethernet devices"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/webalizer/default.nix b/pkgs/tools/networking/webalizer/default.nix index 67a95f32b619..e9b9452c7563 100644 --- a/pkgs/tools/networking/webalizer/default.nix +++ b/pkgs/tools/networking/webalizer/default.nix @@ -11,10 +11,10 @@ stdenv.mkDerivation { preConfigure = '' substituteInPlace ./configure \ - --replace "--static" "" + --replace "--static" "" ''; - buildInputs = [zlib libpng gd geoip db]; + buildInputs = [zlib libpng gd geoip db]; configureFlags = [ "--enable-dns" @@ -23,7 +23,10 @@ stdenv.mkDerivation { "--enable-shared" ]; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "Web server log file analysis program"; + homepage = http://www.webalizer.org; + platforms = platforms.unix; + license = licenses.gpl2; }; } diff --git a/pkgs/tools/networking/x11-ssh-askpass/default.nix b/pkgs/tools/networking/x11-ssh-askpass/default.nix index 4061d5284aa6..896a2ff4daaa 100644 --- a/pkgs/tools/networking/x11-ssh-askpass/default.nix +++ b/pkgs/tools/networking/x11-ssh-askpass/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation { outputs = [ "out" "man" ]; src = fetchurl { - url = http://www.jmknoble.net/software/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1.tar.gz; - sha1 = "78c992951685d4dbffb77536f37b83ae2a6eafc7"; + url = http://pkgs.fedoraproject.org/repo/pkgs/openssh/x11-ssh-askpass-1.2.4.1.tar.gz/8f2e41f3f7eaa8543a2440454637f3c3/x11-ssh-askpass-1.2.4.1.tar.gz; + sha256 = "620de3c32ae72185a2c9aeaec03af24242b9621964e38eb625afb6cdb30b8c88"; }; nativeBuildInputs = [ imake ]; @@ -24,11 +24,10 @@ stdenv.mkDerivation { installTargets = [ "install" "install.man" ]; - meta = { - homepage = http://www.jmknoble.net/software/x11-ssh-askpass/; + meta = with stdenv.lib; { + homepage = https://github.com/sigmavirus24/x11-ssh-askpass; description = "Lightweight passphrase dialog for OpenSSH or other open variants of SSH"; - - platforms = stdenv.lib.platforms.unix; - maintainers = []; + license = licenses.mit; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/package-management/bunny/default.nix b/pkgs/tools/package-management/bunny/default.nix index c73f3fb524cd..cb99e5af055b 100644 --- a/pkgs/tools/package-management/bunny/default.nix +++ b/pkgs/tools/package-management/bunny/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "bunny-${version}"; - version = "1.1"; + version = "1.3"; src = fetchFromGitLab { owner = "tim241"; repo = "bunny"; rev = version; - sha256 = "0mxhj23fscbyqb9hfpmimgjn6nbx1lx3dl2msgwdy281zs25w8ki"; + sha256 = "0nh2h5kj9b0nkb6yrzf4if7anfdmy9vijzy4bl3s7qck0nzbpy8s"; }; dontBuild = true; diff --git a/pkgs/tools/package-management/clib/default.nix b/pkgs/tools/package-management/clib/default.nix index 795a605b3b63..158db426c615 100644 --- a/pkgs/tools/package-management/clib/default.nix +++ b/pkgs/tools/package-management/clib/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, curl }: stdenv.mkDerivation rec { - version = "1.8.0"; + version = "1.8.1"; name = "clib-${version}"; src = fetchFromGitHub { rev = version; owner = "clibs"; repo = "clib"; - sha256 = "0w1qiwq0jjrk8p848bmwxq4wvzhbd2zghq3qm8ylaj3z0xdw7ppk"; + sha256 = "1kl8amlw0106jsvv71a7nifhff1jdvgsrxr7l7hfr75i506q8976"; }; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/tools/security/duo-unix/default.nix b/pkgs/tools/security/duo-unix/default.nix index 729f85a73fce..3ef07c44f501 100644 --- a/pkgs/tools/security/duo-unix/default.nix +++ b/pkgs/tools/security/duo-unix/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "duo-unix-${version}"; - version = "1.9.20"; + version = "1.10.4"; src = fetchurl { url = "https://dl.duosecurity.com/duo_unix-${version}.tar.gz"; - sha256 = "0zxrpdbgi8k8jbqg5yxjv3b0lz9kpk89pglwb3lqlvzscbxdv5qj"; + sha256 = "1pbl6ii7sh66i277s5mqpnv092jd2q52qis3ar4lwy4mywfvrhjp"; }; buildInputs = [ pam openssl zlib ]; diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix index d1266ca495ed..f4def72b728c 100644 --- a/pkgs/tools/security/monkeysphere/default.nix +++ b/pkgs/tools/security/monkeysphere/default.nix @@ -1,35 +1,53 @@ -{ stdenv, fetchurl, perl, makeWrapper, perlPackages }: +{ stdenv, fetchurl, makeWrapper +, perl, libassuan, libgcrypt +, perlPackages, lockfileProgs, gnupg +}: stdenv.mkDerivation rec { name = "monkeysphere-${version}"; - version = "0.37"; + version = "0.41"; src = fetchurl { - url = "http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.37.orig.tar.gz"; - sha256 = "0nbfd220miflah5l2y20qlmgfpbqi0j8h7qgx1b06h7v2jjbh45m"; + url = "http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${version}.orig.tar.gz"; + sha256 = "0jz7kwkwgylqprnl8bwvl084s5gjrilza77ln18i3f6x48b2y6li"; }; - buildInputs = [ makeWrapper perl ]; - patches = [ ./monkeysphere.patch ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl libassuan libgcrypt ]; + makeFlags = '' PREFIX=/ DESTDIR=$(out) ''; - postInstall = '' - wrapProgram $out/bin/openpgp2ssh --prefix PERL5LIB : \ - "${with perlPackages; stdenv.lib.makePerlPath [ - CryptOpenSSLRSA - CryptOpenSSLBignum - ]}" - wrapProgram $out/bin/monkeysphere --prefix PERL5LIB :\ - "${with perlPackages; stdenv.lib.makePerlPath [ - CryptOpenSSLRSA - CryptOpenSSLBignum - ]}" - ''; + postFixup = + let wrapperArgs = runtimeDeps: + "--prefix PERL5LIB : " + + (with perlPackages; stdenv.lib.makePerlPath [ + CryptOpenSSLRSA + CryptOpenSSLBignum + ]) + + stdenv.lib.optionalString + (builtins.length runtimeDeps > 0) + " --prefix PATH : ${stdenv.lib.makeBinPath runtimeDeps}"; + wrapMonkeysphere = runtimeDeps: program: + "wrapProgram $out/bin/${program} ${wrapperArgs runtimeDeps}\n"; + wrapPrograms = runtimeDeps: programs: stdenv.lib.concatMapStrings + (wrapMonkeysphere runtimeDeps) + programs; + in wrapPrograms [ gnupg ] [ "monkeysphere-authentication" "monkeysphere-host" ] + + wrapPrograms [ lockfileProgs ] [ "monkeysphere" ] + + '' + # These 4 programs depend on the program name ($0): + for program in openpgp2pem openpgp2spki openpgp2ssh pem2openpgp; do + rm $out/bin/$program + ln -sf keytrans $out/share/monkeysphere/$program + makeWrapper $out/share/monkeysphere/$program $out/bin/$program \ + ${wrapperArgs [ ]} + done + ''; meta = with stdenv.lib; { homepage = http://web.monkeysphere.info/; @@ -43,7 +61,8 @@ stdenv.mkDerivation rec { TLS/SSL communications through the normal use of tools you are familiar with, such as your web browser0 or secure shell. ''; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.all; + maintainers = with maintainers; [ primeos ]; }; } diff --git a/pkgs/tools/security/monkeysphere/monkeysphere.patch b/pkgs/tools/security/monkeysphere/monkeysphere.patch index 8b343b93454f..fdf4b9335b19 100644 --- a/pkgs/tools/security/monkeysphere/monkeysphere.patch +++ b/pkgs/tools/security/monkeysphere/monkeysphere.patch @@ -1,92 +1,32 @@ -diff -rupN monkeysphere-0.37/Makefile monkeysphere-0.37-patched/Makefile ---- monkeysphere-0.37/Makefile 2014-08-06 19:27:38.000000000 +0200 -+++ monkeysphere-0.37-patched/Makefile 2015-07-31 19:51:57.539373097 +0200 -@@ -42,11 +42,11 @@ install: all installman - mkdir -p $(DESTDIR)$(PREFIX)/share/doc/monkeysphere - printf "Monkeysphere %s\n" $(MONKEYSPHERE_VERSION) > $(DESTDIR)$(PREFIX)/share/monkeysphere/VERSION - install src/monkeysphere $(DESTDIR)$(PREFIX)/bin -- sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere -+ sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' $(DESTDIR)$(PREFIX)/bin/monkeysphere - install src/monkeysphere-host $(DESTDIR)$(PREFIX)/sbin -- sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-host -+ sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-host - install src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/sbin -- sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-authentication -+ sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-authentication - install src/monkeysphere-authentication-keys-for-user $(DESTDIR)$(PREFIX)/share/monkeysphere - install -m 0755 src/share/common $(DESTDIR)$(PREFIX)/share/monkeysphere - install -m 0644 src/share/defaultenv $(DESTDIR)$(PREFIX)/share/monkeysphere -@@ -59,8 +59,8 @@ install: all installman - ln -sf ../share/monkeysphere/keytrans $(DESTDIR)$(PREFIX)/bin/openpgp2pem - ln -sf ../share/monkeysphere/keytrans $(DESTDIR)$(PREFIX)/bin/openpgp2spki - install -m 0744 src/transitions/* $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions -- sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions/0.23 -- sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions/0.28 -+ sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions/0.23 -+ sed -i 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions/0.28 - install -m 0644 src/transitions/README.txt $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions - install -m 0644 src/share/m/* $(DESTDIR)$(PREFIX)/share/monkeysphere/m - install -m 0644 src/share/mh/* $(DESTDIR)$(PREFIX)/share/monkeysphere/mh -diff -rupN monkeysphere-0.37/src/share/checkperms monkeysphere-0.37-patched/src/share/checkperms ---- monkeysphere-0.37/src/share/checkperms 2014-08-06 19:27:38.000000000 +0200 -+++ monkeysphere-0.37-patched/src/share/checkperms 2015-07-31 19:52:18.170675985 +0200 +diff --git a/Makefile b/Makefile +--- a/Makefile ++++ b/Makefile +@@ -52,7 +52,7 @@ clean: + replaced/%: % + mkdir -p $(dir $@) + sed < $< > $@ \ +- -e 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' \ ++ -e 's:__SYSSHAREDIR_PREFIX__:$(DESTDIR):' \ + -e 's:__SYSCONFDIR_PREFIX__:$(ETCPREFIX):' \ + -e 's:__SYSDATADIR_PREFIX__:$(LOCALSTATEDIR):' + +diff --git a/src/share/checkperms b/src/share/checkperms +--- a/src/share/checkperms ++++ b/src/share/checkperms @@ -1,4 +1,4 @@ -#!/usr/bin/perl -T +#!/usr/bin/perl # checkperms: ensure as best we can that a given file can only be # modified by the given user (or the superuser, naturally). This -diff -rupN monkeysphere-0.37/src/share/keytrans monkeysphere-0.37-patched/src/share/keytrans ---- monkeysphere-0.37/src/share/keytrans 2014-08-06 19:27:38.000000000 +0200 -+++ monkeysphere-0.37-patched/src/share/keytrans 2015-07-31 20:13:36.664514290 +0200 +diff --git a/src/share/keytrans b/src/share/keytrans +--- a/src/share/keytrans ++++ b/src/share/keytrans @@ -1,4 +1,4 @@ -#!/usr/bin/perl -T +#!/usr/bin/perl # keytrans: this is an RSA key translation utility; it is capable of # transforming RSA keys (both public keys and secret keys) between -@@ -1069,7 +1069,7 @@ sub packetwalk { - - - for (basename($0)) { -- if (/^pem2openpgp$/) { -+ if (/pem2openpgp/) { - my $rsa; - my $stdin; - -@@ -1107,7 +1107,7 @@ for (basename($0)) { - } - ); - } -- elsif (/^openpgp2ssh$/) { -+ elsif (/openpgp2ssh/) { - my $fpr = shift; - my $instream; - open($instream,'-'); -@@ -1123,7 +1123,7 @@ for (basename($0)) { - die "No matching key found.\n"; - } - } -- elsif (/^openpgp2pem$/) { -+ elsif (/openpgp2pem/) { - my $fpr = shift; - my $instream; - open($instream,'-'); -@@ -1139,7 +1139,7 @@ for (basename($0)) { - die "No matching key found.\n"; - } - } -- elsif (/^openpgp2spki$/) { -+ elsif (/openpgp2spki/) { - my $fpr = shift; - my $instream; - open($instream,'-'); -@@ -1151,7 +1151,7 @@ for (basename($0)) { - die "No matching key found.\n"; - } - } -- elsif (/^keytrans$/) { -+ elsif (/keytrans/) { - # subcommands when keytrans is invoked directly are UNSUPPORTED, - # UNDOCUMENTED, and WILL NOT BE MAINTAINED. - my $subcommand = shift; +-- +2.16.3 diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix index 40c999d80f13..2712186ec5d1 100644 --- a/pkgs/tools/system/s6-rc/default.nix +++ b/pkgs/tools/system/s6-rc/default.nix @@ -1,27 +1,18 @@ -{ stdenv, execline, fetchgit, skalibs, s6 }: +{ stdenv, skawarePackages }: -let +with skawarePackages; - version = "0.4.0.1"; +buildPackage { + pname = "s6-rc"; + version = "0.4.1.0"; + sha256 = "1xl37xi509pcm5chcvn8l7gb952sr5mkpxhpkbsxhsllj791bfa2"; -in stdenv.mkDerivation rec { - - name = "s6-rc-${version}"; - - src = fetchgit { - url = "git://git.skarnet.org/s6-rc"; - rev = "refs/tags/v${version}"; - sha256 = "10gkkdbvkb4s2yshx425v9diwm7vvbl320a2bm0c3wz71xr94wsw"; - }; + description = "A service manager for s6-based systems"; + platforms = stdenv.lib.platforms.linux; outputs = [ "bin" "lib" "dev" "doc" "out" ]; - dontDisableStatic = true; - - enableParallelBuilding = true; - configureFlags = [ - "--enable-absolute-paths" "--libdir=\${lib}/lib" "--libexecdir=\${lib}/libexec" "--dynlibdir=\${lib}/lib" @@ -37,22 +28,15 @@ in stdenv.mkDerivation rec { "--with-dynlib=${skalibs.lib}/lib" "--with-dynlib=${execline.lib}/lib" "--with-dynlib=${s6.out}/lib" - ] - ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) - ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.hostPlatform.system}"); + ]; postInstall = '' - mkdir -p $doc/share/doc/s6-rc/ + # remove all s6 executables from build directory + rm $(find -name "s6-rc-*" -type f -mindepth 1 -maxdepth 1 -executable) + rm s6-rc libs6rc.* + mv doc $doc/share/doc/s6-rc/html mv examples $doc/share/doc/s6-rc/examples ''; - meta = { - homepage = http://skarnet.org/software/s6-rc/; - description = "A service manager for s6-based systems"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ]; - }; - } diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix index d7ade3cdb290..031439d56d5c 100644 --- a/pkgs/tools/system/s6/default.nix +++ b/pkgs/tools/system/s6/default.nix @@ -1,31 +1,21 @@ -{ stdenv, execline, fetchgit, skalibs }: +{ stdenv, skawarePackages }: -let +with skawarePackages; - version = "2.7.1.1"; +buildPackage { + pname = "s6"; + version = "2.7.2.0"; + sha256 = "02canrzmhr66gi16ldyylk378jlmyfl73vn72ayr12h2wyxgqm5g"; -in stdenv.mkDerivation rec { - - name = "s6-${version}"; - - src = fetchgit { - url = "git://git.skarnet.org/s6"; - rev = "refs/tags/v${version}"; - sha256 = "0dncw3h9wc4cgc9q8zjwicgbcqcn6722yhk8g9bvrhs7h4fkfqav"; - }; + description = "skarnet.org's small & secure supervision software suite"; # NOTE lib: cannot split lib from bin at the moment, # since some parts of lib depend on executables in bin. # (the `*_startf` functions in `libs6`) - outputs = [ /*"bin" "lib"*/ "out" "dev" "doc" ]; - dontDisableStatic = true; - - enableParallelBuilding = true; - + # TODO: nsss support configureFlags = [ - "--enable-absolute-paths" "--libdir=\${out}/lib" "--libexecdir=\${out}/libexec" "--dynlibdir=\${out}/lib" @@ -38,22 +28,15 @@ in stdenv.mkDerivation rec { "--with-lib=${execline.lib}/lib" "--with-dynlib=${skalibs.lib}/lib" "--with-dynlib=${execline.lib}/lib" - ] - ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) - ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.hostPlatform.system}"); + ]; postInstall = '' - mkdir -p $doc/share/doc/s6/ + # remove all s6 executables from build directory + rm $(find -type f -mindepth 1 -maxdepth 1 -executable) + rm libs6.* + mv doc $doc/share/doc/s6/html mv examples $doc/share/doc/s6/examples ''; - meta = { - homepage = http://www.skarnet.org/software/s6/; - description = "skarnet.org's small & secure supervision software suite"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ]; - }; - } diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index f70f0f3d75b2..81c88ecad9e5 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -1,19 +1,26 @@ -{ stdenv, fetchFromGitHub, rustPlatform, asciidoc, docbook_xsl, libxslt }: +{ stdenv, fetchFromGitHub, rustPlatform, asciidoc, docbook_xsl, libxslt +, Security +, withPCRE2 ? false, pcre2 ? null +}: rustPlatform.buildRustPackage rec { name = "ripgrep-${version}"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "BurntSushi"; repo = "ripgrep"; rev = version; - sha256 = "089xffrqi4wm0w1lhy5iqxrcb82ca44bxl8qps4ilv0ih91vxwfj"; + sha256 = "017fz5kv1kv9jz7mb7vcxrklf5vybvfz2x61g6myzshqz4z1v1yb"; }; - cargoSha256 = "1wsw7s1bc1gnpq4kjzkas5zf2snhpx9f6cyrrf6g5jr8l0hcbyih"; + cargoSha256 = "0k2b2vbklfdjk2zdc8ip480drc12gy1whlwj94p44hr3402azcgr"; + + cargoBuildFlags = stdenv.lib.optional withPCRE2 "--features pcre2"; nativeBuildInputs = [ asciidoc docbook_xsl libxslt ]; + buildInputs = (stdenv.lib.optional withPCRE2 pcre2) + ++ (stdenv.lib.optional stdenv.isDarwin Security); preFixup = '' mkdir -p "$out/man/man1" diff --git a/pkgs/tools/typesetting/pdf2htmlEX/default.nix b/pkgs/tools/typesetting/pdf2htmlEX/default.nix index e0f3681f43d8..ad9684910c0b 100644 --- a/pkgs/tools/typesetting/pdf2htmlEX/default.nix +++ b/pkgs/tools/typesetting/pdf2htmlEX/default.nix @@ -43,5 +43,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = [ maintainers.taktoa ]; platforms = with platforms; linux; + broken = true; # 2018-09-08 }; } diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index 8b3e320fd269..41ec8ad52694 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -35,7 +35,7 @@ let mkUniquePkgs = pkgs: fastUnique (a: b: a < b) # highlighting hack: > # here we deal with those dummy packages needed for hyphenation filtering - (map (p: if lib.isDerivation p then builtins.toPath p else "") pkgs); + (map (p: if lib.isDerivation p then p.outPath else "") pkgs); in buildEnv { name = "texlive-${extraName}-${bin.texliveYear}"; diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/pkgs/tools/virtualization/euca2ools/default.nix index ce628ff84b5e..5b310992afb6 100644 --- a/pkgs/tools/virtualization/euca2ools/default.nix +++ b/pkgs/tools/virtualization/euca2ools/default.nix @@ -15,7 +15,7 @@ in buildPythonApplication rec { propagatedBuildInputs = [ boto m2crypto ]; meta = { - homepage = http://open.eucalyptus.com/downloads; + homepage = https://github.com/eucalyptus/euca2ools; description = "Tools for interacting with Amazon EC2/S3-compatible cloud computing services"; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c05f01ec839e..fed02f40134d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -292,6 +292,8 @@ mapAliases ({ vimprobable2Wrapper = vimprobable2; # added 2015-01 virtviewer = virt-viewer; # added 2015-12-24 vorbisTools = vorbis-tools; # added 2016-01-26 + weechat-xmpp = weechatScripts.weechat-xmpp; # added 2018-09-06 + weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # added 2018-09-06 wineStaging = wine-staging; # added 2018-01-08 winusb = woeusb; # added 2017-12-22 wireguard = wireguard-tools; # added 2018-05-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26409db6d01d..249e96610841 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -129,8 +129,7 @@ with pkgs; digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox { }; - # go 1.9 pin until https://github.com/moby/moby/pull/35739 - dockerTools = callPackage ../build-support/docker { go = go_1_9; }; + dockerTools = callPackage ../build-support/docker { }; docker_compose = pythonPackages.docker_compose; @@ -1462,6 +1461,8 @@ with pkgs; noteshrink = callPackage ../tools/misc/noteshrink { }; + noti = callPackage ../tools/misc/noti { }; + nrsc5 = callPackage ../applications/misc/nrsc5 { }; nwipe = callPackage ../tools/security/nwipe { }; @@ -2345,7 +2346,9 @@ with pkgs; enblend-enfuse = callPackage ../tools/graphics/enblend-enfuse { }; - cryfs = callPackage ../tools/filesystems/cryfs { }; + cryfs = callPackage ../tools/filesystems/cryfs { + spdlog = spdlog_0; + }; encfs = callPackage ../tools/filesystems/encfs { tinyxml2 = tinyxml-2; @@ -2385,7 +2388,7 @@ with pkgs; exempi = callPackage ../development/libraries/exempi { }; - execline = callPackage ../tools/misc/execline { }; + execline = skawarePackages.execline; exif = callPackage ../tools/graphics/exif { }; @@ -2909,7 +2912,10 @@ with pkgs; }) (x: { configureFlags = x.configureFlags ++ ["--with-cgraph=no"];}); grin = callPackage ../tools/text/grin { }; - ripgrep = callPackage ../tools/text/ripgrep { }; + + ripgrep = callPackage ../tools/text/ripgrep { + inherit (darwin.apple_sdk.frameworks) Security; + }; grive2 = callPackage ../tools/filesystems/grive2 { }; @@ -3356,7 +3362,7 @@ with pkgs; jaaa = callPackage ../applications/audio/jaaa { }; jackett = callPackage ../servers/jackett { - mono = mono50; + mono = mono5; }; jade = callPackage ../tools/text/sgml/jade { }; @@ -5066,13 +5072,13 @@ with pkgs; s3gof3r = callPackage ../tools/networking/s3gof3r { }; - s6-dns = callPackage ../tools/networking/s6-dns { }; + s6-dns = skawarePackages.s6-dns; - s6-linux-utils = callPackage ../os-specific/linux/s6-linux-utils { }; + s6-linux-utils = skawarePackages.s6-linux-utils; - s6-networking = callPackage ../tools/networking/s6-networking { }; + s6-networking = skawarePackages.s6-networking; - s6-portable-utils = callPackage ../tools/misc/s6-portable-utils { }; + s6-portable-utils = skawarePackages.s6-portable-utils; sablotron = callPackage ../tools/text/xml/sablotron { }; @@ -6040,9 +6046,7 @@ with pkgs; wireguard-go = callPackage ../tools/networking/wireguard-go { }; - wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf { - overrideDerivation = lib.overrideDerivation; - }; + wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf { }; wml = callPackage ../development/web/wml { }; @@ -6908,7 +6912,7 @@ with pkgs; jikes = callPackage ../development/compilers/jikes { }; - julia = callPackage ../development/compilers/julia { + julia_06 = callPackage ../development/compilers/julia { gmp = gmp6; openblas = openblasCompat; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; @@ -6927,6 +6931,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; }; + julia = julia_06; + jwasm = callPackage ../development/compilers/jwasm { }; kotlin = callPackage ../development/compilers/kotlin { }; @@ -7135,7 +7141,8 @@ with pkgs; opaline = callPackage ../development/tools/ocaml/opaline { }; - opam = callPackage ../development/tools/ocaml/opam { + opam = callPackage ../development/tools/ocaml/opam { }; + opam_1_2 = callPackage ../development/tools/ocaml/opam/1.2.2.nix { inherit (ocaml-ng.ocamlPackages_4_05) ocaml; }; @@ -7954,6 +7961,11 @@ with pkgs; inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; }; + bazel_jdk10 = callPackage ../development/tools/build-managers/bazel { + inherit (darwin) cctools; + inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; + runJdk = jdk10; + }; bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { }; buildifier = bazel-buildtools; @@ -8743,13 +8755,9 @@ with pkgs; texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { }; texinfo6 = callPackage ../development/tools/misc/texinfo/6.5.nix { }; texinfo = texinfo6; - texinfoInteractive = appendToName "interactive" (texinfo.override { - interactive = true; - # doCheck = true -> some xlocale.h problem with perl 5.28.0 - # (it's mistakenly trying to include the non-existent header) - perl = perl526; - buildPackages = buildPackages // { perl = buildPackages.perl526; }; - }); + texinfoInteractive = appendToName "interactive" ( + texinfo.override { interactive = true; } + ); texi2html = callPackage ../development/tools/misc/texi2html { }; @@ -11242,6 +11250,8 @@ with pkgs; mtpfs = callPackage ../tools/filesystems/mtpfs { }; + mtxclient = callPackage ../development/libraries/mtxclient { }; + mu = callPackage ../tools/networking/mu { texinfo = texinfo4; }; @@ -11315,6 +11325,8 @@ with pkgs; nss_wrapper = callPackage ../development/libraries/nss_wrapper { }; + nsss = skawarePackages.nsss; + ntbtls = callPackage ../development/libraries/ntbtls { }; ntk = callPackage ../development/libraries/audio/ntk { }; @@ -12007,7 +12019,24 @@ with pkgs; shibboleth-sp = callPackage ../development/libraries/shibboleth-sp { }; - skalibs = callPackage ../development/libraries/skalibs { }; + skalibs = skawarePackages.skalibs; + + skawarePackages = recurseIntoAttrs { + buildPackage = callPackage ../build-support/skaware/build-skaware-package.nix { }; + + skalibs = callPackage ../development/libraries/skalibs { }; + execline = callPackage ../tools/misc/execline { }; + + s6 = callPackage ../tools/system/s6 { }; + s6-dns = callPackage ../tools/networking/s6-dns { }; + s6-linux-utils = callPackage ../os-specific/linux/s6-linux-utils { }; + s6-networking = callPackage ../tools/networking/s6-networking { }; + s6-portable-utils = callPackage ../tools/misc/s6-portable-utils { }; + s6-rc = callPackage ../tools/system/s6-rc { }; + + nsss = callPackage ../development/libraries/nsss { }; + + }; skydive = callPackage ../tools/networking/skydive { }; @@ -13103,6 +13132,8 @@ with pkgs; nas = callPackage ../servers/nas { }; + nats-streaming-server = callPackage ../servers/nats-streaming-server { }; + neard = callPackage ../servers/neard { }; nginx = nginxStable; @@ -13419,9 +13450,9 @@ with pkgs; boost = boost159; }; - s6 = callPackage ../tools/system/s6 { }; + s6 = skawarePackages.s6; - s6-rc = callPackage ../tools/system/s6-rc { }; + s6-rc = skawarePackages.s6-rc; supervise = callPackage ../tools/system/supervise { }; @@ -13675,6 +13706,8 @@ with pkgs; bluez5 = callPackage ../os-specific/linux/bluez { }; + pulseaudio-modules-bt = callPackage ../applications/audio/pulseaudio-modules-bt { }; + bluez = bluez5; inherit (python3Packages) bedup; @@ -14437,6 +14470,8 @@ with pkgs; govers = callPackage ../development/tools/govers { }; + govendor = callPackage ../development/tools/govendor { }; + gotools = callPackage ../development/tools/gotools { }; gotop = callPackage ../tools/system/gotop { }; @@ -14520,6 +14555,8 @@ with pkgs; policycoreutils = callPackage ../os-specific/linux/policycoreutils { }; + semodule-utils = callPackage ../os-specific/linux/semodule-utils { }; + powerdns = callPackage ../servers/dns/powerdns { }; dnsdist = callPackage ../servers/dns/dnsdist { }; @@ -17823,6 +17860,8 @@ with pkgs; nanoblogger = callPackage ../applications/misc/nanoblogger { }; + nanorc = callPackage ../applications/editors/nano/nanorc { }; + navipowm = callPackage ../applications/misc/navipowm { }; navit = libsForQt5.callPackage ../applications/misc/navit { }; @@ -18813,6 +18852,8 @@ with pkgs; nylas-mail-bin = callPackage ../applications/networking/mailreaders/nylas-mail-bin { }; + thonny = callPackage ../applications/editors/thonny { }; + thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { inherit (gnome2) libIDL; libpng = libpng_apng; @@ -19179,13 +19220,7 @@ with pkgs; guile = guile_2_0; }; - weechat-matrix-bridge = callPackage ../applications/networking/instant-messengers/weechat-matrix-bridge { - inherit (luaPackages) cjson; - }; - - weechat-xmpp = callPackage ../applications/networking/instant-messengers/weechat-xmpp { - inherit (pythonPackages) pydns; - }; + weechatScripts = callPackage ../applications/networking/irc/weechat/scripts { }; westonLite = weston.override { pango = null; @@ -19571,6 +19606,8 @@ with pkgs; yate = callPackage ../applications/misc/yate { }; + ydiff = callPackage ../development/tools/ydiff { }; + yed = callPackage ../applications/graphics/yed {}; inherit (gnome3) yelp; @@ -19714,7 +19751,7 @@ with pkgs; chessdb = callPackage ../games/chessdb { }; - chessx = libsForQt5.callPackage ../games/chessx { }; + chessx = libsForQt59.callPackage ../games/chessx { }; chocolateDoom = callPackage ../games/chocolate-doom { }; @@ -20199,6 +20236,8 @@ with pkgs; nativeOnly = true; }).run; + steamcmd = steamPackages.steamcmd; + linux-steam-integration = callPackage ../games/linux-steam-integration { gtk = pkgs.gtk3; }; @@ -20604,6 +20643,8 @@ with pkgs; ezminc = callPackage ../applications/science/biology/EZminc { }; + hisat2 = callPackage ../applications/science/biology/hisat2 { }; + htslib = callPackage ../development/libraries/science/biology/htslib { }; igv = callPackage ../applications/science/biology/igv { }; @@ -21283,29 +21324,7 @@ with pkgs; fastnlo = callPackage ../development/libraries/physics/fastnlo { }; - geant4 = callPackage ../development/libraries/physics/geant4 { - enableMultiThreading = true; - enableG3toG4 = false; - enableInventor = false; - enableGDML = false; - enableQT = false; - enableXM = false; - enableOpenGLX11 = true; - enableRaytracerX11 = false; - - # Optional system packages, otherwise internal GEANT4 packages are used. - clhep = null; - zlib = null; - - # For enableGDML. - xercesc = null; - - # For enableQT. - qt = null; # qt4SDK or qt5SDK - - # For enableXM. - motif = null; # motif or lesstif - }; + geant4 = libsForQt5.callPackage ../development/libraries/physics/geant4 { }; cernlib = callPackage ../development/libraries/physics/cernlib { }; @@ -22216,9 +22235,14 @@ with pkgs; inherit (gnome2) gtksourceview; }; - bullet = callPackage ../development/libraries/bullet {}; + bullet = callPackage ../development/libraries/bullet { + inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; + }; - spdlog = callPackage ../development/libraries/spdlog { }; + inherit (callPackages ../development/libraries/spdlog { }) + spdlog_0 spdlog_1; + + spdlog = spdlog_1; dart = callPackage ../development/interpreters/dart { }; dart_stable = dart.override { version = "1.24.3"; }; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index ba82bd217fdc..a83c3baaa4a0 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -178,7 +178,7 @@ let for file in elpy.el elpy-pkg.el; do substituteInPlace $file \ --replace "company \"0.8.2\"" "company \"${company.version}\"" \ - --replace "find-file-in-project \"3.3\"" "find-file-in-project \"${find-file-in-project.version}\"" \ + --replace "find-file-in-project \"3.3\"" "find-file-in-project \"${(melpaPackages self).find-file-in-project.version}\"" \ --replace "highlight-indentation \"0.5.0\"" "highlight-indentation \"${highlight-indentation.version}\"" \ --replace "pyvenv \"1.3\"" "pyvenv \"${pyvenv.version}\"" \ --replace "yasnippet \"0.8.0\"" "yasnippet \"${yasnippet.version}\"" @@ -226,31 +226,6 @@ let ess-R-object-popup = callPackage ../applications/editors/emacs-modes/ess-R-object-popup { }; - find-file-in-project = melpaBuild rec { - pname = "find-file-in-project"; - version = "3.5"; - src = fetchFromGitHub { - owner = "technomancy"; - repo = pname; - rev = "53a8d8174f915d9dcf5ac6954b1c0cae61266177"; - sha256 = "0wky8vqg08iw34prbz04bqmhfhj82y93swb8zkz6la2vf9da0gmd"; - }; - recipe = writeText "recipe" '' - (find-file-in-project - :repo "technomancy/find-file-in-project" - :fetcher github) - ''; - meta = { - description = "Quick access to project files in Emacs"; - longDescription = '' - Find files in a project quickly. - This program provides a couple methods for quickly finding any file in a - given project. It depends on GNU find. - ''; - license = gpl3Plus; - }; - }; - filesets-plus = callPackage ../applications/editors/emacs-modes/filesets-plus { }; font-lock-plus = callPackage ../applications/editors/emacs-modes/font-lock-plus { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 7b6af70ebcf9..f5e5cfb3972b 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -564,6 +564,8 @@ let result = callPackage ../development/ocaml-modules/ocaml-result { }; + seq = callPackage ../development/ocaml-modules/seq { }; + sequence = callPackage ../development/ocaml-modules/sequence { }; spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8903436d5955..6bf58f5db28d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1250,7 +1250,6 @@ let meta = { description = "Serves PODs right from your Catalyst application"; license = stdenv.lib.licenses.bsd3; - maintainers = [ maintainers.rycee ]; }; }; @@ -1478,7 +1477,6 @@ let propagatedBuildInputs = [ CatalystPluginFormValidator FormValidatorSimple ]; meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -1506,7 +1504,6 @@ let meta = { description = "Catalyst Plugin for Log::Handler"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ stdenv.lib.maintainers.rycee ]; }; }; @@ -1534,7 +1531,6 @@ let meta = { description = "Per-session custom expiry times"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ stdenv.lib.maintainers.rycee ]; }; }; @@ -1572,7 +1568,6 @@ let meta = { description = "File storage backend for session data"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ stdenv.lib.maintainers.rycee ]; }; }; @@ -1614,7 +1609,6 @@ let meta = { description = "Handle passing of status messages between screens of a web application"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ stdenv.lib.maintainers.rycee ]; }; }; @@ -1629,7 +1623,6 @@ let meta = { description = "CSV view class"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -1752,7 +1745,6 @@ let meta = { description = "Handle Common Gateway Interface requests and responses"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -1895,7 +1887,6 @@ let meta = { description = "Unified cache handling interface"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -2509,7 +2500,6 @@ let homepage = https://github.com/rjbs/Config-INI; description = "Simple .ini-file format"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -2568,7 +2558,6 @@ let homepage = https://github.com/rjbs/Config-MVP; description = "Multivalue-property package-oriented configuration"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -2631,6 +2620,7 @@ let prePatch = '' # Attempts to use network. rm t/01-proxy-http.t + rm t/01-proxy-proc-safeexec.t ''; meta = { description = "A generic connection to a hierarchical-structured data set"; @@ -2801,7 +2791,6 @@ let meta = { description = "Read and write Changes files"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ rycee ]; }; }; @@ -3074,7 +3063,6 @@ let meta = with stdenv.lib; { description = "Perl wrapper around OpenSSL's AES library"; license = with licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; platforms = platforms.unix; }; }; @@ -3561,7 +3549,6 @@ let meta = { description = "Domain and host name validation"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -3576,7 +3563,6 @@ let meta = { description = "IPv4 and IPv6 validation methods"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -3590,7 +3576,6 @@ let meta = { description = "Common URL validation methods"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -3823,7 +3808,6 @@ let meta = { description = "Parse and format MySQL dates and times"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -4333,7 +4317,6 @@ let meta = { description = "Adding keywords to perl, in perl"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ rycee ]; }; }; @@ -4495,7 +4478,6 @@ let meta = { description = "Perl extension for 32 bit Jenkins Hashing Algorithm"; license = stdenv.lib.licenses.artistic2; - maintainers = [ maintainers.rycee ]; }; }; @@ -4915,7 +4897,6 @@ let homepage = https://github.com/rjbs/Email-Abstract; description = "Unified interface to mail representations"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -4967,7 +4948,6 @@ let homepage = https://github.com/rjbs/Email-Date-Format; description = "Produce RFC 2822 date strings"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -5009,7 +4989,6 @@ let homepage = https://github.com/rjbs/Email-MIME; description = "Easy MIME message handling"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ rycee ]; }; }; @@ -5038,7 +5017,6 @@ let homepage = https://github.com/rjbs/Email-MIME-ContentType; description = "Parse a MIME Content-Type Header"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ rycee ]; }; propagatedBuildInputs = [ Encode ]; }; @@ -5054,7 +5032,6 @@ let homepage = https://github.com/rjbs/Email-MIME-Encodings; description = "A unified interface to MIME encoding and decoding"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ rycee ]; }; }; @@ -5069,7 +5046,6 @@ let homepage = https://github.com/rjbs/Email-Send; description = "Simply Sending Email"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; buildInputs = [ MIMETools MailTools ]; }; @@ -5102,7 +5078,6 @@ let homepage = https://github.com/rjbs/Email-Sender; description = "A library for sending email"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -5117,7 +5092,6 @@ let homepage = https://github.com/rjbs/Email-Simple; description = "Simple parsing of RFC2822 message format and headers"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -5140,7 +5114,6 @@ let propagatedBuildInputs = [ EmailValid ]; meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -5220,7 +5193,6 @@ let meta = { description = "Determine the locale encoding"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -5936,7 +5908,6 @@ let meta = { description = "Determine MIME types of data or files using libmagic"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -6053,7 +6024,6 @@ let meta = { description = "Read a file backwards by lines"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -6239,7 +6209,6 @@ let homepage = https://github.com/tommybutler/file-util/wiki; description = "Easy, versatile, portable file handling"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -6352,7 +6321,6 @@ let meta = { description = "Validation with simple chains of constraints"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; buildInputs = [ CGI ]; }; @@ -6868,7 +6836,6 @@ let meta = { description = "Provide the stuff missing in Hash::Util"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -7591,7 +7558,6 @@ let meta = { description = "Alternative but compatible interface to modules that export symbols"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -7694,7 +7660,6 @@ let meta = { description = "Open an HTML file with automatic charset detection"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -7825,7 +7790,6 @@ let meta = { description = "IO::Socket with read/write timeout"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -8785,7 +8749,6 @@ let homepage = https://github.com/preaction/Log-Any; description = "Bringing loggers and listeners together"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -8830,7 +8793,6 @@ let meta = { description = "Log messages to several outputs"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -8890,7 +8852,6 @@ let homepage = https://mschilli.github.io/log4perl/; description = "Log4j implementation for Perl"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -9221,7 +9182,6 @@ let meta = { description = "Various e-mail related modules"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -9510,7 +9470,6 @@ let meta = { description = "Low-calorie MIME generator (DEPRECATED)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -9551,7 +9510,6 @@ let homepage = https://github.com/rjbs/mixin-linewise; description = "Write your linewise code for handles; this does the rest"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -10031,10 +9989,10 @@ let }; }; Mojolicious = buildPerlPackage rec { - name = "Mojolicious-7.93"; + name = "Mojolicious-7.88"; src = fetchurl { url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz"; - sha256 = "00c30fc566fee0823af0a75bdf4f170531655df14beca6d51f0e453a43aaad5d"; + sha256 = "4c4c9c05131fcd175cd6370e15d2586baec1a3ec882cb6971e1f5f52b5e0d785"; }; meta = { homepage = https://mojolicious.org/; @@ -10095,7 +10053,6 @@ let meta = { description = "Minimalist Object Orientation (with Moose compatibility)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -10403,7 +10360,6 @@ let homepage = https://github.com/gfx/mousex-getopt; description = "A Mouse role for processing command line options"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -10504,7 +10460,6 @@ let homepage = https://github.com/moose/MooseX-Getopt; description = "A Moose role for processing command line options"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -10763,7 +10718,6 @@ let homepage = https://github.com/moose/MooseX-Types; description = "Organise your Moose types in libraries"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -11060,7 +11014,6 @@ let meta = { description = "Manages IPv4 and IPv6 addresses and subnets"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -11253,7 +11206,6 @@ let meta = { description = "Work with TLD names"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -11694,6 +11646,8 @@ let sha256 = "91c177f30f82302eaf3173356eef05c21bc82163df752acb469177bd14a72db9"; }; buildInputs = [ pkgs.zookeeper_mt ]; + # fix "error: format not a string literal and no format arguments [-Werror=format-security]" + hardeningDisable = stdenv.lib.optional (stdenv.lib.versionAtLeast perl.version "5.28") "format"; NIX_CFLAGS_COMPILE = "-I${pkgs.zookeeper_mt}/include"; NIX_CFLAGS_LINK = "-L${pkgs.zookeeper_mt.out}/lib -lzookeeper_mt"; meta = { @@ -11794,7 +11748,6 @@ let homepage = https://github.com/dluxhu/perl-parallel-forkmanager; description = "A simple parallel processing fork manager"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -12189,7 +12142,6 @@ let meta = { description = "A PerlIO layer that adds read & write timeout to a handle"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -12811,7 +12763,6 @@ let homepage = https://github.com/rjbs/Pod-Elemental-PerlMunger; description = "A thing that takes a string of Perl and rewrites its documentation"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -12852,7 +12803,6 @@ let homepage = https://github.com/neilb/Pod-POM; description = "POD Object Model"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -12866,7 +12816,6 @@ let meta = { description = "Generate the TOC of a POD with Pod::POM"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -13041,7 +12990,6 @@ let homepage = https://github.com/rjbs/Pod-Weaver; description = "Weave together a Pod document from an outline"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -13105,7 +13053,6 @@ let homepage = https://github.com/sanko/readonly; description = "Facility for creating read-only scalars, arrays, hashes"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -13130,7 +13077,6 @@ let homepage = https://github.com/PerlRedis/perl-redis; description = "Perl binding for Redis database"; license = stdenv.lib.licenses.artistic2; - maintainers = [ maintainers.rycee ]; platforms = stdenv.lib.platforms.unix; }; }; @@ -13318,7 +13264,6 @@ let meta = { description = "Roles. Like a nouvelle cuisine portion size slice of Moose"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -13593,7 +13538,6 @@ let homepage = https://github.com/rjbs/Software-License; description = "Packages that provide templated software licenses"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -14147,7 +14091,6 @@ let homepage = https://github.com/rjbs/Sub-Exporter-ForMethods; description = "Helper routines for using Sub::Exporter to build methods"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -14201,7 +14144,6 @@ let meta = { description = "Tool for inspecting subroutines"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -14228,7 +14170,6 @@ let homepage = https://github.com/p5sagit/Sub-Name; description = "(Re)name a sub"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -14408,7 +14349,6 @@ let meta = { description = "Perl interface to the UNIX syslog(3) calls"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -14797,7 +14737,6 @@ let meta = { description = "Format a header and rows into a table"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -14873,7 +14812,6 @@ let meta = { description = "Distribution with a rich set of tools built upon the Test2 framework"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -14964,7 +14902,6 @@ let meta = { description = "Easily create test classes in an xUnit/JUnit style"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -15173,7 +15110,6 @@ let homepage = https://github.com/rjbs/Test-Fatal; description = "Incredibly simple helpers for testing code with exceptions"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -15860,7 +15796,6 @@ let meta = { description = "Basic utilities for writing tests"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -16015,7 +15950,6 @@ let homepage = https://github.com/karenetheridge/Test-Warnings; description = "Test for warnings and the lack of them"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -16212,7 +16146,6 @@ let meta = { description = "Comma-separated values manipulator (using XS or PurePerl)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -16226,7 +16159,6 @@ let meta = { description = "Encoding aware Text::CSV"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -16734,7 +16666,6 @@ let homepage = https://github.com/rjbs/Throwable; description = "A role for classes that can be thrown"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index ef6da6ed8042..f235cb639df4 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -198,9 +198,9 @@ let }; xdebug26 = assert isPhp7; buildPecl { - name = "xdebug-2.6.0"; + name = "xdebug-2.6.1"; - sha256 = "1p6b54ypi5lq4ka3pyy2gswdf1d5vjb9y8lp9fqcp3zn7g04q9mm"; + sha256 = "0xxxy6n4lv7ghi9liqx133yskg07lw316vhcds43n1sjq3b93rns"; doCheck = true; checkTarget = "test"; @@ -335,11 +335,11 @@ let composer = pkgs.stdenv.mkDerivation rec { name = "composer-${version}"; - version = "1.6.5"; + version = "1.7.2"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "0d1lpvq8wylh5qgxhbqb5r7j3c6qk0bz4b5vg187jsl6z6fvxgk7"; + sha256 = "03km8qw3nshj7qzk5pidziha2ldx1l2yxhh2s7vpg25f9782hd7c"; }; unpackPhase = ":"; @@ -504,11 +504,11 @@ let psysh = pkgs.stdenv.mkDerivation rec { name = "psysh-${version}"; - version = "0.9.6"; + version = "0.9.8"; src = pkgs.fetchurl { url = "https://github.com/bobthecow/psysh/releases/download/v${version}/psysh-v${version}.tar.gz"; - sha256 = "06icmyn7v229mpfplqj76kjnp1gh4ns0nrxa7bsckyqhzi425kc6"; + sha256 = "0xs9bl0hplkm2hajmm4qca65bm2x7wnx4vbmk0d2jxpvwrgqgnzd"; }; phases = [ "installPhase" ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 55bf9f74518b..7ca55835abf6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -300,6 +300,8 @@ in { fire = callPackage ../development/python-modules/fire { }; + genanki = callPackage ../development/python-modules/genanki { }; + globus-sdk = callPackage ../development/python-modules/globus-sdk { }; goocalendar = callPackage ../development/python-modules/goocalendar { }; @@ -336,6 +338,8 @@ in { mail-parser = callPackage ../development/python-modules/mail-parser { }; + markerlib = callPackage ../development/python-modules/markerlib { }; + monty = callPackage ../development/python-modules/monty { }; mpi4py = callPackage ../development/python-modules/mpi4py { @@ -540,6 +544,8 @@ in { seekpath = callPackage ../development/python-modules/seekpath { }; + selectors2 = callPackage ../development/python-modules/selectors2 { }; + serversyncstorage = callPackage ../development/python-modules/serversyncstorage {}; simpleeval = callPackage ../development/python-modules/simpleeval { }; @@ -572,6 +578,8 @@ in { trio = callPackage ../development/python-modules/trio {}; + sniffio = callPackage ../development/python-modules/sniffio { }; + tokenserver = callPackage ../development/python-modules/tokenserver {}; toml = callPackage ../development/python-modules/toml { }; @@ -1452,6 +1460,8 @@ in { disabled = !isPy27; + buildInputs = optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.IOKit ]; + src = pkgs.fetchurl { url = "http://cddb-py.sourceforge.net/${name}.tar.gz"; sha256 = "098xhd575ibvdx7i3dny3lwi851yxhjg2hn5jbbgrwj833rg5l5w"; @@ -1708,35 +1718,7 @@ in { idna = callPackage ../development/python-modules/idna { }; - mahotas = buildPythonPackage rec { - name = "python-mahotas-${version}"; - version = "1.4.2"; - - src = pkgs.fetchurl { - url = "https://github.com/luispedro/mahotas/archive/v${version}.tar.gz"; - sha256 = "1mvsxh0pa5vdvbknlv1m68n7gw2cv4pyqgqp3r770rnmf6nxbp7m"; - }; - - buildInputs = with self; [ - nose - pillow - scipy - ]; - propagatedBuildInputs = with self; [ - numpy - imread - ]; - - disabled = stdenv.isi686; # Failing tests - - meta = with stdenv.lib; { - description = "Computer vision package based on numpy"; - homepage = http://mahotas.readthedocs.io/; - maintainers = with maintainers; [ luispedro ]; - license = licenses.mit; - platforms = platforms.linux; - }; - }; + mahotas = callPackage ../development/python-modules/mahotas { }; MDP = callPackage ../development/python-modules/mdp {}; @@ -2604,48 +2586,9 @@ in { GeoIP = callPackage ../development/python-modules/GeoIP { }; - gmpy = buildPythonPackage rec { - name = "gmpy-1.17"; - disabled = isPyPy; + gmpy = callPackage ../development/python-modules/gmpy { }; - src = pkgs.fetchurl { - url = "mirror://pypi/g/gmpy/${name}.zip"; - sha256 = "1a79118a5332b40aba6aa24b051ead3a31b9b3b9642288934da754515da8fa14"; - }; - - buildInputs = [ - pkgs.gcc - pkgs.gmp - ]; - - meta = { - description = "GMP or MPIR interface to Python 2.4+ and 3.x"; - homepage = http://code.google.com/p/gmpy/; - }; - }; - - gmpy2 = buildPythonPackage rec { - name = "gmpy2-2.0.6"; - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/g/gmpy2/${name}.zip"; - sha256 = "5041d0ae24407c24487106099f5bcc4abb1a5f58d90e6712cc95321975eddbd4"; - }; - - buildInputs = [ - pkgs.gcc - pkgs.gmp - pkgs.mpfr - pkgs.libmpc - ]; - - meta = { - description = "GMP/MPIR, MPFR, and MPC interface to Python 2.6+ and 3.x"; - homepage = http://code.google.com/p/gmpy/; - license = licenses.gpl3Plus; - }; - }; + gmpy2 = callPackage ../development/python-modules/gmpy2 { }; gmusicapi = with pkgs; buildPythonPackage rec { name = "gmusicapi-10.1.0"; @@ -3712,6 +3655,8 @@ in { }; }; + phe = callPackage ../development/python-modules/phe { }; + phpserialize = callPackage ../development/python-modules/phpserialize { }; plaid-python = callPackage ../development/python-modules/plaid-python { }; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 06978d1067bf..ff09fa5ad1fd 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -79,11 +79,17 @@ let # The old identifiers for cross-compiling. These should eventually be removed, # and the packages that rely on them refactored accordingly. - platformCompat = self: super: let - inherit (super.stdenv) buildPlatform hostPlatform targetPlatform; - in { - inherit buildPlatform hostPlatform targetPlatform; - inherit (buildPlatform) system; + platformCompat = self: super: { + buildPlatform = lib.warn + "top-level `buildPlatform` is deprecated since 18.09. Please use `stdenv.buildPlatform`." + super.stdenv.buildPlatform; + hostPlatform = lib.warn + "top-level `hostPlatform` is deprecated since 18.09. Please use `stdenv.hostPlatform`." + super.stdenv.hostPlatform; + targetPlatform = lib.warn + "top-level `targetPlatform` is deprecated since 18.09. Please use `stdenv.targetPlatform`." + super.stdenv.targetPlatform; + inherit (super.stdenv.hostPlatform) system; }; splice = self: super: import ./splice.nix lib self (buildPackages != null);