diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 27f4da36f2d..d84c6a59538 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -66,11 +66,11 @@
/doc/languages-frameworks/python.section.md @FRidh
# Haskell
-/pkgs/development/compilers/ghc @basvandijk @cdepillabout
-/pkgs/development/haskell-modules @basvandijk @cdepillabout @infinisil
-/pkgs/development/haskell-modules/default.nix @basvandijk @cdepillabout
-/pkgs/development/haskell-modules/generic-builder.nix @basvandijk @cdepillabout
-/pkgs/development/haskell-modules/hoogle.nix @basvandijk @cdepillabout
+/pkgs/development/compilers/ghc @cdepillabout
+/pkgs/development/haskell-modules @cdepillabout @infinisil
+/pkgs/development/haskell-modules/default.nix @cdepillabout
+/pkgs/development/haskell-modules/generic-builder.nix @cdepillabout
+/pkgs/development/haskell-modules/hoogle.nix @cdepillabout
# Perl
/pkgs/development/interpreters/perl @volth
diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 36afdae3866..4ca932d1792 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -36,9 +36,8 @@ rec {
else if final.isUClibc then "uclibc"
else if final.isAndroid then "bionic"
else if final.isLinux /* default */ then "glibc"
- else if final.isMsp430 then "newlib"
- else if final.isVc4 then "newlib"
else if final.isAvr then "avrlibc"
+ else if final.isNone then "newlib"
else if final.isNetBSD then "nblibc"
# TODO(@Ericson2314) think more about other operating systems
else "native/impure";
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 04f0d882d8d..6de84f4982d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1085,6 +1085,12 @@
githubId = 7716744;
name = "Berno Strik";
};
+ brettlyons = {
+ email = "blyons@fastmail.com";
+ github = "brettlyons";
+ githubId = 3043718;
+ name = "Brett Lyons";
+ };
btlvr = {
email = "btlvr@protonmail.com";
github = "btlvr";
@@ -1362,6 +1368,12 @@
githubId = 25088352;
name = "Christian Kögler";
};
+ clkamp = {
+ email = "c@lkamp.de";
+ github = "clkamp";
+ githubId = 46303707;
+ name = "Christian Lütke-Stetzkamp";
+ };
kampka = {
email = "christian@kampka.net";
github = "kampka";
@@ -6075,6 +6087,20 @@
githubId = 807447;
name = "Robert Scott";
};
+ risson = {
+ name = "Marc Schmitt";
+ email = "marc.schmitt@risson.space";
+ github = "rissson";
+ githubId = 18313093;
+ keys = [
+ { longkeyid = "rsa4096/0xF6FD87B15C263EC9";
+ fingerprint = "8A0E 6A7C 08AB B9DE 67DE 2A13 F6FD 87B1 5C26 3EC9";
+ }
+ { longkeyid = "ed25519/0xBBB7A6801DF1E03F";
+ fingerprint = "C0A7 A9BB 115B C857 4D75 EA99 BBB7 A680 1DF1 E03F";
+ }
+ ];
+ };
rittelle = {
email = "rittelle@posteo.de";
github = "rittelle";
@@ -6648,6 +6674,12 @@
email = "jot.skrzyp@gmail.com";
name = "Jakub Skrzypnik";
};
+ skykanin = {
+ email = "skykanin@users.noreply.github.com";
+ github = "skykanin";
+ githubId = 3789764;
+ name = "skykanin";
+ };
sleexyz = {
email = "freshdried@gmail.com";
github = "sleexyz";
@@ -6790,6 +6822,12 @@
githubId = 4061736;
name = "Severen Redwood";
};
+ sstef = {
+ email = "stephane@nix.frozenid.net";
+ github = "fkstef";
+ githubId = 8668915;
+ name = "Stephane Schitter";
+ };
steell = {
email = "steve@steellworks.com";
github = "Steell";
@@ -7748,7 +7786,7 @@
email = "worldofpeace@protonmail.ch";
github = "worldofpeace";
githubId = 28888242;
- name = "Worldofpeace";
+ name = "worldofpeace";
};
wscott = {
email = "wsc9tt@gmail.com";
@@ -8102,4 +8140,17 @@
githubId = 3674056;
name = "Asad Saeeduddin";
};
+ ngerstle = {
+ name = "Nicholas Gerstle";
+ email = "ngerstle@gmail.com";
+ github = "ngerstle";
+ };
+ xavierzwirtz = {
+ email = "me@xavierzwirtz.com";
+ github = "xavierzwirtz";
+ githubId = 474343;
+ name = "Xavier Zwirtz";
+ };
}
+
+
diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix
index bbc3004b1c4..7c45e148e82 100755
--- a/maintainers/scripts/update.nix
+++ b/maintainers/scripts/update.nix
@@ -2,6 +2,7 @@
, maintainer ? null
, path ? null
, max-workers ? null
+, include-overlays ? false
, keep-going ? null
}:
@@ -20,9 +21,7 @@ let
in
[x] ++ nubOn f xs;
- pkgs = import ./../../default.nix {
- overlays = [];
- };
+ pkgs = import ./../../default.nix (if include-overlays then { } else { overlays = []; });
packagesWith = cond: return: set:
nubOn (pkg: pkg.updateScript)
diff --git a/nixos/doc/manual/development/releases.xml b/nixos/doc/manual/development/releases.xml
index a22a0a3707b..cc0ec78cc74 100755
--- a/nixos/doc/manual/development/releases.xml
+++ b/nixos/doc/manual/development/releases.xml
@@ -71,8 +71,9 @@
Update versionSuffix in
- nixos/release.nix, use git log
- --format=%an|wc -l to get the commit count
+ nixos/release.nix, use
+ git rev-list --count 17.09-beta
+ to get the commit count.
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index d07b7cf49c3..892208b01d7 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -20,7 +20,7 @@
- Support is planned until the end of October 2020, handing over to 20.09.
+ Support is planned until the end of April 2021, handing over to 21.03.
@@ -59,7 +59,18 @@
-
+
+ Grafana is now built without support for phantomjs by default. Phantomjs support has been
+ deprecated in Grafana
+ and the phantomjs project is
+ currently unmaintained.
+ It can still be enabled by providing phantomJsSupport = true to the package instanciation:
+{
+ services.grafana.package = pkgs.grafana.overrideAttrs (oldAttrs: rec {
+ phantomJsSupport = false;
+ });
+}
+
diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index aba9bc0945b..4100ec89701 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -116,6 +116,7 @@ in
"/lib" # FIXME: remove and update debug-info.nix
"/sbin"
"/share/emacs"
+ "/share/hunspell"
"/share/nano"
"/share/org"
"/share/themes"
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
index 23c3426bff0..62cbdbcfd17 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
@@ -1,5 +1,4 @@
-# This module defines a NixOS installation CD that contains X11 and
-# GNOME 3.
+# This module defines a NixOS installation CD that contains GNOME.
{ lib, ... }:
@@ -10,10 +9,22 @@ with lib;
services.xserver.desktopManager.gnome3.enable = true;
- # Auto-login as root.
- services.xserver.displayManager.gdm.autoLogin = {
+ # Wayland can be problematic for some hardware like Nvidia graphics cards.
+ services.xserver.displayManager.defaultSession = "gnome-xorg";
+
+ services.xserver.displayManager.gdm = {
enable = true;
- user = "root";
+ # autoSuspend makes the machine automatically suspend after inactivity.
+ # It's possible someone could/try to ssh'd into the machine and obviously
+ # have issues because it's inactive.
+ # See:
+ # * https://github.com/NixOS/nixpkgs/pull/63790
+ # * https://gitlab.gnome.org/GNOME/gnome-control-center/issues/22
+ autoSuspend = false;
+ autoLogin = {
+ enable = true;
+ user = "nixos";
+ };
};
}
diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
index 72b5850a4d9..2068f27f1c9 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,5 +1,5 @@
{
- x86_64-linux = "/nix/store/68mycwwczrciryylq2a66jwfhxp09zsg-nix-2.3.3-debug";
+ x86_64-linux = "/nix/store/ddmmzn4ggz1f66lwxjy64n89864yj9w9-nix-2.3.3";
i686-linux = "/nix/store/5axys7hsggb4282dsbps5k5p0v59yv13-nix-2.3.3";
aarch64-linux = "/nix/store/k80nwvi19hxwbz3c9cxgp24f1jjxwmcc-nix-2.3.3";
x86_64-darwin = "/nix/store/lrnvapsqmf0ja6zfyx4cpxr7ahdr7f9b-nix-2.3.3";
diff --git a/nixos/modules/programs/fish_completion-generator.patch b/nixos/modules/programs/fish_completion-generator.patch
index a8c797d185a..997f38c5066 100644
--- a/nixos/modules/programs/fish_completion-generator.patch
+++ b/nixos/modules/programs/fish_completion-generator.patch
@@ -1,11 +1,13 @@
--- a/create_manpage_completions.py
+++ b/create_manpage_completions.py
-@@ -776,8 +776,6 @@ def parse_manpage_at_path(manpage_path, output_directory):
-
+@@ -844,10 +844,6 @@ def parse_manpage_at_path(manpage_path, output_directory):
+
built_command_output.insert(0, "# " + CMDNAME)
-
+
- # Output the magic word Autogenerated so we can tell if we can overwrite this
-- built_command_output.insert(1, "# Autogenerated from man page " + manpage_path)
+- built_command_output.insert(
+- 1, "# Autogenerated from man page " + manpage_path
+- )
# built_command_output.insert(2, "# using " + parser.__class__.__name__) # XXX MISATTRIBUTES THE CULPABILE PARSER! Was really using Type2 but reporting TypeDeroffManParser
-
+
for line in built_command_output:
diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index 7da6666f79c..238c18242c1 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -325,10 +325,10 @@ in
KEY=${spath}/certificates/${keyName}.key
if [ -e $KEY -a $KEY -nt key.pem ]; then
cp -p ${spath}/certificates/${keyName}.key key.pem
- cp -p ${spath}/certificates/${keyName}.crt cert.pem
+ cp -p ${spath}/certificates/${keyName}.crt fullchain.pem
cp -p ${spath}/certificates/${keyName}.issuer.crt chain.pem
- cat cert.pem chain.pem > fullchain.pem
- cat key.pem cert.pem chain.pem > full.pem
+ ln -s fullchain.pem cert.pem
+ cat key.pem fullchain.pem > full.pem
chmod ${rights} *.pem
chown '${data.user}:${data.group}' *.pem
fi
diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index c70d999ca96..050872e933f 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@@ -355,6 +355,7 @@ in
ExecStart = "${wrappedSlurm}/bin/slurmd";
PIDFile = "/run/slurmd.pid";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+ LimitMEMLOCK = "infinity";
};
preStart = ''
diff --git a/nixos/modules/services/continuous-integration/buildkite-agents.nix b/nixos/modules/services/continuous-integration/buildkite-agents.nix
index fbda2731bbf..c17d89c387a 100644
--- a/nixos/modules/services/continuous-integration/buildkite-agents.nix
+++ b/nixos/modules/services/continuous-integration/buildkite-agents.nix
@@ -258,7 +258,7 @@ in
});
config.assertions = mapAgents (name: cfg: [
- { assertion = cfg.hooksPath == hooksDir || all (v: v == null) (attrValues cfg.hooks);
+ { assertion = cfg.hooksPath == (hooksDir cfg) || all (v: v == null) (attrValues cfg.hooks);
message = ''
Options `services.buildkite-agents.${name}.hooksPath' and
`services.buildkite-agents.${name}.hooks.' are mutually exclusive.
diff --git a/nixos/modules/services/misc/parsoid.nix b/nixos/modules/services/misc/parsoid.nix
index 61626e78f8b..09b7f977bfb 100644
--- a/nixos/modules/services/misc/parsoid.nix
+++ b/nixos/modules/services/misc/parsoid.nix
@@ -6,7 +6,7 @@ let
cfg = config.services.parsoid;
- parsoid = pkgs.nodePackages."parsoid-git://github.com/abbradar/parsoid#stable";
+ parsoid = pkgs.nodePackages.parsoid;
confTree = {
worker_heartbeat_timeout = 300000;
@@ -98,8 +98,29 @@ in
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
serviceConfig = {
- User = "nobody";
ExecStart = "${parsoid}/lib/node_modules/parsoid/bin/server.js -c ${confFile} -n ${toString cfg.workers}";
+
+ DynamicUser = true;
+ User = "parsoid";
+ Group = "parsoid";
+
+ CapabilityBoundingSet = "";
+ NoNewPrivileges = true;
+ ProtectSystem = "strict";
+ ProtectHome = true;
+ PrivateTmp = true;
+ PrivateDevices = true;
+ ProtectHostname = true;
+ ProtectKernelTunables = true;
+ ProtectKernelModules = true;
+ ProtectControlGroups = true;
+ RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
+ RestrictNamespaces = true;
+ LockPersonality = true;
+ #MemoryDenyWriteExecute = true;
+ RestrictRealtime = true;
+ RestrictSUIDSGID = true;
+ RemoveIPC = true;
};
};
diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index f476b147a57..c0619211c2f 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -19,7 +19,7 @@ let
map (i: i.name) (filter (i: if i.useDHCP != null then !i.useDHCP else i.ipv4.addresses != [ ]) interfaces)
++ mapAttrsToList (i: _: i) config.networking.sits
++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bridges))
- ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.vswitches))
+ ++ flatten (concatMap (i: attrNames (filterAttrs (_: config: config.type != "internal") i.interfaces)) (attrValues config.networking.vswitches))
++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bonds))
++ config.networking.dhcpcd.denyInterfaces;
diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix
index a2f91a4200b..c5a84eebd46 100644
--- a/nixos/modules/services/networking/kresd.nix
+++ b/nixos/modules/services/networking/kresd.nix
@@ -32,9 +32,9 @@ let
+ cfg.extraConfig
);
- package = pkgs.knot-resolver.override {
- extraFeatures = cfg.listenDoH != [];
- };
+ package = if cfg.listenDoH == []
+ then pkgs.knot-resolver # never force `extraFeatures = false`
+ else pkgs.knot-resolver.override { extraFeatures = true; };
in {
meta.maintainers = [ maintainers.vcunat /* upstream developer */ ];
diff --git a/nixos/modules/services/networking/stubby.nix b/nixos/modules/services/networking/stubby.nix
index b38bcd4cec0..849d266576d 100644
--- a/nixos/modules/services/networking/stubby.nix
+++ b/nixos/modules/services/networking/stubby.nix
@@ -72,6 +72,7 @@ let
resolution_type: GETDNS_RESOLUTION_STUB
dns_transport_list:
${fallbacks}
+ appdata_dir: "/var/cache/stubby"
tls_authentication: ${cfg.authenticationMode}
tls_query_padding_blocksize: ${toString cfg.queryPaddingBlocksize}
edns_client_subnet_private: ${if cfg.subnetPrivate then "1" else "0"}
@@ -208,6 +209,7 @@ in
CapabilityBoundingSet = "CAP_NET_BIND_SERVICE";
ExecStart = "${pkgs.stubby}/bin/stubby -C ${confFile} ${optionalString cfg.debugLogging "-l"}";
DynamicUser = true;
+ CacheDirectory = "stubby";
};
};
};
diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix
index 7785861a730..ff8e54a1ce2 100644
--- a/nixos/modules/services/networking/wireguard.nix
+++ b/nixos/modules/services/networking/wireguard.nix
@@ -435,7 +435,7 @@ in
message = "networking.wireguard.interfaces.${interfaceName} peer «${peer.publicKey}» has both presharedKey and presharedKeyFile set, but only one can be used.";
}) all_peers;
- boot.extraModulePackages = [ kernel.wireguard ];
+ boot.extraModulePackages = optional (versionOlder kernel.kernel.version "5.6") kernel.wireguard;
environment.systemPackages = [ pkgs.wireguard-tools ];
systemd.services =
diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index 5ba72e8d773..fd28b94f7be 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@@ -23,7 +23,8 @@ let
for DIR in "${homeDir}" "${settingsDir}" "${fullSettings.download-dir}" "${fullSettings.incomplete-dir}"; do
mkdir -p "$DIR"
done
- chmod 700 "${homeDir}" "${settingsDir}"
+ chmod 755 "${homeDir}"
+ chmod 700 "${settingsDir}"
chmod ${downloadDirPermissions} "${fullSettings.download-dir}" "${fullSettings.incomplete-dir}"
cp -f ${settingsFile} ${settingsDir}/settings.json
'';
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index d79f2bb735f..912e05d6d40 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -443,7 +443,7 @@ in {
pools.nextcloud = {
user = "nextcloud";
group = "nginx";
- phpOptions = phpOptionsExtensions + phpOptionsStr;
+ phpOptions = phpOptionsStr;
phpPackage = phpPackage;
phpEnv = {
NEXTCLOUD_CONFIG_DIR = "${cfg.home}/config";
@@ -533,6 +533,7 @@ in {
add_header X-Robots-Tag none;
add_header X-Download-Options noopen;
add_header X-Permitted-Cross-Domain-Policies none;
+ add_header X-Frame-Options sameorigin;
add_header Referrer-Policy no-referrer;
access_log off;
'';
@@ -547,6 +548,7 @@ in {
add_header X-Robots-Tag none;
add_header X-Download-Options noopen;
add_header X-Permitted-Cross-Domain-Policies none;
+ add_header X-Frame-Options sameorigin;
add_header Referrer-Policy no-referrer;
add_header Strict-Transport-Security "max-age=15552000; includeSubDomains" always;
error_page 403 /core/templates/403.php;
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 325023f4121..e0ac47bb766 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -166,9 +166,10 @@ in
};
systemd.tmpfiles.rules = [
- "d /run/gdm/.config 0711 gdm gdm -"
+ "d /run/gdm/.config 0711 gdm gdm"
] ++ optionals config.hardware.pulseaudio.enable [
- "L+ /run/gdm/.config/pulse - - - - ${pulseConfig}"
+ "d /run/gdm/.config/pulse 0711 gdm gdm"
+ "L+ /run/gdm/.config/pulse/${pulseConfig.name} - - - - ${pulseConfig}"
] ++ optionals config.services.gnome3.gnome-initial-setup.enable [
# Create stamp file for gnome-initial-setup to prevent it starting in GDM.
"f /run/gdm/.config/gnome-initial-setup-done 0711 gdm gdm - yes"
diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index 1726d05115e..4d25137c5df 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -10,7 +10,7 @@ let
slaves = concatMap (i: i.interfaces) (attrValues cfg.bonds)
++ concatMap (i: i.interfaces) (attrValues cfg.bridges)
- ++ concatMap (i: i.interfaces) (attrValues cfg.vswitches)
+ ++ concatMap (i: attrNames (filterAttrs (_: config: config.type != "internal") i.interfaces)) (attrValues cfg.vswitches)
++ concatMap (i: [i.interface]) (attrValues cfg.macvlans)
++ concatMap (i: [i.interface]) (attrValues cfg.vlans);
@@ -336,34 +336,47 @@ let
createVswitchDevice = n: v: nameValuePair "${n}-netdev"
(let
- deps = concatLists (map deviceDependency v.interfaces);
+ deps = concatLists (map deviceDependency (attrNames (filterAttrs (_: config: config.type != "internal") v.interfaces)));
+ internalConfigs = concatMap (i: ["network-link-${i}.service" "network-addresses-${i}.service"]) (attrNames (filterAttrs (_: config: config.type == "internal") v.interfaces));
ofRules = pkgs.writeText "vswitch-${n}-openFlowRules" v.openFlowRules;
in
{ description = "Open vSwitch Interface ${n}";
- wantedBy = [ "network-setup.service" "vswitchd.service" ] ++ deps;
- bindsTo = [ "vswitchd.service" (subsystemDevice n) ] ++ deps;
- partOf = [ "network-setup.service" "vswitchd.service" ];
- after = [ "network-pre.target" "vswitchd.service" ] ++ deps;
- before = [ "network-setup.service" ];
+ wantedBy = [ "network-setup.service" (subsystemDevice n) ] ++ internalConfigs;
+ # before = [ "network-setup.service" ];
+ # should work without internalConfigs dependencies because address/link configuration depends
+ # on the device, which is created by ovs-vswitchd with type=internal, but it does not...
+ before = [ "network-setup.service" ] ++ internalConfigs;
+ partOf = [ "network-setup.service" ]; # shutdown the bridge when network is shutdown
+ bindsTo = [ "ovs-vswitchd.service" ]; # requires ovs-vswitchd to be alive at all times
+ after = [ "network-pre.target" "ovs-vswitchd.service" ] ++ deps; # start switch after physical interfaces and vswitch daemon
+ wants = deps; # if one or more interface fails, the switch should continue to run
serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true;
path = [ pkgs.iproute config.virtualisation.vswitch.package ];
+ preStart = ''
+ echo "Resetting Open vSwitch ${n}..."
+ ovs-vsctl --if-exists del-br ${n} -- add-br ${n} \
+ -- set bridge ${n} protocols=${concatStringsSep "," v.supportedOpenFlowVersions}
+ '';
script = ''
- echo "Removing old Open vSwitch ${n}..."
- ovs-vsctl --if-exists del-br ${n}
-
- echo "Adding Open vSwitch ${n}..."
- ovs-vsctl -- add-br ${n} ${concatMapStrings (i: " -- add-port ${n} ${i}") v.interfaces} \
+ echo "Configuring Open vSwitch ${n}..."
+ ovs-vsctl ${concatStrings (mapAttrsToList (name: config: " -- add-port ${n} ${name}" + optionalString (config.vlan != null) " tag=${toString config.vlan}") v.interfaces)} \
+ ${concatStrings (mapAttrsToList (name: config: optionalString (config.type != null) " -- set interface ${name} type=${config.type}") v.interfaces)} \
${concatMapStrings (x: " -- set-controller ${n} " + x) v.controllers} \
${concatMapStrings (x: " -- " + x) (splitString "\n" v.extraOvsctlCmds)}
+
echo "Adding OpenFlow rules for Open vSwitch ${n}..."
- ovs-ofctl add-flows ${n} ${ofRules}
+ ovs-ofctl --protocols=${v.openFlowVersion} add-flows ${n} ${ofRules}
'';
postStop = ''
+ echo "Cleaning Open vSwitch ${n}"
+ echo "Shuting down internal ${n} interface"
ip link set ${n} down || true
- ovs-ofctl del-flows ${n} || true
- ovs-vsctl --if-exists del-br ${n}
+ echo "Deleting flows for ${n}"
+ ovs-ofctl --protocols=${v.openFlowVersion} del-flows ${n} || true
+ echo "Deleting Open vSwitch ${n}"
+ ovs-vsctl --if-exists del-br ${n} || true
'';
});
@@ -476,9 +489,9 @@ let
# Remove Dead Interfaces
ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}"
ip link add link "${v.interface}" name "${n}" type vlan id "${toString v.id}"
-
- # We try to bring up the logical VLAN interface. If the master
- # interface the logical interface is dependent upon is not up yet we will
+
+ # We try to bring up the logical VLAN interface. If the master
+ # interface the logical interface is dependent upon is not up yet we will
# fail to immediately bring up the logical interface. The resulting logical
# interface will brought up later when the master interface is up.
ip link set "${n}" up || true
diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix
index e25dc0c0b39..41deceb000e 100644
--- a/nixos/modules/tasks/network-interfaces-systemd.nix
+++ b/nixos/modules/tasks/network-interfaces-systemd.nix
@@ -1,4 +1,4 @@
-{ config, lib, utils, ... }:
+{ config, lib, utils, pkgs, ... }:
with utils;
with lib;
@@ -18,7 +18,10 @@ let
concatLists (map (bond: bond.interfaces) (attrValues cfg.bonds))
++ concatLists (map (bridge: bridge.interfaces) (attrValues cfg.bridges))
++ map (sit: sit.dev) (attrValues cfg.sits)
- ++ map (vlan: vlan.interface) (attrValues cfg.vlans);
+ ++ map (vlan: vlan.interface) (attrValues cfg.vlans)
+ # add dependency to physical or independently created vswitch member interface
+ # TODO: warn the user that any address configured on those interfaces will be useless
+ ++ concatMap (i: attrNames (filterAttrs (_: config: config.type != "internal") i.interfaces)) (attrValues cfg.vswitches);
in
@@ -51,11 +54,6 @@ in
networking.dhcpcd.enable = mkDefault false;
- systemd.services.network-local-commands = {
- after = [ "systemd-networkd.service" ];
- bindsTo = [ "systemd-networkd.service" ];
- };
-
systemd.network =
let
domains = cfg.search ++ (optional (cfg.domain != null) cfg.domain);
@@ -233,6 +231,63 @@ in
# This forces the network interface creator to initialize slaves.
networking.interfaces = listToAttrs (map (i: nameValuePair i { }) slaves);
+ systemd.services = let
+ # We must escape interfaces due to the systemd interpretation
+ subsystemDevice = interface:
+ "sys-subsystem-net-devices-${escapeSystemdPath interface}.device";
+ # support for creating openvswitch switches
+ createVswitchDevice = n: v: nameValuePair "${n}-netdev"
+ (let
+ deps = map subsystemDevice (attrNames (filterAttrs (_: config: config.type != "internal") v.interfaces));
+ ofRules = pkgs.writeText "vswitch-${n}-openFlowRules" v.openFlowRules;
+ in
+ { description = "Open vSwitch Interface ${n}";
+ wantedBy = [ "network.target" (subsystemDevice n) ];
+ # and create bridge before systemd-networkd starts because it might create internal interfaces
+ before = [ "systemd-networkd.service" ];
+ # shutdown the bridge when network is shutdown
+ partOf = [ "network.target" ];
+ # requires ovs-vswitchd to be alive at all times
+ bindsTo = [ "ovs-vswitchd.service" ];
+ # start switch after physical interfaces and vswitch daemon
+ after = [ "network-pre.target" "ovs-vswitchd.service" ] ++ deps;
+ wants = deps; # if one or more interface fails, the switch should continue to run
+ serviceConfig.Type = "oneshot";
+ serviceConfig.RemainAfterExit = true;
+ path = [ pkgs.iproute config.virtualisation.vswitch.package ];
+ preStart = ''
+ echo "Resetting Open vSwitch ${n}..."
+ ovs-vsctl --if-exists del-br ${n} -- add-br ${n} \
+ -- set bridge ${n} protocols=${concatStringsSep "," v.supportedOpenFlowVersions}
+ '';
+ script = ''
+ echo "Configuring Open vSwitch ${n}..."
+ ovs-vsctl ${concatStrings (mapAttrsToList (name: config: " -- add-port ${n} ${name}" + optionalString (config.vlan != null) " tag=${toString config.vlan}") v.interfaces)} \
+ ${concatStrings (mapAttrsToList (name: config: optionalString (config.type != null) " -- set interface ${name} type=${config.type}") v.interfaces)} \
+ ${concatMapStrings (x: " -- set-controller ${n} " + x) v.controllers} \
+ ${concatMapStrings (x: " -- " + x) (splitString "\n" v.extraOvsctlCmds)}
+
+
+ echo "Adding OpenFlow rules for Open vSwitch ${n}..."
+ ovs-ofctl --protocols=${v.openFlowVersion} add-flows ${n} ${ofRules}
+ '';
+ postStop = ''
+ echo "Cleaning Open vSwitch ${n}"
+ echo "Shuting down internal ${n} interface"
+ ip link set ${n} down || true
+ echo "Deleting flows for ${n}"
+ ovs-ofctl --protocols=${v.openFlowVersion} del-flows ${n} || true
+ echo "Deleting Open vSwitch ${n}"
+ ovs-vsctl --if-exists del-br ${n} || true
+ '';
+ });
+ in mapAttrs' createVswitchDevice cfg.vswitches
+ // {
+ "network-local-commands" = {
+ after = [ "systemd-networkd.service" ];
+ bindsTo = [ "systemd-networkd.service" ];
+ };
+ };
};
}
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index cef9c38c2e3..9542a60beee 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -13,7 +13,7 @@ let
slaves = concatMap (i: i.interfaces) (attrValues cfg.bonds)
++ concatMap (i: i.interfaces) (attrValues cfg.bridges)
- ++ concatMap (i: i.interfaces) (attrValues cfg.vswitches);
+ ++ concatMap (i: attrNames (filterAttrs (name: config: ! (config.type == "internal" || hasAttr name cfg.interfaces)) i.interfaces)) (attrValues cfg.vswitches);
slaveIfs = map (i: cfg.interfaces.${i}) (filter (i: cfg.interfaces ? ${i}) slaves);
@@ -336,6 +336,32 @@ let
};
+ vswitchInterfaceOpts = {name, ...}: {
+
+ options = {
+
+ name = mkOption {
+ description = "Name of the interface";
+ example = "eth0";
+ type = types.str;
+ };
+
+ vlan = mkOption {
+ description = "Vlan tag to apply to interface";
+ example = 10;
+ type = types.nullOr types.int;
+ default = null;
+ };
+
+ type = mkOption {
+ description = "Openvswitch type to assign to interface";
+ example = "internal";
+ type = types.nullOr types.str;
+ default = null;
+ };
+ };
+ };
+
hexChars = stringToCharacters "0123456789abcdef";
isHexString = s: all (c: elem c hexChars) (stringToCharacters (toLower s));
@@ -486,8 +512,8 @@ in
networking.vswitches = mkOption {
default = { };
example =
- { vs0.interfaces = [ "eth0" "eth1" ];
- vs1.interfaces = [ "eth2" "wlan0" ];
+ { vs0.interfaces = { eth0 = { }; lo1 = { type="internal"; }; };
+ vs1.interfaces = [ { name = "eth2"; } { name = "lo2"; type="internal"; } ];
};
description =
''
@@ -504,9 +530,8 @@ in
interfaces = mkOption {
example = [ "eth0" "eth1" ];
- type = types.listOf types.str;
- description =
- "The physical network interfaces connected by the vSwitch.";
+ description = "The physical network interfaces connected by the vSwitch.";
+ type = with types; loaOf (submodule vswitchInterfaceOpts);
};
controllers = mkOption {
@@ -530,6 +555,25 @@ in
'';
};
+ # TODO: custom "openflow version" type, with list from existing openflow protocols
+ supportedOpenFlowVersions = mkOption {
+ type = types.listOf types.str;
+ example = [ "OpenFlow10" "OpenFlow13" "OpenFlow14" ];
+ default = [ "OpenFlow13" ];
+ description = ''
+ Supported versions to enable on this switch.
+ '';
+ };
+
+ # TODO: use same type as elements from supportedOpenFlowVersions
+ openFlowVersion = mkOption {
+ type = types.str;
+ default = "OpenFlow13";
+ description = ''
+ Version of OpenFlow protocol to use when communicating with the switch internally (e.g. with openFlowRules).
+ '';
+ };
+
extraOvsctlCmds = mkOption {
type = types.lines;
default = "";
diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index 52d852894ce..9f7bac480e3 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -219,7 +219,7 @@ in {
wantedBy = [ "multi-user.target" ];
requires = [ "libvirtd-config.service" ];
after = [ "systemd-udev-settle.service" "libvirtd-config.service" ]
- ++ optional vswitch.enable "vswitchd.service";
+ ++ optional vswitch.enable "ovs-vswitchd.service";
environment.LIBVIRTD_ARGS = ''--config "${configFile}" ${concatStringsSep " " cfg.extraOptions}'';
diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix
index 6b8ad83661f..c6a3ceddc3e 100644
--- a/nixos/modules/virtualisation/openvswitch.nix
+++ b/nixos/modules/virtualisation/openvswitch.nix
@@ -124,7 +124,7 @@ in {
'';
};
- systemd.services.vswitchd = {
+ systemd.services.ovs-vswitchd = {
description = "Open_vSwitch Daemon";
wantedBy = [ "multi-user.target" ];
bindsTo = [ "ovsdb.service" ];
@@ -139,6 +139,8 @@ in {
PIDFile = "/run/openvswitch/ovs-vswitchd.pid";
# Use service type 'forking' to correctly determine when vswitchd is ready.
Type = "forking";
+ Restart = "always";
+ RestartSec = 3;
};
};
@@ -182,4 +184,7 @@ in {
'';
};
})]));
+
+ meta.maintainers = with maintainers; [ netixx ];
+
}
diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix
index ab65523592d..788b4d9d976 100644
--- a/nixos/modules/virtualisation/virtualbox-image.nix
+++ b/nixos/modules/virtualisation/virtualbox-image.nix
@@ -45,10 +45,41 @@ in {
The file name of the VirtualBox appliance.
'';
};
+ params = mkOption {
+ type = with types; attrsOf (oneOf [ str int bool (listOf str) ]);
+ example = {
+ audio = "alsa";
+ rtcuseutc = "on";
+ usb = "off";
+ };
+ description = ''
+ Parameters passed to the Virtualbox appliance.
+
+ Run VBoxManage modifyvm --help to see more options.
+ '';
+ };
};
};
config = {
+
+ virtualbox.params = mkMerge [
+ (mapAttrs (name: mkDefault) {
+ acpi = "on";
+ vram = 32;
+ nictype1 = "virtio";
+ nic1 = "nat";
+ audiocontroller = "ac97";
+ audio = "alsa";
+ audioout = "on";
+ rtcuseutc = "on";
+ usb = "on";
+ usbehci = "on";
+ mouse = "usbtablet";
+ })
+ (mkIf (pkgs.stdenv.hostPlatform.system == "i686-linux") { pae = "on"; })
+ ];
+
system.build.virtualBoxOVA = import ../../lib/make-disk-image.nix {
name = cfg.vmDerivationName;
@@ -69,12 +100,8 @@ in {
VBoxManage createvm --name "$vmName" --register \
--ostype ${if pkgs.stdenv.hostPlatform.system == "x86_64-linux" then "Linux26_64" else "Linux26"}
VBoxManage modifyvm "$vmName" \
- --memory ${toString cfg.memorySize} --acpi on --vram 32 \
- ${optionalString (pkgs.stdenv.hostPlatform.system == "i686-linux") "--pae on"} \
- --nictype1 virtio --nic1 nat \
- --audiocontroller ac97 --audio alsa --audioout on \
- --rtcuseutc on \
- --usb on --usbehci on --mouse usbtablet
+ --memory ${toString cfg.memorySize} \
+ ${lib.cli.toGNUCommandLineShell { } cfg.params}
VBoxManage storagectl "$vmName" --name SATA --add sata --portcount 4 --bootable on --hostiocache on
VBoxManage storageattach "$vmName" --storagectl SATA --port 0 --device 0 --type hdd \
--medium disk.vmdk
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index e47e64edb29..9377a931a75 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -55,6 +55,7 @@ in rec {
"nixos.ova.x86_64-linux"
"nixos.sd_image.aarch64-linux"
"nixos.tests.boot.biosCdrom.x86_64-linux"
+ "nixos.tests.boot.biosUsb.x86_64-linux"
"nixos.tests.boot-stage1.x86_64-linux"
"nixos.tests.boot.uefiCdrom.x86_64-linux"
"nixos.tests.boot.uefiUsb.x86_64-linux"
@@ -64,6 +65,7 @@ in rec {
"nixos.tests.docker.x86_64-linux"
"nixos.tests.ecryptfs.x86_64-linux"
"nixos.tests.env.x86_64-linux"
+ "nixos.tests.firefox-esr.x86_64-linux"
"nixos.tests.firefox.x86_64-linux"
"nixos.tests.firewall.x86_64-linux"
"nixos.tests.fontconfig-default-fonts.x86_64-linux"
@@ -84,6 +86,12 @@ in rec {
"nixos.tests.installer.simple.x86_64-linux"
"nixos.tests.installer.swraid.x86_64-linux"
"nixos.tests.ipv6.x86_64-linux"
+ "nixos.tests.keymap.azerty.x86_64-linux"
+ "nixos.tests.keymap.colemak.x86_64-linux"
+ "nixos.tests.keymap.dvorak.x86_64-linux"
+ "nixos.tests.keymap.dvp.x86_64-linux"
+ "nixos.tests.keymap.neo.x86_64-linux"
+ "nixos.tests.keymap.qwertz.x86_64-linux"
"nixos.tests.lightdm.x86_64-linux"
"nixos.tests.login.x86_64-linux"
"nixos.tests.misc.x86_64-linux"
diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix
index 61df74042cb..c4f2002918f 100644
--- a/nixos/tests/containers-imperative.nix
+++ b/nixos/tests/containers-imperative.nix
@@ -46,6 +46,15 @@ import ./make-test-python.nix ({ pkgs, ...} : {
};
}
'';
+ brokenCfg = pkgs.writeText "broken.nix" ''
+ {
+ assertions = [
+ { assertion = false;
+ message = "I never evaluate";
+ }
+ ];
+ }
+ '';
in ''
with subtest("Make sure we have a NixOS tree (required by ‘nixos-container create’)"):
machine.succeed("PAGER=cat nix-env -qa -A nixos.hello >&2")
@@ -130,5 +139,11 @@ import ./make-test-python.nix ({ pkgs, ...} : {
with subtest("Ensure that the container path is gone"):
print(machine.succeed("ls -lsa /var/lib/containers"))
machine.succeed(f"test ! -e /var/lib/containers/{id1}")
+
+ with subtest("Ensure that a failed container creation doesn'leave any state"):
+ machine.fail(
+ "nixos-container create b0rk --config-file ${brokenCfg}"
+ )
+ machine.succeed(f"test ! -e /var/lib/containers/b0rk")
'';
})
diff --git a/nixos/tests/systemd-networkd-vrf.nix b/nixos/tests/systemd-networkd-vrf.nix
index 5bc824531e8..af7813a2e60 100644
--- a/nixos/tests/systemd-networkd-vrf.nix
+++ b/nixos/tests/systemd-networkd-vrf.nix
@@ -197,15 +197,15 @@ in {
# Test whether SSH through a VRF IP is possible.
# (Note: this seems to be an issue on Linux 5.x, so I decided to add this to
# ensure that we catch this when updating the default kernel).
- with subtest("tcp traffic through vrf works"):
- node1.wait_for_open_port(22)
- client.succeed(
- "cat ${snakeOilPrivateKey} > privkey.snakeoil"
- )
- client.succeed("chmod 600 privkey.snakeoil")
- client.succeed(
- "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil root@192.168.1.2 true"
- )
+ # with subtest("tcp traffic through vrf works"):
+ # node1.wait_for_open_port(22)
+ # client.succeed(
+ # "cat ${snakeOilPrivateKey} > privkey.snakeoil"
+ # )
+ # client.succeed("chmod 600 privkey.snakeoil")
+ # client.succeed(
+ # "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil root@192.168.1.2 true"
+ # )
# Only configured routes through the VRF from the main routing table should
# work. Additional IPs are only reachable when binding to the vrf interface.
diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix
index 876889416da..cd1783ff685 100644
--- a/pkgs/applications/audio/cantata/default.nix
+++ b/pkgs/applications/audio/cantata/default.nix
@@ -28,7 +28,7 @@ assert withOnlineServices -> withTaglib;
assert withReplaygain -> withTaglib;
let
- version = "2.3.3";
+ version = "2.4.1";
pname = "cantata";
fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF");
fstats = x: map (fstat x);
@@ -42,7 +42,7 @@ in mkDerivation {
owner = "CDrummond";
repo = "cantata";
rev = "v${version}";
- sha256 = "1m651fmdbnb50glym75kzma0bllvqbmrb2afp1g9g5cxm1898c0f";
+ sha256 = "0ix7xp352bziwz31mw79y7wxxmdn6060p8ry2px243ni1lz1qx1c";
};
buildInputs = [ vlc qtbase qtmultimedia qtsvg ]
@@ -77,7 +77,7 @@ in mkDerivation {
];
meta = with lib; {
- homepage = https://github.com/cdrummond/cantata;
+ homepage = "https://github.com/cdrummond/cantata";
description = "A graphical client for MPD";
license = licenses.gpl3;
maintainers = with maintainers; [ peterhoeg ];
diff --git a/pkgs/applications/audio/pulseaudio-dlna/default.nix b/pkgs/applications/audio/pulseaudio-dlna/default.nix
index a9f56cca001..75990d593df 100644
--- a/pkgs/applications/audio/pulseaudio-dlna/default.nix
+++ b/pkgs/applications/audio/pulseaudio-dlna/default.nix
@@ -16,10 +16,10 @@ assert vorbisSupport -> vorbisTools != null;
let
zeroconf = pythonPackages.callPackage ./zeroconf.nix { };
-
-in pythonPackages.buildPythonApplication {
+in
+pythonPackages.buildPythonApplication {
pname = "pulseaudio-dlna";
- version = "2017-11-01";
+ version = "unstable-2017-11-01";
src = fetchFromGitHub {
owner = "masmu";
@@ -28,12 +28,9 @@ in pythonPackages.buildPythonApplication {
sha256 = "1dfn7036vrq49kxv4an7rayypnm5dlawsf02pfsldw877hzdamqk";
};
- # pulseaudio-dlna has no tests
- doCheck = false;
-
propagatedBuildInputs = with pythonPackages; [
dbus-python docopt requests setproctitle protobuf psutil futures
- chardet notify2 netifaces pyroute2 pygobject2 lxml ]
+ chardet notify2 netifaces pyroute2 pygobject2 lxml setuptools ]
++ [ zeroconf ]
++ stdenv.lib.optional mp3Support lame
++ stdenv.lib.optional opusSupport opusTools
@@ -42,12 +39,15 @@ in pythonPackages.buildPythonApplication {
++ stdenv.lib.optional soxSupport sox
++ stdenv.lib.optional vorbisSupport vorbisTools;
+ # upstream has no tests
+ checkPhase = ''
+ $out/bin/pulseaudio-dlna --help > /dev/null
+ '';
+
meta = with stdenv.lib; {
description = "A lightweight streaming server which brings DLNA / UPNP and Chromecast support to PulseAudio and Linux";
- homepage = https://github.com/masmu/pulseaudio-dlna;
-
+ homepage = "https://github.com/masmu/pulseaudio-dlna";
license = licenses.gpl3Plus;
-
maintainers = with maintainers; [ mog ];
platforms = platforms.linux;
};
diff --git a/pkgs/applications/audio/sonic-lineup/default.nix b/pkgs/applications/audio/sonic-lineup/default.nix
new file mode 100644
index 00000000000..4ad9e51b645
--- /dev/null
+++ b/pkgs/applications/audio/sonic-lineup/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, alsaLib, boost, bzip2, fftw, fftwFloat, libfishsound
+, libid3tag, liblo, liblrdf, libmad, liboggz, libpulseaudio, libsamplerate
+, libsndfile, opusfile, portaudio, rubberband, serd, sord, vampSDK, capnproto
+, wrapQtAppsHook, pkgconfig
+}:
+
+stdenv.mkDerivation rec {
+ pname = "sonic-lineup";
+ version = "1.0.1";
+
+ src = fetchurl {
+ url = "https://code.soundsoftware.ac.uk/attachments/download/2610/${pname}-${version}.tar.gz";
+ sha256 = "0w4v5zr81d8fh97y820r0vj1rrbl0kwgvhfkdnyl4hiabs97b1i7";
+ };
+
+ buildInputs =
+ [ alsaLib boost bzip2 fftw fftwFloat libfishsound libid3tag liblo liblrdf
+ libmad liboggz libpulseaudio libsamplerate libsndfile opusfile pkgconfig
+ portaudio rubberband serd sord capnproto
+ ];
+
+ nativeBuildInputs = [ pkgconfig wrapQtAppsHook ];
+
+ enableParallelBuilding = true;
+
+ # comment out the tests
+ preConfigure = ''
+ sed -i 's/sub_test_svcore_/#sub_test_svcore_/' sonic-lineup.pro
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Comparative visualisation of related audio recordings";
+ homepage = https://www.sonicvisualiser.org/sonic-lineup/;
+ license = licenses.gpl2Plus;
+ maintainers = [ maintainers.vandenoever ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/audio/spectmorph/default.nix b/pkgs/applications/audio/spectmorph/default.nix
index 7544a3520c7..a4f48aa0c21 100644
--- a/pkgs/applications/audio/spectmorph/default.nix
+++ b/pkgs/applications/audio/spectmorph/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "spectmorph";
- version = "0.5.0";
+ version = "0.5.1";
src = fetchurl {
url = "http://spectmorph.org/files/releases/${pname}-${version}.tar.bz2";
- sha256 = "003wznv3sy1b4g55vqii9pr3i3bb3zmj7nqvwrz7vjsfn2xyd1bn";
+ sha256 = "06jrfx5g9c56swxn78lix0gyrjkhi21l9wqs56knp8iqcgfi3m0s";
};
buildInputs = [ libjack2 lv2 glib qt5.qtbase libao cairo libsndfile fftwFloat ];
diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix
index db54055def4..9613df6df0b 100644
--- a/pkgs/applications/audio/spotify-tui/default.nix
+++ b/pkgs/applications/audio/spotify-tui/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "spotify-tui";
- version = "0.14.0";
+ version = "0.15.0";
src = fetchFromGitHub {
owner = "Rigellute";
repo = "spotify-tui";
rev = "v${version}";
- sha256 = "06xqj83m4hz00p8796m0df7lv9875p8zc1v6l9yqbiak1h95lq7h";
+ sha256 = "19mnnpsidwr5y6igs478gfp7rq76378f66nzfhj4mraqd2jc4nzj";
};
- cargoSha256 = "1pc4n6lm1w0660ivm0kxzicpckvb351y62dpv0cxa7ckd3raa5pr";
+ cargoSha256 = "1zhv3sla92z7pjdnf0r4x85n7z9spi70vgy4kw72rdc5v9bmj7q8";
nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optionals stdenv.isLinux [ python3 ];
buildInputs = [ openssl ]
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 414e205b9a9..28490f2ce7b 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -8,19 +8,15 @@ let
inherit (gnome2) GConf gnome_vfs;
};
stableVersion = {
- version = "3.5.3.0"; # "Android Studio 3.5.3"
- build = "191.6010548";
- sha256Hash = "1nsm4d3vdx90szqd78a8mjq65xc9m5ipd35cqrlx3c3ny900sqxg";
- };
- betaVersion = {
- version = "3.6.0.20"; # "Android Studio 3.6 RC 3"
- build = "192.6186006";
- sha256Hash = "153piq67yps5jwqrbciam4kpxziavml29d8ya5bi2rvfhipdd7da";
+ version = "3.6.0.21"; # "Android Studio 3.6"
+ build = "192.6200805";
+ sha256Hash = "1rf79fh6fbaxsj26q9bgl4vvmakv4wc0amjz026cm89hcwwzrb4d";
};
+ betaVersion = latestVersion;
latestVersion = { # canary & dev
- version = "4.0.0.9"; # "Android Studio 4.0 Canary 9"
- build = "193.6137316";
- sha256Hash = "1cgxyqp85z5x2jnjh1qabn2cfiziiwvfr6iggzb531dlhllyfyqw";
+ version = "4.0.0.10"; # "Android Studio 4.0 Beta 1"
+ build = "193.6220182";
+ sha256Hash = "0ibp54wcss4ihm454hbavv1bhar6cd4alp5b0z248ryjr5w9mixf";
};
in {
# Attributes are named by their corresponding release channels
diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix
index 1e07902365d..8c1b95a1d26 100644
--- a/pkgs/applications/editors/ghostwriter/default.nix
+++ b/pkgs/applications/editors/ghostwriter/default.nix
@@ -2,13 +2,13 @@
mkDerivation rec {
pname = "ghostwriter";
- version = "1.8.0";
+ version = "1.8.1";
src = fetchFromGitHub {
owner = "wereturtle";
repo = pname;
rev = "v${version}";
- sha256 = "13yn82m1l2pq93wbl569a2lzpc3sn8a8g30hsgdch1l9xlmhwran";
+ sha256 = "0jc6szfh5sdnafhwsr1xv7cn1fznniq58bix41hb9wlbkvq7wzi6";
};
nativeBuildInputs = [ qmake pkgconfig qttools ];
diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix
index 1ee1d3376db..8ff2ed36fdc 100644
--- a/pkgs/applications/gis/whitebox-tools/default.nix
+++ b/pkgs/applications/gis/whitebox-tools/default.nix
@@ -1,13 +1,13 @@
{ stdenv, rustPlatform , fetchFromGitHub, Security }:
rustPlatform.buildRustPackage rec {
pname = "whitebox_tools";
- version = "0.16.0";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "jblindsay";
repo = "whitebox-tools";
rev = "v${version}";
- sha256 = "1vs4hf2x3qjnffs9kjx56rzl67kpcy8xvng6p0r9fp9mfnblxg6j";
+ sha256 = "0zi32d0wrbl2763dcllv2g0liwacsfiza5lkx52620prjjbhby8i";
};
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;
- cargoSha256 = "1y3vk8bzsaisx7wrncjxcqdh355f2wk4n59vq5qgj37fph2zpy7f";
+ cargoSha256 = "0zn4b4md3pn1rvb15rnz3zcx9a359x26nfy7zcfp7nx27ais13n5";
# failures: structures::polyline::test::test_polyline_split
doCheck = false;
diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index d3950c06c33..e9223b1453e 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -50,13 +50,13 @@ let
inherit (python2Packages) pygtk wrapPython python;
in stdenv.mkDerivation rec {
pname = "gimp";
- version = "2.10.14";
+ version = "2.10.16";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
- sha256 = "0m6wdnfvsxyhimdd4v3351g4r1fklllnbipbwcfym3h7q88hz6yz";
+ sha256 = "1sybf1yilw272lr8qbyx3zbvysf5rc89gk80gd4aj4xr6jazxyfb";
};
nativeBuildInputs = [
@@ -155,6 +155,7 @@ in stdenv.mkDerivation rec {
configureFlags = [
"--without-webkit" # old version is required
+ "--disable-check-update"
"--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new"
"--with-icc-directory=/run/current-system/sw/share/color/icc"
# fix libdir in pc files (${exec_prefix} needs to be passed verbatim)
diff --git a/pkgs/applications/graphics/gimp/remove-cc-reference.patch b/pkgs/applications/graphics/gimp/remove-cc-reference.patch
index 0d6a87000cc..e37351cfd46 100644
--- a/pkgs/applications/graphics/gimp/remove-cc-reference.patch
+++ b/pkgs/applications/graphics/gimp/remove-cc-reference.patch
@@ -1,13 +1,15 @@
diff --git a/app/gimp-version.c b/app/gimp-version.c
-index 12605c6..a9083da 100644
+index 0f7bfb9bf9..1679624b8e 100644
--- a/app/gimp-version.c
+++ b/app/gimp-version.c
-@@ -203,7 +203,7 @@ gimp_version (gboolean be_verbose,
- lib_versions = gimp_library_versions (localized);
- verbose_info = g_strdup_printf ("git-describe: %s\n"
- "C compiler:\n%s\n%s",
-- GIMP_GIT_VERSION, CC_VERSION,
-+ GIMP_GIT_VERSION, "@cc_version@",
+@@ -228,9 +228,9 @@
+ "# Libraries #\n%s",
+ GIMP_GIT_VERSION,
+ GIMP_BUILD_ID,
+ gimp_version_get_revision (),
+ GIMP_BUILD_PLATFORM,
+- CC_VERSION,
++ "@cc_version@",
lib_versions);
g_free (lib_versions);
diff --git a/pkgs/applications/graphics/ideogram/default.nix b/pkgs/applications/graphics/ideogram/default.nix
index ba5ee230ce4..386916083bb 100644
--- a/pkgs/applications/graphics/ideogram/default.nix
+++ b/pkgs/applications/graphics/ideogram/default.nix
@@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "ideogram";
- version = "1.3.0";
+ version = "1.3.2";
src = fetchFromGitHub {
owner = "cassidyjames";
repo = pname;
rev = version;
- sha256 = "0ghc7hk4b4r3a0x9r30rrgv3rarxyjr2hf9ig244xwvhh5rn3j10";
+ sha256 = "08nl11gj3234nrqyigqkq3yiyrqf2hha24x5jkl78ypj2xhcnhw8";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/graphics/qview/default.nix b/pkgs/applications/graphics/qview/default.nix
index 8df6ce4f80b..b6f25795665 100644
--- a/pkgs/applications/graphics/qview/default.nix
+++ b/pkgs/applications/graphics/qview/default.nix
@@ -1,18 +1,27 @@
-{stdenv, fetchFromGitHub, qmake}:
-stdenv.mkDerivation rec {
+{ mkDerivation, lib, fetchFromGitHub, qmake, qtbase }:
+
+mkDerivation rec {
pname = "qview";
version = "3.0";
+
src = fetchFromGitHub {
owner = "jurplel";
repo = "qView";
rev = version;
sha256 = "15a91bs3wcqhgf76wzigbn10hayg628j84pq4j2vaxar94ak0vk7";
};
+
nativeBuildInputs = [ qmake ];
+
+ buildInputs = [
+ qtbase
+ ];
+
patchPhase = ''
sed "s|/usr/|$out/|g" -i qView.pro
'';
- meta = with stdenv.lib; {
+
+ meta = with lib; {
description = "Practical and minimal image viewer";
homepage = "https://interversehq.com/qview/";
license = licenses.gpl3;
diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index a4d77715199..78e7249a087 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -78,6 +78,10 @@ in buildRustPackage rec {
++ lib.optionals stdenv.isDarwin [ AppKit CoreGraphics CoreServices CoreText Foundation OpenGL ];
outputs = [ "out" "terminfo" ];
+ postPatch = ''
+ substituteInPlace alacritty/src/config/mouse.rs \
+ --replace xdg-open ${xdg_utils}/bin/xdg-open
+ '';
postBuild = lib.optionalString stdenv.isDarwin "make app";
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 83f2bf63642..277bb5fe1f2 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -2,7 +2,7 @@
, ilmbase, libXi, libX11, libXext, libXrender
, libjpeg, libpng, libsamplerate, libsndfile
, libtiff, libGLU, libGL, openal, opencolorio, openexr, openimageio2, openjpeg, python3Packages
-, openvdb, libXxf86vm, tbb
+, openvdb, libXxf86vm, tbb, alembic
, zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath
, jackaudioSupport ? false, libjack2
, cudaSupport ? config.cudaSupport or false, cudatoolkit
@@ -17,11 +17,11 @@ let python = python3Packages.python; in
stdenv.mkDerivation rec {
pname = "blender";
- version = "2.81a";
+ version = "2.82";
src = fetchurl {
url = "https://download.blender.org/source/${pname}-${version}.tar.xz";
- sha256 = "1zl0ar95qkxsrbqw9miz2hrjijlqjl06vg3clfk9rm7krr2l3b2j";
+ sha256 = "0rgw8nilvn6k6r7p28y2l1rwpami1cc8xz473jaahn7wa4ndyah0";
};
patches = lib.optional stdenv.isDarwin ./darwin.patch;
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
[ boost ffmpeg gettext glew ilmbase
freetype libjpeg libpng libsamplerate libsndfile libtiff
opencolorio openexr openimageio2 openjpeg python zlib fftw jemalloc
+ alembic
(opensubdiv.override { inherit cudaSupport; })
tbb
makeWrapper
@@ -75,7 +76,9 @@ stdenv.mkDerivation rec {
'';
cmakeFlags =
- [ "-DWITH_MOD_OCEANSIM=ON"
+ [
+ "-DWITH_ALEMBIC=ON"
+ "-DWITH_MOD_OCEANSIM=ON"
"-DWITH_CODEC_FFMPEG=ON"
"-DWITH_CODEC_SNDFILE=ON"
"-DWITH_INSTALL_PORTABLE=OFF"
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index fc7575ea92c..07612c96bee 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -30,11 +30,11 @@ let
in
mkDerivation rec {
pname = "calibre";
- version = "4.8.0";
+ version = "4.11.2";
src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
- sha256 = "1lk44qh3hzqhpz2b00iik7cgjg4xm36qjh2pxflkjnbk691gbpqk";
+ sha256 = "0fxmpygc2ybx8skwhp9j6gnk9drlfiz2cl9g55h10zgxkfzqzqgv";
};
patches = [
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index df95b26b9c5..924d4dc9e0b 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -90,6 +90,7 @@ python3Packages.buildPythonApplication {
'' + (if enableQt then ''
substituteInPlace ./electrum/qrscanner.py \
--replace ${libzbar_name} ${zbar.lib}/lib/libzbar${stdenv.hostPlatform.extensions.sharedLibrary}
+ sed -i 's/qdarkstyle<2.7/qdarkstyle<3.0/' contrib/requirements/requirements.txt
'' else ''
sed -i '/qdarkstyle/d' contrib/requirements/requirements.txt
'');
diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/applications/misc/etesync-dav/default.nix
new file mode 100644
index 00000000000..d99d1890563
--- /dev/null
+++ b/pkgs/applications/misc/etesync-dav/default.nix
@@ -0,0 +1,33 @@
+{ lib, python3Packages, radicale2 }:
+
+python3Packages.buildPythonApplication rec {
+ pname = "etesync-dav";
+ version = "0.14.2";
+
+ src = python3Packages.fetchPypi {
+ inherit pname version;
+ sha256 = "05kzy74r2hd44sqjgd0bc588ganrzbz5brpiginb8sh8z38igb60";
+ };
+
+ propagatedBuildInputs = with python3Packages; [
+ etesync
+ flask
+ flask_wtf
+ radicale2
+ ];
+
+ checkInputs = with python3Packages; [
+ pytest
+ ];
+
+ checkPhase = ''
+ pytest
+ '';
+
+ meta = with lib; {
+ homepage = "https://www.etesync.com/";
+ description = "Secure, end-to-end encrypted, and privacy respecting sync for contacts, calendars and tasks";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ valodim ];
+ };
+}
diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 18f7153b1eb..b32004d0cc7 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "hugo";
- version = "0.64.1";
+ version = "0.65.3";
goPackagePath = "github.com/gohugoio/hugo";
@@ -10,10 +10,10 @@ buildGoModule rec {
owner = "gohugoio";
repo = pname;
rev = "v${version}";
- sha256 = "1h5n5d7g3l2lp25sjrcmavbkqqm1csgv2q5z7afwbb57j0m1nkn8";
+ sha256 = "1m0xhzm1w6y778x3fplzr9dif7lcqlkfvk4b7plywrisv3ic8yqs";
};
- modSha256 = "18wfsp3ypfxj5qljmb19kzyc5byf413nkabz5mfvq8srjhcq1ifl";
+ modSha256 = "1f320zbqnv2ybsp3qmlgn3rsjgp2zdb24qjd3gcys30mw48cx3na";
buildFlags = [ "-tags" "extended" ];
diff --git a/pkgs/applications/misc/lutris/chrootenv.nix b/pkgs/applications/misc/lutris/chrootenv.nix
index 5b9bb925a4e..a3a5d0ce751 100644
--- a/pkgs/applications/misc/lutris/chrootenv.nix
+++ b/pkgs/applications/misc/lutris/chrootenv.nix
@@ -97,7 +97,7 @@ in buildFHSUserEnv {
libcap libtiff libva libgphoto2 libxslt libtxc_dxtn libsndfile giflib zlib glib
alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils
readline gcc SDL SDL2 curl graphite2 gtk2 gtk3 udev ncurses wayland libglvnd
- vulkan-loader xdg_utils sqlite gnutls
+ vulkan-loader xdg_utils sqlite gnutls libbsd
# PCSX2 // TODO: "libgobject-2.0.so.0: wrong ELF class: ELFCLASS64"
diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix
index 675f0adfc7f..f9d8599e329 100644
--- a/pkgs/applications/misc/lyx/default.nix
+++ b/pkgs/applications/misc/lyx/default.nix
@@ -3,12 +3,12 @@
}:
mkDerivation rec {
- version = "2.3.4";
+ version = "2.3.4.3";
pname = "lyx";
src = fetchurl {
url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${pname}-${version}.tar.xz";
- sha256 = "0qgvc19flnf6ny3ffyj8civwaxrnwcdlw2v708hg49cbmg6f8igh";
+ sha256 = "1rpp6wq0dc0bxwc0pipajv98vi7cpg391nq10d3c4pmpq38m08wx";
};
# LaTeX is used from $PATH, as people often want to have it with extra pkgs
diff --git a/pkgs/development/python-modules/mps-youtube/default.nix b/pkgs/applications/misc/mps-youtube/default.nix
similarity index 67%
rename from pkgs/development/python-modules/mps-youtube/default.nix
rename to pkgs/applications/misc/mps-youtube/default.nix
index 753a0d24d0a..b1118cfc597 100644
--- a/pkgs/development/python-modules/mps-youtube/default.nix
+++ b/pkgs/applications/misc/mps-youtube/default.nix
@@ -1,17 +1,16 @@
-{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
-, pafy
-}:
+{ lib, python3Packages, fetchFromGitHub }:
-buildPythonPackage rec {
+with python3Packages;
+
+buildPythonApplication rec {
pname = "mps-youtube";
- version = "0.2.8";
- disabled = (!isPy3k);
+ version = "unstable-2020-01-28";
src = fetchFromGitHub {
owner = "mps-youtube";
repo = "mps-youtube";
- rev = "v${version}";
- sha256 = "1w1jhw9rg3dx7vp97cwrk5fymipkcy2wrbl1jaa38ivcjhqg596y";
+ rev = "b808697133ec2ad7654953232d1e841b20aa7cc3";
+ sha256 = "0lqprlpc0v092xqkjc0cc395ag45lijwgd34dpg2jy6i0f2szywv";
};
propagatedBuildInputs = [ pafy ];
@@ -30,6 +29,6 @@ buildPythonPackage rec {
description = "Terminal based YouTube player and downloader";
homepage = "https://github.com/mps-youtube/mps-youtube";
license = licenses.gpl3;
- maintainers = with maintainers; [ odi ];
+ maintainers = with maintainers; [ koral odi ];
};
}
diff --git a/pkgs/applications/misc/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix
index 7b070e32ca5..4847f06ebb8 100644
--- a/pkgs/applications/misc/pastel/default.nix
+++ b/pkgs/applications/misc/pastel/default.nix
@@ -2,22 +2,23 @@
rustPlatform.buildRustPackage rec {
pname = "pastel";
- version = "0.6.1";
+ version = "0.7.0";
src = fetchFromGitHub {
owner = "sharkdp";
repo = pname;
rev = "v${version}";
- sha256 = "1c47bph1qraq3g0g5bp23jqlz7qdn4f8vh264y937jz17avvacx5";
+ sha256 = "1fh0l64bvpbgm1725qmyq3042pglr8wz3w1azjv6lml9ivrm4b0k";
};
- cargoSha256 = "1hkqahsrhmgcpgp0pvfpc0wmwqivnqylsxzjrz63k1s9ssdv9syy";
+ cargoSha256 = "0q7p66r6hwqaalwm9fd2bshadlynhjf3pzd6rnamr07mknyfzh5s";
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
meta = with stdenv.lib; {
description = "A command-line tool to generate, analyze, convert and manipulate colors";
- homepage = https://github.com/sharkdp/pastel;
+ homepage = "https://github.com/sharkdp/pastel";
+ changelog = "https://github.com/sharkdp/pastel/releases/tag/v${version}";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ davidtwco ];
platforms = platforms.all;
diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix
index d7a019c1c41..eb39a702f93 100644
--- a/pkgs/applications/misc/yubioath-desktop/default.nix
+++ b/pkgs/applications/misc/yubioath-desktop/default.nix
@@ -1,21 +1,21 @@
{ stdenv, fetchurl, mkDerivation
-, qmake, qtbase, qtquickcontrols
+, qmake, qtbase, qtquickcontrols2, qtgraphicaleffects
, python3, pyotherside
, pcsclite, yubikey-personalization
, yubikey-manager, makeWrapper }:
mkDerivation rec {
pname = "yubioath-desktop";
- version = "4.3.6";
+ version = "5.0.2";
src = fetchurl {
url = "https://developers.yubico.com/yubioath-desktop/Releases/yubioath-desktop-${version}.tar.gz";
- sha256 = "0s04anjbb5zm98kfdpp9hr68k3mx3gqlp8fa1miy7nq87pr4f7a5";
+ sha256 = "19ingk0ab88a22s04apcw8kx9xygxlbk8kp4xnb8pmf8z3k6l2gf";
};
doCheck = false;
- buildInputs = [ stdenv qtbase qtquickcontrols python3 ];
+ buildInputs = [ stdenv qtbase qtquickcontrols2 qtgraphicaleffects python3 ];
nativeBuildInputs = [ qmake makeWrapper python3.pkgs.wrapPython ];
@@ -48,11 +48,18 @@ mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "Yubikey Desktop Authenticator";
+ description = "Yubico Authenticator";
+ longDescription = ''
+ Application for generating Open Authentication (OATH) time-based TOTP and
+ event-based HOTP one-time password codes, with the help of a YubiKey that
+ protects the shared secrets.
+ '';
- homepage = https://www.yubico.com/support/knowledge-base/categories/articles/yubico-authenticator-download/;
+ homepage = "https://developers.yubico.com/yubioath-desktop";
+ downloadPage = "https://developers.yubico.com/yubioath-desktop/Releases/";
+ changelog = "https://developers.yubico.com/yubioath-desktop/Release_Notes.html";
- license = stdenv.lib.licenses.gpl3;
- maintainers = with maintainers; [ mic92 ];
+ license = stdenv.lib.licenses.bsd2;
+ maintainers = with maintainers; [ mic92 risson ];
};
}
diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index caaecd0ab9f..63d56a48038 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -82,11 +82,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
- version = "1.3.115";
+ version = "1.4.95";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
- sha256 = "1k9g1zjnn0bhyw133padpyym73x8v1i3nm65a040bgkwh6a5jaj8";
+ sha256 = "1a7rk4r7phlf1y3ap3942z5sfvb6i4qglvq06qqhz49wq1wbgvq1";
};
dontConfigure = true;
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index c3522e17379..8968a10bed0 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -1,4 +1,4 @@
-{ newScope, config, stdenv, llvmPackages_9
+{ newScope, config, stdenv, llvmPackages_9, llvmPackages_10
, makeWrapper, ed
, glib, gtk3, gnome3, gsettings-desktop-schemas
, libva ? null
@@ -19,8 +19,10 @@
}:
let
- stdenv = llvmPackages_9.stdenv;
- llvmPackages = llvmPackages_9;
+ llvmPackages = if channel == "dev"
+ then llvmPackages_10
+ else llvmPackages_9;
+ stdenv = llvmPackages.stdenv;
callPackage = newScope chromium;
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index bfc4fd02840..8c8e8149f93 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
- sha256 = "0vsykl3gaql8fp1h5007ljds8m8q2n6n34dsbcqqav2008zlks61";
- sha256bin64 = "1bmszzgmzv7hkczs6kcsa2r8vv6nhg39q1sv74695mr3j3j4bdp8";
- version = "81.0.4044.17";
+ sha256 = "1bahnvn6i08gg10r9p012n7xjwhnjk1xq4c70kw6sqr4p53423mn";
+ sha256bin64 = "066lvnh18k5982dv9481g9i31g9pq6a8q92g93xkqgj2bipbv6si";
+ version = "81.0.4044.26";
};
dev = {
- sha256 = "0vsykl3gaql8fp1h5007ljds8m8q2n6n34dsbcqqav2008zlks61";
- sha256bin64 = "0xx4h82w6jklwlk8p2a2qqk2a9vnf004hmgw69i8iwk6l1d9hxfb";
- version = "81.0.4044.17";
+ sha256 = "0k35sa1qq54cixybb12nyzkjyrwb4cbjfffwfvr5dl859i5bz1kk";
+ sha256bin64 = "0ckbgk6jw3zq3gqvvwdlcrqlm110hkvija6jfh9dk0ip1wdx8wkm";
+ version = "82.0.4062.3";
};
stable = {
- sha256 = "10myihiyrgnm0ly41k4h8ayl3vv3cpshs3pshpqaba0l8i5r5b9f";
- sha256bin64 = "0pd4ygmyinaq22lmaqjqi1gs3svnb863mkhcf85dzm1354iz1g9k";
- version = "80.0.3987.106";
+ sha256 = "0wr487drgd030d7p84rdz1cys0c87wbgh2qg3d7qd98gqbfcpss8";
+ sha256bin64 = "0kipzd0q3p3wwklcl1fb937xhklc0s76apsfrjwy0jcmcy47blzf";
+ version = "80.0.3987.122";
};
}
diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix
index c25e41de5db..20ecbebd6d8 100644
--- a/pkgs/applications/networking/browsers/ephemeral/default.nix
+++ b/pkgs/applications/networking/browsers/ephemeral/default.nix
@@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "ephemeral";
- version = "6.2.0";
+ version = "6.2.1";
src = fetchFromGitHub {
owner = "cassidyjames";
repo = "ephemeral";
rev = version;
- sha256 = "1y0n1p14kg24qnybi201181q7j6vm20ka4xwmgggjll9v6qflvaz";
+ sha256 = "182kzk68l6rr878aaaqx31c6npb65x77qzhbc5rbqlrrdrb69zsg";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index d7d840de8d6..67936928d29 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,965 +1,965 @@
{
- version = "73.0b3";
+ version = "74.0b7";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ach/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ach/firefox-74.0b7.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha512 = "2cf55dffbab78993b9be7e4f78a8143c813114177a018b79f0e0973bd842847ad2a7f58d0626be8aac79ba586f8c8d8f26dce1c00781d8f3eebe941d951bfd52";
+ sha512 = "371391df688dab86c5126b1af61cdd94a05ffe5fd001c465406000f5d50eb66bbb24d0d18e4b4d4293f06f02913344ed6ab1241841441dbd9696e20ae806efc8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/af/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/af/firefox-74.0b7.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha512 = "838f46238f86bcf4a19170303a3fdd2b427f9e2f7b16ea4e4fdb9f79ef9c86ebe61b402d84499ee0a791a758f521908b30f6970a5310c69364dcfc6a94caafe3";
+ sha512 = "8ae751f86a6cef220e586f64fe0253a9d86b69c90034665ea94bcaa9981b2a9e8844988a8940853f58837577c00a275b8f5c316bab51709c829b0135524e372a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/an/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/an/firefox-74.0b7.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha512 = "d8af28cec80715e1a8ac73eedebcd207bc5ea02a0fea48d92648776597da83be38325b858f9366cf135441b49511f3071cb61237ae2951076c23288741b0b051";
+ sha512 = "a141d87b3e9d447174b34b8c835542d2287f88fda576171a86147251331b2dff62d1ac404566bf98348cf8d9ecd21c48be5b06fa989cfb276fe9ddca3aa35852";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ar/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ar/firefox-74.0b7.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "b9a0b00fc4f83706928da2260547bed62f58e3b113b57a020682bb647ed2eb2670912dff48db18a4bd3f54dda98d0158039c4de9a828205d85032a2cc77a52ec";
+ sha512 = "e964ce1088b8e129d66bdf815a0585ad1861b77c36106c088774f642f687b0097fbbc22cea7b8b7fac8598ea6e076ff74c41804333788ddbde2fa80d8e466e36";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ast/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ast/firefox-74.0b7.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "77576261a8ac6c76d7cbe72b833cbd4f4cda70142468277a84ab8947553bba570e7094110d04d76beb20f6d97def6b99d4ed7be65c8b34655d6df763f998ffde";
+ sha512 = "8833edd124f20d62213f8e22925caecad4b5cff3b6bdad997930c60a351da87dbd4d4516c441570a621314dc1d86666448c1de95bfa7a84ed1d0494088529a83";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/az/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/az/firefox-74.0b7.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha512 = "ae84dbf5348c6b9e37694ffbb0645be5dc70866cc093923865050b524f500ad6893a547f131a0a07069b09a1d9eb693a7cd9a643813f57701bd40ea3c61ef92b";
+ sha512 = "04856c83309a1f1c0f8ac99e998495702fa70d0dc65f6adf7a21f81e96da016dcd9b4c8d3363bff03f0bedeedcadd9fc101c54500f3b319f5e1e09269a283997";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/be/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/be/firefox-74.0b7.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "19aa8077fa3e7795b2af8381a14935a8af344b9c2d539840c488153adf9e929fed877fe860c6fef878b3eb9d7a85c0bf5915975e9243220c2075bbf165c70f4d";
+ sha512 = "cbf7858cc233b87163fd985396367dd6459cbfdfbfdbd54d3bcf9419233f03934011f1df9381725c250d6b69bb02a5b7c4a752d1d282e358998494d74c6385bb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/bg/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/bg/firefox-74.0b7.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "5a96793fe865eba35f90c38c5fd8b0d62f81e9922f39d25f3791f04514cbda86a123b23e6eb90117af0b1fe5b64b85d644a83e279a45055d4de78647541689e4";
+ sha512 = "4d142b7dc4ae68106a39196d79c92ed857354e1a4896ec30b94de26a764da07434b713faf7ddc74886e20735969b5b2dc316f9ac1b5a57b43545d9282a675441";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/bn/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/bn/firefox-74.0b7.tar.bz2";
locale = "bn";
arch = "linux-x86_64";
- sha512 = "b6e095346e9151f86887bed103e0bae70a1dd3bd6fa2a227809569f96656ba6c2d57327b24af6e1e87d45cf956641ae8b2de81fcbcbc91ecac6fc5ba4f2fc64b";
+ sha512 = "916a3f4f76a944ffd13d26d630985e85bfea416d714ff95423a0761341e569a2100397ee06c32005c3f98f7926a1dba6cde817a1d94f638168edab2005c5ad63";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/br/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/br/firefox-74.0b7.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "861730396b2d3c7ca0dde9bf018b60e2b2ba8b929a124f86ac474c1852f07290a01c5351b82fb8f858d98e1867146cccbf7ca3527546804328983f34be65d505";
+ sha512 = "d127065bfd273aae19cc9194a2f5df9a4ae797f9d1b2c8bf50df0fd177c4cc5651e5acc752ee45aeaf1b6bc419680de0a55d8c022df71fbcb6a2188b9fd99207";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/bs/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/bs/firefox-74.0b7.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha512 = "b667afb631a2afd6555fc9efeb4b72b804d29e9a4567318e56cb3f367beb523a7acb2ca39144077412ac611574ba766aa1749f964dc60a56140e26a05824b95f";
+ sha512 = "0b4706f44d63070e2d0438c0fe43d9f157cc770c6777df17e71243a6c7a9ee694aca554de5a7857dc8f450acdcde93a5c75a874cdb7cfa46d16d39b3cd97d791";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ca-valencia/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ca-valencia/firefox-74.0b7.tar.bz2";
locale = "ca-valencia";
arch = "linux-x86_64";
- sha512 = "511b6c6085b9fe321f65fa385e354025096cbdafd87998b90166d51d568e7f9e1065e69f94f358976141477d4edb4b04307e00d0b6a558f7025f9482f0c910c0";
+ sha512 = "73103b02b91cf205d0cd69e0af10bf7c864062703f4b11a4c47beffeeb656aa8e73796f30edcb458382bd31c728b28ce2a122681aee5b41db666cb3c647e76ed";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ca/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ca/firefox-74.0b7.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "2e7c3dee71bac0ff2ada5f7332cd5d32e00d4890a9c4ee3d31b804b3433812069050649fbfaefd8a71c1a7ad53fd781beccf10cfbb5b789860704e52501b0bf2";
+ sha512 = "6bef2c5a242d7cdbe511cdb4491fae34c5897900b5a61aaad34f6511916fdd937f39fe53c29249eb0309191a5f7c7ba3c2c6e44522bc3033c0adb6086967bcfc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/cak/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/cak/firefox-74.0b7.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha512 = "d1e8f3792249b65202bf3f05ac710a5e163264c04e71ee218914434852ff91698584b7074f19ea2446db464d57e722250db5a9ace64ffc4fc6d29e1b6e1354f9";
+ sha512 = "91893441b0ca1ad8d2887a52569374ec4fa51522bdff7b468fb2664414406b54ee6910c5c9fdc70b2b9ec502c999829594c24a20240acdf2f2fef7dda06e7e2e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/cs/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/cs/firefox-74.0b7.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "df94e13955565f01735deb81a49e50536c02dc573908481ece70bce78d6d78507e7be635d046cae6f18bbf3995d0e9488bf908c1577099242961c6740f145f4c";
+ sha512 = "dd1da900168651d2ed545f1084f2968f7678b462773f2547a11034360170d981ba9bd813d9392ade20755e72145eaf6c1e6d0b6e2d128d1f884f0d8756d49227";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/cy/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/cy/firefox-74.0b7.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "f9a296e3caf6a095933637510ee6f327496bbb530c0e459c2aae297b60d5c41f678f8fc705baf105ce6183511bea7d6bd88ead342e1d97bc1a036e8f834edaf7";
+ sha512 = "a7a343140c7fb381278de6475fb5204ac4d38eb07bc3813b1d84f649e69aea3807336831cf364a4a90aa8c6c6d54a202da764f59ad70c8e5509866fcf3e8e1dc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/da/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/da/firefox-74.0b7.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "64242fad2236821d169ab2691850d4c24877c1a7a4643d142cd3eb4abad72cd15e6a8c0c9c2bc1d09ef8f7f0e189c300fd3749654d39d72b9941b114d4c3ac98";
+ sha512 = "e0ed22aff77496deb13843e7907e8c02f86ff9b73aa97236aff4d1ea1c6127ceb69cf7722fad2dc8a3766d863b7f728fb0ae29f64cdfb0209bc41d9db9700ee3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/de/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/de/firefox-74.0b7.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "fe5b87df4baa2bd2dd87f42d8c2ae203f25bb7e7fe6ca6b04a8a9e18cd1cd95b508ce91c7567f974a48548f0f5fe2cccb89024ccd3131b3f2b54c82c3bdf5e2e";
+ sha512 = "a8234fcd9d02f7ca55c99ad2bb8584f525196670111e9dc4fe8c28d3592030cf98a4619939408853f04f004828c15269ba1ab0b63b97fe04dcbf61f0318cf5b0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/dsb/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/dsb/firefox-74.0b7.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "256daa30e5b5bd16abd1b72953c7986bc019cc0050b71439af24166a84ab47640b660051c3d9367cd919c7b505eb40a81a0b2237cdb19fd62d1e80e9d900c083";
+ sha512 = "98933acc4e74a1d88e4fbf8bbcdcd0310eea9af7ce88d708146408a157529fd727104fd827fa445a139721c1e1f1523637b0cb6ccc20ae0267ea723928384155";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/el/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/el/firefox-74.0b7.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "8793a20c37f21a94de542e0e2771603ab50c3145462ad52338a12705bda9028c36080dab0a0fc461be2a7473c3b81ba8f835704aba7639c6fc4069b546c6c9d9";
+ sha512 = "a6656de1898fbaa3a67c1b7e0c7c45dd9f5a6f3117bf2b044bf266556750606b3eb0c00ace7e32f32ce37367d5196d28bc5bbec3a6ddb5f0fc7629f6a2156a90";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/en-CA/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/en-CA/firefox-74.0b7.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha512 = "d4ef93e73d79c72da4ae88640fbc4640e63e1f7748f4f27307ae39cb8e0d567aa2027263692d750ff7391c3e210ebbae8fdefc6915cec2e7cc356c4a992472e7";
+ sha512 = "b1be0cbdc584520038e3df24607e8342ee71745f11c7e89f574d45270d2f024a4974d353549098ff3e5300a5c618f7274615f05858d2b9c5df090464d473387a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/en-GB/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/en-GB/firefox-74.0b7.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "023e2127eff59cf4f7df0c583e6113efe9d120fec1ae877bfd3c31c4819eee16469ae34718857757dbf68e2a6a4c7941d33afd38c77122847c8392a81ace43e7";
+ sha512 = "072c48287c0346c28bed4ccae0b71b984f4b656f917b0a6c6f20ac4fbffc9bc8248070fd584ea3444f40a65ac02202b09d26548c417d8a9abe8f54e385daa609";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/en-US/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/en-US/firefox-74.0b7.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "675555b854a27009aeb02260f4e3916e04f693fc031b9420384f79371837130372318c6178c27640448fecbc08a536bbf218cf5fc504a0270e3109aa30ab188c";
+ sha512 = "70a350c3122e8565aabb3155bbf532f75958ea0ab83576f98b1f1a819fc54ccbffab6e0db3f5996814cd199b1a30aedf586b6bc3e6b2037c7374cbcf78fc3dea";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/eo/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/eo/firefox-74.0b7.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha512 = "118bfc3e503fe5a998930e197a1528396463473fb6ab9df06953e1de808f9e3d50559004a1c6b5612de7bb9f9198cd135f18634523e668de5f3ee99f7cdba1d6";
+ sha512 = "35d35b253084fee933c828ff38b8219cb742ace5c36f407fe1235cd5aebd956b813111b9cb05306ce5f85ca42634d4ab903ad409c3055ee0ae4975c007e029fa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/es-AR/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/es-AR/firefox-74.0b7.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "605cac3b3cd27d27460a04a727cd3db0a7831f52474473d62d7b0a8f3ffa71a4be7a2b4e94e87f3cc9b35bef844749a315ca53c2d46011255d66edc17cd0c912";
+ sha512 = "0448e25a909dc951812bf5b8ff3eb39e1ba0825900ad4a4d78b3c182830a37fe8c6f226128341178e0b6612b4c9ebbb826d2484505ffed4e23097ec1210e8238";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/es-CL/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/es-CL/firefox-74.0b7.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha512 = "9c06b14b530b9b555919a87a3ec352aa2dd8fb070c141ac5083ea875af95bcf202baf8b0d4951868c7a9ab67aac54f62e928e70cf5bd57b58f80ed748a24f899";
+ sha512 = "703c9e4cfbf94522c1b4526bb68e7ea6941169fe1f45ef155f96587701064dd3d1c2056fb59a582fd14b4a41ff4d9b82094b40f4c95da6c8d5da66d96b012e80";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/es-ES/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/es-ES/firefox-74.0b7.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "422a1ed25e05b120cb632698622e3b374b920a207fd1acf19b19b0040425d77574e3e2b4aff0d5cf01d20d87522878b3cf76b6b58a06688b6036608d02d95b92";
+ sha512 = "e4666af45ec236cf8f14b69ff0bbcaa4070ed9205a04cf5dd37823feb1230e66f726d980de97326c1ebc7b93c2b3b43cab61efbb1983d8882a78abba5eeab313";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/es-MX/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/es-MX/firefox-74.0b7.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha512 = "11bfa4525a9e60521a01fc008034bc82d5af05c2b04b74d59f572ecc02c62e3fe8cadb19970bf0689bdec56ec34b2c827d635058b31534bd56285883bb93d979";
+ sha512 = "1aba3fb4f7d34c55b433fe886eba74b0c71ff2a759a015fa31becc8c8a207b70b816d6cdd1ab648d3b8fa220268c8c95d19689fea65dd963de6750f1ea0f2905";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/et/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/et/firefox-74.0b7.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "c24aaccdd757d4e25981d39dfd32c5c7f90e1537196feb5ec4f381c6a270da2160b5c95c2c0ae24af25e27a614839988d8a27befd8fc8704c7c5dd0c2612e676";
+ sha512 = "485cf19a8bf5a8e877ddec241a98d580b8ebd187c0b92185b116fdfb3936d31cd379f10211241b591f8927a077d7482668abc411ba67c4d5b83ef5e47e0ce6ae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/eu/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/eu/firefox-74.0b7.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "884e9501e232a5038787743161089da139530f7a45fec92883b6719a736442963f670c63429399c10695ae27f8acd443760d09f281173a23b8e845183ab067c5";
+ sha512 = "4bb9b8f3a38379011240c4ee9d0d1db9457271c5bbcddf691e42d33e281e2a63d781e962375e8dd55860ca49c872922384ddcc1f1d9ead98fafa213d2095de32";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/fa/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/fa/firefox-74.0b7.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha512 = "3822983825639beebc52a0adc5c029327da62ed8c3bd182a437d0a2b02f89b047b2df18c112fc7738113a421ed1c7f9b028fc5472b2facc8bf8bd50c501d5f33";
+ sha512 = "995e24fdcddf91ab5eb2d5809b84997506c8c3967fbc2735a120c11fc69cb87c02a2d1f0b6c477946a5406bb585c73ca6361110dad6a3927745b24fa509d5018";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ff/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ff/firefox-74.0b7.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha512 = "15f50945928ab83c48ce49c136f738c1f289303c9a1a6b3c9183f3fb02713685bf38289f06e4892c1f21e37b691deadc85e8914e803362f39d0d9d93e52e2398";
+ sha512 = "f504e9157265dabd9340b2974051ed9da7b4f8f56cf652c44d96fb949a3381dea16b9782a7d029f2c3e19793a9fb4aeab703f30773dbc1b9e70e937b00e4e77b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/fi/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/fi/firefox-74.0b7.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "c88fcda868b18510e0a49cf96c753803211c50a11dd849b242f324d574d31dd5d74398b99ecac5158d6f4cbc3f878322ba2296f8001b041ed32b3c2819e8a8bd";
+ sha512 = "f97ad7cc1c1e170bef9e2da7ea51df57b32445a3b13478372735af5336251cf4da6ac2955edfb70c1ff9fd9eb997eecdac6e63c867ae80e18f2391ecaab1406f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/fr/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/fr/firefox-74.0b7.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "2eb84dc3714a03294043c07bf00d2d87cecafbb8297aee9b82317b0cef1fccc32dbda94056d0122dd8384da81e2e7477f1fd5d8466a34d9af51c288ce1af1a76";
+ sha512 = "aabf2b7b4d3e564a9aa250c3bdbc3c3f3ece0c69a6047f76bff316534637ddc00eb24d1e59c419ffb9b7c4193b7a151682cf75b4470c378ed5305c1cd9329843";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/fy-NL/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/fy-NL/firefox-74.0b7.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "a187c7c806a5e7eebd8d121d0e84063702f7d8142a78dad46866f7b1e5b87950badbbeed394394e805d74536719756e87ea9a0c1ae016c9274983244943c9547";
+ sha512 = "057bb572d45eef62599debed8390f45a53f5b9ed720ac37bf46c3a6f352235598f17a1627989f50c0e10a5f22d1882a8170024bb9583bc2fa7923cff32feef48";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ga-IE/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ga-IE/firefox-74.0b7.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "7d6809783ca7d04d836fe6b108d8e5b417d1d0b71211b46d08820826368003924f2b45e4e65eb827704c10fa6300b2b8f1f45a8744be4d28e862f66d5c2c5bc5";
+ sha512 = "9872d3692571fde83a8237a41c51c64e8a1c099174262b33032b281fc76b5f564b29f3ad1ccc7dc5ba4c8ef709810cc1a3ccdc34942361453ef15ede006b42a7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/gd/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/gd/firefox-74.0b7.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "21a2f38bc70f9015d0e85e82b778ff02d52698fe361fc76b2b2a372acf2ffe7d673b353961fcc752051a43c1f2bebe1c9d06ba292f327b5d1e5cf98636d162b4";
+ sha512 = "c3e5613572ecccc67989c5d3ac5f590092bb05fb43166b931ea49fdf7cd0cca150a6208970009ffc8063d7d87dd9e5b371a9d317af8b9094240ac9314eb8499c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/gl/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/gl/firefox-74.0b7.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "7488b041f11b54b267d4c9dcdc68d6c1089313e617ab012b1a61eef50f2eb53c7d823f3a8dfb4eda82ee6d6eb9484bafc431da9989c11a4d31a39ef5947f3ec4";
+ sha512 = "766b0ce2b5b4a78e0470dd708a83423e8e756a7f44a6bb7e74ef06699e48bc848c2f1e5e452db090f1a8b8c33fe20036f1059500a14c878824516868056ac45a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/gn/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/gn/firefox-74.0b7.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha512 = "849309594d09f2320e845ff027de1eaaf421ee8066a3b0afa960119312e480c2d1399fb85adecf4b96f848be534911377705b87118d68c04a616399a4765f71a";
+ sha512 = "f6937fec4839c3a06fe36e78958b549cd1bb0ee6ce2490ba3f05716a6853807781a51c7ddd4eb8c5c10c38624818f9ee70a3115fe53e426b27c8d9162691e3d6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/gu-IN/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/gu-IN/firefox-74.0b7.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha512 = "e9695ca0e26dbe43d3887d4b22416058ea86585b7d9ede321624e2ad4f4acb1d8c39c9e2f9ed3b3ecff2d9cb6273186bf0b407c6418b24b0dd275b573729e5cf";
+ sha512 = "005223824b6ec5e3ed8c404ac9fea73b1ca57412247ed625c667709e81be1727b04a0a1b0b59add46864601b04efaf01dcb592016b3e25c026204444a6c411a4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/he/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/he/firefox-74.0b7.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "696f8ea1dcbe5e814e7bf66113971571d85c0313c1d18ac4dd0bd7cf9ff46ac72c198bf0e68b9a76ea0f5133aad0b8b1f53e3a914c88c0e5c998e877c49e2a67";
+ sha512 = "29ff04367e36a3df0e5d93d69bcedc6c698692a42cc80fb2f51171b784c030de832593a617e35483bb6acd849b77b5d19340a31a0322e1421d5ccc07a1b90161";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/hi-IN/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/hi-IN/firefox-74.0b7.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha512 = "c17751255f00ad7506caabccf79a915cd8e99e6f4fa4ddd414b5ba4f3024e55f0dcc0ef72696e7479fea960739aeec094ddac80681e6875eacbf477d1857990c";
+ sha512 = "6c78e91ed89ea3ccd7d67d46548993aae9375648ede8edd76cbbf6bcaa97ceb55f13506b8c9418b6fa94fcf15e0d4052196334f3f2b804439c3fa9db564e9b4e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/hr/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/hr/firefox-74.0b7.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "7409ed690da2cf0bb71be4e7da9a77c7fddb33900870e55cba7fe7fdc75e1cc4fdf590d73f8e9afd3845789987e98f22a83193e47ccaf5b8e57962fa25be43bb";
+ sha512 = "0935d78afd0739eb510f24e0ca21d9007bf89c3d587b2661e0bca2383b0a7361071a529c67c213312b390ace44e79b07826d0ddba4ed5756bd800027ecfeaba2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/hsb/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/hsb/firefox-74.0b7.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "c3e83bd51b63a5fee1630151742956625605f1d76ea10e7a7ed09dd87c0b86ebf2950909ac199eb8974e34072cb75e1adefd2fd4629b7b695aa86c2b007d4ffa";
+ sha512 = "1372280c8770db01aeb2fa5992a5ae702318b84e972c379752ca7c1a15e00dc44cc7a5e9fc212c928e987aa0599f240a73828c7296769064e41b8699bf4d1173";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/hu/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/hu/firefox-74.0b7.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "47ab25f67e2fa813c3bfdb11f5810f6c9b7d515d80509e469c6841a0de45b03f7d4f14867a3dd823e0fd0092ef1e39697e2e18adea267d89d17b15dce0b58aa0";
+ sha512 = "6ad396d94908a40b4263866163c6de6ac3a414b27fc57a9b272df2db3b5bedb6f1a0fb31170bff456858fe8185761e58f44011a77295c41afc8dab1d7ab6550d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/hy-AM/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/hy-AM/firefox-74.0b7.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "685bf2df4290a05781bce59aebd539c6e045ea9a70d2782082f5ab5ce94157bf50bd3e81d14516282e4e16d200a775f3970ff3266520f9df0ad8ba55a88d63fa";
+ sha512 = "c59a6adf717d489b9de000be2f9cd4c166f3b25217d2add4f790d6261cfd8395aafa5a40cf8f41a3596916b265df5734236e7ccb02e9d7958e90e6e96d616468";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ia/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ia/firefox-74.0b7.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha512 = "d58fd9f9199e68463798b17c5d09bd73d8e36382e52d9932b2da1ad3ff48092fabb076761ad9c41dcbd2ed34d8f92c601e8191c1ec0e689a0e9415807bed4447";
+ sha512 = "c971f1eddfa61f0abb9053c106688eb42dbdcae9bf96ad3b4860280c7939d38599c9cc00f41056eb5297eacd6b90bea7efd2722ddd3f4b33284468837a8a0439";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/id/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/id/firefox-74.0b7.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "33035f69d26e97fcc2b3e57f25f9b0201f9a7381fb83caf53c0c70ced67bc1e3726c7e50884746015e1e3f2d20f509299e066897563bd01245d3088bf86f4af9";
+ sha512 = "7d161578a96265e1a3fca8efcb6f54b93b3831a1b7f1ecfb7dfb5717bf9859767a136a3182482bd06946bf8b50fb8fb4a118a7e4ecc16d3a3ccd9cef54303d5e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/is/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/is/firefox-74.0b7.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "db79a8253a2cca8fd1378ea0e81b0248b78c080b61a31299714f107d737889afb4992e399a173323a69cf47cc4a2f1e3f4e750fde9908be9ed40359003f3bdad";
+ sha512 = "aa462c1c49ccae93dfd16bb7f2fcaec55eb26b093332b24658a120349c9e2de233a6bf75585221c187b668f77b2bb675ac44ec9a1d5896f0845c91eeedf969fe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/it/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/it/firefox-74.0b7.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "161f48227a51b6a2f20e7baff9abe0782ad35c28af05344b8214f9cfb1ba1b4485135198353ff05b8c17a9fff6fb57c857e7031d92bb7a9e480b50d974e9d553";
+ sha512 = "50a3d1a7dc05531cbed59ad0bb3289706c1e4558a2b160ec80f2762979ba13f84bb5ac689ffa21c58e1ee6cd3b60fc4bb96ece54aa0b2755adf28c10231dbeeb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ja/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ja/firefox-74.0b7.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "d37ea12de0f1efcd472acf2ea7073538a7bc0be86816b86e0d2919201f11549b62760cd1efdd9c1315aaabfad4424664a6f75560c671873ba8977892fce728a6";
+ sha512 = "255c6b9291a38d431210c014433ce8d986245e30dc3bafcf13c1dfcdcead06e1988a1e960a9f3a23d37f1d527635630e2e76c3aae4a81b0ae3edd9c6daf161d3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ka/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ka/firefox-74.0b7.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha512 = "c4b93af5cd91946b90a35f9deee8eb7269ec74dee93523ebca869b12e0866200f177a4c49d94e2eb2151302ddf09b8a4aee9ea6e2c87a27baed6554e3d418ef7";
+ sha512 = "6cce90df66e85fa5d3fc96f9962d9140dad36f6fff840a5e80af608cca20c2557a79f5e01338d0fe64f6a0d1d6b15c72c883147cb3fe932a368ad04353b26ba3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/kab/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/kab/firefox-74.0b7.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "4722c5bb6baeedd5f1e9c51bd1611285a20f33e610ee5665db8f52f77d46c46e501f074e2c0cd41b3fb1b26f1803e872505390404a085813d5910d6086b28ef5";
+ sha512 = "3170509b386ae0d0390dbde71fbd9397ce587bec4a47e2328796ca04c9b379585a2311b28c373ee34672b549db6c1e69471fec65de581d11d177eae536407af4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/kk/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/kk/firefox-74.0b7.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "48e10eff6b37ba34ba4c00a3c2af3fe4a2a533c5bfc5eebba1c5158a5a97e5a077cd71f74b0d86148376d74af549611aee7208ffa8b3f5c2a649fb142d7b816c";
+ sha512 = "71ef08a02731831cf6fc863012f58bca054017dc854f17ade9ef885c391c437b40bda9c89c1a06f9258047b1c9e74250f67ccf07fa8ed0c47d52a425b447e21b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/km/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/km/firefox-74.0b7.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha512 = "5bf396dc2b596ecc06505daa919994ca8fd74f7dd147d3c1436ca8da862d223925f32feb833b0f7e0aa3e0f81fb3729eb8c117f10b24e72c3ec4ef7c4ecf7a0d";
+ sha512 = "a1411bbca99f8c45c5b7a3d3793df3496d653c61d022cb7bc5d223e3dfc4b6f27228a888e429656930c05442b8e8087bca6553848f01304760483e2486ef071d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/kn/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/kn/firefox-74.0b7.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha512 = "1d156c2de119b06fa17e2dc4c209b34a63d980e8ad548582c1eea314e2151b8d8a79c8634ab473bd8ed0c471114d22091ba3abafa91150e93ede009b3524a56c";
+ sha512 = "a7d8e7349e65f21085b4fdf69284eeb70d0cafa528d034b5c2220cc2ba6aa2edcc846d736d288307115cb3e6139597dd47316b3d0a0a9e327b72b61f901c4eba";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ko/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ko/firefox-74.0b7.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "cd1e0b60b6013b073ab90b1581f5c9686ccedb81fc414f7ef21af1ae86691ee5d7d9789b144abb1ce689cf3aa9f32ea88fc7734b3db11e46c9df6743d4d0e6b3";
+ sha512 = "e6afa5b7d32e641b5f4c04d4afdc91c7cd7422102658b932ca927daaf6652e035d8d9ce6348a9bbe07cd562f69f74bea7746df8c85aa292751b4cc3ec764600f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/lij/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/lij/firefox-74.0b7.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha512 = "7f8c9f3c11c17dff706bead9c85ed6d9009579e05b1631b70e7d9e0d813e18e9043eb1287dc71fad293596ff23a53d49de2c1bde829149f73e99da6227e852f9";
+ sha512 = "4ae2955412987487c37d24f8a4a935b14a84048627e6fbfca15a8f4fb5eb4f4339ed3c32afc1be2e9c5725a7caf6d0894ba2fd80eb79150cbf364c3927ed80f5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/lt/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/lt/firefox-74.0b7.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "34f90d1891b7d7d9b9dc576c20cb7a17b2c7d04850b96a1fabef34cd03da8925c3e6e2dfacd6371b2a1b59732279f1c3d90dd8ca495b2f175dbe2c8008fb2f08";
+ sha512 = "df9b514e06272fd0eb3f73e14d9a9ae9c22e5e3e7bf456a63a95054158f2c3fe81bb6750cbc6ed3a53d5a3f11f63a801b6c6d412df50bc08bc3ebde71028efc8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/lv/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/lv/firefox-74.0b7.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha512 = "fa8d8b14db57a51f02a5c41285fb9d37c5331188a26060571cdfdec8362f6ac6382533ee4a7678085d0c95134edf4cb9eaa9a523ae9dfd701c5481d9bb286eb1";
+ sha512 = "28471815ab78ba35fed8b77fc2722920e848eba3ee8cf9cda62dccecb055b8684e2ff5587f477b38b286a515899b1b9c23b38fd04a8f510a3dc4a48d05bd3c9e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/mk/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/mk/firefox-74.0b7.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha512 = "b7c22b2e6cd47be25accbc7d7fc91200addf8ab0ea2ee2edb2978315f2e6fb08fe1cfb2f04be872d0f466a3be5f1aa6e66af551b22dd643498bb641130df2172";
+ sha512 = "3cc80253d3dd1b5a55035a5b2ac0ba1b10b8cae71537fd277ed95c91fa5d88e75f0c95a4373a0a2c5f9d887709679cdbd154b1babbd1089f6c63cf2484a3176a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/mr/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/mr/firefox-74.0b7.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha512 = "2f01647d916e723cba7bc7b0f67ec11101377ac3f3b0954e412f4bcb23eae5008ca7b175dbd5ef20e5a4a06381ee176969fe6407975f85742dc84a712b942e7a";
+ sha512 = "e7d702978faac40984d1fc5ceb7b689ca6e5acb30c3b4e119431013a8efcd89421ff57ff74ae8283ed3c818cc171c1cbba461d17106e22f1cb7ebc1e1080d832";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ms/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ms/firefox-74.0b7.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "f138851c8930c1ba357d347519f1a97226152a5a3a37efe32c2ac0b670cb14735bb8c3d4c4463b87d2cf463a39f4baa05b775b456a419de42d062c081ffc8f77";
+ sha512 = "6912c3bf5b7dabffb89b9814c4d451aab946233a489a76ad2d456856b56d94c3403179436facb4aa344844fd130b550b7223113db7155084be2176c07c4b04e5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/my/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/my/firefox-74.0b7.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha512 = "14380f48c0f0d2985a2e48f40712302318ad2fe1c7517acc13967202f28d98900062d530ba197520f6c710548ac7c2641c48386d0a3f9a9e293b7584b21ab6f1";
+ sha512 = "07a5cd6d3376b0e4b4dcc4db5801cf9e8cc17e2ba7269953c10c8620e597f837bdb29cbe4707da17f87e3778f42257b4ac71511dc8941b72c4a7b7e5e1f8373d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/nb-NO/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/nb-NO/firefox-74.0b7.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "70f8dab495b1c81e2a4af830181e926b92ead8f5fb8b4a8fd48d60504539094a2244777df9fc78ae7b5404cc451907b9060732ef37a0dbdb1874bd2c4659203f";
+ sha512 = "d974a6686d12df092f84aa6bf4519de0700565fe2c96b5a80b9b994bef08e1f2879d602019d8f9f42db771586558f2b50dc474478fe8880d08c95a3b17a800b7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ne-NP/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ne-NP/firefox-74.0b7.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha512 = "b92d7b2232cf42cca6dcde40a1a7b32b38a2469d9dfd598907bf6c12fb007bd25763bdad2077b70b218eb59f3d0f24c104c9f605193c27ffcadad26e87699ee9";
+ sha512 = "832b0d811e6adf9f0539f359f3b13d3e0f8fa8583e3d862979e6c44d3da94b4375c5ccff27ba9dc23936dc666fba8cbf1e55dfd6b8bf563f9ba35dc46d600502";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/nl/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/nl/firefox-74.0b7.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "0356bdbaa9f44c1782736c3ec70d993481e14a63655cad5f3c031de8c76d474c2784f663cf854dc8c2b678c87205f763b8457d3359e17810122adb0185a79ab0";
+ sha512 = "436421d93e8daf719fbea0a0e5f71163f150091e00ccd2bf64f9eab9be8359247c57fa7b66d16786644f9d96738d57316b75feff4da1a2a75f5d4a302fc6cd08";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/nn-NO/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/nn-NO/firefox-74.0b7.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "d7a9d8f11d83d94fe4ef84900574fe49cf00d2403fe13acd45c8164d2f080e4d7ac45d06b5fb194569debd5dd31af929d359a92c361896b9c3c872dd8e74b666";
+ sha512 = "cb3cf186419c3303cacc92326d901a4f1b79991ec5054a8438047df06e052ed981eac7cad8a6bf5a360c673f232d623ad40af83537de962caa361e0e8839210c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/oc/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/oc/firefox-74.0b7.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha512 = "a59a43f379cf368e4444f573fb7a8970a18562eca6d9ee3c70a8ba706e86172691d29d75d003063b420339ddbee18d5b5c59e8b3505c6566c769429f54016cd3";
+ sha512 = "28b65b10cda0c34ec99975d3612576619a897eb2bff5ed215068b133c3c32793810994cfc15877529fe1fcdd9abe48001a873ad929f1f6578a91dafb075375eb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/pa-IN/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/pa-IN/firefox-74.0b7.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "4911d2365f6aad5966004235fa209bcf043055bab1fa3e03316f0d8a57906ae3db0e3242198f95c90ed1ff94519f334978d1aeb9d4f300e8fae2313a2eb1a73a";
+ sha512 = "a4068e759d8af078c3e7f9cf58c00c2fbebe09fc2c204373d5850d195c9d6923721d43091aae2cd27430967254a16dc3f1dbad44da9eadd3974f5b38257a21bf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/pl/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/pl/firefox-74.0b7.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "8292a813f5841fdf4c6b0ca7e4d2ab0f9b4492fb8885154cdbbd1c104eaf48622e961cacc096a37f34491bfde57033432a10f17054cb35590cf2ccfb7e517a77";
+ sha512 = "49e50aa82149d9c0bb06d6351326c43a08198e321cda4b8023b02a48d53931447dffe70c3fab55eeae979898749cf884b57a4b49bcdc223231ba9034ed9ce089";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/pt-BR/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/pt-BR/firefox-74.0b7.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "8a2857897b0108029fd8511d21ff6d6c3195d764156012ee2fc84a49ee3f025311b6c73f6d2cd5b655e2f339169a6cb5f5f574d294f2ef23d1ac68ab7289581c";
+ sha512 = "0c2b334dc66242cf7653665a66536b23be1bcf5b8e8278714b437b894f80a679f13bc92e409ff9674f60015c8046e97b9847f4d613eecb64787b766898bdf9e3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/pt-PT/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/pt-PT/firefox-74.0b7.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "f385375e761183d358efe684b7c70b0bda36035cffe81f78547b1a8b78b7d2f42762d3a94b663e8084f8aaeae59641698e811c779769f858f2886b39dd1e9a25";
+ sha512 = "ecd47ca036187a034913b59510081d009b6932e8e7d328ff917aa99c717523da96468f843b25e5044dafa15d1858e8331d6558dd344e31263de27d0dfd76c2c3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/rm/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/rm/firefox-74.0b7.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "1a536d76992dcdd96e64417dc52fe210e1814cf49b258c04d1a18caa246d901c6c62633ababcf141756aacf06dd4ce8cdf4d8365c319d24deee4dbc3903455b8";
+ sha512 = "fd6d6db19134f494e72991f300e1990b78db9391b0a3a447eccc57add51ba7a1008a492532149d39afc561ee188a7836c3a0fc75c222c59400dbf60dc28080ae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ro/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ro/firefox-74.0b7.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "1472c96ca414a4d0ec3ee0ed9fefff8049be7cb7367c8a9d4a27245fd583debbeb2cdae95da762dbe38727bf414a0e4ba0f1b4f4658e8e0d61cd0d718ee1c5ad";
+ sha512 = "62ec3ba94ca44e2ca92fb0dc02834d39b91f7a1ce6446407531019332f1b9d129bdd8ef9de7c0cc26cd8857ae82d03539f7d0f2a51e5f755d4311fa3ae410eb5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ru/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ru/firefox-74.0b7.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "218c3c6fc4e55aa2914cd88c57bfe5870030b7554c01c51f8ea23630eb9fc3e04b0e2b0bd91aad8dee2a6976daffd69765ffc205d5b50363bd12e8b6b3a45c5e";
+ sha512 = "2b89defde47592774464b8570b81636d94d77a891c22e353e5bafede7c370b4331aa8aa49b2701239ca58eb8d08d74a7525661a57374f1686a427346fc425f9f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/si/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/si/firefox-74.0b7.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "62af3f3a0d40255e75cac716d39db53fc1a760079933a04e9366f866c6593628d7d69ef699cdcee634cabeaeb254caabb407bd0ccc73a2f160d270f794b40afd";
+ sha512 = "8a86deb917486f679316b9f8d2d7bc54ea175d87f972cd9697d1ddd3e1fc357059fb6383a777d409d5b3a110ae7f74505e327eace3593ec4b4fb35290edbc0d3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/sk/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/sk/firefox-74.0b7.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "e9a62c81865a1ca8e98eda1026911d910c4ddd7b18c3895e74a77f315e7f479bfaf6c52c1b6f96c1f87bc04275649779ca15b1f986e912861ba3d08ab75ef56d";
+ sha512 = "ea15d6e49b8987f4c6136de6fec19a627d71434378f2839046a3fe443ee340a925773bcb09c5dfd3779cd1118aebdac808f54c5872245b11ab882564f81467aa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/sl/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/sl/firefox-74.0b7.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "3ec9b91051bba53794abfda08b1d02ac7ca4fbed7f4f187d1c2dfb542a058514ccb24d946929b522ec88a30c6584df4269d3b53a9a2474c9634f875ab2eedafd";
+ sha512 = "3dd20c0ee05318cc7f80a27d895af4952bb13b8ee3af1fd733a0bc03902f470fa31fd8b3231d608e76df3885c6036f27ddc5241bb889fbb43b09467d34fe77bd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/son/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/son/firefox-74.0b7.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha512 = "7a97a2ae04db0780f62b24cbe941ac3ac5c9e2bd9f0281e23910d7b4c3e9c43f8834af0b633c6c0c88bd1b609e297aae4f6638cf28f6dd9d3fa417b6687bd658";
+ sha512 = "513c17a2d91d28f5ac958d45f872a931b3f3db198355a70b72e0238938811e2387fa5d15b0106feb3fcaaf455e19e7603c37b27dd39d8d81dff4106face87481";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/sq/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/sq/firefox-74.0b7.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "303181c208b738dedee0cbc0e8ce7092d73aafc485d50273aaf791c8f7a960ea3ebf6c033cedbce84d25442a614d265d1d7a3653a5a3dee8f859393ccab35aa8";
+ sha512 = "ce96e1f7f0f0152afc053d4f2ae2c8774cd79e12ee250de311fe39c22b933fdba701dddbc2430c5aaa3ddef8d4920c2a04d9373fe8e8aab7a3bab9a6863ba68c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/sr/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/sr/firefox-74.0b7.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "5f0c19e789c07f06e6acf6f477721bb6b7f986df8f55e88f8fd7ec7293d489af9d6f7517865900bb97ece61ede3d4137a7a3b3c00714796bbcbdd9c6004ec807";
+ sha512 = "67691bade82b21bffbe312b6dd3db5c7aab2bcc28ec59cd0ac378ede98d92c15d98b2c4ccdd6d7bcb77d88f760e7c8880d3db5d93286cf6a71a79816adcdb0ce";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/sv-SE/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/sv-SE/firefox-74.0b7.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "8480c74a1bc8b143fd60efecac05264da9b539d0fe23e941429eb467b58656f7a9427c43f2e724ec383508b02a076e1c8ae08de8b3a1296edb6f26ad2854ff4d";
+ sha512 = "5e890e03090c8d3317f8910c16602e9d26df02d91a05159d4610a3b8f0c3b8a026e6256c59406d40d979f93a20f162e1d344d6c430b33e86709dd66b211246ad";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ta/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ta/firefox-74.0b7.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha512 = "aeea547b18f69d2861f757c0e91e6366ca07b6de51373f1711eb34352dd893a8dd6c77d796a88723bb5df1e38f3f18b17de8062eac8c38b7c521066feea07fb6";
+ sha512 = "30a030bfb1e92f3375411c9bd38b8c75db01783ed45bd6d1b3919442bf386ffbabca7a3064ca22800e22b9255b81d415e8487f00a50e0641c9f8bff297d0a4c5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/te/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/te/firefox-74.0b7.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha512 = "d0b3f9e8929c993d594f3e71cfeb93389fc09c55f8bfb09aded4511cb5f216cf15334fb4c7b4b55bfafec8f1bbcfcc09a4900a67bb4bdb9015cef1a78763022a";
+ sha512 = "bc2685e7a6e4e1e744367e01222b192cb35a5cbbc0e5e5f8e3c03e9ef8dd54b599f854bd045d03b02c2fadc36bd778b9f4c72e660357f96e7fe8e49a9b555331";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/th/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/th/firefox-74.0b7.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha512 = "5b9b210591525544667a204bb8190d9a02208c67cbccd109c492a6353a1812c5bbea550a199fa097a2f9295326946d7fb1725537a27859a4bfbafe4520fc2e5a";
+ sha512 = "8cb0fdf71183382c11d3d8244cca52dc9ab1d95a929809e016867ebfdfe1e9ff722a6a54d8e829cd659d218097df8ad503286fa2d60aeab0bc29d514cc1cb304";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/tl/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/tl/firefox-74.0b7.tar.bz2";
locale = "tl";
arch = "linux-x86_64";
- sha512 = "9be7096bd4d0208dd1d67ebdcbf95a27bc1f83c32fdfc4dc0b310919e1416b3000448fea6fd9bcb2e4f22d95572adb0a541ee4fac23015a79e8e1bb330c07f9b";
+ sha512 = "807581a2d4f4b87938058ba8173cfeb944cc54790c01d6477fe9a9b75848341f785768b4b011c33f3010ddc02fb1937cceea27a8260e3d53c386acbc21d7152e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/tr/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/tr/firefox-74.0b7.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "b395c8c4051dfc328731f28d8292ae2b2ea6366dbdee73d6d1c359eb2f9a66e7247bb9574f3a9fb81c7e09966b0f8bf2736b9bc69a6c36fa11309d697a4bb92c";
+ sha512 = "089f764a47b35d5a96edb36f3f056fefd2a2e649036b713a28a482a5cf5a61f5ccadd5e8f20588a0c40bf707f556ae238688b605db189e9a1efc2dcb7d9ecdc4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/trs/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/trs/firefox-74.0b7.tar.bz2";
locale = "trs";
arch = "linux-x86_64";
- sha512 = "72449ddbf314b4e023b7e8bc2604689800e17318b67545d856c7a5560ad6606a611a2712959d18680a493792e5ea0a7a6260f85cd13117afae47b84f8ca74048";
+ sha512 = "35622a3df18be8710530531cf934b5d3c79b942e4f1024edc75b810bd71d45d52ce88ef051fd051083f45b50152602b76d854d2ae56bb64a38739be937884a87";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/uk/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/uk/firefox-74.0b7.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "b944b5e844698f7f430043a54ac50fca000378b558e64da555e345a658093e12fe50df4827650e1ac9927bfb916e486d29764602e4385b147ccade3219e1e519";
+ sha512 = "77a2383129c6f60f77458e3e17bc57015f91d8f58d9d0211dda918d075b57398d7cf80cc2409eef2c6053c843667e6b094733026533e5ae665845bc925a67f40";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ur/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ur/firefox-74.0b7.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha512 = "d3298470e187ce25934e392056c1e4aa34a8644237414f91697b459e22c6a0e13eb7ece5ba6564b6ea8c1cd86e47d96a9d0fb6d4f028841574c3cca15213bbb1";
+ sha512 = "45d49bb2de384d12749c45f02cc726627123f9b50f920f144a2aebae694407226497df5c0273eda168f11f2adec22495cafc82c114f711c858b9b207d997e1f3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/uz/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/uz/firefox-74.0b7.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha512 = "c3779fa2cbcdf8faa537c06144ede677b6788e58802a09c530dd7f92fee1f8786e2e22e9dfc7b36d72db9e9a576ffa09da34a2c8067df7e4aa342077de96877d";
+ sha512 = "14bdd8d672660b0cfa8099276870e54b725d1effdd7128666dc77e942c7295e466544806ea134d48b56e8c5b37518876c5a14c79419fa232f30e35cadc217948";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/vi/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/vi/firefox-74.0b7.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "46263dab55ac771b3e9730493c27d18fbf72b30fff75b46a0e9a6de5442c442ff667584793c394b9a9534ecb6d2a71665b923dcbe02f3e2e7a1dc99e17f8fb0e";
+ sha512 = "3633f9e834c5ff0dd0a888a35f414d87ca35ff0acf63fa41ca4169531f20c21a7debc649c583ed2826b1217b209e42355625a7d822c8e354d4d973aeeb07c359";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/xh/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/xh/firefox-74.0b7.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha512 = "6cac93014f00eeff30115006c8bd52a469fda04c8cf8a0b4a70330bc5c9f45afc96080a03d7e8bc5c10f3e1b33658806731f2e80dfcbc3f973b80104979916eb";
+ sha512 = "b49201efcbaa9254d94940d87529ea15c1ec18682098e46bb4c6df96d20396e6884538bd93ef79a0539d52bea808f9c9e621f4a157b0fa48310bc89ecc659052";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/zh-CN/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/zh-CN/firefox-74.0b7.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "c1f1102d12b68f1e14c8b0ac0a77e5890d9f0dd279893f1892888f6549560d9ea91a1e73a4cb51343a27486805e6d6144fbe70dc79896ce1c87655517c846096";
+ sha512 = "5d00ab9e02db12e34a69d5a8301075f695e103c73bc5d3942e8aa6312010fd9bcbbfae2db19dffb12e369e4abcda0919842a839eae48e27b63a9a40a2d152943";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/zh-TW/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/zh-TW/firefox-74.0b7.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "e964a4ec85e6de84de9c6908933b5f7dc35812913720271b3c9abfc6c76c929e59a8396a18557f089ba29f39ec021674dd19110f3fe58c95c6c6af569dd1bb5d";
+ sha512 = "8b5c6e59a6a93c1e569ab0549deb0ed529ff7463b999c39e1f737805d71edab8553bed6bce5335aa75657c1356fb847d8389829f74e0d8977765fe6b5f7ae615";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ach/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ach/firefox-74.0b7.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha512 = "ff9198d1212aae39a0c8ecb92d633e594cf83678d669509b2b73afb402e48eda15bfd92104e059516988c563a77e8b3122a9782d9af4426ce6e861611ef447cb";
+ sha512 = "4182a91809587cb00b5b15cf244385625dbd1043f64ec67719fd4532315f02983c605554fcec94e3ac9e152c5a69519b9f3cb274c4dfa4850b509669214ab970";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/af/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/af/firefox-74.0b7.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha512 = "634075f2f106f581abcb2a09b053dbaf4f5c9a248248a77ddcccf98b41ca6b3a826378d7f30efb397951349517180b6cb0aa13580d8931a0676b2bbde5a5fa9d";
+ sha512 = "37505dd57623b9b8ed5c9481b3c355790f4a83758629fecde8f286126455f83b4908f0dcafaa6b53a78ac2d1c0d77e8f8d3721d3677461729561b0460c0e3da5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/an/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/an/firefox-74.0b7.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha512 = "a8df8dbb81253471d97649e3ed2c79a2c8c1fe4c0730e5b4e048c44afb3db5f1dbc95f98f13c08a2a81efe4eeb0b242b6fa93233f51f0f848629c410399bf30e";
+ sha512 = "bdf45ce1f39caee0addced219c3702e888d749249c81082f0fd851375029557c995cad40bd3ead24aba1c52b96b440b3004b43994a4a9268c1bd041a7dd92e07";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ar/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ar/firefox-74.0b7.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "2460223644611db68c1b3111340a4c4cef3c5327ea3b5fd679171c18f92ba09bc5dbd37a847efa65b1c297410eb931397eed52d967595a38fbf732c7272592e3";
+ sha512 = "c69b667ef5066064fffdbe8adce20784c23e0985e30490d4ab7905da6cebdbf49557ddc321221130e6e7af63753bc7b9bbd290960ce1b86591cccf0ec53fd171";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ast/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ast/firefox-74.0b7.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "7ca5adee6a38c2fb16cc45ba22891dcabb513f3c3b4c69a68eeb94085a0263281d3c70cdcb42971086165974018f3d26044845d8538595dec6414f612b23c31d";
+ sha512 = "a697e44af702f500d72e8142cd76230b886b893a310dad7136b583204f8201b0718b97f5b11cbe3af4baa0e95f46fe6f1e69ccf4b9ed42c34d782c320d6d2f19";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/az/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/az/firefox-74.0b7.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha512 = "abf86da5833fd56a3b3f5b7cda7954b1f62dd641ea8a62cc2a17d8c4a406be8d2e63e6b6443dcf7f0b0b275ca2f0b2fd9fa4b4f316a38e794b0e87f696a7e5b8";
+ sha512 = "ebe0786c3790da17fc1dd5ca0f10ab3fb854e90b08c3093aeb14d5df09b58d8ae0954b7bb99d159736f0cbb70391d81a47dcc9e229b02ed5fbb2b9ac7e19cda4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/be/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/be/firefox-74.0b7.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "99fab30dc81ae8c1a536f0754e9f85f6b18b89bfd57217fc8c9bcb13e98fd40aedefa29cbcde506507a713f79e38d72fa067e5e4647ff5a01890828087adc8bf";
+ sha512 = "74003379f102a2c8c8079eab756afe16ab1037d985fbd266bfc80abaa5ce6dfe911b20ddcbe5dc228e87dcda4f0f7f874cf2dd762dff90c89c5e865c77304d1a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/bg/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/bg/firefox-74.0b7.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "f7705501978c415dc52644ce095cea5f6940d052f8c5ba04ef51d71cd8469bc55179c29de3279b05b5ed84b0479258d2eee02445e080b246c6751f3117afebad";
+ sha512 = "71ad6c25955e6c840e583ad8a7f83c5de21445f0784c36f2073e42a036a16e58ca768ba43468bf5432148ff6d254b5cc547341cc38dcf844c7f40c3225df21c1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/bn/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/bn/firefox-74.0b7.tar.bz2";
locale = "bn";
arch = "linux-i686";
- sha512 = "ee8bc5d2eb469c91c9173bcd787168e2291d8d6498411c8fb96a4f110ed9340dbf6073cfa822dee5e433f93e6c252561b9276f911cb440296d314815de1255db";
+ sha512 = "840e225c9112502bccdda79146dd5c9b920f1eed97afe7423e539f750f02a0b343bf3313ba8826145efdf318fdd17bbff5de142fcd3e1178334af55fecec67dc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/br/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/br/firefox-74.0b7.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "430f14bd4a67d7f00c06406da9fca433cb945a00b63e463c0735edfbe8353e6a32f0ef737bbe346e0b5535ba2fabe3e423d58839af3334f67713a097629efda4";
+ sha512 = "6dfaa0af20e6b874fe675b879da9e7edb80b0486ef283d3e957be8d7804781c083f9ee12c9b5da758e9e38806cd35cc0ec78ea3aca3f7e2dd994e6c06c167abd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/bs/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/bs/firefox-74.0b7.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha512 = "bdd6adf295d32106f76cf5cc26e680c6a85f740a6bb662c5e3a8c262048e20749e8240a943136ac1dade2359da065578a0c6a0fcd48cca77ffaba01b7f88552b";
+ sha512 = "ee62dbead4c185915d72facdb7ddfd42f6e543d3dcb48ede83cb0026581e0b4236e3b29c89053c302441b51b13333d3cc46500eb389fc1c72c7d467da0f21d06";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ca-valencia/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ca-valencia/firefox-74.0b7.tar.bz2";
locale = "ca-valencia";
arch = "linux-i686";
- sha512 = "7a53608f4ae40d6c46945bba045ab5c8de03b7a33dd3a7e8517b81e758900bec21ebadcf1fb5ffd35e24a7dedb9990d11d03d91c57fc6af4b24236cd229f0fe3";
+ sha512 = "56ef6d6859e260058cdcca261452524eead1cd1f57811f64776f3703e16e44599c665c2071f1c29188fbb5f02481467d1bb569722460970f951f7c50ed44f2bd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ca/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ca/firefox-74.0b7.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "59b46688b233758e4dd3cc64bd1af821f5bfd72c0ab842d5c6a281da6ede00b1d77614d0f89fd96e004bbb617d38204dcbb1e17635fa4d0e6b5d57131526b7f1";
+ sha512 = "32249eeeeb5bfd1155d9a7e8ec13d5da92a49193ff6d3298df01f525ff08186ca2a6e7e14bbcba048abbffa1fcad3ca0ee3394f8ee548b6470f9c961a26a8276";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/cak/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/cak/firefox-74.0b7.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha512 = "135ba9fbe2c94845b1c4daaa1ea311fd6963488f6e9de972c4a288f5d6585715ab2fa954f9fc0ad81bcda264aede4decb991e8e17b92a90c675f94bbfe2e6c1e";
+ sha512 = "00b5766bc6b96dd85222d9a9e9ba58b22bd0f78d42c0ed929279242a3973efee0b7c6fbaa5b8796b3b6488a3c2883a06e221916201740c8352be134fa2f988ba";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/cs/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/cs/firefox-74.0b7.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "aa7256aaac8427198ef215f651a2a1948d32241ec9aa753241ea225101a530cf8b1c7eb7c2ce97302a0431349296225a65db5377cbbeadcc416dee46513bc7fc";
+ sha512 = "2d6ffdbb0ac90d626f613942f3c1e474e39dd73c7f54ee9587882ef09006f78f5bc9e9738d25d63e55123c9e8652b4b5484e9881720e911f1f5e01d55209884d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/cy/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/cy/firefox-74.0b7.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "e0760ca8699a2ff6b6639c10883adea4d77fbc5c77c4963ba930079755828d977a9395313402fff09ead9f81683e9304a03ca7e1964aa3c64135a6b293cfc21c";
+ sha512 = "867b673671dbe387069de42909aaccd04f4c164ee73cd1ae4170fc0333c54a48ba557b2d3956b60953f39463b86a6d6525b2a5e325e22c22cfa3c446f7fc3340";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/da/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/da/firefox-74.0b7.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "e83dae84d532556b7e702cbb4b1708a4be587aa8fb17601fe13a036941a3152f5c23eae37f7578cd0b4af3b07f022c35594bf56e265d0dd55ccbbf6ce81ec47e";
+ sha512 = "d0cfbf8493cb53096d1667b2a453b569c1ea9fc3815f95de9128fe784416671ef770fc3e70701ba0a5a935563b3b055cf3db5cd849520ec2d75d52527111156b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/de/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/de/firefox-74.0b7.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "1f46cce2007a7fa10763e0491f3bf120fddaf8943046eb17b343f5f3cd8edb755b4fdbe8e4753cb96c3d6c735c1d7c28b67e2dc6bc00f554353e2b9ae49a632c";
+ sha512 = "c52ec2293b4f7d61ddf1860a63d76e01555023f203420bc6fb53bfb24e407aefb4276896b343bfea2517bed9674fb39431bf1a38124288b6376d480b9432a51f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/dsb/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/dsb/firefox-74.0b7.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "3e0c1c594404bad4675418ff2f7b3c06c90d734d7359a83820af17b387045ea744ddfc85a8b943b1428d34fee1207db187d347c6e8bc1e90f6ccfae35c44f846";
+ sha512 = "9ad7846365072c32a841f30e1c040c56144e95fe4d9f4cab9adb282ce9a5dbd481d498fc71b0330feadaa68f23a35ca512c1ebe3d07f7a4032567a6225c875c9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/el/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/el/firefox-74.0b7.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "3002644598b7726ec4a2a2c7235268085f2d1e41461bb1868ef08b449b97a638bbc8d7742bf92ac45e606f90d091c8ebbdf6f80fc4d0461dde85ff33d5f7ce81";
+ sha512 = "526d4562e8b1e239b2e15ab89c90646fff6b85daa309a9388dfdc60c4be743ce39a03505af58f827e9549fa4b8e658bffa2a5a7f22921a94f54c1737b6df11b0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/en-CA/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/en-CA/firefox-74.0b7.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha512 = "4a070956b29ac116884c8d8959ecfab0e244e580885913ba33abdbf43caea380b11e6078edaffd504ef340528381b14b1ec16f5ed9f1bba34b2b2107eff34acb";
+ sha512 = "6a7c18c9581327c40f128acc56e8a9f4c7575b85472ebf120047d3f5abb220fdc03f78b5a182c9e3ac93970d24ecec3a57224cd02ca2537ab5b86e594cb7bc2f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/en-GB/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/en-GB/firefox-74.0b7.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "98f416aca8964192843cd4723e5c731427f61d3d582001f8a5e76ca5217421d2c6e5f4ca796520c773d345c79087b95b37f6a35b0d1295716193f65e3a080106";
+ sha512 = "48cc9068571767366a5086f340a5d4566e1d8261e4bb715fa3463106db4c02a5af316b37775e4720344ae2068eb35fe004bf893ac1ebe923336f13978e2ac955";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/en-US/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/en-US/firefox-74.0b7.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "82b45b5920caecc7aa9c93963b5977bbe0a7bd7ff150deb6fb7be277dcb0d0c5811d8d7f62756d0c70ca887184ea81c175302732f56c556b6a38159531bd0cf6";
+ sha512 = "e50c0d061aba197a2f2e153731dc5169fab02416733669a593387338a1acfba1bbaa2d26aa0ffc75fc972524ad70ceabceec30912e06cb827a25036607acb7d8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/eo/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/eo/firefox-74.0b7.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha512 = "130685fab546fe659fe375f426b191919812d43a6fef1d20efbad92fb4c9b81bb4880fe4061eb6f8183a80b9480b7f207b0c18b7faf6aefb596b05e8261e82f2";
+ sha512 = "23586c04536846ef9b0750fde66b04efa265f97a5d8c30c7f5e435010b80b0d6556caa9b6c579126080fd3d58abd957dabe5723779af1936ebe4c21c185d333a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/es-AR/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/es-AR/firefox-74.0b7.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "b7605a051db772909b7e2382826fe928d52b26248dd6ec3dcb234be9657734b142d07656c5b2d87f97e240509d63049bc8e37f7162f15a931abdf2cc64048014";
+ sha512 = "6d2c87e248b8e4e395af916d6b91eba9451e1b6664b31d843409b06e4589daa044392a1f4f31cab9411350c753d21a817411cf7149dde4eaa87ec20ab724f63f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/es-CL/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/es-CL/firefox-74.0b7.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha512 = "4f8a5b856ce70310885cd657ea398db4c6153dc2ef821eb1708f71ce7506e628da6e59aa7bdfa1e5804c0da254a818a1d0f69e1be61e538c879827db9a457405";
+ sha512 = "b9576b60cb40716707c5037de36ce278c9d8410bdb68ea0e1bacab310e8c0679fe80d0a5ada111e9f605a4eb313a7d7519fde7dede3de43eed40cd88386f16ec";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/es-ES/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/es-ES/firefox-74.0b7.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "a4061b50e23c796cdd4a8788359b8d9dd5914ec36e0022e7b9806a0b8d3e569fd9dcab0b888fe4ab848ee2b3ebfdc6aad95c2f8ae642184dc7781d362323c497";
+ sha512 = "602e5a02e5a534650036067f87fb844ddc564aa54ee219ada4098ebd4e7c60635c59b0ec1435f2a7d963cf0fc35e0850e0a86007e4562155bc1bc07b78349e95";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/es-MX/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/es-MX/firefox-74.0b7.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha512 = "eb73b17efdaf28fbb56277407edb7bb822f3e91d330763235b526f639eae8b6b2c043237faa75cadf3dbaccfe5d793b899e16bd8feb2f449f2f97d5da5eb181a";
+ sha512 = "0088acbde6764febe9b37b8485110d34bf72c20b1aa4fa9435712c3b58609ac082c7d1ea203157394ecd9d7609f35fa05e784e6fc5273f14d8c216a392d4ce9f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/et/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/et/firefox-74.0b7.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "febed7ea65436ba33509cf7bea9c6a52342b6d4618d8131ef0b07ee70e291554a31b2b556f1ca2ebbb243f7d89af591764cafff13fbee592d000566d4931a2fa";
+ sha512 = "a88ad46ba958dde4ce6589e05bb941707b894ac8b5289f7dc4763d5960a7a4754fbf5dc669ef8318867482a9fff61e711e2c13befc08dc1201ddf5c3273051c4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/eu/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/eu/firefox-74.0b7.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "d59a52c8ab5ddcd9ca1d51d152d074e6cc9d730bdd14df688050f7c845d8ed95d4e6b5f4cc06745fa3e664c4d743b84329e63ea2f6a5e4de59dc9ea844015b17";
+ sha512 = "c24c9ac1869ab82ea8ce162cf441e45356583e4e5466058460ddf925c25a88580bad7672ba82abad090faf29dc804e098abf0aba72f1cec18736bab1f3410c1d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/fa/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/fa/firefox-74.0b7.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha512 = "64a68e992b2a9158683dedf6fdbcdf18ff0bef4aad8f68bf277baa7bc92c0f55d75e4020f15dddeb18e32bba42f94d37c14c5b9c1978273fccb13961ddfebe52";
+ sha512 = "16e30c57680a2ad0c7557f4819a0aa28e4e066d3a7b39ef9e1b99fe69d0c8825120f086ad628f3cd0fb85c28d9059a9ead5f9dbc695777ad06bb7430857a966a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ff/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ff/firefox-74.0b7.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha512 = "d87c5edc038571d31b147fa1555e8bec7988958e0de661dcc77282ea052acb5d427d07862412431557699ba85b69abecd350207ebee36aa935b59d9a8e981bc0";
+ sha512 = "e4b53574e12f35124c3fad67f53524b8788ed2625156fd5d73742414c179a71892732643cc9d29dae3e036820f1ce1701552a4ac29c2a9de0af89094e9dbd937";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/fi/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/fi/firefox-74.0b7.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "e026d27700ac603e63155130b020fec3bced265e226e3aacf9865c4d9673fbb1c76ec048a3eaf45733a7f86a88a87c32856184c6136e088528f377eb5fed2c75";
+ sha512 = "0005ff250d51f48dbac887e2a9c4d74253f4c01a8cd1f4fceceefd2596dc5290f24147f3ec7b7e4b487b7c6036c05a74025fc7f736daba943e599d93c9c5e789";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/fr/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/fr/firefox-74.0b7.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "57f8ccd042ec0f388cb2f9dd33ab44a8937a7984e563345fcf4178007a015575961f66042a96412468480dd2225f82f5a7f8ce9ce2c42f7d5eaa1c4bdfe12e32";
+ sha512 = "419ed2989376b876c13851f98c4d278b79b81f9dd5be9c2121e2fc365681e7348e077f5e70013cfa8d271ce7d10cab487f1479c031d3a4d428885ae3614db2bb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/fy-NL/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/fy-NL/firefox-74.0b7.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "c2947cd50ef4b29c1121d02980f6fd641dcf394f0202faebec82e54baeeeb7af5b4f8c1a113abd30b29511a1e1cc796618a39eaad347ee5c108895af914e2e26";
+ sha512 = "ebba32714ef12a12a7a1c1cc485cc5d0287c3d7657278a599f906cd5c214612bf1be0a786d2c8079b483406c4c1161fb96b50f046cd9c878bddae5f927453588";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ga-IE/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ga-IE/firefox-74.0b7.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "c64f524aff159f744024d10e809e579d2ad8d6e5842c90a436ed1e45a4bcd0beaeaecc53e1ab5359cb660f5627553be062518aa20b5a9f4ba823e9eb8f47bf10";
+ sha512 = "86d2d878625c230cb251f2f88dda89fcd82e6ab8535b1eb7476a11f023145c6d5b38f3615920b11079357e8af7ff17801326380543e6b0a5d9e4d9e1356a8ea8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/gd/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/gd/firefox-74.0b7.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "f0e0ce12f5db6b5e14f8faddf678f25c670932071fb3e0c2d6a09a3ec55a94c9b7ca91c829d4b88f65095e766216623c4efa42a8e355dd6628960a7f8d75c9dd";
+ sha512 = "ed5cfc312da1b7c336f449301a37b8ff6f5c83c8ae0aee3ef83bae8f3e4accf56da7680694327a5ae6294df7015037f31afdc30a409678406fdc83c821aaf490";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/gl/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/gl/firefox-74.0b7.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "33b2f5fabba352a89fc04a09e3a751bc59140d6405e07f823052f8ce2deccad29ec7efcf2093db467811031a1f4ba45c93cf8604cc22d20dc88985c1608681b2";
+ sha512 = "701fe5b9dee8b64314b3e1bfce55ae3d1d33aceb871650098c8e10826f5e88e6c734698937cbaf2f0fbe07e2e6c914270842a3df399cdbc82a3556b1ec048a45";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/gn/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/gn/firefox-74.0b7.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha512 = "82cd31100fcf4e59e45800345e4c2aadc1b22f9ecd1b2c6eda25e90914b3c3780b5fb2fdd3934d4e127d9933f5384cad5376c3279aaab5a0f995654b16b08b3b";
+ sha512 = "40be9288775e6411f7f682cac10ba9d5ca3618a7b8d64086278c4fe9e2766c6bb24b5c1444d344643adfa93a2751f1855107d66b4b2260e0da3f4f473b71d2b4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/gu-IN/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/gu-IN/firefox-74.0b7.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha512 = "31068b937c0fd4990e7b6d9c3f827ca4a0cb549cf342847d0e9fce649ebb5b147dfba61edfc2493f37c05df4c4a411df5e9de57533a80d2f88c55c9dd9d79f5e";
+ sha512 = "057941bb40197fca1069bf7eb787b2bafcf998d1cc83af1b64abee3c17cb5a0b5d2975f4183ed33dbbc2c056e3e316f29b8aaf21f2c711b7a474000dc159d5b5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/he/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/he/firefox-74.0b7.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "5247e1c19b3ec8b7ba2130a643f65216e96cf46e2ad82124f241490ae6fa50e8fe240a8c420b1b8f0f5d2b471fbe97d97a066c46082e13085ee0bdd07ad003bc";
+ sha512 = "f75b88b8de0aca5e31594a592b3827d2f0925d9c307200dbf8c2cf0ea04239d371412daabecc29a689ce5cd273ffdcfcd40fb03c2e91fe9162fe48bde5178a74";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/hi-IN/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/hi-IN/firefox-74.0b7.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha512 = "1733900f55e2e7bb1adcb1fdf0b0a3a41721276dd721c1c6cf7e51b881f1e2b607edd95b3065a8ca0708a83fb6251db57309c192c11cab4521b0c240c9637710";
+ sha512 = "f4890834127bac76196e2b94461f28916b4467e35b43f40a6153e43ce90eee60903ac7d1d7cdbfc1eec8d27fa47e2cde6d2c95a1a996a5179b9d1cd9b160d927";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/hr/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/hr/firefox-74.0b7.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "204d4f0fedadbccba86ba97105b8cd14bc5f1677d7fa40c05ee1e5d7728b3e6fd4e39d9bf77339e29ae1da01190e75ecfc4c5b1f70998769242875cd4a774ae5";
+ sha512 = "ffd75c9101ebcea645f704c2fda287a7365f473a8d9efea75df889ad7a9d36c1c170690adafe20a1b2b09cd39014ea4913b440044d08b0e9c2f412dd17ed2ea4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/hsb/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/hsb/firefox-74.0b7.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "8fa5b5cd0aedd9a933ba28e430d726c81e9dd32780d763750eba1fb043e4b53ec610ff29218e913f6690881312a8f460805aef4774d1edc5bf119e6b72bd927d";
+ sha512 = "0c0912b483c984f6ea58e2a35f07a2932c3ea56e1e49324d979638ec8d6652d89c6690672f17dcf6ba4a751d8d2395b9a1e2a6503f3c8476f8e3a199e2ce3843";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/hu/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/hu/firefox-74.0b7.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "2f721ce1ca93dd43554b78efa89932891f6bcf8844e87996d1e79f4a91f5595cb8653d8196f78f11e9ea63375e6efb133dc5bdd714ac51b85fb1e64cf582283c";
+ sha512 = "716dc8e392758954849fc7928864bed6cd0fe40aaa51872f4dfdbccb28edeed138b1eed6f7d1c401bdb7b080c7c5fbd0e62c0133bff270c68421fb48579783eb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/hy-AM/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/hy-AM/firefox-74.0b7.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "be074edd4daf2507d6a42995950f333b7fb81ecd2cf63e91070d78207399c0c7a90caee7dd4c5773989e82688c090e9625891d32e4ff07911940b859ab26035b";
+ sha512 = "bf28485aa9ff76aa20db8be6020763e46151d87d3e4f8fbe8c8e72af9e81198ec645d47cfac29254fe802304269fa00addbd75aac6fc2928880b92feb87e11d3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ia/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ia/firefox-74.0b7.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha512 = "7b50878cc42ac790d54908f60a898b26be95c0d5e7c70ff82e309c9f0d614bb58837d359aae406cdcba861edfaff3b342c8d279962dcb5f076b7aec01949a7d8";
+ sha512 = "1a3811dce3493851734afc5b955533edee0029783a5cabce62e72649a0cdadab52206dc72d414ae2b92f34b425f111bf5b399f07c15f7b5c81f7eec3ddfb82fa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/id/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/id/firefox-74.0b7.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "a352fa281b614f6e5aa64c2d10075e314066aa8f5dd5dea415dcee228eecf762a699d67955d42ee1e6db9e2c83ddfda95641d165d8fcbb97d42313b9771dc945";
+ sha512 = "67b851f947407b7735d7335bc3d9fad5ea736e9bdf03cde7a28b3854b398263ca6956c2baef014bd6969b254d203d0784afc53127f66270ab8df1922ea8f1ca1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/is/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/is/firefox-74.0b7.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "9b145f44a91d80fc844cae8ca5ef6bf9c4911cdf3ce5b6f2393c186abfe634123905deef0d6d2aca3a457054e26d946b134d6cf3354a87c89075b6c0dd7c0a68";
+ sha512 = "5eea1c115b5725fefaad5be3cd401fbac96ea50886ec3bdfff586cfb08c48b2f5611a797f476f34f43706c0708ef460e7b0b75e104f87ad358369f07743a9b76";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/it/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/it/firefox-74.0b7.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "32c20eaaccad71e0a5125881cb726ab91d24821fbb416361eec16075a884a763a80749b458b684e29291407387174d7e08ccbcf18eb2c587c6d2034a26751709";
+ sha512 = "0f44fdc04418f28d24638cc1893bb8aa6ca790e8afdf5d29da8b13e491f3acc53a0edc91c61679feef7eb4a2714308c36453f19a20c16d939dd7c248ba35dad3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ja/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ja/firefox-74.0b7.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "220d0fd243ffe8ff87fbb3f070286f8f10475c937d53066b52d6d6fa4d3096a403f4e8f84bbea8f5da463a5fd0a34fc2b936b59951ea4c17438c0272267623d2";
+ sha512 = "e951694a4d8f1f9570a869cc5a0dcca733fa3d9c4089528ea55ee8ee70251dbc0e873530c87df293c2259dca59b8c92ae247897846c93b0f9e2b510643ccbdd3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ka/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ka/firefox-74.0b7.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha512 = "f7a155f925e7fe1ad3282afa12e9eb0444c549bac719c18028fe9833b104d229ea122498e232a60ce49e446d2d8ca78d6346b12fae48158fbda40143753cc509";
+ sha512 = "f4613efe42a9b2ac03d85e5d8164031d869d8e253c681f2d002e180eb2bf214a33671da7a39d9e0149ceef1ea27f783a5b69be7d2e02e0497c474b2149477f4e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/kab/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/kab/firefox-74.0b7.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "217af3c935d9200f936865e613561116969a5b1ff0560e59a2f9d4e94c5250a207be9e9ff4f848f167397d52e0519a8d9732321faa05414396745ccb4a9f6e60";
+ sha512 = "e59813d89542a9fc68291a3a8cb75de567b247142596147f54e6a2e83170444d684003274e449649055225c0c8b882d96924a265b8d2de98711299e21776563d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/kk/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/kk/firefox-74.0b7.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "4be47ab65def786216ec5296f8481cee46ba62b4979ce43cc44ded720a2a0fdc6273504179dba2bc2eba8b901559ee13d15aeebe9ec5f88c90b4e83fae88af69";
+ sha512 = "b944ab903eb5b7075f3ea633e1ec40b4c688a2a97103f81ac80f6de77a3bfd4384de1314010b82937c986240e8e8dd40841a07c27e72c56b962a428aed24aa39";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/km/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/km/firefox-74.0b7.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha512 = "546268e76a66fa11ef0631fdd78c10fbb9a8cb9a6083a94ec52e91558a63f2e6d1730c4e9cf368dbedba9ecfdf3bf3cceba063dff94b1890788e9c72509ebe4b";
+ sha512 = "83eec772f2bb78198a955dad41ad6d68d9247006bb3430bc058da6da2d0d42c4a691ae20a4cee1a7b8c3495f6b07c15cb1487e7e3d4b30b3cf79ec42ab76dfae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/kn/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/kn/firefox-74.0b7.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha512 = "9e44a65ea9ff34a894ab2d183bb120e51f55698c86f816a6b72b194023a6fb9541e1c0f4644d933467a4994f067564ebe1d949affa171a7f9f7485961beb7771";
+ sha512 = "f9f85e4a01b56b74c062b9b06a7a372426ab43ff2635fecf9b9eeb1c83d60682f17a19d1451e773593a0cefe15e39711a70e73ac3ce76a43b1274175faec06ad";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ko/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ko/firefox-74.0b7.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "f1b99828870aca3fae634c74af62205b1bec1085c378a9fad228325cc7c28043c0995c6ec1725c5038da5bfe57a5ea0227e5852595f9bd4da14fb609102592ff";
+ sha512 = "f0da90b5634db1db5576b8506f208a7e3810473d63c78228833eadffb512b202dd2866fab1964150a271c61c869589adef317c6be82978d5caeae148058dd819";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/lij/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/lij/firefox-74.0b7.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha512 = "b8b835ac11e295259756416430b3b973ce33d353e24fc9611445256950bebf03712ee80ff01a273fbff2e16e042c9bb52803cac7468cfd5d5898f6dcfddd533e";
+ sha512 = "2d580111b1b20aade3eb7dfd607ecb7b7003b268dbad127eac13625d62396562c0e2d39f04597c1225f43ea84555307f9a3805df23743a1a5304175d5bd7a0c0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/lt/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/lt/firefox-74.0b7.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "fb4874ea658e5eda4fcaed15e7c18c5c8700e9d9a3b94ec9e95b1b5c610dd70412e35b27a67921f65e9285fc8fb1c6079fda1da9c015770f6cc26e2f73a56410";
+ sha512 = "b786f7f6b5ec6910d994f48d625365a386ed461f86a4397cd9ab074b164ff30c2c88ab8d4edad93b55d082bc806f7648c048c4a76ec6a68dd18b5f65dc6c6e4e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/lv/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/lv/firefox-74.0b7.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha512 = "f676d8029ba766cfa527388241170cf391b648e617ab0c81930ec663eca027e70625146fbf279951ea062468e7c9d5731ee177e20e7d09b93ee0972c16336d77";
+ sha512 = "cfdf66bd7eef43a619cdf3cfa67fbc863a0bd886adde00d1d5286d17608f4e3c605001a0e5fff1b01fbba3f28b371cffca78b4ee82fe8f2c487e6df32c2d8ae6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/mk/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/mk/firefox-74.0b7.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha512 = "fd473e113f89bc94cf53c2d8a8973d974efff836d7cf00d3ad8a957b31751d45ecd72c1e9943eebc74263747788629234346d51c9f49e2e00acdec823ce6c23d";
+ sha512 = "d27d5ff71a465081b931ba2d3dbe8d69ff7e8532f630f541ffb24861808e43988e11f4fb3427809197cee3e7fc488dfa7bf0ea274b5aafd8e1bcf910b4e3e239";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/mr/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/mr/firefox-74.0b7.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha512 = "b2f25777da4de54364a1e5aa909a96859d23a18d4fe0c01799c2ae26e86d21e7dae8a6c6e694f10731cdefe6d8954227cd37d635cb9a2575ab87ba5ba9741660";
+ sha512 = "b455f77ec2a081f4ce8f45e5bca6348c7b62a524e7d5439e1f79417ea57b33508aa97fa9fad149d207f59a8507dbf0be8fb18d19b72c822b030cf7061b0d5d20";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ms/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ms/firefox-74.0b7.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "80798f0dcab4d792569032fdf8761081e3570a3ee358986ce318c99ba342cefa1e72ae69008f29cfd4fc6e43db3973e17a3679c2c9a9e951016f6dd6f9520cbf";
+ sha512 = "a81696357fa5138622e5f2032ceb5c271749bf412d5e6e5b88087918397732727ccb57186193ff36e80f9109aa4b5c0313245c2bb62d73b6821e10f1ccaf64e0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/my/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/my/firefox-74.0b7.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha512 = "20195c08ec9824e64c9ba0496224b227142ab9d081ba2eb0df74b0a79412d767d626194eef07cb5cd184914a5ae3da73c712c40a54ed52e7273a09521ca26cd1";
+ sha512 = "1c280d2d0b608b5c718a7c829b6b8a10f806d6206ca88d7246b4401d9c60c9905dc4aad659b4ffdd183897a3b7f497ce5adc963f5813ec498d0db313a6597c25";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/nb-NO/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/nb-NO/firefox-74.0b7.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "e1d80aa8eae8bda7a6d618e0ce0d5186c95c2a3db3d9f1df49946129ca3cdaae7bea07f78d1d460eda57b4bd081a0bf84d6d9c878b21abd12dab56a36b0e341f";
+ sha512 = "425cf32bb16362a3a7270413ec6c95ef81a1f35c3fe18e21f55773ae68ceeb9d07c3ef309e8593e613a0238a5946e1b431b37dddf7ce44c336b35ecdc4115927";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ne-NP/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ne-NP/firefox-74.0b7.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha512 = "ce1941cf4a8881daae3d77b01b2488148dad34459b9274abb63de25dfcc3e54d8ce3fcd117b1e6fd0b18e2ee78dba403d321aeaa724023462475b239a8b2d1dd";
+ sha512 = "91abdccdcdfb2af196d5ee78837143d515198649c4345c9d19d79a01b35381e6fb813f9c99e4b69ff5efadfafdd11deb53418190bf223122ca40d9449d3cdc80";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/nl/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/nl/firefox-74.0b7.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "a20244712edffd519ce1dcef28b12ff9e25993ec54b045bbc9c3654d3e8d40d8b1589cc22d60e5bb0aee7e52c9ead1fd5eb0a634253704d28f201d71e69004eb";
+ sha512 = "61e31c484176e95852e02181f2a3f892603b3e2ee021d6f2a000016f76db99e9c82989792379f39520edf9374ee57f49b08ae4245d629a4aa8910add52b36725";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/nn-NO/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/nn-NO/firefox-74.0b7.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "ddaf423b62a8875e2918fa500d30584b226721dd986758e0583e55fa2860f9b9295c01eed0f44cb3bb360fd68b6bf76d6b4b26549992b56160883e1873491b54";
+ sha512 = "cd51b29ff5c5815496974f80190dfe34e6ec6cd4eef605f94306e7576d332eceb1007edba11d2d0d072b1b02601efc7f2fa8f27ff5ab14a92dd75c29db25998e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/oc/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/oc/firefox-74.0b7.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha512 = "66323fb9679800b326397573108ccfd970cf218ac0f9d6e283b3ab892e15b31c234f810ebb436af02b58a1ce7f07b42a369e304b3472ecb9728cad626e0ad219";
+ sha512 = "f6a5f5f3ca08b6439d02e5a8fbdf5805374d10b2512b8cda0eb45e5b0d0c4001f40144f5984791ddd8c7c147d9e96d399dc466d0004da00f245d1251d24dda7a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/pa-IN/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/pa-IN/firefox-74.0b7.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "494b8c8ac441788ffbecce5d247bf78bdd0de44078aa4db5f1c0daa24849198b99cbacccc5f0f972bd0b69c8a5d1be5d5303ffd0a2c97583eab9c24a504a4260";
+ sha512 = "42d4d089260373e5d16895c44b2f47610b96c0a01a0bb70c39876c376e70a58dca27efdc4a0d21996fd9479d0dd1255d6a7a448f6be8fe5d45fe675180d70d55";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/pl/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/pl/firefox-74.0b7.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "ecc7942da5452cce5e203f6074b9434fcba205c50a50eb8e018eb368579831bf524a52b181a0af275d23818f469e24d1efb7df7e43e517e9fca349aaec9db8fe";
+ sha512 = "cbe18d3fa35ec9c4f8a43e42bf4a5b5e38c8fb8b0624eb594a340ec866f0f8eee77093cb7fc3ad9cf85aa8c8177a43ddcc1d0f34933d34c414c4d7f6c74d5ff7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/pt-BR/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/pt-BR/firefox-74.0b7.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "9bcbcd89da3741b343433980751640476aa65f037a69d6347f98385a02e777617a698f2d8842b4e880549ab7d89902bbbf9cc020858e20b6354e9be3afe06877";
+ sha512 = "92e983cb0139204f51e97d4fe0510750f98cf93fe20f8a4b5bcd24874e266b7ebdff00170b25acdc492a7eff65f1c9c6aa1c44b29d8209c04fe5c6a43eb3ac5d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/pt-PT/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/pt-PT/firefox-74.0b7.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "829976d56fb891cdfae4952a9f887575e464118a3b906b457e539c4deeecdec36a2cf18615c37182e82941395154525e1b7ceac2f84720640fdbd96b849f3aa9";
+ sha512 = "1a576f343b3b93b786038ec5fe0dbcbb3df4eeacfb94c447d5242622e207dcf360500942957d0019c124c32698448c23e231b336b8681526d4d2cdd8ec78202f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/rm/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/rm/firefox-74.0b7.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "4d49ded918d2810c74ba755a81c3a095b237e353e31e54c2aaa99f135a24a036a3436c08d0cd3be4c495ceb4afab46cfd88ab18f5e72df136bb0258b2b2bc78c";
+ sha512 = "c5e1ca70aec643d00531d4a485e515d17bc7be7242bb66c7df5818ed68f69e33542e57719fc0cd8852e4efcc4d73d76bc2646dc75e428052c078e260d9c8d2b2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ro/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ro/firefox-74.0b7.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "0fbed6fba8d3680b5ee170b4b44c19f79bd088b385d343961229668dc637a95649f41482af1d224cf2678e421be15cce61cf170dcc4f2108711e0c07c09d1373";
+ sha512 = "ddff96dc6073cfeb7462b160280e996335e3dbc48ca717ff3ab09d93d686d9b5697144fe0dad7be12bb293557e431522844f9265e71d3839ad6e070b75a213fc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ru/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ru/firefox-74.0b7.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "f3bd0dac4dd67bb079dba21fe677a52f61cc7ce0f5fe8628cdf70a86087064233cfd5716713d2ad29cd940cac6bf67af4993bdb9abeb35098949190c1dd13d68";
+ sha512 = "c33ac5097ab81d90cbfbcadd38b9d9906f660559ef5cf0d8978f603680d3e30505f8c65b55edf5b83fa91db2643cb893a8ae1d8d7542316d082868e341a19294";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/si/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/si/firefox-74.0b7.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "07f42c470ce8a719fd10507a6146f99722b63c8fbc35bc3460402a699cffe6a183e2a3bfb08c69db3adff1f94d439f0f7073a472d1f333d2236859d81852a832";
+ sha512 = "f99a34d222b07758af6a49067f2993d49ba5099b8ea8987ebae00a5ad908ff71782aadc49086152d84f1f1698a55ab027362247a15e05f62fabfadb7f45fc2d2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/sk/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/sk/firefox-74.0b7.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "ddb5dca06ad37c54ad7e97526cb1bbc6dacfb53d9692e125badb63093ac969f0f7381c306ea811f0fd04cc65b62ef1793287caa3e3a33773518c0b6b45fd63d4";
+ sha512 = "a18af4cc09828a567b9c6bf162a8800034f4b094bac20c15dbcad8a33b2a17792bd1470f77f75d8da8f954b69cee74929d8aa7ef4fd47a078f84b03824658a52";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/sl/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/sl/firefox-74.0b7.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "c617dc91548e02a65222b4c418d2f8edc0e9f64e8cd8e4bc661cef3626b728a83e1c0b667d7c50dd836ab1e6f81bc03a022e83a820f46dec51df08209d35f56c";
+ sha512 = "401c261b1a523c90aecf1432bd01bfa151087d36a8331d0f4138330bc21272c4980c90dee46d2ba323a20825367bb54a15fc22ce14c7b3b91c8901d6e243f86b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/son/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/son/firefox-74.0b7.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha512 = "725ab271cb9b9f66022249f46e7658b31732107416d3374e53f53ef16f8c8f40957433c6bedefa18f301b78eac592ee079018b700def09a7b83ff9acf09d8f52";
+ sha512 = "63cc0aeb2b8b74166bdcb5db839ae7cb2befe7f444397337f73dd8b56bd763f7844283f72837b775ab923d70dc44797f8f99f3a155cec361cec9ba6e83ff6a7b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/sq/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/sq/firefox-74.0b7.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "50de90b50d270714d4f8bc81cef21d3ca1dc0bd1ce650b8202a7e0edf25f4c4bab651c1708293efc3830a8381b082e941db1c58e542ce9bc23648a5f522d08ce";
+ sha512 = "04667fa706cbe244ee04c2e36dd7fc496899d3b09d0a251dbf15371c9e0ae00a999131642c2b137ce0f23ea1149da1d487753fa7cad96fca8de11c5225617001";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/sr/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/sr/firefox-74.0b7.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "ca2c296c7a36b7c28315eb8b7746779f5aeaab6eebc2e20ffdb9080d443208fd051ba2eb6b40bb103015c403da0c1cfb3d7210fea36534ea541e3481a3db8598";
+ sha512 = "8254f5af29e06e3a83ad2b9746e90fa9b9b9eb876b64a849bedbbd2375a01a2e5d369ad8f3686bf524504cf085f463171aa9b0acbaa823b8a50c123d19dd5bea";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/sv-SE/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/sv-SE/firefox-74.0b7.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "1669c987e3c8708978b95697f61f7390138f85d36bfef3866e71befc75cd4ef2ae28878bc9bc06e6c4875e3a653c80a146f6229123da222b5b93d08f3c916a04";
+ sha512 = "89a165c71ddccc04f8b6c86bd199267bd8fdcf274db601c68903868b67b5d3c3205c4b359076adef4ec48e95ad03f2034b7cae9fae981c584214a2cf4d607806";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ta/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ta/firefox-74.0b7.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha512 = "c6a8c9b6ec314f2a3602e3bcaba555a9826ee9575da5376d355145963538c233dd7c63a3fc0cbd0d1158ae2bfc667be6936a42a3f14dbd134e0580ee7d231fd2";
+ sha512 = "0a8f218a94ebe7e667c62c0c2c2752fe0df57885abad3916dc9ecba186f1420c77c1011b05f9512c37b75eebf9062f345f0d7580b9c7dba36c8043b581965e43";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/te/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/te/firefox-74.0b7.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha512 = "ad5d8cac04fa3c50ee553bae8459b32cfaa342a90e68919600c025b6536f1e7e7c64ba40e8793eda76ddbf573f2a3c3c103df38be1c3d521798ff802d82dee00";
+ sha512 = "3a4cc3a66e8ed7a42a31c69c314ad6935fbdc3062d3a82c35e7f215f0a3e29e841c196e32f5368e2b24ce8a7abb71c65307004478269d156f68de78a945f3e1d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/th/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/th/firefox-74.0b7.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha512 = "1cba0960e666d0db889357e7cc189a373c27ea75a362ecf499cd9f4d69d4b3f6040b858121e198454602c0286fd7e4b4ac637495d755f9df59f1151f0fa87e4b";
+ sha512 = "fcd070aaec8d12509047fbc4cd3a7040830e9af6b5ece30ada6388cf458daf0a26e381db22515a440d6bfaad700a0d628c3036996dd9d6b3263b192b45da33aa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/tl/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/tl/firefox-74.0b7.tar.bz2";
locale = "tl";
arch = "linux-i686";
- sha512 = "935a443bd4051c5f199792fa2ebcf658ed88f72996f473756f00c8d67a2dfc7e821cb861fd9babeda9d6912adad0fb06bf0e8d4033fc855b0fdc1d996883e2fa";
+ sha512 = "cec3476e88d5d1551fe8a6e75416d0397001eada288d270273b004777a099bdfd2b63eaa5e2f81994bc86b0a720f35602308089a469adabfe457a48b8f11a88a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/tr/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/tr/firefox-74.0b7.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "5d80ea9137c1e963041d37adca91152b1ba27edcb61445e3a018759669eec4240db9c343888d5b22197f4b38db31f9372fb3858ae6e1b9c612ed4a243694222d";
+ sha512 = "22e71e68ccfeb4774570a94033ad7de3d90c8f327886b7c3555082b03b46bea090eaf16d63208897cfaa47094d7eeb8ee89d1d43af78cf8af2753b669d0c1fa0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/trs/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/trs/firefox-74.0b7.tar.bz2";
locale = "trs";
arch = "linux-i686";
- sha512 = "2981eaf9d3487e5946a17ec61e4be9ef799107ab81cc54957ac5544270d5a2f26df2cd577669e4cdbf2451d6bf92232f49857358d1ddb95fbb6d6e7c6e469acf";
+ sha512 = "a6d7673761a590e7d714f8e5949e9962a7f693bf35ac9e5425c84d1d9173b220d9af3e1468c9c83aa930f31cbd2df9844f65a1b749883ec35fd5ddd4ec310463";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/uk/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/uk/firefox-74.0b7.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "1146c9ed03be550212d9593527de8f044fb47fd5ce33234f52e26b934920b3d5c40c7aafb607e1f57773cd79a664ef68d8ca9244a97d465f52771a04607ff027";
+ sha512 = "2944b38a4b71702aa04d11c68cc5fc0253614015d8ee7b63f9138ccb90a2190c52131722477218f99e917260ae7beb0736f8d8fcf275093f423fe884e9370a67";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ur/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ur/firefox-74.0b7.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha512 = "c54d497945fe94ab4e66452828b3e0b3eb6e3b4b14f787703175899b5a14331c5685fcab1f361d3a82b7fc3185ad25d4b1887ca0b11e24b89ea451ac8d1c3751";
+ sha512 = "e42728c0a24a131d831fd65c1b0006a28be594dd5011fe5a510f7b1b62c7937d06b1f0077a1ac2d454211e27f5d03c8d60f3fc725a58eebbe72f6064d875c6ee";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/uz/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/uz/firefox-74.0b7.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha512 = "0790525ab6b0387a51b7b11010c3f8ce0612390f8bd768bf93b841a28f1cafdf928473598007fd1b3b27ce785e62a751b7a9f11cbb9d6ea99f384f9c83397cba";
+ sha512 = "9f777b1fd31953b903123250250f7dc55d63513c49b69c3ba782702f8faf4a831b1fc84137e8554b4af6e23d1203a89ab2a61947a39f3f9a801acc1312a7ebe8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/vi/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/vi/firefox-74.0b7.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "1288e5650ef2122c39babf6a23fc55f708d2fbc87e8c81457e511b84acd7cdb7e5a9dd934beaf10708c00e154d2a4119a990cbd6414c5f3d89c5ab83c09f33e5";
+ sha512 = "7023655042219b9e818fb921bd6da1941b7c75a22f7570559d06c2e10de2bb81191b266323fdd132c4c7ae881d932eae78c93dc6d8d5e20a6adf6325f87778a3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/xh/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/xh/firefox-74.0b7.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha512 = "b8de4d48dfceac7714889a8ff8401d4e21b3f49e54c44a8763311720f7e29f938ad7992355e9225f5413060e34a97803a04ce1ff91405785e7a73bb13e8b283c";
+ sha512 = "6475fa9eb12145e13a9433fc4f1d28a8e40bbab39e9c33337deafd7021982a22e64f795382c2cea09d767df2600b39824f8cbca948a2fc6ad24fb6a94b3737a5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/zh-CN/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/zh-CN/firefox-74.0b7.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "4c257e7054fac26b8e4d3c5e74d5833721278f5ea91c139b7350b776c169c9e5401288c511b817f6ebefc0c15963b665f793b988bbe4f4aba9fc5723cb055f5f";
+ sha512 = "51bd5cacf3dbcd6df7c887226641464ebe723bec4952f071da9dcfde89d714217f8677b8819425a8f1f3ce272a4228b08b4eeebe9c3aa61fe473138b891f385a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/zh-TW/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/zh-TW/firefox-74.0b7.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "3845d207572adfb150dfcdd7fbd44febfcab17ec52a864f98573f9bea525dccf2deb5d940b9a487c8b4192efd21effade113a810af2bdcf6de1f91441e119a10";
+ sha512 = "741766345cb235586333866fcce8b33e80895b4e313306f26971f013e53189dfe4e119e1d9d6e94b09b334496cf8c49240a86c9ce1032d7ad5b5fada3e352767";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index f7a23816a20..00c8ff548d2 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,965 +1,965 @@
{
- version = "73.0b3";
+ version = "74.0b7";
sources = [
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ach/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ach/firefox-74.0b7.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha512 = "424e0708ee24b9db2faa8b46fa55b4da17a9a9028c265dc3d1392b15b5df491953d97591435e6da54c17ef63156f10b661e38d905fae63fbc417c9b97f053ebf";
+ sha512 = "2dca0c3b07364118aa4b7950769e94b75e932836ed139eee3c91168236d7e0f3bb4775a6463550e7a4b20ba57a75e62bf31c4db5ad1c46c47fb256dbaf78820d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/af/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/af/firefox-74.0b7.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha512 = "8ca2ef501af06726c8563b378f3c5a9a427db9c637c7057726451cb099a8bf2acd89e3036e48c0e1de4bd727163c11e2d4220b05e0b250b1ec27c8fc32816ded";
+ sha512 = "e39a8d3a8cce92984fe786d6e1d8272eea27ed049ae1fc1a6c9f5202665c84436fbbd48f04ea16b16a046521536f741c92f217c09db13d84483ed934091b3b83";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/an/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/an/firefox-74.0b7.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha512 = "fd153f8c2e59eeab7219f8c6756535865407834e6a8fcf6ca0b00d3222478f032a18b08b787d6d93435c03f8553f976298630b2b2c1c13581221559822196a80";
+ sha512 = "75e5e95ce56a748d6c193374741f6f2c53503dcb0aa8ea33e2695b74937ade76ae723ca7b397157aecc46d04419be3de19e020427083e5002043438e1461154c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ar/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ar/firefox-74.0b7.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "970773bc5d0f39c00e56ffce18c6f65bd11fd6828eaf1d03da47410486e7e1db988055f01fb269d6442c4997533630564575a5413316dfbefbfb947ae029170f";
+ sha512 = "fffbb5e730f1ca4925c0fca2597b29a359bb3835c5338024f15614c720a11087d36edb9a7eab4b99e42e75b3f622c80a709cc7ce08aee6acab23287f030f5683";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ast/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ast/firefox-74.0b7.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "ab26fc31dd53adee1fa976a23cc69b2754318e07bcf250d3ac1f5ebf6820dc87e99048de25d2027fa7636642b73fe5f9e698f311d144ca60421ce117c21fb3bc";
+ sha512 = "b820e187245a7c22f959600e52d386188c1f9a7fa914ff03a9da9a7901ed2c090b7a057967121ac0c061047099ba800a33944fb5c629b8a41ea3e789b3385203";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/az/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/az/firefox-74.0b7.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha512 = "a0e346298a2d4b37895cd4774ad85e2692e7e006cd0215aed0e3c2f1a1b1ac6945ebc9e6706af769ae54a79d8a15404d3ef41174ae992eb60a51d02bc92ea2c5";
+ sha512 = "69b5a0f326c9c9cdb2f98709e0400da6fdf05c4abe7bbf385dc0593daee61f1e4874ef6ec6f1fc12f5a1ef6b290b6b44664c8977b17496133f7bb95683937ad6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/be/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/be/firefox-74.0b7.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "500fb614558649ca571bd6fb975b0ae138c3287d8cd4641f4fed17261203d310f793f7e5d4cb6b20906aad065cee46d2cddf007ae09078f1035dd91f5a58b695";
+ sha512 = "2734e21739a5fd0fddc3ea52d85ae268aa12f45d83e2a3a2529d96657bf03396d84bf9549decba412988e637989014b88cba773c2586a1fb04a0dfc439d71caf";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/bg/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/bg/firefox-74.0b7.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "93ed78c58fccc60f96eac5f373bf95e86f3ff71272ae57ff1dd06b09bc8f2cf7fad11d9e64f16247024fb5f3cf8d15ad8e0950de9b0b59c5d97cc7ca56354531";
+ sha512 = "d67ad4c4f282db155b41368df5094d6cd614d4e4deccb348b2873f710c3522ecd30511da368df97c4b9eb53a0588c134c7af298bf9abab602014d18d7586ef74";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/bn/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/bn/firefox-74.0b7.tar.bz2";
locale = "bn";
arch = "linux-x86_64";
- sha512 = "b6c343ad995cfe04fd18ff48926784e58d52337bd8b206b4cc83ca13be9f51d76bd2b02d165dada97738b7822c170bd1c5b5db22f1a55e9512b81fa457284b85";
+ sha512 = "0d8b5dcaf19166878c8fdbc1dc2b1743398cbcf7506089098dba170a5999a205653a048ebfd2017c4a69da4b71c8202245b64fa0835db14d41879e8a9772a511";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/br/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/br/firefox-74.0b7.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "b0bb5ec1ba87a8ac9e43c26913cd31d01f184d0df0f7026143dad53e0bbb1ac912760923412cd29042ca4f43809616a2f2dd7cb4b1f7676a75bd4800a6a7ddd3";
+ sha512 = "9d26f9c77c6e723cf942d5a656282857db008542a451fd2db59911f07acc7387a8ccc874c1c9ee25bc8e20248dedc72d9e1289c36d1018487929bf0d53093924";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/bs/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/bs/firefox-74.0b7.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha512 = "8b4e19f65ccfe0d79ac318e2e85a90e34ee6cf37a1c444fef41b4e3fd65f874a0ab493fa1ab2730c5347de1c7f96f3211666b215b430cec9afb2e1f329683701";
+ sha512 = "b7d973d03d5c25c08b2515510ccf3115ebe498c73a23823254e8955f47e065c8ca2ecfd651c1762d36d7841d48a15b76792fa2ce9282f5115fa9bfed8f411b40";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ca-valencia/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ca-valencia/firefox-74.0b7.tar.bz2";
locale = "ca-valencia";
arch = "linux-x86_64";
- sha512 = "9eefa08b2e796d917910455b5e6557230b329ce21889e9b07a4d992b35294b572762ab771e87f4b0a3917c3ab7e73dbb3122fa68386444ceaea7b8a2dc47ec8c";
+ sha512 = "94912a03c29f673de7e0bc1ea8af77ec5b28e3694f042573e3f44d0b1298d2a8520ee5c062697ba838532d2247662ff771426de00ac6cc50d011a0bff1bc0348";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ca/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ca/firefox-74.0b7.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "f37aaee00d8502d0a84f5130182975149835c0e8be2295f6b0456e5893016fd32097435d20c50b3d85cc8d425ebc279ad6220b1014cf070bec8caaffeba4f9a5";
+ sha512 = "6ff2ef52764e1bdd04861373cab88ed59bd4640e420a1e9567a974b1920957f14ac1e578bf32e1cb57297455aeca40cb84609d1adfab86a751306a0554008f70";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/cak/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/cak/firefox-74.0b7.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha512 = "e4e53bd16c71614106e01a7d1a616f3c8c84d31e9a4a313aa3a0b52f5188b8b576cd79d0982cbbf64ac37c304758dc17dbd35be8feb911af924634b7e617b661";
+ sha512 = "0a870236f57d9927361906b4098383dbc8430766b3b915e5a872ccd2c8b56b56d78edbe025aea8e8a120bf8a95c9159e26065fb24541d9e4a4860174b1d9b78f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/cs/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/cs/firefox-74.0b7.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "844902cdbbcd491e7a87bd0a888e7a61e3edce3574cf3c596e885ffdec2aead01e0d5a7f8656b11812c61f3dfcfed4c37e7e0a1f911e3f2e63204b045227a01d";
+ sha512 = "38dcb5650759007495e76bd62a18b95c63db7f63e77e5d0c488722d00b4f7ae00df3adcb771d7a73454655b8192e3008988e742733eb56f043481e40c357b847";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/cy/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/cy/firefox-74.0b7.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "03857201fb0cd9cc36144140dc0a0fedeaad1ae705f135b3977cb88fa313f9faf5e7af1d620acc32dd167618106ddcbf2f05706a8f8b2d7a7ae3ac5fe35208f3";
+ sha512 = "d07b503f1cf8b4b11a94fd2adea08ad0c37474d779d2cf7590e6700464260c81b0221ce5344f17e19634e1e6cd5f0a5addf50dce2cd4eacb10b6ff3783ef2424";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/da/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/da/firefox-74.0b7.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "d1bce5710a377a29a85178e4291369c5a069d964bb94d061a0564fc4f062bc778be48669ef50d899c439e38d33cc5fe463c9d9edd83f9f974486a36fab587865";
+ sha512 = "5386f303e45ec533e7fefc75d29252c9612126ee1d1415745c9f3bb9d2f9c12ec1cf5f93d488f83dcb51177b17f26ded417b5c93d0ccf207749bce8f1dd9de63";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/de/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/de/firefox-74.0b7.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "d7c8f6918440ba77093b5aaf69650cfe80e331411b536d0b24d999da7649c06e4365d42ef2de3db2d4ca9d5dce434cc6f5062177ecf748b440f66b531adb2c15";
+ sha512 = "26003755df79996a18fde1e1f0dc73178a3eda884be22a5848dca65d9d1b60677cd6dc67435e3e40100149d894185b0b3347e418f302b21bc056d1f982547de7";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/dsb/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/dsb/firefox-74.0b7.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "ae7d3daa752af8a4dff2602afc7b0abd5b7d90d725ce0eeb9760dfc54d479e16bc53e7488d5cadd11f1d33bd6631c5d43a9c56e4356de7c0d12cf32a5aed6420";
+ sha512 = "a0512e2996326fd8bfa63a97509dfbae54ed8114af1ffd4e260e0389ea6e64207095cd5cd9fb4e5c4a2b98ab61a91498db2838d72e6d259a200c636bd9521eb5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/el/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/el/firefox-74.0b7.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "739ad0199e848aca996acb189b610ebba605cfb6526b16ea3790a287277ff099bc60f837f516bd9fd5c3d2bfcbeb189b1b0948edecf0379c3da8bf458bea5960";
+ sha512 = "832df3733c81629f0d432ac7fbf0ba0523104532673f0b584525b5238c9a18eb30d2919ef47361a70b5a8dbd11742767a1b7f57030814dce05f07a9b54a17475";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/en-CA/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/en-CA/firefox-74.0b7.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha512 = "65c90cbc816df3da6bebd8986ce99be193b304f7cff327ecb0191374c908e523bab5b9005e8022229af787828f513ef8fe814462b1a691f56288e9852c9bf187";
+ sha512 = "e50ef2f8a7ef4defcb7aa151ca5a8140d28da1111dba92b1ef8a618a65dbe812345f3737f1945e0f0c31d14e3fbffa833ff8f50e0390efc004d81bd2eb5705b9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/en-GB/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/en-GB/firefox-74.0b7.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "ca748676b9fcaf3e2e48b114fb9945355683bdb3bf89affc87fe36d7856cf433e901bd5ad3a5975984294d9023421e3acef892e64de4de17f908d3de5e43ca7d";
+ sha512 = "127ecc18969dc3226ca7e8a0b75cd7bd5ae96ab4f325655a049d4f57fd5471ed3e83e8587edb96e3a2c4cff0b370871266cd4d7b468791ce2e28eeed7ed91286";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/en-US/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/en-US/firefox-74.0b7.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "d1d5d2e202299f29a568245c20dc307141986ee99af108ef40aac24f2e2a49e12dbb42ba1a6d07c132400a608802e90465af8010329fbc48cb97f65236a723bb";
+ sha512 = "c4f47f02ec25a34590159f3e04b8e49841aad1092156b54b342869a3330cb7b36317196f3c65f57e73e4ecc6cc53f4cb19168425930febc100c53f626631fb78";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/eo/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/eo/firefox-74.0b7.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha512 = "9fa1e7a0a3b98ca67aa1cb693b26a0e4fa6a261ba1a34274f6c8c82ef67092aed94f399513be5089ef7b300cc598da1dfe0d08f811c6daacc534f4c2aec63e00";
+ sha512 = "07f5f34b74c768d8748a32103163fd6d0d390241e8cc7a1c7e0c90d627d822457ffa5406d06ff28b7b18ab1f9ec4cbe42a9712d56a5881351efa40ea6deb7dbd";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/es-AR/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/es-AR/firefox-74.0b7.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "ca6802d8c226a0fd8bc15a926ecff00fe1cde4a69116233cf94c5f85d37023d311d25057ec2be5a0994c2e19671e3a984dac469a0a26cfddde805b18299304bb";
+ sha512 = "6f3531ab56ed0dffa9a1e22c86dca8f7869cfdf9b9adf8ae3c7d5ed12a567c1033db7b5c15daf98edbbecf0b450ff5a064e48ede479ada4b72ccaf0c851932ca";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/es-CL/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/es-CL/firefox-74.0b7.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha512 = "77257cf06c50a8407adbbdce1b07943c8921f0296e599020f93d01096aa7b32bc08c8c0b3931b31e69460307a82bb4c93155c585f3312feac751f1ae88f98af3";
+ sha512 = "c969ce949167600c414b9f0ab649a72cd9b9c12e766b6b92ddf36735939d4d5471bf8312e309db5b2b6e1f508b0af33ebe35b8e76b67af663b300893b539cc5c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/es-ES/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/es-ES/firefox-74.0b7.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "06d8c8c6e4978d62c4549700fafe6380bd2a33509f128bc028d4d34293003cbba278154855cc1e2d46b00237c26615fb779584cdf307111abcebe39af96c9f32";
+ sha512 = "e5060f9a575b6cb430265f214a554b21794673db9334665d6cb72c476bebd3c1b2797c8fb3447297c2a06f0e243a6da5da7f9d22a403472d81dc8f754eead226";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/es-MX/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/es-MX/firefox-74.0b7.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha512 = "a5bb660b5e3d14a8abbb98894114427e537ea5c848085e04eb7513d5cb38efeaba060fbd92de4374f513730c57c6e7bb3cd434e74f5d488a92c169f9347005b4";
+ sha512 = "48048e589d5b57c75a5eb7e3048f541766129f5c63d7e3773d5d62fdefa5afb02338e14f76d44c6ca0c4ca0a688cf259fe98d0fe23759808b9c45414d5009389";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/et/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/et/firefox-74.0b7.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "454d9e2f1d4c7aad02bd67eb5ce28ad481383f6ca43d0d2e0e1386ddac4e9015a2ca2f423b7d05b78c41f196ecbecac8b240ecadf0291ff81945276232a4c67c";
+ sha512 = "3f196d585242bc7387233223210f444bbff50309ed2638e16a19f42f48c06701af560e65f127addf861536151717e099f548fc837d5bcb7982831c0e20384055";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/eu/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/eu/firefox-74.0b7.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "ecffdc18654bb030be8a09bf7f86d444ae8fa570e94d6184b0fe2f1a7c16f0d49f5ad594205b0d0c79a2b90078aa7b1529fc784ecb5980846e74178021ac609e";
+ sha512 = "9b831ad80c7e5234243607b3391d422015fdc5276e083291e75ec1b2074c69e824c49481bee0ca9f7d23ec31f02a9fb72540dcf0634afed2a8427ece7d4e0503";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/fa/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/fa/firefox-74.0b7.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha512 = "589e73827314af1d5819e93cfc1dffdb1dfe050ee09f927a0d6c049541e5f218a46a6e23bad3d5927c92fe31f3268fb8cbf5ad0aee6a0c6a67ca294158ca8d7a";
+ sha512 = "8318bd18537396c99f496ef5d43b1d70756cbf7ebd153c6dcc272c13eacc57737a48c186e055bb9fcd10936510b038560257ea03ae1bc8afd563df4e703b05a5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ff/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ff/firefox-74.0b7.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha512 = "d12c967c89baf8f96726e83b3047c75a58d8e2ac77fdd37b71f686d42dabebc30770eed87d57c897ed764d55ea1d8373d50c4def1c202d5d455ed0918f3cd46e";
+ sha512 = "d2c46c0569d98f96415f451d2956e0a86fb030b254852cc552c48b546e31f75c5a6bc54a97607f3653ab330f1b3ea5d988fc933f1d0654919f2abf4d1e7c396c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/fi/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/fi/firefox-74.0b7.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "69afcf98da111e683c6fb5adb83946c3bf61b63c9b85ede26f397f42d86acaa2257e45716622029e6917625ccba742de876f927f5508b55d70f6b16372ee4511";
+ sha512 = "8b1cac6cbb141bc7dbf8bd33f6cf8b0abc7b97f38df83181241948b8d376d67c77125795a24ff64506e9ee5f986508005120b7952bafcbcd76fe0e802c23bdba";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/fr/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/fr/firefox-74.0b7.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "f119df35876a10175f129a04ba988ca41ee66ae843711f2b6c1dcd1b370d91f02ac70f3cc7de3882743a26241dbe2c32bf6e11f0f39293287091a084a4353b34";
+ sha512 = "41b55258d992c751aeb60ea8c9819f05fa5365d98a0d305c3129c989c46d1022e667edf654856b666c84e48eb799f3194acbe8c2a278baab8ca5984656317e54";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/fy-NL/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/fy-NL/firefox-74.0b7.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "69b9a51dc956705b8569976fb72460c034872d5e62505a69cd6ea6bd81175479e8641d1931504b047d9e8c5580af8aeb0b0500022141a0d7cb1df886d52063b1";
+ sha512 = "cb2368446de46f90a567c6a2d698e6fc0e48aca18093c7feff581b5b7fd15d5699e3d4bbf02254b3c54cb28acf95c29b1f86cf8e2fcd40b0759dfd068907ae6a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ga-IE/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ga-IE/firefox-74.0b7.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "a6739397f1a51e1944dd7ac5a9528433f8b0963ecd28d28ac2fce94042659bda964c98e5784a72fad58484ffdf870d3888c68acca7abed4b85660b31fc033cc7";
+ sha512 = "0c55d65e2b1ebab4c2e976c76eff205c6232b0f9ddbdace008c9d27d9bf25773e91b516a2536b1e7f069b4c7b468703da22d1814cc2fdd3ac1eff798184147df";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/gd/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/gd/firefox-74.0b7.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "ae71c727b6e37a83b1789f167de49f3de43662ac1f4a9e0b3005b3f68c6fd5d43b141b1b960a8800cd3c2cfb2a3b1ff7483f07c2f24d8bc2e967d50791f622b6";
+ sha512 = "4723a47718cf1dec08bd9b3d6e0e7a4f857b5ff16ebba926f26cc6bd2000bfd19c238d05df1362d602da57864578fc2fc14c9f9c6c49e6b430a5118b22636cf0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/gl/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/gl/firefox-74.0b7.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "5c8be99ab328ff792861d28851d664c03bc9ffd6fa2861253856eb350906dc49571533731c22e15f3eace1a2041e08434a2e77946f622fc8e6e3aadc1903ba50";
+ sha512 = "69e719b5f65c0b8392f1515bd46ac0d22d763ac3911b082bd1201f7dd70db53862a60a0a43157f3e3cc468bd133eda0d5ef915b225159736d936e754237b711d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/gn/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/gn/firefox-74.0b7.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha512 = "b55c72cb0b7e81539e63a155c896e8d4f2dd821122379d4a98e9efb72b72f67d5fc97bed4a1979a0e2e22378a19ff2380b4bd9d6164804e679f1e0d4ae92ce1b";
+ sha512 = "cfcdc2deda122556e89f7b32b97e0cd5a9a01970babd11c3fcec205de1adb0744674dba06d0a5b725c379d2a98dee592724d5310f4c8ce55d9fb46e58dbf113c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/gu-IN/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/gu-IN/firefox-74.0b7.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha512 = "77bbf000241b5d7a4e7ad4b7e01f0edd4930fc73b2d142f40184ea6ee62c0b278cf790b5872b666366ce4384b278f1728ea2ef18e632cfbdff379c8c480270ce";
+ sha512 = "b2c9551e6cb5c047c6169e5bb1e3eaa6272391fe3905554762b21037b832e2db75497b3e3d680e886821390a5df1df8c28cef64022e4fea77e439c97b5608ba8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/he/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/he/firefox-74.0b7.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "a7ac1700342e2b69c3f1a6cfb24baa7b67cb186bad85e9ba6919e68f0b0b2105ffd4b4c20cd40a9fa4b842a53a277fe84f958ba8649e775500214df73d3ddf39";
+ sha512 = "ec076d4f9f178c3ad69f38e10796057e6650c4771002ae3ab06b7334634482db783ad1ff946e291e55d6112bcd1fd07e37cb8a475af268ddb6fc4541e4ba31fb";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/hi-IN/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/hi-IN/firefox-74.0b7.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha512 = "574065abac633c814d3380180bf2e9296250d15fb182784393396ad971388e2a00e1b04eb20d66f41e4611faae532d4765029977d281b93616f8aa503fe5fb23";
+ sha512 = "3c7e6b5343c6bbce4aba4069f543a09fba4df38350e30bd792028209d1f3f6a862a5ad8b08ece57b0e10b49775d97a5846a0fe71872cb3b8e7de0ff11059eb23";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/hr/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/hr/firefox-74.0b7.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "3e8637bdfd6b0f99c6c03743242c2b560b1c088ea69bfa3e2f5657e76e9e6e1b72a638c34b6fbfbacee74b68b7e7249bc8a66e7c4b384a978448a44441ab4782";
+ sha512 = "44b3186b2de73acc348b2114818c3361dc6e09b8a865f6ca81af5956a7a5bbf84932d39e2a970d8eb314524bff6c0b59923e50ddff203c3844a7e075b01d16f6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/hsb/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/hsb/firefox-74.0b7.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "43d1b2c699372e30a04e1c8e84646f6fe07f54f6734c8d0155e35cdfde2ce327380aaa3313f4c3da8cf9773bf3a1f4a9793fa539af577f1d025e0228aa50d56c";
+ sha512 = "b367e8059e20aaabbb53bcdcf6b84d2687e748d832b1eba6fbc23ff097b5b8351d303fcfaf6cc12cb9921231072838c3c865ea1737e25ed533f523cf70cce194";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/hu/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/hu/firefox-74.0b7.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "d755fd0f7248523458f490457d47fb8a6804b36cfe1eba9fac28b68919b2f0c30769a149ea34f91b909b407a11838a65fd6d3b21ca9508d335672d410b1dee59";
+ sha512 = "bdf99f29203f13973eb100e83827ae669bc0d42bd12488a3653caab92c1b73edeef5304db2678bf6ad59a86e40aa14c552518765468bacde63ec4b4b12da09a2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/hy-AM/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/hy-AM/firefox-74.0b7.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "10a3725db9b9c4ade65768974c96106d142ab39b7dae6fd9a452d0f9d831a3d9d05a84575c6970add6af8882f62c71e8b2d9a3352745e71a3156a6cdac534157";
+ sha512 = "4677da96c94600d9becd6870acc2911e385093775969afde671c900700eaa56b25a4292862ebf3873a704897995c87bb249bc17d0da8394bca4d71d13bb85369";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ia/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ia/firefox-74.0b7.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha512 = "72f0269b9279fa88c7252689619e68b08a1238a790940b3cff1f82ddef9c14c4b743a260faa3e63874439de95593e1496b5d56283caee779f486c7ccf591b8ec";
+ sha512 = "277cf81214b0cb0a41f9dce8704d387eee36e6d947e7f625239fd84bca25d850d6f43db92a88bf68b3aeb12bc6e2174421fe0a006b80b89bade5de949914bd71";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/id/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/id/firefox-74.0b7.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "9d5229c81495296628c3b8cf6f3181b2531d339c34faf531cbaac7630959fae86b6a07e3ed3cdb450488285f2427680d0b2f7ea00a5dafa96f374ae5f4821232";
+ sha512 = "26b3e8b4d375e57bcc3c1b7a641f27240106a1c42fc97913eb3fe4cf5f51885ca9d004cd95df1a798270a7a16c5407ec519e2ceeef4626480e7a3440e45f237c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/is/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/is/firefox-74.0b7.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "afb2c487b0f2f1713750bd222b03841f0c36ad7ce38cf219336d867465c02fa4f2fb30db0d7f456bbcaea1bf92e4d463db256fa84855bfa93e0a4c97f010895b";
+ sha512 = "ad3bd0a308f8444ba01b84175b3bd72dec2c234edac61d5ad839644d4a09b89fbda61951229ac43b4f152c5ad8af7055477fac2fdaf71c2ff737ea73089339f3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/it/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/it/firefox-74.0b7.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "83525986faecf23f7282a2d406bac08d5d538df07eb04abba8f2334de19ffa5de5990cd7c73000156c3abb54e895f39c0eb59e5241484d92733505cf264143cb";
+ sha512 = "a6c2ae689f748c8c306122057b267191e59e9b8bf273600beeff7181586c54c3c014b74aa88dc286132b8c998607b0246012a12255025899e7c44619a3940a9c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ja/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ja/firefox-74.0b7.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "f8c01a7b0a3172d3e03621dfbf507b61c320acba371e408155a3ce325db65135dfb4023ae09758c19c078794a38ae34aa2c115159e491010f46ef74dcdcfcbfe";
+ sha512 = "1418d6e286a20860d7b7073e5f3a15127545e27cc8692a50c178e7d5311948716823bb9ab713450f6bc3fe2d443165971a8e6ad2c8251ffbb2379d4953b37714";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ka/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ka/firefox-74.0b7.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha512 = "ba041dffc57d9c15690e689ebd90f5c2d09d5b6972713b1249f01c190ba4b4062e41fb061a32fc69953cc8b2d2d6eb4593fb13287795f40f8882cb3ef35943cc";
+ sha512 = "039af653f9e75736027acec1f0e405c350ec66f4d343044297089601bae01fa76d6baae8a9b2eedfd31981d8022f4ff350817fb2505ad3f5e59aafce3441fde7";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/kab/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/kab/firefox-74.0b7.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "e2f42c9a510205e88978b05de9d2b1871dd5756272da992a9c25a1ab67f6054f4a052c3da1eb2882d908d0a56b1c64426f73ed1994b466abdd78ac2cc4d3f012";
+ sha512 = "688930d5d2e67d03695abbcaad36880a052a4196fbe8ff406cbd7bfa0e540394836b15762e2ff64627a4f4e9abc16a58cbcd2d362624bf84db2efd6a4008c612";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/kk/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/kk/firefox-74.0b7.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "77d20f9f753197492158a4926106d9436b74afe4905119fa8ed5255ab270a1e04e76a515151f5a20110652b77e59ca4a562f04d001482a85dafa9b3e5aafdf59";
+ sha512 = "1f794ac9678b81af8cfb8ebc6c379d9e0603f2da337c23df1161170d54dc3967d6f89411e7b550da0ad1a2b7cd5db11ed5040d4056b333ce5dc66c1cd4629534";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/km/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/km/firefox-74.0b7.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha512 = "120a68421dcc63e14425556a68677203e95be4a5ed9c8f7b85d6c8665b93debf2ac4ff685ff199162a7c347770bec787a6aef4ca0111472a177e6ac46d1a97f4";
+ sha512 = "54057be25090fcfef69ab8ca2e4bacdfb96769f4e797fe83932bea198605a183e8bd8941484cf0e91c3e3a4fd4ffbc384be09894cf381b777649cbe340bfbb6e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/kn/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/kn/firefox-74.0b7.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha512 = "5ee256b56533a0c11996b9fcb611e97122e572162d5a5463faf17464352b9242dce2d2bfab9074fff8340ec06b4b741e6a3bff4e4d584fb0f52d13d77cf87ad1";
+ sha512 = "6e36f0aff051302132e5f83667638171b3bd7437b9d0fb3160d0f069b1131c617df6668d0de0a866e905073e57d6ac1990c9f00d59d6cfb179dd4eaff6384aa2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ko/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ko/firefox-74.0b7.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "ade37f0d1ea0d318b414bd5d9b293683610aadd19d5d6d99afc4ce5745b3b43a25c6f95e5a574e547af89de558d04aace4aec80a109a022147bc2629ed7114cb";
+ sha512 = "6be107f8f29914633196903bb687f7d23ecbfe70f4655247a5a260ef01a0841cd843600791867de64575caa63e0d3f09935eaa7ff154673d72fe044e5dce7c4e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/lij/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/lij/firefox-74.0b7.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha512 = "b439c512f322e7762cab97b967b80fe695229bf10e406a7c1e3c12fb0b8b752716ddd6d7790acbed6d0bcc5763cca8447b9d071dc7bee245a1f86b81f8ec3810";
+ sha512 = "7b2ce6efa438363584daec053c99a4f61133ecf151070c9fb7a44b340a60f3c132ab92b9df50ec7ffc8ae556951876d3a4a3ef32551fdba4a359d7fb80da13de";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/lt/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/lt/firefox-74.0b7.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "4208d0bcb28151fbfd80e5ca22f2d9cbdeb0a31f009e86dcf01733582635ae6e9944e4ef623ccd97e466893e58f9039f19d951253abc84c6a74465cf7619d3b7";
+ sha512 = "723dbdbd1881f8f072a63ec43050855dbf147e811eedd983f568fa33516f150fae2af615c565689690b3e9effb119bb0b3934022c3a5800ee9d5eecad4e42c05";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/lv/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/lv/firefox-74.0b7.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha512 = "a3d3338683d84a4bd093e70dae1b3a85bd88f952c84f1248c46b1043e80771df2acc851d9b5ee207ba6e8a907e3bf7dd4f2acec700f268344d6de9369f2923f8";
+ sha512 = "3da0b6dcb24bacee313a5c654ede55885f538d4c18385533ba92b32543da0e6a790c242c9b6cee92c4320292aa2c7a4975241feab89647d430fe0f7cefec350f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/mk/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/mk/firefox-74.0b7.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha512 = "4cdc928f24bbe037690970bfe293b3af4ee2db74af53f5ea8c57956ffe2b3699da76bbb5c78949b9856112aa93ff5e6adff80207f70fce0f7d0b49cf9cd9c6ca";
+ sha512 = "e84a8051a9e8fdcf9e27084166e8da04898dc143045feae305c676a02c6381e3d0f3ef2cc4a74c6395075d9172fd75b4763ce262c42284669d542c56ff0056d9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/mr/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/mr/firefox-74.0b7.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha512 = "a7b67c1592a59ed556d086380753e20b3cd6924ab0cc6aa22f441c70d10feef049ebcfa89c216caa42104e34695eaf492e4abbb654b5aa8115a0f8a5cb3db85a";
+ sha512 = "23b8ce5221190e3d147752e8267d27edde8f4f2981e4c329a5e223063839881417204076335df8c5f50f9a0a754d4b391020ea7ba5222c64ad7ccfef3ef0da68";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ms/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ms/firefox-74.0b7.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "2772a5fbc812e99b259afabb73085b64968c5a23269199579c22c9c4d7b7e85723d72a575aaf6bbf3a1fcb6c2d442202bb4017d6bfe562a8b535caa240f8591d";
+ sha512 = "6b9d37b331fc1f45cbf0ebfc005f47375a24cf0bbd7e68940c6804d9afaa82aac048ad4bdfd0a018c2ba4d275a145a2a64f3c62b1f46193b2d59f7a9f0ca8b5c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/my/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/my/firefox-74.0b7.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha512 = "d7115f8e44e7155e5b0ae474fb7a7236160f7f28e8eabf25ce5e42fcbf706e5336f314194f47842689ead602e176696a55b85983ef43439172ee4942752fc3ca";
+ sha512 = "bf2d1cec77a74608db287c5079db8a7681f18486ace763e59b59ba0833c2e1f61d10127fbe34678fcd15f4864b1e94be2160fcffd14a62612e7a543d8380661f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/nb-NO/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/nb-NO/firefox-74.0b7.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "ac575bb2f12c03a04bbe1bdf16f14388b43b2c4a449d0a71f3486baf0b488bc44cb7764864324da498ddbf8af08684e51cb9f9bd45ef25d2162b12318a8c4c12";
+ sha512 = "2c93b5c1bbb1d629e9d3fe38170b610e8f2f4332a12ae841959955051e6e6f4d56c6162f7298b9ebba78c36c81c150dd28c10b18d194c3ba7116733df5bcf7da";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ne-NP/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ne-NP/firefox-74.0b7.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha512 = "fec1a4d5a018c4e3bbed6c4664c993dd3103146c80c96f88f90e65c2ea0ee12ae1e8ece3116e9af23b7af63220666b3682db12efd43773fc1803dcb0e8685d5d";
+ sha512 = "e6443dedebdb4d11e3a07adccdf92d221f7ea05e257389792962331d9f3f8839d24509dc996b39843ae9079828a21975a026f6e0dc75e06296e2c392781f70e9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/nl/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/nl/firefox-74.0b7.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "3aa8bd22b20b01e1703345b4961d6a0be6d207d3f5009264410b4e1523d70a26995288a5084b5a5df4e54783d723be0d22b075d4619e4ea66120497651a674bd";
+ sha512 = "b6c0e5a0ef7af5cb1c9ff89e682e9aeb0b954ba754591dc54c8a73fa1de8e3f37f5f78f614e5aa82eca5289dfd62782f9128e984f79fc3d36486a2dbd4affc54";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/nn-NO/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/nn-NO/firefox-74.0b7.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "416c6f87f6ba7e339082a232bc9a6669fc1d0594777e33215cc4dd801e6765f3f130a732650ebb83499fbb03e6af6819009090fd1268b77c61eaa06b74965e30";
+ sha512 = "9b2c0e29d4bc92685ef2c914c783dbbc663cd6bc9ea6f15e398ab8f8fb238159ad0dd84647c28b2c9e5991e75195fa2f305690d9f7f98360c8d40754c10d4bab";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/oc/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/oc/firefox-74.0b7.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha512 = "43b62c8b25703fcc0bf2df581c0434efe5fe0718820daf5d953335efe8171f8a052b9e5cde5ada8f0576c1e38e844e082724ec4d1a1a90e91a616667227e22d6";
+ sha512 = "9a50ee9b626f3f96e9d08a5f5df174f8b89692ea2fc3b927f260e9579174273f78a9d11efbd1007b4165331dd52e52bbaed83a77ed458aef166b764a2bc5d559";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/pa-IN/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/pa-IN/firefox-74.0b7.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "b519af2d1b7d404f6cf7f46c0806b909c2b9675b8af6da39d2cb8d006ad8e79ca6a9e5cb18fc69f1415a961129b6bf2248d9e4ac1d65e895771b504aa2dcd34f";
+ sha512 = "9f29ce7b0002e41a08c64129a08a0946dd622fe69e6dcc30747d432990bcf4fa209256e74b1a7ed51364fc142449e010f6dcd61606441f1c4cfaeb4440269ae8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/pl/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/pl/firefox-74.0b7.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "e7570576016b72764b0046586e82aa059883529c20e1b14a939ef27f2a8d083024bb131eec90be6e8f33f3bf798475fc47494ece617b966251162c4638582a48";
+ sha512 = "c8ae484055f3b0dbc81043355903f8f8b60c3c07f431b904d4a181488461a810b8912099cc0ac23adf026e377a71a2248ba216f840ad35193d774367d484a1cf";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/pt-BR/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/pt-BR/firefox-74.0b7.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "daac9ed0155445874110fb161c8056277dec011300cb0ceceece63394892cd346f3e1ba200a6516c6e02ab1d24afef0bc5c02e27ff9fd701d0df299314908f00";
+ sha512 = "7708ab164dbffcec1a90a42b18bf6520e0d1657cc33a7e96a2b241b170649c2a3808b3877bd413af835d269c3ecadcdead912bf471c6f84f811a293612257087";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/pt-PT/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/pt-PT/firefox-74.0b7.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "d819d3787bad21052fd6f870606ca216dec51e0034e307aa1490b945aca4870f7540dded944e787d0ef85154b8aa085696e8e765a70bfd1bdb88058f942f91a7";
+ sha512 = "229d4ce0e510f178d08474dc663a598bddb85bcbf23db6a98aaa2179d9e8824be65da0b49313854dd96077abcbb401c1fbeb9a5e3fcff1fce457b52bf97112a6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/rm/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/rm/firefox-74.0b7.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "d3d6eed9506bb95a7c5b78cbdf4f82f3ba2735086241ed0f90c9010496d8e7233a2fd9e7cf09704bab762590dd03fe8cbd30c50188e3b51846a18390b84f0516";
+ sha512 = "1ad93043f33239894c9d38b49347445fd0e462dce882bbaea39242be93d71233fdc621c2778980bcba089d5d72e60a751fba4df663b19c0cb061bbefac5ad637";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ro/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ro/firefox-74.0b7.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "f147967c9ba077e629dd1302e4dc1bcece89b94f8495e785892495d7d2100c465426cc318904f127fdae7ace3d2cd878b6a98e5fb4d7e56118f7b4bc5820c33e";
+ sha512 = "4968c4a27122bac5f4bbbcf2f55064d6d42b35e7877da3a2cabc0c877e4bd70b1a5c9beb81edc4e13cd0bf34495332cc137b08a6dd223a52b8033e4a1cf10126";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ru/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ru/firefox-74.0b7.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "6d1fc4b8e4763e84bc99f8771ac95d8f439038b21dbe555badc42ca58f7ae0d55a355b4de8fd623e0014e6fb1c53d1bb01d3701139d7c23ab70f86bfee18762c";
+ sha512 = "5fe2e24d79d716822463a3aa89ea63a578819a028e1f4715a5852ea1f8b05cae906b4140dc21c6fe8a2f9a33c3d37363f254dd0cc38b4c480a7e80becd2fccd8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/si/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/si/firefox-74.0b7.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "6f8ddf92a984e1172e9fb84f482bdfdef4d76eeff4bbf6e9ee1ec16c0154b9042132ba2806bc31e7d66ae0f9f2f938e78a8b1272b8d0f02bb3b100dc12da0b33";
+ sha512 = "10e1023ff62b4e66244a8f0e9d937b338087934d12cd9ddbb1d5935612d47668bb2e704406662efe962eec89b2dd4ea53c2369c524cfcce0b38dbed01cc3fa1b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/sk/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/sk/firefox-74.0b7.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "d31f250bc38982d2760bc4e57350a650653910ad972ea444709f1cc9dbc86f7b1bd614ba1976898f2cb7ce6c0017f7cc5905b5658dddeb6061883d7ac06c6de3";
+ sha512 = "15fdb81e23eddf249eb5c2fd2f0f5ea824560a8a34f3080efa29ef484251379b9eb86afb66987311fc892c38021f81fc2664fc41d0f9eef6135e426188083a34";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/sl/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/sl/firefox-74.0b7.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "986c0e11f5131c756a3490a2ab772b792eedc57554b2229c501a11bd7f39c60b7b916d18b9f3881cb595fee8659ae7ecf8e3a98c0f8a1dac17d13129a4c50e30";
+ sha512 = "44cd71b632c0012133d68537aa4cfb5512f992ddf227901d35f9ac6034e38cf36190c4c75b95e0ab93ca172e0317922a62497e9458edb0b724d8b66ccbb06190";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/son/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/son/firefox-74.0b7.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha512 = "55b602a8e9aa299e4cf0cdcde126ef07c9ddb9243b871734a7ace76fd476c67531b760722c19955e5039579c920a8c3f77a16b3846c78f8855ec5b099487d993";
+ sha512 = "419ee0cc45d6d0bef462f093b017856cbf33e1dbb190d822ea0b85bf91452f583244a876771e1680de1e68bcb0977039187dcef56b44b1cc14e4e5e2e7c3478d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/sq/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/sq/firefox-74.0b7.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "c7e4a285a228c1453b47368827fb2d602373335c4889a4b7221a3c2fcf8ccffac1c04291d967bf0cf885deff0f887e04b35a2220cbe9eb3eadefb9003634bbda";
+ sha512 = "787ca501dcda265430e825fd890b6760b2295c812ae882bb7d07ce40f349ad2dcf4852bbfff0c6cdb56011f3948afafaf0dbe76842e0f011f9e4e15214e07b9a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/sr/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/sr/firefox-74.0b7.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "2d1909a4e8b91aeb0e42d491201f67b733994e3a82b6f899da467eab1c7760cf21888a2e5e693f8cf18bcb7b53e3c60ded962aef09898dc2e1ffae189186c3ec";
+ sha512 = "8bf08f9460852e66649d60b551d3d628f7507c2302f56d457f2649437d6523e74ea702115895fe2ab8ecd4a3994969b89d24094c0c41cf8ef81eca140c63f80b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/sv-SE/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/sv-SE/firefox-74.0b7.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "21a6d9faed19e72df514b2fe0e07e7ea4c6e167a985d8fa830b15d1fa754382dd05e49c1b7f1f173e01fcdc03af5d05b3151e35df3e3c9854742a8a5c2d5be95";
+ sha512 = "75f71a1c906d86ab92c0bfa6b2d07e54b3b411037614f27b463f7f97b39a73df920300ac3c227a7c35a062c99903fee84fa685050cb9eb25bcdbacc99650ad12";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ta/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ta/firefox-74.0b7.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha512 = "ebd2806835bf2a54a716dee6dca94310fcb61d55679cb2f9d3df5ad84a61bf040c36e286ed51ce0011c6a7a56a5baba9228ffe26fadfb2e62233fc1704e29c98";
+ sha512 = "cc147836101fd0b17d24f696fa0e5d4a4fdc2579f21deaf95757a3213d967e6e934691af5c7fa84bee9a5e0a3dab37067c8d44be821eb5f145fdbb5cd96c30dd";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/te/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/te/firefox-74.0b7.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha512 = "1c18c4d53a1851a8b68cc33ee3e63c3c2b7ff7b194fe70d68ee29bfb2fba6a6f6d88937d61fa58972fa00eb64ebc50d3b472f8f6e52bff7d1ebd713700298af7";
+ sha512 = "f4ec0d17d604caad1b3eb37b413b9685bcd39517e680e1636ab007cc4cdb253e71a2643c85436be72de2fa62bda13dad6787e2e8fdda3689e421818d2bfa4fa5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/th/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/th/firefox-74.0b7.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha512 = "a79967f2fd94b987cc8b04b536960536f0bb7bbf25fa64d48423f3a382f18dde33605aeb9fc551f99c2c4be56a9b3c01bfde553b2457d84833e4e126ab35c8b9";
+ sha512 = "f09b98036d5822d588a1afd3befeca14748d9f7938ff101f0555d740f5586462c07ebf76c90a3238636a3d37fe3f5a90b26fcae1de8658cc0db712e2ce3d2116";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/tl/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/tl/firefox-74.0b7.tar.bz2";
locale = "tl";
arch = "linux-x86_64";
- sha512 = "4fcb7329a0e331c9a2f78382e276bb856f47bee1472c993fef54b526cc5cb0647ac9b49674ffd35e1dcea714a8ca7374ae59c52074af75132c8403c23f3ca41c";
+ sha512 = "28ff7d5cbd6a41ad2887dee8c04b4e129d588cd20758a2f2233cc69e6ea24cfe7013f5f21524be30139e243fd6bcae1193949b653360db65d8544e6cb654459c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/tr/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/tr/firefox-74.0b7.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "0c768fc110fdea49298c334cf425d88cf5c7d16c1bd638640066abefc7821da41f4468c121d09347ca258ecfea86a8141731b6b84e88677a45fe4ebda5bc15a1";
+ sha512 = "2b676a0d0db8edb3f1af3174b7543f6cd704a61197ce9f505eecc53f7431c66c1b0853a0d5cf57c9ec601377bbf66efddbe648ec992b4e518e85bc83c8f052e1";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/trs/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/trs/firefox-74.0b7.tar.bz2";
locale = "trs";
arch = "linux-x86_64";
- sha512 = "379e1bfa5ae54fda8fe5664329b147e5f2b7356865ccb202a01a30b77fbd3e308063537c8ac585341ce6f63b4bb0b1ff52e25d09c520daee3ae7ba376df7349f";
+ sha512 = "0a934e3106d9e99e6bc2d93d7f50d6a87e146f0a5d771a6a9f52a18db8cbc59ded661443d6bed42c148e6981e8d809f3449b27bce9194d584f6d457edab1b549";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/uk/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/uk/firefox-74.0b7.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "43f07a1a5a7df971696b6350f800536d670fda1802774b5f02f033699b3d08d152ca23cd8da737b86013db11dc6b410f0723808f33fd07bae802d2c566e5776a";
+ sha512 = "3860b93570cb44849ba351b15318425c8a5a2e3dc82f6a229cfaba21d22245f74b56672ab82fc48d52c250c528b9bccf53d25b6d358e5b02493b6fdd82037f4d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ur/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ur/firefox-74.0b7.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha512 = "2afa0052ab11080f9a1933fff0d087feaf57e983d4f6e9ad1954afaae97c7ba3fe6d0e3d961f78369771b2fb4894144696b9bf628aa3b255a83856adbaf2eb2c";
+ sha512 = "89ff25d895fd5a484ea78ee6be21b7789998215847445d8aec7487966042fd88e5703938274245b940807d7f668f21b41b8eca5eff0d5ac715f3958ed8a32dce";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/uz/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/uz/firefox-74.0b7.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha512 = "c0e27e017fe5dbd1a2346e38e467bd785d41143b428b0fd2dc3da698ba9be73033c45beecc72a50562bc7d2f7900ce27be021f74db00dd6a32c7845d6e8284ba";
+ sha512 = "60cb02c912f359915ceb6732a1b8c358177966bb24ac7849362b865b1570b31266e9a9f2790384eb2ba6c15298642e8e112ee85c9cae1da65b62eea5332f65a1";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/vi/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/vi/firefox-74.0b7.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "55754603578038d0ca49294b228ea5cc5976f899faa59615cf392f7391a152788dc154603521fbc2a9018279e35649c402011b32fbe0d03ce29139baff57261f";
+ sha512 = "b19c3a265bd2f218d1f7012397c081690f8c949d4146c0d504409858b323a9084c00e04e540904d82c31ebe586a47d1cadf3f9ed74be0d20544af7ab95583486";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/xh/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/xh/firefox-74.0b7.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha512 = "943c6c8ccc8c58fb62eca7d40b5afdac7e16bdc8c4426968e67827884dbb5e0b2b6732b5329d4df2efc98b198992e5ca51a4b380df14e1b1ebc1bb09b3a57556";
+ sha512 = "d0e177251ee7c2f756083f1f19993d16c365d77f4be3811a11e6f93384cf58c23ae8579a9a65cf289264e0e45705226b4cd1365dda3f8731d95c2b0d20912066";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/zh-CN/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/zh-CN/firefox-74.0b7.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "c3c023f4169b98bf5d165b29d159a9d234da40740a92d29b6ee1690ff5e09f2fbee19d38e3114339937d58c7deeb1be3bcefbf9e7247688e123ba35e3b5f87b6";
+ sha512 = "30bf6bc54b91826ed9fa30988f069afa7b13e35d3ca0441f10107abb367c970080217123b22bf4ddf046db99394e9df46d825d91e5fd4ff717f3f025b3d54159";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/zh-TW/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/zh-TW/firefox-74.0b7.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "118be7d6cea9fcc55e68530e984a7ea2a42168004913ca4a6ec46ec6d8f131d0df5c50559dace8a80612e06fb589abe1f0cd1f48bf02018e9fb9ac1e7941dd73";
+ sha512 = "b10365171ba6fc4265f9684524d1270c7dbbc1890fe01154c7c4286335523a3ee7bc98fe8e86f874a584fdf30bd64746c9e3c62ffc48b55e97f9f728ec844910";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ach/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ach/firefox-74.0b7.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha512 = "ab6e1475a19c711f105d8f1a5f5701a60e76e7ad8614c65b0b8381285ecbae42b3a21c427309246a4104513dd793ade952465a3339def3d62fe83e355d030642";
+ sha512 = "54cf3f1a2b73f95e6ebd276c5b9ca40ee598c67e8a8f308ca969a79532614a10c9dd4e06f0a5f2d580a514009938a493676d46c969a257c1d3d90ea20d588a4d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/af/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/af/firefox-74.0b7.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha512 = "1d19e09a10e40ed4867ac42ac6160852c06c5154399e733829ecf0d80955132856fad6f3062a33901c6da5fcd4376ab3b83e001ff387ffe6b241df71eb931858";
+ sha512 = "dede24db1ca9c1064b8afa51e87187e9eddfe8f3f159bf268227e941c7d9edd08823927c10b6681eb79c335db567575c0e0a10eeb24561deff0e587d4d5d6f78";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/an/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/an/firefox-74.0b7.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha512 = "4f45cb52d55b5a2575de02eba0bd7f256943adf0cc4858cca8d5160e7a13181cab8d0cb331352edd7abec92661cfcf2970506bf6dec3a8c5d6ec2b32a6ec1bd9";
+ sha512 = "841d9c1b70a1ec0a58939abfd7c5932c7db76ccf1b77f7950ef3e4a7541219120d638562d96159d9f6606ad9090db04796c7b5e1048192fadf5a490ee2489135";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ar/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ar/firefox-74.0b7.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "9beb42f010832b8cd58a335f07a848210030ad4de3fd594123bfc9babab85ad232daecad112b1abada7c0428882d4021ad159ded58fbae309d0e55cf607d24d2";
+ sha512 = "7e12b8cae568f82de67d8f4848a092ddab634fb8c3ef3caeba4f7bceacdb260a12cce70df7fd80c30ac3b227647755141fb367aafe692db31c0e58415a9fbf85";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ast/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ast/firefox-74.0b7.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "0008b51f70ea6ecb0ea88aab8303521aece7377f9fcda2f09b18a5890806889d537880d3b0adc49f7e9af55f693b8215143659545b85b06b106758ad805badfc";
+ sha512 = "c3b52dc3eb427e24e2566c383f8acc1119f6f6db5447ff6aeffccd65c97f370532252aca2bfc7bc83ae1c98824c8ee9e39b76a50ab3b5849669621ca9446e136";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/az/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/az/firefox-74.0b7.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha512 = "bf54af8891f8519daa6b8c3b99b4d0fe9b93c3b2a2108f4e2a3f5b3287680e127bc8246558fa58b5380ba19e1f924d6a15b130a1ccd07dd9c2b9b0c28d455f3b";
+ sha512 = "7d61d36d5dddb26de5face1f53aa74104b3a451eed26a194d4918cfd5e1c8983007b2ec37c60327d1c733b6595521c88d327a2b71e3e237b0ba2b52f06d6c659";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/be/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/be/firefox-74.0b7.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "452e4d3ce27ea806f3e7e1055a0e91e2c4e337fae7544323dd2c967861470c46907cbd1bb5e154bb3f7b605e5b9355f1a0b57988d77667fa7597f88917ff1af1";
+ sha512 = "233258a22818b7a3b6726dfa3fa8d3e702d3ee28440ff987676472e8b865bc23907adab61ce994648617a9e83fd530afce567f77536c3fcdb7434c9d1663ca5c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/bg/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/bg/firefox-74.0b7.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "bd4fad19039b3442f8db7f8cf6709686fe1ac64e7789f5e4c61fbe94b02fd2c14059633c1268358e809aaa2759278a10056457eb0625a8f6a8341c0c493be37b";
+ sha512 = "8a5170979d50e1e2546fbad96dcba9d5fbc1618b4c6faf770c417e44308dd22ee0aa27a5b18f5f073f7b555f064744c4b1b627e6648afc2c5a120093c747682c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/bn/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/bn/firefox-74.0b7.tar.bz2";
locale = "bn";
arch = "linux-i686";
- sha512 = "f0351ea913dc78c1df1015303a0587b6e68789e07611f220f3c1816366537cb0777783df8bbe4ee3c317053886314c2bd8d8c1ba2af27f222930d4d48e9c570c";
+ sha512 = "76a3a07092cf6d921b94031a2b3baa8e7d356df3b49dfa9e0d7310c87f020236d7b8525532e26a77156a465bc70bdc477f285223e4f3adba81dab63165023951";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/br/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/br/firefox-74.0b7.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "4fb87b89c2d7b1961463e554ed1123d03a65994cddcc23a9c0cdc35fd913ac42b58a51ee1e2650645748ddfb22cfbc54813c8e18432b9eb106d701d495bf6b7c";
+ sha512 = "b64af8927deeda0460144e05ef1c8bf8eae4fa3932fdf8f1e0d23a9df417296e7e195946b2d5090c8986af0b5561a26a3098cd0b01b4dd1353ac8b55a192ae8a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/bs/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/bs/firefox-74.0b7.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha512 = "85e2f335c8be9378f76f89a97aa70fe968e522ee82e0741b6927b8dc26cfcbe30e2da538d72f1edab559372611c55508672a29f8bfe367eaabf3032d1a691250";
+ sha512 = "ec02811bdc0ee960fa05e676a1d5d92dac953e8db66919d2e1f2ec1f4ef426438b242bf34e0e1fe10d7735605e17da0efbc5b50a7caea2827cd41d0f2cc22e3d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ca-valencia/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ca-valencia/firefox-74.0b7.tar.bz2";
locale = "ca-valencia";
arch = "linux-i686";
- sha512 = "d2a85f873ba9a9b993c36d1369dae29482a109bf0ace3c2f153b2580fd8bb6481c8c21b5be21065abb72376e5c932af0f24a383737aef4f2b4854106254242dc";
+ sha512 = "5d2191d153d02525a50667faf39f8454da9fd87154e205fc00d085bd2e8ffb4216f5b08716ef6464e0788ea100f4241bfe2d746f57a503e9098929fb5674f286";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ca/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ca/firefox-74.0b7.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "2e9c9d0be0f31ccc115d994c08c5261ddd4b171b0ad9dc3ded6f5e0e0b3a3cfc0c3404462507dc41b57915b3e5e3f99fc580a216ebf914fc9077da56010f62ce";
+ sha512 = "74ff21b0633a76c726bb3de02d6f148083e72e1db622ddf8f188e5181bff9808475db7d7f94a0384f6b17682ef74b0f531c1e00aed2ac572f5690ebf5cb8c6cf";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/cak/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/cak/firefox-74.0b7.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha512 = "e24b214e626c9c3dc7e508069c7f164bdecc02c7adc53e91a894cad8c9be75f52ea0a0247eb531584d431b0daca0c0fc9fcf8ef41b44f1a3dda4f58f0a4057fc";
+ sha512 = "3a303ff95a0ac27ed0c8b4993b858305e36c95d69e144af2b7ac9eb08de5527739f37c97f7cc762094ec9b68f86a2a676b1c59768b447ca95cb4f7674e86e579";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/cs/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/cs/firefox-74.0b7.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "fc993a9b4196ce08cce40cb76c289a47ce5f6626df96d383ecc086f7485a8a9d4720f7c55eaa1bb11fc7a0fa7a891ad685b8cf6f53b60825e73e0f7299e08dcf";
+ sha512 = "15e5a4c4c6a81c3c23ddca3deb09766c22525681075e3f488b0e4bf9c2dac5fdeb859aa41522d76eac5ae342b7cf9b962968d186bd86d1a5d942ba554bb7980a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/cy/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/cy/firefox-74.0b7.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "a031707aa831719b7fa6d00c5ee03108c8e5b2989de7eda9518f84aef863d84f9785b6fa0a9d55d686b4b732c7dabcc00d39db2a0853c5691e96d10b7a288475";
+ sha512 = "3d8b06c9cbd823c331184c5372748881d91b6673f2bcb2c201bd052ca7bc6db36f502fb5b6d8b5880df34574ca860fee32f675c32157c9cc2fd022f1bb420672";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/da/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/da/firefox-74.0b7.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "fb9669674d6ff3100e2b459e82de810fd3ef2da4c8969a50b51e3b185e3b4dfcd4264fc58a4589fcf89c81ec7c7af8a92e241a5193a394fb36d8b039dad72bce";
+ sha512 = "8bf4415f1c2402767a7d7cb30fb32f5f7f3ebe8131790c4bc5d8520447b4970a4e55b7b102e532bb24ed8ca431027f7d407932cae0ea7b06f23415854910c677";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/de/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/de/firefox-74.0b7.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "bbd5d9d4279e7f72470c39aaf0f6f858caadf19bb12cbe19624b4fa25775210999ebf64805d4e15ed7494917bffb3e352d0099059e2cf76b5b0afeff0a732060";
+ sha512 = "8163578f08c87792a890c52fb1b7a5af1ed16b7065013593d72e7af6b8321467b2230eb5537e5443bf86c8a4eafd47710a9181e4fb3c22f5039dc40fd2f9fa84";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/dsb/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/dsb/firefox-74.0b7.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "8d44af7c18cf9de5dadde8ba482509dd33b201a66a61126d3f0717a550d0fe85543edf08049288eabc678ed859e2123f5234e325a6d69d4138ccbc6676e19d93";
+ sha512 = "3c7fe1cd45fa52f5d0f385c2549f4b146291fafd8828ed4a5e68f8b79c5163ca81f052149222f80c48246da45bfc0ec35769dedccb4b3af66a1b35b983007ee1";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/el/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/el/firefox-74.0b7.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "b26a3b664d1f2b0735a8518a25eefac1ba71e0959f91a90cd638c27299a3690c595a912331c7d62039df6f5a238c50e57af5897cc89f4eba8043c60eea47b9bb";
+ sha512 = "a5319e5daaa3721e6b47fd7b338acb1ccc6f9f316d127d4fc83fe5be13411e68b0fa597f5ab5f44a290eeb848fd58b5db28fa25749ca4a8180cd32e765bcfbd8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/en-CA/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/en-CA/firefox-74.0b7.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha512 = "9ae79724ddc932755b293ae359ac15537128c9d7b0b4b0719cc34f7e4cbdddc49cd89dbde2d445fd7971904e7825c6e5e55cdf6d95ead6057cf5900c14dbefbb";
+ sha512 = "bb9a61e88c9d847fb579b35e4fd603c7d1b18114de00b155cd7816bb72f4bfbb3f5988703f2c2333446fb9e0092c0656c5d6cddc41f84a0c004fce9f057787b9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/en-GB/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/en-GB/firefox-74.0b7.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "c97e6b95482106d30efbf322c20db52c0a6021ff90af87b54e8f03997bc01f0033ea6ddad221e19d38b89344d4311d3bd576bff1568c865bade2348a4873b87f";
+ sha512 = "6e2afbf7ca225ce980928931073be020e9c4421d8780449a8ce5d46e3e1cd122d5be813054b2abf57c9e5f8f680ae1dc05ea733336e7e9479c3b04116a119f51";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/en-US/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/en-US/firefox-74.0b7.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "102419fc53525643cd208fce53474c4d8f936527a027c7f16e41c5b87c8fac6c62e8c3d848fa0355db6eb8b2cae71fedd9206ef414213caf7e08ddc1f36cb8d6";
+ sha512 = "d0a72bac65daf49aba93e84c781830fb4f6fa365d8e5aa23571aa52fb0f0058465afe7b84b40330d6e5abd8403ca075fc787343af724664ce1d328a0d7523864";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/eo/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/eo/firefox-74.0b7.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha512 = "b03765ca142f26db991fa5412246add6987a5f3ed92ad6f554a7c3367107a6f1a5c6daa1c80504dd5fdb3347bb0efb23f0266e8e60327310c8e41821fa0ab56d";
+ sha512 = "3ccb3970b2623a31e741d7c88aa2e5f3c71bdca83ffded16508939fe9d2ed431b2b83d09deb00e2d5fadb0915b8d17c8a7e1073f5585167c28bbe41c9e03d94d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/es-AR/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/es-AR/firefox-74.0b7.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "a71e4c912ffff9cefad99a01105cb911389e0cd89ecf0b0e70531d5993ca7630246023a82c6f4fd480c121c419d9826e633d8310a4e9669f4eaf55c9728d2145";
+ sha512 = "c59405042b68ef5f7e50428700440972c082436950d03e2988ff2187c28767d709ac4a4cda71241c3c2f619db2f9e5cad38e3c9631300fa86ada966d6659015c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/es-CL/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/es-CL/firefox-74.0b7.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha512 = "8ef11a37acd621741cb3a84b7250d9aeb03bb45ef7f2cb2763493aa4e3b884c9dfc987ecf9347de6be8322e376ccc4f1d34b06e0d8107d3e338d484951e8daa8";
+ sha512 = "12666d98f08d3de2385d47e6b864c548c9dbc95dc34a1dc52b2a893650859bd383586e7870cceb591471e3e9edb47027198896971e29d2e5eff4ec3bbab978f7";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/es-ES/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/es-ES/firefox-74.0b7.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "73d69ab48824449ef4d63d65c9f09ecd3f890b67514bafaa5061ba77de2ec05f4b59dad32c4b4ecb50cdf5289117949ed5a3bb3d7dc8a9f26abc7fd3ed452ac2";
+ sha512 = "0af2573f041b1b7e4fa8b1698c221e986bf83389966f5937b66d13e68a544fb366871e1a5316b675a5af00db9992478b00a1569953c194754dd6bb449bda4da3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/es-MX/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/es-MX/firefox-74.0b7.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha512 = "21bc857470880094695085b310aeb990fda5d4c9e46bd60db9511ce2cac486dba71cae6dc7b5130e8390cf5be0712ee4122946bbf01e87580c01215d17aac74a";
+ sha512 = "6eaa4cb7db3d5c129853a8457eff48fc619c8da16127bb4158633f001a8459578550f9feb3883bf1590857dd9ecfc99666372306ff86d6275d66523d2ea7f590";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/et/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/et/firefox-74.0b7.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "f894998a24814b22e40fda5b0a0d3ca123fc7a9d311f3534ca7daef3ab113307aa94b1a1959b2669affe995e9d646ca46b40334b893c24c81f13a49b58111dbe";
+ sha512 = "fb0fcef92df95bf3d9be3ff49a87bee5e98d123008d07455557fe2f282ca53a3763103ffcde2d63c395c45ffc24e994b4d182dc6b72f78118ed972ce007f5405";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/eu/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/eu/firefox-74.0b7.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "53e4e213a524b481835679b33362434b3a0f7cc128a82e30bec4f25fe38b1a0ecf4f8784307d64c63eb7cfc533b8047a8df2f59f04fcd7bc4d49c2a187621f44";
+ sha512 = "63528ff70397a343c23660b6e281924056c3d15581f9d090b1f546422074bbc4727732c763d03670bee0d7e58dcfc5753418a885b10a36b09c11c1ab3b55a643";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/fa/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/fa/firefox-74.0b7.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha512 = "2d43a2c3d4971734ed4b02426bee301e792a801e0c707e75e54d3819e4f6131d3b9b01c16d392a685c90cf67a7b7fe9338eb387375d3435e5a4fb990279f6ce9";
+ sha512 = "1a5416eb730a81ace3675542f7c870f1c0b083a86dfadc7b027244caa283a29486175c6a2cf1ffac3ed8d2e0a1600dad1e2d63216a91c6322164308cd1e590ce";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ff/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ff/firefox-74.0b7.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha512 = "fbeaa892ec89272bb5ecd07186bd85f216d937734517694745f7e5af2b3b7f28dd1793cedbe137595141948e499703653942387e2608574b2235722cb7921390";
+ sha512 = "29017cf396ad93e5c9ed098ee6324a0a49183965c1983935187d3de644cd3522c2fec34b61d12b4527d4cff307e0f2945b616711ac5ebfddaa982ec3467697e6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/fi/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/fi/firefox-74.0b7.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "62c2db72d523ca7b4b289fbe3339b5a9b92f4b4e363fe1f74eae9cb2b1d02366549e0aee786915e6cc054209bdb067916975ac676b8d89968c0fd343f981917a";
+ sha512 = "653ec6123b84002602413e89c152d6cb406be55d9a9fa5ff72839c0b90d3bf1a87a32d2e113ae907721f53f85397621d7a06bf3e38a32bc274b89bf1a7487e98";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/fr/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/fr/firefox-74.0b7.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "d396922106139cb72d21c69b42af8ad4467ddf5123b32dd11f6d25ef3d0bbab178e8ebb4ef7b5aaee3eff2ea8cd5b3d212e2f39897931d8c7d2604c6fff6650e";
+ sha512 = "7845a7c8c1e9f844e4f01414bd52f172bf397c6eb8bfa0033c0216c30f8c14ff7ccc5a213428d187f571e8fc4ff393dbe37180510da4a1b4154f63b2a4285e55";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/fy-NL/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/fy-NL/firefox-74.0b7.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "45821498e7678ba6b39e738ba24378366c91641d264159abb64df86bfc2286ff614946d1985f520d92be20bfcf378e7efa5caf2448e079b45ac282af78b0594c";
+ sha512 = "9cd9f134c4ce2b5d465c608f211acb45f50d9d3a0c200e9080fbbeba13f25f5faed6b6baa1a9149f88b3806f4027e72866e004e3934d0331f10e25673fb213cb";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ga-IE/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ga-IE/firefox-74.0b7.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "175c93f81607ad3c8372de5d923b743b4ce1c44e1c515754be95df47497e9d2cc7eeacd43544a7a21a126384bf0a7df735370c5bff8c51dc6707bd9620671e97";
+ sha512 = "2a75c341c77530075d8598efef163f245040c602a62380fa0792b32c746e455ffd2a1220fecdf321db665cb6ac0d1d7963a7750e733ca59f1c413449ec1df9e8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/gd/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/gd/firefox-74.0b7.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "d9fbadde30e1a68838050fc27b9f737aedcb231c2b5116124f21c4cb9b8463dabcac437d6a6bd36463fce5626bf599eb28561d80cc438b6ba62dec50bd218fbc";
+ sha512 = "5bed7e36547adcfed70f68ffe5112029e5a03dd900f9f35efb7ac2d5c9e18e051bb26000ae9b157f9d2855db701122fdec826944e1ced7a67d78d257801c17e9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/gl/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/gl/firefox-74.0b7.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "56330fc2edf51ecf1f2f2d5e6b7eeaaf86e8ba37a0991d8ea29d33ea427e3e558eed0986c178bf686ef1de80536535502e06c42484859120c97358e9b03b94d8";
+ sha512 = "fa5c6453ba164c5c14c33bcdba3defe56bc19df2494a26f4666477d950606f69e69fe2d3d162b9dea506308b28b8728e0cfd31c343b0b1ffcd164c2f580246b8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/gn/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/gn/firefox-74.0b7.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha512 = "19aba8b00edca670e9e98d01305b76d2ffe58bea4fcc6d8a0b5566f630ffa02ed8008774235bf78b1729fbf0b43a5e85b45bfe53574b53336eae04a8ec7a563f";
+ sha512 = "29a584ba3ec860fb44b06bad43fa9ef02cabf5bb14ae65e54f732d195af11b9acd3dcca5be7939b3790126cdd4882109a645dd31cb0da41e8469f81edcc87b99";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/gu-IN/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/gu-IN/firefox-74.0b7.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha512 = "3715355921ee26120f8ebff18a55448742b33bc8db055194a0ec6825f0eabc0244b7646bb53af9e908454a4c8c179cf39450ad6eabf25aa4a9d1f04c03e95cc3";
+ sha512 = "553942bf2da825b5173b4076b534db357a56f180e77663c132cb1392a678ab2d42d532d073aa99c0de40e0f0ebb622d321c01fc0f2f20d2ec6ba426588219955";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/he/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/he/firefox-74.0b7.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "855277b384edc288f1c17f54b228b2886b4376b1170ebe04d7df63cf681d8efa0bb1859ba9c2e8bfd9488204041c022977e570d65455cc309ace211c8d20e723";
+ sha512 = "7dcdb7443875614d0ef9820390c672b324a4742c4b3f50bcf0b42caaadd5c113777ae684406f5a5beed975c81d12e9d2df4e0211e4187dafe2cad351d23d5140";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/hi-IN/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/hi-IN/firefox-74.0b7.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha512 = "ba9c5c50b2663684e1547ac9b940bda4b667ca7240fc406f9adb66b9e750565090bf2cf5f3e238fa755f67631bf5f06c0b0bdc77aab086c0d50bfb6819e60bc1";
+ sha512 = "2267a22af52773bbd793ec9591ac0fe42db52b61d396a040bf2583ca58c8a97a651dac26922335aa35c830523f4d0074568d45c5e74c4aef7b541d0a76a08189";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/hr/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/hr/firefox-74.0b7.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "9013f01047bf4f455fe6a100af62fd02bd700d97839049173e9e5256ff7747d78b3e9485d72c3474b0e1361e833f185d58267accec965c1e6e272b45a9fd87c3";
+ sha512 = "8b0cdf350f423fd695b291296a345cf8d5b194d0a762f99b6d0d066b723f9e374ea40f93e08657c9e6ca8d824ca6a5465c7fc935688c1c859a6c783a1b409cea";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/hsb/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/hsb/firefox-74.0b7.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "e593d1e791bc957959271117b86a726fb402073eddd8a4048204adae73c491108e75f90b8cb757893bc3c9292fb372ba97c7151c5216de3416a7a994a05ca310";
+ sha512 = "214d1b272b9d1c6aeae23c221ed76b0966e0d9d2b9c52f53b65f3eac6727e4d9e840f427ff62f37fb8a1103f2a81c2baff18f5f9ca6e3b776ccf00127a2796ed";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/hu/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/hu/firefox-74.0b7.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "b147ca817d4b30cb1935d086873f0d3885538cb4ea6036d98b6374fc67f8bcdeaa9762a6b60c650617cadbf9b232f308ddac90383f6ce5f9da426641ca44e5c4";
+ sha512 = "37f1f312899525e83103062d1d51074303459ba845570781b0ed34702cff5779329615cb38846db9728f8ae242ead2c7ce7dc8207e8dfb8419c1f9146570f4b5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/hy-AM/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/hy-AM/firefox-74.0b7.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "6c6d317967b18198fc0ad380356b9ee1a686097e7fa9de0a7698e3afdf49b3a0699fa4bb53d0559f7e815cf5c4c31aeffae4c93f4387b3a0dec26d0a7324a2d0";
+ sha512 = "64fd466a0d9d6e32cfda8a320f189f40bd8426c41e5401097936d1bc92cd760ea8ed2dd86366a914311a7994d904e55ef7310433cb91b7edfbb3b3a5248005b0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ia/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ia/firefox-74.0b7.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha512 = "406c28af9096c3cfa1c4c235d5d8a380d0d33e56a34aeb3367bbece314faa35b342ff765c070f170d0ab3e5dbef6f82d0cf7fae16f67a4519c11abc2ed53535b";
+ sha512 = "e13b02893891cae774fba02de7d2f15d57d0912f3985d2d5ec2d4c9299f54cdd0fb7d0f75a2e1643ff2be4e85944ab71df822b3dfa4e189b7728d4f97cbe3dd0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/id/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/id/firefox-74.0b7.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "18febb0b70cec71b4dd16a30267184c61f770d2bcd341b97ef9d97fa0f08648d8dcbad8826993c783437c848caa56a80fe87eb63eb327d3bd4944a4d2cbbbc3f";
+ sha512 = "1aa455734b272e4b1d31c8c252604fd9d8a37def3fa6085cf6927815a661344c22d2b100c1c155b508d1b2a809dcaa68ba1090020a852699756c7f494ac1980b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/is/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/is/firefox-74.0b7.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "40fdc20ff3ef9e140366fe361ac232b0810cf44d0ae1fe99e3aa820859a5c4d79a32ed7f38a4f0a5b8b16d9887012345ef25fa38cb28516386ebf8ddfa0cef64";
+ sha512 = "60a50ea36dfb707ce877074fd68ca8fe95d9367f57350e35af9a252c1235a34b05f4d8ec2d76daa2f4bdc1026086924c53ea1f75d130286a124425b3d6dc603b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/it/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/it/firefox-74.0b7.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "4b21d5c247705f3109b8183c937c87e77424d4dd1f9dd6a5cc7c86f53efe06d756db7a9f569cecfb985e8910dd37217c6fb7a5a6cad7146430b26a4d507118b5";
+ sha512 = "6d6119b936c957d54bc4c5dfcd2df3ee42543024a89e48ec5cb08645d7b7ce9f53a8437a92afcd2c4cf4395724324599f9bde922fd0c88e6ccd2ed76a1141359";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ja/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ja/firefox-74.0b7.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "9c48ffa427ffff6eece2f58c327804c5a8e305673ecb8c56e54e5bc0a25a42e72367fa34110ee7492502c6c62e9938fd1a42d64cc152bf77d4992c2c2da1e684";
+ sha512 = "8f76e03d072e9d6c4bf9b6fda4425f29f4645e089886d8ed9a648ea82a7a602ee6296ff7c5c0e505195bbf9e051d758095d23c622cdb5b606a285b550b3b0488";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ka/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ka/firefox-74.0b7.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha512 = "07a6017a3f5790e6a611d471d3b1695dfa5a454b5d6f9bd951c8cb57041c7b161089e2de72d0293767b552a74fd72ec5cd6c3e30e8cca25dd2f9c17c9fbb6e2d";
+ sha512 = "f173d6bd7ced596da30f9c76366d1caec34548e08d676286bdacb1ae336f01174b391588eba9b725f25079271d9e8378f5248ab9896532dbe395f925912f1f56";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/kab/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/kab/firefox-74.0b7.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "309959ec518f581e8a231592cc3e2549a96692420f30048861c165b9ece41f396bd793b030a4f3825a65f54a0a7812e34cbfa03f68ac1294a5cb3a0b40dbcc7b";
+ sha512 = "ae1633a7dc1ef1120f5922ac237020d54e1e3783f339948394d3811e87baff35a8fbfbc17fe1efd7b0c5ee0ef5fbd4b28f9ca734a3cf03e6c19255ae5ad9d2eb";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/kk/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/kk/firefox-74.0b7.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "20387e41e2b539b2ed5cc1302cfc5643f77ecc87b14b8642e56958b5abf06de32bd1d5552a31375b25f07f66fcc481dc13a907e3027e0b9a6a804fa05ed36810";
+ sha512 = "6389efbbb824b59a1817fff041b3529a1466b310b8b93229b2d8cacaf6b009210ceef136b579c154b232cd0b756e13676487fc8018a00ab22ba800eefb183e55";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/km/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/km/firefox-74.0b7.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha512 = "b6cc0dd8e364c785978997a2becc439999fa2c9654fc8522faa079483ebf4fc85ff66371cce67cbdcc0555e5bf6972b2a817aff7f7be1c71f13d4ab56797f93a";
+ sha512 = "e57271974dac3818ad52838fc9db0e486eff210ce85a74ccad57a76072aae7a7eb46fb88b8080473098619279c515122a22d986b38c53c34b5cb6d80303f2220";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/kn/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/kn/firefox-74.0b7.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha512 = "a623bb91f11ae69ac21a5ca6c9e8ddb1dba12157318c7947e11271f9cb29ab4a5a370b71c80377d71a6dc5f3fb5fa1e95b80dd740f2ca0f265f162ab13d8ad55";
+ sha512 = "49d5f860bba705238eebe7f94dc2efba3f05c69f3c1813a27479e514031ffc1f6ff0e1c6316424bd73f2c750f5bfceb07212486122c5b3575ffa7930690cf214";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ko/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ko/firefox-74.0b7.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "2278a542e53e84c8cf896d38865eff81c86e9b2964e35eb917b3c51b0939cdf4646451a9daf8337952954611941a46094ce7ccee39495356e88c247b0ce950f5";
+ sha512 = "47f90c68de6663bd0ae774cda94c2a0a85a92e743834c74f667049f18faa4836e403da8abcbe04b8dfb5f12f6518925e672967fe23754dd045e37a26a3d8d285";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/lij/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/lij/firefox-74.0b7.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha512 = "61f3719dea99c3bfa5ac2acf2a7b9d1dabe886c17475c68a2db0013a3f6328d7d281712dfc804fddc851585732cf3bf76c7f53a43d3a7412f3d581578f5aa785";
+ sha512 = "5ccb1acea6a156d972854b6396a1a6d3c7d8bfc297113fd8354f9062d954bdebd5c0566ae4886453fdc4aca27dd3e1732c0d45d91d859fdcfda230f50e1bf826";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/lt/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/lt/firefox-74.0b7.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "3a14e219ff56c24cd0f418992ebdc813c63c53e22c79317a4369642ab4aaea2d071149613570d71e2e88c3791e8b4e111511347473827329d460bb090ffdc230";
+ sha512 = "1a877afa01166cf14116633aaf2d3fe3112c0adf5e45272bc71de9b6c56343da0c1c87a459529a318262cd80e5d0d3a436f92b79ec4cc5b92329dcc15fe11871";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/lv/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/lv/firefox-74.0b7.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha512 = "35a3cbd4b28eb7104f7b87dc8db31825fd941da28d9888c7cbffee753a08d2364882a0844ef671dd78ff1e9d5b7a63dd76f6b8b92d72afaa572fada385835b92";
+ sha512 = "37403fcda86c796c082941e8e8e14b621c0de2a7080b413b7868b79ebc0fa5ae6069a8127739a7d271de109e7a9fc8f7562fa5d342b03926f05e247d7d5299da";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/mk/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/mk/firefox-74.0b7.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha512 = "8d8022c243f4bca2c6d2b9a14b503aa7391dc160cc7f2841f95aa61e168a6676a0510ff9d798f8f582ab75847ab616599393c7ad5643aad70bab2be1fe810e5d";
+ sha512 = "f87d35121c20aaccb8b344940d86114f3ba34878f9cba2c5031e10e54d29e7fc548ef1a58882cd5e8bcb97b170760581e6df787ba1ad05960d61c5f67e6aa878";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/mr/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/mr/firefox-74.0b7.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha512 = "845ac2db77e84c1cac13eb240a7ea2fc73a2dc442df8ec078699b2e7aa6bb36d218adeaba493273caeed9b476c0a1550046dce6371404c25154747f1d4457f99";
+ sha512 = "07b5750823b4973c494b9b4f9c76d4269097489c7362630fb59eb995b12a58f3b69dc9931d802f40f3109e939ffa026402455afd57e487225564169cb14a198c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ms/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ms/firefox-74.0b7.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "87cdc7b6a1fd42808cc06b5931530b4cae06ad6497c3abf33f5b4569a500a7c294c0c8aff95c74e3441cd25b8a8a47f64d9563cd95430d22f5d65f0296cd8984";
+ sha512 = "c13597c3dceab6935def4c629b24a52fce3ff3406fc3fea395c68444993cd2d9ac25a10647a2d4818db49faa36a69faff61e5b648886b4c662caaf69e435158b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/my/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/my/firefox-74.0b7.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha512 = "57f6b0c7b01feef4a0ba078e45c37e6f1a2e1e6af59bb117cffa63341125ac99e7dde105110e42c0c4940b9688e66d1814656dc018464a5b9f23ca6c56d6d6df";
+ sha512 = "1dd123936837ef7d806449df7458ee0879d3da33d16824587e55830a88f5c52dac9c66d4d4678e9cad35ea1456ccc6a9f282caf3e6b8888145729123aad33556";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/nb-NO/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/nb-NO/firefox-74.0b7.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "c0013df0b0166749e1eba8e26023393d1f26ca764d430aed1f00d9afa47d2f89148f401e902a58227c73059a7de6ed59d16ecb6ff09b3caa018c26ad0639af8d";
+ sha512 = "b9c4ddcc16a8403f82f1b2c9bbf390fdd94efbcf442a9010b8a127193826cd4c21258edadbb887dabe5cc5aa642842e371be01cc3fffd353ecf3c2815a2dee2e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ne-NP/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ne-NP/firefox-74.0b7.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha512 = "c1d90ba6a63316b7c7aab6728cccdbc3fbc2101b5b6e07a7a18b23e87fb14340b03c00cfc2485ef2148147786c1dae51c1526f6e6d6b163246ccfd394f1947d5";
+ sha512 = "1bdd91de19876c54223c43543b73df2d9c37d27a8986544d48707810f12657626c2491ba09313c0fc51733232c4b5008e0236148feecc415b9d3bcb52b126536";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/nl/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/nl/firefox-74.0b7.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "eb99fe6fa16f5d94da7cd018cd771e91b99029b4335b4548eaef3515ebece162e41fd212f7ae21f66d545dbab150224811c6030608e4f4d59f96812a065483cb";
+ sha512 = "6cfd830592b5342b18a0c0382b33be36fa060df7fa8892ae6aba2b7dac37f2578108491e2eeddeab73546336c354ef0456206c37be4638942ad28124c14a7792";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/nn-NO/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/nn-NO/firefox-74.0b7.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "db55a9343d1cfda37c15010ff844f8a4e4f75e89c7fae1074e36f371c0baf6d409e2e13fcba8ce14af1c70b973e80c3f7137bfcf13dff79f9cdce021caa098af";
+ sha512 = "b092affa3674da00ead882e26b27fe61d3719b69ac0ceb5ece2e88225c26d78c066a47ddb642e539a77f01263ba85f503b7dbfe1bad0529f1cb68275cfef6ef4";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/oc/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/oc/firefox-74.0b7.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha512 = "22dbbd932dfa8a8d15fd368f8119e4772e36351047acfbb1bebe722011ed7a8b65457fd5cd10a585fb6b58dff5941e9f6e528fa7507dbf8937094eef42a4b061";
+ sha512 = "44971c64acd96da8c144671c82be145ec46118f0f38bde69580c83d2e7a6b6f0d6bb1a9b6f21cd2e84b70725aea9c388ca2b4d6545061bd4a4f9f4f5eaf2d929";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/pa-IN/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/pa-IN/firefox-74.0b7.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "c4ee5d90be98a344bb2c366e7893e63b46f23ede940a66d8361dfff17753ccf526578e4d8d99ffbd289a2fa72e939350b0b6097e1a1153ac6cf18a1711027ed5";
+ sha512 = "0583f4b15cce5c1c4fe70d0f9c9d446035510c158fee6da27a135b9efaeac7007177b4ded5983c8130f1d1e9c377990545318f5955a99737426424dad50e448a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/pl/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/pl/firefox-74.0b7.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "451c60d012244939f40c6f5e1a7860a00ec50c4f36cc797222fa8d112c89370dc4714d5ee89b918bdf1479eed08e0cec0573b4aa34b0c4b7c0f691d7c5997e0b";
+ sha512 = "75046f40fe1dd1950091f61e487c6b8c9f424db14f05872c528e602fdac0a0f00ff147194f953fae941cb3bb93b75367c7434c1db95d8a31e7961278fa820a27";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/pt-BR/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/pt-BR/firefox-74.0b7.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "6d494f8befe9652f1f088223805e28bbae891f47735a04b6b547a2a0fd436025fb2fc324215da31f9ea18ff93b3e5125c63daf3dc7b808627255e1e0db03fdb4";
+ sha512 = "25df8753b7363b4cfca6882fbd1941e8d4b532708f17ff7299f685c9ea2d15df61b12bd0ad293daa80e6b184d53ef2e36aafcbb4b2a7cd5b976bf81700d4c68a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/pt-PT/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/pt-PT/firefox-74.0b7.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "0b1e87ab692e628472fe5b13b673e3c19f67563dbd0c27d43376d3821203067816223acd561d22a0b4a75fdf9a357cd3838a9b81e31410512fcb0f62d647f6ae";
+ sha512 = "f06faae5ecf8c873c8fd2c1999adf23b8b08c1b782f33e929bc97630d4094a098324454c87af9321332ab39f8543013bd827f10299237dda8d7decfaf29fb59b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/rm/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/rm/firefox-74.0b7.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "0279e1f9adada4962a9c34648abf744e5c0519393411694a03eb33df04800a68814534a4f60205a64a7384f18ed8973a63954f1e83f7429ba11910d26543cc21";
+ sha512 = "9b026decebb2be032a7ebef1e5d7a18643bb3ebfd31baff4022d1fbed444edf93ba4db70c9df2f899de3d4f9c1fe8c0a218e0ec40015f0d46ee156c5181d1235";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ro/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ro/firefox-74.0b7.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "4b367c76863834e7551f9b75e9596203de328f0273587b34fa0a506ab3afe5c7b70860fa16f28bf93b51ae55f3d3206ecc84f79ed0519c9b9c8c4af67689b1a7";
+ sha512 = "6977c73f7207944ba646cc6593aefbc5b24b94d8e63b95508412967b6da6c5076e6875827789330bebd02c50b0f6b9a1d40dd49e3c079e614ee0e273cf2a8c59";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ru/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ru/firefox-74.0b7.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "674d878bd0073d92600c86e8c86e42d1bb336456996eb5e35d202dcf2207bb94a3c9bcfadb8e3b4be10ad4644658b9e75ee10d4a813b3e7693881a229f0a4542";
+ sha512 = "49c458fc0c307904c25e7d55dd1b4acf41020777ed559828cd01bf416585a1479c853909dbe29d2d90b1d52471f8628cabecbcd98918dad7eca7a0cf4096f1a7";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/si/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/si/firefox-74.0b7.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "d6b74e81a8d2bdc3cc109a02d402fa1f6496e0947c63262ec0fef8497b7509bb423a5488633b0aaa56bf9b002fd9a3ce0606df433589218f08d8b6dfd0b37ff5";
+ sha512 = "54078ba7d22c1a280347d18ed30dbef9079adac167e8b79f3bec686693acebcca90bad4ba8747d173fc762499bfbbb6bf8fd23906666ed005f568ae8c5683392";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/sk/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/sk/firefox-74.0b7.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "44518f7bebf255456dc609465832efb4073b4558d6eb98adfb147d80c533adf4d37adc4a9aad3989125cdd9b88644222b86e8d84b074f23ae978f6ae13763f9d";
+ sha512 = "47fc04108bdebcefa46cb366d071adcc45508609530bf02eddc65eb6d13b34ca223b2a9e552563b475c2f8dfeda58101ed8af21312170330bc8c48ae79427a35";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/sl/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/sl/firefox-74.0b7.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "5bc271ccd953b7fe1108e4b2cfa0e8f38b44c0d2daeca5642551976a6f713d3c666679e5af8a5547c9ceba9e3bee4b3b85be91339c414e0636e311a307c4d50d";
+ sha512 = "cba41a4178b971c136b3853d96568152a1583a00c9d859327e41dbdc278fa7bb31b2bde537551bbc5549c2d506cc09871bc53aa3da486018210b0f86634b3865";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/son/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/son/firefox-74.0b7.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha512 = "97c2634291d7754ca63ea70cf726f3af649d5f1456663af8b4897fdb22486e2b3f0468c86d41b0df4924dd5ef1fdc5ee38cf6e14a0301ee466334617e2d5f779";
+ sha512 = "2a4fbdec227edeb83448ea9575b991b574e467d2e2ff14d75f000a1d912d3bac6cb6caa6cb7fa3c61236d2729decfa5f0aa9f0e756e503dcde076bc095ffb786";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/sq/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/sq/firefox-74.0b7.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "fba81f43e1a27e85e6fb4746c7c86825edb66a44d60e4655afe85ebed7df4e0862c9c0afb24d2e6b232a651d607f1ec31b1655a3a6770b01e7456a31898b323c";
+ sha512 = "c0743b88f8c33e8bfa934f0b63eb67a9ea55489b01167e5bdde91362f7217375d2e2834eccce5a7e61543ae81fbc45c296a7fa31126f61cd0f2dd8b04c807df4";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/sr/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/sr/firefox-74.0b7.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "29629f3fe03bbcd26794d7e7d3ece4e727bde980abb4eed3dc42e76c8f8c84b65a28a5a7ebba698fe85c6672bc818b1172cfad7e8a61e004b21898feaa8a7b9d";
+ sha512 = "20faa1be8b168ca94c8c4a8a22c4ebb3f1aa3555358b0d8ae765a13ff5a185a7c16ed8bd9f9f1e137cd02cd3f5119acf912649e46d84a180e285c4f5f9b25f0d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/sv-SE/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/sv-SE/firefox-74.0b7.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "c6b2aad865fcae6f376fb6feac993157981e8fb3eb43e406be0835db884206d2a031afc19dad089549d8680b9612bb0a0d8370a45b09abf97a9eeb19321fa081";
+ sha512 = "cf272cbb87e59751eb5f24c1d07b1a5926aef006d6c199b58c3cd90f853b9ebc78d11d03a2c7600c0cfefd07499c0946f26465e22c29cf69b74f6e0c8474a15e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ta/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ta/firefox-74.0b7.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha512 = "b37ab878c001880f7e4f066017c62d6c0bc87ab57fa953a466b9043f10f3a0d89bb692440b8f8a374c4af52ccd3b4faaf42b78b297e310bbc4845f0b5986f65a";
+ sha512 = "8ea559be2b493eb925dcb01dc5091b7bf776ce7af47fc95dbc33e1e1038ddd5bbe31c85c19e616746e1c6fbac42f4476bd1f2b62df03850a144bfa880ac6c27b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/te/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/te/firefox-74.0b7.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha512 = "77ded17897c73b1ad654b96edba79dee11e156154c4190974279b433fdfa4928ddf9c8907095a5741a559f70d82323d13339a74c3e940c2b9a293bcbba9775c6";
+ sha512 = "10190b94faac8db9385119b21d8fa46b930eca4a4371dc53415995d132430a9aa83d7e6af4d406d96a831b4318ff160be1f301d7f91b02a082d90285f03b6ef0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/th/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/th/firefox-74.0b7.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha512 = "79d114ca86c4c4419575cff9062658864e7feac2139b17c5784a2793ff519645ab11b6dd45035bf6fbb46c8eb5769c860ea86ec9e22a55084ffa2e29f8c7d854";
+ sha512 = "b95d95ce5bb0f42502aa88d24884a14f84af84133ab0702cc84c0c8c2e3b4ca1471133da971e85aee81f5979d99af575712366fe38f470e030275f73071c20f2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/tl/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/tl/firefox-74.0b7.tar.bz2";
locale = "tl";
arch = "linux-i686";
- sha512 = "4fd86a16bae99cb84fbe66e8a16b20c7eaef65933ad5476f6169f670644bd972532b02e4cfe3decbb5ab0c1bb12e93fade15465657e24820cc76c433ea16513e";
+ sha512 = "149891af8ad8016d33e7db3144a9c5167be895cd7bb098972a51f35a5f4f97ae03fb3349c7d0c2222217d7f133d483344a3a4796c1be89402f8843cd7cfa5cf4";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/tr/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/tr/firefox-74.0b7.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "2195cdcb9335b878d4e9d19505fb10f8d4bce375434ce0c8e5f57615ce00065fb2ff060fb26ce8fd64164bad534813504130d678044414ce43c80de3b239422a";
+ sha512 = "bb152289951ca25f42b227c8e851c5fc8cd6788d654d64478417760b4999e10103247ac21216ecdc6d4e3faa5e39bcb3ecd3b0f4c03cccb67ca546fa673de03f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/trs/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/trs/firefox-74.0b7.tar.bz2";
locale = "trs";
arch = "linux-i686";
- sha512 = "cf5368ae0a0952dd86897d6ddca528553e9638a40a6e0835bbbd4dbe2b9827be55a8456143e419a8123f69825c21490f1992626f659fb5764a8bc8696dc1242f";
+ sha512 = "f1f47c635364e7da15a80ed33bb2c0841dbaf2734bb24fc21b33967e909e1cd047496c1c30fa83d3ba11802e46eccadedac14b033705a66f542b3b084b9e729d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/uk/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/uk/firefox-74.0b7.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "bcacc5f07f9e06d6dbfcac985caa2137b42665844ed306628406f99531d513dd7f32b23928849561708cbd935843e03e63a0830599b6b9bcba856f5ef57ecf2c";
+ sha512 = "a5cae41b115e9ef41bc5f5bfe618dd7f317333083b83ec9c52a0a56e4962135cf3d644d136fb03b5b12d1e0609bb2c554cec87215a279ff42cd3b3a6b3a357a2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ur/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ur/firefox-74.0b7.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha512 = "49f74d806155a3b4f9e07b097d38ab455fd128c7438e6f02a9972e5dd4b630501fa04bdbd2e738bfc88728f60072cc8bb5c14835e2bc58ff6365635693c9a1ba";
+ sha512 = "077667c2264347c301c3744a0f65fa2546e2168b8aeadf13b8b86a251bbcc16b65d10d0e91aa9368a4aecd86abe3f2b6685b16bdf8e2bc1b9003bb41fb4f0ef2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/uz/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/uz/firefox-74.0b7.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha512 = "a24cb69911a2fa80c41776dae8d4292ccfe5c5950f48e4f97f5012cff7e85fb212ab5ce3f7323345378781c37ba46b10b384d11860ef6d58aa2d470dcd88429d";
+ sha512 = "6b4aa50c39d355f9a8d55d1bc58e07b17a72bbdcd5e9b45816dd00e7f45105bad90e1ea0d38990af8d7c481a45f7de4f164cda6db2b35f85b1b903f403211c16";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/vi/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/vi/firefox-74.0b7.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "d824495245722d80f796fc8f5e9e1a39dc87dff95c90e57eec5c46ca6de62e9a18f185d50b343a41383021d9c918f734c3167885e7f5584f54244c954b1ade9d";
+ sha512 = "a2e91a40f0ff57f800ba2ebb6a6f7bf355b2780acb4e72d759cd01d1ddec134d0f7e33852cee2e15c1382ca6f432d58a7ff653e1885b21b9657a85b9c52f11f7";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/xh/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/xh/firefox-74.0b7.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha512 = "31898ab796e3ae9221375a243fbb58d5fccb78024945c625e8b76631ee2c0408518029e35595b33de0f97ae9f47a63b7bc7f47277e2676d2c290da2db18229ae";
+ sha512 = "d86daca8654c7b3ba1687ad6be2f00f42fa66caaf6086339045323b2f1c7d127b07f3e7c6104147402ab4aaf9265610b4514d8e6f7c73c1698711aedf0800ad0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/zh-CN/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/zh-CN/firefox-74.0b7.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "a1477ac4728fdf7b395ab10cd27d3a595ece76e5f57bbf79e1d9cdc210a7fe52ad2648c0c34612169545ae5b06e341ec67eb8b0c3c8aee48ec81e531f5efafe4";
+ sha512 = "169e02a6bdc822547feea77359ac35932dade565c99d9b9cbff9d6d3a7a007b5dfe98d006f9b4b12d03e8fa0a96ba3fb2552c7c15196c5c269f07ae21fe9bd98";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/zh-TW/firefox-73.0b3.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/zh-TW/firefox-74.0b7.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "2ebf7a3b54940aefd36666450441ecf69ed62ecc43bd7ae5caf57da1f98242eaa8cba5d8ad017e42a481e7bdc4e30dba6ed259a3c65d123ee5615ab62d37500d";
+ sha512 = "3eb488a91dda4c3ab1b8eb421519e196da4bd78f66bc49716f1c743e961ef397f3d24cac2e30e7c21c8c898d8b96f84a34de8d0a0c85908a68fa8225978544b4";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox/fix-pa-context-connect-retval.patch b/pkgs/applications/networking/browsers/firefox/fix-pa-context-connect-retval.patch
deleted file mode 100644
index 1c3c3294894..00000000000
--- a/pkgs/applications/networking/browsers/firefox/fix-pa-context-connect-retval.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Yep, it's a "return code was ignored" bug.
-diff --git a/media/libcubeb/src/cubeb_pulse.c b/media/libcubeb/src/cubeb_pulse.c
-index aaaaaaaaaaa..bbbbbbbbbbb 100644
---- a/media/libcubeb/src/cubeb_pulse.c
-+++ b/media/libcubeb/src/cubeb_pulse.c
-@@ -473,6 +473,8 @@
- static int
- pulse_context_init(cubeb * ctx)
- {
-+ int r;
-+
- if (ctx->context) {
- assert(ctx->error == 1);
- pulse_context_destroy(ctx);
-@@ -486,9 +488,9 @@
- WRAP(pa_context_set_state_callback)(ctx->context, context_state_callback, ctx);
-
- WRAP(pa_threaded_mainloop_lock)(ctx->mainloop);
-- WRAP(pa_context_connect)(ctx->context, NULL, 0, NULL);
-+ r = WRAP(pa_context_connect)(ctx->context, NULL, 0, NULL);
-
-- if (wait_until_context_ready(ctx) != 0) {
-+ if (r < 0 || wait_until_context_ready(ctx) != 0) {
- WRAP(pa_threaded_mainloop_unlock)(ctx->mainloop);
- pulse_context_destroy(ctx);
- ctx->context = NULL;
diff --git a/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch b/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch
deleted file mode 100644
index de278152f97..00000000000
--- a/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ru -x '*~' firefox-55.0.3-orig/docshell/base/nsAboutRedirector.cpp firefox-55.0.3/docshell/base/nsAboutRedirector.cpp
---- firefox-55.0.3-orig/docshell/base/nsAboutRedirector.cpp 2017-07-31 18:20:51.000000000 +0200
-+++ firefox-55.0.3/docshell/base/nsAboutRedirector.cpp 2017-09-26 22:02:00.814151731 +0200
-@@ -36,10 +36,6 @@
- nsIAboutModule::ALLOW_SCRIPT
- },
- {
-- "buildconfig", "chrome://global/content/buildconfig.html",
-- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT
-- },
-- {
- "checkerboard", "chrome://global/content/aboutCheckerboard.xhtml",
- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
- nsIAboutModule::ALLOW_SCRIPT
-diff -ru -x '*~' firefox-55.0.3-orig/toolkit/content/jar.mn firefox-55.0.3/toolkit/content/jar.mn
---- firefox-55.0.3-orig/toolkit/content/jar.mn 2017-07-31 18:20:52.000000000 +0200
-+++ firefox-55.0.3/toolkit/content/jar.mn 2017-09-26 22:01:42.383350314 +0200
-@@ -40,7 +40,6 @@
- content/global/plugins.css
- content/global/browser-child.js
- content/global/browser-content.js
--* content/global/buildconfig.html
- content/global/buildconfig.css
- content/global/contentAreaUtils.js
- content/global/datepicker.xhtml
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 2a5a82aed6a..b94a33bfa87 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -1,16 +1,7 @@
-{ config, lib, callPackage, fetchurl, fetchFromGitHub, overrideCC, gccStdenv, gcc6 }:
+{ config, lib, callPackage, fetchurl }:
let
-
common = opts: callPackage (import ./common.nix opts) {};
-
- # Needed on older branches since rustc: 1.32.0 -> 1.33.0
- missing-documentation-patch = fetchurl {
- name = "missing-documentation.patch";
- url = "https://aur.archlinux.org/cgit/aur.git/plain/deny_missing_docs.patch"
- + "?h=firefox-esr&id=03bdd01f9cf";
- sha256 = "1i33n3fgwc8d0v7j4qn7lbdax0an6swar12gay3q2nwrhg3ic4fb";
- };
in
rec {
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 2b44263096b..8256487b751 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -8,6 +8,7 @@
, google_talk_plugin, fribid, gnome3/*.gnome-shell*/
, browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow
, tridactyl-native
+, fx_cast_bridge
, udev
, kerberos
}:
@@ -71,6 +72,7 @@ let
++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell
++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator
++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration
+ ++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge
++ extraNativeMessagingHosts
);
libs = lib.optional stdenv.isLinux udev
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index d2de889bf7b..70c93ee03e5 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -17,11 +17,11 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
- version = "2.11.1811.38-1";
+ version = "2.11.1811.44-1";
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
- sha256 = "0nz7yhxp7fxv6pj1i2684di1wgk4k78hw4icfjqzjwmvc3i710jw";
+ sha256 = "1hzlcvbp056nzxdiig91rsm5f0s0cjqs0imlgn7822jadp9wwnwn";
};
unpackPhase = ''
diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index 6ceee567592..12e20e9c13b 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "helm";
- version = "3.0.3";
+ version = "3.1.1";
src = fetchFromGitHub {
owner = "helm";
repo = "helm";
rev = "v${version}";
- sha256 = "1gdrm3zz7524c8v3g128drfzdyalxlipbzxmwhalm7px4p5z4n0j";
+ sha256 = "16hbwmgq14g28r9s0ipnpiqlppyh57yrcqcspmj05vrf9jsg5vwj";
};
- modSha256 = "1kmm6yb03g9lsz380rvf32j4icp3rcq7ixxcgsxfgpwqvq08zkn6";
+ modSha256 = "0618zzi4x37ahsrazsr82anghhfva8yaryzb3p5d737p3ixbiyv8";
subPackages = [ "cmd/helm" ];
buildFlagsArray = [ "-ldflags=-w -s -X helm.sh/helm/v3/internal/version.version=v${version}" ];
diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix
index def13e2b9d0..af20be1b0da 100644
--- a/pkgs/applications/networking/cluster/luigi/default.nix
+++ b/pkgs/applications/networking/cluster/luigi/default.nix
@@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "luigi";
- version = "2.8.11";
+ version = "2.8.12";
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "17nc5xrqp6hp3ayscvdpsiiga8gsfpa4whsk0n97gzk5qpndrcy2";
+ sha256 = "1p83mxqs7w5v27a58ps7wji5mlyfz66cpkbyrndix0pv9hdyzpxn";
};
propagatedBuildInputs = with python3Packages; [ dateutil tornado_4 python-daemon boto3 ];
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 5c131948649..da943c2aa7e 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -112,8 +112,8 @@ in rec {
terraform_0_11-full = terraform_0_11.full;
terraform_0_12 = pluggable (generic {
- version = "0.12.20";
- sha256 = "1k94iwhdvp1ifg9w7y26cl89ihki2w9kxv8mz06pp9bnfwfw67x5";
+ version = "0.12.21";
+ sha256 = "128mrqib8rigy6kk6fby0pjh4jh2qm2qwkrlbn0wgfln0637d9ff";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };
});
diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix
index 2dae8377055..6dcfb27b7ba 100644
--- a/pkgs/applications/networking/gns3/default.nix
+++ b/pkgs/applications/networking/gns3/default.nix
@@ -15,6 +15,7 @@ let
src = oldAttrs.src.override {
inherit version sha256;
};
+ doCheck = oldAttrs.doCheck && (attrname != "psutil");
});
};
};
diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix
index 787d66826ef..553b466b12f 100644
--- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix
+++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, pkgconfig, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qmake, boost, openssl }:
+{ mkDerivation, stdenv, lib, pkgconfig, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qmake, boost, openssl, wrapQtAppsHook }:
mkDerivation rec {
pname = "chatterino2";
@@ -10,8 +10,15 @@ mkDerivation rec {
sha256 = "0i2385hamhd9i7jdy906cfrd81cybw524j92l87c8pzrkxphignk";
fetchSubmodules = true;
};
- nativeBuildInputs = [ qmake pkgconfig ];
+ nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ];
buildInputs = [ qtbase qtsvg qtmultimedia boost openssl ];
+ postInstall = lib.optionalString stdenv.isDarwin ''
+ mkdir -p "$out/Applications"
+ mv bin/chatterino.app "$out/Applications/"
+ '';
+ postFixup = lib.optionalString stdenv.isDarwin ''
+ wrapQtApp "$out/Applications/chatterino.app/Contents/MacOS/chatterino"
+ '';
meta = with lib; {
description = "A chat client for Twitch chat";
longDescription = ''
diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 70b36c66387..ab15cbb22af 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -7,30 +7,30 @@ in {
pname = "discord";
binaryName = "Discord";
desktopName = "Discord";
- version = "0.0.9";
+ version = "0.0.10";
src = fetchurl {
url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
- sha256 = "1i0f8id10rh2fx381hx151qckvvh8hbznfsfav8w0dfbd1bransf";
+ sha256 = "0kx92i8naqr3algmyy3wyzbh8146z7gigxwf1nbpg1gl16wlplaq";
};
};
ptb = callPackage ./base.nix rec {
pname = "discord-ptb";
binaryName = "DiscordPTB";
desktopName = "Discord PTB";
- version = "0.0.16";
+ version = "0.0.18";
src = fetchurl {
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
- sha256 = "1ia94xvzygim9rx1sjnnss518ggw0i20mhp9pby33q70ha35n0aq";
+ sha256 = "1v9xph7shpmabwysbc08qqlkydzgsir8rwarrjf01xmpcpyia17g";
};
};
canary = callPackage ./base.nix rec {
pname = "discord-canary";
binaryName = "DiscordCanary";
desktopName = "Discord Canary";
- version = "0.0.98";
+ version = "0.0.102";
src = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
- sha256 = "0raqsfakjbcsh7g280yi7sg2jsrmy2q4jldg73wb868z35radld4";
+ sha256 = "1zl53vprkwbkfn3v0lddpp1swignqjxksi4qxl5zqj7482j372a4";
};
};
}.${branch}
diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix
index 5e6e2f9b8d8..a36f72c03d0 100644
--- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix
@@ -2,24 +2,24 @@
buildGoModule rec {
pname = "gomuks";
- version = "2019-06-28";
+ version = "2020-02-19";
goPackagePath = "maunium.net/go/gomuks";
src = fetchFromGitHub {
owner = "tulir";
repo = pname;
- rev = "37df8eb454088e61db7a14f382851205bc1806ad";
- sha256 = "1hr15d9sbq6mddaxv3pwz86qp1hhzssgrvakfpc49xl4h04dq33g";
+ rev = "702592bf89dfcf1ec382c0a09d99318bce7a3943";
+ sha256 = "0g638q8ypkp6dbfy1s4hz798cpkld301f914il3yd70yf05vvysc";
};
- modSha256 = "1qrqgzzsxqvmy4m9shypa94bzw34mc941jhmyccip9grk9fzsxws";
+ modSha256 = "03vbrh50pvx71rp6c23qc2sh0ir4jm1wl0gvi3z1c14ndzhsqky4";
meta = with stdenv.lib; {
homepage = "https://maunium.net/go/gomuks/";
description = "A terminal based Matrix client written in Go";
license = licenses.gpl3;
- maintainers = with maintainers; [ tilpner ];
+ maintainers = with maintainers; [ tilpner emily ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix
deleted file mode 100644
index 1a11e8c0443..00000000000
--- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ stdenv, fetchFromGitHub, fetchNodeModules, nodejs-10_x, ruby, sencha
-, auth0ClientID, auth0Domain }:
-
-stdenv.mkDerivation rec {
- pname = "rambox-bare";
- version = "0.7.3";
-
- src = fetchFromGitHub {
- owner = "ramboxapp";
- repo = "community-edition";
- rev = version;
- sha256 = "03pwzyij2i5m23qzhyqdcipixmqj46qbjmq626swwqy03a0p91qv";
- };
-
- nativeBuildInputs = [ nodejs-10_x ruby sencha ];
-
- node_modules = fetchNodeModules {
- inherit src;
-
- nodejs = nodejs-10_x;
- sha256 = "05vb0r0q3ckg2g87fsm22j0cbfvk81q5z43zwmrzh3pb3zh54xj1";
- };
-
- patches = [ ./isDev.patch ];
-
- configurePhase = ''
- echo 'var auth0Cfg = { clientID: "${auth0ClientID}", domain: "${auth0Domain}" };' > env.js
- ln -s ${node_modules} node_modules
- '';
-
- buildPhase = ''
- mkdir ../rambox-build
- npm run sencha:compile:build
- '';
-
- installPhase = ''
- mv ../rambox-build/ $out
-
- # https://github.com/saenzramiro/rambox/issues/1281
- echo '{"name": "rambox", "version": "${version}", "main": "electron/main.js"}' > $out/package.json
-
- # https://github.com/saenzramiro/rambox/issues/1282
- cp --parents ext/packages/ext-locale/build/ext-locale-*.js $out
-
- # Symbolic link causes `Uncaught Error: Cannot find module 'immutable'`
- cp -r ${node_modules} $out/node_modules
- '';
-
- meta = with stdenv.lib; {
- description = "Messaging and emailing app that combines common web applications into one";
- homepage = http://rambox.pro;
- license = licenses.gpl3;
- maintainers = with maintainers; [ gnidorah ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix
index f588c31c183..488da12c18c 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix
@@ -1,52 +1,50 @@
-{ stdenv, newScope, makeWrapper
-, electron, xdg_utils, makeDesktopItem
-, auth0ClientID ? "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU"
-, auth0Domain ? "nixpkgs.auth0.com" }:
+{ stdenv, fetchurl, xdg_utils, dpkg, makeWrapper, autoPatchelfHook
+, libXtst, libXScrnSaver, gtk3, nss, alsaLib, udev, libnotify
+}:
let
- callPackage = newScope self;
- self = {
- fetchNodeModules = callPackage ./fetchNodeModules.nix {};
- rambox-bare = callPackage ./bare.nix {
- inherit auth0ClientID auth0Domain;
+ version = "0.7.3";
+in stdenv.mkDerivation rec {
+ pname = "rambox";
+ inherit version;
+ src = {
+ x86_64-linux = fetchurl {
+ url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-amd64.deb";
+ sha256 = "09v8zlayas906zhqy2aw4wkvyl87ykr09sjf0nmgmf69piwmjgg6";
};
- sencha = callPackage ./sencha {};
- };
- desktopItem = makeDesktopItem rec {
- name = "Rambox";
- exec = "rambox";
- icon = "${self.rambox-bare}/resources/Icon.png";
- desktopName = name;
- genericName = "Rambox messenger";
- categories = "Network;";
- };
-in
+ i686-linux = fetchurl {
+ url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-i386.deb";
+ sha256 = "0gv4pf3vhrw4xyccm24ivv92d9qy4zpwsh0m82ib1w764lyxmyrz";
+ };
+ }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
-with self;
+ nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook ];
+ buildInputs = [ libXtst libXScrnSaver gtk3 nss alsaLib ];
+ runtimeDependencies = [ udev.lib libnotify ];
-stdenv.mkDerivation {
- name = "rambox-${rambox-bare.version}";
-
- nativeBuildInputs = [ makeWrapper ];
-
- dontUnpack = true;
-
- dontWrapGApps = true; # we only want $gappsWrapperArgs here
+ unpackPhase = "dpkg-deb -x $src .";
installPhase = ''
- runHook preInstall
- mkdir -p $out/share/applications
- ln -s ${desktopItem}/share/applications/* $out/share/applications
- runHook postInstall
+ mkdir -p $out/bin
+ cp -r opt $out
+ ln -s $out/opt/Rambox/rambox $out/bin
+
+ # provide resources
+ cp -r usr/share $out
+ substituteInPlace $out/share/applications/rambox.desktop \
+ --replace Exec=/opt/Rambox/rambox Exec=rambox
'';
postFixup = ''
- makeWrapper ${electron}/bin/electron $out/bin/rambox \
- --add-flags "${rambox-bare} --without-update" \
- --prefix PATH : ${xdg_utils}/bin
+ wrapProgram $out/opt/Rambox/rambox --prefix PATH : ${xdg_utils}/bin
'';
- meta = rambox-bare.meta // {
- platforms = [ "i686-linux" "x86_64-linux" ];
+ meta = with stdenv.lib; {
+ description = "Free and Open Source messaging and emailing app that combines common web applications into one";
+ homepage = http://rambox.pro;
+ license = licenses.mit;
+ maintainers = [ maintainers.gnidorah ];
+ platforms = ["i686-linux" "x86_64-linux"];
+ hydraPlatforms = [];
};
}
diff --git a/pkgs/applications/networking/instant-messengers/rambox/isDev.patch b/pkgs/applications/networking/instant-messengers/rambox/isDev.patch
deleted file mode 100644
index b918144c766..00000000000
--- a/pkgs/applications/networking/instant-messengers/rambox/isDev.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://github.com/saenzramiro/rambox/issues/1280
-
-diff -urNZ a/electron/main.js b/electron/main.js
---- a/electron/main.js 2017-11-02 14:58:06.085127616 +0000
-+++ b/electron/main.js 2017-11-02 14:58:18.316887679 +0000
-@@ -8,7 +8,7 @@
- // Configuration
- const Config = require('electron-config');
- // Development
--const isDev = require('electron-is-dev');
-+const isDev = false;
- // Updater
- const updater = require('./updater');
- // File System
diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
deleted file mode 100644
index 30b12963b33..00000000000
--- a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ stdenv, fetchurl, gzip, which, unzip, jdk }:
-
-let
- version = "6.6.0.13";
- srcs = {
- i686-linux = fetchurl {
- url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-i386.sh.zip";
- sha256 = "15b197108b49mf0afpihkh3p68lxm7580zz2w0xsbahglnvhwyfz";
- };
- x86_64-linux = fetchurl {
- url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-amd64.sh.zip";
- sha256 = "1cxhckmx1802p9qiw09cgb1v5f30wcvnrwkshmia8p8n0q47lpp4";
- };
- };
-in
-
-stdenv.mkDerivation {
- inherit version;
-
- pname = "sencha-bare";
- src = srcs.${stdenv.hostPlatform.system};
-
- nativeBuildInputs = [ gzip which unzip ];
- buildInputs = [ jdk ];
-
- sourceRoot = ".";
-
- configurePhase = ''
- substituteAll ${./response.varfile} response.varfile
- '';
-
- installPhase = ''
- ./SenchaCmd*.sh -q -dir $out -varfile response.varfile
- # disallow sencha writing into /nix/store/repo
- echo "repo.local.dir=$TMP/repo" >> $out/sencha.cfg
- rm $out/shell-wrapper.sh $out/Uninstaller
- '';
-
- meta = with stdenv.lib; {
- license = licenses.unfree;
- platforms = attrNames srcs;
- };
-}
diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix
deleted file mode 100644
index 4be8edaf9b8..00000000000
--- a/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ stdenv, callPackage, makeWrapper }:
-
-let
- sencha-bare = callPackage ./bare.nix {};
-in
-
-stdenv.mkDerivation {
- name = "sencha-${sencha-bare.version}";
-
- nativeBuildInputs = [ makeWrapper ];
-
- dontUnpack = true;
-
- installPhase = ''
- makeWrapper ${sencha-bare}/sencha $out/bin/sencha
- '';
-}
diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/response.varfile b/pkgs/applications/networking/instant-messengers/rambox/sencha/response.varfile
deleted file mode 100644
index 0ff6f0a30d5..00000000000
--- a/pkgs/applications/networking/instant-messengers/rambox/sencha/response.varfile
+++ /dev/null
@@ -1,13 +0,0 @@
-addToPath$Integer=1
-parentDir=.
-sys.adminRights$Boolean=false
-sys.component.148$Boolean=true
-sys.component.157$Boolean=true
-sys.component.26$Boolean=true
-sys.component.30$Boolean=true
-sys.component.90$Boolean=true
-sys.component.91$Boolean=true
-sys.component.92$Boolean=true
-sys.component.94$Boolean=true
-sys.installationDir=@out@
-sys.languageId=en
\ No newline at end of file
diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index e501d3bcdbf..32f50b6fd63 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -8,120 +8,146 @@ let
version = "4.2.0";
- rpath = stdenv.lib.makeLibraryPath [
- alsaLib
- at-spi2-atk
- at-spi2-core
- atk
- cairo
- cups
- curl
- dbus
- expat
- fontconfig
- freetype
- glib
- gnome2.GConf
- gdk-pixbuf
- gtk3
- pango
- libnotify
- libxcb
- libappindicator-gtk3
- nspr
- nss
- stdenv.cc.cc
- systemd
- libuuid
- libpulseaudio
+ inherit (stdenv.hostPlatform) system;
- xorg.libxkbfile
- xorg.libX11
- xorg.libXcomposite
- xorg.libXcursor
- xorg.libXdamage
- xorg.libXext
- xorg.libXfixes
- xorg.libXi
- xorg.libXrandr
- xorg.libXrender
- xorg.libXtst
- xorg.libXScrnSaver
- ] + ":${stdenv.cc.cc.lib}/lib64";
+ throwSystem = throw "Unsupported system: ${system}";
- src =
- if stdenv.hostPlatform.system == "x86_64-linux" then
- fetchurl {
- url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb";
- sha256 = "01b2klhky04fijdqcpfafgdqx2c5nh2fpnzvzgvz10hv7h16cinv";
- }
- else
- throw "Slack is not supported on ${stdenv.hostPlatform.system}";
-
-in stdenv.mkDerivation {
pname = "slack";
- inherit version;
- inherit src;
+ sha256 = {
+ x86_64-darwin = "0947a98m7yz4hldjvcqnv9s17dpvlsk9sflc1zc99hf500zck0w1";
+ x86_64-linux = "01b2klhky04fijdqcpfafgdqx2c5nh2fpnzvzgvz10hv7h16cinv";
+ }.${system} or throwSystem;
- buildInputs = [
- gtk3 # needed for GSETTINGS_SCHEMAS_PATH
- ];
-
- nativeBuildInputs = [ dpkg makeWrapper nodePackages.asar ];
-
- dontUnpack = true;
- dontBuild = true;
- dontPatchELF = true;
-
- installPhase = ''
- # The deb file contains a setuid binary, so 'dpkg -x' doesn't work here
- dpkg --fsys-tarfile $src | tar --extract
- rm -rf usr/share/lintian
-
- mkdir -p $out
- mv usr/* $out
-
- # Otherwise it looks "suspicious"
- chmod -R g-w $out
-
- for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do
- patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true
- patchelf --set-rpath ${rpath}:$out/lib/slack $file || true
- done
-
- # Replace the broken bin/slack symlink with a startup wrapper
- rm $out/bin/slack
- makeWrapper $out/lib/slack/slack $out/bin/slack \
- --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \
- --prefix PATH : ${xdg_utils}/bin
-
- # Fix the desktop link
- substituteInPlace $out/share/applications/slack.desktop \
- --replace /usr/bin/ $out/bin/ \
- --replace /usr/share/ $out/share/
- '' + stdenv.lib.optionalString (theme != null) ''
- asar extract $out/lib/slack/resources/app.asar $out/lib/slack/resources/app.asar.unpacked
- cat <> $out/lib/slack/resources/app.asar.unpacked/dist/ssb-interop.bundle.js
-
- var fs = require('fs');
- document.addEventListener('DOMContentLoaded', function() {
- fs.readFile('${theme}/theme.css', 'utf8', function(err, css) {
- let s = document.createElement('style');
- s.type = 'text/css';
- s.innerHTML = css;
- document.head.appendChild(s);
- });
- });
- EOF
- asar pack $out/lib/slack/resources/app.asar.unpacked $out/lib/slack/resources/app.asar
- '';
meta = with stdenv.lib; {
description = "Desktop client for Slack";
homepage = https://slack.com;
license = licenses.unfree;
maintainers = [ maintainers.mmahut ];
- platforms = [ "x86_64-linux" ];
+ platforms = [ "x86_64-darwin" "x86_64-linux" ];
};
-}
+
+ linux = stdenv.mkDerivation rec {
+ inherit pname version meta;
+ src = fetchurl {
+ url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb";
+ inherit sha256;
+ };
+
+ rpath = stdenv.lib.makeLibraryPath [
+ alsaLib
+ at-spi2-atk
+ at-spi2-core
+ atk
+ cairo
+ cups
+ curl
+ dbus
+ expat
+ fontconfig
+ freetype
+ glib
+ gnome2.GConf
+ gdk-pixbuf
+ gtk3
+ pango
+ libnotify
+ libxcb
+ libappindicator-gtk3
+ nspr
+ nss
+ stdenv.cc.cc
+ systemd
+ libuuid
+ libpulseaudio
+
+ xorg.libxkbfile
+ xorg.libX11
+ xorg.libXcomposite
+ xorg.libXcursor
+ xorg.libXdamage
+ xorg.libXext
+ xorg.libXfixes
+ xorg.libXi
+ xorg.libXrandr
+ xorg.libXrender
+ xorg.libXtst
+ xorg.libXScrnSaver
+ ] + ":${stdenv.cc.cc.lib}/lib64";
+
+ buildInputs = [
+ gtk3 # needed for GSETTINGS_SCHEMAS_PATH
+ ];
+
+ nativeBuildInputs = [ dpkg makeWrapper nodePackages.asar ];
+
+ dontUnpack = true;
+ dontBuild = true;
+ dontPatchELF = true;
+
+ installPhase = ''
+ # The deb file contains a setuid binary, so 'dpkg -x' doesn't work here
+ dpkg --fsys-tarfile $src | tar --extract
+ rm -rf usr/share/lintian
+
+ mkdir -p $out
+ mv usr/* $out
+
+ # Otherwise it looks "suspicious"
+ chmod -R g-w $out
+
+ for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true
+ patchelf --set-rpath ${rpath}:$out/lib/slack $file || true
+ done
+
+ # Replace the broken bin/slack symlink with a startup wrapper
+ rm $out/bin/slack
+ makeWrapper $out/lib/slack/slack $out/bin/slack \
+ --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \
+ --prefix PATH : ${xdg_utils}/bin
+
+ # Fix the desktop link
+ substituteInPlace $out/share/applications/slack.desktop \
+ --replace /usr/bin/ $out/bin/ \
+ --replace /usr/share/ $out/share/
+ '' + stdenv.lib.optionalString (theme != null) ''
+ asar extract $out/lib/slack/resources/app.asar $out/lib/slack/resources/app.asar.unpacked
+ cat <> $out/lib/slack/resources/app.asar.unpacked/dist/ssb-interop.bundle.js
+
+ var fs = require('fs');
+ document.addEventListener('DOMContentLoaded', function() {
+ fs.readFile('${theme}/theme.css', 'utf8', function(err, css) {
+ let s = document.createElement('style');
+ s.type = 'text/css';
+ s.innerHTML = css;
+ document.head.appendChild(s);
+ });
+ });
+ EOF
+ asar pack $out/lib/slack/resources/app.asar.unpacked $out/lib/slack/resources/app.asar
+ '';
+ };
+
+ darwin = stdenv.mkDerivation {
+ inherit pname version meta;
+
+ phases = [ "installPhase" ];
+
+ src = fetchurl {
+ url = "https://downloads.slack-edge.com/mac_releases/Slack-${version}-macOS.dmg";
+ inherit sha256;
+ };
+
+ installPhase = ''
+ /usr/bin/hdiutil mount -nobrowse -mountpoint slack-mnt $src
+ mkdir -p $out/Applications
+ cp -r ./slack-mnt/Slack.app $out/Applications
+ /usr/bin/hdiutil unmount slack-mnt
+ defaults write com.tinyspeck.slackmacgap SlackNoAutoUpdates -bool YES
+ '';
+ };
+in if stdenv.isDarwin
+ then darwin
+ else linux
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index ec7e4e68312..9cd181c591d 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -19,12 +19,12 @@ with lib;
mkDerivation rec {
pname = "telegram-desktop";
- version = "1.9.13";
+ version = "1.9.14";
# Telegram-Desktop with submodules
src = fetchurl {
url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
- sha256 = "1cd1vy5f0hin01jp7agdr56axwd8539rkngb7c16x17bhj5r7rm7";
+ sha256 = "0jsss4b51ylf4qk58frvh2yap1s3cjf3isnlc273cc0fh5g1skc6";
};
postPatch = ''
diff --git a/pkgs/applications/networking/instant-messengers/turses/default.nix b/pkgs/applications/networking/instant-messengers/turses/default.nix
index 780dab79e99..27977dae15f 100644
--- a/pkgs/applications/networking/instant-messengers/turses/default.nix
+++ b/pkgs/applications/networking/instant-messengers/turses/default.nix
@@ -15,6 +15,8 @@ buildPythonPackage rec {
checkInputs = [ mock pytest coverage tox ];
propagatedBuildInputs = [ urwid tweepy future ];
+ LC_ALL = "en_US.UTF-8";
+
patches = [
(fetchpatch {
url = "https://github.com/louipc/turses/commit/be0961b51f502d49fd9e2e5253ac130e543a31c7.patch";
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index d22c1cefc2f..25e273bda51 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -14,11 +14,11 @@ assert pulseaudioSupport -> libpulseaudio != null;
let
inherit (stdenv.lib) concatStringsSep makeBinPath optional;
- version = "3.5.352596.0119";
+ version = "3.5.359539.0224";
srcs = {
x86_64-linux = fetchurl {
url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
- sha256 = "1h8wki0b920k0hcy812w91ara59z4rmfllxx04nbmzsxh0bvsx90";
+ sha256 = "1n6rcsl86150y2dzkcgy5rzdij0d6ib3nvg4dz4a4dkyhq5hbla2";
};
};
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 13ac80677ee..96d7b3faaed 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -27,12 +27,12 @@ let
in
assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
stdenv.mkDerivation rec {
- version = "2.7";
+ version = "2.7.1";
pname = "weechat";
src = fetchurl {
url = "https://weechat.org/files/src/weechat-${version}.tar.bz2";
- sha256 = "00hzchzw1w2181kczcrrnj8ngml3bwk7qciha3higxq3qynf0h8c";
+ sha256 = "0acz41jg7lmipni9z2agfqw4dhmx5hf6k9w4pvr4zih1fhkldva2";
};
outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;
diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix
index 17e07f91c03..c39b7fe1596 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "weechat-autosort";
- version = "3.4";
+ version = "3.8";
src = fetchFromGitHub {
owner = "de-vri-es";
repo = pname;
rev = version;
- sha256 = "1sbr6ga9krrfgqznvsxjd3hdxzkvslh41ls5xrj7l2p4ws4gwlkn";
+ sha256 = "0a2gc8nhklvlivradhqy2pkymsqyy01pvzrmwg60cln8snmcqpd5";
};
passthru.scripts = [ "autosort.py" ];
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
description = "Autosort is a weechat script to automatically or manually keep your buffers sorted";
homepage = https://github.com/de-vri-es/weechat-autosort;
license = licenses.gpl3;
- maintainers = with maintainers; [ ma27 ];
+ maintainers = with maintainers; [ ma27 emily ];
};
}
diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
index 845dd928766..038611ca289 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
@@ -64,7 +64,7 @@ in buildPythonPackage {
--replace '/usr/bin/env -S python3' '${scriptPython}/bin/python'
substituteInPlace $out/bin/matrix_decrypt \
--replace '/usr/bin/env python3' '${scriptPython}/bin/python'
-
+
mkdir -p $out/${python.sitePackages}
cp -r $src/matrix $out/${python.sitePackages}/matrix
'';
@@ -75,7 +75,7 @@ in buildPythonPackage {
description = "A Python plugin for Weechat that lets Weechat communicate over the Matrix protocol";
homepage = "https://github.com/poljar/weechat-matrix";
license = licenses.isc;
- platforms = platforms.linux;
+ platforms = platforms.unix;
maintainers = with maintainers; [ tilpner emily ];
};
}
diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
index f62ab292d66..ffe75eaac7c 100644
--- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
@@ -30,11 +30,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "claws-mail";
- version = "3.17.4";
+ version = "3.17.5";
src = fetchurl {
url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz";
- sha256 = "00mfhaac16sv67rwiq98hr4nl5zmd1h2afswwwksdcsi3q9x23jr";
+ sha256 = "1gjrmdmhc7zzilrlss9yl86ybv9sra8v0qi7mkwv7d9azidx5kns";
};
outputs = [ "out" "dev" ];
@@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
meta = {
description = "The user-friendly, lightweight, and fast email client";
- homepage = https://www.claws-mail.org/;
+ homepage = "https://www.claws-mail.org/";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ fpletz globin ];
diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix
index 72003f41721..05268bdaead 100644
--- a/pkgs/applications/networking/p2p/tixati/default.nix
+++ b/pkgs/applications/networking/p2p/tixati/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "tixati";
- version = "2.66";
+ version = "2.67";
src = fetchurl {
url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz";
- sha256 = "1qwmxfkgc5q7v6ickxr29khil6mh9crv5mwdm72bp6k64w0akbs7";
+ sha256 = "0510wkwmwrlv61958zd5nsc4lr0l0lka3jf4pq3dyiyfsf4k20rq";
};
installPhase = ''
diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix
index 573752b5b53..8b194e53b44 100644
--- a/pkgs/applications/networking/remote/anydesk/default.nix
+++ b/pkgs/applications/networking/remote/anydesk/default.nix
@@ -5,7 +5,7 @@
let
sha256 = {
- x86_64-linux = "1ysd8fwzm0360qs6ijr6l0y2agqb3njz20h7am1x4kxmhy8ravq9";
+ x86_64-linux = "0az7n4lhmd4pz0spjvyiwd4w1gnqbh8f1fvr1jinsssyq0j26ldj";
i386-linux = "0vjxbg5hwkqkh600rr75xviwy848r1xw9mxwf6bb6l8b0isvlsgg";
}.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported");
@@ -28,7 +28,7 @@ let
in stdenv.mkDerivation rec {
pname = "anydesk";
- version = "5.5.1";
+ version = "5.5.2";
src = fetchurl {
urls = [
diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix
index 1b96e9fb663..75ba68db3a8 100644
--- a/pkgs/applications/networking/seafile-client/default.nix
+++ b/pkgs/applications/networking/seafile-client/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools
+{ mkDerivation, lib, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools
, seafile-shared, ccnet, jansson, libsearpc
, withShibboleth ? true, qtwebengine }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "seafile-client";
version = "7.0.5";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
++ lib.optional withShibboleth "-DBUILD_SHIBBOLETH_SUPPORT=ON";
qtWrapperArgs = [
- "--suffix PATH : ${stdenv.lib.makeBinPath [ ccnet seafile-shared ]}"
+ "--suffix PATH : ${lib.makeBinPath [ ccnet seafile-shared ]}"
];
meta = with lib; {
diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/pkgs/applications/networking/sniffers/ettercap/default.nix
index dbff491fa80..c548098baa7 100644
--- a/pkgs/applications/networking/sniffers/ettercap/default.nix
+++ b/pkgs/applications/networking/sniffers/ettercap/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, libpcap, libnet, zlib, curl, pcre
-, openssl, ncurses, glib, gtk3, atk, pango, flex, bison, geoip
+, openssl, ncurses, glib, gtk3, atk, pango, flex, bison, geoip, harfbuzz
, pkgconfig }:
stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake flex bison pkgconfig ];
buildInputs = [
libpcap libnet zlib curl pcre openssl ncurses
- glib gtk3 atk pango geoip
+ glib gtk3 atk pango geoip harfbuzz
];
preConfigure = ''
@@ -30,9 +30,19 @@ stdenv.mkDerivation rec {
"-DGTK3_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
];
+ # TODO: Remove after the next release (0.8.4 should work without this):
+ NIX_CFLAGS_COMPILE = [ "-I${harfbuzz.dev}/include/harfbuzz" ];
+
meta = with stdenv.lib; {
description = "Comprehensive suite for man in the middle attacks";
- homepage = http://ettercap.github.io/ettercap/;
+ longDescription = ''
+ Ettercap is a comprehensive suite for man in the middle attacks. It
+ features sniffing of live connections, content filtering on the fly and
+ many other interesting tricks. It supports active and passive dissection
+ of many protocols and includes many features for network and host
+ analysis.
+ '';
+ homepage = https://www.ettercap-project.org/;
license = licenses.gpl2;
platforms = platforms.unix;
maintainers = with maintainers; [ pSub ];
diff --git a/pkgs/applications/networking/ssb/patchwork/default.nix b/pkgs/applications/networking/ssb/patchwork/default.nix
index cf1159b83f8..2b4618b05b3 100644
--- a/pkgs/applications/networking/ssb/patchwork/default.nix
+++ b/pkgs/applications/networking/ssb/patchwork/default.nix
@@ -2,12 +2,12 @@
let
pname = "ssb-patchwork";
- version = "3.17.2";
+ version = "3.17.5";
name = "Patchwork-${version}";
src = fetchurl {
url = "https://github.com/ssbc/patchwork/releases/download/v${version}/${name}.AppImage";
- sha256 = "1pmy01jwdr461vsl4fsxi3jaqnjx9yl5dw4987y5g73qx21qc5d5";
+ sha256 = "0zmi6d9v92icbkln69n50648xbaz6jih5sal1fm5a8kw5is8qg4s";
};
binary = appimageTools.wrapType2 {
@@ -23,7 +23,7 @@ let
name = "ssb-patchwork";
exec = "${binary}/bin/ssb-patchwork";
icon = "ssb-patchwork.png";
- comment = "Decentralized messaging and sharing app";
+ comment = "Client for the decentralized social network Secure Scuttlebutt";
desktopName = "Patchwork";
genericName = "Patchwork";
categories = "Network;";
@@ -45,9 +45,9 @@ in
longDescription = ''
sea-slang for gossip - a scuttlebutt is basically a watercooler on a ship.
'';
- homepage = https://www.scuttlebutt.nz/;
+ homepage = "https://www.scuttlebutt.nz/";
license = licenses.agpl3;
- maintainers = with maintainers; [ thedavidmeister ninjatrappeur flokli ];
+ maintainers = with maintainers; [ asymmetric ninjatrappeur thedavidmeister ];
platforms = [ "x86_64-linux" ];
};
}
diff --git a/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/pkgs/applications/office/libreoffice/src-fresh/primary.nix
index ec7f9e52bbb..fb21d1292d6 100644
--- a/pkgs/applications/office/libreoffice/src-fresh/primary.nix
+++ b/pkgs/applications/office/libreoffice/src-fresh/primary.nix
@@ -26,7 +26,8 @@ rec {
sha256 = "0a7arjlxxy7hjm1brxwd124bf1gkbl92bgygi3sbbhbsv07pjdcr";
};
- # TODO: dictionaries
+ # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
+ # it and LibreOffice can use these by pointing DICPATH environment variable at the hunspell directory
help = fetchSrc {
name = "help";
diff --git a/pkgs/applications/office/libreoffice/src-still/primary.nix b/pkgs/applications/office/libreoffice/src-still/primary.nix
index d3da7d09b70..36deae53670 100644
--- a/pkgs/applications/office/libreoffice/src-still/primary.nix
+++ b/pkgs/applications/office/libreoffice/src-still/primary.nix
@@ -26,7 +26,8 @@ rec {
sha256 = "01g09bbn1ixrsfj4l0x6x8p06dz9hnlrhnr3f3xb42drmi9ipvjv";
};
- # TODO: dictionaries
+ # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
+ # it and LibreOffice can use these by pointing DICPATH environment variable at the hunspell directory
help = fetchSrc {
name = "help";
diff --git a/pkgs/applications/office/libreoffice/wrapper.sh b/pkgs/applications/office/libreoffice/wrapper.sh
index 62569734745..806dd0806ad 100644
--- a/pkgs/applications/office/libreoffice/wrapper.sh
+++ b/pkgs/applications/office/libreoffice/wrapper.sh
@@ -17,6 +17,13 @@ if uname | grep Linux > /dev/null &&
export DBUS_SESSION_BUS_ADDRESS="unix:path=$dbus_socket_dir/session"
fi
+for PROFILE in $NIX_PROFILES; do
+ HDIR="$PROFILE/share/hunspell"
+ if [ -d "$HDIR" ]; then
+ export DICPATH=$DICPATH''${DICPATH:+:}$HDIR
+ fi
+done
+
"@libreoffice@/bin/$(basename "$0")" "$@"
code="$?"
diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix
index bfa162a54a2..9aeddf1a021 100644
--- a/pkgs/applications/office/todoman/default.nix
+++ b/pkgs/applications/office/todoman/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python3, glibcLocales }:
+{ stdenv, python3, glibcLocales, installShellFiles, jq }:
let
inherit (python3.pkgs) buildPythonApplication fetchPypi;
@@ -17,6 +17,7 @@ buildPythonApplication rec {
LANG = "en_US.UTF-8";
LC_TYPE = "en_US.UTF-8";
+ nativeBuildInputs = [ installShellFiles ];
buildInputs = [ glibcLocales ];
propagatedBuildInputs = with python3.pkgs;
[ atomicwrites click click-log click-repl configobj humanize icalendar parsedatetime
@@ -28,6 +29,12 @@ buildPythonApplication rec {
makeWrapperArgs = [ "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive"
"--set CHARSET en_us.UTF-8" ];
+ postInstall = ''
+ installShellCompletion --bash contrib/completion/bash/_todo
+ substituteInPlace contrib/completion/zsh/_todo --replace "jq " "${jq}/bin/jq "
+ installShellCompletion --zsh contrib/completion/zsh/_todo
+ '';
+
preCheck = ''
# Remove one failing test that only checks whether the command line works
rm tests/test_main.py
diff --git a/pkgs/applications/radio/rtl_433/default.nix b/pkgs/applications/radio/rtl_433/default.nix
index 148ad35a1f0..5faac96d28f 100644
--- a/pkgs/applications/radio/rtl_433/default.nix
+++ b/pkgs/applications/radio/rtl_433/default.nix
@@ -4,14 +4,14 @@
stdenv.mkDerivation {
- version = "19.08";
+ version = "20.02";
pname = "rtl_433";
src = fetchFromGitHub {
owner = "merbanan";
repo = "rtl_433";
- rev = "19.08";
- sha256 = "0cm82gm5c86qfl4dw37h8wyk77947k6fv2n1pn3xvk3wz2ygsdi6";
+ rev = "20.02";
+ sha256 = "11991xky9gawkragdyg27qsf7kw5bhlg7ygvf3fn7ng00x4xbh1z";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix
index cc6af8a17c0..9908439e10d 100644
--- a/pkgs/applications/science/astronomy/gildas/default.nix
+++ b/pkgs/applications/science/astronomy/gildas/default.nix
@@ -7,8 +7,8 @@ let
in
stdenv.mkDerivation rec {
- srcVersion = "jan20a";
- version = "20200101_a";
+ srcVersion = "feb20a";
+ version = "20200201_a";
pname = "gildas";
src = fetchurl {
@@ -16,19 +16,15 @@ stdenv.mkDerivation rec {
# source code of the previous release to a different directory
urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz"
"http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ];
- sha256 = "12n08pax7gwg2z121ix3ah5prq3yswqnf2yc8jgs4i9rgkpbsfzz";
+ sha256 = "05f34kpi3pfgf4dsyka7mkcln26yzb2mixnnc306krq0isjm7m26";
};
- # Python scripts are not converted to Python 3 syntax when parallel
- # building is turned on. Disable it until this is fixed upstream.
- enableParallelBuilding = false;
-
nativeBuildInputs = [ pkgconfig groff perl getopt gfortran which ];
buildInputs = [ gtk2-x11 lesstif cfitsio python3Env ncurses ]
++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation ]);
- patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ./imager-py3.patch ];
+ patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ];
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument";
diff --git a/pkgs/applications/science/astronomy/gildas/imager-py3.patch b/pkgs/applications/science/astronomy/gildas/imager-py3.patch
deleted file mode 100644
index 71a129164ba..00000000000
--- a/pkgs/applications/science/astronomy/gildas/imager-py3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN gildas-src-jan20a.orig/contrib/imager/pro/define.ima gildas-src-jan20a/contrib/imager/pro/define.ima
---- gildas-src-jan20a.orig/contrib/imager/pro/define.ima 2020-01-01 02:15:16.000000000 +0100
-+++ gildas-src-jan20a/contrib/imager/pro/define.ima 2020-01-14 11:18:46.000000000 +0100
-@@ -9,7 +9,7 @@
- !
- ! Patch for a Bug on Mac-OS/X where Python blocks if activated first
- ! from a script launched by a widget.
--python print "Starting Python"
-+python print("Starting Python")
- !
- ! INPUT, GO and UVT_CONVERT always defined by GreG
- define command GO "@ p_go.ima" gag_pro:go_greg.hlp
diff --git a/pkgs/applications/science/biology/mrtrix/default.nix b/pkgs/applications/science/biology/mrtrix/default.nix
new file mode 100644
index 00000000000..6959b2caab8
--- /dev/null
+++ b/pkgs/applications/science/biology/mrtrix/default.nix
@@ -0,0 +1,77 @@
+{ stdenv, lib, fetchFromGitHub, python, makeWrapper
+, eigen, fftw, libtiff, zlib, ants, bc
+, qt5, libGL, libGLU, libX11, libXext
+, withGui ? true }:
+
+stdenv.mkDerivation rec {
+ pname = "mrtrix";
+ version = "3.0_RC3_latest";
+
+ src = fetchFromGitHub {
+ owner = "MRtrix3";
+ repo = "mrtrix3";
+ rev = version;
+ sha256 = "184nv524p8j94qicjy9l288bqcgl2yxqqs55a7042i0gfsnwp51c";
+ fetchSubmodules = true;
+ };
+
+ nativeBuildInputs = [ eigen makeWrapper ] ++ lib.optional withGui qt5.wrapQtAppsHook;
+
+ buildInputs = [
+ ants
+ python
+ fftw
+ libtiff
+ zlib ] ++ lib.optionals withGui [
+ libGL
+ libGLU
+ libX11
+ libXext
+ qt5.qtbase
+ qt5.qtsvg
+ ];
+
+ installCheckInputs = [ bc ];
+
+ postPatch = ''
+ patchShebangs ./build ./configure ./run_tests ./bin/population_template
+ substituteInPlace ./run_tests \
+ --replace 'git submodule update --init >> $LOGFILE 2>&1' ""
+ '';
+
+ configurePhase = ''
+ export EIGEN_CFLAGS="-isystem ${eigen}/include/eigen3"
+ unset LD # similar to https://github.com/MRtrix3/mrtrix3/issues/1519
+ ./configure ${lib.optionalString (!withGui) "-nogui"};
+ '';
+
+ buildPhase = ''
+ ./build
+ (cd testing && ../build)
+ '';
+
+ installCheckPhase = "./run_tests";
+ doInstallCheck = true;
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out
+ cp -ar lib $out/lib
+ cp -ar bin $out/bin
+ runHook postInstall
+ '';
+
+ postInstall = ''
+ for prog in $out/bin/*; do
+ wrapProgram $prog --prefix PATH : ${lib.makeBinPath [ ants ]}
+ done
+ '';
+
+ meta = with lib; {
+ homepage = "https://github.com/MRtrix3/mrtrix3";
+ description = "Suite of tools for diffusion imaging";
+ maintainers = with maintainers; [ bcdarwin ];
+ platforms = platforms.linux;
+ license = licenses.mpl20;
+ };
+}
diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix
index 75d69d3e499..694adc4d634 100644
--- a/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/pkgs/applications/science/electronics/gtkwave/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "gtkwave";
- version = "3.3.103";
+ version = "3.3.104";
src = fetchurl {
url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz";
- sha256 = "0djqfnxy772a9p44wnm5ansbih7jg76xv1hvcpkv3gblhkzg49ay";
+ sha256 = "1qvldbnlp3wkqr5ff93f6pdvv9yzij7lxfhpqlizakz08l1xb391";
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix
index 2ac7c208a5f..b77f5110521 100644
--- a/pkgs/applications/science/logic/elan/default.nix
+++ b/pkgs/applications/science/logic/elan/default.nix
@@ -1,14 +1,9 @@
-{ stdenv, pkgconfig, curl, openssl, zlib, fetchFromGitHub, rustPlatform }:
+{ lib, pkgconfig, curl, openssl, zlib, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "elan";
version = "0.7.5";
- # Delete this on next update; see #79975 for details
- legacyCargoFetcher = true;
-
- cargoSha256 = "0q0xlvyyf88dbz43r7kk9v8rrp6hj0nl5i2i9mg6ibk2gphgdv6v";
-
src = fetchFromGitHub {
owner = "kha";
repo = "elan";
@@ -16,6 +11,8 @@ rustPlatform.buildRustPackage rec {
sha256 = "1147f3lzr6lgvf580ppspn20bdwnf6l8idh1h5ana0p0lf5a0dn1";
};
+ cargoSha256 = "0vja1cq6z7jlr4nzfdzn4gl8l31yld82zmgzwihnalif13q3fcps";
+
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ curl zlib openssl ];
@@ -38,7 +35,7 @@ rustPlatform.buildRustPackage rec {
$out/bin/elan completions zsh > "$out/share/zsh/site-functions/_elan"
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Small tool to manage your installations of the Lean theorem prover";
homepage = "https://github.com/Kha/elan";
license = with licenses; [ asl20 /* or */ mit ];
diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix
index 726bac5c50e..d718dd01ed4 100644
--- a/pkgs/applications/science/logic/lean/default.nix
+++ b/pkgs/applications/science/logic/lean/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lean";
- version = "3.5.1";
+ version = "3.6.0";
src = fetchFromGitHub {
owner = "leanprover-community";
repo = "lean";
rev = "v${version}";
- sha256 = "0m7knf1hfbn2v6p6kmqxlx8c40p5nzv8d975w2xwljaccc42j1yp";
+ sha256 = "1filkhyqcjglbavbkjra0nk3y7hw8993wyl7r87ikydb2bjishsc";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix
index be15bba979f..988ea8c855c 100644
--- a/pkgs/applications/science/machine-learning/shogun/default.nix
+++ b/pkgs/applications/science/machine-learning/shogun/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, lib, fetchFromGitHub, fetchpatch, ccache, cmake, ctags, swig
+{ stdenv, lib, fetchFromGitHub, fetchpatch, fetchurl, cmake, ctags, swig
# data, compression
, bzip2, curl, hdf5, json_c, lzma, lzo, protobuf, snappy
# maths
-, openblasCompat, eigen, nlopt, lp_solve, colpack
+, openblasCompat, eigen, nlopt, lp_solve, colpack, liblapack, glpk
# libraries
, libarchive, libxml2
# extra support
@@ -13,47 +13,79 @@
assert pythonSupport -> pythonPackages != null;
assert opencvSupport -> opencv != null;
-stdenv.mkDerivation rec {
+let
pname = "shogun";
- version = "6.0.0";
-
- src = fetchFromGitHub {
- owner = pname + "-toolbox";
- repo = pname;
- rev = pname + "_" + version;
- sha256 = "0f2zwzvn5apvwypkfkq371xp7c5bdb4g1fwqfh8c2d57ysjxhmgf";
- fetchSubmodules = true;
+ version = "6.1.4";
+ rxcppVersion = "4.0.0";
+ gtestVersion = "1.8.0";
+ srcs = {
+ toolbox = fetchFromGitHub {
+ owner = pname + "-toolbox";
+ repo = pname;
+ rev = pname + "_" + version;
+ sha256 = "38aULxK50wQ2+/ERosSpRyBmssmYSGv5aaWfWSlrSRc=";
+ fetchSubmodules = true;
+ };
+ # we need the packed archive
+ rxcpp = fetchurl {
+ url = "https://github.com/Reactive-Extensions/RxCpp/archive/v${rxcppVersion}.tar.gz";
+ sha256 = "0y2isr8dy2n1yjr9c5570kpc9lvdlch6jv0jvw000amwn5d3krsh";
+ };
+ gtest = fetchurl {
+ url = "https://github.com/google/googletest/archive/release-${gtestVersion}.tar.gz";
+ sha256 = "1n5p1m2m3fjrjdj752lf92f9wq3pl5cbsfrb49jqbg52ghkz99jq";
+ };
};
+in
+
+stdenv.mkDerivation rec {
+
+ inherit pname version;
+
+ src = srcs.toolbox;
+
+ postUnpack = ''
+ mkdir -p $sourceRoot/third_party/{rxcpp,gtest}
+ ln -s ${srcs.rxcpp} $sourceRoot/third_party/rxcpp/v${rxcppVersion}.tar.gz
+ ln -s ${srcs.gtest} $sourceRoot/third_party/gtest/release-${gtestVersion}.tar.gz
+ '';
+
+ # broken
+ doCheck = false;
patches = [
- (fetchpatch {
- name = "Fix-meta-example-parser-bug-in-parallel-builds.patch";
- url = "https://github.com/shogun-toolbox/shogun/commit/ecd6a8f11ac52748e89d27c7fab7f43c1de39f05.patch";
- sha256 = "1hrwwrj78sxhwcvgaz7n4kvh5y9snfcc4jf5xpgji5hjymnl311n";
- })
(fetchpatch {
url = "https://github.com/awild82/shogun/commit/365ce4c4c700736d2eec8ba6c975327a5ac2cd9b.patch";
sha256 = "158hqv4xzw648pmjbwrhxjp7qcppqa7kvriif87gn3zdn711c49s";
})
];
+ CCACHE_DISABLE="1";
CCACHE_DIR=".ccache";
buildInputs = with lib; [
- openblasCompat bzip2 ccache cmake colpack curl ctags eigen hdf5 json_c lp_solve lzma lzo
- protobuf nlopt snappy swig (libarchive.dev) libxml2
+ openblasCompat bzip2 cmake colpack curl ctags eigen hdf5 json_c lp_solve lzma lzo
+ protobuf nlopt snappy swig (libarchive.dev) libxml2 liblapack glpk
]
++ optionals (pythonSupport) (with pythonPackages; [ python ply numpy ])
++ optional (opencvSupport) opencv;
- cmakeFlags = with lib; []
- ++ (optional (pythonSupport) "-DPythonModular=ON")
- ++ (optional (opencvSupport) "-DOpenCV=ON")
- ;
+ NIX_CFLAGS_COMPILE="-faligned-new";
- # Previous attempts to fix parallel builds (see patch above) were not entirely successful.
- # Sporadic build failures still exist. Dislable parallel builds for now.
- enableParallelBuilding = false;
+ cmakeFlags =
+ let
+ onOff = b: if b then "ON" else "OFF";
+ flag = n: b: "-D"+n+"="+onOff b;
+ in
+ with lib; [
+ (flag "ENABLE_TESTING" doCheck)
+ (flag "BUILD_META_EXAMPLES" doCheck)
+ (flag "CMAKE_VERBOSE_MAKEFILE:BOOL" doCheck)
+ (flag "PythonModular" pythonSupport)
+ (flag "OpenCV" opencvSupport)
+ ];
+
+ enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "A toolbox which offers a wide range of efficient and unified machine learning methods";
diff --git a/pkgs/applications/science/math/R/0001-Disable-test-pending-upstream-fix.patch b/pkgs/applications/science/math/R/0001-Disable-test-pending-upstream-fix.patch
new file mode 100644
index 00000000000..7bf32df0b7a
--- /dev/null
+++ b/pkgs/applications/science/math/R/0001-Disable-test-pending-upstream-fix.patch
@@ -0,0 +1,26 @@
+From 85ede2cf452800710de136f4f864921d3bb9773c Mon Sep 17 00:00:00 2001
+From: Tom Hall
+Date: Fri, 21 Feb 2020 22:56:06 +0000
+Subject: [PATCH] Disable test pending upstream fix
+
+See https://bugs.r-project.org/bugzilla/show_bug.cgi?id=17718
+---
+ tests/reg-tests-1d.R | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/reg-tests-1d.R b/tests/reg-tests-1d.R
+index 9b551a1fc8..18ce6027ed 100644
+--- a/tests/reg-tests-1d.R
++++ b/tests/reg-tests-1d.R
+@@ -3079,7 +3079,7 @@ stopifnot(exprs = {
+ x[1:52] %% 3 == 2:1
+ -x[1:52] %% 3 == 1:2
+ }) # larger x suffer from cancellation (well, warning too early now):
+-tools::assertWarning(x[60:68] %% 3)
++#tools::assertWarning(x[60:68] %% 3)
+
+
+ ## Hilmar Berger's on R-devel list: 'data.frame() == NULL' etc
+--
+2.24.1
+
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 517fc9d7b32..f613f94b9cc 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -7,7 +7,6 @@
# R as of writing does not support outputting both .so and .a files; it outputs:
# --enable-R-static-lib conflicts with --enable-R-shlib and will be ignored
, static ? false
-, javaSupport ? (!stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64)
}:
stdenv.mkDerivation rec {
@@ -23,12 +22,15 @@ stdenv.mkDerivation rec {
buildInputs = [
bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses
pango pcre perl readline texLive xz zlib less texinfo graphviz icu
- pkgconfig bison imake which openblas curl tcl tk
- ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ]
- ++ stdenv.lib.optional javaSupport jdk;
+ pkgconfig bison imake which openblas curl tcl tk jdk
+ ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ];
patches = [
./no-usr-local-search-paths.patch
+ ] ++ stdenv.lib.optionals stdenv.hostPlatform.isAarch64 [
+ # Remove a test which fails on aarch64.
+ # See https://bugs.r-project.org/bugzilla/show_bug.cgi?id=17718
+ ./0001-Disable-test-pending-upstream-fix.patch
];
prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
@@ -57,7 +59,7 @@ stdenv.mkDerivation rec {
CC=$(type -p cc)
CXX=$(type -p c++)
FC="${gfortran}/bin/gfortran" F77="${gfortran}/bin/gfortran"
- ${stdenv.lib.optionalString javaSupport "JAVA_HOME=\"${jdk}\""}
+ JAVA_HOME="${jdk}"
RANLIB=$(type -p ranlib)
R_SHELL="${stdenv.shell}"
'' + stdenv.lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix
index a08c0ee3403..de84d35c2e8 100644
--- a/pkgs/applications/science/math/geogebra/default.nix
+++ b/pkgs/applications/science/math/geogebra/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "geogebra";
- version = "5-0-570-0";
+ version = "5-0-573-0";
preferLocalBuild = true;
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
"https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
"http://web.archive.org/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
];
- sha256 = "0q6brg5rkl2gyyg9vhiilvb8zy23zlp4a1xcwnv501xzcccv0p37";
+ sha256 = "0lj0k49sjsjqs716n74xbq6a4gids5903f5s6fhqyahrwyldhzrj";
};
srcIcon = fetchurl {
diff --git a/pkgs/applications/version-management/cvsq/default.nix b/pkgs/applications/version-management/cvsq/default.nix
new file mode 100644
index 00000000000..f9cabb94b97
--- /dev/null
+++ b/pkgs/applications/version-management/cvsq/default.nix
@@ -0,0 +1,67 @@
+{ stdenv
+, fetchurl
+, makeWrapper
+, cvs
+, perl
+, nettools
+, findutils
+, rsync
+, coreutils
+, diffutils
+} :
+
+stdenv.mkDerivation rec {
+ pname = "cvsq";
+ version = "1.10";
+
+ src = fetchurl {
+ url = "http://www.linta.de/~aehlig/cvsq/cvsq-${version}.tgz";
+ sha256 = "1a2e5666d4d23f1eb673a505caeb771ac62a86ed69c9ab89c4e2696c2ccd0621";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ cvs perl nettools findutils rsync coreutils diffutils ];
+
+
+ makeFlags = [ "prefix=$(out)" ];
+
+ postInstall = ''
+ substituteInPlace $out/bin/cvsq --replace "/bin/sh" "${stdenv.shell}"
+ substituteInPlace $out/bin/lcvs --replace "/bin/sh" "${stdenv.shell}"
+ wrapProgram $out/bin/cvsq --prefix PATH : ${stdenv.lib.makeBinPath
+ [ cvs nettools findutils rsync coreutils diffutils ]}
+ wrapProgram $out/bin/cvsq-branch --prefix PATH : ${stdenv.lib.makeBinPath
+ [ cvs nettools findutils rsync coreutils diffutils ]}
+ wrapProgram $out/bin/cvsq-merge --prefix PATH : ${stdenv.lib.makeBinPath
+ [ cvs nettools findutils rsync coreutils diffutils ]}
+ wrapProgram $out/bin/cvsq-switch --prefix PATH : ${stdenv.lib.makeBinPath
+ [ cvs nettools findutils rsync coreutils diffutils ]}
+ wrapProgram $out/bin/lcvs --prefix PATH : ${stdenv.lib.makeBinPath
+ [ cvs nettools findutils rsync coreutils diffutils ]}
+ '';
+
+ meta = {
+ description = ''A collection of tools to work locally with CVS'';
+ longDescription = ''
+ cvsq is a collection of tools to work locally with CVS.
+
+ cvsq queues commits and other cvs commands in a queue to be executed later,
+ when the machine is online again. In case of a commit (the default action)
+ an actual copy of the working directory is made, so that you can continue
+ editing without affecting the scheduled commit. You can even schedule
+ several successive commits to the same file and they will be correctly
+ committed as successive commits at the time of upload. This is different
+ from an earlier script also named cvsq that you might have seen elsewhere.
+
+ lcvs uses rsync to maintain a local copy of a cvs repository. It also
+ gives a convenient interface to call cvs in such a way that it believes the
+ current working directory refers to the local copy rather than to the actual
+ repository. This is useful for commands like log, diff, etc; however it cannot
+ be used for commits (that's what cvsq is for).
+ '';
+ homepage = https://www.linta.de/~aehlig/cvsq/;
+ license = stdenv.lib.licenses.bsd3;
+ maintainers = with stdenv.lib.maintainers; [ clkamp ];
+ platforms = stdenv.lib.platforms.all;
+ };
+}
diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix
index fe0c1a508d0..be84b7abc82 100644
--- a/pkgs/applications/version-management/gerrit/default.nix
+++ b/pkgs/applications/version-management/gerrit/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "gerrit";
- version = "3.0.2";
+ version = "3.1.2";
src = fetchurl {
url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war";
- sha256 = "16zh2dczjnzwzrzg0xkqs7bfd6bzk7s42gyb59z3206zpvh5kq9k";
+ sha256 = "01hak4gqaqn40a0qvmg8a89ai3ndnjls5v64m8awig8j1yysz5vl";
};
buildCommand = ''
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 0f6dea75c6f..a7008bf44b3 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -24,7 +24,7 @@ let
bump2version = pkgs.python37Packages.callPackage ./bump2version { };
- darcsToGit = callPackage ./darcs-to-git { };
+ darcs-to-git = callPackage ./darcs-to-git { };
delta = callPackage ./delta { };
@@ -40,29 +40,6 @@ let
inherit (darwin.apple_sdk.frameworks) Security;
};
- git-appraise = callPackage ./git-appraise {};
-
- git-fame = callPackage ./git-fame {};
-
- git-filter-repo = callPackage ./git-filter-repo {
- pythonPackages = python3Packages;
- };
-
- gita = python3Packages.callPackage ./gita {};
-
- # The full-featured Git.
- gitFull = gitBase.override {
- svnSupport = true;
- guiSupport = true;
- sendEmailSupport = true;
- withLibsecret = !stdenv.isDarwin;
- };
-
- # Git with SVN support, but without GUI.
- gitSVN = lowPrio (appendToName "with-svn" (gitBase.override {
- svnSupport = true;
- }));
-
git-annex = pkgs.haskellPackages.git-annex;
git-annex-metadata-gui = libsForQt5.callPackage ./git-annex-metadata-gui {
@@ -84,6 +61,8 @@ let
git-annex-utils = callPackage ./git-annex-utils { };
+ git-appraise = callPackage ./git-appraise {};
+
git-bug = callPackage ./git-bug { };
# support for bugzilla
@@ -101,6 +80,14 @@ let
git-extras = callPackage ./git-extras { };
+ git-fame = callPackage ./git-fame {};
+
+ git-fast-export = callPackage ./fast-export { };
+
+ git-filter-repo = callPackage ./git-filter-repo {
+ pythonPackages = python3Packages;
+ };
+
git-gone = callPackage ./git-gone {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -117,6 +104,8 @@ let
git-machete = python3Packages.callPackage ./git-machete { };
+ git-my = callPackage ./git-my { };
+
git-octopus = callPackage ./git-octopus { };
git-open = callPackage ./git-open { };
@@ -127,6 +116,8 @@ let
utillinux = if stdenv.isLinux then utillinuxMinimal else utillinux;
};
+ git-remote-gcrypt = callPackage ./git-remote-gcrypt { };
+
git-remote-hg = callPackage ./git-remote-hg { };
git-reparent = callPackage ./git-reparent { };
@@ -153,9 +144,20 @@ let
git2cl = callPackage ./git2cl { };
- gitFastExport = callPackage ./fast-export { };
+ # The full-featured Git.
+ gitFull = gitBase.override {
+ svnSupport = true;
+ guiSupport = true;
+ sendEmailSupport = true;
+ withLibsecret = !stdenv.isDarwin;
+ };
- gitRemoteGcrypt = callPackage ./git-remote-gcrypt { };
+ # Git with SVN support, but without GUI.
+ gitSVN = lowPrio (appendToName "with-svn" (gitBase.override {
+ svnSupport = true;
+ }));
+
+ gita = python3Packages.callPackage ./gita {};
gitflow = callPackage ./gitflow { };
@@ -167,34 +169,31 @@ let
inherit (darwin) Security;
};
- hubUnstable = throw "use gitAndTools.hub instead";
-
lab = callPackage ./lab { };
lefthook = callPackage ./lefthook { };
- pre-commit = pkgs.python3Packages.toPythonApplication pkgs.python3Packages.pre-commit;
-
pass-git-helper = python3Packages.callPackage ./pass-git-helper { };
+ pre-commit = pkgs.python3Packages.toPythonApplication pkgs.python3Packages.pre-commit;
+
qgit = qt5.callPackage ./qgit { };
- stgit = callPackage ./stgit {
- };
+ stgit = callPackage ./stgit { };
subgit = callPackage ./subgit { };
+ svn-all-fast-export = libsForQt5.callPackage ./svn-all-fast-export { };
+
svn2git = callPackage ./svn2git {
git = gitSVN;
};
- svn-all-fast-export = libsForQt5.callPackage ./svn-all-fast-export { };
-
thicket = callPackage ./thicket { };
tig = callPackage ./tig { };
- topGit = callPackage ./topgit { };
+ top-git = callPackage ./topgit { };
transcrypt = callPackage ./transcrypt { };
@@ -202,8 +201,12 @@ let
} // lib.optionalAttrs (config.allowAliases or true) (with self; {
# aliases
+ darcsToGit = darcs-to-git;
gitAnnex = git-annex;
+ gitFastExport = git-fast-export;
+ gitRemoteGcrypt = git-remote-gcrypt;
svn_all_fast_export = svn-all-fast-export;
+ topGit = top-git;
});
in
self
diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix
index 36ce0a484b3..91c448e7857 100644
--- a/pkgs/applications/version-management/git-and-tools/delta/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "01jiqizg1ywvrrwhqzfqzbaqrzyfaqm66sixas0mpyzmd6cdwmh6";
};
- # Delete this on next update; see #79975 for details
- legacyCargoFetcher = true;
-
- cargoSha256 = "1zmk70hccrxn1gdr1bksnvh6sa2h4518s0ni8k2ihxi4ld1ch5p2";
+ cargoSha256 = "0hah0qfgnl4w2h0djyh4xx1jks5dkzwin01qw001dqiasl60prn2";
meta = with lib; {
homepage = "https://github.com/dandavison/delta";
diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix
index 19f97e8994c..594d2a3abae 100644
--- a/pkgs/applications/version-management/git-and-tools/gh/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gh";
- version = "0.5.5";
+ version = "0.5.7";
src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "v${version}";
- sha256 = "0jmkcx95kngzylqhllg33s094rggpsrgky704z8v6j4969xgrfnc";
+ sha256 = "14j8210c1dndnhb8l2ifxcljzhajjhil86lvk9y7ndjkq09805q1";
};
- modSha256 = "0ina3m2ixkkz2fws6ifwy34pmp6kn5s3j7w40alz6vmybn2smy1h";
+ modSha256 = "1qwcl74sg5az9vaivnvn7f40p72ilmkms5rp52sp5imfrql81lxf";
buildFlagsArray = [
"-ldflags=-X github.com/cli/cli/command.Version=${version}"
diff --git a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix
index f07e05e23e2..3f5cbad4c12 100644
--- a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix
@@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
- # Delete this on next update; see #79975 for details
- legacyCargoFetcher = true;
-
- cargoSha256 = "1khplyglavsidh13nnq9y5rxd5w89ail08wgzn29a5m03zir1yfd";
+ cargoSha256 = "13gikjswbb0kkpvb5zhj88qq5l667624gkfb7hd3zygh4qyhsy05";
meta = with stdenv.lib; {
homepage = "https://github.com/tummychow/git-absorb";
diff --git a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix
index 635393b1deb..2517e20ce9d 100644
--- a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix
@@ -10,10 +10,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "0bzq4ridzb4l1zqrj1r0vlzkjpgfaqwky5jf49cwjhz4ybwrfpkq";
};
- # Delete this on next update; see #79975 for details
- legacyCargoFetcher = true;
-
- cargoSha256 = "1k5gxbjv4a8l5y9rm0n4vwzlwp4hk1rb59v0wvcirmj0p7hpw9x9";
+ cargoSha256 = "0r0hyp15knbbs4l9rcn395pzrx2vbibmwvs4pmga363irmi8mcy5";
meta = with lib; {
homepage = "https://github.com/softprops/git-codeowners";
diff --git a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix
index 54f7e935ea3..aaf22c940cb 100644
--- a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "05wlng563p9iy0ky3z23a4jakcix887fb45r7j2mk0fp5ykdjmzh";
};
- # Delete this on next update; see #79975 for details
- legacyCargoFetcher = true;
-
- cargoSha256 = "1s3v5p6qgz74sh34gvajf453fsgl13sds4v8hz8c6ivipz4hpby2";
+ cargoSha256 = "1scp9rzn59akxsf9p48j1zq6clbwdyasnyi4j28nj03ghvdv2i33";
nativeBuildInputs = [ pkgconfig makeWrapper ];
diff --git a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix
index e50efb5c6b7..d8125f604bf 100644
--- a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix
@@ -13,10 +13,7 @@ buildRustPackage rec {
sha256 = "0krz50pw9bkyzl78bvppk6skbpjp8ga7bd34jya4ha1xfmd8p89c";
};
- # Delete this on next update; see #79975 for details
- legacyCargoFetcher = true;
-
- cargoSha256 = "1ccipxifnm38315qigaq28hlzam2wr8q2p2dbcq96kar6pq377vf";
+ cargoSha256 = "0vcg2pl0s329fr8p23pwdx2jy7qahbr7n337ib61f69aaxi1xmq0";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openssl ]
diff --git a/pkgs/applications/version-management/git-and-tools/git-my/default.nix b/pkgs/applications/version-management/git-and-tools/git-my/default.nix
new file mode 100644
index 00000000000..8a5ec250932
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-my/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ pname = "git-my";
+ version = "1.1.2";
+
+ src = fetchFromGitHub {
+ owner = "davidosomething";
+ repo = "git-my";
+ rev = version;
+ sha256 = "0jji5zw25jygj7g4f6f3k0p0s9g37r8iad8pa0s67cxbq2v4sc0v";
+ };
+
+ dontBuild = true;
+
+ installPhase = ''
+ install -Dm755 -t "$out"/bin ./git-my
+ '';
+
+ meta = with stdenv.lib; {
+ description =
+ "List remote branches if they're merged and/or available locally";
+ homepage = https://github.com/davidosomething/git-my;
+ license = licenses.free;
+ maintainers = with maintainers; [ bb010g ];
+ platforms = platforms.all;
+ };
+}
+
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index a7f13905e7c..9396c6cd99c 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -21,7 +21,7 @@ assert sendEmailSupport -> perlSupport;
assert svnSupport -> perlSupport;
let
- version = "2.25.0";
+ version = "2.25.1";
svn = subversionClient.override { perlBindings = perlSupport; };
gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
- sha256 = "1l58v42aazj0x9276gk8r9mwyl9pgp9w99aakz4xfhzv7wd2jq60";
+ sha256 = "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2";
};
outputs = [ "out" ];
diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
index ca0c905874e..ee4cc61c63f 100644
--- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
@@ -1,14 +1,14 @@
-{callPackage, stdenv, fetchFromGitHub, ...}:
+{ callPackage, stdenv, fetchFromGitHub, ...}:
stdenv.mkDerivation {
pname = "gitstatus";
- version = "unstable-2020-01-28";
+ version = "unstable-2020-02-26";
src = fetchFromGitHub {
owner = "romkatv";
repo = "gitstatus";
- rev = "edb99aa7b86d10ad0a1cfe25135b57c8031d82ad";
- sha256 = "1nys74qswwc7hn9cv0j7syvbpnw0f15chc9pi11him4d6lsflrfd";
+ rev = "c0e5a24299c1a1a71434dac1de6ea650e80fbe49";
+ sha256 = "0fj84cvr5a895jqgg86raakx6lqyyhahf1dgzgx05y2gfvnxxh8m";
};
buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ];
diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix
index 211ad1eccd8..1279e5dd6c9 100644
--- a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix
@@ -1,4 +1,4 @@
-{fetchFromGitHub, libgit2, ...}:
+{ fetchFromGitHub, libgit2, ...}:
libgit2.overrideAttrs (oldAttrs: {
cmakeFlags = oldAttrs.cmakeFlags ++ [
@@ -13,7 +13,7 @@ libgit2.overrideAttrs (oldAttrs: {
src = fetchFromGitHub {
owner = "romkatv";
repo = "libgit2";
- rev = "75be63625a0de418ec3551306362ee1e21034039";
- sha256 = "1bwr1ahfxn1nn2f78ri91icxpv8xhpmgypcvg042cmcpm2qrahz9";
+ rev = "bb77509f4436901f3958e30272026f63d2247d7d";
+ sha256 = "06iypr0sc6g11xipwfbgm6f039d4qy9krmwb3zww8k4y004s5jcv";
};
})
diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix
index 7af3e70f211..543ca58401a 100644
--- a/pkgs/applications/version-management/git-repo/default.nix
+++ b/pkgs/applications/version-management/git-repo/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "git-repo";
- version = "2.3";
+ version = "2.4.1";
src = fetchFromGitHub {
owner = "android";
repo = "tools_repo";
rev = "v${version}";
- sha256 = "0jrll0mjfwakyjvlhbxwsdi32jhgss9mwz8c8h24n1qbqqxysrk4";
+ sha256 = "0khg1731927gvin73dcbw1657kbfq4k7agla5rpzqcnwkk5agzg3";
};
patches = [ ./import-ssl-module.patch ];
diff --git a/pkgs/applications/version-management/git-repo/import-ssl-module.patch b/pkgs/applications/version-management/git-repo/import-ssl-module.patch
index 783a2c17dee..f1ec4e3a7dd 100644
--- a/pkgs/applications/version-management/git-repo/import-ssl-module.patch
+++ b/pkgs/applications/version-management/git-repo/import-ssl-module.patch
@@ -1,9 +1,11 @@
---- a/repo 2020-02-05 21:11:52.773854798 +0100
-+++ b/repo 2020-02-05 21:12:34.018329462 +0100
-@@ -137,6 +137,7 @@
+diff --git a/repo b/repo
+index 8b05def..f394b3e 100755
+--- a/repo
++++ b/repo
+@@ -236,6 +236,7 @@ import optparse
+ import re
+ import shutil
import stat
- import subprocess
- import sys
+import ssl
if sys.version_info[0] == 3:
diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/applications/version-management/sourcehut/default.nix
index 3fa5399c2b5..f6de0036afe 100644
--- a/pkgs/applications/version-management/sourcehut/default.nix
+++ b/pkgs/applications/version-management/sourcehut/default.nix
@@ -6,7 +6,7 @@
# https://github.com/NixOS/nixpkgs/pull/54425#discussion_r250688781
let
- fetchNodeModules = callPackage ../../networking/instant-messengers/rambox/fetchNodeModules.nix { };
+ fetchNodeModules = callPackage ./fetchNodeModules.nix { };
python = python37.override {
packageOverrides = self: super: {
diff --git a/pkgs/applications/networking/instant-messengers/rambox/fetchNodeModules.nix b/pkgs/applications/version-management/sourcehut/fetchNodeModules.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/rambox/fetchNodeModules.nix
rename to pkgs/applications/version-management/sourcehut/fetchNodeModules.nix
diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix
index 388476cbf8e..aee6fab77a2 100644
--- a/pkgs/applications/video/devede/default.nix
+++ b/pkgs/applications/video/devede/default.nix
@@ -2,7 +2,7 @@
, gtk3, gettext, wrapGAppsHook, gdk-pixbuf, gobject-introspection }:
let
- inherit (python3Packages) dbus-python buildPythonApplication pygobject3 urllib3;
+ inherit (python3Packages) dbus-python buildPythonApplication pygobject3 urllib3 setuptools;
in buildPythonApplication {
name = "devede-4.8.8";
@@ -34,7 +34,7 @@ in buildPythonApplication {
];
propagatedBuildInputs = [
- gtk3 pygobject3 gdk-pixbuf dbus-python ffmpeg mplayer dvdauthor vcdimager cdrkit urllib3
+ gtk3 pygobject3 gdk-pixbuf dbus-python ffmpeg mplayer dvdauthor vcdimager cdrkit urllib3 setuptools
];
postPatch = ''
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 4fae93aa1a1..eef390d30ed 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchFromGitHub, autoconf, automake, libtool, makeWrapper, linuxHeaders
+{ stdenv, lib, fetchpatch, fetchurl, fetchFromGitHub, autoconf, automake, libtool, makeWrapper, linuxHeaders
, pkgconfig, cmake, gnumake, yasm, python2Packages
, libgcrypt, libgpgerror, libunistring
, boost, avahi, lame, autoreconfHook
@@ -194,6 +194,15 @@ in stdenv.mkDerivation {
autoconf automake libtool # still needed for some components. Check if that is the case with 19.0
] ++ lib.optionals useWayland [ wayland-protocols ];
+ patches = [
+ # Adds missing cassert includes, fixing builds. This will be unnecessary
+ # after 18.6 is released (which will contain this patch)
+ (fetchpatch {
+ url = "https://github.com/xbmc/xbmc/commit/d5947e6733fd564edb68df91fd6d389d9fb82319.patch";
+ sha256 = "1shlbsbfba3074wdyhl42vgin6jfzl7sy3zsvxaxkpx8g7my9jn2";
+ })
+ ];
+
cmakeFlags = [
"-Dlibdvdcss_URL=${libdvdcss.src}"
"-Dlibdvdnav_URL=${libdvdnav.src}"
diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/applications/video/peek/default.nix
index 4872b5ec2eb..ce0ea532c4c 100644
--- a/pkgs/applications/video/peek/default.nix
+++ b/pkgs/applications/video/peek/default.nix
@@ -25,13 +25,13 @@
stdenv.mkDerivation rec {
pname = "peek";
- version = "1.4.0";
+ version = "1.5.1";
src = fetchFromGitHub {
owner = "phw";
repo = "peek";
rev = version;
- sha256 = "0q70hz9anqywqgksd43i8v9ijwy6djyzwnzzd94j44xqwsk9zdbb";
+ sha256 = "1xwlfizga6hvjqq127py8vabaphsny928ar7mwqj9cyqfl6fx41x";
};
nativeBuildInputs = [
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = https://github.com/phw/peek;
+ homepage = "https://github.com/phw/peek";
description = "Simple animated GIF screen recorder with an easy to use interface";
license = licenses.gpl3;
maintainers = with maintainers; [ puffnfresh worldofpeace ];
diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index 6926f7e8eae..f0959284d66 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -8,13 +8,13 @@ assert stdenv.lib.versionAtLeast mlt.version "6.18.0";
mkDerivation rec {
pname = "shotcut";
- version = "19.12.31";
+ version = "20.02.17";
src = fetchFromGitHub {
owner = "mltframework";
repo = "shotcut";
rev = "v${version}";
- sha256 = "1vwgah8pp2kbd0iaz952d3bwxphk06yxqc0pi4hk1mklkh87qzm9";
+ sha256 = "0nsqlbapqgxccb7mnvxqw4hdddj944d4z5jxafpv0cwj7s3z8wj0";
};
patches = [ ./0001-encodedock.cpp-connect-to-VAAPI-via-DRM-not-X11.patch ];
diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix
index 9eaf2d6c5c2..c82e29eb9a6 100644
--- a/pkgs/applications/virtualization/crun/default.nix
+++ b/pkgs/applications/virtualization/crun/default.nix
@@ -1,6 +1,36 @@
-{ stdenv, lib, fetchFromGitHub, autoreconfHook, go-md2man, pkgconfig
-, libcap, libseccomp, python3, systemd, yajl }:
+{ stdenv
+, lib
+, fetchFromGitHub
+, autoreconfHook
+, go-md2man
+, pkgconfig
+, libcap
+, libseccomp
+, python3
+, systemd
+, yajl
+}:
+let
+ # these tests require additional permissions
+ disabledTests = [
+ "test_capabilities.py"
+ "test_cwd.py"
+ "test_detach.py"
+ "test_exec.py"
+ "test_hooks.py"
+ "test_hostname.py"
+ "test_paths.py"
+ "test_pid.py"
+ "test_pid_file.py"
+ "test_preserve_fds.py"
+ "test_start.py"
+ "test_uid_gid.py"
+ "test_update.py"
+ "tests_libcrun_utils"
+ ];
+
+in
stdenv.mkDerivation rec {
pname = "crun";
version = "0.12.2.1";
@@ -19,16 +49,18 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- preBuild = ''
- cat > git-version.h < .tarball-version
+ echo '#define GIT_VERSION "${src.rev}"' > git-version.h
+
+ ${lib.concatMapStringsSep "\n" (e:
+ "substituteInPlace Makefile.am --replace 'tests/${e}' ''"
+ ) disabledTests}
'';
- # the tests require additional permissions
- doCheck = false;
+ doCheck = true;
meta = with lib; {
description = "A fast and lightweight fully featured OCI runtime and C library for running containers";
diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix
index cd6600387cd..d56318555e5 100644
--- a/pkgs/applications/virtualization/lkl/default.nix
+++ b/pkgs/applications/virtualization/lkl/default.nix
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
# Fix a /usr/bin/env reference in here that breaks sandboxed builds
prePatch = "patchShebangs arch/lkl/scripts";
+ # Fixup build with newer Linux headers: https://github.com/lkl/linux/pull/484
+ postPatch = "sed '1i#include ' -i tools/lkl/lib/hijack/xlate.c";
installPhase = ''
mkdir -p $out/bin $lib/lib $dev
diff --git a/pkgs/applications/virtualization/umoci/default.nix b/pkgs/applications/virtualization/umoci/default.nix
index 245bb841af6..f07bb0fc164 100644
--- a/pkgs/applications/virtualization/umoci/default.nix
+++ b/pkgs/applications/virtualization/umoci/default.nix
@@ -1,21 +1,23 @@
-{ stdenv, fetchFromGitHub, buildGoPackage }:
+{ lib, fetchFromGitHub, buildGoPackage }:
buildGoPackage rec {
pname = "umoci";
- version = "0.4.4";
-
- goPackagePath = "github.com/openSUSE/umoci";
+ version = "0.4.5";
src = fetchFromGitHub {
owner = "openSUSE";
repo = "umoci";
rev = "v${version}";
- sha256 = "1mmk9y6xk0qk5rgysmm7x16b025zzwa2sd13jd32drd48scai2dw";
+ sha256 = "1gzj4nnys73wajdwjn5jsskvnhzh8s2vmyl76ax8drpvw19bd5g3";
};
- meta = with stdenv.lib; {
+ goPackagePath = "github.com/openSUSE/umoci";
+
+ buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
+
+ meta = with lib; {
description = "umoci modifies Open Container images";
- homepage = https://umo.ci;
+ homepage = "https://umo.ci";
license = licenses.asl20;
maintainers = with maintainers; [ zokrezyl ];
platforms = platforms.linux;
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index 403d9939e13..fd964215d45 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "i3";
- version = "4.17.1";
+ version = "4.18";
src = fetchurl {
url = "https://i3wm.org/downloads/${pname}-${version}.tar.bz2";
- sha256 = "0iazv2i2rgmakzh95pgj6iapyzn7bdpcbcd35a79mhlml4ry33qy";
+ sha256 = "0dv5g8ycfmijxfjyw8hzsxaf80v09lb73zh7x2vszy78h3amifqz";
};
nativeBuildInputs = [ which pkgconfig makeWrapper ];
diff --git a/pkgs/applications/window-managers/sway/lock-fancy.nix b/pkgs/applications/window-managers/sway/lock-fancy.nix
index aa2db698f74..338d626d990 100644
--- a/pkgs/applications/window-managers/sway/lock-fancy.nix
+++ b/pkgs/applications/window-managers/sway/lock-fancy.nix
@@ -14,13 +14,13 @@ let
];
in stdenv.mkDerivation rec {
pname = "swaylock-fancy-unstable";
- version = "2019-03-31";
+ version = "2020-02-22";
src = fetchFromGitHub {
owner = "Big-B";
repo = "swaylock-fancy";
- rev = "35618ceec70338047355b6b057825e68f16971b5";
- sha256 = "06fjqwblmj0d9pq6y11rr73mizirna4ixy6xkvblf1c7sn5n8lpc";
+ rev = "5cf977b12f372740aa7b7e5a607d583f93f1e028";
+ sha256 = "0laqwzi6069sgz91i69438ns0g2nq4zkqickavrf80h4g3gcs8vm";
};
postPatch = ''
diff --git a/pkgs/build-support/src-only/default.nix b/pkgs/build-support/src-only/default.nix
index a93b3648090..c2f7cfb9399 100644
--- a/pkgs/build-support/src-only/default.nix
+++ b/pkgs/build-support/src-only/default.nix
@@ -1,4 +1,4 @@
-{stdenv, name, src, patches ? [], buildInputs ? [], ...}:
+{ stdenv, name, src, patches ? [], buildInputs ? [] }:
stdenv.mkDerivation {
inherit src buildInputs patches name;
installPhase = "cp -r . $out";
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index a7050f52e52..488c7f2ce2c 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -126,6 +126,10 @@ rec {
mkdir -p /fs/etc
ln -sf /proc/mounts /fs/etc/mtab
echo "127.0.0.1 localhost" > /fs/etc/hosts
+ # Ensures tools requiring /etc/passwd will work (e.g. nix)
+ if [ ! -e /fs/etc/passwd ]; then
+ echo "root:x:0:0:System administrator:/root:/bin/sh" > /fs/etc/passwd
+ fi
echo "starting stage 2 ($command)"
exec switch_root /fs $command $out
diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version
index 7fb5e413a26..6a66f94597f 100755
--- a/pkgs/common-updater/scripts/update-source-version
+++ b/pkgs/common-updater/scripts/update-source-version
@@ -144,6 +144,10 @@ if [[ -n "$sri" ]]; then
tempHash="$(nix to-sri --type "$oldHashAlgo" "$tempHash")"
fi
+# Escape regex metacharacter that are allowed in hashes (+)
+oldHashEscaped=$(echo "$oldHash" | sed -re 's|[+]|\\&|g')
+tempHashEscaped=$(echo "$tempHash" | sed -re 's|[+]|\\&|g')
+
# Replace new version
sed -i.bak "$nixFile" -re "$pattern"
if cmp -s "$nixFile" "$nixFile.bak"; then
@@ -159,7 +163,7 @@ if [[ -n "$newUrl" ]]; then
fi
fi
-sed -i "$nixFile" -re "s|\"$oldHash\"|\"$tempHash\"|"
+sed -i "$nixFile" -re "s|\"$oldHashEscaped\"|\"$tempHash\"|"
if cmp -s "$nixFile" "$nixFile.bak"; then
die "Failed to replace source hash of '$attr' to a temporary hash!"
fi
@@ -168,12 +172,12 @@ fi
if [[ -z "$newHash" ]]; then
nix-build $systemArg --no-out-link -A "$attr.src" 2>"$attr.fetchlog" >/dev/null || true
# FIXME: use nix-build --hash here once https://github.com/NixOS/nix/issues/1172 is fixed
- newHash=$(grep --extended-regexp --invert-match "killing process|dependencies couldn't be built|wanted: " "$attr.fetchlog" | tail -n2 | sed "s~output path .* has .* hash ‘\(.*\)’ when .* was expected\|fixed-output derivation produced path '.*' with .* hash '\(.*\)' instead of the expected hash '.*'\| got: .*:\(.*\)~\1\2\3~" | head -n1)
-fi
+ newHash=$(sed '1,/hash mismatch in fixed-output derivation/d' "$attr.fetchlog" | grep --perl-regexp --only-matching 'got: +.+[:-]\K.+')
-if [[ -n "$sri" ]]; then
- # nix-build preserves the hashing scheme so we can just convert the result to SRI using the old type
- newHash="$(nix to-sri --type "$oldHashAlgo" "$newHash")"
+ if [[ -n "$sri" ]]; then
+ # nix-build preserves the hashing scheme so we can just convert the result to SRI using the old type
+ newHash="$(nix to-sri --type "$oldHashAlgo" "$newHash")"
+ fi
fi
if [[ -z "$newHash" ]]; then
@@ -186,7 +190,7 @@ if [[ -z "${ignoreSameHash}" && "$oldVersion" != "$newVersion" && "$oldHash" = "
die "Both the old and new source hashes of '$attr.src' were equivalent. Please fix the package's source URL to be dependent on '\${version}'!"
fi
-sed -i "$nixFile" -re "s|\"$tempHash\"|\"$newHash\"|"
+sed -i "$nixFile" -re "s|\"$tempHashEscaped\"|\"$newHash\"|"
if cmp -s "$nixFile" "$nixFile.bak"; then
die "Failed to replace temporary source hash of '$attr' to the final source hash!"
fi
diff --git a/pkgs/data/fonts/babelstone-han/default.nix b/pkgs/data/fonts/babelstone-han/default.nix
index 0d46fc92d5f..da2d67c084f 100644
--- a/pkgs/data/fonts/babelstone-han/default.nix
+++ b/pkgs/data/fonts/babelstone-han/default.nix
@@ -1,16 +1,17 @@
{ lib, fetchzip }:
let
- version = "12.1.7";
+ version = "13.0.3";
in fetchzip {
name = "babelstone-han-${version}";
- url = https://www.babelstone.co.uk/Fonts/Download/BabelStoneHan.zip;
+ # upstream download links are unversioned, so hash changes
+ url = https://web.archive.org/web/20200210125314/https://www.babelstone.co.uk/Fonts/Download/BabelStoneHan.zip;
postFetch = ''
mkdir -p $out/share/fonts/truetype
unzip $downloadedFile '*.ttf' -d $out/share/fonts/truetype
'';
- sha256 = "07liv0lmk28ybxccf91gp2wmc17pk3fcshixpj0jx069b64zwf1v";
+ sha256 = "018isk3hbzsihzrxavgjbn485ngzvlm96npqx9y7zpkxsssslc4w";
meta = with lib; {
description = "Unicode CJK font with over 36000 Han characters";
@@ -18,7 +19,6 @@ in fetchzip {
license = licenses.free;
platforms = platforms.all;
- hydraPlatforms = [];
- maintainers = [ maintainers.volth ];
+ maintainers = with maintainers; [ volth emily ];
};
}
diff --git a/pkgs/data/fonts/cozette/default.nix b/pkgs/data/fonts/cozette/default.nix
new file mode 100644
index 00000000000..a5d9f905562
--- /dev/null
+++ b/pkgs/data/fonts/cozette/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, fetchurl, mkfontscale }:
+
+let
+ version = "1.5.1";
+ releaseUrl =
+ "https://github.com/slavfox/Cozette/releases/download/v.${version}";
+in stdenv.mkDerivation rec {
+ pname = "Cozette";
+ inherit version;
+
+ srcs = map fetchurl [
+ {
+ url = "${releaseUrl}/cozette.otb";
+ sha256 = "05k45n7jar11gnng2awpmc7zk9jdlzd6wz87xx49cp75jm4z9xm8";
+ }
+ {
+ url = "${releaseUrl}/CozetteVector.otf";
+ sha256 = "1sqhnjpizn1wi26lc7z2zml7yr7zkcpa72mh1drvd74rlcs1ip30";
+ }
+ {
+ url = "${releaseUrl}/CozetteVector.ttf";
+ sha256 = "1q4ml8shv9lmyc6bwhffwvbvl92s73j7xkb0rkqvci4f0zbz7mcy";
+ }
+ ];
+
+ nativeBuildInputs = [ mkfontscale ];
+
+ sourceRoot = "./";
+
+ unpackCmd = ''
+ otName=$(stripHash "$curSrc")
+ cp $curSrc ./$otName
+ '';
+
+ installPhase = ''
+
+ install -D -m 644 *.otf -t "$out/share/fonts/opentype"
+ install -D -m 644 *.ttf -t "$out/share/fonts/truetype"
+ install -D -m 644 *.otb -t "$out/share/fonts/misc"
+
+ mkfontdir "$out/share/fonts/misc"
+ mkfontscale "$out/share/fonts/truetype"
+ mkfontscale "$out/share/fonts/opentype"
+ '';
+
+ outputs = [ "out" ];
+
+ meta = with stdenv.lib; {
+ description = "A bitmap programming font optimized for coziness.";
+ homepage = "https://github.com/slavfox/cozette";
+ license = licenses.mit;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ brettlyons ];
+ };
+}
diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index e6e3aeba9de..4ff0ed5fe49 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
buildPhase = ''
runHook preBuild
- npm run build -- ttf::$pname >/dev/null
+ npm run build --no-update-notifier -- ttf::$pname >/dev/null
runHook postBuild
'';
diff --git a/pkgs/data/fonts/merriweather-sans/default.nix b/pkgs/data/fonts/merriweather-sans/default.nix
new file mode 100644
index 00000000000..397f42236b5
--- /dev/null
+++ b/pkgs/data/fonts/merriweather-sans/default.nix
@@ -0,0 +1,34 @@
+{ stdenvNoCC
+, lib
+, fetchFromGitHub
+}:
+
+stdenvNoCC.mkDerivation rec {
+ pname = "merriweather-sans";
+ version = "1.008";
+
+ src = fetchFromGitHub {
+ owner = "SorkinType";
+ repo = "Merriweather-Sans";
+ rev = "8a1b078e3aeec6aecc856c3422898816af9b9dc7";
+ sha256 = "1f6a64bv4b4b1v3g2pgrzxcys8rk12wq6wfxamgzligcq5fxaffd";
+ };
+
+ # TODO: it would be nice to build this from scratch, but lots of
+ # Python dependencies to package (fontmake, gftools)
+
+ installPhase = ''
+ install -m444 -Dt $out/share/fonts/truetype/${pname} fonts/ttfs/*.ttf
+ install -m444 -Dt $out/share/fonts/woff/${pname} fonts/woff/*.woff
+ install -m444 -Dt $out/share/fonts/woff2/${pname} fonts/woff2/*.woff2
+ # TODO: install variable version?
+ '';
+
+ meta = with lib; {
+ homepage = "https://github.com/SorkinType/Merriweather-Sans";
+ description = "Merriweather Sans is a low-contrast semi-condensed sans-serif text typeface family designed to be pleasant to read at very small sizes";
+ license = licenses.ofl;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ emily ];
+ };
+}
diff --git a/pkgs/data/fonts/merriweather/default.nix b/pkgs/data/fonts/merriweather/default.nix
new file mode 100644
index 00000000000..1768c44bc03
--- /dev/null
+++ b/pkgs/data/fonts/merriweather/default.nix
@@ -0,0 +1,35 @@
+{ stdenvNoCC
+, lib
+, fetchFromGitHub
+}:
+
+stdenvNoCC.mkDerivation rec {
+ pname = "merriweather";
+ version = "2.005";
+
+ src = fetchFromGitHub {
+ owner = "SorkinType";
+ repo = "Merriweather";
+ rev = "4fd88c9299009d1c1d201e7da3ff75cf1de5153a";
+ sha256 = "1ndycja2jzhcfbqbm0p6ka2zl1i1pdbkf0crw2lp3pi4k89wlm29";
+ };
+
+ # TODO: it would be nice to build this from scratch, but lots of
+ # Python dependencies to package (fontmake, gftools)
+
+ installPhase = ''
+ install -m444 -Dt $out/share/fonts/opentype/${pname} fonts/otf/*.otf
+ install -m444 -Dt $out/share/fonts/truetype/${pname} fonts/ttfs/*.ttf
+ install -m444 -Dt $out/share/fonts/woff/${pname} fonts/woff/*.woff
+ install -m444 -Dt $out/share/fonts/woff2/${pname} fonts/woff2/*.woff2
+ # TODO: install variable version?
+ '';
+
+ meta = with lib; {
+ homepage = "https://github.com/SorkinType/Merriweather";
+ description = "Merriweather was designed to be a text face that is pleasant to read on screens";
+ license = licenses.ofl;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ emily ];
+ };
+}
diff --git a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
index bf19fb8238f..ccfc72dc180 100644
--- a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
+++ b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchgit, fontforge, python2, python3 }:
+{ stdenv, fetchgit, fontforge, python3 }:
stdenv.mkDerivation rec {
pname = "rictydiminished-with-firacode";
- version = "1.2.0";
+ version = "1.2.2";
src = fetchgit {
url = "https://github.com/hakatashi/RictyDiminished-with-FiraCode.git";
rev = version;
- sha256 = "1vlzx5dsx6j9d9q84pdnwcxjy7mr1sv8sacx0zgfxhxnj66n1gnn";
+ sha256 = "sha256-twh3yLAM4MUjWzSDNmo8gNIRf01hieXeOS334sNdFk4=";
fetchSubmodules = true;
};
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
substituteInPlace apply-feature.py --replace \
'ricty = ttLib.TTFont(options.in_font)' \
'ricty = ttLib.TTFont(options.in_font, recalcTimestamp=False)'
- substituteInPlace build-py3.py --replace \
+ substituteInPlace build.py --replace \
'datetime.date.today()' \
'datetime.date.fromtimestamp(float(os.environ["SOURCE_DATE_EPOCH"]))'
'';
@@ -30,21 +30,16 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [
- # Python 3 not supported by parts of the build system
- # https://github.com/hakatashi/RictyDiminished-with-FiraCode/pull/3
- (fontforge.override {
- python = python2;
- })
(python3.withPackages (ps: [
ps.jinja2
- ps.py3to2
ps.fonttools
+ ps.fontforge
]))
];
meta = with stdenv.lib; {
homepage = "https://github.com/hakatashi/RictyDiminished-with-FiraCode";
- description = "The best Japanese programming font meets the awesone ligatures of Firacode";
+ description = "The best Japanese programming font meets the awesome ligatures of Firacode";
license = licenses.ofl;
platforms = platforms.all;
maintainers = with maintainers; [ mt-caret ];
diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix
index 3906353d82b..8becdf83f5d 100644
--- a/pkgs/data/fonts/sudo/default.nix
+++ b/pkgs/data/fonts/sudo/default.nix
@@ -1,19 +1,21 @@
{ lib, fetchzip }:
let
- version = "0.41";
+ version = "0.42";
in fetchzip {
name = "sudo-font-${version}";
url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip";
- sha256 = "055sz9jg3fg7ypk9nia4dl9haaaq3w8zx5c2cdi3iq9kj8k5gg53";
+ sha256 = "1rqpwihf2sakrhkaw041r3xc9fhafaqn22n79haqkmwv4vmnspch";
postFetch = ''
- mkdir -p $out/share/fonts/truetype/
+ mkdir -p $out/share/fonts/
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/
+ unzip -j $downloadedFile \*.woff -d $out/share/fonts/woff/
+ unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2/
'';
meta = with lib; {
description = "Font for programmers and command line users";
- homepage = https://www.kutilek.de/sudo-font/;
+ homepage = "https://www.kutilek.de/sudo-font/";
license = licenses.ofl;
maintainers = with maintainers; [ dtzWill ];
platforms = platforms.all;
diff --git a/pkgs/data/fonts/vazir-fonts/default.nix b/pkgs/data/fonts/vazir-fonts/default.nix
index f3986753809..a41013fd490 100755
--- a/pkgs/data/fonts/vazir-fonts/default.nix
+++ b/pkgs/data/fonts/vazir-fonts/default.nix
@@ -2,7 +2,7 @@
let
pname = "vazir-fonts";
- version = "19.2.0";
+ version = "22.1.0";
in fetchFromGitHub {
name = "${pname}-${version}";
@@ -12,12 +12,12 @@ in fetchFromGitHub {
postFetch = ''
tar xf $downloadedFile --strip=1
- find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/vazir-fonts {} \;
+ find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \;
'';
- sha256 = "008h095rjrcjhz9h02v6cf3gv64khj21lii4zffgpdlmvfs29f8l";
+ sha256 = "1nh3pyyw3082aizdwgyihh4z122z7kzp45ry7lzdhq9lshkpzglc";
meta = with lib; {
- homepage = https://github.com/rastikerdar/vazir-font;
+ homepage = "https://github.com/rastikerdar/vazir-font";
description = "A Persian (Farsi) Font - قلم (فونت) فارسی وزیر";
license = licenses.ofl;
platforms = platforms.all;
diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix
index c85f01d2718..96ad0e2c2b8 100644
--- a/pkgs/data/icons/numix-icon-theme-circle/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix
@@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
sha256 = "0za44h7f4vk37yl30xlaa6w76maiipb6p63gl9hl1rshdn9nxq0y";
};
- nativeBuildInputs = [ gtk3 numix-icon-theme ];
+ nativeBuildInputs = [ gtk3 ];
- propagatedBuildInputs = [
- hicolor-icon-theme
- ];
+ buildInputs = [ numix-icon-theme ];
+
+ propagatedBuildInputs = [ hicolor-icon-theme ];
dontDropIconThemeCache = true;
diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix
index 620ef02fde7..644d20cccfd 100644
--- a/pkgs/data/icons/numix-icon-theme-square/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-square/default.nix
@@ -2,20 +2,20 @@
stdenv.mkDerivation rec {
pname = "numix-icon-theme-square";
- version = "19.09.20";
+ version = "19.12.27";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
- sha256 = "0q3d4d4wndknz3043bh8ardjvdpds2hkzk73kyyh1848wg4ff0ly";
+ sha256 = "0pjbi2g7wk8gyr4lvp8fvcb8z29kc3l6v19a45axgadnc609hqw7";
};
- nativeBuildInputs = [ gtk3 numix-icon-theme ];
+ nativeBuildInputs = [ gtk3 ];
- propagatedBuildInputs = [
- hicolor-icon-theme
- ];
+ buildInputs = [ numix-icon-theme ];
+
+ propagatedBuildInputs = [ hicolor-icon-theme ];
dontDropIconThemeCache = true;
diff --git a/pkgs/data/icons/qogir-icon-theme/default.nix b/pkgs/data/icons/qogir-icon-theme/default.nix
index 8bfde381633..641b3da883e 100644
--- a/pkgs/data/icons/qogir-icon-theme/default.nix
+++ b/pkgs/data/icons/qogir-icon-theme/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "qogir-icon-theme";
- version = "2020-01-29";
+ version = "2020-02-21";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
- sha256 = "0g6qiry4gzkr48xn4qi8sdna0hi3982sywskz9adkzqcznir542h";
+ sha256 = "0m7f26dzzz5gkxi9dbbc96pl0xcvayr1ibxbjkrlsjcdvfg7p3rr";
};
nativeBuildInputs = [ gtk3 ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "A colorful design icon theme for linux desktops";
+ description = "Flat colorful design icon theme";
homepage = "https://github.com/vinceliuice/Qogir-icon-theme";
license = with licenses; [ gpl3 ];
platforms = platforms.linux;
diff --git a/pkgs/data/themes/mojave/default.nix b/pkgs/data/themes/mojave/default.nix
index 6c38e3aaba4..d560e3fe583 100644
--- a/pkgs/data/themes/mojave/default.nix
+++ b/pkgs/data/themes/mojave/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "mojave-gtk-theme";
- version = "2019-12-12";
+ version = "2020-02-20";
srcs = [
(fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
- sha256 = "0d5m9gh97db01ygqlp2sv9v1m183d9fgid9n9wms9r5rrrw6bs8m";
+ sha256 = "0fbpjfdx53g4qicr97jl1dssykjwwca9xzrfyh53dmd81vr6znpy";
})
(fetchurl {
url = "https://github.com/vinceliuice/Mojave-gtk-theme/raw/11741a99d96953daf9c27e44c94ae50a7247c0ed/macOS_Mojave_Wallpapers.tar.xz";
diff --git a/pkgs/data/themes/nordic-polar/default.nix b/pkgs/data/themes/nordic-polar/default.nix
index d1cfb800001..1ec260f5033 100644
--- a/pkgs/data/themes/nordic-polar/default.nix
+++ b/pkgs/data/themes/nordic-polar/default.nix
@@ -2,16 +2,16 @@
stdenv.mkDerivation rec {
pname = "nordic-polar";
- version = "1.5.0";
+ version = "1.6.0";
srcs = [
(fetchurl {
- url = "https://github.com/EliverLara/Nordic-Polar/releases/download/v.${version}/Nordic-Polar.tar.xz";
- sha256 = "0ddccxvyf929045x6fm8xyx6rvb0d6wh6pylycwgqqm4vxbdwnly";
+ url = "https://github.com/EliverLara/Nordic-Polar/releases/download/v${version}/Nordic-Polar.tar.xz";
+ sha256 = "0cym8rcg8jpfraqlfrmymkm0jrsk1s9p7z6vcil4vxbyim9q9w16";
})
(fetchurl {
- url = "https://github.com/EliverLara/Nordic-Polar/releases/download/v.${version}/Nordic-Polar-standard-buttons.tar.xz";
- sha256 = "0q0qfy0aw80rds6isx3pjrqx4zrq2crxrm29nrmyzh4gr7n17li6";
+ url = "https://github.com/EliverLara/Nordic-Polar/releases/download/v${version}/Nordic-Polar-standard-buttons.tar.xz";
+ sha256 = "0s4wf9nqpa75km905jh03gl2d2hjcdvfacmkdz3njviqm6pwqxsv";
})
];
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Gtk theme created using the awesome Nord color pallete";
- homepage = https://github.com/EliverLara/Nordic-Polar;
+ homepage = "https://github.com/EliverLara/Nordic-Polar";
license = licenses.gpl3;
platforms = platforms.all;
maintainers = [ maintainers.romildo ];
diff --git a/pkgs/data/themes/nordic/default.nix b/pkgs/data/themes/nordic/default.nix
index 5172b2992cc..4979738231d 100644
--- a/pkgs/data/themes/nordic/default.nix
+++ b/pkgs/data/themes/nordic/default.nix
@@ -2,24 +2,32 @@
stdenv.mkDerivation rec {
pname = "nordic";
- version = "1.6.5";
+ version = "1.8.1";
srcs = [
(fetchurl {
- url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic.tar.xz";
- sha256 = "163g1kh92fhgbwi91053xs39bpdd032w2v67c3jf8lf4cgvkwggp";
+ url = "https://github.com/EliverLara/Nordic/releases/download/V${version}/Nordic.tar.xz";
+ sha256 = "0jvc6l093gj9azkrjswdc1kqlyc6drnhsxgpzylzcgjxvxyi9vmd";
})
(fetchurl {
- url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-blue.tar.xz";
- sha256 = "05qq1v8sil8s51aa78q2najcqdnkpgdzc8dckrx47wy36cfxbxwz";
+ url = "https://github.com/EliverLara/Nordic/releases/download/V${version}/Nordic-standard-buttons.tar.xz";
+ sha256 = "049hcvccjds465v78sk3cjg7zck36l1zpyrf4p8xinj2h3b74zr8";
})
(fetchurl {
- url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-standard-buttons.tar.xz";
- sha256 = "17r450xxd8v8125a4bwd0yj3f3vnwcad2f19a0vgmk63s9grvkg0";
+ url = "https://github.com/EliverLara/Nordic/releases/download/V${version}/Nordic-darker.tar.xz";
+ sha256 = "1qaj4x451ic8mx4aak1axw29jm6ymwgh5w3n3mw5kjm1fwg4b5dz";
})
(fetchurl {
- url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-blue-standard-buttons.tar.xz";
- sha256 = "0894naw0wkl2h9l27qz9h1k02dfgfqyb02icmgadg0cb44j3zlpb";
+ url = "https://github.com/EliverLara/Nordic/releases/download/V${version}/Nordic-darker-standard-buttons.tar.xz";
+ sha256 = "19wczzppimp7sql9v0sq1sc5j0ix51270c58j22mg01kd2h2iivy";
+ })
+ (fetchurl {
+ url = "https://github.com/EliverLara/Nordic/releases/download/V${version}/Nordic-bluish-accent.tar.xz";
+ sha256 = "1jvjjxiz8q9583f3gidky65s2g5pd5bkvbx0jvwn0p0kz8vlzmzk";
+ })
+ (fetchurl {
+ url = "https://github.com/EliverLara/Nordic/releases/download/V${version}/Nordic-bluish-accent-standard-buttons.tar.xz";
+ sha256 = "0wqn0aszddq8nbh6c667rwhy7c1zky23a9q3d8gci421n20l6lyd";
})
];
@@ -35,7 +43,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Dark Gtk theme created using the awesome Nord color pallete";
- homepage = https://github.com/EliverLara/Nordic;
+ homepage = "https://github.com/EliverLara/Nordic";
license = licenses.gpl3;
platforms = platforms.all;
maintainers = [ maintainers.romildo ];
diff --git a/pkgs/data/themes/qogir/default.nix b/pkgs/data/themes/qogir/default.nix
index 44993c7e2ec..286b2922953 100644
--- a/pkgs/data/themes/qogir/default.nix
+++ b/pkgs/data/themes/qogir/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "qogir-theme";
- version = "2019-10-25";
+ version = "2020-02-20";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
- sha256 = "027c9pbfv5flqrjcvmbyjrfi37nzq33z19bai4zjjxjvryfqpmlm";
+ sha256 = "0f0fa13ql59j9zv24vnsai76i0qwawh3jxzj1p78yfvcfmg45jcn";
};
buildInputs = [ gdk-pixbuf librsvg ];
diff --git a/pkgs/data/themes/vimix/default.nix b/pkgs/data/themes/vimix/default.nix
new file mode 100644
index 00000000000..1b3d2005f08
--- /dev/null
+++ b/pkgs/data/themes/vimix/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, gtk_engines, gtk-engine-murrine }:
+
+stdenv.mkDerivation rec {
+ pname = "vimix-gtk-themes";
+ version = "2020-02-24";
+
+ src = fetchFromGitHub {
+ owner = "vinceliuice";
+ repo = pname;
+ rev = version;
+ sha256 = "18v7yhwzachjgy276rdhj5cg353f0qysa2kxk9gyc6s71q2gjzcv";
+ };
+
+ buildInputs = [ gtk_engines ];
+
+ propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+
+ installPhase = ''
+ patchShebangs .
+ mkdir -p $out/share/themes
+ name= ./install.sh -d $out/share/themes
+ rm $out/share/themes/*/{AUTHORS,LICENSE}
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Flat Material Design theme for GTK based desktop environments";
+ homepage = "https://github.com/vinceliuice/vimix-gtk-themes";
+ license = licenses.gpl3;
+ platforms = platforms.unix;
+ maintainers = [ maintainers.romildo ];
+ };
+}
diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix
index 2c3686f63d0..27a879af184 100644
--- a/pkgs/data/themes/yaru/default.nix
+++ b/pkgs/data/themes/yaru/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "yaru";
- version = "19.10.5";
+ version = "20.04.1";
src = fetchFromGitHub {
owner = "ubuntu";
repo = "yaru";
rev = version;
- sha256 = "0d53flfkb01kycchdhv72ga0qh8947bxvm5njfrrbk6rqfg0zc1v";
+ sha256 = "0c9az0bmnrnkgxfifp6nkan5bvjrkqrpg38zsp2vg493bm3bpbg1";
};
nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ];
diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix
index b2a0eea6d5e..ffa902a2891 100644
--- a/pkgs/desktops/mate/mate-themes/default.nix
+++ b/pkgs/desktops/mate/mate-themes/default.nix
@@ -1,21 +1,23 @@
-{ stdenv, fetchurl, pkgconfig, intltool, mate, gtk2, gtk3,
+{ stdenv, fetchurl, pkgconfig, gettext, mate-icon-theme, gtk2, gtk3,
gtk_engines, gtk-engine-murrine, gdk-pixbuf, librsvg }:
stdenv.mkDerivation rec {
pname = "mate-themes";
- version = "3.22.20";
+ version = "3.22.21";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/themes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0c3dhf8p9nc2maky4g9xr04iil9wwbdkmhpzynlc6lfg4ksqq2bx";
+ sha256 = "051g2vq817g84yrqzf7hjcqr4xrghnw1rprjd6jf5mhhzmwcas6n";
};
- nativeBuildInputs = [ pkgconfig intltool gtk3 ];
+ nativeBuildInputs = [ pkgconfig gettext gtk3 ];
- buildInputs = [ mate.mate-icon-theme gtk2 gtk_engines gdk-pixbuf librsvg ];
+ buildInputs = [ mate-icon-theme gtk2 gtk_engines gdk-pixbuf librsvg ];
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+ dontDropIconThemeCache = true;
+
postInstall = ''
gtk-update-icon-cache "$out"/share/icons/ContrastHigh
'';
diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix
index e8faa9c0a9c..e3ff823924e 100644
--- a/pkgs/development/beam-modules/hex/default.nix
+++ b/pkgs/development/beam-modules/hex/default.nix
@@ -8,13 +8,13 @@ let
pkg = self: stdenv.mkDerivation rec {
pname = "hex";
- version = "0.20.1";
+ version = "0.20.5";
src = fetchFromGitHub {
- owner = "hexpm";
- repo = "hex";
- rev = "v${version}";
- sha256 = "0yxw7r31kk45b1nk48pajwwv9zl746kc9pwqfb73za8b1g8bgxd3";
+ owner = "hexpm";
+ repo = "hex";
+ rev = "v${version}";
+ sha256 = "1wz6n4qrmsb4kkww6lrdbs99xzwp4dyjjmr8m4drcwn3sd2k9ba6";
};
setupHook = writeText "setupHook.sh" ''
diff --git a/pkgs/development/compilers/bluespec/default.nix b/pkgs/development/compilers/bluespec/default.nix
index 5f6b44a5892..49737b48c57 100644
--- a/pkgs/development/compilers/bluespec/default.nix
+++ b/pkgs/development/compilers/bluespec/default.nix
@@ -71,6 +71,10 @@ in stdenv.mkDerivation rec {
src/comp/update-build-version.sh \
src/comp/update-build-system.sh \
src/comp/wrapper.sh
+
+ substituteInPlace src/comp/Makefile \
+ --replace 'BINDDIR' 'BINDIR' \
+ --replace 'install-bsc install-bluetcl' 'install-bsc install-bluetcl $(UTILEXES) install-utils'
'';
makeFlags = [
diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index 58d49a50515..7b7a564ba37 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -14,18 +14,18 @@ in rec {
# v2.1.15 (LTS)
aspnetcore_2_1 = buildAspNetCore {
- version = "2.1.15";
- sha512 = "a557f175cca92bb1dd66cf638ff84fe85750fab67028bd4472748b22ef0591f5f3812446a3dbe21c3d1be28c47d459d854d690dbace1b95bc7136b248af87334";
+ version = "2.1.16";
+ sha512 = "0awdzi8dysbg8xcy4l8wx2sb8gaaklphmwv61qxh7dj6ih4nla34l02xdax1l8nw41znnnqzsa77avglnrz36pckm9mc52m7wc7877h";
};
netcore_2_1 = buildNetCore {
- version = "2.1.15";
- sha512 = "cfd7f7caea7e896dd4d68a05c827c86f38595f24e854edb3f934715ee1268e2623f17ff768215e465fe596cd474497384be2b1381f04ddd6d555665a341f65f6";
+ version = "2.1.16";
+ sha512 = "07vvmza32hsblpw4zpcksm2gicy4agh0d1fwradqj16y6xbh3frdp87mqgbj5m54mmyfp5bc8c46v1w6dfm1w3y80v2y46aynild45l";
};
sdk_2_1 = buildNetCoreSdk {
- version = "2.1.803";
- sha512 = "57d48d6ca1bd92ac348dc05220d984811c0cf005774d7afdfbbf125a842acb0a26572146ed25a7eb26f4e0404fe840b70d1e7ec1fb7c9a5c6cfe81fefc41b363";
+ version = "2.1.804";
+ sha512 = "1kbzxcdgyvs94kkm6ikr1j0p0k3zq30d10sl69ig0rgbqbqm4rpqi6dq94jjbw7q3jlwz83vgq3549q38d2s9kalmzv9lmddn2kkc42";
};
# v2.2
@@ -35,34 +35,34 @@ in rec {
# v3.0.2 (Maintenance)
aspnetcore_3_0 = buildAspNetCore {
- version = "3.0.2";
- sha512 = "84dcc2a2a9e43afbc166771153d85b19cb09f964c85c787d77b362fd1d9e076345ae153305fa9040999846a56b69041eb89282804587478b926179d2613d259d";
+ version = "3.0.3";
+ sha512 = "342v6kxxbxky09d1c392vvr9rm30lf75wccka1bk2h4advlcga5nlgv93g7vrq48bsyxfi5gc36r3b0dlwl1g409g5mlk1042n6d0yq";
};
netcore_3_0 = buildNetCore {
- version = "3.0.2";
- sha512 = "c8f0e4eb220fa896c4a803a8d9d0c704ae7b8383801a977036f3089b1d779159f5a2d9293dc11ff5f4f6c76febc6f70f6cfcdff0debd3243cad5eb635f853d45";
+ version = "3.0.3";
+ sha512 = "32ykpcw2xx708r2lxcwcbxnmy4sk159rlfjfvkw990qh7n79pm3lm2qwa3zhqcslznmpg18kwxz8qb5fgsa0h49g843xx4kyai0n7rx";
};
sdk_3_0 = buildNetCoreSdk {
- version = "3.0.102";
- sha512 = "77bc287d9c20630976ac4c0736192ba4899154c9e7cc5b87bc9d94d5d8abafdd832cfe8f385b6ba584c702d9261566109df15ab46b0d62bd218d950d3b47893e";
+ version = "3.0.103";
+ sha512 = "2diiplgxs92fkb6ym68b02d79z4qn63x5qlky5lvr757c1zkh0vfpk3khawdg94kdn4qkn6dmyqr0msxqgmiqyhp63cadzqq4vx7b12";
};
# v3.1.1 (LTS)
aspnetcore_3_1 = buildAspNetCore {
- version = "3.1.1";
- sha512 = "cc27828cacbc783ef83cc1378078e14ac558aec30726b36c4f154fad0d08ff011e7e1dfc17bc851926ea3b0da9c7d71496af14ee13184bdf503856eca30a89ae";
+ version = "3.1.2";
+ sha512 = "27708bk5liz8r39p4dzs41clgq298d49g8ipzdj56pz613vkfyv7bp91666ydz36aazm265j2g9ji3sk1f9kbgv6024zwrly5w9vqrm";
};
netcore_3_1 = buildNetCore {
- version = "3.1.1";
- sha512 = "991a89ac7b52d3bf6c00359ce94c5a3f7488cd3d9e4663ba0575e1a5d8214c5fcc459e2cb923c369c2cdb789a96f0b1dfb5c5aae1a04df6e7f1f365122072611";
+ version = "3.1.2";
+ sha512 = "3zwg1anrcni9kagmjxn485bpjvb146hkm7irmikq3v879gjhd2fgpscg226ds83l4pxll3r7lwris6ij952xmy8lsqraapd9111ba14";
};
sdk_3_1 = buildNetCoreSdk {
- version = "3.1.101";
- sha512 = "eeee75323be762c329176d5856ec2ecfd16f06607965614df006730ed648a5b5d12ac7fd1942fe37cfc97e3013e796ef278e7c7bc4f32b8680585c4884a8a6a1";
+ version = "3.1.102";
+ sha512 = "0lmz8ac5j0i4zcq4904kr6qibvyjcm2ckfg27kqyqfii00qmm80xb5sk3i7f06xqkbgkrqkbg9rsldk75akw6m5dxg932j602bxrb4w";
};
}
diff --git a/pkgs/development/compilers/go/1.12.nix b/pkgs/development/compilers/go/1.12.nix
index 78ffa965875..35bcfa36e99 100644
--- a/pkgs/development/compilers/go/1.12.nix
+++ b/pkgs/development/compilers/go/1.12.nix
@@ -242,7 +242,7 @@ stdenv.mkDerivation rec {
homepage = http://golang.org/;
description = "The Go Programming language";
license = licenses.bsd3;
- maintainers = with maintainers; [ cstrahan orivej velovix mic92 rvolosatovs Frostman ];
+ maintainers = with maintainers; [ cstrahan orivej mic92 rvolosatovs Frostman ];
platforms = platforms.linux ++ platforms.darwin;
};
}
diff --git a/pkgs/development/compilers/go/1.13.nix b/pkgs/development/compilers/go/1.13.nix
index 71a05610922..aa881273032 100644
--- a/pkgs/development/compilers/go/1.13.nix
+++ b/pkgs/development/compilers/go/1.13.nix
@@ -239,7 +239,7 @@ stdenv.mkDerivation rec {
homepage = http://golang.org/;
description = "The Go Programming language";
license = licenses.bsd3;
- maintainers = with maintainers; [ cstrahan orivej velovix mic92 rvolosatovs kalbasit Frostman ];
+ maintainers = with maintainers; [ cstrahan orivej mic92 rvolosatovs kalbasit Frostman ];
platforms = platforms.linux ++ platforms.darwin;
};
}
diff --git a/pkgs/development/compilers/llvm/10/bintools.nix b/pkgs/development/compilers/llvm/10/bintools.nix
new file mode 100644
index 00000000000..72a2a733193
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/bintools.nix
@@ -0,0 +1,19 @@
+{ runCommand, stdenv, llvm, lld, version }:
+
+let
+ prefix =
+ if stdenv.hostPlatform != stdenv.targetPlatform
+ then "${stdenv.targetPlatform.config}-"
+ else "";
+in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } ''
+ mkdir -p $out/bin
+ for prog in ${lld}/bin/*; do
+ ln -s $prog $out/bin/${prefix}$(basename $prog)
+ done
+ for prog in ${llvm}/bin/*; do
+ ln -s $prog $out/bin/${prefix}$(echo $(basename $prog) | sed -e "s|llvm-||")
+ ln -sf $prog $out/bin/${prefix}$(basename $prog)
+ done
+ rm -f $out/bin/${prefix}cat
+ ln -s ${lld}/bin/lld $out/bin/${prefix}ld
+''
diff --git a/pkgs/development/compilers/llvm/10/clang/compiler-rt-baremetal.patch b/pkgs/development/compilers/llvm/10/clang/compiler-rt-baremetal.patch
new file mode 100644
index 00000000000..a4a0f21b0fc
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/clang/compiler-rt-baremetal.patch
@@ -0,0 +1,53 @@
+Index: lib/Driver/ToolChains/BareMetal.cpp
+===================================================================
+--- a/lib/Driver/ToolChains/BareMetal.cpp
++++ b/lib/Driver/ToolChains/BareMetal.cpp
+@@ -157,7 +157,7 @@
+ void BareMetal::AddLinkRuntimeLib(const ArgList &Args,
+ ArgStringList &CmdArgs) const {
+ CmdArgs.push_back(Args.MakeArgString("-lclang_rt.builtins-" +
+- getTriple().getArchName() + ".a"));
++ getTriple().getArchName()));
+ }
+
+ void baremetal::Linker::ConstructJob(Compilation &C, const JobAction &JA,
+Index: test/Driver/baremetal.cpp
+===================================================================
+--- a/test/Driver/baremetal.cpp
++++ b/test/Driver/baremetal.cpp
+@@ -13,7 +13,7 @@
+ // CHECK-V6M-C-NEXT: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"
+ // CHECK-V6M-C-SAME: "-L[[RESOURCE_DIR:[^"]+]]{{[/\\]+}}lib{{[/\\]+}}baremetal"
+ // CHECK-V6M-C-SAME: "-T" "semihosted.lds" "-Lsome{{[/\\]+}}directory{{[/\\]+}}user{{[/\\]+}}asked{{[/\\]+}}for"
+-// CHECK-V6M-C-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"
++// CHECK-V6M-C-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m"
+ // CHECK-V6M-C-SAME: "-o" "{{.*}}.o"
+
+ // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+@@ -35,7 +35,7 @@
+ // CHECK-V6M-DEFAULTCXX: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"
+ // CHECK-V6M-DEFAULTCXX-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal"
+ // CHECK-V6M-DEFAULTCXX-SAME: "-lc++" "-lc++abi" "-lunwind"
+-// CHECK-V6M-DEFAULTCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"
++// CHECK-V6M-DEFAULTCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m"
+ // CHECK-V6M-DEFAULTCXX-SAME: "-o" "{{.*}}.o"
+
+ // RUN: %clangxx -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+@@ -48,7 +48,7 @@
+ // CHECK-V6M-LIBCXX: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"
+ // CHECK-V6M-LIBCXX-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal"
+ // CHECK-V6M-LIBCXX-SAME: "-lc++" "-lc++abi" "-lunwind"
+-// CHECK-V6M-LIBCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"
++// CHECK-V6M-LIBCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m"
+ // CHECK-V6M-LIBCXX-SAME: "-o" "{{.*}}.o"
+
+ // RUN: %clangxx -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+@@ -61,7 +61,7 @@
+ // CHECK-V6M-LIBSTDCXX: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"
+ // CHECK-V6M-LIBSTDCXX-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal"
+ // CHECK-V6M-LIBSTDCXX-SAME: "-lstdc++" "-lsupc++" "-lunwind"
+-// CHECK-V6M-LIBSTDCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"
++// CHECK-V6M-LIBSTDCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m"
+ // CHECK-V6M-LIBSTDCXX-SAME: "-o" "{{.*}}.o"
+
+ // RUN: %clangxx -no-canonical-prefixes %s -### -o %t.o 2>&1 \
diff --git a/pkgs/development/compilers/llvm/10/clang/default.nix b/pkgs/development/compilers/llvm/10/clang/default.nix
new file mode 100644
index 00000000000..fcabe6d430f
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/clang/default.nix
@@ -0,0 +1,122 @@
+{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld
+, fixDarwinDylibNames
+, enableManpages ? false
+, enablePolly ? false # TODO: get this info from llvm (passthru?)
+}:
+
+let
+ self = stdenv.mkDerivation ({
+ pname = "clang";
+ inherit version;
+
+ src = fetch "clang" "1npwv0j6812q9jar79bb5m2j4lmvp11680in45nlma8czrs52w0v";
+
+ unpackPhase = ''
+ unpackFile $src
+ mv clang-${version}* clang
+ sourceRoot=$PWD/clang
+ unpackFile ${clang-tools-extra_src}
+ mv clang-tools-extra-* $sourceRoot/tools/extra
+ '';
+
+ nativeBuildInputs = [ cmake python3 lld ]
+ ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx;
+
+ buildInputs = [ libxml2 llvm ]
+ ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+
+ cmakeFlags = [
+ "-DCMAKE_CXX_FLAGS=-std=c++14"
+ "-DCLANGD_BUILD_XPC=OFF"
+ ] ++ stdenv.lib.optionals enableManpages [
+ "-DCLANG_INCLUDE_DOCS=ON"
+ "-DLLVM_ENABLE_SPHINX=ON"
+ "-DSPHINX_OUTPUT_MAN=ON"
+ "-DSPHINX_OUTPUT_HTML=OFF"
+ "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
+ ] ++ stdenv.lib.optionals enablePolly [
+ "-DWITH_POLLY=ON"
+ "-DLINK_POLLY_INTO_TOOLS=ON"
+ ];
+
+ patches = [
+ ./purity.patch
+ # https://reviews.llvm.org/D51899
+ ./compiler-rt-baremetal.patch
+ ];
+
+ postPatch = ''
+ sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \
+ -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \
+ lib/Driver/ToolChains/*.cpp
+
+ # Patch for standalone doc building
+ sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt
+ '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+ sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp
+ '' + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+ substituteInPlace tools/extra/clangd/CMakeLists.txt \
+ --replace "NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB" FALSE
+ '';
+
+ outputs = [ "out" "lib" "python" ];
+
+ # Clang expects to find LLVMgold in its own prefix
+ postInstall = ''
+ if [ -e ${llvm}/lib/LLVMgold.so ]; then
+ ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+ fi
+
+ ln -sv $out/bin/clang $out/bin/cpp
+
+ # Move libclang to 'lib' output
+ moveToOutput "lib/libclang.*" "$lib"
+ moveToOutput "lib/libclang-cpp.*" "$lib"
+ substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \
+ --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." \
+ --replace "\''${_IMPORT_PREFIX}/lib/libclang-cpp." "$lib/lib/libclang-cpp."
+
+ mkdir -p $python/bin $python/share/clang/
+ mv $out/bin/{git-clang-format,scan-view} $python/bin
+ if [ -e $out/bin/set-xcode-analyzer ]; then
+ mv $out/bin/set-xcode-analyzer $python/bin
+ fi
+ mv $out/share/clang/*.py $python/share/clang
+ rm $out/bin/c-index-test
+ '';
+
+ enableParallelBuilding = true;
+
+ passthru = {
+ isClang = true;
+ inherit llvm;
+ } // stdenv.lib.optionalAttrs (stdenv.targetPlatform.isLinux || (stdenv.cc.isGNU && stdenv.cc.cc ? gcc)) {
+ gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
+ };
+
+ meta = {
+ description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
+ homepage = http://llvm.org/;
+ license = stdenv.lib.licenses.ncsa;
+ platforms = stdenv.lib.platforms.all;
+ };
+ } // stdenv.lib.optionalAttrs enableManpages {
+ pname = "clang-manpages";
+
+ buildPhase = ''
+ make docs-clang-man
+ '';
+
+ installPhase = ''
+ mkdir -p $out/share/man/man1
+ # Manually install clang manpage
+ cp docs/man/*.1 $out/share/man/man1/
+ '';
+
+ outputs = [ "out" ];
+
+ doCheck = false;
+
+ meta.description = "man page for Clang ${version}";
+ });
+in self
diff --git a/pkgs/development/compilers/llvm/10/clang/purity.patch b/pkgs/development/compilers/llvm/10/clang/purity.patch
new file mode 100644
index 00000000000..a6729a9b004
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/clang/purity.patch
@@ -0,0 +1,30 @@
+From 4add81bba40dcec62c4ea4481be8e35ac53e89d8 Mon Sep 17 00:00:00 2001
+From: Will Dietz
+Date: Thu, 18 May 2017 11:56:12 -0500
+Subject: [PATCH] "purity" patch for 5.0
+
+---
+ lib/Driver/ToolChains/Gnu.cpp | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp
+index fe3c0191bb..c6a482bece 100644
+--- a/lib/Driver/ToolChains/Gnu.cpp
++++ b/lib/Driver/ToolChains/Gnu.cpp
+@@ -494,13 +494,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
+ if (!IsStatic) {
+ if (Args.hasArg(options::OPT_rdynamic))
+ CmdArgs.push_back("-export-dynamic");
+-
+- if (!Args.hasArg(options::OPT_shared) && !IsStaticPIE) {
+- const std::string Loader =
+- D.DyldPrefix + ToolChain.getDynamicLinker(Args);
+- CmdArgs.push_back("-dynamic-linker");
+- CmdArgs.push_back(Args.MakeArgString(Loader));
+- }
+ }
+
+ CmdArgs.push_back("-o");
+--
+2.11.0
+
diff --git a/pkgs/development/compilers/llvm/10/compiler-rt-codesign.patch b/pkgs/development/compilers/llvm/10/compiler-rt-codesign.patch
new file mode 100644
index 00000000000..3cc12b94b20
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/compiler-rt-codesign.patch
@@ -0,0 +1,33 @@
+From 3dec5f3475a26aeb4678627795c4b67c6b7b4785 Mon Sep 17 00:00:00 2001
+From: Will Dietz
+Date: Tue, 19 Sep 2017 13:13:06 -0500
+Subject: [PATCH] remove codesign use on Apple, disable ios sim testing that
+ needs it
+
+---
+ cmake/Modules/AddCompilerRT.cmake | 8 ------
+ test/asan/CMakeLists.txt | 52 ---------------------------------------
+ test/tsan/CMakeLists.txt | 47 -----------------------------------
+ 3 files changed, 107 deletions(-)
+
+diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake
+index bc5fb9ff7..b64eb4246 100644
+--- a/cmake/Modules/AddCompilerRT.cmake
++++ b/cmake/Modules/AddCompilerRT.cmake
+@@ -210,14 +210,6 @@ function(add_compiler_rt_runtime name type)
+ set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "")
+ set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib")
+ endif()
+- if(APPLE)
+- # Ad-hoc sign the dylibs
+- add_custom_command(TARGET ${libname}
+- POST_BUILD
+- COMMAND codesign --sign - $
+- WORKING_DIRECTORY ${COMPILER_RT_LIBRARY_OUTPUT_DIR}
+- )
+- endif()
+ endif()
+ install(TARGETS ${libname}
+ ARCHIVE DESTINATION ${COMPILER_RT_LIBRARY_INSTALL_DIR}
+2.14.1
+
diff --git a/pkgs/development/compilers/llvm/10/compiler-rt.nix b/pkgs/development/compilers/llvm/10/compiler-rt.nix
new file mode 100644
index 00000000000..c9eed4d0070
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/compiler-rt.nix
@@ -0,0 +1,73 @@
+{ stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
+stdenv.mkDerivation rec {
+ pname = "compiler-rt";
+ inherit version;
+ src = fetch pname "11qiass6gbpq3m1srqlk5gm0zcm8j4jk2cmingra237qhaxz8wv9";
+
+ nativeBuildInputs = [ cmake python3 llvm ];
+ buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
+
+ NIX_CFLAGS_COMPILE = [
+ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0"
+ ];
+
+ cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [
+ "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
+ "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
+ "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
+ "-DCMAKE_C_FLAGS=-nodefaultlibs"
+ "-DCMAKE_CXX_COMPILER_WORKS=ON"
+ "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
+ "-DCOMPILER_RT_BUILD_XRAY=OFF"
+ "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF"
+ "-DCOMPILER_RT_BUILD_PROFILE=OFF"
+ "-DCOMPILER_RT_BAREMETAL_BUILD=ON"
+ #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
+ "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
+ "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
+ ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
+ "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
+ "-DCOMPILER_RT_BUILD_XRAY=OFF"
+ "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF"
+ "-DCOMPILER_RT_BUILD_PROFILE=OFF"
+ ] ++ stdenv.lib.optionals (stdenv.hostPlatform.parsed.kernel.name == "none") [
+ "-DCOMPILER_RT_BAREMETAL_BUILD=ON"
+ "-DCOMPILER_RT_OS_DIR=baremetal"
+ ];
+
+ outputs = [ "out" "dev" ];
+
+ patches = [
+ ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
+ ./find-darwin-sdk-version.patch # don't test for macOS being >= 10.15
+ ];# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
+
+ # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
+ # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
+ # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd
+ # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by
+ # a flag and turn the flag off during the stdenv build.
+ postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+ substituteInPlace cmake/config-ix.cmake \
+ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
+ '' + stdenv.lib.optionalString (stdenv.hostPlatform.useLLVM or false) ''
+ substituteInPlace lib/builtins/int_util.c \
+ --replace "#include " ""
+ substituteInPlace lib/builtins/clear_cache.c \
+ --replace "#include " ""
+ substituteInPlace lib/builtins/cpu_model.c \
+ --replace "#include " ""
+ '';
+
+ # Hack around weird upsream RPATH bug
+ postInstall = stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
+ ln -s "$out/lib"/*/* "$out/lib"
+ '' + stdenv.lib.optionalString (stdenv.hostPlatform.useLLVM or false) ''
+ ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o
+ ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o
+ ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o
+ ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/crtendS.o
+ '';
+
+ enableParallelBuilding = true;
+}
diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix
new file mode 100644
index 00000000000..0f9d302f7cf
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/default.nix
@@ -0,0 +1,204 @@
+{ lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook
+, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith
+, buildLlvmTools # tools, but from the previous stage, for cross
+, targetLlvmLibraries # libraries, but from the next stage, for cross
+}:
+
+let
+ release_version = "10.0.0";
+ candidate = "rc2";
+ version = "10.0.0${candidate}"; # differentiating these is important for rc's
+
+ fetch = name: sha256: fetchurl {
+ url = "https://prereleases.llvm.org/${release_version}/${candidate}/${name}-${version}.src.tar.xz";
+ inherit sha256;
+ };
+
+ clang-tools-extra_src = fetch "clang-tools-extra" "1yi34b6lspcpig0gnws2ba0shgmrs2jgjb3hp08mm0dg3blzk8ss";
+
+ tools = stdenv.lib.makeExtensible (tools: let
+ callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
+ mkExtraBuildCommands = cc: ''
+ rsrc="$out/resource-root"
+ mkdir "$rsrc"
+ ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc"
+ ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
+ echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
+ '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && tools.clang-unwrapped ? gcc && !(stdenv.targetPlatform.useLLVM or false)) ''
+ echo "--gcc-toolchain=${tools.clang-unwrapped.gcc}" >> $out/nix-support/cc-cflags
+ '';
+ in {
+
+ llvm = callPackage ./llvm.nix { };
+ llvm-polly = callPackage ./llvm.nix { enablePolly = true; };
+
+ clang-unwrapped = callPackage ./clang {
+ inherit (tools) lld;
+ inherit clang-tools-extra_src;
+ };
+ clang-polly-unwrapped = callPackage ./clang {
+ inherit clang-tools-extra_src;
+ llvm = tools.llvm-polly;
+ enablePolly = true;
+ };
+
+ llvm-manpages = lowPrio (tools.llvm.override {
+ enableManpages = true;
+ python3 = pkgs.python3; # don't use python-boot
+ });
+
+ clang-manpages = lowPrio (tools.clang-unwrapped.override {
+ enableManpages = true;
+ python3 = pkgs.python3; # don't use python-boot
+ });
+
+ lldb-manpages = lowPrio (tools.lldb.override {
+ enableManpages = true;
+ python3 = pkgs.python3; # don't use python-boot
+ });
+
+ libclang = tools.clang-unwrapped.lib;
+
+ clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
+
+ libstdcxxClang = wrapCCWith rec {
+ cc = tools.clang-unwrapped;
+ extraPackages = [
+ libstdcxxHook
+ targetLlvmLibraries.compiler-rt
+ ];
+ extraBuildCommands = mkExtraBuildCommands cc;
+ };
+
+ libcxxClang = wrapCCWith rec {
+ cc = tools.clang-unwrapped;
+ libcxx = targetLlvmLibraries.libcxx;
+ extraPackages = [
+ targetLlvmLibraries.libcxx
+ targetLlvmLibraries.libcxxabi
+ targetLlvmLibraries.compiler-rt
+ ];
+ extraBuildCommands = mkExtraBuildCommands cc;
+ };
+
+ lld = callPackage ./lld.nix {};
+
+ lldb = callPackage ./lldb.nix {};
+
+ # Below, is the LLVM bootstrapping logic. It handles building a
+ # fully LLVM toolchain from scratch. No GCC toolchain should be
+ # pulled in. As a consequence, it is very quick to build different
+ # targets provided by LLVM and we can also build for what GCC
+ # doesn’t support like LLVM. Probably we should move to some other
+ # file.
+
+ bintools = callPackage ./bintools.nix {};
+
+ lldClang = wrapCCWith rec {
+ cc = tools.clang-unwrapped;
+ libcxx = targetLlvmLibraries.libcxx;
+ bintools = wrapBintoolsWith {
+ inherit (tools) bintools;
+ };
+ extraPackages = [
+ targetLlvmLibraries.libcxx
+ targetLlvmLibraries.libcxxabi
+ targetLlvmLibraries.compiler-rt
+ ] ++ stdenv.lib.optionals (!stdenv.targetPlatform.isWasm) [
+ targetLlvmLibraries.libunwind
+ ];
+ extraBuildCommands = ''
+ echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags
+ echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags
+ echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
+ '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) ''
+ echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags
+ '' + stdenv.lib.optionalString stdenv.targetPlatform.isWasm ''
+ echo "-fno-exceptions" >> $out/nix-support/cc-cflags
+ '' + mkExtraBuildCommands cc;
+ };
+
+ lldClangNoLibcxx = wrapCCWith rec {
+ cc = tools.clang-unwrapped;
+ libcxx = null;
+ bintools = wrapBintoolsWith {
+ inherit (tools) bintools;
+ };
+ extraPackages = [
+ targetLlvmLibraries.compiler-rt
+ ];
+ extraBuildCommands = ''
+ echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags
+ echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags
+ echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
+ echo "-nostdlib++" >> $out/nix-support/cc-cflags
+ '' + mkExtraBuildCommands cc;
+ };
+
+ lldClangNoLibc = wrapCCWith rec {
+ cc = tools.clang-unwrapped;
+ libcxx = null;
+ bintools = wrapBintoolsWith {
+ inherit (tools) bintools;
+ libc = null;
+ };
+ extraPackages = [
+ targetLlvmLibraries.compiler-rt
+ ];
+ extraBuildCommands = ''
+ echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags
+ echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags
+ echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
+ '' + mkExtraBuildCommands cc;
+ };
+
+ lldClangNoCompilerRt = wrapCCWith {
+ cc = tools.clang-unwrapped;
+ libcxx = null;
+ bintools = wrapBintoolsWith {
+ inherit (tools) bintools;
+ libc = null;
+ };
+ extraPackages = [ ];
+ extraBuildCommands = ''
+ echo "-nostartfiles" >> $out/nix-support/cc-cflags
+ echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags
+ '';
+ };
+
+ });
+
+ libraries = stdenv.lib.makeExtensible (libraries: let
+ callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
+ in {
+
+ compiler-rt = callPackage ./compiler-rt.nix ({} //
+ (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+ stdenv = overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt;
+ }));
+
+ stdenv = overrideCC stdenv buildLlvmTools.clang;
+
+ libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
+
+ libcxx = callPackage ./libc++ ({} //
+ (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+ stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
+ }));
+
+ libcxxabi = callPackage ./libc++abi.nix ({} //
+ (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+ stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
+ libunwind = libraries.libunwind;
+ }));
+
+ openmp = callPackage ./openmp.nix {};
+
+ libunwind = callPackage ./libunwind.nix ({} //
+ (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+ stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
+ }));
+
+ });
+
+in { inherit tools libraries; } // libraries // tools
diff --git a/pkgs/development/compilers/llvm/10/find-darwin-sdk-version.patch b/pkgs/development/compilers/llvm/10/find-darwin-sdk-version.patch
new file mode 100644
index 00000000000..fc16ddda76b
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/find-darwin-sdk-version.patch
@@ -0,0 +1,62 @@
+--- a/cmake/Modules/CompilerRTDarwinUtils.cmake 2020-01-25 23:13:55.000000000 +0100
++++ b/cmake/Modules/CompilerRTDarwinUtils.cmake 2020-01-25 23:19:37.000000000 +0100
+@@ -43,41 +43,6 @@
+ set(DARWIN_${sdk_name}_CACHED_SYSROOT ${var_internal} CACHE STRING "Darwin SDK path for SDK ${sdk_name}." FORCE)
+ endfunction()
+
+-function(find_darwin_sdk_version var sdk_name)
+- # We deliberately don't cache the result here because
+- # CMake's caching causes too many problems.
+- set(result_process 1)
+- if(NOT DARWIN_PREFER_PUBLIC_SDK)
+- # Let's first try the internal SDK, otherwise use the public SDK.
+- execute_process(
+- COMMAND xcrun --sdk ${sdk_name}.internal --show-sdk-version
+- RESULT_VARIABLE result_process
+- OUTPUT_VARIABLE var_internal
+- OUTPUT_STRIP_TRAILING_WHITESPACE
+- ERROR_FILE /dev/null
+- )
+- endif()
+- if((NOT ${result_process} EQUAL 0) OR "" STREQUAL "${var_internal}")
+- execute_process(
+- COMMAND xcrun --sdk ${sdk_name} --show-sdk-version
+- RESULT_VARIABLE result_process
+- OUTPUT_VARIABLE var_internal
+- OUTPUT_STRIP_TRAILING_WHITESPACE
+- ERROR_FILE /dev/null
+- )
+- endif()
+- if(NOT result_process EQUAL 0)
+- message(FATAL_ERROR
+- "Failed to determine SDK version for \"${sdk_name}\" SDK")
+- endif()
+- # Check reported version looks sane.
+- if (NOT "${var_internal}" MATCHES "^[0-9]+\\.[0-9]+(\\.[0-9]+)?$")
+- message(FATAL_ERROR
+- "Reported SDK version \"${var_internal}\" does not look like a version")
+- endif()
+- set(${var} ${var_internal} PARENT_SCOPE)
+-endfunction()
+-
+ # There isn't a clear mapping of what architectures are supported with a given
+ # target platform, but ld's version output does list the architectures it can
+ # link for.
+@@ -119,17 +84,6 @@
+ foreach(flag ${DARWIN_${os}_LINK_FLAGS})
+ set(os_linker_flags "${os_linker_flags} ${flag}")
+ endforeach()
+-
+- # Disable building for i386 for macOS SDK >= 10.15. The SDK doesn't support
+- # linking for i386 and the corresponding OS doesn't allow running macOS i386
+- # binaries.
+- if ("${os}" STREQUAL "osx")
+- find_darwin_sdk_version(macosx_sdk_version "macosx")
+- if ("${macosx_sdk_version}" VERSION_GREATER 10.15 OR "${macosx_sdk_version}" VERSION_EQUAL 10.15)
+- message(STATUS "Disabling i386 slice for ${valid_archs}")
+- list(REMOVE_ITEM archs "i386")
+- endif()
+- endif()
+ endif()
+
+ # The simple program will build for x86_64h on the simulator because it is
diff --git a/pkgs/development/compilers/llvm/10/libc++/default.nix b/pkgs/development/compilers/llvm/10/libc++/default.nix
new file mode 100644
index 00000000000..2d2bc4db2d7
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/libc++/default.nix
@@ -0,0 +1,55 @@
+{ lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version
+, enableShared ? true }:
+
+stdenv.mkDerivation {
+ pname = "libc++";
+ inherit version;
+
+ src = fetch "libcxx" "0d83z1dbr6kkwcq72kqpdkvnndjvcjx7w80qlkvqlv7r2zai5kjg";
+
+ postUnpack = ''
+ unpackFile ${libcxxabi.src}
+ export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include"
+ '';
+
+ patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch;
+
+ preConfigure = ''
+ # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package
+ cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$LIBCXXABI_INCLUDE_DIR")
+ '' + lib.optionalString stdenv.hostPlatform.isMusl ''
+ patchShebangs utils/cat_files.py
+ '';
+ nativeBuildInputs = [ cmake ]
+ ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3;
+
+ buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
+
+ cmakeFlags = [
+ "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
+ "-DLIBCXX_LIBCPPABI_VERSION=2"
+ "-DLIBCXX_CXX_ABI=libcxxabi"
+ ] ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1"
+ ++ stdenv.lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"
+ ++ stdenv.lib.optional stdenv.hostPlatform.isWasm [
+ "-DLIBCXX_ENABLE_THREADS=OFF"
+ "-DLIBCXX_ENABLE_FILESYSTEM=OFF"
+ "-DLIBCXX_ENABLE_EXCEPTIONS=OFF"
+ ] ++ stdenv.lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF";
+
+ enableParallelBuilding = true;
+
+ linkCxxAbi = stdenv.isLinux;
+
+ setupHooks = [
+ ../../../../../build-support/setup-hooks/role.bash
+ ./setup-hook.sh
+ ];
+
+ meta = {
+ homepage = http://libcxx.llvm.org/;
+ description = "A new implementation of the C++ standard library, targeting C++11";
+ license = with stdenv.lib.licenses; [ ncsa mit ];
+ platforms = stdenv.lib.platforms.all;
+ };
+}
diff --git a/pkgs/development/compilers/llvm/10/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/10/libc++/setup-hook.sh
new file mode 100644
index 00000000000..6611259165a
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/libc++/setup-hook.sh
@@ -0,0 +1,6 @@
+# See pkgs/build-support/setup-hooks/role.bash
+getHostRole
+
+linkCxxAbi="@linkCxxAbi@"
+export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
+export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
diff --git a/pkgs/development/compilers/llvm/10/libc++abi.nix b/pkgs/development/compilers/llvm/10/libc++abi.nix
new file mode 100644
index 00000000000..3715ce36ec0
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/libc++abi.nix
@@ -0,0 +1,67 @@
+{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version
+, enableShared ? true }:
+
+stdenv.mkDerivation {
+ pname = "libc++abi";
+ inherit version;
+
+ src = fetch "libcxxabi" "001rnpgya6y0vcsy5jqcc7ria666mswbzw4avdps6dgs6caqrfpd";
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;
+
+ cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [
+ "-DLLVM_ENABLE_LIBCXX=ON"
+ "-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
+ ] ++ stdenv.lib.optionals stdenv.hostPlatform.isWasm [
+ "-DLIBCXXABI_ENABLE_THREADS=OFF"
+ "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF"
+ ] ++ stdenv.lib.optionals (!enableShared) [
+ "-DLIBCXXABI_ENABLE_SHARED=OFF"
+ ];
+
+ patches = [ ./libcxxabi-no-threads.patch ];
+
+ postUnpack = ''
+ unpackFile ${libcxx.src}
+ unpackFile ${llvm.src}
+ cmakeFlags+=" -DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)"
+ '' + stdenv.lib.optionalString stdenv.isDarwin ''
+ export TRIPLE=x86_64-apple-darwin
+ '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+ patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
+ '' + stdenv.lib.optionalString stdenv.hostPlatform.isWasm ''
+ patch -p1 -d $(ls -d llvm-*) -i ${./libcxxabi-wasm.patch}
+ '';
+
+ installPhase = if stdenv.isDarwin
+ then ''
+ for file in lib/*.dylib; do
+ # this should be done in CMake, but having trouble figuring out
+ # the magic combination of necessary CMake variables
+ # if you fancy a try, take a look at
+ # http://www.cmake.org/Wiki/CMake_RPATH_handling
+ install_name_tool -id $out/$file $file
+ done
+ make install
+ install -d 755 $out/include
+ install -m 644 ../include/*.h $out/include
+ ''
+ else ''
+ install -d -m 755 $out/include $out/lib
+ install -m 644 lib/libc++abi.a $out/lib
+ install -m 644 ../include/cxxabi.h $out/include
+ '' + stdenv.lib.optionalString enableShared ''
+ install -m 644 lib/libc++abi.so.1.0 $out/lib
+ ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
+ ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
+ '';
+
+ meta = {
+ homepage = http://libcxxabi.llvm.org/;
+ description = "A new implementation of low level support for a standard C++ library";
+ license = with stdenv.lib.licenses; [ ncsa mit ];
+ maintainers = with stdenv.lib.maintainers; [ vlstill ];
+ platforms = stdenv.lib.platforms.all;
+ };
+}
diff --git a/pkgs/development/compilers/llvm/10/libcxxabi-no-threads.patch b/pkgs/development/compilers/llvm/10/libcxxabi-no-threads.patch
new file mode 100644
index 00000000000..787f3e16500
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/libcxxabi-no-threads.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4138acf..41b4763 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -362,6 +362,7 @@ if (NOT LIBCXXABI_ENABLE_THREADS)
+ " is also set to ON.")
+ endif()
+ add_definitions(-D_LIBCXXABI_HAS_NO_THREADS)
++ add_definitions(-D_LIBCPP_HAS_NO_THREADS)
+ endif()
+
+ if (LIBCXXABI_HAS_EXTERNAL_THREAD_API)
diff --git a/pkgs/development/compilers/llvm/10/libcxxabi-wasm.patch b/pkgs/development/compilers/llvm/10/libcxxabi-wasm.patch
new file mode 100644
index 00000000000..4ebfe46aa81
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/libcxxabi-wasm.patch
@@ -0,0 +1,16 @@
+diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake
+index 15497d405e0..33f7f18193a 100644
+--- a/cmake/modules/HandleLLVMOptions.cmake
++++ b/cmake/modules/HandleLLVMOptions.cmake
+@@ -127,7 +127,10 @@ else(WIN32)
+ set(LLVM_HAVE_LINK_VERSION_SCRIPT 1)
+ endif()
+ else(FUCHSIA OR UNIX)
+- MESSAGE(SEND_ERROR "Unable to determine platform")
++ if(${CMAKE_SYSTEM_NAME} MATCHES "Wasi")
++ else()
++ MESSAGE(SEND_ERROR "Unable to determine platform")
++ endif()
+ endif(FUCHSIA OR UNIX)
+ endif(WIN32)
+
diff --git a/pkgs/development/compilers/llvm/10/libunwind.nix b/pkgs/development/compilers/llvm/10/libunwind.nix
new file mode 100644
index 00000000000..7a8fb13dad2
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/libunwind.nix
@@ -0,0 +1,14 @@
+{ stdenv, version, fetch, cmake, fetchpatch, enableShared ? true }:
+
+stdenv.mkDerivation rec {
+ pname = "libunwind";
+ inherit version;
+
+ src = fetch pname "0194s3qqqz4qcrzdfy7c931sm3d9hnjk624gldja85mwz1v1x9a8";
+
+ nativeBuildInputs = [ cmake ];
+
+ enableParallelBuilding = true;
+
+ cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF";
+}
diff --git a/pkgs/development/compilers/llvm/10/lld.nix b/pkgs/development/compilers/llvm/10/lld.nix
new file mode 100644
index 00000000000..cea5ab3ee06
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/lld.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, fetch
+, cmake
+, libxml2
+, llvm
+, version
+}:
+
+stdenv.mkDerivation rec {
+ pname = "lld";
+ inherit version;
+
+ src = fetch pname "0z0a1h94hx0wj5289gvp99bvvj2ghid94xj2c5acmh1df8cx1vna";
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ llvm libxml2 ];
+
+ outputs = [ "out" "dev" ];
+
+ enableParallelBuilding = true;
+
+ postInstall = ''
+ moveToOutput include "$dev"
+ moveToOutput lib "$dev"
+ '';
+
+ meta = {
+ description = "The LLVM Linker";
+ homepage = http://lld.llvm.org/;
+ license = stdenv.lib.licenses.ncsa;
+ platforms = stdenv.lib.platforms.all;
+ };
+}
diff --git a/pkgs/development/compilers/llvm/10/lldb-procfs.patch b/pkgs/development/compilers/llvm/10/lldb-procfs.patch
new file mode 100644
index 00000000000..b075dbaeee0
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/lldb-procfs.patch
@@ -0,0 +1,31 @@
+--- a/source/Plugins/Process/Linux/Procfs.h
++++ b/source/Plugins/Process/Linux/Procfs.h
+@@ -11,21 +11,12 @@
+ // sys/procfs.h on Android/Linux for all supported architectures.
+
+ #include
++#include
+
+-#ifdef __ANDROID__
+-#if defined(__arm64__) || defined(__aarch64__)
+-typedef unsigned long elf_greg_t;
+-typedef elf_greg_t
+- elf_gregset_t[(sizeof(struct user_pt_regs) / sizeof(elf_greg_t))];
+-typedef struct user_fpsimd_state elf_fpregset_t;
+-#ifndef NT_FPREGSET
+-#define NT_FPREGSET NT_PRFPREG
+-#endif // NT_FPREGSET
+-#elif defined(__mips__)
+-#ifndef NT_FPREGSET
+-#define NT_FPREGSET NT_PRFPREG
+-#endif // NT_FPREGSET
+-#endif
+-#else // __ANDROID__
++#if !defined(__GLIBC__) && defined(__powerpc__)
++#define pt_regs musl_pt_regs
++#include
++#undef pt_regs
++#else
+ #include
+-#endif // __ANDROID__
++#endif
diff --git a/pkgs/development/compilers/llvm/10/lldb.nix b/pkgs/development/compilers/llvm/10/lldb.nix
new file mode 100644
index 00000000000..63df2d08454
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/lldb.nix
@@ -0,0 +1,101 @@
+{ stdenv
+, fetch
+, cmake
+, zlib
+, ncurses
+, swig
+, which
+, libedit
+, libxml2
+, llvm
+, clang-unwrapped
+, python3
+, version
+, darwin
+, lit
+, enableManpages ? false
+}:
+
+stdenv.mkDerivation (rec {
+ pname = "lldb";
+ inherit version;
+
+ src = fetch pname "0nh26a4mxd54k5f9gpizr55vdalkzym2l82kvfh3lm8lvimypga1";
+
+ patches = [ ./lldb-procfs.patch ];
+
+ nativeBuildInputs = [ cmake python3 which swig lit ]
+ ++ stdenv.lib.optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ];
+
+ buildInputs = [
+ ncurses
+ zlib
+ libedit
+ libxml2
+ llvm
+ ]
+ ++ stdenv.lib.optionals stdenv.isDarwin [
+ darwin.libobjc
+ darwin.apple_sdk.libs.xpc
+ darwin.apple_sdk.frameworks.Foundation
+ darwin.bootstrap_cmds
+ darwin.apple_sdk.frameworks.Carbon
+ darwin.apple_sdk.frameworks.Cocoa
+ ];
+
+ CXXFLAGS = "-fno-rtti";
+ hardeningDisable = [ "format" ];
+
+ cmakeFlags = [
+ "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic
+ "-DClang_DIR=${clang-unwrapped}/lib/cmake"
+ "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit"
+ ] ++ stdenv.lib.optionals stdenv.isDarwin [
+ "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON"
+ ] ++ stdenv.lib.optionals enableManpages [
+ "-DLLVM_ENABLE_SPHINX=ON"
+ "-DSPHINX_OUTPUT_MAN=ON"
+ "-DSPHINX_OUTPUT_HTML=OFF"
+ ]
+;
+
+ enableParallelBuilding = true;
+
+ postInstall = ''
+ # Editor support
+ # vscode:
+ install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json
+ mkdir -p $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
+ ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A next-generation high-performance debugger";
+ homepage = http://lldb.llvm.org;
+ license = licenses.ncsa;
+ platforms = platforms.all;
+ };
+} // stdenv.lib.optionalAttrs enableManpages {
+ pname = "lldb-manpages";
+
+ buildPhase = ''
+ make docs-lldb-man
+ '';
+
+ propagatedBuildInputs = [];
+
+ installPhase = ''
+ # manually install lldb man page
+ mkdir -p $out/share/man/man1
+ install docs/man/lldb.1 -t $out/share/man/man1/
+ '';
+
+ postPatch = null;
+ postInstall = null;
+
+ outputs = [ "out" ];
+
+ doCheck = false;
+
+ meta.description = "man pages for LLDB ${version}";
+})
diff --git a/pkgs/development/compilers/llvm/10/llvm-outputs.patch b/pkgs/development/compilers/llvm/10/llvm-outputs.patch
new file mode 100644
index 00000000000..40096fa3497
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/llvm-outputs.patch
@@ -0,0 +1,26 @@
+diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp
+index 94d426b..37f7794 100644
+--- a/tools/llvm-config/llvm-config.cpp
++++ b/tools/llvm-config/llvm-config.cpp
+@@ -333,6 +333,21 @@ int main(int argc, char **argv) {
+ ActiveIncludeOption = "-I" + ActiveIncludeDir;
+ }
+
++ /// Nix-specific multiple-output handling: override ActiveLibDir if --link-shared
++ if (!IsInDevelopmentTree) {
++ bool WantShared = true;
++ for (int i = 1; i < argc; ++i) {
++ StringRef Arg = argv[i];
++ if (Arg == "--link-shared")
++ WantShared = true;
++ else if (Arg == "--link-static")
++ WantShared = false; // the last one wins
++ }
++
++ if (WantShared)
++ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX;
++ }
++
+ /// We only use `shared library` mode in cases where the static library form
+ /// of the components provided are not available; note however that this is
+ /// skipped if we're run from within the build dir. However, once installed,
diff --git a/pkgs/development/compilers/llvm/10/llvm.nix b/pkgs/development/compilers/llvm/10/llvm.nix
new file mode 100644
index 00000000000..4496b5abcf4
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/llvm.nix
@@ -0,0 +1,185 @@
+{ stdenv
+, fetch
+, cmake
+, python3
+, libffi
+, libbfd
+, libpfm
+, libxml2
+, ncurses
+, version
+, release_version
+, zlib
+, buildPackages
+, debugVersion ? false
+, enableManpages ? false
+, enableSharedLibraries ? true
+, enablePFM ? !(stdenv.isDarwin
+ || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245
+)
+, enablePolly ? false
+}:
+
+let
+ inherit (stdenv.lib) optional optionals optionalString;
+
+ # Used when creating a version-suffixed symlink of libLLVM.dylib
+ shortVersion = with stdenv.lib;
+ concatStringsSep "." (take 1 (splitString "." release_version));
+
+in stdenv.mkDerivation (rec {
+ pname = "llvm";
+ inherit version;
+
+ src = fetch pname "01azqqygm83s6l1g35kqkc7da06dkc8jxpb4zsd420lmhfhw4gws";
+ polly_src = fetch "polly" "00nvnh0jhi1s5gcyfnb30h9g2j18z79kipiy878bkawg53f4z2xf";
+
+ unpackPhase = ''
+ unpackFile $src
+ mv llvm-${version}* llvm
+ sourceRoot=$PWD/llvm
+ '' + optionalString enablePolly ''
+ unpackFile $polly_src
+ mv polly-* $sourceRoot/tools/polly
+ '';
+
+ outputs = [ "out" "python" ]
+ ++ optional enableSharedLibraries "lib";
+
+ nativeBuildInputs = [ cmake python3 ]
+ ++ optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ];
+
+ buildInputs = [ libxml2 libffi ]
+ ++ optional enablePFM libpfm; # exegesis
+
+ propagatedBuildInputs = [ ncurses zlib ];
+
+ postPatch = optionalString stdenv.isDarwin ''
+ substituteInPlace cmake/modules/AddLLVM.cmake \
+ --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \
+ --replace 'set(_install_rpath "@loader_path/../lib''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' ""
+ ''
+ # Patch llvm-config to return correct library path based on --link-{shared,static}.
+ + optionalString (enableSharedLibraries) ''
+ substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib
+ patch -p1 < ./llvm-outputs.patch
+ '' + ''
+ # FileSystem permissions tests fail with various special bits
+ substituteInPlace unittests/Support/CMakeLists.txt \
+ --replace "Path.cpp" ""
+ rm unittests/Support/Path.cpp
+ '' + optionalString stdenv.hostPlatform.isMusl ''
+ patch -p1 -i ${../TLI-musl.patch}
+ substituteInPlace unittests/Support/CMakeLists.txt \
+ --replace "add_subdirectory(DynamicLibrary)" ""
+ rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
+ # valgrind unhappy with musl or glibc, but fails w/musl only
+ rm test/CodeGen/AArch64/wineh4.mir
+ '' + optionalString stdenv.hostPlatform.isAarch32 ''
+ # skip failing X86 test cases on 32-bit ARM
+ rm test/DebugInfo/X86/convert-debugloc.ll
+ rm test/DebugInfo/X86/convert-inlined.ll
+ rm test/DebugInfo/X86/convert-linked.ll
+ rm test/tools/dsymutil/X86/op-convert.test
+ '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") ''
+ # Seems to require certain floating point hardware (NEON?)
+ rm test/ExecutionEngine/frem.ll
+ '' + ''
+ patchShebangs test/BugPoint/compile-custom.ll.py
+ '';
+
+ # hacky fix: created binaries need to be run before installation
+ preBuild = ''
+ mkdir -p $out/
+ ln -sv $PWD/lib $out
+ '';
+
+ cmakeFlags = with stdenv; [
+ "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}"
+ "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc
+ "-DLLVM_BUILD_TESTS=ON"
+ "-DLLVM_ENABLE_FFI=ON"
+ "-DLLVM_ENABLE_RTTI=ON"
+ "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
+ "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
+ "-DLLVM_ENABLE_DUMP=ON"
+ ] ++ optionals enableSharedLibraries [
+ "-DLLVM_LINK_LLVM_DYLIB=ON"
+ ] ++ optionals enableManpages [
+ "-DLLVM_BUILD_DOCS=ON"
+ "-DLLVM_ENABLE_SPHINX=ON"
+ "-DSPHINX_OUTPUT_MAN=ON"
+ "-DSPHINX_OUTPUT_HTML=OFF"
+ "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
+ ] ++ optionals (!isDarwin) [
+ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"
+ ] ++ optionals isDarwin [
+ "-DLLVM_ENABLE_LIBCXX=ON"
+ "-DCAN_TARGET_i386=false"
+ ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+ "-DCMAKE_CROSSCOMPILING=True"
+ "-DLLVM_TABLEGEN=${buildPackages.llvm_10}/bin/llvm-tblgen"
+ ];
+
+ postBuild = ''
+ rm -fR $out
+ '';
+
+ preCheck = ''
+ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib
+ '';
+
+ postInstall = ''
+ mkdir -p $python/share
+ mv $out/share/opt-viewer $python/share/opt-viewer
+ ''
+ + optionalString enableSharedLibraries ''
+ moveToOutput "lib/libLLVM-*" "$lib"
+ moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib"
+ ''
+ + optionalString (enableSharedLibraries && (!stdenv.isDarwin)) ''
+ substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
+ --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-"
+ ''
+ + optionalString (stdenv.isDarwin && enableSharedLibraries) ''
+ substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
+ --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib"
+ ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
+ ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
+ '';
+
+ doCheck = stdenv.isLinux && (!stdenv.isx86_32);
+
+ checkTarget = "check-all";
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "Collection of modular and reusable compiler and toolchain technologies";
+ homepage = http://llvm.org/;
+ license = stdenv.lib.licenses.ncsa;
+ maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ];
+ platforms = stdenv.lib.platforms.all;
+ };
+} // stdenv.lib.optionalAttrs enableManpages {
+ pname = "llvm-manpages";
+
+ buildPhase = ''
+ make docs-llvm-man
+ '';
+
+ propagatedBuildInputs = [];
+
+ installPhase = ''
+ make -C docs install
+ '';
+
+ postPatch = null;
+ postInstall = null;
+
+ outputs = [ "out" ];
+
+ doCheck = false;
+
+ meta.description = "man pages for LLVM ${version}";
+})
diff --git a/pkgs/development/compilers/llvm/10/openmp.nix b/pkgs/development/compilers/llvm/10/openmp.nix
new file mode 100644
index 00000000000..ff6d77c1bf6
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/openmp.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, fetch
+, cmake
+, llvm
+, perl
+, version
+}:
+
+stdenv.mkDerivation rec {
+ pname = "openmp";
+ inherit version;
+
+ src = fetch pname "1fpvpsbrrpngm8zplhdbkhnk79mhfdf3xsw1rwcfcv564gilla3w";
+
+ nativeBuildInputs = [ cmake perl ];
+ buildInputs = [ llvm ];
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "Components required to build an executable OpenMP program";
+ homepage = http://openmp.llvm.org/;
+ license = stdenv.lib.licenses.mit;
+ platforms = stdenv.lib.platforms.all;
+ };
+}
diff --git a/pkgs/development/compilers/llvm/10/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/10/sanitizers-nongnu.patch
new file mode 100644
index 00000000000..1f2ac97818e
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/sanitizers-nongnu.patch
@@ -0,0 +1,412 @@
+From f7a253f8f85d0f49df6b73996737a3e84ac64236 Mon Sep 17 00:00:00 2001
+From: Will Dietz
+Date: Mon, 24 Sep 2018 11:17:25 -0500
+Subject: [PATCH] Ported to 7.0, taken from gentoo-musl project.
+
+------
+Ported to compiler-rt-sanitizers-5.0.0. Taken from
+
+https://gist.githubusercontent.com/pwaller/2337f3290f12634cad3e3730cff0a6c1/raw/83c87a8585e2f9662494db5662e5361beb093c26/nongnu.patch
+Signed-off-by: Jory A. Pratt
+
+Taken from gentoo-musl project, with a few additional minor fixes.
+---
+ lib/asan/asan_linux.cc | 4 +-
+ lib/interception/interception_linux.cc | 2 +-
+ lib/interception/interception_linux.h | 2 +-
+ lib/msan/msan_linux.cc | 2 +-
+ lib/sanitizer_common/sanitizer_allocator.cc | 2 +-
+ .../sanitizer_common_interceptors_ioctl.inc | 4 +-
+ .../sanitizer_common_syscalls.inc | 2 +-
+ lib/sanitizer_common/sanitizer_linux.cc | 8 +++-
+ .../sanitizer_linux_libcdep.cc | 10 ++---
+ lib/sanitizer_common/sanitizer_platform.h | 6 +++
+ .../sanitizer_platform_interceptors.h | 4 +-
+ .../sanitizer_platform_limits_posix.cc | 37 +++++++++++--------
+ lib/tsan/rtl/tsan_platform_linux.cc | 2 +-
+ 13 files changed, 51 insertions(+), 34 deletions(-)
+
+diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc
+index 625f32d40..73cf77aca 100644
+--- a/lib/asan/asan_linux.cc
++++ b/lib/asan/asan_linux.cc
+@@ -46,7 +46,7 @@
+ #include
+ #endif
+
+-#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS
++#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU
+ #include
+ extern "C" void* _DYNAMIC;
+ #elif SANITIZER_NETBSD
+@@ -139,7 +139,7 @@ void AsanApplyToGlobals(globals_op_fptr op, const void *needle) {
+ UNIMPLEMENTED();
+ }
+
+-#if SANITIZER_ANDROID
++#if SANITIZER_ANDROID || SANITIZER_NONGNU
+ // FIXME: should we do anything for Android?
+ void AsanCheckDynamicRTPrereqs() {}
+ void AsanCheckIncompatibleRT() {}
+diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc
+index 26bfcd8f6..529b234f7 100644
+--- a/lib/interception/interception_linux.cc
++++ b/lib/interception/interception_linux.cc
+@@ -43,7 +43,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr,
+ }
+
+ // Android and Solaris do not have dlvsym
+-#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD
++#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
+ void *GetFuncAddrVer(const char *func_name, const char *ver) {
+ return dlvsym(RTLD_NEXT, func_name, ver);
+ }
+diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h
+index 942c25609..24a4d5080 100644
+--- a/lib/interception/interception_linux.h
++++ b/lib/interception/interception_linux.h
+@@ -36,7 +36,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver);
+ (::__interception::uptr) & WRAP(func))
+
+ // Android, Solaris and OpenBSD do not have dlvsym
+-#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD
++#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
+ #define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \
+ (::__interception::real_##func = (func##_f)( \
+ unsigned long)::__interception::GetFuncAddrVer(#func, symver))
+diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc
+index 385a650c4..6e30a8ce9 100644
+--- a/lib/msan/msan_linux.cc
++++ b/lib/msan/msan_linux.cc
+@@ -13,7 +13,7 @@
+ //===----------------------------------------------------------------------===//
+
+ #include "sanitizer_common/sanitizer_platform.h"
+-#if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD
++#if SANITIZER_FREEBSD || (SANITIZER_LINUX && !SANITIZER_NONGNU) || SANITIZER_NETBSD
+
+ #include "msan.h"
+ #include "msan_report.h"
+diff --git a/lib/sanitizer_common/sanitizer_allocator.cc b/lib/sanitizer_common/sanitizer_allocator.cc
+index 6bfd5e5ee..048f6154f 100644
+--- a/lib/sanitizer_common/sanitizer_allocator.cc
++++ b/lib/sanitizer_common/sanitizer_allocator.cc
+@@ -27,7 +27,7 @@ const char *SecondaryAllocatorName = "LargeMmapAllocator";
+
+ // ThreadSanitizer for Go uses libc malloc/free.
+ #if SANITIZER_GO || defined(SANITIZER_USE_MALLOC)
+-# if SANITIZER_LINUX && !SANITIZER_ANDROID
++# if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ extern "C" void *__libc_malloc(uptr size);
+ # if !SANITIZER_GO
+ extern "C" void *__libc_memalign(uptr alignment, uptr size);
+diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
+index 2d633c173..b6eb23116 100644
+--- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
++++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
+@@ -104,7 +104,7 @@ static void ioctl_table_fill() {
+ _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz);
+ #endif
+
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX && !SANITIZER_NONGNU
+ // Conflicting request ids.
+ // _(CDROMAUDIOBUFSIZ, NONE, 0);
+ // _(SNDCTL_TMR_CONTINUE, NONE, 0);
+@@ -365,7 +365,7 @@ static void ioctl_table_fill() {
+ _(VT_WAITACTIVE, NONE, 0);
+ #endif
+
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE
+ _(CYGETDEFTHRESH, WRITE, sizeof(int));
+ _(CYGETDEFTIMEOUT, WRITE, sizeof(int));
+diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc
+index 469c8eb7e..24f87867d 100644
+--- a/lib/sanitizer_common/sanitizer_common_syscalls.inc
++++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc
+@@ -2038,7 +2038,7 @@ POST_SYSCALL(setrlimit)(long res, long resource, void *rlim) {
+ }
+ }
+
+-#if !SANITIZER_ANDROID
++#if !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim,
+ void *old_rlim) {
+ if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz);
+diff --git a/lib/sanitizer_common/sanitizer_linux.cc b/lib/sanitizer_common/sanitizer_linux.cc
+index 96d6c1eff..9e2b7fb9d 100644
+--- a/lib/sanitizer_common/sanitizer_linux.cc
++++ b/lib/sanitizer_common/sanitizer_linux.cc
+@@ -541,13 +541,13 @@ const char *GetEnv(const char *name) {
+ #endif
+ }
+
+-#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD
++#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
+ extern "C" {
+ SANITIZER_WEAK_ATTRIBUTE extern void *__libc_stack_end;
+ }
+ #endif
+
+-#if !SANITIZER_GO && !SANITIZER_FREEBSD && !SANITIZER_NETBSD && \
++#if (!SANITIZER_GO || SANITIZER_NONGNU) && !SANITIZER_FREEBSD && !SANITIZER_NETBSD && \
+ !SANITIZER_OPENBSD
+ static void ReadNullSepFileToArray(const char *path, char ***arr,
+ int arr_size) {
+@@ -590,6 +590,10 @@ static void GetArgsAndEnv(char ***argv, char ***envp) {
+ #elif SANITIZER_NETBSD
+ *argv = __ps_strings->ps_argvstr;
+ *envp = __ps_strings->ps_envstr;
++#elif SANITIZER_NONGNU
++ static const int kMaxArgv = 2000, kMaxEnvp = 2000;
++ ReadNullSepFileToArray("/proc/self/cmdline", argv, kMaxArgv);
++ ReadNullSepFileToArray("/proc/self/environ", envp, kMaxEnvp);
+ #else // SANITIZER_FREEBSD
+ #if !SANITIZER_GO
+ if (&__libc_stack_end) {
+diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+index 4962ff832..438f94dbe 100644
+--- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc
++++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+@@ -179,7 +179,7 @@ __attribute__((unused)) static bool GetLibcVersion(int *major, int *minor,
+ }
+
+ #if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && \
+- !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_SOLARIS
++ !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_SOLARIS && !SANITIZER_NONGNU
+ static uptr g_tls_size;
+
+ #ifdef __i386__
+@@ -261,7 +261,7 @@ void InitTlsSize() { }
+ #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) || \
+ defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__) || \
+ defined(__arm__)) && \
+- SANITIZER_LINUX && !SANITIZER_ANDROID
++ SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ // sizeof(struct pthread) from glibc.
+ static atomic_uintptr_t thread_descriptor_size;
+
+@@ -426,7 +426,7 @@ int GetSizeFromHdr(struct dl_phdr_info *info, size_t size, void *data) {
+
+ #if !SANITIZER_GO
+ static void GetTls(uptr *addr, uptr *size) {
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ # if defined(__x86_64__) || defined(__i386__) || defined(__s390__)
+ *addr = ThreadSelf();
+ *size = GetTlsSize();
+@@ -470,7 +470,7 @@ static void GetTls(uptr *addr, uptr *size) {
+ #elif SANITIZER_OPENBSD
+ *addr = 0;
+ *size = 0;
+-#elif SANITIZER_ANDROID
++#elif SANITIZER_ANDROID || SANITIZER_NONGNU
+ *addr = 0;
+ *size = 0;
+ #elif SANITIZER_SOLARIS
+@@ -486,7 +486,7 @@ static void GetTls(uptr *addr, uptr *size) {
+ #if !SANITIZER_GO
+ uptr GetTlsSize() {
+ #if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NETBSD || \
+- SANITIZER_OPENBSD || SANITIZER_SOLARIS
++ SANITIZER_OPENBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU
+ uptr addr, size;
+ GetTls(&addr, &size);
+ return size;
+diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h
+index d81e25580..e10680ac8 100644
+--- a/lib/sanitizer_common/sanitizer_platform.h
++++ b/lib/sanitizer_common/sanitizer_platform.h
+@@ -208,6 +208,12 @@
+ # define SANITIZER_SOLARIS32 0
+ #endif
+
++#if defined(__linux__) && !defined(__GLIBC__)
++# define SANITIZER_NONGNU 1
++#else
++# define SANITIZER_NONGNU 0
++#endif
++
+ #if defined(__myriad2__)
+ # define SANITIZER_MYRIAD2 1
+ #else
+diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h
+index f95539a73..6c53b3415 100644
+--- a/lib/sanitizer_common/sanitizer_platform_interceptors.h
++++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h
+@@ -39,7 +39,7 @@
+ # include "sanitizer_platform_limits_solaris.h"
+ #endif
+
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ # define SI_LINUX_NOT_ANDROID 1
+ #else
+ # define SI_LINUX_NOT_ANDROID 0
+@@ -322,7 +322,7 @@
+ #define SANITIZER_INTERCEPT_ETHER_R (SI_FREEBSD || SI_LINUX_NOT_ANDROID)
+ #define SANITIZER_INTERCEPT_SHMCTL \
+ (SI_NETBSD || SI_OPENBSD || SI_SOLARIS || \
+- ((SI_FREEBSD || SI_LINUX_NOT_ANDROID) && \
++ ((SI_FREEBSD || SI_LINUX_NOT_ANDROID || SANITIZER_NONGNU) && \
+ SANITIZER_WORDSIZE == 64)) // NOLINT
+ #define SANITIZER_INTERCEPT_RANDOM_R SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_PTHREAD_ATTR_GET SI_POSIX
+diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+index 54da635d7..2f6ff69c3 100644
+--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -14,6 +14,9 @@
+
+ #include "sanitizer_platform.h"
+
++// Workaround musl <--> linux conflicting definition of 'struct sysinfo'
++#define _LINUX_SYSINFO_H
++
+ #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_MAC
+ // Tests in this file assume that off_t-dependent data structures match the
+ // libc ABI. For example, struct dirent here is what readdir() function (as
+@@ -138,12 +141,14 @@ typedef struct user_fpregs elf_fpregset_t;
+
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+ #include
+-#include
++# if !SANITIZER_NONGNU
++# include
++# endif
+ #include
+-#include
+-#include
+-#include
+-#include
++#include
++#include
++#include
++#include
+ #if HAVE_RPC_XDR_H
+ # include
+ #elif HAVE_TIRPC_RPC_XDR_H
+@@ -251,7 +256,7 @@ namespace __sanitizer {
+ unsigned struct_itimerspec_sz = sizeof(struct itimerspec);
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ // Use pre-computed size of struct ustat to avoid which
+ // has been removed from glibc 2.28.
+ #if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \
+@@ -322,7 +327,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr));
+ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+ #endif
+
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ int glob_nomatch = GLOB_NOMATCH;
+ int glob_altdirfunc = GLOB_ALTDIRFUNC;
+ #endif
+@@ -416,7 +421,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+ unsigned struct_termios_sz = sizeof(struct termios);
+ unsigned struct_winsize_sz = sizeof(struct winsize);
+
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX && !SANITIZER_NONGNU
+ unsigned struct_arpreq_sz = sizeof(struct arpreq);
+ unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf);
+ unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession);
+@@ -466,7 +471,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+ unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);
+ unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);
+ #if EV_VERSION > (0x010000)
+@@ -834,7 +839,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+ unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE;
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;
+ unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;
+ unsigned IOCTL_CYGETMON = CYGETMON;
+@@ -989,7 +994,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr);
+ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum);
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ CHECK_TYPE_SIZE(glob_t);
+ CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc);
+ CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv);
+@@ -1023,6 +1028,7 @@ CHECK_TYPE_SIZE(iovec);
+ CHECK_SIZE_AND_OFFSET(iovec, iov_base);
+ CHECK_SIZE_AND_OFFSET(iovec, iov_len);
+
++#if !SANITIZER_NONGNU
+ CHECK_TYPE_SIZE(msghdr);
+ CHECK_SIZE_AND_OFFSET(msghdr, msg_name);
+ CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen);
+@@ -1036,6 +1042,7 @@ CHECK_TYPE_SIZE(cmsghdr);
+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len);
+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level);
+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type);
++#endif
+
+ #ifndef __GLIBC_PREREQ
+ #define __GLIBC_PREREQ(x, y) 0
+@@ -1145,7 +1152,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno);
+
+ CHECK_TYPE_SIZE(ether_addr);
+
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ CHECK_TYPE_SIZE(ipc_perm);
+ # if SANITIZER_FREEBSD
+ CHECK_SIZE_AND_OFFSET(ipc_perm, key);
+@@ -1206,7 +1213,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr);
+ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data);
+ #endif
+
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo));
+ #endif
+
+@@ -1256,7 +1263,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE);
+ COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE);
+ #endif
+
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE));
+ CHECK_SIZE_AND_OFFSET(FILE, _flags);
+ CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr);
+@@ -1275,7 +1282,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain);
+ CHECK_SIZE_AND_OFFSET(FILE, _fileno);
+ #endif
+
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk));
+ CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit);
+ CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev);
+diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc
+index de989b780..51a97b554 100644
+--- a/lib/tsan/rtl/tsan_platform_linux.cc
++++ b/lib/tsan/rtl/tsan_platform_linux.cc
+@@ -294,7 +294,7 @@ void InitializePlatform() {
+ // This is required to properly "close" the fds, because we do not see internal
+ // closes within glibc. The code is a pure hack.
+ int ExtractResolvFDs(void *state, int *fds, int nfd) {
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ int cnt = 0;
+ struct __res_state *statp = (struct __res_state*)state;
+ for (int i = 0; i < MAXNS && cnt < nfd; i++) {
+--
+2.19.0
+
diff --git a/pkgs/development/compilers/ocaml/4.10.nix b/pkgs/development/compilers/ocaml/4.10.nix
index 046ea84a0d8..234b2c44631 100644
--- a/pkgs/development/compilers/ocaml/4.10.nix
+++ b/pkgs/development/compilers/ocaml/4.10.nix
@@ -1,6 +1,6 @@
import ./generic.nix {
major_version = "4";
minor_version = "10";
- patch_version = "0+rc1";
- sha256 = "1nzmn9wszixsyzz4bhpwqw8dx0m1iy83xmanp4g9f5dfywgcss2c";
+ patch_version = "0+rc2";
+ sha256 = "1iv8x9xr4k2s1x1p4rj4fqdh2iwzhgi56lyshvh6gg224i14rkbz";
}
diff --git a/pkgs/development/compilers/rust/1_41_0.nix b/pkgs/development/compilers/rust/1_41_0.nix
index 2762f441171..b73d9b8ef26 100644
--- a/pkgs/development/compilers/rust/1_41_0.nix
+++ b/pkgs/development/compilers/rust/1_41_0.nix
@@ -6,6 +6,16 @@
# request review, in case platforms cannot be covered.
# 2. The LLVM version used for building should match with rust upstream.
# 3. Firefox and Thunderbird should still build on x86_64-linux.
+
+{ stdenv, lib
+, buildPackages
+, newScope, callPackage
+, CoreFoundation, Security
+, llvmPackages_5
+, pkgsBuildTarget, pkgsBuildBuild
+, fetchpatch
+} @ args:
+
import ./default.nix {
rustcVersion = "1.41.0";
rustcSha256 = "0jypz2mrzac41sj0zh07yd1z36g2s2rvgsb8g624sk4l14n84ijm";
@@ -26,4 +36,13 @@ import ./default.nix {
};
selectRustPackage = pkgs: pkgs.rust_1_41_0;
+
+ rustcPatches = [
+ (fetchpatch {
+ url = "https://github.com/QuiltOS/rust/commit/f1803452b9e95bfdbc3b8763138b9f92c7d12b46.diff";
+ sha256 = "1mzxaj46bq7ll617wg0mqnbnwr1da3hd4pbap8bjwhs3kfqnr7kk";
+ })
+ ];
}
+
+(builtins.removeAttrs args [ "fetchpatch" ])
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index af7f63b6f8a..a5da7ee7a6d 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -4,6 +4,7 @@
, bootstrapVersion
, bootstrapHashes
, selectRustPackage
+, rustcPatches ? []
}:
{ stdenv, lib
, buildPackages
@@ -79,6 +80,8 @@
sha256 = rustcSha256;
inherit enableRustcDev;
+ patches = rustcPatches;
+
# Use boot package set to break cycle
rustPlatform = bootRustPlatform;
} // lib.optionalAttrs (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) {
diff --git a/pkgs/development/compilers/rust/rls/default.nix b/pkgs/development/compilers/rust/rls/default.nix
index 942e23c6170..4cf507fbf5c 100644
--- a/pkgs/development/compilers/rust/rls/default.nix
+++ b/pkgs/development/compilers/rust/rls/default.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage {
CARGO_BUILD_RUSTFLAGS = if stdenv.isDarwin then "-C rpath" else null;
nativeBuildInputs = [ pkgconfig cmake ];
- buildInputs = [ openssh openssl curl zlib libiconv ]
+ buildInputs = [ openssh openssl curl zlib libiconv rustPlatform.rust.rustc.llvm ]
++ (stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security ]);
doCheck = true;
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage {
meta = with stdenv.lib; {
description = "Rust Language Server - provides information about Rust programs to IDEs and other tools";
- homepage = https://github.com/rust-lang/rls/;
+ homepage = "https://github.com/rust-lang/rls/";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ symphorien ];
platforms = platforms.all;
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 7857dbc7ee6..6498c34ce8b 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -7,6 +7,7 @@
, enableRustcDev ? true
, version
, sha256
+, patches ? []
}:
let
@@ -104,6 +105,8 @@ in stdenv.mkDerivation rec {
# the rust build system complains that nix alters the checksums
dontFixLibtool = true;
+ inherit patches;
+
postPatch = ''
patchShebangs src/etc
diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix
index 77bc3cc5b73..25accf8c949 100644
--- a/pkgs/development/compilers/swift/default.nix
+++ b/pkgs/development/compilers/swift/default.nix
@@ -26,6 +26,7 @@
, git
, libgit2
, fetchFromGitHub
+, fetchpatch
, findutils
, makeWrapper
, gnumake
@@ -224,6 +225,15 @@ stdenv.mkDerivation {
# uuid.h is not part of glibc, but of libuuid
sed -i 's|''${GLIBC_INCLUDE_PATH}/uuid/uuid.h|${libuuid.dev}/include/uuid/uuid.h|' swift/stdlib/public/Platform/glibc.modulemap.gyb
+ # Compatibility with glibc 2.30
+ # Adapted from https://github.com/apple/swift-package-manager/pull/2408
+ patch -p1 -d swiftpm -i ${./patches/swift-package-manager-glibc-2.30.patch}
+ # https://github.com/apple/swift/pull/27288
+ patch -p1 -d swift -i ${fetchpatch {
+ url = "https://github.com/apple/swift/commit/f968f4282d53f487b29cf456415df46f9adf8748.patch";
+ sha256 = "1aa7l66wlgip63i4r0zvi9072392bnj03s4cn12p706hbpq0k37c";
+ }}
+
PREFIX=''${out/#\/}
substituteInPlace indexstore-db/Utilities/build-script-helper.py \
--replace usr "$PREFIX"
diff --git a/pkgs/development/compilers/swift/patches/swift-package-manager-glibc-2.30.patch b/pkgs/development/compilers/swift/patches/swift-package-manager-glibc-2.30.patch
new file mode 100644
index 00000000000..14ef3849764
--- /dev/null
+++ b/pkgs/development/compilers/swift/patches/swift-package-manager-glibc-2.30.patch
@@ -0,0 +1,25 @@
+diff --git a/Sources/Basic/Process.swift b/Sources/Basic/Process.swift
+index f388c769..8f208691 100644
+--- a/Sources/Basic/Process.swift
++++ b/Sources/Basic/Process.swift
+@@ -322,7 +322,10 @@ public final class Process: ObjectIdentifierProtocol {
+ defer { posix_spawn_file_actions_destroy(&fileActions) }
+
+ // Workaround for https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=89e435f3559c53084498e9baad22172b64429362
+- let devNull = strdup("/dev/null")
++ // Change allowing for newer version of glibc
++ guard let devNull = strdup("/dev/null") else {
++ throw SystemError.posix_spawn(0, arguments)
++ }
+ defer { free(devNull) }
+ // Open /dev/null as stdin.
+ posix_spawn_file_actions_addopen(&fileActions, 0, devNull, O_RDONLY, 0)
+@@ -348,7 +351,7 @@ public final class Process: ObjectIdentifierProtocol {
+
+ let argv = CStringArray(arguments)
+ let env = CStringArray(environment.map({ "\($0.0)=\($0.1)" }))
+- let rv = posix_spawnp(&processID, argv.cArray[0], &fileActions, &attributes, argv.cArray, env.cArray)
++ let rv = posix_spawnp(&processID, argv.cArray[0]!, &fileActions, &attributes, argv.cArray, env.cArray)
+
+ guard rv == 0 else {
+ throw SystemError.posix_spawn(rv, arguments)
diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
index 739759a67fc..de90a0c0695 100644
--- a/pkgs/development/compilers/yosys/default.nix
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "yosys";
- version = "2020.02.07";
+ version = "2020.02.25";
src = fetchFromGitHub {
owner = "YosysHQ";
repo = "yosys";
- rev = "2e8d6ec0b06b4e51e222c15c8049130bc264ae57";
- sha256 = "0asnqhxs5r5r2xmvsk9pbgyqgk53j1snh7c9qizcppn4csapda81";
+ rev = "6edca05793197a846bbfb0329e836c87fa5aabb6";
+ sha256 = "1cwps3nsld80bh2b66l8fx3fa2zsx174mw72kqxyihpfdm0m0z1s";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix
index 97703922395..8bbf74b6078 100644
--- a/pkgs/development/coq-modules/coq-ext-lib/default.nix
+++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix
@@ -2,11 +2,13 @@
let params =
{
- "8.5" = { version = "0.9.4"; sha256 = "1y66pamgsdxlq2w1338lj626ln70cwj7k53hxcp933g8fdsa4hp0"; };
- "8.6" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; };
- "8.7" = { version = "0.9.7"; sha256 = "00v4bm4glv1hy08c8xsm467az6d1ashrznn8p2bmbmmp52lfg7ag"; };
- "8.8" = { version = "0.10.3"; sha256 = "0795gs2dlr663z826mp63c8h2zfadn541dr8q0fvnvi2z7kfyslb"; };
- "8.9" = { version = "0.10.3"; sha256 = "0795gs2dlr663z826mp63c8h2zfadn541dr8q0fvnvi2z7kfyslb"; };
+ "8.5" = { version = "0.9.4"; sha256 = "1y66pamgsdxlq2w1338lj626ln70cwj7k53hxcp933g8fdsa4hp0"; };
+ "8.6" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; };
+ "8.7" = { version = "0.9.7"; sha256 = "00v4bm4glv1hy08c8xsm467az6d1ashrznn8p2bmbmmp52lfg7ag"; };
+ "8.8" = { version = "0.11.1"; sha256 = "0dmf1p9j8lm0hwaq0af18jxdwg869xi2jm8447zng7krrq3kvkg5"; };
+ "8.9" = { version = "0.11.1"; sha256 = "0dmf1p9j8lm0hwaq0af18jxdwg869xi2jm8447zng7krrq3kvkg5"; };
+ "8.10" = { version = "0.11.1"; sha256 = "0dmf1p9j8lm0hwaq0af18jxdwg869xi2jm8447zng7krrq3kvkg5"; };
+ "8.11" = { version = "0.11.1"; sha256 = "0dmf1p9j8lm0hwaq0af18jxdwg869xi2jm8447zng7krrq3kvkg5"; };
};
param = params.${coq.coq-version};
in
diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix
index 647a13afa8f..aeb53a995e5 100644
--- a/pkgs/development/coq-modules/mathcomp/default.nix
+++ b/pkgs/development/coq-modules/mathcomp/default.nix
@@ -8,6 +8,7 @@ let
####################################
# sha256 of released mathcomp versions
mathcomp-sha256 = {
+ "1.10.0" = "1b9m6pwxxyivw7rgx82gn5kmgv2mfv3h3y0mmjcjfypi8ydkrlbv";
"1.9.0" = "0lid9zaazdi3d38l8042lczb02pw5m9wq0yysiilx891hgq2p81r";
"1.8.0" = "07l40is389ih8bi525gpqs3qp4yb2kl11r9c8ynk1ifpjzpnabwp";
"1.7.0" = "0wnhj9nqpx2bw6n1l4i8jgrw3pjajvckvj3lr4vzjb3my2lbxdd1";
@@ -15,6 +16,7 @@ let
};
# versions of coq compatible with released mathcomp versions
mathcomp-coq-versions = {
+ "1.10.0" = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" ];
"1.9.0" = flip elem ["8.7" "8.8" "8.9" "8.10"];
"1.8.0" = flip elem ["8.7" "8.8" "8.9"];
"1.7.0" = flip elem ["8.6" "8.7" "8.8" "8.9"];
@@ -24,7 +26,7 @@ let
max-mathcomp-version = last (naturalSort (attrNames mathcomp-coq-versions));
# mathcomp prefered version by decreasing order
# (the first version in the list will be tried first)
- mathcomp-version-preference = [ "1.8.0" "1.9.0" "1.7.0" "1.6.1" ];
+ mathcomp-version-preference = [ "1.8.0" "1.9.0" "1.10.0" "1.7.0" "1.6.1" ];
##############################################################
# COMPUTED using the configuration above (edit with caution) #
@@ -133,6 +135,7 @@ getAttrOr = a: n: a.${n} or (throw a.error);
mathcompCorePkgs_1_7 = mathcompGen "1.7.0";
mathcompCorePkgs_1_8 = mathcompGen "1.8.0";
mathcompCorePkgs_1_9 = mathcompGen "1.9.0";
+mathcompCorePkgs_1_10 = mathcompGen "1.10.0";
mathcompCorePkgs = recurseIntoAttrs
(mapDerivationAttrset dontDistribute (mathcompGen default-mathcomp-version));
@@ -143,6 +146,7 @@ inherit mathcompGenSingle;
mathcomp_1_7_single = getAttrOr (mathcompGenSingle "1.7.0") "single";
mathcomp_1_8_single = getAttrOr (mathcompGenSingle "1.8.0") "single";
mathcomp_1_9_single = getAttrOr (mathcompGenSingle "1.9.0") "single";
+mathcomp_1_10_single = getAttrOr (mathcompGenSingle "1.10.0") "single";
mathcomp_single = dontDistribute
(getAttrOr (mathcompGenSingle default-mathcomp-version) "single");
@@ -151,13 +155,16 @@ mathcomp_single = dontDistribute
# each of these have a special attribute overrideMathcomp which
# must be used instead of overrideAttrs in order to also fix the dependencies
inherit mathcompGen mathcompCorePkgs
- mathcompCorePkgs_1_7 mathcompCorePkgs_1_8 mathcompCorePkgs_1_9;
+ mathcompCorePkgs_1_7 mathcompCorePkgs_1_8 mathcompCorePkgs_1_9
+ mathcompCorePkgs_1_10
+ ;
mathcomp = getAttrOr mathcompCorePkgs "all";
mathcomp_1_7 = getAttrOr mathcompCorePkgs_1_7 "all";
mathcomp_1_8 = getAttrOr mathcompCorePkgs_1_8 "all";
mathcomp_1_9 = getAttrOr mathcompCorePkgs_1_9 "all";
+mathcomp_1_10 = getAttrOr mathcompCorePkgs_1_10 "all";
ssreflect = getAttrOr mathcompCorePkgs "ssreflect";
@@ -165,4 +172,5 @@ ssreflect = getAttrOr mathcompCorePkgs "ssreflect";
(mapAttrs' (n: pkg: {name = "mathcomp-${n}"; value = pkg;}) mathcompCorePkgs) //
(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_7"; value = pkg;}) mathcompCorePkgs_1_7) //
(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_8"; value = pkg;}) mathcompCorePkgs_1_8) //
-(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_9"; value = pkg;}) mathcompCorePkgs_1_9)
+(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_9"; value = pkg;}) mathcompCorePkgs_1_9) //
+(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_10"; value = pkg;}) mathcompCorePkgs_1_10)
diff --git a/pkgs/development/dhall-modules/Prelude.nix b/pkgs/development/dhall-modules/Prelude.nix
new file mode 100644
index 00000000000..c689f7156fb
--- /dev/null
+++ b/pkgs/development/dhall-modules/Prelude.nix
@@ -0,0 +1,68 @@
+{ buildDhallPackage, fetchFromGitHub, lib }:
+
+let
+ makePrelude =
+ version:
+ lib.makeOverridable
+ ( { rev, sha256, file ? "package.dhall" }:
+ buildDhallPackage {
+ name = "Prelude-${version}";
+
+ code =
+ let
+ src = fetchFromGitHub {
+ owner = "dhall-lang";
+ repo = "dhall-lang";
+
+ inherit rev sha256;
+ };
+
+ in
+ "${src}/Prelude/${file}";
+ }
+ );
+
+in
+ lib.mapAttrs makePrelude {
+ # Prelude versions older than 7.0.0 use old-style union literals, which are
+ # no longer supported by the latest version of the standard
+ "7.0.0" = {
+ rev = "f0509b403ace4b8a72ebb5fa9c473b9aeabeaf33";
+ sha256 = "00ldlvqfh411vnrnc41zfnlvgfanwfd3l8hdia8kni3r8q9qmd71";
+ };
+
+ "8.0.0" = {
+ rev = "136a3491753fef251b2087031617d1ee1053f285";
+ sha256 = "0haxd5dhi5bmg06a0hx1blpivmwrcnndydwagibj3zvch4knyi2q";
+ };
+
+ "9.0.0" = {
+ rev = "6cbf57c946e7e6576babc23a38320e53ecfa6bee";
+ sha256 = "1r06fijszyifq5b4j6libwkm06g8693m9n5c4kq61dvzrjfd2gim";
+ };
+
+ "10.0.0" = {
+ rev = "ecbf82785cff406bbd162bbabf3df6f817c805e0";
+ sha256 = "0gxkr9649jqpykdzqjc98gkwnjry8wp469037brfghyidwsm021m";
+ };
+
+ "11.0.0" = {
+ rev = "8098184d17c3aecc82674a7b874077a7641be05a";
+ sha256 = "0rdvyxq7mvas82wsfzzpk6imzm8ax4q58l522mx0ks69pacpr3yi";
+ };
+
+ "11.1.0" = {
+ rev = "31e90e1996f6c4cb50e03ccb1f3c45beb4bd278c";
+ sha256 = "0rdvyxq7mvas82wsfzzpk6imzm8ax4q58l522mx0ks69pacpr3yi";
+ };
+
+ "12.0.0" = {
+ rev = "9f248138f69ee5e22192dc3d0417d5c77b189e04";
+ sha256 = "1gbr0376sfamp0ibhcbxz4vaxr6ipv42y42p5wyksfhz3ls9x5ph";
+ };
+
+ "13.0.0" = {
+ rev = "48db9e1ff1f8881fa4310085834fbc19e313ebf0";
+ sha256 = "0kg3rzag3irlcldck63rjspls614bc2sbs3zq44h0pzcz9v7z5h9";
+ };
+ }
diff --git a/pkgs/development/dhall-modules/default.nix b/pkgs/development/dhall-modules/default.nix
deleted file mode 100644
index b6632a86f31..00000000000
--- a/pkgs/development/dhall-modules/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ pkgs }:
-
-# TODO: add into the toplevel fixpoint instead of using rec
-rec {
-
- prelude = prelude_3_0_0;
- prelude_3_0_0 = pkgs.callPackage ./prelude/v3.nix {};
-
-}
diff --git a/pkgs/development/dhall-modules/dhall-kubernetes.nix b/pkgs/development/dhall-modules/dhall-kubernetes.nix
new file mode 100644
index 00000000000..23a1123eacb
--- /dev/null
+++ b/pkgs/development/dhall-modules/dhall-kubernetes.nix
@@ -0,0 +1,40 @@
+{ buildDhallPackage, fetchFromGitHub, lib }:
+
+let
+ makeDhallKubernetes =
+ version:
+ lib.makeOverridable
+ ( { rev
+ , sha256
+ , file ? "package.dhall"
+ }:
+ buildDhallPackage {
+ name = "dhall-kubernetes-${version}";
+
+ code =
+ let
+ src = fetchFromGitHub {
+ owner = "dhall-lang";
+ repo = "dhall-kubernetes";
+
+ inherit rev sha256;
+ };
+
+ in
+ "${src}/${file}";
+ }
+ );
+
+in
+ lib.mapAttrs makeDhallKubernetes {
+ # 2.1.0 was the first version to introduce a top-level `package.dhall` file
+ "2.1.0" = {
+ rev = "bbfec3d8548b605f1c9628f34029ab4a7d928839";
+ sha256 = "10zkigj05khiy6w2sqcm5nw7d47r5k52xq8np8q86h0phy798g96";
+ };
+
+ "3.0.0" = {
+ rev = "3c6d09a9409977cdde58a091d76a6d20509ca4b0";
+ sha256 = "1r4awh770ghsrwabh5ddy3jpmrbigakk0h32542n1kh71w3cdq1h";
+ };
+ }
diff --git a/pkgs/development/dhall-modules/dhall-packages.nix b/pkgs/development/dhall-modules/dhall-packages.nix
new file mode 100644
index 00000000000..34ebbed6869
--- /dev/null
+++ b/pkgs/development/dhall-modules/dhall-packages.nix
@@ -0,0 +1,66 @@
+{ buildDhallPackage, dhall-kubernetes, fetchFromGitHub, lib, Prelude }:
+
+let
+ makeDhallPackages =
+ version:
+ lib.makeOverridable
+ ( { rev
+ , sha256
+ , dependencies
+ }:
+ buildDhallPackage {
+ name = "dhall-packages-${version}";
+
+ inherit dependencies;
+
+ code =
+ let
+ src = fetchFromGitHub {
+ owner = "EarnestResearch";
+ repo = "dhall-packages";
+
+ inherit rev sha256;
+ };
+
+ in
+ "${src}/package.dhall";
+ }
+ );
+
+in
+ lib.mapAttrs makeDhallPackages {
+ "0.11.1" =
+ let
+ k8s_6a47bd = dhall-kubernetes."3.0.0".override {
+ rev = "6a47bd50c4d3984a13570ea62382a3ad4a9919a4";
+ sha256 = "1azqs0x2kia3xw93rfk2mdi8izd7gy9aq6qzbip32gin7dncmfhh";
+ };
+
+ k8s_4ad581 = dhall-kubernetes."3.0.0".override {
+ rev = "4ad58156b7fdbbb6da0543d8b314df899feca077";
+ sha256 = "12fm70qbhcainxia388svsay2cfg9iksc6mss0nvhgxhpypgp8r0";
+ };
+
+ k8s_fee24c = dhall-kubernetes."3.0.0".override {
+ rev = "fee24c0993ba0b20190e2fdb94e386b7fb67252d";
+ sha256 = "11d93z8y0jzrb8dl43gqha9z96nxxqkl7cbxpz8hw8ky9x6ggayk";
+ };
+
+ in
+ { rev = "8d228f578fbc7bb16c04a7c9ac8c6c7d2e13d1f7";
+ sha256 = "1v4y1x13lxy6cxf8xqc6sb0mc4mrd4frkxih95v9q2wxw4vkw2h7";
+
+ dependencies = [
+ (k8s_6a47bd.override { file = "1.14/package.dhall"; })
+ (k8s_6a47bd.override { file = "1.15/package.dhall"; })
+ (k8s_6a47bd.override { file = "1.16/package.dhall"; })
+ (k8s_4ad581.override { file = "types.dhall"; })
+ (k8s_fee24c.override { file = "types/io.k8s.api.core.v1.ServiceSpec.dhall"; })
+ (k8s_fee24c.override { file = "types/io.k8s.api.core.v1.PodTemplateSpec.dhall"; })
+ Prelude."12.0.0"
+ (Prelude."12.0.0".override { file = "JSON/package.dhall"; })
+ (Prelude."12.0.0".override { file = "JSON/Type"; })
+ (Prelude."12.0.0".override { file = "Map/Type"; })
+ ];
+ };
+ }
diff --git a/pkgs/development/dhall-modules/prelude/v3.nix b/pkgs/development/dhall-modules/prelude/v3.nix
deleted file mode 100644
index ef673310ceb..00000000000
--- a/pkgs/development/dhall-modules/prelude/v3.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, lib, fetchFromGitHub }:
-
-stdenv.mkDerivation {
- name = "dhall-prelude";
-
- src = fetchFromGitHub {
- owner = "dhall-lang";
- repo = "dhall-lang";
- # Commit where the v3.0.0 prelude folder was merged into dhall-lang
- # and a LICENSE file has been added.
- rev = "f6aa9399f1ac831d66c34104abe6856023c5b2df";
- sha256 = "0kqjgh3y1l3cb3rj381j7c09547g1vh2dsfzpm08y1qajhhf9vgf";
- };
-
- phases = [ "unpackPhase" "installPhase" ];
-
- installPhase = ''
- cp -r Prelude $out
- '';
-
- meta = {
- license = lib.licenses.bsd3;
- maintainers = with lib.maintainers; [ Profpatsch ];
- };
-}
diff --git a/pkgs/development/interpreters/clojurescript/lumo/default.nix b/pkgs/development/interpreters/clojurescript/lumo/default.nix
index 0e9d81d5e95..d6252a7506a 100644
--- a/pkgs/development/interpreters/clojurescript/lumo/default.nix
+++ b/pkgs/development/interpreters/clojurescript/lumo/default.nix
@@ -1,18 +1,30 @@
-{ stdenv, lib, fetchurl, clojure,
- nodejs, jre, unzip, nodePackages,
- python, openssl, pkgs }:
+{ stdenv
+, lib
+, fetchurl
+, clojure
+, gnutar
+, nodejs
+, jre
+, unzip
+, nodePackages
+, xcbuild
+, python
+, openssl
+, pkgs
+, fetchgit
+, darwin
+}:
+let
+ version = "1.10.1";
+ nodeVersion = "11.13.0";
+ nodeSources = fetchurl {
+ url = "https://nodejs.org/dist/v${nodeVersion}/node-v${nodeVersion}.tar.gz";
+ sha256 = "1cjzjbshxnysxkvbf41p3m8298cnhs9kfvdczgvvvlp6w16x4aac";
+ };
+ lumo-internal-classpath = "LUMO__INTERNAL__CLASSPATH";
-let # packageJSON=./package.json;
- version = "1.9.0";
- nodeVersion = "10.9.0";
- nodeSources = fetchurl {
- url="https://nodejs.org/dist/v${nodeVersion}/node-v${nodeVersion}.tar.gz";
- sha256="0wgawq3wzw07pir73bxz13dggcc1fj0538y7y69n3cc0a2kiplqy";
- };
- lumo-internal-classpath = "LUMO__INTERNAL__CLASSPATH";
-
- # as found in cljs/snapshot/lumo/repl.cljs
- requireDeps = '' \
+ # as found in cljs/snapshot/lumo/repl.cljs
+ requireDeps = '' \
cljs.analyzer \
cljs.compiler \
cljs.env \
@@ -50,104 +62,125 @@ let # packageJSON=./package.json;
lumo.js-deps \
lumo.common '';
- compileClojurescript = (simple: ''
- (require '[cljs.build.api :as cljs])
- (cljs/build \"src/cljs/snapshot\"
- {:optimizations ${if simple then ":simple" else ":none"}
- :main 'lumo.core
- :cache-analysis true
- :source-map false
- :dump-core false
- :static-fns true
- :optimize-constants false
- :npm-deps false
- :verbose true
- :closure-defines {'cljs.core/*target* \"nodejs\"
- 'lumo.core/*lumo-version* \"${version}\"}
- :compiler-stats true
- :process-shim false
- :fn-invoke-direct true
- :parallel-build false
- :browser-repl false
- :target :nodejs
- :hashbang false
- ;; :libs [ \"src/cljs/bundled\" \"src/js\" ]
- :output-dir ${if simple
- then ''\"cljstmp\"''
- else ''\"target\"''}
- :output-to ${if simple
- then ''\"cljstmp/main.js\"''
- else ''\"target/deleteme.js\"'' }})
- '');
+ compileClojurescript = (simple: ''
+ (require '[cljs.build.api :as cljs])
+ (cljs/build \"src/cljs/snapshot\"
+ {:optimizations ${if simple then ":simple" else ":none"}
+ :main 'lumo.core
+ :cache-analysis true
+ :source-map false
+ :dump-core false
+ :static-fns true
+ :optimize-constants false
+ :npm-deps false
+ :verbose true
+ :closure-defines {'cljs.core/*target* \"nodejs\"
+ 'lumo.core/*lumo-version* \"${version}\"}
+ :compiler-stats true
+ :process-shim false
+ :fn-invoke-direct true
+ :parallel-build false
+ :browser-repl false
+ :target :nodejs
+ :hashbang false
+ ;; :libs [ \"src/cljs/bundled\" \"src/js\" ]
+ :output-dir ${if simple
+ then ''\"cljstmp\"''
+ else ''\"target\"''}
+ :output-to ${if simple
+ then ''\"cljstmp/main.js\"''
+ else ''\"target/deleteme.js\"'' }})
+ ''
+ );
- cacheToJsons = ''
- (import [java.io ByteArrayOutputStream FileInputStream])
- (require '[cognitect.transit :as transit]
- '[clojure.edn :as edn]
- '[clojure.string :as str])
+ cacheToJsons = ''
+ (import [java.io ByteArrayOutputStream FileInputStream])
+ (require '[cognitect.transit :as transit]
+ '[clojure.edn :as edn]
+ '[clojure.string :as str])
- (defn write-transit-json [cache]
- (let [out (ByteArrayOutputStream. 1000000)
- writer (transit/writer out :json)]
- (transit/write writer cache)
- (.toString out)))
+ (defn write-transit-json [cache]
+ (let [out (ByteArrayOutputStream. 1000000)
+ writer (transit/writer out :json)]
+ (transit/write writer cache)
+ (.toString out)))
- (defn process-caches []
- (let [cache-aot-path \"target/cljs/core.cljs.cache.aot.edn\"
- cache-aot-edn (edn/read-string (slurp cache-aot-path))
- cache-macros-path \"target/cljs/core\$macros.cljc.cache.json\"
- cache-macros-stream (FileInputStream. cache-macros-path)
- cache-macros-edn (transit/read (transit/reader cache-macros-stream :json))
- caches [[cache-aot-path cache-aot-edn]
- [cache-macros-path cache-macros-edn]]]
- (doseq [[path cache-edn] caches]
- (doseq [key (keys cache-edn)]
- (let [out-path (str/replace path #\"(\.json|\.edn)\$\"
- (str \".\" (munge key) \".json\"))
- tr-json (write-transit-json (key cache-edn))]
- (spit out-path tr-json))))))
+ (defn process-caches []
+ (let [cache-aot-path \"target/cljs/core.cljs.cache.aot.edn\"
+ cache-aot-edn (edn/read-string (slurp cache-aot-path))
+ cache-macros-path \"target/cljs/core\$macros.cljc.cache.json\"
+ cache-macros-stream (FileInputStream. cache-macros-path)
+ cache-macros-edn (transit/read (transit/reader cache-macros-stream :json))
+ caches [[cache-aot-path cache-aot-edn]
+ [cache-macros-path cache-macros-edn]]]
+ (doseq [[path cache-edn] caches]
+ (doseq [key (keys cache-edn)]
+ (let [out-path (str/replace path #\"(\.json|\.edn)\$\"
+ (str \".\" (munge key) \".json\"))
+ tr-json (write-transit-json (key cache-edn))]
+ (spit out-path tr-json))))))
- (process-caches)
- '';
+ (process-caches)
+ '';
- trimMainJsEnd = ''
- (let [string (slurp \"target/main.js\")]
- (spit \"target/main.js\"
- (subs string 0 (.indexOf string \"cljs.nodejs={};\"))))
- '';
+ trimMainJsEnd = ''
+ (let [string (slurp \"target/main.js\")]
+ (spit \"target/main.js\"
+ (subs string 0 (.indexOf string \"cljs.nodejs={};\"))))
+ '';
- cljdeps = import ./deps.nix { inherit pkgs; };
- classp = cljdeps.makeClasspaths {
- extraClasspaths=["src/js" "src/cljs/bundled" "src/cljs/snapshot"];
- };
-
-
- getJarPath = jarName: (lib.findFirst (p: p.name == jarName) null cljdeps.packages).path.jar;
-
-in stdenv.mkDerivation {
- inherit version;
- pname = "lumo";
-
- src = fetchurl {
- url = "https://github.com/anmonteiro/lumo/archive/${version}.tar.gz";
- sha256 = "1mr3zjslznhv7y3mzvg1pmmvzn10d6di26izz4x8p4nfnshacwgw";
+ cljdeps = import ./deps.nix { inherit pkgs; };
+ classp = cljdeps.makeClasspaths {
+ extraClasspaths = [ "src/js" "src/cljs/bundled" "src/cljs/snapshot" ];
};
- buildInputs = [ nodejs clojure jre unzip python openssl
- nodePackages."lumo-build-deps-../interpreters/clojurescript/lumo" ];
+ getJarPath = jarName: (lib.findFirst (p: p.name == jarName) null cljdeps.packages).path.jar;
+in
+stdenv.mkDerivation {
+ inherit version;
+ pname = "lumo";
+
+ src = fetchgit {
+ url = "https://github.com/anmonteiro/lumo.git";
+ rev = "${version}";
+ sha256 = "12agi6bacqic2wq6q3l28283badzamspajmajzqm7fbdl2aq1a4p";
+ };
+
+ buildInputs = [
+ nodejs
+ clojure
+ jre
+ unzip
+ python
+ openssl
+ gnutar
+ nodePackages."lumo-build-deps-../interpreters/clojurescript/lumo"
+ ]
+ ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+ ApplicationServices
+ xcbuild
+ ]
+ );
+
+ patches = [ ./no_mangle.patch ./mkdir_promise.patch ];
+
+ postPatch = ''
+ substituteInPlace $NIX_BUILD_TOP/lumo/vendor/nexe/exe.js \
+ --replace 'glob.sync(dir + "/*")' 'glob.sync(dir + "/../*")'
+ '';
buildPhase = ''
- # Copy over lumo-build-deps environment
+ # Copy over lumo-build-deps environment
rm yarn.lock
cp -rf ${nodePackages."lumo-build-deps-../interpreters/clojurescript/lumo"}/lib/node_modules/lumo-build-deps/* ./
# configure clojure-cli
mkdir ./.cpcache
export CLJ_CONFIG=`pwd`
- export CLJ_CACHE=`pwd`/.cpcache
+ export CLJ_CACHE=`pwd`/.cpcache
# require more namespaces for cljs-bundle
sed -i "s!ns lumo.core! \
@@ -155,7 +188,7 @@ in stdenv.mkDerivation {
(:require ${requireDeps}) \
(:require-macros [clojure.template :as temp] \
[cljs.test :as test])!g" \
- ./src/cljs/snapshot/lumo/core.cljs
+ ./src/cljs/snapshot/lumo/core.cljs
# Step 1: compile clojurescript with :none and :simple
${clojure}/bin/clojure -Scp ${classp} -e "${compileClojurescript true}"
@@ -204,7 +237,7 @@ in stdenv.mkDerivation {
# Step 3: generate munged cache jsons
${clojure}/bin/clojure -Scp ${classp} -e "${cacheToJsons}"
rm ./target/cljs/core\$macros\.cljc\.cache\.json
-
+
# Step 4: Bunde javascript
NODE_ENV=production node scripts/bundle.js
@@ -215,21 +248,20 @@ in stdenv.mkDerivation {
# Step 6: Package executeable 1st time
# fetch node sources and copy to palce that nexe will find
- mkdir -p tmp/${nodeVersion}
- cp ${nodeSources} tmp/${nodeVersion}/node-${nodeVersion}.tar.gz
- tar -C ./tmp/${nodeVersion} -xf ${nodeSources}
- mv ./tmp/${nodeVersion}/node-v${nodeVersion}/* ./tmp/${nodeVersion}/
+ mkdir -p tmp/node/${nodeVersion}
+ cp ${nodeSources} tmp/node/${nodeVersion}/node-${nodeVersion}.tar.gz
+ tar -C ./tmp/node/${nodeVersion} -xf ${nodeSources} --warning=no-unknown-keyword
+ mv ./tmp/node/${nodeVersion}/node-v${nodeVersion}/* ./tmp/node/${nodeVersion}/
rm -rf ${lumo-internal-classpath}
- mv target ${lumo-internal-classpath}
+ cp -rf target ${lumo-internal-classpath}
node scripts/package.js ${nodeVersion}
- rm -rf ${lumo-internal-classpath}
+ rm -rf target
+ mv ${lumo-internal-classpath} target
# Step 7: AOT Macros
sh scripts/aot-bundle-macros.sh
# Step 8: Package executeable 2nd time
- rm -rf ${lumo-internal-classpath}
- mv target ${lumo-internal-classpath}
node scripts/package.js ${nodeVersion}
'';
@@ -250,7 +282,6 @@ in stdenv.mkDerivation {
homepage = https://github.com/anmonteiro/lumo;
license = stdenv.lib.licenses.epl10;
maintainers = [ stdenv.lib.maintainers.hlolli ];
- platforms = stdenv.lib.platforms.linux;
+ platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
};
}
-
diff --git a/pkgs/development/interpreters/clojurescript/lumo/deps.edn b/pkgs/development/interpreters/clojurescript/lumo/deps.edn
index e1563599a8c..7a2faee1d7a 100644
--- a/pkgs/development/interpreters/clojurescript/lumo/deps.edn
+++ b/pkgs/development/interpreters/clojurescript/lumo/deps.edn
@@ -1,12 +1,12 @@
{:deps
- {org.clojure/clojure {:mvn/version "1.10.0-beta5"}
- org.clojure/clojurescript {:mvn/version "1.10.439"}
- org.clojure/test.check {:mvn/version "0.10.0-alpha3"}
+ {org.clojure/clojure {:mvn/version "1.10.1"}
+ org.clojure/clojurescript {:mvn/version "1.10.520"}
+ org.clojure/test.check {:mvn/version "0.10.0-alpha4"}
org.clojure/tools.reader {:mvn/version "1.3.2"
:exclusions [org.clojure/clojure org.clojure/clojurescript]}
com.cognitect/transit-cljs {:mvn/version "0.8.256"
:exclusions [org.clojure/clojure org.clojure/clojurescript]}
malabarba/lazy-map {:mvn/version "1.3"
:exclusions [org.clojure/clojure org.clojure/clojurescript]}
- fipp {:mvn/version "0.6.14"
+ fipp {:mvn/version "0.6.17"
:exclusions [org.clojure/clojure org.clojure/clojurescript]}}}
diff --git a/pkgs/development/interpreters/clojurescript/lumo/deps.nix b/pkgs/development/interpreters/clojurescript/lumo/deps.nix
index 3e53c7f98dd..4f3beff3b81 100644
--- a/pkgs/development/interpreters/clojurescript/lumo/deps.nix
+++ b/pkgs/development/interpreters/clojurescript/lumo/deps.nix
@@ -1,241 +1,240 @@
-# generated by clj2nix-1.0.3
+# generated by clj2nix-1.0.4
{ pkgs }:
- let repos = [
- "https://repo.clojars.org/"
- "https://repo1.maven.org/"
- "http://central.maven.org/maven2/"
- "http://oss.sonatype.org/content/repositories/releases/"
- "http://oss.sonatype.org/content/repositories/public/"
- "http://repo.typesafe.com/typesafe/releases/"
- ];
+let repos = [
+ "https://repo.clojars.org/"
+ "https://repo1.maven.org/"
+ "http://oss.sonatype.org/content/repositories/releases/"
+ "http://oss.sonatype.org/content/repositories/public/"
+ "http://repo.typesafe.com/typesafe/releases/"
+ ];
- in rec {
- makePaths = {extraClasspaths ? []}: (builtins.map (dep: if builtins.hasAttr "jar" dep.path then dep.path.jar else dep.path) packages) ++ extraClasspaths;
- makeClasspaths = {extraClasspaths ? []}: builtins.concatStringsSep ":" (makePaths {inherit extraClasspaths;});
+in rec {
+ makePaths = {extraClasspaths ? []}: (builtins.map (dep: if builtins.hasAttr "jar" dep.path then dep.path.jar else dep.path) packages) ++ extraClasspaths;
+ makeClasspaths = {extraClasspaths ? []}: builtins.concatStringsSep ":" (makePaths {inherit extraClasspaths;});
- packages = [
- {
- name = "com.cognitect/transit-java";
- path = pkgs.fetchMavenArtifact {
- inherit repos;
- artifactId = "transit-java";
- groupId = "com.cognitect";
- sha512 = "80365a4f244e052b6c4fdfd2fd3b91288835599cb4dd88e0e0dae19883dcda39afee83966810ed81beff342111c3a45a66f5601c443f3ad49904908c43631708";
- version = "0.8.332";
- };
- }
+ packages = [
+ {
+ name = "com.cognitect/transit-java";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "transit-java";
+ groupId = "com.cognitect";
+ sha512 = "80365a4f244e052b6c4fdfd2fd3b91288835599cb4dd88e0e0dae19883dcda39afee83966810ed81beff342111c3a45a66f5601c443f3ad49904908c43631708";
+ version = "0.8.332";
+ };
+ }
- {
- name = "org.clojure/data.json";
- path = pkgs.fetchMavenArtifact {
- inherit repos;
- artifactId = "data.json";
- groupId = "org.clojure";
- sha512 = "ce526bef01bedd31b772954d921a61832ae60af06121f29080853f7932326438b33d183240a9cffbe57e00dc3744700220753948da26b8973ee21c30e84227a6";
- version = "0.2.6";
- };
- }
+ {
+ name = "org.clojure/data.json";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "data.json";
+ groupId = "org.clojure";
+ sha512 = "ce526bef01bedd31b772954d921a61832ae60af06121f29080853f7932326438b33d183240a9cffbe57e00dc3744700220753948da26b8973ee21c30e84227a6";
+ version = "0.2.6";
+ };
+ }
- {
- name = "org.clojure/clojure";
- path = pkgs.fetchMavenArtifact {
- inherit repos;
- artifactId = "clojure";
- groupId = "org.clojure";
- sha512 = "f7a6b207b1bcbb6523d32ecfdd3c8c25d4d0b0a59c78baf06cdc69ba3c21c5e96b5dac8e9efcb331efd94e10bccbb9b54fca62a4312309db65a1f9d89d9da3f4";
- version = "1.10.0-beta5";
- };
- }
+ {
+ name = "org.clojure/clojure";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "clojure";
+ groupId = "org.clojure";
+ sha512 = "f28178179483531862afae13e246386f8fda081afa523d3c4ea3a083ab607d23575d38ecb9ec0ee7f4d65cbe39a119f680e6de4669bc9cf593aa92be0c61562b";
+ version = "1.10.1";
+ };
+ }
- {
- name = "commons-codec/commons-codec";
- path = pkgs.fetchMavenArtifact {
- inherit repos;
- artifactId = "commons-codec";
- groupId = "commons-codec";
- sha512 = "8edecc0faf38e8620460909d8191837f34e2bb2ce853677c486c5e79bb79e88d043c3aed69c11f1365c4884827052ee4e1c18ca56e38d1a5bc0ce15c57daeee3";
- version = "1.10";
- };
- }
+ {
+ name = "commons-codec/commons-codec";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "commons-codec";
+ groupId = "commons-codec";
+ sha512 = "8edecc0faf38e8620460909d8191837f34e2bb2ce853677c486c5e79bb79e88d043c3aed69c11f1365c4884827052ee4e1c18ca56e38d1a5bc0ce15c57daeee3";
+ version = "1.10";
+ };
+ }
- {
- name = "com.google.errorprone/error_prone_annotations";
- path = pkgs.fetchMavenArtifact {
- inherit repos;
- artifactId = "error_prone_annotations";
- groupId = "com.google.errorprone";
- sha512 = "bd2135cc9eb2c652658a2814ec9c565fa3e071d4cff590cbe17b853885c78c9f84c1b7b24ba736f4f30ed8cec60a6af983827fcbed61ff142f27ac808e97fc6b";
- version = "2.1.3";
- };
- }
+ {
+ name = "com.google.errorprone/error_prone_annotations";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "error_prone_annotations";
+ groupId = "com.google.errorprone";
+ sha512 = "bd2135cc9eb2c652658a2814ec9c565fa3e071d4cff590cbe17b853885c78c9f84c1b7b24ba736f4f30ed8cec60a6af983827fcbed61ff142f27ac808e97fc6b";
+ version = "2.1.3";
+ };
+ }
- {
- name = "org.clojure/core.specs.alpha";
- path = pkgs.fetchMavenArtifact {
- inherit repos;
- artifactId = "core.specs.alpha";
- groupId = "org.clojure";
- sha512 = "348c0ea0911bc0dcb08655e61b97ba040649b4b46c32a62aa84d0c29c245a8af5c16d44a4fa5455d6ab076f4bb5bbbe1ad3064a7befe583f13aeb9e32a169bf4";
- version = "0.2.44";
- };
- }
+ {
+ name = "org.clojure/core.specs.alpha";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "core.specs.alpha";
+ groupId = "org.clojure";
+ sha512 = "348c0ea0911bc0dcb08655e61b97ba040649b4b46c32a62aa84d0c29c245a8af5c16d44a4fa5455d6ab076f4bb5bbbe1ad3064a7befe583f13aeb9e32a169bf4";
+ version = "0.2.44";
+ };
+ }
- {
- name = "org.clojure/spec.alpha";
- path = pkgs.fetchMavenArtifact {
- inherit repos;
- artifactId = "spec.alpha";
- groupId = "org.clojure";
- sha512 = "18c97fb2b74c0bc2ff4f6dc722a3edec539f882ee85d0addf22bbf7e6fe02605d63f40c2b8a2905868ccd6f96cfc36a65f5fb70ddac31c6ec93da228a456edbd";
- version = "0.2.176";
- };
- }
+ {
+ name = "org.clojure/spec.alpha";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "spec.alpha";
+ groupId = "org.clojure";
+ sha512 = "18c97fb2b74c0bc2ff4f6dc722a3edec539f882ee85d0addf22bbf7e6fe02605d63f40c2b8a2905868ccd6f96cfc36a65f5fb70ddac31c6ec93da228a456edbd";
+ version = "0.2.176";
+ };
+ }
- {
- name = "org.codehaus.mojo/animal-sniffer-annotations";
- path = pkgs.fetchMavenArtifact {
- inherit repos;
- artifactId = "animal-sniffer-annotations";
- groupId = "org.codehaus.mojo";
- sha512 = "9e5e3ea9e06e0ac9463869fd0e08ed38f7042784995a7b50c9bfd7f692a53f0e1430b9e1367dc772d0d4eafe5fd2beabbcc60da5008bd792f9e7ec8436c0f136";
- version = "1.14";
- };
- }
+ {
+ name = "org.codehaus.mojo/animal-sniffer-annotations";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "animal-sniffer-annotations";
+ groupId = "org.codehaus.mojo";
+ sha512 = "9e5e3ea9e06e0ac9463869fd0e08ed38f7042784995a7b50c9bfd7f692a53f0e1430b9e1367dc772d0d4eafe5fd2beabbcc60da5008bd792f9e7ec8436c0f136";
+ version = "1.14";
+ };
+ }
- {
- name = "com.googlecode.json-simple/json-simple";
- path = pkgs.fetchMavenArtifact {
- inherit repos;
- artifactId = "json-simple";
- groupId = "com.googlecode.json-simple";
- sha512 = "f8798bfbcc8ab8001baf90ce47ec2264234dc1da2d4aa97fdcdc0990472a6b5a5a32f828e776140777d598a99d8a0c0f51c6d0767ae1a829690ab9200ae35742";
- version = "1.1.1";
- };
- }
+ {
+ name = "com.googlecode.json-simple/json-simple";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "json-simple";
+ groupId = "com.googlecode.json-simple";
+ sha512 = "f8798bfbcc8ab8001baf90ce47ec2264234dc1da2d4aa97fdcdc0990472a6b5a5a32f828e776140777d598a99d8a0c0f51c6d0767ae1a829690ab9200ae35742";
+ version = "1.1.1";
+ };
+ }
- {
- name = "com.cognitect/transit-cljs";
- path = pkgs.fetchMavenArtifact {
- inherit repos;
- artifactId = "transit-cljs";
- groupId = "com.cognitect";
- sha512 = "318b98ddd63629f37b334bb90e625bc31ab6abcf0b1fa80d8e097551658f2d9219b5ee35869a31f2976d7d385da83bea0c07b0d097babcae241ecbd0fe8a7ecd";
- version = "0.8.256";
- };
- }
+ {
+ name = "com.cognitect/transit-cljs";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "transit-cljs";
+ groupId = "com.cognitect";
+ sha512 = "318b98ddd63629f37b334bb90e625bc31ab6abcf0b1fa80d8e097551658f2d9219b5ee35869a31f2976d7d385da83bea0c07b0d097babcae241ecbd0fe8a7ecd";
+ version = "0.8.256";
+ };
+ }
- {
- name = "org.clojure/google-closure-library";
- path = pkgs.fetchMavenArtifact {
- inherit repos;
- artifactId = "google-closure-library";
- groupId = "org.clojure";
- sha512 = "75631182ef12f21723fe3eba1003d8cf9b8348a51512961e4e1b87bc24d8f3abb14a70c856f08cdaa5588a2d7c2b1b0c03aeaa3c4c5f2ed745a85f59ceeab83a";
- version = "0.0-20170809-b9c14c6b";
- };
- }
+ {
+ name = "org.clojure/google-closure-library";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "google-closure-library";
+ groupId = "org.clojure";
+ sha512 = "75631182ef12f21723fe3eba1003d8cf9b8348a51512961e4e1b87bc24d8f3abb14a70c856f08cdaa5588a2d7c2b1b0c03aeaa3c4c5f2ed745a85f59ceeab83a";
+ version = "0.0-20170809-b9c14c6b";
+ };
+ }
- {
- name = "fipp";
- path = pkgs.fetchMavenArtifact {
- inherit repos;
- artifactId = "fipp";
- groupId = "fipp";
- sha512 = "155b5bb7045ac7c3a75c638e65464ca1fc90e5b4692328fc2da73b26792178fdbce5ab01ba0397e1986b6162b06b8904712d2c366f32ea43ea5fa2b454a526a5";
- version = "0.6.14";
- };
- }
+ {
+ name = "fipp";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "fipp";
+ groupId = "fipp";
+ sha512 = "d844ab63d28cb5e31657cc38e574bbc7072a78419c997f25445ac6ea4a719904a4f4844b37e3f664a8d2e49bd38ff1006a9e8c6e63fb4e2f0a2322d6c2638275";
+ version = "0.6.17";
+ };
+ }
- {
- name = "org.clojure/clojurescript";
- path = pkgs.fetchMavenArtifact {
- inherit repos;
- artifactId = "clojurescript";
- groupId = "org.clojure";
- sha512 = "4aec5abdd48aaf95f7a729e11d225a99d02caa3a4ddff3e9e4f8db80dea83ab70a4440691cb372562c8c16e73c2850b22806a2851df3849c852fddd49b57fc58";
- version = "1.10.439";
- };
- }
+ {
+ name = "org.clojure/clojurescript";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "clojurescript";
+ groupId = "org.clojure";
+ sha512 = "b241959d6bd2ab659920965d301508226e26b3edcee469e4cd516cd4ed014b1a6b132c17ee7d96a8e66fe27fd01a74813ac8b85958d260f9fdbbeb4348d57ff1";
+ version = "1.10.520";
+ };
+ }
- {
- name = "com.google.jsinterop/jsinterop-annotations";
- path = pkgs.fetchMavenArtifact {
- inherit repos;
- artifactId = "jsinterop-annotations";
- groupId = "com.google.jsinterop";
- sha512 = "b6fd98a9167d031f6bff571567d4658fda62c132dc74d47ca85e02c9bb3ce8812b1012c67f4c81501ab0cbd9ccd9cda5dcf32d306e04368ace7a173cecae975d";
- version = "1.0.0";
- };
- }
+ {
+ name = "com.google.jsinterop/jsinterop-annotations";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "jsinterop-annotations";
+ groupId = "com.google.jsinterop";
+ sha512 = "b6fd98a9167d031f6bff571567d4658fda62c132dc74d47ca85e02c9bb3ce8812b1012c67f4c81501ab0cbd9ccd9cda5dcf32d306e04368ace7a173cecae975d";
+ version = "1.0.0";
+ };
+ }
- {
- name = "com.fasterxml.jackson.core/jackson-core";
- path = pkgs.fetchMavenArtifact {
- inherit repos;
- artifactId = "jackson-core";
- groupId = "com.fasterxml.jackson.core";
- sha512 = "a1bd6c264b9ab07aad3d0f26b65757e35ff47904ab895bb7f997e3e1fd063129c177ad6f69876907b04ff8a43c6b1770a26f53a811633a29e66a5dce57194f64";
- version = "2.8.7";
- };
- }
+ {
+ name = "com.fasterxml.jackson.core/jackson-core";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "jackson-core";
+ groupId = "com.fasterxml.jackson.core";
+ sha512 = "a1bd6c264b9ab07aad3d0f26b65757e35ff47904ab895bb7f997e3e1fd063129c177ad6f69876907b04ff8a43c6b1770a26f53a811633a29e66a5dce57194f64";
+ version = "2.8.7";
+ };
+ }
- {
- name = "malabarba/lazy-map";
- path = pkgs.fetchMavenArtifact {
- inherit repos;
- artifactId = "lazy-map";
- groupId = "malabarba";
- sha512 = "ce56d6f03ac344579e15f062cdd4c477c0323da716d4d4106c4edb746959699e0b294b25aacf8ecf1579a6bdd5556a60f4bcb1648d22832984c069a0431c840f";
- version = "1.3";
- };
- }
+ {
+ name = "malabarba/lazy-map";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "lazy-map";
+ groupId = "malabarba";
+ sha512 = "ce56d6f03ac344579e15f062cdd4c477c0323da716d4d4106c4edb746959699e0b294b25aacf8ecf1579a6bdd5556a60f4bcb1648d22832984c069a0431c840f";
+ version = "1.3";
+ };
+ }
- {
- name = "com.cognitect/transit-js";
- path = pkgs.fetchMavenArtifact {
- inherit repos;
- artifactId = "transit-js";
- groupId = "com.cognitect";
- sha512 = "6ca0978e633e41b45ff5a76df79099ba7c4900a8ca9f6acd2a903e4ab10a1ec0c83d4127009df9dac1337debaba01f7ff1d5cced1c2159c05ef94845f73f0623";
- version = "0.8.846";
- };
- }
+ {
+ name = "com.cognitect/transit-js";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "transit-js";
+ groupId = "com.cognitect";
+ sha512 = "6ca0978e633e41b45ff5a76df79099ba7c4900a8ca9f6acd2a903e4ab10a1ec0c83d4127009df9dac1337debaba01f7ff1d5cced1c2159c05ef94845f73f0623";
+ version = "0.8.846";
+ };
+ }
- {
- name = "org.mozilla/rhino";
- path = pkgs.fetchMavenArtifact {
- inherit repos;
- artifactId = "rhino";
- groupId = "org.mozilla";
- sha512 = "466e7a76303ea191802b5e7adb3dff64c1d6283a25ce87447296b693b87b166f4cdd191ef7dc130a5739bfa0e4a81b08550f607c84eec167406d9be2225562dc";
- version = "1.7R5";
- };
- }
+ {
+ name = "org.mozilla/rhino";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "rhino";
+ groupId = "org.mozilla";
+ sha512 = "466e7a76303ea191802b5e7adb3dff64c1d6283a25ce87447296b693b87b166f4cdd191ef7dc130a5739bfa0e4a81b08550f607c84eec167406d9be2225562dc";
+ version = "1.7R5";
+ };
+ }
- {
- name = "org.clojure/google-closure-library-third-party";
- path = pkgs.fetchMavenArtifact {
- inherit repos;
- artifactId = "google-closure-library-third-party";
- groupId = "org.clojure";
- sha512 = "57fa84fbbca3eb9e612d2842e4476b74f64d13dd076ffca6c9d9e15c4ca8a2f2c56cc19307bcad0ab5b4f9cb0c3e7900ccc845bd570ebc92e2633885ab621f35";
- version = "0.0-20170809-b9c14c6b";
- };
- }
+ {
+ name = "org.clojure/google-closure-library-third-party";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "google-closure-library-third-party";
+ groupId = "org.clojure";
+ sha512 = "57fa84fbbca3eb9e612d2842e4476b74f64d13dd076ffca6c9d9e15c4ca8a2f2c56cc19307bcad0ab5b4f9cb0c3e7900ccc845bd570ebc92e2633885ab621f35";
+ version = "0.0-20170809-b9c14c6b";
+ };
+ }
- {
- name = "com.google.javascript/closure-compiler-externs";
- path = pkgs.fetchMavenArtifact {
- inherit repos;
- artifactId = "closure-compiler-externs";
- groupId = "com.google.javascript";
- sha512 = "1a47c8559144095c0b23a8e40acd7185625cea5a4c103eb75fbacd32d5809d087bfb60aaf57066329649c6017ec5f993756024e767a5b8f84926371ba6183a82";
- version = "v20180805";
- };
- }
+ {
+ name = "com.google.javascript/closure-compiler-externs";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "closure-compiler-externs";
+ groupId = "com.google.javascript";
+ sha512 = "1a47c8559144095c0b23a8e40acd7185625cea5a4c103eb75fbacd32d5809d087bfb60aaf57066329649c6017ec5f993756024e767a5b8f84926371ba6183a82";
+ version = "v20180805";
+ };
+ }
- {
+ {
name = "org.javassist/javassist";
path = pkgs.fetchMavenArtifact {
inherit repos;
@@ -307,8 +306,8 @@
inherit repos;
artifactId = "core.rrb-vector";
groupId = "org.clojure";
- sha512 = "5f737bf3ca3acf567b2b5c14b5761c8c38e94e1f6168f8cba9f46d2ae41334ae3d68d2c00663827a6214094d96b9767f6803f66ab44b0012c6f2e3c2997b1796";
- version = "0.0.13";
+ sha512 = "4e410c4a90a869e98d5d69a8a6dd6427e9d77b70e1a2b54cf24baf23389f22e7a208375783c2fdc5c1a5acfb8511a5c5ed57ad1a946d5bffd203f453d90a6155";
+ version = "0.0.14";
};
}
@@ -351,8 +350,8 @@
inherit repos;
artifactId = "test.check";
groupId = "org.clojure";
- sha512 = "bf57571a9d31d50cf15b38134f4d7c34d03eb458bc62b30c7a1dbf233e300c67f1fda6673dbd1584a0497cf8875f972e6697e7f13d0c3e70e4254697b1b75cc6";
- version = "0.10.0-alpha3";
+ sha512 = "60fa3bd38c32cf193c573f1bd47c6abd7e7a5bb2fc7f7f9f97aa9dcd54d5e2eab9e351f5f83b01bb96b32811a9f2f5ab384c6b7b7ebbb6c86d1ad4f2789351bf";
+ version = "0.10.0-alpha4";
};
}
diff --git a/pkgs/development/interpreters/clojurescript/lumo/mkdir_promise.patch b/pkgs/development/interpreters/clojurescript/lumo/mkdir_promise.patch
new file mode 100644
index 00000000000..e9504bb5c1a
--- /dev/null
+++ b/pkgs/development/interpreters/clojurescript/lumo/mkdir_promise.patch
@@ -0,0 +1,20 @@
+diff --git a/vendor/nexe/exe.js b/vendor/nexe/exe.js
+index 21e78bb..ecbfca4 100644
+--- a/vendor/nexe/exe.js
++++ b/vendor/nexe/exe.js
+@@ -254,9 +254,7 @@ return initModule._compile(${JSON.stringify(source)}, process.execPath);
+ */
+
+ function makeOutputDirectory(next) {
+- mkdirp(path.dirname(options.output), function() {
+- next();
+- });
++ mkdirp(path.dirname(options.output)).then(() => next());
+ },
+
+ /**
+@@ -1107,4 +1105,3 @@ exports.package = function(path, options) {
+
+ return obj;
+ }
+-
diff --git a/pkgs/development/interpreters/clojurescript/lumo/no_mangle.patch b/pkgs/development/interpreters/clojurescript/lumo/no_mangle.patch
new file mode 100644
index 00000000000..9af22341195
--- /dev/null
+++ b/pkgs/development/interpreters/clojurescript/lumo/no_mangle.patch
@@ -0,0 +1,13 @@
+diff --git a/scripts/bundle.js b/scripts/bundle.js
+index 16425a4..0d510fc 100644
+--- a/scripts/bundle.js
++++ b/scripts/bundle.js
+@@ -73,6 +73,8 @@ const plugins = [
+ if (!isDevBuild) {
+ plugins.push(
+ babelMinify({
++ evaluate: false,
++ mangle: false,
+ comments: false,
+ removeConsole: true,
+ removeDebugger: true,
diff --git a/pkgs/development/interpreters/clojurescript/lumo/package.json b/pkgs/development/interpreters/clojurescript/lumo/package.json
index cfffdc890d1..6ab3f9616c7 100644
--- a/pkgs/development/interpreters/clojurescript/lumo/package.json
+++ b/pkgs/development/interpreters/clojurescript/lumo/package.json
@@ -1,40 +1,49 @@
{
"name": "lumo-build-deps",
- "version": "1.9.0",
+ "version": "1.10.1",
"dependencies": {
"@babel/core": "^7.1.5",
- "@babel/plugin-external-helpers": "7.0.0",
+ "@babel/plugin-external-helpers": "7.8.3",
"@babel/plugin-proposal-class-properties": "^7.1.0",
"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
"@babel/plugin-transform-runtime": "^7.1.0",
"@babel/preset-env": "^7.1.5",
- "@babel/preset-stage-2": "7.0.0",
+ "@babel/preset-stage-2": "7.8.3",
"@babel/runtime": "^7.1.5",
+ "async": "^3.1.1",
"async-retry": "^1.2.3",
"babel-core": "^7.0.0-bridge.0",
- "babel-eslint": "10.0.1",
- "babel-jest": "^23.6.0",
+ "babel-eslint": "10.0.3",
+ "babel-jest": "^25.1.0",
"babel-loader": "^8.0.4",
"babel-plugin-transform-flow-strip-types": "6.22.0",
- "chalk": "^2.4.1",
- "cross-env": "5.2.0",
+ "browserify": "^16.2.3",
+ "chalk": "^3.0.0",
+ "colors": "^1.3.3",
+ "cross-env": "7.0.0",
"death": "^1.1.0",
- "flow-bin": "0.85.0",
+ "flow-bin": "0.118.0",
"google-closure-compiler-js": "20170910.0.1",
+ "glob": "^7.1.3",
+ "gunzip-maybe": "^1.4.1",
+ "insert-module-globals": "^7.2.0",
"jszip": "github:anmonteiro/jszip#patch-1",
- "nexe": "3.0.0-beta.7",
+ "mkdirp": "^1.0.3",
+ "ncp": "^2.0.0",
"node-fetch": "^2.2.1",
- "paredit.js": "0.3.4",
+ "paredit.js": "0.3.6",
"posix-getopt": "github:anmonteiro/node-getopt#master",
- "prettier": "1.15.1",
+ "prettier": "1.19.1",
"progress": "^2.0.0",
- "read-pkg": "^4.0.1",
- "rollup": "0.67.0",
- "rollup-plugin-babel": "4.0.3",
- "rollup-plugin-babel-minify": "6.1.1",
- "rollup-plugin-commonjs": "9.2.0",
- "rollup-plugin-node-resolve": "3.4.0",
- "rollup-plugin-replace": "2.1.0",
+ "read-pkg": "^5.2.0",
+ "request": "^2.88.0",
+ "rollup": "^1.9.0",
+ "rollup-plugin-babel": "^4.3.2",
+ "rollup-plugin-babel-minify": "^9.1.1",
+ "rollup-plugin-commonjs": "^10.0.0",
+ "rollup-plugin-node-resolve": "^5.0.0",
+ "rollup-plugin-replace": "^2.1.1",
+ "tar-stream": "^2.0.1",
"webpack": "^4.25.1",
"webpack-cli": "^3.2.3",
"which-promise": "^1.0.0"
diff --git a/pkgs/development/interpreters/dhall/build-dhall-package.nix b/pkgs/development/interpreters/dhall/build-dhall-package.nix
new file mode 100644
index 00000000000..739dc9b3d52
--- /dev/null
+++ b/pkgs/development/interpreters/dhall/build-dhall-package.nix
@@ -0,0 +1,83 @@
+{ haskell, haskellPackages, lib, lndir, runCommand, writeText }:
+
+{ name
+
+ # Expressions to add to the cache before interpreting the code
+, dependencies ? []
+
+ # A Dhall expression
+ #
+ # Carefully note that the following expression must be devoid of uncached HTTP
+ # imports. This is because the expression will be evaluated using an
+ # interpreter with HTTP support disabled, so all HTTP imports have to be
+ # protected by an integrity check that can be satisfied via cached
+ # dependencies.
+ #
+ # You can add a dependency to the cache using the preceding `dependencies`
+ # option
+, code
+
+ # `buildDhallPackage` can include both a "source distribution" in
+ # `source.dhall` and a "binary distribution" in `binary.dhall`:
+ #
+ # * `source.dhall` is a dependency-free αβ-normalized Dhall expression
+ #
+ # * `binary.dhall` is an expression of the form: `missing sha256:${HASH}`
+ #
+ # This expression requires you to install the cache product located at
+ # `.cache/dhall/1220${HASH}` to successfully resolve
+ #
+ # By default, `buildDhallPackage` only includes "binary.dhall" to conserve
+ # space within the Nix store, but if you set the following `source` option to
+ # `true` then the package will also include `source.dhall`.
+, source ? false
+}:
+
+let
+ # `buildDhallPackage` requires version 1.25.0 or newer of the Haskell
+ # interpreter for Dhall. Given that the default version is 1.24.0 we choose
+ # the latest available version instead until the default is upgraded.
+ #
+ # HTTP support is disabled in order to force that HTTP dependencies are built
+ # using Nix instead of using Dhall's support for HTTP imports.
+ dhall =
+ haskell.lib.justStaticExecutables
+ (haskell.lib.appendConfigureFlag
+ haskellPackages.dhall_1_29_0
+ "-f-with-http"
+ );
+
+ file = writeText "${name}.dhall" code;
+
+ cache = ".cache";
+
+ cacheDhall = "${cache}/dhall";
+
+ sourceFile = "source.dhall";
+
+in
+ runCommand name { inherit dependencies; } ''
+ set -eu
+
+ mkdir -p ${cacheDhall}
+
+ for dependency in $dependencies; do
+ ${lndir}/bin/lndir -silent $dependency/${cacheDhall} ${cacheDhall}
+ done
+
+ export XDG_CACHE_HOME=$PWD/${cache}
+
+ mkdir -p $out/${cacheDhall}
+
+ ${dhall}/bin/dhall --alpha --file '${file}' > $out/${sourceFile}
+
+ SHA_HASH=$(${dhall}/bin/dhall hash <<< $out/${sourceFile})
+
+ HASH_FILE="''${SHA_HASH/sha256:/1220}"
+
+ ${dhall}/bin/dhall encode --file $out/${sourceFile} > $out/${cacheDhall}/$HASH_FILE
+
+ echo "missing $SHA_HASH" > $out/binary.dhall
+
+ ${lib.optionalString (!source) "rm $out/${sourceFile}"}
+ ''
diff --git a/pkgs/development/interpreters/dhall/default.nix b/pkgs/development/interpreters/dhall/default.nix
deleted file mode 100644
index 8e1df36e412..00000000000
--- a/pkgs/development/interpreters/dhall/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ haskell, haskellPackages, stdenvNoCC }:
-
-let
- static = haskell.lib.justStaticExecutables haskellPackages.dhall;
-
-in static.overrideAttrs (old: {
- passthru = old.passthru or {} // {
- prelude = stdenvNoCC.mkDerivation {
- name = "dhall-prelude";
- inherit (old) src;
- phases = [ "unpackPhase" "installPhase" ];
- installPhase = ''
- mkdir $out
- cp -r Prelude/* $out/
- '';
- };
- };
-})
diff --git a/pkgs/development/interpreters/elixir/1.10.nix b/pkgs/development/interpreters/elixir/1.10.nix
index 7f4162cade8..afab770da35 100644
--- a/pkgs/development/interpreters/elixir/1.10.nix
+++ b/pkgs/development/interpreters/elixir/1.10.nix
@@ -3,7 +3,7 @@
# How to obtain `sha256`:
# nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz
mkDerivation {
- version = "1.10.1";
- sha256 = "07iccn90yp11ms58mwkwd9ixd9vma0025l9zm6l7y0jjzrj3vycy";
+ version = "1.10.2";
+ sha256 = "04yi1hljq7ii9flh6pmb5411z7q1bdq9f9sq8323k9hm1f5jwkx6";
minimumOTPVersion = "21";
}
diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix
index 4e3f92d7cdc..82624d2272b 100644
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/pkgs/development/interpreters/jruby/default.nix
@@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" "";
jruby = stdenv.mkDerivation rec {
pname = "jruby";
- version = "9.2.9.0";
+ version = "9.2.10.0";
src = fetchurl {
url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz";
- sha256 = "04grdf57c1dgragm17yyjk69ak8mwiwfc1vjzskzcaag3fwgplyf";
+ sha256 = "0lwmqyg06rv3iyhmfnqcg4xzaxcfrgjivjrc4ljwb0y629vp16ci";
};
buildInputs = [ makeWrapper ];
diff --git a/pkgs/development/interpreters/jython/default.nix b/pkgs/development/interpreters/jython/default.nix
index 84941f9a6fa..35af365c1f7 100644
--- a/pkgs/development/interpreters/jython/default.nix
+++ b/pkgs/development/interpreters/jython/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "jython";
- version = "2.7.2b2";
+ version = "2.7.2b3";
src = fetchurl {
url = "http://search.maven.org/remotecontent?filepath=org/python/jython-standalone/${version}/jython-standalone-${version}.jar";
- sha256 = "0mmrrydr94q2siwjynkw1gw677navmcvjvbi1jpdbp6idfx0jh6b";
+ sha256 = "142285hd9mx0nx5zw0jvkpqkb4kbhgyyy52p5bj061ya8bg5jizy";
};
buildInputs = [ makeWrapper ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Python interpreter written in Java";
- homepage = https://jython.org/;
+ homepage = "https://jython.org/";
license = stdenv.lib.licenses.psfl;
platforms = jre.meta.platforms;
};
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index f0f80f75854..b32d15b2a1f 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -1,8 +1,54 @@
-{ stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull
-, libsndfile, portaudio, libX11, graphicsmagick, pcre, pkgconfig, libGL, libGLU, fltk
-, fftw, fftwSinglePrec, zlib, curl, qrupdate, openblas, arpack, libwebp, gl2ps
-, qt ? null, qscintilla ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null
-, suitesparse ? null, gnuplot ? null, jdk ? null, python ? null, overridePlatforms ? null
+{ stdenv
+, fetchurl
+, gfortran
+, ncurses
+, perl
+, flex
+, texinfo
+, qhull
+, libsndfile
+, portaudio
+, libX11
+, graphicsmagick
+, pcre
+, pkgconfig
+, libGL
+, libGLU
+, fltk
+# Both are needed for discrete Fourier transform
+, fftw
+, fftwSinglePrec
+, zlib
+, curl
+, qrupdate
+, openblas
+, arpack
+, libwebp
+, gl2ps
+, ghostscript ? null
+, hdf5 ? null
+, glpk ? null
+, suitesparse ? null
+, gnuplot ? null
+# - Include support for GNU readline:
+, enableReadline ? true
+, readline ? null
+# - Build Java interface:
+, enableJava ? true
+, jdk ? null
+, python ? null
+, overridePlatforms ? null
+, sundials_2 ? null
+# - Build Octave Qt GUI:
+, enableQt ? false
+, qtbase ? null
+, qtsvg ? null
+, qtscript ? null
+, qscintilla ? null
+, qttools ? null
+# - JIT compiler for loops:
+, enableJIT ? false
+, llvm ? null
}:
let
@@ -20,33 +66,63 @@ in
stdenv.mkDerivation rec {
version = "5.2.0";
pname = "octave";
+
src = fetchurl {
url = "mirror://gnu/octave/${pname}-${version}.tar.gz";
sha256 = "1qcmcpsq1lfka19fxzvxjwjhg113c39a9a0x8plkhvwdqyrn5sig";
};
- buildInputs = [ gfortran readline ncurses perl flex texinfo qhull
- graphicsmagick pcre pkgconfig fltk zlib curl openblas libsndfile fftw
- fftwSinglePrec portaudio qrupdate arpack libwebp gl2ps ]
- ++ (stdenv.lib.optional (qt != null) qt)
- ++ (stdenv.lib.optional (qscintilla != null) qscintilla)
- ++ (stdenv.lib.optional (ghostscript != null) ghostscript)
- ++ (stdenv.lib.optional (llvm != null) llvm)
- ++ (stdenv.lib.optional (hdf5 != null) hdf5)
- ++ (stdenv.lib.optional (glpk != null) glpk)
- ++ (stdenv.lib.optional (suitesparse != null) suitesparse)
- ++ (stdenv.lib.optional (jdk != null) jdk)
- ++ (stdenv.lib.optional (gnuplot != null) gnuplot)
- ++ (stdenv.lib.optional (python != null) python)
- ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ libGL libGLU libX11 ])
- ;
-
- # makeinfo is required by Octave at runtime to display help
- prePatch = ''
- substituteInPlace libinterp/corefcn/help.cc \
- --replace 'Vmakeinfo_program = "makeinfo"' \
- 'Vmakeinfo_program = "${texinfo}/bin/makeinfo"'
- '';
+ buildInputs = [
+ readline
+ ncurses
+ perl
+ flex
+ qhull
+ graphicsmagick
+ pcre
+ fltk
+ zlib
+ curl
+ openblas
+ libsndfile
+ fftw
+ fftwSinglePrec
+ portaudio
+ qrupdate
+ arpack
+ libwebp
+ gl2ps
+ ]
+ ++ (stdenv.lib.optionals enableQt [
+ qtbase
+ qtsvg
+ qscintilla
+ ])
+ ++ (stdenv.lib.optional (ghostscript != null) ghostscript)
+ ++ (stdenv.lib.optional (hdf5 != null) hdf5)
+ ++ (stdenv.lib.optional (glpk != null) glpk)
+ ++ (stdenv.lib.optional (suitesparse != null) suitesparse)
+ ++ (stdenv.lib.optional (enableJava) jdk)
+ ++ (stdenv.lib.optional (sundials_2 != null) sundials_2)
+ ++ (stdenv.lib.optional (gnuplot != null) gnuplot)
+ ++ (stdenv.lib.optional (python != null) python)
+ ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ libGL libGLU libX11 ])
+ ;
+ nativeBuildInputs = [
+ pkgconfig
+ gfortran
+ # Listed here as well because it's outputs are split
+ fftw
+ fftwSinglePrec
+ texinfo
+ ]
+ ++ (stdenv.lib.optional (sundials_2 != null) sundials_2)
+ ++ (stdenv.lib.optional enableJIT llvm)
+ ++ (stdenv.lib.optionals enableQt [
+ qtscript
+ qttools
+ ])
+ ;
doCheck = !stdenv.isDarwin;
@@ -55,15 +131,16 @@ stdenv.mkDerivation rec {
# See https://savannah.gnu.org/bugs/?50339
F77_INTEGER_8_FLAG = if openblas.blas64 then "-fdefault-integer-8" else "";
- configureFlags =
- [ "--enable-readline"
- "--enable-dl"
- "--with-blas=openblas"
- "--with-lapack=openblas"
- ]
- ++ stdenv.lib.optional openblas.blas64 "--enable-64"
- ++ stdenv.lib.optionals stdenv.isDarwin ["--with-x=no"]
- ;
+ configureFlags = [
+ "--with-blas=openblas"
+ "--with-lapack=openblas"
+ ]
+ ++ stdenv.lib.optionals enableReadline [ "--enable-readline" ]
+ ++ stdenv.lib.optionals openblas.blas64 [ "--enable-64" ]
+ ++ stdenv.lib.optionals stdenv.isDarwin [ "--with-x=no" ]
+ ++ stdenv.lib.optionals enableQt [ "--with-qt=5" ]
+ ++ stdenv.lib.optionals enableJIT [ "--enable-jit" ]
+ ;
# Keep a copy of the octave tests detailed results in the output
# derivation, because someone may care
@@ -81,6 +158,8 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl3Plus;
maintainers = with stdenv.lib.maintainers; [raskin];
description = "Scientific Pragramming Language";
+ # https://savannah.gnu.org/bugs/?func=detailitem&item_id=56425 is the best attempt to fix JIT
+ broken = enableJIT;
platforms = if overridePlatforms == null then
(with stdenv.lib.platforms; linux ++ darwin)
else overridePlatforms;
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 911795cc192..0e4d83c1352 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -1,9 +1,11 @@
# pcre functionality is tested in nixos/tests/php-pcre.nix
-{ lib, stdenv, fetchurl, autoconf, bison, libtool, pkgconfig, re2c
-, libmysqlclient, libxml2, readline, zlib, curl, postgresql, gettext
-, openssl, pcre, pcre2, sqlite, config, libjpeg, libpng, freetype
+{ config, lib, stdenv, fetchurl
+, autoconf, automake, bison, file, flex, libtool, pkgconfig, re2c
+, libxml2, readline, zlib, curl, postgresql, gettext
+, openssl, pcre, pcre2, sqlite
, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, unixODBC
, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2
+, gd, freetype, libXpm, libjpeg, libpng, libwebp
, libzip, valgrind, oniguruma
}:
@@ -19,8 +21,8 @@ let
, ldapSupport ? config.php.ldap or true
, mhashSupport ? config.php.mhash or false
, mysqlndSupport ? config.php.mysqlnd or true
- , mysqliSupport ? config.php.mysqli or true
- , pdo_mysqlSupport ? config.php.pdo_mysql or true
+ , mysqliSupport ? (config.php.mysqli or true) && (mysqlndSupport)
+ , pdo_mysqlSupport ? (config.php.pdo_mysql or true) && (mysqlndSupport)
, libxml2Support ? config.php.libxml2 or true
, apxs2Support ? config.php.apxs2 or (!stdenv.isDarwin)
, embedSupport ? config.php.embed or false
@@ -61,20 +63,24 @@ let
, xmlrpcSupport ? (config.php.xmlrpc or false) && (libxml2Support)
, cgotoSupport ? config.php.cgoto or false
, valgrindSupport ? (config.php.valgrind or true) && (versionAtLeast version "7.2")
+ , ipv6Support ? config.php.ipv6 or true
+ , pearSupport ? (config.php.pear or true) && (libxml2Support)
}:
let
- mysqlBuildInputs = optional (!mysqlndSupport) libmysqlclient;
libmcrypt' = libmcrypt.override { disablePosixThreads = true; };
in stdenv.mkDerivation {
inherit version;
- name = "php-${version}";
+ pname = "php";
enableParallelBuilding = true;
- nativeBuildInputs = [ autoconf bison libtool pkgconfig re2c ];
+ nativeBuildInputs = [
+ autoconf automake bison file flex libtool pkgconfig re2c
+ ];
+
buildInputs = [ ]
++ optional (versionOlder version "7.3") pcre
++ optional (versionAtLeast version "7.3") pcre2
@@ -83,7 +89,7 @@ let
++ optionals imapSupport [ uwimap openssl pam ]
++ optionals curlSupport [ curl openssl ]
++ optionals ldapSupport [ openldap openssl ]
- ++ optionals gdSupport [ libpng libjpeg freetype ]
+ ++ optionals gdSupport [ gd freetype libXpm libjpeg libpng libwebp ]
++ optionals opensslSupport [ openssl openssl.dev ]
++ optional apxs2Support apacheHttpd
++ optional (ldapSupport && stdenv.isLinux) cyrus_sasl
@@ -95,8 +101,6 @@ let
++ optional postgresqlSupport postgresql
++ optional pdo_odbcSupport unixODBC
++ optional pdo_pgsqlSupport postgresql
- ++ optionals pdo_mysqlSupport mysqlBuildInputs
- ++ optionals mysqliSupport mysqlBuildInputs
++ optional gmpSupport gmp
++ optional gettextSupport gettext
++ optional intlSupport icu
@@ -138,7 +142,6 @@ let
++ optional (libxml2Support && (versionOlder version "7.4")) "--with-libxml-dir=${libxml2.dev}"
++ optional (!libxml2Support) [
"--disable-dom"
- "--disable-libxml"
(if (versionOlder version "7.4") then "--disable-libxml" else "--without-libxml")
"--disable-simplexml"
"--disable-xml"
@@ -152,23 +155,26 @@ let
++ optional postgresqlSupport "--with-pgsql=${postgresql}"
++ optional pdo_odbcSupport "--with-pdo-odbc=unixODBC,${unixODBC}"
++ optional pdo_pgsqlSupport "--with-pdo-pgsql=${postgresql}"
- ++ optional pdo_mysqlSupport "--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else libmysqlclient}"
- ++ optionals mysqliSupport [
- "--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${libmysqlclient}/bin/mysql_config"}"
- ]
- ++ optional ( pdo_mysqlSupport || mysqliSupport ) "--with-mysql-sock=/run/mysqld/mysqld.sock"
+ ++ optional (pdo_mysqlSupport && mysqlndSupport) "--with-pdo-mysql=mysqlnd"
+ ++ optional (mysqliSupport && mysqlndSupport) "--with-mysqli=mysqlnd"
+ ++ optional (pdo_mysqlSupport || mysqliSupport) "--with-mysql-sock=/run/mysqld/mysqld.sock"
++ optional bcmathSupport "--enable-bcmath"
- # FIXME: Our own gd package doesn't work, see https://bugs.php.net/bug.php?id=60108.
++ optionals (gdSupport && versionAtLeast version "7.4") [
"--enable-gd"
+ "--with-external-gd=${gd.dev}"
+ "--with-webp=${libwebp}"
"--with-jpeg=${libjpeg.dev}"
+ "--with-xpm=${libXpm.dev}"
"--with-freetype=${freetype.dev}"
"--enable-gd-jis-conv"
] ++ optionals (gdSupport && versionOlder version "7.4") [
- "--with-gd"
- "--with-freetype-dir=${freetype.dev}"
- "--with-png-dir=${libpng.dev}"
+ "--with-gd=${gd.dev}"
+ "--with-webp-dir=${libwebp}"
"--with-jpeg-dir=${libjpeg.dev}"
+ "--with-png-dir=${libpng.dev}"
+ "--with-freetype-dir=${freetype.dev}"
+ "--with-xpm-dir=${libXpm.dev}"
+ "--enable-gd-jis-conv"
]
++ optional gmpSupport "--with-gmp=${gmp.dev}"
++ optional soapSupport "--enable-soap"
@@ -198,7 +204,9 @@ let
++ optional (!pharSupport) "--disable-phar"
++ optional xmlrpcSupport "--with-xmlrpc"
++ optional cgotoSupport "--enable-re2c-cgoto"
- ++ optional valgrindSupport "--with-valgrind=${valgrind.dev}";
+ ++ optional valgrindSupport "--with-valgrind=${valgrind.dev}"
+ ++ optional (!ipv6Support) "--disable-ipv6"
+ ++ optional (pearSupport && libxml2Support) "--with-pear=$(out)/lib/php/pear";
hardeningDisable = [ "bindnow" ];
@@ -212,14 +220,17 @@ let
--replace '@PHP_LDFLAGS@' ""
done
- #[[ -z "$libxml2" ]] || addToSearchPath PATH $libxml2/bin
+ substituteInPlace ./build/libtool.m4 --replace /usr/bin/file ${file}/bin/file
export EXTENSION_DIR=$out/lib/php/extensions
- configureFlags+=(--with-config-file-path=$out/etc \
- --includedir=$dev/include)
+ ./buildconf --copy --force
- ./buildconf --force
+ if test -f $src/genfiles; then
+ ./genfiles
+ fi
+ '' + optionalString stdenv.isDarwin ''
+ substituteInPlace configure --replace "-lstdc++" "-lc++"
'';
postInstall = ''
@@ -231,8 +242,8 @@ let
mkdir -p $dev/bin $dev/share/man/man1
mv $out/bin/phpize $out/bin/php-config $dev/bin/
mv $out/share/man/man1/phpize.1.gz \
- $out/share/man/man1/php-config.1.gz \
- $dev/share/man/man1/
+ $out/share/man/man1/php-config.1.gz \
+ $dev/share/man/man1/
'';
src = fetchurl {
@@ -251,10 +262,6 @@ let
patches = [ ./fix-paths-php7.patch ] ++ extraPatches;
- postPatch = optional stdenv.isDarwin ''
- substituteInPlace configure --replace "-lstdc++" "-lc++"
- '';
-
stripDebugList = "bin sbin lib modules";
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix
index d2d74769a1f..b3ae8c7aa31 100644
--- a/pkgs/development/libraries/CGAL/default.nix
+++ b/pkgs/development/libraries/CGAL/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }:
stdenv.mkDerivation rec {
- version = "5.0";
+ version = "5.0.1";
name = "cgal-" + version;
src = fetchFromGitHub {
owner = "CGAL";
repo = "releases";
rev = "CGAL-${version}";
- sha256 = "15r631kddphw3wsvrxrkdbq9y7m0q8kx0kwc9zq97x6ksg3v0gs3";
+ sha256 = "0mmz7kdpzs7xf40qypn4qyka4nq2dykz9sdkimfgpdka9l7lrfwv";
};
# note: optional component libCGAL_ImageIO would need zlib and opengl;
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Computational Geometry Algorithms Library";
- homepage = http://cgal.org;
+ homepage = "http://cgal.org";
license = with licenses; [ gpl3Plus lgpl3Plus];
platforms = platforms.all;
maintainers = [ maintainers.raskin ];
diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix
index c3cc9d84aa4..93ee2ddc704 100644
--- a/pkgs/development/libraries/cpp-utilities/default.nix
+++ b/pkgs/development/libraries/cpp-utilities/default.nix
@@ -1,4 +1,9 @@
-{ stdenv, fetchFromGitHub, cmake, cppunit }:
+{ stdenv
+, fetchFromGitHub
+, fetchpatch
+, cmake
+, cppunit
+}:
stdenv.mkDerivation rec {
pname = "cpp-utilities";
@@ -10,6 +15,17 @@ stdenv.mkDerivation rec {
rev = "v${version}";
sha256 = "0cghk1a0ki1063ci63imakmggwzkky1hx6lhrvc0wjfv754wsklb";
};
+ # See https://github.com/Martchus/cpp-utilities/issues/18
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/Martchus/cpp-utilities/commit/b2a2773cdfb2b0017a3fa3d0ed2259a9a5fda666.patch";
+ sha256 = "01js90ba4xxljifncm48zbxmg7mwwz1gla1hn87yzbic47d85hfj";
+ })
+ (fetchpatch {
+ url = "https://github.com/Martchus/cpp-utilities/commit/4dd2179f191d1ace113f26177944684fa1561dc1.patch";
+ sha256 = "0chw33mwsvj7cigd1c4xl2zhpbfsp5rrijdm46qpn78bq70xcz9j";
+ })
+ ];
nativeBuildInputs = [ cmake ];
checkInputs = [ cppunit ];
diff --git a/pkgs/development/libraries/doctest/default.nix b/pkgs/development/libraries/doctest/default.nix
new file mode 100644
index 00000000000..e55313bc9fe
--- /dev/null
+++ b/pkgs/development/libraries/doctest/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, installShellFiles, cmake }:
+
+stdenv.mkDerivation rec {
+ pname = "doctest";
+ version = "2.3.5";
+
+ src = fetchFromGitHub {
+ owner = "onqtam";
+ repo = "doctest";
+ rev = version;
+ sha256 = "0rddlzhnv0f5036q0m0p019pismka7sx6x8cnzk65sk77b1dsbhg";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/onqtam/doctest";
+ description = "The fastest feature-rich C++11/14/17/20 single-header testing framework";
+ platforms = platforms.linux;
+ license = licenses.mit;
+ maintainers = with maintainers; [ davidtwco ];
+ };
+}
diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix
index 639ad8d0e51..803cf853be1 100644
--- a/pkgs/development/libraries/gegl/4.0.nix
+++ b/pkgs/development/libraries/gegl/4.0.nix
@@ -18,6 +18,7 @@
, netsurf
, pango
, poly2tri-c
+, poppler
, bzip2
, json-glib
, gettext
@@ -34,14 +35,14 @@
stdenv.mkDerivation rec {
pname = "gegl";
- version = "0.4.20";
+ version = "0.4.22";
outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev";
src = fetchurl {
url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1zrxnxlhn0jmshg4n2m2xlgi886w059ynkiiihm7rpi05fs8pg93";
+ sha256 = "0q9cckf90fb82qc5d496fjz459f1xw4j4p3rff1f57yivx0yr20q";
};
patches = [
@@ -71,6 +72,7 @@ stdenv.mkDerivation rec {
netsurf.libnsgif
pango
poly2tri-c
+ poppler
bzip2
libraw
libwebp
diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix
index eafd85cc92a..8e3327d880f 100644
--- a/pkgs/development/libraries/hpx/default.nix
+++ b/pkgs/development/libraries/hpx/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "hpx";
- version = "1.4.0";
+ version = "1.4.1";
src = fetchFromGitHub {
owner = "STEllAR-GROUP";
repo = "hpx";
rev = version;
- sha256 = "1wkipk7240vqpy8and2r8n7wnqyl4dcn41cyla4zcns2jhbr23vb";
+ sha256 = "0yjsrb11hlfwbiw0xi71ami9nrvz6jwj160h9qgl50icd79ngn46";
};
buildInputs = [ boost hwloc gperftools ];
diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix
index a0f44a33220..01a73f4a130 100644
--- a/pkgs/development/libraries/libfido2/default.nix
+++ b/pkgs/development/libraries/libfido2/default.nix
@@ -1,17 +1,22 @@
-{ stdenv, fetchurl, cmake, pkgconfig, libcbor, libressl, udev }:
+{ stdenv, fetchurl, cmake, pkgconfig, libcbor, libressl, udev, IOKit }:
stdenv.mkDerivation rec {
pname = "libfido2";
- version = "1.3.0";
+ version = "1.3.1";
src = fetchurl {
url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz";
- sha256 = "1izyl3as9rn7zcxpsvgngjwr55gli5gy822ac3ajzm65qiqkcbhb";
+ sha256 = "0hdgxbmjbnm9kjwc07nrl2zy87qclvb3rzvdwr5iw35n2qhf4dds";
};
nativeBuildInputs = [ cmake pkgconfig ];
- buildInputs = [ libcbor libressl udev ];
+ buildInputs = [ libcbor libressl ]
+ ++ stdenv.lib.optionals stdenv.isLinux [ udev ]
+ ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ];
- cmakeFlags = [ "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d" ];
+ patches = [ ./detect_apple_ld.patch ];
+
+ cmakeFlags = [ "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d"
+ "-DCMAKE_INSTALL_LIBDIR=lib" ];
meta = with stdenv.lib; {
description = ''
@@ -20,6 +25,6 @@ stdenv.mkDerivation rec {
homepage = https://github.com/Yubico/libfido2;
license = licenses.bsd2;
maintainers = with maintainers; [ dtzWill ];
-
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/libfido2/detect_apple_ld.patch b/pkgs/development/libraries/libfido2/detect_apple_ld.patch
new file mode 100644
index 00000000000..de972e0f358
--- /dev/null
+++ b/pkgs/development/libraries/libfido2/detect_apple_ld.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt 2020-02-19 17:21:59.000000000 +0000
++++ b/CMakeLists.txt 2020-02-23 15:57:34.241115306 +0000
+@@ -296,7 +296,7 @@
+ endif()
+
+ # export list
+-if(CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
++if(APPLE AND CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
+ # clang + lld
+ string(CONCAT CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS}
+ " -exported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/src/export.llvm")
diff --git a/pkgs/development/libraries/liblinear/default.nix b/pkgs/development/libraries/liblinear/default.nix
index 7b70510dec3..a306eb2ed68 100644
--- a/pkgs/development/libraries/liblinear/default.nix
+++ b/pkgs/development/libraries/liblinear/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl, fixDarwinDylibNames }:
stdenv.mkDerivation rec {
pname = "liblinear";
@@ -14,14 +14,11 @@ stdenv.mkDerivation rec {
make lib
'';
- installPhase = let
- libSuff = stdenv.hostPlatform.extensions.sharedLibrary;
- in ''
+ installPhase = ''
mkdir -p $out/lib $out/bin $out/include
${if stdenv.isDarwin then ''
cp liblinear.so.3 $out/lib/liblinear.3.dylib
ln -s $out/lib/liblinear.3.dylib $out/lib/liblinear.dylib
- install_name_tool -id liblinear.3.dylib $out/lib/liblinear.3.dylib
'' else ''
cp liblinear.so.3 $out/lib/liblinear.so.3
ln -s $out/lib/liblinear.so.3 $out/lib/liblinear.so
@@ -31,6 +28,8 @@ stdenv.mkDerivation rec {
cp linear.h $out/include
'';
+ nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames ];
+
meta = with stdenv.lib; {
description = "A library for large linear classification";
homepage = https://www.csie.ntu.edu.tw/~cjlin/liblinear/;
diff --git a/pkgs/development/libraries/libubox/default.nix b/pkgs/development/libraries/libubox/default.nix
index 71ac22e85a8..2cd5bd8a341 100644
--- a/pkgs/development/libraries/libubox/default.nix
+++ b/pkgs/development/libraries/libubox/default.nix
@@ -1,12 +1,13 @@
{ stdenv, lib, fetchgit, cmake, pkgconfig, json_c }:
stdenv.mkDerivation {
- name = "libubox-2017-09-29";
+ pname = "libubox";
+ version = "unstable-2020-01-20";
src = fetchgit {
url = "https://git.openwrt.org/project/libubox.git";
- rev = "632688e8d6cde32781e4ec685d59afb0938300ad";
- sha256 = "1rkwn287k7p802hbd9ap13xxrxsghq6827r86ymqbbcmbcrna13c";
+ rev = "43a103ff17ee5872669f8712606578c90c14591d";
+ sha256 = "0cihgckghamcfxrvqjjn69giib80xhsqaj98ldn0gd96zqh96sd4";
};
cmakeFlags = [ "-DBUILD_LUA=OFF" "-DBUILD_EXAMPLES=OFF" ];
diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix
index 0dec9daee6a..3d0a94a35d0 100644
--- a/pkgs/development/libraries/libyaml-cpp/default.nix
+++ b/pkgs/development/libraries/libyaml-cpp/default.nix
@@ -11,8 +11,6 @@ stdenv.mkDerivation rec {
sha256 = "0ykkxzxcwwiv8l8r697gyqh1nl582krpvi7m7l6b40ijnk4pw30s";
};
- outputs = [ "out" "dev" ];
-
nativeBuildInputs = [ cmake ];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DYAML_CPP_BUILD_TESTS=OFF" ];
diff --git a/pkgs/development/libraries/lyra/default.nix b/pkgs/development/libraries/lyra/default.nix
new file mode 100644
index 00000000000..3e73c9266a0
--- /dev/null
+++ b/pkgs/development/libraries/lyra/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, installShellFiles, meson, ninja }:
+
+stdenv.mkDerivation rec {
+ pname = "lyra";
+ version = "1.1";
+
+ src = fetchFromGitHub {
+ owner = "bfgroup";
+ repo = "lyra";
+ rev = version;
+ sha256 = "1wcwsmg41bmjir6pjrjxrwccqj25d9068ifi9m6xz6q3fhaq6s81";
+ };
+
+ nativeBuildInputs = [ meson ninja ];
+
+ enableParallelBuilding = true;
+
+ postPatch = "sed -i s#/usr#$out#g meson.build";
+
+ postInstall = ''
+ mkdir -p $out/include
+ cp -R $src/include/* $out/include
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/bfgroup/Lyra";
+ description = "A simple to use, composable, command line parser for C++ 11 and beyond";
+ platforms = platforms.linux;
+ license = licenses.boost;
+ maintainers = with maintainers; [ davidtwco ];
+ };
+}
diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix
index 53c4594f535..351b38b3345 100644
--- a/pkgs/development/libraries/mapnik/default.nix
+++ b/pkgs/development/libraries/mapnik/default.nix
@@ -8,12 +8,12 @@
stdenv.mkDerivation rec {
pname = "mapnik";
- version = "3.0.22";
+ version = "3.0.23";
src = fetchzip {
# this one contains all git submodules and is cheaper than fetchgit
url = "https://github.com/mapnik/mapnik/releases/download/v${version}/mapnik-v${version}.tar.bz2";
- sha256 = "18yvnnbwqndagzaa2nwh3g7gb52dghaypxpkmc2h5l88770bl17f";
+ sha256 = "1754m8y7fyk0dyf7cglhavsk66g5kdqhnmgicib1jkcgjbl69f15";
};
# a distinct dev output makes python-mapnik fail
diff --git a/pkgs/development/libraries/mypaint-brushes/1.0.nix b/pkgs/development/libraries/mypaint-brushes/1.0.nix
index 115d818d936..c66329fa633 100644
--- a/pkgs/development/libraries/mypaint-brushes/1.0.nix
+++ b/pkgs/development/libraries/mypaint-brushes/1.0.nix
@@ -1,5 +1,4 @@
{ stdenv
-, fetchpatch
, autoconf
, automake
, fetchFromGitHub
@@ -8,23 +7,15 @@
stdenv.mkDerivation rec {
pname = "mypaint-brushes";
- version = "1.3.0";
+ version = "1.3.1";
src = fetchFromGitHub {
owner = "mypaint";
repo = pname;
rev = "v${version}";
- sha256 = "1iz89z6v2mp8j1lrf942k561s8311i3s34ap36wh4rybb2lq15m0";
+ sha256 = "1c95l1vfz7sbrdlzrbz7h1p6s1k113kyjfd9wfnxlm0p6562cz3j";
};
- patches = [
- # build with automake 1.16
- (fetchpatch {
- url = https://github.com/Jehan/mypaint-brushes/commit/1e9109dde3bffd416ed351c3f30ecd6ffd0ca2cd.patch;
- sha256 = "0mi8rwbirl0ib22f2hz7kdlgi4hw8s3ab29b003dsshdyzn5iha9";
- })
- ];
-
nativeBuildInputs = [
autoconf
automake
diff --git a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix
index 8f693a32e35..2309e6671f8 100644
--- a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix
+++ b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix
@@ -6,7 +6,7 @@ let
inherit name;
src = fetchurl {
- url = "https://www.hepforge.org/archive/lhapdf/pdfsets/6.2/${name}.tar.gz";
+ url = "http://lhapdfsets.web.cern.ch/lhapdfsets/current/${name}.tar.gz";
inherit sha256;
};
diff --git a/pkgs/development/libraries/readline/7.0.nix b/pkgs/development/libraries/readline/7.0.nix
index 065d6544986..486c6eaa224 100644
--- a/pkgs/development/libraries/readline/7.0.nix
+++ b/pkgs/development/libraries/readline/7.0.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
- maintainers = [ maintainers.vanschelven ];
+ maintainers = [ ];
platforms = platforms.unix;
branch = "7.0";
diff --git a/pkgs/development/libraries/readline/8.0.nix b/pkgs/development/libraries/readline/8.0.nix
index 7fbef9a986a..9b9f459e4c3 100644
--- a/pkgs/development/libraries/readline/8.0.nix
+++ b/pkgs/development/libraries/readline/8.0.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ vanschelven dtzWill ];
+ maintainers = with maintainers; [ dtzWill ];
platforms = platforms.unix;
branch = "8.0";
diff --git a/pkgs/development/libraries/seasocks/default.nix b/pkgs/development/libraries/seasocks/default.nix
index 8efcd0de2f1..9825c0c4035 100644
--- a/pkgs/development/libraries/seasocks/default.nix
+++ b/pkgs/development/libraries/seasocks/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, python, zlib, fetchpatch }:
+{ stdenv, fetchFromGitHub, cmake, python, zlib }:
stdenv.mkDerivation rec {
pname = "seasocks";
@@ -11,13 +11,6 @@ stdenv.mkDerivation rec {
sha256 = "1c2gc0k9wgbgn7y7wmq2ylp0gvdbmagc1x8c4jwbsncl1gy6x4g2";
};
- patches = [
- (fetchpatch {
- url = "https://github.com/mattgodbolt/seasocks/commit/5753b50ce3b2232d166843450043f88a4a362422.patch";
- sha256 = "1c20xjma8jdgcr5m321srpmys6b4jvqkazfqr668km3r2ck5xncl";
- })
- ];
-
nativeBuildInputs = [ cmake ];
buildInputs = [ zlib python ];
diff --git a/pkgs/development/libraries/sentencepiece/default.nix b/pkgs/development/libraries/sentencepiece/default.nix
index 907e0cc5076..05c641fab89 100644
--- a/pkgs/development/libraries/sentencepiece/default.nix
+++ b/pkgs/development/libraries/sentencepiece/default.nix
@@ -17,15 +17,13 @@ stdenv.mkDerivation rec {
sha256 = "1ncvyw9ar0z7nd47cysxg5xrjm01y1shdlhp8l2pdpx059p3yx3w";
};
- enableParallelBuilding = true;
-
nativeBuildInputs = [ cmake gperftools ];
meta = with stdenv.lib; {
- homepage = https://github.com/google/sentencepiece;
+ homepage = "https://github.com/google/sentencepiece";
description = "Unsupervised text tokenizer for Neural Network-based text generation";
license = licenses.asl20;
- platforms = [ "x86_64-linux" ];
+ platforms = platforms.unix;
maintainers = with maintainers; [ pashashocky ];
};
}
diff --git a/pkgs/development/libraries/sundials/3.x.nix b/pkgs/development/libraries/sundials/2.x.nix
similarity index 81%
rename from pkgs/development/libraries/sundials/3.x.nix
rename to pkgs/development/libraries/sundials/2.x.nix
index 879f13e8bf5..12840b76940 100644
--- a/pkgs/development/libraries/sundials/3.x.nix
+++ b/pkgs/development/libraries/sundials/2.x.nix
@@ -2,6 +2,8 @@
, cmake
, fetchurl
, python
+# GNU Octave needs KLU for ODE solvers
+, suitesparse
, liblapack
, gfortran
, lapackSupport ? true }:
@@ -12,14 +14,17 @@ let liblapackShared = liblapack.override {
in stdenv.mkDerivation rec {
pname = "sundials";
- version = "3.2.1";
+ version = "2.7.0";
- buildInputs = [ python ] ++ stdenv.lib.optionals (lapackSupport) [ gfortran ];
+ buildInputs = [ python ] ++ stdenv.lib.optionals (lapackSupport) [
+ gfortran
+ suitesparse
+ ];
nativeBuildInputs = [ cmake ];
src = fetchurl {
url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz";
- sha256 = "0238r1qnwqz13wcjzfsbcfi8rfnlxcjjmxq2vpf2qf5jgablvna7";
+ sha256 = "01513g0j7nr3rh7hqjld6mw0mcx5j9z9y87bwjc16w2x2z3wm7yk";
};
patches = [
@@ -34,6 +39,10 @@ in stdenv.mkDerivation rec {
"-DEXAMPLES_INSTALL_PATH=${placeholder "out"}/share/examples"
] ++ stdenv.lib.optionals (lapackSupport) [
"-DSUNDIALS_INDEX_TYPE=int32_t"
+ # GNU Octave needs KLU for ODE solvers
+ "-DKLU_ENABLE=ON"
+ "-DKLU_INCLUDE_DIR=${suitesparse}/include"
+ "-DKLU_LIBRARY_DIR=${suitesparse}/lib"
"-DLAPACK_ENABLE=ON"
"-DLAPACK_LIBRARIES=${liblapackShared}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary};${liblapackShared}/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}"
];
diff --git a/pkgs/development/libraries/sycl-info/default.nix b/pkgs/development/libraries/sycl-info/default.nix
new file mode 100644
index 00000000000..f294c887b0c
--- /dev/null
+++ b/pkgs/development/libraries/sycl-info/default.nix
@@ -0,0 +1,57 @@
+{ stdenv
+, fetchFromGitHub
+, installShellFiles
+, cmake
+, ninja
+, ocl-icd
+, opencl-headers
+, lyra
+, nlohmann_json
+, ronn
+, doctest
+}:
+
+stdenv.mkDerivation rec {
+ pname = "sycl-info";
+ version = "unstable-2019-11-19";
+
+ src = fetchFromGitHub {
+ owner = "codeplaysoftware";
+ repo = "sycl-info";
+ rev = "b47d498ee2d6b77ec21972de5882e8e12efecd6c";
+ sha256 = "0fy0y1rcfb11p3vijd8wym6xkaicav49pv2bv2l18rma929n1m1m";
+ };
+
+ buildInputs = [
+ nlohmann_json
+ ronn
+ opencl-headers
+ ocl-icd
+ doctest
+ lyra
+ ];
+
+ nativeBuildInputs = [
+ cmake
+ ninja
+ ];
+
+ cmakeFlags = [
+ "-DBUILD_TESTING=ON"
+ "-DBUILD_DOCS=ON"
+ "-DBUILD_SHARED_LIBS=ON"
+ "-DLYRA_INCLUDE_DIRS=${stdenv.lib.getDev lyra}/include"
+ ];
+
+ # Required for ronn to compile the manpage.
+ RUBYOPT = "-KU -E utf-8:utf-8";
+
+ meta = with stdenv.lib;
+ {
+ homepage = "https://github.com/codeplaysoftware/sycl-info";
+ description = "Tool to show information about available SYCL implementations";
+ platforms = platforms.linux;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ davidtwco ];
+ };
+}
diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix
index 5a8ebe84ba6..6acbb66e15c 100644
--- a/pkgs/development/libraries/talloc/default.nix
+++ b/pkgs/development/libraries/talloc/default.nix
@@ -4,11 +4,12 @@
}:
stdenv.mkDerivation rec {
- name = "talloc-2.1.14";
+ pname = "talloc";
+ version = "2.1.16";
src = fetchurl {
- url = "mirror://samba/talloc/${name}.tar.gz";
- sha256 = "1kk76dyav41ip7ddbbf04yfydb4jvywzi2ps0z2vla56aqkn11di";
+ url = "mirror://samba/talloc/${pname}-${version}.tar.gz";
+ sha256 = "1aajda08yf7njgvg6r21ccxlvkarb9bwvf4jqh8yn3871a1zcnqr";
};
nativeBuildInputs = [ pkgconfig fixDarwinDylibNames python wafHook
diff --git a/pkgs/development/libraries/ubus/default.nix b/pkgs/development/libraries/ubus/default.nix
new file mode 100644
index 00000000000..1f7124411ac
--- /dev/null
+++ b/pkgs/development/libraries/ubus/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, cmake, fetchgit, libubox, libjson }:
+
+stdenv.mkDerivation {
+ pname = "ubus";
+ version = "unstable-2020-01-05";
+
+ src = fetchgit {
+ url = "https://git.openwrt.org/project/ubus.git";
+ rev = "d35df8adda873dc75d876f72b78e84db8cfa72ee";
+ sha256 = "1ksrih5vfyixaafzsrs6ab88qw34d0197wvw201jl5p1fc7drgn4";
+ };
+
+ cmakeFlags = [ "-D BUILD_LUA:BOOL=OFF" ];
+ buildInputs = [ libubox libjson ];
+ nativeBuildInputs = [ cmake ];
+
+ meta = with stdenv.lib; {
+ description = "OpenWrt system message/RPC bus";
+ homepage = "https://git.openwrt.org/?p=project/ubus.git;a=summary";
+ license = licenses.lgpl21;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ petabyteboy ];
+ };
+}
diff --git a/pkgs/development/libraries/uci/default.nix b/pkgs/development/libraries/uci/default.nix
new file mode 100644
index 00000000000..e3bdea8c889
--- /dev/null
+++ b/pkgs/development/libraries/uci/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, cmake, fetchgit, pkgconfig, libubox }:
+
+stdenv.mkDerivation {
+ pname = "uci";
+ version = "unstable-2020-01-27";
+
+ src = fetchgit {
+ url = "https://git.openwrt.org/project/uci.git";
+ rev = "e8d83732f9eb571dce71aa915ff38a072579610b";
+ sha256 = "1si8dh8zzw4j6m7387qciw2akfvl7c4779s8q5ns2ys6dn4sz6by";
+ };
+
+ hardeningDisable = [ "all" ];
+ cmakeFlags = [ "-D BUILD_LUA:BOOL=OFF" ];
+ buildInputs = [ libubox ];
+ nativeBuildInputs = [ cmake pkgconfig ];
+
+ meta = with stdenv.lib; {
+ description = "OpenWrt Unified Configuration Interface";
+ homepage = "https://git.openwrt.org/?p=project/uci.git;a=summary";
+ license = licenses.lgpl21;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ petabyteboy ];
+ };
+}
diff --git a/pkgs/development/libraries/ucx/default.nix b/pkgs/development/libraries/ucx/default.nix
new file mode 100644
index 00000000000..d1e3934d882
--- /dev/null
+++ b/pkgs/development/libraries/ucx/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, doxygen
+, numactl, rdma-core, libbfd, libiberty, perl, zlib
+}:
+
+let
+ version = "1.7.0";
+
+in stdenv.mkDerivation {
+ name = "ucx-${version}";
+
+ src = fetchFromGitHub {
+ owner = "openucx";
+ repo = "ucx";
+ rev = "v${version}";
+ sha256 = "149p8s7jrg7pbbq0hw0qm8va119bsl19q4scgk94vjqliyc1s33h";
+ };
+
+ nativeBuildInputs = [ autoreconfHook doxygen ];
+
+ buildInputs = [ numactl rdma-core libbfd libiberty perl zlib ];
+
+ configureFlags = [
+ "--with-rdmacm=${rdma-core}"
+ "--with-dc"
+ "--with-rc"
+ "--with-dm"
+ "--with-verbs=${rdma-core}"
+ ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "Unified Communication X library";
+ homepage = http://www.openucx.org;
+ license = licenses.bsd3;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.markuskowa ];
+ };
+}
diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix
index 71bd608e93a..5c508f133e1 100644
--- a/pkgs/development/libraries/virglrenderer/default.nix
+++ b/pkgs/development/libraries/virglrenderer/default.nix
@@ -1,24 +1,21 @@
-{ stdenv, fetchurl, pkgconfig, libGLU, epoxy, libX11, libdrm, mesa }:
-
+{ stdenv, fetchurl, cmake, meson, ninja, pkgconfig, python3
+, libGLU, epoxy, libX11, libdrm, mesa
+}:
stdenv.mkDerivation rec {
-
pname = "virglrenderer";
- version = "0.7.0";
+ version = "0.8.1";
src = fetchurl {
- url = "https://www.freedesktop.org/software/virgl/${pname}-${version}.tar.bz2";
- sha256 = "041agg1d6i8hg250y30f08n3via0hs9rbijxdrfifb8ara805v0m";
+ url = "https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/virglrenderer-${version}/virglrenderer-virglrenderer-${version}.tar.bz2";
+ sha256 = "0ac39mplmy6lmcd6cljmfsrfby7m6ac3dzvmnn5pv200drl415l4";
};
buildInputs = [ libGLU epoxy libX11 libdrm mesa ];
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ cmake meson ninja pkgconfig python3 ];
- # Fix use of fd_set without proper include
- prePatch = ''
- sed -e '1i#include ' -i vtest/util.c
- '';
+ dontUseCmakeConfigure = true;
meta = with stdenv.lib; {
description = "A virtual 3D GPU library that allows a qemu guest to use the host GPU for accelerated 3D rendering";
@@ -27,5 +24,4 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
maintainers = [ maintainers.xeji ];
};
-
}
diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/pkgs/development/lisp-modules/asdf/default.nix
index 8d316d06fbb..25d179fe968 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.3";
+ version="3.3.4";
name="${baseName}-${version}";
- hash="1167445kmb0dbixc5l2r58cswg5s6jays0l1zxrk3aij0490bkgg";
- url="http://common-lisp.net/project/asdf/archives/asdf-3.3.3.tar.gz";
- sha256="1167445kmb0dbixc5l2r58cswg5s6jays0l1zxrk3aij0490bkgg";
+ hash="07npcxgq2m07w78k8gnz9i73kbw6ky2zh2pylhh9b69jvncdqkpy";
+ url="http://common-lisp.net/project/asdf/archives/asdf-3.3.4.tar.gz";
+ sha256="07npcxgq2m07w78k8gnz9i73kbw6ky2zh2pylhh9b69jvncdqkpy";
};
buildInputs = [
texinfo texLive perl
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 2a4146577ff..33946b7213a 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -1432,17 +1432,17 @@ moonscript = buildLuarocksPackage {
};
nvim-client = buildLuarocksPackage {
pname = "nvim-client";
- version = "0.2.0-1";
+ version = "0.2.2-1";
src = fetchurl {
- url = https://luarocks.org/nvim-client-0.2.0-1.src.rock;
- sha256 = "1ah9mjvz28hrbwnyb5n60znz3m0m41rn7jpnxwfx773cys3skidx";
+ url = https://luarocks.org/nvim-client-0.2.2-1.src.rock;
+ sha256 = "0bgx94ziiq0004zw9lz2zb349xaqs5pminqd8bwdrfdnfjnbp8x0";
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua mpack luv coxpcall ];
meta = with stdenv.lib; {
- homepage = "https://github.com/neovim/lua-client/archive/0.2.0-1.tar.gz";
+ homepage = "https://github.com/neovim/lua-client/archive/0.2.2-1.tar.gz";
description = "Lua client to Nvim";
license = {
fullName = "Apache";
diff --git a/pkgs/development/node-packages/default-v10.nix b/pkgs/development/node-packages/default-v10.nix
index 65b537ad50f..54bd0337fad 100644
--- a/pkgs/development/node-packages/default-v10.nix
+++ b/pkgs/development/node-packages/default-v10.nix
@@ -62,6 +62,10 @@ nodePackages // {
buildInputs = [ nodePackages.node-gyp-build ];
};
+ insect = nodePackages.insect.override (drv: {
+ nativeBuildInputs = drv.nativeBuildInputs or [] ++ [ pkgs.psc-package pkgs.purescript nodePackages.pulp ];
+ });
+
node-inspector = nodePackages.node-inspector.override {
buildInputs = [ nodePackages.node-pre-gyp ];
};
diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh
index ca6e0628642..3b1626f9afb 100755
--- a/pkgs/development/node-packages/generate.sh
+++ b/pkgs/development/node-packages/generate.sh
@@ -1,10 +1,15 @@
#!/usr/bin/env nix-shell
-#! nix-shell -I nixpkgs=../../.. -i bash -p nodePackages.node2nix
-# NOTE: Script must be run from the node-packages directory
-
+#! nix-shell shell-generate.nix -i bash
set -eu -o pipefail
-rm -f node-env.nix
-node2nix --nodejs-10 -i node-packages-v10.json -o node-packages-v10.nix -c composition-v10.nix
-node2nix --nodejs-12 -i node-packages-v12.json -o node-packages-v12.nix -c composition-v12.nix
-node2nix --nodejs-13 -i node-packages-v13.json -o node-packages-v13.nix -c composition-v13.nix
+cd "$NODE_NIXPKGS_PATH/pkgs/development/node-packages"
+rm -f ./node-env.nix
+for version in 10 12 13; do
+ tmpdir=$(mktemp -d)
+ node2nix --nodejs-$version -i node-packages-v$version.json -o $tmpdir/node-packages-v$version.nix -c $tmpdir/composition-v$version.nix
+ if [ $? -eq 0 ]; then
+ mv $tmpdir/node-packages-v$version.nix .
+ mv $tmpdir/composition-v$version.nix .
+ fi
+done
+cd -
diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json
index cbae97149d3..f8e7c3f3441 100644
--- a/pkgs/development/node-packages/node-packages-v10.json
+++ b/pkgs/development/node-packages/node-packages-v10.json
@@ -54,6 +54,7 @@
, "hueadm"
, "imapnotify"
, "indium"
+, "insect"
, "ionic"
, "ios-deploy"
, { "iosevka-build-deps": "../../data/fonts/iosevka" }
@@ -99,6 +100,7 @@
, {"npm2nix": "git://github.com/NixOS/npm2nix.git#5.12.0"}
, "ocaml-language-server"
, "parcel-bundler"
+, "parsoid"
, "peerflix"
, "peerflix-server"
, "pnpm"
@@ -163,6 +165,7 @@
, "webtorrent-cli"
, "wring"
, "write-good"
+, "yaml-language-server"
, "yarn"
, "yo"
]
diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix
index 5497679f4f6..a87b6d30a38 100644
--- a/pkgs/development/node-packages/node-packages-v10.nix
+++ b/pkgs/development/node-packages/node-packages-v10.nix
@@ -22,31 +22,31 @@ let
sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ==";
};
};
- "@angular-devkit/architect-0.900.2" = {
+ "@angular-devkit/architect-0.900.3" = {
name = "_at_angular-devkit_slash_architect";
packageName = "@angular-devkit/architect";
- version = "0.900.2";
+ version = "0.900.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.900.2.tgz";
- sha512 = "uClqp4QEY/m6CB7SsNZGdVNTEgMzkI1Fkt0TOdE9huN1iCi/0+h3nQb+NZ1vBqD2afg9EqDwIPu2KCU0p1BR2A==";
+ url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.900.3.tgz";
+ sha512 = "4UHc58Dlc5XHY3eiYSX9gytLyPNYixGSRwLcc/LRwuPgrmUFKPzCN3nwgB+9kc03/HN89CsJ1rS1scid6N6vxQ==";
};
};
- "@angular-devkit/core-9.0.2" = {
+ "@angular-devkit/core-9.0.3" = {
name = "_at_angular-devkit_slash_core";
packageName = "@angular-devkit/core";
- version = "9.0.2";
+ version = "9.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.0.2.tgz";
- sha512 = "lEmfYs7+oHmXEQ3y97QGm73zs7i6chpx+ZSaBUvMM9oCKj/lytcn+diVG+t4hMavH6TK0lai7DO1rAbYkbmdrA==";
+ url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.0.3.tgz";
+ sha512 = "3+abmv9K9d+BVgUAolYgoOqlGAA2Jb1pWo2biapSDG6KjUZHUCJdnsKigLtLorCdv0SrjTp56FFplkcqKsFQgA==";
};
};
- "@angular-devkit/schematics-9.0.2" = {
+ "@angular-devkit/schematics-9.0.3" = {
name = "_at_angular-devkit_slash_schematics";
packageName = "@angular-devkit/schematics";
- version = "9.0.2";
+ version = "9.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.0.2.tgz";
- sha512 = "+MiSBWErz8hxcbyHioCQtTnFpbqaoCEQEknK0vCb15fFEY2Hi3u2TXK59QNKsqn8w+Mye5dHYhwmpsAC8Wcgtw==";
+ url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.0.3.tgz";
+ sha512 = "BQnZtFQPLZZOijhuEndtzL6cOnhaE8nNxupkRHavWohOMStnLsRyvVJj6JVDkf37wvT5koqTNjHhbdMxcCRc6A==";
};
};
"@antora/asciidoc-loader-2.2.0" = {
@@ -157,13 +157,13 @@ let
sha512 = "3d6SqtknM3PiLRw2wLtcMVVfmyHtfNuWo8+ZBRmUrZs8HfhGteV8/s4vpiOJZmLYhW4KLFgIgG09lFdD5t78Ow==";
};
};
- "@apollo/federation-0.12.0" = {
+ "@apollo/federation-0.12.1" = {
name = "_at_apollo_slash_federation";
packageName = "@apollo/federation";
- version = "0.12.0";
+ version = "0.12.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.12.0.tgz";
- sha512 = "jJb4CzJDLWghkVkhQE5go9XvekQZgL8MsHAGWHzrgHXfUNHZhAjkxODH0duPEq2WunGSp6rSu4rerW1cC89JvA==";
+ url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.12.1.tgz";
+ sha512 = "ZzTHtZH9b0JXtP55hicN42/+qX99qomN2MhTnTkM7jrcAWzE1V5spX/60GHTAeEQGf0zbmAOwzKCgIQS2AU6Bw==";
};
};
"@apollo/protobufjs-1.0.3" = {
@@ -535,13 +535,13 @@ let
sha512 = "0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw==";
};
};
- "@babel/plugin-external-helpers-7.0.0" = {
+ "@babel/plugin-external-helpers-7.8.3" = {
name = "_at_babel_slash_plugin-external-helpers";
packageName = "@babel/plugin-external-helpers";
- version = "7.0.0";
+ version = "7.8.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-external-helpers/-/plugin-external-helpers-7.0.0.tgz";
- sha512 = "tZKTMdhZvTy0KCEX5EGQQm1RHr7jUa36q/yax1baEA0yZapVYmu10yW7LTqijITgSq416gPVjrcexiA6y4pJlA==";
+ url = "https://registry.npmjs.org/@babel/plugin-external-helpers/-/plugin-external-helpers-7.8.3.tgz";
+ sha512 = "mx0WXDDiIl5DwzMtzWGRSPugXi9BxROS05GQrhLNbEamhBiicgn994ibwkyiBH+6png7bm/yA7AUsvHyCXi4Vw==";
};
};
"@babel/plugin-proposal-async-generator-functions-7.8.3" = {
@@ -634,6 +634,15 @@ let
sha512 = "tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==";
};
};
+ "@babel/plugin-syntax-bigint-7.8.3" = {
+ name = "_at_babel_slash_plugin-syntax-bigint";
+ packageName = "@babel/plugin-syntax-bigint";
+ version = "7.8.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz";
+ sha512 = "wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==";
+ };
+ };
"@babel/plugin-syntax-dynamic-import-7.8.3" = {
name = "_at_babel_slash_plugin-syntax-dynamic-import";
packageName = "@babel/plugin-syntax-dynamic-import";
@@ -1066,13 +1075,13 @@ let
sha512 = "iCXFk+T4demnq+dNLLvlGOgvYF6sPZ/hS1EmswugOqh1Ysp2vuiqJzpgsnp5rW8+6dLJT/0CXDzye28ZH6BAfQ==";
};
};
- "@babel/preset-stage-2-7.0.0" = {
+ "@babel/preset-stage-2-7.8.3" = {
name = "_at_babel_slash_preset-stage-2";
packageName = "@babel/preset-stage-2";
- version = "7.0.0";
+ version = "7.8.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/preset-stage-2/-/preset-stage-2-7.0.0.tgz";
- sha512 = "A8ia2Wus0OAP6hh28ZgPSCBJEX3Jnql3kg9di/I+Lmg1gbJXgDZBrHr/UGZXl20Vi1lXgMuUq8c8J899KFr5gA==";
+ url = "https://registry.npmjs.org/@babel/preset-stage-2/-/preset-stage-2-7.8.3.tgz";
+ sha512 = "dStnEQgejNYIHFNACdDCigK4BF7wgW6Zahv9Dc2un7rGjbeVtZhBfR3sy0I7ZJOhBexkFxVdMZ5hqmll7BFShw==";
};
};
"@babel/preset-typescript-7.8.3" = {
@@ -1156,15 +1165,6 @@ let
sha512 = "jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==";
};
};
- "@calebboyd/semaphore-1.3.1" = {
- name = "_at_calebboyd_slash_semaphore";
- packageName = "@calebboyd/semaphore";
- version = "1.3.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/@calebboyd/semaphore/-/semaphore-1.3.1.tgz";
- sha512 = "17z9me12RgAEcMhIgR7f+BiXKbzwF9p1VraI69OxrUUSWGuSMOyOTEHQNVtMKuVrkEDVD0/Av5uiGZPBMYZljw==";
- };
- };
"@cliqz-oss/firefox-client-0.3.1" = {
name = "_at_cliqz-oss_slash_firefox-client";
packageName = "@cliqz-oss/firefox-client";
@@ -1183,13 +1183,22 @@ let
sha512 = "O/IyiB5pfztCdmxQZg0/xeq5w+YiP3gtJz8d4We2EpLPKzbDVjOrtfLKYgVfm6Ya6mbvDge1uLkSRwaoVCWKnA==";
};
};
- "@comandeer/babel-plugin-banner-4.1.0" = {
+ "@cnakazawa/watch-1.0.4" = {
+ name = "_at_cnakazawa_slash_watch";
+ packageName = "@cnakazawa/watch";
+ version = "1.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz";
+ sha512 = "v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==";
+ };
+ };
+ "@comandeer/babel-plugin-banner-5.0.0" = {
name = "_at_comandeer_slash_babel-plugin-banner";
packageName = "@comandeer/babel-plugin-banner";
- version = "4.1.0";
+ version = "5.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@comandeer/babel-plugin-banner/-/babel-plugin-banner-4.1.0.tgz";
- sha512 = "9hKVIN2+maygxkngnXDsZXRZqCYDY4pxIRljJqqJ5A+eJZzW3k/NZj5lixEmStjWFjlPlOHGYBytBehpf0l+hA==";
+ url = "https://registry.npmjs.org/@comandeer/babel-plugin-banner/-/babel-plugin-banner-5.0.0.tgz";
+ sha512 = "sR9Go0U6puXoXyW9UgIiIQhRcJ8jVOvGl4BptUiXAtheMs72WcakZ1udh6J0ZOivr3o8jAM+MTCHLP8FZMbVpQ==";
};
};
"@cronvel/get-pixels-3.3.1" = {
@@ -1480,6 +1489,42 @@ let
sha512 = "ODXbta2kvFNkMIEGwl7KX5gJTcZZHkzSLoBh3wND2H+EsG0KpIqOZKWMtkj+suuPut85wyLZ7fGfARnrNf7dtA==";
};
};
+ "@istanbuljs/load-nyc-config-1.0.0" = {
+ name = "_at_istanbuljs_slash_load-nyc-config";
+ packageName = "@istanbuljs/load-nyc-config";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.0.0.tgz";
+ sha512 = "ZR0rq/f/E4f4XcgnDvtMWXCUJpi8eO0rssVhmztsZqLIEFA9UUP9zmpE0VxlM+kv/E1ul2I876Fwil2ayptDVg==";
+ };
+ };
+ "@istanbuljs/schema-0.1.2" = {
+ name = "_at_istanbuljs_slash_schema";
+ packageName = "@istanbuljs/schema";
+ version = "0.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz";
+ sha512 = "tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==";
+ };
+ };
+ "@jest/transform-25.1.0" = {
+ name = "_at_jest_slash_transform";
+ packageName = "@jest/transform";
+ version = "25.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@jest/transform/-/transform-25.1.0.tgz";
+ sha512 = "4ktrQ2TPREVeM+KxB4zskAT84SnmG1vaz4S+51aTefyqn3zocZUnliLLm5Fsl85I3p/kFPN4CRp1RElIfXGegQ==";
+ };
+ };
+ "@jest/types-25.1.0" = {
+ name = "_at_jest_slash_types";
+ packageName = "@jest/types";
+ version = "25.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@jest/types/-/types-25.1.0.tgz";
+ sha512 = "VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA==";
+ };
+ };
"@kbrandwijk/swagger-to-graphql-2.4.3" = {
name = "_at_kbrandwijk_slash_swagger-to-graphql";
packageName = "@kbrandwijk/swagger-to-graphql";
@@ -2236,13 +2281,13 @@ let
sha512 = "eoOVMjILna7FVQf96iWc3+ZtE/ZT6y8ob8ZzcqKY1ibSQCnu4O/B7pJvzMx5cyZ/RjAff6DAdEb0O0Cjcxidkg==";
};
};
- "@octokit/endpoint-5.5.2" = {
+ "@octokit/endpoint-5.5.3" = {
name = "_at_octokit_slash_endpoint";
packageName = "@octokit/endpoint";
- version = "5.5.2";
+ version = "5.5.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.5.2.tgz";
- sha512 = "ICDcRA0C2vtTZZGud1nXRrBLXZqFayodXAKZfo3dkdcLNqcHsgaz3YSTupbURusYeucSVRjjG+RTcQhx6HPPcg==";
+ url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.5.3.tgz";
+ sha512 = "EzKwkwcxeegYYah5ukEeAI/gYRLv2Y9U5PpIsseGSFDk+G3RbipQGBs8GuYS1TLCtQaqoO66+aQGtITPalxsNQ==";
};
};
"@octokit/plugin-enterprise-rest-3.6.2" = {
@@ -2281,13 +2326,13 @@ let
sha512 = "EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ==";
};
};
- "@octokit/request-5.3.1" = {
+ "@octokit/request-5.3.2" = {
name = "_at_octokit_slash_request";
packageName = "@octokit/request";
- version = "5.3.1";
+ version = "5.3.2";
src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/request/-/request-5.3.1.tgz";
- sha512 = "5/X0AL1ZgoU32fAepTfEoggFinO3rxsMLtzhlUX+RctLrusn/CApJuGFCd0v7GMFhF+8UiCsTTfsu7Fh1HnEJg==";
+ url = "https://registry.npmjs.org/@octokit/request/-/request-5.3.2.tgz";
+ sha512 = "7NPJpg19wVQy1cs2xqXjjRq/RmtSomja/VSWnptfYwuBxLdbYh2UjhGi0Wx7B1v5Iw5GKhfFDQL7jM7SSp7K2g==";
};
};
"@octokit/request-error-1.2.1" = {
@@ -2308,13 +2353,13 @@ let
sha512 = "gfFKwRT/wFxq5qlNjnW2dh+qh74XgTQ2B179UX5K1HYCluioWj8Ndbgqw2PVqa1NnVJkGHp2ovMpVn/DImlmkw==";
};
};
- "@octokit/types-2.1.1" = {
+ "@octokit/types-2.2.0" = {
name = "_at_octokit_slash_types";
packageName = "@octokit/types";
- version = "2.1.1";
+ version = "2.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/types/-/types-2.1.1.tgz";
- sha512 = "89LOYH+d/vsbDX785NOfLxTW88GjNd0lWRz1DVPVsZgg9Yett5O+3MOvwo7iHgvUwbFz0mf/yPIjBkUbs4kxoQ==";
+ url = "https://registry.npmjs.org/@octokit/types/-/types-2.2.0.tgz";
+ sha512 = "iEeW3XlkxeM/CObeoYvbUv24Oe+DldGofY+3QyeJ5XKKA6B+V94ePk14EDCarseWdMs6afKZPv3dFq8C+SY5lw==";
};
};
"@parcel/fs-1.11.0" = {
@@ -2479,22 +2524,22 @@ let
sha512 = "MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg==";
};
};
- "@schematics/angular-9.0.2" = {
+ "@schematics/angular-9.0.3" = {
name = "_at_schematics_slash_angular";
packageName = "@schematics/angular";
- version = "9.0.2";
+ version = "9.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.0.2.tgz";
- sha512 = "H6ZyxLYoIN68bbNKnUjBCPtB0fcwnpIyTkqXQHa3B4HITcU3uee4PLAl3xCkTS2NGv8m/0eWND9zt5wryGf8PQ==";
+ url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.0.3.tgz";
+ sha512 = "6XSnPW4G7aoKXccg0FTpZ02y/yi9y/bj7swnSL9Z4RRPIvPVapDjB7uJPg8sm8+PTIpcMhEFQrchIqM3LXW4zA==";
};
};
- "@schematics/update-0.900.2" = {
+ "@schematics/update-0.900.3" = {
name = "_at_schematics_slash_update";
packageName = "@schematics/update";
- version = "0.900.2";
+ version = "0.900.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@schematics/update/-/update-0.900.2.tgz";
- sha512 = "CRDb2pax8DtSyO32b2D5uKlQZ+s5h9feD4oEMvm2zU7z/4wcoTNC0T9ols20aHYeNhKYD9FuMI3KQWlgMTPgbw==";
+ url = "https://registry.npmjs.org/@schematics/update/-/update-0.900.3.tgz";
+ sha512 = "mlRsm3/HM1f/10Wdz4xMYA+mpW3EDCB+whlV5cJ7PGMhjUMaxA9DuWvoP06h05le6XmgnjIEoxL6NJ7CgesHcA==";
};
};
"@serverless/cli-1.4.0" = {
@@ -2524,13 +2569,13 @@ let
sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ==";
};
};
- "@serverless/enterprise-plugin-3.4.0" = {
+ "@serverless/enterprise-plugin-3.4.1" = {
name = "_at_serverless_slash_enterprise-plugin";
packageName = "@serverless/enterprise-plugin";
- version = "3.4.0";
+ version = "3.4.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.4.0.tgz";
- sha512 = "QaJUQwtej6LsBlmPldPYNHOApjrHrpGvreVcXy2GBqr0hpPFy+o2xmSKek+NDjmpyzHraeHKb5DoKemTWUxsTg==";
+ url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.4.1.tgz";
+ sha512 = "xo887e8GdumWY4iUxlgm3vrIZqVxFXvYk/fGORS+uTa4QG5t6iiJlPy7P0S8KKr90UBWE3eSg9w4tGAgVw2fIg==";
};
};
"@serverless/event-mocks-1.1.1" = {
@@ -2632,6 +2677,15 @@ let
sha512 = "JZvsmhDXSyjv1dkc12lPI3tNTNYlIaOiIQMYFg2RgqF3QmWjTyBUgRZcF7LoKyufHtS4dIudM6k1aHBpSaDrhw==";
};
};
+ "@snyk/cli-interface-2.3.2" = {
+ name = "_at_snyk_slash_cli-interface";
+ packageName = "@snyk/cli-interface";
+ version = "2.3.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.3.2.tgz";
+ sha512 = "jmZyxVHqzYU1GfdnWCGdd68WY/lAzpPVyqalHazPj4tFJehrSfEFc82RMTYAMgXEJuvFRFIwhsvXh3sWUhIQmg==";
+ };
+ };
"@snyk/cocoapods-lockfile-parser-3.0.0" = {
name = "_at_snyk_slash_cocoapods-lockfile-parser";
packageName = "@snyk/cocoapods-lockfile-parser";
@@ -2965,6 +3019,42 @@ let
sha512 = "dBtBbrc+qTHy1WdfHYjBwRln4+LWqASWakLHsWHR2NWHIFkv4W3O070IGoGLEBrJBvct3r0L1BUPuvURi7kYUQ==";
};
};
+ "@types/babel__core-7.1.6" = {
+ name = "_at_types_slash_babel__core";
+ packageName = "@types/babel__core";
+ version = "7.1.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.6.tgz";
+ sha512 = "tTnhWszAqvXnhW7m5jQU9PomXSiKXk2sFxpahXvI20SZKu9ylPi8WtIxueZ6ehDWikPT0jeFujMj3X4ZHuf3Tg==";
+ };
+ };
+ "@types/babel__generator-7.6.1" = {
+ name = "_at_types_slash_babel__generator";
+ packageName = "@types/babel__generator";
+ version = "7.6.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.1.tgz";
+ sha512 = "bBKm+2VPJcMRVwNhxKu8W+5/zT7pwNEqeokFOmbvVSqGzFneNxYcEBro9Ac7/N9tlsaPYnZLK8J1LWKkMsLAew==";
+ };
+ };
+ "@types/babel__template-7.0.2" = {
+ name = "_at_types_slash_babel__template";
+ packageName = "@types/babel__template";
+ version = "7.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.2.tgz";
+ sha512 = "/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==";
+ };
+ };
+ "@types/babel__traverse-7.0.9" = {
+ name = "_at_types_slash_babel__traverse";
+ packageName = "@types/babel__traverse";
+ version = "7.0.9";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.9.tgz";
+ sha512 = "jEFQ8L1tuvPjOI8lnpaf73oCJe+aoxL6ygqSy6c8LcW98zaC+4mzWuQIRCEvKeCOu+lbqdXcg4Uqmm1S8AP1tw==";
+ };
+ };
"@types/babylon-6.16.5" = {
name = "_at_types_slash_babylon";
packageName = "@types/babylon";
@@ -3064,6 +3154,15 @@ let
sha512 = "EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==";
};
};
+ "@types/estree-0.0.42" = {
+ name = "_at_types_slash_estree";
+ packageName = "@types/estree";
+ version = "0.0.42";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.42.tgz";
+ sha512 = "K1DPVvnBCPxzD+G51/cxVIoc2X8uUVl1zpJeE6iKcgHMj4+tbat5Xu4TjV7v2QSDbIeAfLi2hIk+u2+s0MlpUQ==";
+ };
+ };
"@types/events-3.0.0" = {
name = "_at_types_slash_events";
packageName = "@types/events";
@@ -3136,6 +3235,42 @@ let
sha512 = "c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A==";
};
};
+ "@types/istanbul-lib-coverage-2.0.1" = {
+ name = "_at_types_slash_istanbul-lib-coverage";
+ packageName = "@types/istanbul-lib-coverage";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz";
+ sha512 = "hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==";
+ };
+ };
+ "@types/istanbul-lib-report-3.0.0" = {
+ name = "_at_types_slash_istanbul-lib-report";
+ packageName = "@types/istanbul-lib-report";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz";
+ sha512 = "plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==";
+ };
+ };
+ "@types/istanbul-reports-1.1.1" = {
+ name = "_at_types_slash_istanbul-reports";
+ packageName = "@types/istanbul-reports";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz";
+ sha512 = "UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==";
+ };
+ };
+ "@types/jquery-3.3.33" = {
+ name = "_at_types_slash_jquery";
+ packageName = "@types/jquery";
+ version = "3.3.33";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.33.tgz";
+ sha512 = "U6IdXYGkfUI42SR79vB2Spj+h1Ly3J3UZjpd8mi943lh126TK7CB+HZOxGh2nM3IySor7wqVQdemD/xtydsBKA==";
+ };
+ };
"@types/js-yaml-3.12.2" = {
name = "_at_types_slash_js-yaml";
packageName = "@types/js-yaml";
@@ -3163,13 +3298,13 @@ let
sha512 = "MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw==";
};
};
- "@types/koa-2.11.1" = {
+ "@types/koa-2.11.2" = {
name = "_at_types_slash_koa";
packageName = "@types/koa";
- version = "2.11.1";
+ version = "2.11.2";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/koa/-/koa-2.11.1.tgz";
- sha512 = "/kqQs+8Qd9GL0cdl39HEhK91k7xq6+Zci76RUdqtTLj1Mg1aVG7zwJm3snkeyFUeAvY8noY27eMXgqg1wHZgwA==";
+ url = "https://registry.npmjs.org/@types/koa/-/koa-2.11.2.tgz";
+ sha512 = "2UPelagNNW6bnc1I5kIzluCaheXRA9S+NyOdXEFFj9Az7jc15ek5V03kb8OTbb3tdZ5i2BIJObe86PhHvpMolg==";
};
};
"@types/koa-compose-3.2.5" = {
@@ -3226,22 +3361,22 @@ let
sha1 = "69a23a3ad29caf0097f06eda59b361ee2f0639f6";
};
};
- "@types/node-10.17.15" = {
+ "@types/node-10.17.16" = {
name = "_at_types_slash_node";
packageName = "@types/node";
- version = "10.17.15";
+ version = "10.17.16";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/node/-/node-10.17.15.tgz";
- sha512 = "daFGV9GSs6USfPgxceDA8nlSe48XrVCJfDeYm7eokxq/ye7iuOH87hKXgMtEAVLFapkczbZsx868PMDT1Y0a6A==";
+ url = "https://registry.npmjs.org/@types/node/-/node-10.17.16.tgz";
+ sha512 = "A4283YSA1OmnIivcpy/4nN86YlnKRiQp8PYwI2KdPCONEBN093QTb0gCtERtkLyVNGKKIGazTZ2nAmVzQU51zA==";
};
};
- "@types/node-13.7.1" = {
+ "@types/node-13.7.5" = {
name = "_at_types_slash_node";
packageName = "@types/node";
- version = "13.7.1";
+ version = "13.7.5";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/node/-/node-13.7.1.tgz";
- sha512 = "Zq8gcQGmn4txQEJeiXo/KiLpon8TzAl0kmKH4zdWctPj05nWwp1ClMdAVEloqrQKfaC48PNLdgN/aVaLqUrluA==";
+ url = "https://registry.npmjs.org/@types/node/-/node-13.7.5.tgz";
+ sha512 = "PfSBCTQhAQg6QBP4UhXgrZ/wQ3pjfwBr4sA7Aul+pC9XwGgm9ezrJF7OiC/I4Kf+7VPu/5ThKngAruqxyctZfA==";
};
};
"@types/node-6.14.9" = {
@@ -3289,6 +3424,15 @@ let
sha512 = "ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==";
};
};
+ "@types/resolve-0.0.8" = {
+ name = "_at_types_slash_resolve";
+ packageName = "@types/resolve";
+ version = "0.0.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz";
+ sha512 = "auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==";
+ };
+ };
"@types/responselike-1.0.0" = {
name = "_at_types_slash_responselike";
packageName = "@types/responselike";
@@ -3325,6 +3469,15 @@ let
sha512 = "oprSwp094zOglVrXdlo/4bAHtKTAxX6VT8FOZlBKrmyLbNvE1zxZyJ6yikMVtHIvwP45+ZQGJn+FdXGKTozq0g==";
};
};
+ "@types/sizzle-2.3.2" = {
+ name = "_at_types_slash_sizzle";
+ packageName = "@types/sizzle";
+ version = "2.3.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz";
+ sha512 = "7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==";
+ };
+ };
"@types/superagent-3.8.2" = {
name = "_at_types_slash_superagent";
packageName = "@types/superagent";
@@ -3379,6 +3532,24 @@ let
sha512 = "Pv2HGRE4gWLs31In7nsyXEH4uVVsd0HNV9i2dyASvtDIlOtSTr1eczPLDpdEuyv5LWH5LT20GIXwPjkshKWI1g==";
};
};
+ "@types/yargs-15.0.4" = {
+ name = "_at_types_slash_yargs";
+ packageName = "@types/yargs";
+ version = "15.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.4.tgz";
+ sha512 = "9T1auFmbPZoxHz0enUFlUuKRy3it01R+hlggyVUMtnCTQRunsQYifnSGb8hET4Xo8yiC0o0r1paW3ud5+rbURg==";
+ };
+ };
+ "@types/yargs-parser-15.0.0" = {
+ name = "_at_types_slash_yargs-parser";
+ packageName = "@types/yargs-parser";
+ version = "15.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz";
+ sha512 = "FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==";
+ };
+ };
"@types/zen-observable-0.8.0" = {
name = "_at_types_slash_zen-observable";
packageName = "@types/zen-observable";
@@ -4495,13 +4666,13 @@ let
sha512 = "TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==";
};
};
- "ajv-6.11.0" = {
+ "ajv-6.12.0" = {
name = "ajv";
packageName = "ajv";
- version = "6.11.0";
+ version = "6.12.0";
src = fetchurl {
- url = "https://registry.npmjs.org/ajv/-/ajv-6.11.0.tgz";
- sha512 = "nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==";
+ url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz";
+ sha512 = "D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==";
};
};
"ajv-6.5.3" = {
@@ -4990,13 +5161,13 @@ let
sha512 = "sbLEIMQrkV7RkIruqTPXxeCMkAAycv4yzTkBzRgOR1BrR5UB7qZtupqxkersTJSf0HZ3sbaNRrNV80TnnM7cUw==";
};
};
- "apollo-2.22.1" = {
+ "apollo-2.23.0" = {
name = "apollo";
packageName = "apollo";
- version = "2.22.1";
+ version = "2.23.0";
src = fetchurl {
- url = "https://registry.npmjs.org/apollo/-/apollo-2.22.1.tgz";
- sha512 = "FONVPKvK0gg+loWCh7KOAAa/HlvbKcR7pdiC3Mtpohe3RWKqKb/QLsBPHjCgz1mjVyVL+05Cv/SjnQ9WHUO6/g==";
+ url = "https://registry.npmjs.org/apollo/-/apollo-2.23.0.tgz";
+ sha512 = "X6BKom6trsIOpn0AuH811HWMi2DyL/KvQ09yd5h2V726SD09jhzaNrR/1m/3RI7bVRTFHK4xncn1V3Z8KKRduQ==";
};
};
"apollo-cache-1.3.4" = {
@@ -5053,13 +5224,13 @@ let
sha512 = "sanUIqXWyyDpxY3fYOVU+Hsxwxdj5fmn3Zcy6CcMGnWmh9o7tautQAuod2a63wrDs1jcNQcFq3EKIpeB+2xECw==";
};
};
- "apollo-codegen-core-0.36.1" = {
+ "apollo-codegen-core-0.36.2" = {
name = "apollo-codegen-core";
packageName = "apollo-codegen-core";
- version = "0.36.1";
+ version = "0.36.2";
src = fetchurl {
- url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.36.1.tgz";
- sha512 = "PSucYRG29+BAnQE8A4KhGqUK0LdFfAiep8az1qNDq6RDfqVhdqzMF32ZpQWuEx7cz4YTRcBs9cg2/ZjXxAgJwA==";
+ url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.36.2.tgz";
+ sha512 = "XQMOg4eUlEBEGCLTaqwu89gP/BdHwBMKUQPeo+voWhRI3D0ZxP4CfmCZ5khf0M4peh1OiTDG30hSn4DPzSOloA==";
};
};
"apollo-codegen-flow-0.20.0" = {
@@ -5071,13 +5242,13 @@ let
sha512 = "XgKE19B0Q74PBLVqHP/77NcCFrcvrN9wi3CcotH+FV8BeHTjvpHlilTsQMmd2STPt19cCvY2Qtz0EOeLXTUQ2Q==";
};
};
- "apollo-codegen-flow-0.34.1" = {
+ "apollo-codegen-flow-0.34.2" = {
name = "apollo-codegen-flow";
packageName = "apollo-codegen-flow";
- version = "0.34.1";
+ version = "0.34.2";
src = fetchurl {
- url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.34.1.tgz";
- sha512 = "q28f5rY+KwVWNoPyTJHSSJfA+y9JdXFxvzDZNQ7odUKuLZRDJSswYZkBYk/Nq/rkl7RwOJ7qgwEG6AxhPMvH1g==";
+ url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.34.2.tgz";
+ sha512 = "gba1iSDAetw+c+/Ip/zYKoUsO7mGcTGJCgzoH+Q0Ww6KpKiIvg5PppBVhsg2sleomgL7gnGx2juqx6dAj1iSTg==";
};
};
"apollo-codegen-flow-legacy-0.20.0" = {
@@ -5098,13 +5269,13 @@ let
sha512 = "NbnMOfUXXovlTGRj4mIZGXB9HvidQhwKfAmdYHox5peHPkjjsqEzxGCIuWCSnubWiCF2uHZnQoIkg4sXWf0KLw==";
};
};
- "apollo-codegen-scala-0.35.1" = {
+ "apollo-codegen-scala-0.35.2" = {
name = "apollo-codegen-scala";
packageName = "apollo-codegen-scala";
- version = "0.35.1";
+ version = "0.35.2";
src = fetchurl {
- url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.35.1.tgz";
- sha512 = "9yywcpwZiclKRXXSFGYuJcQIOTlPyPKSYH/+Rls1Vu5CafPGgkhIJQLtvtc80PJMaK1vmYVvsrDsAO91Tu/frw==";
+ url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.35.2.tgz";
+ sha512 = "Wq+WF8p1SGEqgkWJuTDsGMX16VzWxsJE/Nsy/BystG0Ys9RuhG4lPmpEpLYqsMX0O4OyWet+Yvio/H4xzOZQIA==";
};
};
"apollo-codegen-swift-0.20.0" = {
@@ -5116,13 +5287,13 @@ let
sha512 = "L9Y4StbXw0t/nuF+miz0ybSt/io6tsLc063Yeh1A8GCvhFFQyXE/yK0Rf3nO1Bl5Z9UZ5o8Aae9kK4GSWYIGNQ==";
};
};
- "apollo-codegen-swift-0.36.1" = {
+ "apollo-codegen-swift-0.36.2" = {
name = "apollo-codegen-swift";
packageName = "apollo-codegen-swift";
- version = "0.36.1";
+ version = "0.36.2";
src = fetchurl {
- url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.36.1.tgz";
- sha512 = "no5bq4xiTqeT591bpGTdy3ATfflmmQXc9h6q935lVrak5uqGigd72RPWHNeN/BbnGg6khaL9jBbSs2+VqrOGug==";
+ url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.36.2.tgz";
+ sha512 = "fzoMb9YIk9z2IPyf7hPFyooQfbEtSl/EOKjILsqRIO7HTD7B0Vup/Jbu7W5GrwYZAsZH3MU1IpdULRfVNoIOhw==";
};
};
"apollo-codegen-typescript-0.20.0" = {
@@ -5134,13 +5305,13 @@ let
sha512 = "mzlIJXz+5WPwzeALqRHHR9aPPEf6IlhSrjCawpUHmFU1NK9hgwbguYCEYZv9mKkYBUUgDY+9cGFK1cafJX70AQ==";
};
};
- "apollo-codegen-typescript-0.36.1" = {
+ "apollo-codegen-typescript-0.36.2" = {
name = "apollo-codegen-typescript";
packageName = "apollo-codegen-typescript";
- version = "0.36.1";
+ version = "0.36.2";
src = fetchurl {
- url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.36.1.tgz";
- sha512 = "iQ2FGxA9Neb5728eqtvC9J4Ig6heOEMdgVcfsIrUQRTRKiPp7iIKc2DS8ReMX6LMdRhm000ldcquJFQJldFjLg==";
+ url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.36.2.tgz";
+ sha512 = "DuoDVP8DiiucXCT17rkP8fUPGF+oqCwNt3/PdywVc7pokQfYMHhJJPxVNzIWJZ7Pqs4eD25VoJCp40DLIkLAfA==";
};
};
"apollo-codegen-typescript-legacy-0.20.0" = {
@@ -5197,13 +5368,13 @@ let
sha512 = "abCHcKln1EGbzSItW087EjBI5wnluikyUqEn4VsdeWHCtdENWpHCn/MnM0+jJa1prNasxN7tCukp4nMpJYYVqg==";
};
};
- "apollo-language-server-1.19.1" = {
+ "apollo-language-server-1.19.2" = {
name = "apollo-language-server";
packageName = "apollo-language-server";
- version = "1.19.1";
+ version = "1.19.2";
src = fetchurl {
- url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.19.1.tgz";
- sha512 = "Xq9DL+7rl1I78hU5TTJG1zxfPWbz08l/XOthI+rCEhzhIFafzOlUjrtJziuYr1AmAAjA9CJLzaaUDC9ixm+Sfw==";
+ url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.19.2.tgz";
+ sha512 = "ZPMlqwVaAN96LGZiliW1ALbGFkZ6N0jYowhvM9SMlqNzKzIKCVi3mUjNAcIB0CIP4YvgLjUfL0IqUE7qw/ZOHw==";
};
};
"apollo-link-1.2.13" = {
@@ -5368,15 +5539,6 @@ let
sha512 = "F14aX2R/fKNYMvhuP2t9GD9fggID7zp5I96MF5QeKYWDWTrkRdHRp4+SVfXUVN+cXOaB/IebfvRtzPf25CM0zw==";
};
};
- "app-builder-5.2.0" = {
- name = "app-builder";
- packageName = "app-builder";
- version = "5.2.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/app-builder/-/app-builder-5.2.0.tgz";
- sha512 = "RRj/vu8WhmMM71G9BxMLRvcwpr1QUJZ9NXURGGo1v3fPiauzkQfNi31kM7irRNqR87NV+lJ/qI62iTzcAc+V0Q==";
- };
- };
"app-module-path-2.2.0" = {
name = "app-module-path";
packageName = "app-module-path";
@@ -5944,13 +6106,13 @@ let
sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428";
};
};
- "array.prototype.find-2.1.0" = {
+ "array.prototype.find-2.1.1" = {
name = "array.prototype.find";
packageName = "array.prototype.find";
- version = "2.1.0";
+ version = "2.1.1";
src = fetchurl {
- url = "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.1.0.tgz";
- sha512 = "Wn41+K1yuO5p7wRZDl7890c3xvv5UBrfVXTVIe28rSQb6LS0fZMDrQB6PAcxQFRFy6vJTLDc3A2+3CjQdzVKRg==";
+ url = "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.1.1.tgz";
+ sha512 = "mi+MYNJYLTx2eNYy+Yh6raoQacCsNeeMUaspFPh9Y141lFSsWxxB8V9mM2ye+eqiRs917J6/pJ4M9ZPzenWckA==";
};
};
"arraybuffer.slice-0.0.6" = {
@@ -6268,6 +6430,15 @@ let
sha512 = "X5Dj8hK1pJNC2Wzo2Rcp9FBVdJMGRR/S7V+lH46s8GVFhtbo5O4Le5GECCF/8PISVdkUA6mMPvgz7qTTD1rf1g==";
};
};
+ "async-3.2.0" = {
+ name = "async";
+ packageName = "async";
+ version = "3.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/async/-/async-3.2.0.tgz";
+ sha512 = "TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==";
+ };
+ };
"async-done-1.3.2" = {
name = "async-done";
packageName = "async-done";
@@ -6457,13 +6628,13 @@ let
sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
};
};
- "aws-sdk-2.620.0" = {
+ "aws-sdk-2.626.0" = {
name = "aws-sdk";
packageName = "aws-sdk";
- version = "2.620.0";
+ version = "2.626.0";
src = fetchurl {
- url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.620.0.tgz";
- sha512 = "j+PGKbYwk5OjzbCFbxzRkcJVEvfdn9YFkrU8dJdjleYf9AzUSUpTjMyZsyUPOKxJxdNdA9FYTs43WdtSKHZa0A==";
+ url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.626.0.tgz";
+ sha512 = "1D5slT34OI1NseXLszpWwZ+N/Jla8BsY+XsGDH/4yNDDN8Cf+8zKb1AqqSw4T4onz9xhoTHWCTWqTLDL+8XAnw==";
};
};
"aws-sign2-0.6.0" = {
@@ -6529,13 +6700,13 @@ let
sha512 = "poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==";
};
};
- "babel-eslint-10.0.1" = {
+ "babel-eslint-10.0.3" = {
name = "babel-eslint";
packageName = "babel-eslint";
- version = "10.0.1";
+ version = "10.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.0.1.tgz";
- sha512 = "z7OT1iNV+TjOwHNLLyJk+HN+YVWX+CLE6fPD2SymJZOZQBs+QIexFjhm4keGTm8MW9xr4EC9Q0PbaLB24V5GoQ==";
+ url = "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.0.3.tgz";
+ sha512 = "z3U7eMY6r/3f3/JB9mTsLjyxrv0Yb1zb8PCWCLpguxfCzBIZUwy23R1t/XKewP+8mEN2Ck8Dtr4q20z6ce6SoA==";
};
};
"babel-generator-6.26.1" = {
@@ -6628,13 +6799,13 @@ let
sha1 = "3471de9caec388e5c850e597e58a26ddf37602b2";
};
};
- "babel-jest-23.6.0" = {
+ "babel-jest-25.1.0" = {
name = "babel-jest";
packageName = "babel-jest";
- version = "23.6.0";
+ version = "25.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/babel-jest/-/babel-jest-23.6.0.tgz";
- sha512 = "lqKGG6LYXYu+DQh/slrQ8nxXQkEkhugdXsU6St7GmhVS7Ilc/22ArwqXNJrf0QaOBjZB0360qZMwXqDYQHXaew==";
+ url = "https://registry.npmjs.org/babel-jest/-/babel-jest-25.1.0.tgz";
+ sha512 = "tz0VxUhhOE2y+g8R2oFrO/2VtVjA1lkJeavlhExuRBg3LdNJY9gwQ+Vcvqt9+cqy71MCTJhewvTB7Qtnnr9SWg==";
};
};
"babel-loader-8.0.6" = {
@@ -6664,22 +6835,22 @@ let
sha512 = "o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==";
};
};
- "babel-plugin-istanbul-4.1.6" = {
+ "babel-plugin-istanbul-6.0.0" = {
name = "babel-plugin-istanbul";
packageName = "babel-plugin-istanbul";
- version = "4.1.6";
+ version = "6.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz";
- sha512 = "PWP9FQ1AhZhS01T/4qLSKoHGY/xvkZdVBGlKM/HuxxS3+sC66HhTNR7+MpbO/so/cz/wY94MeSWJuP1hXIPfwQ==";
+ url = "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz";
+ sha512 = "AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==";
};
};
- "babel-plugin-jest-hoist-23.2.0" = {
+ "babel-plugin-jest-hoist-25.1.0" = {
name = "babel-plugin-jest-hoist";
packageName = "babel-plugin-jest-hoist";
- version = "23.2.0";
+ version = "25.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.2.0.tgz";
- sha1 = "e61fae05a1ca8801aadee57a6d66b8cefaf44167";
+ url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.1.0.tgz";
+ sha512 = "oIsopO41vW4YFZ9yNYoLQATnnN46lp+MZ6H4VvPKFkcc2/fkl3CfE/NZZSmnEIEsJRmJAgkVEK0R7Zbl50CpTw==";
};
};
"babel-plugin-minify-builtins-0.5.0" = {
@@ -6952,13 +7123,13 @@ let
sha1 = "379937abc67d7895970adc621f284cd966cf2153";
};
};
- "babel-preset-jest-23.2.0" = {
+ "babel-preset-jest-25.1.0" = {
name = "babel-preset-jest";
packageName = "babel-preset-jest";
- version = "23.2.0";
+ version = "25.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-23.2.0.tgz";
- sha1 = "8ec7a03a138f001a1a8fb1e8113652bf1a55da46";
+ url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.1.0.tgz";
+ sha512 = "eCGn64olaqwUMaugXsTtGAM2I0QTahjEtnRu0ql8Ie+gDWAc1N6wqN0k2NilnyTunM69Pad7gJY7LOtwLimoFQ==";
};
};
"babel-preset-minify-0.5.1" = {
@@ -7015,6 +7186,15 @@ let
sha1 = "a3b073f94ab49eb6fa55cd65227a334380632497";
};
};
+ "babybird-0.0.1" = {
+ name = "babybird";
+ packageName = "babybird";
+ version = "0.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babybird/-/babybird-0.0.1.tgz";
+ sha1 = "da80c79c6d7441cdfec7c2ff2dcbd7c13ebdbea2";
+ };
+ };
"babylon-6.18.0" = {
name = "babylon";
packageName = "babylon";
@@ -8203,6 +8383,15 @@ let
sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298";
};
};
+ "browserify-zlib-0.1.4" = {
+ name = "browserify-zlib";
+ packageName = "browserify-zlib";
+ version = "0.1.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz";
+ sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d";
+ };
+ };
"browserify-zlib-0.2.0" = {
name = "browserify-zlib";
packageName = "browserify-zlib";
@@ -8221,6 +8410,15 @@ let
sha512 = "gFOnZNYBHrEyUML0xr5NJ6edFaaKbTFX9S9kQHlYfCP0Rit/boRIz4G+Avq6/4haEKJXdGGUnoolx+5MWW2BoA==";
};
};
+ "bser-2.1.1" = {
+ name = "bser";
+ packageName = "bser";
+ version = "2.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz";
+ sha512 = "gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==";
+ };
+ };
"btoa-lite-1.0.0" = {
name = "btoa-lite";
packageName = "btoa-lite";
@@ -8482,15 +8680,6 @@ let
sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f";
};
};
- "builtin-modules-2.0.0" = {
- name = "builtin-modules";
- packageName = "builtin-modules";
- version = "2.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-2.0.0.tgz";
- sha512 = "3U5kUA5VPsRUA3nofm/BXX7GVHKfxz0hOBAPxXrIvHzlDRkQVqEn6yi8QJegxl4LzOHLdvb7XF5dVawa/VVYBg==";
- };
- };
"builtin-modules-3.1.0" = {
name = "builtin-modules";
packageName = "builtin-modules";
@@ -8545,6 +8734,15 @@ let
sha1 = "f150f0f6748abdd72aeae84f04403be2ef113797";
};
};
+ "bunyan-syslog-udp-0.2.0" = {
+ name = "bunyan-syslog-udp";
+ packageName = "bunyan-syslog-udp";
+ version = "0.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/bunyan-syslog-udp/-/bunyan-syslog-udp-0.2.0.tgz";
+ sha512 = "tY6iaw+iYbCjlsAgAyO4CeA7Usnj5VndygMfd2PcHK++626oMoHANcdsH5tq5VxRPsbk9M1fbuk0a5pX9axV2w==";
+ };
+ };
"busboy-0.2.14" = {
name = "busboy";
packageName = "busboy";
@@ -8932,13 +9130,22 @@ let
sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";
};
};
- "caniuse-lite-1.0.30001027" = {
+ "caniuse-lite-1.0.30001030" = {
name = "caniuse-lite";
packageName = "caniuse-lite";
- version = "1.0.30001027";
+ version = "1.0.30001030";
src = fetchurl {
- url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001027.tgz";
- sha512 = "7xvKeErvXZFtUItTHgNtLgS9RJpVnwBlWX8jSo/BO8VsF6deszemZSkJJJA1KOKrXuzZH4WALpAJdq5EyfgMLg==";
+ url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001030.tgz";
+ sha512 = "QGK0W4Ft/Ac+zTjEiRJfwDNATvS3fodDczBXrH42784kcfqcDKpEPfN08N0HQjrAp8He/Jw8QiSS9QRn7XAbUw==";
+ };
+ };
+ "capture-exit-2.0.0" = {
+ name = "capture-exit";
+ packageName = "capture-exit";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz";
+ sha512 = "PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==";
};
};
"capture-stack-trace-1.0.1" = {
@@ -9310,15 +9517,6 @@ let
sha512 = "0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA==";
};
};
- "cherow-1.6.9" = {
- name = "cherow";
- packageName = "cherow";
- version = "1.6.9";
- src = fetchurl {
- url = "https://registry.npmjs.org/cherow/-/cherow-1.6.9.tgz";
- sha512 = "pmmkpIQRcnDA7EawKcg9+ncSZNTYfXqDx+K3oqqYvpZlqVBChjTomTfw+hePnkqYR3Y013818c0R1Q5P/7PGrQ==";
- };
- };
"child-process-ext-2.1.0" = {
name = "child-process-ext";
packageName = "child-process-ext";
@@ -9589,6 +9787,15 @@ let
sha512 = "UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==";
};
};
+ "clarinet-0.11.0" = {
+ name = "clarinet";
+ packageName = "clarinet";
+ version = "0.11.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/clarinet/-/clarinet-0.11.0.tgz";
+ sha1 = "6cc912b93138dc867fc273cd34ea90e83e054719";
+ };
+ };
"class-utils-0.3.6" = {
name = "class-utils";
packageName = "class-utils";
@@ -10858,13 +11065,13 @@ let
sha512 = "bzlVWS2THbMetHqXKB8ypsXN4DQ/1qopGwNJi1eYbpwesJcd86FBjFciCQX/YwAhp9bM7NVnPFqZ5LpV7gP0Dg==";
};
};
- "conf-6.2.0" = {
+ "conf-6.2.1" = {
name = "conf";
packageName = "conf";
- version = "6.2.0";
+ version = "6.2.1";
src = fetchurl {
- url = "https://registry.npmjs.org/conf/-/conf-6.2.0.tgz";
- sha512 = "fvl40R6YemHrFsNiyP7TD0tzOe3pQD2dfT2s20WvCaq57A1oV+RImbhn2Y4sQGDz1lB0wNSb7dPcPIvQB69YNA==";
+ url = "https://registry.npmjs.org/conf/-/conf-6.2.1.tgz";
+ sha512 = "GbPshJUwZY8/+WXTLLyJplzCVAljX0vECBdUy1Es8npc8naGIEivexdhZP2zt8x/REzgtB9IONaB+ZNB9Ciz6w==";
};
};
"config-1.31.0" = {
@@ -10948,6 +11155,15 @@ let
sha512 = "ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==";
};
};
+ "connect-busboy-0.0.2" = {
+ name = "connect-busboy";
+ packageName = "connect-busboy";
+ version = "0.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/connect-busboy/-/connect-busboy-0.0.2.tgz";
+ sha1 = "ac5c9c96672171885e576c66b2bfd95d3bb11097";
+ };
+ };
"connect-history-api-fallback-1.6.0" = {
name = "connect-history-api-fallback";
packageName = "connect-history-api-fallback";
@@ -11110,6 +11326,16 @@ let
sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==";
};
};
+ "content-type-git+https://github.com/wikimedia/content-type.git#master" = {
+ name = "content-type";
+ packageName = "content-type";
+ version = "1.0.1";
+ src = fetchgit {
+ url = "https://github.com/wikimedia/content-type.git";
+ rev = "47b2632d0a2ee79a7d67268e2f6621becd95d05b";
+ sha256 = "e583031138b98e2a09ce14dbd72afa0377201894092c941ef4cc07206c35ed04";
+ };
+ };
"content-types-0.1.0" = {
name = "content-types";
packageName = "content-types";
@@ -11596,13 +11822,13 @@ let
sha512 = "0Cbj7gyvFVApzpK/uhCtQ/9kE9UnYpxMzaq5nQQC/Dh4iaj5fxp7iEFIullrYwzj8nf0qnsI1Qsx34hAeAebvw==";
};
};
- "cpy-8.0.0" = {
+ "cpy-8.0.1" = {
name = "cpy";
packageName = "cpy";
- version = "8.0.0";
+ version = "8.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/cpy/-/cpy-8.0.0.tgz";
- sha512 = "iTjLUqtVr45e17GFAyxA0lqFinbGMblMCTtAqrPzT/IETNtDuyyhDDk8weEZ08MiCc6EcuyNq2KtGH5J2BIAoQ==";
+ url = "https://registry.npmjs.org/cpy/-/cpy-8.0.1.tgz";
+ sha512 = "XplonbFkGld3KST+wKFutU+Al3srtT9RaeLTJeRY47QzzLDlA5kpK4s+o0DdgRx7W0cdkifOehGnCBCGIFfdeg==";
};
};
"crc-0.2.0" = {
@@ -11722,15 +11948,6 @@ let
sha512 = "+SaJ2OfeRvfQqwXQ2kgr0Y5pzBR/lijf5OpnnaruwWnmI799JfWr2jN2ItOV9s3A/+TFOt6mxvKzQq5F0Jp6VQ==";
};
};
- "cross-env-5.2.0" = {
- name = "cross-env";
- packageName = "cross-env";
- version = "5.2.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz";
- sha512 = "jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==";
- };
- };
"cross-env-6.0.3" = {
name = "cross-env";
packageName = "cross-env";
@@ -11740,6 +11957,15 @@ let
sha512 = "+KqxF6LCvfhWvADcDPqo64yVIB31gv/jQulX2NGzKS/g3GEVz6/pt4wjHFtFWsHMddebWD/sDthJemzM4MaAag==";
};
};
+ "cross-env-7.0.0" = {
+ name = "cross-env";
+ packageName = "cross-env";
+ version = "7.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cross-env/-/cross-env-7.0.0.tgz";
+ sha512 = "rV6M9ldNgmwP7bx5u6rZsTbYidzwvrwIYZnT08hSGLcQCcggofgFW+sNe7IhA1SRauPS0QuLbbX+wdNtpqE5CQ==";
+ };
+ };
"cross-fetch-2.2.2" = {
name = "cross-fetch";
packageName = "cross-fetch";
@@ -11965,15 +12191,6 @@ let
sha512 = "DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==";
};
};
- "css-unit-converter-1.1.1" = {
- name = "css-unit-converter";
- packageName = "css-unit-converter";
- version = "1.1.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/css-unit-converter/-/css-unit-converter-1.1.1.tgz";
- sha1 = "d9b9281adcfd8ced935bdbaba83786897f64e996";
- };
- };
"css-what-2.1.3" = {
name = "css-what";
packageName = "css-what";
@@ -12010,15 +12227,6 @@ let
sha1 = "c814903e45623371a0477b40109aaafbeeaddbb4";
};
};
- "cssesc-2.0.0" = {
- name = "cssesc";
- packageName = "cssesc";
- version = "2.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz";
- sha512 = "MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==";
- };
- };
"cssesc-3.0.0" = {
name = "cssesc";
packageName = "cssesc";
@@ -12739,6 +12947,15 @@ let
sha512 = "vDPw+rDgn3bZe1+F/pyEwb1oMG2XTlRVgAa6B4KccTEpYgF8w6eQllVbQcfIJnZyvzFtFpxnpGtx8dd7DJp/Rw==";
};
};
+ "decimal.js-7.5.1" = {
+ name = "decimal.js";
+ packageName = "decimal.js";
+ version = "7.5.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/decimal.js/-/decimal.js-7.5.1.tgz";
+ sha512 = "1K5Y6MykxQYfHBcFfAj2uBaLmwreq4MsjsvrlgcEOvg+X82IeeXlIVIVkBMiypksu+yo9vcYP6lfU3qTedofSQ==";
+ };
+ };
"decode-uri-component-0.2.0" = {
name = "decode-uri-component";
packageName = "decode-uri-component";
@@ -13495,13 +13712,13 @@ let
sha512 = "Uv3SW8bmH9nAtHKaKSanOQmj2DnlH65fUpcrMdfdaOxUG02QQ4YGZ8AE7kKOMisF7UqvOlGKVYWRvezdncW9lg==";
};
};
- "diff2html-2.8.0" = {
+ "diff2html-3.1.2" = {
name = "diff2html";
packageName = "diff2html";
- version = "2.8.0";
+ version = "3.1.2";
src = fetchurl {
- url = "https://registry.npmjs.org/diff2html/-/diff2html-2.8.0.tgz";
- sha512 = "YDadfvH7ge833dKRGNr1gWZLa00tihMhwACUuQwrIQcPu/tnZ9t/Dq5W6fTQaKnLZ7iY7snGoyikTmF9mqBx+Q==";
+ url = "https://registry.npmjs.org/diff2html/-/diff2html-3.1.2.tgz";
+ sha512 = "yn4SXS6Em3Ml9ejsj8cWBcjWwSFOFwOd4Qd3U7pJHpyM3agY2lU+gxU2WedLxAgCMXffsublB96gG26efheCxQ==";
};
};
"diff3-0.0.3" = {
@@ -13729,6 +13946,15 @@ let
sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6";
};
};
+ "dnscache-1.0.2" = {
+ name = "dnscache";
+ packageName = "dnscache";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/dnscache/-/dnscache-1.0.2.tgz";
+ sha512 = "2FFKzmLGOnD+Y378bRKH+gTjRMuSpH7OKgPy31KjjfCoKZx7tU8Dmqfd/3fhG2d/4bppuN8/KtWMUZBAcUCRnQ==";
+ };
+ };
"dockerfile-ast-0.0.12" = {
name = "dockerfile-ast";
packageName = "dockerfile-ast";
@@ -13738,13 +13964,13 @@ let
sha512 = "cIV8oXkAxpIuN5XgG0TGg07nLDgrj4olkfrdT77OTA3VypscsYHBUg/FjHxW9K3oA+CyH4Th/qtoMgTVpzSobw==";
};
};
- "dockerfile-ast-0.0.18" = {
+ "dockerfile-ast-0.0.19" = {
name = "dockerfile-ast";
packageName = "dockerfile-ast";
- version = "0.0.18";
+ version = "0.0.19";
src = fetchurl {
- url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.18.tgz";
- sha512 = "SEp95qCox1KAzf8BBtjHoBDD0a7/eNlZJ6fgDf9RxqeSEDwLuEN9YjdZ/tRlkrYLxXR4i+kqZzS4eDRSqs8VKQ==";
+ url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.19.tgz";
+ sha512 = "iDRNFeAB2j4rh/Ecc2gh3fjciVifCMsszfCfHlYF5Wv8yybjZLiRDZUBt/pS3xrAz8uWT8fCHLq4pOQMmwCDwA==";
};
};
"dockerfile-ast-0.0.20" = {
@@ -13846,6 +14072,15 @@ let
sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==";
};
};
+ "dom-storage-2.1.0" = {
+ name = "dom-storage";
+ packageName = "dom-storage";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/dom-storage/-/dom-storage-2.1.0.tgz";
+ sha512 = "g6RpyWXzl0RR6OTElHKBl7nwnK87GUyZMYC7JWsB/IA73vpqK2K6LT39x4VepLxlSsWBFrPVLnsSR5Jyty0+2Q==";
+ };
+ };
"dom-walk-0.1.1" = {
name = "dom-walk";
packageName = "dom-walk";
@@ -13927,6 +14162,15 @@ let
sha512 = "JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==";
};
};
+ "domino-2.1.4" = {
+ name = "domino";
+ packageName = "domino";
+ version = "2.1.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/domino/-/domino-2.1.4.tgz";
+ sha512 = "l70mlQ7IjPKC8kT7GljQXJZmt5OqFL+RE91ik5y5WWQtsd9wP8R7gpFnNu96fK5MqAAZRXfLLsnzKtkty5fWGQ==";
+ };
+ };
"domutils-1.4.3" = {
name = "domutils";
packageName = "domutils";
@@ -14368,13 +14612,13 @@ let
sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==";
};
};
- "electron-to-chromium-1.3.353" = {
+ "electron-to-chromium-1.3.360" = {
name = "electron-to-chromium";
packageName = "electron-to-chromium";
- version = "1.3.353";
+ version = "1.3.360";
src = fetchurl {
- url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.353.tgz";
- sha512 = "CkG24biyy9qQTQs8U2vGQaiyWSFDxAXP/UGHBveXZ1TGoWOAw+eYZXryrX0UeIMKnQjcaHx33hzYuydv98kqGQ==";
+ url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.360.tgz";
+ sha512 = "RE1pv2sjQiDRRN1nI0fJ0eQHZ9le4oobu16OArnwEUV5ycAU5SNjFyvzjZ1gPUAqBa2Ud1XagtW8j3ZXfHuQHA==";
};
};
"elegant-spinner-1.0.1" = {
@@ -14495,6 +14739,15 @@ let
sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389";
};
};
+ "emojis-list-3.0.0" = {
+ name = "emojis-list";
+ packageName = "emojis-list";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz";
+ sha512 = "/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==";
+ };
+ };
"emphasize-1.5.0" = {
name = "emphasize";
packageName = "emphasize";
@@ -14594,13 +14847,13 @@ let
sha1 = "a432755ab4f51e7fc74f3a719c6b81df5d668bdc";
};
};
- "endent-1.4.0" = {
+ "endent-1.4.1" = {
name = "endent";
packageName = "endent";
- version = "1.4.0";
+ version = "1.4.1";
src = fetchurl {
- url = "https://registry.npmjs.org/endent/-/endent-1.4.0.tgz";
- sha512 = "V9cYHc4IcnE9hYCuZat9YVUxIsK3gLB3gEUnr07rqElI+3TB+yC/wmMTNZ7L4xDmDFwg4Lypl5Gc3i+23komhA==";
+ url = "https://registry.npmjs.org/endent/-/endent-1.4.1.tgz";
+ sha512 = "buHTb5c8AC9NshtP6dgmNLYkiT+olskbq1z6cEGvfGCF3Qphbu/1zz5Xu+yjTDln8RbxNhPoUyJ5H8MSrp1olQ==";
};
};
"ends-with-0.2.0" = {
@@ -15242,15 +15495,6 @@ let
sha512 = "MiIDOotoWseIfLIfGeDzF6sDvHkVvGd2JgkvjyHtN3q4RoxdAXrAMuI3SXTOKatljgacKwpNAYShmcKZa4yZzw==";
};
};
- "eslint-scope-3.7.1" = {
- name = "eslint-scope";
- packageName = "eslint-scope";
- version = "3.7.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz";
- sha1 = "3d63c3edfda02e06e01a452ad88caacc7cdcb6e8";
- };
- };
"eslint-scope-3.7.3" = {
name = "eslint-scope";
packageName = "eslint-scope";
@@ -15476,15 +15720,6 @@ let
sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==";
};
};
- "estree-walker-0.5.2" = {
- name = "estree-walker";
- packageName = "estree-walker";
- version = "0.5.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/estree-walker/-/estree-walker-0.5.2.tgz";
- sha512 = "XpCnW/AE10ws/kDAs37cngSkvgIR8aN3G0MS85m7dUpuK2EREo9VJ00uvw6Dg/hXEpfsE1I1TvJOJr+Z+TL+ig==";
- };
- };
"estree-walker-0.6.1" = {
name = "estree-walker";
packageName = "estree-walker";
@@ -15755,6 +15990,15 @@ let
sha512 = "FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==";
};
};
+ "exec-sh-0.3.4" = {
+ name = "exec-sh";
+ packageName = "exec-sh";
+ version = "0.3.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz";
+ sha512 = "sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==";
+ };
+ };
"execa-0.1.1" = {
name = "execa";
packageName = "execa";
@@ -15962,6 +16206,15 @@ let
sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==";
};
};
+ "express-handlebars-3.1.0" = {
+ name = "express-handlebars";
+ packageName = "express-handlebars";
+ version = "3.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/express-handlebars/-/express-handlebars-3.1.0.tgz";
+ sha512 = "7QlaXnSREMmN5P2o4gmpUZDfJlLtfBka9d6r7/ccXaU7rPp76odw9YYtwZYdIiha2JqwiaG6o2Wu6NZJQ0u7Fg==";
+ };
+ };
"express-history-api-fallback-2.2.1" = {
name = "express-history-api-fallback";
packageName = "express-history-api-fallback";
@@ -16466,6 +16719,15 @@ let
sha512 = "D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==";
};
};
+ "fb-watchman-2.0.1" = {
+ name = "fb-watchman";
+ packageName = "fb-watchman";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz";
+ sha512 = "DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==";
+ };
+ };
"fd-lock-1.0.2" = {
name = "fd-lock";
packageName = "fd-lock";
@@ -17060,22 +17322,22 @@ let
sha1 = "554440766da0a0d603999f433453f6c2fc6a75c1";
};
};
- "flow-bin-0.85.0" = {
+ "flow-bin-0.118.0" = {
name = "flow-bin";
packageName = "flow-bin";
- version = "0.85.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/flow-bin/-/flow-bin-0.85.0.tgz";
- sha512 = "ougBA2q6Rn9sZrjZQ9r5pTFxCotlGouySpD2yRIuq5AYwwfIT8HHhVMeSwrN5qJayjHINLJyrnsSkkPCZyfMrQ==";
- };
- };
- "flow-parser-0.118.0" = {
- name = "flow-parser";
- packageName = "flow-parser";
version = "0.118.0";
src = fetchurl {
- url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.118.0.tgz";
- sha512 = "PM3aKA5K3e5kK2hJPsSVdQD4/SVZUQni9qfB0+JHBCjqoAS5mSe3SlhLR9TlH3WDQccL0H2b6zpP8LjOzx9Wtg==";
+ url = "https://registry.npmjs.org/flow-bin/-/flow-bin-0.118.0.tgz";
+ sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg==";
+ };
+ };
+ "flow-parser-0.119.1" = {
+ name = "flow-parser";
+ packageName = "flow-parser";
+ version = "0.119.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.119.1.tgz";
+ sha512 = "yFd4z6ZBXq//TJo/gtSzGKhz6wEVeI2m+6JB25JzXuRAOhM5Ze4xFkc3FSIStbYjrAx4H1IUiUTI/yy30oKp8A==";
};
};
"fluent-ffmpeg-2.1.2" = {
@@ -17402,13 +17664,13 @@ let
sha1 = "ef5491490f9433b705faa77249c99029ae348559";
};
};
- "formidable-1.2.1" = {
+ "formidable-1.2.2" = {
name = "formidable";
packageName = "formidable";
- version = "1.2.1";
+ version = "1.2.2";
src = fetchurl {
- url = "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz";
- sha512 = "Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg==";
+ url = "https://registry.npmjs.org/formidable/-/formidable-1.2.2.tgz";
+ sha512 = "V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q==";
};
};
"forwarded-0.1.2" = {
@@ -17870,6 +18132,33 @@ let
sha512 = "BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==";
};
};
+ "gc-stats-1.4.0" = {
+ name = "gc-stats";
+ packageName = "gc-stats";
+ version = "1.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/gc-stats/-/gc-stats-1.4.0.tgz";
+ sha512 = "4FcCj9e8j8rCjvLkqRpGZBLgTC/xr9XEf5By3x77cDucWWB3pJK6FEwXZCTCbb4z8xdaOoi4owBNrvn3ciDdxA==";
+ };
+ };
+ "gelf-stream-1.1.1" = {
+ name = "gelf-stream";
+ packageName = "gelf-stream";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/gelf-stream/-/gelf-stream-1.1.1.tgz";
+ sha1 = "9cea9b6386ac301c741838ca3cb91e66dbfbf669";
+ };
+ };
+ "gelfling-0.3.1" = {
+ name = "gelfling";
+ packageName = "gelfling";
+ version = "0.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/gelfling/-/gelfling-0.3.1.tgz";
+ sha1 = "336a98f81510f9ae0af2a494e17468a116a9dc04";
+ };
+ };
"generate-function-1.1.0" = {
name = "generate-function";
packageName = "generate-function";
@@ -18284,13 +18573,13 @@ let
sha1 = "97fb5d96bfde8973313f20e8288ef9a167fa64ce";
};
};
- "github-slugger-1.2.1" = {
+ "github-slugger-1.3.0" = {
name = "github-slugger";
packageName = "github-slugger";
- version = "1.2.1";
+ version = "1.3.0";
src = fetchurl {
- url = "https://registry.npmjs.org/github-slugger/-/github-slugger-1.2.1.tgz";
- sha512 = "SsZUjg/P03KPzQBt7OxJPasGw6NRO5uOgiZ5RGXVud5iSIZ0eNZeNp5rTwCxtavrRUa/A77j8mePVc5lEvk0KQ==";
+ url = "https://registry.npmjs.org/github-slugger/-/github-slugger-1.3.0.tgz";
+ sha512 = "gwJScWVNhFYSRDvURk/8yhcFBee6aFjye2a7Lhb2bUyRulpIoek9p0I9Kt7PT67d/nUlZbFu8L9RLiA0woQN8Q==";
};
};
"gl-matrix-2.8.1" = {
@@ -19086,13 +19375,13 @@ let
sha512 = "4FOv3ZKfA4WdOKJeHdz6B3F/vxBLSgmBcGeAFPf4n1F64ltJUvOOerNj0rsJxONQGdhUMynQIvd6LzB+1J5oKA==";
};
};
- "graphql-tools-4.0.6" = {
+ "graphql-tools-4.0.7" = {
name = "graphql-tools";
packageName = "graphql-tools";
- version = "4.0.6";
+ version = "4.0.7";
src = fetchurl {
- url = "https://registry.npmjs.org/graphql-tools/-/graphql-tools-4.0.6.tgz";
- sha512 = "jHLQw8x3xmSNRBCsaZqelXXsFfUSUSktSCUP8KYHiX1Z9qEuwcMpAf+FkdBzk8aTAFqOlPdNZ3OI4DKKqGKUqg==";
+ url = "https://registry.npmjs.org/graphql-tools/-/graphql-tools-4.0.7.tgz";
+ sha512 = "rApl8sT8t/W1uQRcwzxMYyUBiCl/XicluApiDkNze5TX/GR0BSTQMjM2UcRGdTmkbsb1Eqq6afkyyeG/zMxZYQ==";
};
};
"graphql-type-json-0.3.1" = {
@@ -19266,6 +19555,15 @@ let
sha1 = "e28c4d45d05ecbbed818363ce8f9c5926229ffe5";
};
};
+ "gunzip-maybe-1.4.1" = {
+ name = "gunzip-maybe";
+ packageName = "gunzip-maybe";
+ version = "1.4.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.1.tgz";
+ sha512 = "qtutIKMthNJJgeHQS7kZ9FqDq59/Wn0G2HYCRNjpup7yKfVI6/eqwpmroyZGFoCYaG+sW6psNVb4zoLADHpp2g==";
+ };
+ };
"handle-thing-2.0.0" = {
name = "handle-thing";
packageName = "handle-thing";
@@ -19482,6 +19780,15 @@ let
sha1 = "a6a2e55486011940482e13e2c93791c449acf449";
};
};
+ "has-glob-1.0.0" = {
+ name = "has-glob";
+ packageName = "has-glob";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/has-glob/-/has-glob-1.0.0.tgz";
+ sha1 = "9aaa9eedbffb1ba3990a7b0010fb678ee0081207";
+ };
+ };
"has-gulplog-0.1.0" = {
name = "has-gulplog";
packageName = "has-gulplog";
@@ -19761,6 +20068,15 @@ let
sha1 = "087e1f10b046932fc8594dd9e6d378afc9d1e5ac";
};
};
+ "heapdump-0.3.15" = {
+ name = "heapdump";
+ packageName = "heapdump";
+ version = "0.3.15";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/heapdump/-/heapdump-0.3.15.tgz";
+ sha512 = "n8aSFscI9r3gfhOcAECAtXFaQ1uy4QSke6bnaL+iymYZ/dWs9cqDqHM+rALfsHUwukUbxsdlECZ0pKmJdQ/4OA==";
+ };
+ };
"help-me-1.1.0" = {
name = "help-me";
packageName = "help-me";
@@ -19842,6 +20158,15 @@ let
sha1 = "aab4dcfd0fc4cbdb219d268005f2335a3c639e8f";
};
};
+ "historic-readline-1.0.8" = {
+ name = "historic-readline";
+ packageName = "historic-readline";
+ version = "1.0.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/historic-readline/-/historic-readline-1.0.8.tgz";
+ sha1 = "6f36e770769275113a57ae1a6007001af771cff6";
+ };
+ };
"hmac-drbg-1.0.1" = {
name = "hmac-drbg";
packageName = "hmac-drbg";
@@ -19896,22 +20221,31 @@ let
sha1 = "08a74d9272a9cc83ae8e6bbe0303f0ee76432094";
};
};
- "hosted-git-info-2.8.5" = {
+ "hosted-git-info-2.8.6" = {
name = "hosted-git-info";
packageName = "hosted-git-info";
- version = "2.8.5";
+ version = "2.8.6";
src = fetchurl {
- url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz";
- sha512 = "kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==";
+ url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.6.tgz";
+ sha512 = "Kp6rShEsCHhF5dD3EWKdkgVA8ix90oSUJ0VY4g9goxxa0+f4lx63muTftn0mlJ/+8IESGWyKnP//V2D7S4ZbIQ==";
};
};
- "hosted-git-info-3.0.2" = {
+ "hosted-git-info-3.0.3" = {
name = "hosted-git-info";
packageName = "hosted-git-info";
- version = "3.0.2";
+ version = "3.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.2.tgz";
- sha512 = "ezZMWtHXm7Eb7Rq4Mwnx2vs79WUx2QmRg3+ZqeGroKzfDO+EprOcgRPYghsOP9JuYBfK18VojmRTGCg8Ma+ktw==";
+ url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.3.tgz";
+ sha512 = "1ZStA49Bj7WGT+GF2ee50gWMkltL+04v+FgXs20OQbe/usWm9Vh6El9UViiGvD/CEYvsej3AMzABmKmd9DYwnw==";
+ };
+ };
+ "hot-shots-6.8.7" = {
+ name = "hot-shots";
+ packageName = "hot-shots";
+ version = "6.8.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/hot-shots/-/hot-shots-6.8.7.tgz";
+ sha512 = "XH8iezBSZgVw2jegu96pUfF1Zv0VZ/iXjb7L5yE3F7mn7/bdhf4qeniXjO0wQWeefe433rhOsazNKLxM+XMI9w==";
};
};
"hpack.js-2.1.6" = {
@@ -20239,13 +20573,13 @@ let
sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
};
};
- "http-signature-1.3.1" = {
+ "http-signature-1.3.2" = {
name = "http-signature";
packageName = "http-signature";
- version = "1.3.1";
+ version = "1.3.2";
src = fetchurl {
- url = "https://registry.npmjs.org/http-signature/-/http-signature-1.3.1.tgz";
- sha512 = "Y29YKEc8MQsjch/VzkUVJ+2MXd9WcR42fK5u36CZf4G8bXw2DXMTWuESiB0R6m59JAWxlPPw5/Fri/t/AyyueA==";
+ url = "https://registry.npmjs.org/http-signature/-/http-signature-1.3.2.tgz";
+ sha512 = "sjgXeFLIVJ54n1+HWOvazGkIQpaawFGIQ1PYPORaFNWpPHJ28ZuDgWljvMIhAIcOelTtrh9e5wVB3IorxjiZDA==";
};
};
"http_ece-1.1.0" = {
@@ -21274,15 +21608,6 @@ let
sha1 = "296aca878a821816e5b85d0a285a99bcff4582f0";
};
};
- "ipaddr.js-1.9.0" = {
- name = "ipaddr.js";
- packageName = "ipaddr.js";
- version = "1.9.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz";
- sha512 = "M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==";
- };
- };
"ipaddr.js-1.9.1" = {
name = "ipaddr.js";
packageName = "ipaddr.js";
@@ -21589,6 +21914,15 @@ let
sha512 = "RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==";
};
};
+ "is-deflate-1.0.0" = {
+ name = "is-deflate";
+ packageName = "is-deflate";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-deflate/-/is-deflate-1.0.0.tgz";
+ sha1 = "c862901c3c161fb09dac7cdc7e784f80e98f2f14";
+ };
+ };
"is-descriptor-0.1.6" = {
name = "is-descriptor";
packageName = "is-descriptor";
@@ -21796,6 +22130,15 @@ let
sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==";
};
};
+ "is-gzip-1.0.0" = {
+ name = "is-gzip";
+ packageName = "is-gzip";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz";
+ sha1 = "6ca8b07b99c77998025900e555ced8ed80879a83";
+ };
+ };
"is-hexadecimal-1.0.4" = {
name = "is-hexadecimal";
packageName = "is-hexadecimal";
@@ -22174,6 +22517,15 @@ let
sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24";
};
};
+ "is-reference-1.1.4" = {
+ name = "is-reference";
+ packageName = "is-reference";
+ version = "1.1.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-reference/-/is-reference-1.1.4.tgz";
+ sha512 = "uJA/CDPO3Tao3GTrxYn6AwkM4nUPJiGGYu5+cB8qbC7WGFlrKZbiRo7SFKxUAEpFUfiHofWCXBUNhvYJMh+6zw==";
+ };
+ };
"is-regex-1.0.5" = {
name = "is-regex";
packageName = "is-regex";
@@ -22678,22 +23030,22 @@ let
sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
};
};
- "istanbul-lib-coverage-1.2.1" = {
+ "istanbul-lib-coverage-3.0.0" = {
name = "istanbul-lib-coverage";
packageName = "istanbul-lib-coverage";
- version = "1.2.1";
+ version = "3.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz";
- sha512 = "PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==";
+ url = "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz";
+ sha512 = "UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==";
};
};
- "istanbul-lib-instrument-1.10.2" = {
+ "istanbul-lib-instrument-4.0.1" = {
name = "istanbul-lib-instrument";
packageName = "istanbul-lib-instrument";
- version = "1.10.2";
+ version = "4.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz";
- sha512 = "aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==";
+ url = "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz";
+ sha512 = "imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg==";
};
};
"isurl-1.0.0" = {
@@ -22795,6 +23147,51 @@ let
sha1 = "7a549bbd9ffe1585b0cd0a191e203055bee574b4";
};
};
+ "jest-haste-map-25.1.0" = {
+ name = "jest-haste-map";
+ packageName = "jest-haste-map";
+ version = "25.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.1.0.tgz";
+ sha512 = "/2oYINIdnQZAqyWSn1GTku571aAfs8NxzSErGek65Iu5o8JYb+113bZysRMcC/pjE5v9w0Yz+ldbj9NxrFyPyw==";
+ };
+ };
+ "jest-regex-util-25.1.0" = {
+ name = "jest-regex-util";
+ packageName = "jest-regex-util";
+ version = "25.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-25.1.0.tgz";
+ sha512 = "9lShaDmDpqwg+xAd73zHydKrBbbrIi08Kk9YryBEBybQFg/lBWR/2BDjjiSE7KIppM9C5+c03XiDaZ+m4Pgs1w==";
+ };
+ };
+ "jest-serializer-25.1.0" = {
+ name = "jest-serializer";
+ packageName = "jest-serializer";
+ version = "25.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.1.0.tgz";
+ sha512 = "20Wkq5j7o84kssBwvyuJ7Xhn7hdPeTXndnwIblKDR2/sy1SUm6rWWiG9kSCgJPIfkDScJCIsTtOKdlzfIHOfKA==";
+ };
+ };
+ "jest-util-25.1.0" = {
+ name = "jest-util";
+ packageName = "jest-util";
+ version = "25.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest-util/-/jest-util-25.1.0.tgz";
+ sha512 = "7did6pLQ++87Qsj26Fs/TIwZMUFBXQ+4XXSodRNy3luch2DnRXsSnmpVtxxQ0Yd6WTipGpbhh2IFP1mq6/fQGw==";
+ };
+ };
+ "jest-worker-25.1.0" = {
+ name = "jest-worker";
+ packageName = "jest-worker";
+ version = "25.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest-worker/-/jest-worker-25.1.0.tgz";
+ sha512 = "ZHhHtlxOWSxCoNOKHGbiLzXnl42ga9CxDr27H36Qn+15pQZd3R/F24jrmjDelw9j/iHUIWMWs08/u2QN50HHOg==";
+ };
+ };
"jetpack-id-1.0.0" = {
name = "jetpack-id";
packageName = "jetpack-id";
@@ -22831,13 +23228,13 @@ let
sha1 = "06d4912255093419477d425633606e0e90782967";
};
};
- "joplin-turndown-4.0.19" = {
+ "joplin-turndown-4.0.22" = {
name = "joplin-turndown";
packageName = "joplin-turndown";
- version = "4.0.19";
+ version = "4.0.22";
src = fetchurl {
- url = "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.19.tgz";
- sha512 = "B9XeR7bjsPWhwevnCk+EN8VQmaesDqGP3sjkk+ROMuNoQAj0p0RMkZB3actv6Ej6Q9EnRJm3JokfM3Ua4TVYvA==";
+ url = "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.22.tgz";
+ sha512 = "jg3jo2tDwEzSErujU755iyO50IOLSzcEC8fq5CChbpzBMOp6GdPzphVcxFROClhFoZggJAyx2JerJ7LBRhpfgQ==";
};
};
"joplin-turndown-plugin-gfm-1.0.12" = {
@@ -22885,6 +23282,15 @@ let
sha1 = "d6be2e4c377494e2378b1cae2920a91d1182d8c4";
};
};
+ "jquery.terminal-2.14.1" = {
+ name = "jquery.terminal";
+ packageName = "jquery.terminal";
+ version = "2.14.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.14.1.tgz";
+ sha512 = "cYHjjJb4W29WhHP12n40MZ1ljBhB5IHK5VpBYQzzK9KV5ImlO5vLEAr+vcEEZhZ26UXPLVenOMXB0xIZTAxPKA==";
+ };
+ };
"js-base64-2.5.2" = {
name = "js-base64";
packageName = "js-base64";
@@ -23173,13 +23579,13 @@ let
sha1 = "b9eb01fe29f5ea3e92878f15aea10ad38b5acf89";
};
};
- "json-refs-3.0.13" = {
+ "json-refs-3.0.15" = {
name = "json-refs";
packageName = "json-refs";
- version = "3.0.13";
+ version = "3.0.15";
src = fetchurl {
- url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.13.tgz";
- sha512 = "/FJ+BJ6BASjmNsBJHE8qMVj46HTS2Pfq5gI5BQRhyUsdrw9HaHRWSOsOh87deTOyWMtGas5Qr8H6ikrcWHdZbw==";
+ url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.15.tgz";
+ sha512 = "0vOQd9eLNBL18EGl5yYaO44GhixmImes2wiYn9Z3sag3QnehWrYWlB9AFtMxCL2Bj3fyxgDYkxGFEU/chlYssw==";
};
};
"json-rpc2-0.8.1" = {
@@ -23380,6 +23786,15 @@ let
sha512 = "hk/69oAeaIzchq/v3lS50PXuzn5O2ynldopMC+SWBql7J2WtdptfB9dy8Y7+Og5rPkTCpn83zTiO8FMcqlXJ/g==";
};
};
+ "jsonc-parser-2.2.1" = {
+ name = "jsonc-parser";
+ packageName = "jsonc-parser";
+ version = "2.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.2.1.tgz";
+ sha512 = "o6/yDBYccGvTz1+QFevz6l6OBZ2+fMVu2JZ9CIhzsYRX4mjaK5IyX9eldUdCmga16zlgQxyrj5pt9kzuj2C02w==";
+ };
+ };
"jsonfile-1.0.1" = {
name = "jsonfile";
packageName = "jsonfile";
@@ -23705,6 +24120,43 @@ let
sha512 = "8xtA8oqbZ6v1Niryp2/g4GxW16EQh5MvrUylQoOG+zcrDff5CKttON2XUXvMwlIHq4/2zfPVFiinAccJ+WhxoA==";
};
};
+ "kad-fs-0.0.4" = {
+ name = "kad-fs";
+ packageName = "kad-fs";
+ version = "0.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/kad-fs/-/kad-fs-0.0.4.tgz";
+ sha1 = "02ea5aa5cf22225725579627ccfd6d266372289a";
+ };
+ };
+ "kad-git+https://github.com/wikimedia/kad.git#master" = {
+ name = "kad";
+ packageName = "kad";
+ version = "1.3.6";
+ src = fetchgit {
+ url = "https://github.com/wikimedia/kad.git";
+ rev = "96f8f5c8e5a88f5dffed47abc20756e93e16387e";
+ sha256 = "12e5b6430f57389c974e7a393f2c7ac9a26df06a58cfe1afbcb5a5f3f00249ea";
+ };
+ };
+ "kad-localstorage-0.0.7" = {
+ name = "kad-localstorage";
+ packageName = "kad-localstorage";
+ version = "0.0.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/kad-localstorage/-/kad-localstorage-0.0.7.tgz";
+ sha1 = "f7a2e780da53fb28b943c2c5a894c279aa810f17";
+ };
+ };
+ "kad-memstore-0.0.1" = {
+ name = "kad-memstore";
+ packageName = "kad-memstore";
+ version = "0.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/kad-memstore/-/kad-memstore-0.0.1.tgz";
+ sha1 = "83cb748496ac491c7135104cbe56b88ca7392477";
+ };
+ };
"katex-0.11.1" = {
name = "katex";
packageName = "katex";
@@ -23732,6 +24184,15 @@ let
sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b";
};
};
+ "keyboardevent-key-polyfill-1.1.0" = {
+ name = "keyboardevent-key-polyfill";
+ packageName = "keyboardevent-key-polyfill";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/keyboardevent-key-polyfill/-/keyboardevent-key-polyfill-1.1.0.tgz";
+ sha1 = "8a319d8e45a13172fca56286372f90c1d4c7014c";
+ };
+ };
"keygrip-1.1.0" = {
name = "keygrip";
packageName = "keygrip";
@@ -24218,13 +24679,13 @@ let
sha512 = "rXM7GYnW8gsl1vedTJIbzOrRv85c/2uCMpiiCzO2fndd06U/kUXEEU9evYn4zFggBOg36IsBW8LzqIpETwwQzg==";
};
};
- "leveldown-5.4.1" = {
+ "leveldown-5.5.1" = {
name = "leveldown";
packageName = "leveldown";
- version = "5.4.1";
+ version = "5.5.1";
src = fetchurl {
- url = "https://registry.npmjs.org/leveldown/-/leveldown-5.4.1.tgz";
- sha512 = "3lMPc7eU3yj5g+qF1qlALInzIYnkySIosR1AsUKFjL9D8fYbTLuENBAeDRZXIG4qeWOAyqRItOoLu2v2avWiMA==";
+ url = "https://registry.npmjs.org/leveldown/-/leveldown-5.5.1.tgz";
+ sha512 = "GoC455/ncfg4yLLItr192HuXpA+CcQ2q9GncXJhewvvlpsBBEegChn5tMPP+kGvJt7u2LuXAd8fY2moQxFD+sQ==";
};
};
"levelup-0.19.1" = {
@@ -24389,6 +24850,24 @@ let
sha1 = "cc09c24467a0f0a1ed10a5196dba597cad3f65dc";
};
};
+ "limitation-0.2.1" = {
+ name = "limitation";
+ packageName = "limitation";
+ version = "0.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/limitation/-/limitation-0.2.1.tgz";
+ sha512 = "5lMmsPc9ZtMjBk8rJ8ADKIj6AOgYvRtAuNfboO2TVPZsmcn6gSRyijUsA8KG6DUcJ89/hyQ3cnVRyzO1hbDavw==";
+ };
+ };
+ "line-reader-0.4.0" = {
+ name = "line-reader";
+ packageName = "line-reader";
+ version = "0.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/line-reader/-/line-reader-0.4.0.tgz";
+ sha1 = "17e44818da0ac335675ba300954f94ef670e66fd";
+ };
+ };
"lines-and-columns-1.1.6" = {
name = "lines-and-columns";
packageName = "lines-and-columns";
@@ -24533,6 +25012,15 @@ let
sha512 = "fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==";
};
};
+ "loader-utils-1.4.0" = {
+ name = "loader-utils";
+ packageName = "loader-utils";
+ version = "1.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz";
+ sha512 = "qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==";
+ };
+ };
"locate-path-2.0.0" = {
name = "locate-path";
packageName = "locate-path";
@@ -26207,13 +26695,13 @@ let
sha512 = "rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==";
};
};
- "make-error-1.3.5" = {
+ "make-error-1.3.6" = {
name = "make-error";
packageName = "make-error";
- version = "1.3.5";
+ version = "1.3.6";
src = fetchurl {
- url = "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz";
- sha512 = "c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==";
+ url = "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz";
+ sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==";
};
};
"make-error-cause-1.2.2" = {
@@ -26252,6 +26740,15 @@ let
sha512 = "pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==";
};
};
+ "makeerror-1.0.11" = {
+ name = "makeerror";
+ packageName = "makeerror";
+ version = "1.0.11";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz";
+ sha1 = "e01a5c9109f2af79660e4e8b9587790184f5a96c";
+ };
+ };
"mamacro-0.0.3" = {
name = "mamacro";
packageName = "mamacro";
@@ -26693,13 +27190,13 @@ let
sha512 = "xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==";
};
};
- "mdast-comment-marker-1.1.1" = {
+ "mdast-comment-marker-1.1.2" = {
name = "mdast-comment-marker";
packageName = "mdast-comment-marker";
- version = "1.1.1";
+ version = "1.1.2";
src = fetchurl {
- url = "https://registry.npmjs.org/mdast-comment-marker/-/mdast-comment-marker-1.1.1.tgz";
- sha512 = "TWZDaUtPLwKX1pzDIY48MkSUQRDwX/HqbTB4m3iYdL/zosi/Z6Xqfdv0C0hNVKvzrPjZENrpWDt4p4odeVO0Iw==";
+ url = "https://registry.npmjs.org/mdast-comment-marker/-/mdast-comment-marker-1.1.2.tgz";
+ sha512 = "vTFXtmbbF3rgnTh3Zl3irso4LtvwUq/jaDvT2D1JqTGAwaipcS7RpTxzi6KjoRqI9n2yuAhzLDAC8xVTF3XYVQ==";
};
};
"mdast-util-to-nlcst-3.2.3" = {
@@ -26801,6 +27298,15 @@ let
sha512 = "fqm86UwHvAnneIv40Uy1sDQaFtAByq/k0SQ3uCtbnEeSQNT1s5TDHCZOD1VmYCHwfY1jL2NjoZVwzZKYqy3L7A==";
};
};
+ "mediawiki-title-0.6.5" = {
+ name = "mediawiki-title";
+ packageName = "mediawiki-title";
+ version = "0.6.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.6.5.tgz";
+ sha512 = "fPcI4r2yH02UUgMo308CVzIuXUaRUrBzMvjXX8J4XfcHgX9Y73iB0/VLp+S3TnxnTgIGrQ3BFb7kWGR7kkyS8g==";
+ };
+ };
"megaminx-0.3.3" = {
name = "megaminx";
packageName = "megaminx";
@@ -27161,6 +27667,15 @@ let
sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==";
};
};
+ "micromatch-4.0.2" = {
+ name = "micromatch";
+ packageName = "micromatch";
+ version = "4.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz";
+ sha512 = "y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==";
+ };
+ };
"middleware-handler-0.2.0" = {
name = "middleware-handler";
packageName = "middleware-handler";
@@ -27773,13 +28288,13 @@ let
sha1 = "359a19ec634cda3c706c8709adda54c0329aaec4";
};
};
- "moment-timezone-0.5.27" = {
+ "moment-timezone-0.5.28" = {
name = "moment-timezone";
packageName = "moment-timezone";
- version = "0.5.27";
+ version = "0.5.28";
src = fetchurl {
- url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.27.tgz";
- sha512 = "EIKQs7h5sAsjhPCqN6ggx6cEbs94GK050254TIJySD1bzoM5JTYDwAU1IoVOeTOL6Gm27kYJ51/uuvq1kIlrbw==";
+ url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.28.tgz";
+ sha512 = "TDJkZvAyKIVWg5EtVqRzU97w0Rb0YVbfpqyjgu6GwXCAohVRqwZjf4fOzDE6p1Ch98Sro/8hQQi65WDXW5STPw==";
};
};
"monotonic-timestamp-0.0.9" = {
@@ -27899,6 +28414,15 @@ let
sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
};
};
+ "ms-0.7.3" = {
+ name = "ms";
+ packageName = "ms";
+ version = "0.7.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz";
+ sha1 = "708155a5e44e33f5fd0fc53e81d0d40a91be1fff";
+ };
+ };
"ms-2.0.0" = {
name = "ms";
packageName = "ms";
@@ -27926,6 +28450,15 @@ let
sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
};
};
+ "msgpack5-3.6.0" = {
+ name = "msgpack5";
+ packageName = "msgpack5";
+ version = "3.6.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/msgpack5/-/msgpack5-3.6.0.tgz";
+ sha512 = "6HuCZHA57WtNUzrKIvjJ8OMxigzveJ6D5i13y6TsgGu3X3zxABpuBvChpppOoGdB9SyWZcmqUs1fwUV/PpSQ7Q==";
+ };
+ };
"multer-1.4.2" = {
name = "multer";
packageName = "multer";
@@ -28704,6 +29237,16 @@ let
sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==";
};
};
+ "negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" = {
+ name = "negotiator";
+ packageName = "negotiator";
+ version = "0.6.1";
+ src = fetchgit {
+ url = "https://github.com/arlolra/negotiator.git";
+ rev = "0418ab4e9a665772b7e233564a4525c9d9a8ec3a";
+ sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394";
+ };
+ };
"neo-async-2.6.1" = {
name = "neo-async";
packageName = "neo-async";
@@ -28767,15 +29310,6 @@ let
sha1 = "4aa7bfd43f03f0b81c9702b13d6a858ddb326f3e";
};
};
- "nexe-3.0.0-beta.7" = {
- name = "nexe";
- packageName = "nexe";
- version = "3.0.0-beta.7";
- src = fetchurl {
- url = "https://registry.npmjs.org/nexe/-/nexe-3.0.0-beta.7.tgz";
- sha512 = "Vnvd/rHCDyvc3ZxEX/sSw6lCMsBLHqkhGQS627MtetIiFBj1G7oRw9y1All8a7Tzi560o+SGIkAbnjFR60wNlQ==";
- };
- };
"next-event-1.0.0" = {
name = "next-event";
packageName = "next-event";
@@ -28839,22 +29373,22 @@ let
sha1 = "04b035cb530d46859d1018839a518c029133f676";
};
};
- "nlcst-is-literal-1.2.0" = {
+ "nlcst-is-literal-1.2.1" = {
name = "nlcst-is-literal";
packageName = "nlcst-is-literal";
- version = "1.2.0";
+ version = "1.2.1";
src = fetchurl {
- url = "https://registry.npmjs.org/nlcst-is-literal/-/nlcst-is-literal-1.2.0.tgz";
- sha512 = "0f7SKVXHdQvXvibPzLL90Lp8KXbhO0ktZGvythpwyoc7mmXKGe2VtDjnPRailPWBO8TgzHRzvQzkPIz81PSyBA==";
+ url = "https://registry.npmjs.org/nlcst-is-literal/-/nlcst-is-literal-1.2.1.tgz";
+ sha512 = "abNv1XY7TUoyLn5kSSorMIYHfRvVfXbgftNFNvEMiQQkyKteLdjrGuDqEMMyK70sMbn7uPA6oUbRvykM6pg+pg==";
};
};
- "nlcst-normalize-2.1.3" = {
+ "nlcst-normalize-2.1.4" = {
name = "nlcst-normalize";
packageName = "nlcst-normalize";
- version = "2.1.3";
+ version = "2.1.4";
src = fetchurl {
- url = "https://registry.npmjs.org/nlcst-normalize/-/nlcst-normalize-2.1.3.tgz";
- sha512 = "TtAmaUsjZPU6zH+yksmLwTezMti5Db8R+kdViCmWv44pWGxNr4C90p7X33YbiULxDfA7i7J7gUutDX4fT9pn7g==";
+ url = "https://registry.npmjs.org/nlcst-normalize/-/nlcst-normalize-2.1.4.tgz";
+ sha512 = "dWJ3XUoAoWoau24xOM59Y1FPozv7DyYWy+rdUaXj9Ow0hBCVuwqDQbXzTF7H+HskyTVpTkRPXYPu4YsMEScmRw==";
};
};
"nlcst-search-1.5.1" = {
@@ -28866,13 +29400,13 @@ let
sha512 = "G3ws0fgNlVsUvHvA2G1PTjyxzGOJ0caI0+WOvlZzev5iSUTX+R1q4lnlL4Y7E+he4ZMUW/0FMn9rYwdYon/13g==";
};
};
- "nlcst-to-string-2.0.3" = {
+ "nlcst-to-string-2.0.4" = {
name = "nlcst-to-string";
packageName = "nlcst-to-string";
- version = "2.0.3";
+ version = "2.0.4";
src = fetchurl {
- url = "https://registry.npmjs.org/nlcst-to-string/-/nlcst-to-string-2.0.3.tgz";
- sha512 = "OY2QhGdf6jpYfHqS4vJwqF7aIBZkaMjMUkcHcskMPitvXLuYNGdQvgVWI/5yKwkmIdmhft3ounSJv+Re2yydng==";
+ url = "https://registry.npmjs.org/nlcst-to-string/-/nlcst-to-string-2.0.4.tgz";
+ sha512 = "3x3jwTd6UPG7vi5k4GEzvxJ5rDA7hVUIRNHPblKuMVP9Z3xmlsd9cgLcpAMkc5uPOBna82EeshROFhsPkbnTZg==";
};
};
"no-case-2.3.2" = {
@@ -29245,13 +29779,13 @@ let
sha512 = "wEiT7bSeU9oVHPK7S+mHb3cR6cIf9l205wTiHzhnUAuoDJS+IdwQkkpFgKTYmkL4Py2LvqCU90h85YpQul7QFQ==";
};
};
- "node-releases-1.1.49" = {
+ "node-releases-1.1.50" = {
name = "node-releases";
packageName = "node-releases";
- version = "1.1.49";
+ version = "1.1.50";
src = fetchurl {
- url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.49.tgz";
- sha512 = "xH8t0LS0disN0mtRCh+eByxFPie+msJUBL/lJDBuap53QGiYPa9joh83K4pCZgWJ+2L4b9h88vCVdXQ60NO2bg==";
+ url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.50.tgz";
+ sha512 = "lgAmPv9eYZ0bGwUYAKlr8MG6K4CvWliWqnkcT2P8mMAgVrH3lqfBPorFlxiG1pHQnqmavJZ9vbMXUTNyMLbrgQ==";
};
};
"node-request-by-swagger-1.1.4" = {
@@ -29533,15 +30067,6 @@ let
sha1 = "df7c3ed5a277c3f9d4b5d819b05311d10a200ae6";
};
};
- "npm-6.12.1" = {
- name = "npm";
- packageName = "npm";
- version = "6.12.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/npm/-/npm-6.12.1.tgz";
- sha512 = "+pMvUpgSXVBythrv//64j4i6DaLLJ1O0y8kwjNgjAE7atBNGzX4rcOEWvmsuiei6J+mA38O0nUZ/P35GuCD/jg==";
- };
- };
"npm-bundled-1.1.1" = {
name = "npm-bundled";
packageName = "npm-bundled";
@@ -30137,13 +30662,13 @@ let
sha512 = "WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==";
};
};
- "objectorarray-1.0.3" = {
+ "objectorarray-1.0.4" = {
name = "objectorarray";
packageName = "objectorarray";
- version = "1.0.3";
+ version = "1.0.4";
src = fetchurl {
- url = "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.3.tgz";
- sha512 = "kPoflSYkAf/Onvjr4ZLaq37vDuOXjVzfwLCRuORRzYGdXkHa/vacPT0RgR+KmtkwOYFcxTMM62BRrZk8GGKHjw==";
+ url = "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.4.tgz";
+ sha512 = "91k8bjcldstRz1bG6zJo8lWD7c6QXcB4nTDUqiEvIL1xAsLoZlOOZZG+nd6YPz+V7zY1580J4Xxh1vZtyv4i/w==";
};
};
"observ-0.2.0" = {
@@ -31217,13 +31742,13 @@ let
sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247";
};
};
- "paredit.js-0.3.4" = {
+ "paredit.js-0.3.6" = {
name = "paredit.js";
packageName = "paredit.js";
- version = "0.3.4";
+ version = "0.3.6";
src = fetchurl {
- url = "https://registry.npmjs.org/paredit.js/-/paredit.js-0.3.4.tgz";
- sha512 = "b6t7ORo/MwT6xvRiuu1c1do3+CAUd7/0rgc1d3qNHUeP64zxy4ttLIvK7SEHzyfyDLvD9pPuV9mYKHf6MgUkmg==";
+ url = "https://registry.npmjs.org/paredit.js/-/paredit.js-0.3.6.tgz";
+ sha512 = "Z97Go1ucly6XzJDWsX8g6aXKIapx610JElNEgAvOQ8DA3A5uTAzEIaPZyn3r/WskHS+HpaO17oALcy2dUsKlQA==";
};
};
"parent-module-1.0.1" = {
@@ -31973,6 +32498,15 @@ let
sha512 = "U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==";
};
};
+ "peek-stream-1.1.3" = {
+ name = "peek-stream";
+ packageName = "peek-stream";
+ version = "1.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/peek-stream/-/peek-stream-1.1.3.tgz";
+ sha512 = "FhJ+YbOSBb9/rIl2ZeE/QHEsWn7PqNYt8ARAY3kIgNGOk13g9FGyIY6JIl/xB/3TFRVoTv5as0l11weORrTekA==";
+ };
+ };
"peer-wire-protocol-0.7.1" = {
name = "peer-wire-protocol";
packageName = "peer-wire-protocol";
@@ -32460,13 +32994,22 @@ let
sha512 = "IY4oRjpXWYshuTDFxMVkJDtWIk2LhsTlu8bZnbEJA4+bYT16Lvpo8Qv6EvDumhYRgzjZl489pmsY3qVgJQ08nA==";
};
};
- "postcss-calc-7.0.1" = {
+ "postcss-7.0.27" = {
+ name = "postcss";
+ packageName = "postcss";
+ version = "7.0.27";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz";
+ sha512 = "WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==";
+ };
+ };
+ "postcss-calc-7.0.2" = {
name = "postcss-calc";
packageName = "postcss-calc";
- version = "7.0.1";
+ version = "7.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.1.tgz";
- sha512 = "oXqx0m6tb4N3JGdmeMSc/i91KppbYsFZKdH0xMOqK8V1rJlzrKlTdokz8ozUXLVejydRN6u2IddxpcijRj2FqQ==";
+ url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.2.tgz";
+ sha512 = "rofZFHUg6ZIrvRwPeFktv06GdbDYLcGqh9EwiMutZg+a0oePCCw1zHOEiji6LCpyRcjTREtPASuUqeAvYlEVvQ==";
};
};
"postcss-colormin-4.0.3" = {
@@ -32730,15 +33273,6 @@ let
sha512 = "h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==";
};
};
- "postcss-selector-parser-5.0.0" = {
- name = "postcss-selector-parser";
- packageName = "postcss-selector-parser";
- version = "5.0.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz";
- sha512 = "w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==";
- };
- };
"postcss-selector-parser-6.0.2" = {
name = "postcss-selector-parser";
packageName = "postcss-selector-parser";
@@ -32775,6 +33309,15 @@ let
sha512 = "pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==";
};
};
+ "postcss-value-parser-4.0.3" = {
+ name = "postcss-value-parser";
+ packageName = "postcss-value-parser";
+ version = "4.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz";
+ sha512 = "N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg==";
+ };
+ };
"posthtml-0.11.6" = {
name = "posthtml";
packageName = "posthtml";
@@ -32802,13 +33345,13 @@ let
sha512 = "BUIorsYJTvS9UhXxPTzupIztOMVNPa/HtAm9KHni9z6qEfiJ1bpOBL5DfUOL9XAc3XkLIEzBzpph+Zbm4AdRAg==";
};
};
- "posthtml-render-1.1.5" = {
+ "posthtml-render-1.2.0" = {
name = "posthtml-render";
packageName = "posthtml-render";
- version = "1.1.5";
+ version = "1.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/posthtml-render/-/posthtml-render-1.1.5.tgz";
- sha512 = "yvt54j0zCBHQVEFAuR+yHld8CZrCa/E1Z/OcFNCV1IEWTLVxT8O7nYnM4IIw1CD4r8kaRd3lc42+0lgCKgm87w==";
+ url = "https://registry.npmjs.org/posthtml-render/-/posthtml-render-1.2.0.tgz";
+ sha512 = "dQB+hoAKDtnI94RZm/wxBUH9My8OJcXd0uhWmGh2c7tVtQ85A+OS3yCN3LNbFtPz3bViwBJXAeoi+CBGMXM0DA==";
};
};
"prebuild-install-5.3.3" = {
@@ -32865,15 +33408,6 @@ let
sha1 = "815ed1f6ebc65926f865b310c0713bcb3315ce4b";
};
};
- "prettier-1.15.1" = {
- name = "prettier";
- packageName = "prettier";
- version = "1.15.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/prettier/-/prettier-1.15.1.tgz";
- sha512 = "4rgV2hyc/5Pk0XHH4VjJWHRgVjgRbpMfLQjREAhHBtyW1UvTFkjJEsueGYNYYZd9mn97K+1qv0EBwm11zoaSgA==";
- };
- };
"prettier-1.19.1" = {
name = "prettier";
packageName = "prettier";
@@ -32955,6 +33489,15 @@ let
sha512 = "G2gJwLzLcYS+2m6bTAe+CcDpwak9YpcvpScI0tE4WYb2O3lEZD/YywkMNpGqsSx5wttGvh2UXaKROTKKCyM2dw==";
};
};
+ "prfun-2.1.5" = {
+ name = "prfun";
+ packageName = "prfun";
+ version = "2.1.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/prfun/-/prfun-2.1.5.tgz";
+ sha512 = "UCDQscAfQ1HArwvSUobJWbc3sTGLqGpYkRqXUpBZgf+zOWpOjz2dxnpRsOu+qxIj1K0n5UT1wgbCCgetsIwiug==";
+ };
+ };
"primitive-quadify-off-curves-0.4.1" = {
name = "primitive-quadify-off-curves";
packageName = "primitive-quadify-off-curves";
@@ -33153,6 +33696,15 @@ let
sha512 = "nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==";
};
};
+ "promise-8.0.3" = {
+ name = "promise";
+ packageName = "promise";
+ version = "8.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/promise/-/promise-8.0.3.tgz";
+ sha512 = "HeRDUL1RJiLhyA0/grn+PTShlBAcLuh/1BJGtrvjwbvRDCTLLMEz9rOGCV+R3vHY4MixIuoMEd9Yq/XvsTPcjw==";
+ };
+ };
"promise-inflight-1.0.1" = {
name = "promise-inflight";
packageName = "promise-inflight";
@@ -33378,13 +33930,13 @@ let
sha1 = "71c0ee3b102de3f202f3b64f608d173fcba1a918";
};
};
- "proxy-addr-2.0.5" = {
+ "proxy-addr-2.0.6" = {
name = "proxy-addr";
packageName = "proxy-addr";
- version = "2.0.5";
+ version = "2.0.6";
src = fetchurl {
- url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz";
- sha512 = "t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==";
+ url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz";
+ sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==";
};
};
"proxy-agent-3.1.1" = {
@@ -34890,15 +35442,6 @@ let
sha1 = "9cbc686978fee65d16c00e2b19c237fcf6e38389";
};
};
- "read-pkg-4.0.1" = {
- name = "read-pkg";
- packageName = "read-pkg";
- version = "4.0.1";
- src = fetchurl {
- url = "https://registry.npmjs.org/read-pkg/-/read-pkg-4.0.1.tgz";
- sha1 = "963625378f3e1c4d48c85872b5a6ec7d5d093237";
- };
- };
"read-pkg-5.2.0" = {
name = "read-pkg";
packageName = "read-pkg";
@@ -35070,6 +35613,15 @@ let
sha1 = "41059608ffc154757b715d9989d199ffbf372e35";
};
};
+ "realpath-native-1.1.0" = {
+ name = "realpath-native";
+ packageName = "realpath-native";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/realpath-native/-/realpath-native-1.1.0.tgz";
+ sha512 = "wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==";
+ };
+ };
"recast-0.11.23" = {
name = "recast";
packageName = "recast";
@@ -35079,13 +35631,13 @@ let
sha1 = "451fd3004ab1e4df9b4e4b66376b2a21912462d3";
};
};
- "recast-0.18.5" = {
+ "recast-0.18.7" = {
name = "recast";
packageName = "recast";
- version = "0.18.5";
+ version = "0.18.7";
src = fetchurl {
- url = "https://registry.npmjs.org/recast/-/recast-0.18.5.tgz";
- sha512 = "sD1WJrpLQAkXGyQZyGzTM75WJvyAd98II5CHdK3IYbt/cZlU0UzCRVU11nUFNXX9fBVEt4E9ajkMjBlUlG+Oog==";
+ url = "https://registry.npmjs.org/recast/-/recast-0.18.7.tgz";
+ sha512 = "qNfoxvMkW4k8jJgNCfmIES7S31MEejXcEQs57eKUcQGiJUuX7cXNOD2h+W9z0rjNun2EkKqf0WvuRtmHw4NPNg==";
};
};
"rechoir-0.6.2" = {
@@ -35250,13 +35802,22 @@ let
sha512 = "naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==";
};
};
- "regenerator-transform-0.14.1" = {
+ "regenerator-runtime-0.13.4" = {
+ name = "regenerator-runtime";
+ packageName = "regenerator-runtime";
+ version = "0.13.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz";
+ sha512 = "plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==";
+ };
+ };
+ "regenerator-transform-0.14.2" = {
name = "regenerator-transform";
packageName = "regenerator-transform";
- version = "0.14.1";
+ version = "0.14.2";
src = fetchurl {
- url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.1.tgz";
- sha512 = "flVuee02C3FKRISbxhXl9mGzdbWUVHubl1SMaknjxkFB1/iqpJhArQUvRxOOPEc/9tAiX0BaQ28FJH10E4isSQ==";
+ url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.2.tgz";
+ sha512 = "V4+lGplCM/ikqi5/mkkpJ06e9Bujq1NFmNLvsCs56zg3ZbzrnUzAtizZ24TXxtRX/W2jcdScwQCnbL0CICTFkQ==";
};
};
"regex-cache-0.4.4" = {
@@ -35700,6 +36261,15 @@ let
sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a";
};
};
+ "request-light-0.2.5" = {
+ name = "request-light";
+ packageName = "request-light";
+ version = "0.2.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/request-light/-/request-light-0.2.5.tgz";
+ sha512 = "eBEh+GzJAftUnex6tcL6eV2JCifY0+sZMIUpUPOVXbs2nV5hla4ZMmO3icYKGuGVuQ2zHE9evh4OrRcH4iyYYw==";
+ };
+ };
"request-progress-2.0.1" = {
name = "request-progress";
packageName = "request-progress";
@@ -35889,15 +36459,6 @@ let
sha1 = "00a9f7387556e27038eae232caa372a6a59b665a";
};
};
- "resolve-dependencies-2.2.3" = {
- name = "resolve-dependencies";
- packageName = "resolve-dependencies";
- version = "2.2.3";
- src = fetchurl {
- url = "https://registry.npmjs.org/resolve-dependencies/-/resolve-dependencies-2.2.3.tgz";
- sha512 = "EIZcqEE3q+fWNapzpQ2iiCPal+J7TsLfLnoeGq4h5L4GYjnf4xKzVHN7VBjLGgOJwUs/Z+a6nqA80AhwP7IPlQ==";
- };
- };
"resolve-dir-1.0.1" = {
name = "resolve-dir";
packageName = "resolve-dir";
@@ -36330,58 +36891,58 @@ let
sha512 = "jmaDhK9CO4YbQAV8zzCnq9vjAqeO489MS5ehZ+rXmFiPFFE6B+S9KYO6prjmLJ5A0zY3QxVlQdrIya7E/azz/Q==";
};
};
- "rollup-0.67.0" = {
+ "rollup-1.31.1" = {
name = "rollup";
packageName = "rollup";
- version = "0.67.0";
+ version = "1.31.1";
src = fetchurl {
- url = "https://registry.npmjs.org/rollup/-/rollup-0.67.0.tgz";
- sha512 = "p34buXxArhwv9ieTdHvdhdo65Cbig68s/Z8llbZuiX5e+3zCqnBF02Ck9IH0tECrmvvrJVMws32Ry84hTnS1Tw==";
+ url = "https://registry.npmjs.org/rollup/-/rollup-1.31.1.tgz";
+ sha512 = "2JREN1YdrS/kpPzEd33ZjtuNbOuBC3ePfuZBdKEybvqcEcszW1ckyVqzcEiEe0nE8sqHK+pbJg+PsAgRJ8+1dg==";
};
};
- "rollup-plugin-babel-4.0.3" = {
+ "rollup-plugin-babel-4.3.3" = {
name = "rollup-plugin-babel";
packageName = "rollup-plugin-babel";
- version = "4.0.3";
+ version = "4.3.3";
src = fetchurl {
- url = "https://registry.npmjs.org/rollup-plugin-babel/-/rollup-plugin-babel-4.0.3.tgz";
- sha512 = "/PP0MgbPQyRywI4zRIJim6ySjTcOLo4kQbEbROqp9kOR3kHC3FeU++QpBDZhS2BcHtJTVZMVbBV46flbBN5zxQ==";
+ url = "https://registry.npmjs.org/rollup-plugin-babel/-/rollup-plugin-babel-4.3.3.tgz";
+ sha512 = "tKzWOCmIJD/6aKNz0H1GMM+lW1q9KyFubbWzGiOG540zxPPifnEAHTZwjo0g991Y+DyOZcLqBgqOdqazYE5fkw==";
};
};
- "rollup-plugin-babel-minify-6.1.1" = {
+ "rollup-plugin-babel-minify-9.1.1" = {
name = "rollup-plugin-babel-minify";
packageName = "rollup-plugin-babel-minify";
- version = "6.1.1";
+ version = "9.1.1";
src = fetchurl {
- url = "https://registry.npmjs.org/rollup-plugin-babel-minify/-/rollup-plugin-babel-minify-6.1.1.tgz";
- sha512 = "MX0lqOHp1vHd7WbHTK5OG679msgPxzGzYf4VBEg6kKptO05fgheCbN51i3EoFYSa+8/VtNDjPc23iDdZfhO2uw==";
+ url = "https://registry.npmjs.org/rollup-plugin-babel-minify/-/rollup-plugin-babel-minify-9.1.1.tgz";
+ sha512 = "/Jph4PungzuB4h8uPSNKJQ16GjxVTfaRT6f4EwZW5NfD7RU7niFSEMMCZAlM6ezf11MBo1ttQcei+FisyCxicg==";
};
};
- "rollup-plugin-commonjs-9.2.0" = {
+ "rollup-plugin-commonjs-10.1.0" = {
name = "rollup-plugin-commonjs";
packageName = "rollup-plugin-commonjs";
- version = "9.2.0";
+ version = "10.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-9.2.0.tgz";
- sha512 = "0RM5U4Vd6iHjL6rLvr3lKBwnPsaVml+qxOGaaNUWN1lSq6S33KhITOfHmvxV3z2vy9Mk4t0g4rNlVaJJsNQPWA==";
+ url = "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-10.1.0.tgz";
+ sha512 = "jlXbjZSQg8EIeAAvepNwhJj++qJWNJw1Cl0YnOqKtP5Djx+fFGkp3WRh+W0ASCaFG5w1jhmzDxgu3SJuVxPF4Q==";
};
};
- "rollup-plugin-node-resolve-3.4.0" = {
+ "rollup-plugin-node-resolve-5.2.0" = {
name = "rollup-plugin-node-resolve";
packageName = "rollup-plugin-node-resolve";
- version = "3.4.0";
+ version = "5.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.4.0.tgz";
- sha512 = "PJcd85dxfSBWih84ozRtBkB731OjXk0KnzN0oGp7WOWcarAFkVa71cV5hTJg2qpVsV2U8EUwrzHP3tvy9vS3qg==";
+ url = "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-5.2.0.tgz";
+ sha512 = "jUlyaDXts7TW2CqQ4GaO5VJ4PwwaV8VUGA7+km3n6k6xtOEacf61u0VXwN80phY/evMcaS+9eIeJ9MOyDxt5Zw==";
};
};
- "rollup-plugin-replace-2.1.0" = {
+ "rollup-plugin-replace-2.2.0" = {
name = "rollup-plugin-replace";
packageName = "rollup-plugin-replace";
- version = "2.1.0";
+ version = "2.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/rollup-plugin-replace/-/rollup-plugin-replace-2.1.0.tgz";
- sha512 = "SxrAIgpH/B5/W4SeULgreOemxcpEgKs2gcD42zXw50bhqGWmcnlXneVInQpAqzA/cIly4bJrOpeelmB9p4YXSQ==";
+ url = "https://registry.npmjs.org/rollup-plugin-replace/-/rollup-plugin-replace-2.2.0.tgz";
+ sha512 = "/5bxtUPkDHyBJAKketb4NfaeZjL5yLZdeUihSfbF2PQMz+rSTEb8ARKoOl3UBT4m7/X+QOXJo3sLTcq+yMMYTA==";
};
};
"rollup-pluginutils-2.8.2" = {
@@ -36438,6 +36999,15 @@ let
sha512 = "OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==";
};
};
+ "rsvp-4.8.5" = {
+ name = "rsvp";
+ packageName = "rsvp";
+ version = "4.8.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz";
+ sha512 = "nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==";
+ };
+ };
"rttc-4.5.2" = {
name = "rttc";
packageName = "rttc";
@@ -36708,6 +37278,15 @@ let
sha512 = "jLYV0DORrzY3xaz/S9ydJL6Iz7essZeAfnAavsJ+zsJGZ1MOnsS52yRjU3uF3pJa/lla7+wisp//fxOwOH8SKQ==";
};
};
+ "sane-4.1.0" = {
+ name = "sane";
+ packageName = "sane";
+ version = "4.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz";
+ sha512 = "hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==";
+ };
+ };
"sanitize-filename-1.6.3" = {
name = "sanitize-filename";
packageName = "sanitize-filename";
@@ -37302,6 +37881,15 @@ let
sha1 = "f13bf928e42b9c3e79383e61cc3998b5d14e6cdd";
};
};
+ "service-runner-2.7.6" = {
+ name = "service-runner";
+ packageName = "service-runner";
+ version = "2.7.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/service-runner/-/service-runner-2.7.6.tgz";
+ sha512 = "EBiEpdTwH/Cbx4Yeeo+a8i93ollOkF1vRQrvt6VuSXuCv9WFZgoK5AOEp8JZF/Bk+9ueVnyKfIiDUn8Nehj0Pg==";
+ };
+ };
"set-blocking-1.0.0" = {
name = "set-blocking";
packageName = "set-blocking";
@@ -37725,6 +38313,15 @@ let
sha512 = "06I3cwOD5Q3LdVd6qfyDGp1U9eau9x9qniSL3b/aDgM5bsJX4nZfCuii2UCFcTfrDq0jCXF4NQ/38qeC8CJZTg==";
};
};
+ "simplediff-0.1.1" = {
+ name = "simplediff";
+ packageName = "simplediff";
+ version = "0.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/simplediff/-/simplediff-0.1.1.tgz";
+ sha1 = "b0caeeb093223370033c6c3aa1130dc86c6a087c";
+ };
+ };
"single-line-log-0.4.1" = {
name = "single-line-log";
packageName = "single-line-log";
@@ -37995,40 +38592,40 @@ let
sha512 = "9NjxHVMd1U1LFw66Lya4LXgrsFUiuRiL4opxfTFo0LmMNzUoU5Bk/p0zDdg3FE5Wg61r4fP2D8w+QTl6M8CGiw==";
};
};
- "snyk-docker-plugin-1.38.0" = {
+ "snyk-docker-plugin-2.2.0" = {
name = "snyk-docker-plugin";
packageName = "snyk-docker-plugin";
- version = "1.38.0";
+ version = "2.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.38.0.tgz";
- sha512 = "43HbJj6QatuL2BNG+Uq2Taa73wdfSQSID8FJWW4q5/LYgd9D+RtdiE4lAMwxqYYbvThU9uuza4epuF/B1CAlYw==";
+ url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-2.2.0.tgz";
+ sha512 = "adoerkNsYNNZFKnvtjJLJeEgjUf2js0hnG32aUJSRtbDN1Ejgbj88a0UYc90C+s2xZJaulJgImy9/5IsG5/omg==";
};
};
- "snyk-go-parser-1.3.1" = {
+ "snyk-go-parser-1.4.0" = {
name = "snyk-go-parser";
packageName = "snyk-go-parser";
- version = "1.3.1";
+ version = "1.4.0";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk-go-parser/-/snyk-go-parser-1.3.1.tgz";
- sha512 = "jrFRfIk6yGHFeipGD66WV9ei/A/w/lIiGqI80w1ndMbg6D6M5pVNbK7ngDTmo4GdHrZDYqx/VBGBsUm2bol3Rg==";
+ url = "https://registry.npmjs.org/snyk-go-parser/-/snyk-go-parser-1.4.0.tgz";
+ sha512 = "zcLA8u/WreycCjFKBblYfxszg7Fmnemuu9Ug/CE/jqF0yBXsI5DCWMteUvFkoa8DRntfGTlgf98TRl2aTSc2MQ==";
};
};
- "snyk-go-plugin-1.11.1" = {
+ "snyk-go-plugin-1.13.0" = {
name = "snyk-go-plugin";
packageName = "snyk-go-plugin";
- version = "1.11.1";
+ version = "1.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.11.1.tgz";
- sha512 = "IsNi7TmpHoRHzONOWJTT8+VYozQJnaJpKgnYNQjzNm2JlV8bDGbdGQ1a8LcEoChxnJ8v8aMZy7GTiQyGGABtEQ==";
+ url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.13.0.tgz";
+ sha512 = "6lN9S8uO6LE1Y6ZJMZm3EZ8kvvI/vZh8r+JJGAPfVO2C265xymEpFBJ4Nn2or0Q0LlqZ8W8lWi1HUMXXid6k+w==";
};
};
- "snyk-gradle-plugin-3.2.4" = {
+ "snyk-gradle-plugin-3.2.5" = {
name = "snyk-gradle-plugin";
packageName = "snyk-gradle-plugin";
- version = "3.2.4";
+ version = "3.2.5";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.2.4.tgz";
- sha512 = "XmS1gl7uZNHP9HP5RaPuRXW3VjkbdWe+EgSOlvmspztkubIOIainqc87k7rIJ6u3tLBhqsZK8b5ru0/E9Q69hQ==";
+ url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.2.5.tgz";
+ sha512 = "XxPi/B16dGkV1USoyFbpn6LlSJ9SUC6Y6z/4lWuF4spLnKtWwpEb1bwTdBFsxnkUfqzIRtPr0+wcxxXvv9Rvcw==";
};
};
"snyk-module-1.9.1" = {
@@ -40686,13 +41283,13 @@ let
sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==";
};
};
- "systeminformation-4.22.0" = {
+ "systeminformation-4.22.3" = {
name = "systeminformation";
packageName = "systeminformation";
- version = "4.22.0";
+ version = "4.22.3";
src = fetchurl {
- url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.22.0.tgz";
- sha512 = "Sq6H99xxvBeN54kUdM9DCdbesSLb+S5MZnUD2qy7gutyfS0REYZ4QN6tfsWbYhcsaocrvcpCwoOHblbO+caN4A==";
+ url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.22.3.tgz";
+ sha512 = "wsIXxaR6dbLrOp8/KwyiEdXsQVFPOayIhNWI6WwMJg/G6oPX2NIZ4jo8MePMXrTb5VkA7Rihl5343eVqiL+jlg==";
};
};
"syswide-cas-5.3.0" = {
@@ -41074,13 +41671,13 @@ let
sha512 = "a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==";
};
};
- "terminal-kit-1.33.10" = {
+ "terminal-kit-1.33.15" = {
name = "terminal-kit";
packageName = "terminal-kit";
- version = "1.33.10";
+ version = "1.33.15";
src = fetchurl {
- url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.33.10.tgz";
- sha512 = "xKJAeyfm9EIkHWWz0C/GXbYW5LytAMzuVT9xZdI9kgLnm9Z7lNkly0WdBCH8WOPD4inZpKjNzBKr0StEOJXBNA==";
+ url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.33.15.tgz";
+ sha512 = "zGZpZRXXAKJw/fyWxY7k8rOzo56OBzzhfPQGloPBP4irhQs6cv4VWMOoVFHze8o7L4YzwtijBotfI479xA4QxQ==";
};
};
"terser-3.17.0" = {
@@ -41092,13 +41689,13 @@ let
sha512 = "/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==";
};
};
- "terser-4.6.3" = {
+ "terser-4.6.4" = {
name = "terser";
packageName = "terser";
- version = "4.6.3";
+ version = "4.6.4";
src = fetchurl {
- url = "https://registry.npmjs.org/terser/-/terser-4.6.3.tgz";
- sha512 = "Lw+ieAXmY69d09IIc/yqeBqXpEQIpDGZqT34ui1QWXIUpR2RjbqEkT8X7Lgex19hslSqcWM5iMN2kM11eMsESQ==";
+ url = "https://registry.npmjs.org/terser/-/terser-4.6.4.tgz";
+ sha512 = "5fqgBPLgVHZ/fVvqRhhUp9YUiGXhFJ9ZkrZWD9vQtFBR4QIGTnbsb+/kKqSqfgp3WnBwGWAFnedGTtmX1YTn0w==";
};
};
"terser-webpack-plugin-1.4.3" = {
@@ -41110,13 +41707,13 @@ let
sha512 = "QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA==";
};
};
- "test-exclude-4.2.3" = {
+ "test-exclude-6.0.0" = {
name = "test-exclude";
packageName = "test-exclude";
- version = "4.2.3";
+ version = "6.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/test-exclude/-/test-exclude-4.2.3.tgz";
- sha512 = "SYbXgY64PT+4GAL2ocI3HwPa4Q4TBKm0cwAVeKOt/Aoc0gSpNRjJX8w0pA1LMKZ3LBmd8pYBqApFNQLII9kavA==";
+ url = "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz";
+ sha512 = "cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==";
};
};
"text-extensions-1.9.0" = {
@@ -41398,13 +41995,13 @@ let
sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f";
};
};
- "timeout-refresh-1.0.1" = {
+ "timeout-refresh-1.0.2" = {
name = "timeout-refresh";
packageName = "timeout-refresh";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/timeout-refresh/-/timeout-refresh-1.0.1.tgz";
- sha512 = "bW5oSShdwFCN9K7RpB5dkq5bqNlGt8Lwbfxr8vprysk8hDiK5yy7Mgf2Qlz2ssE0gfQfoYhk4VLY9Hhsnr9Ulw==";
+ url = "https://registry.npmjs.org/timeout-refresh/-/timeout-refresh-1.0.2.tgz";
+ sha512 = "lsO23gD/EeW53AvEoTOleUFqTIapZTu5NPzD6ndUGs0+G1IuN0+hu2kT6I3AmNX2fiOrcC6umtzMEv1XQmajgQ==";
};
};
"timers-browserify-1.4.2" = {
@@ -41569,6 +42166,15 @@ let
sha512 = "8+Ah9aB1IRXCnIOxXZ0uFozV1nMU5xiu7hhFVUSxZ3bYu+psD4TzagCzVbexUCgNNGJnsmNDQlS4nG3mTyoNkw==";
};
};
+ "tmpl-1.0.4" = {
+ name = "tmpl";
+ packageName = "tmpl";
+ version = "1.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz";
+ sha1 = "23640dd7b42d00433911140820e5cf440e521dd1";
+ };
+ };
"to-absolute-glob-2.0.2" = {
name = "to-absolute-glob";
packageName = "to-absolute-glob";
@@ -41974,13 +42580,13 @@ let
sha1 = "a8b13fd6bfd2489519674ccde55ba3693b706d09";
};
};
- "tr46-2.0.0" = {
+ "tr46-2.0.2" = {
name = "tr46";
packageName = "tr46";
- version = "2.0.0";
+ version = "2.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/tr46/-/tr46-2.0.0.tgz";
- sha512 = "LrErSqfhdUw73AC/eXV2fEmNkvgSYxfm5lvxnLvuVgoVDknvD28Pa5FeDGc8RuVouDxUD3GnHHFv7xnBp7As5w==";
+ url = "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz";
+ sha512 = "3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==";
};
};
"transliteration-1.6.6" = {
@@ -42208,13 +42814,13 @@ let
sha512 = "6qWWz2HdFbD2uAfgS5t65Dd6HQKYjfra+YXQzKzxIG+RKTpoeDi+x+TW85SEF3cWUI2UecrOXJobvD+04MiTZg==";
};
};
- "tslib-1.10.0" = {
+ "tslib-1.11.0" = {
name = "tslib";
packageName = "tslib";
- version = "1.10.0";
+ version = "1.11.0";
src = fetchurl {
- url = "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz";
- sha512 = "qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==";
+ url = "https://registry.npmjs.org/tslib/-/tslib-1.11.0.tgz";
+ sha512 = "BmndXUtiTn/VDDrJzQE7Mm22Ix3PxgLltW9bSNLoeCY31gnG2OPx0QqJnuc9oMIKioYrz487i6K9o4Pdn0j+Kg==";
};
};
"tslib-1.9.3" = {
@@ -42370,13 +42976,13 @@ let
sha1 = "b75bc2df15649bb84e8b9aa3c0669c6c4bce0d25";
};
};
- "twig-1.14.0" = {
+ "twig-1.15.0" = {
name = "twig";
packageName = "twig";
- version = "1.14.0";
+ version = "1.15.0";
src = fetchurl {
- url = "https://registry.npmjs.org/twig/-/twig-1.14.0.tgz";
- sha512 = "ut1LslUKAeF56TYQglabJaATUqbNuGO3EcXDhUspAdNbxez5VwTk2n8H00V0VfNy9Scet+VGQP8oPxt4v6mykQ==";
+ url = "https://registry.npmjs.org/twig/-/twig-1.15.0.tgz";
+ sha512 = "kJkEbF4sTyZcaMAXffCjaUt6ZSD3v6qZQZd9b6mySvfuUIseTCJCvikphAJvrNJTDw7nZDfGorvTtUkzge1HPg==";
};
};
"txt-to-ast-3.0.3" = {
@@ -42532,6 +43138,15 @@ let
sha512 = "/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==";
};
};
+ "typescript-3.8.2" = {
+ name = "typescript";
+ packageName = "typescript";
+ version = "3.8.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/typescript/-/typescript-3.8.2.tgz";
+ sha512 = "EgOVgL/4xfVrCMbhYKUQTdF37SQn4Iw73H5BgCrF1Abdun7Kwy/QZsE/ssAy0y4LxBbvua3PIbFsbRczWWnDdQ==";
+ };
+ };
"typescript-eslint-parser-16.0.1" = {
name = "typescript-eslint-parser";
packageName = "typescript-eslint-parser";
@@ -42631,13 +43246,13 @@ let
sha512 = "pcnnhaoG6RtrvHJ1dFncAe8Od6Nuy30oaJ82ts6//sGSXOP5UjBMEthiProjXmMNHOfd93sqlkztifFMcb+4yw==";
};
};
- "uglify-js-3.7.7" = {
+ "uglify-js-3.8.0" = {
name = "uglify-js";
packageName = "uglify-js";
- version = "3.7.7";
+ version = "3.8.0";
src = fetchurl {
- url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.7.7.tgz";
- sha512 = "FeSU+hi7ULYy6mn8PKio/tXsdSXN35lm4KgV2asx00kzrLU9Pi3oAslcJT70Jdj7PHX29gGUPOT6+lXGBbemhA==";
+ url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.8.0.tgz";
+ sha512 = "ugNSTT8ierCsDHso2jkBHXYrU8Y5/fY2ZUprfrJUiD7YpuFvV4jODLFmb3h4btQjqr5Nh4TX4XtgDfCU1WdioQ==";
};
};
"uglify-to-browserify-1.0.2" = {
@@ -43243,13 +43858,22 @@ let
sha512 = "gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw==";
};
};
- "universal-user-agent-4.0.0" = {
+ "universal-user-agent-4.0.1" = {
name = "universal-user-agent";
packageName = "universal-user-agent";
- version = "4.0.0";
+ version = "4.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-4.0.0.tgz";
- sha512 = "eM8knLpev67iBDizr/YtqkJsF3GK8gzDc6st/WKzrTuPtcsOKW/0IdL4cnMBsU69pOx0otavLWBDGTwg+dB0aA==";
+ url = "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-4.0.1.tgz";
+ sha512 = "LnST3ebHwVL2aNe4mejI9IQh2HfZ1RLo8Io2HugSif8ekzD1TlWpHpColOB/eh8JHMLkGH3Akqf040I+4ylNxg==";
+ };
+ };
+ "universal-user-agent-5.0.0" = {
+ name = "universal-user-agent";
+ packageName = "universal-user-agent";
+ version = "5.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-5.0.0.tgz";
+ sha512 = "B5TPtzZleXyPrUMKCpEHFmVhMN6EhmJYjG5PQna9s7mXeSqGTLap4OpqLl5FCEFUI3UBmllkETwKf/db66Y54Q==";
};
};
"universalify-0.1.2" = {
@@ -43270,6 +43894,15 @@ let
sha512 = "8rMeVYWSIyccIJscb9NdCfZKSRBKYTeVnwmiRYT2ulE3qd1RaDQ0xQDP+rI3ccIWbhu/zuo5cgN8z73belNZgw==";
};
};
+ "unix-dgram-2.0.3" = {
+ name = "unix-dgram";
+ packageName = "unix-dgram";
+ version = "2.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/unix-dgram/-/unix-dgram-2.0.3.tgz";
+ sha512 = "Bay5CkSLcdypcBCsxvHEvaG3mftzT5FlUnRToPWEAVxwYI8NI/8zSJ/Gknlp86MPhV6hBA8I8TBsETj2tssoHQ==";
+ };
+ };
"unixify-1.0.0" = {
name = "unixify";
packageName = "unixify";
@@ -44548,13 +45181,13 @@ let
sha512 = "RWkO/c/A7iXhHEy3OuEqkCqavDjpD4NF2Ca8vjai+ZtEYNeHrm1ybTnBYLP4Ft1uXvvaaVtYA9HrDjD6+CUONg==";
};
};
- "vscode-css-languageservice-4.0.2" = {
+ "vscode-css-languageservice-4.1.0" = {
name = "vscode-css-languageservice";
packageName = "vscode-css-languageservice";
- version = "4.0.2";
+ version = "4.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.0.2.tgz";
- sha512 = "pTnfXbsME3pl+yDfhUp/mtvPyIJk0Le4zqJxDn56s9GY9LqY0RmkSEh0oHH6D0HXR3Ni6wKosIaqu8a2G0+jdw==";
+ url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.1.0.tgz";
+ sha512 = "iTX3dTp0Y0RFWhIux5jasI8r9swdiWVB1Z3OrZ10iDHxzkETjVPxAQ5BEQU4ag0Awc8TTg1C7sJriHQY2LO14g==";
};
};
"vscode-emmet-helper-1.2.17" = {
@@ -44575,6 +45208,15 @@ let
sha512 = "mIb5VMXM5jI97HzCk2eadI1K//rCEZXte0wBqA7PGXsyJH4KTyJUaYk9MR+mbfpUl2vMi3HZw9GUOLGYLc6l5w==";
};
};
+ "vscode-json-languageservice-3.5.1" = {
+ name = "vscode-json-languageservice";
+ packageName = "vscode-json-languageservice";
+ version = "3.5.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.5.1.tgz";
+ sha512 = "F8jPqcAC1mbQOMKvGYS4dGEw9JCZxVEi7tc5ASZLfcfwKq2URZKB4fOtdy1GEsTLsrW11tVrBjEPntpXzqp/NA==";
+ };
+ };
"vscode-jsonrpc-3.6.0" = {
name = "vscode-jsonrpc";
packageName = "vscode-jsonrpc";
@@ -44692,6 +45334,15 @@ let
sha512 = "N8bOS8i0xuQMn/y0bijyefDbOsMl6hiH6LDREYWavTLTM5jbj44EiQfStsbmAv/0eaFKkL/jf5hW7nWwBy2HBw==";
};
};
+ "vscode-languageserver-textdocument-1.0.1" = {
+ name = "vscode-languageserver-textdocument";
+ packageName = "vscode-languageserver-textdocument";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.1.tgz";
+ sha512 = "UIcJDjX7IFkck7cSkNNyzIz5FyvpQfY7sdzVy+wkKN/BLaD4DQ0ppXQrKePomCxTS7RrolK1I0pey0bG9eh8dA==";
+ };
+ };
"vscode-languageserver-types-3.14.0" = {
name = "vscode-languageserver-types";
packageName = "vscode-languageserver-types";
@@ -44773,6 +45424,15 @@ let
sha512 = "obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ==";
};
};
+ "vscode-uri-2.1.1" = {
+ name = "vscode-uri";
+ packageName = "vscode-uri";
+ version = "2.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.1.tgz";
+ sha512 = "eY9jmGoEnVf8VE8xr5znSah7Qt1P/xsCdErz+g8HYZtJ7bZqKH5E3d+6oVNm1AC/c6IHUDokbmVXKOi4qPAC9A==";
+ };
+ };
"vstream-0.1.0" = {
name = "vstream";
packageName = "vstream";
@@ -44899,6 +45559,15 @@ let
sha1 = "a16d025eb931bd03b52f308caed0f40fcebe9532";
};
};
+ "walker-1.0.7" = {
+ name = "walker";
+ packageName = "walker";
+ version = "1.0.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz";
+ sha1 = "2f7f9b8fd10d677262b18a884e28d19618e028fb";
+ };
+ };
"ware-1.3.0" = {
name = "ware";
packageName = "ware";
@@ -45295,6 +45964,24 @@ let
sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==";
};
};
+ "wikimedia-langconv-0.1.0" = {
+ name = "wikimedia-langconv";
+ packageName = "wikimedia-langconv";
+ version = "0.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/wikimedia-langconv/-/wikimedia-langconv-0.1.0.tgz";
+ sha512 = "nSiLDIIMAmnulDIRcophSU4oOLW1AGnQKNim+SI5MtzE5gwlD+VJNTkBbSYq8Nov8WjD9jWobaKxo+5yeiC1vA==";
+ };
+ };
+ "wikipeg-2.0.3" = {
+ name = "wikipeg";
+ packageName = "wikipeg";
+ version = "2.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/wikipeg/-/wikipeg-2.0.3.tgz";
+ sha512 = "VMVqiZRIFqb5rQYhRqvzPy5yFwJyCkjEdNAsSnq6ZxYH+7EN7/U+R3LrIx1Lf16pq+DZuWY3wrkq6YFhU8c0lg==";
+ };
+ };
"win-detect-browsers-1.0.2" = {
name = "win-detect-browsers";
packageName = "win-detect-browsers";
@@ -45619,13 +46306,13 @@ let
sha512 = "GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==";
};
};
- "write-file-atomic-3.0.1" = {
+ "write-file-atomic-3.0.3" = {
name = "write-file-atomic";
packageName = "write-file-atomic";
- version = "3.0.1";
+ version = "3.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.1.tgz";
- sha512 = "JPStrIyyVJ6oCSz/691fAjFtefZ6q+fP6tm+OS4Qw6o+TGQxNp1ziY2PgS+X/m0V8OWhZiO/m4xSj+Pr4RrZvw==";
+ url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz";
+ sha512 = "AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==";
};
};
"write-good-0.11.3" = {
@@ -45781,6 +46468,15 @@ let
sha1 = "c9af18876f7a175801d564fe70ad9e8317784934";
};
};
+ "xdg-basedir-2.0.0" = {
+ name = "xdg-basedir";
+ packageName = "xdg-basedir";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz";
+ sha1 = "edbc903cc385fc04523d966a335504b5504d1bd2";
+ };
+ };
"xdg-basedir-3.0.0" = {
name = "xdg-basedir";
packageName = "xdg-basedir";
@@ -46205,6 +46901,15 @@ let
sha512 = "2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A==";
};
};
+ "yaml-ast-parser-custom-tags-0.0.43" = {
+ name = "yaml-ast-parser-custom-tags";
+ packageName = "yaml-ast-parser-custom-tags";
+ version = "0.0.43";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/yaml-ast-parser-custom-tags/-/yaml-ast-parser-custom-tags-0.0.43.tgz";
+ sha512 = "R5063FF/JSAN6qXCmylwjt9PcDH6M0ExEme/nJBzLspc6FJDmHHIqM7xh2WfEmsTJqClF79A9VkXjkAqmZw9SQ==";
+ };
+ };
"yaml-front-matter-3.4.1" = {
name = "yaml-front-matter";
packageName = "yaml-front-matter";
@@ -46679,17 +47384,17 @@ in
"@angular/cli" = nodeEnv.buildNodePackage {
name = "_at_angular_slash_cli";
packageName = "@angular/cli";
- version = "9.0.2";
+ version = "9.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@angular/cli/-/cli-9.0.2.tgz";
- sha512 = "ih3bnvav94MXI9YpwJ4AaETfUGwzc+S2jg4vkfYMuBeWO8kJ7Ma4f2ZriIwWyfHWHlBLHDF6OjAVdisBKPpQag==";
+ url = "https://registry.npmjs.org/@angular/cli/-/cli-9.0.3.tgz";
+ sha512 = "DYa2k6ihYmvfKgv2SE/OqP76D8EEHkIFcJ3ZgVdnxEyCmUXUD4zqOVDzDIK794BdditLF88g4Mezz142bn6XUA==";
};
dependencies = [
- sources."@angular-devkit/architect-0.900.2"
- sources."@angular-devkit/core-9.0.2"
- sources."@angular-devkit/schematics-9.0.2"
- sources."@schematics/angular-9.0.2"
- (sources."@schematics/update-0.900.2" // {
+ sources."@angular-devkit/architect-0.900.3"
+ sources."@angular-devkit/core-9.0.3"
+ sources."@angular-devkit/schematics-9.0.3"
+ sources."@schematics/angular-9.0.3"
+ (sources."@schematics/update-0.900.3" // {
dependencies = [
(sources."npm-package-arg-7.0.0" // {
dependencies = [
@@ -46788,7 +47493,7 @@ in
sources."has-1.0.3"
sources."has-flag-3.0.0"
sources."has-symbols-1.0.1"
- sources."hosted-git-info-3.0.2"
+ sources."hosted-git-info-3.0.3"
sources."http-cache-semantics-3.8.1"
(sources."http-proxy-agent-2.1.0" // {
dependencies = [
@@ -46856,7 +47561,7 @@ in
sources."node-fetch-npm-2.0.2"
(sources."normalize-package-data-2.5.0" // {
dependencies = [
- sources."hosted-git-info-2.8.5"
+ sources."hosted-git-info-2.8.6"
sources."semver-5.7.1"
];
})
@@ -46864,7 +47569,7 @@ in
sources."npm-normalize-package-bin-1.0.1"
(sources."npm-package-arg-6.1.1" // {
dependencies = [
- sources."hosted-git-info-2.8.5"
+ sources."hosted-git-info-2.8.6"
sources."semver-5.7.1"
];
})
@@ -46973,7 +47678,7 @@ in
sources."through2-2.0.5"
sources."tmp-0.0.33"
sources."tough-cookie-2.5.0"
- sources."tslib-1.10.0"
+ sources."tslib-1.11.0"
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
sources."type-fest-0.8.1"
@@ -47338,7 +48043,7 @@ in
];
})
sources."to-utf8-0.0.1"
- sources."uglify-js-3.7.7"
+ sources."uglify-js-3.8.0"
sources."unc-path-regex-0.1.2"
sources."unique-stream-2.3.1"
sources."universalify-0.1.2"
@@ -47390,7 +48095,7 @@ in
sources."acorn-globals-4.3.4"
sources."acorn-walk-6.2.0"
sources."agent-base-4.3.0"
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
sources."ansi-escapes-3.2.0"
sources."ansi-regex-3.0.0"
sources."ansi-styles-3.2.1"
@@ -47512,7 +48217,7 @@ in
sources."tmp-0.0.33"
sources."tough-cookie-2.5.0"
sources."tr46-1.0.1"
- sources."tslib-1.10.0"
+ sources."tslib-1.11.0"
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
sources."type-check-0.3.2"
@@ -47551,10 +48256,10 @@ in
};
dependencies = [
sources."@akryum/winattr-3.0.0"
- sources."@apollo/federation-0.12.0"
+ sources."@apollo/federation-0.12.1"
(sources."@apollo/protobufjs-1.0.3" // {
dependencies = [
- sources."@types/node-10.17.15"
+ sources."@types/node-10.17.16"
];
})
sources."@apollographql/apollo-tools-0.4.3"
@@ -47673,7 +48378,7 @@ in
})
(sources."@babel/runtime-7.8.4" // {
dependencies = [
- sources."regenerator-runtime-0.13.3"
+ sources."regenerator-runtime-0.13.4"
];
})
sources."@babel/template-7.8.3"
@@ -47762,12 +48467,12 @@ in
sources."@types/graphql-upload-8.0.3"
sources."@types/http-assert-1.5.1"
sources."@types/keygrip-1.0.2"
- sources."@types/koa-2.11.1"
+ sources."@types/koa-2.11.2"
sources."@types/koa-compose-3.2.5"
sources."@types/long-4.0.1"
sources."@types/mime-2.0.1"
sources."@types/minimatch-3.0.3"
- sources."@types/node-13.7.1"
+ sources."@types/node-13.7.5"
sources."@types/node-fetch-2.5.4"
sources."@types/normalize-package-data-2.4.0"
sources."@types/range-parser-1.2.3"
@@ -47787,7 +48492,7 @@ in
sources."abbrev-1.1.1"
sources."accepts-1.3.7"
sources."aggregate-error-3.0.1"
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
sources."ansi-align-2.0.0"
sources."ansi-escapes-3.2.0"
sources."ansi-regex-4.1.0"
@@ -47799,9 +48504,10 @@ in
sources."normalize-path-2.1.1"
];
})
- (sources."apollo-2.22.1" // {
+ (sources."apollo-2.23.0" // {
dependencies = [
sources."graphql-tag-2.10.1"
+ sources."mkdirp-1.0.3"
sources."strip-ansi-5.2.0"
];
})
@@ -47809,17 +48515,17 @@ in
sources."apollo-cache-control-0.8.11"
sources."apollo-cache-inmemory-1.6.5"
sources."apollo-client-2.6.8"
- sources."apollo-codegen-core-0.36.1"
- sources."apollo-codegen-flow-0.34.1"
- sources."apollo-codegen-scala-0.35.1"
- sources."apollo-codegen-swift-0.36.1"
- sources."apollo-codegen-typescript-0.36.1"
+ sources."apollo-codegen-core-0.36.2"
+ sources."apollo-codegen-flow-0.34.2"
+ sources."apollo-codegen-scala-0.35.2"
+ sources."apollo-codegen-swift-0.36.2"
+ sources."apollo-codegen-typescript-0.36.2"
sources."apollo-datasource-0.7.0"
sources."apollo-engine-reporting-1.6.0"
sources."apollo-engine-reporting-protobuf-0.4.4"
sources."apollo-env-0.6.1"
sources."apollo-graphql-0.4.0"
- sources."apollo-language-server-1.19.1"
+ sources."apollo-language-server-1.19.2"
sources."apollo-link-1.2.13"
sources."apollo-link-context-1.0.19"
sources."apollo-link-error-1.1.12"
@@ -47945,7 +48651,7 @@ in
sources."callsites-2.0.0"
sources."camel-case-3.0.0"
sources."camelcase-4.1.0"
- sources."caniuse-lite-1.0.30001027"
+ sources."caniuse-lite-1.0.30001030"
sources."capture-stack-trace-1.0.1"
sources."cardinal-2.1.1"
sources."caseless-0.12.0"
@@ -48110,7 +48816,7 @@ in
sources."ecc-jsbn-0.1.2"
sources."ee-first-1.1.1"
sources."ejs-2.7.4"
- sources."electron-to-chromium-1.3.353"
+ sources."electron-to-chromium-1.3.360"
sources."elegant-spinner-1.0.1"
sources."emoji-regex-7.0.3"
sources."encodeurl-1.0.2"
@@ -48194,7 +48900,7 @@ in
})
sources."find-up-3.0.0"
sources."fkill-6.2.0"
- sources."flow-parser-0.118.0"
+ sources."flow-parser-0.119.1"
sources."for-in-1.0.2"
sources."forever-agent-0.6.1"
sources."form-data-2.3.3"
@@ -48263,7 +48969,7 @@ in
sources."graphql-extensions-0.10.10"
sources."graphql-subscriptions-1.1.0"
sources."graphql-tag-2.10.3"
- sources."graphql-tools-4.0.6"
+ sources."graphql-tools-4.0.7"
sources."graphql-type-json-0.3.1"
sources."graphql-upload-8.1.0"
sources."growly-1.3.0"
@@ -48289,7 +48995,7 @@ in
sources."he-1.2.0"
sources."header-case-1.0.1"
sources."homedir-polyfill-1.0.3"
- sources."hosted-git-info-2.8.5"
+ sources."hosted-git-info-2.8.6"
(sources."htmlparser2-3.10.1" // {
dependencies = [
sources."readable-stream-3.6.0"
@@ -48327,7 +49033,7 @@ in
sources."interpret-1.2.0"
sources."into-stream-2.0.1"
sources."invariant-2.2.4"
- sources."ipaddr.js-1.9.0"
+ sources."ipaddr.js-1.9.1"
sources."is-accessor-descriptor-1.0.0"
sources."is-arrayish-0.2.1"
sources."is-binary-path-1.0.1"
@@ -48454,7 +49160,7 @@ in
];
})
sources."make-dir-1.3.0"
- sources."make-error-1.3.5"
+ sources."make-error-1.3.6"
sources."map-cache-0.2.2"
sources."map-visit-1.0.0"
sources."media-typer-0.3.0"
@@ -48517,7 +49223,7 @@ in
sources."is-wsl-2.1.1"
];
})
- sources."node-releases-1.1.49"
+ sources."node-releases-1.1.50"
(sources."nodemon-1.19.4" // {
dependencies = [
sources."debug-3.2.6"
@@ -48625,7 +49331,7 @@ in
sources."process-exists-3.1.0"
sources."process-nextick-args-2.0.1"
sources."proto-list-1.2.4"
- sources."proxy-addr-2.0.5"
+ sources."proxy-addr-2.0.6"
sources."ps-list-4.1.0"
sources."pseudomap-1.0.2"
sources."psl-1.7.0"
@@ -48648,7 +49354,7 @@ in
];
})
sources."readdirp-2.2.1"
- (sources."recast-0.18.5" // {
+ (sources."recast-0.18.7" // {
dependencies = [
sources."source-map-0.6.1"
];
@@ -48658,7 +49364,7 @@ in
sources."regenerate-1.4.0"
sources."regenerate-unicode-properties-8.1.0"
sources."regenerator-runtime-0.10.5"
- sources."regenerator-transform-0.14.1"
+ sources."regenerator-transform-0.14.2"
(sources."regex-not-1.0.2" // {
dependencies = [
sources."extend-shallow-3.0.2"
@@ -48908,7 +49614,7 @@ in
sources."trim-repeated-1.0.0"
sources."ts-invariant-0.4.4"
sources."ts-node-8.6.2"
- sources."tslib-1.10.0"
+ sources."tslib-1.11.0"
sources."tty-1.0.1"
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
@@ -49232,10 +49938,10 @@ in
alloy = nodeEnv.buildNodePackage {
name = "alloy";
packageName = "alloy";
- version = "1.14.5";
+ version = "1.14.6";
src = fetchurl {
- url = "https://registry.npmjs.org/alloy/-/alloy-1.14.5.tgz";
- sha512 = "zMCw1CCc2sR70pwLMCrSReTBWOHUClV28s7gD83eewkF7VM7e+fsPKtlKMRRzrxnVdzvRWXipZKWU3GjYZi95w==";
+ url = "https://registry.npmjs.org/alloy/-/alloy-1.14.6.tgz";
+ sha512 = "M+DxWKG35yfUrJj58i6ohTrf8EaRkk9mFj/QSXxUvmqsyYrBmpQT1RnITzk7HY0QVxW1Oiw9zjxGVrQeozJL/w==";
};
dependencies = [
sources."@babel/code-frame-7.8.3"
@@ -49351,12 +50057,16 @@ in
asar = nodeEnv.buildNodePackage {
name = "asar";
packageName = "asar";
- version = "2.0.3";
+ version = "2.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/asar/-/asar-2.0.3.tgz";
- sha512 = "QdHKO+HOYVtE4B/M3up3i4LSJeJgsa2CTVBrjBf9GgLUPGGUFZowcdJ5yE4gOJuRAHNdqB9JFeRfFfaOu5x8Rw==";
+ url = "https://registry.npmjs.org/asar/-/asar-2.1.0.tgz";
+ sha512 = "d2Ovma+bfqNpvBzY/KU8oPY67ZworixTpkjSx0PCXnQi67c2cXmssaTxpFDUM0ttopXoGx/KRxNg/GDThYbXQA==";
};
dependencies = [
+ sources."@types/events-3.0.0"
+ sources."@types/glob-7.1.1"
+ sources."@types/minimatch-3.0.3"
+ sources."@types/node-13.7.5"
sources."balanced-match-1.0.0"
sources."bluebird-3.7.2"
sources."brace-expansion-1.1.11"
@@ -49405,7 +50115,7 @@ in
];
})
sources."acorn-walk-6.2.0"
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
sources."array-equal-1.0.0"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
@@ -49583,7 +50293,7 @@ in
sources."get-stdin-4.0.1"
sources."glob-6.0.4"
sources."graceful-fs-3.0.12"
- sources."hosted-git-info-2.8.5"
+ sources."hosted-git-info-2.8.6"
sources."indent-string-2.1.0"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
@@ -49881,10 +50591,10 @@ in
sources."@protobufjs/pool-1.1.0"
sources."@protobufjs/utf8-1.1.0"
sources."@types/long-4.0.1"
- sources."@types/node-10.17.15"
+ sources."@types/node-10.17.16"
sources."addr-to-ip-port-1.5.1"
sources."airplay-js-0.2.16"
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
sources."ansi-regex-1.1.1"
sources."ansi-styles-2.2.1"
sources."append-0.1.1"
@@ -50008,7 +50718,7 @@ in
sources."har-validator-5.1.3"
sources."has-ansi-1.0.3"
sources."hat-0.0.3"
- sources."hosted-git-info-2.8.5"
+ sources."hosted-git-info-2.8.6"
sources."http-signature-1.2.0"
sources."immediate-chunk-store-1.0.8"
sources."indent-string-2.1.0"
@@ -50454,10 +51164,10 @@ in
sources."@types/events-3.0.0"
sources."@types/glob-7.1.1"
sources."@types/minimatch-3.0.3"
- sources."@types/node-13.7.1"
+ sources."@types/node-13.7.5"
sources."abbrev-1.1.1"
sources."accepts-1.3.7"
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
sources."ansi-0.3.1"
sources."ansi-align-2.0.0"
sources."ansi-escapes-3.2.0"
@@ -50575,11 +51285,8 @@ in
sources."debug-2.6.9"
sources."decode-uri-component-0.2.0"
sources."dedent-0.7.0"
- sources."deep-equal-1.1.1"
sources."deep-extend-0.6.0"
- sources."define-properties-1.1.3"
sources."define-property-2.0.2"
- sources."defined-1.0.0"
sources."delayed-stream-1.0.0"
(sources."dep-graph-1.1.0" // {
dependencies = [
@@ -50591,7 +51298,6 @@ in
sources."detect-indent-5.0.0"
sources."dir-glob-2.2.2"
sources."dot-prop-4.2.0"
- sources."dotignore-0.1.2"
sources."duplexer3-0.1.4"
sources."ecc-jsbn-0.1.2"
sources."editor-1.0.0"
@@ -50599,10 +51305,8 @@ in
sources."elementtree-0.1.7"
sources."encodeurl-1.0.2"
sources."end-of-stream-1.4.4"
- sources."endent-1.4.0"
+ sources."endent-1.4.1"
sources."env-paths-1.0.0"
- sources."es-abstract-1.17.4"
- sources."es-to-primitive-1.2.1"
sources."escape-html-1.0.3"
sources."escape-string-regexp-1.0.5"
sources."etag-1.8.1"
@@ -50652,7 +51356,6 @@ in
})
sources."finalhandler-1.1.2"
sources."find-up-2.1.0"
- sources."for-each-0.3.3"
sources."for-in-1.0.2"
sources."forever-agent-0.6.1"
sources."form-data-2.3.3"
@@ -50661,7 +51364,6 @@ in
sources."fresh-0.5.2"
sources."fs-extra-8.1.0"
sources."fs.realpath-1.0.0"
- sources."function-bind-1.1.1"
sources."get-stream-4.1.0"
sources."get-value-2.0.6"
sources."getpass-0.1.7"
@@ -50686,16 +51388,14 @@ in
sources."graceful-fs-4.2.3"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
- sources."has-1.0.3"
sources."has-flag-3.0.0"
- sources."has-symbols-1.0.1"
sources."has-value-1.0.0"
(sources."has-values-1.0.0" // {
dependencies = [
sources."kind-of-4.0.0"
];
})
- sources."hosted-git-info-2.8.5"
+ sources."hosted-git-info-2.8.6"
(sources."http-errors-1.7.2" // {
dependencies = [
sources."inherits-2.0.3"
@@ -50719,14 +51419,11 @@ in
})
sources."insight-0.10.3"
sources."ip-regex-2.1.0"
- sources."ipaddr.js-1.9.0"
+ sources."ipaddr.js-1.9.1"
sources."is-accessor-descriptor-1.0.0"
- sources."is-arguments-1.0.4"
sources."is-buffer-1.1.6"
- sources."is-callable-1.1.5"
sources."is-ci-1.2.1"
sources."is-data-descriptor-1.0.0"
- sources."is-date-object-1.0.2"
sources."is-descriptor-1.0.2"
sources."is-extendable-0.1.1"
sources."is-extglob-2.1.1"
@@ -50744,10 +51441,8 @@ in
sources."is-plain-object-2.0.4"
sources."is-promise-2.1.0"
sources."is-redirect-1.0.0"
- sources."is-regex-1.0.5"
sources."is-retry-allowed-1.2.0"
sources."is-stream-1.1.0"
- sources."is-symbol-1.0.3"
sources."is-typedarray-1.0.0"
sources."is-url-1.2.4"
sources."is-windows-1.0.2"
@@ -50816,13 +51511,9 @@ in
sources."kind-of-3.2.2"
];
})
- sources."object-inspect-1.7.0"
- sources."object-is-1.0.2"
- sources."object-keys-1.1.1"
sources."object-visit-1.0.1"
- sources."object.assign-4.1.0"
sources."object.pick-1.3.0"
- sources."objectorarray-1.0.3"
+ sources."objectorarray-1.0.4"
sources."on-finished-2.3.0"
sources."on-headers-1.0.2"
sources."once-1.4.0"
@@ -50859,7 +51550,7 @@ in
sources."posix-character-classes-0.1.1"
sources."prepend-http-1.0.4"
sources."promzard-0.3.0"
- sources."proxy-addr-2.0.5"
+ sources."proxy-addr-2.0.6"
sources."pseudomap-1.0.2"
sources."psl-1.7.0"
sources."pump-3.0.0"
@@ -50881,7 +51572,6 @@ in
})
sources."read-package-json-2.1.1"
sources."regex-not-1.0.2"
- sources."regexp.prototype.flags-1.3.0"
sources."registry-auth-token-3.4.0"
sources."registry-url-3.1.0"
sources."repeat-element-1.1.3"
@@ -50892,11 +51582,10 @@ in
sources."tough-cookie-2.5.0"
];
})
- sources."resolve-1.14.2"
+ sources."resolve-1.15.1"
sources."resolve-from-4.0.0"
sources."resolve-url-0.2.1"
sources."restore-cursor-2.0.0"
- sources."resumer-0.0.0"
sources."ret-0.1.15"
sources."run-async-2.3.0"
sources."rxjs-6.5.4"
@@ -50982,9 +51671,6 @@ in
sources."strip-ansi-4.0.0"
];
})
- sources."string.prototype.trim-1.2.1"
- sources."string.prototype.trimleft-2.1.1"
- sources."string.prototype.trimright-2.1.1"
(sources."strip-ansi-5.2.0" // {
dependencies = [
sources."ansi-regex-4.1.0"
@@ -50994,7 +51680,6 @@ in
sources."strip-eof-1.0.0"
sources."strip-json-comments-2.0.1"
sources."supports-color-5.5.0"
- sources."tape-4.13.0"
(sources."term-size-1.2.0" // {
dependencies = [
sources."cross-spawn-5.1.0"
@@ -51014,7 +51699,7 @@ in
sources."to-regex-range-2.1.1"
sources."toidentifier-1.0.0"
sources."tough-cookie-3.0.1"
- sources."tslib-1.10.0"
+ sources."tslib-1.11.0"
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
sources."type-is-1.6.18"
@@ -51089,7 +51774,7 @@ in
sources."@types/events-3.0.0"
sources."@types/glob-7.1.1"
sources."@types/minimatch-3.0.3"
- sources."@types/node-13.7.1"
+ sources."@types/node-13.7.5"
sources."arr-diff-4.0.0"
sources."arr-flatten-1.1.0"
sources."arr-union-3.1.0"
@@ -51138,7 +51823,7 @@ in
sources."concat-map-0.0.1"
sources."copy-descriptor-0.1.1"
sources."cp-file-7.0.0"
- sources."cpy-8.0.0"
+ sources."cpy-8.0.1"
sources."currently-unhandled-0.4.1"
sources."debug-2.6.9"
sources."decamelize-1.2.0"
@@ -51200,13 +51885,18 @@ in
sources."glob-to-regexp-0.3.0"
sources."globby-9.2.0"
sources."graceful-fs-4.2.3"
+ (sources."has-glob-1.0.0" // {
+ dependencies = [
+ sources."is-glob-3.1.0"
+ ];
+ })
sources."has-value-1.0.0"
(sources."has-values-1.0.0" // {
dependencies = [
sources."kind-of-4.0.0"
];
})
- sources."hosted-git-info-2.8.5"
+ sources."hosted-git-info-2.8.6"
sources."ignore-4.0.6"
sources."indent-string-3.2.0"
sources."inflight-1.0.6"
@@ -51430,7 +52120,7 @@ in
sources."@cycle/run-3.4.0"
sources."@cycle/time-0.10.1"
sources."@types/cookiejar-2.1.1"
- sources."@types/node-13.7.1"
+ sources."@types/node-13.7.5"
sources."@types/superagent-3.8.2"
sources."ansi-escapes-3.2.0"
sources."ansi-regex-2.1.1"
@@ -51479,7 +52169,7 @@ in
sources."external-editor-2.2.0"
sources."figures-2.0.0"
sources."form-data-2.5.1"
- sources."formidable-1.2.1"
+ sources."formidable-1.2.2"
sources."has-ansi-2.0.0"
sources."has-flag-3.0.0"
sources."iconv-lite-0.4.24"
@@ -51685,7 +52375,7 @@ in
];
})
sources."tmp-0.1.0"
- sources."tslib-1.10.0"
+ sources."tslib-1.11.0"
sources."type-fest-0.8.1"
sources."uid-number-0.0.6"
sources."universalify-0.1.2"
@@ -51784,7 +52474,7 @@ in
};
dependencies = [
sources."abstract-random-access-1.1.2"
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
sources."ansi-align-2.0.0"
sources."ansi-diff-1.1.1"
sources."ansi-regex-3.0.0"
@@ -52344,7 +53034,7 @@ in
sources."throttle-1.0.3"
sources."thunky-1.1.0"
sources."timed-out-4.0.1"
- sources."timeout-refresh-1.0.1"
+ sources."timeout-refresh-1.0.2"
sources."to-buffer-1.1.1"
(sources."to-object-path-0.3.0" // {
dependencies = [
@@ -52641,19 +53331,19 @@ in
elasticdump = nodeEnv.buildNodePackage {
name = "elasticdump";
packageName = "elasticdump";
- version = "6.21.0";
+ version = "6.22.0";
src = fetchurl {
- url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.21.0.tgz";
- sha512 = "Ym6TP6yWNXwueViA0e2cByyGfbr1sFThsI3vzQHy3xiDKZVDcMCE2eFiUen342VksZznzM0R8L61SQ3T39hBTw==";
+ url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.22.0.tgz";
+ sha512 = "ZoZzAb8kwldRgdr1cSbdyQwmIGUI8V89NhCR0+t9sEmgALHYB9BclcslAZPmjrZ9T7iN7LX63gnwp0wMBcgkig==";
};
dependencies = [
sources."JSONStream-1.3.5"
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."async-2.6.3"
sources."asynckit-0.4.0"
- sources."aws-sdk-2.620.0"
+ sources."aws-sdk-2.626.0"
sources."aws-sign2-0.7.0"
sources."aws4-1.9.1"
sources."base64-js-1.3.1"
@@ -52878,7 +53568,7 @@ in
sources."has-symbol-support-x-1.4.2"
sources."has-to-string-tag-x-1.4.1"
sources."home-or-tmp-2.0.0"
- sources."hosted-git-info-2.8.5"
+ sources."hosted-git-info-2.8.6"
sources."import-jsx-1.3.2"
sources."imurmurhash-0.1.4"
sources."indent-string-3.2.0"
@@ -53067,7 +53757,7 @@ in
sources."@babel/highlight-7.8.3"
sources."acorn-7.1.0"
sources."acorn-jsx-5.1.0"
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
sources."ansi-escapes-4.3.0"
sources."ansi-regex-5.0.0"
sources."ansi-styles-3.2.1"
@@ -53191,7 +53881,7 @@ in
sources."text-table-0.2.0"
sources."through-2.3.8"
sources."tmp-0.0.33"
- sources."tslib-1.10.0"
+ sources."tslib-1.11.0"
sources."type-check-0.3.2"
sources."type-fest-0.8.1"
sources."uri-js-4.2.2"
@@ -53214,17 +53904,17 @@ in
eslint_d = nodeEnv.buildNodePackage {
name = "eslint_d";
packageName = "eslint_d";
- version = "8.0.0";
+ version = "8.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/eslint_d/-/eslint_d-8.0.0.tgz";
- sha512 = "9I+AC6Y7WTX4J1O3GGg1LqGiDxOUedLxzIxtKSWnD1FP3z2MPQbnWNNycg9Pq/L5B0NlszdaBlajUexZ8qzuag==";
+ url = "https://registry.npmjs.org/eslint_d/-/eslint_d-8.1.0.tgz";
+ sha512 = "cNZFOYG+Quphqj+GPoTNe9nsDCRJo2AjHVpu4RkvAxH8+vR2ckvm7ksr+Lwi+kkKuMf4h+QifTAXJ0HuBkJ7FA==";
};
dependencies = [
sources."@babel/code-frame-7.8.3"
sources."@babel/highlight-7.8.3"
sources."acorn-7.1.0"
sources."acorn-jsx-5.1.0"
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
sources."ansi-escapes-4.3.0"
sources."ansi-regex-5.0.0"
sources."ansi-styles-3.2.1"
@@ -53353,7 +54043,7 @@ in
sources."text-table-0.2.0"
sources."through-2.3.8"
sources."tmp-0.0.33"
- sources."tslib-1.10.0"
+ sources."tslib-1.11.0"
sources."type-check-0.3.2"
sources."type-fest-0.8.1"
sources."uri-js-4.2.2"
@@ -53382,7 +54072,7 @@ in
sha1 = "81f5f98043cc2517053f96ba5d61ef5db430c010";
};
dependencies = [
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
sources."ansi-escapes-1.4.0"
sources."ansi-regex-2.1.1"
sources."ansi-styles-2.2.1"
@@ -53434,7 +54124,7 @@ in
sources."has-ansi-2.0.0"
sources."has-flag-3.0.0"
sources."hasha-2.2.0"
- sources."hosted-git-info-2.8.5"
+ sources."hosted-git-info-2.8.6"
sources."http-signature-1.2.0"
sources."indent-string-2.1.0"
sources."inherits-2.0.4"
@@ -53622,7 +54312,7 @@ in
sources."get-stream-5.1.0"
sources."hard-rejection-2.1.0"
sources."has-flag-4.0.0"
- sources."hosted-git-info-2.8.5"
+ sources."hosted-git-info-2.8.6"
sources."human-signals-1.1.1"
sources."iconv-lite-0.4.24"
sources."indent-string-4.0.0"
@@ -53741,7 +54431,7 @@ in
sources."through-2.3.8"
sources."tmp-0.0.33"
sources."trim-newlines-3.0.0"
- sources."tslib-1.10.0"
+ sources."tslib-1.11.0"
sources."type-fest-0.8.1"
sources."validate-npm-package-license-3.0.4"
sources."which-2.0.2"
@@ -54404,10 +55094,10 @@ in
git-standup = nodeEnv.buildNodePackage {
name = "git-standup";
packageName = "git-standup";
- version = "2.3.1";
+ version = "2.3.2";
src = fetchurl {
- url = "https://registry.npmjs.org/git-standup/-/git-standup-2.3.1.tgz";
- sha512 = "c3ASD4cakIYrReY2lb4xKayyDgh4SICA8aFjuV5HRhabzrputa2Adj/eCJpnOV3Teoe9QNq1MgA2Rc4h45DJhw==";
+ url = "https://registry.npmjs.org/git-standup/-/git-standup-2.3.2.tgz";
+ sha512 = "vDYicak+2y+u6TCtneCx/j6LuT9WhJShyWjTB5dhjXqTB9TJ/uF444OmYwrMlaT0/CqxHOV9NXlML+CR8AJxdA==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -54444,7 +55134,7 @@ in
sources."@types/color-name-1.1.1"
sources."@types/minimist-1.2.0"
sources."@types/normalize-package-data-2.4.0"
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
(sources."ansi-align-3.0.0" // {
dependencies = [
sources."emoji-regex-7.0.3"
@@ -54475,7 +55165,7 @@ in
sources."clone-response-1.0.2"
sources."color-convert-2.0.1"
sources."color-name-1.1.4"
- sources."conf-6.2.0"
+ sources."conf-6.2.1"
sources."configstore-5.0.1"
sources."cross-spawn-7.0.1"
sources."crypto-random-string-2.0.0"
@@ -54517,7 +55207,7 @@ in
sources."hard-rejection-2.1.0"
sources."has-flag-4.0.0"
sources."has-yarn-2.1.0"
- sources."hosted-git-info-2.8.5"
+ sources."hosted-git-info-2.8.6"
sources."http-cache-semantics-4.0.4"
sources."human-signals-1.1.1"
sources."iconv-lite-0.4.24"
@@ -54674,7 +55364,7 @@ in
sources."tmp-0.0.33"
sources."to-readable-stream-1.0.0"
sources."trim-newlines-3.0.0"
- sources."tslib-1.10.0"
+ sources."tslib-1.11.0"
sources."type-fest-0.8.1"
sources."typedarray-to-buffer-3.1.5"
sources."unique-string-2.0.0"
@@ -54686,7 +55376,7 @@ in
sources."which-2.0.2"
sources."widest-line-3.1.0"
sources."wrappy-1.0.2"
- sources."write-file-atomic-3.0.1"
+ sources."write-file-atomic-3.0.3"
sources."xdg-basedir-4.0.0"
sources."yargs-parser-16.1.0"
];
@@ -54726,7 +55416,7 @@ in
sources."@types/color-name-1.1.1"
sources."accepts-1.3.7"
sources."agent-base-4.3.0"
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
(sources."ansi-align-3.0.0" // {
dependencies = [
sources."ansi-regex-4.1.0"
@@ -55013,7 +55703,7 @@ in
sources."has-yarn-2.1.0"
sources."header-case-1.0.1"
sources."homedir-polyfill-1.0.3"
- sources."hosted-git-info-2.8.5"
+ sources."hosted-git-info-2.8.6"
sources."http-cache-semantics-4.0.4"
(sources."http-errors-1.7.2" // {
dependencies = [
@@ -55056,7 +55746,7 @@ in
})
sources."invert-kv-1.0.0"
sources."ip-regex-1.0.3"
- sources."ipaddr.js-1.9.0"
+ sources."ipaddr.js-1.9.1"
sources."is-arrayish-0.2.1"
sources."is-ci-2.0.0"
sources."is-directory-0.3.1"
@@ -55255,7 +55945,7 @@ in
})
sources."process-nextick-args-2.0.1"
sources."protochain-1.0.5"
- sources."proxy-addr-2.0.5"
+ sources."proxy-addr-2.0.6"
sources."prr-1.0.1"
sources."pseudomap-1.0.2"
sources."psl-1.7.0"
@@ -55364,7 +56054,7 @@ in
sources."tough-cookie-2.5.0"
sources."traverse-chain-0.1.0"
sources."trim-right-1.0.1"
- sources."tslib-1.10.0"
+ sources."tslib-1.11.0"
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
sources."type-fest-0.8.1"
@@ -55724,10 +56414,10 @@ in
gtop = nodeEnv.buildNodePackage {
name = "gtop";
packageName = "gtop";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/gtop/-/gtop-1.0.1.tgz";
- sha512 = "rDONVL6bOSKi9H2PuZ+nItRvFML39EeLgV65JRkGPdLri5saUAMVISZV/4jW8LylZBRHysVmaI1nCu5S/0Iilg==";
+ url = "https://registry.npmjs.org/gtop/-/gtop-1.0.2.tgz";
+ sha512 = "Dn/8Kt57CsFLHd9vJIqWuhzXETpm+J86tD444rOz04uUu0kQBUTEBXmwu7zOVntb+TRr4EuyRxBo2tecJAPFmA==";
};
dependencies = [
sources."abbrev-1.1.1"
@@ -55779,7 +56469,7 @@ in
sources."string_decoder-0.10.31"
sources."strip-ansi-3.0.1"
sources."supports-color-2.0.0"
- sources."systeminformation-4.22.0"
+ sources."systeminformation-4.22.3"
sources."term-canvas-0.0.5"
sources."wordwrap-0.0.3"
sources."x256-0.0.2"
@@ -55997,7 +56687,7 @@ in
];
})
sources."homedir-polyfill-1.0.3"
- sources."hosted-git-info-2.8.5"
+ sources."hosted-git-info-2.8.6"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
sources."ini-1.3.5"
@@ -56377,7 +57067,7 @@ in
];
})
sources."homedir-polyfill-1.0.3"
- sources."hosted-git-info-2.8.5"
+ sources."hosted-git-info-2.8.6"
sources."inherits-2.0.4"
sources."ini-1.3.5"
sources."interpret-1.2.0"
@@ -56619,7 +57309,7 @@ in
sources."param-case-2.1.1"
sources."relateurl-0.2.7"
sources."source-map-0.6.1"
- sources."uglify-js-3.7.7"
+ sources."uglify-js-3.8.0"
sources."upper-case-1.1.3"
];
buildInputs = globalBuildInputs;
@@ -56641,7 +57331,7 @@ in
sha512 = "uXuRyVhQa0HlNmZg5LJ1BRJvRq5f7IJL/34tItHhZr9re15pwaqAuLUAIcqtwd1bLUCE++7HVPtR+NSReFW0iA==";
};
dependencies = [
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."async-2.6.1"
@@ -56952,6 +57642,60 @@ in
bypassCache = true;
reconstructLock = true;
};
+ insect = nodeEnv.buildNodePackage {
+ name = "insect";
+ packageName = "insect";
+ version = "5.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/insect/-/insect-5.4.0.tgz";
+ sha512 = "l4g7U75E+WgrgNGH774djfTyp5Aw+2jJokYe9iCunSAbi/w+nRGHqTJfwbODLwiJQTnbXkM42FxgPRA29Ce7Bg==";
+ };
+ dependencies = [
+ sources."@types/jquery-3.3.33"
+ sources."@types/sizzle-2.3.2"
+ sources."balanced-match-1.0.0"
+ sources."brace-expansion-1.1.11"
+ sources."clipboard-2.0.4"
+ sources."clone-1.0.4"
+ sources."concat-map-0.0.1"
+ sources."decimal.js-7.5.1"
+ sources."defaults-1.0.3"
+ sources."delegate-3.2.0"
+ sources."fs-extra-0.24.0"
+ sources."fs.realpath-1.0.0"
+ sources."glob-7.1.6"
+ sources."good-listener-1.2.2"
+ sources."graceful-fs-4.2.3"
+ sources."historic-readline-1.0.8"
+ sources."inflight-1.0.6"
+ sources."inherits-2.0.4"
+ sources."jquery-3.4.1"
+ sources."jquery.terminal-2.14.1"
+ sources."jsonfile-2.4.0"
+ sources."keyboardevent-key-polyfill-1.1.0"
+ sources."line-reader-0.4.0"
+ sources."minimatch-3.0.4"
+ sources."once-1.4.0"
+ sources."os-homedir-1.0.2"
+ sources."path-is-absolute-1.0.1"
+ sources."prismjs-1.19.0"
+ sources."rimraf-2.7.1"
+ sources."select-1.1.2"
+ sources."tiny-emitter-2.1.0"
+ sources."wcwidth-1.0.1"
+ sources."wrappy-1.0.2"
+ sources."xdg-basedir-2.0.0"
+ ];
+ buildInputs = globalBuildInputs;
+ meta = {
+ description = "High precision scientific calculator with support for physical units";
+ homepage = https://github.com/sharkdp/insect;
+ license = "MIT";
+ };
+ production = true;
+ bypassCache = true;
+ reconstructLock = true;
+ };
ionic = nodeEnv.buildNodePackage {
name = "ionic";
packageName = "ionic";
@@ -57049,7 +57793,7 @@ in
sources."figures-3.2.0"
sources."file-uri-to-path-1.0.0"
sources."form-data-2.5.1"
- sources."formidable-1.2.1"
+ sources."formidable-1.2.2"
sources."fs-extra-8.1.0"
sources."fs-minipass-1.2.7"
sources."fs.realpath-1.0.0"
@@ -57246,7 +57990,7 @@ in
sources."tmp-0.0.33"
sources."toidentifier-1.0.0"
sources."tree-kill-1.2.2"
- sources."tslib-1.10.0"
+ sources."tslib-1.11.0"
sources."type-check-0.3.2"
sources."type-fest-0.8.1"
sources."typedarray-to-buffer-3.1.5"
@@ -57266,7 +58010,7 @@ in
];
})
sources."wrappy-1.0.2"
- sources."write-file-atomic-3.0.1"
+ sources."write-file-atomic-3.0.3"
sources."ws-7.2.1"
sources."xregexp-2.0.0"
sources."yallist-3.1.1"
@@ -57307,7 +58051,7 @@ in
dependencies = [
sources."JSONStream-1.3.5"
sources."abbrev-1.1.1"
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
sources."amdefine-1.0.1"
sources."ansi-regex-2.1.1"
sources."ansi-styles-3.2.1"
@@ -57427,7 +58171,7 @@ in
sources."har-validator-5.1.3"
sources."has-flag-3.0.0"
sources."has-unicode-2.0.1"
- sources."hosted-git-info-2.8.5"
+ sources."hosted-git-info-2.8.6"
sources."http-signature-1.2.0"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
@@ -57700,10 +58444,10 @@ in
jake = nodeEnv.buildNodePackage {
name = "jake";
packageName = "jake";
- version = "10.4.5";
+ version = "10.4.6";
src = fetchurl {
- url = "https://registry.npmjs.org/jake/-/jake-10.4.5.tgz";
- sha512 = "C3lYe6+tTk8mLq3aD+p59kHTjnRgW8U5A6tMBQKug0CMbLZ/sLnAwcH9SDHFZH/D9irbedbkvqCGaRbkGJ/QBg==";
+ url = "https://registry.npmjs.org/jake/-/jake-10.4.6.tgz";
+ sha512 = "bfxWbCowItajx7PV0xyoRfLC1DCND7z308JD5OvMhmsjO9232onI0jbbFZFWnvLSMzniRBhOee9EggsWBQ1+Ew==";
};
dependencies = [
sources."ansi-styles-3.2.1"
@@ -57844,7 +58588,7 @@ in
];
})
sources."acorn-walk-6.2.0"
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
(sources."ansi-escape-sequences-4.1.0" // {
dependencies = [
sources."array-back-3.1.0"
@@ -58061,7 +58805,7 @@ in
sources."isarray-1.0.0"
sources."isexe-2.0.0"
sources."isstream-0.1.2"
- sources."joplin-turndown-4.0.19"
+ sources."joplin-turndown-4.0.22"
sources."joplin-turndown-plugin-gfm-1.0.12"
sources."jpeg-js-0.1.2"
sources."js-tokens-4.0.0"
@@ -58311,7 +59055,7 @@ in
sources."q-0.9.7"
];
})
- sources."terminal-kit-1.33.10"
+ sources."terminal-kit-1.33.15"
(sources."tkwidgets-0.5.26" // {
dependencies = [
sources."is-fullwidth-code-point-2.0.0"
@@ -58595,16 +59339,16 @@ in
json-refs = nodeEnv.buildNodePackage {
name = "json-refs";
packageName = "json-refs";
- version = "3.0.13";
+ version = "3.0.14";
src = fetchurl {
- url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.13.tgz";
- sha512 = "/FJ+BJ6BASjmNsBJHE8qMVj46HTS2Pfq5gI5BQRhyUsdrw9HaHRWSOsOh87deTOyWMtGas5Qr8H6ikrcWHdZbw==";
+ url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.14.tgz";
+ sha512 = "+4j+3FzUO3EjQA3QJX5LIMakunOIGQ7nnQsOFwYj2hZQWrPZdmlvwQPnmjcdJ7bHdPju2u/s7jM7WAF+0alXTg==";
};
dependencies = [
sources."argparse-1.0.10"
sources."asynckit-0.4.0"
sources."combined-stream-1.0.8"
- sources."commander-2.19.0"
+ sources."commander-4.1.1"
sources."component-emitter-1.3.0"
sources."cookiejar-2.1.2"
sources."core-util-is-1.0.2"
@@ -58613,7 +59357,7 @@ in
sources."esprima-4.0.1"
sources."extend-3.0.2"
sources."form-data-2.5.1"
- sources."formidable-1.2.1"
+ sources."formidable-1.2.2"
sources."graphlib-2.1.8"
sources."inherits-2.0.4"
sources."isarray-1.0.0"
@@ -58631,7 +59375,7 @@ in
sources."qs-6.9.1"
sources."readable-stream-2.3.7"
sources."safe-buffer-5.1.2"
- sources."slash-2.0.0"
+ sources."slash-3.0.0"
sources."sprintf-js-1.0.3"
sources."string_decoder-1.1.1"
sources."superagent-3.8.3"
@@ -58651,17 +59395,17 @@ in
json-server = nodeEnv.buildNodePackage {
name = "json-server";
packageName = "json-server";
- version = "0.16.0";
+ version = "0.16.1";
src = fetchurl {
- url = "https://registry.npmjs.org/json-server/-/json-server-0.16.0.tgz";
- sha512 = "vdqfkMAiHUCHMkTRgxNJsd0c+lnczxFCxM8bewyalEiunDD8XWXsvgsezAt4iycqWV5aVoR//irtyUX50ZpSdA==";
+ url = "https://registry.npmjs.org/json-server/-/json-server-0.16.1.tgz";
+ sha512 = "aVUTdpt+X27iIuWuxBChJywykPSP4opEiFrH044pG+34Gde3eHZRTzeMyx8ts5/kY2gK1Ru2YBmF2k/vI0lQug==";
};
dependencies = [
sources."@sindresorhus/is-0.14.0"
sources."@szmarczak/http-timer-1.1.2"
sources."@types/color-name-1.1.1"
sources."accepts-1.3.7"
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
(sources."ansi-align-3.0.0" // {
dependencies = [
sources."string-width-3.1.0"
@@ -58770,7 +59514,7 @@ in
sources."imurmurhash-0.1.4"
sources."inherits-2.0.3"
sources."ini-1.3.5"
- sources."ipaddr.js-1.9.0"
+ sources."ipaddr.js-1.9.1"
sources."is-ci-2.0.0"
sources."is-fullwidth-code-point-2.0.0"
sources."is-installed-globally-0.3.1"
@@ -58834,7 +59578,7 @@ in
sources."please-upgrade-node-3.2.0"
sources."pluralize-8.0.0"
sources."prepend-http-2.0.0"
- sources."proxy-addr-2.0.5"
+ sources."proxy-addr-2.0.6"
sources."psl-1.7.0"
sources."pump-3.0.0"
sources."punycode-2.1.1"
@@ -58909,7 +59653,7 @@ in
];
})
sources."wrappy-1.0.2"
- sources."write-file-atomic-3.0.1"
+ sources."write-file-atomic-3.0.3"
sources."xdg-basedir-4.0.0"
sources."y18n-4.0.0"
sources."yargs-15.1.0"
@@ -59245,7 +59989,7 @@ in
sources."abab-1.0.4"
sources."acorn-2.7.0"
sources."acorn-globals-1.0.9"
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
sources."ansi-regex-2.1.1"
sources."ansi-styles-3.2.1"
sources."asn1-0.2.4"
@@ -59594,35 +60338,37 @@ in
sources."@mrmlnc/readdir-enhanced-2.2.1"
sources."@nodelib/fs.stat-1.1.3"
sources."@octokit/auth-token-2.4.0"
- (sources."@octokit/endpoint-5.5.2" // {
+ (sources."@octokit/endpoint-5.5.3" // {
dependencies = [
sources."is-plain-object-3.0.0"
sources."isobject-4.0.0"
+ sources."universal-user-agent-5.0.0"
];
})
sources."@octokit/plugin-enterprise-rest-3.6.2"
sources."@octokit/plugin-paginate-rest-1.1.2"
sources."@octokit/plugin-request-log-1.0.0"
sources."@octokit/plugin-rest-endpoint-methods-2.4.0"
- (sources."@octokit/request-5.3.1" // {
+ (sources."@octokit/request-5.3.2" // {
dependencies = [
sources."is-plain-object-3.0.0"
sources."isobject-4.0.0"
+ sources."universal-user-agent-5.0.0"
];
})
sources."@octokit/request-error-1.2.1"
sources."@octokit/rest-16.43.1"
- sources."@octokit/types-2.1.1"
+ sources."@octokit/types-2.2.0"
sources."@types/events-3.0.0"
sources."@types/glob-7.1.1"
sources."@types/minimatch-3.0.3"
- sources."@types/node-13.7.1"
+ sources."@types/node-13.7.5"
sources."@zkochan/cmd-shim-3.1.0"
sources."JSONStream-1.3.5"
sources."abbrev-1.1.1"
sources."agent-base-4.3.0"
sources."agentkeepalive-3.5.2"
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
sources."ansi-escapes-3.2.0"
sources."ansi-regex-2.1.1"
sources."ansi-styles-3.2.1"
@@ -59958,7 +60704,7 @@ in
sources."kind-of-4.0.0"
];
})
- sources."hosted-git-info-2.8.5"
+ sources."hosted-git-info-2.8.6"
sources."http-cache-semantics-3.8.1"
sources."http-proxy-agent-2.1.0"
sources."http-signature-1.2.0"
@@ -60376,12 +61122,12 @@ in
sources."tr46-1.0.1"
sources."trim-newlines-2.0.0"
sources."trim-off-newlines-1.0.1"
- sources."tslib-1.10.0"
+ sources."tslib-1.11.0"
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
sources."type-fest-0.3.1"
sources."typedarray-0.0.6"
- (sources."uglify-js-3.7.7" // {
+ (sources."uglify-js-3.8.0" // {
dependencies = [
sources."source-map-0.6.1"
];
@@ -60391,7 +61137,7 @@ in
sources."union-value-1.0.1"
sources."unique-filename-1.1.1"
sources."unique-slug-2.0.2"
- sources."universal-user-agent-4.0.0"
+ sources."universal-user-agent-4.0.1"
sources."universalify-0.1.2"
(sources."unset-value-1.0.0" // {
dependencies = [
@@ -60473,7 +61219,7 @@ in
sha512 = "tlWX341RECuTOvoDIvtFqXsKj072hm3+9ymRBe76/mD6O5ZZecnlAOVDlWAleF2+aohFrxNidXhv2773f6kY7g==";
};
dependencies = [
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
sources."asap-2.0.6"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
@@ -60526,7 +61272,7 @@ in
sources."source-map-0.6.1"
sources."sshpk-1.16.1"
sources."tough-cookie-2.5.0"
- sources."tslib-1.10.0"
+ sources."tslib-1.11.0"
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
sources."uri-js-4.2.2"
@@ -60903,7 +61649,7 @@ in
dependencies = [
sources."accepts-1.3.7"
sources."after-0.8.2"
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
sources."anymatch-1.3.2"
sources."argparse-1.0.10"
sources."arr-diff-2.0.0"
@@ -61036,7 +61782,7 @@ in
sources."fsevents-1.2.11"
sources."get-value-2.0.6"
sources."getpass-0.1.7"
- sources."github-slugger-1.2.1"
+ sources."github-slugger-1.3.0"
sources."glob-base-0.3.0"
sources."glob-parent-2.0.0"
sources."graceful-fs-4.2.3"
@@ -61070,7 +61816,7 @@ in
sources."indexof-0.0.1"
sources."inherits-2.0.3"
sources."innertext-1.0.3"
- sources."ipaddr.js-1.9.0"
+ sources."ipaddr.js-1.9.1"
(sources."is-accessor-descriptor-1.0.0" // {
dependencies = [
sources."kind-of-6.0.3"
@@ -61184,7 +61930,7 @@ in
sources."posix-character-classes-0.1.1"
sources."preserve-0.2.0"
sources."process-nextick-args-2.0.1"
- sources."proxy-addr-2.0.5"
+ sources."proxy-addr-2.0.6"
sources."psl-1.7.0"
sources."punycode-2.1.1"
sources."qs-6.7.0"
@@ -61406,7 +62152,7 @@ in
"lumo-build-deps-../interpreters/clojurescript/lumo" = nodeEnv.buildNodePackage {
name = "lumo-build-deps";
packageName = "lumo-build-deps";
- version = "1.9.0";
+ version = "1.10.1";
src = ../interpreters/clojurescript/lumo;
dependencies = [
sources."@babel/code-frame-7.8.3"
@@ -61436,9 +62182,13 @@ in
sources."@babel/helper-split-export-declaration-7.8.3"
sources."@babel/helper-wrap-function-7.8.3"
sources."@babel/helpers-7.8.4"
- sources."@babel/highlight-7.8.3"
+ (sources."@babel/highlight-7.8.3" // {
+ dependencies = [
+ sources."chalk-2.4.2"
+ ];
+ })
sources."@babel/parser-7.8.4"
- sources."@babel/plugin-external-helpers-7.0.0"
+ sources."@babel/plugin-external-helpers-7.8.3"
sources."@babel/plugin-proposal-async-generator-functions-7.8.3"
sources."@babel/plugin-proposal-class-properties-7.8.3"
sources."@babel/plugin-proposal-dynamic-import-7.8.3"
@@ -61449,6 +62199,7 @@ in
sources."@babel/plugin-proposal-optional-chaining-7.8.3"
sources."@babel/plugin-proposal-unicode-property-regex-7.8.3"
sources."@babel/plugin-syntax-async-generators-7.8.4"
+ sources."@babel/plugin-syntax-bigint-7.8.3"
sources."@babel/plugin-syntax-dynamic-import-7.8.3"
sources."@babel/plugin-syntax-json-strings-7.8.3"
sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3"
@@ -61489,22 +62240,35 @@ in
sources."@babel/plugin-transform-typeof-symbol-7.8.4"
sources."@babel/plugin-transform-unicode-regex-7.8.3"
sources."@babel/preset-env-7.8.4"
- sources."@babel/preset-stage-2-7.0.0"
+ sources."@babel/preset-stage-2-7.8.3"
sources."@babel/runtime-7.8.4"
sources."@babel/template-7.8.3"
sources."@babel/traverse-7.8.4"
sources."@babel/types-7.8.3"
- sources."@calebboyd/semaphore-1.3.1"
- sources."@comandeer/babel-plugin-banner-4.1.0"
- sources."@mrmlnc/readdir-enhanced-2.2.1"
- sources."@nodelib/fs.stat-1.1.3"
- sources."@sindresorhus/is-0.7.0"
- sources."@szmarczak/http-timer-1.1.2"
- sources."@types/estree-0.0.39"
- sources."@types/events-3.0.0"
- sources."@types/glob-7.1.1"
- sources."@types/minimatch-3.0.3"
- sources."@types/node-13.7.1"
+ sources."@cnakazawa/watch-1.0.4"
+ sources."@comandeer/babel-plugin-banner-5.0.0"
+ sources."@istanbuljs/load-nyc-config-1.0.0"
+ sources."@istanbuljs/schema-0.1.2"
+ (sources."@jest/transform-25.1.0" // {
+ dependencies = [
+ sources."source-map-0.6.1"
+ ];
+ })
+ sources."@jest/types-25.1.0"
+ sources."@types/babel__core-7.1.6"
+ sources."@types/babel__generator-7.6.1"
+ sources."@types/babel__template-7.0.2"
+ sources."@types/babel__traverse-7.0.9"
+ sources."@types/color-name-1.1.1"
+ sources."@types/estree-0.0.42"
+ sources."@types/istanbul-lib-coverage-2.0.1"
+ sources."@types/istanbul-lib-report-3.0.0"
+ sources."@types/istanbul-reports-1.1.1"
+ sources."@types/node-13.7.5"
+ sources."@types/normalize-package-data-2.4.0"
+ sources."@types/resolve-0.0.8"
+ sources."@types/yargs-15.0.4"
+ sources."@types/yargs-parser-15.0.0"
sources."@webassemblyjs/ast-1.8.5"
sources."@webassemblyjs/floating-point-hex-parser-1.8.5"
sources."@webassemblyjs/helper-api-error-1.8.5"
@@ -61525,69 +62289,25 @@ in
sources."@webassemblyjs/wast-printer-1.8.5"
sources."@xtuc/ieee754-1.2.0"
sources."@xtuc/long-4.2.2"
+ sources."JSONStream-1.3.5"
sources."ace.improved-0.2.1"
- sources."acorn-6.4.0"
- sources."ajv-6.11.0"
+ sources."acorn-7.1.0"
+ sources."acorn-node-1.8.2"
+ sources."acorn-walk-7.1.1"
+ sources."ajv-6.12.0"
sources."ajv-errors-1.0.1"
sources."ajv-keywords-3.4.1"
sources."amdefine-1.0.1"
- sources."ansi-regex-2.1.1"
- sources."ansi-styles-2.2.1"
- (sources."anymatch-2.0.0" // {
- dependencies = [
- sources."arr-diff-4.0.0"
- sources."array-unique-0.3.2"
- sources."braces-2.3.2"
- sources."debug-2.6.9"
- sources."define-property-1.0.0"
- (sources."expand-brackets-2.1.4" // {
- dependencies = [
- sources."define-property-0.2.5"
- ];
- })
- sources."extend-shallow-2.0.1"
- sources."extglob-2.0.4"
- sources."fill-range-4.0.0"
- (sources."is-accessor-descriptor-0.1.6" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- (sources."is-data-descriptor-0.1.4" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- (sources."is-descriptor-0.1.6" // {
- dependencies = [
- sources."kind-of-5.1.0"
- ];
- })
- (sources."is-number-3.0.0" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- sources."isobject-3.0.1"
- sources."kind-of-6.0.3"
- sources."micromatch-3.1.10"
- sources."ms-2.0.0"
- ];
- })
- sources."app-builder-5.2.0"
+ sources."ansi-regex-4.1.0"
+ sources."ansi-styles-3.2.1"
+ sources."anymatch-3.1.1"
sources."aproba-1.2.0"
- (sources."archive-type-4.0.0" // {
- dependencies = [
- sources."file-type-4.4.0"
- ];
- })
- sources."arr-diff-2.0.0"
+ sources."argparse-1.0.10"
+ sources."arr-diff-4.0.0"
sources."arr-flatten-1.1.0"
sources."arr-union-3.1.0"
- sources."array-union-1.0.2"
- sources."array-uniq-1.0.3"
- sources."array-unique-0.2.1"
- sources."arrify-1.0.1"
+ sources."array-unique-0.3.2"
+ sources."asn1-0.2.4"
sources."asn1.js-4.10.1"
(sources."assert-1.5.0" // {
dependencies = [
@@ -61595,23 +62315,17 @@ in
sources."util-0.10.3"
];
})
+ sources."assert-plus-1.0.0"
sources."assign-symbols-1.0.0"
+ sources."async-3.2.0"
sources."async-each-1.0.3"
sources."async-retry-1.3.1"
+ sources."asynckit-0.4.0"
sources."atob-2.1.2"
- (sources."babel-code-frame-6.26.0" // {
- dependencies = [
- sources."chalk-1.1.3"
- sources."js-tokens-3.0.2"
- ];
- })
+ sources."aws-sign2-0.7.0"
+ sources."aws4-1.9.1"
sources."babel-core-7.0.0-bridge.0"
- sources."babel-eslint-10.0.1"
- (sources."babel-generator-6.26.1" // {
- dependencies = [
- sources."jsesc-1.3.0"
- ];
- })
+ sources."babel-eslint-10.0.3"
sources."babel-helper-evaluate-path-0.5.0"
sources."babel-helper-flip-expressions-0.4.3"
sources."babel-helper-is-nodes-equiv-0.0.1"
@@ -61619,16 +62333,16 @@ in
sources."babel-helper-mark-eval-scopes-0.4.3"
sources."babel-helper-remove-or-void-0.4.3"
sources."babel-helper-to-multiple-sequence-expressions-0.5.0"
- sources."babel-jest-23.6.0"
+ sources."babel-jest-25.1.0"
(sources."babel-loader-8.0.6" // {
dependencies = [
- sources."pify-4.0.1"
+ sources."minimist-0.0.8"
+ sources."mkdirp-0.5.1"
];
})
- sources."babel-messages-6.23.0"
sources."babel-plugin-dynamic-import-node-2.3.0"
- sources."babel-plugin-istanbul-4.1.6"
- sources."babel-plugin-jest-hoist-23.2.0"
+ sources."babel-plugin-istanbul-6.0.0"
+ sources."babel-plugin-jest-hoist-25.1.0"
sources."babel-plugin-minify-builtins-0.5.0"
sources."babel-plugin-minify-constant-folding-0.5.0"
sources."babel-plugin-minify-dead-code-elimination-0.5.1"
@@ -61641,7 +62355,6 @@ in
sources."babel-plugin-minify-simplify-0.5.1"
sources."babel-plugin-minify-type-constructors-0.4.3"
sources."babel-plugin-syntax-flow-6.18.0"
- sources."babel-plugin-syntax-object-rest-spread-6.13.0"
sources."babel-plugin-transform-flow-strip-types-6.22.0"
sources."babel-plugin-transform-inline-consecutive-adds-0.4.3"
sources."babel-plugin-transform-member-expression-literals-6.9.4"
@@ -61654,44 +62367,50 @@ in
sources."babel-plugin-transform-remove-undefined-0.5.0"
sources."babel-plugin-transform-simplify-comparison-operators-6.9.4"
sources."babel-plugin-transform-undefined-to-void-6.9.4"
- sources."babel-preset-jest-23.2.0"
+ sources."babel-preset-jest-25.1.0"
sources."babel-preset-minify-0.5.1"
(sources."babel-runtime-6.26.0" // {
dependencies = [
sources."regenerator-runtime-0.11.1"
];
})
- sources."babel-template-6.26.0"
- (sources."babel-traverse-6.26.0" // {
- dependencies = [
- sources."debug-2.6.9"
- sources."globals-9.18.0"
- sources."ms-2.0.0"
- ];
- })
- (sources."babel-types-6.26.0" // {
- dependencies = [
- sources."to-fast-properties-1.0.3"
- ];
- })
- sources."babylon-6.18.0"
sources."balanced-match-1.0.0"
(sources."base-0.11.2" // {
dependencies = [
sources."define-property-1.0.0"
- sources."isobject-3.0.1"
];
})
sources."base64-js-1.3.1"
+ sources."bcrypt-pbkdf-1.0.2"
sources."big.js-5.2.2"
sources."binary-extensions-1.13.1"
sources."bindings-1.5.0"
- sources."bl-1.2.2"
+ (sources."bl-3.0.0" // {
+ dependencies = [
+ sources."readable-stream-3.6.0"
+ ];
+ })
sources."bluebird-3.7.2"
sources."bn.js-4.11.8"
sources."brace-expansion-1.1.11"
- sources."braces-1.8.5"
+ (sources."braces-2.3.2" // {
+ dependencies = [
+ sources."extend-shallow-2.0.1"
+ ];
+ })
sources."brorand-1.1.0"
+ sources."browser-pack-6.1.0"
+ (sources."browser-resolve-1.11.3" // {
+ dependencies = [
+ sources."resolve-1.1.7"
+ ];
+ })
+ (sources."browserify-16.5.0" // {
+ dependencies = [
+ sources."minimist-0.0.8"
+ sources."mkdirp-0.5.1"
+ ];
+ })
sources."browserify-aes-1.2.0"
sources."browserify-cipher-1.0.1"
sources."browserify-des-1.0.2"
@@ -61699,57 +62418,47 @@ in
sources."browserify-sign-4.0.4"
sources."browserify-zlib-0.2.0"
sources."browserslist-4.8.7"
+ sources."bser-2.1.1"
sources."buffer-5.4.3"
- sources."buffer-alloc-1.2.0"
- sources."buffer-alloc-unsafe-1.1.0"
- sources."buffer-crc32-0.2.13"
- sources."buffer-fill-1.0.0"
sources."buffer-from-1.1.1"
sources."buffer-xor-1.0.3"
- sources."builtin-modules-2.0.0"
+ sources."builtin-modules-3.1.0"
sources."builtin-status-codes-3.0.0"
- sources."cacache-12.0.3"
- (sources."cache-base-1.0.1" // {
+ (sources."cacache-12.0.3" // {
dependencies = [
- sources."isobject-3.0.1"
+ sources."minimist-0.0.8"
+ sources."mkdirp-0.5.1"
];
})
- (sources."cacheable-request-2.1.4" // {
- dependencies = [
- sources."lowercase-keys-1.0.0"
- ];
- })
- sources."call-me-maybe-1.0.1"
+ sources."cache-base-1.0.1"
+ sources."cached-path-relative-1.0.2"
sources."camelcase-5.3.1"
- sources."caniuse-lite-1.0.30001027"
- sources."caw-2.0.1"
- (sources."chalk-2.4.2" // {
+ sources."caniuse-lite-1.0.30001030"
+ sources."capture-exit-2.0.0"
+ sources."caseless-0.12.0"
+ (sources."chalk-3.0.0" // {
dependencies = [
- sources."ansi-styles-3.2.1"
- sources."supports-color-5.5.0"
+ sources."ansi-styles-4.2.1"
+ sources."color-convert-2.0.1"
+ sources."color-name-1.1.4"
+ sources."has-flag-4.0.0"
+ sources."supports-color-7.1.0"
];
})
- sources."cherow-1.6.9"
(sources."chokidar-2.1.8" // {
dependencies = [
- sources."array-unique-0.3.2"
- sources."braces-2.3.2"
- sources."extend-shallow-2.0.1"
- sources."fill-range-4.0.0"
- (sources."glob-parent-3.1.0" // {
+ (sources."anymatch-2.0.0" // {
dependencies = [
- sources."is-glob-3.1.0"
+ sources."normalize-path-2.1.1"
];
})
- sources."is-extglob-2.1.1"
- sources."is-glob-4.0.1"
- sources."is-number-3.0.0"
- sources."isobject-3.0.1"
- sources."normalize-path-3.0.0"
+ sources."fsevents-1.2.11"
+ sources."micromatch-3.1.10"
];
})
sources."chownr-1.1.4"
sources."chrome-trace-event-1.0.2"
+ sources."ci-info-2.0.0"
sources."cipher-base-1.0.4"
(sources."class-utils-0.3.6" // {
dependencies = [
@@ -61765,37 +62474,38 @@ in
];
})
sources."is-descriptor-0.1.6"
- sources."isobject-3.0.1"
sources."kind-of-5.1.0"
];
})
- sources."cli-cursor-2.1.0"
- sources."cli-spinners-2.2.0"
- (sources."cliui-5.0.0" // {
- dependencies = [
- sources."ansi-regex-4.1.0"
- sources."strip-ansi-5.2.0"
- ];
- })
+ sources."cliui-5.0.0"
sources."clone-2.1.2"
sources."clone-buffer-1.0.0"
- sources."clone-response-1.0.2"
sources."clone-stats-1.0.0"
sources."cloneable-readable-1.1.3"
sources."collection-visit-1.0.0"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
- sources."commander-2.8.1"
+ sources."colors-1.4.0"
+ (sources."combine-source-map-0.8.0" // {
+ dependencies = [
+ sources."convert-source-map-1.1.3"
+ ];
+ })
+ sources."combined-stream-1.0.8"
+ sources."commander-2.20.3"
sources."commondir-1.0.1"
sources."component-emitter-1.3.0"
sources."concat-map-0.0.1"
sources."concat-stream-1.6.2"
- sources."config-chain-1.1.12"
sources."console-browserify-1.2.0"
sources."constants-browserify-1.0.0"
- sources."content-disposition-0.5.3"
sources."convert-source-map-1.7.0"
- sources."copy-concurrently-1.0.5"
+ (sources."copy-concurrently-1.0.5" // {
+ dependencies = [
+ sources."minimist-0.0.8"
+ sources."mkdirp-0.5.1"
+ ];
+ })
sources."copy-descriptor-0.1.1"
sources."core-js-2.6.11"
(sources."core-js-compat-3.6.4" // {
@@ -61807,293 +62517,162 @@ in
sources."create-ecdh-4.0.3"
sources."create-hash-1.2.0"
sources."create-hmac-1.1.7"
- sources."cross-env-5.2.0"
+ (sources."cross-env-7.0.0" // {
+ dependencies = [
+ sources."cross-spawn-7.0.1"
+ sources."path-key-3.1.1"
+ sources."shebang-command-2.0.0"
+ sources."shebang-regex-3.0.0"
+ sources."which-2.0.2"
+ ];
+ })
sources."cross-spawn-6.0.5"
sources."crypto-browserify-3.12.0"
sources."cyclist-1.0.1"
+ sources."dash-ast-1.0.0"
+ sources."dashdash-1.14.1"
sources."death-1.1.0"
sources."debug-4.1.1"
sources."decamelize-1.2.0"
sources."decode-uri-component-0.2.0"
- (sources."decompress-4.2.0" // {
- dependencies = [
- (sources."make-dir-1.3.0" // {
- dependencies = [
- sources."pify-3.0.0"
- ];
- })
- ];
- })
- sources."decompress-response-3.3.0"
- (sources."decompress-tar-4.1.1" // {
- dependencies = [
- sources."file-type-5.2.0"
- ];
- })
- (sources."decompress-tarbz2-4.1.1" // {
- dependencies = [
- sources."file-type-6.2.0"
- ];
- })
- (sources."decompress-targz-4.1.1" // {
- dependencies = [
- sources."file-type-5.2.0"
- ];
- })
- (sources."decompress-unzip-4.0.1" // {
- dependencies = [
- sources."file-type-3.9.0"
- sources."get-stream-2.3.1"
- ];
- })
- (sources."defaults-1.0.3" // {
- dependencies = [
- sources."clone-1.0.4"
- ];
- })
- sources."defer-to-connect-1.1.3"
sources."define-properties-1.1.3"
- (sources."define-property-2.0.2" // {
- dependencies = [
- sources."isobject-3.0.1"
- ];
- })
+ sources."define-property-2.0.2"
+ sources."defined-1.0.0"
+ sources."delayed-stream-1.0.0"
+ sources."deps-sort-2.0.1"
sources."des.js-1.0.1"
sources."detect-file-1.0.0"
- sources."detect-indent-4.0.0"
+ sources."detective-5.2.0"
sources."diffie-hellman-5.0.3"
- (sources."dir-glob-2.0.0" // {
- dependencies = [
- sources."path-type-3.0.0"
- sources."pify-3.0.0"
- ];
- })
sources."domain-browser-1.2.0"
- (sources."download-7.1.0" // {
- dependencies = [
- sources."got-8.3.2"
- sources."make-dir-1.3.0"
- sources."pify-3.0.0"
- ];
- })
- sources."duplexer3-0.1.4"
+ sources."duplexer2-0.1.4"
sources."duplexify-3.7.1"
- sources."electron-to-chromium-1.3.353"
+ sources."ecc-jsbn-0.1.2"
+ sources."electron-to-chromium-1.3.360"
sources."elliptic-6.5.2"
sources."emoji-regex-7.0.3"
- sources."emojis-list-2.1.0"
+ sources."emojis-list-3.0.0"
sources."end-of-stream-1.4.4"
- sources."enhanced-resolve-4.1.1"
+ (sources."enhanced-resolve-4.1.1" // {
+ dependencies = [
+ sources."memory-fs-0.5.0"
+ ];
+ })
sources."errno-0.1.7"
sources."error-ex-1.3.2"
+ sources."es-abstract-1.17.4"
+ sources."es-to-primitive-1.2.1"
sources."escape-string-regexp-1.0.5"
- sources."eslint-scope-3.7.1"
+ sources."eslint-scope-4.0.3"
sources."eslint-visitor-keys-1.1.0"
+ sources."esprima-4.0.1"
sources."esrecurse-4.2.1"
sources."estraverse-4.3.0"
sources."estree-walker-0.6.1"
sources."esutils-2.0.3"
- sources."events-3.1.0"
+ sources."events-2.1.0"
sources."evp_bytestokey-1.0.3"
- (sources."execa-1.0.0" // {
+ sources."exec-sh-0.3.4"
+ sources."execa-1.0.0"
+ (sources."expand-brackets-2.1.4" // {
dependencies = [
- sources."get-stream-4.1.0"
+ sources."debug-2.6.9"
+ sources."define-property-0.2.5"
+ sources."extend-shallow-2.0.1"
+ (sources."is-accessor-descriptor-0.1.6" // {
+ dependencies = [
+ sources."kind-of-3.2.2"
+ ];
+ })
+ (sources."is-data-descriptor-0.1.4" // {
+ dependencies = [
+ sources."kind-of-3.2.2"
+ ];
+ })
+ sources."is-descriptor-0.1.6"
+ sources."kind-of-5.1.0"
+ sources."ms-2.0.0"
];
})
- sources."expand-brackets-0.1.5"
- sources."expand-range-1.8.2"
sources."expand-tilde-2.0.2"
- sources."ext-list-2.2.2"
- sources."ext-name-5.0.0"
+ sources."extend-3.0.2"
(sources."extend-shallow-3.0.2" // {
dependencies = [
sources."is-extendable-1.0.1"
];
})
- sources."extglob-0.3.2"
- sources."fast-deep-equal-3.1.1"
- (sources."fast-glob-2.2.7" // {
+ (sources."extglob-2.0.4" // {
dependencies = [
- sources."arr-diff-4.0.0"
- sources."array-unique-0.3.2"
- (sources."braces-2.3.2" // {
- dependencies = [
- sources."extend-shallow-2.0.1"
- ];
- })
- sources."debug-2.6.9"
- (sources."expand-brackets-2.1.4" // {
- dependencies = [
- sources."define-property-0.2.5"
- sources."extend-shallow-2.0.1"
- ];
- })
- (sources."extglob-2.0.4" // {
- dependencies = [
- sources."define-property-1.0.0"
- sources."extend-shallow-2.0.1"
- ];
- })
- (sources."fill-range-4.0.0" // {
- dependencies = [
- sources."extend-shallow-2.0.1"
- ];
- })
- (sources."glob-parent-3.1.0" // {
- dependencies = [
- sources."is-glob-3.1.0"
- ];
- })
- (sources."is-accessor-descriptor-0.1.6" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- (sources."is-data-descriptor-0.1.4" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- (sources."is-descriptor-0.1.6" // {
- dependencies = [
- sources."kind-of-5.1.0"
- ];
- })
- sources."is-extglob-2.1.1"
- sources."is-glob-4.0.1"
- (sources."is-number-3.0.0" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- sources."isobject-3.0.1"
- sources."kind-of-6.0.3"
- sources."micromatch-3.1.10"
- sources."ms-2.0.0"
+ sources."define-property-1.0.0"
+ sources."extend-shallow-2.0.1"
];
})
+ sources."extsprintf-1.3.0"
+ sources."fast-deep-equal-3.1.1"
sources."fast-json-stable-stringify-2.1.0"
- sources."fd-slicer-1.1.0"
+ sources."fast-safe-stringify-2.0.7"
+ sources."fb-watchman-2.0.1"
sources."figgy-pudding-3.5.1"
- sources."file-type-8.1.0"
sources."file-uri-to-path-1.0.0"
- sources."filename-regex-2.0.1"
- sources."filename-reserved-regex-2.0.0"
- sources."filenamify-2.1.0"
- sources."fill-range-2.2.4"
+ (sources."fill-range-4.0.0" // {
+ dependencies = [
+ sources."extend-shallow-2.0.1"
+ ];
+ })
sources."find-cache-dir-2.1.0"
- sources."find-up-2.1.0"
+ sources."find-up-4.1.0"
(sources."findup-sync-3.0.0" // {
dependencies = [
- sources."arr-diff-4.0.0"
- sources."array-unique-0.3.2"
- sources."braces-2.3.2"
- sources."debug-2.6.9"
- sources."define-property-1.0.0"
- (sources."expand-brackets-2.1.4" // {
- dependencies = [
- sources."define-property-0.2.5"
- ];
- })
- sources."extend-shallow-2.0.1"
- sources."extglob-2.0.4"
- sources."fill-range-4.0.0"
- (sources."is-accessor-descriptor-0.1.6" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- (sources."is-data-descriptor-0.1.4" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- (sources."is-descriptor-0.1.6" // {
- dependencies = [
- sources."kind-of-5.1.0"
- ];
- })
- sources."is-extglob-2.1.1"
- sources."is-glob-4.0.1"
- (sources."is-number-3.0.0" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- sources."isobject-3.0.1"
- sources."kind-of-6.0.3"
sources."micromatch-3.1.10"
- sources."ms-2.0.0"
];
})
- sources."flow-bin-0.85.0"
+ sources."flow-bin-0.118.0"
sources."flush-write-stream-1.1.1"
sources."for-in-1.0.2"
- sources."for-own-0.1.5"
+ sources."forever-agent-0.6.1"
+ sources."form-data-2.3.3"
sources."fragment-cache-0.2.1"
sources."from2-2.3.0"
sources."fs-constants-1.0.0"
sources."fs-write-stream-atomic-1.0.10"
sources."fs.realpath-1.0.0"
- sources."fsevents-1.2.11"
+ sources."fsevents-2.1.2"
sources."function-bind-1.1.1"
sources."gensync-1.0.0-beta.1"
+ sources."get-assigned-identifiers-1.2.0"
sources."get-caller-file-2.0.5"
- sources."get-proxy-2.1.0"
- sources."get-stream-3.0.0"
+ sources."get-stream-4.1.0"
sources."get-value-2.0.6"
+ sources."getpass-0.1.7"
sources."glob-7.1.6"
- sources."glob-base-0.3.0"
- sources."glob-parent-2.0.0"
- sources."glob-to-regexp-0.3.0"
+ (sources."glob-parent-3.1.0" // {
+ dependencies = [
+ sources."is-glob-3.1.0"
+ ];
+ })
(sources."global-modules-2.0.0" // {
dependencies = [
sources."global-prefix-3.0.0"
- sources."kind-of-6.0.3"
];
})
sources."global-prefix-1.0.2"
sources."globals-11.12.0"
- (sources."globby-8.0.2" // {
- dependencies = [
- sources."pify-3.0.0"
- ];
- })
sources."google-closure-compiler-js-20170910.0.1"
- (sources."got-9.6.0" // {
- dependencies = [
- sources."@sindresorhus/is-0.14.0"
- (sources."cacheable-request-6.1.0" // {
- dependencies = [
- sources."get-stream-5.1.0"
- sources."lowercase-keys-2.0.0"
- ];
- })
- sources."get-stream-4.1.0"
- sources."http-cache-semantics-4.0.4"
- sources."normalize-url-4.5.0"
- sources."p-cancelable-1.1.0"
- ];
- })
sources."graceful-fs-4.2.3"
- sources."graceful-readlink-1.0.1"
- sources."has-ansi-2.0.0"
- sources."has-flag-3.0.0"
- sources."has-symbol-support-x-1.4.2"
- sources."has-symbols-1.0.1"
- sources."has-to-string-tag-x-1.4.1"
- (sources."has-value-1.0.0" // {
+ (sources."gunzip-maybe-1.4.1" // {
dependencies = [
- sources."isobject-3.0.1"
+ sources."browserify-zlib-0.1.4"
+ sources."pako-0.2.9"
];
})
+ sources."har-schema-2.0.0"
+ sources."har-validator-5.1.3"
+ sources."has-1.0.3"
+ sources."has-flag-3.0.0"
+ sources."has-symbols-1.0.1"
+ sources."has-value-1.0.0"
(sources."has-values-1.0.0" // {
dependencies = [
- (sources."is-number-3.0.0" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
sources."kind-of-4.0.0"
];
})
@@ -62101,120 +62680,135 @@ in
sources."hash.js-1.1.7"
sources."hmac-drbg-1.0.1"
sources."homedir-polyfill-1.0.3"
- sources."hosted-git-info-2.8.5"
- sources."http-cache-semantics-3.8.1"
+ sources."hosted-git-info-2.8.6"
+ sources."htmlescape-1.1.1"
+ sources."http-signature-1.2.0"
sources."https-browserify-1.0.0"
sources."ieee754-1.1.13"
sources."iferr-0.1.5"
- sources."ignore-3.3.10"
sources."import-local-2.0.0"
sources."imurmurhash-0.1.4"
sources."infer-owner-1.0.4"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
sources."ini-1.3.5"
+ sources."inline-source-map-0.6.2"
+ sources."insert-module-globals-7.2.0"
sources."interpret-1.2.0"
- sources."into-stream-3.1.0"
sources."invariant-2.2.4"
sources."invert-kv-2.0.0"
- (sources."is-accessor-descriptor-1.0.0" // {
- dependencies = [
- sources."kind-of-6.0.3"
- ];
- })
+ sources."is-accessor-descriptor-1.0.0"
sources."is-arrayish-0.2.1"
sources."is-binary-path-1.0.1"
sources."is-buffer-1.1.6"
- (sources."is-data-descriptor-1.0.0" // {
- dependencies = [
- sources."kind-of-6.0.3"
- ];
- })
- (sources."is-descriptor-1.0.2" // {
- dependencies = [
- sources."kind-of-6.0.3"
- ];
- })
- sources."is-dotfile-1.0.3"
- sources."is-equal-shallow-0.1.3"
+ sources."is-callable-1.1.5"
+ sources."is-ci-2.0.0"
+ sources."is-data-descriptor-1.0.0"
+ sources."is-date-object-1.0.2"
+ sources."is-deflate-1.0.0"
+ sources."is-descriptor-1.0.2"
sources."is-extendable-0.1.1"
- sources."is-extglob-1.0.0"
- sources."is-finite-1.1.0"
+ sources."is-extglob-2.1.1"
sources."is-fullwidth-code-point-2.0.0"
- sources."is-glob-2.0.1"
+ sources."is-glob-4.0.1"
+ sources."is-gzip-1.0.0"
sources."is-module-1.0.0"
- sources."is-natural-number-4.0.1"
- sources."is-number-2.1.0"
- sources."is-object-1.0.1"
- sources."is-plain-obj-1.1.0"
- (sources."is-plain-object-2.0.4" // {
+ (sources."is-number-3.0.0" // {
dependencies = [
- sources."isobject-3.0.1"
+ sources."kind-of-3.2.2"
];
})
- sources."is-posix-bracket-0.1.1"
- sources."is-primitive-2.0.0"
- sources."is-retry-allowed-1.2.0"
+ sources."is-plain-object-2.0.4"
+ (sources."is-reference-1.1.4" // {
+ dependencies = [
+ sources."@types/estree-0.0.39"
+ ];
+ })
+ sources."is-regex-1.0.5"
sources."is-stream-1.1.0"
- sources."is-utf8-0.2.1"
+ sources."is-symbol-1.0.3"
+ sources."is-typedarray-1.0.0"
sources."is-windows-1.0.2"
sources."is-wsl-1.1.0"
sources."isarray-1.0.0"
sources."isexe-2.0.0"
- sources."isobject-2.1.0"
- sources."istanbul-lib-coverage-1.2.1"
- sources."istanbul-lib-instrument-1.10.2"
- sources."isurl-1.0.0"
+ sources."isobject-3.0.1"
+ sources."isstream-0.1.2"
+ sources."istanbul-lib-coverage-3.0.0"
+ (sources."istanbul-lib-instrument-4.0.1" // {
+ dependencies = [
+ sources."semver-6.3.0"
+ ];
+ })
+ sources."jest-haste-map-25.1.0"
+ sources."jest-regex-util-25.1.0"
+ sources."jest-serializer-25.1.0"
+ (sources."jest-util-25.1.0" // {
+ dependencies = [
+ sources."minimist-0.0.8"
+ sources."mkdirp-0.5.1"
+ ];
+ })
+ (sources."jest-worker-25.1.0" // {
+ dependencies = [
+ sources."has-flag-4.0.0"
+ sources."supports-color-7.1.0"
+ ];
+ })
sources."js-tokens-4.0.0"
+ sources."js-yaml-3.13.1"
+ sources."jsbn-0.1.1"
sources."jsesc-2.5.2"
- sources."json-buffer-3.0.0"
sources."json-parse-better-errors-1.0.2"
+ sources."json-schema-0.2.3"
sources."json-schema-traverse-0.4.1"
+ sources."json-stable-stringify-0.0.1"
+ sources."json-stringify-safe-5.0.1"
sources."json5-2.1.1"
+ sources."jsonify-0.0.0"
+ sources."jsonparse-1.3.1"
+ sources."jsprim-1.4.1"
sources."jszip-git://github.com/anmonteiro/jszip#patch-1"
- sources."keyv-3.0.0"
- sources."kind-of-3.2.2"
+ sources."kind-of-6.0.3"
+ sources."labeled-stream-splicer-2.0.2"
sources."lcid-2.0.0"
sources."leven-3.1.0"
sources."levenary-1.1.1"
- sources."load-json-file-1.1.0"
+ sources."lines-and-columns-1.1.6"
sources."loader-runner-2.4.0"
- (sources."loader-utils-1.2.3" // {
+ (sources."loader-utils-1.4.0" // {
dependencies = [
sources."json5-1.0.1"
];
})
- sources."locate-path-2.0.0"
+ sources."locate-path-5.0.0"
sources."lodash-4.17.15"
- sources."log-symbols-2.2.0"
+ sources."lodash.memoize-3.0.4"
sources."loose-envify-1.4.0"
- sources."lowercase-keys-1.0.1"
sources."lru-cache-5.1.1"
sources."magic-string-0.25.6"
- (sources."make-dir-2.1.0" // {
- dependencies = [
- sources."pify-4.0.1"
- ];
- })
+ sources."make-dir-2.1.0"
+ sources."makeerror-1.0.11"
sources."mamacro-0.0.3"
sources."map-age-cleaner-0.1.3"
sources."map-cache-0.2.2"
sources."map-visit-1.0.0"
- sources."math-random-1.0.4"
sources."md5.js-1.3.5"
- (sources."mem-4.3.0" // {
+ sources."mem-4.3.0"
+ sources."memory-fs-0.4.1"
+ sources."merge-stream-2.0.0"
+ (sources."micromatch-4.0.2" // {
dependencies = [
- sources."mimic-fn-2.1.0"
- sources."p-is-promise-2.1.0"
+ sources."braces-3.0.2"
+ sources."fill-range-7.0.1"
+ sources."is-number-7.0.0"
+ sources."to-regex-range-5.0.1"
];
})
- sources."memory-fs-0.5.0"
- sources."merge2-1.3.0"
- sources."micromatch-2.3.11"
sources."miller-rabin-4.0.1"
sources."mime-db-1.43.0"
- sources."mimic-fn-1.2.0"
- sources."mimic-response-1.0.1"
+ sources."mime-types-2.1.26"
+ sources."mimic-fn-2.1.0"
sources."minimalistic-assert-1.0.1"
sources."minimalistic-crypto-utils-1.0.1"
sources."minimatch-3.0.4"
@@ -62225,54 +62819,43 @@ in
sources."is-extendable-1.0.1"
];
})
- (sources."mkdirp-0.5.1" // {
+ sources."mkdirp-1.0.3"
+ sources."module-deps-6.2.2"
+ (sources."move-concurrently-1.0.1" // {
dependencies = [
sources."minimist-0.0.8"
+ sources."mkdirp-0.5.1"
];
})
- sources."move-concurrently-1.0.1"
sources."ms-2.1.2"
- sources."multistream-2.1.1"
sources."nan-2.14.0"
- (sources."nanomatch-1.2.13" // {
- dependencies = [
- sources."arr-diff-4.0.0"
- sources."array-unique-0.3.2"
- sources."kind-of-6.0.3"
- ];
- })
+ sources."nanomatch-1.2.13"
+ sources."ncp-2.0.0"
sources."neo-async-2.6.1"
- (sources."nexe-3.0.0-beta.7" // {
- dependencies = [
- sources."pify-4.0.1"
- ];
- })
sources."nice-try-1.0.5"
sources."node-fetch-2.6.0"
+ sources."node-int64-0.4.0"
(sources."node-libs-browser-2.2.1" // {
dependencies = [
sources."buffer-4.9.2"
- sources."punycode-1.4.1"
+ sources."events-3.1.0"
+ sources."inherits-2.0.3"
+ sources."stream-http-2.8.3"
+ sources."timers-browserify-2.0.11"
+ sources."tty-browserify-0.0.0"
+ sources."util-0.11.1"
];
})
- (sources."node-releases-1.1.49" // {
+ sources."node-modules-regexp-1.0.0"
+ (sources."node-releases-1.1.50" // {
dependencies = [
sources."semver-6.3.0"
];
})
sources."normalize-package-data-2.5.0"
- sources."normalize-path-2.1.1"
- (sources."normalize-url-2.0.1" // {
- dependencies = [
- sources."sort-keys-2.0.0"
- ];
- })
- (sources."npm-conf-1.1.3" // {
- dependencies = [
- sources."pify-3.0.0"
- ];
- })
+ sources."normalize-path-3.0.0"
sources."npm-run-path-2.0.2"
+ sources."oauth-sign-0.9.0"
sources."object-assign-4.1.1"
(sources."object-copy-0.1.0" // {
dependencies = [
@@ -62284,81 +62867,65 @@ in
sources."kind-of-5.1.0"
];
})
+ sources."kind-of-3.2.2"
];
})
+ sources."object-inspect-1.7.0"
sources."object-keys-1.1.1"
- (sources."object-visit-1.0.1" // {
- dependencies = [
- sources."isobject-3.0.1"
- ];
- })
+ sources."object-visit-1.0.1"
sources."object.assign-4.1.0"
- sources."object.omit-2.0.1"
- (sources."object.pick-1.3.0" // {
- dependencies = [
- sources."isobject-3.0.1"
- ];
- })
+ sources."object.getownpropertydescriptors-2.1.0"
+ sources."object.pick-1.3.0"
sources."once-1.4.0"
- sources."onetime-2.0.1"
- (sources."ora-3.4.0" // {
- dependencies = [
- sources."ansi-regex-4.1.0"
- sources."strip-ansi-5.2.0"
- ];
- })
sources."os-browserify-0.3.0"
sources."os-locale-3.1.0"
- sources."p-cancelable-0.4.1"
sources."p-defer-1.0.0"
- sources."p-event-2.3.1"
sources."p-finally-1.0.0"
- sources."p-is-promise-1.1.0"
- sources."p-limit-1.3.0"
- sources."p-locate-2.0.0"
- sources."p-timeout-2.0.1"
- sources."p-try-1.0.0"
+ sources."p-is-promise-2.1.0"
+ sources."p-limit-2.2.2"
+ sources."p-locate-4.1.0"
+ sources."p-try-2.2.0"
sources."pako-1.0.11"
sources."parallel-transform-1.2.0"
- sources."paredit.js-0.3.4"
+ sources."paredit.js-0.3.6"
+ sources."parents-1.0.1"
sources."parse-asn1-5.1.5"
- sources."parse-glob-3.0.4"
- sources."parse-json-2.2.0"
+ sources."parse-json-5.0.0"
sources."parse-passwd-1.0.0"
sources."pascalcase-0.1.1"
sources."path-browserify-0.0.1"
sources."path-dirname-1.0.2"
- sources."path-exists-3.0.0"
+ sources."path-exists-4.0.0"
sources."path-is-absolute-1.0.1"
sources."path-key-2.0.1"
sources."path-parse-1.0.6"
- sources."path-type-1.1.0"
+ sources."path-platform-0.11.15"
sources."pbkdf2-3.0.17"
- sources."pend-1.2.0"
- sources."pify-2.3.0"
- sources."pinkie-2.0.4"
- sources."pinkie-promise-2.0.1"
+ sources."peek-stream-1.1.3"
+ sources."performance-now-2.1.0"
+ sources."picomatch-2.2.1"
+ sources."pify-4.0.1"
+ sources."pinkie-1.0.0"
+ sources."pinkie-promise-1.0.0"
+ sources."pirates-4.0.1"
(sources."pkg-dir-3.0.0" // {
dependencies = [
sources."find-up-3.0.0"
sources."locate-path-3.0.0"
- sources."p-limit-2.2.2"
sources."p-locate-3.0.0"
- sources."p-try-2.2.0"
+ sources."path-exists-3.0.0"
];
})
sources."posix-character-classes-0.1.1"
sources."posix-getopt-git://github.com/anmonteiro/node-getopt#master"
- sources."prepend-http-2.0.0"
- sources."preserve-0.2.0"
- sources."prettier-1.15.1"
+ sources."prettier-1.19.1"
sources."private-0.1.8"
sources."process-0.11.10"
sources."process-nextick-args-2.0.1"
sources."progress-2.0.3"
sources."promise-inflight-1.0.1"
- sources."proto-list-1.2.4"
sources."prr-1.0.1"
+ sources."psl-1.7.0"
sources."public-encrypt-4.0.3"
sources."pump-3.0.0"
(sources."pumpify-1.5.1" // {
@@ -62366,78 +62933,29 @@ in
sources."pump-2.0.1"
];
})
- sources."punycode-2.1.1"
- sources."query-string-5.1.1"
+ sources."punycode-1.4.1"
+ sources."qs-6.5.2"
sources."querystring-0.2.0"
sources."querystring-es3-0.2.1"
- (sources."randomatic-3.1.1" // {
- dependencies = [
- sources."is-number-4.0.0"
- sources."kind-of-6.0.3"
- ];
- })
sources."randombytes-2.1.0"
sources."randomfill-1.0.4"
- (sources."read-pkg-4.0.1" // {
+ sources."read-only-stream-2.0.0"
+ sources."read-pkg-5.2.0"
+ (sources."readable-stream-2.3.7" // {
dependencies = [
- sources."parse-json-4.0.0"
- sources."pify-3.0.0"
+ sources."string_decoder-1.1.1"
];
})
- (sources."read-pkg-up-1.0.1" // {
- dependencies = [
- sources."find-up-1.1.2"
- sources."path-exists-2.1.0"
- sources."read-pkg-1.1.0"
- ];
- })
- sources."readable-stream-2.3.7"
(sources."readdirp-2.2.1" // {
dependencies = [
- sources."arr-diff-4.0.0"
- sources."array-unique-0.3.2"
- sources."braces-2.3.2"
- sources."debug-2.6.9"
- sources."define-property-1.0.0"
- (sources."expand-brackets-2.1.4" // {
- dependencies = [
- sources."define-property-0.2.5"
- ];
- })
- sources."extend-shallow-2.0.1"
- sources."extglob-2.0.4"
- sources."fill-range-4.0.0"
- (sources."is-accessor-descriptor-0.1.6" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- (sources."is-data-descriptor-0.1.4" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- (sources."is-descriptor-0.1.6" // {
- dependencies = [
- sources."kind-of-5.1.0"
- ];
- })
- (sources."is-number-3.0.0" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- sources."isobject-3.0.1"
- sources."kind-of-6.0.3"
sources."micromatch-3.1.10"
- sources."ms-2.0.0"
];
})
+ sources."realpath-native-1.1.0"
sources."regenerate-1.4.0"
sources."regenerate-unicode-properties-8.1.0"
- sources."regenerator-runtime-0.13.3"
- sources."regenerator-transform-0.14.1"
- sources."regex-cache-0.4.4"
+ sources."regenerator-runtime-0.13.4"
+ sources."regenerator-transform-0.14.2"
sources."regex-not-1.0.2"
sources."regexpu-core-4.6.0"
sources."regjsgen-0.5.1"
@@ -62449,24 +62967,14 @@ in
sources."remove-trailing-separator-1.1.0"
sources."repeat-element-1.1.3"
sources."repeat-string-1.6.1"
- sources."repeating-2.0.1"
sources."replace-ext-1.0.0"
+ sources."request-2.88.2"
sources."require-directory-2.1.1"
- sources."require-main-filename-1.0.1"
+ sources."require-main-filename-2.0.0"
sources."resolve-1.15.1"
- sources."resolve-cwd-2.0.0"
- (sources."resolve-dependencies-2.2.3" // {
+ (sources."resolve-cwd-2.0.0" // {
dependencies = [
- sources."dir-glob-2.2.2"
- sources."globby-9.2.0"
- sources."ignore-4.0.6"
- (sources."path-type-3.0.0" // {
- dependencies = [
- sources."pify-3.0.0"
- ];
- })
- sources."pify-4.0.1"
- sources."slash-2.0.0"
+ sources."resolve-from-3.0.0"
];
})
(sources."resolve-dir-1.0.1" // {
@@ -62474,30 +62982,32 @@ in
sources."global-modules-1.0.0"
];
})
- sources."resolve-from-3.0.0"
+ sources."resolve-from-5.0.0"
sources."resolve-url-0.2.1"
- sources."responselike-1.0.2"
- sources."restore-cursor-2.0.0"
sources."ret-0.1.15"
sources."retry-0.12.0"
sources."rimraf-2.7.1"
sources."ripemd160-2.0.2"
- sources."rollup-0.67.0"
- sources."rollup-plugin-babel-4.0.3"
- sources."rollup-plugin-babel-minify-6.1.1"
- (sources."rollup-plugin-commonjs-9.2.0" // {
- dependencies = [
- sources."estree-walker-0.5.2"
- ];
- })
- sources."rollup-plugin-node-resolve-3.4.0"
- sources."rollup-plugin-replace-2.1.0"
+ sources."rollup-1.31.1"
+ sources."rollup-plugin-babel-4.3.3"
+ sources."rollup-plugin-babel-minify-9.1.1"
+ sources."rollup-plugin-commonjs-10.1.0"
+ sources."rollup-plugin-node-resolve-5.2.0"
+ sources."rollup-plugin-replace-2.2.0"
sources."rollup-pluginutils-2.8.2"
+ sources."rsvp-4.8.5"
sources."run-queue-1.0.3"
sources."safe-buffer-5.1.2"
sources."safe-regex-1.1.0"
+ sources."safer-buffer-2.1.2"
+ (sources."sane-4.1.0" // {
+ dependencies = [
+ sources."anymatch-2.0.0"
+ sources."micromatch-3.1.10"
+ sources."normalize-path-2.1.1"
+ ];
+ })
sources."schema-utils-1.0.0"
- sources."seek-bzip-1.0.5"
sources."semver-5.7.1"
sources."serialize-javascript-2.1.2"
sources."set-blocking-2.0.0"
@@ -62508,10 +63018,14 @@ in
})
sources."setimmediate-1.0.5"
sources."sha.js-2.4.11"
+ sources."shasum-1.0.2"
+ sources."shasum-object-1.0.0"
sources."shebang-command-1.2.0"
sources."shebang-regex-1.0.0"
+ sources."shell-quote-1.7.2"
sources."signal-exit-3.0.2"
- sources."slash-1.0.0"
+ sources."simple-concat-1.0.0"
+ sources."slash-3.0.0"
(sources."snapdragon-0.8.2" // {
dependencies = [
sources."debug-2.6.9"
@@ -62535,12 +63049,13 @@ in
(sources."snapdragon-node-2.1.1" // {
dependencies = [
sources."define-property-1.0.0"
- sources."isobject-3.0.1"
];
})
- sources."snapdragon-util-3.0.1"
- sources."sort-keys-1.1.2"
- sources."sort-keys-length-1.0.1"
+ (sources."snapdragon-util-3.0.1" // {
+ dependencies = [
+ sources."kind-of-3.2.2"
+ ];
+ })
sources."source-list-map-0.1.8"
sources."source-map-0.5.7"
sources."source-map-resolve-0.5.3"
@@ -62556,6 +63071,8 @@ in
sources."spdx-expression-parse-3.0.0"
sources."spdx-license-ids-3.0.5"
sources."split-string-3.1.0"
+ sources."sprintf-js-1.0.3"
+ sources."sshpk-1.16.1"
sources."ssri-6.0.1"
(sources."static-extend-0.1.2" // {
dependencies = [
@@ -62575,28 +63092,36 @@ in
];
})
sources."stream-browserify-2.0.2"
+ sources."stream-combiner2-1.1.1"
sources."stream-each-1.2.3"
- sources."stream-http-2.8.3"
- sources."stream-shift-1.0.1"
- sources."strict-uri-encode-1.1.0"
- (sources."string-width-3.1.0" // {
+ (sources."stream-http-3.1.0" // {
dependencies = [
- sources."ansi-regex-4.1.0"
- sources."strip-ansi-5.2.0"
+ sources."readable-stream-3.6.0"
];
})
- sources."string_decoder-1.1.1"
- sources."strip-ansi-3.0.1"
- sources."strip-bom-2.0.0"
- sources."strip-dirs-2.1.0"
- sources."strip-eof-1.0.0"
- sources."strip-outer-1.0.1"
- sources."supports-color-2.0.0"
- sources."tapable-1.1.3"
- sources."tar-stream-1.6.2"
- (sources."terser-4.6.3" // {
+ sources."stream-shift-1.0.1"
+ sources."stream-splicer-2.0.1"
+ sources."string-width-3.1.0"
+ sources."string.prototype.trimleft-2.1.1"
+ sources."string.prototype.trimright-2.1.1"
+ (sources."string_decoder-1.3.0" // {
+ dependencies = [
+ sources."safe-buffer-5.2.0"
+ ];
+ })
+ sources."strip-ansi-5.2.0"
+ sources."strip-eof-1.0.0"
+ sources."subarg-1.0.0"
+ sources."supports-color-5.5.0"
+ sources."syntax-error-1.4.0"
+ sources."tapable-1.1.3"
+ (sources."tar-stream-2.1.0" // {
+ dependencies = [
+ sources."readable-stream-3.6.0"
+ ];
+ })
+ (sources."terser-4.6.4" // {
dependencies = [
- sources."commander-2.20.3"
sources."source-map-0.6.1"
];
})
@@ -62605,29 +63130,34 @@ in
sources."source-map-0.6.1"
];
})
- sources."test-exclude-4.2.3"
+ sources."test-exclude-6.0.0"
sources."through-2.3.8"
sources."through2-2.0.5"
- sources."timed-out-4.0.1"
- sources."timers-browserify-2.0.11"
+ sources."timers-browserify-1.4.2"
+ sources."tmpl-1.0.4"
sources."to-arraybuffer-1.0.1"
- sources."to-buffer-1.1.1"
sources."to-fast-properties-2.0.0"
- sources."to-object-path-0.3.0"
- sources."to-readable-stream-1.0.0"
- sources."to-regex-3.0.2"
- (sources."to-regex-range-2.1.1" // {
+ (sources."to-object-path-0.3.0" // {
dependencies = [
- sources."is-number-3.0.0"
+ sources."kind-of-3.2.2"
];
})
- sources."trim-repeated-1.0.0"
- sources."trim-right-1.0.1"
- sources."tslib-1.10.0"
- sources."tty-browserify-0.0.0"
+ sources."to-regex-3.0.2"
+ sources."to-regex-range-2.1.1"
+ (sources."tough-cookie-2.5.0" // {
+ dependencies = [
+ sources."punycode-2.1.1"
+ ];
+ })
+ sources."tslib-1.11.0"
+ sources."tty-browserify-0.0.1"
sources."tunnel-agent-0.6.0"
+ sources."tweetnacl-0.14.5"
+ sources."type-fest-0.6.0"
sources."typedarray-0.0.6"
- sources."unbzip2-stream-1.3.3"
+ sources."typedarray-to-buffer-3.1.5"
+ sources."umd-3.0.3"
+ sources."undeclared-identifiers-1.1.3"
sources."unicode-canonical-property-names-ecmascript-1.0.4"
sources."unicode-match-property-ecmascript-1.0.4"
sources."unicode-match-property-value-ecmascript-1.1.0"
@@ -62643,79 +63173,55 @@ in
];
})
sources."has-values-0.1.4"
- sources."isobject-3.0.1"
];
})
sources."upath-1.2.0"
- sources."uri-js-4.2.2"
+ (sources."uri-js-4.2.2" // {
+ dependencies = [
+ sources."punycode-2.1.1"
+ ];
+ })
sources."urix-0.1.0"
(sources."url-0.11.0" // {
dependencies = [
sources."punycode-1.3.2"
];
})
- sources."url-parse-lax-3.0.0"
- sources."url-to-options-1.0.1"
sources."use-3.1.1"
- (sources."util-0.11.1" // {
+ (sources."util-0.10.4" // {
dependencies = [
sources."inherits-2.0.3"
];
})
sources."util-deprecate-1.0.2"
+ sources."util.promisify-1.0.1"
+ sources."uuid-3.4.0"
sources."v8-compile-cache-2.0.3"
sources."validate-npm-package-license-3.0.4"
+ sources."verror-1.10.0"
sources."vinyl-2.2.0"
sources."vm-browserify-1.1.2"
+ sources."walker-1.0.7"
sources."watchpack-1.6.0"
- sources."wcwidth-1.0.1"
(sources."webpack-4.41.6" // {
dependencies = [
- sources."arr-diff-4.0.0"
- sources."array-unique-0.3.2"
- sources."braces-2.3.2"
- sources."debug-2.6.9"
- sources."define-property-1.0.0"
- sources."eslint-scope-4.0.3"
- (sources."expand-brackets-2.1.4" // {
- dependencies = [
- sources."define-property-0.2.5"
- ];
- })
- sources."extend-shallow-2.0.1"
- sources."extglob-2.0.4"
- sources."fill-range-4.0.0"
- (sources."is-accessor-descriptor-0.1.6" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- (sources."is-data-descriptor-0.1.4" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- (sources."is-descriptor-0.1.6" // {
- dependencies = [
- sources."kind-of-5.1.0"
- ];
- })
- (sources."is-number-3.0.0" // {
- dependencies = [
- sources."kind-of-3.2.2"
- ];
- })
- sources."isobject-3.0.1"
- sources."kind-of-6.0.3"
- sources."memory-fs-0.4.1"
+ sources."acorn-6.4.0"
sources."micromatch-3.1.10"
- sources."ms-2.0.0"
+ sources."minimist-0.0.8"
+ sources."mkdirp-0.5.1"
];
})
(sources."webpack-cli-3.3.11" // {
dependencies = [
+ (sources."chalk-2.4.2" // {
+ dependencies = [
+ sources."supports-color-5.5.0"
+ ];
+ })
+ sources."emojis-list-2.1.0"
sources."enhanced-resolve-4.1.0"
- sources."memory-fs-0.4.1"
+ sources."json5-1.0.1"
+ sources."loader-utils-1.2.3"
sources."supports-color-6.1.0"
];
})
@@ -62734,19 +63240,13 @@ in
sources."which-module-2.0.0"
(sources."which-promise-1.0.0" // {
dependencies = [
- sources."pinkie-1.0.0"
- sources."pinkie-promise-1.0.0"
+ sources."pify-2.3.0"
];
})
sources."worker-farm-1.7.0"
- (sources."wrap-ansi-5.1.0" // {
- dependencies = [
- sources."ansi-regex-4.1.0"
- sources."ansi-styles-3.2.1"
- sources."strip-ansi-5.2.0"
- ];
- })
+ sources."wrap-ansi-5.1.0"
sources."wrappy-1.0.2"
+ sources."write-file-atomic-3.0.3"
sources."xtend-4.0.2"
sources."y18n-4.0.0"
sources."yallist-3.1.1"
@@ -62754,14 +63254,11 @@ in
dependencies = [
sources."find-up-3.0.0"
sources."locate-path-3.0.0"
- sources."p-limit-2.2.2"
sources."p-locate-3.0.0"
- sources."p-try-2.2.0"
- sources."require-main-filename-2.0.0"
+ sources."path-exists-3.0.0"
];
})
sources."yargs-parser-13.1.1"
- sources."yauzl-2.10.0"
];
buildInputs = globalBuildInputs;
meta = {
@@ -62801,11 +63298,11 @@ in
sha512 = "tpBlUsnJfJ5xMHAjBC/10s8Un/WT/FmF+xXaZjeaegESmjcPlEcxZ+UuCtxArETovLS5gZ8lZXzdhgslHziLsg==";
};
dependencies = [
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
sources."ansi-styles-3.2.1"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
- sources."async-3.1.1"
+ sources."async-3.2.0"
sources."asynckit-0.4.0"
sources."aws-sign2-0.7.0"
sources."aws4-1.9.1"
@@ -63381,7 +63878,7 @@ in
sources."longest-1.0.1"
sources."lru-cache-2.7.3"
sources."lru-queue-0.1.0"
- sources."make-error-1.3.5"
+ sources."make-error-1.3.6"
sources."make-error-cause-1.2.2"
sources."make-iterator-1.0.1"
sources."map-cache-0.2.2"
@@ -63594,8 +64091,8 @@ in
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
sources."type-1.2.0"
- sources."typescript-3.7.5"
- (sources."uglify-js-3.7.7" // {
+ sources."typescript-3.8.2"
+ (sources."uglify-js-3.8.0" // {
dependencies = [
sources."source-map-0.6.1"
];
@@ -63818,14 +64315,14 @@ in
sources."esprima-4.0.1"
sources."extend-3.0.2"
sources."form-data-2.5.1"
- sources."formidable-1.2.1"
+ sources."formidable-1.2.2"
sources."graphlib-2.1.8"
sources."inherits-2.0.4"
sources."isarray-1.0.0"
sources."js-yaml-3.13.1"
- (sources."json-refs-3.0.13" // {
+ (sources."json-refs-3.0.15" // {
dependencies = [
- sources."commander-2.19.0"
+ sources."commander-4.1.1"
];
})
sources."lodash-4.17.15"
@@ -63841,7 +64338,7 @@ in
sources."qs-6.9.1"
sources."readable-stream-2.3.7"
sources."safe-buffer-5.1.2"
- sources."slash-2.0.0"
+ sources."slash-3.0.0"
sources."sprintf-js-1.0.3"
sources."string_decoder-1.1.1"
sources."superagent-3.8.3"
@@ -63953,7 +64450,7 @@ in
};
dependencies = [
sources."abbrev-1.1.1"
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
sources."ansi-regex-2.1.1"
sources."aproba-1.2.0"
sources."are-we-there-yet-1.1.5"
@@ -64179,7 +64676,7 @@ in
sources."hawk-3.1.3"
sources."headless-0.1.7"
sources."hoek-2.16.3"
- sources."hosted-git-info-2.8.5"
+ sources."hosted-git-info-2.8.6"
sources."http-errors-1.7.2"
sources."http-signature-1.1.1"
sources."iconv-lite-0.4.24"
@@ -64188,7 +64685,7 @@ in
sources."inherits-2.0.3"
sources."ini-1.3.5"
sources."invert-kv-1.0.0"
- sources."ipaddr.js-1.9.0"
+ sources."ipaddr.js-1.9.1"
sources."is-arrayish-0.2.1"
sources."is-finite-1.1.0"
sources."is-fullwidth-code-point-1.0.0"
@@ -64262,7 +64759,7 @@ in
sources."pinkie-promise-2.0.1"
sources."plist-1.2.0"
sources."process-nextick-args-2.0.1"
- sources."proxy-addr-2.0.5"
+ sources."proxy-addr-2.0.6"
sources."punycode-1.4.1"
sources."qs-6.7.0"
sources."range-parser-1.2.1"
@@ -64710,7 +65207,7 @@ in
sources."inflight-1.0.6"
sources."inherits-2.0.3"
sources."ini-1.3.5"
- sources."ipaddr.js-1.9.0"
+ sources."ipaddr.js-1.9.1"
sources."is-absolute-1.0.0"
sources."is-callable-1.1.5"
sources."is-date-object-1.0.2"
@@ -64775,7 +65272,7 @@ in
];
})
sources."moment-2.24.0"
- sources."moment-timezone-0.5.27"
+ sources."moment-timezone-0.5.28"
(sources."mqtt-2.18.8" // {
dependencies = [
sources."readable-stream-2.3.7"
@@ -64841,7 +65338,7 @@ in
sources."pause-0.0.1"
sources."performance-now-2.1.0"
sources."process-nextick-args-2.0.1"
- sources."proxy-addr-2.0.5"
+ sources."proxy-addr-2.0.6"
sources."pseudomap-1.0.2"
sources."psl-1.7.0"
sources."pump-3.0.0"
@@ -64857,7 +65354,7 @@ in
sources."raw-body-2.4.0"
sources."rc-1.2.8"
sources."readable-stream-3.6.0"
- sources."regenerator-runtime-0.13.3"
+ sources."regenerator-runtime-0.13.4"
sources."reinterval-1.1.0"
sources."remove-trailing-separator-1.1.0"
(sources."request-2.88.0" // {
@@ -64983,7 +65480,7 @@ in
};
dependencies = [
sources."abbrev-1.1.1"
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
sources."ansi-regex-2.1.1"
sources."aproba-1.2.0"
sources."are-we-there-yet-1.1.5"
@@ -65039,7 +65536,7 @@ in
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."has-unicode-2.0.1"
- sources."hosted-git-info-2.8.5"
+ sources."hosted-git-info-2.8.6"
sources."http-signature-1.2.0"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
@@ -65290,10 +65787,10 @@ in
npm = nodeEnv.buildNodePackage {
name = "npm";
packageName = "npm";
- version = "6.13.7";
+ version = "6.14.0";
src = fetchurl {
- url = "https://registry.npmjs.org/npm/-/npm-6.13.7.tgz";
- sha512 = "X967EKTT407CvgrWFjXusnPh0VLERcmR9hZFSVgkEquOomZkvpwLJ5zrQ3qrG9SpPLKJE4bPLUu76exKQ4a3Cg==";
+ url = "https://registry.npmjs.org/npm/-/npm-6.14.0.tgz";
+ sha512 = "OgfdLadz7j6dikbpaimmLzMxwLKbXthQXHiJwtegorwtBVnhecfUeYkHopwd5ICaiClQnqlYQCHERXDiYK3Jcw==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -65414,7 +65911,7 @@ in
sources."has-ansi-2.0.0"
sources."has-flag-4.0.0"
sources."has-yarn-2.1.0"
- sources."hosted-git-info-3.0.2"
+ sources."hosted-git-info-3.0.3"
sources."http-cache-semantics-4.0.4"
sources."http-proxy-agent-3.0.0"
sources."https-proxy-agent-4.0.0"
@@ -65664,7 +66161,7 @@ in
};
dependencies = [
sources."abbrev-1.1.1"
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
sources."ansi-regex-2.1.1"
sources."aproba-1.2.0"
sources."are-we-there-yet-1.1.5"
@@ -65988,7 +66485,7 @@ in
];
})
sources."acorn-walk-6.2.0"
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
sources."alphanum-sort-1.0.2"
sources."ansi-regex-3.0.0"
sources."ansi-styles-3.2.1"
@@ -66076,7 +66573,7 @@ in
sources."callsites-2.0.0"
sources."camelcase-5.3.1"
sources."caniuse-api-3.0.0"
- sources."caniuse-lite-1.0.30001027"
+ sources."caniuse-lite-1.0.30001030"
sources."caseless-0.12.0"
sources."chalk-2.4.2"
sources."chokidar-2.1.8"
@@ -66149,7 +66646,6 @@ in
];
})
sources."css-tree-1.0.0-alpha.37"
- sources."css-unit-converter-1.1.1"
sources."css-what-3.2.1"
sources."cssesc-0.1.0"
sources."cssnano-4.1.10"
@@ -66212,7 +66708,7 @@ in
sources."duplexer2-0.1.4"
sources."ecc-jsbn-0.1.2"
sources."ee-first-1.1.1"
- sources."electron-to-chromium-1.3.353"
+ sources."electron-to-chromium-1.3.360"
sources."elliptic-6.5.2"
sources."emoji-regex-7.0.3"
sources."encodeurl-1.0.2"
@@ -66310,7 +66806,7 @@ in
(sources."htmlnano-0.2.5" // {
dependencies = [
sources."posthtml-0.12.0"
- sources."terser-4.6.3"
+ sources."terser-4.6.4"
];
})
(sources."htmlparser2-3.10.1" // {
@@ -66462,7 +66958,7 @@ in
sources."punycode-1.4.1"
];
})
- (sources."node-releases-1.1.49" // {
+ (sources."node-releases-1.1.50" // {
dependencies = [
sources."semver-6.3.0"
];
@@ -66509,12 +67005,16 @@ in
sources."physical-cpu-count-2.0.0"
sources."pn-1.1.0"
sources."posix-character-classes-0.1.1"
- (sources."postcss-7.0.26" // {
+ (sources."postcss-7.0.27" // {
dependencies = [
sources."supports-color-6.1.0"
];
})
- sources."postcss-calc-7.0.1"
+ (sources."postcss-calc-7.0.2" // {
+ dependencies = [
+ sources."postcss-value-parser-4.0.3"
+ ];
+ })
sources."postcss-colormin-4.0.3"
sources."postcss-convert-values-4.0.1"
sources."postcss-discard-comments-4.0.2"
@@ -66567,9 +67067,9 @@ in
sources."postcss-ordered-values-4.1.2"
sources."postcss-reduce-initial-4.0.3"
sources."postcss-reduce-transforms-4.0.2"
- (sources."postcss-selector-parser-5.0.0" // {
+ (sources."postcss-selector-parser-6.0.2" // {
dependencies = [
- sources."cssesc-2.0.0"
+ sources."cssesc-3.0.0"
];
})
sources."postcss-svgo-4.0.2"
@@ -66577,7 +67077,7 @@ in
sources."postcss-value-parser-3.3.1"
sources."posthtml-0.11.6"
sources."posthtml-parser-0.4.2"
- sources."posthtml-render-1.1.5"
+ sources."posthtml-render-1.2.0"
sources."prelude-ls-1.1.2"
sources."private-0.1.8"
sources."process-0.11.10"
@@ -66585,12 +67085,7 @@ in
sources."psl-1.7.0"
sources."public-encrypt-4.0.3"
sources."punycode-2.1.1"
- (sources."purgecss-1.4.2" // {
- dependencies = [
- sources."cssesc-3.0.0"
- sources."postcss-selector-parser-6.0.2"
- ];
- })
+ sources."purgecss-1.4.2"
sources."q-1.5.1"
sources."qs-6.5.2"
sources."querystring-0.2.0"
@@ -66607,8 +67102,8 @@ in
sources."readdirp-2.2.1"
sources."regenerate-1.4.0"
sources."regenerate-unicode-properties-8.1.0"
- sources."regenerator-runtime-0.13.3"
- sources."regenerator-transform-0.14.1"
+ sources."regenerator-runtime-0.13.4"
+ sources."regenerator-transform-0.14.2"
(sources."regex-not-1.0.2" // {
dependencies = [
sources."extend-shallow-3.0.2"
@@ -66753,9 +67248,7 @@ in
sources."typedarray-0.0.6"
(sources."uncss-0.17.3" // {
dependencies = [
- sources."cssesc-3.0.0"
sources."is-absolute-url-3.0.3"
- sources."postcss-selector-parser-6.0.2"
];
})
sources."unicode-canonical-property-names-ecmascript-1.0.4"
@@ -66835,6 +67328,289 @@ in
bypassCache = true;
reconstructLock = true;
};
+ parsoid = nodeEnv.buildNodePackage {
+ name = "parsoid";
+ packageName = "parsoid";
+ version = "0.11.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/parsoid/-/parsoid-0.11.0.tgz";
+ sha512 = "EGaqfG5nB5J+1P1qCZVkhLqIl1H9saR8a6Ro90yMmGRKCyPUDMEBkju4yNiOtV3cSJncl8jYk/Xz6wdmnV95Mw==";
+ };
+ dependencies = [
+ (sources."accepts-1.3.7" // {
+ dependencies = [
+ sources."negotiator-0.6.2"
+ ];
+ })
+ sources."ajv-6.12.0"
+ sources."ansi-regex-4.1.0"
+ sources."ansi-styles-3.2.1"
+ sources."argparse-1.0.10"
+ sources."array-flatten-1.1.1"
+ sources."asap-2.0.6"
+ sources."asn1-0.2.4"
+ sources."assert-plus-1.0.0"
+ sources."async-0.9.2"
+ sources."asynckit-0.4.0"
+ sources."aws-sign2-0.7.0"
+ sources."aws4-1.9.1"
+ sources."babybird-0.0.1"
+ sources."balanced-match-1.0.0"
+ sources."bcrypt-pbkdf-1.0.2"
+ sources."bindings-1.5.0"
+ sources."bl-1.2.2"
+ sources."bluebird-3.7.2"
+ (sources."body-parser-1.19.0" // {
+ dependencies = [
+ sources."bytes-3.1.0"
+ sources."content-type-1.0.4"
+ ];
+ })
+ sources."brace-expansion-1.1.11"
+ sources."bunyan-1.8.12"
+ sources."bunyan-syslog-udp-0.2.0"
+ sources."busboy-0.3.1"
+ sources."bytes-3.0.0"
+ sources."camelcase-5.3.1"
+ sources."caseless-0.12.0"
+ sources."clarinet-0.11.0"
+ sources."cliui-5.0.0"
+ sources."color-convert-1.9.3"
+ sources."color-name-1.1.3"
+ sources."colors-1.4.0"
+ sources."combined-stream-1.0.8"
+ sources."commander-2.20.3"
+ sources."compressible-2.0.18"
+ sources."compression-1.7.4"
+ sources."concat-map-0.0.1"
+ sources."connect-busboy-0.0.2"
+ sources."content-disposition-0.5.3"
+ sources."content-type-git+https://github.com/wikimedia/content-type.git#master"
+ sources."cookie-0.4.0"
+ sources."cookie-signature-1.0.6"
+ sources."core-js-2.6.11"
+ sources."core-util-is-1.0.2"
+ sources."dashdash-1.14.1"
+ sources."debug-2.6.9"
+ sources."decamelize-1.2.0"
+ sources."define-properties-1.1.3"
+ sources."delayed-stream-1.0.0"
+ sources."depd-1.1.2"
+ sources."destroy-1.0.4"
+ sources."dicer-0.3.0"
+ sources."dnscache-1.0.2"
+ sources."dom-storage-2.1.0"
+ sources."domino-2.1.4"
+ sources."dtrace-provider-0.8.8"
+ sources."ecc-jsbn-0.1.2"
+ sources."ee-first-1.1.1"
+ sources."emoji-regex-7.0.3"
+ sources."encodeurl-1.0.2"
+ sources."entities-1.1.2"
+ sources."errno-0.1.7"
+ sources."escape-html-1.0.3"
+ sources."esprima-4.0.1"
+ sources."etag-1.8.1"
+ (sources."express-4.17.1" // {
+ dependencies = [
+ sources."content-type-1.0.4"
+ ];
+ })
+ sources."express-handlebars-3.1.0"
+ sources."extend-3.0.2"
+ sources."extsprintf-1.3.0"
+ sources."fast-deep-equal-3.1.1"
+ sources."fast-json-stable-stringify-2.1.0"
+ sources."file-uri-to-path-1.0.0"
+ sources."finalhandler-1.1.2"
+ sources."find-up-3.0.0"
+ sources."forever-agent-0.6.1"
+ sources."form-data-2.3.3"
+ sources."forwarded-0.1.2"
+ sources."fresh-0.5.2"
+ sources."fs.realpath-1.0.0"
+ sources."function-bind-1.1.1"
+ sources."gc-stats-1.4.0"
+ sources."gelf-stream-1.1.1"
+ sources."gelfling-0.3.1"
+ sources."get-caller-file-2.0.5"
+ sources."getpass-0.1.7"
+ sources."glob-7.1.6"
+ sources."graceful-fs-4.2.3"
+ sources."handlebars-4.7.3"
+ sources."har-schema-2.0.0"
+ sources."har-validator-5.1.3"
+ sources."has-symbols-1.0.1"
+ sources."hat-0.0.3"
+ sources."heapdump-0.3.15"
+ sources."hot-shots-6.8.7"
+ sources."http-errors-1.7.2"
+ sources."http-signature-1.2.0"
+ sources."iconv-lite-0.4.24"
+ sources."inflight-1.0.6"
+ sources."inherits-2.0.3"
+ sources."ipaddr.js-1.9.1"
+ sources."is-arguments-1.0.4"
+ sources."is-fullwidth-code-point-2.0.0"
+ sources."is-typedarray-1.0.0"
+ sources."isarray-1.0.0"
+ sources."isstream-0.1.2"
+ sources."js-yaml-3.13.1"
+ sources."jsbn-0.1.1"
+ sources."json-schema-0.2.3"
+ sources."json-schema-traverse-0.4.1"
+ sources."json-stringify-safe-5.0.1"
+ sources."jsprim-1.4.1"
+ (sources."kad-git+https://github.com/wikimedia/kad.git#master" // {
+ dependencies = [
+ sources."ms-0.7.3"
+ ];
+ })
+ sources."kad-fs-0.0.4"
+ sources."kad-localstorage-0.0.7"
+ sources."kad-memstore-0.0.1"
+ sources."limitation-0.2.1"
+ sources."locate-path-3.0.0"
+ sources."lodash-4.17.15"
+ sources."lodash.clone-4.5.0"
+ sources."media-typer-0.3.0"
+ sources."mediawiki-title-0.6.5"
+ sources."merge-1.2.1"
+ sources."merge-descriptors-1.0.1"
+ sources."methods-1.1.2"
+ sources."mime-1.6.0"
+ sources."mime-db-1.43.0"
+ sources."mime-types-2.1.26"
+ sources."minimatch-3.0.4"
+ sources."minimist-0.0.10"
+ (sources."mkdirp-0.5.1" // {
+ dependencies = [
+ sources."minimist-0.0.8"
+ ];
+ })
+ sources."moment-2.24.0"
+ sources."ms-2.0.0"
+ sources."msgpack5-3.6.0"
+ sources."mv-2.1.1"
+ sources."nan-2.14.0"
+ sources."ncp-2.0.0"
+ sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access"
+ sources."neo-async-2.6.1"
+ sources."oauth-sign-0.9.0"
+ sources."object-keys-1.1.1"
+ sources."object.assign-4.1.0"
+ sources."on-finished-2.3.0"
+ sources."on-headers-1.0.2"
+ sources."once-1.4.0"
+ sources."optimist-0.6.1"
+ sources."p-limit-2.2.2"
+ sources."p-locate-3.0.0"
+ sources."p-try-2.2.0"
+ sources."parseurl-1.3.3"
+ sources."path-exists-3.0.0"
+ sources."path-is-absolute-1.0.1"
+ sources."path-to-regexp-0.1.7"
+ sources."performance-now-2.1.0"
+ sources."pn-1.1.0"
+ sources."prfun-2.1.5"
+ sources."process-nextick-args-2.0.1"
+ sources."promise-8.0.3"
+ sources."proxy-addr-2.0.6"
+ sources."prr-1.0.1"
+ sources."psl-1.7.0"
+ sources."punycode-2.1.1"
+ sources."qs-6.7.0"
+ sources."range-parser-1.2.1"
+ (sources."raw-body-2.4.0" // {
+ dependencies = [
+ sources."bytes-3.1.0"
+ ];
+ })
+ sources."readable-stream-2.3.7"
+ (sources."request-2.88.2" // {
+ dependencies = [
+ sources."qs-6.5.2"
+ ];
+ })
+ sources."require-directory-2.1.1"
+ sources."require-main-filename-2.0.0"
+ (sources."rimraf-2.4.5" // {
+ dependencies = [
+ sources."glob-6.0.4"
+ ];
+ })
+ sources."safe-buffer-5.1.2"
+ sources."safe-json-stringify-1.2.0"
+ sources."safer-buffer-2.1.2"
+ sources."semver-6.3.0"
+ (sources."send-0.17.1" // {
+ dependencies = [
+ sources."ms-2.1.1"
+ ];
+ })
+ (sources."serve-favicon-2.5.0" // {
+ dependencies = [
+ sources."ms-2.1.1"
+ sources."safe-buffer-5.1.1"
+ ];
+ })
+ sources."serve-static-1.14.1"
+ (sources."service-runner-2.7.6" // {
+ dependencies = [
+ sources."semver-7.1.3"
+ sources."yargs-14.2.2"
+ ];
+ })
+ sources."set-blocking-2.0.0"
+ sources."setprototypeof-1.1.1"
+ sources."simplediff-0.1.1"
+ sources."source-map-0.6.1"
+ sources."sprintf-js-1.0.3"
+ sources."sshpk-1.16.1"
+ sources."statuses-1.5.0"
+ sources."streamsearch-0.1.2"
+ sources."string-width-3.1.0"
+ sources."string_decoder-1.1.1"
+ sources."strip-ansi-5.2.0"
+ sources."toidentifier-1.0.0"
+ sources."tough-cookie-2.5.0"
+ sources."tunnel-agent-0.6.0"
+ sources."tweetnacl-0.14.5"
+ sources."type-is-1.6.18"
+ sources."uglify-js-3.8.0"
+ sources."unix-dgram-2.0.3"
+ sources."unpipe-1.0.0"
+ sources."uri-js-4.2.2"
+ sources."util-deprecate-1.0.2"
+ sources."utils-merge-1.0.1"
+ sources."uuid-3.4.0"
+ sources."vary-1.1.2"
+ sources."verror-1.10.0"
+ sources."which-module-2.0.0"
+ sources."wikimedia-langconv-0.1.0"
+ sources."wikipeg-2.0.3"
+ sources."wordwrap-0.0.3"
+ sources."worker-farm-1.7.0"
+ sources."wrap-ansi-5.1.0"
+ sources."wrappy-1.0.2"
+ sources."y18n-4.0.0"
+ (sources."yargs-13.3.0" // {
+ dependencies = [
+ sources."yargs-parser-13.1.1"
+ ];
+ })
+ sources."yargs-parser-15.0.0"
+ ];
+ buildInputs = globalBuildInputs;
+ meta = {
+ description = "A bidirectional runtime wikitext parser. Converts back and forth between wikitext and HTML/XML DOM with RDFa.";
+ homepage = "https://github.com/wikimedia/parsoid#readme";
+ license = "GPL-2.0+";
+ };
+ production = true;
+ bypassCache = true;
+ reconstructLock = true;
+ };
peerflix = nodeEnv.buildNodePackage {
name = "peerflix";
packageName = "peerflix";
@@ -66943,7 +67719,7 @@ in
sources."has-flag-3.0.0"
sources."has-symbols-1.0.1"
sources."hat-0.0.3"
- sources."hosted-git-info-2.8.5"
+ sources."hosted-git-info-2.8.6"
sources."http-headers-3.0.2"
sources."iconv-lite-0.4.24"
sources."immediate-chunk-store-1.0.8"
@@ -67169,7 +67945,7 @@ in
sources."accepts-1.3.7"
sources."addr-to-ip-port-1.5.1"
sources."after-0.8.2"
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
sources."archiver-3.1.1"
(sources."archiver-utils-2.1.0" // {
dependencies = [
@@ -67319,7 +68095,7 @@ in
sources."inherits-2.0.4"
sources."ip-1.1.5"
sources."ip-set-1.0.2"
- sources."ipaddr.js-1.9.0"
+ sources."ipaddr.js-1.9.1"
sources."is-typedarray-1.0.0"
sources."isarray-1.0.0"
sources."isexe-2.0.0"
@@ -67397,7 +68173,7 @@ in
sources."pend-1.2.0"
sources."performance-now-2.1.0"
sources."process-nextick-args-2.0.1"
- sources."proxy-addr-2.0.5"
+ sources."proxy-addr-2.0.6"
sources."psl-1.7.0"
sources."pump-3.0.0"
sources."punycode-2.1.1"
@@ -68038,7 +68814,7 @@ in
sha1 = "c8fa1fffb8258ce68adf75df73f90fbb6f23d198";
};
dependencies = [
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."asynckit-0.4.0"
@@ -68288,10 +69064,10 @@ in
serverless = nodeEnv.buildNodePackage {
name = "serverless";
packageName = "serverless";
- version = "1.63.0";
+ version = "1.64.0";
src = fetchurl {
- url = "https://registry.npmjs.org/serverless/-/serverless-1.63.0.tgz";
- sha512 = "dMwUiAsVoE+25R2jmD0+DfRf9VpvjBN8mgqweXtvm3k6TP536a9Wug8Ue6pc0KpEPc++zg5lIyd1zlTlrSHnPg==";
+ url = "https://registry.npmjs.org/serverless/-/serverless-1.64.0.tgz";
+ sha512 = "N1Ls4ecV1++ZYqZ6RRVUOqMrHZrwBW/nvy/P1N7FCfJX1k9LQMtUe6wa4X5+q0kiFdhIHYYCteHcpSGJbyOwTw==";
};
dependencies = [
sources."2-thenable-1.0.0"
@@ -68307,7 +69083,7 @@ in
sources."semver-6.3.0"
];
})
- (sources."@serverless/enterprise-plugin-3.4.0" // {
+ (sources."@serverless/enterprise-plugin-3.4.1" // {
dependencies = [
sources."fs-extra-8.1.0"
sources."node-fetch-2.6.0"
@@ -68358,7 +69134,7 @@ in
sources."async-limiter-1.0.1"
sources."asynckit-0.4.0"
sources."atob-2.1.2"
- (sources."aws-sdk-2.620.0" // {
+ (sources."aws-sdk-2.626.0" // {
dependencies = [
sources."buffer-4.9.1"
sources."uuid-3.3.2"
@@ -68469,32 +69245,19 @@ in
sources."debug-4.1.1"
sources."decamelize-1.2.0"
sources."decode-uri-component-0.2.0"
- (sources."decompress-4.2.0" // {
- dependencies = [
- sources."pify-2.3.0"
- ];
- })
+ sources."decompress-4.2.0"
sources."decompress-response-3.3.0"
- (sources."decompress-tar-4.1.1" // {
- dependencies = [
- sources."file-type-5.2.0"
- ];
- })
+ sources."decompress-tar-4.1.1"
(sources."decompress-tarbz2-4.1.1" // {
dependencies = [
sources."file-type-6.2.0"
];
})
- (sources."decompress-targz-4.1.1" // {
- dependencies = [
- sources."file-type-5.2.0"
- ];
- })
+ sources."decompress-targz-4.1.1"
(sources."decompress-unzip-4.0.1" // {
dependencies = [
sources."file-type-3.9.0"
sources."get-stream-2.3.1"
- sources."pify-2.3.0"
];
})
sources."deep-extend-0.6.0"
@@ -68508,6 +69271,7 @@ in
dependencies = [
sources."@sindresorhus/is-0.7.0"
sources."cacheable-request-2.1.4"
+ sources."file-type-8.1.0"
sources."get-stream-3.0.0"
sources."got-8.3.2"
sources."http-cache-semantics-3.8.1"
@@ -68515,6 +69279,7 @@ in
sources."lowercase-keys-1.0.0"
sources."normalize-url-2.0.1"
sources."p-cancelable-0.4.1"
+ sources."pify-3.0.0"
sources."sort-keys-2.0.0"
];
})
@@ -68553,7 +69318,7 @@ in
sources."fast-levenshtein-2.0.6"
sources."fd-slicer-1.1.0"
sources."figures-3.2.0"
- sources."file-type-8.1.0"
+ sources."file-type-5.2.0"
sources."filename-reserved-regex-2.0.0"
sources."filenamify-2.1.0"
sources."filesize-3.6.1"
@@ -68562,7 +69327,7 @@ in
sources."flat-5.0.0"
sources."for-in-1.0.2"
sources."form-data-2.5.1"
- sources."formidable-1.2.1"
+ sources."formidable-1.2.2"
sources."fragment-cache-0.2.1"
sources."from2-2.3.0"
sources."fs-constants-1.0.0"
@@ -68585,11 +69350,7 @@ in
sources."glob-7.1.6"
sources."glob-parent-5.1.0"
sources."global-dirs-0.1.1"
- (sources."globby-6.1.0" // {
- dependencies = [
- sources."pify-2.3.0"
- ];
- })
+ sources."globby-6.1.0"
sources."got-9.6.0"
sources."graceful-fs-4.2.3"
sources."graceful-readlink-1.0.1"
@@ -68701,7 +69462,11 @@ in
sources."lru-cache-4.1.5"
sources."lru-queue-0.1.0"
sources."lsmod-1.0.0"
- sources."make-dir-1.3.0"
+ (sources."make-dir-1.3.0" // {
+ dependencies = [
+ sources."pify-3.0.0"
+ ];
+ })
sources."map-cache-0.2.2"
sources."map-visit-1.0.0"
sources."memoizee-0.4.14"
@@ -68732,7 +69497,11 @@ in
sources."node-fetch-1.7.3"
sources."normalize-path-3.0.0"
sources."normalize-url-4.5.0"
- sources."npm-conf-1.1.3"
+ (sources."npm-conf-1.1.3" // {
+ dependencies = [
+ sources."pify-3.0.0"
+ ];
+ })
sources."npm-run-path-2.0.2"
sources."object-assign-4.1.1"
(sources."object-copy-0.1.0" // {
@@ -68780,7 +69549,7 @@ in
sources."path-loader-1.0.10"
sources."pend-1.2.0"
sources."picomatch-2.2.1"
- sources."pify-3.0.0"
+ sources."pify-2.3.0"
sources."pinkie-2.0.4"
sources."pinkie-promise-2.0.1"
sources."prepend-http-2.0.0"
@@ -68803,7 +69572,7 @@ in
sources."rc-1.2.8"
sources."readable-stream-2.3.7"
sources."readdirp-3.3.0"
- sources."regenerator-runtime-0.13.3"
+ sources."regenerator-runtime-0.13.4"
sources."regex-not-1.0.2"
sources."registry-auth-token-4.1.1"
sources."registry-url-5.1.0"
@@ -68931,7 +69700,7 @@ in
sources."to-regex-range-5.0.1"
sources."traverse-0.6.6"
sources."trim-repeated-1.0.0"
- sources."tslib-1.10.0"
+ sources."tslib-1.11.0"
sources."tunnel-agent-0.6.0"
sources."type-2.0.0"
sources."type-fest-0.8.1"
@@ -69025,7 +69794,7 @@ in
sources."CSSwhat-0.4.7"
sources."accepts-1.3.7"
sources."after-0.8.1"
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
sources."array-flatten-1.1.1"
sources."arraybuffer.slice-0.0.6"
sources."asn1-0.2.4"
@@ -69119,7 +69888,7 @@ in
sources."iconv-lite-0.4.24"
sources."indexof-0.0.1"
sources."inherits-2.0.4"
- sources."ipaddr.js-1.9.0"
+ sources."ipaddr.js-1.9.1"
sources."irc-replies-2.0.1"
sources."is-typedarray-1.0.0"
sources."isarray-0.0.1"
@@ -69157,7 +69926,7 @@ in
sources."path-to-regexp-0.1.7"
sources."pause-stream-0.0.11"
sources."performance-now-2.1.0"
- sources."proxy-addr-2.0.5"
+ sources."proxy-addr-2.0.6"
sources."psl-1.7.0"
sources."punycode-2.1.1"
sources."qs-6.7.0"
@@ -69515,7 +70284,7 @@ in
sources."ecc-jsbn-0.1.2"
sources."escape-regexp-component-1.0.2"
sources."extsprintf-1.2.0"
- sources."formidable-1.2.1"
+ sources."formidable-1.2.2"
(sources."getpass-0.1.7" // {
dependencies = [
sources."assert-plus-1.0.0"
@@ -69575,7 +70344,7 @@ in
sources."clone-0.1.5"
sources."dashdash-1.10.1"
sources."extsprintf-1.0.0"
- (sources."http-signature-1.3.1" // {
+ (sources."http-signature-1.3.2" // {
dependencies = [
sources."assert-plus-1.0.0"
sources."dashdash-1.14.1"
@@ -69639,13 +70408,13 @@ in
snyk = nodeEnv.buildNodePackage {
name = "snyk";
packageName = "snyk";
- version = "1.292.0";
+ version = "1.297.1";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk/-/snyk-1.292.0.tgz";
- sha512 = "ga4ouBqRc897Ts80yzdZG25zqGgbU3ah8VKtLyRjK1ZmApHy+PRi2zBVJcwMspyfhyaCh47vr1siIqHler4rxg==";
+ url = "https://registry.npmjs.org/snyk/-/snyk-1.297.1.tgz";
+ sha512 = "o+BfGFrgEdko8TWbZUPc6LZXB6Ma0frL7A82uz0SoE5/dMHYNj8ko9cJ8AUf3kDZ9JoMuuQDVn4UPHAfffUkNA==";
};
dependencies = [
- sources."@snyk/cli-interface-2.3.0"
+ sources."@snyk/cli-interface-2.3.2"
sources."@snyk/cocoapods-lockfile-parser-3.0.0"
sources."@snyk/composer-lockfile-parser-1.2.0"
sources."@snyk/configstore-3.2.0-rc1"
@@ -69663,7 +70432,7 @@ in
sources."@types/debug-4.1.5"
sources."@types/events-3.0.0"
sources."@types/js-yaml-3.12.2"
- sources."@types/node-13.7.1"
+ sources."@types/node-13.7.5"
sources."@types/restify-4.3.6"
sources."@types/semver-5.5.0"
sources."@types/xml2js-0.4.3"
@@ -69731,7 +70500,7 @@ in
})
sources."depd-1.1.2"
sources."diff-4.0.2"
- sources."dockerfile-ast-0.0.18"
+ sources."dockerfile-ast-0.0.19"
sources."dot-prop-5.2.0"
(sources."dotnet-deps-parser-4.9.0" // {
dependencies = [
@@ -69778,7 +70547,7 @@ in
sources."graceful-fs-4.2.3"
sources."graphlib-2.1.8"
sources."has-flag-3.0.0"
- sources."hosted-git-info-2.8.5"
+ sources."hosted-git-info-2.8.6"
sources."http-errors-1.7.3"
(sources."http-proxy-agent-2.1.0" // {
dependencies = [
@@ -69916,19 +70685,21 @@ in
sources."signal-exit-3.0.2"
sources."smart-buffer-4.1.0"
sources."snyk-config-2.2.3"
- (sources."snyk-docker-plugin-1.38.0" // {
+ (sources."snyk-docker-plugin-2.2.0" // {
dependencies = [
sources."debug-4.1.1"
];
})
- sources."snyk-go-parser-1.3.1"
- (sources."snyk-go-plugin-1.11.1" // {
+ sources."snyk-go-parser-1.4.0"
+ (sources."snyk-go-plugin-1.13.0" // {
dependencies = [
sources."debug-4.1.1"
+ sources."tmp-0.1.0"
];
})
- (sources."snyk-gradle-plugin-3.2.4" // {
+ (sources."snyk-gradle-plugin-3.2.5" // {
dependencies = [
+ sources."@snyk/cli-interface-2.3.0"
sources."debug-4.1.1"
];
})
@@ -70008,7 +70779,7 @@ in
sources."toidentifier-1.0.0"
sources."toml-3.0.0"
sources."tree-kill-1.2.2"
- sources."tslib-1.10.0"
+ sources."tslib-1.11.0"
sources."type-check-0.3.2"
sources."unique-string-1.0.0"
sources."unpipe-1.0.0"
@@ -70191,7 +70962,7 @@ in
sources."got-6.7.1"
sources."graceful-fs-4.2.3"
sources."has-flag-3.0.0"
- sources."hosted-git-info-2.8.5"
+ sources."hosted-git-info-2.8.6"
sources."http-proxy-agent-2.1.0"
sources."https-proxy-agent-3.0.1"
sources."import-lazy-2.1.0"
@@ -70629,7 +71400,7 @@ in
];
})
sources."level-supports-1.0.1"
- (sources."leveldown-5.4.1" // {
+ (sources."leveldown-5.5.1" // {
dependencies = [
sources."abstract-leveldown-6.2.2"
sources."node-gyp-build-4.1.1"
@@ -71177,7 +71948,7 @@ in
sources."semver-5.0.3"
];
})
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
sources."align-text-0.1.4"
sources."ansi-regex-2.1.1"
sources."ansi-styles-2.2.1"
@@ -71194,7 +71965,7 @@ in
sources."async-1.5.2"
sources."async-limiter-1.0.1"
sources."asynckit-0.4.0"
- (sources."aws-sdk-2.620.0" // {
+ (sources."aws-sdk-2.626.0" // {
dependencies = [
sources."uuid-3.3.2"
];
@@ -71359,7 +72130,7 @@ in
})
(sources."express-4.17.1" // {
dependencies = [
- sources."proxy-addr-2.0.5"
+ sources."proxy-addr-2.0.6"
sources."qs-6.7.0"
];
})
@@ -71385,7 +72156,7 @@ in
})
sources."forever-agent-0.6.1"
sources."form-data-2.1.4"
- sources."formidable-1.2.1"
+ sources."formidable-1.2.2"
sources."forwarded-0.1.2"
sources."fresh-0.5.2"
sources."fs.realpath-1.0.0"
@@ -71425,7 +72196,7 @@ in
];
})
sources."hoek-2.16.3"
- sources."hosted-git-info-2.8.5"
+ sources."hosted-git-info-2.8.6"
(sources."http-errors-1.7.2" // {
dependencies = [
sources."inherits-2.0.3"
@@ -71445,7 +72216,7 @@ in
sources."inflight-1.0.6"
sources."inherits-2.0.4"
sources."invert-kv-2.0.0"
- sources."ipaddr.js-1.9.0"
+ sources."ipaddr.js-1.9.1"
sources."is-arrayish-0.2.1"
sources."is-buffer-1.1.6"
(sources."is-expression-3.0.0" // {
@@ -72231,7 +73002,7 @@ in
sources."finalhandler-1.1.2"
sources."for-in-1.0.2"
sources."form-data-2.5.1"
- sources."formidable-1.2.1"
+ sources."formidable-1.2.2"
sources."fragment-cache-0.2.1"
sources."fresh-0.5.2"
sources."fs-extra-0.24.0"
@@ -72614,7 +73385,7 @@ in
sources."truncate-utf8-bytes-1.0.2"
sources."type-is-1.6.18"
sources."typedarray-0.0.6"
- (sources."uglify-js-3.7.7" // {
+ (sources."uglify-js-3.8.0" // {
dependencies = [
sources."source-map-0.6.1"
];
@@ -72685,8 +73456,8 @@ in
sha256 = "886069ecc5eedf0371b948e8ff66e7f2943c85fe7cfdaa7183e1a3572d55852b";
};
dependencies = [
- sources."@types/node-13.7.1"
- sources."ajv-6.11.0"
+ sources."@types/node-13.7.5"
+ sources."ajv-6.12.0"
sources."ansi-regex-4.1.0"
sources."ansi-styles-3.2.1"
sources."argparse-1.0.10"
@@ -72925,7 +73696,7 @@ in
sources."has-1.0.3"
sources."has-ansi-2.0.0"
sources."has-symbols-1.0.1"
- sources."hosted-git-info-2.8.5"
+ sources."hosted-git-info-2.8.6"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
sources."is-alphabetical-1.0.4"
@@ -73229,7 +74000,7 @@ in
sources."got-6.7.1"
sources."graceful-fs-4.2.3"
sources."has-flag-3.0.0"
- sources."hosted-git-info-2.8.5"
+ sources."hosted-git-info-2.8.6"
sources."ignore-3.3.10"
sources."import-lazy-2.1.0"
sources."imurmurhash-0.1.4"
@@ -73280,16 +74051,16 @@ in
sources."map-obj-1.0.1"
sources."map-stream-0.1.0"
sources."markdown-escapes-1.0.4"
- sources."mdast-comment-marker-1.1.1"
+ sources."mdast-comment-marker-1.1.2"
sources."mdast-util-to-nlcst-3.2.3"
sources."meow-3.7.0"
sources."minimatch-3.0.4"
sources."minimist-1.2.0"
sources."ms-2.1.2"
- sources."nlcst-is-literal-1.2.0"
- sources."nlcst-normalize-2.1.3"
+ sources."nlcst-is-literal-1.2.1"
+ sources."nlcst-normalize-2.1.4"
sources."nlcst-search-1.5.1"
- sources."nlcst-to-string-2.0.3"
+ sources."nlcst-to-string-2.0.4"
sources."normalize-package-data-2.5.0"
sources."npm-prefix-1.2.0"
sources."npm-run-path-2.0.2"
@@ -73641,7 +74412,7 @@ in
sha512 = "47yQZ14SbNfyBGKcSV/89eXwxLlGIwj8WzbKk1jvDh/uPy59skVfFbWoF4tUn09mYnRyVldMsdqB0llYgQMLUA==";
};
dependencies = [
- sources."array.prototype.find-2.1.0"
+ sources."array.prototype.find-2.1.1"
sources."check-ends-with-period-1.0.1"
sources."define-properties-1.1.3"
sources."emoji-regex-6.5.1"
@@ -73824,14 +74595,14 @@ in
sources."@types/color-name-1.1.1"
sources."@types/http-cache-semantics-4.0.0"
sources."@types/keyv-3.1.1"
- sources."@types/node-13.7.1"
+ sources."@types/node-13.7.5"
sources."@types/responselike-1.0.0"
sources."abbrev-1.1.1"
sources."abstract-logging-1.0.0"
sources."accepts-1.3.7"
sources."after-0.8.2"
sources."agent-base-4.3.0"
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
sources."ansi-regex-2.1.1"
sources."ansi-styles-4.2.1"
sources."aproba-1.2.0"
@@ -74000,7 +74771,7 @@ in
sources."inflight-1.0.6"
sources."inherits-2.0.4"
sources."ini-1.3.5"
- sources."ipaddr.js-1.9.0"
+ sources."ipaddr.js-1.9.1"
sources."irc-framework-4.6.0"
sources."is-fullwidth-code-point-1.0.0"
sources."is-typedarray-1.0.0"
@@ -74113,7 +74884,7 @@ in
sources."precond-0.2.3"
sources."prepend-http-2.0.0"
sources."process-nextick-args-2.0.1"
- sources."proxy-addr-2.0.5"
+ sources."proxy-addr-2.0.6"
sources."psl-1.7.0"
sources."pump-3.0.0"
sources."punycode-2.1.1"
@@ -74124,7 +74895,7 @@ in
sources."read-1.0.7"
sources."read-chunk-3.2.0"
sources."readable-stream-3.6.0"
- sources."regenerator-runtime-0.13.3"
+ sources."regenerator-runtime-0.13.4"
sources."registry-auth-token-4.1.1"
sources."registry-url-5.1.0"
(sources."request-2.88.2" // {
@@ -74277,7 +75048,7 @@ in
};
dependencies = [
sources."adm-zip-0.4.13"
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."async-2.6.3"
@@ -74434,7 +75205,7 @@ in
];
})
sources."glob-5.0.15"
- (sources."http-signature-1.3.1" // {
+ (sources."http-signature-1.3.2" // {
dependencies = [
sources."assert-plus-1.0.0"
];
@@ -74620,7 +75391,7 @@ in
sources."strip-ansi-3.0.1"
sources."supports-color-2.0.0"
sources."temp-0.8.4"
- sources."tslib-1.10.0"
+ sources."tslib-1.11.0"
sources."wordwrap-0.0.3"
sources."wrappy-1.0.2"
];
@@ -74660,10 +75431,10 @@ in
typescript = nodeEnv.buildNodePackage {
name = "typescript";
packageName = "typescript";
- version = "3.7.5";
+ version = "3.8.2";
src = fetchurl {
- url = "https://registry.npmjs.org/typescript/-/typescript-3.7.5.tgz";
- sha512 = "/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==";
+ url = "https://registry.npmjs.org/typescript/-/typescript-3.8.2.tgz";
+ sha512 = "EgOVgL/4xfVrCMbhYKUQTdF37SQn4Iw73H5BgCrF1Abdun7Kwy/QZsE/ssAy0y4LxBbvua3PIbFsbRczWWnDdQ==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -74714,10 +75485,10 @@ in
uglify-js = nodeEnv.buildNodePackage {
name = "uglify-js";
packageName = "uglify-js";
- version = "3.7.7";
+ version = "3.8.0";
src = fetchurl {
- url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.7.7.tgz";
- sha512 = "FeSU+hi7ULYy6mn8PKio/tXsdSXN35lm4KgV2asx00kzrLU9Pi3oAslcJT70Jdj7PHX29gGUPOT6+lXGBbemhA==";
+ url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.8.0.tgz";
+ sha512 = "ugNSTT8ierCsDHso2jkBHXYrU8Y5/fY2ZUprfrJUiD7YpuFvV4jODLFmb3h4btQjqr5Nh4TX4XtgDfCU1WdioQ==";
};
dependencies = [
sources."commander-2.20.3"
@@ -74736,57 +75507,47 @@ in
ungit = nodeEnv.buildNodePackage {
name = "ungit";
packageName = "ungit";
- version = "1.5.3";
+ version = "1.5.4";
src = fetchurl {
- url = "https://registry.npmjs.org/ungit/-/ungit-1.5.3.tgz";
- sha512 = "P47B9tvsJMtEJqQL9hwmkt/ygklfliLsHMAYJ9HdK5cv2Bn7vk+NhNphNgGjr/SgfnlW+jZP8QJky+JBT20m4w==";
+ url = "https://registry.npmjs.org/ungit/-/ungit-1.5.4.tgz";
+ sha512 = "jSqAjax1FKpzcyvpsvMyJHF1k/QW2MetI2fq7FOwU2NDRL9sa5jWqTUSsgNBYHe0I+fSAoj2OAZStEByUpHo4A==";
};
dependencies = [
sources."@primer/octicons-9.4.0"
+ sources."@sindresorhus/is-0.14.0"
+ sources."@szmarczak/http-timer-1.1.2"
sources."abbrev-1.1.1"
sources."accepts-1.3.7"
sources."after-0.8.2"
- sources."ajv-6.11.0"
- sources."ansi-regex-2.1.1"
+ sources."ansi-regex-4.1.0"
sources."ansi-styles-3.2.1"
- sources."aproba-1.2.0"
- sources."are-we-there-yet-1.1.5"
sources."array-flatten-1.1.1"
sources."arraybuffer.slice-0.0.7"
- sources."asn1-0.2.4"
- sources."assert-plus-1.0.0"
sources."async-1.0.0"
sources."async-limiter-1.0.1"
sources."asynckit-0.4.0"
- sources."aws-sign2-0.7.0"
- sources."aws4-1.9.1"
sources."backo2-1.0.2"
sources."balanced-match-1.0.0"
sources."base64-arraybuffer-0.1.5"
sources."base64id-1.0.0"
- sources."bcrypt-pbkdf-1.0.2"
sources."better-assert-1.0.2"
sources."blob-0.0.5"
sources."bluebird-3.5.5"
sources."blueimp-md5-2.10.0"
sources."body-parser-1.19.0"
sources."brace-expansion-1.1.11"
- sources."buffer-from-1.1.1"
- sources."builtins-1.0.3"
sources."bytes-3.1.0"
- sources."callsite-1.0.0"
- sources."camelcase-5.3.1"
- sources."caseless-0.12.0"
- (sources."cliui-5.0.0" // {
+ (sources."cacheable-request-6.1.0" // {
dependencies = [
- sources."ansi-regex-4.1.0"
- sources."is-fullwidth-code-point-2.0.0"
- sources."string-width-3.1.0"
- sources."strip-ansi-5.2.0"
+ sources."get-stream-5.1.0"
+ sources."lowercase-keys-2.0.0"
];
})
+ sources."callsite-1.0.0"
+ sources."camelcase-5.3.1"
+ sources."cliui-5.0.0"
sources."clone-2.1.2"
- sources."code-point-at-1.1.0"
+ sources."clone-response-1.0.2"
sources."color-3.1.2"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
@@ -74797,15 +75558,12 @@ in
sources."component-emitter-1.2.1"
sources."component-inherit-0.0.3"
sources."concat-map-0.0.1"
- sources."concat-stream-1.6.2"
- sources."console-control-strings-1.1.0"
sources."content-disposition-0.5.2"
sources."content-type-1.0.4"
sources."cookie-0.3.1"
sources."cookie-parser-1.4.4"
sources."cookie-signature-1.0.6"
sources."cookiejar-2.1.2"
- sources."core-util-is-1.0.2"
(sources."cross-spawn-6.0.5" // {
dependencies = [
sources."semver-5.7.1"
@@ -74813,20 +75571,20 @@ in
})
sources."crossroads-0.12.2"
sources."cycle-1.0.3"
- sources."dashdash-1.14.1"
sources."debug-2.6.9"
sources."decamelize-1.2.0"
+ sources."decompress-response-3.3.0"
sources."dedent-0.7.0"
sources."deep-extend-0.6.0"
+ sources."defer-to-connect-1.1.3"
sources."delayed-stream-1.0.0"
- sources."delegates-1.0.0"
sources."depd-1.1.2"
sources."destroy-1.0.4"
sources."diff-4.0.2"
- sources."diff2html-2.8.0"
+ sources."diff2html-3.1.2"
sources."dnd-page-scroll-0.0.4"
+ sources."duplexer3-0.1.4"
sources."eachr-3.3.0"
- sources."ecc-jsbn-0.1.2"
(sources."editions-2.3.0" // {
dependencies = [
sources."semver-6.3.0"
@@ -74869,12 +75627,8 @@ in
sources."depd-2.0.0"
];
})
- sources."extend-3.0.2"
sources."extract-opts-3.4.0"
- sources."extsprintf-1.3.0"
sources."eyes-0.1.8"
- sources."fast-deep-equal-3.1.1"
- sources."fast-json-stable-stringify-2.1.0"
sources."fast-safe-stringify-2.0.7"
(sources."finalhandler-1.1.1" // {
dependencies = [
@@ -74882,37 +75636,26 @@ in
];
})
sources."find-up-3.0.0"
- sources."forever-agent-0.6.1"
- sources."form-data-2.3.3"
- sources."formidable-1.2.1"
+ sources."form-data-2.5.1"
+ sources."formidable-1.2.2"
sources."forwarded-0.1.2"
sources."fresh-0.5.2"
sources."fs.realpath-1.0.0"
- sources."gauge-2.7.4"
sources."get-caller-file-2.0.5"
sources."get-stream-4.1.0"
sources."getmac-1.4.6"
- sources."getpass-0.1.7"
sources."glob-7.1.6"
- sources."graceful-fs-4.2.3"
- sources."har-schema-2.0.0"
- sources."har-validator-5.1.3"
- (sources."has-binary2-1.0.3" // {
- dependencies = [
- sources."isarray-2.0.1"
- ];
- })
+ sources."got-9.6.0"
+ sources."has-binary2-1.0.3"
sources."has-cors-1.1.0"
- sources."has-unicode-2.0.1"
sources."hasher-1.2.0"
(sources."hogan.js-3.0.2" // {
dependencies = [
sources."mkdirp-0.3.0"
];
})
- sources."hosted-git-info-2.8.5"
+ sources."http-cache-semantics-4.0.4"
sources."http-errors-1.7.2"
- sources."http-signature-1.2.0"
sources."iconv-lite-0.4.24"
sources."ignore-5.1.4"
sources."indexof-0.0.1"
@@ -74920,29 +75663,26 @@ in
sources."inherits-2.0.3"
sources."ini-1.3.5"
sources."invert-kv-2.0.0"
- sources."ipaddr.js-1.9.0"
+ sources."ipaddr.js-1.9.1"
sources."is-arrayish-0.3.2"
- sources."is-fullwidth-code-point-1.0.0"
+ sources."is-fullwidth-code-point-2.0.0"
sources."is-stream-1.1.0"
- sources."is-typedarray-1.0.0"
sources."is-wsl-1.1.0"
- sources."isarray-1.0.0"
+ sources."isarray-2.0.1"
sources."isexe-2.0.0"
sources."isstream-0.1.2"
sources."jquery-3.4.1"
sources."jquery-ui-bundle-1.12.1"
- sources."jsbn-0.1.1"
- sources."json-schema-0.2.3"
- sources."json-schema-traverse-0.4.1"
- sources."json-stringify-safe-5.0.1"
- sources."jsprim-1.4.1"
+ sources."json-buffer-3.0.0"
sources."just-detect-adblock-1.0.0"
+ sources."keyv-3.1.0"
sources."knockout-3.5.1"
+ sources."latest-version-5.1.0"
sources."lcid-2.0.0"
sources."locate-path-3.0.0"
sources."locks-0.2.2"
sources."lodash-4.17.15"
- sources."lodash.merge-4.6.2"
+ sources."lowercase-keys-1.0.1"
sources."lru-cache-4.1.5"
sources."map-age-cleaner-0.1.3"
sources."media-typer-0.3.0"
@@ -74958,6 +75698,7 @@ in
sources."mime-db-1.43.0"
sources."mime-types-2.1.26"
sources."mimic-fn-2.1.0"
+ sources."mimic-response-1.0.1"
sources."minimatch-3.0.4"
sources."minimist-0.0.8"
sources."mkdirp-0.5.1"
@@ -74967,43 +75708,28 @@ in
sources."nice-try-1.0.5"
sources."node-cache-4.2.1"
sources."nopt-1.0.10"
- (sources."normalize-package-data-2.5.0" // {
- dependencies = [
- sources."semver-5.7.1"
- ];
- })
- sources."npm-6.12.1"
- (sources."npm-package-arg-6.1.1" // {
- dependencies = [
- sources."semver-5.7.1"
- ];
- })
- (sources."npm-registry-client-8.6.0" // {
- dependencies = [
- sources."semver-5.7.1"
- ];
- })
+ sources."normalize-url-4.5.0"
sources."npm-run-path-2.0.2"
- sources."npmlog-4.1.2"
sources."nprogress-0.2.0"
- sources."number-is-nan-1.0.1"
- sources."oauth-sign-0.9.0"
sources."object-assign-4.1.1"
sources."object-component-0.0.3"
sources."on-finished-2.3.0"
sources."on-headers-1.0.2"
sources."once-1.4.0"
sources."open-6.1.0"
- sources."os-homedir-1.0.2"
sources."os-locale-3.1.0"
- sources."os-tmpdir-1.0.2"
- sources."osenv-0.1.5"
+ sources."p-cancelable-1.1.0"
sources."p-defer-1.0.0"
sources."p-finally-1.0.0"
sources."p-is-promise-2.1.0"
sources."p-limit-2.2.2"
sources."p-locate-3.0.0"
sources."p-try-2.2.0"
+ (sources."package-json-6.5.0" // {
+ dependencies = [
+ sources."semver-6.3.0"
+ ];
+ })
sources."parseqs-0.0.5"
sources."parseuri-0.0.5"
sources."parseurl-1.3.3"
@@ -75013,16 +75739,12 @@ in
sources."path-exists-3.0.0"
sources."path-is-absolute-1.0.1"
sources."path-key-2.0.1"
- sources."path-parse-1.0.6"
sources."path-to-regexp-0.1.7"
sources."pause-0.0.1"
- sources."performance-now-2.1.0"
- sources."process-nextick-args-2.0.1"
- sources."proxy-addr-2.0.5"
+ sources."prepend-http-2.0.0"
+ sources."proxy-addr-2.0.6"
sources."pseudomap-1.0.2"
- sources."psl-1.7.0"
sources."pump-3.0.0"
- sources."punycode-2.1.1"
sources."qs-6.7.0"
sources."random-bytes-1.0.0"
sources."range-parser-1.2.1"
@@ -75033,16 +75755,12 @@ in
sources."minimist-1.2.0"
];
})
- sources."readable-stream-2.3.7"
- (sources."request-2.88.2" // {
- dependencies = [
- sources."qs-6.5.2"
- ];
- })
+ sources."readable-stream-3.6.0"
+ sources."registry-auth-token-4.1.1"
+ sources."registry-url-5.1.0"
sources."require-directory-2.1.1"
sources."require-main-filename-2.0.0"
- sources."resolve-1.15.1"
- sources."retry-0.10.1"
+ sources."responselike-1.0.2"
sources."rimraf-2.6.3"
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
@@ -75062,7 +75780,6 @@ in
sources."signal-exit-3.0.2"
sources."signals-1.0.0"
sources."simple-swizzle-0.2.2"
- sources."slide-1.1.6"
sources."snapsvg-0.5.1"
(sources."socket.io-2.2.0" // {
dependencies = [
@@ -75079,20 +75796,17 @@ in
(sources."socket.io-parser-3.3.0" // {
dependencies = [
sources."debug-3.1.0"
- sources."isarray-2.0.1"
];
})
- sources."spdx-correct-3.1.0"
- sources."spdx-exceptions-2.2.0"
- sources."spdx-expression-parse-3.0.0"
- sources."spdx-license-ids-3.0.5"
- sources."sshpk-1.16.1"
- sources."ssri-5.3.0"
sources."stack-trace-0.0.10"
sources."statuses-1.5.0"
- sources."string-width-1.0.2"
- sources."string_decoder-1.1.1"
- sources."strip-ansi-3.0.1"
+ sources."string-width-3.1.0"
+ (sources."string_decoder-1.3.0" // {
+ dependencies = [
+ sources."safe-buffer-5.2.0"
+ ];
+ })
+ sources."strip-ansi-5.2.0"
sources."strip-eof-1.0.0"
sources."strip-json-comments-2.0.1"
(sources."superagent-5.0.9" // {
@@ -75101,55 +75815,31 @@ in
sources."debug-4.1.1"
sources."mime-2.4.4"
sources."ms-2.1.2"
- sources."readable-stream-3.6.0"
sources."semver-6.3.0"
];
})
sources."temp-0.9.1"
sources."to-array-0.1.4"
+ sources."to-readable-stream-1.0.0"
sources."toidentifier-1.0.0"
- sources."tough-cookie-2.5.0"
- sources."tunnel-agent-0.6.0"
- sources."tweetnacl-0.14.5"
sources."type-is-1.6.18"
sources."typechecker-4.11.0"
- sources."typedarray-0.0.6"
sources."uid-safe-2.1.5"
sources."unpipe-1.0.0"
- sources."uri-js-4.2.2"
+ sources."url-parse-lax-3.0.0"
sources."util-deprecate-1.0.2"
sources."utils-merge-1.0.1"
- sources."uuid-3.4.0"
- sources."validate-npm-package-license-3.0.4"
- sources."validate-npm-package-name-3.0.0"
sources."vary-1.1.2"
- sources."verror-1.10.0"
- sources."whatwg-fetch-3.0.0"
sources."which-1.3.1"
sources."which-module-2.0.0"
- sources."wide-align-1.1.3"
sources."winston-2.4.0"
- (sources."wrap-ansi-5.1.0" // {
- dependencies = [
- sources."ansi-regex-4.1.0"
- sources."is-fullwidth-code-point-2.0.0"
- sources."string-width-3.1.0"
- sources."strip-ansi-5.2.0"
- ];
- })
+ sources."wrap-ansi-5.1.0"
sources."wrappy-1.0.2"
sources."ws-6.1.4"
sources."xmlhttprequest-ssl-1.5.5"
sources."y18n-4.0.0"
sources."yallist-2.1.2"
- (sources."yargs-13.2.4" // {
- dependencies = [
- sources."ansi-regex-4.1.0"
- sources."is-fullwidth-code-point-2.0.0"
- sources."string-width-3.1.0"
- sources."strip-ansi-5.2.0"
- ];
- })
+ sources."yargs-13.2.4"
sources."yargs-parser-13.1.1"
sources."yeast-0.1.2"
];
@@ -75239,7 +75929,7 @@ in
};
dependencies = [
sources."absolute-0.0.1"
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
sources."ansi-escapes-3.2.0"
sources."ansi-red-0.1.1"
sources."ansi-regex-3.0.0"
@@ -75486,10 +76176,10 @@ in
sources."toml-2.3.6"
sources."tough-cookie-2.5.0"
sources."trim-repeated-1.0.0"
- sources."tslib-1.10.0"
+ sources."tslib-1.11.0"
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
- sources."uglify-js-3.7.7"
+ sources."uglify-js-3.8.0"
sources."uid-0.0.2"
sources."unbzip2-stream-1.3.3"
sources."unyield-0.0.1"
@@ -75547,14 +76237,14 @@ in
sources."@starptech/rehype-webparser-0.10.0"
sources."@starptech/webparser-0.10.0"
sources."@szmarczak/http-timer-1.1.2"
- sources."@types/node-13.7.1"
+ sources."@types/node-13.7.5"
sources."@types/unist-2.0.3"
sources."@types/vfile-3.0.2"
sources."@types/vfile-message-2.0.0"
sources."abbrev-1.1.1"
sources."acorn-6.4.0"
sources."acorn-jsx-5.1.0"
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
sources."ajv-keywords-2.1.1"
(sources."ansi-align-3.0.0" // {
dependencies = [
@@ -75891,7 +76581,7 @@ in
sources."hast-util-parse-selector-2.2.3"
sources."hast-util-to-string-1.0.2"
sources."hast-util-whitespace-1.0.3"
- sources."hosted-git-info-2.8.5"
+ sources."hosted-git-info-2.8.6"
sources."html-void-elements-1.0.5"
sources."html-whitespace-sensitive-tag-names-1.0.1"
sources."http-cache-semantics-4.0.4"
@@ -76379,13 +77069,13 @@ in
sources."trim-newlines-2.0.0"
sources."trim-trailing-lines-1.1.3"
sources."trough-1.0.5"
- sources."tslib-1.10.0"
+ sources."tslib-1.11.0"
sources."tslint-5.20.1"
sources."tsutils-2.29.0"
sources."type-check-0.3.2"
sources."type-fest-0.3.1"
sources."typedarray-0.0.6"
- sources."typescript-3.7.5"
+ sources."typescript-3.8.2"
(sources."typescript-eslint-parser-16.0.1" // {
dependencies = [
sources."semver-5.5.0"
@@ -76460,11 +77150,16 @@ in
})
sources."vfile-sort-2.2.1"
sources."vfile-statistics-1.1.3"
- sources."vscode-css-languageservice-4.0.2"
+ (sources."vscode-css-languageservice-4.1.0" // {
+ dependencies = [
+ sources."vscode-uri-2.1.1"
+ ];
+ })
sources."vscode-emmet-helper-1.2.17"
sources."vscode-jsonrpc-5.0.1"
sources."vscode-languageserver-5.3.0-next.10"
sources."vscode-languageserver-protocol-3.15.3"
+ sources."vscode-languageserver-textdocument-1.0.1"
sources."vscode-languageserver-types-3.15.1"
sources."vscode-nls-4.1.1"
sources."vscode-textbuffer-1.0.0"
@@ -76544,14 +77239,18 @@ in
sources."@szmarczak/http-timer-1.1.2"
sources."@types/color-name-1.1.1"
sources."@types/minimatch-3.0.3"
- sources."@types/node-13.7.1"
+ sources."@types/node-13.7.5"
sources."JSONSelect-0.2.1"
sources."acorn-6.4.0"
sources."acorn-jsx-5.1.0"
sources."adbkit-2.11.1"
sources."adbkit-logcat-1.1.0"
sources."adbkit-monkey-1.0.1"
- sources."addons-linter-1.20.0"
+ (sources."addons-linter-1.20.0" // {
+ dependencies = [
+ sources."regenerator-runtime-0.13.3"
+ ];
+ })
sources."adm-zip-0.4.14"
sources."ajv-6.10.2"
sources."ajv-keywords-1.5.1"
@@ -77303,7 +78002,7 @@ in
];
})
sources."rechoir-0.6.2"
- sources."regenerator-runtime-0.13.3"
+ sources."regenerator-runtime-0.13.4"
sources."regex-not-1.0.2"
sources."regexp.prototype.flags-1.3.0"
sources."regexpp-2.0.1"
@@ -77488,9 +78187,9 @@ in
sources."to-regex-range-2.1.1"
sources."tosource-1.0.0"
sources."tough-cookie-2.5.0"
- sources."tr46-2.0.0"
+ sources."tr46-2.0.2"
sources."traverse-0.4.6"
- sources."tslib-1.10.0"
+ sources."tslib-1.11.0"
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
sources."type-1.2.0"
@@ -77555,7 +78254,7 @@ in
})
sources."wrappy-1.0.2"
sources."write-1.0.3"
- sources."write-file-atomic-3.0.1"
+ sources."write-file-atomic-3.0.3"
sources."ws-7.2.1"
sources."xdg-basedir-4.0.0"
sources."xml2js-0.4.23"
@@ -77632,7 +78331,7 @@ in
sources."@xtuc/ieee754-1.2.0"
sources."@xtuc/long-4.2.2"
sources."acorn-6.4.0"
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
sources."ajv-errors-1.0.1"
sources."ajv-keywords-3.4.1"
(sources."anymatch-2.0.0" // {
@@ -77731,7 +78430,7 @@ in
sources."domain-browser-1.2.0"
sources."duplexify-3.7.1"
sources."elliptic-6.5.2"
- sources."emojis-list-2.1.0"
+ sources."emojis-list-3.0.0"
sources."end-of-stream-1.4.4"
(sources."enhanced-resolve-4.1.1" // {
dependencies = [
@@ -77838,7 +78537,7 @@ in
sources."json5-1.0.1"
sources."kind-of-6.0.3"
sources."loader-runner-2.4.0"
- sources."loader-utils-1.2.3"
+ sources."loader-utils-1.4.0"
sources."locate-path-3.0.0"
sources."lru-cache-5.1.1"
sources."make-dir-2.1.0"
@@ -78009,7 +78708,7 @@ in
sources."stream-shift-1.0.1"
sources."string_decoder-1.1.1"
sources."tapable-1.1.3"
- (sources."terser-4.6.3" // {
+ (sources."terser-4.6.4" // {
dependencies = [
sources."source-map-0.6.1"
];
@@ -78029,7 +78728,7 @@ in
})
sources."to-regex-3.0.2"
sources."to-regex-range-2.1.1"
- sources."tslib-1.10.0"
+ sources."tslib-1.11.0"
sources."tty-browserify-0.0.0"
sources."typedarray-0.0.6"
sources."union-value-1.0.1"
@@ -78424,9 +79123,9 @@ in
sources."@types/events-3.0.0"
sources."@types/glob-7.1.1"
sources."@types/minimatch-3.0.3"
- sources."@types/node-13.7.1"
+ sources."@types/node-13.7.5"
sources."accepts-1.3.7"
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
sources."ajv-errors-1.0.1"
sources."ajv-keywords-3.4.1"
sources."ansi-colors-3.2.4"
@@ -78664,7 +79363,7 @@ in
sources."invert-kv-2.0.0"
sources."ip-1.1.5"
sources."ip-regex-2.1.0"
- sources."ipaddr.js-1.9.0"
+ sources."ipaddr.js-1.9.1"
sources."is-absolute-url-3.0.3"
sources."is-accessor-descriptor-1.0.0"
sources."is-arguments-1.0.4"
@@ -78787,7 +79486,7 @@ in
})
sources."posix-character-classes-0.1.1"
sources."process-nextick-args-2.0.1"
- sources."proxy-addr-2.0.5"
+ sources."proxy-addr-2.0.6"
sources."prr-1.0.1"
sources."pump-3.0.0"
sources."punycode-2.1.1"
@@ -79021,7 +79720,7 @@ in
sha512 = "P15M5ZC8dyCjQHWwd4Ia/dm0SgVvZJMYeykVIVYXbGyqO4dWB5oyPHp9i7wjwo5LhtlhKbiBCdS2NvM07Wlybg==";
};
dependencies = [
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
sources."ajv-errors-1.0.1"
sources."ajv-keywords-3.4.1"
sources."ansi-colors-3.2.4"
@@ -79043,7 +79742,7 @@ in
sources."cyclist-1.0.1"
sources."dir-glob-2.2.2"
sources."duplexify-3.7.1"
- sources."emojis-list-2.1.0"
+ sources."emojis-list-3.0.0"
sources."end-of-stream-1.4.4"
sources."fast-deep-equal-3.1.1"
sources."fast-json-stable-stringify-2.1.0"
@@ -79081,7 +79780,7 @@ in
sources."minimist-1.2.0"
];
})
- sources."loader-utils-1.2.3"
+ sources."loader-utils-1.4.0"
sources."locate-path-3.0.0"
sources."lru-cache-5.1.1"
sources."make-dir-2.1.0"
@@ -79170,7 +79869,7 @@ in
sources."@protobufjs/pool-1.1.0"
sources."@protobufjs/utf8-1.1.0"
sources."@types/long-4.0.1"
- sources."@types/node-10.17.15"
+ sources."@types/node-10.17.16"
sources."addr-to-ip-port-1.5.1"
sources."airplay-js-0.3.0"
sources."balanced-match-1.0.0"
@@ -79496,6 +80195,57 @@ in
bypassCache = true;
reconstructLock = true;
};
+ yaml-language-server = nodeEnv.buildNodePackage {
+ name = "yaml-language-server";
+ packageName = "yaml-language-server";
+ version = "0.7.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.7.2.tgz";
+ sha512 = "3jBsYrtnlaI5H6psW+0qzVh9LoQ21fuvC8KIupjPbQURb6cAMUGH5aElKREAevSSpgs7VIoqU1ZMCglIHm32OA==";
+ };
+ dependencies = [
+ sources."agent-base-4.3.0"
+ sources."argparse-1.0.10"
+ sources."debug-3.1.0"
+ sources."es6-promise-4.2.8"
+ sources."es6-promisify-5.0.0"
+ sources."esprima-4.0.1"
+ sources."http-proxy-agent-2.1.0"
+ sources."https-proxy-agent-2.2.4"
+ sources."js-yaml-3.13.1"
+ sources."jsonc-parser-2.2.1"
+ sources."ms-2.0.0"
+ sources."prettier-1.19.1"
+ sources."request-light-0.2.5"
+ sources."sprintf-js-1.0.3"
+ sources."vscode-json-languageservice-3.5.1"
+ sources."vscode-jsonrpc-4.0.0"
+ (sources."vscode-languageserver-5.2.1" // {
+ dependencies = [
+ sources."vscode-uri-1.0.8"
+ ];
+ })
+ (sources."vscode-languageserver-protocol-3.14.1" // {
+ dependencies = [
+ sources."vscode-languageserver-types-3.14.0"
+ ];
+ })
+ sources."vscode-languageserver-textdocument-1.0.1"
+ sources."vscode-languageserver-types-3.15.1"
+ sources."vscode-nls-4.1.1"
+ sources."vscode-uri-2.1.1"
+ sources."yaml-ast-parser-custom-tags-0.0.43"
+ ];
+ buildInputs = globalBuildInputs;
+ meta = {
+ description = "YAML language server";
+ homepage = "https://github.com/redhat-developer/yaml-language-server#readme";
+ license = "MIT";
+ };
+ production = true;
+ bypassCache = true;
+ reconstructLock = true;
+ };
yarn = nodeEnv.buildNodePackage {
name = "yarn";
packageName = "yarn";
@@ -79528,7 +80278,7 @@ in
sources."@nodelib/fs.stat-1.1.3"
sources."@sindresorhus/is-0.7.0"
sources."aggregate-error-3.0.1"
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
sources."ansi-0.3.1"
sources."ansi-align-2.0.0"
sources."ansi-escapes-3.2.0"
@@ -79769,7 +80519,7 @@ in
sources."kind-of-4.0.0"
];
})
- sources."hosted-git-info-2.8.5"
+ sources."hosted-git-info-2.8.6"
sources."http-cache-semantics-3.8.1"
sources."http-signature-1.2.0"
sources."humanize-string-1.0.2"
@@ -80019,7 +80769,7 @@ in
sources."indent-string-2.1.0"
];
})
- sources."regenerator-runtime-0.13.3"
+ sources."regenerator-runtime-0.13.4"
sources."regex-not-1.0.2"
sources."registry-auth-token-3.4.0"
sources."registry-url-3.1.0"
@@ -80202,11 +80952,11 @@ in
sources."to-regex-range-2.1.1"
sources."tough-cookie-3.0.1"
sources."trim-newlines-1.0.0"
- sources."tslib-1.10.0"
+ sources."tslib-1.11.0"
sources."tunnel-0.0.6"
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
- sources."twig-1.14.0"
+ sources."twig-1.15.0"
sources."type-fest-0.3.1"
sources."typedarray-0.0.6"
sources."union-value-1.0.1"
diff --git a/pkgs/development/node-packages/node-packages-v12.nix b/pkgs/development/node-packages/node-packages-v12.nix
index 198bd0d3324..910e9284ebc 100644
--- a/pkgs/development/node-packages/node-packages-v12.nix
+++ b/pkgs/development/node-packages/node-packages-v12.nix
@@ -13,13 +13,13 @@ let
sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
};
};
- "ajv-6.11.0" = {
+ "ajv-6.12.0" = {
name = "ajv";
packageName = "ajv";
- version = "6.11.0";
+ version = "6.12.0";
src = fetchurl {
- url = "https://registry.npmjs.org/ajv/-/ajv-6.11.0.tgz";
- sha512 = "nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==";
+ url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz";
+ sha512 = "D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==";
};
};
"ansi-regex-2.1.1" = {
@@ -2735,7 +2735,7 @@ in
};
dependencies = [
sources."abbrev-1.1.1"
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
sources."ansi-regex-2.1.1"
sources."aproba-1.2.0"
sources."are-we-there-yet-1.1.5"
@@ -2921,7 +2921,7 @@ in
};
dependencies = [
sources."abbrev-1.1.1"
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
sources."ansi-regex-2.1.1"
sources."aproba-1.2.0"
sources."are-we-there-yet-1.1.5"
diff --git a/pkgs/development/node-packages/node-packages-v13.nix b/pkgs/development/node-packages/node-packages-v13.nix
index 6e6c0cb4736..a18a7352311 100644
--- a/pkgs/development/node-packages/node-packages-v13.nix
+++ b/pkgs/development/node-packages/node-packages-v13.nix
@@ -13,13 +13,13 @@ let
sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
};
};
- "ajv-6.11.0" = {
+ "ajv-6.12.0" = {
name = "ajv";
packageName = "ajv";
- version = "6.11.0";
+ version = "6.12.0";
src = fetchurl {
- url = "https://registry.npmjs.org/ajv/-/ajv-6.11.0.tgz";
- sha512 = "nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==";
+ url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz";
+ sha512 = "D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==";
};
};
"ansi-regex-2.1.1" = {
@@ -1259,7 +1259,7 @@ in
};
dependencies = [
sources."abbrev-1.1.1"
- sources."ajv-6.11.0"
+ sources."ajv-6.12.0"
sources."ansi-regex-2.1.1"
sources."aproba-1.2.0"
sources."are-we-there-yet-1.1.5"
diff --git a/pkgs/development/node-packages/shell-generate.nix b/pkgs/development/node-packages/shell-generate.nix
new file mode 100644
index 00000000000..0ca5d494e56
--- /dev/null
+++ b/pkgs/development/node-packages/shell-generate.nix
@@ -0,0 +1,9 @@
+{ nixpkgs ? import ../../.. {} }:
+with nixpkgs;
+mkShell {
+ buildInputs = [
+ bash nodePackages.node2nix
+ ];
+ NODE_NIXPKGS_PATH = toString ./.;
+}
+
diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix
index 1b3bb9a7981..263da89d1df 100644
--- a/pkgs/development/ocaml-modules/batteries/default.nix
+++ b/pkgs/development/ocaml-modules/batteries/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, qtest, num }:
-let version = "2.11.0"; in
+let version = "3.0.0"; in
stdenv.mkDerivation {
name = "ocaml${ocaml.version}-batteries-${version}";
src = fetchurl {
url = "https://github.com/ocaml-batteries-team/batteries-included/releases/download/v${version}/batteries-${version}.tar.gz";
- sha256 = "0swdnm9c3sd3yzzyg7yh1lkqhfikmga4fzx2416ja1q62nv26j53";
+ sha256 = "0d833amm4p0pczgl7wriv99f3r5r6345p5gi9d97sm0hqx27vzwi";
};
buildInputs = [ ocaml findlib ocamlbuild qtest ];
diff --git a/pkgs/development/ocaml-modules/dum/default.nix b/pkgs/development/ocaml-modules/dum/default.nix
index 37c00f6b31e..5e5199c2690 100644
--- a/pkgs/development/ocaml-modules/dum/default.nix
+++ b/pkgs/development/ocaml-modules/dum/default.nix
@@ -1,25 +1,24 @@
-{ lib, fetchFromGitHub, buildOcaml, ocaml
+{ stdenv, fetchFromGitHub, ocaml, findlib
, easy-format
}:
-buildOcaml rec {
- name = "dum";
+stdenv.mkDerivation rec {
+ name = "ocaml${ocaml.version}-dum-${version}";
version = "1.0.1";
- minimumOCamlVersion = "4.06";
-
src = fetchFromGitHub {
owner = "mjambon";
- repo = name;
+ repo = "dum";
rev = "v${version}";
sha256 = "0yrxl97szjc0s2ghngs346x3y0xszx2chidgzxk93frjjpsr1mlr";
};
- buildInputs = [ easy-format ];
+ buildInputs = [ ocaml findlib ];
+ propagatedBuildInputs = [ easy-format ];
- doCheck = true;
+ createFindlibDestdir = true;
- meta = with lib; {
+ meta = with stdenv.lib; {
homepage = https://github.com/mjambon/dum;
description = "Inspect the runtime representation of arbitrary OCaml values";
license = licenses.lgpl21Plus;
diff --git a/pkgs/development/ocaml-modules/pgocaml/ppx.nix b/pkgs/development/ocaml-modules/pgocaml/ppx.nix
new file mode 100644
index 00000000000..f8bc4a40e7f
--- /dev/null
+++ b/pkgs/development/ocaml-modules/pgocaml/ppx.nix
@@ -0,0 +1,8 @@
+{ buildDunePackage, pgocaml, ppx_tools, ppx_tools_versioned, rresult }:
+
+buildDunePackage {
+ pname = "pgocaml_ppx";
+ inherit (pgocaml) src version meta;
+
+ propagatedBuildInputs = [ pgocaml ppx_tools ppx_tools_versioned rresult ];
+}
diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix
index 984906342bc..8173fc87aba 100644
--- a/pkgs/development/ocaml-modules/ppx_tools/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib }:
+{ stdenv, fetchFromGitHub, buildDunePackage, ocaml, findlib }:
let param = {
"4.02" = {
@@ -24,18 +24,39 @@ let param = {
version = "5.3+4.08.0";
sha256 = "0vdmhs3hpmh5iclx4lzgdpf362m4l35zprxs73r84z1yhr4jcr4m"; };
"4.09" = {
- version = "5.3+4.08.0";
- sha256 = "0vdmhs3hpmh5iclx4lzgdpf362m4l35zprxs73r84z1yhr4jcr4m"; };
+ version = "6.0+4.08.0";
+ sha256 = "056cmdajap8mbb8k0raj0cq0y4jf7pf5x0hlivm92w2v7xxf59ns"; };
+ "4.10" = {
+ version = "6.1+4.10.0";
+ sha256 = "0ccx2g4zpwnv52bbzhgxji1nvzmn80jwiqalwwc4s60i9qg51llw"; };
}.${ocaml.meta.branch};
in
- stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-ppx_tools-${param.version}";
- src = fetchFromGitHub {
+
+let src = fetchFromGitHub {
owner = "alainfrisch";
- repo = "ppx_tools";
- rev = if param ? rev then param.rev else param.version;
+ repo = pname;
+ rev = param.rev or param.version;
inherit (param) sha256;
};
+ pname = "ppx_tools";
+ meta = with stdenv.lib; {
+ description = "Tools for authors of ppx rewriters";
+ homepage = http://www.lexifi.com/ppx_tools;
+ license = licenses.mit;
+ maintainers = with maintainers; [ vbgl ];
+ };
+in
+if stdenv.lib.versionAtLeast param.version "6.0"
+then
+ buildDunePackage {
+ inherit pname src meta;
+ inherit (param) version;
+ }
+else
+ stdenv.mkDerivation {
+ name = "ocaml${ocaml.version}-${pname}-${param.version}";
+
+ inherit src;
nativeBuildInputs = [ ocaml findlib ];
buildInputs = [ ocaml findlib ];
@@ -44,11 +65,5 @@ in
dontStrip = true;
- meta = with stdenv.lib; {
- description = "Tools for authors of ppx rewriters";
- homepage = http://www.lexifi.com/ppx_tools;
- license = licenses.mit;
- platforms = ocaml.meta.platforms or [];
- maintainers = with maintainers; [ vbgl ];
- };
+ meta = meta // { inherit (ocaml.meta) platforms; };
}
diff --git a/pkgs/development/ocaml-modules/printbox/default.nix b/pkgs/development/ocaml-modules/printbox/default.nix
index 555ccef3495..f2bbfdcec18 100644
--- a/pkgs/development/ocaml-modules/printbox/default.nix
+++ b/pkgs/development/ocaml-modules/printbox/default.nix
@@ -1,8 +1,8 @@
-{ lib, fetchFromGitHub, buildDunePackage, ocaml, mdx }:
+{ lib, fetchFromGitHub, buildDunePackage, uucp, uutf }:
buildDunePackage rec {
pname = "printbox";
- version = "0.2";
+ version = "0.4";
minimumOCamlVersion = "4.05";
@@ -10,15 +10,15 @@ buildDunePackage rec {
owner = "c-cube";
repo = pname;
rev = version;
- sha256 = "16nwwpp13hzlcm9xqfxc558afm3i5s802dkj69l9s2vp04lgms5n";
+ sha256 = "0bq2v37v144i00h1zwyqhkfycxailr245n97yff0f7qnidxprix0";
};
- checkInputs = lib.optional doCheck mdx.bin;
+ checkInputs = lib.optionals doCheck [ uucp uutf ];
- doCheck = !lib.versionAtLeast ocaml.version "4.08";
+ doCheck = true;
meta = {
- homepage = https://github.com/c-cube/printbox/;
+ homepage = "https://github.com/c-cube/printbox/";
description = "Allows to print nested boxes, lists, arrays, tables in several formats";
license = lib.licenses.isc;
maintainers = [ lib.maintainers.romildo ];
diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix
index e17e99cdc67..cfbcc27ba9c 100644
--- a/pkgs/development/ocaml-modules/uri/default.nix
+++ b/pkgs/development/ocaml-modules/uri/default.nix
@@ -4,11 +4,11 @@
buildDunePackage rec {
pname = "uri";
- version = "3.0.0";
+ version = "3.1.0";
src = fetchurl {
url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
- sha256 = "1yhrgm3hbn0hh4jdmcrvxinazgg8vrm0vn425sg8ggzblvxk9cwg";
+ sha256 = "0hxc2mshmqxz2qmjya47dzf858s6lsf3xvqswpzprkvhv0zq4ln4";
};
buildInputs = [ ounit ];
diff --git a/pkgs/development/python-modules/acoustics/default.nix b/pkgs/development/python-modules/acoustics/default.nix
index 85ce02be1c3..bf3f31d351f 100644
--- a/pkgs/development/python-modules/acoustics/default.nix
+++ b/pkgs/development/python-modules/acoustics/default.nix
@@ -25,6 +25,7 @@ buildPythonPackage rec {
description = "A package for acousticians";
maintainers = with maintainers; [ fridh ];
license = with licenses; [ bsd3 ];
- homepage = https://github.com/python-acoustics/python-acoustics;
+ homepage = "https://github.com/python-acoustics/python-acoustics";
+ broken = true; # no longer compatible with pandas>=1
};
}
diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 737d1eec3c2..304a2a362e9 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
};
checkInputs = [
- pytestrunner pytest gunicorn pytest-timeout async_generator pytest_xdist
+ pytestrunner pytest gunicorn async_generator pytest_xdist
pytest-mock pytestcov trustme brotlipy freezegun
];
diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/pkgs/development/python-modules/aioresponses/default.nix
index 446bb9e6379..01c37275fc3 100644
--- a/pkgs/development/python-modules/aioresponses/default.nix
+++ b/pkgs/development/python-modules/aioresponses/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "aioresponses";
- version = "0.6.2";
+ version = "0.6.3";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "0srqbxxxffi3idqd161n5b90xyqy9gibigxxmvqag3nxab5vw1j6";
+ sha256 = "06w15iyr07s861hkzqfdclzxkpvgg83sx8f235mz8k2490hnyqvv";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/aiorun/default.nix b/pkgs/development/python-modules/aiorun/default.nix
index aa7462ba831..16a8a167fbb 100644
--- a/pkgs/development/python-modules/aiorun/default.nix
+++ b/pkgs/development/python-modules/aiorun/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "aiorun";
- version = "2020.1.3";
+ version = "2020.2.1";
format = "flit";
disabled = isPy27;
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "cjrh";
repo = pname;
rev = "v${version}";
- sha256 = "0ka0pj6xr47j7rw6kd5mkrr5jyhn631pfpd95ig7vbln4434qnb4";
+ sha256 = "0wcj8prkijb889ic8n6varms7xkwy028hhw0imgkd1i0p64lm3m4";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix
index a8a7fc3a7bf..b704fd7453f 100644
--- a/pkgs/development/python-modules/ansible-lint/default.nix
+++ b/pkgs/development/python-modules/ansible-lint/default.nix
@@ -1,17 +1,21 @@
{ lib
, fetchPypi
, buildPythonPackage
+, isPy27
, ansible
, pyyaml
, six
, nose
, setuptools_scm
, ruamel_yaml
+, pathlib2
}:
buildPythonPackage rec {
pname = "ansible-lint";
version = "4.2.0";
+ # pip is not able to import version info on raumel.yaml
+ disabled = isPy27;
src = fetchPypi {
inherit pname version;
@@ -21,7 +25,8 @@ buildPythonPackage rec {
format = "pyproject";
nativeBuildInputs = [ setuptools_scm ];
- propagatedBuildInputs = [ pyyaml six ansible ruamel_yaml ];
+ propagatedBuildInputs = [ pyyaml six ansible ruamel_yaml ]
+ ++ lib.optionals isPy27 [ pathlib2 ];
checkInputs = [ nose ];
postPatch = ''
diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix
index aab979f3a8f..24675200b5b 100644
--- a/pkgs/development/python-modules/azure-core/default.nix
+++ b/pkgs/development/python-modules/azure-core/default.nix
@@ -11,14 +11,14 @@
}:
buildPythonPackage rec {
- version = "1.2.1";
+ version = "1.2.2";
pname = "azure-core";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "1fff6g5lszn97qz1h4l1n255r9538yybb329ilb2rwdfq3q9kkg2";
+ sha256 = "0bz4m6kmqymxlxf9qk6jw8v895d13rsggbgsjpsbvi9px6w15nwb";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix
index 4663b9fa035..ac99b98f0e5 100644
--- a/pkgs/development/python-modules/azure-mgmt-network/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix
@@ -7,13 +7,13 @@
}:
buildPythonPackage rec {
- version = "8.0.0";
+ version = "9.0.0";
pname = "azure-mgmt-network";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "1prg4b1agda9bsn6zmvffkj22rr6jy784rdfp6154yifjr6z5jiv";
+ sha256 = "12bsdbh37xiz42hvrp8ghszyqkiali3pk50x44f3aip12pgx6kix";
};
postInstall = if isPy3k then "" else ''
diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix
index 8f9128a62a0..c418dca1ec7 100644
--- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix
@@ -8,13 +8,13 @@
buildPythonPackage rec {
- version = "7.0.0";
+ version = "8.0.1";
pname = "azure-mgmt-resource";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "eaea8b5d05495d1b74220052275d46b6bed93b59245bcaa747279a52e41c3bdf";
+ sha256 = "0gngm7w17r5922ji11pnpa6gp5vh5z6la025v9cda6smsnx0fxx7";
};
postInstall = if isPy3k then "" else ''
diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix
index 552b1c88792..719e1eae3cc 100644
--- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix
@@ -7,13 +7,13 @@
}:
buildPythonPackage rec {
- version = "7.0.0";
+ version = "7.1.0";
pname = "azure-mgmt-storage";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "7f5e6b18dee267c99f08f6a716a93173bbae433c8665f5c59153fb1a963bc105";
+ sha256 = "03yjvw1dwkwsadsv60i625mr9zpdryy7ywvh7p8fg60djszh1p5l";
};
postInstall = if isPy3k then "" else ''
diff --git a/pkgs/development/python-modules/bespon/default.nix b/pkgs/development/python-modules/bespon/default.nix
new file mode 100644
index 00000000000..7949675d651
--- /dev/null
+++ b/pkgs/development/python-modules/bespon/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ version = "0.3.0";
+ pname = "BespON";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0698vx1kh8c84f5qfhl4grdlyn1lljvdih8yczdz0pql8wkn8i7v";
+ };
+
+ propagatedBuildInputs = [ ];
+ # upstream doesn't contain tests
+ doCheck = false;
+
+ pythonImportsCheck = [ "bespon" ];
+ meta = with stdenv.lib; {
+ description = "Encodes and decodes data in the BespON format.";
+ homepage = "https://github.com/gpoore/bespon_py";
+ license = licenses.lgpl3;
+ maintainers = with maintainers; [ synthetica ];
+ };
+
+}
diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix
index b96e0b7874a..db5ed5410e3 100644
--- a/pkgs/development/python-modules/braintree/default.nix
+++ b/pkgs/development/python-modules/braintree/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "braintree";
- version = "3.58.0";
+ version = "3.59.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0n8k9m3kifj34rzi2a3jgjsik91w8z32xaaxcmvqs7x8m5m3kjj4";
+ sha256 = "08g8qlnsp9wd2zbf6x3npp1425g7ih4lyljzvybd3vazsbqlw4yq";
};
propagatedBuildInputs = [ requests ];
diff --git a/pkgs/development/python-modules/bsddb3/default.nix b/pkgs/development/python-modules/bsddb3/default.nix
index a286249ea0f..7a541a47952 100644
--- a/pkgs/development/python-modules/bsddb3/default.nix
+++ b/pkgs/development/python-modules/bsddb3/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "bsddb3";
- version = "6.2.6";
+ version = "6.2.7";
src = fetchPypi {
inherit pname version;
- sha256 = "42d621f4037425afcb16b67d5600c4556271a071a9a7f7f2c2b1ba65bc582d05";
+ sha256 = "17yw0by4lycwpvnx06cnzbbchz4zvzbx3j89b20xa314xdizmxxh";
};
buildInputs = [ pkgs.db ];
diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix
index b9d2b4b7751..8aa80a75067 100644
--- a/pkgs/development/python-modules/can/default.nix
+++ b/pkgs/development/python-modules/can/default.nix
@@ -24,12 +24,7 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [ wrapt pyserial aenum ] ++ lib.optional (pythonOlder "3.5") typing;
- checkInputs = [ nose mock pytest pytest-timeout hypothesis future ];
-
- # Tests won't work with hypothesis 4.7.3 under Python 2. So skip the tests in
- # that case. This clause can be removed once hypothesis has been upgraded in
- # nixpkgs.
- doCheck = !(isPy27 && (hypothesis.version == "4.7.3"));
+ checkInputs = [ nose mock pytest hypothesis future ];
# Add the scripts to PATH
checkPhase = ''
diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix
index d354c523949..62f3731632d 100644
--- a/pkgs/development/python-modules/chalice/default.nix
+++ b/pkgs/development/python-modules/chalice/default.nix
@@ -44,8 +44,9 @@ buildPythonPackage rec {
doCheck = false;
postPatch = ''
+ sed -i setup.py -e "/pip>=/c\'pip',"
substituteInPlace setup.py \
- --replace 'pip>=9,<=18.1' 'pip' \
+ --replace 'pip>=9,<=19.4' 'pip' \
--replace 'typing==3.6.4' 'typing' \
--replace 'attrs==17.4.0' 'attrs' \
--replace 'click>=6.6,<7.0' 'click'
diff --git a/pkgs/development/python-modules/ckcc-protocol/default.nix b/pkgs/development/python-modules/ckcc-protocol/default.nix
index 599f91f2d07..f1136851f8a 100644
--- a/pkgs/development/python-modules/ckcc-protocol/default.nix
+++ b/pkgs/development/python-modules/ckcc-protocol/default.nix
@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "ckcc-protocol";
- version = "0.8.0";
+ version = "1.0.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "1mbs9l8qycy50j5lq6az7l5d8i40nb0vmlyhcyax298qp6c1r1gh";
+ sha256 = "1glws7z7kk9qyl1j4446hb6vv3l4s5xca40zb4fzhsh6chm76h11";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix
new file mode 100644
index 00000000000..2a77f45217a
--- /dev/null
+++ b/pkgs/development/python-modules/cvxpy/default.nix
@@ -0,0 +1,49 @@
+{ lib
+, pythonOlder
+, buildPythonPackage
+, fetchPypi
+, cvxopt
+, ecos
+, multiprocess
+, numpy
+, osqp
+, scipy
+, scs
+, six
+ # Check inputs
+, nose
+}:
+
+buildPythonPackage rec {
+ pname = "cvxpy";
+ version = "1.0.25";
+
+ disabled = pythonOlder "3.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "04zalvc8lckjfzm3i2ir32ib5pd6v7hxqqcnsnq6fw40vffm4dc5";
+ };
+
+ propagatedBuildInputs = [
+ cvxopt
+ ecos
+ multiprocess
+ osqp
+ scs
+ six
+ ];
+
+ checkInputs = [ nose ];
+ checkPhase = ''
+ nosetests
+ '';
+
+ meta = {
+ description = "A domain-specific language for modeling convex optimization problems in Python.";
+ homepage = "https://www.cvxpy.org/";
+ downloadPage = "https://github.com/cvxgrp/cvxpy/";
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ drewrisinger ];
+ };
+}
diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix
index 6dc19a17462..204a14eb0da 100644
--- a/pkgs/development/python-modules/datadog/default.nix
+++ b/pkgs/development/python-modules/datadog/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "datadog";
- version = "0.33.0";
+ version = "0.34.1";
src = fetchPypi {
inherit pname version;
- sha256 = "bce73f33a4496b004402baa502251150e3b48a48f610ff89d4cd110b366ee0ab";
+ sha256 = "1msi3wm0khmzh0ad7lwd5gigmqrxj25hd4w0qrsarihmd4ywrn1v";
};
postPatch = ''
@@ -25,6 +25,6 @@ buildPythonPackage rec {
meta = with lib; {
description = "The Datadog Python library";
license = licenses.bsd3;
- homepage = https://github.com/DataDog/datadogpy;
+ homepage = "https://github.com/DataDog/datadogpy";
};
}
diff --git a/pkgs/development/python-modules/django-gravatar2/default.nix b/pkgs/development/python-modules/django-gravatar2/default.nix
index be153feb2a7..4ea3b7e7ee5 100644
--- a/pkgs/development/python-modules/django-gravatar2/default.nix
+++ b/pkgs/development/python-modules/django-gravatar2/default.nix
@@ -2,18 +2,18 @@
buildPythonPackage rec {
pname = "django-gravatar2";
- version = "1.4.2";
+ version = "1.4.4";
src = fetchPypi {
inherit pname version;
- sha256 = "1qsv40xywbqsf4mkrmsswrpzqd7nfljxpfiim9an2z3dykn5rka6";
+ sha256 = "1vn921fb6jjx7rf5dzhy66rkb71nwmh9ydd0xs9ys72icw4jh4y8";
};
doCheck = false;
meta = with stdenv.lib; {
description = "Essential Gravatar support for Django";
- homepage = https://github.com/twaddington/django-gravatar;
+ homepage = "https://github.com/twaddington/django-gravatar";
license = licenses.mit;
};
}
diff --git a/pkgs/development/python-modules/etesync/default.nix b/pkgs/development/python-modules/etesync/default.nix
new file mode 100644
index 00000000000..f96c3e10883
--- /dev/null
+++ b/pkgs/development/python-modules/etesync/default.nix
@@ -0,0 +1,55 @@
+{ lib, buildPythonPackage, fetchPypi, isPy27,
+ appdirs, asn1crypto, cffi, cryptography, furl, idna, orderedmultidict,
+ packaging, peewee, py, pyasn1, pycparser, pyparsing, pyscrypt,
+ python-dateutil, pytz, requests, six, vobject,
+ pytest
+}:
+
+buildPythonPackage rec {
+ pname = "etesync";
+ version = "0.9.3";
+ disabled = isPy27;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1i6v7i4xmbpkc1pgpzq8gyl2kvg3a1kpdwp8q6l3l0vf9p5qm06w";
+ };
+
+ propagatedBuildInputs = [
+ appdirs
+ asn1crypto
+ cffi
+ cryptography
+ furl
+ idna
+ orderedmultidict
+ packaging
+ peewee
+ py
+ pyasn1
+ pycparser
+ pyparsing
+ pyscrypt
+ python-dateutil
+ pytz
+ requests
+ six
+ vobject
+ ];
+
+ checkInputs = [
+ pytest
+ ];
+
+ checkPhase = ''
+ pytest tests/test_collections.py
+ pytest tests/test_crypto.py
+ '';
+
+ meta = with lib; {
+ homepage = "https://www.etesync.com/";
+ description = "A python API to interact with an EteSync server.";
+ license = licenses.lgpl3;
+ maintainers = with maintainers; [ valodim ];
+ };
+}
diff --git a/pkgs/development/python-modules/face_recognition/default.nix b/pkgs/development/python-modules/face_recognition/default.nix
index 2856eeeab1b..93502a296dc 100644
--- a/pkgs/development/python-modules/face_recognition/default.nix
+++ b/pkgs/development/python-modules/face_recognition/default.nix
@@ -4,13 +4,13 @@
buildPythonPackage rec {
pname = "face_recognition";
- version = "1.2.3";
+ version = "1.3.0";
src = fetchFromGitHub {
repo = pname;
owner = "ageitgey";
- rev = "634db2e4309a365cee2503cb65d6f2e88f519d1e";
- sha256 = "06zw5hq417d5yp17zynhxhb73074lx2qy64fqfzf711rw5vrn2mx";
+ rev = "d34c622bf42e2c619505a4884017051ecf61ac77";
+ sha256 = "052878vnh3vbrsvmpgr0bx78k524dlxn47b2xakzbxk7dyjrgcli";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/fastdtw/default.nix b/pkgs/development/python-modules/fastdtw/default.nix
new file mode 100644
index 00000000000..cb75a599d03
--- /dev/null
+++ b/pkgs/development/python-modules/fastdtw/default.nix
@@ -0,0 +1,65 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, fetchpatch
+, cython
+, numpy
+ # Check Inputs
+, pytestCheckHook
+, python
+}:
+
+buildPythonPackage rec {
+ pname = "fastdtw";
+ version = "0.3.4";
+
+ src = fetchFromGitHub {
+ owner = "slaypni";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0irc5x4ahfp7f7q4ic97qa898s2awi0vdjznahxrfjirn8b157dw";
+ };
+
+ patches = [
+ # Removes outdated cythonized C++ file, which doesn't match CPython. Will be auto-used if left.
+ # Remove when PR 40 merged
+ (fetchpatch {
+ url = "https://patch-diff.githubusercontent.com/raw/slaypni/fastdtw/pull/40.patch";
+ sha256 = "0xjma0h84bk1n32wgk99rwfc85scp187a7fykhnylmcc73ppal9q";
+ })
+ ];
+
+ nativeBuildInputs = [
+ cython
+ ];
+
+ propagatedBuildInputs = [
+ numpy
+ ];
+
+ pythonImportsCheck = [ "fastdtw.fastdtw" ];
+ checkInputs = [ pytestCheckHook ];
+ dontUseSetuptoolsCheck = true; # looks for pytest-runner
+ preCheck = ''
+ echo "Temporarily moving tests to $OUT to find cython modules"
+ export PACKAGEDIR=$out/${python.sitePackages}
+ cp -r $TMP/source/tests $PACKAGEDIR
+ pushd $PACKAGEDIR
+ '';
+ postCheck = ''
+ rm -rf tests
+ popd
+ '';
+
+
+ meta = with lib; {
+ description = "Python implementation of FastDTW (Dynamic Time Warping)";
+ longDescription = ''
+ FastDTW is an approximate Dynamic Time Warping (DTW) algorithm that provides
+ optimal or near-optimal alignments with an O(N) time and memory complexity.
+ '';
+ homepage = "https://github.com/slaypni/fastdtw";
+ license = licenses.mit;
+ maintainers = with maintainers; [ drewrisinger ];
+ };
+}
diff --git a/pkgs/development/python-modules/filebytes/default.nix b/pkgs/development/python-modules/filebytes/default.nix
index e3f638276c2..7404620896c 100644
--- a/pkgs/development/python-modules/filebytes/default.nix
+++ b/pkgs/development/python-modules/filebytes/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "filebytes";
- version = "0.10.0";
+ version = "0.10.2";
src = fetchPypi {
inherit pname version;
- sha256 = "97d1f1f4ba660d8df6c51beea36ea7185704307d54b0b5d72ce57415c9ece082";
+ sha256 = "0h97i6h525hg401dvvaa5krxi184qpvldbdn0izmirvr9pvh4hkn";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/flask-babelex/default.nix b/pkgs/development/python-modules/flask-babelex/default.nix
index c61967af6bc..cdcb400983b 100644
--- a/pkgs/development/python-modules/flask-babelex/default.nix
+++ b/pkgs/development/python-modules/flask-babelex/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "flask-babelex";
- version = "0.9.3";
+ version = "0.9.4";
src = fetchPypi {
inherit version;
pname = "Flask-BabelEx";
- sha256 = "cf79cdedb5ce860166120136b0e059e9d97b8df07a3bc2411f6243de04b754b4";
+ sha256 = "09yfr8hlwvpgvq8kp1y7qbnnl0q28hi0348bv199ssiqx779r99r";
};
propagatedBuildInputs = [
@@ -40,7 +40,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Adds i18n/l10n support to Flask applications";
- homepage = https://github.com/mrjoes/flask-babelex;
+ homepage = "https://github.com/mrjoes/flask-babelex";
license = licenses.bsd3;
maintainers = [ maintainers.costrouc ];
};
diff --git a/pkgs/development/python-modules/fluidasserts/default.nix b/pkgs/development/python-modules/fluidasserts/default.nix
index f1f5397c0a8..7275199fca4 100644
--- a/pkgs/development/python-modules/fluidasserts/default.nix
+++ b/pkgs/development/python-modules/fluidasserts/default.nix
@@ -7,17 +7,16 @@
, aiohttp
, androguard
, azure-identity
-, azure-keyvault-keys
-, azure-keyvault-secrets
+, azure-keyvault
, azure-mgmt-compute
, azure-mgmt-keyvault
, azure-mgmt-network
, azure-mgmt-resource
, azure-mgmt-security
, azure-mgmt-storage
+, azure-mgmt-sql
, azure-mgmt-web
-, azure-storage-file
-, azure-storage-file-share
+, azure-storage
, bandit
, bcrypt
, beautifulsoup4
@@ -45,11 +44,14 @@
, pyhcl
, pyjks
, pynacl
+, pyodbc
, pyopenssl
, pypdf2
, pysmb
+, pytesseract
, python_magic
, pytz
+, pywinrm
, requirements-detector
, selenium
, tlslite-ng
@@ -57,35 +59,30 @@
# pythonPackages to test the derivation
, pytest
+, flask
+, flask-httpauth
+, docker
}:
buildPythonPackage rec {
pname = "fluidasserts";
- version = "20.1.33141";
+ version = "20.2.30165";
disabled = !isPy37;
src = fetchPypi {
inherit pname version;
- extension = "zip";
- sha256 = "01l6yb3r19q8b4kwqkrzn7mpfsr65zsgzax2fbs43hb6pq6vavnx";
+ sha256 = "0wcplzfx89d3c6hvdgag860sl3infqmymy6ly6y6ah77pkc98x15";
};
patchPhase = ''
- # Version mismatches between current FluidAsserts and Nixpkgs
- substituteInPlace ./setup.py \
- --replace 'tlslite-ng==0.8.0-alpha36' 'tlslite-ng==0.7.5' \
- --replace 'boto3==1.11.7' 'boto3==1.10.1' \
- --replace 'typed-ast==1.4.1' 'typed-ast==1.4.0' \
- --replace 'pillow==7.0.0' 'pillow==6.2.1' \
+ # Release packages from their hard pinned versions
+ sed -i -E "s/(.*)==.*/\1/g" requirements.txt
# Functionality that will be not present for the momment
# but that we'll work to add in the future
# Just a minimal portion of fluidasserts use this
- substituteInPlace ./setup.py \
- --replace "'pymssql==2.1.4'," "" \
- --replace "'pytesseract==0.3.1'," "" \
- --replace "'pywinrm==0.4.1'," "" \
- --replace "'mitmproxy==5.0.1'," "" \
+ substituteInPlace ./requirements.txt \
+ --replace "mitmproxy" "" \
'';
@@ -94,17 +91,16 @@ buildPythonPackage rec {
aiohttp
androguard
azure-identity
- azure-keyvault-keys
- azure-keyvault-secrets
+ azure-keyvault
azure-mgmt-compute
azure-mgmt-keyvault
azure-mgmt-network
azure-mgmt-resource
azure-mgmt-security
azure-mgmt-storage
+ azure-mgmt-sql
azure-mgmt-web
- azure-storage-file
- azure-storage-file-share
+ azure-storage
bandit
bcrypt
beautifulsoup4
@@ -132,28 +128,67 @@ buildPythonPackage rec {
pyhcl
pyjks
pynacl
+ pyodbc
pyopenssl
pypdf2
pysmb
+ pytesseract
python_magic
pytz
+ pywinrm
requirements-detector
selenium
tlslite-ng
viewstate
];
+ configurePhase = ''
+ mkdir -p build/config
+ touch build/config/README.rst
+ '';
+
checkInputs = [
+ docker
+ flask
+ flask-httpauth
pytest
];
checkPhase = ''
+ # This tests require BWAPP Docker Container
+ sed -ie 's/test_a[0-9]//g' ./test/test_proto_http_open.py
+ sed -ie 's/test_a[0-9]//g' ./test/test_proto_http_close.py
+
+ # This tests require network connectivity
+ sed -ie 's/test_is_date_unsyncd//g' ./test/test_proto_http_open.py
+ sed -ie 's/test_is_date_unsyncd//g' ./test/test_proto_http_close.py
+
+ # Remove impurities
+ substituteInPlace ./test/conftest.py \
+ --replace "import wait" "" \
+ --replace "if not os.path.exists(name):" "if os.path.exists(name):" \
+ --replace "from test.mock import graphql_server" "" \
+ --replace "(graphql_server.start, 'MockGraphQLServer', ['proto_graphql'])," "" \
+
+ pytest --asserts-module 'iot' \
+ test/test_iot_phone.py
+
+ pytest --asserts-module 'ot' \
+ test/test_ot_powerlogic.py
+
+ pytest --asserts-module 'proto_http' \
+ test/test_proto_{http_close,http_open}.py
+
+ pytest --asserts-module 'proto_rest' \
+ test/test_proto_rest.py
+
# This file launches mock docker containers and servers
# let's remove it to create a custom test environment
rm test/conftest.py
pytest \
- test/test_cloud_aws_terraform_{ebs,ec2}.py \
+ test/test_cloud_aws_terraform_{cloudfront,dynamodb,ebs,ec2,elb}.py \
+ test/test_cloud_aws_terraform_{fsx,iam,kms,rds,s3}.py \
test/test_cloud_aws_cloudformation_{cloudfront,dynamodb,ec2,elb,elb2}.py \
test/test_cloud_aws_cloudformation_{fsx,iam,kms,rds,s3,secretsmanager}.py \
test/test_format_{apk,jks,jwt,pdf,pkcs12,string}.py \
@@ -161,7 +196,6 @@ buildPythonPackage rec {
test/test_lang_{javascript,java}.py \
test/test_lang_{core,csharp,docker,dotnetconfig,html,php,python,rpgle}.py \
test/test_utils_generic.py
-
'';
meta = with lib; {
diff --git a/pkgs/development/python-modules/furl/default.nix b/pkgs/development/python-modules/furl/default.nix
index ecb455b51e4..5893e5a6b94 100644
--- a/pkgs/development/python-modules/furl/default.nix
+++ b/pkgs/development/python-modules/furl/default.nix
@@ -1,22 +1,27 @@
-{ stdenv, buildPythonPackage, fetchPypi, flake8, six, orderedmultidict }:
+{ stdenv, buildPythonPackage, fetchPypi, flake8, six, orderedmultidict, pytest }:
buildPythonPackage rec {
pname = "furl";
- version = "2.0.0";
+ version = "2.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1v2lakx03d5w8954a39ki44xv5mllnq0a0avhxykv9hrzg0yvjpx";
+ sha256 = "08dnw3bs1mk0f1ccn466a5a7fi1ivwrp0jspav9arqpf3wd27q60";
};
- checkInputs = [ flake8 ];
+ checkInputs = [ flake8 pytest ];
propagatedBuildInputs = [ six orderedmultidict ];
+ # see https://github.com/gruns/furl/issues/121
+ checkPhase = ''
+ pytest -k 'not join'
+ '';
+
meta = with stdenv.lib; {
- description = "URL manipulation made simple.";
- homepage = https://github.com/gruns/furl;
- license = licenses.publicDomain;
+ description = "furl is a small Python library that makes parsing and manipulating URLs easy";
+ homepage = "https://github.com/gruns/furl";
+ license = licenses.unlicense;
maintainers = with maintainers; [ vanzef ];
};
}
diff --git a/pkgs/development/python-modules/fuzzywuzzy/default.nix b/pkgs/development/python-modules/fuzzywuzzy/default.nix
index 7091799deca..551f5f4c3dd 100644
--- a/pkgs/development/python-modules/fuzzywuzzy/default.nix
+++ b/pkgs/development/python-modules/fuzzywuzzy/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "fuzzywuzzy";
- version = "0.17.0";
+ version = "0.18.0";
src = fetchPypi {
inherit pname version;
- sha256 = "6f49de47db00e1c71d40ad16da42284ac357936fa9b66bea1df63fed07122d62";
+ sha256 = "1s00zn75y2dkxgnbw8kl8dw4p1mc77cv78fwfa4yb0274s96w0a5";
};
propagatedBuildInputs = [ python-Levenshtein ];
diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix
index 0f30be449c0..f3209c2d520 100644
--- a/pkgs/development/python-modules/google_api_core/default.nix
+++ b/pkgs/development/python-modules/google_api_core/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
description = "This library is not meant to stand-alone. Instead it defines common helpers used by all Google API clients.";
homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
license = licenses.asl20;
- maintainers = with maintainers; [ vanschelven ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/google_auth/default.nix b/pkgs/development/python-modules/google_auth/default.nix
index 56ca3358e89..1f86c2a2af2 100644
--- a/pkgs/development/python-modules/google_auth/default.nix
+++ b/pkgs/development/python-modules/google_auth/default.nix
@@ -21,6 +21,6 @@ buildPythonPackage rec {
description = "This library simplifies using Google’s various server-to-server authentication mechanisms to access Google APIs.";
homepage = "https://google-auth.readthedocs.io/en/latest/";
license = licenses.asl20;
- maintainers = with maintainers; [ vanschelven ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/google_cloud_core/default.nix b/pkgs/development/python-modules/google_cloud_core/default.nix
index c74ad1d2e3c..2a9a13b2630 100644
--- a/pkgs/development/python-modules/google_cloud_core/default.nix
+++ b/pkgs/development/python-modules/google_cloud_core/default.nix
@@ -22,6 +22,6 @@ buildPythonPackage rec {
description = "API Client library for Google Cloud: Core Helpers";
homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
license = licenses.asl20;
- maintainers = with maintainers; [ vanschelven ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/google_cloud_speech/default.nix b/pkgs/development/python-modules/google_cloud_speech/default.nix
index c00ea653900..bdf8031970f 100644
--- a/pkgs/development/python-modules/google_cloud_speech/default.nix
+++ b/pkgs/development/python-modules/google_cloud_speech/default.nix
@@ -21,6 +21,6 @@ buildPythonPackage rec {
description = "Cloud Speech API enables integration of Google speech recognition into applications.";
homepage = "https://github.com/googleapis/google-cloud-python/tree/master/speech";
license = licenses.asl20;
- maintainers = with maintainers; [ vanschelven ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/googleapis_common_protos/default.nix b/pkgs/development/python-modules/googleapis_common_protos/default.nix
index 7a10ce12c38..08d31b6920b 100644
--- a/pkgs/development/python-modules/googleapis_common_protos/default.nix
+++ b/pkgs/development/python-modules/googleapis_common_protos/default.nix
@@ -19,6 +19,6 @@ buildPythonPackage rec {
description = "Common protobufs used in Google APIs";
homepage = "https://github.com/googleapis/googleapis";
license = licenses.asl20;
- maintainers = with maintainers; [ vanschelven ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/googletrans/default.nix b/pkgs/development/python-modules/googletrans/default.nix
new file mode 100644
index 00000000000..06d00820005
--- /dev/null
+++ b/pkgs/development/python-modules/googletrans/default.nix
@@ -0,0 +1,34 @@
+{ lib, buildPythonPackage, fetchFromGitHub, requests, pytest, coveralls }:
+
+buildPythonPackage rec {
+ pname = "googletrans";
+ version = "2.4.0";
+
+ src = fetchFromGitHub {
+ owner = "ssut";
+ repo = "py-googletrans";
+ rev = "v${version}";
+ sha256 = "0wzzinn0k9rfv9z1gmfk9l4kljyd4n6kizsjw4wjxv91kfhj92hz";
+ };
+
+ propagatedBuildInputs = [
+ requests
+ ];
+
+ checkInputs = [ pytest coveralls ];
+
+ # majority of tests just try to ping Google's Translate API endpoint
+ doCheck = false;
+ checkPhase = ''
+ pytest
+ '';
+
+ pythonImportsCheck = [ "googletrans" ];
+
+ meta = with lib; {
+ description = "Googletrans is python library to interact with Google Translate API";
+ homepage = "https://py-googletrans.readthedocs.io";
+ license = licenses.mit;
+ maintainers = with maintainers; [ unode ];
+ };
+}
diff --git a/pkgs/development/python-modules/graphql-core/default.nix b/pkgs/development/python-modules/graphql-core/default.nix
new file mode 100644
index 00000000000..21cc58e67fc
--- /dev/null
+++ b/pkgs/development/python-modules/graphql-core/default.nix
@@ -0,0 +1,54 @@
+{ buildPythonPackage
+, fetchFromGitHub
+, lib
+
+, coveralls
+, promise
+, pytest
+, pytest-benchmark
+, pytest-mock
+, rx
+, six
+}:
+
+buildPythonPackage rec {
+ pname = "graphql-core";
+ version = "2.3.1";
+
+ src = fetchFromGitHub {
+ owner = "graphql-python";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "029jnwy6zbj4x7f3ffpn1gyx0w9ala9cj2g115g6aa7im3xd2jma";
+ };
+
+ propagatedBuildInputs = [
+ promise
+ rx
+ six
+ ];
+
+ checkInputs = [
+ coveralls
+ pytest
+ pytest-benchmark
+ pytest-mock
+ ];
+
+ checkPhase = "pytest";
+
+ configurePhase = ''
+ substituteInPlace setup.py \
+ --replace 'pytest-mock==1.2' 'pytest-mock==1.13.0' \
+ --replace 'pytest-benchmark==3.0.0' 'pytest-benchmark==3.2.2'
+ '';
+
+ meta = with lib; {
+ description = "Port of graphql-js to Python";
+ homepage = "https://github.com/graphql-python/graphql-core";
+ license = licenses.mit;
+ maintainers = with maintainers; [
+ kamadorueda
+ ];
+ };
+}
diff --git a/pkgs/development/python-modules/graphql-server-core/default.nix b/pkgs/development/python-modules/graphql-server-core/default.nix
new file mode 100644
index 00000000000..e12d71836f1
--- /dev/null
+++ b/pkgs/development/python-modules/graphql-server-core/default.nix
@@ -0,0 +1,40 @@
+{ buildPythonPackage
+, fetchFromGitHub
+, lib
+
+, black
+, graphql-core
+, promise
+}:
+
+buildPythonPackage rec {
+ pname = "graphql-server-core";
+ version = "1.2.0";
+
+ src = fetchFromGitHub {
+ owner = "graphql-python";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "123q3xziv0s22h10v3f5slirf4b6nxj0hnmarwx9vws6x21bgrgh";
+ };
+
+ propagatedBuildInputs = [
+ graphql-core
+ promise
+ ];
+
+ checkPhase = "black --check graphql_server tests";
+
+ checkInputs = [
+ black
+ ];
+
+ meta = with lib; {
+ description = "Core package for using GraphQL in a custom server easily";
+ homepage = "https://github.com/graphql-python/graphql-server-core";
+ license = licenses.mit;
+ maintainers = with maintainers; [
+ kamadorueda
+ ];
+ };
+}
diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix
index 7965e200130..fcfccf29efd 100644
--- a/pkgs/development/python-modules/grpcio-tools/default.nix
+++ b/pkgs/development/python-modules/grpcio-tools/default.nix
@@ -20,6 +20,6 @@ buildPythonPackage rec {
description = "Protobuf code generator for gRPC";
license = licenses.asl20;
homepage = "https://grpc.io/grpc/python/";
- maintainers = with maintainers; [ vanschelven ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix
index 60bfae8dca5..cdb252f7434 100644
--- a/pkgs/development/python-modules/grpcio/default.nix
+++ b/pkgs/development/python-modules/grpcio/default.nix
@@ -18,6 +18,6 @@ buildPythonPackage rec {
description = "HTTP/2-based RPC framework";
license = licenses.asl20;
homepage = "https://grpc.io/grpc/python/";
- maintainers = with maintainers; [ vanschelven ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix
index 00c9b86c5eb..622360edd24 100644
--- a/pkgs/development/python-modules/gssapi/default.nix
+++ b/pkgs/development/python-modules/gssapi/default.nix
@@ -18,13 +18,13 @@
buildPythonPackage rec {
pname = "gssapi";
- version = "1.6.1";
+ version = "1.6.2";
src = fetchFromGitHub {
owner = "pythongssapi";
repo = "python-${pname}";
rev = "v${version}";
- sha256 = "0n13vb3v50vr04vrnql2w00gri0gcf08i0pr0q2p4w8scbsw7kjk";
+ sha256 = "195x3zqzyv491i9hf7l4asmic5pb2w3l1r7bps89651wkb3mrz1l";
};
# It's used to locate headers
@@ -63,7 +63,7 @@ buildPythonPackage rec {
'';
meta = with lib; {
- homepage = https://pypi.python.org/pypi/gssapi;
+ homepage = "https://pypi.python.org/pypi/gssapi";
description = "Python GSSAPI Wrapper";
license = licenses.mit;
};
diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix
new file mode 100644
index 00000000000..b2857eb2457
--- /dev/null
+++ b/pkgs/development/python-modules/hg-evolve/default.nix
@@ -0,0 +1,24 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+}:
+
+buildPythonPackage rec {
+ pname = "hg-evolve";
+ version = "9.2.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "08bjrgxv8zrrz5xxydzkjl4a8cw3g62nmzfnvdzxxcrf1c96qw76";
+ };
+
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "Enables the “changeset evolution” feature of Mercurial core";
+ homepage = "https://www.mercurial-scm.org/doc/evolution/";
+ maintainers = with maintainers; [ xavierzwirtz ];
+ license = stdenv.lib.licenses.gpl2Plus;
+ };
+}
diff --git a/pkgs/development/python-modules/httpretty/default.nix b/pkgs/development/python-modules/httpretty/default.nix
index 86b8ef13a7a..79c0fbfcac8 100644
--- a/pkgs/development/python-modules/httpretty/default.nix
+++ b/pkgs/development/python-modules/httpretty/default.nix
@@ -37,6 +37,7 @@ buildPythonPackage rec {
"tests.functional.test_httplib2.test_callback_response"
"tests.functional.test_requests.test_streaming_responses"
"tests.functional.test_httplib2.test_callback_response"
+ "tests.functional.test_requests.test_httpretty_should_allow_adding_and_overwritting_by_kwargs_u2"
];
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix
index cc08d2cf375..90dfc6fa7da 100644
--- a/pkgs/development/python-modules/jinja2/default.nix
+++ b/pkgs/development/python-modules/jinja2/default.nix
@@ -1,5 +1,9 @@
-{ stdenv, buildPythonPackage, fetchPypi
-, pytest, markupsafe }:
+{ stdenv
+, buildPythonPackage
+, isPy3k
+, fetchPypi
+, pytest
+, markupsafe }:
buildPythonPackage rec {
pname = "Jinja2";
@@ -13,6 +17,10 @@ buildPythonPackage rec {
checkInputs = [ pytest ];
propagatedBuildInputs = [ markupsafe ];
+ # Multiple tests run out of stack space on 32bit systems with python2.
+ # See https://github.com/pallets/jinja/issues/1158
+ doCheck = !stdenv.is32bit || isPy3k;
+
checkPhase = ''
pytest -v tests
'';
diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix
index ad26b62931d..e96950c496c 100644
--- a/pkgs/development/python-modules/jug/default.nix
+++ b/pkgs/development/python-modules/jug/default.nix
@@ -5,7 +5,7 @@
buildPythonPackage rec {
pname = "Jug";
- version = "1.6.9";
+ version = "2.0.0";
buildInputs = [ nose numpy ];
propagatedBuildInputs = [
bottle
@@ -18,13 +18,13 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "0193hp8ap6caw57jdch3vw0hl5m8942lxhjdsfaxk4bfb239l5kz";
+ sha256 = "1am73pis8qrbgmpwrkja2qr0n9an6qha1k1yp87nx6iq28w5h7cv";
};
meta = with stdenv.lib; {
description = "A Task-Based Parallelization Framework";
license = licenses.mit;
- homepage = https://jug.readthedocs.io/;
+ homepage = "https://jug.readthedocs.io/";
maintainers = with maintainers; [ luispedro ];
};
}
diff --git a/pkgs/development/python-modules/ldaptor/default.nix b/pkgs/development/python-modules/ldaptor/default.nix
index 49dc9a9b25b..614fe60ada9 100644
--- a/pkgs/development/python-modules/ldaptor/default.nix
+++ b/pkgs/development/python-modules/ldaptor/default.nix
@@ -2,9 +2,11 @@
, buildPythonPackage
, fetchPypi
, twisted
+, passlib
, pycrypto
, pyopenssl
, pyparsing
+, service-identity
, zope_interface
, isPy3k
}:
@@ -19,7 +21,7 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [
- twisted pycrypto pyopenssl pyparsing zope_interface
+ twisted passlib pycrypto pyopenssl pyparsing service-identity zope_interface
];
disabled = isPy3k;
@@ -32,4 +34,4 @@ buildPythonPackage rec {
homepage = https://github.com/twisted/ldaptor;
license = lib.licenses.mit;
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/python-modules/locustio/default.nix b/pkgs/development/python-modules/locustio/default.nix
index 2203fa4c6ad..0b64fc39feb 100644
--- a/pkgs/development/python-modules/locustio/default.nix
+++ b/pkgs/development/python-modules/locustio/default.nix
@@ -1,17 +1,18 @@
-{ buildPythonPackage
-, fetchFromGitHub
-, mock
-, unittest2
-, msgpack
-, requests
+{ buildPythonPackage, fetchFromGitHub, isPy38
, flask
, gevent
+, mock
+, msgpack
, pyzmq
+, requests
+, unittest2
}:
buildPythonPackage rec {
pname = "locustio";
- version = "0.9.0";
+ version = "0.14.4";
+ # tests hang on python38
+ disabled = isPy38;
src = fetchFromGitHub {
owner = "locustio";
@@ -21,10 +22,14 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [ msgpack requests flask gevent pyzmq ];
- buildInputs = [ mock unittest2 ];
+ checkInputs = [ mock unittest2 ];
+ # remove file which attempts to do GET request
+ preCheck = ''
+ rm locust/test/test_stats.py
+ '';
meta = {
- homepage = https://locust.io/;
+ homepage = "https://locust.io/";
description = "A load testing tool";
};
}
diff --git a/pkgs/development/python-modules/mockito/default.nix b/pkgs/development/python-modules/mockito/default.nix
index f0673b64ef3..74887b99536 100644
--- a/pkgs/development/python-modules/mockito/default.nix
+++ b/pkgs/development/python-modules/mockito/default.nix
@@ -1,12 +1,12 @@
{ stdenv, buildPythonPackage, fetchPypi, isPy3k, funcsigs, pytest, numpy }:
buildPythonPackage rec {
- version = "1.2.0";
+ version = "1.2.1";
pname = "mockito";
src = fetchPypi {
inherit pname version;
- sha256 = "2a1cbae9d0aef4ae7586b03f2a463e8c5ba96aa937c0535ced4a5621f851feeb";
+ sha256 = "1ilj73bdk81v4l7ir6hbfvmslzbsxkgvz1asngbyf7w5gl2y5nyf";
};
propagatedBuildInputs = stdenv.lib.optionals (!isPy3k) [ funcsigs ];
@@ -20,7 +20,7 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
description = "Spying framework";
- homepage = https://github.com/kaste/mockito-python;
+ homepage = "https://github.com/kaste/mockito-python";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
};
diff --git a/pkgs/development/python-modules/msgpack/default.nix b/pkgs/development/python-modules/msgpack/default.nix
index 20be837782a..8095c151da7 100644
--- a/pkgs/development/python-modules/msgpack/default.nix
+++ b/pkgs/development/python-modules/msgpack/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "msgpack";
- version = "0.6.2";
+ version = "1.0.0";
src = fetchPypi {
inherit pname version;
- sha256 = "ea3c2f859346fcd55fc46e96885301d9c2f7a36d453f5d8f2967840efa1e1830";
+ sha256 = "1h5mxh84rcw04dvxy1qbfn2hisavfqgilh9k09rgyjhd936dad4m";
};
checkPhase = ''
diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/pkgs/development/python-modules/mysql-connector/default.nix
index 61a055b5ea8..e66f102e6ca 100644
--- a/pkgs/development/python-modules/mysql-connector/default.nix
+++ b/pkgs/development/python-modules/mysql-connector/default.nix
@@ -1,9 +1,7 @@
-{ lib, buildPythonPackage, fetchFromGitHub
-, python3, protobuf3_6
-}:
+{ lib, buildPythonPackage, fetchFromGitHub, python, protobuf3_6 }:
let
- python = python3.override {
+ py = python.override {
packageOverrides = self: super: {
protobuf = super.protobuf.override {
protobuf = protobuf3_6;
@@ -21,7 +19,7 @@ in buildPythonPackage rec {
sha256 = "1jscmc5s7mwx43gvxjlqc30ylp5jjpmkqx7s3b9nllbh926p3ixg";
};
- propagatedBuildInputs = with python.pkgs; [ protobuf dnspython ];
+ propagatedBuildInputs = with py.pkgs; [ protobuf dnspython ];
# Tests are failing (TODO: unknown reason)
# TypeError: __init__() missing 1 required positional argument: 'string'
diff --git a/pkgs/development/python-modules/nbsphinx/default.nix b/pkgs/development/python-modules/nbsphinx/default.nix
index 788a8f73ab8..4557d665650 100644
--- a/pkgs/development/python-modules/nbsphinx/default.nix
+++ b/pkgs/development/python-modules/nbsphinx/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "nbsphinx";
- version = "0.5.0";
+ version = "0.5.1";
src = fetchPypi {
inherit pname version;
- sha256 = "03g0mqbgk143cq3l3r42js2iy5l6iyvpckpqip4p468rlzrddyhn";
+ sha256 = "0kh0d83xavpffdp4xp4hq8xy43l6lyv3d1a25rnc15jcbdf1nghw";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/nbval/default.nix b/pkgs/development/python-modules/nbval/default.nix
index ff9d6f134e0..020fab8f888 100644
--- a/pkgs/development/python-modules/nbval/default.nix
+++ b/pkgs/development/python-modules/nbval/default.nix
@@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "nbval";
- version = "0.9.4";
+ version = "0.9.5";
src = fetchPypi {
inherit pname version;
- sha256 = "5273c2d958335e24b170fe59b689b13e4b1855b569626e18b1c7e420f5110cc6";
+ sha256 = "1xh2p7g5s5g06caaraf3dsz69bpj7dgw2h3ss67kci789aspnwp8";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix
index 8f1136c4654..44621d35383 100644
--- a/pkgs/development/python-modules/poetry/default.nix
+++ b/pkgs/development/python-modules/poetry/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, callPackage
-, isPy27, isPy34
+, isPy27, isPy34, pythonOlder
, cleo
, requests
, cachy
@@ -7,7 +7,6 @@
, pyrsistent
, pyparsing
, cachecontrol
-, lockfile
, pkginfo
, html5lib
, shellingham
@@ -17,42 +16,43 @@
, pathlib2
, virtualenv
, functools32
+, clikit
+, keyring
+, pexpect
+, importlib-metadata
, pytest
, jsonschema
+, intreehooks
+, lockfile
}:
let
- cleo6 = cleo.overridePythonAttrs (oldAttrs: rec {
- version = "0.6.8";
- src = fetchPypi {
- inherit (oldAttrs) pname;
- inherit version;
- sha256 = "06zp695hq835rkaq6irr1ds1dp2qfzyf32v60vxpd8rcnxv319l5";
- };
- });
glob2 = callPackage ./glob2.nix { };
in buildPythonPackage rec {
pname = "poetry";
- version = "0.12.17";
+ version = "1.0.3";
src = fetchPypi {
inherit pname version;
- sha256 = "0gxwcd65qjmzqzppf53x51sic1rbcd9py6cdzx3aprppipimslvf";
+ sha256 = "0fx1ilgkrsqjjnpgv5zljsp0wpcsywdqvvi8im9z396qq6qpk830";
};
postPatch = ''
- substituteInPlace setup.py --replace \
- "requests-toolbelt>=0.8.0,<0.9.0" \
- "requests-toolbelt>=0.8.0,<0.10.0" \
- --replace 'pyrsistent>=0.14.2,<0.15.0' 'pyrsistent>=0.14.2,<0.16.0'
+ substituteInPlace pyproject.toml \
+ --replace "pyrsistent = \"^0.14.2\"" "pyrsistent = \"^0.15.0\"" \
+ --replace "requests-toolbelt = \"^0.8.0\"" "requests-toolbelt = \"^0.9.0\"" \
+ --replace "importlib-metadata = {version = \"~1.1.3\", python = \"<3.8\"}" \
+ "importlib-metadata = {version = \"~1.3.0\", python = \"<3.8\"}"
'';
format = "pyproject";
+ nativeBuildInputs = [ intreehooks ];
+
propagatedBuildInputs = [
- cachy
- cleo6
+ cleo
+ clikit
requests
cachy
requests-toolbelt
@@ -60,13 +60,16 @@ in buildPythonPackage rec {
pyrsistent
pyparsing
cachecontrol
- lockfile
pkginfo
html5lib
shellingham
tomlkit
+ pexpect
+ keyring
+ lockfile
] ++ lib.optionals (isPy27 || isPy34) [ typing pathlib2 glob2 ]
- ++ lib.optionals isPy27 [ virtualenv functools32 subprocess32 ];
+ ++ lib.optionals isPy27 [ virtualenv functools32 subprocess32 ]
+ ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
postInstall = ''
mkdir -p "$out/share/bash-completion/completions"
@@ -85,7 +88,7 @@ in buildPythonPackage rec {
'';
meta = with lib; {
- homepage = https://github.com/sdispater/poetry;
+ homepage = "https://python-poetry.org/";
description = "Python dependency management and packaging made easy";
license = licenses.mit;
maintainers = with maintainers; [ jakewaksbaum ];
diff --git a/pkgs/development/python-modules/promise/default.nix b/pkgs/development/python-modules/promise/default.nix
new file mode 100644
index 00000000000..68668812fc8
--- /dev/null
+++ b/pkgs/development/python-modules/promise/default.nix
@@ -0,0 +1,49 @@
+{ buildPythonPackage
+, fetchPypi
+, lib
+
+, coveralls
+, gevent
+, mock
+, pytest-asyncio
+, pytest-benchmark
+, pytestcov
+, six
+}:
+
+buildPythonPackage rec {
+ pname = "promise";
+ version = "2.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1l4kknj97dj5pxfpsz3ln78x9a843561c740b1m4pfi3qlvq7lfz";
+ };
+
+ patchPhase = ''
+ substituteInPlace setup.py \
+ --replace '"futures",' ""
+ '';
+
+ propagatedBuildInputs = [
+ gevent
+ six
+ ];
+
+ checkInputs = [
+ coveralls
+ mock
+ pytest-asyncio
+ pytest-benchmark
+ pytestcov
+ ];
+
+ meta = with lib; {
+ description = "Ultra-performant Promise implementation in Python";
+ homepage = "https://github.com/syrusakbary/promise";
+ license = licenses.mit;
+ maintainers = with maintainers; [
+ kamadorueda
+ ];
+ };
+}
diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix
index 388716cb700..59dd94b3018 100644
--- a/pkgs/development/python-modules/psutil/default.nix
+++ b/pkgs/development/python-modules/psutil/default.nix
@@ -1,26 +1,41 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, python
, darwin
+, pytest
+, mock
+, ipaddress
}:
buildPythonPackage rec {
pname = "psutil";
- version = "5.6.7";
+ version = "5.7.0";
src = fetchPypi {
inherit pname version;
- sha256 = "ffad8eb2ac614518bbe3c0b8eb9dffdb3a8d2e3a7d5da51c5b974fb723a5c5aa";
+ sha256 = "03jykdi3dgf1cdal9bv4fq9zjvzj9l9bs99gi5ar81sdl5nc2pk8";
};
- # No tests in archive
- doCheck = false;
+ # arch doesn't report frequency is the same way
+ doCheck = stdenv.isx86_64;
+ checkInputs = [ pytest ]
+ ++ lib.optionals isPy27 [ mock ipaddress ];
+ # out must be referenced as test import paths are relative
+ # disable tests which don't work in sandbox
+ # cpu_times is flakey on darwin
+ checkPhase = ''
+ pytest $out/${python.sitePackages}/psutil/tests/test_system.py \
+ -k 'not user \
+ and not disk_io_counters and not sensors_battery \
+ and not cpu_times'
+ '';
- buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.IOKit ];
+ buildInputs = lib.optionals stdenv.isDarwin [ darwin.IOKit ];
- meta = {
+ pythonImportsCheck = [ "psutil" ];
+
+ meta = with lib; {
description = "Process and system utilization information interface for python";
- homepage = https://github.com/giampaolo/psutil;
- license = stdenv.lib.licenses.bsd3;
+ homepage = "https://github.com/giampaolo/psutil";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ jonringer ];
};
}
diff --git a/pkgs/development/python-modules/pybullet/default.nix b/pkgs/development/python-modules/pybullet/default.nix
index d7b46f07749..e2d391493d2 100644
--- a/pkgs/development/python-modules/pybullet/default.nix
+++ b/pkgs/development/python-modules/pybullet/default.nix
@@ -3,15 +3,16 @@
, fetchPypi
, libGLU, libGL
, xorg
+, numpy
}:
buildPythonPackage rec {
pname = "pybullet";
- version = "2.6.1";
+ version = "2.6.6";
src = fetchPypi {
inherit pname version;
- sha256 = "c6da064687ae481c73b744b9f3a62d8231349a6bf368d7a2e564f71ef73e9403";
+ sha256 = "1lsvjqij1vb9w8j6lvnq7lppflc7svz4cj37n74q67mb46gq3dxr";
};
buildInputs = [
@@ -19,6 +20,8 @@ buildPythonPackage rec {
xorg.libX11
];
+ propagatedBuildInputs = [ numpy ];
+
patches = [
# make sure X11 and OpenGL can be found at runtime
./static-libs.patch
diff --git a/pkgs/development/python-modules/pybullet/static-libs.patch b/pkgs/development/python-modules/pybullet/static-libs.patch
index 08a68b81486..8b58e3659e0 100644
--- a/pkgs/development/python-modules/pybullet/static-libs.patch
+++ b/pkgs/development/python-modules/pybullet/static-libs.patch
@@ -1,13 +1,13 @@
diff --git a/setup.py b/setup.py
-index 98efabdbf..e69e79084 100644
+index 6f7bd7589..321fc6ab0 100644
--- a/setup.py
+++ b/setup.py
-@@ -563,6 +563,8 @@ print("-----")
+@@ -465,6 +465,8 @@ print("-----")
extensions = []
+libraries += [ "X11", "GL" ] # statically link x11 and opengl
+
- pybullet_ext = Extension("pybullet",
- sources = sources,
- libraries = libraries,
+ pybullet_ext = Extension(
+ "pybullet",
+ sources=sources,
diff --git a/pkgs/development/python-modules/pyfribidi/default.nix b/pkgs/development/python-modules/pyfribidi/default.nix
index 50a0bfa1e22..fcb201c0311 100644
--- a/pkgs/development/python-modules/pyfribidi/default.nix
+++ b/pkgs/development/python-modules/pyfribidi/default.nix
@@ -1,14 +1,14 @@
{ stdenv
, buildPythonPackage
, fetchPypi
-, isPy3k
, isPyPy
+, six
}:
buildPythonPackage rec {
version = "0.12.0";
pname = "pyfribidi";
- disabled = isPy3k || isPyPy;
+ disabled = isPyPy;
src = fetchPypi {
inherit pname version;
@@ -16,6 +16,10 @@ buildPythonPackage rec {
sha256 = "64726a4a56783acdc79c6b9b3a15f16e6071077c897a0b999f3b43f744bc621c";
};
+ patches = stdenv.lib.optional stdenv.cc.isClang ./pyfribidi-clang.patch;
+
+ propagatedBuildInputs = [ six ];
+
meta = with stdenv.lib; {
description = "A simple wrapper around fribidi";
homepage = https://github.com/pediapress/pyfribidi;
diff --git a/pkgs/development/python-modules/pyfribidi/pyfribidi-clang.patch b/pkgs/development/python-modules/pyfribidi/pyfribidi-clang.patch
new file mode 100644
index 00000000000..c570843f7e8
--- /dev/null
+++ b/pkgs/development/python-modules/pyfribidi/pyfribidi-clang.patch
@@ -0,0 +1,17 @@
+diff --git a/pyfribidi.c b/pyfribidi.c
+index 9a0120d..238134a 100644
+--- a/pyfribidi.c
++++ b/pyfribidi.c
+@@ -148,10 +148,11 @@ init_pyfribidi (void)
+ {
+ #if PY_MAJOR_VERSION >= 3
+ PyObject *module = PyModule_Create (&pyfribidi_moduledef);
++ if (module == NULL) return NULL;
+ #else
+ PyObject *module = Py_InitModule ("_pyfribidi", PyfribidiMethods);
++ if (module == NULL) return;
+ #endif
+- if (module == NULL) return NULL;
+
+ PyModule_AddIntConstant (module, "RTL", (long) FRIBIDI_TYPE_RTL);
+ PyModule_AddIntConstant (module, "LTR", (long) FRIBIDI_TYPE_LTR);
diff --git a/pkgs/development/python-modules/pyftpdlib/default.nix b/pkgs/development/python-modules/pyftpdlib/default.nix
index 9fc654292ab..e7c5b922dc0 100644
--- a/pkgs/development/python-modules/pyftpdlib/default.nix
+++ b/pkgs/development/python-modules/pyftpdlib/default.nix
@@ -8,12 +8,12 @@
}:
buildPythonPackage rec {
- version = "1.5.5";
+ version = "1.5.6";
pname = "pyftpdlib";
src = fetchPypi {
inherit pname version;
- sha256 = "1adf1c03d1508749e7c2f26dc9850ec0ef834318d725b7ae5ac91698f5c86752";
+ sha256 = "0pnv2byzmzg84q5nmmhn1xafvfil85qa5y52bj455br93zc5b9px";
};
checkInputs = [ mock psutil ];
diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix
index bef4969d7d2..7451b1102ed 100644
--- a/pkgs/development/python-modules/pyodbc/default.nix
+++ b/pkgs/development/python-modules/pyodbc/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "pyodbc";
- version = "4.0.28";
+ version = "4.0.30";
disabled = isPyPy; # use pypypdbc instead
src = fetchPypi {
inherit pname version;
- sha256 = "510643354c4c687ed96bf7e7cec4d02d6c626ecf3e18696f5a0228dd6d11b769";
+ sha256 = "0skjpraar6hcwsy82612bpj8nw016ncyvvq88j5syrikxgp5saw5";
};
buildInputs = [ unixODBC ];
diff --git a/pkgs/development/python-modules/pyopengl/default.nix b/pkgs/development/python-modules/pyopengl/default.nix
index a425fcf5be9..ed643eb2198 100644
--- a/pkgs/development/python-modules/pyopengl/default.nix
+++ b/pkgs/development/python-modules/pyopengl/default.nix
@@ -19,6 +19,8 @@ buildPythonPackage rec {
patchPhase = let
ext = stdenv.hostPlatform.extensions.sharedLibrary; in ''
+ # Theses lines are patching the name of dynamic libraries
+ # so pyopengl can find them at runtime.
substituteInPlace OpenGL/platform/glx.py \
--replace "'GL'" "'${pkgs.libGL}/lib/libGL${ext}'" \
--replace "'GLU'" "'${pkgs.libGLU}/lib/libGLU${ext}'" \
@@ -26,6 +28,16 @@ buildPythonPackage rec {
substituteInPlace OpenGL/platform/darwin.py \
--replace "'OpenGL'" "'${pkgs.libGL}/lib/libGL${ext}'" \
--replace "'GLUT'" "'${pkgs.freeglut}/lib/libglut${ext}'"
+
+ # https://github.com/NixOS/nixpkgs/issues/76822
+ # pyopengl introduced a new "robust" way of loading libraries in 3.1.4.
+ # The later patch of the filepath does not work anymore because
+ # pyopengl takes the "name" (for us: the path) and tries to add a
+ # few suffix during its loading phase.
+ # The following patch put back the "name" (i.e. the path) in the
+ # list of possible files.
+ substituteInPlace OpenGL/platform/ctypesloader.py \
+ --replace "filenames_to_try = []" "filenames_to_try = [name]"
'';
# Need to fix test runner
diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix
index 3563edce792..e13472dafb4 100644
--- a/pkgs/development/python-modules/pyroute2/default.nix
+++ b/pkgs/development/python-modules/pyroute2/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pyroute2";
- version = "0.5.7";
+ version = "0.5.9";
src = fetchPypi {
inherit pname version;
- sha256 = "963fce07da2841456d39e3b932b071f6de28d23dadfae014022d67a752916f98";
+ sha256 = "1dymaa3rif05k42sh4c3g2m057v2dsc2f3f49hl2rw5yz8bd23i4";
};
# requires root priviledges
diff --git a/pkgs/development/python-modules/pysam/default.nix b/pkgs/development/python-modules/pysam/default.nix
index 46dd54c62e2..38b55c4563d 100644
--- a/pkgs/development/python-modules/pysam/default.nix
+++ b/pkgs/development/python-modules/pysam/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "pysam";
- version = "0.15.3";
+ version = "0.15.4";
# Fetching from GitHub instead of PyPi cause the 0.13 src release on PyPi is
# missing some files which cause test failures.
@@ -23,26 +23,35 @@ buildPythonPackage rec {
owner = "pysam-developers";
repo = "pysam";
rev = "v${version}";
- sha256 = "0g6md20gsr24pdr9b8nj403w31ixfjv8bjhdvg3x476kjiq1kvyb";
+ sha256 = "04w6h6mv6lsr74hj9gy4r2laifcbhgl2bjcr4r1l9r73xdd45mdy";
};
+ nativeBuildInputs = [ samtools ];
buildInputs = [ bzip2 curl cython lzma zlib ];
- checkInputs = [ pytest bcftools htslib samtools ];
-
+ checkInputs = [ pytest bcftools htslib ];
checkPhase = "py.test";
- preInstall = ''
+ # tests require samtools<=1.9
+ doCheck = false;
+ preCheck = ''
export HOME=$(mktemp -d)
make -C tests/pysam_data
make -C tests/cbcf_data
'';
- meta = {
- homepage = https://pysam.readthedocs.io/;
+ pythonImportsCheck = [
+ "pysam"
+ "pysam.bcftools"
+ "pysam.libcutils"
+ "pysam.libcvcf"
+ ];
+
+ meta = with lib; {
description = "A python module for reading, manipulating and writing genome data sets";
- maintainers = with lib.maintainers; [ unode ];
- license = lib.licenses.mit;
+ homepage = "https://pysam.readthedocs.io/";
+ maintainers = with maintainers; [ unode ];
+ license = licenses.mit;
platforms = [ "i686-linux" "x86_64-linux" ];
};
}
diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix
index b4552b264d5..593911c064e 100644
--- a/pkgs/development/python-modules/pysaml2/default.nix
+++ b/pkgs/development/python-modules/pysaml2/default.nix
@@ -36,6 +36,11 @@ buildPythonPackage rec {
})
];
+ postPatch = ''
+ # fix failing tests on systems with 32bit time_t
+ sed -i 's/2999\(-.*T\)/2029\1/g' tests/*.xml
+ '';
+
propagatedBuildInputs = [ cryptography defusedxml future pyopenssl dateutil pytz requests six ];
checkInputs = [ mock pyasn1 pymongo pytest responses ];
diff --git a/pkgs/development/python-modules/pyscrypt/default.nix b/pkgs/development/python-modules/pyscrypt/default.nix
new file mode 100644
index 00000000000..372f6db0832
--- /dev/null
+++ b/pkgs/development/python-modules/pyscrypt/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchPypi, python }:
+
+buildPythonPackage rec {
+ pname = "pyscrypt";
+ version = "1.6.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1sd5pd5fpcdnpp4h58kdnvkf0s3afh4ssfqky2ap6z0gy6ax3zds";
+ };
+
+ checkPhase = ''
+ ${python.interpreter} tests/run-tests-hash.py
+ '';
+
+ meta = with lib; {
+ homepage = "https://github.com/ricmoo/pyscrypt/";
+ description = "Pure-Python implementation of Scrypt PBKDF and scrypt file format library";
+ license = licenses.mit;
+ maintainers = with maintainers; [ valodim ];
+ };
+}
diff --git a/pkgs/development/python-modules/pytest-flask/default.nix b/pkgs/development/python-modules/pytest-flask/default.nix
index b58b934dadc..0ad85844440 100644
--- a/pkgs/development/python-modules/pytest-flask/default.nix
+++ b/pkgs/development/python-modules/pytest-flask/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pytest-flask";
- version = "0.15.0";
+ version = "0.15.1";
src = fetchPypi {
inherit pname version;
- sha256 = "0jdzrib94vwfpl8524h34aqzqndh3h4xn706v32xh412c8dphx6q";
+ sha256 = "1ri3p3hibb1r2wcblpvs64s4jz40ci4jki4s2nf3xf7iz2wwbn6b";
};
doCheck = false;
diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix
index 3997e716817..3849fffd47c 100644
--- a/pkgs/development/python-modules/pytest-timeout/default.nix
+++ b/pkgs/development/python-modules/pytest-timeout/default.nix
@@ -21,7 +21,10 @@ buildPythonPackage rec {
};
checkInputs = [ pytest pexpect ];
- checkPhase = ''pytest -ra'';
+ checkPhase = ''
+ # test_suppresses_timeout_when_pdb_is_entered fails under heavy load
+ pytest -ra -k 'not test_suppresses_timeout_when_pdb_is_entered'
+ '';
meta = with lib;{
description = "py.test plugin to abort hanging tests";
diff --git a/pkgs/development/python-modules/pywinrm/default.nix b/pkgs/development/python-modules/pywinrm/default.nix
index 9ed44c83b60..798364afd0d 100644
--- a/pkgs/development/python-modules/pywinrm/default.nix
+++ b/pkgs/development/python-modules/pywinrm/default.nix
@@ -1,6 +1,8 @@
{ lib
, buildPythonPackage
, fetchPypi
+, isPy38
+, kerberos
, mock
, pytest
, requests
@@ -12,6 +14,7 @@
buildPythonPackage rec {
pname = "pywinrm";
version = "0.4.1";
+ disabled = isPy38;
src = fetchPypi {
inherit pname version;
@@ -19,13 +22,16 @@ buildPythonPackage rec {
};
checkInputs = [ mock pytest ];
- propagatedBuildInputs = [ requests requests_ntlm six xmltodict ];
+ propagatedBuildInputs = [ requests requests_ntlm six kerberos xmltodict ];
meta = with lib; {
description = "Python library for Windows Remote Management";
- homepage = https://github.com/diyan/pywinrm/;
+ homepage = "https://github.com/diyan/pywinrm";
license = licenses.mit;
- maintainers = with maintainers; [ elasticdog ];
+ maintainers = with maintainers; [
+ elasticdog
+ kamadorueda
+ ];
platforms = platforms.all;
};
}
diff --git a/pkgs/development/python-modules/qiskit-terra/default.nix b/pkgs/development/python-modules/qiskit-terra/default.nix
new file mode 100644
index 00000000000..4a015e15d5d
--- /dev/null
+++ b/pkgs/development/python-modules/qiskit-terra/default.nix
@@ -0,0 +1,119 @@
+{ lib
+, pythonOlder
+, buildPythonPackage
+, fetchFromGitHub
+, cython
+, dill
+, jsonschema
+, numpy
+, marshmallow
+, marshmallow-polyfield
+, matplotlib
+, networkx
+, ply
+, psutil
+, scipy
+, sympy
+ # test requirements
+, ddt
+, hypothesis
+, ipywidgets
+, nbformat
+, nbconvert
+, pillow
+, pydot
+, python
+, pygraphviz
+, pylatexenc
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "qiskit-terra";
+ version = "0.12.0";
+
+ disabled = pythonOlder "3.5";
+
+ src = fetchFromGitHub {
+ owner = "Qiskit";
+ repo = pname;
+ rev = version;
+ sha256 = "1yarfziy2w8n1d7zyyxykfs68608j8md4kwfyhbyc6wy483fk9sy";
+ };
+
+ nativeBuildInputs = [ cython ];
+
+ propagatedBuildInputs = [
+ dill
+ jsonschema
+ numpy
+ marshmallow
+ marshmallow-polyfield
+ matplotlib
+ networkx
+ ply
+ psutil
+ scipy
+ sympy
+ ];
+
+
+ # *** Tests ***
+ checkInputs = [
+ ddt
+ hypothesis
+ ipywidgets
+ nbformat
+ nbconvert
+ pillow
+ pydot
+ pygraphviz
+ pylatexenc
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "qiskit"
+ "qiskit.transpiler.passes.routing.cython.stochastic_swap.swap_trial"
+ ];
+
+ dontUseSetuptoolsCheck = true; # can't find setup.py, so fails. tested by pytest
+
+ disabledTests = [
+ "test_long_name" # generated circuit images differ for some reason
+ "test_jupyter_jobs_pbars" # needs IBMQ provider package (qiskit-ibmq-provider), circular dependency
+ ];
+
+ pytestFlagsArray = [
+ "--ignore=test/randomized/test_transpiler_equivalence.py" # collection requires qiskit-aer, which would cause circular dependency
+ ];
+
+ # Moves tests to $PACKAGEDIR/test. They can't be run from /build because of finding
+ # cythonized modules and expecting to find some resource files in the test directory.
+ preCheck = ''
+ export PACKAGEDIR=$out/${python.sitePackages}
+ echo "Moving Qiskit test files to package directory"
+ cp -r $TMP/source/test $PACKAGEDIR
+ cp -r $TMP/source/examples $PACKAGEDIR
+ cp -r $TMP/source/qiskit/schemas/examples $PACKAGEDIR/qiskit/schemas/
+
+ # run pytest from Nix's $out path
+ pushd $PACKAGEDIR
+ '';
+ postCheck = ''
+ rm -rf test
+ rm -rf examples
+ popd
+ '';
+
+
+ meta = with lib; {
+ description = "Provides the foundations for Qiskit.";
+ longDescription = ''
+ Allows the user to write quantum circuits easily, and takes care of the constraints of real hardware.
+ '';
+ homepage = "https://github.com/QISKit/qiskit-terra";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ drewrisinger ];
+ };
+}
diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/pkgs/development/python-modules/qtawesome/default.nix
index 9392504ce26..8150290ca74 100644
--- a/pkgs/development/python-modules/qtawesome/default.nix
+++ b/pkgs/development/python-modules/qtawesome/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "QtAwesome";
- version = "0.6.1";
+ version = "0.7.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1w4im0hzx497binyx6a6awbyszk1bsz34prm4j72gl5kszkiq7yq";
+ sha256 = "1k9nn6z8lhaznas509h9cjy434haggz2n1mhs29bycmds716k7j8";
};
propagatedBuildInputs = [ qtpy six ];
diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix
index 18fdd682f71..2d4d24cf805 100644
--- a/pkgs/development/python-modules/reproject/default.nix
+++ b/pkgs/development/python-modules/reproject/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
+, fetchpatch
, numpy
, astropy
, astropy-healpix
@@ -24,6 +25,12 @@ buildPythonPackage rec {
nativeBuildInputs = [ astropy-helpers cython ];
+ # Fix tests
+ patches = [ (fetchpatch {
+ url = "https://github.com/astropy/reproject/pull/218/commits/4661e075137424813ed77f1ebcbc251fee1b8467.patch";
+ sha256 = "13g3h824pqn2lgypzg1b87vkd44y7m302lhw3kh4rfww1dkzhm9v";
+ }) ];
+
# Disable automatic update of the astropy-helper module
postPatch = ''
substituteInPlace setup.cfg --replace "auto_use = True" "auto_use = False"
diff --git a/pkgs/development/python-modules/scikits-odes/default.nix b/pkgs/development/python-modules/scikits-odes/default.nix
index 89ffe334e7f..ba3d5eaaff0 100644
--- a/pkgs/development/python-modules/scikits-odes/default.nix
+++ b/pkgs/development/python-modules/scikits-odes/default.nix
@@ -1,7 +1,7 @@
{ stdenv
, lib
, buildPythonPackage
-, fetchFromGitHub
+, fetchPypi
, fetchurl
, cython
, enum34
@@ -11,19 +11,16 @@
, pytest
, python
, scipy
-, sundials_3
+, sundials
}:
buildPythonPackage rec {
pname = "scikits.odes";
- version = "2.4.0-9-g93075ae";
+ version = "2.6.1";
- # we fetch github instead of Pypi, as we want #104 and #105, which don't apply cleanly on 2.4.0
- src = fetchFromGitHub {
- owner = "bmcage";
- repo = "odes";
- rev = "93075ae25c409f572f13ca7207fada5706f73c73";
- sha256 = "161rab7hy6r1a9xw1zby9xhnnmxi0zwdpzxfpjkw9651xn2k5xyw";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0kbf2n16h9s35x6pavlx6sff0pqr68i0x0609z92a4vadni32n6b";
};
nativeBuildInputs = [
@@ -33,7 +30,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
numpy
- sundials_3
+ sundials
scipy
] ++ lib.optionals (!isPy3k) [ enum34 ];
diff --git a/pkgs/development/python-modules/scs/default.nix b/pkgs/development/python-modules/scs/default.nix
new file mode 100644
index 00000000000..4e500d68535
--- /dev/null
+++ b/pkgs/development/python-modules/scs/default.nix
@@ -0,0 +1,56 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, blas
+, liblapack
+, numpy
+, scipy
+, scs
+ # check inputs
+, nose
+}:
+
+buildPythonPackage rec {
+ inherit (scs) pname version;
+
+ src = fetchFromGitHub {
+ owner = "bodono";
+ repo = "scs-python";
+ rev = "f02abdc0e2e0a5851464e30f6766ccdbb19d73f0"; # need to choose commit manually, untagged
+ sha256 = "174b5s7cwgrn1m55jlrszdl403zhpzc4yl9acs6kjv9slmg1mmjr";
+ };
+
+ preConfigure = ''
+ rm -r scs
+ ln -s ${scs.src} scs
+ '';
+
+ buildInputs = [
+ liblapack
+ blas
+ ];
+
+ propagatedBuildInputs = [
+ numpy
+ scipy
+ ];
+
+ checkInputs = [ nose ];
+ checkPhase = ''
+ nosetests
+ '';
+ pythonImportsCheck = [ "scs" ];
+
+ meta = with lib; {
+ description = "Python interface for SCS: Splitting Conic Solver";
+ longDescription = ''
+ Solves convex cone programs via operator splitting.
+ Can solve: linear programs (LPs), second-order cone programs (SOCPs), semidefinite programs (SDPs),
+ exponential cone programs (ECPs), and power cone programs (PCPs), or problems with any combination of those cones.
+ '';
+ homepage = "https://github.com/cvxgrp/scs"; # upstream C package
+ downloadPage = "https://github.com/bodono/scs-python";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ drewrisinger ];
+ };
+}
diff --git a/pkgs/development/python-modules/seaborn/0.9.1.nix b/pkgs/development/python-modules/seaborn/0.9.1.nix
new file mode 100644
index 00000000000..552262bb514
--- /dev/null
+++ b/pkgs/development/python-modules/seaborn/0.9.1.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, pandas
+, matplotlib
+}:
+
+buildPythonPackage rec {
+ pname = "seaborn";
+ version = "0.9.1";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "da33aa8c20a9a342ce73831d02831a10413f54a05471c7f31edf34f225d456ae";
+ };
+
+ checkInputs = [ nose ];
+ propagatedBuildInputs = [ pandas matplotlib ];
+
+ checkPhase = ''
+ nosetests -v
+ '';
+
+ # Computationally very demanding tests
+ doCheck = false;
+
+ meta = {
+ description = "Statisitical data visualization";
+ homepage = "http://stanford.edu/~mwaskom/software/seaborn/";
+ license = with lib.licenses; [ bsd3 ];
+ maintainers = [ ];
+ };
+}
diff --git a/pkgs/development/python-modules/swagger-spec-validator/default.nix b/pkgs/development/python-modules/swagger-spec-validator/default.nix
index 3c83aa643f5..bdb78096aef 100644
--- a/pkgs/development/python-modules/swagger-spec-validator/default.nix
+++ b/pkgs/development/python-modules/swagger-spec-validator/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "swagger-spec-validator";
- version = "2.4.3";
+ version = "2.5.0";
src = fetchFromGitHub {
owner = "Yelp";
repo = "swagger_spec_validator";
rev = "v" + version;
- sha256 = "02f8amc6iq2clxxmrz8hirbb57sizaxijp0higqy16shk63ibalw";
+ sha256 = "0qlkiyncdh7cdyjvnwjpv9i7y75ghwnpyqkkpfaa8hg698na13pw";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix
index 4cf2200eda7..a4933f1b206 100644
--- a/pkgs/development/python-modules/tablib/default.nix
+++ b/pkgs/development/python-modules/tablib/default.nix
@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "tablib";
- version = "1.0.0";
+ version = "1.1.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "0ddvcgycv5m7q4rn5bch9qnhxjgn7192z537b1wzpmwd5s074cgz";
+ sha256 = "19wvx40lgm1d1zqscznwjklchczcmv07cqfigalmpj7i7ym0j6ad";
};
propagatedBuildInputs = [ xlwt openpyxl pyyaml xlrd odfpy ];
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 06fb1bb8157..d340f3c4636 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -721,6 +721,15 @@ let
preConfigure = "patchShebangs configure";
});
+ ggbio = old.ggbio.overrideDerivation (attrs: {
+ patches = [
+ (pkgs.fetchpatch {
+ url = "https://github.com/tengfei/ggbio/commit/b04a9840cf5c0bd0514db2536f2e610bbd364727.patch";
+ sha256 = "blwtObyIYo1UBWz4nlmcJ8Nyw/n0qwmJrtwFWuoUyMg=";
+ })
+ ];
+ });
+
RcppArmadillo = old.RcppArmadillo.overrideDerivation (attrs: {
patchPhase = "patchShebangs configure";
});
diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 1efbaa2c0ff..4772a0e2308 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flow";
- version = "0.118.0";
+ version = "0.119.0";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "refs/tags/v${version}";
- sha256 = "103dgj61qhbqzfgqjbcww2bfipk894glj9xjg1r2zwfsgpxy6x26";
+ sha256 = "0myvhdanhwljqa3irmkkdchd81416xnh9w0mgdajyh4az4safc1k";
};
installPhase = ''
diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index a1140dbab81..49c749b2123 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -110,17 +110,17 @@ in {
#
# DO NOT EDIT! Automatically generated by ./update.py
radare2 = generic {
- version_commit = "23710";
- gittap = "4.2.0";
- gittip = "57a60ba8c5e782ca0807e3c7b1d26a8b3923073d";
- rev = "4.2.0";
- version = "4.2.0";
- sha256 = "1xkvc9msbcvwgcasx9q10098ciw1zpnwgrciw397rq9ayrrvpngz";
+ version_commit = "23781";
+ gittap = "4.2.1";
+ gittip = "08478fdd29d8ce2a6c61fbd7b207bffc10682938";
+ rev = "4.2.1";
+ version = "4.2.1";
+ sha256 = "14b9433cgc2nabhz836zfgvgh2dwailcmvy05krsa0inmzbvx9fg";
cs_ver = "4.0.1";
cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6";
};
r2-for-cutter = generic {
- version_commit = "23710";
+ version_commit = "23781";
gittap = "4.2.1";
gittip = "08478fdd29d8ce2a6c61fbd7b207bffc10682938";
rev = "08478fdd29d8ce2a6c61fbd7b207bffc10682938";
diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix
index 05237d0080c..c98eba0abe6 100644
--- a/pkgs/development/tools/analysis/tflint/default.nix
+++ b/pkgs/development/tools/analysis/tflint/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tflint";
- version = "0.14.0";
+ version = "0.15.0";
src = fetchFromGitHub {
owner = "terraform-linters";
repo = pname;
rev = "v${version}";
- sha256 = "0awb8mjdqdwg4g6lpl6g4vavkhy1hby6gsv6mqsycm1a6z1n7q4k";
+ sha256 = "0j1bx2180z6znfrg8k4sjwvm3cbvnklqjxdssbr2yd47h8kfwk3g";
};
- modSha256 = "0ihfrlpi45q4acwfqxkk5ha8x76qk0z4ly3ipdck3a525mfdmk23";
+ modSha256 = "1qa7qfxpc43n9xyyfcd24d17g4fdcffkd57ny078ja219x13kay3";
subPackages = [ "." ];
diff --git a/pkgs/development/tools/build-managers/apache-maven/builder.sh b/pkgs/development/tools/build-managers/apache-maven/builder.sh
index 8d06352b135..2760bb95fcf 100644
--- a/pkgs/development/tools/build-managers/apache-maven/builder.sh
+++ b/pkgs/development/tools/build-managers/apache-maven/builder.sh
@@ -5,7 +5,7 @@ unpackPhase
mkdir -p $out/maven
cp -r $name/* $out/maven
-makeWrapper $out/maven/bin/mvn $out/bin/mvn --set JAVA_HOME "$jdk"
+makeWrapper $out/maven/bin/mvn $out/bin/mvn --set-default JAVA_HOME "$jdk"
# Add the maven-axis and JIRA plugin by default when using maven 1.x
if [ -e $out/maven/bin/maven ]
diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
index fc5f98a8ccb..e1d5b669982 100644
--- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
@@ -1,25 +1,29 @@
-{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "bazel-buildtools";
- version = "0.29.0";
- rev = "5bcc31df55ec1de770cb52887f2e989e7068301f";
+ version = "1.0.0";
goPackagePath = "github.com/bazelbuild/buildtools";
- src = fetchgit {
- inherit rev;
- url = "https://github.com/bazelbuild/buildtools";
- sha256 = "0p2kgyawh3l46h7dzglqh9c7i16zr5mhmqlhy7qvr4skwif1l089";
+ src = fetchFromGitHub {
+ owner = "bazelbuild";
+ repo = "buildtools";
+ rev = version;
+ sha256 = "1rgz1bpg2db6z4q04z061h5b9qjk8padi71xyjcwqfchwqpl7hiv";
};
goDeps = ./deps.nix;
+ excludedPackages = [ "generatetables" ];
+
+ buildFlagsArray = [ "-ldflags=-s -w -X main.buildVersion=${version} -X main.buildScmRevision=${src.rev}" ];
+
meta = with stdenv.lib; {
description = "Tools for working with Google's bazel buildtool. Includes buildifier, buildozer, and unused_deps.";
homepage = https://github.com/bazelbuild/buildtools;
license = licenses.asl20;
- maintainers = with maintainers; [ elasticdog uri-canva ];
+ maintainers = with maintainers; [ elasticdog uri-canva marsam ];
platforms = platforms.all;
};
}
diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix b/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix
index 4aaa37aa9a7..38be0dedc37 100644
--- a/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix
+++ b/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix
@@ -1,12 +1,11 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
[
{
goPackagePath = "github.com/golang/protobuf";
fetch = {
type = "git";
url = "https://github.com/golang/protobuf";
- rev = "4c88cc3f1a34ffade77b79abc53335d1e511f25b";
- sha256 = "0chbdc4q55z7myiwnbvhryc5ihf6cxh8p4w3c1imy2gyzjn9sf4r";
+ rev = "d23c5127dc24889085f8ccea5c9d560a57a879d8";
+ sha256 = "1cyyr52yhj3fzrily3rmsbqyj8va4ld75lmry0857m39rgpv8sy1";
};
}
{
@@ -14,8 +13,8 @@
fetch = {
type = "git";
url = "https://github.com/google/starlark-go";
- rev = "988906f77f657477aa7ebf4d8fb5f12d6c50b767";
- sha256 = "0ivmbcq3avaxj8ixbc60h706d6wk9wi2mnsid6a483ia4yn7w9k8";
+ rev = "6677ee5c7211380ec7e6a1b50dc45287e40ca9e1";
+ sha256 = "1dl8q1lwvmm38w2lzfwray2djdcq40z89yy6vzy387w0xrax0jj0";
};
}
]
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index da69000a5e4..884f0253f1a 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -326,6 +326,14 @@ stdenv.mkDerivation rec {
postPatch = let
darwinPatches = ''
+ bazelLinkFlags () {
+ eval set -- "$NIX_LDFLAGS"
+ local flag
+ for flag in "$@"; do
+ printf ' -Wl,%s' "$flag"
+ done
+ }
+
# Disable Bazel's Xcode toolchain detection which would configure compilers
# and linkers from Xcode instead of from PATH
export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
@@ -335,14 +343,14 @@ stdenv.mkDerivation rec {
# Framework search paths aren't added by bintools hook
# https://github.com/NixOS/nixpkgs/pull/41914
- export NIX_LDFLAGS="$NIX_LDFLAGS -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks"
+ export NIX_LDFLAGS+=" -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks"
# libcxx includes aren't added by libcxx hook
# https://github.com/NixOS/nixpkgs/pull/41589
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1"
# don't use system installed Xcode to run clang, use Nix clang instead
- sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation;g" \
+ sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \
scripts/bootstrap/compile.sh \
src/tools/xcode/realpath/BUILD \
src/tools/xcode/stdredirect/BUILD \
diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix
index ac438080b9a..88ebc5ebfae 100644
--- a/pkgs/development/tools/build-managers/cmake/2.8.nix
+++ b/pkgs/development/tools/build-managers/cmake/2.8.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
--replace '"-framework CoreServices"' '""'
'';
- buildInputs = [ curl expat zlib bzip2 ]
+ buildInputs = [ setupHook curl expat zlib bzip2 ]
++ optional useNcurses ncurses
++ optional useQt4 qt4;
@@ -67,7 +67,6 @@ stdenv.mkDerivation rec {
dontUseCmakeConfigure = true;
preConfigure = with stdenv; ''
- source $setupHook
fixCmakeFiles .
substituteInPlace Modules/Platform/UnixPaths.cmake \
--subst-var-by libc_bin ${getBin cc.libc} \
@@ -82,7 +81,7 @@ stdenv.mkDerivation rec {
homepage = https://cmake.org;
description = "Cross-Platform Makefile Generator";
platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.unix;
- maintainers = with stdenv.lib.maintainers; [ ];
+ maintainers = with stdenv.lib.maintainers; [ xfix ];
license = stdenv.lib.licenses.bsd3;
};
}
diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix
index ab9ba1758d0..84444261132 100644
--- a/pkgs/development/tools/build-managers/mill/default.nix
+++ b/pkgs/development/tools/build-managers/mill/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mill";
- version = "0.6.0";
+ version = "0.6.1";
src = fetchurl {
url = "https://github.com/lihaoyi/mill/releases/download/${version}/${version}";
- sha256 = "0pdyv3bk2d50gqqd9h4a2i4yym4k01p7qkwhzz2mxa18f64777s9";
+ sha256 = "1blar5dxhmxlwxhmq8wv0xvhy200qks6xj12n54qx9d5qp300ncw";
};
nativeBuildInputs = [ makeWrapper ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = https://www.lihaoyi.com/mill;
+ homepage = "https://www.lihaoyi.com/mill";
license = licenses.mit;
description = "A build tool for Scala, Java and more";
longDescription = ''
diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index 91ef9d4a222..01c6ec0df29 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
{ lib, buildGoPackage, fetchFromGitLab, fetchurl }:
let
- version = "12.7.0";
+ version = "12.8.0";
# Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
docker_x86_64 = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz";
- sha256 = "0vaaaw6hxmr55kgcn86rim9in96zmyv0zhl7asr4b7qknabsjp4m";
+ sha256 = "02k9nzfqlsd78dan522qynbz2i2ggvf960968vmg0wdg6rjv19z2";
};
docker_arm = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
- sha256 = "031fv7f15wiqq7209n2ab7n3qzjf7cjzvbp4pkz24bkc3lr3y773";
+ sha256 = "098g6948w8skbz9z5212ndsxvf3k12aijy0v2a7c86r0zhlga52x";
};
in
buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
owner = "gitlab-org";
repo = "gitlab-runner";
rev = "v${version}";
- sha256 = "0f08syk7v7w89pcdbzwgscsxl54gnms1qd4spjppnq4h5r959jp2";
+ sha256 = "17cs7bs3dxkj6r7hip6kv7cj7g5lq9x1g3gcl2kjj8djxzkhfc4m";
};
patches = [ ./fix-shell-path.patch ];
diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix
index 316c38706d3..368a1520ca0 100644
--- a/pkgs/development/tools/gnulib/default.nix
+++ b/pkgs/development/tools/gnulib/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation {
pname = "gnulib";
- version = "20190811";
+ version = "20200223";
src = fetchgit {
url = https://git.savannah.gnu.org/r/gnulib.git;
- rev = "6430babe47ece6953cf18ef07c1d8642c8588e89";
- sha256 = "14kgykbjly03dlb25sllcfcrpk7zkypa449gr3zbqv4rhpmnzizg";
+ rev = "292fd5d6ff5ecce81ec3c648f353732a9ece83c0";
+ sha256 = "0hkg3nql8nsll0vrqk4ifda0v4kpi67xz42r8daqsql6c4rciqnw";
};
dontFixup = true;
diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/development/tools/go-tools/default.nix
index 4c80c2aff18..1fd17060bd4 100644
--- a/pkgs/development/tools/go-tools/default.nix
+++ b/pkgs/development/tools/go-tools/default.nix
@@ -5,22 +5,21 @@
buildGoModule rec {
pname = "go-tools";
- version = "2019.2.2";
+ version = "2020.1.3";
- goPackagePath = "honnef.co/go/tools";
excludedPackages = ''\(simple\|ssa\|ssa/ssautil\|lint\|staticcheck\|stylecheck\|unused\)/testdata'';
src = fetchFromGitHub {
owner = "dominikh";
repo = "go-tools";
rev = version;
- sha256 = "1vndpwg797z2gw9h9378iq99aqy7nalqx82lgvcsaqnkypdmppnd";
+ sha256 = "0pvi1mzhy6zgx4zfgdypbl4zhvgg11hl5qv7blf2qs0a96j2djhf";
};
- modSha256 = "0ysaq94m7pkziliz4z4dl8ad84mbn17m2hqxvs9wbw4iwhkpi7gz";
+ modSha256 = "03560xjr2531xj87paskfx2zs364fz6y4kpsid8x08s1syq9nq7p";
meta = with lib; {
- description = "A collection of tools and libraries for working with Go code, including linters and static analysis.";
+ description = "A collection of tools and libraries for working with Go code, including linters and static analysis";
homepage = https://staticcheck.io;
license = licenses.mit;
maintainers = with maintainers; [ rvolosatovs kalbasit ];
diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix
index b3116a9b2f9..87807355413 100644
--- a/pkgs/development/tools/kubectx/default.nix
+++ b/pkgs/development/tools/kubectx/default.nix
@@ -4,13 +4,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "kubectx";
- version = "0.7.1";
+ version = "0.8.0";
src = fetchFromGitHub {
owner = "ahmetb";
repo = pname;
rev = "v${version}";
- sha256 = "0mv40jh94by99i5wkf3p52wk4l68hvly1k5gnn7zsy9avc8fjd0p";
+ sha256 = "1wkvmic29mkzfs6619wjs3mya8ffigwv9n1w9y7zkfvpi8gxa0a6";
};
buildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix
index bf1cae3edc7..227fb27051a 100644
--- a/pkgs/development/tools/misc/act/default.nix
+++ b/pkgs/development/tools/misc/act/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "act";
- version = "0.1.3";
+ version = "0.2.4";
src = fetchFromGitHub {
owner = "nektos";
repo = pname;
rev = "v${version}";
- sha256 = "1y1bvk93dzsxwjakmgpb5qyy3lqng7cdabi64b555c1z6b42mf58";
+ sha256 = "1sn36686nfmqvhmippdapk0pxqx3x1q4dwdyhjr8j8scyfrk68iv";
};
- modSha256 = "00d0wjnr5y3bl95lma8sdwvqqs7fd0k43azawp1kb29kqnrlismg";
+ modSha256 = "0ghp61m8fxg1iwq2ypmp99cqv3n16c06v2xzg9v34299vmd89gi2";
meta = with lib; {
description = "Run your GitHub Actions locally";
diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix
index e66341b5f8c..72aecf20ca3 100644
--- a/pkgs/development/tools/misc/hydra/default.nix
+++ b/pkgs/development/tools/misc/hydra/default.nix
@@ -85,7 +85,7 @@ in stdenv.mkDerivation rec {
buildInputs =
[ makeWrapper autoconf automake libtool unzip nukeReferences sqlite libpqxx
- gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt
+ gitAndTools.top-git mercurial darcs subversion bazaar openssl bzip2 libxslt
guile # optional, for Guile + Guix support
perlDeps perl nix
postgresql # for running the tests
@@ -95,7 +95,7 @@ in stdenv.mkDerivation rec {
hydraPath = lib.makeBinPath (
[ sqlite subversion openssh nix coreutils findutils pixz
- gzip bzip2 lzma gnutar unzip git gitAndTools.topGit mercurial darcs gnused bazaar
+ gzip bzip2 lzma gnutar unzip git gitAndTools.top-git mercurial darcs gnused bazaar
] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix
index 140b7679ab2..51c22199cc1 100644
--- a/pkgs/development/tools/misc/sccache/default.nix
+++ b/pkgs/development/tools/misc/sccache/default.nix
@@ -1,16 +1,16 @@
{ stdenv, fetchFromGitHub, cargo, rustc, rustPlatform, pkgconfig, glib, openssl, darwin }:
rustPlatform.buildRustPackage rec {
- version = "0.2.12";
+ version = "0.2.13";
pname = "sccache";
src = fetchFromGitHub {
owner = "mozilla";
repo = "sccache";
rev = version;
- sha256 = "1yd3rfp032crwlmfn2p3z12f67q7bxm78fhvdlc7azm2a4hkif4k";
+ sha256 = "19z9fdkn3bnr8q33m66h2by6bs6kmhw3a2lq2n8bywmnhrjwhxpw";
};
- cargoSha256 = "17i3m7hj7kvdbicabmz2wl3g6s6c8lcyi3pririkq77jxm87shfh";
+ cargoSha256 = "1pm7il0x7i9mqx4vsmkcs8nq0dqr5ck3x3x7la6k39igaxn9vkwz";
cargoBuildFlags = [ "--features=all" ];
nativeBuildInputs = [
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
meta = with stdenv.lib; {
description = "Ccache with Cloud Storage";
- homepage = https://github.com/mozilla/sccache;
+ homepage = "https://github.com/mozilla/sccache";
maintainers = with maintainers; [ doronbehar ];
license = licenses.asl20;
platforms = platforms.unix;
diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix
index 860602cb684..45a2a312304 100644
--- a/pkgs/development/tools/ocaml/dune/2.nix
+++ b/pkgs/development/tools/ocaml/dune/2.nix
@@ -6,11 +6,11 @@ else
stdenv.mkDerivation rec {
pname = "dune";
- version = "2.3.0";
+ version = "2.3.1";
src = fetchurl {
url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
- sha256 = "1zswdp2gran8djk718q5g3ldbvw0qp34j9jj1n7m1xp870g3590l";
+ sha256 = "1jzm29z58l34kpqll9jcz5dkkhh36lncba1yb32ghknkvyfdvcxj";
};
buildInputs = [ ocaml findlib ];
diff --git a/pkgs/development/tools/parinfer-rust/default.nix b/pkgs/development/tools/parinfer-rust/default.nix
index 47e7ab25481..a313683f2ae 100644
--- a/pkgs/development/tools/parinfer-rust/default.nix
+++ b/pkgs/development/tools/parinfer-rust/default.nix
@@ -2,19 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "parinfer-rust";
- version = "0.4.2";
+ version = "0.4.3";
src = fetchFromGitHub {
owner = "eraserhd";
repo = "parinfer-rust";
rev = "v${version}";
- sha256 = "1k2kr1zlxx3w3kwb634kngzx8vl5iif1yr6zk2xh46gjwqb3223l";
+ sha256 = "0hj5in5h7pj72m4ag80ing513fh65q8xlsf341qzm3vmxm3y3jgd";
};
- # Delete this on next update; see #79975 for details
- legacyCargoFetcher = true;
-
- cargoSha256 = "0i5wy15w985nxwl4b6rzb06hchzjwph6ygzjkkmigm9diw9jcycn";
+ cargoSha256 = "16ylk125p368mcz8nandmfqlygrqjlf8mqaxlbpixqga378saidl";
buildInputs = [ llvmPackages.libclang llvmPackages.clang ];
LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
index 0d1c243d097..ac866a139d9 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
@@ -25,19 +25,21 @@ let
# Get license by id falling back to input string
getLicenseBySpdxId = spdxId: spdxLicenses.${spdxId} or spdxId;
- #
- # Returns an attrset { python, poetryPackages } for the given lockfile
- #
- mkPoetryPython =
- { poetrylock
+ /*
+ Returns an attrset { python, poetryPackages, pyProject, poetryLock } for the given pyproject/lockfile.
+ */
+ mkPoetryPackages =
+ { pyproject
+ , poetrylock
, poetryPkg
, overrides ? [ defaultPoetryOverrides ]
, meta ? {}
, python ? pkgs.python3
, pwd ? null
}@attrs: let
- lockData = readTOML poetrylock;
- lockFiles = lib.getAttrFromPath [ "metadata" "files" ] lockData;
+ pyProject = readTOML pyproject;
+ poetryLock = readTOML poetrylock;
+ lockFiles = lib.getAttrFromPath [ "metadata" "files" ] poetryLock;
specialAttrs = [
"overrides"
@@ -48,11 +50,18 @@ let
evalPep508 = mkEvalPep508 python;
- # Filter packages by their PEP508 markers
+ # Filter packages by their PEP508 markers & pyproject interpreter version
partitions = let
- supportsPythonVersion = pkgMeta: if pkgMeta ? marker then (evalPep508 pkgMeta.marker) else true;
+ supportsPythonVersion = pkgMeta: let
+ pep508Result = if pkgMeta ? marker then (evalPep508 pkgMeta.marker) else true;
+
+ flatDeps = (pyProject.tool.poetry.dependencies or {}) // (pyProject.tool.poetry.dev-dependencies or {});
+ constraints = flatDeps.${pkgMeta.name}.python or "";
+ pyprojectResult = isCompatible python.pythonVersion constraints;
+ in
+ pyprojectResult && pep508Result;
in
- lib.partition supportsPythonVersion lockData.package;
+ lib.partition supportsPythonVersion poetryLock.package;
compatible = partitions.right;
incompatible = partitions.wrong;
@@ -82,18 +91,22 @@ let
);
in
lockPkgs;
-
overlays = builtins.map getFunctorFn (
[
(
- self: super: {
- mkPoetryDep = self.callPackage ./mk-poetry-dep.nix {
- inherit pkgs lib python poetryLib;
- };
- poetry = poetryPkg;
- # The canonical name is setuptools-scm
- setuptools-scm = super.setuptools_scm;
- }
+ self: super: let
+ hooks = self.callPackage ./hooks {};
+ in
+ {
+ mkPoetryDep = self.callPackage ./mk-poetry-dep.nix {
+ inherit pkgs lib python poetryLib;
+ };
+ poetry = poetryPkg;
+ # The canonical name is setuptools-scm
+ setuptools-scm = super.setuptools_scm;
+
+ inherit (hooks) removePathDependenciesHook;
+ }
)
# Null out any filtered packages, we don't want python.pkgs from nixpkgs
(self: super: builtins.listToAttrs (builtins.map (x: { name = x.name; value = null; }) incompatible))
@@ -110,6 +123,8 @@ let
{
python = py;
poetryPackages = map (pkg: py.pkgs.${pkg.name}) compatible;
+ poetryLock = poetryLock;
+ inherit pyProject;
};
/* Returns a package with a python interpreter and all packages specified in the poetry.lock lock file.
@@ -118,7 +133,8 @@ let
poetry2nix.mkPoetryEnv { poetrylock = ./poetry.lock; python = python3; }
*/
mkPoetryEnv =
- { poetrylock
+ { pyproject
+ , poetrylock
, overrides ? [ defaultPoetryOverrides ]
, meta ? {}
, pwd ? null
@@ -126,9 +142,9 @@ let
}:
let
poetryPkg = poetry.override { inherit python; };
- py = mkPoetryPython (
+ py = mkPoetryPackages (
{
- inherit poetryPkg poetrylock overrides meta python pwd;
+ inherit poetryPkg pyproject poetrylock overrides meta python pwd;
}
);
in
@@ -147,13 +163,12 @@ let
}@attrs: let
poetryPkg = poetry.override { inherit python; };
- py = (
- mkPoetryPython {
- inherit poetryPkg poetrylock overrides meta python pwd;
- }
- ).python;
+ poetryPython = mkPoetryPackages {
+ inherit poetryPkg pyproject poetrylock overrides meta python pwd;
+ };
+ py = poetryPython.python;
- pyProject = readTOML pyproject;
+ inherit (poetryPython) pyProject;
specialAttrs = [
"overrides"
@@ -187,21 +202,13 @@ let
buildInputs = mkInput "buildInputs" buildSystemPkgs;
propagatedBuildInputs = mkInput "propagatedBuildInputs" (getDeps "dependencies") ++ ([ py.pkgs.setuptools ]);
- nativeBuildInputs = mkInput "nativeBuildInputs" [ pkgs.yj ];
+ nativeBuildInputs = mkInput "nativeBuildInputs" [ pkgs.yj py.pkgs.removePathDependenciesHook ];
checkInputs = mkInput "checkInputs" (getDeps "dev-dependencies");
passthru = {
python = py;
};
- postPatch = (passedAttrs.postPatch or "") + ''
- # Tell poetry not to resolve the path dependencies. Any version is
- # fine !
- yj -tj < pyproject.toml | ${python.interpreter} ${./pyproject-without-path.py} > pyproject.json
- yj -jt < pyproject.json > pyproject.toml
- rm pyproject.json
- '';
-
meta = meta // {
inherit (pyProject.tool.poetry) description homepage;
license = getLicenseBySpdxId (pyProject.tool.poetry.license or "unknown");
@@ -240,7 +247,7 @@ let
in
{
- inherit mkPoetryEnv mkPoetryApplication cli doc;
+ inherit mkPoetryEnv mkPoetryApplication mkPoetryPackages cli doc;
/*
The default list of poetry2nix override overlays
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix
new file mode 100644
index 00000000000..dd24b2634e0
--- /dev/null
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix
@@ -0,0 +1,25 @@
+{ python
+, callPackage
+, makeSetupHook
+, yj
+}:
+
+let
+ pythonInterpreter = python.pythonForBuild.interpreter;
+in
+{
+
+ removePathDependenciesHook = callPackage (
+ {}:
+ makeSetupHook {
+ name = "remove-path-dependencies.sh";
+ deps = [];
+ substitutions = {
+ inherit pythonInterpreter;
+ yj = "${yj}/bin/yj";
+ pyprojectPatchScript = "${./pyproject-without-path.py}";
+ };
+ } ./remove-path-dependencies.sh
+ ) {};
+
+}
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pyproject-without-path.py b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-path.py
similarity index 100%
rename from pkgs/development/tools/poetry2nix/poetry2nix/pyproject-without-path.py
rename to pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-path.py
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-path-dependencies.sh b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-path-dependencies.sh
new file mode 100644
index 00000000000..900fe66908b
--- /dev/null
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-path-dependencies.sh
@@ -0,0 +1,8 @@
+remove-path-dependencies-hook() {
+ # Tell poetry not to resolve the path dependencies. Any version is fine!
+ @yj@ -tj < pyproject.toml | @pythonInterpreter@ @pyprojectPatchScript@ > pyproject.json
+ @yj@ -jt < pyproject.json > pyproject.toml
+ rm pyproject.json
+}
+
+postPatchHooks+=(remove-path-dependencies-hook)
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix
index d49e6ce36db..64ba0293132 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix
@@ -8,27 +8,30 @@ let
genList (i: if i == idx then value else (builtins.elemAt list i)) (length list)
);
- # Returns true if pythonVersion matches with the expression in pythonVersions
- isCompatible = pythonVersion: pythonVersions:
- let
- operators = {
- "||" = cond1: cond2: cond1 || cond2;
- "," = cond1: cond2: cond1 && cond2; # , means &&
- };
- # split string at "," and "||"
- tokens = builtins.filter (x: x != "") (builtins.split "(,|\\|\\|)" pythonVersions);
- combine = acc: v:
- let
- isOperator = builtins.typeOf v == "list";
- operator = if isOperator then (builtins.elemAt v 0) else acc.operator;
- in
- if isOperator then (acc // { inherit operator; }) else {
- inherit operator;
- state = operators."${operator}" acc.state (satisfiesSemver pythonVersion v);
- };
- initial = { operator = ","; state = true; };
- in
- (builtins.foldl' combine initial tokens).state;
+ # Compare a semver expression with a version
+ isCompatible = version: let
+ operators = {
+ "||" = cond1: cond2: cond1 || cond2;
+ "," = cond1: cond2: cond1 && cond2; # , means &&
+ "&&" = cond1: cond2: cond1 && cond2;
+ };
+ splitRe = "(" + (builtins.concatStringsSep "|" (builtins.map (x: lib.replaceStrings [ "|" ] [ "\\|" ] x) (lib.attrNames operators))) + ")";
+ in
+ expr:
+ let
+ tokens = builtins.filter (x: x != "") (builtins.split splitRe expr);
+ combine = acc: v:
+ let
+ isOperator = builtins.typeOf v == "list";
+ operator = if isOperator then (builtins.elemAt v 0) else acc.operator;
+ in
+ if isOperator then (acc // { inherit operator; }) else {
+ inherit operator;
+ state = operators."${operator}" acc.state (satisfiesSemver version v);
+ };
+ initial = { operator = "&&"; state = true; };
+ in
+ if expr == "" then true else (builtins.foldl' combine initial tokens).state;
fromTOML = builtins.fromTOML or
(
@@ -65,7 +68,7 @@ let
else { pkg = []; str = null; };
# Fetch the artifacts from the PyPI index. Since we get all
- # info we need from the lock file we don't use nixpkgs' fetchPypi
+ # info we need from the lock file we don't use nixpkgs' fetchPyPi
# as it modifies casing while not providing anything we don't already
# have.
#
@@ -101,5 +104,6 @@ in
isCompatible
readTOML
getBuildSystemPkgs
+ satisfiesSemver
;
}
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix
index cbfa3dafa75..5113ad25e4b 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix
@@ -83,7 +83,13 @@ pythonPackages.callPackage (
else (builtins.elemAt (lib.strings.splitString "-" name) 2);
};
- baseBuildInputs = lib.optional (name != "setuptools_scm" && name != "setuptools-scm") pythonPackages.setuptools-scm;
+ # Prevent infinite recursion
+ skipSetupToolsSCM = [
+ "setuptools_scm"
+ "setuptools-scm"
+ "toml" # Toml is an extra for setuptools-scm
+ ];
+ baseBuildInputs = lib.optional (! lib.elem name skipSetupToolsSCM) pythonPackages.setuptools-scm;
format = if isLocal then "pyproject" else if isGit then "setuptools" else fileInfo.format;
@@ -100,7 +106,11 @@ pythonPackages.callPackage (
# Stripping pre-built wheels lead to `ELF load command address/offset not properly aligned`
dontStrip = format == "wheel";
- nativeBuildInputs = if (!isSource && (getManyLinuxDeps fileInfo.name).str != null) then [ autoPatchelfHook ] else [];
+ nativeBuildInputs = (if (!isSource && (getManyLinuxDeps fileInfo.name).str != null) then [ autoPatchelfHook ] else [])
+ ++ lib.optional (isLocal) pkgs.yj
+ ++ lib.optional (format == "pyproject") pythonPackages.removePathDependenciesHook
+ ;
+
buildInputs = (
baseBuildInputs
++ lib.optional (!isSource) (getManyLinuxDeps fileInfo.name).pkg
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
index 86260c03703..6316dcf51c0 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
@@ -103,7 +103,7 @@ self: super:
);
# importlib-metadata has an incomplete dependency specification
- importlib-metadata = super.importlib-metadata.overrideAttrs (
+ importlib-metadata = if super.importlib-metadata == null then null else super.importlib-metadata.overrideAttrs (
old: {
propagatedBuildInputs = old.propagatedBuildInputs ++ lib.optional self.python.isPy2 self.pathlib2;
}
diff --git a/pkgs/development/tools/poetry2nix/update b/pkgs/development/tools/poetry2nix/update
index a5d367590be..4840c23c3b8 100755
--- a/pkgs/development/tools/poetry2nix/update
+++ b/pkgs/development/tools/poetry2nix/update
@@ -15,7 +15,7 @@ mv poetry2nix-master/* .
mkdir build
cp *.nix *.json *.py build/
-cp -r bin build/
+cp -r hooks bin build/
rm build/shell.nix build/generate.py build/overlay.nix build/flake.nix
cat > build/README.md << EOF
diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix
index 5c0fc6f28ed..0c2b94807c0 100644
--- a/pkgs/development/tools/scalafmt/default.nix
+++ b/pkgs/development/tools/scalafmt/default.nix
@@ -2,7 +2,7 @@
let
baseName = "scalafmt";
- version = "2.3.2";
+ version = "2.4.2";
deps = stdenv.mkDerivation {
name = "${baseName}-deps-${version}";
buildCommand = ''
@@ -13,7 +13,7 @@ let
'';
outputHashMode = "recursive";
outputHashAlgo = "sha256";
- outputHash = "0q42qa6k4wqnfj710lcarkg8hv7wpvfhvjh9ygil1ah8936xmj72";
+ outputHash = "0axinxfyycnmxg561n80s90swr6d0pgsw669gvpsk557nhmcclja";
};
in
stdenv.mkDerivation {
diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix
index 325338c376a..bab881cf4a4 100644
--- a/pkgs/development/tools/skaffold/default.nix
+++ b/pkgs/development/tools/skaffold/default.nix
@@ -1,10 +1,10 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }:
buildGoPackage rec {
pname = "skaffold";
- version = "1.3.1";
- # rev is the 1.3.1 commit, mainly for skaffold version command output
- rev = "6ba887a42438d1da578a005cf550e618fee6dfb8";
+ version = "1.4.0";
+ # rev is the ${version} commit, mainly for skaffold version command output
+ rev = "bb324609b4254ceb9f76d35eb03642a6a1807867";
goPackagePath = "github.com/GoogleContainerTools/skaffold";
subPackages = ["cmd/skaffold"];
@@ -20,13 +20,21 @@ buildGoPackage rec {
owner = "GoogleContainerTools";
repo = "skaffold";
rev = "v${version}";
- sha256 = "1ph7qyk5khdinxbhgqhhja8fz8b6q8yz5rj5xh0nwaff4bmlfd99";
+ sha256 = "0nrz2gnp722cq4p8lcfl0nlws53c2bfq17jgr2jad4vyjglgfscw";
};
- meta = {
+ nativeBuildInputs = [ installShellFiles ];
+ postInstall = ''
+ for shell in bash zsh; do
+ $bin/bin/skaffold completion $shell > skaffold.$shell
+ installShellCompletion skaffold.$shell
+ done
+ '';
+
+ meta = with lib; {
description = "Easy and Repeatable Kubernetes Development";
- homepage = https://github.com/GoogleContainerTools/skaffold;
- license = lib.licenses.asl20;
- maintainers = with lib.maintainers; [ vdemeester ];
+ homepage = "https://skaffold.dev/";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ vdemeester ];
};
}
diff --git a/pkgs/development/tools/uftrace/default.nix b/pkgs/development/tools/uftrace/default.nix
index 796d3509c1c..a364f2eed0c 100644
--- a/pkgs/development/tools/uftrace/default.nix
+++ b/pkgs/development/tools/uftrace/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "uftrace";
- version = "0.9.3";
+ version = "0.9.4";
src = fetchFromGitHub {
owner = "namhyung";
repo = "uftrace";
rev = "v${version}";
- sha256 = "0m5f4azm2gdl0li7dfq00ys07j8r2lfjkbb4rx5l7q0kj67ldr7s";
+ sha256 = "09zj4lgsbx0yp4i8ij9nh7wzylfcj421jzf1kkc2zpnn5hgynsb5";
};
postUnpack = ''
diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix
index a230b0e7ce1..eb507857ca8 100644
--- a/pkgs/development/tools/yq-go/default.nix
+++ b/pkgs/development/tools/yq-go/default.nix
@@ -1,30 +1,21 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
-# buildGoModule is not supported by the project
-# See https://github.com/mikefarah/yq/issues/227
-buildGoPackage rec {
+buildGoModule rec {
pname = "yq-go";
- version = "3.1.0";
-
- goPackagePath = "github.com/mikefarah/yq/v3";
+ version = "3.1.2";
src = fetchFromGitHub {
owner = "mikefarah";
rev = version;
repo = "yq";
- sha256 = "0hsb9m0pq2agsg7392r6h9sv5vqa2r7fl0ff1q24vpx8jlpq1vc6";
+ sha256 = "0gjxmnmphav8ms4zdkcjcsgrjs77ccwdfpc1qpxjp6fr2g4v5vmq";
};
- goDeps = ./deps.nix;
-
- postInstall = ''
- mv $bin/bin/v3 $bin/bin/yq
- '';
+ modSha256 = "035w9bh96rr2x21w7bwwpngyng6839wglpgwf7gy8p6difvnn2v9";
meta = with stdenv.lib; {
description = "Portable command-line YAML processor";
- homepage = http://mikefarah.github.io/yq/;
+ homepage = "https://mikefarah.gitbook.io/yq/";
license = [ licenses.mit ];
maintainers = [ maintainers.lewo ];
};
diff --git a/pkgs/development/tools/yq-go/deps.nix b/pkgs/development/tools/yq-go/deps.nix
deleted file mode 100644
index 2ca5e0ffd1b..00000000000
--- a/pkgs/development/tools/yq-go/deps.nix
+++ /dev/null
@@ -1,363 +0,0 @@
-# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
-[
- {
- goPackagePath = "github.com/BurntSushi/toml";
- fetch = {
- type = "git";
- url = "https://github.com/BurntSushi/toml";
- rev = "v0.3.1";
- sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
- };
- }
- {
- goPackagePath = "github.com/armon/consul-api";
- fetch = {
- type = "git";
- url = "https://github.com/armon/consul-api";
- rev = "eb2c6b5be1b6";
- sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9";
- };
- }
- {
- goPackagePath = "github.com/coreos/etcd";
- fetch = {
- type = "git";
- url = "https://github.com/coreos/etcd";
- rev = "v3.3.10";
- sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl";
- };
- }
- {
- goPackagePath = "github.com/coreos/go-etcd";
- fetch = {
- type = "git";
- url = "https://github.com/coreos/go-etcd";
- rev = "v2.0.0";
- sha256 = "1xb34hzaa1lkbq5vkzy9vcz6gqwj7hp6cdbvyack2bf28dwn33jj";
- };
- }
- {
- goPackagePath = "github.com/coreos/go-semver";
- fetch = {
- type = "git";
- url = "https://github.com/coreos/go-semver";
- rev = "v0.2.0";
- sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0";
- };
- }
- {
- goPackagePath = "github.com/cpuguy83/go-md2man";
- fetch = {
- type = "git";
- url = "https://github.com/cpuguy83/go-md2man";
- rev = "v1.0.10";
- sha256 = "1bqkf2bvy1dns9zd24k81mh2p1zxsx2nhq5cj8dz2vgkv1xkh60i";
- };
- }
- {
- goPackagePath = "github.com/davecgh/go-spew";
- fetch = {
- type = "git";
- url = "https://github.com/davecgh/go-spew";
- rev = "v1.1.1";
- sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
- };
- }
- {
- goPackagePath = "github.com/fsnotify/fsnotify";
- fetch = {
- type = "git";
- url = "https://github.com/fsnotify/fsnotify";
- rev = "v1.4.7";
- sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
- };
- }
- {
- goPackagePath = "github.com/hashicorp/hcl";
- fetch = {
- type = "git";
- url = "https://github.com/hashicorp/hcl";
- rev = "v1.0.0";
- sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66";
- };
- }
- {
- goPackagePath = "github.com/inconshreveable/mousetrap";
- fetch = {
- type = "git";
- url = "https://github.com/inconshreveable/mousetrap";
- rev = "v1.0.0";
- sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
- };
- }
- {
- goPackagePath = "github.com/kylelemons/godebug";
- fetch = {
- type = "git";
- url = "https://github.com/kylelemons/godebug";
- rev = "v1.1.0";
- sha256 = "0dkk3friykg8p6wgqryx6745ahhb9z1j740k7px9dac6v5xjp78c";
- };
- }
- {
- goPackagePath = "github.com/magiconair/properties";
- fetch = {
- type = "git";
- url = "https://github.com/magiconair/properties";
- rev = "v1.8.0";
- sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
- };
- }
- {
- goPackagePath = "github.com/mitchellh/go-homedir";
- fetch = {
- type = "git";
- url = "https://github.com/mitchellh/go-homedir";
- rev = "v1.1.0";
- sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1";
- };
- }
- {
- goPackagePath = "github.com/mitchellh/mapstructure";
- fetch = {
- type = "git";
- url = "https://github.com/mitchellh/mapstructure";
- rev = "v1.1.2";
- sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr";
- };
- }
- {
- goPackagePath = "github.com/pelletier/go-toml";
- fetch = {
- type = "git";
- url = "https://github.com/pelletier/go-toml";
- rev = "v1.2.0";
- sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy";
- };
- }
- {
- goPackagePath = "github.com/pkg/errors";
- fetch = {
- type = "git";
- url = "https://github.com/pkg/errors";
- rev = "v0.8.1";
- sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
- };
- }
- {
- goPackagePath = "github.com/pmezard/go-difflib";
- fetch = {
- type = "git";
- url = "https://github.com/pmezard/go-difflib";
- rev = "v1.0.0";
- sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
- };
- }
- {
- goPackagePath = "github.com/russross/blackfriday";
- fetch = {
- type = "git";
- url = "https://github.com/russross/blackfriday";
- rev = "v1.5.2";
- sha256 = "0jzbfzcywqcrnym4gxlz6nphmm1grg6wsl4f0r9x384rn83wkj7c";
- };
- }
- {
- goPackagePath = "github.com/spf13/afero";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/afero";
- rev = "v1.1.2";
- sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k";
- };
- }
- {
- goPackagePath = "github.com/spf13/cast";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/cast";
- rev = "v1.3.0";
- sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5";
- };
- }
- {
- goPackagePath = "github.com/spf13/cobra";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/cobra";
- rev = "v0.0.5";
- sha256 = "0z4x8js65mhwg1gf6sa865pdxfgn45c3av9xlcc1l3xjvcnx32v2";
- };
- }
- {
- goPackagePath = "github.com/spf13/jwalterweatherman";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/jwalterweatherman";
- rev = "v1.0.0";
- sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8";
- };
- }
- {
- goPackagePath = "github.com/spf13/pflag";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/pflag";
- rev = "v1.0.3";
- sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd";
- };
- }
- {
- goPackagePath = "github.com/spf13/viper";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/viper";
- rev = "v1.3.2";
- sha256 = "1829hvf805kda65l59r17wvid7y0vr390s23zfhf4w7vdb4wp3zh";
- };
- }
- {
- goPackagePath = "github.com/stretchr/testify";
- fetch = {
- type = "git";
- url = "https://github.com/stretchr/testify";
- rev = "v1.2.2";
- sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
- };
- }
- {
- goPackagePath = "github.com/ugorji/go";
- fetch = {
- type = "git";
- url = "https://github.com/ugorji/go";
- rev = "d75b2dcb6bc8";
- sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps";
- };
- }
- {
- goPackagePath = "github.com/xordataexchange/crypt";
- fetch = {
- type = "git";
- url = "https://github.com/xordataexchange/crypt";
- rev = "b2862e3d0a77";
- sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y";
- };
- }
- {
- goPackagePath = "golang.org/x/crypto";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/crypto";
- rev = "87dc89f01550";
- sha256 = "0z4i1m2yn3f31ci7wvcm2rxkx2yiv7a78mfzklncmsz2k97rlh2g";
- };
- }
- {
- goPackagePath = "golang.org/x/mod";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/mod";
- rev = "c90efee705ee";
- sha256 = "0i5md645rmcy5z5ij9ng428k9rz4g3k1kjy3blsq1264rn426gdf";
- };
- }
- {
- goPackagePath = "golang.org/x/net";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/net";
- rev = "3b0461eec859";
- sha256 = "0l00c8l0a8xnv6qdpwfzxxsr58jggacgzdrwiprrfx2xqm37b6d5";
- };
- }
- {
- goPackagePath = "golang.org/x/sync";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sync";
- rev = "112230192c58";
- sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn";
- };
- }
- {
- goPackagePath = "golang.org/x/sys";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sys";
- rev = "97732733099d";
- sha256 = "118hkp01i4z1f5h6hcjm0ff2ngqhrzj1f7731n0kw8dr6hvbx0sw";
- };
- }
- {
- goPackagePath = "golang.org/x/text";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/text";
- rev = "v0.3.0";
- sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
- };
- }
- {
- goPackagePath = "golang.org/x/tools";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/tools";
- rev = "04c2e8eff935";
- sha256 = "0xfif9h5ssf5f7f65k35zr5n6z524zv65kv68zg2qybnmb3c008d";
- };
- }
- {
- goPackagePath = "golang.org/x/xerrors";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/xerrors";
- rev = "1b5146add898";
- sha256 = "0w2akj91krxjag0xdhsg78470888nicc5ismc2ap9jqpss6v1zih";
- };
- }
- {
- goPackagePath = "gopkg.in/check.v1";
- fetch = {
- type = "git";
- url = "https://gopkg.in/check.v1";
- rev = "20d25e280405";
- sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np";
- };
- }
- {
- goPackagePath = "gopkg.in/imdario/mergo.v0";
- fetch = {
- type = "git";
- url = "https://gopkg.in/imdario/mergo.v0";
- rev = "v0.3.7";
- sha256 = "05ir0jj74w0yfi1lrhjd97v759in1dpsma64cgmbiqvyp6hfmmf8";
- };
- }
- {
- goPackagePath = "gopkg.in/op/go-logging.v1";
- fetch = {
- type = "git";
- url = "https://gopkg.in/op/go-logging.v1";
- rev = "b2cb9fa56473";
- sha256 = "01a6lkpj5p82gplddh55az194s9y3014p4j8x4zc8yv886z9c8gn";
- };
- }
- {
- goPackagePath = "gopkg.in/yaml.v2";
- fetch = {
- type = "git";
- url = "https://gopkg.in/yaml.v2";
- rev = "v2.2.2";
- sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
- };
- }
- {
- goPackagePath = "gopkg.in/yaml.v3";
- fetch = {
- type = "git";
- url = "https://gopkg.in/yaml.v3";
- rev = "4206685974f2";
- sha256 = "1ff5fd8x45cay9100ds63hxd32s7czsrric0ql6a1jrxczsgqk1g";
- };
- }
-]
diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix
index 1c5557f7624..4086566f681 100644
--- a/pkgs/development/web/grails/default.nix
+++ b/pkgs/development/web/grails/default.nix
@@ -11,11 +11,11 @@ let
in
stdenv.mkDerivation rec {
pname = "grails";
- version = "4.0.1";
+ version = "4.0.2";
src = fetchurl {
url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip";
- sha256 = "0igkzxqfm6lvp4s8w6kavdvjriq59q42jmj9ynbc669dvy6y6725";
+ sha256 = "0ry2z4xn0zmdr38k0aa9qiwvfg3q4yxd1wxdwmhzp1vd3g39cx49";
};
buildInputs = [ unzip ];
diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix
index ae4302b7429..d05fbff5e0c 100644
--- a/pkgs/development/web/insomnia/default.nix
+++ b/pkgs/development/web/insomnia/default.nix
@@ -16,12 +16,12 @@ let
];
in stdenv.mkDerivation rec {
pname = "insomnia";
- version = "7.0.6";
+ version = "7.1.0";
src = fetchurl {
url =
"https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb";
- sha256 = "125g40micavq5js5l7lpv01yl8635dwg240vldz8i2riqj65inq8";
+ sha256 = "1aqzg01dwgm1jidavwxichydxsz1c4ck8xhgvlgw24qddx5gwq1y";
};
nativeBuildInputs =
diff --git a/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix
index 527e4168083..e32943fa8be 100644
--- a/pkgs/games/freeorion/default.nix
+++ b/pkgs/games/freeorion/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, doxygen, graphviz, makeWrapper
-, boost, SDL2, python2, freetype, openal, libogg, libvorbis, zlib, libpng, libtiff
+, boost168, SDL2, python2, freetype, openal, libogg, libvorbis, zlib, libpng, libtiff
, libjpeg, libGLU, libGL, glew, libxslt
}:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
- (boost.override { enablePython = true; })
+ (boost168.override { enablePython = true; })
SDL2 python2 freetype openal libogg libvorbis zlib libpng libtiff libjpeg libGLU libGL glew ];
nativeBuildInputs = [ cmake doxygen graphviz makeWrapper ];
diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix
index 5c65203c93a..2fb67535951 100644
--- a/pkgs/games/mnemosyne/default.nix
+++ b/pkgs/games/mnemosyne/default.nix
@@ -5,11 +5,11 @@
python.pkgs.buildPythonApplication rec {
pname = "mnemosyne";
- version = "2.7";
+ version = "2.7.1";
src = fetchurl {
url = "mirror://sourceforge/project/mnemosyne-proj/mnemosyne/mnemosyne-${version}/Mnemosyne-${version}.tar.gz";
- sha256 = "0lx70vl3pa3c42lr59s459b2bqi7fm0c80lsm06l34ggfwdadq24";
+ sha256 = "0dhvg9cxc6m6kzk75h363h1g0bl80cqz11cijh0zpz9f4w6lnqsq";
};
nativeBuildInputs = with python.pkgs; [ wrapPython pyqtwebengine.wrapQtAppsHook ];
@@ -46,7 +46,7 @@ python.pkgs.buildPythonApplication rec {
'';
meta = {
- homepage = https://mnemosyne-proj.org/;
+ homepage = "https://mnemosyne-proj.org/";
description = "Spaced-repetition software";
longDescription = ''
The Mnemosyne Project has two aspects:
diff --git a/pkgs/games/qgo/default.nix b/pkgs/games/qgo/default.nix
index 610be7efdce..17441d14e7c 100644
--- a/pkgs/games/qgo/default.nix
+++ b/pkgs/games/qgo/default.nix
@@ -1,17 +1,17 @@
-{ stdenv
+{ lib
+, mkDerivation
, fetchFromGitHub
-, makeWrapper
, qmake
, qtbase
, qtmultimedia
, qttranslations
}:
-stdenv.mkDerivation {
+mkDerivation {
pname = "qgo";
version = "unstable-2017-12-18";
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "A Go client based on Qt5";
longDescription = ''
qGo is a Go Client based on Qt 5. It supports playing online at
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
postPatch = ''
sed -i 's|@out@|'"''${out}"'|g' src/src.pro src/defines.h
'';
- nativeBuildInputs = [ makeWrapper qmake ];
+ nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase qtmultimedia qttranslations ];
enableParallelBuilding = true;
diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index 8832f3bbc18..cb85426c23b 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -86,6 +86,8 @@ in buildFHSUserEnv rec {
mono
xorg.xkeyboardconfig
xorg.libpciaccess
+ udev # shadow of the tomb raider
+
## screeps dependencies
gtk3
dbus
@@ -100,6 +102,9 @@ in buildFHSUserEnv rec {
# friends options won't display "Launch Game" without it
lsof
+
+ # called by steam's setup.sh
+ file
] ++ (if (!nativeOnly) then [
(steamPackages.steam-runtime-wrapped.override {
inherit runtimeOnly;
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 25d78e3be46..3c5e76e2a4a 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -61,11 +61,11 @@ let
ale = buildVimPluginFrom2Nix {
pname = "ale";
- version = "2020-02-08";
+ version = "2020-02-22";
src = fetchFromGitHub {
owner = "w0rp";
repo = "ale";
- rev = "d6d2a0c77010db6a75a8942e2af9606971738c23";
+ rev = "8012809c3f30a767db8395c5b8e3651cdb995635";
sha256 = "1g3zws7zi18plvwd6m7wrvj83siczsnwx0yr892v1m0gh7x2452y";
};
};
@@ -160,12 +160,12 @@ let
awesome-vim-colorschemes = buildVimPluginFrom2Nix {
pname = "awesome-vim-colorschemes";
- version = "2019-11-23";
+ version = "2020-02-23";
src = fetchFromGitHub {
owner = "rafi";
repo = "awesome-vim-colorschemes";
- rev = "b5037cbf87ee4b0beed91adb33c339122e58326f";
- sha256 = "1yxjdb2cmha6vqhmsv8vy80whs201wwwx0xmyp76mz9zkcsyljak";
+ rev = "fc222a81de4734eeccd89e81d66319d4a2e8fee7";
+ sha256 = "08wk7i2p62zghvk7q22z6ac6qidpd58r1pkx5lbxg6l9zv7sb8j3";
};
};
@@ -215,12 +215,12 @@ let
bufexplorer = buildVimPluginFrom2Nix {
pname = "bufexplorer";
- version = "2020-01-10";
+ version = "2020-02-17";
src = fetchFromGitHub {
owner = "jlanzarotta";
repo = "bufexplorer";
- rev = "8014787603fff635dfae6afd4dbe9297673a0b39";
- sha256 = "0drj8q6wg9h08nf517l0dks1fbcnc558zg7dqavxc43maymq5mxm";
+ rev = "29258f58357acc10c672585a9efe8913d756734d";
+ sha256 = "00wjwk9yzfclrbd4p59b5wpl21s2vjs4ahn30xhpza93bk513wnq";
};
};
@@ -347,12 +347,12 @@ let
coc-git = buildVimPluginFrom2Nix {
pname = "coc-git";
- version = "2020-02-16";
+ version = "2020-02-19";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-git";
- rev = "f67abbe05f535086167b3cb4cde6c2c309905959";
- sha256 = "0fl3hgapcwr5sjgmm02lx6vg18qlw5g03ysv926rjb0r0nl3rhh5";
+ rev = "b0b6d913f2faaf02a79542c41cfa4db0c1d9b373";
+ sha256 = "0xg90a2h6g97m3wiakniqk60kdzi4ijgyc1p0bk1cxbj7gxvc7yg";
};
};
@@ -391,12 +391,12 @@ let
coc-imselect = buildVimPluginFrom2Nix {
pname = "coc-imselect";
- version = "2019-11-04";
+ version = "2020-02-18";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-imselect";
- rev = "19d89413b3b00db8de6ccd7db619149f542f496c";
- sha256 = "12w36mkw6b1bxpw51h04xxg703zdwrnww0wh3j32x2bx3bycdla4";
+ rev = "01442d2fb7d344122e59755f59782a0e1bf7d294";
+ sha256 = "1vqx9yna66njdw1my15ac6djr3yvnb6das96nx12mpingnw85kky";
};
};
@@ -446,12 +446,12 @@ let
coc-metals = buildVimPluginFrom2Nix {
pname = "coc-metals";
- version = "2020-02-13";
+ version = "2020-02-19";
src = fetchFromGitHub {
owner = "ckipp01";
repo = "coc-metals";
- rev = "23ec84c855cb791f3d3030fff83aa343e15607b9";
- sha256 = "1x6ain64aip83h0fhqx7xqnc7jqamgf72q77fddp42id6cws0v61";
+ rev = "973360108311862d6b49711af20671329d22fef5";
+ sha256 = "0f1chb6f18bqzcrps1nl871k98i91833lp1d2ql2rpl7kk7bsl72";
};
};
@@ -490,12 +490,12 @@ let
coc-python = buildVimPluginFrom2Nix {
pname = "coc-python";
- version = "2020-01-15";
+ version = "2020-02-21";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-python";
- rev = "3e03f98a1979b3ef1901c28cdd8d27a8d03bf399";
- sha256 = "1va1z1w0hjb1h03n6shsyg2i54f6wdpdpq4gl79fl96jd94k8ihp";
+ rev = "6a5104d18ae5ebf7d9b84af7c4a34c6ced62aee8";
+ sha256 = "0l8zrb2bhv1apx2vp8gswqh7v64dxfd8124cggxfkkzdqyxr10w0";
};
};
@@ -534,12 +534,12 @@ let
coc-snippets = buildVimPluginFrom2Nix {
pname = "coc-snippets";
- version = "2020-02-10";
+ version = "2020-02-19";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-snippets";
- rev = "e5ebdaae28474a9e7a21bddc5fcdd3d1c9729437";
- sha256 = "0j5wcjbmip14zx7aizb8ma2vmr03w6nzym9kpc98x4v8vwswqjhg";
+ rev = "aaa059bb998418850ec2d7958a5df16e96e76d59";
+ sha256 = "1ardzqassj1kgfjp0vxsi0kimi7w61rxdhr8ng272nrkaxbxz25j";
};
};
@@ -887,23 +887,23 @@ let
denite-git = buildVimPluginFrom2Nix {
pname = "denite-git";
- version = "2019-09-09";
+ version = "2020-02-18";
src = fetchFromGitHub {
owner = "chemzqm";
repo = "denite-git";
- rev = "db4ad6c3717272fc347a46466e4337bba6b4c4cc";
- sha256 = "0rlv9q7fzgiapann3r83szr87mfpxcvhmrsjzrxrimqk3m992wa2";
+ rev = "52b47c249ba67bc089c9fdcbab5628fc1b767651";
+ sha256 = "000vv7jka1911b9sb8vbb6y25npqrw95nx6wmcj7vnm9pn64izdb";
};
};
denite-nvim = buildVimPluginFrom2Nix {
pname = "denite-nvim";
- version = "2020-02-17";
+ version = "2020-02-23";
src = fetchFromGitHub {
owner = "Shougo";
repo = "denite.nvim";
- rev = "eeb067ca291b7f677b6faab590344a4ca84c0e70";
- sha256 = "0irz8g9qpm7d36gig86j3dqk4mdbzl5rnzg07cgizh88jqhzxvin";
+ rev = "e435b78c3fa878dba7bbb03ee7cd95df6ce7a836";
+ sha256 = "10lz16l34ran96i5902hw9zw3qbfdz712bdjkdwvaijmgnj464s5";
};
};
@@ -1077,12 +1077,12 @@ let
deoplete-nvim = buildVimPluginFrom2Nix {
pname = "deoplete-nvim";
- version = "2020-02-01";
+ version = "2020-02-23";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete.nvim";
- rev = "6e01000280edc9c9c56ef7b1d59977fc93e3bf4c";
- sha256 = "00qvpp7r7wnccfzfxq9xa4cyxzr25zy32mpxscnbixc7cv5y981x";
+ rev = "ebc9c155b0247314609e8d326e030adb3391f243";
+ sha256 = "1y51fn2lxal6kf7cls913kl51f67in08xhv2waqngv71bd377bjj";
};
};
@@ -1300,12 +1300,12 @@ let
fzf-vim = buildVimPluginFrom2Nix {
pname = "fzf-vim";
- version = "2020-02-05";
+ version = "2020-02-19";
src = fetchFromGitHub {
owner = "junegunn";
repo = "fzf.vim";
- rev = "467c3277884240f7b5430f8f4d600e3415c38f3b";
- sha256 = "1bnml1gfrzbbp6j1lwcip4k9ncf4br604z4h1snw29qsf0wgcyv3";
+ rev = "48a2d80a24d19bfaafd91005786653bc49303c62";
+ sha256 = "0p4ifdl70iwsdqsgpbs66lam7fzdc2jxa9hvzslwi0gllccpfsm5";
};
};
@@ -1399,12 +1399,12 @@ let
gruvbox = buildVimPluginFrom2Nix {
pname = "gruvbox";
- version = "2018-02-25";
+ version = "2020-02-23";
src = fetchFromGitHub {
owner = "morhetz";
repo = "gruvbox";
- rev = "cb4e7a5643f7d2dd40e694bcbd28c4b89b185e86";
- sha256 = "12qkq1x96bm1cmqfg6sb8jxpl2b6gwvhc5qn3gva6vl4nx3ianqi";
+ rev = "040138616bec342d5ea94d4db296f8ddca17007a";
+ sha256 = "0qk2mqs04qlxkc1ldgjbiv1yisi2xl2b8svmjz0hdp9y2l5vfccw";
};
};
@@ -1752,12 +1752,12 @@ let
lh-vim-lib = buildVimPluginFrom2Nix {
pname = "lh-vim-lib";
- version = "2020-01-12";
+ version = "2020-02-19";
src = fetchFromGitHub {
owner = "LucHermitte";
repo = "lh-vim-lib";
- rev = "13a59968c0d76884f2ef1feb27493ba90d62deb0";
- sha256 = "0g9dfg7y7znj3iiz67323jbflg6d34hq8hc8v4gcjnrinagyydnv";
+ rev = "3077a653988ff1f3d6483a2281650ac6da5b7559";
+ sha256 = "04g5rf1wcvxpkqbf3vkyjmkykqwi4dhp3l8i0mvng03gwpzfp0ym";
};
};
@@ -2005,12 +2005,12 @@ let
neomake = buildVimPluginFrom2Nix {
pname = "neomake";
- version = "2020-02-13";
+ version = "2020-02-20";
src = fetchFromGitHub {
owner = "neomake";
repo = "neomake";
- rev = "acbbd0e0ce2277c33926c189d0f54825e2ed59d3";
- sha256 = "1s9pg7pz39z4xz80v5i2vh3hd664zfxg2769mfj2nqz38f0qnk97";
+ rev = "76e5b2bad8e98e805ff4749068e6be6206bec2a0";
+ sha256 = "17713a1bd405c8k2qa0b7mgw2pj58r83qnz3qhjxvg877vybag6n";
};
};
@@ -2104,23 +2104,23 @@ let
nerdcommenter = buildVimPluginFrom2Nix {
pname = "nerdcommenter";
- version = "2020-01-25";
+ version = "2020-02-19";
src = fetchFromGitHub {
owner = "scrooloose";
repo = "nerdcommenter";
- rev = "cbadb3d93e5dcb121793b182880ee784dbd78978";
- sha256 = "0zk9a6ns5552nc9d65cxigv84v1p8dkdm9zwrvhi37vjznknb7gy";
+ rev = "c62e618a1ab5a50a4028e3296500ba29d9b033d8";
+ sha256 = "0w4bxj423dxxkcxnfmipf8x5jfm058rq4g3m98wzcz5zbambv3qs";
};
};
nerdtree = buildVimPluginFrom2Nix {
pname = "nerdtree";
- version = "2020-02-07";
+ version = "2020-02-20";
src = fetchFromGitHub {
owner = "scrooloose";
repo = "nerdtree";
- rev = "07612557ebb4118ef4a337faa7033d0270773c71";
- sha256 = "17l4nd62riyfnzn5i1g5blmrivlx9m3gf5qf7x0rw31y3d8k64g3";
+ rev = "e67324fdea7a192c7ce1b4c6b3c3b9f82f11eee7";
+ sha256 = "0y7hd69k0i21cqgs11n80ljv6cl0gfcjjwa0dvdywpd8mmn1ad4k";
};
};
@@ -2168,6 +2168,17 @@ let
};
};
+ NrrwRgn = buildVimPluginFrom2Nix {
+ pname = "NrrwRgn";
+ version = "2019-12-12";
+ src = fetchFromGitHub {
+ owner = "chrisbra";
+ repo = "NrrwRgn";
+ rev = "8a2930141ada6719aae6c53bf4e4a8dfc3f8dbed";
+ sha256 = "0mns43i7jj0kragylfhpawbkd9wwky8fbyvwx33406193ymyn3y3";
+ };
+ };
+
nvim-cm-racer = buildVimPluginFrom2Nix {
pname = "nvim-cm-racer";
version = "2017-07-27";
@@ -2214,12 +2225,12 @@ let
nvim-lsp = buildVimPluginFrom2Nix {
pname = "nvim-lsp";
- version = "2020-02-17";
+ version = "2020-02-23";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lsp";
- rev = "8c78ca42072d14ca678cd1e138f665a5d42df558";
- sha256 = "10w7rzpfl70bg6w665pfq6mgdz9gsw5i341sd4f0ncr2asrd7l76";
+ rev = "2dc39ef00bedde68aa7fab7023646a5ff8ca9986";
+ sha256 = "0l6blvqj2fh942farbwk02gfl2skqr59m6zz1kn4drybvr0sdw8k";
};
};
@@ -2280,12 +2291,12 @@ let
open-browser-vim = buildVimPluginFrom2Nix {
pname = "open-browser-vim";
- version = "2020-02-07";
+ version = "2020-02-20";
src = fetchFromGitHub {
owner = "tyru";
repo = "open-browser.vim";
- rev = "a78ae55a6f5d76347d36515e930cad711b8d324b";
- sha256 = "1gzbabm81q16n6i40rk3r63xpf5rkfgwi4akhdvhxhdavk7z5dzs";
+ rev = "a1091492328a57fac02e80641a86c9c64a95ebe1";
+ sha256 = "10pbad4ad3lslx0kl4a79z8rlg19xcqi7wicfldk1l003badw7cw";
};
};
@@ -2687,12 +2698,12 @@ let
SpaceCamp = buildVimPluginFrom2Nix {
pname = "SpaceCamp";
- version = "2020-02-15";
+ version = "2020-02-23";
src = fetchFromGitHub {
owner = "jaredgorski";
repo = "SpaceCamp";
- rev = "68e8d592237a61fd322c0305d0e7415d64153ec9";
- sha256 = "1njg0hqcbcqiyyjq5vldbwhndz9d7x9gxksdyr5yygc58463zk2l";
+ rev = "44d2e55286bc04588b35b356e36c56ae15e78ad2";
+ sha256 = "1qzlcp46x4pm6dyf2k4n2rrdh27zj7j719gh853gvhdbvjk650yr";
};
};
@@ -2786,12 +2797,12 @@ let
swift-vim = buildVimPluginFrom2Nix {
pname = "swift-vim";
- version = "2019-12-05";
+ version = "2020-02-21";
src = fetchFromGitHub {
owner = "keith";
repo = "swift.vim";
- rev = "245e5f7aae6f1bc96849a0a01a58cb81cf56e721";
- sha256 = "0hj7ln0qvfpb0pmvkzj21zd8a2zribdahwwl4rn1yn8skclcq149";
+ rev = "c4053da88208cef5a32a5862694d36b73f6ce310";
+ sha256 = "0awz0pf3awrwhay40wngfllpmmh24zwm02ra530x4n1hk74iwf2v";
};
};
@@ -2874,23 +2885,23 @@ let
tcomment_vim = buildVimPluginFrom2Nix {
pname = "tcomment_vim";
- version = "2020-01-04";
+ version = "2020-02-21";
src = fetchFromGitHub {
owner = "tomtom";
repo = "tcomment_vim";
- rev = "239c0c08d3e691a2c447278b88de91b602fa50bd";
- sha256 = "1v2v6zp59mblz7dj5fad640qsz92dgjsb2qzir42df2h86qx0zwa";
+ rev = "20e85e8c2346bd1f60f1ef55c5e32bb54a7a22fc";
+ sha256 = "0k8w924gyrx71kifj6cdgxbzlv5v4cp9gdy5bhc53cgn9nfjgapw";
};
};
tender-vim = buildVimPluginFrom2Nix {
pname = "tender-vim";
- version = "2020-02-12";
+ version = "2020-02-18";
src = fetchFromGitHub {
owner = "jacoborus";
repo = "tender.vim";
- rev = "0c3c715d27ba8fcc13ad1343bda069710b49b259";
- sha256 = "1rpwl3xd46nb4ghklbffpacg4f8plmjxgbnckd5jc7wwjfs1sl7q";
+ rev = "f93b2f373cc21826524c94fbd1f3b3a4c55173d2";
+ sha256 = "0bfns5vsbyh1s01s295hbf8h04n21cfkfp8b2r3cfr8mcvazpmpq";
};
};
@@ -3326,12 +3337,12 @@ let
vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline";
- version = "2020-02-17";
+ version = "2020-02-21";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline";
- rev = "7e00ee1107d0ed24ac09af51e576ea7d85e114a3";
- sha256 = "02ax3y8kh503dh7gsi0nwsvlas02vd4issawriydy1wl8ngfgdbh";
+ rev = "0b2683464877c1e39d0c67427c7fdc4bc6697d15";
+ sha256 = "010cqvszgfvwci1iw8w0kwjdy4284i16yarfcsq5zcd0786sn8s6";
};
};
@@ -3392,12 +3403,12 @@ let
vim-autoformat = buildVimPluginFrom2Nix {
pname = "vim-autoformat";
- version = "2020-02-05";
+ version = "2020-02-21";
src = fetchFromGitHub {
owner = "Chiel92";
repo = "vim-autoformat";
- rev = "f5d5d07731005adbd2dc76cf8f47ae9a68db9783";
- sha256 = "15szhh1i52wv5p6l1a9755fk8yndpipvhxjbc2y9dgbx35zyvpm2";
+ rev = "db57d849f31cd81075c82d4827426a326de76dae";
+ sha256 = "057clz1p9lkb0nvrqxgdsmm760sksg8pwa2wny3vc69hi7m1wr9w";
};
};
@@ -3632,6 +3643,17 @@ let
};
};
+ vim-cue = buildVimPluginFrom2Nix {
+ pname = "vim-cue";
+ version = "2020-02-06";
+ src = fetchFromGitHub {
+ owner = "jjo";
+ repo = "vim-cue";
+ rev = "482f0b1df03f59bbd1bf4bca99314770289a7f35";
+ sha256 = "05c9amxpn4zyb8hvcnzrzq43r70hzs32rhn5rjaf5jflgmwaph0q";
+ };
+ };
+
vim-cursorword = buildVimPluginFrom2Nix {
pname = "vim-cursorword";
version = "2020-02-01";
@@ -3799,12 +3821,12 @@ let
vim-elixir = buildVimPluginFrom2Nix {
pname = "vim-elixir";
- version = "2020-02-11";
+ version = "2020-02-21";
src = fetchFromGitHub {
owner = "elixir-lang";
repo = "vim-elixir";
- rev = "95a0e08e9bc3ebb3d2606c83b06cef3db4092337";
- sha256 = "00l3qi8dg5qvq67d1wqijf00ahvp7bhcp6l0z87szdr8fs5r2ak1";
+ rev = "85afa5e0de0ba0d640898e9d232552795fc726d2";
+ sha256 = "1askl7ridl6np25ldf4mwqp7iavb9wj119qjqmjga8niylq80hnm";
};
};
@@ -3975,12 +3997,12 @@ let
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
- version = "2020-02-16";
+ version = "2020-02-23";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
- rev = "98f67310aa3ae324d725a3b6b68a63e5a48372f4";
- sha256 = "177dk2b2mb13d6hf6hp97p91qsbafd29z8n3zdfwxjgxf9fjgl4c";
+ rev = "31629d8bd18ddb5db6d9c55585d1eeb325a6bb43";
+ sha256 = "1qvhdxha29wj7fw88i72n16m05hd9apfqwf16g6wi6v2nfqfwpnp";
};
};
@@ -4052,12 +4074,12 @@ let
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
- version = "2020-02-14";
+ version = "2020-02-23";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
- rev = "13c943aaad7ad98ddf0c35f6b758318f53e144fb";
- sha256 = "1qik4knd96py6f5y4xylshdxbf5fvf0960aadwvk1ninvsazxqic";
+ rev = "dc02b2192ff2f652379f94791b7c7e311c946068";
+ sha256 = "1h6hb870zqx7wdk49wpcp7rrd70nvvb4wk311j8439z4f6ibfsdq";
};
};
@@ -4239,12 +4261,12 @@ let
vim-illuminate = buildVimPluginFrom2Nix {
pname = "vim-illuminate";
- version = "2019-11-21";
+ version = "2020-02-21";
src = fetchFromGitHub {
owner = "RRethy";
repo = "vim-illuminate";
- rev = "4929d19cc8483d9d9872cb3669915e6a8cc381a2";
- sha256 = "1rbhnmqrw8gdpf60lx4akhadz3q80fykal1a9c4mnn5nrqymv9va";
+ rev = "80dafb9b0e7b9f4ce7c843d4104f455c8c5b1f42";
+ sha256 = "1yijaj1dqfmw4dsdmgj01sxizyraisxwjqh2hhbq93pdln4lm51f";
};
};
@@ -4680,12 +4702,12 @@ let
vim-nftables = buildVimPluginFrom2Nix {
pname = "vim-nftables";
- version = "2019-07-25";
+ version = "2020-02-21";
src = fetchFromGitHub {
owner = "nfnty";
repo = "vim-nftables";
- rev = "aad8540ef56f495baa589f646edc1253db990f1a";
- sha256 = "1fzi2zzrdzscnjzv8js0ln3bwyxnacilvfcklpndmss67gxbnbkm";
+ rev = "01c7b97eff12fd4b624e6efa2c0468163db61ebc";
+ sha256 = "1n3mpaa60k4w0sqpkgw19aksa1sbcqz7vl8fp6bj6i63bhiprsqf";
};
};
@@ -5285,12 +5307,12 @@ let
vim-snippets = buildVimPluginFrom2Nix {
pname = "vim-snippets";
- version = "2020-02-05";
+ version = "2020-02-20";
src = fetchFromGitHub {
owner = "honza";
repo = "vim-snippets";
- rev = "cca8bdc4df751c1f262030b8409845aa657f5043";
- sha256 = "18iyl4axash340lqq3j5b3jisk2zpz5gsaz307sjclsf1s6860xr";
+ rev = "35067caeca1c17fa5d38d5de031b26610e939cba";
+ sha256 = "00y608jfrw72wfvzyl82f8m1qxmb1m3c5micncca8qvyjyya07y7";
};
};
@@ -5461,12 +5483,12 @@ let
vim-test = buildVimPluginFrom2Nix {
pname = "vim-test";
- version = "2020-02-16";
+ version = "2020-02-19";
src = fetchFromGitHub {
owner = "janko-m";
repo = "vim-test";
- rev = "330b0911f13bcb48a3e28dedcf71e19de5bd4864";
- sha256 = "0iibm4nzxf7fhn5ka3pmnw324xnnxcf1lkia20w0wbx39axn4br3";
+ rev = "3ffaea971fe579c028242e79d7823dd8e8dbeebd";
+ sha256 = "0f3sn7zkwmdj3adxvclm8yqwkhxlbjzph8jmlr6kyx8xk8axdin8";
};
};
@@ -5516,12 +5538,12 @@ let
vim-textobj-user = buildVimPluginFrom2Nix {
pname = "vim-textobj-user";
- version = "2019-10-16";
+ version = "2020-02-21";
src = fetchFromGitHub {
owner = "kana";
repo = "vim-textobj-user";
- rev = "9861dc6829a0ce253e40b4d947a9432b58eb499b";
- sha256 = "1gyz6y5f9bf5hnmb54lqmddy3g9y7bc28k9mrqfr49cd9nziywa5";
+ rev = "41a675ddbeefd6a93664a4dc52f302fe3086a933";
+ sha256 = "1y1g3vcm97fqjyigiajbvbck4nlc04vxl3535x4sl40s5jbm5vz3";
};
};
@@ -5670,12 +5692,12 @@ let
vim-visual-multi = buildVimPluginFrom2Nix {
pname = "vim-visual-multi";
- version = "2020-02-16";
+ version = "2020-02-18";
src = fetchFromGitHub {
owner = "mg979";
repo = "vim-visual-multi";
- rev = "0f85922ec3cc0c497ac91ce02e5252643bcf7947";
- sha256 = "1kgqns7a8px13hh0kfdn12zg3f6zv0s3sphxl899mywnp4nx3489";
+ rev = "7417eaf7349db2c904f1ff85e69b14122a1c07ae";
+ sha256 = "14cxpwq0r0c8aq3n6vk5b9rqlazvvjszm9fdlbsrggx52llkpq3z";
};
};
@@ -5879,12 +5901,12 @@ let
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
- version = "2020-02-15";
+ version = "2020-02-18";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
- rev = "aa4d8f9d39a112f09f30872962a0c79cd121bedf";
- sha256 = "1rlhb8srp9dgmspp92qvp79sjw17m04ps90m2zlslh07xm5v2aag";
+ rev = "20f47baff2a981d6d72a8404adfd878c8736e4ee";
+ sha256 = "1bw4fh1c9xi1hfa3c3dpk605zkmg1hr4qnxrl02jlpiy631lalq2";
};
};
@@ -5923,12 +5945,12 @@ let
vista-vim = buildVimPluginFrom2Nix {
pname = "vista-vim";
- version = "2020-02-15";
+ version = "2020-02-19";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vista.vim";
- rev = "ae2c79d97547d3e048e7138ac8721825b5a47a09";
- sha256 = "0j5ya2rwl11daqgdfsqpr8svmhp9hs5zzhabq5xf3d3hlb7nvcpq";
+ rev = "73ce1d884987910f3c219a99cf659ae4146e6bf4";
+ sha256 = "0815pjnzf3pgvf45y801bzigjq79dscl7xdcs3p7qj4b8afazygg";
};
};
@@ -6033,24 +6055,24 @@ let
yats-vim = buildVimPluginFrom2Nix {
pname = "yats-vim";
- version = "2020-01-31";
+ version = "2020-02-20";
src = fetchFromGitHub {
owner = "HerringtonDarkholme";
repo = "yats.vim";
- rev = "ae182ee2449db2cce3055f7430b3adf6c0867948";
- sha256 = "0s96pd5ky2mxngxbw7lkhxbjzq74ay9jyk0zjy0q3ldd3xv4ssx5";
+ rev = "97f53f67097ddc87ab64bf8931c2798ea56e6184";
+ sha256 = "15g38zl0x0a9vn4xql4siwvshlnvlz404d7w2falqp72hr91zzmn";
fetchSubmodules = true;
};
};
youcompleteme = buildVimPluginFrom2Nix {
pname = "youcompleteme";
- version = "2020-02-14";
+ version = "2020-02-19";
src = fetchFromGitHub {
owner = "valloric";
repo = "youcompleteme";
- rev = "de8bad012d66e652a2b5ecc77c2a23c8f97489b3";
- sha256 = "1my5j2fk6c80sqmj353909dky78jr92g8bxhp02ky2mcwxlg6qrm";
+ rev = "dd4a583e06f64751ac1439c30a9a40d82cdb741d";
+ sha256 = "1imlp6sw6a2qgr6ih5fap1x83fzil5glq44lrs9d5an6wf1z8jzk";
fetchSubmodules = true;
};
};
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index c115f9b1cd6..cecd53ae820 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -28,6 +28,9 @@
# vCoolor dependency
, gnome3
+
+# notational-fzf-vim dependencies
+, ripgrep
}:
self: super: {
@@ -249,6 +252,17 @@ self: super: {
ncm2-ultisnips = super.ncm2-ultisnips.overrideAttrs(old: {
dependencies = with super; [ ultisnips ];
});
+
+ notational-fzf-vim = super.notational-fzf-vim.overrideAttrs(old: {
+ dependencies = with self; [ fzf-vim ];
+ patchPhase = ''
+ substituteInPlace plugin/notational_fzf.vim \
+ --replace "'rg'" "'${ripgrep}/bin/rg'" \
+ --replace \
+ "let s:python_executable = executable('pypy3') ? 'pypy3' : 'python3'" \
+ "let s:python_executable = '${python3}/bin/python3'"
+ '';
+ });
fzf-vim = super.fzf-vim.overrideAttrs(old: {
dependencies = [ self.fzfWrapper ];
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index fcde3fdc5c6..af06e12ab6b 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -42,6 +42,7 @@ chikatoike/concealedyank.vim
chikatoike/sourcemap.vim
chrisbra/CheckAttach
chrisbra/csv.vim
+chrisbra/NrrwRgn
chrisbra/Recover.vim
chrisbra/unicode.vim
chrisgeo/sparkup
@@ -56,8 +57,8 @@ cocopon/iceberg.vim
cohama/lexima.vim
ctjhoa/spacevim
ctrlpvim/ctrlp.vim
-dag/vim-fish
dag/vim2hs
+dag/vim-fish
dannyob/quickfixstatus
darfink/starsearch.vim
dart-lang/dart-vim-plugin
@@ -158,6 +159,7 @@ jhradilek/vim-docbk
jhradilek/vim-snippets as vim-docbk-snippets
jiangmiao/auto-pairs
jistr/vim-nerdtree-tabs
+jjo/vim-cue
jlanzarotta/bufexplorer
jnurmine/zenburn
jonbri/vim-colorstepper
@@ -309,8 +311,8 @@ neoclide/coc-neco
neoclide/coc-pairs
neoclide/coc-prettier
neoclide/coc-python
-neoclide/coc-r-lsp
neoclide/coc-rls
+neoclide/coc-r-lsp
neoclide/coc-smartf
neoclide/coc-snippets
neoclide/coc-solargraph
@@ -326,10 +328,10 @@ neoclide/coc-yaml
neoclide/coc-yank
neoclide/vim-easygit
neomake/neomake
-neovim/nvim-lsp
-neovim/nvimdev.nvim
neovimhaskell/haskell-vim
neovimhaskell/nvim-hs.vim
+neovim/nvimdev.nvim
+neovim/nvim-lsp
neutaaaaan/iosvkem
nfnty/vim-nftables
nicoe/deoplete-khard
@@ -500,14 +502,16 @@ Valodim/deoplete-notmuch
vhda/verilog_systemverilog.vim
vim-airline/vim-airline
vim-airline/vim-airline-themes
+vimlab/split-term.vim
+vimoutliner/vimoutliner
vim-pandoc/vim-pandoc
vim-pandoc/vim-pandoc-after
vim-pandoc/vim-pandoc-syntax
vim-ruby/vim-ruby
-vim-scripts/a.vim
vim-scripts/align
vim-scripts/argtextobj.vim
vim-scripts/autoload_cscope.vim
+vim-scripts/a.vim
vim-scripts/bats.vim
vim-scripts/changeColorScheme.vim
vim-scripts/Colour-Sampler-Pack
@@ -530,8 +534,6 @@ vim-scripts/utl.vim
vim-scripts/wombat256.vim
vim-scripts/YankRing.vim
vim-utils/vim-husk
-vimlab/split-term.vim
-vimoutliner/vimoutliner
vimwiki/vimwiki
vito-c/jq.vim
vmchale/dhall-vim
diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index 16c14b32218..81cd77f3edb 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -330,9 +330,8 @@ let
);
in
''
- set packpath-=~/.vim/after
- set packpath+=${packDir packages}
- set packpath+=~/.vim/after
+ set packpath^=${packDir packages}
+ set runtimepath^=${packDir packages}
filetype indent plugin on | syn on
'');
diff --git a/pkgs/os-specific/linux/can-utils/default.nix b/pkgs/os-specific/linux/can-utils/default.nix
index 6e26ef4bbce..1451a4e96c0 100644
--- a/pkgs/os-specific/linux/can-utils/default.nix
+++ b/pkgs/os-specific/linux/can-utils/default.nix
@@ -13,6 +13,12 @@ stdenv.mkDerivation {
sha256 = "1ygzp8rjr8f1gs48mb1pz7psdgbfhlvr6kjdnmzbsqcml06zvrpr";
};
+ # Fixup build with newer Linux headers.
+ postPatch = ''
+ sed '1i#include ' -i \
+ slcanpty.c cansniffer.c canlogserver.c isotpdump.c isotpsniffer.c isotpperf.c
+ '';
+
preConfigure = ''makeFlagsArray+=(PREFIX="$out")'';
meta = with stdenv.lib; {
diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix
index 5f5005d8b97..b61d99cead1 100644
--- a/pkgs/os-specific/linux/dbus-broker/default.nix
+++ b/pkgs/os-specific/linux/dbus-broker/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "dbus-broker";
- version = "21";
+ version = "22";
src = fetchFromGitHub {
owner = "bus1";
repo = "dbus-broker";
rev = "v${version}";
- sha256 = "14lgjv0gxvfa1h5hsarh9nwpxns6jb2861nd7mcanpkm2jlxh5vm";
+ sha256 = "0vxr73afix5wjxy8g4cckwhl242rrlazm52673iwmdyfz5nskj2x";
fetchSubmodules = true;
};
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix
index eac2ed4acd0..aa6aeca9549 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -2,6 +2,7 @@
{ stdenv
, fetchurl
+, fetchpatch
, substituteAll
, gtk-doc
, pkgconfig
@@ -87,11 +88,11 @@ in
stdenv.mkDerivation rec {
pname = "fwupd";
- version = "1.3.7";
+ version = "1.3.8";
src = fetchurl {
url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
- sha256 = "02mzn3whk5mba4nxyrkypawr1gzjx79n4nrkhrp8vja6mxxgsf10";
+ sha256 = "14hbwp3263n4z61ws62vj50kh9a89fz2l29hyv7f1xlas4zz6j8x";
};
# libfwupd goes to lib
@@ -162,6 +163,12 @@ stdenv.mkDerivation rec {
# needs a different set of modules than po/make-images
inherit installedTestsPython;
})
+
+ # Find the correct lds and crt name when specifying -Defi_ldsdir
+ (fetchpatch {
+ url = "https://github.com/fwupd/fwupd/commit/52cda3db9ca9ab4faf99310edf29df926a713b5c.patch";
+ sha256 = "0hsj79dzamys7ryz33iwxwd58kb1h7gaw637whm0nkvzkqq6rm16";
+ })
];
postPatch = ''
diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 248e5334d50..fd2bf0b8f15 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.19.104";
+ version = "4.19.106";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1s3bsqcsjrpjiqlxwq89llb5pb37fkbr1pwircpnh1r6ijrgzsr3";
+ sha256 = "1nlwgs15mc3hlfhqw95pz7wisg8yshzrxzzq2a0y30mjm5vbvj33";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index 4692ef7dc56..8c75304da7f 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.4.20";
+ version = "5.4.22";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "1fv7bknwjyzh176rwn11dxvpymp97h5v94mhpdhxqx3hkb6nsgvr";
+ sha256 = "06kx9bmrrk1brici8wvvd6dxqawgcig4i59pwllcq39rgs6wn6v6";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-5.5.nix b/pkgs/os-specific/linux/kernel/linux-5.5.nix
index 375743dda15..061e719cc2b 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.5.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.5.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.5.4";
+ version = "5.5.6";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "1yx60d22c3x2qnwdhrwdr2nxir59gk33jh5d5334780bxc6zsh7a";
+ sha256 = "0dgfwqmkqlrn2anwf2bj7lgl9bi4fhkmp44jhmyjc5vmknmqik2l";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/pagemon/default.nix b/pkgs/os-specific/linux/pagemon/default.nix
index 772ef56cde2..64177fa5d00 100644
--- a/pkgs/os-specific/linux/pagemon/default.nix
+++ b/pkgs/os-specific/linux/pagemon/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "pagemon";
- version = "0.01.17";
+ version = "0.01.18";
src = fetchFromGitHub {
- sha256 = "11r84nwjvnjyxc3jqhbvlgb89ajfj7v8212mz61dq5ilq5k7xa3d";
+ sha256 = "1aq1mq3k8n70h81s64w2zg4kksw1y05326bn4y8p94lpaypvxqfd";
rev = "V${version}";
repo = "pagemon";
owner = "ColinIanKing";
diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix
index 917652ca6f7..f8c75b1913b 100644
--- a/pkgs/os-specific/linux/pax-utils/default.nix
+++ b/pkgs/os-specific/linux/pax-utils/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "pax-utils";
- version = "1.2.4";
+ version = "1.2.5";
src = fetchurl {
url = "http://distfiles.gentoo.org/distfiles/${pname}-${version}.tar.xz";
- sha256 = "01kr6l2c3bhbgdrmwgzh6jk0jjkw3pi9xrzzl9cpn0ibyf68p1aj";
+ sha256 = "1v4jwbda25w07qhlx5xc5i0hwsv3pjy8hfy0r93vnmfjxq61grvw";
};
makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix
index 637ac0607db..18ef3bf3fa5 100644
--- a/pkgs/servers/computing/slurm/default.nix
+++ b/pkgs/servers/computing/slurm/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, libtool, curl
, python, munge, perl, pam, openssl, zlib
, ncurses, libmysqlclient, gtk2, lua, hwloc, numactl
-, readline, freeipmi, libssh2, xorg, lz4
+, readline, freeipmi, libssh2, xorg, lz4, rdma-core
# enable internal X11 support via libssh2
, enableX11 ? true
}:
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig libtool ];
buildInputs = [
curl python munge perl pam openssl zlib
- libmysqlclient ncurses gtk2 lz4
+ libmysqlclient ncurses gtk2 lz4 rdma-core
lua hwloc numactl readline freeipmi
] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ];
@@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
"--with-munge=${munge}"
"--with-ssl=${openssl.dev}"
"--with-zlib=${zlib}"
+ "--with-ofed=${rdma-core}"
"--sysconfdir=/etc/slurm"
] ++ (optional (gtk2 == null) "--disable-gtktest")
++ (optional enableX11 "--with-libssh2=${libssh2.dev}")
diff --git a/pkgs/servers/http/apache-modules/mod_ca/default.nix b/pkgs/servers/http/apache-modules/mod_ca/default.nix
index 37f2a397ae6..c4551108338 100644
--- a/pkgs/servers/http/apache-modules/mod_ca/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_ca/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, pkgconfig, apacheHttpd, openssl, openldap }:
+{ stdenv, fetchurl, pkgconfig, apacheHttpd, openssl, openldap, apr, aprutil }:
stdenv.mkDerivation rec {
pname = "mod_ca";
- version = "0.2.1";
+ version = "0.2.2";
src = fetchurl {
url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz";
- sha256 = "1pxapjrzdsk2s25vhgvf56fkakdqcbn9hjncwmqh0asl1pa25iic";
+ sha256 = "0gs66br3aig749rzifxn6j1rz2kps4hc4jppscly48lypgyygy8s";
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ apacheHttpd openssl openldap ];
+ buildInputs = [ apacheHttpd openssl openldap apr aprutil ];
# Note that configureFlags and installFlags are inherited by
# the various submodules.
diff --git a/pkgs/servers/http/apache-modules/mod_crl/default.nix b/pkgs/servers/http/apache-modules/mod_crl/default.nix
index 54c0de1c701..ee7dbe3245d 100644
--- a/pkgs/servers/http/apache-modules/mod_crl/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_crl/default.nix
@@ -1,12 +1,13 @@
{ stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }:
+
stdenv.mkDerivation rec {
pname = "mod_crl";
- version = "0.2.1";
+ version = "0.2.3";
src = fetchurl {
url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz";
- sha256 = "0k6iqn5a4bqdz3yx6d53f1r75c21jnwhxmmcq071zq0361xjzzj6";
+ sha256 = "1x186kp6fr8nwg0jlv5phagxndvw4rjqfga9mkibmn6dx252p61d";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/http/apache-modules/mod_csr/default.nix b/pkgs/servers/http/apache-modules/mod_csr/default.nix
index 60f97d2f361..6547d3aa2b5 100644
--- a/pkgs/servers/http/apache-modules/mod_csr/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_csr/default.nix
@@ -1,35 +1,19 @@
{ stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }:
+
stdenv.mkDerivation rec {
pname = "mod_csr";
- version = "0.2.1";
+ version = "0.2.3";
src = fetchurl {
url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz";
- sha256 = "01sdvv07kchdd6ssrmd2cbhj50qh2ibp5g5h6jy1jqbzp0b3j9ja";
+ sha256 = "1p4jc0q40453wpvwqgnr1n007b4jxpkizzy3r4jygsxxgg4x9w7x";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ mod_ca apr aprutil ];
inherit (mod_ca) configureFlags installFlags;
- # After openssl-1.0.2t, starting in openssl-1.1.0l
- # parts of the OpenSSL struct API was replaced by
- # getters - but some setters where forgotten.
- #
- # It is expected that these are back/retrofitted in version
- # openssl-1.1.1d -- but while fixing this it was found
- # that there were quite a few other setters missing and
- # that some of the memory management needed was at odds
- # with the principles used sofar.
- #
- # See https://github.com/openssl/openssl/pull/10563
- #
- # So as a stopgap - use a minimalist compat. layer
- # https://source.redwax.eu/projects/RS/repos/mod_csr/browse/openssl_setter_compat.h
- #
- preBuild = "cp ${./openssl_setter_compat.h} openssl_setter_compat.h";
-
meta = with stdenv.lib; {
description = "RedWax CA service module to handle Certificate Signing Requests";
diff --git a/pkgs/servers/http/apache-modules/mod_csr/openssl_setter_compat.h b/pkgs/servers/http/apache-modules/mod_csr/openssl_setter_compat.h
deleted file mode 100644
index a2a9e0f7a18..00000000000
--- a/pkgs/servers/http/apache-modules/mod_csr/openssl_setter_compat.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Licensed to Stichting The Commons Conservancy (TCC) under one or more
- * contributor license agreements. See the AUTHORS file distributed with
- * this work for additional information regarding copyright ownership.
- * TCC licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// These routines are copies from OpenSSL/1.1.1 its x509/x509_req.c
-// and the private header files for that. They are needed as
-// starting with OpenSSL 1.1.0 the X509_req structure became
-// private; and got some get0 functions to access its internals.
-// But no getter's until post 1.1.1 (PR#10563). So this is a
-// stopgap for these lacking releases.
-//
-// Testest against:
-// openssl-1.0.2t 0x01000214fL (does not need it, privates still accessile)
-// openssl-1.1.0l 0x0101000cfL (needs it)
-// openssl-1.1.1d 0x01010104fL (last version that needs it)
-// openssl-1.1.1-dev (should not need it - post PR#10563).
-//
-/* #if OPENSSL_VERSION_NUMBER >= 0x010100000L && OPENSSL_VERSION_NUMBER <= 0x01010104fL */
-#if OPENSSL_VERSION_NUMBER >= 0x010100000L
-#include "openssl/x509.h"
-
-#define HAS_OPENSSL_PR10563_WORK_AROUND
-
-struct X509_req_info_st {
- ASN1_ENCODING enc;
- ASN1_INTEGER *version;
- X509_NAME *subject;
- X509_PUBKEY *pubkey;
- STACK_OF(X509_ATTRIBUTE) *attributes;
-};
-
-typedef _Atomic int CRYPTO_REF_COUNT;
-
-struct X509_req_st {
- X509_REQ_INFO req_info;
- X509_ALGOR sig_alg;
- ASN1_BIT_STRING *signature; /* signature */
- CRYPTO_REF_COUNT references;
- CRYPTO_RWLOCK *lock;
-# ifndef OPENSSL_NO_SM2
- ASN1_OCTET_STRING *sm2_id;
-# endif
-};
-
-
-static void _X509_REQ_set1_signature(X509_REQ *req, X509_ALGOR *palg)
-{
- if (req->sig_alg.algorithm)
- ASN1_OBJECT_free(req->sig_alg.algorithm);
- if (req->sig_alg.parameter)
- ASN1_TYPE_free(req->sig_alg.parameter);
- req->sig_alg = *palg;
-}
-#endif
diff --git a/pkgs/servers/http/apache-modules/mod_ocsp/default.nix b/pkgs/servers/http/apache-modules/mod_ocsp/default.nix
index 6730ca16f10..6ec3f246fad 100644
--- a/pkgs/servers/http/apache-modules/mod_ocsp/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_ocsp/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mod_ocsp";
- version = "0.2.1";
+ version = "0.2.2";
src = fetchurl {
url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz";
- sha256 = "1vwgai56krdf8knb0mgy07ni9mqxk82bcb4gibwpnxvl6qwgv2i0";
+ sha256 = "0wy5363m4gq1w08iny2b3sh925bnznlln88pr9lgj9vgbn8pqnrn";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix b/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix
index 2bcf3b1d9c2..1cf68f2a276 100644
--- a/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mod_pkcs12";
- version = "0.2.1";
+ version = "0.2.2";
src = fetchurl {
url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz";
- sha256 = "0by4qfjs3a8q0amzwazfq8ii6ydv36v2mjga0jzc9i6xyl4rs6ai";
+ sha256 = "1jfyax3qrw9rpf2n0pn6iw4dpn2nl4j0i2a998n5p1mdmjx9ch73";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/http/apache-modules/mod_scep/default.nix b/pkgs/servers/http/apache-modules/mod_scep/default.nix
index 98703659c35..1331c6da3e4 100644
--- a/pkgs/servers/http/apache-modules/mod_scep/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_scep/default.nix
@@ -2,34 +2,17 @@
stdenv.mkDerivation rec {
pname = "mod_scep";
- version = "0.2.1";
+ version = "0.2.3";
src = fetchurl {
url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz";
- sha256 = "14l8v6y6kx5dg8avb5ny95qdcgrw40ss80nqrgmw615mk7zcj81f";
+ sha256 = "1imddqyi81l90valvndx9r0ywn32ggijrdfrjmbx8j1abaccagrc";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ mod_ca apr aprutil ];
inherit (mod_ca) configureFlags installFlags;
- # After openssl-1.0.2t, starting in openssl-1.1.0l
- # parts of the OpenSSL struct API was replaced by
- # getters - but some setters where forgotten.
- #
- # It is expected that these are back/retrofitted in version
- # openssl-1.1.1d -- but while fixing this it was found
- # that there were quite a few other setters missing and
- # that some of the memory management needed was at odds
- # with the principles used sofar.
- #
- # See https://github.com/openssl/openssl/pull/10563
- #
- # So as a stopgap - use a minimalist compat. layer
- # https://source.redwax.eu/projects/RS/repos/mod_csr/browse/openssl_setter_compat.h
- #
- preBuild = "cp ${./openssl_setter_compat.h} openssl_setter_compat.h";
-
meta = with stdenv.lib; {
description = "RedWax CA service modules for SCEP (Automatic ceritifcate issue/renewal)";
diff --git a/pkgs/servers/http/apache-modules/mod_scep/openssl_setter_compat.h b/pkgs/servers/http/apache-modules/mod_scep/openssl_setter_compat.h
deleted file mode 100644
index a2a9e0f7a18..00000000000
--- a/pkgs/servers/http/apache-modules/mod_scep/openssl_setter_compat.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Licensed to Stichting The Commons Conservancy (TCC) under one or more
- * contributor license agreements. See the AUTHORS file distributed with
- * this work for additional information regarding copyright ownership.
- * TCC licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// These routines are copies from OpenSSL/1.1.1 its x509/x509_req.c
-// and the private header files for that. They are needed as
-// starting with OpenSSL 1.1.0 the X509_req structure became
-// private; and got some get0 functions to access its internals.
-// But no getter's until post 1.1.1 (PR#10563). So this is a
-// stopgap for these lacking releases.
-//
-// Testest against:
-// openssl-1.0.2t 0x01000214fL (does not need it, privates still accessile)
-// openssl-1.1.0l 0x0101000cfL (needs it)
-// openssl-1.1.1d 0x01010104fL (last version that needs it)
-// openssl-1.1.1-dev (should not need it - post PR#10563).
-//
-/* #if OPENSSL_VERSION_NUMBER >= 0x010100000L && OPENSSL_VERSION_NUMBER <= 0x01010104fL */
-#if OPENSSL_VERSION_NUMBER >= 0x010100000L
-#include "openssl/x509.h"
-
-#define HAS_OPENSSL_PR10563_WORK_AROUND
-
-struct X509_req_info_st {
- ASN1_ENCODING enc;
- ASN1_INTEGER *version;
- X509_NAME *subject;
- X509_PUBKEY *pubkey;
- STACK_OF(X509_ATTRIBUTE) *attributes;
-};
-
-typedef _Atomic int CRYPTO_REF_COUNT;
-
-struct X509_req_st {
- X509_REQ_INFO req_info;
- X509_ALGOR sig_alg;
- ASN1_BIT_STRING *signature; /* signature */
- CRYPTO_REF_COUNT references;
- CRYPTO_RWLOCK *lock;
-# ifndef OPENSSL_NO_SM2
- ASN1_OCTET_STRING *sm2_id;
-# endif
-};
-
-
-static void _X509_REQ_set1_signature(X509_REQ *req, X509_ALGOR *palg)
-{
- if (req->sig_alg.algorithm)
- ASN1_OBJECT_free(req->sig_alg.algorithm);
- if (req->sig_alg.parameter)
- ASN1_TYPE_free(req->sig_alg.parameter);
- req->sig_alg = *palg;
-}
-#endif
diff --git a/pkgs/servers/http/apache-modules/mod_spkac/default.nix b/pkgs/servers/http/apache-modules/mod_spkac/default.nix
index 72e0d521e3b..00f054f755e 100644
--- a/pkgs/servers/http/apache-modules/mod_spkac/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_spkac/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mod_spkac";
- version = "0.2.1";
+ version = "0.2.2";
src = fetchurl {
url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz";
- sha256 = "0x6ia9qcr7lx2awpv9cr4ndic5f4g8yqzmp2hz66zpzkmk2b2pyz";
+ sha256 = "0hpr58yazbi21m0sjn22a8ns4h81s4jlab9szcdw7j9w9jdc7j0h";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/http/apache-modules/mod_timestamp/default.nix b/pkgs/servers/http/apache-modules/mod_timestamp/default.nix
index 139da289078..9cd2a822b09 100644
--- a/pkgs/servers/http/apache-modules/mod_timestamp/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_timestamp/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mod_timestamp";
- version = "0.2.1";
+ version = "0.2.2";
src = fetchurl {
url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz";
- sha256 = "0j4b04dbdwn9aff3da9m0lnqi0qbw6c6hhi81skl15kyc3vzp67f";
+ sha256 = "1p18mgxx2ainfrc2wm27rl3lh6yl0ihx6snib60jnp694587bfwg";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix
new file mode 100644
index 00000000000..5fe684cfe31
--- /dev/null
+++ b/pkgs/servers/keycloak/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchzip, makeWrapper, jre }:
+
+stdenv.mkDerivation rec {
+ pname = "keycloak";
+ version = "9.0.0";
+
+ src = fetchzip {
+ url = "https://downloads.jboss.org/keycloak/${version}/keycloak-${version}.zip";
+ sha256 = "1w2d76v1rjghvdks1w32qi08gh88cd37vbf6vx0kq9a2gnhn7hip";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ installPhase = ''
+ mkdir $out
+ cp -r * $out
+
+ rm -rf $out/bin/*.{ps1,bat}
+ rm -rf $out/bin/add-user-keycloak.sh
+ rm -rf $out/bin/jconsole.sh
+
+ chmod +x $out/bin/standalone.sh
+ wrapProgram $out/bin/standalone.sh \
+ --prefix PATH ":" ${jre}/bin ;
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "https://www.keycloak.org/";
+ description = "Identity and access management for modern applications and services";
+ license = licenses.asl20;
+ maintainers = [ maintainers.ngerstle ];
+ };
+
+}
diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix
index 7174b45a6f7..76b247cfd84 100644
--- a/pkgs/servers/mail/opensmtpd/default.nix
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@@ -4,14 +4,14 @@
stdenv.mkDerivation rec {
pname = "opensmtpd";
- version = "6.6.3p1";
+ version = "6.6.4p1";
nativeBuildInputs = [ autoconf automake libtool bison ];
buildInputs = [ libasr libevent zlib libressl db pam ];
src = fetchurl {
url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz";
- sha256 = "1dqysjlyl0x3qzdzc9sjrla0063vpmlyq735lzf88p7wgzmw1xwy";
+ sha256 = "1kyph9ycq0j21dl9n1sq5fns9p4gckdi0fmnf8awrcwrdcm9dyg2";
};
patches = [
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 427d3d1d42e..a4a4796a8cd 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,8 +1,8 @@
-{ lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
+{ lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomJsSupport ? false, phantomjs2 ? null }:
buildGoPackage rec {
pname = "grafana";
- version = "6.6.1";
+ version = "6.6.2";
goPackagePath = "github.com/grafana/grafana";
@@ -12,12 +12,12 @@ buildGoPackage rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
- sha256 = "0yw7yq201f5c3dzy51jaa2mgn0bdh69341a7r9hz9bxpb21w0zq9";
+ sha256 = "0zbc9jcr3w7rwsv96csqaifn5d0b435wyrrajr5wzsmhljygvrcy";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
- sha256 = "0xrkaiz3kl1avq040xyyal35rkf2mg6s2y0wggmndvsnwc3q5p0f";
+ sha256 = "1plijm7cy92k79ypcnxjmdf2vhlxa4dzwjyl9lkf2npm7kswswsl";
};
postPatch = ''
@@ -31,6 +31,7 @@ buildGoPackage rec {
tar -xvf $srcStatic
mkdir -p $bin/share/grafana
mv grafana-*/{public,conf,tools} $bin/share/grafana/
+ '' + lib.optionalString phantomJsSupport ''
ln -sf ${phantomjs2}/bin/phantomjs $bin/share/grafana/tools/phantomjs/phantomjs
'';
diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix
index 67474797c48..c6189e12471 100644
--- a/pkgs/servers/monitoring/telegraf/default.nix
+++ b/pkgs/servers/monitoring/telegraf/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "telegraf";
- version = "1.13.3";
+ version = "1.13.4";
goPackagePath = "github.com/influxdata/telegraf";
@@ -14,7 +14,7 @@ buildGoPackage rec {
owner = "influxdata";
repo = "telegraf";
rev = version;
- sha256 = "093695n83m1ywy4l7nswjh1xc0gkg7pxilxav7jjxkgl4p15yf28";
+ sha256 = "031hq9dg87cqj4am7qkbgfan2s6bqc2hf48h0gnrv78hbz8icxa1";
};
buildFlagsArray = [ ''-ldflags=
diff --git a/pkgs/servers/monitoring/telegraf/deps.nix b/pkgs/servers/monitoring/telegraf/deps.nix
index 84be580c4f1..4292d9aa791 100644
--- a/pkgs/servers/monitoring/telegraf/deps.nix
+++ b/pkgs/servers/monitoring/telegraf/deps.nix
@@ -932,8 +932,8 @@
fetch = {
type = "git";
url = "https://github.com/safchain/ethtool";
- rev = "ef7e7c9c27639f149a3c4bfae07a9c0fc3a1691a";
- sha256 = "140bd01ngh2jgqhr2av3d4xmwk71c2mq5crg8gy89al76dwrjb7b";
+ rev = "f459e2d136648a780248aba0fcac44740fe3b500";
+ sha256 = "0zhxq588vkicxy4cbjjd20l4n1pzpi7q734595y6zz4zljsp24cs";
};
}
{
@@ -1013,8 +1013,8 @@
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
- rev = "f35b8ab0b5a2cef36673838d662e249dd9c94686";
- sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
+ rev = "3ebf1ddaeb260c4b1ae502a01c7844fa8c1fa0e9";
+ sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl";
};
}
{
diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 9fb7a2e3e0e..22fc4ebf39e 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "nextcloud";
- version = "18.0.0";
+ version = "18.0.1";
src = fetchurl {
url = "https://download.nextcloud.com/server/releases/${pname}-${version}.tar.bz2";
- sha256 = "0yr6sh9nf15dpnpcj4ypdmm9l3y8ls57pxsmqh5h913db2jrah0r";
+ sha256 = "1h0rxpdssn1hc65k41zbvww9r4f79vbd9bixc9ri5n7hp0say3vp";
};
installPhase = ''
diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix
index 21658a273b4..90dd1641746 100644
--- a/pkgs/servers/nosql/eventstore/default.nix
+++ b/pkgs/servers/nosql/eventstore/default.nix
@@ -16,13 +16,13 @@ in
stdenv.mkDerivation rec {
pname = "EventStore";
- version = "5.0.5";
+ version = "5.0.6";
src = fetchFromGitHub {
owner = "EventStore";
repo = "EventStore";
rev = "oss-v${version}";
- sha256 = "0cnpw24fvnj0q644p9jlijcqz6bxi61g0b59g52d3qxfydr0lgs0";
+ sha256 = "0jlyyqs1z2xrw0dkai2k2zr3dsdbdsvmhx81qa92k7ga9hv04sqj";
};
buildInputs = [
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- homepage = https://geteventstore.com/;
+ homepage = "https://geteventstore.com/";
description = "Event sourcing database with processing logic in JavaScript";
license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ puffnfresh ];
diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index 2586171a7cf..24422842e35 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -8,13 +8,13 @@
# server, and the FHS userenv and corresponding NixOS module should
# automatically pick up the changes.
stdenv.mkDerivation rec {
- version = "1.18.6.2368-97add474d";
+ version = "1.18.7.2438-f342a5a43";
pname = "plexmediaserver";
# Fetch the source
src = fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm";
- sha256 = "0d2nnvw9qpmsra6g044bz192v67igcp1mfayy4sk0j2yqgiqvcgl";
+ sha256 = "07lill29ck5h6lnrxj4k709afh36d6giy4jzv1jwcvcq1hdrvmzh";
};
outputs = [ "out" "basedb" ];
diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix
index cdab1fce7b0..ad3654f17df 100644
--- a/pkgs/servers/search/elasticsearch/plugins.nix
+++ b/pkgs/servers/search/elasticsearch/plugins.nix
@@ -18,6 +18,9 @@ let
inherit installPhase;
pname = "elasticsearch-${pluginName}";
dontUnpack = true;
+ # Work around the "unpacker appears to have produced no directories"
+ # case that happens when the archive doesn't have a subdirectory.
+ setSourceRoot = "sourceRoot=$(pwd)";
buildInputs = [ unzip ];
meta = a.meta // {
platforms = elasticsearch.meta.platforms;
@@ -26,6 +29,24 @@ let
});
in {
+ analysis-icu = esPlugin rec {
+ name = "elasticsearch-analysis-icu-${version}";
+ pluginName = "analysis-icu";
+ version = esVersion;
+ src = fetchurl {
+ url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";
+ sha256 =
+ if version == "7.5.1" then "0v6ynbk34g7pl9cwy8ga8bk1my18jb6pc3pqbjl8p93w38219vi6"
+ else if version == "6.8.3" then "0vbaqyj0lfy3ijl1c9h92b0nh605h5mjs57bk2zhycdvbw5sx2lv"
+ else throw "unsupported version ${version} for plugin ${pluginName}";
+ };
+ meta = with stdenv.lib; {
+ homepage = https://github.com/elastic/elasticsearch/tree/master/plugins/analysis-icu;
+ description = "The ICU Analysis plugin integrates the Lucene ICU module into elasticsearch";
+ license = licenses.asl20;
+ };
+ };
+
analysis-lemmagen = esPlugin rec {
pluginName = "analysis-lemmagen";
version = esVersion;
diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix
index 99402b3e1be..af14a3e176c 100644
--- a/pkgs/servers/shairport-sync/default.nix
+++ b/pkgs/servers/shairport-sync/default.nix
@@ -2,11 +2,11 @@
, libdaemon, popt, pkgconfig, libconfig, libpulseaudio, soxr }:
stdenv.mkDerivation rec {
- version = "3.3.5";
+ version = "3.3.6";
pname = "shairport-sync";
src = fetchFromGitHub {
- sha256 = "1qaxx1g4dvdx54mc1kw07hm445zij37w6qmkdcwymy13krvsfd4b";
+ sha256 = "0s5aq1a7dmf3n2d6ps6x7xarpn53vvlcbms8k23wl2h5vrx91rwi";
rev = version;
repo = "shairport-sync";
owner = "mikebrady";
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index c86ed3defbc..51181c4d2ae 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -1,7 +1,9 @@
{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses, zlib, xz, lzo, lz4, bzip2, snappy
, libiconv, openssl, pcre, boost, judy, bison, libxml2, libkrb5, linux-pam, curl
-, libaio, libevent, jemalloc, cracklib, systemd, numactl, perl
+, libaio, libevent, jemalloc, cracklib, systemd, perl
, fixDarwinDylibNames, cctools, CoreServices, less
+, numactl # NUMA Support
+, withStorageMroonga ? true, kytea, msgpack, zeromq
, withoutClient ? false
}:
@@ -19,14 +21,14 @@ mariadb = server // {
};
common = rec { # attributes common to both builds
- version = "10.3.20";
+ version = "10.3.22";
src = fetchurl {
urls = [
"https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz"
"https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz"
];
- sha256 = "14n4zfpwhvafz02r95bidmkwq2bz9jj3safqni1h21jfd0nqz0ak";
+ sha256 = "1iyf1hl82nqsci5h327a537rvdrc5qcbrd1v3fc4cxy2pmfha01j";
name = "mariadb-${version}.tar.gz";
};
@@ -87,7 +89,6 @@ common = rec { # attributes common to both builds
# Remove Development components. Need to use libmysqlclient.
rm "$out"/lib/mysql/plugin/daemon_example.ini
rm "$out"/lib/{libmariadbclient.a,libmysqlclient.a,libmysqlclient_r.a,libmysqlservices.a}
- rm "$out"/lib/mysql/plugin/{caching_sha2_password.so,dialog.so,mysql_clear_password.so,sha256_password.so}
rm "$out"/bin/{mariadb_config,mysql_config}
rm -r $out/include
rm -r $out/lib/pkgconfig
@@ -144,6 +145,7 @@ server = stdenv.mkDerivation (common // {
xz lzo lz4 bzip2 snappy
libxml2 boost judy libevent cracklib
] ++ optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) numactl
+ ++ optionals withStorageMroonga [ kytea msgpack zeromq ]
++ optional stdenv.hostPlatform.isLinux linux-pam
++ optional (!stdenv.hostPlatform.isDarwin) mytopEnv;
@@ -164,6 +166,10 @@ server = stdenv.mkDerivation (common // {
"-DWITH_INNODB_DISALLOW_WRITES=ON"
"-DWITHOUT_EXAMPLE=1"
"-DWITHOUT_FEDERATED=1"
+ ] ++ optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) [
+ "-DWITH_NUMA=ON"
+ ] ++ optional (!withStorageMroonga) [
+ "-DWITHOUT_MROONGA=ON"
] ++ optionals withoutClient [
"-DWITHOUT_CLIENT=ON"
] ++ optionals stdenv.hostPlatform.isDarwin [
@@ -179,7 +185,6 @@ server = stdenv.mkDerivation (common // {
chmod +x "$out"/bin/wsrep_sst_common
rm "$out"/bin/{mysql_client_test,mysqltest}
rm -r "$out"/data # Don't need testing data
- mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql
'' + optionalString withoutClient ''
${ # We don't build with GSSAPI on Darwin
optionalString (!stdenv.hostPlatform.isDarwin) ''
@@ -188,6 +193,8 @@ server = stdenv.mkDerivation (common // {
}
rm "$out"/lib/mysql/plugin/client_ed25519.so
rm "$out"/lib/{libmysqlclient${libExt},libmysqlclient_r${libExt}}
+ '' + optionalString withStorageMroonga ''
+ mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql
'' + optionalString (!stdenv.hostPlatform.isDarwin) ''
sed -i 's/-mariadb/-mysql/' "$out"/bin/galera_new_cluster
'';
diff --git a/pkgs/servers/sql/patroni/default.nix b/pkgs/servers/sql/patroni/default.nix
new file mode 100644
index 00000000000..a9fc3fd1a17
--- /dev/null
+++ b/pkgs/servers/sql/patroni/default.nix
@@ -0,0 +1,57 @@
+{ lib, pythonPackages, fetchFromGitHub }:
+
+pythonPackages.buildPythonApplication rec {
+ pname = "patroni";
+ version = "1.6.4";
+
+ src = fetchFromGitHub {
+ owner = "zalando";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0w0mz4a1cyxdsqmv7jrkw163jll8ir5zmf93zcidlqx13knrk80g";
+ };
+
+ # cdiff renamed to ydiff; remove when patroni source reflects this.
+ postPatch = ''
+ for i in requirements.txt patroni/ctl.py tests/test_ctl.py; do
+ substituteInPlace $i --replace cdiff ydiff
+ done
+ '';
+
+ propagatedBuildInputs = with pythonPackages; [
+ boto
+ click
+ consul
+ dns
+ kazoo
+ kubernetes
+ prettytable
+ psutil
+ psycopg2
+ python-dateutil
+ python-etcd
+ pyyaml
+ tzlocal
+ urllib3
+ ydiff
+ ];
+
+ checkInputs = with pythonPackages; [
+ flake8
+ mock
+ pytest
+ pytestcov
+ requests
+ ];
+
+ # Fix tests by preventing them from writing to /homeless-shelter.
+ preCheck = "export HOME=$(mktemp -d)";
+
+ meta = with lib; {
+ homepage = "https://patroni.readthedocs.io/en/latest/";
+ description = "A Template for PostgreSQL HA with ZooKeeper, etcd or Consul";
+ license = licenses.mit;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.limeytexan ];
+ };
+}
diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix
index c7bceb232f6..70ba715cf66 100644
--- a/pkgs/servers/sql/postgresql/ext/postgis.nix
+++ b/pkgs/servers/sql/postgresql/ext/postgis.nix
@@ -14,13 +14,13 @@
}:
stdenv.mkDerivation rec {
pname = "postgis";
- version = "3.0.0";
+ version = "3.0.1";
outputs = [ "out" "doc" ];
src = fetchurl {
url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz";
- sha256 = "15557fbk0xkngihwhqsbdyz2ng49blisf5zydw81j0gabk6x4vy0";
+ sha256 = "0lv37v8f3143kfm9sdvw59461q2lndxiqvaw47lvmnaha7wk4m2s";
};
buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ]
diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix
index faab933ae25..d4c18f9f581 100644
--- a/pkgs/shells/powershell/default.nix
+++ b/pkgs/shells/powershell/default.nix
@@ -30,22 +30,23 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin
mkdir -p $out/share/powershell
cp -r * $out/share/powershell
- makeWrapper $out/share/powershell/pwsh $out/bin/pwsh --prefix ${platformLdLibraryPath} : "${stdenv.lib.makeLibraryPath libraries}" \
- --set TERM xterm --set POWERSHELL_TELEMETRY_OPTOUT 1 --set DOTNET_CLI_TELEMETRY_OPTOUT 1
+ makeWrapper $out/share/powershell/pwsh $out/bin/pwsh \
+ --prefix ${platformLdLibraryPath} : "${stdenv.lib.makeLibraryPath libraries}" \
+ --set TERM xterm --set POWERSHELL_TELEMETRY_OPTOUT 1 --set DOTNET_CLI_TELEMETRY_OPTOUT 1
'';
dontStrip = true;
meta = with stdenv.lib; {
description = "Cross-platform (Windows, Linux, and macOS) automation and configuration tool/framework";
- homepage = https://github.com/PowerShell/PowerShell;
+ homepage = "https://github.com/PowerShell/PowerShell";
maintainers = [ maintainers.yrashk ];
- platforms = platforms.unix;
+ platforms = [ "x86_64-darwin" "x86_64-linux" ];
license = with licenses; [ mit ];
};
- passthru = {
- shellPath = "/bin/pwsh";
+ passthru = {
+ shellPath = "/bin/pwsh";
};
}
diff --git a/pkgs/shells/zsh/bracketed-paste-magic.patch b/pkgs/shells/zsh/bracketed-paste-magic.patch
deleted file mode 100644
index f22f6489ce7..00000000000
--- a/pkgs/shells/zsh/bracketed-paste-magic.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/Functions/Zle/bracketed-paste-magic b/Functions/Zle/bracketed-paste-magic
-index 4baae82..840091b 100644
---- a/Functions/Zle/bracketed-paste-magic
-+++ b/Functions/Zle/bracketed-paste-magic
-@@ -162,7 +162,7 @@ bracketed-paste-magic() {
-
- # There are active widgets. Reprocess $PASTED as keystrokes.
- NUMERIC=1
-- zle -U - $PASTED
-+ zle -U - "$PASTED"
-
- # Just in case there are active undo widgets
-
-@@ -212,7 +212,7 @@ bracketed-paste-magic() {
- # Arrange to display highlighting if necessary
- if [[ -z $zle_highlight || -n ${(M)zle_highlight:#paste:*} ]]; then
- zle -R
-- zle .read-command && zle -U - $KEYS
-+ zle .read-command && zle -U - "$KEYS"
- fi
- }
-
diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index 52bd3c71858..8e050acef1f 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, ncurses, pcre, buildPackages }:
let
- version = "5.7.1";
+ version = "5.8";
documentation = fetchurl {
url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.xz";
- sha256 = "1d1r88n1gfdavx4zy3svl1gljrvzim17jb2r834hafg2a016flrh";
+ sha256 = "1i6wdzq6rfjx5yjrpzan1jf50hk2pfzy5qib9mb7cnnbjfar6klv";
};
in
@@ -15,16 +15,9 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz";
- sha256 = "1s3yww0mzgvpc48kp0x868mm3gbna42sbgzya0nknj0x5hn2jq3j";
+ sha256 = "09yyaadq738zlrnlh1hd3ycj1mv3q5hh4xl1ank70mjnqm6bbi6w";
};
- patches = [
- # Bracketed-paste-magic error in Putty due to empty $PASTED variable
- # http://www.zsh.org/mla/workers/2019/msg00808.html
- # This patch included in the next version
- ./bracketed-paste-magic.patch
- ];
-
buildInputs = [ ncurses pcre ];
configureFlags = [
diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 3b67d2a2280..1e533c1df04 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
{ stdenv, fetchgit }:
stdenv.mkDerivation rec {
- version = "2020-02-11";
+ version = "2020-02-26";
pname = "oh-my-zsh";
- rev = "17428f3c9a99c8d81e57bcf565d39011669e65ed";
+ rev = "01bfb57446fdc77e8b4ae696729688284392c0e6";
src = fetchgit { inherit rev;
url = "https://github.com/ohmyzsh/ohmyzsh";
- sha256 = "1i2f5gvr8gdvwx4x135j949x4q1q721jq2936p33c1zk9wq4kzwc";
+ sha256 = "1mkmdyzz89c48zncszv67lkhgkincpzx5hfssbyfyj3pkrgf97xx";
};
pathsToLink = [ "/share/oh-my-zsh" ];
diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
index 38d5cfdb852..7daa8fa1fd7 100644
--- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
+++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
@@ -3,14 +3,15 @@
# To make use of this derivation, use
# `programs.zsh.promptInit = "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme";`
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "powerlevel10k";
- version = "1.1";
+ version = "1.2.0";
+
src = fetchFromGitHub {
owner = "romkatv";
repo = "powerlevel10k";
- rev = "9d9c50611da19044370ee759e593ccadbad32a6a";
- sha256 = "0jl4jamh7i8w7lp3qbbakh1wsyrrmslsrjwh9jgyvw50a83hp6fj";
+ rev = "v${version}";
+ sha256 = "1hvhql7564j6n6xwg4wckzvzs4fk5zlrdxkx5nd9i3g2d477nbac";
};
patches = [
diff --git a/pkgs/tools/X11/xprintidle-ng/default.nix b/pkgs/tools/X11/xprintidle-ng/default.nix
index 117a612381f..4ae457dab4a 100644
--- a/pkgs/tools/X11/xprintidle-ng/default.nix
+++ b/pkgs/tools/X11/xprintidle-ng/default.nix
@@ -19,20 +19,18 @@ stdenv.mkDerivation rec {
--replace "AC_PREREQ([2.62])" "AC_PREREQ([2.63])"
'';
- nativeBuildInputs = [
+ nativeBuildInputs = [
autoconf automake gettext git gnulib
help2man libtool perl pkgconfig texinfo
];
configurePhase = ''
- cp -r "${gnulib}" gnulib
- chmod a+rX,u+w -R gnulib
- ./bootstrap --gnulib-srcdir=gnulib
+ ./bootstrap --gnulib-srcdir=${gnulib}
./configure --prefix="$out"
'';
buildInputs = [
- libX11 libXScrnSaver libXext
+ libX11 libXScrnSaver libXext
];
meta = {
diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix
index ddecd15b6ad..48a1de61cd8 100644
--- a/pkgs/tools/admin/aws-vault/default.nix
+++ b/pkgs/tools/admin/aws-vault/default.nix
@@ -1,17 +1,18 @@
-{ buildGoPackage, lib, fetchFromGitHub }:
-buildGoPackage rec {
+{ buildGoModule, lib, fetchFromGitHub }:
+buildGoModule rec {
pname = "aws-vault";
- version = "4.5.1";
-
- goPackagePath = "github.com/99designs/${pname}";
+ version = "5.3.2";
src = fetchFromGitHub {
owner = "99designs";
repo = pname;
rev = "v${version}";
- sha256 = "0y64fx15p9ls829lif7c0jaxyclzpnr8l5cyw25q545878dzmcs5";
+ sha256 = "04dyibcaijv5011laycf39m4gvprvvsn5zkxslyih1kqd170w3wg";
};
+ modSha256 = "1d3hjfmfmlpw2scfyn597zkzz864w97p0wrsxjp49m9mi0pgmhq9";
+ subPackages = [ "." ];
+
# set the version. see: aws-vault's Makefile
buildFlagsArray = ''
-ldflags=
@@ -19,10 +20,10 @@ buildGoPackage rec {
'';
meta = with lib; {
- description = "A vault for securely storing and accessing AWS credentials in development environments";
+ description =
+ "A vault for securely storing and accessing AWS credentials in development environments";
homepage = "https://github.com/99designs/aws-vault";
license = licenses.mit;
maintainers = with maintainers; [ zimbatm ];
};
-
}
diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix
index 9a6b512ce1f..69e0a2afe6e 100644
--- a/pkgs/tools/admin/azure-cli/default.nix
+++ b/pkgs/tools/admin/azure-cli/default.nix
@@ -1,12 +1,12 @@
{ stdenv, lib, python, fetchFromGitHub, installShellFiles }:
let
- version = "2.0.81";
+ version = "2.1.0";
src = fetchFromGitHub {
owner = "Azure";
repo = "azure-cli";
rev = "azure-cli-${version}";
- sha256 = "1fpdc59qqkx9s5aip62jzcky92fhlbvc97hi1x047sldh9ibp02n";
+ sha256 = "0f4wrqp9f4n4mk73ybx08ybvmxx88r6g5cvx8ld6ybhl2w8bbn9v";
};
# put packages that needs to be overriden in the py package scope
diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix
index 4cf0a5d3554..2ac74a16edd 100644
--- a/pkgs/tools/admin/azure-cli/python-packages.nix
+++ b/pkgs/tools/admin/azure-cli/python-packages.nix
@@ -119,11 +119,14 @@ let
azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.4.0" "zip"
"1b69rz9wm0jvc54vx3b7h633x8gags51xwxrkp6myar40jggxw6g";
- azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.5.0" "zip"
- "0jhq8fi3dn2cncyv2rrgr4kldd254f30zgwf6p85rdgvg2p9k4hl";
+ azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.6.0" "zip"
+ "13s2k4jl8570bj6jkqzm0w29z29rl7h5i7czd3kr6vqar5wj9xjd";
- azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "6.0.0" "zip"
- "08n6r6ja7p20qlhb9pp51nwwxz2mal19an98zry276i8z5x8ckp0";
+ azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "8.0.1" "zip"
+ "0gngm7w17r5922ji11pnpa6gp5vh5z6la025v9cda6smsnx0fxx7";
+
+ azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "0.4.0" "zip"
+ "1dn5585nsizszjivx6lp677ka0mrg0ayqgag4yzfdz9ml8mj1xl5";
azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "10.0.0" "zip"
"1s3bx6knxw5dxycp43yimvgrh0i19drzd09asglcwz2x5mr3bpyg";
@@ -161,8 +164,8 @@ let
azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "2.1.0" "zip"
"1l55py4fzzwhxlmnwa41gpmqk9v2ncc79w7zq11sm9a5ynrv2c1p";
- azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "7.0.0" "zip"
- "0ss5yc9k3dh78lb88nfh3z98yz1pcd8d7d7cfjlxmv4n3dlr1kij";
+ azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "9.0.0" "zip"
+ "12bsdbh37xiz42hvrp8ghszyqkiali3pk50x44f3aip12pgx6kix";
azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "1.1.1" "zip"
"16wk0ksycrscsn3n14qk4vvf7i567vq6f96lwf5dwbc81wx6n32x";
@@ -194,11 +197,11 @@ let
azure-mgmt-relay = overrideAzureMgmtPackage super.azure-mgmt-relay "0.1.0" "zip"
"1jss6qhvif8l5s0lblqw3qzijjf0h88agciiydaa7f4q577qgyfr";
- azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "2.6.0" "zip"
- "1nnp2ki4iz4f4897psmwb0v5khrwh84fgxja7nl7g73g3ym20sz8";
+ azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "3.0.0" "zip"
+ "05c6isg13dslds94kv28v6navxj4bp4c5lsd9df0g3ndsxvpdrxp";
- azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "1.1.0" "zip"
- "16a0d3j5dilbp7pd7gbwf8jr46vzbjim1p9alcmisi12m4km7885";
+ azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "2.1.0" "zip"
+ "1ikv8b2h1r91fa0srz95ymn54qpqgb5a4faxwp4hf92r5h85c8j9";
azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "4.0.0" "zip"
"0aphqh4mvrc1yiyis8zvks0d19d1m3lqylr9jc8fj73iw84rwgm5";
@@ -218,8 +221,8 @@ let
azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.52.0" "zip"
"0357laxgldb7lvvws81r8xb6mrq9dwwnr1bnwdnyj4bw6p21i9hn";
- azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "7.1.0" "zip"
- "03yjvw1dwkwsadsv60i625mr9zpdryy7ywvh7p8fg60djszh1p5l";
+ azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "7.2.0" "zip"
+ "01ck1ankgr9ikvfghhdcs777yrl2j2p8cw9q8nfdrjp22lpchabl";
azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.4.0" "zip"
"1x18grkjf2p2r1ihlwv607sna9yjvsr2jwnkjc55askrgrwx5jx2";
diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 326d15a9318..95878ef09ab 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -21,18 +21,20 @@ let
sources = name: system: {
x86_64-darwin = {
url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
- sha256 = "10h0khh8npj2j5f7h3z86h46zbb1skbfs74firssich6jk7rx6km";
+ sha256 = "0hg4823dlnf9ahqh9dr05wsi6cdxn9mbwhg65jng3d2aws3ski6r";
};
x86_64-linux = {
url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
- sha256 = "182r9lgpks50ihcrkarc5w6l4rfmpdnx825lazamj5j2jsha73xw";
+ sha256 = "00ziqr60q1la716c9cy3hjpyq3hiw3m75d4wry6prn5655jw4ph6";
};
}.${system};
+ strip = if stdenv.isDarwin then "strip -x" else "strip";
+
in stdenv.mkDerivation rec {
pname = "google-cloud-sdk";
- version = "268.0.0";
+ version = "281.0.0";
src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system);
@@ -93,7 +95,7 @@ in stdenv.mkDerivation rec {
done
# strip the Cython gRPC library
- strip $out/google-cloud-sdk/lib/third_party/grpc/_cython/cygrpc.so
+ ${strip} $out/google-cloud-sdk/lib/third_party/grpc/_cython/cygrpc.so
'';
meta = with stdenv.lib; {
diff --git a/pkgs/tools/backup/wal-g/default.nix b/pkgs/tools/backup/wal-g/default.nix
index c6c47ce4f16..90ce2d188d6 100644
--- a/pkgs/tools/backup/wal-g/default.nix
+++ b/pkgs/tools/backup/wal-g/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "wal-g";
- version = "0.2.0";
+ version = "0.2.14";
src = fetchFromGitHub {
owner = "wal-g";
repo = "wal-g";
rev = "v${version}";
- sha256 = "08lk7by1anxpd9v97xbf9443kk4n1w63zaar2nz86w8i3k3b4id9";
+ sha256 = "0rrn9kzcg3nw9qvzy58m4qacghv0pj7iyjh4yspc71n5nkamkfgm";
};
buildInputs = [ brotli ];
@@ -16,11 +16,21 @@ buildGoPackage rec {
doCheck = true;
goPackagePath = "github.com/wal-g/wal-g";
+
+ goDeps = ./deps.nix;
+
+ subPackages = [ "main/pg" ];
+
+ buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/cmd/pg.WalgVersion=${version} -X ${goPackagePath}/cmd/pg.GitRevision=${src.rev}" ];
+
+ postInstall = ''
+ mv $bin/bin/pg $bin/bin/wal-g
+ '';
+
meta = {
- inherit (src.meta) homepage;
+ homepage = "https://github.com/wal-g/wal-g";
license = stdenv.lib.licenses.asl20;
- description = "An archival restoration tool for Postgres";
+ description = "An archival restoration tool for PostgreSQL";
maintainers = [ stdenv.lib.maintainers.ocharles ];
- broken = true;
};
}
diff --git a/pkgs/tools/backup/wal-g/deps.nix b/pkgs/tools/backup/wal-g/deps.nix
new file mode 100644
index 00000000000..13daf375c31
--- /dev/null
+++ b/pkgs/tools/backup/wal-g/deps.nix
@@ -0,0 +1,588 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
+[
+ {
+ goPackagePath = "cloud.google.com/go";
+ fetch = {
+ type = "git";
+ url = "https://code.googlesource.com/gocloud";
+ rev = "0ebda48a7f143b1cce9eb37a8c1106ac762a3430";
+ sha256 = "1kclgclwar3r37zbvb9gg3qxbgzkb50zk3s9778zlh2773qikmai";
+ };
+ }
+ {
+ goPackagePath = "github.com/Azure/azure-pipeline-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Azure/azure-pipeline-go";
+ rev = "232aee85e8e3a6223a11c0943f7df2ae0fac00e4";
+ sha256 = "1agn2nzmm1dkwggm4w7h4bnrav4n5jrl0vqbqy2s49vqlr8zirn6";
+ };
+ }
+ {
+ goPackagePath = "github.com/Azure/azure-storage-blob-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Azure/azure-storage-blob-go";
+ rev = "fc700035fe4a7020f50d49f420b3c088aed57e03";
+ sha256 = "00gsnk9s1rlrakqvcm917hn4r47jannxwp7rkhrb71pamzm46752";
+ };
+ }
+ {
+ goPackagePath = "github.com/BurntSushi/toml";
+ fetch = {
+ type = "git";
+ url = "https://github.com/BurntSushi/toml";
+ rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005";
+ sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
+ };
+ }
+ {
+ goPackagePath = "github.com/DataDog/zstd";
+ fetch = {
+ type = "git";
+ url = "https://github.com/DataDog/zstd";
+ rev = "aebefd9fcb99f22cd691ef778a12ed68f0e6a1ab";
+ sha256 = "06wphl43ji23c0cmmm6fd3wszbwq36mdp1jarak2a6hmxl6yf0b8";
+ };
+ }
+ {
+ goPackagePath = "github.com/RoaringBitmap/roaring";
+ fetch = {
+ type = "git";
+ url = "https://github.com/RoaringBitmap/roaring";
+ rev = "3d677d3262197ee558b85029301eb69b8239f91a";
+ sha256 = "0v5jbqr7m4x7n8rxcyizhs21ndyinn8kil9hd6y2bifx9b9g6gv9";
+ };
+ }
+ {
+ goPackagePath = "github.com/aws/aws-sdk-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/aws/aws-sdk-go";
+ rev = "02973e4916ed10f78aff1257f45f01d23907a05d";
+ sha256 = "0w5c06l0f8h77p74gmsp2wzl21pcn92yzsycd36746qqav83yyld";
+ };
+ }
+ {
+ goPackagePath = "github.com/cyberdelia/lzo";
+ fetch = {
+ type = "git";
+ url = "https://github.com/cyberdelia/lzo";
+ rev = "feb520148d8940294afb1e242dc1d2a7c9c34432";
+ sha256 = "0mk93b7vr9hp1xcvzaw5r01zs2blhk24m22pacf6sx5zwx8fd2ld";
+ };
+ }
+ {
+ goPackagePath = "github.com/davecgh/go-spew";
+ fetch = {
+ type = "git";
+ url = "https://github.com/davecgh/go-spew";
+ rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73";
+ sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
+ };
+ }
+ {
+ goPackagePath = "github.com/fsnotify/fsnotify";
+ fetch = {
+ type = "git";
+ url = "https://github.com/fsnotify/fsnotify";
+ rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
+ sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
+ };
+ }
+ {
+ goPackagePath = "github.com/glycerine/go-unsnap-stream";
+ fetch = {
+ type = "git";
+ url = "https://github.com/glycerine/go-unsnap-stream";
+ rev = "9f0cb55181dd3a0a4c168d3dbc72d4aca4853126";
+ sha256 = "1v10z30y9qc8dl34x0s8lr773g6raxilfdxbmzd1176pspzcmm9n";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-redis/redis";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-redis/redis";
+ rev = "75795aa4236dc7341eefac3bbe945e68c99ef9df";
+ sha256 = "1qf7zl5slnc4bcz0z0vn4fq1pwkphdrmqmjg3wv5q6pv2x29drli";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-sql-driver/mysql";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-sql-driver/mysql";
+ rev = "72cd26f257d44c1114970e19afddcd812016007e";
+ sha256 = "1fvsvwc1v2i0gqn01mynvi1shp5xm0xaym6xng09fcbqb56lbjx1";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/mock";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/mock";
+ rev = "51421b967af1f557f93a59e0057aaf15ca02e29c";
+ sha256 = "12ddj2g8ab87id6n2n67vnbhq6p8dvgsq1pzpqfriym4dk8w54fg";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/protobuf";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/protobuf";
+ rev = "6c65a5562fc06764971b7c5d05c76c75e84bdbf7";
+ sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/snappy";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/snappy";
+ rev = "2e65f85255dbc3072edf28d6b5b8efc472979f5a";
+ sha256 = "05w6mpc4qcy0pv8a2bzng8nf4s5rf5phfang4jwy9rgf808q0nxf";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/brotli";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/brotli";
+ rev = "d6d98957ca8ccb1ef45922e978bb10efca0ea541";
+ sha256 = "0n0ia2sxsj3fnnzhjbigbadpsqxivjs3v78b1xzqvgd1nwalglaj";
+ };
+ }
+ {
+ goPackagePath = "github.com/googleapis/gax-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/googleapis/gax-go";
+ rev = "bd5b16380fd03dc758d11cef74ba2e3bc8b0e8c2";
+ sha256 = "1lxawwngv6miaqd25s3ba0didfzylbwisd2nz7r4gmbmin6jsjrx";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/golang-lru";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/golang-lru";
+ rev = "7f827b33c0f158ec5dfbba01bb0b14a4541fd81d";
+ sha256 = "1p2igd58xkm8yaj2c2wxiplkf2hj6kxwrg6ss7mx61s5rd71v5xb";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/hcl";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/hcl";
+ rev = "8cb6e5b959231cc1119e43259c4a608f9c51a241";
+ sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66";
+ };
+ }
+ {
+ goPackagePath = "github.com/inconshreveable/mousetrap";
+ fetch = {
+ type = "git";
+ url = "https://github.com/inconshreveable/mousetrap";
+ rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
+ sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
+ };
+ }
+ {
+ goPackagePath = "github.com/jackc/pgx";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jackc/pgx";
+ rev = "c73e7d75061bb42b0282945710f344cfe1113d10";
+ sha256 = "1am1iggch89mn4a99bxnawjhc5yrgd8fjlmzq0b9l9qy5w1gzr1f";
+ };
+ }
+ {
+ goPackagePath = "github.com/jedib0t/go-pretty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jedib0t/go-pretty";
+ rev = "a37e1e030434d93557ca8a6a77b4cf9d31cc21ff";
+ sha256 = "057xwrrqq0cvyq9f0wnfzjpx10807520vl92qq7l7a7s0r56jyrx";
+ };
+ }
+ {
+ goPackagePath = "github.com/jmespath/go-jmespath";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jmespath/go-jmespath";
+ rev = "c2b33e84";
+ sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz";
+ };
+ }
+ {
+ goPackagePath = "github.com/magiconair/properties";
+ fetch = {
+ type = "git";
+ url = "https://github.com/magiconair/properties";
+ rev = "c2353362d570a7bfa228149c62842019201cfb71";
+ sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-ieproxy";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-ieproxy";
+ rev = "f9202b1cfdeb0c82ddd3dc1e8e9cd94b3c0c1b13";
+ sha256 = "0r8c17znlv32750qy3p96fbyp8ys8xfdccpzv0z9lr2y88jnzhpz";
+ };
+ }
+ {
+ goPackagePath = "github.com/minio/sio";
+ fetch = {
+ type = "git";
+ url = "https://github.com/minio/sio";
+ rev = "035b4ef8c449ba2ba21ec143c91964e76a1fb68c";
+ sha256 = "007mh7a61qzgf8ga4pix6qhm6jbph3h71a8iif7l45mvqphabh0z";
+ };
+ }
+ {
+ goPackagePath = "github.com/mitchellh/mapstructure";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mitchellh/mapstructure";
+ rev = "3536a929edddb9a5b34bd6861dc4a9647cb459fe";
+ sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr";
+ };
+ }
+ {
+ goPackagePath = "github.com/mschoch/smat";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mschoch/smat";
+ rev = "90eadee771aeab36e8bf796039b8c261bebebe4f";
+ sha256 = "141saq6d4z3c7v3jw45zy4gn6wwjlyralqygjff1fzvz1gkvimk3";
+ };
+ }
+ {
+ goPackagePath = "github.com/ncw/swift";
+ fetch = {
+ type = "git";
+ url = "https://github.com/ncw/swift";
+ rev = "f737f4e00462f79ff2e0ddbcfb09331ce7ec4fa9";
+ sha256 = "0c6vcn3dmhh339wilh71fmjb535kgfkf9dh2dh8ln43whq6mbjbs";
+ };
+ }
+ {
+ goPackagePath = "github.com/pelletier/go-toml";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pelletier/go-toml";
+ rev = "c01d1270ff3e442a8a57cddc1c92dc1138598194";
+ sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy";
+ };
+ }
+ {
+ goPackagePath = "github.com/philhofer/fwd";
+ fetch = {
+ type = "git";
+ url = "https://github.com/philhofer/fwd";
+ rev = "bb6d471dc95d4fe11e432687f8b70ff496cf3136";
+ sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2";
+ };
+ }
+ {
+ goPackagePath = "github.com/pierrec/lz4";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pierrec/lz4";
+ rev = "5a3d2245f97fc249850e7802e3c01fad02a1c316";
+ sha256 = "1my03x0m72vc2xyy9h0naa1qrzcf0g531gh4cakcwpxrq0z39vmr";
+ };
+ }
+ {
+ goPackagePath = "github.com/pierrec/xxHash";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pierrec/xxHash";
+ rev = "d17cb990ad2d219d5901415ceaeb50d17df59527";
+ sha256 = "07rbr0apyq9m8m2knf1j7g9299r2v2ihvig1b7bq2srszcd9r221";
+ };
+ }
+ {
+ goPackagePath = "github.com/pkg/errors";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pkg/errors";
+ rev = "ba968bfe8b2f7e042a574c888954fccecfa385b4";
+ sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
+ };
+ }
+ {
+ goPackagePath = "github.com/pmezard/go-difflib";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pmezard/go-difflib";
+ rev = "792786c7400a136282c1664665ae0a8db921c6c2";
+ sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/afero";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/afero";
+ rev = "f4711e4db9e9a1d3887343acb72b2bbfc2f686f5";
+ sha256 = "14qqj0cz6a595vn4dp747vddx05fd77jdsyl85qjmf9baymaxlam";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/cast";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/cast";
+ rev = "8c9545af88b134710ab1cd196795e7f2388358d7";
+ sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/cobra";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/cobra";
+ rev = "ef82de70bb3f60c65fb8eebacbb2d122ef517385";
+ sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/jwalterweatherman";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/jwalterweatherman";
+ rev = "94f6ae3ed3bceceafa716478c5fbf8d29ca601a1";
+ sha256 = "1ywmkwci5zyd88ijym6f30fj5c0k2yayxarkmnazf5ybljv50q7b";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/pflag";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/pflag";
+ rev = "298182f68c66c05229eb03ac171abe6e309ee79a";
+ sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/viper";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/viper";
+ rev = "6d33b5a963d922d182c91e8a1c88d81fd150cfd4";
+ sha256 = "1190mg04718r03qriav99sf4kx2n7wdgr8vdni15f74bpbzrdjrl";
+ };
+ }
+ {
+ goPackagePath = "github.com/stretchr/testify";
+ fetch = {
+ type = "git";
+ url = "https://github.com/stretchr/testify";
+ rev = "221dbe5ed46703ee255b1da0dec05086f5035f62";
+ sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb";
+ };
+ }
+ {
+ goPackagePath = "github.com/tinsane/tracelog";
+ fetch = {
+ type = "git";
+ url = "https://github.com/tinsane/tracelog";
+ rev = "05cb843fbac1d7693bbbbed8aa8f7b401438ee7f";
+ sha256 = "1fry633qi4iih9za91m90c26p3qpd79d716dggk10cbc0bpvql51";
+ };
+ }
+ {
+ goPackagePath = "github.com/tinylib/msgp";
+ fetch = {
+ type = "git";
+ url = "https://github.com/tinylib/msgp";
+ rev = "b2b6a672cf1e5b90748f79b8b81fc8c5cf0571a1";
+ sha256 = "0pypfknghg1hcjjrqz3f1riaylk6hcxn9h0qyzynb74rp0qmlxjc";
+ };
+ }
+ {
+ goPackagePath = "github.com/ulikunitz/xz";
+ fetch = {
+ type = "git";
+ url = "https://github.com/ulikunitz/xz";
+ rev = "590df8077fbcb06ad62d7714da06c00e5dd2316d";
+ sha256 = "07mivr4aiw3b8qzwajsxyjlpbkf3my4xx23lv0yryc4pciam5lhy";
+ };
+ }
+ {
+ goPackagePath = "github.com/wal-g/storages";
+ fetch = {
+ type = "git";
+ url = "https://github.com/wal-g/storages";
+ rev = "ecd376af8972cd9c3e355831c126a7862de6b2b9";
+ sha256 = "1jmvin93811xxh9sqf6xrrys55dm12zszqf2l3arf92h0bysvniy";
+ };
+ }
+ {
+ goPackagePath = "github.com/willf/bitset";
+ fetch = {
+ type = "git";
+ url = "https://github.com/willf/bitset";
+ rev = "e553b05586428962bf7058d1044519d87ca72d74";
+ sha256 = "0davmxzv79qqg7lkj89diqinqx3xkr94d67yfnazqn3h1f7sjkd1";
+ };
+ }
+ {
+ goPackagePath = "go.opencensus.io";
+ fetch = {
+ type = "git";
+ url = "https://github.com/census-instrumentation/opencensus-go";
+ rev = "9c377598961b706d1542bd2d84d538b5094d596e";
+ sha256 = "05jr8gkr2w34i5wwki4zhl5ch0qrgi7cdgag5iy5gpxplhbrvbg9";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/crypto";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/crypto";
+ rev = "e657309f52e71501f9934566ac06dc5c2f7f11a1";
+ sha256 = "17jwkjrfj7kz25z8z492xlz88nmb42kpjcxl9dsv5jl28zvzq1bj";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/exp";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/exp";
+ rev = "ec7cb31e5a562f5e9e31b300128d2f530f55d127";
+ sha256 = "19b4kdwfahq9f809v4lmn9h47sq1y67nkl7csnracn5qd334hp06";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/lint";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/lint";
+ rev = "959b441ac422379a43da2230f62be024250818b0";
+ sha256 = "1mgcv5f00pkzsbwnq2y7vqvd1b4lr5a3s47cphh2qv4indfk7pck";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/net";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/net";
+ rev = "74dc4d7220e7acc4e100824340f3e66577424772";
+ sha256 = "0563yswwqknxx2gsvl0qikn0lmwalilbng8i12iw4d3v40n23s0l";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/oauth2";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/oauth2";
+ rev = "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33";
+ sha256 = "06jwpvx0x2gjn2y959drbcir5kd7vg87k0r1216abk6rrdzzrzi2";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sync";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sync";
+ rev = "42b317875d0fa942474b76e1b46a6060d720ae6e";
+ sha256 = "0mrjhk7al7yyh76x9flvxy4jm5jyqh2fxbxagpaazxn1xdgkaif3";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sys";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sys";
+ rev = "4d1cda033e0619309c606fc686de3adcf599539e";
+ sha256 = "1wgaldbnkmh568v8kkgvnmkskaj96fqrbzhx23yji2kh1432q6gh";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/text";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/text";
+ rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0";
+ sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/time";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/time";
+ rev = "85acf8d2951cb2a3bde7632f9ff273ef0379bcbd";
+ sha256 = "0yqnxsrarjk4qkda8kcxzmk7y90kkkxzx9iwryzrk7bzs87ky3xc";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/tools";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/tools";
+ rev = "fc82fb2afd64396b05ea9aa0bccd6e8f2257b154";
+ sha256 = "1rnpbhhcnv28k63m7biv2rxrmdxhz9q3p35qi0phcq2qhcf78032";
+ };
+ }
+ {
+ goPackagePath = "google.golang.org/api";
+ fetch = {
+ type = "git";
+ url = "https://code.googlesource.com/google-api-go-client";
+ rev = "feb0267beb8644f5088a03be4d5ec3f8c7020152";
+ sha256 = "1lzdzkd2i41v6amxs9jah1q44qbvf1yvm8906jpfjiq6c3ffhqss";
+ };
+ }
+ {
+ goPackagePath = "google.golang.org/appengine";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/appengine";
+ rev = "4a4468ece617fc8205e99368fa2200e9d1fad421";
+ sha256 = "13cyhqwmvc2nia4ssdwwdzscq52aj3z9zjikx17wk4kb0j8vr370";
+ };
+ }
+ {
+ goPackagePath = "google.golang.org/genproto";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/go-genproto";
+ rev = "24fa4b261c55da65468f2abfdae2b024eef27dfb";
+ sha256 = "109zhaqlfd8zkbr1hk6zqbs6vcxfrk64scjwh2nswph05gr0m84d";
+ };
+ }
+ {
+ goPackagePath = "google.golang.org/grpc";
+ fetch = {
+ type = "git";
+ url = "https://github.com/grpc/grpc-go";
+ rev = "6eaf6f47437a6b4e2153a190160ef39a92c7eceb";
+ sha256 = "1cn33r2gclmq2v1ndpf1n5bmhf2qs8mms7ii5cnl6f9ch4r2c4k3";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/yaml.v2";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-yaml/yaml";
+ rev = "51d6538a90f86fe93ac480b35f37b2be17fef232";
+ sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
+ };
+ }
+ {
+ goPackagePath = "honnef.co/go/tools";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dominikh/go-tools";
+ rev = "72554cb117ad340748b3093e7108983fd984c9f2";
+ sha256 = "1vndpwg797z2gw9h9378iq99aqy7nalqx82lgvcsaqnkypdmppnd";
+ };
+ }
+]
\ No newline at end of file
diff --git a/pkgs/tools/bluetooth/bluez-alsa/default.nix b/pkgs/tools/bluetooth/bluez-alsa/default.nix
index 7db28b581e2..326366f4f0d 100644
--- a/pkgs/tools/bluetooth/bluez-alsa/default.nix
+++ b/pkgs/tools/bluetooth/bluez-alsa/default.nix
@@ -13,13 +13,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "bluez-alsa";
- version = "2.0.0";
+ version = "2.1.0";
src = fetchFromGitHub {
owner = "Arkq";
repo = "bluez-alsa";
rev = "v${version}";
- sha256 = "08mppgnjf1j2733bk9yf0cny6rfxxwiys0s62lz2zd2lpdl6d9lz";
+ sha256 = "112dfqxc144a61jqil2s3181gngfw5vz7yy10ml4f5a1nd90qnci";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
diff --git a/pkgs/tools/compression/lbzip2/default.nix b/pkgs/tools/compression/lbzip2/default.nix
index 7e9cc055abf..99d41c06ec6 100644
--- a/pkgs/tools/compression/lbzip2/default.nix
+++ b/pkgs/tools/compression/lbzip2/default.nix
@@ -1,13 +1,23 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub, gnulib, perl, autoconf, automake }:
stdenv.mkDerivation rec {
- name = "lbzip2-2.5";
+ version = "2.5";
+ name = "lbzip2-${version}";
- src = fetchurl {
- url = "http://archive.lbzip2.org/${name}.tar.gz";
- sha256 = "1sahaqc5bw4i0iyri05syfza4ncf5cml89an033fspn97klmxis6";
+ src = fetchFromGitHub {
+ owner = "kjn";
+ repo = "lbzip2";
+ sha256 = "1h321wva6fp6khz6x0i6rqb76xh327nw6v5jhgjpcckwdarj5jv8";
+ rev = "v${version}";
};
+ buildInputs = [ gnulib perl ];
+ nativeBuildInputs = [ autoconf automake ];
+
+ preConfigure = ''
+ ./build-aux/autogen.sh
+ '';
+
meta = with stdenv.lib; {
homepage = "https://github.com/kjn/lbzip2"; # Formerly http://lbzip2.org/
description = "Parallel bzip2 compression utility";
diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index db5c469e63b..dad032073c0 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -15,10 +15,10 @@ let
# The command
# find /nix/store/...-glusterfs-.../ -name '*.py' -executable
# can help with finding new Python scripts.
- version = "7.2";
+ version = "7.3";
name="${baseName}-${version}";
url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz";
- sha256 = "0v333q217rvgh6bnmq4bcafkjz2gq0p4xqmxd3carkyl1zyyp8q5";
+ sha256 = "08g8394vk88cb71z4k5sknld1nsd20f4mk2yyjvdp1hwm97z12pq";
};
buildInputs = [
diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix
index d5656db29a7..3d1e2114196 100644
--- a/pkgs/tools/graphics/gifski/default.nix
+++ b/pkgs/tools/graphics/gifski/default.nix
@@ -2,25 +2,22 @@
rustPlatform.buildRustPackage rec {
pname = "gifski";
- version = "0.9.1";
+ version = "0.10.2";
src = fetchFromGitHub {
owner = "ImageOptim";
repo = "gifski";
rev = version;
- sha256 = "0dl5725imb2a2s0fskdqlnh2207ryyi2v5gz37cr5mf6khz898p2";
+ sha256 = "0gsk1pagg89q1mi3d28q6dsnanncwphw9lrb7qybppw0vyvqlqbx";
};
- # Delete this on next update; see #79975 for details
- legacyCargoFetcher = true;
-
- cargoSha256 = "0wngsd0pmmxlwzxmyp8pvphh1ijs5s9k1mkkv688xpc4b8w0z10j";
+ cargoSha256 = "0k7pzcll7hn2a354vviyj8dr0kq63cwsldgv303kwklmxji02d0v";
nativeBuildInputs = [ pkgconfig ];
meta = with stdenv.lib; {
description = "GIF encoder based on libimagequant (pngquant)";
- homepage = https://gif.ski/;
+ homepage = "https://gif.ski/";
license = licenses.agpl3;
maintainers = [ maintainers.marsam ];
};
diff --git a/pkgs/tools/graphics/imageworsener/default.nix b/pkgs/tools/graphics/imageworsener/default.nix
new file mode 100644
index 00000000000..7c3d8931700
--- /dev/null
+++ b/pkgs/tools/graphics/imageworsener/default.nix
@@ -0,0 +1,41 @@
+{ stdenv
+, fetchurl
+, zlib
+, libpng
+, libjpeg
+, libwebp
+}:
+
+stdenv.mkDerivation rec {
+ pname = "imageworsener";
+ version = "1.3.3";
+
+ src = fetchurl {
+ url = "https://entropymine.com/${pname}/${pname}-${version}.tar.gz";
+ sha256 = "099ymaqk7gj0plmdx7fxabbdx2n03d25r00ly0vf6cx37mgnwjvw";
+ };
+
+ postPatch = ''
+ patchShebangs tests/runtest
+ '';
+
+ postInstall = ''
+ mkdir -p $out/share/doc/imageworsener
+ cp readme.txt technical.txt $out/share/doc/imageworsener
+ '';
+
+ buildInputs = [ zlib libpng libjpeg libwebp ];
+
+ doCheck = true;
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "A raster image scaling and processing utility";
+ homepage = https://entropymine.com/imageworsener/;
+ changelog = "https://github.com/jsummers/${pname}/blob/${version}/changelog.txt";
+ license = licenses.mit;
+ maintainers = with maintainers; [ emily ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix
index 9de7603c973..b67e71c0fdf 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
postPatch = /* CVE-2005-2471, from Arch */ ''
substituteInPlace converter/other/pstopnm.c \
- --replace '"-DSAFER"' '"-DPARANOIDSAFER"'
+ --replace '"-dSAFER"' '"-dPARANOIDSAFER"'
'';
buildInputs =
diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index 4951074bc43..644fd5eef3b 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -51,13 +51,13 @@ in
stdenv.mkDerivation rec {
pname = "ibus";
- version = "1.5.21";
+ version = "1.5.22";
src = fetchFromGitHub {
owner = "ibus";
repo = "ibus";
rev = version;
- sha256 = "0fjbqj7d2g5c8i1wdggzhz269xisxv4xb1pa9swalm5p2b2vrjlx";
+ sha256 = "09ynn7gq84q18hhbg6wq2yrliwil42qbzxbwbpggry1s955jg5xb";
};
patches = [
diff --git a/pkgs/tools/misc/codebraid/default.nix b/pkgs/tools/misc/codebraid/default.nix
new file mode 100644
index 00000000000..bc4a7084cdd
--- /dev/null
+++ b/pkgs/tools/misc/codebraid/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, python3Packages, fetchFromGitHub }:
+
+python3Packages.buildPythonApplication rec {
+ pname = "codebraid";
+ version = "0.5.0-unstable-2019-12-11";
+
+ src = fetchFromGitHub {
+ owner = "gpoore";
+ repo = pname;
+ rev = "fac1b29";
+ sha256 = "0ldfrkkip7i1fdyz1iydyik3mhm0xv0jvxnl37r7g707dl38vf3h";
+ };
+
+ propagatedBuildInputs = with python3Packages; [ bespon ];
+ # unfortunately upstream doesn't contain tests
+ checkPhase = ''
+ $out/bin/codebraid --help > /dev/null
+ '';
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/gpoore/codebraid";
+ description = ''
+ Live code in Pandoc Markdown.
+
+ Codebraid is a Python program that enables executable code in Pandoc
+ Markdown documents. Using Codebraid can be as simple as adding a class to
+ your code blocks' attributes, and then running codebraid rather than
+ pandoc to convert your document from Markdown to another format.
+ codebraid supports almost all of pandoc's options and passes them to
+ pandoc internally.
+
+ Codebraid provides two options for executing code. It includes a built-in
+ code execution system that currently supports Python 3.5+, Julia, Rust,
+ R, Bash, and JavaScript. Code can also be executed using Jupyter kernels,
+ with support for rich output like plots.
+ '';
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ synthetica ];
+ };
+}
diff --git a/pkgs/tools/misc/colorz/default.nix b/pkgs/tools/misc/colorz/default.nix
new file mode 100644
index 00000000000..aadd050dae2
--- /dev/null
+++ b/pkgs/tools/misc/colorz/default.nix
@@ -0,0 +1,24 @@
+{ lib, python3Packages }:
+
+python3Packages.buildPythonApplication rec {
+ pname = "colorz";
+ version = "1.0.3";
+
+ src = python3Packages.fetchPypi {
+ inherit pname version;
+ sha256 = "0ghd90lgplf051fs5n5bb42zffd3fqpgzkbv6bhjw7r8jqwgcky0";
+ };
+
+ propagatedBuildInputs = with python3Packages; [ pillow scipy ];
+
+ checkPhase = ''
+ $out/bin/colorz --help > /dev/null
+ '';
+
+ meta = with lib; {
+ description = "Color scheme generator";
+ homepage = "https://github.com/metakirby5/colorz";
+ license = licenses.mit;
+ maintainers = with maintainers; [ skykanin ];
+ };
+}
diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix
index 3f6988f1f65..e769cb25a73 100644
--- a/pkgs/tools/misc/coreboot-utils/default.nix
+++ b/pkgs/tools/misc/coreboot-utils/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, zlib, pciutils, coreutils, acpica-tools, iasl, makeWrapper, gnugrep, gnused, file, buildEnv }:
let
- version = "4.10";
+ version = "4.11";
meta = with stdenv.lib; {
description = "Various coreboot-related tools";
@@ -16,7 +16,7 @@ let
src = fetchurl {
url = "https://coreboot.org/releases/coreboot-${version}.tar.xz";
- sha256 = "1jsiz17afi2lqg1jv6lsl8s05w7vr7iwgg86y2qp369hcz6kcwfa";
+ sha256 = "11xdm2c1blaqb32j98085sak78jldsw0xhrkzqs5b8ir9jdqbzcp";
};
enableParallelBuilding = true;
diff --git a/pkgs/tools/misc/datamash/default.nix b/pkgs/tools/misc/datamash/default.nix
index 18e80ab6e4a..f66f2b97d14 100644
--- a/pkgs/tools/misc/datamash/default.nix
+++ b/pkgs/tools/misc/datamash/default.nix
@@ -2,16 +2,16 @@
stdenv.mkDerivation rec {
pname = "datamash";
- version = "1.5";
+ version = "1.6";
src = fetchurl {
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
- sha256 = "1b91pbdarnfmbhid8aa2f50k0fln8n7pg62782b4y0jlzvaljqi2";
+ sha256 = "1jvqxcyh0aghnqh3m2rk5av1x0038flcmfzd493vasv1k69vgfdr";
};
meta = with stdenv.lib; {
description = "A command-line program which performs basic numeric,textual and statistical operations on input textual data files";
- homepage = https://www.gnu.org/software/datamash/;
+ homepage = "https://www.gnu.org/software/datamash/";
license = licenses.gpl3Plus;
platforms = platforms.all;
maintainers = with maintainers; [ pSub vrthra ];
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 12e6e1af93a..9273d82455d 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -9,11 +9,11 @@
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
python3Packages.buildPythonApplication rec {
pname = "diffoscope";
- version = "136";
+ version = "137";
src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
- sha256 = "0an9c63xgy1bvqnpnn9mfphsq1qx8ba69yk15nqa9p78iqq2hf4h";
+ sha256 = "1qa508nlqvz0s0cd6jk5c8m43kqfx1h2mgx50iphy4y0spnyv946";
};
patches = [
@@ -69,9 +69,9 @@ python3Packages.buildPythonApplication rec {
diffoscope is developed as part of the "reproducible builds" Debian
project and was formerly known as "debbindiff".
'';
- homepage = https://wiki.debian.org/ReproducibleBuilds;
+ homepage = "https://diffoscope.org/";
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ dezgeg ];
+ maintainers = with maintainers; [ dezgeg ma27 ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix
index 143bc805dec..3b9e600dcdb 100644
--- a/pkgs/tools/misc/flashrom/default.nix
+++ b/pkgs/tools/misc/flashrom/default.nix
@@ -1,4 +1,13 @@
-{ lib, stdenv, fetchurl, pkgconfig, libftdi, pciutils }:
+{ lib
+, stdenv
+, fetchurl
+, meson
+, ninja
+, pkgconfig
+, libftdi1
+, libusb1
+, pciutils
+}:
stdenv.mkDerivation rec {
pname = "flashrom";
@@ -9,23 +18,16 @@ stdenv.mkDerivation rec {
sha256 = "0ax4kqnh7kd3z120ypgp73qy1knz47l6qxsqzrfkd97mh5cdky71";
};
- # Newer versions of libusb deprecate some API flashrom uses.
- #postPatch = ''
- # substituteInPlace Makefile \
- # --replace "-Werror" "-Werror -Wno-error=deprecated-declarations -Wno-error=unused-const-variable="
- #'';
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ libftdi pciutils ];
-
- preConfigure = "export PREFIX=$out";
+ nativeBuildInputs = [ meson pkgconfig ninja ];
+ buildInputs = [ libftdi1 libusb1 pciutils ];
meta = with lib; {
homepage = http://www.flashrom.org;
description = "Utility for reading, writing, erasing and verifying flash ROM chips";
license = licenses.gpl2;
maintainers = with maintainers; [ funfunctor fpletz ];
- platforms = with platforms; linux;
+ platforms = platforms.all;
+ # https://github.com/flashrom/flashrom/issues/125
badPlatforms = [ "aarch64-linux" ];
};
}
diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix
index 042ed2b0334..f25c095dade 100644
--- a/pkgs/tools/misc/fluent-bit/default.nix
+++ b/pkgs/tools/misc/fluent-bit/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fluent-bit";
- version = "1.3.7";
+ version = "1.3.8";
src = fetchFromGitHub {
owner = "fluent";
repo = "fluent-bit";
rev = "v${version}";
- sha256 = "1j0fzhakk4kpfpq4p4c0byw99adxd9w7irfn83rlvw8bw32j2lrj";
+ sha256 = "1b14hm809zy4idg8p2ah1sg4pgzqyy459mlf7rfc2msvf716sicr";
};
nativeBuildInputs = [ cmake flex bison ];
diff --git a/pkgs/tools/misc/fx_cast/default.nix b/pkgs/tools/misc/fx_cast/default.nix
new file mode 100644
index 00000000000..5fa57e830d2
--- /dev/null
+++ b/pkgs/tools/misc/fx_cast/default.nix
@@ -0,0 +1,85 @@
+{ stdenv, fetchurl, dpkg }:
+
+stdenv.mkDerivation rec {
+ pname = "fx_cast_bridge";
+ version = "0.0.5";
+
+ src = fetchurl {
+ url = "https://github.com/hensm/fx_cast/releases/download/v${version}/${pname}-${version}-x64.deb";
+ sha256 = "1qmp1d7miq7c2q8i4bhfp5ywxdngvyi7rjl6i82is2g5nhr7gbvv";
+ };
+
+ nativeBuildInputs = [ dpkg ];
+
+ unpackPhase = ''
+ runHook preUnpack
+ dpkg-deb -xv $src ./
+ runHook postUnpack
+ '';
+
+ dontBuild = true;
+ dontPatchELF = true;
+
+ installPhase = ''
+ install -DT {opt/fx_cast,$out/bin}/${pname}
+ install -DT {usr,$out}/lib/mozilla/native-messaging-hosts/${pname}.json
+
+ substituteInPlace $out/lib/mozilla/native-messaging-hosts/${pname}.json \
+ --replace {/opt/fx_cast,$out/bin}/${pname}
+ '';
+
+ # See now-cli/default.nix
+ dontStrip = true;
+ preFixup = let
+ libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc stdenv.cc.libc];
+ bin = "$out/bin/${pname}";
+ in ''
+
+ orig_size=$(stat --printf=%s ${bin})
+
+ patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" ${bin}
+ patchelf --set-rpath ${libPath} ${bin}
+ chmod +x ${bin}
+
+ new_size=$(stat --printf=%s ${bin})
+
+ ###### zeit-pkg fixing starts here.
+ # we're replacing plaintext js code that looks like
+ # PAYLOAD_POSITION = '1234 ' | 0
+ # [...]
+ # PRELUDE_POSITION = '1234 ' | 0
+ # ^-----20-chars-----^^------22-chars------^
+ # ^-- grep points here
+ #
+ # var_* are as described above
+ # shift_by seems to be safe so long as all patchelf adjustments occur
+ # before any locations pointed to by hardcoded offsets
+
+ var_skip=20
+ var_select=22
+ shift_by=$(expr $new_size - $orig_size)
+
+ function fix_offset {
+ # $1 = name of variable to adjust
+ location=$(grep -obUam1 "$1" ${bin} | cut -d: -f1)
+ location=$(expr $location + $var_skip)
+
+ value=$(dd if=${bin} iflag=count_bytes,skip_bytes skip=$location \
+ bs=1 count=$var_select status=none)
+ value=$(expr $shift_by + $value)
+
+ echo -n $value | dd of=${bin} bs=1 seek=$location conv=notrunc
+ }
+
+ fix_offset PAYLOAD_POSITION
+ fix_offset PRELUDE_POSITION
+
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Implementation of the Chrome Sender API (Chromecast) within Firefox";
+ homepage = https://hensm.github.io/fx_cast/;
+ license = licenses.mit;
+ maintainers = with maintainers; [ dtzWill ];
+ };
+}
diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix
index e331e43956e..48b471e3b40 100644
--- a/pkgs/tools/misc/graylog/default.nix
+++ b/pkgs/tools/misc/graylog/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "graylog";
- version = "3.2.0";
+ version = "3.2.1";
src = fetchurl {
url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
- sha256 = "128hlk2m7dy1ajvxkkazbi2npx738jfrkkznvmhyxm0hllcw4r9z";
+ sha256 = "1pilksik3bbd4sgmnpns9gg9sddybzxzxkn9sknn40dav08k1x6h";
};
dontBuild = true;
diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index 3f5485718dc..3eec453824d 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -83,12 +83,9 @@ stdenv.mkDerivation rec {
unset CPP # setting CPP intereferes with dependency calculation
- cp -r ${gnulib} $PWD/gnulib
- chmod u+w -R $PWD/gnulib
-
patchShebangs .
- ./bootstrap --no-git --gnulib-srcdir=$PWD/gnulib
+ ./bootstrap --no-git --gnulib-srcdir=${gnulib}
substituteInPlace ./configure --replace '/usr/share/fonts/unifont' '${unifont}/share/fonts'
'';
diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix
index 4bc690bc45f..9a41f5e857a 100644
--- a/pkgs/tools/misc/ostree/default.nix
+++ b/pkgs/tools/misc/ostree/default.nix
@@ -37,13 +37,13 @@ let
]));
in stdenv.mkDerivation rec {
pname = "ostree";
- version = "2019.6";
+ version = "2020.2";
outputs = [ "out" "dev" "man" "installedTests" ];
src = fetchurl {
url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz";
- sha256 = "1bhrfbjna3rnymijxagzkdq2zl74g71s2xmimihjhvcw2zybi0jl";
+ sha256 = "0bbk0sg4m38g7j00hy358p2azxas87minpgz3avwma6jsylj1qjg";
};
patches = [
@@ -52,12 +52,6 @@ in stdenv.mkDerivation rec {
# Patch from https://github.com/ostreedev/ostree/pull/1633
./01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch
- # Fix tests running in Catalan instead of C locale.
- (fetchpatch {
- url = "https://github.com/ostreedev/ostree/commit/5135a1e58ade2bfafc8c1fda359540eafd72531e.patch";
- sha256 = "1crzaagw1zzx8v6rsnxb9jnc3ij9hlpvdl91w3skqdm28adx7yx8";
- })
-
# Workarounds for https://github.com/ostreedev/ostree/issues/1592
./fix-1592.patch
@@ -119,9 +113,14 @@ in stdenv.mkDerivation rec {
"installed_test_metadir=${placeholder "installedTests"}/share/installed-tests/libostree"
];
- postFixup = ''
+ postFixup = let
+ typelibPath = stdenv.lib.makeSearchPath "/lib/girepository-1.0" [
+ (placeholder "out")
+ gobject-introspection
+ ];
+ in ''
for test in $installedTests/libexec/installed-tests/libostree/*.js; do
- wrapProgram "$test" --prefix GI_TYPELIB_PATH : "$out/lib/girepository-1.0"
+ wrapProgram "$test" --prefix GI_TYPELIB_PATH : "${typelibPath}"
done
'';
diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix
index b42be5b548c..34a6cb03d8b 100644
--- a/pkgs/tools/misc/plantuml/default.nix
+++ b/pkgs/tools/misc/plantuml/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, jre, graphviz }:
stdenv.mkDerivation rec {
- version = "1.2020.0";
+ version = "1.2020.1";
pname = "plantuml";
src = fetchurl {
url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
- sha256 = "1ibhyj51wib2d8q7zyjbzp65hqm0a1jczqwqdw3834zdmrb2v7bs";
+ sha256 = "02a55na86561fnxf6pk0cpg13mx8qr7pvigyp65rqks0f9ygj9ga";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix
index 550db58895d..1472b4ae72f 100644
--- a/pkgs/tools/misc/skim/default.nix
+++ b/pkgs/tools/misc/skim/default.nix
@@ -2,21 +2,18 @@
rustPlatform.buildRustPackage rec {
pname = "skim";
- version = "0.7.0";
+ version = "0.8.0";
src = fetchFromGitHub {
owner = "lotabout";
repo = pname;
rev = "v${version}";
- sha256 = "0is6zymvy673f1g466i3ayi4jawdl7pm9l3cbdxcw32h3snbkgqp";
+ sha256 = "0b0x389khdqyzdb6mwbf31wdfn8xila756hb11l555iwipl271ci";
};
outputs = [ "out" "vim" ];
- # Delete this on next update; see #79975 for details
- legacyCargoFetcher = true;
-
- cargoSha256 = "1dl530ac8i4wdw7lziskl7rhh3ak9ykcws3kpy64808kxg3b1jnz";
+ cargoSha256 = "0xcsj8wprp9r6s7r2d2fnbicrc5pfnnx1gxyrq2qkj3rwr1q8ndg";
patchPhase = ''
sed -i -e "s|expand(':h:h')|'$out'|" plugin/skim.vim
diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix
index 0c0820837f5..338452e213c 100644
--- a/pkgs/tools/misc/starship/default.nix
+++ b/pkgs/tools/misc/starship/default.nix
@@ -3,13 +3,13 @@
rustPlatform.buildRustPackage rec {
pname = "starship";
- version = "0.36.0";
+ version = "0.36.1";
src = fetchFromGitHub {
owner = "starship";
repo = pname;
rev = "v${version}";
- sha256 = "0vkp6yfafzyhilkk5rfvgka91gmhm9nrrvy3m6gdza4ayslmcpam";
+ sha256 = "1ip6jfnlw0maabvihzbmmka453njnw1yf7hq3fd89l6dx57315m5";
};
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
@@ -19,10 +19,7 @@ rustPlatform.buildRustPackage rec {
--replace "/bin/echo" "echo"
'';
- # Delete this on next update; see #79975 for details
- legacyCargoFetcher = true;
-
- cargoSha256 = "05q527bd5q6a7kd03hwic4bynyc4sipyvi0bf2g2jqxzcsmswyyk";
+ cargoSha256 = "16wsd8z4cfb5pplwfvwgi5qawwv8c0aa220wnvphplmgz8cpq35r";
checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root";
meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix
index 191d66a6de8..e0aba2724af 100644
--- a/pkgs/tools/misc/topgrade/default.nix
+++ b/pkgs/tools/misc/topgrade/default.nix
@@ -2,22 +2,21 @@
rustPlatform.buildRustPackage rec {
pname = "topgrade";
- version = "3.9.0";
+ version = "4.0.2";
src = fetchFromGitHub {
owner = "r-darwish";
repo = pname;
rev = "v${version}";
- sha256 = "0g9pb4f5skigyahv8kpx7wkvv625lvgnbqz6iq7j7wgixxf4nl1i";
+ sha256 = "0kkk718s65r3j5k3a3wz9p0q1v8rjz0yshmfwxak3aw99nj9yyvq";
};
- # Delete this on next update; see #79975 for details
- legacyCargoFetcher = true;
-
- cargoSha256 = "1y85hl7xl60vsj3ivm6pyd6bvk39wqg25bqxfx00r9myha94iqmd";
+ cargoSha256 = "1g6jzbmicyqnp0dkcbw7sa36b3qxag8f596mb47wq2fl25pg0d3x";
buildInputs = lib.optional stdenv.isDarwin Foundation;
+ # TODO: add manpage (topgrade.8) to postInstall on next update
+
meta = with lib; {
description = "Upgrade all the things";
homepage = "https://github.com/r-darwish/topgrade";
diff --git a/pkgs/tools/misc/trac/default.nix b/pkgs/tools/misc/trac/default.nix
index f41087ca3fd..1d0f9a5d828 100644
--- a/pkgs/tools/misc/trac/default.nix
+++ b/pkgs/tools/misc/trac/default.nix
@@ -16,12 +16,12 @@
buildPythonApplication rec {
pname = "trac";
- version = "1.4";
+ version = "1.4.1";
src = fetchPypi {
inherit version;
pname = "Trac";
- sha256 = "1cg51rg0vb9vf23wgn28z3szlxhwnxprj5m0mvibqyypi123bvx1";
+ sha256 = "0d61ypn0j9wb8119bj3pj7s8swfjykdl0sz398p92k9bvxh4dayz";
};
prePatch = ''
diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix
index 2e01059b736..92bcf98c919 100644
--- a/pkgs/tools/misc/vector/default.nix
+++ b/pkgs/tools/misc/vector/default.nix
@@ -1,6 +1,7 @@
{ stdenv, lib, fetchFromGitHub, rustPlatform
, openssl, pkg-config, protobuf
, Security, libiconv, rdkafka
+, tzdata
, features ?
(if stdenv.isAarch64
@@ -10,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "vector";
- version = "0.7.2";
+ version = "0.8.0";
src = fetchFromGitHub {
owner = "timberio";
repo = pname;
rev = "v${version}";
- sha256 = "1r6pqljrl0cqz5x09p6bmf4h52h8m02pg05a09idj86v0c0q6bw3";
+ sha256 = "0girph2icl95klwqh3ksyr7fwril2pyb2gmnphgxrs6bibp1a2ha";
};
- cargoSha256 = "1c742g7a4z5lhr991hxdhwk8h0d43r4vv5bxj80sf3lynyx60yzf";
+ cargoSha256 = "1f4c982i2r2y63h0a79nlwdwrp81ps93zan7a6ag5w7c4223ab5g";
buildInputs = [ openssl pkg-config protobuf rdkafka ]
++ stdenv.lib.optional stdenv.isDarwin [ Security libiconv ];
@@ -28,8 +29,7 @@ rustPlatform.buildRustPackage rec {
PROTOC_INCLUDE="${protobuf}/include";
cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
- # skip tests, too -- they don't respect the rdkafka flag...
- doCheck = false;
+ checkPhase = "TZDIR=${tzdata}/share/zoneinfo cargo test --no-default-features --features ${lib.concatStringsSep "," features},disable-resolv-conf -- --test-threads 1";
meta = with stdenv.lib; {
description = "A high-performance logs, metrics, and events router";
diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix
index 06eabec0618..a79540eaeca 100644
--- a/pkgs/tools/networking/amass/default.nix
+++ b/pkgs/tools/networking/amass/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "amass";
- version = "3.4.2";
+ version = "3.4.4";
src = fetchFromGitHub {
owner = "OWASP";
repo = "Amass";
rev = "v${version}";
- sha256 = "0mia01cqmaa17696m73qazpbyrcng7wldca79g46xgc4z96q1i7i";
+ sha256 = "1qr9cd22m6w5r32bsvg08bmvyvzz7agaklrghf8n1d23ijj1563p";
};
- modSha256 = "1zwm7skdhql6isffyhixqsgvcgxw2436iv8bj92cxs70ipk537v9";
+ modSha256 = "00pd0xi0m3w4xqdqq7ldqcpirq9plln45nhpjrsp5r9bz7yc5wn9";
outputs = [ "out" "wordlists" ];
diff --git a/pkgs/tools/networking/boringtun/default.nix b/pkgs/tools/networking/boringtun/default.nix
index 60a9469bced..59654501a39 100644
--- a/pkgs/tools/networking/boringtun/default.nix
+++ b/pkgs/tools/networking/boringtun/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "1mijy51hd8c4as9g4ivpfxismc9m5m3nhibfvclh3wrlcmp1ha9c";
};
- # Delete this on next update; see #79975 for details
- legacyCargoFetcher = true;
-
- cargoSha256 = "1gvmshwg9b486933vfgkg2r8nn6w6dyz42hqjy74p785fcg0v5hs";
+ cargoSha256 = "1kbbkbrfjff4yicwanydmcjr2av6s6wrsgafpvbh255vvkd7mr6x";
buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
diff --git a/pkgs/tools/networking/cassowary/default.nix b/pkgs/tools/networking/cassowary/default.nix
index bc1f9cebb42..6156f43b04b 100644
--- a/pkgs/tools/networking/cassowary/default.nix
+++ b/pkgs/tools/networking/cassowary/default.nix
@@ -1,21 +1,23 @@
-{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses, }:
+{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "cassowary";
- version = "0.3.0";
+ version = "0.7.0";
src = fetchFromGitHub {
owner = "rogerwelin";
repo = pname;
- rev = "33b7e81a5d147980f4ddc689818df2b071f6ab4e";
- sha256 = "01cdmh2v9rz8rna08hdsddllck6zp9wcrhxdy6hs77zfsbzyfflx";
+ rev = "v${version}";
+ sha256 = "0p5vcs25h5nj36dm9yjmdjymcq0zldm3zlqfppxcjx862h48k8zj";
};
modSha256 = "1iylnnmj5slji89pkb3shp4xqar1zbpl7bzwddbzpp8y52fmsv1c";
+ buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
+
meta = with lib; {
homepage = "https://github.com/rogerwelin/cassowary";
- description = "Modern cross-platform HTTP load-testing tool written in Go ";
+ description = "Modern cross-platform HTTP load-testing tool written in Go";
license = licenses.mit;
maintainers = with maintainers; [ hugoreeves ];
platforms = platforms.unix;
diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix
index 8dd18df28c7..7ee959905ce 100644
--- a/pkgs/tools/networking/eternal-terminal/default.nix
+++ b/pkgs/tools/networking/eternal-terminal/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "eternal-terminal";
- version = "6.0.5";
+ version = "6.0.6";
src = fetchFromGitHub {
owner = "MisterTea";
repo = "EternalTerminal";
rev = "et-v${version}";
- sha256 = "04jn0189vq5lc795izkxq1zdv9fnpxz2xchg2mm37armpz7n06id";
+ sha256 = "0vhhiccyvp9pjdmmscwdwcynxfwd2kgv418z90blnir0yfkvsryq";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/tools/networking/hey/default.nix b/pkgs/tools/networking/hey/default.nix
new file mode 100644
index 00000000000..d65d5c9e323
--- /dev/null
+++ b/pkgs/tools/networking/hey/default.nix
@@ -0,0 +1,22 @@
+{ buildGoModule, lib, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "hey";
+ version = "0.1.3";
+
+ src = fetchFromGitHub {
+ owner = "rakyll";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "06w5hf0np0ayvjnfy8zgy605yrs5j326nk2gm0fy7amhwx1fzkwv";
+ };
+
+ modSha256 = "0a00kcyagqczw0vhl8qs2xs1y8myw080y9kjs4qrcmj6kibdy55q";
+
+ meta = with lib; {
+ description = "HTTP load generator, ApacheBench (ab) replacement";
+ homepage = "https://github.com/rakyll/hey";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ filalex77 ];
+ };
+}
diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index 971d8e69686..3b968077095 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -9,13 +9,13 @@ assert upnpSupport -> miniupnpc != null;
stdenv.mkDerivation rec {
pname = "i2pd";
- version = "2.29.0";
+ version = "2.30.0";
src = fetchFromGitHub {
owner = "PurpleI2P";
repo = pname;
rev = version;
- sha256 = "1issg3aidwikk4g12sa8q81zzp0hd0g8wdy2dx4899z8yrscl300";
+ sha256 = "nGl7c5UY9kJPRaMveMF+aIf8T11WFrB//37oKzREdvM=";
};
buildInputs = with stdenv.lib; [ boost zlib openssl ]
diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix
index 4c8b926b582..afe37dc0770 100644
--- a/pkgs/tools/networking/libreswan/default.nix
+++ b/pkgs/tools/networking/libreswan/default.nix
@@ -6,7 +6,7 @@
let
optional = stdenv.lib.optional;
- version = "3.29";
+ version = "3.30";
name = "libreswan-${version}";
binPath = stdenv.lib.makeBinPath [
bash iproute iptables procps coreutils gnused gawk nss.tools which python
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://download.libreswan.org/${name}.tar.gz";
- sha256 = "0gmbb1m5in5dvnbk1n31r8myrdankzvi6yk9gcqbcwijyih423nn";
+ sha256 = "1bww4w5r6hx0xf9xdxvkfmcv7zyas58ls1mklk6k197kv2i0p24w";
};
# These flags were added to compile v3.18. Try to lift them when updating.
diff --git a/pkgs/tools/networking/netalyzr/default.nix b/pkgs/tools/networking/netalyzr/default.nix
deleted file mode 100644
index 969084582ae..00000000000
--- a/pkgs/tools/networking/netalyzr/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, jre, makeWrapper }:
-
-stdenv.mkDerivation {
- pname = "netalyzr";
- version = "57861";
-
- # unfortunately there is not a version specific download URL
- src = fetchurl {
- url = "http://netalyzr.icsi.berkeley.edu/NetalyzrCLI.jar";
- sha256 = "0fa3gvgp05p1nf1d711052wgvnp0xnvhj2h2bwk1mh1ih8qn50xb";
- };
-
- phases = [ "installPhase" ];
-
- nativeBuildInputs = [ makeWrapper ];
-
- installPhase = ''
- mkdir -p $out/{bin,share/netalyzr}
- install -m644 $src $out/share/netalyzr/NetalyzrCLI.jar
- makeWrapper ${stdenv.lib.getBin jre}/bin/java $out/bin/netalyzr \
- --add-flags "-jar $out/share/netalyzr/NetalyzrCLI.jar"
- '';
-
- meta = with stdenv.lib; {
- description = "Network debugging and analysis tool";
- homepage = http://netalyzr.icsi.berkeley.edu;
- maintainers = with maintainers; [ peterhoeg ];
- platforms = platforms.all;
- };
-}
diff --git a/pkgs/tools/networking/netifd/default.nix b/pkgs/tools/networking/netifd/default.nix
new file mode 100644
index 00000000000..38591f38fcf
--- /dev/null
+++ b/pkgs/tools/networking/netifd/default.nix
@@ -0,0 +1,28 @@
+{ runCommand, stdenv, cmake, fetchgit, libnl, libubox, uci, ubus, json_c }:
+
+stdenv.mkDerivation {
+ pname = "netifd";
+ version = "unstable-2020-01-18";
+
+ src = fetchgit {
+ url = "https://git.openwrt.org/project/netifd.git";
+ rev = "1321c1bd8fe921986c4eb39c3783ddd827b79543";
+ sha256 = "178pckyf1cydi6zzr4bmhksv8vyaks91zv9lqqd2z5nkmccl6vf3";
+ };
+
+ buildInputs = [ libnl libubox uci ubus json_c ];
+ nativeBuildInputs = [ cmake ];
+
+ preBuild = ''
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE \
+ -I$(echo "${stdenv.lib.getDev libnl}"/include/libnl*/)"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "OpenWrt Network interface configuration daemon";
+ homepage = "https://git.openwrt.org/?p=project/netifd.git;a=summary";
+ license = licenses.lgpl21;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ petabyteboy ];
+ };
+}
diff --git a/pkgs/tools/networking/nfdump/default.nix b/pkgs/tools/networking/nfdump/default.nix
index 0ae309cf94d..256bb824310 100644
--- a/pkgs/tools/networking/nfdump/default.nix
+++ b/pkgs/tools/networking/nfdump/default.nix
@@ -2,7 +2,7 @@
, autoconf, automake, libtool, pkg-config
, bzip2, libpcap, flex, yacc }:
-let version = "1.6.18"; in
+let version = "1.6.19"; in
stdenv.mkDerivation {
pname = "nfdump";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
owner = "phaag";
repo = "nfdump";
rev = "v${version}";
- sha256 = "0hfgj9lghkjrjxww0jdk8gxr6g4gbmbdmfg9ddg5jj6gcra21gha";
+ sha256 = "0idhg7pdkv602h0d0dz7msk8gsxz32ingn16dkqbxp4mgfiakp9r";
};
nativeBuildInputs = [ autoconf automake flex libtool pkg-config yacc ];
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
longDescription = ''
nfdump is a set of tools for working with netflow data.
'';
- homepage = https://github.com/phaag/nfdump;
+ homepage = "https://github.com/phaag/nfdump";
license = licenses.bsd3;
maintainers = [ maintainers.takikawa ];
platforms = platforms.unix;
diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix
index a0a65997414..ff01fc89f09 100644
--- a/pkgs/tools/networking/siege/default.nix
+++ b/pkgs/tools/networking/siege/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, openssl, zlib }:
stdenv.mkDerivation rec {
- name = "siege-4.0.4";
+ name = "siege-4.0.5";
src = fetchurl {
url = "http://download.joedog.org/siege/${name}.tar.gz";
- sha256 = "0vzaj5nzb0fir2a4l7ghv3wa5d1nk2ss8gmwjb6bjavjplccyzcg";
+ sha256 = "0c82h0idkvfbzspy7h6w97wyk671694nl1ir94zhzn54mw0p0jrv";
};
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
diff --git a/pkgs/tools/networking/termshark/default.nix b/pkgs/tools/networking/termshark/default.nix
index 3361127afed..35b92e0f653 100644
--- a/pkgs/tools/networking/termshark/default.nix
+++ b/pkgs/tools/networking/termshark/default.nix
@@ -2,19 +2,19 @@
buildGoModule rec {
pname = "termshark";
- version = "1.0.0";
+ version = "2.1.1";
src = fetchFromGitHub {
owner = "gcla";
repo = "termshark";
rev = "v${version}";
- sha256 = "1h9wysvd7i4vzn9qyswrmckmshxmh24ypvca98balkyhsxjwlb6j";
+ sha256 = "14h548apg3zvjvq6yy22hpw2ziy5vmwyr04vv59ls1mjg4qf2v8b";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ wireshark-cli ];
- modSha256 = "09mbjbk5wa18z4xis5b2v2v0b04mf4d896yp88vcj8d8hsmbmc6g";
+ modSha256 = "0lp4gky76di7as78421p3lsirfr7mic3z204ildvj6gf6d15svpr";
postFixup = ''
wrapProgram $out/bin/termshark --prefix PATH : ${stdenv.lib.makeBinPath [ wireshark-cli ]}
@@ -28,8 +28,7 @@ buildGoModule rec {
meta = with stdenv.lib; {
homepage = https://termshark.io/;
description = "A terminal UI for wireshark-cli, inspired by Wireshark";
- platforms = platforms.linux;
license = licenses.mit;
- maintainers = [ maintainers.winpat ];
+ maintainers = with maintainers; [ winpat elseym ];
};
}
diff --git a/pkgs/tools/networking/uqmi/default.nix b/pkgs/tools/networking/uqmi/default.nix
index 010d6a7f8e8..17a55d86b9a 100644
--- a/pkgs/tools/networking/uqmi/default.nix
+++ b/pkgs/tools/networking/uqmi/default.nix
@@ -1,12 +1,13 @@
{ stdenv, lib, fetchgit, cmake, perl, libubox, json_c }:
stdenv.mkDerivation {
- name = "uqmi-2016-12-19";
+ pname = "uqmi";
+ version = "unstable-2019-06-27";
src = fetchgit {
url = "https://git.openwrt.org/project/uqmi.git";
- rev = "8ceeab690d8c6f1e3afbd4bcaee7bc2ba3fbe165";
- sha256 = "1fw9r36d024iiq6bq2cikaq5pams5pnbc4z6pcmcny2k4l5cdb6m";
+ rev = "1965c713937495a5cb029165c16acdb6572c3f87";
+ sha256 = "1gn8sdcl4lwfs3lwabmnjbvdhhk1l42bwbajwds7j4936fpbklx0";
};
postPatch = ''
diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix
index e43c174ab3f..be3d1267861 100644
--- a/pkgs/tools/networking/vde2/default.nix
+++ b/pkgs/tools/networking/vde2/default.nix
@@ -8,12 +8,19 @@ stdenv.mkDerivation rec {
sha256 = "14xga0ib6p1wrv3hkl4sa89yzjxv7f1vfqaxsch87j6scdm59pr2";
};
- patches = stdenv.lib.optional stdenv.hostPlatform.isMusl (
- fetchpatch {
+ patches = [
+ # Fix build with openssl 1.1.0
+ (fetchpatch {
+ name = "vde_cryptcab-compile-against-openssl-1.1.0.patch";
+ url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/vde_cryptcab-compile-against-openssl-1.1.0.patch?h=packages/vde2&id=15b11be49997fa94b603e366064690b7cc6bce61";
+ sha256 = "07z1yabwigq35mkwzqa934n7vjnjlqz5xfzq8cfj87lgyjjp00qi";
+ })
+ ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl [
+ (fetchpatch {
url = "https://git.alpinelinux.org/cgit/aports/plain/main/vde2/musl-build-fix.patch?id=ddee2f86a48e087867d4a2c12849b2e3baccc238";
sha256 = "0b5382v541bkxhqylilcy34bh83ag96g71f39m070jzvi84kx8af";
- }
- );
+ })
+ ];
configureFlags = stdenv.lib.optional (!withPython) "--disable-python";
@@ -23,7 +30,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
meta = with stdenv.lib; {
- homepage = http://vde.sourceforge.net/;
+ homepage = "https://github.com/virtualsquare/vde-2";
description = "Virtual Distributed Ethernet, an Ethernet compliant virtual network";
platforms = platforms.unix;
license = licenses.gpl2;
diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix
index 2306359addf..1010c5d9cda 100644
--- a/pkgs/tools/networking/whois/default.nix
+++ b/pkgs/tools/networking/whois/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2, libiconv }:
stdenv.mkDerivation rec {
- version = "5.5.5";
+ version = "5.5.6";
pname = "whois";
src = fetchFromGitHub {
owner = "rfc1036";
repo = "whois";
rev = "v${version}";
- sha256 = "01gni315lnkyrwd173fqw0c12qrisfb38wy066s2j85nq64a3nqv";
+ sha256 = "0iqbn2ky9j7qdpv5hycy56knnfhl8nz4l4905rnr0p703lvxxx8d";
};
nativeBuildInputs = [ perl gettext pkgconfig ];
diff --git a/pkgs/tools/nix/nix-query-tree-viewer/default.nix b/pkgs/tools/nix/nix-query-tree-viewer/default.nix
new file mode 100644
index 00000000000..de0b88378a4
--- /dev/null
+++ b/pkgs/tools/nix/nix-query-tree-viewer/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, rustPlatform, glib, gtk3, wrapGAppsHook }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "nix-query-tree-viewer";
+ version = "0.2.0";
+
+ src = fetchFromGitHub {
+ owner = "cdepillabout";
+ repo = "nix-query-tree-viewer";
+ rev = "v${version}";
+ sha256 = "0vjcllhgq64n7mwxvyhmbqd6fpa9lwrpsnggc1kdlgd14ggq6jj6";
+ };
+
+ nativeBuildInputs = [
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ glib
+ gtk3
+ ];
+
+ cargoSha256 = "1pbyi7knqmqxbpi3jhl492is9zkaxdpdnmbm11nqwc1nvvbjblzc";
+
+ meta = with stdenv.lib; {
+ description = "GTK viewer for the output of `nix store --query --tree`";
+ homepage = "https://github.com/cdepillabout/nix-query-tree-viewer";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ cdepillabout ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 06e987f6f2b..eed14a12978 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -197,10 +197,10 @@ in rec {
nixFlakes = lib.lowPrio (callPackage common rec {
name = "nix-2.4${suffix}";
- suffix = "pre20200207_d2032ed";
+ suffix = "pre20200220_4a4521f";
src = fetchurl {
- url = "https://hydra.nixos.org/build/111815420/download/3/nix-2.4${suffix}.tar.xz";
- sha256 = "e72a20efeee4ccc704cca3a06de9185fb8742bc7ef1a62af5896ec0f379b9ceb";
+ url = "https://hydra.nixos.org/build/113373394/download/3/nix-2.4${suffix}.tar.xz";
+ sha256 = "31fe87c40f40a590bc8f575283725d5f04ecb9aebb6b404f679d77438d75265d";
};
inherit storeDir stateDir confDir boehmgc;
diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix
index 1387a6c6ed1..50146f0aad3 100644
--- a/pkgs/tools/system/bfs/default.nix
+++ b/pkgs/tools/system/bfs/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "bfs";
- version = "1.5.2";
+ version = "1.6";
src = fetchFromGitHub {
repo = "bfs";
owner = "tavianator";
rev = version;
- sha256 = "04jgah6yvz3i2bwrv1ki2nmj1yinba7djbfq8n8ism4gffsza9dz";
+ sha256 = "0qrxd1vdz2crk7jf7cdda5bhm1f841hjvin7fn497wymwr5qyjah";
};
buildInputs = stdenv.lib.optionals stdenv.isLinux [ libcap acl ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
bfs is a variant of the UNIX find command that operates breadth-first rather than
depth-first. It is otherwise intended to be compatible with many versions of find.
'';
- homepage = https://github.com/tavianator/bfs;
+ homepage = "https://github.com/tavianator/bfs";
license = licenses.bsd0;
platforms = platforms.unix;
maintainers = with maintainers; [ yesbox ];
diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix
index 4f8cfb966e8..482e6253a52 100644
--- a/pkgs/tools/system/netdata/default.nix
+++ b/pkgs/tools/system/netdata/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
+{ stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkgconfig
, CoreFoundation, IOKit, libossp_uuid
-, curl, libcap, libuuid, lm_sensors, zlib
+, curl, libcap, libuuid, lm_sensors, zlib, fetchpatch
, withCups ? false, cups
, withDBengine ? true, libuv, lz4, judy
, withIpmi ? (!stdenv.isDarwin), freeipmi
@@ -11,15 +11,17 @@
with stdenv.lib;
-stdenv.mkDerivation rec {
- version = "1.19.0";
+let
+ go-d-plugin = callPackage ./go.d.plugin.nix {};
+in stdenv.mkDerivation rec {
+ version = "1.20.0";
pname = "netdata";
src = fetchFromGitHub {
owner = "netdata";
repo = "netdata";
rev = "v${version}";
- sha256 = "1s6kzx4xh8b6v7ki8h2mfzprj5rxvlgx2md20cr8c0v81qpz3q3q";
+ sha256 = "0g7iv5w14wndl5iv2q81dppgwq09sm93vpnyq7p49nl7q1dsz1d6";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
@@ -34,11 +36,19 @@ stdenv.mkDerivation rec {
patches = [
./no-files-in-etc-and-var.patch
+ # part of the next release
+ (fetchpatch {
+ url = "https://github.com/netdata/netdata/commit/5c992b7d92cf008ce91627efccf8644732db1f87.patch";
+ sha256 = "1nvbmhy5rir4kw77dhx1qr0l0wcspakr7z7ivva1ilz1aml8nbnm";
+ })
];
NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1";
- postInstall = optionalString (!stdenv.isDarwin) ''
+ postInstall = ''
+ ln -s ${go-d-plugin.bin}/lib/netdata/conf.d/* $out/lib/netdata/conf.d
+ ln -s ${go-d-plugin.bin}/bin/godplugind $out/libexec/netdata/plugins.d/go.d.plugin
+ '' + optionalString (!stdenv.isDarwin) ''
# rename this plugin so netdata will look for setuid wrapper
mv $out/libexec/netdata/plugins.d/apps.plugin \
$out/libexec/netdata/plugins.d/apps.plugin.org
diff --git a/pkgs/tools/system/netdata/deps.nix b/pkgs/tools/system/netdata/deps.nix
new file mode 100644
index 00000000000..10d933c5a56
--- /dev/null
+++ b/pkgs/tools/system/netdata/deps.nix
@@ -0,0 +1,534 @@
+# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
+[
+ {
+ goPackagePath = "github.com/OneOfOne/xxhash";
+ fetch = {
+ type = "git";
+ url = "https://github.com/OneOfOne/xxhash";
+ rev = "v1.2.2";
+ sha256 = "1mjfhrwhvxa48rycjnqpqzm521i38h1hdyz6pdwmhd7xb8j6gwi6";
+ };
+ }
+ {
+ goPackagePath = "github.com/Wing924/ltsv";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Wing924/ltsv";
+ rev = "v0.3.1";
+ sha256 = "05jl8myq16y847wmx6cmlxl50z86cpiv9pq4fflmac7lp4hf67m3";
+ };
+ }
+ {
+ goPackagePath = "github.com/alecthomas/template";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alecthomas/template";
+ rev = "fb15b899a751";
+ sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26";
+ };
+ }
+ {
+ goPackagePath = "github.com/alecthomas/units";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alecthomas/units";
+ rev = "c3de453c63f4";
+ sha256 = "0js37zlgv37y61j4a2d46jh72xm5kxmpaiw0ya9v944bjpc386my";
+ };
+ }
+ {
+ goPackagePath = "github.com/axiomhq/hyperloglog";
+ fetch = {
+ type = "git";
+ url = "https://github.com/axiomhq/hyperloglog";
+ rev = "a4c4c47bc57f";
+ sha256 = "0pwjxyhn0ms3n1q0hbqb5gz2lxb28giflkya9ck2lwfyd28y254s";
+ };
+ }
+ {
+ goPackagePath = "github.com/beorn7/perks";
+ fetch = {
+ type = "git";
+ url = "https://github.com/beorn7/perks";
+ rev = "v1.0.0";
+ sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x";
+ };
+ }
+ {
+ goPackagePath = "github.com/cespare/xxhash";
+ fetch = {
+ type = "git";
+ url = "https://github.com/cespare/xxhash";
+ rev = "v1.1.0";
+ sha256 = "1qyzlcdcayavfazvi03izx83fvip8h36kis44zr2sg7xf6sx6l4x";
+ };
+ }
+ {
+ goPackagePath = "github.com/davecgh/go-spew";
+ fetch = {
+ type = "git";
+ url = "https://github.com/davecgh/go-spew";
+ rev = "v1.1.1";
+ sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
+ };
+ }
+ {
+ goPackagePath = "github.com/davecgh/go-xdr";
+ fetch = {
+ type = "git";
+ url = "https://github.com/davecgh/go-xdr";
+ rev = "e6a2ba005892";
+ sha256 = "0vifrz4iil4r7k8sz5iqlfbh80ysgs5abp2simgyhsbrkxrrsrrd";
+ };
+ }
+ {
+ goPackagePath = "github.com/dgryski/go-metro";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dgryski/go-metro";
+ rev = "280f6062b5bc";
+ sha256 = "1a82ksyklh1lcpgzh07ik78pgz4m0b3q921yfglafd7v0ld6xljr";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-kit/kit";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-kit/kit";
+ rev = "v0.9.0";
+ sha256 = "09038mnw705h7isbjp8dzgp2i04bp5rqkmifxvwc5xkh75s00qpw";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-logfmt/logfmt";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-logfmt/logfmt";
+ rev = "v0.4.0";
+ sha256 = "06smxc112xmixz78nyvk3b2hmc7wasf2sl5vxj1xz62kqcq9lzm9";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-sql-driver/mysql";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-sql-driver/mysql";
+ rev = "v1.5.0";
+ sha256 = "11x0m9yf3kdnf6981182r824psgxwfaqhn3x3in4yiidp0w0hk3v";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-stack/stack";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-stack/stack";
+ rev = "v1.8.0";
+ sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v";
+ };
+ }
+ {
+ goPackagePath = "github.com/gogo/protobuf";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gogo/protobuf";
+ rev = "v1.1.1";
+ sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/protobuf";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/protobuf";
+ rev = "v1.3.2";
+ sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/uuid";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/uuid";
+ rev = "6a5e28554805";
+ sha256 = "0q1zwabj77agp1yljqjlf31ip8c6lr25xwqlw3zzfgha81y45lv0";
+ };
+ }
+ {
+ goPackagePath = "github.com/influxdata/influxdb";
+ fetch = {
+ type = "git";
+ url = "https://github.com/influxdata/influxdb";
+ rev = "v1.7.6";
+ sha256 = "07abzhmsgj7krmhf7jis50a4fc4w29h48nyzgvrll5lz3cax979q";
+ };
+ }
+ {
+ goPackagePath = "github.com/jessevdk/go-flags";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jessevdk/go-flags";
+ rev = "v1.4.0";
+ sha256 = "0algnnigph27spgn655zm4723yfjxjjvlf4k14z9drj3682df25a";
+ };
+ }
+ {
+ goPackagePath = "github.com/json-iterator/go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/json-iterator/go";
+ rev = "v1.1.6";
+ sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r";
+ };
+ }
+ {
+ goPackagePath = "github.com/julienschmidt/httprouter";
+ fetch = {
+ type = "git";
+ url = "https://github.com/julienschmidt/httprouter";
+ rev = "v1.2.0";
+ sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666";
+ };
+ }
+ {
+ goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
+ fetch = {
+ type = "git";
+ url = "https://github.com/konsorten/go-windows-terminal-sequences";
+ rev = "v1.0.1";
+ sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip";
+ };
+ }
+ {
+ goPackagePath = "github.com/kr/logfmt";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/logfmt";
+ rev = "b84e30acd515";
+ sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9";
+ };
+ }
+ {
+ goPackagePath = "github.com/kr/pretty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/pretty";
+ rev = "v0.1.0";
+ sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp";
+ };
+ }
+ {
+ goPackagePath = "github.com/kr/pty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/pty";
+ rev = "v1.1.1";
+ sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6";
+ };
+ }
+ {
+ goPackagePath = "github.com/kr/text";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/text";
+ rev = "v0.1.0";
+ sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-isatty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-isatty";
+ rev = "v0.0.7";
+ sha256 = "1i77aq4gf9as03m8fpfh8fq49n4z9j7548blrcsidm1xhslzk5xd";
+ };
+ }
+ {
+ goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
+ fetch = {
+ type = "git";
+ url = "https://github.com/matttproud/golang_protobuf_extensions";
+ rev = "v1.0.1";
+ sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
+ };
+ }
+ {
+ goPackagePath = "github.com/miekg/dns";
+ fetch = {
+ type = "git";
+ url = "https://github.com/miekg/dns";
+ rev = "v1.1.27";
+ sha256 = "0fpd9alvhzrkb1c31n4lrxlpv1nlhy51w1yg39xxb3mjmrb7lby1";
+ };
+ }
+ {
+ goPackagePath = "github.com/mitchellh/go-homedir";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mitchellh/go-homedir";
+ rev = "v1.1.0";
+ sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1";
+ };
+ }
+ {
+ goPackagePath = "github.com/modern-go/concurrent";
+ fetch = {
+ type = "git";
+ url = "https://github.com/modern-go/concurrent";
+ rev = "bacd9c7ef1dd";
+ sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs";
+ };
+ }
+ {
+ goPackagePath = "github.com/modern-go/reflect2";
+ fetch = {
+ type = "git";
+ url = "https://github.com/modern-go/reflect2";
+ rev = "v1.0.1";
+ sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf";
+ };
+ }
+ {
+ goPackagePath = "github.com/mwitkow/go-conntrack";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mwitkow/go-conntrack";
+ rev = "cc309e4a2223";
+ sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf";
+ };
+ }
+ {
+ goPackagePath = "github.com/netdata/go-orchestrator";
+ fetch = {
+ type = "git";
+ url = "https://github.com/netdata/go-orchestrator";
+ rev = "c793edba0e8f";
+ sha256 = "0bqvqdkd510yl3c9f86h6ii7r1l5sjx0x655lzgv6cahq90k3pr7";
+ };
+ }
+ {
+ goPackagePath = "github.com/pkg/errors";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pkg/errors";
+ rev = "v0.8.1";
+ sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
+ };
+ }
+ {
+ goPackagePath = "github.com/pmezard/go-difflib";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pmezard/go-difflib";
+ rev = "v1.0.0";
+ sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/client_golang";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/client_golang";
+ rev = "v1.0.0";
+ sha256 = "1f03ndyi3jq7zdxinnvzimz3s4z2374r6dikkc8i42xzb6d1bli6";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/client_model";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/client_model";
+ rev = "v0.2.0";
+ sha256 = "0jffnz94d6ff39fr96b5w8i8yk26pwnrfggzz8jhi8k0yihg2c9d";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/common";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/common";
+ rev = "v0.9.0";
+ sha256 = "0gvfb622fjybvhwh8rjpgnz2zxrz9cdc1kzn40hk4hyqg5435w3b";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/procfs";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/procfs";
+ rev = "v0.0.2";
+ sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/prometheus";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/prometheus";
+ rev = "v2.5.0";
+ sha256 = "07sgsmazjr5lgkbaz63qanpg536pyfb7asljz67rqz6c47ngzifp";
+ };
+ }
+ {
+ goPackagePath = "github.com/sirupsen/logrus";
+ fetch = {
+ type = "git";
+ url = "https://github.com/sirupsen/logrus";
+ rev = "v1.4.2";
+ sha256 = "087k2lxrr9p9dh68yw71d05h5g9p5v26zbwd6j7lghinjfaw334x";
+ };
+ }
+ {
+ goPackagePath = "github.com/spaolacci/murmur3";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spaolacci/murmur3";
+ rev = "f09979ecbc72";
+ sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25";
+ };
+ }
+ {
+ goPackagePath = "github.com/stretchr/objx";
+ fetch = {
+ type = "git";
+ url = "https://github.com/stretchr/objx";
+ rev = "v0.1.1";
+ sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls";
+ };
+ }
+ {
+ goPackagePath = "github.com/stretchr/testify";
+ fetch = {
+ type = "git";
+ url = "https://github.com/stretchr/testify";
+ rev = "v1.4.0";
+ sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb";
+ };
+ }
+ {
+ goPackagePath = "github.com/vmware/govmomi";
+ fetch = {
+ type = "git";
+ url = "https://github.com/vmware/govmomi";
+ rev = "v0.22.1";
+ sha256 = "1z4am6143jrrls0023flnqgadm1z9p60w09cp1j5pnslm60vvw78";
+ };
+ }
+ {
+ goPackagePath = "github.com/vmware/vmw-guestinfo";
+ fetch = {
+ type = "git";
+ url = "https://github.com/vmware/vmw-guestinfo";
+ rev = "25eff159a728";
+ sha256 = "1nag33p0i6zxh25kf0hpdsc3n1agrjsncdqqj8sxd2q1zf7lhf5j";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/crypto";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/crypto";
+ rev = "87dc89f01550";
+ sha256 = "0z4i1m2yn3f31ci7wvcm2rxkx2yiv7a78mfzklncmsz2k97rlh2g";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/mod";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/mod";
+ rev = "c90efee705ee";
+ sha256 = "0i5md645rmcy5z5ij9ng428k9rz4g3k1kjy3blsq1264rn426gdf";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/net";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/net";
+ rev = "aa69164e4478";
+ sha256 = "1w0r52a9csj5vkhysvdx6l5v2dq1lnmvs95ffhpibypjha7lq214";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sync";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sync";
+ rev = "112230192c58";
+ sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sys";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sys";
+ rev = "2837fb4f24fe";
+ sha256 = "01wrq33y1bjkk0kpxhs59iq7i95llhs2f8k0v5mr3f6wd46v4h5b";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/text";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/text";
+ rev = "v0.3.0";
+ sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/tools";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/tools";
+ rev = "49a3e744a425";
+ sha256 = "0xx4gv9wpv36crk7gv7imf5vzzs2mz7zla2q2jkck3xnzff8fw3v";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/xerrors";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/xerrors";
+ rev = "1b5146add898";
+ sha256 = "0w2akj91krxjag0xdhsg78470888nicc5ismc2ap9jqpss6v1zih";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/alecthomas/kingpin.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/alecthomas/kingpin.v2";
+ rev = "v2.2.6";
+ sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/check.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/check.v1";
+ rev = "20d25e280405";
+ sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/yaml.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/yaml.v2";
+ rev = "v2.2.7";
+ sha256 = "0k5xcwkd3wmcx54isk7ck9cwp8fapfhyqdz3f13kxp77cxqizazj";
+ };
+ }
+ {
+ goPackagePath = "layeh.com/radius";
+ fetch = {
+ type = "git";
+ url = "https://github.com/layeh/radius";
+ rev = "890bc1058917";
+ sha256 = "01ncxwmlj5xjz4kd4pbp77xqqgixip492ilczk7ac0fivjcvdnb3";
+ };
+ }
+]
diff --git a/pkgs/tools/system/netdata/go.d.plugin.nix b/pkgs/tools/system/netdata/go.d.plugin.nix
new file mode 100644
index 00000000000..0e1de1bbd8e
--- /dev/null
+++ b/pkgs/tools/system/netdata/go.d.plugin.nix
@@ -0,0 +1,30 @@
+{ lib, fetchFromGitHub, buildGoPackage }:
+
+buildGoPackage rec {
+ pname = "netdata-go.d.plugin";
+ version = "0.15.0";
+
+ src = fetchFromGitHub {
+ owner = "netdata";
+ repo = "go.d.plugin";
+ rev = "v${version}";
+ sha256 = "0v732mndhgrbqiwsdndqd08pvgbvl4ffn5rqbyv7iw1dwwr08f67";
+ };
+
+ goPackagePath = "github.com/netdata/go.d.plugin";
+
+ postInstall = ''
+ mkdir -p $bin/lib/netdata/conf.d
+ cp -r go/src/${goPackagePath}/config/* $bin/lib/netdata/conf.d
+ '';
+
+ goDeps = ./deps.nix;
+
+ meta = with lib; {
+ description = "Netdata orchestrator for data collection modules written in go";
+ homepage = https://github.com/netdata/go.d.plugin;
+ license = licenses.gpl3;
+ platforms = platforms.unix;
+ maintainers = [ maintainers.lethalman ];
+ };
+}
diff --git a/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch b/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch
index 138787b98f1..594805fdf18 100644
--- a/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch
+++ b/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch
@@ -1,155 +1,129 @@
-diff --git a/Makefile.am b/Makefile.am
-index 2625dcc..1fdd645 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -113,10 +113,10 @@ AM_CFLAGS = \
- $(NULL)
-
- sbin_PROGRAMS =
--dist_cache_DATA = packaging/installer/.keep
--dist_varlib_DATA = packaging/installer/.keep
--dist_registry_DATA = packaging/installer/.keep
--dist_log_DATA = packaging/installer/.keep
-+dist_cache_DATA =
-+dist_varlib_DATA =
-+dist_registry_DATA =
-+dist_log_DATA =
- plugins_PROGRAMS =
-
- LIBNETDATA_FILES = \
+From 4ecc1475be94a384c122594b5f7d455beb64a2f0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Thalheim?=
+Date: Sat, 22 Feb 2020 06:42:14 +0000
+Subject: [PATCH] no files in etc and var
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jörg Thalheim
+---
+ collectors/Makefile.am | 2 +-
+ collectors/charts.d.plugin/Makefile.am | 2 +-
+ collectors/node.d.plugin/Makefile.am | 2 +-
+ collectors/python.d.plugin/Makefile.am | 2 +-
+ collectors/statsd.plugin/Makefile.am | 2 +-
+ health/Makefile.am | 2 +-
+ system/Makefile.am | 3 +--
+ web/Makefile.am | 2 +-
+ 8 files changed, 8 insertions(+), 9 deletions(-)
+
diff --git a/collectors/Makefile.am b/collectors/Makefile.am
-index 7431025..f62f8ac 100644
+index 9bb52958..c9799165 100644
--- a/collectors/Makefile.am
+++ b/collectors/Makefile.am
-@@ -30,11 +30,6 @@ SUBDIRS = \
- usercustompluginsconfigdir=$(configdir)/custom-plugins.d
+@@ -32,7 +32,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d
usergoconfigdir=$(configdir)/go.d
--# Explicitly install directories to avoid permission issues due to umask
+ # Explicitly install directories to avoid permission issues due to umask
-install-exec-local:
-- $(INSTALL) -d $(DESTDIR)$(usercustompluginsconfigdir)
-- $(INSTALL) -d $(DESTDIR)$(usergoconfigdir)
--
- dist_noinst_DATA = \
- README.md \
- $(NULL)
++no-install-exec-local:
+ $(INSTALL) -d $(DESTDIR)$(usercustompluginsconfigdir)
+ $(INSTALL) -d $(DESTDIR)$(usergoconfigdir)
+
diff --git a/collectors/charts.d.plugin/Makefile.am b/collectors/charts.d.plugin/Makefile.am
-index b3b2fb9..68b768e 100644
+index 03c7f0a9..01985db0 100644
--- a/collectors/charts.d.plugin/Makefile.am
+++ b/collectors/charts.d.plugin/Makefile.am
-@@ -31,13 +31,8 @@ dist_charts_DATA = \
-
- userchartsconfigdir=$(configdir)/charts.d
- dist_userchartsconfig_DATA = \
-- .keep \
+@@ -34,7 +34,7 @@ dist_userchartsconfig_DATA = \
$(NULL)
--# Explicitly install directories to avoid permission issues due to umask
+ # Explicitly install directories to avoid permission issues due to umask
-install-exec-local:
-- $(INSTALL) -d $(DESTDIR)$(userchartsconfigdir)
--
++no-install-exec-local:
+ $(INSTALL) -d $(DESTDIR)$(userchartsconfigdir)
+
chartsconfigdir=$(libconfigdir)/charts.d
- dist_chartsconfig_DATA = \
- $(NULL)
diff --git a/collectors/node.d.plugin/Makefile.am b/collectors/node.d.plugin/Makefile.am
-index 411bce9..ba60276 100644
+index c3142d43..95e32445 100644
--- a/collectors/node.d.plugin/Makefile.am
+++ b/collectors/node.d.plugin/Makefile.am
-@@ -23,13 +23,8 @@ dist_noinst_DATA = \
-
- usernodeconfigdir=$(configdir)/node.d
- dist_usernodeconfig_DATA = \
-- .keep \
+@@ -26,7 +26,7 @@ dist_usernodeconfig_DATA = \
$(NULL)
--# Explicitly install directories to avoid permission issues due to umask
+ # Explicitly install directories to avoid permission issues due to umask
-install-exec-local:
-- $(INSTALL) -d $(DESTDIR)$(usernodeconfigdir)
--
++no-install-exec-local:
+ $(INSTALL) -d $(DESTDIR)$(usernodeconfigdir)
+
nodeconfigdir=$(libconfigdir)/node.d
- dist_nodeconfig_DATA = \
- $(NULL)
diff --git a/collectors/python.d.plugin/Makefile.am b/collectors/python.d.plugin/Makefile.am
-index cb14e35..8a6c5a7 100644
+index e678f86a..29a319da 100644
--- a/collectors/python.d.plugin/Makefile.am
+++ b/collectors/python.d.plugin/Makefile.am
-@@ -29,13 +29,8 @@ dist_python_DATA = \
-
- userpythonconfigdir=$(configdir)/python.d
- dist_userpythonconfig_DATA = \
-- .keep \
+@@ -32,7 +32,7 @@ dist_userpythonconfig_DATA = \
$(NULL)
--# Explicitly install directories to avoid permission issues due to umask
+ # Explicitly install directories to avoid permission issues due to umask
-install-exec-local:
-- $(INSTALL) -d $(DESTDIR)$(userpythonconfigdir)
--
++no-install-exec-local:
+ $(INSTALL) -d $(DESTDIR)$(userpythonconfigdir)
+
pythonconfigdir=$(libconfigdir)/python.d
- dist_pythonconfig_DATA = \
- $(NULL)
diff --git a/collectors/statsd.plugin/Makefile.am b/collectors/statsd.plugin/Makefile.am
-index 87b6ca7..9d010c7 100644
+index b01302d1..f5b77da4 100644
--- a/collectors/statsd.plugin/Makefile.am
+++ b/collectors/statsd.plugin/Makefile.am
-@@ -14,9 +14,4 @@ dist_statsdconfig_DATA = \
-
- userstatsdconfigdir=$(configdir)/statsd.d
- dist_userstatsdconfig_DATA = \
-- .keep \
+@@ -17,5 +17,5 @@ dist_userstatsdconfig_DATA = \
$(NULL)
--
--# Explicitly install directories to avoid permission issues due to umask
+
+ # Explicitly install directories to avoid permission issues due to umask
-install-exec-local:
-- $(INSTALL) -d $(DESTDIR)$(userstatsdconfigdir)
++no-install-exec-local:
+ $(INSTALL) -d $(DESTDIR)$(userstatsdconfigdir)
diff --git a/health/Makefile.am b/health/Makefile.am
-index f63faa8..8912ef2 100644
+index 853ed0d7..210330a6 100644
--- a/health/Makefile.am
+++ b/health/Makefile.am
-@@ -16,13 +16,8 @@ dist_noinst_DATA = \
-
- userhealthconfigdir=$(configdir)/health.d
- dist_userhealthconfig_DATA = \
-- .keep \
+@@ -19,7 +19,7 @@ dist_userhealthconfig_DATA = \
$(NULL)
--# Explicitly install directories to avoid permission issues due to umask
+ # Explicitly install directories to avoid permission issues due to umask
-install-exec-local:
-- $(INSTALL) -d $(DESTDIR)$(userhealthconfigdir)
--
++no-install-exec-local:
+ $(INSTALL) -d $(DESTDIR)$(userhealthconfigdir)
+
healthconfigdir=$(libconfigdir)/health.d
- dist_healthconfig_DATA = \
- health.d/adaptec_raid.conf \
diff --git a/system/Makefile.am b/system/Makefile.am
-index ad68c65..bf6a840 100644
+index ad68c655..74f032f9 100644
--- a/system/Makefile.am
+++ b/system/Makefile.am
-@@ -16,14 +16,6 @@ CLEANFILES = \
- include $(top_srcdir)/build/subst.inc
+@@ -17,11 +17,10 @@ include $(top_srcdir)/build/subst.inc
SUFFIXES = .in
--dist_config_SCRIPTS = \
+ dist_config_SCRIPTS = \
- edit-config \
-- $(NULL)
--
--# Explicitly install directories to avoid permission issues due to umask
+ $(NULL)
+
+ # Explicitly install directories to avoid permission issues due to umask
-install-exec-local:
-- $(INSTALL) -d $(DESTDIR)$(configdir)
--
++no-install-exec-local:
+ $(INSTALL) -d $(DESTDIR)$(configdir)
+
nodist_noinst_DATA = \
- netdata-openrc \
- netdata.logrotate \
diff --git a/web/Makefile.am b/web/Makefile.am
-index ccaccd7..f2fed50 100644
+index ccaccd76..16a2977e 100644
--- a/web/Makefile.am
+++ b/web/Makefile.am
-@@ -11,10 +11,6 @@ SUBDIRS = \
-
+@@ -12,7 +12,7 @@ SUBDIRS = \
usersslconfigdir=$(configdir)/ssl
--# Explicitly install directories to avoid permission issues due to umask
+ # Explicitly install directories to avoid permission issues due to umask
-install-exec-local:
-- $(INSTALL) -d $(DESTDIR)$(usersslconfigdir)
--
++no-install-exec-local:
+ $(INSTALL) -d $(DESTDIR)$(usersslconfigdir)
+
dist_noinst_DATA = \
- README.md \
- gui/confluence/README.md \
+--
+2.25.0
+
diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh
index f5c447ea0a5..7750de70061 100644
--- a/pkgs/tools/system/plan9port/builder.sh
+++ b/pkgs/tools/system/plan9port/builder.sh
@@ -5,18 +5,11 @@ export PLAN9_TARGET=$PLAN9
plan9portLinkFlags()
{
- local -a linkFlags=()
eval set -- "$NIX_LDFLAGS"
- while (( $# > 0 )); do
- if [[ $1 = -rpath ]]; then
- linkFlags+=( "-Wl,-rpath,$2" )
- shift 2
- else
- linkFlags+=( "$1" )
- shift
- fi
+ local flag
+ for flag in "$@"; do
+ printf ' -Wl,%s' "$flag"
done
- echo "${linkFlags[*]}"
}
configurePhase()
diff --git a/pkgs/tools/system/s-tui/default.nix b/pkgs/tools/system/s-tui/default.nix
index 924269b6637..a6816daae33 100644
--- a/pkgs/tools/system/s-tui/default.nix
+++ b/pkgs/tools/system/s-tui/default.nix
@@ -1,19 +1,21 @@
-{ stdenv, pythonPackages }:
+{ stdenv, python3Packages }:
-pythonPackages.buildPythonPackage rec {
+python3Packages.buildPythonPackage rec {
pname = "s-tui";
version = "1.0.0";
- src = pythonPackages.fetchPypi {
+ src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "0r5yhlsi5xiy7ii1w4kqkaxz9069v5bbfwi3x3xnxhk51yjfgr8n";
};
- propagatedBuildInputs = with pythonPackages; [
+ propagatedBuildInputs = with python3Packages; [
urwid
psutil
];
+ LC_ALL = "en_US.UTF-8";
+
meta = with stdenv.lib; {
homepage = https://amanusk.github.io/s-tui/;
description = "Stress-Terminal UI monitoring tool";
diff --git a/pkgs/tools/system/throttled/default.nix b/pkgs/tools/system/throttled/default.nix
index 4f52b5e0945..02ff7511382 100644
--- a/pkgs/tools/system/throttled/default.nix
+++ b/pkgs/tools/system/throttled/default.nix
@@ -2,24 +2,24 @@
stdenv.mkDerivation rec {
pname = "throttled";
- version = "0.6";
+ version = "0.7";
src = fetchFromGitHub {
owner = "erpalma";
repo = pname;
rev = "v${version}";
- sha256 = "1icb2288pj25vbdnd16zvisw9c01hp8vkk25ilkc74gy76xhpcs4";
+ sha256 = "1y1sczvj2qc8ml9i1rdzr8hklvci9bdphm3mmri2ncaqys8wdbh4";
};
nativeBuildInputs = [ python3Packages.wrapPython ];
- pythonPath = with python3Packages; [
+ pythonPath = with python3Packages; [
configparser
dbus-python
pygobject3
];
- # The upstream unit both assumes the install location, and tries to run in a virtualenv
+ # The upstream unit both assumes the install location, and tries to run in a virtualenv
postPatch = ''sed -e 's|ExecStart=.*|ExecStart=${placeholder "out"}/bin/lenovo_fix.py|' -i systemd/lenovo_fix.service'';
installPhase = ''
diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix
index cdc6878bb5a..6f7b4d487ef 100644
--- a/pkgs/tools/text/ocrmypdf/default.nix
+++ b/pkgs/tools/text/ocrmypdf/default.nix
@@ -29,14 +29,14 @@ let
in buildPythonApplication rec {
pname = "ocrmypdf";
- version = "9.5.0";
+ version = "9.6.0";
disabled = ! python3Packages.isPy3k;
src = fetchFromGitHub {
owner = "jbarlow83";
repo = "OCRmyPDF";
rev = "v${version}";
- sha256 = "0rvwxykyscpcvfgm8zzyvjgzl9x9ddi9cxmqyxrc031mxpc0lzyy";
+ sha256 = "1cpj8fj1mzp6mbd1z9dj38fmlcg5q2gbya4vbag1ddd4vp7rvn2m";
};
nativeBuildInputs = with python3Packages; [
diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix
index 0bcd663ae5a..265141ad534 100644
--- a/pkgs/tools/text/shfmt/default.nix
+++ b/pkgs/tools/text/shfmt/default.nix
@@ -1,21 +1,21 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "shfmt";
- version = "3.0.1";
+ version = "3.0.2";
src = fetchFromGitHub {
owner = "mvdan";
repo = "sh";
rev = "v${version}";
- sha256 = "1y6n2xi8m579xksnnsdzb4zvcvij48kywjfqzp7qm43ni8g7w9a8";
+ sha256 = "1q0gazh87y7sl5sl5m046a83d64aas9xnbg2d1d1h2vwcqdaccp2";
};
modSha256 = "1ll2cxhgf8hh19wzdykgc81c4yfcp8bzmfaif08nvvb63rhjdb5y";
subPackages = ["cmd/shfmt"];
- meta = with stdenv.lib; {
- homepage = https://github.com/mvdan/sh;
+ meta = with lib; {
+ homepage = "https://github.com/mvdan/sh";
description = "A shell parser and formatter";
longDescription = ''
shfmt formats shell programs. It can use tabs or any number of spaces to indent.
diff --git a/pkgs/tools/typesetting/tikzit/default.nix b/pkgs/tools/typesetting/tikzit/default.nix
index 5ee1adda483..0a1f6591b86 100644
--- a/pkgs/tools/typesetting/tikzit/default.nix
+++ b/pkgs/tools/typesetting/tikzit/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, qmake, qttools, qtbase, libsForQt5, flex, bison }:
+{ stdenv, mkDerivation, fetchFromGitHub, qmake, qttools, qtbase, poppler, flex, bison }:
-stdenv.mkDerivation {
+mkDerivation {
pname = "tikzit";
version = "2.1.4";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ qmake qttools flex bison ];
- buildInputs = [ qtbase libsForQt5.poppler ];
+ buildInputs = [ qtbase poppler ];
# src/data/tikzlexer.l:29:10: fatal error: tikzparser.parser.hpp: No such file or directory
enableParallelBuilding = false;
diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix
index 9d4f7b514a3..099a02e8f65 100644
--- a/pkgs/tools/video/rav1e/default.nix
+++ b/pkgs/tools/video/rav1e/default.nix
@@ -2,7 +2,7 @@
rustPlatform.buildRustPackage rec {
pname = "rav1e";
- version = "0.3.0";
+ version = "0.3.1";
src = stdenv.mkDerivation rec {
name = "${pname}-${version}-source";
@@ -11,11 +11,11 @@ rustPlatform.buildRustPackage rec {
owner = "xiph";
repo = "rav1e";
rev = "v${version}";
- sha256 = "1z8wdwhmczd7qq61gpngnyhl9614csccm0vnavvzjmaqsljlm0qi";
+ sha256 = "001v29baa77pkab13d7imi71llixyvffqax8kgjwhm1dhsqlm7bl";
};
cargoLock = fetchurl {
url = "https://github.com/xiph/rav1e/releases/download/v${version}/Cargo.lock";
- sha256 = "0qhgiryb71qgil5nawy7n3mj5g9aiikl3hq3nlikg94rm9dl0dhv";
+ sha256 = "06l8jj75ma5kvz1m14x58an2zvx12i6wcq70gzq5k47nvj5l0zax";
};
installPhase = ''
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;
- cargoSha256 = "185jnmyirfhrv8bxvmwizf3lvq49sjj1696g3gflph31d8bfpb0c";
+ cargoSha256 = "0jxc8qsp5fasnh5cbg6yl9d878n7dppay9gzjndlb65kj9j43h84";
nativeBuildInputs = [ nasm ];
diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
index 0ba0d5546a0..6e38942cb25 100755
--- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl
+++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
@@ -43,6 +43,7 @@ Usage: nixos-container list
[--config ]
[--config-file ]
[--flake ]
+ [--nixos-path ]
nixos-container login
nixos-container root-login
nixos-container run -- args...
@@ -149,6 +150,16 @@ sub buildFlake {
unlink("$systemPath.tmp");
}
+sub clearContainerState {
+ my ($profileDir, $gcRootsDir, $root, $configFile) = @_;
+
+ safeRemoveTree($profileDir) if -e $profileDir;
+ safeRemoveTree($gcRootsDir) if -e $gcRootsDir;
+ system("chattr", "-i", "$root/var/empty") if -e "$root/var/empty";
+ safeRemoveTree($root) if -e $root;
+ unlink($configFile) or die;
+}
+
if ($action eq "create") {
# Acquire an exclusive lock to prevent races with other
# invocations of ‘nixos-container create’.
@@ -226,7 +237,10 @@ if ($action eq "create") {
if (defined $systemPath) {
system("nix-env", "-p", "$profileDir/system", "--set", $systemPath) == 0
- or die "$0: failed to set initial container configuration\n";
+ or do {
+ clearContainerState($profileDir, "$profileDir/$containerName", $root, $confFile);
+ die "$0: failed to set initial container configuration\n";
+ };
} else {
mkpath("$root/etc/nixos", 0, 0755);
@@ -237,7 +251,10 @@ if ($action eq "create") {
system("nix-env", "-p", "$profileDir/system",
"-I", "nixos-config=$nixosConfigFile", "-f", "$nixenvF",
"--set", "-A", "system") == 0
- or die "$0: failed to build initial container configuration\n";
+ or do {
+ clearContainerState($profileDir, "$profileDir/$containerName", $root, $confFile);
+ die "$0: failed to build initial container configuration\n"
+ };
}
print "$containerName\n" if $ensureUniqueName;
@@ -331,11 +348,7 @@ if ($action eq "destroy") {
terminateContainer if (isContainerRunning);
- safeRemoveTree($profileDir) if -e $profileDir;
- safeRemoveTree($gcRootsDir) if -e $gcRootsDir;
- system("chattr", "-i", "$root/var/empty") if -e "$root/var/empty";
- safeRemoveTree($root) if -e $root;
- unlink($confFile) or die;
+ clearContainerState($profileDir, $gcRootsDir, $root, $confFile);
}
elsif ($action eq "restart") {
@@ -374,6 +387,7 @@ elsif ($action eq "update") {
system("nix-env", "-p", "$profileDir/system", "--set", $systemPath) == 0
or die "$0: failed to set container configuration\n";
} else {
+
my $nixosConfigFile = "$root/etc/nixos/configuration.nix";
# FIXME: may want to be more careful about clobbering the existing
@@ -383,8 +397,9 @@ elsif ($action eq "update") {
writeNixOSConfig $nixosConfigFile;
}
+ my $nixenvF = $nixosPath // "";
system("nix-env", "-p", "$profileDir/system",
- "-I", "nixos-config=$nixosConfigFile", "-f", "",
+ "-I", "nixos-config=$nixosConfigFile", "-f", $nixenvF,
"--set", "-A", "system") == 0
or die "$0: failed to build container configuration\n";
}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index dabbfcd6d49..42478f38b84 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -423,6 +423,7 @@ mapAliases ({
smbclient = samba; # added 2018-04-25
slim = throw "slim has been removed. Please use a different display-manager"; # added 2019-11-11
slimThemes = throw "slimThemes has been removed because slim has been also"; # added 2019-11-11
+ sundials_3 = throw "removed 2020-02. outdated and no longer needed";
net_snmp = net-snmp; # added 2019-12-21
spaceOrbit = space-orbit; # addewd 2016-05-23
speech_tools = speech-tools; # added 2018-04-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b70c6856301..d681fd0fe03 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -165,6 +165,8 @@ in
corgi = callPackage ../development/tools/corgi { };
+ colorz = callPackage ../tools/misc/colorz { };
+
dhallToNix = callPackage ../build-support/dhall-to-nix.nix {
inherit dhall-nix;
};
@@ -949,6 +951,8 @@ in
ili2c = callPackage ../tools/misc/ili2c { };
+ imageworsener = callPackage ../tools/graphics/imageworsener { };
+
imgpatchtools = callPackage ../development/mobile/imgpatchtools { };
ipgrep = callPackage ../tools/networking/ipgrep { };
@@ -1776,6 +1780,8 @@ in
fwup = callPackage ../tools/misc/fwup { };
+ fx_cast_bridge = callPackage ../tools/misc/fx_cast { };
+
fzf = callPackage ../tools/misc/fzf { };
fzf-zsh = callPackage ../shells/zsh/fzf-zsh { };
@@ -1964,6 +1970,10 @@ in
opendune = callPackage ../games/opendune { };
+ merriweather = callPackage ../data/fonts/merriweather { };
+
+ merriweather-sans = callPackage ../data/fonts/merriweather-sans { };
+
meson = callPackage ../development/tools/build-managers/meson { };
meson-tools = callPackage ../misc/meson-tools { };
@@ -2624,6 +2634,8 @@ in
cocoapods-beta = lowPrio (callPackage ../development/mobile/cocoapods { beta = true; });
+ codebraid = callPackage ../tools/misc/codebraid { };
+
compass = callPackage ../development/tools/compass { };
conda = callPackage ../tools/package-management/conda { };
@@ -3158,9 +3170,7 @@ in
ethtool = callPackage ../tools/misc/ethtool { };
- ettercap = callPackage ../applications/networking/sniffers/ettercap {
- openssl = openssl_1_0_2;
- };
+ ettercap = callPackage ../applications/networking/sniffers/ettercap { };
euca2ools = callPackage ../tools/virtualization/euca2ools { };
@@ -4051,6 +4061,8 @@ in
hexd = callPackage ../tools/misc/hexd { };
pixd = callPackage ../tools/misc/pixd { };
+ hey = callPackage ../tools/networking/hey { };
+
hhpc = callPackage ../tools/misc/hhpc { };
hiera-eyaml = callPackage ../tools/system/hiera-eyaml { };
@@ -4265,6 +4277,8 @@ in
netmask = callPackage ../tools/networking/netmask {};
+ netifd = callPackage ../tools/networking/netifd {};
+
ipscan = callPackage ../tools/security/ipscan { };
ipv6calc = callPackage ../tools/networking/ipv6calc {};
@@ -6009,6 +6023,8 @@ in
openmpi = callPackage ../development/libraries/openmpi { };
+ ucx = callPackage ../development/libraries/ucx {};
+
openmodelica = callPackage ../applications/science/misc/openmodelica { };
qarte = libsForQt5.callPackage ../applications/video/qarte { };
@@ -6706,6 +6722,8 @@ in
svtplay-dl = callPackage ../tools/misc/svtplay-dl { };
+ sycl-info = callPackage ../development/libraries/sycl-info { };
+
symengine = callPackage ../development/libraries/symengine { };
sysbench = callPackage ../development/tools/misc/sysbench {};
@@ -6728,8 +6746,6 @@ in
w3m = w3m-batch;
};
- netalyzr = callPackage ../tools/networking/netalyzr { };
-
swaks = callPackage ../tools/networking/swaks { };
swiften = callPackage ../development/libraries/swiften { };
@@ -7088,9 +7104,7 @@ in
vbetool = callPackage ../tools/system/vbetool { };
- vde2 = callPackage ../tools/networking/vde2 {
- openssl = openssl_1_0_2;
- };
+ vde2 = callPackage ../tools/networking/vde2 { };
vboot_reference = callPackage ../tools/system/vboot_reference {};
@@ -7881,6 +7895,7 @@ in
llvm-polly = llvmPackages_latest.llvm-polly;
clang-polly = llvmPackages_latest.clang.override { cc = llvmPackages_latest.clang-polly-unwrapped; };
+ clang_10 = llvmPackages_10.clang;
clang_9 = llvmPackages_9.clang;
clang_8 = llvmPackages_8.clang;
clang_7 = llvmPackages_7.clang;
@@ -8575,6 +8590,7 @@ in
lld_7 = llvmPackages_7.lld;
lld_8 = llvmPackages_8.lld;
lld_9 = llvmPackages_9.lld;
+ lld_10 = llvmPackages_10.lld;
lldb = llvmPackages.lldb;
lldb_5 = llvmPackages_5.lldb;
@@ -8582,10 +8598,12 @@ in
lldb_7 = llvmPackages_7.lldb;
lldb_8 = llvmPackages_8.lldb;
lldb_9 = llvmPackages_9.lldb;
+ lldb_10 = llvmPackages_10.lldb;
llvm = llvmPackages.llvm;
llvm-manpages = llvmPackages.llvm-manpages;
+ llvm_10 = llvmPackages_10.llvm;
llvm_9 = llvmPackages_9.llvm;
llvm_8 = llvmPackages_8.llvm;
llvm_7 = llvmPackages_7.llvm;
@@ -8636,7 +8654,15 @@ in
stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
});
- llvmPackages_latest = llvmPackages_9;
+ llvmPackages_10 = callPackage ../development/compilers/llvm/10 ({
+ inherit (stdenvAdapters) overrideCC;
+ buildLlvmTools = buildPackages.llvmPackages_10.tools;
+ targetLlvmLibraries = targetPackages.llvmPackages_10.libraries;
+ } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) {
+ stdenv = gcc7Stdenv;
+ });
+
+ llvmPackages_latest = llvmPackages_9; # llvmPackages_10: when out of RC
lorri = callPackage ../tools/misc/lorri {
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
@@ -9025,6 +9051,8 @@ in
inherit bintools libc;
} // extraArgs; in self);
+ yaml-language-server = nodePackages.yaml-language-server;
+
# prolog
yap = callPackage ../development/compilers/yap { };
@@ -9062,7 +9090,7 @@ in
clooj = callPackage ../development/interpreters/clojure/clooj.nix { };
- dhall = callPackage ../development/interpreters/dhall { };
+ dhall = haskell.lib.justStaticExecutables haskellPackages.dhall;
dhall-nix = haskell.lib.justStaticExecutables haskellPackages.dhall-nix;
@@ -9072,7 +9100,7 @@ in
dhall-text = haskell.lib.justStaticExecutables haskellPackages.dhall-text;
- dhallPackages = import ../development/dhall-modules { inherit pkgs; };
+ dhallPackages = callPackages ./dhall-packages.nix { };
duktape = callPackage ../development/interpreters/duktape { };
@@ -9132,7 +9160,7 @@ in
kanif = callPackage ../applications/networking/cluster/kanif { };
lumo = callPackage ../development/interpreters/clojurescript/lumo {
- nodejs = nodejs-10_x;
+ nodejs = nodejs-13_x;
};
lxappearance = callPackage ../desktops/lxde/core/lxappearance {
@@ -9219,23 +9247,19 @@ in
};
octave = callPackage ../development/interpreters/octave {
- qt = null;
- qscintilla = null;
- ghostscript = null;
- graphicsmagick = null;
- llvm = null;
- hdf5 = null;
- glpk = null;
- suitesparse = null;
- jdk = null;
+ python = python3;
openblas = if stdenv.isDarwin then openblasCompat else openblas;
};
-
- octaveFull = (lowPrio (octave.override {
- qt = qt4;
- inherit qscintilla;
- overridePlatforms = ["x86_64-linux" "x86_64-darwin"];
+ octave-jit = callPackage ../development/interpreters/octave {
+ python = python3;
openblas = if stdenv.isDarwin then openblasCompat else openblas;
+ enableJIT = true;
+ };
+ octaveFull = (lowPrio (libsForQt512.callPackage ../development/interpreters/octave {
+ python = python3;
+ openblas = if stdenv.isDarwin then openblasCompat else openblas;
+ enableQt = true;
+ overridePlatforms = ["x86_64-linux" "x86_64-darwin"];
}));
ocropus = callPackage ../applications/misc/ocropus { };
@@ -11133,6 +11157,10 @@ in
cpp-netlib = callPackage ../development/libraries/cpp-netlib {};
+ ubus = callPackage ../development/libraries/ubus { };
+
+ uci = callPackage ../development/libraries/uci { };
+
uri = callPackage ../development/libraries/uri { };
cppcms = callPackage ../development/libraries/cppcms { };
@@ -11228,6 +11256,8 @@ in
dlib = callPackage ../development/libraries/dlib { };
+ doctest = callPackage ../development/libraries/doctest { };
+
docopt_cpp = callPackage ../development/libraries/docopt_cpp { };
dotconf = callPackage ../development/libraries/dotconf { };
@@ -12456,7 +12486,9 @@ in
libfakekey = callPackage ../development/libraries/libfakekey { };
- libfido2 = callPackage ../development/libraries/libfido2 { };
+ libfido2 = callPackage ../development/libraries/libfido2 {
+ inherit (darwin.apple_sdk.frameworks) IOKit;
+ };
libfilezilla = callPackage ../development/libraries/libfilezilla { };
@@ -13307,6 +13339,8 @@ in
asciidoc = asciidoc-full;
};
+ lyra = callPackage ../development/libraries/lyra { };
+
lzo = callPackage ../development/libraries/lzo { };
opencl-clang = callPackage ../development/libraries/opencl-clang { };
@@ -13476,9 +13510,7 @@ in
nghttp2 = callPackage ../development/libraries/nghttp2 { };
libnghttp2 = nghttp2.lib;
- nix-plugins = callPackage ../development/libraries/nix-plugins {
- nix = nixUnstable;
- };
+ nix-plugins = callPackage ../development/libraries/nix-plugins {};
nika-fonts = callPackage ../data/fonts/nika-fonts { };
@@ -14396,9 +14428,13 @@ in
withQt5 = false;
};
- sundials = callPackage ../development/libraries/sundials { };
+ sundials = callPackage ../development/libraries/sundials {
+ python = python3;
+ };
- sundials_3 = callPackage ../development/libraries/sundials/3.x.nix { };
+ sundials_2 = callPackage ../development/libraries/sundials/2.x.nix {
+ python = python3;
+ };
sutils = callPackage ../tools/misc/sutils { };
@@ -14427,7 +14463,7 @@ in
taglib-sharp = callPackage ../development/libraries/taglib-sharp { };
talloc = callPackage ../development/libraries/talloc {
- python = buildPackages.python2;
+ python = buildPackages.python3;
};
tclap = callPackage ../development/libraries/tclap {};
@@ -15343,6 +15379,8 @@ in
jetty = callPackage ../servers/http/jetty { };
+ keycloak = callPackage ../servers/keycloak { };
+
knot-dns = callPackage ../servers/dns/knot-dns { };
knot-resolver = callPackage ../servers/dns/knot-resolver { };
@@ -15673,6 +15711,8 @@ in
vmfs-tools = callPackage ../tools/filesystems/vmfs-tools { };
+ patroni = callPackage ../servers/sql/patroni { pythonPackages = python3Packages; };
+
pgbouncer = callPackage ../servers/sql/pgbouncer { };
pgpool = callPackage ../servers/sql/pgpool {
@@ -17424,6 +17464,8 @@ in
corefonts = callPackage ../data/fonts/corefonts { };
+ cozette = callPackage ../data/fonts/cozette { };
+
culmus = callPackage ../data/fonts/culmus { };
clearlyU = callPackage ../data/fonts/clearlyU
@@ -18067,6 +18109,8 @@ in
victor-mono = callPackage ../data/fonts/victor-mono { };
+ vimix-gtk-themes = callPackage ../data/themes/vimix {};
+
vistafonts = callPackage ../data/fonts/vista-fonts { };
vistafonts-chs = callPackage ../data/fonts/vista-fonts-chs { };
@@ -18615,6 +18659,8 @@ in
cvsps = callPackage ../applications/version-management/cvsps { };
+ cvsq = callPackage ../applications/version-management/cvsq { };
+
cvs2svn = callPackage ../applications/version-management/cvs2svn { };
cwm = callPackage ../applications/window-managers/cwm { };
@@ -18933,6 +18979,8 @@ in
eteroj.lv2 = libsForQt5.callPackage ../applications/audio/eteroj.lv2 { };
+ etesync-dav = callPackage ../applications/misc/etesync-dav {};
+
etherape = callPackage ../applications/networking/sniffers/etherape { };
evilvte = callPackage ../applications/misc/evilvte (config.evilvte or {});
@@ -20448,6 +20496,8 @@ in
mpc-qt = libsForQt5.callPackage ../applications/video/mpc-qt { };
+ mps-youtube = callPackage ../applications/misc/mps-youtube { };
+
mplayer = callPackage ../applications/video/mplayer ({
libdvdnav = libdvdnav_4_2_1;
} // (config.mplayer or {}));
@@ -20604,6 +20654,15 @@ in
shogun = callPackage ../applications/science/machine-learning/shogun {
stdenv = gcc8Stdenv;
+
+ # Workaround for the glibc abi version mismatch.
+ # Please note that opencv builds are by default disabled.
+ opencv = opencv3.override {
+ stdenv = gcc8Stdenv;
+ openexr = openexr.override {
+ stdenv = gcc8Stdenv;
+ };
+ };
};
sky = callPackage ../applications/networking/instant-messengers/sky {};
@@ -21539,6 +21598,10 @@ in
skanlite = libsForQt5.callPackage ../applications/office/skanlite { };
+ sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup {
+ inherit (pkgs.vamp) vampSDK;
+ };
+
sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser {
inherit (pkgs.vamp) vampSDK;
};
@@ -23968,6 +24031,8 @@ in
mrbayes = callPackage ../applications/science/biology/mrbayes { };
+ mrtrix = callPackage ../applications/science/biology/mrtrix { python = python3; };
+
megahit = callPackage ../applications/science/biology/megahit { };
messer-slim = callPackage ../applications/science/biology/messer-slim { };
@@ -25206,6 +25271,8 @@ in
nix-prefetch-svn
nix-prefetch-scripts;
+ nix-query-tree-viewer = callPackage ../tools/nix/nix-query-tree-viewer { };
+
nix-update-source = callPackage ../tools/package-management/nix-update-source {};
nix-script = callPackage ../tools/nix/nix-script {};
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index 4faaf86040d..565410cc5f6 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -54,7 +54,12 @@ let
mathcompCorePkgs_1_9 mathcomp_1_9
mathcomp-ssreflect_1_9 mathcomp-fingroup_1_9 mathcomp-algebra_1_9
- mathcomp-solvable_1_9 mathcomp-field_1_9 mathcomp-character_1_9;
+ mathcomp-solvable_1_9 mathcomp-field_1_9 mathcomp-character_1_9
+
+ mathcompCorePkgs_1_10 mathcomp_1_10
+ mathcomp-ssreflect_1_10 mathcomp-fingroup_1_10 mathcomp-algebra_1_10
+ mathcomp-solvable_1_10 mathcomp-field_1_10 mathcomp-character_1_10
+ ;
inherit (callPackage ../development/coq-modules/mathcomp/extra.nix { })
mathcompExtraGen multinomials coqeal
diff --git a/pkgs/top-level/dhall-packages.nix b/pkgs/top-level/dhall-packages.nix
new file mode 100644
index 00000000000..6cdd84c2279
--- /dev/null
+++ b/pkgs/top-level/dhall-packages.nix
@@ -0,0 +1,28 @@
+{ lib
+, newScope
+, overrides ? (self: super: {})
+}:
+
+let
+ packages = self:
+ let
+ callPackage = newScope self;
+
+ buildDhallPackage =
+ callPackage ../development/interpreters/dhall/build-dhall-package.nix { };
+
+ in
+ { inherit buildDhallPackage;
+
+ dhall-kubernetes =
+ callPackage ../development/dhall-modules/dhall-kubernetes.nix { };
+
+ dhall-packages =
+ callPackage ../development/dhall-modules/dhall-packages.nix { };
+
+ Prelude =
+ callPackage ../development/dhall-modules/Prelude.nix { };
+ };
+
+in
+ lib.fix' (lib.extends overrides packages)
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index baa1d862e53..dc7abbd15a6 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -623,6 +623,8 @@ let
pgocaml = callPackage ../development/ocaml-modules/pgocaml {};
+ pgocaml_ppx = callPackage ../development/ocaml-modules/pgocaml/ppx.nix {};
+
ocaml-sat-solvers = callPackage ../development/ocaml-modules/ocaml-sat-solvers { };
ocamlscript = callPackage ../development/tools/ocaml/ocamlscript { };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 9401a76ca3e..57f24021739 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3652,8 +3652,8 @@ let
url = mirror://cpan/authors/id/T/TT/TTAR/Crypt-OpenSSL-AES-0.02.tar.gz;
sha256 = "b66fab514edf97fc32f58da257582704a210c2b35e297d5c31b7fa2ffd08e908";
};
- NIX_CFLAGS_COMPILE = "-I${pkgs.openssl_1_0_2.dev}/include";
- NIX_CFLAGS_LINK = "-L${pkgs.openssl_1_0_2.out}/lib -lcrypto";
+ NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include";
+ NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto";
meta = with stdenv.lib; {
description = "Perl wrapper around OpenSSL's AES library";
license = with licenses; [ artistic1 gpl1Plus ];
@@ -3667,8 +3667,8 @@ let
url = mirror://cpan/authors/id/K/KM/KMX/Crypt-OpenSSL-Bignum-0.09.tar.gz;
sha256 = "1p22znbajq91lbk2k3yg12ig7hy5b4vy8igxwqkmbm4nhgxp4ki3";
};
- NIX_CFLAGS_COMPILE = "-I${pkgs.openssl_1_0_2.dev}/include";
- NIX_CFLAGS_LINK = "-L${pkgs.openssl_1_0_2.out}/lib -lcrypto";
+ NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include";
+ NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto";
};
CryptOpenSSLGuess = buildPerlPackage {
@@ -3705,8 +3705,8 @@ let
sha256 = "4173403ad4cf76732192099f833fbfbf3cd8104e0246b3844187ae384d2c5436";
};
propagatedBuildInputs = [ CryptOpenSSLRandom ];
- NIX_CFLAGS_COMPILE = "-I${pkgs.openssl_1_0_2.dev}/include";
- NIX_CFLAGS_LINK = "-L${pkgs.openssl_1_0_2.out}/lib -lcrypto";
+ NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include";
+ NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto";
buildInputs = [ CryptOpenSSLGuess ];
};
@@ -3769,7 +3769,7 @@ let
url = mirror://cpan/authors/id/N/NA/NANIS/Crypt-SSLeay-0.72.tar.gz;
sha256 = "1s7zm6ph37kg8jzaxnhi4ff4snxl7mi5h14arxbri0kp6s0lzlzm";
};
- makeMakerFlags = "--libpath=${pkgs.openssl_1_0_2.out}/lib --incpath=${pkgs.openssl_1_0_2.dev}/include";
+ makeMakerFlags = "--libpath=${pkgs.openssl.out}/lib --incpath=${pkgs.openssl.dev}/include";
buildInputs = [ PathClass ];
propagatedBuildInputs = [ LWPProtocolHttps ];
};
@@ -9478,11 +9478,11 @@ let
# TODO: use CPAN version
ImageExifTool = buildPerlPackage {
pname = "Image-ExifTool";
- version = "11.70";
+ version = "11.85";
src = fetchurl {
- url = "https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-11.70.tar.gz";
- sha256 = "1z0s0zvga24m9dzp1lnrsvwv9qmvn21ifd9in520sd54ld774ifp";
+ url = "https://exiftool.org/Image-ExifTool-11.85.tar.gz";
+ sha256 = "15zqm0ly2b3paqg0ym44ib2mvh6k18a9q5rvdirwipqa127al2lb";
};
nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang;
@@ -9492,7 +9492,7 @@ let
meta = with stdenv.lib; {
description = "A tool to read, write and edit EXIF meta information";
- homepage = https://www.sno.phy.queensu.ca/~phil/exiftool/;
+ homepage = "https://exiftool.org/";
longDescription = ''
ExifTool is a platform-independent Perl library plus a command-line
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index eb0ddf2dc29..5903b535f60 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -201,13 +201,13 @@ let
maxminddb = buildPecl rec {
pname = "maxminddb";
- version = "1.5.0";
+ version = "1.6.0";
src = pkgs.fetchFromGitHub {
owner = "maxmind";
repo = "MaxMind-DB-Reader-php";
rev = "v${version}";
- sha256 = "1ilgpx36rgihjr8s4bvkbms5hl6xy7mymna3ym2bl4lb15vkr0sm";
+ sha256 = "0sa943ij9pgz55aik93lllb8lh063bvr66ibn77p3y3p41vdiabz";
};
buildInputs = [ pkgs.libmaxminddb ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2b9a8bb8c25..99d321ada39 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1203,6 +1203,8 @@ in {
simplefix = callPackage ../development/python-modules/simplefix { };
+ pyscrypt = callPackage ../development/python-modules/pyscrypt { };
+
pyside2-tools = toPythonModule (callPackage ../development/python-modules/pyside2-tools {
inherit (pkgs) cmake qt5;
});
@@ -1496,7 +1498,7 @@ in {
webapp2 = callPackage ../development/python-modules/webapp2 { };
wordcloud = callPackage ../development/python-modules/wordcloud { };
-
+
wrf-python = callPackage ../development/python-modules/wrf-python { };
pyunbound = callPackage ../tools/networking/unbound/python.nix { };
@@ -1690,7 +1692,7 @@ in {
asn1ate = callPackage ../development/python-modules/asn1ate { };
- atlassian-python-api = callPackage ../development/python-modules/atlassian-python-api { };
+ atlassian-python-api = callPackage ../development/python-modules/atlassian-python-api { };
atomiclong = callPackage ../development/python-modules/atomiclong { };
@@ -1770,6 +1772,8 @@ in {
beaker = callPackage ../development/python-modules/beaker { };
+ bespon = callPackage ../development/python-modules/bespon { };
+
betamax = callPackage ../development/python-modules/betamax {};
betamax-matchers = callPackage ../development/python-modules/betamax-matchers { };
@@ -1904,6 +1908,8 @@ in {
cvxopt = callPackage ../development/python-modules/cvxopt { };
+ cvxpy = callPackage ../development/python-modules/cvxpy { };
+
cycler = callPackage ../development/python-modules/cycler { };
cysignals = callPackage ../development/python-modules/cysignals { };
@@ -2641,6 +2647,8 @@ in {
Fabric = callPackage ../development/python-modules/Fabric { };
+ fastdtw = callPackage ../development/python-modules/fastdtw { };
+
faulthandler = if ! isPy3k
then callPackage ../development/python-modules/faulthandler {}
else throw "faulthandler is built into ${python.executable}";
@@ -2737,6 +2745,8 @@ in {
google-pasta = callPackage ../development/python-modules/google-pasta { };
+ googletrans = callPackage ../development/python-modules/googletrans { };
+
gpapi = callPackage ../development/python-modules/gpapi { };
gplaycli = callPackage ../development/python-modules/gplaycli { };
@@ -3431,6 +3441,8 @@ in {
hg-git = callPackage ../development/python-modules/hg-git { };
+ hg-evolve = callPackage ../development/python-modules/hg-evolve { };
+
dtopt = callPackage ../development/python-modules/dtopt { };
easywatch = callPackage ../development/python-modules/easywatch { };
@@ -3451,6 +3463,8 @@ in {
et_xmlfile = callPackage ../development/python-modules/et_xmlfile { };
+ etesync = callPackage ../development/python-modules/etesync { };
+
eventlet = callPackage ../development/python-modules/eventlet { };
exifread = callPackage ../development/python-modules/exifread { };
@@ -3807,6 +3821,10 @@ in {
inherit (pkgs) pkgconfig;
};
+ graphql-core = callPackage ../development/python-modules/graphql-core { };
+
+ graphql-server-core = callPackage ../development/python-modules/graphql-server-core { };
+
grammalecte = callPackage ../development/python-modules/grammalecte { };
greenlet = callPackage ../development/python-modules/greenlet { };
@@ -4406,7 +4424,7 @@ in {
nbconvert = callPackage ../development/python-modules/nbconvert { };
- nbformat = if isPy3k then
+ nbformat = if isPy3k then
callPackage ../development/python-modules/nbformat { }
else callPackage ../development/python-modules/nbformat/2.nix { };
@@ -4779,6 +4797,8 @@ in {
precis-i18n = callPackage ../development/python-modules/precis-i18n { };
+ promise = callPackage ../development/python-modules/promise { };
+
prox-tv = callPackage ../development/python-modules/prox-tv {
# We need to use blas instead of openblas on darwin,
# see https://github.com/NixOS/nixpkgs/pull/45013.
@@ -5080,6 +5100,8 @@ in {
python-simple-hipchat = callPackage ../development/python-modules/python-simple-hipchat {};
python_simple_hipchat = self.python-simple-hipchat;
+ scs = callPackage ../development/python-modules/scs { scs = pkgs.scs; };
+
python_keyczar = callPackage ../development/python-modules/python_keyczar { };
python-language-server = callPackage ../development/python-modules/python-language-server {};
@@ -5478,7 +5500,10 @@ in {
scp = callPackage ../development/python-modules/scp {};
- seaborn = callPackage ../development/python-modules/seaborn { };
+ seaborn = if isPy3k then
+ callPackage ../development/python-modules/seaborn { }
+ else
+ callPackage ../development/python-modules/seaborn/0.9.1.nix { };
seabreeze = callPackage ../development/python-modules/seabreeze { };
@@ -6491,8 +6516,6 @@ in {
maildir-deduplicate = callPackage ../development/python-modules/maildir-deduplicate { };
- mps-youtube = callPackage ../development/python-modules/mps-youtube { };
-
d2to1 = callPackage ../development/python-modules/d2to1 { };
ovh = callPackage ../development/python-modules/ovh { };
@@ -6948,6 +6971,8 @@ in {
qiskit = callPackage ../development/python-modules/qiskit { };
+ qiskit-terra = callPackage ../development/python-modules/qiskit-terra { };
+
qasm2image = callPackage ../development/python-modules/qasm2image { };
simpy = callPackage ../development/python-modules/simpy { };