diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-05-08 09:36:00 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-05-08 09:36:00 -0500 |
commit | 6748534d83fa05cc6dee0f11bce543f7672b351f (patch) | |
tree | a0d303182dd9e0c8ae149316270b732715e9ae64 | |
parent | 4f7cdd35d58e3d32ba576e218316b3c835bc508c (diff) | |
parent | 3510b983c41196fce90729289c8c300ada1ccaea (diff) |
Merge remote-tracking branch 'upstream/master' into staging
317 files changed, 7447 insertions, 6305 deletions
diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 96a91c0fffbc9..b83e1eb7d82d0 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -136,7 +136,18 @@ checkConfigOutput "true" "$@" ./define-module-check.nix # Check coerced value. checkConfigOutput "\"42\"" config.value ./declare-coerced-value.nix checkConfigOutput "\"24\"" config.value ./declare-coerced-value.nix ./define-value-string.nix -checkConfigError 'The option value .* in .* is not.*string or signed integer.*' config.value ./declare-coerced-value.nix ./define-value-list.nix +checkConfigError 'The option value .* in .* is not.*string or signed integer convertible to it' config.value ./declare-coerced-value.nix ./define-value-list.nix + +# Check coerced value with unsound coercion +checkConfigOutput "12" config.value ./declare-coerced-value-unsound.nix +checkConfigError 'The option value .* in .* is not.*8 bit signed integer.* or string convertible to it' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix +checkConfigError 'unrecognised JSON value' config.value ./declare-coerced-value-unsound.nix ./define-value-string-arbitrary.nix + +# Check loaOf with long list. +checkConfigOutput "1 2 3 4 5 6 7 8 9 10" config.result ./loaOf-with-long-list.nix + +# Check loaOf with many merges of lists. +checkConfigOutput "1 2 3 4 5 6 7 8 9 10" config.result ./loaOf-with-many-list-merges.nix cat <<EOF ====== module tests ====== diff --git a/lib/tests/modules/declare-coerced-value-unsound.nix b/lib/tests/modules/declare-coerced-value-unsound.nix new file mode 100644 index 0000000000000..7a017f24e77d4 --- /dev/null +++ b/lib/tests/modules/declare-coerced-value-unsound.nix @@ -0,0 +1,10 @@ +{ lib, ... }: + +{ + options = { + value = lib.mkOption { + default = "12"; + type = lib.types.coercedTo lib.types.str lib.toInt lib.types.ints.s8; + }; + }; +} diff --git a/lib/tests/modules/define-value-string-arbitrary.nix b/lib/tests/modules/define-value-string-arbitrary.nix new file mode 100644 index 0000000000000..8e3abaf536a0d --- /dev/null +++ b/lib/tests/modules/define-value-string-arbitrary.nix @@ -0,0 +1,3 @@ +{ + value = "foobar"; +} diff --git a/lib/tests/modules/define-value-string-bigint.nix b/lib/tests/modules/define-value-string-bigint.nix new file mode 100644 index 0000000000000..f27e31985c922 --- /dev/null +++ b/lib/tests/modules/define-value-string-bigint.nix @@ -0,0 +1,3 @@ +{ + value = "1000"; +} diff --git a/lib/tests/modules/loaOf-with-long-list.nix b/lib/tests/modules/loaOf-with-long-list.nix new file mode 100644 index 0000000000000..f30903c47e504 --- /dev/null +++ b/lib/tests/modules/loaOf-with-long-list.nix @@ -0,0 +1,19 @@ +{ config, lib, ... }: + +{ + options = { + loaOfInt = lib.mkOption { + type = lib.types.loaOf lib.types.int; + }; + + result = lib.mkOption { + type = lib.types.str; + }; + }; + + config = { + loaOfInt = [ 1 2 3 4 5 6 7 8 9 10 ]; + + result = toString (lib.attrValues config.loaOfInt); + }; +} diff --git a/lib/tests/modules/loaOf-with-many-list-merges.nix b/lib/tests/modules/loaOf-with-many-list-merges.nix new file mode 100644 index 0000000000000..f8f8a8da82bc2 --- /dev/null +++ b/lib/tests/modules/loaOf-with-many-list-merges.nix @@ -0,0 +1,19 @@ +{ config, lib, ... }: + +{ + options = { + loaOfInt = lib.mkOption { + type = lib.types.loaOf lib.types.int; + }; + + result = lib.mkOption { + type = lib.types.str; + }; + }; + + config = { + loaOfInt = lib.mkMerge (map lib.singleton [ 1 2 3 4 5 6 7 8 9 10 ]); + + result = toString (lib.attrValues config.loaOfInt); + }; +} diff --git a/lib/types.nix b/lib/types.nix index a334db5c7247b..772716897725a 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -256,7 +256,7 @@ rec { functor = (defaultFunctor name) // { wrapped = elemType; }; }; - nonEmptyListOf = elemType: + nonEmptyListOf = elemType: let list = addCheck (types.listOf elemType) (l: l != []); in list // { description = "non-empty " + list.description; }; @@ -280,15 +280,26 @@ rec { # List or attribute set of ... loaOf = elemType: let - convertIfList = defIdx: def: + convertAllLists = defs: + let + padWidth = stringLength (toString (length defs)); + unnamedPrefix = i: "unnamed-" + fixedWidthNumber padWidth i + "."; + in + imap1 (i: convertIfList (unnamedPrefix i)) defs; + + convertIfList = unnamedPrefix: def: if isList def.value then - { inherit (def) file; - value = listToAttrs ( - imap1 (elemIdx: elem: - { name = elem.name or "unnamed-${toString defIdx}.${toString elemIdx}"; - value = elem; - }) def.value); - } + let + padWidth = stringLength (toString (length def.value)); + unnamed = i: unnamedPrefix + fixedWidthNumber padWidth i; + in + { inherit (def) file; + value = listToAttrs ( + imap1 (elemIdx: elem: + { name = elem.name or (unnamed elemIdx); + value = elem; + }) def.value); + } else def; listOnly = listOf elemType; @@ -297,7 +308,7 @@ rec { name = "loaOf"; description = "list or attribute set of ${elemType.description}s"; check = x: isList x || isAttrs x; - merge = loc: defs: attrOnly.merge loc (imap1 convertIfList defs); + merge = loc: defs: attrOnly.merge loc (convertAllLists defs); getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["<name?>"]); getSubModules = elemType.getSubModules; substSubModules = m: loaOf (elemType.substSubModules m); @@ -419,16 +430,13 @@ rec { assert coercedType.getSubModules == null; mkOptionType rec { name = "coercedTo"; - description = "${finalType.description} or ${coercedType.description}"; - check = x: finalType.check x || coercedType.check x; + description = "${finalType.description} or ${coercedType.description} convertible to it"; + check = x: finalType.check x || (coercedType.check x && finalType.check (coerceFunc x)); merge = loc: defs: let coerceVal = val: if finalType.check val then val - else let - coerced = coerceFunc val; - in assert finalType.check coerced; coerced; - + else coerceFunc val; in finalType.merge loc (map (def: def // { value = coerceVal def.value; }) defs); getSubOptions = finalType.getSubOptions; getSubModules = finalType.getSubModules; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4b584e6a1151e..e31b84b03b0b7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -998,6 +998,11 @@ github = "demin-dmitriy"; name = "Dmitriy Demin"; }; + demyanrogozhin = { + email = "demyan.rogozhin@gmail.com"; + github = "demyanrogozhin"; + name = "Demyan Rogozhin"; + }; derchris = { email = "derchris@me.com"; github = "derchrisuk"; @@ -1740,6 +1745,11 @@ github = "jdagilliland"; name = "Jason Gilliland"; }; + jD91mZM2 = { + email = "me@krake.one"; + github = "jD91mZM2"; + name = "jD91mZM2"; + }; jefdaj = { email = "jefdaj@gmail.com"; github = "jefdaj"; @@ -1815,6 +1825,11 @@ github = "joamaki"; name = "Jussi Maki"; }; + joelburget = { + email = "joelburget@gmail.com"; + github = "joelburget"; + name = "Joel Burget"; + }; joelmo = { email = "joel.moberg@gmail.com"; github = "joelmo"; diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index ec7b2f107e8e2..01b5e9d77460d 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -101,6 +101,12 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' that can be mapped onto the YAML configuration defined in <link xlink:href="https://github.com/docker/distribution/blob/v2.6.2/docs/configuration.md">the <varname>docker/distribution</varname> docs</link>. </para> </listitem> + <listitem> + <para> + <literal>googleearth</literal> has been removed from Nixpkgs. Google does not provide + a stable URL for Nixpkgs to use to package this proprietary software. + </para> + </listitem> </itemizedlist> </section> @@ -169,6 +175,64 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' for further reference. </para> </listitem> + <listitem> + <para> + The module for <option>security.dhparams</option> has two new options now: + </para> + + <variablelist> + <varlistentry> + <term><option>security.dhparams.stateless</option></term> + <listitem><para> + Puts the generated Diffie-Hellman parameters into the Nix store instead + of managing them in a stateful manner in + <filename class="directory">/var/lib/dhparams</filename>. + </para></listitem> + </varlistentry> + <varlistentry> + <term><option>security.dhparams.defaultBitSize</option></term> + <listitem><para> + The default bit size to use for the generated Diffie-Hellman parameters. + </para></listitem> + </varlistentry> + </variablelist> + + <note><para> + The path to the actual generated parameter files should now be queried + using + <literal>config.security.dhparams.params.<replaceable>name</replaceable>.path</literal> + because it might be either in the Nix store or in a directory configured + by <option>security.dhparams.path</option>. + </para></note> + + <note> + <title>For developers:</title> + <para> + Module implementers should not set a specific bit size in order to let + users configure it by themselves if they want to have a different bit + size than the default (2048). + </para> + <para> + An example usage of this would be: +<programlisting> +{ config, ... }: + +{ + security.dhparams.params.myservice = {}; + environment.etc."myservice.conf".text = '' + dhparams = ${config.security.dhparams.params.myservice.path} + ''; +} +</programlisting> + </para> + </note> + </listitem> + <listitem> + <para> + <literal>networking.networkmanager.useDnsmasq</literal> has been deprecated. Use + <literal>networking.networkmanager.dns</literal> instead. + </para> + </listitem> </itemizedlist> </section> </section> diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix index 986d80ff1b999..4095d9c6d00d4 100644 --- a/nixos/lib/make-ext4-fs.nix +++ b/nixos/lib/make-ext4-fs.nix @@ -14,7 +14,7 @@ in pkgs.stdenv.mkDerivation { name = "ext4-fs.img"; - nativeBuildInputs = with pkgs; [e2fsprogs libfaketime perl]; + nativeBuildInputs = with pkgs; [e2fsprogs.bin libfaketime perl]; buildCommand = '' @@ -83,5 +83,12 @@ pkgs.stdenv.mkDerivation { echo "--- Failed to create EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks) ---" return 1 fi + + # I have ended up with corrupted images sometimes, I suspect that happens when the build machine's disk gets full during the build. + if ! fsck.ext4 -n -f $out; then + echo "--- Fsck failed for EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks) ---" + cat errorlog + return 1 + fi ''; } diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 6bb556a0123c1..5ad28ea9499ef 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,6 +1,6 @@ { - x86_64-linux = "/nix/store/2gk7rk2sx2dkmsjr59gignrfdmya8f6s-nix-2.0.1"; - i686-linux = "/nix/store/5160glkphiv13qggnivyidg8r0491pbl-nix-2.0.1"; - aarch64-linux = "/nix/store/jk29zz3ns9vdkkclcyzzkpzp8dhv1x3i-nix-2.0.1"; - x86_64-darwin = "/nix/store/4a9czmrpd4hf3r80zcmga2c2lm3hbbvv-nix-2.0.1"; + x86_64-linux = "/nix/store/z6avpvg24f6d1br2sr6qlphsq3h4d91v-nix-2.0.2"; + i686-linux = "/nix/store/cdqjyb9srhwkc4gqbknnap7y31lws4yq-nix-2.0.2"; + aarch64-linux = "/nix/store/fbgaa3fb2am30klwv4lls44njwqh487a-nix-2.0.2"; + x86_64-darwin = "/nix/store/hs8mxsvdhm95dxgx943d74fws01j2zj3-nix-2.0.2"; } diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index 2e426c017080f..b482a5a675230 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -75,20 +75,20 @@ let cfg = config.documentation; in (mkIf cfg.man.enable { environment.systemPackages = [ pkgs.man-db ]; environment.pathsToLink = [ "/share/man" ]; - environment.extraOutputsToInstall = [ "man" ] ++ optional cfg.dev.enable [ "devman" ]; + environment.extraOutputsToInstall = [ "man" ] ++ optional cfg.dev.enable "devman"; }) (mkIf cfg.info.enable { environment.systemPackages = [ pkgs.texinfoInteractive ]; environment.pathsToLink = [ "/share/info" ]; - environment.extraOutputsToInstall = [ "info" ] ++ optional cfg.dev.enable [ "devinfo" ]; + environment.extraOutputsToInstall = [ "info" ] ++ optional cfg.dev.enable "devinfo"; }) (mkIf cfg.doc.enable { # TODO(@oxij): put it here and remove from profiles? # environment.systemPackages = [ pkgs.w3m ]; # w3m-nox? environment.pathsToLink = [ "/share/doc" ]; - environment.extraOutputsToInstall = [ "doc" ] ++ optional cfg.dev.enable [ "devdoc" ]; + environment.extraOutputsToInstall = [ "doc" ] ++ optional cfg.dev.enable "devdoc"; }) ]); diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 0ed820a32acc0..cc7d868498241 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -190,7 +190,7 @@ cadvisor = 167; nylon = 168; apache-kafka = 169; - panamax = 170; + #panamax = 170; # unused exim = 172; #fleet = 173; # unused #input = 174; # unused @@ -306,6 +306,7 @@ ceph = 288; duplicati = 289; monetdb = 290; + restic = 291; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -473,9 +474,9 @@ #chronos = 164; # unused gitlab = 165; nylon = 168; - panamax = 170; + #panamax = 170; # unused exim = 172; - fleet = 173; + #fleet = 173; # unused input = 174; sddm = 175; tss = 176; @@ -580,6 +581,7 @@ ceph = 288; duplicati = 289; monetdb = 290; + restic = 291; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 505c5497d36d9..6c4326046ef84 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -167,14 +167,13 @@ ./services/backup/mysql-backup.nix ./services/backup/postgresql-backup.nix ./services/backup/restic.nix + ./services/backup/restic-rest-server.nix ./services/backup/rsnapshot.nix ./services/backup/tarsnap.nix ./services/backup/znapzend.nix - ./services/cluster/fleet.nix ./services/cluster/kubernetes/default.nix ./services/cluster/kubernetes/dns.nix ./services/cluster/kubernetes/dashboard.nix - ./services/cluster/panamax.nix ./services/computing/boinc/client.nix ./services/computing/torque/server.nix ./services/computing/torque/mom.nix @@ -514,6 +513,7 @@ ./services/networking/murmur.nix ./services/networking/namecoind.nix ./services/networking/nat.nix + ./services/networking/ndppd.nix ./services/networking/networkmanager.nix ./services/networking/nftables.nix ./services/networking/ngircd.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index a1ead80cc2157..56b7bf00448c9 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -17,6 +17,7 @@ with lib; (mkRenamedOptionModule [ "networking" "enableIntel2100BGFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) (mkRenamedOptionModule [ "networking" "enableRalinkFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) (mkRenamedOptionModule [ "networking" "enableRTL8192cFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) + (mkRenamedOptionModule [ "networking" "networkmanager" "useDnsmasq" ] [ "networking" "networkmanager" "dns" ]) (mkRenamedOptionModule [ "services" "cadvisor" "host" ] [ "services" "cadvisor" "listenAddress" ]) (mkChangedOptionModule [ "services" "printing" "gutenprint" ] [ "services" "printing" "drivers" ] diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index e430c2ddb903d..9e5d636241e97 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -257,7 +257,7 @@ in if [ -e /tmp/lastExitCode ] && [ "$(cat /tmp/lastExitCode)" = "0" ]; then ${if data.activationDelay != null then '' - + ${data.preDelay} if [ -d '${lpath}' ]; then @@ -266,6 +266,10 @@ in systemctl --wait start acme-setlive-${cert}.service fi '' else data.postRun} + + # noop ensuring that the "if" block is non-empty even if + # activationDelay == null and postRun == "" + true fi ''; @@ -294,7 +298,7 @@ in chown '${data.user}:${data.group}' '${cpath}' fi ''; - script = + script = '' workdir="$(mktemp -d)" diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix index 55c75713101d3..e2b84c3e3b380 100644 --- a/nixos/modules/security/dhparams.nix +++ b/nixos/modules/security/dhparams.nix @@ -1,107 +1,173 @@ { config, lib, pkgs, ... }: -with lib; let + inherit (lib) mkOption types; cfg = config.security.dhparams; -in -{ + + bitType = types.addCheck types.int (b: b >= 16) // { + name = "bits"; + description = "integer of at least 16 bits"; + }; + + paramsSubmodule = { name, config, ... }: { + options.bits = mkOption { + type = bitType; + default = cfg.defaultBitSize; + description = '' + The bit size for the prime that is used during a Diffie-Hellman + key exchange. + ''; + }; + + options.path = mkOption { + type = types.path; + readOnly = true; + description = '' + The resulting path of the generated Diffie-Hellman parameters + file for other services to reference. This could be either a + store path or a file inside the directory specified by + <option>security.dhparams.path</option>. + ''; + }; + + config.path = let + generated = pkgs.runCommand "dhparams-${name}.pem" { + nativeBuildInputs = [ pkgs.openssl ]; + } "openssl dhparam -out \"$out\" ${toString config.bits}"; + in if cfg.stateful then "${cfg.path}/${name}.pem" else generated; + }; + +in { options = { security.dhparams = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to generate new DH params and clean up old DH params. + ''; + }; + params = mkOption { - description = - '' - Diffie-Hellman parameters to generate. - - The value is the size (in bits) of the DH params to generate. The - generated DH params path can be found in - <filename><replaceable>security.dhparams.path</replaceable>/<replaceable>name</replaceable>.pem</filename>. - - Note: The name of the DH params is taken as being the name of the - service it serves: the params will be generated before the said - service is started. - - Warning: If you are removing all dhparams from this list, you have - to leave security.dhparams.enable for at least one activation in - order to have them be cleaned up. This also means if you rollback to - a version without any dhparams the existing ones won't be cleaned - up. - ''; - type = with types; attrsOf int; + type = with types; let + coerce = bits: { inherit bits; }; + in attrsOf (coercedTo int coerce (submodule paramsSubmodule)); default = {}; - example = { nginx = 3072; }; + example = lib.literalExample "{ nginx.bits = 3072; }"; + description = '' + Diffie-Hellman parameters to generate. + + The value is the size (in bits) of the DH params to generate. The + generated DH params path can be found in + <literal>config.security.dhparams.params.<replaceable>name</replaceable>.path</literal>. + + <note><para>The name of the DH params is taken as being the name of + the service it serves and the params will be generated before the + said service is started.</para></note> + + <warning><para>If you are removing all dhparams from this list, you + have to leave <option>security.dhparams.enable</option> for at + least one activation in order to have them be cleaned up. This also + means if you rollback to a version without any dhparams the + existing ones won't be cleaned up. Of course this only applies if + <option>security.dhparams.stateful</option> is + <literal>true</literal>.</para></warning> + + <note><title>For module implementers:</title><para>It's recommended + to not set a specific bit size here, so that users can easily + override this by setting + <option>security.dhparams.defaultBitSize</option>.</para></note> + ''; + }; + + stateful = mkOption { + type = types.bool; + default = true; + description = '' + Whether generation of Diffie-Hellman parameters should be stateful or + not. If this is enabled, PEM-encoded files for Diffie-Hellman + parameters are placed in the directory specified by + <option>security.dhparams.path</option>. Otherwise the files are + created within the Nix store. + + <note><para>If this is <literal>false</literal> the resulting store + path will be non-deterministic and will be rebuilt every time the + <package>openssl</package> package changes.</para></note> + ''; + }; + + defaultBitSize = mkOption { + type = bitType; + default = 2048; + description = '' + This allows to override the default bit size for all of the + Diffie-Hellman parameters set in + <option>security.dhparams.params</option>. + ''; }; path = mkOption { - description = - '' - Path to the directory in which Diffie-Hellman parameters will be - stored. - ''; type = types.str; default = "/var/lib/dhparams"; - }; - - enable = mkOption { - description = - '' - Whether to generate new DH params and clean up old DH params. - ''; - default = false; - type = types.bool; + description = '' + Path to the directory in which Diffie-Hellman parameters will be + stored. This only is relevant if + <option>security.dhparams.stateful</option> is + <literal>true</literal>. + ''; }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf (cfg.enable && cfg.stateful) { systemd.services = { dhparams-init = { - description = "Cleanup old Diffie-Hellman parameters"; - wantedBy = [ "multi-user.target" ]; # Clean up even when no DH params is set + description = "Clean Up Old Diffie-Hellman Parameters"; + + # Clean up even when no DH params is set + wantedBy = [ "multi-user.target" ]; + + serviceConfig.RemainAfterExit = true; serviceConfig.Type = "oneshot"; - script = - # Create directory - '' - if [ ! -d ${cfg.path} ]; then - mkdir -p ${cfg.path} - fi - '' + + + script = '' + if [ ! -d ${cfg.path} ]; then + mkdir -p ${cfg.path} + fi + # Remove old dhparams - '' - for file in ${cfg.path}/*; do - if [ ! -f "$file" ]; then - continue - fi - '' + concatStrings (mapAttrsToList (name: value: - '' - if [ "$file" == "${cfg.path}/${name}.pem" ] && \ - ${pkgs.openssl}/bin/openssl dhparam -in "$file" -text | head -n 1 | grep "(${toString value} bit)" > /dev/null; then + for file in ${cfg.path}/*; do + if [ ! -f "$file" ]; then + continue + fi + ${lib.concatStrings (lib.mapAttrsToList (name: { bits, path, ... }: '' + if [ "$file" = ${lib.escapeShellArg path} ] && \ + ${pkgs.openssl}/bin/openssl dhparam -in "$file" -text \ + | head -n 1 | grep "(${toString bits} bit)" > /dev/null; then continue fi - '' - ) cfg.params) + - '' - rm $file - done - - # TODO: Ideally this would be removing the *former* cfg.path, though this - # does not seem really important as changes to it are quite unlikely - rmdir --ignore-fail-on-non-empty ${cfg.path} - ''; + '') cfg.params)} + rm $file + done + + # TODO: Ideally this would be removing the *former* cfg.path, though + # this does not seem really important as changes to it are quite + # unlikely + rmdir --ignore-fail-on-non-empty ${cfg.path} + ''; }; - } // - mapAttrs' (name: value: nameValuePair "dhparams-gen-${name}" { - description = "Generate Diffie-Hellman parameters for ${name} if they don't exist yet"; - after = [ "dhparams-init.service" ]; - before = [ "${name}.service" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig.Type = "oneshot"; - script = - '' - mkdir -p ${cfg.path} - if [ ! -f ${cfg.path}/${name}.pem ]; then - ${pkgs.openssl}/bin/openssl dhparam -out ${cfg.path}/${name}.pem ${toString value} - fi - ''; - }) cfg.params; + } // lib.mapAttrs' (name: { bits, path, ... }: lib.nameValuePair "dhparams-gen-${name}" { + description = "Generate Diffie-Hellman Parameters for ${name}"; + after = [ "dhparams-init.service" ]; + before = [ "${name}.service" ]; + wantedBy = [ "multi-user.target" ]; + unitConfig.ConditionPathExists = "!${path}"; + serviceConfig.Type = "oneshot"; + script = '' + mkdir -p ${lib.escapeShellArg cfg.path} + ${pkgs.openssl}/bin/openssl dhparam -out ${lib.escapeShellArg path} \ + ${toString bits} + ''; + }) cfg.params; }; } diff --git a/nixos/modules/services/backup/restic-rest-server.nix b/nixos/modules/services/backup/restic-rest-server.nix new file mode 100644 index 0000000000000..d4b47a0994101 --- /dev/null +++ b/nixos/modules/services/backup/restic-rest-server.nix @@ -0,0 +1,107 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.restic.server; +in +{ + meta.maintainers = [ maintainers.bachp ]; + + options.services.restic.server = { + enable = mkEnableOption "Restic REST Server"; + + listenAddress = mkOption { + default = ":8000"; + example = "127.0.0.1:8080"; + type = types.str; + description = "Listen on a specific IP address and port."; + }; + + dataDir = mkOption { + default = "/var/lib/restic"; + type = types.path; + description = "The directory for storing the restic repository."; + }; + + appendOnly = mkOption { + default = false; + type = types.bool; + description = '' + Enable append only mode. + This mode allows creation of new backups but prevents deletion and modification of existing backups. + This can be useful when backing up systems that have a potential of being hacked. + ''; + }; + + privateRepos = mkOption { + default = false; + type = types.bool; + description = '' + Enable private repos. + Grants access only when a subdirectory with the same name as the user is specified in the repository URL. + ''; + }; + + prometheus = mkOption { + default = false; + type = types.bool; + description = "Enable Prometheus metrics at /metrics."; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra commandline options to pass to Restic REST server. + ''; + }; + + package = mkOption { + default = pkgs.restic-rest-server; + defaultText = "pkgs.restic-rest-server"; + type = types.package; + description = "Restic REST server package to use."; + }; + }; + + config = mkIf cfg.enable { + systemd.services.restic-rest-server = { + description = "Restic REST Server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = '' + ${cfg.package}/bin/rest-server \ + --listen ${cfg.listenAddress} \ + --path ${cfg.dataDir} \ + ${optionalString cfg.appendOnly "--append-only"} \ + ${optionalString cfg.privateRepos "--private-repos"} \ + ${optionalString cfg.prometheus "--prometheus"} \ + ${escapeShellArgs cfg.extraFlags} \ + ''; + Type = "simple"; + User = "restic"; + Group = "restic"; + + # Security hardening + ReadWritePaths = [ cfg.dataDir ]; + PrivateTmp = true; + ProtectSystem = "strict"; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectControlGroups = true; + PrivateDevices = true; + }; + }; + + users.extraUsers.restic = { + group = "restic"; + home = cfg.dataDir; + createHome = true; + uid = config.ids.uids.restic; + }; + + users.extraGroups.restic.gid = config.ids.uids.restic; + }; +} diff --git a/nixos/modules/services/cluster/fleet.nix b/nixos/modules/services/cluster/fleet.nix deleted file mode 100644 index ec03be3959483..0000000000000 --- a/nixos/modules/services/cluster/fleet.nix +++ /dev/null @@ -1,150 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.fleet; - -in { - - ##### Interface - options.services.fleet = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable fleet service. - ''; - }; - - listen = mkOption { - type = types.listOf types.str; - default = [ "/var/run/fleet.sock" ]; - example = [ "/var/run/fleet.sock" "127.0.0.1:49153" ]; - description = '' - Fleet listening addresses. - ''; - }; - - etcdServers = mkOption { - type = types.listOf types.str; - default = [ "http://127.0.0.1:2379" ]; - description = '' - Fleet list of etcd endpoints to use. - ''; - }; - - publicIp = mkOption { - type = types.nullOr types.str; - default = ""; - description = '' - Fleet IP address that should be published with the local Machine's - state and any socket information. If not set, fleetd will attempt - to detect the IP it should publish based on the machine's IP - routing information. - ''; - }; - - etcdCafile = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - Fleet TLS ca file when SSL certificate authentication is enabled - in etcd endpoints. - ''; - }; - - etcdKeyfile = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - Fleet TLS key file when SSL certificate authentication is enabled - in etcd endpoints. - ''; - }; - - etcdCertfile = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - Fleet TLS cert file when SSL certificate authentication is enabled - in etcd endpoints. - ''; - }; - - metadata = mkOption { - type = types.attrsOf types.str; - default = {}; - apply = attrs: concatMapStringsSep "," (n: "${n}=${attrs."${n}"}") (attrNames attrs); - example = literalExample '' - { - region = "us-west"; - az = "us-west-1"; - } - ''; - description = '' - Key/value pairs that are published with the local to the fleet registry. - This data can be used directly by a client of fleet to make scheduling decisions. - ''; - }; - - extraConfig = mkOption { - type = types.attrsOf types.str; - apply = mapAttrs' (n: v: nameValuePair ("FLEET_" + n) v); - default = {}; - example = literalExample '' - { - VERBOSITY = 1; - ETCD_REQUEST_TIMEOUT = "2.0"; - AGENT_TTL = "40s"; - } - ''; - description = '' - Fleet extra config. See - <link xlink:href="https://github.com/coreos/fleet/blob/master/Documentation/deployment-and-configuration.md"/> - for configuration options. - ''; - }; - - }; - - ##### Implementation - config = mkIf cfg.enable { - systemd.services.fleet = { - description = "Fleet Init System Daemon"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" "fleet.socket" "etcd.service" "docker.service" ]; - requires = [ "fleet.socket" ]; - environment = { - FLEET_ETCD_SERVERS = concatStringsSep "," cfg.etcdServers; - FLEET_PUBLIC_IP = cfg.publicIp; - FLEET_ETCD_CAFILE = cfg.etcdCafile; - FLEET_ETCD_KEYFILE = cfg.etcdKeyfile; - FLEET_ETCD_CERTFILE = cfg.etcdCertfile; - FLEET_METADATA = cfg.metadata; - } // cfg.extraConfig; - serviceConfig = { - ExecStart = "${pkgs.fleet}/bin/fleetd"; - Group = "fleet"; - }; - }; - - systemd.sockets.fleet = { - description = "Fleet Socket for the API"; - wantedBy = [ "sockets.target" ]; - listenStreams = cfg.listen; - socketConfig = { - ListenStream = "/var/run/fleet.sock"; - SocketMode = "0660"; - SocketUser = "root"; - SocketGroup = "fleet"; - }; - }; - - services.etcd.enable = mkDefault true; - virtualisation.docker.enable = mkDefault true; - - environment.systemPackages = [ pkgs.fleet ]; - users.extraGroups.fleet.gid = config.ids.gids.fleet; - }; -} diff --git a/nixos/modules/services/cluster/panamax.nix b/nixos/modules/services/cluster/panamax.nix deleted file mode 100644 index 4475e8d8c24b4..0000000000000 --- a/nixos/modules/services/cluster/panamax.nix +++ /dev/null @@ -1,156 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.panamax; - - panamax_api = pkgs.panamax_api.override { dataDir = cfg.dataDir + "/api"; }; - panamax_ui = pkgs.panamax_ui.override { dataDir = cfg.dataDir + "/ui"; }; - -in { - - ##### Interface - options.services.panamax = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable Panamax service. - ''; - }; - - UIPort = mkOption { - type = types.int; - default = 8888; - description = '' - Panamax UI listening port. - ''; - }; - - APIPort = mkOption { - type = types.int; - default = 3000; - description = '' - Panamax UI listening port. - ''; - }; - - dataDir = mkOption { - type = types.str; - default = "/var/lib/panamax"; - description = '' - Data dir for Panamax. - ''; - }; - - fleetctlEndpoint = mkOption { - type = types.str; - default = "http://127.0.0.1:2379"; - description = '' - Panamax fleetctl endpoint. - ''; - }; - - journalEndpoint = mkOption { - type = types.str; - default = "http://127.0.0.1:19531"; - description = '' - Panamax journal endpoint. - ''; - }; - - secretKey = mkOption { - type = types.str; - default = "SomethingVeryLong."; - description = '' - Panamax secret key (do change this). - ''; - }; - - }; - - ##### Implementation - config = mkIf cfg.enable { - systemd.services.panamax-api = { - description = "Panamax API"; - - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" "fleet.service" "etcd.service" "docker.service" ]; - - path = [ panamax_api ]; - environment = { - RAILS_ENV = "production"; - JOURNAL_ENDPOINT = cfg.journalEndpoint; - FLEETCTL_ENDPOINT = cfg.fleetctlEndpoint; - PANAMAX_DATABASE_PATH = "${cfg.dataDir}/api/db/mnt/db.sqlite3"; - }; - - preStart = '' - rm -rf ${cfg.dataDir}/state/tmp - mkdir -p ${cfg.dataDir}/api/{db/mnt,state/log,state/tmp} - ln -sf ${panamax_api}/share/panamax-api/_db/{schema.rb,seeds.rb,migrate} ${cfg.dataDir}/api/db/ - - if [ ! -f ${cfg.dataDir}/.created ]; then - bundle exec rake db:setup - bundle exec rake db:seed - bundle exec rake panamax:templates:load || true - touch ${cfg.dataDir}/.created - else - bundle exec rake db:migrate - fi - ''; - - serviceConfig = { - ExecStart = "${panamax_api}/bin/bundle exec rails server --binding 127.0.0.1 --port ${toString cfg.APIPort}"; - User = "panamax"; - Group = "panamax"; - }; - }; - - systemd.services.panamax-ui = { - description = "Panamax UI"; - - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" "panamax_api.service" ]; - - path = [ panamax_ui ]; - environment = { - RAILS_ENV = "production"; - JOURNAL_ENDPOINT = cfg.journalEndpoint; - PMX_API_PORT_3000_TCP_ADDR = "localhost"; - PMX_API_PORT_3000_TCP_PORT = toString cfg.APIPort; - SECRET_KEY_BASE = cfg.secretKey; - }; - - preStart = '' - mkdir -p ${cfg.dataDir}/ui/state/{log,tmp} - chown -R panamax:panamax ${cfg.dataDir} - ''; - - serviceConfig = { - ExecStart = "${panamax_ui}/bin/bundle exec rails server --binding 127.0.0.1 --port ${toString cfg.UIPort}"; - User = "panamax"; - Group = "panamax"; - PermissionsStartOnly = true; - }; - }; - - users.extraUsers.panamax = - { uid = config.ids.uids.panamax; - description = "Panamax user"; - createHome = true; - home = cfg.dataDir; - extraGroups = [ "docker" ]; - }; - - services.journald.enableHttpGateway = mkDefault true; - services.fleet.enable = mkDefault true; - services.cadvisor.enable = mkDefault true; - services.cadvisor.port = mkDefault 3002; - virtualisation.docker.enable = mkDefault true; - - environment.systemPackages = [ panamax_api panamax_ui ]; - users.extraGroups.panamax.gid = config.ids.gids.panamax; - }; -} diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index 543e732127a53..96e60f9c88ea6 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -25,6 +25,7 @@ let ssl_cert = <${cfg.sslServerCert} ssl_key = <${cfg.sslServerKey} ${optionalString (!(isNull cfg.sslCACert)) ("ssl_ca = <" + cfg.sslCACert)} + ssl_dh = <${config.security.dhparams.path}/dovecot2.pem disable_plaintext_auth = yes '') @@ -297,10 +298,15 @@ in config = mkIf cfg.enable { - security.pam.services.dovecot2 = mkIf cfg.enablePAM {}; - services.dovecot2.protocols = + security.dhparams = mkIf (! isNull cfg.sslServerCert) { + enable = true; + params = { + dovecot2 = 2048; + }; + }; + services.dovecot2.protocols = optional cfg.enableImap "imap" ++ optional cfg.enablePop3 "pop3" ++ optional cfg.enableLmtp "lmtp"; diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index 7e880ad09b896..10901e1022251 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -395,7 +395,14 @@ in { }; url_preview_ip_range_blacklist = mkOption { type = types.listOf types.str; - default = []; + default = [ + "127.0.0.0/8" + "10.0.0.0/8" + "172.16.0.0/12" + "192.168.0.0/16" + "100.64.0.0/10" + "169.254.0.0/16" + ]; description = '' List of IP address CIDR ranges that the URL preview spider is denied from accessing. @@ -412,14 +419,7 @@ in { }; url_preview_url_blacklist = mkOption { type = types.listOf types.str; - default = [ - "127.0.0.0/8" - "10.0.0.0/8" - "172.16.0.0/12" - "192.168.0.0/16" - "100.64.0.0/10" - "169.254.0.0/16" - ]; + default = []; description = '' Optional list of URL matches that the URL preview spider is denied from accessing. diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index 20c0b0acf165c..c4bd0e7f9eef2 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -242,6 +242,9 @@ let # Don't allow traffic to leak out until the script has completed ip46tables -A INPUT -j nixos-drop + + ${cfg.extraStopCommands} + if ${startScript}; then ip46tables -D INPUT -j nixos-drop 2>/dev/null || true else diff --git a/nixos/modules/services/networking/matterbridge.nix b/nixos/modules/services/networking/matterbridge.nix index 5526e2ba23ac7..e2f4784059530 100644 --- a/nixos/modules/services/networking/matterbridge.nix +++ b/nixos/modules/services/networking/matterbridge.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ options, config, pkgs, lib, ... }: with lib; @@ -6,7 +6,11 @@ let cfg = config.services.matterbridge; - matterbridgeConfToml = pkgs.writeText "matterbridge.toml" (cfg.configFile); + matterbridgeConfToml = + if cfg.configPath == null then + pkgs.writeText "matterbridge.toml" (cfg.configFile) + else + cfg.configPath; in @@ -15,17 +19,32 @@ in services.matterbridge = { enable = mkEnableOption "Matterbridge chat platform bridge"; + configPath = mkOption { + type = with types; nullOr str; + default = null; + example = "/etc/nixos/matterbridge.toml"; + description = '' + The path to the matterbridge configuration file. + ''; + }; + configFile = mkOption { type = types.str; example = '' - #WARNING: as this file contains credentials, be sure to set correct file permissions [irc] + # WARNING: as this file contains credentials, do not use this option! + # It is kept only for backwards compatibility, and would cause your + # credentials to be in the nix-store, thus with the world-readable + # permission bits. + # Use services.matterbridge.configPath instead. + + [irc] [irc.freenode] Server="irc.freenode.net:6667" Nick="matterbot" [mattermost] [mattermost.work] - #do not prefix it wit http:// or https:// + # Do not prefix it with http:// or https:// Server="yourmattermostserver.domain" Team="yourteam" Login="yourlogin" @@ -44,6 +63,10 @@ in channel="off-topic" ''; description = '' + WARNING: THIS IS INSECURE, as your password will end up in + <filename>/nix/store</filename>, thus publicly readable. Use + <literal>services.matterbridge.configPath</literal> instead. + The matterbridge configuration file in the TOML file format. ''; }; @@ -65,32 +88,31 @@ in }; }; - config = mkMerge [ - (mkIf cfg.enable { - - users.extraUsers = mkIf (cfg.user == "matterbridge") [ - { name = "matterbridge"; - group = "matterbridge"; - } ]; - - users.extraGroups = mkIf (cfg.group == "matterbridge") [ - { name = "matterbridge"; - } ]; - - systemd.services.matterbridge = { - description = "Matterbridge chat platform bridge"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - - serviceConfig = { - User = cfg.user; - Group = cfg.group; - ExecStart = "${pkgs.matterbridge.bin}/bin/matterbridge -conf ${matterbridgeConfToml}"; - Restart = "always"; - RestartSec = "10"; - }; + config = mkIf cfg.enable { + warnings = optional options.services.matterbridge.configFile.isDefined + "The option services.matterbridge.configFile is insecure and should be replaced with services.matterbridge.configPath"; + + users.extraUsers = optional (cfg.user == "matterbridge") + { name = "matterbridge"; + group = "matterbridge"; + }; + + users.extraGroups = optional (cfg.group == "matterbridge") + { name = "matterbridge"; }; - }) - ]; -} + systemd.services.matterbridge = { + description = "Matterbridge chat platform bridge"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + User = cfg.user; + Group = cfg.group; + ExecStart = "${pkgs.matterbridge.bin}/bin/matterbridge -conf ${matterbridgeConfToml}"; + Restart = "always"; + RestartSec = "10"; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix index 61d063dbfe0e8..6401631bf6209 100644 --- a/nixos/modules/services/networking/minidlna.nix +++ b/nixos/modules/services/networking/minidlna.nix @@ -1,23 +1,16 @@ # Module for MiniDLNA, a simple DLNA server. - { config, lib, pkgs, ... }: with lib; let - cfg = config.services.minidlna; - port = 8200; - in { - ###### interface - options = { - services.minidlna.enable = mkOption { type = types.bool; default = false; @@ -43,24 +36,48 @@ in ''; }; + services.minidlna.loglevel = mkOption { + type = types.str; + default = "warn"; + example = "general,artwork,database,inotify,scanner,metadata,http,ssdp,tivo=warn"; + description = + '' + Defines the type of messages that should be logged, and down to + which level of importance they should be considered. + + The possible types are “artwork”, “database”, “general”, “http”, + “inotify”, “metadata”, “scanner”, “ssdp” and “tivo”. + + The levels are “off”, “fatal”, “error”, “warn”, “info” and + “debug”, listed here in order of decreasing importance. “off” + turns off logging messages entirely, “fatal” logs the most + critical messages only, and so on down to “debug” that logs every + single messages. + + The types are comma-separated, followed by an equal sign (‘=’), + followed by a level that applies to the preceding types. This can + be repeated, separating each of these constructs with a comma. + + Defaults to “general,artwork,database,inotify,scanner,metadata, + http,ssdp,tivo=warn” which logs every type of message at the + “warn” level. + ''; + }; + services.minidlna.config = mkOption { type = types.lines; description = "The contents of MiniDLNA's configuration file."; }; - }; - ###### implementation - config = mkIf cfg.enable { - services.minidlna.config = '' port=${toString port} friendly_name=${config.networking.hostName} MiniDLNA db_dir=/var/cache/minidlna - log_level=warn + log_level=${cfg.loglevel} inotify=yes ${concatMapStrings (dir: '' media_dir=${dir} @@ -98,7 +115,5 @@ in " -f ${pkgs.writeText "minidlna.conf" cfg.config}"; }; }; - }; - } diff --git a/nixos/modules/services/networking/ndppd.nix b/nixos/modules/services/networking/ndppd.nix new file mode 100644 index 0000000000000..1d6c48dd8d378 --- /dev/null +++ b/nixos/modules/services/networking/ndppd.nix @@ -0,0 +1,47 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.ndppd; + + configFile = pkgs.runCommand "ndppd.conf" {} '' + substitute ${pkgs.ndppd}/etc/ndppd.conf $out \ + --replace eth0 ${cfg.interface} \ + --replace 1111:: ${cfg.network} + ''; +in { + options = { + services.ndppd = { + enable = mkEnableOption "daemon that proxies NDP (Neighbor Discovery Protocol) messages between interfaces"; + interface = mkOption { + type = types.string; + default = "eth0"; + example = "ens3"; + description = "Interface which is on link-level with router."; + }; + network = mkOption { + type = types.string; + default = "1111::"; + example = "2001:DB8::/32"; + description = "Network that we proxy."; + }; + configFile = mkOption { + type = types.nullOr types.path; + default = null; + description = "Path to configuration file."; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.packages = [ pkgs.ndppd ]; + environment.etc."ndppd.conf".source = if (cfg.configFile != null) then cfg.configFile else configFile; + systemd.services.ndppd = { + serviceConfig.RuntimeDirectory = [ "ndppd" ]; + wantedBy = [ "multi-user.target" ]; + }; + }; + + meta.maintainers = with maintainers; [ gnidorah ]; +} diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 10e96eb403623..f4c4adcaaeb89 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -10,7 +10,8 @@ let stateDirs = "/var/lib/NetworkManager /var/lib/dhclient /var/lib/misc"; dns = - if cfg.useDnsmasq then "dnsmasq" + if cfg.dns == "none" then "none" + else if cfg.dns == "dnsmasq" then "dnsmasq" else if config.services.resolved.enable then "systemd-resolved" else if config.services.unbound.enable then "unbound" else "default"; @@ -205,14 +206,20 @@ in { }; }; - useDnsmasq = mkOption { - type = types.bool; - default = false; + dns = mkOption { + type = types.enum [ "auto" "dnsmasq" "none" ]; + default = "auto"; description = '' - Enable NetworkManager's dnsmasq integration. NetworkManager will run - dnsmasq as a local caching nameserver, using a "split DNS" - configuration if you are connected to a VPN, and then update - resolv.conf to point to the local nameserver. + Options: + - auto: Check for systemd-resolved, unbound, or use default. + - dnsmasq: + Enable NetworkManager's dnsmasq integration. NetworkManager will run + dnsmasq as a local caching nameserver, using a "split DNS" + configuration if you are connected to a VPN, and then update + resolv.conf to point to the local nameserver. + - none: + Disable NetworkManager's DNS integration completely. + It will not touch your /etc/resolv.conf. ''; }; diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index 0b52b1d3e3026..fc910e59c323d 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -20,6 +20,7 @@ let zoneStats = length (collect (x: (x.zoneStats or null) != null) cfg.zones) > 0; }; + mkZoneFileName = name: if name == "." then "root" else name; nsdEnv = pkgs.buildEnv { name = "nsd-env"; @@ -50,8 +51,9 @@ let }; writeZoneData = name: text: pkgs.writeTextFile { - inherit name text; - destination = "/zones/${name}"; + name = "nsd-zone-${mkZoneFileName name}"; + inherit text; + destination = "/zones/${mkZoneFileName name}"; }; @@ -146,7 +148,7 @@ let zoneConfigFile = name: zone: '' zone: name: "${name}" - zonefile: "${stateDir}/zones/${name}" + zonefile: "${stateDir}/zones/${mkZoneFileName name}" ${maybeString "outgoing-interface: " zone.outgoingInterface} ${forEach " rrl-whitelist: " zone.rrlWhitelist} ${maybeString "zonestats: " zone.zoneStats} @@ -887,6 +889,12 @@ in config = mkIf cfg.enable { + assertions = singleton { + assertion = zoneConfigs ? "." -> cfg.rootServer; + message = "You have a root zone configured. If this is really what you " + + "want, please enable 'services.nsd.rootServer'."; + }; + environment.systemPackages = [ nsdPkg ]; users.extraGroups = singleton { diff --git a/nixos/modules/services/security/sshguard.nix b/nixos/modules/services/security/sshguard.nix index 7f09e8893c4d0..137c3d610186c 100644 --- a/nixos/modules/services/security/sshguard.nix +++ b/nixos/modules/services/security/sshguard.nix @@ -133,6 +133,7 @@ in { ReadOnlyDirectories = "/"; ReadWriteDirectories = "/run/sshguard /var/lib/sshguard"; RuntimeDirectory = "sshguard"; + StateDirectory = "sshguard"; CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW"; }; }; diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 815c3147e647d..0aa780bf6da16 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -38,6 +38,7 @@ let ${toString (flip mapAttrsToList upstream.servers (name: server: '' server ${name} ${optionalString server.backup "backup"}; ''))} + ${upstream.extraConfig} } '')); @@ -492,6 +493,13 @@ in ''; default = {}; }; + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + These lines go to the end of the upstream verbatim. + ''; + }; }; }); description = '' diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index 87a4ab2a586df..2ce04ed5342c4 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -4,6 +4,7 @@ use strict; use warnings; use File::Basename; use File::Slurp; +use Net::DBus; use Sys::Syslog qw(:standard :macros); use Cwd 'abs_path'; @@ -67,17 +68,15 @@ EOF $SIG{PIPE} = "IGNORE"; sub getActiveUnits { - # FIXME: use D-Bus or whatever to query this, since parsing the - # output of list-units is likely to break. - # Use current version of systemctl binary before daemon is reexeced. - my $lines = `LANG= /run/current-system/sw/bin/systemctl list-units --full --no-legend`; + my $mgr = Net::DBus->system->get_service("org.freedesktop.systemd1")->get_object("/org/freedesktop/systemd1"); + my $units = $mgr->ListUnitsByPatterns([], []); my $res = {}; - foreach my $line (split '\n', $lines) { - chomp $line; - last if $line eq ""; - $line =~ /^(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s/ or next; - next if $1 eq "UNIT"; - $res->{$1} = { load => $2, state => $3, substate => $4 }; + for my $item (@$units) { + my ($id, $description, $load_state, $active_state, $sub_state, + $following, $unit_path, $job_id, $job_type, $job_path) = @$item; + next unless $following eq ''; + next if $job_id == 0 and $active_state eq 'inactive'; + $res->{$id} = { load => $load_state, state => $active_state, substate => $sub_state }; } return $res; } diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 091a2e412eeda..e2d1dd49ef0ec 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -127,7 +127,8 @@ let configurationName = config.boot.loader.grub.configurationName; # Needed by switch-to-configuration. - perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl"; + + perl = "${pkgs.perl}/bin/perl " + (concatMapStringsSep " " (lib: "-I${lib}/${pkgs.perl.libPrefix}") (with pkgs.perlPackages; [ FileSlurp NetDBus XMLParser XMLTwig ])); } else throw "\nFailed assertions:\n${concatStringsSep "\n" (map (x: "- ${x}") failed)}"); # Replace runtime dependencies diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 66ff43c8547d7..f7ec5b088c1b8 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -23,9 +23,12 @@ let cfg = config.virtualisation; - qemuGraphics = if cfg.graphics then "" else "-nographic"; - kernelConsole = if cfg.graphics then "" else "console=${qemuSerialDevice}"; - ttys = [ "tty1" "tty2" "tty3" "tty4" "tty5" "tty6" ]; + qemuGraphics = lib.optionalString (!cfg.graphics) "-nographic"; + + # enable both serial console and tty0. select preferred console (last one) based on cfg.graphics + kernelConsoles = let + consoles = [ "console=${qemuSerialDevice},115200n8" "console=tty0" ]; + in lib.concatStringsSep " " (if cfg.graphics then consoles else reverseList consoles); # XXX: This is very ugly and in the future we really should use attribute # sets to build ALL of the QEMU flags instead of this mixed mess of Nix @@ -108,7 +111,7 @@ let ${mkDiskIfaceDriveFlag "0" "file=$NIX_DISK_IMAGE,cache=writeback,werror=report"} \ -kernel ${config.system.build.toplevel}/kernel \ -initrd ${config.system.build.toplevel}/initrd \ - -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${kernelConsole} $QEMU_KERNEL_PARAMS" \ + -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${kernelConsoles} $QEMU_KERNEL_PARAMS" \ ''} \ $extraDisks \ ${qemuGraphics} \ @@ -248,9 +251,10 @@ in default = true; description = '' - Whether to run QEMU with a graphics window, or access - the guest computer serial port through the host tty. - ''; + Whether to run QEMU with a graphics window, or in nographic mode. + Serial console will be enabled on both settings, but this will + change the preferred console. + ''; }; virtualisation.cores = diff --git a/nixos/release.nix b/nixos/release.nix index 8956d6df85518..6d94b1a3bb452 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -269,6 +269,7 @@ in rec { tests.containers-macvlans = callTest tests/containers-macvlans.nix {}; tests.couchdb = callTest tests/couchdb.nix {}; tests.deluge = callTest tests/deluge.nix {}; + tests.dhparams = callTest tests/dhparams.nix {}; tests.docker = callTestOnMatchingSystems ["x86_64-linux"] tests/docker.nix {}; tests.docker-tools = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-tools.nix {}; tests.docker-tools-overlay = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-tools-overlay.nix {}; @@ -284,7 +285,6 @@ in rec { tests.ferm = callTest tests/ferm.nix {}; tests.firefox = callTest tests/firefox.nix {}; tests.firewall = callTest tests/firewall.nix {}; - tests.fleet = callTestOnMatchingSystems ["x86_64-linux"] tests/fleet.nix {}; tests.fwupd = callTest tests/fwupd.nix {}; tests.gdk-pixbuf = callTest tests/gdk-pixbuf.nix {}; #tests.gitlab = callTest tests/gitlab.nix {}; @@ -361,7 +361,6 @@ in rec { tests.openldap = callTest tests/openldap.nix {}; tests.owncloud = callTest tests/owncloud.nix {}; tests.pam-oath-login = callTest tests/pam-oath-login.nix {}; - #tests.panamax = callTestOnMatchingSystems ["x86_64-linux"] tests/panamax.nix {}; tests.peerflix = callTest tests/peerflix.nix {}; tests.php-pcre = callTest tests/php-pcre.nix {}; tests.postgresql = callSubTests tests/postgresql.nix {}; diff --git a/nixos/tests/dhparams.nix b/nixos/tests/dhparams.nix new file mode 100644 index 0000000000000..d11dfeec5d0c1 --- /dev/null +++ b/nixos/tests/dhparams.nix @@ -0,0 +1,144 @@ +let + common = { pkgs, ... }: { + security.dhparams.enable = true; + environment.systemPackages = [ pkgs.openssl ]; + }; + +in import ./make-test.nix { + name = "dhparams"; + + nodes.generation1 = { pkgs, config, ... }: { + imports = [ common ]; + security.dhparams.params = { + # Use low values here because we don't want the test to run for ages. + foo.bits = 16; + # Also use the old format to make sure the type is coerced in the right + # way. + bar = 17; + }; + + systemd.services.foo = { + description = "Check systemd Ordering"; + wantedBy = [ "multi-user.target" ]; + unitConfig = { + # This is to make sure that the dhparams generation of foo occurs + # before this service so we need this service to start as early as + # possible to provoke a race condition. + DefaultDependencies = false; + + # We check later whether the service has been started or not. + ConditionPathExists = config.security.dhparams.params.foo.path; + }; + serviceConfig.Type = "oneshot"; + serviceConfig.RemainAfterExit = true; + # The reason we only provide an ExecStop here is to ensure that we don't + # accidentally trigger an error because a file system is not yet ready + # during very early startup (we might not even have the Nix store + # available, for example if future changes in NixOS use systemd mount + # units to do early file system initialisation). + serviceConfig.ExecStop = "${pkgs.coreutils}/bin/true"; + }; + }; + + nodes.generation2 = { + imports = [ common ]; + security.dhparams.params.foo.bits = 18; + }; + + nodes.generation3 = common; + + nodes.generation4 = { + imports = [ common ]; + security.dhparams.stateful = false; + security.dhparams.params.foo2.bits = 18; + security.dhparams.params.bar2.bits = 19; + }; + + nodes.generation5 = { + imports = [ common ]; + security.dhparams.defaultBitSize = 30; + security.dhparams.params.foo3 = {}; + security.dhparams.params.bar3 = {}; + }; + + testScript = { nodes, ... }: let + getParamPath = gen: name: let + node = "generation${toString gen}"; + in nodes.${node}.config.security.dhparams.params.${name}.path; + + assertParamBits = gen: name: bits: let + path = getParamPath gen name; + in '' + $machine->nest('check bit size of ${path}', sub { + my $out = $machine->succeed('openssl dhparam -in ${path} -text'); + $out =~ /^\s*DH Parameters:\s+\((\d+)\s+bit\)\s*$/m; + die "bit size should be ${toString bits} but it is $1 instead." + if $1 != ${toString bits}; + }); + ''; + + switchToGeneration = gen: let + node = "generation${toString gen}"; + inherit (nodes.${node}.config.system.build) toplevel; + switchCmd = "${toplevel}/bin/switch-to-configuration test"; + in '' + $machine->nest('switch to generation ${toString gen}', sub { + $machine->succeed('${switchCmd}'); + $main::machine = ''$${node}; + }); + ''; + + in '' + my $machine = $generation1; + + $machine->waitForUnit('multi-user.target'); + + subtest "verify startup order", sub { + $machine->succeed('systemctl is-active foo.service'); + }; + + subtest "check bit sizes of dhparam files", sub { + ${assertParamBits 1 "foo" 16} + ${assertParamBits 1 "bar" 17} + }; + + ${switchToGeneration 2} + + subtest "check whether bit size has changed", sub { + ${assertParamBits 2 "foo" 18} + }; + + subtest "ensure that dhparams file for 'bar' was deleted", sub { + $machine->fail('test -e ${getParamPath 1 "bar"}'); + }; + + ${switchToGeneration 3} + + subtest "ensure that 'security.dhparams.path' has been deleted", sub { + $machine->fail( + 'test -e ${nodes.generation3.config.security.dhparams.path}' + ); + }; + + ${switchToGeneration 4} + + subtest "check bit sizes dhparam files", sub { + ${assertParamBits 4 "foo2" 18} + ${assertParamBits 4 "bar2" 19} + }; + + subtest "check whether dhparam files are in the Nix store", sub { + $machine->succeed( + 'expr match ${getParamPath 4 "foo2"} ${builtins.storeDir}', + 'expr match ${getParamPath 4 "bar2"} ${builtins.storeDir}', + ); + }; + + ${switchToGeneration 5} + + subtest "check whether defaultBitSize works as intended", sub { + ${assertParamBits 5 "foo3" 30} + ${assertParamBits 5 "bar3" 30} + }; + ''; +} diff --git a/nixos/tests/fleet.nix b/nixos/tests/fleet.nix deleted file mode 100644 index 67c95446526f8..0000000000000 --- a/nixos/tests/fleet.nix +++ /dev/null @@ -1,76 +0,0 @@ -import ./make-test.nix ({ pkgs, ...} : rec { - name = "simple"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ offline ]; - }; - - nodes = { - node1 = - { config, pkgs, ... }: - { - services = { - etcd = { - enable = true; - listenPeerUrls = ["http://0.0.0.0:7001"]; - initialAdvertisePeerUrls = ["http://node1:7001"]; - initialCluster = ["node1=http://node1:7001" "node2=http://node2:7001"]; - }; - }; - - services.fleet = { - enable = true; - metadata.name = "node1"; - }; - - networking.firewall.allowedTCPPorts = [ 7001 ]; - }; - - node2 = - { config, pkgs, ... }: - { - services = { - etcd = { - enable = true; - listenPeerUrls = ["http://0.0.0.0:7001"]; - initialAdvertisePeerUrls = ["http://node2:7001"]; - initialCluster = ["node1=http://node1:7001" "node2=http://node2:7001"]; - }; - }; - - services.fleet = { - enable = true; - metadata.name = "node2"; - }; - - networking.firewall.allowedTCPPorts = [ 7001 ]; - }; - }; - - service = builtins.toFile "hello.service" '' - [Unit] - Description=Hello World - - [Service] - ExecStart=/bin/sh -c "while true; do echo \"Hello, world\"; /var/run/current-system/sw/bin/sleep 1; done" - - [X-Fleet] - MachineMetadata=name=node2 - ''; - - testScript = - '' - startAll; - $node1->waitForUnit("fleet.service"); - $node2->waitForUnit("fleet.service"); - - $node2->waitUntilSucceeds("fleetctl list-machines | grep node1"); - $node1->waitUntilSucceeds("fleetctl list-machines | grep node2"); - - $node1->succeed("cp ${service} hello.service && fleetctl submit hello.service"); - $node1->succeed("fleetctl list-unit-files | grep hello"); - $node1->succeed("fleetctl start hello.service"); - $node1->waitUntilSucceeds("fleetctl list-units | grep running"); - $node1->succeed("fleetctl stop hello.service"); - $node1->succeed("fleetctl destroy hello.service"); - ''; -}) diff --git a/nixos/tests/nsd.nix b/nixos/tests/nsd.nix index ad4d4f8224353..c3c91e71b5ca8 100644 --- a/nixos/tests/nsd.nix +++ b/nixos/tests/nsd.nix @@ -41,6 +41,7 @@ in import ./make-test.nix ({ pkgs, ...} : { { address = "dead:beef::1"; prefixLength = 64; } ]; services.nsd.enable = true; + services.nsd.rootServer = true; services.nsd.interfaces = lib.mkForce []; services.nsd.zones."example.com.".data = '' @ SOA ns.example.com noc.example.com 666 7200 3600 1209600 3600 @@ -55,6 +56,11 @@ in import ./make-test.nix ({ pkgs, ...} : { @ A 9.8.7.6 @ AAAA fedc::bbaa ''; + services.nsd.zones.".".data = '' + @ SOA ns.example.com noc.example.com 666 7200 3600 1209600 3600 + root A 1.8.7.4 + root AAAA acbd::4 + ''; }; }; @@ -86,6 +92,9 @@ in import ./make-test.nix ({ pkgs, ...} : { assertHost($_, "a", "deleg.example.com", qr/address 9.8.7.6$/); assertHost($_, "aaaa", "deleg.example.com", qr/address fedc::bbaa$/); + + assertHost($_, "a", "root", qr/address 1.8.7.4$/); + assertHost($_, "aaaa", "root", qr/address acbd::4$/); }; } ''; diff --git a/nixos/tests/panamax.nix b/nixos/tests/panamax.nix deleted file mode 100644 index 088aa79f8c615..0000000000000 --- a/nixos/tests/panamax.nix +++ /dev/null @@ -1,21 +0,0 @@ -import ./make-test.nix ({ pkgs, ...} : { - name = "panamax"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ offline ]; - }; - - machine = { config, pkgs, ... }: { - services.panamax.enable = true; - }; - - testScript = - '' - startAll; - $machine->waitForUnit("panamax-api.service"); - $machine->waitForUnit("panamax-ui.service"); - $machine->waitForOpenPort(3000); - $machine->waitForOpenPort(8888); - $machine->succeed("curl --fail http://localhost:8888/ > /dev/null"); - $machine->shutdown; - ''; -}) diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/altcoins/bitcoin-abc.nix index 35488732117d6..bd365e1673049 100644 --- a/pkgs/applications/altcoins/bitcoin-abc.nix +++ b/pkgs/applications/altcoins/bitcoin-abc.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version; - version = "0.17.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - sha256 = "1s2y29h2q4fnbrfg2ig1cd3h7g3kdcdyrfq7znq1ndnh8xj1j489"; + sha256 = "1kq9n3s9vhkmfaizsyi2cb91ibi06gb6wx0hkcb9hg3nrrvcka3y"; }; patches = [ ./fix-bitcoin-qt-build.patch ]; diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index c58178e3edbb1..9915e0a301a1b 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -86,4 +86,7 @@ rec { parity = callPackage ./parity { }; parity-beta = callPackage ./parity/beta.nix { }; + parity-ui = callPackage ./parity-ui { }; + + particl-core = callPackage ./particl/particl-core.nix { boost = boost165; miniupnpc = miniupnpc_2; withGui = false; }; } diff --git a/pkgs/applications/altcoins/nano-wallet/CMakeLists.txt.patch b/pkgs/applications/altcoins/nano-wallet/CMakeLists.txt.patch new file mode 100644 index 0000000000000..5bbec1d39bea2 --- /dev/null +++ b/pkgs/applications/altcoins/nano-wallet/CMakeLists.txt.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b43f02f6..4470abbf 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -119,7 +119,7 @@ endif (RAIBLOCKS_SECURE_RPC) + + include_directories (${CMAKE_SOURCE_DIR}) + +-set(Boost_USE_STATIC_LIBS ON) ++add_definitions(-DBOOST_LOG_DYN_LINK) + set(Boost_USE_MULTITHREADED ON) + + if (BOOST_CUSTOM) diff --git a/pkgs/applications/altcoins/nano-wallet/default.nix b/pkgs/applications/altcoins/nano-wallet/default.nix new file mode 100644 index 0000000000000..8c4722bd99171 --- /dev/null +++ b/pkgs/applications/altcoins/nano-wallet/default.nix @@ -0,0 +1,57 @@ +{lib, pkgs, stdenv, fetchFromGitHub, cmake, pkgconfig, boost, libGL, qtbase}: + +stdenv.mkDerivation rec { + + name = "nano-wallet-${version}"; + version = "12.1"; + + src = fetchFromGitHub { + owner = "nanocurrency"; + repo = "raiblocks"; + rev = "V${version}"; + sha256 = "10ng7qn6y31s2bjahmpivw2plx90ljjjzb87j3l7zmppsjd2iq03"; + fetchSubmodules = true; + }; + + # Use a patch to force dynamic linking + patches = [ + ./CMakeLists.txt.patch + ]; + + cmakeFlags = let + options = { + BOOST_ROOT = "${boost}"; + Boost_USE_STATIC_LIBS = "OFF"; + RAIBLOCKS_GUI = "ON"; + RAIBLOCKS_TEST = "ON"; + Qt5_DIR = "${qtbase.dev}/lib/cmake/Qt5"; + Qt5Core_DIR = "${qtbase.dev}/lib/cmake/Qt5Core"; + Qt5Gui_INCLUDE_DIRS = "${qtbase.dev}/include/QtGui"; + Qt5Widgets_INCLUDE_DIRS = "${qtbase.dev}/include/QtWidgets"; + }; + optionToFlag = name: value: "-D${name}=${value}"; + in lib.mapAttrsToList optionToFlag options; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ boost libGL qtbase ]; + + buildPhase = '' + make nano_wallet + ''; + + checkPhase = '' + ./core_test + ''; + + meta = { + inherit version; + description = "Wallet for Nano cryptocurrency"; + homepage = https://nano.org/en/wallet/; + license = lib.licenses.bsd2; + # Fails on Darwin. See: + # https://github.com/NixOS/nixpkgs/pull/39295#issuecomment-386800962 + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ jluttine ]; + }; + +} diff --git a/pkgs/applications/altcoins/parity-ui/default.nix b/pkgs/applications/altcoins/parity-ui/default.nix new file mode 100644 index 0000000000000..56a95b6d5968b --- /dev/null +++ b/pkgs/applications/altcoins/parity-ui/default.nix @@ -0,0 +1,50 @@ +{ stdenv, pkgs, fetchurl, lib, makeWrapper, nodePackages }: + +let + +uiEnv = pkgs.callPackage ./env.nix { }; + +in stdenv.mkDerivation rec { + name = "parity-ui-${version}"; + version = "0.1.1"; + + src = fetchurl { + url = "https://github.com/parity-js/shell/releases/download/v${version}/parity-ui_${version}_amd64.deb"; + sha256 = "1jym6q63m5f4xm06dxiiabhbqnr0hysf2d3swysncs5hg6w00lh3"; + name = "${name}.deb"; + }; + + nativeBuildInputs = [ makeWrapper nodePackages.asar ]; + + buildCommand = '' + mkdir -p $out/usr/ + ar p $src data.tar.xz | tar -C $out -xJ . + substituteInPlace $out/usr/share/applications/parity-ui.desktop \ + --replace "/opt/Parity UI" $out/bin + mv $out/usr/* $out/ + mv "$out/opt/Parity UI" $out/share/parity-ui + rm -r $out/usr/ + rm -r $out/opt/ + + fixupPhase + + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${uiEnv.libPath}:$out/share/parity-ui" \ + $out/share/parity-ui/parity-ui + + find $out/share/parity-ui -name "*.node" -exec patchelf --set-rpath "${uiEnv.libPath}:$out/share/parity-ui" {} \; + + paxmark m $out/share/parity-ui/parity-ui + + mkdir -p $out/bin + ln -s $out/share/parity-ui/parity-ui $out/bin/parity-ui + ''; + + meta = with stdenv.lib; { + description = "UI for Parity. Fast, light, robust Ethereum implementation"; + homepage = http://parity.io; + license = licenses.gpl3; + maintainers = [ maintainers.sorpaas ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/altcoins/parity-ui/env.nix b/pkgs/applications/altcoins/parity-ui/env.nix new file mode 100644 index 0000000000000..a273bf33d1006 --- /dev/null +++ b/pkgs/applications/altcoins/parity-ui/env.nix @@ -0,0 +1,19 @@ +{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig +, libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr +, nss, xorg, libcap, systemd, libnotify, libsecret, gnome3 }: + +let + packages = [ + stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 + fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr nss + xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst + xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr + xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify + xorg.libxcb libsecret gnome3.gconf + ]; + + libPathNative = lib.makeLibraryPath packages; + libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages; + libPath = "${libPathNative}:${libPath64}"; + +in { inherit packages libPath; } diff --git a/pkgs/applications/altcoins/particl/particl-core.nix b/pkgs/applications/altcoins/particl/particl-core.nix new file mode 100644 index 0000000000000..2524408429c38 --- /dev/null +++ b/pkgs/applications/altcoins/particl/particl-core.nix @@ -0,0 +1,47 @@ +{ stdenv +, autoreconfHook +, boost +, db48 +, fetchurl +, libevent +, libtool +, miniupnpc +, openssl +, pkgconfig +, utillinux +, zeromq +, zlib +, withGui +, unixtools +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "particl-core-${version}"; + version = "0.16.0.4"; + + src = fetchurl { + url = "https://github.com/particl/particl-core/archive/v${version}.tar.gz"; + sha256 = "1yy8pw13rn821jpi1zvzwi3ipxi1bgfxv8g6jz49qlbjzjmjcr68"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ + openssl db48 boost zlib miniupnpc libevent zeromq + unixtools.hexdump + ]; + + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]; + + meta = { + description = "Privacy-Focused Marketplace & Decentralized Application Platform"; + longDescription= '' + An open source, decentralized privacy platform built for global person to person eCommerce. + ''; + homepage = https://particl.io/; + maintainers = with maintainers; [ demyanrogozhin ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index f3a9b73aabe5e..cfd2a4173da70 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.17.1"; + version = "3.17.5"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "02k1br077v9c5x6nn0391vh28pvn1zjbkjv8h508vy7k6ch2xjyq"; + sha256 = "011bccvjy1rdrc43576hgfb7md404ziqmkam6na2z6v9km1b9gwr"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 660f342dc9d96..cacc6e04429df 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-18.2"; + name = "snd-18.3"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "0b0ija3cf2c9sqh3cclk5a7i73vagfkyw211aykfd76w7ibirs3r"; + sha256 = "117sgvdv0a03ys1v27bs99mgzpfm2a7xg6s0q6m1f79jniia12ss"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 1a4f2bdd1b5b4..5f6772256cab7 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, dpkg, xorg, alsaLib, makeWrapper, openssl, freetype -, glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng, GConf -, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome2 }: +, glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng +, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome3 }: let # Please update the stable branch! @@ -20,7 +20,6 @@ let ffmpeg_0_10 fontconfig freetype - GConf gdk_pixbuf glib gtk2 @@ -93,7 +92,7 @@ stdenv.mkDerivation { librarypath="${stdenv.lib.makeLibraryPath deps}:$libdir" wrapProgram $out/share/spotify/spotify \ --prefix LD_LIBRARY_PATH : "$librarypath" \ - --prefix PATH : "${gnome2.zenity}/bin" + --prefix PATH : "${gnome3.zenity}/bin" # Desktop file mkdir -p "$out/share/applications/" diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 4c4f958ec4937..6bf45f451a5d7 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -3,12 +3,12 @@ , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { - version = "20170428"; + version = "20180320"; name = "x42-plugins-${version}"; src = fetchurl { url = "http://gareus.org/misc/x42-plugins/${name}.tar.xz"; - sha256 = "0yi82rak2277x4nzzr5zwbsnha5pi61w975c8src2iwar2b6m0xg"; + sha256 = "167ly9nxqq3g0j35i9jv9rvd8qp4i9ncfcjxmg972cp6q8ak8mdl"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock index 87b011c4f8b40..a95ced76371d4 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock +++ b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock @@ -1,9 +1,9 @@ GEM remote: https://rubygems.org/ specs: - msgpack (1.2.2) + msgpack (1.2.4) multi_json (1.13.1) - neovim (0.6.2) + neovim (0.7.0) msgpack (~> 1.0) multi_json (~> 1.0) diff --git a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix index aefecbf5ba83a..af887161ea6cf 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix +++ b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix @@ -2,10 +2,10 @@ msgpack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1ai0sfdv9jnr333fsvkn7a8vqvn0iwiw83yj603a3i68ds1x6di1"; + sha256 = "09xy1wc4wfbd1jdrzgxwmqjzfdfxbz0cqdszq2gv6rmc3gv1c864"; type = "gem"; }; - version = "1.2.2"; + version = "1.2.4"; }; multi_json = { source = { @@ -19,9 +19,9 @@ dependencies = ["msgpack" "multi_json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "15r3j9bwlpm1ry7cp6059xb0irvsvvlmw53i28z6sf2khwfj5j53"; + sha256 = "0b487dzz41im8cwzvfjqgf8kkrp6mpkvcbzhazrmqqw8gxyvfbq4"; type = "gem"; }; - version = "0.6.2"; + version = "0.7.0"; }; } diff --git a/pkgs/applications/editors/sublime/3/packages.nix b/pkgs/applications/editors/sublime/3/packages.nix index 01445ade47321..98cfc03c3d26d 100644 --- a/pkgs/applications/editors/sublime/3/packages.nix +++ b/pkgs/applications/editors/sublime/3/packages.nix @@ -5,14 +5,14 @@ let in rec { sublime3-dev = common { - buildVersion = "3162"; - x32sha256 = "190il02hqvv64w17w7xc1fz2wkbhk5a5y96jb25dvafmslm46d4i"; - x64sha256 = "1nsjhjs6zajhx7m3dk7i450krg6pb03zffm1n3m1v0xb9zr37xz3"; + buildVersion = "3170"; + x32sha256 = "04ll92mqnpvvaa161il6l02gvd0g0x95sci0yrywr6jzk6am1fzg"; + x64sha256 = "1snzjr000qrjyvzd876x5j66138glh0bff3c1b2cb2bfc88c3kzx"; } {}; sublime3 = common { - buildVersion = "3143"; - x32sha256 = "0dgpx4wij2m77f478p746qadavab172166bghxmj7fb61nvw9v5i"; - x64sha256 = "06b554d2cvpxc976rvh89ix3kqc7klnngvk070xrs8wbyb221qcw"; + buildVersion = "3170"; + x32sha256 = "04ll92mqnpvvaa161il6l02gvd0g0x95sci0yrywr6jzk6am1fzg"; + x64sha256 = "1snzjr000qrjyvzd876x5j66138glh0bff3c1b2cb2bfc88c3kzx"; } {}; } diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 5c10f6fb3bbca..41d4c114c75ad 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ makeWrapper, libXScrnSaver, libxkbfile, libsecret }: let - version = "1.22.2"; + version = "1.23.0"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "17iqqg6vdccbl1k4k2ks3kkgg7619j6qdvca4k27pjfqm17mvw5n"; - "x86_64-linux" = "1ng2jhhaghsf7a2dmrimazh817jh0ag88whija179ywgrg3i6xam"; - "x86_64-darwin" = "083hizigzxm45hcy6yqwznj9ibqdaxg2xv8rsyas4ig9x55irrcj"; + "i686-linux" = "1nyrcgnf18752n3i7xaq6gpb2k4wsfzk671kxg6za4ycrriw1f5l"; + "x86_64-linux" = "1mkxyavzav522sl3fjn2hdlbj0bkdl3hagqiw9i6h8wgkxcvsszy"; + "x86_64-darwin" = "123ggzssd5qd80jxar2pf5g2n2473pd2j8pfjyir1c7xkaqji2w6"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; diff --git a/pkgs/applications/graphics/epeg/default.nix b/pkgs/applications/graphics/epeg/default.nix new file mode 100644 index 0000000000000..02528a43e31b6 --- /dev/null +++ b/pkgs/applications/graphics/epeg/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, pkgconfig, libtool, autoconf, automake +, libjpeg, libexif +}: + +stdenv.mkDerivation rec { + name = "epeg-0.9.1.042"; # version taken from configure.ac + + src = fetchFromGitHub { + owner = "mattes"; + repo = "epeg"; + rev = "248ae9fc3f1d6d06e6062a1f7bf5df77d4f7de9b"; + sha256 = "14ad33w3pxrg2yfc2xzyvwyvjirwy2d00889dswisq8b84cmxfia"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ pkgconfig libtool autoconf automake ]; + + propagatedBuildInputs = [ libjpeg libexif ]; + + preConfigure = '' + ./autogen.sh + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/mattes/epeg; + description = "Insanely fast JPEG/ JPG thumbnail scaling"; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ nh2 ]; + }; +} diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index f086a8f5ba608..4258d91b42af0 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -2,14 +2,14 @@ , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11 , libwebp, quantumdepth ? 8, fixDarwinDylibNames }: -let version = "1.3.28"; in +let version = "1.3.29"; in stdenv.mkDerivation { name = "graphicsmagick-${version}"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; - sha256 = "0jlrrimrajcmwp7llivyj14qnzb1mpqd8vw95dl6zbx5m2lnhall"; + sha256 = "1m0cc6kpky06lpcipj7rfwc2jbw2igr0jk97zqmw3j1ld5mg93g1"; }; patches = [ diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 33fddf6c8d012..9ab5288700cce 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -1,20 +1,30 @@ -{ stdenv, fetchurl, qt4, qmake4Hook, bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal -, mpfr, gmp, glib, pkgconfig, harfbuzz, qscintilla, gettext +{ stdenv, fetchurl, fetchFromGitHub, qt5, libsForQt5 +, bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal +, mpfr, gmp, glib, pkgconfig, harfbuzz, gettext }: stdenv.mkDerivation rec { - version = "2015.03-3"; + version = "2018.04-git"; name = "openscad-${version}"; - src = fetchurl { - url = "http://files.openscad.org/${name}.src.tar.gz"; - sha256 = "0djsgi9yx1nxr2gh1kgsqw5vrbncp8v5li0p1pp02higqf1psajx"; +# src = fetchurl { +# url = "http://files.openscad.org/${name}.src.tar.gz"; +# sha256 = "0djsgi9yx1nxr2gh1kgsqw5vrbncp8v5li0p1pp02higqf1psajx"; +# }; + src = fetchFromGitHub { + owner = "openscad"; + repo = "openscad"; + rev = "179074dff8c23cbc0e651ce8463737df0006f4ca"; + sha256 = "1y63yqyd0v255liik4ff5ak6mj86d8d76w436x76hs5dk6jgpmfb"; }; buildInputs = [ - qt4 qmake4Hook bison flex eigen boost libGLU_combined glew opencsg cgal mpfr gmp glib - pkgconfig harfbuzz qscintilla gettext - ]; + bison flex eigen boost libGLU_combined glew opencsg cgal mpfr gmp glib + pkgconfig harfbuzz gettext + ] + ++ (with qt5; [qtbase qmake]) + ++ (with libsForQt5; [qscintilla]) + ; qmakeFlags = [ "VERSION=${version}" ]; diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix index 757ce52e9c4c8..e4f565b3b052b 100644 --- a/pkgs/applications/graphics/pqiv/default.nix +++ b/pkgs/applications/graphics/pqiv/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation (rec { name = "pqiv-${version}"; - version = "2.10.3"; + version = "2.10.4"; src = fetchFromGitHub { owner = "phillipberndt"; repo = "pqiv"; rev = version; - sha256 = "16nhnv0dcp242jf1099pjr5dwnc65i40cnb3dvx1avdhidcmsx01"; + sha256 = "04fawc3sd625y1bbgfgwmak56pq28sm58dwn5db4h183iy3awdl9"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix index 2cc127a3fc6fa..3bc814e1e758d 100644 --- a/pkgs/applications/graphics/shutter/default.nix +++ b/pkgs/applications/graphics/shutter/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, fetchpatch, perl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg }: +{ stdenv, fetchurl, fetchpatch, perl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg +, hicolor-icon-theme +}: let perlModules = with perlPackages; @@ -29,6 +31,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/shutter \ --set PERL5LIB "${stdenv.lib.makePerlPath perlModules}" \ --prefix PATH : "${imagemagick.out}/bin" \ + --suffix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" ''; diff --git a/pkgs/applications/kde/akonadi-import-wizard.nix b/pkgs/applications/kde/akonadi-import-wizard.nix new file mode 100644 index 0000000000000..cc1acbc6dd05e --- /dev/null +++ b/pkgs/applications/kde/akonadi-import-wizard.nix @@ -0,0 +1,20 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + akonadi, karchive, kcontacts, kcrash, kidentitymanagement, kio, + kmailtransport, kwallet, mailcommon, mailimporter, messagelib +}: + +mkDerivation { + name = "akonadi-import-wizard"; + meta = { + license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12 ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + akonadi karchive kcontacts kcrash kidentitymanagement kio + kmailtransport kwallet mailcommon mailimporter messagelib + ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 5870179b6c0b9..f602e5c92d9f7 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -67,6 +67,7 @@ let akonadi = callPackage ./akonadi {}; akonadi-calendar = callPackage ./akonadi-calendar.nix {}; akonadi-contacts = callPackage ./akonadi-contacts.nix {}; + akonadi-import-wizard = callPackage ./akonadi-import-wizard.nix {}; akonadi-mime = callPackage ./akonadi-mime.nix {}; akonadi-notes = callPackage ./akonadi-notes.nix {}; akonadi-search = callPackage ./akonadi-search.nix {}; @@ -101,6 +102,7 @@ let kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {}; kdenlive = callPackage ./kdenlive.nix {}; kdepim-runtime = callPackage ./kdepim-runtime.nix {}; + kdepim-addons = callPackage ./kdepim-addons.nix {}; kdepim-apps-libs = callPackage ./kdepim-apps-libs {}; kdf = callPackage ./kdf.nix {}; kdialog = callPackage ./kdialog.nix {}; diff --git a/pkgs/applications/kde/kdepim-addons.nix b/pkgs/applications/kde/kdepim-addons.nix new file mode 100644 index 0000000000000..fd3fe2d6c098d --- /dev/null +++ b/pkgs/applications/kde/kdepim-addons.nix @@ -0,0 +1,23 @@ +{ + mkDerivation, lib, kdepimTeam, + extra-cmake-modules, shared-mime-info, + akonadi-import-wizard, akonadi-notes, calendarsupport, eventviews, + incidenceeditor, kcalcore, kcalutils, kconfig, kdbusaddons, kdeclarative, + kdepim-apps-libs, kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar, + libksieve, mailcommon, mailimporter, messagelib, poppler_qt5, prison +}: + +mkDerivation { + name = "kdepim-addons"; + meta = { + license = with lib.licenses; [ gpl2Plus lgpl21Plus ]; + maintainers = kdepimTeam; + }; + nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; + buildInputs = [ + akonadi-import-wizard akonadi-notes calendarsupport eventviews + incidenceeditor kcalcore kcalutils kconfig kdbusaddons kdeclarative + kdepim-apps-libs kholidays ki18n kmime ktexteditor ktnef libgravatar + libksieve mailcommon mailimporter messagelib poppler_qt5 prison + ]; +} diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix new file mode 100644 index 0000000000000..b0b6111b334a2 --- /dev/null +++ b/pkgs/applications/misc/1password/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchzip, makeWrapper }: + +stdenv.mkDerivation rec { + name = "1password-${version}"; + version = "0.4"; + src = if stdenv.system == "i686-linux" then fetchzip { + url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; + sha256 = "0mhlqvd3az50gnfil0xlq10855v3bg7yb05j6ndg4h2c551jrq41"; + stripRoot = false; + } else fetchzip { + url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; + sha256 = "15cv8xi4slid9jicdmc5xx2r9ag63wcx1mn7hcgzxbxbhyrvwhyf"; + stripRoot = false; + }; + + nativeBuildInputs = [ makeWrapper ]; + installPhase = '' + mkdir -p $out/bin + install -D op $out/share/1password/op + + # https://github.com/NixOS/patchelf/issues/66#issuecomment-267743051 + makeWrapper $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/op \ + --argv0 op \ + --add-flags $out/share/1password/op + ''; + + meta = with stdenv.lib; { + description = "1Password command-line tool"; + homepage = "https://blog.agilebits.com/2017/09/06/announcing-the-1password-command-line-tool-public-beta/"; + maintainers = with maintainers; [ joelburget ]; + license = licenses.unfree; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 9906b1fd8587a..5396299943c53 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ stdenv, fetchFromGitHub , pkgconfig, which, perl, libXrandr , cairo, dbus, systemd, gdk_pixbuf, glib, libX11, libXScrnSaver , libXinerama, libnotify, libxdg_basedir, pango, xproto, librsvg diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix deleted file mode 100644 index f8ba66c4197c2..0000000000000 --- a/pkgs/applications/misc/googleearth/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ stdenv, fetchurl, glibc, libGLU_combined, freetype, glib, libSM, libICE, libXi, libXv -, libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11, qt4 -, zlib, fontconfig, dpkg }: - -let - arch = - if stdenv.system == "x86_64-linux" then "amd64" - else if stdenv.system == "i686-linux" then "i386" - else throw "Unsupported system ${stdenv.system}"; - sha256 = - if arch == "amd64" - then "0dwnppn5snl5bwkdrgj4cyylnhngi0g66fn2k41j3dvis83x24k6" - else "0gndbxrj3kgc2dhjqwjifr3cl85hgpm695z0wi01wvwzhrjqs0l2"; - fullPath = stdenv.lib.makeLibraryPath [ - glibc - glib - stdenv.cc.cc - libSM - libICE - libXi - libXv - libGLU_combined - libXrender - libXrandr - libXfixes - libXcursor - libXinerama - freetype - libXext - libX11 - qt4 - zlib - fontconfig - ]; -in -stdenv.mkDerivation rec { - version = "7.1.4.1529"; - name = "googleearth-${version}"; - - src = fetchurl { - url = "https://dl.google.com/earth/client/current/google-earth-stable_current_${arch}.deb"; - inherit sha256; - }; - - phases = "unpackPhase installPhase"; - - buildInputs = [ dpkg ]; - - unpackPhase = '' - dpkg-deb -x ${src} ./ - ''; - - installPhase ='' - mkdir $out - mv usr/* $out/ - rmdir usr - mv * $out/ - rm $out/bin/google-earth $out/opt/google/earth/free/google-earth - ln -s $out/opt/google/earth/free/googleearth $out/bin/google-earth - - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${fullPath}:\$ORIGIN" \ - $out/opt/google/earth/free/googleearth-bin - - for a in $out/opt/google/earth/free/*.so* ; do - patchelf --set-rpath "${fullPath}:\$ORIGIN" $a - done - ''; - - dontPatchELF = true; - - meta = { - description = "A world sphere viewer"; - homepage = http://earth.google.com; - license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index 097386547f570..7477e5c0af2a4 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -29,11 +29,11 @@ let license_dir = "~/.config/houdini"; in stdenv.mkDerivation rec { - version = "16.5.405"; + version = "16.5.439"; name = "houdini-runtime-${version}"; src = requireFile rec { name = "houdini-${version}-linux_x86_64_gcc4.8.tar.gz"; - sha256 = "14i0kzv881jqd5z9jshri1fxxi3pkxdmi5l4p2b51c9i3apsxmw6"; + sha256 = "7e483072a0e6e751a93f2a2f968cccb2d95559c61106ffeb344c95975704321b"; message = '' This nix expression requires that ${name} is already part of the store. Download it from https://sidefx.com and add it to the nix store with: diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index 5e492fc621fef..8676ba70858fd 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -3,11 +3,11 @@ with builtins; buildDotnetPackage rec { baseName = "keepass"; - version = "2.38"; + version = "2.39"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - sha256 = "0m33gfpvv01xc28k4rrc8llbyk6qanm9rsqcnv8ydms0cr78dbbk"; + sha256 = "05mrbzlkr2h42cls6xhas76dg8kyic4fijwckrh0b0qv5pp71c11"; }; sourceRoot = "."; diff --git a/pkgs/applications/misc/limesuite/default.nix b/pkgs/applications/misc/limesuite/default.nix new file mode 100644 index 0000000000000..4599fab0c6d6e --- /dev/null +++ b/pkgs/applications/misc/limesuite/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchFromGitHub, cmake +, sqlite, wxGTK30, libusb1, soapysdr +, mesa_glu, libX11, gnuplot, fltk +} : + +let + version = "18.04.1"; + +in stdenv.mkDerivation { + name = "limesuite-${version}"; + + src = fetchFromGitHub { + owner = "myriadrf"; + repo = "LimeSuite"; + rev = "v${version}"; + sha256 = "1aaqnwif1j045hvj011k5dyqxgxx72h33r4al74h5f8al81zvzj9"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + libusb1 + sqlite + wxGTK30 + fltk + gnuplot + libusb1 + soapysdr + mesa_glu + libX11 + ]; + + postInstall = '' + mkdir -p $out/lib/udev/rules.d + cp ../udev-rules/64-limesuite.rules $out/lib/udev/rules.d + + mkdir -p $out/share/limesuite + cp bin/Release/lms7suite_mcu/* $out/share/limesuite + + cp bin/dualRXTX $out/bin + cp bin/basicRX $out/bin + cp bin/singleRX $out/bin + ''; + + meta = with stdenv.lib; { + description = "Driver and GUI for LMS7002M-based SDR platforms"; + homepage = https://github.com/myriadrf/LimeSuite; + license = licenses.asl20; + maintainers = with maintainers; [ markuskowa ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 515127e12ebbe..f3fd091363f02 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "pdfpc"; - version = "4.1"; + version = "4.1.1"; src = fetchFromGitHub { repo = "pdfpc"; owner = "pdfpc"; rev = "v${version}"; - sha256 = "02cp0x5prqrizxdp0sf2sk5ip0363vyw6fxsb3zwyx4dw0vz4g96"; + sha256 = "1yjh9rx49d24wlwg44r2a6b5scybp8l1fi9wyf05sig6zfziw1mm"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/soapyairspy/default.nix b/pkgs/applications/misc/soapyairspy/default.nix new file mode 100644 index 0000000000000..af72c784135d4 --- /dev/null +++ b/pkgs/applications/misc/soapyairspy/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, cmake +, airspy, soapysdr +} : + +let + version = "0.1.1"; + +in stdenv.mkDerivation { + name = "soapyairspy-${version}"; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "SoapyAirspy"; + rev = "soapy-airspy-${version}"; + sha256 = "072vc9619s9f22k7639krr1p2418cmhgm44yhzy7x9dzapc43wvk"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ airspy soapysdr ]; + + cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; + + meta = with stdenv.lib; { + homepage = https://github.com/pothosware/SoapyAirspy; + description = "SoapySDR plugin for Airspy devices"; + license = licenses.mit; + maintainers = with maintainers; [ markuskowa ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/soapybladerf/default.nix b/pkgs/applications/misc/soapybladerf/default.nix new file mode 100644 index 0000000000000..4e1adc32946ec --- /dev/null +++ b/pkgs/applications/misc/soapybladerf/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, libbladeRF, soapysdr +} : + +let + version = "0.3.5"; + +in stdenv.mkDerivation { + name = "soapybladerf-${version}"; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "SoapyBladeRF"; + rev = "soapy-bladerf-${version}"; + sha256 = "1n7vy6y8k1smq3l729npxbhxbnrc79gz06dxkibsihz4k8sddkrg"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ libbladeRF soapysdr ]; + + cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; + + + meta = with stdenv.lib; { + homepage = https://github.com/pothosware/SoapyBladeRF; + description = "SoapySDR plugin for BladeRF devices"; + license = licenses.lgpl21; + maintainers = with maintainers; [ markuskowa ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/soapyhackrf/default.nix b/pkgs/applications/misc/soapyhackrf/default.nix new file mode 100644 index 0000000000000..f5543af9c60b0 --- /dev/null +++ b/pkgs/applications/misc/soapyhackrf/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, hackrf, soapysdr +} : + +let + version = "0.3.2"; + +in stdenv.mkDerivation { + name = "soapyhackrf-${version}"; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "SoapyHackRF"; + rev = "soapy-hackrf-${version}"; + sha256 = "1sgx2nk8yrzfwisjfs9mw0xwc47bckzi17p42s2pbv7zcxzpb66p"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ hackrf soapysdr ]; + + cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; + + meta = with stdenv.lib; { + homepage = https://github.com/pothosware/SoapyHackRF; + description = "SoapySDR plugin for HackRF devices"; + license = licenses.mit; + maintainers = with maintainers; [ markuskowa ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/soapyremote/default.nix b/pkgs/applications/misc/soapyremote/default.nix new file mode 100644 index 0000000000000..d10b09f99a8d2 --- /dev/null +++ b/pkgs/applications/misc/soapyremote/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, cmake, soapysdr }: + +let + version = "0.4.3"; + +in stdenv.mkDerivation { + name = "soapyremote-${version}"; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "SoapyRemote"; + rev = "d07f43863b1ef79252f8029cfb5947220f21311d"; + sha256 = "0i101dfqq0aawybv0qyjgsnhk39dc4q6z6ys2gsvwjhpf3d48aw0"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ soapysdr ]; + + cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; + + meta = with stdenv.lib; { + homepage = https://github.com/pothosware/SoapyRemote; + description = "SoapySDR plugin for remote access to SDRs"; + license = licenses.boost; + maintainers = with maintainers; [ markuskowa ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/soapysdr/default.nix b/pkgs/applications/misc/soapysdr/default.nix new file mode 100644 index 0000000000000..6230f2f6f6a66 --- /dev/null +++ b/pkgs/applications/misc/soapysdr/default.nix @@ -0,0 +1,50 @@ +{ stdenv, lib, lndir, makeWrapper +, fetchFromGitHub, cmake +, libusb, pkgconfig +, python, swig2, numpy, ncurses +, extraPackages ? [] +} : + +let + version = "0.6.1"; + +in stdenv.mkDerivation { + name = "soapysdr-${version}"; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "SoapySDR"; + rev = "soapy-sdr-${version}"; + sha256 = "1azbb2j6dv0b2dd5ks6yqd31j17sdhi9p82czwc8zy2isymax0l9"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ libusb ncurses numpy swig2 python ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DUSE_PYTHON_CONFIG=ON" + ]; + + postFixup = lib.optionalString (lib.length extraPackages != 0) '' + # Join all plugins via symlinking + for i in ${toString extraPackages}; do + ${lndir}/bin/lndir -silent $i $out + done + + # Needed for at least the remote plugin server + for file in out/bin/*; do + ${makeWrapper}/bin/wrapProgram "$file" \ + --prefix SOAPY_SDR_PLUGIN_PATH : ${lib.makeSearchPath "lib/SoapySDR/modules0.6" extraPackages} + done + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/pothosware/SoapySDR; + description = "Vendor and platform neutral SDR support library"; + license = licenses.boost; + maintainers = with maintainers; [ markuskowa ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/applications/misc/soapyuhd/default.nix b/pkgs/applications/misc/soapyuhd/default.nix new file mode 100644 index 0000000000000..4f2a79c97fe2d --- /dev/null +++ b/pkgs/applications/misc/soapyuhd/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, uhd, boost, soapysdr +} : + +let + version = "0.3.4"; + +in stdenv.mkDerivation { + name = "soapyuhd-${version}"; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "SoapyUHD"; + rev = "soapy-uhd-${version}"; + sha256 = "1da7cjcvfdqhgznm7x14s1h7lwz5lan1b48akw445ah1vxwvh4hl"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ uhd boost soapysdr ]; + + cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; + + postPatch = '' + sed -i "s:DESTINATION .*uhd/modules:DESTINATION $out/lib/uhd/modules:" CMakeLists.txt + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/pothosware/SoapyAirspy; + description = "SoapySDR plugin for UHD devices"; + license = licenses.gpl3; + maintainers = with maintainers; [ markuskowa ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/applications/misc/todiff/default.nix index 049a9eff347c7..6af7fae34972a 100644 --- a/pkgs/applications/misc/todiff/default.nix +++ b/pkgs/applications/misc/todiff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "todiff-${version}"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "Ekleog"; repo = "todiff"; rev = version; - sha256 = "0n3sifinwhny651q1v1a6y9ybim1b0nd5s1z26sigjdhdvxckn65"; + sha256 = "0xnqw98nccnkqfdmbkblm897v981rw1fagbi5q895bpwfg0p71lk"; }; - cargoSha256 = "0mxdpn98fvmxrp656vwxvzl9vprz5mvqj7d1hvvs4gsjrsiyp0fy"; + cargoSha256 = "0ih7lw5hbayvc66fjqwga0i7l3sb9qn0m26vnham5li39f5i3rqp"; meta = with stdenv.lib; { description = "Human-readable diff for todo.txt files"; diff --git a/pkgs/applications/misc/welle-io/default.nix b/pkgs/applications/misc/welle-io/default.nix index d705de1a8cd6c..143ec518ac519 100644 --- a/pkgs/applications/misc/welle-io/default.nix +++ b/pkgs/applications/misc/welle-io/default.nix @@ -1,6 +1,6 @@ { stdenv, buildEnv, fetchFromGitHub, cmake, pkgconfig , qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2 -, faad2, rtl-sdr, libusb, fftwSinglePrec }: +, faad2, rtl-sdr, soapysdr-with-plugins, libusb, fftwSinglePrec }: let version = "1.0-rc2"; @@ -28,10 +28,11 @@ in stdenv.mkDerivation { qtquickcontrols qtquickcontrols2 rtl-sdr + soapysdr-with-plugins ]; cmakeFlags = [ - "-DRTLSDR=true" + "-DRTLSDR=true" "-DSOAPYSDR=true" ]; enableParallelBuilding = true; @@ -41,7 +42,6 @@ in stdenv.mkDerivation { homepage = http://www.welle.io/; maintainers = with maintainers; [ ck3d ]; license = licenses.gpl2; - platforms = with platforms; linux ++ darwin; + platforms = with platforms; [ "x86_64-linux" "i686-linux" ] ++ darwin; }; - } diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index 88adbfff3b9ae..5b389d99da76d 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "xmrig-${version}"; - version = "2.5.3"; + version = "2.6.1"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "1f9z9akgaf27r5hjrsjw0clk47p7igi0slbg7z6c3rvy5q9kq0wp"; + sha256 = "05gd3jl8nvj2b73l4x72rfbbxrkw3r8q1h761ly4z35v4f3lahk8"; }; nativeBuildInputs = [ cmake ]; @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { description = "Monero (XMR) CPU miner"; homepage = "https://github.com/xmrig/xmrig"; license = licenses.gpl3Plus; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 97ce7d06c411c..eaf304ca9fd47 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -12,8 +12,6 @@ , gdk_pixbuf , glib , glibc -, gst-plugins-base -, gstreamer , gtk2 , gtk3 , kerberos @@ -30,6 +28,7 @@ , libcanberra-gtk2 , libgnome , libgnomeui +, libnotify , defaultIconTheme , libGLU_combined , nspr @@ -98,8 +97,6 @@ stdenv.mkDerivation { gdk_pixbuf glib glibc - gst-plugins-base - gstreamer gtk2 gtk3 kerberos @@ -116,6 +113,7 @@ stdenv.mkDerivation { libcanberra-gtk2 libgnome libgnomeui + libnotify libGLU_combined nspr nss diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 7ab61ec2fe5c7..5b2ede611d03d 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,7 +2,7 @@ ## various stuff that can be plugged in , flashplayer, hal-flash -, MPlayerPlugin, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra-gtk2 +, MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2 , jrePlugin, icedtea_web , trezor-bridge, bluejeans, djview4, adobe-reader , google_talk_plugin, fribid, gnome3/*.gnome-shell*/ @@ -65,13 +65,12 @@ let ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator ++ extraNativeMessagingHosts ); - libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ]) + libs = lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport kerberos ++ lib.optionals (cfg.enableQuakeLive or false) (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib libudev ]) ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash ++ lib.optional (config.pulseaudio or true) libpulseaudio; - gst-plugins = with gst_all; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ]; gtk_modules = [ libcanberra-gtk2 ]; in stdenv.mkDerivation { @@ -97,7 +96,6 @@ let }; buildInputs = [makeWrapper] - ++ lib.optional (!ffmpegSupport) gst-plugins ++ lib.optional (browser ? gtk3) browser.gtk3; buildCommand = '' @@ -117,9 +115,7 @@ let --suffix PATH ':' "$out/bin" \ --set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \ --set MOZ_SYSTEM_DIR "$out/lib/mozilla" \ - ${lib.optionalString (!ffmpegSupport) - ''--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"'' - + lib.optionalString (browser ? gtk3) + ${lib.optionalString (browser ? gtk3) ''--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share' '' diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index 9cad2838a39b2..9cdd32d2aaed4 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -9,21 +9,24 @@ assert sslSupport -> openssl != null; stdenv.mkDerivation rec { name = "lynx-${version}"; - version = "2.8.9dev.16"; + version = "2.8.9dev.17"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/lynx/tarballs/lynx${version}.tar.bz2" "https://invisible-mirror.net/archives/lynx/tarballs/lynx${version}.tar.bz2" ]; - sha256 = "1j0vx871ghkm7fgrafnvd2ml3ywcl8d3gyhq02fhfb851c88lc84"; + sha256 = "1lvfsnrw5mmwrmn1m76q9mx287xwm3h5lg8sv7bcqilc0ywi2f54"; }; enableParallelBuilding = true; hardeningEnable = [ "pie" ]; - configureFlags = [ "--enable-widec" ] ++ stdenv.lib.optional sslSupport "--with-ssl"; + configureFlags = [ + "--enable-widec" + "--enable-ipv6" + ] ++ stdenv.lib.optional sslSupport "--with-ssl"; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ nukeReferences ] @@ -40,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A text-mode web browser"; - homepage = http://lynx.invisible-island.net/; + homepage = https://lynx.invisible-island.net/; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 0c0ef501e9963..aa77f08473444 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { name = "palemoon-${version}"; - version = "27.8.3"; + version = "27.9.0"; src = fetchFromGitHub { name = "palemoon-src"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = version + "_Release"; - sha256 = "1v3wliq8k5yq17ms214fhwka8x4l3sq8kja59dx4pbvczzb1zyzh"; + sha256 = "181g1hy4k9xr6nlrw8jamp541gr5znny4mmpwwaa1lzq5v1w1sw6"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index 9f6b6fcb7e112..8a006edda6a80 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cni-plugins-${version}"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - sha256 = "0m885v76azs7lrk6m6n53rwh0xadwvdcr90h0l3bxpdv87sj2mnf"; + sha256 = "1sywllwnr6lc812sgkqjdd3y10r82shl88dlnwgnbgzs738q2vp2"; }; buildInputs = [ go ]; diff --git a/pkgs/applications/networking/cluster/kontemplate/default.nix b/pkgs/applications/networking/cluster/kontemplate/default.nix index 56cbef7f00553..fd599cd865868 100644 --- a/pkgs/applications/networking/cluster/kontemplate/default.nix +++ b/pkgs/applications/networking/cluster/kontemplate/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "kontemplate-${version}"; - version = "1.4.0"; + version = "1.5.0"; goPackagePath = "github.com/tazjin/kontemplate"; goDeps = ./deps.nix; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "tazjin"; repo = "kontemplate"; rev = "v${version}"; - sha256 = "11aqc9sgyqz3pscx7njnb3xghl7d61vzdgl3bqndady0dxsccrpj"; + sha256 = "0k3yr0ypw6brj1lxqs041zsyi0r09113i0x3xfj48zv4ralq74b6"; }; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/panamax/api/Gemfile b/pkgs/applications/networking/cluster/panamax/api/Gemfile deleted file mode 100644 index 82085aa6db08b..0000000000000 --- a/pkgs/applications/networking/cluster/panamax/api/Gemfile +++ /dev/null @@ -1,23 +0,0 @@ -source 'https://rubygems.org' - -gem 'rails', '4.1.7' -gem 'puma', '2.8.2' -gem 'sqlite3', '1.3.9' -gem 'faraday_middleware', '0.9.0' -gem 'docker-api', '1.13.0', require: 'docker' -gem 'fleet-api', '0.6.0', require: 'fleet' -gem 'active_model_serializers', '0.9.0' -gem 'octokit', '3.2.0' -gem 'kmts', '2.0.1' - -group :test, :development do - gem 'rspec-rails' - gem 'its' -end - -group :test do - gem 'coveralls', '0.7.0' - gem 'shoulda-matchers', '2.6.1' - gem 'database_cleaner', '1.3.0' - gem 'webmock', '1.20.0' -end diff --git a/pkgs/applications/networking/cluster/panamax/api/Gemfile.lock b/pkgs/applications/networking/cluster/panamax/api/Gemfile.lock deleted file mode 100644 index 597c691700ad2..0000000000000 --- a/pkgs/applications/networking/cluster/panamax/api/Gemfile.lock +++ /dev/null @@ -1,164 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - actionmailer (4.1.7) - actionpack (= 4.1.7) - actionview (= 4.1.7) - mail (~> 2.5, >= 2.5.4) - actionpack (4.1.7) - actionview (= 4.1.7) - activesupport (= 4.1.7) - rack (~> 1.5.2) - rack-test (~> 0.6.2) - actionview (4.1.7) - activesupport (= 4.1.7) - builder (~> 3.1) - erubis (~> 2.7.0) - active_model_serializers (0.9.0) - activemodel (>= 3.2) - activemodel (4.1.7) - activesupport (= 4.1.7) - builder (~> 3.1) - activerecord (4.1.7) - activemodel (= 4.1.7) - activesupport (= 4.1.7) - arel (~> 5.0.0) - activesupport (4.1.7) - i18n (~> 0.6, >= 0.6.9) - json (~> 1.7, >= 1.7.7) - minitest (~> 5.1) - thread_safe (~> 0.1) - tzinfo (~> 1.1) - addressable (2.3.6) - archive-tar-minitar (0.5.2) - arel (5.0.1.20140414130214) - builder (3.2.2) - coveralls (0.7.0) - multi_json (~> 1.3) - rest-client - simplecov (>= 0.7) - term-ansicolor - thor - crack (0.4.2) - safe_yaml (~> 1.0.0) - database_cleaner (1.3.0) - diff-lcs (1.2.5) - docile (1.1.5) - docker-api (1.13.0) - archive-tar-minitar - excon (>= 0.37.0) - json - erubis (2.7.0) - excon (0.37.0) - faraday (0.8.9) - multipart-post (~> 1.2.0) - faraday_middleware (0.9.0) - faraday (>= 0.7.4, < 0.9) - fleet-api (0.6.0) - faraday (= 0.8.9) - faraday_middleware (= 0.9.0) - hike (1.2.3) - i18n (0.7.0) - its (0.2.0) - rspec-core - json (1.8.1) - kmts (2.0.1) - mail (2.6.3) - mime-types (>= 1.16, < 3) - mime-types (2.4.3) - minitest (5.5.1) - multi_json (1.10.1) - multipart-post (1.2.0) - octokit (3.2.0) - sawyer (~> 0.5.3) - puma (2.8.2) - rack (>= 1.1, < 2.0) - rack (1.5.2) - rack-test (0.6.3) - rack (>= 1.0) - rails (4.1.7) - actionmailer (= 4.1.7) - actionpack (= 4.1.7) - actionview (= 4.1.7) - activemodel (= 4.1.7) - activerecord (= 4.1.7) - activesupport (= 4.1.7) - bundler (>= 1.3.0, < 2.0) - railties (= 4.1.7) - sprockets-rails (~> 2.0) - railties (4.1.7) - actionpack (= 4.1.7) - activesupport (= 4.1.7) - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rake (10.4.0) - rest-client (1.6.7) - mime-types (>= 1.16) - rspec-core (3.1.7) - rspec-support (~> 3.1.0) - rspec-expectations (3.1.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.1.0) - rspec-mocks (3.1.3) - rspec-support (~> 3.1.0) - rspec-rails (3.1.0) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.1.0) - rspec-expectations (~> 3.1.0) - rspec-mocks (~> 3.1.0) - rspec-support (~> 3.1.0) - rspec-support (3.1.2) - safe_yaml (1.0.4) - sawyer (0.5.4) - addressable (~> 2.3.5) - faraday (~> 0.8, < 0.10) - shoulda-matchers (2.6.1) - activesupport (>= 3.0.0) - simplecov (0.9.1) - docile (~> 1.1.0) - multi_json (~> 1.0) - simplecov-html (~> 0.8.0) - simplecov-html (0.8.0) - sprockets (2.12.3) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.4) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (>= 2.8, < 4.0) - sqlite3 (1.3.9) - term-ansicolor (1.3.0) - tins (~> 1.0) - thor (0.19.1) - thread_safe (0.3.4) - tilt (1.4.1) - tins (1.3.0) - tzinfo (1.2.2) - thread_safe (~> 0.1) - webmock (1.20.0) - addressable (>= 2.3.6) - crack (>= 0.3.2) - -PLATFORMS - ruby - -DEPENDENCIES - active_model_serializers (= 0.9.0) - coveralls (= 0.7.0) - database_cleaner (= 1.3.0) - docker-api (= 1.13.0) - faraday_middleware (= 0.9.0) - fleet-api (= 0.6.0) - its - kmts (= 2.0.1) - octokit (= 3.2.0) - puma (= 2.8.2) - rails (= 4.1.7) - rspec-rails - shoulda-matchers (= 2.6.1) - sqlite3 (= 1.3.9) - webmock (= 1.20.0) diff --git a/pkgs/applications/networking/cluster/panamax/api/default.nix b/pkgs/applications/networking/cluster/panamax/api/default.nix deleted file mode 100644 index 1c2e2ccac27be..0000000000000 --- a/pkgs/applications/networking/cluster/panamax/api/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ stdenv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler -, ruby, libxslt, libxml2, sqlite, openssl, docker -, dataDir ? "/var/lib/panamax-api" }@args: - -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "panamax-api-${version}"; - version = "0.2.16"; - - env = bundlerEnv { - name = "panamax-api-gems-${version}"; - inherit ruby; - gemdir = ./.; - }; - - bundler = args.bundler.override { inherit ruby; }; - - database_yml = builtins.toFile "database.yml" '' - production: - adapter: sqlite3 - database: <%= ENV["PANAMAX_DATABASE_PATH"] || "${dataDir}/db/mnt/db.sqlite3" %> - timeout: 5000 - ''; - - src = fetchgit { - rev = "refs/tags/v${version}"; - url = "git://github.com/CenturyLinkLabs/panamax-api"; - sha256 = "0dqg0fbmy5cgjh0ql8yqlybhjyyrslgghjrc24wjhd1rghjn2qi6"; - }; - - buildInputs = [ makeWrapper sqlite openssl env.ruby bundler ]; - - setSourceRoot = '' - mkdir -p $out/share - cp -R panamax-api $out/share/panamax-api - export sourceRoot="$out/share/panamax-api" - ''; - - postPatch = '' - find . -type f -exec sed -e 's|/usr/bin/docker|${docker}/bin/docker|g' -i "{}" \; - ''; - - configurePhase = '' - export HOME=$PWD - export GEM_HOME=${env}/${env.ruby.gemPath} - export RAILS_ENV=production - - ln -sf ${database_yml} config/database.yml - ''; - - installPhase = '' - rm -rf log tmp - mv ./db ./_db - ln -sf ${dataDir}/{db,state/log,state/tmp} . - - mkdir -p $out/bin - makeWrapper bin/bundle "$out/bin/bundle" \ - --run "cd $out/share/panamax-api" \ - --prefix "PATH" : "$out/share/panamax-api/bin:${env.ruby}/bin:$PATH" \ - --prefix "HOME" : "$out/share/panamax-api" \ - --prefix "GEM_HOME" : "${env}/${env.ruby.gemPath}" \ - --prefix "GEM_PATH" : "$out/share/panamax-api:${bundler}/${env.ruby.gemPath}" - ''; - - meta = with stdenv.lib; { - broken = true; # needs ruby 2.1 - homepage = https://github.com/CenturyLinkLabs/panamax-api; - description = "The API behind The Panamax UI"; - license = licenses.asl20; - maintainers = with maintainers; [ matejc offline ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/networking/cluster/panamax/api/gemset.nix b/pkgs/applications/networking/cluster/panamax/api/gemset.nix deleted file mode 100644 index 8182543a2bb9b..0000000000000 --- a/pkgs/applications/networking/cluster/panamax/api/gemset.nix +++ /dev/null @@ -1,568 +0,0 @@ -{ - "actionmailer" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "0qjv5akjbpgd4cx518k522mssvc3y3nki65hi6fj5nbzi7a6rwq5"; - }; - dependencies = [ - "actionpack" - "actionview" - "mail" - ]; - }; - "actionpack" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "07y1ny00h69xklq260smyl5md052f617gqrzkyw5sxafs5z25zax"; - }; - dependencies = [ - "actionview" - "activesupport" - "rack" - "rack-test" - ]; - }; - "actionview" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "06sp37gfpn2jn7j6vlpp1y6vfi5kig60vyvixrjhyz0g4vgm13ax"; - }; - dependencies = [ - "activesupport" - "builder" - "erubis" - ]; - }; - "active_model_serializers" = { - version = "0.9.0"; - source = { - type = "gem"; - sha256 = "1ws3gx3wwlm17w7k0agwzmcmww6627lvqaqm828lzm3g1xqilkkl"; - }; - dependencies = [ - "activemodel" - ]; - }; - "activemodel" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "0rlqzz25l7vsphgkilg80kmk20d9h357awi27ax6zzb9klkqh0jr"; - }; - dependencies = [ - "activesupport" - "builder" - ]; - }; - "activerecord" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "0j4r0m32mjbwmz9gs8brln35jzr1cn7h585ggj0w0f1ai4hjsby5"; - }; - dependencies = [ - "activemodel" - "activesupport" - "arel" - ]; - }; - "activesupport" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "13i3mz66d5kp5y39gjwmcfqv0wb6mxm5k1nnz40wvd38dsf7n3bs"; - }; - dependencies = [ - "i18n" - "json" - "minitest" - "thread_safe" - "tzinfo" - ]; - }; - "addressable" = { - version = "2.3.6"; - source = { - type = "gem"; - sha256 = "137fj0whmn1kvaq8wjalp8x4qbblwzvg3g4bfx8d8lfi6f0w48p8"; - }; - }; - "archive-tar-minitar" = { - version = "0.5.2"; - source = { - type = "gem"; - sha256 = "1j666713r3cc3wb0042x0wcmq2v11vwwy5pcaayy5f0lnd26iqig"; - }; - }; - "arel" = { - version = "5.0.1.20140414130214"; - source = { - type = "gem"; - sha256 = "0dhnc20h1v8ml3nmkxq92rr7qxxpk6ixhwvwhgl2dbw9mmxz0hf9"; - }; - }; - "builder" = { - version = "3.2.2"; - source = { - type = "gem"; - sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2"; - }; - }; - "coveralls" = { - version = "0.7.0"; - source = { - type = "gem"; - sha256 = "0sz30d7b83qqsj3i0fr691w05d62wj7x3afh0ryjkqkis3fq94j4"; - }; - dependencies = [ - "multi_json" - "rest-client" - "simplecov" - "term-ansicolor" - "thor" - ]; - }; - "crack" = { - version = "0.4.2"; - source = { - type = "gem"; - sha256 = "1il94m92sz32nw5i6hdq14f1a2c3s9hza9zn6l95fvqhabq38k7a"; - }; - dependencies = [ - "safe_yaml" - ]; - }; - "database_cleaner" = { - version = "1.3.0"; - source = { - type = "gem"; - sha256 = "19w25yda684pg29bggq26wy4lpyjvzscwg2hx3hmmmpysiwfnxgn"; - }; - }; - "diff-lcs" = { - version = "1.2.5"; - source = { - type = "gem"; - sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1"; - }; - }; - "docile" = { - version = "1.1.5"; - source = { - type = "gem"; - sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx"; - }; - }; - "docker-api" = { - version = "1.13.0"; - source = { - type = "gem"; - sha256 = "1rara27gn7lxaf12dqkx8s1clssg10jndfcy4wz2fv6ms1i1lnp6"; - }; - dependencies = [ - "archive-tar-minitar" - "excon" - "json" - ]; - }; - "erubis" = { - version = "2.7.0"; - source = { - type = "gem"; - sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; - }; - }; - "excon" = { - version = "0.37.0"; - source = { - type = "gem"; - sha256 = "05x7asmsq5m419n1lhzk9bic02gwng4cqmrcqsfnd6kmkwm8csv2"; - }; - }; - "faraday" = { - version = "0.8.9"; - source = { - type = "gem"; - sha256 = "17d79fsgx0xwh0mfxyz5pbr435qlw79phlfvifc546w2axdkp718"; - }; - dependencies = [ - "multipart-post" - ]; - }; - "faraday_middleware" = { - version = "0.9.0"; - source = { - type = "gem"; - sha256 = "1kwvi2sdxd6j764a7q5iir73dw2v6816zx3l8cgfv0wr2m47icq2"; - }; - dependencies = [ - "faraday" - ]; - }; - "fleet-api" = { - version = "0.6.0"; - source = { - type = "gem"; - sha256 = "0136mzc0fxp6mzh38n6xbg87cw9g9vq1nrlr3ylazbflvmlxgan6"; - }; - dependencies = [ - "faraday" - "faraday_middleware" - ]; - }; - "hike" = { - version = "1.2.3"; - source = { - type = "gem"; - sha256 = "0i6c9hrszzg3gn2j41v3ijnwcm8cc2931fnjiv6mnpl4jcjjykhm"; - }; - }; - "i18n" = { - version = "0.7.0"; - source = { - type = "gem"; - sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758"; - }; - }; - "its" = { - version = "0.2.0"; - source = { - type = "gem"; - sha256 = "0rxwds9ipqp48mzqcaxzmfcqhawazg0zlhc1avv3i2cmm3np1z8g"; - }; - dependencies = [ - "rspec-core" - ]; - }; - "json" = { - version = "1.8.1"; - source = { - type = "gem"; - sha256 = "0002bsycvizvkmk1jyv8px1hskk6wrjfk4f7x5byi8gxm6zzn6wn"; - }; - }; - "kmts" = { - version = "2.0.1"; - source = { - type = "gem"; - sha256 = "1wk680q443lg35a25am6i8xawf16iqg5xnq1m8xd2gib4dsy1d8v"; - }; - }; - "mail" = { - version = "2.6.3"; - source = { - type = "gem"; - sha256 = "1nbg60h3cpnys45h7zydxwrl200p7ksvmrbxnwwbpaaf9vnf3znp"; - }; - dependencies = [ - "mime-types" - ]; - }; - "mime-types" = { - version = "2.4.3"; - source = { - type = "gem"; - sha256 = "16nissnb31wj7kpcaynx4gr67i7pbkzccfg8k7xmplbkla4rmwiq"; - }; - }; - "minitest" = { - version = "5.5.1"; - source = { - type = "gem"; - sha256 = "1h8jn0rgmwy37jnhfcg55iilw0n370vgp8xnh0g5laa8rhv32fyn"; - }; - }; - "multi_json" = { - version = "1.10.1"; - source = { - type = "gem"; - sha256 = "1ll21dz01jjiplr846n1c8yzb45kj5hcixgb72rz0zg8fyc9g61c"; - }; - }; - "multipart-post" = { - version = "1.2.0"; - source = { - type = "gem"; - sha256 = "12p7lnmc52di1r4h73h6xrpppplzyyhani9p7wm8l4kgf1hnmwnc"; - }; - }; - "octokit" = { - version = "3.2.0"; - source = { - type = "gem"; - sha256 = "07ll3x1hv72zssb4hkdw56xg3xk6x4fch4yf38zljvbh388r11ng"; - }; - dependencies = [ - "sawyer" - ]; - }; - "puma" = { - version = "2.8.2"; - source = { - type = "gem"; - sha256 = "1l57fmf8vyxfjv7ab5znq0k339cym5ghnm5xxfvd1simjp73db0k"; - }; - dependencies = [ - "rack" - ]; - }; - "rack" = { - version = "1.5.2"; - source = { - type = "gem"; - sha256 = "19szfw76cscrzjldvw30jp3461zl00w4xvw1x9lsmyp86h1g0jp6"; - }; - }; - "rack-test" = { - version = "0.6.3"; - source = { - type = "gem"; - sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z"; - }; - dependencies = [ - "rack" - ]; - }; - "rails" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "059mpljplmhfz8rr4hk40q67fllcpsy809m4mwwbkm8qwif2z5r0"; - }; - dependencies = [ - "actionmailer" - "actionpack" - "actionview" - "activemodel" - "activerecord" - "activesupport" - "railties" - "sprockets-rails" - ]; - }; - "railties" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "1n08h0rgj0aq5lvslnih6lvqz9wadpz6nnb25i4qhp37fhhyz9yz"; - }; - dependencies = [ - "actionpack" - "activesupport" - "rake" - "thor" - ]; - }; - "rake" = { - version = "10.4.0"; - source = { - type = "gem"; - sha256 = "0a10xzqc1lh6gjkajkslr0n40wjrniyiyzxkp9m5fc8wf7b74zw8"; - }; - }; - "rest-client" = { - version = "1.6.7"; - source = { - type = "gem"; - sha256 = "0nn7zalgidz2yj0iqh3xvzh626krm2al79dfiij19jdhp0rk8853"; - }; - dependencies = [ - "mime-types" - ]; - }; - "rspec-core" = { - version = "3.1.7"; - source = { - type = "gem"; - sha256 = "01bawvln663gffljwzpq3mrpa061cghjbvfbq15jvhmip3csxqc9"; - }; - dependencies = [ - "rspec-support" - ]; - }; - "rspec-expectations" = { - version = "3.1.2"; - source = { - type = "gem"; - sha256 = "0m8d36wng1lpbcs54zhg1rxh63rgj345k3p0h0c06lgknz339nzh"; - }; - dependencies = [ - "diff-lcs" - "rspec-support" - ]; - }; - "rspec-mocks" = { - version = "3.1.3"; - source = { - type = "gem"; - sha256 = "0gxk5w3klia4zsnp0svxck43xxwwfdqvhr3srv6p30f3m5q6rmzr"; - }; - dependencies = [ - "rspec-support" - ]; - }; - "rspec-rails" = { - version = "3.1.0"; - source = { - type = "gem"; - sha256 = "1b1in3n1dc1bpf9wb3p3b2ynq05iacmr48jxzc73lj4g44ksh3wq"; - }; - dependencies = [ - "actionpack" - "activesupport" - "railties" - "rspec-core" - "rspec-expectations" - "rspec-mocks" - "rspec-support" - ]; - }; - "rspec-support" = { - version = "3.1.2"; - source = { - type = "gem"; - sha256 = "14y6v9r9lrh91ry9r79h85v0f3y9ja25w42nv5z9n0bipfcwhprb"; - }; - }; - "safe_yaml" = { - version = "1.0.4"; - source = { - type = "gem"; - sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; - }; - }; - "sawyer" = { - version = "0.5.4"; - source = { - type = "gem"; - sha256 = "01kl4zpf0gaacnkra5nikrzfpwj8f10hsvgyzm7z2s1mz4iipx2v"; - }; - dependencies = [ - "addressable" - "faraday" - ]; - }; - "shoulda-matchers" = { - version = "2.6.1"; - source = { - type = "gem"; - sha256 = "1p3jhvd4dsj6d7nbmvnqhqhpmb8pnr05pi7jv9ajwqcys8140mc1"; - }; - dependencies = [ - "activesupport" - ]; - }; - "simplecov" = { - version = "0.9.1"; - source = { - type = "gem"; - sha256 = "06hylxlalaxxldpbaqa54gc52wxdff0fixdvjyzr6i4ygxwzr7yf"; - }; - dependencies = [ - "docile" - "multi_json" - "simplecov-html" - ]; - }; - "simplecov-html" = { - version = "0.8.0"; - source = { - type = "gem"; - sha256 = "0jhn3jql73x7hsr00wwv984iyrcg0xhf64s90zaqv2f26blkqfb9"; - }; - }; - "sprockets" = { - version = "2.12.3"; - source = { - type = "gem"; - sha256 = "1bn2drr8bc2af359dkfraq0nm0p1pib634kvhwn5lvj3r4vllnn2"; - }; - dependencies = [ - "hike" - "multi_json" - "rack" - "tilt" - ]; - }; - "sprockets-rails" = { - version = "2.2.4"; - source = { - type = "gem"; - sha256 = "172cdg38cqsfgvrncjzj0kziz7kv6b1lx8pccd0blyphs25qf4gc"; - }; - dependencies = [ - "actionpack" - "activesupport" - "sprockets" - ]; - }; - "sqlite3" = { - version = "1.3.9"; - source = { - type = "gem"; - sha256 = "07m6a6flmyyi0rkg0j7x1a9861zngwjnximfh95cli2zzd57914r"; - }; - }; - "term-ansicolor" = { - version = "1.3.0"; - source = { - type = "gem"; - sha256 = "1a2gw7gmpmx57sdpyhjwl0zn4bqp7jyjz7aslpvvphd075layp4b"; - }; - dependencies = [ - "tins" - ]; - }; - "thor" = { - version = "0.19.1"; - source = { - type = "gem"; - sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; - }; - }; - "thread_safe" = { - version = "0.3.4"; - source = { - type = "gem"; - sha256 = "1cil2zcdzqkyr8zrwhlg7gywryg36j4mxlxw0h0x0j0wjym5nc8n"; - }; - }; - "tilt" = { - version = "1.4.1"; - source = { - type = "gem"; - sha256 = "00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir"; - }; - }; - "tins" = { - version = "1.3.0"; - source = { - type = "gem"; - sha256 = "1yxa5kyp9mw4w866wlg7c32ingzqxnzh3ir9yf06pwpkmq3mrbdi"; - }; - }; - "tzinfo" = { - version = "1.2.2"; - source = { - type = "gem"; - sha256 = "1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx"; - }; - dependencies = [ - "thread_safe" - ]; - }; - "webmock" = { - version = "1.20.0"; - source = { - type = "gem"; - sha256 = "0bl5v0xzcj24lx7xpsnywv3liqnqb5lfxysmmfb2fgi0n8586i6m"; - }; - dependencies = [ - "addressable" - "crack" - ]; - }; -} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/panamax/ui/Gemfile b/pkgs/applications/networking/cluster/panamax/ui/Gemfile deleted file mode 100644 index 6f7dc59d04d03..0000000000000 --- a/pkgs/applications/networking/cluster/panamax/ui/Gemfile +++ /dev/null @@ -1,31 +0,0 @@ -source 'https://rubygems.org' - -gem 'rails', '4.1.7' -gem 'puma', '2.8.2' -gem 'sass', '3.3.9' -gem 'therubyracer', '0.12.1', platforms: :ruby -gem 'haml', '4.0.5' -gem 'uglifier', '2.5.1' -gem 'ctl_base_ui' -gem 'activeresource', '4.0.0' -gem 'kramdown', '1.4.0' -gem 'zeroclipboard-rails' - - -group :test, :development do - gem 'rspec-rails' - gem 'its' - gem 'capybara' - gem 'teaspoon' - gem 'phantomjs' - gem 'dotenv-rails', '0.11.1' - gem 'pry' - gem 'pry-byebug' - gem 'pry-stack_explorer' -end - -group :test do - gem 'webmock' - gem 'sinatra', '1.4.5' - gem 'coveralls', '0.7.0' -end diff --git a/pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock b/pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock deleted file mode 100644 index b273595bbb051..0000000000000 --- a/pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock +++ /dev/null @@ -1,226 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - actionmailer (4.1.7) - actionpack (= 4.1.7) - actionview (= 4.1.7) - mail (~> 2.5, >= 2.5.4) - actionpack (4.1.7) - actionview (= 4.1.7) - activesupport (= 4.1.7) - rack (~> 1.5.2) - rack-test (~> 0.6.2) - actionview (4.1.7) - activesupport (= 4.1.7) - builder (~> 3.1) - erubis (~> 2.7.0) - activemodel (4.1.7) - activesupport (= 4.1.7) - builder (~> 3.1) - activerecord (4.1.7) - activemodel (= 4.1.7) - activesupport (= 4.1.7) - arel (~> 5.0.0) - activeresource (4.0.0) - activemodel (~> 4.0) - activesupport (~> 4.0) - rails-observers (~> 0.1.1) - activesupport (4.1.7) - i18n (~> 0.6, >= 0.6.9) - json (~> 1.7, >= 1.7.7) - minitest (~> 5.1) - thread_safe (~> 0.1) - tzinfo (~> 1.1) - addressable (2.3.6) - arel (5.0.1.20140414130214) - binding_of_caller (0.7.2) - debug_inspector (>= 0.0.1) - builder (3.2.2) - byebug (3.5.1) - columnize (~> 0.8) - debugger-linecache (~> 1.2) - slop (~> 3.6) - capybara (2.4.4) - mime-types (>= 1.16) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - coderay (1.1.0) - columnize (0.8.9) - coveralls (0.7.0) - multi_json (~> 1.3) - rest-client - simplecov (>= 0.7) - term-ansicolor - thor - crack (0.4.2) - safe_yaml (~> 1.0.0) - ctl_base_ui (0.0.5) - haml (~> 4.0) - jquery-rails (~> 3.1) - jquery-ui-rails (~> 4.2) - rails (~> 4.1) - sass (~> 3.3) - debug_inspector (0.0.2) - debugger-linecache (1.2.0) - diff-lcs (1.2.5) - docile (1.1.5) - dotenv (0.11.1) - dotenv-deployment (~> 0.0.2) - dotenv-deployment (0.0.2) - dotenv-rails (0.11.1) - dotenv (= 0.11.1) - erubis (2.7.0) - execjs (2.2.2) - haml (4.0.5) - tilt - hike (1.2.3) - i18n (0.7.0) - its (0.2.0) - rspec-core - jquery-rails (3.1.2) - railties (>= 3.0, < 5.0) - thor (>= 0.14, < 2.0) - jquery-ui-rails (4.2.1) - railties (>= 3.2.16) - json (1.8.2) - kramdown (1.4.0) - libv8 (3.16.14.11) - mail (2.6.3) - mime-types (>= 1.16, < 3) - method_source (0.8.2) - mime-types (2.4.3) - mini_portile (0.6.1) - minitest (5.5.1) - multi_json (1.10.1) - netrc (0.8.0) - nokogiri (1.6.5) - mini_portile (~> 0.6.0) - phantomjs (1.9.7.1) - pry (0.10.1) - coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-byebug (2.0.0) - byebug (~> 3.4) - pry (~> 0.10) - pry-stack_explorer (0.4.9.1) - binding_of_caller (>= 0.7) - pry (>= 0.9.11) - puma (2.8.2) - rack (>= 1.1, < 2.0) - rack (1.5.2) - rack-protection (1.5.3) - rack - rack-test (0.6.3) - rack (>= 1.0) - rails (4.1.7) - actionmailer (= 4.1.7) - actionpack (= 4.1.7) - actionview (= 4.1.7) - activemodel (= 4.1.7) - activerecord (= 4.1.7) - activesupport (= 4.1.7) - bundler (>= 1.3.0, < 2.0) - railties (= 4.1.7) - sprockets-rails (~> 2.0) - rails-observers (0.1.2) - activemodel (~> 4.0) - railties (4.1.7) - actionpack (= 4.1.7) - activesupport (= 4.1.7) - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rake (10.4.0) - ref (1.0.5) - rest-client (1.7.2) - mime-types (>= 1.16, < 3.0) - netrc (~> 0.7) - rspec-core (3.1.7) - rspec-support (~> 3.1.0) - rspec-expectations (3.1.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.1.0) - rspec-mocks (3.1.3) - rspec-support (~> 3.1.0) - rspec-rails (3.1.0) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.1.0) - rspec-expectations (~> 3.1.0) - rspec-mocks (~> 3.1.0) - rspec-support (~> 3.1.0) - rspec-support (3.1.2) - safe_yaml (1.0.4) - sass (3.3.9) - simplecov (0.9.1) - docile (~> 1.1.0) - multi_json (~> 1.0) - simplecov-html (~> 0.8.0) - simplecov-html (0.8.0) - sinatra (1.4.5) - rack (~> 1.4) - rack-protection (~> 1.4) - tilt (~> 1.3, >= 1.3.4) - slop (3.6.0) - sprockets (2.12.3) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.4) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (>= 2.8, < 4.0) - teaspoon (0.8.0) - railties (>= 3.2.5, < 5) - term-ansicolor (1.3.0) - tins (~> 1.0) - therubyracer (0.12.1) - libv8 (~> 3.16.14.0) - ref - thor (0.19.1) - thread_safe (0.3.4) - tilt (1.4.1) - tins (1.3.3) - tzinfo (1.2.2) - thread_safe (~> 0.1) - uglifier (2.5.1) - execjs (>= 0.3.0) - json (>= 1.8.0) - webmock (1.20.4) - addressable (>= 2.3.6) - crack (>= 0.3.2) - xpath (2.0.0) - nokogiri (~> 1.3) - zeroclipboard-rails (0.1.0) - railties (>= 3.1) - -PLATFORMS - ruby - -DEPENDENCIES - activeresource (= 4.0.0) - capybara - coveralls (= 0.7.0) - ctl_base_ui - dotenv-rails (= 0.11.1) - haml (= 4.0.5) - its - kramdown (= 1.4.0) - phantomjs - pry - pry-byebug - pry-stack_explorer - puma (= 2.8.2) - rails (= 4.1.7) - rspec-rails - sass (= 3.3.9) - sinatra (= 1.4.5) - teaspoon - therubyracer (= 0.12.1) - uglifier (= 2.5.1) - webmock - zeroclipboard-rails diff --git a/pkgs/applications/networking/cluster/panamax/ui/default.nix b/pkgs/applications/networking/cluster/panamax/ui/default.nix deleted file mode 100644 index 2f60942f014ba..0000000000000 --- a/pkgs/applications/networking/cluster/panamax/ui/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ stdenv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler -, ruby, openssl, sqlite, dataDir ? "/var/lib/panamax-ui"}@args: - -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "panamax-ui-${version}"; - version = "0.2.14"; - - env = bundlerEnv { - name = "panamax-ui-gems-${version}"; - inherit ruby; - gemdir = ./.; - }; - - bundler = args.bundler.override { inherit ruby; }; - - src = fetchgit { - rev = "refs/tags/v${version}"; - url = "git://github.com/CenturyLinkLabs/panamax-ui"; - sha256 = "01k0h0rjqp5arvwxm2xpfxjsag5qw0qqlg7hx4v8f6jsyc4wmjfl"; - }; - - buildInputs = [ makeWrapper env.ruby openssl sqlite bundler ]; - - setSourceRoot = '' - mkdir -p $out/share - cp -R panamax-ui $out/share/panamax-ui - export sourceRoot="$out/share/panamax-ui" - ''; - - postPatch = '' - find . -type f -iname "*.haml" -exec sed -e 's|CoreOS Journal|NixOS Journal|g' -i "{}" \; - find . -type f -iname "*.haml" -exec sed -e 's|CoreOS Local|NixOS Local|g' -i "{}" \; - find . -type f -iname "*.haml" -exec sed -e 's|CoreOS Host|NixOS Host|g' -i "{}" \; - sed -e 's|CoreOS Local|NixOS Local|g' -i "spec/features/manage_application_spec.rb" - # fix libv8 dependency - substituteInPlace Gemfile.lock --replace "3.16.14.7" "3.16.14.11" - ''; - - configurePhase = '' - export HOME=$PWD - export GEM_HOME=${env}/${env.ruby.gemPath} - ''; - - buildPhase = '' - rm -f ./bin/* - bundle exec rake rails:update:bin - ''; - - installPhase = '' - rm -rf log tmp db - ln -sf ${dataDir}/{db,state/log,state/tmp} . - - mkdir -p $out/bin - makeWrapper bin/bundle "$out/bin/bundle" \ - --run "cd $out/share/panamax-ui" \ - --prefix "PATH" : "$out/share/panamax-ui/bin:${env.ruby}/bin:$PATH" \ - --prefix "HOME" : "$out/share/panamax-ui" \ - --prefix "GEM_HOME" : "${env}/${env.ruby.gemPath}" \ - --prefix "GEM_PATH" : "$out/share/panamax-ui:${bundler}/${env.ruby.gemPath}" - ''; - - meta = with stdenv.lib; { - broken = true; # needs ruby 2.1 - homepage = https://github.com/CenturyLinkLabs/panamax-ui; - description = "The Web GUI for Panamax"; - license = licenses.asl20; - maintainers = with maintainers; [ matejc offline ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/networking/cluster/panamax/ui/gemset.nix b/pkgs/applications/networking/cluster/panamax/ui/gemset.nix deleted file mode 100644 index b41b482edb73c..0000000000000 --- a/pkgs/applications/networking/cluster/panamax/ui/gemset.nix +++ /dev/null @@ -1,789 +0,0 @@ -{ - "actionmailer" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "0qjv5akjbpgd4cx518k522mssvc3y3nki65hi6fj5nbzi7a6rwq5"; - }; - dependencies = [ - "actionpack" - "actionview" - "mail" - ]; - }; - "actionpack" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "07y1ny00h69xklq260smyl5md052f617gqrzkyw5sxafs5z25zax"; - }; - dependencies = [ - "actionview" - "activesupport" - "rack" - "rack-test" - ]; - }; - "actionview" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "06sp37gfpn2jn7j6vlpp1y6vfi5kig60vyvixrjhyz0g4vgm13ax"; - }; - dependencies = [ - "activesupport" - "builder" - "erubis" - ]; - }; - "activemodel" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "0rlqzz25l7vsphgkilg80kmk20d9h357awi27ax6zzb9klkqh0jr"; - }; - dependencies = [ - "activesupport" - "builder" - ]; - }; - "activerecord" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "0j4r0m32mjbwmz9gs8brln35jzr1cn7h585ggj0w0f1ai4hjsby5"; - }; - dependencies = [ - "activemodel" - "activesupport" - "arel" - ]; - }; - "activeresource" = { - version = "4.0.0"; - source = { - type = "gem"; - sha256 = "0fc5igjijyjzsl9q5kybkdzhc92zv8wsv0ifb0y90i632jx6d4jq"; - }; - dependencies = [ - "activemodel" - "activesupport" - "rails-observers" - ]; - }; - "activesupport" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "13i3mz66d5kp5y39gjwmcfqv0wb6mxm5k1nnz40wvd38dsf7n3bs"; - }; - dependencies = [ - "i18n" - "json" - "minitest" - "thread_safe" - "tzinfo" - ]; - }; - "addressable" = { - version = "2.3.6"; - source = { - type = "gem"; - sha256 = "137fj0whmn1kvaq8wjalp8x4qbblwzvg3g4bfx8d8lfi6f0w48p8"; - }; - }; - "arel" = { - version = "5.0.1.20140414130214"; - source = { - type = "gem"; - sha256 = "0dhnc20h1v8ml3nmkxq92rr7qxxpk6ixhwvwhgl2dbw9mmxz0hf9"; - }; - }; - "binding_of_caller" = { - version = "0.7.2"; - source = { - type = "gem"; - sha256 = "15jg6dkaq2nzcd602d7ppqbdxw3aji961942w93crs6qw4n6h9yk"; - }; - dependencies = [ - "debug_inspector" - ]; - }; - "builder" = { - version = "3.2.2"; - source = { - type = "gem"; - sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2"; - }; - }; - "byebug" = { - version = "3.5.1"; - source = { - type = "gem"; - sha256 = "0ldc2r0b316rrn2fgdgiznskj9gb0q9n60243laq7nqw9na8wdan"; - }; - dependencies = [ - "columnize" - "debugger-linecache" - "slop" - ]; - }; - "capybara" = { - version = "2.4.4"; - source = { - type = "gem"; - sha256 = "114k4xi4nfbp3jfbxgwa3fksbwsyibx74gbdqpcgg3dxpmzkaa4f"; - }; - dependencies = [ - "mime-types" - "nokogiri" - "rack" - "rack-test" - "xpath" - ]; - }; - "coderay" = { - version = "1.1.0"; - source = { - type = "gem"; - sha256 = "059wkzlap2jlkhg460pkwc1ay4v4clsmg1bp4vfzjzkgwdckr52s"; - }; - }; - "columnize" = { - version = "0.8.9"; - source = { - type = "gem"; - sha256 = "1f3azq8pvdaaclljanwhab78hdw40k908ma2cwk59qzj4hvf7mip"; - }; - }; - "coveralls" = { - version = "0.7.0"; - source = { - type = "gem"; - sha256 = "0sz30d7b83qqsj3i0fr691w05d62wj7x3afh0ryjkqkis3fq94j4"; - }; - dependencies = [ - "multi_json" - "rest-client" - "simplecov" - "term-ansicolor" - "thor" - ]; - }; - "crack" = { - version = "0.4.2"; - source = { - type = "gem"; - sha256 = "1il94m92sz32nw5i6hdq14f1a2c3s9hza9zn6l95fvqhabq38k7a"; - }; - dependencies = [ - "safe_yaml" - ]; - }; - "ctl_base_ui" = { - version = "0.0.5"; - source = { - type = "gem"; - sha256 = "1pji85xmddgld5lqx52zxi5r2kx6rsjwkqlr26bp62xb29r10x57"; - }; - dependencies = [ - "haml" - "jquery-rails" - "jquery-ui-rails" - "rails" - "sass" - ]; - }; - "debug_inspector" = { - version = "0.0.2"; - source = { - type = "gem"; - sha256 = "109761g00dbrw5q0dfnbqg8blfm699z4jj70l4zrgf9mzn7ii50m"; - }; - }; - "debugger-linecache" = { - version = "1.2.0"; - source = { - type = "gem"; - sha256 = "0iwyx190fd5vfwj1gzr8pg3m374kqqix4g4fc4qw29sp54d3fpdz"; - }; - }; - "diff-lcs" = { - version = "1.2.5"; - source = { - type = "gem"; - sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1"; - }; - }; - "docile" = { - version = "1.1.5"; - source = { - type = "gem"; - sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx"; - }; - }; - "dotenv" = { - version = "0.11.1"; - source = { - type = "gem"; - sha256 = "09z0y0d6bks7i0sqvd8szfqj9i1kkj01anzly7shi83b3gxhrq9m"; - }; - dependencies = [ - "dotenv-deployment" - ]; - }; - "dotenv-deployment" = { - version = "0.0.2"; - source = { - type = "gem"; - sha256 = "1ad66jq9a09qq1js8wsyil97018s7y6x0vzji0dy34gh65sbjz8c"; - }; - }; - "dotenv-rails" = { - version = "0.11.1"; - source = { - type = "gem"; - sha256 = "0r6hif0i1lipbi7mkxx7wa5clsn65n6wyd9jry262cx396lsfrqy"; - }; - dependencies = [ - "dotenv" - ]; - }; - "erubis" = { - version = "2.7.0"; - source = { - type = "gem"; - sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; - }; - }; - "execjs" = { - version = "2.2.2"; - source = { - type = "gem"; - sha256 = "05m41mnxn4b2p133qzbz5cy9cc5rn57aa0pp2943hxmzbk379z1f"; - }; - }; - "haml" = { - version = "4.0.5"; - source = { - type = "gem"; - sha256 = "1xmzb0k5q271090crzmv7dbw8ss4289bzxklrc0fhw6pw3kcvc85"; - }; - dependencies = [ - "tilt" - ]; - }; - "hike" = { - version = "1.2.3"; - source = { - type = "gem"; - sha256 = "0i6c9hrszzg3gn2j41v3ijnwcm8cc2931fnjiv6mnpl4jcjjykhm"; - }; - }; - "i18n" = { - version = "0.7.0"; - source = { - type = "gem"; - sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758"; - }; - }; - "its" = { - version = "0.2.0"; - source = { - type = "gem"; - sha256 = "0rxwds9ipqp48mzqcaxzmfcqhawazg0zlhc1avv3i2cmm3np1z8g"; - }; - dependencies = [ - "rspec-core" - ]; - }; - "jquery-rails" = { - version = "3.1.2"; - source = { - type = "gem"; - sha256 = "0h5a565i3l2mbd221m6mz9d1nr53pz19i9qxv08qr1dv0yx2pr3y"; - }; - dependencies = [ - "railties" - "thor" - ]; - }; - "jquery-ui-rails" = { - version = "4.2.1"; - source = { - type = "gem"; - sha256 = "1garrnqwh35acj2pp4sp6fpm2g881h23y644lzbic2qmcrq9wd2v"; - }; - dependencies = [ - "railties" - ]; - }; - "json" = { - version = "1.8.2"; - source = { - type = "gem"; - sha256 = "0zzvv25vjikavd3b1bp6lvbgj23vv9jvmnl4vpim8pv30z8p6vr5"; - }; - }; - "kramdown" = { - version = "1.4.0"; - source = { - type = "gem"; - sha256 = "001vy0ymiwbvkdbb9wpqmswv6imliv7xim00gq6rlk0chnbiaq80"; - }; - }; - libv8 = { - version = "3.16.14.11"; - source = { - type = "gem"; - sha256 = "000vbiy78wk5r1f6p7qncab8ldg7qw5pjz7bchn3lw700gpaacxp"; - }; - }; - "mail" = { - version = "2.6.3"; - source = { - type = "gem"; - sha256 = "1nbg60h3cpnys45h7zydxwrl200p7ksvmrbxnwwbpaaf9vnf3znp"; - }; - dependencies = [ - "mime-types" - ]; - }; - "method_source" = { - version = "0.8.2"; - source = { - type = "gem"; - sha256 = "1g5i4w0dmlhzd18dijlqw5gk27bv6dj2kziqzrzb7mpgxgsd1sf2"; - }; - }; - "mime-types" = { - version = "2.4.3"; - source = { - type = "gem"; - sha256 = "16nissnb31wj7kpcaynx4gr67i7pbkzccfg8k7xmplbkla4rmwiq"; - }; - }; - "mini_portile" = { - version = "0.6.1"; - source = { - type = "gem"; - sha256 = "07gah4k84sar9d850v9gip9b323pw74vwwndh3bbzxpw5iiwsd3l"; - }; - }; - "minitest" = { - version = "5.5.1"; - source = { - type = "gem"; - sha256 = "1h8jn0rgmwy37jnhfcg55iilw0n370vgp8xnh0g5laa8rhv32fyn"; - }; - }; - "multi_json" = { - version = "1.10.1"; - source = { - type = "gem"; - sha256 = "1ll21dz01jjiplr846n1c8yzb45kj5hcixgb72rz0zg8fyc9g61c"; - }; - }; - "netrc" = { - version = "0.8.0"; - source = { - type = "gem"; - sha256 = "1j4jbdvd19kq34xiqx1yqb4wmcywyrlaky8hrh09c1hz3c0v5dkb"; - }; - }; - "nokogiri" = { - version = "1.6.5"; - source = { - type = "gem"; - sha256 = "1xmxz6fa0m4p7c7ngpgz6gjgv65lzz63dsf0b6vh7gs2fkiw8j7l"; - }; - dependencies = [ - "mini_portile" - ]; - }; - "phantomjs" = { - version = "1.9.7.1"; - source = { - type = "gem"; - sha256 = "14as0yzwbzvshbp1f8igjxcdxc5vbjgh0jhdvy393il084inlrl7"; - }; - }; - "pry" = { - version = "0.10.1"; - source = { - type = "gem"; - sha256 = "1j0r5fm0wvdwzbh6d6apnp7c0n150hpm9zxpm5xvcgfqr36jaj8z"; - }; - dependencies = [ - "coderay" - "method_source" - "slop" - ]; - }; - "pry-byebug" = { - version = "2.0.0"; - source = { - type = "gem"; - sha256 = "17b6720ci9345wkzj369ydyj6hdlg2krd26zivpd4dvaijszzgzq"; - }; - dependencies = [ - "byebug" - "pry" - ]; - }; - "pry-stack_explorer" = { - version = "0.4.9.1"; - source = { - type = "gem"; - sha256 = "1828jqcfdr9nk86n15ky199vf33cfz51wkpv6kx230g0dsh9r85z"; - }; - dependencies = [ - "binding_of_caller" - "pry" - ]; - }; - "puma" = { - version = "2.8.2"; - source = { - type = "gem"; - sha256 = "1l57fmf8vyxfjv7ab5znq0k339cym5ghnm5xxfvd1simjp73db0k"; - }; - dependencies = [ - "rack" - ]; - }; - "rack" = { - version = "1.5.2"; - source = { - type = "gem"; - sha256 = "19szfw76cscrzjldvw30jp3461zl00w4xvw1x9lsmyp86h1g0jp6"; - }; - }; - "rack-protection" = { - version = "1.5.3"; - source = { - type = "gem"; - sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r"; - }; - dependencies = [ - "rack" - ]; - }; - "rack-test" = { - version = "0.6.3"; - source = { - type = "gem"; - sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z"; - }; - dependencies = [ - "rack" - ]; - }; - "rails" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "059mpljplmhfz8rr4hk40q67fllcpsy809m4mwwbkm8qwif2z5r0"; - }; - dependencies = [ - "actionmailer" - "actionpack" - "actionview" - "activemodel" - "activerecord" - "activesupport" - "railties" - "sprockets-rails" - ]; - }; - "rails-observers" = { - version = "0.1.2"; - source = { - type = "gem"; - sha256 = "1lsw19jzmvipvrfy2z04hi7r29dvkfc43h43vs67x6lsj9rxwwcy"; - }; - dependencies = [ - "activemodel" - ]; - }; - "railties" = { - version = "4.1.7"; - source = { - type = "gem"; - sha256 = "1n08h0rgj0aq5lvslnih6lvqz9wadpz6nnb25i4qhp37fhhyz9yz"; - }; - dependencies = [ - "actionpack" - "activesupport" - "rake" - "thor" - ]; - }; - "rake" = { - version = "10.4.0"; - source = { - type = "gem"; - sha256 = "0a10xzqc1lh6gjkajkslr0n40wjrniyiyzxkp9m5fc8wf7b74zw8"; - }; - }; - "ref" = { - version = "1.0.5"; - source = { - type = "gem"; - sha256 = "19qgpsfszwc2sfh6wixgky5agn831qq8ap854i1jqqhy1zsci3la"; - }; - }; - "rest-client" = { - version = "1.7.2"; - source = { - type = "gem"; - sha256 = "0h8c0prfi2v5p8iim3wm60xc4yripc13nqwq601bfl85k4gf25i0"; - }; - dependencies = [ - "mime-types" - "netrc" - ]; - }; - "rspec-core" = { - version = "3.1.7"; - source = { - type = "gem"; - sha256 = "01bawvln663gffljwzpq3mrpa061cghjbvfbq15jvhmip3csxqc9"; - }; - dependencies = [ - "rspec-support" - ]; - }; - "rspec-expectations" = { - version = "3.1.2"; - source = { - type = "gem"; - sha256 = "0m8d36wng1lpbcs54zhg1rxh63rgj345k3p0h0c06lgknz339nzh"; - }; - dependencies = [ - "diff-lcs" - "rspec-support" - ]; - }; - "rspec-mocks" = { - version = "3.1.3"; - source = { - type = "gem"; - sha256 = "0gxk5w3klia4zsnp0svxck43xxwwfdqvhr3srv6p30f3m5q6rmzr"; - }; - dependencies = [ - "rspec-support" - ]; - }; - "rspec-rails" = { - version = "3.1.0"; - source = { - type = "gem"; - sha256 = "1b1in3n1dc1bpf9wb3p3b2ynq05iacmr48jxzc73lj4g44ksh3wq"; - }; - dependencies = [ - "actionpack" - "activesupport" - "railties" - "rspec-core" - "rspec-expectations" - "rspec-mocks" - "rspec-support" - ]; - }; - "rspec-support" = { - version = "3.1.2"; - source = { - type = "gem"; - sha256 = "14y6v9r9lrh91ry9r79h85v0f3y9ja25w42nv5z9n0bipfcwhprb"; - }; - }; - "safe_yaml" = { - version = "1.0.4"; - source = { - type = "gem"; - sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; - }; - }; - "sass" = { - version = "3.3.9"; - source = { - type = "gem"; - sha256 = "0k19vj73283i907z4wfkc9qdska2b19z7ps6lcr5s4qzwis1zkmz"; - }; - }; - "simplecov" = { - version = "0.9.1"; - source = { - type = "gem"; - sha256 = "06hylxlalaxxldpbaqa54gc52wxdff0fixdvjyzr6i4ygxwzr7yf"; - }; - dependencies = [ - "docile" - "multi_json" - "simplecov-html" - ]; - }; - "simplecov-html" = { - version = "0.8.0"; - source = { - type = "gem"; - sha256 = "0jhn3jql73x7hsr00wwv984iyrcg0xhf64s90zaqv2f26blkqfb9"; - }; - }; - "sinatra" = { - version = "1.4.5"; - source = { - type = "gem"; - sha256 = "0qyna3wzlnvsz69d21lxcm3ixq7db08mi08l0a88011qi4qq701s"; - }; - dependencies = [ - "rack" - "rack-protection" - "tilt" - ]; - }; - "slop" = { - version = "3.6.0"; - source = { - type = "gem"; - sha256 = "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n"; - }; - }; - "sprockets" = { - version = "2.12.3"; - source = { - type = "gem"; - sha256 = "1bn2drr8bc2af359dkfraq0nm0p1pib634kvhwn5lvj3r4vllnn2"; - }; - dependencies = [ - "hike" - "multi_json" - "rack" - "tilt" - ]; - }; - "sprockets-rails" = { - version = "2.2.4"; - source = { - type = "gem"; - sha256 = "172cdg38cqsfgvrncjzj0kziz7kv6b1lx8pccd0blyphs25qf4gc"; - }; - dependencies = [ - "actionpack" - "activesupport" - "sprockets" - ]; - }; - "teaspoon" = { - version = "0.8.0"; - source = { - type = "gem"; - sha256 = "1j3brbm9cv5km9d9wzb6q2b3cvc6m254z48h7h77z1w6c5wr0p3z"; - }; - dependencies = [ - "railties" - ]; - }; - "term-ansicolor" = { - version = "1.3.0"; - source = { - type = "gem"; - sha256 = "1a2gw7gmpmx57sdpyhjwl0zn4bqp7jyjz7aslpvvphd075layp4b"; - }; - dependencies = [ - "tins" - ]; - }; - "therubyracer" = { - version = "0.12.1"; - source = { - type = "gem"; - sha256 = "106fqimqyaalh7p6czbl5m2j69z8gv7cm10mjb8bbb2p2vlmqmi6"; - }; - dependencies = [ - "libv8" - "ref" - ]; - }; - "thor" = { - version = "0.19.1"; - source = { - type = "gem"; - sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; - }; - }; - "thread_safe" = { - version = "0.3.4"; - source = { - type = "gem"; - sha256 = "1cil2zcdzqkyr8zrwhlg7gywryg36j4mxlxw0h0x0j0wjym5nc8n"; - }; - }; - "tilt" = { - version = "1.4.1"; - source = { - type = "gem"; - sha256 = "00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir"; - }; - }; - "tins" = { - version = "1.3.3"; - source = { - type = "gem"; - sha256 = "14jnsg15wakdk1ljh2iv9yvzk8nb7gpzd2zw4yvjikmffqjyqvna"; - }; - }; - "tzinfo" = { - version = "1.2.2"; - source = { - type = "gem"; - sha256 = "1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx"; - }; - dependencies = [ - "thread_safe" - ]; - }; - "uglifier" = { - version = "2.5.1"; - source = { - type = "gem"; - sha256 = "1vihq309mzv9a2i0s8v4imrn1g2kj8z0vr88q3i5b657c4kxzfp0"; - }; - dependencies = [ - "execjs" - "json" - ]; - }; - "webmock" = { - version = "1.20.4"; - source = { - type = "gem"; - sha256 = "01cz13ybxbbvkpl21bcfv0p9ir8m2zcplx93ps01ma54p25z4mxr"; - }; - dependencies = [ - "addressable" - "crack" - ]; - }; - "xpath" = { - version = "2.0.0"; - source = { - type = "gem"; - sha256 = "04kcr127l34p7221z13blyl0dvh0bmxwx326j72idayri36a394w"; - }; - dependencies = [ - "nokogiri" - ]; - }; - "zeroclipboard-rails" = { - version = "0.1.0"; - source = { - type = "gem"; - sha256 = "00ixal0a0mxaqsyzp06c6zz4qdwqydy1qv4n7hbyqfhbmsdalcfc"; - }; - dependencies = [ - "railties" - ]; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index 538e9a3786be1..eff33643ebcfa 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -1,6 +1,5 @@ -{stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig -, cairo, mpg123, gstreamer, gst-ffmpeg, gst-plugins-base, gst-plugins-bad -, gst-plugins-good, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg +{stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig, gst_all_1 +, cairo, mpg123, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg , gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx }: stdenv.mkDerivation rec { @@ -11,11 +10,10 @@ stdenv.mkDerivation rec { sha256 = "02bf4fwirf3b7h3cr1jqm0xsjzza4fi9kg88424js2l0xywwzpgf"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [zlib openssl libre librem - cairo mpg123 gstreamer gst-ffmpeg gst-plugins-base gst-plugins-bad gst-plugins-good + buildInputs = [zlib openssl libre librem cairo mpg123 alsaLib SDL libv4l celt libsndfile srtp ffmpeg gsm speex portaudio spandsp libuuid ccache libvpx - ]; + ] ++ (with gst_all_1; [ gstreamer gst-libav gst-plugins-base gst-plugins-bad gst-plugins-good ]); makeFlags = [ "LIBRE_MK=${libre}/share/re/re.mk" "LIBRE_INC=${libre}/include/re" @@ -26,7 +24,7 @@ stdenv.mkDerivation rec { "CCACHE_DISABLE=1" "USE_ALSA=1" "USE_AMR=1" "USE_CAIRO=1" "USE_CELT=1" - "USE_CONS=1" "USE_EVDEV=1" "USE_FFMPEG=1" "USE_GSM=1" "USE_GST=1" + "USE_CONS=1" "USE_EVDEV=1" "USE_FFMPEG=1" "USE_GSM=1" "USE_GST1=1" "USE_L16=1" "USE_MPG123=1" "USE_OSS=1" "USE_PLC=1" "USE_VPX=1" "USE_PORTAUDIO=1" "USE_SDL=1" "USE_SNDFILE=1" "USE_SPEEX=1" "USE_SPEEX_AEC=1" "USE_SPEEX_PP=1" "USE_SPEEX_RESAMP=1" "USE_SRTP=1" diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 8405769582f7e..688ac6d10d6fc 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -17,8 +17,8 @@ let src = fetchFromGitHub { owner = "mujx"; repo = "matrix-structs"; - rev = "91bb2b85a75d664007ef81aeb500d35268425922"; - sha256 = "1v544pv18sd91gdrhbk0nm54fggprsvwwrkjmxa59jrvhwdk7rsx"; + rev = "690080daa3bc1984297c4d7103cde9ea07e2e0b7"; + sha256 = "0l6mncpdbjmrzp5a3q1jv0sxf7bwl5ljslrcjca1j2bjjbqb61bz"; }; postUnpack = '' @@ -47,13 +47,13 @@ let in stdenv.mkDerivation rec { name = "nheko-${version}"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "mujx"; repo = "nheko"; rev = "v${version}"; - sha256 = "1dqd698p6wicz0x1lb6mzlwcp68sjkivanb9lwz3yy1mlmy8i3jn"; + sha256 = "1yg6bk193mqj99x3sy0f20x3ggpl0ahrp36w6hhx7pyw5qm17342"; }; # This patch is likely not strictly speaking needed, but will help detect when diff --git a/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch b/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch index 661ae756a4dde..a3425a7804543 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch +++ b/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch @@ -54,7 +54,7 @@ index cef00f6..e69de29 100644 - MatrixStructs - - GIT_REPOSITORY https://github.com/mujx/matrix-structs -- GIT_TAG 91bb2b85a75d664007ef81aeb500d35268425922 +- GIT_TAG 690080daa3bc1984297c4d7103cde9ea07e2e0b7 - - BUILD_IN_SOURCE 1 - SOURCE_DIR ${MATRIX_STRUCTS_ROOT} diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index ce558130a6ce8..4946c065492f3 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -3,11 +3,11 @@ let configFile = writeText "riot-config.json" conf; in stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "0.14.1"; + version = "0.14.2"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "08paca7wc135hspkv97bgh2a29hbg8vxv0mrp68mgwscpyrl6vnf"; + sha256 = "1qma49a6lvr9anrry3vbhjhvy06bgapknnvbdljnbb3l9c99nmxi"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index f1b3c55d14c3a..1791a7ff1ddc4 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://telepathy.freedesktop.org/releases/${project}/${name}.tar.bz2"; - sha256 = "18i00l8lnp5dghqmgmpxnn0is2a20pkisxy0sb78hnd2dz0z6xnl"; + sha256 = "1bjx85k7jyfi5pvl765fzc7q2iz9va51anrc2djv7caksqsdbjlg"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 03b4b980929c8..db32dd0c23e28 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, system, makeWrapper, makeDesktopItem, - alsaLib, dbus, glib, gstreamer, fontconfig, freetype, libpulseaudio, libxml2, - libxslt, libGLU_combined, nspr, nss, sqlite, utillinux, zlib, xorg, udev, expat, libv4l }: + alsaLib, dbus, glib, fontconfig, freetype, libpulseaudio, + utillinux, zlib, xorg, udev, sqlite, expat, libv4l, procps }: let - version = "2.0.106600.0904"; + version = "2.0.123200.0405"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "1dcr0rqgjingjqbqv37hqjhhwy8axnjyirrnmjk44b5xnh239w9s"; + sha256 = "1ifwa2xf5mw1ll2j1f39qd7mpyxpc6xj3650dmlnxf525dsm573z"; }; }; @@ -17,25 +17,20 @@ in stdenv.mkDerivation { src = srcs.${system}; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; libPath = stdenv.lib.makeLibraryPath [ alsaLib - dbus + expat glib - gstreamer - fontconfig freetype libpulseaudio - libxml2 - libxslt - nspr - nss + zlib + dbus + fontconfig sqlite utillinux - zlib udev - expat xorg.libX11 xorg.libSM @@ -79,6 +74,7 @@ in stdenv.mkDerivation { makeWrapper $packagePath/zoom $out/bin/zoom-us \ --prefix LD_LIBRARY_PATH : "$packagePath:$libPath" \ --prefix LD_PRELOAD : "${libv4l}/lib/v4l1compat.so" \ + --prefix PATH : "${procps}/bin" \ --set QT_PLUGIN_PATH "$packagePath/platforms" \ --set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \ --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" diff --git a/pkgs/applications/networking/ndppd/default.nix b/pkgs/applications/networking/ndppd/default.nix index 5314d3668eb04..a5eb9021048e4 100644 --- a/pkgs/applications/networking/ndppd/default.nix +++ b/pkgs/applications/networking/ndppd/default.nix @@ -1,6 +1,11 @@ -{ stdenv, fetchFromGitHub, gzip, ... }: +{ stdenv, fetchFromGitHub, fetchurl, gzip, ... }: -stdenv.mkDerivation rec { +let + serviceFile = fetchurl { + url = "https://raw.githubusercontent.com/DanielAdolfsson/ndppd/f37e8eb33dc68b3385ecba9b36a5efd92755580f/ndppd.service"; + sha256 = "1zf54pzjfj9j9gr48075njqrgad4myd3dqmhvzxmjy4gjy9ixmyh"; + }; +in stdenv.mkDerivation rec { name = "ndppd-${version}"; version = "0.2.5"; @@ -19,6 +24,16 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace /bin/gzip ${gzip}/bin/gzip ''; + postInstall = '' + mkdir -p $out/etc + cp ndppd.conf-dist $out/etc/ndppd.conf + + mkdir -p $out/lib/systemd/system + # service file needed for our module is not in release yet + substitute ${serviceFile} $out/lib/systemd/system/ndppd.service \ + --replace /usr/sbin/ndppd $out/sbin/ndppd + ''; + meta = { description = "A daemon that proxies NDP (Neighbor Discovery Protocol) messages between interfaces"; homepage = https://github.com/DanielAdolfsson/ndppd; diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 0b8a584fc6a62..74d59c05ec91f 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -6,13 +6,13 @@ let pname = "liferea"; - version = "1.12.2"; + version = "1.12.3"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "18mz1drp6axvjbr9jdw3i0ijl3l2m191198p4c93qnm7g96ldh15"; + sha256 = "0wm2c8qrgnadq63fivai53xm7vl05wgxc0nk39jcriscdikzqpcg"; }; nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ]; diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 90d68a96e5c03..b2e9333beb3ee 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -10,11 +10,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "qbittorrent-${version}"; - version = "4.0.4"; + version = "4.1.0"; src = fetchurl { url = "mirror://sourceforge/qbittorrent/${name}.tar.xz"; - sha256 = "13sw0sdw2agm49plp9xvkg6wva274drpvgz76dqj4j2kfxx9s2jk"; + sha256 = "0fdr74sc31x421sb69vlgal1hxpccjxxk8hrrzz9f5bg4jv895pw"; }; nativeBuildInputs = [ pkgconfig which ]; diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix new file mode 100644 index 0000000000000..212aaa5fa2c4d --- /dev/null +++ b/pkgs/applications/office/kmymoney/default.nix @@ -0,0 +1,70 @@ +{ stdenv, lib, fetchurl, doxygen, extra-cmake-modules, graphviz, kdoctools + +, akonadi, alkimia, aqbanking, gmp, gwenhywfar, kactivities, karchive +, kcmutils, kcontacts, kdewebkit, kdiagram, kholidays, kidentitymanagement +, kitemmodels, libical, libofx, qgpgme + +# Needed for running tests: +, qtbase, xvfb_run + +# For weboob, which only supports Python 2.x: +, python2Packages +}: + +stdenv.mkDerivation rec { + name = "kmymoney-${version}"; + version = "5.0.1"; + + src = fetchurl { + url = "mirror://kde/stable/kmymoney/${version}/src/${name}.tar.xz"; + sha256 = "1c9apnvc07y17pzy4vygry1dai5ass2z7j354lrcppa85b18yvnx"; + }; + + # Hidden dependency that wasn't included in CMakeLists.txt: + NIX_CFLAGS_COMPILE = "-I${kitemmodels.dev}/include/KF5"; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + doxygen extra-cmake-modules graphviz kdoctools python2Packages.wrapPython + ]; + + buildInputs = [ + akonadi alkimia aqbanking gmp gwenhywfar kactivities karchive kcmutils + kcontacts kdewebkit kdiagram kholidays kidentitymanagement kitemmodels + libical libofx qgpgme + + # Put it into buildInputs so that CMake can find it, even though we patch + # it into the interface later. + python2Packages.weboob + ]; + + weboobPythonPath = [ python2Packages.weboob ]; + + postInstall = '' + buildPythonPath "$weboobPythonPath" + patchPythonScript "$out/share/kmymoney/weboob/kmymoneyweboob.py" + + # Within the embedded Python interpreter, sys.argv is unavailable, so let's + # assign it to a dummy value so that the assignment of sys.argv[0] injected + # by patchPythonScript doesn't fail: + sed -i -e '1i import sys; sys.argv = [""]' \ + "$out/share/kmymoney/weboob/kmymoneyweboob.py" + ''; + + doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform; + installCheckPhase = let + pluginPath = "${qtbase.bin}/${qtbase.qtPluginPrefix}"; + in lib.optionalString doInstallCheck '' + QT_PLUGIN_PATH=${lib.escapeShellArg pluginPath} CTEST_OUTPUT_ON_FAILURE=1 \ + ${xvfb_run}/bin/xvfb-run -s '-screen 0 1024x768x24' make test \ + ARGS="-E '(reports-chart-test)'" # Test fails, so exclude it for now. + ''; + + meta = { + description = "Personal finance manager for KDE"; + homepage = https://kmymoney.org/; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index bb6e529f5d299..9675293cfe579 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr, libedit, python -, texinfo, gnused }: +, texinfo, gnused, usePython ? true }: stdenv.mkDerivation rec { name = "ledger-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; + cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" (stdenv.lib.optionalString usePython "-DUSE_PYTHON=true") ]; # Skip byte-compiling of emacs-lisp files because this is currently # broken in ledger... diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 7af1669dc45e8..ed90ed5aa0472 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.2"; + version = "2.18.3"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "0w3b2jz4n9irslsg85r4x9dc3y4ziykn8fs4iqqiq4sfdcz259fz"; + sha256 = "0w4v30vnyr549hd9lhj1sm69whssabqvhfrbavxfjbl2k9fw83qf"; }; buildInputs = [ jre makeWrapper ]; diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 095aa5a7f8c87..16fdab59ea022 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "lean-${version}"; - version = "3.3.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean"; rev = "v${version}"; - sha256 = "0irh9b4haz0pzzxrb4hwcss91a0xb499kjrcrmr2s59p3zq8bbd9"; + sha256 = "0ww8azlyy3xikhd7nh96f507sg23r53zvayij1mwv5513vmblhhw"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix index 98acebcf2cc50..2580b9b0fbe0e 100644 --- a/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/pkgs/applications/science/logic/symbiyosys/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "symbiyosys-${version}"; - version = "2018.03.21"; + version = "2018.05.03"; src = fetchFromGitHub { owner = "yosyshq"; repo = "symbiyosys"; - rev = "76a624a363bc44df102359595d34f29370c6668b"; - sha256 = "1ikax1yiqgj5442wcgp1iigw8wiyw7k848z4ykn7k068kbc320bm"; + rev = "35d956c7bb77c0602d198035b2d73a9c61cb4de4"; + sha256 = "02zg3nkwp3fdjwz1agvsn55k1xipwh2rradb0bgjrjpsmmw63gda"; }; buildInputs = [ python3 yosys ]; diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix index 7a9dcc231929f..fb37554b65fe7 100644 --- a/pkgs/applications/science/logic/tamarin-prover/default.nix +++ b/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -4,12 +4,12 @@ }: let - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "tamarin-prover"; repo = "tamarin-prover"; - rev = "120c7e706f3e1d4646b233faf2bc9936834ed9d3"; - sha256 = "064blwjjwnkycwgsrdn1xkjya976wndpz9h5pjmgjqqirinc8c5x"; + rev = "7ced07a69f8e93178f9a95797479277a736ae572"; + sha256 = "02pyw22h90228g6qybjpdvpcm9d5lh96f5qwmy2hv2bylz05z3nn"; }; # tamarin has its own dependencies, but they're kept inside the repo, @@ -65,13 +65,22 @@ mkDerivation (common "tamarin-prover" src // { enableSharedExecutables = false; postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc"; + # Fix problem with MonadBaseControl not being found + patchPhase = '' + sed -ie 's,\(import *\)Control\.Monad$,&\ + \1Control.Monad.Trans.Control,' src/Web/Handler.hs + + sed -ie 's~\( *, \)mtl~&\ + \1monad-control~' tamarin-prover.cabal + ''; + # wrap the prover to be sure it can find maude, sapic, etc executableToolDepends = [ makeWrapper which maude graphviz sapic ]; postInstall = '' wrapProgram $out/bin/tamarin-prover \ --prefix PATH : ${lib.makeBinPath [ which maude graphviz sapic ]} # so that the package can be used as a vim plugin to install syntax coloration - install -Dt $out/share/vim-plugins/tamarin-prover/syntax/ etc/{spthy,sapic}.vim + install -Dt $out/share/vim-plugins/tamarin-prover/syntax/ etc/{spthy,sapic}.vim install etc/filetype.vim -D $out/share/vim-plugins/tamarin-prover/ftdetect/tamarin.vim ''; @@ -79,8 +88,8 @@ mkDerivation (common "tamarin-prover" src // { executableHaskellDepends = (with haskellPackages; [ base binary binary-orphans blaze-builder blaze-html bytestring - cmdargs conduit containers deepseq directory fclabels file-embed - filepath gitrev http-types HUnit lifted-base mtl parsec process + cmdargs conduit containers monad-control deepseq directory fclabels file-embed + filepath gitrev http-types HUnit lifted-base mtl monad-unlift parsec process resourcet safe shakespeare tamarin-prover-term template-haskell text threads time wai warp yesod-core yesod-static ]) ++ [ tamarin-prover-utils diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 9b9d5b250ef60..97781a69ce644 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -19,6 +19,8 @@ , libxml2 , libuuid , lang ? "en" +, libGL +, libGLU }: let @@ -56,6 +58,8 @@ stdenv.mkDerivation rec { libxml2 libuuid zlib + libGL + libGLU ] ++ (with xorg; [ libX11 libXext diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index cadc72f0f87b9..f46a704ea9caa 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "fossil-${version}"; - version = "2.5"; + version = "2.6"; src = fetchurl { urls = @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { "https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz" ]; name = "${name}.tar.gz"; - sha256 = "1lxawkhr1ki9fqw8076fxib2b1w673449yzb6vxjshqzh5h77c7r"; + sha256 = "1nbfzxwnq66f8162nmddd22xn3nyazqr16kka2c1gghqb5ar99vn"; }; buildInputs = [ zlib openssl readline sqlite which ed ] diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 2bd8697c8ec11..13b861d0a9edd 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -89,6 +89,8 @@ rec { git-secret = callPackage ./git-secret { }; + git-secrets = callPackage ./git-secrets { }; + git-stree = callPackage ./git-stree { }; git2cl = callPackage ./git2cl { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix index 5e41db0e03f84..adfdb9a541c11 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "git-remote-gcrypt-${version}"; - version = "1.0.3"; + version = "1.1"; rev = version; src = fetchFromGitHub { inherit rev; owner = "spwhitton"; repo = "git-remote-gcrypt"; - sha256 = "1vay3204729c7wajgn3nxf0s0hzwpdrw14pl6kd8w2ss25gvw2k1"; + sha256 = "0mhz5mqnr35rk7j4wyhp7hzmqgv8r554n9qlm4iw565bz7acvq24"; }; outputs = [ "out" "man" ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix new file mode 100644 index 0000000000000..14026df818537 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix @@ -0,0 +1,40 @@ +{ stdenv, lib, fetchFromGitHub, makeWrapper, git }: + +let + version = "1.2.1"; + repo = "git-secrets"; + +in stdenv.mkDerivation { + name = "${repo}-${version}"; + + src = fetchFromGitHub { + inherit repo; + owner = "awslabs"; + rev = "${version}"; + sha256 = "14jsm4ks3k5d9iq3jr23829izw040pqpmv7dz8fhmvx6qz8fybzg"; + }; + + buildInputs = [ makeWrapper git]; + + # buildPhase = '' + # make man # TODO: need rst2man.py + # ''; + + installPhase = '' + install -D git-secrets $out/bin/git-secrets + + wrapProgram $out/bin/git-secrets \ + --prefix PATH : "${lib.makeBinPath [ git ]}" + + # TODO: see above note on rst2man.py + # mkdir $out/share + # cp -r man $out/share + ''; + + meta = { + description = "Prevents you from committing passwords and other sensitive information to a git repository"; + homepage = https://github.com/awslabs/git-secretshttps://github.com/awslabs/git-secrets; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index da9ee9b40811f..71b59ed4aef7f 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; buildGoPackage rec { name = "gitea-${version}"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "07fbcd134n7giwxpqli5hfywmi0vb8awgdh3gyiwyzhjwwzfrxkq"; + sha256 = "1mid67c4021m7mi4ablx1w5v43831gzn8xpg8n30a4zmr70781wm"; }; patches = [ ./static-root-path.patch ]; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 1e29b458a3145..cf68da44a5fac 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "3.4.0"; + version = "3.6.0"; src = fetchurl { url = "https://release.gitkraken.com/linux/v${version}.deb"; - sha256 = "0jj3a02bz30xa7p4migyhvxd9s0cllymsp1rdh2pbh40p79g1fp1"; + sha256 = "0zrxw7rrlspm3ic847dy1ly4rlcdkizdr6m8nycmrxg4s98yxkb8"; }; libPath = makeLibraryPath [ @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { find $out/share/gitkraken -name "*.node" -exec patchelf --set-rpath "${libPath}:$out/share/gitkraken" {} \; - rm $out/bin/gitkraken + mkdir $out/bin ln -s $out/share/gitkraken/gitkraken $out/bin/gitkraken ''; diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index e3cafe6b64649..f6816ec154848 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -5,14 +5,14 @@ let pname = "meld"; - version = "3.18.0"; + version = "3.18.1"; inherit (python3Packages) python buildPythonApplication pycairo pygobject3; in buildPythonApplication rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0gi2jzgsrd5q2icyp6wphbn532ddg82nxhfxlffkniy7wnqmi0c4"; + sha256 = "0yg8i1ff3rsavsaxbnd6dxmfsiyv49kk8rv5wqnyhf2zmfp8rxis"; }; buildInputs = [ diff --git a/pkgs/applications/version-management/sit/aarch64-eexist.patch b/pkgs/applications/version-management/sit/aarch64-eexist.patch new file mode 100644 index 0000000000000..8b45e77d040db --- /dev/null +++ b/pkgs/applications/version-management/sit/aarch64-eexist.patch @@ -0,0 +1,17 @@ +diff --git a/sit-core/src/repository.rs b/sit-core/src/repository.rs +index ebd357d..074dcc9 100644 +--- a/sit-core/src/repository.rs ++++ b/sit-core/src/repository.rs +@@ -305,6 +305,12 @@ impl Repository { + let id: String = name.into(); + let mut path = self.items_path.clone(); + path.push(&id); ++ #[cfg(all(debug_assertions, target_arch = "aarch64"))] { ++ use std::io; ++ if path.is_dir() { ++ return Err(io::Error::from_raw_os_error(17).into()); // 17 is EEXIST ++ } ++ } + fs::create_dir(path)?; + let id = OsString::from(id); + Ok(Item { diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix index 84211543c3b38..ae84add283e61 100644 --- a/pkgs/applications/version-management/sit/default.nix +++ b/pkgs/applications/version-management/sit/default.nix @@ -1,23 +1,27 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ stdenv, fetchFromGitHub, rustPlatform, cmake, libzip }: rustPlatform.buildRustPackage rec { name = "sit-${version}"; - version = "0.3.0"; + version = "0.3.2"; src = fetchFromGitHub { owner = "sit-it"; repo = "sit"; rev = "v${version}"; - sha256 = "1si4fg02wxi35hpkr58na06h19yjw6qd9c5mbb9xfkkzgz5mnssj"; + sha256 = "0lhl4rrfmsi76498mg5si2xagl8l2pi5d92dxhsyzszpwn5jdp57"; }; - cargoSha256 = "083p7z7blj064840ddgnxvqjmih4bmy92clds3qgv5v7lh63wfmn"; + buildInputs = [ cmake libzip ]; + + cargoSha256 = "102haqix13nwcncng1s8qkw68spn6fhh3vysk2nbahw6f78zczqg"; + + patches = [ ./aarch64-eexist.patch ]; meta = with stdenv.lib; { description = "Serverless Information Tracker"; - homepage = http://sit-it.org/; + homepage = https://sit.sh/; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ dywedir ]; + maintainers = with maintainers; [ dywedir yrashk ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix index 8b94204cd6274..3b8dce90243bc 100644 --- a/pkgs/applications/video/minitube/default.nix +++ b/pkgs/applications/video/minitube/default.nix @@ -1,21 +1,23 @@ -{ stdenv, fetchFromGitHub, makeWrapper, phonon, phonon-backend-vlc, qt4, qmake4Hook +{ stdenv, fetchFromGitHub, makeWrapper, phonon, phonon-backend-vlc, qtbase, qmake +, qtdeclarative, qttools + # "Free" key generated by nckx <github@tobias.gr>. I no longer have a Google # account. You'll need to generate (and please share :-) a new one if it breaks. , withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }: stdenv.mkDerivation rec { name = "minitube-${version}"; - version = "2.4"; + version = "2.9"; src = fetchFromGitHub { - sha256 = "0mm8v2vpspwxh2fqaykb381v6r9apywc1b0x8jkcbp7s43w10lp5"; + sha256 = "11zkmwqadlgrrghs3rxq0h0fllfnyd3g09d7gdd6vd9r1a1yz73f"; rev = version; repo = "minitube"; owner = "flaviotordini"; }; - buildInputs = [ phonon phonon-backend-vlc qt4 ]; - nativeBuildInputs = [ makeWrapper qmake4Hook ]; + buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qttools ]; + nativeBuildInputs = [ makeWrapper qmake ]; qmakeFlags = [ "DEFINES+=APP_GOOGLE_API_KEY=${withAPIKey}" ]; @@ -23,7 +25,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/minitube \ - --prefix QT_PLUGIN_PATH : "${phonon-backend-vlc}/lib/kde4/plugins" + --prefix QT_PLUGIN_PATH : "${phonon-backend-vlc}/lib/qt-5.${stdenv.lib.versions.minor qtbase.version}/plugins" ''; meta = with stdenv.lib; { @@ -36,5 +38,6 @@ stdenv.mkDerivation rec { homepage = https://flavio.tordini.org/minitube; license = licenses.gpl3Plus; platforms = platforms.linux; + maintainers = with maintainers; [ ma27 ]; }; } diff --git a/pkgs/applications/video/mkcast/default.nix b/pkgs/applications/video/mkcast/default.nix deleted file mode 100644 index 2d5d2d3b102c2..0000000000000 --- a/pkgs/applications/video/mkcast/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchFromGitHub, wmctrl, pythonPackages, byzanz -, xdpyinfo, makeWrapper, gtk2, xorg, gnome3 }: - -stdenv.mkDerivation rec { - name = "mkcast-2015-03-13"; - - src = fetchFromGitHub { - owner = "KeyboardFire"; - repo = "mkcast"; - rev = "cac22cb6c6f8ec2006339698af5e9199331759e0"; - sha256 = "15wp3n3z8gw7kjdxs4ahda17n844awhxsqbql5ipsdhqfxah2d8p"; - }; - - buildInputs = with pythonPackages; [ makeWrapper pygtk gtk2 xlib ]; - - makeFlags = [ "PREFIX=$(out)" ]; - - postInstall = '' - for f in $out/bin/*; do #*/ - wrapProgram $f --prefix PATH : "${stdenv.lib.makeBinPath [ xdpyinfo wmctrl byzanz gnome3.gnome-terminal ]}:$out/bin" - done - - rm -r screenkey/.bzr - cp -R screenkey $out/bin - - wrapProgram $out/bin/screenkey/screenkey \ - --prefix PATH : "${xorg.xmodmap}/bin"\ - --prefix PYTHONPATH : "$PYTHONPATH" - ''; - - meta = with stdenv.lib; { - description = "A tool for creating GIF screencasts of a terminal, with key presses overlaid"; - homepage = https://github.com/KeyboardFire/mkcast; - platforms = platforms.linux; - maintainers = with maintainers; [ domenkozar pSub ]; - }; -} diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix index 2454044bb48e2..a689697e0a0fe 100644 --- a/pkgs/applications/video/qstopmotion/default.nix +++ b/pkgs/applications/video/qstopmotion/default.nix @@ -1,6 +1,5 @@ -{ stdenv, fetchurl, qt5, gstreamer, gstreamermm, gst_plugins_bad -, gst_plugins_base, gst_plugins_good, ffmpeg, guvcview, automoc4 -, cmake, libxml2, gettext, pkgconfig, libgphoto2, gphoto2, v4l_utils +{ stdenv, fetchurl, qt5, ffmpeg, guvcview, automoc4 +, cmake, ninja, libxml2, gettext, pkgconfig, libgphoto2, gphoto2, v4l_utils , libv4l, pcre }: stdenv.mkDerivation rec { @@ -13,11 +12,9 @@ stdenv.mkDerivation rec { sha256 = "1vbiznwyc05jqg0dpmgxmvf7kdzmlck0i8v2c5d69kgrdnaypcrf"; }; - buildInputs = [ qt5.qtbase gstreamer gstreamermm gst_plugins_bad gst_plugins_good - gst_plugins_base ffmpeg guvcview v4l_utils libv4l pcre - ]; + buildInputs = [ qt5.qtbase ffmpeg guvcview v4l_utils libv4l pcre ]; - nativeBuildInputs = [ pkgconfig cmake gettext libgphoto2 gphoto2 libxml2 libv4l ]; + nativeBuildInputs = [ pkgconfig cmake ninja gettext libgphoto2 gphoto2 libxml2 libv4l ]; meta = with stdenv.lib; { homepage = http://www.qstopmotion.org; diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index 0ae9de0468018..d1f6f8b6ad1ba 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, alsaLib, ffmpeg, libjack2, libX11, libXext -, libXfixes, libGLU_combined, pkgconfig, libpulseaudio, qt4, cmake, ninja +{ stdenv, fetchurl, alsaLib, ffmpeg, libjack2, libX11, libXext, qtx11extras +, libXfixes, libGLU_combined, pkgconfig, libpulseaudio, qtbase, cmake, ninja }: stdenv.mkDerivation rec { @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "02rl9yyx3hlz9fqvgzv7ipmvx2qahj7ws5wx2m7zs3lssq3qag3g"; }; + cmakeFlags = [ "-DWITH_QT5=TRUE" ]; + patches = [ ./fix-paths.patch ]; postPatch = '' @@ -24,14 +26,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ninja ]; buildInputs = [ alsaLib ffmpeg libjack2 libX11 libXext libXfixes libGLU_combined - libpulseaudio qt4 + libpulseaudio qtbase qtx11extras ]; meta = with stdenv.lib; { description = "A screen recorder for Linux"; homepage = http://www.maartenbaert.be/simplescreenrecorder; license = licenses.gpl3; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.goibhniu ]; }; } diff --git a/pkgs/applications/video/xscast/default.nix b/pkgs/applications/video/xscast/default.nix new file mode 100644 index 0000000000000..ae048f1bdac40 --- /dev/null +++ b/pkgs/applications/video/xscast/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, makeWrapper, ffmpeg, imagemagick, dzen2, xorg }: + +stdenv.mkDerivation rec { + name = "xscast-unstable-${version}"; + version = "2016-07-26"; + + src = fetchFromGitHub { + owner = "KeyboardFire"; + repo = "xscast"; + rev = "9e6fd3c28d3f5ae630619f6dbccaf1f6ca594b21"; + sha256 = "0br27bq9bpglfdpv63h827bipgvhlh10liyhmhcxls4227kagz72"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + install -Dm755 xscast.sh $out/bin/xscast + install -Dm644 xscast.1 $out/share/man/man1/xscast.1 + patchShebangs $out/bin + + wrapProgram "$out/bin/xscast" \ + --prefix PATH : ${stdenv.lib.makeBinPath [ ffmpeg dzen2 xorg.xwininfo xorg.xinput xorg.xmodmap imagemagick ]} + + runHook postInstall + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/KeyboardFire/xscast; + license = licenses.mit; + description = "Screencasts of windows with list of keystrokes overlayed"; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index bb2243ca97b96..8c429ff1d0625 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -135,7 +135,7 @@ stdenv.mkDerivation rec { postInstall = if stdenv.isx86_64 then ''makeWrapper $out/bin/qemu-system-x86_64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' else if stdenv.isi686 then ''makeWrapper $out/bin/qemu-system-i386 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' - else if stdenv.isAarch32 then ''makeWrapper $out/bin/qemu-system-arm $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' + else if stdenv.isAarch32 then ''makeWrapper $out/bin/qemu-system-arm $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' else if stdenv.isAarch64 then ''makeWrapper $out/bin/qemu-system-aarch64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' else ""; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index ca0520f32a8f2..d09a30f98a74a 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -94,9 +94,7 @@ in stdenv.mkDerivation { patches = optional enableHardening ./hardened.patch - ++ [ ./qtx11extras.patch ]; - - + ++ [ ./qtx11extras.patch ./kernpcidev.patch ]; postPatch = '' sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \ diff --git a/pkgs/applications/virtualization/virtualbox/kernpcidev.patch b/pkgs/applications/virtualization/virtualbox/kernpcidev.patch new file mode 100644 index 0000000000000..5192227d7d012 --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/kernpcidev.patch @@ -0,0 +1,18 @@ +diff --git a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c b/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c +index b8019f7..b7d2e39 100644 +--- a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c ++++ b/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c +@@ -73,8 +73,11 @@ MODULE_LICENSE("GPL"); + MODULE_VERSION(VBOX_VERSION_STRING); + #endif + +- +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 17, 0) ++# define PCI_DEV_GET(v,d,p) pci_get_device(v,d,p) ++# define PCI_DEV_PUT(x) pci_dev_put(x) ++# define PCI_DEV_GET_SLOT(bus, devfn) pci_get_domain_bus_and_slot(0, bus, devfn) ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20) + # define PCI_DEV_GET(v,d,p) pci_get_device(v,d,p) + # define PCI_DEV_PUT(x) pci_dev_put(x) + # define PCI_DEV_GET_SLOT(bus, devfn) pci_get_bus_and_slot(bus, devfn) diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index edaa88bde23d8..b7545d5cd1c5d 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "2.10.1-1-c"; + version = "2.11-c"; name = "i3lock-color-${version}"; src = fetchFromGitHub { owner = "PandorasFox"; repo = "i3lock-color"; - rev = "01476c56333cccae80cdd3f125b0b9f3a0fe2cb3"; - sha256 = "06ca8496fkdkvh4ycg0b7kd3r1bjdqdwfimb51v4nj1lm87pdkdf"; + rev = version; + sha256 = "1myq9fazkwd776agrnj27bm5nwskvss9v9a5qb77n037dv8d0rdw"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc MANDIR=\${out}/share/man"; postInstall = '' mv $out/bin/i3lock $out/bin/i3lock-color + mv $out/share/man/man1/i3lock.1 $out/share/man/man1/i3lock-color.1 + sed -i 's/\(^\|\s\|"\)i3lock\(\s\|$\)/\1i3lock-color\2/g' $out/share/man/man1/i3lock-color.1 ''; meta = with stdenv.lib; { description = "A simple screen locker like slock"; diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 05f89728f6a7d..9085385fe2562 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "jwm-${version}"; - version = "1653"; + version = "1685"; src = fetchFromGitHub { owner = "joewing"; repo = "jwm"; rev = "s${version}"; - sha256 = "09ci3g97xmif66pp9n4sdvdmlxpw67pwp8lbjynxhdvha5pwwpv5"; + sha256 = "1kyvy022sij898g2hm5spy5vq0kw6aqd7fsnawl2xyh06gwh29wg"; }; nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ]; diff --git a/pkgs/applications/window-managers/way-cooler/default.nix b/pkgs/applications/window-managers/way-cooler/default.nix index c8b67ec047ae3..442bf5e08dfae 100644 --- a/pkgs/applications/window-managers/way-cooler/default.nix +++ b/pkgs/applications/window-managers/way-cooler/default.nix @@ -20,24 +20,16 @@ let mkdir -p $out/etc cp -r config $out/etc/way-cooler ''; - postFixup = '' - cd $out/bin - mv way_cooler way-cooler - ''; }); wc-bg = ((callPackage ./wc-bg.nix {}).wc_bg {}).overrideAttrs (oldAttrs: rec { nativeBuildInputs = [ makeWrapper ]; postFixup = '' - makeWrapper $out/bin/wc_bg $out/bin/wc-bg \ + makeWrapper $out/bin/wc-bg $out/bin/wc-bg \ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ wayland ]}" ''; }); wc-grab = ((callPackage ./wc-grab.nix {}).wc_grab {}).overrideAttrs (oldAttrs: rec { - postFixup = '' - cd $out/bin - mv wc_grab wc-grab - ''; }); wc-lock = (((callPackage ./wc-lock.nix {}).wc_lock {}).override { crateOverrides = defaultCrateOverrides // { @@ -47,7 +39,7 @@ let nativeBuildInputs = [ makeWrapper ]; postFixup = '' - makeWrapper $out/bin/wc_lock $out/bin/wc-lock \ + makeWrapper $out/bin/wc-lock $out/bin/wc-lock \ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libxkbcommon wayland ]}" ''; }); diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 584beb3d89b8e..374b71d42a39d 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -32,28 +32,42 @@ rec { inherit pkgs buildImage pullImage shadowSetup buildImageWithNixDb; }; - pullImage = - let - fixName = name: builtins.replaceStrings ["/" ":"] ["-" "-"] name; - in { - imageName, + pullImage = let + fixName = name: builtins.replaceStrings ["/" ":"] ["-" "-"] name; + in + { imageName # To find the digest of an image, you can use skopeo: # skopeo inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest' # sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b - imageDigest, - sha256, + , imageDigest + , sha256 # This used to set a tag to the pulled image - finalImageTag ? "latest", - name ? (fixName "docker-image-${imageName}-${finalImageTag}.tar") }: - runCommand name { - impureEnvVars=pkgs.stdenv.lib.fetchers.proxyImpureEnvVars; - outputHashMode="flat"; - outputHashAlgo="sha256"; - outputHash=sha256; - } - '' - ${pkgs.skopeo}/bin/skopeo copy docker://${imageName}@${imageDigest} docker-archive://$out:${imageName}:${finalImageTag} - ''; + , finalImageTag ? "latest" + , name ? fixName "docker-image-${imageName}-${finalImageTag}.tar" + }: + + runCommand name { + impureEnvVars = pkgs.stdenv.lib.fetchers.proxyImpureEnvVars; + outputHashMode = "flat"; + outputHashAlgo = "sha256"; + outputHash = sha256; + + # One of the dependencies of Skopeo uses a hardcoded /var/tmp for storing + # big image files, which is not available in sandboxed builds. + nativeBuildInputs = lib.singleton (pkgs.skopeo.overrideAttrs (drv: { + postPatch = (drv.postPatch or "") + '' + sed -i -e 's!/var/tmp!/tmp!g' \ + vendor/github.com/containers/image/storage/storage_image.go \ + vendor/github.com/containers/image/internal/tmpdir/tmpdir.go + ''; + })); + SSL_CERT_FILE = "${pkgs.cacert.out}/etc/ssl/certs/ca-bundle.crt"; + + sourceURL = "docker://${imageName}@${imageDigest}"; + destNameTag = "${imageName}:${finalImageTag}"; + } '' + skopeo copy "$sourceURL" "docker-archive://$out:$destNameTag" + ''; # We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash. # And we cannot untar it, because then we cannot preserve permissions ecc. diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 2441da156d1a7..1d993dcc1094b 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -185,7 +185,7 @@ init_submodules(){ # checkout each submodule hash=$(echo "$l" | awk '{print $1}' | tr -d '-') - dir=$(echo "$l" | awk '{print $2}') + dir=$(echo "$l" | sed -n 's/^ \{0,1\}[^ ]* \(.*\) ([^ ]*)$/\1/p') name=$( git config -f .gitmodules --get-regexp submodule\..*\.path | sed -n "s,^\(.*\)\.path $dir\$,\\1,p") diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 08d0a358e61fa..622fba0686f4c 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -92,7 +92,7 @@ rec { echo "loading kernel modules..." for i in $(cat ${modulesClosure}/insmod-list); do - insmod $i + insmod $i || echo "warning: unable to load $i" done mount -t devtmpfs devtmpfs /dev diff --git a/pkgs/data/icons/iconpack-obsidian/default.nix b/pkgs/data/icons/iconpack-obsidian/default.nix new file mode 100644 index 0000000000000..b033f510f0b9f --- /dev/null +++ b/pkgs/data/icons/iconpack-obsidian/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, gtk3 }: + +stdenv.mkDerivation rec { + name = "iconpack-obsidian-${version}"; + version = "4.0.1"; + + src = fetchFromGitHub { + owner = "madmaxms"; + repo = "iconpack-obsidian"; + rev = "v${version}"; + sha256 = "1mlaldqjc3am2d2m577fhsidlnfqlhmnf1l8hh50iqr94mc14fab"; + }; + + nativeBuildInputs = [ gtk3 ]; + + installPhase = '' + mkdir -p $out/share/icons + mv Obsidian* $out/share/icons + ''; + + postFixup = '' + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + ''; + + meta = with stdenv.lib; { + description = "Gnome Icon Pack based upon Faenza"; + homepage = https://github.com/madmaxms/iconpack-obsidian; + license = licenses.lgpl3; + # darwin cannot deal with file names differing only in case + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 09c677c35bdae..82122335f695b 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-20180416"; + name = "osinfo-db-20180502"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${name}.tar.xz"; - sha256 = "0qam3qbrwzrz40pikhb8y11lidpb6snsa80ym8s6hp5kh4icr1h6"; + sha256 = "05036mpc5hapx616lfzc67xj157hw3mgyk0arv3brjcx0qmzaram"; }; nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index 9b782b94f7fff..b0fd5f3db2b20 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, efl, xcbutilkeysyms, libXrandr, libXdmcp, libxcb, libffi, pam, alsaLib, - luajit, bzip2, libpthreadstubs, gdbm, libcap, libGLU, + luajit, bzip2, libpthreadstubs, gdbm, libcap, libGLU, mesa_noglu, xkeyboard_config, pcre }: @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { libpthreadstubs gdbm pcre + mesa_noglu ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix index 3a52707fcf4ce..1a15092c7e771 100644 --- a/pkgs/desktops/enlightenment/terminology.nix +++ b/pkgs/desktops/enlightenment/terminology.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, efl, pcre, makeWrapper }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, pcre, mesa_noglu, makeWrapper }: stdenv.mkDerivation rec { name = "terminology-${version}"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.xz"; - sha256 = "05ncxvzb9rzkyjvd95hzn8lswqdwr8cix6rd54nqn9559jibh4ns"; + sha256 = "0kw34l5lahn1qaks3ah6x8k41d6hfywpqfak2p7qq1z87zj506mx"; }; nativeBuildInputs = [ + meson + ninja (pkgconfig.override { vanilla = true; }) makeWrapper ]; @@ -17,11 +19,12 @@ stdenv.mkDerivation rec { buildInputs = [ efl pcre + mesa_noglu ]; meta = { - description = "The best terminal emulator written with the EFL"; - homepage = http://enlightenment.org/; + description = "Powerful terminal emulator based on EFL"; + homepage = https://www.enlightenment.org/about-terminology; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; diff --git a/pkgs/desktops/gnome-2/desktop/libgweather/default.nix b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix index ab68acda2770b..47f2b8c90fb74 100644 --- a/pkgs/desktops/gnome-2/desktop/libgweather/default.nix +++ b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, GConf, libsoup, libtasn1, nettle, gmp }: +assert stdenv ? glibc; + stdenv.mkDerivation rec { name = "libgweather-2.30.3"; src = fetchurl { diff --git a/pkgs/desktops/gnome-3/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/apps/bijiben/default.nix index 93a2c41caf357..5ed4b487bdd90 100644 --- a/pkgs/desktops/gnome-3/apps/bijiben/default.nix +++ b/pkgs/desktops/gnome-3/apps/bijiben/default.nix @@ -5,13 +5,13 @@ , gnome3, libxml2 }: let - version = "3.28.1"; + version = "3.28.2"; in stdenv.mkDerivation rec { name = "bijiben-${version}"; src = fetchurl { url = "mirror://gnome/sources/bijiben/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0ivx3hbpg7qaqzpbbn06lz9w3q285vhwgfr353b14bg0nsidwy17"; + sha256 = "1z1dqspjpyym27yav7pr813x7k0jdxifgj5rdxgp4m6cs1ixcvjs"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index d7def6e270916..4470f11597eb5 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -5,13 +5,13 @@ , libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }: let - version = "3.28.1"; + version = "3.28.2"; in stdenv.mkDerivation rec { name = "evolution-${version}"; src = fetchurl { url = "mirror://gnome/sources/evolution/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0sdv5lg2vlz5f4raymz9d8a5jq4j18vbqyigaip6508p3bjnfj8l"; + sha256 = "0lx9amjxmfnwc0089griyxms9prmb78wfnfvdsvli8yw1cns4i74"; }; propagatedUserEnvPkgs = [ gnome3.evolution-data-server ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 8ce9617aaae49..5b91ded959b35 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -9,13 +9,13 @@ # TODO: ovirt (optional) let - version = "3.28.2"; + version = "3.28.3"; in stdenv.mkDerivation rec { name = "gnome-boxes-${version}"; src = fetchurl { url = "mirror://gnome/sources/gnome-boxes/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0xss6wrs4hkmr0aa9qxr9b6wxbygrkjz4p0c4xnymicq97jnwra1"; + sha256 = "05x9c7w60cafcd3bdkr68ra8pbh7m8pciw67871hckaqafw76q1d"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index b88bad2f6497b..347cd7a16ae05 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -4,13 +4,13 @@ let pname = "gnome-calendar"; - version = "3.28.1"; + version = "3.28.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1jacznnjql5jgzvzcp5kh2k0cd0y41cri6qz2bsakpllf7adbrq6"; + sha256 = "0x6wxngf8fkwgbl6x7rzp0srrb43rm55klpb2vfjk2hahpbjvxyw"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix index 1587fec2c6955..b07417ecc35aa 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gnome-characters-${version}"; - version = "3.28.0"; + version = "3.28.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-characters/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "14q92ysg7krawxlwv6ymgsxz2plk81wgfz6knlma7lm13jsczmf0"; + sha256 = "04nmn23iw65wsczx1l6fa4jfdsv65klb511p39zj1pgwyisgj5l0"; }; postPatch = '' diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index c184bcbb42d8e..614308f7b6313 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gnome-logs-${version}"; - version = "3.28.0"; + version = "3.28.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-logs/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0j3wkbz7c2snmx4kjmh767175nf2lqxx2p8b8xa2qslknxc3gq6b"; + sha256 = "0qqmw55rrxdz2n9xwn85nm7j9y9i85fxlxjfgv683mbpdyv0gbg0"; }; configureFlags = [ "--disable-tests" ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index b5c8188bd0647..cade274e69a87 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-maps"; - version = "3.28.1"; + version = "3.28.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "19xx1v25ycr8ih4jwb1vc662jcx6kynaf7baj4i569ccrcwaj2d5"; + sha256 = "1yzi08a9316jplgsl2z0qzlqxhghyqcjhv0m6i94wcain4mxk1z7"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index c2d5045e79ea1..9aa8eee0bca80 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "3.28.1"; + version = "3.28.2"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${pname}-${version}.tar.xz"; - sha256 = "0xbwndfl72292dx4x99vm0iyrcy8xw2i5fhsch7b073rk4ydbyfx"; + sha256 = "0xkbw9cp002vwwq6vlsbkahz9xbwpkyydd9cvh7az379sdlz4rid"; }; nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobjectIntrospection ]; diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix index 85587d11178d8..7f7a533a55026 100644 --- a/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/core/eog/default.nix @@ -4,13 +4,13 @@ let pname = "eog"; - version = "3.28.1"; + version = "3.28.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1v3s4x4xdmfa488drwvxfps33jiyh3qz9z8v8s3779n1jn92rmbq"; + sha256 = "1gasrfqi7qrzdq1idh29r0n6ikkqjb6pbp7a8k5krfz5hkhyfin0"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobjectIntrospection ]; diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index 01891ad82473d..a951620685996 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -1,26 +1,26 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, python3, dconf, gobjectIntrospection +{ fetchurl, stdenv, pkgconfig, gnome3, python3, gobjectIntrospection , intltool, libsoup, libxml2, libsecret, icu, sqlite -, p11-kit, db, nspr, nss, libical, gperf, makeWrapper +, p11-kit, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking , vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib }: stdenv.mkDerivation rec { name = "evolution-data-server-${version}"; - version = "3.28.1"; + version = "3.28.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "12b9lfgwd57rzn9394xrbvl9ym5aqldpz9v7c9a421dsv8dgq13b"; + sha256 = "1azk8zh167a6hyxzz73yh36gbpf7i52b7zi10hnnnsywh80pj6jk"; }; nativeBuildInputs = [ - cmake ninja pkgconfig intltool python3 gperf makeWrapper gobjectIntrospection vala + cmake ninja pkgconfig intltool python3 gperf wrapGAppsHook gobjectIntrospection vala ]; buildInputs = with gnome3; [ glib libsoup libxml2 gtk gnome-online-accounts gcr p11-kit libgweather libgdata libaccounts-glib json-glib - icu sqlite kerberos openldap webkitgtk + icu sqlite kerberos openldap webkitgtk glib-networking ]; propagatedBuildInputs = [ libsecret nss nspr libical db ]; @@ -36,14 +36,6 @@ stdenv.mkDerivation rec { cmakeFlags="-DINCLUDE_INSTALL_DIR=$dev/include $cmakeFlags" ''; - preFixup = '' - for f in $(find $out/libexec/ -type f -executable); do - wrapProgram "$f" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" - done - ''; - passthru = { updateScript = gnome3.updateScript { packageName = "evolution-data-server"; diff --git a/pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch b/pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch index bbc803d49c19f..7722e2550bdb3 100644 --- a/pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch +++ b/pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch @@ -1,8 +1,17 @@ -diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c -index ff3a1acb..b8705d8f 100644 +--- a/daemon/gdm-launch-environment.c ++++ b/daemon/gdm-launch-environment.c +@@ -126,7 +126,7 @@ + "LC_COLLATE", "LC_MONETARY", "LC_MESSAGES", "LC_PAPER", + "LC_NAME", "LC_ADDRESS", "LC_TELEPHONE", "LC_MEASUREMENT", + "LC_IDENTIFICATION", "LC_ALL", "WINDOWPATH", "XCURSOR_PATH", +- "XDG_CONFIG_DIRS", NULL ++ "XDG_CONFIG_DIRS", "GDM_SESSIONS_DIR", NULL + }; + char *system_data_dirs; + int i; --- a/daemon/gdm-session.c +++ b/daemon/gdm-session.c -@@ -344,6 +344,7 @@ get_system_session_dirs (GdmSession *self) +@@ -345,12 +345,17 @@ char **search_dirs; static const char *x_search_dirs[] = { @@ -10,8 +19,7 @@ index ff3a1acb..b8705d8f 100644 "/etc/X11/sessions/", DMCONFDIR "/Sessions/", DATADIR "/gdm/BuiltInSessions/", -@@ -351,6 +352,10 @@ get_system_session_dirs (GdmSession *self) - NULL + DATADIR "/xsessions/", }; + if (getenv("GDM_SESSIONS_DIR") != NULL) { @@ -21,3 +29,24 @@ index ff3a1acb..b8705d8f 100644 static const char *wayland_search_dir = DATADIR "/wayland-sessions/"; search_array = g_array_new (TRUE, TRUE, sizeof (char *)); +--- a/libgdm/gdm-sessions.c ++++ b/libgdm/gdm-sessions.c +@@ -217,6 +217,7 @@ + { + int i; + const char *xorg_search_dirs[] = { ++ "/var/empty/", + "/etc/X11/sessions/", + DMCONFDIR "/Sessions/", + DATADIR "/gdm/BuiltInSessions/", +@@ -224,6 +225,10 @@ + NULL + }; + ++ if (g_getenv("GDM_SESSIONS_DIR") != NULL) { ++ xorg_search_dirs[0] = g_getenv("GDM_SESSIONS_DIR"); ++ }; ++ + #ifdef ENABLE_WAYLAND_SUPPORT + const char *wayland_search_dirs[] = { + DATADIR "/wayland-sessions/", diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix index fc352de2acf87..1bf640f713f7c 100644 --- a/pkgs/desktops/gnome-3/core/gjs/default.nix +++ b/pkgs/desktops/gnome-3/core/gjs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gjs-${version}"; - version = "1.52.2"; + version = "1.52.3"; src = fetchurl { url = "mirror://gnome/sources/gjs/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "00x08ypx61i3k84bmvkhdj37q81g79lzm5sxqm1lz4xzzad9rg98"; + sha256 = "1z4n15wdz6pbqd2hfzrqc8mmprhv50v4jk43p08v0xv07yldh8ff"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index c8636cb1dc1fc..5799e613d5bcb 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -5,13 +5,13 @@ , vala, meson, ninja }: let - version = "3.28.1"; + version = "3.28.2"; in stdenv.mkDerivation rec { name = "gnome-contacts-${version}"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "17iinxqf221kk9yppv3yhg0m7jxk5zvwxmdf3hjygf9xgfw7z3zi"; + sha256 = "1ilgmvgprn1slzmrzbs0zwgbzxp04rn5ycqd9c8zfvyh6zzwwr8w"; }; propagatedUserEnvPkgs = [ evolution-data-server ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index 740748631ee24..39108141c93c5 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gnome-keyring-${version}"; - version = "3.28.0.2"; + version = "3.28.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-keyring/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0a52xz535vgfymjw3cxmryi3xn2ik24vwk6sixyb7q6jgmqi4bw8"; + sha256 = "0sk4las4ji8wv9nx8mldzqccmpmkvvr9pdwv9imj26r10xyin5w1"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix index 7ba3545848f77..a963ea148badb 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gnome-shell-extensions-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "00xm5r4q40c0ji80vrsqg2fkrvzb1nm75p3ikv6bsmd3gfvwwp91"; + sha256 = "0n4h8rdnq3knrvlg6inrl62a73h20dbhfgniwy18572jicrh5ip9"; }; passthru = { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { # Fixup adapted from export-zips.sh in the source. extensiondir=$out/share/gnome-shell/extensions - schemadir=$out/share/gsettings-schemas/gnome-shell-extensions-3.28.0/glib-2.0/schemas/ + schemadir=$out/share/gsettings-schemas/${name}/glib-2.0/schemas/ glib-compile-schemas $schemadir diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 70177d0a516e9..6b1e15bbc993c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -1,7 +1,7 @@ { fetchurl, fetchpatch, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, json-glib, libcroco, gettext, libsecret , python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core , libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info -, libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42 +, libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils , libpulseaudio, libical, nss, gobjectIntrospection, gstreamer, wrapGAppsHook , accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet , sassc, systemd, gst_all_1 }: @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { name = "gnome-shell-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0kmsh305cfr3fg40rhwykqbl466lwcq9djda25kf29ib7h6w1pn7"; + sha256 = "1k2cgaky293kcjis0pmh9hw1aby3yyilb5dzrbww62wxzppc9s35"; }; # Needed to find /etc/NetworkManager/VPN @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales - sassc + sassc desktop-file-utils ]; buildInputs = with gnome3; [ systemd caribou diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 623d2b1251e12..866888feba0c5 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "mutter-${version}"; - version = "3.28.0"; + version = "3.28.1"; src = fetchurl { url = "mirror://gnome/sources/mutter/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1c46sf10mgvwgym4c6hbjm7wa82dvfv8j8dx4zdbc7zj4n0grzsq"; + sha256 = "1bhmjvf6l1fj5igsw2xlg3nv5526laiwaxh47dgk50f40qax1qin"; }; passthru = { diff --git a/pkgs/development/arduino/platformio/chrootenv.nix b/pkgs/development/arduino/platformio/chrootenv.nix index f46e705fb901d..ae68e84ab1c2e 100644 --- a/pkgs/development/arduino/platformio/chrootenv.nix +++ b/pkgs/development/arduino/platformio/chrootenv.nix @@ -20,6 +20,7 @@ let }; in (with pkgs; [ zlib + git ]) ++ (with python.pkgs; [ python setuptools diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix index 70acb79dc7e46..bf8511704f800 100644 --- a/pkgs/development/compilers/arachne-pnr/default.nix +++ b/pkgs/development/compilers/arachne-pnr/default.nix @@ -4,13 +4,13 @@ with builtins; stdenv.mkDerivation rec { name = "arachne-pnr-${version}"; - version = "2018.03.07"; + version = "2018.05.03"; src = fetchFromGitHub { owner = "cseed"; repo = "arachne-pnr"; - rev = "6701132cbd5c7b31edd0ff18ca6727eb3691186b"; - sha256 = "1c55k9gpq042mkyxrblwskbmr3v0baj4gkwm45v1gvmhdza6gfw8"; + rev = "ea2d04215bc0fd6072cda244caeb6670892033b3"; + sha256 = "0qhf5djyh0pzmgv33rjnnqq6asmmwxjdadvr18a83iy9pll6gg5k"; }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index c85f3e002cc52..3976be0476adf 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -1,4 +1,4 @@ -{ stdenv, targetPackages, fetchurl, noSysDirs +{ stdenv, targetPackages, fetchurl, noSysDirs, fetchpatch , langC ? true, langCC ? true, langFortran ? false , langObjC ? targetPlatform.isDarwin , langObjCpp ? targetPlatform.isDarwin @@ -65,7 +65,21 @@ let version = "4.9.4"; ++ optional noSysDirs ../no-sys-dirs.patch ++ optional langFortran ../gfortran-driving.patch ++ [ ../struct-ucontext.patch ../struct-sigaltstack-4.9.patch ] # glibc-2.26 - ; + # Retpoline patches pulled from the branch hjl/indirect/gcc-4_9-branch (by H.J. Lu, the author of GCC upstream retpoline commits) + ++ builtins.map ({commit, sha256}: fetchpatch {url = "https://github.com/hjl-tools/gcc/commit/${commit}.patch"; inherit sha256;}) + [{ commit = "e623d21608e96ecd6b65f0d06312117d20488a38"; sha256 = "1ix8i4d2r3ygbv7npmsdj790rhxqrnfwcqzv48b090r9c3ij8ay3"; } + { commit = "2015a09e332309f12de1dadfe179afa6a29368b8"; sha256 = "0xcfs0cbb63llj2gbcdrvxim79ax4k4aswn0a3yjavxsj71s1n91"; } + { commit = "6b11591f4494f705e8746e7d58b7f423191f4e92"; sha256 = "0aydyhsm2ig0khgbp27am7vq7liyqrq6kfhfi2ki0ij0ab1hfbga"; } + { commit = "203c7d9c3e9cb0f88816b481ef8e7e87b3ecc373"; sha256 = "0wqn16y7wy5kg8ngfcni5qdwfphl01axczibbk49bxclwnzvldqa"; } + { commit = "f039c6f284b2c9ce97c8353d6034978795c4872e"; sha256 = "13fkgdb17lpyxfksz1zanxhgpsm0jrss9w61nbl7an4im22hz7ci"; } + { commit = "ed42606bdab1c5d9e5ad828cd6fe1a0557f193b7"; sha256 = "0gdnn8v3p03imj3qga2mzdhpgbmjcklkxdl97jvz5xia2ikzknxm"; } + { commit = "5278e062ef292fd2fbf987d25389785f4c5c0f99"; sha256 = "0j81x758wf8v7j4rx5wc1cy7yhkvhlhv3wmnarwakxiwsspq0vrs"; } + { commit = "76f1ffbbb6cd9f6ecde6c82cd16e20a27242e890"; sha256 = "1py56y6gp7fjf4f8bbsfwh5bs1gnmlqda1ycsmnwlzfm0cshdp0c"; } + { commit = "4ca48b2b688b135c0390f54ea9077ef10aedd52c"; sha256 = "15r019pzr3k0lpgyvdc92c8fayw8b5lrzncna4bqmamcsdz7vsaw"; } + { commit = "98c7bf9ddc80db965d69d61521b1c7a1cec32d9a"; sha256 = "1d7pfdv1q23nf0wadw7jbp6d6r7pnzjpbyxgbdfv7j1vr9l1bp60"; } + { commit = "3dc76b53ad896494ca62550a7a752fecbca3f7a2"; sha256 = "0jvdzfpvfdmklfcjwqblwq1i22iqis7ljpvm7adra5d7zf2xk7xz"; } + { commit = "1e961ed49b18e176c7457f53df2433421387c23b"; sha256 = "04dnqqs4qsvz4g8cq6db5id41kzys7hzhcaycwmc9rpqygs2ajwz"; } + { commit = "e137c72d099f9b3b47f4cc718aa11eab14df1a9c"; sha256 = "1ms0dmz74yf6kwgjfs4d2fhj8y6mcp2n184r3jk44wx2xc24vgb2"; }]; javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at @@ -484,8 +498,7 @@ stdenv.mkDerivation ({ platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.freebsd ++ - stdenv.lib.platforms.illumos ++ - stdenv.lib.platforms.darwin; + stdenv.lib.platforms.illumos; }; } diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix new file mode 100644 index 0000000000000..2465e6149c0a6 --- /dev/null +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -0,0 +1,454 @@ +{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs +, langC ? true, langCC ? true, langFortran ? false +, langObjC ? targetPlatform.isDarwin +, langObjCpp ? targetPlatform.isDarwin +, langGo ? false +, profiledCompiler ? false +, staticCompiler ? false +, enableShared ? true +, texinfo ? null +, perl ? null # optional, for texi2pod (then pod2man) +, gmp, mpfr, libmpc, gettext, which +, libelf # optional, for link-time optimizations (LTO) +, isl ? null # optional, for the Graphite optimization framework. +, zlib ? null +, enableMultilib ? false +, enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins +, name ? "gcc" +, libcCross ? null +, crossStageStatic ? false +, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd +, stripped ? true +, gnused ? null +, cloog # unused; just for compat with gcc4, as we override the parameter on some places +, darwin ? null +, buildPlatform, hostPlatform, targetPlatform +, buildPackages +}: + +# LTO needs libelf and zlib. +assert libelf != null -> zlib != null; + +# Make sure we get GNU sed. +assert hostPlatform.isDarwin -> gnused != null; + +# The go frontend is written in c++ +assert langGo -> langCC; + +with stdenv.lib; +with builtins; + +let version = "8.1.0"; + + # Whether building a cross-compiler for GNU/Hurd. + crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"; + + enableParallelBuilding = true; + + patches = + optional (targetPlatform != hostPlatform) ../libstdc++-target.patch + ++ optional noSysDirs ../no-sys-dirs.patch + /* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied + url = "https://git.busybox.net/buildroot/plain/package/gcc/${version}/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02"; + sha256 = ""; # TODO: uncomment and check hash when available. + }) */ + ++ optional langFortran ../gfortran-driving.patch; + + /* Platform flags */ + platformFlags = let + gccArch = targetPlatform.platform.gcc.arch or null; + gccCpu = targetPlatform.platform.gcc.cpu or null; + gccAbi = targetPlatform.platform.gcc.abi or null; + gccFpu = targetPlatform.platform.gcc.fpu or null; + gccFloat = targetPlatform.platform.gcc.float or null; + gccMode = targetPlatform.platform.gcc.mode or null; + in + optional (gccArch != null) "--with-arch=${gccArch}" ++ + optional (gccCpu != null) "--with-cpu=${gccCpu}" ++ + optional (gccAbi != null) "--with-abi=${gccAbi}" ++ + optional (gccFpu != null) "--with-fpu=${gccFpu}" ++ + optional (gccFloat != null) "--with-float=${gccFloat}" ++ + optional (gccMode != null) "--with-mode=${gccMode}"; + + /* Cross-gcc settings (build == host != target) */ + crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; + crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem"; + crossConfigureFlags = + # Ensure that -print-prog-name is able to find the correct programs. + [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" + "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++ + (if crossMingw && crossStageStatic then [ + "--with-headers=${libcCross}/include" + "--with-gcc" + "--with-gnu-as" + "--with-gnu-ld" + "--with-gnu-ld" + "--disable-shared" + "--disable-nls" + "--disable-debug" + "--enable-sjlj-exceptions" + "--enable-threads=win32" + "--disable-win32-registry" + ] else if crossStageStatic then [ + "--disable-libssp" + "--disable-nls" + "--without-headers" + "--disable-threads" + "--disable-libgomp" + "--disable-libquadmath" + "--disable-shared" + "--disable-libatomic" # libatomic requires libc + "--disable-decimal-float" # libdecnumber requires libc + # maybe only needed on musl, PATH_MAX + # https://github.com/richfelker/musl-cross-make/blob/0867cdf300618d1e3e87a0a939fa4427207ad9d7/litecross/Makefile#L62 + "--disable-libmpx" + ] else [ + (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot" + else "--with-headers=${getDev libcCross}/include") + "--enable-__cxa_atexit" + "--enable-long-long" + ] ++ + (if crossMingw then [ + "--enable-threads=win32" + "--enable-sjlj-exceptions" + "--enable-hash-synchronization" + "--enable-libssp" + "--disable-nls" + "--with-dwarf2" + # To keep ABI compatibility with upstream mingw-w64 + "--enable-fully-dynamic-string" + ] else + optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [ + # libsanitizer requires netrom/netrom.h which is not + # available in uclibc. + "--disable-libsanitizer" + # In uclibc cases, libgomp needs an additional '-ldl' + # and as I don't know how to pass it, I disable libgomp. + "--disable-libgomp" + # musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865 + "--disable-libmpx" + ] ++ [ + "--enable-threads=posix" + "--enable-nls" + "--disable-decimal-float" # No final libdecnumber (it may work only in 386) + ])); + stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; + crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else ""; + + bootstrap = targetPlatform == hostPlatform; + +in + +stdenv.mkDerivation ({ + name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; + + builder = ../builder.sh; + + src = fetchurl { + url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; + sha256 = "0lxil8x0jjx7zbf90cy1rli650akaa6hpk8wk8s62vk2jbwnc60x"; + }; + + inherit patches; + + outputs = [ "out" "lib" "man" "info" ]; + setOutputFlags = false; + NIX_NO_SELF_RPATH = true; + + libc_dev = stdenv.cc.libc_dev; + + hardeningDisable = [ "format" ]; + + # This should kill all the stdinc frameworks that gcc and friends like to + # insert into default search paths. + prePatch = stdenv.lib.optionalString hostPlatform.isDarwin '' + substituteInPlace gcc/config/darwin-c.c \ + --replace 'if (stdinc)' 'if (0)' + + substituteInPlace libgcc/config/t-slibgcc-darwin \ + --replace "-install_name @shlib_slibdir@/\$(SHLIB_INSTALL_NAME)" "-install_name $lib/lib/\$(SHLIB_INSTALL_NAME)" + + substituteInPlace libgfortran/configure \ + --replace "-install_name \\\$rpath/\\\$soname" "-install_name $lib/lib/\\\$soname" + ''; + + postPatch = '' + configureScripts=$(find . -name configure) + for configureScript in $configureScripts; do + patchShebangs $configureScript + done + '' + ( + if (hostPlatform.isHurd + || (libcCross != null # e.g., building `gcc.crossDrv' + && libcCross ? crossConfig + && libcCross.crossConfig == "i586-pc-gnu") + || (crossGNU && libcCross != null)) + then + # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not + # in glibc, so add the right `-I' flags to the default spec string. + assert libcCross != null -> libpthreadCross != null; + let + libc = if libcCross != null then libcCross else stdenv.glibc; + gnu_h = "gcc/config/gnu.h"; + extraCPPDeps = + libc.propagatedBuildInputs + ++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross + ++ stdenv.lib.optional (libpthread != null) libpthread; + extraCPPSpec = + concatStrings (intersperse " " + (map (x: "-I${x.dev or x}/include") extraCPPDeps)); + extraLibSpec = + if libpthreadCross != null + then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}" + else "-L${libpthread}/lib"; + in + '' echo "augmenting \`CPP_SPEC' in \`${gnu_h}' with \`${extraCPPSpec}'..." + sed -i "${gnu_h}" \ + -es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g' + + echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..." + sed -i "${gnu_h}" \ + -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g' + + echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..." + sed -i "${gnu_h}" \ + -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g' + '' + else if targetPlatform != hostPlatform || stdenv.cc.libc != null then + # On NixOS, use the right path to the dynamic linker instead of + # `/lib/ld*.so'. + let + libc = if libcCross != null then libcCross else stdenv.cc.libc; + in + ( + '' echo "fixing the \`GLIBC_DYNAMIC_LINKER', \`UCLIBC_DYNAMIC_LINKER', and \`MUSL_DYNAMIC_LINKER' macros..." + for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h + do + grep -q _DYNAMIC_LINKER "$header" || continue + echo " fixing \`$header'..." + sed -i "$header" \ + -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' \ + -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g' + done + '' + + stdenv.lib.optionalString (targetPlatform.libc == "musl") + '' + sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' + '' + ) + else ""); + + # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild, + crossStageStatic = targetPlatform == hostPlatform || crossStageStatic; + inherit noSysDirs staticCompiler + libcCross crossMingw; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ texinfo which gettext ] + ++ (optional (perl != null) perl); + + # For building runtime libs + depsBuildTarget = + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ]; + + buildInputs = [ + gmp mpfr libmpc libelf + targetPackages.stdenv.cc.bintools # For linking code at run-time + ] ++ (optional (isl != null) isl) + ++ (optional (zlib != null) zlib) + ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools]) + + # The builder relies on GNU sed (for instance, Darwin's `sed' fails with + # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. + ++ (optional hostPlatform.isDarwin gnused) + ++ (optional hostPlatform.isDarwin targetPackages.stdenv.cc.bintools) + ; + + NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl"; + + preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' + export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g` + export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET" + export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET" + export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET" + ''; + + dontDisableStatic = true; + + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = + # TODO(@Ericson2314): Figure out what's going wrong with Arm + if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32 + then [] + else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + + configureFlags = + # Basic dependencies + [ + "--with-gmp-include=${gmp.dev}/include" + "--with-gmp-lib=${gmp.out}/lib" + "--with-mpfr-include=${mpfr.dev}/include" + "--with-mpfr-lib=${mpfr.out}/lib" + "--with-mpc=${libmpc}" + ] ++ + optional (libelf != null) "--with-libelf=${libelf}" ++ + optional (!(crossMingw && crossStageStatic)) + "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++ + + # Basic configuration + [ + "--enable-lto" + "--disable-libstdcxx-pch" + "--without-included-gettext" + "--with-system-zlib" + "--enable-static" + "--enable-languages=${ + concatStrings (intersperse "," + ( optional langC "c" + ++ optional langCC "c++" + ++ optional langFortran "fortran" + ++ optional langGo "go" + ++ optional langObjC "objc" + ++ optional langObjCpp "obj-c++" + ++ optionals crossDarwin [ "objc" "obj-c++" ] + ) + ) + }" + ] ++ + + (if enableMultilib + then ["--enable-multilib" "--disable-libquadmath"] + else ["--disable-multilib"]) ++ + optional (!enableShared) "--disable-shared" ++ + (if enablePlugin + then ["--enable-plugin"] + else ["--disable-plugin"]) ++ + + # Optional features + optional (isl != null) "--with-isl=${isl}" ++ + + platformFlags ++ + optional (targetPlatform != hostPlatform) crossConfigureFlags ++ + optional (!bootstrap) "--disable-bootstrap" ++ + + # Platform-specific flags + optional (targetPlatform == hostPlatform && targetPlatform.isi686) "--with-arch=i686" ++ + optionals hostPlatform.isSunOS [ + "--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit" + # On Illumos/Solaris GNU as is preferred + "--with-gnu-as" "--without-gnu-ld" + ] + ++ optional (targetPlatform == hostPlatform && targetPlatform.libc == "musl") "--disable-libsanitizer" + ; + + targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + + buildFlags = + optional bootstrap (if profiledCompiler then "profiledbootstrap" else "bootstrap"); + + installTargets = + if stripped + then "install-strip" + else "install"; + + /* For cross-built gcc (build != host == target) */ + crossAttrs = { + dontStrip = true; + buildFlags = ""; + }; + + # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 + ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; + + # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the + # library headers and binaries, regarless of the language being compiled. + # + # Likewise, the LTO code doesn't find zlib. + # + # Cross-compiling, we need gcc not to read ./specs in order to build the g++ + # compiler (after the specs for the cross-gcc are created). Having + # LIBRARY_PATH= makes gcc read the specs from ., and the build breaks. + + CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([] + ++ optional (zlib != null) zlib + ++ optional (libpthread != null) libpthread + ++ optional (libpthreadCross != null) libpthreadCross + + # On GNU/Hurd glibc refers to Mach & Hurd + # headers. + ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs) + libcCross.propagatedBuildInputs + )); + + LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath ([] + ++ optional (zlib != null) zlib + ++ optional (libpthread != null) libpthread) + ); + + EXTRA_TARGET_FLAGS = optionals + (targetPlatform != hostPlatform && libcCross != null) + ([ + "-idirafter ${getDev libcCross}/include" + ] ++ optionals (! crossStageStatic) [ + "-B${libcCross.out}/lib" + ]); + + EXTRA_TARGET_LDFLAGS = optionals + (targetPlatform != hostPlatform && libcCross != null) + ([ + "-Wl,-L${libcCross.out}/lib" + ] ++ (if crossStageStatic then [ + "-B${libcCross.out}/lib" + ] else [ + "-Wl,-rpath,${libcCross.out}/lib" + "-Wl,-rpath-link,${libcCross.out}/lib" + ]) ++ optionals (libpthreadCross != null) [ + "-L${libpthreadCross}/lib" + "-Wl,${libpthreadCross.TARGET_LDFLAGS}" + ]); + + passthru = + { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; }; + + inherit enableParallelBuilding enableMultilib; + + inherit (stdenv) is64bit; + + meta = { + homepage = http://gcc.gnu.org/; + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ + description = "GNU Compiler Collection, version ${version}" + + (if stripped then "" else " (with debugging info)"); + + longDescription = '' + The GNU Compiler Collection includes compiler front ends for C, C++, + Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as + libraries for these languages (libstdc++, libgomp,...). + + GCC development is a part of the GNU Project, aiming to improve the + compiler used in the GNU system including the GNU/Linux variant. + ''; + + maintainers = with stdenv.lib.maintainers; [ synthetica ]; + + platforms = + stdenv.lib.platforms.linux ++ + stdenv.lib.platforms.freebsd ++ + stdenv.lib.platforms.darwin; + }; +} + +// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) { + makeFlags = [ "all-gcc" "all-target-libgcc" ]; + installTargets = "install-gcc install-target-libgcc"; +} + +# Strip kills static libs of other archs (hence targetPlatform != hostPlatform) +// optionalAttrs (!stripped || targetPlatform != hostPlatform) { dontStrip = true; } + +// optionalAttrs (enableMultilib) { dontMoveLib64 = true; } +) diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix index a6639d643dcf0..23e7ec222a63a 100644 --- a/pkgs/development/compilers/go/1.10.nix +++ b/pkgs/development/compilers/go/1.10.nix @@ -76,6 +76,10 @@ stdenv.mkDerivation rec { sed -i '/TestRespectSetgidDir/areturn' src/cmd/go/internal/work/build_test.go # Remove cert tests that conflict with NixOS's cert resolution sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go + # TestWritevError hangs sometimes + sed -i '/TestWritevError/areturn' src/net/writev_test.go + # TestVariousDeadlines fails sometimes + sed -i '/TestVariousDeadlines/areturn' src/net/timeout_test.go sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index 6a92775e0c257..8ef528e2c92ae 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -76,6 +76,10 @@ stdenv.mkDerivation rec { sed -i '/TestRespectSetgidDir/areturn' src/cmd/go/internal/work/build_test.go # Remove cert tests that conflict with NixOS's cert resolution sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go + # TestWritevError hangs sometimes + sed -i '/TestWritevError/areturn' src/net/writev_test.go + # TestVariousDeadlines fails sometimes + sed -i '/TestVariousDeadlines/areturn' src/net/timeout_test.go sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index d5ce240b4a5fe..76f29eeaa0c0d 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.2.40"; + version = "1.2.41"; in stdenv.mkDerivation rec { inherit version; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "0n4na0ddnjgc573szk5bpd34v5gib71pah62xq7vwdf34q8mg61l"; + sha256 = "0p16xl2qhm7913abd06vvmsx956ny51jjfr6knkmrnk8y9r2g1xg"; }; propagatedBuildInputs = [ jre ] ; @@ -22,6 +22,11 @@ in stdenv.mkDerivation rec { for p in $(ls $out/bin/) ; do wrapProgram $out/bin/$p --prefix PATH ":" ${jre}/bin ; done + + if [ -f $out/LICENSE ]; then + install -D $out/LICENSE $out/share/kotlin/LICENSE + rm $out/LICENSE + fi ''; meta = { diff --git a/pkgs/development/compilers/openjdk/darwin/8.nix b/pkgs/development/compilers/openjdk/darwin/8.nix index cc7c5fd371d2e..7457ffceab1fe 100644 --- a/pkgs/development/compilers/openjdk/darwin/8.nix +++ b/pkgs/development/compilers/openjdk/darwin/8.nix @@ -26,6 +26,11 @@ let # jni.h expects jni_md.h to be in the header search path. ln -s $out/include/darwin/*_md.h $out/include/ + + if [ -f $out/LICENSE ]; then + install -D $out/LICENSE $out/share/zulu/LICENSE + rm $out/LICENSE + fi ''; preFixup = '' diff --git a/pkgs/development/compilers/openjdk/darwin/default.nix b/pkgs/development/compilers/openjdk/darwin/default.nix index 6ecc785be3b93..54239e58002f7 100644 --- a/pkgs/development/compilers/openjdk/darwin/default.nix +++ b/pkgs/development/compilers/openjdk/darwin/default.nix @@ -16,6 +16,11 @@ let # jni.h expects jni_md.h to be in the header search path. ln -s $out/include/darwin/*_md.h $out/include/ + + if [ -f $out/LICENSE ]; then + install -D $out/LICENSE $out/share/zulu/LICENSE + rm $out/LICENSE + fi ''; preFixup = '' diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index 5289540e944cc..099a591b407de 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, boost, bison, flex, openjdk, doxygen, perl, graphviz, libtool, lsb-release, ncurses, zlib, sqlite }: +{ stdenv, fetchFromGitHub +, boost, bison, flex, openjdk, doxygen +, perl, graphviz, libtool, ncurses, zlib, sqlite +, autoreconfHook }: stdenv.mkDerivation rec { version = "1.2.0"; @@ -11,12 +14,10 @@ stdenv.mkDerivation rec { sha256 = "1g8yvm40h102mab8lacpl1cwgqsw1js0s1yn4l84l9fjdvlh2ygd"; }; + nativeBuildInputs = [ autoreconfHook bison flex ]; + buildInputs = [ - autoconf automake boost bison flex openjdk - # Used for 1.2.0 - libtool lsb-release ncurses zlib sqlite - # Used for docs - doxygen perl graphviz + boost openjdk ncurses zlib sqlite doxygen perl graphviz ]; patchPhase = '' @@ -29,8 +30,6 @@ stdenv.mkDerivation rec { # for boost and failing there, so we tell it what's what here. configureFlags = [ "--with-boost-libdir=${boost}/lib" ]; - preConfigure = "./bootstrap"; - meta = with stdenv.lib; { description = "A translator of declarative Datalog programs into the C++ language"; homepage = "http://souffle-lang.github.io/"; diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index c20bffe26ed1c..4bd5640c854c5 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchFromBitbucket +{ stdenv, fetchFromGitHub , pkgconfig, tcl, readline, libffi, python3, bison, flex }: @@ -6,25 +6,25 @@ with builtins; stdenv.mkDerivation rec { name = "yosys-${version}"; - version = "2018.03.21"; + version = "2018.05.03"; srcs = [ (fetchFromGitHub { owner = "yosyshq"; repo = "yosys"; - rev = "3f0070247590458c5ed28c5a7abfc3b9d1ec138b"; - sha256 = "0rsnjk25asg7dkxcmim464rmxgvm7x7njmcp5nyl8y4iwn8i9p8v"; + rev = "a572b495387743a58111e7264917a497faa17ebf"; + sha256 = "0q4xh4sy3n83c8il8lygzv0i6ca4qw36i2k6qz6giw0wd2pkibkb"; name = "yosys"; }) # NOTE: the version of abc used here is synchronized with # the one in the yosys Makefile of the version above; # keep them the same for quality purposes. - (fetchFromBitbucket { - owner = "alanmi"; + (fetchFromGitHub { + owner = "berkeley-abc"; repo = "abc"; - rev = "6e3c24b3308a"; - sha256 = "1i4wv0si4fb6dpv2yrpkp588mdlfrnx2s02q2fgra5apdm54c53w"; + rev = "f23ea8e33f6d5cc54f58bec6d9200483e5d8c704"; + sha256 = "1xwmq3k5hfavdrs7zbqjxh35kr2pis4i6hhzrq7qzyzs0az0hls9"; name = "yosys-abc"; }) ]; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8c7ef561f171b..2c16b37bba88d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -47,12 +47,12 @@ self: super: { hoogleLocal = { packages ? [] }: self.callPackage ./hoogle.nix { inherit packages; }; # Break infinite recursions. + attoparsec-varword = super.attoparsec-varword.override { bytestring-builder-varword = dontCheck self.bytestring-builder-varword; }; clock = dontCheck super.clock; Dust-crypto = dontCheck super.Dust-crypto; hasql-postgres = dontCheck super.hasql-postgres; hspec = super.hspec.override { stringbuilder = dontCheck self.stringbuilder; }; hspec-core = super.hspec-core.override { silently = dontCheck self.silently; temporary = dontCheck self.temporary; }; - hspec-expectations = dontCheck super.hspec-expectations; HTTP = dontCheck super.HTTP; http-streams = dontCheck super.http-streams; @@ -422,6 +422,10 @@ self: super: { # https://github.com/evanrinehart/mikmod/issues/1 mikmod = addExtraLibrary super.mikmod pkgs.libmikmod; + # The doctest phase fails because it does not have a proper environment in + # which to run the commands it's ought to test. + haskell-gi = dontCheck super.haskell-gi; + # https://github.com/basvandijk/threads/issues/10 threads = dontCheck super.threads; @@ -634,6 +638,8 @@ self: super: { # Need newer versions of their dependencies than the ones we have in LTS-11.x. cabal2nix = super.cabal2nix.overrideScope (self: super: { hpack = self.hpack_0_28_2; hackage-db = self.hackage-db_2_0_1; }); + dbus-hslogger = super.dbus-hslogger.overrideScope (self: super: { dbus = self.dbus_1_0_1; }); + status-notifier-item = super.status-notifier-item.overrideScope (self: super: { dbus = self.dbus_1_0_1; }); # https://github.com/bos/configurator/issues/22 configurator = dontCheck super.configurator; @@ -1022,6 +1028,9 @@ self: super: { # https://github.com/dmwit/encoding/pull/3 encoding = appendPatch super.encoding ./patches/encoding-Cabal-2.0.patch; + # Work around overspecified constraint on github ==0.18. + github-backup = doJailbreak super.github-backup; + } // diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 6b18694dc8d19..412c3bfd57efc 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2398,6 +2398,7 @@ extra-packages: - aws ^>= 0.18 # pre-lts-11.x versions neeed by git-annex 6.20180227 - binary > 0.7 && < 0.8 # keep a 7.x major release around for older compilers - binary > 0.8 && < 0.9 # keep a 8.x major release around for older compilers + - blank-canvas < 0.6.3 # more recent versions depend on base-compat-batteries == 0.10.* but we're on base-compat-0.9.* - Cabal == 1.18.* # required for cabal-install et al on old GHC versions - Cabal == 1.20.* # required for cabal-install et al on old GHC versions - Cabal == 1.24.* # required for jailbreak-cabal etc. @@ -2478,8 +2479,6 @@ package-maintainers: - streamproc - structured-haskell-mode - titlecase - gebner: - - hledger-diff gridaphobe: - ghc-srcspan-plugin - located-base @@ -2739,6 +2738,7 @@ dont-distribute-packages: alerta: [ i686-linux, x86_64-linux, x86_64-darwin ] alex-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] alfred: [ i686-linux, x86_64-linux, x86_64-darwin ] + alg: [ i686-linux, x86_64-linux, x86_64-darwin ] alga: [ i686-linux, x86_64-linux, x86_64-darwin ] algebra-sql: [ i686-linux, x86_64-linux, x86_64-darwin ] algebraic-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3088,6 +3088,7 @@ dont-distribute-packages: barrier-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] barrier: [ i686-linux, x86_64-linux, x86_64-darwin ] base-compat-batteries: [ i686-linux, x86_64-linux, x86_64-darwin ] + base-compat-migrate: [ i686-linux, x86_64-linux, x86_64-darwin ] base-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] base-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ] base-noprelude: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3167,6 +3168,7 @@ dont-distribute-packages: bindings-friso: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-gsl: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-gts: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-hamlib: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-hdf5: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-K8055: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-levmar: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3293,6 +3295,7 @@ dont-distribute-packages: bson-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] btree-concurrent: [ i686-linux, x86_64-linux, x86_64-darwin ] btree: [ i686-linux, x86_64-linux, x86_64-darwin ] + buchhaltung: [ i686-linux, x86_64-linux, x86_64-darwin ] buffer-builder-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] buffer: [ i686-linux, x86_64-linux, x86_64-darwin ] buffon: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3326,6 +3329,7 @@ dont-distribute-packages: c-dsl: [ i686-linux, x86_64-linux, x86_64-darwin ] c-io: [ i686-linux, x86_64-linux, x86_64-darwin ] c2hsc: [ i686-linux, x86_64-linux, x86_64-darwin ] + ca: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-audit: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-bounds: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-cargs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3426,7 +3430,9 @@ dont-distribute-packages: categorical-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] category-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] category-traced: [ i686-linux, x86_64-linux, x86_64-darwin ] + category: [ i686-linux, x86_64-linux, x86_64-darwin ] catnplus: [ i686-linux, x86_64-linux, x86_64-darwin ] + cautious-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] cayley-client: [ i686-linux, x86_64-linux, x86_64-darwin ] cblrepo: [ i686-linux, x86_64-linux, x86_64-darwin ] CBOR: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3692,6 +3698,7 @@ dont-distribute-packages: constrained-dynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] constrained-monads: [ i686-linux, x86_64-linux, x86_64-darwin ] constraint-manip: [ i686-linux, x86_64-linux, x86_64-darwin ] + constraint: [ i686-linux, x86_64-linux, x86_64-darwin ] ConstraintKinds: [ i686-linux, x86_64-linux, x86_64-darwin ] constructive-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] consul-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3895,6 +3902,7 @@ dont-distribute-packages: data-type: [ i686-linux, x86_64-linux, x86_64-darwin ] database-study: [ i686-linux, x86_64-linux, x86_64-darwin ] datadog: [ i686-linux, x86_64-linux, x86_64-darwin ] + datafix: [ i686-linux, x86_64-linux, x86_64-darwin ] datalog: [ i686-linux, x86_64-linux, x86_64-darwin ] DataTreeView: [ i686-linux, x86_64-linux, x86_64-darwin ] datetime-sb: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3909,6 +3917,7 @@ dont-distribute-packages: dbmigrations-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] dbus-client: [ i686-linux, x86_64-linux, x86_64-darwin ] dbus-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + dbus-hslogger: [ i686-linux, x86_64-linux, x86_64-darwin ] dbus-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] dbus-th-introspection: [ i686-linux, x86_64-linux, x86_64-darwin ] DBus: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4317,6 +4326,7 @@ dont-distribute-packages: exp-extended: [ i686-linux, x86_64-linux, x86_64-darwin ] expand: [ i686-linux, x86_64-linux, x86_64-darwin ] expat-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] + expiring-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] explain: [ i686-linux, x86_64-linux, x86_64-darwin ] explicit-determinant: [ i686-linux, x86_64-linux, x86_64-darwin ] explicit-iomodes-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4325,6 +4335,7 @@ dont-distribute-packages: explicit-sharing: [ i686-linux, x86_64-linux, x86_64-darwin ] explore: [ i686-linux, x86_64-linux, x86_64-darwin ] exposed-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] + expressions-z3: [ i686-linux, x86_64-linux, x86_64-darwin ] extcore: [ i686-linux, x86_64-linux, x86_64-darwin ] extemp: [ i686-linux, x86_64-linux, x86_64-darwin ] extended-categories: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4956,6 +4967,7 @@ dont-distribute-packages: gore-and-ash-actor: [ i686-linux, x86_64-linux, x86_64-darwin ] gore-and-ash-async: [ i686-linux, x86_64-linux, x86_64-darwin ] gore-and-ash-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] + gore-and-ash-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ] gore-and-ash-lambdacube: [ i686-linux, x86_64-linux, x86_64-darwin ] gore-and-ash-network: [ i686-linux, x86_64-linux, x86_64-darwin ] gore-and-ash-sdl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5018,6 +5030,7 @@ dont-distribute-packages: gridfs: [ i686-linux, x86_64-linux, x86_64-darwin ] gridland: [ i686-linux, x86_64-linux, x86_64-darwin ] grm: [ i686-linux, x86_64-linux, x86_64-darwin ] + groot: [ i686-linux, x86_64-linux, x86_64-darwin ] gross: [ i686-linux, x86_64-linux, x86_64-darwin ] GroteTrap: [ i686-linux, x86_64-linux, x86_64-darwin ] groundhog-converters: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5036,6 +5049,7 @@ dont-distribute-packages: gtfs: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk-mac-integration: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk-serialized-event: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtk-sni-tray: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk-strut: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk-toy: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk2hs-cast-glade: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5593,6 +5607,7 @@ dont-distribute-packages: HLearn-datastructures: [ i686-linux, x86_64-linux, x86_64-darwin ] HLearn-distributions: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-chart: [ i686-linux, x86_64-linux, x86_64-darwin ] + hledger-diff: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-irr: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-vty: [ i686-linux, x86_64-linux, x86_64-darwin ] hlibBladeRF: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5618,7 +5633,9 @@ dont-distribute-packages: hmatrix-nipals: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-nlopt: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-quadprogpp: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmatrix-sparse: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-static: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmatrix-sundials: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] hmeap-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] hmeap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5719,6 +5736,7 @@ dont-distribute-packages: hpqtypes-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] hpqtypes: [ i686-linux, x86_64-linux, x86_64-darwin ] hprotoc-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] + hprotoc: [ i686-linux, x86_64-linux, x86_64-darwin ] hps-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] hps-kmeans: [ i686-linux, x86_64-linux, x86_64-darwin ] hps: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6087,6 +6105,7 @@ dont-distribute-packages: instant-hashable: [ i686-linux, x86_64-linux, x86_64-darwin ] instant-zipper: [ i686-linux, x86_64-linux, x86_64-darwin ] instapaper-sender: [ i686-linux, x86_64-linux, x86_64-darwin ] + int-multimap: [ i686-linux, x86_64-linux, x86_64-darwin ] integer-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] intel-aes: [ i686-linux, x86_64-linux, x86_64-darwin ] interleavableGen: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6261,6 +6280,7 @@ dont-distribute-packages: katip-syslog: [ i686-linux, x86_64-linux, x86_64-darwin ] katt: [ i686-linux, x86_64-linux, x86_64-darwin ] kawaii: [ i686-linux, x86_64-linux, x86_64-darwin ] + kazura-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] kd-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] kdesrc-build-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] kdt: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6699,6 +6719,7 @@ dont-distribute-packages: mattermost-api-qc: [ i686-linux, x86_64-linux, x86_64-darwin ] mattermost-api: [ i686-linux, x86_64-linux, x86_64-darwin ] maude: [ i686-linux, x86_64-linux, x86_64-darwin ] + maxent-learner-hw-gui: [ i686-linux, x86_64-linux, x86_64-darwin ] maxent: [ i686-linux, x86_64-linux, x86_64-darwin ] maxsharing: [ i686-linux, x86_64-linux, x86_64-darwin ] maybench: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6765,6 +6786,7 @@ dont-distribute-packages: MHask: [ i686-linux, x86_64-linux, x86_64-darwin ] mi: [ i686-linux, x86_64-linux, x86_64-darwin ] Michelangelo: [ i686-linux, x86_64-linux, x86_64-darwin ] + microaeson: [ i686-linux, x86_64-linux, x86_64-darwin ] microformats2-types: [ i686-linux, x86_64-linux, x86_64-darwin ] microlens-each: [ i686-linux, x86_64-linux, x86_64-darwin ] micrologger: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6961,6 +6983,7 @@ dont-distribute-packages: mvc-updates: [ i686-linux, x86_64-linux, x86_64-darwin ] mvc: [ i686-linux, x86_64-linux, x86_64-darwin ] mvclient: [ i686-linux, x86_64-linux, x86_64-darwin ] + mxnet-dataiter: [ i686-linux, x86_64-linux, x86_64-darwin ] mxnet-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] mxnet-nn: [ i686-linux, x86_64-linux, x86_64-darwin ] mxnet-nnvm: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7278,6 +7301,7 @@ dont-distribute-packages: pandoc-unlit: [ i686-linux, x86_64-linux, x86_64-darwin ] PandocAgda: [ i686-linux, x86_64-linux, x86_64-darwin ] pang-a-lambda: [ i686-linux, x86_64-linux, x86_64-darwin ] + pangraph: [ i686-linux, x86_64-linux, x86_64-darwin ] panpipe: [ i686-linux, x86_64-linux, x86_64-darwin ] pansite: [ i686-linux, x86_64-linux, x86_64-darwin ] papa-export: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7393,6 +7417,7 @@ dont-distribute-packages: pgstream: [ i686-linux, x86_64-linux, x86_64-darwin ] phasechange: [ i686-linux, x86_64-linux, x86_64-darwin ] phaser: [ i686-linux, x86_64-linux, x86_64-darwin ] + phoityne: [ i686-linux, x86_64-linux, x86_64-darwin ] phone-metadata: [ i686-linux, x86_64-linux, x86_64-darwin ] phone-numbers: [ i686-linux, x86_64-linux, x86_64-darwin ] phone-push: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7409,6 +7434,7 @@ dont-distribute-packages: picoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] picosat: [ i686-linux, x86_64-linux, x86_64-darwin ] pictikz: [ i686-linux, x86_64-linux, x86_64-darwin ] + pier: [ i686-linux, x86_64-linux, x86_64-darwin ] piet: [ i686-linux, x86_64-linux, x86_64-darwin ] pig: [ i686-linux, x86_64-linux, x86_64-darwin ] pinchot: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7569,6 +7595,7 @@ dont-distribute-packages: preprocessor: [ i686-linux, x86_64-linux, x86_64-darwin ] press: [ i686-linux, x86_64-linux, x86_64-darwin ] presto-hdbc: [ i686-linux, x86_64-linux, x86_64-darwin ] + pretty-relative-time: [ i686-linux, x86_64-linux, x86_64-darwin ] prettyprinter-vty: [ i686-linux, x86_64-linux, x86_64-darwin ] primesieve: [ i686-linux, x86_64-linux, x86_64-darwin ] primitive-simd: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7596,6 +7623,7 @@ dont-distribute-packages: procrastinating-variable: [ i686-linux, x86_64-linux, x86_64-darwin ] procstat: [ i686-linux, x86_64-linux, x86_64-darwin ] producer: [ i686-linux, x86_64-linux, x86_64-darwin ] + product: [ i686-linux, x86_64-linux, x86_64-darwin ] prof2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] prof2pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] profiteur: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7665,6 +7693,7 @@ dont-distribute-packages: puzzle-draw-cmdline: [ i686-linux, x86_64-linux, x86_64-darwin ] puzzle-draw: [ i686-linux, x86_64-linux, x86_64-darwin ] pvd: [ i686-linux, x86_64-linux, x86_64-darwin ] + PyF: [ i686-linux, x86_64-linux, x86_64-darwin ] pyffi: [ i686-linux, x86_64-linux, x86_64-darwin ] pyfi: [ i686-linux, x86_64-linux, x86_64-darwin ] python-pickle: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7745,6 +7774,7 @@ dont-distribute-packages: rand-vars: [ i686-linux, x86_64-linux, x86_64-darwin ] randfile: [ i686-linux, x86_64-linux, x86_64-darwin ] random-access-list: [ i686-linux, x86_64-linux, x86_64-darwin ] + random-class: [ i686-linux, x86_64-linux, x86_64-darwin ] random-derive: [ i686-linux, x86_64-linux, x86_64-darwin ] random-eff: [ i686-linux, x86_64-linux, x86_64-darwin ] random-effin: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8513,6 +8543,8 @@ dont-distribute-packages: stable-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] stack-bump: [ i686-linux, x86_64-linux, x86_64-darwin ] stack-hpc-coveralls: [ i686-linux, x86_64-linux, x86_64-darwin ] + stack-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] + stack-network: [ i686-linux, x86_64-linux, x86_64-darwin ] stack-prism: [ i686-linux, x86_64-linux, x86_64-darwin ] stack-run-auto: [ i686-linux, x86_64-linux, x86_64-darwin ] stack-run: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8586,6 +8618,7 @@ dont-distribute-packages: stream-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] stream: [ i686-linux, x86_64-linux, x86_64-darwin ] streamed: [ i686-linux, x86_64-linux, x86_64-darwin ] + streaming-base64: [ i686-linux, x86_64-linux, x86_64-darwin ] streaming-benchmarks: [ i686-linux, x86_64-linux, x86_64-darwin ] streaming-concurrency: [ i686-linux, x86_64-linux, x86_64-darwin ] streaming-eversion: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8783,6 +8816,7 @@ dont-distribute-packages: termplot: [ i686-linux, x86_64-linux, x86_64-darwin ] terntup: [ i686-linux, x86_64-linux, x86_64-darwin ] terrahs: [ i686-linux, x86_64-linux, x86_64-darwin ] + tersmu: [ i686-linux, x86_64-linux, x86_64-darwin ] test-framework-doctest: [ i686-linux, x86_64-linux, x86_64-darwin ] test-framework-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] test-framework-sandbox: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9014,6 +9048,7 @@ dont-distribute-packages: twitter-types: [ i686-linux, x86_64-linux, x86_64-darwin ] twitter: [ i686-linux, x86_64-linux, x86_64-darwin ] tx: [ i686-linux, x86_64-linux, x86_64-darwin ] + txt: [ i686-linux, x86_64-linux, x86_64-darwin ] txtblk: [ i686-linux, x86_64-linux, x86_64-darwin ] TYB: [ i686-linux, x86_64-linux, x86_64-darwin ] tyfam-witnesses: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9132,6 +9167,7 @@ dont-distribute-packages: utc: [ i686-linux, x86_64-linux, x86_64-darwin ] utf8-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] UTFTConverter: [ i686-linux, x86_64-linux, x86_64-darwin ] + util: [ i686-linux, x86_64-linux, x86_64-darwin ] uu-options: [ i686-linux, x86_64-linux, x86_64-darwin ] uuagc-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] uuid-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9205,6 +9241,7 @@ dont-distribute-packages: vk-aws-route53: [ i686-linux, x86_64-linux, x86_64-darwin ] vowpal-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] voyeur: [ i686-linux, x86_64-linux, x86_64-darwin ] + vpq: [ i686-linux, x86_64-linux, x86_64-darwin ] vrpn: [ i686-linux, x86_64-linux, x86_64-darwin ] vte: [ i686-linux, x86_64-linux, x86_64-darwin ] vtegtk3: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e9d076343f82f..197f2d7cb7505 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -15223,6 +15223,7 @@ self: { ]; description = "Quasiquotations for a python like interpolated string formater"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "QIO" = callPackage @@ -19370,12 +19371,12 @@ self: { shell32 = null; shfolder = null; shlwapi = null; user32 = null; winmm = null;}; - "Win32_2_7_0_0" = callPackage + "Win32_2_8_0_0" = callPackage ({ mkDerivation }: mkDerivation { pname = "Win32"; - version = "2.7.0.0"; - sha256 = "1583c2x208bpwgvk0gyy2931604vikx57kyiiaxf7mp8shh13fhi"; + version = "2.8.0.0"; + sha256 = "0ppvpf2zx6547bqx7ysbq9ld99hf1v9rfa9s4f57hkn758l9ldm4"; homepage = "https://github.com/haskell/win32"; description = "A binding to Windows Win32 API"; license = stdenv.lib.licenses.bsd3; @@ -19800,6 +19801,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.xorg) xinput;}; + "XML" = callPackage + ({ mkDerivation, base, base-unicode-symbols, smallcheck, tasty + , tasty-smallcheck, txt, util, vector + }: + mkDerivation { + pname = "XML"; + version = "0.0.0.0"; + sha256 = "1arlnyzj3zdzqrsr9lhicx2y1ag00cgf6jzn6nyxa7d7avp42025"; + libraryHaskellDepends = [ + base base-unicode-symbols txt util vector + ]; + testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; + description = "Extensible Markup Language"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "XMLParser" = callPackage ({ mkDerivation, base, parsec }: mkDerivation { @@ -23476,8 +23493,8 @@ self: { }: mkDerivation { pname = "aivika-distributed"; - version = "1.3"; - sha256 = "1sm56b6z8ajkap3nlcrsl592m40vgb5zmhhnc8al6arrra2j21pc"; + version = "1.4"; + sha256 = "0fpl6xa32w4f1bl4l8b5pwagm68k42nn45w7d1hsh9ffy4bfsq0k"; libraryHaskellDepends = [ aivika aivika-transformers array base binary containers distributed-process exceptions mtl mwc-random random stm time @@ -23820,6 +23837,7 @@ self: { libraryHaskellDepends = [ base util ]; description = "Algebraic structures"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alga" = callPackage @@ -27269,6 +27287,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ansi-terminal_0_8_0_3" = callPackage + ({ mkDerivation, base, colour }: + mkDerivation { + pname = "ansi-terminal"; + version = "0.8.0.3"; + sha256 = "18466bjgsmn2f96i3q6sp5f72paa2flqh40n9h137z29kvr53sva"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base colour ]; + homepage = "https://github.com/feuerbach/ansi-terminal"; + description = "Simple ANSI terminal support, with Windows compatibility"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ansi-terminal-game" = callPackage ({ mkDerivation, ansi-terminal, array, base, bytestring, cereal , clock, hspec, linebreak, split, terminal-size, timers-tick @@ -30181,8 +30214,8 @@ self: { }: mkDerivation { pname = "atlassian-connect-descriptor"; - version = "0.4.6.0"; - sha256 = "1yyc5cp10zqhmi2hay0hiz526lxfcn56g13ikfh25pqzayrxnd8b"; + version = "0.4.7.0"; + sha256 = "0n9a0bkf525gw1fcik6gmaarf5l7zmn29whiyrcp3dv7afqdfhwa"; libraryHaskellDepends = [ aeson base cases network network-uri text time-units unordered-containers @@ -30509,8 +30542,10 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "2.10.0.20"; - sha256 = "0k73jcj2za79wvb6nki1k02d6rj7zrnl0vz494ajh4d96gwdwacp"; + version = "2.10.1.5"; + sha256 = "14y4mpk6hkqvw8jh49idj9gx2wxcy2ppz00abny6fsbw6iff4xrs"; + revision = "1"; + editedCabalFile = "0ff0nslsi5b4g8gp63x6js3c026ajgfamd8pg2k1aygwx8x3zqk9"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; @@ -30551,21 +30586,21 @@ self: { "ats-storable" = callPackage ({ mkDerivation, base, bytestring, composition-prelude, hspec - , microlens, microlens-th, text + , storable, text }: mkDerivation { pname = "ats-storable"; - version = "0.3.0.1"; - sha256 = "1apzmyq9a4hjn9d0fz7pxvxflq61kp26fa6gz3c50pdjby55zhns"; + version = "0.3.0.3"; + sha256 = "1a9id432vhvr3n69m1f7iyc899nc2wa4w8jpa7s7aqkixw2vqlr2"; libraryHaskellDepends = [ - base bytestring composition-prelude microlens microlens-th text + base bytestring composition-prelude text ]; testHaskellDepends = [ base hspec ]; - homepage = "https://github.com//ats-generic#readme"; + testSystemDepends = [ storable ]; description = "Marshal ATS types into Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {storable = null;}; "attempt" = callPackage ({ mkDerivation, base, failure }: @@ -30927,6 +30962,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "attoparsec-varword" = callPackage + ({ mkDerivation, attoparsec, base, bytestring + , bytestring-builder-varword, hspec, QuickCheck + }: + mkDerivation { + pname = "attoparsec-varword"; + version = "0.1.0.0"; + sha256 = "1rrc4pqi7slsq2rhiasid7m7fm489vd851jvakb8z5z64mrxc409"; + libraryHaskellDepends = [ attoparsec base ]; + testHaskellDepends = [ + attoparsec base bytestring bytestring-builder-varword hspec + QuickCheck + ]; + homepage = "https://github.com/concert/hs-varword#readme"; + description = "Variable-length integer decoding for Attoparsec"; + license = stdenv.lib.licenses.lgpl3; + }) {}; + "attosplit" = callPackage ({ mkDerivation, attoparsec, base, bytestring }: mkDerivation { @@ -31542,8 +31595,8 @@ self: { }: mkDerivation { pname = "avro"; - version = "0.3.0.0"; - sha256 = "0sfi6jc7pcigpwgkfqq9ckwm7bzhfc9kf2rhznrrsy9qw5i7xrll"; + version = "0.3.0.1"; + sha256 = "1day4zpypk1jirkn0zfvmfwy0pnsvggibi9k2gk23kqnn904sv77"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific @@ -33098,6 +33151,7 @@ self: { homepage = "https://github.com/bergmark/base-compat-migrate#readme"; description = "Helps migrating projects to base-compat(-batteries)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "base-encoding" = callPackage @@ -33622,8 +33676,8 @@ self: { }: mkDerivation { pname = "battleplace"; - version = "0.1.0.2"; - sha256 = "0gkchw2dqg3cps5xf88qmmn9mzd7zpws1ngsr3k9lh7krah8a7fc"; + version = "0.1.0.3"; + sha256 = "0kvw69br5nrx4nnrp0r00wr55w15wq5kh68df2r89yrd8l5vp02x"; libraryHaskellDepends = [ aeson base bytestring cereal data-default hashable memory servant text vector @@ -35779,6 +35833,7 @@ self: { homepage = "https://github.com/relrod/hamlib-haskell"; description = "Hamlib bindings for Haskell"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) hamlib;}; "bindings-hdf5" = callPackage @@ -37432,6 +37487,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "blank-canvas_0_6_2" = callPackage + ({ mkDerivation, aeson, base, base-compat, base64-bytestring + , bytestring, colour, containers, data-default-class, directory + , http-types, kansas-comet, mime-types, process, scotty, semigroups + , shake, stm, text, text-show, time, transformers, unix, vector + , wai, wai-extra, warp + }: + mkDerivation { + pname = "blank-canvas"; + version = "0.6.2"; + sha256 = "1qhdvxia8wlnv0ss9dsrxdfw3qsf376ypnpsijz7vxkj9dmzyq84"; + revision = "4"; + editedCabalFile = "03l1k5b58b9p8ajm2aiq5xfryj45zipzv04mxc2qnl5xk9jz0iqw"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base base-compat base64-bytestring bytestring colour + containers data-default-class http-types kansas-comet mime-types + scotty semigroups stm text text-show transformers vector wai + wai-extra warp + ]; + testHaskellDepends = [ + base containers directory process shake stm text time unix vector + ]; + homepage = "https://github.com/ku-fpg/blank-canvas/wiki"; + description = "HTML5 Canvas Graphics Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "blank-canvas" = callPackage ({ mkDerivation, aeson, base, base-compat-batteries , base64-bytestring, bytestring, colour, containers @@ -39836,6 +39920,7 @@ self: { homepage = "http://johannesgerer.com/buchhaltung"; description = "Automates most of your plain text accounting data entry in ledger format"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "buffer" = callPackage @@ -40565,6 +40650,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bytestring-builder-varword" = callPackage + ({ mkDerivation, attoparsec, attoparsec-varword, base, bytestring + , hspec, QuickCheck + }: + mkDerivation { + pname = "bytestring-builder-varword"; + version = "0.1.0.0"; + sha256 = "1lpcy47z3jf023iv0vdwsy5l2bsjb4i8vbnzjk9hzg0n9866f2g1"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + attoparsec attoparsec-varword base bytestring hspec QuickCheck + ]; + homepage = "https://github.com/concert/hs-varword#readme"; + description = "Variable-length integer encoding"; + license = stdenv.lib.licenses.lgpl3; + }) {}; + "bytestring-class" = callPackage ({ mkDerivation, base, bytestring, utf8-string }: mkDerivation { @@ -41207,6 +41309,7 @@ self: { libraryHaskellDepends = [ alg base ]; description = "Cellular Automata"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cab" = callPackage @@ -44002,6 +44105,7 @@ self: { libraryHaskellDepends = [ alg base ]; description = "Categorical types and classes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "category-extras" = callPackage @@ -44119,6 +44223,7 @@ self: { ]; homepage = "https://github.com/Nickske666/cautious#readme"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cayley-client" = callPackage @@ -44291,8 +44396,8 @@ self: { }: mkDerivation { pname = "cdeps"; - version = "0.1.0.2"; - sha256 = "1yd1ahf2ri31lwcs0mvhn6wgpglgk3vsf5698qw6asm8rl1gcaz9"; + version = "0.1.1.0"; + sha256 = "1pgarp84p757jyx71qma64g84fcyg6rrhrmrh4c1sszykqjnw7g0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -44836,22 +44941,23 @@ self: { "cgrep" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, async, base , bytestring, cmdargs, containers, directory, dlist, either - , filepath, ghc-prim, mtl, process, regex-base, regex-pcre - , regex-posix, safe, split, stm, stringsearch, transformers - , unicode-show, unix-compat, unordered-containers, utf8-string - , yaml + , exceptions, filepath, ghc-prim, mtl, process, regex-base + , regex-pcre, regex-posix, safe, split, stm, stringsearch + , transformers, unicode-show, unix-compat, unordered-containers + , utf8-string, yaml }: mkDerivation { pname = "cgrep"; - version = "6.6.24"; - sha256 = "0clnnhr5srrl3z2crfrs7csihrgcq5p9d9vgqbgxsf741jnfmhcx"; + version = "6.6.25"; + sha256 = "0cary2b5jg8151n48a4vij32g68mrql791mhw43v44wvhlag8plw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson ansi-terminal array async base bytestring cmdargs containers - directory dlist either filepath ghc-prim mtl process regex-base - regex-pcre regex-posix safe split stm stringsearch transformers - unicode-show unix-compat unordered-containers utf8-string yaml + directory dlist either exceptions filepath ghc-prim mtl process + regex-base regex-pcre regex-posix safe split stm stringsearch + transformers unicode-show unix-compat unordered-containers + utf8-string yaml ]; homepage = "http://awgn.github.io/cgrep/"; description = "Command line tool"; @@ -50918,8 +51024,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "concurrent-utilities"; - version = "0.2.0.1"; - sha256 = "168prywiw4fhh2syzj452pyqj8byy4sb929mgkv5srgwkzqr6g0f"; + version = "0.2.0.2"; + sha256 = "1phc9a90nvx6dk741hmg3w5m9y8ra5a7zsgmzw173ibaapr2yhqi"; libraryHaskellDepends = [ base ]; homepage = "-"; description = "More utilities and broad-used datastructures for concurrency"; @@ -52126,6 +52232,7 @@ self: { libraryHaskellDepends = [ base category ]; description = "Reified constraints"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "constraint-classes" = callPackage @@ -52190,12 +52297,12 @@ self: { }) {}; "constrictor" = callPackage - ({ mkDerivation, base, transformers }: + ({ mkDerivation, base, ghc-prim, transformers }: mkDerivation { pname = "constrictor"; - version = "0.1.1.0"; - sha256 = "0vid1m5lsmpdx9bpc78ad3nk720z62chd0j9rx03laiz2fjzx2bh"; - libraryHaskellDepends = [ base transformers ]; + version = "0.1.1.1"; + sha256 = "0rw36xbrrqm40rqacl8zps7hm424nqwkhxr82c98b16n182zvnan"; + libraryHaskellDepends = [ base ghc-prim transformers ]; homepage = "https://github.com/chessai/constrictor.git"; description = "strict versions of many things in base"; license = stdenv.lib.licenses.mit; @@ -52503,8 +52610,8 @@ self: { ({ mkDerivation, base, criterion, hspec, recursion-schemes }: mkDerivation { pname = "continued-fraction"; - version = "0.1.0.8"; - sha256 = "1izjdvm65zj960dcgg8xamg6ysfhn04qjxb9q7mpgzg8yi6f326c"; + version = "0.1.0.9"; + sha256 = "1831a093wnbf7kvplsp59xkdhj0g8wva08ixf9w12x6vl0yyj6sb"; libraryHaskellDepends = [ base recursion-schemes ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion ]; @@ -56298,21 +56405,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "curl-runnings_0_3_0" = callPackage + "curl-runnings_0_6_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring , case-insensitive, cmdargs, directory, hspec, hspec-expectations - , http-conduit, http-types, text, unordered-containers, vector - , yaml + , http-conduit, http-types, megaparsec, text, unordered-containers + , vector, yaml }: mkDerivation { pname = "curl-runnings"; - version = "0.3.0"; - sha256 = "0bcapr5kcwlc65bkg6w3aq69jzrb2rydkw13v99dcf9fn43kwcfj"; + version = "0.6.0"; + sha256 = "06dcxwhmzsinmay63m9wnsjsy1cgwyms64c0jicndnc3nhbl0824"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty base bytestring case-insensitive directory hspec - hspec-expectations http-conduit http-types text + hspec-expectations http-conduit http-types megaparsec text unordered-containers vector yaml ]; executableHaskellDepends = [ base cmdargs text ]; @@ -57886,14 +57993,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-diverse_3_0_0_0" = callPackage + "data-diverse_3_1_0_0" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim , hspec, tagged }: mkDerivation { pname = "data-diverse"; - version = "3.0.0.0"; - sha256 = "1sxv9pyggdpwba0771vpvrawnycjrnvpayq0fjf7ly57mrdi3zd0"; + version = "3.1.0.0"; + sha256 = "0jg8g8zp8s14qalrmqa3faspg9kfifzdv0mi8a25xmqgi6rz64aq"; libraryHaskellDepends = [ base containers deepseq ghc-prim tagged ]; @@ -57924,14 +58031,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-diverse-lens_3_1_0_0" = callPackage + "data-diverse-lens_3_1_1_0" = callPackage ({ mkDerivation, base, data-diverse, data-has, generic-lens, hspec , lens, profunctors, tagged }: mkDerivation { pname = "data-diverse-lens"; - version = "3.1.0.0"; - sha256 = "0g1cnn1kw36ac68wm8qmd8pdzjpl4xcil7shailxwawldi52v549"; + version = "3.1.1.0"; + sha256 = "1ynw9j8a92ny8327i0r037swsc3rj3723dnlar77x640849nif0p"; libraryHaskellDepends = [ base data-diverse data-has generic-lens lens profunctors tagged ]; @@ -59177,6 +59284,7 @@ self: { homepage = "https://github.com/sgraf812/datafix"; description = "Fixing data-flow problems"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dataflow" = callPackage @@ -59683,6 +59791,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "dbus-hslogger" = callPackage + ({ mkDerivation, base, dbus, hslogger, optparse-applicative }: + mkDerivation { + pname = "dbus-hslogger"; + version = "0.1.0.1"; + sha256 = "0i2y69kagp53cmlb7p3y6ysr9k5wvfd0vcnpwsasyn1jpk6g80zi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base dbus hslogger ]; + executableHaskellDepends = [ + base dbus hslogger optparse-applicative + ]; + homepage = "https://github.com/IvanMalison/dbus-hslogger#readme"; + description = "Expose a dbus server to control hslogger"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dbus-qq" = callPackage ({ mkDerivation, base, containers, dbus, parsec, QuickCheck , template-haskell @@ -60659,8 +60785,8 @@ self: { ({ mkDerivation, base, foldl }: mkDerivation { pname = "deferred-folds"; - version = "0.2.3"; - sha256 = "0v3nr8svnsqgj4rmbki4f38fndq03gxghkwb9q6qjd9w2m2hx3y1"; + version = "0.4.0.1"; + sha256 = "1n2wr03bqpp2yfm1jl54b3xrq4q2dwdj0ijssk8hbk3mzr4pac00"; libraryHaskellDepends = [ base foldl ]; homepage = "https://github.com/metrix-ai/deferred-folds"; description = "Abstractions over deferred folds"; @@ -61603,6 +61729,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "df1" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , QuickCheck, tasty, tasty-quickcheck, text, time + }: + mkDerivation { + pname = "df1"; + version = "0.1"; + sha256 = "0crcwg63d1m47qj44774ydk9v5sssg08vwbjgh1lg8qvqss7qk8l"; + libraryHaskellDepends = [ + attoparsec base bytestring containers text time + ]; + testHaskellDepends = [ + attoparsec base bytestring QuickCheck tasty tasty-quickcheck text + time + ]; + homepage = "https://github.com/k0001/di"; + description = "Type, render and parse the df1 hierarchical structured log format"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dfrac" = callPackage ({ mkDerivation, base, scientific }: mkDerivation { @@ -61698,7 +61844,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall_1_13_0" = callPackage + "dhall_1_13_1" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, case-insensitive , containers, contravariant, cryptonite, deepseq, directory , exceptions, filepath, formatting, haskeline, http-client @@ -61710,8 +61856,8 @@ self: { }: mkDerivation { pname = "dhall"; - version = "1.13.0"; - sha256 = "1fn3yi2zv2l88jjapk0zhij247cy4yh0w07icyr41g341wx7gfv4"; + version = "1.13.1"; + sha256 = "1mjhxkdpw7blcdci6cmm3x2c9ascp7djc8c77dblfpzyqa3sqxf0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -61927,19 +62073,86 @@ self: { }) {}; "di" = callPackage - ({ mkDerivation, base, bytestring, QuickCheck, stm, tasty - , tasty-hunit, tasty-quickcheck, time, transformers + ({ mkDerivation, base, df1, di-core, di-df1, di-handle, di-monad + , exceptions }: mkDerivation { pname = "di"; - version = "0.2"; - sha256 = "1vmhd8zph5ai13n2cfrjaxcdifwqv7wiggqbfi5ifhancxwlfq7p"; - libraryHaskellDepends = [ base stm time transformers ]; + version = "1.0"; + sha256 = "1bsgq1x4xc1nhfx2wkzmhy3hfy11xkdic35x0lxdc282k2iw7f4i"; + libraryHaskellDepends = [ + base df1 di-core di-df1 di-handle di-monad exceptions + ]; + homepage = "https://github.com/k0001/di"; + description = "Typeful hierarchical structured logging using di, mtl and df1"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "di-core" = callPackage + ({ mkDerivation, base, containers, exceptions, QuickCheck, stm + , tasty, tasty-hunit, tasty-quickcheck, time + }: + mkDerivation { + pname = "di-core"; + version = "1.0"; + sha256 = "0slggv1c2q8amznf0j38x12v0f4lhg7z7mr0qaayj6v6pkpp5s6j"; + libraryHaskellDepends = [ base containers exceptions stm time ]; + testHaskellDepends = [ + base exceptions QuickCheck stm tasty tasty-hunit tasty-quickcheck + time + ]; + homepage = "https://github.com/k0001/di"; + description = "Typeful hierarchical structured logging without monad towers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "di-df1" = callPackage + ({ mkDerivation, base, bytestring, df1, di-core, di-handle + , di-monad, QuickCheck, stm, tasty, tasty-quickcheck, text, time + }: + mkDerivation { + pname = "di-df1"; + version = "1.0"; + sha256 = "07lz6vb4dxa6j3xxlwxv23gps5xv4rimz571h2n95hhldx8n9jnp"; + libraryHaskellDepends = [ + base df1 di-core di-handle di-monad stm + ]; testHaskellDepends = [ - base bytestring QuickCheck stm tasty tasty-hunit tasty-quickcheck + base bytestring df1 di-core QuickCheck tasty tasty-quickcheck text + time ]; homepage = "https://github.com/k0001/di"; - description = "Easy, powerful, structured and typeful logging without monad towers"; + description = "Write logs in the df1 format using the di logging framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "di-handle" = callPackage + ({ mkDerivation, base, bytestring, di-core, exceptions, unix }: + mkDerivation { + pname = "di-handle"; + version = "1.0"; + sha256 = "1v4jn1dvvfa6nbqx34hhjg47lbjafkmdps8aalq3n5sah99iy26d"; + libraryHaskellDepends = [ + base bytestring di-core exceptions unix + ]; + homepage = "https://github.com/k0001/di"; + description = "IO support for file handles in di-core"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "di-monad" = callPackage + ({ mkDerivation, base, containers, di-core, exceptions, mtl, pipes + , stm, transformers + }: + mkDerivation { + pname = "di-monad"; + version = "1.0"; + sha256 = "1kb2dx4whbl0lp0yb5y7m66ma0qywprzy5zs3msxiqfdbc3ghqvx"; + libraryHaskellDepends = [ + base containers di-core exceptions mtl pipes stm transformers + ]; + homepage = "https://github.com/k0001/di"; + description = "mtl flavoured typeful hierarchical structured logging for di-core"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -63467,6 +63680,8 @@ self: { pname = "directory"; version = "1.3.2.2"; sha256 = "0m4dhcz7d1y0y08hn8ny378ly67gqbx676srgardq6800w2iqhzj"; + revision = "1"; + editedCabalFile = "1qdpglb2xzgcm1yja9d9hvw75cg85wai292f7rb6h0hsjnhrans3"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -68137,8 +68352,8 @@ self: { pname = "ekg"; version = "0.4.0.15"; sha256 = "1k3d5kiqm034qs04k0pcisf4zbdmx2fcgl9a6c1lzzjw96zf6aj8"; - revision = "1"; - editedCabalFile = "05995gywwysmfhrvalvqnkvw7gh6z85jrb91a1knnvi0jwq4c6m3"; + revision = "2"; + editedCabalFile = "0dn8xysffy7pgz88h4h6lpjpl5n978dm3yxlzyxbk2k1byhzzx7d"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring ekg-core ekg-json filepath network snap-core @@ -68379,6 +68594,8 @@ self: { pname = "ekg-statsd"; version = "0.2.3.0"; sha256 = "05lakyb0sp6g8nziy6jzk2l19v2371cdnih6pp6myyj6iflx9smf"; + revision = "1"; + editedCabalFile = "1k4sndkjg1prvzhiii9gcgkx8zfkk9c4nf548x0hrbmj1laj8d62"; libraryHaskellDepends = [ base bytestring ekg-core network text time unordered-containers ]; @@ -71281,8 +71498,8 @@ self: { }: mkDerivation { pname = "eventloop"; - version = "0.8.2.6"; - sha256 = "1f3dmkrxjfj128pdkarrc6mka09jmh360bn6vgbp4qm2xv5hl16s"; + version = "0.8.2.7"; + sha256 = "0rqgb224v9zy2kkchk2v3zwpdwh805ff03j5y5vswmc0l52bkw7w"; libraryHaskellDepends = [ aeson base bytestring concurrent-utilities deepseq network stm suspend text timers websockets @@ -71672,6 +71889,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "exception-transformers_0_4_0_7" = callPackage + ({ mkDerivation, base, HUnit, stm, test-framework + , test-framework-hunit, transformers, transformers-compat + }: + mkDerivation { + pname = "exception-transformers"; + version = "0.4.0.7"; + sha256 = "1vzjy6mz6y9jacpwq2bax86nwzq9mk4b9y3r3r98l50r7pmn2nwj"; + libraryHaskellDepends = [ + base stm transformers transformers-compat + ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit transformers + transformers-compat + ]; + description = "Type classes and monads for unchecked extensible exceptions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "exceptional" = callPackage ({ mkDerivation, base, exceptions }: mkDerivation { @@ -72152,6 +72389,7 @@ self: { homepage = "https://github.com/metrix-ai/expiring-containers"; description = "Expiring containers"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "expiring-mvar" = callPackage @@ -72355,6 +72593,7 @@ self: { ]; description = "Encode and Decode expressions from Z3 ASTs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extcore" = callPackage @@ -79627,6 +79866,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "fuzzy-dates" = callPackage + ({ mkDerivation, base, hourglass, hspec, lens, parsec }: + mkDerivation { + pname = "fuzzy-dates"; + version = "0.1.1.1"; + sha256 = "1hanmwzr1g11am4z3r9wrkzfycvk76a03cg9bqpifidv7y9hcd73"; + libraryHaskellDepends = [ base hourglass hspec lens parsec ]; + testHaskellDepends = [ base hourglass hspec lens parsec ]; + homepage = "https://github.com/ReedOei/fuzzy-dates#readme"; + description = "Libary for parsing dates in strings in varied formats"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fuzzy-timings" = callPackage ({ mkDerivation, base, containers, glpk-hs, HUnit, mtl, QuickCheck , random, test-framework, test-framework-hunit @@ -81456,14 +81708,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-hspec_0_6_0_1" = callPackage + "genvalidity-hspec_0_6_0_2" = callPackage ({ mkDerivation, base, doctest, genvalidity, genvalidity-property , hspec, hspec-core, QuickCheck, validity }: mkDerivation { pname = "genvalidity-hspec"; - version = "0.6.0.1"; - sha256 = "18srjw0c8li10nbnxwbnhrggkl9nhdfjy02jpxd6hpij345y3j47"; + version = "0.6.0.2"; + sha256 = "0l14vn5hddkvyzhch8l9abwh3naya27p9f6lz918zd8i5l5pd32n"; libraryHaskellDepends = [ base genvalidity genvalidity-property hspec hspec-core QuickCheck validity @@ -81695,14 +81947,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "genvalidity-property_0_2_0_0" = callPackage + "genvalidity-property_0_2_0_1" = callPackage ({ mkDerivation, base, directory, doctest, filepath, genvalidity , hspec, QuickCheck, validity }: mkDerivation { pname = "genvalidity-property"; - version = "0.2.0.0"; - sha256 = "10przvvqrmjyr9cmbna79kj15wjhi0r4j64qn5824gslyy7g39pa"; + version = "0.2.0.1"; + sha256 = "02ypm53llfdrqasji79bng3ybkjs8ak7klcrhkg15k6jgk0ca877"; libraryHaskellDepends = [ base genvalidity hspec QuickCheck validity ]; @@ -81851,15 +82103,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-unordered-containers_0_2_0_0" = callPackage + "genvalidity-unordered-containers_0_2_0_2" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable , hspec, QuickCheck, unordered-containers, validity , validity-unordered-containers }: mkDerivation { pname = "genvalidity-unordered-containers"; - version = "0.2.0.0"; - sha256 = "1kfn6g3h33g215qy0iffhr35vd2np9nsf6634fjk40mbz1san0m8"; + version = "0.2.0.2"; + sha256 = "0sjs06qf0pk6xvgc38qayzfqk6wm1qgpx3yzglpkhdy809gl5pfa"; libraryHaskellDepends = [ base genvalidity hashable QuickCheck unordered-containers validity validity-unordered-containers @@ -81893,14 +82145,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-uuid_0_1_0_0" = callPackage + "genvalidity-uuid_0_1_0_1" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, uuid, validity, validity-uuid }: mkDerivation { pname = "genvalidity-uuid"; - version = "0.1.0.0"; - sha256 = "1j4q3smhz812cfgsv6vmjgng068knd9v7xg0hkvx868wbndgk37h"; + version = "0.1.0.1"; + sha256 = "1ssihh980iz9kx2apygbw0r5qdb40hnvjkpsn2qw55r8d5hc4sa6"; libraryHaskellDepends = [ base genvalidity QuickCheck uuid validity validity-uuid ]; @@ -81933,14 +82185,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-vector_0_2_0_0" = callPackage + "genvalidity-vector_0_2_0_1" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, validity, validity-vector, vector }: mkDerivation { pname = "genvalidity-vector"; - version = "0.2.0.0"; - sha256 = "0ww3hzkzhblx8qp062vz74vwaqvv38l0sl0dwyxrqra68qglxr4f"; + version = "0.2.0.1"; + sha256 = "1xinffnzcaws7i6k0l3x89g6kzkg1vhiwkngh5ag69wvpzq3if7n"; libraryHaskellDepends = [ base genvalidity QuickCheck validity validity-vector vector ]; @@ -83928,8 +84180,8 @@ self: { }) {inherit (pkgs) gdk_pixbuf;}; "gi-gdkx11" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gdk-x11 - , gi-gdk, gi-gio, gi-gobject, gi-xlib, haskell-gi, haskell-gi-base + ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdk + , gi-gio, gi-gobject, gi-xlib, gtk3, haskell-gi, haskell-gi-base , haskell-gi-overloading, text, transformers }: mkDerivation { @@ -83941,13 +84193,13 @@ self: { base bytestring containers gi-gdk gi-gio gi-gobject gi-xlib haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ gdk-x11 ]; + libraryPkgconfigDepends = [ gtk3 ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GdkX11 bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {gdk-x11 = null;}; + }) {gtk3 = pkgs.gnome3.gtk;}; "gi-ggit" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio @@ -83994,18 +84246,18 @@ self: { }) {inherit (pkgs) glib;}; "gi-girepository" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-gobject - , gobjectIntrospection, haskell-gi, haskell-gi-base + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, gobjectIntrospection, haskell-gi, haskell-gi-base , haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-girepository"; - version = "1.0.15"; - sha256 = "1g9bvf850zsbqi4dw8i1nbclqwi599zvwny4fsl0hp8lqb9w7ps6"; + version = "1.0.16"; + sha256 = "1kb7vyqks6br8z2bjp9wzj0dvh76s35dbx93iijgl138270ikww6"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ - base bytestring containers gi-gobject haskell-gi haskell-gi-base - haskell-gi-overloading text transformers + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gobjectIntrospection ]; doHaddock = false; @@ -84178,8 +84430,8 @@ self: { }: mkDerivation { pname = "gi-gstvideo"; - version = "1.0.15"; - sha256 = "1k35x6cc1kiyhwq978dlckib2sfz7k3w2gxfqsha591a0661k10d"; + version = "1.0.16"; + sha256 = "0g6z15di4lk3l6hxpl6yqffw23kya3r2khxs4ah6vmkdn42wcalw"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase @@ -84522,8 +84774,8 @@ self: { }: mkDerivation { pname = "gi-webkit2"; - version = "4.0.18"; - sha256 = "0qxqsg9p2380z6cyvky8g0a90v1zyf90ff9mmislnzm89fmc8013"; + version = "4.0.19"; + sha256 = "1hnxp1vk2qhi7shr4qd7khi2nq0vpn58f1g6j7dkl0h23266fwz2"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib @@ -84546,8 +84798,8 @@ self: { }: mkDerivation { pname = "gi-webkit2webextension"; - version = "4.0.16"; - sha256 = "010svwg3p3sdd209l8cnwhsm2dp9n6qf0shzqjdx5l1pkjv32zqm"; + version = "4.0.17"; + sha256 = "0lpz5a9395bqfmxbhfjfbqi4832a68ybbr1y0c475r8ya6pnx4cq"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-gobject gi-gtk @@ -85481,6 +85733,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "github-webhooks_0_10_0" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , cryptonite, deepseq, deepseq-generics, hspec, memory, text, time + , vector + }: + mkDerivation { + pname = "github-webhooks"; + version = "0.10.0"; + sha256 = "1pvif863yi6qxwjd43insjvrzizaz78b3kf8l13rmy3irjlqljh8"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring cryptonite deepseq + deepseq-generics memory text time vector + ]; + testHaskellDepends = [ aeson base bytestring hspec text vector ]; + homepage = "https://github.com/onrock-eng/github-webhooks#readme"; + description = "Aeson instances for GitHub Webhook payloads"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "githud" = callPackage ({ mkDerivation, base, mtl, parsec, process, tasty, tasty-hunit , tasty-quickcheck, tasty-smallcheck, text, unix @@ -89074,6 +89346,7 @@ self: { homepage = "https://github.com/Teaspot-Studio/gore-and-ash-glfw"; description = "Core module for Gore&Ash engine for GLFW input events"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gore-and-ash-lambdacube" = callPackage @@ -90526,6 +90799,7 @@ self: { homepage = "https://github.com/alonsodomin/groot#readme"; description = "Command line utility to manage AWS ECS resources"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gross" = callPackage @@ -91135,20 +91409,22 @@ self: { "gtk-sni-tray" = callPackage ({ mkDerivation, base, bytestring, containers, dbus, directory - , gi-dbusmenugtk3, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gtk, gtk-strut - , gtk3, haskell-gi, haskell-gi-base, hslogger, optparse-applicative + , enclosed-exceptions, filepath, gi-dbusmenugtk3, gi-gdk + , gi-gdkpixbuf, gi-glib, gi-gtk, gtk-strut, gtk3, haskell-gi + , haskell-gi-base, hslogger, optparse-applicative , status-notifier-item, text, transformers, unix }: mkDerivation { pname = "gtk-sni-tray"; - version = "0.1.1.0"; - sha256 = "16wif6b94ipw49810jyjgl6h8mhx7bkz0pkl8ri6ir9ljp0mnvp0"; + version = "0.1.2.0"; + sha256 = "1imgna34fdsg2fwlxk5xb0dvw8sbqjk7qgvh1p3wc8q9yx8zl0qm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring containers dbus directory gi-dbusmenugtk3 gi-gdk - gi-gdkpixbuf gi-glib gi-gtk gtk-strut haskell-gi haskell-gi-base - hslogger status-notifier-item text transformers unix + base bytestring containers dbus directory enclosed-exceptions + filepath gi-dbusmenugtk3 gi-gdk gi-gdkpixbuf gi-glib gi-gtk + gtk-strut haskell-gi haskell-gi-base hslogger status-notifier-item + text transformers unix ]; libraryPkgconfigDepends = [ gtk3 ]; executableHaskellDepends = [ @@ -91158,6 +91434,7 @@ self: { homepage = "https://github.com/IvanMalison/gtk-sni-tray#readme"; description = "A standalone StatusNotifierItem/AppIndicator tray"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {gtk3 = pkgs.gnome3.gtk;}; "gtk-strut" = callPackage @@ -91627,20 +91904,23 @@ self: { }) {}; "h-gpgme" = callPackage - ({ mkDerivation, base, bindings-gpgme, bytestring, either, HUnit - , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, time + ({ mkDerivation, base, bindings-gpgme, bytestring, data-default + , directory, email-validate, exceptions, filepath, HUnit + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, temporary, time , transformers, unix }: mkDerivation { pname = "h-gpgme"; - version = "0.4.0.0"; - sha256 = "0v85bz57jn265v5pnr0xjw838qmiy7v6vinvvd6m7pj5zls5hx9m"; + version = "0.5.0.0"; + sha256 = "0fvkj7cz7nfz52a2zccngb8gbs8p94whvgccvnxpwmkg90m45mfp"; libraryHaskellDepends = [ - base bindings-gpgme bytestring either time unix + base bindings-gpgme bytestring data-default email-validate time + transformers unix ]; testHaskellDepends = [ - base bindings-gpgme bytestring either HUnit QuickCheck tasty - tasty-hunit tasty-quickcheck time transformers unix + base bindings-gpgme bytestring data-default directory + email-validate exceptions filepath HUnit QuickCheck tasty + tasty-hunit tasty-quickcheck temporary time transformers unix ]; homepage = "https://github.com/rethab/h-gpgme"; description = "High Level Binding for GnuPG Made Easy (gpgme)"; @@ -97440,7 +97720,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "haskell-lsp_0_2_1_0" = callPackage + "haskell-lsp_0_2_2_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default , directory, filepath, hashable, haskell-lsp-types, hslogger, hspec , lens, mtl, network-uri, parsec, sorted-list, stm, text, time @@ -97448,8 +97728,8 @@ self: { }: mkDerivation { pname = "haskell-lsp"; - version = "0.2.1.0"; - sha256 = "09wv2ic66lc03pndpx4xsmmv3zxwram5i82483j340avm2rp06c0"; + version = "0.2.2.0"; + sha256 = "1h3ibwd0i0z2c35fxw0m0gyd6dj45pf17x9hc5cgf3sql4qr5yxd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -97499,8 +97779,8 @@ self: { }: mkDerivation { pname = "haskell-lsp-types"; - version = "0.2.1.0"; - sha256 = "0byslqf8qw7rc1kva3inm8bsm9z12h19y3b3yzgwz1hlkshjl2d0"; + version = "0.2.2.0"; + sha256 = "0wchy8qrd450s90j6d26psznrd3n245lvn01qxa42l5akljmlymx"; libraryHaskellDepends = [ aeson base bytestring data-default filepath hashable lens network-uri text unordered-containers @@ -104823,6 +105103,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hint_0_8_0" = callPackage + ({ mkDerivation, base, directory, exceptions, extensible-exceptions + , filepath, ghc, ghc-boot, ghc-paths, HUnit, mtl, random, unix + }: + mkDerivation { + pname = "hint"; + version = "0.8.0"; + sha256 = "0h8wan0hb16m1gcil1csaay9f9f1pq3kfgbzfsfpjszmr1i2sw1f"; + libraryHaskellDepends = [ + base directory exceptions filepath ghc ghc-boot ghc-paths mtl + random unix + ]; + testHaskellDepends = [ + base directory exceptions extensible-exceptions filepath HUnit unix + ]; + homepage = "https://github.com/mvdan/hint"; + description = "Runtime Haskell interpreter (GHC API wrapper)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hint-server" = callPackage ({ mkDerivation, base, eprocess, exceptions, hint, monad-loops, mtl }: @@ -104839,6 +105140,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hinter" = callPackage + ({ mkDerivation, base, directory, exceptions, extensible-exceptions + , filepath, ghc, ghc-boot, ghc-paths, HUnit, mtl, random, unix + }: + mkDerivation { + pname = "hinter"; + version = "0.1.0.0"; + sha256 = "0r790y7j64y79rqg7ip4dk5a8pbpryisp008lcmswzc0si35jfgl"; + libraryHaskellDepends = [ + base directory exceptions filepath ghc ghc-boot ghc-paths mtl + random unix + ]; + testHaskellDepends = [ + base directory exceptions extensible-exceptions filepath HUnit unix + ]; + homepage = "https://github.com/strake/hint.hs"; + description = "Runtime Haskell interpreter (GHC API wrapper)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hinterface" = callPackage ({ mkDerivation, array, async, base, binary, bytestring, containers , cryptonite, exceptions, hspec, lifted-async, lifted-base, memory @@ -105708,7 +106029,7 @@ self: { homepage = "https://github.com/gebner/hledger-diff"; description = "Compares the transactions in two ledger files"; license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ gebner ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-iadd" = callPackage @@ -106002,8 +106323,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "2.1.4"; - sha256 = "01qgnljgsd331zx9df2diijnfvy78p1j6ysqqq317v66yxpz6vlh"; + version = "2.1.5"; + sha256 = "00kib9b80s0bhdv267dgybl68knmzzmq7n0maygzc0kxc9k1bwj1"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -106260,6 +106581,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hmatrix-backprop_0_1_2_1" = callPackage + ({ mkDerivation, backprop, base, finite-typelits + , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog + , hmatrix, hmatrix-vector-sized, microlens, microlens-platform + , vector, vector-sized + }: + mkDerivation { + pname = "hmatrix-backprop"; + version = "0.1.2.1"; + sha256 = "0qcm2hkdh50xgvxhs6nr303h0gs1x9apiklgnk8xjzgibsy8vb1n"; + libraryHaskellDepends = [ + backprop base finite-typelits ghc-typelits-knownnat + ghc-typelits-natnormalise hmatrix hmatrix-vector-sized microlens + vector vector-sized + ]; + testHaskellDepends = [ + backprop base finite-typelits hedgehog hmatrix hmatrix-vector-sized + microlens microlens-platform vector-sized + ]; + homepage = "https://github.com/mstksg/hmatrix-backprop#readme"; + description = "hmatrix operations lifted for backprop"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hmatrix-banded" = callPackage ({ mkDerivation, base, hmatrix, liblapack, transformers }: mkDerivation { @@ -106450,6 +106796,7 @@ self: { homepage = "https://github.com/albertoruiz/hmatrix"; description = "Sparse linear solver"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {mkl_core = null; mkl_intel = null; mkl_sequential = null;}; "hmatrix-special" = callPackage @@ -106515,6 +106862,7 @@ self: { homepage = "https://github.com/idontgetoutmuch/hmatrix/tree/sundials"; description = "hmatrix interface to sundials"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {sundials_arkode = null;}; "hmatrix-svdlibc" = callPackage @@ -109203,6 +109551,7 @@ self: { homepage = "https://github.com/k-bx/protocol-buffers"; description = "Parse Google Protocol Buffer specifications"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hprotoc-fork" = callPackage @@ -109352,8 +109701,8 @@ self: { pname = "hquantlib"; version = "0.0.4.0"; sha256 = "0x24qkbpclir0ik52hyxw3ahnqk1nqscxpx1ahnxs4w1bv7bkcmp"; - revision = "1"; - editedCabalFile = "02wp531cckdgj11sjamyafnij0cri7svrg4ddbvak9yki0xpm286"; + revision = "2"; + editedCabalFile = "1wx32kkv1as3rras5b1y3v77abx0sqsam6ssa5s7vm83pncx38y4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115230,6 +115579,40 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-streams_0_8_6_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base + , base64-bytestring, blaze-builder, bytestring, Cabal + , case-insensitive, directory, ghc-prim, HsOpenSSL, hspec + , hspec-expectations, http-common, HUnit, io-streams, lifted-base + , mtl, network, network-uri, openssl-streams, snap-core + , snap-server, system-fileio, system-filepath, text, transformers + , unordered-containers + }: + mkDerivation { + pname = "http-streams"; + version = "0.8.6.1"; + sha256 = "18vxd35n7s3z4gjvad94bknc8z1w9d7ccgphnhsxlz5cackizmxq"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-builder bytestring + case-insensitive directory HsOpenSSL http-common io-streams mtl + network network-uri openssl-streams text transformers + unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-pretty attoparsec base base64-bytestring blaze-builder + bytestring case-insensitive directory ghc-prim HsOpenSSL hspec + hspec-expectations http-common HUnit io-streams lifted-base mtl + network network-uri openssl-streams snap-core snap-server + system-fileio system-filepath text transformers + unordered-containers + ]; + homepage = "https://github.com/afcowie/http-streams/"; + description = "An HTTP client using io-streams"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-test" = callPackage ({ mkDerivation, aeson, base, bytestring, http-client, lens , lens-aeson, mtl, tasty, tasty-hunit, text, time, wreq @@ -116569,7 +116952,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-rankselect_0_12_0_0" = callPackage + "hw-rankselect_0_12_0_1" = callPackage ({ mkDerivation, base, bytestring, conduit, criterion, deepseq , directory, hedgehog, hspec, hw-balancedparens, hw-bits , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, lens @@ -116577,8 +116960,8 @@ self: { }: mkDerivation { pname = "hw-rankselect"; - version = "0.12.0.0"; - sha256 = "1yp9fmxk55ikhrrpkff4r1sgqadg4b0yfz2w1xardxb3n09n4xpa"; + version = "0.12.0.1"; + sha256 = "0jg27cpdw341gr1mjnqm5rq66q84q1rzwa5bp8czzws71m5kpfpy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120924,18 +121307,24 @@ self: { }) {}; "int-multimap" = callPackage - ({ mkDerivation, base, containers, hashable, unordered-containers + ({ mkDerivation, base, containers, hashable, tasty, tasty-hunit + , tasty-quickcheck, unordered-containers }: mkDerivation { pname = "int-multimap"; - version = "0.2"; - sha256 = "17hwqly7v5224fddan9nkywv4pp478nby7iswaj32x27qwn9p11f"; + version = "0.2.1"; + sha256 = "080ypcd99pvw0wsrydz6hzd9hrr18v4kcb3wihz6v8ylfn08d6ci"; libraryHaskellDepends = [ base containers hashable unordered-containers ]; + testHaskellDepends = [ + base containers hashable tasty tasty-hunit tasty-quickcheck + unordered-containers + ]; homepage = "https://github.com/metrix-ai/int-multimap"; description = "A data structure that associates each Int key with a set of values"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "integer-gmp_1_0_2_0" = callPackage @@ -126400,24 +126789,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "katydid_0_2_0_1" = callPackage - ({ mkDerivation, base, containers, criterion, deepseq, directory - , filepath, HUnit, hxt, json, mtl, parsec, regex-tdfa, tasty - , tasty-hunit, text + "katydid_0_3_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , directory, either, extra, filepath, HUnit, hxt, ilist, json, mtl + , parsec, primes, regex-tdfa, tasty, tasty-hunit, text }: mkDerivation { pname = "katydid"; - version = "0.2.0.1"; - sha256 = "1m3rclgrjc7f1rirn39w55rw4vlr769kvm0byw53kg2ib95l2nlg"; + version = "0.3.0.0"; + sha256 = "1r95yxhrsw0ghv55xlq987yzhly69ihiy4bz6k3k41mfj8d7kj8v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers deepseq hxt json mtl parsec regex-tdfa + base bytestring containers deepseq either extra hxt ilist json mtl + parsec regex-tdfa text ]; executableHaskellDepends = [ base mtl ]; testHaskellDepends = [ - base containers directory filepath HUnit hxt json mtl parsec tasty - tasty-hunit + base containers directory filepath HUnit hxt ilist json mtl parsec + primes tasty tasty-hunit text ]; benchmarkHaskellDepends = [ base criterion deepseq directory filepath hxt mtl text @@ -126520,6 +126910,7 @@ self: { homepage = "http://github.com/asakamirai/kazura-queue"; description = "Fast concurrent queues much inspired by unagi-chan"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kbq-gu" = callPackage @@ -131248,12 +131639,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "lens-labels_0_2_0_0" = callPackage + "lens-labels_0_2_0_1" = callPackage ({ mkDerivation, base, ghc-prim, profunctors, tagged }: mkDerivation { pname = "lens-labels"; - version = "0.2.0.0"; - sha256 = "137axpd2j7q4k34mav0338spk985ksh760nfv3vsm59aq9ab76xf"; + version = "0.2.0.1"; + sha256 = "1nn0qp0xl65wc5axy68jlmif1k97af8v5r09sf02fw3iww7ym7wj"; libraryHaskellDepends = [ base ghc-prim profunctors tagged ]; homepage = "https://github.com/google/proto-lens#readme"; description = "Integration of lenses with OverloadedLabels"; @@ -132637,6 +133028,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lift-read-show" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "lift-read-show"; + version = "0.1.0.0"; + sha256 = "0sp725nflvqzxvhycjj1v9j46y4cx1vvbr9k6pfwz585n35gs1a0"; + libraryHaskellDepends = [ base ]; + description = "Helper methods to define `Read1`, `Read2`, `Show1`, `Show2` instances"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lifted-async" = callPackage ({ mkDerivation, async, base, constraints, criterion, deepseq , HUnit, lifted-base, monad-control, mtl, tasty, tasty-hunit @@ -134599,7 +135001,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {llvm-config = null;}; - "llvm-hs_6_0_0" = callPackage + "llvm-hs_6_1_1" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, Cabal , containers, exceptions, llvm-config, llvm-hs-pure, mtl , pretty-show, QuickCheck, tasty, tasty-hunit, tasty-quickcheck @@ -134607,10 +135009,8 @@ self: { }: mkDerivation { pname = "llvm-hs"; - version = "6.0.0"; - sha256 = "1hll3s40bbrzyylyfnh0w907cpkbxx6qn3a6wv7kfi107zfx2rgd"; - revision = "1"; - editedCabalFile = "1apyscxr48g37qw15wmqb98si8gcnx8cky6bj68ai3jfjfphbjly"; + version = "6.1.1"; + sha256 = "0vlp1rgddgavs4kg0s1qmny6mlx4rpz12ybcrqg6vmv68w1qyr5r"; setupHaskellDepends = [ base Cabal containers ]; libraryHaskellDepends = [ array attoparsec base bytestring containers exceptions llvm-hs-pure @@ -134629,22 +135029,22 @@ self: { "llvm-hs-pretty" = callPackage ({ mkDerivation, array, base, bytestring, directory, filepath - , llvm-hs, llvm-hs-pure, mtl, pretty-show, tasty, tasty-golden - , tasty-hspec, tasty-hunit, text, transformers, wl-pprint-text + , llvm-hs, llvm-hs-pure, mtl, tasty, tasty-golden, tasty-hspec + , tasty-hunit, text, transformers, wl-pprint-text }: mkDerivation { pname = "llvm-hs-pretty"; - version = "0.2.0.0"; - sha256 = "133kyksbp88q0wavp3wdjg69h9fpwi7nq626nvikdy46cf7lgklh"; + version = "0.2.1.0"; + sha256 = "1v8nz7c7wvvh29c48li10m12lj8y3yn5b8rs1b86y351s11vsag6"; libraryHaskellDepends = [ array base bytestring llvm-hs-pure text wl-pprint-text ]; testHaskellDepends = [ - base directory filepath llvm-hs llvm-hs-pure mtl pretty-show tasty - tasty-golden tasty-hspec tasty-hunit text transformers + base directory filepath llvm-hs llvm-hs-pure mtl tasty tasty-golden + tasty-hspec tasty-hunit text transformers ]; homepage = "https://github.com/llvm-hs/llvm-hs-pretty"; - description = "Pretty printer for LLVM IR"; + description = "A pretty printer for LLVM IR"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -134671,24 +135071,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "llvm-hs-pure_6_0_0" = callPackage + "llvm-hs-pure_6_1_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, fail - , hspec, mtl, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, text, transformers, unordered-containers + , mtl, tasty, tasty-hunit, tasty-quickcheck, template-haskell + , transformers, unordered-containers }: mkDerivation { pname = "llvm-hs-pure"; - version = "6.0.0"; - sha256 = "005414p1jv5nyf3awiybksc1paf092a9070x23l2y6fvd9jhy0sl"; - revision = "1"; - editedCabalFile = "05idczj2c9iv3kb7fyfhc0ypfsmcjkf9n46w24ivarjbs8fykrb3"; + version = "6.1.0"; + sha256 = "12fivm5w4nz306p7w0bxsmgb2cnbkp06dyrdfi64vrsgm9kgbqmw"; libraryHaskellDepends = [ attoparsec base bytestring containers fail mtl template-haskell transformers unordered-containers ]; testHaskellDepends = [ - base bytestring containers hspec mtl tasty tasty-hunit - tasty-quickcheck text transformers unordered-containers + base containers mtl tasty tasty-hunit tasty-quickcheck transformers ]; homepage = "http://github.com/llvm-hs/llvm-hs/"; description = "Pure Haskell LLVM functionality (no FFI)"; @@ -135090,19 +135487,16 @@ self: { }) {}; "locators" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, cryptohash - , hspec, hspec-expectations, HUnit, QuickCheck + ({ mkDerivation, base, bytestring, containers, cryptohash, hspec + , HUnit, QuickCheck }: mkDerivation { pname = "locators"; - version = "0.2.4.3"; - sha256 = "0wcp56hy8zs7sngspzywyq4j39y0pji0xwqj7x1i26rg77wi7xw4"; - libraryHaskellDepends = [ - base bytestring cereal containers cryptohash - ]; + version = "0.2.4.4"; + sha256 = "19csw13qbxxv7lr3blx856k2y21sidgpnv56dq45la3f4100jv9d"; + libraryHaskellDepends = [ base bytestring containers cryptohash ]; testHaskellDepends = [ - base bytestring cereal containers cryptohash hspec - hspec-expectations HUnit QuickCheck + base bytestring containers cryptohash hspec HUnit QuickCheck ]; description = "Human exchangable identifiers and locators"; license = stdenv.lib.licenses.bsd3; @@ -139482,17 +139876,17 @@ self: { , brick, brick-skylighting, bytestring, cheapskate, checkers , config-ini, connection, containers, directory, filepath, gitrev , hashable, Hclip, mattermost-api, mattermost-api-qc - , microlens-platform, mtl, process, quickcheck-text, semigroups - , skylighting-core, stm, stm-delay, strict, string-conversions - , tasty, tasty-hunit, tasty-quickcheck, temporary, text - , text-zipper, time, timezone-olson, timezone-series, transformers - , Unique, unix, unordered-containers, utf8-string, vector, vty - , word-wrap, xdg-basedir + , microlens-platform, mtl, process, quickcheck-text, random + , semigroups, skylighting-core, stm, stm-delay, strict + , string-conversions, tasty, tasty-hunit, tasty-quickcheck + , temporary, text, text-zipper, time, timezone-olson + , timezone-series, transformers, Unique, unix, unordered-containers + , utf8-string, uuid, vector, vty, word-wrap, xdg-basedir }: mkDerivation { pname = "matterhorn"; - version = "40900.0.1"; - sha256 = "1ygnh27dv5hprb5fqqxwjxsf43ik784pwdagndn3sdiddy2k3yf7"; + version = "40901.0.0"; + sha256 = "1ra1ikivf5y17mzwjvfsvg1kz4438wllv2qwxzaigb9cirrz0n4r"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -139500,9 +139894,9 @@ self: { aeson aspell-pipe async base base-compat brick brick-skylighting bytestring cheapskate config-ini connection containers directory filepath gitrev hashable Hclip mattermost-api microlens-platform - mtl process semigroups skylighting-core stm stm-delay strict + mtl process random semigroups skylighting-core stm stm-delay strict temporary text text-zipper time timezone-olson timezone-series - transformers unix unordered-containers utf8-string vector vty + transformers unix unordered-containers utf8-string uuid vector vty word-wrap xdg-basedir ]; testHaskellDepends = [ @@ -139511,8 +139905,8 @@ self: { mattermost-api mattermost-api-qc microlens-platform mtl process quickcheck-text semigroups stm strict string-conversions tasty tasty-hunit tasty-quickcheck text text-zipper time timezone-olson - timezone-series transformers Unique unordered-containers vector vty - xdg-basedir + timezone-series transformers Unique unordered-containers uuid + vector vty xdg-basedir ]; description = "Terminal client for the Mattermost chat system"; license = stdenv.lib.licenses.bsd3; @@ -139648,6 +140042,7 @@ self: { homepage = "https://github.com/george-steel/maxent-learner"; description = "GUI for maxent-learner-hw"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "maximal-cliques" = callPackage @@ -141195,6 +141590,7 @@ self: { ]; description = "A tiny JSON library with light dependency footprint"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microbench" = callPackage @@ -143298,8 +143694,8 @@ self: { }: mkDerivation { pname = "monad-classes"; - version = "0.3.2.0"; - sha256 = "0r6wfl7xd870ml1mysznih1yly9rnj869cpr30fjwy9dsybkbfwr"; + version = "0.3.2.1"; + sha256 = "0vclcwxy0qc9y1i3iw0ysymcvikn12mi5lfbarxykdhygmi1w5m5"; libraryHaskellDepends = [ base ghc-prim mmorph monad-control peano reflection transformers transformers-base transformers-compat @@ -144118,6 +144514,8 @@ self: { pname = "monad-ste"; version = "0.1.0.0"; sha256 = "0yqkx7rlrfms7wiymb41y5nxh8fyi4049729iamwablx6hdpsrw6"; + revision = "1"; + editedCabalFile = "17xfha8zn0snlqwi8cr44my3d1zbyvhh83qlmb747dblhmj1rdi1"; libraryHaskellDepends = [ base exceptions ghc-prim primitive ]; testHaskellDepends = [ base hspec HUnit ]; homepage = "http://github.com/cartazio/monad-ste"; @@ -144696,6 +145094,38 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "mongoDB_2_4_0_0" = callPackage + ({ mkDerivation, array, base, base16-bytestring, base64-bytestring + , binary, bson, bytestring, conduit, conduit-extra, containers + , criterion, cryptohash, data-default-class, hashtables, hspec + , lifted-base, monad-control, mtl, network, nonce, old-locale + , parsec, pureMD5, random, random-shuffle, resourcet, stm, tagged + , text, time, tls, transformers, transformers-base + }: + mkDerivation { + pname = "mongoDB"; + version = "2.4.0.0"; + sha256 = "06g7mvazsymbyzm1zhsyfpbmhvlizidb4lp5l6axfw2wh90h5f7x"; + libraryHaskellDepends = [ + array base base16-bytestring base64-bytestring binary bson + bytestring conduit conduit-extra containers cryptohash + data-default-class hashtables lifted-base monad-control mtl network + nonce parsec pureMD5 random random-shuffle resourcet stm tagged + text time tls transformers transformers-base + ]; + testHaskellDepends = [ base hspec mtl old-locale text time ]; + benchmarkHaskellDepends = [ + array base base16-bytestring base64-bytestring binary bson + bytestring containers criterion cryptohash data-default-class + hashtables lifted-base monad-control mtl network nonce parsec + random random-shuffle stm text transformers-base + ]; + homepage = "https://github.com/mongodb-haskell/mongodb"; + description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mongodb-queue" = callPackage ({ mkDerivation, base, data-default, hspec, lifted-base , monad-control, mongoDB, network, text, transformers @@ -146615,6 +147045,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "multivector" = callPackage + ({ mkDerivation, base, smallcheck, tasty, tasty-smallcheck, Vector + , vector + }: + mkDerivation { + pname = "multivector"; + version = "0.1.0.0"; + sha256 = "183i59ri20fci2f2w4algmr8crz6q2aj1yirhgwjilkj3f4h6h4d"; + libraryHaskellDepends = [ base vector ]; + testHaskellDepends = [ + base smallcheck tasty tasty-smallcheck Vector + ]; + description = "Vectors of packed tuples"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {Vector = null;}; + "muon" = callPackage ({ mkDerivation, base, blaze-html, ConfigFile, directory, Glob , happstack-server, HStringTemplate, markdown, MissingH, process @@ -147340,6 +147788,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) mxnet;}; + "mxnet-dataiter" = callPackage + ({ mkDerivation, base, conduit, conduit-combinators, hspec, mxnet + , mxnet-nn, streaming, template-haskell + }: + mkDerivation { + pname = "mxnet-dataiter"; + version = "0.1.0.0"; + sha256 = "1cicxgasx0s840vvkc6n6v6rsrr8rk9jhpqh96kiy6dk0m4k02s9"; + libraryHaskellDepends = [ + base conduit conduit-combinators mxnet mxnet-nn streaming + template-haskell + ]; + testHaskellDepends = [ base hspec mxnet streaming ]; + homepage = "https://github.com/pierric/mxnet-dataiter#readme"; + description = "mxnet dataiters"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mxnet-examples" = callPackage ({ mkDerivation, base, mxnet }: mkDerivation { @@ -147359,16 +147826,17 @@ self: { ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring , exceptions, ghc-prim, lens, mmorph, mtl, mxnet, resourcet , streaming, streaming-bytestring, streaming-utils - , unordered-containers, vector + , transformers-base, unordered-containers, vector }: mkDerivation { pname = "mxnet-nn"; - version = "0.0.1.2"; - sha256 = "0w5ri77ccav65dza3a4aanzvylcwscs4rf4yqylc12w03xh0rshp"; + version = "0.0.1.3"; + sha256 = "0693ca7rwai4s8i8vqbmmq3q50pd23svcnnnd1cxjbqxh6hgsbs1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base lens mtl mxnet resourcet unordered-containers vector + base lens mtl mxnet resourcet transformers-base + unordered-containers vector ]; executableHaskellDepends = [ attoparsec attoparsec-binary base bytestring exceptions ghc-prim @@ -148860,8 +149328,8 @@ self: { }: mkDerivation { pname = "nest"; - version = "0.0.1"; - sha256 = "1ndd93z9yqa1slhb8wq3j5fr3rc2fna0cb5xqh9s3dynb966zqqk"; + version = "0.0.2"; + sha256 = "15q7c2ppw1ajnhglfawlc2a65k7d2cvcpav88y8kjqmp68hvgpic"; libraryHaskellDepends = [ base bytestring containers text transformers unix ]; @@ -156573,18 +157041,18 @@ self: { "pandoc-placetable" = callPackage ({ mkDerivation, aeson, base, bytestring, explicit-exception - , http-conduit, pandoc-types, spreadsheet, utf8-string + , http-conduit, pandoc-types, spreadsheet, text, utf8-string }: mkDerivation { pname = "pandoc-placetable"; - version = "0.4.2"; - sha256 = "0y8mz2jgnfzr8ib7w4bfwwdsljs3a2qpq3pxgvl2jwi7wdrcslai"; + version = "0.5"; + sha256 = "0kjlx2krgwf32y30cca09xnf1h3c91s0pzsv5xf7l8zw85jikxah"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ aeson base bytestring explicit-exception http-conduit pandoc-types - spreadsheet utf8-string + spreadsheet text utf8-string ]; homepage = "https://github.com/mb21/pandoc-placetable"; description = "Pandoc filter to include CSV files"; @@ -156786,6 +157254,7 @@ self: { homepage = "https://github.com/tuura/pangraph#readme"; description = "A set of parsers for graph languages"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "panhandle" = callPackage @@ -158362,8 +158831,8 @@ self: { }: mkDerivation { pname = "patat"; - version = "0.6.1.1"; - sha256 = "153d2ij27jjsh0h014d1v3y06diri1njbmwzvq2kgwdbdqgkhf0y"; + version = "0.7.0.0"; + sha256 = "0w7k1s8nma0bp4cvacmpa3fxxslarcijpxvbvasjyik3inazqhsd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -160954,6 +161423,7 @@ self: { testHaskellDepends = [ base hspec ]; description = "Deprecated - ghci debug viewer with simple editor"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "phoityne-vscode" = callPackage @@ -161177,6 +161647,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pi-hoole" = callPackage + ({ mkDerivation, aeson, base, base58-bytestring, blaze-html + , bytestring, containers, directory, filepath, http-types + , megaparsec, optparse-generic, process, regex-pcre, shakespeare + , text, unix, wai, warp, yaml + }: + mkDerivation { + pname = "pi-hoole"; + version = "0.2.0.0"; + sha256 = "0qjs8b7ljybvklx9s5xmb9kg2mxlaqfwjf7d52c31y3f21d5q8q0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base containers directory filepath megaparsec process text + ]; + executableHaskellDepends = [ + aeson base base58-bytestring blaze-html bytestring containers + directory filepath http-types megaparsec optparse-generic + regex-pcre shakespeare text unix wai warp yaml + ]; + testHaskellDepends = [ base ]; + description = "Lightweight access control solution for the pijul vcs"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "pi-lcd" = callPackage ({ mkDerivation, base, bytestring, clock, deepseq, text, unix , unordered-containers @@ -161396,6 +161891,7 @@ self: { homepage = "https://github.com/judah/pier#readme"; description = "Yet another Haskell build system"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "piet" = callPackage @@ -162159,6 +162655,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pipes-group_1_0_10" = callPackage + ({ mkDerivation, base, doctest, free, lens-family-core, pipes + , pipes-parse, transformers + }: + mkDerivation { + pname = "pipes-group"; + version = "1.0.10"; + sha256 = "1j37sj0i7lkmk228lchp5kkvf86fiwrkikwwrfibpb6xwixjmlr8"; + libraryHaskellDepends = [ + base free pipes pipes-parse transformers + ]; + testHaskellDepends = [ base doctest lens-family-core ]; + description = "Group streams into substreams"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-http" = callPackage ({ mkDerivation, base, bytestring, http-client, http-client-tls , pipes @@ -162981,8 +163494,8 @@ self: { }: mkDerivation { pname = "planb-token-introspection"; - version = "0.1.1.0"; - sha256 = "0b54sr1zvrczjxlx9xrb5zcy1kmybv396cigqvm652k9q16zifc5"; + version = "0.1.2.0"; + sha256 = "09b54m2m90g8ci6sxsgayvfxd9gmkwp2xw16gk1afxnha39lzwlq"; libraryHaskellDepends = [ aeson aeson-casing base bytestring containers http-client http-client-tls http-types mtl safe-exceptions text transformers @@ -163714,6 +164227,8 @@ self: { pname = "pointfree-fancy"; version = "1.1.1.7"; sha256 = "1xw2p96ghclfxmc12kwxyh25r5k9k6h3zriaf38wz5d3j36npa7w"; + revision = "1"; + editedCabalFile = "0mdanymbifnxc85z3aixmn5v08kxa1fjazadrhc0jjf5y110sxc2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165510,8 +166025,8 @@ self: { }: mkDerivation { pname = "potoki"; - version = "0.11.2"; - sha256 = "1c07q872d6k75cah1rfjw7wfam76fn8dc4x265v0xrngys6k9iwh"; + version = "0.11.3"; + sha256 = "134wy711qnkrwa9c78d7lv8vnc3b5a2dqyslzvs59xqx4csh61xj"; libraryHaskellDepends = [ attoparsec base base-prelude bytestring directory foldl hashable potoki-core profunctors ptr text transformers unagi-chan @@ -166331,6 +166846,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "preprocessor-tools_2_0_2" = callPackage + ({ mkDerivation, base, mtl, parsec, syb }: + mkDerivation { + pname = "preprocessor-tools"; + version = "2.0.2"; + sha256 = "0m825wnz7vs3as10glfzy7j0laf6j9w566isly95005gj2sb0lwp"; + libraryHaskellDepends = [ base mtl parsec syb ]; + homepage = "https://github.com/tov/preprocessor-tools-hs"; + description = "A framework for extending Haskell's syntax via quick-and-dirty preprocessors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "presburger" = callPackage ({ mkDerivation, base, containers, pretty, QuickCheck }: mkDerivation { @@ -166516,6 +167044,7 @@ self: { homepage = "https://github.com/NorfairKing/pretty-relative-time#readme"; description = "Pretty relative time"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pretty-show" = callPackage @@ -166798,6 +167327,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "prim-ref" = callPackage + ({ mkDerivation, base, ghc-prim, primitive, semigroups }: + mkDerivation { + pname = "prim-ref"; + version = "0.1"; + sha256 = "0fyjxpk4xllkh3r5b7fbb4sb6whxwbdm5lr9zn44qb9v4g0nx2d8"; + libraryHaskellDepends = [ base ghc-prim primitive semigroups ]; + homepage = "https://github.com/andrewthad/prim-array#readme"; + description = "Primitive byte array with type variable"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "prim-spoon" = callPackage ({ mkDerivation, base, criterion, ghc-prim, HUnit, QuickCheck , spoon @@ -167532,6 +168073,7 @@ self: { libraryHaskellDepends = [ base category ]; description = "Product category"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "product-isomorphic" = callPackage @@ -168301,15 +168843,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "proto-lens_0_3_0_0" = callPackage + "proto-lens_0_3_1_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , data-default-class, deepseq, lens-family, lens-labels, parsec , pretty, text, transformers, void }: mkDerivation { pname = "proto-lens"; - version = "0.3.0.0"; - sha256 = "0skbqawzz58ilpvkdcx1hmpaj67pyjz449qmdrp2scdpdcc1nica"; + version = "0.3.1.0"; + sha256 = "1awlp7101vhqf2hhz3h93mf38lyyfx5ay3gvrdna0k3msykimgw7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base bytestring containers data-default-class deepseq @@ -168337,14 +168879,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "proto-lens-arbitrary_0_1_2_0" = callPackage + "proto-lens-arbitrary_0_1_2_1" = callPackage ({ mkDerivation, base, bytestring, containers, lens-family , proto-lens, QuickCheck, text }: mkDerivation { pname = "proto-lens-arbitrary"; - version = "0.1.2.0"; - sha256 = "1xkvv822qsi1h99f7xpbprq4j9yf5ykz6bd5lj5jn8626vfq0n67"; + version = "0.1.2.1"; + sha256 = "08qwn60pih64lk6xnqwzx3q1qja46pvaw6539r1m4kbw3wyh2kl2"; libraryHaskellDepends = [ base bytestring containers lens-family proto-lens QuickCheck text ]; @@ -168361,8 +168903,8 @@ self: { }: mkDerivation { pname = "proto-lens-combinators"; - version = "0.1.0.9"; - sha256 = "1kkns9p2ipq4b3jy1l4lbh9h1m3vvg1l5r6ncqs0ydc2rqy1iasf"; + version = "0.1.0.10"; + sha256 = "0yv6wrg3wsp6617mw02n3d9gmlb9nyvfabffrznpvlaywwk8cnir"; setupHaskellDepends = [ base Cabal proto-lens-protoc ]; libraryHaskellDepends = [ base data-default-class lens-family proto-lens-protoc transformers @@ -168407,14 +168949,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "proto-lens-optparse_0_1_1_1" = callPackage + ({ mkDerivation, base, optparse-applicative, proto-lens, text }: + mkDerivation { + pname = "proto-lens-optparse"; + version = "0.1.1.1"; + sha256 = "1zi6kv6af39bbbcf2v7d1l2fc2f3m6r1i2yvv4ddm6w0i7vhd1qw"; + libraryHaskellDepends = [ + base optparse-applicative proto-lens text + ]; + homepage = "https://github.com/google/proto-lens#readme"; + description = "Adapting proto-lens to optparse-applicative ReadMs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "proto-lens-protobuf-types" = callPackage ({ mkDerivation, base, Cabal, lens-family, proto-lens , proto-lens-protoc, text }: mkDerivation { pname = "proto-lens-protobuf-types"; - version = "0.3.0.0"; - sha256 = "1r9pbpapgi8bq938m1fliwbv8cxr18v3a3hbziq33psvas48kwa4"; + version = "0.3.0.1"; + sha256 = "0630yl73s11dnfripbz5pa25mzpsnjzd278qcm5yiy6zmcz0a6ca"; setupHaskellDepends = [ base Cabal proto-lens-protoc ]; libraryHaskellDepends = [ base lens-family proto-lens proto-lens-protoc text @@ -168433,8 +168990,8 @@ self: { }: mkDerivation { pname = "proto-lens-protoc"; - version = "0.3.0.0"; - sha256 = "0fh6q3alm8pw32zsg6yrf8b3gf2ww5yqsjax2hmij3y20fl26s79"; + version = "0.3.1.0"; + sha256 = "0hihwynqlxhbc7280v7syag0p5php4gdvchbpzvwl54hvcjakgvx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -170940,15 +171497,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "quickcheck-classes_0_4_9" = callPackage + "quickcheck-classes_0_4_10" = callPackage ({ mkDerivation, aeson, base, bifunctors, containers, primitive , QuickCheck, semigroupoids, semigroups, tagged, transformers , vector }: mkDerivation { pname = "quickcheck-classes"; - version = "0.4.9"; - sha256 = "1m5qszs50hjfycds84arfcfqj7z4l622479bd2w55vin49mp12pn"; + version = "0.4.10"; + sha256 = "1x01746853wbfrfry807gva15wn02jcd0cfqbag7f5xm1fd8nlss"; libraryHaskellDepends = [ aeson base bifunctors containers primitive QuickCheck semigroupoids semigroups tagged transformers @@ -171189,6 +171746,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quickcheck-state-machine-distributed" = callPackage + ({ mkDerivation, base, binary, containers, directory + , distributed-process, mtl, network-transport + , network-transport-tcp, QuickCheck, random, stm, strict, tasty + , tasty-quickcheck, temporary + }: + mkDerivation { + pname = "quickcheck-state-machine-distributed"; + version = "0.0.1"; + sha256 = "0451xx4c3698nk3c2jhq7xmc0nnaxlj422i30sh7cgyrfrbdw9wj"; + libraryHaskellDepends = [ + base binary containers distributed-process mtl network-transport + network-transport-tcp QuickCheck random stm + ]; + testHaskellDepends = [ + base binary containers directory distributed-process mtl + network-transport network-transport-tcp QuickCheck random stm + strict tasty tasty-quickcheck temporary + ]; + homepage = "https://github.com/advancedtelematic/quickcheck-state-machine-distributed#readme"; + description = "Test monadic programs using state machine based models"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "quickcheck-string-random" = callPackage ({ mkDerivation, base, QuickCheck, string-random, tasty , tasty-quickcheck, text @@ -172213,6 +172794,7 @@ self: { libraryHaskellDepends = [ base primitive transformers util ]; description = "Class of random value generation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "random-derive" = callPackage @@ -173557,8 +174139,8 @@ self: { ({ mkDerivation, base, doctest, reactive-banana, stm, time }: mkDerivation { pname = "reactive-banana-automation"; - version = "0.1.1"; - sha256 = "0fn3frv0idgdg9faysri7x5nzrxrzhpy41s5nm6v8ckqcnzq7vvv"; + version = "0.3.0"; + sha256 = "1f752kmfmgdx9mhvzljm37vrn18jn7wgz0m4byl3v4npcv502cyr"; libraryHaskellDepends = [ base reactive-banana stm time ]; testHaskellDepends = [ base doctest ]; description = "home (etc) automation using reactive-banana"; @@ -174119,6 +174701,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "record-dot-preprocessor" = callPackage + ({ mkDerivation, base, extra, filepath }: + mkDerivation { + pname = "record-dot-preprocessor"; + version = "0.1"; + sha256 = "1py5bkwxwwq1jjsa16rmjm92hxnil0clim5579h5mizzq47fczrd"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base extra filepath ]; + homepage = "https://github.com/ndmitchell/record-dot-preprocessor#readme"; + description = "Preprocessor to allow record.field syntax"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "record-gl" = callPackage ({ mkDerivation, base, base-prelude, containers, GLUtil, HUnit , linear, OpenGL, record, tagged, template-haskell, test-framework @@ -180329,21 +180925,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "s3-signer_0_4_0_0" = callPackage + "s3-signer_0_5_0_0" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, byteable , bytestring, case-insensitive, cryptohash, http-types, time , utf8-string }: mkDerivation { pname = "s3-signer"; - version = "0.4.0.0"; - sha256 = "1s1l5zj4azbgl0p6w52498d6shc5c0yqnzrbjfz1hh45hh2182qf"; + version = "0.5.0.0"; + sha256 = "1r48j7ni8byzdi0girkj6lf2hp4q85ir2xnqpckzdxd0ppap2dnp"; libraryHaskellDepends = [ base base64-bytestring blaze-builder byteable bytestring case-insensitive cryptohash http-types time utf8-string ]; - testHaskellDepends = [ base blaze-builder bytestring time ]; - doHaddock = false; + testHaskellDepends = [ + base base64-bytestring blaze-builder byteable bytestring + case-insensitive cryptohash http-types time utf8-string + ]; homepage = "https://github.com/dmjio/s3-signer"; description = "Pre-signed Amazon S3 URLs"; license = stdenv.lib.licenses.bsd3; @@ -182103,6 +182701,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "scientific_0_3_6_0" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, criterion + , deepseq, hashable, integer-gmp, integer-logarithms, primitive + , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, text + }: + mkDerivation { + pname = "scientific"; + version = "0.3.6.0"; + sha256 = "1rdwqw2xi1c6305vbxa0sfyl18rjgir7flbdz2pbdvaj3nw44lr4"; + libraryHaskellDepends = [ + base binary bytestring containers deepseq hashable integer-gmp + integer-logarithms primitive text + ]; + testHaskellDepends = [ + base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml + tasty-hunit tasty-quickcheck tasty-smallcheck text + ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/basvandijk/scientific"; + description = "Numbers represented using scientific notation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "scion" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , filepath, ghc, ghc-paths, ghc-syb, hslogger, json, multiset @@ -183655,15 +184278,16 @@ self: { "semirings" = callPackage ({ mkDerivation, base, constrictor, containers, hashable - , integer-gmp, unordered-containers, vector + , integer-gmp, semigroups, transformers, unordered-containers + , vector }: mkDerivation { pname = "semirings"; - version = "0.1.1"; - sha256 = "1vrvid3ix80vwmf7qmp5f1f97nyzkq4a01bxf62kpqlbri2m9mz3"; + version = "0.1.2"; + sha256 = "1fn1hbrnljgx8kdnmk0c01zi1r0pk59cildla9gb6bykqs4rwmws"; libraryHaskellDepends = [ - base constrictor containers hashable integer-gmp - unordered-containers vector + base constrictor containers hashable integer-gmp semigroups + transformers unordered-containers vector ]; homepage = "http://github.com/chessai/semirings"; description = "two monoids as one, in holy haskimony"; @@ -187151,8 +187775,8 @@ self: { }: mkDerivation { pname = "shake-ats"; - version = "1.8.0.2"; - sha256 = "16gmyn1rbfx33dxxkyxrswa8cvjpiq3i2vm59hy4y9lag10nq9xn"; + version = "1.8.0.4"; + sha256 = "036clj4q6rwgzjc3abirir5yqrn78vnj7c5w8p9b82jkrlka8w6g"; libraryHaskellDepends = [ base binary dependency directory hashable hs2ats language-ats lens shake shake-ext text @@ -187186,8 +187810,8 @@ self: { }: mkDerivation { pname = "shake-ext"; - version = "2.11.0.2"; - sha256 = "1wmvk91gfmrd1cqj3k70h3lc2xypiqs2d2dh4xlq97fsqm2kmfmy"; + version = "2.11.0.3"; + sha256 = "0v5n7l3xx1a0y4vvrn0zi61pb3wd41pqh1g3vnq1dr12dhrrx1ac"; libraryHaskellDepends = [ base Cabal cdeps composition-prelude cpphs directory shake template-haskell @@ -195465,6 +196089,7 @@ self: { homepage = "https://github.com/clintonmead/stack-lib#readme"; description = "Wrapper to use stack as a library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stack-network" = callPackage @@ -195507,6 +196132,7 @@ self: { homepage = "https://github.com/McGizzle/stack-network#readme"; description = "A program for extending Stack to add distributed capabilities"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stack-prism" = callPackage @@ -197817,6 +198443,7 @@ self: { ]; description = "Streaming conversion from/to base64"; license = stdenv.lib.licenses.cc0; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-benchmarks" = callPackage @@ -201410,8 +202037,8 @@ self: { ({ mkDerivation, attoparsec, base, process, text }: mkDerivation { pname = "system-info"; - version = "0.4.0.0"; - sha256 = "1sl1m19ia5n8rws49596lipjzx5q3jn9yjqhjlfs4vvh9rc2dnkh"; + version = "0.4.0.1"; + sha256 = "1v18ds9k7vnvzghpyqkh1ixskf27cb94f9r696982h2vp373zh43"; libraryHaskellDepends = [ attoparsec base process text ]; testHaskellDepends = [ base ]; homepage = "https://github.com/ChaosGroup/system-info"; @@ -201931,34 +202558,37 @@ self: { "taffybar" = callPackage ({ mkDerivation, alsa-mixer, base, cairo, ConfigFile, containers - , dbus, directory, dyre, either, enclosed-exceptions, filepath - , gi-gdk, gi-gdkpixbuf, gi-gdkx11, gi-gtk, glib, gtk-traymanager - , gtk3, haskell-gi-base, HStringTemplate, HTTP, mtl, multimap - , network, network-uri, old-locale, parsec, process, rate-limit - , safe, split, stm, text, time, time-locale-compat, time-units - , transformers, transformers-base, tuple, unix, utf8-string, X11 - , xdg-basedir, xml, xml-helpers, xmonad, xmonad-contrib + , dbus, dbus-hslogger, directory, dyre, either, enclosed-exceptions + , filepath, gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gdkx11, gi-glib + , gi-gtk, glib, gtk-sni-tray, gtk-strut, gtk-traymanager, gtk3 + , haskell-gi, haskell-gi-base, hslogger, HStringTemplate, HTTP, mtl + , multimap, network, network-uri, old-locale, optparse-applicative + , parsec, process, rate-limit, regex-compat, safe, split + , status-notifier-item, stm, text, time, time-locale-compat + , time-units, transformers, transformers-base, tuple, unix + , utf8-string, X11, xdg-basedir, xml, xml-helpers, xmonad + , xmonad-contrib }: mkDerivation { pname = "taffybar"; - version = "1.0.2"; - sha256 = "05061nfnp0m833z1hqz8q6v4gphal03w4prvpfb12vwvsvsvsin9"; - revision = "1"; - editedCabalFile = "02ip0c6fq3ra6zhhq2adxjx8j4w07x19zndkk0jj6jn6kj5qggf3"; + version = "2.0.0"; + sha256 = "1s3nqvsivi4wgi6hi7b3f83r75sl5qp0hsqr0cdwd7s8fqai3wia"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - alsa-mixer base cairo ConfigFile containers dbus directory dyre - either enclosed-exceptions filepath gi-gdk gi-gdkpixbuf gi-gdkx11 - gi-gtk glib gtk-traymanager gtk3 haskell-gi-base HStringTemplate - HTTP mtl multimap network network-uri old-locale parsec process - rate-limit safe split stm text time time-locale-compat time-units + alsa-mixer base cairo ConfigFile containers dbus dbus-hslogger + directory dyre either enclosed-exceptions filepath gi-cairo gi-gdk + gi-gdkpixbuf gi-gdkx11 gi-glib gi-gtk glib gtk-sni-tray gtk-strut + gtk-traymanager gtk3 haskell-gi haskell-gi-base hslogger + HStringTemplate HTTP mtl multimap network network-uri old-locale + parsec process rate-limit regex-compat safe split + status-notifier-item stm text time time-locale-compat time-units transformers transformers-base tuple unix utf8-string X11 xdg-basedir xml xml-helpers xmonad xmonad-contrib ]; - executableHaskellDepends = [ base ]; - homepage = "http://github.com/travitch/taffybar"; + executableHaskellDepends = [ base hslogger optparse-applicative ]; + homepage = "http://github.com/taffybar/taffybar"; description = "A desktop bar similar to xmobar, but with more GUI"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -203769,16 +204399,16 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "teardown_0_4_1_0" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, gauge, rio, tasty + "teardown_0_5_0_0" = callPackage + ({ mkDerivation, base, gauge, prettyprinter, rio, tasty , tasty-hunit, typed-process, unliftio }: mkDerivation { pname = "teardown"; - version = "0.4.1.0"; - sha256 = "1w8yblzn0i8i03bfg97qgq4c6i6l2p04krvwg41q157rcgb91gq0"; + version = "0.5.0.0"; + sha256 = "0p1rjvl36gl4dqpvcjsb06jyiwsxg2qyha8rfdiddljb4ixw1sjh"; libraryHaskellDepends = [ - ansi-wl-pprint base rio typed-process unliftio + base prettyprinter rio typed-process unliftio ]; testHaskellDepends = [ base rio tasty tasty-hunit typed-process unliftio @@ -204775,6 +205405,7 @@ self: { homepage = "http://mbays.freeshell.org/tersmu"; description = "A semantic parser for lojban"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "test-fixture" = callPackage @@ -212608,6 +213239,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "txt" = callPackage + ({ mkDerivation, base, bytestring, deepseq, smallcheck, tasty + , tasty-smallcheck, utf8-string, util + }: + mkDerivation { + pname = "txt"; + version = "0.0.2.1"; + sha256 = "0cdng6qlskycpmr1yxvr25q5j876nji5iw3hlx2xb7n0rvk3ylh5"; + libraryHaskellDepends = [ + base bytestring deepseq utf8-string util + ]; + testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; + description = "Text"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "txt-sushi" = callPackage ({ mkDerivation, base, binary, bytestring, containers, directory , parsec, regex-posix @@ -216712,6 +217360,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Utilities"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "util-plus" = callPackage @@ -217422,14 +218071,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "validity-aeson_0_2_0_0" = callPackage + "validity-aeson_0_2_0_1" = callPackage ({ mkDerivation, aeson, base, validity, validity-scientific , validity-text, validity-unordered-containers, validity-vector }: mkDerivation { pname = "validity-aeson"; - version = "0.2.0.0"; - sha256 = "01ck9kbclrjxbjb7rvr1y95cizbdq5lzdd0xfpbpaf4rfgjd3w56"; + version = "0.2.0.1"; + sha256 = "001smpck69y4bmrzrykjvjnrwjllny83kh1l1c2fyy4zzjw14lpy"; libraryHaskellDepends = [ aeson base validity validity-scientific validity-text validity-unordered-containers validity-vector @@ -218545,8 +219194,8 @@ self: { pname = "vector-space-points"; version = "0.2.1.2"; sha256 = "0jqiy7b3hy21c0imqxbzvcx0hxy33bh97bv47bpv099dx32d7spy"; - revision = "3"; - editedCabalFile = "07jrxmjw7yzrgkncam4axy3b3j5iha1d632kyd24n805b6p7vym3"; + revision = "4"; + editedCabalFile = "1bw8l4nlxsx2nlam9kry60k75vszfx9zxr8zj0mcb3r0r7s178mx"; libraryHaskellDepends = [ base vector-space ]; description = "A type for points, as distinct from vectors"; license = stdenv.lib.licenses.bsd3; @@ -219408,6 +220057,28 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "voicebase" = callPackage + ({ mkDerivation, aeson, base, bytestring, HsOpenSSL, http-client + , http-client-openssl, json-autotype, lens, mime-types, options + , text, wreq + }: + mkDerivation { + pname = "voicebase"; + version = "0.1.1.1"; + sha256 = "1nc2cmfmdalggb7f9xw4xrhms31cky478wxxkq50as6bryl3k3q3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring HsOpenSSL http-client http-client-openssl + json-autotype lens mime-types text wreq + ]; + executableHaskellDepends = [ base bytestring mime-types options ]; + testHaskellDepends = [ base ]; + homepage = "https://bitbucket.org/daisee/voicebase"; + description = "Upload audio files to voicebase to get a transcription"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "void" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -219460,6 +220131,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "vpq" = callPackage + ({ mkDerivation, base, primitive, smallcheck, tasty + , tasty-smallcheck, util, vector + }: + mkDerivation { + pname = "vpq"; + version = "0.1.0.0"; + sha256 = "1qa3l71ch96slan8s2zx9wc4ljsl4jgl83m7h0rfb9nd9cawflf7"; + libraryHaskellDepends = [ base primitive util vector ]; + testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; + description = "Priority queue based on vector"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vrpn" = callPackage ({ mkDerivation, base, vrpn }: mkDerivation { @@ -222871,14 +223557,15 @@ self: { }: mkDerivation { pname = "weeder"; - version = "1.0.4"; - sha256 = "0xcqhc09v81ynpfxyqb2nyjypcxw84b7ac7cwmkfwf1i71ixf28q"; - isLibrary = false; + version = "1.0.5"; + sha256 = "0blaknr11j95sxdm6k2pyfmq1f2llg4hdmy24rvjy9jb82d3vrsi"; + isLibrary = true; isExecutable = true; - executableHaskellDepends = [ + libraryHaskellDepends = [ aeson base bytestring cmdargs deepseq directory extra filepath foundation hashable process text unordered-containers vector yaml ]; + executableHaskellDepends = [ base ]; homepage = "https://github.com/ndmitchell/weeder#readme"; description = "Detect dead code"; license = stdenv.lib.licenses.bsd3; @@ -223990,6 +224677,8 @@ self: { pname = "wordchoice"; version = "0.1.2.6"; sha256 = "16x595vv9fbq6j634a8wqnd1agmzbv09372sc99lq1a997crmq2w"; + revision = "1"; + editedCabalFile = "1igc5fc91ilva7yqhcmdsd6yq6q974ybb2hwk856cpqpmas0402j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -224033,21 +224722,21 @@ self: { "wordpass" = callPackage ({ mkDerivation, base, containers, deepseq, directory, filepath - , hflags, random-fu, random-source, text, unix-compat, vector + , optparse-applicative, QuickCheck, text, unix-compat, vector }: mkDerivation { pname = "wordpass"; - version = "1.0.0.7"; - sha256 = "1n6r47ki83xzvms90sxnyqfyqzrs7j705ji2832mf5160xld30r2"; + version = "1.0.0.9"; + sha256 = "0gkcqcfl0n9z94bjg2ajzlwjm55qxsc9yd2q97azw4g2c69sn8lq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers deepseq directory filepath random-fu random-source - text unix-compat vector + base containers deepseq directory filepath optparse-applicative + QuickCheck text unix-compat vector ]; executableHaskellDepends = [ - base containers deepseq directory filepath hflags random-fu - random-source text unix-compat vector + base containers deepseq directory filepath optparse-applicative + QuickCheck text unix-compat vector ]; homepage = "https://github.com/mgajda/wordpass"; description = "Dictionary-based password generator"; @@ -224844,6 +225533,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wuss_1_1_9" = callPackage + ({ mkDerivation, base, bytestring, connection, network, websockets + }: + mkDerivation { + pname = "wuss"; + version = "1.1.9"; + sha256 = "1la0zvdsb1w0k2sj8f9wrnsirljjnbx0a1kalzwalh6d82h2jd9z"; + libraryHaskellDepends = [ + base bytestring connection network websockets + ]; + homepage = "https://github.com/tfausak/wuss#readme"; + description = "Secure WebSocket (WSS) clients"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wx" = callPackage ({ mkDerivation, base, stm, time, wxcore }: mkDerivation { diff --git a/pkgs/development/interpreters/love/11.1.nix b/pkgs/development/interpreters/love/11.1.nix new file mode 100644 index 0000000000000..e92a84b40b86c --- /dev/null +++ b/pkgs/development/interpreters/love/11.1.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, libGLU_combined, openal, luajit, + libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg, + libtheora, which, autoconf, automake, libtool +}: + +let + pname = "love"; + version = "11.1"; +in + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + src = fetchFromBitbucket { + owner = "rude"; + repo = "love"; + rev = "${version}"; + sha256 = "16jn6klbsz8qi2wn3llbr7ri5arlc0b19la19ypzk6p7v20z4sfr"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + SDL2 libGLU_combined openal luajit libdevil freetype physfs libmodplug mpg123 + libvorbis libogg libtheora autoconf which libtool automake + ]; + + preConfigure = "$shell ./platform/unix/automagic"; + + configureFlags = [ + "--with-lua=luajit" + ]; + + NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3 + + meta = { + homepage = http://love2d.org; + description = "A Lua-based 2D game engine/scripting language"; + license = stdenv.lib.licenses.zlib; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.raskin ]; + }; +} diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index a96320f45ae40..89d394c875699 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -1,8 +1,8 @@ { stdenv, buildPackages, lib , fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub , zlib, openssl, gdbm, ncurses, readline, groff, libyaml, libffi, autoreconfHook, bison -, autoconf, darwin ? null -, buildEnv, bundler, bundix, Foundation +, autoconf, libiconv, libobjc, libunwind, Foundation +, buildEnv, bundler, bundix } @ args: let @@ -37,7 +37,7 @@ let isRuby25 = ver.majMin == "2.5"; baseruby = self.override { useRailsExpress = false; }; self = lib.makeOverridable ( - { stdenv, buildPackages, lib + { stdenv, buildPackages, lib , fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub , useRailsExpress ? true , zlib, zlibSupport ? true @@ -48,8 +48,8 @@ let , libyaml, yamlSupport ? true , libffi, fiddleSupport ? true , autoreconfHook, bison, autoconf - , darwin ? null - , buildEnv, bundler, bundix, Foundation + , buildEnv, bundler, bundix + , libiconv, libobjc, libunwind, Foundation }: let rubySrc = if useRailsExpress then fetchFromGitHub { @@ -93,9 +93,8 @@ let # support is not enabled, so add readline to the build inputs if curses # support is disabled (if it's enabled, we already have it) and we're # running on darwin - ++ (op (!cursesSupport && stdenv.isDarwin) readline) - ++ (op stdenv.isDarwin Foundation) - ++ (ops stdenv.isDarwin (with darwin; [ libiconv libobjc libunwind ])); + ++ op (!cursesSupport && stdenv.isDarwin) readline + ++ ops stdenv.isDarwin [ libiconv libobjc libunwind Foundation ]; enableParallelBuilding = true; @@ -136,8 +135,6 @@ let ++ op (stdenv.hostPlatform != stdenv.buildPlatform) "--with-baseruby=${buildRuby}"; - doCheck = false; # expensive, fails - preInstall = '' # Ruby installs gems here itself now. mkdir -pv "$out/${passthru.gemPath}" diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix index 4992ea04f1105..35dcff95029d1 100644 --- a/pkgs/development/interpreters/spidermonkey/52.nix +++ b/pkgs/development/interpreters/spidermonkey/52.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr }: let - version = "52.6.0"; + version = "52.7.4"; in stdenv.mkDerivation rec { name = "spidermonkey-${version}"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; - sha256 = "0hhyd4ni4jja7jd687dm0csi1jcjxahf918zbjzr8njz655djz2q"; + sha256 = "0dn3hbc95qhvcgzbibhy17xwn5m0340f64bq5byvx22c2rf40xwz"; }; buildInputs = [ readline icu zlib nspr ]; diff --git a/pkgs/development/libraries/alkimia/default.nix b/pkgs/development/libraries/alkimia/default.nix new file mode 100644 index 0000000000000..6f4fd09015e5e --- /dev/null +++ b/pkgs/development/libraries/alkimia/default.nix @@ -0,0 +1,31 @@ +{ mkDerivation, fetchurl, lib +, extra-cmake-modules, doxygen, graphviz, qtbase, mpir +}: + +mkDerivation rec { + name = "alkimia-${version}"; + version = "7.0.1"; + + src = fetchurl { + url = "mirror://kde/stable/alkimia/${version}/src/${name}.tar.xz"; + sha256 = "1fri76465058fgsyrmdrc3hj1javz4g10mfzqp5rsj7qncjr1i22"; + }; + + nativeBuildInputs = [ extra-cmake-modules doxygen graphviz ]; + + buildInputs = [ qtbase ]; + propagatedBuildInputs = [ mpir ]; + + meta = { + description = "Library used by KDE finance applications"; + longDescription = '' + Alkimia is the infrastructure for common storage and business + logic that will be used by all financial applications in KDE. + + The target is to share financial related information over + application bounderies. + ''; + license = lib.licenses.lgpl21Plus; + platforms = qtbase.meta.platforms; + }; +} diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index d3ba4b8890942..17c6f75a59db5 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2018.04.16.00"; + version = "2018.04.23.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "10wivnszpqcbg2hbvfal94lcjw20pjz0d8p0m4qa7i4v4z90q37p"; + sha256 = "0wfp4pxi71bi3bz3h5jxsvdd5wa8q6wqdgsx0jvyvaiiy7v884sv"; }; nativeBuildInputs = [ autoreconfHook python pkgconfig ]; diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index b097e5cbb64c8..52d439918aa36 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -4,19 +4,17 @@ assert odbcSupport -> unixODBC != null; +# Work is in progress to move to cmake so revisit that later + stdenv.mkDerivation rec { name = "freetds-${version}"; - version = "1.00.80"; + version = "1.00.91"; src = fetchurl { url = "http://www.freetds.org/files/stable/${name}.tar.bz2"; - sha256 = "17s15avxcyhfk0zsj8rggizhpd2j2sa41w5xlnshzd2r3piqyl6k"; + sha256 = "04c344xdvh2j36r01ph7yhy5rb1668il0z9vyphwdy6qqwywh622"; }; - configureFlags = [ - "--with-tdsver=7.3" - ]; - buildInputs = [ openssl ] ++ stdenv.lib.optional odbcSupport unixODBC; diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix index 57112e2825eeb..33583a4c6bb33 100644 --- a/pkgs/development/libraries/gsm/default.nix +++ b/pkgs/development/libraries/gsm/default.nix @@ -9,11 +9,11 @@ in stdenv.mkDerivation rec { name = "gsm-${version}"; - version = "1.0.17"; + version = "1.0.18"; src = fetchurl { url = "http://www.quut.com/gsm/${name}.tar.gz"; - sha256 = "00bns0d4wwrvc60lj2w7wz4yk49q1f6rpdrwqzrxsha9d78mfnl5"; + sha256 = "041amvpz8cvxykl3pwqldrzxligmmzcg8ncdnxbg32rlqf3q1xh4"; }; patchPhase = '' diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 238edddaf3adc..4f3bc64b5d401 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -18,14 +18,14 @@ let pname = "gvfs"; - version = "1.36.1"; + version = "1.36.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "09phj9kqk8lzcmkjfq7qmzpkj4xp1vg4mskv6d2s9j62hvrxyh1q"; + sha256 = "1xq105596sk9yram5a143b369wpaiiwc9gz86n0j1kfr7nipkqn4"; }; # Uncomment when switching back to meson diff --git a/pkgs/development/libraries/iml/default.nix b/pkgs/development/libraries/iml/default.nix index 4af2bba9160d7..b55d13ecc3f4c 100644 --- a/pkgs/development/libraries/iml/default.nix +++ b/pkgs/development/libraries/iml/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gmp, atlas}: +{stdenv, autoreconfHook, fetchurl, gmp, openblas}: stdenv.mkDerivation rec { name = "iml-${version}"; version = "1.0.5"; @@ -6,8 +6,18 @@ stdenv.mkDerivation rec { url = "http://www.cs.uwaterloo.ca/~astorjoh/iml-${version}.tar.bz2"; sha256 = "0akwhhz9b40bz6lrfxpamp7r7wkk48p455qbn04mfnl9a1l6db8x"; }; - buildInputs = [gmp atlas]; - configureFlags = "--with-gmp-include=${gmp.dev}/include --with-gmp-lib=${gmp}/lib"; + buildInputs = [ + gmp + openblas + ]; + nativeBuildInputs = [ + autoreconfHook + ]; + configureFlags = [ + "--with-gmp-include=${gmp.dev}/include" + "--with-gmp-lib=${gmp}/lib" + "--with-cblas=-lopenblas" + ]; meta = { inherit version; description = ''Algorithms for computing exact solutions to dense systems of linear equations over the integers''; diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index f54139836b1d6..d780fc30a4c2e 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -155,6 +155,7 @@ let kded = callPackage ./kded.nix {}; kdesignerplugin = callPackage ./kdesignerplugin.nix {}; kdesu = callPackage ./kdesu.nix {}; + kdewebkit = callPackage ./kdewebkit.nix {}; kemoticons = callPackage ./kemoticons.nix {}; kglobalaccel = callPackage ./kglobalaccel.nix {}; kiconthemes = callPackage ./kiconthemes {}; diff --git a/pkgs/development/libraries/kde-frameworks/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks/kdewebkit.nix new file mode 100644 index 0000000000000..b7dcfb7fe64cd --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kdewebkit.nix @@ -0,0 +1,11 @@ +{ mkDerivation, extra-cmake-modules +, kconfig, kcoreaddons, kio, kparts, qtwebkit +}: + +mkDerivation { + name = "kdewebkit"; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kconfig kcoreaddons kio kparts ]; + propagatedBuildInputs = [ qtwebkit ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index 54f2273c2fcfa..83f86c40c0d15 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libtool, gtk ? null, libcap -, alsaLib, libpulseaudio, gstreamer, gst-plugins-base, libvorbis }: +, alsaLib, libpulseaudio, gst_all_1, libvorbis }: stdenv.mkDerivation rec { name = "libcanberra-0.30"; @@ -9,11 +9,10 @@ stdenv.mkDerivation rec { sha256 = "0wps39h8rx2b00vyvkia5j40fkak3dpipp1kzilqla0cgvk73dn2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig libtool ]; buildInputs = [ - libtool alsaLib libpulseaudio libvorbis gtk libcap - /*gstreamer gst-plugins-base*/ # ToDo: gstreamer not found (why?), add (g)udev? - ]; + alsaLib libpulseaudio libvorbis gtk libcap + ] ++ (with gst_all_1; [ gstreamer gst-plugins-base ]); configureFlags = "--disable-oss"; diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index c3050bf8c676b..d6447e449cfbb 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libcouchbase-${version}"; - version = "2.8.6"; + version = "2.8.7"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "1in0fdl5mgzhwmd8kvniqkizi7isf2g2gvbknfbbdmxkki7a8p95"; + sha256 = "1hx66dlbb3sc3xaj6nsav4rp7qghl9zyv796kxj1sammw9wp98b1"; }; cmakeFlags = "-DLCB_NO_MOCK=ON"; diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix index 683a5bee4c7c6..e50b8a13b9509 100644 --- a/pkgs/development/libraries/libcue/default.nix +++ b/pkgs/development/libraries/libcue/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libcue-${version}"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "lipnitsk"; repo = "libcue"; rev = "v${version}"; - sha256 = "0znn9scamy1nsz1dzvsamqg46zr7ldfvpxiyzi1ss9d6gbcm0frs"; + sha256 = "1iqw4n01rv2jyk9lksagyxj8ml0kcfwk67n79zy1r6zv1xfp5ywm"; }; nativeBuildInputs = [ cmake bison flex ]; diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index 01bfe1653fe6a..ce1d3b138f88a 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = if extraOnly then "libfm-extra-${version}" else "libfm-${version}"; - version = "1.3.0"; + version = "1.3.0.2"; src = fetchurl { url = "mirror://sourceforge/pcmanfm/libfm-${version}.tar.xz"; - sha256 = "151jyy8ipmp2h829gd9s4s429qafv1zxl7j6zaj1k1gzm9s5rmnb"; + sha256 = "0wkwbi1nyvqza3r1dhrq846axiiq0fy0dqgngnagh76fjrwnzl0q"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index f84cc677d16db..d3a21ee7fa290 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, cairo, Carbon, fontconfig -, libtiff, giflib, libungif, libjpeg, libpng, monoDLLFixer +, libtiff, giflib, libjpeg, libpng, monoDLLFixer , libXrender, libexif }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patchFlags = "-p0"; buildInputs = - [ pkgconfig glib cairo fontconfig libtiff giflib libungif + [ pkgconfig glib cairo fontconfig libtiff giflib libjpeg libpng libXrender libexif ] ++ stdenv.lib.optional stdenv.isDarwin Carbon; diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix index 1c8f33d82f72d..86166ec608fd3 100644 --- a/pkgs/development/libraries/libofx/default.nix +++ b/pkgs/development/libraries/libofx/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, opensp, pkgconfig, libxml2, curl }: stdenv.mkDerivation rec { - name = "libofx-0.9.12"; + name = "libofx-0.9.13"; src = fetchurl { url = "mirror://sourceforge/libofx/${name}.tar.gz"; - sha256 = "0wvkgffq9qjhjrggg8r1nbhmw65j3lcl4y4cdpmmkrqiz9ia0py1"; + sha256 = "1r60pj1jn269mk4s4025qxllkzgvnbw5r3vby8j2ry5svmygksjp"; }; configureFlags = [ "--with-opensp-includes=${opensp}/include/OpenSP" ]; diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index 4ad2f7ba34dc8..1213f93112f6d 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libraw-${version}"; - version = "0.18.9"; + version = "0.18.10"; src = fetchurl { url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz"; - sha256 = "0kmjfdr409k9q9n17k9ywims5z4kqc16s81ba7y09n7669q1gvyj"; + sha256 = "0klrzg1cn8ksxqbhx52dldi5bbmad190npnhhgkyr2jzpgrbpj88"; }; outputs = [ "out" "lib" "dev" "doc" ]; diff --git a/pkgs/development/libraries/libu2f-server/default.nix b/pkgs/development/libraries/libu2f-server/default.nix index 5d7da127c2a92..6140c13e493d5 100644 --- a/pkgs/development/libraries/libu2f-server/default.nix +++ b/pkgs/development/libraries/libu2f-server/default.nix @@ -1,15 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, json_c, openssl, check }: +{ stdenv, fetchurl, pkgconfig, json_c, openssl, check, file, help2man, which, gengetopt }: stdenv.mkDerivation rec { - name = "libu2f-server-1.0.1"; - + name = "libu2f-server-1.1.0"; src = fetchurl { url = "https://developers.yubico.com/libu2f-server/Releases/${name}.tar.xz"; - sha256 = "0vhzixz1s629qv9dpdj6b7fxfyxnr5j2vx2cq9q6v790a68ga656"; + sha256 = "0xx296nmmqa57w0v5p2kasl5zr1ms2gh6qi4lhv6xvzbmjp3rkcd"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ json_c openssl check ]; + buildInputs = [ json_c openssl check file help2man which gengetopt ]; meta = with stdenv.lib; { homepage = https://developers.yubico.com/libu2f-server/; diff --git a/pkgs/development/libraries/libx86emu/default.nix b/pkgs/development/libraries/libx86emu/default.nix index b745098bd64b9..bbaa6b089610c 100644 --- a/pkgs/development/libraries/libx86emu/default.nix +++ b/pkgs/development/libraries/libx86emu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libx86emu-${version}"; - version = "1.12"; + version = "1.14"; src = fetchFromGitHub { owner = "wfeldt"; repo = "libx86emu"; rev = version; - sha256 = "0dlzvwdkk0vc6qf0a0zzbxki3pig1mda8p3fa54rxqaxkwp4mqr6"; + sha256 = "120a01jrrd4rwwjfr5f612xq9hbh35c87a6wnqn7zzw3fqydc2lw"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/libraries/mbedtls/darwin_dylib.patch b/pkgs/development/libraries/mbedtls/darwin_dylib.patch deleted file mode 100644 index bc6992d6e779f..0000000000000 --- a/pkgs/development/libraries/mbedtls/darwin_dylib.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/library/Makefile b/library/Makefile -index 28f9231..ad9cc32 100644 ---- a/library/Makefile -+++ b/library/Makefile -@@ -103,9 +103,9 @@ libmbedtls.so: libmbedtls.$(SOEXT_TLS) - echo " LN $@ -> $<" - ln -sf $< $@ - --libmbedtls.dylib: $(OBJS_TLS) -+libmbedtls.dylib: $(OBJS_TLS) libmbedx509.dylib - echo " LD $@" -- $(CC) -dynamiclib $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS_TLS) -+ $(CC) -dynamiclib -L. -lmbedcrypto -lmbedx509 $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS_TLS) - - libmbedtls.dll: $(OBJS_TLS) libmbedx509.dll - echo " LD $@" -@@ -126,9 +126,9 @@ libmbedx509.so: libmbedx509.$(SOEXT_X509) - echo " LN $@ -> $<" - ln -sf $< $@ - --libmbedx509.dylib: $(OBJS_X509) -+libmbedx509.dylib: $(OBJS_X509) libmbedcrypto.dylib - echo " LD $@" -- $(CC) -dynamiclib $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS_X509) -+ $(CC) -dynamiclib -L. -lmbedcrypto $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS_X509) - - libmbedx509.dll: $(OBJS_X509) libmbedcrypto.dll - echo " LD $@" diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index 8c2a2a694b035..74be133b06875 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -1,19 +1,17 @@ { stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { - name = "mbedtls-2.8.0"; + name = "mbedtls-2.9.0"; src = fetchFromGitHub { owner = "ARMmbed"; repo = "mbedtls"; rev = name; - sha256 = "1pnwmy0qg8g9lz26fpr5fzpvrdjm59winxpwdjfp6d62qxdjbgmn"; + sha256 = "1pb1my8wwa757hvd06qwidkj58fa1wayf16g98q600xhya5fj3vx"; }; nativeBuildInputs = [ perl ]; - patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin_dylib.patch ]; - postPatch = '' patchShebangs . '' + stdenv.lib.optionalString stdenv.isDarwin '' @@ -34,15 +32,17 @@ stdenv.mkDerivation rec { ]; postInstall = stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $out/lib/libmbedtls.dylib - install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $out/lib/libmbedx509.dylib - install_name_tool -change libmbedx509.dylib $out/lib/libmbedx509.dylib $out/lib/libmbedtls.dylib - - for exe in $out/bin/*; do - install_name_tool -change libmbedtls.dylib $out/lib/libmbedtls.dylib $exe - install_name_tool -change libmbedx509.dylib $out/lib/libmbedx509.dylib $exe - install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $exe - done + install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $out/lib/libmbedtls.dylib + install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $out/lib/libmbedx509.dylib + install_name_tool -change libmbedx509.dylib $out/lib/libmbedx509.dylib $out/lib/libmbedtls.dylib + + for exe in $out/bin/*; do + if [[ $exe != *.sh ]]; then + install_name_tool -change libmbedtls.dylib $out/lib/libmbedtls.dylib $exe + install_name_tool -change libmbedx509.dylib $out/lib/libmbedx509.dylib $exe + install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $exe + fi + done ''; doCheck = true; diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix index cbcf83f1d322b..b9b25e7f43b3b 100644 --- a/pkgs/development/libraries/mpir/default.nix +++ b/pkgs/development/libraries/mpir/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1fvmhrqdjs925hzr2i8bszm50h00gwsh17p2kn2pi51zrxck9xjj"; }; + configureFlags = [ "--enable-cxx" ]; + meta = { inherit version; description = ''A highly optimised library for bignum arithmetic forked from GMP''; diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index cbac7210a10ed..d2d1068271690 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -8,7 +8,7 @@ , enableEXR ? (!stdenv.isDarwin), openexr, ilmbase , enableJPEG2K ? true, jasper , enableFfmpeg ? false, ffmpeg -, enableGStreamer ? false, gst_all +, enableGStreamer ? false, gst_all_1 , enableEigen ? true, eigen , darwin }: @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ++ lib.optionals enableEXR [ openexr ilmbase ] ++ lib.optional enableJPEG2K jasper ++ lib.optional enableFfmpeg ffmpeg - ++ lib.optionals enableGStreamer (with gst_all; [ gstreamer gst-plugins-base ]) + ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optional enableEigen eigen ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa QTKit ]) ; @@ -69,6 +69,7 @@ stdenv.mkDerivation rec { (opencvFlag "JPEG" enableJPEG) (opencvFlag "PNG" enablePNG) (opencvFlag "OPENEXR" enableEXR) + (opencvFlag "GSTREAMER" enableGStreamer) ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix index d44bc78a533db..4dffa7486a1cd 100644 --- a/pkgs/development/libraries/poco/default.nix +++ b/pkgs/development/libraries/poco/default.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { buildInputs = [ zlib pcre expat sqlite openssl unixODBC mysql.connector-c ]; + MYSQL_DIR = mysql.connector-c; + MYSQL_INCLUDE_DIR = "${MYSQL_DIR}/include/mysql"; + cmakeFlags = [ "-DPOCO_UNBUNDLED=ON" ]; diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index c37c59997f643..4227575acb091 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -79,8 +79,8 @@ stdenv.mkDerivation rec { }) (fetchpatch { name = "fix-medium-font.patch"; - url = "http://anonscm.debian.org/cgit/pkg-kde/qt/qt4-x11.git/plain/debian/patches/" - + "kubuntu_39_fix_medium_font.diff?id=21b342d71c19e6d68b649947f913410fe6129ea4"; + url = "https://salsa.debian.org/qt-kde-team/qt/qt4-x11/raw/" + + "21b342d71c19e6d68b649947f913410fe6129ea4/debian/patches/kubuntu_39_fix_medium_font.diff"; sha256 = "0bli44chn03c2y70w1n8l7ss4ya0b40jqqav8yxrykayi01yf95j"; }) (fetchpatch { diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 6834b7ce87b63..d73bc370f9909 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -28,10 +28,15 @@ qtModule { preConfigure = '' QMAKEPATH="$PWD/Tools/qmake''${QMAKEPATH:+:}$QMAKEPATH" fixQtBuiltinPaths . '*.pr?' + # Fix hydra's "Log limit exceeded" + export qmakeFlags="$qmakeFlags CONFIG+=silent" ''; NIX_CFLAGS_COMPILE = - [ "-Wno-expansion-to-defined" ] # with gcc7 this warning blows the log over Hydra's limit + # with gcc7 this warning blows the log over Hydra's limit + [ "-Wno-expansion-to-defined" ] + # with clang this warning blows the log over Hydra's limit + ++ optional stdenv.isDarwin "-Wno-inconsistent-missing-override" ++ optionals flashplayerFix [ ''-DNIXPKGS_LIBGTK2="${getLib gtk2}/lib/libgtk-x11-2.0"'' diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix index 8cca5565bf6fd..8b740bdb6f6d1 100644 --- a/pkgs/development/libraries/science/math/atlas/default.nix +++ b/pkgs/development/libraries/science/math/atlas/default.nix @@ -47,7 +47,7 @@ let inherit (stdenv.lib) optional optionalString; # Don't upgrade until https://github.com/math-atlas/math-atlas/issues/44 # is resolved. - version = "3.10.2"; + version = "3.10.3"; in stdenv.mkDerivation { @@ -55,7 +55,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/math-atlas/atlas${version}.tar.bz2"; - sha256 = "0bqh4bdnjdyww4mcpg6kn0x7338mfqbdgysn97dzrwwb26di7ars"; + sha256 = "1dyjlq3fiparvm8ypwk6rsmjzmnwk81l88gkishphpvc79ryp216"; }; buildInputs = [ gfortran ]; diff --git a/pkgs/development/libraries/science/math/brial/default.nix b/pkgs/development/libraries/science/math/brial/default.nix new file mode 100644 index 0000000000000..0c0332f136628 --- /dev/null +++ b/pkgs/development/libraries/science/math/brial/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook +, pkgconfig +, boost +, m4ri +, gd +}: + +stdenv.mkDerivation rec { + version = "1.2.3"; + name = "brial-${version}"; + + src = fetchFromGitHub { + owner = "BRiAl"; + repo = "BRiAl"; + rev = version; + sha256 = "0qy4cwy7qrk4zg151cmws5cglaa866z461cnj9wdnalabs7v7qbg"; + }; + + # FIXME package boost-test and enable checks + doCheck = false; + + configureFlags = [ + "--with-boost-unit-test-framework=no" + ]; + + buildInputs = [ + boost + m4ri + gd + ]; + + nativeBuildInputs = [ + autoreconfHook + pkgconfig + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/BRiAl/BRiAl; + description = "Legacy version of PolyBoRi maintained by sagemath developers"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ timokau ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix deleted file mode 100644 index 61a45cbab94be..0000000000000 --- a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ - stdenv, - fetchurl, - gfortran, - cmake, - python2, - atlas ? null, - shared ? false -}: -let - atlasMaybeShared = if atlas != null then atlas.override { inherit shared; } - else null; - usedLibExtension = if shared then ".so" else ".a"; - inherit (stdenv.lib) optional optionals concatStringsSep; - inherit (builtins) hasAttr attrNames; - version = "3.5.0"; -in - -stdenv.mkDerivation rec { - name = "liblapack-${version}"; - src = fetchurl { - url = "http://www.netlib.org/lapack/lapack-${version}.tgz"; - sha256 = "0lk3f97i9imqascnlf6wr5mjpyxqcdj73pgj97dj2mgvyg9z1n4s"; - }; - - propagatedBuildInputs = [ atlasMaybeShared ]; - buildInputs = [ gfortran cmake ]; - nativeBuildInputs = [ python2 ]; - - cmakeFlags = [ - "-DUSE_OPTIMIZED_BLAS=ON" - "-DCMAKE_Fortran_FLAGS=-fPIC" - ] - ++ (optionals (atlas != null) [ - "-DBLAS_ATLAS_f77blas_LIBRARY=${atlasMaybeShared}/lib/libf77blas${usedLibExtension}" - "-DBLAS_ATLAS_atlas_LIBRARY=${atlasMaybeShared}/lib/libatlas${usedLibExtension}" - ]) - ++ (optional shared "-DBUILD_SHARED_LIBS=ON") - # If we're on darwin, CMake will automatically detect impure paths. This switch - # prevents that. - ++ (optional stdenv.isDarwin "-DCMAKE_OSX_SYSROOT:PATH=''") - ; - - doCheck = ! shared; - - checkPhase = " - sed -i 's,^#!.*,#!${python2.interpreter},' lapack_testing.py - ctest - "; - - enableParallelBuilding = true; - - passthru = { - blas = atlas; - }; - - meta = with stdenv.lib; { - inherit version; - description = "Linear Algebra PACKage"; - homepage = http://www.netlib.org/lapack/; - license = licenses.bsd3; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index baf77696b16ff..c68454fbe4a1d 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -13,14 +13,14 @@ let usedLibExtension = if shared then ".so" else ".a"; inherit (stdenv.lib) optional optionals concatStringsSep; inherit (builtins) hasAttr attrNames; - version = "3.4.1"; + version = "3.8.0"; in stdenv.mkDerivation rec { name = "liblapack-${version}"; src = fetchurl { - url = "http://www.netlib.org/lapack/lapack-${version}.tgz"; - sha256 = "93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f"; + url = "http://www.netlib.org/lapack/lapack-${version}.tar.gz"; + sha256 = "1xmwi2mqmipvg950gb0rhgprcps8gy8sjm8ic9rgy2qjlv22rcny"; }; propagatedBuildInputs = [ atlasMaybeShared ]; @@ -44,7 +44,6 @@ stdenv.mkDerivation rec { doCheck = ! shared; checkPhase = " - sed -i 's,^#!.*,#!${python2.interpreter},' lapack_testing.py ctest "; diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/pkgs/development/lisp-modules/asdf/default.nix index 27089ee3e52d0..c9d8d52b0682b 100644 --- a/pkgs/development/lisp-modules/asdf/default.nix +++ b/pkgs/development/lisp-modules/asdf/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="asdf"; - version="3.3.1"; + version="3.3.2"; name="${baseName}-${version}"; - hash="1yhlhyllabsha84wycqk0mhbcq2w332jdlp19ccx4rplczzn2w3g"; - url="http://common-lisp.net/project/asdf/archives/asdf-3.3.1.tar.gz"; - sha256="1yhlhyllabsha84wycqk0mhbcq2w332jdlp19ccx4rplczzn2w3g"; + hash="1bdrybn97qhny5192ifis8fp8m79djql2k4h9r9q2wnwxf9q2d4x"; + url="http://common-lisp.net/project/asdf/archives/asdf-3.3.2.tar.gz"; + sha256="1bdrybn97qhny5192ifis8fp8m79djql2k4h9r9q2wnwxf9q2d4x"; }; buildInputs = [ texinfo texLive perl diff --git a/pkgs/development/misc/avr/gcc/default.nix b/pkgs/development/misc/avr/gcc/default.nix index 824979291833f..cce11616e2f1c 100644 --- a/pkgs/development/misc/avr/gcc/default.nix +++ b/pkgs/development/misc/avr/gcc/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, gmp, mpfr, libmpc, zlib, avrbinutils, texinfo }: let - version = "7.3.0"; + version = "8.1.0"; in stdenv.mkDerivation { name = "avr-gcc-${version}"; src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "0p71bij6bfhzyrs8676a8jmpjsfz392s2rg862sdnsk30jpacb43"; + sha256 = "0lxil8x0jjx7zbf90cy1rli650akaa6hpk8wk8s62vk2jbwnc60x"; }; patches = [ diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix index 5f71b5994080c..04b6f2cbc8349 100644 --- a/pkgs/development/mobile/xcodeenv/simulate-app.nix +++ b/pkgs/development/mobile/xcodeenv/simulate-app.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { echo "Please provide a UDID of a simulator:" read udid else - # If a parameter has been provided, consider that a device UDID an use that + # If a parameter has been provided, consider that a device UDID and use that udid="$1" fi diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json index 9b19a4f5a628d..5f18a286ad779 100644 --- a/pkgs/development/node-packages/node-packages-v6.json +++ b/pkgs/development/node-packages/node-packages-v6.json @@ -19,6 +19,7 @@ , "dnschain" , "docker-registry-server" , "elasticdump" +, "elm-oracle" , "elm-test" , "emoj" , "eslint" @@ -38,6 +39,7 @@ , "ionic" , "ios-deploy" , "istanbul" +, "imapnotify" , "javascript-typescript-langserver" , "jayschema" , "jsdoc" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index e5d9ff18eb0dc..66a016ceb5109 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -94,22 +94,31 @@ let sha512 = "2fv2qaz90rp6ib2s45ix0p3a4bd6yl6k94k1kkhw7w4s2aa5mqc6chppkf6pfvsz1l6phh7y0xswyfyzjgny7qzascch8c7ws20a0r4"; }; }; - "@types/node-8.10.4" = { + "@types/node-10.0.4" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.10.4"; + version = "10.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-10.0.4.tgz"; + sha512 = "2zwjjfa4s706r0w45siwgzax5c8g5j3z79dkckwzgrzqxglj070ijv0m9g1ipc1y4kr7l0r9qia9yfxc9syw64hib8vh216cxk1las6"; + }; + }; + "@types/node-8.10.12" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "8.10.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.10.4.tgz"; - sha512 = "345l7fbkr415rdf3p0akk11k8shxibfl77crpj3wd3a8d4lbsdpylfzm8ihkg6wnj88gjpcwy4nw6vb2x58kwx15fbl09bz96dlrahn"; + url = "https://registry.npmjs.org/@types/node/-/node-8.10.12.tgz"; + sha512 = "199k4d6vmwxd4bkmxmpszdvz6nxby7px5w2cw0yrhrp5clmxvsfc1xnwirjlpidfc4a76i6pzprmdkrpli8i454s909bx6z7wd584b9"; }; }; - "@types/node-9.6.2" = { + "@types/node-9.6.12" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "9.6.2"; + version = "9.6.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-9.6.2.tgz"; - sha512 = "30kq6rikl2ya5krnyglrbi52xrm0f3q0nyzj99haady8c2s03l3rcp42cxkkd4v3mrvsw3jan0kz7vb4j148qg8wklh2igvsmii2sai"; + url = "https://registry.npmjs.org/@types/node/-/node-9.6.12.tgz"; + sha512 = "2515a59dsfswy2l4i7hid0krh69mzz42byi55a12a0cz21masdmd3j0zc8aq7qyh2sm6lmhzbxy1n8vhb563ybjhiygavn9d24k77yr"; }; }; "@types/request-2.47.0" = { @@ -481,6 +490,15 @@ let sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1"; }; }; + "adm-zip-0.4.9" = { + name = "adm-zip"; + packageName = "adm-zip"; + version = "0.4.9"; + src = fetchurl { + url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.9.tgz"; + sha512 = "03k8g7lxi05n57v16vv32x32lkikh9qvv4pmkycrw52j3r031fkvns49z8wvfbj3rjj6vh712ahyfz5k3m5b9v832n9dz18f8kxljbs"; + }; + }; "after-0.8.1" = { name = "after"; packageName = "after"; @@ -616,13 +634,13 @@ let sha1 = "617997fc5f60576894c435f940d819e135b80762"; }; }; - "ajv-keywords-3.1.0" = { + "ajv-keywords-3.2.0" = { name = "ajv-keywords"; packageName = "ajv-keywords"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.1.0.tgz"; - sha1 = "ac2b27939c543e95d2c06e7f7f5c27be4aa543be"; + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz"; + sha1 = "e86b819c602cf8821ad637413698f1dec021847a"; }; }; "ajv-merge-patch-3.0.0" = { @@ -1030,13 +1048,13 @@ let sha1 = "2b12247b933001971addcbfe4e67d20fd395bbf4"; }; }; - "args-3.0.8" = { + "args-4.0.0" = { name = "args"; packageName = "args"; - version = "3.0.8"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/args/-/args-3.0.8.tgz"; - sha512 = "26h2nssgwzgc9y1mywgjcx2rbbkxlpx23zj9gh81bayjr8522zi78rwrhpkkqwh7dwqx6mv8gphcx8zyv3vm8hxw5s89kjlzm66k7y9"; + url = "https://registry.npmjs.org/args/-/args-4.0.0.tgz"; + sha512 = "2xd628jhziygi9jr16ckq557189nw5lracgzcpv8ddvymc3mjxvqzffgp68wmgknw6ps7nliwwyismriv6z4snvn0xmm7kwbrafbgp1"; }; }; "arr-diff-2.0.0" = { @@ -1579,13 +1597,13 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "atob-2.1.0" = { + "atob-2.1.1" = { name = "atob"; packageName = "atob"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/atob/-/atob-2.1.0.tgz"; - sha512 = "0dyf7054n94f1pwp9chcy6vawgwd2wqp8jqrnvxl489jyxxbg46n2vkb5vfs5jqnkmh6kbyv4lpysrn13hzzh5q021frc6vrcgqms2a"; + url = "https://registry.npmjs.org/atob/-/atob-2.1.1.tgz"; + sha1 = "ae2d5a729477f289d60dd7f96a6314a22dd6c22a"; }; }; "atomic-batcher-1.0.2" = { @@ -1615,13 +1633,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.223.1" = { + "aws-sdk-2.233.1" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.223.1"; + version = "2.233.1"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.223.1.tgz"; - sha1 = "b264bf6407d7c74152f08b4a8fda8aad3a84baa4"; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.233.1.tgz"; + sha1 = "b4f541069a9f2781e9f73e1336ce81a9fc08bcf1"; }; }; "aws-sign-0.2.0" = { @@ -2038,13 +2056,13 @@ let sha1 = "63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"; }; }; - "babel-core-6.26.0" = { + "babel-core-6.26.3" = { name = "babel-core"; packageName = "babel-core"; - version = "6.26.0"; + version = "6.26.3"; src = fetchurl { - url = "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz"; - sha1 = "af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"; + url = "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz"; + sha512 = "0617drz6fkpdpkl4snbfz7ivd296j19182m7x4klhqac60qr77wn8bkgpz696sscxykcv1n8cdv09pz7v9xq6s1k552fyp6w0p8ag7a"; }; }; "babel-generator-6.26.1" = { @@ -2236,13 +2254,13 @@ let sha1 = "f616eda9d3e4b66b8ca7fca79f695722c5f8e26f"; }; }; - "bail-1.0.2" = { + "bail-1.0.3" = { name = "bail"; packageName = "bail"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/bail/-/bail-1.0.2.tgz"; - sha1 = "f7d6c1731630a9f9f0d4d35ed1f962e2074a1764"; + url = "https://registry.npmjs.org/bail/-/bail-1.0.3.tgz"; + sha512 = "1v31szd5dwn62xh8a9cy95yby0ibq9j9barzs03hxjr4vcjnwz1mgjdb9p4rqgymjm3f5zrxgrnqkjd9h9viykd56zfchsm66g04zym"; }; }; "balanced-match-1.0.0" = { @@ -2326,6 +2344,15 @@ let sha512 = "3kqp8hzql2ccdqf7vqizav1lrwp5gynn081718g9slxcs428sv02n037xb9hfgrqybbk4qacnk5mcv63z8fm3l4h6fi06xm8nqj3h1j"; }; }; + "base64-js-1.3.0" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz"; + sha512 = "2bvd1ja1kbighx0vm4ia3gqv15m70pldsx2igl37ayq11715w3g0vfmfq1yb8w80hlzblvszig3fr4sdhn8rr800lsaz8dg47zsziki"; + }; + }; "base64-url-1.2.1" = { name = "base64-url"; packageName = "base64-url"; @@ -2524,13 +2551,13 @@ let sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4"; }; }; - "big-integer-1.6.27" = { + "big-integer-1.6.28" = { name = "big-integer"; packageName = "big-integer"; - version = "1.6.27"; + version = "1.6.28"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.27.tgz"; - sha512 = "2v5f59yjsa3hzwhk333s84nfl1x24w52h9hqpwbav0p5v5d5prkna0flw25ywccrrjziq3lylbl874qqikzljkyz2g6jjdqhlqhld9p"; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.28.tgz"; + sha512 = "3b56jaa0yvrl9p90c0phnhyh02sv9hxssl8y0nghv91ra8akrcdpxm55c1gf5w1is9991wm2g0wqcr4hm5ri9lmzwd8gc9d72pzg51q"; }; }; "big.js-3.2.0" = { @@ -2677,13 +2704,13 @@ let sha512 = "10md5792s6q3xwdrmwh1a8ax9w128g607b5qsbxzw8x0gl9184g754hprchl6mq8lmf4f8qylk2h8vavsnbn9yy9gzjnyh2kwrzmxky"; }; }; - "bittorrent-dht-8.2.0" = { + "bittorrent-dht-8.3.0" = { name = "bittorrent-dht"; packageName = "bittorrent-dht"; - version = "8.2.0"; + version = "8.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-8.2.0.tgz"; - sha512 = "291qfv5f3w3d7zcq9xyjplpnaaahy7mzj664w5g9w1zgiwv3dikl38r8wx0rdb3afsv5ih0ghrzc2r1k19c52axsagnpsc10hihlkii"; + url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-8.3.0.tgz"; + sha512 = "2p2fxhvwin4xnjdmbhrlwivx4a8pjzfn6mc5qxnxzl1q40xxp56wd6xrcxfq9viqjkvpc7g0j3dvgmvcywhgw41nvjyxi8pgm5v43kp"; }; }; "bittorrent-peerid-1.2.0" = { @@ -2695,13 +2722,13 @@ let sha1 = "9f675612f0e6afc6ef3450dfba51ff7238abf371"; }; }; - "bittorrent-protocol-2.4.0" = { + "bittorrent-protocol-2.4.1" = { name = "bittorrent-protocol"; packageName = "bittorrent-protocol"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-2.4.0.tgz"; - sha512 = "3xggi5fxwkzkkgy3z7v5b9w7fk2bjan077b4s9rvqfp7cmnw6l96p36qlkqgp38rd57lzdlkay42dkqhcb8r7gzszp5598nviy0p4mb"; + url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-2.4.1.tgz"; + sha512 = "0vx3k29q25mp4ind4745868n0hc7xcggwbj0hyqp0hfblfxpdwddv1gwdh0x0m9skja637bxvn2i1ssvqrc80qyjfy4asw63rpvg99m"; }; }; "bittorrent-tracker-7.7.0" = { @@ -2713,13 +2740,13 @@ let sha1 = "ffd2eabc141d36ed5c1817df7e992f91fd7fc65c"; }; }; - "bittorrent-tracker-9.7.0" = { + "bittorrent-tracker-9.9.1" = { name = "bittorrent-tracker"; packageName = "bittorrent-tracker"; - version = "9.7.0"; + version = "9.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.7.0.tgz"; - sha512 = "06jp495xv047v5n3wclbga8laqmgjis5wjwhc7ggq2qx4xszp395mg2v0147p7v0ybpw5bpvdfhr1zp12barvn2lgj9f0c9iji4jr5r"; + url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.9.1.tgz"; + sha512 = "06yb4m1bbllq52hhm7cp5j35bd9my3rhlsgaycpv6g9iymxq0qr8bx9fmxr673i9m6nxvkbrjym7ykp9f8w674inpp3csplqf2apl1x"; }; }; "bl-0.8.2" = { @@ -3037,15 +3064,6 @@ let sha1 = "0c1817c48063a88d96cc3d516c55e57fff5d9ecb"; }; }; - "boxen-0.3.1" = { - name = "boxen"; - packageName = "boxen"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/boxen/-/boxen-0.3.1.tgz"; - sha1 = "a7d898243ae622f7abb6bb604d740a76c6a5461b"; - }; - }; "boxen-1.3.0" = { name = "boxen"; packageName = "boxen"; @@ -3190,15 +3208,6 @@ let sha1 = "089a3463af58d0e48d8cd4070b3f74654d5abca9"; }; }; - "browserify-14.5.0" = { - name = "browserify"; - packageName = "browserify"; - version = "14.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-14.5.0.tgz"; - sha512 = "3p941rcrmn44115ylbnq53sdsnfm08rlvckdbkrnxvl00ibis5sxyhgrx33vm8sfyb5vgbk8x4b0fv3vwirvd7frwbdmzigsjqcx9w0"; - }; - }; "browserify-aes-1.2.0" = { name = "browserify-aes"; packageName = "browserify-aes"; @@ -3217,22 +3226,22 @@ let sha1 = "96247e853f068fd6e0d45cc73f0bb2cd9778ef02"; }; }; - "browserify-cipher-1.0.0" = { + "browserify-cipher-1.0.1" = { name = "browserify-cipher"; packageName = "browserify-cipher"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz"; - sha1 = "9988244874bf5ed4e28da95666dcd66ac8fc363a"; + url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz"; + sha512 = "3bz6v63l37ndb18236yjdkbxjcvy4x16a8j7vsqxqprvnkcnkq1hg1ffd1c9zk9a3j555ppnpisfyh0x4adlb8lmpwbfa8i837n9y5h"; }; }; - "browserify-des-1.0.0" = { + "browserify-des-1.0.1" = { name = "browserify-des"; packageName = "browserify-des"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz"; - sha1 = "daa277717470922ed2fe18594118a175439721dd"; + url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.1.tgz"; + sha512 = "35rl28vzg80fa81b0a7rdaj71zf0ymxxhlmdpisps4dlgvkazbxz47q9fnl1n9wnbq7ilk6vnbxa399zcwdjdz3i0lii1mpnyhh4bfg"; }; }; "browserify-incremental-3.1.1" = { @@ -3505,13 +3514,13 @@ let sha1 = "8de37f5a300730c305fc3edd9f93348ee8a46288"; }; }; - "bufferutil-3.0.4" = { + "bufferutil-3.0.5" = { name = "bufferutil"; packageName = "bufferutil"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/bufferutil/-/bufferutil-3.0.4.tgz"; - sha512 = "1q344kiig9b8ssskrp7r77kf3xk516bfcjlilgz0a8q5zflz35rnp8im2kx1y9smcp23hw2q1aqsi39i6cb7svzf40a7dk6h4ds54pf"; + url = "https://registry.npmjs.org/bufferutil/-/bufferutil-3.0.5.tgz"; + sha512 = "2b5ha7z8v5gkanyakrbax9k9d00cv9gs2nfnk5g4d16ljmpv40jv3pljawxmnw2jj04z57cqlzbw1w8wr5kyblin8c2jz7a2av09xfi"; }; }; "bufferview-1.0.1" = { @@ -3892,6 +3901,15 @@ let sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; }; }; + "camelcase-5.0.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz"; + sha512 = "2q57983k3n95gzbhqhc0cv6krvq7nd37h837xg6favqywdda14ha7k2xbdaryni3xzzm55pvi0adrl1fbgxypaxz1kvrifnm5kb1akx"; + }; + }; "camelcase-keys-2.1.0" = { name = "camelcase-keys"; packageName = "camelcase-keys"; @@ -3973,13 +3991,13 @@ let sha512 = "2wa0gi2wljxw00rvqz454sgdr8yy90z8lhprxjc1prwi695lnzrh6sk0qqhp63h9gmbldyvvzfvm8k1jk0sbv6icdawcss441jky3qa"; }; }; - "ccount-1.0.2" = { + "ccount-1.0.3" = { name = "ccount"; packageName = "ccount"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/ccount/-/ccount-1.0.2.tgz"; - sha1 = "53b6a2f815bb77b9c2871f7b9a72c3a25f1d8e89"; + url = "https://registry.npmjs.org/ccount/-/ccount-1.0.3.tgz"; + sha512 = "2dqnm6wybhq4zcdf3x97zjibb5zvvcbq3p837sp61rk6wvbk3nqq4lpivvxgvgg4cgl346aqzkpwry1sl7l1yw7ab7d6wqi34h6vpr6"; }; }; "center-align-0.1.3" = { @@ -4072,31 +4090,49 @@ let sha512 = "06jlrzx0nb92910rcfhx55n28jgvhc0qda49scnfyifnmc31dyfqsl5qqiwhsxkrhrc6c07x69q037f1pwg06kkfd1qdzaxz7dj7kk4"; }; }; - "character-entities-1.2.1" = { + "chalk-2.4.0" = { + name = "chalk"; + packageName = "chalk"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz"; + sha512 = "0bnfi1y6b0wl6wn93ykm3awxyjnsknai0hrnvvkxfvjrcsld722r3ljdac9zifvvg8vqd4pxlrhrc4r58yp0xxfxj2bpx18zv8z1gss"; + }; + }; + "chalk-2.4.1" = { + name = "chalk"; + packageName = "chalk"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz"; + sha512 = "1yl5ffjp5w65b9ydnw4vp13n563121hs64xbnajif51grhpqmslaqllj24zm1pfaw9ywvdx69n8ppa3riwlps25k5934zgnbf3pmcrr"; + }; + }; + "character-entities-1.2.2" = { name = "character-entities"; packageName = "character-entities"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/character-entities/-/character-entities-1.2.1.tgz"; - sha1 = "f76871be5ef66ddb7f8f8e3478ecc374c27d6dca"; + url = "https://registry.npmjs.org/character-entities/-/character-entities-1.2.2.tgz"; + sha512 = "30y1wgwpay9yfcz4l3wj9yslp751hch7vhing2f748qn8clk0im3f32xn25k57s6q94mkq0gnk6ga8icz3yzhm752vjq1p7mxghgjmh"; }; }; - "character-entities-html4-1.1.1" = { + "character-entities-html4-1.1.2" = { name = "character-entities-html4"; packageName = "character-entities-html4"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.1.tgz"; - sha1 = "359a2a4a0f7e29d3dc2ac99bdbe21ee39438ea50"; + url = "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.2.tgz"; + sha512 = "0ikbsydxv9ap7im4i2l4nv5gqgilwwbbpxf8xgyknz3cv2jgp4285f0kdl0qcv1xbh9946a9wkcyd4b7mg5nzg0s5dyxnys571xg2mh"; }; }; - "character-entities-legacy-1.1.1" = { + "character-entities-legacy-1.1.2" = { name = "character-entities-legacy"; packageName = "character-entities-legacy"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.1.tgz"; - sha1 = "f40779df1a101872bb510a3d295e1fccf147202f"; + url = "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.2.tgz"; + sha512 = "2ag1akl7wv9ysm4qkkrx8r59mj08xgnavah9hn79ggzknkb5hikn15fdgbcql4yln4a5kbi0b8xykwhy80vrarsbyfqapgdnmapdl7l"; }; }; "character-parser-1.2.1" = { @@ -4117,13 +4153,13 @@ let sha1 = "c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"; }; }; - "character-reference-invalid-1.1.1" = { + "character-reference-invalid-1.1.2" = { name = "character-reference-invalid"; packageName = "character-reference-invalid"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.1.tgz"; - sha1 = "942835f750e4ec61a308e60c2ef8cc1011202efc"; + url = "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.2.tgz"; + sha512 = "1wm395ypw8d7xpq3jffx9m3j24simj28sf9symc9pa94s8l04maqagcy79j62yngip7rvcg4c7zvvxx7hygw9r0k44jaayzwmqz33zc"; }; }; "chardet-0.4.2" = { @@ -4234,13 +4270,13 @@ let sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181"; }; }; - "chrome-trace-event-0.1.2" = { + "chrome-trace-event-0.1.3" = { name = "chrome-trace-event"; packageName = "chrome-trace-event"; - version = "0.1.2"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-0.1.2.tgz"; - sha1 = "90f36885d5345a50621332f0717b595883d5d982"; + url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-0.1.3.tgz"; + sha512 = "3y9nwc7vk3r253x4yrz1ibinpd6xcfy75skh9i5s5gkh3c93sddvlp7dkr5fjs6aarr9n8cy0ck8zwfw10h4fqnw6p6ibgbj74xsfdj"; }; }; "chromecast-player-0.2.3" = { @@ -4333,13 +4369,13 @@ let sha512 = "3hadrrn41znfv3gbqjxf0ckzjmns7w7zgsqw73sdz8nclaff9b0cg1mqhz3zxw3ndnmqqvrdcfykkfpv2v1pv4jdyzcccbn3hsbg4ji"; }; }; - "circular-json-0.5.1" = { + "circular-json-0.5.3" = { name = "circular-json"; packageName = "circular-json"; - version = "0.5.1"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/circular-json/-/circular-json-0.5.1.tgz"; - sha512 = "1myzlq58v42dc2b1i17rcmvj7529spwcqgzc7j2q663a7xkk4nhzqk6hpw20lvp99iaq0k0zg5p0jzf19n7p0vrg45hk160ai31qf2j"; + url = "https://registry.npmjs.org/circular-json/-/circular-json-0.5.3.tgz"; + sha512 = "0gpz4w5khkmnx6wpsh9ccxkwc2cp9i4s9dgf2fi9dgq78ik42cld3sgil5lc3rkjvdp5fgv33c1b8pjvx3dw7kk3q3888ly54x4np32"; }; }; "clarinet-0.11.0" = { @@ -4540,15 +4576,6 @@ let sha512 = "0j60cwp5vpc7v13m0d5rgh6h5jf6yxnywfb1wgbdn7lalklrr5ncvfkkqk6xj7b046bl2jabfqifk3yl6agd93ixfmywif2xfc4hqyr"; }; }; - "clite-0.3.0" = { - name = "clite"; - packageName = "clite"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/clite/-/clite-0.3.0.tgz"; - sha1 = "e7fcbc8cc5bd3e7f8b84ed48db12e9474cc73441"; - }; - }; "cliui-2.1.0" = { name = "cliui"; packageName = "cliui"; @@ -4567,13 +4594,13 @@ let sha1 = "120601537a916d29940f934da3b48d585a39213d"; }; }; - "cliui-4.0.0" = { + "cliui-4.1.0" = { name = "cliui"; packageName = "cliui"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-4.0.0.tgz"; - sha512 = "0mh539939k4z2nhj5h1m8kdr3bfy2f1kmdkss02cdbyabmpdkc6m22llyykymriahf54gpx6qg9v3vrs51gqgrrfhpsgbdndgjdd3cx"; + url = "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz"; + sha512 = "26knyxdavl3y7kq82vfa094ym3n05vy2h2j5srb9fhhy8l43l0kwlasah5i78jks77zqgc373hbf96xcxv6am042gpbw35x452vwlg0"; }; }; "clivas-0.1.4" = { @@ -4846,13 +4873,13 @@ let sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be"; }; }; - "collapse-white-space-1.0.3" = { + "collapse-white-space-1.0.4" = { name = "collapse-white-space"; packageName = "collapse-white-space"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.3.tgz"; - sha1 = "4b906f670e5a963a87b76b0e1689643341b6023c"; + url = "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.4.tgz"; + sha512 = "0iifkywgm8zqn27w0maj5c1yarf294qm5qqcbsajafv8r5f9w02ss33qfngyp59mamv8h8yqx93xpsqnabzn0wnpssrx6qr0ns3bx31"; }; }; "collection-visit-1.0.0" = { @@ -4945,13 +4972,13 @@ let sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63"; }; }; - "colors-1.2.1" = { + "colors-1.2.4" = { name = "colors"; packageName = "colors"; - version = "1.2.1"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-1.2.1.tgz"; - sha512 = "0m8vssxhc3xlx639gz68425ll6mqh0rib6yr7s2v2vg1hwnqka02zijxmg16iyvzmd5sbsczjs2mqs0n428pc1cgkgj439fsa9b1kxk"; + url = "https://registry.npmjs.org/colors/-/colors-1.2.4.tgz"; + sha512 = "1ch53w9md043zff52vsmh89qirws3x7n4zw88xxw0h98fjg71dsll3gh1b598a48xq98d15qpjb07g9ddjsfknrba0byp56fl3a53z9"; }; }; "colour-0.7.1" = { @@ -5630,13 +5657,13 @@ let sha1 = "bd727a7faed77e71ff3985ac93351a912733ad0f"; }; }; - "conventional-changelog-1.1.23" = { + "conventional-changelog-1.1.24" = { name = "conventional-changelog"; packageName = "conventional-changelog"; - version = "1.1.23"; + version = "1.1.24"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.23.tgz"; - sha512 = "2775l94nr8rbnvhihkrwyszncc2g7z1kvbsqpbvni86h8072xvxngbba6yxzzw4dfs57ghklkh9l0ibjy17rl7ldrh6q9lpyd9xf8y8"; + url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.24.tgz"; + sha512 = "3ap10i691k1bd6kslyrxrlrcqzdgdv1mibnraknwvls1n1kcbw77w9d6sljjdan766bhx0md07gz6ihjwsk3s3vhiw7cqvqrd914ryr"; }; }; "conventional-changelog-angular-1.6.6" = { @@ -5657,13 +5684,13 @@ let sha512 = "3m1yhgjwbz0x993dfdw3g2n4svz4ym4k1snhg57iraw1418glgdwpz52j01300v8d1p6ldjjbrv7x3gqa08xcqq6inpkbhv2fmdk4zj"; }; }; - "conventional-changelog-cli-1.3.21" = { + "conventional-changelog-cli-1.3.22" = { name = "conventional-changelog-cli"; packageName = "conventional-changelog-cli"; - version = "1.3.21"; + version = "1.3.22"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.21.tgz"; - sha512 = "1n93839r75vwj9fl4i3x3l06zc84kin92cp8nrlxksga9lqdpxc8b8i72wvi9jvwk0z6i29wisxdpiw6y7rrmdl13ch9f3k7jb43m9b"; + url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.22.tgz"; + sha512 = "1kb6qrs4myjknqg4cpl530gxzbainsvhrzg6hm6xhdjhprby9flw28y92cbimq9cqpc6qq2bldzbnlxf1yzq5yhamwld3pijqhdsy56"; }; }; "conventional-changelog-codemirror-0.3.8" = { @@ -5675,22 +5702,22 @@ let sha512 = "24l71rg9rqfl9aa8fi3c1dc2iqxmdsh6ba8b9rwrrj7dg1gzfc5afw03rns5b1h6zld15942aqsjvwklwp6myzw3q1aakaps0m5jwfw"; }; }; - "conventional-changelog-core-2.0.10" = { + "conventional-changelog-core-2.0.11" = { name = "conventional-changelog-core"; packageName = "conventional-changelog-core"; - version = "2.0.10"; + version = "2.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-2.0.10.tgz"; - sha512 = "19pvarpv78qfmlnsz11c8anrwfg1v04qmwrsrcnai8p3xmbzdyvp1znz9j23l0i6l26yabkd4b631wybnkgxr4qgwzgb9hvf8fhvz8l"; + url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-2.0.11.tgz"; + sha512 = "13c6y0mi0wqrx2rklaiqn2dxy9bsn53fb0w1r7072y8fp2cbnwdvijn8b42qidrmzcbbpcgn4pcx05h9ghl3vak6izlcy3a37lw9x0y"; }; }; - "conventional-changelog-ember-0.3.11" = { + "conventional-changelog-ember-0.3.12" = { name = "conventional-changelog-ember"; packageName = "conventional-changelog-ember"; - version = "0.3.11"; + version = "0.3.12"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.3.11.tgz"; - sha512 = "1pm9wncjsfizvxzf84fp9ywdfm0znj0af0h2012ylazva8iis7zp4vph9ymrnd87kfmdv5gk2s0nsq8gqm6vxh87vbdykg640zczf0j"; + url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.3.12.tgz"; + sha512 = "2hi3q231r8izwb8863rcmm3craji5glcr8icm0ijxa8jdlanshghdb5pnqrqay09kjkaiff9qxpnggb4b1p8gazg2mb6vmkpc1p6qls"; }; }; "conventional-changelog-eslint-1.0.9" = { @@ -6143,13 +6170,13 @@ let sha1 = "e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4"; }; }; - "create-ecdh-4.0.0" = { + "create-ecdh-4.0.1" = { name = "create-ecdh"; packageName = "create-ecdh"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz"; - sha1 = "888c723596cdf7612f6498233eebd7a35301737d"; + url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.1.tgz"; + sha512 = "2whpg1253714sq60ayvsap6n3qdwa9l0zhdlxv2gz8frppds69w1q079pmf55qlygnc7ad499511xsbswy0a39asqcp9a0p1w5c56w9"; }; }; "create-error-class-3.0.2" = { @@ -6161,31 +6188,31 @@ let sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; }; }; - "create-hash-1.1.3" = { + "create-hash-1.2.0" = { name = "create-hash"; packageName = "create-hash"; - version = "1.1.3"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz"; - sha1 = "606042ac8b9262750f483caddab0f5819172d8fd"; + url = "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz"; + sha512 = "055xaldi3hy1bjxhvznh3470j1kq2xk827mxal79bgqik3lblax6s4inxqby27ymgcghl2hn7wnx9fnacmyq3q93hk6y327cc41nkfg"; }; }; - "create-hmac-1.1.6" = { + "create-hmac-1.1.7" = { name = "create-hmac"; packageName = "create-hmac"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz"; - sha1 = "acb9e221a4e17bdb076e90657c42b93e3726cf06"; + url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz"; + sha512 = "0p2jhk94k3as67lhrr1jyljkr0y65snxjzqnix0nifnfcanhilccrzkc47gwlg5wy0m8l1gv12lj78ivgmw5m1ww4f8iylr52bbv49h"; }; }; - "create-torrent-3.30.0" = { + "create-torrent-3.31.0" = { name = "create-torrent"; packageName = "create-torrent"; - version = "3.30.0"; + version = "3.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-torrent/-/create-torrent-3.30.0.tgz"; - sha512 = "15hphpabh12fwvjbaihwjr1sqzj6c4lzcms4jbyy0s2jk1rirrg3cb9743g2a8jw2ihz15yfw0dxqwnc6n5nixiazdg7hwaj8d5nfmi"; + url = "https://registry.npmjs.org/create-torrent/-/create-torrent-3.31.0.tgz"; + sha512 = "1na322prpyqfv81davvqya3rs9pv99rsh611kvqfaps96izmysyw7ppfm3n8qj94y4z6ib8mjs591f6vhdx501v0nqv27pn09qbsfnh"; }; }; "cron-1.3.0" = { @@ -6638,13 +6665,13 @@ let sha512 = "0yyadc98mdpvqdszc1v26zcgd6zqxink2wrhxw9ax60wk0sxqw6mm3m2jbqvibj54p1gjsmgsf1yhv20xsm77kkb7qwj79jlx8kvfad"; }; }; - "dat-doctor-1.3.1" = { + "dat-doctor-1.4.0" = { name = "dat-doctor"; packageName = "dat-doctor"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/dat-doctor/-/dat-doctor-1.3.1.tgz"; - sha512 = "19cfxdik2pv94dbfsz4nm6a0v6vfx5s1isaagmsjrb44czbcl55sjj9nf1302hqc8ckijsdmlsrna02hb0mjzzhsy0m6c8r3cv0wabk"; + url = "https://registry.npmjs.org/dat-doctor/-/dat-doctor-1.4.0.tgz"; + sha512 = "3ysgc2z0pjbka9617lqykw8c0bqbacgixd6j8nlcdi7sz7j94w2sl17mq3xaq7b6kr5wdngi64y584hj8baqgxw2aaavgvk96kff3fl"; }; }; "dat-encoding-4.0.2" = { @@ -6737,13 +6764,13 @@ let sha512 = "13cbr004milnmjisg774rqqw82vyjg1p1d6gvm3xji516rq7zzc1x7da397njig5s2rg2qmw1dixdn4cpkmvc8irq4y1dzb3h46sz2c"; }; }; - "dat-swarm-defaults-1.0.0" = { + "dat-swarm-defaults-1.0.1" = { name = "dat-swarm-defaults"; packageName = "dat-swarm-defaults"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/dat-swarm-defaults/-/dat-swarm-defaults-1.0.0.tgz"; - sha1 = "ba7d58c309cf60c3924afad869b75192b61fe354"; + url = "https://registry.npmjs.org/dat-swarm-defaults/-/dat-swarm-defaults-1.0.1.tgz"; + sha512 = "0kgq4nz4axx3kpfam6lxid88x5gx39gbk3kzcgmbhxld9vwl3469q58hkd2zjripg3955483j450yvszk1pwpn895adz62mn0xsarag"; }; }; "data-uri-to-buffer-1.2.0" = { @@ -6809,15 +6836,6 @@ let sha512 = "3fxpn11cnyqcz25h9krfrpnra9zi1zri0l4f42a89acybqgj6dyr6p0lskcjffahiwxxmmc0zvgalnlk2wa74b764cm7pd5si78884g"; }; }; - "datland-swarm-defaults-1.0.2" = { - name = "datland-swarm-defaults"; - packageName = "datland-swarm-defaults"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/datland-swarm-defaults/-/datland-swarm-defaults-1.0.2.tgz"; - sha1 = "277b895a39f1aa7f96a495a02fb3662a5ed9f2e0"; - }; - }; "debounce-1.1.0" = { name = "debounce"; packageName = "debounce"; @@ -6944,6 +6962,15 @@ let sha1 = "d171a87933252807eb3cb61dc1c1445d078df2d9"; }; }; + "decimal.js-10.0.0" = { + name = "decimal.js"; + packageName = "decimal.js"; + version = "10.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decimal.js/-/decimal.js-10.0.0.tgz"; + sha512 = "1zfwp3adsdq838zcpkpm59x7kdqny1lcdk04r7fw28zy3va4jpjkrkpyyz7ifnzazpks9ky9mjb2xdrkx07nzrh909nzasps0aplcm1"; + }; + }; "decode-uri-component-0.2.0" = { name = "decode-uri-component"; packageName = "decode-uri-component"; @@ -7079,6 +7106,15 @@ let sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f"; }; }; + "deep-extend-0.5.1" = { + name = "deep-extend"; + packageName = "deep-extend"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz"; + sha512 = "3bzqm7nqgh7m8xjhl0q8jc0ccm9riymsfmy0144x6n2qy9v1gin2ww8s9wjlayk0xyzq9cz9pyar02yiv30mhqsj7rmw35ywrsc3jrp"; + }; + }; "deep-is-0.1.3" = { name = "deep-is"; packageName = "deep-is"; @@ -7457,13 +7493,13 @@ let sha1 = "31bb815881c975634c7f3907a5e789341e1560bc"; }; }; - "diffie-hellman-5.0.2" = { + "diffie-hellman-5.0.3" = { name = "diffie-hellman"; packageName = "diffie-hellman"; - version = "5.0.2"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz"; - sha1 = "b5835739270cfe26acf632099fded2a07f209e5e"; + url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz"; + sha512 = "37186rz3862gn294acnwnm59jwm62x1rz9ca0y5anvmj0a7abs4rhw974qp1j684qpd4rxb8c2kagv21hapxfddr2q72zvyv7ya19lj"; }; }; "difflib-0.2.4" = { @@ -7538,6 +7574,15 @@ let sha1 = "f805211dcac74f6bb3a4d5d5541ad783b1b67d22"; }; }; + "dnd-page-scroll-0.0.4" = { + name = "dnd-page-scroll"; + packageName = "dnd-page-scroll"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/dnd-page-scroll/-/dnd-page-scroll-0.0.4.tgz"; + sha512 = "29fmw2g96bpgniybrcvpic1s5bwffgrckiasf479q7lrgca1b8726rr6kwymwsg7d702dgnvii6fjl48pvsfs4jp2svk5mjj15x9y3f"; + }; + }; "dns-discovery-5.6.1" = { name = "dns-discovery"; packageName = "dns-discovery"; @@ -7925,13 +7970,13 @@ let sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; }; }; - "duplexify-3.5.4" = { + "duplexify-3.6.0" = { name = "duplexify"; packageName = "duplexify"; - version = "3.5.4"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.4.tgz"; - sha512 = "2qcky919ps17a9ndimxvcqc73wlrcjmq8ppddbnl45xs9yqp1dmzzfaspfn63xzp14rl3dlk4g6y2ia71s6r9nggd0mb891hcni4di7"; + url = "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz"; + sha512 = "12hhn0igd7y8nmni0qd63wpc9w1fl5rgdh4d1mq65n6r00l7byh7fs5v6m6pd8xzwmnxhrxqrc1y5yh6hswbh2i9ic9la21if5w7vbw"; }; }; "each-async-1.1.1" = { @@ -8087,13 +8132,13 @@ let sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df"; }; }; - "email-validator-1.1.1" = { + "email-validator-2.0.3" = { name = "email-validator"; packageName = "email-validator"; - version = "1.1.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/email-validator/-/email-validator-1.1.1.tgz"; - sha512 = "3ydmy134p48c4zswbvjllak53h545dmzsz77bwpfxjf7aw510yyg4w58pazc2yz9agm93rphfgglrlj9cfkfdygcg1rbv0vj4jhjixy"; + url = "https://registry.npmjs.org/email-validator/-/email-validator-2.0.3.tgz"; + sha1 = "33e50d66f526b97cd72c17205aefaec79c8a2a1e"; }; }; "emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" = { @@ -8934,13 +8979,13 @@ let sha1 = "1c86991d816ad1e504750e73874224ecf3bec508"; }; }; - "eventemitter3-3.0.1" = { + "eventemitter3-3.1.0" = { name = "eventemitter3"; packageName = "eventemitter3"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.0.1.tgz"; - sha512 = "0c5685grn5npm90n22lw5hjz93ga3ffc3j6jk5rs4sz0w7ymwj942v3w94ikkgxpvxj7mfawsdrczwad0b7srbkynbwac7xvsxqzq20"; + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz"; + sha512 = "1q3lcjzcm6cva1avw6qkzynnk6rlcp0pblgxxliwry2z52rz9fy82wh630clfv12i64ygywca69hfbj3ki71hy1in94nqxzka32zwla"; }; }; "events-1.1.1" = { @@ -9690,13 +9735,13 @@ let sha1 = "bd162262c0b6e94bfbcdcf19a3bbb3764f785695"; }; }; - "filesize-3.6.0" = { + "filesize-3.6.1" = { name = "filesize"; packageName = "filesize"; - version = "3.6.0"; + version = "3.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/filesize/-/filesize-3.6.0.tgz"; - sha512 = "1vldkz70kikg8b3ac8l686hm1aplkwqmllm9lg32cvy50hqzcqhari8pl2c41zsvl3bpzzfv7v8db0j91c0qd9vx8wz4w2nhsv9d4w3"; + url = "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz"; + sha512 = "1rfby2136b86m318244b42lrcx9hc28vz71cv9i84cd5z7dd3cwvj1gx8mykbjh937yyi1h4q5kk3vhjcldc8pkd2f7iapszgbd3a7c"; }; }; "filestream-4.1.3" = { @@ -9726,15 +9771,6 @@ let sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; }; }; - "filled-array-1.1.0" = { - name = "filled-array"; - packageName = "filled-array"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz"; - sha1 = "c3c4f6c663b923459a9aa29912d2d031f1507f84"; - }; - }; "filter-obj-1.1.0" = { name = "filter-obj"; packageName = "filter-obj"; @@ -10365,6 +10401,15 @@ let sha512 = "13w7dc43h1mv5a43zps5rwsgvlgpd1pj8rwlhmp1fsbyddysv2zy6d8xyaf9hllnqx3ykw62yv1j5z1y79kvyi6hjgymn9cj2cwj61a"; }; }; + "fs-constants-1.0.0" = { + name = "fs-constants"; + packageName = "fs-constants"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz"; + sha512 = "2iv1j05gzx1sgpckd597sdd2f5x54rgcib3rpwgf31050wqxn5h27map6cn9wk4vix393s4ws2xv6kgps5zfby2iirb2zw8hk1818yb"; + }; + }; "fs-ext-0.6.0" = { name = "fs-ext"; packageName = "fs-ext"; @@ -10500,13 +10545,13 @@ let sha512 = "25k3z64r4fhzjs1crh981lkkvkrhn2xv67k7y00zpnpsl571y5apg0r0kanddirms8kxf2xgf4yx9n2hzs9ml3v3p9qcnqhkh9khzja"; }; }; - "fsevents-1.1.3" = { + "fsevents-1.2.3" = { name = "fsevents"; packageName = "fsevents"; - version = "1.1.3"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz"; - sha512 = "3jw51f4iayxvp9wfxczk1xgcvhsydhlgah64jmpl0mqiii2h8i5pp0lrqac5xn7296gxqrvy4lgm4k4hkifk8gipgqxd68x764gp2jq"; + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.3.tgz"; + sha512 = "3nsv4z5qk2hhcrp6bng9bzpj4nsk0b41i363phlqfp69dq1p2x6a1g3y86z2j7aj4mfj88y1i1agkb1y0pg5c388223h394jqxppvjz"; }; }; "fstream-0.1.31" = { @@ -10734,6 +10779,15 @@ let sha1 = "122e161591e21ff4c52530305693f20e6393a398"; }; }; + "get-stdin-6.0.0" = { + name = "get-stdin"; + packageName = "get-stdin"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz"; + sha512 = "3p9jcnfk7nqnw43xammn5v5z63nxrxgz675sn70q8sma9ick6wq2plbw8b9r5il5f8f9krdamp316rdxvwcm2j4jagvymrjmhfjv7lf"; + }; + }; "get-stream-2.3.1" = { name = "get-stream"; packageName = "get-stream"; @@ -11104,13 +11158,22 @@ let sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; }; }; - "globals-11.4.0" = { + "global-tunnel-ng-2.1.1" = { + name = "global-tunnel-ng"; + packageName = "global-tunnel-ng"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.1.1.tgz"; + sha1 = "dab824432260b6dcb70d173b78288e2fa6e0b880"; + }; + }; + "globals-11.5.0" = { name = "globals"; packageName = "globals"; - version = "11.4.0"; + version = "11.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-11.4.0.tgz"; - sha512 = "0fgjya5jfxjd8gzgpnpig973bbplfq2i5fkfpi5lxyjsi3988wq3by19ka2ql2j4a80l9bk5g5brq4vvd2hr61ak79pzwm5z24ycb0g"; + url = "https://registry.npmjs.org/globals/-/globals-11.5.0.tgz"; + sha512 = "0lyc1vv873r8cgcxlnj32p6nhdbdsjash1kv2cb1chvawmbr0m83kl565iwhvjd3dyz4ba3d3mr80wa21sqj8hv77knsxiw8bx9z345"; }; }; "globals-9.18.0" = { @@ -11176,15 +11239,6 @@ let sha1 = "e5d0ed4af55fc3eef4d56007769d98192bcb2eca"; }; }; - "got-5.7.1" = { - name = "got"; - packageName = "got"; - version = "5.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-5.7.1.tgz"; - sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35"; - }; - }; "got-6.7.1" = { name = "got"; packageName = "got"; @@ -11203,13 +11257,13 @@ let sha512 = "0phvycaq4yl6jjpyc9vwmgghfy7a6nnpynscpgpbx74zjaa5dbpl1ag0jf7jvimfk0vf6xfjqgh67xdlvi0ycgvp1kasajapjiqr5b3"; }; }; - "got-8.3.0" = { + "got-8.3.1" = { name = "got"; packageName = "got"; - version = "8.3.0"; + version = "8.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-8.3.0.tgz"; - sha512 = "2yzcsaq1ajn6bxgq2c4cmzbvysgdd88zypwa96yw57x2rb9gkbww5djfr8m8b1j0bal94khxaz98qjqjf9777ilh3c0l6w25pyp44wh"; + url = "https://registry.npmjs.org/got/-/got-8.3.1.tgz"; + sha512 = "3by57aak00z7wr6h4sax941f2q8mmvcvy815wxm3lzzdkm8l6i6hxbapxxqzsl0mayv96mmlcqnzkx3axzzwk9yx4wr16yqp7wxf8mn"; }; }; "graceful-fs-1.2.3" = { @@ -11626,15 +11680,6 @@ let sha1 = "78c5926893c80215c2b568ae1fd3fcab7a2696b0"; }; }; - "hash-base-2.0.2" = { - name = "hash-base"; - packageName = "hash-base"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz"; - sha1 = "66ea1d856db4e8a5470cadf6fce23ae5244ef2e1"; - }; - }; "hash-base-3.0.4" = { name = "hash-base"; packageName = "hash-base"; @@ -12004,13 +12049,13 @@ let sha1 = "29691b6fc58f4f7e81a3605dca82682b068e4430"; }; }; - "http-parser-js-0.4.11" = { + "http-parser-js-0.4.12" = { name = "http-parser-js"; packageName = "http-parser-js"; - version = "0.4.11"; + version = "0.4.12"; src = fetchurl { - url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.11.tgz"; - sha512 = "1y4az74zgv7jy1cav126lbrbvfqv30p7v3ijmj91ychbg0337k71cwy2n5dvmdfvwhgv3vxxzw2ymxlbj6wh1wf6aycb313c0xpj920"; + url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.12.tgz"; + sha1 = "b9cfbf4a2cf26f0fc34b10ca1489a27771e3474f"; }; }; "http-proxy-1.0.2" = { @@ -12031,6 +12076,15 @@ let sha1 = "06dff292952bf64dbe8471fa9df73066d4f37742"; }; }; + "http-proxy-1.17.0" = { + name = "http-proxy"; + packageName = "http-proxy"; + version = "1.17.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz"; + sha512 = "3z80svhb9hi5fawc8za5qn75lybr53646gfsqm2hkqss4pr186pp7k6f5jnjgw7vrkgjy4yzvb34729q6kvrikn4xgq9gfdg7xsgajd"; + }; + }; "http-proxy-agent-1.0.0" = { name = "http-proxy-agent"; packageName = "http-proxy-agent"; @@ -12040,6 +12094,15 @@ let sha1 = "cc1ce38e453bf984a0f7702d2dd59c73d081284a"; }; }; + "http-proxy-agent-2.1.0" = { + name = "http-proxy-agent"; + packageName = "http-proxy-agent"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz"; + sha512 = "21cixh55jg0m41bhn1xh9pydf31jq4ip5j525hprkimg376jjxms69raxfbsryi0mzhmgw84g1nb3paqznb1l2ajy0zhnkvnl2dn0db"; + }; + }; "http-proxy-middleware-0.17.4" = { name = "http-proxy-middleware"; packageName = "http-proxy-middleware"; @@ -12175,13 +12238,13 @@ let sha512 = "3bml62y8rmpga8wbcxfqm6izvc9xxlblx0vc08r778qa42jgw6fjif4i7f9bj2y98bz4xyimg5vfgch92j6i2l7zcwiq5za8l34cziw"; }; }; - "hypercore-6.13.0" = { + "hypercore-6.14.0" = { name = "hypercore"; packageName = "hypercore"; - version = "6.13.0"; + version = "6.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-6.13.0.tgz"; - sha512 = "056r7rmx6zkfivza10a0fs5p2wlgxrb82gb1sz8hmjgczvc9gx652ybhbckmr0a0bjknc1yzd23zw6v3r2svasymvdfgcp9k98qf1hw"; + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.14.0.tgz"; + sha512 = "3liw77yhvn3nlrczf9s30vvn4bxrn3glh65a2psy1va9pvcnjwx6wfh52v5l9qbd7zyp4q4nb7qrq0n3am7jwmz3dkb5fzvdnlwikkh"; }; }; "hypercore-protocol-6.6.4" = { @@ -12292,13 +12355,13 @@ let sha512 = "0jj1pdq3j9ak8cixn2kjp7ip8hf3xgnb85j4jr32yf9rry620v9072c0kk577mllfk1zl9wzs5ypwzbp7vbhf7j31d5rrqgwb0nldm1"; }; }; - "iconv-lite-0.4.21" = { + "iconv-lite-0.4.22" = { name = "iconv-lite"; packageName = "iconv-lite"; - version = "0.4.21"; + version = "0.4.22"; src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.21.tgz"; - sha512 = "0myjcmxx7dn5liikg8d2zgwb433sk761dfxwwnszyam16rzv5dzva352jrvav7cnambn0ha8fzh6g6xhdhxsd20l5v1p65r6vvmazhj"; + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.22.tgz"; + sha512 = "1fdqcacbfr3yxs5i2kj9kn06lgx2a9yfrdps0hsmw96p1slawiqp3qyfnqczp570wbbi5sr8valqyll05a5gzj3ahppnkl32waaf26l"; }; }; "iconv-lite-0.4.8" = { @@ -12337,13 +12400,13 @@ let sha1 = "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"; }; }; - "ignore-3.3.7" = { + "ignore-3.3.8" = { name = "ignore"; packageName = "ignore"; - version = "3.3.7"; + version = "3.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz"; - sha512 = "0f6xhxww989yic6hwdm8mbylcyakfkrrn22a39wdcc9k842xxyyhzfxkmi79s9gjk3rp3h07n265lf4n51z8yafpdm78d617dxbfqb0"; + url = "https://registry.npmjs.org/ignore/-/ignore-3.3.8.tgz"; + sha512 = "1pcaabfvizn9sa1m16vdnp2rn54fhkmaw4ayj2vb1amgsjn9w7yw64ac4km7avly142z4gzsgyv8g3im9d1qirlpvg0r18h8k2pwj55"; }; }; "ignore-by-default-1.0.1" = { @@ -12598,15 +12661,6 @@ let sha1 = "dbd740cf6ca3b731296a63ce6f6d961851f336df"; }; }; - "inquirer-1.0.3" = { - name = "inquirer"; - packageName = "inquirer"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-1.0.3.tgz"; - sha1 = "ebe3a0948571bcc46ccccbe2f9bcec251e984bd0"; - }; - }; "inquirer-1.2.3" = { name = "inquirer"; packageName = "inquirer"; @@ -12832,22 +12886,22 @@ let sha512 = "1qllik6fjwfq17ic0fxwqyll8mrhmcm36xfsq45xc57mq9ah4i4nn4f8fvgb0gx4kpl3jlpkzndp0xlmmf2mh0xmggw6mhw74fng64v"; }; }; - "is-alphabetical-1.0.1" = { + "is-alphabetical-1.0.2" = { name = "is-alphabetical"; packageName = "is-alphabetical"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.1.tgz"; - sha1 = "c77079cc91d4efac775be1034bf2d243f95e6f08"; + url = "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.2.tgz"; + sha512 = "33gw3lnhmg5snnpbjafj2dnv8f55g5wqmssczl998knajppvmp85gwz712jbk0wcj14np1zmghm3j8lsh0xb6r20pf33k0y2vh4sk2p"; }; }; - "is-alphanumerical-1.0.1" = { + "is-alphanumerical-1.0.2" = { name = "is-alphanumerical"; packageName = "is-alphanumerical"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.1.tgz"; - sha1 = "dfb4aa4d1085e33bdb61c2dee9c80e9c6c19f53b"; + url = "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.2.tgz"; + sha512 = "2r2l14mwrzcvxayr6ib04k4apkpgcs7m41pnw51999y0nld0a8fjhwhvlw2arkda8hf9anc9ld3bxlxgn9psif9ha488x0797zx89x7"; }; }; "is-arguments-1.0.2" = { @@ -12958,13 +13012,13 @@ let sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; }; }; - "is-decimal-1.0.1" = { + "is-decimal-1.0.2" = { name = "is-decimal"; packageName = "is-decimal"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.1.tgz"; - sha1 = "f5fb6a94996ad9e8e3761fbfbd091f1fca8c4e82"; + url = "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.2.tgz"; + sha512 = "1g028jya2ymjyzj2gwna1zpajbhhxh2xh2vsi8dp3zzn9a04sgs9vvbcb66gb439mzb95vfpyydhb2h09r7yzhkfbhijwl2cgpfa72d"; }; }; "is-descriptor-0.1.6" = { @@ -13129,13 +13183,13 @@ let sha1 = "9521c76845cc2610a85203ddf080a958c2ffabc0"; }; }; - "is-hexadecimal-1.0.1" = { + "is-hexadecimal-1.0.2" = { name = "is-hexadecimal"; packageName = "is-hexadecimal"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.1.tgz"; - sha1 = "6e084bbc92061fbb0971ec58b6ce6d404e24da69"; + url = "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.2.tgz"; + sha512 = "3y2isd2s41r430x4v5hbln61sibalz4af6wp5alq3svvvsmnlg0bhyjjf8nzmcgvrc49hw8w3r32bisxc90r8ia6z65v98sgcdpzsvf"; }; }; "is-installed-globally-0.1.0" = { @@ -13795,6 +13849,24 @@ let sha1 = "4d50c318079122000fe5f16af1ff8e1917b77e06"; }; }; + "jquery-3.3.1" = { + name = "jquery"; + packageName = "jquery"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz"; + sha512 = "0d5v4s4626l13llvp6hq5wlghysf7lmfxpp0x0ymvcrvikz2xmyrag81wxndb9fy48mx61gcdlbmdwln78s43givdwpmrk9dir5vfai"; + }; + }; + "jquery-ui-1.12.1" = { + name = "jquery-ui"; + packageName = "jquery-ui"; + version = "1.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.12.1.tgz"; + sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; + }; + }; "js-select-0.6.0" = { name = "js-select"; packageName = "js-select"; @@ -14362,6 +14434,15 @@ let sha512 = "0a7k7qcmcik3dwcjd6f0ngq3i3pdz1cc7xz9ck30gd65nd0ylmgx0kf6b686qd1kk32v3rcila2hdj12cnrjwrjqzs96vjqw5jhj04s"; }; }; + "k-rpc-5.0.0" = { + name = "k-rpc"; + packageName = "k-rpc"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/k-rpc/-/k-rpc-5.0.0.tgz"; + sha512 = "3frk0pf1y988y12m54vkfa2anc0mg6p4yiq5ca8pkvwb56g8n9n58j7f4gh3rnjgw8xb5ib8gc54nmgk8mlsbjm6azf8c2z0ynzc8dw"; + }; + }; "k-rpc-socket-1.8.0" = { name = "k-rpc-socket"; packageName = "k-rpc-socket"; @@ -14543,13 +14624,13 @@ let sha1 = "59c128e0dc5ce410201151194eeb9cbf858650f6"; }; }; - "knockout-3.5.0-beta" = { + "knockout-3.5.0-rc" = { name = "knockout"; packageName = "knockout"; - version = "3.5.0-beta"; + version = "3.5.0-rc"; src = fetchurl { - url = "https://registry.npmjs.org/knockout/-/knockout-3.5.0-beta.tgz"; - sha512 = "2qh1bqb9lj7l92pwcrwmpcanbyn65rmni3swyv6hrphn7xbaw8mkir3w67sf4ardk1iqvz9waalq2wf2rgpvvblhva2n2hssq6as6yr"; + url = "https://registry.npmjs.org/knockout/-/knockout-3.5.0-rc.tgz"; + sha512 = "2nys4zw0rwz0601pzq748gvs8x78n570f2j00ggwakyhbzpdgm90ivscnaym52hf226isgqfdjikxr0nig0hbb28d1xf3s1kpks24vr"; }; }; "kuduscript-1.0.16" = { @@ -14588,15 +14669,6 @@ let sha1 = "72cfc46e3e8d1be651e1ebb54ea9f6ea96f374bb"; }; }; - "latest-version-2.0.0" = { - name = "latest-version"; - packageName = "latest-version"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz"; - sha1 = "56f8d6139620847b8017f8f1f4d78e211324168b"; - }; - }; "latest-version-3.1.0" = { name = "latest-version"; packageName = "latest-version"; @@ -14759,6 +14831,15 @@ let sha1 = "9144b6eebca5f1d0680169f1a6770dcea60b75c3"; }; }; + "leven-2.1.0" = { + name = "leven"; + packageName = "leven"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz"; + sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580"; + }; + }; "levn-0.3.0" = { name = "levn"; packageName = "levn"; @@ -14957,13 +15038,22 @@ let sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; }; }; - "lockfile-1.0.3" = { + "lockfile-1.0.4" = { name = "lockfile"; packageName = "lockfile"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.3.tgz"; - sha1 = "2638fc39a0331e9cac1a04b71799931c9c50df79"; + url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.4.tgz"; + sha512 = "1c3gz9fvn9lz8b2whpi7cifz94b28c4gglngjhlcsfgmgbv0093pdkb4865hv6f2dyypr32f7am9ajrhrbjzv3iw9hw2zni8k0d7xkj"; + }; + }; + "locks-0.2.2" = { + name = "locks"; + packageName = "locks"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/locks/-/locks-0.2.2.tgz"; + sha1 = "259933d1327cbaf0fd3662f8fffde36809d84ced"; }; }; "lodash-1.0.2" = { @@ -15029,6 +15119,15 @@ let sha1 = "bbccce6373a400fbfd0a8c67ca42f6d1ef416432"; }; }; + "lodash-4.17.10" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.10"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz"; + sha512 = "1ba5b80jjzwrh9fbdk5ywv8sic0dynij21wgrfxsfjzwvwd7x1n6azdhdc0vjdxqmcpm0mhshd1k7n2ascxpz00z3p8a3k97mwg1s2i"; + }; + }; "lodash-4.17.5" = { name = "lodash"; packageName = "lodash"; @@ -15254,15 +15353,6 @@ let sha1 = "d09178716ffea4dde9e5fb7b37f6f0802274580c"; }; }; - "lodash.defaultsdeep-4.6.0" = { - name = "lodash.defaultsdeep"; - packageName = "lodash.defaultsdeep"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.0.tgz"; - sha1 = "bec1024f85b1bd96cbea405b23c14ad6443a6f81"; - }; - }; "lodash.escape-3.2.0" = { name = "lodash.escape"; packageName = "lodash.escape"; @@ -15506,6 +15596,15 @@ let sha1 = "936a4e309ef330a7645ed4145986c85ae5b20805"; }; }; + "lodash.set-4.3.2" = { + name = "lodash.set"; + packageName = "lodash.set"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz"; + sha1 = "d8757b1da807dde24816b0d6a84bea1a76230b23"; + }; + }; "lodash.some-4.6.0" = { name = "lodash.some"; packageName = "lodash.some"; @@ -15704,6 +15803,15 @@ let sha1 = "d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"; }; }; + "lossless-json-1.0.2" = { + name = "lossless-json"; + packageName = "lossless-json"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lossless-json/-/lossless-json-1.0.2.tgz"; + sha512 = "2aa3jc0qwf051bd2qwy43qzyfhh8cnqd419qg8cscni65ancjabyrradx3m06r6k84b8r4fc58khm4n6bhk8bpmf282qln79kzpfvfp"; + }; + }; "loud-rejection-1.6.0" = { name = "loud-rejection"; packageName = "loud-rejection"; @@ -15776,6 +15884,15 @@ let sha1 = "ec2bba603f4c5bb3e7a1bf62ce1c1dbc1d474e08"; }; }; + "lru-cache-2.2.4" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "2.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz"; + sha1 = "6c658619becf14031d0d0b594b16042ce4dc063d"; + }; + }; "lru-cache-2.5.2" = { name = "lru-cache"; packageName = "lru-cache"; @@ -16118,13 +16235,13 @@ let sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d"; }; }; - "mdn-data-1.1.0" = { + "mdn-data-1.1.2" = { name = "mdn-data"; packageName = "mdn-data"; - version = "1.1.0"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.0.tgz"; - sha512 = "3av1cblh8aix05jyfib9mhm57qx8fnkxgxs2g493mdm4815pisrn8rzgf9yxjiww6psa619aa8l62xigrbwfcag741bgls227f82blc"; + url = "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.2.tgz"; + sha512 = "3x1bk7zqpzy2m8cc3qv575crg71dgj4mb0vl7nq4g3y8bjl2hw0qv2c6ss1iss6gpdrslaif4yp7ggrf0ldiplmk2ld4p9yhmzsljhx"; }; }; "mdns-js-0.5.0" = { @@ -16172,13 +16289,13 @@ let sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; }; }; - "mediasource-2.1.3" = { + "mediasource-2.2.0" = { name = "mediasource"; packageName = "mediasource"; - version = "2.1.3"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mediasource/-/mediasource-2.1.3.tgz"; - sha1 = "27a9c1aac51bfb6eba96af2d13a84d0b2a8eac68"; + url = "https://registry.npmjs.org/mediasource/-/mediasource-2.2.0.tgz"; + sha512 = "2y4j45xwbrb5cd7b66ndvk5hqy18slbkcvji5krlcg07vpszsrvz732y2ih9li0wn9qh56rx5fz6qb3kdnx877b0snjxhgyj74jlicg"; }; }; "mediawiki-title-0.6.5" = { @@ -16271,13 +16388,13 @@ let sha1 = "72cb668b425228290abbfa856892587308a801fb"; }; }; - "meow-4.0.0" = { + "meow-4.0.1" = { name = "meow"; packageName = "meow"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-4.0.0.tgz"; - sha512 = "2rvzq4615rj5x6za96as8f2xx6zs8m8lzraql20fiv5kr03dm9cy3zqq93ccryl42j9mp2n846pmdpkkh79i15962pnxrppbmxf9vri"; + url = "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz"; + sha512 = "3y4j4aqwlphwsfw770c3x06m26vd7lx810g9q39qdg1gsl1hilx48qfig40d9h3i3nj4pc66w1qg6xsmd9g7fyg77darwsr7qf83i65"; }; }; "merge-1.2.0" = { @@ -16397,13 +16514,13 @@ let sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; }; }; - "micro-9.1.0" = { + "micro-9.1.4" = { name = "micro"; packageName = "micro"; - version = "9.1.0"; + version = "9.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/micro/-/micro-9.1.0.tgz"; - sha512 = "232sjz2wv3xlfz5wf20jihj8avic507avydzwcf4d8zgy07ha9x3pqc6xkw0y8bjk8f8w30fmih38gsdvz7ph92c4kj4cxxfinph2nh"; + url = "https://registry.npmjs.org/micro/-/micro-9.1.4.tgz"; + sha512 = "0zajgsz4m4z0cbibs2vz4brzp6ihq647id9zq67lrcy6nkc9fzjc8fx4g1bsf6nnbjha22fi5sz7lmfq46qixcz807v1p5pjd13kr6r"; }; }; "micro-compress-1.0.0" = { @@ -16505,13 +16622,13 @@ let sha512 = "1x901mk5cdib4xp27v4ivwwr7mhy64r4rk953bzivi5p9lf2bhw88ra2rhkd254xkdx2d3q30zkq239vc4yx4pfsj4hpys8rbr6fif7"; }; }; - "mime-2.2.2" = { + "mime-2.3.1" = { name = "mime"; packageName = "mime"; - version = "2.2.2"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-2.2.2.tgz"; - sha512 = "2ahs0dpq95sf8rrpc024h6jqrvknjnj5v046k755kz6br3pr371y9j9df0srgfszdqviaw4fc6vgngbyik866272hmckw1qif1w7cq3"; + url = "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz"; + sha512 = "1xa7b4k7mp4apq8mvj7912m38gzbcbbddaa92lmbb9cbs08z0b2a4x3kds1sr86br6x6r19kygscf20ky6g6wyx313x1jb8qnajai9q"; }; }; "mime-db-1.12.0" = { @@ -16595,13 +16712,13 @@ let sha1 = "d2d0f1887ca363d1acf0ea86d5c4df293b3fb675"; }; }; - "minimalistic-assert-1.0.0" = { + "minimalistic-assert-1.0.1" = { name = "minimalistic-assert"; packageName = "minimalistic-assert"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"; - sha1 = "702be2dda6b37f4836bcb3f5db56641b64a1d3d3"; + url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"; + sha512 = "3y39pa1xxg7j49vya7xca4p1mg89d0df56hj4yjhpyhmza3g5qvpgp11xs11wkd48zzy7ym970jfbn0ppimmczpijns249j7q05rljj"; }; }; "minimalistic-crypto-utils-1.0.1" = { @@ -16712,13 +16829,13 @@ let sha512 = "1slngp5z9rczjirv9lpdwiv1ap4xmp28jxl4r0i5hpds1khlm89qp70ziz8k5h2vwjph6srjqi3gb2yrwwsnnwli6p8yxvlyx7nn80p"; }; }; - "minipass-2.2.4" = { + "minipass-2.3.0" = { name = "minipass"; packageName = "minipass"; - version = "2.2.4"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-2.2.4.tgz"; - sha512 = "3r74gps1yd2fabj46qd42hknvpkg4aqwg3cdz8xjn8aqww0rsk3nmbgh8p2h0rkjlpxihg1wnpfa4bmpgmnydlbhpb1rz5dcxcwhdc7"; + url = "https://registry.npmjs.org/minipass/-/minipass-2.3.0.tgz"; + sha512 = "1p0pbj1iwnzb7kkqbh5h0vd6byh1l6na1yx69qmbb0wbmwm0qc5g4hn4z6lr8wkzb4kybvd1hjm4hxd93nrdr8ydbqqd9wd1w9bcq4d"; }; }; "minizlib-1.1.0" = { @@ -16730,13 +16847,13 @@ let sha512 = "2agpbdf9h90nhafdam3jwrw8gcz3jw1i40cx6bhwaw8qaf2s863gi2b77l73dc3hmf5dx491hv5km1rqzabgsbpkjxrvdcwy6pr8gp1"; }; }; - "mirror-folder-2.1.1" = { + "mirror-folder-2.2.0" = { name = "mirror-folder"; packageName = "mirror-folder"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-2.1.1.tgz"; - sha1 = "1ad3b777b39e403cc27bf52086c23e41ef4c9604"; + url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-2.2.0.tgz"; + sha512 = "3js8pwgmj4lzzi6nzl0wp021rhsnz31jpkkzdf35xzwm1l65m6ygjf4hz77vvy3dk2h5jb2d32nvzy26n3d5hswg3nb8s0rylvv510r"; }; }; "mississippi-2.0.0" = { @@ -16865,6 +16982,15 @@ let sha512 = "2zf8ycbhqnh9hc6zd3h5s1ii6bjg41z721ffg760j8i045vjjzpzzg542c02ylkic68p0skw1ss97lwphblcw8rip3ik29x9pglhq19"; }; }; + "mold-source-map-0.4.0" = { + name = "mold-source-map"; + packageName = "mold-source-map"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mold-source-map/-/mold-source-map-0.4.0.tgz"; + sha1 = "cf67e0b31c47ab9badb5c9c25651862127bb8317"; + }; + }; "moment-2.1.0" = { name = "moment"; packageName = "moment"; @@ -16901,13 +17027,13 @@ let sha512 = "2zc9qgzsrnp9g4jm4qsb1g1h7w5zmnkz8690br52l83yr9kwhch0mh7r2vdhc706jkrqczia9wbrgkscz0x6k8cwmb3r5jifbpp47v2"; }; }; - "moment-2.22.0" = { + "moment-2.22.1" = { name = "moment"; packageName = "moment"; - version = "2.22.0"; + version = "2.22.1"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.22.0.tgz"; - sha512 = "1v5hxqrwy3yd5023aflf2r1nlkayx1sh9cjjyk3415lba199gkimbq72ba26j3rf2azc0zwhqcz86jh8garynvlh1zm6vr33w59fsyn"; + url = "https://registry.npmjs.org/moment/-/moment-2.22.1.tgz"; + sha512 = "1hzs2jf69lrw76a4diywsl4451qpm3iavk8f324hgb6x3njb64bd77375kwv4ydllzc5cy1v1mabgciln7yhfd9avn7nvcy6i2n84mj"; }; }; "moment-2.6.0" = { @@ -16928,13 +17054,13 @@ let sha1 = "359a19ec634cda3c706c8709adda54c0329aaec4"; }; }; - "moment-timezone-0.5.14" = { + "moment-timezone-0.5.16" = { name = "moment-timezone"; packageName = "moment-timezone"; - version = "0.5.14"; + version = "0.5.16"; src = fetchurl { - url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.14.tgz"; - sha1 = "4eb38ff9538b80108ba467a458f3ed4268ccfcb1"; + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.16.tgz"; + sha512 = "0vnhrg02rgwwa4zzdm7g9j3sd17j8vn30cjiflg86lac0k2fvfaixl7fwd1yx990yr6abq6zhk5gmaqx2vgz22a6akxld35dbvnbpg1"; }; }; "mongodb-1.2.14" = { @@ -16991,13 +17117,13 @@ let sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; }; }; - "mp4-box-encoding-1.1.3" = { + "mp4-box-encoding-1.1.4" = { name = "mp4-box-encoding"; packageName = "mp4-box-encoding"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/mp4-box-encoding/-/mp4-box-encoding-1.1.3.tgz"; - sha512 = "0ma1r4wxwlnxb4xjmq6gga6m4ilsarrcvgj4yrjhngbh5l6gng87i4nakbkm4iqxbnchw75ybivhlfhx8bn4qm525qxirs7gh77i8c9"; + url = "https://registry.npmjs.org/mp4-box-encoding/-/mp4-box-encoding-1.1.4.tgz"; + sha512 = "2i0lx4lji8zy0xwa6bzhqp1wdsigp38jlm3k7h7k6k013j8bp5z0nwyvwkr79ax2f1cw2gp7i2vwx99w5swmwy95l8a6188rvq0v857"; }; }; "mp4-stream-2.0.3" = { @@ -17054,6 +17180,15 @@ let sha1 = "5c0a3f29c8ccffbbb1ec941dcec09d71fa32f36a"; }; }; + "mri-1.1.1" = { + name = "mri"; + packageName = "mri"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mri/-/mri-1.1.1.tgz"; + sha1 = "85aa26d3daeeeedf80dc5984af95cc5ca5cad9f1"; + }; + }; "ms-0.1.0" = { name = "ms"; packageName = "ms"; @@ -17441,15 +17576,6 @@ let sha512 = "349rr7x0djrlkav4gbhkg355852ingn965r0kkch8rr4cwp7qki9676zpq8cq988yszzd2hld6szsbbnd1v6rghzf11abn1nyzlj1vc"; }; }; - "nan-2.3.5" = { - name = "nan"; - packageName = "nan"; - version = "2.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz"; - sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08"; - }; - }; "nan-2.5.1" = { name = "nan"; packageName = "nan"; @@ -17607,6 +17733,15 @@ let sha1 = "17b09581988979fddafe0201e931ba933c96cbb4"; }; }; + "nconf-0.10.0" = { + name = "nconf"; + packageName = "nconf"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nconf/-/nconf-0.10.0.tgz"; + sha512 = "3sx74c63qv1f3qy4gg717mvjyxc0zf66w8n5d156zs30vq256h4akw8d723ggf1qprb0q5yda14zn67rx1jlcwlb2cb0gz918qrga3w"; + }; + }; "nconf-0.6.9" = { name = "nconf"; packageName = "nconf"; @@ -17625,15 +17760,6 @@ let sha1 = "ee4b561dd979a3c58db122e38f196d49d61aeb5b"; }; }; - "nconf-0.7.2" = { - name = "nconf"; - packageName = "nconf"; - version = "0.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/nconf/-/nconf-0.7.2.tgz"; - sha1 = "a05fdf22dc01c378dd5c4df27f2dc90b9aa8bb00"; - }; - }; "ncp-0.4.2" = { name = "ncp"; packageName = "ncp"; @@ -17697,13 +17823,13 @@ let sha1 = "02a71b008eaf7d55ae89fb9fd7685b7b88d7bc29"; }; }; - "needle-2.2.0" = { + "needle-2.2.1" = { name = "needle"; packageName = "needle"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.2.0.tgz"; - sha512 = "3ry4wyih9w3nc3d319bmfd9l4jj8fn00lqfs1d00sfy6azvy66yhm6jv411cn1c1zqc01hvj59dlavm82mzxw5mlar8ck9ylz5s0mkq"; + url = "https://registry.npmjs.org/needle/-/needle-2.2.1.tgz"; + sha512 = "3wnlvqmkxw69bl3clghqpsl1kxqm7hkq4v4ab0rm6dx7xqyg3bn8q38i6hmxm47ccfn6bxcvl53c4madxdgblnm06ika99x4g06rxmp"; }; }; "negotiator-0.3.0" = { @@ -17743,13 +17869,13 @@ let sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394"; }; }; - "neo-async-2.5.0" = { + "neo-async-2.5.1" = { name = "neo-async"; packageName = "neo-async"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/neo-async/-/neo-async-2.5.0.tgz"; - sha512 = "3mgwi8gsgy9lazh0qbpaz8f2l8gvvpn3jp0ghc6xnn0xq0ajdmzp7lfklby1n4s67fy1w5g5gzizyqzds8l3fqsj76cy0mq06rr56cw"; + url = "https://registry.npmjs.org/neo-async/-/neo-async-2.5.1.tgz"; + sha512 = "3256b78wjq1hf7ycvh6ll1wr0kxpqb01lgj1fdirkrx5lpzz12c4ygifw09c2bag30njm8sfjkwkg3gxpy32kl1w3n9x4cizdzgg8nw"; }; }; "nested-error-stacks-1.0.2" = { @@ -17860,13 +17986,13 @@ let sha512 = "34msnfifpdmxl414b8rch1p1six59jd9251b7wkb37n78fa84xfa5f5f5cxxp477wb846nfrsg6b1py3rahz4xdpk17lzzy9kvdjr5f"; }; }; - "node-abi-2.3.0" = { + "node-abi-2.4.1" = { name = "node-abi"; packageName = "node-abi"; - version = "2.3.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-2.3.0.tgz"; - sha512 = "2ijjyzh7bcyyhjaa5m0kdfg6hvxkq6czwxfg6y5d2nl6v7m9qab2ixwgvzbaaivn0r0ig48j4443905167vnpzgvlq5icfj9nyvl2fg"; + url = "https://registry.npmjs.org/node-abi/-/node-abi-2.4.1.tgz"; + sha512 = "3mhfjq1a2ahvkjijw39q6wg6hdiqhz9nf02wjmn61sc0fc7fn0631wxafvny4gjnljin7yv808lhcswg0v1lrcg7k3bqhs7mb16qjd5"; }; }; "node-alias-1.0.4" = { @@ -17995,13 +18121,13 @@ let sha512 = "2cwrivwc0ha272cly9r61bbb14kkl1s1hsmn53yr88b6pfjqj512nac6c5rphc6ak88v8gpl1f879qdd3v7386103zzr7miibpmbhis"; }; }; - "node-red-node-email-0.1.27" = { + "node-red-node-email-0.1.29" = { name = "node-red-node-email"; packageName = "node-red-node-email"; - version = "0.1.27"; + version = "0.1.29"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.27.tgz"; - sha512 = "0r799aswbfv6f9rjdrh6bddfzwj1mpinlani8cwc7zbmipcf4dsyffmf3xghb3hpb15k26jvpb46f2ia8cff1vyn4i9h3jn5dnzflnc"; + url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.29.tgz"; + sha512 = "0xrn1958dc81s10r3ynp4v7697py7bdhawvk71cgca1wi6ysj9w8r1dbfc29znpzz0kpmqy07v0y98nxasy6ing7hsc0kyd8rmrvnps"; }; }; "node-red-node-feedparser-0.1.12" = { @@ -18049,15 +18175,6 @@ let sha512 = "3a22r0jr4112h0vr1smzrsaygc607v13arhjbjwzmy1jvmcrdlq9ydnw96ailkrlnwl3k0l65hjcgnrgkdwyc2qhbfnq2bgk0xz7pkd"; }; }; - "node-status-codes-1.0.0" = { - name = "node-status-codes"; - packageName = "node-status-codes"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz"; - sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"; - }; - }; "node-swt-0.1.1" = { name = "node-swt"; packageName = "node-swt"; @@ -18094,13 +18211,13 @@ let sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907"; }; }; - "node-version-1.1.0" = { + "node-version-1.1.3" = { name = "node-version"; packageName = "node-version"; - version = "1.1.0"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-version/-/node-version-1.1.0.tgz"; - sha512 = "0kc13ygbwm9zdjqv43ccb3mvfhmkwack6ziqcadw58b0f8ssv8h2gdr0br8xaqxpxp0h6pz9vm28yns03nl1vbqbgdankcsb127cmdp"; + url = "https://registry.npmjs.org/node-version/-/node-version-1.1.3.tgz"; + sha512 = "0zdxwcfi3gca8d1jdg3m1gh6b3xxsc7sxpdrnvabc5j5fdgmhcdqaxv3q28rl95ibb7qjcvw7c7k5wzhrvhayb9vn6lr7snabkh8k5c"; }; }; "node-wsfederation-0.1.1" = { @@ -18355,13 +18472,13 @@ let sha1 = "5b1d577e4c8869d6c8603bc89e9cd1637303e46e"; }; }; - "npm-6.0.0-next.0" = { + "npm-6.0.0" = { name = "npm"; packageName = "npm"; - version = "6.0.0-next.0"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.0.0-next.0.tgz"; - sha512 = "06yn34ji94fcadvnj3mafxlv8hnin0mgrdpdjplk33nkjc8niq5kr1kfwikqxj36kyzwdcz8a27599sakryvgvb14mqjabc525ik35x"; + url = "https://registry.npmjs.org/npm/-/npm-6.0.0.tgz"; + sha512 = "1s1pq7rdh5xxd4phq7bf1fikbfwc9iiglgayiy0bf14skvivj96j7f5mzyh3631gzhm7vmpak0k523axik5n4hza8gd8c90s203plqj"; }; }; "npm-bundled-1.0.3" = { @@ -18391,13 +18508,13 @@ let sha1 = "99b85aec29fcb388d2dd351f0013bf5268787e67"; }; }; - "npm-package-arg-6.0.0" = { + "npm-package-arg-6.1.0" = { name = "npm-package-arg"; packageName = "npm-package-arg"; - version = "6.0.0"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.0.0.tgz"; - sha512 = "15a1x3fjip5waxap8dbjkm88j0c2bcnay8pw14p74h1499wznynw2if91shrqlrbzwia09x4xiphp6wkxga5z8vf9k08bjarn1vn047"; + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz"; + sha512 = "14dqycy588sf0k73livvvpmp1dqmbhacc97pq3ksxk1wrm9j82r7hhlrxigj0nb58gz4cbvbh3isj1x3sjiqxs60dhv439xd4zy31nd"; }; }; "npm-packlist-1.1.10" = { @@ -18941,15 +19058,6 @@ let sha1 = "7abc22e644dff63b0a96d5ab7f2790c0f01abc95"; }; }; - "opn-5.2.0" = { - name = "opn"; - packageName = "opn"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/opn/-/opn-5.2.0.tgz"; - sha512 = "12iyalgghs3dj0pfb7rxa013x946169yfsjfd15fsfrx5kv80z2qh082x7v7d91hh7bf9vxcm4wqmyyj9ckk3gnvc7mw77j6fkwdpr5"; - }; - }; "opn-5.3.0" = { name = "opn"; packageName = "opn"; @@ -19292,6 +19400,15 @@ let sha512 = "30jd44ckpmfj9prfhzc8bjvn5b5adxk93g9saif813id8mrvl3g1asrhz9l0bc2rp0i779wnhg1rjw80h2y7zk8v02ghq4bdh4hn4a0"; }; }; + "pac-proxy-agent-2.0.2" = { + name = "pac-proxy-agent"; + packageName = "pac-proxy-agent"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-2.0.2.tgz"; + sha512 = "3222l2ayjn9gj3q7br4vxqz1a5bq5h53fcqvrns3zdlqfinarbi0kgkrlf7vyc7arr7ljks5988y4a6lyd663br23wvg391a4vl0cvh"; + }; + }; "pac-resolver-2.0.0" = { name = "pac-resolver"; packageName = "pac-resolver"; @@ -19301,6 +19418,15 @@ let sha1 = "99b88d2f193fbdeefc1c9a529c1f3260ab5277cd"; }; }; + "pac-resolver-3.0.0" = { + name = "pac-resolver"; + packageName = "pac-resolver"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pac-resolver/-/pac-resolver-3.0.0.tgz"; + sha512 = "1w6mzypllad7wy658kd56fqih6i8x0f841a2pnnn97dhkk810nw3r9f73kpxqa6llkrgy6p1ax4xy1rgbzvrf4zczblvf13pgqkgixm"; + }; + }; "package-json-1.2.0" = { name = "package-json"; packageName = "package-json"; @@ -19310,15 +19436,6 @@ let sha1 = "c8ecac094227cdf76a316874ed05e27cc939a0e0"; }; }; - "package-json-2.4.0" = { - name = "package-json"; - packageName = "package-json"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz"; - sha1 = "0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb"; - }; - }; "package-json-4.0.1" = { name = "package-json"; packageName = "package-json"; @@ -19400,22 +19517,22 @@ let sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751"; }; }; - "parse-asn1-5.1.0" = { + "parse-asn1-5.1.1" = { name = "parse-asn1"; packageName = "parse-asn1"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz"; - sha1 = "37c4f9b7ed3ab65c74817b5f2480937fbf97c712"; + url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz"; + sha512 = "1vq07bq1c0b5v82mknyg2y4lrdy1qmqkzw432f406rx9v2hni3040z270kpsvi2vf4ikq6x0k9g8p16n7aafrwsrpwvx0wpa9z7pz18"; }; }; - "parse-entities-1.1.1" = { + "parse-entities-1.1.2" = { name = "parse-entities"; packageName = "parse-entities"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.1.tgz"; - sha1 = "8112d88471319f27abae4d64964b122fe4e1b890"; + url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.2.tgz"; + sha512 = "192kwdas18b36rdffjp98qvq4ssnmnndryvcz2lzz6g8dnn5pfglabpjcj4p9bngkyp5z0fwvpb0vj4i9zdskp8gzbig6zd1scnbpz4"; }; }; "parse-filepath-1.0.2" = { @@ -19499,13 +19616,22 @@ let sha1 = "a814bd8505e8b58e88eb8ff3e2daff5d19a711b7"; }; }; - "parse-torrent-5.8.3" = { + "parse-torrent-5.9.1" = { name = "parse-torrent"; packageName = "parse-torrent"; - version = "5.8.3"; + version = "5.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.8.3.tgz"; - sha1 = "f95ef23301239609de406794ad9f958a1bca1b6c"; + url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.9.1.tgz"; + sha512 = "31lm2ifw06p00gc0qvxinqvy8afhq0lrg3fpf5rrhb6dqx3avd3ykps8sjv2nj91wf06k62yvn9cvf1f243yzl9xpzy9255556x8bnb"; + }; + }; + "parse-torrent-6.0.0" = { + name = "parse-torrent"; + packageName = "parse-torrent"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-6.0.0.tgz"; + sha512 = "1yr12djspi83lybgycwsaz5wbikbsazwhk2w4xf3niri1lx0p3965br1xbsjw1m0xrzc71q6mw5xz44w0hd3ic5wmb2v62abl7kld16"; }; }; "parse-torrent-file-2.1.4" = { @@ -19517,15 +19643,6 @@ let sha1 = "32d4b6afde631420e5f415919a222b774b575707"; }; }; - "parse-torrent-file-4.1.0" = { - name = "parse-torrent-file"; - packageName = "parse-torrent-file"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.1.0.tgz"; - sha512 = "2cxnv563f946k2ng808an4gcj7yi23drqv8agns3h69drrbv0rq47wdi0xjs0lsvi1i36i7l1wzaci4c4gzzfy8ghfmv4k06hpb5ph5"; - }; - }; "parse5-3.0.3" = { name = "parse5"; packageName = "parse5"; @@ -19940,13 +20057,13 @@ let sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"; }; }; - "pbkdf2-3.0.14" = { + "pbkdf2-3.0.16" = { name = "pbkdf2"; packageName = "pbkdf2"; - version = "3.0.14"; + version = "3.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz"; - sha512 = "30bb7vx0m1k1m3d1i1khgvmgddx3ahqgprs421ssrh5plpx50k5bazsj67gdi7qiknircqy59yxbclq95s2rnmk8ysgkqdpsddijfw2"; + url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz"; + sha512 = "1q07jjlhbbn9fd1aqyrqqxlv184k8ppbafavwvb19lvgbzvp8fnrx7qd9lkbfzb6g4592czp178wizmgvhrhandxngiljv1gczrg06b"; }; }; "peer-wire-protocol-0.7.1" = { @@ -20157,13 +20274,13 @@ let sha1 = "a32b907f28d17f61b74d45d46fd89dea3c4e88b5"; }; }; - "please-upgrade-node-3.0.1" = { + "please-upgrade-node-3.0.2" = { name = "please-upgrade-node"; packageName = "please-upgrade-node"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.0.1.tgz"; - sha1 = "0a681f2c18915e5433a5ca2cd94e0b8206a782db"; + url = "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.0.2.tgz"; + sha512 = "2x54acxamqkr98gwnwf5h8bajcrcsv8b4156laym47ibf2093kbnki8v4dlk7zs8q5dclqnhqdr6p183phna67v0wdwb4mywm4mzjbf"; }; }; "plist-1.2.0" = { @@ -20319,13 +20436,13 @@ let sha512 = "174sg3cs8v8bqg8rnk673qp365n46kls3f3a41pp0jx48qivkg06rck0j2bfyzm5hr1i6kjbcn82h1rkjgfi5jbd0amrd877m3wfpbz"; }; }; - "postcss-6.0.21" = { + "postcss-6.0.22" = { name = "postcss"; packageName = "postcss"; - version = "6.0.21"; + version = "6.0.22"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-6.0.21.tgz"; - sha512 = "1vvp2mzw4gq6zm875fi7hgyypy0a44mbdpv0i4aqxsq8xajdxfyaz4ap4idh29v74ag4z26wla48k315yyg3d0h83zxkn1kniywmxnb"; + url = "https://registry.npmjs.org/postcss/-/postcss-6.0.22.tgz"; + sha512 = "0fdfvn2pq9hvw40s9l174v5rv4d5x3i9xmd8p3mln6bhzrny3v1h0y1324ghq30jnbrvyfam0725r3hsmj28lhhmc32q08lpaa3v1sf"; }; }; "prebuild-install-2.1.2" = { @@ -20337,13 +20454,13 @@ let sha1 = "d9ae0ca85330e03962d93292f95a8b44c2ebf505"; }; }; - "prebuild-install-2.5.1" = { + "prebuild-install-4.0.0" = { name = "prebuild-install"; packageName = "prebuild-install"; - version = "2.5.1"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-2.5.1.tgz"; - sha512 = "013s09xwdppxw3n9h0vz22br6q1dc5rkh8pk9nk3xl0pqsv495qj1y8k5srgmgm7692q1hlyj08nrfbr9nr232bsrkcvhbkm8pzsdfw"; + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-4.0.0.tgz"; + sha512 = "2ffx8smnrj269a2r9lsiv4s71rvzhanb3a3hqg1i8daznmhl0w9lfsylh9hw5si1agsmbsn0j2syp8sn9r7cwxm8ps9b80vwv2v5mpf"; }; }; "precond-0.2.3" = { @@ -20436,6 +20553,15 @@ let sha512 = "2x2535hml3hmhh6qbsl9r97mpa264mbpvmv0lbsqsfkv3sfd8wv7zw1b68555qsj5c6ma4b66qkgdsrr6355lhbmz052hqzq2qx082h"; }; }; + "printf-0.2.5" = { + name = "printf"; + packageName = "printf"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/printf/-/printf-0.2.5.tgz"; + sha1 = "c438ca2ca33e3927671db4ab69c0e52f936a4f0f"; + }; + }; "private-0.1.8" = { name = "private"; packageName = "private"; @@ -20715,6 +20841,15 @@ let sha1 = "57eb5347aa805d74ec681cb25649dba39c933499"; }; }; + "proxy-agent-3.0.0" = { + name = "proxy-agent"; + packageName = "proxy-agent"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-3.0.0.tgz"; + sha512 = "1krp2s6sjv452zj0xhmknrm0769jx2v21bfas1aw2kvg2zhdxcq32w7i6kg87fd9ajyynss694bylaw8khkg8clsgxifz9wg6zgmac3"; + }; + }; "proxy-from-env-1.0.0" = { name = "proxy-from-env"; packageName = "proxy-from-env"; @@ -20787,13 +20922,13 @@ let sha512 = "3jqj1qpjdy5lizvm5mir14vqzzqgaim2yl0iwa164ps6mlp20liyaid1mhr62k23dg0zbkk11zcnzk56d0xvzy9ddbdfmjcnjy3k4mb"; }; }; - "public-encrypt-4.0.0" = { + "public-encrypt-4.0.2" = { name = "public-encrypt"; packageName = "public-encrypt"; - version = "4.0.0"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz"; - sha1 = "39f699f3a46560dd5ebacbca693caf7c65c18cc6"; + url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz"; + sha512 = "38qgcvnxnp4lva9c0x6xhq05hb811n8q5s8dxchm5mg04rv64693a1w2hrhy8lcgbvs36kv003ar1xsh312c866hzvwb0qwr897jhp2"; }; }; "pug-2.0.3" = { @@ -20994,13 +21129,13 @@ let sha512 = "31n24fqakqmhzk2ch644gziskmysmrgiwclsdsr0rwk9spgikqpwickbnayap0rynfjlq72s7iny2p35n3qszypr97ws5njkpx741ig"; }; }; - "pumpify-1.4.0" = { + "pumpify-1.5.0" = { name = "pumpify"; packageName = "pumpify"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/pumpify/-/pumpify-1.4.0.tgz"; - sha512 = "1h37biy199n445y10vpyiswwcxv8zigfqp0b1xwgbyjq51f2dhjn1pcggjc4j5ccbd64l1ivfi0bqinx4m5clcawvwggy7jv93qsjfs"; + url = "https://registry.npmjs.org/pumpify/-/pumpify-1.5.0.tgz"; + sha512 = "0kf28xyrgm26kblaainzcxi4dqyxv0q1a03b55a9sma3b37sf9nkk2ysk7df2r4864ic4yr4j47plap1l0lck1raxnwraz8a29b8s2i"; }; }; "punycode-1.3.2" = { @@ -21219,6 +21354,15 @@ let sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r"; }; }; + "qs-6.5.2" = { + name = "qs"; + packageName = "qs"; + version = "6.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; + sha512 = "0c46ws0x9g3mmkgfmvd78bzvnmv2b8ryg4ah6jvyyqgjv9v994z7xdyvsc4vg9sf98gg7phvy3q1ahgaj5fy3dwzf2rki6bixgl15ip"; + }; + }; "qtdatastream-0.7.1" = { name = "qtdatastream"; packageName = "qtdatastream"; @@ -21309,13 +21453,13 @@ let sha1 = "72f3d865b4b55a259879473e2fb2de3569c69ee2"; }; }; - "random-access-storage-1.1.1" = { + "random-access-storage-1.2.0" = { name = "random-access-storage"; packageName = "random-access-storage"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/random-access-storage/-/random-access-storage-1.1.1.tgz"; - sha512 = "1dswb4yr7m8350bx8z0z19iqgk2a43qbfc1qf8n3w483mqqg0f5gsykd5cg14yy8jik0n9ghy7j2f5kp1anzjna46ih9ncxpm0vq0k1"; + url = "https://registry.npmjs.org/random-access-storage/-/random-access-storage-1.2.0.tgz"; + sha512 = "3jz9jky55s8w0pd5q2v58fxdgca5ymbhlif0zn6jv55jr7bvp1xvn60bz4b2k6m399zzxzdk196385wl3gw6xasxzi3mq8xkp9al118"; }; }; "random-bytes-1.0.0" = { @@ -21453,13 +21597,13 @@ let sha1 = "bcd60c77d3eb93cde0050295c3f379389bc88f89"; }; }; - "raw-socket-1.5.2" = { + "raw-socket-1.6.0" = { name = "raw-socket"; packageName = "raw-socket"; - version = "1.5.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.5.2.tgz"; - sha512 = "0afwhc6rx359xqdsjiyxdlj46kb8mq4lkwy9fhmgszkp8cai9pk8927vxvg4gpg522clwx3dv1xsbnx745pip7crbjdb7kn2i8p2iqy"; + url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.6.0.tgz"; + sha512 = "2268lfw8q4mz0v988by3y0hbad848sx7kmmqm3rk7nbj7xc3sy045adcdbnh3c8vrhk57ljk61wshphgr69y8pw3987f1if369ny7pr"; }; }; "rc-0.4.0" = { @@ -21471,13 +21615,13 @@ let sha1 = "ce24a2029ad94c3a40d09604a87227027d7210d3"; }; }; - "rc-1.2.6" = { + "rc-1.2.7" = { name = "rc"; packageName = "rc"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.2.6.tgz"; - sha1 = "eb18989c6d4f4f162c399f79ddd29f3835568092"; + url = "https://registry.npmjs.org/rc/-/rc-1.2.7.tgz"; + sha512 = "30b4pqzhk8f4ppzyk5diwxac7xpf4hd3rysyin012l59da9v5iaai4wd6yzlz3rjspfvvy191q6qcsw47mwlw9y07n35kzq23rw7lid"; }; }; "rc-config-loader-2.0.1" = { @@ -21705,13 +21849,13 @@ let sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; }; }; - "record-cache-1.0.1" = { + "record-cache-1.0.2" = { name = "record-cache"; packageName = "record-cache"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/record-cache/-/record-cache-1.0.1.tgz"; - sha512 = "3a25qmwmlljwlcc1zpn80lrq3hmwwaykiac95q2gcm1im4wchk9mdhbgak2lidqijaf6mil2rp5sbm0zfzvvh39nz1lmlz72sll39iy"; + url = "https://registry.npmjs.org/record-cache/-/record-cache-1.0.2.tgz"; + sha512 = "2iykkjgwmmcma3306cjzsq34dg6rxfvwr4r11fyq56dfsybp9qwnvhc4fbi3l854zfj71fbw887bgab78ykr6b3m9gdw2lpf5sa53c0"; }; }; "recursive-readdir-2.2.2" = { @@ -21957,13 +22101,13 @@ let sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; }; }; - "render-media-2.12.0" = { + "render-media-3.0.0" = { name = "render-media"; packageName = "render-media"; - version = "2.12.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/render-media/-/render-media-2.12.0.tgz"; - sha512 = "1y1njral1kn6s6g797ji5pl475zcmvcmrgdnv1vliq8q33vw3b4i4i5fsx9yj2ap7jdpb461507wpijixf56rc5q4r97542zvzxq0by"; + url = "https://registry.npmjs.org/render-media/-/render-media-3.0.0.tgz"; + sha512 = "27zqxwa89zq3m0h5qykra6yx9jbc5cljfpx80nrm3y3rhl7ngm17fyb42xhw2sa584x2ld6ll1lnyrhvs3cihfm1ivd9g1hlvjvjaai"; }; }; "render-readme-1.3.1" = { @@ -22200,13 +22344,13 @@ let sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; }; }; - "resolve-1.7.0" = { + "resolve-1.7.1" = { name = "resolve"; packageName = "resolve"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.7.0.tgz"; - sha512 = "2f21aw16zyl0cnz3cr5pvskv4f4lxhp2c14ak8p80kam37nayxdsi9j9n9bcdpilnqbw2pbipxc4nx4vqhyg3mnlhjn1mfip3jikn21"; + url = "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz"; + sha512 = "1zhdyfbs9gfd5iswb8dbra3gljv9mglapgcirci1zsfs78rfn557rp6z81drxxsz0m4w4imm2n9qf7yrchkfjhxz9a0vwp9hwpg1fkk"; }; }; "resolve-dir-1.0.1" = { @@ -22407,13 +22551,13 @@ let sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn"; }; }; - "ripemd160-2.0.1" = { + "ripemd160-2.0.2" = { name = "ripemd160"; packageName = "ripemd160"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz"; - sha1 = "0f4584295c53a3628af7e6d79aca21ce57d1c6e7"; + url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz"; + sha512 = "0hbd4cqbkycj691cj7gm40x3x5w46xk56xkg6n11wskc3k4xbdz1xxxyy6r27rcwipkzp19y1fmpfmb4lgf10l8asn6prdn11m24bla"; }; }; "rndm-1.2.0" = { @@ -22488,22 +22632,22 @@ let sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; }; }; - "run-parallel-1.1.8" = { + "run-parallel-1.1.9" = { name = "run-parallel"; packageName = "run-parallel"; - version = "1.1.8"; + version = "1.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.8.tgz"; - sha512 = "1jzs29b3g9xx5408i8gzyflx0wajfa1ai9sgm63pbvkaas0351j9y92kxq06x8dhg7w829skizs88cdlf156zfm1yk5brbbb0spb6vv"; + url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz"; + sha512 = "3sl2kbxcwy92faw7zm0z4vql32622mag0bh6dv4bjk7cvc8a9sarvdclr9508hknhl0b7v8kzqvg3klvvff7psmvkfg9hy32i4sfjhc"; }; }; - "run-parallel-limit-1.0.4" = { + "run-parallel-limit-1.0.5" = { name = "run-parallel-limit"; packageName = "run-parallel-limit"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/run-parallel-limit/-/run-parallel-limit-1.0.4.tgz"; - sha512 = "2y7d7x3kwlwgyqvhlklxl08rkc63c2ww0jf8pcwlnw4nl2k3wcbkid5fwg130cbkwzslv8c4xrrxccng4yqib8dbcgivyq0h855k4yf"; + url = "https://registry.npmjs.org/run-parallel-limit/-/run-parallel-limit-1.0.5.tgz"; + sha512 = "2b87xk6x0fxs3bls9zzprvxiy2ldgvjxckkfv3ccg23j6f8qv58379pmylkkiv61w6b8qcsmsciwch7lg41nxx0qk6bpgp076h3xiin"; }; }; "run-queue-1.0.3" = { @@ -22515,13 +22659,13 @@ let sha1 = "e848396f057d223f24386924618e25694161ec47"; }; }; - "run-series-1.1.6" = { + "run-series-1.1.8" = { name = "run-series"; packageName = "run-series"; - version = "1.1.6"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/run-series/-/run-series-1.1.6.tgz"; - sha512 = "2rpksrvsfrz5kv3cwr448d60521dlky61p5hp3ci7g8140yfm58g7xak4gkqysfc9cm6hknxyizfs832939fxg01qslxrzlx7l805a1"; + url = "https://registry.npmjs.org/run-series/-/run-series-1.1.8.tgz"; + sha512 = "1gg6q66zyhqr3ylp9zx79v9qyxns1j643p9gkk2kqkijihpvp27ilhzg0qb8kiqxcsw2m0y5rbmdkq6qdhnkar4l088p96i8dhfsv7q"; }; }; "rusha-0.8.13" = { @@ -22578,13 +22722,13 @@ let sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be"; }; }; - "rxjs-5.5.8" = { + "rxjs-5.5.10" = { name = "rxjs"; packageName = "rxjs"; - version = "5.5.8"; + version = "5.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.8.tgz"; - sha512 = "32whnkvnay58zbcwimj3lpagg52k7swjdcys6i14a0im2hj1svh602bpvpb3zrqv36k96a1gsjjzbjxvfy6aj89i838l06mxsiflgh7"; + url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.10.tgz"; + sha512 = "3lc28jznaclc3qcipvf29dnfa11m4xdzyr4gkas29pgp0s4c44f8cyzsxyfwkqzqa8k06q7j7hl5wwyy671d8gdkwl9j76lh2cf4629"; }; }; "safe-buffer-5.0.1" = { @@ -22605,6 +22749,15 @@ let sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh"; }; }; + "safe-buffer-5.1.2" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "3xbm0dkya4bc3zwfwpdzbl8ngq0aai5ihlp2v3s39y7162c7wyvv9izj3g8hv6dy6vm2lq48lmfzygk0kxwbjb6xic7k4a329j99p8r"; + }; + }; "safe-json-parse-1.0.1" = { name = "safe-json-parse"; packageName = "safe-json-parse"; @@ -22641,6 +22794,15 @@ let sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1"; }; }; + "sander-0.5.1" = { + name = "sander"; + packageName = "sander"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sander/-/sander-0.5.1.tgz"; + sha1 = "741e245e231f07cafb6fdf0f133adfa216a502ad"; + }; + }; "sanitize-html-1.18.2" = { name = "sanitize-html"; packageName = "sanitize-html"; @@ -22722,6 +22884,15 @@ let sha1 = "a346bb1acd4207ae70bd7c0c7ca9e566b6baddb8"; }; }; + "secure-keys-1.0.0" = { + name = "secure-keys"; + packageName = "secure-keys"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/secure-keys/-/secure-keys-1.0.0.tgz"; + sha1 = "f0c82d98a3b139a8776a8808050b824431087fca"; + }; + }; "seek-bzip-1.0.5" = { name = "seek-bzip"; packageName = "seek-bzip"; @@ -22821,6 +22992,15 @@ let sha512 = "0h32zh035y8m6dzcqhcymbhwgmc8839fa1hhj0jfh9ivp9kmqfj1sbwnsnkzcn9qm3sqn38sa8ys2g4c638lpnmzjr0a0qndmv7f8p1"; }; }; + "semver-compare-1.0.0" = { + name = "semver-compare"; + packageName = "semver-compare"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz"; + sha1 = "0dee216a1c941ab37e9efb1788f6afc5ff5537fc"; + }; + }; "semver-diff-2.1.0" = { name = "semver-diff"; packageName = "semver-diff"; @@ -22965,13 +23145,13 @@ let sha1 = "90cff19d02e07027fd767f5ead3e7b95d1e7380c"; }; }; - "serialize-javascript-1.4.0" = { + "serialize-javascript-1.5.0" = { name = "serialize-javascript"; packageName = "serialize-javascript"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.4.0.tgz"; - sha1 = "7c958514db6ac2443a8abc062dc9f7886a7f6005"; + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.5.0.tgz"; + sha512 = "2hiydb59y0q07hp3qfs8g9qjhgmhmajps769wpw2f5ghxwy3ibr7y7lnx7q23snmc3asgzhik0444jvfs3d4gmy0qx9w0n0v3q1rbqr"; }; }; "serve-favicon-2.3.2" = { @@ -23316,13 +23496,22 @@ let sha1 = "e9755eda407e96da40c5e5158c9ea37b33becbeb"; }; }; - "simple-get-2.7.0" = { + "simple-get-2.8.1" = { name = "simple-get"; packageName = "simple-get"; - version = "2.7.0"; + version = "2.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-get/-/simple-get-2.7.0.tgz"; - sha512 = "2r1w3cxxmd92r19mjrlzwn6xypjd5vrx0gk21l2bmxcp1x54pavhmifbhq8llxfk6z2lmzly7g3l8rrdl19m65nzlcicwy7cfn3sha6"; + url = "https://registry.npmjs.org/simple-get/-/simple-get-2.8.1.tgz"; + sha512 = "13j7pz8kfspyi25dkkvb6wm5r95yf7adskwf7z46g02vv27clgq9lgpbxx2hy1s5qip45dim625sby77fm4c67h31a0769p5i2qf94m"; + }; + }; + "simple-get-3.0.2" = { + name = "simple-get"; + packageName = "simple-get"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-get/-/simple-get-3.0.2.tgz"; + sha512 = "021na7dsxyawdzbif9l56dzgvzdd5s4kwm09rb8hg3abvr94i05arvn0z6q5vmpi24bmnnp2i677rf7964fza0frx3zx406a82x6kbm"; }; }; "simple-git-1.92.0" = { @@ -23352,13 +23541,13 @@ let sha1 = "4e421f485ac7b13b08077a4476934d52c5ba3bb3"; }; }; - "simple-peer-9.0.0" = { + "simple-peer-9.1.1" = { name = "simple-peer"; packageName = "simple-peer"; - version = "9.0.0"; + version = "9.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.0.0.tgz"; - sha512 = "1fwihnw60ayp1hyj2rp40cshqhi32rj1gjhr060awg35rk762z9a4d15zapvxi76bmdhgs3vs8lv7xmdqxbabg8d3z1xlkq5vnhq0d1"; + url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.1.1.tgz"; + sha512 = "27d9j7ah5ync1cndpinw966zb81lc9z6pc38y8dkc1l5rxdkv3fmf5ilhf0jq94m3qvb2ipldjmvbs1sza5ccvazwlr4pjgfr07ym23"; }; }; "simple-plist-0.2.1" = { @@ -23658,121 +23847,121 @@ let sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l"; }; }; - "snyk-1.71.0" = { + "snyk-1.78.1" = { name = "snyk"; packageName = "snyk"; - version = "1.71.0"; + version = "1.78.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.71.0.tgz"; - sha1 = "842cfed35ffac591ac34824ce0f1467655c5f8f1"; + url = "https://registry.npmjs.org/snyk/-/snyk-1.78.1.tgz"; + sha1 = "a9eefbc97c6f0179f3cc318a4232aacd57e347fe"; }; }; - "snyk-config-1.0.1" = { + "snyk-config-2.1.0" = { name = "snyk-config"; packageName = "snyk-config"; - version = "1.0.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-config/-/snyk-config-1.0.1.tgz"; - sha1 = "f27aec2498b24027ac719214026521591111508f"; + url = "https://registry.npmjs.org/snyk-config/-/snyk-config-2.1.0.tgz"; + sha512 = "0r81kdx8az7nfiv0r36ggarzdw5rzai06qivv1r48xdfax2gdz9axxjhnwyzhf3mpz6245fz2ilc8l349h85s01yh05rxjsjvbg6m8g"; }; }; - "snyk-go-plugin-1.4.6" = { + "snyk-go-plugin-1.5.0" = { name = "snyk-go-plugin"; packageName = "snyk-go-plugin"; - version = "1.4.6"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.4.6.tgz"; - sha512 = "3002f73liv15dpg1ls92j4m50374z69p9ic74zpqmr8mjlxcdv09gcxkdmg0bdkzlj3s02bpmdj7vrkw5jb2k2f6zbrr5g4d18pjy8n"; + url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.5.0.tgz"; + sha512 = "20i967dg1n1pir2j0ivpd72i5j3y9xa3826jvl8jspmg9wfnpfq6x0isp3irw42zrcvflshi0nhk3sckcj3lqgjaw82g14wda28g80z"; }; }; - "snyk-gradle-plugin-1.2.0" = { + "snyk-gradle-plugin-1.3.0" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-1.2.0.tgz"; - sha512 = "1b2bxvwl2v4prlj942i4jkz4mahgp39j7lvy91jzv00nsk59l76b1icn48zj4zk84s00jil3pnxnfzsclhcc612d70s4wwi3x2hrrqn"; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-1.3.0.tgz"; + sha512 = "22av46k72s8cgigsj0ppir7cd1150079mg1hhb8qgkg9a4asdw3wn48ahwra08rai0rd4z4jhwhmhpc7d63np4ivvjdqcy30qzmr9mc"; }; }; - "snyk-module-1.8.1" = { + "snyk-module-1.8.2" = { name = "snyk-module"; packageName = "snyk-module"; - version = "1.8.1"; + version = "1.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-module/-/snyk-module-1.8.1.tgz"; - sha1 = "31d5080fb1c0dfd6fa8567dd34a523fd02bf1fca"; + url = "https://registry.npmjs.org/snyk-module/-/snyk-module-1.8.2.tgz"; + sha512 = "03372r6cvic19gajy5sa3q11sjal4499svhv50bglywf9jfi2555lpnvsshh08kr6krwcmnm7vb3fm4va3pb616h5wy4ln2kxnmva2y"; }; }; - "snyk-mvn-plugin-1.1.1" = { + "snyk-mvn-plugin-1.2.0" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-1.1.1.tgz"; - sha512 = "3h9drys1g2wh3w072rn00zw57g5xy42ap38k05gvdryiphx8p9iksb4azg4dyf2vd616jzslqid45hjd6iphafdzpk4b90mws880hqa"; + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-1.2.0.tgz"; + sha512 = "3pq0wqa8isczv7pcwfm9jfh5qkwjd482hw45m40c5vnnzbxxbji4m1zvxybpzb08azfp6rigblr0hkrhb8m59qf24hcy1scgn3ddr49"; }; }; - "snyk-nuget-plugin-1.3.9" = { + "snyk-nuget-plugin-1.4.0" = { name = "snyk-nuget-plugin"; packageName = "snyk-nuget-plugin"; - version = "1.3.9"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.3.9.tgz"; - sha512 = "017qpf5cy1f0x8apjc1a3qp3aa9w7v7zlyy8jb8r7q4ilsnpdzvywrxhd6s1yy3b9fiylmgmldgdcz77srqq9pm2njvdi80pyd00zqp"; + url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.4.0.tgz"; + sha512 = "1frla7fsnn7ijg088bjqqy7iq5q0if7sz337rb1g6h5kg760z7968yjgi3nprp218vbpqjrf75xpi6m8dj8k04gpfdkb2am9klnymh4"; }; }; - "snyk-php-plugin-1.3.2" = { + "snyk-php-plugin-1.5.0" = { name = "snyk-php-plugin"; packageName = "snyk-php-plugin"; - version = "1.3.2"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.3.2.tgz"; - sha512 = "2fihlcs2qxdbdfy1pjnf7110l6h4r16vkp0q51wqsfd8fw5s1qgb34plii6yhbfbs8a1il93i6hfn93yclbv50m2129wg7naf57jlqi"; + url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.5.0.tgz"; + sha512 = "10p6nq7sxfdfzaqh87s2hnw00vr904bklcscp26yvimdsa5p5n0x4m8ynbiiqa0b35rgp2lpq5qxmybgnshwv8b97fh89vq2i5lsbhx"; }; }; - "snyk-policy-1.10.2" = { + "snyk-policy-1.12.0" = { name = "snyk-policy"; packageName = "snyk-policy"; - version = "1.10.2"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.10.2.tgz"; - sha1 = "2a7bf0f07c7b811b9dda93cf9bbb10dc992dd7bc"; + url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.12.0.tgz"; + sha512 = "3pmnx9hjrlz0gpxy6b2gia65h1rpdalc1g68s759p0ik0xq5rgi8hm3cqnvicg24cgqm8qwdsf5v7bcfxcj3m6yi7rc2wgkf0vahj08"; }; }; - "snyk-python-plugin-1.5.7" = { + "snyk-python-plugin-1.6.0" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; - version = "1.5.7"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.5.7.tgz"; - sha512 = "3fqq6dbx31yysvd835ng60linxmbkzixiqqf28yxq9pdx3x8dq55syhv1g6as3s85wd04q5vc5qlfgdl91jlhwcgjvdwjjr2wwp84pq"; + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.6.0.tgz"; + sha512 = "06n8zx8az0afp7b2gnav664hzmjxg5dp96a5vmy5a58dhr278x6fl7pgsd332ykxanphrm59dsm0hyka2s8wibam2v8wjbgm4xxrlzz"; }; }; - "snyk-resolve-1.0.0" = { + "snyk-resolve-1.0.1" = { name = "snyk-resolve"; packageName = "snyk-resolve"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-resolve/-/snyk-resolve-1.0.0.tgz"; - sha1 = "bbe9196d37f57c39251e6be75ccdd5b2097e99a2"; + url = "https://registry.npmjs.org/snyk-resolve/-/snyk-resolve-1.0.1.tgz"; + sha512 = "2kh7wgl3yjw4am7ay4ag5d6qynbj06jzqf6wph17lhwx9ichwl6adqaf8nbsksib1y65kmvmvqm90j5zqdxfx6qj97qs1kdp0nbxs7g"; }; }; - "snyk-resolve-deps-1.7.0" = { + "snyk-resolve-deps-3.1.0" = { name = "snyk-resolve-deps"; packageName = "snyk-resolve-deps"; - version = "1.7.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-1.7.0.tgz"; - sha1 = "13743a058437dff890baaf437c333c966a743cb6"; + url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-3.1.0.tgz"; + sha512 = "3qk3349lw5q1spqk4q1arw496hbp4d8qlj576whfl710kf7ajwpv4kcak5wprzhvwmqs656q7w71sc0jvz9afprh65rlklx3yaiwl31"; }; }; - "snyk-sbt-plugin-1.2.5" = { + "snyk-sbt-plugin-1.3.0" = { name = "snyk-sbt-plugin"; packageName = "snyk-sbt-plugin"; - version = "1.2.5"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.2.5.tgz"; - sha512 = "183dfn89vslcl63y76jxyndz67f5c8ii4wh0pvbxgzqb3161rz5j5p4k7dv69shiw55q1lyb1j70pjng6rafw5k0jnqc58x63bpqgz8"; + url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.3.0.tgz"; + sha512 = "03bdn4g3836nyv06flg4g6jnr9j297z8ay67jg0k7zfanwg7glaaqbkxzas1bl36jj1snyb8ifb8xvhshbxjbvl6xpngxxpbq3ly729"; }; }; "snyk-tree-1.0.0" = { @@ -23784,13 +23973,13 @@ let sha1 = "0fb73176dbf32e782f19100294160448f9111cc8"; }; }; - "snyk-try-require-1.2.0" = { + "snyk-try-require-1.3.0" = { name = "snyk-try-require"; packageName = "snyk-try-require"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-1.2.0.tgz"; - sha1 = "30fc2b11c07064591ee35780c826be91312f2144"; + url = "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-1.3.0.tgz"; + sha1 = "f35706acf91c8af788d58e1f1ad6bf0fcf6c5493"; }; }; "socket.io-0.9.14" = { @@ -23982,6 +24171,15 @@ let sha512 = "33yfj0m61wn7g9s59m7mxhm6w91nkdrd7hcnnbacrj58zqgykpyr7f6lsggvc9xzysrf951ncxh4malqi11yf8z6909fasllxi6cnxh"; }; }; + "socks-proxy-agent-3.0.1" = { + name = "socks-proxy-agent"; + packageName = "socks-proxy-agent"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-3.0.1.tgz"; + sha512 = "2a5lsw4fry6nqk3jdxvwqrnpasypvl8c4d0kg32912820lc72l7s9jzidfsrn2an9c66xqicspxb2vnir5cjspprs9qklxnd75060b7"; + }; + }; "sodium-javascript-0.5.5" = { name = "sodium-javascript"; packageName = "sodium-javascript"; @@ -23991,13 +24189,13 @@ let sha512 = "3451wvpagbw2ib50galmlfrb5za3zh0ml1irbm2ijd0lbjblg9va4fnag6sfs7msb1m0i5zicz93jwp90c22v0n40qzpczhicg85jah"; }; }; - "sodium-native-2.1.5" = { + "sodium-native-2.1.6" = { name = "sodium-native"; packageName = "sodium-native"; - version = "2.1.5"; + version = "2.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.5.tgz"; - sha512 = "3cwd4rvsggx0lzc7433v6321fjs65q9nqr3c9gcz7j51ca580aq6ciacmmq788yxb3ih78b1fkpkprm75d0hadj3ng2bznc6qsl1var"; + url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.6.tgz"; + sha512 = "3y0f008galwxign4qb49q2kfkhz68nfxazpcq5y63wahaqly89x640nnv8cv4rg9xn1vbp5wia76vkmh1ja13dp95vjzw2lv5q2zymx"; }; }; "sodium-universal-2.0.0" = { @@ -24009,6 +24207,15 @@ let sha512 = "2rd6r7v2i3z76rzvllqx9ywk5f64q23944njcf14vv7x3l0illqn41bgdiifik4kswgys99mxsrqinq8akf3n7b15r9871km74mbivj"; }; }; + "sorcery-0.10.0" = { + name = "sorcery"; + packageName = "sorcery"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sorcery/-/sorcery-0.10.0.tgz"; + sha1 = "8ae90ad7d7cb05fc59f1ab0c637845d5c15a52b7"; + }; + }; "sort-keys-1.1.2" = { name = "sort-keys"; packageName = "sort-keys"; @@ -24207,6 +24414,15 @@ let sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; }; }; + "sourcemap-codec-1.4.1" = { + name = "sourcemap-codec"; + packageName = "sourcemap-codec"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.1.tgz"; + sha512 = "3645hn4agfzixljvwx4l0fwxqvcr6f0j7pvgcdcy34788n1qaabrs1nawn8c10qk8pw4b21mb0f0chgfhl10rzir7y5i2kf2cs5wzc5"; + }; + }; "sparkles-1.0.0" = { name = "sparkles"; packageName = "sparkles"; @@ -24450,13 +24666,13 @@ let sha512 = "00qc3iqsi21cc2az3nz36q88psab4ickpzranndk6vmrb6yhn5xsq3kgp21x3lp0406bdaalpb59xy7zzqnl40ans69v3z2l8z8h52x"; }; }; - "stable-0.1.6" = { + "stable-0.1.8" = { name = "stable"; packageName = "stable"; - version = "0.1.6"; + version = "0.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/stable/-/stable-0.1.6.tgz"; - sha1 = "910f5d2aed7b520c6e777499c1f32e139fdecb10"; + url = "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz"; + sha512 = "3mw0cg71gcp6hfg3x0snaxcva4yqnifs11vbs3ba4agmcz8njmz70ndk5d8z97441jdvjhvb8aq8r44ngd8z4iw5hpgfmff372nlbwf"; }; }; "stack-trace-0.0.10" = { @@ -24891,13 +25107,13 @@ let sha512 = "1r18lbap331hx5hfic2irpd3rai1ymp5s93p5xfzfr0khw9krkx51glwhmdjxbrk07kryqqdc2fly59avw3pq3q2apq7q487q55bh6r"; }; }; - "string2compact-1.2.2" = { + "string2compact-1.2.3" = { name = "string2compact"; packageName = "string2compact"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/string2compact/-/string2compact-1.2.2.tgz"; - sha1 = "420b3a9ee1c46854919b4a2aeac65c43fa50597b"; + url = "https://registry.npmjs.org/string2compact/-/string2compact-1.2.3.tgz"; + sha512 = "2v32r74gw45hwccyyv9br6r685nps3c7z95ik5c9sip5nva4flx1scz0mg3h47hw0xrnfj0wh89binqz26ld86zvqxhai2067g3bi7d"; }; }; "string_decoder-0.10.31" = { @@ -24927,13 +25143,13 @@ let sha512 = "315yd4vzwrwk3vwj1klf46y1cj2jbvf88066y2rnwhksb98phj46jkxixbwsp3h607w7czy7cby522s7sx8mvspdpdm3s72y2ga3x4z"; }; }; - "stringify-entities-1.3.1" = { + "stringify-entities-1.3.2" = { name = "stringify-entities"; packageName = "stringify-entities"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.1.tgz"; - sha1 = "b150ec2d72ac4c1b5f324b51fb6b28c9cdff058c"; + url = "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.2.tgz"; + sha512 = "3f4kckmssz5nm8qwm7plgq1vl73jwzc9k7cf80gwjqvzdysa558x5gfhjws59hhni39yncaly8dm0rwa590k1pblxvg602955041c4y"; }; }; "stringstream-0.0.5" = { @@ -25188,13 +25404,13 @@ let sha1 = "fb15027984751ee7152200e6cd21cd6e19a5de87"; }; }; - "superagent-3.8.2" = { + "superagent-3.8.3" = { name = "superagent"; packageName = "superagent"; - version = "3.8.2"; + version = "3.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/superagent/-/superagent-3.8.2.tgz"; - sha512 = "0sxwwjllf26hx079lw1w3c1zywq2af9ssi7f0n334xzz1mgnfx2lr5l532a988zyi3bigzmfidqgdrfmwv6ghgzs77qsw87yr0zhlc1"; + url = "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz"; + sha512 = "0a4ra91hgzbhnyccsx319r1xzaw4cb3k144g7xrp10y3wckzd98vxhf5vk34cfvvlrav8pyf2vqr11scimkiyivg2w84458q0n2vd0q"; }; }; "supports-color-0.2.0" = { @@ -25251,22 +25467,13 @@ let sha512 = "1flwwfdd7gg94xrc0b2ard3qjx4cpy600q49gx43y8pzvs7j56q78bjhv8mk18vgbggr4fd11jda8ck5cdrkc5jcjs04nlp7kwbg85c"; }; }; - "supports-color-4.5.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz"; - sha1 = "be7a0de484dec5c5cddf8b3d59125044912f635b"; - }; - }; - "supports-color-5.3.0" = { + "supports-color-5.4.0" = { name = "supports-color"; packageName = "supports-color"; - version = "5.3.0"; + version = "5.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz"; - sha512 = "0v9skvg8c5hgqfsm98p7d7hisk11syjdvl3nxid3ik572hbjwv4vyzws7q0n1yz8mvb1asbk00838fi09hyfskrng54icn8nbag98yi"; + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz"; + sha512 = "3ks7qkl6s064qcdc5qnpzcwzcrnlzccz9m3faw54fnmsm2k8fzb9saqr5nhx7w9lnd4nbp0zg047zz8mwsd4fxfnalpb7kra619fdnf"; }; }; "symbol-observable-1.0.1" = { @@ -25405,22 +25612,22 @@ let sha512 = "1ryql8hyrrhd0gdd71ishbj3cnr8ay0i0wpvy9mj3hjiy35cc1wa0h07wz8jwils98j00gr03ix3cf2j1xm43xjn9bsavwn1yr4a0x5"; }; }; - "tar-4.4.1" = { + "tar-4.4.2" = { name = "tar"; packageName = "tar"; - version = "4.4.1"; + version = "4.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.4.1.tgz"; - sha512 = "33gymcvk33znj1lscj0kds60g5jzagw2dcx1fcbpxz85pi21kqlazvwz579p301x0vqvir1nslh901zq28sfx2zpsnd7qldvjpzbsrv"; + url = "https://registry.npmjs.org/tar/-/tar-4.4.2.tgz"; + sha512 = "25ypdsz6l4xmg1f89pjy8s773j3lzx855iiakbdknz115vxyg4p4z1j0i84iyjpzwgfjfs2l2njpd0y2hlr5sh4n01nh6124zs09y85"; }; }; - "tar-fs-1.16.0" = { + "tar-fs-1.16.2" = { name = "tar-fs"; packageName = "tar-fs"; - version = "1.16.0"; + version = "1.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.0.tgz"; - sha512 = "1i39d75rgrl2a3v3x65w7bz6az06sg7xdvp7j9zk5bqilj5znclmr7r5n9l6la6nkqikn4lkhnfrgp4hzbvp6ph77nn53g6zvmdpni3"; + url = "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.2.tgz"; + sha512 = "0ywy8jh175q90rbr38yxx8dzhiyj8ch0jjxxidvjwmkh4s6hi1cp56ibq3aydlqflybssn9cc2cjdq717yqcw70kjsr12f46dd2gn9d"; }; }; "tar-pack-3.4.1" = { @@ -25432,13 +25639,13 @@ let sha512 = "0mgk8jd55vr7i3i29r1skhxwwbqkqfz6mbr32r5nn8h6v5xns8d2rc7835y7wj0zmppckxai7nm8r4s65kkg6yhirnwx33yixn75x1w"; }; }; - "tar-stream-1.5.5" = { + "tar-stream-1.6.0" = { name = "tar-stream"; packageName = "tar-stream"; - version = "1.5.5"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz"; - sha512 = "219gn10gvilrq6h3yshbhn25fx46n0wlgg66h0v326jhzz8gmpxsinb8bnhx1py35z0cv2248v91k2vy6vmkajmvpmkfmizywn601wr"; + url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.0.tgz"; + sha512 = "2kw4php0986jgdzqvrih64plc8md1f1v3wfc8mz3y0lz95dmmvba1lpjmwp1v4crgfky63r8an3syfavn3gb0d56xk7615zy40a47cn"; }; }; "temp-0.6.0" = { @@ -25486,6 +25693,15 @@ let sha1 = "5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2"; }; }; + "tempfile-2.0.0" = { + name = "tempfile"; + packageName = "tempfile"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tempfile/-/tempfile-2.0.0.tgz"; + sha1 = "6b0446856a9b1114d1856ffcbe509cccb0977265"; + }; + }; "term-size-1.2.0" = { name = "term-size"; packageName = "term-size"; @@ -25603,6 +25819,15 @@ let sha1 = "9e785836daf46743145a5984b6268d828528ac6c"; }; }; + "through-2.2.7" = { + name = "through"; + packageName = "through"; + version = "2.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/through/-/through-2.2.7.tgz"; + sha1 = "6e8e21200191d4eb6a99f6f010df46aa1c6eb2bd"; + }; + }; "through-2.3.4" = { name = "through"; packageName = "through"; @@ -25720,15 +25945,6 @@ let sha1 = "f38b0ae81d3747d628001f41dafc652ace671c0a"; }; }; - "timed-out-3.1.3" = { - name = "timed-out"; - packageName = "timed-out"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz"; - sha1 = "95860bfcc5c76c277f8f8326fd0f5b2e20eba217"; - }; - }; "timed-out-4.0.1" = { name = "timed-out"; packageName = "timed-out"; @@ -25747,13 +25963,13 @@ let sha1 = "c9c58b575be8407375cb5e2462dacee74359f41d"; }; }; - "timers-browserify-2.0.6" = { + "timers-browserify-2.0.10" = { name = "timers-browserify"; packageName = "timers-browserify"; - version = "2.0.6"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.6.tgz"; - sha512 = "0zvmxvcvmv91k667dy2hzd9a2knvhizxvbx73gcnbi5na3ypc3mldfljw062d7n6y2mf7n2gwwc5wr4wrdih927fxahg8s0hinyf38x"; + url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz"; + sha512 = "37aksk3ydmwy2n7ffsnbvyrwb5kmz5bhvi5fhyg593qs61x7vi9drblwnri5z4x9mzaz91xxqdgg15f0qmf8cd85wdfax2pbm4vbw32"; }; }; "timespan-2.3.0" = { @@ -25873,13 +26089,13 @@ let sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43"; }; }; - "to-buffer-1.1.0" = { + "to-buffer-1.1.1" = { name = "to-buffer"; packageName = "to-buffer"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.0.tgz"; - sha1 = "375bc03edae5c35a8fa0b3fe95a1f3985db1dcfa"; + url = "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz"; + sha512 = "1b8wsfz1rp8fsb2kz7isrsx292vl5w4cmx9qvivxqsj61avx9ph1azxa6zr3mc85cz8qddbkxm6ski8zvacmpadc22wp6pv5gk427wp"; }; }; "to-fast-properties-1.0.3" = { @@ -25972,13 +26188,13 @@ let sha1 = "2d17d82cf669ada7f9dfe75db4b31f7034b71e29"; }; }; - "torrent-discovery-8.4.0" = { + "torrent-discovery-8.4.1" = { name = "torrent-discovery"; packageName = "torrent-discovery"; - version = "8.4.0"; + version = "8.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-8.4.0.tgz"; - sha512 = "39hhpi3mzygr52pgdah0fvll7mdgmchilxshqjykypiz9167p476sjph4w1qbv98254ij6kdwn9b0j4bwqkcbnr3mspmjh1sm5n8fak"; + url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-8.4.1.tgz"; + sha512 = "39wg1cq3w31h0yhwjl9aacpl9654psnwigdfbxli93xqvfm9w403gppc2r295ikc9rvglirzcyqiafpd6f8jpf65d6119xnwhgvyz1w"; }; }; "torrent-piece-1.1.1" = { @@ -26170,22 +26386,22 @@ let sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003"; }; }; - "trim-trailing-lines-1.1.0" = { + "trim-trailing-lines-1.1.1" = { name = "trim-trailing-lines"; packageName = "trim-trailing-lines"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.0.tgz"; - sha1 = "7aefbb7808df9d669f6da2e438cac8c46ada7684"; + url = "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.1.tgz"; + sha512 = "2d7isckw2m4zqhp0qd4d8d272j8jp09qvqnp1fj3igzqkl7mx75l3fcnr8x1kh64xgf5afr9zyw6wk221mb7ajsk9xvfvfn2vsfyqkd"; }; }; - "trough-1.0.1" = { + "trough-1.0.2" = { name = "trough"; packageName = "trough"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/trough/-/trough-1.0.1.tgz"; - sha1 = "a9fd8b0394b0ae8fff82e0633a0a36ccad5b5f86"; + url = "https://registry.npmjs.org/trough/-/trough-1.0.2.tgz"; + sha512 = "2qhjpmwnyz01jcf1yqjq00my48a3imn5z2z0ha4alfcr3imfpvrcbnv893cw71s7rh9h5icjga9nk180qk07nfmpwmlis66kd8jhy8l"; }; }; "truncate-2.0.1" = { @@ -26251,6 +26467,15 @@ let sha1 = "f23bcd8b7a7b8a864261b2084f66f93193396334"; }; }; + "tunnel-0.0.4" = { + name = "tunnel"; + packageName = "tunnel"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel/-/tunnel-0.0.4.tgz"; + sha1 = "2d3785a158c174c9a16dc2c046ec5fc5f1742213"; + }; + }; "tunnel-0.0.5" = { name = "tunnel"; packageName = "tunnel"; @@ -26386,13 +26611,13 @@ let sha512 = "2gjv6xyp9rqfdfqadayc4b36b79sjdiwsxa38z43v01cdn3xbc06ax90mjv36hxj9j96nfbwr6w1wn7n0zq8f3y3fw4jfy0j1hw5557"; }; }; - "typescript-2.8.1" = { + "typescript-2.8.3" = { name = "typescript"; packageName = "typescript"; - version = "2.8.1"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.8.1.tgz"; - sha512 = "1v0ac83sjf21wg11fpllicxz8irx9yg341zmng7vz15524gbfphc9ch70n4x9r70gm0r4ak79xyaxw9zh6b2cwcs7mg447qvzlxz3q2"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.8.3.tgz"; + sha512 = "2vwhgmdrdw42wwaqbmrnz7zy197hrxl6smkmhrb3n93vsjmqg24a4r10czdralib6qpj82bx2gw97r3gxlspj7y54jswigs2vj3bf1b"; }; }; "typewise-1.0.3" = { @@ -26431,13 +26656,13 @@ let sha1 = "09ec54cd5b11dd5f1ef2fc0ab31d37002ca2b5ad"; }; }; - "ua-parser-js-0.7.17" = { + "ua-parser-js-0.7.18" = { name = "ua-parser-js"; packageName = "ua-parser-js"; - version = "0.7.17"; + version = "0.7.18"; src = fetchurl { - url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.17.tgz"; - sha512 = "39ac4xrr9v9ya7rbn5cz8dss5j3s36yhpj9qrhfxxqzgy1vljns0qfyv7d76lqgdgdbfbrd91kb5x7jlg0fw2r4f3kml0v8xmv545xr"; + url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.18.tgz"; + sha512 = "2fa0nkj7g5jpslp45h1icl5hsw01qmm64x4s6vlxw07v2b80b3myi38r8b2s06h0chbva92bi9dd7hync3lmkfpls9m3h27algg1p1f"; }; }; "uc.micro-1.0.5" = { @@ -26503,13 +26728,13 @@ let sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; }; }; - "uglify-js-3.3.20" = { + "uglify-js-3.3.23" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.3.20"; + version = "3.3.23"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.20.tgz"; - sha512 = "3x6k1plb2hrmm51fn2w7nmi9pixipwj224a4afly17p2mwk75qhycib3zlaj9m0bk43ydfh0h2gv01l1xfhabvjcv36pc7x4xcf94js"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.23.tgz"; + sha512 = "2zylyzplicczqknizbm1mp7grxz6bi6vg03rsld8l18b2rahl9y7b1rj2c3sp75afmmyqlgg57v8c0b1adyqm7arzw8kcc3n6l8mkra"; }; }; "uglify-js-3.3.6" = { @@ -26530,13 +26755,13 @@ let sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; }; }; - "uglifyjs-webpack-plugin-1.2.4" = { + "uglifyjs-webpack-plugin-1.2.5" = { name = "uglifyjs-webpack-plugin"; packageName = "uglifyjs-webpack-plugin"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.4.tgz"; - sha512 = "14jcr2nd1d4l940llkm93b2rm9886qi9vz16ab85nji84bmsr99rvzvv4vwzj3j0m2lpkkm2gskd4p29lv4vzjr76zp6vxwjn71nhng"; + url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.5.tgz"; + sha512 = "15z1mr0hms0qbrip49l6c03ljb7243ag7smh13l8xfd0lgmky3b5pa1c1q4r4cdfwvl4m3yr9adj9grdfqqpgr5vc012gj05kbhk144"; }; }; "uid-0.0.2" = { @@ -26665,15 +26890,6 @@ let sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"; }; }; - "undefsafe-0.0.3" = { - name = "undefsafe"; - packageName = "undefsafe"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/undefsafe/-/undefsafe-0.0.3.tgz"; - sha1 = "ecca3a03e56b9af17385baac812ac83b994a962f"; - }; - }; "undefsafe-2.0.2" = { name = "undefsafe"; packageName = "undefsafe"; @@ -26737,6 +26953,15 @@ let sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; }; }; + "underscore-1.9.0" = { + name = "underscore"; + packageName = "underscore"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.9.0.tgz"; + sha512 = "3w8byp6gw4jzam7sl3g72zy9k8qb67jc9h4fhlhd6xj3zn07rnnm812g9jc6ygfxqi4yv54l800ijnl9b8kizf8wc5582xi4h6pb1g0"; + }; + }; "underscore-contrib-0.3.0" = { name = "underscore-contrib"; packageName = "underscore-contrib"; @@ -26764,13 +26989,13 @@ let sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; }; }; - "unherit-1.1.0" = { + "unherit-1.1.1" = { name = "unherit"; packageName = "unherit"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/unherit/-/unherit-1.1.0.tgz"; - sha1 = "6b9aaedfbf73df1756ad9e316dd981885840cd7d"; + url = "https://registry.npmjs.org/unherit/-/unherit-1.1.1.tgz"; + sha512 = "3k40pnw86jz2238r4fv4sp5sdykrva5gl4azq3yxnhk1mw8biy17b5c71hrzq0sfd48dp0kpq3k04f0k11bxd623qrpw2kmmxbnwxpr"; }; }; "unicode-emoji-modifier-base-1.0.0" = { @@ -26854,31 +27079,31 @@ let sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a"; }; }; - "unist-util-is-2.1.1" = { + "unist-util-is-2.1.2" = { name = "unist-util-is"; packageName = "unist-util-is"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.1.tgz"; - sha1 = "0c312629e3f960c66e931e812d3d80e77010947b"; + url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.2.tgz"; + sha512 = "1bk26f0rhka8jhrbjg0jhfc4cqxz7g5k7z8qxqw0353mfx7nvaq9dqj73s9vr3a0jd1yx4lv64cm6ajji7p55xj3cka1bgxy4mw2ib2"; }; }; - "unist-util-remove-position-1.1.1" = { + "unist-util-remove-position-1.1.2" = { name = "unist-util-remove-position"; packageName = "unist-util-remove-position"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.1.tgz"; - sha1 = "5a85c1555fc1ba0c101b86707d15e50fa4c871bb"; + url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.2.tgz"; + sha512 = "3nrir95gy69ywsf99s11xmdk5dwjkaf1d7jriasr0nljg57cj4i5jxjh70f2hzazfwqfikb6blpn8dl3ck9sq3w578nbmga3cw0s6jz"; }; }; - "unist-util-visit-1.3.0" = { + "unist-util-visit-1.3.1" = { name = "unist-util-visit"; packageName = "unist-util-visit"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.3.0.tgz"; - sha512 = "24s5gpqr3vip7zfd3c81k1mhcj1qzlmjhxpn80n3ay8kkg3zycjdkvi6d78j1d3lva7qr1lqrf2mcz5k41as5vwh8w5xdn52drmhyzn"; + url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.3.1.tgz"; + sha512 = "1lbrqw43r1ckx1i8zqjpyfbvdh3dngb9c6qsk5hcflqkryxzc8icc5vn50xf6vxsgcj4bznzfj10c17rrfd2jlvldhlnlq98ks43xyi"; }; }; "universalify-0.1.1" = { @@ -27025,13 +27250,22 @@ let sha512 = "0xw24ba88hfvwwgniyn17n26av45g1pxqf095231065l4n9dp5w3hyc7azjd8sqyix7pnfx1pmr44fzmwwazkz0ly83cp214g4qk13p"; }; }; - "update-check-1.2.0" = { + "upath-1.0.5" = { + name = "upath"; + packageName = "upath"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/upath/-/upath-1.0.5.tgz"; + sha512 = "31m1lljcfngdnpyz67gpkwvb66gx6750si3jzmf1vg6kq420fq5lcd34cfgp6wz3manjpqbp9i98ax2yjl2xs7mq824chw38vvsgcm9"; + }; + }; + "update-check-1.3.2" = { name = "update-check"; packageName = "update-check"; - version = "1.2.0"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/update-check/-/update-check-1.2.0.tgz"; - sha512 = "1w28g23994qxxlkbmahrqsakjmr6hhknxyg6y109y5ghgph52w51wzyxz2y2z22417298cmyinbc8fjkv64840g61cqv0iziy7bsy14"; + url = "https://registry.npmjs.org/update-check/-/update-check-1.3.2.tgz"; + sha512 = "16lfi8gzdrmk0sq5fbqrq8vy3gmpssr05xac487hmsph1hk0i82n1bp8dklmvnkqk28w74bl8gphkanjn0v8f1walwcbbhpg3mss8fj"; }; }; "update-notifier-0.5.0" = { @@ -27043,15 +27277,6 @@ let sha1 = "07b5dc2066b3627ab3b4f530130f7eddda07a4cc"; }; }; - "update-notifier-0.6.3" = { - name = "update-notifier"; - packageName = "update-notifier"; - version = "0.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-0.6.3.tgz"; - sha1 = "776dec8daa13e962a341e8a1d98354306b67ae08"; - }; - }; "update-notifier-2.3.0" = { name = "update-notifier"; packageName = "update-notifier"; @@ -27061,13 +27286,13 @@ let sha1 = "4e8827a6bb915140ab093559d7014e3ebb837451"; }; }; - "update-notifier-2.4.0" = { + "update-notifier-2.5.0" = { name = "update-notifier"; packageName = "update-notifier"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.4.0.tgz"; - sha1 = "f9b4c700fbfd4ec12c811587258777d563d8c866"; + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz"; + sha512 = "07vkna9y5i0ak6rwcbinrrgpabrcmav91ys805c42jskyc6kfla3wd12klsr858vzv5civi7arh5xz8bv7jdj81zgzyh6j70a31s0w3"; }; }; "update-section-0.3.3" = { @@ -27205,22 +27430,22 @@ let sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; }; }; - "useragent-2.3.0" = { + "useragent-2.2.1" = { name = "useragent"; packageName = "useragent"; - version = "2.3.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz"; - sha512 = "1vqmf9ng5navlr0kvklslvzbqym47sbqblc3i74ln0hswdyd0yx86fj3cnhb2pjjyy3cqs1mq9ywkz92j5x7km2iv1g2jkfkki0f2p0"; + url = "https://registry.npmjs.org/useragent/-/useragent-2.2.1.tgz"; + sha1 = "cf593ef4f2d175875e8bb658ea92e18a4fd06d8e"; }; }; - "ut_metadata-3.2.0" = { + "ut_metadata-3.2.1" = { name = "ut_metadata"; packageName = "ut_metadata"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.2.0.tgz"; - sha512 = "3c8a0bnic4symhd8m0gy22adlj8pkmiclsxbr6j979fwabrj0z74xp2bknfqp57vndr4f79d4mnhygrbvp69xdn911j0q6ljgd1bw8i"; + url = "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.2.1.tgz"; + sha512 = "0d0wdjn4cdn5jqsdma0624pvsxv2zakshxlcx2hm9vrxnr1pvm5al0lzwchkpri3nmsdimf3liv6rr7g5c9z79gphdijzrz19lg7ydn"; }; }; "ut_pex-1.2.0" = { @@ -27340,13 +27565,13 @@ let sha1 = "ae43eb7745f5fe63dcc2f277cb4164ad27087f30"; }; }; - "utp-native-1.7.0" = { + "utp-native-1.7.1" = { name = "utp-native"; packageName = "utp-native"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/utp-native/-/utp-native-1.7.0.tgz"; - sha512 = "1d0ccaz56506y44838shld6zkqx9rcx3cpw5qddbfbyjyjr73704gysrl3qwii6i80kx1i2ysnn8bdx6q0i4biwzjj36ksx2865i0yz"; + url = "https://registry.npmjs.org/utp-native/-/utp-native-1.7.1.tgz"; + sha512 = "2mflgna04nng4cj8z4pr53pw0fm3z447mvbnvcahlvq8wpg46znrvg4fkgh18k14bkiq3gic5d2h975bgy7h7l64cfjpc8r2km3naqm"; }; }; "uue-3.1.2" = { @@ -27610,13 +27835,13 @@ let sha1 = "c0fd6fa484f8debdb771f68c31ed75d88da97fe7"; }; }; - "vfile-location-2.0.2" = { + "vfile-location-2.0.3" = { name = "vfile-location"; packageName = "vfile-location"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.2.tgz"; - sha1 = "d3675c59c877498e492b4756ff65e4af1a752255"; + url = "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.3.tgz"; + sha512 = "3l6rl79knh2zld6jvcxwjk17697nijqykbma3wxj5gcdixc8i4vjj92ad5372yf00x9j7h760s53km1n4ljcxzwl20m1hszi6bpzknc"; }; }; "vhost-3.0.2" = { @@ -27718,6 +27943,15 @@ let sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"; }; }; + "vm-browserify-1.0.1" = { + name = "vm-browserify"; + packageName = "vm-browserify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.0.1.tgz"; + sha512 = "2cfjhw3c398d3nlbi0z1f6jlmjymyk13clnsnvwpa6cgcpbhh0zsghs7zi1fz6ydnbg6ignbbhvzrk44k0mcaps8iiv0q0c29rcpb0j"; + }; + }; "voc-1.1.0" = { name = "voc"; packageName = "voc"; @@ -27880,6 +28114,15 @@ let sha512 = "003dzsqf9q7awjnkv00gwrqw7s8n29y8nmfcmpsl845j2m7rgxxvvd3gld643c92jfwq9yw7ysbaavw9pq1yc5df8yfxmh1sjj64aa5"; }; }; + "watchpack-1.6.0" = { + name = "watchpack"; + packageName = "watchpack"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz"; + sha512 = "34gp4bbaidicl7azgivrrxb9kvdz501gg0xyf88lya75j9wmrbd1rs5rlk2h5g07q5rb453fkjkck54j2qzsdam1qk36bijf5xlg9wb"; + }; + }; "wcwidth-1.0.1" = { name = "wcwidth"; packageName = "wcwidth"; @@ -27943,13 +28186,13 @@ let sha512 = "1bq9cabpvsx4b0aajmbhsgkdzh816rrixhbnsmvcr0ypcndhn5zz9fggfc8i4l2s00b6jhif65phkc9l6zvika8ngb21rip9qx4pj4m"; }; }; - "webtorrent-0.98.24" = { + "webtorrent-0.99.4" = { name = "webtorrent"; packageName = "webtorrent"; - version = "0.98.24"; + version = "0.99.4"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.98.24.tgz"; - sha512 = "1jf65qy9fq5ngb1sv296r6wbahjwac8vkdddpfhwmyvmbxabfyn8vz09d5di8sy69d4w0kyi74kjx09v7rd954cg135kr9smyy615yk"; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.99.4.tgz"; + sha512 = "1d0rpdlr8flkbipr3qhr59qknfc3mlmz8ka9w6mnkbxhdflwky2l1f3z244xzgis509c8r1qyyjskv99ccrmc10rz93l52f4bb7m0kj"; }; }; "whatwg-fetch-2.0.4" = { @@ -28060,15 +28303,6 @@ let sha512 = "39m5b8qc31vxhh0bz14vh9a1kf9znarvlpkf0v6vv1f2dxi61gihav2djq2mn7ns1z3yq6l8pyydj52fyzbm2q04rssrcrv4jbwnc4a"; }; }; - "widest-line-1.0.0" = { - name = "widest-line"; - packageName = "widest-line"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz"; - sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c"; - }; - }; "widest-line-2.0.0" = { name = "widest-line"; packageName = "widest-line"; @@ -28123,15 +28357,6 @@ let sha1 = "f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"; }; }; - "window-size-0.2.0" = { - name = "window-size"; - packageName = "window-size"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz"; - sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075"; - }; - }; "windows-no-runnable-0.0.6" = { name = "windows-no-runnable"; packageName = "windows-no-runnable"; @@ -28222,13 +28447,13 @@ let sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e"; }; }; - "winston-2.4.1" = { + "winston-2.4.2" = { name = "winston"; packageName = "winston"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-2.4.1.tgz"; - sha512 = "2m8ya9y2s295czzzd8yffyny528vfnbjlzz4xpix3c5y51yfmczzbh3v1hkj0kmxwr25c7yp3xxz1vz4skbj93n4ir9gxbp6y9q7zwk"; + url = "https://registry.npmjs.org/winston/-/winston-2.4.2.tgz"; + sha512 = "1n2jk29vqjj4v60j3553gyy1lz5mnm90bf999p4nz6chnmh0izg8c9kf4chy1j68fx8d3mnr5ci5llqr4cjy0n775ydjj2zhrvw0bz1"; }; }; "with-4.0.3" = { @@ -28483,6 +28708,15 @@ let sha1 = "496b2cc109eca8dbacfe2dc72b603c17c5870ad4"; }; }; + "xenvar-0.5.1" = { + name = "xenvar"; + packageName = "xenvar"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xenvar/-/xenvar-0.5.1.tgz"; + sha1 = "f82d2fedee63af76687b70115ce6274dc71310e9"; + }; + }; "xhr-2.4.1" = { name = "xhr"; packageName = "xhr"; @@ -28862,15 +29096,6 @@ let sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; }; }; - "yargs-3.15.0" = { - name = "yargs"; - packageName = "yargs"; - version = "3.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-3.15.0.tgz"; - sha1 = "3d9446ef21fb3791b3985690662e4b9683c7f181"; - }; - }; "yargs-3.32.0" = { name = "yargs"; packageName = "yargs"; @@ -28880,15 +29105,6 @@ let sha1 = "03088e9ebf9e756b69751611d2a5ef591482c995"; }; }; - "yargs-4.8.1" = { - name = "yargs"; - packageName = "yargs"; - version = "4.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz"; - sha1 = "c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0"; - }; - }; "yargs-6.6.0" = { name = "yargs"; packageName = "yargs"; @@ -28925,15 +29141,6 @@ let sha1 = "52acc23feecac34042078ee78c0c007f5085db4c"; }; }; - "yargs-parser-2.4.1" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz"; - sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4"; - }; - }; "yargs-parser-4.2.1" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -29111,10 +29318,10 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.12.0"; + version = "1.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.12.0.tgz"; - sha512 = "1sk9p5lng0hwngvzbz28nwaamf73hyz4pa14fxzmwq11syjfiw8b3p95vig8sabn2zfwi8ddginhg5rvf10a5rgpq3cy608yy7qk21z"; + url = "https://registry.npmjs.org/alloy/-/alloy-1.13.0.tgz"; + sha512 = "30a11iiiihsrqj8dc11n5m57im2300l46cygfh4r1q121m2l0vhzaqkg6p65kd7law25xkviw92zwmkd926n674hkv9gr6vsxrskimh"; }; dependencies = [ sources."JSV-4.0.2" @@ -29123,7 +29330,7 @@ in sources."array-unique-0.3.2" sources."async-2.6.0" sources."babel-code-frame-6.26.0" - (sources."babel-core-6.26.0" // { + (sources."babel-core-6.26.3" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -29145,7 +29352,7 @@ in sources."brace-expansion-1.1.11" sources."chalk-1.1.3" sources."chmodr-1.0.2" - sources."colors-1.2.1" + sources."colors-1.2.4" sources."commander-2.15.1" sources."concat-map-0.0.1" sources."convert-source-map-1.5.1" @@ -29187,7 +29394,7 @@ in sources."strip-ansi-0.1.1" ]; }) - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."loose-envify-1.3.1" sources."matcher-collection-1.0.5" sources."minimatch-3.0.4" @@ -29207,7 +29414,7 @@ in sources."private-0.1.8" sources."regenerator-runtime-0.11.1" sources."repeating-2.0.1" - sources."resolve-1.7.0" + sources."resolve-1.7.1" sources."sax-0.5.8" sources."slash-1.0.0" sources."source-map-0.6.1" @@ -29320,11 +29527,11 @@ in sources."performance-now-2.1.0" sources."punycode-1.4.1" sources."q-1.5.1" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."readable-stream-1.1.14" sources."request-2.85.0" sources."rimraf-2.6.2" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."sntp-2.1.0" sources."sshpk-1.14.1" sources."string_decoder-0.10.31" @@ -29363,7 +29570,7 @@ in dependencies = [ sources."@types/caseless-0.12.1" sources."@types/form-data-2.2.1" - sources."@types/node-8.10.4" + sources."@types/node-8.10.12" sources."@types/request-2.47.0" sources."@types/tough-cookie-2.3.2" sources."@types/uuid-3.4.3" @@ -29634,7 +29841,7 @@ in sources."streamline-0.4.11" ]; }) - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."map-stream-0.1.0" sources."md5.js-1.3.4" sources."mime-db-1.33.0" @@ -29642,7 +29849,7 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.22.0" + sources."moment-2.22.1" (sources."ms-rest-2.3.3" // { dependencies = [ sources."extend-3.0.1" @@ -29653,10 +29860,10 @@ in }) (sources."ms-rest-azure-2.5.5" // { dependencies = [ - sources."@types/node-9.6.2" + sources."@types/node-9.6.12" (sources."adal-node-0.1.28" // { dependencies = [ - sources."@types/node-8.10.4" + sources."@types/node-8.10.12" ]; }) sources."async-2.6.0" @@ -29695,7 +29902,7 @@ in }) sources."punycode-1.4.1" sources."q-0.9.7" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."read-1.0.7" (sources."readable-stream-1.0.34" // { dependencies = [ @@ -29728,7 +29935,7 @@ in }) sources."revalidator-0.1.8" sources."rimraf-2.6.2" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."sax-0.5.2" sources."sntp-2.1.0" sources."source-map-0.1.43" @@ -29933,10 +30140,10 @@ in browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "16.1.1"; + version = "16.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-16.1.1.tgz"; - sha512 = "01ay1w7sndfvwjdc5n7sa9a4yzzrwdr8agj1655dz50f0g034scaqli9v1dngxasi8gk8gqvqcsqnmphvwkj1y6awlq1y5l6bbgc8c9"; + url = "https://registry.npmjs.org/browserify/-/browserify-16.2.0.tgz"; + sha512 = "02kwwi6cvxwcyhv9n13j05y67xdkb4b09p5z7n2sl97sif012i5cibmbz6wqqy89ybqh7s3sbdxqf7g6y2hbl61g81vhrbz9815v2ya"; }; dependencies = [ sources."JSONStream-1.3.2" @@ -29949,7 +30156,7 @@ in sources."assert-1.4.1" sources."astw-2.2.0" sources."balanced-match-1.0.0" - sources."base64-js-1.2.3" + sources."base64-js-1.3.0" sources."bn.js-4.11.8" sources."brace-expansion-1.1.11" sources."brorand-1.1.0" @@ -29960,8 +30167,8 @@ in ]; }) sources."browserify-aes-1.2.0" - sources."browserify-cipher-1.0.0" - sources."browserify-des-1.0.0" + sources."browserify-cipher-1.0.1" + sources."browserify-des-1.0.1" sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" @@ -29978,20 +30185,16 @@ in sources."constants-browserify-1.0.0" sources."convert-source-map-1.1.3" sources."core-util-is-1.0.2" - sources."create-ecdh-4.0.0" - sources."create-hash-1.1.3" - sources."create-hmac-1.1.6" - (sources."crypto-browserify-3.12.0" // { - dependencies = [ - sources."hash-base-2.0.2" - ]; - }) + sources."create-ecdh-4.0.1" + sources."create-hash-1.2.0" + sources."create-hmac-1.1.7" + sources."crypto-browserify-3.12.0" sources."date-now-0.1.4" sources."defined-1.0.0" sources."deps-sort-2.0.0" sources."des.js-1.0.0" sources."detective-5.1.0" - sources."diffie-hellman-5.0.2" + sources."diffie-hellman-5.0.3" sources."domain-browser-1.2.0" sources."duplexer2-0.1.4" sources."elliptic-6.4.0" @@ -30007,7 +30210,6 @@ in sources."htmlescape-1.1.1" sources."https-browserify-1.0.0" sources."ieee754-1.1.11" - sources."indexof-0.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."inline-source-map-0.6.2" @@ -30022,7 +30224,7 @@ in sources."lodash.memoize-3.0.4" sources."md5.js-1.3.4" sources."miller-rabin-4.0.1" - sources."minimalistic-assert-1.0.0" + sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -30037,15 +30239,15 @@ in sources."os-browserify-0.3.0" sources."pako-1.0.6" sources."parents-1.0.1" - sources."parse-asn1-5.1.0" + sources."parse-asn1-5.1.1" sources."path-browserify-0.0.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.5" sources."path-platform-0.11.15" - sources."pbkdf2-3.0.14" + sources."pbkdf2-3.0.16" sources."process-0.11.10" sources."process-nextick-args-2.0.0" - sources."public-encrypt-4.0.0" + sources."public-encrypt-4.0.2" sources."punycode-1.4.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" @@ -30055,12 +30257,11 @@ in (sources."readable-stream-2.3.6" // { dependencies = [ sources."isarray-1.0.0" - sources."string_decoder-1.1.1" ]; }) - sources."resolve-1.7.0" - sources."ripemd160-2.0.1" - sources."safe-buffer-5.1.1" + sources."resolve-1.7.1" + sources."ripemd160-2.0.2" + sources."safe-buffer-5.1.2" sources."sha.js-2.4.11" sources."shasum-1.0.2" sources."shell-quote-1.6.1" @@ -30069,7 +30270,7 @@ in sources."stream-combiner2-1.1.1" sources."stream-http-2.8.1" sources."stream-splicer-2.0.0" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" (sources."subarg-1.0.0" // { dependencies = [ sources."minimist-1.2.0" @@ -30094,7 +30295,7 @@ in ]; }) sources."util-deprecate-1.0.2" - sources."vm-browserify-0.0.4" + sources."vm-browserify-1.0.1" sources."wrappy-1.0.2" sources."xtend-4.0.1" ]; @@ -30129,7 +30330,7 @@ in sources."async-0.2.10" sources."aws-sign-0.2.0" sources."balanced-match-1.0.0" - sources."base64-js-1.2.3" + sources."base64-js-1.3.0" sources."bencode-2.0.0" sources."bitfield-0.1.0" sources."bittorrent-dht-6.4.2" @@ -30273,8 +30474,8 @@ in sources."optjs-3.2.2" sources."pad-0.0.5" sources."parse-json-2.2.0" - sources."parse-torrent-5.8.3" - sources."parse-torrent-file-4.1.0" + sources."parse-torrent-5.9.1" + sources."parse-torrent-file-2.1.4" sources."path-exists-2.1.0" sources."path-is-absolute-1.0.1" sources."path-type-1.1.0" @@ -30289,13 +30490,12 @@ in sources."bencode-0.7.0" sources."debug-3.1.0" sources."end-of-stream-0.1.5" - sources."get-stdin-5.0.1" + sources."get-stdin-6.0.0" sources."isarray-1.0.0" sources."magnet-uri-4.2.3" sources."minimist-0.0.10" sources."object-assign-4.1.1" sources."once-1.2.0" - sources."parse-torrent-file-2.1.4" sources."readable-stream-2.3.6" sources."safe-buffer-5.0.1" sources."string_decoder-1.1.1" @@ -30326,7 +30526,7 @@ in sources."qs-0.5.6" sources."query-string-1.0.1" sources."random-access-file-2.0.1" - sources."random-access-storage-1.1.1" + sources."random-access-storage-1.2.0" sources."random-iterate-1.0.1" sources."randombytes-2.0.6" sources."range-parser-1.2.0" @@ -30336,7 +30536,6 @@ in sources."read-pkg-up-1.0.1" (sources."read-torrent-1.3.0" // { dependencies = [ - sources."bencode-0.7.0" sources."magnet-uri-2.0.1" sources."mime-1.2.11" (sources."parse-torrent-4.1.0" // { @@ -30344,7 +30543,6 @@ in sources."magnet-uri-4.2.3" ]; }) - sources."parse-torrent-file-2.1.4" sources."thirty-two-0.0.2" ]; }) @@ -30355,16 +30553,16 @@ in sources."request-2.16.6" sources."rimraf-2.6.2" sources."router-0.6.2" - sources."run-parallel-1.1.8" - sources."run-series-1.1.6" + sources."run-parallel-1.1.9" + sources."run-series-1.1.8" sources."rusha-0.8.13" sources."rx-2.5.3" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."sax-1.2.4" sources."semver-5.5.0" sources."signal-exit-3.0.2" sources."simple-concat-1.0.0" - sources."simple-get-2.7.0" + sources."simple-get-2.8.1" sources."simple-peer-6.4.4" sources."simple-sha1-2.1.0" (sources."simple-websocket-4.3.1" // { @@ -30387,7 +30585,7 @@ in ]; }) sources."stream-transcoder-0.0.5" - sources."string2compact-1.2.2" + sources."string2compact-1.2.3" sources."string_decoder-0.10.31" sources."strip-ansi-2.0.1" sources."strip-bom-2.0.0" @@ -30494,14 +30692,14 @@ in sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."axios-0.17.1" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."cli-cursor-2.1.0" sources."cli-spinners-1.3.1" sources."cli-table2-0.2.0" sources."code-point-at-1.1.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."colors-1.2.1" + sources."colors-1.2.4" sources."commander-2.15.1" sources."debug-3.1.0" sources."escape-string-regexp-1.0.5" @@ -30521,7 +30719,7 @@ in sources."signal-exit-3.0.2" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" ]; buildInputs = globalBuildInputs; meta = { @@ -30555,7 +30753,7 @@ in sources."stack-trace-0.0.10" sources."statsd-parser-0.0.4" sources."strftime-0.10.0" - sources."winston-2.4.1" + sources."winston-2.4.2" ]; buildInputs = globalBuildInputs; meta = { @@ -30601,7 +30799,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-0.0.8" sources."bcrypt-pbkdf-1.0.1" - sources."big-integer-1.6.27" + sources."big-integer-1.6.28" sources."block-stream-0.0.9" sources."bn.js-4.11.8" (sources."body-parser-1.18.2" // { @@ -30626,8 +30824,8 @@ in ]; }) sources."browserify-aes-1.2.0" - sources."browserify-cipher-1.0.0" - sources."browserify-des-1.0.0" + sources."browserify-cipher-1.0.1" + sources."browserify-des-1.0.1" sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-transform-tools-1.7.0" @@ -30684,9 +30882,8 @@ in (sources."cordova-lib-8.0.0" // { dependencies = [ sources."acorn-4.0.13" - sources."base64-js-1.2.3" + sources."base64-js-1.3.0" sources."glob-7.1.1" - sources."hash-base-2.0.2" sources."isarray-1.0.0" sources."minimist-1.2.0" sources."nopt-4.0.1" @@ -30698,7 +30895,9 @@ in sources."process-nextick-args-2.0.0" sources."q-1.0.1" sources."qs-6.3.2" + sources."safe-buffer-5.1.1" sources."shelljs-0.3.0" + sources."underscore-1.8.3" sources."uuid-3.2.1" sources."xmlbuilder-8.2.2" ]; @@ -30710,15 +30909,15 @@ in ]; }) sources."core-util-is-1.0.2" - sources."create-ecdh-4.0.0" - sources."create-hash-1.1.3" - sources."create-hmac-1.1.6" + sources."create-ecdh-4.0.1" + sources."create-hash-1.2.0" + sources."create-hmac-1.1.7" sources."cryptiles-2.0.5" sources."crypto-browserify-3.12.0" sources."dashdash-1.14.1" sources."date-now-0.1.4" sources."debug-2.6.9" - sources."deep-extend-0.4.2" + sources."deep-extend-0.5.1" sources."defined-1.0.0" sources."delayed-stream-1.0.0" (sources."dep-graph-1.1.0" // { @@ -30737,11 +30936,11 @@ in sources."destroy-1.0.4" sources."detect-indent-5.0.0" sources."detective-4.7.1" - sources."diffie-hellman-5.0.2" + sources."diffie-hellman-5.0.3" sources."domain-browser-1.1.7" sources."dot-prop-3.0.0" sources."duplexer2-0.1.4" - sources."duplexify-3.5.4" + sources."duplexify-3.6.0" sources."ecc-jsbn-0.1.1" sources."editor-1.0.0" sources."ee-first-1.1.1" @@ -30862,7 +31061,7 @@ in sources."mime-1.4.1" sources."mime-db-1.33.0" sources."mime-types-2.1.18" - sources."minimalistic-assert-1.0.0" + sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -30874,7 +31073,7 @@ in sources."nested-error-stacks-1.0.2" sources."nopt-3.0.1" sources."normalize-package-data-2.4.0" - sources."npm-package-arg-6.0.0" + sources."npm-package-arg-6.1.0" sources."number-is-nan-1.0.1" sources."oauth-sign-0.8.2" sources."object-assign-4.1.1" @@ -30894,14 +31093,14 @@ in sources."package-json-1.2.0" sources."pako-0.2.9" sources."parents-1.0.1" - sources."parse-asn1-5.1.0" + sources."parse-asn1-5.1.1" sources."parseurl-1.3.2" sources."path-browserify-0.0.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.5" sources."path-platform-0.11.15" sources."path-to-regexp-0.1.7" - sources."pbkdf2-3.0.14" + sources."pbkdf2-3.0.16" sources."pegjs-0.10.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" @@ -30912,7 +31111,7 @@ in sources."promzard-0.3.0" sources."properties-parser-0.3.1" sources."proxy-addr-2.0.3" - sources."public-encrypt-4.0.0" + sources."public-encrypt-4.0.2" sources."punycode-1.4.1" sources."q-1.5.1" sources."qs-6.5.1" @@ -30927,7 +31126,7 @@ in sources."http-errors-1.6.2" ]; }) - sources."rc-1.2.6" + sources."rc-1.2.7" sources."read-1.0.7" sources."read-all-stream-3.1.0" sources."read-only-stream-2.0.0" @@ -30942,13 +31141,13 @@ in sources."registry-url-3.1.0" sources."repeating-1.1.3" sources."request-2.79.0" - sources."resolve-1.7.0" + sources."resolve-1.7.1" sources."restore-cursor-1.0.1" sources."rimraf-2.6.2" - sources."ripemd160-2.0.1" + sources."ripemd160-2.0.2" sources."run-async-0.1.0" sources."rx-lite-3.1.2" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."sax-0.3.5" sources."semver-5.5.0" sources."semver-diff-2.1.0" @@ -31002,7 +31201,7 @@ in sources."type-is-1.6.16" sources."typedarray-0.0.6" sources."umd-3.0.3" - sources."underscore-1.8.3" + sources."underscore-1.9.0" sources."unorm-1.4.1" sources."unpipe-1.0.0" (sources."update-notifier-0.5.0" // { @@ -31110,7 +31309,7 @@ in sources."pseudomap-1.0.2" sources."readable-stream-1.1.14" sources."rimraf-2.6.2" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."semver-5.5.0" sources."string_decoder-0.10.31" sources."strip-ansi-3.0.1" @@ -31155,7 +31354,7 @@ in dependencies = [ sources."ansi-styles-3.2.1" sources."babel-runtime-6.26.0" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."core-js-2.5.5" @@ -31176,7 +31375,7 @@ in sources."shebang-regex-1.0.0" sources."source-map-0.5.7" sources."source-map-support-0.4.18" - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" sources."universalify-0.1.1" sources."which-1.3.0" sources."yallist-2.1.2" @@ -31268,7 +31467,7 @@ in sources."bytes-3.0.0" sources."call-me-maybe-1.0.1" sources."caseless-0.12.0" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."circular-append-file-1.0.1" sources."cli-truncate-1.1.0" sources."cliclopts-1.1.1" @@ -31276,7 +31475,7 @@ in sources."codecs-1.2.1" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."colors-1.2.1" + sources."colors-1.2.4" sources."combined-stream-1.0.6" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" @@ -31292,7 +31491,7 @@ in sources."cycle-1.0.3" sources."dashdash-1.14.1" sources."dat-dns-1.3.2" - (sources."dat-doctor-1.3.1" // { + (sources."dat-doctor-1.4.0" // { dependencies = [ sources."debug-2.6.9" sources."dns-packet-1.3.1" @@ -31333,8 +31532,7 @@ in sources."dat-registry-4.0.0" sources."dat-secret-storage-4.0.1" sources."dat-storage-1.0.4" - sources."dat-swarm-defaults-1.0.0" - sources."datland-swarm-defaults-1.0.2" + sources."dat-swarm-defaults-1.0.1" sources."debug-3.1.0" sources."deep-equal-0.2.2" sources."delayed-stream-1.0.0" @@ -31359,7 +31557,7 @@ in sources."dns-socket-3.0.0" sources."dns-txt-2.0.2" sources."dom-walk-0.1.1" - sources."duplexify-3.5.4" + sources."duplexify-3.6.0" sources."ecc-jsbn-0.1.1" sources."end-of-stream-1.4.1" sources."escape-string-regexp-1.0.5" @@ -31394,7 +31592,7 @@ in sources."hoek-4.2.1" sources."http-methods-0.1.0" sources."http-signature-1.2.0" - (sources."hypercore-6.13.0" // { + (sources."hypercore-6.14.0" // { dependencies = [ sources."varint-5.0.0" ]; @@ -31457,7 +31655,7 @@ in sources."min-document-2.19.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" - sources."mirror-folder-2.1.1" + sources."mirror-folder-2.2.0" sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."multi-random-access-2.1.1" @@ -31503,10 +31701,10 @@ in sources."protocol-buffers-encodings-1.1.0" sources."pump-2.0.1" sources."punycode-1.4.1" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."random-access-file-2.0.1" sources."random-access-memory-2.4.0" - sources."random-access-storage-1.1.1" + sources."random-access-storage-1.2.0" (sources."randomatic-1.1.7" // { dependencies = [ (sources."is-number-3.0.0" // { @@ -31529,14 +31727,14 @@ in sources."revalidator-0.1.8" sources."rimraf-2.6.2" sources."rusha-0.8.13" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."signed-varint-2.0.1" sources."simple-sha1-2.1.0" sources."siphash24-1.1.0" sources."slice-ansi-1.0.0" sources."sntp-2.1.0" sources."sodium-javascript-0.5.5" - sources."sodium-native-2.1.5" + sources."sodium-native-2.1.6" sources."sodium-universal-2.0.0" sources."sorted-array-functions-1.1.0" sources."sorted-indexof-1.0.0" @@ -31558,7 +31756,7 @@ in sources."debug-2.6.9" ]; }) - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" (sources."throttle-1.0.3" // { dependencies = [ sources."debug-2.6.9" @@ -31566,7 +31764,7 @@ in }) sources."through2-2.0.3" sources."thunky-1.0.2" - sources."to-buffer-1.1.0" + sources."to-buffer-1.1.1" sources."toiletdb-1.4.1" sources."tough-cookie-2.3.4" sources."township-client-1.3.2" @@ -31582,7 +31780,7 @@ in sources."untildify-3.0.2" sources."util-deprecate-1.0.2" sources."utile-0.3.0" - sources."utp-native-1.7.0" + sources."utp-native-1.7.1" sources."uuid-3.2.1" sources."varint-3.0.1" sources."verror-1.10.0" @@ -31610,10 +31808,10 @@ in dhcp = nodeEnv.buildNodePackage { name = "dhcp"; packageName = "dhcp"; - version = "0.2.11"; + version = "0.2.12"; src = fetchurl { - url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.11.tgz"; - sha512 = "287rcz01q13rn3b83ds5kh05l176wag4p9vxxzrx3q63nhjmy6pvkxf1c1d7k0bd8r8nhqdldn5f1p50r4a1y1ybgy9zz0gqfbwb0d7"; + url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.12.tgz"; + sha512 = "1ks1wdfgj703sxp1ys7hjfkw0sm6sm9z7iviqxicvmy9r3mj7irq3vjyk4nvxgyq29j3qz8bi8lvm38r4w8j1j2xbkx85fk0l3vpa7r"; }; dependencies = [ sources."minimist-1.2.0" @@ -31683,7 +31881,7 @@ in sources."fresh-0.2.4" sources."from-0.1.7" sources."hiredis-0.4.1" - sources."http-parser-js-0.4.11" + sources."http-parser-js-0.4.12" sources."inherits-2.0.3" sources."ini-1.3.5" sources."ipaddr.js-1.0.5" @@ -31783,6 +31981,9 @@ in sources."basic-auth-1.1.0" sources."bindings-1.2.1" sources."bl-0.8.2" + sources."buffer-alloc-1.1.0" + sources."buffer-alloc-unsafe-0.1.1" + sources."buffer-fill-0.1.1" sources."bytewise-1.1.0" sources."bytewise-core-1.2.3" sources."cookie-signature-1.1.0" @@ -31790,7 +31991,7 @@ in sources."cors-2.8.4" sources."deferred-leveldown-0.2.0" sources."docker-parse-image-3.0.1" - sources."duplexify-3.5.4" + sources."duplexify-3.6.0" sources."end-of-stream-1.4.1" (sources."errno-0.1.7" // { dependencies = [ @@ -31805,6 +32006,7 @@ in sources."string_decoder-1.1.1" ]; }) + sources."fs-constants-1.0.0" sources."inherits-2.0.3" sources."isarray-0.0.1" sources."json-stringify-safe-5.0.1" @@ -31871,7 +32073,7 @@ in sources."pull-stream-3.6.7" sources."pull-window-2.1.4" sources."pump-1.0.3" - (sources."pumpify-1.4.0" // { + (sources."pumpify-1.5.0" // { dependencies = [ sources."pump-2.0.1" ]; @@ -31879,7 +32081,7 @@ in sources."readable-stream-1.1.14" sources."relative-date-1.1.3" sources."root-2.0.0" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."semver-5.1.1" sources."sorted-union-stream-1.0.2" sources."split2-0.2.1" @@ -31887,7 +32089,7 @@ in sources."stream-shift-1.0.0" sources."stream-to-pull-stream-1.7.2" sources."string_decoder-0.10.31" - (sources."tar-stream-1.5.5" // { + (sources."tar-stream-1.6.0" // { dependencies = [ sources."bl-1.2.2" sources."isarray-1.0.0" @@ -31902,6 +32104,7 @@ in ]; }) sources."thunky-0.1.0" + sources."to-buffer-1.1.1" sources."typewise-1.0.3" sources."typewise-core-1.2.0" sources."typewiselite-1.0.0" @@ -31922,10 +32125,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "3.3.8"; + version = "3.3.12"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.8.tgz"; - sha512 = "3bahinp16ajfxy06ihrl022906h6zdxhsgmwh28k1p04blzqzgddbryx4l1a8ncg5fdjlj7ka9k3f6lam68fanjw4093hgyns7iclf4"; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.12.tgz"; + sha512 = "3jj2vxmyham5bhfxvbilsd60sgkdabzl0mbid2i4hfjjgqjs76f4av2qifnvphn4a0ds727wjcp4kjz2963pjqrq53ik0k87706arn1"; }; dependencies = [ sources."JSONStream-1.3.2" @@ -31934,10 +32137,10 @@ in sources."assert-plus-1.0.0" sources."async-2.6.0" sources."asynckit-0.4.0" - sources."aws-sdk-2.223.1" + sources."aws-sdk-2.233.1" sources."aws-sign2-0.7.0" sources."aws4-1.7.0" - sources."base64-js-1.2.3" + sources."base64-js-1.3.0" sources."bcrypt-pbkdf-1.0.1" sources."boom-4.3.1" sources."buffer-4.9.1" @@ -31951,6 +32154,7 @@ in ]; }) sources."dashdash-1.14.1" + sources."decimal.js-10.0.0" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.1" sources."events-1.1.1" @@ -31978,7 +32182,8 @@ in sources."json-stringify-safe-5.0.1" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" - sources."lodash-4.17.5" + sources."lodash-4.17.10" + sources."lossless-json-1.0.2" sources."mime-db-1.33.0" sources."mime-types-2.1.18" sources."minimist-0.0.10" @@ -31986,14 +32191,14 @@ in sources."optimist-0.6.1" sources."performance-now-2.1.0" sources."punycode-1.3.2" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."querystring-0.2.0" (sources."request-2.85.0" // { dependencies = [ sources."punycode-1.4.1" ]; }) - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."sax-1.2.1" sources."sntp-2.1.0" sources."sshpk-1.14.1" @@ -32018,6 +32223,23 @@ in production = true; bypassCache = false; }; + elm-oracle = nodeEnv.buildNodePackage { + name = "elm-oracle"; + packageName = "elm-oracle"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/elm-oracle/-/elm-oracle-1.1.1.tgz"; + sha1 = "61f6d783221b4ad08e7d101d678b9d5a67d3961c"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Query for information about values in elm source files."; + homepage = "https://github.com/ElmCast/elm-oracle#readme"; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = false; + }; elm-test = nodeEnv.buildNodePackage { name = "elm-test"; packageName = "elm-test"; @@ -32187,7 +32409,7 @@ in sources."repeat-string-1.6.1" sources."request-2.79.0" sources."rimraf-2.6.2" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."set-immediate-shim-1.0.1" sources."sntp-1.0.9" sources."split-1.0.1" @@ -32242,7 +32464,7 @@ in sources."asap-2.0.6" sources."auto-bind-1.2.0" sources."babel-code-frame-6.26.0" - sources."babel-core-6.26.0" + sources."babel-core-6.26.3" sources."babel-generator-6.26.1" sources."babel-helper-builder-react-jsx-6.26.0" sources."babel-helpers-6.24.1" @@ -32302,7 +32524,7 @@ in sources."has-to-string-tag-x-1.4.1" sources."home-or-tmp-2.0.0" sources."hosted-git-info-2.6.0" - sources."iconv-lite-0.4.21" + sources."iconv-lite-0.4.22" (sources."import-jsx-1.3.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -32314,10 +32536,10 @@ in (sources."ink-0.3.1" // { dependencies = [ sources."ansi-styles-3.2.1" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."core-js-1.2.7" sources."strip-ansi-4.0.0" - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" ]; }) sources."ink-text-input-1.1.1" @@ -32340,7 +32562,7 @@ in sources."json5-0.5.1" sources."load-json-file-1.1.0" sources."locate-path-2.0.0" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."lodash.debounce-4.0.8" sources."lodash.flattendeep-4.4.0" sources."lodash.isequal-4.5.0" @@ -32403,7 +32625,7 @@ in sources."require-from-string-1.2.1" sources."resolve-from-3.0.0" sources."restore-cursor-2.0.0" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-5.5.0" sources."setimmediate-1.0.5" @@ -32428,7 +32650,7 @@ in sources."to-fast-properties-1.0.3" sources."trim-newlines-1.0.0" sources."trim-right-1.0.1" - sources."ua-parser-js-0.7.17" + sources."ua-parser-js-0.7.18" sources."unicode-emoji-modifier-base-1.0.0" sources."url-parse-lax-1.0.0" sources."url-to-options-1.0.1" @@ -32483,10 +32705,10 @@ in sources."buffer-from-1.0.0" sources."caller-path-0.1.0" sources."callsites-0.2.0" - (sources."chalk-2.3.2" // { + (sources."chalk-2.4.1" // { dependencies = [ sources."ansi-styles-3.2.1" - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" ]; }) sources."chardet-0.4.2" @@ -32523,13 +32745,13 @@ in sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.2" - sources."globals-11.4.0" + sources."globals-11.5.0" sources."globby-5.0.0" sources."graceful-fs-4.1.11" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" - sources."iconv-lite-0.4.21" - sources."ignore-3.3.7" + sources."iconv-lite-0.4.22" + sources."ignore-3.3.8" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -32547,7 +32769,7 @@ in sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.3.0" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."lru-cache-4.1.2" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" @@ -32580,7 +32802,7 @@ in sources."run-async-2.3.0" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-5.5.0" sources."shebang-command-1.2.0" @@ -32679,9 +32901,9 @@ in dependencies = [ sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" - (sources."chalk-2.3.2" // { + (sources."chalk-2.4.1" // { dependencies = [ - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" ]; }) sources."strip-ansi-4.0.0" @@ -32706,13 +32928,13 @@ in sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.2" - sources."globals-11.4.0" + sources."globals-11.5.0" sources."globby-5.0.0" sources."graceful-fs-4.1.11" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" - sources."iconv-lite-0.4.21" - sources."ignore-3.3.7" + sources."iconv-lite-0.4.22" + sources."ignore-3.3.8" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -32730,7 +32952,7 @@ in sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.3.0" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."lru-cache-4.1.2" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" @@ -32759,14 +32981,14 @@ in sources."readable-stream-2.3.6" sources."regexpp-1.1.0" sources."require-uncached-1.0.3" - sources."resolve-1.7.0" + sources."resolve-1.7.1" sources."resolve-from-1.0.1" sources."restore-cursor-2.0.0" sources."rimraf-2.6.2" sources."run-async-2.3.0" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-5.5.0" sources."shebang-command-1.2.0" @@ -32808,10 +33030,10 @@ in emojione = nodeEnv.buildNodePackage { name = "emojione"; packageName = "emojione"; - version = "3.1.2"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/emojione/-/emojione-3.1.2.tgz"; - sha1 = "991e30c80db4b1cf15eacb257620a7edce9c6ef4"; + url = "https://registry.npmjs.org/emojione/-/emojione-3.1.4.tgz"; + sha1 = "828767fbbe2ffd4fa75ebeeba9873e83643d6664"; }; buildInputs = globalBuildInputs; meta = { @@ -32933,11 +33155,11 @@ in (sources."ora-1.4.0" // { dependencies = [ sources."ansi-styles-3.2.1" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."cli-cursor-2.1.0" sources."onetime-2.0.1" sources."restore-cursor-2.0.0" - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" ]; }) sources."os-tmpdir-1.0.2" @@ -32958,7 +33180,7 @@ in sources."progress-1.1.8" sources."promise-phantom-3.1.6" sources."punycode-1.4.1" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" sources."readable-stream-2.3.6" @@ -32967,7 +33189,7 @@ in sources."request-2.85.0" sources."request-progress-2.0.1" sources."restore-cursor-1.0.1" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."semver-5.5.0" sources."signal-exit-3.0.2" sources."sntp-2.1.0" @@ -33094,7 +33316,7 @@ in ]; }) sources."fs.realpath-1.0.0" - sources."fsevents-1.1.3" + sources."fsevents-1.2.3" sources."glob-7.1.2" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" @@ -33144,7 +33366,7 @@ in sources."preserve-0.2.0" (sources."prettyjson-1.2.1" // { dependencies = [ - sources."colors-1.2.1" + sources."colors-1.2.4" sources."minimist-1.2.0" ]; }) @@ -33170,7 +33392,7 @@ in sources."resumer-0.0.0" sources."revalidator-0.1.8" sources."rimraf-2.6.2" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."set-immediate-shim-1.0.1" sources."shush-1.0.0" sources."stack-trace-0.0.10" @@ -33209,7 +33431,7 @@ in dependencies = [ sources."async-2.6.0" sources."debug-3.1.0" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."lodash.groupby-4.6.0" sources."microee-0.0.6" sources."minilog-3.1.0" @@ -33395,7 +33617,7 @@ in sources."array-uniq-1.0.3" sources."array-unique-0.3.2" sources."assign-symbols-1.0.0" - sources."atob-2.1.0" + sources."atob-2.1.1" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -33618,11 +33840,11 @@ in sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" sources."replace-ext-0.0.1" - sources."resolve-1.7.0" + sources."resolve-1.7.1" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."semver-4.3.6" sources."sequencify-0.0.7" @@ -33735,7 +33957,7 @@ in sha1 = "e21764eafe6429ec8dc9377b55e1ca86799704d5"; }; dependencies = [ - sources."eventemitter3-3.0.1" + sources."eventemitter3-3.1.0" sources."http-proxy-1.0.2" sources."lru-cache-2.5.2" sources."minimist-0.0.8" @@ -33831,10 +34053,10 @@ in html-minifier = nodeEnv.buildNodePackage { name = "html-minifier"; packageName = "html-minifier"; - version = "3.5.14"; + version = "3.5.15"; src = fetchurl { - url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.14.tgz"; - sha512 = "0ai1rga42v2z8mbnn2kv238fzi9p2nxzj7l2b4csgcg4wddmh697h1s4kmwipqqfd6ppi6xd26m2ynipkjm63sj48kjb0sh73mz165i"; + url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.15.tgz"; + sha512 = "01ni8s31nr1rb70wqi980nyfwir4z2z5mjvs454rgylns4nfyqvci581b40s1b67hgd95anq46j4yf5r947y5wzvncr7dgsysnvi5ir"; }; dependencies = [ sources."camel-case-3.0.0" @@ -33846,7 +34068,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.5.7" - (sources."uglify-js-3.3.20" // { + (sources."uglify-js-3.3.23" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -33879,7 +34101,9 @@ in sources."is-extglob-2.1.1" sources."is-glob-3.1.0" sources."mime-1.4.1" + sources."qs-6.5.1" sources."raw-body-1.1.7" + sources."safe-buffer-5.1.1" sources."setprototypeof-1.0.3" sources."statuses-1.4.0" sources."string_decoder-0.10.31" @@ -33914,9 +34138,12 @@ in sources."kind-of-4.0.0" ]; }) + sources."buffer-alloc-1.1.0" + sources."buffer-alloc-unsafe-0.1.1" sources."buffer-crc32-0.2.13" + sources."buffer-fill-0.1.1" sources."bytes-3.0.0" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."chardet-0.4.2" sources."chokidar-1.7.0" sources."chownr-1.0.1" @@ -33953,7 +34180,7 @@ in sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" - sources."eventemitter3-1.2.0" + sources."eventemitter3-3.1.0" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" (sources."express-4.16.3" // { @@ -33969,24 +34196,30 @@ in sources."filename-regex-2.0.1" sources."fill-range-2.2.3" sources."finalhandler-1.1.1" + sources."follow-redirects-1.4.1" sources."for-in-1.0.2" sources."for-own-0.1.5" sources."form-data-2.3.2" sources."formidable-1.2.1" sources."forwarded-0.1.2" sources."fresh-0.5.2" + sources."fs-constants-1.0.0" sources."fs-minipass-1.2.5" sources."fs.realpath-1.0.0" - sources."fsevents-1.1.3" + sources."fsevents-1.2.3" sources."glob-7.1.2" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" sources."graceful-fs-4.1.11" sources."has-flag-3.0.0" sources."http-errors-1.6.3" - sources."http-parser-js-0.4.11" - sources."http-proxy-1.16.2" - sources."http-proxy-middleware-0.17.4" + sources."http-parser-js-0.4.12" + sources."http-proxy-1.17.0" + (sources."http-proxy-middleware-0.17.4" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) sources."iconv-lite-0.4.19" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -34012,7 +34245,7 @@ in sources."lazystream-1.0.0" sources."leek-0.0.24" sources."livereload-js-2.3.0" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."lodash._baseassign-3.2.0" sources."lodash._basecopy-3.0.1" sources."lodash._bindcallback-3.0.1" @@ -34036,7 +34269,7 @@ in sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" - sources."minipass-2.2.4" + sources."minipass-2.3.0" sources."minizlib-1.1.0" sources."mkdirp-0.5.1" sources."ms-2.0.0" @@ -34062,7 +34295,7 @@ in sources."process-nextick-args-2.0.0" sources."proxy-addr-2.0.3" sources."pseudomap-1.0.2" - sources."qs-6.5.1" + sources."qs-6.5.2" (sources."randomatic-1.1.7" // { dependencies = [ (sources."is-number-3.0.0" // { @@ -34092,7 +34325,7 @@ in sources."run-async-2.3.0" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safe-json-parse-1.0.1" sources."sax-1.1.4" sources."semver-5.5.0" @@ -34110,14 +34343,15 @@ in sources."string-width-2.1.1" sources."string_decoder-1.1.1" sources."strip-ansi-4.0.0" - sources."superagent-3.8.2" - sources."supports-color-5.3.0" - (sources."tar-4.4.1" // { + sources."superagent-3.8.3" + sources."supports-color-5.4.0" + (sources."tar-4.4.2" // { dependencies = [ sources."minimist-0.0.8" + sources."safe-buffer-5.1.2" ]; }) - sources."tar-stream-1.5.5" + sources."tar-stream-1.6.0" sources."through-2.3.8" (sources."tiny-lr-1.1.1" // { dependencies = [ @@ -34125,6 +34359,7 @@ in ]; }) sources."tmp-0.0.33" + sources."to-buffer-1.1.1" sources."tslib-1.9.0" sources."type-is-1.6.16" sources."ultron-1.1.1" @@ -34261,6 +34496,68 @@ in production = true; bypassCache = false; }; + imapnotify = nodeEnv.buildNodePackage { + name = "imapnotify"; + packageName = "imapnotify"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/imapnotify/-/imapnotify-0.4.1.tgz"; + sha512 = "0fn58ydrck0mwpq48pj2in6aql522avzyabrddq4ixykr1h29ha3cvh1v0mga8ghg1v9zpkii81qqac74qwm9ikr1kll616fcz0cc0s"; + }; + dependencies = [ + sources."async-0.2.10" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."bunyan-1.8.12" + sources."colors-0.6.2" + sources."concat-map-0.0.1" + sources."core-util-is-1.0.2" + sources."cycle-1.0.3" + sources."dtrace-provider-0.8.6" + sources."eyes-0.1.8" + sources."glob-6.0.4" + sources."imap-0.8.19" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."isarray-0.0.1" + sources."isstream-0.1.2" + sources."minimatch-3.0.4" + sources."minimist-0.0.10" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."moment-2.22.1" + sources."mv-2.1.1" + sources."nan-2.10.0" + sources."ncp-2.0.0" + sources."once-1.4.0" + sources."optimist-0.6.1" + sources."path-is-absolute-1.0.1" + sources."pkginfo-0.3.1" + sources."printf-0.2.5" + sources."readable-stream-1.1.14" + sources."rimraf-2.4.5" + sources."safe-json-stringify-1.1.0" + sources."semver-5.3.0" + sources."stack-trace-0.0.10" + sources."string_decoder-0.10.31" + sources."utf7-1.0.2" + sources."winston-0.8.3" + sources."wordwrap-0.0.3" + sources."wrappy-1.0.2" + sources."xenvar-0.5.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Execute scripts on new messages using IDLE imap command"; + homepage = "https://github.com/a-sk/node-imapnotify#readme"; + license = "MIT"; + }; + production = true; + bypassCache = false; + }; javascript-typescript-langserver = nodeEnv.buildNodePackage { name = "javascript-typescript-langserver"; packageName = "javascript-typescript-langserver"; @@ -34279,7 +34576,7 @@ in sources."bufrw-1.2.1" sources."chai-4.1.2" sources."chai-as-promised-7.1.1" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."check-error-1.0.2" sources."color-convert-1.9.1" sources."color-name-1.1.3" @@ -34302,7 +34599,7 @@ in sources."opentracing-0.13.0" ]; }) - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."long-2.4.0" sources."minimatch-3.0.4" sources."mz-2.7.0" @@ -34313,11 +34610,11 @@ in sources."opentracing-0.14.3" sources."path-is-absolute-1.0.1" sources."pathval-1.1.0" - sources."rxjs-5.5.8" + sources."rxjs-5.5.10" sources."semaphore-async-await-1.5.1" sources."string-similarity-1.2.0" sources."string-template-0.2.1" - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" sources."symbol-observable-1.0.1" sources."thenify-3.3.0" sources."thenify-all-1.6.0" @@ -34605,7 +34902,7 @@ in sources."inherits-2.0.3" sources."isarray-1.0.0" sources."js-yaml-3.11.0" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."methods-1.1.2" sources."mime-1.6.0" sources."mime-db-1.33.0" @@ -34615,13 +34912,13 @@ in sources."path-loader-1.0.4" sources."process-nextick-args-2.0.0" sources."punycode-2.1.0" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."readable-stream-2.3.6" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."slash-1.0.0" sources."sprintf-js-1.0.3" sources."string_decoder-1.1.1" - sources."superagent-3.8.2" + sources."superagent-3.8.3" sources."uri-js-3.0.2" sources."util-deprecate-1.0.2" ]; @@ -34637,10 +34934,10 @@ in json-server = nodeEnv.buildNodePackage { name = "json-server"; packageName = "json-server"; - version = "0.12.1"; + version = "0.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/json-server/-/json-server-0.12.1.tgz"; - sha512 = "3isg3ph43vqfq6m6pg0d1iy7gj2gc6jgym0gp3ng7p9fv7bf1q43isf3wbc7bc9w5swsxqjc3v304ic8iinilwrkwxgks1alaxjs3si"; + url = "https://registry.npmjs.org/json-server/-/json-server-0.12.2.tgz"; + sha512 = "3dqw05mkw5k42zdpjhg3cjiq7bfh8x1zxllrwyz0jgwmd4p79079fhsiifazqa5is659lzdnmiyiabxy62jjjk55xa296rdhyajc2vm"; }; dependencies = [ sources."accepts-1.3.5" @@ -34667,10 +34964,10 @@ in sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.0" sources."caseless-0.12.0" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."ci-info-1.1.3" sources."cli-boxes-1.0.0" - sources."cliui-4.0.0" + sources."cliui-4.1.0" sources."co-4.6.0" sources."code-point-at-1.1.0" sources."color-convert-1.9.1" @@ -34697,7 +34994,7 @@ in sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decamelize-1.2.0" - sources."deep-extend-0.4.2" + sources."deep-extend-0.5.1" sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" @@ -34775,7 +35072,7 @@ in sources."latest-version-3.1.0" sources."lcid-1.0.0" sources."locate-path-2.0.0" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."lodash-id-0.14.0" sources."lowdb-0.15.5" sources."lowercase-keys-1.0.1" @@ -34814,7 +35111,7 @@ in sources."path-to-regexp-0.1.7" sources."performance-now-2.1.0" sources."pify-3.0.0" - sources."please-upgrade-node-3.0.1" + sources."please-upgrade-node-3.0.2" sources."pluralize-7.0.0" sources."prepend-http-1.0.4" sources."proxy-addr-2.0.3" @@ -34828,7 +35125,7 @@ in sources."http-errors-1.6.2" ]; }) - sources."rc-1.2.6" + sources."rc-1.2.7" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."request-2.85.0" @@ -34836,6 +35133,7 @@ in sources."require-main-filename-1.0.1" sources."safe-buffer-5.1.1" sources."semver-5.5.0" + sources."semver-compare-1.0.0" sources."semver-diff-2.1.0" sources."send-0.16.2" sources."serve-static-1.13.2" @@ -34854,7 +35152,7 @@ in sources."strip-ansi-4.0.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" sources."term-size-1.2.0" sources."timed-out-4.0.1" sources."tough-cookie-2.3.4" @@ -34864,7 +35162,7 @@ in sources."unique-string-1.0.0" sources."unpipe-1.0.0" sources."unzip-response-2.0.1" - sources."update-notifier-2.4.0" + sources."update-notifier-2.5.0" sources."url-parse-lax-1.0.0" sources."utils-merge-1.0.1" sources."uuid-3.2.1" @@ -34925,16 +35223,13 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "2.0.0"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-2.0.0.tgz"; - sha512 = "0iyj9ic6sj94x4xdd6wy8zgabqbl2ydrsp8h76lwrcx27ns8pzd7bg8yibsjgddzkisb9p1gp6bn46b8g5m2lh3yj5vqx55q2ks7lib"; + url = "https://registry.npmjs.org/karma/-/karma-2.0.2.tgz"; + sha1 = "4d2db9402850a66551fa784b0164fb0824ed8c4b"; }; dependencies = [ - sources."JSONStream-1.3.2" sources."accepts-1.3.5" - sources."acorn-4.0.13" - sources."acorn-node-1.3.0" sources."addressparser-1.0.1" sources."after-0.8.2" sources."agent-base-2.1.1" @@ -34949,18 +35244,12 @@ in sources."anymatch-1.3.2" sources."arr-diff-2.0.0" sources."arr-flatten-1.1.0" - sources."array-filter-0.0.1" - sources."array-map-0.0.0" - sources."array-reduce-0.0.0" sources."array-slice-0.2.3" sources."array-unique-0.2.1" sources."arraybuffer.slice-0.0.7" sources."asn1-0.2.3" - sources."asn1.js-4.10.1" - sources."assert-1.4.1" sources."assert-plus-1.0.0" sources."ast-types-0.11.3" - sources."astw-2.2.0" sources."async-2.1.5" sources."async-each-1.0.1" sources."async-limiter-1.0.0" @@ -34976,7 +35265,6 @@ in sources."backo2-1.0.2" sources."balanced-match-1.0.0" sources."base64-arraybuffer-0.1.5" - sources."base64-js-1.2.3" sources."base64id-1.0.0" sources."bcrypt-pbkdf-1.0.1" sources."better-assert-1.0.2" @@ -34985,7 +35273,6 @@ in sources."bl-1.1.2" sources."blob-0.0.4" sources."bluebird-3.5.1" - sources."bn.js-4.11.8" (sources."body-parser-1.18.2" // { dependencies = [ sources."setprototypeof-1.0.3" @@ -34998,102 +35285,51 @@ in sources."kind-of-4.0.0" ]; }) - sources."brorand-1.1.0" - sources."browser-pack-6.1.0" - (sources."browser-resolve-1.11.2" // { - dependencies = [ - sources."resolve-1.1.7" - ]; - }) - (sources."browserify-14.5.0" // { - dependencies = [ - sources."acorn-5.5.3" - sources."hash-base-2.0.2" - sources."isarray-2.0.4" - sources."process-nextick-args-2.0.0" - sources."source-map-0.5.7" - ]; - }) - sources."browserify-aes-1.2.0" - sources."browserify-cipher-1.0.0" - sources."browserify-des-1.0.0" - sources."browserify-rsa-4.0.1" - sources."browserify-sign-4.0.4" - sources."browserify-zlib-0.2.0" - sources."buffer-5.1.0" - sources."buffer-from-1.0.0" sources."buffer-more-ints-0.0.2" - sources."buffer-xor-1.0.3" sources."buildmail-4.0.1" - sources."builtin-status-codes-3.0.0" sources."bytes-3.0.0" - sources."cached-path-relative-1.0.1" sources."callsite-1.0.0" sources."caseless-0.12.0" sources."chalk-1.1.3" sources."chokidar-1.7.0" - sources."cipher-base-1.0.4" - sources."circular-json-0.5.1" + sources."circular-json-0.5.3" sources."co-4.6.0" - sources."colors-1.2.1" + sources."colors-1.2.4" sources."combine-lists-1.0.1" - sources."combine-source-map-0.8.0" sources."combined-stream-1.0.6" sources."commander-2.15.1" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" sources."component-inherit-0.0.3" sources."concat-map-0.0.1" - (sources."concat-stream-1.5.2" // { - dependencies = [ - sources."readable-stream-2.0.6" - sources."string_decoder-0.10.31" - ]; - }) (sources."connect-3.6.6" // { dependencies = [ sources."statuses-1.3.1" ]; }) - sources."console-browserify-1.1.0" - sources."constants-browserify-1.0.0" sources."content-type-1.0.4" - sources."convert-source-map-1.1.3" sources."cookie-0.3.1" sources."core-js-2.5.5" sources."core-util-is-1.0.2" - sources."create-ecdh-4.0.0" - sources."create-hash-1.1.3" - sources."create-hmac-1.1.6" (sources."cryptiles-3.1.2" // { dependencies = [ sources."boom-5.2.0" ]; }) - sources."crypto-browserify-3.12.0" sources."custom-event-1.0.1" sources."dashdash-1.14.1" sources."data-uri-to-buffer-1.2.0" sources."date-format-1.2.0" - sources."date-now-0.1.4" sources."debug-2.6.9" sources."deep-is-0.1.3" - sources."defined-1.0.0" sources."degenerator-1.0.4" sources."delayed-stream-1.0.0" sources."depd-1.1.2" - sources."deps-sort-2.0.0" - sources."des.js-1.0.0" - sources."detective-4.7.1" sources."di-0.0.1" - sources."diffie-hellman-5.0.2" sources."dom-serialize-2.2.1" - sources."domain-browser-1.1.7" sources."double-ended-queue-2.1.0-0" - sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.1" sources."ee-first-1.1.1" - sources."elliptic-6.4.0" sources."encodeurl-1.0.2" (sources."engine.io-3.1.5" // { dependencies = [ @@ -35113,9 +35349,7 @@ in sources."esprima-3.1.3" sources."estraverse-4.2.0" sources."esutils-2.0.2" - sources."eventemitter3-1.2.0" - sources."events-1.1.1" - sources."evp_bytestokey-1.0.3" + sources."eventemitter3-3.1.0" (sources."expand-braces-0.1.2" // { dependencies = [ sources."braces-0.1.5" @@ -35136,19 +35370,18 @@ in sources."filename-regex-2.0.1" sources."fill-range-2.2.3" sources."finalhandler-1.1.0" - sources."follow-redirects-1.0.0" + sources."follow-redirects-1.4.1" sources."for-in-1.0.2" sources."for-own-0.1.5" sources."forever-agent-0.6.1" sources."form-data-2.3.2" sources."fs.realpath-1.0.0" - sources."fsevents-1.1.3" + sources."fsevents-1.2.3" (sources."ftp-0.3.10" // { dependencies = [ sources."readable-stream-1.1.14" ]; }) - sources."function-bind-1.1.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" sources."get-uri-2.0.1" @@ -35159,37 +35392,28 @@ in sources."graceful-fs-4.1.11" sources."har-schema-2.0.0" sources."har-validator-5.0.3" - sources."has-1.0.1" sources."has-ansi-2.0.0" sources."has-binary2-1.0.2" sources."has-cors-1.1.0" - sources."hash-base-3.0.4" - sources."hash.js-1.1.3" sources."hawk-6.0.2" sources."hipchat-notifier-1.1.0" - sources."hmac-drbg-1.0.1" sources."hoek-4.2.1" - sources."htmlescape-1.1.1" sources."http-errors-1.6.3" - sources."http-proxy-1.16.2" + (sources."http-proxy-1.17.0" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) sources."http-proxy-agent-1.0.0" sources."http-signature-1.2.0" sources."httpntlm-1.6.1" sources."httpreq-0.4.24" - sources."https-browserify-1.0.0" sources."https-proxy-agent-1.0.0" sources."iconv-lite-0.4.19" - sources."ieee754-1.1.11" sources."indexof-0.0.1" sources."inflection-1.10.0" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."inline-source-map-0.6.2" - (sources."insert-module-globals-7.0.6" // { - dependencies = [ - sources."concat-stream-1.6.2" - ]; - }) sources."ip-1.0.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" @@ -35213,21 +35437,15 @@ in sources."jsbn-0.1.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.3.1" - sources."json-stable-stringify-0.0.1" sources."json-stringify-safe-5.0.1" - sources."jsonify-0.0.0" - sources."jsonparse-1.3.1" sources."jsonpointer-4.0.1" sources."jsprim-1.4.1" sources."kind-of-3.2.2" - sources."labeled-stream-splicer-2.0.1" sources."levn-0.3.0" - sources."lexical-scope-1.2.0" sources."libbase64-0.1.0" sources."libmime-3.0.0" sources."libqp-1.1.0" - sources."lodash-4.17.5" - sources."lodash.memoize-3.0.4" + sources."lodash-4.17.10" (sources."log4js-2.5.3" // { dependencies = [ sources."assert-plus-0.2.0" @@ -35237,6 +35455,7 @@ in sources."co-3.0.6" sources."cryptiles-2.0.5" sources."debug-3.1.0" + sources."follow-redirects-1.0.0" sources."form-data-2.0.0" sources."har-validator-2.0.6" sources."hawk-3.1.3" @@ -35245,8 +35464,8 @@ in sources."iconv-lite-0.4.15" sources."ip-1.1.5" sources."isarray-0.0.1" - sources."minimist-0.0.8" sources."ms-0.7.1" + sources."process-nextick-args-1.0.7" sources."qs-6.2.3" sources."readable-stream-2.0.6" sources."request-2.75.0" @@ -35266,19 +35485,14 @@ in sources."semver-5.0.3" ]; }) - sources."md5.js-1.3.4" sources."media-typer-0.3.0" sources."micromatch-2.3.11" - sources."miller-rabin-4.0.1" sources."mime-1.6.0" sources."mime-db-1.33.0" sources."mime-types-2.1.18" - sources."minimalistic-assert-1.0.0" - sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" - sources."minimist-1.2.0" + sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."module-deps-4.1.1" sources."ms-2.0.0" sources."nan-2.10.0" sources."negotiator-0.6.1" @@ -35299,48 +35513,34 @@ in sources."once-1.4.0" (sources."optimist-0.6.1" // { dependencies = [ - sources."minimist-0.0.10" sources."wordwrap-0.0.3" ]; }) sources."optionator-0.8.2" - sources."os-browserify-0.3.0" sources."os-tmpdir-1.0.2" sources."pac-proxy-agent-1.1.0" sources."pac-resolver-2.0.0" - sources."pako-1.0.6" - sources."parents-1.0.1" - sources."parse-asn1-5.1.0" sources."parse-glob-3.0.4" sources."parseqs-0.0.5" sources."parseuri-0.0.5" sources."parseurl-1.3.2" - sources."path-browserify-0.0.0" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.5" - sources."path-platform-0.11.15" (sources."path-proxy-1.0.0" // { dependencies = [ sources."inflection-1.3.8" ]; }) - sources."pbkdf2-3.0.14" sources."performance-now-2.1.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."prelude-ls-1.1.2" sources."preserve-0.2.0" - sources."process-0.11.10" - sources."process-nextick-args-1.0.7" + sources."process-nextick-args-2.0.0" sources."proxy-agent-2.0.0" - sources."pseudomap-1.0.2" - sources."public-encrypt-4.0.0" sources."punycode-1.4.1" sources."q-1.4.1" sources."qjobs-1.2.0" sources."qs-6.5.1" - sources."querystring-0.2.0" - sources."querystring-es3-0.2.1" (sources."randomatic-1.1.7" // { dependencies = [ (sources."is-number-3.0.0" // { @@ -35350,8 +35550,6 @@ in }) ]; }) - sources."randombytes-2.0.6" - sources."randomfill-1.0.4" sources."range-parser-1.2.0" (sources."raw-body-2.3.2" // { dependencies = [ @@ -35359,13 +35557,7 @@ in sources."http-errors-1.6.2" ]; }) - sources."read-only-stream-2.0.0" - (sources."readable-stream-2.3.6" // { - dependencies = [ - sources."isarray-1.0.0" - sources."string_decoder-1.1.1" - ]; - }) + sources."readable-stream-2.3.6" sources."readdirp-2.1.0" sources."redis-2.8.0" sources."redis-commands-1.3.5" @@ -35377,16 +35569,11 @@ in sources."request-2.85.0" sources."requestretry-1.13.0" sources."requires-port-1.0.0" - sources."resolve-1.7.0" sources."rimraf-2.6.2" - sources."ripemd160-2.0.1" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."semver-5.5.0" sources."set-immediate-shim-1.0.1" sources."setprototypeof-1.1.0" - sources."sha.js-2.4.11" - sources."shasum-1.0.2" - sources."shell-quote-1.6.1" sources."slack-node-0.2.0" sources."smart-buffer-1.1.15" sources."smtp-connection-2.12.0" @@ -35408,50 +35595,27 @@ in sources."source-map-0.6.1" sources."sshpk-1.14.1" sources."statuses-1.5.0" - sources."stream-browserify-2.0.1" - sources."stream-combiner2-1.1.1" - sources."stream-http-2.8.1" - sources."stream-splicer-2.0.0" sources."streamroller-0.7.0" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" - sources."subarg-1.0.0" sources."supports-color-2.0.0" - sources."syntax-error-1.4.0" - sources."through-2.3.8" - sources."through2-2.0.3" sources."thunkify-2.1.2" - sources."timers-browserify-1.4.2" sources."timespan-2.3.0" sources."tmp-0.0.33" sources."to-array-0.1.4" - sources."to-arraybuffer-1.0.1" sources."tough-cookie-2.3.4" sources."tsscmp-1.0.5" - sources."tty-browserify-0.0.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."type-is-1.6.16" - sources."typedarray-0.0.6" sources."ultron-1.1.1" - sources."umd-3.0.3" sources."underscore-1.7.0" sources."unpipe-1.0.0" - (sources."url-0.11.0" // { - dependencies = [ - sources."punycode-1.3.2" - ]; - }) - (sources."useragent-2.3.0" // { + (sources."useragent-2.2.1" // { dependencies = [ - sources."lru-cache-4.1.2" - ]; - }) - (sources."util-0.10.3" // { - dependencies = [ - sources."inherits-2.0.1" + sources."lru-cache-2.2.4" ]; }) sources."util-deprecate-1.0.2" @@ -35459,7 +35623,6 @@ in sources."uuid-3.2.1" sources."uws-9.14.0" sources."verror-1.10.0" - sources."vm-browserify-0.0.4" sources."void-elements-2.0.1" sources."when-3.7.8" sources."wordwrap-1.0.0" @@ -35468,7 +35631,6 @@ in sources."xmlhttprequest-ssl-1.5.5" sources."xregexp-2.0.0" sources."xtend-4.0.1" - sources."yallist-2.1.2" sources."yeast-0.1.2" ]; buildInputs = globalBuildInputs; @@ -35644,10 +35806,10 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "2.10.1"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-2.10.1.tgz"; - sha512 = "1y2pnipc1wsra1gdj77c4217xcycdwycda28drnh7sf43hcw4ang1x859i95m084v9ahcjysdb7ap2c3zk6ivm0q3way48k1xxnci57"; + url = "https://registry.npmjs.org/lerna/-/lerna-2.11.0.tgz"; + sha512 = "22hg2kpml4wkbgp15nzbhcs81kdaynq0prspzmbfrr5hpbga1cz8vl2adc4dry1lcxs36s2w5pbsvrdic4bw623vx8nngxn0z7kl0wj"; }; dependencies = [ sources."JSONStream-1.3.2" @@ -35674,7 +35836,7 @@ in sources."camelcase-keys-2.1.0" sources."capture-stack-trace-1.0.0" sources."center-align-0.1.3" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."chardet-0.4.2" sources."ci-info-1.1.3" sources."cli-cursor-2.1.0" @@ -35691,7 +35853,7 @@ in sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."console-control-strings-1.1.0" - (sources."conventional-changelog-1.1.23" // { + (sources."conventional-changelog-1.1.24" // { dependencies = [ sources."camelcase-4.1.0" sources."map-obj-1.0.1" @@ -35700,7 +35862,7 @@ in }) sources."conventional-changelog-angular-1.6.6" sources."conventional-changelog-atom-0.2.8" - (sources."conventional-changelog-cli-1.3.21" // { + (sources."conventional-changelog-cli-1.3.22" // { dependencies = [ sources."camelcase-2.1.1" sources."camelcase-keys-4.2.0" @@ -35724,12 +35886,12 @@ in ]; }) sources."conventional-changelog-codemirror-0.3.8" - (sources."conventional-changelog-core-2.0.10" // { + (sources."conventional-changelog-core-2.0.11" // { dependencies = [ - sources."meow-4.0.0" + sources."meow-4.0.1" ]; }) - sources."conventional-changelog-ember-0.3.11" + sources."conventional-changelog-ember-0.3.12" sources."conventional-changelog-eslint-1.0.9" sources."conventional-changelog-express-0.3.6" sources."conventional-changelog-jquery-0.1.0" @@ -35754,7 +35916,7 @@ in sources."decamelize-1.2.0" sources."decamelize-keys-1.1.0" sources."dedent-0.7.0" - sources."deep-extend-0.4.2" + sources."deep-extend-0.5.1" sources."defaults-1.0.3" sources."delegates-1.0.0" sources."detect-indent-5.0.0" @@ -35797,7 +35959,7 @@ in sources."has-flag-3.0.0" sources."has-unicode-2.0.1" sources."hosted-git-info-2.6.0" - sources."iconv-lite-0.4.21" + sources."iconv-lite-0.4.22" sources."imurmurhash-0.1.4" sources."indent-string-2.1.0" sources."inflight-1.0.6" @@ -35843,7 +36005,7 @@ in ]; }) sources."locate-path-2.0.0" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."lodash._reinterpolate-3.0.0" sources."lodash.template-4.4.0" sources."lodash.templatesettings-4.1.0" @@ -35854,7 +36016,7 @@ in sources."make-dir-1.2.0" sources."map-obj-1.0.1" sources."mem-1.1.0" - (sources."meow-4.0.0" // { + (sources."meow-4.0.1" // { dependencies = [ sources."find-up-2.1.0" sources."load-json-file-4.0.0" @@ -35870,7 +36032,7 @@ in sources."minimist-options-3.0.2" sources."mkdirp-0.5.1" sources."modify-values-1.0.1" - sources."moment-2.22.0" + sources."moment-2.22.1" sources."mute-stream-0.0.7" sources."normalize-package-data-2.4.0" sources."npm-run-path-2.0.2" @@ -35911,7 +36073,7 @@ in sources."pseudomap-1.0.2" sources."q-1.5.1" sources."quick-lru-1.1.0" - sources."rc-1.2.6" + sources."rc-1.2.7" sources."read-cmd-shim-1.0.1" sources."read-pkg-3.0.0" sources."read-pkg-up-1.0.1" @@ -35929,7 +36091,7 @@ in sources."run-async-2.3.0" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-5.5.0" sources."set-blocking-2.0.0" @@ -35957,7 +36119,7 @@ in sources."minimist-0.1.0" ]; }) - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" sources."temp-dir-1.0.0" (sources."temp-write-3.4.0" // { dependencies = [ @@ -36031,74 +36193,71 @@ in less = nodeEnv.buildNodePackage { name = "less"; packageName = "less"; - version = "3.0.1"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/less/-/less-3.0.1.tgz"; - sha512 = "25qmszxk5bzrjgyy1m0k87zc1c5h19ckvnlkhl9j3ncm3zfx7rzmydj6f4sw5c7ldc4npzs41fmgd1hw113kilrk8sggwzwvfw7hi59"; + url = "https://registry.npmjs.org/less/-/less-3.0.4.tgz"; + sha512 = "1qmi7lbjfq3w5ygilwf5sagk463c0j6kj2wsidzh6100v02bpfi05c8kbycf395hrdmmy5ffb5f0rsvkvqyhxw9hxrlyvnafc9b4x5b"; }; dependencies = [ - sources."ajv-4.11.8" + sources."ajv-5.5.2" sources."asap-2.0.6" sources."asn1-0.2.3" - sources."assert-plus-0.2.0" + sources."assert-plus-1.0.0" sources."asynckit-0.4.0" - sources."aws-sign2-0.6.0" + sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."bcrypt-pbkdf-1.0.1" - sources."boom-2.10.1" + sources."boom-4.3.1" sources."caseless-0.12.0" sources."co-4.6.0" sources."combined-stream-1.0.6" sources."core-util-is-1.0.2" - sources."cryptiles-2.0.5" + (sources."cryptiles-3.1.2" // { + dependencies = [ + sources."boom-5.2.0" + ]; + }) sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.1" sources."errno-0.1.7" sources."extend-3.0.1" sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.4" + sources."form-data-2.3.2" sources."getpass-0.1.7" sources."graceful-fs-4.1.11" - sources."har-schema-1.0.5" - sources."har-validator-4.2.1" - sources."hawk-3.1.3" - sources."hoek-2.16.3" - sources."http-signature-1.1.1" + sources."har-schema-2.0.0" + sources."har-validator-5.0.3" + sources."hawk-6.0.2" + sources."hoek-4.2.1" + sources."http-signature-1.2.0" sources."image-size-0.5.5" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" - sources."json-stable-stringify-1.0.1" + sources."json-schema-traverse-0.3.1" sources."json-stringify-safe-5.0.1" - sources."jsonify-0.0.0" - (sources."jsprim-1.4.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."jsprim-1.4.1" sources."mime-1.6.0" sources."mime-db-1.33.0" sources."mime-types-2.1.18" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" + sources."performance-now-2.1.0" sources."promise-7.3.1" sources."prr-1.0.1" sources."punycode-1.4.1" - sources."qs-6.4.0" - sources."request-2.81.0" - sources."safe-buffer-5.1.1" - sources."sntp-1.0.9" - sources."source-map-0.5.7" - (sources."sshpk-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."qs-6.5.2" + sources."request-2.85.0" + sources."safe-buffer-5.1.2" + sources."sntp-2.1.0" + sources."source-map-0.6.1" + sources."sshpk-1.14.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" @@ -36164,7 +36323,7 @@ in sources."concat-map-0.0.1" sources."convert-source-map-1.5.1" sources."core-util-is-1.0.2" - sources."duplexify-3.5.4" + sources."duplexify-3.6.0" sources."end-of-stream-1.4.1" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" @@ -36242,7 +36401,7 @@ in sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" sources."replace-ext-1.0.0" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."stream-shift-1.0.0" sources."string_decoder-1.1.1" sources."strip-bom-2.0.0" @@ -36363,6 +36522,7 @@ in sources."expand-range-1.8.2" (sources."express-4.16.3" // { dependencies = [ + sources."safe-buffer-5.1.1" sources."statuses-1.4.0" ]; }) @@ -36380,7 +36540,7 @@ in sources."form-data-2.3.2" sources."forwarded-0.1.2" sources."fresh-0.5.2" - sources."fsevents-1.1.3" + sources."fsevents-1.2.3" sources."getpass-0.1.7" sources."github-slugger-1.2.0" sources."glob-base-0.3.0" @@ -36480,7 +36640,7 @@ in sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" sources."request-2.85.0" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."send-0.16.2" sources."serve-static-1.13.2" sources."set-immediate-shim-1.0.1" @@ -36555,7 +36715,7 @@ in ]; }) sources."chokidar-1.7.0" - sources."colors-1.2.1" + sources."colors-1.2.4" sources."concat-map-0.0.1" sources."connect-3.5.1" sources."core-util-is-1.0.2" @@ -36580,13 +36740,13 @@ in sources."for-own-0.1.5" sources."fresh-0.5.2" sources."from-0.1.7" - sources."fsevents-1.1.3" + sources."fsevents-1.2.3" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" sources."graceful-fs-4.1.11" sources."http-auth-3.1.3" sources."http-errors-1.6.3" - sources."http-parser-js-0.4.11" + sources."http-parser-js-0.4.12" sources."inherits-2.0.3" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" @@ -36612,6 +36772,7 @@ in dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" + sources."safe-buffer-5.1.1" ]; }) sources."ms-0.7.1" @@ -36646,7 +36807,7 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" (sources."send-0.16.2" // { dependencies = [ sources."debug-2.6.9" @@ -36724,10 +36885,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "5.0.5"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-5.0.5.tgz"; - sha512 = "20cyp9x4b3gfrd50w8dcfkm0dv2mc6z0ikvfpkc8dzca6hppslgn0yiw2qdzc4ggf234kzcdvs0hw7lnv7ywilaml4w39vr6r93ghyw"; + url = "https://registry.npmjs.org/mocha/-/mocha-5.1.1.tgz"; + sha512 = "23wcnn35p90xhsc5z94w45s30j756s97acm313h6lacnbliqlaka3drq2xbsi4br8gdkld3r4dc33vglq8kf5jb408c7b2agpyar8lh"; }; dependencies = [ sources."balanced-match-1.0.0" @@ -36790,7 +36951,7 @@ in sources."isarray-1.0.0" sources."js-yaml-3.11.0" sources."json-refs-2.1.7" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."methods-1.1.2" sources."mime-1.6.0" sources."mime-db-1.33.0" @@ -36800,13 +36961,13 @@ in sources."path-loader-1.0.4" sources."process-nextick-args-2.0.0" sources."punycode-2.1.0" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."readable-stream-2.3.6" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."slash-1.0.0" sources."sprintf-js-1.0.3" sources."string_decoder-1.1.1" - sources."superagent-3.8.2" + sources."superagent-3.8.3" sources."uri-js-3.0.2" sources."util-deprecate-1.0.2" ]; @@ -36921,14 +37082,14 @@ in sources."mime-db-1.33.0" sources."mime-types-2.1.18" sources."minimist-0.0.8" - sources."minipass-2.2.4" + sources."minipass-2.3.0" sources."minizlib-1.1.0" sources."mkdirp-0.5.1" sources."ncp-0.4.2" sources."nijs-0.0.25" sources."nopt-3.0.6" sources."normalize-package-data-2.4.0" - sources."npm-package-arg-6.0.0" + sources."npm-package-arg-6.1.0" sources."npm-registry-client-8.5.1" (sources."npmconf-2.1.2" // { dependencies = [ @@ -36949,12 +37110,12 @@ in sources."process-nextick-args-2.0.0" sources."proto-list-1.2.4" sources."punycode-1.4.1" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."readable-stream-2.3.6" sources."request-2.85.0" sources."retry-0.10.1" sources."rimraf-2.2.8" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."semver-5.5.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" @@ -37085,11 +37246,11 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.0" sources."punycode-1.4.1" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."readable-stream-2.3.6" sources."request-2.85.0" sources."rimraf-2.6.2" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."semver-5.3.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" @@ -37168,7 +37329,7 @@ in sources."yargs-1.3.3" ]; }) - sources."big-integer-1.6.27" + sources."big-integer-1.6.28" sources."block-stream-0.0.9" (sources."body-parser-1.18.2" // { dependencies = [ @@ -37204,7 +37365,7 @@ in sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decamelize-1.2.0" - sources."deep-extend-0.4.2" + sources."deep-extend-0.5.1" sources."default-browser-id-1.0.4" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" @@ -37327,7 +37488,7 @@ in sources."http-errors-1.6.2" ]; }) - sources."rc-1.2.6" + sources."rc-1.2.7" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" sources."readable-stream-2.3.6" @@ -37419,10 +37580,10 @@ in node-pre-gyp = nodeEnv.buildNodePackage { name = "node-pre-gyp"; packageName = "node-pre-gyp"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.9.0.tgz"; - sha1 = "bdd4c3afac9b1b1ebff0a9ff3362859eb6781bb8"; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.0.tgz"; + sha512 = "10s7f95mxnxcwziwzx44l62zy3yjmhky942pw134dbd48wshl7abr1ja8qx1rfzz9vgygcx1vlz1jlldy61da33zq0bfi8bfji09f8v"; }; dependencies = [ sources."abbrev-1.1.1" @@ -37437,7 +37598,7 @@ in sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" sources."debug-2.6.9" - sources."deep-extend-0.4.2" + sources."deep-extend-0.5.1" sources."delegates-1.0.0" sources."detect-libc-1.0.3" sources."fs-minipass-1.2.5" @@ -37445,7 +37606,7 @@ in sources."gauge-2.7.4" sources."glob-7.1.2" sources."has-unicode-2.0.1" - sources."iconv-lite-0.4.21" + sources."iconv-lite-0.4.22" sources."ignore-walk-3.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -37454,11 +37615,11 @@ in sources."isarray-1.0.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" - sources."minipass-2.2.4" + sources."minipass-2.3.0" sources."minizlib-1.1.0" sources."mkdirp-0.5.1" sources."ms-2.0.0" - sources."needle-2.2.0" + sources."needle-2.2.1" sources."nopt-4.0.1" sources."npm-bundled-1.0.3" sources."npm-packlist-1.1.10" @@ -37471,14 +37632,14 @@ in sources."osenv-0.1.5" sources."path-is-absolute-1.0.1" sources."process-nextick-args-2.0.0" - (sources."rc-1.2.6" // { + (sources."rc-1.2.7" // { dependencies = [ sources."minimist-1.2.0" ]; }) sources."readable-stream-2.3.6" sources."rimraf-2.6.2" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."semver-5.5.0" @@ -37488,7 +37649,7 @@ in sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - sources."tar-4.4.1" + sources."tar-4.4.2" sources."util-deprecate-1.0.2" sources."wide-align-1.1.2" sources."wrappy-1.0.2" @@ -37506,10 +37667,10 @@ in nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "1.17.3"; + version = "1.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.3.tgz"; - sha512 = "1i6m13ad9c1p8xilw0vjcgmj0nnk1y9b3lncx6kwljxw89hmk5z9vv8m452wfd5qg9bqf9r0b236d9vxbc3i2sx2flamfrr03xm42zh"; + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.4.tgz"; + sha512 = "3bmxd7fd494gy4ddax3mihjz1iy484iakyssbhy87cc2kwbky9xkb8l47vphc3n858q9p9afxl57w0849i24amsdjhwbqh8vxhjy1v5"; }; dependencies = [ sources."abbrev-1.1.1" @@ -37530,7 +37691,7 @@ in sources."array-unique-0.3.2" sources."assign-symbols-1.0.0" sources."async-each-1.0.1" - sources."atob-2.1.0" + sources."atob-2.1.1" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -37555,7 +37716,7 @@ in sources."cache-base-1.0.1" sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.0" - sources."chalk-2.3.2" + sources."chalk-2.4.1" (sources."chokidar-2.0.3" // { dependencies = [ sources."debug-2.6.9" @@ -37602,7 +37763,7 @@ in sources."crypto-random-string-1.0.0" sources."debug-3.1.0" sources."decode-uri-component-0.2.0" - sources."deep-extend-0.4.2" + sources."deep-extend-0.5.1" sources."define-property-2.0.2" sources."dot-prop-4.2.0" sources."duplexer-0.1.1" @@ -37627,7 +37788,7 @@ in sources."for-in-1.0.2" sources."fragment-cache-0.2.1" sources."from-0.1.7" - sources."fsevents-1.1.3" + sources."fsevents-1.2.3" sources."get-stream-3.0.0" sources."get-value-2.0.6" (sources."glob-parent-3.1.0" // { @@ -37721,7 +37882,7 @@ in sources."ps-tree-1.1.0" sources."pseudomap-1.0.2" sources."pstree.remy-1.1.0" - sources."rc-1.2.6" + sources."rc-1.2.7" sources."readable-stream-2.3.6" sources."readdirp-2.1.0" sources."regex-not-1.0.2" @@ -37732,7 +37893,7 @@ in sources."repeat-string-1.6.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."semver-5.5.0" sources."semver-diff-2.1.0" @@ -37771,7 +37932,7 @@ in sources."strip-ansi-4.0.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" sources."term-size-1.2.0" sources."through-2.3.8" sources."timed-out-4.0.1" @@ -37800,8 +37961,8 @@ in ]; }) sources."unzip-response-2.0.1" - sources."upath-1.0.4" - sources."update-notifier-2.4.0" + sources."upath-1.0.5" + sources."update-notifier-2.5.0" sources."urix-0.1.0" sources."url-parse-lax-1.0.0" (sources."use-3.1.0" // { @@ -37902,7 +38063,7 @@ in sources."css-what-2.1.0" sources."dashdash-1.14.1" sources."debug-2.6.9" - sources."deep-extend-0.4.2" + sources."deep-extend-0.5.1" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" @@ -37912,7 +38073,7 @@ in sources."domelementtype-1.3.0" sources."domhandler-2.4.1" sources."domutils-1.5.1" - sources."duplexify-3.5.4" + sources."duplexify-3.6.0" sources."ecc-jsbn-0.1.1" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" @@ -38043,15 +38204,15 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."mkdirp-0.5.1" - sources."moment-2.22.0" - sources."moment-timezone-0.5.14" + sources."moment-2.22.1" + sources."moment-timezone-0.5.16" (sources."mqtt-2.15.1" // { dependencies = [ sources."ws-3.3.3" ]; }) sources."mqtt-packet-5.5.0" - sources."mri-1.1.0" + sources."mri-1.1.1" sources."ms-2.0.0" (sources."multer-1.3.0" // { dependencies = [ @@ -38067,7 +38228,7 @@ in sources."needle-0.11.0" sources."negotiator-0.6.1" sources."node-pre-gyp-0.6.36" - (sources."node-red-node-email-0.1.27" // { + (sources."node-red-node-email-0.1.29" // { dependencies = [ sources."addressparser-1.0.1" sources."clone-1.0.4" @@ -38121,7 +38282,7 @@ in sources."proxy-addr-2.0.3" sources."pseudomap-1.0.2" sources."pump-2.0.1" - sources."pumpify-1.4.0" + sources."pumpify-1.5.0" sources."punycode-1.4.1" sources."qs-6.5.1" sources."random-bytes-1.0.0" @@ -38133,7 +38294,7 @@ in sources."setprototypeof-1.0.3" ]; }) - sources."rc-1.2.6" + sources."rc-1.2.7" sources."readable-stream-2.3.6" sources."reinterval-1.1.0" sources."remove-trailing-separator-1.1.0" @@ -38293,7 +38454,7 @@ in sources."natives-1.1.3" (sources."net-ping-1.1.7" // { dependencies = [ - sources."nan-2.3.5" + sources."nan-2.10.0" ]; }) sources."nodemailer-0.3.35" @@ -38308,7 +38469,7 @@ in sources."qs-0.5.1" sources."rai-0.1.12" sources."range-parser-0.0.4" - sources."raw-socket-1.5.2" + sources."raw-socket-1.6.0" sources."redis-0.7.3" sources."semver-1.1.0" sources."send-0.1.0" @@ -38344,10 +38505,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "5.8.0"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-5.8.0.tgz"; - sha512 = "32zs775qksijpj23rwly4h8gs435lbsgaxzw6dmyjjg3i8qd40bmmadv3ac9mdxd0cd2x0m3ncsqa0j5vkmkvh8dknn0j9d1k6ig30f"; + url = "https://registry.npmjs.org/npm/-/npm-6.0.0.tgz"; + sha512 = "1s1pq7rdh5xxd4phq7bf1fikbfwc9iiglgayiy0bf14skvivj96j7f5mzyh3631gzhm7vmpak0k523axik5n4hza8gd8c90s203plqj"; }; buildInputs = globalBuildInputs; meta = { @@ -38486,12 +38647,12 @@ in sources."process-nextick-args-2.0.0" sources."proto-list-1.2.4" sources."punycode-1.4.1" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."readable-stream-2.3.6" sources."request-2.85.0" sources."retry-0.6.0" sources."rimraf-2.6.2" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."semver-4.3.6" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" @@ -38538,153 +38699,74 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "2.14.1"; + version = "2.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.14.1.tgz"; - sha512 = "1ciz9n8wmwq3lpi3g6xmjr4plqf3ydpqznrcci5bbrq7d9clkmkcg3gzbaqwkgrjgmvahby0akylk66zq8n8zm5mqn0vj0jsrxhryf4"; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.14.2.tgz"; + sha512 = "20p92czrssb8mfn5lmaswrzv0wy5va0r7xlmh5f6sd7zj46iydqkhfmfy9lv3d6zf7x42zdbkdrj4mk420gzlmgb3wgd608cafcnalk"; }; dependencies = [ - sources."abbrev-1.1.1" - sources."align-text-0.1.4" sources."ansi-align-2.0.0" - sources."ansi-escapes-1.4.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" - sources."ansicolors-0.3.2" - sources."archy-1.0.0" sources."argparse-1.0.10" - sources."asap-2.0.6" - sources."async-1.5.2" - sources."balanced-match-1.0.0" - sources."base64-js-0.0.2" sources."bluebird-3.5.1" - sources."bops-0.1.1" - sources."boxen-0.3.1" - sources."brace-expansion-1.1.11" - sources."builtin-modules-1.1.1" - sources."camelcase-1.2.1" + sources."boxen-1.3.0" + sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.0" - sources."center-align-0.1.3" sources."chalk-1.1.3" sources."ci-info-1.1.3" sources."cint-8.2.1" sources."cli-boxes-1.0.0" - sources."cli-cursor-1.0.2" sources."cli-table-0.3.1" - sources."cli-width-2.2.0" - sources."clite-0.3.0" - sources."cliui-2.1.0" - sources."clone-deep-0.3.0" - sources."code-point-at-1.1.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."colors-1.0.3" sources."commander-2.15.1" - sources."concat-map-0.0.1" - (sources."configstore-1.4.0" // { - dependencies = [ - sources."uuid-2.0.3" - ]; - }) - sources."core-util-is-1.0.2" + sources."configstore-3.1.2" sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" sources."debug-2.6.9" - sources."decamelize-1.2.0" - sources."deep-extend-0.4.2" - sources."dot-prop-3.0.0" - sources."duplexer2-0.1.4" + sources."deep-extend-0.5.1" + sources."dot-prop-4.2.0" sources."duplexer3-0.1.4" - sources."duplexify-3.5.4" - sources."email-validator-1.1.1" - sources."end-of-stream-1.4.1" - sources."error-ex-1.3.1" - sources."es6-promise-3.3.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.0" sources."execa-0.7.0" - sources."exit-hook-1.1.1" sources."fast-diff-1.1.2" - sources."figures-1.7.0" - sources."filled-array-1.1.0" sources."find-up-1.1.2" - sources."for-in-1.0.2" - sources."for-own-1.0.0" - sources."get-caller-file-1.0.2" sources."get-stdin-5.0.1" sources."get-stream-3.0.0" sources."global-dirs-0.1.1" - sources."got-5.7.1" + sources."got-6.7.1" sources."graceful-fs-4.1.11" - sources."graphlib-2.1.5" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" - sources."hasbin-1.2.3" - sources."hosted-git-info-2.6.0" - sources."iconv-lite-0.4.21" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" - sources."infinity-agent-2.0.3" - sources."inherits-2.0.3" sources."ini-1.3.5" - sources."inquirer-1.0.3" - sources."invert-kv-1.0.0" - sources."is-arrayish-0.2.1" - sources."is-buffer-1.1.6" - sources."is-builtin-module-1.0.0" sources."is-ci-1.1.0" - sources."is-extendable-0.1.1" - sources."is-finite-1.0.2" - sources."is-fullwidth-code-point-1.0.0" + sources."is-fullwidth-code-point-2.0.0" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" sources."is-obj-1.0.1" sources."is-path-inside-1.0.1" - sources."is-plain-object-2.0.4" - sources."is-promise-2.1.0" sources."is-redirect-1.0.0" sources."is-retry-allowed-1.1.0" sources."is-stream-1.1.0" - sources."is-utf8-0.2.1" - sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."isobject-3.0.1" sources."jju-1.3.0" sources."js-yaml-3.11.0" sources."json-parse-helpfulerror-1.0.3" sources."json5-0.5.1" - sources."kind-of-3.2.2" - sources."latest-version-2.0.0" - sources."lazy-cache-1.0.4" - sources."lcid-1.0.0" - sources."load-json-file-1.1.0" - sources."lodash-4.17.5" - sources."lodash.assign-4.2.0" - sources."lodash.clonedeep-4.5.0" - sources."lodash.defaults-4.2.0" - sources."lodash.defaultsdeep-4.6.0" - sources."lodash.mergewith-4.6.1" - sources."longest-1.0.1" + sources."latest-version-3.1.0" + sources."lodash-4.17.10" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.2" sources."make-dir-1.2.0" - sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mixin-object-2.0.1" - sources."mkdirp-0.5.1" + sources."minimist-1.2.0" sources."ms-2.0.0" - sources."mute-stream-0.0.6" - sources."nconf-0.7.2" - (sources."needle-2.2.0" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."nested-error-stacks-1.0.2" sources."node-alias-1.0.4" - sources."node-status-codes-1.0.0" - sources."normalize-package-data-2.4.0" sources."npm-3.10.10" sources."npm-run-path-2.0.2" (sources."npmi-2.0.1" // { @@ -38692,214 +38774,56 @@ in sources."semver-4.3.6" ]; }) - sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" sources."object-keys-1.0.11" - sources."once-1.4.0" - sources."onetime-1.1.0" - sources."open-0.0.5" - sources."os-homedir-1.0.2" - sources."os-locale-1.4.0" - sources."os-name-1.0.3" - sources."os-tmpdir-1.0.2" - sources."osenv-0.1.5" - sources."osx-release-1.1.0" sources."p-finally-1.0.0" - sources."package-json-2.4.0" - sources."parse-json-2.2.0" + sources."package-json-4.0.1" sources."path-exists-2.1.0" - sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" - sources."path-type-1.1.0" - sources."pify-2.3.0" + sources."pify-3.0.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."prepend-http-1.0.4" - sources."process-nextick-args-2.0.0" - sources."promise-7.3.1" - sources."proxy-from-env-1.0.0" sources."pseudomap-1.0.2" - sources."punycode-1.3.2" - sources."querystring-0.2.0" - sources."rc-1.2.6" + sources."rc-1.2.7" sources."rc-config-loader-2.0.1" - sources."read-all-stream-3.1.0" - sources."read-pkg-1.1.0" - sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.6" - sources."recursive-readdir-2.2.2" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" - sources."repeat-string-1.6.1" - sources."repeating-2.0.1" - sources."require-directory-2.1.1" sources."require-from-string-2.0.2" - sources."require-main-filename-1.0.1" - sources."restore-cursor-1.0.1" - sources."right-align-0.1.3" - sources."run-async-2.3.0" - sources."rx-4.1.0" - sources."safe-buffer-5.1.1" - sources."safer-buffer-2.1.2" - sources."sax-1.2.4" + sources."safe-buffer-5.1.2" sources."semver-5.5.0" sources."semver-diff-2.1.0" sources."semver-utils-1.1.2" - sources."set-blocking-2.0.0" - (sources."shallow-clone-0.1.2" // { - dependencies = [ - sources."kind-of-2.0.1" - ]; - }) sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" - sources."slide-1.1.6" - (sources."snyk-1.71.0" // { - dependencies = [ - sources."async-0.9.2" - sources."camelcase-3.0.0" - sources."cliui-3.2.0" - sources."debug-3.1.0" - sources."for-in-0.1.8" - sources."got-3.3.1" - sources."latest-version-1.0.1" - sources."lazy-cache-0.2.7" - sources."minimist-1.2.0" - sources."object-assign-3.0.0" - sources."package-json-1.2.0" - sources."repeating-1.1.3" - sources."timed-out-2.0.0" - sources."update-notifier-0.5.0" - sources."window-size-0.2.0" - sources."yargs-4.8.1" - ]; - }) - (sources."snyk-config-1.0.1" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."snyk-go-plugin-1.4.6" - sources."snyk-gradle-plugin-1.2.0" - (sources."snyk-module-1.8.1" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."snyk-mvn-plugin-1.1.1" - (sources."snyk-nuget-plugin-1.3.9" // { - dependencies = [ - sources."es6-promise-4.2.4" - ]; - }) - sources."snyk-php-plugin-1.3.2" - (sources."snyk-policy-1.10.2" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."snyk-python-plugin-1.5.7" - (sources."snyk-resolve-1.0.0" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - (sources."snyk-resolve-deps-1.7.0" // { - dependencies = [ - sources."configstore-2.1.0" - sources."debug-2.6.9" - sources."update-notifier-0.6.3" - sources."uuid-2.0.3" - ]; - }) - (sources."snyk-sbt-plugin-1.2.5" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."snyk-tree-1.0.0" - (sources."snyk-try-require-1.2.0" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) sources."spawn-please-0.3.0" - sources."spdx-correct-3.0.0" - sources."spdx-exceptions-2.1.0" - sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.0" sources."sprintf-js-1.0.3" - sources."stream-shift-1.0.0" - sources."string-length-1.0.1" - sources."string-width-1.0.2" - sources."string_decoder-1.1.1" + sources."string-width-2.1.1" sources."strip-ansi-3.0.1" - sources."strip-bom-2.0.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" - (sources."tempfile-1.1.1" // { - dependencies = [ - sources."uuid-2.0.3" - ]; - }) sources."term-size-1.2.0" - sources."then-fs-2.0.0" - sources."through-2.3.8" - sources."timed-out-3.1.3" - sources."to-utf8-0.0.1" - sources."toml-2.3.3" - sources."undefsafe-0.0.3" + sources."timed-out-4.0.1" sources."unique-string-1.0.0" - sources."unzip-response-1.0.2" - (sources."update-notifier-2.4.0" // { + sources."unzip-response-2.0.1" + (sources."update-notifier-2.5.0" // { dependencies = [ sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" - sources."boxen-1.3.0" - sources."camelcase-4.1.0" - sources."chalk-2.3.2" - sources."configstore-3.1.2" - sources."dot-prop-4.2.0" - sources."got-6.7.1" - sources."is-fullwidth-code-point-2.0.0" - sources."latest-version-3.1.0" - sources."package-json-4.0.1" - sources."pify-3.0.0" - sources."string-width-2.1.1" + sources."chalk-2.4.1" sources."strip-ansi-4.0.0" - sources."supports-color-5.3.0" - sources."timed-out-4.0.1" - sources."unzip-response-2.0.1" - sources."widest-line-2.0.0" - sources."write-file-atomic-2.3.0" - sources."xdg-basedir-3.0.0" + sources."supports-color-5.4.0" ]; }) - sources."url-0.11.0" sources."url-parse-lax-1.0.0" - sources."util-deprecate-1.0.2" - sources."uuid-3.2.1" - sources."validate-npm-package-license-3.0.3" sources."which-1.3.0" - sources."which-module-1.0.0" - sources."widest-line-1.0.0" - sources."win-release-1.1.1" - sources."window-size-0.1.4" - sources."wordwrap-0.0.2" - sources."wrap-ansi-2.1.0" - sources."wrappy-1.0.2" - sources."write-file-atomic-1.3.4" - sources."xdg-basedir-2.0.0" - sources."xml2js-0.4.19" - sources."xmlbuilder-9.0.7" - sources."y18n-3.2.1" + sources."widest-line-2.0.0" + sources."write-file-atomic-2.3.0" + sources."xdg-basedir-3.0.0" sources."yallist-2.1.2" - sources."yargs-3.15.0" - sources."yargs-parser-2.4.1" - sources."zip-1.2.0" ]; buildInputs = globalBuildInputs; meta = { @@ -38926,7 +38850,7 @@ in sources."boom-5.2.0" sources."builtin-modules-1.1.1" sources."camelcase-4.1.0" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."chardet-0.4.2" sources."cli-cursor-2.1.0" sources."cli-table2-0.2.0" @@ -38939,7 +38863,7 @@ in sources."code-point-at-1.1.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."colors-1.2.1" + sources."colors-1.2.4" sources."cross-spawn-5.1.0" sources."cvss-1.0.2" sources."debug-3.1.0" @@ -38959,12 +38883,12 @@ in sources."hoek-4.2.1" sources."hosted-git-info-2.6.0" sources."https-proxy-agent-2.2.1" - sources."iconv-lite-0.4.21" + sources."iconv-lite-0.4.22" (sources."inquirer-3.3.0" // { dependencies = [ sources."ansi-regex-3.0.0" sources."is-fullwidth-code-point-2.0.0" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" ]; @@ -39024,7 +38948,7 @@ in sources."strip-ansi-3.0.1" sources."strip-bom-3.0.0" sources."strip-eof-1.0.0" - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" sources."through-2.3.8" sources."tmp-0.0.33" sources."validate-npm-package-license-3.0.3" @@ -39143,7 +39067,7 @@ in sources."cliui-2.1.0" sources."co-4.6.0" sources."code-point-at-1.1.0" - sources."colors-1.2.1" + sources."colors-1.2.4" sources."combined-stream-1.0.6" sources."compressible-2.0.13" sources."compression-1.7.2" @@ -39271,7 +39195,7 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.10" sources."mkdirp-0.5.1" - sources."moment-2.22.0" + sources."moment-2.22.1" sources."ms-2.0.0" sources."msgpack5-3.6.0" sources."mv-2.1.1" @@ -39400,10 +39324,10 @@ in peerflix = nodeEnv.buildNodePackage { name = "peerflix"; packageName = "peerflix"; - version = "0.37.0"; + version = "0.38.0"; src = fetchurl { - url = "https://registry.npmjs.org/peerflix/-/peerflix-0.37.0.tgz"; - sha512 = "0i2j5pgw72bkg5s5crh3p534sz6m6yvbyg174kkgyj1l0sgaqmzj22xmh0dvxqk7r3rp79w2vs27gdqzb8azmlr6ag13m17h20cyhhf"; + url = "https://registry.npmjs.org/peerflix/-/peerflix-0.38.0.tgz"; + sha512 = "0jy97ypdv4a36cdcszfcj0qmv1z1k896h17xb7n2jzj26r4bz8kpj0dcnx255mj5bpxv3074gmabdk2da9jmp2awryyxj7f6l31p2bi"; }; dependencies = [ sources."addr-to-ip-port-1.4.3" @@ -39418,7 +39342,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-0.0.8" sources."bencode-2.0.0" - sources."big-integer-1.6.27" + sources."big-integer-1.6.28" sources."bitfield-0.1.0" sources."bittorrent-dht-6.4.2" sources."bittorrent-tracker-7.7.0" @@ -39456,7 +39380,7 @@ in sources."decamelize-1.2.0" sources."decompress-response-3.3.0" sources."deep-equal-1.0.1" - sources."deep-extend-0.4.2" + sources."deep-extend-0.5.1" sources."dns-equal-1.0.0" sources."dns-packet-1.3.1" sources."dns-txt-2.0.2" @@ -39491,7 +39415,7 @@ in sources."ini-1.3.5" (sources."inquirer-1.2.3" // { dependencies = [ - sources."lodash-4.17.5" + sources."lodash-4.17.10" ]; }) sources."internal-ip-1.2.0" @@ -39548,12 +39472,12 @@ in sources."os-shim-0.1.3" sources."os-tmpdir-1.0.2" sources."parse-json-2.2.0" - (sources."parse-torrent-5.8.3" // { + (sources."parse-torrent-5.9.1" // { dependencies = [ - sources."get-stdin-5.0.1" + sources."get-stdin-6.0.0" ]; }) - sources."parse-torrent-file-4.1.0" + sources."parse-torrent-file-2.1.4" sources."path-exists-2.1.0" sources."path-is-absolute-1.0.1" sources."path-type-1.1.0" @@ -39570,11 +39494,11 @@ in sources."process-nextick-args-2.0.0" sources."pump-1.0.3" sources."random-access-file-2.0.1" - sources."random-access-storage-1.1.1" + sources."random-access-storage-1.2.0" sources."random-iterate-1.0.1" sources."randombytes-2.0.6" sources."range-parser-1.2.0" - sources."rc-1.2.6" + sources."rc-1.2.7" sources."re-emitter-1.1.3" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" @@ -39585,16 +39509,16 @@ in sources."reverse-http-1.3.0" sources."rimraf-2.6.2" sources."run-async-2.3.0" - sources."run-parallel-1.1.8" - sources."run-series-1.1.6" + sources."run-parallel-1.1.9" + sources."run-series-1.1.8" sources."rusha-0.8.13" sources."rx-4.1.0" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."semver-5.5.0" sources."server-destroy-1.0.1" sources."signal-exit-3.0.2" sources."simple-concat-1.0.0" - sources."simple-get-2.7.0" + sources."simple-get-2.8.1" sources."simple-peer-6.4.4" sources."simple-sha1-2.1.0" (sources."simple-websocket-4.3.1" // { @@ -39611,7 +39535,7 @@ in sources."speedometer-0.1.4" sources."stream-buffers-2.2.0" sources."string-width-1.0.2" - sources."string2compact-1.2.2" + sources."string2compact-1.2.3" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" @@ -39641,7 +39565,6 @@ in sources."minimist-0.0.8" sources."once-1.3.3" sources."parse-torrent-4.1.0" - sources."parse-torrent-file-2.1.4" sources."readable-stream-1.1.14" sources."safe-buffer-5.0.1" sources."string_decoder-0.10.31" @@ -39878,9 +39801,9 @@ in sources."process-nextick-args-2.0.0" sources."proxy-addr-1.0.10" sources."pump-1.0.3" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."random-access-file-2.0.1" - sources."random-access-storage-1.1.1" + sources."random-access-storage-1.2.0" sources."random-bytes-1.0.0" sources."random-iterate-1.0.1" sources."randombytes-2.0.6" @@ -39907,10 +39830,10 @@ in }) sources."rimraf-2.6.2" sources."rndm-1.2.0" - sources."run-parallel-1.1.8" - sources."run-series-1.1.6" + sources."run-parallel-1.1.9" + sources."run-series-1.1.8" sources."rusha-0.8.13" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" (sources."send-0.13.0" // { dependencies = [ sources."ms-0.7.1" @@ -39925,7 +39848,7 @@ in ]; }) sources."simple-concat-1.0.0" - sources."simple-get-2.7.0" + sources."simple-get-2.8.1" sources."simple-peer-6.4.4" sources."simple-sha1-2.1.0" (sources."simple-websocket-4.3.1" // { @@ -39955,7 +39878,7 @@ in sources."speedometer-0.1.4" sources."statuses-1.5.0" sources."stream-counter-0.2.0" - sources."string2compact-1.2.2" + sources."string2compact-1.2.3" sources."string_decoder-0.10.31" sources."thirty-two-0.0.2" sources."thunky-1.0.2" @@ -40079,7 +40002,7 @@ in }) sources."kew-0.7.0" sources."klaw-1.3.1" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."mime-db-1.33.0" sources."mime-types-2.1.18" sources."minimatch-3.0.4" @@ -40133,10 +40056,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "1.11.1"; + version = "1.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-1.11.1.tgz"; - sha512 = "33s27xnirdx15j0dkp0i79bawmn7pysqxjiksh1jd5gcl4fdzvhd1sr9n7lh4k1ik37g1lmi3gb33j3kz31psqlxxyz1l5djgmq7wjg"; + url = "https://registry.npmjs.org/prettier/-/prettier-1.12.1.tgz"; + sha1 = "c1ad20e803e7749faf905a409d2367e06bbe7325"; }; buildInputs = globalBuildInputs; meta = { @@ -40150,10 +40073,10 @@ in pulp = nodeEnv.buildNodePackage { name = "pulp"; packageName = "pulp"; - version = "12.0.1"; + version = "12.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/pulp/-/pulp-12.0.1.tgz"; - sha512 = "3n09lgnyd4p3h3jlhgcvbh6n6m9h89hwvbhli5ic32fkl5y4g7yi61m1vw483479jxkif2zyqs89l6j6hq4iy15jdknx1lcp9qbyvwy"; + url = "https://registry.npmjs.org/pulp/-/pulp-12.2.0.tgz"; + sha512 = "1kgjvji88fvdi6vazqq6gx32zqgkg9qp639952cz2v2g5izl7yblgawy1xra5dypv5c1a43wk4ch4iskr1kxxpfmn7pnql92q1nvxgg"; }; dependencies = [ sources."JSONStream-1.3.2" @@ -40188,7 +40111,7 @@ in sources."astw-2.2.0" sources."async-1.5.2" sources."async-each-1.0.1" - sources."atob-2.1.0" + sources."atob-2.1.1" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -40200,7 +40123,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."base64-js-1.2.3" + sources."base64-js-1.3.0" sources."binary-extensions-1.11.0" sources."bn.js-4.11.8" sources."brace-expansion-1.1.11" @@ -40224,15 +40147,14 @@ in sources."readable-stream-2.0.6" ]; }) - sources."hash-base-2.0.2" sources."isarray-2.0.4" sources."process-nextick-args-2.0.0" ]; }) sources."browserify-aes-1.2.0" sources."browserify-cache-api-3.0.1" - sources."browserify-cipher-1.0.0" - sources."browserify-des-1.0.0" + sources."browserify-cipher-1.0.1" + sources."browserify-des-1.0.1" (sources."browserify-incremental-3.1.1" // { dependencies = [ sources."JSONStream-0.10.0" @@ -40243,6 +40165,7 @@ in sources."browserify-sign-4.0.4" sources."browserify-zlib-0.1.4" sources."buffer-4.9.1" + sources."buffer-crc32-0.2.13" sources."buffer-from-1.0.0" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" @@ -40263,7 +40186,7 @@ in ]; }) sources."collection-visit-1.0.0" - sources."colors-1.2.1" + sources."colors-1.2.4" sources."combine-source-map-0.8.0" sources."component-emitter-1.2.1" sources."concat-map-0.0.1" @@ -40273,9 +40196,9 @@ in sources."convert-source-map-1.1.3" sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" - sources."create-ecdh-4.0.0" - sources."create-hash-1.1.3" - sources."create-hmac-1.1.6" + sources."create-ecdh-4.0.1" + sources."create-hash-1.2.0" + sources."create-hmac-1.1.7" sources."crypto-browserify-3.12.0" sources."date-now-0.1.4" sources."debug-2.6.9" @@ -40285,10 +40208,11 @@ in sources."deps-sort-2.0.0" sources."des.js-1.0.0" sources."detective-4.7.1" - sources."diffie-hellman-5.0.2" + sources."diffie-hellman-5.0.3" sources."domain-browser-1.1.7" sources."duplexer2-0.1.4" sources."elliptic-6.4.0" + sources."es6-promise-3.3.1" sources."events-1.1.1" sources."evp_bytestokey-1.0.3" (sources."expand-brackets-2.1.4" // { @@ -40308,7 +40232,7 @@ in sources."for-in-1.0.2" sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" - sources."fsevents-1.1.3" + sources."fsevents-1.2.3" sources."function-bind-1.1.1" sources."get-value-2.0.6" sources."glob-7.1.2" @@ -40364,17 +40288,23 @@ in sources."micromatch-3.1.10" sources."miller-rabin-4.0.1" sources."mime-1.6.0" - sources."minimalistic-assert-1.0.0" + sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."mixin-deep-1.3.1" + sources."mkdirp-0.5.1" sources."module-deps-4.1.1" + (sources."mold-source-map-0.4.0" // { + dependencies = [ + sources."through-2.2.7" + ]; + }) sources."ms-2.0.0" sources."mute-stream-0.0.7" sources."nan-2.10.0" sources."nanomatch-1.2.9" - sources."neo-async-2.5.0" + sources."neo-async-2.5.1" (sources."node-static-0.7.10" // { dependencies = [ sources."minimist-0.0.10" @@ -40391,18 +40321,18 @@ in sources."os-tmpdir-1.0.2" sources."pako-0.2.9" sources."parents-1.0.1" - sources."parse-asn1-5.1.0" + sources."parse-asn1-5.1.1" sources."pascalcase-0.1.1" sources."path-browserify-0.0.0" sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.5" sources."path-platform-0.11.15" - sources."pbkdf2-3.0.14" + sources."pbkdf2-3.0.16" sources."posix-character-classes-0.1.1" sources."process-0.11.10" sources."process-nextick-args-1.0.7" - sources."public-encrypt-4.0.0" + sources."public-encrypt-4.0.2" sources."punycode-1.4.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" @@ -40421,13 +40351,18 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.2" sources."repeat-string-1.6.1" - sources."resolve-1.7.0" + sources."resolve-1.7.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" - sources."rimraf-2.2.8" - sources."ripemd160-2.0.1" - sources."safe-buffer-5.1.1" + sources."rimraf-2.6.2" + sources."ripemd160-2.0.2" + sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" + (sources."sander-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) sources."set-immediate-shim-1.0.1" sources."set-value-2.0.0" sources."sha.js-2.4.11" @@ -40446,9 +40381,11 @@ in }) sources."snapdragon-node-2.1.1" sources."snapdragon-util-3.0.1" + sources."sorcery-0.10.0" sources."source-map-0.5.7" sources."source-map-resolve-0.5.1" sources."source-map-url-0.4.0" + sources."sourcemap-codec-1.4.1" (sources."split-string-3.1.0" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -40464,7 +40401,11 @@ in sources."string_decoder-0.10.31" sources."subarg-1.0.0" sources."syntax-error-1.4.0" - sources."temp-0.8.3" + (sources."temp-0.8.3" // { + dependencies = [ + sources."rimraf-2.2.8" + ]; + }) sources."through-2.3.8" sources."through2-2.0.3" sources."timers-browserify-1.4.2" @@ -40490,7 +40431,7 @@ in }) ]; }) - sources."upath-1.0.4" + sources."upath-1.0.5" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -40509,7 +40450,7 @@ in }) sources."util-deprecate-1.0.2" sources."vm-browserify-0.0.4" - (sources."watchpack-1.5.0" // { + (sources."watchpack-1.6.0" // { dependencies = [ sources."define-property-1.0.0" sources."extend-shallow-2.0.1" @@ -40591,6 +40532,9 @@ in ]; }) sources."boom-2.10.1" + sources."buffer-alloc-1.1.0" + sources."buffer-alloc-unsafe-0.1.1" + sources."buffer-fill-0.1.1" sources."bufferutil-2.0.1" sources."bytes-3.0.0" sources."camelcase-1.2.1" @@ -40617,7 +40561,7 @@ in sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decamelize-1.2.0" - sources."deep-extend-0.4.2" + sources."deep-extend-0.5.1" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" @@ -40645,6 +40589,7 @@ in sources."form-data-2.1.4" sources."forwarded-0.1.2" sources."fresh-0.5.2" + sources."fs-constants-1.0.0" sources."function-bind-1.1.1" sources."gauge-2.7.4" sources."getpass-0.1.7" @@ -40695,7 +40640,7 @@ in }) sources."less-middleware-2.2.1" sources."libquassel-2.1.9" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."longest-1.0.1" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" @@ -40716,7 +40661,7 @@ in sources."tunnel-agent-0.4.3" ]; }) - sources."node-abi-2.3.0" + sources."node-abi-2.4.1" sources."node.extend-2.0.0" sources."noop-logger-0.1.1" sources."npmlog-4.1.2" @@ -40763,12 +40708,12 @@ in sources."http-errors-1.6.2" ]; }) - sources."rc-1.2.6" + sources."rc-1.2.7" sources."readable-stream-2.3.6" sources."regenerator-runtime-0.11.1" sources."repeat-string-1.6.1" sources."request-2.81.0" - sources."resolve-1.7.0" + sources."resolve-1.7.1" sources."right-align-0.1.3" sources."safe-buffer-5.1.1" sources."semver-5.5.0" @@ -40798,8 +40743,9 @@ in sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - sources."tar-fs-1.16.0" - sources."tar-stream-1.5.5" + sources."tar-fs-1.16.2" + sources."tar-stream-1.6.0" + sources."to-buffer-1.1.1" sources."to-fast-properties-1.0.3" sources."token-stream-0.0.1" sources."tough-cookie-2.3.4" @@ -40859,7 +40805,7 @@ in sources."esprima-fb-13001.1001.0-dev-harmony-fb" sources."glob-5.0.15" sources."graceful-fs-4.1.11" - sources."iconv-lite-0.4.21" + sources."iconv-lite-0.4.22" sources."inflight-1.0.6" sources."inherits-2.0.3" (sources."jstransform-10.1.0" // { @@ -41055,7 +41001,7 @@ in sources."oauth-sign-0.8.2" (sources."openid-2.0.6" // { dependencies = [ - sources."qs-6.5.1" + sources."qs-6.5.2" sources."request-2.85.0" ]; }) @@ -41067,7 +41013,7 @@ in sources."raw-body-0.0.3" sources."readable-stream-1.1.14" sources."request-2.9.203" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."sax-1.2.4" sources."send-0.1.4" sources."sntp-2.1.0" @@ -41112,10 +41058,10 @@ in serve = nodeEnv.buildNodePackage { name = "serve"; packageName = "serve"; - version = "6.5.4"; + version = "6.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-6.5.4.tgz"; - sha512 = "3dhp8p2c9i86bwaxlxxlhml4p7ps2ph09pap35g5ivy0ndxv6av87axckmm4g7dwvz6c8y6mvc8c0v93m9hlk2rqm07y211621b1hhh"; + url = "https://registry.npmjs.org/serve/-/serve-6.5.6.tgz"; + sha512 = "1gfw9s3jh8ymzv26733pp33xkvhihlb25w8aznc3yqcx7wg82k7fzz6f3w3aw758dy7cshb89ijliaqcf1p4bgrchfqbxv1613wgmmd"; }; dependencies = [ sources."accepts-1.3.5" @@ -41126,24 +41072,23 @@ in sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."arch-2.1.0" - (sources."args-3.0.8" // { + (sources."args-4.0.0" // { dependencies = [ - sources."chalk-2.1.0" + sources."chalk-2.3.2" ]; }) sources."async-1.5.2" sources."basic-auth-2.0.0" sources."bluebird-3.5.1" - sources."boxen-1.3.0" - sources."bytes-3.0.0" - sources."camelcase-4.1.0" - sources."center-align-0.1.3" - (sources."chalk-2.3.2" // { + (sources."boxen-1.3.0" // { dependencies = [ - sources."has-flag-3.0.0" - sources."supports-color-5.3.0" + sources."camelcase-4.1.0" ]; }) + sources."bytes-3.0.0" + sources."camelcase-5.0.0" + sources."center-align-0.1.3" + sources."chalk-2.4.0" sources."cli-boxes-1.0.0" (sources."clipboardy-1.2.3" // { dependencies = [ @@ -41160,7 +41105,7 @@ in sources."dargs-5.1.0" sources."debug-2.6.9" sources."decamelize-1.2.0" - sources."deep-extend-0.4.2" + sources."deep-extend-0.5.1" sources."depd-1.1.1" sources."destroy-1.0.4" sources."detect-port-1.2.2" @@ -41170,7 +41115,7 @@ in sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" sources."execa-0.7.0" - sources."filesize-3.6.0" + sources."filesize-3.6.1" sources."fresh-0.5.2" sources."fs-extra-5.0.0" sources."get-stream-3.0.0" @@ -41181,7 +41126,7 @@ in sources."wordwrap-0.0.2" ]; }) - sources."has-flag-2.0.0" + sources."has-flag-3.0.0" sources."http-errors-1.6.2" sources."iconv-lite-0.4.19" sources."inherits-2.0.3" @@ -41195,10 +41140,10 @@ in sources."jsonfile-4.0.0" sources."kind-of-3.2.2" sources."lazy-cache-1.0.4" - sources."lodash-4.17.5" + sources."leven-2.1.0" sources."longest-1.0.1" sources."lru-cache-4.1.2" - sources."micro-9.1.0" + sources."micro-9.1.4" sources."micro-compress-1.0.0" sources."mime-1.4.1" sources."mime-db-1.33.0" @@ -41207,23 +41152,22 @@ in sources."mri-1.1.0" sources."ms-2.0.0" sources."negotiator-0.6.1" - sources."node-version-1.1.0" + sources."node-version-1.1.3" sources."npm-run-path-2.0.2" sources."on-finished-2.3.0" sources."on-headers-1.0.1" sources."openssl-self-signed-certificate-1.1.6" - sources."opn-5.2.0" + sources."opn-5.3.0" sources."optimist-0.6.1" sources."p-finally-1.0.0" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" sources."path-type-3.0.0" sources."pify-3.0.0" - sources."pkginfo-0.4.1" sources."pseudomap-1.0.2" sources."range-parser-1.2.0" sources."raw-body-2.3.2" - sources."rc-1.2.6" + sources."rc-1.2.7" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."repeat-string-1.6.1" @@ -41241,12 +41185,11 @@ in sources."signal-exit-3.0.2" sources."source-map-0.4.4" sources."statuses-1.5.0" - sources."string-similarity-1.2.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."supports-color-4.5.0" + sources."supports-color-5.4.0" sources."term-size-1.2.0" (sources."uglify-js-2.8.29" // { dependencies = [ @@ -41256,7 +41199,7 @@ in sources."uglify-to-browserify-1.0.2" sources."universalify-0.1.1" sources."unpipe-1.0.0" - (sources."update-check-1.2.0" // { + (sources."update-check-1.3.2" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -41544,7 +41487,7 @@ in }) sources."bytes-1.0.0" sources."caseless-0.12.0" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."co-4.6.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" @@ -41660,7 +41603,7 @@ in sources."minimatch-1.0.0" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.22.0" + sources."moment-2.22.1" sources."ms-2.0.0" sources."mv-2.1.1" sources."nan-2.10.0" @@ -41676,7 +41619,7 @@ in sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" sources."performance-now-2.1.0" - sources."postcss-6.0.21" + sources."postcss-6.0.22" sources."process-nextick-args-2.0.0" sources."proxy-addr-1.1.5" sources."punycode-1.4.1" @@ -41697,7 +41640,7 @@ in }) (sources."request-2.85.0" // { dependencies = [ - sources."qs-6.5.1" + sources."qs-6.5.2" ]; }) sources."rimraf-2.4.5" @@ -41724,7 +41667,7 @@ in sources."statuses-1.3.1" sources."string_decoder-1.1.1" sources."stringstream-0.0.5" - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" sources."through-2.3.8" sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" @@ -41775,12 +41718,12 @@ in sources."graceful-readlink-1.0.1" sources."inherits-2.0.3" sources."isarray-1.0.0" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."minimatch-3.0.4" sources."process-nextick-args-2.0.0" sources."readable-stream-2.3.6" sources."readdirp-2.1.0" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."set-immediate-shim-1.0.1" sources."string_decoder-1.1.1" sources."util-deprecate-1.0.2" @@ -41863,7 +41806,7 @@ in ]; }) sources."rimraf-2.4.5" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safe-json-stringify-1.1.0" sources."semver-4.3.6" (sources."smartdc-auth-2.3.1" // { @@ -41968,7 +41911,7 @@ in sources."object-component-0.0.3" sources."parseqs-0.0.5" sources."parseuri-0.0.5" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."socket.io-adapter-1.1.1" sources."socket.io-client-2.1.0" sources."socket.io-parser-3.2.0" @@ -42151,7 +42094,7 @@ in sources."is-regex-1.0.4" sources."is-symbol-1.0.1" sources."js-yaml-3.10.0" - sources."mdn-data-1.1.0" + sources."mdn-data-1.1.2" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."nth-check-1.0.1" @@ -42162,7 +42105,7 @@ in sources."sax-1.2.4" sources."source-map-0.5.7" sources."sprintf-js-1.0.3" - sources."stable-0.1.6" + sources."stable-0.1.8" sources."unquote-1.1.1" sources."util.promisify-1.0.0" ]; @@ -42206,7 +42149,7 @@ in sources."prr-1.0.1" sources."readable-stream-2.3.6" sources."resolve-from-2.0.0" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" sources."tapable-0.2.8" sources."util-deprecate-1.0.2" @@ -42305,7 +42248,7 @@ in sources."keypress-0.2.1" sources."kind-of-3.2.2" sources."lazy-cache-1.0.4" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."longest-1.0.1" sources."longjohn-0.2.11" sources."mime-db-1.33.0" @@ -42341,7 +42284,7 @@ in }) sources."right-align-0.1.3" sources."rimraf-2.2.8" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."semver-5.3.0" sources."sntp-1.0.9" sources."source-map-0.1.32" @@ -42388,10 +42331,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "2.8.1"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.8.1.tgz"; - sha512 = "1v0ac83sjf21wg11fpllicxz8irx9yg341zmng7vz15524gbfphc9ch70n4x9r70gm0r4ak79xyaxw9zh6b2cwcs7mg447qvzlxz3q2"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.8.3.tgz"; + sha512 = "2vwhgmdrdw42wwaqbmrnz7zy197hrxl6smkmhrb3n93vsjmqg24a4r10czdralib6qpj82bx2gw97r3gxlspj7y54jswigs2vj3bf1b"; }; buildInputs = globalBuildInputs; meta = { @@ -42451,7 +42394,7 @@ in sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" sources."debug-2.6.9" - sources."deep-extend-0.4.2" + sources."deep-extend-0.5.1" sources."defaults-1.0.3" sources."delayed-stream-1.0.0" sources."detect-indent-5.0.0" @@ -42505,7 +42448,7 @@ in sources."jspm-config-0.3.4" sources."latest-version-3.1.0" sources."listify-1.0.0" - sources."lockfile-1.0.3" + sources."lockfile-1.0.4" sources."log-update-1.0.2" sources."loose-envify-1.3.1" sources."lowercase-keys-1.0.1" @@ -42541,7 +42484,7 @@ in sources."promise-finally-3.0.0" sources."pseudomap-1.0.2" sources."punycode-1.4.1" - (sources."rc-1.2.6" // { + (sources."rc-1.2.7" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -42551,7 +42494,7 @@ in sources."registry-url-3.1.0" sources."restore-cursor-1.0.1" sources."rimraf-2.6.2" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."semver-5.0.3" sources."semver-diff-2.1.0" sources."shebang-command-1.2.0" @@ -42574,7 +42517,7 @@ in sources."touch-1.0.0" sources."tough-cookie-2.3.4" sources."typedarray-0.0.6" - sources."typescript-2.8.1" + sources."typescript-2.8.3" (sources."typings-core-2.3.3" // { dependencies = [ sources."minimist-0.0.8" @@ -42583,12 +42526,12 @@ in sources."unc-path-regex-0.1.2" sources."unique-string-1.0.0" sources."unzip-response-2.0.1" - (sources."update-notifier-2.4.0" // { + (sources."update-notifier-2.5.0" // { dependencies = [ sources."ansi-styles-3.2.1" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."semver-5.5.0" - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" ]; }) sources."url-parse-lax-1.0.0" @@ -42616,10 +42559,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.3.20"; + version = "3.3.23"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.20.tgz"; - sha512 = "3x6k1plb2hrmm51fn2w7nmi9pixipwj224a4afly17p2mwk75qhycib3zlaj9m0bk43ydfh0h2gv01l1xfhabvjcv36pc7x4xcf94js"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.23.tgz"; + sha512 = "2zylyzplicczqknizbm1mp7grxz6bi6vg03rsld8l18b2rahl9y7b1rj2c3sp75afmmyqlgg57v8c0b1adyqm7arzw8kcc3n6l8mkra"; }; dependencies = [ sources."commander-2.15.1" @@ -42637,10 +42580,10 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.4.18"; + version = "1.4.22"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.4.18.tgz"; - sha512 = "3mdb4qpdmm6n3c34z8pkrn3yx2nxyvqszw3rb24lcf8mbpbx2d534bpb3mcg2lg4lxsysijp652pkwbxd492sm7z9bz296r8cgppmqm"; + url = "https://registry.npmjs.org/ungit/-/ungit-1.4.22.tgz"; + sha512 = "22lf4pk1mn1vn8rgakj6z2dllv4xr7nybymkgrpvkfkglrlh6s9ch5cbbqsdy7mgrhgkmqwrygyb5xypwil4rrfw4a2x1q15jpg229w"; }; dependencies = [ sources."abbrev-1.1.1" @@ -42654,7 +42597,7 @@ in sources."arraybuffer.slice-0.0.7" sources."asn1-0.2.3" sources."assert-plus-1.0.0" - sources."async-2.6.0" + sources."async-0.9.2" sources."async-limiter-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" @@ -42683,7 +42626,7 @@ in sources."camelcase-4.1.0" sources."caseless-0.12.0" sources."charenc-0.0.2" - (sources."cliui-4.0.0" // { + (sources."cliui-4.1.0" // { dependencies = [ sources."ansi-regex-2.1.1" ]; @@ -42723,7 +42666,7 @@ in sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decamelize-1.2.0" - sources."deep-extend-0.4.2" + sources."deep-extend-0.5.1" sources."delayed-stream-0.0.5" sources."delegates-1.0.0" sources."depd-1.1.2" @@ -42734,6 +42677,7 @@ in sources."mkdirp-0.3.0" ]; }) + sources."dnd-page-scroll-0.0.4" sources."eachr-3.2.0" sources."ecc-jsbn-0.1.1" sources."editions-1.3.4" @@ -42786,7 +42730,7 @@ in sources."http-errors-1.6.3" sources."http-signature-1.2.0" sources."iconv-lite-0.4.19" - sources."ignore-3.3.7" + sources."ignore-3.3.8" sources."indexof-0.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -42802,6 +42746,8 @@ in sources."isarray-0.0.1" sources."isexe-2.0.0" sources."isstream-0.1.2" + sources."jquery-3.3.1" + sources."jquery-ui-1.12.1" sources."jsbn-0.1.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.3.1" @@ -42810,17 +42756,17 @@ in sources."just-detect-adblock-1.0.0" (sources."keen.io-0.1.3" // { dependencies = [ - sources."async-0.9.2" sources."methods-1.0.1" sources."mime-1.2.11" sources."qs-1.2.0" sources."superagent-0.21.0" ]; }) - sources."knockout-3.5.0-beta" + sources."knockout-3.5.0-rc" sources."lcid-1.0.0" sources."locate-path-2.0.0" - sources."lodash-4.17.5" + sources."locks-0.2.2" + sources."lodash-4.17.10" sources."lru-cache-4.1.2" sources."md5-2.2.1" sources."media-typer-0.3.0" @@ -42839,14 +42785,14 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.22.0" + sources."moment-2.22.1" sources."ms-2.0.0" sources."negotiator-0.6.1" sources."node-cache-4.2.0" sources."nopt-1.0.10" sources."normalize-package-data-2.4.0" - sources."npm-6.0.0-next.0" - sources."npm-package-arg-6.0.0" + sources."npm-6.0.0" + sources."npm-package-arg-6.1.0" (sources."npm-registry-client-8.5.1" // { dependencies = [ sources."combined-stream-1.0.6" @@ -42908,7 +42854,7 @@ in sources."http-errors-1.6.2" ]; }) - (sources."rc-1.2.6" // { + (sources."rc-1.2.7" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -42958,7 +42904,7 @@ in sources."strip-ansi-3.0.1" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - (sources."superagent-3.8.2" // { + (sources."superagent-3.8.3" // { dependencies = [ sources."combined-stream-1.0.6" sources."component-emitter-1.2.1" @@ -43001,7 +42947,7 @@ in sources."which-1.3.0" sources."which-module-2.0.0" sources."wide-align-1.1.2" - (sources."winston-2.4.1" // { + (sources."winston-2.4.2" // { dependencies = [ sources."async-1.0.0" ]; @@ -43074,7 +43020,10 @@ in sources."boom-4.3.1" sources."brace-expansion-1.1.11" sources."buffer-3.6.0" + sources."buffer-alloc-1.1.0" + sources."buffer-alloc-unsafe-0.1.1" sources."buffer-crc32-0.2.13" + sources."buffer-fill-0.1.1" sources."builtins-1.0.3" sources."camelcase-1.2.1" sources."capture-stack-trace-1.0.0" @@ -43085,7 +43034,7 @@ in ]; }) sources."center-align-0.1.3" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."chardet-0.4.2" sources."cli-cursor-2.1.0" sources."cli-spinners-1.3.1" @@ -43154,6 +43103,7 @@ in sources."filenamify-2.0.0" sources."forever-agent-0.6.1" sources."form-data-2.3.2" + sources."fs-constants-1.0.0" sources."fs-extra-0.26.7" sources."fs.realpath-1.0.0" sources."get-proxy-2.1.0" @@ -43181,7 +43131,7 @@ in sources."hawk-6.0.2" sources."hoek-4.2.1" sources."http-signature-1.2.0" - sources."iconv-lite-0.4.21" + sources."iconv-lite-0.4.22" sources."ieee754-1.1.11" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -43212,7 +43162,7 @@ in sources."kind-of-3.2.2" sources."klaw-1.3.1" sources."lazy-cache-1.0.4" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."log-symbols-2.2.0" sources."longest-1.0.1" sources."lowercase-keys-1.0.1" @@ -43257,7 +43207,7 @@ in sources."process-nextick-args-2.0.0" sources."proto-list-1.2.4" sources."punycode-1.4.1" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."read-metadata-1.0.0" sources."readable-stream-2.3.6" sources."recursive-readdir-2.2.2" @@ -43273,7 +43223,7 @@ in sources."run-async-2.3.0" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."seek-bzip-1.0.5" sources."semver-5.5.0" @@ -43289,14 +43239,15 @@ in sources."strip-ansi-4.0.0" sources."strip-dirs-2.1.0" sources."strip-outer-1.0.1" - sources."supports-color-5.3.0" - sources."tar-stream-1.5.5" + sources."supports-color-5.4.0" + sources."tar-stream-1.6.0" sources."through-2.3.8" sources."thunkify-2.1.2" sources."thunkify-wrap-1.0.4" sources."tildify-1.2.0" sources."timed-out-4.0.1" sources."tmp-0.0.33" + sources."to-buffer-1.1.1" sources."toml-2.3.3" sources."tough-cookie-2.3.4" sources."trim-repeated-1.0.0" @@ -43349,7 +43300,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."adm-zip-0.4.7" + sources."adm-zip-0.4.9" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."asn1-0.2.3" @@ -43422,7 +43373,7 @@ in }) sources."kew-0.1.7" sources."klaw-1.3.1" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."mime-db-1.33.0" sources."mime-types-2.1.18" sources."minimatch-3.0.4" @@ -43470,7 +43421,7 @@ in sources."tunnel-agent-0.4.3" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" - sources."underscore-1.8.3" + sources."underscore-1.9.0" sources."util-deprecate-1.0.2" sources."verror-1.10.0" sources."which-1.2.14" @@ -43490,16 +43441,16 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.5.0"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.5.0.tgz"; - sha512 = "3m4zqjmw0byxpxxx35zfrpng2sawkk71mna6b7b5vx1ba534kvsrs3i6332vz7m0dskp9k8ywqv545kg8x7xnv8xvl6x709yjrdjsp8"; + url = "https://registry.npmjs.org/webpack/-/webpack-4.7.0.tgz"; + sha512 = "3qmpyw1gbcmwgc42iss0vqam6vgi5kqvzv5s4xba1ww50824vq5yb3p7zbh0is33q76axrkhj4d7p1cigp5w0jnhhd2v3v6ky580wrr"; }; dependencies = [ sources."acorn-5.5.3" sources."acorn-dynamic-import-3.0.0" sources."ajv-6.4.0" - sources."ajv-keywords-3.1.0" + sources."ajv-keywords-3.2.0" sources."anymatch-2.0.0" sources."aproba-1.2.0" sources."arr-diff-4.0.0" @@ -43510,7 +43461,7 @@ in sources."assert-1.4.1" sources."assign-symbols-1.0.0" sources."async-each-1.0.1" - sources."atob-2.1.0" + sources."atob-2.1.1" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -43523,7 +43474,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."base64-js-1.2.3" + sources."base64-js-1.3.0" sources."big.js-3.2.0" sources."binary-extensions-1.11.0" sources."bluebird-3.5.1" @@ -43538,8 +43489,8 @@ in }) sources."brorand-1.1.0" sources."browserify-aes-1.2.0" - sources."browserify-cipher-1.0.0" - sources."browserify-des-1.0.0" + sources."browserify-cipher-1.0.1" + sources."browserify-des-1.0.1" sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" @@ -43551,7 +43502,7 @@ in sources."cache-base-1.0.1" sources."chokidar-2.0.3" sources."chownr-1.0.1" - sources."chrome-trace-event-0.1.2" + sources."chrome-trace-event-0.1.3" sources."cipher-base-1.0.4" (sources."class-utils-0.3.6" // { dependencies = [ @@ -43569,9 +43520,9 @@ in sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" - sources."create-ecdh-4.0.0" - sources."create-hash-1.1.3" - sources."create-hmac-1.1.6" + sources."create-ecdh-4.0.1" + sources."create-hash-1.2.0" + sources."create-hmac-1.1.7" sources."crypto-browserify-3.12.0" sources."cyclist-0.2.2" sources."date-now-0.1.4" @@ -43579,9 +43530,9 @@ in sources."decode-uri-component-0.2.0" sources."define-property-2.0.2" sources."des.js-1.0.0" - sources."diffie-hellman-5.0.2" + sources."diffie-hellman-5.0.3" sources."domain-browser-1.2.0" - sources."duplexify-3.5.4" + sources."duplexify-3.6.0" sources."elliptic-6.4.0" sources."emojis-list-2.1.0" sources."end-of-stream-1.4.1" @@ -43617,7 +43568,7 @@ in sources."from2-2.3.0" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-1.1.3" + sources."fsevents-1.2.3" sources."get-value-2.0.6" sources."glob-7.1.2" (sources."glob-parent-3.1.0" // { @@ -43683,7 +43634,7 @@ in ]; }) sources."miller-rabin-4.0.1" - sources."minimalistic-assert-1.0.0" + sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -43694,10 +43645,9 @@ in sources."ms-2.0.0" sources."nan-2.10.0" sources."nanomatch-1.2.9" - sources."neo-async-2.5.0" + sources."neo-async-2.5.1" (sources."node-libs-browser-2.1.0" // { dependencies = [ - sources."hash-base-2.0.2" sources."inherits-2.0.1" sources."punycode-1.4.1" ]; @@ -43713,13 +43663,13 @@ in sources."p-try-1.0.0" sources."pako-1.0.6" sources."parallel-transform-1.1.0" - sources."parse-asn1-5.1.0" + sources."parse-asn1-5.1.1" sources."pascalcase-0.1.1" sources."path-browserify-0.0.0" sources."path-dirname-1.0.2" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" - sources."pbkdf2-3.0.14" + sources."pbkdf2-3.0.16" sources."pify-3.0.0" sources."pkg-dir-2.0.0" sources."posix-character-classes-0.1.1" @@ -43728,9 +43678,9 @@ in sources."promise-inflight-1.0.1" sources."prr-1.0.1" sources."pseudomap-1.0.2" - sources."public-encrypt-4.0.0" + sources."public-encrypt-4.0.2" sources."pump-2.0.1" - sources."pumpify-1.4.0" + sources."pumpify-1.5.0" sources."punycode-2.1.0" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" @@ -43745,12 +43695,12 @@ in sources."resolve-url-0.2.1" sources."ret-0.1.15" sources."rimraf-2.6.2" - sources."ripemd160-2.0.1" + sources."ripemd160-2.0.2" sources."run-queue-1.0.3" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."schema-utils-0.4.5" - sources."serialize-javascript-1.4.0" + sources."serialize-javascript-1.5.0" sources."set-immediate-shim-1.0.1" sources."set-value-2.0.0" sources."setimmediate-1.0.5" @@ -43814,7 +43764,7 @@ in sources."string_decoder-1.1.1" sources."tapable-1.0.0" sources."through2-2.0.3" - sources."timers-browserify-2.0.6" + sources."timers-browserify-2.0.10" sources."to-arraybuffer-1.0.1" sources."to-object-path-0.3.0" sources."to-regex-3.0.2" @@ -43822,7 +43772,7 @@ in sources."tty-browserify-0.0.0" sources."typedarray-0.0.6" sources."uglify-es-3.3.10" - (sources."uglifyjs-webpack-plugin-1.2.4" // { + (sources."uglifyjs-webpack-plugin-1.2.5" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -43843,7 +43793,7 @@ in }) ]; }) - sources."upath-1.0.4" + sources."upath-1.0.5" sources."uri-js-3.0.2" sources."urix-0.1.0" (sources."url-0.11.0" // { @@ -43859,7 +43809,7 @@ in sources."util-0.10.3" sources."util-deprecate-1.0.2" sources."vm-browserify-0.0.4" - sources."watchpack-1.5.0" + sources."watchpack-1.6.0" (sources."webpack-sources-1.1.0" // { dependencies = [ sources."source-map-0.6.1" @@ -43883,10 +43833,10 @@ in webtorrent-cli = nodeEnv.buildNodePackage { name = "webtorrent-cli"; packageName = "webtorrent-cli"; - version = "1.11.0"; + version = "1.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-1.11.0.tgz"; - sha512 = "04agjsk7s1fdmiy195shkjqxswpkadyg08vgj4pqxpwy6d5d4kbngz3gmg9vvnm2z9hi2sdc6ryx0r59nws7xjkifi3grzfkxzz1c06"; + url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-1.12.1.tgz"; + sha512 = "2hnm4r244as9zcld8hf884vwp4iwqvrnjc01c5037bpwa0zzc8y5zss9xc75ffbhw8dp54kbfzvlfwfn6q49hymbnsfj44ckqfalavr"; }; dependencies = [ sources."addr-to-ip-port-1.4.3" @@ -43906,10 +43856,10 @@ in sources."binary-search-1.3.3" sources."bindings-1.3.0" sources."bitfield-2.0.0" - sources."bittorrent-dht-8.2.0" + sources."bittorrent-dht-8.3.0" sources."bittorrent-peerid-1.2.0" - sources."bittorrent-protocol-2.4.0" - sources."bittorrent-tracker-9.7.0" + sources."bittorrent-protocol-2.4.1" + sources."bittorrent-tracker-9.9.1" sources."bl-1.2.2" sources."blob-to-buffer-1.2.7" sources."block-stream2-1.1.0" @@ -43922,13 +43872,21 @@ in sources."buffer-fill-0.1.1" sources."buffer-from-1.0.0" sources."buffer-indexof-1.1.1" - sources."bufferutil-3.0.4" + (sources."bufferutil-3.0.5" // { + dependencies = [ + sources."simple-get-2.8.1" + ]; + }) sources."bufferview-1.0.1" sources."bytebuffer-3.5.5" sources."castv2-0.1.9" sources."castv2-client-1.2.0" sources."chownr-1.0.1" - sources."chromecasts-1.9.1" + (sources."chromecasts-1.9.1" // { + dependencies = [ + sources."mime-1.6.0" + ]; + }) sources."chunk-store-stream-2.1.0" sources."clivas-0.2.0" sources."closest-to-2.0.0" @@ -43939,17 +43897,25 @@ in sources."concat-stream-1.6.2" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" - sources."create-torrent-3.30.0" + sources."create-torrent-3.31.0" sources."debug-2.6.9" sources."decompress-response-3.3.0" - sources."deep-extend-0.4.2" + sources."deep-extend-0.5.1" sources."defined-1.0.0" sources."delegates-1.0.0" sources."detect-libc-1.0.3" - sources."dlnacasts-0.1.0" + (sources."dlnacasts-0.1.0" // { + dependencies = [ + sources."mime-1.6.0" + ]; + }) sources."dns-packet-1.3.1" sources."dns-txt-2.0.2" - sources."ecstatic-3.2.0" + (sources."ecstatic-3.2.0" // { + dependencies = [ + sources."mime-1.6.0" + ]; + }) sources."elementtree-0.1.7" sources."end-of-stream-1.4.1" sources."executable-4.1.1" @@ -43957,10 +43923,11 @@ in sources."filestream-4.1.3" sources."flatten-1.0.2" sources."fs-chunk-store-1.7.0" + sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" sources."get-browser-rtc-1.0.2" - sources."get-stdin-5.0.1" + sources."get-stdin-6.0.0" sources."github-from-package-0.0.0" sources."glob-7.1.2" sources."has-unicode-2.0.1" @@ -43979,24 +43946,28 @@ in sources."isarray-1.0.0" sources."junk-2.1.0" sources."k-bucket-4.0.0" - sources."k-rpc-4.3.1" + sources."k-rpc-5.0.0" sources."k-rpc-socket-1.8.0" sources."last-one-wins-1.0.4" - sources."load-ip-set-1.3.1" + (sources."load-ip-set-1.3.1" // { + dependencies = [ + sources."simple-get-2.8.1" + ]; + }) sources."long-2.4.0" sources."lru-3.1.0" sources."magnet-uri-5.1.7" sources."mdns-js-0.5.0" sources."mdns-js-packet-0.2.0" - sources."mediasource-2.1.3" + sources."mediasource-2.2.0" sources."memory-chunk-store-1.3.0" - sources."mime-1.6.0" + sources."mime-2.3.1" sources."mimic-response-1.0.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."mkdirp-0.5.1" - sources."moment-2.22.0" - sources."mp4-box-encoding-1.1.3" + sources."moment-2.22.1" + sources."mp4-box-encoding-1.1.4" sources."mp4-stream-2.0.3" sources."ms-2.0.0" (sources."multicast-dns-6.2.3" // { @@ -44009,7 +43980,7 @@ in sources."netmask-1.0.6" sources."network-address-1.1.2" sources."next-event-1.0.0" - sources."node-abi-2.3.0" + sources."node-abi-2.4.1" sources."node-ssdp-2.9.1" sources."nodebmc-0.0.7" sources."noop-logger-0.1.1" @@ -44021,45 +43992,48 @@ in sources."optjs-3.2.2" sources."os-homedir-1.0.2" sources."package-json-versionify-1.0.4" - sources."parse-torrent-5.8.3" - sources."parse-torrent-file-4.1.0" + (sources."parse-torrent-6.0.0" // { + dependencies = [ + sources."simple-get-3.0.2" + ]; + }) sources."path-is-absolute-1.0.1" sources."piece-length-1.0.0" sources."pify-2.3.0" sources."plist-with-patches-0.5.1" - sources."prebuild-install-2.5.1" + sources."prebuild-install-4.0.0" sources."prettier-bytes-1.0.4" sources."process-nextick-args-2.0.0" sources."protobufjs-3.8.2" sources."pump-3.0.0" sources."qap-3.3.1" sources."random-access-file-2.0.1" - sources."random-access-storage-1.1.1" + sources."random-access-storage-1.2.0" sources."random-iterate-1.0.1" sources."randombytes-2.0.6" sources."range-parser-1.2.0" sources."range-slice-stream-1.2.0" - sources."rc-1.2.6" + sources."rc-1.2.7" sources."readable-stream-2.3.6" - sources."record-cache-1.0.1" - (sources."render-media-2.12.0" // { + sources."record-cache-1.0.2" + (sources."render-media-3.0.0" // { dependencies = [ sources."pump-1.0.3" ]; }) sources."rimraf-2.6.2" - sources."run-parallel-1.1.8" - sources."run-parallel-limit-1.0.4" - sources."run-series-1.1.6" + sources."run-parallel-1.1.9" + sources."run-parallel-limit-1.0.5" + sources."run-series-1.1.8" sources."rusha-0.8.13" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."sax-1.1.4" sources."semver-5.5.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" sources."simple-concat-1.0.0" - sources."simple-get-2.7.0" - sources."simple-peer-9.0.0" + sources."simple-get-2.8.1" + sources."simple-peer-9.1.1" sources."simple-sha1-2.1.0" (sources."simple-websocket-7.0.2" // { dependencies = [ @@ -44072,21 +44046,22 @@ in sources."stream-to-blob-url-2.1.0" sources."stream-with-known-length-to-buffer-1.0.1" sources."string-width-1.0.2" - sources."string2compact-1.2.2" + sources."string2compact-1.2.3" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - (sources."tar-fs-1.16.0" // { + (sources."tar-fs-1.16.2" // { dependencies = [ sources."pump-1.0.3" ]; }) - sources."tar-stream-1.5.5" + sources."tar-stream-1.6.0" sources."thirty-two-1.0.2" sources."through-2.3.8" sources."thunky-0.1.0" sources."to-arraybuffer-1.0.1" - (sources."torrent-discovery-8.4.0" // { + sources."to-buffer-1.1.1" + (sources."torrent-discovery-8.4.1" // { dependencies = [ sources."minimist-1.2.0" sources."pump-2.0.1" @@ -44102,16 +44077,16 @@ 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.0" + sources."ut_metadata-3.2.1" sources."ut_pex-1.2.0" sources."util-deprecate-1.0.2" sources."videostream-2.4.2" sources."vlc-command-1.1.1" - (sources."webtorrent-0.98.24" // { + (sources."webtorrent-0.99.4" // { dependencies = [ sources."debug-3.1.0" - sources."mime-2.2.2" sources."minimist-0.0.8" + sources."simple-get-3.0.2" sources."thunky-1.0.2" ]; }) @@ -44146,7 +44121,7 @@ in dependencies = [ sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" - sources."@types/node-9.6.2" + sources."@types/node-10.0.4" sources."JSONSelect-0.2.1" sources."abbrev-1.1.1" sources."acorn-5.5.3" @@ -44165,32 +44140,26 @@ in sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."async-2.6.0" - sources."camelcase-1.2.1" + sources."camelcase-2.1.1" sources."cli-cursor-1.0.2" - sources."cliui-3.2.0" + sources."cliui-4.1.0" sources."debug-3.1.0" sources."decamelize-1.2.0" sources."domelementtype-1.1.3" - sources."es6-promise-3.3.1" + sources."es6-promise-4.2.4" sources."figures-1.7.0" - sources."find-up-2.1.0" sources."for-in-0.1.8" - sources."globals-11.4.0" - sources."got-3.3.1" + sources."globals-11.5.0" + sources."iconv-lite-0.4.19" sources."inquirer-0.12.0" sources."is-fullwidth-code-point-1.0.0" - sources."latest-version-1.0.1" - sources."lazy-cache-0.2.7" + sources."isarray-0.0.1" sources."mute-stream-0.0.5" - sources."object-assign-3.0.0" sources."onetime-1.1.0" - sources."package-json-1.2.0" - sources."parse-json-2.2.0" - sources."path-exists-3.0.0" + sources."pify-3.0.0" sources."pluralize-1.2.1" sources."progress-1.1.8" - sources."punycode-1.3.2" - sources."repeating-1.1.3" + sources."punycode-2.1.0" sources."restore-cursor-1.0.1" sources."run-async-0.1.0" sources."rx-lite-3.1.2" @@ -44198,33 +44167,26 @@ in sources."source-map-0.6.1" sources."source-map-support-0.5.4" sources."string-width-1.0.2" + sources."string_decoder-0.10.31" sources."strip-ansi-4.0.0" - sources."strip-bom-2.0.0" - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" sources."table-3.8.3" - sources."timed-out-2.0.0" sources."traverse-0.6.6" sources."underscore-1.6.0" - sources."update-notifier-0.5.0" - sources."which-module-2.0.0" - sources."window-size-0.2.0" - sources."wordwrap-0.0.2" (sources."yargs-11.0.0" // { dependencies = [ sources."camelcase-4.1.0" - sources."cliui-4.0.0" sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" ]; }) - sources."yargs-parser-9.0.2" ]; }) - sources."adm-zip-0.4.7" + sources."adm-zip-0.4.9" + sources."agent-base-4.2.0" sources."ajv-6.3.0" sources."ajv-keywords-2.1.1" sources."ajv-merge-patch-3.0.0" - sources."align-text-0.1.4" sources."anchor-markdown-header-0.5.7" sources."ansi-align-2.0.0" sources."ansi-escapes-3.1.0" @@ -44267,14 +44229,15 @@ in sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" + sources."ast-types-0.11.3" sources."async-0.2.10" sources."async-each-1.0.1" sources."asynckit-0.4.0" - sources."atob-2.1.0" + sources."atob-2.1.1" sources."aws-sign2-0.7.0" sources."aws4-1.7.0" sources."babel-code-frame-6.26.0" - sources."babel-core-6.26.0" + sources."babel-core-6.26.3" sources."babel-generator-6.26.1" sources."babel-helpers-6.24.1" sources."babel-messages-6.23.0" @@ -44294,7 +44257,7 @@ in sources."babel-traverse-6.26.0" sources."babel-types-6.26.0" sources."babylon-6.18.0" - sources."bail-1.0.2" + sources."bail-1.0.3" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -44316,11 +44279,14 @@ in sources."boom-4.3.1" sources."bops-0.1.1" sources."boundary-1.0.1" - sources."boxen-0.3.1" + sources."boxen-1.3.0" sources."brace-expansion-1.1.11" sources."braces-2.3.2" + sources."buffer-alloc-1.1.0" + sources."buffer-alloc-unsafe-0.1.1" sources."buffer-crc32-0.2.13" sources."buffer-equal-constant-time-1.0.1" + sources."buffer-fill-0.1.1" sources."buffer-from-1.0.0" sources."builtin-modules-1.1.1" (sources."bunyan-1.8.12" // { @@ -44329,19 +44295,19 @@ in sources."rimraf-2.4.5" ]; }) + sources."bytes-3.0.0" sources."cache-base-1.0.1" sources."caller-path-0.1.0" sources."callsites-0.2.0" sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.0" sources."caseless-0.12.0" - sources."ccount-1.0.2" - sources."center-align-0.1.3" + sources."ccount-1.0.3" sources."chalk-2.3.2" - sources."character-entities-1.2.1" - sources."character-entities-html4-1.1.1" - sources."character-entities-legacy-1.1.1" - sources."character-reference-invalid-1.1.1" + sources."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."chardet-0.4.2" (sources."cheerio-1.0.0-rc.2" // { dependencies = [ @@ -44366,13 +44332,12 @@ in sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" - sources."clite-0.3.0" - sources."cliui-2.1.0" + sources."cliui-3.2.0" sources."clone-1.0.4" sources."clone-deep-0.3.0" sources."co-4.6.0" sources."code-point-at-1.1.0" - sources."collapse-white-space-1.0.3" + sources."collapse-white-space-1.0.4" sources."collection-visit-1.0.0" sources."color-convert-1.9.1" sources."color-name-1.1.3" @@ -44385,11 +44350,7 @@ in sources."compress-commons-1.2.2" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" - (sources."configstore-1.4.0" // { - dependencies = [ - sources."uuid-2.0.3" - ]; - }) + sources."configstore-3.1.2" sources."convert-source-map-1.5.1" sources."copy-descriptor-0.1.1" sources."core-js-2.5.5" @@ -44409,19 +44370,26 @@ in sources."css-what-2.1.0" sources."d-1.0.0" sources."dashdash-1.14.1" + sources."data-uri-to-buffer-1.2.0" sources."debounce-1.1.0" sources."debug-2.6.9" - sources."decamelize-2.0.0" + (sources."decamelize-2.0.0" // { + dependencies = [ + sources."xregexp-4.0.0" + ]; + }) sources."decode-uri-component-0.2.0" sources."deep-equal-1.0.1" - sources."deep-extend-0.4.2" + sources."deep-extend-0.5.1" sources."deep-is-0.1.3" sources."deepcopy-0.6.3" sources."deepmerge-2.1.0" sources."defaults-1.0.3" sources."define-property-2.0.2" + sources."degenerator-1.0.4" sources."del-2.2.2" sources."delayed-stream-1.0.0" + sources."depd-1.1.1" sources."detect-indent-4.0.0" (sources."dispensary-0.16.0" // { dependencies = [ @@ -44434,14 +44402,12 @@ in sources."domelementtype-1.3.0" sources."domhandler-2.4.1" sources."domutils-1.5.1" - sources."dot-prop-3.0.0" + sources."dot-prop-4.2.0" sources."dtrace-provider-0.8.6" - sources."duplexer2-0.1.4" sources."duplexer3-0.1.4" - sources."duplexify-3.5.4" sources."ecc-jsbn-0.1.1" sources."ecdsa-sig-formatter-1.0.9" - sources."email-validator-1.1.1" + sources."email-validator-2.0.3" sources."emoji-regex-6.1.3" sources."encoding-0.1.12" sources."end-of-stream-1.4.1" @@ -44461,6 +44427,7 @@ in sources."es6-symbol-3.1.1" sources."es6-weak-map-2.0.2" sources."escape-string-regexp-1.0.5" + sources."escodegen-1.9.1" sources."escope-3.6.0" (sources."eslint-4.19.0" // { dependencies = [ @@ -44526,9 +44493,9 @@ in sources."fd-slicer-1.0.1" sources."figures-2.0.0" sources."file-entry-cache-2.0.0" + sources."file-uri-to-path-1.0.0" sources."fill-range-4.0.0" - sources."filled-array-1.1.0" - sources."find-up-1.1.2" + sources."find-up-2.1.0" (sources."firefox-profile-1.1.0" // { dependencies = [ sources."async-2.5.0" @@ -44543,9 +44510,15 @@ in sources."forever-agent-0.6.1" sources."form-data-2.3.2" sources."fragment-cache-0.2.1" + sources."fs-constants-1.0.0" sources."fs-extra-4.0.3" sources."fs.realpath-1.0.0" - sources."fsevents-1.1.3" + sources."fsevents-1.2.3" + (sources."ftp-0.3.10" // { + dependencies = [ + sources."readable-stream-1.1.14" + ]; + }) sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" (sources."fx-runner-1.0.8" // { @@ -44560,6 +44533,11 @@ in sources."generate-object-property-1.2.0" sources."get-caller-file-1.0.2" sources."get-stream-3.0.0" + (sources."get-uri-2.0.1" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) sources."get-value-2.0.6" sources."getpass-0.1.7" sources."gettext-parser-1.1.0" @@ -44577,7 +44555,7 @@ in sources."global-dirs-0.1.1" sources."globals-9.18.0" sources."globby-5.0.0" - sources."got-5.7.1" + sources."got-6.7.1" sources."graceful-fs-4.1.11" sources."graceful-readlink-1.0.1" sources."graphlib-2.1.5" @@ -44596,12 +44574,14 @@ in sources."home-or-tmp-2.0.0" sources."hosted-git-info-2.6.0" sources."htmlparser2-3.9.2" + sources."http-errors-1.6.2" + sources."http-proxy-agent-2.1.0" sources."http-signature-1.2.0" - sources."iconv-lite-0.4.21" - sources."ignore-3.3.7" + sources."https-proxy-agent-2.2.1" + sources."iconv-lite-0.4.22" + sources."ignore-3.3.8" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" - sources."infinity-agent-2.0.3" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" @@ -44609,23 +44589,24 @@ in sources."interpret-1.1.0" sources."invariant-2.2.4" sources."invert-kv-1.0.0" + sources."ip-1.1.5" sources."is-absolute-0.1.7" sources."is-accessor-descriptor-1.0.0" - sources."is-alphabetical-1.0.1" - sources."is-alphanumerical-1.0.1" + sources."is-alphabetical-1.0.2" + sources."is-alphanumerical-1.0.2" sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" sources."is-builtin-module-1.0.0" sources."is-data-descriptor-1.0.0" - sources."is-decimal-1.0.1" + sources."is-decimal-1.0.2" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-finite-1.0.2" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.0" - sources."is-hexadecimal-1.0.1" + sources."is-hexadecimal-1.0.2" sources."is-installed-globally-0.1.0" sources."is-mergeable-object-1.1.0" sources."is-my-ip-valid-1.0.0" @@ -44648,6 +44629,7 @@ in sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."is-windows-1.0.2" + sources."is-wsl-1.1.0" sources."isarray-1.0.0" sources."isemail-1.2.0" sources."isexe-2.0.0" @@ -44678,26 +44660,27 @@ in sources."jwa-1.1.5" sources."jws-3.1.4" sources."kind-of-3.2.2" - sources."latest-version-2.0.0" - sources."lazy-cache-1.0.4" + sources."latest-version-3.1.0" + sources."lazy-cache-0.2.7" sources."lazystream-1.0.0" sources."lcid-1.0.0" sources."levn-0.3.0" sources."load-json-file-1.1.0" sources."locate-path-2.0.0" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."lodash.assign-4.2.0" + sources."lodash.assignin-4.2.0" sources."lodash.clonedeep-4.5.0" - sources."lodash.defaults-4.2.0" - sources."lodash.defaultsdeep-4.6.0" - sources."lodash.mergewith-4.6.1" + sources."lodash.flatten-4.4.0" + sources."lodash.get-4.4.2" sources."lodash.once-4.1.1" + sources."lodash.set-4.3.2" sources."lodash.sortby-4.7.0" - sources."longest-1.0.1" sources."longest-streak-1.0.0" sources."loose-envify-1.3.1" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.2" + sources."macos-release-1.1.0" sources."make-dir-1.2.0" sources."map-cache-0.2.2" sources."map-visit-1.0.0" @@ -44721,7 +44704,7 @@ in sources."minimist-0.0.8" ]; }) - sources."moment-2.22.0" + sources."moment-2.22.1" sources."ms-2.0.0" sources."mute-stream-0.0.7" sources."mv-2.1.1" @@ -44730,19 +44713,18 @@ in sources."nanomatch-1.2.9" sources."natural-compare-1.4.0" sources."natural-compare-lite-1.4.0" - sources."nconf-0.7.2" + sources."nconf-0.10.0" sources."ncp-2.0.0" - (sources."needle-2.2.0" // { + (sources."needle-2.2.1" // { dependencies = [ sources."debug-2.6.9" ]; }) - sources."neo-async-2.5.0" - sources."nested-error-stacks-1.0.2" + sources."neo-async-2.5.1" + sources."netmask-1.0.6" sources."next-tick-1.0.0" sources."node-forge-0.7.5" sources."node-notifier-5.2.1" - sources."node-status-codes-1.0.0" sources."nomnom-1.8.1" sources."normalize-package-data-2.4.0" sources."normalize-path-2.1.1" @@ -44757,26 +44739,27 @@ in sources."once-1.4.0" sources."onetime-2.0.1" sources."open-0.0.5" + sources."opn-5.3.0" sources."optionator-0.8.2" sources."os-homedir-1.0.2" sources."os-locale-2.1.0" - sources."os-name-1.0.3" + sources."os-name-2.0.1" sources."os-shim-0.1.3" sources."os-tmpdir-1.0.2" - sources."osenv-0.1.5" - sources."osx-release-1.1.0" sources."p-finally-1.0.0" sources."p-limit-1.2.0" sources."p-locate-2.0.0" sources."p-try-1.0.0" - sources."package-json-2.4.0" + sources."pac-proxy-agent-2.0.2" + sources."pac-resolver-3.0.0" + sources."package-json-4.0.1" sources."pako-1.0.6" - sources."parse-entities-1.1.1" + sources."parse-entities-1.1.2" sources."parse-json-4.0.0" sources."parse5-3.0.3" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" - sources."path-exists-2.1.0" + sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" @@ -44810,15 +44793,15 @@ in sources."process-nextick-args-2.0.0" sources."progress-2.0.0" sources."promise-7.3.1" + sources."proxy-agent-3.0.0" sources."proxy-from-env-1.0.0" sources."pseudomap-1.0.2" sources."pump-3.0.0" sources."punycode-1.4.1" - sources."qs-6.5.1" - sources."querystring-0.2.0" + sources."qs-6.5.2" sources."quick-format-unescaped-1.1.2" - sources."rc-1.2.6" - sources."read-all-stream-3.1.0" + sources."raw-body-2.3.2" + sources."rc-1.2.7" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" sources."readable-stream-2.3.6" @@ -44851,27 +44834,27 @@ in sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."require-uncached-1.0.3" - sources."resolve-1.7.0" + sources."resolve-1.7.1" sources."resolve-from-1.0.1" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" sources."ret-0.1.15" - sources."right-align-0.1.3" sources."rimraf-2.6.2" sources."run-async-2.3.0" - sources."rx-4.1.0" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safe-json-stringify-1.1.0" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" + sources."secure-keys-1.0.0" sources."semver-5.5.0" sources."semver-diff-2.1.0" sources."set-blocking-2.0.0" sources."set-immediate-shim-1.0.1" sources."set-value-2.0.0" + sources."setprototypeof-1.0.3" sources."sha.js-2.4.11" (sources."shallow-clone-0.1.2" // { dependencies = [ @@ -44911,7 +44894,7 @@ in sources."signal-exit-3.0.2" sources."slash-1.0.0" sources."slice-ansi-1.0.0" - sources."slide-1.1.6" + sources."smart-buffer-1.1.15" (sources."snapdragon-0.8.2" // { dependencies = [ (sources."define-property-0.2.5" // { @@ -44926,73 +44909,52 @@ in sources."snapdragon-node-2.1.1" sources."snapdragon-util-3.0.1" sources."sntp-2.1.0" - (sources."snyk-1.71.0" // { + (sources."snyk-1.78.1" // { dependencies = [ + sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" sources."async-1.5.2" - sources."camelcase-3.0.0" - sources."chalk-1.1.3" - sources."inquirer-1.0.3" - sources."mute-stream-0.0.6" + sources."chalk-2.4.1" + sources."cli-cursor-2.1.0" + sources."figures-2.0.0" + sources."inquirer-3.3.0" + sources."is-fullwidth-code-point-2.0.0" + sources."mute-stream-0.0.7" + sources."onetime-2.0.1" sources."os-locale-1.4.0" + sources."restore-cursor-2.0.0" sources."run-async-2.3.0" + sources."rx-lite-4.0.8" + sources."string-width-2.1.1" sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - sources."yargs-3.15.0" - ]; - }) - (sources."snyk-config-1.0.1" // { - dependencies = [ - sources."async-0.9.2" - sources."debug-2.6.9" + sources."yargs-3.32.0" ]; }) - sources."snyk-go-plugin-1.4.6" - sources."snyk-gradle-plugin-1.2.0" - (sources."snyk-module-1.8.1" // { + (sources."snyk-config-2.1.0" // { dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."snyk-mvn-plugin-1.1.1" - (sources."snyk-nuget-plugin-1.3.9" // { - dependencies = [ - sources."es6-promise-4.2.4" - ]; - }) - sources."snyk-php-plugin-1.3.2" - (sources."snyk-policy-1.10.2" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."snyk-python-plugin-1.5.7" - (sources."snyk-resolve-1.0.0" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - (sources."snyk-resolve-deps-1.7.0" // { - dependencies = [ - sources."configstore-2.1.0" - sources."debug-2.6.9" - sources."update-notifier-0.6.3" - sources."uuid-2.0.3" - sources."yargs-4.8.1" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" ]; }) - (sources."snyk-sbt-plugin-1.2.5" // { + sources."snyk-go-plugin-1.5.0" + sources."snyk-gradle-plugin-1.3.0" + sources."snyk-module-1.8.2" + sources."snyk-mvn-plugin-1.2.0" + sources."snyk-nuget-plugin-1.4.0" + sources."snyk-php-plugin-1.5.0" + sources."snyk-policy-1.12.0" + sources."snyk-python-plugin-1.6.0" + sources."snyk-resolve-1.0.1" + sources."snyk-resolve-deps-3.1.0" + (sources."snyk-sbt-plugin-1.3.0" // { dependencies = [ sources."debug-2.6.9" ]; }) sources."snyk-tree-1.0.0" - (sources."snyk-try-require-1.2.0" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) + sources."snyk-try-require-1.3.0" + sources."socks-1.1.10" + sources."socks-proxy-agent-3.0.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.1" (sources."source-map-support-0.5.3" // { @@ -45017,8 +44979,8 @@ in sources."sprintf-js-1.0.3" sources."sshpk-1.14.1" sources."static-extend-0.1.2" + sources."statuses-1.5.0" sources."stream-parser-0.3.1" - sources."stream-shift-1.0.0" sources."stream-to-array-2.3.0" (sources."stream-to-promise-2.2.0" // { dependencies = [ @@ -45026,10 +44988,9 @@ in sources."once-1.3.3" ]; }) - sources."string-length-1.0.1" sources."string-width-2.1.1" sources."string_decoder-1.1.1" - sources."stringify-entities-1.3.1" + sources."stringify-entities-1.3.2" sources."stringstream-0.0.5" sources."strip-ansi-3.0.1" sources."strip-bom-3.0.0" @@ -45040,12 +45001,9 @@ in sources."structured-source-3.0.2" sources."supports-color-2.0.0" sources."table-4.0.2" - sources."tar-stream-1.5.5" - (sources."tempfile-1.1.1" // { - dependencies = [ - sources."uuid-2.0.3" - ]; - }) + sources."tar-stream-1.6.0" + sources."temp-dir-1.0.0" + sources."tempfile-2.0.0" sources."term-size-1.2.0" sources."text-table-0.2.0" sources."then-fs-2.0.0" @@ -45053,8 +45011,10 @@ in sources."thenify-all-1.6.0" sources."through-2.3.8" sources."through2-2.0.3" - sources."timed-out-3.1.3" + sources."thunkify-2.1.2" + sources."timed-out-4.0.1" sources."tmp-0.0.33" + sources."to-buffer-1.1.1" sources."to-fast-properties-1.0.3" sources."to-object-path-0.3.0" sources."to-regex-3.0.2" @@ -45068,15 +45028,19 @@ in sources."traverse-0.4.6" sources."trim-0.0.1" sources."trim-right-1.0.1" - sources."trim-trailing-lines-1.1.0" - sources."trough-1.0.1" + sources."trim-trailing-lines-1.1.1" + sources."trough-1.0.2" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."typedarray-0.0.6" - sources."undefsafe-0.0.3" + (sources."undefsafe-2.0.2" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) sources."underscore-1.8.3" - sources."unherit-1.1.0" + sources."unherit-1.1.1" sources."unified-4.2.1" (sources."union-value-1.0.0" // { dependencies = [ @@ -45084,10 +45048,11 @@ in ]; }) sources."unique-string-1.0.0" - sources."unist-util-is-2.1.1" - sources."unist-util-remove-position-1.1.1" - sources."unist-util-visit-1.3.0" + sources."unist-util-is-2.1.2" + sources."unist-util-remove-position-1.1.2" + sources."unist-util-visit-1.3.1" sources."universalify-0.1.1" + sources."unpipe-1.0.0" (sources."unset-value-1.0.0" // { dependencies = [ (sources."has-value-0.3.1" // { @@ -45097,27 +45062,11 @@ in }) ]; }) - sources."unzip-response-1.0.2" + sources."unzip-response-2.0.1" sources."upath-1.0.4" - (sources."update-notifier-2.3.0" // { - dependencies = [ - sources."boxen-1.3.0" - sources."configstore-3.1.2" - sources."dot-prop-4.2.0" - sources."got-6.7.1" - sources."latest-version-3.1.0" - sources."package-json-4.0.1" - sources."pify-3.0.0" - sources."timed-out-4.0.1" - sources."unzip-response-2.0.1" - sources."widest-line-2.0.0" - sources."write-file-atomic-2.3.0" - sources."xdg-basedir-3.0.0" - ]; - }) + sources."update-notifier-2.3.0" sources."update-section-0.3.3" sources."urix-0.1.0" - sources."url-0.11.0" sources."url-parse-lax-1.0.0" (sources."use-3.1.0" // { dependencies = [ @@ -45130,7 +45079,7 @@ in sources."validate-npm-package-license-3.0.3" sources."verror-1.10.0" sources."vfile-1.4.0" - sources."vfile-location-2.0.2" + sources."vfile-location-2.0.3" (sources."watchpack-1.5.0" // { dependencies = [ sources."define-property-1.0.0" @@ -45158,15 +45107,11 @@ in }) sources."wcwidth-1.0.1" sources."webidl-conversions-4.0.2" - (sources."whatwg-url-6.3.0" // { - dependencies = [ - sources."punycode-2.1.0" - ]; - }) + sources."whatwg-url-6.3.0" sources."when-3.7.7" sources."which-1.3.0" - sources."which-module-1.0.0" - sources."widest-line-1.0.0" + sources."which-module-2.0.0" + sources."widest-line-2.0.0" sources."win-release-1.1.1" sources."window-size-0.1.4" sources."winreg-0.0.12" @@ -45174,27 +45119,31 @@ in sources."wrap-ansi-2.1.0" sources."wrappy-1.0.2" sources."write-0.2.1" - sources."write-file-atomic-1.3.4" - sources."xdg-basedir-2.0.0" + sources."write-file-atomic-2.3.0" + sources."xdg-basedir-3.0.0" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xmldom-0.1.27" - sources."xregexp-4.0.0" + sources."xregexp-2.0.0" sources."xtend-4.0.1" sources."y18n-3.2.1" sources."yallist-2.1.2" (sources."yargs-6.6.0" // { dependencies = [ sources."camelcase-3.0.0" - sources."cliui-3.2.0" sources."decamelize-1.2.0" + sources."find-up-1.1.2" sources."is-fullwidth-code-point-1.0.0" sources."os-locale-1.4.0" + sources."parse-json-2.2.0" + sources."path-exists-2.1.0" sources."string-width-1.0.2" + sources."strip-bom-2.0.0" + sources."which-module-1.0.0" sources."yargs-parser-4.2.1" ]; }) - sources."yargs-parser-2.4.1" + sources."yargs-parser-9.0.2" sources."yauzl-2.9.1" sources."zip-1.2.0" (sources."zip-dir-1.0.2" // { @@ -45233,10 +45182,10 @@ in yarn = nodeEnv.buildNodePackage { name = "yarn"; packageName = "yarn"; - version = "1.5.1"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-1.5.1.tgz"; - sha1 = "e8680360e832ac89521eb80dad3a7bc27a40bab4"; + url = "https://registry.npmjs.org/yarn/-/yarn-1.6.0.tgz"; + sha1 = "9cec6f7986dc237d39ec705ce74d95155fe55d4b"; }; buildInputs = globalBuildInputs; meta = { @@ -45250,10 +45199,10 @@ in yo = nodeEnv.buildNodePackage { name = "yo"; packageName = "yo"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/yo/-/yo-2.0.1.tgz"; - sha512 = "390n0gdbxr25mr804mrwfqw6r6srk4q9spnsnnlfvlsfvr6dwd93nrgh0l2sr76a9jdw2jiycwc0241h6zch6hi0jlhg3w8hk6i4hyy"; + url = "https://registry.npmjs.org/yo/-/yo-2.0.2.tgz"; + sha512 = "13z42dkmgbs67a3i6wfzf1h3lp54r6xj9p063kyx2nq0v132lqnkss2srl2kayfljcdprr7pw7dfm6h08kqnkhzrlzi1ls7h7cz2qgy"; }; dependencies = [ sources."@sindresorhus/is-0.7.0" @@ -45333,7 +45282,7 @@ in sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" sources."decompress-response-3.3.0" - sources."deep-extend-0.4.2" + sources."deep-extend-0.5.1" sources."default-uid-1.0.0" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" @@ -45376,8 +45325,9 @@ in sources."getpass-0.1.7" sources."glob-7.1.2" sources."global-dirs-0.1.1" + sources."global-tunnel-ng-2.1.1" sources."globby-6.1.0" - sources."got-8.3.0" + sources."got-8.3.1" sources."graceful-fs-4.1.11" sources."grouped-queue-0.3.3" sources."har-schema-2.0.0" @@ -45393,7 +45343,7 @@ in sources."http-cache-semantics-3.8.1" sources."http-signature-1.2.0" sources."humanize-string-1.0.2" - sources."iconv-lite-0.4.21" + sources."iconv-lite-0.4.22" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."indent-string-3.2.0" @@ -45404,9 +45354,9 @@ in dependencies = [ sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."strip-ansi-4.0.0" - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" ]; }) (sources."insight-0.8.4" // { @@ -45471,7 +45421,7 @@ in sources."latest-version-3.1.0" sources."load-json-file-1.1.0" sources."locate-path-2.0.0" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."lodash._getnative-3.9.1" sources."lodash.debounce-3.1.1" sources."lodash.pad-4.5.1" @@ -45568,9 +45518,9 @@ in sources."process-nextick-args-2.0.0" sources."pseudomap-1.0.2" sources."punycode-1.4.1" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."query-string-5.1.1" - sources."rc-1.2.6" + sources."rc-1.2.7" sources."read-pkg-1.1.0" (sources."read-pkg-up-2.0.0" // { dependencies = [ @@ -45598,7 +45548,7 @@ in sources."rx-4.1.0" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."scoped-regex-1.0.0" sources."semver-5.5.0" @@ -45661,6 +45611,7 @@ in sources."tmp-0.0.33" sources."tough-cookie-2.3.4" sources."trim-newlines-1.0.0" + sources."tunnel-0.0.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."twig-0.8.9" @@ -45668,13 +45619,13 @@ in sources."unique-string-1.0.0" sources."untildify-3.0.2" sources."unzip-response-2.0.1" - (sources."update-notifier-2.4.0" // { + (sources."update-notifier-2.5.0" // { dependencies = [ sources."ansi-styles-3.2.1" sources."camelcase-4.1.0" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."execa-0.7.0" - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" ]; }) sources."url-parse-lax-3.0.0" @@ -45714,11 +45665,11 @@ in (sources."yeoman-environment-2.0.6" // { dependencies = [ sources."ansi-styles-3.2.1" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."debug-3.1.0" sources."log-symbols-2.2.0" sources."pify-2.3.0" - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" ]; }) (sources."yosay-2.0.2" // { diff --git a/pkgs/development/node-packages/node-packages-v8.json b/pkgs/development/node-packages/node-packages-v8.json index 2d987cbfb1bd9..4236064c7545e 100644 --- a/pkgs/development/node-packages/node-packages-v8.json +++ b/pkgs/development/node-packages/node-packages-v8.json @@ -15,4 +15,6 @@ , "vue-cli" , "swagger" , "npm" +, "three" +, "mathjax" ] diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index 4b2e714c42dba..cfaa4f0634f42 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -22,13 +22,13 @@ let sha512 = "0ahsk9basb6qimsb40yr40vxxkmmfiqlig23brc5dymic61gfhzg2mzqz5cvkiz2y8g2rwnlwb619fkd3f4hw1yg8bkbczcaxzcrqn0"; }; }; - "@cycle/isolate-3.2.0" = { + "@cycle/isolate-3.3.0" = { name = "_at_cycle_slash_isolate"; packageName = "@cycle/isolate"; - version = "3.2.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cycle/isolate/-/isolate-3.2.0.tgz"; - sha512 = "1g3jcq2dmxpqn3nyvclbf9hnp18h4c41vsqywp2yf2mda92bzdjwidq8f231yxb6rs6r39zpvn741kjify4h5zl4d8ix1xigilbcyj7"; + url = "https://registry.npmjs.org/@cycle/isolate/-/isolate-3.3.0.tgz"; + sha512 = "0406glnab9c4579lfqikh8w67xjd7fvll3sysxy80sxjv3iaks6w08bgjl8418pk2x0iid8shd3ad7xqiw1lvdjarxnrydmnj3c8mjq"; }; }; "@cycle/run-3.4.0" = { @@ -49,13 +49,13 @@ let sha1 = "cbc4b9a68981bf0b501ccd06a9058acd65309bf7"; }; }; - "@types/node-9.6.2" = { + "@types/node-10.0.4" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "9.6.2"; + version = "10.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-9.6.2.tgz"; - sha512 = "30kq6rikl2ya5krnyglrbi52xrm0f3q0nyzj99haady8c2s03l3rcp42cxkkd4v3mrvsw3jan0kz7vb4j148qg8wklh2igvsmii2sai"; + url = "https://registry.npmjs.org/@types/node/-/node-10.0.4.tgz"; + sha512 = "2zwjjfa4s706r0w45siwgzax5c8g5j3z79dkckwzgrzqxglj070ijv0m9g1ipc1y4kr7l0r9qia9yfxc9syw64hib8vh216cxk1las6"; }; }; "@types/superagent-3.5.6" = { @@ -481,13 +481,13 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "atob-2.1.0" = { + "atob-2.1.1" = { name = "atob"; packageName = "atob"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/atob/-/atob-2.1.0.tgz"; - sha512 = "0dyf7054n94f1pwp9chcy6vawgwd2wqp8jqrnvxl489jyxxbg46n2vkb5vfs5jqnkmh6kbyv4lpysrn13hzzh5q021frc6vrcgqms2a"; + url = "https://registry.npmjs.org/atob/-/atob-2.1.1.tgz"; + sha1 = "ae2d5a729477f289d60dd7f96a6314a22dd6c22a"; }; }; "atomic-batcher-1.0.2" = { @@ -940,13 +940,13 @@ let sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; }; }; - "chalk-2.3.2" = { + "chalk-2.4.1" = { name = "chalk"; packageName = "chalk"; - version = "2.3.2"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz"; - sha512 = "06jlrzx0nb92910rcfhx55n28jgvhc0qda49scnfyifnmc31dyfqsl5qqiwhsxkrhrc6c07x69q037f1pwg06kkfd1qdzaxz7dj7kk4"; + url = "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz"; + sha512 = "1yl5ffjp5w65b9ydnw4vp13n563121hs64xbnajif51grhpqmslaqllj24zm1pfaw9ywvdx69n8ppa3riwlps25k5934zgnbf3pmcrr"; }; }; "chardet-0.4.2" = { @@ -1228,13 +1228,13 @@ let sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; }; }; - "colors-1.2.1" = { + "colors-1.2.4" = { name = "colors"; packageName = "colors"; - version = "1.2.1"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-1.2.1.tgz"; - sha512 = "0m8vssxhc3xlx639gz68425ll6mqh0rib6yr7s2v2vg1hwnqka02zijxmg16iyvzmd5sbsczjs2mqs0n428pc1cgkgj439fsa9b1kxk"; + url = "https://registry.npmjs.org/colors/-/colors-1.2.4.tgz"; + sha512 = "1ch53w9md043zff52vsmh89qirws3x7n4zw88xxw0h98fjg71dsll3gh1b598a48xq98d15qpjb07g9ddjsfknrba0byp56fl3a53z9"; }; }; "combine-errors-3.0.3" = { @@ -1570,13 +1570,13 @@ let sha512 = "0yyadc98mdpvqdszc1v26zcgd6zqxink2wrhxw9ax60wk0sxqw6mm3m2jbqvibj54p1gjsmgsf1yhv20xsm77kkb7qwj79jlx8kvfad"; }; }; - "dat-doctor-1.3.1" = { + "dat-doctor-1.4.0" = { name = "dat-doctor"; packageName = "dat-doctor"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/dat-doctor/-/dat-doctor-1.3.1.tgz"; - sha512 = "19cfxdik2pv94dbfsz4nm6a0v6vfx5s1isaagmsjrb44czbcl55sjj9nf1302hqc8ckijsdmlsrna02hb0mjzzhsy0m6c8r3cv0wabk"; + url = "https://registry.npmjs.org/dat-doctor/-/dat-doctor-1.4.0.tgz"; + sha512 = "3ysgc2z0pjbka9617lqykw8c0bqbacgixd6j8nlcdi7sz7j94w2sl17mq3xaq7b6kr5wdngi64y584hj8baqgxw2aaavgvk96kff3fl"; }; }; "dat-encoding-4.0.2" = { @@ -1669,22 +1669,13 @@ let sha512 = "13cbr004milnmjisg774rqqw82vyjg1p1d6gvm3xji516rq7zzc1x7da397njig5s2rg2qmw1dixdn4cpkmvc8irq4y1dzb3h46sz2c"; }; }; - "dat-swarm-defaults-1.0.0" = { + "dat-swarm-defaults-1.0.1" = { name = "dat-swarm-defaults"; packageName = "dat-swarm-defaults"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dat-swarm-defaults/-/dat-swarm-defaults-1.0.0.tgz"; - sha1 = "ba7d58c309cf60c3924afad869b75192b61fe354"; - }; - }; - "datland-swarm-defaults-1.0.2" = { - name = "datland-swarm-defaults"; - packageName = "datland-swarm-defaults"; - version = "1.0.2"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/datland-swarm-defaults/-/datland-swarm-defaults-1.0.2.tgz"; - sha1 = "277b895a39f1aa7f96a495a02fb3662a5ed9f2e0"; + url = "https://registry.npmjs.org/dat-swarm-defaults/-/dat-swarm-defaults-1.0.1.tgz"; + sha512 = "0kgq4nz4axx3kpfam6lxid88x5gx39gbk3kzcgmbhxld9vwl3469q58hkd2zjripg3955483j450yvszk1pwpn895adz62mn0xsarag"; }; }; "debug-2.2.0" = { @@ -1786,13 +1777,13 @@ let sha1 = "84b745896f34c684e98f2ce0e42abaf43bba017d"; }; }; - "deep-extend-0.4.2" = { + "deep-extend-0.5.1" = { name = "deep-extend"; packageName = "deep-extend"; - version = "0.4.2"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz"; - sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f"; + url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz"; + sha512 = "3bzqm7nqgh7m8xjhl0q8jc0ccm9riymsfmy0144x6n2qy9v1gin2ww8s9wjlayk0xyzq9cz9pyar02yiv30mhqsj7rmw35ywrsc3jrp"; }; }; "define-property-0.2.5" = { @@ -2047,13 +2038,13 @@ let sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; }; }; - "duplexify-3.5.4" = { + "duplexify-3.6.0" = { name = "duplexify"; packageName = "duplexify"; - version = "3.5.4"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.4.tgz"; - sha512 = "2qcky919ps17a9ndimxvcqc73wlrcjmq8ppddbnl45xs9yqp1dmzzfaspfn63xzp14rl3dlk4g6y2ia71s6r9nggd0mb891hcni4di7"; + url = "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz"; + sha512 = "12hhn0igd7y8nmni0qd63wpc9w1fl5rgdh4d1mq65n6r00l7byh7fs5v6m6pd8xzwmnxhrxqrc1y5yh6hswbh2i9ic9la21if5w7vbw"; }; }; "ecc-jsbn-0.1.1" = { @@ -2605,6 +2596,15 @@ let sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; }; }; + "fs-constants-1.0.0" = { + name = "fs-constants"; + packageName = "fs-constants"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz"; + sha512 = "2iv1j05gzx1sgpckd597sdd2f5x54rgcib3rpwgf31050wqxn5h27map6cn9wk4vix393s4ws2xv6kgps5zfby2iirb2zw8hk1818yb"; + }; + }; "fs-extra-0.24.0" = { name = "fs-extra"; packageName = "fs-extra"; @@ -2641,13 +2641,13 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; - "fsevents-1.1.3" = { + "fsevents-1.2.3" = { name = "fsevents"; packageName = "fsevents"; - version = "1.1.3"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz"; - sha512 = "3jw51f4iayxvp9wfxczk1xgcvhsydhlgah64jmpl0mqiii2h8i5pp0lrqac5xn7296gxqrvy4lgm4k4hkifk8gipgqxd68x764gp2jq"; + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.3.tgz"; + sha512 = "3nsv4z5qk2hhcrp6bng9bzpj4nsk0b41i363phlqfp69dq1p2x6a1g3y86z2j7aj4mfj88y1i1agkb1y0pg5c388223h394jqxppvjz"; }; }; "fstream-1.0.11" = { @@ -3046,13 +3046,13 @@ let sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; }; }; - "hypercore-6.13.0" = { + "hypercore-6.14.0" = { name = "hypercore"; packageName = "hypercore"; - version = "6.13.0"; + version = "6.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-6.13.0.tgz"; - sha512 = "056r7rmx6zkfivza10a0fs5p2wlgxrb82gb1sz8hmjgczvc9gx652ybhbckmr0a0bjknc1yzd23zw6v3r2svasymvdfgcp9k98qf1hw"; + url = "https://registry.npmjs.org/hypercore/-/hypercore-6.14.0.tgz"; + sha512 = "3liw77yhvn3nlrczf9s30vvn4bxrn3glh65a2psy1va9pvcnjwx6wfh52v5l9qbd7zyp4q4nb7qrq0n3am7jwmz3dkb5fzvdnlwikkh"; }; }; "hypercore-protocol-6.6.4" = { @@ -3100,13 +3100,13 @@ let sha1 = "d96c92732076f072711b6b10fd7d4f65ad8ee23d"; }; }; - "iconv-lite-0.4.21" = { + "iconv-lite-0.4.22" = { name = "iconv-lite"; packageName = "iconv-lite"; - version = "0.4.21"; + version = "0.4.22"; src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.21.tgz"; - sha512 = "0myjcmxx7dn5liikg8d2zgwb433sk761dfxwwnszyam16rzv5dzva352jrvav7cnambn0ha8fzh6g6xhdhxsd20l5v1p65r6vvmazhj"; + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.22.tgz"; + sha512 = "1fdqcacbfr3yxs5i2kj9kn06lgx2a9yfrdps0hsmw96p1slawiqp3qyfnqczp570wbbi5sr8valqyll05a5gzj3ahppnkl32waaf26l"; }; }; "iconv-lite-0.4.8" = { @@ -3910,13 +3910,13 @@ let sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6"; }; }; - "lodash-4.17.5" = { + "lodash-4.17.10" = { name = "lodash"; packageName = "lodash"; - version = "4.17.5"; + version = "4.17.10"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz"; - sha512 = "11hikgyas884mz8a58vyixaahxbpdwljdw4cb6qp15xa3sfqikp2mm6wgv41jsl34nzsv1hkx9kw3nwczvas5p73whirmaz4sxggwmj"; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz"; + sha512 = "1ba5b80jjzwrh9fbdk5ywv8sic0dynij21wgrfxsfjzwvwd7x1n6azdhdc0vjdxqmcpm0mhshd1k7n2ascxpz00z3p8a3k97mwg1s2i"; }; }; "lodash-compat-3.10.2" = { @@ -4549,13 +4549,13 @@ let sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; }; - "minipass-2.2.4" = { + "minipass-2.3.0" = { name = "minipass"; packageName = "minipass"; - version = "2.2.4"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-2.2.4.tgz"; - sha512 = "3r74gps1yd2fabj46qd42hknvpkg4aqwg3cdz8xjn8aqww0rsk3nmbgh8p2h0rkjlpxihg1wnpfa4bmpgmnydlbhpb1rz5dcxcwhdc7"; + url = "https://registry.npmjs.org/minipass/-/minipass-2.3.0.tgz"; + sha512 = "1p0pbj1iwnzb7kkqbh5h0vd6byh1l6na1yx69qmbb0wbmwm0qc5g4hn4z6lr8wkzb4kybvd1hjm4hxd93nrdr8ydbqqd9wd1w9bcq4d"; }; }; "minizlib-1.1.0" = { @@ -4567,13 +4567,13 @@ let sha512 = "2agpbdf9h90nhafdam3jwrw8gcz3jw1i40cx6bhwaw8qaf2s863gi2b77l73dc3hmf5dx491hv5km1rqzabgsbpkjxrvdcwy6pr8gp1"; }; }; - "mirror-folder-2.1.1" = { + "mirror-folder-2.2.0" = { name = "mirror-folder"; packageName = "mirror-folder"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-2.1.1.tgz"; - sha1 = "1ad3b777b39e403cc27bf52086c23e41ef4c9604"; + url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-2.2.0.tgz"; + sha512 = "3js8pwgmj4lzzi6nzl0wp021rhsnz31jpkkzdf35xzwm1l65m6ygjf4hz77vvy3dk2h5jb2d32nvzy26n3d5hswg3nb8s0rylvv510r"; }; }; "mixin-deep-1.3.1" = { @@ -4801,13 +4801,13 @@ let sha512 = "15fbq2bchsjk85zklc34xl74skmdxbipsf0zjf1k6jfq1fr31h5bn7c6438ff55i9yzrhf11k85ahvahyb73khfjl4sj59zjrqksj9d"; }; }; - "needle-2.2.0" = { + "needle-2.2.1" = { name = "needle"; packageName = "needle"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.2.0.tgz"; - sha512 = "3ry4wyih9w3nc3d319bmfd9l4jj8fn00lqfs1d00sfy6azvy66yhm6jv411cn1c1zqc01hvj59dlavm82mzxw5mlar8ck9ylz5s0mkq"; + url = "https://registry.npmjs.org/needle/-/needle-2.2.1.tgz"; + sha512 = "3wnlvqmkxw69bl3clghqpsl1kxqm7hkq4v4ab0rm6dx7xqyg3bn8q38i6hmxm47ccfn6bxcvl53c4madxdgblnm06ika99x4g06rxmp"; }; }; "nets-3.2.0" = { @@ -4846,13 +4846,13 @@ let sha512 = "0vkilw1ghsjca0lrj9gsdgsi8wj4bvpfr25q1qzx1kp5hhvjdhapmvpmrd2hikwq9dxydw6sdvv0730wwvmsg36xqf0hgp9777l3ns8"; }; }; - "nodemon-1.17.3" = { + "nodemon-1.17.4" = { name = "nodemon"; packageName = "nodemon"; - version = "1.17.3"; + version = "1.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.3.tgz"; - sha512 = "1i6m13ad9c1p8xilw0vjcgmj0nnk1y9b3lncx6kwljxw89hmk5z9vv8m452wfd5qg9bqf9r0b236d9vxbc3i2sx2flamfrr03xm42zh"; + url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.4.tgz"; + sha512 = "3bmxd7fd494gy4ddax3mihjz1iy484iakyssbhy87cc2kwbky9xkb8l47vphc3n858q9p9afxl57w0849i24amsdjhwbqh8vxhjy1v5"; }; }; "nopt-1.0.10" = { @@ -5503,13 +5503,13 @@ let sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607"; }; }; - "qs-6.5.1" = { + "qs-6.5.2" = { name = "qs"; packageName = "qs"; - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz"; - sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r"; + url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; + sha512 = "0c46ws0x9g3mmkgfmvd78bzvnmv2b8ryg4ah6jvyyqgjv9v994z7xdyvsc4vg9sf98gg7phvy3q1ahgaj5fy3dwzf2rki6bixgl15ip"; }; }; "raf-3.3.2" = { @@ -5539,13 +5539,13 @@ let sha1 = "72f3d865b4b55a259879473e2fb2de3569c69ee2"; }; }; - "random-access-storage-1.1.1" = { + "random-access-storage-1.2.0" = { name = "random-access-storage"; packageName = "random-access-storage"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/random-access-storage/-/random-access-storage-1.1.1.tgz"; - sha512 = "1dswb4yr7m8350bx8z0z19iqgk2a43qbfc1qf8n3w483mqqg0f5gsykd5cg14yy8jik0n9ghy7j2f5kp1anzjna46ih9ncxpm0vq0k1"; + url = "https://registry.npmjs.org/random-access-storage/-/random-access-storage-1.2.0.tgz"; + sha512 = "3jz9jky55s8w0pd5q2v58fxdgca5ymbhlif0zn6jv55jr7bvp1xvn60bz4b2k6m399zzxzdk196385wl3gw6xasxzi3mq8xkp9al118"; }; }; "randomatic-1.1.7" = { @@ -5584,13 +5584,13 @@ let sha1 = "a2c2f98c8531cee99c63d8d238b7de97bb659fca"; }; }; - "rc-1.2.6" = { + "rc-1.2.7" = { name = "rc"; packageName = "rc"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.2.6.tgz"; - sha1 = "eb18989c6d4f4f162c399f79ddd29f3835568092"; + url = "https://registry.npmjs.org/rc/-/rc-1.2.7.tgz"; + sha512 = "30b4pqzhk8f4ppzyk5diwxac7xpf4hd3rysyin012l59da9v5iaai4wd6yzlz3rjspfvvy191q6qcsw47mwlw9y07n35kzq23rw7lid"; }; }; "read-1.0.7" = { @@ -5881,13 +5881,13 @@ let sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be"; }; }; - "safe-buffer-5.1.1" = { + "safe-buffer-5.1.2" = { name = "safe-buffer"; packageName = "safe-buffer"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"; - sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh"; + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "3xbm0dkya4bc3zwfwpdzbl8ngq0aai5ihlp2v3s39y7162c7wyvv9izj3g8hv6dy6vm2lq48lmfzygk0kxwbjb6xic7k4a329j99p8r"; }; }; "safe-regex-1.1.0" = { @@ -6187,13 +6187,13 @@ let sha512 = "3451wvpagbw2ib50galmlfrb5za3zh0ml1irbm2ijd0lbjblg9va4fnag6sfs7msb1m0i5zicz93jwp90c22v0n40qzpczhicg85jah"; }; }; - "sodium-native-2.1.5" = { + "sodium-native-2.1.6" = { name = "sodium-native"; packageName = "sodium-native"; - version = "2.1.5"; + version = "2.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.5.tgz"; - sha512 = "3cwd4rvsggx0lzc7433v6321fjs65q9nqr3c9gcz7j51ca580aq6ciacmmq788yxb3ih78b1fkpkprm75d0hadj3ng2bznc6qsl1var"; + url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.6.tgz"; + sha512 = "3y0f008galwxign4qb49q2kfkhz68nfxazpcq5y63wahaqly89x640nnv8cv4rg9xn1vbp5wia76vkmh1ja13dp95vjzw2lv5q2zymx"; }; }; "sodium-universal-2.0.0" = { @@ -6574,6 +6574,15 @@ let sha512 = "0sxwwjllf26hx079lw1w3c1zywq2af9ssi7f0n334xzz1mgnfx2lr5l532a988zyi3bigzmfidqgdrfmwv6ghgzs77qsw87yr0zhlc1"; }; }; + "superagent-3.8.3" = { + name = "superagent"; + packageName = "superagent"; + version = "3.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz"; + sha512 = "0a4ra91hgzbhnyccsx319r1xzaw4cb3k144g7xrp10y3wckzd98vxhf5vk34cfvvlrav8pyf2vqr11scimkiyivg2w84458q0n2vd0q"; + }; + }; "supports-color-1.2.0" = { name = "supports-color"; packageName = "supports-color"; @@ -6601,13 +6610,13 @@ let sha512 = "1flwwfdd7gg94xrc0b2ard3qjx4cpy600q49gx43y8pzvs7j56q78bjhv8mk18vgbggr4fd11jda8ck5cdrkc5jcjs04nlp7kwbg85c"; }; }; - "supports-color-5.3.0" = { + "supports-color-5.4.0" = { name = "supports-color"; packageName = "supports-color"; - version = "5.3.0"; + version = "5.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz"; - sha512 = "0v9skvg8c5hgqfsm98p7d7hisk11syjdvl3nxid3ik572hbjwv4vyzws7q0n1yz8mvb1asbk00838fi09hyfskrng54icn8nbag98yi"; + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz"; + sha512 = "3ks7qkl6s064qcdc5qnpzcwzcrnlzccz9m3faw54fnmsm2k8fzb9saqr5nhx7w9lnd4nbp0zg047zz8mwsd4fxfnalpb7kra619fdnf"; }; }; "swagger-converter-0.1.7" = { @@ -6637,13 +6646,13 @@ let sha1 = "a4316ccb0d40a77d30dadf91f0f4db7e475f948a"; }; }; - "swagger-test-templates-1.4.3" = { + "swagger-test-templates-1.5.0" = { name = "swagger-test-templates"; packageName = "swagger-test-templates"; - version = "1.4.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-test-templates/-/swagger-test-templates-1.4.3.tgz"; - sha1 = "e047473aec06b938992e427665cafdbb6a01cfc0"; + url = "https://registry.npmjs.org/swagger-test-templates/-/swagger-test-templates-1.5.0.tgz"; + sha512 = "0jmilcls10zf18f7nlcdn29qdf21bl4xsk1kzzayp5h92ljkwx3c9jyy3a3p2yrd6pjnzh0k5c4yih3kbv6nxcd2rpf5vlfm44lg06l"; }; }; "swagger-tools-0.9.16" = { @@ -6673,22 +6682,22 @@ let sha1 = "8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"; }; }; - "tar-4.4.1" = { + "tar-4.4.2" = { name = "tar"; packageName = "tar"; - version = "4.4.1"; + version = "4.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.4.1.tgz"; - sha512 = "33gymcvk33znj1lscj0kds60g5jzagw2dcx1fcbpxz85pi21kqlazvwz579p301x0vqvir1nslh901zq28sfx2zpsnd7qldvjpzbsrv"; + url = "https://registry.npmjs.org/tar/-/tar-4.4.2.tgz"; + sha512 = "25ypdsz6l4xmg1f89pjy8s773j3lzx855iiakbdknz115vxyg4p4z1j0i84iyjpzwgfjfs2l2njpd0y2hlr5sh4n01nh6124zs09y85"; }; }; - "tar-stream-1.5.5" = { + "tar-stream-1.6.0" = { name = "tar-stream"; packageName = "tar-stream"; - version = "1.5.5"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz"; - sha512 = "219gn10gvilrq6h3yshbhn25fx46n0wlgg66h0v326jhzz8gmpxsinb8bnhx1py35z0cv2248v91k2vy6vmkajmvpmkfmizywn601wr"; + url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.0.tgz"; + sha512 = "2kw4php0986jgdzqvrih64plc8md1f1v3wfc8mz3y0lz95dmmvba1lpjmwp1v4crgfky63r8an3syfavn3gb0d56xk7615zy40a47cn"; }; }; "term-size-1.2.0" = { @@ -6790,13 +6799,13 @@ let sha512 = "0drg2bck1cj8677rgs1l98v7vqaxawcqh6ja87qilwnd719l5y0lzv5ssn3pcwa37fdbg4188y6x15a90vkllyvfpd9v7fai2b8j44d"; }; }; - "to-buffer-1.1.0" = { + "to-buffer-1.1.1" = { name = "to-buffer"; packageName = "to-buffer"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.0.tgz"; - sha1 = "375bc03edae5c35a8fa0b3fe95a1f3985db1dcfa"; + url = "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz"; + sha512 = "1b8wsfz1rp8fsb2kz7isrsx292vl5w4cmx9qvivxqsj61avx9ph1azxa6zr3mc85cz8qddbkxm6ski8zvacmpadc22wp6pv5gk427wp"; }; }; "to-iso-string-0.0.2" = { @@ -7114,22 +7123,22 @@ let sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97"; }; }; - "upath-1.0.4" = { + "upath-1.0.5" = { name = "upath"; packageName = "upath"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/upath/-/upath-1.0.4.tgz"; - sha512 = "0xw24ba88hfvwwgniyn17n26av45g1pxqf095231065l4n9dp5w3hyc7azjd8sqyix7pnfx1pmr44fzmwwazkz0ly83cp214g4qk13p"; + url = "https://registry.npmjs.org/upath/-/upath-1.0.5.tgz"; + sha512 = "31m1lljcfngdnpyz67gpkwvb66gx6750si3jzmf1vg6kq420fq5lcd34cfgp6wz3manjpqbp9i98ax2yjl2xs7mq824chw38vvsgcm9"; }; }; - "update-notifier-2.4.0" = { + "update-notifier-2.5.0" = { name = "update-notifier"; packageName = "update-notifier"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.4.0.tgz"; - sha1 = "f9b4c700fbfd4ec12c811587258777d563d8c866"; + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz"; + sha512 = "07vkna9y5i0ak6rwcbinrrgpabrcmav91ys805c42jskyc6kfla3wd12klsr858vzv5civi7arh5xz8bv7jdj81zgzyh6j70a31s0w3"; }; }; "uri-js-3.0.2" = { @@ -7222,13 +7231,13 @@ let sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; }; }; - "utp-native-1.7.0" = { + "utp-native-1.7.1" = { name = "utp-native"; packageName = "utp-native"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/utp-native/-/utp-native-1.7.0.tgz"; - sha512 = "1d0ccaz56506y44838shld6zkqx9rcx3cpw5qddbfbyjyjr73704gysrl3qwii6i80kx1i2ysnn8bdx6q0i4biwzjj36ksx2865i0yz"; + url = "https://registry.npmjs.org/utp-native/-/utp-native-1.7.1.tgz"; + sha512 = "2mflgna04nng4cj8z4pr53pw0fm3z447mvbnvcahlvq8wpg46znrvg4fkgh18k14bkiq3gic5d2h975bgy7h7l64cfjpc8r2km3naqm"; }; }; "uuid-3.2.1" = { @@ -7519,13 +7528,13 @@ let sha1 = "a81981ea70a57946133883f029c5821a89359a7f"; }; }; - "z-schema-3.19.1" = { + "z-schema-3.20.0" = { name = "z-schema"; packageName = "z-schema"; - version = "3.19.1"; + version = "3.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/z-schema/-/z-schema-3.19.1.tgz"; - sha512 = "29crh8y7kjqp652n8wpbh4ljd4j579jg9kwaw9anmd8nhkdz5ljg9arxm8wpcpir5rka60l7h3i13mahcrsq95ydl3f1pxfcfm77wwc"; + url = "https://registry.npmjs.org/z-schema/-/z-schema-3.20.0.tgz"; + sha512 = "2fmqk4rayvsp7kjhfmr7ldrwvfvg1aif9dwpsqbqvmsz8j18q5lxs1vm4frg7pla8fwj2xacjzy0fsm2xfqvwmsxa5yxvsb21y5v2pn"; }; }; }; @@ -7576,23 +7585,23 @@ in dependencies = [ sources."@cycle/dom-18.3.0" sources."@cycle/http-14.9.0" - sources."@cycle/isolate-3.2.0" + sources."@cycle/isolate-3.3.0" sources."@cycle/run-3.4.0" (sources."@cycle/time-0.10.1" // { dependencies = [ sources."chalk-1.1.3" ]; }) - sources."@types/node-9.6.2" + sources."@types/node-10.0.4" sources."@types/superagent-3.5.6" sources."ansi-escapes-3.1.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."asynckit-0.4.0" - (sources."chalk-2.3.2" // { + (sources."chalk-2.4.1" // { dependencies = [ sources."ansi-styles-3.2.1" - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" ]; }) sources."chardet-0.4.2" @@ -7626,7 +7635,7 @@ in sources."formidable-1.2.1" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" - sources."iconv-lite-0.4.21" + sources."iconv-lite-0.4.22" sources."inherits-2.0.3" (sources."inquirer-3.3.0" // { dependencies = [ @@ -7638,7 +7647,7 @@ in sources."is-promise-2.1.0" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."lodash._baseiteratee-4.7.0" sources."lodash._basetostring-4.12.0" sources."lodash._baseuniq-4.6.0" @@ -7662,14 +7671,14 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.0" sources."pseudomap-1.0.2" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."raf-3.3.2" sources."readable-stream-2.3.6" sources."restore-cursor-2.0.0" sources."run-async-2.3.0" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."setimmediate-1.0.5" sources."shebang-command-1.2.0" @@ -7758,7 +7767,7 @@ in sources."bytes-3.0.0" sources."call-me-maybe-1.0.1" sources."caseless-0.12.0" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."circular-append-file-1.0.1" sources."cli-truncate-1.1.0" sources."cliclopts-1.1.1" @@ -7766,7 +7775,7 @@ in sources."codecs-1.2.1" sources."color-convert-1.9.1" sources."color-name-1.1.3" - sources."colors-1.2.1" + sources."colors-1.2.4" sources."combined-stream-1.0.6" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" @@ -7782,7 +7791,7 @@ in sources."cycle-1.0.3" sources."dashdash-1.14.1" sources."dat-dns-1.3.2" - (sources."dat-doctor-1.3.1" // { + (sources."dat-doctor-1.4.0" // { dependencies = [ sources."debug-2.6.9" sources."dns-packet-1.3.1" @@ -7823,8 +7832,7 @@ in sources."dat-registry-4.0.0" sources."dat-secret-storage-4.0.1" sources."dat-storage-1.0.4" - sources."dat-swarm-defaults-1.0.0" - sources."datland-swarm-defaults-1.0.2" + sources."dat-swarm-defaults-1.0.1" sources."debug-3.1.0" sources."deep-equal-0.2.2" sources."delayed-stream-1.0.0" @@ -7849,7 +7857,7 @@ in sources."dns-socket-3.0.0" sources."dns-txt-2.0.2" sources."dom-walk-0.1.1" - sources."duplexify-3.5.4" + sources."duplexify-3.6.0" sources."ecc-jsbn-0.1.1" sources."end-of-stream-1.4.1" sources."escape-string-regexp-1.0.5" @@ -7884,7 +7892,7 @@ in sources."hoek-4.2.1" sources."http-methods-0.1.0" sources."http-signature-1.2.0" - (sources."hypercore-6.13.0" // { + (sources."hypercore-6.14.0" // { dependencies = [ sources."varint-5.0.0" ]; @@ -7947,7 +7955,7 @@ in sources."min-document-2.19.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" - sources."mirror-folder-2.1.1" + sources."mirror-folder-2.2.0" sources."mkdirp-0.5.1" sources."ms-2.0.0" sources."multi-random-access-2.1.1" @@ -7993,10 +8001,10 @@ in sources."protocol-buffers-encodings-1.1.0" sources."pump-2.0.1" sources."punycode-1.4.1" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."random-access-file-2.0.1" sources."random-access-memory-2.4.0" - sources."random-access-storage-1.1.1" + sources."random-access-storage-1.2.0" (sources."randomatic-1.1.7" // { dependencies = [ (sources."is-number-3.0.0" // { @@ -8019,14 +8027,14 @@ in sources."revalidator-0.1.8" sources."rimraf-2.6.2" sources."rusha-0.8.13" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."signed-varint-2.0.1" sources."simple-sha1-2.1.0" sources."siphash24-1.1.0" sources."slice-ansi-1.0.0" sources."sntp-2.1.0" sources."sodium-javascript-0.5.5" - sources."sodium-native-2.1.5" + sources."sodium-native-2.1.6" sources."sodium-universal-2.0.0" sources."sorted-array-functions-1.1.0" sources."sorted-indexof-1.0.0" @@ -8048,7 +8056,7 @@ in sources."debug-2.6.9" ]; }) - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" (sources."throttle-1.0.3" // { dependencies = [ sources."debug-2.6.9" @@ -8056,7 +8064,7 @@ in }) sources."through2-2.0.3" sources."thunky-1.0.2" - sources."to-buffer-1.1.0" + sources."to-buffer-1.1.1" sources."toiletdb-1.4.1" sources."tough-cookie-2.3.4" sources."township-client-1.3.2" @@ -8072,7 +8080,7 @@ in sources."untildify-3.0.2" sources."util-deprecate-1.0.2" sources."utile-0.3.0" - sources."utp-native-1.7.0" + sources."utp-native-1.7.1" sources."uuid-3.2.1" sources."varint-3.0.1" sources."verror-1.10.0" @@ -8134,10 +8142,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "5.0.5"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-5.0.5.tgz"; - sha512 = "20cyp9x4b3gfrd50w8dcfkm0dv2mc6z0ikvfpkc8dzca6hppslgn0yiw2qdzc4ggf234kzcdvs0hw7lnv7ywilaml4w39vr6r93ghyw"; + url = "https://registry.npmjs.org/mocha/-/mocha-5.1.1.tgz"; + sha512 = "23wcnn35p90xhsc5z94w45s30j756s97acm313h6lacnbliqlaka3drq2xbsi4br8gdkld3r4dc33vglq8kf5jb408c7b2agpyar8lh"; }; dependencies = [ sources."balanced-match-1.0.0" @@ -8282,11 +8290,11 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.0" sources."punycode-1.4.1" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."readable-stream-2.3.6" sources."request-2.85.0" sources."rimraf-2.6.2" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."semver-5.3.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.2" @@ -8336,10 +8344,10 @@ in node-pre-gyp = nodeEnv.buildNodePackage { name = "node-pre-gyp"; packageName = "node-pre-gyp"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.9.0.tgz"; - sha1 = "bdd4c3afac9b1b1ebff0a9ff3362859eb6781bb8"; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.0.tgz"; + sha512 = "10s7f95mxnxcwziwzx44l62zy3yjmhky942pw134dbd48wshl7abr1ja8qx1rfzz9vgygcx1vlz1jlldy61da33zq0bfi8bfji09f8v"; }; dependencies = [ sources."abbrev-1.1.1" @@ -8354,7 +8362,7 @@ in sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" sources."debug-2.6.9" - sources."deep-extend-0.4.2" + sources."deep-extend-0.5.1" sources."delegates-1.0.0" sources."detect-libc-1.0.3" sources."fs-minipass-1.2.5" @@ -8362,7 +8370,7 @@ in sources."gauge-2.7.4" sources."glob-7.1.2" sources."has-unicode-2.0.1" - sources."iconv-lite-0.4.21" + sources."iconv-lite-0.4.22" sources."ignore-walk-3.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -8371,11 +8379,11 @@ in sources."isarray-1.0.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" - sources."minipass-2.2.4" + sources."minipass-2.3.0" sources."minizlib-1.1.0" sources."mkdirp-0.5.1" sources."ms-2.0.0" - sources."needle-2.2.0" + sources."needle-2.2.1" sources."nopt-4.0.1" sources."npm-bundled-1.0.3" sources."npm-packlist-1.1.10" @@ -8388,14 +8396,14 @@ in sources."osenv-0.1.5" sources."path-is-absolute-1.0.1" sources."process-nextick-args-2.0.0" - (sources."rc-1.2.6" // { + (sources."rc-1.2.7" // { dependencies = [ sources."minimist-1.2.0" ]; }) sources."readable-stream-2.3.6" sources."rimraf-2.6.2" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."semver-5.5.0" @@ -8405,7 +8413,7 @@ in sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - sources."tar-4.4.1" + sources."tar-4.4.2" sources."util-deprecate-1.0.2" sources."wide-align-1.1.2" sources."wrappy-1.0.2" @@ -8423,10 +8431,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "1.38.3"; + version = "1.41.3"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-1.38.3.tgz"; - sha1 = "84b7ce1eee5d893c51995752e8afc2ee726539e3"; + url = "https://registry.npmjs.org/pnpm/-/pnpm-1.41.3.tgz"; + sha1 = "66b38792c8447702c47553a87dddc5748a3aefca"; }; buildInputs = globalBuildInputs; meta = { @@ -8475,12 +8483,12 @@ in sources."graceful-readlink-1.0.1" sources."inherits-2.0.3" sources."isarray-1.0.0" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."minimatch-3.0.4" sources."process-nextick-args-2.0.0" sources."readable-stream-2.3.6" sources."readdirp-2.1.0" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."set-immediate-shim-1.0.1" sources."string_decoder-1.1.1" sources."util-deprecate-1.0.2" @@ -8531,7 +8539,10 @@ in sources."boom-4.3.1" sources."brace-expansion-1.1.11" sources."buffer-3.6.0" + sources."buffer-alloc-1.1.0" + sources."buffer-alloc-unsafe-0.1.1" sources."buffer-crc32-0.2.13" + sources."buffer-fill-0.1.1" sources."builtins-1.0.3" sources."camelcase-1.2.1" sources."capture-stack-trace-1.0.0" @@ -8542,7 +8553,7 @@ in ]; }) sources."center-align-0.1.3" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."chardet-0.4.2" sources."cli-cursor-2.1.0" sources."cli-spinners-1.3.1" @@ -8611,6 +8622,7 @@ in sources."filenamify-2.0.0" sources."forever-agent-0.6.1" sources."form-data-2.3.2" + sources."fs-constants-1.0.0" sources."fs-extra-0.26.7" sources."fs.realpath-1.0.0" sources."get-proxy-2.1.0" @@ -8638,7 +8650,7 @@ in sources."hawk-6.0.2" sources."hoek-4.2.1" sources."http-signature-1.2.0" - sources."iconv-lite-0.4.21" + sources."iconv-lite-0.4.22" sources."ieee754-1.1.11" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -8669,7 +8681,7 @@ in sources."kind-of-3.2.2" sources."klaw-1.3.1" sources."lazy-cache-1.0.4" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."log-symbols-2.2.0" sources."longest-1.0.1" sources."lowercase-keys-1.0.1" @@ -8714,7 +8726,7 @@ in sources."process-nextick-args-2.0.0" sources."proto-list-1.2.4" sources."punycode-1.4.1" - sources."qs-6.5.1" + sources."qs-6.5.2" sources."read-metadata-1.0.0" sources."readable-stream-2.3.6" sources."recursive-readdir-2.2.2" @@ -8730,7 +8742,7 @@ in sources."run-async-2.3.0" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."seek-bzip-1.0.5" sources."semver-5.5.0" @@ -8746,14 +8758,15 @@ in sources."strip-ansi-4.0.0" sources."strip-dirs-2.1.0" sources."strip-outer-1.0.1" - sources."supports-color-5.3.0" - sources."tar-stream-1.5.5" + sources."supports-color-5.4.0" + sources."tar-stream-1.6.0" sources."through-2.3.8" sources."thunkify-2.1.2" sources."thunkify-wrap-1.0.4" sources."tildify-1.2.0" sources."timed-out-4.0.1" sources."tmp-0.0.33" + sources."to-buffer-1.1.1" sources."toml-2.3.3" sources."tough-cookie-2.3.4" sources."trim-repeated-1.0.0" @@ -8839,7 +8852,7 @@ in sources."async-1.5.2" sources."async-each-1.0.1" sources."asynckit-0.4.0" - sources."atob-2.1.0" + sources."atob-2.1.1" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -8917,7 +8930,7 @@ in sources."debug-2.6.9" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" - sources."deep-extend-0.4.2" + sources."deep-extend-0.5.1" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" sources."depd-1.1.2" @@ -8961,7 +8974,7 @@ in sources."from-0.1.7" sources."fs-extra-0.24.0" sources."fs.realpath-1.0.0" - sources."fsevents-1.1.3" + sources."fsevents-1.2.3" sources."get-stream-3.0.0" sources."get-value-2.0.6" sources."glob-7.1.2" @@ -9026,13 +9039,13 @@ in dependencies = [ sources."debug-3.1.0" sources."ms-2.0.0" - sources."qs-6.5.1" - sources."superagent-3.8.2" + sources."qs-6.5.2" + sources."superagent-3.8.3" ]; }) (sources."json-schema-deref-sync-0.3.4" // { dependencies = [ - sources."lodash-4.17.5" + sources."lodash-4.17.10" ]; }) sources."jsonfile-2.4.0" @@ -9115,11 +9128,11 @@ in sources."nan-2.10.0" sources."nanomatch-1.2.9" sources."native-promise-only-0.8.1" - (sources."nodemon-1.17.3" // { + (sources."nodemon-1.17.4" // { dependencies = [ sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" - sources."chalk-2.3.2" + sources."chalk-2.4.1" sources."debug-3.1.0" sources."define-property-1.0.0" sources."extend-shallow-2.0.1" @@ -9146,7 +9159,7 @@ in sources."lru-cache-4.1.2" sources."minimist-1.2.0" sources."strip-ansi-4.0.0" - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" ]; }) sources."nopt-1.0.10" @@ -9187,7 +9200,7 @@ in sources."bytes-2.1.0" ]; }) - sources."rc-1.2.6" + sources."rc-1.2.7" sources."readable-stream-2.3.6" sources."readdirp-2.1.0" sources."readline2-1.0.1" @@ -9205,7 +9218,7 @@ in sources."rimraf-2.6.2" sources."run-async-0.1.0" sources."rx-lite-3.1.2" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."sanitize-filename-1.6.1" sources."semver-5.5.0" @@ -9268,7 +9281,7 @@ in sources."supports-color-2.0.0" sources."swagger-converter-0.2.0" sources."swagger-editor-2.10.5" - (sources."swagger-test-templates-1.4.3" // { + (sources."swagger-test-templates-1.5.0" // { dependencies = [ sources."camelcase-1.2.1" sources."is-extglob-1.0.0" @@ -9287,7 +9300,7 @@ in sources."form-data-1.0.0-rc3" sources."formidable-1.0.17" sources."isarray-0.0.1" - sources."lodash-4.17.5" + sources."lodash-4.17.10" sources."mime-1.3.4" sources."ms-0.7.1" sources."object-assign-3.0.0" @@ -9337,8 +9350,8 @@ in ]; }) sources."unzip-response-2.0.1" - sources."upath-1.0.4" - sources."update-notifier-2.4.0" + sources."upath-1.0.5" + sources."update-notifier-2.5.0" sources."uri-js-3.0.2" sources."urix-0.1.0" sources."url-parse-lax-1.0.0" @@ -9362,7 +9375,7 @@ in sources."xtend-4.0.1" sources."yallist-2.1.2" sources."yargs-3.10.0" - sources."z-schema-3.19.1" + sources."z-schema-3.20.0" ]; buildInputs = globalBuildInputs; meta = { @@ -9376,10 +9389,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "5.8.0"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-5.8.0.tgz"; - sha512 = "32zs775qksijpj23rwly4h8gs435lbsgaxzw6dmyjjg3i8qd40bmmadv3ac9mdxd0cd2x0m3ncsqa0j5vkmkvh8dknn0j9d1k6ig30f"; + url = "https://registry.npmjs.org/npm/-/npm-6.0.0.tgz"; + sha512 = "1s1pq7rdh5xxd4phq7bf1fikbfwc9iiglgayiy0bf14skvivj96j7f5mzyh3631gzhm7vmpak0k523axik5n4hza8gd8c90s203plqj"; }; buildInputs = globalBuildInputs; meta = { @@ -9390,4 +9403,38 @@ in production = true; bypassCache = true; }; + three = nodeEnv.buildNodePackage { + name = "three"; + packageName = "three"; + version = "0.92.0"; + src = fetchurl { + url = "https://registry.npmjs.org/three/-/three-0.92.0.tgz"; + sha1 = "8d3d1f5af890e62da7f4cb45d20c09fa51057dcd"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "JavaScript 3D library"; + homepage = https://threejs.org/; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; + mathjax = nodeEnv.buildNodePackage { + name = "mathjax"; + packageName = "mathjax"; + version = "2.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mathjax/-/mathjax-2.7.4.tgz"; + sha512 = "37hnj84ls531nqjxr4r6k4bjbqz4zqpb9adg7k6klah8dlj3rh38j4p8mbjh4h0v7r575kkc528rspincfabpm4j8y5v68kh6v8p907"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Beautiful math in all browsers. MathJax is an open-source JavaScript display engine for LaTeX, MathML, and AsciiMath notation that works in all browsers."; + homepage = "https://github.com/mathjax/MathJax#readme"; + license = "Apache-2.0"; + }; + production = true; + bypassCache = true; + }; } \ No newline at end of file diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 42afec7e439d7..da9383c4e95bd 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,35 +1,47 @@ -{ stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, - js_of_ocaml, react, lwt, calendar, cryptokit, tyxml, - ipaddr, ocamlnet, ssl, ocaml_pcre, ocaml_optcomp, - reactivedata, opam, ppx_tools, ppx_deriving, findlib -, ocamlbuild +{ stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, camlp4, + js_of_ocaml, lwt_react, cryptokit, + ipaddr, ocamlnet, lwt_ssl, ocaml_pcre, + opam, ppx_tools, ppx_deriving, findlib +, js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json +, js_of_ocaml-lwt +, js_of_ocaml-tyxml }: -assert stdenv.lib.versionAtLeast ocaml.version "4.02"; +assert stdenv.lib.versionAtLeast ocaml.version "4.03"; stdenv.mkDerivation rec { pname = "eliom"; - version = "6.2.0"; + version = "6.3.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz"; - sha256 = "01c4l982ld6d1ndhb6f15ldb2li7mv0bs279d5gs99mpiwsapadx"; + sha256 = "137hgdzv9fwkzf6xdksqy437lrf8xvrycf5jwc3z4cmpsigs6x7v"; }; patches = [ ./camlp4.patch ]; - buildInputs = [ ocaml which findlib ocamlbuild ocaml_optcomp opam ppx_tools ]; + buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json opam ppx_tools + ocsigen_deriving + ]; - propagatedBuildInputs = [ lwt reactivedata tyxml ipaddr ocsigen_server ppx_deriving - ocsigen_deriving js_of_ocaml - calendar cryptokit ocamlnet react ssl ocaml_pcre ]; + propagatedBuildInputs = [ + camlp4 + cryptokit + ipaddr + js_of_ocaml-lwt + js_of_ocaml-ppx + js_of_ocaml-tyxml + lwt_react + lwt_ssl + ocamlnet ocaml_pcre + ocsigen_server + ppx_deriving + ]; installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR"; - createFindlibDestdir = true; - setupHook = [ ./setup-hook.sh ]; meta = { diff --git a/pkgs/development/ocaml-modules/git-http/default.nix b/pkgs/development/ocaml-modules/git-http/default.nix index 5b93b96076584..5e757b5b6727b 100644 --- a/pkgs/development/ocaml-modules/git-http/default.nix +++ b/pkgs/development/ocaml-modules/git-http/default.nix @@ -1,10 +1,12 @@ -{ stdenv, ocaml, findlib, jbuilder, git, cohttp-lwt }: +{ stdenv, ocaml, findlib, jbuilder, git, cohttp-lwt +, alcotest, mtime, nocrypto +}: stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-git-http-${version}"; inherit (git) version src; - buildInputs = [ ocaml findlib jbuilder ]; + buildInputs = [ ocaml findlib jbuilder alcotest mtime nocrypto ]; propagatedBuildInputs = [ git cohttp-lwt ]; @@ -12,6 +14,9 @@ stdenv.mkDerivation rec { inherit (jbuilder) installPhase; + doCheck = true; + checkPhase = "jbuilder runtest -p git-http"; + meta = { description = "Client implementation of the “Smart” HTTP Git protocol in pure OCaml"; inherit (git.meta) homepage license maintainers platforms; diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix index 9347c6ad00cdc..6f0f0d0b120b8 100644 --- a/pkgs/development/ocaml-modules/git/default.nix +++ b/pkgs/development/ocaml-modules/git/default.nix @@ -1,19 +1,20 @@ { stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, opam , astring, decompress, fmt, hex, logs, mstruct, ocaml_lwt, ocamlgraph, uri +, alcotest, mtime, nocrypto }: stdenv.mkDerivation rec { - version = "1.11.4"; + version = "1.11.5"; name = "ocaml${ocaml.version}-git-${version}"; src = fetchFromGitHub { owner = "mirage"; repo = "ocaml-git"; rev = version; - sha256 = "182b6shcfcq50r5snm01hwalnmck43x1xgdd4fvjb6q78pbwag2x"; + sha256 = "0r1bxpxjjnl9hh8xbabsxl7svzvd19hfy73a2y1m4kljmw64dpfh"; }; - buildInputs = [ ocaml findlib jbuilder ]; + buildInputs = [ ocaml findlib jbuilder alcotest mtime nocrypto ]; propagatedBuildInputs = [ astring decompress fmt hex logs mstruct ocaml_lwt ocamlgraph uri ]; @@ -21,6 +22,9 @@ stdenv.mkDerivation rec { inherit (jbuilder) installPhase; + doCheck = true; + checkPhase = "jbuilder runtest -p git"; + meta = { description = "Git format and protocol in pure OCaml"; license = stdenv.lib.licenses.isc; diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index 081f9edbecf94..efbb12304970f 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, ocaml, findlib, which, react, ssl, -lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib, +{ stdenv, fetchurl, ocaml, findlib, which, react, ssl +, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib, libev, openssl, ocaml_sqlite3, tree, uutf, makeWrapper, camlp4 -, camlzip, pgocaml +, camlzip, pgocaml, lwt2, lwt_react, lwt_ssl }: let mkpath = p: n: @@ -9,17 +9,32 @@ let mkpath = p: n: "${p}/lib/ocaml/${v}/site-lib/${n}"; in +let param = + if stdenv.lib.versionAtLeast ocaml.version "4.03" then { + version = "2.9"; + sha256 = "0na3qa4h89f2wv31li63nfpg4151d0g8fply0bq59j3bhpyc85nd"; + buildInputs = [ lwt_react lwt_ssl ]; + ldpath = ""; + } else { + version = "2.8"; + sha256 = "1v44qv2ixd7i1qinyhlzzqiffawsdl7xhhh6ysd7lf93kh46d5sy"; + buildInputs = [ lwt2 ]; + ldpath = "${mkpath lwt2 "lwt"}"; + } +; in + stdenv.mkDerivation { - name = "ocsigenserver-2.8"; + name = "ocsigenserver-${param.version}"; src = fetchurl { - url = https://github.com/ocsigen/ocsigenserver/archive/2.8.tar.gz; - sha256 = "1v44qv2ixd7i1qinyhlzzqiffawsdl7xhhh6ysd7lf93kh46d5sy"; + url = "https://github.com/ocsigen/ocsigenserver/archive/${param.version}.tar.gz"; + inherit (param) sha256; }; - buildInputs = [ocaml which findlib react ssl lwt + buildInputs = [ocaml which findlib react ssl ocamlnet ocaml_pcre cryptokit tyxml ipaddr zlib libev openssl - ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml camlzip ]; + ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml camlzip ] + ++ (param.buildInputs or []); configureFlags = "--root $(out) --prefix /"; @@ -31,7 +46,7 @@ stdenv.mkDerivation { '' rm -rf $out/var/run wrapProgram $out/bin/ocsigenserver \ - --prefix CAML_LD_LIBRARY_PATH : "${mkpath ssl "ssl"}:${mkpath lwt "lwt"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}" + --prefix CAML_LD_LIBRARY_PATH : "${mkpath ssl "ssl"}:${param.ldpath}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}" ''; dontPatchShebangs = true; diff --git a/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/pkgs/development/ocaml-modules/ocsigen-start/default.nix index 13794602af4f8..ba7e3e93c9899 100644 --- a/pkgs/development/ocaml-modules/ocsigen-start/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-start/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, buildOcaml, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ojquery, magick, ocsigen_deriving, ocsigen_server }: +{ stdenv, fetchurl, buildOcaml, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ocsigen_deriving, ocsigen_server +, js_of_ocaml-camlp4 +}: buildOcaml rec { name = "ocsigen-start"; - version = "1.0.0"; + version = "1.1.0"; - buildInputs = [ eliom ]; - propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ojquery ocsigen_deriving ocsigen_server magick ]; + buildInputs = [ eliom js_of_ocaml-camlp4 ]; + propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ocsigen_deriving ocsigen_server ]; patches = [ ./templates-dir.patch ]; @@ -16,7 +18,7 @@ buildOcaml rec src = fetchurl { url = "https://github.com/ocsigen/${name}/archive/${version}.tar.gz"; - sha256 = "0npc2iq39ixci6ly0fssklv07zqi5cfa1adad4hm8dbzjawkqqll"; + sha256 = "09cw6qzcld0m1qm66mbjg9gw8l6dynpw3fzhm3kfx5ldh0afgvjq"; }; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix index 00416c92bb94d..556c343241c31 100644 --- a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, buildOcaml, ocaml, eliom, opam }: +{ stdenv, fetchurl, buildOcaml, ocaml, opam +, calendar, eliom, js_of_ocaml-ppx_deriving_json +}: buildOcaml rec { name = "ocsigen-toolkit"; - version = "1.0.0"; + version = "1.1.0"; - propagatedBuildInputs = [ eliom ]; + propagatedBuildInputs = [ calendar eliom js_of_ocaml-ppx_deriving_json ]; buildInputs = [ opam ]; - createFindlibDestdir = true; - installPhase = '' export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH @@ -18,7 +18,7 @@ buildOcaml rec ''; src = fetchurl { - sha256 = "0wm4fnss7vlkd03ybgfrk63kpip6m6p6kdqjn3f64n11256mwzj2"; + sha256 = "1i5806gaqqllgsgjz3lf9fwlffqg3vfl49msmhy7xvq2sncbxp8a"; url = "https://github.com/ocsigen/${name}/archive/${version}.tar.gz"; }; diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix new file mode 100644 index 0000000000000..0211fef16060e --- /dev/null +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -0,0 +1,19 @@ +{ lib, stdenv, buildPythonPackage, fetchPypi, aiohttp }: + +buildPythonPackage rec { + pname = "aiohue"; + version = "1.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "05b2fj8pzbij8hglx6p5ckfx0h1b7wcfpys306l853vp56d882yh"; + }; + + propagatedBuildInputs = [ aiohttp ]; + + meta = with lib; { + description = "asyncio package to talk to Philips Hue"; + homepage = https://github.com/balloob/aiohue; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/coinmarketcap/default.nix b/pkgs/development/python-modules/coinmarketcap/default.nix new file mode 100644 index 0000000000000..52afdee46ab7f --- /dev/null +++ b/pkgs/development/python-modules/coinmarketcap/default.nix @@ -0,0 +1,19 @@ +{ lib, stdenv, buildPythonPackage, fetchPypi, requests-cache }: + +buildPythonPackage rec { + pname = "coinmarketcap"; + version = "4.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0bk530cmfqri84m9386ydn3f89gq23nxylvnl523gr5589vw54bj"; + }; + + propagatedBuildInputs = [ requests-cache ]; + + meta = with lib; { + description = "A python wrapper around the https://coinmarketcap.com API."; + homepage = https://github.com/barnumbirr/coinmarketcap; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/neovim/default.nix b/pkgs/development/python-modules/neovim/default.nix index 646a8e7bb112c..6d96732cbb078 100644 --- a/pkgs/development/python-modules/neovim/default.nix +++ b/pkgs/development/python-modules/neovim/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "neovim"; - version = "0.2.4"; + version = "0.2.6"; src = fetchPypi { inherit pname version; - sha256 = "0accfgyvihs08bwapgakx6w93p4vbrq2448n2z6gw88m2hja9jm3"; + sha256 = "0xlj54w9bnmq4vidk6r08hwa6az7drahi08w1qf4j9q45rs8mrbc"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 47a154a529c7d..5f1c1b7670403 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.9.3"; + version = "8.9.5"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "68f7402c6d2646adff4df895471f2b47fd61d0cf57c59a06aacc88dfff04a1cb"; + sha256 = "09swdf3f9sdvqyyzkap93012m9fnhamizf42d5kzpdjwikvsfx8x"; }; meta = { diff --git a/pkgs/development/python-modules/pymvglive/default.nix b/pkgs/development/python-modules/pymvglive/default.nix new file mode 100644 index 0000000000000..1263c498a46b3 --- /dev/null +++ b/pkgs/development/python-modules/pymvglive/default.nix @@ -0,0 +1,19 @@ +{ lib, stdenv, buildPythonPackage, fetchPypi, requests }: + +buildPythonPackage rec { + pname = "PyMVGLive"; + version = "1.1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0sh4xm74im9qxzpbrlc5h1vnpgvpybnpvdcav1iws0b561zdr08c"; + }; + + propagatedBuildInputs = [ requests ]; + + meta = with lib; { + description = "get live-data from mvg-live.de"; + homepage = https://github.com/pc-coholic/PyMVGLive; + license = licenses.free; + }; +} diff --git a/pkgs/development/python-modules/pyowm/default.nix b/pkgs/development/python-modules/pyowm/default.nix new file mode 100644 index 0000000000000..26606a580a4d8 --- /dev/null +++ b/pkgs/development/python-modules/pyowm/default.nix @@ -0,0 +1,19 @@ +{ lib, stdenv, buildPythonPackage, fetchPypi, requests }: + +buildPythonPackage rec { + pname = "pyowm"; + version = "2.8.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0y2r322pcamabar70513pbyiq26x33l1aq9cim6k30lk9p4aq310"; + }; + + propagatedBuildInputs = [ requests ]; + + meta = with lib; { + description = "A Python wrapper around the OpenWeatherMap web API"; + homepage = https://pyowm.readthedocs.io/; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index a510eedee4fda..c8376196d3ac7 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -1,8 +1,31 @@ -{ buildPythonPackage, fetchFromGitHub, lib, numpy, pyyaml, cffi, cmake, - git, stdenv }: +{ buildPythonPackage, + cudaSupport ? false, cudatoolkit ? null, cudnn ? null, + fetchFromGitHub, fetchpatch, lib, numpy, pyyaml, cffi, cmake, + git, stdenv, linkFarm, symlinkJoin, + utillinux, which }: -buildPythonPackage rec { - version = "0.2.0"; +assert cudnn == null || cudatoolkit != null; +assert !cudaSupport || cudatoolkit != null; + +let + cudatoolkit_joined = symlinkJoin { + name = "${cudatoolkit.name}-unsplit"; + paths = [ cudatoolkit.out cudatoolkit.lib ]; + }; + + # Normally libcuda.so.1 is provided at runtime by nvidia-x11 via + # LD_LIBRARY_PATH=/run/opengl-driver/lib. We only use the stub + # libcuda.so from cudatoolkit for running tests, so that we don’t have + # to recompile pytorch on every update to nvidia-x11 or the kernel. + cudaStub = linkFarm "cuda-stub" [{ + name = "libcuda.so.1"; + path = "${cudatoolkit}/lib/stubs/libcuda.so"; + }]; + cudaStubEnv = lib.optionalString cudaSupport + "LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} "; + +in buildPythonPackage rec { + version = "0.3.1"; pname = "pytorch"; name = "${pname}-${version}"; @@ -10,18 +33,41 @@ buildPythonPackage rec { owner = "pytorch"; repo = "pytorch"; rev = "v${version}"; - sha256 = "1s3f46ga1f4lfrcj3lpvvhgkdr1pi8i2hjd9xj9qiz3a9vh2sj4n"; + fetchSubmodules = true; + sha256 = "1k8fr97v5pf7rni5cr2pi21ixc3pdj3h3lkz28njbjbgkndh7mr3"; }; - checkPhase = '' - ${stdenv.shell} test/run_test.sh + patches = [ + (fetchpatch { + # make sure stdatomic.h is included when checking for ATOMIC_INT_LOCK_FREE + # Fixes this test failure: + # RuntimeError: refcounted file mapping not supported on your system at /tmp/nix-build-python3.6-pytorch-0.3.0.drv-0/source/torch/lib/TH/THAllocator.c:525 + url = "https://github.com/pytorch/pytorch/commit/502aaf39cf4a878f9e4f849e5f409573aa598aa9.patch"; + stripLen = 3; + extraPrefix = "torch/lib/"; + sha256 = "1miz4lhy3razjwcmhxqa4xmlcmhm65lqyin1czqczj8g16d3f62f"; + }) + ]; + + postPatch = '' + substituteInPlace test/run_test.sh --replace \ + "INIT_METHOD='file://'\$TEMP_DIR'/shared_init_file' \$PYCMD ./test_distributed.py" \ + "echo Skipped for Nix package" + ''; + + preConfigure = lib.optionalString cudaSupport '' + export CC=${cudatoolkit.cc}/bin/gcc + '' + lib.optionalString (cudaSupport && cudnn != null) '' + export CUDNN_INCLUDE_DIR=${cudnn}/include ''; buildInputs = [ cmake git numpy.blas - ]; + utillinux + which + ] ++ lib.optionals cudaSupport [cudatoolkit_joined cudnn]; propagatedBuildInputs = [ cffi @@ -29,8 +75,8 @@ buildPythonPackage rec { pyyaml ]; - preConfigure = '' - export NO_CUDA=1 + checkPhase = '' + ${cudaStubEnv}${stdenv.shell} test/run_test.sh ''; meta = { diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 005d02e60472a..f33acc79a2bb0 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchurl, glibcLocales, mock, pytest, botocore, +{ stdenv, buildPythonPackage, fetchurl, glibcLocales, mock, pytest, botocore, testfixtures, pillow, six, twisted, w3lib, lxml, queuelib, pyopenssl, service-identity, parsel, pydispatcher, cssselect, lib }: buildPythonPackage rec { @@ -20,8 +20,9 @@ buildPythonPackage rec { LC_ALL="en_US.UTF-8"; checkPhase = '' - py.test --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py + py.test --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py ${lib.optionalString stdenv.isDarwin "--ignore=tests/test_utils_iterators.py"} # The ignored tests require mitmproxy, which depends on protobuf, but it's disabled on Python3 + # Ignore iteration test, because lxml can't find encodings on darwin https://bugs.launchpad.net/lxml/+bug/707396 ''; src = fetchurl { @@ -34,6 +35,6 @@ buildPythonPackage rec { homepage = http://scrapy.org/; license = licenses.bsd3; maintainers = with maintainers; [ drewkett ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/supervise_api/default.nix b/pkgs/development/python-modules/supervise_api/default.nix index f73aba0a5f9a7..35600357d2cc2 100644 --- a/pkgs/development/python-modules/supervise_api/default.nix +++ b/pkgs/development/python-modules/supervise_api/default.nix @@ -4,17 +4,16 @@ , supervise , isPy3k , whichcraft +, utillinux }: buildPythonPackage rec { pname = "supervise_api"; - version = "0.4.0"; - - name = "${pname}-${version}"; + version = "0.5.3"; src = fetchPypi { inherit pname version; - sha256 = "029h1mlfhkm9lw043rawh24ld8md620y94k6c1l9hs5vvyq4fs84"; + sha256 = "0dakc1h2ih1bw67y137wp0vph8d3y2lx5d70b8dgggy1zbpqxl1m"; }; propagatedBuildInputs = [ @@ -22,9 +21,7 @@ buildPythonPackage rec { ] ++ lib.optionals ( !isPy3k ) [ whichcraft ]; - - # no tests - doCheck = false; + checkInputs = [ utillinux ]; meta = { description = "An API for running processes safely and securely"; diff --git a/pkgs/development/python-modules/yowsup/argparse-dependency.patch b/pkgs/development/python-modules/yowsup/argparse-dependency.patch index 364f0054fe784..e2b9f0c9a74cc 100644 --- a/pkgs/development/python-modules/yowsup/argparse-dependency.patch +++ b/pkgs/development/python-modules/yowsup/argparse-dependency.patch @@ -1,13 +1,13 @@ diff --git a/setup.py b/setup.py -index 053ed07..60f0d9a 100755 +index 991e89c..7a96ccf 100755 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ import yowsup import platform import sys --deps = ['python-dateutil', 'argparse', 'python-axolotl>=0.1.39', 'six'] +-deps = ['python-dateutil', 'argparse', 'python-axolotl>=0.1.39', 'six==1.10'] +deps = ['python-dateutil', 'python-axolotl>=0.1.39', 'six'] if sys.version_info < (2,7): - deps += ['importlib'] + deps += ['importlib', "protobuf==3.4.0"] diff --git a/pkgs/development/python-modules/yowsup/default.nix b/pkgs/development/python-modules/yowsup/default.nix index f7ee986aebb31..5fa4af18c089f 100644 --- a/pkgs/development/python-modules/yowsup/default.nix +++ b/pkgs/development/python-modules/yowsup/default.nix @@ -3,19 +3,18 @@ }: buildPythonPackage rec { - name = "${pname}-${version}"; pname = "yowsup"; - version = "2.5.2"; + version = "2.5.7"; - # python2 is currently incompatible with yowsup: - # https://github.com/tgalal/yowsup/issues/2325#issuecomment-343516519 + # The Python 2.x support of this package is incompatible with `six==1.11`: + # https://github.com/tgalal/yowsup/issues/2416#issuecomment-365113486 disabled = !isPy3k; src = fetchFromGitHub { owner = "tgalal"; repo = "yowsup"; rev = "v${version}"; - sha256 = "16l8jmr32wwvl11m0a4r4id3dkfqj2n7dn6gky1077xwmj2da4fl"; + sha256 = "1p0hdj5x38v2cxjnhdnqcnp5g7la57mbi365m0z83wa01x2n73w6"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 593fe6c159b25..d5eaa24c16751 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { - version = "0.11.1"; + version = "0.12.0"; meta = with stdenv.lib; { homepage = "https://github.com/bazelbuild/bazel/"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "e8d762bcc01566fa50952c8028e95cfbe7545a39b8ceb3a0d0d6df33b25b333f"; + sha256 = "3b3e7dc76d145046fdc78db7cac9a82bc8939d3b291e53a7ce85315feb827754"; }; sourceRoot = "."; diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index ae540104df3a9..ed73d26768a4c 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -14,11 +14,11 @@ let package = pythonPackages.buildPythonApplication rec { name = "${pname}-${version}"; pname = "buildbot"; - version = "1.1.0"; + version = "1.1.1"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1rhmlcvw0dsr4f37sb3xmb9xcn76lsrsw2g1z611g339nmxzi0sc"; + sha256 = "1vcmanx3ma3cfyiddjcmsnx6qmxd3m5blqax04rcsiq2zq4dmzir"; }; buildInputs = with pythonPackages; [ diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix index 35c8ed8c71cd9..c8a12c1926473 100644 --- a/pkgs/development/tools/build-managers/buildbot/plugins.nix +++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix @@ -11,7 +11,7 @@ src = pythonPackages.fetchPypi { inherit pname version format; - sha256 = "0nmrq50c5ib185rpb8ai1mm7gjq2mjvxik1kqrjfa62i1ia9ikyj"; + sha256 = "01v9w8iy9q6fwrmz6db7fanjixax7whn74k67bj0czrbjjkpfzvb"; }; meta = with stdenv.lib; { @@ -29,7 +29,7 @@ src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1laz7l7cbbz0czb6skxw314bd2qk2f63qw3n2rs7m7v11gd9cdll"; + sha256 = "1cwxkzpgwzk9b361rj980bbnmhzzsr46pgf94zqpg3na8xm6hpwj"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; @@ -49,7 +49,7 @@ src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0mmri8c4n1zwxc1dx2a11yllrmnwqqxjvvil9224lbs98mpchppi"; + sha256 = "0ival58f50128315d0nck63pzya2zm7q6hvgmxfbjl0my8il9p2l"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; @@ -69,7 +69,7 @@ src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0nwlw2m3qfifia6gy3d4lrnycra50k98ax071p2zjqknanh563vr"; + sha256 = "0jiwfb699nqbmpcm88y187ig4ha6p7d4v98mjwa9blhm54dk8kh1"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; @@ -89,7 +89,7 @@ src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1zml9bd910zwcby4vr3lmzap2grinha2w5zgb2cmixmz7hfrqswp"; + sha256 = "00mfn24gbwr2p3n7nsijzv949l7hiksiafhma18nnh40r8f4l5f2"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix index 59d3c93bb8775..b1cfb6aeaf2f0 100644 --- a/pkgs/development/tools/build-managers/buildbot/worker.nix +++ b/pkgs/development/tools/build-managers/buildbot/worker.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonApplication (rec { name = "${pname}-${version}"; pname = "buildbot-worker"; - version = "1.1.0"; + version = "1.1.1"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0hpiawf0dq8phsvihlcx9bpl70n7s3rhcgbgma36bark6sgr4y8y"; + sha256 = "02xfzlcy3cnvc3cmpl9gs6209a3qm71yz5pahbws9jcyhv6fbrrm"; }; buildInputs = with pythonPackages; [ setuptoolsTrial mock ]; diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix index 3c87abbdce979..cb203a431d4bf 100644 --- a/pkgs/development/tools/icestorm/default.nix +++ b/pkgs/development/tools/icestorm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "icestorm-${version}"; - version = "2018.03.21"; + version = "2018.05.03"; src = fetchFromGitHub { owner = "cliffordwolf"; repo = "icestorm"; - rev = "4476d83f76fa0222be0b691fe27c1e0228266f82"; - sha256 = "1r43vwwz61rvdpc3kylg8yzv0flz9p4j3yc1cc4h904zsdwjx39a"; + rev = "237280ce44f72c7b2e1ca671d5113dba34cc4fca"; + sha256 = "0r9xh024snaf1g2r5k524yl6lvf5rkfhqwjzcixh1m12012i5hrh"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix index c7cc054397631..39677ba719e2a 100644 --- a/pkgs/development/tools/java/cfr/default.nix +++ b/pkgs/development/tools/java/cfr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cfr-${version}"; - version = "0_125"; + version = "0.128"; src = fetchurl { url = "http://www.benf.org/other/cfr/cfr_${version}.jar"; - sha256 = "1ad9ddg79cybv8j8l3mm67znyw54z5i55x4m9n239fn26p1ndawa"; + sha256 = "09mx1f6d1p57q5r05nvgm1xrhqv34n7v7rwq875whb441h1dnsix"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index 2b26383ed3101..9c0c357e18676 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { name = "fswatch-${version}"; - version = "1.11.2"; + version = "1.11.3"; src = fetchFromGitHub { owner = "emcrisostomo"; repo = "fswatch"; rev = version; - sha256 = "05vgpd1fx9fy3vnnmq5gz236avgva82axix127xy98gaxrac52vq"; + sha256 = "1w83bpgx0wsgn70jyxwrvh9dsivrq41ifcignjzdxdwz9j0rwhh1"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/tools/mypy/default.nix b/pkgs/development/tools/mypy/default.nix index fd21a8a23d342..d021f994e491f 100644 --- a/pkgs/development/tools/mypy/default.nix +++ b/pkgs/development/tools/mypy/default.nix @@ -2,14 +2,14 @@ buildPythonApplication rec { pname = "mypy"; - version = "0.590"; + version = "0.600"; # Tests not included in pip package. doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "0ynyrrj0wjyw130ay9x1ca88lbhbblp06bfsjrpzbcvp4grgxgq4"; + sha256 = "1pd3kkz435wlvi9fwqbi3xag5zs59jcjqi6c9gzdjdn23friq9dw"; }; propagatedBuildInputs = [ lxml typed-ast psutil ]; diff --git a/pkgs/development/tools/ocaml/jbuilder/default.nix b/pkgs/development/tools/ocaml/jbuilder/default.nix index d48bc4101113b..38fd4323d5ca0 100644 --- a/pkgs/development/tools/ocaml/jbuilder/default.nix +++ b/pkgs/development/tools/ocaml/jbuilder/default.nix @@ -2,16 +2,18 @@ stdenv.mkDerivation rec { name = "jbuilder-${version}"; - version = "1.0+beta17"; + version = "1.0+beta20"; src = fetchFromGitHub { owner = "ocaml"; repo = "dune"; rev = "${version}"; - sha256 = "04pyry459hp2r2s9m5xkcq1glzp20ddz5wb1w8nzp3zgygy0431x"; + sha256 = "0571lzm8caq6wnia7imgy4a27x5l2bvxiflg0jrwwml0ylnii65f"; }; buildInputs = [ ocaml ]; + dontAddPrefix = true; + installPhase = "${opam}/bin/opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR"; preFixup = "rm -rf $out/jbuilder"; diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/development/tools/rust/cargo-fuzz/default.nix new file mode 100644 index 0000000000000..cc5d90b223d6d --- /dev/null +++ b/pkgs/development/tools/rust/cargo-fuzz/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, fetchurl, runCommand, rustPlatform }: + +rustPlatform.buildRustPackage rec { + name = "cargo-fuzz-${version}"; + version = "0.5.3"; # Note to self: on 0.5.4, remove the hand-added Cargo.lock + + src = + let + source = fetchFromGitHub { + owner = "rust-fuzz"; + repo = "cargo-fuzz"; + rev = version; + sha256 = "1l452fnjw7i10nrd4y4rssi5d457vgjp6rhdr9cnq32bjhdkprrs"; + }; + cargo-lock = fetchurl { + url = "https://gist.githubusercontent.com/Ekleog/7d5b62d13b7207aafa4c37d1bbdf2de7/raw/c6027fc1c531947f4d6836a3c4cba1b3e24df24c/Cargo.lock"; + sha256 = "0d7b6kxfbfvwksybzrihylamg2zv5fmsk9m6xshryhwipskzzvmd"; + }; + in + runCommand "cargo-fuzz-src" {} '' + cp -R ${source} $out + chmod +w $out + cp ${cargo-lock} $out/Cargo.lock + ''; + + cargoSha256 = "0ajm8qp8hi7kn7199ywv26cmjv13phxv72lz8kcq97hxg17x0dkk"; + + meta = with stdenv.lib; { + description = "Command line helpers for fuzzing"; + homepage = https://github.com/rust-fuzz/cargo-fuzz; + license = with licenses; [ mit asl20 ]; + maintainers = [ maintainers.ekleog ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/wllvm/default.nix b/pkgs/development/tools/wllvm/default.nix index c78767e115a2b..399a8e66860b0 100644 --- a/pkgs/development/tools/wllvm/default.nix +++ b/pkgs/development/tools/wllvm/default.nix @@ -1,13 +1,13 @@ { stdenv, python3Packages }: python3Packages.buildPythonApplication rec { - version = "1.1.5"; + version = "1.2.0"; pname = "wllvm"; name = "${pname}-${version}"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "02lnilhqz7mq0w6mp574rmjxiszp1wyla16jqr89r0z9vjg2j9rv"; + sha256 = "1hriyv5gfkcxjqk71l3030qfy3scsjr3mp12hkxfknh65inlqs5z"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 4e5596fee6613..6d1eb0dbe3eba 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -15,11 +15,11 @@ let runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl openssl nghttp2 ]; in stdenv.mkDerivation rec { name = "insomnia-${version}"; - version = "5.16.1"; + version = "5.16.2"; src = fetchurl { url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb"; - sha256 = "0r1l7pfcnif8vw9jnxbh5p9sih6wvgjpx8rpfmnvw21pr8cm0zyp"; + sha256 = "1sjcbi45n10lf69a48447lfbxxjib7v2isshaykz43qqasqqrd18"; }; nativeBuildInputs = [ makeWrapper dpkg ]; diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix index 332e84402bb17..e6d23cf1b9f0f 100644 --- a/pkgs/games/bzflag/default.nix +++ b/pkgs/games/bzflag/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "bzflag"; - version = "2.4.12"; + version = "2.4.14"; src = fetchurl { url = "https://download.bzflag.org/${pname}/source/${version}/${name}.tar.bz2"; - sha256 = "0380y47kgl97ld3dybjgjr2zwxqky8f938k9z7vad647cic3m8d8"; + sha256 = "1p4vaap8msk7cfqkcc2nrchw7pp4inbyx706zmlwnmpr9k0nx909"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index d3128210a1be1..81ffd6b135fc1 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -1,35 +1,28 @@ -{ stdenv, fetchurl, cmake, pkgconfig, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf -, pango, gettext, boost, freetype, libvorbis, fribidi, dbus, libpng, pcre -, makeWrapper, enableTools ? false +{ stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf +, pango, gettext, boost, freetype, libvorbis, fribidi, dbus, libpng, pcre, openssl, icu +, enableTools ? false }: stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.12.6"; + version = "1.14.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "0kifp6g1dsr16m6ngjq2hx19h851fqg326ps3krnhpyix963h3x5"; + sha256 = "09niq53y17faizhmd98anx3dha7hvacvj9a0a64lg8wn915cm0bw"; }; - nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; + nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext boost - libvorbis fribidi dbus libpng pcre ]; + buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf pango gettext boost + libvorbis fribidi dbus libpng pcre openssl icu ]; cmakeFlags = [ "-DENABLE_TOOLS=${if enableTools then "ON" else "OFF"}" ]; enableParallelBuilding = true; - # Wesnoth doesn't support input frameworks and Unicode input breaks when they are enabled. - postInstall = '' - for i in $out/bin/*; do - wrapProgram "$i" --unset XMODIFIERS - done - ''; - meta = with stdenv.lib; { description = "The Battle for Wesnoth, a free, turn-based strategy game with a fantasy theme"; longDescription = '' @@ -42,7 +35,7 @@ stdenv.mkDerivation rec { homepage = http://www.wesnoth.org/; license = licenses.gpl2; - maintainers = with maintainers; [ kkallio abbradar ]; - platforms = platforms.unix; + maintainers = with maintainers; [ abbradar ]; + platforms = platforms.linux; }; } diff --git a/pkgs/games/wesnoth/dev.nix b/pkgs/games/wesnoth/dev.nix deleted file mode 100644 index 81ffd6b135fc1..0000000000000 --- a/pkgs/games/wesnoth/dev.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf -, pango, gettext, boost, freetype, libvorbis, fribidi, dbus, libpng, pcre, openssl, icu -, enableTools ? false -}: - -stdenv.mkDerivation rec { - pname = "wesnoth"; - version = "1.14.0"; - - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "09niq53y17faizhmd98anx3dha7hvacvj9a0a64lg8wn915cm0bw"; - }; - - nativeBuildInputs = [ cmake pkgconfig ]; - - buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf pango gettext boost - libvorbis fribidi dbus libpng pcre openssl icu ]; - - cmakeFlags = [ "-DENABLE_TOOLS=${if enableTools then "ON" else "OFF"}" ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "The Battle for Wesnoth, a free, turn-based strategy game with a fantasy theme"; - longDescription = '' - The Battle for Wesnoth is a Free, turn-based tactical strategy - game with a high fantasy theme, featuring both single-player, and - online/hotseat multiplayer combat. Fight a desperate battle to - reclaim the throne of Wesnoth, or take hand in any number of other - adventures. - ''; - - homepage = http://www.wesnoth.org/; - license = licenses.gpl2; - maintainers = with maintainers; [ abbradar ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 0b71797eeec83..e064609941500 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { ++ lib.optional pulseaudioSupport pkgs.libpulseaudio ++ lib.optional xineramaSupport pkgs.xorg.libXinerama ++ lib.optional udevSupport pkgs.udev + ++ lib.optional vulkanSupport pkgs.vulkan-loader ++ lib.optionals gstreamerSupport (with pkgs.gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ]) ++ lib.optionals gtkSupport [ pkgs.gtk3 pkgs.glib ] ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ] diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 91fb0da82d8a4..ca67ca836ba01 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -40,7 +40,9 @@ pulseaudioSupport ? false, udevSupport ? false, xineramaSupport ? false, - xmlSupport ? false }: + xmlSupport ? false, + vulkanSupport ? false, +}: let wine-build = build: release: lib.getAttr build (callPackage ./packages.nix { @@ -51,7 +53,7 @@ let wine-build = build: release: netapiSupport cursesSupport vaSupport pcapSupport v4lSupport saneSupport gsmSupport gphoto2Support ldapSupport fontconfigSupport alsaSupport pulseaudioSupport xineramaSupport gtkSupport openclSupport xmlSupport tlsSupport - openglSupport gstreamerSupport udevSupport; + openglSupport gstreamerSupport udevSupport vulkanSupport; }; }); diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index f86e34a5d5420..817241fbe0fe9 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -39,16 +39,16 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "3.5"; + version = "3.7"; url = "https://dl.winehq.org/wine/source/3.x/wine-${version}.tar.xz"; - sha256 = "0hr1syfhnpvcm84gmms1i26k68hakcgw4m6dvckmbbvw7ca0c8pl"; + sha256 = "1drbzk3y0m14lkq3vzwwkvain5shykgcbmyzh6gcb5r4sxh3givn"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-compholio/wine-staging/releases inherit (unstable) version; - sha256 = "0kcwg7w79zbsg29b9ma9mapzhj9dg7z0vccy4a35fx04044xj0zn"; + sha256 = "0kam73jqhah7bzji5csxxhhfdp6byhzpcph6xnzjqz2aic5xk7xi"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix index c0c67eeb6abe9..f524c7d95792b 100644 --- a/pkgs/misc/themes/adapta/default.nix +++ b/pkgs/misc/themes/adapta/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "adapta-gtk-theme-${version}"; - version = "3.93.0.258"; + version = "3.93.1.1"; src = fetchFromGitHub { owner = "adapta-project"; repo = "adapta-gtk-theme"; rev = version; - sha256 = "114rryaqr97f7qlwxn3fdspzigxx1jgpsbhypdn265511rsh30hx"; + sha256 = "00k67qpq62swz7p6dk4g8ak31h97lxyddpyr6xii1jpbygwkk9zc"; }; preferLocalBuild = true; diff --git a/pkgs/misc/themes/obsidian2/default.nix b/pkgs/misc/themes/obsidian2/default.nix new file mode 100644 index 0000000000000..41f29f34be884 --- /dev/null +++ b/pkgs/misc/themes/obsidian2/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, gtk-engine-murrine }: + +stdenv.mkDerivation rec { + name = "theme-obsidian2-${version}"; + version = "2.5"; + + src = fetchFromGitHub { + owner = "madmaxms"; + repo = "theme-obsidian-2"; + rev = "v${version}"; + sha256 = "12jya1gzmhpfh602vbf51vi69fmis7sanvx278h3skm03a7civlv"; + }; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + + installPhase = '' + mkdir -p $out/share/themes + cp -a Obsidian-2 $out/share/themes + ''; + + meta = with stdenv.lib; { + description = "Gnome theme, based upon Adwaita-Maia dark skin"; + homepage = https://github.com/madmaxms/theme-obsidian-2; + license = with licenses; [ gpl3 ]; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix index c537aa8a1f92d..c29611c0c662d 100644 --- a/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchurl, vscode-utils, unzip, dos2unix, mono46, clang-tools, writeScript -, gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise. +{ stdenv, lib, fetchurl, fetchzip, vscode-utils, jq, mono46, clang-tools, writeScript +, gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise. }: assert gdbUseFixed -> null != gdb; @@ -33,13 +33,11 @@ let langComponentBinaries = stdenv.mkDerivation { name = "cpptools-language-component-binaries"; - src = fetchurl { - url = https://download.visualstudio.microsoft.com/download/pr/11151953/d3cc8b654bffb8a2f3896d101f3c3155/Bin_Linux.zip; - sha256 = "12qbxsrdc73cqjb84xdck1xafzhfkcyn6bqbpcy1bxxr3b7hxbii"; + src = fetchzip { + url = https://download.visualstudio.microsoft.com/download/pr/11991016/8a81aa8f89aac452956b0e4c68e6620b/Bin_Linux.zip; + sha256 = "0ma59fxfldbgh6ijlvfbs3hnl4g0cnw5gs6286zdrp065n763sv4"; }; - buildInputs = [ unzip ]; - patchPhase = '' elfInterpreter="${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2" patchelf --set-interpreter "$elfInterpreter" ./Microsoft.VSCode.CPP.Extension.linux @@ -53,13 +51,6 @@ let ''; }; - cpptoolsJsonFile = fetchurl { - url = https://download.visualstudio.microsoft.com/download/pr/11070848/7b97d6724d52cae8377c61bb4601c989/cpptools.json; - sha256 = "124f091aic92rzbg2vg831y22zr5wi056c1kh775djqs3qv31ja6"; - }; - - - openDebugAD7Script = writeScript "OpenDebugAD7" '' #!${stdenv.shell} BIN_DIR="$(cd "$(dirname "$0")" && pwd -P)" @@ -76,23 +67,24 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "cpptools"; publisher = "ms-vscode"; - version = "0.12.3"; - sha256 = "1dcqy54n1w29xhbvxscd41hdrbdwar6g12zx02f6kh2f1kw34z5z"; + version = "0.16.1"; + sha256 = "0m4cam8sf3zwp8ss1dii908g7rc8b9l6pry0dglg0rmf45pkiaj3"; }; buildInputs = [ - dos2unix + jq ]; - prePatch = '' - dos2unix package.json - ''; + postPatch = '' + mv ./package.json ./package_ori.json - patches = [ - ./vscode-cpptools-0-12-3-package-json.patch - ]; + # 1. Add activation events so that the extension is functional. This listing is empty when unpacking the extension but is filled at runtime. + # 2. Patch `packages.json` so that nix's *gdb* is used as default value for `miDebuggerPath`. + cat ./package_ori.json | \ + jq --slurpfile actEvts ${./package-activation-events-0-16-1.json} '(.activationEvents) = $actEvts[0]' | \ + jq '(.contributes.debuggers[].configurationAttributes | .attach , .launch | .properties.miDebuggerPath | select(. != null) | select(.default == "/usr/bin/gdb") | .default) = "${gdbDefaultsTo}"' > \ + ./package.json - postPatch = '' # Patch `packages.json` so that nix's *gdb* is used as default value for `miDebuggerPath`. substituteInPlace "./package.json" \ --replace "\"default\": \"/usr/bin/gdb\"" "\"default\": \"${gdbDefaultsTo}\"" @@ -103,9 +95,6 @@ vscode-utils.buildVscodeMarketplaceExtension { # Move unused files out of the way. mv ./debugAdapters/bin/OpenDebugAD7.exe.config ./debugAdapters/bin/OpenDebugAD7.exe.config.unused - # Bring the `cpptools.json` file at the root of the package, same as the extension would do. - cp -p "${cpptoolsJsonFile}" "./cpptools.json" - # Combining the language component binaries as part of our package. find "${langComponentBinaries}/bin" -mindepth 1 -maxdepth 1 | xargs cp -p -t "./bin" @@ -121,7 +110,7 @@ vscode-utils.buildVscodeMarketplaceExtension { meta = with stdenv.lib; { license = licenses.unfree; maintainers = [ maintainers.jraygauthier ]; - # A 32 bit linux would also be possible with some effort (specific download of binaries + + # A 32 bit linux would also be possible with some effort (specific download of binaries + # patching of the elf files with 32 bit interpreter). platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/misc/vscode-extensions/cpptools/missing_elf_deps.sh b/pkgs/misc/vscode-extensions/cpptools/missing_elf_deps.sh new file mode 100755 index 0000000000000..f5eb08d78a5dc --- /dev/null +++ b/pkgs/misc/vscode-extensions/cpptools/missing_elf_deps.sh @@ -0,0 +1,52 @@ +#!/usr/bin/env nix-shell +#! nix-shell -p coreutils -i bash + +scriptDir=$(cd "`dirname "$0"`"; pwd) +echo "scriptDir='$scriptDir'" + +function get_pkg_out() { + local pkg="$1" + local suffix="${2:-}" + local nixExp="with (import <nixpkgs> {}); ${pkg}" + echo "$(nix-build -E "$nixExp" --no-out-link)${suffix}" +} + +interpreter="$(get_pkg_out "stdenv.glibc" "/lib/ld-linux-x86-64.so.2")" +echo "interpreter='$interpreter'" + +# For clangformat dep on 'libtinfo.so.5'. +ncursesLibDir="$(get_pkg_out "ncurses5.out" "/lib")" +echo "ncursesLibDir='$ncursesLibDir'" + +# For clanformat dep on 'libstdc++.so.6'. +stdcppLibDir="$(get_pkg_out "stdenv.cc.cc.lib" "/lib")" +echo "stdcppLibDir='$stdcppLibDir'" + +# For clangformat dep on 'libz.so.1'. +zlibLibDir="$(get_pkg_out "zlib.out" "/lib")" +echo "zlibLibDir='$zlibLibDir'" + +function patchelf_mono() { + local exe="$1" + patchelf --set-interpreter "$interpreter" "$exe" +} + +function patchelf_clangformat() { + local exe="$1" + patchelf --set-interpreter "$interpreter" "$exe" + local rpath="$ncursesLibDir:$stdcppLibDir:$zlibLibDir" + patchelf --set-rpath "$rpath" "$exe" +} + +function print_nix_version_clangtools() { + nixClangToolsBin="$(get_pkg_out "clang-tools" "/bin")" + echo "nixClangToolsBin='$nixClangToolsBin'" + $nixClangToolsBin/clang-format --version +} + +function print_nix_version_mono() { + nixMonoBin="$(get_pkg_out "mono" "/bin")" + echo "nixMonoBin='$nixMonoBin'" + $nixMonoBin/mono --version +} + diff --git a/pkgs/misc/vscode-extensions/cpptools/package-activation-events-0-16-1.json b/pkgs/misc/vscode-extensions/cpptools/package-activation-events-0-16-1.json new file mode 100644 index 0000000000000..3a12a8bc04749 --- /dev/null +++ b/pkgs/misc/vscode-extensions/cpptools/package-activation-events-0-16-1.json @@ -0,0 +1,22 @@ +[ +"onLanguage:cpp", +"onLanguage:c", +"onCommand:extension.pickNativeProcess", +"onCommand:extension.pickRemoteNativeProcess", +"onCommand:C_Cpp.ConfigurationEdit", +"onCommand:C_Cpp.ConfigurationSelect", +"onCommand:C_Cpp.SwitchHeaderSource", +"onCommand:C_Cpp.Navigate", +"onCommand:C_Cpp.GoToDeclaration", +"onCommand:C_Cpp.PeekDeclaration", +"onCommand:C_Cpp.ToggleErrorSquiggles", +"onCommand:C_Cpp.ToggleIncludeFallback", +"onCommand:C_Cpp.ToggleDimInactiveRegions", +"onCommand:C_Cpp.ShowReleaseNotes", +"onCommand:C_Cpp.ResetDatabase", +"onCommand:C_Cpp.PauseParsing", +"onCommand:C_Cpp.ResumeParsing", +"onCommand:C_Cpp.ShowParsingCommands", +"onCommand:C_Cpp.TakeSurvey", +"onDebug" +] \ No newline at end of file diff --git a/pkgs/misc/vscode-extensions/cpptools/update_helper.sh b/pkgs/misc/vscode-extensions/cpptools/update_helper.sh new file mode 100755 index 0000000000000..00ef77553242d --- /dev/null +++ b/pkgs/misc/vscode-extensions/cpptools/update_helper.sh @@ -0,0 +1,168 @@ +#!/usr/bin/env nix-shell +#! nix-shell -p coreutils -p jq -p unzip -i bash +set -euo pipefail + +# +# A little script to help maintaining this package. It will: +# +# - download the specified version of the extension to the store and print its url, packed store path and hash +# - unpack the extension, bring it to the store and print its store path and hash +# - fetch its runtimes dependencies from the 'package.json' file using the 'jq' utility, unpack those to the store +# and print its url store path and hash +# - patch elf of the binaries that got a nix replacement +# - bring the patched version to the store +# - run their '--version' and call 'ldd' +# - print the version of the runtime deps nix replacements. +# +# TODO: Print to a properly formated nix file all the required information to fetch everything (extension + runtime deps). +# TODO: Print x86 and maybe darwin runtime dependencies. +# + +scriptDir=$(cd "`dirname "$0"`"; pwd) +echo "scriptDir='$scriptDir'" + +extPublisher="vscode" +extName="cpptools" +defaultExtVersion="0.16.1" +extVersion="${1:-$defaultExtVersion}" + +echo +echo "------------- Downloading extension ---------------" + +extZipStoreName="${extPublisher}-${extName}.zip" +extUrl="https://ms-vscode.gallery.vsassets.io/_apis/public/gallery/publisher/ms-vscode/extension/cpptools/${extVersion}/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage" +echo "extUrl='$extUrl'" +storePathWithSha=$(nix-prefetch-url --name "$extZipStoreName" --print-path "$extUrl" 2> /dev/null) + +cpptoolsZipStorePath="$(echo "$storePathWithSha" | tail -n1)" +cpptoolsZipSha256="$(echo "$storePathWithSha" | head -n1)" +echo "cpptoolsZipStorePath='$cpptoolsZipStorePath'" +echo "cpptoolsZipSha256='$cpptoolsZipSha256'" + + +extStoreName="${extPublisher}-${extName}" + + +function rm_tmpdir() { + #echo "Removing \`tmpDir='$tmpDir'\`" + rm -rf -- "$tmpDir" + unset tmpDir + trap - INT TERM HUP EXIT +} +function make_trapped_tmpdir() { + tmpDir=$(mktemp -d) + trap rm_tmpdir INT TERM HUP EXIT +} + +echo +echo "------------- Unpacked extension ---------------" + +make_trapped_tmpdir +unzip -q -d "$tmpDir" "$cpptoolsZipStorePath" + +cpptoolsStorePath="$(nix add-to-store -n "$extStoreName" "$tmpDir")" +cpptoolsSha256="$(nix hash-path --base32 --type sha512 "$cpptoolsStorePath")" +echo "cpptoolsStorePath='$cpptoolsStorePath'" +echo "cpptoolsSha256='$cpptoolsSha256'" + +rm_tmpdir + +storePathWithSha=$(nix-prefetch-url --print-path "file://${cpptoolsStorePath}/extension/package.json" 2> /dev/null) + +extPackageJSONStorePath="$(echo "$storePathWithSha" | tail -n1)" +extPackageJSONSha256="$(echo "$storePathWithSha" | head -n1)" +echo "extPackageJSONStorePath='$extPackageJSONStorePath'" +echo "extPackageJSONSha256='$extPackageJSONSha256'" + +print_runtime_dep() { + + local outName="$1" + local extPackageJSONStorePath="$2" + local depDesc="$3" + + local urlRaw=$(cat "$extPackageJSONStorePath" | jq -r --arg desc "$depDesc" '.runtimeDependencies[] | select(.description == $desc) | .url') + local url=$(echo $urlRaw | xargs curl -Ls -o /dev/null -w %{url_effective}) + + local urlRawVarStr="${outName}_urlRaw='$urlRaw'" + local urlVarStr="${outName}_url='$url'" + echo "$urlRawVarStr" + echo "$urlVarStr" + + local storePathWithSha="$(nix-prefetch-url --unpack --print-path "$url" 2> /dev/null)" + + local storePath="$(echo "$storePathWithSha" | tail -n1)" + local sha256="$(echo "$storePathWithSha" | head -n1)" + + local sha256VarStr="${outName}_sha256='$sha256'" + local storePathVarStr="${outName}_storePath='$storePath'" + echo "$sha256VarStr" + echo "$storePathVarStr" + + eval "$urlRawVarStr" + eval "$urlVarStr" + eval "$sha256VarStr" + eval "$storePathVarStr" +} + +echo +echo "------------- Runtime dependencies ---------------" + +print_runtime_dep "langComponentBinaries" "$extPackageJSONStorePath" "C/C++ language components (Linux / x86_64)" +print_runtime_dep "monoRuntimeBinaries" "$extPackageJSONStorePath" "Mono Runtime (Linux / x86_64)" +print_runtime_dep "clanFormatBinaries" "$extPackageJSONStorePath" "ClangFormat (Linux / x86_64)" + + +echo +echo "------------- Runtime deps missing elf deps ---------------" + +source "$scriptDir/missing_elf_deps.sh" + +echo +echo "------------- Runtime dep mono ---------------" + +make_trapped_tmpdir +find "$monoRuntimeBinaries_storePath" -mindepth 1 -maxdepth 1 | xargs -d '\n' cp -rp -t "$tmpDir" +chmod -R a+rwx "$tmpDir" + +ls -la "$tmpDir/debugAdapters" + +patchelf_mono "$tmpDir/debugAdapters/mono.linux-x86_64" + +chmod a+x "$tmpDir/debugAdapters/mono.linux-x86_64" +ldd "$tmpDir/debugAdapters/mono.linux-x86_64" +"$tmpDir/debugAdapters/mono.linux-x86_64" --version + +monoRuntimeBinariesPatched_storePath="$(nix add-to-store -n "monoRuntimeBinariesPatched" "$tmpDir")" +echo "monoRuntimeBinariesPatched_storePath='$monoRuntimeBinariesPatched_storePath'" + +rm_tmpdir + + +echo +echo "------------- Runtime dep clang ---------------" +make_trapped_tmpdir +find "$clanFormatBinaries_storePath" -mindepth 1 -maxdepth 1 | xargs -d '\n' cp -rp -t "$tmpDir" +chmod -R a+rwx "$tmpDir" + +ls -la "$tmpDir/bin" + +patchelf_clangformat "$tmpDir/bin/clang-format" + +chmod a+x "$tmpDir/bin/clang-format" +ldd "$tmpDir/bin/clang-format" +"$tmpDir/bin/clang-format" --version + + +clanFormatBinariesPatched_storePath="$(nix add-to-store -n "clanFormatBinariesPatched" "$tmpDir")" +echo "clanFormatBinariesPatched_storePath='$clanFormatBinariesPatched_storePath'" + +rm_tmpdir + +echo +echo "------------- Nix mono ---------------" +print_nix_version_clangtools + +echo +echo "------------- Nix mono ---------------" +print_nix_version_mono + diff --git a/pkgs/misc/vscode-extensions/cpptools/vscode-cpptools-0-12-3-package-json.patch b/pkgs/misc/vscode-extensions/cpptools/vscode-cpptools-0-12-3-package-json.patch deleted file mode 100644 index 1873963f460d6..0000000000000 --- a/pkgs/misc/vscode-extensions/cpptools/vscode-cpptools-0-12-3-package-json.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff --git a/package.json b/package.json -index 518e839..1c17c35 100644 ---- a/package.json -+++ b/package.json -@@ -37,7 +37,26 @@ - "Linters" - ], - "activationEvents": [ -- "*" -+ "onLanguage:cpp", -+ "onLanguage:c", -+ "onCommand:extension.pickNativeProcess", -+ "onCommand:extension.pickRemoteNativeProcess", -+ "onCommand:extension.provideInitialConfigurations_cppvsdbg", -+ "onCommand:extension.provideInitialConfigurations_cppdbg", -+ "onCommand:C_Cpp.ConfigurationEdit", -+ "onCommand:C_Cpp.ConfigurationSelect", -+ "onCommand:C_Cpp.SwitchHeaderSource", -+ "onCommand:C_Cpp.UnloadLanguageServer", -+ "onCommand:C_Cpp.Navigate", -+ "onCommand:C_Cpp.GoToDeclaration", -+ "onCommand:C_Cpp.PeekDeclaration", -+ "onCommand:C_Cpp.ToggleErrorSquiggles", -+ "onCommand:C_Cpp.ToggleIncludeFallback", -+ "onCommand:C_Cpp.ShowReleaseNotes", -+ "onCommand:C_Cpp.ResetDatabase", -+ "workspaceContains:.vscode/c_cpp_properties.json", -+ "onDebug:cppdbg", -+ "onDebug:cppvsdbg" - ], - "main": "./out/src/main", - "contributes": { -@@ -281,8 +300,7 @@ - "cpp" - ] - }, -- "runtime": "node", -- "program": "./out/src/Debugger/Proxy/debugProxy.js", -+ "program": "./debugAdapters/OpenDebugAD7", - "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217", - "variables": { - "pickProcess": "extension.pickNativeProcess", -@@ -722,7 +740,29 @@ - } - } - } -- } -+ }, -+ "configurationSnippets": [ -+ { -+ "label": "C/C++: (gdb) Launch", -+ "description": "Launch with gdb.", -+ "bodyText": "{\n\t\"name\": \"(gdb) Launch\",\n\t\"type\": \"cppdbg\",\n\t\"request\": \"launch\",\n\t\"program\": \"enter program name, for example \\${workspaceRoot}/a.out\",\n\t\"args\": [],\n\t\"stopAtEntry\": false,\n\t\"cwd\": \"\\${workspaceRoot}\",\n\t\"environment\": [],\n\t\"externalConsole\": true,\n\t\"MIMode\": \"gdb\",\n\t\"setupCommands\": [\n\t {\n\t \"description\": \"Enable pretty-printing for gdb\",\n\t \"text\": \"-enable-pretty-printing\",\n\t \"ignoreFailures\": true\n\t }\n\t]\n}" -+ }, -+ { -+ "label": "C/C++: (gdb) Attach", -+ "description": "Attach with gdb.", -+ "bodyText": "{ \n\t\"name\": \"(gdb) Attach\",\n\t\"type\": \"cppdbg\",\n\t\"request\": \"attach\",\n\t\"program\": \"enter program name, for example \\${workspaceRoot}/a.out\",\n\t\"processId\": \"\\${command:pickProcess}\",\n\t\"MIMode\": \"gdb\"\n}" -+ }, -+ { -+ "label": "C/C++: (gdb) Pipe Launch", -+ "description": "Pipe Launch with gdb.", -+ "bodyText": "{\n\t\"name\": \"(gdb) Pipe Launch\",\n\t\"type\": \"cppdbg\",\n\t\"request\": \"launch\",\n\t\"program\": \"enter program name, for example \\${workspaceRoot}/a.out\",\n\t\"args\": [],\n\t\"stopAtEntry\": false,\n\t\"cwd\": \"\\${workspaceRoot}\",\n\t\"environment\": [],\n\t\"externalConsole\": true,\n\t\"pipeTransport\": {\n\t\t\"debuggerPath\": \"/usr/bin/gdb\",\n\t\t\"pipeProgram\": \"/usr/bin/ssh\",\n\t\t\"pipeArgs\": [],\n\t\t\"pipeCwd\": \"\"\n\t},\n\t\"MIMode\": \"gdb\",\n\t\"setupCommands\": [\n\t {\n\t \"description\": \"Enable pretty-printing for gdb\",\n\t \"text\": \"-enable-pretty-printing\",\n\t \"ignoreFailures\": true\n\t }\n\t]\n}" -+ }, -+ { -+ "label": "C/C++: (gdb) Pipe Attach", -+ "description": "Pipe Attach with gdb.", -+ "bodyText": "{\n\t\"name\": \"(gdb) Pipe Attach\",\n\t\"type\": \"cppdbg\",\n\t\"request\": \"attach\",\n\t\"program\": \"enter program name, for example \\${workspaceRoot}/a.out\",\n\t\"processId\": \"\\${command:pickRemoteProcess}\",\n\t\"pipeTransport\": {\n\t\t\"debuggerPath\": \"/usr/bin/gdb\",\n\t\t\"pipeProgram\": \"/usr/bin/ssh\",\n\t\t\"pipeArgs\": [],\n\t\t\"pipeCwd\": \"\"\n\t},\n\t\"MIMode\": \"gdb\"\n}" -+ } -+ ] - }, - { - "type": "cppvsdbg", -@@ -741,7 +781,7 @@ - "variables": { - "pickProcess": "extension.pickNativeProcess" - }, -- "initialConfigurations": "extension.provideInitialConfigurations_cppvsdbg", -+ "initialConfigurations": "", - "configurationAttributes": { - "launch": { - "required": [ diff --git a/pkgs/os-specific/darwin/skhd/default.nix b/pkgs/os-specific/darwin/skhd/default.nix index 24eb644e96fbe..3331084d807e7 100644 --- a/pkgs/os-specific/darwin/skhd/default.nix +++ b/pkgs/os-specific/darwin/skhd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "skhd-${version}"; - version = "0.0.12"; + version = "0.0.14"; src = fetchFromGitHub { owner = "koekeishiya"; repo = "skhd"; rev = "v${version}"; - sha256 = "09ihfd7cfqnfv095skn6rbrmjji61skwgg36b6s055fycrlbyp0h"; + sha256 = "0kkmlka1hxsjdkx0ywkm48p9v1jhld26lfplls20n0hj97i5iwlz"; }; buildInputs = [ Carbon ]; diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index 9b7484932ebdf..90489e12d6907 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }: let - ver = "2018.0"; + ver = "2018.1"; in stdenv.mkDerivation rec { name = "alfred-${ver}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "0mzjgjkmgdrrqa6fbpii9q1xqvg3kvwgq2k2kpdf0vy4xxnypky7"; + sha256 = "0xkd842yp227jzfybjq8c5s7y5c7amm1f5ai80k8wyjwysnad3w0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index 54a92d784e2a1..ebf7179d0814a 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "hwdata-${version}"; - version = "0.311"; + version = "0.312"; src = fetchurl { - url = "https://github.com/vcrhonek/hwdata/archive/v0.311.tar.gz"; - sha256 = "159av9wvl3biryxd5pgqcwz6wkdaa0ydmcysmzznx939mfv7w18z"; + url = "https://github.com/vcrhonek/hwdata/archive/v0.312.tar.gz"; + sha256 = "04dbxfn40b8vyw49qpkslv20akbqm5hwl3cndmqacp6cik1l0gai"; }; preConfigure = "patchShebangs ./configure"; diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index a1c577d2bb570..792c7bcb0849a 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -3,17 +3,17 @@ let ell = fetchgit { url = https://git.kernel.org/pub/scm/libs/ell/ell.git; - rev = "0.4"; - sha256 = "0l203n1jnqa2mcifir8ydxhcvbiwlvk89ailm0lida83l9vdlwpv"; + rev = "0.5"; + sha256 = "0xw53bigh99nhacjb67qs1g145fwls7065l8vsrziwzpkyd5s6a8"; }; in stdenv.mkDerivation rec { name = "iwd-${version}"; - version = "0.1"; + version = "0.2"; src = fetchgit { url = https://git.kernel.org/pub/scm/network/wireless/iwd.git; rev = version; - sha256 = "1f8c6xvcvqw8z78mskynd2fkghggcl7vfz8vxzvpx0fkqcprn5n0"; + sha256 = "0khc017s27n6y6c6wbqhmcghzggnagxbi8j36hl5g73y6s44vx42"; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix index c4bade2abeda7..d486bd1d6d24a 100644 --- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix +++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix @@ -33,8 +33,7 @@ buildLinux (rec { DEFAULT_MPTCP_PM default # MPTCP scheduler selection. - # Disabled as the only non-default is the useless round-robin. - MPTCP_SCHED_ADVANCED n + MPTCP_SCHED_ADVANCED y DEFAULT_MPTCP_SCHED default # Smarter TCP congestion controllers diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index d02ab4157191f..9222567033070 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, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.17-rc3"; - modDirVersion = "4.17.0-rc3"; + version = "4.17-rc4"; + modDirVersion = "4.17.0-rc4"; extraMeta.branch = "4.17"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1divgjzmpl98b5j416vhkq53li0y9v5vvdwbgwpr2xznspzbkygq"; + sha256 = "1y34hpzgxblwqslhsfsmzmpv9f3s936r93wgn4kmhkcwsm0in292"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix index d02a531f67fca..c89a8ff914791 100644 --- a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix +++ b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix @@ -11,6 +11,17 @@ stdenv.lib.overrideDerivation systemd (p: { ninja systemd-cryptsetup systemd-cryptsetup-generator ''; + # As ninja install is not used here, the rpath needs to be manually fixed. + # Otherwise the resulting binary doesn't properly link against systemd-shared.so + postFixup = '' + sharedLib=libsystemd-shared-${p.version}.so + for prog in `find $out -type f -executable`; do + (patchelf --print-needed $prog | grep $sharedLib > /dev/null) && ( + patchelf --set-rpath `patchelf --print-rpath $prog`:"$out/lib/systemd" $prog + ) || true + done + ''; + installPhase = '' mkdir -p $out/lib/systemd/ cp systemd-cryptsetup $out/lib/systemd/systemd-cryptsetup diff --git a/pkgs/os-specific/linux/tbs/default.nix b/pkgs/os-specific/linux/tbs/default.nix new file mode 100644 index 0000000000000..291666c0b4502 --- /dev/null +++ b/pkgs/os-specific/linux/tbs/default.nix @@ -0,0 +1,63 @@ +{ stdenv, lib, fetchFromGitHub, kernel, kmod, perl, patchutils, perlPackages, libelf }: +let + + media = fetchFromGitHub rec { + name = repo; + owner = "tbsdtv"; + repo = "linux_media"; + rev = "efe31531b77efd3a4c94516504a5823d31cdc776"; + sha256 = "1533qi3sb91v00289hl5zaj4l35r2sf9fqc6z5ky1vbb7byxgnlr"; + }; + + build = fetchFromGitHub rec { + name = repo; + owner = "tbsdtv"; + repo = "media_build"; + rev = "a0d62eba4d429e0e9d2c2f910fb203e817cac84b"; + sha256 = "1329s7w9xlqjqwkpaqsd6b5dmzhm97jw0c7c7zzmmbdkl289i4i4"; + }; + +in stdenv.mkDerivation { + name = "tbs-2018.04.18-${kernel.version}"; + + srcs = [ media build ]; + sourceRoot = "${build.name}"; + + preConfigure = '' + make dir DIR=../${media.name} + ''; + + postPatch = '' + patchShebangs . + + sed -i v4l/Makefile \ + -i v4l/scripts/make_makefile.pl \ + -e 's,/sbin/depmod,${kmod}/bin/depmod,g' \ + -e 's,/sbin/lsmod,${kmod}/bin/lsmod,g' + + sed -i v4l/Makefile \ + -e 's,^OUTDIR ?= /lib/modules,OUTDIR ?= ${kernel.dev}/lib/modules,' \ + -e 's,^SRCDIR ?= /lib/modules,SRCDIR ?= ${kernel.dev}/lib/modules,' + ''; + + buildFlags = [ "VER=${kernel.modDirVersion}" ]; + installFlags = [ "DESTDIR=$(out)" ]; + + hardeningDisable = [ "all" ]; + + nativeBuildInputs = [ patchutils kmod perl perlPackages.ProcProcessTable ] + ++ kernel.moduleBuildDependencies; + + postInstall = '' + xz $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/media/dvb-core/dvb-core.ko + xz $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/media/v4l2-core/videodev.ko + ''; + + meta = with lib; { + homepage = https://www.tbsdtv.com/; + description = "Linux driver for TBSDTV cards"; + license = licenses.gpl2; + maintainers = with maintainers; [ ck3d ]; + priority = -1; + }; +} diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 964fa77c31a9b..4defe9787ba35 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "emby-${version}"; - version = "3.3.1.0"; + version = "3.4.0.0"; src = fetchurl { url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip"; - sha256 = "04qq3rl3pwxnsr8z6x3dwplh6brn1nd0jpmmnvizln4ffx9wspb8"; + sha256 = "1936d5bcrf23av5nc8yh6708gxngsbkh86gvmzpsv3d33jgqv1nl"; }; buildInputs = with pkgs; [ diff --git a/pkgs/servers/fleet/default.nix b/pkgs/servers/fleet/default.nix deleted file mode 100644 index 98daab253b3c9..0000000000000 --- a/pkgs/servers/fleet/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, lib, go, fetchFromGitHub }: - -stdenv.mkDerivation rec { - name = "fleet-${version}"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "coreos"; - repo = "fleet"; - rev = "v${version}"; - sha256 = "0j48ajz19aqfzv9iyznnn39aw51y1nqcl270grmvi5cbqycmrfm0"; - }; - - buildInputs = [ go ]; - - buildPhase = '' - patchShebangs build - ./build - ''; - - installPhase = '' - mkdir -p $out - mv bin $out - ''; - - meta = with stdenv.lib; { - description = "A distributed init system"; - homepage = https://coreos.com/using-coreos/clustering/; - license = licenses.asl20; - maintainers = with maintainers; [ - cstrahan - jgeerds - offline - ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index b1745dd537169..5ebb510be467b 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -56,14 +56,12 @@ let mkdir -vp $out/{bin,libexec/plugins} $lib/{lib,share/java} $dev/include/foundationdb cp -v ./lib/libfdb_c.so $lib/lib - cp -v ./lib/libfdb_java.so $lib/lib - cp -v ./lib/libFDBLibTLS.so $out/libexec/plugins/FDBLibTLS.so cp -v ./bindings/c/foundationdb/fdb_c.h $dev/include/foundationdb cp -v ./bindings/c/foundationdb/fdb_c_options.g.h $dev/include/foundationdb - cp -v ./bindings/java/foundationdb-client.jar $lib/share/java + cp -v ./bindings/java/foundationdb-client.jar $lib/share/java/fdb-java.jar for x in fdbbackup fdbcli fdbserver fdbmonitor; do cp -v "./bin/$x" $out/bin; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 3e95b41fb7e87..6e0e216488d55 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -116,7 +116,7 @@ "homematic" = ps: with ps; [ pyhomematic ]; "homematicip_cloud" = ps: with ps; [ ]; "http" = ps: with ps; [ aiohttp-cors ]; - "hue" = ps: with ps; [ ]; + "hue" = ps: with ps; [ aiohue ]; "ifttt" = ps: with ps; [ ]; "ihc" = ps: with ps; [ ]; "image_processing.dlib_face_detect" = ps: with ps; [ face_recognition ]; @@ -285,7 +285,7 @@ "sensor.bme680" = ps: with ps; [ ]; "sensor.broadlink" = ps: with ps; [ ]; "sensor.buienradar" = ps: with ps; [ ]; - "sensor.coinmarketcap" = ps: with ps; [ ]; + "sensor.coinmarketcap" = ps: with ps; [ coinmarketcap ]; "sensor.cpuspeed" = ps: with ps; [ ]; "sensor.crimereports" = ps: with ps; [ ]; "sensor.cups" = ps: with ps; [ pycups ]; @@ -335,12 +335,12 @@ "sensor.miflora" = ps: with ps; [ ]; "sensor.modem_callerid" = ps: with ps; [ ]; "sensor.mopar" = ps: with ps; [ ]; - "sensor.mvglive" = ps: with ps; [ ]; + "sensor.mvglive" = ps: with ps; [ PyMVGLive ]; "sensor.nederlandse_spoorwegen" = ps: with ps; [ ]; "sensor.neurio_energy" = ps: with ps; [ ]; "sensor.nut" = ps: with ps; [ ]; "sensor.openevse" = ps: with ps; [ ]; - "sensor.openweathermap" = ps: with ps; [ ]; + "sensor.openweathermap" = ps: with ps; [ pyowm ]; "sensor.otp" = ps: with ps; [ ]; "sensor.plex" = ps: with ps; [ ]; "sensor.pocketcasts" = ps: with ps; [ ]; @@ -453,7 +453,7 @@ "weather.buienradar" = ps: with ps; [ ]; "weather.darksky" = ps: with ps; [ ]; "weather.metoffice" = ps: with ps; [ ]; - "weather.openweathermap" = ps: with ps; [ ]; + "weather.openweathermap" = ps: with ps; [ pyowm ]; "weather.yweather" = ps: with ps; [ yahooweather ]; "wemo" = ps: with ps; [ ]; "wink" = ps: with ps; [ ]; diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix index 99900bbdb3ea8..277fa06a70791 100644 --- a/pkgs/servers/http/hiawatha/default.nix +++ b/pkgs/servers/http/hiawatha/default.nix @@ -12,11 +12,11 @@ assert enableSSL -> openssl !=null; stdenv.mkDerivation rec { name = "hiawatha-${version}"; - version = "10.7"; + version = "10.8.1"; src = fetchurl { url = "https://github.com/hsleisink/hiawatha/archive/v${version}.tar.gz"; - sha256 = "1k0vgpfkmdxmkimq4ab70cqwhj5qwr4pzq7nnv957ah8cw2ijy1z"; + sha256 = "1f2hlw2lp98b4dx87i7pz7h66vsy2g22b5adfrlij3kj0vfv61w8"; }; buildInputs = [ cmake libxslt zlib libxml2 ] ++ stdenv.lib.optional enableSSL openssl ; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index f2d38111d5d22..8324af8b3d0d5 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jackett-${version}"; - version = "0.8.886"; + version = "0.8.929"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "18agnavhch29pi1w6vp374cs6bz2j7bf55mh4ym0cs038h5xkdvv"; + sha256 = "1dq69734f6x8iw1jpvln5lq7bykpwky6iiwz8iwwamwg8143f20p"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 4c82f5cfdde81..77bcc98da04e4 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -26,13 +26,13 @@ let }; in pythonPackages.buildPythonApplication rec { name = "matrix-synapse-${version}"; - version = "0.27.4"; + version = "0.28.1"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - sha256 = "051bwr4vz8mwglh1m9rqlljbn8g3alvd52f09ff887nsi6z3jc17"; + sha256 = "1xgiprnhp893zc0g3i7wpwzgjy6q5nb858p0s6kcsca60vr9j6h0"; }; patches = [ diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index d36810b9f5c1c..4eae86b00b0f0 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.28.6"; + version = "0.29.0"; src = fetchurl { url = "http://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "1dzs57yyx6k93gvyva9y38xdb4pbvdliad3zzgk3vs74fp1zh2vq"; + sha256 = "1dfq06cm8k36pkqpng4cd8ax8cdxbcssww4vapq2w9ccflpnlam2"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index df89e67bffc14..bcae836cbf21e 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "5.1.0"; + version = "5.1.1"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -9,12 +9,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "1j8l8v5iq1mpvc8j7vbwqqd0xhv9ysl05lxwm524cqljynslaq8f"; + sha256 = "0b8i293bfxyblfqwxpb1dkgva95f0bljpvp27j4l4hmjm2g8bpd9"; }; srcStatic = fetchurl { url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz"; - sha256 = "08wha1n3lqn27pc3bc3sg94y47npy69ydh2ad1rbkmvllnjbwx3z"; + sha256 = "0kyfyxcj2yy9v1in6h6kh6sl5p7m03g643qpjriplwwa93bdmk8k"; }; preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter-deps.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter-deps.nix index 194651f43326e..07bedaba9f363 100644 --- a/pkgs/servers/monitoring/prometheus/postfix-exporter-deps.nix +++ b/pkgs/servers/monitoring/prometheus/postfix-exporter-deps.nix @@ -10,30 +10,12 @@ }; } { - goPackagePath = "github.com/coreos/go-systemd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-systemd"; - rev = "d1b7d058aa2adfc795ad17ff4aaa2bc64ec11c78"; - sha256 = "1nz3v1b90hnmj2vjjwq96pr6psxlndqjyd30v9sgiwygzb7db9mv"; - }; - } - { - goPackagePath = "github.com/coreos/pkg"; - fetch = { - type = "git"; - url = "https://github.com/coreos/pkg"; - rev = "97fdf19511ea361ae1c100dd393cc47f8dcfa1e1"; - sha256 = "1srn87wih25l09f75483hnxsr8fc6rq3bk7w1x8125ym39p6mg21"; - }; - } - { goPackagePath = "github.com/golang/protobuf"; fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "e09c5db296004fbe3f74490e84dcd62c3c5ddb1b"; - sha256 = "1acnmalkqwrq6k3l71c4pyws0zn18r2609kqaq55lhbdcjgzid31"; + rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265"; + sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; }; } { @@ -68,8 +50,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/common"; - rev = "d0f7cd64bda49e08b22ae8a730aa57aa0db125d6"; - sha256 = "1d4hfbb66xsf0wq317fwhgrwakqzhvryw4d7ip851lwrpql5fqcx"; + rev = "d811d2e9bf898806ecfb6ef6296774b13ffc314c"; + sha256 = "0r4067r4ysmljksqw3awcxx5qplqhykahc5igdzgkky7i4bvaik1"; }; } { diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix index 3c2f01c0a5ced..97df26aea4e55 100644 --- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix @@ -1,8 +1,11 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, systemd, makeWrapper }: +{ stdenv, buildGoPackage, fetchFromGitHub, systemd, makeWrapper +, withSystemdSupport ? true }: + +with stdenv.lib; buildGoPackage rec { name = "postfix_exporter-${version}"; - version = "0.1.1"; + version = "0.1.2"; goPackagePath = "github.com/kumina/postfix_exporter"; @@ -10,20 +13,41 @@ buildGoPackage rec { owner = "kumina"; repo = "postfix_exporter"; rev = version; - sha256 = "1p2j66jzzgyv2w832pw57g02vrac6ldrblqllgwyy0i8krb3ibyz"; + sha256 = "1b9ib3scxni6hlw55wv6f0z1xfn27l0p29as24f71rs70pyzy4hm"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ systemd ]; + nativeBuildInputs = optional withSystemdSupport makeWrapper; + buildInputs = optional withSystemdSupport systemd; + buildFlags = optional (!withSystemdSupport) "-tags nosystemd"; goDeps = ./postfix-exporter-deps.nix; + extraSrcs = optionals withSystemdSupport [ + { + goPackagePath = "github.com/coreos/go-systemd"; + src = fetchFromGitHub { + owner = "coreos"; + repo = "go-systemd"; + rev = "d1b7d058aa2adfc795ad17ff4aaa2bc64ec11c78"; + sha256 = "1nz3v1b90hnmj2vjjwq96pr6psxlndqjyd30v9sgiwygzb7db9mv"; + }; + } + { + goPackagePath = "github.com/coreos/pkg"; + src = fetchFromGitHub { + owner = "coreos"; + repo = "pkg"; + rev = "97fdf19511ea361ae1c100dd393cc47f8dcfa1e1"; + sha256 = "1srn87wih25l09f75483hnxsr8fc6rq3bk7w1x8125ym39p6mg21"; + }; + } + ]; - postInstall = '' + postInstall = optionalString withSystemdSupport '' wrapProgram $bin/bin/postfix_exporter \ --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib" ''; - meta = with stdenv.lib; { + meta = { inherit (src.meta) homepage; description = "A Prometheus exporter for Postfix"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/zabbix/3.4.nix b/pkgs/servers/monitoring/zabbix/3.4.nix new file mode 100644 index 0000000000000..332e139f42836 --- /dev/null +++ b/pkgs/servers/monitoring/zabbix/3.4.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib, pcre, libevent, libiconv }: + + +let + + version = "3.4.8"; + branch = "3.4"; + + src = fetchurl { + url = "https://netix.dl.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz"; + sha256 = "cec14993d1ec2c9d8c51f6608c9408620f27174db92edc2347bafa7b841ccc07"; + }; + +in + +{ + agent = stdenv.mkDerivation { + name = "zabbix-agent-${version}"; + + inherit src; + + configureFlags = [ + "--enable-agent" + "--with-libpcre=${pcre.dev}" + "--with-iconv=${libiconv}" + ]; + buildInputs = [ pcre libiconv ]; + + meta = with stdenv.lib; { + inherit branch; + description = "An enterprise-class open source distributed monitoring solution (client-side agent)"; + homepage = http://www.zabbix.com/; + license = licenses.gpl2; + maintainers = [ maintainers.eelco ]; + platforms = platforms.linux; + }; + }; + +} + diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 063ad8c3f576a..a4b2418f58c96 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "groonga-${version}"; - version = "8.0.1"; + version = "8.0.2"; src = fetchurl { url = "http://packages.groonga.org/source/groonga/${name}.tar.gz"; - sha256 = "074r71dcv1l8rm6an7b8iyfpcxbk00iysmzszssknqg8mrqvsphg"; + sha256 = "0bsf4dbgbddij49xg6d6kl9kb1m5ywdyc1w1xz2giisqk1hdwsz4"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 63425fbb28c21..e22e3a64fac10 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -34,7 +34,7 @@ common = rec { # attributes common to both builds sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt ''; - patches = [ ./cmake-includedir.patch ] + patches = [ ./cmake-includedir.patch ./include-dirs-path.patch ] ++ stdenv.lib.optional stdenv.cc.isClang ./clang-isfinite.patch; cmakeFlags = [ diff --git a/pkgs/servers/sql/mariadb/include-dirs-path.patch b/pkgs/servers/sql/mariadb/include-dirs-path.patch new file mode 100644 index 0000000000000..8d468cf546a41 --- /dev/null +++ b/pkgs/servers/sql/mariadb/include-dirs-path.patch @@ -0,0 +1,13 @@ +diff --git a/libmariadb/mariadb_config/mariadb_config.c.in b/libmariadb/mariadb_config/mariadb_config.c.in +index 45d2f4e..e5666db 100644 +--- a/libmariadb/mariadb_config/mariadb_config.c.in ++++ b/libmariadb/mariadb_config/mariadb_config.c.in +@@ -5,7 +5,7 @@ + + static char *mariadb_progname; + +-#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql" ++#define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mysql" + #define LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb @extra_dynamic_LDFLAGS@" + #define LIBS_SYS "@extra_dynamic_LDFLAGS@" + #define CFLAGS INCLUDE diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index 1de2a52634bc6..5f26801ca6d3e 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dash-0.5.9.1"; + name = "dash-0.5.10"; src = fetchurl { url = "http://gondor.apana.org.au/~herbert/dash/files/${name}.tar.gz"; - sha256 = "5ecd5bea72a93ed10eb15a1be9951dd51b52e5da1d4a7ae020efd9826b49e659"; + sha256 = "1arimvc9zcghhb3nin9z3yr5706vxfri4a9r3j9j9d0n676f0w5d"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix new file mode 100644 index 0000000000000..733a8eb630ddb --- /dev/null +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -0,0 +1,33 @@ +{ lib, rustPlatform, fetchFromGitHub, x11, xorg, libpulseaudio, pkgconfig, patchelf +, stdenv}: + +rustPlatform.buildRustPackage rec { + name = "xidlehook-${version}"; + version = "0.4.6"; + + src = fetchFromGitHub { + owner = "jD91mZM2"; + repo = "xidlehook"; + rev = version; + + sha256 = "0h84ichm1v2wdmm4w1n7jr70yfb9hhi7kykvd99ppg00h1x9lr7w"; + }; + + cargoSha256 = "0a1bl6fnfw6xy71q3b5zij52p9skylj1ivqj8my44bfsid2qfn7d"; + + buildInputs = [ x11 xorg.libXScrnSaver libpulseaudio ]; + nativeBuildInputs = [ pkgconfig patchelf ]; + + postFixup = lib.optionalString stdenv.isLinux '' + RPATH="$(patchelf --print-rpath $out/bin/xidlehook)" + patchelf --set-rpath "$RPATH:${libpulseaudio}/lib" $out/bin/xidlehook + ''; + + meta = with lib; { + description = "xautolock rewrite in Rust, with a few extra features"; + homepage = https://github.com/jD91mZM2/xidlehook; + license = licenses.mit; + maintainers = with maintainers; [ jD91mZM2 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/admin/bluemix-cli/default.nix b/pkgs/tools/admin/bluemix-cli/default.nix new file mode 100644 index 0000000000000..2c24728fab9fb --- /dev/null +++ b/pkgs/tools/admin/bluemix-cli/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "bluemix-cli-${version}"; + version = "0.6.6"; + + src = fetchurl { + name = "linux64.tar.gz"; + url = "https://clis.ng.bluemix.net/download/bluemix-cli/${version}/linux64"; + sha256 = "1swjawc4szqrl0wgjcb4na1hbxylaqp2mp53lxsbfbk1db0c3y85"; + }; + + installPhase = '' + install -m755 -D --target $out/bin bin/bluemix bin/bluemix-analytics bin/cfcli/cf + ''; + + meta = with lib; { + description = "Administration CLI for IBM BlueMix"; + homepage = "https://console.bluemix.net/docs/cli/index.html"; + downloadPage = "https://console.bluemix.net/docs/cli/reference/bluemix_cli/download_cli.html#download_install"; + license = licenses.unfree; + maintainers = [ maintainers.tazjin ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix index f93231d80222b..6d782fdba35c7 100644 --- a/pkgs/tools/audio/abcm2ps/default.nix +++ b/pkgs/tools/audio/abcm2ps/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "abcm2ps-${version}"; - version = "8.13.20"; + version = "8.13.21"; src = fetchFromGitHub { owner = "leesavide"; repo = "abcm2ps"; rev = "v${version}"; - sha256 = "0zgwrclky6b1l1pd07s31azyxf4clwi3cp5x0wjix0wp78b89pbx"; + sha256 = "03r98xdw2vdwsi726i0zb7p0ljp3fpzjl1nhzfwz57m3zmqvz6r1"; }; prePatch = '' diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index ff6a7af03efed..a0e7b1f906c92 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "abcMIDI-${version}"; - version = "2018.04.24"; + version = "2018.05.02"; src = fetchzip { url = "http://ifdo.ca/~seymour/runabc/${name}.zip"; - sha256 = "02n5xnagj1z44b23zmaxdkmn8nisrb34r8hb5xs7cr1wq7m4fmlh"; + sha256 = "0pva0kwkwdrq4mfgiz389dhaqv66csqjaddirzxmhvvi6qji5d24"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index ace5431866514..958afa3f6a9c3 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages -, asciidoc-full, makeWrapper }: +, utillinux, asciidoc, makeWrapper }: stdenv.mkDerivation rec { name = "btrbk-${version}"; @@ -10,7 +10,9 @@ stdenv.mkDerivation rec { sha256 = "04ahfm52vcf1w0c2km0wdgj2jpffp45bpawczmygcg8fdcm021lp"; }; - buildInputs = with perlPackages; [ asciidoc-full makeWrapper perl DateCalc ]; + nativeBuildInputs = [ asciidoc makeWrapper ]; + + buildInputs = with perlPackages; [ perl DateCalc ]; preInstall = '' for f in $(find . -name Makefile); do @@ -27,6 +29,10 @@ stdenv.mkDerivation rec { --replace "/bin/date" "${coreutils}/bin/date" \ --replace "/bin/echo" "${coreutils}/bin/echo" \ --replace '$btrbk' 'btrbk' + + # Fix SSH filter script + sed -i '/^export PATH/d' ssh_filter_btrbk.sh + substituteInPlace ssh_filter_btrbk.sh --replace logger ${utillinux}/bin/logger ''; preFixup = '' diff --git a/pkgs/tools/backup/mydumper/default.nix b/pkgs/tools/backup/mydumper/default.nix index da8805bc226e7..e87878551254b 100644 --- a/pkgs/tools/backup/mydumper/default.nix +++ b/pkgs/tools/backup/mydumper/default.nix @@ -2,14 +2,14 @@ , glib, zlib, pcre, mysql, libressl }: stdenv.mkDerivation rec { - version = "0.9.3"; + version = "0.9.5"; name = "mydumper-${version}"; src = fetchFromGitHub { owner = "maxbube"; repo = "mydumper"; rev = "v${version}"; - sha256 = "139v6707sxyslg7n1fii8b1ybdq50hbqhc8zf6p1cr3h2hhl6ns9"; + sha256 = "0vbz0ri5hm6yzkrcgnaj8px6bf59myr5dbhyy7fd4cv44hr685k6"; }; nativeBuildInputs = [ cmake pkgconfig ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = ''High-perfomance MySQL backup tool''; homepage = https://github.com/maxbube/mydumper; license = licenses.gpl3; - platforms = platforms.all; + platforms = platforms.linux; maintainers = with maintainers; [ izorkin ]; }; } diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix index f305cff0ea251..80add316094cb 100644 --- a/pkgs/tools/bootloaders/refind/default.nix +++ b/pkgs/tools/bootloaders/refind/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { install -D -m0644 gptsync/gptsync_${efiPlatform}.efi $out/share/refind/tools_${efiPlatform}/gptsync_${efiPlatform}.efi # helper scripts - install -D -m0755 refind-install $out/share/refind/refind-install + install -D -m0755 refind-install $out/bin/refind-install install -D -m0755 mkrlconf $out/bin/refind-mkrlconf install -D -m0755 mvrefind $out/bin/refind-mvrefind install -D -m0755 fonts/mkfont.sh $out/bin/refind-mkfont @@ -86,21 +86,13 @@ stdenv.mkDerivation rec { # keys install -D -m0644 keys/* $out/share/refind/keys/ - # The refind-install script assumes that all resource files are - # installed under the same directory as the script itself. To avoid - # having to patch around this assumption, generate a wrapper that - # cds into $out/share/refind and executes the real script from - # there. - cat >$out/bin/refind-install <<EOF -#! ${stdenv.shell} -cd $out/share/refind && exec -a $out/bin/refind-install ./refind-install \$* -EOF - chmod +x $out/bin/refind-install + # Fix variable definition of 'RefindDir' which is used to locate ressource files. + sed -i "s,\bRefindDir=.*,RefindDir=$out/share/refind,g" $out/bin/refind-install # Patch uses of `which`. We could patch in calls to efibootmgr, # openssl, convert, and openssl, but that would greatly enlarge # refind's closure (from ca 28MB to over 400MB). - sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/share/refind/refind-install + sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-install sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-mvrefind sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-mkfont ''; diff --git a/pkgs/tools/filesystems/blobfuse/default.nix b/pkgs/tools/filesystems/blobfuse/default.nix index f847cde98a9e9..b5694535e9469 100644 --- a/pkgs/tools/filesystems/blobfuse/default.nix +++ b/pkgs/tools/filesystems/blobfuse/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "blobfuse-${version}"; - version = "1.0.1-RC-Preview"; + version = "1.0.2"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-fuse"; rev = "v${version}"; - sha256 = "143rxgfmprir4a7frrv8llkv61jxzq50w2v8wn32vx6gl6vci1zs"; + sha256 = "1qh04z1fsj1l6l12sz9yl2sy9hwlrnzac54hwrr7wvsgv90n9gbp"; }; buildInputs = [ curl gnutls libgcrypt libuuid fuse ]; @@ -20,4 +20,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ jbgi ]; platforms = platforms.linux; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index 6acf5e221d471..4bcef5a83f046 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = "https://sources.debian.net/data/main/n/ntfs-3g/1:2016.2.22AR.1-4/debian/patches/0003-CVE-2017-0358.patch"; + url = "https://sources.debian.org/data/main/n/ntfs-3g/1:2016.2.22AR.1+dfsg-1/debian/patches/0003-CVE-2017-0358.patch"; sha256 = "0hd05q9q06r18k8pmppvch1sslzqln5fvqj51d5r72g4mnpavpj3"; }) ]; diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index a177f33bb3774..b2b8508640bfb 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -20,11 +20,11 @@ let withX = libX11 != null && !aquaterm && !stdenv.isDarwin; in stdenv.mkDerivation rec { - name = "gnuplot-5.2.2"; + name = "gnuplot-5.2.3"; src = fetchurl { url = "mirror://sourceforge/gnuplot/${name}.tar.gz"; - sha256 = "18diyy7aib9mn098x07g25c7jij1x7wbfpicz0z8gwxx08px45m4"; + sha256 = "0977vgjszjpqhz2jahq07zmcmi0k9d6v7wq70ph2klfrb29qrdgy"; }; nativeBuildInputs = [ makeWrapper pkgconfig texinfo ] ++ lib.optional withQt qttools; diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index e334a2a8813ee..3903fde3302e5 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "fwup-${version}"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "fhunleth"; repo = "fwup"; rev = "v${version}"; - sha256 = "1v79q5s4lm8scrz9nmqcszyh40is6k7hkr15r4aljyfbp1gamsfs"; + sha256 = "1jhl50yj5h6wl3fx1hcqi4vb7633srmbbcpsgajprc5fxscjgapm"; }; doCheck = true; diff --git a/pkgs/tools/misc/lolcat/Gemfile.lock b/pkgs/tools/misc/lolcat/Gemfile.lock index 1ef7e5527961c..3c4646ddf48f4 100644 --- a/pkgs/tools/misc/lolcat/Gemfile.lock +++ b/pkgs/tools/misc/lolcat/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: http://rubygems.org/ specs: - lolcat (99.9.10) + lolcat (99.9.11) manpages (~> 0.6.1) paint (~> 2.0.0) trollop (~> 2.1.2) diff --git a/pkgs/tools/misc/lolcat/gemset.nix b/pkgs/tools/misc/lolcat/gemset.nix index 78677edcc34ba..86069f7ecc0eb 100644 --- a/pkgs/tools/misc/lolcat/gemset.nix +++ b/pkgs/tools/misc/lolcat/gemset.nix @@ -3,10 +3,10 @@ dependencies = ["manpages" "paint" "trollop"]; source = { remotes = ["http://rubygems.org"]; - sha256 = "0fidwmgywkklxf2a4f4dl82b8mx4w4n73vqm6jqgyqd3nfmgysnl"; + sha256 = "1z0j354sj2qm2srgz3i28s347fwylvv1j614806cr33zcd1j4mwp"; type = "gem"; }; - version = "99.9.10"; + version = "99.9.11"; }; manpages = { source = { diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix new file mode 100644 index 0000000000000..e48816db935a9 --- /dev/null +++ b/pkgs/tools/misc/powerline-rs/default.nix @@ -0,0 +1,31 @@ +{ lib, rustPlatform, fetchFromGitHub, pkgconfig, file, perl, cmake, openssl_1_1_0, libssh2, libgit2, libzip }: +rustPlatform.buildRustPackage rec { + pname = "powerline-rs"; + name = "${pname}-${version}"; + version = "0.1.7"; + + src = fetchFromGitHub { + owner = "jD91mZM2"; + repo = "powerline-rs"; + rev = version; + + sha256 = "0ry1axia78sp9vmn6p119l69sj3dqx2san1k71a5npf60rf4gfkc"; + }; + + cargoSha256 = "184s432a6damzvl0lv6jar1iml9dq60r190aqjy44lcg938981zc"; + + nativeBuildInputs = [ pkgconfig file perl cmake ]; + buildInputs = [ openssl_1_1_0 libssh2 libgit2 libzip ]; + + postInstall = '' + install -Dm 755 "${pname}.bash" "$out/etc/bash_completion.d/${pname}" + install -Dm 755 "${pname}.fish" "$out/share/fish/vendor_completions.d/${pname}" + ''; + + meta = with lib; { + description = "powerline-shell rewritten in Rust, inspired by powerline-go"; + license = licenses.mit; + maintainers = with maintainers; [ jD91mZM2 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index ddd76a344e01d..0a261671872dc 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pspg-${version}"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "okbob"; repo = "pspg"; rev = "${version}"; - sha256 = "10r6jfcqw4wclp84f07g3bda844csgm4sh7cjsnk2smmal7nhybs"; + sha256 = "19jiixanyghasd2awkxx7c224fz01d9v0c4qxn4msvkny39m3gz9"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/misc/termplay/default.nix b/pkgs/tools/misc/termplay/default.nix new file mode 100644 index 0000000000000..5771ec6aff198 --- /dev/null +++ b/pkgs/tools/misc/termplay/default.nix @@ -0,0 +1,38 @@ +{ rustPlatform, fetchFromGitHub, lib, makeWrapper, gst_all_1, libsixel }: +rustPlatform.buildRustPackage rec { + name = "termplay-${version}"; + version = "2.0.4"; + + src = fetchFromGitHub { + owner = "jD91mZM2"; + repo = "termplay"; + rev = version; + + sha256 = "0qgx9xmi8n3sq5n5m6gai777sllw9hyki2kwsj2k4h1ykibzq9r0"; + }; + + cargoBuildFlags = ["--features" "bin"]; + cargoSha256 = "1ghvp4n6mvckamvn3hk672wh29jlrwmhrd4hv3mh98li1x9ssbmf"; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-ugly + gst_all_1.gst-plugins-bad + libsixel + ]; + + postInstall = '' + wrapProgram $out/bin/termplay --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" + ''; + + meta = with lib; { + description = "Play an image/video in your terminal"; + homepage = https://jd91mzm2.github.io/termplay/; + license = licenses.mit; + maintainers = with maintainers; [ jD91mZM2 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix index e6a1c93d2bb6a..d507816dbd383 100644 --- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix +++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, yubikey-personalization, qt4, qmake4Hook, libyubikey }: +{ stdenv, fetchurl, pkgconfig, yubikey-personalization, qtbase, qmake, libyubikey }: stdenv.mkDerivation rec { name = "yubikey-personalization-gui-3.1.25"; @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1knyv5yss8lhzaff6jpfqv12fjf1b8b21mfxzx3qi0hw4nl8n2v8"; }; - nativeBuildInputs = [ pkgconfig qmake4Hook ]; - buildInputs = [ yubikey-personalization qt4 libyubikey ]; + nativeBuildInputs = [ pkgconfig qmake ]; + buildInputs = [ yubikey-personalization qtbase libyubikey ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index 817da08c05e36..60fd42962fb71 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, nodejs, which, python27, utillinux }: -let version = "20.1"; in +let version = "20.2"; in stdenv.mkDerivation { name = "cjdns-"+version; @@ -8,7 +8,7 @@ stdenv.mkDerivation { owner = "cjdelisle"; repo = "cjdns"; rev = "cjdns-v${version}"; - sha256 = "033q8av46y0q8vxyqvb4yjh1lz6a17mmk8lhdpwdcqnsws8xjjsw"; + sha256 = "13zhcfwx8c3vdcf6ifivrgf8q7mgx00vnxcspdz88zk7dh65c6jn"; }; buildInputs = [ which python27 nodejs ] ++ diff --git a/pkgs/tools/networking/gmrender-resurrect/default.nix b/pkgs/tools/networking/gmrender-resurrect/default.nix new file mode 100644 index 0000000000000..6926f1522c71a --- /dev/null +++ b/pkgs/tools/networking/gmrender-resurrect/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, makeWrapper +, gstreamer, gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav, libupnp }: + +let version = "4f221e6b85abf85957b547436e982d7a501a1718"; in + +stdenv.mkDerivation { + name = "gmrender-resurrect-${version}"; + + src = fetchFromGitHub { + owner = "hzeller"; + repo = "gmrender-resurrect"; + rev = "${version}"; + sha256 = "1dmdhyz27bh74qmvncfd3kw7zqwnd05bhxcfjjav98z5qrxdygj4"; + }; + + preConfigurePhases = "autoconfPhase"; + + autoconfPhase = "./autogen.sh"; + + buildInputs = [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav libupnp ]; + nativeBuildInputs = [ autoconf automake pkgconfig makeWrapper ]; + + postInstall = '' + for prog in "$out/bin/"*; do + wrapProgram "$prog" --suffix GST_PLUGIN_SYSTEM_PATH : "${gst-plugins-base}/lib/gstreamer-1.0:${gst-plugins-good}/lib/gstreamer-1.0:${gst-plugins-bad}/lib/gstreamer-1.0:${gst-plugins-ugly}/lib/gstreamer-1.0:${gst-libav}/lib/gstreamer-1.0" + done + ''; + + meta = with stdenv.lib; { + description = "Resource efficient UPnP/DLNA renderer, optimal for Raspberry Pi, CuBox or a general MediaServer"; + homepage = https://github.com/hzeller/gmrender-resurrect; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.koral ]; + }; +} diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 3a1bba4ce8c13..2f907df8dcac9 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, iptables, libuuid, pkgconfig }: stdenv.mkDerivation rec { - name = "miniupnpd-2.0.20180422"; + name = "miniupnpd-2.0.20180503"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "03g9r519p127sj6rl2x535022bwj8vzvdwp4385v7vnjrd4dswzy"; + sha256 = "031aw66b09ij2yv640xjbp302vkwr8ima5cz7a0951jzhqbfs6xn"; name = "${name}.tar.gz"; }; diff --git a/pkgs/tools/networking/pacparser/default.nix b/pkgs/tools/networking/pacparser/default.nix new file mode 100644 index 0000000000000..54b3cf8fd81e0 --- /dev/null +++ b/pkgs/tools/networking/pacparser/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "pacparser-${version}"; + version = "1.3.7"; + + src = fetchurl { + url = "https://github.com/manugarg/pacparser/releases/download/${version}/${name}.tar.gz"; + sha256 = "0jfjm8lqyhdy9ny8a8icyd4rhclhfn608cr1i15jml82q8pyqj7b"; + }; + + makeFlags = [ "NO_INTERNET=1" ]; + + preConfigure = '' + export makeFlags="$makeFlags PREFIX=$out" + patchShebangs tests/runtests.sh + cd src + ''; + + meta = with stdenv.lib; { + description = "A library to parse proxy auto-config (PAC) files"; + homepage = http://pacparser.manugarg.com/; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index e2d4712d5bc3f..5c1636ddb862b 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -5,11 +5,11 @@ , openssl ? null }: stdenv.mkDerivation rec { - name = "wget-1.19.4"; + name = "wget-1.19.5"; src = fetchurl { url = "mirror://gnu/wget/${name}.tar.lz"; - sha256 = "16jmcqcasx3q9k4azssryli9qyxfq0sfijw998g8zp58cnwzzh1g"; + sha256 = "0xfaxmlnih7dhkyks5wi4vrn0n1xshmy6gx6fb2k1120sprydyr9"; }; patches = [ diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/pkgs/tools/package-management/nix-pin/default.nix index bb3a1faa0c3ba..6f109cd9f4137 100644 --- a/pkgs/tools/package-management/nix-pin/default.nix +++ b/pkgs/tools/package-management/nix-pin/default.nix @@ -1,20 +1,22 @@ -{ pkgs, stdenv, fetchFromGitHub, mypy, python3 }: +{ lib, pkgs, stdenv, fetchFromGitHub, mypy, python3, nix, git, makeWrapper }: let self = stdenv.mkDerivation rec { name = "nix-pin-${version}"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "timbertson"; repo = "nix-pin"; - rev = "version-0.2.2"; - sha256 = "1kw43kzy4m6lnnif51r2a8i4vcgr7d4vqb1c75p7pk2b9y3jwxsz"; + rev = "version-0.3.0"; + sha256 = "1kq50v8m8y1wji63b7y3wh6nv3ahvdxvvbsb07day2zzf5ysy8kj"; }; - buildInputs = [ python3 mypy ]; + buildInputs = [ python3 mypy makeWrapper ]; buildPhase = '' mypy bin/* ''; installPhase = '' mkdir "$out" cp -r bin share "$out" + wrapProgram $out/bin/nix-pin \ + --prefix PATH : "${lib.makeBinPath [ nix git ]}" ''; passthru = let diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 230994897234f..1d15bd11b7faf 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -132,10 +132,10 @@ in rec { }) // { perl-bindings = nixStable; }; nixStable = (common rec { - name = "nix-2.0.1"; + name = "nix-2.0.2"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "689c33b9885b56b7817bf94aad3bc7ccf50710ebb34b01c5a5a2ac4e472750b1"; + sha256 = "2d2984410f73d759485526e594ce41b9819fafa4676f4f85a93dbdd5352a1435"; }; }) // { perl-bindings = perl-bindings { nix = nixStable; }; }; diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index a11b70917c8d5..eb8861486747f 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -1,20 +1,30 @@ { stdenv, fetchFromGitHub , autoreconfHook, pkgconfig -, gtk3, nssTools, pcsclite }: +, gtk3, nssTools, pcsclite +, libxml2, libproxy +, openssl, curl +, makeWrapper }: stdenv.mkDerivation rec { name = "eid-mw-${version}"; - version = "4.1.19"; + version = "4.4.1"; src = fetchFromGitHub { - sha256 = "191c74kxfrfb894v8y4vi2iygyffjy9jjq5fj7cnnddgwai5n3c5"; + sha256 = "0an7xgj5rzl75kq6qfrmm886v639hhlh7c9yfs8iihc47wghpma8"; rev = "v${version}"; repo = "eid-mw"; owner = "Fedict"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ gtk3 pcsclite ]; + nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; + buildInputs = [ gtk3 pcsclite libxml2 libproxy curl openssl ]; + preConfigure = '' + mkdir openssl + ln -s ${openssl.out}/lib openssl + ln -s ${openssl.bin}/bin openssl + ln -s ${openssl.dev}/include openssl + export SSL_PREFIX=$(realpath openssl) + ''; postPatch = '' sed 's@m4_esyscmd_s(.*,@[${version}],@' -i configure.ac @@ -22,41 +32,48 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-dialogs=yes" ]; - enableParallelBuilding = true; - - doCheck = true; - postInstall = '' install -D ${./eid-nssdb.in} $out/bin/eid-nssdb substituteInPlace $out/bin/eid-nssdb \ --replace "modutil" "${nssTools}/bin/modutil" - # Only provides a useless "about-eid-mw.desktop" that segfaults anyway: - rm -r $out/share/applications $out/bin/about-eid-mw + rm $out/bin/about-eid-mw + wrapProgram $out/bin/eid-viewer --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/$name" ''; + enableParallelBuilding = true; + + doCheck = true; + meta = with stdenv.lib; { description = "Belgian electronic identity card (eID) middleware"; homepage = http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/; license = licenses.lgpl3; longDescription = '' Allows user authentication and digital signatures with Belgian ID cards. - Also requires a running pcscd service and compatible card reader. + Also requires a running pcscd service and compatible card reader. + + eid-viewer is also installed. + **TO FIX:** + The procedure below did not work for me, I had to install the .so directly in firefox as instructed at + https://eid.belgium.be/en/log-eid#7507 + and specify + /run/current-system/sw/lib/libbeidpkcs11.so + as the path to the module. + + This package only installs the libraries. To use eIDs in Firefox or + Chromium, the eID Belgium add-on must be installed. This package only installs the libraries. To use eIDs in NSS-compatible browsers like Chrom{e,ium} or Firefox, each user must first execute: - ~$ eid-nssdb add - (Running the script once as root with the --system option enables eID support for all users, but will *not* work when using Chrom{e,ium}!) - Before uninstalling this package, it is a very good idea to run - ~$ eid-nssdb [--system] remove - and remove all ~/.pki and/or /etc/pki directories no longer needed. ''; platforms = platforms.linux; + maintainers = with maintainers; [ bfortz ]; }; } diff --git a/pkgs/tools/security/eid-viewer/default.nix b/pkgs/tools/security/eid-viewer/default.nix deleted file mode 100644 index 10cc314fe1db9..0000000000000 --- a/pkgs/tools/security/eid-viewer/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, jre, pcsclite }: - -stdenv.mkDerivation rec { - name = "eid-viewer-${version}"; - version = "4.1.9"; - - src = fetchurl { - url = "https://downloads.services.belgium.be/eid/eid-viewer-${version}-v${version}.src.tar.gz"; - sha256 = "0bq9jl4kl97j0dfhz4crcb1wqhn420z5vpg510zadvrmqjhy1x4g"; - }; - - buildInputs = [ jre pcsclite ]; - nativeBuildInputs = [ makeWrapper ]; - - unpackPhase = "tar -xzf ${src} --strip-components=1"; - - preConfigure = '' - substituteInPlace eid-viewer.sh.in --replace "exec java" "exec ${jre}/bin/java" - ''; - - postInstall = '' - wrapProgram $out/bin/eid-viewer --suffix LD_LIBRARY_PATH : ${pcsclite}/lib - cat >> $out/share/applications/eid-viewer.desktop << EOF - # eid-viewer creates XML without a header, making it "plain text": - MimeType=application/xml;text/xml;text/plain - EOF - ''; - - doCheck = true; - - meta = with stdenv.lib; { - description = "Belgian electronic identity card (eID) viewer"; - homepage = http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/; - license = licenses.lgpl3; - longDescription = '' - A simple, graphical Java application to view, print and save data from - Belgian electronic identity cards. Independent of the eid-mw package, - which is required to actually use your eID for authentication or signing. - ''; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 743f9136ae538..1bbd4169f2ebd 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, git, gnupg, makeWrapper }: +{ stdenv, buildGoPackage, fetchFromGitHub, git, gnupg, xclip, makeWrapper }: buildGoPackage rec { version = "1.6.11"; @@ -18,6 +18,7 @@ buildGoPackage rec { wrapperPath = with stdenv.lib; makeBinPath ([ git gnupg + xclip ]); postInstall = '' diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix index 7552b21ed3331..e55e97656f637 100644 --- a/pkgs/tools/security/john/default.nix +++ b/pkgs/tools/security/john/default.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; homepage = https://github.com/magnumripper/JohnTheRipper/; maintainers = with maintainers; [ offline ]; - platforms = platforms.unix; + platforms = [ "x86_64-linux" "x86_64-darwin"]; }; } diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix index e0a11f574181c..56a47ea387431 100644 --- a/pkgs/tools/security/lynis/default.nix +++ b/pkgs/tools/security/lynis/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "lynis"; - version = "2.6.3"; + version = "2.6.4"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "CISOfy"; repo = "${pname}"; rev = "${version}"; - sha256 = "17xfs0jr0rf8xvk860l2wpxg0h1m2c1dq41lqnq6wga9jifxmzqd"; + sha256 = "1p449gsackcavw5h9yn0ckk1fkakx9d55izi22gh8wfvijdfhw10"; }; nativeBuildInputs = [ makeWrapper perl ]; diff --git a/pkgs/tools/security/open-ecard/default.nix b/pkgs/tools/security/open-ecard/default.nix new file mode 100644 index 0000000000000..a0af51186edfb --- /dev/null +++ b/pkgs/tools/security/open-ecard/default.nix @@ -0,0 +1,64 @@ +{ stdenv, fetchurl, jre, pcsclite, makeDesktopItem, makeWrapper }: + +let + version = "1.2.4"; + + srcs = { + richclient = fetchurl { + url = "https://jnlp.openecard.org/richclient-${version}-20171212-0958.jar"; + sha256 = "1ckhyhszp4zhfb5mn67lz603b55z814jh0sz0q5hriqzx017j7nr"; + }; + cifs = fetchurl { + url = "https://jnlp.openecard.org/cifs-${version}-20171212-0958.jar"; + sha256 = "0rc862lx3y6sw87r1v5xjmqqpysyr1x6yqhycqmcdrwz0j3wykrr"; + }; + logo = fetchurl { + url = https://raw.githubusercontent.com/ecsec/open-ecard/1.2.3/gui/graphics/src/main/ext/oec_logo_bg-transparent.svg; + sha256 = "0rpmyv10vjx2yfpm03mqliygcww8af2wnrnrppmsazdplksaxkhs"; + }; + }; +in stdenv.mkDerivation rec { + appName = "open-ecard"; + name = "${appName}-${version}"; + + src = srcs.richclient; + + phases = "installPhase"; + + buildInputs = [ makeWrapper ]; + + desktopItem = makeDesktopItem { + name = appName; + desktopName = "Open eCard App"; + genericName = "eCard App"; + comment = "Client side implementation of the eCard-API-Framework"; + icon = "oec_logo_bg-transparent.svg"; + exec = appName; + categories = "Utility;Security;"; + }; + + installPhase = '' + mkdir -p $out/share/java + cp ${srcs.richclient} $out/share/java/richclient-${version}.jar + cp ${srcs.cifs} $out/share/java/cifs-${version}.jar + + mkdir -p $out/share/applications $out/share/pixmaps + cp $desktopItem/share/applications/* $out/share/applications + cp ${srcs.logo} $out/share/pixmaps/oec_logo_bg-transparent.svg + + mkdir -p $out/bin + makeWrapper ${jre}/bin/java $out/bin/${appName} \ + --add-flags "-cp $out/share/java/cifs-${version}.jar" \ + --add-flags "-jar $out/share/java/richclient-${version}.jar" \ + --suffix LD_LIBRARY_PATH ':' ${pcsclite}/lib + ''; + + meta = with stdenv.lib; { + description = "Client side implementation of the eCard-API-Framework (BSI + TR-03112) and related international standards, such as ISO/IEC 24727"; + homepage = https://www.openecard.org/; + license = licenses.gpl3; + maintainers = with maintainers; [ sephalon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 4f9e6c06697c4..5ce0ce0dbc214 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -1,10 +1,12 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub +{ stdenv, lib, pkgs, fetchurl, fetchFromGitHub, buildEnv , coreutils, gnused, getopt, git, tree, gnupg, which, procps, qrencode , makeWrapper , xclip ? null, xdotool ? null, dmenu ? null , x11Support ? !stdenv.isDarwin -, tombPluginSupport ? false, tomb + +# For backwards-compatibility +, tombPluginSupport ? false }: with lib; @@ -14,98 +16,100 @@ assert x11Support -> xclip != null && dmenu != null; let - plugins = map (p: (fetchFromGitHub { - owner = "roddhjav"; - repo = "pass-${p.name}"; - inherit (p) rev sha256; - })) - ([ - { name = "import"; - rev = "491935bd275f29ceac2b876b3a288011d1ce31e7"; - sha256 = "02mbh05ab8h7kc30hz718d1d1vkjz43b96c7p0xnd92610d2q66q"; } - { name = "update"; - rev = "cf576c9036fd18efb9ed29e0e9f811207b556fde"; - sha256 = "1hhbrg6a2walrvla6q4cd3pgrqbcrf9brzjkb748735shxfn52hd"; } - ] ++ stdenv.lib.optional tombPluginSupport { - name = "tomb"; - rev = "3368134898a42c1b758fabac625ec240e125c6be"; - sha256 = "0qqmxfg4w3r088qhlkhs44036mya82vjflsjjhw2hk8y0wd2i6ds"; } - ); - -in stdenv.mkDerivation rec { - version = "1.7.1"; - name = "password-store-${version}"; - - src = fetchurl { - url = "http://git.zx2c4.com/password-store/snapshot/${name}.tar.xz"; - sha256 = "0scqkpll2q8jhzcgcsh9kqz0gwdpvynivqjmmbzax2irjfaiklpn"; - }; + passExtensions = import ./extensions { inherit pkgs; }; + + env = extensions: + let + selected = extensions passExtensions + ++ stdenv.lib.optional tombPluginSupport passExtensions.tomb; + in buildEnv { + name = "pass-extensions-env"; + paths = selected; + buildInputs = concatMap (x: x.buildInputs) selected; + }; + + generic = extensionsEnv: extraPassthru: stdenv.mkDerivation rec { + version = "1.7.1"; + name = "password-store-${version}"; + + src = fetchurl { + url = "http://git.zx2c4.com/password-store/snapshot/${name}.tar.xz"; + sha256 = "0scqkpll2q8jhzcgcsh9kqz0gwdpvynivqjmmbzax2irjfaiklpn"; + }; + + patches = [ ./set-correct-program-name-for-sleep.patch + ] ++ stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ extensionsEnv ]; + + installFlags = [ "PREFIX=$(out)" "WITH_ALLCOMP=yes" ]; + + postInstall = '' + # Install Emacs Mode. NOTE: We can't install the necessary + # dependencies (s.el and f.el) here. The user has to do this + # himself. + mkdir -p "$out/share/emacs/site-lisp" + cp "contrib/emacs/password-store.el" "$out/share/emacs/site-lisp/" + '' + optionalString x11Support '' + cp "contrib/dmenu/passmenu" "$out/bin/" + ''; - patches = [ ./set-correct-program-name-for-sleep.patch - ] ++ stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch; - - nativeBuildInputs = [ makeWrapper ]; - - installFlags = [ "PREFIX=$(out)" "WITH_ALLCOMP=yes" ]; - - postInstall = '' - # plugins - ${stdenv.lib.concatStringsSep "\n" (map (plugin: '' - pushd ${plugin} - PREFIX=$out make install - popd - '') plugins)} - - # Install Emacs Mode. NOTE: We can't install the necessary - # dependencies (s.el and f.el) here. The user has to do this - # himself. - mkdir -p "$out/share/emacs/site-lisp" - cp "contrib/emacs/password-store.el" "$out/share/emacs/site-lisp/" - '' + optionalString x11Support '' - cp "contrib/dmenu/passmenu" "$out/bin/" - ''; - - wrapperPath = with stdenv.lib; makeBinPath ([ - coreutils - getopt - git - gnupg - gnused - tree - which - qrencode - procps - ] ++ optional tombPluginSupport tomb - ++ ifEnable x11Support [ dmenu xclip xdotool ]); - - postFixup = '' - # Fix program name in --help - substituteInPlace $out/bin/pass \ - --replace 'PROGRAM="''${0##*/}"' "PROGRAM=pass" - - # Ensure all dependencies are in PATH - wrapProgram $out/bin/pass \ - --prefix PATH : "${wrapperPath}" - '' + stdenv.lib.optionalString x11Support '' - # We just wrap passmenu with the same PATH as pass. It doesn't - # need all the tools in there but it doesn't hurt either. - wrapProgram $out/bin/passmenu \ - --prefix PATH : "$out/bin:${wrapperPath}" - ''; - - meta = with stdenv.lib; { - description = "Stores, retrieves, generates, and synchronizes passwords securely"; - homepage = https://www.passwordstore.org/; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ lovek323 the-kenny fpletz ]; - platforms = platforms.unix; - - longDescription = '' - pass is a very simple password store that keeps passwords inside gpg2 - encrypted files inside a simple directory tree residing at - ~/.password-store. The pass utility provides a series of commands for - manipulating the password store, allowing the user to add, remove, edit, - synchronize, generate, and manipulate passwords. + wrapperPath = with stdenv.lib; makeBinPath ([ + coreutils + getopt + git + gnupg + gnused + tree + which + qrencode + procps + ] ++ ifEnable x11Support [ dmenu xclip xdotool ]); + + postFixup = '' + # Link extensions env + rmdir $out/lib/password-store/extensions + ln -s ${extensionsEnv}/lib/password-store/extensions $out/lib/password-store/. + + # Fix program name in --help + substituteInPlace $out/bin/pass \ + --replace 'PROGRAM="''${0##*/}"' "PROGRAM=pass" + + # Ensure all dependencies are in PATH + wrapProgram $out/bin/pass \ + --prefix PATH : "${wrapperPath}" + '' + stdenv.lib.optionalString x11Support '' + # We just wrap passmenu with the same PATH as pass. It doesn't + # need all the tools in there but it doesn't hurt either. + wrapProgram $out/bin/passmenu \ + --prefix PATH : "$out/bin:${wrapperPath}" ''; + + passthru = { + extensions = passExtensions; + } // extraPassthru; + + meta = with stdenv.lib; { + description = "Stores, retrieves, generates, and synchronizes passwords securely"; + homepage = https://www.passwordstore.org/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ]; + platforms = platforms.unix; + + longDescription = '' + pass is a very simple password store that keeps passwords inside gpg2 + encrypted files inside a simple directory tree residing at + ~/.password-store. The pass utility provides a series of commands for + manipulating the password store, allowing the user to add, remove, edit, + synchronize, generate, and manipulate passwords. + ''; + }; }; + +in + +generic (env (_: [])) { + withExtensions = extensions: generic (env extensions) {}; } diff --git a/pkgs/tools/security/pass/extensions/default.nix b/pkgs/tools/security/pass/extensions/default.nix new file mode 100644 index 0000000000000..dfb853c0a0bfb --- /dev/null +++ b/pkgs/tools/security/pass/extensions/default.nix @@ -0,0 +1,12 @@ +{ pkgs, ... }: + +with pkgs; + +{ + pass-import = callPackage ./import.nix { + pythonPackages = python3Packages; + }; + pass-otp = callPackage ./otp.nix {}; + pass-tomb = callPackage ./tomb.nix {}; + pass-update = callPackage ./update.nix {}; +} diff --git a/pkgs/tools/security/pass/extensions/import.nix b/pkgs/tools/security/pass/extensions/import.nix new file mode 100644 index 0000000000000..8ba4abc5e3db7 --- /dev/null +++ b/pkgs/tools/security/pass/extensions/import.nix @@ -0,0 +1,37 @@ +{ stdenv, pass, fetchFromGitHub, pythonPackages, makeWrapper }: + +let + pythonEnv = pythonPackages.python.withPackages (p: [ p.defusedxml ]); + +in stdenv.mkDerivation rec { + name = "pass-import-${version}"; + version = "2.2"; + + src = fetchFromGitHub { + owner = "roddhjav"; + repo = "pass-import"; + rev = "v${version}"; + sha256 = "189wf2jz2j43k27930cnl53sm2drh1s0nq1nmh4is3rzn8cna6wq"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ pythonEnv ]; + + dontBuild = true; + + installFlags = [ "PREFIX=$(out)" ]; + + postFixup = '' + wrapProgram $out/lib/password-store/extensions/import.bash \ + --prefix PATH : "${pythonEnv}/bin" + ''; + + meta = with stdenv.lib; { + description = "Pass extension for importing data from existing password managers"; + homepage = https://github.com/roddhjav/pass-import; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/security/pass-otp/default.nix b/pkgs/tools/security/pass/extensions/otp.nix index 7f0f44bdfa444..60198675b29d7 100644 --- a/pkgs/tools/security/pass-otp/default.nix +++ b/pkgs/tools/security/pass/extensions/otp.nix @@ -1,4 +1,5 @@ -{ stdenv, pass, fetchFromGitHub, oathToolkit }: +{ stdenv, fetchFromGitHub, oathToolkit }: + stdenv.mkDerivation rec { name = "pass-otp-${version}"; version = "1.1.0"; @@ -10,15 +11,15 @@ stdenv.mkDerivation rec { sha256 = "1cgj4zc8fq88n3h6c0vkv9i5al785mdprpgpbv5m22dz9p1wqvbb"; }; - buildInputs = [ pass oathToolkit ]; + buildInputs = [ oathToolkit ]; + + dontBuild = true; patchPhase = '' sed -i -e 's|OATH=\$(which oathtool)|OATH=${oathToolkit}/bin/oathtool|' otp.bash ''; - installPhase = '' - make PREFIX=$out install - ''; + installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "A pass extension for managing one-time-password (OTP) tokens"; diff --git a/pkgs/tools/security/pass/extensions/tomb.nix b/pkgs/tools/security/pass/extensions/tomb.nix new file mode 100644 index 0000000000000..b9f458cd4e120 --- /dev/null +++ b/pkgs/tools/security/pass/extensions/tomb.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, tomb }: + +stdenv.mkDerivation rec { + name = "pass-tomb-${version}"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "roddhjav"; + repo = "pass-tomb"; + rev = "v${version}"; + sha256 = "0wxa673yyzasjlkpd5f3yl5zf7bhsw7h1jbhf6sdjz65bypr2596"; + }; + + buildInputs = [ tomb ]; + + dontBuild = true; + + installFlags = [ "PREFIX=$(out)" ]; + + postFixup = '' + substituteInPlace $out/lib/password-store/extensions/tomb.bash \ + --replace 'TOMB="''${PASSWORD_STORE_TOMB:-tomb}"' 'TOMB="''${PASSWORD_STORE_TOMB:-${tomb}/bin/tomb}"' + ''; + + meta = with stdenv.lib; { + description = "Pass extension that keeps the password store encrypted inside a tomb"; + homepage = https://github.com/roddhjav/pass-tomb; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/security/pass/extensions/update.nix b/pkgs/tools/security/pass/extensions/update.nix new file mode 100644 index 0000000000000..dd145b069720a --- /dev/null +++ b/pkgs/tools/security/pass/extensions/update.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "pass-update-${version}"; + version = "2.0"; + + src = fetchFromGitHub { + owner = "roddhjav"; + repo = "pass-update"; + rev = "v${version}"; + sha256 = "0a81q0jfni185zmbislzbcv0qr1rdp0cgr9wf9riygis2xv6rs6k"; + }; + + dontBuild = true; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "Pass extension that provides an easy flow for updating passwords"; + homepage = https://github.com/roddhjav/pass-update; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/security/pgpdump/default.nix b/pkgs/tools/security/pgpdump/default.nix index 09b5b5f58ca4a..82bec2486e814 100644 --- a/pkgs/tools/security/pgpdump/default.nix +++ b/pkgs/tools/security/pgpdump/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "pgpdump-${version}"; - version = "0.32"; + version = "0.33"; src = fetchFromGitHub { owner = "kazu-yamamoto"; repo = "pgpdump"; rev = "v${version}"; - sha256 = "1ip7q5sgh3nwdqbrzpp6sllkls5kma98kns53yspw1830xi1n8xc"; + sha256 = "0pi9qdbmcmi58gmljin51ylbi3zkknl8fm26jm67cpl55hvfsn23"; }; buildInputs = stdenv.lib.optionals supportCompressedPackets [ zlib bzip2 ]; @@ -27,4 +27,3 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ primeos ]; }; } - diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix index a8fb57b2fba06..f26142260fef3 100644 --- a/pkgs/tools/system/acpica-tools/default.nix +++ b/pkgs/tools/system/acpica-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "acpica-tools-${version}"; - version = "20180313"; + version = "20180427"; src = fetchurl { url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - sha256 = "05ab2xfv9wqwbzjaa9xqgrvvan87rxv29hw48h1gcckpc5smp2wm"; + sha256 = "05hczn82dpn7irh8zy9m17hm8r3ngwrbmk69zsldr4k1w3cv40df"; }; NIX_CFLAGS_COMPILE = "-O3"; diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 6996d66abe0c4..9c7a5b36c5bda 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, libgcrypt, readline, libgpgerror }: stdenv.mkDerivation rec { - version = "1.6.1"; + version = "1.6.2"; name = "freeipmi-${version}"; src = fetchurl { url = "mirror://gnu/freeipmi/${name}.tar.gz"; - sha256 = "0jdm1nwsnkj0nzjmcqprmjk25449mhjj25khwzpq3mpjw440wmd2"; + sha256 = "0jhjf21gn1m9lhjsc1ard9zymq25mk7rxcyygjfxgy0vb4j36l9i"; }; buildInputs = [ libgcrypt readline libgpgerror ]; diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index cffce8e3b8833..2ebab9d63904a 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python27Packages }: python27Packages.buildPythonApplication rec { - version = "2.23.0"; + version = "2.25.0"; name = "fanficfare-${version}"; nameprefix = ""; src = fetchurl { url = "https://github.com/JimmXinu/FanFicFare/archive/v${version}.tar.gz"; - sha256 = "0589b5pg03rfv9x753cnbkz6pz508xs1n2lla3qfpagxc0pyg8i1"; + sha256 = "1fval2jhrv3w762rmrbhbn8zj161aalvqy8n8q74yr8hzmpcvlwn"; }; propagatedBuildInputs = with python27Packages; [ beautifulsoup4 chardet html5lib html2text ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5b3c69a001523..fdc6b58346b97 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -202,6 +202,7 @@ mapAliases (rec { openssh_with_kerberos = openssh; # added 2018-01-28 owncloudclient = owncloud-client; # added 2016-08 p11_kit = p11-kit; # added 2018-02-25 + pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # added 2018-05-04 pgp-tools = signing-party; # added 2017-03-26 pidgin-with-plugins = pidgin; # added 2016-06 pidginlatex = pidgin-latex; # added 2018-01-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35cf1cd79252a..ffaaa1aa3ff47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -400,6 +400,8 @@ with pkgs; ### TOOLS + _1password = callPackage ../applications/misc/1password { }; + _9pfs = callPackage ../tools/filesystems/9pfs { }; a2ps = callPackage ../tools/text/a2ps { }; @@ -655,8 +657,11 @@ with pkgs; lastpass-cli = callPackage ../tools/security/lastpass-cli { }; + pacparser = callPackage ../tools/networking/pacparser { }; + pass = callPackage ../tools/security/pass { }; - pass-otp = callPackage ../tools/security/pass-otp { }; + + passExtensions = recurseIntoAttrs pass.extensions; gopass = callPackage ../tools/security/gopass { }; @@ -830,6 +835,8 @@ with pkgs; blink = callPackage ../applications/networking/instant-messengers/blink { }; + bluemix-cli = callPackage ../tools/admin/bluemix-cli { }; + libqmatrixclient = libsForQt5.callPackage ../development/libraries/libqmatrixclient { }; quaternion = libsForQt5.callPackage ../applications/networking/instant-messengers/quaternion { }; @@ -890,7 +897,9 @@ with pkgs; btrfs-dedupe = callPackage ../tools/filesystems/btrfs-dedupe/default.nix {}; - btrbk = callPackage ../tools/backup/btrbk { }; + btrbk = callPackage ../tools/backup/btrbk { + asciidoc = asciidoc-full; + }; buildtorrent = callPackage ../tools/misc/buildtorrent { }; @@ -2104,8 +2113,6 @@ with pkgs; eid-mw = callPackage ../tools/security/eid-mw { }; - eid-viewer = callPackage ../tools/security/eid-viewer { }; - mcrcon = callPackage ../tools/networking/mcrcon {}; tealdeer = callPackage ../tools/misc/tealdeer/default.nix { }; @@ -2558,6 +2565,10 @@ with pkgs; glxinfo = callPackage ../tools/graphics/glxinfo { }; + gmrender-resurrect = callPackage ../tools/networking/gmrender-resurrect { + inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav; + }; + gmvault = callPackage ../tools/networking/gmvault { }; gnash = callPackage ../misc/gnash { }; @@ -3133,9 +3144,7 @@ with pkgs; go-jira = callPackage ../applications/misc/go-jira { }; - john = callPackage ../tools/security/john { - gcc = gcc49; # doesn't build with gcc5 - }; + john = callPackage ../tools/security/john { }; journalbeat = callPackage ../tools/system/journalbeat { }; @@ -3326,8 +3335,6 @@ with pkgs; motion = callPackage ../applications/video/motion { }; - mkcast = callPackage ../applications/video/mkcast { }; - mtail = callPackage ../servers/monitoring/mtail { }; multitail = callPackage ../tools/misc/multitail { }; @@ -3534,6 +3541,8 @@ with pkgs; libwebsockets = callPackage ../development/libraries/libwebsockets { }; + limesuite = callPackage ../applications/misc/limesuite { }; + limesurvey = callPackage ../servers/limesurvey { }; linuxquota = callPackage ../tools/misc/linuxquota { }; @@ -3838,6 +3847,8 @@ with pkgs; namazu = callPackage ../tools/text/namazu { }; + nano-wallet = libsForQt5.callPackage ../applications/altcoins/nano-wallet { }; + nasty = callPackage ../tools/security/nasty { }; nat-traverse = callPackage ../tools/networking/nat-traverse { }; @@ -4087,6 +4098,8 @@ with pkgs; opendylan_bin = callPackage ../development/compilers/opendylan/bin.nix { }; + open-ecard = callPackage ../tools/security/open-ecard { }; + openjade = callPackage ../tools/text/sgml/openjade { }; openmvg = callPackage ../applications/science/misc/openmvg { }; @@ -4291,7 +4304,7 @@ with pkgs; fmodex = callPackage ../games/zandronum/fmod.nix { }; - pdfmod = callPackage ../applications/misc/pdfmod { }; + pdfmod = callPackage ../applications/misc/pdfmod { mono = mono4; }; pdf-quench = callPackage ../applications/misc/pdf-quench { }; @@ -4872,7 +4885,7 @@ with pkgs; simpleproxy = callPackage ../tools/networking/simpleproxy { }; - simplescreenrecorder = callPackage ../applications/video/simplescreenrecorder { }; + simplescreenrecorder = libsForQt5.callPackage ../applications/video/simplescreenrecorder { }; sipsak = callPackage ../tools/networking/sipsak { }; @@ -5130,6 +5143,8 @@ with pkgs; telepresence = callPackage ../tools/networking/telepresence { }; + termplay = callPackage ../tools/misc/termplay { }; + tewisay = callPackage ../tools/misc/tewisay { }; texmacs = if stdenv.isDarwin @@ -5563,6 +5578,8 @@ with pkgs; xprintidle-ng = callPackage ../tools/X11/xprintidle-ng {}; + xscast = callPackage ../applications/video/xscast { }; + xsettingsd = callPackage ../tools/X11/xsettingsd { }; xsensors = callPackage ../os-specific/linux/xsensors { }; @@ -5757,6 +5774,8 @@ with pkgs; xiccd = callPackage ../tools/misc/xiccd { }; + xidlehook = callPackage ../tools/X11/xidlehook {}; + xorriso = callPackage ../tools/cd-dvd/xorriso { }; xpf = callPackage ../tools/text/xml/xpf { @@ -6076,6 +6095,7 @@ with pkgs; }; gcc7Stdenv = overrideCC gccStdenv gcc7; + gcc8Stdenv = overrideCC gccStdenv gcc8; wrapCCMulti = cc: if system == "x86_64-linux" then let @@ -6230,6 +6250,17 @@ with pkgs; isl = if !stdenv.isDarwin then isl_0_17 else null; })); + gcc8 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/8 { + inherit noSysDirs; + + # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion + profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); + + libcCross = if targetPlatform != buildPlatform then libcCross else null; + + isl = if !stdenv.isDarwin then isl_0_17 else null; + })); + gcc-snapshot = lowPrio (wrapCC (callPackage ../development/compilers/gcc/snapshot { inherit noSysDirs; @@ -6713,7 +6744,9 @@ with pkgs; mlton = callPackage ../development/compilers/mlton { }; - mono = mono58; + mono = mono5; + mono5 = mono58; + mono4 = mono48; mono40 = lowPrio (callPackage ../development/compilers/mono/4.0.nix { inherit (darwin) libobjc; @@ -6813,7 +6846,7 @@ with pkgs; buildRustCrate = callPackage ../build-support/rust/build-rust-crate.nix { }; - cargo-vendor = callPackage ../build-support/rust/cargo-vendor {}; + cargo-vendor = callPackage ../build-support/rust/cargo-vendor { }; carnix = (callPackage ../build-support/rust/carnix.nix { }).carnix { }; @@ -6838,6 +6871,8 @@ with pkgs; cargo-edit = callPackage ../tools/package-management/cargo-edit { }; + cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { }; + rainicorn = callPackage ../development/tools/rust/rainicorn { }; rustfmt = callPackage ../development/tools/rust/rustfmt { }; rustracer = callPackage ../development/tools/rust/racer { }; @@ -7078,6 +7113,7 @@ with pkgs; love_0_8 = callPackage ../development/interpreters/love/0.8.nix { lua=lua5_1; }; love_0_9 = callPackage ../development/interpreters/love/0.9.nix { }; love_0_10 = callPackage ../development/interpreters/love/0.10.nix { }; + love_11 = callPackage ../development/interpreters/love/11.1.nix { }; love = love_0_10; ### LUA MODULES @@ -7341,7 +7377,10 @@ with pkgs; bundlerEnv = callPackage ../development/ruby-modules/bundler-env { }; bundlerApp = callPackage ../development/ruby-modules/bundler-app { }; - inherit (callPackage ../development/interpreters/ruby { inherit (darwin.apple_sdk.frameworks) Foundation; }) + inherit (callPackage ../development/interpreters/ruby { + inherit (darwin) libiconv libobjc libunwind; + inherit (darwin.apple_sdk.frameworks) Foundation; + }) ruby_2_3 ruby_2_4 ruby_2_5; @@ -9255,7 +9294,7 @@ with pkgs; gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { }; - gnome-sharp = callPackage ../development/libraries/gnome-sharp {}; + gnome-sharp = callPackage ../development/libraries/gnome-sharp { mono = mono4; }; granite = callPackage ../development/libraries/granite { }; elementary-cmake-modules = callPackage ../development/libraries/elementary-cmake-modules { }; @@ -9387,7 +9426,7 @@ with pkgs; hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { }; - hyena = callPackage ../development/libraries/hyena { }; + hyena = callPackage ../development/libraries/hyena { mono = mono4; }; icu58 = callPackage (import ../development/libraries/icu/58.nix fetchurl) ({ nativeBuildRoot = buildPackages.icu58.override { buildRootOnly = true; }; @@ -11149,6 +11188,8 @@ with pkgs; accounts-qt = callPackage ../development/libraries/accounts-qt { }; + alkimia = callPackage ../development/libraries/alkimia { }; + fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { }; qgpgme = callPackage ../development/libraries/gpgme { }; @@ -11436,6 +11477,30 @@ with pkgs; snappy = callPackage ../development/libraries/snappy { }; + soapyairspy = callPackage ../applications/misc/soapyairspy { }; + + soapybladerf = callPackage ../applications/misc/soapybladerf { }; + + soapyhackrf = callPackage ../applications/misc/soapyhackrf { }; + + soapysdr = callPackage ../applications/misc/soapysdr { inherit (python3Packages) python numpy; }; + + soapyremote = callPackage ../applications/misc/soapyremote { }; + + soapysdr-with-plugins = callPackage ../applications/misc/soapysdr { + inherit (python3Packages) python numpy; + extraPackages = [ + limesuite + soapyairspy + soapybladerf + soapyhackrf + soapyremote + soapyuhd + ]; + }; + + soapyuhd = callPackage ../applications/misc/soapyuhd { }; + socket_wrapper = callPackage ../development/libraries/socket_wrapper { }; sofia_sip = callPackage ../development/libraries/sofia-sip { }; @@ -11912,7 +11977,7 @@ with pkgs; libusb = libusb1; }; - yubikey-personalization-gui = callPackage ../tools/misc/yubikey-personalization-gui { }; + yubikey-personalization-gui = libsForQt5.callPackage ../tools/misc/yubikey-personalization-gui { }; zeitgeist = callPackage ../development/libraries/zeitgeist { }; @@ -12336,8 +12401,6 @@ with pkgs; firebird = callPackage ../servers/firebird { icu = null; stdenv = overrideCC stdenv gcc5; }; firebirdSuper = firebird.override { icu = icu58; superServer = true; stdenv = overrideCC stdenv gcc5; }; - fleet = callPackage ../servers/fleet { }; - foswiki = callPackage ../servers/foswiki { }; frab = callPackage ../servers/web-apps/frab { }; @@ -12916,6 +12979,7 @@ with pkgs; zabbix20 = callPackage ../servers/monitoring/zabbix/2.0.nix { }; zabbix22 = callPackage ../servers/monitoring/zabbix/2.2.nix { }; + zabbix34 = callPackage ../servers/monitoring/zabbix/3.4.nix { }; zipkin = callPackage ../servers/monitoring/zipkin { }; @@ -13459,6 +13523,8 @@ with pkgs; broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { }; + tbs = callPackage ../os-specific/linux/tbs { }; + nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; nvidiaPackages = callPackage ../os-specific/linux/nvidia-x11 { }; @@ -14286,6 +14352,8 @@ with pkgs; ibm-plex = callPackage ../data/fonts/ibm-plex { }; + iconpack-obsidian = callPackage ../data/icons/iconpack-obsidian { }; + inconsolata = callPackage ../data/fonts/inconsolata {}; inconsolata-lgc = callPackage ../data/fonts/inconsolata/lgc.nix {}; @@ -14442,6 +14510,8 @@ with pkgs; powerline-go = callPackage ../tools/misc/powerline-go { }; + powerline-rs = callPackage ../tools/misc/powerline-rs { }; + profont = callPackage ../data/fonts/profont { }; proggyfonts = callPackage ../data/fonts/proggyfonts { }; @@ -14751,9 +14821,12 @@ with pkgs; parity = self.altcoins.parity; parity-beta = self.altcoins.parity-beta; + parity-ui = self.altcoins.parity-ui; stellar-core = self.altcoins.stellar-core; + particl-core = self.altcoins.particl-core; + aumix = callPackage ../applications/audio/aumix { gtkGUI = false; }; @@ -15454,6 +15527,8 @@ with pkgs; epdfview = callPackage ../applications/misc/epdfview { }; + epeg = callPackage ../applications/graphics/epeg/default.nix { }; + inherit (gnome3) epiphany; epic5 = callPackage ../applications/networking/irc/epic5 { }; @@ -15834,7 +15909,7 @@ with pkgs; gitAndTools = recurseIntoAttrs (callPackage ../applications/version-management/git-and-tools {}); - inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar git-secret transcrypt git-crypt; + inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar git-secret git-secrets transcrypt git-crypt; gitMinimal = git.override { withManual = false; @@ -15978,8 +16053,6 @@ with pkgs; google-chrome-dev = google-chrome.override { chromium = chromiumDev; channel = "dev"; }; - googleearth = callPackage_i686 ../applications/misc/googleearth { }; - google-play-music-desktop-player = callPackage ../applications/audio/google-play-music-desktop-player { inherit (gnome2) GConf; }; @@ -16381,6 +16454,11 @@ with pkgs; kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { }; + kmymoney = libsForQt5.callPackage ../applications/office/kmymoney { + inherit (kdeApplications) kidentitymanagement; + inherit (kdeFrameworks) kdewebkit; + }; + kodestudio = callPackage ../applications/editors/kodestudio { }; konversation = libsForQt5.callPackage ../applications/networking/irc/konversation { }; @@ -16637,7 +16715,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) vmnet; }; - minitube = callPackage ../applications/video/minitube { }; + minitube = libsForQt5.callPackage ../applications/video/minitube { }; mimms = callPackage ../applications/audio/mimms {}; @@ -16865,9 +16943,6 @@ with pkgs; p4v = libsForQt5.callPackage ../applications/version-management/p4v { }; - panamax_api = callPackage ../applications/networking/cluster/panamax/api { }; - panamax_ui = callPackage ../applications/networking/cluster/panamax/ui { }; - partio = callPackage ../development/libraries/partio {}; pcmanfm = callPackage ../applications/misc/pcmanfm { }; @@ -17746,7 +17821,6 @@ with pkgs; }; spotify = callPackage ../applications/audio/spotify { - inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; libpng = libpng12; curl = curl.override { @@ -17785,6 +17859,8 @@ with pkgs; inherit sbcl lispPackages; }; + sublime = callPackage ../applications/editors/sublime/2 { }; + sublime3Packages = recurseIntoAttrs (callPackage ../applications/editors/sublime/3/packages.nix { }); sublime3 = sublime3Packages.sublime3; @@ -19396,7 +19472,7 @@ with pkgs; wesnoth = callPackage ../games/wesnoth { }; - wesnoth-dev = callPackage ../games/wesnoth/dev.nix { }; + wesnoth-dev = wesnoth; widelands = callPackage ../games/widelands { lua = lua5_2; @@ -19563,6 +19639,8 @@ with pkgs; numix-sx-gtk-theme = callPackage ../misc/themes/numix-sx { }; + theme-obsidian2 = callPackage ../misc/themes/obsidian2 { }; + onestepback = callPackage ../misc/themes/onestepback { }; theme-vertex = callPackage ../misc/themes/vertex { }; @@ -19751,12 +19829,14 @@ with pkgs; # great feature, but it's of limited use with pre-built binaries # coming from a central build farm. tolerateCpuTimingInaccuracy = true; - liblapack = liblapack_3_5_0WithoutAtlas; + liblapack = liblapackWithoutAtlas; withLapack = false; }; blas = callPackage ../development/libraries/science/math/blas { }; + brial = callPackage ../development/libraries/science/math/brial { }; + clblas = callPackage ../development/libraries/science/math/clblas { inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo OpenCL; }; @@ -19773,11 +19853,8 @@ with pkgs; # with atlas. Atlas, when built with liblapack as a dependency, uses 3.5.0 # without atlas. Etc. liblapack = callPackage ../development/libraries/science/math/liblapack {}; + liblapackWithoutAtlas = liblapackWithAtlas.override { atlas = null; }; liblapackWithAtlas = liblapack; - liblapackWithoutAtlas = liblapack.override { atlas = null; }; - liblapack_3_5_0 = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix {}; - liblapack_3_5_0WithAtlas = liblapack_3_5_0; - liblapack_3_5_0WithoutAtlas = liblapack_3_5_0.override { atlas = null; }; liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; @@ -20973,6 +21050,7 @@ with pkgs; fontconfigSupport = true; alsaSupport = true; openglSupport = true; + vulkanSupport = stdenv.isLinux; tlsSupport = true; cupsSupport = true; dbusSupport = true; @@ -21225,6 +21303,8 @@ with pkgs; tests = recurseIntoAttrs { cc-wrapper = callPackage ../test/cc-wrapper { }; cc-wrapper-gcc = callPackage ../test/cc-wrapper { stdenv = gccStdenv; }; + cc-wrapper-gcc7 = callPackage ../test/cc-wrapper { stdenv = gcc7Stdenv; }; + cc-wrapper-gcc8 = callPackage ../test/cc-wrapper { stdenv = gcc8Stdenv; }; cc-wrapper-clang = callPackage ../test/cc-wrapper { stdenv = llvmPackages.stdenv; }; cc-wrapper-libcxx = callPackage ../test/cc-wrapper { stdenv = llvmPackages.libcxxStdenv; }; cc-wrapper-clang-39 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_39.stdenv; }; diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix index a9f21e45aed4d..df462665dd160 100644 --- a/pkgs/top-level/impure.nix +++ b/pkgs/top-level/impure.nix @@ -41,7 +41,7 @@ in # fix-point made by Nixpkgs. overlays ? let isDir = path: pathExists (path + "/."); - pathOverlays = try <nixpkgs-overlays> ""; + pathOverlays = try (toString <nixpkgs-overlays>) ""; homeOverlaysFile = homeDir + "/.config/nixpkgs/overlays.nix"; homeOverlaysDir = homeDir + "/.config/nixpkgs/overlays"; overlays = path: diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 741a58ce588a0..bce2662abfd1a 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -217,10 +217,7 @@ let easy-format = callPackage ../development/ocaml-modules/easy-format { }; - eliom = callPackage ../development/ocaml-modules/eliom { - lwt = lwt2; - js_of_ocaml = js_of_ocaml_2; - }; + eliom = callPackage ../development/ocaml-modules/eliom { }; enumerate = callPackage ../development/ocaml-modules/enumerate { }; @@ -504,7 +501,7 @@ let ocplib-simplex = callPackage ../development/ocaml-modules/ocplib-simplex { }; - ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { lwt = lwt2; }; + ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { }; ocsigen-start = callPackage ../development/ocaml-modules/ocsigen-start { }; @@ -1046,5 +1043,10 @@ in rec ocamlPackages_latest = ocamlPackages_4_06; - ocamlPackages = ocamlPackages_4_05; + ocamlPackages = + # OCaml 4.05 is broken on aarch64 + if system == "aarch64-linux" then + ocamlPackages_4_06 + else + ocamlPackages_4_05; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d789b6814b631..61a396e56efb6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5625,7 +5625,17 @@ in { }; }; - pytorch = callPackage ../development/python-modules/pytorch { }; + pytorch = callPackage ../development/python-modules/pytorch { + cudaSupport = pkgs.config.cudaSupport or false; + }; + + pytorchWithCuda = self.pytorch.override { + cudaSupport = true; + }; + + pytorchWithoutCuda = self.pytorch.override { + cudaSupport = false; + }; python2-pythondialog = buildPythonPackage rec { name = "python2-pythondialog-${version}"; @@ -11559,11 +11569,15 @@ in { sha256 = "9b47c5c3a094fa518ca88aeed35ae75834d53e4285512c61879f67a48c94ddaf"; }; propagatedBuildInputs = [ pkgs.libGLU_combined pkgs.freeglut self.pillow ]; - patchPhase = '' - sed -i "s|util.find_library( name )|name|" OpenGL/platform/ctypesloader.py - sed -i "s|'GL',|'libGL.so',|" OpenGL/platform/glx.py - sed -i "s|'GLU',|'${pkgs.libGLU_combined}/lib/libGLU.so',|" OpenGL/platform/glx.py - sed -i "s|'glut',|'${pkgs.freeglut}/lib/libglut.so',|" OpenGL/platform/glx.py + patchPhase = let + ext = stdenv.hostPlatform.extensions.sharedLibrary; in '' + substituteInPlace OpenGL/platform/glx.py \ + --replace "'GL'" "'${pkgs.libGL}/lib/libGL${ext}'" \ + --replace "'GLU'" "'${pkgs.libGLU}/lib/libGLU${ext}'" \ + --replace "'glut'" "'${pkgs.freeglut}/lib/libglut${ext}'" + substituteInPlace OpenGL/platform/darwin.py \ + --replace "'OpenGL'" "'${pkgs.libGL}/lib/libGL${ext}'" \ + --replace "'GLUT'" "'${pkgs.freeglut}/lib/libglut${ext}'" ''; meta = { homepage = http://pyopengl.sourceforge.net/; @@ -18241,6 +18255,14 @@ EOF h11 = callPackage ../development/python-modules/h11 { }; python-docx = callPackage ../development/python-modules/python-docx { }; + + aiohue = callPackage ../development/python-modules/aiohue { }; + + PyMVGLive = callPackage ../development/python-modules/pymvglive { }; + + coinmarketcap = callPackage ../development/python-modules/coinmarketcap { }; + + pyowm = callPackage ../development/python-modules/pyowm { }; }); in fix' (extends overrides packages) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 58c00cd84d337..5a2de846ade4c 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -107,6 +107,10 @@ let jobs.tests.cc-wrapper.x86_64-linux jobs.tests.cc-wrapper.x86_64-darwin + jobs.tests.cc-wrapper-gcc7.x86_64-linux + jobs.tests.cc-wrapper-gcc7.x86_64-darwin + jobs.tests.cc-wrapper-gcc8.x86_64-linux + jobs.tests.cc-wrapper-gcc8.x86_64-darwin jobs.tests.cc-wrapper-clang.x86_64-linux jobs.tests.cc-wrapper-clang.x86_64-darwin jobs.tests.cc-wrapper-libcxx.x86_64-linux diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 9b8fefaf8bab2..a73f11e69a4ad 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -1,4 +1,5 @@ -{ pkgs, buildEnv, runCommand, hostPlatform, stdenv, lib }: +{ pkgs, buildEnv, runCommand, hostPlatform, lib +, stdenv }: # These are some unix tools that are commonly included in the /usr/bin # and /usr/sbin directory under more normal distributions. Along with @@ -11,28 +12,21 @@ # input, not "procps" which requires Linux. let - singleBinary = cmd: providers: let - provider = lib.getBin providers.${hostPlatform.parsed.kernel.name}; + provider = "${lib.getBin providers.${hostPlatform.parsed.kernel.name}}/bin/${cmd}"; in runCommand cmd { meta.platforms = map (n: { kernel.name = n; }) (pkgs.lib.attrNames providers); } '' - mkdir -p $out/bin $out/share/man/man1 + mkdir -p $out/bin - if ! [ -x "${provider}/bin/${cmd}" ]; then + if ! [ -x "${provider}" ]; then echo "Cannot find command ${cmd}" exit 1 fi - cp "${provider}/bin/${cmd}" "$out/bin/${cmd}" - - if [ -f "${provider}/share/man/man1/${cmd}.1.gz" ]; then - cp "${provider}/share/man/man1/${cmd}.1.gz" "$out/share/man/man1/${cmd}.1.gz" - fi + ln -s "${provider}" "$out/bin/${cmd}" ''; -in rec { - # more is unavailable in darwin # just use less more_compat = runCommand "more" {} '' @@ -40,127 +34,124 @@ in rec { ln -s ${pkgs.less}/bin/less $out/bin/more ''; - # singular binaries - arp = singleBinary "arp" { - linux = pkgs.nettools; - darwin = pkgs.darwin.network_cmds; - }; - col = singleBinary "col" { - linux = pkgs.utillinux; - darwin = pkgs.darwin.text_cmds; - }; - eject = singleBinary "eject" { - linux = pkgs.utillinux; - }; - getconf = singleBinary "getconf" { - linux = if hostPlatform.isMusl then pkgs.musl-getconf - else lib.getBin stdenv.cc.libc; - darwin = pkgs.darwin.system_cmds; - }; - getent = singleBinary "getent" { - linux = if hostPlatform.isMusl then pkgs.musl-getent - # This may not be right on other platforms, but preserves existing behavior - else /* if hostPlatform.libc == "glibc" then */ pkgs.glibc.bin; - }; - getopt = singleBinary "getopt" { - linux = pkgs.utillinux; - darwin = pkgs.getopt; - }; - fdisk = singleBinary "fdisk" { - linux = pkgs.utillinux; - darwin = pkgs.darwin.diskdev_cmds; - }; - fsck = singleBinary "fsck" { - linux = pkgs.utillinux; - darwin = pkgs.darwin.diskdev_cmds; - }; - hexdump = singleBinary "hexdump" { - linux = pkgs.utillinux; - darwin = pkgs.darwin.shell_cmds; - }; - hostname = singleBinary "hostname" { - linux = pkgs.nettools; - darwin = pkgs.darwin.shell_cmds; - }; - ifconfig = singleBinary "ifconfig" { - linux = pkgs.nettools; - darwin = pkgs.darwin.network_cmds; - }; - logger = singleBinary "logger" { - linux = pkgs.utillinux; - }; - more = singleBinary "more" { - linux = pkgs.utillinux; - darwin = more_compat; - }; - mount = singleBinary "mount" { - linux = pkgs.utillinux; - darwin = pkgs.darwin.diskdev_cmds; + bins = lib.mapAttrs singleBinary { + # singular binaries + arp = { + linux = pkgs.nettools; + darwin = pkgs.darwin.network_cmds; + }; + col = { + linux = pkgs.utillinux; + darwin = pkgs.darwin.text_cmds; + }; + eject = { + linux = pkgs.utillinux; + }; + getconf = singleBinary "getconf" { + linux = if hostPlatform.isMusl then pkgs.musl-getconf + else lib.getBin stdenv.cc.libc; + darwin = pkgs.darwin.system_cmds; + }; + getent = { + linux = if hostPlatform.isMusl then pkgs.musl-getent + # This may not be right on other platforms, but preserves existing behavior + else /* if hostPlatform.libc == "glibc" then */ pkgs.glibc.bin; + }; + getopt = { + linux = pkgs.utillinux; + darwin = pkgs.getopt; + }; + fdisk = { + linux = pkgs.utillinux; + darwin = pkgs.darwin.diskdev_cmds; + }; + fsck = { + linux = pkgs.utillinux; + darwin = pkgs.darwin.diskdev_cmds; + }; + hexdump = { + linux = pkgs.utillinux; + darwin = pkgs.darwin.shell_cmds; + }; + hostname = { + linux = pkgs.nettools; + darwin = pkgs.darwin.shell_cmds; + }; + ifconfig = { + linux = pkgs.nettools; + darwin = pkgs.darwin.network_cmds; + }; + logger = { + linux = pkgs.utillinux; + }; + more = { + linux = pkgs.utillinux; + darwin = more_compat; + }; + mount = { + linux = pkgs.utillinux; + darwin = pkgs.darwin.diskdev_cmds; + }; + netstat = { + linux = pkgs.nettools; + darwin = pkgs.darwin.network_cmds; + }; + ping = { + linux = pkgs.iputils; + darwin = pkgs.darwin.network_cmds; + }; + ps = { + linux = pkgs.procps; + darwin = pkgs.darwin.ps; + }; + quota = { + linux = pkgs.linuxquota; + darwin = pkgs.darwin.diskdev_cmds; + }; + route = { + linux = pkgs.nettools; + darwin = pkgs.darwin.network_cmds; + }; + script = { + linux = pkgs.utillinux; + darwin = pkgs.darwin.shell_cmds; + }; + sysctl = { + linux = pkgs.procps; + darwin = pkgs.darwin.system_cmds; + }; + top = { + linux = pkgs.procps; + darwin = pkgs.darwin.top; + }; + umount = { + linux = pkgs.utillinux; + darwin = pkgs.darwin.diskdev_cmds; + }; + whereis = { + linux = pkgs.utillinux; + darwin = pkgs.darwin.shell_cmds; + }; + wall = { + linux = pkgs.utillinux; + }; + write = { + linux = pkgs.utillinux; + darwin = pkgs.darwin.basic_cmds; + }; }; - netstat = singleBinary "netstat" { - linux = pkgs.nettools; - darwin = pkgs.darwin.network_cmds; - }; - ping = singleBinary "ping" { - linux = pkgs.iputils; - darwin = pkgs.darwin.network_cmds; - }; - ps = singleBinary "ps" { - linux = pkgs.procps; - darwin = pkgs.darwin.ps; - }; - quota = singleBinary "quota" { - linux = pkgs.linuxquota; - darwin = pkgs.darwin.diskdev_cmds; - }; - route = singleBinary "route" { - linux = pkgs.nettools; - darwin = pkgs.darwin.network_cmds; - }; - script = singleBinary "script" { - linux = pkgs.utillinux; - darwin = pkgs.darwin.shell_cmds; - }; - sysctl = singleBinary "sysctl" { - linux = pkgs.procps; - darwin = pkgs.darwin.system_cmds; - }; - top = singleBinary "top" { - linux = pkgs.procps; - darwin = pkgs.darwin.top; - }; - umount = singleBinary "umount" { - linux = pkgs.utillinux; - darwin = pkgs.darwin.diskdev_cmds; - }; - whereis = singleBinary "whereis" { - linux = pkgs.utillinux; - darwin = pkgs.darwin.shell_cmds; - }; - wall = singleBinary "wall" { - linux = pkgs.utillinux; - }; - write = singleBinary "write" { - linux = pkgs.utillinux; - darwin = pkgs.darwin.basic_cmds; + + makeCompat = name': value: buildEnv { + name = name' + "-compat"; + paths = value; }; # Compatibility derivations # Provided for old usage of these commands. - - procps = buildEnv { - name = "procps-compat"; - paths = [ ps sysctl top ]; - }; - - utillinux = buildEnv { - name = "utillinux-compat"; - paths = [ fsck fdisk getopt hexdump mount - script umount whereis write col ]; - }; - - nettools = buildEnv { - name = "nettools-compat"; - paths = [ arp hostname ifconfig netstat route ]; + compat = with bins; lib.mapAttrs makeCompat { + procps = [ ps sysctl top ]; + utillinux = [ fsck fdisk getopt hexdump mount + script umount whereis write col ]; + nettools = [ arp hostname ifconfig netstat route ]; }; -} +in bins // compat |