diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index 68dd59958c30..c0dc741eabca 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -735,6 +735,62 @@ sets at once: } ``` +### How to specify source overrides for your Haskell package + +When starting a Haskell project you can use `developPackage` +to define a derivation for your package at the `root` path +as well as source override versions for Hackage packages, like so: + +```nix +# default.nix +{ compilerVersion ? "ghc842" }: +let + # pinning nixpkgs using new Nix 2.0 builtin `fetchGit` + pkgs = import (fetchGit (import ./version.nix)) { }; + compiler = pkgs.haskell.packages."${compilerVersion}"; + pkg = compiler.developPackage { + root = ./.; + source-overrides = { + # Let's say the GHC 8.4.2 haskellPackages uses 1.6.0.0 and your test suite is incompatible with >= 1.6.0.0 + HUnit = "1.5.0.0"; + }; + }; +in pkg +``` + +This could be used in place of a simplified `stack.yaml` defining a Nix +derivation for your Haskell package. + +As you can see this allows you to specify only the source version found on +Hackage and nixpkgs will take care of the rest. + +You can also specify `buildInputs` for your Haskell derivation for packages +that directly depend on external libraries like so: + +```nix +# default.nix +{ compilerVersion ? "ghc842" }: +let + # pinning nixpkgs using new Nix 2.0 builtin `fetchGit` + pkgs = import (fetchGit (import ./version.nix)) { }; + compiler = pkgs.haskell.packages."${compilerVersion}"; + pkg = compiler.developPackage { + root = ./.; + source-overrides = { + HUnit = "1.5.0.0"; # Let's say the GHC 8.4.2 haskellPackages uses 1.6.0.0 and your test suite is incompatible with >= 1.6.0.0 + }; + }; + # in case your package source depends on any libraries directly, not just transitively. + buildInputs = [ zlib ]; +in pkg.overrideAttrs(attrs: { + buildInputs = attrs.buildInputs ++ buildInputs; +}) +``` + +Notice that you will need to override (via `overrideAttrs` or similar) the +derivation returned by the `developPackage` Nix lambda as there is no `buildInputs` +named argument you can pass directly into the `developPackage` lambda. + ### How to recover from GHC's infamous non-deterministic library ID bug GHC and distributed build farms don't get along well: diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 7d70ce4a2abf..4daf488bb28f 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -200,7 +200,7 @@ building Python libraries is `buildPythonPackage`. Let's see how we can build th doCheck = false; meta = { - homepage = "http://github.com/pytoolz/toolz/"; + homepage = "https://github.com/pytoolz/toolz/"; description = "List processing tools and functional utilities"; license = licenses.bsd3; maintainers = with maintainers; [ fridh ]; @@ -245,7 +245,7 @@ with import {}; doCheck = false; meta = { - homepage = "http://github.com/pytoolz/toolz/"; + homepage = "https://github.com/pytoolz/toolz/"; description = "List processing tools and functional utilities"; }; }; diff --git a/lib/generators.nix b/lib/generators.nix index c09384c00f57..073bb6982e14 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -173,6 +173,53 @@ rec { fna); in if fna == {} then "<λ>" else "<λ:{${showFnas}}>" - else abort "toPretty: should never happen (v = ${v})"; + else abort "generators.toPretty: should never happen (v = ${v})"; + + # PLIST handling + toPlist = {}: v: let + expr = ind: x: with builtins; + if isNull x then "" else + if isBool x then bool ind x else + if isInt x then int ind x else + if isString x then str ind x else + if isList x then list ind x else + if isAttrs x then attrs ind x else + abort "generators.toPlist: should never happen (v = ${v})"; + + literal = ind: x: ind + x; + + bool = ind: x: literal ind (if x then "" else ""); + int = ind: x: literal ind "${toString x}"; + str = ind: x: literal ind "${x}"; + key = ind: x: literal ind "${x}"; + + indent = ind: expr "\t${ind}"; + + item = ind: libStr.concatMapStringsSep "\n" (indent ind); + + list = ind: x: libStr.concatStringsSep "\n" [ + (literal ind "") + (item ind x) + (literal ind "") + ]; + + attrs = ind: x: libStr.concatStringsSep "\n" [ + (literal ind "") + (attr ind x) + (literal ind "") + ]; + + attr = let attrFilter = name: value: name != "_module" && value != null; + in ind: x: libStr.concatStringsSep "\n" (lib.flatten (lib.mapAttrsToList + (name: value: lib.optional (attrFilter name value) [ + (key "\t${ind}" name) + (expr "\t${ind}" value) + ]) x)); + + in '' + + +${expr "" v} +''; } diff --git a/lib/modules.nix b/lib/modules.nix index 8baae4917053..20207b31d35b 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -493,7 +493,7 @@ rec { inherit priority content; }; - mkOptionDefault = mkOverride 1001; # priority of option defaults + mkOptionDefault = mkOverride 1500; # priority of option defaults mkDefault = mkOverride 1000; # used in config sections of non-user modules to set a default mkForce = mkOverride 50; mkVMOverride = mkOverride 10; # used by ‘nixos-rebuild build-vm’ @@ -532,9 +532,7 @@ rec { # mkAliasDefinitions = mkAliasAndWrapDefinitions id; mkAliasAndWrapDefinitions = wrap: option: - mkMerge - (optional (isOption option && option.isDefined) - (wrap (mkMerge option.definitions))); + mkIf (isOption option && option.isDefined) (wrap (mkMerge option.definitions)); /* Compatibility. */ @@ -669,22 +667,26 @@ rec { }; doRename = { from, to, visible, warn, use }: + { config, options, ... }: let + fromOpt = getAttrFromPath from options; + toOpt = getAttrFromPath to options; toOf = attrByPath to (abort "Renaming error: option `${showOption to}' does not exist."); in - { config, options, ... }: - { options = setAttrByPath from (mkOption { - inherit visible; - description = "Alias of ."; - apply = x: use (toOf config); - }); - config = { - warnings = - let opt = getAttrFromPath from options; in - optional (warn && opt.isDefined) - "The option `${showOption from}' defined in ${showFiles opt.files} has been renamed to `${showOption to}'."; - } // setAttrByPath to (mkAliasDefinitions (getAttrFromPath from options)); - }; + { + options = setAttrByPath from (mkOption { + inherit visible; + description = "Alias of ."; + apply = x: use (toOf config); + }); + config = mkMerge [ + { + warnings = optional (warn && fromOpt.isDefined) + "The option `${showOption from}' defined in ${showFiles fromOpt.files} has been renamed to `${showOption to}'."; + } + (mkAliasAndWrapDefinitions (setAttrByPath to) fromOpt) + ]; + }; } diff --git a/lib/systems/default.nix b/lib/systems/default.nix index ee4c29660a55..5eacc9eb23e1 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -46,7 +46,6 @@ rec { # Misc boolean options useAndroidPrebuilt = false; useiOSPrebuilt = false; - isiPhoneSimulator = false; } // mapAttrs (n: v: v final.parsed) inspect.predicates // args; in assert final.useAndroidPrebuilt -> final.isAndroid; diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 108996206a7d..31772ba0054d 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -100,6 +100,8 @@ rec { config = "aarch64-apple-ios"; # config = "aarch64-apple-darwin14"; sdkVer = "10.2"; + xcodeVer = "8.2"; + xcodePlatform = "iPhoneOS"; useiOSPrebuilt = true; platform = {}; }; @@ -108,6 +110,8 @@ rec { config = "armv7a-apple-ios"; # config = "arm-apple-darwin10"; sdkVer = "10.2"; + xcodeVer = "8.2"; + xcodePlatform = "iPhoneOS"; useiOSPrebuilt = true; platform = {}; }; @@ -116,8 +120,9 @@ rec { config = "x86_64-apple-ios"; # config = "x86_64-apple-darwin14"; sdkVer = "10.2"; + xcodeVer = "8.2"; + xcodePlatform = "iPhoneSimulator"; useiOSPrebuilt = true; - isiPhoneSimulator = true; platform = {}; }; @@ -125,8 +130,9 @@ rec { config = "i686-apple-ios"; # config = "i386-apple-darwin11"; sdkVer = "10.2"; + xcodeVer = "8.2"; + xcodePlatform = "iPhoneSimulator"; useiOSPrebuilt = true; - isiPhoneSimulator = true; platform = {}; }; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d99ce88d61ef..16bd5795b245 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -581,7 +581,7 @@ email = "brandon.barker@gmail.com"; github = "bbarker"; name = "Brandon Elam Barker"; - }; + }; bcarrell = { email = "brandoncarrell@gmail.com"; github = "bcarrell"; @@ -1707,6 +1707,11 @@ github = "igsha"; name = "Igor Sharonov"; }; + iimog = { + email = "iimog@iimog.org"; + github = "iimog"; + name = "Markus J. Ankenbrand"; + }; ikervagyok = { email = "ikervagyok@gmail.com"; github = "ikervagyok"; @@ -1717,6 +1722,16 @@ github = "ilya-kolpakov"; name = "Ilya Kolpakov"; }; + imalison = { + email = "IvanMalison@gmail.com"; + github = "IvanMalison"; + name = "Ivan Malison"; + }; + imalsogreg = { + email = "imalsogreg@gmail.com"; + github = "imalsogreg"; + name = "Greg Hale"; + }; infinisil = { email = "infinisil@icloud.com"; github = "infinisil"; @@ -3092,6 +3107,11 @@ github = "pmiddend"; name = "Philipp Middendorf"; }; + pmyjavec = { + email = "pauly@myjavec.com"; + github = "pmyjavec"; + name = "Pauly Myjavec"; + }; pneumaticat = { email = "kevin@potatofrom.space"; github = "pneumaticat"; @@ -3871,6 +3891,11 @@ github = "timor"; name = "timor"; }; + timput = { + email = "tim@timput.com"; + github = "TimPut"; + name = "Tim Put"; + }; tiramiseb = { email = "sebastien@maccagnoni.eu"; github = "tiramiseb"; @@ -3906,6 +3931,11 @@ github = "tokudan"; name = "Daniel Frank"; }; + tomahna = { + email = "kevin.rauscher@tomahna.fr"; + github = "Tomahna"; + name = "Kevin Rauscher"; + }; tomberek = { email = "tomberek@gmail.com"; github = "tomberek"; diff --git a/nixos/modules/i18n/input-method/default.xml b/nixos/modules/i18n/input-method/default.xml index 76ffa8cb7e37..eb75b7415c9c 100644 --- a/nixos/modules/i18n/input-method/default.xml +++ b/nixos/modules/i18n/input-method/default.xml @@ -68,6 +68,18 @@ ibus.engines = with pkgs.ibus-engines; [ table table-others ]; To use any input method, the package must be added in the configuration, as shown above, and also (after running nixos-rebuild) the input method must be added from IBus' preference dialog. + + + Troubleshooting + If IBus works in some applications but not others, a likely cause of + this is that IBus is depending on a different version of + glib to what the applications are depending on. This can + be checked by running nix-store -q --requisites <path> | grep + glib, where <path> is the path of either + IBus or an application in the Nix store. The glib + packages must match exactly. If they do not, uninstalling and reinstalling + the application is a likely fix. +
Fcitx diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 193ef0d1c961..ea996acebb20 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -242,6 +242,7 @@ ./services/desktops/gnome3/tracker-miners.nix ./services/desktops/profile-sync-daemon.nix ./services/desktops/telepathy.nix + ./services/development/bloop.nix ./services/development/hoogle.nix ./services/editors/emacs.nix ./services/editors/infinoted.nix @@ -486,6 +487,7 @@ ./services/networking/flannel.nix ./services/networking/flashpolicyd.nix ./services/networking/freenet.nix + ./services/networking/freeradius.nix ./services/networking/gale.nix ./services/networking/gateone.nix ./services/networking/gdomap.nix @@ -662,6 +664,7 @@ ./services/web-apps/tt-rss.nix ./services/web-apps/selfoss.nix ./services/web-apps/quassel-webserver.nix + ./services/web-apps/virtlyst.nix ./services/web-apps/youtrack.nix ./services/web-servers/apache-httpd/default.nix ./services/web-servers/caddy.nix diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix index 21d82469c605..2d14762e8685 100644 --- a/nixos/modules/services/backup/restic.nix +++ b/nixos/modules/services/backup/restic.nix @@ -14,7 +14,15 @@ with lib; Read the repository password from a file. ''; example = "/etc/nixos/restic-password"; + }; + s3CredentialsFile = mkOption { + type = with types; nullOr str; + description = '' + file containing the AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY + for an S3-hosted repository, in the format of an EnvironmentFile + as described by systemd.exec(5) + ''; }; repository = mkOption { @@ -134,6 +142,8 @@ with lib; Type = "oneshot"; ExecStart = "${resticCmd} backup ${concatStringsSep " " backup.extraBackupArgs} ${concatStringsSep " " backup.paths}"; User = backup.user; + } // optionalAttrs (backup.s3CredentialsFile != null) { + EnvironmentFile = backup.s3CredentialsFile; }; } // optionalAttrs backup.initialize { preStart = '' diff --git a/nixos/modules/services/development/bloop.nix b/nixos/modules/services/development/bloop.nix new file mode 100644 index 000000000000..56904b7c40e6 --- /dev/null +++ b/nixos/modules/services/development/bloop.nix @@ -0,0 +1,37 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.bloop; + +in { + + options.services.bloop = { + install = mkOption { + type = types.bool; + default = false; + description = '' + Whether to install a user service for the Bloop server. + + The service must be manually started for each user with + "systemctl --user start bloop". + ''; + }; + }; + + config = mkIf (cfg.install) { + systemd.user.services.bloop = { + description = "Bloop Scala build server"; + + serviceConfig = { + Type = "simple"; + ExecStart = ''${pkgs.bloop}/bin/blp-server''; + Restart = "always"; + }; + }; + + environment.systemPackages = [ pkgs.bloop ]; + }; +} diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 816234506593..4e51725b19de 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -9,18 +9,11 @@ let # /var/lib/misc is for dnsmasq.leases. stateDirs = "/var/lib/NetworkManager /var/lib/dhclient /var/lib/misc"; - dns = - if cfg.dns == "none" then "none" - else if cfg.dns == "dnsmasq" then "dnsmasq" - else if config.services.resolved.enable then "systemd-resolved" - else if config.services.unbound.enable then "unbound" - else "default"; - configFile = writeText "NetworkManager.conf" '' [main] plugins=keyfile dhcp=${cfg.dhcp} - dns=${dns} + dns=${cfg.dns} [keyfile] ${optionalString (cfg.unmanaged != []) @@ -217,19 +210,73 @@ in { }; dns = mkOption { - type = types.enum [ "auto" "dnsmasq" "none" ]; - default = "auto"; + type = types.enum [ "default" "dnsmasq" "unbound" "systemd-resolved" "none" ]; + default = "default"; description = '' + Set the DNS (resolv.conf) processing mode. + + Options: - - auto: Check for systemd-resolved, unbound, or use default. - - dnsmasq: - Enable NetworkManager's dnsmasq integration. NetworkManager will run - dnsmasq as a local caching nameserver, using a "split DNS" - configuration if you are connected to a VPN, and then update - resolv.conf to point to the local nameserver. - - none: - Disable NetworkManager's DNS integration completely. - It will not touch your /etc/resolv.conf. + + + "default" + + NetworkManager will update /etc/resolv.conf to + reflect the nameservers provided by currently active connections. + + + + "dnsmasq" + + + Enable NetworkManager's dnsmasq integration. NetworkManager will + run dnsmasq as a local caching nameserver, using a "split DNS" + configuration if you are connected to a VPN, and then update + resolv.conf to point to the local nameserver. + + + It is possible to pass custom options to the dnsmasq instance by + adding them to files in the + /etc/NetworkManager/dnsmasq.d/ directory. + + + When multiple upstream servers are available, dnsmasq will + initially contact them in parallel and then use the fastest to + respond, probing again other servers after some time. This + behavior can be modified passing the + all-servers or strict-order + options to dnsmasq (see the manual page for more details). + + + Note that this option causes NetworkManager to launch and manage + its own instance of the dnsmasq daemon, which is + not the same as setting + services.dnsmasq.enable = true;. + + + + + "unbound" + + NetworkManager will talk to unbound and dnssec-triggerd, + providing a "split DNS" configuration with DNSSEC support. + /etc/resolv.conf will be managed by + dnssec-trigger daemon. + + + + "systemd-resolved" + + NetworkManager will push the DNS configuration to systemd-resolved. + + + + "none" + + NetworkManager will not modify resolv.conf. + + + ''; }; diff --git a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix index ad211f41eef0..b16d299917fe 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix @@ -938,9 +938,12 @@ in { protection. ''; - hw_offload = mkYesNoParam no '' + hw_offload = mkEnumParam ["yes" "no" "auto"] "no" '' Enable hardware offload for this CHILD_SA, if supported by the IPsec - implementation. + implementation. The value yes enforces offloading + and the installation will fail if it's not supported by either kernel or + device. The value auto enables offloading, if it's + supported, but the installation does not fail otherwise. ''; start_action = mkEnumParam ["none" "trap" "start"] "none" '' diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix index 07936faaa133..1a35979ad44c 100644 --- a/nixos/modules/services/networking/unbound.nix +++ b/nixos/modules/services/networking/unbound.nix @@ -131,6 +131,9 @@ in }; }; + # If networkmanager is enabled, ask it to interface with unbound. + networking.networkmanager.dns = "unbound"; + }; } diff --git a/nixos/modules/services/networking/zerotierone.nix b/nixos/modules/services/networking/zerotierone.nix index cd1617b8e2ba..4c1ee75d536c 100644 --- a/nixos/modules/services/networking/zerotierone.nix +++ b/nixos/modules/services/networking/zerotierone.nix @@ -47,7 +47,7 @@ in }; # ZeroTier does not issue DHCP leases, but some strangers might... - networking.dhcpcd.denyInterfaces = [ "zt0" ]; + networking.dhcpcd.denyInterfaces = [ "zt*" ]; # ZeroTier receives UDP transmissions on port 9993 by default networking.firewall.allowedUDPPorts = [ 9993 ]; diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index 643bec188142..248df7351a8c 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -100,6 +100,7 @@ in # Don't restart dbus-daemon. Bad things tend to happen if we do. reloadIfChanged = true; restartTriggers = [ configDir ]; + environment = { LD_LIBRARY_PATH = config.system.nssModules.path; }; }; systemd.user = { diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 610c6463a5eb..1646ee5964fb 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -76,6 +76,8 @@ let define('SMTP_FROM_NAME', '${escape ["'" "\\"] cfg.email.fromName}'); define('SMTP_FROM_ADDRESS', '${escape ["'" "\\"] cfg.email.fromAddress}'); define('DIGEST_SUBJECT', '${escape ["'" "\\"] cfg.email.digestSubject}'); + + ${cfg.extraConfig} ''; in { @@ -431,6 +433,26 @@ let ''; }; + pluginPackages = mkOption { + type = types.listOf types.package; + default = []; + description = '' + List of plugins to install. The list elements are expected to + be derivations. All elements in this derivation are automatically + copied to the plugins.local directory. + ''; + }; + + themePackages = mkOption { + type = types.listOf types.package; + default = []; + description = '' + List of themes to install. The list elements are expected to + be derivations. All elements in this derivation are automatically + copied to the themes.local directory. + ''; + }; + logDestination = mkOption { type = types.enum ["" "sql" "syslog"]; default = "sql"; @@ -441,6 +463,14 @@ let error.log). ''; }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Additional lines to append to config.php. + ''; + }; }; }; @@ -517,6 +547,16 @@ let rm -rf "${cfg.root}/*" mkdir -m 755 -p "${cfg.root}" cp -r "${pkgs.tt-rss}/"* "${cfg.root}" + ${optionalString (cfg.pluginPackages != []) '' + for plugin in ${concatStringsSep " " cfg.pluginPackages}; do + cp -r "$plugin"/* "${cfg.root}/plugins.local/" + done + ''} + ${optionalString (cfg.themePackages != []) '' + for theme in ${concatStringsSep " " cfg.themePackages}; do + cp -r "$theme"/* "${cfg.root}/themes.local/" + done + ''} ln -sf "${tt-rss-config}" "${cfg.root}/config.php" chown -R "${cfg.user}" "${cfg.root}" chmod -R 755 "${cfg.root}" diff --git a/nixos/modules/services/web-apps/virtlyst.nix b/nixos/modules/services/web-apps/virtlyst.nix new file mode 100644 index 000000000000..2fc67435ce82 --- /dev/null +++ b/nixos/modules/services/web-apps/virtlyst.nix @@ -0,0 +1,72 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.virtlyst; + stateDir = "/var/lib/virtlyst"; + + ini = pkgs.writeText "virtlyst-config.ini" '' + [wsgi] + master = true + threads = auto + http-socket = ${cfg.httpSocket} + application = ${pkgs.virtlyst}/lib/libVirtlyst.so + chdir2 = ${stateDir} + static-map = /static=${pkgs.virtlyst}/root/static + + [Cutelyst] + production = true + DatabasePath = virtlyst.sqlite + TemplatePath = ${pkgs.virtlyst}/root/src + + [Rules] + cutelyst.* = true + virtlyst.* = true + ''; + +in + +{ + + options.services.virtlyst = { + enable = mkEnableOption "Virtlyst libvirt web interface"; + + adminPassword = mkOption { + type = types.str; + description = '' + Initial admin password with which the database will be seeded. + ''; + }; + + httpSocket = mkOption { + type = types.str; + default = "localhost:3000"; + description = '' + IP and/or port to which to bind the http socket. + ''; + }; + }; + + config = mkIf cfg.enable { + users.extraUsers.virtlyst = { + home = stateDir; + createHome = true; + group = mkIf config.virtualisation.libvirtd.enable "libvirtd"; + }; + + systemd.services.virtlyst = { + wantedBy = [ "multi-user.target" ]; + environment = { + VIRTLYST_ADMIN_PASSWORD = cfg.adminPassword; + }; + serviceConfig = { + ExecStart = "${pkgs.cutelyst}/bin/cutelyst-wsgi2 --ini ${ini}"; + User = "virtlyst"; + WorkingDirectory = stateDir; + }; + }; + }; + +} diff --git a/nixos/modules/services/web-servers/lighttpd/cgit.nix b/nixos/modules/services/web-servers/lighttpd/cgit.nix index 710fecc0c05c..e6a054c296dc 100644 --- a/nixos/modules/services/web-servers/lighttpd/cgit.nix +++ b/nixos/modules/services/web-servers/lighttpd/cgit.nix @@ -4,8 +4,15 @@ with lib; let cfg = config.services.lighttpd.cgit; + pathPrefix = if stringLength cfg.subdir == 0 then "" else "/" + cfg.subdir; configFile = pkgs.writeText "cgitrc" '' + # default paths to static assets + css=${pathPrefix}/cgit.css + logo=${pathPrefix}/cgit.png + favicon=${pathPrefix}/favicon.ico + + # user configuration ${cfg.configText} ''; in @@ -18,8 +25,17 @@ in type = types.bool; description = '' If true, enable cgit (fast web interface for git repositories) as a - sub-service in lighttpd. cgit will be accessible at - http://yourserver/cgit + sub-service in lighttpd. + ''; + }; + + subdir = mkOption { + default = "cgit"; + example = ""; + type = types.str; + description = '' + The subdirectory in which to serve cgit. The web application will be + accessible at http://yourserver/''${subdir} ''; }; @@ -48,14 +64,14 @@ in services.lighttpd.enableModules = [ "mod_cgi" "mod_alias" "mod_setenv" ]; services.lighttpd.extraConfig = '' - $HTTP["url"] =~ "^/cgit" { + $HTTP["url"] =~ "^/${cfg.subdir}" { cgi.assign = ( "cgit.cgi" => "${pkgs.cgit}/cgit/cgit.cgi" ) alias.url = ( - "/cgit.css" => "${pkgs.cgit}/cgit/cgit.css", - "/cgit.png" => "${pkgs.cgit}/cgit/cgit.png", - "/cgit" => "${pkgs.cgit}/cgit/cgit.cgi" + "${pathPrefix}/cgit.css" => "${pkgs.cgit}/cgit/cgit.css", + "${pathPrefix}/cgit.png" => "${pkgs.cgit}/cgit/cgit.png", + "${pathPrefix}" => "${pkgs.cgit}/cgit/cgit.cgi" ) setenv.add-environment = ( "CGIT_CONFIG" => "${configFile}" diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix index 4d9de020c84e..e1095fb988eb 100644 --- a/nixos/modules/system/boot/resolved.nix +++ b/nixos/modules/system/boot/resolved.nix @@ -147,6 +147,8 @@ in ${config.services.resolved.extraConfig} ''; + # If networkmanager is enabled, ask it to interface with resolved. + networking.networkmanager.dns = "systemd-resolved"; }; } diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index b8a420b7d745..bfcd81d62159 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -171,8 +171,12 @@ in default = config.boot.zfs.enableUnstable; description = '' Request encryption keys or passwords for all encrypted datasets on import. - Dataset encryption is only supported in zfsUnstable at the moment. + For root pools the encryption key can be supplied via both an + interactive prompt (keylocation=prompt) and from a file + (keylocation=file://). Note that for data pools the encryption key can + be only loaded from a file and not via interactive prompt since the + import is processed in a background systemd service. ''; }; @@ -394,6 +398,7 @@ in script = '' zpool_cmd="${packages.zfsUser}/sbin/zpool" ("$zpool_cmd" list "${pool}" >/dev/null) || "$zpool_cmd" import -d ${cfgZfs.devNodes} -N ${optionalString cfgZfs.forceImportAll "-f"} "${pool}" + ${optionalString cfgZfs.requestEncryptionCredentials "\"${packages.zfsUser}/sbin/zfs\" load-key -r \"${pool}\""} ''; }; diff --git a/nixos/release.nix b/nixos/release.nix index e494fa35029f..0d3ae997469f 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -364,6 +364,7 @@ in rec { tests.nsd = callTest tests/nsd.nix {}; tests.openssh = callTest tests/openssh.nix {}; tests.openldap = callTest tests/openldap.nix {}; + tests.opensmtpd = callTest tests/opensmtpd.nix {}; tests.owncloud = callTest tests/owncloud.nix {}; tests.pam-oath-login = callTest tests/pam-oath-login.nix {}; tests.peerflix = callTest tests/peerflix.nix {}; diff --git a/nixos/tests/opensmtpd.nix b/nixos/tests/opensmtpd.nix new file mode 100644 index 000000000000..5079779f35b4 --- /dev/null +++ b/nixos/tests/opensmtpd.nix @@ -0,0 +1,115 @@ +import ./make-test.nix { + name = "opensmtpd"; + + nodes = { + smtp1 = { pkgs, ... }: { + imports = [ common/user-account.nix ]; + networking = { + firewall.allowedTCPPorts = [ 25 ]; + useDHCP = false; + interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [ + { address = "192.168.1.1"; prefixLength = 24; } + ]; + }; + environment.systemPackages = [ pkgs.opensmtpd ]; + services.opensmtpd = { + enable = true; + extraServerArgs = [ "-v" ]; + serverConfiguration = '' + listen on 0.0.0.0 + # DO NOT DO THIS IN PRODUCTION! + # Setting up authentication requires a certificate which is painful in + # a test environment, but THIS WOULD BE DANGEROUS OUTSIDE OF A + # WELL-CONTROLLED ENVIRONMENT! + accept from any for any relay + ''; + }; + }; + + smtp2 = { pkgs, ... }: { + imports = [ common/user-account.nix ]; + networking = { + firewall.allowedTCPPorts = [ 25 143 ]; + useDHCP = false; + interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [ + { address = "192.168.1.2"; prefixLength = 24; } + ]; + }; + environment.systemPackages = [ pkgs.opensmtpd ]; + services.opensmtpd = { + enable = true; + extraServerArgs = [ "-v" ]; + serverConfiguration = '' + listen on 0.0.0.0 + accept from any for local deliver to mda \ + "${pkgs.dovecot}/libexec/dovecot/deliver -d %{user.username}" + ''; + }; + services.dovecot2 = { + enable = true; + enableImap = true; + mailLocation = "maildir:~/mail"; + protocols = [ "imap" ]; + }; + }; + + client = { pkgs, ... }: { + networking = { + useDHCP = false; + interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [ + { address = "192.168.1.3"; prefixLength = 24; } + ]; + }; + environment.systemPackages = let + sendTestMail = pkgs.writeScriptBin "send-a-test-mail" '' + #!${pkgs.python3.interpreter} + import smtplib, sys + + with smtplib.SMTP('192.168.1.1') as smtp: + smtp.sendmail('alice@[192.168.1.1]', 'bob@[192.168.1.2]', """ + From: alice@smtp1 + To: bob@smtp2 + Subject: Test + + Hello World + """) + ''; + + checkMailLanded = pkgs.writeScriptBin "check-mail-landed" '' + #!${pkgs.python3.interpreter} + import imaplib + + with imaplib.IMAP4('192.168.1.2', 143) as imap: + imap.login('bob', 'foobar') + imap.select() + status, refs = imap.search(None, 'ALL') + assert status == 'OK' + assert len(refs) == 1 + status, msg = imap.fetch(refs[0], 'BODY[TEXT]') + assert status == 'OK' + content = msg[0][1] + print("===> content:", content) + split = content.split(b'\r\n') + print("===> split:", split) + lastline = split[-3] + print("===> lastline:", lastline) + assert lastline.strip() == b'Hello World' + ''; + in [ sendTestMail checkMailLanded ]; + }; + }; + + testScript = '' + startAll; + + $client->waitForUnit("network.target"); + $smtp1->waitForUnit('opensmtpd'); + $smtp2->waitForUnit('opensmtpd'); + $smtp2->waitForUnit('dovecot2'); + + $client->succeed('send-a-test-mail'); + $smtp1->waitUntilFails('smtpctl show queue | egrep .'); + $smtp2->waitUntilFails('smtpctl show queue | egrep .'); + $client->succeed('check-mail-landed >&2'); + ''; +} diff --git a/pkgs/applications/altcoins/clightning.nix b/pkgs/applications/altcoins/clightning.nix new file mode 100644 index 000000000000..73cdd3664ea5 --- /dev/null +++ b/pkgs/applications/altcoins/clightning.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchpatch, python3, pkgconfig, which, libtool, autoconf, automake, + autogen, git, sqlite, gmp, zlib, fetchFromGitHub }: + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "clightning-${version}"; + version = "0.6"; + + src = fetchFromGitHub { + fetchSubmodules = true; + owner = "ElementsProject"; + repo = "lightning"; + rev = "v${version}"; + sha256 = "1xbi8c7kn21wj255fxnb9s0sqnzbn3wsz4p96z084k8mw1nc71vn"; + }; + + enableParallelBuilding = true; + + buildInputs = [ which sqlite gmp zlib autoconf libtool automake autogen python3 pkgconfig ]; + + makeFlags = [ "prefix=$(out)" ]; + + configurePhase = '' + ./configure --prefix=$out --disable-developer --disable-valgrind + ''; + + postPatch = '' + echo "" > tools/refresh-submodules.sh + patchShebangs tools/generate-wire.py + ''; + + doCheck = false; + + meta = { + description = "A Bitcoin Lightning Network implementation in C"; + longDescription= '' + c-lightning is a standard compliant implementation of the Lightning + Network protocol. The Lightning Network is a scalability solution for + Bitcoin, enabling secure and instant transfer of funds between any two + parties for any amount. + ''; + homepage = https://github.com/ElementsProject/lightning; + maintainers = with maintainers; [ jb55 ]; + license = licenses.mit; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 1a0e77dc12f1..385e9e53522d 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -6,6 +6,7 @@ rec { bitcoin = libsForQt5.callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = true; }; bitcoind = callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = false; }; + clightning = callPackage ./clightning.nix { }; bitcoin-abc = libsForQt5.callPackage ./bitcoin-abc.nix { boost = boost165; withGui = true; }; bitcoind-abc = callPackage ./bitcoin-abc.nix { boost = boost165; withGui = false; }; diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/applications/audio/MMA/default.nix index dfa27aa9f2eb..d21c3fd5efbd 100644 --- a/pkgs/applications/audio/MMA/default.nix +++ b/pkgs/applications/audio/MMA/default.nix @@ -5,7 +5,7 @@ name = "mma-${version}"; src = fetchurl { - url = "http://www.mellowood.ca/mma/mma-bin-${version}.tar.gz"; + url = "https://www.mellowood.ca/mma/mma-bin-${version}.tar.gz"; sha256 = "1g4gvc0nr0qjc0fyqrnx037zpaasgymgmrm5s7cdxqnld9wqw8ww"; }; diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix index b74d85b9dbfa..e672e6f3bae1 100644 --- a/pkgs/applications/audio/abcde/default.nix +++ b/pkgs/applications/audio/abcde/default.nix @@ -8,7 +8,7 @@ in stdenv.mkDerivation { name = "abcde-${version}"; src = fetchurl { - url = "http://abcde.einval.com/download/abcde-${version}.tar.gz"; + url = "https://abcde.einval.com/download/abcde-${version}.tar.gz"; sha256 = "0f9bjs0phk23vry7gvh0cll9vl6kmc1y4fwwh762scfdvpbp3774"; }; diff --git a/pkgs/applications/audio/aeolus/default.nix b/pkgs/applications/audio/aeolus/default.nix index 7ac1025c5027..68a9bb63e2e0 100644 --- a/pkgs/applications/audio/aeolus/default.nix +++ b/pkgs/applications/audio/aeolus/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "0.9.5"; src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; sha256 = "0wfp8ihldyq2dhdyy7ld7z0zzfvnwam1dvbxnpd9d6xgc4k3j4nv"; }; diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix new file mode 100644 index 000000000000..855d31aadbb0 --- /dev/null +++ b/pkgs/applications/audio/amarok/default.nix @@ -0,0 +1,42 @@ +{ mkDerivation, fetchgit, lib +, extra-cmake-modules, kdoctools +, qca-qt5, qjson, qtquickcontrols2, qtscript, qtwebengine +, karchive, kcmutils, kconfig, kdnssd, kguiaddons, kinit, kirigami2, knewstuff, knotifyconfig, ktexteditor, kwindowsystem +, fftw, phonon, plasma-framework, threadweaver +, curl, ffmpeg, gdk_pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras +}: + +let + pname = "amarok"; + version = "2.9.0-20180618"; + +in mkDerivation { + name = "${pname}-${version}"; + + src = fetchgit { + # master has the Qt5 version as of April 2018 but a formal release has not + # yet been made so change this back to the proper upstream when such a + # release is out + url = git://anongit.kde.org/amarok.git; + # url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + rev = "5d43efa454b6a6c9c833a6f3d7f8ff3cae738c96"; + sha256 = "0fyrbgldg4wbb2darm4aav5fpzbacxzfjrdqwkhv9xr13j7zsvm3"; + }; + + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + + propagatedBuildInputs = [ + qca-qt5 qjson qtquickcontrols2 qtscript qtwebengine + karchive kcmutils kconfig kdnssd kguiaddons kinit kirigami2 knewstuff knotifyconfig ktexteditor kwindowsystem + phonon plasma-framework threadweaver + curl fftw ffmpeg gdk_pixbuf libaio libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static + pcre snappy taglib taglib_extras + ]; + + enableParallelBuilding = true; + + meta = with lib; { + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/applications/audio/amarok/kf5.nix b/pkgs/applications/audio/amarok/kf5.nix deleted file mode 100644 index 461fc260207d..000000000000 --- a/pkgs/applications/audio/amarok/kf5.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ mkDerivation, fetchgit, lib -, extra-cmake-modules, kdoctools -, qca-qt5, qjson, qtscript, qtwebkit -, kcmutils, kconfig, kdelibs4support, kdnssd, kinit, knewstuff, knotifyconfig, ktexteditor -, phonon, plasma-framework, threadweaver -, curl, ffmpeg, gdk_pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras -}: - -let - pname = "amarok"; - version = "2.8.91-20170228"; - -in mkDerivation { - name = "${pname}-${version}"; - - src = fetchgit { - url = git://anongit.kde.org/amarok.git; - # go back to the KDE mirror when kf5 is merged into master - # url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - rev = "323e2d5b43245c4c06e0b83385d37ef0d32920cb"; - sha256 = "05w7kl6qfmkjz0y1bhgkkbmsqdll30bkjd6npkzvivrvp7dplmbh"; - }; - - patches = [ ./qt5_11.patch ]; - - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ - qca-qt5 qjson qtscript qtwebkit - kcmutils kconfig kdelibs4support kdnssd kinit knewstuff knotifyconfig ktexteditor - phonon plasma-framework threadweaver - curl ffmpeg gdk_pixbuf libaio libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static - pcre snappy taglib taglib_extras - ]; - enableParallelBuilding = true; - - meta = with lib; { - license = licenses.gpl2; - maintainers = with maintainers; [ peterhoeg ]; - }; -} diff --git a/pkgs/applications/audio/amarok/qt5_11.patch b/pkgs/applications/audio/amarok/qt5_11.patch deleted file mode 100644 index 36041c136c8b..000000000000 --- a/pkgs/applications/audio/amarok/qt5_11.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/aboutdialog/ExtendedAboutDialog.cpp -+++ b/src/aboutdialog/ExtendedAboutDialog.cpp -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - #include - - #include - diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 6e411c8448f6..19cb55d93c98 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "3.9"; src = fetchurl { - url = "http://distfiles.audacious-media-player.org/audacious-${version}-gtk3.tar.bz2"; + url = "https://distfiles.audacious-media-player.org/audacious-${version}-gtk3.tar.bz2"; sha256 = "0dc7fg0v2l2j4h9cz1baz7rf4n0a5jgk09qvsj806sh6jp7w6ipm"; }; diff --git a/pkgs/applications/audio/banshee/default.nix b/pkgs/applications/audio/banshee/default.nix index d1c0c2afa83b..a3ac2b097e95 100644 --- a/pkgs/applications/audio/banshee/default.nix +++ b/pkgs/applications/audio/banshee/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "2.6.2"; src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/banshee/2.6/banshee-${version}.tar.xz"; + url = "https://ftp.gnome.org/pub/GNOME/sources/banshee/2.6/banshee-${version}.tar.xz"; sha256 = "1y30p8wxx5li39i5gpq2wib0ympy8llz0gyi6ri9bp730ndhhz7p"; }; diff --git a/pkgs/applications/audio/beast/default.nix b/pkgs/applications/audio/beast/default.nix index 7f62d53af9ef..29cecb169998 100644 --- a/pkgs/applications/audio/beast/default.nix +++ b/pkgs/applications/audio/beast/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "beast-0.7.1"; src = fetchurl { - url = "http://ftp.gtk.org/pub/beast/v0.7/${name}.tar.bz2"; + url = "https://ftp.gtk.org/pub/beast/v0.7/${name}.tar.bz2"; sha256 = "0jyl1i1918rsn4296w07fsf6wx3clvad522m3bzgf8ms7gxivg5l"; }; diff --git a/pkgs/applications/audio/bitmeter/default.nix b/pkgs/applications/audio/bitmeter/default.nix index 32daf000dc59..5f3229dc157c 100644 --- a/pkgs/applications/audio/bitmeter/default.nix +++ b/pkgs/applications/audio/bitmeter/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.2"; src = fetchurl { - url = "http://devel.tlrmx.org/audio/source/${name}.tar.gz"; + url = "https://devel.tlrmx.org/audio/source/${name}.tar.gz"; sha256 = "09ck2gxqky701dc1p0ip61rrn16v0pdc7ih2hc2sd63zcw53g2a7"; }; diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index 82c32903bd86..7ff762aa8a0d 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "0.90.0"; src = fetchurl { - url = "http://calf-studio-gear.org/files/${name}.tar.gz"; + url = "https://calf-studio-gear.org/files/${name}.tar.gz"; sha256 = "0dijv2j7vlp76l10s4v8gbav26ibaqk8s24ci74vrc398xy00cib"; }; diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index 760b04bef005..96330d4e9557 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://xiph.org/paranoia; + homepage = https://xiph.org/paranoia; description = "A tool and library for reading digital audio from CDs"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix index c6509b5f460e..4e2e75953f35 100644 --- a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix +++ b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "deadbeef-mpris2-plugin-${version}"; - version = "1.10"; + version = "1.11"; src = fetchurl { url = "https://github.com/Serranya/deadbeef-mpris2-plugin/releases/download/v${version}/${name}.tar.xz"; - sha256 = "083fbvi06y85khr8hdm4rl5alxdanjbbyphizyr4hi93d7a0jg75"; + sha256 = "1j631z34rwxf6wdjpsf8c2f1saq6qas1qmkgsg63m6zzpwqyizw0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/denemo/default.nix b/pkgs/applications/audio/denemo/default.nix index be941bc3db29..6c1536c0a610 100644 --- a/pkgs/applications/audio/denemo/default.nix +++ b/pkgs/applications/audio/denemo/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "2.2.0"; src = fetchurl { - url = "http://ftp.gnu.org/gnu/denemo/denemo-${version}.tar.gz"; + url = "https://ftp.gnu.org/gnu/denemo/denemo-${version}.tar.gz"; sha256 = "18zcs4xmfj4vpzi15dj7k5bjzzzlr3sjf9xhrrgy4samrrdpqzfh"; }; diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix index c42d290c5993..e004e8c847cb 100644 --- a/pkgs/applications/audio/drumgizmo/default.nix +++ b/pkgs/applications/audio/drumgizmo/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "drumgizmo-${version}"; src = fetchurl { - url = "http://www.drumgizmo.org/releases/${name}/${name}.tar.gz"; + url = "https://www.drumgizmo.org/releases/${name}/${name}.tar.gz"; sha256 = "1q2jghjz0ygaja8dgvxp914if8yyzpa204amdcwb9yyinpxsahz4"; }; diff --git a/pkgs/applications/audio/ecasound/default.nix b/pkgs/applications/audio/ecasound/default.nix index 36ce40490222..a9d84eb6e6c5 100644 --- a/pkgs/applications/audio/ecasound/default.nix +++ b/pkgs/applications/audio/ecasound/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { version = "2.9.1"; src = fetchurl { - url = "http://ecasound.seul.org/download/ecasound-${version}.tar.gz"; + url = "https://ecasound.seul.org/download/ecasound-${version}.tar.gz"; sha256 = "1wyws3xc4f9pglrrqv6k9137sarv4asizqrxz8h0dn44rnzfiz1r"; }; diff --git a/pkgs/applications/audio/fomp/default.nix b/pkgs/applications/audio/fomp/default.nix index 367b1db139d5..d7a46143939d 100644 --- a/pkgs/applications/audio/fomp/default.nix +++ b/pkgs/applications/audio/fomp/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.0.0"; src = fetchurl { - url = "http://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${name}.tar.bz2"; sha256 = "1hh2xhknanqn3iwp12ihl6bf8p7bqxryms9qk7mh21lixl42b8k5"; }; diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix index b92d4f6eb1e8..e9ce20f6c80a 100644 --- a/pkgs/applications/audio/gigedit/default.nix +++ b/pkgs/applications/audio/gigedit/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "1.1.0"; src = fetchurl { - url = "http://download.linuxsampler.org/packages/${name}.tar.bz2"; + url = "https://download.linuxsampler.org/packages/${name}.tar.bz2"; sha256 = "087pc919q28r1vw31c7w4m14bqnp4md1i2wbmk8w0vmwv2cbx2ni"; }; diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 62bc2fa6f36f..5c34293e7f9f 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -12,11 +12,11 @@ in stdenv.mkDerivation rec { name = "guitarix-${version}"; - version = "0.37.0"; + version = "0.37.1"; src = fetchurl { url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz"; - sha256 = "17dsd32yd92l7xq1x0b8jsws5yif2pk4zbfjbc560hgarym6r8x6"; + sha256 = "064k0jzxqgx9gwf8za6jziansabzrwzjaim3qx1743ify5g3gaai"; }; nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 ]; diff --git a/pkgs/applications/audio/jaaa/default.nix b/pkgs/applications/audio/jaaa/default.nix index b0fbced22113..cacbf428caa0 100644 --- a/pkgs/applications/audio/jaaa/default.nix +++ b/pkgs/applications/audio/jaaa/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.8.4"; src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; sha256 = "0jyll4rkb6vja2widc340ww078rr24c6nmxbxdqvbxw409nccd01"; }; diff --git a/pkgs/applications/audio/jack-capture/default.nix b/pkgs/applications/audio/jack-capture/default.nix index e4d20db78682..f11bba34c74c 100644 --- a/pkgs/applications/audio/jack-capture/default.nix +++ b/pkgs/applications/audio/jack-capture/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.9.73"; src = fetchurl { - url = "http://archive.notam02.no/arkiv/src/${name}.tar.gz"; + url = "https://archive.notam02.no/arkiv/src/${name}.tar.gz"; sha256 = "1pji0zdwm3kxjrkbzj7fnxhr8ncrc8pyqnwyrh47fhypgqjv1br1"; }; diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix index 99c3e48ae84d..f78110e8bbbf 100644 --- a/pkgs/applications/audio/jalv/default.nix +++ b/pkgs/applications/audio/jalv/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "1.6.0"; src = fetchurl { - url = "http://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${name}.tar.bz2"; sha256 = "1x2wpzzx2cgvz3dgdcgsj8dr0w3zsasy62mvl199bsdj5fbjaili"; }; diff --git a/pkgs/applications/audio/japa/default.nix b/pkgs/applications/audio/japa/default.nix index 4efdaa86084a..cdf25c08378a 100644 --- a/pkgs/applications/audio/japa/default.nix +++ b/pkgs/applications/audio/japa/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "japa-${version}"; src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; sha256 = "1jhj7s4vqk5c4lchdall0kslvj5sh91902hhfjvs6r3a5nrhwcp0"; }; diff --git a/pkgs/applications/audio/ladspa-sdk/default.nix b/pkgs/applications/audio/ladspa-sdk/default.nix index d0ffbf29bcb2..296a4f86a848 100644 --- a/pkgs/applications/audio/ladspa-sdk/default.nix +++ b/pkgs/applications/audio/ladspa-sdk/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "ladspa-sdk-${version}"; version = "1.13"; src = fetchurl { - url = "http://www.ladspa.org/download/ladspa_sdk_${version}.tgz"; + url = "https://www.ladspa.org/download/ladspa_sdk_${version}.tgz"; sha256 = "0srh5n2l63354bc0srcrv58rzjkn4gv8qjqzg8dnq3rs4m7kzvdm"; }; diff --git a/pkgs/applications/audio/ladspa-sdk/ladspah.nix b/pkgs/applications/audio/ladspa-sdk/ladspah.nix index e41d2ba96750..01acc0d01f7e 100644 --- a/pkgs/applications/audio/ladspa-sdk/ladspah.nix +++ b/pkgs/applications/audio/ladspa-sdk/ladspah.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "ladspa.h-${version}"; version = "1.13"; src = fetchurl { - url = "http://www.ladspa.org/download/ladspa_sdk_${version}.tgz"; + url = "https://www.ladspa.org/download/ladspa_sdk_${version}.tgz"; sha256 = "0srh5n2l63354bc0srcrv58rzjkn4gv8qjqzg8dnq3rs4m7kzvdm"; }; diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix index 7f368fe6c281..f173e41321f0 100644 --- a/pkgs/applications/audio/linuxsampler/default.nix +++ b/pkgs/applications/audio/linuxsampler/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "2.1.0"; src = fetchurl { - url = "http://download.linuxsampler.org/packages/${name}.tar.bz2"; + url = "https://download.linuxsampler.org/packages/${name}.tar.bz2"; sha256 = "0fdxpw7jjfi058l95131d6d8538h05z7n94l60i6mhp9xbplj2jf"; }; diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 50356eaadd50..3b967186112b 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -3,18 +3,20 @@ , python36Packages, gnome3, glib, gst_all_1 }: stdenv.mkDerivation rec { - version = "0.9.514"; + version = "0.9.516"; name = "lollypop-${version}"; src = fetchgit { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "0ny8c5apldhhrcjl3wz01pbyjvf60b7xy39mpvbshvdpnqlnqsca"; + sha256 = "0ln77cmcl5wi4xis9kmzg0knbykzwsd1n78rr7ff5y35m9p2zgrf"; }; nativeBuildInputs = with python36Packages; [ + appstream-glib desktop-file-utils + gobjectIntrospection meson ninja pkgconfig @@ -22,9 +24,7 @@ stdenv.mkDerivation rec { wrapPython ]; - buildInputs = [ - appstream-glib glib gobjectIntrospection - ] ++ (with gnome3; [ + buildInputs = [ glib ] ++ (with gnome3; [ easytag gsettings_desktop_schemas gtk3 libsecret libsoup totem-pl-parser ]) ++ (with gst_all_1; [ gst-libav gst-plugins-bad gst-plugins-base gst-plugins-good gst-plugins-ugly diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/pkgs/applications/audio/mda-lv2/default.nix index c7d0caec8bf5..e27aab6e898b 100644 --- a/pkgs/applications/audio/mda-lv2/default.nix +++ b/pkgs/applications/audio/mda-lv2/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.2.2"; src = fetchurl { - url = "http://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${name}.tar.bz2"; sha256 = "0hh40c5d2m0k5gb3vw031l6lqn59dg804an3mkmhkc7qv4gc6xm4"; }; diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index f511fa659149..60a0695ffecc 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "2.0.0"; src = fetchurl { - url = "http://downloads.mixxx.org/${name}/${name}-src.tar.gz"; + url = "https://downloads.mixxx.org/${name}/${name}-src.tar.gz"; sha256 = "0vb71w1yq0xwwsclrn2jj9bk8w4n14rfv5c0aw46c11mp8xz7f71"; }; diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix index 55f3a667e06f..1b3e89d4885e 100644 --- a/pkgs/applications/audio/monkeys-audio/default.nix +++ b/pkgs/applications/audio/monkeys-audio/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { patches = [ ./buildfix.diff ]; src = fetchurl { - url = "http://deb-multimedia.org/pool/main/m/${pname}/${pname}_${version}.orig.tar.gz"; + url = "https://deb-multimedia.org/pool/main/m/${pname}/${pname}_${version}.orig.tar.gz"; sha256 = "0kjfwzfxfx7f958b2b1kf8yj655lp0ppmn0sh57gbkjvj8lml7nz"; }; diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 220ec80834ab..a2d35f382b98 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.21.1"; + version = "3.21.3"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "10d97rkqk5qbrninrahn0gr90yd47ivw2zafb24sp7a2g0mm07md"; + sha256 = "0gp51zz5qr93w0h14m1blmjnlgmilyb15lw2m75varslw1ar7vlg"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix index 6b50ee1426ce..e65604e974af 100644 --- a/pkgs/applications/audio/nova-filters/default.nix +++ b/pkgs/applications/audio/nova-filters/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "nova-filters-${version}"; src = fetchurl { - url = http://klingt.org/~tim/nova-filters/nova-filters_0.2-2.tar.gz; + url = https://klingt.org/~tim/nova-filters/nova-filters_0.2-2.tar.gz; sha256 = "16064vvl2w5lz4xi3lyjk4xx7fphwsxc14ajykvndiz170q32s6i"; }; diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix index fe9ed12390a5..5f95a60237f2 100644 --- a/pkgs/applications/audio/paprefs/default.nix +++ b/pkgs/applications/audio/paprefs/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "paprefs-0.9.10"; src = fetchurl { - url = "http://freedesktop.org/software/pulseaudio/paprefs/${name}.tar.xz"; + url = "https://freedesktop.org/software/pulseaudio/paprefs/${name}.tar.xz"; sha256 = "1c5b3sb881szavly220q31g7rvpn94wr7ywlk00hqb9zaikml716"; }; diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index d113b8a49b31..4f64be02fd52 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "pavucontrol-3.0"; src = fetchurl { - url = "http://freedesktop.org/software/pulseaudio/pavucontrol/${name}.tar.xz"; + url = "https://freedesktop.org/software/pulseaudio/pavucontrol/${name}.tar.xz"; sha256 = "14486c6lmmirkhscbfygz114f6yzf97h35n3h3pdr27w4mdfmlmk"; }; diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix index 3670fb8347d6..faa914e13287 100644 --- a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix +++ b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "helmholtz"; src = fetchurl { - url = "http://www.katjaas.nl/helmholtz/helmholtz~.zip"; + url = "https://www.katjaas.nl/helmholtz/helmholtz~.zip"; name = "helmholtz.zip"; curlOpts = "--user-agent ''"; sha256 = "0h1fj7lmvq9j6rmw33rb8k0byxb898bi2xhcwkqalb84avhywgvs"; diff --git a/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/pkgs/applications/audio/pd-plugins/puremapping/default.nix index 4f285552576c..37d692a3ab5a 100644 --- a/pkgs/applications/audio/pd-plugins/puremapping/default.nix +++ b/pkgs/applications/audio/pd-plugins/puremapping/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "20160130"; src = fetchurl { - url = "http://www.chnry.net/data/puremapping-${version}-generic.zip"; + url = "https://www.chnry.net/data/puremapping-${version}-generic.zip"; name = "puremapping"; sha256 = "1h7qgqd8srrxw2y1rkdw5js4k6f5vc8x6nlm2mq9mq9vjck7n1j7"; }; diff --git a/pkgs/applications/audio/pd-plugins/zexy/default.nix b/pkgs/applications/audio/pd-plugins/zexy/default.nix index 8b7c2121bd79..d56462ccc844 100644 --- a/pkgs/applications/audio/pd-plugins/zexy/default.nix +++ b/pkgs/applications/audio/pd-plugins/zexy/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.2.4"; src = fetchurl { - url = "http://puredata.info/downloads/zexy/releases/${version}/${name}.tar.gz"; + url = "https://puredata.info/downloads/zexy/releases/${version}/${name}.tar.gz"; sha256 = "1xpgl82c2lc6zfswjsa7z10yhv5jb7a4znzh3nc7ffrzm1z8vylp"; }; diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index 558267239ef8..e96b6f1909a5 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -27,17 +27,6 @@ python2Packages.buildPythonApplication rec { doCheck = false; # there are no tests dontStrip = true; # we are not generating any binaries - installPhase = '' - runHook preInstall - - siteDir=$(toPythonPath $out) - mkdir -p $siteDir - PYTHONPATH=$PYTHONPATH:$siteDir - ${python2Packages.python.interpreter} setup.py install --prefix $out - - runHook postInstall - ''; - meta = with stdenv.lib; { homepage = https://puddletag.net; description = "An audio tag editor similar to the Windows program, Mp3tag"; diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index 5ec7375056ec..24a2f1a8a601 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { if stdenv.system == "x86_64-linux" then if builtins.isNull releasePath then fetchurl { - url = "http://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_x86_64.tar.bz2"; + url = "https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_x86_64.tar.bz2"; sha256 = "0pan68fr22xbj7a930y29527vpry3f07q3i9ya4fp6g7aawffsga"; } else diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix index d881afa7f5f0..e57d85de05a9 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.rosegardenmusic.com/; + homepage = https://www.rosegardenmusic.com/; description = "Music composition and editing environment"; longDescription = '' Rosegarden is a music composition and editing environment based around diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index bdb9911d3650..d5f613b45945 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "2.4.1"; src = fetchurl { - url = "http://code.soundsoftware.ac.uk/attachments/download/1185/${name}.tar.gz"; + url = "https://code.soundsoftware.ac.uk/attachments/download/1185/${name}.tar.gz"; sha256 = "06nlha70kgrby16nyhngrv5q846xagnxdinv608v7ga7vpywwmyb"; }; diff --git a/pkgs/applications/audio/tetraproc/default.nix b/pkgs/applications/audio/tetraproc/default.nix index d450cce7b86f..535d53d99eeb 100644 --- a/pkgs/applications/audio/tetraproc/default.nix +++ b/pkgs/applications/audio/tetraproc/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "0.8.2"; src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; sha256 = "17y3vbm5f6h5cmh3yfxjgqz4xhfwpkla3lqfspnbm4ndlzmfpykv"; }; diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix index 4140c5da5a45..78bd43383539 100644 --- a/pkgs/applications/audio/tomahawk/default.nix +++ b/pkgs/applications/audio/tomahawk/default.nix @@ -51,5 +51,6 @@ stdenv.mkDerivation rec { homepage = http://tomahawk-player.org/; license = licenses.gpl3Plus; platforms = platforms.all; + broken = true; # 2018-06-25 }; } diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix index 6b9af119859e..f815ac02e6e5 100644 --- a/pkgs/applications/audio/vorbis-tools/default.nix +++ b/pkgs/applications/audio/vorbis-tools/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { A set of command-line tools to manipulate Ogg Vorbis audio files, notably the `ogg123' player and the `oggenc' encoder. ''; - homepage = http://xiph.org/vorbis/; + homepage = https://xiph.org/vorbis/; license = licenses.gpl2; platforms = platforms.all; }; diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 6bf45f451a5d..3540869f3616 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "x42-plugins-${version}"; src = fetchurl { - url = "http://gareus.org/misc/x42-plugins/${name}.tar.xz"; + url = "https://gareus.org/misc/x42-plugins/${name}.tar.xz"; sha256 = "167ly9nxqq3g0j35i9jv9rvd8qp4i9ncfcjxmg972cp6q8ak8mdl"; }; diff --git a/pkgs/applications/audio/ympd/default.nix b/pkgs/applications/audio/ympd/default.nix index c3e8efae7fe9..2e335e6b10e9 100644 --- a/pkgs/applications/audio/ympd/default.nix +++ b/pkgs/applications/audio/ympd/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake mpd_clientlib openssl ]; meta = { - homepage = http://www.ympd.org; + homepage = https://www.ympd.org; description = "Standalone MPD Web GUI written in C, utilizing Websockets and Bootstrap/JS"; maintainers = [ stdenv.lib.maintainers.siddharthist ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index a82e0bf20358..2e82216b7e5d 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,9 +13,9 @@ let sha256Hash = "196yaswbxh2nd83gimjxr8ggr5xkdxq7n3xlh6ax73v59pj4hryq"; }; latestVersion = { - version = "3.2.0.18"; # "Android Studio 3.2 Beta 1" - build = "181.4847800"; - sha256Hash = "1ipdvrx3qxwygq72jlf0dl4haxviscl41q18kclg519r1zbzd4cw"; + version = "3.3.0.0"; # "Android Studio 3.3 Canary 1" + build = "181.4861037"; + sha256Hash = "1abilixr386x65qzgp6pwdn41y1xi9h8yihgxhc1c97n90f5gab8"; }; in rec { # Old alias @@ -43,6 +43,9 @@ in rec { beta = mkStudio (latestVersion // { pname = "android-studio-preview"; #pname = "android-studio-beta"; # TODO: Rename and provide symlink + version = "3.2.0.19"; # "Android Studio 3.2 Beta 2" + build = "181.4860949"; + sha256Hash = "1v1h42xp2fxj8366q9l9b0shk0y1vz9kny0rf7y48kyr5h9glnwr"; meta = stable.meta // { description = "The Official IDE for Android (beta channel)"; diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index c37064ee6000..a77792254725 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -36,7 +36,7 @@ let --set-rpath "${atomEnv.libPath}" \ $share/resources/app/apm/bin/node patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $out/share/atom/resources/app.asar.unpacked/node_modules/symbols-view/vendor/ctags-linux + $share/resources/app.asar.unpacked/node_modules/symbols-view/vendor/ctags-linux dugite=$share/resources/app.asar.unpacked/node_modules/dugite rm -f $dugite/git/bin/git diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 3a09b5c6be47..a2d246809c9d 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -96,7 +96,7 @@ rec { ### Eclipse Platform - eclipse-platform = eclipse-platform-47; # always point to latest + eclipse-platform = eclipse-platform-48; # always point to latest eclipse-platform-46 = buildEclipse { name = "eclipse-platform-4.6.2"; @@ -128,6 +128,21 @@ rec { }; }; + eclipse-platform-48 = buildEclipse { + name = "eclipse-platform-4.8"; + description = "Eclipse Platform Photon"; + sources = { + "x86_64-linux" = fetchurl { + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/eclipse-platform-4.8-linux-gtk-x86_64.tar.gz; + sha512 = "ccce2b954938479e42ef3f9b78f74b24ae4cae7499546fa4f9a55ec1849e1acfd06315d4529b11474a8b3d1142c9409c581edfa571baaf1342ab062f02467af2"; + }; + "i686-linux" = fetchurl { + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/eclipse-platform-4.8-linux-gtk.tar.gz; + sha512 = "f5f407727e22b848931cf38f71b1a0c30a9778aa227c3df137dcceec2fba2ecc309cbfa8b4a660b814d2edb60f65110381497b4325781cab4d6402784139e32b"; + }; + }; + }; + ### Eclipse Scala SDK eclipse-scala-sdk = eclipse-scala-sdk-441; # always point to latest @@ -150,7 +165,7 @@ rec { ### Eclipse SDK - eclipse-sdk = eclipse-sdk-47; # always point to latest + eclipse-sdk = eclipse-sdk-48; # always point to latest eclipse-sdk-46 = buildEclipse { name = "eclipse-sdk-4.6.2"; @@ -182,6 +197,21 @@ rec { }; }; + eclipse-sdk-48 = buildEclipse { + name = "eclipse-sdk-4.8"; + description = "Eclipse Photon Classic"; + sources = { + "x86_64-linux" = fetchurl { + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/eclipse-SDK-4.8-linux-gtk-x86_64.tar.gz; + sha512 = "357ea9e7f426c68ced693f1c7b76eae23f9e3c7893de1f12d17994ec17b447896b5daa7292d5fbf6d9c4e5b7fd637ca5b2a6ba8ce40a2a7c2fe06f2124d31b75"; + }; + "i686-linux" = fetchurl { + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/eclipse-SDK-4.8-linux-gtk.tar.gz; + sha512 = "c7cae7baa3978d48477090bb9941e85b4c7484021ece9c5c77a7e859e57e5c1f13556262f92b561cfb11f828b934bad7a6018be7b8fd9454e3991e8d5cae9917"; + }; + }; + }; + eclipse-sdk-37 = buildEclipse { name = "eclipse-sdk-3.7"; description = "Eclipse Classic"; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 801583299ab0..28fe3e294b5c 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -470,12 +470,12 @@ rec { jdt = buildEclipseUpdateSite rec { name = "jdt-${version}"; - version = "4.7.3a"; + version = "4.8"; src = fetchzip { stripRoot = false; - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/org.eclipse.jdt-4.7.3a.zip; - sha256 = "10dndhqz894xf79zz07dlmkn7k33mn42nbmycr78xz6d2jy8cscx"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.8-201806110500/org.eclipse.jdt-4.8.zip; + sha256 = "1my0d1114mx5gzxmwqlx0rcny39ly97ixlwx53ljk6qcryhdnr88"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/emacs-modes/scala-mode/v1.nix b/pkgs/applications/editors/emacs-modes/scala-mode/v1.nix index f82d467066a6..7867226ff806 100644 --- a/pkgs/applications/editors/emacs-modes/scala-mode/v1.nix +++ b/pkgs/applications/editors/emacs-modes/scala-mode/v1.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "An Emacs mode for editing Scala code"; - homepage = http://www.scala-lang.org/node/354; + homepage = https://www.scala-lang.org/node/354; # non-copyleft, BSD-style license = "permissive"; diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index bedc299ee673..799f58e5b68c 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { name = "geany-${version}"; src = fetchurl { - url = "http://download.geany.org/${name}.tar.bz2"; + url = "https://download.geany.org/${name}.tar.bz2"; sha256 = "66baaff43f12caebcf0efec9a5533044dc52837f799c73a1fd7312caa86099c2"; }; diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix new file mode 100644 index 000000000000..4657d0d10ad8 --- /dev/null +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, wrapGAppsHook +, tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }: +let + version = "3.28.1"; + pname = "gnome-latex"; +in stdenv.mkDerivation { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1z481izrx057wraphnr82kxnpmmi8nvl7jswyylzm22kfs0mw402"; + }; + + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + configureFlags = ["--disable-dconf-migration"]; + + nativeBuildInputs = [ + pkgconfig + wrapGAppsHook + itstool + intltool + ]; + + buildInputs = with gnome3; [ + amtk + defaultIconTheme + glib + gsettings-desktop-schemas + gspell + gtksourceview4 + libgee + libxml2 + tepl + ]; + + doCheck = true; + + passthru.updateScript = gnome3.updateScript { packageName = pname; }; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/GNOME-LaTeX; + description = "A LaTeX editor for the GNOME desktop"; + maintainers = [ maintainers.manveru ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/editors/jupp/default.nix b/pkgs/applications/editors/jupp/default.nix index 14fdcce1c8e5..5e6406e33f28 100644 --- a/pkgs/applications/editors/jupp/default.nix +++ b/pkgs/applications/editors/jupp/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ "https://www.mirbsd.org/MirOS/dist/jupp/${srcName}.tgz" - "http://pub.allbsd.org/MirOS/dist/jupp/${srcName}.tgz" ]; + "https://pub.allbsd.org/MirOS/dist/jupp/${srcName}.tgz" ]; sha256 = "1fnf9jsd6p4jyybkhjjs328qx38ywy8w029ngc7j7kqp0ixn0l0s"; }; diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index e8e529b63abc..66112b3498dd 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { name = "monodevelop-${version}"; src = fetchurl { - url = "http://download.mono-project.com/sources/monodevelop/${name}.tar.bz2"; + url = "https://download.mono-project.com/sources/monodevelop/${name}.tar.bz2"; sha256 = "0bim4bfv3zwijafl9g0cx3159zq43dlcv74mnyrda41j4p52w5ji"; }; diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index c29cbe52872e..fb0ce43a60e6 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { name = "nano-${version}"; - version = "2.9.7"; + version = "2.9.8"; src = fetchurl { url = "mirror://gnu/nano/${name}.tar.xz"; - sha256 = "1ga4sdk3ikx1ilggc6c77vyfpbmq3nrhg6svgglpf5sv60bv0jmn"; + sha256 = "122lm0z97wk3mgnbn8m4d769d4j9rxyc9z7s89xd4gsdp8qsrpn2"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index a23c5242a24b..9af60ca4fcbd 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -15,7 +15,7 @@ in stdenv.mkDerivation { name = "netbeans-8.2"; src = fetchurl { - url = http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101.zip; + url = https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101.zip; sha256 = "0j092qw7aqfc9vpnvr3ix1ii94p4ik6frcnw708iyv4s9crqi65d"; }; diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix index 76a00c44ebbe..2f4693982a9c 100644 --- a/pkgs/applications/editors/scite/default.nix +++ b/pkgs/applications/editors/scite/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "4.0.5"; src = fetchurl { - url = http://www.scintilla.org/scite405.tgz; + url = https://www.scintilla.org/scite405.tgz; sha256 = "0h16wk2986nkkhhdv5g4lxlcn02qwyja24x1r6vf02r1hf46b9q2"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.scintilla.org/SciTE.html; + homepage = https://www.scintilla.org/SciTE.html; description = "SCIntilla based Text Editor"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/applications/editors/tweak/default.nix b/pkgs/applications/editors/tweak/default.nix index e55bcb48787f..aa3b4b99d7a0 100644 --- a/pkgs/applications/editors/tweak/default.nix +++ b/pkgs/applications/editors/tweak/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.02"; src = fetchurl { - url = "http://www.chiark.greenend.org.uk/~sgtatham/tweak/${name}.tar.gz"; + url = "https://www.chiark.greenend.org.uk/~sgtatham/tweak/${name}.tar.gz"; sha256 = "06js54pr5hwpwyxj77zs5s40n5aqvaw48dkj7rid2d47pyqijk2v"; }; diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index efde7242793d..082bc2a2536c 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -3,18 +3,18 @@ stdenv.mkDerivation rec { name = "typora-${version}"; - version = "0.9.48"; + version = "0.9.53"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://www.typora.io/linux/typora_${version}_amd64.deb"; - sha256 = "36a7c5f855306bcbe3364d12aca94c2f6d013a013e59b46f89df81496ec11800"; + sha256 = "02k6x30l4mbjragqbq5rn663xbw3h4bxzgppfxqf5lwydswldklb"; } else fetchurl { url = "https://www.typora.io/linux/typora_${version}_i386.deb"; - sha256 = "7197c526918a791b15b701846f9f2f1747a5b8ceac77c4cba691ee6d74d07d1d"; + sha256 = "1wyq1ri0wwdy7slbd9dwyrdynsaa644x44c815jl787sg4nhas6y"; } ; @@ -80,7 +80,6 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/typora \ "''${gappsWrapperArgs[@]}" \ --suffix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ - --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR" \ --prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share" # Fix the desktop link diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index b2404df8e56e..a64e9a18e1ad 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "grass-7.2.2"; src = fetchurl { - url = http://grass.osgeo.org/grass72/source/grass-7.2.2.tar.gz; + url = https://grass.osgeo.org/grass72/source/grass-7.2.2.tar.gz; sha256 = "0yzljbrxlqp4wbw08n1dvmm4vmwkg8glf1ff4xyh589r5ryb7gxv"; }; diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 279d83e92193..02e874739efe 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; src = fetchurl { - url = "http://qgis.org/downloads/${name}.tar.bz2"; + url = "https://qgis.org/downloads/${name}.tar.bz2"; sha256 = "0bm9sv268lc3v48zjypsjjs62xnyb7zabzrms4jsy020waz6sk9g"; }; diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index ee35afb09237..ac44a1e875c0 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -3,6 +3,7 @@ , ilmbase, gtk3, intltool, lcms2, lensfun, libX11, libexif, libgphoto2, libjpeg , libpng, librsvg, libtiff, openexr, osm-gps-map, pkgconfig, sqlite, libxslt , openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome3 +, ocl-icd }: stdenv.mkDerivation rec { @@ -21,9 +22,9 @@ stdenv.mkDerivation rec { libgphoto2 libjpeg libpng librsvg libtiff openexr sqlite libxslt libsoup graphicsmagick json-glib openjpeg lua pugixml colord colord-gtk libwebp libsecret gnome3.adwaita-icon-theme - osm-gps-map + osm-gps-map ocl-icd ]; - + cmakeFlags = [ "-DBUILD_USERMANUAL=False" ]; @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { # the wrappers: preFixup = '' gappsWrapperArgs+=( - --prefix LD_LIBRARY_PATH ":" "$out/lib/darktable" + --prefix LD_LIBRARY_PATH ":" "$out/lib/darktable:${ocl-icd}/lib" ) ''; diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index eb7daf2797bf..dad378affbea 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "feh-${version}"; - version = "2.26.3"; + version = "2.26.4"; src = fetchurl { url = "https://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "08aagymgajcvciagwy2zdxhicvdfnjmd2xyx9bqjy7l1n16ydwrz"; + sha256 = "15a7hjg7xwj1hsw3c5k18psvvmbqgn4g79qq03bsvibzl4kqakq7"; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index c1f15904818f..2d4fa882dd61 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "3.4.0"; src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/glabels/3.4/glabels-3.4.0.tar.xz"; + url = "https://ftp.gnome.org/pub/GNOME/sources/glabels/3.4/glabels-3.4.0.tar.xz"; sha256 = "04345crf5yrhq6rlrymz630rxnm8yw41vx04hb6xn2nkjn9hf3nl"; }; diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix index 98a32ad18995..78772a63dfe3 100644 --- a/pkgs/applications/graphics/gocr/default.nix +++ b/pkgs/applications/graphics/gocr/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "gocr-0.51"; src = fetchurl { - url = "http://www-e.uni-magdeburg.de/jschulen/ocr/${name}.tar.gz"; + url = "https://www-e.uni-magdeburg.de/jschulen/ocr/${name}.tar.gz"; sha256 = "14i6zi6q11h6d0qds2cpvgvhbxk5xaa027h8cd0wy1zblh7sxckf"; }; diff --git a/pkgs/applications/graphics/imagej/default.nix b/pkgs/applications/graphics/imagej/default.nix index 673361c734e1..0bbd543a3076 100644 --- a/pkgs/applications/graphics/imagej/default.nix +++ b/pkgs/applications/graphics/imagej/default.nix @@ -12,7 +12,7 @@ let version = "150"; src = fetchurl { - url = "http://wsr.imagej.net/distros/cross-platform/ij150.zip"; + url = "https://wsr.imagej.net/distros/cross-platform/ij150.zip"; sha256 = "97aba6fc5eb908f5160243aebcdc4965726693cb1353d9c0d71b8f5dd832cb7b"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/applications/graphics/imlibsetroot/default.nix b/pkgs/applications/graphics/imlibsetroot/default.nix index 90f8eec5993a..a881c0fc1f93 100644 --- a/pkgs/applications/graphics/imlibsetroot/default.nix +++ b/pkgs/applications/graphics/imlibsetroot/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "imlibsetroot-${version}"; version = "1.2"; src = fetchurl { - url = "http://robotmonkeys.net/wp-content/uploads/2010/03/imlibsetroot-12.tar.gz"; + url = "https://robotmonkeys.net/wp-content/uploads/2010/03/imlibsetroot-12.tar.gz"; sha256 = "8c1b3b7c861e4d865883ec13a96b8e4ab22464a87d4e6c67255b17a88e3cfd1c"; }; diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix index b428be1a1ba3..ba64aae62159 100644 --- a/pkgs/applications/graphics/jpegoptim/default.nix +++ b/pkgs/applications/graphics/jpegoptim/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "jpegoptim-${version}"; src = fetchurl { - url = "http://www.kokkonen.net/tjko/src/${name}.tar.gz"; + url = "https://www.kokkonen.net/tjko/src/${name}.tar.gz"; sha256 = "1dss7907fclfl8zsw0bl4qcw0hhz6fqgi3867w0jyfm3q9jfpcc8"; }; diff --git a/pkgs/applications/graphics/krop/default.nix b/pkgs/applications/graphics/krop/default.nix new file mode 100644 index 000000000000..2858086e0d64 --- /dev/null +++ b/pkgs/applications/graphics/krop/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, python3Packages, libsForQt5, ghostscript }: + +python3Packages.buildPythonApplication rec { + pname = "krop"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "arminstraub"; + repo = pname; + rev = "v${version}"; + sha256 = "0y8z9xr10wbzmi1dg1zpcsf3ihnxrnvlaf72821x3390s3qsnydf"; + }; + + propagatedBuildInputs = with python3Packages; [ + pyqt5 + pypdf2 + poppler-qt5 + libsForQt5.poppler + ghostscript + ]; + + # Disable checks because of interference with older Qt versions // xcb + doCheck = false; + + meta = { + homepage = http://arminstraub.com/software/krop; + description = "Graphical tool to crop the pages of PDF files"; + longDescription = '' + Krop is a tool that allows you to optimise your PDF files, and remove + sections of the page you do not want. A unique feature of krop, at least to my + knowledge, is its ability to automatically split pages into subpages to fit the + limited screensize of devices such as eReaders. This is particularly useful, if + your eReader does not support convenient scrolling. Krop also has a command line + interface. + ''; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = with stdenv.lib.maintainers; [ leenaars ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix index f1a58d4e21b8..02f5f33f6e6b 100644 --- a/pkgs/applications/graphics/qiv/default.nix +++ b/pkgs/applications/graphics/qiv/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation (rec { name = "qiv-${version}"; src = fetchurl { - url = "http://spiegl.de/qiv/download/${name}.tgz"; + url = "https://spiegl.de/qiv/download/${name}.tgz"; sha256 = "1rlf5h67vhj7n1y7jqkm9k115nfnzpwngj3kzqsi2lg676srclv7"; }; diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix index 42d129e53887..df44c132ed96 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://download.brother.com/welcome/dlf006645/${name}.amd64.deb"; + url = "https://download.brother.com/welcome/dlf006645/${name}.amd64.deb"; sha256 = "0xy5px96y1saq9l80vwvfn6anr2q42qlxdhm6ci2a0diwib5q9fd"; } else throw "${name} is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)"; diff --git a/pkgs/applications/graphics/seg3d/default.nix b/pkgs/applications/graphics/seg3d/default.nix index 80987a8c7411..bca88cc70130 100644 --- a/pkgs/applications/graphics/seg3d/default.nix +++ b/pkgs/applications/graphics/seg3d/default.nix @@ -6,7 +6,7 @@ assert (stdenv ? glibc); stdenv.mkDerivation { name = "seg3d-1.12_20090930"; src = fetchurl { - url = http://www.sci.utah.edu/releases/seg3d_v1.12/Seg3D_1.12_20090930_source.tgz; + url = https://www.sci.utah.edu/releases/seg3d_v1.12/Seg3D_1.12_20090930_source.tgz; sha256 = "1wr6rc6v5qjjkmws8yrc03z35h3iydxk1z28p06v1wdnca0y71z8"; }; diff --git a/pkgs/applications/graphics/zgv/default.nix b/pkgs/applications/graphics/zgv/default.nix index 1af165368363..7a49e5b2cb7f 100644 --- a/pkgs/applications/graphics/zgv/default.nix +++ b/pkgs/applications/graphics/zgv/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "zgv-${version}"; version = "5.9"; src = fetchurl { - url = "http://www.svgalib.org/rus/zgv/${name}.tar.gz"; + url = "https://www.svgalib.org/rus/zgv/${name}.tar.gz"; sha256 = "1fk4i9x0cpnpn3llam0zy2pkmhlr2hy3iaxhxg07v9sizd4dircj"; }; diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 60391eee6927..d5818614b9e0 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, makeWrapper }: +{ stdenv, fetchzip }: stdenv.mkDerivation rec { name = "1password-${version}"; @@ -6,25 +6,24 @@ stdenv.mkDerivation rec { src = if stdenv.system == "i686-linux" then fetchzip { - url = "https://cache.agilebits.com/dist/1P/op/pkg/v0.4.1/op_linux_386_v${version}.zip"; - sha256 = "0mv2m6rm6bdpca8vhyx213bg4kh06jl2sx8q7mnrp22c3f0yzh7f"; + url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; + sha256 = "1yzzh1f6hx7vwdgzp0znsjarjiw4xqmmrkc5xwywgjpg81qqpl8c"; stripRoot = false; } else if stdenv.system == "x86_64-linux" then fetchzip { - url = "https://cache.agilebits.com/dist/1P/op/pkg/v0.4.1/op_linux_amd64_v${version}.zip"; - sha256 = "016h5jcy6jic8j3mvlnpcig9jxs22vj71gh6rrap2q950bzi6fi1"; + url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; + sha256 = "0dgj1zqmpdbnsz2v2j7nqm232cdgyp9wagc089dxi4hbzkmfcvzx"; stripRoot = false; } else if stdenv.system == "x86_64-darwin" then fetchzip { - url = "https://cache.agilebits.com/dist/1P/op/pkg/v0.4.1/op_darwin_amd64_v${version}.zip"; - sha256 = "1l0bi0f6gd4q19wn3v409gj64wp51mr0xpb09da1fl33rl5fpszb"; + url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.zip"; + sha256 = "116bvyfg38npdhlzaxan5y47cbw7jvj94q5w6v71kxsjzxk9l44a"; stripRoot = false; } else throw "Architecture not supported"; - nativeBuildInputs = [ makeWrapper ]; installPhase = '' install -D op $out/bin/op ''; diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index 250590d0d302..f16144f3befa 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -1,15 +1,18 @@ { mkDerivation, lib, fetchFromGitHub, makeWrapper, qtbase, qtdeclarative, qtsvg, qtx11extras, muparser, cmake, python3 }: +let + pname = "albert"; + version = "0.14.21"; +in mkDerivation rec { - name = "albert-${version}"; - version = "0.14.15"; + name = "${pname}-${version}"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${version}"; - sha256 = "1rjp0bmzs8b9blbxz3sfcanyhgmds882pf1g3jx5qp85y64j8507"; + sha256 = "16nk9krn1mwr0bh57viig9hizqyp3slna0qg7s5a736nsfxy226w"; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/audio/wavesurfer/default.nix b/pkgs/applications/misc/audio/wavesurfer/default.nix index e5e09bf71fd7..0add5ed78cc5 100644 --- a/pkgs/applications/misc/audio/wavesurfer/default.nix +++ b/pkgs/applications/misc/audio/wavesurfer/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "wavesurfer-1.8.5"; src = fetchurl { - url = http://www.speech.kth.se/wavesurfer/wavesurfer-1.8.5.tar.gz; + url = https://www.speech.kth.se/wavesurfer/wavesurfer-1.8.5.tar.gz; sha256 = "1yx9s1j47cq0v40cwq2gn7bdizpw46l95ba4zl9z4gg31mfvm807"; }; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index c4c57380be99..b9d4b83e4f1f 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { name = "blender-2.79b"; src = fetchurl { - url = "http://download.blender.org/source/${name}.tar.gz"; + url = "https://download.blender.org/source/${name}.tar.gz"; sha256 = "1g4kcdqmf67srzhi3hkdnr4z1ph4h9sza1pahz38mrj998q4r52c"; }; diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/applications/misc/calcurse/default.nix index 8800ebd83ca0..fd65fcd22606 100644 --- a/pkgs/applications/misc/calcurse/default.nix +++ b/pkgs/applications/misc/calcurse/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "4.3.0"; src = fetchurl { - url = "http://calcurse.org/files/${name}.tar.gz"; + url = "https://calcurse.org/files/${name}.tar.gz"; sha256 = "16jzg0nasnxdlz23i121x41pq5kbxmjzk52c5d863rg117fc7v1i"; }; diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index ff1712f12fec..0b2bee9122e0 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "0.38.4"; src = fetchurl { - url = "http://www.giuspen.com/software/${name}.tar.xz"; + url = "https://www.giuspen.com/software/${name}.tar.xz"; sha256 = "1zazyxkrli77wahn4c1z24qyz5bwlayl335f2kdxb44dicrx58g2"; }; diff --git a/pkgs/applications/misc/confclerk/default.nix b/pkgs/applications/misc/confclerk/default.nix index 661a00a06616..3851730c4596 100644 --- a/pkgs/applications/misc/confclerk/default.nix +++ b/pkgs/applications/misc/confclerk/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "confclerk-${version}"; src = fetchurl { - url = "http://www.toastfreeware.priv.at/tarballs/confclerk/confclerk-${version}.tar.gz"; + url = "https://www.toastfreeware.priv.at/tarballs/confclerk/confclerk-${version}.tar.gz"; sha256 = "10rhg44px4nvbkd3p341cmp2ds43jn8r4rvgladda9v8zmsgr2b3"; }; diff --git a/pkgs/applications/misc/cura/lulzbot.nix b/pkgs/applications/misc/cura/lulzbot.nix index 341cc8ec2d04..6a36e42eaa3d 100644 --- a/pkgs/applications/misc/cura/lulzbot.nix +++ b/pkgs/applications/misc/cura/lulzbot.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://download.alephobjects.com/ao/aodeb/dists/jessie/main/binary-amd64/cura_${version}_amd64.deb"; + url = "https://download.alephobjects.com/ao/aodeb/dists/jessie/main/binary-amd64/cura_${version}_amd64.deb"; sha256 = "1gsfidg3gim5pjbl82vkh0cw4ya253m4p7nirm8nr6yjrsirkzxg"; } else if stdenv.system == "i686-linux" then diff --git a/pkgs/applications/misc/fbreader/default.nix b/pkgs/applications/misc/fbreader/default.nix index 80f76bc27c89..6fa34a008e77 100644 --- a/pkgs/applications/misc/fbreader/default.nix +++ b/pkgs/applications/misc/fbreader/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "fbreader-0.99.4"; src = fetchurl { - url = http://fbreader.org/files/desktop/fbreader-sources-0.99.4.tgz; + url = https://fbreader.org/files/desktop/fbreader-sources-0.99.4.tgz; sha256 = "1sdq3vvwkq4bkyrvh0p884d66gaddz8hlab3m798ji9ixbak2z1x"; }; diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 43a949ded372..dc70747784cf 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "0.3.0"; src = fetchurl { - url = "http://pwmt.org/projects/girara/download/${name}.tar.xz"; + url = "https://pwmt.org/projects/girara/download/${name}.tar.xz"; sha256 = "18j1gv8pi4cpndvnap88pcfacdz3lnw6pxmw7dvzm359y1gzllmp"; }; diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix index 58d8e9fae618..2710850759b9 100644 --- a/pkgs/applications/misc/gnuradio/default.nix +++ b/pkgs/applications/misc/gnuradio/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, writeText, makeWrapper # Dependencies documented @ https://gnuradio.org/doc/doxygen/build_guide.html # => core dependencies -, cmake, pkgconfig, git, boost, cppunit, fftw +, ninja, cmake, pkgconfig, git, boost, cppunit, fftw # => python wrappers # May be able to upgrade to swig3 , python, swig2, numpy, scipy, matplotlib # => grc - the gnu radio companion -, cheetah, pygtk +, Mako, cheetah, pygtk # Note: GR is migrating to Mako. Cheetah should be removed for GR3.8 # => gr-wavelet: collection of wavelet blocks , gsl # => gr-qtgui: the Qt-based GUI @@ -26,18 +26,18 @@ stdenv.mkDerivation rec { name = "gnuradio-${version}"; - version = "3.7.11.1"; + version = "3.7.13.3"; src = fetchFromGitHub { owner = "gnuradio"; repo = "gnuradio"; - rev = "6d2221196082a4954c249dc6955e33d5832a56f2"; - sha256 = "1fkrb8cnjbriy2x94lz73q6aqxar1rkvfbafp266ykdpm29b4xgm"; + rev = "v${version}"; + sha256 = "0fqxn1k41xqd52i5z528zdhkn52i9z5hl6cc75ggdx9iqxhvb3jj"; fetchSubmodules = true; }; nativeBuildInputs = [ - cmake pkgconfig git makeWrapper cppunit orc + cmake pkgconfig git makeWrapper cppunit orc ninja ]; buildInputs = [ @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals stdenv.isDarwin [ CoreAudio ]; propagatedBuildInputs = [ - cheetah numpy scipy matplotlib pyqt4 pygtk wxPython pyopengl + Mako cheetah numpy scipy matplotlib pyqt4 pygtk wxPython pyopengl ]; enableParallelBuilding = true; @@ -69,6 +69,8 @@ stdenv.mkDerivation rec { setupHook = [ grcSetupHook ]; # patch wxgui and pygtk check due to python importerror in a headless environment + # wxgtk gui will be removed in GR3.8 + # c++11 hack may not be necessary anymore preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-unused-variable ${stdenv.lib.optionalString (!stdenv.isDarwin) "-std=c++11"}" sed -i 's/.*wx\.version.*/set(WX_FOUND TRUE)/g' gr-wxgui/CMakeLists.txt diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index b6391d06eb92..586807b2dd5c 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "19"; src = fetchurl { - url = "http://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; + url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; sha256 = "0n08fg55zgpfg1f6lq0n3ngi0n8af1r0rhmbnpik5mjng4m9g3x5"; }; diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix index dc9b0c29aa10..57dc68263ac4 100644 --- a/pkgs/applications/misc/guake/default.nix +++ b/pkgs/applications/misc/guake/default.nix @@ -2,7 +2,7 @@ , gtk3, keybinder3, libnotify, libutempter, vte }: let - version = "3.2.2"; + version = "3.3.0"; in python3.pkgs.buildPythonApplication rec { name = "guake-${version}"; format = "other"; @@ -11,7 +11,7 @@ in python3.pkgs.buildPythonApplication rec { owner = "Guake"; repo = "guake"; rev = version; - sha256 = "1wx8vghn0h52xryyn6cf9z1lbwsk766lhff162szbaxlxyl6xsc0"; + sha256 = "1wckzz18rpgacnkynh4rknhhki52agd76i2p80kk9rlrdifqs788"; }; nativeBuildInputs = [ gettext gobjectIntrospection wrapGAppsHook python3.pkgs.pip glibcLocales ]; diff --git a/pkgs/applications/misc/gxneur/default.nix b/pkgs/applications/misc/gxneur/default.nix index f581b302c3f4..69c91d257558 100644 --- a/pkgs/applications/misc/gxneur/default.nix +++ b/pkgs/applications/misc/gxneur/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gxneur-0.13.0"; src = fetchurl { - url = http://dists.xneur.ru/release-0.13.0/tgz/gxneur-0.13.0.tar.bz2; + url = https://dists.xneur.ru/release-0.13.0/tgz/gxneur-0.13.0.tar.bz2; sha256 = "f093428a479158247a7ff8424f0aec9af9f7b1d05b191cf30b7c534965a6839f"; }; diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 525be09d9686..fb17aadfa490 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -4,7 +4,7 @@ let in stdenv.mkDerivation { name = "masterpdfeditor-${version}"; src = fetchurl { - url = "http://get.code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; + url = "https://get.code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; sha256 = "0k5bzlhqglskiiq86nmy18mnh5bf2w3mr9cq3pibrwn5pisxnxxc"; }; diff --git a/pkgs/applications/misc/pdfdiff/default.nix b/pkgs/applications/misc/pdfdiff/default.nix index 90149263644d..ee54904bfd66 100644 --- a/pkgs/applications/misc/pdfdiff/default.nix +++ b/pkgs/applications/misc/pdfdiff/default.nix @@ -7,7 +7,7 @@ py.buildPythonApplication rec { version = "0.92"; src = fetchurl { - url = "http://www.cs.ox.ac.uk/people/cas.cremers/downloads/software/pdfdiff.py"; + url = "https://www.cs.ox.ac.uk/people/cas.cremers/downloads/software/pdfdiff.py"; sha256 = "0zxwjjbklz87wkbhkmsvhc7xmv5php7m2a9vm6ydhmhlxsybf836"; }; diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix index 889f516f00b7..7e7850668b84 100644 --- a/pkgs/applications/misc/pgadmin/default.nix +++ b/pkgs/applications/misc/pgadmin/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.22.2"; src = fetchurl { - url = "http://ftp.postgresql.org/pub/pgadmin/pgadmin3/v${version}/src/pgadmin3-${version}.tar.gz"; + url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin3/v${version}/src/pgadmin3-${version}.tar.gz"; sha256 = "1b24b356h8z188nci30xrb57l7kxjqjnh6dq9ws638phsgiv0s4v"; }; diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix index 556889e126c0..3cd52af6d321 100644 --- a/pkgs/applications/misc/pstree/default.nix +++ b/pkgs/applications/misc/pstree/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ "http://www.sfr-fresh.com/unix/misc/${name}.tar.gz" - "http://distfiles.macports.org/pstree/${name}.tar.gz" + "https://distfiles.macports.org/pstree/${name}.tar.gz" ]; sha256 = "17s7v15c4gryjpi11y1xq75022nkg4ggzvjlq2dkmyg67ssc76vw"; }; diff --git a/pkgs/applications/misc/ptask/default.nix b/pkgs/applications/misc/ptask/default.nix index af74ea570ab3..e1a64c73a123 100644 --- a/pkgs/applications/misc/ptask/default.nix +++ b/pkgs/applications/misc/ptask/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "ptask-1.0.0"; src = fetchurl { - url = "http://wpitchoune.net/ptask/files/${name}.tar.gz"; + url = "https://wpitchoune.net/ptask/files/${name}.tar.gz"; sha256 = "13nirr7b29bv3w2zc8zxphhmc9ayhs61i11jl4819nabk7vy1kdq"; }; diff --git a/pkgs/applications/misc/rtl-sdr/default.nix b/pkgs/applications/misc/rtl-sdr/default.nix index 92e96a7fb5ee..bedfc563b1c0 100644 --- a/pkgs/applications/misc/rtl-sdr/default.nix +++ b/pkgs/applications/misc/rtl-sdr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, pkgconfig, libusb1 }: +{ stdenv, lib, fetchpatch, fetchgit, cmake, pkgconfig, libusb1 }: stdenv.mkDerivation rec { name = "rtl-sdr-${version}"; @@ -26,7 +26,13 @@ stdenv.mkDerivation rec { grep -q "Requires:" "$pcfile" && { echo "Upstream has added 'Requires:' in $(basename "$pcfile"); update nix expression."; exit 1; } echo "Requires: libusb-1.0" >> "$pcfile" ''; - + patches = lib.optionals stdenv.isDarwin [ + (fetchpatch { + name = "linker-fix.patch"; + url = "https://github.com/lukeadams/rtl-sdr/commit/7a66dcf268305b5aa507d1756799942c74549b72.patch"; + sha256 = "0cn9fyf4ay4i3shvxj1ivgyxjvfm401irk560jdjl594nzadrcsl"; + }) + ]; meta = with stdenv.lib; { description = "Turns your Realtek RTL2832 based DVB dongle into a SDR receiver"; homepage = http://sdr.osmocom.org/trac/wiki/rtl-sdr; diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index d216a695a3c5..e0c5946d564f 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -6,12 +6,12 @@ let inherit (python3Packages) python buildPythonApplication fetchPypi; in buildPythonApplication rec { name = "${pname}-${version}"; pname = "safeeyes"; - version = "2.0.5"; + version = "2.0.6"; namePrefix = ""; src = fetchPypi { inherit pname version; - sha256 = "1q52ncqn18wb3d42dzsm7lh301w6g053a685i1cnismvp86amvfl"; + sha256 = "0s14pxicgq33srvhf6bvfq48wv3z4rlsmzkccz4ky9vh3gfx7zka"; }; buildInputs = [ diff --git a/pkgs/applications/misc/sbagen/default.nix b/pkgs/applications/misc/sbagen/default.nix index 14680619e0c2..6f38ba5662b5 100644 --- a/pkgs/applications/misc/sbagen/default.nix +++ b/pkgs/applications/misc/sbagen/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "sbagen-1.4.4"; src = fetchurl { - url = "http://uazu.net/sbagen/${name}.tgz"; + url = "https://uazu.net/sbagen/${name}.tgz"; sha256 = "0w62yk1b0hq79kl0angma897yqa8p1ww0dwydf3zlwav333prkd2"; }; diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/applications/misc/tasksh/default.nix index f64d25471982..1e51ba22ddc3 100644 --- a/pkgs/applications/misc/tasksh/default.nix +++ b/pkgs/applications/misc/tasksh/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; src = fetchurl { - url = "http://taskwarrior.org/download/${name}.tar.gz"; + url = "https://taskwarrior.org/download/${name}.tar.gz"; sha256 = "1z8zw8lld62fjafjvy248dncjk0i4fwygw0ahzjdvyyppx4zjhkf"; }; diff --git a/pkgs/applications/misc/tqsl/default.nix b/pkgs/applications/misc/tqsl/default.nix index 829ed2585627..b41f5c9a0a70 100644 --- a/pkgs/applications/misc/tqsl/default.nix +++ b/pkgs/applications/misc/tqsl/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { version = "2.3.1"; src = fetchurl { - url = "http://www.arrl.org/files/file/LoTW%20Instructions/${name}.tar.gz"; + url = "https://www.arrl.org/files/file/LoTW%20Instructions/${name}.tar.gz"; sha256 = "10cjlilampwl10hwb7m28m5z9gyrscvvc1rryfjnhj9q2x4ppgxv"; }; diff --git a/pkgs/applications/misc/tvbrowser/bin.nix b/pkgs/applications/misc/tvbrowser/bin.nix new file mode 100644 index 000000000000..38865ca4f3d9 --- /dev/null +++ b/pkgs/applications/misc/tvbrowser/bin.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchurl, makeWrapper, jre, makeDesktopItem }: + +let + desktopItem = makeDesktopItem { + name = "tvbrowser"; + exec = "tvbrowser"; + icon = "tvbrowser"; + comment = "Themeable and easy to use TV Guide"; + desktopName = "TV-Browser"; + genericName = "Electronic TV Program Guide"; + categories = "AudioVideo;TV;Java;"; + startupNotify = "true"; + extraEntries = '' + StartupWMClass=tvbrowser-TVBrowser + ''; + }; + +in stdenv.mkDerivation rec { + pname = "tvbrowser"; + version = "4.0.1"; + name = "${pname}-bin-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/TV-Browser%20Releases%20%28Java%208%20and%20higher%29/${version}/${pname}_${version}_bin.tar.gz"; + sha256 = "0ahsirf6cazs5wykgbwsc6n35w6jprxyphzqmm7d370n37sb07pm"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/share/java/${pname} + cp -R * $out/share/java/${pname} + rm $out/share/java/${pname}/${pname}.{sh,desktop} + + mkdir -p $out/share/applications + ln -s ${desktopItem}/share/applications/* $out/share/applications/ + + for i in 16 32 48 128; do + mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps + ln -s $out/share/java/${pname}/imgs/${pname}$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/${pname}.png + done + + mkdir -p $out/bin + makeWrapper ${jre}/bin/java $out/bin/${pname} \ + --add-flags "-jar $out/share/java/${pname}/${pname}.jar" \ + --run "cd $out/share/java/${pname}" + ''; + + meta = with stdenv.lib; { + description = "Electronic TV Program Guide"; + homepage = https://www.tvbrowser.org/; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ jfrankenau ]; + }; +} diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix index 1a9cd2a12525..cf461c498c1c 100644 --- a/pkgs/applications/misc/urh/default.nix +++ b/pkgs/applications/misc/urh/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urh-${version}"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "jopohl"; repo = "urh"; rev = "v${version}"; - sha256 = "0i01pj71p3lc1kcqj6mixax6865vbxd9k9jczi2xh4p9nmfa5m2a"; + sha256 = "1n8nkrydic2zkglz9hyrf28np3v42b4xwia068b29szivr9fmnrn"; }; buildInputs = [ hackrf rtl-sdr ]; diff --git a/pkgs/applications/misc/vcal/default.nix b/pkgs/applications/misc/vcal/default.nix index 9225bd86492e..7649785524f1 100644 --- a/pkgs/applications/misc/vcal/default.nix +++ b/pkgs/applications/misc/vcal/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.8"; src = fetchurl { - url = "http://waynemorrison.com/software/vcal"; + url = "https://waynemorrison.com/software/vcal"; sha256 = "0jrm0jzqxb1xjp24hwbzlxsh22gjssay9gj4zszljzdm68r5afvc"; }; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Parser for VCalendar and ICalendar files, usable from the command line"; - homepage = http://waynemorrison.com/software/; + homepage = https://waynemorrison.com/software/; license = licenses.asl20; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/applications/misc/verbiste/default.nix b/pkgs/applications/misc/verbiste/default.nix index 3ec92adb7f8c..f23862c63cd4 100644 --- a/pkgs/applications/misc/verbiste/default.nix +++ b/pkgs/applications/misc/verbiste/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "0.1.45"; src = fetchurl { - url = "http://perso.b2b2c.ca/~sarrazip/dev/${name}.tar.gz"; + url = "https://perso.b2b2c.ca/~sarrazip/dev/${name}.tar.gz"; sha256 = "180zyhdjspp7lk2291wsqs6bm7y27r7bd00447iimmjpx372s22c"; }; diff --git a/pkgs/applications/misc/welle-io/default.nix b/pkgs/applications/misc/welle-io/default.nix index 143ec518ac51..27376f4db81c 100644 --- a/pkgs/applications/misc/welle-io/default.nix +++ b/pkgs/applications/misc/welle-io/default.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A DAB/DAB+ Software Radio"; - homepage = http://www.welle.io/; + homepage = https://www.welle.io/; maintainers = with maintainers; [ ck3d ]; license = licenses.gpl2; platforms = with platforms; [ "x86_64-linux" "i686-linux" ] ++ darwin; diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix index 4e1e505e035e..aacf71e17b6c 100644 --- a/pkgs/applications/misc/xmrig/proxy.nix +++ b/pkgs/applications/misc/xmrig/proxy.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "xmrig-proxy-${version}"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig-proxy"; rev = "v${version}"; - sha256 = "1yfbdgyd37r5vb2g8jz4i92hxang3hbiig5y4507v9hr75jvfivh"; + sha256 = "1f573shf0qv1kh0sb9sljagpb2q1rn8h7qc1hxlb5nlchs9qcnnn"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/xneur/0.8.nix b/pkgs/applications/misc/xneur/0.8.nix index 39da756204f9..897c861e40a1 100644 --- a/pkgs/applications/misc/xneur/0.8.nix +++ b/pkgs/applications/misc/xneur/0.8.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "xneur-0.8.0"; src = fetchurl { - url = http://dists.xneur.ru/release-0.8.0/tgz/xneur-0.8.0.tar.bz2; + url = https://dists.xneur.ru/release-0.8.0/tgz/xneur-0.8.0.tar.bz2; sha256 = "1f05bm4vqdrlm8rxwgqv89k5lhc236xg841aw4snw514g0hi2sl8"; }; diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index ca0d7775ecef..ff7c6a9e9767 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "Utility for switching between keyboard layouts"; - homepage = http://xneur.ru; + homepage = https://xneur.ru; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/xtermcontrol/default.nix b/pkgs/applications/misc/xtermcontrol/default.nix index ae31ebd1ca7e..8df29cef5392 100644 --- a/pkgs/applications/misc/xtermcontrol/default.nix +++ b/pkgs/applications/misc/xtermcontrol/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "xtermcontrol-${version}"; src = fetchurl { - url = "http://thrysoee.dk/xtermcontrol/xtermcontrol-${version}.tar.gz"; + url = "https://thrysoee.dk/xtermcontrol/xtermcontrol-${version}.tar.gz"; sha256 = "1g81v9gfn08gjn1269j0qx12x36s9j6x39gl91ycay391flgzr5l"; }; diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix index db48c2e7c808..06fa8d2bd0dd 100644 --- a/pkgs/applications/misc/yubioath-desktop/default.nix +++ b/pkgs/applications/misc/yubioath-desktop/default.nix @@ -6,7 +6,7 @@ python27Packages.buildPythonApplication rec { version = "3.1.0"; src = fetchurl { - url = "http://developers.yubico.com/yubioath-desktop/Releases/yubioath-desktop-${version}.tar.gz"; + url = "https://developers.yubico.com/yubioath-desktop/Releases/yubioath-desktop-${version}.tar.gz"; sha256 = "0jfvllgh88g2vwd8sg6willlnn2hq05nd9d3xmv98lhl7gyy1akw"; }; diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix index b056bdedb41e..73094767bf3d 100644 --- a/pkgs/applications/networking/browsers/dillo/default.nix +++ b/pkgs/applications/networking/browsers/dillo/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { name = "dillo-${version}"; src = fetchurl { - url = "http://www.dillo.org/download/${name}.tar.bz2"; + url = "https://www.dillo.org/download/${name}.tar.bz2"; sha256 = "12ql8n1lypv3k5zqgwjxlw1md90ixz3ag6j1gghfnhjq3inf26yv"; }; diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index feab0194983d..9be83bc3678f 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,985 +1,995 @@ { - version = "61.0b14"; + version = "62.0b3"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ach/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ach/firefox-62.0b3.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "db3ed2a6baafe609e3e57f21058b65d6aaad657289c647f50cf701de11653324ea02a1edd11ff005a1037b61053cdf332c2399eb5483f31783e44665fa0a5892"; + sha512 = "30ede248dbc0a8d9375d372dd1c0260dbf7fbbb398d1528400933953da56ef018cf7bac604bef1138a5454fde8cbb96906f65b0afe3605dc9ff5edee91245c41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/af/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/af/firefox-62.0b3.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "b6a1607c92e59e05a17df816e99065b1ecd0d83e8de6f14493985d758c7900d6ca648fb63664479f94d7a162f61a2c3e8dfe54d9ac07a61a1d2021be0d2601ce"; + sha512 = "52227774b4c0f4817c208ca46f68d09fcdd9865867a438ec2eda8dcb66564e7cc7f88d3102dcaa1de6edf428b16167a2460b181facd2b12a2dd0c287deac75e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/an/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/an/firefox-62.0b3.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "8a4df389f422a994926875d90b880ff110f4c526f50c6fafef164b4a7657677f05932729c553387e06bef7af7e479e0e357b005fef72ed05c940811ba94f7f9b"; + sha512 = "e932625df7fcdfbd8c30898008ac07aa91c446a3785eb3c7cc0998ed5e52659268bc8b86086968534e8108312dacd53de4d0e5d9cd0bdc2f76edd46c29599bd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ar/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ar/firefox-62.0b3.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "349f96b77c0b67e9339079c3d5a3b71a655855b5a2d138e3444f0018043a9ba801830a62c07be2ccc452202ff171802ac46bfee4223f5aaaf623d51430a0fa40"; + sha512 = "1873b5a75b3b51e69143f8b85442a995d05a2b753e5ddc06b15224b34d694f8f3ccfba3d15e522e12a265813255023258b791e0a95c680af1d07771aac196ef1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/as/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/as/firefox-62.0b3.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "c60cf70bcae7ccc00fe4a0350a60ecde6284d7e4cca96386b2e8fd26d0f45fded354b547c0da2855e20b0150772fa6e4523074f8bc455c11a1a05abdf0680940"; + sha512 = "31b0241902ece8d7364e85a5072f8e4f9ee18fb0b45f3f0d11dff4c25499e6488fa47fbe4eaed6ab16fb63d72fa153e8459ef0e455973d0142e3240ebee35503"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ast/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ast/firefox-62.0b3.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "c68f45e752a7e0733540ade38e369ab85e0815f81d0df8887509e3ce0265a7f8d213ccec9390a6637600ef2027d413c14933702d259c745cf1e9789f13d2760c"; + sha512 = "d4b3033952e71c3aa9c4a0b6e3835c35795deddee65c0f39f50f24d4b5557407d7bbfb6f7e69969856c1ae4e8d7654e943656377c94dd33d8e45a5ce44054eda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/az/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/az/firefox-62.0b3.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "b953d077fad90aec862fd50c9cb9ec73b682cbcc1ccefc75e813ce00aeeb7f2865b6abeaa23e1a6217e2fffe4530110447905d5c7d68d6a4a297669ecf98a7b5"; + sha512 = "8bb472d6f3a81db37b5d3e06f19b1c7a3c44f7055ccbc922a600b10870f45e2380ea427cd7e0a3b4567798a21274f9619482e077650a22f2bcd7d52c8d83a06f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/be/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/be/firefox-62.0b3.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "d68b380e95e3c353698b5e6842aee7737c22d1140d62d92653936efb92b49ec1e9f227ad9e0cd8cb5dbdbc5efd7b537112532a87c4d20759adc89d9ae58a42c7"; + sha512 = "4c5e859878a9463d9c55b08b1a1ef41d09265bfb4b217cfb3c70ee98f6df50910493a5425fcbff0473ca9c29a8ff753097530d7747506747b4ac05f2b9e87f39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/bg/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/bg/firefox-62.0b3.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "79270f024baaacbc01b46d63c60ed58e75f49c1ec14a0c9de480bfd750b5f914bbaf25be216792bf0be6eaa3ae0f8886862bdb8f92568eef54c6f31b9f71c15a"; + sha512 = "95eb87c22eeb1302cd86c4a92ffdd367d3586eb9ad6a6472a4b7cb8133554f09f322572d576c46a23d0b0a6fd9f84fd2b7217ada82eeedaeb31484c8d85e6807"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/bn-BD/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/bn-BD/firefox-62.0b3.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "3c5620c1017dae764823fc98cb724e69fa74bb0925fe1ee1f687de7122d3a9094492d7fc80fcf3e922c7bdd3d6bd4e744bd9cf02f3f10763382303f88fb79b48"; + sha512 = "629ecff0efa7aad6f6ce407f1d44ac5c52f781828909a953ad6efe92c43c1cb94fb555bf96e2474b664bdeefaf40b1f6ed7e0acbc43ab9e48ee37b5d0164908c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/bn-IN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/bn-IN/firefox-62.0b3.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "47a9f5c4b6f9e96b8c6dd64fd3989115a66a5ced77c913409201f4dae25c6d72b6d91e0746abcaaafc4c84d3018d7955e085dd2af45665b96f590a95746e8da1"; + sha512 = "ae7a67643bcaaaa199560785169c41f43854ef0ca110e1fffcd7f118433e6213bb4549fb6c85b52a3c1b00a7700609f489eb7e649225f4f3f1aeab0097af82e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/br/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/br/firefox-62.0b3.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "75fbd163865f92bc40eff88d475b8e30e77e4e9a3d1d9b0ba588e7b78d5ca1c57d15d85cd8868dda73e8a67a25e0ecfbc9710d758828463b0d7030076c3d421d"; + sha512 = "eaffdb43d8870a26989be3f3ac44649a593c40679f2d7ff230fd710f3edd2fd9d011503e9a7e4659a4db5acc9eddb979c9bc9c6953d3f089c278e145e2a89eb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/bs/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/bs/firefox-62.0b3.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "23065f2645d8ee5c502568bac03f7e184b7d49d9c05388d2110e9875ac7423c43f3edef6c64d307c14697991adc039d6779fcc8c6b4f488b953484e611e0931f"; + sha512 = "b431d7b07bad19fb209ce8563cbac95f2385b921f13bbc931deaa37528850d7234734a223775796c7d919e67931ac4d931345badebdf158f3d9de20b7267dac6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ca/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ca/firefox-62.0b3.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "10c180075ebdb9eeb09f00e8c3c88848955969b429167a3dc2f8a61826ea20aa687cc2ed819ad0a8d59909278e55c2c8c626bf0a366ec52841e27b0eb434d3d7"; + sha512 = "04b5aaf8c9e29f85cb5c8a71a1bd6c43e0247f3c92bfb56bd3c0b862ec813c5d94dd40ae901609516a12649beeaac7d7e512b585d1e9b5e87167329942b614e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/cak/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/cak/firefox-62.0b3.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "9dc714c03556dcaf0d775257183a93b09b1bda567fce442af55e7dca4fbd119ca55d754c1d504304683e92bd29734b298ba685a089b11ceab52cee5ebbc74fc3"; + sha512 = "80680ed074f4f532bf5138174bc7f79b1f0dac4617e717e52dea3ceb6592919776ba7afcfc8b63d9dae8816d0dfde8af7badecf6f84610404f94c5a92486abf3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/cs/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/cs/firefox-62.0b3.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "a4122dfca825a16a40176a6aba334e4fc74e66146f04d01812c6049be2ff93b0199f321bd2d46b02b87a179fb51ae95246fde58a263e507ff2f3fe1b1e11d3dc"; + sha512 = "d93cd8788dffaa1f58ea70454d2b5693d0b22bbd8f8d65456add235c6ce812faa04e63ee375b07154f8a0d6364df39637b43bb7e7619eae2df394c9e8724eeb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/cy/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/cy/firefox-62.0b3.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "5fd2a5f5bf3d26c79eb896370932c5bc72842f086617fe16a8b4b729c841a8e872946b56e20c623b54c12a6751918c3cd97d7dc29835b0b2a04a01f70da65e38"; + sha512 = "2a3a4f1d31dc97655b2a0dab87d21c71b974545be1d35c427f459cc079b32d91da65ede482c9915d333d865266a1a2ed6dfa0ab770943972a91064f08bfca67b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/da/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/da/firefox-62.0b3.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "a9f48d240cc0bb8eacf2ab418b5903db0d789c3712a61b28b8aee3aec2c9112eb79a4805142798aa15561ab09d7d63fb69ddced7d8ae3b1fd5aab1f00da164e2"; + sha512 = "529aa1487c7cd7e488fdf8e011acb0284b2d9d2c89cbcf4799f530fc9301f4894eaea555939896d289a63cbe737e0dbc5b1312dab6a2684213cf33ee988799d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/de/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/de/firefox-62.0b3.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "ca81b151a407d588418505b84cfa14cea622d50c3ce3cf7e8b9e0666fc5c93d7f2fd25e792d768ea8d7fbbbc22d7228a2bd85fcafd9aafc6c8f8c78259e6e9ad"; + sha512 = "160a7ef01b28c72b66ba07c9d3cb7bf8acd8935ed2a3e17d14bf62385e46f19b6e8d24cf4f3b98e321183a17bd7f6d6ee75bc144244f66f93d1b3945cfe9ad1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/dsb/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/dsb/firefox-62.0b3.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "f4a733fc705ddb33f8f2108c85aa39050157fdcfc9ae07905ce6fd50e910595741837356eaefe83610a50e4ac93b919ce8d665817b5b53f9c71cb00c278b73f9"; + sha512 = "c0f3095ad12bc6f9131f676d17dca3385b586c593f0de8568c3b7dbb1c6ca43729720b962f35d5993be0fdef096da5085ab64d4868f29727d49a136955abe086"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/el/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/el/firefox-62.0b3.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "da642365a096f146047b92d915467b34cb348fe1986189afdd32e0fb5a89d826b9d19c5f0adbc786810d65987528a7d7c4fef60ba144e695ffff26e2149b099e"; + sha512 = "e899b6aeafab429521cf25de489d98fad392a901c5533185b7b2e7516b6705f13a57c6bb68b5904a0887c54a026959df2b0fb1375df3a926b3065d516bdc0f4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/en-GB/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/en-CA/firefox-62.0b3.tar.bz2"; + locale = "en-CA"; + arch = "linux-x86_64"; + sha512 = "ccdb6270c83ca3475a4a77d3bc9304c1407977d0c60a4cee9680122b8e16a481f656914174cd6e4ea9b9a738424c74eecc34c864f897bfb2b59736d9cbe7a8ab"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/en-GB/firefox-62.0b3.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "aaec5a485464ab420d936395c16dbea142642162b22a494a5ebe5ac6e9f184df303807fda2573d7f36cd0cfa370f7b6101b4bbd259ff59f16f99bc88039c253b"; + sha512 = "674854163f9ede8b6e4eab70b748635e0111420c127a9b94ead1294330255f4f00c89160608b98dc6231114bf4be87aa470631645069ac5a587f84a282ca6656"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/en-US/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/en-US/firefox-62.0b3.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "61e810f7c8d3d959f29653e754ec4d1b3f5745684c06d2621a9c84da70917adf4a6926f16288ac3375240247c9d09388be0c07cf386f4683f4ae4dc967eb53a2"; + sha512 = "b09b00a8a5228fc2afb0d890ec63a19a078cdfbf82c64b7255aa26ed5ec26591b2dbc4e313bff40fab0accd6ecdaa4fbbce363bb78fed5d29d4fb7b7e46713ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/en-ZA/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/en-ZA/firefox-62.0b3.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "b8feaa4158cc886799eacfd87a28f48d1176e5e23d89d7f23457197ae9c8a414a45f96a656815d3322ba307d20cac889f68984967114a7e5655276a32a10ad71"; + sha512 = "72be1014c8be0030cd0c512c31c64a73957d24eb756bf4cc9959a5656f460ecbae5c984d0708cb9d5d29c434468f7b68bb215d04bc261057921bfcc75bb420c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/eo/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/eo/firefox-62.0b3.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "ad3293e8b836ad2b0fe81f4864d8b9ea3a62fb2e293c564fd92a67d75671047c8b2f77ca9626dbc6bd5f4f4989b43d676eb8f56e2ea7bb7770a682b583a3d889"; + sha512 = "65fd6961a1f694711336bbab7f1cf1ca5804f838295a9e3d4ead6c7fee7779c7c881820bf35eb8de218e08b8435329514a43e9018253f5519856fc0a75382d82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/es-AR/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/es-AR/firefox-62.0b3.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "437a6d1f79e45f0ffade6db41806d2397fa85966e744bab1251ad38c77141782ac2c7e97303ce75013f17d2be7672121c366a35de00b12a42e3eb382b56323ab"; + sha512 = "a1b23e9591635e0f4bf8520e63cbc7e7ee8c9b016983b4e71185f067deaf2f1edeca80798ac833fd0aa2f337fcce71ebb36fec7afb30f9a36bdf0b59162ffef8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/es-CL/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/es-CL/firefox-62.0b3.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "685f731b6d24c9c7d069e3bd1e387ca68e6c165c0f68aa956b644ef68bb5094be93ed4c97e1e102da7b1773083ea578a7aa12fa8f3b56d7e28c79e0503952043"; + sha512 = "ed19154cc73ba0115a5f3b5606661324992d09347fc4debea0174d49ce01ed6aa4d7a1db51a064d4190053ef20f3d1263f8c48125075178a41da80ab4870e7f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/es-ES/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/es-ES/firefox-62.0b3.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "c01478c08a969ad80a2fb3be6f0a64e483100e4bdaf2d287e1cc410c0ed4b7ce7845fb1a3ed7cd393cecddd094b2eaacfb8a59101da0f6ae69f50817f1163b83"; + sha512 = "b6ce87d1adde83a33bddf2c26051facfee52197fdc8e1f9d3e457b05dee15ff76c36e0987d4802a68717ffbbdb3cb22d7737fe76d0b4b19be9b818c2d319ea8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/es-MX/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/es-MX/firefox-62.0b3.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "0cca13347ce96fd516658a25ebb4c6c9c3bab292d7bfaf9fd5f0b046af5171c9b628808d118fcf32c0ec7b5c5a1a3d38f0c39c652436c42f700b7ec02d888752"; + sha512 = "286c1b3cee8b93496b2ea1c158af19a5dc8f8094c5656ca3062463783834590199a2ce20e31141be2de9772b2e5d2a16ec52ad46fd19fadd25ae5c828f0b3b5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/et/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/et/firefox-62.0b3.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "51542b5b23f34d6fed183a5fb764d3904fba9c2e64f5818ecd6cf06b903b8b77f65365d0c38648ff454a46fa557744f6a62c520428909a3dd6a69440fbb2fc86"; + sha512 = "d99ffaf22ad6040382d4501572591f5a5f507baa812ff51911d7d7df876a22c961eedd2570eca9efa2a9109ab48e8b17b54838e90ef1b8bd619a0b3f57cef239"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/eu/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/eu/firefox-62.0b3.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "24e6bc43548588f7e4ab2b9ffbf2631924abb2e4878bc1f34fd0f03ab82d5eb2cc923de2473a7887579fb4089ff7370470fb4f4d6141e5695fa90447e43320f9"; + sha512 = "0ccfe1605789438672104bf54325676c1fdf2cafb3a3698eacfc9844843d8d33e1dee11fa38934c625301a5ce1f3ee271c2587d39aa64abc9efa509549d897df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/fa/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/fa/firefox-62.0b3.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "128ae166b160bcb909d46ce491edc3a916b09040ca13e032d87fb324031410696f610dfde2e179337278388a04a2b9dfaf66dc665c8006838e4dae8adaeb9729"; + sha512 = "7114be05fc7418f4426e6b61e2dc6b3629b905117af1517004a68eda17f6bdd0818c656efc5c298e2a2b357c740d2410e96022aa0c1d964ef83bda48b2c55d2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ff/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ff/firefox-62.0b3.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "df4d1662be15fa20eda2211250b0f67b4397b4ba6f405920356aabcb4faf41d78bbadeab174d4d4bf34059aece1138b430420fc03fe6105b2864c1a020545736"; + sha512 = "74eeccf7d25e71482d1a0b96096559aa90d969aff0e5085f7c0f51fbb6cd6b7bb9689e648f89ca5773efcd9ec51ed493baa49d007a10163a8995c3738573d880"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/fi/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/fi/firefox-62.0b3.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "4a8b8cabc19ab53bc510b9cbbda9af78abd688f8ca59ee4ede1c2452f3813c9b662bda41325e5bd181ee82777cae605fe00d2da6d41237dd967b7b0a0ab7abd1"; + sha512 = "30df120ccd5fbd0970851694edd0f09058a02bcf7e22928869f779b2ab4f31886b5893379bb742f67cba3427a368c5413354ac49d89cbcd6ed0e7a5d15941792"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/fr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/fr/firefox-62.0b3.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "33cc81bd2ad138ecec1b8f34eb2ea9c54d7e1180ff4ecc7c569f8d1984c8651c0b13d5648dc11ce4cf8b54898a801c5b8f7b4129e342916e757907e820e6eb68"; + sha512 = "7ccb92068898d13494047de74e4663b87e2567a8ba252d53d5ca7b395053d5488524aeb035db2c01b25eb4320c79f5628da7faccf57d9c9e076921bfdf4bf84f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/fy-NL/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/fy-NL/firefox-62.0b3.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "b2d0d5ead80040c9ffa393568896792a092fffd9b65713a49d06411bd087e5226ccab8cfbf739d209a6abf1db33b7b051d661e88d20809e63fb8217bf2561e8f"; + sha512 = "d2c468239240c860324733dfda2aa3b94864e31d83079ff3026c7abbb2949c891da4a72fe7ae4509d9f3e88d3805201f200c1dd6ac0169c4206bf651977b5ad9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ga-IE/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ga-IE/firefox-62.0b3.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "af2cdabb5bad6fae6fee620dfcb4f0cb2092ed1ec2630ba625575e4001e4f9632e7273e1f0397d3451053cd7861daa09e07946a360a9b22b94172ef2fdd9a805"; + sha512 = "a4646dfa1761ec80139ab38106bb823b90170dacd851a5406a675d4b388391da01faf2211ae5913ccbf0b0207c2af6c166f12bdc51185a2c97de1d7fbac1e262"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/gd/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/gd/firefox-62.0b3.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "70273bd17930f0d6062bcbb83a9a62137df4fdd6cdcdc6d924765667ef324dd6b240980db6909fd07622dad50a6aa722d0b209c7b1549df254f9b18dccaa5c69"; + sha512 = "6caf34ec1b45abe91ccb48d09d4462c5b3dd6bb1f42a727805b7348b5d027f5b7128661979e9f711ef93c55f36abb082d7ae38961d1333bbc0422047e0ec05a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/gl/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/gl/firefox-62.0b3.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "f55b0ff1ee18d9cad4008ad8f3934274e27bc47b96d052504fb0a81777bccff7ab70b9577efe0b1e020c45d52600d2c83f63eca4d847af9a76906453f007250b"; + sha512 = "b8193b7b4123635a7df3c7fc89afbafbca04f29789bb8165f32f91afbac91255d9f157e320ef34775ba8aef9de6c05c556de8ba0f8a108601cd75b1d2d8ff7b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/gn/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/gn/firefox-62.0b3.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "a019bc5261681a56fc4cd0c69269c2a0b64ab59b7e3b2fc8bc1f93258abcd883eb27fd54af3128cfeede247d3af83454ff7fe28b07c61294850c0ac09c730898"; + sha512 = "a8d3614e837c3c62c7eda24dfcb8347240b3e8d23282c9dc02a62ffc2bf84ec97602288f9459e05fbb364e4ab196099e7a4e881f8c39211b027c64a8baf1ecd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/gu-IN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/gu-IN/firefox-62.0b3.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "08acda8d3412f713c9ab352a650e3bb03e880ceca90a9160bae712d67bffccfdd448ff6efbe5da0ae798c542fe3e8cdb960d45dcdbfc5ce8e76204ad243f8aae"; + sha512 = "953acf6c1f65c7e5ad67dc3c8f0f2e8cf764aa230b8a1391221ab1966dbdc45c0199cd4d8e11b2409ec1a964a14c468a2bc4a517ec1597578f02301b60965768"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/he/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/he/firefox-62.0b3.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "a440032a4a9844bc419fdfe53dda3ed9df9e4323ccef56c3d346c84abcd0262b2d8b777892560d14e831b348c1e958fc309c4740280fec94f9ef0be56751b939"; + sha512 = "0a4364e10a169fa755cd04ad205fa9fea01c8197a299c0c8a6857861343b6cf154bbe9b615c7592823cdf5a05043d97974d61867db63b4d4971fd28ddafe6c85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/hi-IN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/hi-IN/firefox-62.0b3.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "fda2da9cd5ee20becf3f43af75eb9a101b986911921ef0b31b8350945d06fb5c8f6e86b4fe863021564a0e03e8e3b66bce2c4dbb5adb4a060140f47008e20a5f"; + sha512 = "7ca2d592ff66147387cbdd651addc07f05fa8f7def67200f7b6e8b5d7b71874eeb2f289ae5e8a91f321c90e2216a7ed2accba1f45bdb40bbf5f115509ae0a660"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/hr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/hr/firefox-62.0b3.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "beaa980e41ccda8da17afabb1e9628400087930581c6aa53f84cde1849b9395cf55b2a8d0f99514df93e439de8b0b65b75e767bb72ade0dbc26265392410befb"; + sha512 = "a3f9f110b344e6c5e204b2d5439594ea2a38db591693be6a357ae145864e4f2f989e876fcf947ae4ddb897c32d3f376931075a0b56e0034b4f558eed8d6293f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/hsb/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/hsb/firefox-62.0b3.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "abfb497cb396855188222b4fda3f529ece63df9314540db2d8f998588150c036ca44f9e5a1b0b28ec1e49c0bc2ff16617cd41b8e427a8cf80df07199a5cad794"; + sha512 = "816e5aaa60e9041f127a5792e44357245a551feef2415d6c1d1e3e5045629382be7cad0cb9947c666cde0010ff93e4c114a0b04e0e060ed508b5c280456e118e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/hu/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/hu/firefox-62.0b3.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "7a7f0ac492b52f4dd85f9cdbcead46957dd866a10abb92abd5e0ead7a6b3a28cc3fdb4d7f35b3074bea867342977713cb5fb3e75fc35225b4fd915831c3b7b11"; + sha512 = "5cb7979744039864ec9451db0d4f8771792df35be22171a2d1934533f751aa3269fde7dcd6bb263284a2e66c83823f6b36c821e92aed7804c2b091c23c6abd72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/hy-AM/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/hy-AM/firefox-62.0b3.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "5ca423c446b7923d609e5ea831ff8d732f58326e5a04d42da546418963a18568c48af608ba15c2c64d4a91a7e8baae8c911349dd8b6153d55d03252e95e5fdb0"; + sha512 = "971051896b26735f0e94ec60bc046900c62cad571b1d6daf4c41c65d825056ae72c5fc4428c696cc148ad107050685471cd99887251c52223a46f3cff9347c4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ia/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ia/firefox-62.0b3.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "7210c9c50d0486ebbb02b9fa0f82b1f49ca6b30c1159c7bbda16ba25e6ba200892c8fa63ca329a450441d86a1480f79d514172d17a9e4baaf0d336a5a7cca136"; + sha512 = "086733f47febb78bdcf1dff692a3ba03c3de57a03d84245cf8add743f7006f75f9fd1813d6bedab9c71bfe5b2d8d7e2f79950e19cca9a1082664e08f8f3ecd4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/id/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/id/firefox-62.0b3.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "4d49c7501c4a1169cd8820e3ba469b9118a1ebba2a72761137c890e4aa1f30ca735cae23c857af3cb9755c69828bb8f4cd51dcd3b862cce39e56d1a4c937d2f1"; + sha512 = "fce9a1a60caef1f77572fee5934d072e9321ff0d6146745da4c48f5461a3e7e74e756ac4e6ebaf1bad804b6e6062eed2d8511377693b459ea8d47a80a99940e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/is/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/is/firefox-62.0b3.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "2983b2e1ef94b551ad40558bc0380347aa4b5aaa7964e5d3b2a8de8aa14cbbd472c1abf2ffa1bdec5c2471f6d906395383be9653b5aed1f9d2732e62d04a37d8"; + sha512 = "82480e44a7402deba55cd1bf3112a9c90ef937da3f5c41a4340b8097035e0b7583d8927b73b28433768f7f40e2010704b51e895a703ba40b6ebe1ce106b56946"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/it/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/it/firefox-62.0b3.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "edbb9dbda1ad0e7a1b7f0f9c79001052083a36b180706a26ff70653ee4af859f0d93a5792a59f2542cad140005c8cdf2948cf8b4a784626ee78b009f2a92d3a9"; + sha512 = "ecb4cb08e7638478281522346181af2ad939567e777f9b49bbac54985f0d01a98260a3a36ee9053d0cb8e549a3aee481d2639d87eced7fdfd31693c88675bfd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ja/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ja/firefox-62.0b3.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "63d8787831be6a56e7a1ef73c1d54c5e2659415862e87c7f0e237c9b83a9dc7a41259fa598f9ad49af1608ef7d49fa46c8b3c0395f9ff473567a16620523b4f3"; + sha512 = "0cc094cde71d8729a93d3ffeaa8f1ce0e878835133dd32de8a807caea71e06fbc6f41ee748135eebad3fe9241628d6d17628e8a2e68f5e8e4a18e88b31f0fd6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ka/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ka/firefox-62.0b3.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "2d47a3853a46609208c07dc79f44cd36e01668f0bdeb37d4dd233fdb2e1388ab545373a52b321b29a86390015af92cf95b0ecf8afeb779fd5a4991b368399d11"; + sha512 = "ba98c0d5270f7d16bb865212a4602bc0baaf0d956e5ffd4cb6f83e67391df450e187a7b927d99e6b4668e5465be0b9839099ea9eb7c67765ab0db2d3d72c6f91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/kab/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/kab/firefox-62.0b3.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "ee009619b6c01e2d85afeda2be4773442ee3e8a037519f6203d6717cf851ad80c3f9622ce9166c4391803870a900b8a9f1f9cefd72fc26549c3712ac91fbdebc"; + sha512 = "3553d3dd634693226bfc0db1aaf94c3c9b43461ab2c4466a8419e4429dc2f8cc87f25d15fe23a588ed1f415944a7019a9686b7bfd3057e6687ce56b63f674236"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/kk/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/kk/firefox-62.0b3.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "ca42d739e7f0611ac4386d71b838e1e02f1f3faf490d4776c6d4efe18bef1abfbe8840c750f2924948b5c4fedbc4b8ddc814ba47d76109c337c237c34484877c"; + sha512 = "79d9097b7b000d95bf967aeca33d043227155e2acf10aa2812af1ada20547e37ca33975ba922b267ae9ed35c107eb466edf6a188d2c87d847828db66df4ad012"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/km/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/km/firefox-62.0b3.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "048270e2ce3f5677fd419f7a17896f1d5d5b9169edbc3121aeb4883b1fb6aa945c98f66099cc800d2364cd4510323bd6ee7cd428299a8545a6e43e90c9889a42"; + sha512 = "ebf3264bf56422e8bff7170eca01909ffc197704d386d0fd08847b7dda0b832a4e9e42ef200a7e516b037e6ef02364a5fbfb844faf1dc65c2e99e55cf5d89c8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/kn/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/kn/firefox-62.0b3.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "589ae46f4172da22d479edf47e8593d142a8a194258215d72b657b681122cc500bdf6a10915b5dc3436a897ed033b29ef77e53ed82c42018dd2a23bc40c6e16f"; + sha512 = "37859cc2086c393f0026d5b164ce1a8ae7f43f231f92a94bca3c5d33781a502b1c108b9773745689bc6c7ea17311ccc9b692ef7cbedeb09abf8c8914a4bfdadb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ko/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ko/firefox-62.0b3.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "1b1b9cc7a0beaa0eff417e2736da000a0a82f400f1e16181d07943f3740978c491dcb4be2c3f9113c7bd7bfb1ebd5f2dd812ce4e793225e5753c88447d366111"; + sha512 = "f2032095748d301b1c1a7503d80f92f96bb07dbc7373a2b07e879850a706615eb82a838bb2a0617ba3ea779165256bdb2be24f5186073009d52123609310f9da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/lij/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/lij/firefox-62.0b3.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "d0aa1d8dda8a60de3f16ca5d600df4e1d3a6f0424ccbfd2f0d89f0f4dec7547e1ac6234e0b75f43785d4ec99a79c96023cdeb8d38fd5632a470382d25d052fd7"; + sha512 = "50e742da88e94d29ef02d172ee9de5ccf78e51997bf9bae048a1c63f703f1af4948cd1b70740a5d8d944fff58bea03c6b66edbb75732fe0817bac89d238203b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/lt/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/lt/firefox-62.0b3.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "7e940801759c6f93892d6fb9839138a6f548563d91ed56b6e4c757523e446e16fc7e6672a1d1fff8b3ebb8c014283a62205ae0528e69228cfc50be88df450b81"; + sha512 = "bd34739a3f1c7722d8532d3c960af7d1abc1150b75d97188551ad4d811b60fd585143e2c2828786a84138753443bb29d480ab342a5bdc843be1d8772641d2243"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/lv/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/lv/firefox-62.0b3.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "3e8eb6bef0b1acc94d5570a89ff7a9528777f8b6b3eb2ce20984ba299f32c122090d4117b702004ea97e667b38a59d553777a5239b2cf03909501a6c2ca0cb90"; + sha512 = "3accceec24b52c19bab59f0b99e1bbd5ac51553056cbd3a304d0e38fba0c94aa927d3f4ddcf709996a819be64f0eeb30127c59c0f8b7a2a142e8e37b6d386675"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/mai/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/mai/firefox-62.0b3.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "29df14e1c1529fb5e69925e58dba1ee093c3f1279499e28ca0477511c62f838b8e2b76218b2a32f3a7012dc246b9bd41a8ebab691c986fae1e0aeebf80deae98"; + sha512 = "614cd2818a1868667d17576b793c471dbccf1afe450a1dbda969aa4c84fe67dc44108fcaa2146ca64a0f5109201e4efcbb65dbf49ae68b900f57138a2a562ece"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/mk/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/mk/firefox-62.0b3.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "7e5054e4daf8b03851c68a9453d43f5991e1f06b27483ec2c788460134aa196630d1f7e3ca2e6be3aefe1b04ea02ab9d765d6c92f3baeef48f463b14308367f6"; + sha512 = "85068377c4a31e96c85efeab9019830bd4703bd3a26ba8a9d5c52e3c8c3fda4c23efef0a9c5a97c17fa0cc7a4f982024bd7fa0eeb0a80eb05ec90d22f610859f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ml/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ml/firefox-62.0b3.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "7627427e8f2650caf48ce0c319d5adeddba8f12b8a7869481954f7b66fdfeb0cbf7dc4248a2164ebdecc136d078db376cabbdec26999220f0bc604cd779c5393"; + sha512 = "88f09504637268604a77b59b61f0fbd38fe3f4a04d557c7e2abb36d5c2bdff88d1c6fc07ca1cc18e00a4a032de4e93fb674552d9ab77d3ad2256dba45438cce4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/mr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/mr/firefox-62.0b3.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "b84b177ef37cb0760ecb717597175923110732ef87043efc7c751705fb0317fe585112e66c1350b552dd1b338d298d59f32c18f426d943e9e1d5d95996aac056"; + sha512 = "97f39a0b777d7bfc90b744e9487cfd7552802978247b0285577bc10f27383d5033f7a3555c399939182dae046e716b35f542b50f7d1e39f7cb78bfa9afd184ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ms/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ms/firefox-62.0b3.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "724e176e62efebb8ca7fefba8a152e4a54269793e077fc8236da49f86bc943a5decb79b1db8fe48b9e4b62470248f6d8bfb33275e8fad5d1ae12be965b35d95b"; + sha512 = "ce9cbecf5ec72ba7843426fab4c62e0ace1d0870816e00b104e60f7ee7300111d2f6759d3f52c128e0c06a912fb22ee0e7db74e185d1ca33451739c703520a9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/my/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/my/firefox-62.0b3.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "2811005715196c3320a9939db86eb282359ff8fecd7e16097d64cf7a02a8647922db16be214cfef0f7b5b1f7340306b83622ae79e3bc361c19071cd1ecf44762"; + sha512 = "8b52d27861a1a48fb5dce225f88cd7b7104443de0fca537c060225ee0bc5205be40677a8743900eaab892996e2f1fd829865962ad22f72a1dcaa157bfc8b0499"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/nb-NO/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/nb-NO/firefox-62.0b3.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "20569fea1ad722a88f32e4f711fd14020613bd0b17e068962dacf8c789da643ff95b03e67db99496bb3c78c9960e05bfe4c5d4d7e56315f3c5d68b7b52b073a0"; + sha512 = "d8da0175bf389c1d85534b1f8b2fa3acaba0d7f42c4b31c19c1099dda1ad505af1921c9c0009b219a78e6f929978be77eb73ad399dd67e9ccf143339862f4923"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ne-NP/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ne-NP/firefox-62.0b3.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "77fc1f141dc0f594bc6c81d48e82cb294ac12bf75e0aa44a0c6302952701b7ad9db637f818042efadc962a0ea86eb54d76a75a2d862eec753960309aeaf58449"; + sha512 = "9a7c68be248103fa7f817d63169f362c0a74de4e3214cd20dd51e0d2b9f0997dad9e71fe4f4cfa908486013c010ccf018e68b26f45f4725cf7c6c6d0f6f51707"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/nl/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/nl/firefox-62.0b3.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "fc59c15e8061aa38fc9192c9d527c70cf645b27bd12fcb4dab9b6b6eca52399670d2ddb734079211b7fc0ae460742c9fa0f05e84cd1cf0c7c4cba2b90161a835"; + sha512 = "a39ba40d3d17bfe4c8ec26e1a727255b3c6d1e4dd1d18f0af473fed1d5955849d035ee1b51969e21e9b20d04a1341f6cc3f0cec02cbe3358cf7f5225ea773ea7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/nn-NO/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/nn-NO/firefox-62.0b3.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "fdc761fe1ff141c822ae33c973e43f6746af10c87438929878c95617dcafe15b53b2e5dbfc86f4705b1d2b19de22d9ff001dbe4cfc18690e15a16fa232035890"; + sha512 = "2bf0dc2ae462d160fbaa3cc0351dac577537649adeabd321b44aedda65c4525382dd8627b925ccfc4701966c593dad81b30391819affc15f62481eb93fc46e9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/oc/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/oc/firefox-62.0b3.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "3b027dad30e088e7f829cf71d7b9202293c4541719f5f424444542fdbc2b726b8c89f2ec0b4bb44110433cd58c4c1a449816aef97c7a94e985df4867959b978d"; + sha512 = "e63393b51019891b1662f6b5950efd62e7880b9f1921abf35fbcb851cce68d544069a0bf06ffc297c198d216ba7a407165bbd7c127578f6da8a1a173cd5d06a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/or/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/or/firefox-62.0b3.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "073ed117f3fee3a27191083f5b0ad5da554c7e88e9af962ca9fac2a7e51ea852f782812cc5f8dbd4f3ed0a0baa858b0df94a0bc52b5066441d031599d814756e"; + sha512 = "7acc56b02539257d5f08605dd9fa64c01ad4ddbfcae34d81e805f7e46dc311105a43ad102cf588fe332d70d79558119c17d69e653b5bf11eca2d63863725b936"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/pa-IN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/pa-IN/firefox-62.0b3.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "88c674c508f99b3efd900b8c02cc43a8d10555ff3862ce82ed031ab4f9b05588b62f0591c41f7e617fee8ba8d58a57159417f59e81127d36471d33e2acff1a07"; + sha512 = "f4dbf55b3861e2018412ef3d27d06d531ebd59b1dc0d4b60161f006e920ddcb4cb0ff3bbca7ad2559f3052003044b5bf4370af1d0cf9f2375869f68673dbd102"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/pl/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/pl/firefox-62.0b3.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "3a6da575e3dc776a4f5ff94ef8ec3650b5089dbb3f9f413c5656cfd5ef583053db24ff9d51564f46ed69977549fa1c46d838c360d8a56c308c70573d0d2e6b08"; + sha512 = "2c4cb6f9c190a0b286ca9657c29e9bc7065809b5a532c5da906d66095430b01c5b401551eaf3f29fdd5beb44dcdde9de26c9df5fd7acc78474db1509c25f063a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/pt-BR/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/pt-BR/firefox-62.0b3.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "8037bf07ae7d69fa90f1c0bfc0d5ebceab92739e4789c002520da6349fb454d0a365fdb8614e02cc125cddf9f1a2c154d75d9cd4c6ebd0e93b67e9f4f6a54949"; + sha512 = "5dff06cbf8da6a5006ec927adc192f6afdbebd816ff49e2b68036f52fdbe26542da66370a1a574cfb33949a9aa5e18f0f9f4ef5358fbbd65608ea68f9507cc62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/pt-PT/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/pt-PT/firefox-62.0b3.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "3f7795c2aad51c8650fe48e1722e064acc9d7f021ae03d512f6c339810f635ac2daa0d015f5b1e05e0caa6ff7ae8d5b54bfa0d952f2ace93cc318c77fb4eeb0f"; + sha512 = "e3ab34d448e7a5408461a6663c621da74145381fc25e1db98ac3989b383e093ee2fa1b12429d5d1ece58bc27a3b2a94cefe0fce22e79b8d74116cff637de125a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/rm/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/rm/firefox-62.0b3.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "8e269a4688a81db4b31e01a9cc740d16b8e5b1b8f2d63a869ef9a365e5043a7b6ca6b47457ee263d5f95e148f7c91279435109728bdfe92992525beb450b20d1"; + sha512 = "f8355c83a7af21259a2be8d720cf2cb00bfddd06d699d888da41cdd7a8fc5834833992787f75319193b0cdf7f0b5c87f7b8705bf88de3a5ea357a719cfd58886"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ro/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ro/firefox-62.0b3.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "b6a93a86cf055da00edb0f8cd77ad2abaa5db584ae6a8ae0165a4bcdec9e36a94ce89094c9aed956c751555518a1d8c92b396fe3f813e9c39605d23aab064b6e"; + sha512 = "daca4090ea994c8111098d874b77e1ed8c8874a993c2c81328081fc42111c476e3a5eda2e383bec557b4bf2e9ac6cb8a78bb75c930cae69d760f231f7bbbda35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ru/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ru/firefox-62.0b3.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "4b1204d979afd4269c9e6b2bf91d0e911cbdb4151331bcad1f87cda9f4b72d57f9fdf3bef1aad3f7ef225c2f57093c23120f1f03f8a43ce05da9d777098d1c02"; + sha512 = "c1f6c877b1119b2d16960cd5724ac9044912524791dc25658a86b34f1b1ee800dea524e954e60048fe8211285f227a864359902562a0a721ec6b948fa722da02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/si/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/si/firefox-62.0b3.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "7526e31f043c440317b31c4bfac03ed04c52395722b08fb2640e0345f08b36e4004f59cf99af192dcf2604ead3dc39ffd3e54552e7664bfd853c3741c0d9d250"; + sha512 = "0784b64e92df8b00d48695e627a00c3d4bd4ca56f717f0582c4f2fe025f3da9984d6b509fa4ecd06b9367ec6a9931938e69f6edd83397f0ff416e74167d85d15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/sk/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/sk/firefox-62.0b3.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "9110f9d05de1700bb1f8b25f551694621180dceb01f2d31c420b80a1f9934abad01c455b3a742df9cd1e2a23bfb6918a428fdabdbf175011e5192df3a4678002"; + sha512 = "76b6412df2dad10607b201d7be480e436e44988d401a055669e2ae308c0d687ead9e3f1bd06d30ccfab55fcff2f605fe96f98e3df8e321bd4ab11a3d211a5ce8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/sl/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/sl/firefox-62.0b3.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "2ffee69bf2162d825103be8d5c1886336903e51bc2276b7a8e1724c87b216d6eeb86c36c58dffd3ce543bd6efbc85011c6b5270742f68dcec13bd9e1c68e2792"; + sha512 = "056b78321432303d6dd09f4833b6420f0134a47b90d62820f7bf12b430f608be3cb3d3960bc6e7b4d247c599efbd7305989ca44b55bdaba37c49ef57ce19cf0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/son/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/son/firefox-62.0b3.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "04b16e9ba37f2d318c00f62a02b6aa163cf0f53d6c094f77e9723267595dc1ff7e49270537cfc052016592e036d4c3d6b163865ebb836b61497926fc5c4de0c2"; + sha512 = "f7b5b82969e199a12887f381f39def4d2ab8cf6fb9a722b3b9c312c841dc5fa8b4568e98940d0b683a9165edbdabfcf17092497c80b732108d0883a1ec58bfda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/sq/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/sq/firefox-62.0b3.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "087fc35a1ecdf796a3b028c2cb2a01e0bfa635a1ef185778901f0cf32f350de9194f3bef9c7f071efff2a99b18abec715a7d46982e1ace1738ed96ec8b59bcf2"; + sha512 = "2a8f683b0529596c35cd0f76b7d8fc1f1503f1298ff05a7596972d3ece439d88587b250615f5994dc75fd1ceb370ef2473f91028015b2464ef259838cd9d78be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/sr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/sr/firefox-62.0b3.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "356b1b95f0fb94d549de1d70f9cb7367d939d9bf5c5c261e82abc552897291beb2aed4951fab3790de8aff7a607612a254c2893696283fa9c4c876785519ebbd"; + sha512 = "b33187d6b6b20023fa810a0b3c70792f1c665833213460dbb081c5b2848217a025688b456e66e50d8750e42cb7e71f6445e5680e5d8d7b77c3999463ffbcfbbc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/sv-SE/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/sv-SE/firefox-62.0b3.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "d08b88fd20cc744e65f860e4e5554464ffc68ad560e9df21e7f9cc50a247ecdde98b14423a77de27d82c5423036fc453f868120acf2f5be1ab256995921a2271"; + sha512 = "ea2b99d16d891e742697a68749cb8499c0457e15e42d61bfe0f2356f3f42ba272df6fe88088a594c9423d59177f4bbbf11dd929d6f33459a280948ecff55a2c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ta/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ta/firefox-62.0b3.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "16dfdef8941dbbda1cb56731dd25970b7460168abcc5ee3ef037efbcc0b0b6f3bd37a3f5ea81c6f9c75121dbc6ea95fa100d980ccc9152c05dde2a69f04fa94f"; + sha512 = "fdcfdaba2ef1cda3f7434aea3d7931a9f88b4406ae8a05d5fd1b84722b2170079385f99bb071febfb6416e147f0b06bd0dd710766222edaa5e68331d92edf106"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/te/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/te/firefox-62.0b3.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "3362d040253ab49a114b534d246a0bf158f0bb37643e2420bd04430c7b0b40a9d416af6b40d907011757b099967a1af841ea97a04b8f2f7d26e3b429c9dbabbf"; + sha512 = "b4e55cd67c66362d28867f9ddef1f6a44d3081e183fb19d4a73895817a37e2eec0a87e394c0fa70305f7752c40ed355ed16fc3111d72e70f6e667b959bf22c56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/th/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/th/firefox-62.0b3.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "ea53e69b2010801200f7c93f5691a95c1e21ae1ac7f8f5519c64d1e823ec0be097d9298492c68ba970527fb2a8022b9786c0e001c938bfdad803c4b12c65371c"; + sha512 = "20780e1eafed9667b1124a3e99636fe3b401f8da0785c9f44bf5b797b2d7b0ee17cefa916c5a30813bf66fd6bfaa1313d74b8b59e65c05d6488d30aa9939d3cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/tr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/tr/firefox-62.0b3.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "6d7cf398e05e5e7de2d5262e8fc15482c97ed529807bdf72cbba2f09e95c961c33e4cc4eff5e27f05ed62d3fa4aa2f29803dfdd70ee21271c22880dc5ad380f4"; + sha512 = "bc3cd8e37a59f599b486c966097f152836e1486925fc99f7b65df33535d99347659dea5c0696c061d36a5fe85a8ac307fc43c3b88152daef40389395ca3a43d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/uk/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/uk/firefox-62.0b3.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "e5638cefc2d867edbd1a8c09f756d206b0bd390bb1dc23fe779171c37c73de9fa5c9429bc0156deefe85a95fe9d84bde8c4845c0d6c0bdd8813dc8642aeb6895"; + sha512 = "4a0b66639dfe743bc585d35887f1c32bc93df6345b943e4e21909bd5613bb298273640bd97a50a38f1577a985368b169cfd6528da6b7816282411483f1a83782"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/ur/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/ur/firefox-62.0b3.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "370c06a1102ffcd2c43b15618c677303a49b321b69833167089107ede0a0210251af3e25b83f27651e77fc2e3c6b921094e8d2fb1246ff147815d241b359a268"; + sha512 = "69d6451c07778120ec20003f7106ebe77b04569a81e0a9b8643e8436b7a05d8a6fb97f9d8d9e91c6bfec1031d0518e720520ccbcb9461350f4ae2b7efe421d8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/uz/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/uz/firefox-62.0b3.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "370bd94f9dd0c07dd24eb8be0b0ee217c5fe85825849db387d6efcebc67bb75926981be6de24ef4702d45e6e6d885a34f5c58520e5c95bc82cc249de794c7b3f"; + sha512 = "6cbc42bc4f147c6f6a30e41a42b019938d8984dbe21f6f01be689b212f3308bc409f02c5dd1337edacd29d80ab5af2b67e14fe2666d349d3368030b551965e2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/vi/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/vi/firefox-62.0b3.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "c1afd15a69938f75d0da51ab5911d059589011a6d9c4e062a2cb07e20e8743965e2101fce31a52714f6f24c94d4a723c6a133563f7e6bf2b2f2f11f1b34c59fe"; + sha512 = "07877f515cc5c04bc03173108321ca019432dc4440bd66b3de0c8bcefcad22a2671a84b82ea4120a630b5bf732067d59e0be9abf003566ce4e00da8ae64e3d66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/xh/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/xh/firefox-62.0b3.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "077c6ee3c1a7ada84989542265ea653afb3d10623ff765b7e0f41f1fe2af92e52918279612dc02e6c3b5dc1671128410134b6ddbe693fc892db52cfb0f96db66"; + sha512 = "db8c70eb94f26d07f6f80d842b632353e353ef4577fd341f3c66e81b48421b948999104570a545cd3366dea286a5640547c999f3c9ef69cb443b770c37c73083"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/zh-CN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/zh-CN/firefox-62.0b3.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "f076b4d080e07af43f53c7a88a1bc78099ea6245c14fa33dd9626da6230c6fec8409dc736250c3493e86209c4ea0647dd4869e5dfefe65e3a7ba3f10646ebd07"; + sha512 = "a4b7a5bcde4951b94cb688b0c9760dab85c879ddaba0627113f53b80dc80958fb85d8edea61e6a923f0aa8d78af1ee751cf40c34683aa077481cca4a6688c65f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-x86_64/zh-TW/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-x86_64/zh-TW/firefox-62.0b3.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "6760e7f7a2a54f89990ef47bf8c22c69ba3233182e400df40f020aa994dab46feeb98faa219e9d123c9432660b7247c39c3f2a1138cc52e2bf5bfdeeede60ca9"; + sha512 = "37c477b745d2ed5c0fb0dcffdd2727e3c95cb73e5d5d88a5f707bec8be3deeea4e05cf35562059a8274734524a85987943d7a7085e3194fdd83eb4517c2c8870"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ach/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ach/firefox-62.0b3.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "2a2b61f47e6d0210523040a19cb2d40439c71391153f8e5336967360ba9303028bce1e3861fec0d8435c08199d7812b5f7bb8dfc1c62a7bd42ce72f06af0eea5"; + sha512 = "a037c7a7e98174c7ea9b2a87ba0fdc0dd1059fbbf087cd6f6831e3eb0a06d223dd1a2f99a52898d324f40d08337525c4604f35bd154b216d369e9da70db744f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/af/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/af/firefox-62.0b3.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "203c5368da99891c3dbd87e919aee53ae2a1783ab982280d5eddbc00c60ed580a4329e7288275d5c5d29ba084e92e187f219d1fbe2e00b35176ec8141a1bd60e"; + sha512 = "558a10aaa328676b5540990cca5be794e5dc7202a74cc97948db71642ef4d045d16ed5a72e816d8f0ce63741fd78b815ecdc1aa4a2fd4e4241d1ebddf5d25022"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/an/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/an/firefox-62.0b3.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "3bad264a314ee943e656bbb547f0a88bb08570d42ebab47659d4d2d5436b1726af072c1e520c8a2e1bd29f6bf819535b7fc5999658309450f3609b01ab8b8d28"; + sha512 = "810b5e449cdc78806b9aee08a5a43fe0e5f771e49a8f2185f950609d397b9cbb80ba16c35c8efb24fb8d9d6d7b1e41a5a3da1374c84a919f47c3db70b31090a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ar/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ar/firefox-62.0b3.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "1dd65025483e00c557f926692e3c0ac274a27f0412cf556c3e0ef864b1046c7888c8d354e931a419b04382544cff5e8f83ffe3ad3a4fbb040d7155e6e45a3e03"; + sha512 = "39762c036ce21ce118dd5529b35be17fe9a8f03753e59deffe8903d20f73355ff20466a2a4d3e400826575fb08a5882002019421240490987d7e9b9215499654"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/as/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/as/firefox-62.0b3.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "5863c820b36e54c6de3428e3fd0c54e9ee4efc1fcfc6fd3953163b042e93301b04b7243bb56284b83c283cdb8e3d48e0068d4cc18818ec350b9ccf17703011c7"; + sha512 = "12d9b7000d8a2a3b0c0930b778a0e262793381dc57ae53532043c2dcddc520ab931baa67eed24c3bc2dae8d9ea198a34250d41cf61b80b0af18aca24b754387b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ast/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ast/firefox-62.0b3.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "eeb69145ad50f7868859392dc768891b48a717b4609d5320e8aadd73d03e6b3124740f97b1557e4fc52d8b128a22253194c624b5df86491a4d17ca9947526d9a"; + sha512 = "3c84c453e4d583b2df67649badf90f0dfc0d25780d1d7cb5fb38c9b9b749a25842d986554b4cc8a66aa4193f93688a570bd7ccbdcfc901203b8e240bde2235e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/az/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/az/firefox-62.0b3.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "a10c3cd3d0117f51666f92e37ea1f8df818f5df6ed96c1d99a88a277317b14b7e1a87a67a0b100a2cc22040da03a91ac3916b11f1b560e60fc8b03f42a21e3c3"; + sha512 = "dfca240828b9c4e4e7b555f6c7e33c29e6b095ef73b91e87c548bfbccc80d78a25f58a790f02de3d53303ff6a554dcd0b538a0bd5a34e95469bf0fdb319ee4ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/be/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/be/firefox-62.0b3.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "7e9fa9f157bef60f53d752ce1309146061f67bf1b22c5b1fa2f700bf825ca84981c5eb6988a35719d9871aba96702043a8eb108a1a99f5ba6a69206f841459e8"; + sha512 = "4080e78d935385a39bdaa1a1433642e89b2026e4803bf76e45e92da9a741ec5bcbcff5fbcd6dca6cca072334610189614382df9d6d1cbb116a0e95758c2f5930"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/bg/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/bg/firefox-62.0b3.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "2aecd034f770c2b005a11b9debc589a50f84495741116644f06925d718062f3bf2d23238e9c62ff53e73a47b4efcdca5bfe86242f58ca9aa3b7b704b04737ab2"; + sha512 = "fbfe7107d0f3c70c283a643426c530e62a45962973818311dd3787563c54ae8fda3826bc8bc807ed5b9fb281ac0ab163162705cccdedb84d3f8cc2eb2a68a712"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/bn-BD/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/bn-BD/firefox-62.0b3.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "01f8ffd5c3f0f5084f41a9e8cb71da6cb985c689b4acc534a67b34844b7d7c3851d7236b7f0f5bec5488ec0c332373e19cb8e2e44595e4482ec8a3ddfd82f5fc"; + sha512 = "5fc9c22452bf775577ffacfa0a6a328265e5143c0c7804b40fa33f887eda33cccb95aedba9426f65ff60d7d3fda28fa4e82bd7fb740341f4dc4d5991526eb3d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/bn-IN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/bn-IN/firefox-62.0b3.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "0706b9f070ba39b787b3743806731905144dcd27cd52681dcf431c3d0feff859ec4071c3d289dfab818390e964cd63adcc526d23ccca81833ec78000853eee46"; + sha512 = "ffb74d1aecadb920208bf282e5805dce203d854f79f733d34dc5834b065e2bdd5f9feaf2646c13247be9b9a3fc47f1277a917c89f86f14285d7c6c41b9399cf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/br/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/br/firefox-62.0b3.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "6e9f1f8070031d79035b9b607f3c8db80d32134e0df44cd54eaccb066b9ead09f239a59f29f28bd9e1237c0dad23e300052ef82b0a1c7991d6feedc7b0823844"; + sha512 = "7a127b5901965324d47d2fe2a263ee7e088df95cb7a53014a06bc4dbfdef0eac7026272af2616c90e2dd7aef82be12dfc5fc7010b306376d97db9588f30a1133"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/bs/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/bs/firefox-62.0b3.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "47d02d0780410b9fc9f062a981b3bdfc46d3d784112882a72190dc4e361ecbb34fd67bb730ed5a5257fef13015d705746939a0ee9a0357d028df0498b83f7781"; + sha512 = "704022cfbc5ec0d9bd74c6782354c507cf6c1945fb6101bfa5bdafa982c69c38e66527db09a00f5fafa4b7263e9b5e53f95b68d6e4be24f9c4f48d90d63db38e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ca/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ca/firefox-62.0b3.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "20b540c40eef7bd437af29378468dd60d923f38fc09544ef79c37245aeb31147a40f5a60784896c16b9565dd0689243f7d5d3dd8ea1741e454f192640e394b85"; + sha512 = "a2efb994515d3c85e501c32f77a9bfdbb80a27e0e30f6cfc0dd877041906866665d7663266acc50d1acb73f2d56349a80e47ea51ac4891a588f40a2861e89007"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/cak/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/cak/firefox-62.0b3.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "97fb206d18c8a31dade78ef73cf1e8eda6da87ef137f6e708afb7eed7016d0880b3ecd29297b27969797d76399bafd36e0e644b06c585a8ccd44c9a734daeb8d"; + sha512 = "bdcda65e9f15ceecf75294af72fa9dfebd64253521545b24d543b3adbe2f98418700ebf0191ad5d894cec4cdf7457a2a8a2f60734b9a437f35e870f27efe5d04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/cs/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/cs/firefox-62.0b3.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "e4e24731741405fffdbd71a1ec71c7153b37843a148e0afc6c63114a65467de00143729b46d715a5fdf2f85ea51b45a550cf6a18bcf655875880766d4cfbd0f6"; + sha512 = "a2d6b96afc9f2f3ea5707504329233c536f4fd387f0125da39bd68d94efc40f46080f5184e45362dbbb4f44896a662d7855ac4c57be44c4b2caf9dac23f899d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/cy/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/cy/firefox-62.0b3.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "05f90be2bf33ef4cb89ed99b7509bc89d68e0800a472c47852246200b4344506b352ce9c47a72641ce5cf7324900aa6460f1ff4b201e5ebad0c17302e1985d32"; + sha512 = "82f87813b206d623680b20ef3f687f59fb83decc4479e25f6bbb7f46d986ec805ed054c643f2b5955c43925d930a04ead99ebfad2862652f4fd4e71043f137b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/da/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/da/firefox-62.0b3.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "62a3833f81a050c8d686fe48d23c05572c097178b2f38df27119d443788b02980682984fa9c43aa0bf93d7063d317eacdead1593cf382b9b13f45869c4f1041d"; + sha512 = "7b023117930f5266c75819fad5d207aa9a177776864a798cfdbec24ad25507af139a184b593b267f045ef381cac8baa28240d5788667dfae37967e4364fa07da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/de/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/de/firefox-62.0b3.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "60ee63b9e762d6fd467901aa79190f142a2cb3e1ff2360e573bcc8c23ff3de37f30b8145794ad9e0720cd0db9b37054ee8217449b9c9c1a29f799d2a6c6dc62e"; + sha512 = "cbf905036051c20ab3afc1899ccf5ca2db3a137023764f039830d996f515967b78a02349a118d0bc0be022be353b0ba57e8f27b8baddd21ff4d8eb240577b208"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/dsb/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/dsb/firefox-62.0b3.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "bb6d9b5279b279c72c708e301e2f40c2238f06dd75aa431d442d2dac33638efdf61e9228572f28c559cb9fa5132ac031d743288099caaf9cdbdcc9ffb7899228"; + sha512 = "f7a109193d3fccd09718763d44f9c30313b2062b25c962e4fe4273e62f630655cc7c162d2b6648bbcff89469d5ba26fc894c330f074dab3924d705e3406dc9e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/el/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/el/firefox-62.0b3.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "8e854281742ba2eda03404d24c72a5b765ae267f87e00b71edbf9615966ca6cb8f1d742ce254001a898fa247633c6d66249e32172649e53ba5ea89308d97cb3f"; + sha512 = "80a90637d8678a1817e653f50ad7a67b7bcb395e3f6df3e39f90b575b9d554e86554e0732675210ac2979e030827135a6ddc752640b7d6e55d6a6c0098c9e34a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/en-GB/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/en-CA/firefox-62.0b3.tar.bz2"; + locale = "en-CA"; + arch = "linux-i686"; + sha512 = "2dae6b1eaf95e735adb0d4299a7ad5abb3dcf15ee8fd117f200600e3b668d1d4a0e5e23a3b1db2d3ca00498b1abcbeef1494dea834b18e43bed067a60000feda"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/en-GB/firefox-62.0b3.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "0a5976df3aab1eea107ca06812a088b7c2bdf50234dc405461e1e2b9f9f51e2974d904066810757b7504e8e766a2f08bb897b35bfac37736691da7aace35d6bc"; + sha512 = "63e280fc13f34b19b07fd2dca94f38d1d2d6a0d2d300b430dedc23ef60d248bab8171dfd8836d0d9476ffdeab9951083307b36fa2324cd39feafddd71599093c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/en-US/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/en-US/firefox-62.0b3.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "40527b6b86f91fda49ac0a379dd86519065e0c27a3e71a5b4a3f20ffaa3b8f15a9c9dc3d4b3477140c8bfb67bdb013aee1ec739c5ec9681cc381be31d2b8a9e7"; + sha512 = "03d8cbc65efa158d1b7fe303db38df37648aa0f56b6afb7a3e6349f4a658946e8b78fc892391866175966387b90bfcad3e1543b615521c4c8aa15053a34b60b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/en-ZA/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/en-ZA/firefox-62.0b3.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "bfec1005f0f749dd18e2d442b12f91e6b3a3a958cb2ba384995349b336ea104525fff29edb397ada2f09beefac4144f35ceda1ac71f7b49d8a1c6dcdb3c8a982"; + sha512 = "a5510a63055c47b313eefe5d4aa21b1e9411c9a155ee4e89fc3438ad6a0b9909bc197ad5462bcf29df4e7bcd8a86ca0eba33ed222e15d4061cc4ce7bd67f757d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/eo/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/eo/firefox-62.0b3.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "e98dbbaf1f54c79c515b50f4407e1cb9fd09facd87fbc537c834d82236fa8a512e04ede57562d539752cb1d792a27f61973a6ddbd0ae54e96f4f090f0c31f953"; + sha512 = "29908c15095edc7701609dc8d2ac0ab3a8ec2f18bfaa74e5b410e80fbc2f1476f3f98db67dece9e8caa37cbf3e0f8034cf791958220a906e2b53205487c9e8a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/es-AR/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/es-AR/firefox-62.0b3.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "67c9f943b156cdddf7338c8b28ff6a038c728469b4b56737ca90ec37215aacca419d67bee782715e38a0a19d6cb71e2d03175806727025956d29ce06599da658"; + sha512 = "1b2cb7e7fa15219988b87c465c74516d04c8642033504888de896b8c29555073864a5f5ca9a39baf3f273dc981dba139322e6f65c242dbb69ab5d335e4952540"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/es-CL/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/es-CL/firefox-62.0b3.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "8aa5f0d088b2dcbffbc3aab792a981a260ca47ca664cd9bce1524895c065b694daa54c1634ba750fb2156ece43ede1ca4b677565de0d7ecfa262417537263ee6"; + sha512 = "232a910b28f3e415bfbf2ba56167941f5076bef3f58c24d3647fbc2c034ac71a1bc4d4903c4e7e26f56f73c72a4759baab9e8a9edbcd848b6235337e095100c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/es-ES/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/es-ES/firefox-62.0b3.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "0171bab869a15aff9717a8a12073aef6c1de7041e819ad9646845fbd439466ff01ffc4de828bb39f0ea197e509573322d7720dc7f29a3c0b78027abcb0b5d728"; + sha512 = "3ab5192cc1bd24a565cee5a24e4f11719fb6f052c6503770bab5436b308b2ea1aa935b40ee4fe9a1168ddbf206c9a8361585880cab0380cc6794b15a172b2089"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/es-MX/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/es-MX/firefox-62.0b3.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "04bfff437a5eaca5ea4d6ab36fb95417b0022a4c6258f06198be20f97f435094a915c1417f6adea650490a789301367d665e92a3db965b8f891bb4d013bef80a"; + sha512 = "d5ec7c8b509370002108a741c46b1846d03af3805e22724a26d8195cfaee3a5bdf09b1140df2755d43593bdb7ac0eacd68df59348e818cb0ebd102343a30ec4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/et/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/et/firefox-62.0b3.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "c6cc47cc3810549957eb17f36537165c86b6a96fde6fe6b2c2bf6cfdb5e89dee594d4cdd71b763299fd2d70cc4a111b14c13429e9f0b937f86c80b1daca9d2ee"; + sha512 = "aa3bfe0fffe0ef16ac9ca5ba50374eacd82435a2b2625999e1663f4335dd7f0ff56559ef43247d858e85f7c6bdf8c2dc971ee7cfdf457de99ea0434002c40571"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/eu/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/eu/firefox-62.0b3.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "68cc677bfb3b0bd62199648e9fed7345940935e4124a8276097a66430e5579fcfb5f12c0fd2509be642a55daecc193f87c08f817a3130eba5d61e060ae543bab"; + sha512 = "d41a08fdb3188c6e9c8c97e3b4883442c9ec8e2c4915c179bdef70af8da8d31c2750b8128298de9fa9a7aaad1ed2374ee91285057eb5e80bf22845572df6292f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/fa/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/fa/firefox-62.0b3.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "84f20aa1d9587e46ba8df0cc831c615f27b70517b454056e318aa2e25a2c5affd690c384cbcad13a787a824884d8b2f6a82d5562594aba1df502546a68af4cb8"; + sha512 = "7fce80e993a00210aff7afe4f75b19e55e39e2ccdaf6346186be1fc508df298dcab101da349c7c243e736a2e3d4b5ce59a7ed88c5f5602e2263d0bde3406472e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ff/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ff/firefox-62.0b3.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "c003035c001fb703ed3760a74a357163d0e2a2c78fc9f9441aa477f5b90007ccebf209db7064ce93eb580f548bf558e0706baf42143ae5ce68e04b1fd970a831"; + sha512 = "87387872c03dc64afa6f92f36614898de6d22f946a8f65ee8647a1b80705e180dc36688f23285a6db8fb57056ce7d6562251cea9bb44bf9dc60a2c63c6d74399"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/fi/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/fi/firefox-62.0b3.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "d365e9de7a51dd3fc0d6e5b20b72c53cae3c04ec7514ceee3b90b9648a852d42c88371dd82b6fbd0152e02d43676816a6cb2c7cddf94974f91c8307bfe632209"; + sha512 = "d09dcb33a339c274c9559a3835ce376e0dffe4bdba6c80dd0de877ea3324a3ed752f5bb7e1f28eba3c5ff48cf0fa85f0807756edf8bbeeef22bbb163b13bd433"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/fr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/fr/firefox-62.0b3.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "57da42f68f1397b59f41486a945e1f29cabe9db7bdda3ec93c4c313b48eb8cade04b2735a6f4134aee1a1c62c8780d7ac599224dfcee994c893c215f6ab99243"; + sha512 = "5180d006c4fca181bf96b5cc2a36f6668398ea1670b3bae4ca3802d30e3e7f6a0c9f0bf26ee4e8596bfaef451dd3724dc0e16e95eef5d5117bd67d39a0967ff6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/fy-NL/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/fy-NL/firefox-62.0b3.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "988680846f81922d419561531af99172d20ed3b7fb96c52be17ed50abef947d86dc4c79c0b8bf99e6b1275eb91e2bd4f0f0b0d5caf51135ad989e9f5dad58170"; + sha512 = "7f95c5d348ec4b9881a1c0f2a6d6b0b71f98f007ee9237ac11a5aea0c05266ecf9f2b2a1df6cae7926ce338e04e2930fa41ca394ad6d6434c2eae225e3d08276"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ga-IE/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ga-IE/firefox-62.0b3.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "a1e3d50f339ab4de550f8bc28795cea6ab5c1086defb80effc9847c005d8f9dda6e0cf28c09c19fa771682f5c3ffc2344178ad2072f51a258037ee4cc9ddc027"; + sha512 = "fd264de05253312e94660883857194c80049435398e39cdaa45d7c06f2f39e356903f14d27c70899f71d79aed22286476ef65fe18737810b767875d8557bc67c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/gd/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/gd/firefox-62.0b3.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "43989eea2de832ef6d32353e1c5391709b575db80d6602404f002b3869e55605f5b9bbcdae50a8755d09c2a7f0577eb3fa57f581d132c9d1e0b11313976be9b5"; + sha512 = "a82e59321fc99f0b853e8febaf74ca709572473a0e1ba80c450b83bd213a27c0d3a42e13958d239ed78078abc22b518c19f15a9f6ed95b2799c0b3644aad724f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/gl/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/gl/firefox-62.0b3.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "a77de1b17a36e410b3b7e5088c8714c6223c1eb3cd558b6e7880675f8a7e307818e207376bfa3d9695bcc1cd271feee8225e1935cf80a41e7c6b0ec14a4f0f43"; + sha512 = "f2ecdfded32e7a99d225d6e535a24d0e7e73270020d0a16abffaa05a5553a309ec412ccd7d2fc45a0ea3dadd7a46f78279c1a6a79f884f00e06d9502e26b05a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/gn/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/gn/firefox-62.0b3.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "29473ea93d487757a3e9899f0bc09571a0c973f7d1426096fb290241438c1c32c3cc01130d563ba04e5a62c973a167d756d7fd314f970f0e6a2e0215ee0b93c0"; + sha512 = "3e807ffd78b3bd9ecb46f1c0f26b69be6108adbce27eb6235fd8d44c46ab8555dd84fb626a40c361ff7a93a233b03ab58754430fbdaa9d059da338decc45906e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/gu-IN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/gu-IN/firefox-62.0b3.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "933c87a3c3d34648b7ef74ca5ac1bb4b98bdf0fd571b40265e7d1137d1b519809929e7330fd8e2e0fe635557947013a257f3e1009fb04657658ee8725a99bef8"; + sha512 = "50edcc06670da6e41903cc476efb66412cdb025e7dab4bc6777743f0ca59c9f8aba1ecfa445b25185bef69a950b24febf79dd6becb43b8a5e96cc23441285d32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/he/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/he/firefox-62.0b3.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "5e7d5c69c7da4c3065aa8f4e1ac6435ae294b6fa4ad813704863eb699f90f0add5c22ab32db5e32aa7ed797ad276f1c872b6b0ef0d16cda09d87e3fe9291e3fa"; + sha512 = "dcf02abacc28fa133db89513ed696d9063c263edf46e35e920804e1ec059c673aa9174181f96809c844fc42738a38d3c1abd7b0e1588b8b501ceef874382b103"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/hi-IN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/hi-IN/firefox-62.0b3.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "bb2de84243fb2c80f5457890361b4b365baffa64e90afd354ec0606ab3432360a9f70fa406a75dff68e9b3bbd6e842a1566181a62c246af67559cb164f223d46"; + sha512 = "06d36c3e16e66c5d5a46c1fff49d7e42316a9cf0de734582759b01489a73b51a0e338db104635ae941a206ae18749be124ee7ce578517306f898b2a24e7e9d62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/hr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/hr/firefox-62.0b3.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "8b3c437ca5629c8751b55424c1a71ad9247edd72f3d06b3dcbc9f256a5e729a7df3cddc8984f65cdb84a8b6608af339e84c36e728e64978db0ac6be21e9eb95c"; + sha512 = "77d49817ee73c36cf4297a0e0d97fb54f4551051a444c61ff15ea8f4de3b10f842307ca5ea58d588f571e967b3abc1a2a8a5f2cfcc4f08e3f3e745c0a2f8b2b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/hsb/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/hsb/firefox-62.0b3.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "e76dbdafa7d73291d9674de2e6faf84622482efc55aa1ff94bc76bcdc6aaa693bddf4899fe10615f78b2832eb541cac2b5621092b53ea8d2d682951b15f52907"; + sha512 = "07578453be912cda63cb87240aa8254b87a64d119339d9f1a89fa64d397391f03e99d3177e2a0853f06f78e1008706735c4c8eb835b627cd2322c404c6cc0cb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/hu/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/hu/firefox-62.0b3.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "72cac3169709b2293e0d00d9ad190635252047b3267f8ba77c076436682c7c2ba22006558456516e18d8331c21cef3644e9d59c76deeebb1a6328796746198a5"; + sha512 = "db3646504427cdca82196a6fcd56b133e06a8630dd3b55200a9627dba91adb2ba5f2d4747742cd89f1b4eda70eb95d06a229a5b783ccb68aa52aa40c6e69086c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/hy-AM/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/hy-AM/firefox-62.0b3.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "1c806e54898725cd1fa6e62c012d8dce5225ac1c423a80597fb9b3716e7aebd92add9dde916bef22632b5d4122d6bd42159571d0357fc77ee3a0f553dca71645"; + sha512 = "359d64594bc2009a4aa71e0d49406e87a071c312b78b51b82a5bf1501b3e75fa693029e7999846f2d0e204d43525a18d3bec5370d04c4fa6d27de0754950affb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ia/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ia/firefox-62.0b3.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "5ccd9d2fb06679312590534542b34950875c76b2cb26aa1648c09e8727b60610a9cf9fabe433670ccce8e55e01c300827707163d0e071d176446f1590f4d0cb0"; + sha512 = "dde35f60387a9ffe930f77638660e7765e3bcad00116e5c36b9256f06af61966758679cdc27b254d43ef12a1a3ae0b3d5cbde7e338cb3e4245ab60bf29792d9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/id/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/id/firefox-62.0b3.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "66f47c27bcf34d4a194f64fe40f069a7c1c799f5f859c9893f6dc751194a514022ffdbb3b6c9aca4842bfebfd6682a0b78b3972cc7710abd2f84fb1fd7a62c5a"; + sha512 = "7d480fb09f3171cb3b7fcebac9a548c16622bbd19822de288def3e6d3cfb56eb68aeb0c23de4c1c74e303a5491a0a818dbc420dee6d117f6734ed8a3018f4f8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/is/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/is/firefox-62.0b3.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "1ddccadee1a492e2a2062b370193f7b5d67a9fec45f48b4b283e1ef22a14d6c7520ffa209f365937458b6029b36aca9c6ede675f532a7dc12459874b3b746899"; + sha512 = "fdeef94f70504762ae64060590cbe59804aa1023d6b9095a96c87fa06c42919e36004917228219a012a3036fe64b6550d0f6851c56e09d66472385ba8a9764b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/it/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/it/firefox-62.0b3.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "e00ab5b91594b53b7e95d975040159c49eca2eadc9bf70d4e6f576d216b454fb752e3860d7595db2aae5ea1aa980227334dfc6d9abe8076149182f77a859289a"; + sha512 = "446f92129d027d4cde2d34d3b5fda8890a5461db89a95e1f456f0beb8b59f77bad0306565062307d2b02c69504376e31e933955803ea0a08e8c9de10077c9807"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ja/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ja/firefox-62.0b3.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "36e800528ce1aa0dffff9bf1967158f4065c35efdc40cd7d01dbb9f622ac1aaee31f57f11800d2e2617dde9064ce767d9728da2723276d20b7d6e0c822dc8fb4"; + sha512 = "0bf6139ddc700056295969d193b1663edc11c22832a789edf1010dc979f8da2d08f2c58ef67b37119dbf80fcb6b0564db54d1f15b6bbb94ee43d01ee113a11f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ka/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ka/firefox-62.0b3.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "6acff5ec778eca029433e34b63b2ad0a5405dc4c6d64d12e899f895df1e43e21ced61cc7f3c0979a9c4e0237dffc0733caf45c66eea66f8d0576b56a80711d64"; + sha512 = "e1d94e02cfa454564a8d57f7297337189157bb4632f603f41678b204fd52c25b46c3bc2bb445fc947baa50a9a23aea287b747998ed2126a1de77f425637bf2b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/kab/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/kab/firefox-62.0b3.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "429e656266348d7b4b114d29c19c645bef26657bea0a5436eb537deb1e27f4dc30f3be0c48c2af4700af74e3f8b0256e60661e3172d0cdfac6f7be7754b40575"; + sha512 = "3de3ab72850763d06ea987fe92841024121f245ecc2c3e5ba44904bbbbc926063ee104ccf287a85cd88f189f11dd4fef12e3917c2f481659a03d99ad90ab06ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/kk/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/kk/firefox-62.0b3.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "7c4e9a3a36c2393badd55f78461622154264365b709a4ea1dc801b1bc267290cb31414e036823fdb7544dc08930bc0a1ba30e9793df50e26ec3660bc870e0c58"; + sha512 = "7ae95f7a83ab91def7b2d9c83777f85b88ed5d4507a0b4c2b1258b46f38c08e6db9506adde4d8343cf92eafb595506b8c9ae6eb4c4b7c0735c367fc583d2f933"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/km/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/km/firefox-62.0b3.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "26188cc7887d0093395699e9d504d2749a74cadef9280af4fdcedf34960b92308993b1a17b1b2335183db6a4fe734b0da7078c2301aab626b5cd375dbbe9d95e"; + sha512 = "adc3ae9055915eeadd5f1c7b3c76a562ec4043a3e73d6f0885a8577d9bb86b46ae4df2d537c920d9077b9cdafe14c78296e22ff76e18bab2123ca91c37df2479"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/kn/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/kn/firefox-62.0b3.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "266922c89bc287d1f934a35c9909d3549ff298219d40bc1286d94e9a84d4122ce5dfc1a6e6a50393af01877a370822058134b3cb0ffe337df38f196ed1acc05c"; + sha512 = "b005a955cc8d47d9e00605fb02b508ec7153dffb5c4d0e5a49cb89dad8f7e4cafc4ce0c3208076e80611f35bd4ab8f8bca07e5112219a6a62aa87a2966342fe9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ko/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ko/firefox-62.0b3.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "42eed78f69e8d7cf27d839bb20a622271c09cc9a54f8242d2b97235b9865804eca9632aee86f88cfc19399e9f8d957efb3d71681d7bd3b85aa924fa2fe7a1bd7"; + sha512 = "96c1191ea09841dd73c7e0c0f25f0cb0a31cfce8d5231a18df7c54190e4dc4c6bda9fdc23b49d3c7de54ed179b0c6c876f4932f01f6dc0fbd79b5a97104629b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/lij/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/lij/firefox-62.0b3.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "f751829a499b0b0df7c23239f90195a4a9578df5cbd14d3547bd537c70408cc8625a9af7a22e9ac874b1c9fdb61b89f83f3667fb2a08bacb5fdb87d2216cfea1"; + sha512 = "a457973ea05899d64bd691509fa1a0e915747015111e1c146b366cb3cd41d20563bfaf0d034b8935876dc53b80a02fd4b0e9c0a693a31a930fe6c70bc675b98f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/lt/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/lt/firefox-62.0b3.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "c96b866a94b39cf744cad0d4c404913db86ecefe0a5aa44051494fc4fa085a90864c57db953e415c09709c76ce146c6dcd12dafb4d887739d9b096fa9b28cac5"; + sha512 = "ea78673f152de3a08964db5bd9ce91a77c1725a947f6af2b074ef73987297f3f48fc37b11ee8e7b4a8a9f5369a99f56906ab233a3615b462dca9eeb4c71626ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/lv/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/lv/firefox-62.0b3.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "15a31d3341c3218c7da3413fd18db5eb865fb8f57783817394046b2d34790c2f9379421013959368f227209e5a7497c14a7b0d8e0e27debca389ace98d165438"; + sha512 = "6cbcadd3ac50a21409e83d1c60a533559602824a1deab1b3b66d89479f43dda4b44abbcdf4795fbe5291e3e718a5574d88388d66e8a79a842ad1bb29febe8e8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/mai/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/mai/firefox-62.0b3.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "5b1d2430e46fb427be89f97eaad48716607831ce113578355711eef1ee41c023cce5d5f854e65963b4387ad090f3c28b8507465057948059bae810c587963ea0"; + sha512 = "8159ff18abf68b9d3dd4744913fef67695cd98ff3e6eb2b7ff727c53a34949be9b49986e6a2c7b88cc1163075dfa688e263b7340ed378dbee285c03ab4cb9af5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/mk/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/mk/firefox-62.0b3.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "a9f3188c05350be481a176c8bc2a1017fa3ac6723644bc82d6595343e8b7d7cd9a5bf8d014a3f9e7ee34ecbf8371b78005729bb48a630f99ad59dac9651360ad"; + sha512 = "e5f1e26acdef22b51aad608950dd1a0d459c8fbb0f0b11a73bef67bfdf645366a56bab865a198e48fb8ad5a082cdd03a5b2682469c383044a6a6863fb5ebe295"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ml/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ml/firefox-62.0b3.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "285e33d2a9439130322ece4b98137760feb929c69e41edda8a73efb258ee7b7d2f5b15a1587da48ebe1b85c4dc83a1b2d41ab8a52bd15ea3c332a8a514fc0a01"; + sha512 = "779d447f6457441c3723862a2487d5c807f709d234b07cc5f4308a4da39945ec872793b0868f7f8fca684b63623f05f03bd51f9ba7bf37818a7505b11e9e4c39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/mr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/mr/firefox-62.0b3.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "613cc263328545e42b1f78c1cdef685aa717c230b411b6ef1fa19550f309332dce7c08825a78990c766d900afd793c6abda60028a5a79ae481296ec34f75124a"; + sha512 = "e42cd6f92c9c5e3bced29c7310c571dfc2a13fbd0295200695ec1243fa94a4ef57d8b0bc213da1acc5c0004ad5c608eb84e3b8d8d3a7d4c0b9f46c055d22b80d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ms/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ms/firefox-62.0b3.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "47c073e05ddde6fa6deca25a206d649bbcc89557e5eac2d55b6fd764b7341a0aac9b69bd7cf1c2cf8a80fd0a60536cf83a849b0ecdf402d70e113b13a409333d"; + sha512 = "b30f42f4d4824b8bfa0a31bc08a24094fec0c12dbe91449c263295c1e349a59bba04f13c0d0fa02884c673b3627cf356d567ee075bea401139640a814cebb7a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/my/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/my/firefox-62.0b3.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "b20fe68717a9894a630dfa78e8313f62b4054a6821c1daccdc0001653836247ce5d659f580e4127e8d96ac3b37f25a252768e9991bb429642e51a742e0dfbe6e"; + sha512 = "c3b3307bd8668e5918857860a639dda21969e2ebdc35905faf4f5788644ffe4973b99585a3966e4e127715ed3654f9d5151f1d3d7fbfbf6380f74f228cc711d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/nb-NO/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/nb-NO/firefox-62.0b3.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "94447d3231f864c7d6fb027e7bc44bad4408c32851b7e57cb5cc0bc35a89a7db1fa2868ac94d2b2284cc51e4f69457e00ee8965c5e1ce83c4811e654bd7e10b6"; + sha512 = "41776a30a2345be5845348dbfe5146dc1ccca4ace6fe5cc152fa7a08ee346b2e15be3a3b35f27df49ed1e199d43b6f70748a8e0322877386374b4678648cd912"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ne-NP/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ne-NP/firefox-62.0b3.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "42c6876f5f5f6d860e79f852c55ac4661c77d7603a158aba0c26e4245a4f0ba9a7cf9822c6f1fe0c67c161b9e8fe904cb665f6b91fbc5faed233515e091c36e9"; + sha512 = "4130075d9546cddc151e2cfb3deb45747173009fd56ff01ad7b6c84f4de48cded9627bbe8e7cf9b3993fd4438904d78259ac1d75013afa6d48c7f81ddbe2a42a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/nl/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/nl/firefox-62.0b3.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "c6cd8f95b88d856c33cc62b1052a3d2956e48fc405455d227be16e58c251ec00d793ba2215433ccbd2a126cf77e98d629251ec1cb72c38faf4d544bd53963749"; + sha512 = "0ea7b52e6e065ce99ccdc7a2a126af8a2c5695ba5cce5504b308881450bed0d0744f445e0193300353b9a6497b29c1f20fb7bfaddb78582b478c6fd7225dd506"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/nn-NO/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/nn-NO/firefox-62.0b3.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "7423ca1349d7aff3469cb922bc33894eee1b4b46678767666369f6833df30a95b575dc5d175bee2f09b30b49ef6cdf93b144feed7e74992cd9b930114a46411c"; + sha512 = "3cc74dce8034e05d8839a7302cb755200e1bd13768fabc33281bc6d698a4311b4af4540fb407fbf2df71353e746edeab6ef33d9490e4851d615dcbabc5129d6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/oc/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/oc/firefox-62.0b3.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "3ebde82eae1ebd0ed41ea5ce842ca6717914961c518d4238cdd2c094c9e4b871f856547563da4dae1c5aac0462471ab56b1098705b47b817521e5946109b5edc"; + sha512 = "eada735c781efbf19f68c3fc92dd0502a6be3eaa1be3363499ded16d7ecf2ff55c8b3922c18bda74f516fde4f827946989eedaefe0f89b4f1378c08c8e4a60d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/or/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/or/firefox-62.0b3.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "01b5737ac9db850a0b8e08e3ae36d85d9152775abe354f4014604e3e974dab273950d3bbf74ccb921325df87d565cdaaa9bd59109f8d1f887ac32cf261389fdc"; + sha512 = "85ca6b655f77ea788d0a7f35cd0af4c498189dd9b0b69a02f7efbd57dbdbe7de48d20f1b74487ab03a136a6c64f9606a1ed3472c7510107f4dc4a82473873152"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/pa-IN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/pa-IN/firefox-62.0b3.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "b40698c13098332e0ac4e0070589b05553a5fed58ec823fbd9cd12caad7662b2394dd4cff1d05f025879e20821b3742f9b07f28fe69a9f34051d9118204b63cd"; + sha512 = "1a953691cacb7aaced202ee466e217feb66a87eba5789b77beb98cf4b8636d6f4880f2a3608af9392e0363e596588f2cd6362553ce301dd26d16f5cdc62c9266"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/pl/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/pl/firefox-62.0b3.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "1d5ffc9c578b625d8dbb085c0c681aefb8aef1a962ed4e7b8e05d7a8062f11a7ae792344acc5bdd41be66a987aaee0edaf2c5e15e65ff509c36e4164bb45dad1"; + sha512 = "298dafd3d49890c295ed24e525424cd8eede31bbe295509e5eb24e815c51adc79848d391af61c35cc79be30feed2990acee9bdd3f8029b11be2dcd8090f43ac2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/pt-BR/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/pt-BR/firefox-62.0b3.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "fd2954673b8a1a1d6e547db8ae830ed89c4b7e8bb70debf344e76f7dd10aa73aa03cdbb0b788fc4c4e9fffcb5f6a1536323481cebcbe35ccbc5c4317ac813db5"; + sha512 = "fe779f5e6cbce2be6c12a934a2b83681ba77bb570a75c2b9d7d68e27c34823dbd88c14e75543900c38b1edad440a124036027dc8756527b9db0c7bdf26829b30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/pt-PT/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/pt-PT/firefox-62.0b3.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "ad9b660ae4c8a21696570682390de7a46f3d6d2c8096e7ee0c6288b69b0ed95451b06d6b84ee1719a4f8d90c7d9def61a86cc4a8fb0c2c6c8ad7801d8ce6cdfe"; + sha512 = "9423cd6a91564aae4af0dc53db5cee24a93f97bdee5c6311c0bd798395312a583d4a1e45ce49516a37cda3864e38b0f243b5502cd380dc9fee08512d37573bee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/rm/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/rm/firefox-62.0b3.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "dced55cc01aef583db533d5ffe8960f87f7485d232b6194003f1625e370a6767fa27126dd3d35f5e32c295c6f20ebfd4fcec983e57e56b160430b04964c84cc3"; + sha512 = "49cd84478b01cae06135706e04f43768d989ec29cb418595476bedb97c1af9ff5e99cfc1e2e13a0a447ca4a6450ee873043c612da76a9acf4e1cc834db40976d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ro/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ro/firefox-62.0b3.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "e3a7deb350abdfb188a11dfb2f2e1569603019e3391ccf97fc84faaac35e9fac7489ddb97220845cdcaec6321317f6a10897de0feca68650f5fbfdf13644667f"; + sha512 = "0f84b684db2d68be8d344424f8ad5bd3bb7d4b9e48304bb305d6cb5c7622cf2243a301a51fb3544c6fc3526bb4c17088771d1cea86c142fad6d8aea4323dee3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ru/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ru/firefox-62.0b3.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "439b8ab31a627df07df9d9cf0a713a330cb2fdf8af27caf12367077226327c60eeab5b1931a0f2e978c965e402a7c8ef31d0e06a60515c5fbc6c03bb8877d922"; + sha512 = "5620a6765d5c911c825477129a7fed51921ad0c7623d81ef8554c86015ace816a38ed2a99ea2bdc9d04144aa301eee8a22d4a773a80fff642777268c2885ea12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/si/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/si/firefox-62.0b3.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "e90be9907ffd6a6e8edf3c5af56faeb1b57f27094af50f5bb583c2645267e4a47c9330c8dcd8727c51eb83920c7743ec88b5427e72c92fbf66fae7568c213d81"; + sha512 = "fab980c5319bf1e09d9433fabeb48657929430d79154817e414b3abec731271a5444485da7b4a4639564f2cc1e0ac1c862c6e048a7f955f0e8282f3fbcd6a897"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/sk/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/sk/firefox-62.0b3.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "a135e841a1eef634684c904df2b3170ef4da7a6b74e4e7e8758610ec4875910328a77bf686f280b4c705eb9cda6939afe1d7cc23b4e1f45718ceb630a99569bb"; + sha512 = "d83016d0992f3f2a707623e422ad98b1fcf7ba2e0f48524ce188ac68c1e9e1174a3de95745f3a1f804cddebc790f4e46f1d6184b5ba30e5b839e208fa83d0946"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/sl/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/sl/firefox-62.0b3.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "241b8b72761f475cd3ed482cdcd3014bd574b1654ea37bd82562c273473f56a6fbc20a44b0f38dae9611629871e5122ffcfbbf006261352b137f5c04895f0a26"; + sha512 = "e659376911924a58ad5a8298ae98787307d133dcde179c8b1f358e929e7321dc87eec8d2a601f4dc3aeb4cdbe1105309fdbb9efdfd3d22828d5ae6e9f627819a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/son/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/son/firefox-62.0b3.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "e5b5cc8fcfa68a6490bc0780ca7d6aa39be5b7f764b74ba832be25242fa19cf1b079b4a67d4f8320d01b64ccf636010981072f81aba5e01bcb86607ee09454c6"; + sha512 = "8ee3e51d3549635793ada4af651c063e3440e0a5bd4d88af15d33c783b03c97c553cad06872b60cdde416031a81816b546c3452e07e93535bd97c38d3f278833"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/sq/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/sq/firefox-62.0b3.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "c3e1246d2351df36ab477d5ce9cde3badf041df1c93d80493786d9d14f2241fb04367725264ad1c7043de193a7188d16b1c646c1ad98b073a4aa74fcd36df15b"; + sha512 = "ac8d9f7ee122c4362a1efed25137ea34fa2125c563d150c3660a079b9c9af35eb3a90f0fd96cf5fa3747df71e040f99953847b065ce6a3b568e3d5cce3884cc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/sr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/sr/firefox-62.0b3.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "c2d87fc3adaa26cf50534ad0db581b3130ebd6906976183ec3d338e5c71a48fa1c81107c2f690221a43e8267cc7166b1ad0b75a6fb20a813d8953f145b37128e"; + sha512 = "d044cfa14abb017c042fe41bcd8ce8acada46c461afc308bbf3e8475c7869ea228aa7cdcb5c18d97f49fb4feccb691ab5c13232c944b900ad478bce08c070232"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/sv-SE/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/sv-SE/firefox-62.0b3.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "4af7da8131ef8d9ddd1baed4fd0def10c648addddfbf3f14605478a2e8ad67f0e713d304b36aa32a2abc2e506b8a56485c6bff13ad7ddc3091e39eaf406a6c32"; + sha512 = "ac3e16d233061a774dcca9ae76f6c2f4ba42b885c771d3da1186e1329735efb1fb34e7672a050058cacd2d3db7f4bf4d60bcfef77529777a7ff10ac7f93f30d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ta/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ta/firefox-62.0b3.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "d90f085f2c67def801484808f49bdd4b7862a9f7e2701025510fce2d7ae1d5cafdee4d5c42ae288ed45ab86a71a3893161e9fc7b84403f746d9fc72a754e4f1e"; + sha512 = "89dee1fe6edaa32cd5f5eda39ed175a3debc23de44b116f8de32e38e1827a7ac30613614ab3fc6401165db0d0486db3c94045750e37294a43211ab9718b26911"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/te/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/te/firefox-62.0b3.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "3ef8eee4f684f021eca667ec29dc4ddc1339e83a6ee93015fe5f24dc91a804f8405a958b0647d9430aca6202659a811720401a960b36ab6b2f54b53e6e88686f"; + sha512 = "3c292980d3ff21d59c98d68eec743d397cd76516561a610d912866bc25f0dbaa2db70d76b7bfcd94dab21cf86857e134f9ddd5bb85b5b38be86d7987c3cce1c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/th/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/th/firefox-62.0b3.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "ff4e3d40ad392c0e00dff2d0720327e45199597d31128e3e67c8cee77b63e39680848351c947df46825eec862afc1adf24880a2a825769b222742adfbeec55a1"; + sha512 = "867b8860acb1764cefe3b5b691beb9a2c521f0738b927b41c896517ef7712d6e082eb15272b8aac3efdaaa103fcdcd57279ae71096b7a94a851121f7e7103ff9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/tr/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/tr/firefox-62.0b3.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "5dbb673c93c84a7bb30704503869f6cb43ef42de038507d81daaaec4482ce93db74b1f43c8c50881768fe94cfbea95dd2f7ec376409ff2779afcc08727ddab9e"; + sha512 = "56416e1fd7ba25d1a6d0b65e5a6f0035addc2d8c28145c6ee91a2dfe8893f6fbdbaaf82a05304b687512e4f6f1b8798e9c83bbdf6a1d72bfd32a85710b5df91c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/uk/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/uk/firefox-62.0b3.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "863cc55f0f44f5f01d5134a5572b39367ba899457bc5fca3f60b62309a6212546a3b8e71945c70572ce311fa9a60c09cd0f4ac8c2f380692f806dbdb4880c648"; + sha512 = "c228886955089f11567361056d6ddb043617e4d48613592be7d2ffae5cf8528a7109eb10760fcf7d731aaf26d1c6ce92cbadca32013864c2a29117017aa3552c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/ur/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/ur/firefox-62.0b3.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "d6550a25f2c81f55799032ac2f78f1db50cded6e06a8ea06144d65edaf619a9ea0ad9e2571fef4614e744c5e949a73a414934f70fd18710bfb0a54022685daeb"; + sha512 = "e10d8c5e1723148909ba855c111ee077942a8d5a3d8154b10349a718a8fbfc44b3eb366a95cbf30aa01e71f9123dabad27b29513bcd2dd31dd7665aa5c01f060"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/uz/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/uz/firefox-62.0b3.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "089b8a19ab110d3358dfc8837d0550b954a443e5ece3cb779d06a160988f0be2c3ff3b1fdd56d2daeb3ee625cb880d9ee65246c80dfc5dd58b49ab0e2d7c2302"; + sha512 = "d2ffc996a3bc7eb852e4627a4968d6e48ea3b5d7fb19c756f90d42b0da4ad6325ae5bfb23c8feab969a3fac96e5712fd1fc8978949d59f677a9bc36f3d440d90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/vi/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/vi/firefox-62.0b3.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "b7010185038600d9045df6e5504f34745b7ccf0b031271474d69bdca2940f95e7bede030fa6bc241696fcccf971ded644970c829c612bd13aa0e4452e0ddf27b"; + sha512 = "d6c045e3fb066170da74b347fe75542c34a9c7eb758bb6d85a26313b7a2d1183aa3d1a65088bcfd1dc675c44fc0532c9d6779f8b1f11236cf2eb8c287fe17af6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/xh/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/xh/firefox-62.0b3.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "fca5c5f5a2f667932aabcf7d112dd4293e7a0f2df1a400b9ffe60c9e08c4c0631df5834778dec3f3312898a4b1cb6d30637ef6b78b3868a49dcfa3c82858bf83"; + sha512 = "169196a370bc41bfc6f03c43e70d966ec2dcb10f2727ed3750afec73df7a33875af20dffe3bd1f2a97671af23b028f9de85281245f92243db1bca44361be77c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/zh-CN/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/zh-CN/firefox-62.0b3.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "da337172f306b816d1004c176d5ea4f968e65c126571cbea323d85bb35c7d51a6214510b709d20a8574ff7686ac9168abecb8c8c6ddd33137982e4e7d1519e99"; + sha512 = "3f1615c4ae6cc297c749c01f0eef3620f0a789220a1f4bd052a42e3e92a3a32ef141ada45c204ef5bb3646e0a1964f1e580e149280b04e1189b8e6c6e1fdc733"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b14/linux-i686/zh-TW/firefox-61.0b14.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b3/linux-i686/zh-TW/firefox-62.0b3.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "5ab07868511a6a2fe31e5039bd52aad753782fb6bc6c437caea66cb8264307203f2fdfb711a49b5ca4dbc8db6408b21e309f1ca4f7b4f7ee3a47bbc83b3871ef"; + sha512 = "5f82822c82b0efeae25ca083b27a3054136a5b881139bec624764171bc1e91c352e688655006e00aac039b743273dac1155ed6312ac5f016af6ca18bb969a56a"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index b5e17363a51d..8626b9ef6649 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,995 +1,995 @@ { - version = "62.0b2"; + version = "62.0b3"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ach/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ach/firefox-62.0b3.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "e8a73275e443ca96a98e7be86aed6fde2d260c679d8e6c6abe14cee34a7cce6546fe2d67e3f6e459e70aa1c24cea4e1fea5989e1e445c010eb09c6c380e92836"; + sha512 = "fb662a573025fc9f8e4de57d81f0a237b507040a040844150d55d37210296873112de5cca3a57b3f849ca9d4ba4a11786d8118446b0d190c2895e7144945ab28"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/af/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/af/firefox-62.0b3.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "a8840407317ba6c78d8107eed1dda66b1cadbcbb3974408a7591a0b707d48a315d8510bab6745928ff373557b322abaa5004e4ec72ac47a10b8f3e844a739078"; + sha512 = "000ce0eadeec614c9ec6388932fc0835fe844966be86516b71c9baf33126ab8e7245231da12046ed38c5b0f9ebe79ac1af61ce7d0c39263a8e890032bd36f24a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/an/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/an/firefox-62.0b3.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "592cc4f177c6a66c25c1921f15446e2358a2cf248747e7f528b9f0c0bba068454c7adcea39a7c1b07dacb17512ce530bef57015a3c3292fd87a312855209df32"; + sha512 = "b081b77430f9a0f9d4459c680f6b544acb290522308bbae6c2635791d325c3283afa3db97e9bdafb446a9f2265f3f20836eade5a687fb9f38811cb12e7af2330"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ar/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ar/firefox-62.0b3.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "8914a43999c7c48bd2d6b898cf809f1a7bffb41f64f12eabf6821eb7bae9dfd47431636976bcd746a219e951ec546b45257d03280e4d1805098d14fc2c2b66db"; + sha512 = "6e9fa89945b9ef32cffd2fb936151a642e0b5a1ac1b333e22406fd409087c456e64095edb371eb244af2100cfc0d36d4b106d7fee6d67d9ff5627d3efefe0434"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/as/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/as/firefox-62.0b3.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "b25747a2c9fab1e0137f39d7c620ef8d0f6d997dded045c8c7f8eaa1167393357ad555f7e82597169bd2f61cb88eca83269e3e4f6f4a257a1cf97dbe9520cca0"; + sha512 = "53750c2fb6abb624c5fd645bd08406bb4d0dfbc7094e128a773d1222f211d25fa4ad042879e0aab53a092fed0e6d4a1997f941662afda2bbd5740a6946768241"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ast/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ast/firefox-62.0b3.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "d577dbd473dab2fc618ada2d6ebceae37796a5401f5d7dbdf6f78fbd2078df79d612280c816105a6776f8a0f49dd18f46af4def052af351f7e846a90a4dfeff4"; + sha512 = "26105f6c7568727608f70351d3111f2997eab7a3670bec9733415b8612c38f5c780568ffd0da4ca840ffd12a7fa27b4e7e34cf8749817762f9d805e0fe4e3bc9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/az/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/az/firefox-62.0b3.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "c7713c7464582b96584f4d16f1cb70321503c971052d135dfac46df661cc8569661041b5c9dde1d78e7c9dce7a8f3794210611f961cdafab11445fb8907e606d"; + sha512 = "d4d0507bbf25810e39fb348705ef950d1d0b85d9570b72d6a24aab5d95a5860632229392863aff6f719cf41975299e76b57f337681d233be9f32fab2a3a6ec57"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/be/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/be/firefox-62.0b3.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "4b1129d50cd2948ba7168bec3a9f2e380672da29a5ffd86ba69a7a1fcdc7a154b35192176da97bf0bab284be53f5aff64c7c9d07ddae3f7a38395b97e669d365"; + sha512 = "d6426e87f85d76da37e58a3f2f59d965bb96fd8d10c066130fc8445dc753c04fa9103987e29d9dd2cde38d1123d63f3741997d823f14ccf51d57746fa3508070"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/bg/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/bg/firefox-62.0b3.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "be0dd58530cbf5a2d1a45ac83b8a5c6876f27ff603ed7e38c26993ed9730984ad7314d2191494f3e30eaccac19aab24ef0d2148e965162975f24d2dbbe92bce1"; + sha512 = "e99f471aaf2aadc26e6484dec1a0969da2459aaa7fbc4c16bae76abf5bd325d43642853aa6b5b1d8b7375c82f69a5a012743a2a458c6fb365f8429a4d4e7c9df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/bn-BD/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/bn-BD/firefox-62.0b3.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "17d9323b7e6bd65e4af89be8aa7fdfcfe3e090e9d8a911c0e6403f9a8aad4238acdb5e259e958e78b11fbdb51b65d9eb62b1c0e322e8cced623250d921234887"; + sha512 = "55e3d8ecc06fb8d12310ec6ed6a7458c7f0f357ba286ad7a4967880e0da591704133525e989349f57696a64b168a532da3d167897fb91aad7ae0fd153bf96f09"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/bn-IN/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/bn-IN/firefox-62.0b3.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "544f72273a6db0d219878d3ed49567fe2f0e5e72e5c8e3b85ba0ecacb60813a5a3ccdb1466a9c0156ca44622a2d451a6b93fd3303b2512135da89d0430bfb928"; + sha512 = "ca0940bb07232cbcd9143547a3870593b938979f4aeb6711e9320468f1b55bd8da02c363be6450f9cd6ca4320e0b41b401b21c8b16b7fa8238f4ececb1cc82bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/br/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/br/firefox-62.0b3.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "cff328e9154f5c73722f9245f07177a97d46eaed99a03b3177f3eaa83157a9e584caf8731e55c73896eb2f8c01d16e7ca899ac6ceaa8bdc43bbe68c21d90fc13"; + sha512 = "bc060aa4d847eb5e3694f2c88f536de9dee2f0e83967f3ed3559894fc91f483b8cfc9a160d57d0c97008f145bcaec2eea5b7a9a442439d71cadce35820765c6c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/bs/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/bs/firefox-62.0b3.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "eb419f8a8cf848ed8913511c8f7fb5585e4171d9c2062900f693face140d91bb5cdfd7ac413be4df928793f5b5d7780ab3b877da596848b8255d7fc0139efeb9"; + sha512 = "b6ad77b36fb6613234aff3e120e8e0954dfa430287c6a48662c8affde272f4449a452104a215a25e075b6afc4e4b3d7ceb6f7e9439e10ba4de411e7c6396be39"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ca/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ca/firefox-62.0b3.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "6e113bdc0ec10629d285a15dce967699d5299ac82e99744d6b707f338b0e407d0a03803e3c70da94fd13e460887e66919edf7d5ed07d12b9d0d1c21de811dc40"; + sha512 = "261fa5ad64ad6f3d58d87ed71843105b12ad689372f215be4572e23937cac0dd648d8bf722c614c08211c864045dfe8a7f65eef45a297666a762f80a62cf56b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/cak/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/cak/firefox-62.0b3.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "639a98dc336f0b11dcb9b98c4c3e2a81f47086cc6ef4eb9f22eacb232832a3fedb071302bafec8df0c4f819afb4b0dc95c8c709be69a06ac16eea50dd44c8f9f"; + sha512 = "27feba8268ddfe5d12876520f6dec73799802ef179464c54c44fc134fa18c15faeca9d946b6d3f67a8b7210cc68130c7373167aaf1732f5ed9df1febd6077860"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/cs/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/cs/firefox-62.0b3.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "5fdb22988c3f04be8974e8746c2b3f3b794d5dc5c317830883e3ffee67c82a2dca21f45c2e8b695be3612c906d03bfc54db5fc086c63a35eb9b204eb7177e18c"; + sha512 = "4f922f1a443c630571c0389b816db1880f0cd386326778560461eaed7ede66700be9f69294e90c9339295009c3ce2a1a2b3e545a73f3b61854f899ae5cfda75c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/cy/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/cy/firefox-62.0b3.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "2c89c1ab0808d85cfb148690265c51a2c5af3a507799cca510c3c1901d2561a27a077d0f7f1136f61b7db1a0eee1ef98da61d6c16718d0effe8621c71368264e"; + sha512 = "2a36df61f32b2da0a3d0e6d37c4f7e9fce3e596a23feede17539baaeb74f24abdc9fa562ee6ab6cad57650b25a1e117a20d308cbdb30a07c59b11907efdc631a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/da/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/da/firefox-62.0b3.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "40544a20f4826d7b91904690ba0c3e2a37b422309447adff63515405ee46a73ee6e9741f42a29e36055420bfd917fb732c179174f7536c97fe8e745aa791eb77"; + sha512 = "4840577c308c51eecc349fd3780311a9dda632c0ffeb3df10bf028c3e6ad27d0fe5fb7c572bf706a69fcd49ab9de83680023ac4373abd46860b8afe8e6d2bd2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/de/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/de/firefox-62.0b3.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "4b2354b069925c77e3cca77c49013ff3f5fbf8586c0158b83762dad1ab3028a35f26eb3f80cc79f8f7c729adf23d1ad8f28f81b1210f2a79c01b3ce0b8e9bdfb"; + sha512 = "4767e6bb638664c9abbf4c93547e6f9498e84181b5924f8f96a35b8e7e3cc11ab04b18cfbca38efa075274cc9bd2a036e25f53eb84d462f2afd7abda4f4e32c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/dsb/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/dsb/firefox-62.0b3.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "ee0922e704593acda845e4d5e211e364625fb5749794e1d945178462a2351d12617823917d0f79fefbe9dcee24f4dafdc174742d12a778ec6959471e31bc1005"; + sha512 = "4620c84dea2fffaa684554ec8517a5a6dabbdbbf4f60b999a490e70fe0da5a1fa21ef2183e089414b979f0529d867bd98ec892df146507502eb81ba6c2c04856"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/el/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/el/firefox-62.0b3.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "f07de19cc17675c777e66341d771a3271b558318358af1b379dbe90ca23c01451217680fab80980fbbadd9a82bfc6bea84f8b8568dad00304b22cab19ba933f2"; + sha512 = "12ad8e39c55f975f82351e1499ce1ba78565326eff521f36c87d31b7500f3da004c1e8c72c98cc603949c8456cbd709f8810491c6914f5c42e6cf8b05eac4684"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/en-CA/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/en-CA/firefox-62.0b3.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "ceed256dd96a3b356f3cb89e01d10450f33f5dae8f4224145cea553fc825c315c2f3b9bf670c80cd0648e31be56cf2f988ec62d95f0bc554684baa35f59294bc"; + sha512 = "0f7c43bd7f5586a1ec78ccbb2bf424933be3964c16c2424adde1e901c0fdd5d523adcd974b02e09999bad66bb719a9976e7749b8673d303613447861e07c65a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/en-GB/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/en-GB/firefox-62.0b3.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "723cb9937c49bb44a425c4a8f8ea4379ca97f11ab1aa4d7108204211925aefe370a7ca3fa2ed68dc38ec4157b866c0c2988c5c1b375bda07e9acd8b3b40c53d7"; + sha512 = "5c234d1017b65319b129e8430469850e9c5d25990df2949e16dbd610cef45bcb5061d044cbfd0ef95cc0328f9c27eb239c251b7d41388677741e638349bce26e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/en-US/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/en-US/firefox-62.0b3.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "386a86c641c225508d7efa4a467b981154ea41c06a5948d09e7d6c3ebe4e8cd9236e52ab6a5ec1e543b80f9402b1e0aea26d2a7b2bed81b742f3923e2420e92c"; + sha512 = "638b97dd86c548b666220b0b4e785d49c40f8dc46ea006416b7f66cadd2fa511040604743c921bf5c156b06fa26007859d26923ab39cbca0a5def80c9e171ffc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/en-ZA/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/en-ZA/firefox-62.0b3.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "60138c99ad5413379646ae8939be17bcf4bdc205c850a21d759b1b15a53740326cd4bbdacdc86e1affb7a6f522064b3f6a61a14c0590b5a50755c5a5713d3703"; + sha512 = "3a64761e9083c5b6eedf25c6641534211d6325d9b97b22a19a413305ecdc697d75bd06322f04c7b84c08ee077685fd23da3363306a31ec3439794333a2e264cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/eo/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/eo/firefox-62.0b3.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "f03d76e59a2ec73cbefe815595febd99225b3a88b6eaee721dd714c6104122f7d6380f43270808ac7d58a958bca77f346941a88cca0ce8d280988e3e7f8b56a2"; + sha512 = "d244bf5d4a4f385116228b6b3f306d15b8710a969ea50580e91da861b97ece4473aa2851ea02bccfc73dc183abd523089c09da320cb6d34e1db492ce0bf58cb9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/es-AR/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/es-AR/firefox-62.0b3.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "43b3d2e06b37e41bdade831238d025bc9ed244ae47c05c97059136926bc07cbf5468ae18d31479daabd57200a03cee3e076dbe2fbe9c82393b649b74dc640aea"; + sha512 = "5e53d61b916f9774c2471d941b26b72e5d1caef0c1997a1b435b1f57b70cb96ffd8b4061ee4a3bd90c2d480fb94314d2f71d6be336ced511b27b447b6dc2e6b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/es-CL/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/es-CL/firefox-62.0b3.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "50fb64e738d45199b7244586093f939392d9a4aa4b94f34724d8390a749f55b0da32278a7b239f48802fad45a2e497cff5b745d6bd805f98de5c214057192d4e"; + sha512 = "23f44b92bee6543ef4919554533a2ba35e1597d4ff46246047b4f2f0e45751c5739f00167f535f39c8f06415bc63e204a5b38152da33a26cd8dc2f713b3ebb4b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/es-ES/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/es-ES/firefox-62.0b3.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "d0252a66a1222b1fcbb3fcd57cbd5e11da901409b714911da4642961e854174f9b082bd0694da0afbbc6864fe6df16a60c7a02087c1d4ebd9443306ed63cd292"; + sha512 = "47b30177bdf420887782067817ffb7618b0aa73a4777568de97e9b09fd86ca3d575c1b00f8ecaf24455ebb654238dc873ad3544818353d48d18f1202fd96c9f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/es-MX/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/es-MX/firefox-62.0b3.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "1a989fa0f586bab19a4b4247e11fc9a74280ee8c66e6655c309fa8413864628742e9d41f60a3f4097523aa90f0ea5176e84c38daaa34853509e38596339690a4"; + sha512 = "34749402c8fbee479097d411981b271c4c5f3fe17faa7a22684ba4755035d1316b01b94e085a0d7107f3e14caed296c37e96007af32ff447672cf3732bdf6fa5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/et/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/et/firefox-62.0b3.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "640a65fb860b8678e547c79a0b5c2063a87473ff2813662eccac2e9a47ba57fd41ca20bcd200cda8fd9e01e86ebfdc2a8510534c1d4a4e22ad6f100a9533f2c5"; + sha512 = "093f375d961b48a70457f31c007547341f72eb86f4b91ad84fcc8dd2bbbc4b23a2b20d2422904f9959b6906c3075166f82669b30938525dd72287e864ea98ab1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/eu/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/eu/firefox-62.0b3.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "0fd6c238fdda13eebaa18784e78158427fb94975943f0b0a8d07ff1d8d16d7ecb2d34b95417237cfbf2ae3c63652c5b1ff39350de2fba38a959b5d8b6b7b469a"; + sha512 = "a9dfab6c92cb6a78cab0a9e2f1f273bed2d54d18a918367cd8e1fdd9f96dfa9e065bf4205211e8c95c6e085c947aa48e22a82c8ef4e5b87f94829bf6de4d1547"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/fa/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/fa/firefox-62.0b3.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "1f9fd5d3c6987a3ce9a10aa057d9334e3b2dd050b1b240c4a704e3e3599f6e2b98bb776f31f46284c16109b0eb89e533bda4b48dbfb22dc5a804df631a60f22e"; + sha512 = "5e20caf1360465aed8711f914d2d6d727aecf3e94b6b19cd3264c4b0fd567950bac73eb602b2a7813f6d7bae6717aa598f04daafa49960c19852ba8dbb06f849"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ff/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ff/firefox-62.0b3.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "9a11342c02298fbc3f8fb3bd0daf38796f70db7aacc5f2d127d3b2102d9c732347fe4bfc9ca368b7d6181c294091ad2cf7d8bb7017eeb3abbd2fb9180ac6597c"; + sha512 = "4d2a56f24d2be12653e3b3a3d5466702c2a83a3e2d6a3628897b63e0de8653dd7412878a6fc855ee37f588a3aa3ff3d587ef544b4f81dd8f73042fa9a2918243"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/fi/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/fi/firefox-62.0b3.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "4b8ec3d78c38db9078e128c0c7b37306946053c1073972a8960a3299e0419e42526c762e6fd8da95b14dd521d334b85bd61290e3759df186bf305ed1c7b2cbad"; + sha512 = "ba75525f36e0fdd30f030b3490aed77ea5ba53a21da526871d1813882bdb11aef2576448dc066d0aa995a0ccaa7c3740b4e19c88c4c9a6490b23432800637b33"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/fr/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/fr/firefox-62.0b3.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "96ef7135fa52202ef8a6aef9ccaa0a2e29a43fe1175d0be889a41ce92c731a31cd7c1809dbedbaec2e16a832da5f3d73a3c77a0703d8985a62e1ecddf8a267e6"; + sha512 = "bd8ec59817759393c6a248769873673e05591241e172404b8277709dcfa8496061fb411641145bc51bc7c34b26427c88088199ac1b7314c1780e312038e48643"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/fy-NL/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/fy-NL/firefox-62.0b3.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "767da4cc0d82efe65c1c740ba8d604b1d50f920daeee5fea2dcad5efea5f46f168ac8d27a15fcfbd0af30d6df2c3f0210301df2c7006a5b39a207c190c0f7e0f"; + sha512 = "af9180e4773207eed96741f8aaf0448e3f0b0ea061a6d9d6059f01cfe6f9a599a0a68c54868e1ce2428b5b6c3c5262a8a5de545dad96799c144da49e591184bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ga-IE/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ga-IE/firefox-62.0b3.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "1828c79bc6d80649eddb9d8fdfb7b395e66f3ef5fc900fbeb3d727955aed292a782fe8a413038c037fb699b49d93b72b645c699868f55c823a68e7a5abd468ba"; + sha512 = "2cfe60bc05ab09bd86dfbd77d5b9cfd0b768cd8c9cdcee7772a712056cb0aff70ddba515e10fd5f2be29ca4f82e1dd8632cc131a30d70dcb183b3dcd1e9e5f46"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/gd/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/gd/firefox-62.0b3.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "ab3f9798ba035a33bfc4cfbd576b883e2d677932e6f8f75cd1c129cbdbd02323004fbabd69a26ffeb34d4eb2197d0e079fe1fde8044eb1b4c626e87cbc800219"; + sha512 = "2a918ffae1c37d06aedb5e33cb3771c0879edd31722fc4afcb50b58be984122a573b59130dbd978521c7473fc24584bd5dfb05e46877bd885c9468d20050a997"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/gl/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/gl/firefox-62.0b3.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "c9e0d513265faa304d17ed8471da5ef42b84e6eb8b992a22e267b29545eeb72042061f575b5085d5c25d7a1f9dd222da53535670e5a251eb6dc7d2cd3b700e79"; + sha512 = "0cf0fe3099b4c1967c152a95228eccc8043c65324b42f87c2dea5d33a3bac93672eeb93dc85c7d12f8768489ee071d6437aa6efbcbe6d5b81a7129ce20da1312"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/gn/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/gn/firefox-62.0b3.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "f0d2117c871fe61a0b3c4f2b08bc1a35b25f892ed08231f48c84fc4d88180b7d37fcac08550eb06b49fcfb76188ff08e89fc23933ce3205e3e7f628f242df826"; + sha512 = "0156f9882dd2ab3a02aa2916eae8eeeddad584038bcbd79a877ccee67bf24d2095a95817fc4add01dda9680db6d713f13629d83e0470faf84187b9a836e0a489"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/gu-IN/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/gu-IN/firefox-62.0b3.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "35d62c047992a5ad288e905fc4f386f3d3618df2c42f617cc7c2be777604a8a30d17c14e4e7ee21f06b35657d6cc8b2743379836d433652c7509f6c0455956a2"; + sha512 = "78421ec8446122895822893559d5d1d8180a38158a41e04529eb165e7e68f50d0419ed60dd6a94076dcea270f3cf492376ed1ca8b53bc67cd70e19a18fad5c77"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/he/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/he/firefox-62.0b3.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "05c9481db1ecb833774f808a33db96f4848fc260751f35d8e9328916a5c298c8c174cdb55845bdf5838edd7ba323d9c6dc6566609e359a5746ea09ce2566f8db"; + sha512 = "77fcfd12786a328f27dc59b1fa6bccf3427090d557d4f2be945f575d3d2b46049d293a400c74496ceabc24b3c17e6dfe6fd038c1dc9ab9460c5ff807f30a8993"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/hi-IN/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/hi-IN/firefox-62.0b3.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "8a92fa9b24e54fda81d15b18dda8432dd94e26164d58e1dd7f65d5f744c905e8790693557ac15bfcbcb491032ef436b3c7c01651767d4b43dc663193ba47ddbe"; + sha512 = "4437886e4647b086556b19f3530c1974dd429b6ddb1f678ae3fb3448bf75ea27a4ad153692328d22d8e15ad21233ada1769e6ed7222560d26ab2f1c4cfba5f56"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/hr/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/hr/firefox-62.0b3.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "432f9c7429900cc929afdf8e7e4905606a7f83652519d8f0e5991aedc99b7eb56b73ad7820efca20250df19ed68c0b4c409a4fe2595961a23df6f3982447d3de"; + sha512 = "f0226760fb545f730a218d24129e95a2f0739044421cc91d921377afd0c0118811cf3f7f26a3be63ebcaf2f0b259f5279a2b4da17399e9ba076eea6980f9816b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/hsb/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/hsb/firefox-62.0b3.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "ac9b1b4053cfef117b4ab4218a5e27c390f6eca3ed93bae5067e48863512e93ecf037e60efdaf1cd5e162f89915d35ae5740c77b4ac91b3f4204c3e4de250629"; + sha512 = "be593a431d81bba03f5cb9d4e15a2e31a2be4561c5b89c585b23edc08b618383d8658d4898320dfd34483de95f483176e5fbd9c6493f72a416f040a3485f4eee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/hu/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/hu/firefox-62.0b3.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "5ed2987282e18a35ee024b6fac92ce28ef0d195c8747b1072fe03bbdb8eed719d070b2ad74549d74f9ec0fd88b41a83d22c5dce9d1a9e09a6bd9397f99bd4db7"; + sha512 = "2d3e066b7eb24c948759cf62ee2ceddafd86b51b73a67e306c78ade75661b3a6a47c1dee51b1b43057ddfc555a64c523befce8e17afa9008d7e2ee382c2e3c28"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/hy-AM/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/hy-AM/firefox-62.0b3.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "419aa9d8513edb65c3ce94cea7ba95bf44f8ac38e24f3b0ca63f0b02c01dd2719d54fd8b8f4128be5cfcdd8cf4c45d709b5b74679a9419fabbb630fb8708e4b8"; + sha512 = "a23afdceaf33a3ce0bb323812cd6a1e0239b2f2c4ba688c601f8a158e64a2635e1cab1313edcccd337bbbba63173e9d171254e00ca3bafc6ebaab4297ed6584f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ia/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ia/firefox-62.0b3.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "fb6f815b6e0ca4b8f4da7a423186b1973222bc1512461944aa6cf1cd1393bbac274cd612b7e17f19a27e2229c6a594d50f7d15cb9acd21932c5a5871cf24d04b"; + sha512 = "b36bfea78825a783d4813f9454d9fca02c6ac9ae685c7ab81efebf3fdada08e76b2e02cba0b19fc6a1809bab46dee01dfbcec2fd57fa83186de092e5b2744227"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/id/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/id/firefox-62.0b3.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "c1f9166df40952b2b933bc900bb8db65c1c744ff7007cf93efb8c8e9d5fc886d4e97db92e7b0fe58ea245b6239b109f297b6b1c5e8751aed1fb7bf7c8549b218"; + sha512 = "013c40d4a0775101cbd66078c62a4bd28be2335b9bf38350474fc2593b7fcc43c5caed4cef4ad906245ad0192df8de38e8fc537ecd6a48afdc97d5141738a2db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/is/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/is/firefox-62.0b3.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "d8f60fc52faaec8a02154826db63a8b7e976cb8667bf05bb8485f61ac3b29862d9a0d4953815e876d6019d99c89b76ef45f6d1be14a1286b7bdc57cd06d1cade"; + sha512 = "f9c95cde0a4927c5b7e3d2920a90ee3229319fa8989b6c7e2deb2cc864e12822b156e6b44fdc8b4ed6d8e8bc706e323cd0e38bf1e2393eaffd32040eda2faa78"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/it/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/it/firefox-62.0b3.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "5b2815fd990934dc49d750311592413c7458349e890d3a74d0d342ef86a1cadee8d870bd515b454d566d0d51866dca894e06580228a437f59ed793ca8df9de0a"; + sha512 = "3a1f50aba975761e41626b3e5f3f6619dcc09d31a27899e4b0348c45af5079883de2b67135197e7a57e448172e55cb9bed4864ad6fb9e0e0c0624152c180632b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ja/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ja/firefox-62.0b3.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "5267ac59466a24cd3b07b33ffa3a503b907e84cf58e87d682a8173b826a7d7cf587fbd52d0d8be7732436f6cae5a638e0d0ba02d1f614ebe828514cc67457209"; + sha512 = "b513ec2ed69e0e8c16a53404fc3b891181a581101972e54ec509f4f2b842d2a18fda2b6dcc573bf3a426bd06dae4de8295b12d016b81242d93bcb1e25e11557c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ka/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ka/firefox-62.0b3.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "920a6be8aa3d0b3557e170a310496a59555a49833d27c777e2ff446f001570b299872d807e0512a6c37e42d44d6c92cb213138170a04103a9b2169c84744bf25"; + sha512 = "520f4d76371051d4f97a3ecf295031b208561b5ec1bd81317d63fe445fd80d75f5ed8fa866e2e742073a8fe6f92cbe018edba93d4ccef50d1f78c90f598950e9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/kab/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/kab/firefox-62.0b3.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "5667c3cc41ef58e816de3212389d61d9cdd02f577915dcfedfed9a55bd050873578f9d45a05357952f7b8c77a218d68164fb71d04bf669d5fe4e948cc81b8752"; + sha512 = "c0744662c499216249ccd2c8a926933c00f2bca52fb3c8f865c5f7a0e0a4699938dd146ec94ca16517bf9f6502c30dc5695c1505c033ff6bde3c08af5bd2966e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/kk/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/kk/firefox-62.0b3.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "17bed6ff7dcfeebc40c6f703c1881ddd872e7ce212ae560d3da27f14f140b72f7fe61fe59dca41bd198a7499e64e74b0775ea0a95200dc2270cc5f5ee6fe67a3"; + sha512 = "aa939d0305fcb03f62bc704fcd1aebffc2389e69674a05033d268dfa87eba3c31828ef70a658c072766afdcdb2435ab451cf47f9a4776d6bb5b15bf871b393fe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/km/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/km/firefox-62.0b3.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "11bdf73fb720d05d6952825c496d77e2ba3bfdaf07250912dcadb79d954f63eafbddedae2eabaa7639c17a6437268c4924e48a07790ef57f1ebe2734723c5d58"; + sha512 = "cc0bf0b7332423df05ffb8f3b22d02765f5a8a78922ee0b6bb832cf7d9117bc8a79e4abdb4b06008736db8eb519fa22eb929aac37df443e788305098cc694418"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/kn/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/kn/firefox-62.0b3.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "9375a349ebefe25a02ea74f7ab14616dbff8542970f09b9bda5df521d7ccc48c6aff48270b6123295c77848c8fd47f3d985bec88a37b2188456fd57d89d2510f"; + sha512 = "4e90b10dfae4126cd4a5f4855118ed011a7cd2f54af02148b46a8001326aa167b508e053a259105513f4341982b163835ac58d5459052f847584aeb2584e97c9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ko/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ko/firefox-62.0b3.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "cc5be1a62f69d92c48edec8e471565001a9a62dd9d4e9d1415e0cf5e4a1853e0a63c161725ff3c21d5fa58fee826bc90442f107012e1da71e1b4b353247edb71"; + sha512 = "2e3645774a2746be83e18169b0b0dddfed5e89f0c7d804f76b1e672f3606ab448359e3086085762a8cbe1ea3431ba73f4ebad94f3819624d8bb3b4e5edff9cfa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/lij/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/lij/firefox-62.0b3.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "5ce170b3e6c28a0d2d2efac7b0db94237ab9f8051c5f799ad7b07fccefcdc6072826781b96c6470f8d1a78b2821338bed58cfd43014ee8e23b7241119451a74f"; + sha512 = "9ca670bf8828933e587c3d1ed2f4bdd730b12afcb757f88f50e55cf79afcd51a9edf67f0d15eb44d8166bf8afde2d54bce1a9a3f7d10596a31f7f73d2b1d4c71"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/lt/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/lt/firefox-62.0b3.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "1dd418f20c4cf2d268c39bc3bb91018a60fac6c284e1967d26eff30728ae706b528a79b47ad91104e8045e428a47df17ecffc6ab91beb1a83bc76465be7bf7ce"; + sha512 = "be2de3a6c0b9510fcb6e1fb09d366019e7a27517bf00c85a33ab35719c091ac821c560828ba6bd4252456dad2cd5d52ffa16131d3c4024c9b66d02584187f6e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/lv/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/lv/firefox-62.0b3.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "227994d4be37899de8ac58019b79dac43191b4e46dcfda40f28691b87e495f42ae83d00586d7c278122e6cda09a18b8b41189ed084927013033070247f24d47f"; + sha512 = "e99ab69dadfec0765ef4c616c12f919fe6fdbc048e96e2b2a67580e5d36123cf3e0dbdb2c45066cb535ca5c1b7b1f151a779ff6b93994026ca88ca558ad6fd71"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/mai/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/mai/firefox-62.0b3.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "2811471b87a09360b70075e4dfab80cf3dc29d298ec50e8a9d516bc7e3dd2af57ad9c23929c2c7eb7253a27f47404a4529aca2af5d837e43807c24f184338e23"; + sha512 = "6d57ef217c9f51725586087c366d52421181f4fd90744f6481d923fc4fdc094dfff5452a39a307d8302eb3cad84293feb1dd5319cf3007dbcf895d0a11219982"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/mk/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/mk/firefox-62.0b3.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "2c48afe3b8decea6832634bb861559e156c1617b64320b57a028c9245b61ec2681e8a9b2ffb24681fc42e34c2b3176d98133e24d6337fc8e450d267646065eb8"; + sha512 = "64d24756a2c0ed9b237d2241150ee0b45618c2f66b13f29d0c28f0a77fd3893c5845ae29d93590f461a9ae67bd18e6e6bc07597a8e55fa1fa98b8ea2551a9048"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ml/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ml/firefox-62.0b3.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "92009904ea47702f0119fb17c7ced25a7b1da937ca9f11e18565e5848469a90eea4260e2cde370fcf8ec1939498cba84d48b4992a70cbc79a5be50212dcc2601"; + sha512 = "88d21818c5f251676f67ae42ee498a55124104bcf9c96b4dc92d490b0d3ad33846edb7fb9011ad53b6b85c7d5a7fc7540124aea3b89d37ffd6e8ab60da638626"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/mr/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/mr/firefox-62.0b3.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "6790c045ed9c73ac0426df2091c14054740eb8386c0f4b6ceebdfb65cf0c4cbb39f31a389da74b3adc922fc6e62ea0eb38482f7800023e7b28a4071d539ab978"; + sha512 = "7b1fc11292246ad1bc87421081c4a2c45e34ea262b3ca2eb77acc619b6290c8ba25db3465f15205496d662a6ed6eb9ce69a46f941eeea4b0009458bb008482ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ms/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ms/firefox-62.0b3.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "8204ebe6cc36f76c1385c73df1c4d4e966caeac6207ddd85cd6f000908677d219e6cf6821df1ae92150695cdf4f2fb811d2f649f21d3aca35349284dcfbf3edc"; + sha512 = "c790907f60b92d67e2a100607e5b1a8de8047385eb777313d0b349bcaa9ead166c2a51295c25269fc9a9928e228b76fc981c58842097c3294fcaa3f3ada870b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/my/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/my/firefox-62.0b3.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "05e4fd1dbc9bcecd1980071cf953c5dad0993e718bea9c01e6e62c8f9b8bc4d8657009da1d99cef75182d15d3d8b90f306bd62e7e641c5a19c873877e713eeeb"; + sha512 = "481f21afd3dcd418749bdf8eee509d35c915003e92c5db39fc41f3fe84ed9f83f3a343eb83c195e5c72f6c48f69fe878798a6b8df80c80f3d6f23811f288bc42"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/nb-NO/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/nb-NO/firefox-62.0b3.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "26f3bb008850b84f77b13ab68759e929eb92a33fa68e226937a6d4a2e17b854d741b9863a37375f97a7d89602437a414c8b4c0f76a4f71bf8c86c9054730948e"; + sha512 = "51f8ea1ec330464d69b805ebc0da9130a0a08063b0c535d6da4b0ad396f6073947d0bb28bfe19fd07d0054a32afb96d43e9a3a83cc65356d921295cc51186c73"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ne-NP/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ne-NP/firefox-62.0b3.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "b1f09b3976e5db99d55836f664469ab0d89849130b5ae1c73d9d772ead471f6c9ad96ccabe440f1479ebe60c0fb4ac52bb365e5d57f0193086bdd03fda2937a1"; + sha512 = "57e69cb671901ca78dac898c4c304bbcd19f1c54d63be2dcaeaf921ea26d6b4adfc6ffe415547fa5b2b871c6356e65ca21b23c5e7160fbd81885d17e9ffca682"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/nl/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/nl/firefox-62.0b3.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "b4f90d601cf101ce6b99371100a92322f19448d8fb208d415be12f7f80d30547bc962b30a455cc1c5efa6eb2e69985e194a83a98a7bd7e69bdcdde126169c142"; + sha512 = "8dde66286a7fbc6eab4b7ad6573aa4602172ae7b96cbd732cf4886512f1cc085a9659a3943704eaeaf99b8a3005400e3d3cbcdf9452768575910cfec16756f9d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/nn-NO/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/nn-NO/firefox-62.0b3.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "3fec29703a1b76817616428706c42dd240b05a4c0729c4aafb2bcee1942144234ab3b4e717006b3613b14df831fd7dd9edf318d46283c3260243e42eced1e63e"; + sha512 = "97f460ce8d17b03f24f13bdfe6119f08c727523900eec0549095dc6c97cfacf4e9081447cc8984d33050196453a22d47dbb7bf205efe595eeae794b5c78088cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/oc/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/oc/firefox-62.0b3.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "4e60f8a294d4da610d8ba52bf1e2cd0d4e76ba2574afa0cecf8b3f657015868b53e15a0462efd571975800055f91b8f70c39ad36a17a37857344ca14b23568bb"; + sha512 = "09e0e00dc7c06445efe7d12c46b77ccfd749726a9b7e9f291dd79025b14f07540b741c949b64d9eea27fd6549a3ed0a3a4da6034b25e455bc124c44e5238a6bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/or/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/or/firefox-62.0b3.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "1d309ccb6e0f53f8a8dc85c1c2c691f8728be063875a169560cecfb3feb11c4e5a0a075602e0a2aa97e939df98d5538d96fd0cd0736370c841cbbdb2b930ab30"; + sha512 = "ca47ca122004c43b9ad3e46a6743b3b16595786894fdf9e90ec82196b1aa2a4befe6e75599faf2e12754d301f74fefe318afc9ff994d27e696ef94ef2af0abc9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/pa-IN/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/pa-IN/firefox-62.0b3.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "56fb76551693f0c739bf0dd42ed10c5cb4ef8be33e4f229e6ba42b83e2111bfa420666327176219f45177db7cb216007296c3abbd000c4426cdb8e2b4107dfa7"; + sha512 = "a173b1561fa796e914200b8ac027a8fe9e57de7806ce72ca7c6126c1fc3cee2cad5694ba34c2e2dfa8748378192b15721f14c01b10344eaf073fc1efe51d0005"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/pl/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/pl/firefox-62.0b3.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "ea8a5f453e78e3df32e56991a2bd940b1a104ef857af83552c5a7b7d85223a3dadb7c2b10d08903c515de1f11c207108249d1a4d868ea2174bd8cc4acbbdb76a"; + sha512 = "935dbcf9df73b7f2a689e81a7726c4009f3284ece8ba4f9a5c19326842f8dbe262ce1d68d025c79d09a2317a0260344ce110f2a8470dbd41a87aa2deb20285b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/pt-BR/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/pt-BR/firefox-62.0b3.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "97d564ca87b0d1978c1aa96616714d208797bdac9b608500df3a3658a3724248f731265c3ecbc1adcf518a47577ff6e9cd150a96f75307a578e9e37b8ca4cc63"; + sha512 = "8b783f8b348b021afd50447b96d931ea3e59b607ca0e6127e680af13959c2396b952f9d9395a21515b27d9bf0718a756c6276e54fea169a58783f706316848e0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/pt-PT/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/pt-PT/firefox-62.0b3.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "cff3873a8e66f03b9bde42ed27361761a04455c755f2f4b4780e92d0819aa08c851bcffbce937584164eed68bddf560c21e4d273147e3e2db52fcc376f12f5fb"; + sha512 = "2f0b3fcba8ed0b14b6270d4fe3dfcb1a4ad273e3723191bf2b041fca7776e362601a2e06beb6a544957fc66208072e4106d33bf8b52a2be0610f4db21c651c93"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/rm/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/rm/firefox-62.0b3.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "4e46719324957027c1659e13da8d2c306ce89c85db2698a8af00142ffeaedda648639f562035ee3c91b16cdef44834a059b76b0a7ff8645026fccc832aa5209d"; + sha512 = "cb1b633c75cb08d1a84edfd315e02f3d3056f70a3eb382d1ab31dc317cd37522c7719a23eb1ab5f89c11711e4ce901e23b65f7f9182c88008ac964571c844a27"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ro/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ro/firefox-62.0b3.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "99f21fab8546dec02584972d1917a7b72fae6eab929a27e2823ed3f4f53865703acfdca5ca81443b9a7417635a2d7a0e49ae0b24248ba4781330377255a0354c"; + sha512 = "2d56b60d2843bf0a526fe1ab6edae613fe78ecec4acc4a603ce107d2a67b286d8e6098dfd1fadccb77335977a0401ca73527ff8414a6537edcd001ff288bad77"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ru/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ru/firefox-62.0b3.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "207b795615e39357b9349d5985519328ebb493d4bc29b43abf1f7003bfe75fe0fcb21d3a8553083cddff049b5d7d46b15428c58d862c7cbb7096b162bd1c5df2"; + sha512 = "32cbeb54cd3b9c6edd56d05988d1fee6617b2aa8f0166f4acb07cd701aa1cdb03718edbb6fca776ba13103a377a31cc65e5800a49d1466500afc6cd8a92baf8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/si/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/si/firefox-62.0b3.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "e96d47336868e7df0ba39e8036bae96b8883b6f4ddf90b3fa6353e46bb61580efd46b97ea3bdde8f3af53dedd072abdacf72fba747b98ebe46c6955be6910165"; + sha512 = "06243a2358db5b9fa50a56e6302878a1cefc4fff42bfda6bcee57a8996314b101a61e544413c1cfc3e72555e88b0e946c5691956c33c04e44fdb199bbd30844f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/sk/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/sk/firefox-62.0b3.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "f1f3785f5ea509bdfa05a5dfbf41689d029d06af3bae1e143311397158bb37d6f232f06c82900a853470d2411f47d974fdef318f9082c46aa62299afbfbbb5c7"; + sha512 = "642c96e2dfb5f809504c27754dacc7dc604d724e8d783373b5c3d37c8fb5d2c159f4f7536353859d3263ce8648c53740eaf7ec7448c165718bf9f0d53870df06"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/sl/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/sl/firefox-62.0b3.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "ea0d91574603c06ce9f2fadda962ddbf1ab45f11618652d6c1f540119dcf41b904e2ca809bba8537e380525c2698eabe7be559539bf650b792baeebb118f72e8"; + sha512 = "4a803d3a1ad2720e4af3aaf1540ea56683a4d22c76beedb0b6928d7c5a89fa5bd36233a675fb85ad2d7d6f5c1c4cd7ab5e5ce77c3f49ca71a195cb93fbe37d1f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/son/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/son/firefox-62.0b3.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "338391b220307b5e13822c6bc6ebc46da07530a6bab71305b3aff7e3d938494db0877d19b9a2dbee6706798402d93ba83db0c9c63061b063d15b25ebe2013df6"; + sha512 = "16f89877424340062914fcdb4be8e4d88bb0b6e04104069fc74b50a54c8610b4f766cc4623b5e39c794d2974144cad610900516054af51cd963529fa4d6d37d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/sq/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/sq/firefox-62.0b3.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "74801d764972326f1c96197ab2f4e8a20b481a33638c9b54f56f6d627b8610f7d22fb9ad309d04e84b9f9a931a2a40a0afe473136ca1d0de6c0f809169cdbe96"; + sha512 = "10c97decc9c113535042386b005687f32c16a6bfaa8930f23dd3787e7753d2c41d94e6dd5caef6183f0d3f72156bc5bbbf72389186b50a8a7376e5abda333132"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/sr/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/sr/firefox-62.0b3.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "17fcab8886c7d3cae3ce36af19ad7e3066ac45dc4f91b57cca7936cbd34fed1e9c0250d220cf02804298ad07151e3e247eafb398ca6d4a18076f36e4de431db4"; + sha512 = "8d34baaf402bfdb3bb0c3c5104a9080da4d5eededb6d55b490a5a7c62a095f68e2e0534691bea826281abb91e7f28f3fd4a22076aec0e1600abd31c94c937f10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/sv-SE/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/sv-SE/firefox-62.0b3.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "8caf5d927039be97bbd67183f9e92828732e6d9cd5abac4ba0b29de8097402f0080c827b73ae244bbd1e3a99532c4e9f3e961d6a172426d342f9c9a05133b459"; + sha512 = "d4317109b5309eb355f5bdab8edb0259840b0ff940f57295851491d2dc0d8ef5488626bb952fda4055e2459ef502c57a836cce688a99aa88a570a388658b1ff3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ta/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ta/firefox-62.0b3.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "53311054be09b410e9a5c4e319e35239b70ef5f08a7f5f127f437f627dbafd5938d7f41410dc0179768c167e4f4a84ad78b6d9d3b2b2e5cd40692e1c162195a1"; + sha512 = "6433f05c761095a3efc838eee6d46f8ef2337d6fd655c79dcd8dc95572875bc13d393ce98757c70c895161becbac3d3e08458ff24a604fc8c389405cee7fffa1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/te/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/te/firefox-62.0b3.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "3cf97c0a96806671d4c78af3a928a373ae4883c1c49bdb59730b74bd5f19cfcbaceec81ec48a918254dd35263b8a58c3e1b3ed2d443a9f58e3a6aa7c83934637"; + sha512 = "07c2413be438177e6557b275a308ba5198b3332a128822a0ddf5c51dd13b2c2b50249990b2d541b58180d6bce4c4b7c42b984cef6f8ef9e4f62f5f0307261484"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/th/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/th/firefox-62.0b3.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "0baa020a46e27660644b2baeb299c466ff77d65fdab54001060ebe4682e6959128d7aa8c1b008821b777fdbbd20b36f40bfe8c099072df3bd0a0b4884c484ec1"; + sha512 = "fd82735960e4ea6db66928a022796606bfeb9ca00e889c6140d224d7a6382f1f0ba55f3cf171203a110d5429fc38cd84353296fee950857dfa0e3ea5fec2f22a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/tr/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/tr/firefox-62.0b3.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "36a7668168dea9a0995a416d1c0612930c4f3d2b66622f04b89e22c438d0e95adea57de6ae766d1c22dd81fe7d4cccda9c7e6abd77160a36edc2d505451aa139"; + sha512 = "16b41ff0ac170a58f2dd8eb7adf0a7e1ed68fe88bce71ca594daa26e1881358697984a46dc74b75d5d4d554be28591ef570e9da672390eab57c97a9eecd36506"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/uk/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/uk/firefox-62.0b3.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "48086676df822883aa7e193af088d15988ffd5034eb526a4656ab02477dd1832d3de3d12680d2bd7b25f1bd771a0c87c10aae421f9020f09c4fcf527267f538c"; + sha512 = "fd8c5c8aee503dae022dd76a6e4af91c15796219c05a8350458ece2f6ea0bcbf15a461a5be035df6880e1d3aa287e447911023ecdf36a59451e44bc2cc819063"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/ur/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/ur/firefox-62.0b3.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "a7e2024b5721e70c0118f13e4cbb45108054fa3b2f7702b7e219287d0a380f6e769d4e6d1a65c766653e7014c223edc607d5962cc62e6a0a18559cddfc7247fc"; + sha512 = "12db58871502288ffdad76881f4d4b7c7922f22f4317c1286984035b6ddbe9155e3f0bac2f4645c3bb5878b491d326af68234ff69d046435a8ed1b5f2bcc2618"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/uz/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/uz/firefox-62.0b3.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "f88b75d07f5ceed0fd0dcdca03f30ef866c367a5656f1cba5a6bdcb8543bd65791c51e1763a333ced20b4b0b10b292b2d4e04f81b8dfab68607f5e9e97d5e53e"; + sha512 = "e3d5c3df93ecb48e685162a751f9eb225c063fd2b5a8676f7956cc1e3a651529dae38693304320187ef8f0eeb92c2fbe0c3dd7541443800d235ae0059562c0aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/vi/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/vi/firefox-62.0b3.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "15dbd0458d883e0ebfbecae7d6d506a1ec4695737373deb881f3a10895f4777927ee1f6454507bf995db9bbbfb5eafe71aa7883939e1ad1dde28cfb8cecf9103"; + sha512 = "6e4eb1cb75f36c600bb9211a5560578441c0bb4ff5c58e75d07025ec98843e74e01299ea1686f45b461aae664dca68fe9c2f6352b389cb8229ac4c1578a4e494"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/xh/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/xh/firefox-62.0b3.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "c6f9a216713fe8cea1231cd2caaf32bed366c961f8c03eed4d80689a00b28e6a61c945e7bc4458a30a438c797f6a576eafae5536819fa98b70e0422a081db4dd"; + sha512 = "695ec0a3141c102270b09ffe55045b539981d68d35b13cb948570669edb86ee7dcb34e3d246800fc155d0126acadec73d97bab0eb5f7e63bca82270cdd3659cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/zh-CN/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/zh-CN/firefox-62.0b3.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "59fefb1f8a2218f9ff1022a37b15f9adaae32031a2869e9aef0bb48a1dd44133b812573dd0cf63edc68abac4c5bcd30be9ff44d8ee7c49348d969cf456cffdea"; + sha512 = "a94b0b7e67ffe5e3c961df0b6ed802ea9c20a6054236b5c17b638a1526bbe6f65392ec9eed2de6fc64dc9d8904e72da98f7262812273ad977694eaf53609295c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-x86_64/zh-TW/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-x86_64/zh-TW/firefox-62.0b3.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "8efd164392d3309be8fbb7fa2718f11fe877d78070818c0a443b89a0f9bc3ef3689fdca2c7b02bf69783542923fff9c482b6d2916a90b40cb68b3951204c8a65"; + sha512 = "ec12bbb68350a10ab67da8160be765a5893a497a373267efc992bdb0429eb17bed9526247a313ff72aac4b491f42fdf618d4b03229d5f7b8aec7e680b60acd03"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ach/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ach/firefox-62.0b3.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "629a3a267deb22985d2ac17645b004b6a8732c694e8d5d42d533ced212df0b36e74ed31a2870e11a841193ffee3d9c7d56f092c623ab3328f9e683a0a2c39e39"; + sha512 = "377a6ec42ee65a5002d6abe5f2c6f949f64914ef28f86c6ab4ce7218fbc689018f2e20c17660b340a34e047227a48cb0f9ee566ba5f390febfae4eb0f7675d6c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/af/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/af/firefox-62.0b3.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "fa0cb4898b4b09e592f3326517459a356e41edd53cc28e5615a7883311b43ae728f9c80f7c0c3e114186aa8ab9465e21af38e3a75215e184e30e2a31014de1fc"; + sha512 = "fd4558780ab15eac16d81e35b8ce8919c5968296d3c407f5d937dfecf72d1b63d53548f1775999a01792cabbc0118ad8c118c03f9b82e51abf1a6fa0ecc3220c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/an/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/an/firefox-62.0b3.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "ea862964df4a53e2a57b858f8b6a6d26743de5a49a68a6807cc86ac3eb68330eba2e71c193b8bf3fa70a267258825db588c4da43b2c0f4b0fb002d4d9f5b21e3"; + sha512 = "3dca1d995e534f9f037e13809d65fa3a59f3d97ceae7e3820685886130350ce3e1da9f6cf8b75dd213f8c1021cde55c5f215886f2e045ab7f60d1910c60ad4de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ar/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ar/firefox-62.0b3.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "79956425e3086e74fa4e693aef7f7a8980b5ff8d2660f98d9f1738c538651fac13f1decf76b124c5a8e6b61f8b1e7b9a11bcc5a451b832f38449a00485e82577"; + sha512 = "5e3cba2868e67303d6cd340fa6540aa0a892ac0d0a81fef8d2c17586565a68974cc88c92cf98e2dbe79882c5897ba9229d0bcf49a883f64b7c0697cc2fdfba7e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/as/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/as/firefox-62.0b3.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "efd784691330dfc8601e145cc8b537d26505f533e453f771629414adcd4da1f4c047811acd5e628dc40c1d4f32d6db38ce92b0fe73730e131a87ffabe15b49f4"; + sha512 = "dfb1e492f247efbc86a326e4ec3d5524a0b9f16991f80b9d10d7da2929b252532b96a29ee32ad38bd151c2260eb8f3afe924c4c897b3171606db42046fc70641"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ast/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ast/firefox-62.0b3.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "b588d2b98f573b578986f1b5639e4b8e5cd6f38427c8bdb5a31377148772d2e0c843c2e89765b9f3d75e3efcd1f228cc84f47da5df67cb71061058472d3d3b5c"; + sha512 = "bd3e42054d2e52eaa683eebd163656d69d59df1b479341a5236dcf46ca9195582ef5e980d5bb44df2503010a7f406b1fd3678733754aa4cf2405995a62c93ae8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/az/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/az/firefox-62.0b3.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "3aa4592c594d548d779a2282de16672ce6a836b49e7dcddee75e1d528ed7c9b687f9ff380e7a3f0f1dd94c9c23ed8889eafdad1bf79404f54b5b6e73d219e922"; + sha512 = "4d159eb67bf68275f000af3027dfd6059c532254ed2be98297b0cf8bc4c622b902d8bd17c00498600892f431d87dccaa6177cb8991ac37623422e197c5b3130a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/be/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/be/firefox-62.0b3.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "b692bae3de9a79bebd51a700174030dd7c7b8e4d6de34b9d7ad6224dfc476226d7eab1149202a4337bc5661fcf8f23ae3e76cf07a5a182c9e066dfe8cbf13889"; + sha512 = "bff2e6c483a3bba92d591e57d4f3c7c144ef1d43ef8d86d64beb9e0970ac585b04175135228aa43eeca1d518bc396c0ebbb7632e1d91909e92239269d1484393"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/bg/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/bg/firefox-62.0b3.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "541e62c2dafdb1176a15034dda155be75a5f96278e6052266529078332d9e89c95245c9af8880ee033d4a5d40a6a1ccfbc3ed0f8c1c1e574927841d3e2fdc8e6"; + sha512 = "a07453ebbb39d427df3fcfe83280dd53519eb4a3b9aefc975098741d803bad430d84de733ef67b7f50738ed056c8db9c0867f9efa245a15c28955ac88fadc180"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/bn-BD/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/bn-BD/firefox-62.0b3.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "ee598835112d2369f496559afab22ee91599bfac35e26bf177bf7d645c33acdfa5f0f2c4defde697e36709b8b65d512226d18046b10536b73852a7e6279aa8a7"; + sha512 = "4c5c0d9bc4d9169d0d87a809bfb7740fec274c0f05cc1927e7c93058b948dccf66b0d3e35d111d1bab9c03496f6c78a8619a2edced3999c13f06e9522feddf02"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/bn-IN/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/bn-IN/firefox-62.0b3.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "5c4141ad1f91755d02e06cb0c1c9f39b49aefc6b43f35c2bd4eca92ac855dd316b290f799065de995a73e2415e2a2c3c78e82e5aee44f50e02b3f44b49017136"; + sha512 = "e6e2aa7643901ecd94149d2ac90f6d190edddae8f6692deecad4c5b619e75538765840c968f78ebefad73ccb85e05d429e6c20d040bbaaaff07513f49ba7fa37"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/br/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/br/firefox-62.0b3.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "7a58c8fbf96984fb0d77700918990f083993498c284a4e38a2b24832d6cecbd960b71131a3e0da3410a9be9199ac63f939a278249fb38143e2a5eb1cec41378e"; + sha512 = "6802ba52185ff5145f0d4dd6f33606c3a66796b24b4a43d8c3ce1967ddc916bdea935eee11453eb0e84d4a557784cdb2511c52ad9ee52fca5e9df7f6e70d144e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/bs/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/bs/firefox-62.0b3.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "649a526b35c4b0b4dff5fe8fd4928fedfe63e2efde8d97dc1672ef469caa068bcde72f9a176f8768d240739bce37b1d26264f2115bda6d7f95c9b37e0aa184a4"; + sha512 = "16af58f6127df1b72bd672d1942e66adf6e5fdcae8a43e18cd3fdaee592468f492668bf3272e15d440a123b97d15e913a668af3f069615a295e9de24b2b1ba8c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ca/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ca/firefox-62.0b3.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "36ae7093d941e0523107593d466de2c42c2b8cb293ec491ec75e824cc2ea34d579b57f06e4c0bd563ad5ac44484fb0ddb2679aaa195aa1e0d6f823042b502fa7"; + sha512 = "9bfbe17e3bdf5bdc72a346c909c1e8c97a3158407b1bf937fa1b6b86fba831607401b1cee55dcd5a0b3553849f2f1cef8a5adcc563c44e1a88dd1101dc7f8700"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/cak/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/cak/firefox-62.0b3.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "d81dc145819bb8211559f42958434b2fefd9891144e4d4024e7196be70c549483f8f25e34863643095dbc65a182ccbd1cfa7b1fdd46cb0a7ae5dcee1a3d4c6a1"; + sha512 = "55f887c4dd9d8c9251982a1274ff0986b3634fea2b974cc0edfa42a1777d75645314e22d5c1583990c5dc3448cc6ebb6b6ada590a9fb8673cfa4949b19c970a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/cs/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/cs/firefox-62.0b3.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "75c7ccaffaa13d563a79c71dd21bb262ea128e8ac12d81db18255d2073910c78e264a77f3e7e9d022d316293bec91d4209738b805a49b421f88ecc992049fbf3"; + sha512 = "0d242c4d5ceb72d21884589ba6562617000206faafc4a55fa984ab083e35f4bec820e5d75ff7a152b0ffbd486798de18f7a17cc6cde9e5fdc52f3b2d1ad0e076"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/cy/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/cy/firefox-62.0b3.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "818f430ba479e5287df5833c4222b65b7fe733805a1e55d664829032e8933419012ea4dd01e3c6ba3f02fec7c954dd4d999cf55b49464c040d0649d7a81ff455"; + sha512 = "0c8202cd52179cb76e7037a6d3e19bc362ddc66742bee71b1df8ae01a016437ac10e7723ce43decf28d5b31020c625021c62bcd9786754296303ec11960ebe18"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/da/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/da/firefox-62.0b3.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "a9bb147b35ba5da74dfa2dce3c8422d8d6b224aed390b1f2438a3a523b3ab6c182db6a2a15ca39db8a3e730e4104b7c5a8043557bc9d91d3c6d116bd8411690a"; + sha512 = "92017b5cc8fc9c7d2973cc40c870f3022aa6f0a643b41425f436c458e19639c1e46f068028eac9956ecd33db5f73ffcccd208a9d694b3d749ce69b2decf7ba32"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/de/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/de/firefox-62.0b3.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "1976bb7b371fe9e9da812e76fdadcc6d1cf95f303cfe7f6f72fc1b98f2ddac3af1bf0665d74c22f5a2cc41046b686cd59819b2bba923d5c02ed956577cc80682"; + sha512 = "c454fdc29eb41afda1b9ff074d41b471fdf31cf9f75e4dc45a8e5f94d4d526f928d88918dfe9617f95ed755cd22de8dd4c7fb5b64f7566e3df70beca6795c897"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/dsb/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/dsb/firefox-62.0b3.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "6be5e34ef9e5a28d0a92c5e7c638c0e902b59a596b03ce03af2f86d88e4567f01a25005284af49cf1143bf1b3e3cec2480dd04b0ac0cbbec7b85e8876308a02e"; + sha512 = "e80c89860ad364d66913d1c67d05057bf4fac56b17339833bacdeebf0e55ee20dda723ae404364fb6d4bb58728cb4cd13e7660f11fd5cb4c29284e5d67d27a50"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/el/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/el/firefox-62.0b3.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "a119500ce6aa1f2c26041aec8609b88cdb1e87eb3cd8f56148a0894fc273f3899a3923b765c8b46e25010893a55acddc24b96c15bcef2553702fdc0d4bbe05ad"; + sha512 = "faff2b3992f2ec2c312a68e1d6562a3d5d72b9cb29bdb4a0503ad1b08a9abcfa5f934b2ffc5cb85a9dc5dbd74d772b5e1d239216510c5825706be406380369b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/en-CA/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/en-CA/firefox-62.0b3.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "83bd5fd70859ac58f142f837ee96e9241ef7ef58f603bc88b82b5272d296ebb4eed8d8a84a64f105e99bc97ae739e00591f45b46bdc9d369e8c613d196e864eb"; + sha512 = "24643937312c2500dd9f7cae8dce49564e5e891b85b97be408793d7d0df9797fb43a0e03e685b8e3d84011d87da46b5036887d66d69ed4b9301b89454b6cfa47"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/en-GB/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/en-GB/firefox-62.0b3.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "533a54c96f7ffec3978cf02c3bef945b4eed1bb81f4c5831b8b85901f84d262869e184620e470ff41afdef75dd3f3340ee904632304dba285ba0d4c13a6e3ecc"; + sha512 = "66f84337f0bd9f25069cd086d5f963b56bf372e3fec1d09e4bc6f39a94b6b177dffbd95c829eb0e78914cc915b55bfe7b5e25f14cd594339c7ce270ac77a2667"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/en-US/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/en-US/firefox-62.0b3.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "294fb79215d8f2d0fd2a5bc721acdb3c3062554e3172161ca71e5a64534ff01ca61c637d2dff4a5396c64cc88f40b493e96f07441aa6aa297d14ea9c5be88f29"; + sha512 = "a5ddbe8f111ba737ab0f123b888d0638bd299a715b231ccb40c2f92b1abdf859d8e077fc80184becfe675e4e35c88dcdd720b85f57c4d4ccd814b355349e1a51"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/en-ZA/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/en-ZA/firefox-62.0b3.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "1b8ff2d6c331e1e5888c50aff0529487c918114de850d8d8d60e3dbbc45b3669b56272b3163d7ac15a9c56a939935358ebb7761f21184513bd3dac4dd3a7113c"; + sha512 = "d6f01366d3fbc8650576f9ffef64c23672b638003e5da7dbf66a2c19ee2b3486f0e4dcf724cb95daf2749dd4b2875f2037d8211ecbe3a617ce4afceeeaecaf1f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/eo/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/eo/firefox-62.0b3.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "0ebcf307f388ee3a6f58a9383207f3235d29fa240a797af4d7fe6d94e552203c1d46a1a94b4dd5d30d98d12ffe4a33b322947c684619459e86e0d4af5952ff8e"; + sha512 = "aa1e0d8b9f25893ecf6397fb017e32aa44bf06d57b13366528c5a59ad6f5b88dae0dd06784a133fc67cb9acdfeda57f56147a3970911a870b6773f8c1773fcf0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/es-AR/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/es-AR/firefox-62.0b3.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "24f2b7beb26ee6bde3c47a71ef5ca547c276217044e05c8f13a2be35ad96f8d387cdcaf0a8401fe348034f322ef4392a8f77711b0d43dc02eb74cce9be262e20"; + sha512 = "59517a73c001c4d72b33f191cac521c7f4982b44c942185758ecc2a451fb41811198c771661966c550ea27d747ef60bc7589209f9680016f9f2296696b52a649"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/es-CL/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/es-CL/firefox-62.0b3.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "3d33ee9df1712971a1dd4bde372e36b15e81b2ca841fc3c2096c3ba45119923ae3f1bfc37b9911ca751a161b90393722b8af0ab196ab92607678316d349e3acb"; + sha512 = "03b89336a014fb2b8f10227f210b33a4250eaa86604e65cd4ded3407d8b960ac1d2f67732fbd5ea7d8b0fcb25eb17f431ca69fb1820cec234deb9e68fc2664c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/es-ES/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/es-ES/firefox-62.0b3.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "206eefa522da06712c655955420bf7aec89ad0174ecefe132741e0d84cffccd4bdb72f448cfcc5c47e1100ca9c532cead8b50627cf18575e53e2c383bfa23226"; + sha512 = "0e023192c1b88270a6a1f6d7bad506233b47461f669949912b84d502fb404db6d797b51eb35ee898f10ddcee6d7e2ec98c46fc1c65d7a79b6cee1b47056a5b3a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/es-MX/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/es-MX/firefox-62.0b3.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "1e4c3a10e7d2f34aaa1164c7e92d79d3f21928d5d1d800f9cf329b0016d7a2468e76c37eb2038363863d8ffa1d2da0248264d1dc7dbf21ac3c41d03b793ef4e5"; + sha512 = "4ccc60cdacd9b5144c56cdbbc8d51c41822c5a6ca43713080a62c46924627ef98dbb259c22842aaa6255b45bc95b9a72c169352e505a353be95886036b122bde"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/et/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/et/firefox-62.0b3.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "770fc7f02278d0e7fa9d3d18bd943c6d1bae90eb8b4ffd1c2d9087c49e6e9a990a361d168709811aa7de5c34f5923efa7d1e44d70a66c2e0b126e4776f10a0b0"; + sha512 = "3472a528bcdaa138dd68a44e872da9f17b3e3dd0cf99e1bd9cf99057fa0a71332dad99df2eedae82f015e3306531ed7575d579e94391b0d1262604f9294c6f78"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/eu/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/eu/firefox-62.0b3.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "760c630e156d3ee0dd5a9f836326f47a9adf88dcbab14eea48520bdc656cfe4d5722655cf2a64e4235a2407453e2f3a40e57a05d53773e1827083ef9ee5224cd"; + sha512 = "2cc55b33e020985729d144357329429ba803d3380383051728e42824bbcca2da27458f42a6d4cd19015e7b14bb175ef104c02a7416fff69cdf425699246370b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/fa/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/fa/firefox-62.0b3.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "55bc4f4cd68a9cadc0dc225e017f29d1b631a31d9b62e2731a199455e3fcbaa7a67ad41a40d8eff7848a69c659dc8226656ee848328924ab214ce360456f42c0"; + sha512 = "8874887a56222ba65fc675cc6c98b99ca5934121b3ab358fa1bd9bf284f8e34dae3d705010dab891d7f4896be0526f5c050cba688c06b55e90ee8ae30ff5813c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ff/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ff/firefox-62.0b3.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "fda4adbd6b98533d348368095fcfd9e2a268e0824387755448a737c17a8b7b1d82a9de4c1081756eddbb9ac6bb33ed2a637f826217c0fda3ae6c61d88800e963"; + sha512 = "1c58c56d95834bcb6dd008dba4454ca4f21f63698bfc538d4e4f1565a09cb12735fb44067173637baab3ef530b8eddf28a0aa69065a2b2049b0dbee8f49483a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/fi/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/fi/firefox-62.0b3.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "c4a93e9769ca4a88687ff5d050d425345aea97d9d15cab4ab89b4ee9263df6ed7c30ffaac17434e35c6b3574f71a24ebe1c3c7aec53d81870caf4884696aa878"; + sha512 = "3b64e794db0017d38f15d348181ef8a93d94f88d8ef69b5ed2171af7f1ebf529835783924286d55acae1eeec944bb5f45dfa2c59639ac258f1dfd56eb7120710"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/fr/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/fr/firefox-62.0b3.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "88df0803f1a18ef0da2f5b2480c6ae039b3f079eb2894db760170a3a535513e847aa92a70f8f42925ea5732a91235b0a3ccfeb7cf055406bafc13c308e45887b"; + sha512 = "d4022a1d25798844582c39f71311ea8c416dab9c2554a510a1ee2171acdf26c30bc85bfcddde07b29aec5ba0a30f1c3f957e2cb97f9c4dbdd9e539685703ca49"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/fy-NL/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/fy-NL/firefox-62.0b3.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "445b24fa7a74e60e97bc870cdd94ea2f9ae120d6a788bd4b44c2e496f62395f89e7112c0b309ef27d66d76da1b3e22b72c780c189275ec84a511c7d758c81bd4"; + sha512 = "d684855eb69e1574311493d9b86be37486e4391b48b377019b53fbc119cc10ff5364a0b004f9fa64575b84404b0a49c75780bdfe29d5a06c37d217558e025ccb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ga-IE/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ga-IE/firefox-62.0b3.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "6ea507929c6d886aa7f9c55b097f732bbc38dae75cea14943d1db43f11aa5501e0b99821ee33816cd72e8ee9bf138071fd75f7eab400e5ac04f424a591f3cd52"; + sha512 = "7874e6b777a01b696310ea96bb6ce28355f9aab492d05a0529ac9cf33c7ed76d896aa441a457ec304ed8bbcd6346a95553c91399f62938c19efeeeb5c3c08c27"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/gd/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/gd/firefox-62.0b3.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "82b4a68795af8fb47c024a9675c75d4ac5d4e6f09217493ac2dae1fc0f4fd2bd9f5ffdf89f5338c943d26e250ad546203a0604427d0d614c04f1cf191b1c4c10"; + sha512 = "a570db98e06387e46ec29f14ee2048c9b7c8e4406f8f216748635ec471d2073a843039e2d6de8aad1773ec82e97a817b005b9b4f2200922d934aaad4ed950a65"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/gl/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/gl/firefox-62.0b3.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "231777e852a8f09a99aadabae38a16de21939bd492ce239c6e112e148b84c9742eb0dfaa12354aed277322d763c1d01d5f946477d9608eb8dc8fc6942f6bda4f"; + sha512 = "959e9863455c7802bd6720dcc8203b426e00bc17038785c22a00ed7f8f6c6942fd30548fe607bab66c7e234ffa4b94408a4bc0591b78674e097f9be26d465967"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/gn/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/gn/firefox-62.0b3.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "9a01dc496021e351bfc1169438ea23ab5e01c5e29df95b12c2b0085403baf076e29ede5afc906311a866069695cafb5ad911098a1826bd1078cbd1ccba048fd7"; + sha512 = "cc8f2acbd0830430192c14a994eb0a47a6f0366e2bedab3fc43e2590e208440afecdda67e0571779b7003d2f800f1705d3a2851fe1f5c9d0b08eb855b09d5154"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/gu-IN/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/gu-IN/firefox-62.0b3.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "e453eba04e32a850db6884c65616d0c33f5926b6c5f8e791dccfed565ba15a6d07878ca5bf91e4d7e329233e74ec7f9bec37052e5d57c37b257f47092634419c"; + sha512 = "eff0f28add6f701db024d6319c11a95d6d82437cd42a2b1fb608325d6198301af361cd02c77b807f894adca8e3c418ab2bd6473b2a9be7a6a038d147655f3d00"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/he/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/he/firefox-62.0b3.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "12c9ca53789b1a72dcfc311017fc3e4ca286da7595f0198da02a6217b0a4ae1c1e517822cacd7e63df7481771141cb505421e65fc872a0665578bc5b8bec5bc3"; + sha512 = "6191a8070cf7327e2cecc4433744f43a173daaa882a0fc2b440d9239af8e2e0a579b9c3b6da608fa0951000f527adf408e43e529a09fea4f232adf44f1fd1afb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/hi-IN/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/hi-IN/firefox-62.0b3.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "da90ba70059980d76b342be7561b81fc1f1d95c04995f8a72827ba7009b4652b057b2dce1f359cb6ef5eab2ca67dbe2bbb8cc9da3df436cf68f9073412aedb44"; + sha512 = "3ef5346c74bcb81345aebb4be162f046392d84792a5024ce438a460d8fd147082a46e38e97b24c99567d880ebe4f4e8b84c9a83186bcc9f36333aa2ee26b1192"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/hr/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/hr/firefox-62.0b3.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "cb7295b08bc58e989067f65143644b5716689a4d5878e24880fa54f77b455ae9af5de310ca087ce78d7028eb8da856a25f87d162e7f0f061b6f2d061cee2e91e"; + sha512 = "3550f03d1bcf399664d6a53fb932c5d1eb7e6de9345055071f14e65c7672f767d58983bcb0b95c77ba02a45d734f3d6bf65b720edfa6f441146765ebdebc6201"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/hsb/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/hsb/firefox-62.0b3.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "36cb530230d00c7b0b78072a2c9017431d93296a291ad6436088564e099298848639e86bcac3062d056dac9d7b985b4717a167b037b17e925fc269430b1bfe95"; + sha512 = "2048278924a2d413c1807a15e937933cd76a02b8daf56ed44b89ec789cfab5d0ac4d666b06ba282350b17f96ff72755b4e52f49bc4fdb50ece4ff78ddc6c8833"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/hu/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/hu/firefox-62.0b3.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "b91a1efb194ec8cfb8ba9be21cad49eeb75c273b3af5c78b887ca44211ce5a678aa1b307b4c15fd4c5e1e24ccc4b5c1d1e758bebbc20d4302d3ba06c2da39146"; + sha512 = "5ed4bf6277af178fb7c92c6b1c915896c02b35581506da5ef5048289199b501e690f44b5f82f857d8ab4a9ce737d36fcf761437f80f1a6933a934fa746c5a5ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/hy-AM/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/hy-AM/firefox-62.0b3.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "5c52fec228d283146654741b634906d5ea5a172f99e5bbcf9233a330473df4123192ffb44318c3399d35000b8533b9542d5567df24558b2d312b0e9565a961d7"; + sha512 = "97170265155cd43aecae59534d8876748a64ee4ac336037f60202925dc8ed84c3b1d0dd49bb278d4f3f20e1e1b87158270d710346ed16d2839a9d32fd6f0b064"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ia/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ia/firefox-62.0b3.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "05ec2b4348a2bcd25d1c0110a6e86cfebd0bb1c62c8d2b931ae8c3fd9ffcf39a41cbd3be52b3522d62c5f9bffd41f3a47ac6fe6c2602a784aa184146aa698232"; + sha512 = "e0b22f7c2687368f8255c050750c017edfea66cfdef8ef0f37d0d17a4f700498ddb6d567cee655292cff74be204023927f85c5a709ae0f32bb919d751d258538"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/id/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/id/firefox-62.0b3.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "ba2931615fc7468acf361a722df435f6eb6e9002c57c1cb30439343b16b166fd78e17571e250c4aa8f2cc803e34131fa61afd582b7d78f59ef858ef3ac8c10fe"; + sha512 = "b430ee23b6a5b26b218e8d23622778b0bcc70d562188018900bdd14cb66f25114448ea263772c9a38d6db2c1a97b89ba69b1d9d855c1fd9d737d6626e19e46cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/is/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/is/firefox-62.0b3.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "a2f05aaf639f22427872d84ff3b03893b2681984f52142d8451ce211f1f0c3ebaf8cdc0fe11c7ae6189b5e2aa21c82fa4dc4060196eaeea944b0a3aac7929bea"; + sha512 = "88670e161184ea78f1438bf56f66181956a18e31eb16735cdef1c2024d59fff3d0fc257c691249a1d93e96321ef80601af17733b347bdfa485945b4d4f41992b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/it/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/it/firefox-62.0b3.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "749f03441d05b11ce5f1db1594d56c3dac530876a179c6b98a3932d082637e70102281dbcc7f988545f7b455fde4e20fd99657b1a318fd5e953fc225b08cd699"; + sha512 = "4bcc1492d278b3d7184ca2ddd494e31ae0689f7edf198d75e54d3c78fdd3f9a3f2a1839efaae2838ecb6f10bfd63348a4ef4a742f9f256a22f10d1049d50e244"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ja/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ja/firefox-62.0b3.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "6bd637bccae955eb543e648329061546e1a847a0dd3a7d730f73cbe9ffb2eeee0e1ee1cfa900ad6a2e2988a5cb70e3a7284c3e13e8be8e9620bca6d35805eee9"; + sha512 = "a3e1bc8b5d1939956639b5ee52b154b1a26bc7209db675b4d29bab67ca7f0dac925014ed10ca176bf6bb52b1749207a4dc2d504170c97b24a542cc95ba78c61f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ka/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ka/firefox-62.0b3.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "f4a0bad9c3ec2f45039f87265eda6d1c6b318316147c0cbbbe0c4acf066ffb2051070420edc21c9d005d06e9d7d5b2b97347816cfc4386aabdf5ac7da7bd1010"; + sha512 = "13816a6488fb90c56f951d44db171c8b3142f366c4047edbe31c10e3f2834abf329c45b9b737f86107f0dc6f852e825e1978e7369fb5f10a51c578b520678148"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/kab/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/kab/firefox-62.0b3.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "ee9023d4c7485810bbf8d506672083813643ae477234b4aaa2beab0049f12aab83c069bd0a74fb4d7248f398c3f23e9514191d093dd8e40c7afe12ce5896a57d"; + sha512 = "a5bf1a8f85876bdc2b289e1e9688c7b3dec6783167cb14d5049b04e11f4a3efa1ba885468ca84ec6f8109e5363dfc1f3688020459532290416595d4d92713b95"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/kk/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/kk/firefox-62.0b3.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "8dbd5851b1c3e26b69cdf5176f752ffa39eb3c10449d6e28cb4be7472969550599e939c84d16fa600fe33bc329141d0f4d64c77e74072b154da9ec83f186cafd"; + sha512 = "68401c28fa4389a98614a40963978bcab94b15d2d9ea4818b28b488d905e9b223c82e1f3aae9bcbe2dd7da6ffd9d3d20e10dbc3bb4ac7ba182e0b7833c074093"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/km/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/km/firefox-62.0b3.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "629c95765741b39acdd44cc3bcc509e7adb3c2538a1a3786fdef3f856276a6a876b1a42df1a462f27b4d949e5b2c11adecf49ac196cd834f24c3bfeea9737825"; + sha512 = "71a8d5c71839c48e3117bb93735eaf8d56fa6d762ed46cd9514e91a13bf968db9c88d8c8b225d9842a9e7726ab2658568df7392cb4c45f0d736f60d2ed9e6f8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/kn/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/kn/firefox-62.0b3.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "f4bd52a1253e5f8d258e16051de1da8aeeb13e79a79b8b6e674253b1b69d3f153e75c75b9def32053e7b65f4d2de154ab83f5bda3dd7d7dc6763e2eb858ee3b9"; + sha512 = "d7b4644db963ef737eec03981cf795dd279f49cf87893a0647c229ad55dad45c85a42462b6ea94fc44b40d145853a86b0dfd92094ea17c441f0f997800d8b5a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ko/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ko/firefox-62.0b3.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "bb68ef96316f2e7960e80c2351d08f98301da66f257db5c3326c7daba7d352b07ae6a408f7569f1b88f1ea35e060a6e75b2c253f8905078d7e48aaa6e9a7f9d7"; + sha512 = "9c63a2d88f1c6073a0322d4464ac801e70b16fc82eb9ff544e1593a9d1b3478b123724d323062661b548dc6351f42e5885e659bcae94b022e4a7a79edf93bec5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/lij/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/lij/firefox-62.0b3.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "b8eb9855fbd1cd4f8bd1ef9a033925ec7f355a9c053369798203742b31c0b077618a7f31a2534c6e802f2d48744b6b08edc3024d30dd1a8ffa2dec10700568c3"; + sha512 = "a47014e854a7902098354556c389dac98b8b58ad928f65d864e70f74f6da47b4c4a10d2383eb18cfc3970d2cedc958861a912982b3d648d60c0f24f3662b1cf6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/lt/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/lt/firefox-62.0b3.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "e2174d2aac6f82cdea13a8a9b60710e149eda357a10e084bd566b336fecf63a04b34372d343f54cfcac4ec03781f1cf67b1baf5945e9c51b65015e3487dcad85"; + sha512 = "41d66d0786e84ec6b39016d96536d41a011d202d741d1322d025f43e50a7d47df9216afe859700c3d79e6a2d4e11297b4d0b11ba6ab9de7f303f07186a58b0b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/lv/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/lv/firefox-62.0b3.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "467cebfc8deac42eed8d8d8882ca75ac8c4686bc98afb04edfbf6657eae2ed249cca4d718c328c14994961582b79f32ad5badcf43b7ab542226f80f288fbf87a"; + sha512 = "e46264a45fc3b68a161558fd3f1ce16d0d2a50179109626b133ca398605f71fa09b51de54d5b4f063645b8b79d220a9b52dfa5cacf05f0eb4ab43677a17d5359"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/mai/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/mai/firefox-62.0b3.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "930d9ee5f07e4b23a69af055524fbd20380fe17692424db8e34f356607592a100e58045e0e90f76256b4c00cc5c09f1baf2807a98669ef3ac3827a024a6a5f14"; + sha512 = "fc43421d4976d4a5f9c9c86aa0ba3eae5adeb8244f49edcbf2b6e94acae2006b58931e26d2f627e02b9119e99a4e45216d48f3d687cdfff1f67b837115a14439"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/mk/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/mk/firefox-62.0b3.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "95500e1e99f10145e380de987616b8635219458cffa0b776da9c912eff3844b0912f6d58aa9964ce7d455e07de599628aef8875eb3175fee9ca057267eb679b2"; + sha512 = "7dc4e4697e085af373f144efd50e9710ed83e9bb7d6415f7a1c2f5323555aa441bd1062893727aebb0002cea5a8856703e1f21d181349babe72c6b01b3e7b2c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ml/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ml/firefox-62.0b3.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "2a38a511e7dfbee4ad96ab5d1d01e56a3243136826b46419ec3b19495ebc942adee52e9b3f369d7168fdcd5ce239f957662ac16b289c71fc14690f87f08403f6"; + sha512 = "c0a584e609a230cc65203b4064e6cf88ebbd83884f6a6c4b6e09c677076e99256088c99a9d9ef2dc0ab918bcda10f679298edba3d4b713e8cff066a3bae86502"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/mr/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/mr/firefox-62.0b3.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "4d62cd91c4503f3aa4fb807ce4947784e37e5e55818e65ad7de77b49ea8c9949a514b489f0d47545c3e6705d4b1d38fa417df113b2b1cae93bb143cb6bd09a26"; + sha512 = "4c49e33fbb66025ab682196440277b78e4241c05573a383ca925f789ef5c049b58a366b7af121cefc8a6f10181273d3ce86c2a80a33955e5200822ae363dba40"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ms/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ms/firefox-62.0b3.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "48a6762fc270b6666f972d5f5000450741aba4845e7857a8fa609819765f9745fe295b1d491762d39b73e717fde7bd0d9fea24f3b3bd5aece28d82dbad7e10f5"; + sha512 = "1b649a0ef49cdf869ce3836c4ef037882f9b66889af787aae28032b879b0e38ec86ac823276397903ba91c3b640d15644225b0418fe748d94bb1499b0c9409b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/my/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/my/firefox-62.0b3.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "c48c372b20515cee56138313556a4a2156b1316b1586b563e50b5e153f22da7387436563f2869129d7176e2df2f030169789342b1604e48e2185fdddce7bf31a"; + sha512 = "266b5e3e6c6c26bd9c82839716cd2d3eac168ff96960a406f24ffe4d3a9b8e7da72f68ec01df9d13577ac8c9a38354d30babbb3067c4ad6477cb0d63038c669a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/nb-NO/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/nb-NO/firefox-62.0b3.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "0152559b76592e30e672af3cc333dcca6fc928e6224a96daff3a01dcc404ab9b18600678ea87a59a28ad0366842c025942e672ae7011f777a2ac170cebaa17b4"; + sha512 = "9ed5567c8bd5e8bdc274ce55c03cf609911276b2c33bc58aaafe4f3828dd4d8c32c669337c747b1283ea0fcc7fa6813d9fc06c3b6384c2c1d6911d69456604d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ne-NP/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ne-NP/firefox-62.0b3.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "aa6226d0f0e1f3550ab4103e583d1a3a38b509ddabceab46ae3a7c02e7403884d08c7084e49b626e2d06581eb6b5192de913f245998f516577521ad0beb43b40"; + sha512 = "f98bb5236d175ee3b40e8cbcf2a92899fde9c35fd1528e6160876f9f541b9de8395af4043be8afbfc4070cd2ae9b1d85a3ef40883051615a6591564f47533776"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/nl/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/nl/firefox-62.0b3.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "1cb3f8b0e7634dd978640d0f080086d8fd071180c0266f94db6cfdc1c6d33ee79776b8d2c8bfdbadd2e102a78fc01176a16ad29a101d58c716de800cfc6db42a"; + sha512 = "9af76a903df95d99d20cd9acc28badb1d39c2112844668993bc4ae9158221700ebc115dea198f8fb4afb7db59f6f855c7e1b8fe7ef15888072a4ee1bd6eb61d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/nn-NO/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/nn-NO/firefox-62.0b3.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "f30751ad1c02ee9fb7f4dd442cbbec9ae217700b6d35b619cbc12e00f58eb25f37fb5c98908dcbe0b82c81f6790c3334265d28c1bc882d0a772cf45c8ac48a33"; + sha512 = "d23038b982bda5a7f636e5ef012d8618072eb188d379d026488695c21698e6ac452340d1719dca89cd0c7487a14271339f36a716ffd08f23b4bf5dbbafc121aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/oc/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/oc/firefox-62.0b3.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "1b1c5f822f119f114d8a68d2aa098b398b70c420d4823203694d4491dede84d4d096a652faabbf4905108663da87235bddf1075c4fb54a8017374f01d99da34c"; + sha512 = "cf5e95c8024d827ef3ab242f09d99789b1e074f4982d77ad13ff4f03ca060a4a1c597d9359a01afd20d465fa23605e77fd1ec9dda71159fa34c468cfec4462f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/or/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/or/firefox-62.0b3.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "285b27aad7065e9bfb75d70662512916f000f5fb11637a34413e4f67043bf35beb3e13960b88b67ce932b2aef879c802a88a0cf19dd7c8d7b89f0303a47c4142"; + sha512 = "ae80ab15d337a5b0f4e7b56f0dafe32689ae5a6bef1a2a3b0dfbb022e12452c5ebf54d39395e67a10daa3d29db7f74e199080a39978960c4b4e5ebcfd2ac762d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/pa-IN/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/pa-IN/firefox-62.0b3.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "bca37e2c65a0341a9a695edfc99444b761eddfeae95ee168ea65583c2511864e1cc1070a53fe73392e2a2e091a270123be9a18b09de54f142803674bc2ed4f8f"; + sha512 = "071a1bcf9ae7da98577c561264820b8f31fb81b2778f96a7e5707b175314b0d124b3ab484d057b90eb39897314e80c8ecaf95605f984a355e5c0b73fad9714a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/pl/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/pl/firefox-62.0b3.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "8ce19ac1311fc7305ecdc5304918bec16dfc3d65a7edacdd06494ef7486537f1e1bf139c7dff2b9d16e6b72ab41110de0efe2b39f5b956774d9dca9169006aee"; + sha512 = "2b9c7af72db100e0acd9023855e1ef14aa13972e6a46eac0829831bcdbd6e059c5bf8f75c70f3e4687b243bd60bd9b8617c80cc036021926459092495c294728"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/pt-BR/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/pt-BR/firefox-62.0b3.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "910a36d7175d576fde413e9749c406c734c33ae15c8fde5129468a76c48cd604491c3be9480bdf768d90d910d4c0c82bcf32a5d92f7c442e42edf07c445f6879"; + sha512 = "6b2efbf5c74352f903035105db81bdf17a3ea2680711d7efd780801215d1f772b3e031162ec296c411dcea63b0b899ac8be51001049b6c4acf607a27a94823b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/pt-PT/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/pt-PT/firefox-62.0b3.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "7e4acdabdf73291ca35d20575b7a6d367a9b874310937ac8a5adaaf89328decb85d23aa41c0ed088607387e36a86ea9c79cb51b99e12622422917565d9d6bee2"; + sha512 = "3e666c69a66c5e341140cdf00dbf5e2b13d90af067e79fb242b2e34b2bba3849131cbd408c4822945a516965e4c09c55f2283bf2cd83722d4307f0445e2588d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/rm/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/rm/firefox-62.0b3.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "639b0c0d80fbb3a619565bd86d1ddb7078412c667f37f4758048b444ade16328f79f6c40da3fd644cc8f3290f93ad2c1799a16e952066dd172b46fbae2e6bbb9"; + sha512 = "d46528605791a92de03bd6db6e7cc00b9d6966affc5523266f9baa0750ff052b892e4dcea852cb4c5e6546a5d8cb6a3bc4b01102ee81e12df7030dbdd7d2b9ff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ro/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ro/firefox-62.0b3.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "6ff276594b9aa3c5d0459db8cdbd2fb4a78c19fa7bd6a7f6dc1aee0e8e01c2238750f9d923925271f6ad6eb67c3e1fe93c1874fa2a39baece42e5d00c0e1957e"; + sha512 = "8584be2c838c721046fccee9580ff1fd251fa7b0bb0284e8e2f0d65ff1349312de6ebf6072e4782b57d80173f6c526df773c68d0a5f9472baa88394e9cf84c4e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ru/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ru/firefox-62.0b3.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "5579599f5013abcc7302a32aca58a2011a319de08f7e24d077496a4b19f9f9a631c839929d33a1a6804caed23c62787e354e71db974f0a3eacd73300b9b803c6"; + sha512 = "150c7ecd29983f9ebde9d85d7ea0cb3dbb552945bb7dc4a90d103207ee868c3809c8ce2a77f5cbb093b9cda913abd70afce78c9547a57bc6321ae8694b1c5874"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/si/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/si/firefox-62.0b3.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "b07a113f81af2f53500de22b9cb99989ce2c26b01a26f0d1448efbcce8e7052f53ddc07ceeb638305caacc7fc3a334b06e7eadf34a73a9a7d8bfd95fc22505ca"; + sha512 = "fe49558596b3ed3b8e922145f3d55de6d47854137fb2992769d7a4f1b718e4b6c7c4ccc0f9b99f53d6474111e055947f8f9f52aea248217e207f7ac022746da4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/sk/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/sk/firefox-62.0b3.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "41cd851dd8d54e0a8cd128b37b4170bd657a1cc9ab1e59080f477e4b0a12f22b37385106892e5f67bc52b6ceec938b05268a723d4cdb801289bd64d18ec8fd75"; + sha512 = "48021f8552165f9ade8779e967469f5d8db761c90aa3535f6f073f9d00de378a991d8705a46e8a8e5071ddfe1ca64915530f131e80028e29b706f6d41c0b7889"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/sl/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/sl/firefox-62.0b3.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "e3db0de96e71579624f3b7b243853fa83adf5abe7cb78306598a5cf03b22d480ab4ad780e71c1d91e1c7a7a1bacd753ebcc4c3e7a33c04c40e0315c943a48bce"; + sha512 = "74c14db1244825e0914c0719e9d8617e760da562600df1eec65ec8853a3a6a2c0516f8286d81933946abb1803f3807fbe21a295442edabf49c174611e440562b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/son/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/son/firefox-62.0b3.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "eacf707cb6c3da50d0739fe5f26c35c10679d54265b9528ba3cd805621cd304e0d1a58cc7568a6822543283210f86b7fa85074d21702cba173f83e92ac0fcc5b"; + sha512 = "486d10059b08aed3473b0d13bdf2490ac8299fd47295169ac631990d6ea4947859ede13aa86ed201343be9e40ef4e63a40b0a96947ae0f5fc0ab23b666f4b16d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/sq/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/sq/firefox-62.0b3.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "c164f2ec8af034ba49aee7e4d85bbe5c19721ac3d090cc0f82b2d8a0683f2d5dadc9507bdd23fd0f7b7882151b28ec8f0dfd0cfc293f07bc1ec4bcb5e63dad6a"; + sha512 = "75d6265c3eed948d4b5ea8168a1ba992655be83550f0fd4f3ed1d35e25aeaf09cc168dd2dbc1158e08b99bbdcc3f032e75f1675c35cdd37a683e9fb24248b5df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/sr/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/sr/firefox-62.0b3.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "4893138ff776f85a67d6983de06dbb5dc7b799968ce277b0bee7b3e534836552e9ff82e551b9a013473189e457370036aadb9366e18eb14f124d2b18536f4db4"; + sha512 = "755e742490df25bd5c69a40bcaccb58637684b549092bab195cc524d89747b62d424ee693579cfdb2ab8a125070c3f26cafe3d919290fa9a8e4cc2bb71fd9297"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/sv-SE/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/sv-SE/firefox-62.0b3.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "b612b2c01f072ff4c242fbd91612b0a7d3aeaa6635c0c1a66f4934726a8b8332119f6d96971aa056fa57d091d66fb71192b72bdc943bc788f59bb3a142b58852"; + sha512 = "aa6a119f69e4c4e6ce3d7eb45c3d21019fd3e29fd8d4f3a9fc12e939f230646cccbb1dee54a0528cbecb48db4bed42a1996a0e1757a1d18ff647b5de1b203379"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ta/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ta/firefox-62.0b3.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "4f431d7702f7dba2223084c567284acec2cd741d29db8888ebe8632ab849f3cbe12165ea3cd4d0f725ee24d9383e7e908826da6fa336a3cb68c616a599083e25"; + sha512 = "1b034a6959630fc7f5fd32d4288d43d374338c38371e2357702cf0e1055ea513aadb0dfab819edcb751c98e9bff993d59a571eb86cf493584451ec4e8e66aa03"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/te/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/te/firefox-62.0b3.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "67c89777963c76fe126431521d8b9a80bdf2bec8ea6e6f231840f99099cef0188fd06017bd4f3391aef64c99a8b2f0eace0a3dc466e1d25c82ce4b0783723884"; + sha512 = "294f92edf25d2e89661f25b1fd2b750649c0b6f965ad1fcfeee2cdf61d3781e1ae2a11b6731a77e7fb2ccb399cef5a045d5a707f4a84713cf4b5cf23faa747bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/th/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/th/firefox-62.0b3.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "736a96e4b772bd34108e173c15f41aab1676352435aa17a333f259733e9924af16226ed1b7d639221e538e8b48c224ff27f0b09a5bde1bd0700d005cfbe20055"; + sha512 = "1d5b15208d4b3d59241d244334328cdda547772aca5de8652bf4710222c9ecbedd590280d2632dacfb6e28e7803556d652da6539688d41d7c8299daa480ae81e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/tr/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/tr/firefox-62.0b3.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "34d33d7503948ad26f40ec3c1defb96b962f07b8d9afff569421168d35a8666345abb9c23a0125bd103448ed86bd22e361b716608a42bbac1482035d2fa48ff6"; + sha512 = "c155c13c7a8964dc163214bc6ade3f0966b349766d072d4846f2228b761ac221dca0d79961e8ea5c8afe0a4ebb73e5ec65bc350a3b1a1905ae289ab7f378d88e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/uk/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/uk/firefox-62.0b3.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "f2df840ef644f5ae344c6e88faca3af65c6c24147f5867e87b9c09e8f94f18747ecec7f0d76dbc9e640224988f1924845b820847dee9983769e09fc5b4f47081"; + sha512 = "bd6084b296f308f04708b301dbc46ec7cdf3e95249b3ec8f4f64b129df1e979721f3796cfabaacc56e124312b86dfdbe19161928b8783a731e59f6b29079c12e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/ur/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/ur/firefox-62.0b3.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "4d8f591cc72adcb6cd31b14b11bb47911f1c566e6c66c93f08ef07a5608936aa2bee54a5929e5238a218e8080daea8a4c83c3135b789bad85123abd03cf7a6c4"; + sha512 = "0b3d5447fcfbb3cfab741848fc64f1dcc013bc1a13dbabc880c59721803e62f0dc6605db15b1cd6f9c150085934674d364974f947d37c4c1208e98919a0c4044"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/uz/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/uz/firefox-62.0b3.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "86ebc113a76905813795d451d7993be8f1c6f0e9b928d25b5f1e4e651f8e2c2492baa01e00af594d1edbd0948f6173e91a37cc5595f62dd7c82c8b6ffffe25ba"; + sha512 = "b5d91159caa13ed34e51206c3127a29d1b7b7f1e07090eeeb25d21dbce4fbc86cae16dfed9f5f1e8b59ee75e9b15460ed89669501d466b5992a9b731e28ae04e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/vi/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/vi/firefox-62.0b3.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "3278d20cac4b0311e0bb5d0034bd697eebc3ce14ed1099ca04f646e6fe04ed1ee2aae03d118a4cb447ca4c0253b127a275410cbab70bdd671f1e5fda28618cd7"; + sha512 = "9ec16c42df70d29b879d0bf38a0e3173a4c5e5b45231d5a04ea111ab347c91cfebdb68c4fa960710cb37e4ea439d48b843e5823171e3bb094ffcfcc53cd50aca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/xh/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/xh/firefox-62.0b3.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "cd65c0c9abe5d90bebc3eaba01a45fd15cc31d115648fda0c54e662183cea9e41557d629a282620dc0867850e99dbaabfd1c213df6fb839883111602d105d40e"; + sha512 = "b2c5fa48411cd13dcbccdc747ca0d73458e1b067aedb57aba7a2bed66a46cf8e6466d6b7e5e49f919cb30190daef1d82dd60efa9ffa6d80ca63d7d0998c390f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/zh-CN/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/zh-CN/firefox-62.0b3.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "3cc975c9880c2eba033954c8caf828144ee0002fe4be9df68a9de1bb183001b572515dd063961f998a4a7b4fffcf285568f979ef0d44cd34788dca8b41c5668d"; + sha512 = "90b830a074e653bab78fcfd4863090af1225a99fce271f8427421d2a70ab04d3c58a0ca367530f2e34b52034d662ccc219b53f0c4793b906be4049d23fb91b9d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b2/linux-i686/zh-TW/firefox-62.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b3/linux-i686/zh-TW/firefox-62.0b3.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "2a5a1ae121819be9df3b2d0c95e2676c72f3094a09dce797d23cdd4e9d2326560bde37574d48ec8eeb973c41e07a4ab12d49cf53324c70cac1d2b881ea22a4dd"; + sha512 = "454fbf27e514638892061d78ce85290e66569e411f5f38f49260b7e14704ceb9cf1d8ddbe3bed524b92dab07c06b1a8527e373ad6e2233c6761f672cd3c57a38"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 6067911b7165..c2b83a0187f8 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -66,10 +66,11 @@ let ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration ++ extraNativeMessagingHosts ); - libs = lib.optional ffmpegSupport ffmpeg + libs = [ libudev ] + ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport kerberos ++ lib.optionals (cfg.enableQuakeLive or false) - (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib libudev ]) + (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash ++ lib.optional (config.pulseaudio or true) libpulseaudio; gtk_modules = [ libcanberra-gtk2 ]; diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index b8ee0aebb5fe..de6766709131 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -98,7 +98,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "7.5.5"; + version = "7.5.6"; lang = "en-US"; @@ -108,7 +108,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "0v8mxxfqfpwm2nqmb3jyi91rqvxm4n391ilnvxavi00pd5p0glfh"; + sha256 = "07z7lg5firyah0897pr04wqnbgf4mvsnk3gq2zgsg1rrwladxz5s"; }; "i686-linux" = fetchurl { @@ -116,7 +116,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "1j1bhj50d0fqimcl10qfg076gp1wq42s6k9865jdvd3xfsgldnsj"; + sha256 = "1s0k82ch7ypjyc5k5rb4skb9ylnp7b9ipvf8gb7pdhb8m4zjk461"; }; }; in diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix index f394df3391ac..aed6987e2738 100644 --- a/pkgs/applications/networking/cluster/flink/default.nix +++ b/pkgs/applications/networking/cluster/flink/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { name = "flink-${flinkVersion}"; src = fetchurl { - url = "mirror://apache/flink/${name}/${name}-bin${hadoopBundle}-scala_${scalaVersion}.tgz"; + url = "mirror://apache/flink/${name}/${name}-bin-scala_${hadoopBundle}${scalaVersion}.tgz"; inherit sha256; }; diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index a9e7325d181f..6f4bc17f8b50 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -1,76 +1,155 @@ -{ stdenv, fetchurl, makeWrapper, which, jre, bash }: +{ stdenv, fetchurl, makeWrapper, pkgconfig, which, maven, cmake, jre, bash, coreutils, glibc, protobuf2_5, fuse, snappy, zlib, bzip2, openssl }: -let - hadoopDerivation = { version, sha256 }: stdenv.mkDerivation rec { +let + common = { version, sha256, dependencies-sha256, tomcat }: + let + # compile the hadoop tarball from sources, it requires some patches + binary-distributon = stdenv.mkDerivation rec { + name = "hadoop-${version}-bin"; + src = fetchurl { + url = "mirror://apache/hadoop/common/hadoop-${version}/hadoop-${version}-src.tar.gz"; + inherit sha256; + }; - name = "hadoop-${version}"; + # perform fake build to make a fixed-output derivation of dependencies downloaded from maven central (~100Mb in ~3000 files) + fetched-maven-deps = stdenv.mkDerivation { + name = "hadoop-${version}-maven-deps"; + inherit src nativeBuildInputs buildInputs configurePhase; + buildPhase = '' + while mvn package -Dmaven.repo.local=$out/.m2 ${mavenFlags} -Dmaven.wagon.rto=5000; [ $? = 1 ]; do + echo "timeout, restart maven to continue downloading" + done + ''; + # keep only *.{pom,jar,xml,sha1,so,dll,dylib} and delete all ephemeral files with lastModified timestamps inside + installPhase = ''find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = dependencies-sha256; + }; + nativeBuildInputs = [ maven cmake pkgconfig ]; + buildInputs = [ fuse snappy zlib bzip2 openssl protobuf2_5 ]; + # most of the hardcoded pathes are fixed in 2.9.x and 3.0.0, this list of patched files might be reduced when 2.7.x and 2.8.x will be deprecated + postPatch = '' + for file in hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HardLink.java \ + hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java \ + hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java \ + hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DockerContainerExecutor.java \ + hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/ContainerLaunch.java \ + hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java; do + if [ -f "$file" ]; then + substituteInPlace "$file" \ + --replace '/usr/bin/stat' 'stat' \ + --replace '/bin/bash' 'bash' \ + --replace '/bin/ls' 'ls' \ + --replace '/bin/mv' 'mv' + fi + done + ''; + configurePhase = "true"; # do not trigger cmake hook + mavenFlags = "-Drequire.snappy -Drequire.bzip2 -DskipTests -Pdist,native -e"; + # prevent downloading tomcat during the build + preBuild = stdenv.lib.optionalString (tomcat != null) '' + install -D ${tomcat.src} hadoop-hdfs-project/hadoop-hdfs-httpfs/downloads/apache-tomcat-${tomcat.version}.tar.gz + install -D ${tomcat.src} hadoop-common-project/hadoop-kms/downloads/apache-tomcat-${tomcat.version}.tar.gz + ''; + buildPhase = '' + # 'maven.repo.local' must be writable + mvn package --offline -Dmaven.repo.local=$(cp -dpR ${fetched-maven-deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 ${mavenFlags} + # remove runtime dependency on $jdk/jre/lib/amd64/server/libjvm.so + patchelf --set-rpath ${stdenv.lib.makeLibraryPath [glibc]} hadoop-dist/target/hadoop-${version}/lib/native/libhadoop.so.1.0.0 + patchelf --set-rpath ${stdenv.lib.makeLibraryPath [glibc]} hadoop-dist/target/hadoop-${version}/lib/native/libhdfs.so.0.0.0 + ''; + installPhase = "mv hadoop-dist/target/hadoop-${version} $out"; + }; + in + stdenv.mkDerivation rec { + name = "hadoop-${version}"; + + src = binary-distributon; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/share/doc/hadoop + cp -dpR * $out/ + mv $out/*.txt $out/share/doc/hadoop/ + + # + # Do not use `wrapProgram` here, script renaming may result to weird things: http://i.imgur.com/0Xee013.png + # + mkdir -p $out/bin.wrapped + for n in $out/bin/*; do + if [ -f "$n" ]; then # only regular files + mv $n $out/bin.wrapped/ + makeWrapper $out/bin.wrapped/$(basename $n) $n \ + --prefix PATH : "${stdenv.lib.makeBinPath [ which jre bash coreutils ]}" \ + --prefix JAVA_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ openssl snappy zlib bzip2 ]}" \ + --set JAVA_HOME "${jre}" \ + --set HADOOP_PREFIX "$out" + fi + done + ''; + + meta = with stdenv.lib; { + homepage = "http://hadoop.apache.org/"; + description = "Framework for distributed processing of large data sets across clusters of computers"; + license = licenses.asl20; + + longDescription = '' + The Apache Hadoop software library is a framework that allows for + the distributed processing of large data sets across clusters of + computers using a simple programming model. It is designed to + scale up from single servers to thousands of machines, each + offering local computation and storage. Rather than rely on + hardware to deliver high-avaiability, the library itself is + designed to detect and handle failures at the application layer, + so delivering a highly-availabile service on top of a cluster of + computers, each of which may be prone to failures. + ''; + maintainers = with maintainers; [ volth ]; + platforms = [ "x86_64-linux" ]; + }; + }; + + tomcat_6_0_48 = rec { + version = "6.0.48"; src = fetchurl { - url = "mirror://apache/hadoop/common/${name}/${name}.tar.gz"; - sha256 = "${sha256}"; - }; - - buildInputs = [ makeWrapper ]; - - buildPhase = '' - for n in bin/{hadoop,hdfs,mapred,yarn} sbin/*.sh; do - sed -i $n -e "s|#!/usr/bin/env bash|#! ${bash}/bin/bash|" - done - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" bin/container-executor; - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" bin/test-container-executor; - ''; - - installPhase = '' - mkdir -p $out - mv *.txt share/doc/hadoop/ - mv * $out - - for n in $out/bin/{hadoop,hdfs,mapred,yarn} $out/sbin/*.sh; do - wrapProgram $n --prefix PATH : "${stdenv.lib.makeBinPath [ which jre bash ]}" --set JAVA_HOME "${jre}" --set HADOOP_HOME "$out" - done - ''; - - meta = { - homepage = http://hadoop.apache.org/; - description = "Framework for distributed processing of large data sets across clusters of computers"; - license = stdenv.lib.licenses.asl20; - - longDescription = '' - The Apache Hadoop software library is a framework that allows for - the distributed processing of large data sets across clusters of - computers using a simple programming model. It is designed to - scale up from single servers to thousands of machines, each - offering local computation and storage. Rather than rely on - hardware to deliver high-avaiability, the library itself is - designed to detect and handle failures at the application layer, - so delivering a highly-availabile service on top of a cluster of - computers, each of which may be prone to failures. - ''; - - platforms = stdenv.lib.platforms.linux; + # do not use "mirror://apache/" here, tomcat-6 is legacy and has been removed from the mirrors + url = "https://archive.apache.org/dist/tomcat/tomcat-6/v${version}/bin/apache-tomcat-${version}.tar.gz"; + sha256 = "1w4jf28g8p25fmijixw6b02iqlagy2rvr57y3n90hvz341kb0bbc"; }; }; -in -{ - hadoop_2_7 = hadoopDerivation { + +in { + hadoop_2_7 = common { version = "2.7.6"; - sha256 = "0sanwam0k2m40pfsf9l5zxvklv8rvq78xvhd2pbsbiab7ylpwcpj"; + sha256 = "0wmg0iy0qxrf43fzajzmx03gxp4yx197vxacqwkxaj45clqwl010"; + dependencies-sha256 = "1lsr9nvrynzspxqcamb10d596zlnmnfpxhkd884gdiva0frm0b1r"; + tomcat = tomcat_6_0_48; }; - hadoop_2_8 = hadoopDerivation { + hadoop_2_8 = common { version = "2.8.4"; - sha256 = "05dik4qnazhf5aldwkljf610cwncsg5y3hyvgj476cfpzmr5jm3b"; + sha256 = "16c3ljhrzibkjn3y1bmjxdgf0kn60l23ay5hqpp7vpbnqx52x68w"; + dependencies-sha256 = "1j4f461487fydgr5978nnm245ksv4xbvskfr8pbmfhcyss6b7w03"; + tomcat = tomcat_6_0_48; }; - hadoop_2_9 = hadoopDerivation { + hadoop_2_9 = common { version = "2.9.1"; - sha256 = "1z22v46mmq9hfjc229x61ws332sa1rvmib3v4jsd6i1n29d03mpf"; + sha256 = "0qgmpfbpv7f521fkjy5ldzdb4lwiblhs0hyl8qy041ws17y5x7d7"; + dependencies-sha256 = "1d5i8jj5y746rrqb9lscycnd7acmxlkz64ydsiyqsh5cdqgy2x7x"; + tomcat = tomcat_6_0_48; }; - hadoop_3_0 = hadoopDerivation { - version = "3.0.2"; - sha256 = "10ig3rrcaizvs5bnni15fvm942mr5hfc2hr355g6ich722kpll0d"; + hadoop_3_0 = common { + version = "3.0.3"; + sha256 = "1vvkci0kx4b48dg0niifn2d3r4wwq8pb3c5z20wy8pqsqrqhlci5"; + dependencies-sha256 = "1kzkna9ywacm2m1cirj9cyip66bgqjhid2xf9rrhq6g10lhr8j9m"; + tomcat = null; }; - hadoop_3_1 = hadoopDerivation { + hadoop_3_1 = common { version = "3.1.0"; - sha256 = "1rs3a752is1y2vgxjlqmmln00iwzncwlwg59l6gjv92zb7njq3b7"; + sha256 = "0lig25jkffkzc2bfgyrnm3wymapgyw9fkai8sk9fnmp7cljia314"; + dependencies-sha256 = "1ri6a7lrijh538vy7v0fzgvkw603pf8jkh3ldl1kl7l0dvszd70d"; + tomcat = null; }; } diff --git a/pkgs/applications/networking/cluster/kanif/default.nix b/pkgs/applications/networking/cluster/kanif/default.nix index 5b543854473d..6274168b3da7 100644 --- a/pkgs/applications/networking/cluster/kanif/default.nix +++ b/pkgs/applications/networking/cluster/kanif/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "kanif-${version}"; src = fetchurl { - url = "http://gforge.inria.fr/frs/download.php/26773/${name}.tar.gz"; + url = "https://gforge.inria.fr/frs/download.php/26773/${name}.tar.gz"; sha256 = "3f0c549428dfe88457c1db293cfac2a22b203f872904c3abf372651ac12e5879"; }; diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index 24fed4ca8521..f10a88ec9614 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "newsboat-${version}"; - version = "2.11.1"; + version = "2.12"; src = fetchurl { url = "https://newsboat.org/releases/${version}/${name}.tar.xz"; - sha256 = "1krpxl854h5dwmpr81m1s84cwk8zivdzvw0s5s0i4dba736pvdma"; + sha256 = "1x23zlgljaqf46v7sp8wnkyf6wighvirvn48ankpa34yr8mvrgcv"; }; prePatch = '' diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix index 2612e2d9240b..5e79517a5512 100644 --- a/pkgs/applications/networking/ids/bro/default.nix +++ b/pkgs/applications/networking/ids/bro/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "bro-2.5.4"; src = fetchurl { - url = "http://www.bro.org/downloads/${name}.tar.gz"; + url = "https://www.bro.org/downloads/${name}.tar.gz"; sha256 = "07sz1i4ly30257677b8vfrbsvxhz2awijyzn5ihg4m567x1ymnl0"; }; diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index edd7b012e217..6a697790d8f9 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "1.1.0"; src = fetchurl { - url = "http://mcabber.com/files/mcabber-${version}.tar.bz2"; + url = "https://mcabber.com/files/mcabber-${version}.tar.bz2"; sha256 = "1ggh865p1rf10ffsnf4g6qv9i8bls36dxdb1nzs5r9vdqci2rz04"; }; diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix index 49cd81ac923c..334c50814d78 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchNodeModules, nodejs-8_x, ruby, sencha -, auth0ClientID, auth0Domain, disableTooltips }: +, auth0ClientID, auth0Domain }: stdenv.mkDerivation rec { name = "rambox-bare-${version}"; @@ -21,8 +21,7 @@ stdenv.mkDerivation rec { sha256 = "1v7zwp8vs2pgy04qi92lvnxgfwkyxbid04lab8925wg1pvm2pk3k"; }; - patches = [ ./isDev.patch ] - ++ stdenv.lib.optionals disableTooltips [ ./disable-tooltips.patch ]; + patches = [ ./isDev.patch ]; configurePhase = '' echo 'var auth0Cfg = { clientID: "${auth0ClientID}", domain: "${auth0Domain}" };' > env.js diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index a601db8c8da5..b6e9c9210251 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -1,14 +1,13 @@ { stdenv, newScope, makeWrapper, electron, xdg_utils, makeDesktopItem , auth0ClientID ? "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU" -, auth0Domain ? "nixpkgs.auth0.com" -, disableTooltips ? false }: +, auth0Domain ? "nixpkgs.auth0.com" }: let callPackage = newScope self; self = { fetchNodeModules = callPackage ./fetchNodeModules.nix {}; rambox-bare = callPackage ./bare.nix { - inherit auth0ClientID auth0Domain disableTooltips; + inherit auth0ClientID auth0Domain; }; sencha = callPackage ./sencha {}; }; diff --git a/pkgs/applications/networking/instant-messengers/rambox/disable-tooltips.patch b/pkgs/applications/networking/instant-messengers/rambox/disable-tooltips.patch deleted file mode 100644 index 5ddaa9d51771..000000000000 --- a/pkgs/applications/networking/instant-messengers/rambox/disable-tooltips.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- index.html.orig 2017-12-16 20:06:03.401298402 +0300 -+++ ./index.html 2017-12-16 20:06:21.474484436 +0300 -@@ -43,14 +43,14 @@ - - - -- --> - - - diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix index 46157178fc1a..ca82f30e2d1f 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gzip, which, unzip, jdk }: let - version = "6.5.3"; + version = "6.5.3.6"; srcs = { i686-linux = fetchurl { url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-i386.sh.zip"; diff --git a/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix b/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix index 713aa8f03744..5fcee73c0f90 100644 --- a/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix +++ b/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "skype-call-recorder-0.8"; src = fetchurl { - url = "http://atdot.ch/scr/files/0.8/skype-call-recorder-0.8.tar.gz"; + url = "https://atdot.ch/scr/files/0.8/skype-call-recorder-0.8.tar.gz"; sha256 = "1iijkhq3aj9gr3bx6zl8ryvzkqcdhsm9yisimakwq0lnw0lgf5di"; }; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix index 7581482504b7..732ea95dd07c 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix @@ -90,6 +90,10 @@ mkDerivation rec { sed -i Telegram/gyp/qt_rcc.gypi \ -e "s,/usr/bin/rcc,rcc,g" + # Build system assumes x86, but it works fine on non-x86 if we patch this one flag out + sed -i Telegram/ThirdParty/libtgvoip/libtgvoip.gyp \ + -e "/-msse2/d" + gyp \ -Dbuild_defines=${GYP_DEFINES} \ -Gconfig=Release \ @@ -133,7 +137,7 @@ mkDerivation rec { description = "Telegram Desktop messaging app " + (if stable then "(stable version)" else "(pre-release)"); license = licenses.gpl3; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = platforms.linux; homepage = https://desktop.telegram.org/; maintainers = with maintainers; [ primeos abbradar garbas ]; }; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 4fa4967c898e..1ff67d02ff67 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "telepathy-gabble-0.18.4"; src = fetchurl { - url = "http://telepathy.freedesktop.org/releases/telepathy-gabble/${name}.tar.gz"; + url = "https://telepathy.freedesktop.org/releases/telepathy-gabble/${name}.tar.gz"; sha256 = "174nlkqm055vrhv11gy73m20jbsggcb0ddi51c7s9m3j5ibr2p0i"; }; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix index 89be42781a4c..769e639314e0 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "${pname}-0.8.0"; src = fetchurl { - url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; + url = "https://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy"; }; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 1791a7ff1ddc..3f22aa28f36f 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "${project}-0.8.2"; src = fetchurl { - url = "http://telepathy.freedesktop.org/releases/${project}/${name}.tar.bz2"; + url = "https://telepathy.freedesktop.org/releases/${project}/${name}.tar.bz2"; sha256 = "1bjx85k7jyfi5pvl765fzc7q2iz9va51anrc2djv7caksqsdbjlg"; }; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index 18b3bb06e98f..7d68f66afc79 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "telepathy-mission-control"; src = fetchurl { - url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; + url = "https://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; sha256 = "1jz6wwgsfxixha6ys2hbzbk5faqnj9kh2m5qdlgx5anqgandsscp"; }; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index 17cd20c09cbd..bae7231e783f 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "${pname}-0.8.1"; src = fetchurl { - url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; + url = "https://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; sha256 = "13k112vrr3zghzr03pnbqc1id65qvpj0sn0virlbf4dmr2511fbh"; }; diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index 781912f665d5..d7c70232b0ad 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "7.0.0.1035"; src = fetchurl { - url = "http://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"; + url = "https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"; sha256 = "06mp2wvqx4y6rd5gs2mh442qcykjrrvwnkhlpx0lara331i2p0lj"; }; diff --git a/pkgs/applications/networking/irc/chatzilla/default.nix b/pkgs/applications/networking/irc/chatzilla/default.nix index e11f4c65c49a..805b474e814f 100644 --- a/pkgs/applications/networking/irc/chatzilla/default.nix +++ b/pkgs/applications/networking/irc/chatzilla/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { # Obtained from http://chatzilla.rdmsoft.com/xulrunner/. - url = "http://chatzilla.rdmsoft.com/xulrunner/download/${name}.en-US.xulapp"; + url = "https://chatzilla.rdmsoft.com/xulrunner/download/${name}.en-US.xulapp"; sha256 = "09asg7ixjrin46xd19ri71g4jdrgb1gg0pk0lwk0dlb1qjxyf1xy"; }; diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix index ec67321400dc..2019d9930ef0 100644 --- a/pkgs/applications/networking/jmeter/default.nix +++ b/pkgs/applications/networking/jmeter/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "jmeter-${version}"; version = "4.0"; src = fetchurl { - url = "http://archive.apache.org/dist/jmeter/binaries/apache-${name}.tgz"; + url = "https://archive.apache.org/dist/jmeter/binaries/apache-${name}.tgz"; sha256 = "1dvngvi6j8qb6nmf5a3gpi5wxck4xisj41qkrj8sjwb1f8jq6nw4"; }; diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 2ae58721188e..33ccec355117 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -15,14 +15,14 @@ let ''; in stdenv.mkDerivation rec { - version = "20180512"; + version = "20180622"; name = "neomutt-${version}"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = "neomutt-${version}"; - sha256 = "12779h2ich6w79bm2wgaaxd9hr6kpxavj4bdrnvm44a0r02kk2vl"; + sha256 = "0rwrxghsxbkbkdyi0544nglip8ri2xi8fn15m0wg5hg52xzcq40i"; }; buildInputs = [ @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { --replace /etc/mime.types ${mime-types}/etc/mime.types # The string conversion tests all fail with the first version of neomutt - # that has tests (20180223) as well as 20180512 so we disable them for now. + # that has tests (20180223) as well as 20180622 so we disable them for now. # I don't know if that is related to the tests or our build environment. # Try again with a later release. sed -i '/rfc2047/d' test/Makefile.autosetup test/main.c diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 401eb755896f..9b259cad6d0b 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "http://notmuchmail.org/releases/${name}.tar.gz"; + url = "https://notmuchmail.org/releases/${name}.tar.gz"; sha256 = "0xh8vq2sa7r07xb3n13drc6gdiqhcgl0pj0za5xj43qkiwpikls0"; }; diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index 22bfddc5b570..70f74dff3097 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "3.7.0"; src = fetchurl { - url = "http://sylpheed.sraoss.jp/sylpheed/v3.7/${name}.tar.xz"; + url = "https://sylpheed.sraoss.jp/sylpheed/v3.7/${name}.tar.xz"; sha256 = "0j9y5vdzch251s264diw9clrn88dn20bqqkwfmis9l7m8vmwasqd"; }; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 759cf74ba9d0..bea713c9e6bd 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation { inherit name; src = fetchurl { - url = "http://download-installer.cdn.mozilla.net/pub/thunderbird/releases/${version}/${source.arch}/${source.locale}/thunderbird-${version}.tar.bz2"; + url = "https://download-installer.cdn.mozilla.net/pub/thunderbird/releases/${version}/${source.arch}/${source.locale}/thunderbird-${version}.tar.bz2"; inherit (source) sha512; }; diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix index 7ca1e595c35d..ca4014ed31c3 100644 --- a/pkgs/applications/networking/p2p/deluge/default.nix +++ b/pkgs/applications/networking/p2p/deluge/default.nix @@ -31,7 +31,7 @@ pythonPackages.buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://deluge-torrent.org; + homepage = https://deluge-torrent.org; description = "Torrent client"; license = licenses.gpl3Plus; maintainers = with maintainers; [ domenkozar ebzzry ]; diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index d634502a0352..bf1545ff3983 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "frostwire-${version}"; src = fetchurl { - url = "http://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz"; + url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz"; sha256 = "01ah0cwr3ahihfz1xxs0irw4rsa7wjgnlkcqfyg5q9rmzwbnxkyh"; }; diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix index 400600751a2e..c56e39826a66 100644 --- a/pkgs/applications/networking/p2p/ncdc/default.nix +++ b/pkgs/applications/networking/p2p/ncdc/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.20"; src = fetchurl { - url = "http://dev.yorhel.nl/download/ncdc-${version}.tar.gz"; + url = "https://dev.yorhel.nl/download/ncdc-${version}.tar.gz"; sha256 = "0ccn7dqbqpqsbglqyalz32c20rjvf1pw0zr88jyvd2b2vxbqi6ca"; }; diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index a1a1f12a8c1c..2521a4b0daf9 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "4.1.2.0"; src = fetchurl { - url = "http://code.x2go.org/releases/source/x2goclient/${name}.tar.gz"; + url = "https://code.x2go.org/releases/source/x2goclient/${name}.tar.gz"; sha256 = "1x1iiyszz6mbrnsqacxzclyx172djq865bw3y83ya7lc9j8a71zn"; }; diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/pkgs/applications/networking/sniffers/kismet/default.nix index 803e35307fe9..0c793c41c55a 100644 --- a/pkgs/applications/networking/sniffers/kismet/default.nix +++ b/pkgs/applications/networking/sniffers/kismet/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2016-07-R1"; src = fetchurl { - url = "http://www.kismetwireless.net/code/${name}.tar.xz"; + url = "https://www.kismetwireless.net/code/${name}.tar.xz"; sha256 = "0dz28y4ay4lskhl0lawqy2dkcrhgfkbg06v22qxzzw8i6caizcmx"; }; diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 42038426515e..ef1dade4dddd 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { name = "wireshark-${variant}-${version}"; src = fetchurl { - url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; + url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; sha256 = "126dvd6myjbxjr69dy9vzzdda2lmjy1wwwc6gcs5djb46jy5nvmb"; }; diff --git a/pkgs/applications/networking/sync/casync/default.nix b/pkgs/applications/networking/sync/casync/default.nix new file mode 100644 index 000000000000..82dd3a506dee --- /dev/null +++ b/pkgs/applications/networking/sync/casync/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchFromGitHub, fetchpatch +, meson, ninja, pkgconfig, sphinx +, acl, curl, fuse, libselinux, udev, xz, zstd +, fuseSupport ? true +, selinuxSupport ? true +, udevSupport ? true +, glibcLocales, rsync +}: + +stdenv.mkDerivation rec { + name = "casync-${version}"; + version = "2-152-ge4a3c5e"; + + src = fetchFromGitHub { + owner = "systemd"; + repo = "casync"; + rev = "e4a3c5efc8f11e0e99f8cc97bd417665d92b40a9"; + sha256 = "0zx6zvj5a6rr3w9s207rvpfw7gwssiqmp1p3c75bsirmz4nmsdf0"; + }; + + buildInputs = [ acl curl xz zstd ] + ++ stdenv.lib.optionals (fuseSupport) [ fuse ] + ++ stdenv.lib.optionals (selinuxSupport) [ libselinux ] + ++ stdenv.lib.optionals (udevSupport) [ udev ]; + nativeBuildInputs = [ meson ninja pkgconfig sphinx ]; + checkInputs = [ glibcLocales rsync ]; + + postPatch = '' + for f in test/test-*.sh.in; do + patchShebangs $f + done + patchShebangs test/http-server.py + ''; + + PKG_CONFIG_UDEV_UDEVDIR = "lib/udev"; + mesonFlags = stdenv.lib.optionals (!fuseSupport) [ "-Dfuse=false" ] + ++ stdenv.lib.optionals (!udevSupport) [ "-Dudev=false" ] + ++ stdenv.lib.optionals (!selinuxSupport) [ "-Dselinux=false" ]; + + doCheck = true; + preCheck = '' + export LC_ALL="en_US.utf-8" + ''; + + meta = with stdenv.lib; { + description = "Content-Addressable Data Synchronizer"; + homepage = https://github.com/systemd/casync; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 405ff2fde735..337c166a79ac 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "rclone-${version}"; - version = "1.41"; + version = "1.42"; goPackagePath = "github.com/ncw/rclone"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "ncw"; repo = "rclone"; rev = "v${version}"; - sha256 = "0kvqzrj7kbr9mhg023lkvk320qhkf4widcv6yph1cx701935brhr"; + sha256 = "0r85d45q0jdfwcrblq1rd698cw3h6mc9h4dmlhzl982zpkncijqj"; }; outputs = [ "bin" "out" "man" ]; @@ -21,7 +21,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Command line program to sync files and directories to and from major cloud storage"; - homepage = http://rclone.org; + homepage = https://rclone.org; license = licenses.mit; maintainers = with maintainers; [ danielfullmer ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index 4eecf7f4a1f8..029158caf4b5 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -21,7 +21,7 @@ python2Packages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = http://syncplay.pl/; + homepage = https://syncplay.pl/; description = "Free software that synchronises media players"; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index be574acc8c75..9d720bee05e7 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchFromGitHub, fetchpatch, libnotify, librsvg, darwin, psmisc, gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3, bcrypt, gobjectIntrospection }: +{ stdenv, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall +, gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook +, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3 +, bcrypt, gobjectIntrospection }: buildPythonApplication rec { version = "0.9.4"; @@ -35,7 +38,7 @@ buildPythonApplication rec { }) (substituteAll { src = ./paths.patch; - killall = "${if stdenv.isDarwin then darwin.shell_cmds else psmisc}/bin/killall"; + killall = "${killall}/bin/killall"; syncthing = "${syncthing}/bin/syncthing"; }) ]; diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index e38ba36b9253..d689b17fe325 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { sha256 = "1mc7qqvrnl0zyhgh8n7wx1g1cbwq74xpvbz8rfjmyi77p693a6fp"; - url = "http://humdi.net/vnstat/${name}.tar.gz"; + url = "https://humdi.net/vnstat/${name}.tar.gz"; }; buildInputs = [ gd ncurses ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { This means that vnStat won't actually be sniffing any traffic and also ensures light use of system resources. ''; - homepage = http://humdi.net/vnstat/; + homepage = https://humdi.net/vnstat/; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index d1b333587a68..b78c0ad09c3d 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { version = "1.7.0"; src = fetchurl { - url = "http://znc.in/releases/archive/${name}.tar.gz"; + url = "https://znc.in/releases/archive/${name}.tar.gz"; sha256 = "0vxra50418bsjfdpf8vl70fijv8syvasjqdxfyjliff6k91k2zn0"; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Advanced IRC bouncer"; - homepage = http://wiki.znc.in/ZNC; + homepage = https://wiki.znc.in/ZNC; maintainers = with maintainers; [ viric schneefux lnl7 ]; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix index 813608a386a4..1dd095e577e8 100644 --- a/pkgs/applications/office/cb2bib/default.nix +++ b/pkgs/applications/office/cb2bib/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "cb2bib"; version = "1.9.7"; src = fetchurl { - url = "http://www.molspaces.com/dl/progs/${name}.tar.gz"; + url = "https://www.molspaces.com/dl/progs/${name}.tar.gz"; sha256 = "0gr8vmlz1ikw0jiwwac2ays20z26cdv3bjdx9m1nc450hl6m5s7s"; }; buildInputs = [ qtbase qtwebkit qtx11extras lzo libX11 ]; diff --git a/pkgs/applications/office/marp/default.nix b/pkgs/applications/office/marp/default.nix index 7f6d93a11ae2..6ff0cf1dfd05 100644 --- a/pkgs/applications/office/marp/default.nix +++ b/pkgs/applications/office/marp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "marp-${version}"; - version = "0.0.12"; + version = "0.0.13"; src = fetchurl { url = "https://github.com/yhatt/marp/releases/download/v${version}/${version}-Marp-linux-x64.tar.gz"; - sha256 = "0pljjkis9vb819d0akqmqnyakwgnvc3qqyg20yr13xms9a5iqv32"; + sha256 = "1120mbw4mf7v4qfmss3121gkgp5pn31alk9cssxbrmdcsdkaq5ld"; }; sourceRoot = "."; diff --git a/pkgs/applications/office/osmo/default.nix b/pkgs/applications/office/osmo/default.nix index b5475ae337a3..20f8b428f0db 100644 --- a/pkgs/applications/office/osmo/default.nix +++ b/pkgs/applications/office/osmo/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk3, libxml2, gettext, libical, libnotify -, libarchive, gtkspell3, webkitgtk, libgringotts, wrapGAppsHook }: +, libarchive, gspell, webkitgtk, libgringotts, wrapGAppsHook }: stdenv.mkDerivation rec { name = "osmo-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gettext wrapGAppsHook ]; buildInputs = [ gtk3 libxml2 libical libnotify libarchive - gtkspell3 webkitgtk libgringotts ]; + gspell webkitgtk libgringotts ]; meta = with stdenv.lib; { description = "A handy personal organizer"; diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index a6f0bccec96b..ac1bf18e9999 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; description = "Desktop Publishing (DTP) and Layout program for Linux"; - homepage = http://www.scribus.net; + homepage = https://www.scribus.net; license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/science/astronomy/gildas/clang.patch b/pkgs/applications/science/astronomy/gildas/clang.patch new file mode 100644 index 000000000000..4d6654a99aee --- /dev/null +++ b/pkgs/applications/science/astronomy/gildas/clang.patch @@ -0,0 +1,22 @@ +diff -ruN gildas-src-jun18a/admin/define-system.sh gildas-src-jun18a.clang/admin/define-system.sh +--- gildas-src-jun18a/admin/define-system.sh 2018-03-12 11:07:57.000000000 +0100 ++++ gildas-src-jun18a.clang/admin/define-system.sh 2018-06-12 14:56:14.000000000 +0200 +@@ -218,13 +218,13 @@ + else + GAG_MACHINE=pc + fi +- if which gcc > /dev/null 2>&1; then +- DEFAULT_CCOMPILER=gcc ++ if which clang > /dev/null 2>&1; then ++ DEFAULT_CCOMPILER=clang + fi +- if which g++ > /dev/null 2>&1; then +- DEFAULT_CXXCOMPILER=g++ +- elif which clang++ > /dev/null 2>&1; then ++ if which clang++ > /dev/null 2>&1; then + DEFAULT_CXXCOMPILER=clang++ ++ elif which g++ > /dev/null 2>&1; then ++ DEFAULT_CXXCOMPILER=g++ + fi + if which ifort > /dev/null 2>&1; then + DEFAULT_FCOMPILER=ifort diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix new file mode 100644 index 000000000000..bd4587bf2276 --- /dev/null +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -0,0 +1,68 @@ +{ stdenv, fetchurl, gtk2-x11 , pkgconfig , python27 , gfortran , lesstif +, cfitsio , getopt , perl , groff , which +}: + +let + python27Env = python27.withPackages(ps: with ps; [ numpy ]); +in + +stdenv.mkDerivation rec { + srcVersion = "jun18a"; + version = "20180601_a"; + name = "gildas-${version}"; + + src = fetchurl { + url = "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.gz"; + sha256 = "0k4x0g69fphb1759cwcw6bbs8imwmq0qwj6zqixxk60skk4n4jvb"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ pkgconfig groff perl getopt gfortran which ]; + + buildInputs = [ gtk2-x11 lesstif cfitsio python27Env ]; + + patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ]; + + configurePhase='' + substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out + substituteInPlace admin/wrapper.sh --replace '%%PYTHONHOME%%' ${python27Env} + source admin/gildas-env.sh -c gfortran -o openmp + echo "gag_doc: $out/share/doc/" >> kernel/etc/gag.dico.lcl + ''; + + buildPhase='' + make depend + make + ''; + + postInstall='' + mkdir -p $out/bin + cp -a ../gildas-exe-${srcVersion}/* $out + mv $out/$GAG_EXEC_SYSTEM $out/libexec + cp admin/wrapper.sh $out/bin/gildas-wrapper.sh + chmod 755 $out/bin/gildas-wrapper.sh + for i in $out/libexec/bin/* ; do + ln -s $out/bin/gildas-wrapper.sh $out/bin/$(basename "$i") + done + ''; + + meta = { + description = "Radioastronomy data analysis software"; + longDescription = '' + GILDAS is a collection of state-of-the-art software + oriented toward (sub-)millimeter radioastronomical + applications (either single-dish or interferometer). + It is daily used to reduce all data acquired with the + IRAM 30M telescope and Plateau de Bure Interferometer + PDBI (except VLBI observations). GILDAS is easily + extensible. GILDAS is written in Fortran-90, with a + few parts in C/C++ (mainly keyboard interaction, + plotting, widgets).''; + homepage = http://www.iram.fr/IRAMFR/GILDAS/gildas.html; + license = stdenv.lib.licenses.free; + maintainers = [ stdenv.lib.maintainers.bzizou stdenv.lib.maintainers.smaret ]; + platforms = stdenv.lib.platforms.all; + }; + +} diff --git a/pkgs/applications/science/astronomy/gildas/return-error-code.patch b/pkgs/applications/science/astronomy/gildas/return-error-code.patch new file mode 100644 index 000000000000..f0bd7da9354e --- /dev/null +++ b/pkgs/applications/science/astronomy/gildas/return-error-code.patch @@ -0,0 +1,13 @@ +diff --new-file -r -u gildas-src-dec17a.orig/admin/gildas-env.sh gildas-src-dec17a/admin/gildas-env.sh +--- gildas-src-dec17a.orig/admin/gildas-env.sh 2017-10-24 11:39:18.000000000 +0200 ++++ gildas-src-dec17a/admin/gildas-env.sh 2017-12-01 11:17:32.051953670 +0100 +@@ -1010,6 +1010,9 @@ + gagenv_message "$gagenv_errors error(s) and $gagenv_warnings warning(s) detected" + if [ $gagenv_errors -ne 0 ]; then + gagenv_message "GILDAS will not compile" ++ gagenv_clean ++ echo ++ \return 1 + elif [ $gagenv_warnings -ne 0 ]; then + gagenv_message "GILDAS will compile with some optional features disabled" + else diff --git a/pkgs/applications/science/astronomy/gildas/wrapper.patch b/pkgs/applications/science/astronomy/gildas/wrapper.patch new file mode 100644 index 000000000000..2e470a1e9cdc --- /dev/null +++ b/pkgs/applications/science/astronomy/gildas/wrapper.patch @@ -0,0 +1,19 @@ +diff --new-file -r -u gildas-src-feb17d.orig/admin/wrapper.sh gildas-src-feb17d/admin/wrapper.sh +--- gildas-src-feb17d.orig/admin/wrapper.sh 1970-01-01 01:00:00.000000000 +0100 ++++ gildas-src-feb17d/admin/wrapper.sh 2017-05-18 21:00:01.660778782 +0200 +@@ -0,0 +1,15 @@ ++#!/bin/sh -e ++ ++export GAG_ROOT_DIR="%%OUT%%" ++export GAG_PATH="${GAG_ROOT_DIR}/etc" ++export GAG_EXEC_SYSTEM="libexec" ++export PYTHONHOME="%%PYTHONHOME%%" ++if [ -z "\$PYTHONPATH" ]; then ++ PYTHONPATH="${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/python" ++else ++ PYTHONPATH="${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/python:${PYTHONPATH}" ++fi ++export PYTHONPATH ++export LD_LIBRARY_PATH=${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/lib/ ++me=`basename $0` ++exec ${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/bin/${me} ${*} diff --git a/pkgs/applications/science/biology/hmmer/default.nix b/pkgs/applications/science/biology/hmmer/default.nix new file mode 100644 index 000000000000..8552aa34c433 --- /dev/null +++ b/pkgs/applications/science/biology/hmmer/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "3.1b2"; + name = "hmmer-${version}"; + + src = fetchurl { + url = "http://eddylab.org/software/hmmer3/${version}/${name}.tar.gz"; + sha256 = "0djmgc0pfli0jilfx8hql1axhwhqxqb8rxg2r5rg07aw73sfs5nx"; + }; + + meta = with stdenv.lib; { + description = "Biosequence analysis using profile hidden Markov models"; + longDescription = '' +HMMER is used for searching sequence databases for sequence homologs, and for making sequence alignments. It implements methods using probabilistic models called profile hidden Markov models (profile HMMs). + +HMMER is often used together with a profile database, such as Pfam or many of the databases that participate in Interpro. But HMMER can also work with query sequences, not just profiles, just like BLAST. For example, you can search a protein query sequence against a database with phmmer, or do an iterative search with jackhmmer. + +HMMER is designed to detect remote homologs as sensitively as possible, relying on the strength of its underlying probability models. In the past, this strength came at significant computational expense, but as of the new HMMER3 project, HMMER is now essentially as fast as BLAST. + +HMMER can be downloaded and installed as a command line tool on your own hardware, and now it is also more widely accessible to the scientific community via new search servers at the European Bioinformatics Institute. + ''; + homepage = http://hmmer.org/; + license = licenses.gpl3; + maintainers = [ maintainers.iimog ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index bf963958406d..753f80d61733 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.4.10"; src = fetchurl { - url = "http://data.broadinstitute.org/igv/projects/downloads/2.4/IGV_${version}.zip"; + url = "https://data.broadinstitute.org/igv/projects/downloads/2.4/IGV_${version}.zip"; sha256 = "1wyv3ny06m6ipb83hi3pzcc50v49zms69c5714iixh0nqpd826f2"; }; diff --git a/pkgs/applications/science/biology/iv/default.nix b/pkgs/applications/science/biology/iv/default.nix index 2258482bd4b2..f204d9bbca96 100644 --- a/pkgs/applications/science/biology/iv/default.nix +++ b/pkgs/applications/science/biology/iv/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "iv-19"; src = fetchurl - { url = "http://www.neuron.yale.edu/ftp/neuron/versions/v${neuron-version}/${name}.tar.gz"; + { url = "https://www.neuron.yale.edu/ftp/neuron/versions/v${neuron-version}/${name}.tar.gz"; sha256 = "07a3g8zzay4h0bls7fh89dd0phn7s34c2g15pij6dsnwpmjg06yx"; }; nativeBuildInputs = [ patchelf ]; diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index 7fa229c42b10..35710fd1fe1f 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses readline python mpi iv ]; src = fetchurl { - url = "http://www.neuron.yale.edu/ftp/neuron/versions/v${version}/nrn-${version}.tar.gz"; + url = "https://www.neuron.yale.edu/ftp/neuron/versions/v${version}/nrn-${version}.tar.gz"; sha256 = "0f26v3qvzblcdjg7isq0m9j2q8q7x3vhmkfllv8lsr3gyj44lljf"; }; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 205d56f3fc87..9ecc9f20ac16 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.924"; src = fetchurl { - url = "http://www.veripool.org/ftp/${name}.tgz"; + url = "https://www.veripool.org/ftp/${name}.tgz"; sha256 = "0xarifraycmdzjxs0lscpwvrwr59z84p8g8dkyjssc463dqikjvx"; }; diff --git a/pkgs/applications/science/logic/coq/8.3.nix b/pkgs/applications/science/logic/coq/8.3.nix index 87b847087e34..341267b2cebe 100644 --- a/pkgs/applications/science/logic/coq/8.3.nix +++ b/pkgs/applications/science/logic/coq/8.3.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { name = "coq-${version}"; src = fetchurl { - url = "http://coq.inria.fr/V${version}/files/coq-${version}.tar.gz"; + url = "https://coq.inria.fr/V${version}/files/coq-${version}.tar.gz"; sha256 = "17d3lmchmqir1rawnr52g78srg4wkd7clzpzfsivxc4y1zp6rwkr"; }; diff --git a/pkgs/applications/science/logic/coq/8.4.nix b/pkgs/applications/science/logic/coq/8.4.nix index 64b0f85aed2a..c3da1205ab0c 100644 --- a/pkgs/applications/science/logic/coq/8.4.nix +++ b/pkgs/applications/science/logic/coq/8.4.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { inherit ocaml camlp5; src = fetchurl { - url = "http://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz"; + url = "https://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz"; sha256 = "1mpbj4yf36kpjg2v2sln12i8dzqn8rag6fd07hslj2lpm4qs4h55"; }; diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index 403eff216f53..91ea7e500144 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "1.5"; src = fetchurl { - url = "http://cvc4.cs.stanford.edu/downloads/builds/src/cvc4-${version}.tar.gz"; + url = "https://cvc4.cs.stanford.edu/downloads/builds/src/cvc4-${version}.tar.gz"; sha256 = "0yxxawgc9vd2cz883swjlm76rbdkj48n7a8dfppsami530y2rvhi"; }; diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix index 44328eeb6bbb..9b0ba0799c78 100644 --- a/pkgs/applications/science/logic/eprover/default.nix +++ b/pkgs/applications/science/logic/eprover/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.0"; src = fetchurl { - url = "http://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_${version}/E.tgz"; + url = "https://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_${version}/E.tgz"; sha256 = "1xmwr32pd8lv3f6yh720mdqhi3na505y3zbgcsgh2hwb7b5i3ngb"; }; diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index af2bb3ed0c4e..ae04c11d9590 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "1awgg39i72pivwfijdwffvil3glnpimjz2x04qbl5la2j6la48nb"; } else fetchurl { - url = "http://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz"; + url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz"; sha256 = "01v1zrajyfamjq5b8v18qr3ffivjckifsvvx2vs13di6wsnmm9gw"; }; diff --git a/pkgs/applications/science/logic/leo2/default.nix b/pkgs/applications/science/logic/leo2/default.nix index e30895346258..be337a1c258e 100644 --- a/pkgs/applications/science/logic/leo2/default.nix +++ b/pkgs/applications/science/logic/leo2/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.6.2"; src = fetchurl { - url = "http://page.mi.fu-berlin.de/cbenzmueller/leo/leo2_v${version}.tgz"; + url = "https://page.mi.fu-berlin.de/cbenzmueller/leo/leo2_v${version}.tgz"; sha256 = "1wjpmizb181iygnd18lx7p77fwaci2clgzs5ix5j51cc8f3pazmv"; }; diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix index ec717002c2d6..6d9549b526f9 100644 --- a/pkgs/applications/science/logic/mcrl2/default.nix +++ b/pkgs/applications/science/logic/mcrl2/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "mcrl2-${version}"; src = fetchurl { - url = "http://www.mcrl2.org/download/release/mcrl2-${version}.${build_nr}.tar.gz"; + url = "https://www.mcrl2.org/download/release/mcrl2-${version}.${build_nr}.tar.gz"; sha256 = "1c8h94ja7271ph61zrcgnjgblxppld6v22f7f900prjgzbcfy14m"; }; diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix index b143fd982505..01dfc35f6e0d 100644 --- a/pkgs/applications/science/logic/prooftree/default.nix +++ b/pkgs/applications/science/logic/prooftree/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation (rec { version = "0.12"; src = fetchurl { - url = "http://askra.de/software/prooftree/releases/prooftree-${version}.tar.gz"; + url = "https://askra.de/software/prooftree/releases/prooftree-${version}.tar.gz"; sha256 = "08yp66j05pdkdpv9xkfqymqy82mir5xbwfh9mkzhh219xkps4b4m"; }; diff --git a/pkgs/applications/science/logic/prover9/default.nix b/pkgs/applications/science/logic/prover9/default.nix index 74e31d062f48..f96532b7038b 100644 --- a/pkgs/applications/science/logic/prover9/default.nix +++ b/pkgs/applications/science/logic/prover9/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "prover9-2009-11a"; src = fetchurl { - url = http://www.cs.unm.edu/~mccune/mace4/download/LADR-2009-11A.tar.gz; + url = https://www.cs.unm.edu/~mccune/mace4/download/LADR-2009-11A.tar.gz; sha256 = "1l2i3d3h5z7nnbzilb6z92r0rbx0kh6yaxn2c5qhn3000xcfsay3"; }; diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix index c22bff9cdee2..b9dd90f601f5 100644 --- a/pkgs/applications/science/logic/satallax/default.nix +++ b/pkgs/applications/science/logic/satallax/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { buildInputs = [ocaml zlib which eprover makeWrapper coq]; src = fetchurl { - url = "http://www.ps.uni-saarland.de/~cebrown/satallax/downloads/${name}.tar.gz"; + url = "https://www.ps.uni-saarland.de/~cebrown/satallax/downloads/${name}.tar.gz"; sha256 = "1kvxn8mc35igk4vigi5cp7w3wpxk2z3bgwllfm4n3h2jfs0vkpib"; }; diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix index 9ae5d75c4577..b677927a8eff 100644 --- a/pkgs/applications/science/logic/workcraft/default.nix +++ b/pkgs/applications/science/logic/workcraft/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://workcraft.org/; + homepage = https://workcraft.org/; description = "Framework for interpreted graph modeling, verification and synthesis"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 953f4e62c22b..f20b75605d5a 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { name = "R-3.5.0"; src = fetchurl { - url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz"; + url = "https://cran.r-project.org/src/base/R-3/${name}.tar.gz"; sha256 = "0w38865laqg28cdhikxdxhx4rfp0kgcn72gakwypsy91br9ja5zx"; }; diff --git a/pkgs/applications/science/math/cbc/default.nix b/pkgs/applications/science/math/cbc/default.nix index 6de77d81be6f..689261abc661 100644 --- a/pkgs/applications/science/math/cbc/default.nix +++ b/pkgs/applications/science/math/cbc/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "cbc-2.9.9"; src = fetchurl { - url = "http://www.coin-or.org/download/source/Cbc/Cbc-2.9.9.tgz"; + url = "https://www.coin-or.org/download/source/Cbc/Cbc-2.9.9.tgz"; sha256 = "1w8axdzm05xf5y13c31w7rc5z6ywxqxiwafnxcq3p195kgj0915a"; }; diff --git a/pkgs/applications/science/math/csdp/default.nix b/pkgs/applications/science/math/csdp/default.nix index 796e8b7264fb..9b402fe0ac94 100644 --- a/pkgs/applications/science/math/csdp/default.nix +++ b/pkgs/applications/science/math/csdp/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "csdp-6.1.1"; src = fetchurl { - url = "http://www.coin-or.org/download/source/Csdp/Csdp-6.1.1.tgz"; + url = "https://www.coin-or.org/download/source/Csdp/Csdp-6.1.1.tgz"; sha256 = "1f9ql6cjy2gwiyc51ylfan24v1ca9sjajxkbhszlds1lqmma8n05"; }; diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 798141b6b438..a53829347053 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "glsurf-3.3.1"; src = fetchurl { - url = "http://lama.univ-savoie.fr/~raffalli/glsurf/glsurf-3.3.1.tar.gz"; + url = "https://lama.univ-savoie.fr/~raffalli/glsurf/glsurf-3.3.1.tar.gz"; sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7"; }; diff --git a/pkgs/applications/science/math/palp/default.nix b/pkgs/applications/science/math/palp/default.nix index 3484c369db3b..4c7df4412e4f 100644 --- a/pkgs/applications/science/math/palp/default.nix +++ b/pkgs/applications/science/math/palp/default.nix @@ -14,13 +14,28 @@ stdenv.mkDerivation rec { sha256 = "1s7s2lc5f0ig1yy7ygsh3sddm3sbq4mxwybqsj8lp9wjdxs7qfrs"; }; - hardeningDisable = [ "format" ]; + hardeningDisable = [ + "format" + "strictoverflow" # causes runtime failure (tested in checkPhase) + ]; preBuild = '' echo Building PALP optimized for ${dim} dimensions sed -i "s/^#define[^a-zA-Z]*POLY_Dmax.*/#define POLY_Dmax ${dim}/" Global.h ''; + # palp has no tests of its own. This test is an adapted sage test that failed + # when #28029 was merged. + doCheck = true; + checkPhase = '' + ./nef.x -f -N << EOF | grep -q 'np=' + 3 6 + 1 0 0 -1 0 0 + 0 1 0 0 -1 0 + 0 0 1 0 0 -1 + EOF + ''; + installPhase = '' mkdir -p "$out/bin" for file in poly class cws nef mori; do @@ -62,6 +77,6 @@ stdenv.mkDerivation rec { # the right license. license = licenses.gpl2; maintainers = with maintainers; [ timokau ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 07c6af0926d6..a811c9da8c27 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "2.9.5"; src = fetchurl { - url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz"; + url = "https://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz"; sha256 = "05z6y5iwdzcdggbrkic9cy9vy9wmk5qxc21cb4lqnbqxnhjihibb"; }; diff --git a/pkgs/applications/science/math/pari/gp2c.nix b/pkgs/applications/science/math/pari/gp2c.nix index b3e36b6bf206..10b0d0cba36d 100644 --- a/pkgs/applications/science/math/pari/gp2c.nix +++ b/pkgs/applications/science/math/pari/gp2c.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "0.0.10pl1"; src = fetchurl { - url = "http://pari.math.u-bordeaux.fr/pub/pari/GP2C/${name}.tar.gz"; + url = "https://pari.math.u-bordeaux.fr/pub/pari/GP2C/${name}.tar.gz"; sha256 = "16hgmdvzxbmv63x1f72q1xgfyh0qhx7kaf9nbaamy0gdawxjxcav"; }; diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix index a3ff0d6d0f1e..1a059aeb1670 100644 --- a/pkgs/applications/science/math/pynac/default.nix +++ b/pkgs/applications/science/math/pynac/default.nix @@ -9,14 +9,14 @@ }: stdenv.mkDerivation rec { - version = "0.7.21"; + version = "0.7.22"; name = "pynac-${version}"; src = fetchFromGitHub { owner = "pynac"; repo = "pynac"; rev = "pynac-${version}"; - sha256 = "072mdziyx52y0knxjf2hs6nab36bckkanp7g6ff6qiy4fm0v8q04"; + sha256 = "1ribm5vpbgsja4hbca1ckw4ln9kjkv608aaqsvxxvbs4z76ys6yi"; }; buildInputs = [ diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index b74bcc3d6377..7f101bac147e 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -52,26 +52,26 @@ stdenv.mkDerivation rec { "http://sagemath.polytechnic.edu.na/src/sage-${version}.tar.gz" "ftp://ftp.sun.ac.za/pub/mirrors/www.sagemath.org/src/sage-${version}.tar.gz" "http://sagemath.mirror.ac.za/src/sage-${version}.tar.gz" - "http://ftp.leg.uct.ac.za/pub/packages/sage/src/sage-${version}.tar.gz" + "https://ftp.leg.uct.ac.za/pub/packages/sage/src/sage-${version}.tar.gz" "http://mirror.ufs.ac.za/sagemath/src/sage-${version}.tar.gz" - "http://mirrors-usa.go-parts.com/sage/sagemath/src/sage-${version}.tar.gz" + "https://mirrors-usa.go-parts.com/sage/sagemath/src/sage-${version}.tar.gz" "http://www.cecm.sfu.ca/sage/src/sage-${version}.tar.gz" "http://files.sagemath.org/src/sage-${version}.tar.gz" - "http://mirrors.xmission.com/sage/src/sage-${version}.tar.gz" + "https://mirrors.xmission.com/sage/src/sage-${version}.tar.gz" "http://sagemath.c3sl.ufpr.br/src/sage-${version}.tar.gz" "http://linorg.usp.br/sage/src/sage-${version}.tar.gz" "http://mirror.hust.edu.cn/sagemath/src/sage-${version}.tar.gz" - "http://ftp.iitm.ac.in/sage/src/sage-${version}.tar.gz" + "https://ftp.iitm.ac.in/sage/src/sage-${version}.tar.gz" "http://ftp.kaist.ac.kr/sage/src/sage-${version}.tar.gz" - "http://ftp.riken.jp/sagemath/src/sage-${version}.tar.gz" - "http://mirrors.tuna.tsinghua.edu.cn/sagemath/src/sage-${version}.tar.gz" - "http://mirrors.ustc.edu.cn/sagemath/src/sage-${version}.tar.gz" + "https://ftp.riken.jp/sagemath/src/sage-${version}.tar.gz" + "https://mirrors.tuna.tsinghua.edu.cn/sagemath/src/sage-${version}.tar.gz" + "https://mirrors.ustc.edu.cn/sagemath/src/sage-${version}.tar.gz" "http://ftp.tsukuba.wide.ad.jp/software/sage/src/sage-${version}.tar.gz" - "http://ftp.yz.yamagata-u.ac.jp/pub/math/sage/src/sage-${version}.tar.gz" - "http://mirror.yandex.ru/mirrors/sage.math.washington.edu/src/sage-${version}.tar.gz" - "http://mirror.aarnet.edu.au/pub/sage/src/sage-${version}.tar.gz" - "http://sage.mirror.garr.it/mirrors/sage/src/sage-${version}.tar.gz" - "http://www.mirrorservice.org/sites/www.sagemath.org/src/sage-${version}.tar.gz" + "https://ftp.yz.yamagata-u.ac.jp/pub/math/sage/src/sage-${version}.tar.gz" + "https://mirror.yandex.ru/mirrors/sage.math.washington.edu/src/sage-${version}.tar.gz" + "https://mirror.aarnet.edu.au/pub/sage/src/sage-${version}.tar.gz" + "https://sage.mirror.garr.it/mirrors/sage/src/sage-${version}.tar.gz" + "https://www.mirrorservice.org/sites/www.sagemath.org/src/sage-${version}.tar.gz" "http://mirror.switch.ch/mirror/sagemath/src/sage-${version}.tar.gz" "https://mirrors.up.pt/pub/sage/src/sage-${version}.tar.gz" "http://www-ftp.lip6.fr/pub/math/sagemath/src/sage-${version}.tar.gz" diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/applications/science/math/scilab-bin/default.nix index 154f1ba39e3c..ad0231d37b0e 100644 --- a/pkgs/applications/science/math/scilab-bin/default.nix +++ b/pkgs/applications/science/math/scilab-bin/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { inherit name; src = fetchurl { - url = "http://www.scilab.org/download/${ver}/scilab-${ver}.bin.linux-${architecture}.tar.gz"; + url = "https://www.scilab.org/download/${ver}/scilab-${ver}.bin.linux-${architecture}.tar.gz"; sha256 = if stdenv.system == "i686-linux" then "6143a95ded40411a35630a89b365875a6526cd4db1e2865ac5612929a7db937a" diff --git a/pkgs/applications/science/math/scilab/default.nix b/pkgs/applications/science/math/scilab/default.nix index bb52b430f8cb..fcdbb6b985d6 100644 --- a/pkgs/applications/science/math/scilab/default.nix +++ b/pkgs/applications/science/math/scilab/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { version = "4.1.2"; name = "scilab-${version}"; src = fetchurl { - url = "http://www.scilab.org/download/${version}/${name}-src.tar.gz"; + url = "https://www.scilab.org/download/${version}/${name}-src.tar.gz"; sha256 = "1adk6jqlj7i3gjklvlf1j3il1nb22axnp4rvwl314an62siih0sc"; }; diff --git a/pkgs/applications/science/math/scotch/default.nix b/pkgs/applications/science/math/scotch/default.nix index 3b01c684d529..8fa020ba07c9 100644 --- a/pkgs/applications/science/math/scotch/default.nix +++ b/pkgs/applications/science/math/scotch/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { buildInputs = [ bison openmpi flex zlib ]; src = fetchurl { - url = "http://gforge.inria.fr/frs/download.php/file/34618/${src_name}.tar.gz"; + url = "https://gforge.inria.fr/frs/download.php/file/34618/${src_name}.tar.gz"; sha256 = "f53f4d71a8345ba15e2dd4e102a35fd83915abf50ea73e1bf6efe1bc2b4220c7"; }; diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix index b139f30b3d18..0f0c6aaf74da 100644 --- a/pkgs/applications/science/misc/openmvg/default.nix +++ b/pkgs/applications/science/misc/openmvg/default.nix @@ -8,7 +8,7 @@ , enableDocs ? false }: stdenv.mkDerivation rec { - version = "1.1"; + version = "1.3"; name = "openmvg-${version}"; src = fetchgit { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # Tag v1.1 rev = "refs/tags/v${version}"; - sha256 = "1di9i7yxnkdvl8lhflynmqw62gaxwv00r1sd7nzzs9qn63g0af0f"; + sha256 = "1cf1gbcl8zvxp4rr6f6vaxwcg0yzc4xban2b5p9zy1m4k1f81zyb"; fetchSubmodules = true; }; diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix index ef539ac9c8df..4e5b986a428e 100644 --- a/pkgs/applications/science/misc/openmvs/default.nix +++ b/pkgs/applications/science/misc/openmvs/default.nix @@ -24,10 +24,28 @@ stdenv.mkDerivation rec { "-DBUILD_STATIC_RUNTIME=ON" "-DINSTALL_BIN_DIR=$out/bin" "-DVCG_DIR=${vcg}" + "-DCGAL_ROOT=${cgal}/lib/cmake/CGAL" "-DCERES_DIR=${ceres-solver}/lib/cmake/Ceres/" ) ''; + + postFixup = '' + rp=$(patchelf --print-rpath $out/bin/DensifyPointCloud) + patchelf --set-rpath $rp:$out/lib/OpenMVS $out/bin/DensifyPointCloud + rp=$(patchelf --print-rpath $out/bin/InterfaceVisualSFM) + patchelf --set-rpath $rp:$out/lib/OpenMVS $out/bin/InterfaceVisualSFM + + rp=$(patchelf --print-rpath $out/bin/ReconstructMesh) + patchelf --set-rpath $rp:$out/lib/OpenMVS $out/bin/ReconstructMesh + + rp=$(patchelf --print-rpath $out/bin/RefineMesh) + patchelf --set-rpath $rp:$out/lib/OpenMVS $out/bin/RefineMesh + + rp=$(patchelf --print-rpath $out/bin/TextureMesh) + patchelf --set-rpath $rp:$out/lib/OpenMVS $out/bin/TextureMesh + ''; + cmakeDir = "./"; dontUseCmakeBuildDir = true; diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 11087846e05c..295e726c679d 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation { - name = "gromacs-2018.1"; + name = "gromacs-2018.2"; src = fetchurl { - url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2018.1.tar.gz"; - sha256 = "1k85sz0b9rmq00g58v22y9v671gsa512sjivx3n3yclr0hs36dad"; + url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2018.2.tar.gz"; + sha256 = "0mvqsg2j4h529a0vvvgpa4cb3p8zan18zcdlmx1na2si1h9fipab"; }; buildInputs = [cmake fftw] diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/applications/science/physics/sacrifice/default.nix index 6c25f720ebf9..64b88dcc3d4f 100644 --- a/pkgs/applications/science/physics/sacrifice/default.nix +++ b/pkgs/applications/science/physics/sacrifice/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.0.0"; src = fetchurl { - url = "http://www.hepforge.org/archive/agile/Sacrifice-1.0.0.tar.gz"; + url = "https://www.hepforge.org/archive/agile/Sacrifice-1.0.0.tar.gz"; sha256 = "10bvpq63kmszy1habydwncm0j1dgvam0fkrmvkgbkvf804dcjp6g"; }; diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix index 340428e8e777..66a9bebacf0d 100644 --- a/pkgs/applications/science/physics/sherpa/default.nix +++ b/pkgs/applications/science/physics/sherpa/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.2.5"; src = fetchurl { - url = "http://www.hepforge.org/archive/sherpa/SHERPA-MC-${version}.tar.gz"; + url = "https://www.hepforge.org/archive/sherpa/SHERPA-MC-${version}.tar.gz"; sha256 = "0rv14j8gvjjr3darb0wcradlmsnyq915jz7v2yybrjzqfbsr3zb5"; }; diff --git a/pkgs/applications/science/robotics/gazebo/default.nix b/pkgs/applications/science/robotics/gazebo/default.nix index 3edf75a4bffe..1d933d569486 100644 --- a/pkgs/applications/science/robotics/gazebo/default.nix +++ b/pkgs/applications/science/robotics/gazebo/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { name = "gazebo-${version}"; src = fetchurl { - url = "http://osrf-distributions.s3.amazonaws.com/gazebo/releases/${name}.tar.bz2"; + url = "https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${name}.tar.bz2"; sha256 = src-sha256; }; diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index ade8af254496..8c442f31cd14 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { name = "recoll-${ver}"; src = fetchurl { - url = "http://www.lesbonscomptes.com/recoll/${name}.tar.gz"; + url = "https://www.lesbonscomptes.com/recoll/${name}.tar.gz"; sha256 = "186bj8zx2xw9hwrzvzxdgdin9nj7msiqh5j57w5g7j4abdlsisjn"; }; diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index d890001489ff..a6efb8d339e9 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "1.1"; src = fetchurl { - url = "http://git.zx2c4.com/cgit/snapshot/${name}.tar.xz"; + url = "https://git.zx2c4.com/cgit/snapshot/${name}.tar.xz"; sha256 = "142qcgs8dwnzhymn0a7xx47p9fc2z5wrb86ah4a9iz0mpqlsz288"; }; diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 9a4ef524dde9..24da6a71c580 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -95,6 +95,8 @@ rec { git-stree = callPackage ./git-stree { }; + git-sync = callPackage ./git-sync { }; + git2cl = callPackage ./git2cl { }; gitFastExport = callPackage ./fast-export { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix new file mode 100644 index 000000000000..7ba7d8ec2434 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub, coreutils, gnugrep, gnused, makeWrapper, git +}: + +stdenv.mkDerivation rec { + name = "git-sync-${version}"; + version = "20151024"; + + src = fetchFromGitHub { + owner = "simonthum"; + repo = "git-sync"; + rev = "eb9adaf2b5fd65aac1e83d6544b9076aae6af5b7"; + sha256 = "01if8y93wa0mwbkzkzx2v1vqh47zlz4k1dysl6yh5rmppd1psknz"; + }; + + buildInputs = [ makeWrapper ]; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin + cp -a git-sync $out/bin/git-sync + ''; + + wrapperPath = with stdenv.lib; makeBinPath [ + coreutils + git + gnugrep + gnused + ]; + + fixupPhase = '' + patchShebangs $out/bin + + wrapProgram $out/bin/git-sync \ + --prefix PATH : "${wrapperPath}" + ''; + + meta = { + description = "A script to automatically synchronize a git repository"; + homepage = https://github.com/simonthum/git-sync; + maintainers = with stdenv.lib.maintainers; [ imalison ]; + license = stdenv.lib.licenses.cc0; + platforms = with stdenv.lib.platforms; unix; + }; +} diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index f2786b15f344..1535d88026a3 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -7,7 +7,7 @@ in stdenv.mkDerivation rec { name = "redmine-${version}"; src = fetchurl { - url = "http://www.redmine.org/releases/${name}.tar.gz"; + url = "https://www.redmine.org/releases/${name}.tar.gz"; sha256 = "0x0zwxyj4dwbk7l64s3lgny10mjf0ba8jwrbafsm4d72sncmacv0"; }; diff --git a/pkgs/applications/version-management/srcml/default.nix b/pkgs/applications/version-management/srcml/default.nix index 2da53d1da893..8753d4f6f571 100644 --- a/pkgs/applications/version-management/srcml/default.nix +++ b/pkgs/applications/version-management/srcml/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Infrastructure for exploration, analysis, and manipulation of source code"; - homepage = http://www.srcml.org; + homepage = https://www.srcml.org; license = licenses.gpl2Plus; maintainers = with maintainers; [ leenaars ]; }; diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/applications/version-management/tailor/default.nix index 4d41cad0d8e6..dc202e9e7b49 100644 --- a/pkgs/applications/version-management/tailor/default.nix +++ b/pkgs/applications/version-management/tailor/default.nix @@ -7,7 +7,7 @@ python2Packages.buildPythonApplication rec { src = fetchurl { urls = [ "http://darcs.arstecnica.it/tailor/tailor-${version}.tar.gz" - "http://src.fedoraproject.org/repo/pkgs/tailor/tailor-${version}.tar.gz/58a6bc1c1d922b0b1e4579c6440448d1/tailor-${version}.tar.gz" + "https://src.fedoraproject.org/repo/pkgs/tailor/tailor-${version}.tar.gz/58a6bc1c1d922b0b1e4579c6440448d1/tailor-${version}.tar.gz" ]; sha256 = "061acapxxn5ab3ipb5nd3nm8pk2xj67bi83jrfd6lqq3273fmdjh"; }; diff --git a/pkgs/applications/video/dvb-apps/default.nix b/pkgs/applications/video/dvb-apps/default.nix index 1e671b4ea7bf..6281c7884015 100644 --- a/pkgs/applications/video/dvb-apps/default.nix +++ b/pkgs/applications/video/dvb-apps/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "dvb-apps-7f68f9c8d311"; src = fetchurl { - url = "http://linuxtv.org/hg/dvb-apps/archive/7f68f9c8d311.tar.gz"; + url = "https://linuxtv.org/hg/dvb-apps/archive/7f68f9c8d311.tar.gz"; sha256 = "0a6c5jjq6ad98bj0r954l3n7zjb2syw9m19jksg06z4zg1z8yg82"; }; diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 75dbb06235b9..107939086325 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qmake, qtscript }: stdenv.mkDerivation rec { - name = "smplayer-18.5.0"; + name = "smplayer-18.6.0"; src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "0fxd8zmp5dyk7y9yymjhj2i5218nfvfqb4830pgzzjqz1zdax8rn"; + sha256 = "0pb862l175ycm6fm90nryzgbqy8kbwpv3i6cbn13h7jh1yrz8nqx"; }; buildInputs = [ qtscript ]; diff --git a/pkgs/applications/video/xawtv/default.nix b/pkgs/applications/video/xawtv/default.nix index 9fcb88c2aaa0..bf77e1d35472 100644 --- a/pkgs/applications/video/xawtv/default.nix +++ b/pkgs/applications/video/xawtv/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "xawtv-3.104"; src = fetchurl { - url = "http://linuxtv.org/downloads/xawtv/${name}.tar.bz2"; + url = "https://linuxtv.org/downloads/xawtv/${name}.tar.bz2"; sha256 = "0jnvbahxmx9jw8g2519wmc1dq9afnlqcrzc876fcbf2x1iz39qxr"; }; diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix index 5b3610243be0..711838b29447 100644 --- a/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/pkgs/applications/virtualization/ecs-agent/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { name = "${pname}-${version}"; pname = "amazon-ecs-agent"; - version = "1.14.0"; + version = "1.18.0"; goPackagePath = "github.com/aws/${pname}"; subPackages = [ "agent" ]; @@ -12,7 +12,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "aws"; repo = pname; - sha256 = "12c8l0x8pm883rlbdr1m07r0kjkzggkfz35cjqz8pzyr5ymjdrc3"; + sha256 = "1l6c2if6wpjmq2hh6k818w38s1rsbwgd6igqy948dwcrb1g1mixr"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix index 9c16733e4a07..b12e7bd5f470 100644 --- a/pkgs/applications/virtualization/spice-vdagent/default.nix +++ b/pkgs/applications/virtualization/spice-vdagent/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "spice-vdagent-0.18.0"; src = fetchurl { - url = "http://www.spice-space.org/download/releases/${name}.tar.bz2"; + url = "https://www.spice-space.org/download/releases/${name}.tar.bz2"; sha256 = "1bmyvapwj1x0m6y8q0r1df2q37vsnb04qkgnnrfbnzf1qzipxvl0"; }; postPatch = '' diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index da092bed47be..883cd1c867a1 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation { name = "virtualbox-${version}"; src = fetchurl { - url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; + url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; sha256 = main; }; diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index 6e0adb15ffdb..9f1e565d1666 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -1,29 +1,29 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, dbus, gdk_pixbuf, libnotify, makeWrapper, pkgconfig, xorg, alsaUtils }: +{ stdenv, lib, rustPlatform, fetchFromGitHub, dbus, gdk_pixbuf, libnotify, makeWrapper, pkgconfig, xorg +, enableAlsaUtils ? true, alsaUtils }: rustPlatform.buildRustPackage rec { name = "dwm-status-${version}"; - version = "0.5.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "Gerschtli"; repo = "dwm-status"; rev = version; - sha256 = "1mppj57h5yr0azypf5d2cgz2wv3k52mg3k4npyfhbmfy1393qbjs"; + sha256 = "0k6r72qgns8i2y1ks0k9fwlabgndww5rssd13mis5bvkqla8j9i9"; }; nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ dbus gdk_pixbuf libnotify xorg.libX11 ]; - cargoSha256 = "0qr999hwrqn7a4n4kvbrpli7shxp9jchj8csxzsw951qmzq32qwv"; + cargoSha256 = "13ibcbk8shfajk200d8v2p6y3zfrz5dlvxqfw1zsm630s5dmy6qx"; - # needed because alsaUtils is an optional runtime dependency - postInstall = lib.optionalString (alsaUtils != null) '' + postInstall = lib.optionalString enableAlsaUtils '' wrapProgram $out/bin/dwm-status \ --prefix "PATH" : "${alsaUtils}/bin" ''; meta = with stdenv.lib; { - description = "DWM status service which dynamically updates when needed"; + description = "Highly performant and configurable DWM status service"; homepage = https://github.com/Gerschtli/dwm-status; license = with licenses; [ mit ]; maintainers = with maintainers; [ gerschtli ]; diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index b2e34a016adc..6f3505056c37 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "herbstluftwm-0.7.0"; src = fetchurl { - url = "http://herbstluftwm.org/tarballs/${name}.tar.gz"; + url = "https://herbstluftwm.org/tarballs/${name}.tar.gz"; sha256 = "09xfs213vg1dpird61wik5bqb9yf8kh63ssy18ihf54inwqgqbvy"; }; diff --git a/pkgs/applications/window-managers/i3/easyfocus.nix b/pkgs/applications/window-managers/i3/easyfocus.nix new file mode 100644 index 000000000000..337ecdd651ff --- /dev/null +++ b/pkgs/applications/window-managers/i3/easyfocus.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, pkgconfig, xproto, libxcb, xcbutilkeysyms +, xlibs , i3ipc-glib , glib +}: + +stdenv.mkDerivation rec { + name = "i3easyfocus-${version}"; + version = "20180622"; + + src = fetchFromGitHub { + owner = "cornerman"; + repo = "i3-easyfocus"; + rev = "3631d5af612d58c3d027f59c86b185590bd78ae1"; + sha256 = "1wgknmmm7iz0wxsdh29gmx4arizva9101pzhnmac30bmixf3nzhr"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxcb xcbutilkeysyms xproto xlibs.libX11.dev i3ipc-glib glib.dev ]; + + # Makefile has no rule for 'install' + installPhase = '' + mkdir -p $out/bin + cp i3-easyfocus $out/bin + ''; + + meta = with stdenv.lib; { + description = "Focus and select windows in i3"; + homepage = https://github.com/cornerman/i3-easyfocus; + maintainers = with maintainers; [teto]; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/i3/i3ipc-glib.nix b/pkgs/applications/window-managers/i3/i3ipc-glib.nix new file mode 100644 index 000000000000..87e11774d43b --- /dev/null +++ b/pkgs/applications/window-managers/i3/i3ipc-glib.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, pkgconfig, xproto, libxcb +, autoreconfHook, json-glib, gtk-doc, which +, gobjectIntrospection +}: + +stdenv.mkDerivation rec { + + name = "i3ipc-glib-${version}"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "acrisci"; + repo = "i3ipc-glib"; + rev = "v${version}"; + sha256 = "1gmk1zjafrn6jh4j7r0wkwrpwvf9drl1lcw8vya23i1f4zbk0wh4"; + }; + + nativeBuildInputs = [ autoreconfHook which pkgconfig ]; + + buildInputs = [ libxcb json-glib gtk-doc xproto gobjectIntrospection ]; + + + preAutoreconf = '' + gtkdocize + ''; + + meta = with stdenv.lib; { + description = "A C interface library to i3wm"; + homepage = https://github.com/acrisci/i3ipc-glib; + maintainers = with maintainers; [teto]; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/matchbox/default.nix b/pkgs/applications/window-managers/matchbox/default.nix index 17084d6a6a70..635265b04abc 100644 --- a/pkgs/applications/window-managers/matchbox/default.nix +++ b/pkgs/applications/window-managers/matchbox/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { buildInputs = [ libmatchbox ]; src = fetchurl { - url = "http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/${version}/matchbox-window-manager-${version}.tar.bz2"; + url = "https://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/${version}/matchbox-window-manager-${version}.tar.bz2"; sha256 = "1zyfq438b466ygcz78nvsmnsc5bhg4wcfnpxb43kbkwpyx53m8l1"; }; diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix index c219c81c2a50..887a58b748da 100644 --- a/pkgs/applications/window-managers/sawfish/default.nix +++ b/pkgs/applications/window-managers/sawfish/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sourceName = "sawfish_${version}"; src = fetchurl { - url = "http://download.tuxfamily.org/sawfish/${sourceName}.tar.xz"; + url = "https://download.tuxfamily.org/sawfish/${sourceName}.tar.xz"; sha256 = "18p8srqqj9vjffg13qhspfz2gr1h4vfs10qzlv89g76r289iam31"; }; diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 4a15e3236168..d967f55b81c8 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "4.0.0"; src = fetchurl { - url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; + url = "https://wayland.freedesktop.org/releases/${name}.tar.xz"; sha256 = "0n2big8xw6g6n46zm1jyf00dv9r4d84visdz5b8vxpw3xzkhmz50"; }; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Reference implementation of a Wayland compositor"; - homepage = http://wayland.freedesktop.org/; + homepage = https://wayland.freedesktop.org/; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index bce5436353c3..f9816b2d0d7c 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -181,6 +181,7 @@ rec { outputHashAlgo = hashAlgo; outputHash = hash; preferLocalBuild = true; + allowSubstitutes = false; builder = writeScript "restrict-message" '' source ${stdenvNoCC}/setup cat <<_EOF_ diff --git a/pkgs/data/fonts/clearlyU/default.nix b/pkgs/data/fonts/clearlyU/default.nix index cbca697cb262..5dc8e53282ab 100644 --- a/pkgs/data/fonts/clearlyU/default.nix +++ b/pkgs/data/fonts/clearlyU/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "clearlyU-12-1.9"; src = fetchurl { - url = http://www.math.nmsu.edu/~mleisher/Software/cu/cu12-1.9.tgz; + url = https://www.math.nmsu.edu/~mleisher/Software/cu/cu12-1.9.tgz; sha256 = "1xn14jbv3m1khy7ydvad9ydkn7yygdbhjy9wm1v000jzjwr3lv21"; }; diff --git a/pkgs/data/fonts/font-awesome-5/default.nix b/pkgs/data/fonts/font-awesome-5/default.nix index 6bb175f1ecac..77c2ed4d780c 100644 --- a/pkgs/data/fonts/font-awesome-5/default.nix +++ b/pkgs/data/fonts/font-awesome-5/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: let - version = "5.0.6"; + version = "5.1.0"; in fetchzip rec { name = "font-awesome-${version}"; @@ -14,7 +14,7 @@ in fetchzip rec { unzip -j $downloadedFile "Font-Awesome-${version}/use-on-desktop/Font Awesome 5 Free-Solid-900.otf" -d $out/share/fonts/opentype ''; - sha256 = "1p7xb8s371r62rx0akcnlkk4mspjid6y0s9h04gakx83ymgjlfg4"; + sha256 = "12m35bk61d8pddhybg2jpl5xv16dclz1qacdmk05m11nzshd3nz1"; meta = with stdenv.lib; { description = "Font Awesome - OTF font"; diff --git a/pkgs/data/fonts/proggyfonts/default.nix b/pkgs/data/fonts/proggyfonts/default.nix index 5ebb365ecdfb..b2207e01df1a 100644 --- a/pkgs/data/fonts/proggyfonts/default.nix +++ b/pkgs/data/fonts/proggyfonts/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "proggyfonts-0.1"; src = fetchurl { - url = "http://web.archive.org/web/20150801042353/http://kaictl.net/software/proggyfonts-0.1.tar.gz"; + url = "https://web.archive.org/web/20150801042353/http://kaictl.net/software/proggyfonts-0.1.tar.gz"; sha256 = "1plcm1sjpa3hdqhhin48fq6zmz3ndm4md72916hd8ff0w6596q0n"; }; diff --git a/pkgs/data/icons/hicolor-icon-theme/default.nix b/pkgs/data/icons/hicolor-icon-theme/default.nix index 03c5be143ded..2c0872188e02 100644 --- a/pkgs/data/icons/hicolor-icon-theme/default.nix +++ b/pkgs/data/icons/hicolor-icon-theme/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "hicolor-icon-theme-0.17"; src = fetchurl { - url = "http://icon-theme.freedesktop.org/releases/${name}.tar.xz"; + url = "https://icon-theme.freedesktop.org/releases/${name}.tar.xz"; sha256 = "1n59i3al3zx6p90ff0l43gzpzmlqnzm6hf5cryxqrlbi48sq8x1i"; }; diff --git a/pkgs/data/misc/freepats/default.nix b/pkgs/data/misc/freepats/default.nix index ac015c02b199..e48470a67bb7 100644 --- a/pkgs/data/misc/freepats/default.nix +++ b/pkgs/data/misc/freepats/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "freepats-20060219"; src = fetchurl { - url = "http://freepats.zenvoid.org/${name}.tar.bz2"; + url = "https://freepats.zenvoid.org/${name}.tar.bz2"; sha256 = "12iw36rd94zirll96cd5k0va7p5hxmf2shvjlhzihcmjaw8flq82"; }; diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index a60368e5c6dc..d25a165e40c4 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/db00b74891fcaae598fdcaf3835e274be8f2c082.tar.gz"; - sha256 = "0csvwqnvyg2jg76rr4blm4hm6max10a6as4mnwdz76sliw4092sg"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/dc7b5d4f0ee056ec87a4a5069b3c68bdd316abd6.tar.gz"; + sha256 = "0llycqa2y6ng5bhzb19ya6p83k0chfycpivg9287gzsmj363j934"; } diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix index d7a5ce33bd26..d14ccdec2ead 100644 --- a/pkgs/data/misc/poppler-data/default.nix +++ b/pkgs/data/misc/poppler-data/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "poppler-data-0.4.9"; src = fetchurl { - url = "http://poppler.freedesktop.org/${name}.tar.gz"; + url = "https://poppler.freedesktop.org/${name}.tar.gz"; sha256 = "04i0wgdkn5lhda8cyxd1ll4a2p41pwqrwd47n9mdpl7cx5ypx70z"; }; diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index d0c6558a611b..c035dc408dc0 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -52,7 +52,7 @@ let hitori gnome-taquin ]; - inherit (pkgs) atk glib gobjectIntrospection webkitgtk gtk3 gtkmm3 + inherit (pkgs) atk glib gobjectIntrospection gspell webkitgtk gtk3 gtkmm3 libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceview4 easytag meld orca rhythmbox shotwell gnome-usage clutter clutter-gst clutter-gtk cogl gtkvnc libdazzle; @@ -375,8 +375,6 @@ let gitg = callPackage ./misc/gitg { }; - gspell = callPackage ./misc/gspell { }; - libgnome-games-support = callPackage ./misc/libgnome-games-support { }; libgda = callPackage ./misc/libgda { }; diff --git a/pkgs/desktops/lxqt/base/libsysstat/default.nix b/pkgs/desktops/lxqt/base/libsysstat/default.nix index b5013f5ac1aa..409afe6d7729 100644 --- a/pkgs/desktops/lxqt/base/libsysstat/default.nix +++ b/pkgs/desktops/lxqt/base/libsysstat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libsysstat-${version}"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "lxde"; repo = "libsysstat"; rev = version; - sha256 = "0yl20dj553z1ijkfxl9n45qvkzxyl9rqw12vb4v6zj3ch6hzbzsx"; + sha256 = "0ad5pcr5lq1hvrfijvddvz2fvsmh1phb54wb0f756av0kyiwq0gb"; }; nativeBuildInputs = [ cmake lxqt.lxqt-build-tools ]; diff --git a/pkgs/desktops/lxqt/core/libfm-qt/default.nix b/pkgs/desktops/lxqt/core/libfm-qt/default.nix index 612fbeafe199..f3a50814d638 100644 --- a/pkgs/desktops/lxqt/core/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/core/libfm-qt/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "libfm-qt"; - version = "0.12.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0932yl098pc5rwgy9irrc3ys47jx64m3wm702dvs8yy15alv6x4i"; + sha256 = "1g8j1lw74qvagqhqsx45b290fjwh3jfl3i0366m0w4la03v0rw5j"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix b/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix index 10b767aedac0..8324cdc3dff0 100644 --- a/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "lxqt-l10n-${version}"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "lxde"; repo = "lxqt-l10n"; rev = version; - sha256 = "025zg5y9f286p74rab4yxyz4cqlh4hqjq43xxpi76ma2fy2s03a4"; + sha256 = "0q1hzj6sa4wc8sgqqqsqfldjpnvihacfq73agvc2li3q6qi5rr0k"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/core/lxqt-themes/default.nix b/pkgs/desktops/lxqt/core/lxqt-themes/default.nix index 6251667430b2..5f996c78643d 100644 --- a/pkgs/desktops/lxqt/core/lxqt-themes/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-themes/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-themes"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0f7bipkxkl741lpb2cziw9wlqy05514nqqrppsz5g4y8bmzw910n"; + sha256 = "026hbblxdbq48n9691b1z1xiak99khsk3wf09vn4iaj5zi7dwhw5"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/core/qtermwidget/default.nix b/pkgs/desktops/lxqt/core/qtermwidget/default.nix index f882088d07b8..56c42cb28532 100644 --- a/pkgs/desktops/lxqt/core/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/core/qtermwidget/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "qtermwidget"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "14yjz6b1l2yd7sfsxjv26yg5153fpyq23443kswkgkd9jh32gxj4"; + sha256 = "05gbdjzgmcr3ljs9ba3qvh7a3v6yn6vakwfy8avld9gy5bdd76rg"; }; nativeBuildInputs = [ cmake lxqt.lxqt-build-tools ]; diff --git a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix index c40b9c4e9f94..cd3b91f4cbdf 100644 --- a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix +++ b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "obconf-qt"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "1vwza1516z7f18s5vfnhzsiyxs6afb1hgr3yqkr7qhplmq5wjma5"; + sha256 = "0mixf35p7b563f77vnikk9b1wqhbdawp723sd30rfql76gkjwjcn"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index 3b5d303816ba..3289ff5081b5 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-screensaver-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1698608m6kf4dn91xdwy7l809yagz02h1k594smj75wvnhr7x4k9"; + sha256 = "1mcr2915wymwjy55m2z0l6b9dszabbv0my0xxsa1fb8xkr4hk4qh"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix index d82cd4b073a2..b108a20d5f06 100644 --- a/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-sensors-applet-${version}"; - version = "1.20.1"; + version = "1.20.2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0lnr3jjq30zw1i2rv5n69dhsa3x39lc91xcgbj4vyj1rxj9ff05x"; + sha256 = "0khxzwjjf2gp9ma6ji0ynvvqlw6hhr8j4gff9klkrn60xbg5h16b"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index 97c80cdc2e4e..47657375bbab 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "mate-session-manager-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0vzr6y9shw4zb3ddfrj0nn7yqggpq9sv6h33p0xxdx71ydl40p2g"; + sha256 = "0gdxa46ps0fxspri08kpp99vzx06faw6x30k6vbjg5m7x1xfq7i5"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index 8c67044a4220..0dc21f276732 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-system-monitor-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "059aryj0gz4sic719nsmckhkjl4yhqxmyplvh78clf5khh4apwn5"; + sha256 = "1a68il7pbch5028fm2caxyjkfrdc6ixhqnaspbwfziw6y8p9bscn"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix index 55cd82eecdc7..4d878e224967 100644 --- a/pkgs/desktops/mate/mate-user-guide/default.nix +++ b/pkgs/desktops/mate/mate-user-guide/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-user-guide-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1n1rlvymz8k7vvjmd9qkv26wz3770w1ywsa41kbisbfp9x7mr0w2"; + sha256 = "1k99cjg54wlipy5bfiv6v6za6gdzmilfvlvb0ingv4p51jp4iddr"; }; nativeBuildInputs = [ itstool intltool libxml2 ]; diff --git a/pkgs/development/compilers/asn1c/default.nix b/pkgs/development/compilers/asn1c/default.nix index eda895d726a0..ce754813dda1 100644 --- a/pkgs/development/compilers/asn1c/default.nix +++ b/pkgs/development/compilers/asn1c/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.9.28"; src = fetchurl { - url = "http://lionet.info/soft/asn1c-${version}.tar.gz"; + url = "https://lionet.info/soft/asn1c-${version}.tar.gz"; sha256 = "1fc64g45ykmv73kdndr4zdm4wxhimhrir4rxnygxvwkych5l81w0"; }; diff --git a/pkgs/development/compilers/chicken/default.nix b/pkgs/development/compilers/chicken/default.nix index ad9e57f794f0..ceeff56330b2 100644 --- a/pkgs/development/compilers/chicken/default.nix +++ b/pkgs/development/compilers/chicken/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { binaryVersion = 8; src = fetchurl { - url = "http://code.call-cc.org/releases/${version}/chicken-${version}.tar.gz"; + url = "https://code.call-cc.org/releases/${version}/chicken-${version}.tar.gz"; sha256 = "0hvckhi5gfny3mlva6d7y9pmx7cbwvq0r7mk11k3sdiik9hlkmdd"; }; diff --git a/pkgs/development/compilers/clean/default.nix b/pkgs/development/compilers/clean/default.nix index 3fed2289f954..16ac8b787219 100644 --- a/pkgs/development/compilers/clean/default.nix +++ b/pkgs/development/compilers/clean/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1w8vvmkwzq8g51639r62apcy75sj69nm08082a34xvqm9ymfgkq5"; }) else if stdenv.system == "x86_64-linux" then (fetchurl { - url = "http://clean.cs.ru.nl/download/Clean24/linux/clean2.4_64_boot.tar.gz"; + url = "https://clean.cs.ru.nl/download/Clean24/linux/clean2.4_64_boot.tar.gz"; sha256 = "08gsa1pjl5wyzh4ah8ccfx8a7mdcn6ycsn1lzkrr9adygv1gmm7r"; }) else throw "Architecture not supported"; diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix index ffbe3c5a62f4..61b24a851941 100644 --- a/pkgs/development/compilers/colm/default.nix +++ b/pkgs/development/compilers/colm/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.13.0.6"; src = fetchurl { - url = "http://www.colm.net/files/colm/${name}.tar.gz"; + url = "https://www.colm.net/files/colm/${name}.tar.gz"; sha256 = "0jd3qmqdm8yszy0yysbp3syk7pcbxvwzv9mibdwz7v9bv1nrai26"; }; diff --git a/pkgs/development/compilers/gforth/default.nix b/pkgs/development/compilers/gforth/default.nix index 6ea21207f19f..675522d54ead 100644 --- a/pkgs/development/compilers/gforth/default.nix +++ b/pkgs/development/compilers/gforth/default.nix @@ -6,7 +6,7 @@ in stdenv.mkDerivation { name = "gforth-${version}"; src = fetchurl { - url = "http://ftp.gnu.org/gnu/gforth/gforth-${version}.tar.gz"; + url = "https://ftp.gnu.org/gnu/gforth/gforth-${version}.tar.gz"; sha256 = "1c1bahc9ypmca8rv2dijiqbangm1d9av286904yw48ph7ciz4qig"; }; diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix index 4d2f3894f178..0f5a43d57eda 100644 --- a/pkgs/development/compilers/ghc/8.4.3.nix +++ b/pkgs/development/compilers/ghc/8.4.3.nix @@ -22,7 +22,7 @@ , # Whether to build dynamic libs for the standard library (on the target # platform). Static libs are always built. - enableShared ? !targetPlatform.isWindows && !targetPlatform.useAndroidPrebuilt && !targetPlatform.useiOSPrebuilt + enableShared ? !targetPlatform.isWindows && !targetPlatform.useiOSPrebuilt , # Whetherto build terminfo. enableTerminfo ? !targetPlatform.isWindows @@ -49,7 +49,8 @@ let '' + stdenv.lib.optionalString enableIntegerSimple '' INTEGER_LIBRARY = integer-simple '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = YES + Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO BUILD_SPHINX_PDF = NO @@ -74,7 +75,7 @@ let targetCC = builtins.head toolsForTarget; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { version = "8.4.3"; name = "${targetPrefix}ghc-${version}"; @@ -208,4 +209,8 @@ stdenv.mkDerivation rec { inherit (ghc.meta) license platforms; }; -} +} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { + dontStrip = true; + dontPatchELF = true; + noAuditTmpdir = true; +}) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 8ccd72ef55a2..43e6473fc241 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -7,7 +7,7 @@ , libffi, libiconv ? null, ncurses -, useLLVM ? !targetPlatform.isx86 +, useLLVM ? !targetPlatform.isx86 || targetPlatform.isMusl , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. @@ -50,7 +50,8 @@ let '' + stdenv.lib.optionalString enableIntegerSimple '' INTEGER_LIBRARY = integer-simple '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = YES + Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO BUILD_SPHINX_PDF = NO @@ -166,10 +167,10 @@ stdenv.mkDerivation rec { # that in turn causes GHCi to abort stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; - hardeningDisable = [ "format" ]; - checkTarget = "test"; + hardeningDisable = [ "format" ]; + postInstall = '' for bin in "$out"/lib/${name}/bin/*; do isELF "$bin" || continue diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index 65b43f712ae2..9aa3efe614eb 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -80,12 +80,12 @@ in stdenv.mkDerivation { cd lib/boot mkdir -p $out/bin - mkdir -p $out/libexec + mkdir -p $out/lib/${bootGhcjs.name} lndir ${libexec} $out/bin - wrapProgram $out/bin/ghcjs --add-flags "-B$out/libexec" - wrapProgram $out/bin/haddock-ghcjs --add-flags "-B$out/libexec" - wrapProgram $out/bin/ghcjs-pkg --add-flags "--global-package-db=$out/libexec/package.conf.d" + wrapProgram $out/bin/ghcjs --add-flags "-B$out/lib/${bootGhcjs.name}" + wrapProgram $out/bin/haddock-ghcjs --add-flags "-B$out/lib/${bootGhcjs.name}" + wrapProgram $out/bin/ghcjs-pkg --add-flags "--global-package-db=$out/lib/${bootGhcjs.name}/package.conf.d" env PATH=$out/bin:$PATH $out/bin/ghcjs-boot -j1 --with-ghcjs-bin $out/bin ''; diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index ca1e2f54df93..cc27d19781fe 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -2,15 +2,13 @@ stdenv.mkDerivation rec { name = "glslang-git-${version}"; - version = "2018-02-05"; + version = "2018-06-21"; - # `vulkan-loader` requires a specific version of `glslang` as specified in - # `/external_revisions/glslang_revision`. src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "2651ccaec8"; - sha256 = "0x5x5i07n9g809rzf5jgw70mmwck31ishdmxnmi0wxx737jjqwaq"; + rev = "ef1f899b5d64a9628023f1bb129198674cba2b97"; + sha256 = "052w6rahmy1wlphv533wz8nyn82icky28lprvl8w3acfq3831zg6"; }; buildInputs = [ cmake bison jq ] ++ spirv-tools.buildInputs; diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index b847a67e7e3f..a6fb61198176 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -78,6 +78,10 @@ in stdenv.mkDerivation rec { "-DLLVM_BUILD_TESTS=ON" "-DLLVM_ENABLE_FFI=ON" "-DLLVM_ENABLE_RTTI=ON" + + "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" ] ++ stdenv.lib.optional enableSharedLibraries [ "-DLLVM_LINK_LLVM_DYLIB=ON" ] ++ stdenv.lib.optional (!isDarwin) @@ -86,9 +90,6 @@ in stdenv.mkDerivation rec { "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ - "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" - "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" # Not yet supported "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" "-DCOMPILER_RT_BUILD_XRAY=OFF" diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index 708e471bd4ac..458ad7db8efd 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -122,6 +122,10 @@ in stdenv.mkDerivation rec { "-DLLVM_ENABLE_FFI=ON" "-DLLVM_ENABLE_RTTI=ON" "-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code + + "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" ] ++ stdenv.lib.optional enableSharedLibraries [ "-DLLVM_LINK_LLVM_DYLIB=ON" ] ++ stdenv.lib.optional (!isDarwin) @@ -133,9 +137,6 @@ in stdenv.mkDerivation rec { "-DCMAKE_CROSSCOMPILING=True" "-DLLVM_TABLEGEN=${buildPackages.llvmPackages_39.llvm}/bin/llvm-tblgen" ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ - "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" - "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" # Not yet supported "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" "-DCOMPILER_RT_BUILD_XRAY=OFF" diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index 06bcd74456c4..e9140d3fcc6a 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -100,6 +100,10 @@ in stdenv.mkDerivation (rec { "-DLLVM_ENABLE_FFI=ON" "-DLLVM_ENABLE_RTTI=ON" "-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code + + "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" ] ++ stdenv.lib.optional enableSharedLibraries "-DLLVM_LINK_LLVM_DYLIB=ON" @@ -115,11 +119,6 @@ in stdenv.mkDerivation (rec { ++ stdenv.lib.optionals (isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" - ] - ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ - "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" - "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" ]; postBuild = '' diff --git a/pkgs/development/compilers/mercury/default.nix b/pkgs/development/compilers/mercury/default.nix index c2352b8126e0..048dd598a480 100644 --- a/pkgs/development/compilers/mercury/default.nix +++ b/pkgs/development/compilers/mercury/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "14.01.1"; src = fetchurl { - url = "http://dl.mercurylang.org/release/mercury-srcdist-${version}.tar.gz"; + url = "https://dl.mercurylang.org/release/mercury-srcdist-${version}.tar.gz"; sha256 = "12z8qi3da8q50mcsjsy5bnr4ia6ny5lkxvzy01a3c9blgbgcpxwq"; }; diff --git a/pkgs/development/compilers/mono/generic-cmake.nix b/pkgs/development/compilers/mono/generic-cmake.nix index 929d00491382..c8afd0dcc906 100644 --- a/pkgs/development/compilers/mono/generic-cmake.nix +++ b/pkgs/development/compilers/mono/generic-cmake.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { inherit sha256; - url = "http://download.mono-project.com/sources/mono/${name}.tar.bz2"; + url = "https://download.mono-project.com/sources/mono/${name}.tar.bz2"; }; buildInputs = diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index a62f2f24dd87..e39de76117af 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { src = fetchurl { inherit sha256; - url = "http://download.mono-project.com/sources/mono/${name}.tar.bz2"; + url = "https://download.mono-project.com/sources/mono/${name}.tar.bz2"; }; buildInputs = diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index 1676ce4884d9..a0daa7df1737 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.13.03"; src = fetchurl { - url = "http://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2"; + url = "https://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2"; sha256 = "04bh736zfj3xy5ihh1whshpjxsisv7hqkz954clzdw6kg93qdv33"; }; diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix index ab71090b3580..9eec23f1ba88 100644 --- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix +++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://developer.download.nvidia.com/cg/Cg_${version}/Cg-${version}_${date}_x86_64.tgz"; + url = "https://developer.download.nvidia.com/cg/Cg_${version}/Cg-${version}_${date}_x86_64.tgz"; sha256 = "e8ff01e6cc38d1b3fd56a083f5860737dbd2f319a39037528fb1a74a89ae9878"; } else if stdenv.system == "i686-linux" then diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix index ca21612776f0..99a65dec1501 100644 --- a/pkgs/development/compilers/ocaml/3.10.0.nix +++ b/pkgs/development/compilers/ocaml/3.10.0.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation (rec { version = "3.10.0"; src = fetchurl { - url = "http://caml.inria.fr/pub/distrib/ocaml-3.10/${name}.tar.bz2"; + url = "https://caml.inria.fr/pub/distrib/ocaml-3.10/${name}.tar.bz2"; sha256 = "1ihmx1civ78s7k2hfc05z1s9vbyx2qw7fg8lnbxnfd6zxkk8878d"; }; diff --git a/pkgs/development/compilers/ocaml/3.11.2.nix b/pkgs/development/compilers/ocaml/3.11.2.nix index df62cd3656b4..e65510c172e6 100644 --- a/pkgs/development/compilers/ocaml/3.11.2.nix +++ b/pkgs/development/compilers/ocaml/3.11.2.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { version = "3.11.2"; src = fetchurl { - url = "http://caml.inria.fr/pub/distrib/ocaml-3.11/${name}.tar.bz2"; + url = "https://caml.inria.fr/pub/distrib/ocaml-3.11/${name}.tar.bz2"; sha256 = "86f3387a0d7e7c8be2a3c53af083a5a726e333686208d5ea0dd6bb5ac3f58143"; }; diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index 8cfe2bb7bcfe..8636f670059c 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { version = "3.12.1"; src = fetchurl { - url = "http://caml.inria.fr/pub/distrib/ocaml-3.12/${name}.tar.bz2"; + url = "https://caml.inria.fr/pub/distrib/ocaml-3.12/${name}.tar.bz2"; sha256 = "13cmhkh7s6srnlvhg3s9qzh3a5dbk2m9qr35jzq922sylwymdkzd"; }; diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index 8bad5494e8b9..0a30ef1352c4 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "4.00.1"; src = fetchurl { - url = "http://caml.inria.fr/pub/distrib/ocaml-4.00/${name}.tar.bz2"; + url = "https://caml.inria.fr/pub/distrib/ocaml-4.00/${name}.tar.bz2"; sha256 = "33c3f4acff51685f5bfd7c260f066645e767d4e865877bf1613c176a77799951"; }; diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix index 81c8cd534025..16d7e2580b38 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { version = "104"; src = fetchurl { - url = "http://caml.inria.fr/pub/distrib/ocaml-4.04/ocaml-4.04.0.tar.gz"; + url = "https://caml.inria.fr/pub/distrib/ocaml-4.04/ocaml-4.04.0.tar.gz"; sha256 = "1pi2hdm9lxhn45qvfqfss1hpa4jijm14qgmrgajsadxqdiplhqyb"; }; diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix new file mode 100644 index 000000000000..65d8110646f8 --- /dev/null +++ b/pkgs/development/compilers/osl/default.nix @@ -0,0 +1,39 @@ +{ clangStdenv, stdenv, fetchFromGitHub, cmake, zlib, openexr, +openimageio, llvm, boost165, flex, bison, partio, pugixml, +utillinux, python +}: + +let boost_static = boost165.override { enableStatic = true; }; +in clangStdenv.mkDerivation rec { + # In theory this could use GCC + Clang rather than just Clang, + # but https://github.com/NixOS/nixpkgs/issues/29877 stops this + name = "openshadinglanguage-${version}"; + version = "1.9.9"; + + src = fetchFromGitHub { + owner = "imageworks"; + repo = "OpenShadingLanguage"; + rev = "Release-1.9.9"; + sha256 = "1w6wbz013nirzsiw11c9dpdkcwlfncs5va8q583pdw0q2pfkj5dn"; + }; + + cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ]; + enableParallelBuilding = true; + + preConfigure = '' patchShebangs src/liboslexec/serialize-bc.bash ''; + + buildInputs = [ + cmake zlib openexr openimageio llvm + boost_static flex bison partio pugixml + utillinux # needed just for hexdump + python # CMake doesn't check this? + ]; + # TODO: How important is partio? CMake doesn't seem to find it + meta = with stdenv.lib; { + description = "Advanced shading language for production GI renderers"; + homepage = http://opensource.imageworks.com/?p=osl; + maintainers = with maintainers; [ hodapp ]; + license = licenses.bsd3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix index d7590146e2ad..94b89cf3a952 100644 --- a/pkgs/development/compilers/pakcs/default.nix +++ b/pkgs/development/compilers/pakcs/default.nix @@ -5,7 +5,7 @@ let fname = "pakcs-1.14.0"; fsrc = fetchurl { - url = "http://www.informatik.uni-kiel.de/~pakcs/download/${fname}-src.tar.gz"; + url = "https://www.informatik.uni-kiel.de/~pakcs/download/${fname}-src.tar.gz"; sha256 = "1651ssh4ql79x8asd7kp4yis2n5rhn3lml4s26y03b0cgbfhs78s"; }; diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index cc993af82080..f07f68241794 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation ( rec { meta = with stdenv.lib; { description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language"; - homepage = http://www.ponylang.org; + homepage = https://www.ponylang.org; license = licenses.bsd2; maintainers = with maintainers; [ doublec kamilchm patternspandemic ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix index 6a0965360f68..f27147d9743a 100644 --- a/pkgs/development/compilers/ponyc/pony-stable.nix +++ b/pkgs/development/compilers/ponyc/pony-stable.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pony-stable-${version}"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "ponylang"; repo = "pony-stable"; rev = version; - sha256 = "0dnj9d35fa0iaka2lsc7cvn9d2qbasknn1c3gbxdyc9drf9vv6kf"; + sha256 = "18ncxdk37r9sp2wnrgqj29nvqljqq9m154pkdv8b6b5k9knpradx"; }; buildInputs = [ ponyc ]; diff --git a/pkgs/development/compilers/scala/2.10.nix b/pkgs/development/compilers/scala/2.10.nix index bac36d61068d..16e0389ad031 100644 --- a/pkgs/development/compilers/scala/2.10.nix +++ b/pkgs/development/compilers/scala/2.10.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "scala-2.10.7"; src = fetchurl { - url = "http://www.scala-lang.org/files/archive/${name}.tgz"; + url = "https://www.scala-lang.org/files/archive/${name}.tgz"; sha256 = "04gi55lzgrhsb78qw8jmnccqim92rw6898knw0a7gfzn2sci30wj"; }; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { Code sizes are typically reduced by a factor of two to three when compared to an equivalent Java application. ''; - homepage = http://www.scala-lang.org/; + homepage = https://www.scala-lang.org/; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; branch = "2.10"; diff --git a/pkgs/development/compilers/scala/2.11.nix b/pkgs/development/compilers/scala/2.11.nix index 1145ebab5245..b1100eb8aa9d 100644 --- a/pkgs/development/compilers/scala/2.11.nix +++ b/pkgs/development/compilers/scala/2.11.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "scala-2.11.12"; src = fetchurl { - url = "http://www.scala-lang.org/files/archive/${name}.tgz"; + url = "https://www.scala-lang.org/files/archive/${name}.tgz"; sha256 = "1a4nc4qp9dm4rps47j92hlmxxqskv67qbdmjqc5zd94wd4rps7di"; }; diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index a25d4f6e6544..8a20066becb7 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "scala-2.12.6"; src = fetchurl { - url = "http://www.scala-lang.org/files/archive/${name}.tgz"; + url = "https://www.scala-lang.org/files/archive/${name}.tgz"; sha256 = "05ili2959yrshqi44wpmwy0dyfm4kvp6i8mlbnj1xvc5b9649iqs"; }; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { Code sizes are typically reduced by a factor of two to three when compared to an equivalent Java application. ''; - homepage = http://www.scala-lang.org/; + homepage = https://www.scala-lang.org/; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/seexpr/default.nix b/pkgs/development/compilers/seexpr/default.nix new file mode 100644 index 000000000000..2760d6ad5d03 --- /dev/null +++ b/pkgs/development/compilers/seexpr/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake, libpng, zlib, qt4, +bison, flex, mesa_glu, pythonPackages +}: + +stdenv.mkDerivation rec { + name = "seexpr-${version}"; + version = "2.11"; + src = fetchFromGitHub { + owner = "wdas"; + repo = "SeExpr"; + rev = "v2.11"; + sha256 = "0a44k56jf6dl36fwgg4zpc252wq5lf9cblg74mp73k82hxw439l4"; + }; + + buildInputs = [ cmake mesa_glu libpng zlib qt4 pythonPackages.pyqt4 bison flex ]; + meta = with stdenv.lib; { + description = "Embeddable expression evaluation engine from Disney Animation"; + homepage = https://www.disneyanimation.com/technology/seexpr.html; + maintainers = with maintainers; [ hodapp ]; + license = licenses.asl20; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix index 9df718694913..1176d348d9d3 100644 --- a/pkgs/development/compilers/shaderc/default.nix +++ b/pkgs/development/compilers/shaderc/default.nix @@ -1,32 +1,52 @@ -{ stdenv, fetchFromGitHub, cmake, glslang, spirv-tools, python }: +{ stdenv, fetchFromGitHub, cmake, python }: +# Like many google projects, shaderc doesn't gracefully support separately compiled dependencies, so we can't easily use +# the versions of glslang and spirv-tools used by vulkan-loader. Exact revisions are taken from +# https://github.com/google/shaderc/blob/known-good/known_good.json -stdenv.mkDerivation rec { +# Future work: extract and fetch all revisions automatically based on a revision of shaderc's known-good branch. +let + glslang = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "glslang"; + rev = "32d3ec319909fcad0b2b308fe1635198773e8316"; + sha256 = "1kmgjv5kbrjy6azpgwnjcn3cj8vg5i8hnyk3m969sc0gq2j1rbjj"; + }; + spirv-tools = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Tools"; + rev = "fe2fbee294a8ad4434f828a8b4d99eafe9aac88c"; + sha256 = "03rq4ypwqnz34n8ip85n95a3b9rxb34j26azzm3b3invaqchv19x"; + }; + spirv-headers = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Headers"; + rev = "3ce3e49d73b8abbf2ffe33f829f941fb2a40f552"; + sha256 = "0yk4bzqifdqpmdxkhvrxbdqhf5ngkga0ig1yyz7khr7rklqfz7wp"; + }; +in stdenv.mkDerivation rec { name = "shaderc-git-${version}"; - version = "2016-09-08"; + version = "2018-06-01"; - # `vulkan-loader` requires a specific version of `glslang` as specified in - # `/glslang_revision`. src = fetchFromGitHub { owner = "google"; repo = "shaderc"; - rev = "e17bb8ba3b8b0b9142b788d988612a40541c54ce"; - sha256 = "17qfjqkz6j355qi130kixaz51svl09k9b5sfikksgnbmzglzcwki"; + rev = "be8e0879750303a1de09385465d6b20ecb8b380d"; + sha256 = "16p25ry2i4zrj00zihfpf210f8xd7g398ffbw25igvi9mbn4nbfd"; }; patchPhase = '' - cp -r ${spirv-tools.src} third_party/spirv-tools - chmod -R +w third_party/spirv-tools - ln -s ${spirv-tools.headers} third_party/spirv-tools/external/spirv-headers + cp -r --no-preserve=mode ${glslang} third_party/glslang + cp -r --no-preserve=mode ${spirv-tools} third_party/spirv-tools + ln -s ${spirv-headers} third_party/spirv-tools/external/spirv-headers ''; - buildInputs = [ cmake glslang python ]; + buildInputs = [ cmake python ]; enableParallelBuilding = true; - cmakeFlags = [ "-DSHADERC_SKIP_TESTS=ON" "-DSHADERC_GLSLANG_DIR=${glslang.src}" ]; + cmakeFlags = [ "-DSHADERC_SKIP_TESTS=ON" ]; meta = with stdenv.lib; { inherit (src.meta) homepage; description = "A collection of tools, libraries and tests for shader compilation."; - broken = true; }; } diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix index d93da8cb9965..7c6b545285cc 100644 --- a/pkgs/development/compilers/yap/default.nix +++ b/pkgs/development/compilers/yap/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "yap-${version}"; src = fetchurl { - url = "http://www.dcc.fc.up.pt/~vsc/Yap/${name}.tar.gz"; + url = "https://www.dcc.fc.up.pt/~vsc/Yap/${name}.tar.gz"; sha256 = "0y7sjwimadqsvgx9daz28c9mxcx9n1znxklih9xg16k6n54v9qxf"; }; diff --git a/pkgs/development/compilers/yasm/default.nix b/pkgs/development/compilers/yasm/default.nix index 738b63fe1ad7..5aea623b91d4 100644 --- a/pkgs/development/compilers/yasm/default.nix +++ b/pkgs/development/compilers/yasm/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "yasm-1.3.0"; src = fetchurl { - url = "http://www.tortall.net/projects/yasm/releases/${name}.tar.gz"; + url = "https://www.tortall.net/projects/yasm/releases/${name}.tar.gz"; sha256 = "0gv0slmm0qpq91za3v2v9glff3il594x5xsrbgab7xcmnh0ndkix"; }; diff --git a/pkgs/development/guile-modules/guile-reader/default.nix b/pkgs/development/guile-modules/guile-reader/default.nix new file mode 100644 index 000000000000..010c523507fd --- /dev/null +++ b/pkgs/development/guile-modules/guile-reader/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, fetchpatch, pkgconfig +, gperf, guile, guile-lib, libffi }: + +with stdenv.lib; +stdenv.mkDerivation rec { + + name = "guile-reader-${version}"; + version = "0.6.2"; + + src = fetchurl { + url = "http://download.savannah.nongnu.org/releases/guile-reader/${name}.tar.gz"; + sha256 = "0592s2s8ampqmqwilc4fvcild6rb9gy79di6vxv5kcdmv23abkgx"; + }; + + patches = [ + (fetchpatch { + name = "0001-fix-prototypes.patch"; + url = https://aur.archlinux.org/cgit/aur.git/plain/reader_flag.patch?h=guile-reader&id=63ac0413a1aa65eb6a0db57bc16ef4481b70dc31; + sha256 = "01ar34xgpxyli8v2bk4kj6876kyrxhxhfpv9v07lx36d254bzrjb"; + }) ]; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gperf guile guile-lib libffi ]; + + GUILE_SITE="${guile-lib}/share/guile/site"; + + configureFlags = [ "--with-guilemoduledir=$(out)/share/guile/site" ]; + + meta = with stdenv.lib; { + description = "A simple framework for building readers for GNU Guile"; + longDescription = '' + Guile-Reader is a simple framework for building readers for GNU + Guile. + + The idea is to make it easy to build procedures that extend + Guile's read procedure. Readers supporting various syntax + variants can easily be written, possibly by re-using existing + "token readers" of a standard Scheme readers. For example, it + is used to implement Skribilo's R5RS-derived document syntax. + ''; + homepage = https://www.gnu.org/software/guile-reader; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.gnu; + }; +} diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 20a908858e9c..6cc6945bae4d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -61,6 +61,10 @@ self: super: { statistics = dontCheck super.statistics; vector-builder = dontCheck super.vector-builder; + # These packages (and their reverse deps) cannot be built with profiling enabled. + ghc-heap-view = disableLibraryProfiling super.ghc-heap-view; + ghc-datasize = disableLibraryProfiling super.ghc-datasize; + # This test keeps being aborted because it runs too quietly for too long Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2; @@ -82,7 +86,7 @@ self: super: { name = "git-annex-${drv.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + drv.version; - sha256 = "0cz044zjp067xjx0dw1yg3n7vnrkn1j3rvnk9i3jf1aqfvm1szwy"; + sha256 = "0q9z5q7vrcqa831wni972kchcdivqp55x1z2fgmdp8jfq4pidvyb"; }; })).overrideScope (self: super: { aws = dontCheck (self.aws_0_18); @@ -594,7 +598,13 @@ self: super: { bustle = overrideCabal super.bustle (drv: { buildDepends = [ pkgs.libpcap ]; buildTools = with pkgs; [ gettext perl help2man intltool ]; - doCheck = false; # https://github.com/wjt/bustle/issues/6 + patches = [ + # Add missing gio-unix-2.0 dependency + (pkgs.fetchpatch { + url = https://github.com/wjt/bustle/commit/bcc3d56d367635c0dfdb4eab0d1265829aba6400.patch; + sha256 = "1ybviivfbs5janiyw01ww365vxckni6fk0j10609clxk4na2nvb9"; + }) + ]; postInstall = '' make install PREFIX=$out ''; @@ -915,6 +925,7 @@ self: super: { # With ghc-8.2.x haddock would time out for unknown reason # See https://github.com/haskell/haddock/issues/679 language-puppet = dontHaddock super.language-puppet; + filecache = overrideCabal super.filecache (drv: { doCheck = !pkgs.stdenv.isDarwin; }); # Missing FlexibleContexts in testsuite # https://github.com/EduardSergeev/monad-memo/pull/4 @@ -1035,7 +1046,7 @@ self: super: { vulkan = super.vulkan.override { vulkan = pkgs.vulkan-loader; }; # Builds only with the latest version of indexed-list-literals. - vector-sized_1_0_2_0 = super.vector-sized_1_0_2_0.override { + vector-sized_1_0_3_0 = super.vector-sized_1_0_3_0.override { indexed-list-literals = self.indexed-list-literals_0_2_1_1; }; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index db453e66c679..1e48971b6fbe 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -39,23 +39,7 @@ self: super: { unix = null; xhtml = null; - ## Shadowed: - - ## Needs bump to a versioned attribute - ## Issue: https://github.com/sol/doctest/issues/189 - doctest = overrideCabal super.doctest_0_15_0 (drv: { - ## Setup: Encountered missing dependencies: - ## ghc >=7.0 && <8.4 - ## - ## Setup: Encountered missing dependencies: - ## QuickCheck >=2.11.3 - doCheck = false; - }); - - ## Needs bump to a versioned attribute - ## Setup: Encountered missing dependencies: - ## Cabal <2.2 - ## Older versions don't compile. + doctest = dontCheck super.doctest_0_16_0; # tests depend on very recent QuickCheck hackage-db = super.hackage-db_2_0_1; ## Needs bump to a versioned attribute diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 752c40ad0060..a9f21040ac0c 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -269,9 +269,9 @@ self: super: builtins.intersectAttrs super { ); llvm-hs = super.llvm-hs.override { llvm-config = pkgs.llvm; }; - llvm-hs_6_2_0 = super.llvm-hs_6_2_0.override { + llvm-hs_6_3_0 = super.llvm-hs_6_3_0.override { llvm-config = pkgs.llvm_6; - llvm-hs-pure = super.llvm-hs-pure_6_2_0; + llvm-hs-pure = super.llvm-hs-pure_6_2_1; }; # Needs help finding LLVM. diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 55cd821e1a2c..e5d713ac4c30 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -17338,6 +17338,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "StrictCheck" = callPackage + ({ mkDerivation, base, bifunctors, containers, deepseq + , generics-sop, HUnit, QuickCheck, template-haskell + }: + mkDerivation { + pname = "StrictCheck"; + version = "0.1.0"; + sha256 = "1psnawzf9ym1gz6i6qi5rpx8sm7idi30wryb2hq39flqjxviqk0z"; + libraryHaskellDepends = [ + base bifunctors containers generics-sop QuickCheck template-haskell + ]; + testHaskellDepends = [ + base deepseq generics-sop HUnit QuickCheck + ]; + description = "StrictCheck: Keep Your Laziness In Check"; + license = stdenv.lib.licenses.mit; + }) {}; + "StringUtils" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -18539,8 +18557,8 @@ self: { }: mkDerivation { pname = "Villefort"; - version = "0.1.2.11"; - sha256 = "0ggcp3sgqv1m5xs8q87c2n6rms7mypbf3j9f5702qllzyns2r79l"; + version = "0.1.2.12"; + sha256 = "16cakg1vyq7sfjqpbv02a44p6bf35qqidwbc07dpnaafp2qndppf"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -21358,8 +21376,8 @@ self: { pname = "ad"; version = "4.3.5"; sha256 = "0q4dvi02k21jq8xf0ywgmcs5mph4hpx5s3y3pj839y0g3x5paplw"; - revision = "3"; - editedCabalFile = "14g2lfsw1fi4gn2cgvhglz4gyi797xk9g1r4pf46g734ivfl67c5"; + revision = "4"; + editedCabalFile = "0n1r7ylnabfcd3x88j93r3fjbz8hdlp3hda0zaw7h5cawc7zy01j"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array base comonad containers data-reify erf free nats reflection @@ -23057,14 +23075,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "alarmclock_0_5_0_1" = callPackage + "alarmclock_0_5_0_2" = callPackage ({ mkDerivation, async, base, clock, hspec, stm, time , unbounded-delays }: mkDerivation { pname = "alarmclock"; - version = "0.5.0.1"; - sha256 = "0l357h9admskcqap4dq5niafpvr1dkf3wvrw166rd2568dp061a6"; + version = "0.5.0.2"; + sha256 = "0k6nfgxbhnsdlxiv1d6q7kgfmfnix8d1z9cpp84kz9m9jw4a6x15"; libraryHaskellDepends = [ async base clock stm time unbounded-delays ]; @@ -23386,6 +23404,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "algolia" = callPackage + ({ mkDerivation, aeson, aeson-iproute, attoparsec, base, bytestring + , cryptonite, data-has, exceptions, hashable, http-client + , http-client-tls, http-types, iproute, memory, mtl, retry + , scientific, tasty, tasty-discover, tasty-hunit, text, time + , unordered-containers, uri-templater, vector + }: + mkDerivation { + pname = "algolia"; + version = "0.1.0.0"; + sha256 = "1gasyh2hv38i4936p4shmqmdxr06n785nydbxhaljrwwzih5mh3p"; + libraryHaskellDepends = [ + aeson aeson-iproute attoparsec base bytestring cryptonite data-has + exceptions hashable http-client http-client-tls http-types iproute + memory mtl retry scientific text time unordered-containers + uri-templater vector + ]; + testHaskellDepends = [ + aeson base tasty tasty-discover tasty-hunit + ]; + description = "A client implementing the Algolia search API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "align" = callPackage ({ mkDerivation, base, containers, transformers, vector }: mkDerivation { @@ -30229,25 +30271,23 @@ self: { "ats-pkg" = callPackage ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, bzlib , Cabal, cli-setup, composition-prelude, containers, cpphs - , dependency, dhall, directory, file-embed, filemanip, hashable - , http-client, http-client-tls, lzma, microlens, microlens-th, mtl + , dependency, dhall, directory, file-embed, filemanip, filepath + , hashable, http-client, http-client-tls, lzma, microlens, mtl , optparse-applicative, parallel-io, process, shake, shake-ats - , shake-ext, tar, temporary, text, unix, zip-archive, zlib + , shake-c, shake-ext, tar, temporary, text, unix, zip-archive, zlib }: mkDerivation { pname = "ats-pkg"; - version = "2.10.2.2"; - sha256 = "080wkmv04zdzm86zrmgvyyfv7gkjxfr1fwy9470vviy7hywh1xin"; - revision = "1"; - editedCabalFile = "02wam77mcbknvfx8hb0d9d8m9ppvrd1w3xklwky5fz2dv071alm3"; + version = "2.11.0.7"; + sha256 = "1jslvfsp1mraills55z1kxnf3x2csx9qn9r7ccsyyl2bimzj9yq6"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; libraryHaskellDepends = [ ansi-wl-pprint base binary bytestring bzlib Cabal composition-prelude containers dependency dhall directory - file-embed filemanip hashable http-client http-client-tls lzma - microlens microlens-th mtl parallel-io process shake shake-ats + file-embed filemanip filepath hashable http-client http-client-tls + lzma microlens mtl parallel-io process shake shake-ats shake-c shake-ext tar text unix zip-archive zlib ]; libraryToolDepends = [ cpphs ]; @@ -33529,8 +33569,8 @@ self: { }: mkDerivation { pname = "bdcs-api"; - version = "0.1.2"; - sha256 = "117688c8b3j32if2xc2dw9845jgpv7fxbkq3dhc56hqjlliha0fr"; + version = "0.1.3"; + sha256 = "1pjcbw7z79bvmyik6ykjha388gdcjb2h1bf3csc2yjy1g87qmq05"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36551,8 +36591,8 @@ self: { pname = "bits"; version = "0.5.1"; sha256 = "14ww8zcyis6kfli28bb9i5dmmj7k1j1dlzpwnfrkzd8kp5xmazk5"; - revision = "4"; - editedCabalFile = "188v93jiwy832ifcjq5db7sk5rngpnvira5kk1cb1srw4851hzyl"; + revision = "5"; + editedCabalFile = "012qycmsfz5l6y82d3zgjmp1k3pgvhlpjdk6rwlpc1wlfbpdqiaw"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytes mtl transformers ]; testHaskellDepends = [ base doctest ]; @@ -37662,6 +37702,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bloodhound_0_16_0_0" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers + , errors, exceptions, hashable, hspec, http-client, http-types + , microlens, microlens-aeson, mtl, network-uri, pretty-simple + , QuickCheck, quickcheck-arbitrary-template, quickcheck-properties + , scientific, semigroups, semver, temporary, text, time + , transformers, unix-compat, unordered-containers, vector + }: + mkDerivation { + pname = "bloodhound"; + version = "0.16.0.0"; + sha256 = "0g4x2g0qmwgfrz39iwwagrr7p19fmmz1fpfk29bkmvqvbfvsjgqz"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring containers exceptions hashable + http-client http-types mtl network-uri scientific semigroups semver + text time transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers errors exceptions hspec + http-client http-types microlens microlens-aeson mtl network-uri + pretty-simple QuickCheck quickcheck-arbitrary-template + quickcheck-properties semigroups semver temporary text time + unix-compat unordered-containers vector + ]; + description = "Elasticsearch client library for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bloodhound-amazonka-auth" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core , amazonka-elasticsearch, base, bloodhound, exceptions, http-client @@ -38532,8 +38601,8 @@ self: { pname = "bound"; version = "2.0.1"; sha256 = "0xmvkwambzmji1czxipl9cms5l3v98765b9spmb3wn5n6dpj0ji9"; - revision = "4"; - editedCabalFile = "1gnknncwjil9kcilpj08a5s0r1z3nk5iyg1dlynldxaj6p0z90hx"; + revision = "5"; + editedCabalFile = "02xvpawr73xq11lwkj1rp96h3pgpgcp693gawc3wn5zksrr0986i"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq hashable mmorph @@ -40062,6 +40131,8 @@ self: { pname = "bytes"; version = "0.15.4"; sha256 = "121x3iqlm8pghw8cd9g30cnqbl7jrdpfjxdanmqdqllajw6xivrm"; + revision = "1"; + editedCabalFile = "1ijk1d47rr4kyi3hl03v1xpb08k87wjr07d8i6gj5glhzfmmwp9k"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base binary bytestring cereal containers hashable mtl scientific @@ -43828,8 +43899,8 @@ self: { }: mkDerivation { pname = "cdeps"; - version = "0.1.1.2"; - sha256 = "0fvl3pzz73mjc0y8pqkfbqkipma9km26qp0n1jfrnh0nqh9104l1"; + version = "0.1.1.4"; + sha256 = "0gqaa8a3q84k5shar58kc5kfdq4f3zp2pz9pg8h78d3fibyz5cmw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -44212,6 +44283,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cfenv" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hspec + , raw-strings-qq + }: + mkDerivation { + pname = "cfenv"; + version = "0.1.0.0"; + sha256 = "0zklgqkm33n8a2pq8h313xij4nvrv0brh7v4q024bglyam1ndscc"; + libraryHaskellDepends = [ aeson base bytestring containers ]; + testHaskellDepends = [ + aeson base containers hspec raw-strings-qq + ]; + description = "A library getting the environment when running on Cloud Foundry"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cfipu" = callPackage ({ mkDerivation, base, bytestring, containers, data-default , dequeue, mtl @@ -45828,8 +45915,8 @@ self: { ({ mkDerivation, base, criterion, QuickCheck, random }: mkDerivation { pname = "cl3"; - version = "1.0.0.1"; - sha256 = "0wgmzygjwyb6djlmxj9k7ffwp60jf3lai8jki525r4as5rggyypi"; + version = "1.0.0.2"; + sha256 = "1ibwjry5xmf8dr8wbfdw3mzq4cz9dy5kvxy4sqkshcc08kjm2kp5"; libraryHaskellDepends = [ base random ]; testHaskellDepends = [ base QuickCheck ]; benchmarkHaskellDepends = [ base criterion ]; @@ -45842,8 +45929,8 @@ self: { ({ mkDerivation, base, cl3, hmatrix }: mkDerivation { pname = "cl3-hmatrix-interface"; - version = "1.0.0.0"; - sha256 = "0cz1pzbnxld2kpiqggln0yags46zhlc8pzghz3mykblwdvgk7z7s"; + version = "1.0.0.1"; + sha256 = "1fixwb8y2v0zwww6p08rwsq7wfz63aj3zv2yjs9z0rp2xm3mq67w"; libraryHaskellDepends = [ base cl3 hmatrix ]; description = "Interface to/from Cl3 and HMatrix"; license = stdenv.lib.licenses.bsd3; @@ -45854,8 +45941,8 @@ self: { ({ mkDerivation, base, cl3, linear }: mkDerivation { pname = "cl3-linear-interface"; - version = "1.0.0.0"; - sha256 = "02yyajy8n9j7jd3kz2qas4h2vyv5b42jrjj092cy18lfj9hr22as"; + version = "1.0.0.1"; + sha256 = "1i4f9xxsdzba49h1dv8x14zz1bv1zamhvw2ngi5d6a17qd11g319"; libraryHaskellDepends = [ base cl3 linear ]; description = "Interface to/from Cl3 and Linear"; license = stdenv.lib.licenses.bsd3; @@ -49005,8 +49092,8 @@ self: { pname = "comonad"; version = "5.0.3"; sha256 = "1xjdwm0xvkcqrpyivl6v569dj8xgivw103bzahy14la0cd6mix57"; - revision = "2"; - editedCabalFile = "07gfz719y6q3bfv8jbvak78dda9g1qy4phl18cxisiapqdz31rry"; + revision = "3"; + editedCabalFile = "062482gwrjc9njqsb239p391bk0s8j39a5xqv5k7rl9ijaxxlfmv"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base containers contravariant distributive semigroups tagged @@ -51363,10 +51450,10 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, vector }: mkDerivation { pname = "constaparser"; - version = "0.1.0.0"; - sha256 = "02psvhz05j61b50sqrwhmfsf9cmvgrjd9k3yn2d57139k7qdwr3d"; + version = "0.1.0.1"; + sha256 = "16s8y035f30gyla620diwnsqi8lbmmfyxjpj4dlq24d45k5wfnsd"; libraryHaskellDepends = [ attoparsec base bytestring vector ]; - description = "Parse ByteStrings of a constant length"; + description = "Parse ByteStrings of a prescribed length"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -53051,8 +53138,8 @@ self: { ({ mkDerivation, base, containers, parallel }: mkDerivation { pname = "cpsa"; - version = "3.5.1"; - sha256 = "01kknyznwyxd5cgw9q21wmzykl1yiava0s1y3vrrdxzvixk1f89l"; + version = "3.6.0"; + sha256 = "1c2hhdny9nn10rgaray827fqc3wq02pv8pf853cy865dl6zdihpb"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -53193,7 +53280,7 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; - "cql-io_1_0_0" = callPackage + "cql-io_1_0_1" = callPackage ({ mkDerivation, async, auto-update, base, bytestring, containers , cql, cryptohash, data-default-class, Decimal, exceptions , hashable, HsOpenSSL, iproute, lens, monad-control, mtl @@ -53203,8 +53290,8 @@ self: { }: mkDerivation { pname = "cql-io"; - version = "1.0.0"; - sha256 = "0wij5h44rk4lnnvh3i6s04bk7dhvxvv9l9y2qicm44736zrphlmx"; + version = "1.0.1"; + sha256 = "06imd6cjfh7jnr8s0d2pqlg82w9h0s81xpyjir6hci61al6yfx5q"; libraryHaskellDepends = [ async auto-update base bytestring containers cql cryptohash data-default-class exceptions hashable HsOpenSSL iproute lens @@ -54853,6 +54940,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "csa" = callPackage + ({ mkDerivation, base, hedgehog, hmatrix, tasty, tasty-hedgehog + , tasty-hspec + }: + mkDerivation { + pname = "csa"; + version = "0.1.0"; + sha256 = "0jnhn4lgj5l466c31h2lwslnal3ypk3ma2j75zw0ghjf35i07qvr"; + libraryHaskellDepends = [ base hmatrix ]; + testHaskellDepends = [ + base hedgehog hmatrix tasty tasty-hedgehog tasty-hspec + ]; + description = "Connection-set algebra (CSA) library"; + license = "GPL"; + }) {}; + "cse-ghc-plugin" = callPackage ({ mkDerivation, base, ghc }: mkDerivation { @@ -55571,6 +55674,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "currencies_0_2_0_0" = callPackage + ({ mkDerivation, base, hspec, text }: + mkDerivation { + pname = "currencies"; + version = "0.2.0.0"; + sha256 = "16c4m6px6kvdr8v2k5gspjn3xag69ki6yf6ij2b3ii5rlpa94wpv"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ base hspec text ]; + description = "Currencies representation, pretty printing and conversion"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "currency" = callPackage ({ mkDerivation, base, containers, hashable, iso3166-country-codes }: @@ -56146,16 +56262,14 @@ self: { , hashable, haskeline, html, HTTP, HUnit, mmap, mtl, network , network-uri, old-time, parsec, process, QuickCheck, random , regex-applicative, regex-compat-tdfa, sandi, shelly, split, stm - , tar, temporary, terminfo, test-framework, test-framework-hunit + , tar, terminfo, test-framework, test-framework-hunit , test-framework-quickcheck2, text, time, transformers, unix , unix-compat, utf8-string, vector, zip-archive, zlib }: mkDerivation { pname = "darcs"; - version = "2.14.0"; - sha256 = "00r8g27sgwlw5r8gx89q99n2hawcacfz1mjj0nmh6ps8l610iyhr"; - revision = "1"; - editedCabalFile = "0kxvr0rv5936x460k5ydyy85lgjhmrlkrm60zhbqkqks304abs1h"; + version = "2.14.1"; + sha256 = "0dfd6bp2wy0aabxx7l93gi3dmq21j970cds424xdy1mgmjcvrpb1"; configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; isLibrary = true; isExecutable = true; @@ -56165,8 +56279,8 @@ self: { containers cryptohash data-ordlist directory fgl filepath graphviz hashable haskeline html HTTP mmap mtl network network-uri old-time parsec process random regex-applicative regex-compat-tdfa sandi stm - tar temporary terminfo text time transformers unix unix-compat - utf8-string vector zip-archive zlib + tar terminfo text time transformers unix unix-compat utf8-string + vector zip-archive zlib ]; librarySystemDepends = [ curl ]; executableHaskellDepends = [ base ]; @@ -60498,8 +60612,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "derulo"; - version = "1.0.1"; - sha256 = "0y5rm5gg53siax0q43z79a0b95fkq5plk91qz658ihxmjd2fbv67"; + version = "1.0.2"; + sha256 = "0kyh5fcbv6337baz2prghak5w4x29ms0ccybbp1qkq0cvmvfwrvq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -60618,6 +60732,45 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "detour-via-sci" = callPackage + ({ mkDerivation, aeson, base, cassava, doctest, hlint, newtype + , scientific, siggy-chardust, template-haskell + }: + mkDerivation { + pname = "detour-via-sci"; + version = "1.0.0"; + sha256 = "1r417lp98k0nizlxh7r74c2c4g1ij33pk5ip0bm7ssmzyya127j5"; + libraryHaskellDepends = [ + aeson base cassava newtype scientific siggy-chardust + template-haskell + ]; + testHaskellDepends = [ + aeson base cassava doctest hlint newtype scientific siggy-chardust + template-haskell + ]; + description = "JSON and CSV encoding for rationals as decimal point numbers"; + license = stdenv.lib.licenses.mpl20; + }) {}; + + "detour-via-uom" = callPackage + ({ mkDerivation, aeson, base, cassava, detour-via-sci, doctest + , hlint, newtype, scientific, uom-plugin + }: + mkDerivation { + pname = "detour-via-uom"; + version = "1.0.0"; + sha256 = "07jhj5mrfkfi2l05fyax6aylq4rp0nixvpsymv2xjzvbv2pfmdq7"; + libraryHaskellDepends = [ + aeson base cassava detour-via-sci newtype scientific uom-plugin + ]; + testHaskellDepends = [ + aeson base cassava detour-via-sci doctest hlint newtype scientific + uom-plugin + ]; + description = "JSON and CSV encoding for quantities"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "detrospector" = callPackage ({ mkDerivation, base, binary, bytestring, cmdargs, containers , hashable, mwc-random, text, unordered-containers, zlib @@ -61372,8 +61525,8 @@ self: { }: mkDerivation { pname = "diagrams-haddock"; - version = "0.4.0.1"; - sha256 = "1x22fgmssbrda7iqz41y2dlc8jqkdiic72q490gm3kmxpd3xakjr"; + version = "0.4.0.2"; + sha256 = "1f4sapi4zhb3nrlq92lr309c4aarnl29bzghnmsvs1kqmimq23y0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -63684,8 +63837,8 @@ self: { pname = "distributive"; version = "0.5.3"; sha256 = "0y566r97sfyvhsmd4yxiz4ns2mqgwf5bdbp56wgxl6wlkidq0wwi"; - revision = "5"; - editedCabalFile = "0hl43mbw87s5l7p1iqc7iwz5rnzdcmj6g33pmq6hv4s9fg96j8x7"; + revision = "6"; + editedCabalFile = "06bd38rf31yrvvy989r44pm0id3dsxwcp6nxg7wk6ccj3n2b8rzk"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base-orphans tagged transformers transformers-compat @@ -64323,7 +64476,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "doctest_0_15_0" = callPackage + "doctest_0_16_0" = callPackage ({ mkDerivation, base, base-compat, code-page, deepseq, directory , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process , QuickCheck, setenv, silently, stringbuilder, syb, transformers @@ -64331,8 +64484,8 @@ self: { }: mkDerivation { pname = "doctest"; - version = "0.15.0"; - sha256 = "13c1l8cc8rzbxgpnaa75x13z9vnr7kffng18czh8gwpv83vn5bpi"; + version = "0.16.0"; + sha256 = "0hkccch65s3kp0b36h7bqhilnpi4bx8kngncm7ma9vbd3dwacjdv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -64650,6 +64803,8 @@ self: { pname = "dot"; version = "0.2.2"; sha256 = "0j4v7vbmm6gfv1y4dp0r7ajiw7iinzflhw8sp867gyafszrpb0a3"; + revision = "1"; + editedCabalFile = "1dc8piglcvaxj0nq946xv185ynh1bk5ca0czrw25p4hji9iji0w1"; libraryHaskellDepends = [ base impure-containers text ]; description = "Data types and encoding for graphviz dot files"; license = stdenv.lib.licenses.bsd3; @@ -65909,8 +66064,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "dwergaz"; - version = "0.2.0.1"; - sha256 = "117f3s3rvka5m9zk8lhwxmqx3slxpf040r7485x6gz58ra33dsg9"; + version = "0.2.0.2"; + sha256 = "1ja2pxkd5mwp404lcyk3p81y41vbwds31446gkscr2qgzrc1sb7s"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "A minimal testing library"; @@ -67062,6 +67217,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "egyptian-fractions" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "egyptian-fractions"; + version = "0.1.0.2"; + sha256 = "05yjwrywpmh58rgx2if1za78g0x9xziv74cpvwnp7pr9b4s9i6zv"; + libraryHaskellDepends = [ base ]; + description = "Egyptian fractions in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ehaskell" = callPackage ({ mkDerivation, base, directory, filepath, mtlparse, process , regexpr, utf8-string, yjtools @@ -71499,18 +71665,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "extensible-effects_2_6_2_0" = callPackage - ({ mkDerivation, base, criterion, HUnit, monad-control, mtl - , QuickCheck, silently, test-framework, test-framework-hunit + "extensible-effects_2_6_3_0" = callPackage + ({ mkDerivation, base, criterion, doctest, HUnit, monad-control + , mtl, QuickCheck, silently, test-framework, test-framework-hunit , test-framework-quickcheck2, test-framework-th, transformers-base }: mkDerivation { pname = "extensible-effects"; - version = "2.6.2.0"; - sha256 = "1gc7packzrh405sz2v4h088knn192kq0hq6zvjab6xqxmrl6bm6f"; + version = "2.6.3.0"; + sha256 = "07syxmhyqhcbsbwwc701k5rya89pkhcjly9nrdw7mspxailbggzs"; libraryHaskellDepends = [ base monad-control transformers-base ]; testHaskellDepends = [ - base HUnit monad-control QuickCheck silently test-framework + base doctest HUnit monad-control QuickCheck silently test-framework test-framework-hunit test-framework-quickcheck2 test-framework-th ]; benchmarkHaskellDepends = [ @@ -71524,19 +71690,22 @@ self: { "extensible-effects-concurrent" = callPackage ({ mkDerivation, base, containers, directory, extensible-effects - , filepath, lens, logging-effect, monad-control, mtl, parallel - , process, QuickCheck, random, stm, tagged, time, transformers + , filepath, HUnit, lens, logging-effect, monad-control, mtl + , parallel, process, QuickCheck, random, stm, tagged, tasty + , tasty-discover, tasty-hunit, time, transformers }: mkDerivation { pname = "extensible-effects-concurrent"; - version = "0.1.3.0"; - sha256 = "1hzl14g3s94bgnpmm3g3ypbgb66pb4m3japn1gn5z7cknxsl2xh3"; + version = "0.2.0.3"; + sha256 = "024wn3i2nxi9j4gskhjnrkqifwszfpfnn812p34krvf763vfqcn1"; libraryHaskellDepends = [ base containers directory extensible-effects filepath lens logging-effect monad-control mtl parallel process QuickCheck random stm tagged time transformers ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ + base extensible-effects HUnit stm tasty tasty-discover tasty-hunit + ]; description = "Message passing concurrency as extensible-effect"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -72534,6 +72703,8 @@ self: { pname = "fay-text"; version = "0.3.2.2"; sha256 = "1q1v8jzkccy9arq6jkz4ynpzm1691d1dv9wzyi4i5m6n0gl7aans"; + revision = "1"; + editedCabalFile = "0zwip7arbrbz1qhjyy5synnlrvl2wica4804wkizpxr9l7acasn6"; enableSeparateDataOutput = true; libraryHaskellDepends = [ fay fay-base text ]; description = "Fay Text type represented as JavaScript strings"; @@ -73273,8 +73444,8 @@ self: { }: mkDerivation { pname = "fficxx"; - version = "0.3.1"; - sha256 = "0y40li2465r1mf9lgswk9hcwbp528iblxwb9icv94p6nyq28z24k"; + version = "0.4"; + sha256 = "0c3893jfxxihkjz9m7m25rfa8x4yfim70p8z4jsbdw6j5adgvh8b"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring Cabal containers data-default directory either @@ -74964,6 +75135,22 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "flexible-defaults_0_0_2" = callPackage + ({ mkDerivation, base, containers, template-haskell, th-extras + , transformers + }: + mkDerivation { + pname = "flexible-defaults"; + version = "0.0.2"; + sha256 = "0r4aq6n5h9xnal535hds111vq8whzsvyc3yibmcbp7fndldd9mgk"; + libraryHaskellDepends = [ + base containers template-haskell th-extras transformers + ]; + description = "Generate default function implementations for complex type classes"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "flexible-time" = callPackage ({ mkDerivation, base, bytestring, unix-time }: mkDerivation { @@ -75573,6 +75760,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) fluidsynth;}; + "flux-monoid" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "flux-monoid"; + version = "0.1.0.0"; + sha256 = "0aa5p8604j63zz8rfxcp4p4110k27ys5dcy980kg5hjzba7aj54m"; + libraryHaskellDepends = [ base ]; + description = "A monoid for tracking changes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fmark" = callPackage ({ mkDerivation, base, directory, filepath, mtl, process, Unixutils }: @@ -78921,6 +79119,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "gauge_0_2_2" = callPackage + ({ mkDerivation, base, basement, bytestring, deepseq, directory + , foundation, process, vector + }: + mkDerivation { + pname = "gauge"; + version = "0.2.2"; + sha256 = "0sv328c7906djwgzgg5nrpn4ag9zj5rqzxmrw5r1m1nnwzx8kcks"; + libraryHaskellDepends = [ + base basement deepseq directory process vector + ]; + testHaskellDepends = [ + base bytestring deepseq directory foundation + ]; + benchmarkHaskellDepends = [ base ]; + description = "small framework for performance measurement and analysis"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gbu" = callPackage ({ mkDerivation, base, containers, fgl, Graphalyze, haskell98, mtl , regex-posix @@ -83702,18 +83920,18 @@ self: { "git-annex" = callPackage ({ mkDerivation, aeson, async, aws, base, blaze-builder , bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive - , clientsession, concurrent-output, conduit, containers, crypto-api - , cryptonite, curl, data-default, DAV, dbus, directory + , clientsession, concurrent-output, conduit, connection, containers + , crypto-api, cryptonite, curl, data-default, DAV, dbus, directory , disk-free-space, dlist, dns, edit-distance, esqueleto, exceptions , fdo-notify, feed, filepath, free, git, gnupg, hinotify, hslogger - , http-client, http-conduit, http-types, IfElse, lsof, magic - , memory, monad-control, monad-logger, mountpoints, mtl, network - , network-info, network-multicast, network-uri, old-locale, openssh - , optparse-applicative, path-pieces, perl, persistent - , persistent-sqlite, persistent-template, process, QuickCheck - , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi - , securemem, shakespeare, socks, split, stm, stm-chans, tagsoup - , tasty, tasty-hunit, tasty-quickcheck, tasty-rerun + , http-client, http-client-tls, http-conduit, http-types, IfElse + , lsof, magic, memory, monad-control, monad-logger, mountpoints + , mtl, network, network-info, network-multicast, network-uri + , old-locale, openssh, optparse-applicative, path-pieces, perl + , persistent, persistent-sqlite, persistent-template, process + , QuickCheck, random, regex-tdfa, resourcet, rsync, SafeSemaphore + , sandi, securemem, shakespeare, socks, split, stm, stm-chans + , tagsoup, tasty, tasty-hunit, tasty-quickcheck, tasty-rerun , template-haskell, text, time, torrent, transformers, unix , unix-compat, unordered-containers, utf8-string, uuid, vector, wai , wai-extra, warp, warp-tls, wget, which, yesod, yesod-core @@ -83721,8 +83939,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20180529"; - sha256 = "1rx0m4yrl3gl2ca8rbbv74fdlg4s2jnddzljhph7271a7bpyxsx5"; + version = "6.20180626"; + sha256 = "0vq3x9p4h3m266pcm2r3m9p51pz5z9zskh7z5nk0adh33j30xf7q"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -83737,20 +83955,20 @@ self: { ]; executableHaskellDepends = [ aeson async aws base blaze-builder bloomfilter byteable bytestring - case-insensitive clientsession concurrent-output conduit containers - crypto-api cryptonite data-default DAV dbus directory + case-insensitive clientsession concurrent-output conduit connection + containers crypto-api cryptonite data-default DAV dbus directory disk-free-space dlist dns edit-distance esqueleto exceptions fdo-notify feed filepath free hinotify hslogger http-client - http-conduit http-types IfElse magic memory monad-control - monad-logger mountpoints mtl network network-info network-multicast - network-uri old-locale optparse-applicative path-pieces persistent - persistent-sqlite persistent-template process QuickCheck random - regex-tdfa resourcet SafeSemaphore sandi securemem shakespeare - socks split stm stm-chans tagsoup tasty tasty-hunit - tasty-quickcheck tasty-rerun template-haskell text time torrent - transformers unix unix-compat unordered-containers utf8-string uuid - vector wai wai-extra warp warp-tls yesod yesod-core yesod-form - yesod-static + http-client-tls http-conduit http-types IfElse magic memory + monad-control monad-logger mountpoints mtl network network-info + network-multicast network-uri old-locale optparse-applicative + path-pieces persistent persistent-sqlite persistent-template + process QuickCheck random regex-tdfa resourcet SafeSemaphore sandi + securemem shakespeare socks split stm stm-chans tagsoup tasty + tasty-hunit tasty-quickcheck tasty-rerun template-haskell text time + torrent transformers unix unix-compat unordered-containers + utf8-string uuid vector wai wai-extra warp warp-tls yesod + yesod-core yesod-form yesod-static ]; executableSystemDepends = [ bup curl git gnupg lsof openssh perl rsync wget which @@ -87496,8 +87714,8 @@ self: { }: mkDerivation { pname = "google-maps-geocoding"; - version = "0.4.0.0"; - sha256 = "1n8zdmm9j8ghd73i0ph8llzbb4bmkni05r16zvs9rfs6ii126bg3"; + version = "0.4.0.1"; + sha256 = "1icya5sh7psr2m12wdx6a5dq9897lp92gq1skxp6s55sksqvglw8"; libraryHaskellDepends = [ aeson base google-static-maps http-client servant servant-client text @@ -87639,8 +87857,8 @@ self: { }: mkDerivation { pname = "google-static-maps"; - version = "0.5.0.1"; - sha256 = "10yzb9blgiya4b4cfd63i4367d71apxc71m0bff6bcp6aq01fw66"; + version = "0.5.0.2"; + sha256 = "05gxk4xnxlshcais8ljzp2wbr93kfi97bjbk2rasj5s2mbvw7rvi"; libraryHaskellDepends = [ aeson base base64-bytestring bytedump bytestring cryptonite double-conversion http-client JuicyPixels memory network-uri @@ -89038,8 +89256,8 @@ self: { }: mkDerivation { pname = "greskell"; - version = "0.2.0.0"; - sha256 = "0zj7gcj4a4msgnzafhy7wh5npwfc5rnn4lnmr5h33q7impws1fgz"; + version = "0.2.0.2"; + sha256 = "01nzqyk0flj4p87iin9ggvy61csvxcnby9phczahqbc0m9v5pi3h"; libraryHaskellDepends = [ aeson base greskell-core semigroups text transformers unordered-containers vector @@ -89060,8 +89278,8 @@ self: { }: mkDerivation { pname = "greskell-core"; - version = "0.1.2.0"; - sha256 = "1246z4zz5jzwbjikkrld3j667kp26v1b135xd62r3akcplxagzd9"; + version = "0.1.2.1"; + sha256 = "1w3rzgkrdd62v734k4pap46780wz9q8fnr0apjvcdzga7h2685hs"; libraryHaskellDepends = [ aeson base containers hashable scientific semigroups text unordered-containers uuid vector @@ -92164,8 +92382,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.7.5"; - sha256 = "0a0m67flsnnbh9ch6pb135avvriy0scpfx39f38d9zwr8lrrs5p3"; + version = "1.8.0"; + sha256 = "1nkms3iqp24xs3v04q3vvc8m8iviq8l38jbw4jksaxbqpwin08bm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -94097,6 +94315,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "happstack-jmacro_7_0_12_1" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, cereal + , digest, happstack-server, jmacro, text, utf8-string + , wl-pprint-text + }: + mkDerivation { + pname = "happstack-jmacro"; + version = "7.0.12.1"; + sha256 = "0bx2wa0pdj73f11xhkk0qq3k8zwh6ccc3kqli9q59617s05wq6zz"; + libraryHaskellDepends = [ + base base64-bytestring bytestring cereal digest happstack-server + jmacro text utf8-string wl-pprint-text + ]; + description = "Support for using JMacro with Happstack"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "happstack-lite" = callPackage ({ mkDerivation, base, bytestring, happstack-server, mtl, text }: mkDerivation { @@ -94171,6 +94407,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "happstack-server_7_5_1_1" = callPackage + ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring + , containers, directory, exceptions, extensible-exceptions + , filepath, hslogger, html, HUnit, monad-control, mtl, network + , network-uri, old-locale, parsec, process, semigroups, sendfile + , syb, system-filepath, template-haskell, text, threads, time + , time-compat, transformers, transformers-base, transformers-compat + , unix, utf8-string, xhtml, zlib + }: + mkDerivation { + pname = "happstack-server"; + version = "7.5.1.1"; + sha256 = "0qgx142xbig19j5j31b4vcgznzaw9c6fg4009vzp9yhvfbfnajk1"; + libraryHaskellDepends = [ + base base64-bytestring blaze-html bytestring containers directory + exceptions extensible-exceptions filepath hslogger html + monad-control mtl network network-uri old-locale parsec process + semigroups sendfile syb system-filepath template-haskell text + threads time time-compat transformers transformers-base + transformers-compat unix utf8-string xhtml zlib + ]; + testHaskellDepends = [ + base bytestring containers HUnit parsec zlib + ]; + description = "Web related tools and services"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "happstack-server-tls" = callPackage ({ mkDerivation, base, bytestring, extensible-exceptions , happstack-server, hslogger, HsOpenSSL, network, openssl, sendfile @@ -95352,14 +95617,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskeline_0_7_4_2" = callPackage + "haskeline_0_7_4_3" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , process, stm, terminfo, transformers, unix }: mkDerivation { pname = "haskeline"; - version = "0.7.4.2"; - sha256 = "1sxhdhy9asinxn0gvd4zandbk6xkb04vy1y7lmh66f9jv66fqhsm"; + version = "0.7.4.3"; + sha256 = "0ydnsr1nhh7mfgvbpclidcfbgzf7j8g5vnwxrnkmgg1dphq0jv84"; configureFlags = [ "-fterminfo" ]; libraryHaskellDepends = [ base bytestring containers directory filepath process stm terminfo @@ -98638,8 +98903,8 @@ self: { pname = "hasql-migration"; version = "0.1.3"; sha256 = "1cv8y16hkh7h421hljvi3hp7s20dn6alf5pjmd852xzdlnvy6j9d"; - revision = "1"; - editedCabalFile = "156s0y5yfc3y0mgv95gcs6n3pv9nd0mgy06x0xriwsf68wjb07ap"; + revision = "2"; + editedCabalFile = "1l2pgi50342ldf8cip2wy63clgn9snk4jz92q2sl8nlnlv5g9b1i"; libraryHaskellDepends = [ base base64-bytestring bytestring contravariant cryptohash data-default-class directory hasql hasql-transaction text time @@ -98652,6 +98917,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hasql-migration_0_2_0" = callPackage + ({ mkDerivation, base, bytestring, contravariant, cryptonite + , data-default-class, directory, hasql, hasql-transaction, hspec + , memory, text, time, transformers + }: + mkDerivation { + pname = "hasql-migration"; + version = "0.2.0"; + sha256 = "03dd0m2ggsv094nga0d8yaqcqb0r9ngdh3zvvr8127n9ka6805l1"; + libraryHaskellDepends = [ + base bytestring contravariant cryptonite data-default-class + directory hasql hasql-transaction memory text time + ]; + testHaskellDepends = [ + base bytestring hasql hasql-transaction hspec transformers + ]; + description = "PostgreSQL Schema Migrations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasql-optparse-applicative" = callPackage ({ mkDerivation, base-prelude, hasql, hasql-pool , optparse-applicative @@ -99284,7 +99570,7 @@ self: { license = "unknown"; }) {}; - "haxl_2_0_0_0" = callPackage + "haxl_2_0_1_0" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , deepseq, exceptions, filepath, ghc-prim, hashable, HUnit, pretty , stm, test-framework, test-framework-hunit, text, time @@ -99292,8 +99578,8 @@ self: { }: mkDerivation { pname = "haxl"; - version = "2.0.0.0"; - sha256 = "12ba1hylv181101s6lyjkf6kn8r42qkh60xd9xinzsm2mcfbbbmy"; + version = "2.0.1.0"; + sha256 = "07s3jxqvdcla3qj8jjxd5088kp7h015i2q20kjhs4n73swa9h9fd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -99576,6 +99862,41 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) SDL_mixer;}; + "hbf" = callPackage + ({ mkDerivation, base, binary, bytestring, criterion, deepseq + , doctest, filepath, hedgehog, hedgehog-checkers, HUnit + , optparse-applicative, parsec, primitive, smallcheck, tasty + , tasty-discover, tasty-hedgehog, tasty-hunit, tasty-smallcheck + , temporary, text, transformers, vector + }: + mkDerivation { + pname = "hbf"; + version = "0.1.0.2"; + sha256 = "07r3m42y3g3ikg0mabqcd309jq2280kg0rn74n2ybmr1vs815fpj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring deepseq filepath optparse-applicative parsec + primitive text transformers vector + ]; + executableHaskellDepends = [ + base binary bytestring deepseq filepath optparse-applicative parsec + primitive text transformers vector + ]; + testHaskellDepends = [ + base binary bytestring deepseq doctest filepath hedgehog + hedgehog-checkers HUnit optparse-applicative parsec primitive + smallcheck tasty tasty-discover tasty-hedgehog tasty-hunit + tasty-smallcheck temporary text transformers vector + ]; + benchmarkHaskellDepends = [ + base binary bytestring criterion deepseq filepath + optparse-applicative parsec primitive text transformers vector + ]; + description = "An optimizing Brainfuck compiler and evaluator"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "hblas" = callPackage ({ mkDerivation, base, blas, hspec, liblapack, primitive , storable-complex, vector @@ -100365,8 +100686,8 @@ self: { pname = "heaps"; version = "0.3.6"; sha256 = "1cnxgmxxvl053yv93vcz5fnla4iir5g9wr697n88ysdyybbkq70q"; - revision = "2"; - editedCabalFile = "0iym09z8039b2v0kfzh1b66b7ky7kqjv85mx1h0xhsayxdy135in"; + revision = "3"; + editedCabalFile = "0k6wsm1hwn3vaxdvw8p7cidxg7p8zply2ig4w4qrbpyjhl6dj9x9"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory doctest filepath ]; @@ -107293,22 +107614,20 @@ self: { "hpack-dhall" = callPackage ({ mkDerivation, aeson, base, dhall, dhall-json, hpack, hspec - , interpolate, mockery, text, transformers, trifecta + , interpolate, megaparsec, mockery, text, transformers }: mkDerivation { pname = "hpack-dhall"; - version = "0.1.0"; - sha256 = "1yz1ypq88lmxdz9728w8q0ag1whwzlkwcdvx8dhyav5k3ifgp2x0"; - revision = "3"; - editedCabalFile = "02pvzwqrs163mgxdydgv6pa1gq75xav68kpjycrxgdbpag6s9ynv"; + version = "0.2.0"; + sha256 = "0avkxcrpa1qgyw56wqna773404gcglvqxr81jmzr0hij406x4c8m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson base dhall dhall-json hpack text transformers trifecta + aeson base dhall dhall-json hpack megaparsec text transformers ]; testHaskellDepends = [ - aeson base dhall dhall-json hpack hspec interpolate mockery text - transformers trifecta + aeson base dhall dhall-json hpack hspec interpolate megaparsec + mockery text transformers ]; description = "Dhall support for Hpack"; license = stdenv.lib.licenses.publicDomain; @@ -107736,8 +108055,8 @@ self: { }: mkDerivation { pname = "hprotoc"; - version = "2.4.10"; - sha256 = "14zihg4gb42kr68y73mzb7a9ryc2yi4h50n3a4v8idw17f3fdhlz"; + version = "2.4.11"; + sha256 = "0740yc33ginskkiggyaqc1khkb2bzb4vg0r12rj59f3gimzfiwlk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108746,18 +109065,20 @@ self: { "hs2ats" = callPackage ({ mkDerivation, ansi-wl-pprint, base, casing, composition-prelude , cpphs, criterion, deepseq, haskell-src-exts, hspec - , hspec-dirstream, language-ats, microlens, system-filepath + , hspec-dirstream, language-ats, microlens, optparse-generic + , system-filepath }: mkDerivation { pname = "hs2ats"; - version = "0.3.0.2"; - sha256 = "0yimapbxy0il6yv12r1xx03vjjgc8hl3iyyi21y41bqdzzl4f37p"; + version = "0.3.0.3"; + sha256 = "0j8kka9n3in9ya1hndn0dpj8d1ha5ihxfrl995dwsa900z00i5yk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-wl-pprint base casing composition-prelude cpphs deepseq haskell-src-exts language-ats microlens ]; + executableHaskellDepends = [ base optparse-generic ]; testHaskellDepends = [ base hspec hspec-dirstream system-filepath ]; @@ -112372,6 +112693,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "html-conduit_1_3_1" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, conduit + , conduit-extra, containers, deepseq, hspec, HUnit, resourcet, text + , transformers, xml-conduit, xml-types + }: + mkDerivation { + pname = "html-conduit"; + version = "1.3.1"; + sha256 = "0dg3sblihi93qn6ax1cwha0cng4zlpmic83ckdylq7s7kwa3rhbi"; + libraryHaskellDepends = [ + attoparsec base bytestring conduit conduit-extra containers + resourcet text transformers xml-conduit xml-types + ]; + testHaskellDepends = [ + base bytestring containers deepseq hspec HUnit text xml-conduit + ]; + description = "Parse HTML documents using xml-conduit datatypes"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "html-email-validate" = callPackage ({ mkDerivation, attoparsec, base, criterion, hspec, QuickCheck , regex-pcre-builtin, text @@ -112925,6 +113267,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "http-client-restricted" = callPackage + ({ mkDerivation, base, connection, data-default, http-client + , http-client-tls, network, utf8-string + }: + mkDerivation { + pname = "http-client-restricted"; + version = "0.0.1"; + sha256 = "0n4rmi30hlppgfz1vfqmcnqxrk1qfg2f05chdvniiq7l94id0kcw"; + libraryHaskellDepends = [ + base connection data-default http-client http-client-tls network + utf8-string + ]; + description = "restricting the servers that http-client will use"; + license = stdenv.lib.licenses.mit; + }) {}; + "http-client-session" = callPackage ({ mkDerivation, base-prelude, bytestring, either, http-client , mtl-prelude @@ -116175,8 +116533,8 @@ self: { pname = "hyphenation"; version = "0.7.1"; sha256 = "1h5i07v2zlka29dj4zysc47p747j88x6z4zm3zwcr5i8yirm0p52"; - revision = "2"; - editedCabalFile = "1pbsq3y0f0j6cl17narqrwxwwpxsvwgazfbqa5k08m2n0s885pfk"; + revision = "3"; + editedCabalFile = "0pphkzschnqs2xj6kdg52gg2fjsg51lv0djxin8pqqjrdnyq4igy"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ @@ -116254,8 +116612,8 @@ self: { }: mkDerivation { pname = "hzenity"; - version = "0.1"; - sha256 = "04y0a72rczwsmxig029f6jgdkc15rmf2fnsbc5pvy26nksh5i7zk"; + version = "0.2"; + sha256 = "1ckc95a9hn8blv8yqdgpcs41wdk1j3mydy5pj41cl73jkir18a0f"; libraryHaskellDepends = [ base containers data-default process process-extras text time ]; @@ -117471,8 +117829,8 @@ self: { }: mkDerivation { pname = "imap"; - version = "0.3.0.7"; - sha256 = "0d5g1fiyfp1d207fjkpyfnp6hi5hdf1jsh50a06mrcdb8dawpbqa"; + version = "0.3.0.8"; + sha256 = "1ha6cxfv77ip85vlg0y39jx92zb1mf35gy39lalhzm59a3cfj97b"; libraryHaskellDepends = [ attoparsec base bytestring connection containers either exceptions hslogger list-t network pipes random rolling-queue stm stm-delay @@ -117633,35 +117991,36 @@ self: { }) {}; "imm" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, atom-conduit, base - , blaze-html, blaze-markup, bytestring, case-insensitive - , chunked-data, comonad, conduit, conduit-combinators, connection - , containers, directory, dyre, fast-logger, filepath, free - , hashable, HaskellNet, HaskellNet-SSL, http-client - , http-client-tls, http-types, microlens, mime-mail - , mono-traversable, monoid-subclasses, network, opml-conduit - , optparse-applicative, rainbow, rainbox, rss-conduit - , safe-exceptions, tagged, text, time, timerep, tls, transformers - , uri-bytestring, xml, xml-conduit, xml-types + ({ mkDerivation, aeson, atom-conduit, base, blaze-html + , blaze-markup, bytestring, case-insensitive, conduit, connection + , containers, directory, dyre, fast-logger, filepath, hashable + , HaskellNet, HaskellNet-SSL, http-client, http-client-tls + , http-types, lifted-base, microlens, mime-mail, monad-time + , mono-traversable, monoid-subclasses, mtl, network, opml-conduit + , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal + , rss-conduit, safe-exceptions, stm, streaming-bytestring + , streaming-with, streamly, text, time, timerep, tls, transformers + , transformers-base, uri-bytestring, xml, xml-conduit, xml-types }: mkDerivation { pname = "imm"; - version = "1.2.1.0"; - sha256 = "0m869l6z50zf57hfy28ad70id3phfqjwkna64m59yycvcqlkj064"; + version = "1.3.0.0"; + sha256 = "1rkndzm0mmc0qpg4i08jkmp00w5jhh4az02y3vzwaaqjfd32jxar"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-wl-pprint atom-conduit base blaze-html blaze-markup - bytestring case-insensitive chunked-data comonad conduit - conduit-combinators connection containers directory dyre - fast-logger filepath free hashable HaskellNet HaskellNet-SSL - http-client http-client-tls http-types microlens mime-mail - mono-traversable monoid-subclasses network opml-conduit - optparse-applicative rainbow rainbox rss-conduit safe-exceptions - tagged text time timerep tls transformers uri-bytestring xml - xml-conduit xml-types + aeson atom-conduit base blaze-html blaze-markup bytestring + case-insensitive conduit connection containers directory dyre + fast-logger filepath hashable HaskellNet HaskellNet-SSL http-client + http-client-tls http-types lifted-base microlens mime-mail + monad-time mono-traversable monoid-subclasses mtl network + opml-conduit optparse-applicative prettyprinter + prettyprinter-ansi-terminal rss-conduit safe-exceptions stm + streaming-bytestring streaming-with streamly text time timerep tls + transformers transformers-base uri-bytestring xml xml-conduit + xml-types ]; - executableHaskellDepends = [ base free ]; + executableHaskellDepends = [ base ]; description = "Execute arbitrary actions for each unread element of RSS/Atom feeds"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; @@ -117962,8 +118321,8 @@ self: { }: mkDerivation { pname = "impure-containers"; - version = "0.4.3"; - sha256 = "003r3ppwdwndg8q84bnh299f04b88bhnxxl65nbrz9xl77lfz2y0"; + version = "0.5.0"; + sha256 = "0rwk7wsymga61192mmjj42079v209dj9gdcjpwjmji1ivxwzy13p"; libraryHaskellDepends = [ base containers ghc-prim hashable primitive vector ]; @@ -117972,7 +118331,7 @@ self: { test-framework-hunit test-framework-quickcheck2 transformers vector ]; benchmarkHaskellDepends = [ base criterion ]; - description = "Mutable containers in haskell"; + description = "Mutable containers in Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -118249,6 +118608,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "indents_0_5_0_0" = callPackage + ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit }: + mkDerivation { + pname = "indents"; + version = "0.5.0.0"; + sha256 = "1ly3v41jacc6lrsvg4j3m5a6zs90gr8dyif5m6bf34hj1k5cgg0n"; + libraryHaskellDepends = [ base mtl parsec ]; + testHaskellDepends = [ base mtl parsec tasty tasty-hunit ]; + description = "indentation sensitive parser-combinators for parsec"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "index-core" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -118548,7 +118920,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "influxdb_1_6_0_4" = callPackage + "influxdb_1_6_0_5" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal , cabal-doctest, clock, containers, doctest, foldl, http-client , http-types, HUnit, lens, mtl, network, optional-args, QuickCheck @@ -118558,8 +118930,8 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "1.6.0.4"; - sha256 = "191w8f52r5qgmrsj131sx5kjqzfcrh3z4wbh2kdv9hyfp717hz2r"; + version = "1.6.0.5"; + sha256 = "1qlc5vcd6vvrbss0nckhxkn1fbq5bfjyhc75r7di14kaww02y05l"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -119595,8 +119967,8 @@ self: { pname = "intervals"; version = "0.8.1"; sha256 = "00vyxf3ba9d7aas3npfapr53w71fslgh69fczjb25axr66fvzqww"; - revision = "3"; - editedCabalFile = "1dzv19jq6xwf9zff6xkzmn9vab2ch2mds75n7hg9n0xg664q1b95"; + revision = "4"; + editedCabalFile = "1qx3q0v13l1zaln9zdk8chxpxhshbz5x0vqm0qda7d1kpv7h6a7r"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array base distributive ghc-prim ]; testHaskellDepends = [ @@ -120144,6 +120516,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ip_1_3_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion + , doctest, hashable, hspec, HUnit, primitive, QuickCheck + , quickcheck-classes, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, vector + }: + mkDerivation { + pname = "ip"; + version = "1.3.0"; + sha256 = "10dc3b41j11xa9rfqlbbrjs4wjszn1zn50w9cjs4i0yc02fqck4y"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring hashable primitive text vector + ]; + testHaskellDepends = [ + attoparsec base bytestring doctest hspec HUnit QuickCheck + quickcheck-classes test-framework test-framework-hunit + test-framework-quickcheck2 text + ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion text + ]; + description = "Library for IP and MAC addresses"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ip-quoter" = callPackage ({ mkDerivation, base, cpu, network, tasty, tasty-hunit , template-haskell @@ -120833,6 +121231,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "iso8601-duration" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, bytestring-lexing + , hspec, hspec-core, QuickCheck, quickcheck-instances, time + }: + mkDerivation { + pname = "iso8601-duration"; + version = "0.1.1.0"; + sha256 = "0ypcs8nrgdnjibr15bgfxhms1h44dq2pgsagdjx70ipgawhmlywl"; + libraryHaskellDepends = [ + attoparsec base bytestring bytestring-lexing time + ]; + testHaskellDepends = [ + base bytestring hspec hspec-core QuickCheck quickcheck-instances + time + ]; + description = "Types and parser for ISO8601 durations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "iso8601-time" = callPackage ({ mkDerivation, base, hspec, HUnit, time }: mkDerivation { @@ -121695,6 +122112,8 @@ self: { pname = "jammittools"; version = "0.5.5"; sha256 = "0x9khnf9ykhgi7aghc24nynfyrh6557mmf8s38597h4zdsd897xz"; + revision = "1"; + editedCabalFile = "0pznd9xkwadls2npdsaj69c5ssn3mdri82qxf1q7h7vyba34qibi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -124342,8 +124761,8 @@ self: { }: mkDerivation { pname = "katip"; - version = "0.5.5.1"; - sha256 = "0q72kjjrn6x1qr2rp6c3mhf5s3cq4pdsl917a9bflid9zmk5n30b"; + version = "0.6.0.0"; + sha256 = "1ll33qvxlqdja7yljyv1mlc5sy4q8izgdscz6zvbyqnjl9iczrn3"; libraryHaskellDepends = [ aeson async auto-update base bytestring containers either hostname microlens microlens-th monad-control mtl old-locale resourcet @@ -124375,8 +124794,8 @@ self: { }: mkDerivation { pname = "katip-elasticsearch"; - version = "0.4.1.0"; - sha256 = "19gpgxg8wz5zdx8a0sspbdk9ypjcrclni0da6sh1hz80yydcfzb1"; + version = "0.4.2.0"; + sha256 = "0h6v9jsdc6r1zqz4wgvqr3y0ghqprjbfhlgmwh6q2cjixm3mxw1x"; libraryHaskellDepends = [ aeson async base bloodhound bytestring enclosed-exceptions exceptions http-client http-types katip retry scientific semigroups @@ -129082,6 +129501,8 @@ self: { pname = "lens"; version = "4.16.1"; sha256 = "1im4drhbydbawd6i0jsrzpqihnmx4ywpkg7yg94ddwsw3mxwkgpm"; + revision = "1"; + editedCabalFile = "12ycfzkc87fp787a5iq3k20mrfjd6b0r2d0dr7zscfd81sgw4shx"; setupHaskellDepends = [ base Cabal cabal-doctest filepath ]; libraryHaskellDepends = [ array base base-orphans bifunctors bytestring call-stack comonad @@ -129159,8 +129580,8 @@ self: { pname = "lens-aeson"; version = "1.0.2"; sha256 = "1k028ycmhz7mnjlrap88fqix4nmmpyy6b88m16kv77d3r8sz04a3"; - revision = "5"; - editedCabalFile = "0z6ib6kndbk5dgzlacmdlsdjrrazj9hwnkk9ldc6flgq15ba74nr"; + revision = "6"; + editedCabalFile = "1pg5v8fnlqw1krgi3d2a03a0zkjjdv5yp5f5z6q4mlb5jldz99a8"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base bytestring lens scientific text @@ -130979,8 +131400,8 @@ self: { pname = "linear"; version = "1.20.7"; sha256 = "1dna0zf4qwqwvslz0nkkfclvbflfvf10qydnjsi20wijilkbd22b"; - revision = "4"; - editedCabalFile = "11fxa2bqpyf99iv2b3yzi9z17y0r70afqij52lmifsyzr24zizv3"; + revision = "5"; + editedCabalFile = "0m67chpgxwakx62n22555nr2ii1hvspqcypjdwib9c1jrpg3ss95"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ adjunctions base base-orphans binary bytes cereal containers @@ -131023,6 +131444,8 @@ self: { pname = "linear-accelerate"; version = "0.6.0.0"; sha256 = "1bwqbs4816xrrc0bcf3nllad1an7c8gv2n9d1qv3ybk7s4fw288s"; + revision = "1"; + editedCabalFile = "1sf1jqpymhkdl5xn1br13qkw3zyg7pqmmwcczcw19zpgwk4ai19v"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ accelerate base distributive lens linear @@ -133146,8 +133569,8 @@ self: { pname = "log-domain"; version = "0.12"; sha256 = "0zin3zgxrx8v69blqzkd5gjk0nmpmg58caqz2xa8qd4v1fjcp4bi"; - revision = "2"; - editedCabalFile = "1yjphyqyn8122ikxxv0a10fh2cbavy7xyb435jxq6gln8sw3m54d"; + revision = "3"; + editedCabalFile = "19xc24jwfhzy3v26689sc4ma50w4ylqd378dpxphl0nrxili645z"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base binary bytes cereal comonad deepseq distributive hashable @@ -133225,6 +133648,8 @@ self: { pname = "log-elasticsearch"; version = "0.10.0.0"; sha256 = "0bjsng7ganwbqxvj9zi7w7l547iw9yh972bc0mc82cnwd6awclj5"; + revision = "1"; + editedCabalFile = "11sd5si8snl5agl34arp9lkxjnm07rd5rs05apq1lvcac70la18d"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bloodhound bytestring deepseq http-client http-client-tls log-base semigroups text @@ -133436,23 +133861,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "logging-effect_1_3_0" = callPackage + "logging-effect_1_3_1" = callPackage ({ mkDerivation, async, base, bytestring, criterion, exceptions , fast-logger, free, lifted-async, monad-control, monad-logger, mtl , prettyprinter, semigroups, stm, stm-delay, text, time - , transformers, transformers-base, wl-pprint-text + , transformers, transformers-base, unliftio-core }: mkDerivation { pname = "logging-effect"; - version = "1.3.0"; - sha256 = "02acs3f4zx0xwivzfpw5i4mnig63m330n1a2ni0brck3kbj9qsrn"; + version = "1.3.1"; + sha256 = "0swpklfn119q08yzxn71xfb8imv5ppcvl58dr297n1sr0v2xw7sb"; libraryHaskellDepends = [ async base exceptions free monad-control mtl prettyprinter semigroups stm stm-delay text time transformers transformers-base + unliftio-core ]; benchmarkHaskellDepends = [ base bytestring criterion fast-logger lifted-async monad-logger - text time wl-pprint-text + prettyprinter text time ]; description = "A mtl-style monad transformer for general purpose & compositional logging"; license = stdenv.lib.licenses.bsd3; @@ -134233,8 +134659,8 @@ self: { pname = "lrucaching"; version = "0.3.3"; sha256 = "192a2zap1bmxa2y48n48rmngf18fr8k0az4a230hziv3g795yzma"; - revision = "2"; - editedCabalFile = "0ypilhv8im5vqwdy6wk9ql2dlpr4cykag6ikvyjapl8bpyfm44xa"; + revision = "3"; + editedCabalFile = "0y7j6m0n1xi40c7dmabi9lk6mjic9h49xx60rq9xc4xap90hjfqb"; libraryHaskellDepends = [ base base-compat deepseq hashable psqueues vector ]; @@ -135105,8 +135531,8 @@ self: { pname = "machines"; version = "0.6.3"; sha256 = "1kxypm26xxd30979yrg94pnaaj3yfn180ri3y4z2xsm2m5iyiliz"; - revision = "6"; - editedCabalFile = "0ga5x9lpik7gz2fx4j3jnn6dw8xkd9cxg19ngj8iwrx4b946m1w7"; + revision = "7"; + editedCabalFile = "00wq0lnz081bcjrnsg2pvn3i08b4ssgqm92n5j0lpqlym2vm0ar8"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ adjunctions base comonad containers distributive mtl pointed @@ -137555,24 +137981,24 @@ self: { "mbug" = callPackage ({ mkDerivation, base, bytestring, directory, extra, formatting - , http-client, http-client-tls, optparse-applicative, process + , http-client, http-client-tls, mtl, optparse-applicative, process , scalpel-core, tagsoup, text, time, xdg-basedir }: mkDerivation { pname = "mbug"; - version = "1.2"; - sha256 = "0rzfayssvifwb7p8m00lv8s1m5paa86nc6ndwi6ih34lhi30qcr8"; + version = "1.3"; + sha256 = "1pa3myyd2qrb14797hix4dh0ajpwr49219x5bf030yps6b0hsi91"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring directory extra formatting http-client - http-client-tls optparse-applicative process scalpel-core tagsoup - text time xdg-basedir + http-client-tls mtl optparse-applicative process scalpel-core + tagsoup text time xdg-basedir ]; executableHaskellDepends = [ base bytestring directory extra formatting http-client - http-client-tls optparse-applicative process scalpel-core tagsoup - text time xdg-basedir + http-client-tls mtl optparse-applicative process scalpel-core + tagsoup text time xdg-basedir ]; description = "download bugs mailboxes"; license = stdenv.lib.licenses.gpl3; @@ -139044,6 +139470,43 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "microformats2-parser_1_0_1_8" = callPackage + ({ mkDerivation, aeson, aeson-pretty, aeson-qq, attoparsec, base + , base-compat, blaze-html, blaze-markup, bytestring, containers + , data-default, either, errors, hspec + , hspec-expectations-pretty-diff, html-conduit, lens-aeson, mtl + , network, network-uri, options, pcre-heavy, raw-strings-qq, safe + , scotty, tagsoup, template-haskell, text, time, transformers + , unordered-containers, vector, wai-cli, wai-extra, xml-lens + , xss-sanitize + }: + mkDerivation { + pname = "microformats2-parser"; + version = "1.0.1.8"; + sha256 = "0hb5i60w369lngfw5a3bai5zvlgchcf1vvxshp9md77lyl7h49ar"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-qq attoparsec base base-compat blaze-markup bytestring + containers data-default either errors html-conduit lens-aeson + network-uri pcre-heavy safe tagsoup text time transformers + unordered-containers vector xml-lens xss-sanitize + ]; + executableHaskellDepends = [ + aeson aeson-pretty base base-compat blaze-html blaze-markup + data-default network network-uri options scotty text wai-cli + wai-extra + ]; + testHaskellDepends = [ + aeson-qq base base-compat bytestring data-default hspec + hspec-expectations-pretty-diff html-conduit mtl network-uri + raw-strings-qq template-haskell text time xml-lens + ]; + description = "A Microformats 2 parser"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "microformats2-types" = callPackage ({ mkDerivation, aeson, base, data-default-class, pandoc-types , setters, text, time @@ -139759,6 +140222,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mime-types_0_1_0_8" = callPackage + ({ mkDerivation, base, bytestring, containers, text }: + mkDerivation { + pname = "mime-types"; + version = "0.1.0.8"; + sha256 = "14ccl2842ya17zyj0bpc7vzklbyqvvydpbypn69h2fmhgji192x8"; + libraryHaskellDepends = [ base bytestring containers text ]; + description = "Basic mime-type handling types and functions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "minecraft-data" = callPackage ({ mkDerivation, array, base, bytestring, cereal, containers, lens , mtl, nbt, pipes, pipes-bytestring, pipes-cereal, pipes-parse @@ -145700,6 +146175,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "names-th_0_3_0_0" = callPackage + ({ mkDerivation, base, containers, template-haskell }: + mkDerivation { + pname = "names-th"; + version = "0.3.0.0"; + sha256 = "09m5zflpk1h7jwz40mijhnpbsd8qnnay1jm3lpfrvdmg49m8zqqb"; + libraryHaskellDepends = [ base containers template-haskell ]; + description = "Manipulate name strings for TH"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "namespace" = callPackage ({ mkDerivation, base, containers, monoid-extras }: mkDerivation { @@ -145862,6 +146349,8 @@ self: { pname = "nanovg"; version = "0.6.0.0"; sha256 = "15nljmlcgj1pw9ydy3a9nmk6zpgfp3p71arw04b1krx2y9r2fnp3"; + revision = "1"; + editedCabalFile = "1lhfsq50r9bdby7mfscw8ih3wsz2m19lr2a2z9b6diaf5kz76vij"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers text vector ]; @@ -147079,14 +147568,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "network_2_7_0_0" = callPackage + "network_2_7_0_1" = callPackage ({ mkDerivation, base, bytestring, directory, doctest, hspec, HUnit , unix }: mkDerivation { pname = "network"; - version = "2.7.0.0"; - sha256 = "17qd387vxq2b27k4g56679flnvfvsm7vqf2mnssa0lvghks4c1f1"; + version = "2.7.0.1"; + sha256 = "1n2lixpl5w8nfn66qw86xsbh3p2v9pc6mhsxhjnwxdq2jv1qs2kh"; libraryHaskellDepends = [ base bytestring unix ]; testHaskellDepends = [ base bytestring directory doctest hspec HUnit @@ -147333,6 +147822,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "network-conduit-tls_1_3_2" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , connection, data-default-class, HUnit, mtl, network + , streaming-commons, tls, transformers, unliftio-core + }: + mkDerivation { + pname = "network-conduit-tls"; + version = "1.3.2"; + sha256 = "0zxdsf7isv3l2g58vsvi8iwlrgf85v7ksa8636kr6ffycbhn1zgc"; + libraryHaskellDepends = [ + base bytestring conduit conduit-extra connection data-default-class + network streaming-commons tls transformers unliftio-core + ]; + testHaskellDepends = [ + base bytestring conduit conduit-extra connection HUnit mtl + ]; + description = "Create TLS-aware network code with conduits"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-connection" = callPackage ({ mkDerivation, base, bytestring, containers, network , network-bytestring, stm @@ -148201,6 +148711,8 @@ self: { pname = "newtype-generics"; version = "0.5.3"; sha256 = "0igyisw2djg19v9vkna1rwf47k97mvkvk4bbkmswznvbm00z15gj"; + revision = "1"; + editedCabalFile = "1glnwq1lw7780qgahqvh1qfx6k2ciwmbhc2wcc78v3aa3s954c8v"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ base hspec ]; testToolDepends = [ hspec-discover ]; @@ -149063,8 +149575,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "non-empty-containers"; - version = "0.1.0.0"; - sha256 = "021rfs019kb3h9zz2ycdg7ia65b1hr2rlxzihcdkqywklvxvykxw"; + version = "0.1.1.0"; + sha256 = "1m4js4z27x43bkccbaqnlrmknfdiwqgdvvkfad7r4kgwdmil3mnc"; libraryHaskellDepends = [ base containers ]; license = stdenv.lib.licenses.bsd3; }) {}; @@ -149157,12 +149669,12 @@ self: { }) {}; "nonemptymap" = callPackage - ({ mkDerivation, base, containers }: + ({ mkDerivation, base, containers, semigroupoids }: mkDerivation { pname = "nonemptymap"; - version = "0.0.2.0"; - sha256 = "0h08xki7z69xrni2r6l7b5wyg6sfdm0hfq2l35q50yac83srfs0v"; - libraryHaskellDepends = [ base containers ]; + version = "0.0.4.0"; + sha256 = "0rkdhbg0bps8ws20xspw98fkmbcgzfir9kk5pxwir8x6pwwbfd8h"; + libraryHaskellDepends = [ base containers semigroupoids ]; description = "A NonEmptyMap Implementation"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -150136,8 +150648,8 @@ self: { }: mkDerivation { pname = "nvim-hs"; - version = "1.0.0.1"; - sha256 = "05kqrnzxhydns3iyqk1rhdgx3cyqgcskhfwa1d87hcyx0p4w51pw"; + version = "1.0.0.2"; + sha256 = "00s8anzazzax8kjsa0ciyvx9c5smwb8a81qh625nf2v9pkp7lr20"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155464,16 +155976,16 @@ self: { }) {}; "parsix" = callPackage - ({ mkDerivation, base, bytestring, containers, fingertree, mtl - , parsers, prettyprinter, prettyprinter-ansi-terminal, QuickCheck - , tasty, tasty-hunit, tasty-quickcheck, text, transformers + ({ mkDerivation, base, containers, fingertree, mtl, parsers + , prettyprinter, prettyprinter-ansi-terminal, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck, text, transformers }: mkDerivation { pname = "parsix"; - version = "0.1.0.1"; - sha256 = "0qpn5vjgp0392nb6nirp92s2g5jxr4jcpg35j0w1mg5ym5ra4mm1"; + version = "0.1.0.2"; + sha256 = "0dg48xycw7dl3700ws9qi49i8095nqag6wr9n1jan2w2gd0vchy1"; libraryHaskellDepends = [ - base bytestring containers fingertree mtl parsers prettyprinter + base containers fingertree mtl parsers prettyprinter prettyprinter-ansi-terminal text transformers ]; testHaskellDepends = [ @@ -157277,6 +157789,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "persistable-record_0_6_0_4" = callPackage + ({ mkDerivation, array, base, containers, dlist, names-th + , product-isomorphic, quickcheck-simple, template-haskell + , th-data-compat, transformers + }: + mkDerivation { + pname = "persistable-record"; + version = "0.6.0.4"; + sha256 = "1ygqllybclw9mm0n05vh635wbz6qlsl2yhas3fxr3xhwsrrvwfkd"; + libraryHaskellDepends = [ + array base containers dlist names-th product-isomorphic + template-haskell th-data-compat transformers + ]; + testHaskellDepends = [ base quickcheck-simple ]; + description = "Binding between SQL database values and haskell records"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistable-types-HDBC-pg" = callPackage ({ mkDerivation, base, bytestring, convertible, dlist, HDBC , persistable-record, relational-query, relational-query-HDBC @@ -157297,6 +157828,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "persistable-types-HDBC-pg_0_0_3_4" = callPackage + ({ mkDerivation, base, bytestring, convertible, dlist, HDBC + , persistable-record, relational-query, relational-query-HDBC + , text-postgresql + }: + mkDerivation { + pname = "persistable-types-HDBC-pg"; + version = "0.0.3.4"; + sha256 = "0iygm59rai7w9g43h2ypra1z4dq2rsw5vc3nwh5bzpaa6x2mqqfb"; + libraryHaskellDepends = [ + base bytestring convertible dlist HDBC persistable-record + relational-query relational-query-HDBC text-postgresql + ]; + testHaskellDepends = [ + base relational-query relational-query-HDBC text-postgresql + ]; + description = "HDBC and Relational-Record instances of PostgreSQL extended types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent_2_7_3_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, blaze-markup, bytestring, conduit, containers @@ -161542,6 +162094,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "pomaps_0_0_1_0" = callPackage + ({ mkDerivation, base, ChasingBottoms, containers, criterion + , deepseq, doctest, ghc-prim, Glob, lattices, random, tasty + , tasty-hspec, tasty-quickcheck, vector + }: + mkDerivation { + pname = "pomaps"; + version = "0.0.1.0"; + sha256 = "1vvvpqr3gnps425mv00scmab0hc8h93ylsiw07vm8cpafwkfxii8"; + libraryHaskellDepends = [ + base containers deepseq ghc-prim lattices + ]; + testHaskellDepends = [ + base ChasingBottoms containers doctest Glob lattices tasty + tasty-hspec tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base criterion deepseq lattices random vector + ]; + description = "Maps and sets of partial orders"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pomodoro" = callPackage ({ mkDerivation, base, bytestring, cereal, directory, filepath , heredoc, libnotify, network, process, time, unix, wx, wxcore @@ -165830,6 +166406,8 @@ self: { pname = "protocol-buffers"; version = "2.4.10"; sha256 = "0rr7yla1gl199hk2zn7jr1p0nq166mi4dm43ild27y6bvrdc2kvk"; + revision = "1"; + editedCabalFile = "04cv52k497nmh04pflmjrl26vlbczvm3mk4qld0zrwqxkk6v0ris"; libraryHaskellDepends = [ array base binary bytestring containers directory filepath mtl parsec syb utf8-string @@ -165838,12 +166416,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "protocol-buffers_2_4_11" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , directory, filepath, mtl, parsec, syb, utf8-string + }: + mkDerivation { + pname = "protocol-buffers"; + version = "2.4.11"; + sha256 = "1s41iprw4w6g56phrgali2b59isn2s67nzfwr38yfgib3lm4kjs7"; + libraryHaskellDepends = [ + array base binary bytestring containers directory filepath mtl + parsec syb utf8-string + ]; + description = "Parse Google Protocol Buffer specifications"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protocol-buffers-descriptor" = callPackage ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { pname = "protocol-buffers-descriptor"; version = "2.4.10"; sha256 = "1w4n0yqf5xhbs5yi0xj8ak268chngklc7sif2s3bjr0dwk7fi5d0"; + revision = "1"; + editedCabalFile = "03b3w0yawnjv5hpprkhj49s1fkj9ib03avyxgv3i9vj0n0ngbiz1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers protocol-buffers @@ -165852,6 +166449,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "protocol-buffers-descriptor_2_4_11" = callPackage + ({ mkDerivation, base, bytestring, containers, protocol-buffers }: + mkDerivation { + pname = "protocol-buffers-descriptor"; + version = "2.4.11"; + sha256 = "06k8sz0i021mizdgh01rx7v08wc767njwppimgmm2hyg6k4bv450"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers protocol-buffers + ]; + description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protocol-buffers-descriptor-fork" = callPackage ({ mkDerivation, base, bytestring, containers , protocol-buffers-fork @@ -170394,8 +171006,8 @@ self: { pname = "rcu"; version = "0.2.2"; sha256 = "0lj88xif38zh1qkpfzyarm36khzavqsl8chjma062b1pvhhlc9lk"; - revision = "2"; - editedCabalFile = "0s9rd1ys6y770xwfgljmrkyw968jqwsa39xpa3x88wzb93qzypmr"; + revision = "3"; + editedCabalFile = "1qyc8jb97mfcmijn825s6mr244mx2kqvam5mm519dm6dyk8kchpa"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -172572,6 +173184,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "regex-tdfa_1_2_3_1" = callPackage + ({ mkDerivation, array, base, bytestring, containers, ghc-prim, mtl + , parsec, regex-base + }: + mkDerivation { + pname = "regex-tdfa"; + version = "1.2.3.1"; + sha256 = "0l7ajnh4hpgggf2a1r9dg0hx2fy679vd2kada5y7r02hy3nfxala"; + libraryHaskellDepends = [ + array base bytestring containers ghc-prim mtl parsec regex-base + ]; + description = "Replaces/Enhances Text.Regex"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "regex-tdfa-pipes" = callPackage ({ mkDerivation, array, base, lens, monads-tf, pipes, regex-base , regex-tdfa @@ -173139,7 +173767,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "relational-query_0_11_3_0" = callPackage + "relational-query_0_12_0_0" = callPackage ({ mkDerivation, array, base, bytestring, containers, dlist , names-th, persistable-record, product-isomorphic , quickcheck-simple, sql-words, template-haskell, text @@ -173147,8 +173775,8 @@ self: { }: mkDerivation { pname = "relational-query"; - version = "0.11.3.0"; - sha256 = "1g7jvhp5vv17hbddc2p6j39gfg638y2b0jjky9jxrcjkww1ii16p"; + version = "0.12.0.0"; + sha256 = "0rp6fi93wyr0w2rhng8ymn9bdh4pdrn488l0lnm4f5ris50dz2y1"; libraryHaskellDepends = [ array base bytestring containers dlist names-th persistable-record product-isomorphic sql-words template-haskell text th-reify-compat @@ -173281,6 +173909,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "relational-schemas_0_1_6_2" = callPackage + ({ mkDerivation, base, bytestring, containers, relational-query + , template-haskell, time + }: + mkDerivation { + pname = "relational-schemas"; + version = "0.1.6.2"; + sha256 = "1c578lz7k06clwn92wi3xl20imn8ddivqblxn0vqrnn5hfkfy8jm"; + libraryHaskellDepends = [ + base bytestring containers relational-query template-haskell time + ]; + description = "RDBMSs' schema templates for relational-query"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "relative-date" = callPackage ({ mkDerivation, base, concatenative, datetime, mtl, parsec, time }: @@ -175299,8 +175943,8 @@ self: { }: mkDerivation { pname = "rhine"; - version = "0.4.0.0"; - sha256 = "18fav38bd2ysk8y5s24xxc6v381mag3g2lqpb9qayvcfj2zndx1x"; + version = "0.4.0.1"; + sha256 = "00xmq61bgq84z8kvnjrh30zffm4q108gbxbndfkl6v63jl0346yj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -175316,13 +175960,13 @@ self: { ({ mkDerivation, base, dunai, gloss, rhine }: mkDerivation { pname = "rhine-gloss"; - version = "0.4.0.0"; - sha256 = "1sidp1f3is889g0kgdcbzpjrqndrvwvq6k713daqlkzarg9wngnj"; + version = "0.4.0.1"; + sha256 = "054f7x6d2gi3ph9iw5fs8qxyl2jwv8q93794zhdkcnyz15371piq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base dunai gloss rhine ]; executableHaskellDepends = [ base ]; - description = "Wrapper to run reactive programs written in Rhine with Gloss as backend"; + description = "Gloss backend for Rhine"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -177900,8 +178544,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "salve"; - version = "1.0.2"; - sha256 = "0c5022vd2pll27q49s4jq47jip27v1kr417wzip7dw5z3b3dd1ni"; + version = "1.0.3"; + sha256 = "1688sd4zrw8swb61svnjawaq7w85hgvh4ww7zz3yppl40sl82irj"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; description = "Semantic version numbers and constraints"; @@ -179567,6 +180211,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "script-monad" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, http-client + , http-types, lens, lens-aeson, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, text, time, unordered-containers, vector, wreq + }: + mkDerivation { + pname = "script-monad"; + version = "0.0.1"; + sha256 = "0s1wb3wgkma7ia8mn4fl8jyl74vrx195m37n71fnbi22z56y8k5j"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring http-client http-types lens + lens-aeson QuickCheck text time unordered-containers vector wreq + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit tasty-quickcheck + ]; + description = "Transformer stack of error, reader, writer, state, and prompt monads"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "scrobble" = callPackage ({ mkDerivation, base, containers, curl, MissingH, network , network-uri, old-locale, pureMD5, time, url @@ -180557,8 +181224,8 @@ self: { pname = "semigroupoids"; version = "5.2.2"; sha256 = "17i96y4iqj8clcs090lf6k0ij3j16nj14vsfwz0mm9nd6i4gbpp4"; - revision = "3"; - editedCabalFile = "1k7iq54rkiqrx5kdcc6mc11agqqcnp1hgrw6c6rl3yjybz1vc5y4"; + revision = "4"; + editedCabalFile = "0pqfrxzypjq6z8lgdkzq4vhcyqkpk5326hny0r6snpc3gm78r4ij"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base-orphans bifunctors comonad containers contravariant @@ -181427,6 +182094,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-JuicyPixels_0_3_0_4" = callPackage + ({ mkDerivation, base, bytestring, http-media, JuicyPixels, servant + , servant-server, wai, warp + }: + mkDerivation { + pname = "servant-JuicyPixels"; + version = "0.3.0.4"; + sha256 = "10crrcrxap7751wifbc28kr1kv0rjvrx3wlnkajgv3xpr05g00kv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring http-media JuicyPixels servant + ]; + executableHaskellDepends = [ + base JuicyPixels servant servant-server wai warp + ]; + description = "Servant support for JuicyPixels"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-aeson-specs" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory , doctest, filepath, hspec, hspec-core, hspec-golden-aeson, mockery @@ -183043,6 +183731,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-static-th_0_2_2_0" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, containers + , directory, doctest, filepath, Glob, hspec-wai, http-media + , semigroups, servant, servant-blaze, servant-server, tasty + , tasty-hspec, tasty-hunit, template-haskell, text, wai + }: + mkDerivation { + pname = "servant-static-th"; + version = "0.2.2.0"; + sha256 = "06vl8a9h5gzmfazj390fmxp6p4bwfdszqjdwnpivv03m80lh3v2v"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-html bytestring containers directory filepath http-media + semigroups servant servant-blaze servant-server template-haskell + text + ]; + testHaskellDepends = [ + base blaze-html bytestring directory doctest filepath Glob + hspec-wai servant servant-blaze servant-server tasty tasty-hspec + tasty-hunit wai + ]; + description = "Embed a directory of static files in your Servant server"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-streaming" = callPackage ({ mkDerivation, base, hspec, http-types, QuickCheck, servant }: mkDerivation { @@ -184341,16 +185056,16 @@ self: { "shake-ats" = callPackage ({ mkDerivation, base, binary, dependency, directory, hashable - , hs2ats, language-ats, microlens, microlens-th, shake, shake-cabal + , hs2ats, language-ats, microlens, shake, shake-c, shake-cabal , shake-ext, text }: mkDerivation { pname = "shake-ats"; - version = "1.8.0.6"; - sha256 = "00887a8dh26w2qj5w0scivrz3qjybbkflf4s135lmrz6s5pb7l6f"; + version = "1.9.0.1"; + sha256 = "0wqc471s20dby2zypc0k80fb0b3mgqji2yx6phygfcd7qr6j5xy1"; libraryHaskellDepends = [ base binary dependency directory hashable hs2ats language-ats - microlens microlens-th shake shake-cabal shake-ext text + microlens shake shake-c shake-cabal shake-ext text ]; description = "Utilities for building ATS projects with shake"; license = stdenv.lib.licenses.bsd3; @@ -184361,8 +185076,8 @@ self: { ({ mkDerivation, base, cdeps, shake }: mkDerivation { pname = "shake-c"; - version = "0.1.0.0"; - sha256 = "0g6lavs5y62g5dpy1pfpm2bks43kf6i4m1gb9hdrkrz1iysgl209"; + version = "0.3.0.0"; + sha256 = "1ib1090z5vrch5nbx9dyn89yxawwhz2igb0s08sqgn7lawd03vvw"; libraryHaskellDepends = [ base cdeps shake ]; description = "Library for building C code with shake"; license = stdenv.lib.licenses.bsd3; @@ -184423,16 +185138,12 @@ self: { }) {}; "shake-ext" = callPackage - ({ mkDerivation, base, cdeps, composition-prelude, directory, shake - , template-haskell - }: + ({ mkDerivation, base, directory, shake }: mkDerivation { pname = "shake-ext"; - version = "2.12.0.0"; - sha256 = "1yvsywbszvn2vllbzbp8c9c10idaid87wv1qvhz2xq4jw2f8q38h"; - libraryHaskellDepends = [ - base cdeps composition-prelude directory shake template-haskell - ]; + version = "3.0.1.0"; + sha256 = "15n94922a4l74n65w59dj8jjpsv2vamm5lwnkii2hq6s1rpgccnm"; + libraryHaskellDepends = [ base directory shake ]; description = "Helper functions for linting with shake"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -185657,6 +186368,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {gdk_x11 = null; gtk_x11 = null;}; + "siggy-chardust" = callPackage + ({ mkDerivation, base, doctest, hlint, smallcheck, tasty + , tasty-hunit, tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "siggy-chardust"; + version = "1.0.0"; + sha256 = "0hssby6mak0bq1fqv47hp6rnw51yz1kgzgsmnvh2k9jfq0y0qwwz"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base doctest hlint smallcheck tasty tasty-hunit tasty-quickcheck + tasty-smallcheck + ]; + description = "Rounding rationals to significant digits and decimal places"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "sigma-ij" = callPackage ({ mkDerivation, array, base, combinat, containers , optparse-applicative, parsec2, random, time @@ -191814,6 +192542,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sql-words_0_1_6_2" = callPackage + ({ mkDerivation, base, QuickCheck, quickcheck-simple }: + mkDerivation { + pname = "sql-words"; + version = "0.1.6.2"; + sha256 = "0f7bvmz2ppq6pwgi3klxzpilnj899ssrsf52r99g9apqz065lsiz"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base QuickCheck quickcheck-simple ]; + description = "SQL keywords data constructors into OverloadedString"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sqlcipher" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, filepath , hspec, openssl, pretty, temporary, time, utf8-string @@ -191985,23 +192726,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "squeal-postgresql_0_2_1_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, deepseq, doctest - , generics-sop, lifted-base, mmorph, monad-control, mtl, network-ip + "squeal-postgresql_0_3_0_0" = callPackage + ({ mkDerivation, aeson, base, binary-parser, bytestring + , bytestring-strict-builder, deepseq, doctest, generics-sop + , lifted-base, mmorph, monad-control, mtl, network-ip , postgresql-binary, postgresql-libpq, resource-pool, scientific , text, time, transformers, transformers-base, uuid-types, vector }: mkDerivation { pname = "squeal-postgresql"; - version = "0.2.1.0"; - sha256 = "1qfz1c4yzjshgvc64plahy3aar96yvcmn2m5giyp17nrfgq266qs"; + version = "0.3.0.0"; + sha256 = "06phwnwsbq6w6zkbhxsfwcrgb875nmnrkn5k770n69vm21p9mlzm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring deepseq generics-sop lifted-base mmorph - monad-control mtl network-ip postgresql-binary postgresql-libpq - resource-pool scientific text time transformers transformers-base - uuid-types vector + aeson base binary-parser bytestring bytestring-strict-builder + deepseq generics-sop lifted-base mmorph monad-control mtl + network-ip postgresql-binary postgresql-libpq resource-pool + scientific text time transformers transformers-base uuid-types + vector ]; executableHaskellDepends = [ base bytestring generics-sop mtl text transformers @@ -193209,6 +193952,18 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "starter_0_3_0" = callPackage + ({ mkDerivation, base, fsnotify }: + mkDerivation { + pname = "starter"; + version = "0.3.0"; + sha256 = "14rxrs1gjsm26m7rk4rj9b2389zca0j24kjl7sfznqpxgk99qmpx"; + libraryHaskellDepends = [ base fsnotify ]; + description = "Develop applications without restarts"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stash" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, directory , hashable, text, vector @@ -199893,17 +200648,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty_1_1_0_1" = callPackage + "tasty_1_1_0_2" = callPackage ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl , optparse-applicative, stm, tagged, unbounded-delays, unix + , wcwidth }: mkDerivation { pname = "tasty"; - version = "1.1.0.1"; - sha256 = "09mbqjak66wynacddn399hh9dqcmgxg4gdn2492g538dj55lmjdw"; + version = "1.1.0.2"; + sha256 = "1q3hsy1a6q8xng3m04hp1m10bwamihani30zi25cjhkhmyl4ads7"; libraryHaskellDepends = [ ansi-terminal async base clock containers mtl optparse-applicative - stm tagged unbounded-delays unix + stm tagged unbounded-delays unix wcwidth ]; description = "Modern and extensible testing framework"; license = stdenv.lib.licenses.mit; @@ -200045,6 +200801,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-golden_2_3_2" = callPackage + ({ mkDerivation, async, base, bytestring, containers, deepseq + , directory, filepath, mtl, optparse-applicative, process, tagged + , tasty, tasty-hunit, temporary, temporary-rc + }: + mkDerivation { + pname = "tasty-golden"; + version = "2.3.2"; + sha256 = "0k3ibjhjc9vcwzrjnl4rnwvfm8l81q347nb7dgvcib6n5wm3s404"; + libraryHaskellDepends = [ + async base bytestring containers deepseq directory filepath mtl + optparse-applicative process tagged tasty temporary + ]; + testHaskellDepends = [ + base directory filepath process tasty tasty-hunit temporary-rc + ]; + description = "Golden tests support for tasty"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-groundhog-converters" = callPackage ({ mkDerivation, aeson, base, bimap, bytestring, containers , groundhog, groundhog-converters, groundhog-sqlite, groundhog-th @@ -202900,6 +203677,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "text-postgresql_0_0_3_1" = callPackage + ({ mkDerivation, base, dlist, QuickCheck, quickcheck-simple + , transformers, transformers-compat + }: + mkDerivation { + pname = "text-postgresql"; + version = "0.0.3.1"; + sha256 = "1s42a1mq7hz63zfpcv7bl4141vnyrsyd0ir723iph6vmsa46iqn6"; + libraryHaskellDepends = [ + base dlist transformers transformers-compat + ]; + testHaskellDepends = [ base QuickCheck quickcheck-simple ]; + description = "Parser and Printer of PostgreSQL extended types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-printer" = callPackage ({ mkDerivation, base, bytestring, pretty, QuickCheck, semigroups , test-framework, test-framework-quickcheck2, text, text-latin1 @@ -205748,8 +206542,8 @@ self: { }: mkDerivation { pname = "tintin"; - version = "1.9.0"; - sha256 = "0nl2qpj59zavvdjbq565ls2gz4apwh2qq2jrknxsvwfl79jnf8pz"; + version = "1.9.1"; + sha256 = "0i44m49v9vxcasiacrrk6ypqan3j2qw4r9g2m99brmji9kwma2kb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -206994,8 +207788,8 @@ self: { }: mkDerivation { pname = "trackit"; - version = "0.3"; - sha256 = "0n4ypg2g82ajnmvv94sgympvbwji0bkw5kmd4zfzrvzrdxq91yvh"; + version = "0.4"; + sha256 = "0dzcmb10imksryr6lpmnq8b7bzqkm9y1dkyx52k1ic5yms3rwxyx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -208048,8 +208842,8 @@ self: { pname = "trifecta"; version = "1.7.1.1"; sha256 = "13n6a3fdxngnzsjnhfrzigv1c2g0xm6lqkjcnirpc37sd0rpby31"; - revision = "4"; - editedCabalFile = "12dv7mipmqc7ykazjqql6slbgdgi5f6hglw2cbdi6brvkwxk7w9z"; + revision = "5"; + editedCabalFile = "0zlvnmzxx1ax8kx1d0z4jibjy49picz2zxknr8i6pz1gsj89bgrw"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html @@ -208651,8 +209445,8 @@ self: { ({ mkDerivation, base, generics-sop }: mkDerivation { pname = "tuple-sop"; - version = "0.3.0.0"; - sha256 = "1m9xsjnnyavms4hxgdam79vc9c4bf6ssmammmzvvidqvyl9z1g15"; + version = "0.3.1.0"; + sha256 = "0hv0fcz5sw93v1niq2r656wpkiwkg6larld7x9cwk4s98h7qvqgn"; libraryHaskellDepends = [ base generics-sop ]; testHaskellDepends = [ base generics-sop ]; description = "functions on n-ary tuples using generics-sop"; @@ -212253,6 +213047,8 @@ self: { pname = "unjson"; version = "0.15.2.0"; sha256 = "040s1b9frl0sj8saa9b0bzsnqhmb4vdrscff2jzzcdn0papn5rbj"; + revision = "1"; + editedCabalFile = "1kv5ybjgpqxq7xy8x1rgr8ia7kaffgih0z7jx74ixdijkqk69447"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers free hashable invariant pretty primitive scientific semigroups text time @@ -215212,14 +216008,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "vector-sized_1_0_2_0" = callPackage + "vector-sized_1_0_3_0" = callPackage ({ mkDerivation, adjunctions, base, deepseq, distributive , finite-typelits, indexed-list-literals, primitive, vector }: mkDerivation { pname = "vector-sized"; - version = "1.0.2.0"; - sha256 = "0ac9bx5pcf9hbm1i9ibw3x52j0a92j8y7svm4b3d65p85mxqhc69"; + version = "1.0.3.0"; + sha256 = "1mjg8hncv7xd3w7fsdalvhwiwnsr83nxv21njc01bgj891as44bx"; libraryHaskellDepends = [ adjunctions base deepseq distributive finite-typelits indexed-list-literals primitive vector @@ -215576,6 +216372,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "vfr-waypoints" = callPackage + ({ mkDerivation, base, containers, fuzzy, lens, monoid-subclasses + , optparse-applicative + }: + mkDerivation { + pname = "vfr-waypoints"; + version = "0.1.0.1"; + sha256 = "0xx7j57wrqg90h8sggq32jm7hp1hyjazylgyk8pnvfmzhirnqp4y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers fuzzy lens monoid-subclasses + ]; + executableHaskellDepends = [ + base fuzzy lens optparse-applicative + ]; + description = "VFR waypoints, as published in the AIP (ERSA)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "vgrep" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, cabal-file-th , containers, directory, doctest, fingertree, generic-deriving @@ -219199,6 +220015,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "webdriver-w3c" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring + , bytestring, containers, directory, exceptions, http-client + , http-types, JuicyPixels, lens, lens-aeson, network-uri, parsec + , QuickCheck, random, scientific, script-monad, SHA, stm, tasty + , tasty-expected-failure, tasty-hunit, tasty-quickcheck, text, time + , unordered-containers, uri-encode, vector, wreq + }: + mkDerivation { + pname = "webdriver-w3c"; + version = "0.0.1"; + sha256 = "0ynidfwhyarbfhiq8m284l6489ribmakx8p8gx6cz7kvh44qa1cv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base base64-bytestring bytestring containers + directory exceptions http-client http-types JuicyPixels lens + lens-aeson network-uri QuickCheck random scientific script-monad + SHA stm tasty tasty-expected-failure text time unordered-containers + uri-encode vector wreq + ]; + executableHaskellDepends = [ base tasty tasty-expected-failure ]; + testHaskellDepends = [ + aeson base base64-bytestring bytestring containers directory + exceptions http-client http-types JuicyPixels lens lens-aeson + parsec QuickCheck random scientific script-monad tasty + tasty-expected-failure tasty-hunit tasty-quickcheck text time + unordered-containers vector wreq + ]; + description = "Bindings to the WebDriver API"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "webex-teams-api" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bitset-word8 , bytestring, conduit, data-default, hspec, http-conduit @@ -228494,6 +229343,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) unzip;}; + "zip-archive_0_3_3" = callPackage + ({ mkDerivation, array, base, binary, bytestring, Cabal, containers + , digest, directory, filepath, HUnit, mtl, pretty, process + , temporary, text, time, unix, unzip, zlib + }: + mkDerivation { + pname = "zip-archive"; + version = "0.3.3"; + sha256 = "0kf8xyac168bng8a0za2jwrbss7a4ralvci9g54hnvl0gkkxx2lq"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + array base binary bytestring containers digest directory filepath + mtl pretty text time unix zlib + ]; + testHaskellDepends = [ + base bytestring directory filepath HUnit process temporary time + unix + ]; + testToolDepends = [ unzip ]; + description = "Library for creating and modifying zip archives"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) unzip;}; + "zip-conduit" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra , criterion, digest, directory, filepath, hpc, HUnit, LibZip, mtl @@ -228596,8 +229471,8 @@ self: { pname = "zippers"; version = "0.2.5"; sha256 = "11f0jx0dbm2y9y5hnpakdvk9fmsm3awr2lcxp46dyma6arr7f4id"; - revision = "2"; - editedCabalFile = "03vmfmj38sa6pn858wa4fcbn3b0jw5pcypzv0kls600fgdbjfqbm"; + revision = "3"; + editedCabalFile = "0y0klc2jaj611cjvmqi95dyj9yvribf9xhibn1andrz5rs6ysz3p"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base lens profunctors semigroupoids semigroups diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 7fda1d84e55b..1a29732b651a 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -38,7 +38,8 @@ let ghcCommand' = if isGhcjs then "ghcjs" else "ghc"; ghcCommand = "${ghc.targetPrefix}${ghcCommand'}"; ghcCommandCaps= lib.toUpper ghcCommand'; - libDir = if isHaLVM then "$out/lib/HaLVM-${ghc.version}" else if isGhcjs then "$out/libexec" else "$out/lib/${ghcCommand}-${ghc.version}"; + libDir = if isHaLVM then "$out/lib/HaLVM-${ghc.version}" + else "$out/lib/${ghcCommand}-${ghc.version}"; docDir = "$out/share/doc/ghc/html"; packageCfgDir = "${libDir}/package.conf.d"; paths = lib.filter (x: x ? isHaskellLibrary) (lib.closePropagation packages); @@ -104,7 +105,7 @@ symlinkJoin { --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}" fi - '' + (lib.optionalString targetPlatform.isDarwin '' + '' + (lib.optionalString (targetPlatform.isDarwin && !isGhcjs && !targetPlatform.isiOS) '' # Work around a linker limit in macOS Sierra (see generic-builder.nix): local packageConfDir="$out/lib/${ghc.name}/package.conf.d"; local dynamicLinksDir="$out/lib/links" diff --git a/pkgs/development/idris-modules/bi.nix b/pkgs/development/idris-modules/bi.nix index fb43fbf209bb..47a81a066769 100644 --- a/pkgs/development/idris-modules/bi.nix +++ b/pkgs/development/idris-modules/bi.nix @@ -8,15 +8,15 @@ }: build-idris-package { name = "bi"; - version = "2018-01-17"; + version = "2018-06-25"; idrisDeps = [ prelude contrib pruviloj ]; src = fetchFromGitHub { owner = "sbp"; repo = "idris-bi"; - rev = "8ab40bc482ca948ac0f6ffb5b4c545a73688dd3a"; - sha256 = "1lra945q2d6anwzjs94srprqj867lrz66rsns08p8828vg55fv97"; + rev = "6bd90fb30b06ab02438efb5059e2fc699fdc7787"; + sha256 = "1px550spigl8k1m1r64mjrw7qjvipa43xy95kz1pb5ibmy84d6r3"; }; meta = { diff --git a/pkgs/development/interpreters/lua-4/default.nix b/pkgs/development/interpreters/lua-4/default.nix index 1d94fd33a72c..be49d2dd9215 100644 --- a/pkgs/development/interpreters/lua-4/default.nix +++ b/pkgs/development/interpreters/lua-4/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "lua-4.0.1"; src = fetchurl { - url = http://www.lua.org/ftp/lua-4.0.1.tar.gz; + url = https://www.lua.org/ftp/lua-4.0.1.tar.gz; sha256 = "0ajd906hasii365xdihv9mdmi3cixq758blx0289x4znkha6wx6z"; }; diff --git a/pkgs/development/interpreters/lua-5/5.0.3.nix b/pkgs/development/interpreters/lua-5/5.0.3.nix index a9e725f128bc..d343ec6c63b1 100644 --- a/pkgs/development/interpreters/lua-5/5.0.3.nix +++ b/pkgs/development/interpreters/lua-5/5.0.3.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "lua-5.0.3"; src = fetchurl { - url = http://www.lua.org/ftp/lua-5.0.3.tar.gz; + url = https://www.lua.org/ftp/lua-5.0.3.tar.gz; sha256 = "1193a61b0e08acaa6eee0eecf29709179ee49c71baebc59b682a25c3b5a45671"; }; diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix index 15077578f27f..271490c99574 100644 --- a/pkgs/development/interpreters/lua-5/5.1.nix +++ b/pkgs/development/interpreters/lua-5/5.1.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { luaversion = "5.1"; src = fetchurl { - url = "http://www.lua.org/ftp/${name}.tar.gz"; + url = "https://www.lua.org/ftp/${name}.tar.gz"; sha256 = "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333"; }; diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix index acddbcfd303c..6221bf3fb843 100644 --- a/pkgs/development/interpreters/lua-5/5.2.nix +++ b/pkgs/development/interpreters/lua-5/5.2.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { version = "${luaversion}.3"; src = fetchurl { - url = "http://www.lua.org/ftp/${name}.tar.gz"; + url = "https://www.lua.org/ftp/${name}.tar.gz"; sha256 = "0b8034v1s82n4dg5rzcn12067ha3nxaylp2vdp8gg08kjsbzphhk"; }; diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index cdbf2bdeeadd..4deadefcc4bc 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -185,8 +185,6 @@ let setupHook = ./setup-hook-cross.sh; }); in rec { - perl = perl524; - perl522 = common { version = "5.22.4"; sha256 = "1yk1xn4wmnrf2ph02j28khqarpyr24qwysjzkjnjv7vh5dygb7ms"; @@ -201,4 +199,9 @@ in rec { version = "5.26.2"; sha256 = "03gpnxx1g6hvlh0v4aqx00580h787sfywp1vlvw64q2xcbm9qbsp"; }; + + perl528 = common { + version = "5.28.0"; + sha256 = "1a3f822lcl8dr8v0hk80yyhpzqlljg49z9flb48rs3nbsij9z4ky"; + }; } diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index cede1b67475b..3032b5e4c2a1 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -348,8 +348,8 @@ in { }; php71 = generic { - version = "7.1.18"; - sha256 = "13mz8baknpydswjgqzfqqqjv426x4pnc04rfv2k33s7d2makf3jq"; + version = "7.1.19"; + sha256 = "1wvhsxzmb78pcr36ginz93iv7rcrxp3p01rb34zxa2h4wdxkxi0k"; }; php72 = generic { diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index e2b64fd4e028..37a5bdd0ce94 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "picoLisp-${version}"; version = "16.12"; src = fetchurl { - url = "http://www.software-lab.de/${name}.tgz"; + url = "https://www.software-lab.de/${name}.tgz"; sha256 = "1k3x6mvk9b34iiyml142bzh3gf241f25ywjlaagbxzb9vklpws75"; }; buildInputs = optional stdenv.is64bit jdk; diff --git a/pkgs/development/interpreters/pyrex/0.9.5.nix b/pkgs/development/interpreters/pyrex/0.9.5.nix index b67ad3db2ef5..18bc875fb334 100644 --- a/pkgs/development/interpreters/pyrex/0.9.5.nix +++ b/pkgs/development/interpreters/pyrex/0.9.5.nix @@ -6,7 +6,7 @@ python2Packages.buildPythonPackage rec { name = "pyrex-${version}"; src = fetchurl { - url = "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz"; + url = "https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz"; sha256 = "0lxxvn4mjfb83swcbqb5908q4iy53w4ip5i0f9angm2va1jyhd3z"; }; diff --git a/pkgs/development/interpreters/pyrex/0.9.6.nix b/pkgs/development/interpreters/pyrex/0.9.6.nix index 7a0ac5a1e229..2feb15b647da 100644 --- a/pkgs/development/interpreters/pyrex/0.9.6.nix +++ b/pkgs/development/interpreters/pyrex/0.9.6.nix @@ -6,7 +6,7 @@ python2Packages.buildPythonPackage rec { name = "pyrex-${version}"; src = fetchurl { - url = "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz"; + url = "https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz"; sha256 = "18pd9f8al3l6i27cc0ddhgg7hxf28lnfs75x4a8jzscydxgiq5a8"; }; diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index 00b3a7f22c2c..c5fc3e8eb712 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -207,7 +207,7 @@ in stdenv.mkDerivation { withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; pkgs = pythonPackages; isPy3 = true; - isPy35 = true; + isPy36 = true; is_py3k = true; # deprecated interpreter = "${self}/bin/${executable}"; }; diff --git a/pkgs/development/interpreters/python/cpython/3.7/default.nix b/pkgs/development/interpreters/python/cpython/3.7/default.nix index aae1041a224a..9cc0377f925f 100644 --- a/pkgs/development/interpreters/python/cpython/3.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.7/default.nix @@ -28,7 +28,7 @@ with stdenv.lib; let majorVersion = "3.7"; minorVersion = "0"; - minorVersionSuffix = "rc1"; + minorVersionSuffix = ""; pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; libPrefix = "python${majorVersion}"; @@ -48,7 +48,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "1dqb1in7xlvq7959pvvxpm50nz5jk7ifxza2x4hfvqr31jvbkky9"; + sha256 = "0j9mic5c9lbd2b20wka7hily7szz740wy9ilfrczxap63rnrk0h3"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index 83e8f1d00302..1244ad5ecd2e 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Perl 6 implementation"; - homepage = "http://www.rakudo.org"; + homepage = https://www.rakudo.org; license = licenses.artistic2; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice vrthra ]; diff --git a/pkgs/development/interpreters/rascal/default.nix b/pkgs/development/interpreters/rascal/default.nix index b079ff003347..25e125b9af63 100644 --- a/pkgs/development/interpreters/rascal/default.nix +++ b/pkgs/development/interpreters/rascal/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "rascal-0.6.2"; src = fetchurl { - url = "http://update.rascal-mpl.org/console/${name}.jar"; + url = "https://update.rascal-mpl.org/console/${name}.jar"; sha256 = "1z4mwdbdc3r24haljnxng8znlfg2ihm9bf9zq8apd9a32ipcw4i6"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.rascal-mpl.org/; + homepage = https://www.rascal-mpl.org/; description = "Command-line REPL for the Rascal metaprogramming language"; license = stdenv.lib.licenses.epl10; maintainers = [ stdenv.lib.maintainers.eelco ]; diff --git a/pkgs/development/interpreters/red/default.nix b/pkgs/development/interpreters/red/default.nix index 36047759baae..56ff02831741 100644 --- a/pkgs/development/interpreters/red/default.nix +++ b/pkgs/development/interpreters/red/default.nix @@ -87,6 +87,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ uralbash ]; platforms = [ "i686-linux" "x86_64-linux" ]; license = licenses.bsd3; - homepage = http://www.red-lang.org/; + homepage = https://www.red-lang.org/; }; } diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 220aa9abe558..4dff7e6974ef 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Ren'Py Visual Novel Engine"; - homepage = http://renpy.org/; + homepage = https://renpy.org/; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix index 4657a51e48f9..2a10caec3af8 100644 --- a/pkgs/development/interpreters/spidermonkey/52.nix +++ b/pkgs/development/interpreters/spidermonkey/52.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr }: let - version = "52.8.0"; + version = "52.8.1"; in stdenv.mkDerivation rec { name = "spidermonkey-${version}"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; - sha256 = "11v2wwgrb92z08dv9cvk5x2dj3xj25qxzbjqjgiq6mz91bzd9gms"; + sha256 = "0yyg9405y19n22x1gybyl7vp6zglbl5h749rsvgv9bm4x5zlnys8"; }; buildInputs = [ readline icu zlib nspr ]; diff --git a/pkgs/development/libraries/CoinMP/default.nix b/pkgs/development/libraries/CoinMP/default.nix index ea72bfb434b8..7fecae0a66e7 100644 --- a/pkgs/development/libraries/CoinMP/default.nix +++ b/pkgs/development/libraries/CoinMP/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.8.3"; src = fetchurl { - url = "http://www.coin-or.org/download/source/CoinMP/${name}.tgz"; + url = "https://www.coin-or.org/download/source/CoinMP/${name}.tgz"; sha256 = "1xr2iwbbhm6l9hwiry5c10pz46xfih8bvzrzwp0nkzf76vdnb9m1"; }; diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index d40b25cd8040..c7e4a9c29ac8 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { version = "1.2.15"; src = fetchurl { - url = "http://www.libsdl.org/release/${name}.tar.gz"; + url = "https://www.libsdl.org/release/${name}.tar.gz"; sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn"; }; diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index c32f59636a92..5e01a83b7c0c 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { version = "2.0.8"; src = fetchurl { - url = "http://www.libsdl.org/release/${name}.tar.gz"; + url = "https://www.libsdl.org/release/${name}.tar.gz"; sha256 = "1v4js1gkr75hzbxzhwzzif0sf9g07234sd23x1vdaqc661bprizd"; }; diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix index ea5f37513afb..17a2dd14b272 100644 --- a/pkgs/development/libraries/SDL2_image/default.nix +++ b/pkgs/development/libraries/SDL2_image/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.0.3"; src = fetchurl { - url = "http://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz"; sha256 = "0s13dmakn21q6yw8avl67d4zkxzl1wap6l5nwf6cvzrmlxfw441m"; }; diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index f31fe33ea096..3819aeb3c316 100644 --- a/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "2.0.2"; src = fetchurl { - url = "http://www.libsdl.org/projects/SDL_mixer/release/${name}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_mixer/release/${name}.tar.gz"; sha256 = "1fw3kkqi5346ai5if4pxrcbhs5c4vv3a4smgz6fl6kyaxwkmwqaf"; }; diff --git a/pkgs/development/libraries/SDL2_net/default.nix b/pkgs/development/libraries/SDL2_net/default.nix index 5cadfb9d9051..1cb74ac1b2d3 100644 --- a/pkgs/development/libraries/SDL2_net/default.nix +++ b/pkgs/development/libraries/SDL2_net/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.0.1"; src = fetchurl { - url = "http://www.libsdl.org/projects/SDL_net/release/${name}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_net/release/${name}.tar.gz"; sha256 = "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm"; }; diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix index 83a2ffc077c3..68c8c16ed4e8 100644 --- a/pkgs/development/libraries/SDL_gfx/default.nix +++ b/pkgs/development/libraries/SDL_gfx/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.0.26"; src = fetchurl { - url = "http://www.ferzkopp.net/Software/SDL_gfx-2.0/${name}.tar.gz"; + url = "https://www.ferzkopp.net/Software/SDL_gfx-2.0/${name}.tar.gz"; sha256 = "0ijljhs0v99dj6y27hc10z6qchyp8gdp4199y6jzngy6dzxlzsvw"; }; diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix index c8cab33ed57f..56701e80b1f3 100644 --- a/pkgs/development/libraries/SDL_image/default.nix +++ b/pkgs/development/libraries/SDL_image/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.2.12"; src = fetchurl { - url = "http://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz"; sha256 = "16an9slbb8ci7d89wakkmyfvp7c0cval8xw4hkg0842nhhlp540b"; }; diff --git a/pkgs/development/libraries/SDL_sound/default.nix b/pkgs/development/libraries/SDL_sound/default.nix index e471c3cc556f..2a009a3b7104 100644 --- a/pkgs/development/libraries/SDL_sound/default.nix +++ b/pkgs/development/libraries/SDL_sound/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.0.3"; src = fetchurl { - url = "http://icculus.org/SDL_sound/downloads/${name}.tar.gz"; + url = "https://icculus.org/SDL_sound/downloads/${name}.tar.gz"; sha256 = "1pz6g56gcy7pmmz3hhych3iq9jvinml2yjz15fjqjlj8pc5zv69r"; }; diff --git a/pkgs/development/libraries/SDL_ttf/default.nix b/pkgs/development/libraries/SDL_ttf/default.nix index f98e4a3b0ad3..cf6b53021f79 100644 --- a/pkgs/development/libraries/SDL_ttf/default.nix +++ b/pkgs/development/libraries/SDL_ttf/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.0.11"; src = fetchurl { - url = "http://www.libsdl.org/projects/SDL_ttf/release/${name}.tar.gz"; + url = "https://www.libsdl.org/projects/SDL_ttf/release/${name}.tar.gz"; sha256 = "1dydxd4f5kb1288i5n5568kdk2q7f8mqjr7i7sd33nplxjaxhk3j"; }; diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix index 3db15892a144..0f0e30ef0f3b 100644 --- a/pkgs/development/libraries/adns/default.nix +++ b/pkgs/development/libraries/adns/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchurl { urls = [ - "http://www.chiark.greenend.org.uk/~ian/adns/ftp/adns-${version}.tar.gz" + "https://www.chiark.greenend.org.uk/~ian/adns/ftp/adns-${version}.tar.gz" "ftp://ftp.chiark.greenend.org.uk/users/ian/adns/adns-${version}.tar.gz" "mirror://gnu/adns/adns-${version}.tar.gz" ]; diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix new file mode 100644 index 000000000000..2487711d9b15 --- /dev/null +++ b/pkgs/development/libraries/amtk/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl +, pkgconfig, gnome3, dbus, xvfb_run }: +let + version = "4.99.1"; + pname = "amtk"; +in stdenv.mkDerivation { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "00fhvw5y638z584s8cfdslh47ngfzcgx4f0b0456sw8p754j3f8d"; + }; + + nativeBuildInputs = [ + pkgconfig + dbus + ]; + + buildInputs = [ + gnome3.gtk + ]; + + doCheck = stdenv.isLinux; + checkPhase = '' + export NO_AT_BRIDGE=1 + ${xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ + --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + make check + ''; + + passthru.updateScript = gnome3.updateScript { packageName = pname; }; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Projects/Amtk; + description = "Actions, Menus and Toolbars Kit for GTK+ applications"; + maintainers = [ maintainers.manveru ]; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index 51ae14be4046..adcb86cedf84 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "aubio-0.4.6"; src = fetchurl { - url = "http://aubio.org/pub/${name}.tar.bz2"; + url = "https://aubio.org/pub/${name}.tar.bz2"; sha256 = "1yvwskahx1bf3x2fvi6cwah1ay11iarh79fjlqz8s887y3hkpixx"; }; diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index 427625d6fc67..710c5b1a92cb 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.24.2"; src = fetchurl { - url = "http://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${name}.tar.bz2"; sha256 = "08m5a372pr1l7aii9s3pic5nm68gynx1n1bc7bnlswziq6qnbv7p"; }; diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix index d30cb1d369eb..4709d0348537 100644 --- a/pkgs/development/libraries/audio/sratom/default.nix +++ b/pkgs/development/libraries/audio/sratom/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.6.0"; src = fetchurl { - url = "http://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${name}.tar.bz2"; sha256 = "0hrxd9i66s06bpn6i3s9ka95134g3sm8yscmif7qgdzhyjqw42j4"; }; diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index 63f43ac7a2c0..e29c7b5cb122 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { name = "${pname}-qt${if withQt4 then "4" else "5"}-${version}"; src = fetchurl { - url = "http://download.drobilla.net/${pname}-${version}.tar.bz2"; + url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; sha256 = "0j489gm3fhnmwmbgw30bvd4byw1vsy4yazdlnji8jzhcz0qwb5cq"; }; diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index 182471acf4ae..1ed457aa5fe1 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "http://audiofile.68k.org/${name}.tar.gz"; + url = "https://audiofile.68k.org/${name}.tar.gz"; sha256 = "0rb927zknk9kmhprd8rdr4azql4gn2dp75a36iazx2xhkbqhvind"; }; diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index f3e7fc7f1621..a82f4e7dfdae 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "babl-0.1.50"; src = fetchurl { - url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; + url = "https://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; sha256 = "0bavr2y4v88pip7vlca4kwmnksk2qxcvkkdp9jyfi6pzh701sb5m"; }; diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index a384a7707832..6f9b94fc872b 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "c-ares-1.14.0"; src = fetchurl { - url = "http://c-ares.haxx.se/download/${name}.tar.gz"; + url = "https://c-ares.haxx.se/download/${name}.tar.gz"; sha256 = "0vnwmbvymw677k780kpb6sb8i3szdp89rzy8mz1fwg1657yw3ls5"; }; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 44cdfc4e0eef..4486149cfcef 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { name = "cairo-${version}"; src = fetchurl { - url = "http://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${name}.tar.xz"; + url = "https://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${name}.tar.xz"; sha256 = "1jcl0mnqq6j2xip8p506g2cj54sfycm339rrd3p4g2jljhdhh8vn"; }; diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index 09d162db8532..47250f2b3da2 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "cairomm-${ver_maj}.${ver_min}"; src = fetchurl { - url = "http://www.cairographics.org/releases/${name}.tar.gz"; + url = "https://www.cairographics.org/releases/${name}.tar.gz"; # gnome doesn't have the latest version ATM; beware: same name but different hash # url = "mirror://gnome/sources/cairomm/${ver_maj}/${name}.tar.xz"; sha256 = "16fmigxsaz85c3lgcls7biwyz8zy8c8h3jndfm54cxxas3a7zi25"; diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix index 1e2017ef0e7f..432e49c4354f 100644 --- a/pkgs/development/libraries/ceres-solver/default.nix +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -20,19 +20,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ glog ] + buildInputs = [ eigen glog ] ++ stdenv.lib.optional (google-gflags != null) google-gflags; - inherit eigen; - doCheck = runTests; checkTarget = "test"; - cmakeFlags = " - -DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3 - "; - meta = with stdenv.lib; { description = "C++ library for modeling and solving large, complicated optimization problems"; license = licenses.bsd3; diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix index 236d634a514b..1f4b43db16c3 100644 --- a/pkgs/development/libraries/cpp-hocon/default.nix +++ b/pkgs/development/libraries/cpp-hocon/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "cpp-hocon-${version}"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { - sha256 = "0qf2nqp28ahypnzjrr37f54i06ylni40y18q9kwp5s7i5cwbjqgc"; + sha256 = "0mfpz349c3arihvngw1a1gfhwlcw6wiwyc44bghjx1q109w7wm1m"; rev = version; repo = "cpp-hocon"; owner = "puppetlabs"; diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix index 7b48ffcaccf8..0690bd425aec 100644 --- a/pkgs/development/libraries/cppunit/default.nix +++ b/pkgs/development/libraries/cppunit/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.14.0"; src = fetchurl { - url = "http://dev-www.libreoffice.org/src/${name}.tar.gz"; + url = "https://dev-www.libreoffice.org/src/${name}.tar.gz"; sha256 = "1027cyfx5gsjkdkaf6c2wnjh68882grw8n672018cj3vs9lrhmix"; }; diff --git a/pkgs/development/libraries/ctpl/default.nix b/pkgs/development/libraries/ctpl/default.nix index fd8fa1a994d6..d50aca1679b8 100644 --- a/pkgs/development/libraries/ctpl/default.nix +++ b/pkgs/development/libraries/ctpl/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.3.4"; src = fetchurl { - url = "http://download.tuxfamily.org/ctpl/releases/ctpl-${version}.tar.gz"; + url = "https://download.tuxfamily.org/ctpl/releases/ctpl-${version}.tar.gz"; sha256 = "1yr92xv9n6kgyixwg9ps4zb404ic5pgb171k4bi3mv9p6k8gv59s"; }; diff --git a/pkgs/development/libraries/cutelyst/default.nix b/pkgs/development/libraries/cutelyst/default.nix new file mode 100644 index 000000000000..2d31f734166e --- /dev/null +++ b/pkgs/development/libraries/cutelyst/default.nix @@ -0,0 +1,45 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, makeWrapper +, qtbase, libuuid, libcap, uwsgi, grantlee }: + +stdenv.mkDerivation rec { + name = "cutelyst-${version}"; + version = "2.4.1"; + + src = fetchFromGitHub { + owner = "cutelyst"; + repo = "cutelyst"; + rev = "v${version}"; + sha256 = "1kfapd5dkyw02g3j4gshxl16b90xdf5vgfhqrkdzix072f7hy5sl"; + }; + + nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; + buildInputs = [ qtbase libuuid libcap uwsgi grantlee ]; + + cmakeFlags = [ + "-DPLUGIN_UWSGI=ON" + "-DPLUGIN_STATICCOMPRESSED=ON" + "-DPLUGIN_CSRFPROTECTION=ON" + "-DPLUGIN_VIEW_GRANTLEE=ON" + ]; + + preBuild = '' + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pwd`/Cutelyst:`pwd`/EventLoopEPoll" + ''; + + postBuild = '' + unset LD_LIBRARY_PATH + ''; + + postInstall = '' + for prog in $out/bin/*; do + wrapProgram "$prog" --set QT_PLUGIN_PATH '${qtbase}/${qtbase.qtPluginPrefix}' + done + ''; + + meta = with lib; { + description = "C++ Web Framework built on top of Qt"; + homepage = https://cutelyst.org/; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index 06dde2ad4078..fb1292181756 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (rec { name = "db-${version}"; src = fetchurl { - url = "http://download.oracle.com/berkeley-db/${name}.tar.gz"; + url = "https://download.oracle.com/berkeley-db/${name}.tar.gz"; sha256 = sha256; }; diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 4f6bd829099f..ade6c98df942 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -14,7 +14,7 @@ self = stdenv.mkDerivation { inherit version; src = fetchurl { - url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; + url = "https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/development/libraries/eigen/2.0.nix b/pkgs/development/libraries/eigen/2.0.nix index 8841855a24ed..015aeaed55ba 100644 --- a/pkgs/development/libraries/eigen/2.0.nix +++ b/pkgs/development/libraries/eigen/2.0.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = "eigen-${v}"; src = fetchurl { - url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2"; + url = "https://bitbucket.org/eigen/eigen/get/${v}.tar.bz2"; name = "eigen-${v}.tar.bz2"; sha256 = "0q4ry2pmdb9lvm0g92wi6s6qng3m9q73n5flwbkfcz1nxmbfhmbj"; }; diff --git a/pkgs/development/libraries/eigen/3.3.nix b/pkgs/development/libraries/eigen/3.3.nix index 7de05926da59..e6d13a5915a1 100644 --- a/pkgs/development/libraries/eigen/3.3.nix +++ b/pkgs/development/libraries/eigen/3.3.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = "eigen-${version}"; src = fetchurl { - url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.gz"; + url = "https://bitbucket.org/eigen/eigen/get/${version}.tar.gz"; name = "eigen-${version}.tar.gz"; sha256 = "1q85bgd6hnsgn0kq73wa4jwh4qdwklfg73pgqrz4zmxvzbqyi1j2"; }; diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index 4e1559e5c738..c120132dcb8b 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = "eigen-${version}"; src = fetchurl { - url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.gz"; + url = "https://bitbucket.org/eigen/eigen/get/${version}.tar.gz"; name = "eigen-${version}.tar.gz"; sha256 = "00l52y7m276gh8wjkqqcxz6x687azrm7a70s3iraxnpy9bxa9y04"; }; diff --git a/pkgs/development/libraries/embree/2.x.nix b/pkgs/development/libraries/embree/2.x.nix new file mode 100644 index 000000000000..c973c2bd9449 --- /dev/null +++ b/pkgs/development/libraries/embree/2.x.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, ispc, tbb, glfw, +openimageio, libjpeg, libpng, libpthreadstubs, libX11 +}: + +stdenv.mkDerivation rec { + name = "embree-${version}"; + version = "2.17.4"; + + src = fetchFromGitHub { + owner = "embree"; + repo = "embree"; + rev = "v2.17.4"; + sha256 = "0q3r724r58j4b6cbyy657fsb78z7a2c7d5mwdp7552skynsn2mn9"; + }; + + cmakeFlags = [ "-DEMBREE_TUTORIALS=OFF" ]; + enableParallelBuilding = true; + + buildInputs = [ pkgconfig cmake ispc tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ]; + meta = with stdenv.lib; { + description = "High performance ray tracing kernels from Intel"; + homepage = https://embree.github.io/; + maintainers = with maintainers; [ hodapp ]; + license = licenses.asl20; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix index 1f58fd698da3..ac2c21d4cf0e 100644 --- a/pkgs/development/libraries/exempi/default.nix +++ b/pkgs/development/libraries/exempi/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "exempi-2.4.5"; src = fetchurl { - url = "http://libopenraw.freedesktop.org/download/${name}.tar.bz2"; + url = "https://libopenraw.freedesktop.org/download/${name}.tar.bz2"; sha256 = "07i29xmg8bqriviaf4vi1mwha4lrw85kfla29cfym14fp3z8aqa0"; }; diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 5dd96c225846..97ad0c08ad96 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2018.06.11.00"; + version = "2018.06.18.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "005p2i36vxy2nppxqhdd4a5x58yx7zljb2diyqb820jygz2hfz8a"; + sha256 = "0698wazz99wzfbz29jgkl4rlakypg3v2cnsjg9a0yq83a4y038p7"; }; nativeBuildInputs = [ autoreconfHook python pkgconfig ]; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index e15f2583f4da..813ea0504653 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { name = "gdal-${version}"; src = fetchurl { - url = "http://download.osgeo.org/gdal/${version}/${name}.tar.xz"; + url = "https://download.osgeo.org/gdal/${version}/${name}.tar.xz"; sha256 = "18iaamzkn0lipizynvspf3bs5qzgcy36hn6bbi941q8dlfdf8xbg"; }; diff --git a/pkgs/development/libraries/gdal/gdal-1_11.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix index 7a80ce7fdb66..7d0b70ec627e 100644 --- a/pkgs/development/libraries/gdal/gdal-1_11.nix +++ b/pkgs/development/libraries/gdal/gdal-1_11.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "gdal-${version}"; src = fetchurl { - url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz"; + url = "https://download.osgeo.org/gdal/${version}/${name}.tar.gz"; sha256 = "561588bdfd9ca91919d4679a77a2b44214b158934ee8b425295ca5be33a1014d"; }; diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index dcdb6a2297b2..a4eab462046c 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, vtk }: stdenv.mkDerivation rec { - version = "2.8.6"; + version = "2.8.7"; name = "gdcm-${version}"; src = fetchurl { url = "mirror://sourceforge/gdcm/${name}.tar.bz2"; - sha256 = "07q7w2qvpknvncp3g6m5f6b3m1ld4pzns52bqah8da7pabgwspjy"; + sha256 = "1psl4r0i3hfhjjm9y8q5ml9lnlal4212bm8df21087dddi9nfl62"; }; dontUseCmakeBuildDir = true; diff --git a/pkgs/development/libraries/gegl/3.0.nix b/pkgs/development/libraries/gegl/3.0.nix index 161153b7e3dc..287c33243865 100644 --- a/pkgs/development/libraries/gegl/3.0.nix +++ b/pkgs/development/libraries/gegl/3.0.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "gegl-0.3.34"; src = fetchurl { - url = "http://download.gimp.org/pub/gegl/0.3/${name}.tar.bz2"; + url = "https://download.gimp.org/pub/gegl/0.3/${name}.tar.bz2"; sha256 = "010k86wn8cmr07rqwa4lccrmiiqrwbnkxvic4lpapwgbamv258jw"; }; diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index e9230b218be9..623ee5b3375c 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -8,7 +8,7 @@ in stdenv.mkDerivation rec { name = "gegl-${version}"; src = fetchurl { - url = "http://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; + url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; sha256 = "13bzl0k5l12pk8bkcq4ar7wscbnw7jswhp34mwfsrf10kp0qndba"; }; diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix index 4d348c92171b..eb7a6d6aaf21 100644 --- a/pkgs/development/libraries/geoclue/2.0.nix +++ b/pkgs/development/libraries/geoclue/2.0.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "geoclue-2.4.8"; src = fetchurl { - url = "http://www.freedesktop.org/software/geoclue/releases/2.4/${name}.tar.xz"; + url = "https://www.freedesktop.org/software/geoclue/releases/2.4/${name}.tar.xz"; sha256 = "08yg1r7m0n9hwyvcy769qkmkf8lslqwv69cjfffwnc3zm5km25qj"; }; diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index 24e3b4842faf..b92f6e61f56a 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "geos-3.6.2"; src = fetchurl { - url = "http://download.osgeo.org/geos/${name}.tar.bz2"; + url = "https://download.osgeo.org/geos/${name}.tar.bz2"; sha256 = "0ak5szby29l9l0vy43dm5z2g92xzdky20q1gc1kah1fnhkgi6nh4"; }; diff --git a/pkgs/development/libraries/gf2x/default.nix b/pkgs/development/libraries/gf2x/default.nix index 7ab06afdad61..1a449f57be7f 100644 --- a/pkgs/development/libraries/gf2x/default.nix +++ b/pkgs/development/libraries/gf2x/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) src = fetchurl { - url = "http://gforge.inria.fr/frs/download.php/file/30873/gf2x-1.1.tar.gz"; + url = "https://gforge.inria.fr/frs/download.php/file/30873/gf2x-1.1.tar.gz"; sha256 = "17w4b39j9dvri5s278pxi8ha7mf47j87kq1lr802l4408rh02gqd"; }; diff --git a/pkgs/development/libraries/gle/default.nix b/pkgs/development/libraries/gle/default.nix index 1980c633474f..dd72637f2eb0 100644 --- a/pkgs/development/libraries/gle/default.nix +++ b/pkgs/development/libraries/gle/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { urls = [ "mirror://sourceforge/project/gle/gle/gle-3.1.0/gle-3.1.0.tar.gz" - "http://www.linas.org/gle/pub/gle-3.1.0.tar.gz" + "https://www.linas.org/gle/pub/gle-3.1.0.tar.gz" ]; sha256 = "09zs1di4dsssl9k322nzildvf41jwipbzhik9p43yb1bcfsp92nw"; }; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index ac921227740c..ff870f525f23 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -54,7 +54,10 @@ stdenv.mkDerivation rec { patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch - ++ [ ./schema-override-variable.patch ]; + ++ optionals stdenv.hostPlatform.isMusl [ + ./quark_init_on_demand.patch + ./gobject_init_on_demand.patch + ] ++ [ ./schema-override-variable.patch ]; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; diff --git a/pkgs/development/libraries/glib/gobject_init_on_demand.patch b/pkgs/development/libraries/glib/gobject_init_on_demand.patch new file mode 100644 index 000000000000..d72d0b61dca2 --- /dev/null +++ b/pkgs/development/libraries/glib/gobject_init_on_demand.patch @@ -0,0 +1,87 @@ +--- glib-source/gobject/gtype.c 2016-08-17 17:20:47.000000000 +0200 ++++ glib-source/gobject/gtype.c 2016-09-01 21:56:31.777406646 +0200 +@@ -209,6 +209,9 @@ + static gboolean type_node_is_a_L (TypeNode *node, + TypeNode *iface_node); + ++#if !defined(__GLIBC__) ++static void gobject_init (void); ++#endif + + /* --- enumeration --- */ + +@@ -2631,7 +2634,10 @@ + GTypeFlags flags) + { + TypeNode *node; +- ++ ++#if !defined(__GLIBC__) ++ gobject_init(); ++#endif + g_assert_type_system_initialized (); + g_return_val_if_fail (type_id > 0, 0); + g_return_val_if_fail (type_name != NULL, 0); +@@ -2749,6 +2755,9 @@ + TypeNode *pnode, *node; + GType type = 0; + ++#if !defined(__GLIBC__) ++ gobject_init(); ++#endif + g_assert_type_system_initialized (); + g_return_val_if_fail (parent_type > 0, 0); + g_return_val_if_fail (type_name != NULL, 0); +@@ -2804,6 +2813,9 @@ + TypeNode *pnode, *node; + GType type; + ++#if !defined(__GLIBC__) ++ gobject_init(); ++#endif + g_assert_type_system_initialized (); + g_return_val_if_fail (parent_type > 0, 0); + g_return_val_if_fail (type_name != NULL, 0); +@@ -3319,6 +3331,9 @@ + { + TypeNode *node; + ++#if !defined(__GLIBC__) ++ gobject_init(); ++#endif + g_assert_type_system_initialized (); + + node = lookup_type_node_I (type); +@@ -4343,6 +4358,9 @@ + void + g_type_init_with_debug_flags (GTypeDebugFlags debug_flags) + { ++#if !defined(__GLIBC__) ++ gobject_init(); ++#endif + g_assert_type_system_initialized (); + + if (debug_flags) +@@ -4361,6 +4379,9 @@ + void + g_type_init (void) + { ++#if !defined(__GLIBC__) ++ gobject_init(); ++#endif + g_assert_type_system_initialized (); + } + +@@ -4372,6 +4393,12 @@ + TypeNode *node; + GType type; + ++#if !defined(__GLIBC__) ++ static int gobject_initialized = 0; ++ if (gobject_initialized) ++ return; ++ gobject_initialized = 1; ++#endif + /* Ensure GLib is initialized first, see + * https://bugzilla.gnome.org/show_bug.cgi?id=756139 + */ diff --git a/pkgs/development/libraries/glib/quark_init_on_demand.patch b/pkgs/development/libraries/glib/quark_init_on_demand.patch new file mode 100644 index 000000000000..168086484314 --- /dev/null +++ b/pkgs/development/libraries/glib/quark_init_on_demand.patch @@ -0,0 +1,33 @@ +--- glib-source/glib/gquark.c 2016-08-17 17:20:47.000000000 +0200 ++++ glib-source/glib/gquark.c 2016-08-30 07:49:13.298234757 +0200 +@@ -57,6 +57,9 @@ + void + g_quark_init (void) + { ++ if (quark_ht) ++ return; ++ + g_assert (quark_seq_id == 0); + quark_ht = g_hash_table_new (g_str_hash, g_str_equal); + quarks = g_new (gchar*, QUARK_BLOCK_SIZE); +@@ -138,9 +141,12 @@ + return 0; + + G_LOCK (quark_global); ++#if !defined(__GLIBC__) ++ g_quark_init (); ++#endif + quark = GPOINTER_TO_UINT (g_hash_table_lookup (quark_ht, string)); + G_UNLOCK (quark_global); + + return quark; + } + +@@ -280,6 +286,7 @@ + GQuark quark; + gchar **quarks_new; + ++ g_quark_init (); + if (quark_seq_id % QUARK_BLOCK_SIZE == 0) + { + quarks_new = g_new (gchar*, quark_seq_id + QUARK_BLOCK_SIZE); diff --git a/pkgs/development/libraries/glibc/2.26-115to131.diff.gz b/pkgs/development/libraries/glibc/2.26-115to131.diff.gz deleted file mode 100644 index 3d866c567a79..000000000000 Binary files a/pkgs/development/libraries/glibc/2.26-115to131.diff.gz and /dev/null differ diff --git a/pkgs/development/libraries/glibc/2.26-75.patch.gz b/pkgs/development/libraries/glibc/2.26-75.patch.gz deleted file mode 100644 index e2a8867e4fff..000000000000 Binary files a/pkgs/development/libraries/glibc/2.26-75.patch.gz and /dev/null differ diff --git a/pkgs/development/libraries/glibc/2.26-75to115.diff.gz b/pkgs/development/libraries/glibc/2.26-75to115.diff.gz deleted file mode 100644 index 9bf1a4f7d39b..000000000000 Binary files a/pkgs/development/libraries/glibc/2.26-75to115.diff.gz and /dev/null differ diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix index b6de369a1ec3..eeeff731a6e3 100644 --- a/pkgs/development/libraries/gloox/default.nix +++ b/pkgs/development/libraries/gloox/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { name = "gloox-${version}"; src = fetchurl { - url = "http://camaya.net/download/gloox-${version}.tar.bz2"; + url = "https://camaya.net/download/gloox-${version}.tar.bz2"; sha256 = "1k57qgif1yii515m6jaqaibkdysfab6394bpawd2l67321f1a4rw"; }; diff --git a/pkgs/desktops/gnome-3/misc/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix similarity index 87% rename from pkgs/desktops/gnome-3/misc/gspell/default.nix rename to pkgs/development/libraries/gspell/default.nix index ca1fc3724fca..051228aeb152 100644 --- a/pkgs/desktops/gnome-3/misc/gspell/default.nix +++ b/pkgs/development/libraries/gspell/default.nix @@ -2,7 +2,7 @@ let pname = "gspell"; - version = "1.8.0"; + version = "1.8.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0ickabxngl567lv1jax4fasr5brq29hg04ymaay47pjfp32w4zqv"; + sha256 = "1rdv873ixhwr15jwgc2z6k6y0hj353fqnwsy7zkh0c30qwiiv6l1"; }; propagatedBuildInputs = [ enchant2 ]; # required for pkgconfig @@ -22,7 +22,6 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; }; }; diff --git a/pkgs/development/libraries/gtdialog/default.nix b/pkgs/development/libraries/gtdialog/default.nix index 36da2fb72aa4..d0a2d3691b49 100644 --- a/pkgs/development/libraries/gtdialog/default.nix +++ b/pkgs/development/libraries/gtdialog/default.nix @@ -6,7 +6,7 @@ let version="1.4"; name="${baseName}-${version}"; hash="1lhsaz56s8m838fi6vnfcd2r6djymvy3n2pbqhii88hraapq3rfk"; - url="http://foicica.com/gtdialog/download/gtdialog_1.4.zip"; + url="https://foicica.com/gtdialog/download/gtdialog_1.4.zip"; sha256="1lhsaz56s8m838fi6vnfcd2r6djymvy3n2pbqhii88hraapq3rfk"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 81a2c8691796..7c67ab48ad4c 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { name = "harfbuzz${optionalString withIcu "-icu"}-${version}"; src = fetchurl { - url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2"; + url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2"; sha256 = "18wnbq919k5h8pfm1pfy38gs1qzj1hnfr1wq989bix1n2jiii1d1"; }; diff --git a/pkgs/development/libraries/ip2location-c/default.nix b/pkgs/development/libraries/ip2location-c/default.nix index 82a4ec337555..a48908f41dd4 100644 --- a/pkgs/development/libraries/ip2location-c/default.nix +++ b/pkgs/development/libraries/ip2location-c/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { sha256 = "1gs43qgcyfn83abrkhvvw1s67d1sbkbj3hab9m17ysn6swafiycx"; - url = "http://www.ip2location.com/downloads/ip2location-c-${version}.tar.gz"; + url = "https://www.ip2location.com/downloads/ip2location-c-${version}.tar.gz"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/isl/0.11.1.nix b/pkgs/development/libraries/isl/0.11.1.nix index cdb018d297b6..20a60f1a102d 100644 --- a/pkgs/development/libraries/isl/0.11.1.nix +++ b/pkgs/development/libraries/isl/0.11.1.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "isl-0.11.1"; # CLooG 0.16.3 fails to build with ISL 0.08. src = fetchurl { - url = "http://src.fedoraproject.org/repo/pkgs/gcc/isl-0.11.1.tar.bz2/bce1586384d8635a76d2f017fb067cd2/isl-0.11.1.tar.bz2"; + url = "https://src.fedoraproject.org/repo/pkgs/gcc/isl-0.11.1.tar.bz2/bce1586384d8635a76d2f017fb067cd2/isl-0.11.1.tar.bz2"; sha256 = "13d9cqa5rzhbjq0xf0b2dyxag7pqa72xj9dhsa03m8ccr1a4npq9"; }; diff --git a/pkgs/development/libraries/java/dbus-java/default.nix b/pkgs/development/libraries/java/dbus-java/default.nix index 23adfd80caac..daee9adb1fdc 100644 --- a/pkgs/development/libraries/java/dbus-java/default.nix +++ b/pkgs/development/libraries/java/dbus-java/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "dbus-java-2.7"; src = fetchurl { - url = http://dbus.freedesktop.org/releases/dbus-java/dbus-java-2.7.tar.gz; + url = https://dbus.freedesktop.org/releases/dbus-java/dbus-java-2.7.tar.gz; sha256 = "0cyaxd8x6sxmi6pklkkx45j311a6w51fxl4jc5j3inc4cailwh5y"; }; JAVA_HOME=jdk; diff --git a/pkgs/development/libraries/java/geoipjava/default.nix b/pkgs/development/libraries/java/geoipjava/default.nix index 13b4df395e50..6af8885464a3 100644 --- a/pkgs/development/libraries/java/geoipjava/default.nix +++ b/pkgs/development/libraries/java/geoipjava/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "GeoIPJava-1.2.5"; src = fetchurl { - url = http://geolite.maxmind.com/download/geoip/api/java/GeoIPJava-1.2.5.zip; + url = https://geolite.maxmind.com/download/geoip/api/java/GeoIPJava-1.2.5.zip; sha256 = "1gb2d0qvvq7xankz7l7ymbr3qprwk9bifpy4hlgw0sq4i6a55ypd"; }; buildInputs = [ jdk unzip ]; diff --git a/pkgs/development/libraries/java/libmatthew-java/default.nix b/pkgs/development/libraries/java/libmatthew-java/default.nix index 877535331698..ad5192f94ce2 100644 --- a/pkgs/development/libraries/java/libmatthew-java/default.nix +++ b/pkgs/development/libraries/java/libmatthew-java/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libmatthew-java-0.8"; src = fetchurl { - url = http://src.fedoraproject.org/repo/pkgs/libmatthew-java/libmatthew-java-0.8.tar.gz/8455b8751083ce25c99c2840609271f5/libmatthew-java-0.8.tar.gz; + url = https://src.fedoraproject.org/repo/pkgs/libmatthew-java/libmatthew-java-0.8.tar.gz/8455b8751083ce25c99c2840609271f5/libmatthew-java-0.8.tar.gz; sha256 = "1yldkhsdzm0a41a0i881bin2jklhp85y3ah245jd6fz3npcx7l85"; }; JAVA_HOME=jdk; diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix index 6435e9fc32da..321ebb46e463 100644 --- a/pkgs/development/libraries/jbigkit/default.nix +++ b/pkgs/development/libraries/jbigkit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "jbigkit-2.1"; src = fetchurl { - url = "http://www.cl.cam.ac.uk/~mgk25/jbigkit/download/${name}.tar.gz"; + url = "https://www.cl.cam.ac.uk/~mgk25/jbigkit/download/${name}.tar.gz"; sha256 = "0cnrcdr1dwp7h7m0a56qw09bv08krb37mpf7cml5sjdgpyv0cwfy"; }; diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 7b6834166d8c..a269069fb048 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "leatherman-${version}"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { - sha256 = "0n516gqv501ymj99bickbr2cbhr109azh9hc1hn7flbcjzz3aljc"; + sha256 = "0lhdncwg2xbd3gy65rx8w2qcxvcwfirzkl762zdwqxf6bj6p2hvb"; rev = version; repo = "leatherman"; owner = "puppetlabs"; diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index 1e7720b0656a..de796307de1a 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { - url = "http://download.osgeo.org/liblas/${name}.tar.bz2"; + url = "https://download.osgeo.org/liblas/${name}.tar.bz2"; sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws"; }; diff --git a/pkgs/development/libraries/libabw/default.nix b/pkgs/development/libraries/libabw/default.nix index 187e06239c10..fe2229bcea6a 100644 --- a/pkgs/development/libraries/libabw/default.nix +++ b/pkgs/development/libraries/libabw/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.1.2"; src = fetchurl { - url = "http://dev-www.libreoffice.org/src/libabw/${name}.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libabw/${name}.tar.xz"; sha256 = "11949iscdb99f2jplxjd39282jxcrf2fw0sqbh5dl7gqb96r8whb"; }; diff --git a/pkgs/development/libraries/libantlr3c/default.nix b/pkgs/development/libraries/libantlr3c/default.nix index 5f0b1ccd18ec..ef5838188593 100644 --- a/pkgs/development/libraries/libantlr3c/default.nix +++ b/pkgs/development/libraries/libantlr3c/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libantlr3c-3.4"; src = fetchurl { - url = http://www.antlr3.org/download/C/libantlr3c-3.4.tar.gz; + url = https://www.antlr3.org/download/C/libantlr3c-3.4.tar.gz; sha256 ="0lpbnb4dq4azmsvlhp6khq1gy42kyqyjv8gww74g5lm2y6blm4fa"; }; diff --git a/pkgs/development/libraries/libaudclient/default.nix b/pkgs/development/libraries/libaudclient/default.nix index aab8fcd4beb8..eebe667badb9 100644 --- a/pkgs/development/libraries/libaudclient/default.nix +++ b/pkgs/development/libraries/libaudclient/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.5-rc2"; src = fetchurl { - url = "http://distfiles.audacious-media-player.org/${name}.tar.bz2"; + url = "https://distfiles.audacious-media-player.org/${name}.tar.bz2"; sha256 = "0nhpgz0kg8r00z54q5i96pjk7s57krq3fvdypq496c7fmlv9kdap"; }; diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index 5ccfb0d1b26f..04bd3f3d71ed 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, git, doxygen, help2man, tecla +{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, git, doxygen, help2man, ncurses, tecla , libusb1, udev }: stdenv.mkDerivation rec { @@ -13,7 +13,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake git doxygen help2man tecla libusb1 udev ]; + # ncurses used due to https://github.com/Nuand/bladeRF/blob/ab4fc672c8bab4f8be34e8917d3f241b1d52d0b8/host/utilities/bladeRF-cli/CMakeLists.txt#L208 + buildInputs = [ cmake git doxygen help2man tecla libusb1 ] + ++ lib.optionals stdenv.isLinux [ udev ] + ++ lib.optionals stdenv.isDarwin [ ncurses ]; # Fixup shebang prePatch = "patchShebangs host/utilities/bladeRF-cli/src/cmd/doc/generate.bash"; @@ -24,17 +27,19 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Debug" + "-DBUILD_DOCUMENTATION=ON" + ] ++ lib.optionals stdenv.isLinux [ "-DUDEV_RULES_PATH=etc/udev/rules.d" "-DINSTALL_UDEV_RULES=ON" - "-DBUILD_DOCUMENTATION=ON" ]; - meta = with stdenv.lib; { - homepage = https://www.nuand.com/; + hardeningDisable = [ "fortify" ]; + + meta = with lib; { + homepage = https://nuand.com/libbladeRF-doc; description = "Supporting library of the BladeRF SDR opensource hardware"; license = licenses.lgpl21; maintainers = with maintainers; [ funfunctor ]; - platforms = with platforms; linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index ff9412ceb580..36410e842a5d 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.8.7"; src = fetchurl { - url = "http://libbsd.freedesktop.org/releases/${name}.tar.xz"; + url = "https://libbsd.freedesktop.org/releases/${name}.tar.xz"; sha256 = "0c9bl49zs0xdddcwj5dh0lay9sxi2m1yi74848g8p87mb87g2j7m"; }; diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index 6d8cafcfaa60..8b5130b0eac8 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libcdr-0.1.4"; src = fetchurl { - url = "http://dev-www.libreoffice.org/src/${name}.tar.xz"; + url = "https://dev-www.libreoffice.org/src/${name}.tar.xz"; sha256 = "0vd6likgk51j46llybkx4wq3674xzrhp0k82220pkx9x1aqfi9z7"; }; diff --git a/pkgs/development/libraries/libclthreads/default.nix b/pkgs/development/libraries/libclthreads/default.nix index ea27046279c7..6d37eb19c712 100644 --- a/pkgs/development/libraries/libclthreads/default.nix +++ b/pkgs/development/libraries/libclthreads/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.4.0"; src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/clthreads-${version}.tar.bz2"; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/clthreads-${version}.tar.bz2"; sha256 = "1s8xx99z6llv46cvkllmd72v2pkzbfl5gngcql85mf14mxkdb7x6"; }; diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix index 3386b081a104..ce67a8efa80e 100644 --- a/pkgs/development/libraries/libclxclient/default.nix +++ b/pkgs/development/libraries/libclxclient/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.9.0"; src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/clxclient-${version}.tar.bz2"; + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/clxclient-${version}.tar.bz2"; sha256 = "14l7xrh964gllymraq4n5pgax94p5jsfjslqi5c6637zc4lmgnl0"; }; diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 8474b387d851..6531a4cd9ed4 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libcouchbase-${version}"; - version = "2.9.0"; + version = "2.9.2"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "12s2iw4akil3hlvsccns7qw2c90yw5h67zj3wq03q938w8xcw0d0"; + sha256 = "1ca3jp1nr5dk2w35wwyhsf96pblbw6n6n7a3ja264ivc9nhpkz4z"; }; cmakeFlags = "-DLCB_NO_MOCK=ON"; diff --git a/pkgs/development/libraries/libcutl/default.nix b/pkgs/development/libraries/libcutl/default.nix index 7b4d39f955aa..81122a6eb520 100644 --- a/pkgs/development/libraries/libcutl/default.nix +++ b/pkgs/development/libraries/libcutl/default.nix @@ -15,7 +15,7 @@ mkDerivation rec { }; src = fetchurl { - url = "http://codesynthesis.com/download/libcutl/1.9/${name}.tar.bz2"; + url = "https://codesynthesis.com/download/libcutl/1.9/${name}.tar.bz2"; sha1 = "0e8d255145afbc339a3284ef85a43f4baf3fec43"; }; diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix index fc0221b93889..5a0006ad6c6e 100644 --- a/pkgs/development/libraries/libdap/default.nix +++ b/pkgs/development/libraries/libdap/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid curl libxml2 ]; src = fetchurl { - url = "http://www.opendap.org/pub/source/${name}.tar.gz"; + url = "https://www.opendap.org/pub/source/${name}.tar.gz"; sha256 = "0gnki93z3kkzp65x7n1kancy7bd503j4qja5fhzvm1gkmi5l65aj"; }; diff --git a/pkgs/development/libraries/libdivecomputer/default.nix b/pkgs/development/libraries/libdivecomputer/default.nix index a09e48dcc1d9..c94806b50c10 100644 --- a/pkgs/development/libraries/libdivecomputer/default.nix +++ b/pkgs/development/libraries/libdivecomputer/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.6.0"; src = fetchurl { - url = "http://www.libdivecomputer.org/releases/${name}.tar.gz"; + url = "https://www.libdivecomputer.org/releases/${name}.tar.gz"; sha256 = "0nm1mcscpxb9dv4p0lidd6rf5xg4vmcbigj6zqxvgn7pwnvpbzm0"; }; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 4d1b4e4c3fdc..93ef1957d2cd 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libdrm-2.4.92"; src = fetchurl { - url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; + url = "https://dri.freedesktop.org/libdrm/${name}.tar.bz2"; sha256 = "1yirzx8hmlvv6r0l7lb3zxmgy5la2mri9al0k16xqfg19pdqzr79"; }; diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index 6057dae4be2e..e81ea18103dc 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -3,7 +3,7 @@ let version = "20180129"; src = fetchurl { - url = "http://www.prevanders.net/libdwarf-${version}.tar.gz"; + url = "https://www.prevanders.net/libdwarf-${version}.tar.gz"; # Upstream displays this hash broken into three parts: sha512 = "02f8024bb9959c91a1fe322459f7587a589d096595" + "6d643921a173e6f9e0a184db7aef66f0fd2548d669" diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix index 5f422f7018b8..5127231dab60 100644 --- a/pkgs/development/libraries/libeatmydata/default.nix +++ b/pkgs/development/libraries/libeatmydata/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libeatmydata-105"; src = fetchurl { - url = "http://www.flamingspork.com/projects/libeatmydata/${name}.tar.gz"; + url = "https://www.flamingspork.com/projects/libeatmydata/${name}.tar.gz"; sha256 = "1pd8sc73cgc41ldsvq6g8ics1m5k8gdcb91as9yg8z5jnrld1lmx"; }; diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix index 4b233301cce7..b5b2b8e37349 100644 --- a/pkgs/development/libraries/libebml/default.nix +++ b/pkgs/development/libraries/libebml/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libebml-1.3.5"; src = fetchurl { - url = "http://dl.matroska.org/downloads/libebml/${name}.tar.xz"; + url = "https://dl.matroska.org/downloads/libebml/${name}.tar.xz"; sha256 = "005a0ipqnfbsq47zrc61zszi439jw32q5xd6dc1jyb3lc0zl266q"; }; diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index da4bbcad4fb6..bc4cea1b4702 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libedit-20180525-3.1"; src = fetchurl { - url = "http://thrysoee.dk/editline/${name}.tar.gz"; + url = "https://thrysoee.dk/editline/${name}.tar.gz"; sha256 = "05iicng4kag5hxdc7adbyj1gm3qbmvcc33m9cyx5gys0s67yl6y4"; }; diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/pkgs/development/libraries/libexttextcat/default.nix index 0ba703585bbb..8d264c929a5b 100644 --- a/pkgs/development/libraries/libexttextcat/default.nix +++ b/pkgs/development/libraries/libexttextcat/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libexttextcat-3.4.5"; src = fetchurl { - url = "http://dev-www.libreoffice.org/src/libexttextcat/${name}.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libexttextcat/${name}.tar.xz"; sha256 = "1j6sjwkyhqvsgyw938bxxfwkzzi1mahk66g5342lv6j89jfvrz8k"; }; diff --git a/pkgs/development/libraries/libfakekey/default.nix b/pkgs/development/libraries/libfakekey/default.nix index 6aca1d2be6d6..fa04655341d4 100644 --- a/pkgs/development/libraries/libfakekey/default.nix +++ b/pkgs/development/libraries/libfakekey/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.1"; src = fetchurl { - url = "http://downloads.yoctoproject.org/releases/matchbox/libfakekey/0.1/${name}.tar.gz"; + url = "https://downloads.yoctoproject.org/releases/matchbox/libfakekey/0.1/${name}.tar.gz"; sha256 = "10msplyn535hmzbmbdnx4zc20hkaw6d81if5lzxs82k8sq2mkx9k"; }; diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix index c6deb1fc9291..b59bf9a06ac5 100644 --- a/pkgs/development/libraries/libftdi/1.x.nix +++ b/pkgs/development/libraries/libftdi/1.x.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { name = "libftdi1-1.4"; src = fetchurl { - url = "http://www.intra2net.com/en/developer/libftdi/download/${name}.tar.bz2"; + url = "https://www.intra2net.com/en/developer/libftdi/download/${name}.tar.bz2"; sha256 = "0x0vncf6i92slgrn0h7ghkskqbglbs534220qa84d0qg114zndpc"; }; diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix index f90e741a57e9..74b87a46ef0a 100644 --- a/pkgs/development/libraries/libftdi/default.nix +++ b/pkgs/development/libraries/libftdi/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libftdi-0.20"; src = fetchurl { - url = "http://www.intra2net.com/en/developer/libftdi/download/${name}.tar.gz"; + url = "https://www.intra2net.com/en/developer/libftdi/download/${name}.tar.gz"; sha256 = "13l39f6k6gff30hsgh0wa2z422g9pyl91rh8a8zz6f34k2sxaxii"; }; diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index 79f49c629b86..05c320c42aec 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "libgdiplus-2.10.9"; src = fetchurl { - url = "http://download.mono-project.com/sources/libgdiplus/${name}.tar.bz2"; + url = "https://download.mono-project.com/sources/libgdiplus/${name}.tar.bz2"; sha256 = "0klnbly2q0yx5p0l5z8da9lhqsjj9xqj06kdw2v7rnms4z1vdpkd"; }; diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix index 3d49fa064509..48a1490caecf 100644 --- a/pkgs/development/libraries/libgeotiff/default.nix +++ b/pkgs/development/libraries/libgeotiff/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "libgeotiff-${version}"; src = fetchurl { - url = "http://download.osgeo.org/geotiff/libgeotiff/${name}.tar.gz"; + url = "https://download.osgeo.org/geotiff/libgeotiff/${name}.tar.gz"; sha256 = "0vjy3bwfhljjx66p9w999i4mdhsf7vjshx29yc3pn5livf5091xd"; }; diff --git a/pkgs/development/libraries/libgig/default.nix b/pkgs/development/libraries/libgig/default.nix index 90d41e30502f..08fce9c521ec 100644 --- a/pkgs/development/libraries/libgig/default.nix +++ b/pkgs/development/libraries/libgig/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "4.1.0"; src = fetchurl { - url = "http://download.linuxsampler.org/packages/${name}.tar.bz2"; + url = "https://download.linuxsampler.org/packages/${name}.tar.bz2"; sha256 = "02xx6bqxzgkvrawwnzrnxx1ypk244q4kpwfd58266f9ji8kq18h6"; }; diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 169a4d38bb53..0e900ca9db64 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -1,6 +1,7 @@ { fetchurl, stdenv, lib , buildPlatform, hostPlatform , enableStatic ? stdenv.hostPlatform.useAndroidPrebuilt +, enableShared ? !stdenv.hostPlatform.useAndroidPrebuilt }: # assert !stdenv.isLinux || hostPlatform != buildPlatform; # TODO: improve on cross @@ -23,10 +24,14 @@ stdenv.mkDerivation rec { lib.optionalString ((hostPlatform != buildPlatform && hostPlatform.libc == "msvcrt") || stdenv.cc.nativeLibc) '' sed '/^_GL_WARN_ON_USE (gets/d' -i srclib/stdio.in.h - ''; + '' + + lib.optionalString (!enableShared) '' + sed -i -e '/preload/d' Makefile.in + ''; configureFlags = lib.optional stdenv.isFreeBSD "--with-pic" - ++ lib.optional enableStatic "--enable-static"; + ++ lib.optional enableStatic "--enable-static" + ++ lib.optional (!enableShared) "--disable-shared"; meta = { description = "An iconv(3) implementation"; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 3b4e3233d554..bf08db6d3b7b 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { version = "1.11.0"; src = fetchurl { - url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; + url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz"; sha256 = "04mwl1v51b785h7q3v23hahr0qzr48qq1jzj7d3msjvgh97nr8v4"; }; diff --git a/pkgs/development/libraries/libmatchbox/default.nix b/pkgs/development/libraries/libmatchbox/default.nix index fcecd3a9d132..798aef8e7da7 100644 --- a/pkgs/development/libraries/libmatchbox/default.nix +++ b/pkgs/development/libraries/libmatchbox/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libX11 libXext libpng ]; src = fetchurl { - url = "http://downloads.yoctoproject.org/releases/matchbox/libmatchbox/${version}/libmatchbox-${version}.tar.bz2"; + url = "https://downloads.yoctoproject.org/releases/matchbox/libmatchbox/${version}/libmatchbox-${version}.tar.bz2"; sha256 = "0lvv44s3bf96zvkysa4ansxj2ffgj3b5kgpliln538q4wd9ank15"; }; diff --git a/pkgs/development/libraries/libmatheval/default.nix b/pkgs/development/libraries/libmatheval/default.nix index 1b17ff0dd433..8e429875b36b 100644 --- a/pkgs/development/libraries/libmatheval/default.nix +++ b/pkgs/development/libraries/libmatheval/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { buildInputs = [ guile ]; src = fetchurl { - url = "http://ftp.gnu.org/gnu/libmatheval/${name}.tar.gz"; + url = "https://ftp.gnu.org/gnu/libmatheval/${name}.tar.gz"; sha256 = "474852d6715ddc3b6969e28de5e1a5fbaff9e8ece6aebb9dc1cc63e9e88e89ab"; }; diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix index 764f4442e6cb..e7bce0e80187 100644 --- a/pkgs/development/libraries/libmatroska/default.nix +++ b/pkgs/development/libraries/libmatroska/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libmatroska-1.4.8"; src = fetchurl { - url = "http://dl.matroska.org/downloads/libmatroska/${name}.tar.xz"; + url = "https://dl.matroska.org/downloads/libmatroska/${name}.tar.xz"; sha256 = "14n9sw974prr3yp4yjb7aadi6x2yz5a0hjw8fs3qigy5shh2piyq"; }; diff --git a/pkgs/development/libraries/libmnl/default.nix b/pkgs/development/libraries/libmnl/default.nix index 2dbdb60b4b66..7c4b451ae6d1 100644 --- a/pkgs/development/libraries/libmnl/default.nix +++ b/pkgs/development/libraries/libmnl/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libmnl-1.0.4"; src = fetchurl { - url = "http://netfilter.org/projects/libmnl/files/${name}.tar.bz2"; + url = "https://netfilter.org/projects/libmnl/files/${name}.tar.bz2"; sha256 = "108zampspaalv44zn0ar9h386dlfixpd149bnxa5hsi8kxlqj7qp"; }; diff --git a/pkgs/development/libraries/libmpcdec/default.nix b/pkgs/development/libraries/libmpcdec/default.nix index 084d7ba73704..a5a4d68ad969 100644 --- a/pkgs/development/libraries/libmpcdec/default.nix +++ b/pkgs/development/libraries/libmpcdec/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libmpcdec-1.2.6"; src = fetchurl { - url = http://files.musepack.net/source/libmpcdec-1.2.6.tar.bz2; + url = https://files.musepack.net/source/libmpcdec-1.2.6.tar.bz2; sha256 = "1a0jdyga1zfi4wgkg3905y6inghy3s4xfs5m4x7pal08m0llkmab"; }; diff --git a/pkgs/development/libraries/libmrss/default.nix b/pkgs/development/libraries/libmrss/default.nix index b0adcf237549..f1a061e5ab58 100644 --- a/pkgs/development/libraries/libmrss/default.nix +++ b/pkgs/development/libraries/libmrss/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libmrss-0.19.2"; src = fetchurl { - url = "http://www.autistici.org/bakunin/libmrss/libmrss-0.19.2.tar.gz"; + url = "https://www.autistici.org/bakunin/libmrss/libmrss-0.19.2.tar.gz"; sha256 = "02r1bgj8qlkn63xqfi5yq8y7wrilxcnkycaag8qskhg5ranic507"; }; diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/development/libraries/libmspack/default.nix index 79d4c056341c..ef250441daba 100644 --- a/pkgs/development/libraries/libmspack/default.nix +++ b/pkgs/development/libraries/libmspack/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libmspack-0.6alpha"; src = fetchurl { - url = "http://www.cabextract.org.uk/libmspack/${name}.tar.gz"; + url = "https://www.cabextract.org.uk/libmspack/${name}.tar.gz"; sha256 = "08gr2pcinas6bdqz3k0286g5cnksmcx813skmdwyca6bmj1fxnqy"; }; diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index 9eefbcfdb49e..2b7258031c33 100644 --- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.1.9"; src = fetchurl { - url = "http://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}.tar.gz"; + url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}.tar.gz"; sha256 = "1r6j17sy5816a2ld759iis2k6igc2w9p70y4nw9w3rd4d5x88c9y"; }; diff --git a/pkgs/development/libraries/libnetfilter_cthelper/default.nix b/pkgs/development/libraries/libnetfilter_cthelper/default.nix index fa94fa549e42..a680e009ab6a 100644 --- a/pkgs/development/libraries/libnetfilter_cthelper/default.nix +++ b/pkgs/development/libraries/libnetfilter_cthelper/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.0.0"; src = fetchurl { - url = "http://netfilter.org/projects/libnetfilter_cthelper/files/${name}.tar.bz2"; + url = "https://netfilter.org/projects/libnetfilter_cthelper/files/${name}.tar.bz2"; sha256 = "07618e71c4d9a6b6b3dc1986540486ee310a9838ba754926c7d14a17d8fccf3d"; }; diff --git a/pkgs/development/libraries/libnfnetlink/default.nix b/pkgs/development/libraries/libnfnetlink/default.nix index 5395b5b2e99c..fa6461d86919 100644 --- a/pkgs/development/libraries/libnfnetlink/default.nix +++ b/pkgs/development/libraries/libnfnetlink/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libnfnetlink-1.0.1"; src = fetchurl { - url = "http://www.netfilter.org/projects/libnfnetlink/files/${name}.tar.bz2"; + url = "https://www.netfilter.org/projects/libnfnetlink/files/${name}.tar.bz2"; sha256 = "06mm2x4b01k3m7wnrxblk9j0mybyr4pfz28ml7944xhjx6fy2w7j"; }; diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index c7967c3fb6fc..cdf93b0b2ff4 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libnice-0.1.14"; src = fetchurl { - url = "http://nice.freedesktop.org/releases/${name}.tar.gz"; + url = "https://nice.freedesktop.org/releases/${name}.tar.gz"; sha256 = "17404z0fr6z3k7s2pkyyh9xp5gv7yylgyxx01mpl7424bnlhn4my"; }; diff --git a/pkgs/development/libraries/libnxml/default.nix b/pkgs/development/libraries/libnxml/default.nix index f34c421a120a..8d97a13b0a08 100644 --- a/pkgs/development/libraries/libnxml/default.nix +++ b/pkgs/development/libraries/libnxml/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libnxml-0.18.3"; src = fetchurl { - url = "http://www.autistici.org/bakunin/libnxml/libnxml-0.18.3.tar.gz"; + url = "https://www.autistici.org/bakunin/libnxml/libnxml-0.18.3.tar.gz"; sha256 = "0ix5b9bxd7r517vhgcxwdviq4m0g0pq46s5g3h04gcqnpbin150g"; }; diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 945554386930..f94f327ea02e 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libpcap-1.8.1"; src = fetchurl { - url = "http://www.tcpdump.org/release/${name}.tar.gz"; + url = "https://www.tcpdump.org/release/${name}.tar.gz"; sha256 = "07jlhc66z76dipj4j5v3dig8x6h3k6cb36kmnmpsixf3zmlvqgb7"; }; diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix index 593bb567df7d..25e55e45d1e2 100644 --- a/pkgs/development/libraries/libpfm/default.nix +++ b/pkgs/development/libraries/libpfm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "4.10.0"; + version = "4.10.1"; name = "libpfm-${version}"; src = fetchurl { url = "mirror://sourceforge/perfmon2/libpfm4/${name}.tar.gz"; - sha256 = "0bldxhcrpav04hi256fmf907gxhyck24j1p998v48zbhm6aykw94"; + sha256 = "0jabhjx77yppr7x38bkfww6n2a480gj62rw0qp7prhdmg19mf766"; }; installFlags = "DESTDIR=\${out} PREFIX= LDCONFIG=true"; diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix index d8ebc2e83a61..8da097c3d386 100644 --- a/pkgs/development/libraries/libplist/default.nix +++ b/pkgs/development/libraries/libplist/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { ''; src = fetchurl { - url = "http://www.libimobiledevice.org/downloads/${name}.tar.bz2"; + url = "https://www.libimobiledevice.org/downloads/${name}.tar.bz2"; sha256 = "00pnh9zf3iwdji2faccns7vagbmbrwbj9a8zp9s53a6rqaa9czis"; }; diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index 3ce4b3f2d3f9..9803e09610e6 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.18.12"; src = fetchurl { - url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz"; + url = "https://www.libraw.org/data/LibRaw-${version}.tar.gz"; sha256 = "1m2khr2cij8z6lawgbmdksjn14fpnjsy8ad4qahnpqapm1slsxap"; }; diff --git a/pkgs/development/libraries/librep/default.nix b/pkgs/development/libraries/librep/default.nix index 5b3beda1eb8b..2f78222cebb1 100644 --- a/pkgs/development/libraries/librep/default.nix +++ b/pkgs/development/libraries/librep/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sourceName = "librep_${version}"; src = fetchurl { - url = "http://download.tuxfamily.org/librep/${sourceName}.tar.xz"; + url = "https://download.tuxfamily.org/librep/${sourceName}.tar.xz"; sha256 = "1bmcjl1x1rdh514q9z3hzyjmjmwwwkziipjpjsl301bwmiwrd8a8"; }; diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix index aa3aaa1c59bc..8018b84a52be 100644 --- a/pkgs/development/libraries/libspatialindex/default.nix +++ b/pkgs/development/libraries/libspatialindex/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "libspatialindex-${version}"; src = fetchurl { - url = "http://download.osgeo.org/libspatialindex/spatialindex-src-${version}.tar.gz"; + url = "https://download.osgeo.org/libspatialindex/spatialindex-src-${version}.tar.gz"; sha256 = "1vxzm7kczwnb6qdmc0hb00z8ykx11zk3sb68gc7rch4vrfi4dakw"; }; diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix index 253c5365c8a3..b75baf149e1a 100644 --- a/pkgs/development/libraries/libspatialite/default.nix +++ b/pkgs/development/libraries/libspatialite/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "libspatialite-4.3.0a"; src = fetchurl { - url = "http://www.gaia-gis.it/gaia-sins/libspatialite-sources/${name}.tar.gz"; + url = "https://www.gaia-gis.it/gaia-sins/libspatialite-sources/${name}.tar.gz"; sha256 = "16d4lpl7xrm9zy4gphy6nwanpjp8wn9g4wq2i2kh8abnlhq01448"; }; diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix index 647e6f16fdf8..f1e4169bd48e 100644 --- a/pkgs/development/libraries/libspectre/default.nix +++ b/pkgs/development/libraries/libspectre/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libspectre-0.2.7"; src = fetchurl { - url = "http://libspectre.freedesktop.org/releases/${name}.tar.gz"; + url = "https://libspectre.freedesktop.org/releases/${name}.tar.gz"; sha256 = "1v63lqc6bhhxwkpa43qmz8phqs8ci4dhzizyy16d3vkb20m846z8"; }; diff --git a/pkgs/development/libraries/libstatgrab/default.nix b/pkgs/development/libraries/libstatgrab/default.nix index 72d73e358485..fb7b3be6b698 100644 --- a/pkgs/development/libraries/libstatgrab/default.nix +++ b/pkgs/development/libraries/libstatgrab/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "libstatgrab-0.91"; src = fetchurl { - url = "http://ftp.i-scream.org/pub/i-scream/libstatgrab/${name}.tar.gz"; + url = "https://ftp.i-scream.org/pub/i-scream/libstatgrab/${name}.tar.gz"; sha256 = "1azinx2yzs442ycwq6p15skl3mscmqj7fd5hq7fckhjp92735s83"; }; diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 6676944d5291..c492a15bfa4e 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "libtiff-${version}"; src = fetchurl { - url = "http://download.osgeo.org/libtiff/tiff-${version}.tar.gz"; + url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz"; sha256 = "1kfg4q01r4mqn7dj63ifhi6pmqzbf4xax6ni6kkk81ri5kndwyvf"; }; diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix index 58b052b8fae8..18ceb5302292 100644 --- a/pkgs/development/libraries/libtsm/default.nix +++ b/pkgs/development/libraries/libtsm/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libtsm-3"; src = fetchurl { - url = "http://freedesktop.org/software/kmscon/releases/${name}.tar.xz"; + url = "https://freedesktop.org/software/kmscon/releases/${name}.tar.xz"; sha256 = "01ygwrsxfii0pngfikgqsb4fxp8n1bbs47l7hck81h9b9bc1ah8i"; }; diff --git a/pkgs/development/libraries/libtxc_dxtn/default.nix b/pkgs/development/libraries/libtxc_dxtn/default.nix index 977570050158..21e3a15449c2 100644 --- a/pkgs/development/libraries/libtxc_dxtn/default.nix +++ b/pkgs/development/libraries/libtxc_dxtn/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "libtxc_dxtn-${version}"; src = fetchurl { - url = "http://people.freedesktop.org/~cbrill/libtxc_dxtn/${name}.tar.bz2"; + url = "https://people.freedesktop.org/~cbrill/libtxc_dxtn/${name}.tar.bz2"; sha256 = "0q5fjaknl7s0z206dd8nzk9bdh8g4p23bz7784zrllnarl90saa5"; }; diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix index 3d15b698b481..ae53178e88d9 100644 --- a/pkgs/development/libraries/libusbmuxd/default.nix +++ b/pkgs/development/libraries/libusbmuxd/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "libusbmuxd-1.0.10"; src = fetchurl { - url = "http://www.libimobiledevice.org/downloads/${name}.tar.bz2"; + url = "https://www.libimobiledevice.org/downloads/${name}.tar.bz2"; sha256 = "1wn9zq2224786mdr12c5hxad643d29wg4z6b7jn888jx4s8i78hs"; }; diff --git a/pkgs/development/libraries/libva/1.0.0.nix b/pkgs/development/libraries/libva/1.0.0.nix index 04d621e29c84..097ac0e3e98e 100644 --- a/pkgs/development/libraries/libva/1.0.0.nix +++ b/pkgs/development/libraries/libva/1.0.0.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "1.7.3"; src = fetchurl { - url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2"; + url = "https://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2"; sha256 = "1ndrf136rlw03xag7j1xpmf9015d1h0dpnv6v587jnh6k2a17g12"; }; diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index 0dbe30251bdd..2d83955de696 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "http://libvirt.org/sources/glib/${name}.tar.gz"; + url = "https://libvirt.org/sources/glib/${name}.tar.gz"; sha256 = "0iwa5sdbii52pjpdm5j37f67sdmf0kpcky4liwhy1nf43k85i4fa"; }; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index cb81aa262e92..f2be3b7831a3 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -6,6 +6,7 @@ , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages , curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode , enableXen ? false, xen ? null +, enableIscsi ? false, openiscsi }: with stdenv.lib; @@ -42,6 +43,8 @@ in stdenv.mkDerivation rec { libapparmor libcap_ng numactl attr parted ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [ xen + ] ++ optionals enableIscsi [ + openiscsi ] ++ optionals stdenv.isDarwin [ libiconv gmp ]; @@ -49,7 +52,7 @@ in stdenv.mkDerivation rec { preConfigure = '' ${ optionalString (!buildFromTarball) "./bootstrap --no-git --gnulib-srcdir=$(pwd)/.gnulib" } - PATH=${stdenv.lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ])}:$PATH + PATH=${stdenv.lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH # the path to qemu-kvm will be stored in VM's .xml and .save files # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations @@ -79,6 +82,8 @@ in stdenv.mkDerivation rec { "--with-storage-disk" ] ++ optionals (stdenv.isLinux && zfs != null) [ "--with-storage-zfs" + ] ++ optionals enableIscsi [ + "--with-storage-iscsi" ] ++ optionals stdenv.isDarwin [ "--with-init-script=none" ]; @@ -88,7 +93,10 @@ in stdenv.mkDerivation rec { "sysconfdir=$(out)/var/lib" ]; - postInstall = '' + + postInstall = let + binPath = [ iptables iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ] ++ optionals enableIscsi [ openiscsi ]; + in '' substituteInPlace $out/libexec/libvirt-guests.sh \ --replace 'ON_SHUTDOWN=suspend' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \ --replace "$out/bin" '${gettext}/bin' \ @@ -101,7 +109,7 @@ in stdenv.mkDerivation rec { substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill rm $out/lib/systemd/system/{virtlockd,virtlogd}.* wrapProgram $out/sbin/libvirtd \ - --prefix PATH : /run/libvirt/nix-emulators:${makeBinPath [ iptables iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ]} + --prefix PATH : /run/libvirt/nix-emulators:${makeBinPath binPath} ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libx86/default.nix b/pkgs/development/libraries/libx86/default.nix index d73d67a39cf2..d56c20cb75af 100644 --- a/pkgs/development/libraries/libx86/default.nix +++ b/pkgs/development/libraries/libx86/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libx86-${version}"; version = "1.1"; src = fetchurl { - url = "http://www.codon.org.uk/~mjg59/libx86/downloads/${name}.tar.gz"; + url = "https://www.codon.org.uk/~mjg59/libx86/downloads/${name}.tar.gz"; sha256 = "0j6h6bc02c6qi0q7c1ncraz4d1hkm5936r35rfsp4x1jrc233wav"; }; patches = [./constants.patch ./non-x86.patch ]; diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix index d225831f7024..b4ad501c2efe 100644 --- a/pkgs/development/libraries/libxcomp/default.nix +++ b/pkgs/development/libraries/libxcomp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { sha256 = "1m3z9w3h6qpgk265xf030w7lcs181jgw2cdyzshb7l97mn1f7hh2"; - url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz"; + url = "https://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz"; }; buildInputs = [ libjpeg libpng libX11 zlib ]; diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index 20053190e3bc..150da3d45997 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "libyaml-${version}"; src = fetchurl { - url = "http://pyyaml.org/download/libyaml/yaml-${version}.tar.gz"; + url = "https://pyyaml.org/download/libyaml/yaml-${version}.tar.gz"; sha256 = "0a87931cx5m14a1x8rbjix3nz7agrcgndf4h392vm62a4rby9240"; }; diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/development/libraries/libzdb/default.nix index 4a5aa057a5cf..f3cbddf1ec41 100644 --- a/pkgs/development/libraries/libzdb/default.nix +++ b/pkgs/development/libraries/libzdb/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec src = fetchurl { - url = "http://www.tildeslash.com/libzdb/dist/libzdb-${version}.tar.gz"; + url = "https://www.tildeslash.com/libzdb/dist/libzdb-${version}.tar.gz"; sha256 = "1596njvy518x7vsvsykmnk1ky82x8jxd6nmmp551y6hxn2qsn08g"; }; diff --git a/pkgs/development/libraries/lief/default.nix b/pkgs/development/libraries/lief/default.nix new file mode 100644 index 000000000000..410c60bff9f3 --- /dev/null +++ b/pkgs/development/libraries/lief/default.nix @@ -0,0 +1,14 @@ +{ stdenv, fetchzip }: + +fetchzip { + url = https://github.com/lief-project/LIEF/releases/download/0.9.0/LIEF-0.9.0-Linux.tar.gz; + sha256 = "1c47hwd00bp4mqd4p5b6xjfl89c3wwk9ccyc3a2gk658250g2la6"; + + meta = with stdenv.lib; { + description = "Library to Instrument Executable Formats"; + homepage = https://lief.quarkslab.com/; + license = [ licenses.asl20 ]; + platforms = platforms.linux; + maintainers = [ maintainers.lassulus ]; + }; +} diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix index 762d23e240a2..e014e38c3f97 100644 --- a/pkgs/development/libraries/loudmouth/default.nix +++ b/pkgs/development/libraries/loudmouth/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "loudmouth-${version}"; src = fetchurl { - url = "http://mcabber.com/files/loudmouth/${name}.tar.bz2"; + url = "https://mcabber.com/files/loudmouth/${name}.tar.bz2"; sha256 = "0b6kd5gpndl9nzis3n6hcl0ldz74bnbiypqgqa1vgb0vrcar8cjl"; }; diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index ed1052ce40a0..a1a096b096d7 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -1,56 +1,37 @@ -{ stdenv, fetchFromGitHub, perl }: +{ stdenv +, fetchFromGitHub + +, cmake +, ninja +, perl # Project uses Perl for scripting and testing + +, enableThreading ? true # Threading can be disabled to increase security https://tls.mbed.org/kb/development/thread-safety-and-multi-threading +}: stdenv.mkDerivation rec { - name = "mbedtls-2.10.0"; + name = "mbedtls-${version}"; + version = "2.11.0"; src = fetchFromGitHub { owner = "ARMmbed"; repo = "mbedtls"; rev = name; - sha256 = "0im83kqf7a64ywxh6dnv0by3gwxww93zx5wpdqglr6xp7b8yg4xk"; + sha256 = "1d4a0jc08q3h051amv8hhh3hmqp4f1rk5z7ffyfs2g8dassm78ir"; }; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ cmake ninja perl ]; - postPatch = '' - patchShebangs . - '' + stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace library/Makefile --replace "-soname" "-install_name" - substituteInPlace tests/scripts/run-test-suites.pl --replace "LD_LIBRARY_PATH" "DYLD_LIBRARY_PATH" - # Necessary for install_name_tool below - echo "LOCAL_LDFLAGS += -headerpad_max_install_names" >> programs/Makefile + postConfigure = stdenv.lib.optionals enableThreading '' + perl scripts/config.pl set MBEDTLS_THREADING_C # Threading abstraction layer + perl scripts/config.pl set MBEDTLS_THREADING_PTHREAD # POSIX thread wrapper layer for the threading layer. ''; - makeFlags = [ - "SHARED=1" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ - "DLEXT=dylib" - ]; - - installFlags = [ - "DESTDIR=\${out}" - ]; - - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $out/lib/libmbedtls.dylib - install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $out/lib/libmbedx509.dylib - install_name_tool -change libmbedx509.dylib $out/lib/libmbedx509.dylib $out/lib/libmbedtls.dylib - - for exe in $out/bin/*; do - if [[ $exe != *.sh ]]; then - install_name_tool -change libmbedtls.dylib $out/lib/libmbedtls.dylib $exe - install_name_tool -change libmbedx509.dylib $out/lib/libmbedx509.dylib $exe - install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $exe - fi - done - ''; - - doCheck = true; + cmakeFlags = [ "-DUSE_SHARED_MBEDTLS_LIBRARY=on" ]; meta = with stdenv.lib; { homepage = https://tls.mbed.org/; - description = "Portable cryptographic and SSL/TLS library, aka polarssl"; - license = licenses.gpl3; + description = "Portable cryptographic and TLS library, formerly known as PolarSSL"; + license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ wkennington fpletz ]; }; diff --git a/pkgs/development/libraries/mdds/0.12.1.nix b/pkgs/development/libraries/mdds/0.12.1.nix index 1c6134d0480b..11bd437d377e 100644 --- a/pkgs/development/libraries/mdds/0.12.1.nix +++ b/pkgs/development/libraries/mdds/0.12.1.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "mdds-${version}"; src = fetchurl { - url = "http://kohei.us/files/mdds/src/mdds_${version}.tar.bz2"; + url = "https://kohei.us/files/mdds/src/mdds_${version}.tar.bz2"; sha256 = "0gg8mb9kxh3wggh7njj1gf90xy27p0yq2cw88wqar9hhg2fmwmi3"; }; diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index 592b6d7a6779..90d86ea9165c 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "mdds-${version}"; src = fetchurl { - url = "http://kohei.us/files/mdds/src/mdds-${version}.tar.bz2"; + url = "https://kohei.us/files/mdds/src/mdds-${version}.tar.bz2"; sha256 = "18g511z1lgfxrga2ld9yr95phmyfbd3ymbv4q5g5lyjn4ljcvf6w"; }; diff --git a/pkgs/development/libraries/mpich2/default.nix b/pkgs/development/libraries/mpich2/default.nix index 4b8e2b651e45..6c5a0e5279ce 100644 --- a/pkgs/development/libraries/mpich2/default.nix +++ b/pkgs/development/libraries/mpich2/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "3.2.1"; src = fetchurl { - url = "http://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz"; + url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz"; sha256 = "1w9h4g7d46d9l5jbcyfxpaqzpjrc5hyvr9d0ns7278psxpr3pdax"; }; diff --git a/pkgs/development/libraries/ntdb/default.nix b/pkgs/development/libraries/ntdb/default.nix index d26b15176aa6..a70cba625a89 100644 --- a/pkgs/development/libraries/ntdb/default.nix +++ b/pkgs/development/libraries/ntdb/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The not-so trivial database"; - homepage = http://tdb.samba.org/; + homepage = https://tdb.samba.org/; license = licenses.lgpl3Plus; maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix index 48ec5141e34f..20a62ef67f98 100644 --- a/pkgs/development/libraries/opendbx/default.nix +++ b/pkgs/development/libraries/opendbx/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "opendbx-1.4.6"; src = fetchurl { - url = "http://linuxnetworks.de/opendbx/download/${name}.tar.gz"; + url = "https://linuxnetworks.de/opendbx/download/${name}.tar.gz"; sha256 = "0z29h6zx5f3gghkh1a0060w6wr572ci1rl2a3480znf728wa0ii2"; }; diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix index 1ab6661db5bb..05370ad4a0bd 100644 --- a/pkgs/development/libraries/openfst/default.nix +++ b/pkgs/development/libraries/openfst/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "openfst"; - version = "1.6.7"; + version = "1.6.8"; src = fetchurl { url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${name}.tar.gz"; - sha256 = "1xqpc1qlvghprwih99immsjh3ba08lg754cf5icnmpkwh9nlh6p2"; + sha256 = "1ngak7qwanf8n1gqghh7snjl4lsp6xhks4y00b16isrm4rk3cnms"; }; meta = { description = "Library for working with finite-state transducers"; diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 93ba3f15a09c..907f071d5c55 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "openldap-2.4.45"; src = fetchurl { - url = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz"; + url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz"; sha256 = "091qvwk5dkcpp17ziabcnh3rg3m7qwzw2pihfcd1d5fdxgywzmnd"; }; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 31e9d661a588..0251de77d03e 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -12,7 +12,7 @@ let name = "openssl-${version}"; src = fetchurl { - url = "http://www.openssl.org/source/${name}.tar.gz"; + url = "https://www.openssl.org/source/${name}.tar.gz"; inherit sha256; }; diff --git a/pkgs/development/libraries/phash/default.nix b/pkgs/development/libraries/phash/default.nix new file mode 100644 index 000000000000..4cc607345e8c --- /dev/null +++ b/pkgs/development/libraries/phash/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, pkgconfig, cimg, imagemagick }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "pHash"; + version = "0.9.4"; + + buildInputs = [ cimg ]; + + # CImg.h calls to external binary `convert` from the `imagemagick` package + # at runtime + propagatedBuildInputs = [ imagemagick ]; + + nativeBuildInputs = [ pkgconfig ]; + + configureFlags = ["--enable-video-hash=no" "--enable-audio-hash=no"]; + postInstall = '' + cp ${cimg}/include/CImg.h $out/include/ + ''; + + src = fetchFromGitHub { + owner = "clearscene"; + repo = "pHash"; + rev = version; + sha256 = "0y4gknfkns5sssfaj0snyx29752my20xmxajg6xggijx0myabbv0"; + }; + + meta = with stdenv.lib; { + inherit version; + description = "Compute the perceptual hash of an image"; + license = licenses.gpl3; + maintainers = [maintainers.imalsogreg]; + platforms = platforms.all; + homepage = http://www.phash.org; + downloadPage = "https://github.com/clearscene/pHash"; + updateWalker = true; + }; +} diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix index 643e36ba6cd6..0487886a8966 100644 --- a/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/pkgs/development/libraries/phonon/backends/vlc.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, cmake, phonon, pkgconfig, vlc , extra-cmake-modules, qtbase ? null, qtx11extras ? null, qt4 ? null -, withQt5 ? false +, withQt4 ? false , debug ? false }: @@ -11,11 +11,12 @@ let pname = "phonon-backend-vlc"; in -assert withQt5 -> qtbase != null; -assert withQt5 -> qtx11extras != null; +assert withQt4 -> qt4 != null; +assert !withQt4 -> qtbase != null; +assert !withQt4 -> qtx11extras != null; stdenv.mkDerivation rec { - name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${v}"; + name = "${pname}-${if withQt4 then "qt4" else "qt5"}-${v}"; meta = with stdenv.lib; { homepage = https://phonon.kde.org/; @@ -30,11 +31,11 @@ stdenv.mkDerivation rec { buildInputs = [ phonon vlc ] - ++ (if withQt5 then [ qtbase qtx11extras ] else [ qt4 ]); + ++ (if withQt4 then [ qt4 ] else [ qtbase qtx11extras ]); - nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 extra-cmake-modules; + nativeBuildInputs = [ cmake pkgconfig ] ++ optional (!withQt4) extra-cmake-modules; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" ] - ++ optional withQt5 "-DPHONON_BUILD_PHONON4QT5=ON"; + ++ optional (!withQt4) "-DPHONON_BUILD_PHONON4QT5=ON"; } diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix index dad138c8433a..f837d807219f 100644 --- a/pkgs/development/libraries/physics/cernlib/default.nix +++ b/pkgs/development/libraries/physics/cernlib/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "cernlib-${version}"; src = fetchurl { - url = "http://cernlib.web.cern.ch/cernlib/download/${version}_source/tar/${version}_src.tar.gz"; + url = "https://cernlib.web.cern.ch/cernlib/download/${version}_source/tar/${version}_src.tar.gz"; sha256 = "0awla1rl96z82br7slcmg8ks1d2a7slk6dj79ywb871j2ksi3fky"; }; diff --git a/pkgs/development/libraries/physics/fastnlo/default.nix b/pkgs/development/libraries/physics/fastnlo/default.nix index e568e1597972..e3291907d31f 100644 --- a/pkgs/development/libraries/physics/fastnlo/default.nix +++ b/pkgs/development/libraries/physics/fastnlo/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.3.1pre-2402"; src = fetchurl { - url = "http://fastnlo.hepforge.org/code/v23/${name}.tar.gz"; + url = "https://fastnlo.hepforge.org/code/v23/${name}.tar.gz"; sha256 = "1h41xnqcz401x3zbs8i2dsb4xlhbv8i5ps0561p6y7gcyridgcbl"; }; diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix index ce6ea4c56a89..9993060eb728 100644 --- a/pkgs/development/libraries/physics/herwig/default.nix +++ b/pkgs/development/libraries/physics/herwig/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "7.1.3"; src = fetchurl { - url = "http://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2"; + url = "https://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2"; sha256 = "1iq1h5ap86729c4pfkswzfh0l2v20fyvqsb15c35g0407l54wfqm"; }; diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index 93e0fa99c347..7f89c92772c3 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "6.2.1"; src = fetchurl { - url = "http://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz"; + url = "https://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz"; sha256 = "0bi02xcmq5as0wf0jn6i3hx0qy0hj61m02sbrbzd1gwjhpccwmvd"; }; diff --git a/pkgs/development/libraries/physics/mcgrid/default.nix b/pkgs/development/libraries/physics/mcgrid/default.nix index aabe132e73b3..32a05d10d3a6 100644 --- a/pkgs/development/libraries/physics/mcgrid/default.nix +++ b/pkgs/development/libraries/physics/mcgrid/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.0.2"; src = fetchurl { - url = "http://www.hepforge.org/archive/mcgrid/${name}.tar.gz"; + url = "https://www.hepforge.org/archive/mcgrid/${name}.tar.gz"; sha256 = "1mw82x7zqbdchnd6shj3dirsav5i2cndp2hjwb8a8xdh4xh9zvfy"; }; diff --git a/pkgs/development/libraries/physics/nlojet/default.nix b/pkgs/development/libraries/physics/nlojet/default.nix index 88fafaf3ae6e..0c9d879fbd09 100644 --- a/pkgs/development/libraries/physics/nlojet/default.nix +++ b/pkgs/development/libraries/physics/nlojet/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "4.1.3"; src = fetchurl { - url = "http://desy.de/~znagy/hep-programs/nlojet++/nlojet++-${version}.tar.gz"; + url = "https://desy.de/~znagy/hep-programs/nlojet++/nlojet++-${version}.tar.gz"; sha256 = "18qfn5kjzvnyh29x40zm2maqzfmrnay9r58n8pfpq5lcphdhhv8p"; }; diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index c13b659f792e..8c4a9288a15b 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.6.0"; src = fetchurl { - url = "http://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; + url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; sha256 = "007rwal8wx2k9gs0r6kym6ix0siz0x9l55q9myq41siirpf2jcpv"; }; diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix index 0a84fe20da72..feffa5c11d54 100644 --- a/pkgs/development/libraries/physics/thepeg/default.nix +++ b/pkgs/development/libraries/physics/thepeg/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.1.3"; src = fetchurl { - url = "http://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2"; + url = "https://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2"; sha256 = "030wpk78mwb56iph5iqmblsxgzpydsa25bbkv07bihihfm8gds0n"; }; diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index 6cda6bd310be..eb34b94118a9 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.7.0"; src = fetchurl { - url = "http://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; + url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; sha256 = "0fyf6ld1klzlfmr5sl1jxzck4a0h14zfkrff8397rn1fqnqbzmmk"; }; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 98937308191e..2b5f7cacd4b3 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { name = "polkit-0.113"; src = fetchurl { - url = "http://www.freedesktop.org/software/polkit/releases/${name}.tar.gz"; + url = "https://www.freedesktop.org/software/polkit/releases/${name}.tar.gz"; sha256 = "109w86kfqrgz83g9ivggplmgc77rz8kx8646izvm2jb57h4rbh71"; }; diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix index 9a72e03ef2c6..aa9a3f9fdc0a 100644 --- a/pkgs/development/libraries/postgis/default.nix +++ b/pkgs/development/libraries/postgis/default.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { name = "postgis-${version}"; src = fetchurl { - url = "http://download.osgeo.org/postgis/source/postgis-${builtins.toString version}.tar.gz"; + url = "https://download.osgeo.org/postgis/source/postgis-${builtins.toString version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index b92aa49a092e..0ebf299a8bfb 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "proj-4.9.3"; src = fetchurl { - url = http://download.osgeo.org/proj/proj-4.9.3.tar.gz; + url = https://download.osgeo.org/proj/proj-4.9.3.tar.gz; sha256 = "1xw5f427xk9p2nbsj04j6m5zyjlyd66sbvl2bkg8hd1kx8pm9139"; }; diff --git a/pkgs/development/libraries/rabbitmq-java-client/default.nix b/pkgs/development/libraries/rabbitmq-java-client/default.nix index a1708ba59c35..96a2347c50fa 100644 --- a/pkgs/development/libraries/rabbitmq-java-client/default.nix +++ b/pkgs/development/libraries/rabbitmq-java-client/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "rabbitmq-java-client-3.3.4"; src = fetchurl { - url = "http://www.rabbitmq.com/releases/rabbitmq-java-client/v3.3.4/rabbitmq-java-client-3.3.4.tar.gz"; + url = "https://www.rabbitmq.com/releases/rabbitmq-java-client/v3.3.4/rabbitmq-java-client-3.3.4.tar.gz"; sha256 = "03kspkgzzjsbq6f8yl2zj5m30qwgxv3l58hrbf6gcgxb5rpfk6sh"; }; diff --git a/pkgs/development/libraries/readosm/default.nix b/pkgs/development/libraries/readosm/default.nix index 7faee7e69a2e..5a4306a63a78 100644 --- a/pkgs/development/libraries/readosm/default.nix +++ b/pkgs/development/libraries/readosm/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "readosm-1.1.0"; src = fetchurl { - url = "http://www.gaia-gis.it/gaia-sins/readosm-sources/${name}.tar.gz"; + url = "https://www.gaia-gis.it/gaia-sins/readosm-sources/${name}.tar.gz"; sha256 = "1v20pnda67imjd70fn0zw30aar525xicy3d3v49md5cvqklws265"; }; diff --git a/pkgs/development/libraries/rep-gtk/default.nix b/pkgs/development/libraries/rep-gtk/default.nix index 5629164f160a..681fc3a012fe 100644 --- a/pkgs/development/libraries/rep-gtk/default.nix +++ b/pkgs/development/libraries/rep-gtk/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sourceName = "rep-gtk_${version}"; src = fetchurl { - url = "http://download.tuxfamily.org/librep/rep-gtk/${sourceName}.tar.xz"; + url = "https://download.tuxfamily.org/librep/rep-gtk/${sourceName}.tar.xz"; sha256 = "0hgkkywm8zczir3lqr727bn7ybgg71x9cwj1av8fykkr8pdpard9"; }; diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index bb36d942a69b..90389055a415 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://rocksdb.org; + homepage = https://rocksdb.org; description = "A library that provides an embeddable, persistent key-value store for fast storage"; license = licenses.bsd3; platforms = platforms.x86_64; diff --git a/pkgs/development/libraries/rubberband/default.nix b/pkgs/development/libraries/rubberband/default.nix index 364a4d4794a8..c9ba339ae0ea 100644 --- a/pkgs/development/libraries/rubberband/default.nix +++ b/pkgs/development/libraries/rubberband/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "High quality software library for audio time-stretching and pitch-shifting"; - homepage = http://www.breakfastquay.com/rubberband/index.html; + homepage = https://www.breakfastquay.com/rubberband/index.html; # commercial license available as well, see homepage. You'll get some more optimized routines license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu maintainers.marcweber ]; diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix index 167fe4190764..25126edbc0f4 100644 --- a/pkgs/development/libraries/schroedinger/default.nix +++ b/pkgs/development/libraries/schroedinger/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { src = fetchurl { urls = [ http://diracvideo.org/download/schroedinger/schroedinger-1.0.11.tar.gz - http://download.videolan.org/contrib/schroedinger-1.0.11.tar.gz + https://download.videolan.org/contrib/schroedinger-1.0.11.tar.gz ]; sha256 = "04prr667l4sn4zx256v1z36a0nnkxfdqyln48rbwlamr6l3jlmqy"; }; diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index 0af00f75d994..4a6aabb447f3 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.12.10"; src = fetchurl { - url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip"; + url = "https://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip"; sha256 = "004pd90knnnzcx727knb7ffkabb1ggbskb8s607bfvfgdd7wlli9"; }; diff --git a/pkgs/development/libraries/science/math/magma/default.nix b/pkgs/development/libraries/science/math/magma/default.nix index 26ec501f1a7e..8444d88809af 100644 --- a/pkgs/development/libraries/science/math/magma/default.nix +++ b/pkgs/development/libraries/science/math/magma/default.nix @@ -7,7 +7,7 @@ let version = "2.0.2"; in stdenv.mkDerivation { name = "magma-${version}"; src = fetchurl { - url = "http://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${version}.tar.gz"; + url = "https://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${version}.tar.gz"; sha256 = "0w3z6k1npfh0d3r8kpw873f1m7lny29sz2bvvfxzk596d4h083lk"; name = "magma-${version}.tar.gz"; }; diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix index 195b90c86e1a..3e8524b40140 100644 --- a/pkgs/development/libraries/science/math/openlibm/default.nix +++ b/pkgs/development/libraries/science/math/openlibm/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "openlibm-${version}"; - version = "0.5.5"; + version = "0.6.0"; src = fetchurl { url = "https://github.com/JuliaLang/openlibm/archive/v${version}.tar.gz"; - sha256 = "1z8cj5q8ca8kmrakwkpjxf8svi81waw0c568cx8v8pv9kvswbp07"; + sha256 = "0a5fpm8nra5ldhjk0cqd2rx1qh32wiarkxmcqcm5xl8z7l4kjm6l"; }; makeFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index 96449a8ed962..ac9183cffe9b 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.28.0"; src = fetchurl { - url = "http://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${name}.tar.bz2"; sha256 = "1v4ai4zyj1q3255nghicns9817jkwb3bh60ssprsjmnjfj41mwhx"; }; diff --git a/pkgs/development/libraries/shapelib/default.nix b/pkgs/development/libraries/shapelib/default.nix index 3234d1bb89bf..09d3efa64b2b 100644 --- a/pkgs/development/libraries/shapelib/default.nix +++ b/pkgs/development/libraries/shapelib/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "shapelib-1.4.1"; src = fetchurl { - url = "http://download.osgeo.org/shapelib/${name}.tar.gz"; + url = "https://download.osgeo.org/shapelib/${name}.tar.gz"; sha256 = "1cr3b5jfglwisbyzj7fnxp9xysqad0fcmcqvqaja6qap6qblijd4"; }; diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix index bcce457e78e8..ec59ae0e819e 100644 --- a/pkgs/development/libraries/slang/default.nix +++ b/pkgs/development/libraries/slang/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "slang-2.3.2"; src = fetchurl { - url = "http://www.jedsoft.org/releases/slang/${name}.tar.bz2"; + url = "https://www.jedsoft.org/releases/slang/${name}.tar.bz2"; sha256 = "06p379fqn6w38rdpqi98irxi2bf4llb0rja3dlgkqz7nqh7kp7pw"; }; diff --git a/pkgs/development/libraries/slib/default.nix b/pkgs/development/libraries/slib/default.nix index 233ba91d299a..665f025ffcf3 100644 --- a/pkgs/development/libraries/slib/default.nix +++ b/pkgs/development/libraries/slib/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "slib-3b5"; src = fetchurl { - url = "http://groups.csail.mit.edu/mac/ftpdir/scm/${name}.zip"; + url = "https://groups.csail.mit.edu/mac/ftpdir/scm/${name}.zip"; sha256 = "0q0p2d53p8qw2592yknzgy2y1p5a9k7ppjx0cfrbvk6242c4mdpq"; }; diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix index 17195febe133..1b5564dc1590 100644 --- a/pkgs/development/libraries/snack/default.nix +++ b/pkgs/development/libraries/snack/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "snack-2.2.10"; src = fetchurl { - url = http://www.speech.kth.se/snack/dist/snack2.2.10.tar.gz; + url = https://www.speech.kth.se/snack/dist/snack2.2.10.tar.gz; sha256 = "07p89jv9qnjqkszws9sssq93ayvwpdnkcxrvyicbm4mb8x2pdzjb"; }; diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix index 995ac631580d..207c6f2d30a1 100644 --- a/pkgs/development/libraries/sord/default.nix +++ b/pkgs/development/libraries/sord/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.16.0"; src = fetchurl { - url = "http://download.drobilla.net/${name}.tar.bz2"; + url = "https://download.drobilla.net/${name}.tar.bz2"; sha256 = "0nh3i867g9z4kdlnk82cg2kcw8r02qgifxvkycvzb4vfjv4v4g4x"; }; diff --git a/pkgs/development/libraries/soundtouch/default.nix b/pkgs/development/libraries/soundtouch/default.nix index c338d6762a4d..95a97f30b6e6 100644 --- a/pkgs/development/libraries/soundtouch/default.nix +++ b/pkgs/development/libraries/soundtouch/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pName = "soundtouch"; name = "${pName}-2.0.0"; src = fetchurl { - url = "http://www.surina.net/soundtouch/${name}.tar.gz"; + url = "https://www.surina.net/soundtouch/${name}.tar.gz"; sha256 = "09cxr02mfyj2bg731bj0i9hh565x8l9p91aclxs8wpqv8b8zf96j"; }; diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix index ea3013c78bcb..be2fc503e390 100644 --- a/pkgs/development/libraries/spandsp/default.nix +++ b/pkgs/development/libraries/spandsp/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "0.0.6"; name = "spandsp-${version}"; src=fetchurl { - url = "http://www.soft-switch.org/downloads/spandsp/spandsp-${version}.tar.gz"; + url = "https://www.soft-switch.org/downloads/spandsp/spandsp-${version}.tar.gz"; sha256 = "0rclrkyspzk575v8fslzjpgp4y2s4x7xk3r55ycvpi4agv33l1fc"; }; buildInputs = []; diff --git a/pkgs/development/libraries/spatialite-tools/default.nix b/pkgs/development/libraries/spatialite-tools/default.nix index ff461f1b8e64..9070423d8c76 100644 --- a/pkgs/development/libraries/spatialite-tools/default.nix +++ b/pkgs/development/libraries/spatialite-tools/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "spatialite-tools-4.1.1"; src = fetchurl { - url = "http://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/${name}.tar.gz"; + url = "https://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/${name}.tar.gz"; sha256 = "14aqmhvab63ydbb82fglsbig7jw1wmci8jjvci07aavdhvh1pyrv"; }; diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix index a96e808a97e4..c7f8787c1fda 100644 --- a/pkgs/development/libraries/speexdsp/default.nix +++ b/pkgs/development/libraries/speexdsp/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional stdenv.isAarch64 "--disable-neon"; meta = with stdenv.lib; { - homepage = http://www.speex.org/; + homepage = https://www.speex.org/; description = "An Open Source/Free Software patent-free audio compression format designed for speech"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 21359c4f0d0b..aeab43c889d6 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchurl { - url = "http://www.spice-space.org/download/gtk/${name}.tar.bz2"; + url = "https://www.spice-space.org/download/gtk/${name}.tar.bz2"; sha256 = "1vknp72pl6v6nf3dphhwp29hk6gv787db2pmyg4m312z2q0hwwp9"; }; diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix index 19b68a0c43de..fc337f22b56f 100644 --- a/pkgs/development/libraries/spice-protocol/default.nix +++ b/pkgs/development/libraries/spice-protocol/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "spice-protocol-0.12.14"; src = fetchurl { - url = "http://www.spice-space.org/download/releases/${name}.tar.bz2"; + url = "https://www.spice-space.org/download/releases/${name}.tar.bz2"; sha256 = "170ckpgazvqv7hxy209myg67pqnd6c0gvr4ysbqgsfch6320nd90"; }; diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index ee54ad555537..0b815f9095f9 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { name = "spice-0.14.0"; src = fetchurl { - url = "http://www.spice-space.org/download/releases/${name}.tar.bz2"; + url = "https://www.spice-space.org/download/releases/${name}.tar.bz2"; sha256 = "0j5q7cp5p95jk8fp48gz76rz96lifimdsx1wnpmfal0nnnar9nrs"; }; diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix index ce4fca6da70d..fc771a493b6d 100644 --- a/pkgs/development/libraries/startup-notification/default.nix +++ b/pkgs/development/libraries/startup-notification/default.nix @@ -6,7 +6,7 @@ in stdenv.mkDerivation { name = "libstartup-notification-${version}"; src = fetchurl { - url = "http://www.freedesktop.org/software/startup-notification/releases/startup-notification-${version}.tar.gz"; + url = "https://www.freedesktop.org/software/startup-notification/releases/startup-notification-${version}.tar.gz"; sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a"; }; diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix index 362881a2f42b..63060bf55533 100644 --- a/pkgs/development/libraries/strigi/default.nix +++ b/pkgs/development/libraries/strigi/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "0.7.8"; src = fetchurl { - url = "http://www.vandenoever.info/software/strigi/${name}.tar.bz2"; + url = "https://www.vandenoever.info/software/strigi/${name}.tar.bz2"; sha256 = "12grxzqwnvbyqw7q1gnz42lypadxmq89vk2qpxczmpmc4nk63r23"; }; diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix index 810420fe6b76..1759258e6664 100644 --- a/pkgs/development/libraries/swiften/default.nix +++ b/pkgs/development/libraries/swiften/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ openssl boost ]; src = fetchurl { - url = "http://swift.im/downloads/releases/swift-${version}/swift-${version}.tar.gz"; + url = "https://swift.im/downloads/releases/swift-${version}/swift-${version}.tar.gz"; sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w"; }; diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix index 13497f7727f4..0c3bb3b13064 100644 --- a/pkgs/development/libraries/sword/default.nix +++ b/pkgs/development/libraries/sword/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "1.7.4"; src = fetchurl { - url = "http://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/${name}.tar.gz"; + url = "https://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/${name}.tar.gz"; sha256 = "0g91kpfkwccvdikddffdbzd6glnp1gdvkx4vh04iyz10bb7shpcr"; }; diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index e8f0d61b2f4f..30d9a38a35df 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Hierarchical pool based memory allocator with destructors"; - homepage = http://tdb.samba.org/; + homepage = https://tdb.samba.org/; license = licenses.gpl3; maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index d372c61dbe28..dc3c2c157138 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { uses locking internally to keep writers from trampling on each other. TDB is also extremely small. ''; - homepage = http://tdb.samba.org/; + homepage = https://tdb.samba.org/; license = licenses.lgpl3Plus; maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix index 41308a7ef4ec..fae51aea477e 100644 --- a/pkgs/development/libraries/telepathy/farstream/default.nix +++ b/pkgs/development/libraries/telepathy/farstream/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "telepathy-farstream"; src = fetchurl { - url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; + url = "https://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; sha256 = "02ky12bb92prr5f6xmvmfq4yz2lj33li6nj4829a98hk5pr9k83g"; }; diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index df5c76abd7cd..9ca2481c3b01 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { passthru.python = python2; meta = { - homepage = http://telepathy.freedesktop.org; + homepage = https://telepathy.freedesktop.org; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index 90dd47c11e2f..24dc3667d172 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -7,7 +7,7 @@ in stdenv.mkDerivation rec { name = "telepathy-qt-0.9.7"; src = fetchurl { - url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz"; + url = "https://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz"; sha256 = "0krxd4hhfx6r0ja19wh3848j7gn1rv8jrnakgmkbmi7bww5x7fi1"; }; diff --git a/pkgs/development/libraries/tepl/default.nix b/pkgs/development/libraries/tepl/default.nix new file mode 100644 index 000000000000..12f953b1aa8d --- /dev/null +++ b/pkgs/development/libraries/tepl/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl +, amtk, gnome3, gtksourceview4, libuchardet, libxml2, pkgconfig }: +let + version = "4.1.1"; + pname = "tepl"; +in stdenv.mkDerivation { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "13kflywpc6iyfpc9baaa54in5vzn4p7i3dh9pr2ival2nkxfnkp2"; + }; + + nativeBuildInputs = [ + pkgconfig + ]; + + buildInputs = [ + amtk + libxml2 + gtksourceview4 + libuchardet + gnome3.gtk + ]; + + doCheck = false; + # TODO: one test fails because of + # (./test-file-metadata:20931): Tepl-WARNING **: 14:41:36.942: GVfs metadata + # is not supported. Fallback to TeplMetadataManager. Either GVfs is not + # correctly installed or GVfs metadata are not supported on this platform. In + # the latter case, you should configure Tepl with --disable-gvfs-metadata. + + passthru.updateScript = gnome3.updateScript { packageName = pname; }; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Projects/Tepl; + description = "Text editor product line"; + maintainers = [ maintainers.manveru ]; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index 154db61894fa..12576eed14ce 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An event system based on the talloc memory management library"; - homepage = http://tevent.samba.org/; + homepage = https://tevent.samba.org/; license = licenses.lgpl3Plus; maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index 45e5174ed573..cb200b82e207 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "0.11.0"; src = fetchurl { - url = "http://archive.apache.org/dist/thrift/${version}/${name}.tar.gz"; + url = "https://archive.apache.org/dist/thrift/${version}/${name}.tar.gz"; sha256 = "1hk0zb9289gf920rdl0clmwqx6kvygz92nj01lqrhd2arfv3ibf4"; }; diff --git a/pkgs/development/libraries/tre/default.nix b/pkgs/development/libraries/tre/default.nix index 25d7849b1b4b..12f7e4c765d2 100644 --- a/pkgs/development/libraries/tre/default.nix +++ b/pkgs/development/libraries/tre/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "tre-0.8.0"; src = fetchurl { - url = "http://laurikari.net/tre/${name}.tar.gz"; + url = "https://laurikari.net/tre/${name}.tar.gz"; sha256 = "1pd7qsa7vc3ybdc6h2gr4pm9inypjysf92kab945gg4qa6jp11my"; }; diff --git a/pkgs/development/libraries/ucl/default.nix b/pkgs/development/libraries/ucl/default.nix index aa983b1394b1..933a3afef35b 100644 --- a/pkgs/development/libraries/ucl/default.nix +++ b/pkgs/development/libraries/ucl/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "ucl-1.03"; src = fetchurl { - url = http://www.oberhumer.com/opensource/ucl/download/ucl-1.03.tar.gz; + url = https://www.oberhumer.com/opensource/ucl/download/ucl-1.03.tar.gz; sha256 = "b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348"; }; diff --git a/pkgs/development/libraries/unicap/default.nix b/pkgs/development/libraries/unicap/default.nix index 604a1b7012af..1aa5e6717021 100644 --- a/pkgs/development/libraries/unicap/default.nix +++ b/pkgs/development/libraries/unicap/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version="0.9.12"; src = fetchurl { - url = "http://www.unicap-imaging.org/downloads/${name}.tar.gz"; + url = "https://www.unicap-imaging.org/downloads/${name}.tar.gz"; sha256 = "05zcnnm4dfc6idihfi0fq5xka6x86zi89wip2ca19yz768sd33s9"; }; diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index 515c3b2ca3b9..25ddfb355241 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.7.1"; src = fetchurl { - url = "http://spice-space.org/download/usbredir/${name}.tar.bz2"; + url = "https://spice-space.org/download/usbredir/${name}.tar.bz2"; sha256 = "1wsnmk4wjpdhbn1zaxg6bmyxspcki2zgy0am9lk037rnl4krwzj0"; }; diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix index 013af68cb6c4..07ca9d2e62e1 100644 --- a/pkgs/development/libraries/vaapi-vdpau/default.nix +++ b/pkgs/development/libraries/vaapi-vdpau/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { name = "libva-vdpau-driver-0.7.4"; src = fetchurl { - url = "http://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/${name}.tar.bz2"; + url = "https://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/${name}.tar.bz2"; sha256 = "1fcvgshzyc50yb8qqm6v6wn23ghimay23ci0p8sm8gxcy211jp0m"; }; diff --git a/pkgs/development/libraries/vo-amrwbenc/default.nix b/pkgs/development/libraries/vo-amrwbenc/default.nix index ba6e437ca3c3..9e4ac7e22ca9 100644 --- a/pkgs/development/libraries/vo-amrwbenc/default.nix +++ b/pkgs/development/libraries/vo-amrwbenc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; meta = { - homepage = "http://sourceforge.net/projects/opencore-amr/"; + homepage = https://sourceforge.net/projects/opencore-amr/; description = "VisualOn Adaptive Multi Rate Wideband (AMR-WB) encoder"; license = "stdenv.lib.licenses.apache"; maintainers = [ stdenv.lib.maintainers.Esteth ]; diff --git a/pkgs/development/libraries/vsqlite/default.nix b/pkgs/development/libraries/vsqlite/default.nix index bfb07c2df337..e706c730ddd3 100644 --- a/pkgs/development/libraries/vsqlite/default.nix +++ b/pkgs/development/libraries/vsqlite/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.3.13"; src = fetchurl { - url = "http://evilissimo.fedorapeople.org/releases/vsqlite--/0.3.13/vsqlite++-${version}.tar.gz"; + url = "https://evilissimo.fedorapeople.org/releases/vsqlite--/0.3.13/vsqlite++-${version}.tar.gz"; sha256 = "17fkj0d2jh0xkjpcayhs1xvbnh1d69f026i7vs1zqnbiwbkpz237"; }; diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix new file mode 100644 index 000000000000..797c64729ecf --- /dev/null +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, cmake }: +stdenv.mkDerivation rec { + name = "vulkan-headers-${version}"; + version = "1.1.77.0"; + + buildInputs = [ cmake ]; + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "Vulkan-Headers"; + rev = "sdk-${version}"; + sha256 = "1k01y5cj154mw7853w5xh135b2jp6k83kzwknw0dbs5adj4dx0kf"; + }; + + meta = with stdenv.lib; { + description = "Vulkan Header files and API registry"; + homepage = "http://www.lunarg.com"; + platforms = platforms.linux; + license = licenses.asl20; + maintainers = [ maintainers.ralith ]; + }; +} diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 0d3bfd4379fe..4b84f696eec6 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,71 +1,36 @@ -{ stdenv, fetchgit, fetchFromGitHub, cmake, pkgconfig, git, python3, - python3Packages, glslang, spirv-tools, x11, libxcb, libXrandr, - libXext, wayland, libGL_driver, makeWrapper }: - -let - version = "1.1.70.0"; - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "Vulkan-LoaderAndValidationLayers"; - rev = "sdk-${version}"; - sha256 = "1a7xwl65bi03l4zbjq54qkxjb8kb4m78qvw8bas5alhf9v6i6yqp"; - }; -in - +{ stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig, + x11, libxcb, libXrandr, libXext, wayland, libGL_driver }: +let version = "1.1.77.0"; in +assert version == vulkan-headers.version; stdenv.mkDerivation rec { name = "vulkan-loader-${version}"; - inherit version src; + inherit version; - nativeBuildInputs = [ makeWrapper pkgconfig ]; - buildInputs = [ cmake git python3 python3Packages.lxml - glslang x11 libxcb libXrandr libXext wayland - ]; + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "Vulkan-Loader"; + rev = "sdk-${version}"; + sha256 = "1nzzkqh0i3j1d3h7kgmaxzi748l338m2p31lxkwxm4y81xp56a94"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake python3 x11 libxcb libXrandr libXext wayland ]; enableParallelBuilding = true; cmakeFlags = [ - "-DBUILD_WSI_MIR_SUPPORT=OFF" "-DFALLBACK_DATA_DIRS=${libGL_driver.driverLink}/share:/usr/local/share:/usr/share" + "-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}" ]; - outputs = [ "out" "dev" "demos" ]; - patches = [ ./rev-file.patch ]; + outputs = [ "out" "dev" ]; - postUnpack = '' - # Hack so a version header can be generated. Relies on ./rev-file.patch to work. - mkdir -p "$sourceRoot/external/glslang/External" - echo "${spirv-tools.src.rev}" > "$sourceRoot/external/glslang/External/spirv-tools" - ''; - - preConfigure = '' - checkRev() { - [ "$2" = $(cat "external_revisions/$1_revision") ] || (echo "ERROR: dependency $1 is revision $2 but should be revision" $(cat "external_revisions/$1_revision") && exit 1) - } - checkRev glslang "${glslang.src.rev}" - ''; - - installPhase = '' - mkdir -p $out/lib $out/bin - cp -d loader/libvulkan.so* $out/lib - cp demos/vulkaninfo $out/bin - mkdir -p $out/etc/vulkan/explicit_layer.d - ln -s $out/etc $out/share - cp -L layers/*.so $out/lib/ - cp -L layers/*.json $out/etc/vulkan/explicit_layer.d/ - sed -i "s:\\./lib:$out/lib/lib:g" "$out/etc/vulkan/"*/*.json - mkdir -p $dev/include - cp -rv ../include $dev/ - mkdir -p $demos/share/vulkan-demos - cp demos/*.spv demos/*.ppm $demos/share/vulkan-demos - mkdir -p $demos/bin - find demos -type f -executable -not -name vulkaninfo -exec cp -v {} $demos/bin \; - for p in cube cubepp; do - wrapProgram $demos/bin/$p --run "cd $demos/share/vulkan-demos" - done + postInstall = '' + cp -r "${vulkan-headers}/include" "$dev" ''; meta = with stdenv.lib; { description = "LunarG Vulkan loader"; - homepage = "http://www.lunarg.com"; + homepage = https://www.lunarg.com; platforms = platforms.linux; license = licenses.asl20; maintainers = [ maintainers.ralith ]; diff --git a/pkgs/development/libraries/vulkan-loader/rev-file.patch b/pkgs/development/libraries/vulkan-loader/rev-file.patch deleted file mode 100644 index e8f9f92c8ead..000000000000 --- a/pkgs/development/libraries/vulkan-loader/rev-file.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c9f73ce96..d14ffeed9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -339,13 +339,13 @@ macro(run_vk_xml_generate dependency output) - endmacro() - - # Define macro used for generating header files containing commit IDs for external dependencies --macro(run_external_revision_generate source_dir symbol_name output) -+macro(run_external_revision_generate rev_file symbol_name output) - add_custom_command(OUTPUT ${output} - # NOTE: If you modify this call to use --rev_file instead of --git_dir (to read the commit ID from a file instead of - # parsing from a Git repository), you probably also want to add the revision file to the list of DEPENDS on the - # subsequent line (to ensure that the script is re-run when the revision file is modified). -- COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/external_revision_generator.py --git_dir ${source_dir} -s ${symbol_name} -o ${output} -- DEPENDS ${SCRIPTS_DIR}/external_revision_generator.py ${source_dir}/.git/HEAD ${source_dir}/.git/index -+ COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/external_revision_generator.py --rev_file ${rev_file} -s ${symbol_name} -o ${output} -+ DEPENDS ${SCRIPTS_DIR}/external_revision_generator.py ${rev_file} - ) - endmacro() - diff --git a/pkgs/development/libraries/wayland/1.9.nix b/pkgs/development/libraries/wayland/1.9.nix index 4c6d95e67c0f..d832becbed88 100644 --- a/pkgs/development/libraries/wayland/1.9.nix +++ b/pkgs/development/libraries/wayland/1.9.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "1.9.0"; src = fetchurl { - url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; + url = "https://wayland.freedesktop.org/releases/${name}.tar.xz"; sha256 = "1yhy62vkbq8j8c9zaa6yzvn75cd99kfa8n2zfdwl80x019r711ww"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Reference implementation of the wayland protocol"; - homepage = http://wayland.freedesktop.org/; + homepage = https://wayland.freedesktop.org/; license = lib.licenses.mit; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ codyopel wkennington ]; diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index c1065b20e6b4..33bce4d6216f 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "1.14"; src = fetchurl { - url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; + url = "https://wayland.freedesktop.org/releases/${name}.tar.xz"; sha256 = "1xknjcfhqvdi1s4iq4kk1q61fg2rar3g8q4vlqarpd324imqjj4n"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Wayland protocol extensions"; - homepage = http://wayland.freedesktop.org/; + homepage = https://wayland.freedesktop.org/; license = lib.licenses.mit; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ ]; diff --git a/pkgs/development/libraries/webkitgtk/2.20.nix b/pkgs/development/libraries/webkitgtk/2.20.nix index d3fffa2dd32f..e234e3e66ad9 100644 --- a/pkgs/development/libraries/webkitgtk/2.20.nix +++ b/pkgs/development/libraries/webkitgtk/2.20.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "http://webkitgtk.org/releases/${name}.tar.xz"; + url = "https://webkitgtk.org/releases/${name}.tar.xz"; sha256 = "1n0dy94bm7wvxln4jis1gp8plv8n4a01g41724zsf5psg1yk16sp"; }; diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix index 39a76a74711f..1a17ae53313b 100644 --- a/pkgs/development/libraries/webkitgtk/2.4.nix +++ b/pkgs/development/libraries/webkitgtk/2.4.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "http://webkitgtk.org/releases/${name}.tar.xz"; + url = "https://webkitgtk.org/releases/${name}.tar.xz"; sha256 = "1xsvnvyvlywwyf6m9ainpsg87jkxjmd37q6zgz9cxb7v3c2ym2jq"; }; diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index 529091518eb6..056ab8c51387 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "webrtc-audio-processing-0.3"; src = fetchurl { - url = "http://freedesktop.org/software/pulseaudio/webrtc-audio-processing/${name}.tar.xz"; + url = "https://freedesktop.org/software/pulseaudio/webrtc-audio-processing/${name}.tar.xz"; sha256 = "1yl0187xjh1j2zkb7v9cs9i868zcaj23pzn4a36qhzam9wfjjvkm"; }; diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 06ed123c7356..276f509772c2 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "x264-${version}"; src = fetchurl { - url = "http://download.videolan.org/x264/snapshots/x264-snapshot-${version}-stable.tar.bz2"; + url = "https://download.videolan.org/x264/snapshots/x264-snapshot-${version}-stable.tar.bz2"; sha256 = "01sgk1ps4qfifdnblwa3fxnd8ah6n6zbmfc1sy09cgqcdgzxgj0z"; }; diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 482c765dcda9..5dd81af2b1af 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -7,7 +7,7 @@ let passthru = { inherit version; }; src = fetchurl { - url = "http://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz"; + url = "https://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz"; inherit sha256; }; diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix index 09c2171945e4..1203f19d6c82 100644 --- a/pkgs/development/libraries/xapian/tools/omega/default.nix +++ b/pkgs/development/libraries/xapian/tools/omega/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { inherit (xapian) version; src = fetchurl { - url = "http://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz"; + url = "https://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz"; sha256 = "0zji8ckp4h5xdy2wbir3lvk680w1g1l4h5swmaxsx7ah12lkrjcr"; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Indexer and CGI search front-end built on Xapian library"; - homepage = http://xapian.org/; + homepage = https://xapian.org/; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/development/libraries/xml-security-c/default.nix index bbbf9af29e58..fec4bbe8efe2 100644 --- a/pkgs/development/libraries/xml-security-c/default.nix +++ b/pkgs/development/libraries/xml-security-c/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.7.3"; src = fetchurl { - url = "http://www.apache.org/dist/santuario/c-library/${name}.tar.gz"; + url = "https://www.apache.org/dist/santuario/c-library/${name}.tar.gz"; sha256 = "e5226e7319d44f6fd9147a13fb853f5c711b9e75bf60ec273a0ef8a190592583"; }; diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index e17ac6d15075..94f1d187267e 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "xmlsec-${version}"; src = fetchurl { - url = "http://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; + url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; sha256 = "0l1dk344rn3j2vnj13daz72xd8j1msvzhg82n2il5ji0qz4pd0ld"; }; diff --git a/pkgs/development/libraries/xsd/default.nix b/pkgs/development/libraries/xsd/default.nix index bef2e46e0736..051a194af98e 100644 --- a/pkgs/development/libraries/xsd/default.nix +++ b/pkgs/development/libraries/xsd/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "4.0.0"; src = fetchurl { - url = "http://codesynthesis.com/download/xsd/4.0/xsd-4.0.0+dep.tar.bz2"; + url = "https://codesynthesis.com/download/xsd/4.0/xsd-4.0.0+dep.tar.bz2"; sha256 = "05wqhmd5cd4pdky8i8qysnh96d2h16ly8r73whmbxkajiyf2m9gc"; }; diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index de2e0b62f9e2..b8537896d791 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = - [ "http://www.zlib.net/fossils/${name}.tar.gz" # stable archive path + [ "https://www.zlib.net/fossils/${name}.tar.gz" # stable archive path "mirror://sourceforge/libpng/zlib/${version}/${name}.tar.gz" ]; sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1"; diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix index 84020a5ac2d5..7da0fc148d42 100644 --- a/pkgs/development/misc/amdapp-sdk/default.nix +++ b/pkgs/development/misc/amdapp-sdk/default.nix @@ -26,7 +26,7 @@ let }; "2.8" = { - url = "http://developer.amd.com/wordpress/media/2012/11/AMD-APP-SDK-v2.8-lnx${bits}.tgz"; + url = "https://developer.amd.com/wordpress/media/2012/11/AMD-APP-SDK-v2.8-lnx${bits}.tgz"; x86 = "99610737f21b2f035e0eac4c9e776446cc4378a614c7667de03a82904ab2d356"; x86_64 = "d9c120367225bb1cd21abbcf77cb0a69cfb4bb6932d0572990104c566aab9681"; diff --git a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix index 5c42f7bc3289..0f43705c0d42 100644 --- a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix +++ b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix @@ -58,13 +58,19 @@ rec { binutils = wrapBintoolsWith { bintools = binaries; libc = targetAndroidndkPkgs.libraries; + extraBuildCommands = '' + echo "--build-id" >> $out/nix-support/libc-ldflags + ''; }; gcc = wrapCCWith { cc = binaries; bintools = binutils; libc = targetAndroidndkPkgs.libraries; - extraBuildCommands = lib.optionalString targetPlatform.isAarch32 (let + extraBuildCommands = '' + echo "-D__ANDROID_API__=${targetPlatform.sdkVer}" >> $out/nix-support/cc-cflags + '' + + lib.optionalString targetPlatform.isAarch32 (let p = targetPlatform.platform.gcc or {} // targetPlatform.parsed.abi; flags = lib.concatLists [ diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index 150d8d758699..1e8ea65c73d9 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -1,6 +1,9 @@ { stdenv, fetchurl, zlib, ncurses5, unzip, lib, makeWrapper , coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which , platformTools, python3, libcxx, version, sha256 +, fullNDK ? false # set to true if you want other parts of the NDK + # that is not used by Nixpkgs like sources, + # examples, docs, or LLVM toolchains }: stdenv.mkDerivation rec { @@ -55,11 +58,14 @@ stdenv.mkDerivation rec { } cd ${pkg_path} + '' + lib.optionalString (!fullNDK) '' # Steps to reduce output size rm -rf docs sources tests # We only support cross compiling with gcc for now rm -rf toolchains/*-clang* toolchains/llvm* + '' + + '' find ${pkg_path}/toolchains \( \ \( -type f -a -name "*.so*" \) -o \ \( -type f -a -perm -0100 \) \ diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix index 44fa961b992f..3c12e16277d9 100644 --- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix +++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix @@ -1,6 +1,9 @@ { stdenv, fetchurl, zlib, ncurses, lib, makeWrapper , coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which , platformTools +, fullNDK ? false # set to true if you want other parts of the NDK + # that is not used by Nixpkgs like sources, + # examples, docs, or LLVM toolchains }: stdenv.mkDerivation rec { @@ -49,11 +52,13 @@ stdenv.mkDerivation rec { -d $out/libexec/${name} < ${ ./make-standalone-toolchain_r8e.patch } cd ${pkg_path} + '' + lib.optionalString (!fullNDK) '' # Steps to reduce output size rm -rf docs sources tests # We only support cross compiling with gcc for now rm -rf toolchains/*-clang* toolchains/llvm-* + '' + '' find ${pkg_path}/toolchains \( \ \( -type f -a -name "*.so*" \) -o \ \( -type f -a -perm -0100 \) \ diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index a90c9f8476e3..8d9f87b6d079 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = "http://dl.google.com/android/repository/tools_r${version}-linux.zip"; + url = "https://dl.google.com/android/repository/tools_r${version}-linux.zip"; sha256 = "0gnk49pkwy4m0nqwm1xnf3w4mfpi9w0kk7841xlawpwbkj0icxap"; } else if stdenv.system == "x86_64-darwin" then fetchurl { diff --git a/pkgs/development/mobile/androidenv/build-gradle-app.nix b/pkgs/development/mobile/androidenv/build-gradle-app.nix index 1ca51fae1c29..d6a391463246 100644 --- a/pkgs/development/mobile/androidenv/build-gradle-app.nix +++ b/pkgs/development/mobile/androidenv/build-gradle-app.nix @@ -101,4 +101,8 @@ stdenv.mkDerivation ({ mkdir -p $out/nix-support echo "file binary-dist \"$(echo $out/*.apk)\"" > $out/nix-support/hydra-build-products ''; + + meta = { + license = stdenv.lib.licenses.unfree; + }; } // builtins.removeAttrs args ["name" "mavenDeps"]) diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix index 2252bab3a793..ce42bfa7ba3d 100644 --- a/pkgs/development/node-packages/composition-v6.nix +++ b/pkgs/development/node-packages/composition-v6.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.3. Do not edit! +# This file has been generated by node2nix 1.6.0. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/development/node-packages/composition-v8.nix b/pkgs/development/node-packages/composition-v8.nix index 96266105942d..7ca3e6b925a2 100644 --- a/pkgs/development/node-packages/composition-v8.nix +++ b/pkgs/development/node-packages/composition-v8.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.3. Do not edit! +# This file has been generated by node2nix 1.6.0. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix index 97f759ef0cbe..6b508b6f0cce 100644 --- a/pkgs/development/node-packages/default-v6.nix +++ b/pkgs/development/node-packages/default-v6.nix @@ -6,27 +6,27 @@ let }; in nodePackages // { - dat = nodePackages.dat.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-gyp-build ]; - }); + dat = nodePackages.dat.override { + buildInputs = [ nodePackages.node-gyp-build ]; + }; - dnschain = nodePackages.dnschain.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper nodePackages.coffee-script ]; + dnschain = nodePackages.dnschain.override { + buildInputs = [ pkgs.makeWrapper nodePackages.coffee-script ]; postInstall = '' wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin ''; - }); + }; - node-inspector = nodePackages.node-inspector.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ]; - }); + node-inspector = nodePackages.node-inspector.override { + buildInputs = [ nodePackages.node-pre-gyp ]; + }; - phantomjs = nodePackages.phantomjs.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; - }); + phantomjs = nodePackages.phantomjs.override { + buildInputs = [ pkgs.phantomjs2 ]; + }; - webdrvr = nodePackages.webdrvr.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ]; + webdrvr = nodePackages.webdrvr.override { + buildInputs = [ pkgs.phantomjs ]; preRebuild = '' mkdir $TMPDIR/webdrvr @@ -42,42 +42,42 @@ nodePackages // { ''; dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this. - }); + }; npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override { postInstall = "npm run-script prepublish"; }; - bower2nix = nodePackages.bower2nix.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; + bower2nix = nodePackages.bower2nix.override { + buildInputs = [ pkgs.makeWrapper ]; postInstall = '' for prog in bower2nix fetch-bower; do wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]} done ''; - }); + }; - ios-deploy = nodePackages.ios-deploy.override (oldAttrs: { + ios-deploy = nodePackages.ios-deploy.override { preRebuild = '' LD=$CC tmp=$(mktemp -d) ln -s /usr/bin/xcodebuild $tmp export PATH="$PATH:$tmp" ''; - }); + }; - fast-cli = nodePackages."fast-cli-1.x".override (oldAttrs: { + fast-cli = nodePackages."fast-cli-1.x".override { preRebuild = '' # Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore sed -i -e "s|console.error('Error verifying phantomjs, continuing', err)|console.error('Error verifying phantomjs, continuing', err); return true;|" node_modules/phantomjs-prebuilt/lib/util.js ''; - buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; - }); + buildInputs = [ pkgs.phantomjs2 ]; + }; - node2nix = nodePackages.node2nix.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; + node2nix = nodePackages.node2nix.override { + buildInputs = [ pkgs.makeWrapper ]; postInstall = '' wrapProgram "$out/bin/node2nix" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nix ]} ''; - }); + }; } diff --git a/pkgs/development/node-packages/default-v8.nix b/pkgs/development/node-packages/default-v8.nix index eb87f13f56d3..561f43271ffc 100644 --- a/pkgs/development/node-packages/default-v8.nix +++ b/pkgs/development/node-packages/default-v8.nix @@ -6,27 +6,27 @@ let }; in nodePackages // { - dat = nodePackages.dat.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-gyp-build ]; - }); + dat = nodePackages.dat.override { + buildInputs = [ nodePackages.node-gyp-build ]; + }; - dnschain = nodePackages.dnschain.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper nodePackages.coffee-script ]; + dnschain = nodePackages.dnschain.override { + buildInputs = [ pkgs.makeWrapper nodePackages.coffee-script ]; postInstall = '' wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin ''; - }); + }; - node-inspector = nodePackages.node-inspector.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ]; - }); + node-inspector = nodePackages.node-inspector.override { + buildInputs = [ nodePackages.node-pre-gyp ]; + }; - phantomjs = nodePackages.phantomjs.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; - }); + phantomjs = nodePackages.phantomjs.override { + buildInputs = [ pkgs.phantomjs2 ]; + }; - webdrvr = nodePackages.webdrvr.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ]; + webdrvr = nodePackages.webdrvr.override { + buildInputs = [ pkgs.phantomjs ]; preRebuild = '' mkdir $TMPDIR/webdrvr @@ -42,32 +42,32 @@ nodePackages // { ''; dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this. - }); + }; npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override { postInstall = "npm run-script prepublish"; }; - bower2nix = nodePackages.bower2nix.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; + bower2nix = nodePackages.bower2nix.override { + buildInputs = [ pkgs.makeWrapper ]; postInstall = '' for prog in bower2nix fetch-bower; do wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]} done ''; - }); + }; - ios-deploy = nodePackages.ios-deploy.override (oldAttrs: { + ios-deploy = nodePackages.ios-deploy.override { preRebuild = '' LD=$CC tmp=$(mktemp -d) ln -s /usr/bin/xcodebuild $tmp export PATH="$PATH:$tmp" ''; - }); + }; - pnpm = nodePackages.pnpm.override (oldAttrs: { - nativeBuildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; + pnpm = nodePackages.pnpm.override { + nativeBuildInputs = [ pkgs.makeWrapper ]; postInstall = let pnpmLibPath = stdenv.lib.makeBinPath [ nodejs.passthru.python @@ -78,13 +78,13 @@ nodePackages // { wrapProgram "$prog" --prefix PATH : ${pnpmLibPath} done ''; - }); + }; - fast-cli = nodePackages."fast-cli-1.x".override (oldAttrs: { + fast-cli = nodePackages."fast-cli-1.x".override { preRebuild = '' # Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore sed -i -e "s|console.error('Error verifying phantomjs, continuing', err)|console.error('Error verifying phantomjs, continuing', err); return true;|" node_modules/phantomjs-prebuilt/lib/util.js ''; - buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; - }); + buildInputs = [ pkgs.phantomjs2 ]; + }; } diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index fc118a788ea7..720e0cc08503 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -27,7 +27,7 @@ let buildInputs = [ nodejs ]; buildPhase = '' export HOME=$TMPDIR - tgzFile=$(npm pack) + tgzFile=$(npm pack | tail -n 1) # Hooks to the pack command will add output (https://docs.npmjs.com/misc/scripts) ''; installPhase = '' mkdir -p $out/tarballs @@ -309,31 +309,42 @@ let }; # Builds and composes an NPM package including all its dependencies - buildNodePackage = { name, packageName, version, dependencies ? [], production ? true, npmFlags ? "", dontNpmInstall ? false, bypassCache ? false, preRebuild ? "", ... }@args: + buildNodePackage = + { name + , packageName + , version + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , preRebuild ? "" + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: let forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; in - stdenv.lib.makeOverridable stdenv.mkDerivation (builtins.removeAttrs args [ "dependencies" ] // { + stdenv.mkDerivation ({ name = "node-${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ stdenv.lib.optional (stdenv.isDarwin) libtool - ++ args.buildInputs or []; - dontStrip = args.dontStrip or true; # Striping may fail a build for some package deployments + ++ buildInputs; - inherit dontNpmInstall preRebuild; - - unpackPhase = args.unpackPhase or "true"; - - buildPhase = args.buildPhase or "true"; + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall preRebuild unpackPhase buildPhase; compositionScript = composePackage args; pinpointDependenciesScript = pinpointDependenciesOfPackage args; passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; - installPhase = args.installPhase or '' + installPhase = '' # Create and enter a root node_modules/ folder mkdir -p $out/lib/node_modules cd $out/lib/node_modules @@ -406,27 +417,47 @@ let # Run post install hook, if provided runHook postInstall ''; - }); + } // extraArgs); # Builds a development shell - buildNodeShell = { name, packageName, version, src, dependencies ? [], production ? true, npmFlags ? "", dontNpmInstall ? false, bypassCache ? false, ... }@args: + buildNodeShell = + { name + , packageName + , version + , src + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + let forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; - nodeDependencies = stdenv.mkDerivation { + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; + + nodeDependencies = stdenv.mkDerivation ({ name = "node-dependencies-${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ stdenv.lib.optional (stdenv.isDarwin) libtool - ++ args.buildInputs or []; + ++ buildInputs; + + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall unpackPhase buildPhase; includeScript = includeDependencies { inherit dependencies; }; pinpointDependenciesScript = pinpointDependenciesOfPackage args; passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; - buildCommand = '' + installPhase = '' mkdir -p $out/${packageName} cd $out/${packageName} @@ -438,13 +469,15 @@ let ${stdenv.lib.optionalString bypassCache '' if [ -f ${src}/package-lock.json ] then - cp ${src}/package-lock.json . + cp ${src}/package-lock.json . fi ''} # Pinpoint the versions of all dependencies to the ones that are actually being used echo "pinpointing versions of dependencies..." cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + source $pinpointDependenciesScriptPath cd ${packageName} @@ -474,15 +507,17 @@ let ''} cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + mv ${packageName} lib ln -s $out/lib/node_modules/.bin $out/bin ''; - }; + } // extraArgs); in - stdenv.lib.makeOverridable stdenv.mkDerivation { + stdenv.mkDerivation { name = "node-shell-${name}-${version}"; - buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or []; + buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs; buildCommand = '' mkdir -p $out/bin cat > $out/bin/shell <=1.15.0'," "" \ + --replace "'setuptools_scm_git_archive>=1.0'," "" \ + ''; checkPhase = '' py.test cheroot diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 368111b3651f..47aca123998f 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -2,6 +2,7 @@ , cheroot, portend, routes, six , setuptools_scm , backports_unittest-mock, objgraph, pathpy, pytest, pytestcov +, backports_functools_lru_cache, requests_toolbelt }: buildPythonPackage rec { @@ -17,7 +18,7 @@ buildPythonPackage rec { buildInputs = [ setuptools_scm ]; - checkInputs = [ backports_unittest-mock objgraph pathpy pytest pytestcov ]; + checkInputs = [ backports_unittest-mock objgraph pathpy pytest pytestcov backports_functools_lru_cache requests_toolbelt ]; checkPhase = '' LANG=en_US.UTF-8 pytest diff --git a/pkgs/development/python-modules/docker_compose/default.nix b/pkgs/development/python-modules/docker_compose/default.nix index a739c341b62d..80a3a6d949c6 100644 --- a/pkgs/development/python-modules/docker_compose/default.nix +++ b/pkgs/development/python-modules/docker_compose/default.nix @@ -6,12 +6,12 @@ , enum34, functools32, }: buildPythonApplication rec { - version = "1.20.1"; + version = "1.21.2"; pname = "docker-compose"; src = fetchPypi { inherit pname version; - sha256 = "34c043ebd4c23e4b864812c16b41dad25cec6b675557b180ced52d372e1a9e66"; + sha256 = "0b0wihlyk89y6n0mly2vbljzqai1hhs6yzplskwdah2lfn9p3c38"; }; # lots of networking and other fails diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 3001b687556b..61b1d0d1cd98 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Simple Python implementation of the Git file formats and protocols"; - homepage = http://samba.org/~jelmer/dulwich/; + homepage = https://samba.org/~jelmer/dulwich/; license = licenses.gpl2Plus; maintainers = with maintainers; [ koral ]; }; diff --git a/pkgs/development/python-modules/flask-autoindex/default.nix b/pkgs/development/python-modules/flask-autoindex/default.nix index 397d1e03ee82..95e457de81d3 100644 --- a/pkgs/development/python-modules/flask-autoindex/default.nix +++ b/pkgs/development/python-modules/flask-autoindex/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { ''; license = licenses.bsd2; maintainers = with maintainers; [ timokau ]; - homepage = http://pythonhosted.org/Flask-AutoIndex/; + homepage = https://pythonhosted.org/Flask-AutoIndex/; }; } diff --git a/pkgs/development/python-modules/flask-caching/default.nix b/pkgs/development/python-modules/flask-caching/default.nix new file mode 100644 index 000000000000..84f549231ce6 --- /dev/null +++ b/pkgs/development/python-modules/flask-caching/default.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonPackage, fetchPypi, flask, pytest, pytestcov }: + +buildPythonPackage rec { + pname = "Flask-Caching"; + version = "1.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "e34f24631ba240e09fe6241e1bf652863e0cff06a1a94598e23be526bc2e4985"; + }; + + propagatedBuildInputs = [ flask ]; + + checkInputs = [ pytest pytestcov ]; + + checkPhase = '' + py.test + ''; + + # https://github.com/sh4nks/flask-caching/pull/74 + doCheck = false; + + meta = with lib; { + description = "Adds caching support to your Flask application"; + homepage = https://github.com/sh4nks/flask-caching; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/flask-common/default.nix b/pkgs/development/python-modules/flask-common/default.nix index 05a728d78cb5..05385e08d05e 100644 --- a/pkgs/development/python-modules/flask-common/default.nix +++ b/pkgs/development/python-modules/flask-common/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchPypi, buildPythonPackage -, crayons, flask, flask_cache, gunicorn, maya, meinheld, whitenoise }: +, crayons, flask, flask-caching, gunicorn, maya, meinheld, whitenoise }: buildPythonPackage rec { pname = "Flask-Common"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "13d99f2dbc0a332b8bc4b2cc394d3e48f89672c266868e372cd9d7b433d921a9"; }; - propagatedBuildInputs = [ crayons flask flask_cache gunicorn maya meinheld whitenoise ]; + propagatedBuildInputs = [ crayons flask flask-caching gunicorn maya meinheld whitenoise ]; meta = with stdenv.lib; { description = "Flask extension with lots of common time-savers"; diff --git a/pkgs/development/python-modules/flask-restful/default.nix b/pkgs/development/python-modules/flask-restful/default.nix index 579289fc7b58..a57823a09872 100644 --- a/pkgs/development/python-modules/flask-restful/default.nix +++ b/pkgs/development/python-modules/flask-restful/default.nix @@ -16,6 +16,10 @@ buildPythonPackage rec { patchPhase = if isPy3k then '' rm tests/test_crypto.py tests/test_paging.py '' else null; +# Disable test broken with aniso > 3.0.0, can be removed when updating to a flask-restful version with commit 54979f0 + preCheck = '' + substituteInPlace "./tests/test_inputs.py" --replace "test_bad_isointervals" "disabled_bad_isointervals" + ''; buildInputs = [ nose mock blinker ]; propagatedBuildInputs = [ flask six pytz aniso8601 pycrypto ]; PYTHON_EGG_CACHE = "`pwd`/.egg-cache"; diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index e75b04e97923..94b9861daa97 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "Hierarchical Density-Based Spatial Clustering of Applications with Noise, a clustering algorithm with a scikit-learn compatible API"; - homepage = http://github.com/scikit-learn-contrib/hdbscan; + homepage = https://github.com/scikit-learn-contrib/hdbscan; license = licenses.bsd3; maintainers = with maintainers; [ ixxie ]; }; diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index c24a5fa77bfe..65d1f4f68220 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = { description = "Lightweight pipelining: using Python functions as pipeline jobs"; - homepage = http://pythonhosted.org/joblib/; + homepage = https://pythonhosted.org/joblib/; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/mt-940/default.nix b/pkgs/development/python-modules/mt-940/default.nix index bab7cc052b9d..9b1a2df48bbb 100644 --- a/pkgs/development/python-modules/mt-940/default.nix +++ b/pkgs/development/python-modules/mt-940/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A library to parse MT940 files and returns smart Python collections for statistics and manipulation"; - homepage = "http://pythonhosted.org/mt-940/"; + homepage = https://pythonhosted.org/mt-940/; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix new file mode 100644 index 000000000000..3676c676cc60 --- /dev/null +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, requests, pytest }: + +buildPythonPackage rec { + version = "2.3.0"; + pname = "plaid-python"; + + src = fetchPypi { + inherit pname version; + sha256 = "0kp0crzjginmga6qvwwppar5b2pbdvwryf6vdpxgx7kkwzv33w97"; + }; + + checkInputs = [ pytest ]; + # Integration tests require API keys and internet access + checkPhase = "py.test -rxs ./tests/unit"; + + propagatedBuildInputs = [ requests ]; + + meta = { + description = "Python client library for the Plaid API and Link"; + homepage = https://github.com/plaid/plaid-python; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bhipple ]; + }; +} diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 859a17e156b0..cd112f7c4e9a 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://www.logilab.org/project/pylint; + homepage = https://www.logilab.org/project/pylint; description = "A bug and style checker for Python"; platforms = platforms.all; license = licenses.gpl1Plus; diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index 038b12b3a9e7..838adeac8a8e 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = "http://github.com/mongodb/mongo-python-driver"; + homepage = https://github.com/mongodb/mongo-python-driver; license = licenses.asl20; description = "Python driver for MongoDB "; }; diff --git a/pkgs/development/python-modules/pyro/default.nix b/pkgs/development/python-modules/pyro/default.nix index 3e2f90aa9d30..3a74a1fe6fa7 100644 --- a/pkgs/development/python-modules/pyro/default.nix +++ b/pkgs/development/python-modules/pyro/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Distributed object middleware for Python (IPC/RPC)"; - homepage = http://pythonhosted.org/Pyro/; + homepage = https://pythonhosted.org/Pyro/; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index 1bc08d634189..9057c3970e15 100644 --- a/pkgs/development/python-modules/pyslurm/default.nix +++ b/pkgs/development/python-modules/pyslurm/default.nix @@ -2,18 +2,21 @@ buildPythonPackage rec { pname = "pyslurm"; - version = "20180427"; + version = "20180604"; src = fetchFromGitHub { repo = "pyslurm"; owner = "PySlurm"; - rev = "3900e1afac9ffd13c80c57d8c39933d42eb7bad7"; - sha256 = "1a183ig4sdbc70rx2yyaslyq61wkbsf8cbim1jj0kzrp65nf0vls"; + rev = "9dd4817e785fee138a9e29c3d71d2ea44898eedc"; + sha256 = "14ivwc27sjnk0z0jpfgyy9bd91m2bhcz11lzp1kk9xn4495i7wvj"; }; buildInputs = [ cython slurm ]; setupPyBuildFlags = [ "--slurm-lib=${slurm}/lib" "--slurm-inc=${slurm.dev}/include" ]; + # Test cases need /etc/slurm/slurm.conf and require a working slurm installation + doCheck = false; + meta = with lib; { homepage = https://github.com/PySlurm/pyslurm; description = "Python bindings to Slurm"; diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index 88b6a662d471..c12d4b8add03 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-mock"; - version = "1.8.0"; + version = "1.10.0"; src = fetchPypi { inherit pname version; - sha256 = "2dd545496af6a0559432b11de79f1fd4fa4a541ae2e01892d5ba6041f85f0994"; + sha256 = "d89a8209d722b8307b5e351496830d5cc5e192336003a485443ae9adeb7dd4c0"; }; propagatedBuildInputs = [ pytest ] ++ lib.optional (!isPy3k) mock; diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix index 93aecbafdf35..cca3279482b8 100644 --- a/pkgs/development/python-modules/pytest-timeout/default.nix +++ b/pkgs/development/python-modules/pytest-timeout/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib;{ description = "py.test plugin to abort hanging tests"; - homepage = http://bitbucket.org/pytest-dev/pytest-timeout/; + homepage = https://bitbucket.org/pytest-dev/pytest-timeout/; license = licenses.mit; maintainers = with maintainers; [ makefu ]; }; diff --git a/pkgs/development/python-modules/python-forecastio/default.nix b/pkgs/development/python-modules/python-forecastio/default.nix new file mode 100644 index 000000000000..68f9ad16977b --- /dev/null +++ b/pkgs/development/python-modules/python-forecastio/default.nix @@ -0,0 +1,31 @@ +{ buildPythonPackage, stdenv, fetchPypi +, requests +, nose +, responses +}: + +buildPythonPackage rec { + pname = "python-forecastio"; + version = "1.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0m6lf4a46pnwm5xg9dnmwslwzrpnj6d9agw570grciivbvb1ji0l"; + + }; + + checkInputs = [ nose ]; + + propagatedBuildInputs = [ requests responses ]; + + checkPhase = '' + nosetests + ''; + + meta = with stdenv.lib; { + homepage = https://zeevgilovitz.com/python-forecast.io/; + description = "A thin Python Wrapper for the Dark Sky (formerly forecast.io) weather API"; + license = licenses.bsd2; + maintainers = with maintainers; [ makefu ]; + }; +} diff --git a/pkgs/development/python-modules/python-openid/default.nix b/pkgs/development/python-modules/python-openid/default.nix index 44ce20383b44..b70d9a1f082f 100644 --- a/pkgs/development/python-modules/python-openid/default.nix +++ b/pkgs/development/python-modules/python-openid/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "OpenID support for modern servers and consumers"; - homepage = http://github.com/openid/python-openid; + homepage = https://github.com/openid/python-openid; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix index c991ce613fcd..381ecec996d1 100644 --- a/pkgs/development/python-modules/python-stdnum/default.nix +++ b/pkgs/development/python-modules/python-stdnum/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "d587a520182f9d8aef7659cca429f4382881589c8883a0a55322b2f94970bdb3"; }; meta = { - homepage = http://arthurdejong.org/python-stdnum/; + homepage = https://arthurdejong.org/python-stdnum/; description = "Python module to handle standardized numbers and codes"; maintainers = with lib.maintainers; [ johbo ]; license = lib.licenses.lgpl2Plus; diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index c29b9f575859..18162d105acf 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -61,7 +61,7 @@ in buildPythonPackage rec { meta = { description = "Tensors and Dynamic neural networks in Python with strong GPU acceleration."; - homepage = http://pytorch.org/; + homepage = https://pytorch.org/; license = lib.licenses.bsd3; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ teh ]; diff --git a/pkgs/development/python-modules/qiskit/setup.py.patch b/pkgs/development/python-modules/qiskit/setup.py.patch index bb7cb71ae098..9c4224ce64c6 100644 --- a/pkgs/development/python-modules/qiskit/setup.py.patch +++ b/pkgs/development/python-modules/qiskit/setup.py.patch @@ -1,19 +1,21 @@ --- a/setup.py +++ b/setup.py -@@ -28,11 +28,11 @@ from setuptools.dist import Distribution +@@ -18,13 +18,13 @@ from setuptools.dist import Distribution requirements = [ - "IBMQuantumExperience>=1.8.29", + "IBMQuantumExperience>=1.9.2", - "matplotlib>=2.1,<2.2", - "networkx>=2.0,<2.1", - "numpy>=1.13,<1.15", - "ply==3.10", -- "scipy>=0.19,<1.1", +- "scipy>=0.19,<1.2", +- "sympy>=1.0,<1.2", +- "pillow>=4.2.1,<5.2" + "matplotlib>=2.1", + "networkx>=2.0", + "numpy>=1.13", + "ply>=3.10", + "scipy>=0.19", - "sympy>=1.0", - "pillow>=4.2.1" ++ "sympy>=1.0", ++ "pillow>=4.2.1" ] diff --git a/pkgs/development/python-modules/restview/default.nix b/pkgs/development/python-modules/restview/default.nix index d80872622bce..e8a8b9dd637d 100644 --- a/pkgs/development/python-modules/restview/default.nix +++ b/pkgs/development/python-modules/restview/default.nix @@ -26,8 +26,8 @@ buildPythonPackage rec { meta = { description = "ReStructuredText viewer"; - homepage = http://mg.pov.lt/restview/; + homepage = https://mg.pov.lt/restview/; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ koral ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/rlp/default.nix b/pkgs/development/python-modules/rlp/default.nix index fd4816c3bb57..87a59cf73975 100644 --- a/pkgs/development/python-modules/rlp/default.nix +++ b/pkgs/development/python-modules/rlp/default.nix @@ -1,15 +1,15 @@ -{ lib, fetchPypi, buildPythonPackage, pytest, hypothesis }: +{ lib, fetchPypi, buildPythonPackage, pytest }: buildPythonPackage rec { pname = "rlp"; - version = "1.0.1"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "492c11b18e89af42f98e96bca7671ffee4ad4cf5e69ea23b4d2221157d81b512"; + sha256 = "0d3gx4mp8q4z369s5yk1n9c55sgfw9fidbwqxq67d6s7l45rm1w7"; }; - checkInputs = [ pytest hypothesis ]; + checkInputs = [ pytest ]; propagatedBuildInputs = [ ]; meta = { @@ -17,6 +17,5 @@ buildPythonPackage rec { homepage = "https://github.com/ethereum/pyrlp"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ gebner ]; - broken = true; # Requires a chain of unpackaged dependencies. }; } diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index c6ece5f03038..f907f72ff244 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , isPyPy +, isPy27 , readline , R , pcre @@ -16,12 +17,18 @@ }: buildPythonPackage rec { - version = "2.9.3"; + version = if isPy27 then + "2.8.6" # python2 support dropped in 2.9.x + else + "2.9.3"; pname = "rpy2"; disabled = isPyPy; src = fetchPypi { inherit version pname; - sha256 = "1b72958e683339ea0c3bd9f73738e9ece2da8da8008a10e2e0c68fc7864e9361"; + sha256 = if isPy27 then + "162zki5c1apgv6qbafi7n66y4hgpgp43xag7q75qb6kv99ri6k80" # 2.8.x + else + "1b72958e683339ea0c3bd9f73738e9ece2da8da8008a10e2e0c68fc7864e9361"; # 2.9.x }; buildInputs = [ readline diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index c605d43888c1..0053b125bcb1 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "S3FS builds on boto3 to provide a convenient Python filesystem interface for S3."; - homepage = http://github.com/dask/s3fs/; + homepage = https://github.com/dask/s3fs/; license = licenses.bsd3; maintainers = with maintainers; [ teh ]; }; diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix index 2441cadfc0bf..ed358213492e 100644 --- a/pkgs/development/python-modules/salmon-mail/default.nix +++ b/pkgs/development/python-modules/salmon-mail/default.nix @@ -13,6 +13,12 @@ buildPythonPackage rec { checkInputs = [ nose jinja2 mock ]; propagatedBuildInputs = [ chardet dnspython lmtpd pythondaemon six ]; + # The tests use salmon executable installed by salmon itself so we need to add + # that to PATH + checkPhase = '' + PATH=$out/bin:$PATH nosetests . + ''; + meta = with stdenv.lib; { homepage = http://salmon-mail.readthedocs.org/; description = "Pythonic mail application server"; diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 5a0bf981684f..5e57dd3f093d 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = { description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering. "; - homepage = http://www.scipy.org/; + homepage = https://www.scipy.org/; maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 7f9da65d2b66..1c03e381bdca 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "A fast high-level web crawling and web scraping framework, used to crawl websites and extract structured data from their pages"; - homepage = http://scrapy.org/; + homepage = https://scrapy.org/; license = licenses.bsd3; maintainers = with maintainers; [ drewkett ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/sklearn-deap/default.nix b/pkgs/development/python-modules/sklearn-deap/default.nix new file mode 100644 index 000000000000..190692c43627 --- /dev/null +++ b/pkgs/development/python-modules/sklearn-deap/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, numpy, scipy, deap, scikitlearn, python }: + +buildPythonPackage rec { + pname = "sklearn-deap"; + version = "0.2.2"; + + # No tests in Pypi + src = fetchFromGitHub { + owner = "rsteca"; + repo = pname; + rev = "${version}"; + sha256 = "01ynmzxg181xhv2d7bs53zjvk9x2qpxix32sspq54mpigxh13ava"; + }; + + propagatedBuildInputs = [ numpy scipy deap scikitlearn ]; + + checkPhase = '' + ${python.interpreter} test.py + ''; + + meta = with stdenv.lib; { + description = "Use evolutionary algorithms instead of gridsearch in scikit-learn"; + homepage = https://github.com/rsteca/sklearn-deap; + license = licenses.lgpl3; + maintainers = with maintainers; [ psyanticy ]; + }; +} + diff --git a/pkgs/development/python-modules/sockjs-tornado/default.nix b/pkgs/development/python-modules/sockjs-tornado/default.nix index 36d6ada49b87..b8b67f708e6d 100644 --- a/pkgs/development/python-modules/sockjs-tornado/default.nix +++ b/pkgs/development/python-modules/sockjs-tornado/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ tornado ]; meta = with lib; { - homepage = http://github.com/mrjoes/sockjs-tornado/; + homepage = https://github.com/mrjoes/sockjs-tornado/; description = "SockJS python server implementation on top of Tornado framework"; license = licenses.mit; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/python-modules/spake2/default.nix b/pkgs/development/python-modules/spake2/default.nix index 08500aeb4ad1..2d2f066eaedc 100644 --- a/pkgs/development/python-modules/spake2/default.nix +++ b/pkgs/development/python-modules/spake2/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "SPAKE2 password-authenticated key exchange library"; - homepage = "http://github.com/warner/python-spake2"; + homepage = https://github.com/warner/python-spake2; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/toolz/default.nix b/pkgs/development/python-modules/toolz/default.nix index eb79149196b0..0fea8f1ab751 100644 --- a/pkgs/development/python-modules/toolz/default.nix +++ b/pkgs/development/python-modules/toolz/default.nix @@ -22,9 +22,9 @@ buildPythonPackage rec{ ''; meta = { - homepage = "http://github.com/pytoolz/toolz/"; + homepage = https://github.com/pytoolz/toolz/; description = "List processing tools and functional utilities"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index 5dace76c9b2c..0915bc300c54 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = { description = "PyTorch vision library"; - homepage = http://pytorch.org/; + homepage = https://pytorch.org/; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ ericsagnes ]; }; diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index b11ba5b491b9..6d72e234ddc4 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://twistedmatrix.com/; + homepage = https://twistedmatrix.com/; description = "Twisted, an event-driven networking engine written in Python"; longDescription = '' Twisted is an event-driven networking engine written in Python diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix index 09004e9337a0..e369e13cb957 100644 --- a/pkgs/development/python-modules/txtorcon/default.nix +++ b/pkgs/development/python-modules/txtorcon/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "txtorcon"; - version = "0.20.0"; + version = "18.0.0"; checkInputs = [ pytest mock lsof GeoIP ]; propagatedBuildInputs = [ @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "dc80cb76b3ddacef6d671c0a088cb1a45274c0858554c32ce55d0f41421c740e"; + sha256 = "0z2gsyp9msxrzsm7vq2vq8231a678g4g563xni6cnq4xdb4nx3w1"; }; # Skip a failing test until fixed upstream: diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix index 07d974ae86fb..38c46bd11fa8 100644 --- a/pkgs/development/python-modules/uncertainties/default.nix +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://pythonhosted.org/uncertainties/; + homepage = https://pythonhosted.org/uncertainties/; description = "Transparent calculations with uncertainties on the quantities involved (aka error propagation)"; maintainers = with maintainers; [ rnhmjoj ]; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/webassets/default.nix b/pkgs/development/python-modules/webassets/default.nix index f4863eec8f1b..a8a4e474f538 100644 --- a/pkgs/development/python-modules/webassets/default.nix +++ b/pkgs/development/python-modules/webassets/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Media asset management for Python, with glue code for various web frameworks"; - homepage = http://github.com/miracle2k/webassets/; + homepage = https://github.com/miracle2k/webassets/; license = licenses.bsd2; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/python-modules/whoosh/default.nix b/pkgs/development/python-modules/whoosh/default.nix index d0a226e9ebdb..cf3fce18c14c 100644 --- a/pkgs/development/python-modules/whoosh/default.nix +++ b/pkgs/development/python-modules/whoosh/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Fast, pure-Python full text indexing, search, and spell checking library."; - homepage = "http://bitbucket.org/mchaput/whoosh"; + homepage = https://bitbucket.org/mchaput/whoosh; license = licenses.bsd2; maintainers = with maintainers; [ nand0p ]; platforms = platforms.all; diff --git a/pkgs/development/python-modules/xstatic-jquery/default.nix b/pkgs/development/python-modules/xstatic-jquery/default.nix index c414e0a070ae..d884f12bdbf1 100644 --- a/pkgs/development/python-modules/xstatic-jquery/default.nix +++ b/pkgs/development/python-modules/xstatic-jquery/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib;{ - homepage = http://jquery.org; + homepage = https://jquery.org; description = "jquery packaged static files for python"; license = licenses.mit; maintainers = with maintainers; [ makefu ]; diff --git a/pkgs/development/python-modules/zc_lockfile/default.nix b/pkgs/development/python-modules/zc_lockfile/default.nix index 5f02f091b506..c51f5ebf0497 100644 --- a/pkgs/development/python-modules/zc_lockfile/default.nix +++ b/pkgs/development/python-modules/zc_lockfile/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Inter-process locks"; - homepage = http://www.python.org/pypi/zc.lockfile; + homepage = https://www.python.org/pypi/zc.lockfile; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 58831d2cc4ef..3c355d085760 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -354,6 +354,10 @@ in buildInputs = [ kerberos ]; }; + tiny_tds = attrs: { + nativeBuildInputs = [ pkgconfig openssl ]; + }; + therubyracer = attrs: { buildFlags = [ "--with-v8-dir=${v8}" diff --git a/pkgs/development/tools/analysis/egypt/default.nix b/pkgs/development/tools/analysis/egypt/default.nix index a7f29017fbe0..07bcd57a121a 100644 --- a/pkgs/development/tools/analysis/egypt/default.nix +++ b/pkgs/development/tools/analysis/egypt/default.nix @@ -6,7 +6,7 @@ buildPerlPackage rec { src = fetchurl { sha256 = "0r0wj6v8z9fzlh9pb5617kyjdf92ppmlbzajaarrq729bbb6ln5m"; - url = "http://www.gson.org/egypt/download/${name}.tar.gz"; + url = "https://www.gson.org/egypt/download/${name}.tar.gz"; }; outputs = [ "out" ]; diff --git a/pkgs/development/tools/analysis/radare/default.nix b/pkgs/development/tools/analysis/radare/default.nix index f2079b2b5a10..b174d6c069b7 100644 --- a/pkgs/development/tools/analysis/radare/default.nix +++ b/pkgs/development/tools/analysis/radare/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { name = "radare-1.5.2"; src = fetchurl { - url = "http://radare.org/get/${name}.tar.gz"; + url = "https://radare.org/get/${name}.tar.gz"; sha256 = "1qdrmcnzfvfvqb27c7pknwm8jl2hqa6c4l66wzyddwlb8yjm46hd"; }; diff --git a/pkgs/development/tools/analysis/radare/ired.nix b/pkgs/development/tools/analysis/radare/ired.nix index a2d135d44841..aec13296bdaa 100644 --- a/pkgs/development/tools/analysis/radare/ired.nix +++ b/pkgs/development/tools/analysis/radare/ired.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "ired-0.4"; src = fetchurl { - url = "http://radare.org/get/${name}.tar.gz"; + url = "https://radare.org/get/${name}.tar.gz"; sha256 = "0wya1ylc6adqg4qw5fi8aspc5d1yr27x9r2vpy133qxzia9qv3mm"; }; diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index 01caa59fe4c3..d0d20362236b 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { preCheck = "export HOME=$TMPDIR"; meta = { - homepage = http://rr-project.org/; + homepage = https://rr-project.org/; description = "Records nondeterministic executions and debugs them deterministically"; longDescription = '' rr aspires to be your primary debugging tool, replacing -- well, diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 1dac9513f948..28214e94c7aa 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, jdk, zip, unzip, bash, writeCBin, coreutils, makeWrapper, which, python +{ stdenv, lib, fetchurl, jdk, zip, unzip, bash, writeCBin, coreutils, makeWrapper, which, python, gnused # Always assume all markers valid (don't redownload dependencies). # Also, don't clean up environment variables. , enableNixHacks ? false @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { int main(int argc, char *argv[]) { char *path = getenv("PATH"); - char *pathToAppend = "${lib.makeBinPath [ coreutils ]}"; + char *pathToAppend = "${lib.makeBinPath [ coreutils gnused ]}"; char *newPath; if (path != NULL) { int length = strlen(path) + 1 + strlen(pathToAppend) + 1; @@ -71,10 +71,10 @@ stdenv.mkDerivation rec { echo "build --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\"" >> .bazelrc echo "build --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\"" >> .bazelrc echo "build --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\"" >> .bazelrc - sed -i -e "366 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "366 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "366 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "366 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "361 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "361 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "361 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "361 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh patchShebangs . ''; @@ -114,11 +114,10 @@ stdenv.mkDerivation rec { examples/java-native/src/test/java/com/example/myproject:hello ''; - # Bazel expects gcc and java to be in the path. installPhase = '' mkdir -p $out/bin mv output/bazel $out/bin - wrapProgram "$out/bin/bazel" --prefix PATH : "${lib.makeBinPath [ stdenv.cc jdk ]}" + wrapProgram "$out/bin/bazel" --set JAVA_HOME "${jdk}" mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions mv output/bazel-complete.bash $out/share/bash-completion/completions/ cp scripts/zsh_completion/_bazel $out/share/zsh/site-functions/ @@ -127,7 +126,7 @@ stdenv.mkDerivation rec { # Save paths to hardcoded dependencies so Nix can detect them. postFixup = '' mkdir -p $out/nix-support - echo "${customBash} ${coreutils}" > $out/nix-support/depends + echo "${customBash} ${gnused} ${coreutils}" > $out/nix-support/depends ''; dontStrip = true; diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix new file mode 100644 index 000000000000..96e9d0f9a439 --- /dev/null +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -0,0 +1,61 @@ +{ stdenv, lib, fetchurl, coursier, jdk, jre, python, makeWrapper }: + +let + baseName = "bloop"; + version = "1.0.0-M11"; + deps = stdenv.mkDerivation { + name = "${baseName}-deps-${version}"; + buildCommand = '' + export COURSIER_CACHE=$(pwd) + ${coursier}/bin/coursier fetch ch.epfl.scala:bloop-frontend_2.12:${version} \ + -r "bintray:scalameta/maven" \ + -r "bintray:scalacenter/releases" \ + -r "https://oss.sonatype.org/content/repositories/staging" > deps + mkdir -p $out/share/java + cp $(< deps) $out/share/java/ + ''; + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = "00p9mrwcms3skzicyj8frqs0r0a2rfvk5fbh58rk5yvcvkwl4fy1"; + }; +in +stdenv.mkDerivation rec { + name = "${baseName}-${version}"; + nailgunCommit = "60c2d130"; + + buildInputs = [ jdk makeWrapper deps ]; + + phases = [ "installPhase" ]; + + client = fetchurl { + url = "https://raw.githubusercontent.com/scalacenter/nailgun/${nailgunCommit}/pynailgun/ng.py"; + sha256 = "0qjw4nsyb4cxg96jj1yv5c0ivcxvmscxxqfzll5w9p1pjb30bq0n"; + }; + + zshCompletion = fetchurl { + url = "https://raw.githubusercontent.com/scalacenter/bloop/v${version}/etc/zsh/_bloop"; + sha256 = "1id6f1fgy2rk0q5aad6ffivhbxa94fallzsc04l9n0y1s2xdhqpm"; + }; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/zsh/site-functions + + cp ${client} $out/bin/blp-client + cp ${zshCompletion} $out/share/zsh/site-functions/_bloop + chmod +x $out/bin/blp-client + + makeWrapper ${jre}/bin/java $out/bin/blp-server \ + --prefix PATH : ${lib.makeBinPath [ jdk ]} \ + --add-flags "-cp $CLASSPATH bloop.Server" + makeWrapper $out/bin/blp-client $out/bin/bloop \ + --prefix PATH : ${lib.makeBinPath [ python ]} + ''; + + meta = with stdenv.lib; { + homepage = https://scalacenter.github.io/bloop/; + license = licenses.asl20; + description = "Bloop is a Scala build server and command-line tool to make the compile and test developer workflows fast and productive in a build-tool-agnostic way."; + maintainers = with maintainers; [ tomahna ]; + }; +} diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 76d099625626..8db0cc0d54f3 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.scala-sbt.org/; + homepage = https://www.scala-sbt.org/; license = licenses.bsd3; description = "A build tool for Scala, Java and more"; maintainers = with maintainers; [ nequissimus rickynils ]; diff --git a/pkgs/development/tools/cdecl/default.nix b/pkgs/development/tools/cdecl/default.nix index c5bccf6ddae6..388f6b0db439 100644 --- a/pkgs/development/tools/cdecl/default.nix +++ b/pkgs/development/tools/cdecl/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "cdecl-2.5"; src = fetchurl { - url = "http://www.cdecl.org/files/cdecl-blocks-2.5.tar.gz"; + url = "https://www.cdecl.org/files/cdecl-blocks-2.5.tar.gz"; sha256 = "1b7k0ra30hh8mg8fqv0f0yzkaac6lfg6n376drgbpxg4wwml1rly"; }; diff --git a/pkgs/development/tools/devtodo/default.nix b/pkgs/development/tools/devtodo/default.nix index a0b0ee571d95..dcaa43156699 100644 --- a/pkgs/development/tools/devtodo/default.nix +++ b/pkgs/development/tools/devtodo/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.1.20"; src = fetchurl { - url = "http://swapoff.org/files/devtodo/${name}.tar.gz"; + url = "https://swapoff.org/files/devtodo/${name}.tar.gz"; sha256 = "029y173njydzlznxmdizrrz4wcky47vqhl87fsb7xjcz9726m71p"; }; diff --git a/pkgs/development/tools/fac/default.nix b/pkgs/development/tools/fac/default.nix index 0fae9fad5d14..d6cc527e6418 100644 --- a/pkgs/development/tools/fac/default.nix +++ b/pkgs/development/tools/fac/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "fac-${version}"; - version = "1.1.0"; + version = "2.0.0"; goPackagePath = "github.com/mkchoi212/fac"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "mkchoi212"; repo = "fac"; rev = "v${version}"; - sha256 = "054j8yrblf1frcfn3dwrjbgf000i3ngbaz2c172nwbx75g309ihx"; + sha256 = "054bbiw0slz9szy3ap2sh5dy97w3g7ms27rd3ww3i1zdhvnggwpc"; }; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/fac/deps.nix b/pkgs/development/tools/fac/deps.nix index 65ec5ded5ad5..65335497e5ff 100644 --- a/pkgs/development/tools/fac/deps.nix +++ b/pkgs/development/tools/fac/deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/alecthomas/chroma"; - rev = "1b755a90bd109f170385cb3964f0abdfd3451145"; - sha256 = "1ilmavg291qhb0xq881f5h172zw40aaynqfb0y4yjyq13jnrf8p8"; + rev = "0c0b382eca61a71c1eb4cb4dea2bc78aa4939d96"; + sha256 = "0chpzs542s366vv01bfhrajdrbhmrvc3gi8jhpw3xgz6wfkivcp4"; }; } { @@ -45,22 +45,22 @@ sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; }; } - { - goPackagePath = "github.com/mkchoi212/fac"; - fetch = { - type = "git"; - url = "https://github.com/mkchoi212/fac"; - rev = "642a3ad8d8b4b76c7eb201e6f69b3bddb210c502"; - sha256 = "10rsmnixs3lybnj4xv09b2ya6x0hjjd03y148f78qfppyz2hsvaz"; - }; - } { goPackagePath = "github.com/nsf/termbox-go"; fetch = { type = "git"; url = "https://github.com/nsf/termbox-go"; - rev = "21a4d435a86280a2927985fd6296de56cbce453e"; - sha256 = "0afbb0nr9rqzlpg5n7dg070w5scdvckyzyy525mhndp8phhzwpg7"; + rev = "5c94acc5e6eb520f1bcd183974e01171cc4c23b3"; + sha256 = "1fi8imdgwvlsgifw2qfl3ww0lsrgkfsimkzz7bnrq41nar78s0fw"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; }; } ] \ No newline at end of file diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 924dde91acc5..866366353345 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "5.1.1"; + version = "5.1.3"; in stdenv.mkDerivation { name = "flyway-${version}"; src = fetchurl { - url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/5.1.1/flyway-commandline-${version}.tar.gz"; - sha256 = "0kdi7m5rwlik0d2rn9s3siqmc83xfkhhsdxw3g7r1mvk2ivscb7f"; + url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/5.1.3/flyway-commandline-${version}.tar.gz"; + sha256 = "08nrjrpcb56f2mhghgjbvl7bfzvlgc81ykxzghq3kpslx5d560lm"; }; buildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix index 697af75a434e..3f64f4a925f1 100644 --- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix +++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix @@ -18,8 +18,8 @@ mkDerivation { src = fetchFromGitHub { owner = "haskell-CI"; repo = "haskell-ci"; - rev = "05926968f17256cae2308756835a3a24d9de437b"; - sha256 = "0s1g1yq6j6vl2bspc90bwbwp7532pcrmh8fhnz8j6yv9py927mmm"; + rev = "b592d290cff68c7abcbd7f99f41aac998e7b7916"; + sha256 = "0jwaifp9wx6lb27qj191hjm125kq3vndh5lf7ibd86x19h5zmy4c"; }; patches = [ newShellCheck ]; isLibrary = true; diff --git a/pkgs/development/tools/mdk/default.nix b/pkgs/development/tools/mdk/default.nix index 37c5dab8ce87..8b5bea7ac6ce 100644 --- a/pkgs/development/tools/mdk/default.nix +++ b/pkgs/development/tools/mdk/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "gnu-mdk-1.2.9"; src = fetchurl { - url = http://ftp.gnu.org/gnu/mdk/v1.2.9/mdk-1.2.9.tar.gz; + url = https://ftp.gnu.org/gnu/mdk/v1.2.9/mdk-1.2.9.tar.gz; sha256 = "0c24wzrzbk0l4z1p5nnxihaqra75amwmw59va44554infkfms9kc"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix index 48cf4b31a176..b2130118fed9 100644 --- a/pkgs/development/tools/misc/babeltrace/default.nix +++ b/pkgs/development/tools/misc/babeltrace/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "babeltrace-1.5.5"; src = fetchurl { - url = "http://www.efficios.com/files/babeltrace/${name}.tar.bz2"; + url = "https://www.efficios.com/files/babeltrace/${name}.tar.bz2"; sha256 = "1b78fam1gbsalga5pppn8ka461q35a9svz3mlbv82ssakdw4d4a0"; }; diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix index a5ad3910f3f0..32c888b7e62f 100644 --- a/pkgs/development/tools/misc/cgdb/default.nix +++ b/pkgs/development/tools/misc/cgdb/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.7.0"; src = fetchurl { - url = "http://cgdb.me/files/${name}.tar.gz"; + url = "https://cgdb.me/files/${name}.tar.gz"; sha256 = "08slzg3702v5nivjhdx2bciqxc5vqcn8pc4i4lsgkcwdcrj94ymz"; }; diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix index cbf5883b2973..a3c5fd7f009c 100644 --- a/pkgs/development/tools/misc/creduce/default.nix +++ b/pkgs/development/tools/misc/creduce/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "2.7.0"; src = fetchurl { - url = "http://embed.cs.utah.edu/creduce/${name}.tar.gz"; + url = "https://embed.cs.utah.edu/creduce/${name}.tar.gz"; sha256 = "0h8s4d54q6cl6i45x3143l2xmr29b2yhr3m0n5qqx63sr5csip1n"; }; diff --git a/pkgs/development/tools/misc/csmith/default.nix b/pkgs/development/tools/misc/csmith/default.nix index c4994ad24d79..a0040e4ed3e5 100644 --- a/pkgs/development/tools/misc/csmith/default.nix +++ b/pkgs/development/tools/misc/csmith/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.3.0"; src = fetchurl { - url = "http://embed.cs.utah.edu/csmith/${name}.tar.gz"; + url = "https://embed.cs.utah.edu/csmith/${name}.tar.gz"; sha256 = "1mb5zgixsyf86slggs756k8a5ddmj980md3ic9sa1y75xl5cqizj"; }; diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix index 9f0ea147b585..3b1c70b4ac33 100644 --- a/pkgs/development/tools/misc/eggdbus/default.nix +++ b/pkgs/development/tools/misc/eggdbus/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "eggdbus-0.6"; src = fetchurl { - url = "http://hal.freedesktop.org/releases/${name}.tar.gz"; + url = "https://hal.freedesktop.org/releases/${name}.tar.gz"; sha256 = "118hj63ac65zlg71kydv4607qcg1qpdlql4kvhnwnnhar421jnq4"; }; diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 5176be123018..08729f6b41b2 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "intel-gpu-tools-1.22"; src = fetchurl { - url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.xz"; + url = "https://xorg.freedesktop.org/archive/individual/app/${name}.tar.xz"; sha256 = "0p4swf9577p6hzglw1lh2sz63wjkk37b7691saj2qw8ha7fc2rix"; }; diff --git a/pkgs/development/tools/misc/jscoverage/default.nix b/pkgs/development/tools/misc/jscoverage/default.nix index cb7d9af86e7d..af660561ee17 100644 --- a/pkgs/development/tools/misc/jscoverage/default.nix +++ b/pkgs/development/tools/misc/jscoverage/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "jscoverage-0.5.1"; src = fetchurl { - url = "http://siliconforks.com/jscoverage/download/${name}.tar.bz2"; + url = "https://siliconforks.com/jscoverage/download/${name}.tar.bz2"; sha256 = "c45f051cec18c10352f15f9844f47e37e8d121d5fd16680e2dd0f3b4420eb7f4"; }; diff --git a/pkgs/development/tools/misc/lit/default.nix b/pkgs/development/tools/misc/lit/default.nix index 42824d1a543e..60f256c2ddaf 100644 --- a/pkgs/development/tools/misc/lit/default.nix +++ b/pkgs/development/tools/misc/lit/default.nix @@ -2,11 +2,11 @@ python2.pkgs.buildPythonApplication rec { pname = "lit"; - version = "0.5.1"; + version = "0.6.0"; src = python2.pkgs.fetchPypi { inherit pname version; - sha256 = "0z651m3vkbk85y41larnsjxrszkbi58x9gzml3lb6ga7qwcrsg97"; + sha256 = "1png3jgbhrw8a602gy6rnzvjcrj8w2p2kk6szdg9lz42zr090lgb"; }; # Non-standard test suite. Needs custom checkPhase. diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/development/tools/misc/msitools/default.nix index ecee27c13858..ebba56d56d3b 100644 --- a/pkgs/development/tools/misc/msitools/default.nix +++ b/pkgs/development/tools/misc/msitools/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "msitools-${version}"; src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/msitools/0.97/${name}.tar.xz"; + url = "https://ftp.gnome.org/pub/GNOME/sources/msitools/0.97/${name}.tar.xz"; sha256 = "0pn6izlgwi4ngpk9jk2n38gcjjpk29nm15aad89bg9z3k9n2hnrs"; }; diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix index 1982a25e3df0..39ec46ffbfdd 100644 --- a/pkgs/development/tools/misc/patchelf/default.nix +++ b/pkgs/development/tools/misc/patchelf/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "patchelf-0.9"; src = fetchurl { - url = "http://nixos.org/releases/patchelf/${name}/${name}.tar.bz2"; + url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2"; sha256 = "a0f65c1ba148890e9f2f7823f4bedf7ecad5417772f64f994004f59a39014f83"; }; diff --git a/pkgs/development/tools/misc/prelink/default.nix b/pkgs/development/tools/misc/prelink/default.nix index ccd0b15a46d2..89b1ed6ee40c 100644 --- a/pkgs/development/tools/misc/prelink/default.nix +++ b/pkgs/development/tools/misc/prelink/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "http://people.redhat.com/jakub/prelink/prelink-${version}.tar.bz2"; + url = "https://people.redhat.com/jakub/prelink/prelink-${version}.tar.bz2"; sha256 = "1w20f6ilqrz8ca51qhrn1n13h7q1r34k09g33d6l2vwvbrhcffb3"; }; diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index a19fecc9c33a..a5fd8f5cf64d 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV) "--enable-mpers=check"; meta = with stdenv.lib; { - homepage = http://strace.io/; + homepage = https://strace.io/; description = "A system call tracer for Linux"; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/development/tools/misc/uhd/default.nix b/pkgs/development/tools/misc/uhd/default.nix index 011d0b3e80b9..0730ef1fb09c 100644 --- a/pkgs/development/tools/misc/uhd/default.nix +++ b/pkgs/development/tools/misc/uhd/default.nix @@ -9,17 +9,15 @@ let uhdVer = "v" + version; - ImgVer = "uhd-images_3.11.0.git-227-g9277fc58.tar.xz"; # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz # and xxx.yyy.zzz. Hrmpf... style keeps changing - version = "3.11.0.0"; + version = "3.12.0.0"; - # Firmware images are downloaded (pre-built) from: - # http://files.ettus.com/binaries/images/ + # Firmware images are downloaded (pre-built) from the respective release on Github uhdImagesSrc = fetchurl { - url = "http://files.ettus.com/binaries/images/${ImgVer}"; - sha256 = "1z8isnlxc5h0168jjpdvdv7rkd55x4dkfh14m8pc501zsf8azd6z"; + url = "https://github.com/EttusResearch/uhd/releases/download/${uhdVer}/uhd-images_${version}.tar.xz"; + sha256 = "1glf2qay4asajbl92fy432idqk0sj5h603najr8sgkbdyyyr933p"; }; in stdenv.mkDerivation { @@ -29,7 +27,7 @@ in stdenv.mkDerivation { owner = "EttusResearch"; repo = "uhd"; rev = "${uhdVer}"; - sha256 = "1ilx1a8k5zygfq7acm9yk2fi368b1a1l7ll21kmmxjv6ifz8ds5q"; + sha256 = "0m7vw7dmvn7d01kkzphayzi0bk50m5v9a17rpnxhn0bqhw282ksv"; }; enableParallelBuilding = true; @@ -49,8 +47,10 @@ in stdenv.mkDerivation { postPhases = [ "installFirmware" ]; + # UHD expects images in `$CMAKE_INSTALL_PREFIX/share/uhd/images` installFirmware = '' - tar --strip-components=1 -xvf "${uhdImagesSrc}" -C "$out" + mkdir -p "$out/share/uhd/images" + tar --strip-components=1 -xvf "${uhdImagesSrc}" -C "$out/share/uhd/images" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index 90aec83be986..fc1513ecf34b 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { version = "0.23.6"; src = fetchurl { - url = "http://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz"; + url = "https://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz"; sha256 = if bits == "x64" then "0ppyjspdvacarhdn4xd5i1pqgmf4z1bxnh1cry780489h25rcjgj" else "0c0j73vnzhsry5rdx41d954a29jmjnvzli728cfbjybfr51zdybg"; diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix index 3cf70d66ddbd..744a136c9ef2 100644 --- a/pkgs/development/tools/ocaml/ocaml-top/default.nix +++ b/pkgs/development/tools/ocaml/ocaml-top/default.nix @@ -2,15 +2,16 @@ , ocamlPackages , jbuilder }: -stdenv.mkDerivation { - name = "ocaml-top-1.1.4"; +stdenv.mkDerivation rec { + version = "1.1.5"; + name = "ocaml-top-${version}"; src = fetchzip { - url = https://github.com/OCamlPro/ocaml-top/archive/1.1.4.tar.gz; - sha256 = "1lmzjmnzsg8xdz0q5nm95zclihi9z80kzsalapg0s9wq0id8qm4j"; + url = "https://github.com/OCamlPro/ocaml-top/archive/${version}.tar.gz"; + sha256 = "1d4i6aanrafgrgk4mh154k6lkwk0b6mh66rykz33awlf5pfqd8yv"; }; buildInputs = [ ncurses jbuilder ] - ++ (with ocamlPackages; [ ocaml ocpBuild findlib lablgtk ocp-index ]); + ++ (with ocamlPackages; [ ocaml ocp-build findlib lablgtk ocp-index ]); configurePhase = '' export TERM=xterm diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix index 8da0f781a8b2..0ed7312660a1 100644 --- a/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -1,11 +1,10 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ncurses, buildOcaml }: +{ stdenv, fetchFromGitHub, ocaml, findlib, ncurses }: let version = "1.99.19-beta"; in -buildOcaml { +stdenv.mkDerivation rec { - name = "ocp-build"; - inherit version; + name = "ocaml${ocaml.version}-ocp-build-${version}"; src = fetchFromGitHub { owner = "OCamlPro"; @@ -14,7 +13,7 @@ buildOcaml { sha256 = "162k5l0cxyqanxlml5v8mqapdq5qbqc9m4b8wdjq7mf523b3h2zj"; }; - buildInputs = [ ocaml ]; + buildInputs = [ ocaml findlib ]; propagatedBuildInputs = [ ncurses ]; preInstall = "mkdir -p $out/bin"; preConfigure = '' diff --git a/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix b/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix deleted file mode 100644 index bdc75766bbf7..000000000000 --- a/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchzip, ocaml, findlib, ocpBuild, opam, cmdliner }: - -let inherit (stdenv.lib) getVersion versionAtLeast; in - -assert versionAtLeast (getVersion ocaml) "3.12.1"; -assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta"; -assert versionAtLeast "0.9.8" (getVersion cmdliner); - -stdenv.mkDerivation { - - name = "ocp-indent-1.5.2"; - - src = fetchzip { - url = "https://github.com/OCamlPro/ocp-indent/archive/1.5.2.tar.gz"; - sha256 = "0ynv2yhm7akpvqp72pdabhddwr352s1k85q8m1khsvspgg1mkiqz"; - }; - - nativeBuildInputs = [ ocpBuild opam ]; - - buildInputs = [ ocaml findlib cmdliner ]; - - createFindlibDestdir = true; - - preConfigure = "patchShebangs ./install.sh"; - - postInstall = '' - mv $out/lib/{ocp-indent,ocaml/${getVersion ocaml}/site-lib/} - ''; - - meta = with stdenv.lib; { - homepage = http://typerex.ocamlpro.com/ocp-indent.html; - description = "A customizable tool to indent OCaml code"; - license = licenses.gpl3; - platforms = ocaml.meta.platforms or []; - maintainers = [ maintainers.jirkamarsik ]; - }; -} diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix index d11278f4d29c..43898d250d91 100644 --- a/pkgs/development/tools/ocaml/ocp-indent/default.nix +++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchzip, ocaml, findlib, ocpBuild, opam, cmdliner }: +{ stdenv, fetchzip, ocaml, findlib, jbuilder, ocp-build, cmdliner }: let inherit (stdenv.lib) getVersion versionAtLeast; in assert versionAtLeast (getVersion ocaml) "3.12.1"; assert versionAtLeast (getVersion cmdliner) "1.0.0"; -assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta"; +assert versionAtLeast (getVersion ocp-build) "1.99.6-beta"; stdenv.mkDerivation rec { - name = "ocp-indent-${version}"; + name = "ocaml${ocaml.version}-ocp-indent-${version}"; version = "1.6.1"; src = fetchzip { @@ -16,16 +16,10 @@ stdenv.mkDerivation rec { sha256 = "0rcaa11mjqka032g94wgw9llqpflyk3ywr3lr6jyxbh1rjvnipnw"; }; - nativeBuildInputs = [ ocpBuild opam ]; + nativeBuildInputs = [ ocp-build ]; buildInputs = [ ocaml findlib cmdliner ]; - createFindlibDestdir = true; - - preConfigure = "patchShebangs ./install.sh"; - - postInstall = '' - mv $out/lib/{ocp-indent,ocaml/${getVersion ocaml}/site-lib/} - ''; + inherit (jbuilder) installPhase; meta = with stdenv.lib; { homepage = http://typerex.ocamlpro.com/ocp-indent.html; diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix index 6b865e9709a6..0a63ae805342 100644 --- a/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -1,39 +1,23 @@ -{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ocpBuild, ocpIndent, opam, cmdliner, ncurses, re, lambdaTerm, libev }: +{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, ocp-build, ocp-indent, cmdliner, re }: -let inherit (stdenv.lib) getVersion versionAtLeast optional; in +stdenv.mkDerivation rec { -assert versionAtLeast (getVersion ocaml) "4"; -assert versionAtLeast (getVersion ocpBuild) "1.99.13-beta"; -assert versionAtLeast (getVersion ocpIndent) "1.4.2"; - -let - version = "1.1.5"; -in - -stdenv.mkDerivation { - - name = "ocp-index-${version}"; + version = "1.1.6"; + name = "ocaml${ocaml.version}-ocp-index-${version}"; src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocp-index"; rev = version; - sha256 = "0gir0fm8mq609371kmwpsqfvpfx2b26ax3f9rg5fjf5r0bjk9pqd"; + sha256 = "0p367aphz9w71qbm3y47qwhgqmyai28l96i1ifb6kg7awph5qmj3"; }; - patches = [ (fetchpatch { - url = https://github.com/OCamlPro/ocp-index/commit/618872a0980d077857a63d502eadbbf0d1b05c0f.diff; - sha256 = "07snnydczkzapradh1c22ggv9vaff67nc36pi3218azb87mb1p7z"; - }) ]; + buildInputs = [ ocaml findlib jbuilder ocp-build cmdliner re ]; + propagatedBuildInputs = [ ocp-indent ]; - buildInputs = [ ocaml findlib ocpBuild opam cmdliner ncurses re libev ] - ++ optional (versionAtLeast (getVersion lambdaTerm) "1.7") lambdaTerm; - propagatedBuildInputs = [ ocpIndent ]; + buildPhase = "jbuilder build -p ocp-index"; - createFindlibDestdir = true; - - preBuild = "export TERM=xterm"; - postInstall = "mv $out/lib/{ocp-index,ocaml/${getVersion ocaml}/site-lib/}"; + inherit (jbuilder) installPhase; meta = { homepage = http://typerex.ocamlpro.com/ocp-index.html; diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 404bf08e74ee..340c57f28176 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, bash, ocaml, findlib, ocamlbuild, camlp4 -, lambdaTerm, ocaml_lwt, camomile, zed, cppo, ppx_tools, makeWrapper +{ stdenv, fetchurl, bash, ocaml, findlib, ocamlbuild, jbuilder +, lambdaTerm, cppo, makeWrapper }: if !stdenv.lib.versionAtLeast ocaml.version "4.02" @@ -7,30 +7,20 @@ then throw "utop is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - version = "1.19.3"; + version = "2.1.0"; name = "utop-${version}"; src = fetchurl { url = "https://github.com/diml/utop/archive/${version}.tar.gz"; - sha256 = "16z02vp9n97iax4fqpbi7v86r75vbabxvnd1rirh8w2miixs1g4x"; + sha256 = "0lpfyhnm4v3xmcpac76g1px3x7na4p29w6xj2q8chqxhcw131n2y"; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ ocaml findlib ocamlbuild cppo camlp4 ppx_tools ]; + buildInputs = [ ocaml findlib ocamlbuild cppo jbuilder ]; - propagatedBuildInputs = [ lambdaTerm ocaml_lwt ]; + propagatedBuildInputs = [ lambdaTerm ]; - createFindlibDestdir = true; - - configureFlags = [ "--enable-camlp4" ] - ++ stdenv.lib.optional (ppx_tools != null && !stdenv.lib.versionAtLeast ocaml.version "4.04") "--enable-interact"; - - buildPhase = '' - make - make doc - ''; - - dontStrip = true; + inherit (jbuilder) installPhase; postFixup = let diff --git a/pkgs/development/tools/parsing/antlr/2.7.7.nix b/pkgs/development/tools/parsing/antlr/2.7.7.nix index 017ef20e81c6..cafb076aa811 100644 --- a/pkgs/development/tools/parsing/antlr/2.7.7.nix +++ b/pkgs/development/tools/parsing/antlr/2.7.7.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "antlr-2.7.7"; src = fetchurl { - url = "http://www.antlr2.org/download/antlr-2.7.7.tar.gz"; + url = "https://www.antlr2.org/download/antlr-2.7.7.tar.gz"; sha256 = "1ffvcwdw73id0dk6pj2mlxjvbg0662qacx4ylayqcxgg381fnfl5"; }; patches = [ ./2.7.7-fixes.patch ]; diff --git a/pkgs/development/tools/parsing/antlr/3.4.nix b/pkgs/development/tools/parsing/antlr/3.4.nix index e6765806e4f7..c892b8fa8eab 100644 --- a/pkgs/development/tools/parsing/antlr/3.4.nix +++ b/pkgs/development/tools/parsing/antlr/3.4.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "antlr-${version}"; version = "3.4"; src = fetchurl { - url ="http://www.antlr3.org/download/antlr-${version}-complete.jar"; + url ="https://www.antlr3.org/download/antlr-${version}-complete.jar"; sha256 = "1xqbam8vf04q5fasb0m2n1pn5dbp2yw763sj492ncq04c5mqcglx"; }; diff --git a/pkgs/development/tools/parsing/antlr/3.5.nix b/pkgs/development/tools/parsing/antlr/3.5.nix index 5e10003dd6f9..030a19e99405 100644 --- a/pkgs/development/tools/parsing/antlr/3.5.nix +++ b/pkgs/development/tools/parsing/antlr/3.5.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "antlr-${version}"; version = "3.5.2"; src = fetchurl { - url ="http://www.antlr3.org/download/antlr-${version}-complete.jar"; + url ="https://www.antlr3.org/download/antlr-${version}-complete.jar"; sha256 = "0srjwxipwsfzmpi0v32d1l5lzk9gi5in8ayg33sq8wyp8ygnbji6"; }; diff --git a/pkgs/development/tools/parsing/antlr/4.7.nix b/pkgs/development/tools/parsing/antlr/4.7.nix index f58d0f9904aa..e097b5b3d5a5 100644 --- a/pkgs/development/tools/parsing/antlr/4.7.nix +++ b/pkgs/development/tools/parsing/antlr/4.7.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "antlr-${version}"; version = "4.7.1"; src = fetchurl { - url ="http://www.antlr.org/download/antlr-${version}-complete.jar"; + url ="https://www.antlr.org/download/antlr-${version}-complete.jar"; sha256 = "1236gwnzchama92apb2swmklnypj01m7bdwwfvwvl8ym85scw7gl"; }; diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index cd1cb0efd123..f418229f893b 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -8,7 +8,7 @@ let name = "ragel-${version}"; src = fetchurl { - url = "http://www.colm.net/files/ragel/${name}.tar.gz"; + url = "https://www.colm.net/files/ragel/${name}.tar.gz"; inherit sha256; }; diff --git a/pkgs/development/tools/profiling/EZTrace/default.nix b/pkgs/development/tools/profiling/EZTrace/default.nix index 98b38697992d..2ff337ef2083 100644 --- a/pkgs/development/tools/profiling/EZTrace/default.nix +++ b/pkgs/development/tools/profiling/EZTrace/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { name = "EZTrace-${version}"; src = fetchurl { - url = "http://gforge.inria.fr/frs/download.php/file/34082/eztrace-${version}.tar.gz"; + url = "https://gforge.inria.fr/frs/download.php/file/34082/eztrace-${version}.tar.gz"; sha256 = "06q5y9qmdn1h0wjmy28z6gwswskmph49j7simfqcqwv05gvd9svr"; }; diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix index fb7a60070744..39e37b217cf3 100644 --- a/pkgs/development/tools/repository-managers/nexus/default.nix +++ b/pkgs/development/tools/repository-managers/nexus/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nexus-${version}"; - version = "3.11.0-01"; + version = "3.12.1-01"; src = fetchurl { - url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-mac.tgz"; - sha256 = "1h5nfzb1sqhzb5j7w2dpmdi7vnnc9g6zx43a44f3zjvlxh1s0vim"; + url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-unix.tar.gz"; + sha256 = "1vv50zv3cr42rq1g16gdl2d1hrxna2jjynlr7kivzlbyfq89ic3f"; }; sourceRoot = name; diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 82724924a4a8..a2cd55f52b90 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { version = "2.40"; src = fetchurl { - url = "http://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip"; + url = "https://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip"; sha256 = spec.sha256; }; diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index 35e0d276101b..cada8353866c 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -7,14 +7,14 @@ spirv_sources = { tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "9e19fc0f31ceaf1f6bc907dbf17dcfded85f2ce8"; - sha256 = "1zpwznq0fyvkzs5h9nnkr7g6svr0w8z6zx62xgnss17c2a5cz0lk"; + rev = "f2c93c6e124836797311facb8449f9a0b76fefc2"; + sha256 = "03w5xk2hjijj1rfbx5dw3lhy7vb9zrssfcwvp09q47f77vkgl105"; }; headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "ce309203d7eceaf908bea8862c27f3e0749f7d00"; - sha256 = "1sv1iy2d46sg7r3xy591db6fn9h78wd079yvfa87vwmwsdkhiqhm"; + rev = "12f8de9f04327336b699b1b80aa390ae7f9ddbf4"; + sha256 = "0fswk5ndvkmy64har3dmhpkv09zmvb0p4knbqc4fdl4qiggz0fvf"; }; }; @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { name = "spirv-tools-${version}"; - version = "2018-02-05"; + version = "2018-06-06"; src = spirv_sources.tools; patchPhase = ''ln -sv ${spirv_sources.headers} external/spirv-headers''; diff --git a/pkgs/development/tools/tradcpp/default.nix b/pkgs/development/tools/tradcpp/default.nix index 3891617e1c79..8cde662b14c3 100644 --- a/pkgs/development/tools/tradcpp/default.nix +++ b/pkgs/development/tools/tradcpp/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "tradcpp-0.5.2"; src = fetchurl { - url = http://ftp.netbsd.org/pub/NetBSD/misc/dholland/tradcpp-0.5.2.tar.gz; + url = https://ftp.netbsd.org/pub/NetBSD/misc/dholland/tradcpp-0.5.2.tar.gz; sha256 = "1h2bwxwc13rz3g2236l89hm47f72hn3m4h7wjir3j532kq0m68bc"; }; diff --git a/pkgs/development/tools/valadoc/default.nix b/pkgs/development/tools/valadoc/default.nix index 2e2fc1ad9273..8f9087ee3b3a 100644 --- a/pkgs/development/tools/valadoc/default.nix +++ b/pkgs/development/tools/valadoc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "valadoc is a documentation generator for generating API documentation from Vala source code"; - homepage = http://valadoc.org; + homepage = https://valadoc.org; license = stdenv.lib.licenses.gpl2; maintainers = with maintainers; [ sternenseemann ]; platforms = with platforms; linux; diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix new file mode 100644 index 000000000000..8951f16e43c4 --- /dev/null +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, vulkan-loader, + glslang, pkgconfig, x11, libxcb, libXrandr, wayland }: + +stdenv.mkDerivation rec { + name = "vulkan-validation-layers-${version}"; + version = "1.1.77.0"; + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "Vulkan-ValidationLayers"; + rev = "sdk-${version}"; + sha256 = "1c7m0x63fv8paph4rlha9bzv6sd0d7j277b31hh1sqkdcv2mzjhj"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake python3 vulkan-headers vulkan-loader x11 libxcb libXrandr wayland ]; + enableParallelBuilding = true; + + cmakeFlags = [ "-DGLSLANG_INSTALL_DIR=${glslang}" ]; + + meta = with stdenv.lib; { + description = "LunarG Vulkan loader"; + homepage = "http://www.lunarg.com"; + platforms = platforms.linux; + license = licenses.asl20; + maintainers = [ maintainers.ralith ]; + }; +} diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix index b7b14128048b..3f7b21be005d 100644 --- a/pkgs/development/tools/xcbuild/default.nix +++ b/pkgs/development/tools/xcbuild/default.nix @@ -1,4 +1,5 @@ -{ stdenv, cmake, fetchFromGitHub, zlib, libxml2, libpng, CoreServices, CoreGraphics, ImageIO, ninja }: +{ stdenv, cmake, fetchFromGitHub, zlib, libxml2, libpng +, CoreServices, CoreGraphics, ImageIO, ninja }: let googletest = fetchFromGitHub { @@ -17,7 +18,8 @@ let in stdenv.mkDerivation rec { name = "xcbuild-${version}"; - # Once a version is released that includes https://github.com/facebook/xcbuild/commit/183c087a6484ceaae860c6f7300caf50aea0d710, + # Once a version is released that includes + # https://github.com/facebook/xcbuild/commit/183c087a6484ceaae860c6f7300caf50aea0d710, # we can stop doing this -pre thing. version = "0.1.2-pre"; diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix index a36c4f4bf806..bb91df474aae 100644 --- a/pkgs/development/tools/xcbuild/platform.nix +++ b/pkgs/development/tools/xcbuild/platform.nix @@ -1,7 +1,9 @@ -{ stdenv, sdk, writeText, platformName, xcbuild }: +{ runCommand, lib, sdk, platformName, writeText }: let + inherit (lib.generators) toPlist; + Info = { CFBundleIdentifier = platformName; Type = "Platform"; @@ -283,24 +285,14 @@ let in -stdenv.mkDerivation { - name = "MacOSX.platform"; - buildInputs = [ xcbuild ]; - buildCommand = '' - mkdir -p $out/ - cd $out/ +runCommand "MacOSX.platform" {} '' + install -D ${writeText "Info.plist" (toPlist {} Info)} $out/Info.plist + install -D ${writeText "version.plist" (toPlist {} Version)} $out/version.plist + install -D ${writeText "Architectures.xcspec" (toPlist {} Architectures)} $out/Developer/Library/Xcode/Specifications/Architectures.xcspec + install -D ${writeText "PackageTypes.xcspec" (toPlist {} PackageTypes)} $out/Developer/Library/Xcode/Specifications/PackageTypes.xcspec + install -D ${writeText "ProductTypes.xcspec" (toPlist {} ProductTypes)} $out/Developer/Library/Xcode/Specifications/ProductTypes.xcspec - plutil -convert xml1 -o Info.plist ${writeText "Info.plist" (builtins.toJSON Info)} - plutil -convert xml1 -o version.plist ${writeText "version.plist" (builtins.toJSON Version)} - - mkdir -p $out/Developer/Library/Xcode/Specifications/ - cd $out/Developer/Library/Xcode/Specifications/ - plutil -convert xml1 -o Architectures.xcspec ${writeText "Architectures.xcspec" (builtins.toJSON Architectures)} - plutil -convert xml1 -o PackageTypes.xcspec ${writeText "PackageTypes.xcspec" (builtins.toJSON PackageTypes)} - plutil -convert xml1 -o ProductTypes.xcspec ${writeText "ProductTypes.xcspec" (builtins.toJSON ProductTypes)} - - mkdir -p $out/Developer/SDKs/ - cd $out/Developer/SDKs/ - cp -r ${sdk} ${sdk.name} - ''; -} + mkdir -p $out/Developer/SDKs/ + cd $out/Developer/SDKs/ + cp -r ${sdk} ${sdk.name} +'' diff --git a/pkgs/development/tools/xcbuild/sdk.nix b/pkgs/development/tools/xcbuild/sdk.nix index 87bbedd57880..c97d17d739ba 100644 --- a/pkgs/development/tools/xcbuild/sdk.nix +++ b/pkgs/development/tools/xcbuild/sdk.nix @@ -1,6 +1,8 @@ -{ stdenv, writeText, toolchainName, sdkName, xcbuild }: +{ runCommand, lib, toolchainName, sdkName, writeText }: let + inherit (lib.generators) toPlist; + # TODO: expose MACOSX_DEPLOYMENT_TARGET in nix so we can use it here. version = "10.10"; @@ -19,17 +21,9 @@ let }; in -stdenv.mkDerivation { - name = "MacOSX${version}.sdk"; +runCommand "MacOSX${version}.sdk" { inherit version; - - buildInputs = [ xcbuild ]; - - buildCommand = '' - mkdir -p $out/ - plutil -convert xml1 -o $out/SDKSettings.plist ${writeText "SDKSettings.json" (builtins.toJSON SDKSettings)} - - mkdir -p $out/System/Library/CoreServices/ - plutil -convert xml1 -o $out/System/Library/CoreServices/SystemVersion.plist ${writeText "SystemVersion.plist" (builtins.toJSON SystemVersion)} - ''; -} +} '' + install -D ${writeText "SDKSettings.plist" (toPlist {} SDKSettings)} $out/SDKSettings.plist + install -D ${writeText "SystemVersion.plist" (toPlist {} SystemVersion)} $out/System/Library/CoreServices/SystemVersion.plist +'' diff --git a/pkgs/development/tools/xcbuild/toolchain.nix b/pkgs/development/tools/xcbuild/toolchain.nix index 9e34360909f9..3c20b510c3b5 100644 --- a/pkgs/development/tools/xcbuild/toolchain.nix +++ b/pkgs/development/tools/xcbuild/toolchain.nix @@ -1,16 +1,18 @@ -{stdenv, writeText, toolchainName, xcbuild, fetchurl -, llvm, cctools, gcc, bootstrap_cmds, binutils -, yacc, flex, m4, unifdef, gperf, indent, ctags, makeWrapper -, xib2nib}: +{ runCommand, toolchainName, fetchurl, makeWrapper, stdenv +, buildPackages, lib, writeText }: let + inherit (lib) getBin optionalString; + inherit (lib.generators) toPlist; + ToolchainInfo = { Identifier = toolchainName; }; - # We could pull this out of developer_cmds but it adds an annoying loop if we want to bootstrap and - # this is just a tiny script so I'm not going to bother + # We could pull this out of developer_cmds but it adds an annoying + # loop if we want to bootstrap and this is just a tiny script so I'm + # not going to bother. mkdep-darwin-src = fetchurl { url = "https://opensource.apple.com/source/developer_cmds/developer_cmds-63/mkdep/mkdep.sh"; sha256 = "0n4wpqfslfjs5zbys5yri8pfi2awyhlmknsf6laa5jzqbzq9x541"; @@ -18,106 +20,50 @@ let }; in -stdenv.mkDerivation { - name = "nixpkgs.xctoolchain"; - buildInputs = [ xcbuild makeWrapper ]; +runCommand "nixpkgs.xctoolchain" { + nativeBuildInputs = [ makeWrapper ]; +} ('' + mkdir -p $out + install -D ${writeText "ToolchainInfo.plist" (toPlist {} ToolchainInfo)} $out/ToolchainInfo.plist - ## cctools should build on Linux but it doesn't currently + mkdir -p $out/usr/include + mkdir -p $out/usr/lib + mkdir -p $out/usr/libexec + mkdir -p $out/usr/share + mkdir -p $out/usr/bin - buildCommand = '' - mkdir -p $out - plutil -convert xml1 -o $out/ToolchainInfo.plist ${writeText "ToolchainInfo.plist" (builtins.toJSON ToolchainInfo)} + for bin in ${getBin stdenv.cc}/bin/*; do + ln -s $bin $out/usr/bin + done - mkdir -p $out/usr/include - mkdir -p $out/usr/lib - mkdir -p $out/usr/libexec - mkdir -p $out/usr/share + for bin in ${getBin stdenv.cc.bintools.bintools}/bin/*; do + if ! [ -e "$out/usr/bin/$(basename $bin)" ]; then + ln -s $bin $out/usr/bin + fi + done - mkdir -p $out/usr/bin - cd $out/usr/bin - ln -s ${stdenv.cc}/bin/cpp - ln -s ${stdenv.cc}/bin/c++ - ln -s ${stdenv.cc}/bin/cc - ln -s c++ clang++ - ln -s cc clang + ln -s ${buildPackages.yacc}/bin/yacc $out/usr/bin/yacc + ln -s ${buildPackages.yacc}/bin/bison $out/usr/bin/bison + ln -s ${buildPackages.flex}/bin/flex $out/usr/bin/flex + ln -s ${buildPackages.flex}/bin/flex++ $out/usr/bin/flex++ + ln -s $out/bin/flex $out/usr/bin/lex - ln -s ${llvm}/bin/llvm-cov - ln -s ${llvm}/bin/llvm-dsymutil - ln -s ${llvm}/bin/llvm-dwarfdump - ln -s ${llvm}/bin/llvm-nm - ln -s ${llvm}/bin/llvm-objdump - ln -s ${llvm}/bin/llvm-otool - ln -s ${llvm}/bin/llvm-profdata - ln -s ${llvm}/bin/llvm-size + ln -s ${buildPackages.m4}/bin/m4 $out/usr/bin/m4 + ln -s $out/usr/bin/m4 $out/usr/bin/gm4 - ln -s ${yacc}/bin/yacc - ln -s ${yacc}/bin/bison - ln -s ${flex}/bin/flex - ln -s ${flex}/bin/flex++ + ln -s ${buildPackages.unifdef}/bin/unifdef $out/usr/bin/unifdef + ln -s ${buildPackages.unifdef}/bin/unifdefall $out/usr/bin/unifdefall - ln -s flex lex + ln -s ${buildPackages.gperf}/bin/gperf $out/usr/bin/gperf + ln -s ${buildPackages.indent}/bin/indent $out/usr/bin/indent + ln -s ${buildPackages.ctags}/bin/ctags $out/usr/bin/ctags +'' + optionalString stdenv.isDarwin '' + for bin in ${getBin buildPackages.darwin.cctools}/bin/*; do + if ! [ -e "$out/usr/bin/$(basename $bin)" ]; then + ln -s $bin $out/usr/bin + fi + done - ln -s ${m4}/bin/m4 - ln -s m4 gm4 - - ln -s ${unifdef}/bin/unifdef - ln -s ${unifdef}/bin/unifdefall - - ln -s ${gperf}/bin/gperf - ln -s ${indent}/bin/indent - ln -s ${ctags}/bin/ctags - '' + stdenv.lib.optionalString stdenv.isDarwin '' - ln -s ${bootstrap_cmds}/bin/mig - ln -s ${binutils}/bin/lipo - - ln -s ${cctools}/bin/ar - ln -s ${cctools}/bin/as - ln -s ${cctools}/bin/nm - ln -s ${cctools}/bin/nmedit - ln -s ${cctools}/bin/ld - ln -s ${cctools}/bin/libtool - ln -s ${cctools}/bin/strings - ln -s ${cctools}/bin/strip - ln -s ${cctools}/bin/install_name_tool - ln -s ${cctools}/bin/bitcode_strip - ln -s ${cctools}/bin/codesign_allocate - ln -s ${cctools}/bin/dsymutil - ln -s ${cctools}/bin/dyldinfo - ln -s ${cctools}/bin/otool - ln -s ${cctools}/bin/unwinddump - ln -s ${cctools}/bin/size - ln -s ${cctools}/bin/segedit - ln -s ${cctools}/bin/pagestuff - ln -s ${cctools}/bin/ranlib - ln -s ${cctools}/bin/redo_prebinding - - ln -s ${xib2nib}/bin/ibtool - '' + - # No point including the entire gcc closure if we don't already have it - (if stdenv.cc.isClang then '' - ln -s ${stdenv.cc.cc.llvm}/bin/llvm-cov gcov - ln -s ${mkdep-darwin-src} mkdep - '' else '' - ln -s ${gcc}/bin/gcov - ln -s ${gcc}/bin/mkdep - ''); -} - -# other commands in /bin/ -# asa -# cmpdylib (in cctools) -# ctf_insert (in cctools) -# dwarfdump -# lorder -# rebase -# rpcgen (in developer_cmds) -# what - - -# swift: see #11463 -# swift -# swift-compress -# swift-demangle -# swift-stdlib-tool -# swift-update -# swiftc + ln -s ${buildPackages.darwin.bootstrap_cmds}/bin/mig $out/usr/bin + ln -s ${mkdep-darwin-src} $out/usr/bin/mkdep +'') diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index 06c48ec0a73f..cfa855e23cd8 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -1,5 +1,5 @@ -{ stdenv, callPackage, makeWrapper, writeText, CoreServices, ImageIO, CoreGraphics -, cctools, bootstrap_cmds, binutils}: +{ stdenv, buildPackages, makeWrapper, writeText, runCommand +, CoreServices, ImageIO, CoreGraphics }: let @@ -7,20 +7,20 @@ let platformName = "com.apple.platform.macosx"; sdkName = "macosx10.10"; - xcbuild = callPackage ./default.nix { + xcbuild = buildPackages.callPackage ./default.nix { inherit CoreServices ImageIO CoreGraphics; }; - toolchain = callPackage ./toolchain.nix { - inherit cctools bootstrap_cmds toolchainName xcbuild binutils stdenv; + toolchain = buildPackages.callPackage ./toolchain.nix { + inherit toolchainName; }; - sdk = callPackage ./sdk.nix { - inherit toolchainName sdkName xcbuild; + sdk = buildPackages.callPackage ./sdk.nix { + inherit toolchainName sdkName; }; - platform = callPackage ./platform.nix { - inherit sdk platformName xcbuild; + platform = buildPackages.callPackage ./platform.nix { + inherit sdk platformName; }; xcconfig = writeText "nix.xcconfig" '' @@ -32,7 +32,7 @@ in stdenv.mkDerivation { name = "xcbuild-wrapper-${xcbuild.version}"; - buildInputs = [ xcbuild makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; setupHook = ./setup-hook.sh; @@ -40,22 +40,21 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/bin - cd $out/bin/ for file in ${xcbuild}/bin/*; do - ln -s $file + ln -s $file $out/bin done - mkdir $out/usr + mkdir -p $out/usr ln -s $out/bin $out/usr/bin - mkdir -p $out/Library/Xcode/ + mkdir -p $out/Library/Xcode ln -s ${xcbuild}/Library/Xcode/Specifications $out/Library/Xcode/Specifications - mkdir -p $out/Platforms/ + mkdir -p $out/Platforms ln -s ${platform} $out/Platforms/nixpkgs.platform - mkdir -p $out/Toolchains/ + mkdir -p $out/Toolchains ln -s ${toolchain} $out/Toolchains/nixpkgs.xctoolchain wrapProgram $out/bin/xcodebuild \ diff --git a/pkgs/development/web/csslint/default.nix b/pkgs/development/web/csslint/default.nix index 4e8cb2b8829c..4159e3690490 100644 --- a/pkgs/development/web/csslint/default.nix +++ b/pkgs/development/web/csslint/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "csslint-${version}"; src = fetchurl { - url = "http://registry.npmjs.org/csslint/-/${name}.tgz"; + url = "https://registry.npmjs.org/csslint/-/${name}.tgz"; sha256 = "1gq2x0pf2p4jhccvn3y3kjhm1lmb4jsfdbzjdh924w8m3sr9jdid"; }; diff --git a/pkgs/development/web/remarkjs/node-packages.nix b/pkgs/development/web/remarkjs/node-packages.nix index 4c8a6c6db97a..3322c58b40d0 100644 --- a/pkgs/development/web/remarkjs/node-packages.nix +++ b/pkgs/development/web/remarkjs/node-packages.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.3. Do not edit! +# This file has been generated by node2nix 1.6.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -10,16 +10,16 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz"; - sha512 = "37dc2svic03crmc9mvs4xc16rd28cbbf33js9ndp8278gb5xi40h1yzx467h3ca9mszjfwwr9vyfnvfbk07dj7gz039izrsq0085kln"; + sha512 = "ls6CAMA6/5gG+O/IdsBcblvnd8qcO/l1TYoNeAzp3wcISOxlPXQEus0mLcdwazEkWjaBdaJ3TaxmNgCLWwvWzg=="; }; }; - "JSONStream-1.3.2" = { + "JSONStream-1.3.3" = { name = "JSONStream"; packageName = "JSONStream"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz"; - sha1 = "c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea"; + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.3.tgz"; + sha512 = "3Sp6WZZ/lXl+nTDoGpGWHEpTnnC6X5fnkolYZR6nwIfzbxxvA8utPWe1gCt7i0m9uVGsSz2IS8K8mJ7HmlduMg=="; }; }; "abbrev-1.1.1" = { @@ -28,34 +28,34 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; - sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy"; + sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; }; }; - "acorn-4.0.13" = { + "acorn-5.7.1" = { name = "acorn"; packageName = "acorn"; - version = "4.0.13"; + version = "5.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz"; - sha1 = "105495ae5361d697bd195c825192e1ad7f253787"; + url = "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz"; + sha512 = "d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ=="; }; }; - "acorn-5.5.3" = { - name = "acorn"; - packageName = "acorn"; - version = "5.5.3"; + "acorn-dynamic-import-3.0.0" = { + name = "acorn-dynamic-import"; + packageName = "acorn-dynamic-import"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz"; - sha512 = "0wmwifv9mm9gqcir9zbz5y1gl1rgwwprqh1f3csjydj8kf3byca7img3rh5b54kbnw3ik34bc6ynbnzsd01zmxrsfdvjv95hn84rpld"; + url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz"; + sha512 = "zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg=="; }; }; - "acorn-node-1.3.0" = { + "acorn-node-1.5.2" = { name = "acorn-node"; packageName = "acorn-node"; - version = "1.3.0"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.3.0.tgz"; - sha512 = "0pxd0cjsh0kdh8nxcpm000fcsgwmr8b13gyxkac8yxzz9a5wblqka5crksicnx8mqwy499k1jryr83bjzb3355xikgs5mfxgpigkwvr"; + url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.5.2.tgz"; + sha512 = "krFKvw/d1F17AN3XZbybIUzEY4YEPNiGo05AfP3dBlfVKrMHETKpgjpuZkSF8qDNt9UkQcqj7am8yJLseklCMg=="; }; }; "adm-zip-0.2.1" = { @@ -67,13 +67,13 @@ let sha1 = "e801cedeb5bd9a4e98d699c5c0f4239e2731dcbf"; }; }; - "ajv-4.11.8" = { + "ajv-5.5.2" = { name = "ajv"; packageName = "ajv"; - version = "4.11.8"; + version = "5.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz"; - sha1 = "82ffb02b29e662ae53bdc20af15947706739c536"; + url = "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz"; + sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; }; }; "array-filter-0.0.1" = { @@ -136,7 +136,7 @@ let version = "4.10.1"; src = fetchurl { url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz"; - sha512 = "15j9ms7k6dx08m1wqrvc4958vcrshjjpicpxmz9bflsyk0x2r7w20lxlm27jpyj7cwj6158a0582vifk393hqp0ysn9mlbabqw9qzd7"; + sha512 = "p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw=="; }; }; "assert-1.4.1" = { @@ -157,15 +157,6 @@ let sha1 = "ee74009413002d84cec7219c6ac811812e723160"; }; }; - "assert-plus-0.2.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"; - sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; - }; - }; "assert-plus-1.0.0" = { name = "assert-plus"; packageName = "assert-plus"; @@ -175,15 +166,6 @@ let sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; }; }; - "astw-2.2.0" = { - name = "astw"; - packageName = "astw"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/astw/-/astw-2.2.0.tgz"; - sha1 = "7bd41784d32493987aeb239b6b4e1c57a873b917"; - }; - }; "async-0.9.2" = { name = "async"; packageName = "async"; @@ -211,22 +193,22 @@ let sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; }; }; - "aws-sign2-0.6.0" = { + "aws-sign2-0.7.0" = { name = "aws-sign2"; packageName = "aws-sign2"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"; - sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f"; + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; + sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.6.0" = { + "aws4-1.7.0" = { name = "aws4"; packageName = "aws4"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz"; - sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e"; + url = "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz"; + sha512 = "32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w=="; }; }; "balanced-match-1.0.0" = { @@ -238,13 +220,13 @@ let sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; }; }; - "base64-js-1.2.3" = { + "base64-js-1.3.0" = { name = "base64-js"; packageName = "base64-js"; - version = "1.2.3"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.3.tgz"; - sha512 = "3kqp8hzql2ccdqf7vqizav1lrwp5gynn081718g9slxcs428sv02n037xb9hfgrqybbk4qacnk5mcv63z8fm3l4h6fi06xm8nqj3h1j"; + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz"; + sha512 = "ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="; }; }; "bcrypt-pbkdf-1.0.1" = { @@ -262,7 +244,7 @@ let version = "4.11.8"; src = fetchurl { url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz"; - sha512 = "20bg51v29zygy89w84qb64pkjikxfjdsgjs0ry6pvv8fkwn5kd1izrqn022d838q3rcaq8dmy033g7q8b6960j4f8ipan74y9ydimr2"; + sha512 = "ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="; }; }; "boom-0.4.2" = { @@ -274,22 +256,13 @@ let sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; }; }; - "boom-2.10.1" = { - name = "boom"; - packageName = "boom"; - version = "2.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"; - sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; - }; - }; "brace-expansion-1.1.11" = { name = "brace-expansion"; packageName = "brace-expansion"; version = "1.1.11"; src = fetchurl { url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; }; }; "brorand-1.1.0" = { @@ -301,22 +274,22 @@ let sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f"; }; }; - "browser-pack-6.0.4" = { + "browser-pack-6.1.0" = { name = "browser-pack"; packageName = "browser-pack"; - version = "6.0.4"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.4.tgz"; - sha512 = "0ylgxzrsxs25v3c4mz5ggqawb8k3xb39ialqlflk1nadfk8wrig2g2ipkpnw6bf9zhdhmigkwqbbl8yssibcb6fgnbbqfgsnfgnz123"; + url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.1.0.tgz"; + sha512 = "erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA=="; }; }; - "browser-resolve-1.11.2" = { + "browser-resolve-1.11.3" = { name = "browser-resolve"; packageName = "browser-resolve"; - version = "1.11.2"; + version = "1.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.2.tgz"; - sha1 = "8ff09b0a2c421718a1051c260b32e48f442938ce"; + url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz"; + sha512 = "exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ=="; }; }; "browser-stdout-1.3.1" = { @@ -325,34 +298,34 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz"; - sha512 = "21jjhrf3wdmzsfqgva5s7shs1wdmcdxsjvi75p8z7i0q2i6n3654gpxjqlhbnpmzm25cpkshyi8swy13017qkp9m7xnbgw0bwiia45a"; + sha512 = "qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw=="; }; }; - "browserify-aes-1.1.1" = { + "browserify-aes-1.2.0" = { name = "browserify-aes"; packageName = "browserify-aes"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.1.tgz"; - sha512 = "0b874c5j68a6h1smd9avnc98zpjy2b4sykkhfpn97lzg7k5aq3ab0jdsmxjafifm0sa3srwscfpcl70gwnlg242p7cavnf115hd6sah"; + url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz"; + sha512 = "+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA=="; }; }; - "browserify-cipher-1.0.0" = { + "browserify-cipher-1.0.1" = { name = "browserify-cipher"; packageName = "browserify-cipher"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz"; - sha1 = "9988244874bf5ed4e28da95666dcd66ac8fc363a"; + url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz"; + sha512 = "sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w=="; }; }; - "browserify-des-1.0.0" = { + "browserify-des-1.0.1" = { name = "browserify-des"; packageName = "browserify-des"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz"; - sha1 = "daa277717470922ed2fe18594118a175439721dd"; + url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.1.tgz"; + sha512 = "zy0Cobe3hhgpiOM32Tj7KQ3Vl91m0njwsjzZQK1L+JDf11dzP9qIvjreVinsvXrgfjhStXwUWAEpB9D7Gwmayw=="; }; }; "browserify-rsa-4.0.1" = { @@ -379,7 +352,7 @@ let version = "0.2.0"; src = fetchurl { url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz"; - sha512 = "24488d4s6d901hj9d9jdddapmcvmibbdpjq6nv3bpyjx72546fcqa0vripy0ydsrw1jk6bakfzvynh5i9cz0g59hrmn4ph75d3kdpk7"; + sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; }; }; "buffer-5.1.0" = { @@ -388,7 +361,16 @@ let version = "5.1.0"; src = fetchurl { url = "https://registry.npmjs.org/buffer/-/buffer-5.1.0.tgz"; - sha512 = "1ipkzdnq03rnxyl50wmzigdbd96lh0mgzffcab80yxl38x7k316kzs3h0w0bxdjj7vqh6dw3wgb7y3rsqab0ar4ky9rbh0r1f1i2hk2"; + sha512 = "YkIRgwsZwJWTnyQrsBTWefizHh+8GYj3kbL1BTiAQ/9pwpino0G7B2gp5tx/FUBqUlvtxV85KNR3mwfAtv15Yw=="; + }; + }; + "buffer-from-1.1.0" = { + name = "buffer-from"; + packageName = "buffer-from"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz"; + sha512 = "c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ=="; }; }; "buffer-xor-1.0.3" = { @@ -433,7 +415,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz"; - sha512 = "3cm9kdc1sv7pakzlhrc1pazdvg9lk4hv31lximwbcrgmwfzg6imxrndszgx9yzlizknfh2b73cr7b5mfcv50bldpyq6jr5s4zknsj1a"; + sha512 = "Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q=="; }; }; "cli-1.0.1" = { @@ -454,15 +436,6 @@ let sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; }; }; - "combine-source-map-0.7.2" = { - name = "combine-source-map"; - packageName = "combine-source-map"; - version = "0.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.7.2.tgz"; - sha1 = "0870312856b307a87cc4ac486f3a9a62aeccc09e"; - }; - }; "combine-source-map-0.8.0" = { name = "combine-source-map"; packageName = "combine-source-map"; @@ -490,31 +463,13 @@ let sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818"; }; }; - "commander-2.11.0" = { + "commander-2.15.1" = { name = "commander"; packageName = "commander"; - version = "2.11.0"; + version = "2.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz"; - sha512 = "2yi2hwf0bghfnv1fdgd4wvh7s0acjrgqbgww97ncm6i6s6ffs1zahnj48f6gqpqj6fsf0jigvnr0civ25k2160c38281r80wvg7jkkg"; - }; - }; - "commander-2.14.1" = { - name = "commander"; - packageName = "commander"; - version = "2.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz"; - sha512 = "11j7mwxfdnhi3yfkhxjvfkg1mzdsi3wq7iygma6ksmj1f7hfs0z8rpfcysqmy85f67mqvzhda3w1lyy1jqxxm31k799sazbipm7b17r"; - }; - }; - "commander-2.15.0" = { - name = "commander"; - packageName = "commander"; - version = "2.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.15.0.tgz"; - sha512 = "090my2m6q69l4kgn1slqs845mf9s5zx7l1p345z2qij174pyk4jr2xkalnq8k0dfhghvdmcjxba03qn959n64r8nkg2cq9d3ja647gc"; + url = "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz"; + sha512 = "VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag=="; }; }; "concat-map-0.0.1" = { @@ -526,22 +481,13 @@ let sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; }; }; - "concat-stream-1.5.2" = { + "concat-stream-1.6.2" = { name = "concat-stream"; packageName = "concat-stream"; - version = "1.5.2"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz"; - sha1 = "708978624d856af41a5a741defdd261da752c266"; - }; - }; - "concat-stream-1.6.1" = { - name = "concat-stream"; - packageName = "concat-stream"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.1.tgz"; - sha512 = "1gyp2id8ifqdpzk81qz5q7200wf8m66ammg6cz8cxv4blmqh7rf761fxd1536ib4kcdp8jccvyx1l9vi6kjl26pwyd05pblki455jc2"; + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz"; + sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; }; }; "config-chain-1.1.11" = { @@ -589,31 +535,31 @@ let sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; }; - "create-ecdh-4.0.0" = { + "create-ecdh-4.0.3" = { name = "create-ecdh"; packageName = "create-ecdh"; - version = "4.0.0"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz"; - sha1 = "888c723596cdf7612f6498233eebd7a35301737d"; + url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz"; + sha512 = "GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw=="; }; }; - "create-hash-1.1.3" = { + "create-hash-1.2.0" = { name = "create-hash"; packageName = "create-hash"; - version = "1.1.3"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz"; - sha1 = "606042ac8b9262750f483caddab0f5819172d8fd"; + url = "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz"; + sha512 = "z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg=="; }; }; - "create-hmac-1.1.6" = { + "create-hmac-1.1.7" = { name = "create-hmac"; packageName = "create-hmac"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz"; - sha1 = "acb9e221a4e17bdb076e90657c42b93e3726cf06"; + url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz"; + sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg=="; }; }; "cryptiles-0.2.2" = { @@ -625,22 +571,13 @@ let sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; }; }; - "cryptiles-2.0.5" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"; - sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8"; - }; - }; "crypto-browserify-3.12.0" = { name = "crypto-browserify"; packageName = "crypto-browserify"; version = "3.12.0"; src = fetchurl { url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz"; - sha512 = "1d3mrhqlay037azmjp2ml5a8yyls9ijdhilv6f0znz0ajgfm972yr9bhm78wqi09p4crc3shgflk50jc63zijsqv777ikkyi2j2qgkz"; + sha512 = "fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg=="; }; }; "ctype-0.5.3" = { @@ -676,7 +613,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; - sha512 = "3g1hqsahr1ks2kpvdxrwzr57fj90nnr0hvwwrw8yyyzcv3i11sym8zwibxx67bl1mln0acddrzpkkdjjxnc6n2cm9fazmgzzsl1fzrr"; + sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; }; }; "defined-1.0.0" = { @@ -730,7 +667,7 @@ let version = "5.1.0"; src = fetchurl { url = "https://registry.npmjs.org/detective/-/detective-5.1.0.tgz"; - sha512 = "1cm9sp1rl54d3y7v9nvw12kad47g5pcmbzf96s7kpm85j1cc79yc8qb8q0xjj71w32pgz2p4fym47sa851i5lswglmmiimgyflwqlac"; + sha512 = "TFHMqfOvxlgrfVzTEkNBSh9SvSNX/HfF4OFI2QFGCyPm02EsyILqnUeb5P6q7JZ3SFNTBL5t2sePRgrN4epUWQ=="; }; }; "diff-3.5.0" = { @@ -739,16 +676,16 @@ let version = "3.5.0"; src = fetchurl { url = "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz"; - sha512 = "32bkv3cfhax4x5zhiyfn63wjhqwkzsjiql3my8p3d9hvv020p8f9hdi7mpqixrkpgs0g9k15mn736s449yad9wq1plhxyhxb2sam3h3"; + sha512 = "A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA=="; }; }; - "diffie-hellman-5.0.2" = { + "diffie-hellman-5.0.3" = { name = "diffie-hellman"; packageName = "diffie-hellman"; - version = "5.0.2"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz"; - sha1 = "b5835739270cfe26acf632099fded2a07f209e5e"; + url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz"; + sha512 = "kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg=="; }; }; "dom-serializer-0.1.0" = { @@ -766,7 +703,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz"; - sha512 = "1fcxv8rzfhs99afvhji7bs5ppxwn9mw040ixdgvkm6iabz72q61arly2lr57086rjn4g2vkb3rkih1cyc7z35kzv1jjciwyrs4g4y4f"; + sha512 = "jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="; }; }; "domelementtype-1.1.3" = { @@ -856,7 +793,7 @@ let version = "0.1.7"; src = fetchurl { url = "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz"; - sha512 = "2bdzcjwgdkg5yrvlw6my57pn77k4j7a2pzppwqrq4va9f5bd4b5mzbhwpklhsy1jl7w9sjvnfs30h42nhz2dbdfhagnh8dk6l2d3yii"; + sha512 = "MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg=="; }; }; "escape-string-regexp-1.0.5" = { @@ -868,13 +805,13 @@ let sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; - "events-2.0.0" = { + "events-2.1.0" = { name = "events"; packageName = "events"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/events/-/events-2.0.0.tgz"; - sha512 = "1r878as79mx3xg56nvjxxbryqa8lqn8xmiqi1xqfx2vjygnfaf15h5l658a9ikfr1bhc6ygxny8jr8ddjxpzlh6y443rxv08di3kwxg"; + url = "https://registry.npmjs.org/events/-/events-2.1.0.tgz"; + sha512 = "3Zmiobend8P9DjmKAty0Era4jV8oJ0yGYe2nJJAxgymF9+N8F2m0hhZiMoWtcfepExzNKZumFU3ksdQbInGWCg=="; }; }; "evp_bytestokey-1.0.3" = { @@ -883,7 +820,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz"; - sha512 = "1wd18zxd7n42asa63aa4k1bdf58warg29c7c8cdzzkd4r1wva7qwzqnn52h8g8hqwj7bxjkk3ryghajrvz4i27h5bzp30p8hjiqdzgx"; + sha512 = "/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA=="; }; }; "exit-0.1.2" = { @@ -913,6 +850,24 @@ let sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; }; }; + "fast-deep-equal-1.1.0" = { + name = "fast-deep-equal"; + packageName = "fast-deep-equal"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz"; + sha1 = "c053477817c86b51daa853c81e059b733d023614"; + }; + }; + "fast-json-stable-stringify-2.0.0" = { + name = "fast-json-stable-stringify"; + packageName = "fast-json-stable-stringify"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; + sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; + }; + }; "forever-agent-0.5.2" = { name = "forever-agent"; packageName = "forever-agent"; @@ -940,13 +895,13 @@ let sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; }; }; - "form-data-2.1.4" = { + "form-data-2.3.2" = { name = "form-data"; packageName = "form-data"; - version = "2.1.4"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz"; - sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1"; + url = "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz"; + sha1 = "4970498be604c20c005d4f5c23aecd21d6b49099"; }; }; "fs.realpath-1.0.0" = { @@ -964,7 +919,16 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; - sha512 = "38chm1mh077ksx6hy2sssfz4q29hf0ncb9k6ila7si54zqcpl5fxd1rh6wi82blqp7jcspf4aynr7jqhbsg2yc9y42xpqqp6c1jz2n8"; + sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; + }; + }; + "get-assigned-identifiers-1.2.0" = { + name = "get-assigned-identifiers"; + packageName = "get-assigned-identifiers"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz"; + sha512 = "mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ=="; }; }; "getpass-0.1.7" = { @@ -982,7 +946,7 @@ let version = "7.1.2"; src = fetchurl { url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"; - sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h"; + sha512 = "MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ=="; }; }; "graceful-fs-4.1.11" = { @@ -994,49 +958,40 @@ let sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; }; }; - "growl-1.10.3" = { + "growl-1.10.5" = { name = "growl"; packageName = "growl"; - version = "1.10.3"; + version = "1.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz"; - sha512 = "3aibvz85l13j140w4jjdk8939q6r7dnf8ay2licxgkaaldk7wbm093c1p5g7k5cg80rl0xslmczyraawfgdr82hhxn7rfsm1rn6rac4"; + url = "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz"; + sha512 = "qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA=="; }; }; - "har-schema-1.0.5" = { + "har-schema-2.0.0" = { name = "har-schema"; packageName = "har-schema"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz"; - sha1 = "d263135f43307c02c602afc8fe95970c0151369e"; - }; - }; - "har-validator-4.2.1" = { - name = "har-validator"; - packageName = "har-validator"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz"; - sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a"; - }; - }; - "has-1.0.1" = { - name = "has"; - packageName = "has"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/has/-/has-1.0.1.tgz"; - sha1 = "8461733f538b0837c9361e39a9ab9e9704dc2f28"; - }; - }; - "has-flag-2.0.0" = { - name = "has-flag"; - packageName = "has-flag"; version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz"; - sha1 = "e8207af1cc7b30d446cc70b734b5e8be18f88d51"; + url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; + sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + }; + }; + "har-validator-5.0.3" = { + name = "har-validator"; + packageName = "har-validator"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz"; + sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd"; + }; + }; + "has-1.0.3" = { + name = "has"; + packageName = "has"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; + sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; }; }; "has-flag-3.0.0" = { @@ -1048,15 +1003,6 @@ let sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; }; }; - "hash-base-2.0.2" = { - name = "hash-base"; - packageName = "hash-base"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz"; - sha1 = "66ea1d856db4e8a5470cadf6fce23ae5244ef2e1"; - }; - }; "hash-base-3.0.4" = { name = "hash-base"; packageName = "hash-base"; @@ -1066,13 +1012,13 @@ let sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918"; }; }; - "hash.js-1.1.3" = { + "hash.js-1.1.4" = { name = "hash.js"; packageName = "hash.js"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz"; - sha512 = "0f88i7rv3ib8lwdh5z5lwrml404frzb1a9n3g25y85jpfng82vzsv7m3c5fbyrpq5ki4c3pa8823z3s61xfigm45q469nqnzp416hgx"; + url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.4.tgz"; + sha512 = "A6RlQvvZEtFS5fLU43IDu0QUmBy+fDO9VMdTXvufKwIkt/rFfvICAViCax5fbDO4zdNzaC3/27ZhKUok5bAJyw=="; }; }; "hawk-1.0.0" = { @@ -1084,15 +1030,6 @@ let sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d"; }; }; - "hawk-3.1.3" = { - name = "hawk"; - packageName = "hawk"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"; - sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4"; - }; - }; "he-1.1.1" = { name = "he"; packageName = "he"; @@ -1120,15 +1057,6 @@ let sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; }; }; - "hoek-2.16.3" = { - name = "hoek"; - packageName = "hoek"; - version = "2.16.3"; - src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"; - sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; - }; - }; "htmlescape-1.1.1" = { name = "htmlescape"; packageName = "htmlescape"; @@ -1156,13 +1084,13 @@ let sha1 = "4fbdac132559aa8323121e540779c0a012b27e66"; }; }; - "http-signature-1.1.1" = { + "http-signature-1.2.0" = { name = "http-signature"; packageName = "http-signature"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"; - sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf"; + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; + sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; }; }; "https-browserify-1.0.0" = { @@ -1174,13 +1102,13 @@ let sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"; }; }; - "ieee754-1.1.8" = { + "ieee754-1.1.12" = { name = "ieee754"; packageName = "ieee754"; - version = "1.1.8"; + version = "1.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz"; - sha1 = "be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"; + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz"; + sha512 = "GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA=="; }; }; "image-size-0.5.5" = { @@ -1192,15 +1120,6 @@ let sha1 = "09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"; }; }; - "indexof-0.0.1" = { - name = "indexof"; - packageName = "indexof"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"; - sha1 = "82dc336d232b9062179d05ab3293a66059fd435d"; - }; - }; "inflight-1.0.6" = { name = "inflight"; packageName = "inflight"; @@ -1252,7 +1171,7 @@ let version = "1.3.5"; src = fetchurl { url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; - sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5"; + sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="; }; }; "inline-source-map-0.6.2" = { @@ -1264,13 +1183,13 @@ let sha1 = "f9393471c18a79d1724f863fa38b586370ade2a5"; }; }; - "insert-module-globals-7.0.2" = { + "insert-module-globals-7.2.0" = { name = "insert-module-globals"; packageName = "insert-module-globals"; - version = "7.0.2"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.0.2.tgz"; - sha512 = "19lb0lqjmyxr13va9m2mdyjmpfb2c4lgnnnwysri85znpa37gcgi6b57zj0h5ymk6fbl3snjfw07gb9azb8yvkldj6av6wdvs1knyx7"; + url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.2.0.tgz"; + sha512 = "VE6NlW+WGn2/AeOMd496AHFYmE7eLKkUY6Ty31k4og5vmA3Fjuwe9v6ifH6Xx/Hz27QvdoMoviw1/pqWRB09Sw=="; }; }; "interpret-1.1.0" = { @@ -1288,7 +1207,7 @@ let version = "1.1.6"; src = fetchurl { url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"; - sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm"; + sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; }; }; "is-typedarray-1.0.0" = { @@ -1318,6 +1237,15 @@ let sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; }; }; + "isarray-2.0.4" = { + name = "isarray"; + packageName = "isarray"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-2.0.4.tgz"; + sha512 = "GMxXOiUirWg1xTKRipM0Ek07rX+ubx4nNVElTJdNLYmNO/2YrDkgJGw9CljXn+r4EWiDQg/8lsRdHyg2PJuUaA=="; + }; + }; "isstream-0.1.2" = { name = "isstream"; packageName = "isstream"; @@ -1345,6 +1273,15 @@ let sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; }; }; + "json-schema-traverse-0.3.1" = { + name = "json-schema-traverse"; + packageName = "json-schema-traverse"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz"; + sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340"; + }; + }; "json-stable-stringify-0.0.1" = { name = "json-stable-stringify"; packageName = "json-stable-stringify"; @@ -1354,15 +1291,6 @@ let sha1 = "611c23e814db375527df851193db59dd2af27f45"; }; }; - "json-stable-stringify-1.0.1" = { - name = "json-stable-stringify"; - packageName = "json-stable-stringify"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"; - sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af"; - }; - }; "json-stringify-safe-5.0.1" = { name = "json-stringify-safe"; packageName = "json-stringify-safe"; @@ -1405,7 +1333,7 @@ let version = "1.1.27"; src = fetchurl { url = "https://registry.npmjs.org/just-extend/-/just-extend-1.1.27.tgz"; - sha512 = "3x01f92pvzs341qv1cin9mb3yiimkzjpy0f4dms78ki26ba01kjqcjpcm85sw005lc8d5dkk9wsigwh7zawnh10vml03siifbbnk5cq"; + sha512 = "mJVp13Ix6gFo3SBAy9U/kL+oeZqzlYYYLQBwXVBlVzIsZwBqGREnOro24oC/8s8aox+rJhtZ2DiQof++IrkA+g=="; }; }; "kew-0.1.7" = { @@ -1417,22 +1345,13 @@ let sha1 = "0a32a817ff1a9b3b12b8c9bacf4bc4d679af8e72"; }; }; - "labeled-stream-splicer-2.0.0" = { + "labeled-stream-splicer-2.0.1" = { name = "labeled-stream-splicer"; packageName = "labeled-stream-splicer"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.0.tgz"; - sha1 = "a52e1d138024c00b86b1c0c91f677918b8ae0a59"; - }; - }; - "lexical-scope-1.2.0" = { - name = "lexical-scope"; - packageName = "lexical-scope"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz"; - sha1 = "fcea5edc704a4b3a8796cdca419c3a0afaf22df4"; + url = "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.1.tgz"; + sha512 = "MC94mHZRvJ3LfykJlTUipBqenZz1pacOZEMhhQ8dMGcDHs0SBE5GbsavUXV7YtP3icBW17W0Zy1I0lfASmo9Pg=="; }; }; "lodash-3.7.0" = { @@ -1462,13 +1381,13 @@ let sha1 = "2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"; }; }; - "lolex-2.3.2" = { + "lolex-2.7.0" = { name = "lolex"; packageName = "lolex"; - version = "2.3.2"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/lolex/-/lolex-2.3.2.tgz"; - sha512 = "2g7dp64fm1kp17mxgz5r8hlgd65k8wfxz8jwcgqskdxn7vsnm6vj1bylcqblyzl6879p3g7qcjqqwmw0nik6032fksb33q5v7d4v6h3"; + url = "https://registry.npmjs.org/lolex/-/lolex-2.7.0.tgz"; + sha512 = "uJkH2e0BVfU5KOJUevbTOtpDduooSarH5PopO+LfM/vZf8Z9sJzODqKev804JYM2i++ktJfUmC1le4LwFQ1VMg=="; }; }; "md5.js-1.3.4" = { @@ -1486,7 +1405,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz"; - sha512 = "12277knznlw4myxmgg6vgkrwmrhj9dyniscrlph3s08ndi2q25v3wrv6rwanvz29v5k5x756xa5yif4xllrghpn3jqaamnr3cp5ypnp"; + sha512 = "115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA=="; }; }; "mime-1.2.11" = { @@ -1504,7 +1423,7 @@ let version = "1.6.0"; src = fetchurl { url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"; - sha512 = "1x901mk5cdib4xp27v4ivwwr7mhy64r4rk953bzivi5p9lf2bhw88ra2rhkd254xkdx2d3q30zkq239vc4yx4pfsj4hpys8rbr6fif7"; + sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; "mime-db-1.33.0" = { @@ -1513,7 +1432,7 @@ let version = "1.33.0"; src = fetchurl { url = "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz"; - sha512 = "36xnw59ik9fqym00cmwb5nyzg0l03k70cp413f7639j93wgmzk1mh0xjc7i6zz3r6k9xnwh0g5cm5a1f3y8c6plgy4qld7fm887ywh4"; + sha512 = "BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="; }; }; "mime-types-2.1.18" = { @@ -1522,16 +1441,16 @@ let version = "2.1.18"; src = fetchurl { url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz"; - sha512 = "22krj1kw7n9z10zdyx7smcaim4bzwqsqzhspwha06q58gcrxfp93hw2cd0vk5crhq5p2dwzqlpacg32lrmp5sjzb798zdzy35mdmkwm"; + sha512 = "lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ=="; }; }; - "minimalistic-assert-1.0.0" = { + "minimalistic-assert-1.0.1" = { name = "minimalistic-assert"; packageName = "minimalistic-assert"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"; - sha1 = "702be2dda6b37f4836bcb3f5db56641b64a1d3d3"; + url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"; + sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="; }; }; "minimalistic-crypto-utils-1.0.1" = { @@ -1549,7 +1468,7 @@ let version = "3.0.4"; src = fetchurl { url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; }; "minimist-0.0.8" = { @@ -1597,13 +1516,13 @@ let sha1 = "586538c8d71fa8de90c41a46acc0481c1fb83e18"; }; }; - "module-deps-6.0.0" = { + "module-deps-6.1.0" = { name = "module-deps"; packageName = "module-deps"; - version = "6.0.0"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/module-deps/-/module-deps-6.0.0.tgz"; - sha512 = "0ri32x2v7ywi8n4h92scc5pq6zlh7mmzbmk0gh2gsh3490w4d9islz1rs0in98cl2h5fl0dfx2dfcad0disnaiqflw46d24ja20raq4"; + url = "https://registry.npmjs.org/module-deps/-/module-deps-6.1.0.tgz"; + sha512 = "NPs5N511VD1rrVJihSso/LiBShRbJALYBKzDW91uZYy7BpjnO4bGnZL3HjZ9yKcFdZUWwaYjDz9zxbuP7vKMuQ=="; }; }; "ms-2.0.0" = { @@ -1624,13 +1543,13 @@ let sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574"; }; }; - "nise-1.3.0" = { + "nise-1.4.2" = { name = "nise"; packageName = "nise"; - version = "1.3.0"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/nise/-/nise-1.3.0.tgz"; - sha512 = "20b9q52bz8ncm5jqjfhrhrcr2rb0y8jhb867ayrkdsf78y1c186qra112a6sj6lbnkab0dx0i1cnr2hz4l4dzzkn1l8khvc71vspqjk"; + url = "https://registry.npmjs.org/nise/-/nise-1.4.2.tgz"; + sha512 = "BxH/DxoQYYdhKgVAfqVy4pzXRZELHOIewzoesxpjYvpU+7YOalQhGNPf7wAx8pLrTNPrHRDlLOkAl8UI0ZpXjw=="; }; }; "node-uuid-1.4.8" = { @@ -1720,7 +1639,7 @@ let version = "1.0.6"; src = fetchurl { url = "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz"; - sha512 = "1r9hy37qsbhv5ipsydkbir2yl7qg3lbpgj4qzrnb903w8mhj9ibaww0zykbp0ak1nxxp6mpbws3xsrf7fgq39zchci90c7chgqvh1wm"; + sha512 = "lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg=="; }; }; "parents-1.0.1" = { @@ -1732,22 +1651,22 @@ let sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751"; }; }; - "parse-asn1-5.1.0" = { + "parse-asn1-5.1.1" = { name = "parse-asn1"; packageName = "parse-asn1"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz"; - sha1 = "37c4f9b7ed3ab65c74817b5f2480937fbf97c712"; + url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz"; + sha512 = "KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw=="; }; }; - "path-browserify-0.0.0" = { + "path-browserify-0.0.1" = { name = "path-browserify"; packageName = "path-browserify"; - version = "0.0.0"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz"; - sha1 = "a0b870729aae214005b7d5032ec2cbbb0fb4451a"; + url = "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz"; + sha512 = "BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ=="; }; }; "path-is-absolute-1.0.1" = { @@ -1786,22 +1705,22 @@ let sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d"; }; }; - "pbkdf2-3.0.14" = { + "pbkdf2-3.0.16" = { name = "pbkdf2"; packageName = "pbkdf2"; - version = "3.0.14"; + version = "3.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz"; - sha512 = "30bb7vx0m1k1m3d1i1khgvmgddx3ahqgprs421ssrh5plpx50k5bazsj67gdi7qiknircqy59yxbclq95s2rnmk8ysgkqdpsddijfw2"; + url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz"; + sha512 = "y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA=="; }; }; - "performance-now-0.2.0" = { + "performance-now-2.1.0" = { name = "performance-now"; packageName = "performance-now"; - version = "0.2.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz"; - sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"; + url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; + sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; "phantomjs-1.9.7-15" = { @@ -1822,22 +1741,13 @@ let sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182"; }; }; - "process-nextick-args-1.0.7" = { - name = "process-nextick-args"; - packageName = "process-nextick-args"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"; - sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; - }; - }; "process-nextick-args-2.0.0" = { name = "process-nextick-args"; packageName = "process-nextick-args"; version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz"; - sha512 = "0rw8xpqqkhs91722slvzf8icxfaimqp4w8zb3840jxr7r8n8035byl6dhdi5bm0yr6x7sdws0gf3m025fg6hqgaklwlbl4d7bah5l9j"; + sha512 = "MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="; }; }; "progress-1.1.8" = { @@ -1855,7 +1765,7 @@ let version = "7.3.1"; src = fetchurl { url = "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz"; - sha512 = "17cn4nns2nxh9r0pdiqsqx3fpvaa82c1mhcr8r84k2a9hkpb0mj4bxzfbg3l9iy74yn9hj6mh2gsddsi3v939a1zp7ycbzqkxfm12cy"; + sha512 = "nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg=="; }; }; "proto-list-1.2.4" = { @@ -1876,13 +1786,22 @@ let sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476"; }; }; - "public-encrypt-4.0.0" = { + "psl-1.1.28" = { + name = "psl"; + packageName = "psl"; + version = "1.1.28"; + src = fetchurl { + url = "https://registry.npmjs.org/psl/-/psl-1.1.28.tgz"; + sha512 = "+AqO1Ae+N/4r7Rvchrdm432afjT9hqJRyBN3DQv9At0tPz4hIFSGKbq64fN9dVoCow4oggIIax5/iONx0r9hZw=="; + }; + }; + "public-encrypt-4.0.2" = { name = "public-encrypt"; packageName = "public-encrypt"; - version = "4.0.0"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz"; - sha1 = "39f699f3a46560dd5ebacbca693caf7c65c18cc6"; + url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz"; + sha512 = "4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q=="; }; }; "punycode-1.3.2" = { @@ -1912,13 +1831,13 @@ let sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107"; }; }; - "qs-6.4.0" = { + "qs-6.5.2" = { name = "qs"; packageName = "qs"; - version = "6.4.0"; + version = "6.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"; - sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; + url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; + sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; }; }; "querystring-0.2.0" = { @@ -1945,7 +1864,7 @@ let version = "2.0.6"; src = fetchurl { url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz"; - sha512 = "3a0zyz736klfzzpd9vwag3gznq7lrj57igm474dq279gsnyqdgfm1brhrs78ky30gsdwz9rwnjjms00fpdpp2p3x8p9mq2zbhw3k108"; + sha512 = "CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A=="; }; }; "randomfill-1.0.4" = { @@ -1954,7 +1873,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz"; - sha512 = "0pm7c7mw7a3qwjr21f8cvxaa2sq5l4svqs51lppn833x0yvz3yx8x4vbd4rswjynykvlgvn4hrpq327pvbzp428f4b1fciy3xnmrfgk"; + sha512 = "87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw=="; }; }; "read-only-stream-2.0.0" = { @@ -1975,22 +1894,13 @@ let sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; }; }; - "readable-stream-2.0.6" = { + "readable-stream-2.3.6" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.0.6"; + version = "2.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"; - sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e"; - }; - }; - "readable-stream-2.3.5" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz"; - sha512 = "09n3j4jsfl2lq3gj65qwn5b3lvzb624lrb8m14h81ls9cw59vvm8436gm5zwaqxf6y1zrfwbrsmizsq48jw1s3qj9zhpjp438735bdl"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz"; + sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw=="; }; }; "rechoir-0.6.2" = { @@ -2011,13 +1921,13 @@ let sha1 = "28c6c04262c7b9ffdd21b9255374517ee6d943f5"; }; }; - "request-2.81.0" = { + "request-2.87.0" = { name = "request"; packageName = "request"; - version = "2.81.0"; + version = "2.87.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz"; - sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; + url = "https://registry.npmjs.org/request/-/request-2.87.0.tgz"; + sha512 = "fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw=="; }; }; "request-progress-0.3.1" = { @@ -2038,13 +1948,13 @@ let sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; }; }; - "resolve-1.5.0" = { + "resolve-1.8.1" = { name = "resolve"; packageName = "resolve"; - version = "1.5.0"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz"; - sha512 = "25scf9zkhf5yc9x3d7mfq2im5vyxmq3ih939na6jzblal7mgfcijmadl2maz501mkccykj714gvdhhmlzi86hbk7k03r9ipnwd142l6"; + url = "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz"; + sha512 = "AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA=="; }; }; "rimraf-2.2.8" = { @@ -2056,22 +1966,31 @@ let sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; }; }; - "ripemd160-2.0.1" = { + "ripemd160-2.0.2" = { name = "ripemd160"; packageName = "ripemd160"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz"; - sha1 = "0f4584295c53a3628af7e6d79aca21ce57d1c6e7"; + url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz"; + sha512 = "ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA=="; }; }; - "safe-buffer-5.1.1" = { + "safe-buffer-5.1.2" = { name = "safe-buffer"; packageName = "safe-buffer"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"; - sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh"; + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + }; + }; + "safer-buffer-2.1.2" = { + name = "safer-buffer"; + packageName = "safer-buffer"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; "samsam-1.3.0" = { @@ -2080,7 +1999,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/samsam/-/samsam-1.3.0.tgz"; - sha512 = "1p5ac86nbwsyxsaqbfa288xk904a0lfc8fph9h2nflvgmz5ilwyprs12lb6as5n6k8q24y541sr4bvv7dy3pl1d2nnm6lpw7xh0hz6l"; + sha512 = "1HwIYD/8UlOtFS3QO3w7ey+SdSDFE4HRNLZoZRYVQefrOY3l17epswImeB1ijgJFQJodIaHcwkp3r/myBjFVbg=="; }; }; "semver-1.1.4" = { @@ -2092,13 +2011,13 @@ let sha1 = "2e5a4e72bab03472cc97f72753b4508912ef5540"; }; }; - "sha.js-2.4.10" = { + "sha.js-2.4.11" = { name = "sha.js"; packageName = "sha.js"; - version = "2.4.10"; + version = "2.4.11"; src = fetchurl { - url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.10.tgz"; - sha512 = "2lfna0mg4mzdki4p3q29rsgywbghvy6f6jy6b61zj68d2d936wfqjgqpsdjchfcqkiim53qknpcnq9iiafyidfrw154qf75a2n2cz5y"; + url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz"; + sha512 = "QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ=="; }; }; "shasum-1.0.2" = { @@ -2134,7 +2053,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/should-equal/-/should-equal-2.0.0.tgz"; - sha512 = "16cp397231rnlk9vc4i8jggycqwxpgrn3pm9l2bf5y02ln4gawz41z2ycqnw9h1rkm7x8zf5qy5d7jv7ll0c634p62fpxfar96gmzb4"; + sha512 = "ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA=="; }; }; "should-format-3.0.3" = { @@ -2161,7 +2080,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.1.0.tgz"; - sha512 = "1y2b2dwphk185za2spffsr383na1pdjl2bf8lwv6yzaix1q9px92brp5i0m670kz5lb9kdlxkp61vq53v7mcxjadhgfjdz7h9v223i4"; + sha512 = "JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA=="; }; }; "should-util-1.0.0" = { @@ -2173,6 +2092,15 @@ let sha1 = "c98cda374aa6b190df8ba87c9889c2b4db620063"; }; }; + "simple-concat-1.0.0" = { + name = "simple-concat"; + packageName = "simple-concat"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.0.tgz"; + sha1 = "7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6"; + }; + }; "sntp-0.2.4" = { name = "sntp"; packageName = "sntp"; @@ -2182,15 +2110,6 @@ let sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; }; }; - "sntp-1.0.9" = { - name = "sntp"; - packageName = "sntp"; - version = "1.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; - sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; - }; - }; "source-map-0.5.7" = { name = "source-map"; packageName = "source-map"; @@ -2206,16 +2125,16 @@ let version = "0.6.1"; src = fetchurl { url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; - sha512 = "3p7hw8p69ikj5mwapmqkacsjnbvdfk5ylyamjg9x5izkl717xvzj0vk3fnmx1n4pf54h5rs7r8ig5kk4jv4ycqqj0hv75cnx6k1lf2j"; + sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; }; - "sshpk-1.14.1" = { + "sshpk-1.14.2" = { name = "sshpk"; packageName = "sshpk"; - version = "1.14.1"; + version = "1.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz"; - sha1 = "130f5975eddad963f1d56f92b9ac6c51fa9f83eb"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz"; + sha1 = "c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"; }; }; "stream-browserify-2.0.1" = { @@ -2236,13 +2155,13 @@ let sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe"; }; }; - "stream-http-2.8.0" = { + "stream-http-2.8.3" = { name = "stream-http"; packageName = "stream-http"; - version = "2.8.0"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/stream-http/-/stream-http-2.8.0.tgz"; - sha512 = "2ghzil78wsr29z8p1883i0vwx9gpsspha4wvdbpvqzbknrfiavwis010i5a7vy0xx8n486f6kwmjxsk3mg1w4bjy4whvizriz28b4xi"; + url = "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz"; + sha512 = "+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw=="; }; }; "stream-splicer-2.0.0" = { @@ -2263,22 +2182,13 @@ let sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; }; }; - "string_decoder-1.0.3" = { + "string_decoder-1.1.1" = { name = "string_decoder"; packageName = "string_decoder"; - version = "1.0.3"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz"; - sha512 = "22vw5mmwlyblqc2zyqwl39wyhyahhpiyknim8iz5fk6xi002x777gkswiq8fh297djs5ii4pgrys57wq33hr5zf3xfd0d7kjxkzl0g0"; - }; - }; - "stringstream-0.0.5" = { - name = "stringstream"; - packageName = "stringstream"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"; - sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878"; + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; }; "strip-json-comments-1.0.4" = { @@ -2299,22 +2209,13 @@ let sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2"; }; }; - "supports-color-4.4.0" = { + "supports-color-5.4.0" = { name = "supports-color"; packageName = "supports-color"; - version = "4.4.0"; + version = "5.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz"; - sha512 = "1flwwfdd7gg94xrc0b2ard3qjx4cpy600q49gx43y8pzvs7j56q78bjhv8mk18vgbggr4fd11jda8ck5cdrkc5jcjs04nlp7kwbg85c"; - }; - }; - "supports-color-5.3.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz"; - sha512 = "0v9skvg8c5hgqfsm98p7d7hisk11syjdvl3nxid3ik572hbjwv4vyzws7q0n1yz8mvb1asbk00838fi09hyfskrng54icn8nbag98yi"; + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz"; + sha512 = "zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w=="; }; }; "syntax-error-1.4.0" = { @@ -2323,7 +2224,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz"; - sha512 = "3psid3r9b0gmnkf2ggydlw1nrcnyqa78smdihifdvff5vmlq92v8qyd6zfi94wczhllcyxl78zbc47cvz3h6xpa9v372xp6msxybwv0"; + sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; "text-encoding-0.6.4" = { @@ -2386,7 +2287,16 @@ let version = "2.3.4"; src = fetchurl { url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz"; - sha512 = "0ncm6j3cjq1f26mzjf04k9bkw1b08w53s4qa3a11c1bdj4pgnqv1422c1xs5jyy6y1psppjx52fhagq5zkjkgrcpdkxcdiry96r77jd"; + sha512 = "TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA=="; + }; + }; + "tough-cookie-2.4.3" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz"; + sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ=="; }; }; "tty-browserify-0.0.1" = { @@ -2395,7 +2305,7 @@ let version = "0.0.1"; src = fetchurl { url = "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz"; - sha512 = "33h4i99m8bj5vqm3hmvfhi19whavny64ic0mr4yl8s14riw077ballp49zbv3kzy8615pad3gfcy7fxa86za1q41biqpmdwn8xxlx0b"; + sha512 = "C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw=="; }; }; "tunnel-agent-0.4.3" = { @@ -2431,7 +2341,7 @@ let version = "4.0.8"; src = fetchurl { url = "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz"; - sha512 = "3z3kf4kgd3czn50a158v1k2l61lpbznrbk8xvh2pdsfsrcsda3271427fzmp1r7awnvvzrhzclfm03cpv671rdlqyz56xpmh6cgzyni"; + sha512 = "0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="; }; }; "typedarray-0.0.6" = { @@ -2443,13 +2353,22 @@ let sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; }; - "umd-3.0.2" = { + "umd-3.0.3" = { name = "umd"; packageName = "umd"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/umd/-/umd-3.0.2.tgz"; - sha512 = "0wgy2hbi34ncj74m0vw30yjcrw0wg3m465r28y458kvvkp7lsmm3klki0f79slyspfnr4c3l0qzcmpggcybk4d6lcb05kh0aj5c2rx6"; + url = "https://registry.npmjs.org/umd/-/umd-3.0.3.tgz"; + sha512 = "4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow=="; + }; + }; + "undeclared-identifiers-1.1.2" = { + name = "undeclared-identifiers"; + packageName = "undeclared-identifiers"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.2.tgz"; + sha512 = "13EaeocO4edF/3JKime9rD7oB6QI8llAGhgn5fKOPyfkJbRb6NFv9pYV6dFEmpa4uRjKeBqLZP8GpuzqHlKDMQ=="; }; }; "url-0.11.0" = { @@ -2470,6 +2389,15 @@ let sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9"; }; }; + "util-0.10.4" = { + name = "util"; + packageName = "util"; + version = "0.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/util/-/util-0.10.4.tgz"; + sha512 = "0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A=="; + }; + }; "util-deprecate-1.0.2" = { name = "util-deprecate"; packageName = "util-deprecate"; @@ -2479,13 +2407,13 @@ let sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; }; }; - "uuid-3.2.1" = { + "uuid-3.3.0" = { name = "uuid"; packageName = "uuid"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz"; - sha512 = "0843vl1c974n8kw5kn0kvhvhwk8y8jydr0xkwwl2963xxmkw4ingk6xj9c8m48jw2i95giglxzq5aw5v5mij9kv7fzln8pxav1cr6cd"; + url = "https://registry.npmjs.org/uuid/-/uuid-3.3.0.tgz"; + sha512 = "ijO9N2xY/YaOqQ5yz5c4sy2ZjWmA6AR6zASb/gdpeKZ8+948CxwfMW9RrKVk5may6ev8c0/Xguu32e2Llelpqw=="; }; }; "verror-1.10.0" = { @@ -2497,13 +2425,13 @@ let sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; }; }; - "vm-browserify-0.0.4" = { + "vm-browserify-1.1.0" = { name = "vm-browserify"; packageName = "vm-browserify"; - version = "0.0.4"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz"; - sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"; + url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz"; + sha512 = "iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw=="; }; }; "which-1.0.9" = { @@ -2539,15 +2467,15 @@ in marked = nodeEnv.buildNodePackage { name = "marked"; packageName = "marked"; - version = "0.3.17"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-0.3.17.tgz"; - sha512 = "2cw4hwy4hyxspppby5ww0sljhyg0nhlgy0aamqvf7nrhg4vyrgyp8ah52pz99rr8pvsjk3h9z9q8fhrlqaixw5kgk2si5yrr0v9n0pq"; + url = "https://registry.npmjs.org/marked/-/marked-0.4.0.tgz"; + sha512 = "tMsdNBgOsrUophCAFQl0XPe6Zqk/uy9gnue+jIIKhykO51hxyu6uNx7zBPy0+y/WKYVZZMspV9YeXLNdKk+iYw=="; }; buildInputs = globalBuildInputs; meta = { description = "A markdown parser built for speed"; - homepage = https://github.com/markedjs/marked; + homepage = https://marked.js.org/; license = "MIT"; }; production = true; @@ -2556,152 +2484,142 @@ in browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "16.1.1"; + version = "16.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-16.1.1.tgz"; - sha512 = "01ay1w7sndfvwjdc5n7sa9a4yzzrwdr8agj1655dz50f0g034scaqli9v1dngxasi8gk8gqvqcsqnmphvwkj1y6awlq1y5l6bbgc8c9"; + url = "https://registry.npmjs.org/browserify/-/browserify-16.2.2.tgz"; + sha512 = "fMES05wq1Oukts6ksGUU2TMVHHp06LyQt0SIwbXIHm7waSrQmNBZePsU0iM/4f94zbvb/wHma+D1YrdzWYnF/A=="; }; dependencies = [ - sources."JSONStream-1.3.2" - sources."acorn-4.0.13" - sources."acorn-node-1.3.0" + sources."JSONStream-1.3.3" + sources."acorn-5.7.1" + sources."acorn-dynamic-import-3.0.0" + sources."acorn-node-1.5.2" sources."array-filter-0.0.1" sources."array-map-0.0.0" sources."array-reduce-0.0.0" sources."asn1.js-4.10.1" - sources."assert-1.4.1" - sources."astw-2.2.0" + (sources."assert-1.4.1" // { + dependencies = [ + sources."inherits-2.0.1" + sources."util-0.10.3" + ]; + }) sources."balanced-match-1.0.0" - sources."base64-js-1.2.3" + sources."base64-js-1.3.0" sources."bn.js-4.11.8" sources."brace-expansion-1.1.11" sources."brorand-1.1.0" - sources."browser-pack-6.0.4" - (sources."browser-resolve-1.11.2" // { + sources."browser-pack-6.1.0" + (sources."browser-resolve-1.11.3" // { dependencies = [ sources."resolve-1.1.7" ]; }) - sources."browserify-aes-1.1.1" - sources."browserify-cipher-1.0.0" - sources."browserify-des-1.0.0" + sources."browserify-aes-1.2.0" + sources."browserify-cipher-1.0.1" + sources."browserify-des-1.0.1" sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" sources."buffer-5.1.0" + sources."buffer-from-1.1.0" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."cached-path-relative-1.0.1" sources."cipher-base-1.0.4" sources."combine-source-map-0.8.0" sources."concat-map-0.0.1" - sources."concat-stream-1.6.1" + sources."concat-stream-1.6.2" sources."console-browserify-1.1.0" sources."constants-browserify-1.0.0" sources."convert-source-map-1.1.3" sources."core-util-is-1.0.2" - sources."create-ecdh-4.0.0" - sources."create-hash-1.1.3" - sources."create-hmac-1.1.6" - (sources."crypto-browserify-3.12.0" // { - dependencies = [ - sources."hash-base-2.0.2" - ]; - }) + sources."create-ecdh-4.0.3" + sources."create-hash-1.2.0" + sources."create-hmac-1.1.7" + sources."crypto-browserify-3.12.0" sources."date-now-0.1.4" sources."defined-1.0.0" sources."deps-sort-2.0.0" sources."des.js-1.0.0" - sources."detective-5.1.0" - sources."diffie-hellman-5.0.2" + (sources."detective-5.1.0" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."diffie-hellman-5.0.3" sources."domain-browser-1.2.0" sources."duplexer2-0.1.4" sources."elliptic-6.4.0" - sources."events-2.0.0" + sources."events-2.1.0" sources."evp_bytestokey-1.0.3" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" + sources."get-assigned-identifiers-1.2.0" sources."glob-7.1.2" - sources."has-1.0.1" + sources."has-1.0.3" sources."hash-base-3.0.4" - sources."hash.js-1.1.3" + sources."hash.js-1.1.4" sources."hmac-drbg-1.0.1" sources."htmlescape-1.1.1" sources."https-browserify-1.0.0" - sources."ieee754-1.1.8" - sources."indexof-0.0.1" + sources."ieee754-1.1.12" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."inline-source-map-0.6.2" - (sources."insert-module-globals-7.0.2" // { - dependencies = [ - sources."combine-source-map-0.7.2" - sources."concat-stream-1.5.2" - sources."readable-stream-2.0.6" - sources."string_decoder-0.10.31" - ]; - }) + sources."insert-module-globals-7.2.0" sources."is-buffer-1.1.6" - sources."isarray-1.0.0" + sources."isarray-2.0.4" sources."json-stable-stringify-0.0.1" sources."jsonify-0.0.0" sources."jsonparse-1.3.1" - (sources."labeled-stream-splicer-2.0.0" // { - dependencies = [ - sources."isarray-0.0.1" - ]; - }) - sources."lexical-scope-1.2.0" + sources."labeled-stream-splicer-2.0.1" sources."lodash.memoize-3.0.4" sources."md5.js-1.3.4" sources."miller-rabin-4.0.1" - sources."minimalistic-assert-1.0.0" + sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - (sources."module-deps-6.0.0" // { - dependencies = [ - sources."acorn-5.5.3" - sources."minimist-1.2.0" - ]; - }) + sources."module-deps-6.1.0" sources."once-1.4.0" sources."os-browserify-0.3.0" sources."pako-1.0.6" sources."parents-1.0.1" - sources."parse-asn1-5.1.0" - sources."path-browserify-0.0.0" + sources."parse-asn1-5.1.1" + sources."path-browserify-0.0.1" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.5" sources."path-platform-0.11.15" - sources."pbkdf2-3.0.14" + sources."pbkdf2-3.0.16" sources."process-0.11.10" - sources."process-nextick-args-1.0.7" - sources."public-encrypt-4.0.0" + sources."process-nextick-args-2.0.0" + sources."public-encrypt-4.0.2" sources."punycode-1.4.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" sources."randombytes-2.0.6" sources."randomfill-1.0.4" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.3.5" // { + (sources."readable-stream-2.3.6" // { dependencies = [ - sources."process-nextick-args-2.0.0" + sources."isarray-1.0.0" ]; }) - sources."resolve-1.5.0" - sources."ripemd160-2.0.1" - sources."safe-buffer-5.1.1" - sources."sha.js-2.4.10" + sources."resolve-1.8.1" + sources."ripemd160-2.0.2" + sources."safe-buffer-5.1.2" + sources."sha.js-2.4.11" sources."shasum-1.0.2" sources."shell-quote-1.6.1" + sources."simple-concat-1.0.0" sources."source-map-0.5.7" sources."stream-browserify-2.0.1" sources."stream-combiner2-1.1.1" - sources."stream-http-2.8.0" + sources."stream-http-2.8.3" sources."stream-splicer-2.0.0" - sources."string_decoder-1.0.3" + sources."string_decoder-1.1.1" (sources."subarg-1.0.0" // { dependencies = [ sources."minimist-1.2.0" @@ -2714,19 +2632,16 @@ in sources."to-arraybuffer-1.0.1" sources."tty-browserify-0.0.1" sources."typedarray-0.0.6" - sources."umd-3.0.2" + sources."umd-3.0.3" + sources."undeclared-identifiers-1.1.2" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" ]; }) - (sources."util-0.10.3" // { - dependencies = [ - sources."inherits-2.0.1" - ]; - }) + sources."util-0.10.4" sources."util-deprecate-1.0.2" - sources."vm-browserify-0.0.4" + sources."vm-browserify-1.1.0" sources."wrappy-1.0.2" sources."xtend-4.0.1" ]; @@ -2742,19 +2657,19 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.3.14"; + version = "3.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.14.tgz"; - sha512 = "0b7d9nvyrhc5ij0xaxvgha7h97d5h36zhnwmbbbj5abk64bvn38sf4d5jwy64n8algm2q36a08n0z4k4khhnnq4h4ysvrin0lyib3rr"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.2.tgz"; + sha512 = "/kVQDzwiE9Vy7Y63eMkMozF4jIt0C2+xHctF9YpqNWdE/NLOuMurshkpoYGUlAbeYhACPv0HJPIHJul0Ak4/uw=="; }; dependencies = [ - sources."commander-2.14.1" + sources."commander-2.15.1" sources."source-map-0.6.1" ]; buildInputs = globalBuildInputs; meta = { description = "JavaScript parser, mangler/compressor and beautifier toolkit"; - homepage = http://lisperator.net/uglifyjs; + homepage = "https://github.com/mishoo/UglifyJS2#readme"; license = "BSD-2-Clause"; }; production = true; @@ -2763,79 +2678,67 @@ in less = nodeEnv.buildNodePackage { name = "less"; packageName = "less"; - version = "3.0.1"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/less/-/less-3.0.1.tgz"; - sha512 = "25qmszxk5bzrjgyy1m0k87zc1c5h19ckvnlkhl9j3ncm3zfx7rzmydj6f4sw5c7ldc4npzs41fmgd1hw113kilrk8sggwzwvfw7hi59"; + url = "https://registry.npmjs.org/less/-/less-3.0.4.tgz"; + sha512 = "q3SyEnPKbk9zh4l36PGeW2fgynKu+FpbhiUNx/yaiBUQ3V0CbACCgb9FzYWcRgI2DJlP6eI4jc8XPrCTi55YcQ=="; }; dependencies = [ - sources."ajv-4.11.8" + sources."ajv-5.5.2" sources."asap-2.0.6" sources."asn1-0.2.3" - sources."assert-plus-0.2.0" + sources."assert-plus-1.0.0" sources."asynckit-0.4.0" - sources."aws-sign2-0.6.0" - sources."aws4-1.6.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.7.0" sources."bcrypt-pbkdf-1.0.1" - sources."boom-2.10.1" sources."caseless-0.12.0" sources."co-4.6.0" sources."combined-stream-1.0.6" sources."core-util-is-1.0.2" - sources."cryptiles-2.0.5" sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.1" sources."errno-0.1.7" sources."extend-3.0.1" sources."extsprintf-1.3.0" + sources."fast-deep-equal-1.1.0" + sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.1.4" + sources."form-data-2.3.2" sources."getpass-0.1.7" sources."graceful-fs-4.1.11" - sources."har-schema-1.0.5" - sources."har-validator-4.2.1" - sources."hawk-3.1.3" - sources."hoek-2.16.3" - sources."http-signature-1.1.1" + sources."har-schema-2.0.0" + sources."har-validator-5.0.3" + sources."http-signature-1.2.0" sources."image-size-0.5.5" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" - sources."json-stable-stringify-1.0.1" + sources."json-schema-traverse-0.3.1" sources."json-stringify-safe-5.0.1" - sources."jsonify-0.0.0" - (sources."jsprim-1.4.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) + sources."jsprim-1.4.1" sources."mime-1.6.0" sources."mime-db-1.33.0" sources."mime-types-2.1.18" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" + sources."performance-now-2.1.0" sources."promise-7.3.1" sources."prr-1.0.1" sources."punycode-1.4.1" - sources."qs-6.4.0" - sources."request-2.81.0" - sources."safe-buffer-5.1.1" - sources."sntp-1.0.9" - sources."source-map-0.5.7" - (sources."sshpk-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - sources."stringstream-0.0.5" + sources."qs-6.5.2" + sources."request-2.87.0" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."source-map-0.6.1" + sources."sshpk-1.14.2" sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uuid-3.2.1" + sources."uuid-3.3.0" sources."verror-1.10.0" ]; buildInputs = globalBuildInputs; @@ -2850,24 +2753,24 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "5.0.4"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-5.0.4.tgz"; - sha512 = "1agv3n6vr1rhjv18n6nfra7wlz7jmf38aym85299fdidy0qq6wsl9zcnvsn4867dcwjgrmrfgnymvg5f7c8sxccw10lvcb8y40akhww"; + url = "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz"; + sha512 = "2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ=="; }; dependencies = [ sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."browser-stdout-1.3.1" - sources."commander-2.11.0" + sources."commander-2.15.1" sources."concat-map-0.0.1" sources."debug-3.1.0" sources."diff-3.5.0" sources."escape-string-regexp-1.0.5" sources."fs.realpath-1.0.0" sources."glob-7.1.2" - sources."growl-1.10.3" - sources."has-flag-2.0.0" + sources."growl-1.10.5" + sources."has-flag-3.0.0" sources."he-1.1.1" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -2877,7 +2780,7 @@ in sources."ms-2.0.0" sources."once-1.4.0" sources."path-is-absolute-1.0.1" - sources."supports-color-4.4.0" + sources."supports-color-5.4.0" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; @@ -2906,7 +2809,7 @@ in sources."aws-sign2-0.5.0" sources."boom-0.4.2" sources."combined-stream-0.0.7" - sources."commander-2.15.0" + sources."commander-2.15.1" (sources."config-chain-1.1.11" // { dependencies = [ sources."ini-1.3.5" @@ -2937,6 +2840,7 @@ in sources."phantomjs-1.9.7-15" sources."progress-1.1.8" sources."proto-list-1.2.4" + sources."psl-1.1.28" sources."punycode-1.4.1" sources."qs-0.6.6" sources."request-2.36.0" @@ -2945,7 +2849,7 @@ in sources."semver-1.1.4" sources."sntp-0.2.4" sources."throttleit-0.0.2" - sources."tough-cookie-2.3.4" + sources."tough-cookie-2.4.3" sources."tunnel-agent-0.4.3" sources."which-1.0.9" ]; @@ -2963,7 +2867,7 @@ in version = "13.2.1"; src = fetchurl { url = "https://registry.npmjs.org/should/-/should-13.2.1.tgz"; - sha512 = "21w1m96rk6ljlx72mlkyg4ix3bg2s4s461fpwi1i6shz7fvl6kfmyqgmij3374iq187a4qfhn7vsc0zs7qw1i61nqn3gy0f8g0cvvwp"; + sha512 = "l+/NwEMO+DcstsHEwPHRHzC9j4UOE3VQwJGcMWSsD/vqpqHbnQ+1iSHy64Ihmmjx1uiRPD9pFadTSc3MJtXAgw=="; }; dependencies = [ sources."should-equal-2.0.0" @@ -2984,10 +2888,10 @@ in sinon = nodeEnv.buildNodePackage { name = "sinon"; packageName = "sinon"; - version = "4.4.4"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/sinon/-/sinon-4.4.4.tgz"; - sha512 = "2wny4iakvr5mfcbgka4hb99893a7v00ygavndsavqpvijidhigwg9iqq9w225vgb741z0waxn4fdi2ndzp83dk2dja2fkj10kglb6q3"; + url = "https://registry.npmjs.org/sinon/-/sinon-6.0.1.tgz"; + sha512 = "rfszhNcfamK2+ofIPi9XqeH89pH7KGDcAtM+F9CsjHXOK3jzWG99vyhyD2V+r7s4IipmWcWUFYq4ftZ9/Eu2Wg=="; }; dependencies = [ sources."@sinonjs/formatio-2.0.0" @@ -2996,11 +2900,11 @@ in sources."isarray-0.0.1" sources."just-extend-1.1.27" sources."lodash.get-4.4.2" - sources."lolex-2.3.2" - sources."nise-1.3.0" + sources."lolex-2.7.0" + sources."nise-1.4.2" sources."path-to-regexp-1.7.0" sources."samsam-1.3.0" - sources."supports-color-5.3.0" + sources."supports-color-5.4.0" sources."text-encoding-0.6.4" sources."type-detect-4.0.8" ]; @@ -3032,15 +2936,12 @@ in (sources."dom-serializer-0.1.0" // { dependencies = [ sources."domelementtype-1.1.3" + sources."entities-1.1.1" ]; }) sources."domelementtype-1.3.0" sources."domhandler-2.3.0" - (sources."domutils-1.5.1" // { - dependencies = [ - sources."entities-1.1.1" - ]; - }) + sources."domutils-1.5.1" sources."entities-1.0.0" sources."exit-0.1.2" sources."fs.realpath-1.0.0" @@ -3071,10 +2972,10 @@ in shelljs = nodeEnv.buildNodePackage { name = "shelljs"; packageName = "shelljs"; - version = "0.8.1"; + version = "0.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.1.tgz"; - sha512 = "0c12wlk7s62rnm6d8cc4frddll01p5f117v2ss075y9zxxfpl5qr322bw7qdksgl7ljfc04rv2wyn6qyjv1m5953ywmgk39srif43v0"; + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.2.tgz"; + sha512 = "pRXeNrCA2Wd9itwhvLp5LZQvPJ0wU6bcjaTMywHHGX5XWhVN2nzSu7WV0q+oUY7mGK3mgSkDDzP3MgjqdyIgbQ=="; }; dependencies = [ sources."balanced-match-1.0.0" @@ -3090,7 +2991,7 @@ in sources."path-is-absolute-1.0.1" sources."path-parse-1.0.5" sources."rechoir-0.6.2" - sources."resolve-1.5.0" + sources."resolve-1.8.1" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; diff --git a/pkgs/development/web/remarkjs/nodepkgs.nix b/pkgs/development/web/remarkjs/nodepkgs.nix index 186302f2715a..846dabb21664 100644 --- a/pkgs/development/web/remarkjs/nodepkgs.nix +++ b/pkgs/development/web/remarkjs/nodepkgs.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.3. Do not edit! +# This file has been generated by node2nix 1.6.0. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/games/airstrike/default.nix b/pkgs/games/airstrike/default.nix index 24f71a5c6a16..a0bbd3b1c671 100644 --- a/pkgs/games/airstrike/default.nix +++ b/pkgs/games/airstrike/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "6a"; src = fetchurl { - url = "http://icculus.org/airstrike/airstrike-pre${version}-src.tar.gz"; + url = "https://icculus.org/airstrike/airstrike-pre${version}-src.tar.gz"; sha256 = "1h6rv2zcp84ycmd0kv1pbpqjgwx57dw42x7878d2c2vnpi5jn8qi"; }; diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix index 1b23d1ccd6d2..628a521126f5 100644 --- a/pkgs/games/alienarena/default.nix +++ b/pkgs/games/alienarena/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "alienarena-7.65"; src = fetchurl { - url = "http://icculus.org/alienarena/Files/alienarena-7.65-linux20130207.tar.gz"; + url = "https://icculus.org/alienarena/Files/alienarena-7.65-linux20130207.tar.gz"; sha256 = "03nnv4m2xmswr0020hssajncdb8sy95jp5yccsm53sgxga4r8igg"; }; diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index 2cc63e9ecdef..d0ffa10baeca 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -19,15 +19,15 @@ let binDists = { x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in { alpha = { - stable = bdist { sha256 = "0gxa8wh0py4l1ym57sfq792kfh00khi0f9ykjlmjqqkdksyxgddf"; fetcher = authenticatedFetch; }; - experimental = bdist { sha256 = "1iy3k9zrw3za9mabf89lfl8i20xfij66ih5vngz5xfyy99mwxiy6"; version = "0.16.35"; fetcher = authenticatedFetch; }; + stable = bdist { sha256 = "0b4hbpdcrh5hgip9q5dkmw22p66lcdhnr0kmb0w5dw6yi7fnxxh0"; fetcher = authenticatedFetch; }; + experimental = bdist { sha256 = "1qwfivl5wf0ii8c4prdl4yili23qimsh2cj874r37q3ygpjk3bd3"; version = "0.16.50"; fetcher = authenticatedFetch; }; }; headless = { - stable = bdist { sha256 = "0n2j86af41dkbsyyy5lawjpdd7c0lvfdwxpwbj1m8v470i1g8zq4"; }; - experimental = bdist { sha256 = "0x4miyva1lmiyv3lb4savdlycia1kzw6bri4qj9b2jmyw1dr8x8h"; version = "0.16.35"; }; + stable = bdist { sha256 = "0zrnpg2js0ysvx9y50h3gajldk16mv02dvrwnkazh5kzr1d9zc3c"; }; + experimental = bdist { sha256 = "00691kr85p58qpxf3889p20nrgsvsyspx3c8yd11dkg46wly06z1"; version = "0.16.50"; }; }; demo = { - stable = bdist { sha256 = "1z04rdlcxnfwami0l5nm292w4ydfhr1s6rcl8hxrsa73d4xk5lch"; version = "0.16.36"; }; + stable = bdist { sha256 = "0zf61z8937yd8pyrjrqdjgd0rjl7snwrm3xw86vv7s7p835san6a"; version = "0.16.51"; }; experimental = bdist { }; }; }; @@ -49,7 +49,7 @@ let actual = binDists.${stdenv.system}.${releaseType}.${branch} or (throw "Factorio: unsupported platform"); bdistForArch = arch: { sha256 ? null - , version ? "0.16.36" + , version ? "0.16.51" , fetcher ? fetchurl , nameMut ? x: x }: diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index 4115dccf577e..df1dd47905e4 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "gzdoom-${version}"; - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "coelckers"; repo = "gzdoom"; rev = "g${version}"; - sha256 = "09400w0xpw6sk593c0fr6m9qmgn6n5r1qdardizim6m0r5ki565i"; + sha256 = "1d12j6jl3bwarjwri0kjagxzi89s3413drinssgndlvmadd69sx4"; }; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 2196fede32fc..2852c6869af2 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -1,4 +1,4 @@ -{ SDL2_image, SDL2_ttf, SDL2_net, fpc, qt4, ghcWithPackages, ffmpeg, freeglut +{ SDL2_image, SDL2_ttf, SDL2_net, fpc, qt5, ghcWithPackages, ffmpeg, freeglut , stdenv, makeWrapper, fetchurl, cmake, pkgconfig, lua5_1, SDL2, SDL2_mixer , zlib, libpng, libGLU_combined, physfs }: @@ -10,17 +10,18 @@ let ]); in stdenv.mkDerivation rec { - version = "0.9.23"; + version = "0.9.24.1"; name = "hedgewars-${version}"; src = fetchurl { - url = "http://www.hedgewars.org/download/releases/hedgewars-src-${version}.tar.bz2"; - sha256 = "12df5ar3zk186ah51c3myr4hlzyybcshmf1w1wf6vr9b0h44jbns"; + url = "https://www.hedgewars.org/download/releases/hedgewars-src-${version}.tar.bz2"; + sha256 = "1f2vbndh9fnwklwjicrhy5zv2ciyhadfsny2cdqnc6lim90hldl1"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ SDL2_ttf SDL2_net cmake lua5_1 SDL2 SDL2_mixer SDL2_image fpc - qt4 ghc ffmpeg freeglut makeWrapper physfs + ghc ffmpeg freeglut makeWrapper physfs + qt5.qttools qt5.qtbase ]; postPatch = '' diff --git a/pkgs/games/hexen/default.nix b/pkgs/games/hexen/default.nix index 7dfb4cf9d3a9..48379da3a0a4 100644 --- a/pkgs/games/hexen/default.nix +++ b/pkgs/games/hexen/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "hexen-0.2.3"; src = fetchurl { - url = http://www.libsdl.org/projects/hexen/src/hexen-0.2.3.tar.gz; + url = https://www.libsdl.org/projects/hexen/src/hexen-0.2.3.tar.gz; sha256 = "c1433e930f2003c5f817f935406bb28ba15298a15b1c11f83f42df3e9f1f3bc4"; }; diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index 16e0c05e0e2c..59e1144cf967 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.12.2"; src = fetchurl { - url = "http://s3.amazonaws.com/Minecraft.Download/versions/${version}/minecraft_server.${version}.jar"; + url = "https://s3.amazonaws.com/Minecraft.Download/versions/${version}/minecraft_server.${version}.jar"; sha256 = "0zhnac6yvkdgdaag0gb0fgrkgizbwrpf7s76yqdiknfswrs947zy"; }; diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index c6697f5806d4..6be5c9ee2474 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -4,12 +4,14 @@ let libpath = with xorg; stdenv.lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ]; in stdenv.mkDerivation rec { name = "multimc-${version}"; - version = "0.6.2"; + # Current release as of 2018-06-23 (v0.6.2) breaks under Qt 5.11—see + # https://github.com/NixOS/nixpkgs/issues/42387 + version = "unstable-2018-06-04"; src = fetchFromGitHub { owner = "MultiMC"; repo = "MultiMC5"; - rev = version; - sha256 = "07jrr6si8nzfqwf073zhgw47y6snib23ad3imh1ik1nn5r7wqy3c"; + rev = "19bb50b872da2702b8e0b65f3f7b6b54c1c5b071"; + sha256 = "01frkk2klm1axr7ywnj23ikxn5pkgj8q6w8vqbslsvmh8bni8rk0"; fetchSubmodules = true; }; nativeBuildInputs = [ cmake file makeWrapper ]; @@ -22,6 +24,12 @@ in stdenv.mkDerivation rec { cp ../application/resources/multimc/scalable/multimc.svg $out/share/pixmaps cp ../application/package/linux/multimc.desktop $out/share/applications wrapProgram $out/bin/MultiMC --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} --prefix PATH : ${jdk}/bin/ + + # As of https://github.com/MultiMC/MultiMC5/blob/7ea1d68244fdae1e7672fb84199ee71e168b31ca/application/package/linux/multimc.desktop, + # the desktop icon refers to `multimc`, but the executable actually gets + # installed as `MultiMC`. Create compatibility symlink to fix the desktop + # icon. + ln -sf $out/bin/MultiMC $out/bin/multimc ''; meta = with stdenv.lib; { diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index 9dd76581fd8b..1ad7565f4508 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation { name = "nethack-3.6.1"; src = fetchurl { - url = "http://nethack.org/download/3.6.1/nethack-361-src.tgz"; + url = "https://nethack.org/download/3.6.1/nethack-361-src.tgz"; sha256 = "1dha0ijvxhx7c9hr0452h93x81iiqsll8bc9msdnp7xdqcfbz32b"; }; diff --git a/pkgs/games/openclonk/default.nix b/pkgs/games/openclonk/default.nix index e4bcef29878c..fa0411196318 100644 --- a/pkgs/games/openclonk/default.nix +++ b/pkgs/games/openclonk/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { name = "openclonk-${version}"; src = fetchurl { - url = "http://www.openclonk.org/builds/release/8.1/openclonk-${version}-src.tar.bz2"; + url = "https://www.openclonk.org/builds/release/8.1/openclonk-${version}-src.tar.bz2"; sha256 = "0imkqjp8lww5p0cnqf4k4mb2v682mnsas63qmiz17rspakr7fxik"; }; diff --git a/pkgs/games/quake3/content/demo.nix b/pkgs/games/quake3/content/demo.nix index 2b4e69f0086c..88ba8679e8a7 100644 --- a/pkgs/games/quake3/content/demo.nix +++ b/pkgs/games/quake3/content/demo.nix @@ -6,7 +6,7 @@ in stdenv.mkDerivation { name = "quake3-demodata-${version}"; src = fetchurl { - url = "http://ftp.gwdg.de/pub/misc/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3ademo-${version}.x86.gz.sh"; + url = "https://ftp.gwdg.de/pub/misc/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3ademo-${version}.x86.gz.sh"; sha256 = "1v54a1hx1bczk9hgn9qhx8vixsy7xn7wj2pylhfjsybfkgvf7pk4"; }; diff --git a/pkgs/games/quake3/content/pointrelease.nix b/pkgs/games/quake3/content/pointrelease.nix index 04da5811d99a..f35aaaad3527 100644 --- a/pkgs/games/quake3/content/pointrelease.nix +++ b/pkgs/games/quake3/content/pointrelease.nix @@ -6,7 +6,7 @@ in stdenv.mkDerivation { name = "quake3-pointrelease-${version}"; src = fetchurl { - url = "http://ftp.gwdg.de/pub/misc/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3apoint-${version}.x86.run"; + url = "https://ftp.gwdg.de/pub/misc/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3apoint-${version}.x86.run"; sha256 = "11piyksfqyxwl9mpgbc71w9sacsh4d3cdsgia0cy0dbbap2k4qf3"; }; diff --git a/pkgs/games/racer/default.nix b/pkgs/games/racer/default.nix index db0b81f5567a..4cbc5397bb3e 100644 --- a/pkgs/games/racer/default.nix +++ b/pkgs/games/racer/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { url = http://hippo.nipax.cz/src/racer-1.1.tar.gz; sha256 = "0fll1qkqfcjq87k0jzsilcw701z92lfxn2y5ga1n038772lymxl9"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = http://hippo.nipax.cz/src/racer-1.1.64.tar.gz; + url = https://hippo.nipax.cz/src/racer-1.1.64.tar.gz; sha256 = "0rjy3gmlhwfkb9zs58j0mc0dar0livwpbc19r6zw5r2k6r7xdan0"; } else throw "System not supported"; diff --git a/pkgs/games/rogue/default.nix b/pkgs/games/rogue/default.nix index 40f0b1754941..bb93fafa3b50 100644 --- a/pkgs/games/rogue/default.nix +++ b/pkgs/games/rogue/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { urls = [ - "http://src.fedoraproject.org/repo/pkgs/rogue/rogue5.4.4-src.tar.gz/033288f46444b06814c81ea69d96e075/rogue5.4.4-src.tar.gz" + "https://src.fedoraproject.org/repo/pkgs/rogue/rogue5.4.4-src.tar.gz/033288f46444b06814c81ea69d96e075/rogue5.4.4-src.tar.gz" "http://ftp.vim.org/ftp/pub/ftp/os/Linux/distr/slitaz/sources/packages-cooking/r/rogue5.4.4-src.tar.gz" "http://rogue.rogueforge.net/files/rogue5.4/rogue5.4.4-src.tar.gz" ]; diff --git a/pkgs/games/scrolls/default.nix b/pkgs/games/scrolls/default.nix index 5f1e1a17553b..b8bf4efcf0aa 100644 --- a/pkgs/games/scrolls/default.nix +++ b/pkgs/games/scrolls/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { }; src = fetchurl { - url = "http://download.scrolls.com/client/linux.tar.gz"; + url = "https://download.scrolls.com/client/linux.tar.gz"; sha256 = "ead1fd14988aa07041fedfa7f845c756cd5077a5a402d85bfb749cb669ececec"; }; diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index 9ce5c7db83fb..83a85415664d 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://springrts.com/; + homepage = https://springrts.com/; description = "A powerful real-time strategy (RTS) game engine"; license = licenses.gpl2; maintainers = [ maintainers.phreedom maintainers.qknight maintainers.domenkozar ]; diff --git a/pkgs/games/tennix/default.nix b/pkgs/games/tennix/default.nix index 4260ded0d6ff..283d8ad21d7e 100644 --- a/pkgs/games/tennix/default.nix +++ b/pkgs/games/tennix/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "tennix-1.1"; src = fetchurl { - url = "http://icculus.org/tennix/downloads/${name}.tar.gz"; + url = "https://icculus.org/tennix/downloads/${name}.tar.gz"; sha256 = "0np5kw1y7i0z0dsqx4r2nvmq86qj8hv3mmgavm3hxraqnds5z8cm"; }; diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix index 65dc77fbf16f..13d296e5961a 100644 --- a/pkgs/games/terraria-server/default.nix +++ b/pkgs/games/terraria-server/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { urlVersion = lib.replaceChars ["."] [""] version; src = fetchurl { - url = "http://terraria.org/server/terraria-server-${urlVersion}.zip"; + url = "https://terraria.org/server/terraria-server-${urlVersion}.zip"; sha256 = "0l7j2n6ip4hxph7dfal7kzdm3dqnm1wba6zc94gafkh97wr35ck3"; }; diff --git a/pkgs/games/xbomb/default.nix b/pkgs/games/xbomb/default.nix index 787aebef2d54..946bff79f975 100644 --- a/pkgs/games/xbomb/default.nix +++ b/pkgs/games/xbomb/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "xbomb-2.2b"; src = fetchurl { - url = "http://www.gedanken.org.uk/software/xbomb/download/${name}.tgz"; + url = "https://www.gedanken.org.uk/software/xbomb/download/${name}.tgz"; sha256 = "0692gjw28qvh8wj9l58scjw6kxj7jdyb3yzgcgs9wcznq11q839m"; }; diff --git a/pkgs/games/xmoto/default.nix b/pkgs/games/xmoto/default.nix index ffb3a0227d9e..ef8c5a09cae9 100644 --- a/pkgs/games/xmoto/default.nix +++ b/pkgs/games/xmoto/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "0.5.11"; src = fetchurl { - url = "http://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz"; + url = "https://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz"; sha256 = "1ci6r8zd0l7z28cy92ddf9dmqbdqwinz2y1cny34c61b57wsd155"; }; diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 7fd5612bf886..6d9ae55e639c 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { name = "xonotic-0.8.2"; src = fetchurl { - url = "http://dl.xonotic.org/${name}.zip"; + url = "https://dl.xonotic.org/${name}.zip"; sha256 = "1mcs6l4clvn7ibfq3q69k2p0z6ww75rxvnngamdq5ic6yhq74bx2"; }; diff --git a/pkgs/games/xsnow/default.nix b/pkgs/games/xsnow/default.nix index 2f898a5aed39..47a321c99b4a 100644 --- a/pkgs/games/xsnow/default.nix +++ b/pkgs/games/xsnow/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "xsnow-${version}"; src = fetchurl { - url = "http://janswaal.home.xs4all.nl/Xsnow/${name}.tar.gz"; + url = "https://janswaal.home.xs4all.nl/Xsnow/${name}.tar.gz"; sha256 = "06jnbp88wc9i9dbmy7kggplw4hzlx2bhghxijmlhkjlizgqwimyh"; }; diff --git a/pkgs/games/xsokoban/default.nix b/pkgs/games/xsokoban/default.nix index 814241244e31..3e9add56903c 100644 --- a/pkgs/games/xsokoban/default.nix +++ b/pkgs/games/xsokoban/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.3c"; src = fetchurl { - url = "http://www.cs.cornell.edu/andru/release/${name}.tar.gz"; + url = "https://www.cs.cornell.edu/andru/release/${name}.tar.gz"; sha256 = "006lp8y22b9pi81x1a9ldfgkl1fbmkdzfw0lqw5y9svmisbafbr9"; }; diff --git a/pkgs/games/zoom/default.nix b/pkgs/games/zoom/default.nix index d6e79289525d..449d7ae6e2d5 100644 --- a/pkgs/games/zoom/default.nix +++ b/pkgs/games/zoom/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "zoom-1.1.5"; src = fetchurl { - url = "http://www.logicalshift.co.uk/unix/zoom/${name}.tar.gz"; + url = "https://www.logicalshift.co.uk/unix/zoom/${name}.tar.gz"; sha256 = "1g6van7f7sg3zfcz80mncnnbccyg2hnm0hq4x558vpsm0lf7z5pj"; }; diff --git a/pkgs/misc/base16-builder/node-packages-generated.nix b/pkgs/misc/base16-builder/node-packages-generated.nix index 6ec938cfdefb..52f3446e8c41 100644 --- a/pkgs/misc/base16-builder/node-packages-generated.nix +++ b/pkgs/misc/base16-builder/node-packages-generated.nix @@ -1,79 +1,16 @@ -# This file has been generated by node2nix 1.3.0. Do not edit! +# This file has been generated by node2nix 1.6.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: let sources = { - "chalk-1.1.3" = { - name = "chalk"; - packageName = "chalk"; - version = "1.1.3"; + "ansi-regex-2.1.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; - sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; - }; - }; - "ejs-2.5.7" = { - name = "ejs"; - packageName = "ejs"; - version = "2.5.7"; - src = fetchurl { - url = "https://registry.npmjs.org/ejs/-/ejs-2.5.7.tgz"; - sha1 = "cc872c168880ae3c7189762fd5ffc00896c9518a"; - }; - }; - "fs-promise-0.3.1" = { - name = "fs-promise"; - packageName = "fs-promise"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-promise/-/fs-promise-0.3.1.tgz"; - sha1 = "bf34050368f24d6dc9dfc6688ab5cead8f86842a"; - }; - }; - "js-yaml-3.10.0" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "3.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz"; - sha512 = "0h26sq1bwxc45bm0hvlcadrbk4bizzaw729wvw690ya7mpys45bqfzdqwhjkdrnq0i44dzxckykz4bix22jfdyfg1asybg3yzczjsrv"; - }; - }; - "limax-1.5.0" = { - name = "limax"; - packageName = "limax"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/limax/-/limax-1.5.0.tgz"; - sha1 = "bbe7f2d3231cef709ebef8c32e3c75bce8fa5734"; - }; - }; - "meow-3.7.0" = { - name = "meow"; - packageName = "meow"; - version = "3.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz"; - sha1 = "72cb668b425228290abbfa856892587308a801fb"; - }; - }; - "open-0.0.5" = { - name = "open"; - packageName = "open"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-0.0.5.tgz"; - sha1 = "42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc"; - }; - }; - "update-notifier-0.6.3" = { - name = "update-notifier"; - packageName = "update-notifier"; - version = "0.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-0.6.3.tgz"; - sha1 = "776dec8daa13e962a341e8a1d98354306b67ae08"; + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; }; }; "ansi-styles-2.2.1" = { @@ -85,51 +22,6 @@ let sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; }; }; - "escape-string-regexp-1.0.5" = { - name = "escape-string-regexp"; - packageName = "escape-string-regexp"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; - }; - }; - "has-ansi-2.0.0" = { - name = "has-ansi"; - packageName = "has-ansi"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; - sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; - }; - }; - "strip-ansi-3.0.1" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; - sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; - }; - }; - "supports-color-2.0.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; - sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; - }; - }; - "ansi-regex-2.1.1" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; - sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; - }; - }; "any-promise-0.1.0" = { name = "any-promise"; packageName = "any-promise"; @@ -139,220 +31,13 @@ let sha1 = "830b680aa7e56f33451d4b049f3bd8044498ee27"; }; }; - "argparse-1.0.9" = { + "argparse-1.0.10" = { name = "argparse"; packageName = "argparse"; - version = "1.0.9"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz"; - sha1 = "73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"; - }; - }; - "esprima-4.0.0" = { - name = "esprima"; - packageName = "esprima"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz"; - sha512 = "27mkhd94y9vrr8pb97br0ym5h85rawwb0biswgwdfp31x0387y12k9p9598bi4fc83fif6crfzqiqmmjs4x7gcb22ml3z1fldqm7yx1"; - }; - }; - "sprintf-js-1.0.3" = { - name = "sprintf-js"; - packageName = "sprintf-js"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; - sha1 = "04e6926f662895354f3dd015203633b857297e2c"; - }; - }; - "hepburn-1.0.0" = { - name = "hepburn"; - packageName = "hepburn"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hepburn/-/hepburn-1.0.0.tgz"; - sha1 = "49ce862942a77570cd4f5c8fe100b85d942cb61b"; - }; - }; - "pinyin-2.8.3" = { - name = "pinyin"; - packageName = "pinyin"; - version = "2.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/pinyin/-/pinyin-2.8.3.tgz"; - sha1 = "301ccb4358ccfe802523c4bd640a612bee4d7c4b"; - }; - }; - "speakingurl-13.0.0" = { - name = "speakingurl"; - packageName = "speakingurl"; - version = "13.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/speakingurl/-/speakingurl-13.0.0.tgz"; - sha1 = "266c52d2b47585375af058e4783c8d1097a2d3db"; - }; - }; - "bulk-replace-0.0.1" = { - name = "bulk-replace"; - packageName = "bulk-replace"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bulk-replace/-/bulk-replace-0.0.1.tgz"; - sha1 = "f095682a896abd4b3d9e08de409cc222e213f9dd"; - }; - }; - "commander-1.1.1" = { - name = "commander"; - packageName = "commander"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-1.1.1.tgz"; - sha1 = "50d1651868ae60eccff0a2d9f34595376bc6b041"; - }; - }; - "object-assign-4.1.1" = { - name = "object-assign"; - packageName = "object-assign"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; - sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; - }; - }; - "nodejieba-2.2.5" = { - name = "nodejieba"; - packageName = "nodejieba"; - version = "2.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/nodejieba/-/nodejieba-2.2.5.tgz"; - sha1 = "821441a683fad25ebd2c8dde1401dd43dbeb027a"; - }; - }; - "keypress-0.1.0" = { - name = "keypress"; - packageName = "keypress"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz"; - sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a"; - }; - }; - "nan-2.3.5" = { - name = "nan"; - packageName = "nan"; - version = "2.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz"; - sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08"; - }; - }; - "camelcase-keys-2.1.0" = { - name = "camelcase-keys"; - packageName = "camelcase-keys"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz"; - sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7"; - }; - }; - "decamelize-1.2.0" = { - name = "decamelize"; - packageName = "decamelize"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; - sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; - }; - }; - "loud-rejection-1.6.0" = { - name = "loud-rejection"; - packageName = "loud-rejection"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz"; - sha1 = "5b46f80147edee578870f086d04821cf998e551f"; - }; - }; - "map-obj-1.0.1" = { - name = "map-obj"; - packageName = "map-obj"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; - sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; - }; - }; - "minimist-1.2.0" = { - name = "minimist"; - packageName = "minimist"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; - sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; - }; - }; - "normalize-package-data-2.4.0" = { - name = "normalize-package-data"; - packageName = "normalize-package-data"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; - sha512 = "01wzws79ps84ylshjb7rfpjykgiqxnpr89s52p2yyzfx8nfvyh5flvf1almiiavsi75xgi8g3s5davc1mmgz7gn8yvlqz6gnhax8f7n"; - }; - }; - "read-pkg-up-1.0.1" = { - name = "read-pkg-up"; - packageName = "read-pkg-up"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"; - sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02"; - }; - }; - "redent-1.0.0" = { - name = "redent"; - packageName = "redent"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz"; - sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"; - }; - }; - "trim-newlines-1.0.0" = { - name = "trim-newlines"; - packageName = "trim-newlines"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"; - sha1 = "5887966bb582a4503a41eb524f7d35011815a613"; - }; - }; - "camelcase-2.1.1" = { - name = "camelcase"; - packageName = "camelcase"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz"; - sha1 = "7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"; - }; - }; - "currently-unhandled-0.4.1" = { - name = "currently-unhandled"; - packageName = "currently-unhandled"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz"; - sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; - }; - }; - "signal-exit-3.0.2" = { - name = "signal-exit"; - packageName = "signal-exit"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; - sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; + sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; }; }; "array-find-index-1.0.2" = { @@ -364,40 +49,13 @@ let sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; }; }; - "hosted-git-info-2.5.0" = { - name = "hosted-git-info"; - packageName = "hosted-git-info"; - version = "2.5.0"; + "boxen-0.3.1" = { + name = "boxen"; + packageName = "boxen"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz"; - sha512 = "355g980qsk8k9hkv60z58llbvpscjl5yqkh4wx719s8jcq2swzn4ynzinj8azmvdgs10r22wb297rmixh9vvsml55sbysdf2i8ipn54"; - }; - }; - "is-builtin-module-1.0.0" = { - name = "is-builtin-module"; - packageName = "is-builtin-module"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"; - sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe"; - }; - }; - "semver-5.4.1" = { - name = "semver"; - packageName = "semver"; - version = "5.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz"; - sha512 = "2r13vwvb5ick34k6flr7vgbjfsdka8zbj5a74rd0ba4bp0nqmhppbaw3qlwn7f4smpifpa4iy4hxj137y598rbvsmy3h0d8vxgvzwar"; - }; - }; - "validate-npm-package-license-3.0.1" = { - name = "validate-npm-package-license"; - packageName = "validate-npm-package-license"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz"; - sha1 = "2804babe712ad3379459acfbe24746ab2c303fbc"; + url = "https://registry.npmjs.org/boxen/-/boxen-0.3.1.tgz"; + sha1 = "a7d898243ae622f7abb6bb604d740a76c6a5461b"; }; }; "builtin-modules-1.1.1" = { @@ -409,283 +67,49 @@ let sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; }; }; - "spdx-correct-1.0.2" = { - name = "spdx-correct"; - packageName = "spdx-correct"; - version = "1.0.2"; + "bulk-replace-0.0.1" = { + name = "bulk-replace"; + packageName = "bulk-replace"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz"; - sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40"; + url = "https://registry.npmjs.org/bulk-replace/-/bulk-replace-0.0.1.tgz"; + sha1 = "f095682a896abd4b3d9e08de409cc222e213f9dd"; }; }; - "spdx-expression-parse-1.0.4" = { - name = "spdx-expression-parse"; - packageName = "spdx-expression-parse"; - version = "1.0.4"; + "camelcase-2.1.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz"; - sha1 = "9bdf2f20e1f40ed447fbe273266191fced51626c"; + url = "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz"; + sha1 = "7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"; }; }; - "spdx-license-ids-1.2.2" = { - name = "spdx-license-ids"; - packageName = "spdx-license-ids"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz"; - sha1 = "c9df7a3424594ade6bd11900d596696dc06bac57"; - }; - }; - "find-up-1.1.2" = { - name = "find-up"; - packageName = "find-up"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz"; - sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"; - }; - }; - "read-pkg-1.1.0" = { - name = "read-pkg"; - packageName = "read-pkg"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"; - sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"; - }; - }; - "path-exists-2.1.0" = { - name = "path-exists"; - packageName = "path-exists"; + "camelcase-keys-2.1.0" = { + name = "camelcase-keys"; + packageName = "camelcase-keys"; version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"; - sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b"; + url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz"; + sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7"; }; }; - "pinkie-promise-2.0.1" = { - name = "pinkie-promise"; - packageName = "pinkie-promise"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; - sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; - }; - }; - "pinkie-2.0.4" = { - name = "pinkie"; - packageName = "pinkie"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"; - sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; - }; - }; - "load-json-file-1.1.0" = { - name = "load-json-file"; - packageName = "load-json-file"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"; - sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0"; - }; - }; - "path-type-1.1.0" = { - name = "path-type"; - packageName = "path-type"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"; - sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; - }; - }; - "graceful-fs-4.1.11" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "4.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; - sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; - }; - }; - "parse-json-2.2.0" = { - name = "parse-json"; - packageName = "parse-json"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"; - sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; - }; - }; - "pify-2.3.0" = { - name = "pify"; - packageName = "pify"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; - sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; - }; - }; - "strip-bom-2.0.0" = { - name = "strip-bom"; - packageName = "strip-bom"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"; - sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e"; - }; - }; - "error-ex-1.3.1" = { - name = "error-ex"; - packageName = "error-ex"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz"; - sha1 = "f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"; - }; - }; - "is-arrayish-0.2.1" = { - name = "is-arrayish"; - packageName = "is-arrayish"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; - sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; - }; - }; - "is-utf8-0.2.1" = { - name = "is-utf8"; - packageName = "is-utf8"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"; - sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; - }; - }; - "indent-string-2.1.0" = { - name = "indent-string"; - packageName = "indent-string"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz"; - sha1 = "8e2d48348742121b4a8218b7a137e9a52049dc80"; - }; - }; - "strip-indent-1.0.1" = { - name = "strip-indent"; - packageName = "strip-indent"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"; - sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2"; - }; - }; - "repeating-2.0.1" = { - name = "repeating"; - packageName = "repeating"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"; - sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; - }; - }; - "is-finite-1.0.2" = { - name = "is-finite"; - packageName = "is-finite"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; - sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; - }; - }; - "number-is-nan-1.0.1" = { - name = "number-is-nan"; - packageName = "number-is-nan"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha1 = "097b602b53422a522c1afb8790318336941a011d"; - }; - }; - "get-stdin-4.0.1" = { - name = "get-stdin"; - packageName = "get-stdin"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"; - sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe"; - }; - }; - "boxen-0.3.1" = { - name = "boxen"; - packageName = "boxen"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/boxen/-/boxen-0.3.1.tgz"; - sha1 = "a7d898243ae622f7abb6bb604d740a76c6a5461b"; - }; - }; - "configstore-2.1.0" = { - name = "configstore"; - packageName = "configstore"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz"; - sha1 = "737a3a7036e9886102aa6099e47bb33ab1aba1a1"; - }; - }; - "is-npm-1.0.0" = { - name = "is-npm"; - packageName = "is-npm"; + "capture-stack-trace-1.0.0" = { + name = "capture-stack-trace"; + packageName = "capture-stack-trace"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz"; - sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4"; + url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz"; + sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d"; }; }; - "latest-version-2.0.0" = { - name = "latest-version"; - packageName = "latest-version"; - version = "2.0.0"; + "chalk-1.1.3" = { + name = "chalk"; + packageName = "chalk"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz"; - sha1 = "56f8d6139620847b8017f8f1f4d78e211324168b"; - }; - }; - "semver-diff-2.1.0" = { - name = "semver-diff"; - packageName = "semver-diff"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz"; - sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"; - }; - }; - "filled-array-1.1.0" = { - name = "filled-array"; - packageName = "filled-array"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz"; - sha1 = "c3c4f6c663b923459a9aa29912d2d031f1507f84"; - }; - }; - "string-width-1.0.2" = { - name = "string-width"; - packageName = "string-width"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; - sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; - }; - }; - "widest-line-1.0.0" = { - name = "widest-line"; - packageName = "widest-line"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz"; - sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c"; + url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; }; }; "code-point-at-1.1.0" = { @@ -697,157 +121,31 @@ let sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; }; }; - "is-fullwidth-code-point-1.0.0" = { - name = "is-fullwidth-code-point"; - packageName = "is-fullwidth-code-point"; - version = "1.0.0"; + "commander-1.1.1" = { + name = "commander"; + packageName = "commander"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; - sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + url = "https://registry.npmjs.org/commander/-/commander-1.1.1.tgz"; + sha1 = "50d1651868ae60eccff0a2d9f34595376bc6b041"; }; }; - "dot-prop-3.0.0" = { - name = "dot-prop"; - packageName = "dot-prop"; - version = "3.0.0"; + "configstore-2.1.0" = { + name = "configstore"; + packageName = "configstore"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz"; - sha1 = "1b708af094a49c9a0e7dbcad790aba539dac1177"; + url = "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz"; + sha1 = "737a3a7036e9886102aa6099e47bb33ab1aba1a1"; }; }; - "mkdirp-0.5.1" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; - }; - }; - "os-tmpdir-1.0.2" = { - name = "os-tmpdir"; - packageName = "os-tmpdir"; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; - sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; - }; - }; - "osenv-0.1.4" = { - name = "osenv"; - packageName = "osenv"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz"; - sha1 = "42fe6d5953df06c8064be6f176c3d05aaaa34644"; - }; - }; - "uuid-2.0.3" = { - name = "uuid"; - packageName = "uuid"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz"; - sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a"; - }; - }; - "write-file-atomic-1.3.4" = { - name = "write-file-atomic"; - packageName = "write-file-atomic"; - version = "1.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz"; - sha1 = "f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"; - }; - }; - "xdg-basedir-2.0.0" = { - name = "xdg-basedir"; - packageName = "xdg-basedir"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz"; - sha1 = "edbc903cc385fc04523d966a335504b5504d1bd2"; - }; - }; - "is-obj-1.0.1" = { - name = "is-obj"; - packageName = "is-obj"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz"; - sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; - }; - }; - "minimist-0.0.8" = { - name = "minimist"; - packageName = "minimist"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; - }; - }; - "os-homedir-1.0.2" = { - name = "os-homedir"; - packageName = "os-homedir"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; - sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; - }; - }; - "imurmurhash-0.1.4" = { - name = "imurmurhash"; - packageName = "imurmurhash"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; - }; - }; - "slide-1.1.6" = { - name = "slide"; - packageName = "slide"; - version = "1.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz"; - sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; - }; - }; - "package-json-2.4.0" = { - name = "package-json"; - packageName = "package-json"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz"; - sha1 = "0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb"; - }; - }; - "got-5.7.1" = { - name = "got"; - packageName = "got"; - version = "5.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-5.7.1.tgz"; - sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35"; - }; - }; - "registry-auth-token-3.3.1" = { - name = "registry-auth-token"; - packageName = "registry-auth-token"; - version = "3.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.1.tgz"; - sha1 = "fb0d3289ee0d9ada2cbb52af5dfe66cb070d3006"; - }; - }; - "registry-url-3.1.0" = { - name = "registry-url"; - packageName = "registry-url"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz"; - sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; }; "create-error-class-3.0.2" = { @@ -859,6 +157,42 @@ let sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; }; }; + "currently-unhandled-0.4.1" = { + name = "currently-unhandled"; + packageName = "currently-unhandled"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz"; + sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; + }; + }; + "decamelize-1.2.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + }; + "deep-extend-0.6.0" = { + name = "deep-extend"; + packageName = "deep-extend"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz"; + sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; + }; + }; + "dot-prop-3.0.0" = { + name = "dot-prop"; + packageName = "dot-prop"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz"; + sha1 = "1b708af094a49c9a0e7dbcad790aba539dac1177"; + }; + }; "duplexer2-0.1.4" = { name = "duplexer2"; packageName = "duplexer2"; @@ -868,6 +202,213 @@ let sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1"; }; }; + "ejs-2.6.1" = { + name = "ejs"; + packageName = "ejs"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ejs/-/ejs-2.6.1.tgz"; + sha512 = "0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ=="; + }; + }; + "error-ex-1.3.2" = { + name = "error-ex"; + packageName = "error-ex"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"; + sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; + }; + }; + "escape-string-regexp-1.0.5" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + }; + "esprima-4.0.0" = { + name = "esprima"; + packageName = "esprima"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz"; + sha512 = "oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw=="; + }; + }; + "filled-array-1.1.0" = { + name = "filled-array"; + packageName = "filled-array"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz"; + sha1 = "c3c4f6c663b923459a9aa29912d2d031f1507f84"; + }; + }; + "find-up-1.1.2" = { + name = "find-up"; + packageName = "find-up"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz"; + sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"; + }; + }; + "fs-promise-0.3.1" = { + name = "fs-promise"; + packageName = "fs-promise"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-promise/-/fs-promise-0.3.1.tgz"; + sha1 = "bf34050368f24d6dc9dfc6688ab5cead8f86842a"; + }; + }; + "get-stdin-4.0.1" = { + name = "get-stdin"; + packageName = "get-stdin"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"; + sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe"; + }; + }; + "got-5.7.1" = { + name = "got"; + packageName = "got"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-5.7.1.tgz"; + sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35"; + }; + }; + "graceful-fs-4.1.11" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; + sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; + }; + }; + "has-ansi-2.0.0" = { + name = "has-ansi"; + packageName = "has-ansi"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; + sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + }; + }; + "hepburn-1.0.0" = { + name = "hepburn"; + packageName = "hepburn"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hepburn/-/hepburn-1.0.0.tgz"; + sha1 = "49ce862942a77570cd4f5c8fe100b85d942cb61b"; + }; + }; + "hosted-git-info-2.6.1" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.1.tgz"; + sha512 = "Ba4+0M4YvIDUUsprMjhVTU1yN9F2/LJSAl69ZpzaLT4l4j5mwTS6jqqW9Ojvj6lKz/veqPzpJBqGbXspOb533A=="; + }; + }; + "imurmurhash-0.1.4" = { + name = "imurmurhash"; + packageName = "imurmurhash"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + }; + }; + "indent-string-2.1.0" = { + name = "indent-string"; + packageName = "indent-string"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz"; + sha1 = "8e2d48348742121b4a8218b7a137e9a52049dc80"; + }; + }; + "inherits-2.0.3" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + }; + "ini-1.3.5" = { + name = "ini"; + packageName = "ini"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; + sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="; + }; + }; + "is-arrayish-0.2.1" = { + name = "is-arrayish"; + packageName = "is-arrayish"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + }; + }; + "is-builtin-module-1.0.0" = { + name = "is-builtin-module"; + packageName = "is-builtin-module"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"; + sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe"; + }; + }; + "is-finite-1.0.2" = { + name = "is-finite"; + packageName = "is-finite"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; + sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; + }; + }; + "is-fullwidth-code-point-1.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + }; + "is-npm-1.0.0" = { + name = "is-npm"; + packageName = "is-npm"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz"; + sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4"; + }; + }; + "is-obj-1.0.1" = { + name = "is-obj"; + packageName = "is-obj"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz"; + sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; + }; + }; "is-redirect-1.0.0" = { name = "is-redirect"; packageName = "is-redirect"; @@ -895,94 +436,13 @@ let sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; }; }; - "lowercase-keys-1.0.0" = { - name = "lowercase-keys"; - packageName = "lowercase-keys"; - version = "1.0.0"; + "is-utf8-0.2.1" = { + name = "is-utf8"; + packageName = "is-utf8"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz"; - sha1 = "4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"; - }; - }; - "node-status-codes-1.0.0" = { - name = "node-status-codes"; - packageName = "node-status-codes"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz"; - sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"; - }; - }; - "read-all-stream-3.1.0" = { - name = "read-all-stream"; - packageName = "read-all-stream"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz"; - sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa"; - }; - }; - "readable-stream-2.3.3" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz"; - sha512 = "1wlizkv2wnz2nyb0lfxgs1m27zzcvasp3n5cfrd7hm4ch1wn79df2nbhzfadba5qqdfb28vhmw3drhp46vk2q6xk524qagvr76v7slv"; - }; - }; - "timed-out-3.1.3" = { - name = "timed-out"; - packageName = "timed-out"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz"; - sha1 = "95860bfcc5c76c277f8f8326fd0f5b2e20eba217"; - }; - }; - "unzip-response-1.0.2" = { - name = "unzip-response"; - packageName = "unzip-response"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz"; - sha1 = "b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe"; - }; - }; - "url-parse-lax-1.0.0" = { - name = "url-parse-lax"; - packageName = "url-parse-lax"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz"; - sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73"; - }; - }; - "capture-stack-trace-1.0.0" = { - name = "capture-stack-trace"; - packageName = "capture-stack-trace"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz"; - sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d"; - }; - }; - "core-util-is-1.0.2" = { - name = "core-util-is"; - packageName = "core-util-is"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; - }; - }; - "inherits-2.0.3" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; - sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + url = "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"; + sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; }; }; "isarray-1.0.0" = { @@ -994,40 +454,274 @@ let sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; }; }; - "process-nextick-args-1.0.7" = { - name = "process-nextick-args"; - packageName = "process-nextick-args"; - version = "1.0.7"; + "js-yaml-3.12.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"; - sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz"; + sha512 = "PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A=="; }; }; - "safe-buffer-5.1.1" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.1.1"; + "keypress-0.1.0" = { + name = "keypress"; + packageName = "keypress"; + version = "0.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"; - sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh"; + url = "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz"; + sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a"; }; }; - "string_decoder-1.0.3" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "1.0.3"; + "latest-version-2.0.0" = { + name = "latest-version"; + packageName = "latest-version"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz"; - sha512 = "22vw5mmwlyblqc2zyqwl39wyhyahhpiyknim8iz5fk6xi002x777gkswiq8fh297djs5ii4pgrys57wq33hr5zf3xfd0d7kjxkzl0g0"; + url = "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz"; + sha1 = "56f8d6139620847b8017f8f1f4d78e211324168b"; }; }; - "util-deprecate-1.0.2" = { - name = "util-deprecate"; - packageName = "util-deprecate"; + "limax-1.6.0" = { + name = "limax"; + packageName = "limax"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/limax/-/limax-1.6.0.tgz"; + sha1 = "996163291c7e8c6e7dd5b438c0190b69622f1b33"; + }; + }; + "load-json-file-1.1.0" = { + name = "load-json-file"; + packageName = "load-json-file"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"; + sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0"; + }; + }; + "loud-rejection-1.6.0" = { + name = "loud-rejection"; + packageName = "loud-rejection"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz"; + sha1 = "5b46f80147edee578870f086d04821cf998e551f"; + }; + }; + "lowercase-keys-1.0.1" = { + name = "lowercase-keys"; + packageName = "lowercase-keys"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; + sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="; + }; + }; + "map-obj-1.0.1" = { + name = "map-obj"; + packageName = "map-obj"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; + sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; + }; + }; + "meow-3.7.0" = { + name = "meow"; + packageName = "meow"; + version = "3.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz"; + sha1 = "72cb668b425228290abbfa856892587308a801fb"; + }; + }; + "minimist-0.0.8" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + }; + "minimist-1.2.0" = { + name = "minimist"; + packageName = "minimist"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; + sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + }; + }; + "mkdirp-0.5.1" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + }; + }; + "nan-2.10.0" = { + name = "nan"; + packageName = "nan"; + version = "2.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz"; + sha512 = "bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA=="; + }; + }; + "node-status-codes-1.0.0" = { + name = "node-status-codes"; + packageName = "node-status-codes"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz"; + sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"; + }; + }; + "nodejieba-2.2.6" = { + name = "nodejieba"; + packageName = "nodejieba"; + version = "2.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/nodejieba/-/nodejieba-2.2.6.tgz"; + sha1 = "17cd416705b7b01c062e6cd9d7179b30453eb4a3"; + }; + }; + "normalize-package-data-2.4.0" = { + name = "normalize-package-data"; + packageName = "normalize-package-data"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; + sha512 = "9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw=="; + }; + }; + "number-is-nan-1.0.1" = { + name = "number-is-nan"; + packageName = "number-is-nan"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + }; + "object-assign-4.1.1" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + }; + "open-0.0.5" = { + name = "open"; + packageName = "open"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-0.0.5.tgz"; + sha1 = "42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc"; + }; + }; + "os-homedir-1.0.2" = { + name = "os-homedir"; + packageName = "os-homedir"; version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; + sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; + }; + }; + "os-tmpdir-1.0.2" = { + name = "os-tmpdir"; + packageName = "os-tmpdir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + }; + "osenv-0.1.5" = { + name = "osenv"; + packageName = "osenv"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz"; + sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; + }; + }; + "package-json-2.4.0" = { + name = "package-json"; + packageName = "package-json"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz"; + sha1 = "0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb"; + }; + }; + "parse-json-2.2.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"; + sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; + }; + }; + "path-exists-2.1.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"; + sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b"; + }; + }; + "path-type-1.1.0" = { + name = "path-type"; + packageName = "path-type"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"; + sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; + }; + }; + "pify-2.3.0" = { + name = "pify"; + packageName = "pify"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; + sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + }; + }; + "pinkie-2.0.4" = { + name = "pinkie"; + packageName = "pinkie"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"; + sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; + }; + }; + "pinkie-promise-2.0.1" = { + name = "pinkie-promise"; + packageName = "pinkie-promise"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; + sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; + }; + }; + "pinyin-2.8.3" = { + name = "pinyin"; + packageName = "pinyin"; + version = "2.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/pinyin/-/pinyin-2.8.3.tgz"; + sha1 = "301ccb4358ccfe802523c4bd640a612bee4d7c4b"; }; }; "prepend-http-1.0.4" = { @@ -1039,31 +733,238 @@ let sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"; }; }; - "rc-1.2.1" = { + "process-nextick-args-2.0.0" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz"; + sha512 = "MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="; + }; + }; + "rc-1.2.8" = { name = "rc"; packageName = "rc"; - version = "1.2.1"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz"; - sha1 = "2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95"; + url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz"; + sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; }; }; - "deep-extend-0.4.2" = { - name = "deep-extend"; - packageName = "deep-extend"; - version = "0.4.2"; + "read-all-stream-3.1.0" = { + name = "read-all-stream"; + packageName = "read-all-stream"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz"; - sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f"; + url = "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz"; + sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa"; }; }; - "ini-1.3.4" = { - name = "ini"; - packageName = "ini"; - version = "1.3.4"; + "read-pkg-1.1.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"; - sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e"; + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"; + sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"; + }; + }; + "read-pkg-up-1.0.1" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"; + sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02"; + }; + }; + "readable-stream-2.3.6" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz"; + sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw=="; + }; + }; + "redent-1.0.0" = { + name = "redent"; + packageName = "redent"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz"; + sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"; + }; + }; + "registry-auth-token-3.3.2" = { + name = "registry-auth-token"; + packageName = "registry-auth-token"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz"; + sha512 = "JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ=="; + }; + }; + "registry-url-3.1.0" = { + name = "registry-url"; + packageName = "registry-url"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz"; + sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; + }; + }; + "repeating-2.0.1" = { + name = "repeating"; + packageName = "repeating"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"; + sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; + }; + }; + "safe-buffer-5.1.2" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + }; + }; + "semver-5.5.0" = { + name = "semver"; + packageName = "semver"; + version = "5.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz"; + sha512 = "4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="; + }; + }; + "semver-diff-2.1.0" = { + name = "semver-diff"; + packageName = "semver-diff"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz"; + sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"; + }; + }; + "signal-exit-3.0.2" = { + name = "signal-exit"; + packageName = "signal-exit"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; + sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + }; + }; + "slide-1.1.6" = { + name = "slide"; + packageName = "slide"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz"; + sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; + }; + }; + "spdx-correct-3.0.0" = { + name = "spdx-correct"; + packageName = "spdx-correct"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz"; + sha512 = "N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g=="; + }; + }; + "spdx-exceptions-2.1.0" = { + name = "spdx-exceptions"; + packageName = "spdx-exceptions"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz"; + sha512 = "4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg=="; + }; + }; + "spdx-expression-parse-3.0.0" = { + name = "spdx-expression-parse"; + packageName = "spdx-expression-parse"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz"; + sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg=="; + }; + }; + "spdx-license-ids-3.0.0" = { + name = "spdx-license-ids"; + packageName = "spdx-license-ids"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz"; + sha512 = "2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA=="; + }; + }; + "speakingurl-14.0.1" = { + name = "speakingurl"; + packageName = "speakingurl"; + version = "14.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/speakingurl/-/speakingurl-14.0.1.tgz"; + sha512 = "1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ=="; + }; + }; + "sprintf-js-1.0.3" = { + name = "sprintf-js"; + packageName = "sprintf-js"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + }; + "string-width-1.0.2" = { + name = "string-width"; + packageName = "string-width"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + }; + "string_decoder-1.1.1" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; + }; + }; + "strip-ansi-3.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + }; + "strip-bom-2.0.0" = { + name = "strip-bom"; + packageName = "strip-bom"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"; + sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e"; + }; + }; + "strip-indent-1.0.1" = { + name = "strip-indent"; + packageName = "strip-indent"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"; + sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2"; }; }; "strip-json-comments-2.0.1" = { @@ -1075,6 +976,114 @@ let sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; }; + "supports-color-2.0.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; + sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + }; + }; + "timed-out-3.1.3" = { + name = "timed-out"; + packageName = "timed-out"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz"; + sha1 = "95860bfcc5c76c277f8f8326fd0f5b2e20eba217"; + }; + }; + "trim-newlines-1.0.0" = { + name = "trim-newlines"; + packageName = "trim-newlines"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"; + sha1 = "5887966bb582a4503a41eb524f7d35011815a613"; + }; + }; + "unzip-response-1.0.2" = { + name = "unzip-response"; + packageName = "unzip-response"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz"; + sha1 = "b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe"; + }; + }; + "update-notifier-0.6.3" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "0.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-0.6.3.tgz"; + sha1 = "776dec8daa13e962a341e8a1d98354306b67ae08"; + }; + }; + "url-parse-lax-1.0.0" = { + name = "url-parse-lax"; + packageName = "url-parse-lax"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz"; + sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73"; + }; + }; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + }; + "uuid-2.0.3" = { + name = "uuid"; + packageName = "uuid"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz"; + sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a"; + }; + }; + "validate-npm-package-license-3.0.3" = { + name = "validate-npm-package-license"; + packageName = "validate-npm-package-license"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz"; + sha512 = "63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g=="; + }; + }; + "widest-line-1.0.0" = { + name = "widest-line"; + packageName = "widest-line"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz"; + sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c"; + }; + }; + "write-file-atomic-1.3.4" = { + name = "write-file-atomic"; + packageName = "write-file-atomic"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz"; + sha1 = "f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"; + }; + }; + "xdg-basedir-2.0.0" = { + name = "xdg-basedir"; + packageName = "xdg-basedir"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz"; + sha1 = "edbc903cc385fc04523d966a335504b5504d1bd2"; + }; + }; }; in { @@ -1087,344 +1096,129 @@ in sha1 = "320eafea9333a8ea2bc8e04bda8db2537c52d23f"; }; dependencies = [ - (sources."chalk-1.1.3" // { + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."any-promise-0.1.0" + sources."argparse-1.0.10" + sources."array-find-index-1.0.2" + sources."boxen-0.3.1" + sources."builtin-modules-1.1.1" + sources."bulk-replace-0.0.1" + sources."camelcase-2.1.1" + sources."camelcase-keys-2.1.0" + sources."capture-stack-trace-1.0.0" + sources."chalk-1.1.3" + sources."code-point-at-1.1.0" + sources."commander-1.1.1" + sources."configstore-2.1.0" + sources."core-util-is-1.0.2" + sources."create-error-class-3.0.2" + sources."currently-unhandled-0.4.1" + sources."decamelize-1.2.0" + sources."deep-extend-0.6.0" + sources."dot-prop-3.0.0" + sources."duplexer2-0.1.4" + sources."ejs-2.6.1" + sources."error-ex-1.3.2" + sources."escape-string-regexp-1.0.5" + sources."esprima-4.0.0" + sources."filled-array-1.1.0" + sources."find-up-1.1.2" + sources."fs-promise-0.3.1" + sources."get-stdin-4.0.1" + sources."got-5.7.1" + sources."graceful-fs-4.1.11" + sources."has-ansi-2.0.0" + sources."hepburn-1.0.0" + sources."hosted-git-info-2.6.1" + sources."imurmurhash-0.1.4" + sources."indent-string-2.1.0" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."is-arrayish-0.2.1" + sources."is-builtin-module-1.0.0" + sources."is-finite-1.0.2" + sources."is-fullwidth-code-point-1.0.0" + sources."is-npm-1.0.0" + sources."is-obj-1.0.1" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" + sources."is-utf8-0.2.1" + sources."isarray-1.0.0" + sources."js-yaml-3.12.0" + sources."keypress-0.1.0" + sources."latest-version-2.0.0" + sources."limax-1.6.0" + sources."load-json-file-1.1.0" + sources."loud-rejection-1.6.0" + sources."lowercase-keys-1.0.1" + sources."map-obj-1.0.1" + sources."meow-3.7.0" + sources."minimist-1.2.0" + (sources."mkdirp-0.5.1" // { dependencies = [ - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - (sources."has-ansi-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."supports-color-2.0.0" - ]; - }) - sources."ejs-2.5.7" - (sources."fs-promise-0.3.1" // { - dependencies = [ - sources."any-promise-0.1.0" - ]; - }) - (sources."js-yaml-3.10.0" // { - dependencies = [ - (sources."argparse-1.0.9" // { - dependencies = [ - sources."sprintf-js-1.0.3" - ]; - }) - sources."esprima-4.0.0" - ]; - }) - (sources."limax-1.5.0" // { - dependencies = [ - (sources."hepburn-1.0.0" // { - dependencies = [ - sources."bulk-replace-0.0.1" - ]; - }) - (sources."pinyin-2.8.3" // { - dependencies = [ - (sources."commander-1.1.1" // { - dependencies = [ - sources."keypress-0.1.0" - ]; - }) - sources."object-assign-4.1.1" - (sources."nodejieba-2.2.5" // { - dependencies = [ - sources."nan-2.3.5" - ]; - }) - ]; - }) - sources."speakingurl-13.0.0" - ]; - }) - (sources."meow-3.7.0" // { - dependencies = [ - (sources."camelcase-keys-2.1.0" // { - dependencies = [ - sources."camelcase-2.1.1" - ]; - }) - sources."decamelize-1.2.0" - (sources."loud-rejection-1.6.0" // { - dependencies = [ - (sources."currently-unhandled-0.4.1" // { - dependencies = [ - sources."array-find-index-1.0.2" - ]; - }) - sources."signal-exit-3.0.2" - ]; - }) - sources."map-obj-1.0.1" - sources."minimist-1.2.0" - (sources."normalize-package-data-2.4.0" // { - dependencies = [ - sources."hosted-git-info-2.5.0" - (sources."is-builtin-module-1.0.0" // { - dependencies = [ - sources."builtin-modules-1.1.1" - ]; - }) - sources."semver-5.4.1" - (sources."validate-npm-package-license-3.0.1" // { - dependencies = [ - (sources."spdx-correct-1.0.2" // { - dependencies = [ - sources."spdx-license-ids-1.2.2" - ]; - }) - sources."spdx-expression-parse-1.0.4" - ]; - }) - ]; - }) - sources."object-assign-4.1.1" - (sources."read-pkg-up-1.0.1" // { - dependencies = [ - (sources."find-up-1.1.2" // { - dependencies = [ - sources."path-exists-2.1.0" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - ]; - }) - (sources."read-pkg-1.1.0" // { - dependencies = [ - (sources."load-json-file-1.1.0" // { - dependencies = [ - sources."graceful-fs-4.1.11" - (sources."parse-json-2.2.0" // { - dependencies = [ - (sources."error-ex-1.3.1" // { - dependencies = [ - sources."is-arrayish-0.2.1" - ]; - }) - ]; - }) - sources."pify-2.3.0" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - (sources."strip-bom-2.0.0" // { - dependencies = [ - sources."is-utf8-0.2.1" - ]; - }) - ]; - }) - (sources."path-type-1.1.0" // { - dependencies = [ - sources."graceful-fs-4.1.11" - sources."pify-2.3.0" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - ]; - }) - ]; - }) - ]; - }) - (sources."redent-1.0.0" // { - dependencies = [ - (sources."indent-string-2.1.0" // { - dependencies = [ - (sources."repeating-2.0.1" // { - dependencies = [ - (sources."is-finite-1.0.2" // { - dependencies = [ - sources."number-is-nan-1.0.1" - ]; - }) - ]; - }) - ]; - }) - (sources."strip-indent-1.0.1" // { - dependencies = [ - sources."get-stdin-4.0.1" - ]; - }) - ]; - }) - sources."trim-newlines-1.0.0" + sources."minimist-0.0.8" ]; }) + sources."nan-2.10.0" + sources."node-status-codes-1.0.0" + sources."nodejieba-2.2.6" + sources."normalize-package-data-2.4.0" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" sources."open-0.0.5" - (sources."update-notifier-0.6.3" // { - dependencies = [ - (sources."boxen-0.3.1" // { - dependencies = [ - sources."filled-array-1.1.0" - sources."object-assign-4.1.1" - (sources."repeating-2.0.1" // { - dependencies = [ - (sources."is-finite-1.0.2" // { - dependencies = [ - sources."number-is-nan-1.0.1" - ]; - }) - ]; - }) - (sources."string-width-1.0.2" // { - dependencies = [ - sources."code-point-at-1.1.0" - (sources."is-fullwidth-code-point-1.0.0" // { - dependencies = [ - sources."number-is-nan-1.0.1" - ]; - }) - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - ]; - }) - sources."widest-line-1.0.0" - ]; - }) - (sources."configstore-2.1.0" // { - dependencies = [ - (sources."dot-prop-3.0.0" // { - dependencies = [ - sources."is-obj-1.0.1" - ]; - }) - sources."graceful-fs-4.1.11" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - sources."object-assign-4.1.1" - sources."os-tmpdir-1.0.2" - (sources."osenv-0.1.4" // { - dependencies = [ - sources."os-homedir-1.0.2" - ]; - }) - sources."uuid-2.0.3" - (sources."write-file-atomic-1.3.4" // { - dependencies = [ - sources."imurmurhash-0.1.4" - sources."slide-1.1.6" - ]; - }) - (sources."xdg-basedir-2.0.0" // { - dependencies = [ - sources."os-homedir-1.0.2" - ]; - }) - ]; - }) - sources."is-npm-1.0.0" - (sources."latest-version-2.0.0" // { - dependencies = [ - (sources."package-json-2.4.0" // { - dependencies = [ - (sources."got-5.7.1" // { - dependencies = [ - (sources."create-error-class-3.0.2" // { - dependencies = [ - sources."capture-stack-trace-1.0.0" - ]; - }) - sources."duplexer2-0.1.4" - sources."is-redirect-1.0.0" - sources."is-retry-allowed-1.1.0" - sources."is-stream-1.1.0" - sources."lowercase-keys-1.0.0" - sources."node-status-codes-1.0.0" - sources."object-assign-4.1.1" - (sources."parse-json-2.2.0" // { - dependencies = [ - (sources."error-ex-1.3.1" // { - dependencies = [ - sources."is-arrayish-0.2.1" - ]; - }) - ]; - }) - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - sources."read-all-stream-3.1.0" - (sources."readable-stream-2.3.3" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.1.1" - sources."string_decoder-1.0.3" - sources."util-deprecate-1.0.2" - ]; - }) - sources."timed-out-3.1.3" - sources."unzip-response-1.0.2" - (sources."url-parse-lax-1.0.0" // { - dependencies = [ - sources."prepend-http-1.0.4" - ]; - }) - ]; - }) - (sources."registry-auth-token-3.3.1" // { - dependencies = [ - (sources."rc-1.2.1" // { - dependencies = [ - sources."deep-extend-0.4.2" - sources."ini-1.3.4" - sources."minimist-1.2.0" - sources."strip-json-comments-2.0.1" - ]; - }) - sources."safe-buffer-5.1.1" - ]; - }) - (sources."registry-url-3.1.0" // { - dependencies = [ - (sources."rc-1.2.1" // { - dependencies = [ - sources."deep-extend-0.4.2" - sources."ini-1.3.4" - sources."minimist-1.2.0" - sources."strip-json-comments-2.0.1" - ]; - }) - ]; - }) - sources."semver-5.4.1" - ]; - }) - ]; - }) - (sources."semver-diff-2.1.0" // { - dependencies = [ - sources."semver-5.4.1" - ]; - }) - ]; - }) + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."package-json-2.4.0" + sources."parse-json-2.2.0" + sources."path-exists-2.1.0" + sources."path-type-1.1.0" + sources."pify-2.3.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."pinyin-2.8.3" + sources."prepend-http-1.0.4" + sources."process-nextick-args-2.0.0" + sources."rc-1.2.8" + sources."read-all-stream-3.1.0" + sources."read-pkg-1.1.0" + sources."read-pkg-up-1.0.1" + sources."readable-stream-2.3.6" + sources."redent-1.0.0" + sources."registry-auth-token-3.3.2" + sources."registry-url-3.1.0" + sources."repeating-2.0.1" + sources."safe-buffer-5.1.2" + sources."semver-5.5.0" + sources."semver-diff-2.1.0" + sources."signal-exit-3.0.2" + sources."slide-1.1.6" + sources."spdx-correct-3.0.0" + sources."spdx-exceptions-2.1.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.0" + sources."speakingurl-14.0.1" + sources."sprintf-js-1.0.3" + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-bom-2.0.0" + sources."strip-indent-1.0.1" + sources."strip-json-comments-2.0.1" + sources."supports-color-2.0.0" + sources."timed-out-3.1.3" + sources."trim-newlines-1.0.0" + sources."unzip-response-1.0.2" + sources."update-notifier-0.6.3" + sources."url-parse-lax-1.0.0" + sources."util-deprecate-1.0.2" + sources."uuid-2.0.3" + sources."validate-npm-package-license-3.0.3" + sources."widest-line-1.0.0" + sources."write-file-atomic-1.3.4" + sources."xdg-basedir-2.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -1433,5 +1227,6 @@ in license = "MIT"; }; production = true; + bypassCache = false; }; } \ No newline at end of file diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix index a112dcdec975..8e6e01237eae 100644 --- a/pkgs/misc/base16-builder/node-packages.nix +++ b/pkgs/misc/base16-builder/node-packages.nix @@ -1,16 +1,17 @@ -# This file has been generated by node2nix 1.3.0. Do not edit! +# This file has been generated by node2nix 1.6.0. Do not edit! {pkgs ? import { inherit system; }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: let - nodeEnv = import ./../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv libtool python2 utillinux runCommand writeTextFile; + nodeEnv = import ../../development/node-packages/node-env.nix { + inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; inherit nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; in import ./node-packages-generated.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} +} \ No newline at end of file diff --git a/pkgs/misc/cups/cups-pk-helper.nix b/pkgs/misc/cups/cups-pk-helper.nix index 91f5af1062c1..f0be3cad723c 100644 --- a/pkgs/misc/cups/cups-pk-helper.nix +++ b/pkgs/misc/cups/cups-pk-helper.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "cups-pk-helper-${version}"; src = fetchurl { - url = "http://www.freedesktop.org/software/cups-pk-helper/releases/cups-pk-helper-${version}.tar.xz"; + url = "https://www.freedesktop.org/software/cups-pk-helper/releases/cups-pk-helper-${version}.tar.xz"; sha256 = "0a52jw6rm7lr5nbyksiia0rn7sasyb5cjqcb95z1wxm2yprgi6lm"; }; diff --git a/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix b/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix index db60ece128f5..4464b5ba11b3 100644 --- a/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { name = "brgenml1cupswrapper-3.1.0-1"; src = fetchurl { - url = "http://download.brother.com/welcome/dlf101125/${name}.i386.deb"; + url = "https://download.brother.com/welcome/dlf101125/${name}.i386.deb"; sha256 = "0kd2a2waqr10kfv1s8is3nd5dlphw4d1343srdsbrlbbndja3s6r"; }; diff --git a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix index bd069b0d65a9..51ef47fe4693 100644 --- a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix +++ b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { name = "brgenml1lpr-3.1.0-1"; src = fetchurl { - url = "http://download.brother.com/welcome/dlf101123/${name}.i386.deb"; + url = "https://download.brother.com/welcome/dlf101123/${name}.i386.deb"; sha256 = "0zdvjnrjrz9sba0k525linxp55lr4cyivfhqbkq1c11br2nvy09f"; }; diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix index b79ffa1c9a12..351a64abd331 100644 --- a/pkgs/misc/cups/drivers/canon/default.nix +++ b/pkgs/misc/cups/drivers/canon/default.nix @@ -7,7 +7,7 @@ let i686_glibc = callPackage_i686 ({glibc}: glibc) {}; src_canon = fetchurl { - url = "http://files.canon-europe.com/files/soft45378/software/o147jen_linuxufrII_0290.zip"; + url = "https://files.canon-europe.com/files/soft45378/software/o147jen_linuxufrII_0290.zip"; sha256 = "1qpdmaaw42gm5fi21rp4lf05skffkq42ka5c8xkw8rckzb13sy9j"; }; diff --git a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix index cda4ed6304d2..8357a452a2b1 100644 --- a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix +++ b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { # The i386 part is a lie. There are x86, x86_64 and armv7l drivers. # Though this builds only supports x86_64 for now. - url = "http://download.brother.com/welcome/dlf103579/hll2390dwpdrv-${version}.i386.deb"; + url = "https://download.brother.com/welcome/dlf103579/hll2390dwpdrv-${version}.i386.deb"; sha256 = "0w8rxh1sa5amxr87qmzs4m2p06b1b36wn2q127mg427sbkh1rwni"; }; diff --git a/pkgs/misc/cups/drivers/kyocera/default.nix b/pkgs/misc/cups/drivers/kyocera/default.nix index db787021ce03..0711bad86a1e 100644 --- a/pkgs/misc/cups/drivers/kyocera/default.nix +++ b/pkgs/misc/cups/drivers/kyocera/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchzip { # this site does not like curl -> override useragent curlOpts = "-A ''"; - url = "http://cdn.kyostatics.net/dlc/ru/driver/all/linuxdrv_1_1203_fs-1x2xmfp.-downloadcenteritem-Single-File.downloadcenteritem.tmp/LinuxDrv_1.1203_FS-1x2xMFP.zip"; + url = "https://cdn.kyostatics.net/dlc/ru/driver/all/linuxdrv_1_1203_fs-1x2xmfp.-downloadcenteritem-Single-File.downloadcenteritem.tmp/LinuxDrv_1.1203_FS-1x2xMFP.zip"; sha256 = "0z1pbgidkibv4j21z0ys8cq1lafc6687syqa07qij2qd8zp15wiz"; }; diff --git a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix index 5a828c265b55..72a40f41f885 100644 --- a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.0.0-1"; src = fetchurl { - url = "http://download.brother.com/welcome/dlf006866/mfcj470dw_cupswrapper_GPL_source_${version}.tar.gz"; + url = "https://download.brother.com/welcome/dlf006866/mfcj470dw_cupswrapper_GPL_source_${version}.tar.gz"; sha256 = "b88f9b592723a00c024129560367f40a560ca3cba06fd99512ab368dd6855853"; }; diff --git a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix index c80009bd8444..c5b63b07318d 100644 --- a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.0.0-1"; src = fetchurl { - url = "http://download.brother.com/welcome/dlf006843/mfcj470dwlpr-${version}.i386.deb"; + url = "https://download.brother.com/welcome/dlf006843/mfcj470dwlpr-${version}.i386.deb"; sha256 = "7202dd895d38d50bb767080f2995ed350eed99bc2b7871452c3c915c8eefc30a"; }; diff --git a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix index fbb523409187..4b31ccf38774 100644 --- a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.0.0-1"; src = fetchurl { - url = "http://download.brother.com/welcome/dlf006814/mfcj6510dw_cupswrapper_GPL_source_${version}.tar.gz"; + url = "https://download.brother.com/welcome/dlf006814/mfcj6510dw_cupswrapper_GPL_source_${version}.tar.gz"; sha256 = "0y5iffybxjin8injrdmc9n9hl4s6b8n6ck76m1z78bzi88vwmhai"; }; diff --git a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix index 228f56d47ae0..40e65136f1b0 100644 --- a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { version = "3.0.0-1"; src = fetchurl { - url = "http://download.brother.com/welcome/dlf006614/mfcj6510dwlpr-${version}.i386.deb"; + url = "https://download.brother.com/welcome/dlf006614/mfcj6510dwlpr-${version}.i386.deb"; sha256 = "1ccvx393pqavsgzd8igrzlin5jrsf01d3acyvwqd1d0yz5jgqy6d"; }; diff --git a/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix index 3b1d2e52881a..1673c2d5c5c8 100644 --- a/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "mfcl2700dncupswrapper-${meta.version}"; src = fetchurl { - url = "http://download.brother.com/welcome/dlf102086/${name}.i386.deb"; + url = "https://download.brother.com/welcome/dlf102086/${name}.i386.deb"; sha256 = "07w48mah0xbv4h8vsh1qd5cd4b463bx8y6gc5x9pfgsxsy6h6da1"; }; diff --git a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix index b0a030469349..8e31cd2956a5 100644 --- a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.2.0-1"; src = fetchurl { - url = "http://download.brother.com/welcome/dlf102085/${name}.i386.deb"; + url = "https://download.brother.com/welcome/dlf102085/${name}.i386.deb"; sha256 = "170qdzxlqikzvv2wphvfb37m19mn13az4aj88md87ka3rl5knk4m"; }; diff --git a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix index d45b53b5b80b..2099291d434b 100644 --- a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.2.0-1"; src = fetchurl { - url = "http://download.brother.com/welcome/dlf101802/${name}.i386.deb"; + url = "https://download.brother.com/welcome/dlf101802/${name}.i386.deb"; sha256 = "6d131926ce22c51b1854d2b91e426cc7ecbf5d6dabd698ef51a417090e35c598"; }; diff --git a/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix index 7791d71114b4..8dbc56fe846d 100644 --- a/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.2.0-1"; src = fetchurl { - url = "http://download.brother.com/welcome/dlf101801/${name}.i386.deb"; + url = "https://download.brother.com/welcome/dlf101801/${name}.i386.deb"; sha256 = "088217e9ad118ec1e7f3d3f8f60f3bd839fe2c7d7c1136b249e9ac648dc742af"; }; diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 2195cf7d2a39..d15680b63639 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { version = "1.20.3"; src = fetchurl { - url = "http://openprinting.org/download/cups-filters/${name}.tar.xz"; + url = "https://openprinting.org/download/cups-filters/${name}.tar.xz"; sha256 = "1g18qkvl9zdxickiblgs2vvkip4b6p2jalw4d30zzz3hh8f1g6iv"; }; diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index 1c79be712b06..ca7ac4b41528 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -6,7 +6,7 @@ libxslt, libusb, sane-backends, rpm, cpio, -eject, +getopt, patchelf, gcc }: @@ -25,6 +25,38 @@ in # adding a plugin for another printer shouldn't be too difficult, but you need the firmware to test... let plugins = { + x770 = stdenv.mkDerivation rec { + name = "iscan-gt-x770-bundle"; + version = "1.0.1"; + pluginVersion = "2.1.2-1"; + + buildInputs = [ patchelf rpm ]; + src = fetchurl { + url = "https://download2.ebz.epson.net/iscan/plugin/gt-x770/rpm/x64/iscan-gt-x770-bundle-${version}.x64.rpm.tar.gz"; + sha256 = "0m9c60rszzdvq1pqfzygzzrjycm1giy465lj29108j7hsnfcv56r"; + }; + installPhase = '' + cd plugins + ${rpm}/bin/rpm2cpio iscan-plugin-gt-x770-${pluginVersion}.x86_64.rpm | ${cpio}/bin/cpio -idmv + mkdir $out + cp -r usr/share $out + cp -r usr/lib64 $out/lib + mv $out/share/iscan $out/share/esci + mv $out/lib/iscan $out/lib/esci + ''; + preFixup = '' + lib=$out/lib/esci/libesint7C.so + rpath=${gcc.cc.lib}/lib/ + patchelf --set-rpath $rpath $lib + ''; + passthru = { + registrationCommand = '' + $registry --add interpreter usb 0x04b8 0x0130 "$plugin/lib/esci/libesint7C $plugin/share/esci/esfw7C.bin" + ''; + hw = "Perfection V500 Photo"; + }; + meta = common_meta // { description = "iscan esci x770 plugin for "+passthru.hw; }; + }; f720 = stdenv.mkDerivation rec { name = "iscan-gt-f720-bundle"; version = "1.0.1"; @@ -124,7 +156,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' # iscan-registry is a shell script requiring getopt - wrapProgram $out/bin/iscan-registry --prefix PATH : ${eject}/bin + wrapProgram $out/bin/iscan-registry --prefix PATH : ${getopt}/bin registry=$out/bin/iscan-registry; '' + stdenv.lib.concatStrings (stdenv.lib.mapAttrsToList (name: value: '' diff --git a/pkgs/misc/drivers/epkowa/firmware_location.patch b/pkgs/misc/drivers/epkowa/firmware_location.patch index 7f67d9cf4579..58ea849d8f9d 100644 --- a/pkgs/misc/drivers/epkowa/firmware_location.patch +++ b/pkgs/misc/drivers/epkowa/firmware_location.patch @@ -8,11 +8,12 @@ set this environment variable. Instead, we patch iscan to set this variable before loading libesci-interpreter-gt-f720.so. --- backend/channel-usb.c.orig 2017-08-14 11:24:27.669582456 +0200 +++ backend/channel-usb.c 2017-08-14 11:31:40.509010897 +0200 -@@ -169,6 +169,8 @@ +@@ -169,6 +169,9 @@ { SANE_Status s; + setenv("ESCI_FIRMWARE_DIR", NIX_ESCI_PREFIX, 1); ++ setenv("ISCAN_FW_DIR", NIX_ESCI_PREFIX, 1); + s = sanei_usb_open (self->name, &self->fd); diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix index d6ac4fd6a03c..99286d5f2047 100644 --- a/pkgs/misc/drivers/foomatic-filters/default.nix +++ b/pkgs/misc/drivers/foomatic-filters/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "foomatic-filters-4.0.17"; src = fetchurl { - url = "http://www.openprinting.org/download/foomatic/${name}.tar.gz"; + url = "https://www.openprinting.org/download/foomatic/${name}.tar.gz"; sha256 = "1qrkgbm5jay2r7sh9qbyf0aiyrsl1mdc844hxf7fhw95a0zfbqm2"; }; diff --git a/pkgs/misc/drivers/gutenprint/bin.nix b/pkgs/misc/drivers/gutenprint/bin.nix index 021852f3505c..3832c4de2dcc 100644 --- a/pkgs/misc/drivers/gutenprint/bin.nix +++ b/pkgs/misc/drivers/gutenprint/bin.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { name = "cups-gutenprint-binary-5.0.1"; src = if stdenv.system == "x86_64-linux" then fetchurl { - url = http://www.openprinting.org/download/printdriver/debian/dists/lsb3.1/main/binary-amd64/gutenprint_5.0.1-1lsb3.1_amd64.deb; + url = https://www.openprinting.org/download/printdriver/debian/dists/lsb3.1/main/binary-amd64/gutenprint_5.0.1-1lsb3.1_amd64.deb; sha256 = "0an5gba6r6v54r53s2gj2fjk8fzpl4lrksjas2333528b0k8gbbc"; } else throw "TODO"; # get from openprint.com -> drivers -> gutenprint diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 91be6cf743a4..4b88d4a96fa0 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -1,26 +1,28 @@ { stdenv, fetchurl, substituteAll , pkgconfig , makeWrapper -, cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils -, net_snmp, openssl, polkit, nettools +, cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends +, dbus, file, ghostscript, usbutils +, net_snmp, openssl, perl, polkit, nettools , bash, coreutils, utillinux , withQt5 ? true , withPlugin ? false +, withStaticPPDInstall ? false }: let name = "hplip-${version}"; - version = "3.18.3"; + version = "3.18.5"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "0x5xs86v18w46rxz5whc15bl4fb7p4km6xqjpwzclp83nl7rl01y"; + sha256 = "0xb7ga2wgbwjxsss67mjn2y6fmqsfwzmv11ivvfzhnl36lh22hkb"; }; plugin = fetchurl { url = "https://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; - sha256 = "11nc3cifhd2h2c7p0dr2jjzrg3fd5j43ih1wy0m186l6wcgdjssw"; + sha256 = "1jf74jya071zqvwhy9n0c3007pzgcxydkw7qdh4sx70brly81i7p"; }; hplipState = substituteAll { @@ -55,8 +57,11 @@ pythonPackages.buildPythonApplication { libusb1 sane-backends dbus + file + ghostscript net_snmp openssl + perl zlib ]; @@ -86,6 +91,11 @@ pythonPackages.buildPythonApplication { -e s,/usr/share/hal/fdi/preprobe/10osvendor,$out/share/hal/fdi/preprobe/10osvendor,g \ -e s,/usr/lib/systemd/system,$out/lib/systemd/system,g \ -e s,/var/lib/hp,$out/var/lib/hp,g \ + -e s,/usr/bin/perl,${perl}/bin/perl,g \ + -e s,/usr/bin/file,${file}/bin/file,g \ + -e s,/usr/bin/gs,${ghostscript}/bin/gs,g \ + -e s,/usr/share/cups/fonts,${ghostscript}/share/ghostscript/fonts,g \ + -e "s,ExecStart=/usr/bin/python /usr/bin/hp-config_usb_printer,ExecStart=$out/bin/hp-config_usb_printer,g" \ {} + ''; @@ -98,6 +108,7 @@ pythonPackages.buildPythonApplication { --with-systraydir=$out/xdg/autostart --with-mimedir=$out/etc/cups --enable-policykit + ${stdenv.lib.optionalString withStaticPPDInstall "--enable-cups-ppd-install"} --disable-qt4 ${stdenv.lib.optionalString withQt5 "--enable-qt5"} " @@ -111,10 +122,20 @@ pythonPackages.buildPythonApplication { hplip_confdir=$out/etc/hp hplip_statedir=$out/var/lib/hp " + + # Prevent 'ppdc: Unable to find include file ""' which prevent + # generation of '*.ppd' files. + # This seems to be a 'ppdc' issue when the tool is run in a hermetic sandbox. + # Could not find how to fix the problem in 'ppdc' so this is a workaround. + export CUPS_DATADIR="${cups}/share/cups" ''; enableParallelBuilding = true; + # + # Running `hp-diagnose_plugin -g` can be used to diagnose + # issues with plugins. + # postInstall = stdenv.lib.optionalString withPlugin '' sh ${plugin} --noexec --keep cd plugin_tmp @@ -130,17 +151,27 @@ pythonPackages.buildPythonApplication { mkdir -p $out/share/hplip/prnt/plugins for plugin in lj hbpl1; do cp $plugin-${hplipArch}.so $out/share/hplip/prnt/plugins + chmod 0755 $out/share/hplip/prnt/plugins/$plugin-${hplipArch}.so ln -s $out/share/hplip/prnt/plugins/$plugin-${hplipArch}.so \ $out/share/hplip/prnt/plugins/$plugin.so done mkdir -p $out/share/hplip/scan/plugins - for plugin in bb_soap bb_marvell bb_soapht fax_marvell; do + for plugin in bb_soap bb_marvell bb_soapht bb_escl; do cp $plugin-${hplipArch}.so $out/share/hplip/scan/plugins + chmod 0755 $out/share/hplip/scan/plugins/$plugin-${hplipArch}.so ln -s $out/share/hplip/scan/plugins/$plugin-${hplipArch}.so \ $out/share/hplip/scan/plugins/$plugin.so done + mkdir -p $out/share/hplip/fax/plugins + for plugin in fax_marvell; do + cp $plugin-${hplipArch}.so $out/share/hplip/fax/plugins + chmod 0755 $out/share/hplip/fax/plugins/$plugin-${hplipArch}.so + ln -s $out/share/hplip/fax/plugins/$plugin-${hplipArch}.so \ + $out/share/hplip/fax/plugins/$plugin.so + done + mkdir -p $out/var/lib/hp cp ${hplipState} $out/var/lib/hp/hplip.state diff --git a/pkgs/misc/drivers/postscript-lexmark/default.nix b/pkgs/misc/drivers/postscript-lexmark/default.nix index f6ddc61b5157..f41104580626 100644 --- a/pkgs/misc/drivers/postscript-lexmark/default.nix +++ b/pkgs/misc/drivers/postscript-lexmark/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "postscript-lexmark-${version}"; src = fetchurl { - url = "http://www.openprinting.org/download/printdriver/components/lsb3.2/main/RPMS/noarch/openprinting-ppds-postscript-lexmark-${version}-1lsb3.2.noarch.rpm"; + url = "https://www.openprinting.org/download/printdriver/components/lsb3.2/main/RPMS/noarch/openprinting-ppds-postscript-lexmark-${version}-1lsb3.2.noarch.rpm"; sha256 = "0wbhvypdr96a5ddg6kj41dn9sbl49n7pfi2vs762ij82hm2gvwcm"; }; diff --git a/pkgs/misc/emulators/bsod/default.nix b/pkgs/misc/emulators/bsod/default.nix index f4b4db497e2d..8575d654febf 100644 --- a/pkgs/misc/emulators/bsod/default.nix +++ b/pkgs/misc/emulators/bsod/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "bsod-0.1"; src = fetchurl { - url = http://www.vanheusden.com/bsod/bsod-0.1.tgz; + url = https://www.vanheusden.com/bsod/bsod-0.1.tgz; sha256 = "0hqwacazyq5rhc04j8w8w0j0dgb6ca8k66c9lxf6bsyi6wvbhvmd"; }; diff --git a/pkgs/misc/emulators/dlx/default.nix b/pkgs/misc/emulators/dlx/default.nix index 561f14b5554f..358cc59d3db0 100644 --- a/pkgs/misc/emulators/dlx/default.nix +++ b/pkgs/misc/emulators/dlx/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "dlx-2012.07.08"; src = fetchurl { - url = "http://www.davidviner.com/zip/dlx/dlx.zip"; + url = "https://www.davidviner.com/zip/dlx/dlx.zip"; sha256 = "0q5hildq2xcig7yrqi26n7fqlanyssjirm7swy2a9icfxpppfpkn"; }; diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/misc/emulators/epsxe/default.nix index 2f11384d845a..a0999e6caf52 100644 --- a/pkgs/misc/emulators/epsxe/default.nix +++ b/pkgs/misc/emulators/epsxe/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version2 = concatStrings (splitString "." version); platform = "linux" + (optionalString stdenv.is64bit "_x64"); in fetchurl { - url = "http://www.epsxe.com/files/ePSXe${version2}${platform}.zip"; + url = "https://www.epsxe.com/files/ePSXe${version2}${platform}.zip"; sha256 = if stdenv.is64bit then "16fa9qc2xhaz1f6294m0b56s5l86cbmclwm9w3mqnch0yjsrvab0" else "1677lclam557kp8jwvchdrk27zfj50fqx2q9i3bcx26d9k61q3kl"; diff --git a/pkgs/misc/emulators/firebird-emu/default.nix b/pkgs/misc/emulators/firebird-emu/default.nix new file mode 100644 index 000000000000..882bf13f4eaf --- /dev/null +++ b/pkgs/misc/emulators/firebird-emu/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, qmake, qtbase, qtdeclarative }: + +stdenv.mkDerivation rec { + name = "firebird-emu-${version}"; + version = "1.4"; + + src = fetchFromGitHub { + owner = "nspire-emus"; + repo = "firebird"; + rev = "v${version}"; + sha256 = "0pdca6bgnmzfgf5kp83as99y348gn4plzbxnqxjs61vp489baahq"; + fetchSubmodules = true; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ qmake ]; + + buildInputs = [ qtbase qtdeclarative ]; + + makeFlags = [ "INSTALL_ROOT=$(out)" ]; + + # Attempts to install to /usr/bin and /usr/share/applications, which Nix does + # not use. + prePatch = '' + substituteInPlace firebird.pro \ + --replace '/usr/' '/' + ''; + + meta = { + homepage = https://github.com/nspire-emus/firebird; + description = "Third-party multi-platform emulator of the ARM-based TI-Nspire™ calculators"; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ pneumaticat ]; + # Only tested on Linux, but likely possible to build on, e.g. macOS + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/misc/emulators/hatari/default.nix b/pkgs/misc/emulators/hatari/default.nix index 440eb681eb38..287df4db01be 100644 --- a/pkgs/misc/emulators/hatari/default.nix +++ b/pkgs/misc/emulators/hatari/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "hatari-2.1.0"; src = fetchurl { - url = "http://download.tuxfamily.org/hatari/2.1.0/${name}.tar.bz2"; + url = "https://download.tuxfamily.org/hatari/2.1.0/${name}.tar.bz2"; sha256 = "0909l9fq20ninf8xgv5qf0a5y64cpk5ja1rsk2iaid1dx5h98agb"; }; diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index 7b42e8d60339..fbe44c6540b3 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sourceName = "higan_v${version}-source"; src = fetchurl { - urls = [ "http://download.byuu.org/${sourceName}.7z" ]; + urls = [ "https://download.byuu.org/${sourceName}.7z" ]; sha256 = "063dzp9wrdnbvagraxi31xg0154y2gf67rrd0mnc8h104cgzjr35"; curlOpts = "--user-agent 'Mozilla/5.0'"; # the good old user-agent trick... }; diff --git a/pkgs/misc/emulators/libdsk/default.nix b/pkgs/misc/emulators/libdsk/default.nix index c2103938accc..9a99c6ddb6f9 100644 --- a/pkgs/misc/emulators/libdsk/default.nix +++ b/pkgs/misc/emulators/libdsk/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.5.8"; src = fetchurl { - url = "http://www.seasip.info/Unix/LibDsk/${name}.tar.gz"; + url = "https://www.seasip.info/Unix/LibDsk/${name}.tar.gz"; sha256 = "1fdypk6gjkb4i2ghnbn3va50y69pdym51jx3iz9jns4636z4sfqd"; }; diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix index 140149bde495..732a5971ed3c 100644 --- a/pkgs/misc/emulators/rpcs3/default.nix +++ b/pkgs/misc/emulators/rpcs3/default.nix @@ -1,19 +1,31 @@ -{ stdenv, lib, fetchgit, cmake, pkgconfig -, qtbase, openal, glew, llvm_4, vulkan-loader, libpng, ffmpeg, libevdev -, pulseaudioSupport ? true, libpulseaudio -, waylandSupport ? true, wayland -, alsaSupport ? true, alsaLib -}: - -stdenv.mkDerivation rec { - name = "rpcs3-${version}"; - version = "2018-02-23"; - - src = fetchgit { - url = "https://github.com/RPCS3/rpcs3"; - rev = "41bd07274f15b8f1be2475d73c3c75ada913dabb"; - sha256 = "1v28m64ahakzj4jzjkmdd7y8q75pn9wjs03vprbnl0z6wqavqn0x"; - }; +{ stdenv, lib, fetchgit, cmake, pkgconfig, git +, qt5, openal, glew, vulkan-loader, libpng, ffmpeg, libevdev, python27 +, pulseaudioSupport ? true, libpulseaudio +, waylandSupport ? true, wayland +, alsaSupport ? true, alsaLib +}: + +let + majorVersion = "0.0.5"; + gitVersion = "6980-81e5f3b7f"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD) +in +stdenv.mkDerivation rec { + name = "rpcs3-${version}"; + version = "${majorVersion}-${gitVersion}"; + + src = fetchgit { + url = "https://github.com/RPCS3/rpcs3"; + rev = "81e5f3b7f299942f56bcfdde54edd09c722b32d8"; + sha256 = "0czj6ga1nccqgcvi58sjnv1cc4k7qvwijp4warml463hpsmbd9r0"; + }; + + preConfigure = '' + cat > ./rpcs3/git-version.h <' \ - '"${pkgs.darwin.apple_sdk.sdk.out}/include/MacTypes.h"' + '"${stdenv.lib.getDev pkgs.darwin.apple_sdk.sdk}/include/MacTypes.h"' done || true # grep returns 1 if it can't find the string ''; preBuild = '' diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index d153ef16c14e..910f1b91c215 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile }: +{ stdenv, requireFile, targetPlatform, lib }: let requireXcode = version: sha256: let @@ -40,11 +40,11 @@ let requireXcode = version: sha256: in app.overrideAttrs ( oldAttrs: oldAttrs // { inherit meta; }); -in rec { +in lib.makeExtensible (self: { xcode_8_1 = requireXcode "8.1" "18xjvfipwzia66gm3r9p770xdd4r375vak7chw5vgqnv9yyjiq2n"; xcode_8_2 = requireXcode "8.2" "13nd1zsfqcp9hwp15hndr0rsbb8rgprrz7zr2ablj4697qca06m2"; xcode_9_1 = requireXcode "9.1" "0ab1403wy84ys3yn26fj78cazhpnslmh3nzzp1wxib3mr1afjvic"; xcode_9_2 = requireXcode "9.2" "1bgfgdp266cbbqf2axcflz92frzvhi0qw0jdkcw6r85kdpc8dj4c"; xcode_9_4 = requireXcode "9.4" "6731381785075602a52489f7ea47ece8f6daf225007ba3ffae1fd59b1c0b5f01"; - xcode = xcode_9_4; -} + xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if targetPlatform.useiOSPrebuilt then targetPlatform.xcodeVer else "8.2")}"; +}) diff --git a/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix similarity index 71% rename from pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix rename to pkgs/os-specific/darwin/xcode/sdk-pkgs.nix index ebca738431c3..d5ed21cd9e24 100644 --- a/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix +++ b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix @@ -25,9 +25,9 @@ rec { sdk = rec { name = "ios-sdk"; type = "derivation"; - outPath = xcode + "/Contents/Developer/Platforms/iPhone${sdkType}.platform/Developer/SDKs/iPhone${sdkType}${version}.sdk"; + outPath = xcode + "/Contents/Developer/Platforms/${platform}.platform/Developer/SDKs/${platform}${version}.sdk"; - sdkType = if targetPlatform.isiPhoneSimulator then "Simulator" else "OS"; + platform = targetPlatform.xcodePlatform; version = targetPlatform.sdkVer; }; @@ -48,7 +48,10 @@ rec { mv cc-cflags.tmp $out/nix-support/cc-cflags echo "-target ${targetPlatform.config} -arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/cc-cflags echo "-isystem ${sdk}/usr/include -isystem ${sdk}/usr/include/c++/4.2.1/ -stdlib=libstdc++" >> $out/nix-support/cc-cflags - echo "${if targetPlatform.isiPhoneSimulator then "-mios-simulator-version-min" else "-miphoneos-version-min"}=${minSdkVersion}" >> $out/nix-support/cc-cflags + '' + stdenv.lib.optionalString (sdk.platform == "iPhoneSimulator") '' + echo "-mios-simulator-version-min=${minSdkVersion}" >> $out/nix-support/cc-cflags + '' + stdenv.lib.optionalString (sdk.platform == "iPhoneOS") '' + echo "-miphoneos-version-min=${minSdkVersion}" >> $out/nix-support/cc-cflags ''; }) // { inherit sdk; @@ -60,7 +63,7 @@ rec { }; } '' if ! [ -d ${sdk} ]; then - echo "You must have version ${sdk.version} of the iPhone${sdk.sdkType} sdk installed at ${sdk}" >&2 + echo "You must have version ${sdk.version} of the ${sdk.platform} sdk installed at ${sdk}" >&2 exit 1 fi ln -s ${sdk}/usr $out diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix index ea4f44f52bbb..7b4ac9e1f3b8 100644 --- a/pkgs/os-specific/linux/atop/default.nix +++ b/pkgs/os-specific/linux/atop/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "atop-${version}"; src = fetchurl { - url = "http://www.atoptool.nl/download/atop-${version}.tar.gz"; + url = "https://www.atoptool.nl/download/atop-${version}.tar.gz"; sha256 = "0r5j9q89wpylmg0px5xymxi3jpihw9wq8bh37g3ciymsw1fp5r3k"; }; diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index ea54ed0b68e8..ad21a6a4dcd6 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { name = "audit-2.8.4"; src = fetchurl { - url = "http://people.redhat.com/sgrubb/audit/${name}.tar.gz"; + url = "https://people.redhat.com/sgrubb/audit/${name}.tar.gz"; sha256 = "0f4ci6ffznnmgblwgv7ich9mjfk3p6y5l6m6h3chhmzw156nj454"; }; diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index 90489e12d690..a3914067d7d8 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "alfred-${ver}"; src = fetchurl { - url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; + url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; sha256 = "0xkd842yp227jzfybjq8c5s7y5c7amm1f5ai80k8wyjwysnad3w0"; }; diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index a1a2cff70a83..61d0eb9bdb0c 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "batctl-${ver}"; src = fetchurl { - url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; + url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; sha256 = "0lxm0vb0w1gxyi5k553jgkpmhifc4cykzfybrsk8hvwilq6pv1r7"; }; diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index e8972263f38d..1a8f7f768626 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test # still builds after the update. src = fetchurl { - url = "http://busybox.net/downloads/${name}.tar.bz2"; + url = "https://busybox.net/downloads/${name}.tar.bz2"; sha256 = "0smfn8hlds6nx8war62kyaykg3n7mxbjjfcpsgz84znwk4v4mhg3"; }; diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix index 1ef18f703d3f..9b7f69d4ab89 100644 --- a/pkgs/os-specific/linux/checksec/default.nix +++ b/pkgs/os-specific/linux/checksec/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.5"; src = fetchurl { - url = "http://www.trapkit.de/tools/checksec.sh"; + url = "https://www.trapkit.de/tools/checksec.sh"; sha256 = "0iq9v568mk7g7ksa1939g5f5sx7ffq8s8n2ncvphvlckjgysgf3p"; }; diff --git a/pkgs/os-specific/linux/conntrack-tools/default.nix b/pkgs/os-specific/linux/conntrack-tools/default.nix index 8f9983b5d6e3..755e88b46cbc 100644 --- a/pkgs/os-specific/linux/conntrack-tools/default.nix +++ b/pkgs/os-specific/linux/conntrack-tools/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "1.4.5"; src = fetchurl { - url = "http://www.netfilter.org/projects/conntrack-tools/files/${name}.tar.bz2"; + url = "https://www.netfilter.org/projects/conntrack-tools/files/${name}.tar.bz2"; sha256 = "0qm4m78hr6a4fbmnkw5nyjm1pzzhydzx0nz7f96iv1c4fsfdkiin"; }; diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index dba495d0dee5..ad9b27f83fa9 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "3.9"; src = fetchurl { - url = "http://download.openvz.org/criu/${name}.tar.bz2"; + url = "https://download.openvz.org/criu/${name}.tar.bz2"; sha256 = "0l71lmklr42pc2bj37pkp7y8va8bx42n9f6i4q4idsx4wrdd75fx"; }; diff --git a/pkgs/os-specific/linux/dmraid/default.nix b/pkgs/os-specific/linux/dmraid/default.nix index c2e950b4ba48..e71d36c5e485 100644 --- a/pkgs/os-specific/linux/dmraid/default.nix +++ b/pkgs/os-specific/linux/dmraid/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "dmraid-1.0.0.rc16"; src = fetchurl { - url = "http://people.redhat.com/~heinzm/sw/dmraid/src/old/${name}.tar.bz2"; + url = "https://people.redhat.com/~heinzm/sw/dmraid/src/old/${name}.tar.bz2"; sha256 = "0m92971gyqp61darxbiri6a48jz3wq3gkp8r2k39320z0i6w8jgq"; }; diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index b4c4af8c2e21..13614493f610 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { version = "17.11.2"; src = fetchurl { - url = "http://fast.dpdk.org/rel/dpdk-${version}.tar.xz"; + url = "https://fast.dpdk.org/rel/dpdk-${version}.tar.xz"; sha256 = "19m5l3jkrns8r1zbjb6ry18w50ff36kbl5b5g6pfcp9p57sfisd2"; }; diff --git a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix index 224239a4affd..8aa78e65dec1 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "b43-fwcutter-019"; src = fetchurl { - url = "http://bues.ch/b43/fwcutter/${name}.tar.bz2"; + url = "https://bues.ch/b43/fwcutter/${name}.tar.bz2"; sha256 = "1ki1f5fy3yrw843r697f8mqqdz0pbsbqnvg4yzkhibpn1lqqbsnn"; }; diff --git a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix index e8ab77a509ff..bf8bcf387261 100644 --- a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix +++ b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "intel2200BGFirmware-${version}"; src = fetchurl { - url = "http://src.fedoraproject.org/repo/pkgs/ipw2200-firmware/ipw2200-fw-${version}.tgz/eaba788643c7cc7483dd67ace70f6e99/ipw2200-fw-${version}.tgz"; + url = "https://src.fedoraproject.org/repo/pkgs/ipw2200-firmware/ipw2200-fw-${version}.tgz/eaba788643c7cc7483dd67ace70f6e99/ipw2200-fw-${version}.tgz"; sha256 = "c6818c11c18cc030d55ff83f64b2bad8feef485e7742f84f94a61d811a6258bd"; }; diff --git a/pkgs/os-specific/linux/fswebcam/default.nix b/pkgs/os-specific/linux/fswebcam/default.nix index fd37d35623e4..b7f47f12b15b 100644 --- a/pkgs/os-specific/linux/fswebcam/default.nix +++ b/pkgs/os-specific/linux/fswebcam/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "fswebcam-20140113"; src = fetchurl { - url = "http://www.sanslogic.co.uk/fswebcam/files/${name}.tar.gz"; + url = "https://www.sanslogic.co.uk/fswebcam/files/${name}.tar.gz"; sha256 = "3ee389f72a7737700d22e0c954720b1e3bbadc8a0daad6426c25489ba9dc3199"; }; diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index a3d8d0a0eece..40d6967c66f4 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "fwts-${version}"; - version = "18.05.00"; + version = "18.06.02"; src = fetchzip { url = "http://fwts.ubuntu.com/release/fwts-V${version}.tar.gz"; - sha256 = "0ixc82zdv4cfj8g2mwd851fc47cpjj81mwjhn00n5wddb9cxmgkj"; + sha256 = "1j7yn3qyy9baylhjvr9j8hiyl1nc7la1j4fffvxk8qvxakwxbyl2"; stripRoot = false; }; diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix index 41bdd5d12ac3..4e04c16d70bd 100644 --- a/pkgs/os-specific/linux/google-authenticator/default.nix +++ b/pkgs/os-specific/linux/google-authenticator/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ pam ]; preConfigure = '' - sed -i "s|libqrencode.so.3|${qrencode}/lib/libqrencode.so.3|" src/google-authenticator.c + sed -i "s|libqrencode.so.4|${qrencode}/lib/libqrencode.so.4|" src/google-authenticator.c ''; installPhase = '' diff --git a/pkgs/os-specific/linux/ioport/default.nix b/pkgs/os-specific/linux/ioport/default.nix index b6c77a930807..56e622df2ce8 100644 --- a/pkgs/os-specific/linux/ioport/default.nix +++ b/pkgs/os-specific/linux/ioport/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "ioport-1.2"; src = fetchurl { - url = "http://people.redhat.com/rjones/ioport/files/ioport-1.2.tar.gz"; + url = "https://people.redhat.com/rjones/ioport/files/ioport-1.2.tar.gz"; sha256 = "1h4d5g78y7kla0zl25jgyrk43wy3m3bygqg0blki357bc55irb3z"; }; buildInputs = [ perl ]; diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index 1668933db809..0c088ac2a4bc 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "1.6.2"; src = fetchurl { - url = "http://www.netfilter.org/projects/iptables/files/${name}.tar.bz2"; + url = "https://www.netfilter.org/projects/iptables/files/${name}.tar.bz2"; sha256 = "0crp0lvh5m2f15pr8cw97h8yb8zjj10x95zj06j46cr68vx2vl2m"; }; diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index a00ba9ab7b8e..5ae128741129 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -55,6 +55,9 @@ ${optionalString (versionOlder version "4.11") '' # via the selinux=0 boot parameter. ${optionalString (versionAtLeast version "4.12") '' SECURITY_SELINUX_DISABLE n +''} + +${optionalString ((versionAtLeast version "4.12") && (versionOlder version "4.17")) '' SECURITY_WRITABLE_HOOKS n ''} diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 4f0308d14922..cf6b254ee858 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.51"; + version = "4.14.52"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0awpvyigj28j8ibjm5362xnlcaiqcn7lwd9wkf7k8i14m8ml1cns"; + sha256 = "0448z0sdwazk2xrwq1zrinv881qhl33f5r2n3pqb07pxnb3jdlm5"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix index 61eb394f6ee0..46d58c5a14dc 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.16.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.16.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.16.17"; + version = "4.16.18"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1302pjxrwpdvmnpisgsgv41brj52y3ppkwi0cyd4c1q8mc5qsgf9"; + sha256 = "089hx2hdd5r558mv8n0c7jciv2nj9v77df0lsplsbxx47dqns0j1"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.17.nix b/pkgs/os-specific/linux/kernel/linux-4.17.nix index 7dbe8c1a15a3..166a8572cf7a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.17.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.17.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.17.2"; + version = "4.17.3"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "173vv0fwykpxhldrr7z83d1wl3ly5mc21nd68f2ycjfw9mpwvssc"; + sha256 = "1z8zja786x5dxwm69zgfkwsvfwjfznwbclf76301c2fd4wjancmg"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 242083219b23..287d8c9cf37d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.109"; + version = "4.9.110"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1c2rwddr8v1l0b5yswfmpy0pf4gdqi4ycs9b94cj2hsklma5dk9x"; + sha256 = "0ypaqj9vs2jc4qiss5yyplx09rk55fa3hrlzdkm0x7x7f0x196ip"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp-93.nix b/pkgs/os-specific/linux/kernel/linux-mptcp-93.nix new file mode 100644 index 000000000000..2efe357cbd68 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-mptcp-93.nix @@ -0,0 +1,47 @@ +{ stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: + +buildLinux (rec { + mptcpVersion = "0.93"; + modDirVersion = "4.9.60"; + version = "${modDirVersion}-mptcp_v${mptcpVersion}"; + + extraMeta = { + branch = "4.4"; + maintainers = with stdenv.lib.maintainers; [ teto layus ]; + }; + + src = fetchFromGitHub { + owner = "multipath-tcp"; + repo = "mptcp"; + rev = "v${mptcpVersion}"; + sha256 = "1irlppzvcmckrazs2c4vg6y8ji31552izc3wqabf401v57jvxcys"; + }; + + extraConfig = '' + IPV6 y + MPTCP y + IP_MULTIPLE_TABLES y + + # Enable advanced path-managers... + MPTCP_PM_ADVANCED y + MPTCP_FULLMESH y + MPTCP_NDIFFPORTS y + # ... but use none by default. + # The default is safer if source policy routing is not setup. + DEFAULT_DUMMY y + DEFAULT_MPTCP_PM default + + # MPTCP scheduler selection. + # Disabled as the only non-default is the useless round-robin. + MPTCP_SCHED_ADVANCED n + DEFAULT_MPTCP_SCHED default + + # Smarter TCP congestion controllers + TCP_CONG_LIA m + TCP_CONG_OLIA m + TCP_CONG_WVEGAS m + TCP_CONG_BALIA m + + '' + (args.extraConfig or ""); +} // args) + diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix index d486bd1d6d24..a439fd0a6ec5 100644 --- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix +++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix @@ -1,8 +1,8 @@ { stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: buildLinux (rec { - mptcpVersion = "0.93"; - modDirVersion = "4.9.60"; + mptcpVersion = "0.94"; + modDirVersion = "4.14.24"; version = "${modDirVersion}-mptcp_v${mptcpVersion}"; # autoModules= true; @@ -15,7 +15,7 @@ buildLinux (rec { owner = "multipath-tcp"; repo = "mptcp"; rev = "v${mptcpVersion}"; - sha256 = "1irlppzvcmckrazs2c4vg6y8ji31552izc3wqabf401v57jvxcys"; + sha256 = "01y3jf5awdxcv6vfpr30n0vaa8w1wgip0whiv88d610550299hkv"; }; extraConfig = '' diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index d1732af9f5eb..5e8059bb4655 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.18-rc1"; - modDirVersion = "4.18.0-rc1"; + version = "4.18-rc2"; + modDirVersion = "4.18.0-rc2"; extraMeta.branch = "4.18"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1wzxnzhxmzn5gygxs1vm4iawknpivr5kn1mav8l1ll3q7s5xqjnr"; + sha256 = "04vflzj14wvvkj3lsbabsw0239y58cdd8g5kciqz1ydhdlgifpza"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix index c7915ace7ca3..201f170c2580 100644 --- a/pkgs/os-specific/linux/keyutils/default.nix +++ b/pkgs/os-specific/linux/keyutils/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.5.10"; src = fetchurl { - url = "http://people.redhat.com/dhowells/keyutils/${name}.tar.bz2"; + url = "https://people.redhat.com/dhowells/keyutils/${name}.tar.bz2"; sha256 = "1dmgjcf7mnwc6h72xkvpaqpzxw8vmlnsmzz0s27pg0giwzm3sp0i"; }; diff --git a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix b/pkgs/os-specific/linux/kmod-debian-aliases/default.nix index a7b6561239d0..07ab0427b226 100644 --- a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix +++ b/pkgs/os-specific/linux/kmod-debian-aliases/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "22-1.1"; src = fetchurl { - url = "http://snapshot.debian.org/archive/debian/20160404T220610Z/pool/main/k/kmod/kmod_${version}.debian.tar.xz"; + url = "https://snapshot.debian.org/archive/debian/20160404T220610Z/pool/main/k/kmod/kmod_${version}.debian.tar.xz"; sha256 = "0daap2n4bvjqcnksaayy6csmdb1px4r02w3xp36bcp6w3lbnqamh"; }; diff --git a/pkgs/os-specific/linux/kmscon/default.nix b/pkgs/os-specific/linux/kmscon/default.nix index d3d6cfd4c58b..0fff816eac7b 100644 --- a/pkgs/os-specific/linux/kmscon/default.nix +++ b/pkgs/os-specific/linux/kmscon/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { name = "kmscon-8"; src = fetchurl { - url = "http://www.freedesktop.org/software/kmscon/releases/${name}.tar.xz"; + url = "https://www.freedesktop.org/software/kmscon/releases/${name}.tar.xz"; sha256 = "0axfwrp3c8f4gb67ap2sqnkn75idpiw09s35wwn6kgagvhf1rc0a"; }; diff --git a/pkgs/os-specific/linux/libvolume_id/default.nix b/pkgs/os-specific/linux/libvolume_id/default.nix index c82c892c4627..14c152dc10e9 100644 --- a/pkgs/os-specific/linux/libvolume_id/default.nix +++ b/pkgs/os-specific/linux/libvolume_id/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libvolume_id-0.81.1"; src = fetchurl { - url = http://www.marcuscom.com/downloads/libvolume_id-0.81.1.tar.bz2; + url = https://www.marcuscom.com/downloads/libvolume_id-0.81.1.tar.bz2; sha256 = "029z04vdxxsl8gycm9whcljhv6dy4b12ybsxdb99jr251gl1ifs5"; }; diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/pkgs/os-specific/linux/lm-sensors/default.nix index 4f35d5465383..25b868369ae1 100644 --- a/pkgs/os-specific/linux/lm-sensors/default.nix +++ b/pkgs/os-specific/linux/lm-sensors/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${version}.tar.bz2" - "http://src.fedoraproject.org/repo/pkgs/lm_sensors/lm_sensors-${version}.tar.bz2/c03675ae9d43d60322110c679416901a/lm_sensors-${version}.tar.bz2" + "https://src.fedoraproject.org/repo/pkgs/lm_sensors/lm_sensors-${version}.tar.bz2/c03675ae9d43d60322110c679416901a/lm_sensors-${version}.tar.bz2" ]; sha256 = "07q6811l4pp0f7pxr8bk3s97ippb84mx5qdg7v92s9hs10b90mz0"; }; diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index 0e0178e8845b..a1b207ffea09 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { name = "${name}.tar.gz"; - url = "http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=e165b73a16fc9027aa3306df40052038c175be1b;sf=tgz"; + url = "https://git.opensvc.com/"; sha256 = "159hxvbk9kh1qay9x04w0gsqzg0hkl5yghfc1wi9kv2n5pcwbkpm"; }; diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index 3d515f7b762f..6bcd2ea692d3 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { version = "1.1.19"; src = fetchurl { - url = "http://www.musl-libc.org/releases/musl-${version}.tar.gz"; + url = "https://www.musl-libc.org/releases/musl-${version}.tar.gz"; sha256 = "1nf1wh44bhm8gdcfr75ayib29b99vpq62zmjymrq7f96h9bshnfv"; }; diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index 63d389fdb1f8..468bfd135e77 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -2,12 +2,12 @@ , flex, bison, libmnl, libnftnl, gmp, readline }: stdenv.mkDerivation rec { - version = "0.8.5"; + version = "0.9.0"; name = "nftables-${version}"; src = fetchurl { - url = "http://netfilter.org/projects/nftables/files/${name}.tar.bz2"; - sha256 = "08z3xaxdryi0i9gcfifs77c96xs8ljynkr2hbfgf3w67l60az6wf"; + url = "https://netfilter.org/projects/nftables/files/${name}.tar.bz2"; + sha256 = "14bygs6vg2v448cw5r4pxqi8an29hw0m9vab8hpmgjmrzjsq30dd"; }; configureFlags = [ diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index cd7733f43a48..15c3e10e1199 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -17,7 +17,6 @@ buildPhase() { # Create the module. echo "Building linux driver against kernel: $kernel"; cd kernel - kernelVersion=$(cd $kernel/lib/modules && ls) sysSrc=$(echo $kernel/lib/modules/$kernelVersion/source) sysOut=$(echo $kernel/lib/modules/$kernelVersion/build) unset src # used by the nv makefile diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 13e5d1b76ea6..0fe0f3d92c92 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -55,6 +55,7 @@ let outputDev = if libsOnly then null else "bin"; kernel = if libsOnly then null else kernel.dev; + kernelVersion = if libsOnly then null else kernel.modDirVersion; hardeningDisable = [ "pic" "format" ]; diff --git a/pkgs/os-specific/linux/otpw/default.nix b/pkgs/os-specific/linux/otpw/default.nix index 69c6dd1510cb..a0464e1996a5 100644 --- a/pkgs/os-specific/linux/otpw/default.nix +++ b/pkgs/os-specific/linux/otpw/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "otpw-1.3"; src = fetchurl { - url = "http://www.cl.cam.ac.uk/~mgk25/download/${name}.tar.gz"; + url = "https://www.cl.cam.ac.uk/~mgk25/download/${name}.tar.gz"; sha256 = "1k3hc7xbxz6hkc55kvddi3cibafwf93ivn58sy1l888d3l5dwmrk"; }; diff --git a/pkgs/os-specific/linux/pam_krb5/default.nix b/pkgs/os-specific/linux/pam_krb5/default.nix index 76dbbf1e1be4..dd3957d36185 100644 --- a/pkgs/os-specific/linux/pam_krb5/default.nix +++ b/pkgs/os-specific/linux/pam_krb5/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "pam-krb5-4.8"; src = fetchurl { - url = "http://archives.eyrie.org/software/kerberos/${name}.tar.gz"; + url = "https://archives.eyrie.org/software/kerberos/${name}.tar.gz"; sha256 = "0j96jfaxzkj1ifc3qxagjmaxvgda7ndqaaxx2ka018is9f5lbfrs"; }; diff --git a/pkgs/os-specific/linux/paxctl/default.nix b/pkgs/os-specific/linux/paxctl/default.nix index afb342768c33..270be695f03a 100644 --- a/pkgs/os-specific/linux/paxctl/default.nix +++ b/pkgs/os-specific/linux/paxctl/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.9"; src = fetchurl { - url = "http://pax.grsecurity.net/${name}.tar.gz"; + url = "https://pax.grsecurity.net/${name}.tar.gz"; sha256 = "0biw882fp1lmgs6kpxznp1v6758r7dg9x8iv5a06k0b82bcdsc53"; }; diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix index 4d70533fac7f..88592798a1f6 100644 --- a/pkgs/os-specific/linux/plymouth/default.nix +++ b/pkgs/os-specific/linux/plymouth/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "0.9.3"; src = fetchurl { - url = "http://www.freedesktop.org/software/plymouth/releases/${name}.tar.xz"; + url = "https://www.freedesktop.org/software/plymouth/releases/${name}.tar.xz"; sha256 = "0x2a9s5jdvfcrdnwbdhm5x4ck3zimmcpghnqvhl65byfj25d13cz"; }; diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix index 1053e07559e8..326ba444957e 100644 --- a/pkgs/os-specific/linux/pm-utils/default.nix +++ b/pkgs/os-specific/linux/pm-utils/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { name = "pm-utils-1.4.1"; src = fetchurl { - url = "http://pm-utils.freedesktop.org/releases/${name}.tar.gz"; + url = "https://pm-utils.freedesktop.org/releases/${name}.tar.gz"; sha256 = "02qc6zaf7ams6qcc470fwb6jvr4abv3lrlx16clqpn36501rkn4f"; }; diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix index db494ec2493f..f24d8d1f875c 100644 --- a/pkgs/os-specific/linux/s6-linux-utils/default.nix +++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix @@ -9,7 +9,7 @@ in stdenv.mkDerivation rec { name = "s6-linux-utils-${version}"; src = fetchurl { - url = "http://www.skarnet.org/software/s6-linux-utils/${name}.tar.gz"; + url = "https://www.skarnet.org/software/s6-linux-utils/${name}.tar.gz"; sha256 = "0245rmk7wfyyfsi4g7f0niprwlvqlwkbyjxflb8kkbvhwfdavqip"; }; diff --git a/pkgs/os-specific/linux/smem/default.nix b/pkgs/os-specific/linux/smem/default.nix index a61a54afc38e..a07eec431c33 100644 --- a/pkgs/os-specific/linux/smem/default.nix +++ b/pkgs/os-specific/linux/smem/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "smem-1.4"; src = fetchurl { - url = "http://www.selenic.com/smem/download/${name}.tar.gz"; + url = "https://www.selenic.com/smem/download/${name}.tar.gz"; sha256 = "1v31vy23s7szl6vdrllq9zbg58bp36jf5xy3fikjfg6gyiwgia9f"; }; diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 778f00d2a95d..af3df245fe67 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -25,7 +25,7 @@ let nativeBuildInputs = [ autoreconfHook ] ++ kernel.moduleBuildDependencies; - hardeningDisable = [ "pic" ]; + hardeningDisable = [ "fortify" "stackprotector" "pic" ]; preConfigure = '' substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix index aeb9deac89d2..199523db4281 100644 --- a/pkgs/os-specific/linux/udisks/1-default.nix +++ b/pkgs/os-specific/linux/udisks/1-default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "udisks-1.0.5"; src = fetchurl { - url = "http://hal.freedesktop.org/releases/${name}.tar.gz"; + url = "https://hal.freedesktop.org/releases/${name}.tar.gz"; sha256 = "0wbg3jrv8limdgvcygf4dqin3y6d30y9pcmmk711vq571vmq5v7j"; }; diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index 6bb12c2c792a..0c0aa84a6bd3 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -42,6 +42,12 @@ in stdenv.mkDerivation rec { gtk-doc libxslt docbook_xml_dtd_412 docbook_xml_dtd_43 docbook_xsl ]; + postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace udisks/udisksclient.c \ + --replace 'defined( __GNUC_PREREQ)' 1 \ + --replace '__GNUC_PREREQ(4,6)' 1 + ''; + buildInputs = [ expat libgudev libblockdev acl systemd glib libatasmart polkit ]; diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index 9bdb16cd1f16..fee9b0c09d56 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "1.14.2"; src = fetchurl { - url = "http://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2"; + url = "https://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2"; sha256 = "14h6d2p3n4jmxhd8i0p1m5dbwz5vnpb3z88xqd9ghg15n7265fg6"; }; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index c44d64b8fa81..6eac54ddf651 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -61,7 +61,7 @@ let # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work NIX_CFLAGS_LINK = "-lgcc_s"; - hardeningDisable = [ "pic" ]; + hardeningDisable = [ "fortify" "stackprotector" "pic" ]; preConfigure = '' substituteInPlace ./module/zfs/zfs_ctldir.c --replace "umount -t zfs" "${utillinux}/bin/umount -t zfs" @@ -157,7 +157,7 @@ in { # to be adapted zfsStable = common { # comment/uncomment if breaking kernel versions are known - incompatibleKernelVersion = "4.16"; + incompatibleKernelVersion = null; # this package should point to the latest release. version = "0.7.9"; @@ -176,7 +176,7 @@ in { zfsUnstable = common rec { # comment/uncomment if breaking kernel versions are known - incompatibleKernelVersion = "4.16"; + incompatibleKernelVersion = null; # this package should point to a version / git revision compatible with the latest kernel release version = "2018-05-22"; @@ -199,7 +199,7 @@ in { # also remove boot.zfs.enableLegacyCrypto zfsLegacyCrypto = common { # comment/uncomment if breaking kernel versions are known - incompatibleKernelVersion = "4.16"; + incompatibleKernelVersion = null; # this package should point to a version / git revision compatible with the latest kernel release version = "2018-02-01"; diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index 10ffa918e5bd..d9c7877978b2 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -26,7 +26,7 @@ let ''; src = fetchurl { - url = "http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/asterisk-${version}.tar.gz"; + url = "https://downloads.asterisk.org/pub/telephony/asterisk/old-releases/asterisk-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 7a03bf75802b..64e4005f53f3 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libtool, curl +{ stdenv, fetchFromGitHub, pkgconfig, libtool, curl , python, munge, perl, pam, openssl , ncurses, mysql, gtk2, lua, hwloc, numactl , readline, freeipmi, libssh2, xorg @@ -8,11 +8,16 @@ stdenv.mkDerivation rec { name = "slurm-${version}"; - version = "17.11.5"; + version = "17.11.7"; - src = fetchurl { - url = "https://download.schedmd.com/slurm/${name}.tar.bz2"; - sha256 = "07ghyyz12k4rksm06xf7dshwp1ndm13zphdbqja99401q4xwbx9r"; + # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php + # because the latter does not keep older releases. + src = fetchFromGitHub { + owner = "SchedMD"; + repo = "slurm"; + # The release tags use - instead of ., and have an extra -1 suffix. + rev = "${builtins.replaceStrings ["."] ["-"] name}-1"; + sha256 = "00dgirjd75i1x6pj80avp18hx5gr3dsnh13vbkqbf0iwpd72qyhp"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index b0fb29677f9a..ff99f7a7cbf6 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { - url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; + url = "https://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; sha256 = "0a9dvyg1dk7vpqn9gz7p5jas3bz7z22bjd66b98g1qk16i2w7rqd"; }; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 5fe7a8608c59..d607389b78f2 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "2.6.7"; src = fetchurl { - url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; + url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; sha256 = "1c2a004b05c161f7b36d5eeccebd9d4cdf60aa09930a7cc766514e468ca92243"; }; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 1a5577e81655..e2db0b860f4c 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -15,7 +15,7 @@ unwrapped = stdenv.mkDerivation rec { version = "2.3.0"; src = fetchurl { - url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; + url = "https://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; sha256 = "2d19c5daf8440bd3d2acd1886b9ede65f04f7753c6fd4618a92a1a4ba3b27a9b"; }; diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index 63e4f3baa8f4..2c82b0bf33a8 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { name = "nsd-4.1.22"; src = fetchurl { - url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz"; + url = "https://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz"; sha256 = "1704masmx77qcj7b7shzrmgp9hpf9vpd265cnvn3b2kn0mkyi1pi"; }; diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index c34edfb5d6f8..6f8bffee24d0 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "4.1.3"; src = fetchurl { - url = "http://downloads.powerdns.com/releases/pdns-${version}.tar.bz2"; + url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2"; sha256 = "1bh1qdgw415ax542123b6isri1jh4mbf2i9i1yffkfk0xmyv79cs"; }; diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index b01e94187898..911f3b23f0c1 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { name = "gpsd-3.16"; src = fetchurl { - url = "http://download-mirror.savannah.gnu.org/releases/gpsd/${name}.tar.gz"; + url = "https://download-mirror.savannah.gnu.org/releases/gpsd/${name}.tar.gz"; sha256 = "0a90ph4qrlz5kkcz2mwkfk3cmwy9fmglp94znz2y0gsd7bqrlmq3"; }; diff --git a/pkgs/servers/h2/default.nix b/pkgs/servers/h2/default.nix index a5dbf74947e2..fc9d4c0508ed 100644 --- a/pkgs/servers/h2/default.nix +++ b/pkgs/servers/h2/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.4.193"; src = fetchzip { - url = "http://www.h2database.com/h2-2016-10-31.zip"; + url = "https://www.h2database.com/h2-2016-10-31.zip"; sha256 = "1da1qcfwi5gvh68i6w6y0qpcqp3rbgakizagkajmjxk2ryc4b3z9"; }; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 7bf7d6237488..d0fdf7655e3c 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.72.0"; + version = "0.72.1"; components = { "abode" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; @@ -794,7 +794,7 @@ "sensor.cups" = ps: with ps; [ pycups ]; "sensor.currencylayer" = ps: with ps; [ ]; "sensor.daikin" = ps: with ps; [ ]; - "sensor.darksky" = ps: with ps; [ ]; + "sensor.darksky" = ps: with ps; [ python-forecastio ]; "sensor.deconz" = ps: with ps; [ ]; "sensor.deluge" = ps: with ps; [ deluge-client ]; "sensor.demo" = ps: with ps; [ ]; @@ -1183,7 +1183,7 @@ "weather" = ps: with ps; [ ]; "weather.bom" = ps: with ps; [ ]; "weather.buienradar" = ps: with ps; [ ]; - "weather.darksky" = ps: with ps; [ ]; + "weather.darksky" = ps: with ps; [ python-forecastio ]; "weather.demo" = ps: with ps; [ ]; "weather.ecobee" = ps: with ps; [ ]; "weather.ipma" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index d1315611157a..eaab9a59dbf6 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -6,7 +6,15 @@ let py = python3.override { + # Override the version of some packages pinned in Home Assistant's setup.py packageOverrides = self: super: { + aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec { + version = "3.3.2"; + src = oldAttrs.src.override { + inherit version; + sha256 = "f20deec7a3fbaec7b5eb7ad99878427ad2ee4cc16a46732b705e8121cbb3cc12"; + }; + }); requests = super.requests.overridePythonAttrs (oldAttrs: rec { version = "2.18.4"; src = oldAttrs.src.override { @@ -14,6 +22,7 @@ let sha256 = "0zi3v9nsmv9j27d0c0m1dvqyvaxz53g8m0aa1h3qanxs4irkwi4w"; }; }); + # Required by requests==2.18.4 urllib3 = super.urllib3.overridePythonAttrs (oldAttrs: rec { version = "1.22"; src = oldAttrs.src.override { @@ -21,6 +30,7 @@ let sha256 = "0kyvc9zdlxr5r96bng5rhm9a6sfqidrbvvkz64s76qs5267dli6c"; }; }); + # Required by requests==2.18.4 idna = super.idna.overridePythonAttrs (oldAttrs: rec { version = "2.6"; src = oldAttrs.src.override { @@ -74,7 +84,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.72.0"; + hassVersion = "0.72.1"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -89,7 +99,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "1jz16ikxdh8bkscjs5pczvjqbfllz8avs11gkw8a97c2lds8la76"; + sha256 = "05r55hdai0qwgpj2f2qqngks7qmz4lqcfbh2c1symfyigv7m634r"; }; propagatedBuildInputs = [ @@ -108,7 +118,7 @@ in with py.pkgs; buildPythonApplication rec { py.test --ignore tests/components # Some basic components should be tested however py.test \ - tests/components/{group,http} \ + tests/components/{group,http,frontend} \ tests/components/test_{api,configurator,demo,discovery,init,introduction,logger,script,shell_command,system_log,websocket_api}.py ''; diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix index 5768e7badea0..58ae8f85b81f 100644 --- a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix +++ b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "tomcat-connectors-1.2.41-dev-1613051"; src = fetchurl { - url = "http://people.apache.org/~rjung/mod_jk-dev/${name}-src.tar.gz"; + url = "https://people.apache.org/~rjung/mod_jk-dev/${name}-src.tar.gz"; sha256 = "11khipjpy3y84j1pp7yyx76y64jccvyhh3klwzqxylff49vjc2fc"; }; diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix index 39722c6d831f..e10799e27f8a 100644 --- a/pkgs/servers/http/hiawatha/default.nix +++ b/pkgs/servers/http/hiawatha/default.nix @@ -3,16 +3,16 @@ , cmake , ninja +, mbedtls -, libxslt -, libxml2 - -, enableSSL ? true -, enableMonitor ? false -, enableRproxy ? true -, enableTomahawk ? false -, enableXSLT ? true -, enableToolkit ? true +, enableCache ? true # Internal cache support. +, enableIpV6 ? true +, enableTls ? true +, enableMonitor ? false # Support for the Hiawatha Monitor. +, enableRproxy ? true # Reverse proxy support. +, enableTomahawk ? false # Tomahawk, the Hiawatha command shell. +, enableXslt ? true, libxml2 ? null, libxslt ? null +, enableToolkit ? true # The URL Toolkit. }: stdenv.mkDerivation rec { @@ -27,28 +27,29 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ninja ]; - buildInputs = [ libxslt libxml2 ]; + buildInputs = [ mbedtls ] ++ stdenv.lib.optionals enableXslt [ libxslt libxml2 ]; prePatch = '' substituteInPlace CMakeLists.txt --replace SETUID "" ''; cmakeFlags = [ - ( - # FIXME: 2018-06-08: Uses bundled library, with external ("-DUSE_SYSTEM_MBEDTLS=on") asks: - # ../src/tls.c:46:2: error: #error "The mbed TLS library must be compiled with MBEDTLS_THREADING_PTHREAD and MBEDTLS_THREADING_C enabled." - if enableSSL then "-DENABLE_TLS=on" else "-DENABLE_TLS=off" ) - ( if enableMonitor then "-DENABLE_MONITOR=on" else "-DENABLE_MONITOR=off" ) - ( if enableRproxy then "-DENABLE_RPROXY=on" else "-DENABLE_RPROXY=off" ) - ( if enableTomahawk then "-DENABLE_TOMAHAWK=on" else "-DENABLE_TOMAHAWK=off" ) - ( if enableXSLT then "-DENABLE_XSLT=on" else "-DENABLE_XSLT=off" ) - ( if enableToolkit then "-DENABLE_TOOLKIT=on" else "-DENABLE_TOOLKIT=off" ) + "-DUSE_SYSTEM_MBEDTLS=on" # Policy to use Nix deps, and Nix uses up to date deps + ( if enableCache then "-DENABLE_CACHE=on" else "-DENABLE_CACHE=off" ) + ( if enableIpV6 then "-DENABLE_IPV6=on" else "-DENABLE_IPV6=off" ) + ( if enableTls then "-DENABLE_TLS=on" else "-DENABLE_TLS=off" ) + ( if enableMonitor then "-DENABLE_MONITOR=on" else "-DENABLE_MONITOR=off" ) + ( if enableRproxy then "-DENABLE_RPROXY=on" else "-DENABLE_RPROXY=off" ) + ( if enableTomahawk then "-DENABLE_TOMAHAWK=on" else "-DENABLE_TOMAHAWK=off" ) + ( if enableXslt then "-DENABLE_XSLT=on" else "-DENABLE_XSLT=off" ) + ( if enableToolkit then "-DENABLE_TOOLKIT=on" else "-DENABLE_TOOLKIT=off" ) ]; meta = with stdenv.lib; { + homepage = https://www.hiawatha-webserver.org; description = "An advanced and secure webserver"; license = licenses.gpl2; - homepage = https://www.hiawatha-webserver.org; + platforms = platforms.unix; # "Hiawatha runs perfectly on Linux, BSD and MacOS X" maintainers = [ maintainers.ndowens ]; }; diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix index 068053d71f09..c5702132d280 100644 --- a/pkgs/servers/http/jboss/default.nix +++ b/pkgs/servers/http/jboss/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "jboss-as-7.1.1.Final"; src = fetchurl { - url = http://download.jboss.org/jbossas/7.1/jboss-as-7.1.1.Final/jboss-as-7.1.1.Final.tar.gz; + url = https://download.jboss.org/jbossas/7.1/jboss-as-7.1.1.Final/jboss-as-7.1.1.Final.tar.gz; sha256 = "1bdjw0ib9qr498vpfbg8klqw6rl11vbz7vwn6gp1r5gpqkd3zzc8"; }; diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index 1e99aab24c60..473f2986ff06 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "jetty-${version}"; version = "9.4.8.v20171121"; src = fetchurl { - url = "http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz"; + url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz"; name = "jetty-distribution-${version}.tar.gz"; sha256 = "0bvwi70vdk468yqgvgq99lwrpy2y5znrl0b1cr8j6ygmsgnvvmjh"; }; diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 31b3449d5f64..4596dac09086 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { name = "lighttpd-1.4.49"; src = fetchurl { - url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz"; + url = "https://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz"; sha256 = "02ff77cpvy1006cwfym38vf78xm18plyj636ll74r7kx2bblkpxf"; }; diff --git a/pkgs/servers/http/micro-httpd/default.nix b/pkgs/servers/http/micro-httpd/default.nix index 02cf49854ac8..b636f79e6c60 100644 --- a/pkgs/servers/http/micro-httpd/default.nix +++ b/pkgs/servers/http/micro-httpd/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "micro-httpd-20140814"; src = fetchurl { - url = "http://acme.com/software/micro_httpd/micro_httpd_14Aug2014.tar.gz"; + url = "https://acme.com/software/micro_httpd/micro_httpd_14Aug2014.tar.gz"; sha256 = "0mlm24bi31s0s8w55i0sysv2nc1n2x4cfp6dm47slz49h2fz24rk"; }; diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/servers/http/mini-httpd/default.nix index 99b13dab84d0..37a0a98d4e01 100644 --- a/pkgs/servers/http/mini-httpd/default.nix +++ b/pkgs/servers/http/mini-httpd/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "mini-httpd-1.7"; src = fetchurl { - url = "http://download-mirror.savannah.gnu.org/releases/mini-httpd/${name}.tar.gz"; + url = "https://download-mirror.savannah.gnu.org/releases/mini-httpd/${name}.tar.gz"; sha256 = "0jggmlaywjfbdljzv5hyiz49plnxh0har2bnc9dq4xmj1pmjgs49"; }; diff --git a/pkgs/servers/http/myserver/default.nix b/pkgs/servers/http/myserver/default.nix index fa3b57a0b22e..a18ac202a4a2 100644 --- a/pkgs/servers/http/myserver/default.nix +++ b/pkgs/servers/http/myserver/default.nix @@ -1,5 +1,5 @@ { lib, fetchurl, stdenv, libgcrypt, libevent, libidn, gnutls -, libxml2, zlib, guile, texinfo, cppunit, psmisc }: +, libxml2, zlib, guile, texinfo, cppunit, killall }: let version = "0.11"; in @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { # On GNU/Linux the `test_suite' process sometimes stays around, so # forcefully terminate it. - postCheck = lib.optionalString stdenv.isLinux "${psmisc}/bin/killall test_suite || true"; + postCheck = "${killall}/bin/killall test_suite || true"; meta = { description = "GNU MyServer, a powerful and easy to configure web server"; diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index ff0a4c65b4a6..1466e7b2246a 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { name = "nginx-${version}"; src = fetchurl { - url = "http://nginx.org/download/nginx-${version}.tar.gz"; + url = "https://nginx.org/download/nginx-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 252e1a97dfdb..1155bac75703 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "1.13.6.2"; src = fetchurl { - url = "http://openresty.org/download/openresty-${version}.tar.gz"; + url = "https://openresty.org/download/openresty-${version}.tar.gz"; sha256 = "0hi9zw4344a4i636g3nbnnlm8qbnq37f50irhd1xncih4xc1jvll"; }; diff --git a/pkgs/servers/http/redstore/default.nix b/pkgs/servers/http/redstore/default.nix index b2c80b3f88fc..7d592d0256b7 100644 --- a/pkgs/servers/http/redstore/default.nix +++ b/pkgs/servers/http/redstore/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "redstore-0.5.4"; src = fetchurl { - url = "http://www.aelius.com/njh/redstore/${name}.tar.gz"; + url = "https://www.aelius.com/njh/redstore/${name}.tar.gz"; sha256 = "0hc1fjfbfvggl72zqx27v4wy84f5m7bp4dnwd8g41aw8lgynbgaq"; }; diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix index 8256bd9c734b..6e012c98737e 100644 --- a/pkgs/servers/http/thttpd/default.nix +++ b/pkgs/servers/http/thttpd/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.29"; src = fetchurl { - url = "http://acme.com/software/thttpd/${name}.tar.gz"; + url = "https://acme.com/software/thttpd/${name}.tar.gz"; sha256 = "15x3h4b49wgfywn82i3wwbf38mdns94mbi4ma9xiwsrjv93rzh4r"; }; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 2190ae1afa26..f2ed31072eea 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jackett-${version}"; - version = "0.8.1070"; + version = "0.8.1138"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "1xdmf1nvs1y8jhivmc0sw8cip925xrj8hg66z0awcymri6qnp6s9"; + sha256 = "0f6n6n2cxbw1gj905kilifsxid4nskk849hzafl6lqxk5nz4fs18"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/kippo/default.nix b/pkgs/servers/kippo/default.nix index 554401438705..a9f5ba6f7b2c 100644 --- a/pkgs/servers/kippo/default.nix +++ b/pkgs/servers/kippo/default.nix @@ -49,7 +49,7 @@ let postInstall = "$out/bin/twistd --help > /dev/null"; meta = with stdenv.lib; { - homepage = http://twistedmatrix.com/; + homepage = https://twistedmatrix.com/; description = "Twisted, an event-driven networking engine written in Python"; longDescription = '' Twisted is an event-driven networking engine written in Python diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index c9065d041618..55070a48b7d0 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ++ lib.optional withSQLite sqlite; src = fetchurl { - url = "http://dovecot.org/releases/2.3/${name}.tar.gz"; + url = "https://dovecot.org/releases/2.3/${name}.tar.gz"; sha256 = "14zva4f8k64x86sm9n21cp2yvrpph6k6k52bm22a00pxjwdq50q8"; }; diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index e98c58c891a1..a393df3d8bda 100644 --- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.5.1"; src = fetchurl { - url = "http://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${version}.tar.gz"; + url = "https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${version}.tar.gz"; sha256 = "0ivmaxic6cygfphvlrvy0xgggydm7j7kjv1ssfqbr08q4rcsmc73"; }; diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index 393ce2c5cda9..87d9e5042990 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "exim-4.91"; src = fetchurl { - url = "http://ftp.exim.org/pub/exim/exim4/${name}.tar.xz"; + url = "https://ftp.exim.org/pub/exim/exim4/${name}.tar.xz"; sha256 = "066ip7a5lqfn9rcr14j4nm0kqysw6mzvbbb0ip50lmfm0fqsqmzc"; }; diff --git a/pkgs/servers/mail/nullmailer/default.nix b/pkgs/servers/mail/nullmailer/default.nix index f17f3ed2de7e..ab632372b464 100644 --- a/pkgs/servers/mail/nullmailer/default.nix +++ b/pkgs/servers/mail/nullmailer/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "nullmailer-${version}"; src = fetchurl { - url = "http://untroubled.org/nullmailer/nullmailer-${version}.tar.gz"; + url = "https://untroubled.org/nullmailer/nullmailer-${version}.tar.gz"; sha256 = "0gykh0qc86rk0knfvp8ndqkryal3pvqdfdya94wvb6n1cc8p3ild"; }; diff --git a/pkgs/servers/mail/postfix/pflogsumm.nix b/pkgs/servers/mail/postfix/pflogsumm.nix index a9ec36f59ca9..3d48e9527819 100644 --- a/pkgs/servers/mail/postfix/pflogsumm.nix +++ b/pkgs/servers/mail/postfix/pflogsumm.nix @@ -6,7 +6,7 @@ buildPerlPackage rec { version = "1.1.3"; src = fetchurl { - url = "http://jimsun.linxnet.com/downloads/${name}.tar.gz"; + url = "https://jimsun.linxnet.com/downloads/${name}.tar.gz"; sha256 = "0hkim9s5f1yg5sfs5048jydhy3sbxafls496wcjk0cggxb113py4"; }; diff --git a/pkgs/servers/mail/postgrey/default.nix b/pkgs/servers/mail/postgrey/default.nix index 1836d0e5cf36..3e7163cb1541 100644 --- a/pkgs/servers/mail/postgrey/default.nix +++ b/pkgs/servers/mail/postgrey/default.nix @@ -12,7 +12,7 @@ let name = "postgrey-${version}"; in runCommand name { src = fetchurl { - url = "http://postgrey.schweikert.ch/pub/${name}.tar.gz"; + url = "https://postgrey.schweikert.ch/pub/${name}.tar.gz"; sha256 = "1xx51xih4711vrvc6d57il9ccallbljj5zhgqdb07jzmz11rakgz"; }; meta = with stdenv.lib; { diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 8a4159a55213..44e1c65c7514 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "memcached-${version}"; src = fetchurl { - url = "http://memcached.org/files/${name}.tar.gz"; + url = "https://memcached.org/files/${name}.tar.gz"; sha256 = "1ppnhsqv9047vm0rrmqla56y972f8qqjdb780iz6v922jjcc723k"; }; diff --git a/pkgs/servers/misc/taskserver/default.nix b/pkgs/servers/misc/taskserver/default.nix index 466c3873c600..63925d30c644 100644 --- a/pkgs/servers/misc/taskserver/default.nix +++ b/pkgs/servers/misc/taskserver/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "Server for synchronising Taskwarrior clients"; - homepage = http://taskwarrior.org; + homepage = https://taskwarrior.org; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ makefu ]; diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/servers/monitoring/consul-alerts/default.nix index ad840dfd607f..646a7856788b 100644 --- a/pkgs/servers/monitoring/consul-alerts/default.nix +++ b/pkgs/servers/monitoring/consul-alerts/default.nix @@ -2,15 +2,26 @@ buildGoPackage rec { name = "consul-alerts-${version}"; - version = "0.3.3"; + version = "0.5.0"; rev = "v${version}"; goPackagePath = "github.com/AcalephStorage/consul-alerts"; + goDeps = ./deps.nix; + src = fetchFromGitHub { inherit rev; owner = "AcalephStorage"; repo = "consul-alerts"; - sha256 = "1w0mb20w1yazyh84sa30bsw271c5nm7lsx2qg0g3gf6mxdb63lpq"; + sha256 = "0dff2cpk3lkgjsh97rvlrpacpka0kwm29691diyvj7lb9ydzlx3r"; + }; + + meta = with stdenv.lib; { + description = "An extendable open source continuous integration server"; + homepage = https://github.com/AcalephStorage/consul-alerts; + # As per README + platforms = platforms.linux ++ platforms.freebsd ++ platforms.darwin; + license = licenses.gpl2; + maintainers = with maintainers; [ nh2 ]; }; } diff --git a/pkgs/servers/monitoring/consul-alerts/deps.nix b/pkgs/servers/monitoring/consul-alerts/deps.nix new file mode 100644 index 000000000000..6494dc61a87c --- /dev/null +++ b/pkgs/servers/monitoring/consul-alerts/deps.nix @@ -0,0 +1,34 @@ +let + mkAwsPackage = name: { + goPackagePath = "github.com/aws/aws-sdk-go/${name}"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "v1.14.13"; + sha256 = "0014b6kl3rbjhjbk7jz116wdgdls54b1bwz454pkn1snlvkj3qil"; + }; + }; +in +[ + (mkAwsPackage "") + (mkAwsPackage "aws/session") + (mkAwsPackage "aws/sns") + (mkAwsPackage "service/sns") + { + goPackagePath = "github.com/imdario/mergo"; + fetch = { + type = "git"; + url = "https://github.com/imdario/mergo"; + rev = "v0.3.5"; + sha256 = "1mvgn89vp39gcpvhiq4n7nw5ipj7fk6h03jgc6fjwgvwvss213pb"; + }; + }{ + goPackagePath = "github.com/mitchellh/hashstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/hashstructure"; + rev = "2bca23e0e452137f789efbc8610126fd8b94f73b"; # has no releases as of writing + sha256 = "0vpacsls26474wya360fjhzi6l4y8s8s251c4szvqxh17n5f5gk1"; + }; + } +] diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 5e3d118b2f3d..217ac3f6d914 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "5.1.4"; + version = "5.2.1"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -9,15 +9,21 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "09bpijjm7cm4p5ci04ihq55fy5zwpdcld791vdpk6m91ixpab2zc"; + sha256 = "0gv7g6ddcmdkjd1xp9dg2kq7askzaw1vkmcii21glqb74k2jfg74"; }; srcStatic = fetchurl { - url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz"; - sha256 = "0ygfq4my3bdqs942l31w0695a6rwyrwq7jr23g0vgaqadamgbgkg"; + url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz"; + sha256 = "0j69a9cjvkknq19aa2l634b48zy1lwmv2p676hzc856zgq3h6m9m"; }; + postPatch = '' + substituteInPlace pkg/cmd/grafana-server/main.go \ + --replace 'var version = "5.0.0"' 'var version = "${version}"' + ''; + preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; + postInstall = '' tar -xvf $srcStatic mkdir -p $bin/share/grafana diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index 47bc6d58da90..6191d667bbe9 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nagios-${version}"; - version = "4.3.4"; + version = "4.4.0"; src = fetchurl { url = "mirror://sourceforge/nagios/nagios-4.x/${name}/${name}.tar.gz"; - sha256 = "1wa4m952sb23dqi5w759adimsp21bkhp598rpq9dnhz3v497h2y9"; + sha256 = "1ldpyk7jxarp52m5vhmrgrgic251ypfzb91hilc0gbmcq9b0l5k6"; }; patches = [ ./nagios.patch ]; diff --git a/pkgs/servers/monitoring/newrelic-sysmond/default.nix b/pkgs/servers/monitoring/newrelic-sysmond/default.nix index e9a9fcff2b93..dc6faf151b77 100644 --- a/pkgs/servers/monitoring/newrelic-sysmond/default.nix +++ b/pkgs/servers/monitoring/newrelic-sysmond/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.3.0.132"; src = fetchurl { - url = "http://download.newrelic.com/server_monitor/archive/${version}/newrelic-sysmond-${version}-linux.tar.gz"; + url = "https://download.newrelic.com/server_monitor/archive/${version}/newrelic-sysmond-${version}-linux.tar.gz"; sha256 = "0cdvffdsadfahfn1779zjfawz6l77awab3g9mw43vsba1568jh4f"; }; diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix index da2d1388c469..d3816cf1ecdb 100644 --- a/pkgs/servers/monitoring/zabbix/2.0.nix +++ b/pkgs/servers/monitoring/zabbix/2.0.nix @@ -65,7 +65,7 @@ in meta = { inherit branch; description = "An enterprise-class open source distributed monitoring solution"; - homepage = http://www.zabbix.com/; + homepage = https://www.zabbix.com/; license = "GPL"; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; @@ -82,7 +82,7 @@ in meta = with stdenv.lib; { inherit branch; description = "An enterprise-class open source distributed monitoring solution (client-side agent)"; - homepage = http://www.zabbix.com/; + homepage = https://www.zabbix.com/; license = licenses.gpl2; maintainers = [ maintainers.eelco ]; platforms = platforms.linux; diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/pkgs/servers/monitoring/zabbix/2.2.nix index 1cc604f6491b..bc5556d4bc00 100644 --- a/pkgs/servers/monitoring/zabbix/2.2.nix +++ b/pkgs/servers/monitoring/zabbix/2.2.nix @@ -77,7 +77,7 @@ in meta = { inherit branch; description = "An enterprise-class open source distributed monitoring solution"; - homepage = http://www.zabbix.com/; + homepage = https://www.zabbix.com/; license = "GPL"; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; @@ -94,7 +94,7 @@ in meta = with stdenv.lib; { inherit branch; description = "An enterprise-class open source distributed monitoring solution (client-side agent)"; - homepage = http://www.zabbix.com/; + homepage = https://www.zabbix.com/; license = licenses.gpl2; maintainers = [ maintainers.eelco ]; platforms = platforms.linux; diff --git a/pkgs/servers/monitoring/zabbix/3.4.nix b/pkgs/servers/monitoring/zabbix/3.4.nix index 332e139f4283..69b3577720f5 100644 --- a/pkgs/servers/monitoring/zabbix/3.4.nix +++ b/pkgs/servers/monitoring/zabbix/3.4.nix @@ -29,7 +29,7 @@ in meta = with stdenv.lib; { inherit branch; description = "An enterprise-class open source distributed monitoring solution (client-side agent)"; - homepage = http://www.zabbix.com/; + homepage = https://www.zabbix.com/; license = licenses.gpl2; maintainers = [ maintainers.eelco ]; platforms = platforms.linux; diff --git a/pkgs/servers/monitoring/zipkin/default.nix b/pkgs/servers/monitoring/zipkin/default.nix index 2925a8f2dc53..4c3479d8662e 100644 --- a/pkgs/servers/monitoring/zipkin/default.nix +++ b/pkgs/servers/monitoring/zipkin/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { description = "Zipkin distributed tracing system"; - homepage = "http://zipkin.io/"; + homepage = https://zipkin.io/; license = licenses.asl20; platforms = platforms.unix; maintainers = [ maintainers.hectorj ]; diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index c330837cdbbe..347af1c4de9f 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -3,14 +3,14 @@ let in stdenv.mkDerivation rec { - version = "3.3.10"; + version = "3.3.11"; name = "arangodb-${version}"; src = fetchFromGitHub { repo = "arangodb"; owner = "arangodb"; rev = "v${version}"; - sha256 = "0c0n681k2z73klb5inhfdy2qzkba681kzg01gwpc6qdnvya8mk9f"; + sha256 = "0x1sq2gvag7adba5nsx913dax2b2259h73623r0b7gn4v01ivq21"; }; buildInputs = [ diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 4980a6fb2bfd..bf1ccbd06d56 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://redis.io; + homepage = https://redis.io; description = "An open source, advanced key-value store"; license = stdenv.lib.licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/servers/nosql/riak-cs/2.1.1.nix b/pkgs/servers/nosql/riak-cs/2.1.1.nix index 4d0bb6c687db..9075756c1621 100644 --- a/pkgs/servers/nosql/riak-cs/2.1.1.nix +++ b/pkgs/servers/nosql/riak-cs/2.1.1.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.isLinux [ pam ]; src = fetchurl { - url = "http://s3.amazonaws.com/downloads.basho.com/riak-cs/2.1/2.1.1/riak-cs-2.1.1.tar.gz"; + url = "https://s3.amazonaws.com/downloads.basho.com/riak-cs/2.1/2.1.1/riak-cs-2.1.1.tar.gz"; sha256 = "115cac127aac6d759c1b429a52e0d18e491c0719a6530b1b88aa52c4efdbedd5"; }; diff --git a/pkgs/servers/nosql/riak-cs/stanchion.nix b/pkgs/servers/nosql/riak-cs/stanchion.nix index 8ea71d611ebb..a064049072c9 100644 --- a/pkgs/servers/nosql/riak-cs/stanchion.nix +++ b/pkgs/servers/nosql/riak-cs/stanchion.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.isLinux [ pam ]; src = fetchurl { - url = "http://s3.amazonaws.com/downloads.basho.com/stanchion/2.1/2.1.1/stanchion-2.1.1.tar.gz"; + url = "https://s3.amazonaws.com/downloads.basho.com/stanchion/2.1/2.1.1/stanchion-2.1.1.tar.gz"; sha256 = "1443arwgg7qvlx3msyg99qvvhck7qxphdjslcp494i60fhr2g8ja"; }; diff --git a/pkgs/servers/nosql/riak/2.2.0.nix b/pkgs/servers/nosql/riak/2.2.0.nix index 9998d34a2dae..e4c9b90ab145 100644 --- a/pkgs/servers/nosql/riak/2.2.0.nix +++ b/pkgs/servers/nosql/riak/2.2.0.nix @@ -7,7 +7,7 @@ let srcs = { riak = fetchurl { - url = "http://s3.amazonaws.com/downloads.basho.com/riak/2.2/2.2.0/riak-2.2.0.tar.gz"; + url = "https://s3.amazonaws.com/downloads.basho.com/riak/2.2/2.2.0/riak-2.2.0.tar.gz"; sha256 = "0kl28bpyzajcllybili46jfr1schl45w5ysii187jr0ssgls2c9p"; }; solr = fetchurl { diff --git a/pkgs/servers/samba/3.x.nix b/pkgs/servers/samba/3.x.nix index 91b1c8f95c1c..4d9fc46dcf7f 100644 --- a/pkgs/servers/samba/3.x.nix +++ b/pkgs/servers/samba/3.x.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { + stdenv.lib.optionalString (configDir == "") "touch $out/lib/smb.conf"; meta = { - homepage = http://www.samba.org/; + homepage = https://www.samba.org/; description = "The standard Windows interoperability suite of programs for Linux and Unix"; platforms = stdenv.lib.platforms.linux; knownVulnerabilities = [ diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index ee14ec6443bf..0ff7f88911f2 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.samba.org/; + homepage = https://www.samba.org/; description = "The standard Windows interoperability suite of programs for Linux and Unix"; license = licenses.gpl3; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index a4b2418f58c9..d8c8682d504e 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "8.0.2"; src = fetchurl { - url = "http://packages.groonga.org/source/groonga/${name}.tar.gz"; + url = "https://packages.groonga.org/source/groonga/${name}.tar.gz"; sha256 = "0bsf4dbgbddij49xg6d6kl9kb1m5ywdyc1w1xz2giisqk1hdwsz4"; }; diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index a952dbada66f..0e31cd8fe08e 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "freeswitch-1.6.20"; src = fetchurl { - url = "http://files.freeswitch.org/freeswitch-releases/${name}.tar.bz2"; + url = "https://files.freeswitch.org/freeswitch-releases/${name}.tar.bz2"; sha256 = "0hqz68abs5x5vzf1mndcvdi35nrhmnklzdrnrk8dyvzvz67hp2ah"; }; postPatch = '' diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index e7114b957dcb..552f0fb4537c 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.0.0.5163"; src = fetchurl { - url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; + url = "https://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; sha256 = "037rs0cb7dfiblfy02x2l4amv9dmx1wiz5pa97vpczfgk5gq99y3"; }; diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/pgroonga/default.nix index 6dcd19d8d680..a27f0ef0824c 100644 --- a/pkgs/servers/sql/postgresql/pgroonga/default.nix +++ b/pkgs/servers/sql/postgresql/pgroonga/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.0.6"; src = fetchurl { - url = "http://packages.groonga.org/source/pgroonga/${name}.tar.gz"; + url = "https://packages.groonga.org/source/pgroonga/${name}.tar.gz"; sha256 = "1hfmz3d0xwhsa4vw8i08s15i7pfd0h0smi2rv663x3cjjjn40i68"; }; diff --git a/pkgs/servers/sql/postgresql/pgtap/default.nix b/pkgs/servers/sql/postgresql/pgtap/default.nix index 1206e50926ed..c6eb4013c5ce 100644 --- a/pkgs/servers/sql/postgresql/pgtap/default.nix +++ b/pkgs/servers/sql/postgresql/pgtap/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { It can also be used in the xUnit testing style. ''; maintainers = with maintainers; [ willibutz ]; - homepage = http://pgtap.org; + homepage = https://pgtap.org; inherit (postgresql.meta) platforms; }; } diff --git a/pkgs/servers/sql/postgresql/psqlodbc/default.nix b/pkgs/servers/sql/postgresql/psqlodbc/default.nix index 111b1be80f81..684817d309ba 100644 --- a/pkgs/servers/sql/postgresql/psqlodbc/default.nix +++ b/pkgs/servers/sql/postgresql/psqlodbc/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "psqlodbc-09.01.0200"; src = fetchurl { - url = "http://ftp.postgresql.org/pub/odbc/versions/src/${name}.tar.gz"; + url = "https://ftp.postgresql.org/pub/odbc/versions/src/${name}.tar.gz"; sha256 = "0b4w1ahfpp34jpscfk2kv9050lh3xl9pvcysqvaigkcd0vsk1hl9"; }; diff --git a/pkgs/servers/sslh/default.nix b/pkgs/servers/sslh/default.nix index bbb9b6ca5191..eb513d3aca62 100644 --- a/pkgs/servers/sslh/default.nix +++ b/pkgs/servers/sslh/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.19c"; src = fetchurl { - url = "http://www.rutschle.net/tech/sslh/sslh-v${version}.tar.gz"; + url = "https://www.rutschle.net/tech/sslh/sslh-v${version}.tar.gz"; sha256 = "1wvvqj9r293skgqi28q4ixz7zwf301h1bf514p41xbi7ifldy4dv"; }; diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index a3c505646214..2db004d9000f 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "trezord-go-${version}"; - version = "2.0.12"; + version = "2.0.14"; # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 ) hardeningDisable = [ "fortify" ]; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "trezor"; repo = "trezord-go"; rev = "v${version}"; - sha256 = "03pz223jjfbd0g9gkk21q6d27jc8vd1bc1jz00i0f3dzvsyfx5g6"; + sha256 = "1bnzib1cbs7cj6vdf015vr60vm5wgfgbqajcpqxcikfckwhjsykv"; }; meta = with stdenv.lib; { diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix index 6f584bfabd3d..b3714c7a0c28 100644 --- a/pkgs/servers/tt-rss/default.nix +++ b/pkgs/servers/tt-rss/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Web-based news feed (RSS/Atom) aggregator"; license = licenses.gpl2Plus; - homepage = http://tt-rss.org; + homepage = https://tt-rss.org; maintainers = with maintainers; [ globin zohl ]; platforms = platforms.all; }; diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix index 0ccf4c5bd0be..87d0a0ee4553 100644 --- a/pkgs/servers/uhub/default.nix +++ b/pkgs/servers/uhub/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "0.5.0"; src = fetchurl { - url = "http://www.extatic.org/downloads/uhub/uhub-${version}-src.tar.bz2"; + url = "https://www.extatic.org/downloads/uhub/uhub-${version}-src.tar.bz2"; sha256 = "1xcqjz20lxikzn96f4f69mqyl9y985h9g0gyc9f7ckj18q22b5j5"; }; diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index bb3f79855330..bde6f78e130c 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { version = "2.0.17"; src = fetchurl { - url = "http://projects.unbit.it/downloads/${name}.tar.gz"; + url = "https://projects.unbit.it/downloads/${name}.tar.gz"; sha256 = "1wlbaairsmhp6bx5wv282q9pgh6w7w6yrb8vxjznfaxrinsfkhix"; }; diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 85192b11c30f..68660ce6b36c 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -7,7 +7,7 @@ let name = "varnish-${version}"; src = fetchurl { - url = "http://varnish-cache.org/_downloads/${name}.tgz"; + url = "https://varnish-cache.org/_downloads/${name}.tgz"; inherit sha256; }; diff --git a/pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch b/pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch new file mode 100644 index 000000000000..e20acdb04a9e --- /dev/null +++ b/pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch @@ -0,0 +1,14 @@ +diff --git a/src/virtlyst.cpp b/src/virtlyst.cpp +index acd195d..8809e4f 100644 +--- a/src/virtlyst.cpp ++++ b/src/virtlyst.cpp +@@ -340,7 +340,8 @@ bool Virtlyst::createDB() + qCCritical(VIRTLYST) << "Error creating database" << query.lastError().text(); + return false; + } +- const QString password = QString::fromLatin1(QUuid::createUuid().toRfc4122().toHex()); ++ const QString password = qEnvironmentVariable("VIRTLYST_ADMIN_PASSWORD", ++ QString::fromLatin1(QUuid::createUuid().toRfc4122().toHex())); + query.bindValue(QStringLiteral(":password"), QString::fromLatin1( + CredentialPassword::createPassword(password.toUtf8(), QCryptographicHash::Sha256, 10000, 16, 16))); + if (!query.exec()) { diff --git a/pkgs/servers/web-apps/virtlyst/default.nix b/pkgs/servers/web-apps/virtlyst/default.nix new file mode 100644 index 000000000000..c6245f9b40d2 --- /dev/null +++ b/pkgs/servers/web-apps/virtlyst/default.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, autoPatchelfHook +, qtbase, libvirt, cutelyst, grantlee }: + +stdenv.mkDerivation rec { + name = "virtlyst-${version}"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "cutelyst"; + repo = "Virtlyst"; + rev = "v${version}"; + sha256 = "1rqv93dys666wsqbg1lvl3pjl8gpdx3dc3y71m3r8apalgr11ikw"; + }; + + nativeBuildInputs = [ cmake pkgconfig autoPatchelfHook ]; + buildInputs = [ qtbase libvirt cutelyst grantlee ]; + + installPhase = '' + mkdir -p $out/lib + cp src/libVirtlyst.so $out/lib + cp -r ../root $out + ''; + + patches = [ ./add-admin-password-env.patch ]; + + meta = with lib; { + description = "Web interface to manage virtual machines with libvirt"; + homepage = https://github.com/cutelyst/Virtlyst; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index e6f5e7ff5887..5e228ccba369 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1475,7 +1475,7 @@ let name = "xcb-util-cursor-0.1.3"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2; + url = https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2; sha256 = "0krr4rcw6r42cncinzvzzdqnmxk3nrgpnadyg2h8k9x10q3hm885"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 4c728d2e3e79..06f54fd52073 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -29,7 +29,7 @@ xorgserver.overrideAttrs (oldAttrs: { meta = { description = "An X server for interfacing X11 apps with the Wayland protocol"; - homepage = http://wayland.freedesktop.org/xserver.html; + homepage = https://wayland.freedesktop.org/xserver.html; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 40f630999450..ed6fef05a263 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { name = "prosody-${version}"; src = fetchurl { - url = "http://prosody.im/downloads/source/${name}.tar.gz"; + url = "https://prosody.im/downloads/source/${name}.tar.gz"; sha256 = "13knr7izscw0zx648b9582dx11aap4cq9bzfiqh5ykd7wwsz1dbm"; }; diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index 5a00a1ee4195..086fca480bb3 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -20,4 +20,8 @@ buildGoPackage rec { maintainers = with maintainers; [ vrthra ]; platforms = with platforms; linux ++ darwin; }; + + passthru = { + shellPath = "/bin/elvish"; + }; } diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix index 7c2caa96d898..a03aa338a83c 100644 --- a/pkgs/shells/mksh/default.nix +++ b/pkgs/shells/mksh/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ - "http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz" + "https://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz" "http://pub.allbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz" ]; sha256 = "0xzv5b83b8ccn3d4qvwz3gk83fi1d42kphax1527nni1472fp1nx"; diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 6c217be4ea3c..0dd65bd2478d 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -14,7 +14,6 @@ in with (import ../../../lib).systems.examples; { armv7l = make armv7l-hf-multiplatform; aarch64 = make aarch64-multiplatform; x86_64-musl = make musl64; - i686-musl = make musl32; armv6l-musl = make muslpi; aarch64-musl = make aarch64-multiplatform-musl; riscv64 = make riscv64; diff --git a/pkgs/tools/X11/arandr/default.nix b/pkgs/tools/X11/arandr/default.nix index 8bbe1b6a52b6..f33d03b6d15f 100644 --- a/pkgs/tools/X11/arandr/default.nix +++ b/pkgs/tools/X11/arandr/default.nix @@ -6,7 +6,7 @@ in buildPythonApplication rec { name = "arandr-0.1.9"; src = fetchurl { - url = "http://christian.amsuess.com/tools/arandr/files/${name}.tar.gz"; + url = "https://christian.amsuess.com/tools/arandr/files/${name}.tar.gz"; sha256 = "1i3f1agixxbfy4kxikb2b241p7c2lg73cl9wqfvlwz3q6zf5faxv"; }; diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index 8ad1b6f6455e..14fe769db6be 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -65,7 +65,7 @@ in stdenv.mkDerivation rec { name = "bumblebee-${version}"; src = fetchurl { - url = "http://bumblebee-project.org/${name}.tar.gz"; + url = "https://bumblebee-project.org/${name}.tar.gz"; sha256 = "03p3gvx99lwlavznrpg9l7jnl1yfg2adcj8jcjj0gxp20wxp060h"; }; diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/tools/X11/vdpauinfo/default.nix index a20b7d69f3dc..21d7a50566db 100644 --- a/pkgs/tools/X11/vdpauinfo/default.nix +++ b/pkgs/tools/X11/vdpauinfo/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "vdpauinfo-1.0"; src = fetchurl { - url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz"; + url = "https://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz"; sha256 = "1i2b0k9h8r0lnxlrkgqzmrjakgaw3f1ygqqwzx8w6676g85rcm20"; }; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libvdpau ]; meta = with stdenv.lib; { - homepage = http://people.freedesktop.org/~aplattner/vdpau/; + homepage = https://people.freedesktop.org/~aplattner/vdpau/; description = "Tool to query the Video Decode and Presentation API for Unix (VDPAU) abilities of the system"; license = licenses.mit; # expat version platforms = platforms.unix; diff --git a/pkgs/tools/X11/x2vnc/default.nix b/pkgs/tools/X11/x2vnc/default.nix index 31ad524cf8f3..2703379a23b9 100644 --- a/pkgs/tools/X11/x2vnc/default.nix +++ b/pkgs/tools/X11/x2vnc/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "x2vnc-1.7.2"; src = fetchurl { - url = http://fredrik.hubbe.net/x2vnc/x2vnc-1.7.2.tar.gz; + url = https://fredrik.hubbe.net/x2vnc/x2vnc-1.7.2.tar.gz; sha256 = "00bh9j3m6snyd2fgnzhj5vlkj9ibh69gfny9bfzlxbnivb06s1yw"; }; diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/pkgs/tools/X11/xbindkeys/default.nix index 1c23593bd141..e633ba4f794a 100644 --- a/pkgs/tools/X11/xbindkeys/default.nix +++ b/pkgs/tools/X11/xbindkeys/default.nix @@ -4,7 +4,7 @@ let version = "1.8.6"; in stdenv.mkDerivation { name = "xbindkeys-${version}"; src = fetchurl { - url = "http://www.nongnu.org/xbindkeys/xbindkeys-${version}.tar.gz"; + url = "https://www.nongnu.org/xbindkeys/xbindkeys-${version}.tar.gz"; sha256 = "060df6d8y727jp1inp7blp44cs8a7jig7vcm8ndsn6gw36z1h3bc"; }; diff --git a/pkgs/tools/X11/xbrightness/default.nix b/pkgs/tools/X11/xbrightness/default.nix index e66b184c04cc..f4112765e675 100644 --- a/pkgs/tools/X11/xbrightness/default.nix +++ b/pkgs/tools/X11/xbrightness/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "xbrightness-0.3-mika-akk"; src = fetchurl { - url = http://shallowsky.com/software/xbrightness/xbrightness-0.3-mika-akk.tar.gz; + url = https://shallowsky.com/software/xbrightness/xbrightness-0.3-mika-akk.tar.gz; sha256 = "2564dbd393544657cdabe4cbf535d9cfb9abe8edddb1b8cdb1ed4d12f358626e"; }; diff --git a/pkgs/tools/X11/xdg-user-dirs/default.nix b/pkgs/tools/X11/xdg-user-dirs/default.nix index 3e0680cac449..c72fab015d9f 100644 --- a/pkgs/tools/X11/xdg-user-dirs/default.nix +++ b/pkgs/tools/X11/xdg-user-dirs/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "xdg-user-dirs-0.17"; src = fetchurl { - url = "http://user-dirs.freedesktop.org/releases/${name}.tar.gz"; + url = "https://user-dirs.freedesktop.org/releases/${name}.tar.gz"; sha256 = "13216b8rfkzak5k6bvpx6jvqv3cnbgpijnjwj8a8d3kq4cl0a1ra"; }; diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/tools/X11/xdotool/default.nix index f69d5d80649b..59ddac0eca15 100644 --- a/pkgs/tools/X11/xdotool/default.nix +++ b/pkgs/tools/X11/xdotool/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { makeFlags = "PREFIX=$(out)"; meta = { - homepage = http://www.semicomplete.com/projects/xdotool/; + homepage = https://www.semicomplete.com/projects/xdotool/; description = "Fake keyboard/mouse input, window management, and more"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index e22338dbc718..2faa8ead0716 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { name = "xidlehook-${version}"; - version = "0.4.8"; + version = "0.4.9"; doCheck = false; @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { repo = "xidlehook"; rev = version; - sha256 = "1125n5szgq7bziz3lkrhb2a2iac93ap63g2xr78ap7b9i3gxs3xh"; + sha256 = "1l2kmymwxal9v5g3q21i985yc201dpybp85qfws2n5rzw8qpg1dw"; }; cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"]; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 279b2e8321a4..5ddc2432bd50 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -15,7 +15,7 @@ in buildPythonApplication rec { version = "2.3.1"; src = fetchurl { - url = "http://xpra.org/src/${name}.tar.xz"; + url = "https://xpra.org/src/${name}.tar.xz"; sha256 = "0wghjmrw77pkh6agc5rz7ynr6s8yyc68qvj9rnp0vlwa3x1fl3ry"; }; diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix index 7e620e0c2c81..a0c2ee8f995f 100644 --- a/pkgs/tools/X11/xpra/gtk3.nix +++ b/pkgs/tools/X11/xpra/gtk3.nix @@ -10,7 +10,7 @@ buildPythonApplication rec { version = "2.2.5"; src = fetchurl { - url = "http://xpra.org/src/${name}.tar.xz"; + url = "https://xpra.org/src/${name}.tar.xz"; sha256 = "1q2l00nc3bgwlhjzkbk4a8x2l8z9w1799yn31icsx5hrgh98a1js"; }; diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 11ab58bc62f8..363214129b28 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -21,7 +21,7 @@ let inherit version; src = fetchurl { - url = "http://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; + url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index cfbb90fdc308..dfe4c099bebb 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, pkgconfig, lxc, buildGoPackage, fetchurl -, makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq, squashfsTools, iproute, iptables +, makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq +, squashfsTools, iproute, iptables, ebtables }: buildGoPackage rec { @@ -26,7 +27,7 @@ buildGoPackage rec { rm $bin/bin/{deps,macaroon-identity} wrapProgram $bin/bin/lxd --prefix PATH ":" ${stdenv.lib.makeBinPath [ - acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables + acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ebtables ]} ''; diff --git a/pkgs/tools/admin/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix index c39c378d2216..b29d80e159b0 100644 --- a/pkgs/tools/admin/nxproxy/default.nix +++ b/pkgs/tools/admin/nxproxy/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { sha256 = "1m3z9w3h6qpgk265xf030w7lcs181jgw2cdyzshb7l97mn1f7hh2"; - url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz"; + url = "https://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz"; }; buildInputs = [ libxcomp ]; diff --git a/pkgs/tools/archivers/cabextract/default.nix b/pkgs/tools/archivers/cabextract/default.nix index 2e9d8cafdc07..782e0f461ece 100644 --- a/pkgs/tools/archivers/cabextract/default.nix +++ b/pkgs/tools/archivers/cabextract/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "cabextract-1.6"; src = fetchurl { - url = "http://www.cabextract.org.uk/${name}.tar.gz"; + url = "https://www.cabextract.org.uk/${name}.tar.gz"; sha256 = "1ysmmz25fjghq7mxb2anyyvr1ljxqxzi4piwjhk0sdamcnsn3rnf"; }; diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/tools/archivers/cromfs/default.nix index 77536a7ad30e..68f7f02e7413 100644 --- a/pkgs/tools/archivers/cromfs/default.nix +++ b/pkgs/tools/archivers/cromfs/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "cromfs-1.5.10.2"; src = fetchurl { - url = "http://bisqwit.iki.fi/src/arch/${name}.tar.bz2"; + url = "https://bisqwit.iki.fi/src/arch/${name}.tar.bz2"; sha256 = "0xy2x1ws1qqfp7hfj6yzm80zhrxzmhn0w2yns77im1lmd2h18817"; }; diff --git a/pkgs/tools/archivers/pxattr/default.nix b/pkgs/tools/archivers/pxattr/default.nix index 715efe719922..05d6a4718de9 100644 --- a/pkgs/tools/archivers/pxattr/default.nix +++ b/pkgs/tools/archivers/pxattr/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "pxattr-2.1.0"; src = fetchurl { - url = "http://www.lesbonscomptes.com/pxattr/pxattr-2.1.0.tar.gz"; + url = "https://www.lesbonscomptes.com/pxattr/pxattr-2.1.0.tar.gz"; sha256 = "1dwcqc5z7gzma1zhis2md49bj2nq7m6jimh4zlx9szw6svisz56z"; }; diff --git a/pkgs/tools/archivers/unarj/default.nix b/pkgs/tools/archivers/unarj/default.nix index 2505c012b26b..217a8ab35a9e 100644 --- a/pkgs/tools/archivers/unarj/default.nix +++ b/pkgs/tools/archivers/unarj/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { sha256 = "0r027z7a0azrd5k885xvwhrxicpd0ah57jzmaqlypxha2qjw7p6p"; - url = "http://src.fedoraproject.org/repo/pkgs/unarj/${name}.tar.gz/c6fe45db1741f97155c7def322aa74aa/${name}.tar.gz"; + url = "https://src.fedoraproject.org/repo/pkgs/unarj/${name}.tar.gz/c6fe45db1741f97155c7def322aa74aa/${name}.tar.gz"; }; preInstall = '' diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index 6d979bbf33d8..9e05043d4b02 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchurl { urls = [ ftp://ftp.info-zip.org/pub/infozip/src/zip30.tgz - http://src.fedoraproject.org/repo/pkgs/zip/zip30.tar.gz/7b74551e63f8ee6aab6fbc86676c0d37/zip30.tar.gz + https://src.fedoraproject.org/repo/pkgs/zip/zip30.tar.gz/7b74551e63f8ee6aab6fbc86676c0d37/zip30.tar.gz ]; sha256 = "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h"; }; diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix index e9eec597384c..1fd092577f74 100644 --- a/pkgs/tools/audio/abcm2ps/default.nix +++ b/pkgs/tools/audio/abcm2ps/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "abcm2ps-${version}"; - version = "8.13.22"; + version = "8.13.23"; src = fetchFromGitHub { owner = "leesavide"; repo = "abcm2ps"; rev = "v${version}"; - sha256 = "0csfg7aj9zg369q3c3bg18f24lk1j0356a90zlbrz7y5p668g3pv"; + sha256 = "00bc4vsdvnyznfwcrkij02n2736nsbjlrh0rng96zv00p4abv4ad"; }; prePatch = '' diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 46b4ada3d573..2d54c182349c 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "abcMIDI-${version}"; - version = "2018.06.13"; + version = "2018.06.23"; src = fetchzip { - url = "http://ifdo.ca/~seymour/runabc/${name}.zip"; - sha256 = "0mmr0wfdwx9vfz17gp0arspv835l5gka78hm5hkri4h3cvxpflfy"; + url = "https://ifdo.ca/~seymour/runabc/${name}.zip"; + sha256 = "0487dlw9v4ayb929w8bk71fs4nbcs1liyk59g6sfr4yn6dx2sl2d"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index 02235f727c5c..8fe6feaee0a6 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -1,5 +1,7 @@ -{stdenv, fetchFromGitHub, autoconf, automake, makeWrapper, pkgconfig -, gnome3, avahi, gtk3, libnotify, libpulseaudio, xlibsWrapper}: +{ stdenv, fetchFromGitHub, autoconf, automake, makeWrapper, pkgconfig +, gnome3, avahi, gtk3, libappindicator-gtk3, libnotify, libpulseaudio +, xlibsWrapper +}: stdenv.mkDerivation rec { name = "pasystray-${version}"; @@ -13,9 +15,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake makeWrapper - gnome3.defaultIconTheme - avahi gtk3 libnotify libpulseaudio xlibsWrapper ]; + buildInputs = [ + autoconf automake makeWrapper + gnome3.defaultIconTheme + avahi gtk3 libappindicator-gtk3 libnotify libpulseaudio xlibsWrapper + ]; preConfigure = '' aclocal diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index 958afa3f6a9c..e9ae73547863 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "0.26.1"; src = fetchurl { - url = "http://digint.ch/download/btrbk/releases/${name}.tar.xz"; + url = "https://digint.ch/download/btrbk/releases/${name}.tar.xz"; sha256 = "04ahfm52vcf1w0c2km0wdgj2jpffp45bpawczmygcg8fdcm021lp"; }; diff --git a/pkgs/tools/backup/chunksync/default.nix b/pkgs/tools/backup/chunksync/default.nix index 91d12a568a49..3ab1eba5b6f0 100644 --- a/pkgs/tools/backup/chunksync/default.nix +++ b/pkgs/tools/backup/chunksync/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "chunksync-${version}"; src = fetchurl { - url = "http://chunksync.florz.de/chunksync_${version}.tar.gz"; + url = "https://chunksync.florz.de/chunksync_${version}.tar.gz"; sha256 = "1gwqp1kjwhcmwhynilakhzpzgc0c6kk8c9vkpi30gwwrwpz3cf00"; }; diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix index ecd6a3209f4f..6d761354b6af 100644 --- a/pkgs/tools/backup/httrack/default.nix +++ b/pkgs/tools/backup/httrack/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "httrack-${version}"; src = fetchurl { - url = "http://mirror.httrack.com/httrack-${version}.tar.gz"; + url = "https://mirror.httrack.com/httrack-${version}.tar.gz"; sha256 = "09a0gm67nml86qby1k1gh7rdxamnrnzwr6l9r5iiq94favjs0xrl"; }; diff --git a/pkgs/tools/compression/bsdiff/default.nix b/pkgs/tools/compression/bsdiff/default.nix index 095bd5f7d9a5..617d86e7f1e3 100644 --- a/pkgs/tools/compression/bsdiff/default.nix +++ b/pkgs/tools/compression/bsdiff/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "4.3"; src = fetchurl { - url = "http://www.daemonology.net/bsdiff/${name}.tar.gz"; + url = "https://www.daemonology.net/bsdiff/${name}.tar.gz"; sha256 = "0j2zm3z271x5aw63mwhr3vymzn45p2vvrlrpm9cz2nywna41b0hq"; }; diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix index 91f7637e1bcb..c9ec557ab1f4 100644 --- a/pkgs/tools/compression/dtrx/default.nix +++ b/pkgs/tools/compression/dtrx/default.nix @@ -16,7 +16,7 @@ in pythonPackages.buildPythonApplication rec { version = "7.1"; src = fetchurl { - url = "http://brettcsmith.org/2007/dtrx/dtrx-${version}.tar.gz"; + url = "https://brettcsmith.org/2007/dtrx/dtrx-${version}.tar.gz"; sha256 = "15yf4n27zbhvv0byfv3i89wl5zn6jc2wbc69lk5a3m6rx54gx6hw"; }; diff --git a/pkgs/tools/compression/lzop/default.nix b/pkgs/tools/compression/lzop/default.nix index 72be1d28d248..00eb5f265aaf 100644 --- a/pkgs/tools/compression/lzop/default.nix +++ b/pkgs/tools/compression/lzop/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "lzop-1.04"; src = fetchurl { - url = "http://www.lzop.org/download/${name}.tar.gz"; + url = "https://www.lzop.org/download/${name}.tar.gz"; sha256 = "0h9gb8q7y54m9mvy3jvsmxf21yx8fc3ylzh418hgbbv0i8mbcwky"; }; diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix index 732aa691d4a9..a2668f73ceb2 100644 --- a/pkgs/tools/compression/pigz/default.nix +++ b/pkgs/tools/compression/pigz/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = name + "-" + version; src = fetchurl { - url = "http://www.zlib.net/${name}/${name}-${version}.tar.gz"; + url = "https://www.zlib.net/${name}/${name}-${version}.tar.gz"; sha256 = "0wsgw5vwl23jrnpsvd8v3xcp5k4waw5mk0164fynjhkv58i1dy54"; }; diff --git a/pkgs/tools/compression/rzip/default.nix b/pkgs/tools/compression/rzip/default.nix index ad1b80410419..8773121e6461 100644 --- a/pkgs/tools/compression/rzip/default.nix +++ b/pkgs/tools/compression/rzip/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = http://rzip.samba.org/; + homepage = https://rzip.samba.org/; description = "Compression program"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/filesystems/archivemount/default.nix b/pkgs/tools/filesystems/archivemount/default.nix index e720634ca44a..18bde25267d3 100644 --- a/pkgs/tools/filesystems/archivemount/default.nix +++ b/pkgs/tools/filesystems/archivemount/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { inherit name; src = fetchurl { - url = "http://www.cybernoia.de/software/archivemount/${name}.tar.gz"; + url = "https://www.cybernoia.de/software/archivemount/${name}.tar.gz"; sha256 = "12fb8fcmd1zwvfgzx4pay47md5cr2kgxcgq82cm6skmq75alfzi4"; }; diff --git a/pkgs/tools/filesystems/chunkfs/default.nix b/pkgs/tools/filesystems/chunkfs/default.nix index e5b09cbbff30..47428e7f52e4 100644 --- a/pkgs/tools/filesystems/chunkfs/default.nix +++ b/pkgs/tools/filesystems/chunkfs/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "chunkfs-${version}"; src = fetchurl { - url = "http://chunkfs.florz.de/chunkfs_${version}.tar.gz"; + url = "https://chunkfs.florz.de/chunkfs_${version}.tar.gz"; sha256 = "4c168fc2b265a6ba34afc565707ea738f34375325763c0596f2cfa1c9b8d40f1"; }; diff --git a/pkgs/tools/filesystems/genimage/default.nix b/pkgs/tools/filesystems/genimage/default.nix index b39c51a0c881..581970e34fa7 100644 --- a/pkgs/tools/filesystems/genimage/default.nix +++ b/pkgs/tools/filesystems/genimage/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "9"; src = fetchurl { - url = "http://public.pengutronix.de/software/genimage/genimage-${version}.tar.xz"; + url = "https://public.pengutronix.de/software/genimage/genimage-${version}.tar.xz"; sha256 = "0y4h8x8lqxam8m90rdfq8cg5137kvilxr3d1qzddpx7nxpvmmwv9"; }; diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/pkgs/tools/filesystems/mtpfs/default.nix index ac1a7c1c1485..afe51caa8772 100644 --- a/pkgs/tools/filesystems/mtpfs/default.nix +++ b/pkgs/tools/filesystems/mtpfs/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; src = fetchurl { - url = "http://www.adebenham.com/files/mtp/${name}.tar.gz"; + url = "https://www.adebenham.com/files/mtp/${name}.tar.gz"; sha256 = "07acrqb17kpif2xcsqfqh5j4axvsa4rnh6xwnpqab5b9w5ykbbqv"; }; diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index 6f2fb68775df..e9325e9b18d5 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -5,14 +5,14 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { - version = "3.3.2"; + version = "3.4.0"; name = "sshfs-fuse-${version}"; src = fetchFromGitHub { owner = "libfuse"; repo = "sshfs"; rev = "sshfs-${version}"; - sha256 = "01nrdprkqynk20yw6zdn6w8xv4hdw47g5d0v5qvfw0wls2kmadyr"; + sha256 = "1mbhjgw6797bln579pfwmn79gs8isnv57z431lbfw7j8xkh75awl"; }; nativeBuildInputs = [ meson pkgconfig ninja docutils ]; diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index 2f7e80dd912c..6acb034d75b6 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { version = "0.1.5.978"; src = fetchurl { - url = "http://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${name}-1.fedora.${p.arch}.rpm"; + url = "https://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${name}-1.fedora.${p.arch}.rpm"; sha256 = p.sha256; }; diff --git a/pkgs/tools/filesystems/zerofree/default.nix b/pkgs/tools/filesystems/zerofree/default.nix index 3283d6789f73..916b8509b0d0 100644 --- a/pkgs/tools/filesystems/zerofree/default.nix +++ b/pkgs/tools/filesystems/zerofree/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.1.1"; src = fetchurl { - url = "http://frippery.org/uml/${name}.tgz"; + url = "https://frippery.org/uml/${name}.tgz"; sha256 = "0rrqfa5z103ws89vi8kfvbks1cfs74ix6n1wb6vs582vnmhwhswm"; }; diff --git a/pkgs/tools/graphics/appleseed/default.nix b/pkgs/tools/graphics/appleseed/default.nix new file mode 100644 index 000000000000..e4b31f06b6e4 --- /dev/null +++ b/pkgs/tools/graphics/appleseed/default.nix @@ -0,0 +1,66 @@ +{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, guile, +eigen3_3, libpng, python, mesa_glu, qt4, openexr, openimageio, +opencolorio, xercesc, ilmbase, osl, seexpr +}: + +let boost_static = boost165.override { enableStatic = true; }; +in stdenv.mkDerivation rec { + + name = "appleseed-${version}"; + version = "1.9.0-beta"; + + src = fetchFromGitHub { + owner = "appleseedhq"; + repo = "appleseed"; + rev = "1.9.0-beta"; + sha256 = "0m7zvfkdjfn48zzaxh2wa1bsaj4l876a05bzgmjlfq5dz3202anr"; + }; + buildInputs = [ + cmake pkgconfig boost_static guile eigen3_3 libpng python + mesa_glu qt4 openexr openimageio opencolorio xercesc + osl seexpr + ]; + + NIX_CFLAGS_COMPILE = "-I${openexr.dev}/include/OpenEXR -I${ilmbase.dev}/include/OpenEXR -I${openimageio.dev}/include/OpenImageIO"; + + cmakeFlags = [ + "-DUSE_EXTERNAL_XERCES=ON" "-DUSE_EXTERNAL_OCIO=ON" "-DUSE_EXTERNAL_OIIO=ON" + "-DUSE_EXTERNAL_OSL=ON" "-DWITH_CLI=ON" "-DWITH_STUDIO=ON" "-DWITH_TOOLS=ON" + "-DUSE_EXTERNAL_PNG=ON" "-DUSE_EXTERNAL_ZLIB=ON" + "-DUSE_EXTERNAL_EXR=ON" "-DUSE_EXTERNAL_SEEXPR=ON" + "-DWITH_PYTHON2_BINDINGS=ON" + # TODO: Look further into this if someone needs Python 3.x: + # "-DWITH_PYTHON3_BINDINGS=ON" + "-DWITH_DISNEY_MATERIAL=ON" + "-DUSE_SSE=ON" + "-DUSE_SSE42=ON" + ]; + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Open source, physically-based global illumination rendering engine"; + homepage = https://appleseedhq.net/; + maintainers = with maintainers; [ hodapp ]; + license = licenses.mit; + platforms = platforms.linux; + }; +} + +# TODO: Is the below problematic? + +# CMake Warning (dev) at /nix/store/dsyw2zla2h3ld2p0jj4cv0j3wal1bp3h-cmake-3.11.2/share/cmake-3.11/Modules/FindOpenGL.cmake:270 (message): +# Policy CMP0072 is not set: FindOpenGL prefers GLVND by default when +# available. Run "cmake --help-policy CMP0072" for policy details. Use the +# cmake_policy command to set the policy and suppress this warning. +# +# FindOpenGL found both a legacy GL library: +# +# OPENGL_gl_LIBRARY: /nix/store/yxrgmcz2xlgn113wz978a91qbsy4rc8g-libGL-1.0.0/lib/libGL.so +# +# and GLVND libraries for OpenGL and GLX: +# +# OPENGL_opengl_LIBRARY: /nix/store/yxrgmcz2xlgn113wz978a91qbsy4rc8g-libGL-1.0.0/lib/libOpenGL.so +# OPENGL_glx_LIBRARY: /nix/store/yxrgmcz2xlgn113wz978a91qbsy4rc8g-libGL-1.0.0/lib/libGLX.so +# +# OpenGL_GL_PREFERENCE has not been set to "GLVND" or "LEGACY", so for +# compatibility with CMake 3.10 and below the legacy GL library will be used. diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index d35eae872040..7a06d9f346b8 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a # while on me. It might be good to find a mirror - url = "http://www.argyllcms.com/Argyll_V${version}_src.zip"; + url = "https://www.argyllcms.com/Argyll_V${version}_src.zip"; sha256 = "1583hspas7rw5xwrs1rb4yn1yl34wh6lfik6xyszpfv39a2axdxx"; # The argyllcms web server doesn't like curl ... diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix index 44ad267f9d4e..dd81c3e4ecc0 100644 --- a/pkgs/tools/graphics/dcraw/default.nix +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "dcraw-9.28.0"; src = fetchurl { - url = "http://www.cybercom.net/~dcoffin/dcraw/archive/${name}.tar.gz"; + url = "https://www.cybercom.net/~dcoffin/dcraw/archive/${name}.tar.gz"; sha256 = "1fdl3xa1fbm71xzc3760rsjkvf0x5jdjrvdzyg2l9ka24vdc7418"; }; diff --git a/pkgs/tools/graphics/exiftags/default.nix b/pkgs/tools/graphics/exiftags/default.nix index 47312f0f9975..9ce95154cb0b 100644 --- a/pkgs/tools/graphics/exiftags/default.nix +++ b/pkgs/tools/graphics/exiftags/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "exiftags-1.01"; src = fetchurl { - url = http://johnst.org/sw/exiftags/exiftags-1.01.tar.gz; + url = https://johnst.org/sw/exiftags/exiftags-1.01.tar.gz; sha256 = "194ifl6hybx2a5x8jhlh9i56k3qfc6p2l72z0ii1b7v0bzg48myr"; }; diff --git a/pkgs/tools/graphics/feedgnuplot/default.nix b/pkgs/tools/graphics/feedgnuplot/default.nix new file mode 100644 index 000000000000..4e371ffd2b07 --- /dev/null +++ b/pkgs/tools/graphics/feedgnuplot/default.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchFromGitHub, buildPerlPackage, makeWrapper, gawk +, makeFontsConf, freefont_ttf, gnuplot, perl, perlPackages +}: + +let + + fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; }; + +in + +buildPerlPackage rec { + name = "feedgnuplot-${version}"; + version = "1.49"; + + src = fetchFromGitHub { + owner = "dkogan"; + repo = "feedgnuplot"; + rev = "v${version}"; + sha256 = "1bjnx36rsxlj845w9apvdjpza8vd9rbs3dlmgvky6yznrwa6sm02"; + }; + + nativeBuildInputs = [ makeWrapper gawk ]; + + buildInputs = [ gnuplot perl ] + ++ (with perlPackages; [ ListMoreUtils IPCRun StringShellQuote ]); + + # Fontconfig error: Cannot load default config file + FONTCONFIG_FILE = fontsConf; + + postPatch = '' + patchShebangs . + ''; + + # Tests require gnuplot 4.6.4 and are completely skipped with gnuplot 5. + doCheck = false; + + postInstall = '' + wrapProgram $out/bin/feedgnuplot \ + --prefix "PATH" ":" "$PATH" \ + --prefix "PERL5LIB" ":" "$PERL5LIB" + install -D -m 444 -t $out/share/bash-completion/completions \ + completions/bash/feedgnuplot + install -D -m 444 -t $out/share/zsh/site-functions \ + completions/zsh/_feedgnuplot + ''; + + meta = with stdenv.lib; { + description = "General purpose pipe-oriented plotting tool"; + homepage = https://github.com/dkogan/feedgnuplot/; + license = with licenses; [ artistic1 gpl1Plus ]; + platforms = platforms.unix; + maintainers = with maintainers; [ mnacamura ]; + }; +} diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/tools/graphics/fgallery/default.nix index 424cf5c1bdc6..a7bb616d82b5 100644 --- a/pkgs/tools/graphics/fgallery/default.nix +++ b/pkgs/tools/graphics/fgallery/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { name = "fgallery-1.8.2"; src = fetchurl { - url = "http://www.thregr.org/~wavexx/software/fgallery/releases/${name}.zip"; + url = "https://www.thregr.org/~wavexx/software/fgallery/releases/${name}.zip"; sha256 = "18wlvqbxcng8pawimbc8f2422s8fnk840hfr6946lzsxr0ijakvf"; }; diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix index 05ce6b6f7c9c..76cb3ab199c2 100644 --- a/pkgs/tools/graphics/gifsicle/default.nix +++ b/pkgs/tools/graphics/gifsicle/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "1.91"; src = fetchurl { - url = "http://www.lcdf.org/gifsicle/${name}.tar.gz"; + url = "https://www.lcdf.org/gifsicle/${name}.tar.gz"; sha256 = "00586z1yz86qcblgmf16yly39n4lkjrscl52hvfxqk14m81fckha"; }; diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index 008f9af36852..6c62e0528386 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" "man" ] ++ stdenv.lib.optional withGimpPlugin "gimpPlugin"; src = fetchurl { - url = "http://gmic.eu/files/source/gmic_${version}.tar.gz"; + url = "https://gmic.eu/files/source/gmic_${version}.tar.gz"; sha256 = "0zqfj2ym5nn3ff93xh2wf9ayxqlznabbdi00xw4lm7vw3iwkzqnc"; }; diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix new file mode 100644 index 000000000000..387c8c0595e7 --- /dev/null +++ b/pkgs/tools/graphics/luxcorerender/default.nix @@ -0,0 +1,87 @@ +{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python35 +, tbb, openimageio, libjpeg, libpng, zlib, libtiff, ilmbase +, freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core +, dbus, doxygen, qt5, c-blosc, mesa_glu, gnome3, pcre +, bison, flex, libpthreadstubs, libX11 +, embree2, makeWrapper, gsettings_desktop_schemas, glib +, withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp +}: + +let boost_static = boost165.override { + python = python35; + enableStatic = true; + }; + +in stdenv.mkDerivation rec { + name = "luxcorerender-${version}"; + version = "2.0"; + + src = fetchFromGitHub { + owner = "LuxCoreRender"; + repo = "LuxCore"; + rev = "luxcorerender_v2.0"; + sha256 = "15nn39ybsfjf3cw3xgkbarvxn4a9ymfd579ankm7yjxkw5gcif38"; + }; + + buildInputs = + [ embree2 pkgconfig cmake zlib boost_static libjpeg + libtiff libpng ilmbase freetype openexr openimageio + tbb qt5.full c-blosc mesa_glu pcre bison + flex libX11 libpthreadstubs python35 libXdmcp libxkbcommon + epoxy at-spi2-core dbus doxygen + # needed for GSETTINGS_SCHEMAS_PATH + gsettings_desktop_schemas glib gnome3.gtk + # needed for XDG_ICON_DIRS + gnome3.defaultIconTheme + makeWrapper + (stdenv.lib.getLib gnome3.dconf) + ] ++ stdenv.lib.optionals withOpenCL [opencl-headers ocl-icd opencl-clhpp]; + + cmakeFlags = [ + "-DOpenEXR_Iex_INCLUDE_DIR=${openexr.dev}/include/OpenEXR" + "-DOpenEXR_IlmThread_INCLUDE_DIR=${ilmbase.dev}/include/OpenEXR" + "-DOpenEXR_Imath_INCLUDE_DIR=${openexr.dev}/include/OpenEXR" + "-DOpenEXR_half_INCLUDE_DIR=${ilmbase.dev}/include" + "-DPYTHON_LIBRARY=${python35}/lib/libpython3.so" + "-DPYTHON_INCLUDE_DIR=${python35}/include/python3.5" + "-DEMBREE_INCLUDE_PATH=${embree2}/include" + "-DEMBREE_LIBRARY=${embree2}/lib/libembree.so" + "-DBoost_PYTHON_LIBRARY_RELEASE=${boost_static}/lib/libboost_python3-mt.so" + ] ++ stdenv.lib.optional withOpenCL + "-DOPENCL_INCLUDE_DIR=${opencl-headers}/include"; + preConfigure = '' + NIX_CFLAGS_COMPILE+=" -isystem ${python35}/include/python3.5" + NIX_LDFLAGS+=" -lpython3" + ''; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/lib + cp -va bin/* $out/bin + cp -va lib/* $out/lib + ''; + + preFixup = '' + wrapProgram "$out/bin/luxcoreui" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ + --suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share' \ + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" + ''; + + meta = with stdenv.lib; { + description = "Open source, physically based, unbiased rendering engine"; + homepage = https://luxcorerender.org/; + maintainers = with maintainers; [ hodapp ]; + license = licenses.asl20; + platforms = platforms.linux; + }; +} + + +# TODO (might not be necessary): +# +# luxcoreui still gives warnings like: "failed to commit changes to +# dconf: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The +# name ca.desrt.dconf was not provided by any .service files" + +# CMake complains of the FindOpenGL/GLVND preference diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index fcd347182ec4..05aa7b866360 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation rec { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced - name = "netpbm-10.77.02"; + name = "netpbm-10.82.01"; src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = 2883; - sha256 = "1lxa5gasmqrwgihkk8ij7vb9kgdw3d5mp25kydkrf6x4wibg1w5f"; + rev = 3264; + sha256 = "17fmyjbxp1l18rma7gb0m8wd9kx2iwhqs8dd6fpalsn2cr8mf8hf"; }; postPatch = /* CVE-2005-2471, from Arch */ '' diff --git a/pkgs/tools/graphics/rocket/default.nix b/pkgs/tools/graphics/rocket/default.nix new file mode 100644 index 000000000000..513439989501 --- /dev/null +++ b/pkgs/tools/graphics/rocket/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, qmake, qtbase }: + +stdenv.mkDerivation rec { + name = "rocket-${version}"; + version = "2018-06-09"; + + src = fetchFromGitHub { + owner = "rocket"; + repo = "rocket"; + rev = "7bc1e9826cad5dbc63e56371c6aa1798b2a7b50b"; + sha256 = "13bdg2dc6ypk17sz39spqdlb3wai2y085bdb36pls2as2nf22drp"; + }; + + nativeBuildInputs = [ qmake ]; + buildInputs = [ qtbase ]; + + configurePhase = ":"; + + installPhase = '' + mkdir -p $out/bin + cp -r editor/editor $out/bin/ + ''; + + meta = with stdenv.lib; { + description = "A tool for synchronizing music and visuals in demoscene productions"; + homepage = "https://github.com/rocket/rocket"; + license = licenses.zlib; + platforms = platforms.linux; + maintainers = [ maintainers.dezgeg ]; + }; +} diff --git a/pkgs/tools/graphics/structure-synth/default.nix b/pkgs/tools/graphics/structure-synth/default.nix new file mode 100644 index 000000000000..92a7d69aa915 --- /dev/null +++ b/pkgs/tools/graphics/structure-synth/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, qt4, qmake4Hook, unzip, mesa_glu, makeWrapper }: + +stdenv.mkDerivation rec { + + name = "structure-synth-${version}"; + version = "v1.5"; + + src = fetchurl { + url = mirror://sourceforge/structuresynth/StructureSynth-Source-v1.5.0.zip; + sha256 = "1kiammx46719az6jzrav8yrwz82nk4m72ybj0kpbnvp9wfl3swbb"; + }; + + buildInputs = [ qt4 unzip mesa_glu makeWrapper ]; + nativeBuildInputs = [ qmake4Hook ]; + + # Thanks to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672000#15: + patches = [ ./gcc47.patch ]; + + enableParallelBuilding = true; + + preConfigure = '' + ${qt4}/bin/qmake -project -after "CONFIG+=opengl" -after "QT+=xml opengl script" -after "unix:LIBS+=-lGLU" + ''; + + installPhase = '' + mkdir -p $out/bin; + mkdir -p $out/share/Examples $out/share/Misc; + cp "Structure Synth Source Code" $out/bin/structure-synth; + cp -r Examples/* $out/share/Examples; + cp -r Misc/* $out/share/Misc; + ''; + + # Structure Synth expects to see 'Examples' and 'Misc' directory in + # either $HOME or $PWD - so help it along by moving $PWD to 'share', + # where we just copied those two directories: + preFixup = '' + wrapProgram "$out/bin/structure-synth" --run "cd $out/share" + ''; + + meta = with stdenv.lib; { + description = "Application for generating 3D structures by specifying a design grammar"; + homepage = http://structuresynth.sourceforge.net; + maintainers = with maintainers; [ hodapp ]; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/graphics/structure-synth/gcc47.patch b/pkgs/tools/graphics/structure-synth/gcc47.patch new file mode 100644 index 000000000000..8726e89c8308 --- /dev/null +++ b/pkgs/tools/graphics/structure-synth/gcc47.patch @@ -0,0 +1,50 @@ +diff -rc "Structure Synth Source Code/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp" "Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp" +*** "Structure Synth Source Code/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp" 2010-11-13 22:32:44.000000000 -0500 +--- "Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp" 2018-06-24 14:23:30.794296776 -0400 +*************** +*** 1,5 **** + #include +! + + #include "RayTracer.h" + +--- 1,5 ---- + #include +! #include + + #include "RayTracer.h" + +diff -rc "Structure Synth Source Code/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp" "Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp" +*** "Structure Synth Source Code/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp" 2010-09-08 21:25:30.000000000 -0400 +--- "Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp" 2018-06-24 14:23:12.542868194 -0400 +*************** +*** 122,128 **** + currentT = p; + + // We do not intersect grid. +! if (!found) return false; + } + + stepX = (dir.x() > 0) ? 1 : -1; +--- 122,128 ---- + currentT = p; + + // We do not intersect grid. +! if (!found) return NULL; + } + + stepX = (dir.x() > 0) ? 1 : -1; +Only in Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer: VoxelStepper.cpp.orig +diff -rc "Structure Synth Source Code/SyntopiaCore/GLEngine/Sphere.h" "Structure Synth Source Code2/SyntopiaCore/GLEngine/Sphere.h" +*** "Structure Synth Source Code/SyntopiaCore/GLEngine/Sphere.h" 2010-08-11 15:12:22.000000000 -0400 +--- "Structure Synth Source Code2/SyntopiaCore/GLEngine/Sphere.h" 2018-06-24 14:23:30.793296807 -0400 +*************** +*** 2,7 **** +--- 2,8 ---- + + #include "SyntopiaCore/Math/Vector3.h" + #include "Object3D.h" ++ #include + + namespace SyntopiaCore { + namespace GLEngine { diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix new file mode 100644 index 000000000000..4e4f5a5db4a6 --- /dev/null +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, cmake, python3, vulkan-loader, + glslang, pkgconfig, x11, libxcb, libXrandr, wayland }: + +stdenv.mkDerivation rec { + name = "vulkan-tools-${version}"; + version = "1.1.77.0"; + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "Vulkan-Tools"; + rev = "sdk-${version}"; + sha256 = "1c827n0xz8d7ydqpjchd58as943acyi182a0p4aq3bdsaxlmmpkg"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake python3 vulkan-loader x11 libxcb libXrandr wayland ]; + enableParallelBuilding = true; + + cmakeFlags = [ "-DBUILD_ICD=OFF" "-DGLSLANG_INSTALL_DIR=${glslang}" ]; + + meta = with stdenv.lib; { + description = "LunarG Vulkan loader"; + homepage = "http://www.lunarg.com"; + platforms = platforms.linux; + license = licenses.asl20; + maintainers = [ maintainers.ralith ]; + }; +} diff --git a/pkgs/tools/graphics/yafaray-core/default.nix b/pkgs/tools/graphics/yafaray-core/default.nix new file mode 100644 index 000000000000..a0de144d907e --- /dev/null +++ b/pkgs/tools/graphics/yafaray-core/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, opencv, zlib +, libxml2, freetype, libjpeg, libtiff, swig, openexr +, ilmbase, boost165 +, withPython ? true, python35 +}: + +stdenv.mkDerivation rec { + + name = "yafaray-core-${version}"; + version = "v3.3.0"; + + src = fetchFromGitHub { + owner = "YafaRay"; + repo = "Core"; + rev = "${version}"; + sha256 = "04p3nlg1rv617qf8v1nzjl6f0w43rvi8w9j6l6ck4bvl77v6cjp6"; + }; + + preConfigure = '' + NIX_CFLAGS_COMPILE+=" -isystem ${ilmbase.dev}/include/OpenEXR" + ''; + + buildInputs = [ + cmake pkgconfig boost165 opencv zlib libxml2 freetype libjpeg libtiff + swig openexr ilmbase + ] ++ stdenv.lib.optional withPython python35; + + meta = with stdenv.lib; { + description = "A free, open source raytracer"; + homepage = http://www.yafaray.org; + maintainers = with maintainers; [ hodapp ]; + license = licenses.lgpl21; + platforms = platforms.linux; + }; + } + +# TODO: Add optional Ruby support +# TODO: Add Qt support? (CMake looks for it, but what for?) diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix index b5b394c5b6cb..b69a9ec81f69 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "http://download.fcitx-im.org/fcitx-configtool/${name}.tar.xz"; + url = "https://download.fcitx-im.org/fcitx-configtool/${name}.tar.xz"; sha256 = "1ypr2jr3vzs2shqfrvhqy69xvagrn9x507180i9wxy14hb97a82r"; }; diff --git a/pkgs/tools/misc/agedu/default.nix b/pkgs/tools/misc/agedu/default.nix new file mode 100644 index 000000000000..2f9615a1fdbb --- /dev/null +++ b/pkgs/tools/misc/agedu/default.nix @@ -0,0 +1,35 @@ +{stdenv, fetchgit, autoreconfHook, halibut}: +let + date = "20180522"; + rev = "5b12791"; +in +stdenv.mkDerivation { + name = "agedu-${date}.${rev}"; + # upstream provides tarballs but it seems they disappear after the next version is released + src = fetchgit { + url = https://git.tartarus.org/simon/agedu.git; + inherit rev; + sha256 = "1zyxif0i3yil4xm8y9aqk6wsdwi7b3jg682lv6ds6a6bl047fz1q"; + }; + + nativeBuildInputs = [autoreconfHook halibut]; + + meta = with stdenv.lib; { + description = "A Unix utility for tracking down wasted disk space"; + longDescription = '' + Most Unix file systems, in their default mode, helpfully record when a + file was last accessed. So if you generated a large amount of data years + ago, forgot to clean it up, and have never used it since, then it ought + in principle to be possible to use those last-access time stamps to tell + the difference between that and a large amount of data you're still + using regularly. + + agedu uses this information to tell you which files waste disk space when + you haven't used them since a long time. + ''; + homepage = https://www.chiark.greenend.org.uk/~sgtatham/agedu/; + license = licenses.mit; + maintainers = with maintainers; [ symphorien ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/apparix/default.nix b/pkgs/tools/misc/apparix/default.nix index 693ca27a88d9..550ab4972d97 100644 --- a/pkgs/tools/misc/apparix/default.nix +++ b/pkgs/tools/misc/apparix/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "apparix-11-062"; src = fetchurl { - url = "http://micans.org/apparix/src/${name}.tar.gz"; + url = "https://micans.org/apparix/src/${name}.tar.gz"; sha256 = "211bb5f67b32ba7c3e044a13e4e79eb998ca017538e9f4b06bc92d5953615235"; }; diff --git a/pkgs/tools/misc/appdata-tools/default.nix b/pkgs/tools/misc/appdata-tools/default.nix index 54c78874dd2e..7ceafe127932 100644 --- a/pkgs/tools/misc/appdata-tools/default.nix +++ b/pkgs/tools/misc/appdata-tools/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureScript = "./autogen.sh"; meta = with stdenv.lib; { - homepage = http://people.freedesktop.org/~hughsient/appdata; + homepage = https://people.freedesktop.org/~hughsient/appdata; description = "CLI designed to validate AppData descriptions for standards compliance and to the style guide"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/tools/misc/aws-mturk-clt/default.nix b/pkgs/tools/misc/aws-mturk-clt/default.nix index e02359eda803..c7829239c41f 100644 --- a/pkgs/tools/misc/aws-mturk-clt/default.nix +++ b/pkgs/tools/misc/aws-mturk-clt/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "aws-mturk-clt-1.3.0"; src = fetchurl { - url = "http://mturk.s3.amazonaws.com/CLTSource/${name}.tar.gz"; + url = "https://mturk.s3.amazonaws.com/CLTSource/${name}.tar.gz"; sha256 = "00yyc7k3iygg83cknv9i2dsaxwpwzdkc8a2l9j56lg999hw3mqm3"; }; diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix index a8b6d5f3c252..e8ea9117bc5a 100644 --- a/pkgs/tools/misc/bandwidth/default.nix +++ b/pkgs/tools/misc/bandwidth/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { version = "1.5.1"; src = fetchurl { - url = "http://zsmith.co/archives/${name}.tar.gz"; + url = "https://zsmith.co/archives/${name}.tar.gz"; sha256 = "1v9k1a2ilkbhc3viyacgq88c9if60kwsd1fy6rn84317qap4i7ib"; }; diff --git a/pkgs/tools/misc/bibtex2html/default.nix b/pkgs/tools/misc/bibtex2html/default.nix index 74894da54182..e34eea8b10ce 100644 --- a/pkgs/tools/misc/bibtex2html/default.nix +++ b/pkgs/tools/misc/bibtex2html/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.98"; src = fetchurl { - url = http://www.lri.fr/~filliatr/ftp/bibtex2html/bibtex2html-1.98.tar.gz; + url = https://www.lri.fr/~filliatr/ftp/bibtex2html/bibtex2html-1.98.tar.gz; sha256 = "1mh6hxmc9qv05hgjc11m2zh5mk9mk0kaqp59pny18ypqgfws09g9"; }; diff --git a/pkgs/tools/misc/buildtorrent/default.nix b/pkgs/tools/misc/buildtorrent/default.nix index 793e5c56e1f1..90fc68dcc5cc 100644 --- a/pkgs/tools/misc/buildtorrent/default.nix +++ b/pkgs/tools/misc/buildtorrent/default.nix @@ -3,17 +3,17 @@ let version = "0.8"; in stdenv.mkDerivation rec { - name = "buildtorrent-${version}"; + name = "buildtorrent-${version}"; - src = fetchurl { - url = "http://mathr.co.uk/blog/code/${name}.tar.gz"; - sha256 = "e8e27647bdb38873ac570d46c1a9689a92b01bb67f59089d1cdd08784f7052d0"; - }; + src = fetchurl { + url = "https://mathr.co.uk/blog/code/${name}.tar.gz"; + sha256 = "e8e27647bdb38873ac570d46c1a9689a92b01bb67f59089d1cdd08784f7052d0"; + }; - meta = { - description = "A simple commandline torrent creator"; - homepage = http://mathr.co.uk/blog/torrent.html; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; - }; + meta = { + description = "A simple commandline torrent creator"; + homepage = http://mathr.co.uk/blog/torrent.html; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.all; + }; } diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index 5dba7744d7b3..e154e217e951 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "calamares"; - version = "3.2.0"; + version = "3.2.1"; # release including submodule src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.gz"; - sha256 = "1i5q3hffjqi1id9kv8sixhddxd90d5qqmbc7gf5vf9m3c54pln64"; + sha256 = "06i1fivcdzdf6fzj4db3izqcgy5q4wwgsmlx24szi88rd2j6prx9"; }; buildInputs = [ diff --git a/pkgs/tools/misc/colord-gtk/default.nix b/pkgs/tools/misc/colord-gtk/default.nix index c26f835c0ee5..38b4916e3942 100644 --- a/pkgs/tools/misc/colord-gtk/default.nix +++ b/pkgs/tools/misc/colord-gtk/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "colord-gtk-0.1.26"; src = fetchurl { - url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz"; + url = "https://www.freedesktop.org/software/colord/releases/${name}.tar.xz"; sha256 = "0i9y3bb5apj6a0f8cx36l6mjzs7xc0k7nf0magmf58vy2mzhpl18"; }; diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 9b6330140097..4461834cb74d 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "colord-1.4.2"; src = fetchurl { - url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz"; + url = "https://www.freedesktop.org/software/colord/releases/${name}.tar.xz"; sha256 = "19zc9gldz469jshl16av7na459kwr5nhvs2pz98xm5lw582xaw2c"; }; diff --git a/pkgs/tools/misc/convmv/default.nix b/pkgs/tools/misc/convmv/default.nix index 253e6a50b361..52bcbde1cc1b 100644 --- a/pkgs/tools/misc/convmv/default.nix +++ b/pkgs/tools/misc/convmv/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "convmv-2.05"; src = fetchurl { - url = "http://www.j3e.de/linux/convmv/${name}.tar.gz"; + url = "https://www.j3e.de/linux/convmv/${name}.tar.gz"; sha256 = "19hwv197p7c23f43vvav5bs19z9b72jzca2npkjsxgprwj5ardjk"; }; diff --git a/pkgs/tools/misc/dbacl/default.nix b/pkgs/tools/misc/dbacl/default.nix index bb1267d62f4b..747d7b26669b 100644 --- a/pkgs/tools/misc/dbacl/default.nix +++ b/pkgs/tools/misc/dbacl/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "dbacl-1.14"; src = fetchurl { - url = "http://www.lbreyer.com/gpl/${name}.tar.gz"; + url = "https://www.lbreyer.com/gpl/${name}.tar.gz"; sha256 = "0224g6x71hyvy7jikfxmgcwww1r5lvk0jx36cva319cb9nmrbrq7"; }; diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix index e89222af74b4..a6280ff4008a 100644 --- a/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/pkgs/tools/misc/desktop-file-utils/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "desktop-file-utils-0.23"; src = fetchurl { - url = "http://www.freedesktop.org/software/desktop-file-utils/releases/${name}.tar.xz"; + url = "https://www.freedesktop.org/software/desktop-file-utils/releases/${name}.tar.xz"; sha256 = "119kj2w0rrxkhg4f9cf5waa55jz1hj8933vh47vcjipcplql02bc"; }; diff --git a/pkgs/tools/misc/ent/default.nix b/pkgs/tools/misc/ent/default.nix index 71b4ec338df3..f4354ad2416c 100644 --- a/pkgs/tools/misc/ent/default.nix +++ b/pkgs/tools/misc/ent/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "ent-1.1"; src = fetchurl { - url = "http://www.fourmilab.ch/random/random.zip"; + url = "https://www.fourmilab.ch/random/random.zip"; sha256 = "1v39jlj3lzr5f99avzs2j2z6anqqd64bzm1pdf6q84a5n8nxckn1"; }; diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix index 1d7c47c2c9ab..729b4cef03a4 100644 --- a/pkgs/tools/misc/esptool/default.nix +++ b/pkgs/tools/misc/esptool/default.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonApplication rec { name = "esptool-${version}"; - version = "2.3.1"; + version = "2.4.1"; src = fetchFromGitHub { owner = "espressif"; repo = "esptool"; rev = "v${version}"; - sha256 = "0gwnl6z5s2ax07l3n38h9hdyz71pn8lzn4fybcwyrii0bj2kapvc"; + sha256 = "1djlmqdvcyqjqbj225xkn4ix9qr01b8pmsdija2h4nizx77xjyng"; }; checkInputs = with python3.pkgs; [ flake8 flake8-future-import flake8-import-order ]; diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index 1bdab1e841f8..21a126b04f3b 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "flashrom-${version}"; src = fetchurl { - url = "http://download.flashrom.org/releases/${name}.tar.bz2"; + url = "https://download.flashrom.org/releases/${name}.tar.bz2"; sha256 = "0i9wg1lyfg99bld7d00zqjm9f0lk6m0q3h3n9c195c9yysq5ccfb"; }; diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix index 9172c13636a6..d70af6b311ff 100644 --- a/pkgs/tools/misc/geekbench/default.nix +++ b/pkgs/tools/misc/geekbench/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "4.1.1"; src = fetchurl { - url = "http://cdn.primatelabs.com/Geekbench-${version}-Linux.tar.gz"; + url = "https://cdn.primatelabs.com/Geekbench-${version}-Linux.tar.gz"; sha256 = "1n9jyzf0a0w37hb30ip76hz73bvim76jd2fgd6131hh0shp1s4v6"; }; diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix index eb029d32f73e..be4de738c1c3 100644 --- a/pkgs/tools/misc/gnokii/default.nix +++ b/pkgs/tools/misc/gnokii/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchurl { sha256 = "0sjjhm40662bj6j0jh3sd25b8nww54nirpwamz618rg6pb5hjwm8"; - url = "http://www.gnokii.org/download/gnokii/${name}.tar.gz"; + url = "https://www.gnokii.org/download/gnokii/${name}.tar.gz"; }; buildInputs = [ diff --git a/pkgs/tools/misc/gnuvd/default.nix b/pkgs/tools/misc/gnuvd/default.nix index 32e796966c9f..9f489fee7ec6 100644 --- a/pkgs/tools/misc/gnuvd/default.nix +++ b/pkgs/tools/misc/gnuvd/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gnuvd-1.0.12"; src = fetchurl { - url = http://www.djcbsoftware.nl/code/gnuvd/gnuvd-1.0.12.tar.gz ; + url = https://www.djcbsoftware.nl/code/gnuvd/gnuvd-1.0.12.tar.gz ; sha256 = "0mpy76a0pxy62zjiihlzmvl4752hiwxhfs8rm1v5zgdr78acxyxz"; }; diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index e048a2800df5..12c199801c71 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "goaccess-${version}"; src = fetchurl { - url = "http://tar.goaccess.io/goaccess-${version}.tar.gz"; + url = "https://tar.goaccess.io/goaccess-${version}.tar.gz"; sha256 = "051lrprg9svl5ccc3sif8fl78vfpkrgjcxgi2wngqn7a81jzdabb"; }; diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix index 76c60023c063..6c5bac11e738 100644 --- a/pkgs/tools/misc/gringo/default.nix +++ b/pkgs/tools/misc/gringo/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ./gringo-4.5.4-to_string.patch ]; - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace ./SConstruct \ --replace \ "env['CXX'] = 'g++'" \ diff --git a/pkgs/tools/misc/hdfview/default.nix b/pkgs/tools/misc/hdfview/default.nix index 405e19e75bf9..03af224b4c05 100644 --- a/pkgs/tools/misc/hdfview/default.nix +++ b/pkgs/tools/misc/hdfview/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.14"; src = fetchurl { - url = "http://support.hdfgroup.org/ftp/HDF5/hdf-java/current/src/${name}.tar.gz"; + url = "https://support.hdfgroup.org/ftp/HDF5/hdf-java/current/src/${name}.tar.gz"; sha256 = "0lv9djfm7hnp14mcyzbiax3xjb8vkbzhh7bdl6cvgy53pc08784p"; }; diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 3089d6cace90..033e93609ab2 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "lf-${version}"; - version = "5"; + version = "6"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "0qgvaa69xs97x42j1ikb03bzpm497z9h3qk7adbdippaqcj40s70"; + sha256 = "1wgmmz1gvphkz0rnjyvgn3860yzvxwackb1dwqbgjrqsqy8ba01z"; }; goPackagePath = "github.com/gokcehan/lf"; diff --git a/pkgs/tools/misc/logstash/contrib.nix b/pkgs/tools/misc/logstash/contrib.nix index c019803f9035..dc33d2ece548 100644 --- a/pkgs/tools/misc/logstash/contrib.nix +++ b/pkgs/tools/misc/logstash/contrib.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "logstash-contrib-${version}"; src = fetchzip { - url = "http://download.elasticsearch.org/logstash/logstash/logstash-contrib-${version}.tar.gz"; + url = "https://download.elasticsearch.org/logstash/logstash/logstash-contrib-${version}.tar.gz"; sha256 = "1yj8sf3b526gixh3c6zhgkfpg4f0c72p1lzhfhdx8b3lw7zjkj0k"; }; diff --git a/pkgs/tools/misc/memtest86/default.nix b/pkgs/tools/misc/memtest86/default.nix index 810bc36fb723..2e364e33fc68 100644 --- a/pkgs/tools/misc/memtest86/default.nix +++ b/pkgs/tools/misc/memtest86/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "memtest86-4.3.6"; src = fetchurl { - url = http://www.memtest86.com/downloads/memtest86-4.3.6-src.tar.gz; + url = https://www.memtest86.com/downloads/memtest86-4.3.6-src.tar.gz; sha256 = "0qbksyl2hmkm12n7zbmf2m2n3q811skhykxx6a9a7y6r7k8y5qmv"; }; diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/tools/misc/mimeo/default.nix index 52f685b22ca6..18e7281ce83a 100644 --- a/pkgs/tools/misc/mimeo/default.nix +++ b/pkgs/tools/misc/mimeo/default.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { version = "2017.6.6"; src = fetchurl { - url = "http://xyne.archlinux.ca/projects/mimeo/src/${name}.tar.xz"; + url = "https://xyne.archlinux.ca/projects/mimeo/src/${name}.tar.xz"; sha256 = "126g3frks6zn6yc1r005qpmxg1pvvvf06ivpyvd9xribn2mwki2z"; }; diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/tools/misc/mpdscribble/default.nix index 47eec54e127e..6913f1c11fdf 100644 --- a/pkgs/tools/misc/mpdscribble/default.nix +++ b/pkgs/tools/misc/mpdscribble/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = - "http://www.musicpd.org/download/mpdscribble/${version}/mpdscribble-${version}.tar.bz2"; + "https://www.musicpd.org/download/mpdscribble/${version}/mpdscribble-${version}.tar.bz2"; sha256 = "0hgb7xh3w455m00lpldwkyrc5spjn3q1pl2ry3kf7w3hiigjpphw"; }; diff --git a/pkgs/tools/misc/mprime/default.nix b/pkgs/tools/misc/mprime/default.nix index 556d21ee2fc7..850ed32998b4 100644 --- a/pkgs/tools/misc/mprime/default.nix +++ b/pkgs/tools/misc/mprime/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { version = "29.4b7"; src = fetchurl { - url = "http://www.mersenne.org/ftp_root/gimps/p95v${lib.replaceStrings ["."] [""] version}.source.zip"; + url = "https://www.mersenne.org/ftp_root/gimps/p95v${lib.replaceStrings ["."] [""] version}.source.zip"; sha256 = "0idaqm46m4yis7vl014scx57lpccvjbnyy79gmj8caxghyajws0m"; }; diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix index 82155eb51c7f..39c9323151f3 100644 --- a/pkgs/tools/misc/multitail/default.nix +++ b/pkgs/tools/misc/multitail/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "multitail-${version}"; src = fetchurl { - url = "http://www.vanheusden.com/multitail/${name}.tgz"; + url = "https://www.vanheusden.com/multitail/${name}.tgz"; sha256 = "1zd1r89xkxngl1pdrvsc877838nwkfqkbcgfqm3vglwalxc587dg"; }; diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index 330210269d57..b167d0f2c475 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.13"; src = fetchurl { - url = "http://dev.yorhel.nl/download/${name}.tar.gz"; + url = "https://dev.yorhel.nl/download/${name}.tar.gz"; sha256 = "0ni56ymlii577src4dzfbrq1mznbf6i0nka4bvh2sb1971f2ingl"; }; diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index af6c17433f11..7dbfc90fa125 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "neofetch-${version}"; - version = "4.0.2"; + version = "5.0.0"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "neofetch"; rev = version; - sha256 = "0c0x05ca8lp74928nix4pvd243l95lav35r21mpkbagf72z284d2"; + sha256 = "0yzyi2p0d8xp576lxyv5m9h60dl1d5dmrn40aad307872835b9rr"; }; dontBuild = true; diff --git a/pkgs/tools/misc/osinfo-db-tools/default.nix b/pkgs/tools/misc/osinfo-db-tools/default.nix index 3464a92fa110..10aa5d1ae99b 100644 --- a/pkgs/tools/misc/osinfo-db-tools/default.nix +++ b/pkgs/tools/misc/osinfo-db-tools/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "osinfo-db-tools-1.1.0"; + name = "osinfo-db-tools-1.2.0"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${name}.tar.gz"; - sha256 = "0sslzrbhpb2js1vn48c11s5p0bic3yqzdnxm054dhc3wq0pwshd1"; + sha256 = "07zqbwsmdgnzqah2smm4zri04c0qm82z1jn8kzz1bnsqbfg84l1v"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix index cd1e5457639b..f453199835f5 100644 --- a/pkgs/tools/misc/pv/default.nix +++ b/pkgs/tools/misc/pv/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "pv-1.6.6"; src = fetchurl { - url = "http://www.ivarch.com/programs/sources/${name}.tar.bz2"; + url = "https://www.ivarch.com/programs/sources/${name}.tar.bz2"; sha256 = "1wbk14xh9rfypiwyy68ssl8dliyji30ly70qki1y2xx3ywszk3k0"; }; diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index dfda07fda4e4..8dcc9ef81ff6 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -9,7 +9,7 @@ assert tkremind -> makeWrapper != null; stdenv.mkDerivation rec { name = "remind-3.1.15"; src = fetchurl { - url = http://www.roaringpenguin.com/files/download/remind-03.01.15.tar.gz; + url = https://www.roaringpenguin.com/files/download/remind-03.01.15.tar.gz; sha256 = "1hcfcxz5fjzl7606prlb7dgls5kr8z3wb51h48s6qm8ang0b9nla"; }; diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix index e9ed5c0450af..b5b5a2cfed8f 100644 --- a/pkgs/tools/misc/rockbox-utility/default.nix +++ b/pkgs/tools/misc/rockbox-utility/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "1.4.0"; src = fetchurl { - url = "http://download.rockbox.org/rbutil/source/RockboxUtility-v${version}-src.tar.bz2"; + url = "https://download.rockbox.org/rbutil/source/RockboxUtility-v${version}-src.tar.bz2"; sha256 = "0k3ycga3b0jnj13whwiip2l0gx32l50pnbh7kfima87nq65aaa5w"; }; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source firmware for mp3 players"; - homepage = http://www.rockbox.org; + homepage = https://www.rockbox.org; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ goibhniu jgeerds ]; diff --git a/pkgs/tools/misc/routino/default.nix b/pkgs/tools/misc/routino/default.nix index ed97601e5191..650ac9f660aa 100644 --- a/pkgs/tools/misc/routino/default.nix +++ b/pkgs/tools/misc/routino/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.2"; src = fetchurl { - url = "http://routino.org/download/${name}.tgz"; + url = "https://routino.org/download/${name}.tgz"; sha256 = "0lkmpi8gn7qf40cx93jcp7nxa9dfwi1d6rjrhcqbdymszzm33972"; }; diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index 671dba0d548b..4d826c97d29c 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "rrdtool-1.7.0"; src = fetchurl { - url = "http://oss.oetiker.ch/rrdtool/pub/${name}.tar.gz"; + url = "https://oss.oetiker.ch/rrdtool/pub/${name}.tar.gz"; sha256 = "0ssjqpa0dwwzbylc0drmlbq922qcw8crffc0rpr805xr6n4k8zgr"; }; diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index a9fefe446fe0..668a3fd5c996 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "2.2.1.1"; src = fetchurl { - url = "http://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz"; + url = "https://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz"; sha256 = "0ca5iiq3n6isj64jb81xpwjzjx1q8jg145nnnn91ra2qqk93kqka"; }; diff --git a/pkgs/tools/misc/t1utils/default.nix b/pkgs/tools/misc/t1utils/default.nix index a256b8e4fdb3..03926b955383 100644 --- a/pkgs/tools/misc/t1utils/default.nix +++ b/pkgs/tools/misc/t1utils/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "t1utils-1.41"; src = fetchurl { - url = "http://www.lcdf.org/type/${name}.tar.gz"; + url = "https://www.lcdf.org/type/${name}.tar.gz"; sha256 = "09rlc837dr69hyiiicha3il37mchsvz84qw8hnvb60lrh9zdsppw"; }; diff --git a/pkgs/tools/misc/testdisk/default.nix b/pkgs/tools/misc/testdisk/default.nix index 80cbf3661da8..14c152236d6b 100644 --- a/pkgs/tools/misc/testdisk/default.nix +++ b/pkgs/tools/misc/testdisk/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "testdisk-7.1"; src = fetchurl { - url = http://www.cgsecurity.org/testdisk-7.0.tar.bz2; + url = https://www.cgsecurity.org/testdisk-7.0.tar.bz2; sha256 = "0ba4wfz2qrf60vwvb1qsq9l6j0pgg81qgf7fh22siaz649mkpfq0"; }; diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index 91eeb6b0a511..39d3ea1c2086 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Advanced Power Management for Linux"; - homepage = http://linrunner.de/en/tlp/docs/tlp-linux-advanced-power-management.html; + homepage = https://linrunner.de/en/tlp/docs/tlp-linux-advanced-power-management.html; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl2Plus; diff --git a/pkgs/tools/misc/unclutter/default.nix b/pkgs/tools/misc/unclutter/default.nix index 84546985f72e..978a3d541ab0 100644 --- a/pkgs/tools/misc/unclutter/default.nix +++ b/pkgs/tools/misc/unclutter/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "unclutter-8"; src = fetchurl { - url = http://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.tar.gz; + url = https://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.tar.gz; sha256 = "33a78949a7dedf2e8669ae7b5b2c72067896497820292c96afaa60bb71d1f2a6"; }; diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix index f66f6c3642e7..23e28c3c286a 100644 --- a/pkgs/tools/misc/units/default.nix +++ b/pkgs/tools/misc/units/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "units-${version}"; - version = "2.16"; + version = "2.17"; src = fetchurl { url = "mirror://gnu/units/${name}.tar.gz"; - sha256 = "11hnp3gcmcc5kci2caxw4hs6m08h2mhqs3xzqq7iafx1ha2ggwyw"; + sha256 = "1n2xzpnxfn475zkd8rzs5gg58xszjbr4bdbgvk6hryzimvwwj0qz"; }; buildInputs = [ readline ]; diff --git a/pkgs/tools/misc/usbmuxd/default.nix b/pkgs/tools/misc/usbmuxd/default.nix index fc8c40ea4e06..2a792669ba8b 100644 --- a/pkgs/tools/misc/usbmuxd/default.nix +++ b/pkgs/tools/misc/usbmuxd/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.1.0"; src = fetchurl { - url = "http://www.libimobiledevice.org/downloads/${name}.tar.bz2"; + url = "https://www.libimobiledevice.org/downloads/${name}.tar.bz2"; sha256 = "0bdlc7a8plvglqqx39qqampqm6y0hcdws76l9dffwl22zss4i29y"; }; diff --git a/pkgs/tools/misc/vorbisgain/default.nix b/pkgs/tools/misc/vorbisgain/default.nix index 1c108af27f88..90b721ad58ae 100644 --- a/pkgs/tools/misc/vorbisgain/default.nix +++ b/pkgs/tools/misc/vorbisgain/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "vorbisgain-0.37"; src = fetchurl { - url = "http://sjeng.org/ftp/vorbis/${name}.tar.gz"; + url = "https://sjeng.org/ftp/vorbis/${name}.tar.gz"; sha256 = "1v1h6mhnckmvvn7345hzi9abn5z282g4lyyl4nnbqwnrr98v0vfx"; }; diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix index 63b6cb66883b..dd3cbb33c1b1 100644 --- a/pkgs/tools/misc/xdaliclock/default.nix +++ b/pkgs/tools/misc/xdaliclock/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.43"; src = fetchurl { - url="http://www.jwz.org/xdaliclock/${name}.tar.gz"; + url="https://www.jwz.org/xdaliclock/${name}.tar.gz"; sha256 = "194zzp1a989k2v8qzfr81gdknr8xiz16d6fdl63jx9r3mj5klmvb"; }; diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix index e6c67ddb9bb8..80a728747fef 100644 --- a/pkgs/tools/misc/xfstests/default.nix +++ b/pkgs/tools/misc/xfstests/default.nix @@ -1,5 +1,6 @@ -{ stdenv, acl, attr, autoconf, automake, bash, bc, coreutils, e2fsprogs, fetchgit, fio, gawk, keyutils -, lib, libaio, libcap, libtool, libuuid, libxfs, lvm2, openssl, perl, procps, psmisc, quota, su +{ stdenv, acl, attr, autoconf, automake, bash, bc, coreutils, e2fsprogs +, fetchgit, fio, gawk, keyutils, killall, lib, libaio, libcap, libtool +, libuuid, libxfs, lvm2, openssl, perl, procps, quota, su , time, utillinux, which, writeScript, xfsprogs }: stdenv.mkDerivation { @@ -90,7 +91,9 @@ stdenv.mkDerivation { ln -s @out@/lib/xfstests/$f $f done - export PATH=${lib.makeBinPath [acl attr bc e2fsprogs fio gawk keyutils libcap lvm2 perl procps psmisc quota utillinux which xfsprogs]}:$PATH + export PATH=${lib.makeBinPath [acl attr bc e2fsprogs fio gawk keyutils + libcap lvm2 perl procps killall quota + utillinux which xfsprogs]}:$PATH exec ./check "$@" ''; diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index e3a5a58671c9..6d99a5c2d1a5 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "aircrack-ng-1.2"; src = fetchurl { - url = "http://download.aircrack-ng.org/${name}.tar.gz"; + url = "https://download.aircrack-ng.org/${name}.tar.gz"; sha256 = "0z7sl1ihgrnc98bpqa1mmkh51w26fnsanvj6ydwcnd8g83azwkvr"; }; diff --git a/pkgs/tools/networking/airfield/node-packages.nix b/pkgs/tools/networking/airfield/node-packages.nix index 657d9284f1b8..13edd48e37d2 100644 --- a/pkgs/tools/networking/airfield/node-packages.nix +++ b/pkgs/tools/networking/airfield/node-packages.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.3. Do not edit! +# This file has been generated by node2nix 1.6.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -49,13 +49,13 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.6.0" = { + "aws4-1.7.0" = { name = "aws4"; packageName = "aws4"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz"; - sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e"; + url = "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz"; + sha512 = "32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w=="; }; }; "bcrypt-pbkdf-1.0.1" = { @@ -67,24 +67,6 @@ let sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; }; }; - "boom-4.3.1" = { - name = "boom"; - packageName = "boom"; - version = "4.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz"; - sha1 = "4f8a3005cb4a7e3889f749030fd25b96e01d2e31"; - }; - }; - "boom-5.2.0" = { - name = "boom"; - packageName = "boom"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz"; - sha512 = "19h20yqpvca08dns1rs4f057f10w63v0snxfml4h5khsk266x3x1im0w72bza4k2xn0kfz6jlv001dhcvxsjr09bmbqnysils9m7437"; - }; - }; "buffer-crc32-0.1.1" = { name = "buffer-crc32"; packageName = "buffer-crc32"; @@ -184,15 +166,6 @@ let sha1 = "f4486b9bf0a12df83c3fca14e31e030fdabd9454"; }; }; - "cryptiles-3.1.2" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz"; - sha1 = "a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"; - }; - }; "dashdash-1.14.1" = { name = "dashdash"; packageName = "dashdash"; @@ -208,7 +181,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; - sha512 = "3g1hqsahr1ks2kpvdxrwzr57fj90nnr0hvwwrw8yyyzcv3i11sym8zwibxx67bl1mln0acddrzpkkdjjxnc6n2cm9fazmgzzsl1fzrr"; + sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; }; }; "delayed-stream-1.0.0" = { @@ -337,24 +310,6 @@ let sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd"; }; }; - "hawk-6.0.2" = { - name = "hawk"; - packageName = "hawk"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz"; - sha512 = "1nl2hjr2mnhj5jlaz8mh54z7acwz5j5idkch04qgjk78756gw5d0fjk4a2immil5ij9ijdssb9ndpryvnh2xpcbgcjv8lxybn330als"; - }; - }; - "hoek-4.2.1" = { - name = "hoek"; - packageName = "hoek"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz"; - sha512 = "1y8kprb3qldxqj31zai5n8dvhydsl9nn5w4rskhnbzzhldn6pm6n5lcyam3sfkb61a62d5m58k8im7z6ngwbd9cw9zp4zm4y7ckrf20"; - }; - }; "http-signature-1.2.0" = { name = "http-signature"; packageName = "http-signature"; @@ -427,13 +382,13 @@ let sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; }; - "lodash-4.17.5" = { + "lodash-4.17.10" = { name = "lodash"; packageName = "lodash"; - version = "4.17.5"; + version = "4.17.10"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz"; - sha512 = "11hikgyas884mz8a58vyixaahxbpdwljdw4cb6qp15xa3sfqikp2mm6wgv41jsl34nzsv1hkx9kw3nwczvas5p73whirmaz4sxggwmj"; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz"; + sha512 = "UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="; }; }; "methods-0.0.1" = { @@ -460,7 +415,7 @@ let version = "1.33.0"; src = fetchurl { url = "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz"; - sha512 = "36xnw59ik9fqym00cmwb5nyzg0l03k70cp413f7639j93wgmzk1mh0xjc7i6zz3r6k9xnwh0g5cm5a1f3y8c6plgy4qld7fm887ywh4"; + sha512 = "BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="; }; }; "mime-types-2.1.18" = { @@ -469,7 +424,7 @@ let version = "2.1.18"; src = fetchurl { url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz"; - sha512 = "22krj1kw7n9z10zdyx7smcaim4bzwqsqzhspwha06q58gcrxfp93hw2cd0vk5crhq5p2dwzqlpacg32lrmp5sjzb798zdzy35mdmkwm"; + sha512 = "lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ=="; }; }; "mkdirp-0.3.3" = { @@ -535,13 +490,13 @@ let sha1 = "9f6bf5d9ac6c76384e95d36d15b48980e5e4add0"; }; }; - "qs-6.5.1" = { + "qs-6.5.2" = { name = "qs"; packageName = "qs"; - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz"; - sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r"; + url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; + sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; }; }; "range-parser-0.0.4" = { @@ -559,7 +514,7 @@ let version = "2.8.0"; src = fetchurl { url = "https://registry.npmjs.org/redis/-/redis-2.8.0.tgz"; - sha512 = "3a3044ax6qdvss83xgjfx10h5q91ls0mwgs3wpsnxcdsiipq3cnmqzsh6glyq0r7vsmpw49jp84c2jnfrhi2bgycrkd9hhhf6ia8lrk"; + sha512 = "M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A=="; }; }; "redis-commands-1.3.5" = { @@ -568,7 +523,7 @@ let version = "1.3.5"; src = fetchurl { url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.5.tgz"; - sha512 = "2q8pai3gf0dczb03jjig3mpaz4j2kvw8icpgf8hp4fryr3d6c0mjkvxxdmlyhainybx4zhgqsw9ghc9p986alzdzd2n2p4cxvr8b0by"; + sha512 = "foGF8u6MXGFF++1TZVC6icGXuMYPftKXt1FBT2vrfU9ZATNtZJ8duRC5d1lEfE8hyVe3jhelHGB91oB7I6qLsA=="; }; }; "redis-parser-2.6.0" = { @@ -580,13 +535,22 @@ let sha1 = "52ed09dacac108f1a631c07e9b69941e7a19504b"; }; }; - "safe-buffer-5.1.1" = { + "safe-buffer-5.1.2" = { name = "safe-buffer"; packageName = "safe-buffer"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"; - sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh"; + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + }; + }; + "safer-buffer-2.1.2" = { + name = "safer-buffer"; + packageName = "safer-buffer"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; "send-0.1.0" = { @@ -598,31 +562,13 @@ let sha1 = "cfb08ebd3cec9b7fc1a37d9ff9e875a971cf4640"; }; }; - "sntp-2.1.0" = { - name = "sntp"; - packageName = "sntp"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz"; - sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l"; - }; - }; - "sshpk-1.14.1" = { + "sshpk-1.14.2" = { name = "sshpk"; packageName = "sshpk"; - version = "1.14.1"; + version = "1.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz"; - sha1 = "130f5975eddad963f1d56f92b9ac6c51fa9f83eb"; - }; - }; - "stringstream-0.0.5" = { - name = "stringstream"; - packageName = "stringstream"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"; - sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz"; + sha1 = "c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"; }; }; "tough-cookie-2.3.4" = { @@ -631,7 +577,7 @@ let version = "2.3.4"; src = fetchurl { url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz"; - sha512 = "0ncm6j3cjq1f26mzjf04k9bkw1b08w53s4qa3a11c1bdj4pgnqv1422c1xs5jyy6y1psppjx52fhagq5zkjkgrcpdkxcdiry96r77jd"; + sha512 = "TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA=="; }; }; "tunnel-agent-0.6.0" = { @@ -652,22 +598,22 @@ let sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; }; - "underscore-1.8.3" = { + "underscore-1.9.1" = { name = "underscore"; packageName = "underscore"; - version = "1.8.3"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"; - sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; + url = "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz"; + sha512 = "5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="; }; }; - "uuid-3.2.1" = { + "uuid-3.3.0" = { name = "uuid"; packageName = "uuid"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz"; - sha512 = "0843vl1c974n8kw5kn0kvhvhwk8y8jydr0xkwwl2963xxmkw4ingk6xj9c8m48jw2i95giglxzq5aw5v5mij9kv7fzln8pxav1cr6cd"; + url = "https://registry.npmjs.org/uuid/-/uuid-3.3.0.tgz"; + sha512 = "ijO9N2xY/YaOqQ5yz5c4sy2ZjWmA6AR6zASb/gdpeKZ8+948CxwfMW9RrKVk5may6ev8c0/Xguu32e2Llelpqw=="; }; }; "verror-1.10.0" = { @@ -726,7 +672,7 @@ in sha1 = "544bfb3bd837608873eed6a72c672a28cb1f1b3f"; }; dependencies = [ - sources."underscore-1.8.3" + sources."underscore-1.9.1" ]; buildInputs = globalBuildInputs; meta = { @@ -757,7 +703,7 @@ in version = "2.8.0"; src = fetchurl { url = "https://registry.npmjs.org/redis/-/redis-2.8.0.tgz"; - sha512 = "3a3044ax6qdvss83xgjfx10h5q91ls0mwgs3wpsnxcdsiipq3cnmqzsh6glyq0r7vsmpw49jp84c2jnfrhi2bgycrkd9hhhf6ia8lrk"; + sha512 = "M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A=="; }; dependencies = [ sources."double-ended-queue-2.1.0-0" @@ -779,7 +725,7 @@ in version = "3.3.3"; src = fetchurl { url = "https://registry.npmjs.org/connect-redis/-/connect-redis-3.3.3.tgz"; - sha512 = "355x879l7vfnzp6m199ghns4sgl5xpx0j6nr2bqimy3xj29i168bsaxi8gwky6cqy4apvb62sp8n67rssdzq667zngf7mm4dddsr5df"; + sha512 = "rpWsW2uk1uOe/ccY/JvW+RiLrhZm7auIx8z4yR+KXemFTIhJyD58jXiJbI0E/fZCnybawpdSqOZ+6/ah6aBeyg=="; }; dependencies = [ sources."debug-3.1.0" @@ -801,13 +747,13 @@ in async = nodeEnv.buildNodePackage { name = "async"; packageName = "async"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.6.0.tgz"; - sha512 = "0zp4b5788400npi1ixjry5x3a4m21c8pnknk8v731rgnwnjbp5ijmfcf5ppmn1ap4a04md1s9dr8n9ygdvrmiai590v0k6dby1wc1y4"; + url = "https://registry.npmjs.org/async/-/async-2.6.1.tgz"; + sha512 = "fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ=="; }; dependencies = [ - sources."lodash-4.17.5" + sources."lodash-4.17.10" ]; buildInputs = globalBuildInputs; meta = { @@ -821,10 +767,10 @@ in request = nodeEnv.buildNodePackage { name = "request"; packageName = "request"; - version = "2.85.0"; + version = "2.87.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.85.0.tgz"; - sha512 = "2d3hg10zs5ycnr8prmiwdhacf88fl0x0bi6szs0z2r07zcbk419laixwpjp8sqapbc2ifyyih7p3r60wgr58bmcncz3pqnx523c8zph"; + url = "https://registry.npmjs.org/request/-/request-2.87.0.tgz"; + sha512 = "fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw=="; }; dependencies = [ sources."ajv-5.5.2" @@ -832,18 +778,12 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.6.0" + sources."aws4-1.7.0" sources."bcrypt-pbkdf-1.0.1" - sources."boom-4.3.1" sources."caseless-0.12.0" sources."co-4.6.0" sources."combined-stream-1.0.6" sources."core-util-is-1.0.2" - (sources."cryptiles-3.1.2" // { - dependencies = [ - sources."boom-5.2.0" - ]; - }) sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.1" @@ -856,8 +796,6 @@ in sources."getpass-0.1.7" sources."har-schema-2.0.0" sources."har-validator-5.0.3" - sources."hawk-6.0.2" - sources."hoek-4.2.1" sources."http-signature-1.2.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" @@ -871,15 +809,14 @@ in sources."oauth-sign-0.8.2" sources."performance-now-2.1.0" sources."punycode-1.4.1" - sources."qs-6.5.1" - sources."safe-buffer-5.1.1" - sources."sntp-2.1.0" - sources."sshpk-1.14.1" - sources."stringstream-0.0.5" + sources."qs-6.5.2" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."sshpk-1.14.2" sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uuid-3.2.1" + sources."uuid-3.3.0" sources."verror-1.10.0" ]; buildInputs = globalBuildInputs; diff --git a/pkgs/tools/networking/airfield/node.nix b/pkgs/tools/networking/airfield/node.nix index 75bc6ec109ce..8f3be4cc8c7f 100644 --- a/pkgs/tools/networking/airfield/node.nix +++ b/pkgs/tools/networking/airfield/node.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.3. Do not edit! +# This file has been generated by node2nix 1.6.0. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix index 128ebc155b56..a06b409ca49b 100644 --- a/pkgs/tools/networking/bwm-ng/default.nix +++ b/pkgs/tools/networking/bwm-ng/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "bwm-ng-${version}"; src = fetchurl { - url = "http://www.gropp.org/bwm-ng/${name}.tar.gz"; + url = "https://www.gropp.org/bwm-ng/${name}.tar.gz"; sha256 = "1w0dwpjjm9pqi613i8glxrgca3rdyqyp3xydzagzr5ndc34z6z02"; }; diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index 1299c5eea5f3..27f5ca2c7dd1 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "3.3"; src = fetchurl { - url = "http://download.tuxfamily.org/chrony/${name}.tar.gz"; + url = "https://download.tuxfamily.org/chrony/${name}.tar.gz"; sha256 = "0a1ilzr88xhzx1ql3xhn36a4rvl79hvp0dvgm3az4cjhhzav47qd"; }; diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index 1ebf57997d00..6c7f335891f5 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "4.4.1"; src = fetchurl { - url = "http://ftp.isc.org/isc/dhcp/${version}/${name}.tar.gz"; + url = "https://ftp.isc.org/isc/dhcp/${version}/${name}.tar.gz"; sha256 = "025nfqx4zwdgv4b3rkw26ihcj312vir08jk6yi57ndmb4a4m08ia"; }; diff --git a/pkgs/tools/networking/dhcping/default.nix b/pkgs/tools/networking/dhcping/default.nix index 2599e822529f..d557c0ab9adb 100644 --- a/pkgs/tools/networking/dhcping/default.nix +++ b/pkgs/tools/networking/dhcping/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { sha256 = "0sk4sg3hn88n44dxikipf3ggfj3ixrp22asb7nry9p0bkfaqdvrj"; - url = "http://www.mavetju.org/download/dhcping-${version}.tar.gz"; + url = "https://www.mavetju.org/download/dhcping-${version}.tar.gz"; }; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/dnstracer/default.nix b/pkgs/tools/networking/dnstracer/default.nix index 65e5c9cd126b..5e2b27c6516c 100644 --- a/pkgs/tools/networking/dnstracer/default.nix +++ b/pkgs/tools/networking/dnstracer/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "dnstracer-${version}"; src = fetchurl { - url = "http://www.mavetju.org/download/${name}.tar.gz"; + url = "https://www.mavetju.org/download/${name}.tar.gz"; sha256 = "177y58smnq2xhx9lbmj1gria371iv3r1d132l2gjvflkjsphig1f"; }; diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index b7ef3b8fa75b..be2e43a8947a 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dropbear-2018.76"; src = fetchurl { - url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2"; + url = "https://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2"; sha256 = "0rgavbzw7jrs5wslxm0dnwx2m409yzxd9hazd92r7kx8xikr3yzj"; }; diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix index b76b32ec4c8a..2b19c8e6a057 100644 --- a/pkgs/tools/networking/fping/default.nix +++ b/pkgs/tools/networking/fping/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "fping-4.0"; src = fetchurl { - url = "http://www.fping.org/dist/${name}.tar.gz"; + url = "https://www.fping.org/dist/${name}.tar.gz"; sha256 = "1kp81wchi79l8z8rrj602fpjrd8bi84y3i7fsaclzlwap5943sv7"; }; diff --git a/pkgs/tools/networking/gftp/default.nix b/pkgs/tools/networking/gftp/default.nix index 312906f95100..d8d4353f7820 100644 --- a/pkgs/tools/networking/gftp/default.nix +++ b/pkgs/tools/networking/gftp/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gftp-2.0.19"; src = fetchurl { - url = http://www.gftp.org/gftp-2.0.19.tar.bz2; + url = https://www.gftp.org/gftp-2.0.19.tar.bz2; sha256 = "1z8b26n23k0sjbxgrix646b06cnpndpq7cbcj0ilsvvdx5ms81jk"; }; diff --git a/pkgs/tools/networking/gvpe/default.nix b/pkgs/tools/networking/gvpe/default.nix index 2317a4e2216c..07676cb18712 100644 --- a/pkgs/tools/networking/gvpe/default.nix +++ b/pkgs/tools/networking/gvpe/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.0"; src = fetchurl { - url = "http://ftp.gnu.org/gnu/gvpe/gvpe-${version}.tar.gz"; + url = "https://ftp.gnu.org/gnu/gvpe/gvpe-${version}.tar.gz"; sha256 = "1v61mj25iyd91z0ir7cmradkkcm1ffbk52c96v293ibsvjs2s2hf"; }; diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index dad00cfd9ee1..c7d7b5ec6dfd 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "i2pd"; - version = "2.18.0"; + version = "2.19.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "019psm86n4k7nzxhw7cnbw144gqni59sf35wiy58a6x6dabmvq8h"; + sha256 = "1676dqa4j7vd18fyxgl65yp3ip6aivchicy6qj8rwp3dilqkiv10"; }; buildInputs = with stdenv.lib; [ boost zlib openssl ] diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/tools/networking/iodine/default.nix index 69f27ff37c23..5aa0c01e8485 100644 --- a/pkgs/tools/networking/iodine/default.nix +++ b/pkgs/tools/networking/iodine/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "iodine-0.7.0"; src = fetchurl { - url = "http://code.kryo.se/iodine/${name}.tar.gz"; + url = "https://code.kryo.se/iodine/${name}.tar.gz"; sha256 = "0gh17kcxxi37k65zm4gqsvbk3aw7yphcs3c02pn1c4s2y6n40axd"; }; diff --git a/pkgs/tools/networking/ip2location/default.nix b/pkgs/tools/networking/ip2location/default.nix index 0506c8580296..00a3f7f3b6b0 100644 --- a/pkgs/tools/networking/ip2location/default.nix +++ b/pkgs/tools/networking/ip2location/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { sha256 = "05zbc02z7vm19byafi05i1rnkxc6yrfkhnm30ly68zzyipkmzx1l"; - url = "http://www.ip2location.com/downloads/ip2location-${version}.tar.gz"; + url = "https://www.ip2location.com/downloads/ip2location-${version}.tar.gz"; }; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/iperf/2.nix b/pkgs/tools/networking/iperf/2.nix index 33e9841eb058..6d26cf591bae 100644 --- a/pkgs/tools/networking/iperf/2.nix +++ b/pkgs/tools/networking/iperf/2.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "iperf-2.0.11"; + name = "iperf-2.0.12"; src = fetchurl { url = "mirror://sourceforge/iperf2/files/${name}.tar.gz"; - sha256 = "1lm5inayc8fkqncj55fvzl9611rkmkj212lknmby7c3bgk851mmp"; + sha256 = "0ii6sgp62x9ly2gyk00w58dy9qwcw2kvhhcfa7v16jr6n4gnazrn"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix index ece7ea3c95e2..ed6ca57f3da8 100644 --- a/pkgs/tools/networking/iperf/3.nix +++ b/pkgs/tools/networking/iperf/3.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "iperf-3.5"; src = fetchurl { - url = "http://downloads.es.net/pub/iperf/${name}.tar.gz"; + url = "https://downloads.es.net/pub/iperf/${name}.tar.gz"; sha256 = "1m9cyycv70s8nlbgr1lqwr155ixk17np0nzqgwaw3f51vkndk6sk"; }; diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index 36eced808569..86d162648238 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { urls = [ "https://lftp.tech/ftp/${name}.tar.xz" "https://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/${name}.tar.xz" - "http://lftp.yar.ru/ftp/${name}.tar.xz" + "https://lftp.yar.ru/ftp/${name}.tar.xz" ]; sha256 = "12y77jlfs4x4zvcah92mw2h2sb4j0bvbaxkh3wwsm8gs392ywyny"; }; diff --git a/pkgs/tools/networking/miredo/default.nix b/pkgs/tools/networking/miredo/default.nix index a1a2b79b86a4..babfcf1db216 100644 --- a/pkgs/tools/networking/miredo/default.nix +++ b/pkgs/tools/networking/miredo/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { buildInputs = [ judy ]; src = fetchurl { - url = "http://www.remlab.net/files/miredo/miredo-${version}.tar.xz"; + url = "https://www.remlab.net/files/miredo/miredo-${version}.tar.xz"; sha256 = "0j9ilig570snbmj48230hf7ms8kvcwi2wblycqrmhh85lksd49ps"; }; diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix index e9af9dc980e7..8612808687e8 100644 --- a/pkgs/tools/networking/modem-manager/default.nix +++ b/pkgs/tools/networking/modem-manager/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "1.7.990"; src = fetchurl { - url = "http://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz"; + url = "https://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz"; sha256 = "1v4hixmghlrw7w4ajq2x4k62js0594h223d0yma365zwqr7hjrfl"; }; diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index bbd003a6256c..6b6d99e745e1 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,15 +1,13 @@ { stdenv, fetchurl, pkgconfig, glib }: stdenv.mkDerivation rec { - name = "nbd-3.14"; + name = "nbd-3.17"; src = fetchurl { url = "mirror://sourceforge/nbd/${name}.tar.xz"; - sha256 = "0cc6wznvkgjv0fxsj3diy92qfsjrsw92m7yq13f044qarh726gad"; + sha256 = "12fil2hb3gkxslr3nl9kak93n4iyhfs3zdwrmx9vjcxblfqnnp6r"; }; - patches = [ ./dont-run-make-in-broken-systemd-subdir.patch ]; - buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.linuxHeaders; diff --git a/pkgs/tools/networking/nbd/dont-run-make-in-broken-systemd-subdir.patch b/pkgs/tools/networking/nbd/dont-run-make-in-broken-systemd-subdir.patch deleted file mode 100644 index ad0a7a6f66de..000000000000 --- a/pkgs/tools/networking/nbd/dont-run-make-in-broken-systemd-subdir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ubr nbd-3.14-orig/Makefile.in nbd-3.14-new/Makefile.in ---- nbd-3.14-orig/Makefile.in 2016-09-19 15:37:30.904176475 +0200 -+++ nbd-3.14-new/Makefile.in 2016-09-19 15:39:43.813543062 +0200 -@@ -403,7 +403,7 @@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = . man doc tests systemd gznbd -+SUBDIRS = . man doc tests gznbd - sbin_PROGRAMS = @NBD_CLIENT_NAME@ - noinst_LTLIBRARIES = libnbdsrv.la libcliserv.la - libcliserv_la_SOURCES = cliserv.h cliserv.c diff --git a/pkgs/tools/networking/ndisc6/default.nix b/pkgs/tools/networking/ndisc6/default.nix index 56cdbd178250..619cdac92668 100644 --- a/pkgs/tools/networking/ndisc6/default.nix +++ b/pkgs/tools/networking/ndisc6/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "ndisc6-1.0.3"; src = fetchurl { - url = "http://www.remlab.net/files/ndisc6/archive/${name}.tar.bz2"; + url = "https://www.remlab.net/files/ndisc6/archive/${name}.tar.bz2"; sha256 = "08f8xrsck2ykszp12yxx4ssf6wnkn7l6m59456hw3vgjyp5dch8g"; }; diff --git a/pkgs/tools/networking/netkit/tftp/default.nix b/pkgs/tools/networking/netkit/tftp/default.nix index d84f87ed1ba7..de53cfdd224c 100644 --- a/pkgs/tools/networking/netkit/tftp/default.nix +++ b/pkgs/tools/networking/netkit/tftp/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { urls = [ "mirror://ubuntu/pool/universe/n/netkit-tftp/netkit-tftp_0.17.orig.tar.gz" "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${name}.tar.gz" - "http://ftp.cc.uoc.gr/mirrors/linux/ubuntu/packages/pool/universe/n/netkit-tftp/netkit-tftp_0.17.orig.tar.gz" + "https://ftp.cc.uoc.gr/mirrors/linux/ubuntu/packages/pool/universe/n/netkit-tftp/netkit-tftp_0.17.orig.tar.gz" ]; sha256 = "0kfibbjmy85r3k92cdchha78nzb6silkgn1zaq9g8qaf1l0w0hrs"; }; diff --git a/pkgs/tools/networking/netrw/default.nix b/pkgs/tools/networking/netrw/default.nix index bd5190767d1f..d10125e09a65 100644 --- a/pkgs/tools/networking/netrw/default.nix +++ b/pkgs/tools/networking/netrw/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ - "http://mamuti.net/files/netrw/netrw-${version}.tar.bz2" + "https://mamuti.net/files/netrw/netrw-${version}.tar.bz2" "http://www.sourcefiles.org/Networking/FTP/Other/netrw-${version}.tar.bz2" ]; sha256 = "1gnl80i5zkyj2lpnb4g0q0r5npba1x6cnafl2jb3i3pzlfz1bndr"; diff --git a/pkgs/tools/networking/noip/default.nix b/pkgs/tools/networking/noip/default.nix index 3e4d2d6e9207..c63d7ac057b1 100644 --- a/pkgs/tools/networking/noip/default.nix +++ b/pkgs/tools/networking/noip/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "noip-2.1.9-1"; src = fetchurl { - url = http://www.noip.com/client/linux/noip-duc-linux.tar.gz; + url = https://www.noip.com/client/linux/noip-duc-linux.tar.gz; sha256 = "82b9bafab96a0c53b21aaef688bf70b3572e26217b5e2072bdb09da3c4a6f593"; }; diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index 1178f5f0107e..6e566d3c4739 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { name = "ntp-4.2.8p11"; src = fetchurl { - url = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz"; + url = "https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz"; sha256 = "13i7rp1va29ffjdk08fvsfl6n47zzwsp147zhgb550k8agvkjjpi"; }; diff --git a/pkgs/tools/networking/nylon/default.nix b/pkgs/tools/networking/nylon/default.nix index 4775d42d7a9e..bc026d6835b8 100644 --- a/pkgs/tools/networking/nylon/default.nix +++ b/pkgs/tools/networking/nylon/default.nix @@ -9,7 +9,7 @@ in stdenv.mkDerivation { name = "nylon-1.21"; src = fetchurl { - url = http://monkey.org/~marius/nylon/nylon-1.21.tar.gz; + url = https://monkey.org/~marius/nylon/nylon-1.21.tar.gz; sha256 = "34c132b005c025c1a5079aae9210855c80f50dc51dde719298e1113ad73408a4"; }; diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/pkgs/tools/networking/rp-pppoe/default.nix index 4651dab7e67e..b2584a4f4974 100644 --- a/pkgs/tools/networking/rp-pppoe/default.nix +++ b/pkgs/tools/networking/rp-pppoe/default.nix @@ -5,7 +5,7 @@ in stdenv.mkDerivation rec { name = "rp-pppoe-" + version; src = fetchurl { - url = "http://www.roaringpenguin.com/files/download/rp-pppoe-${version}.tar.gz"; + url = "https://www.roaringpenguin.com/files/download/rp-pppoe-${version}.tar.gz"; sha256 = "1hl6rjvplapgsyrap8xj46kc9kqwdlm6ya6gp3lv0ihm0c24wy80"; }; diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix new file mode 100644 index 000000000000..eb2fe70cf4ba --- /dev/null +++ b/pkgs/tools/networking/shadowfox/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + name = "shadowfox-${version}"; + version = "1.5.2"; + + src = fetchFromGitHub { + owner = "SrKomodo"; + repo = "shadowfox-updater"; + rev = "v${version}"; + sha256 = "07695hba72q722d18q75pwa45azg9jibj6vqnhwb7mnwz2i7hkkc"; + }; + + goPackagePath = "github.com/SrKomodo/shadowfox-updater"; + goDeps = ./deps.nix; + + buildFlags = "--tags release"; + + meta = with stdenv.lib; { + description = '' + This project aims at creating a universal dark theme for Firefox while + adhering to the modern design principles set by Mozilla. + ''; + homepage = "https://overdodactyl.github.io/ShadowFox/"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ infinisil ]; + }; +} diff --git a/pkgs/tools/networking/shadowfox/deps.nix b/pkgs/tools/networking/shadowfox/deps.nix new file mode 100644 index 000000000000..f3a824af686e --- /dev/null +++ b/pkgs/tools/networking/shadowfox/deps.nix @@ -0,0 +1,75 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/gdamore/encoding"; + fetch = { + type = "git"; + url = "https://github.com/gdamore/encoding"; + rev = "b23993cbb6353f0e6aa98d0ee318a34728f628b9"; + sha256 = "0d7irqpx2fa9vkxgkhf04yiwazsm10fxh0yk86x5crflhph5fv8a"; + }; + } + { + goPackagePath = "github.com/gdamore/tcell"; + fetch = { + type = "git"; + url = "https://github.com/gdamore/tcell"; + rev = "b3cebc399d6f98536af845ed8a5144ab586f6759"; + sha256 = "1kbf08msh4bjbdwnj1cjmddl5jfiarswfim3q085x77bcb43l0qa"; + }; + } + { + goPackagePath = "github.com/go-ini/ini"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "cec2bdc49009247305a260b082a18e802d0fe292"; + sha256 = "0d4ab6v83w5ya4rnnaymasmza4p2jl0lqf4xcgsmsk6lnnrwm5s8"; + }; + } + { + goPackagePath = "github.com/lucasb-eyer/go-colorful"; + fetch = { + type = "git"; + url = "https://github.com/lucasb-eyer/go-colorful"; + rev = "d9cec903b20cbeda6062366e460c2c1bdc717e4d"; + sha256 = "1j8nxi71v0qplfx6alfdx8rm2dxrcfk2k27gjrh2aksa322cmryb"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb"; + sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "3864e76763d94a6df2f9960b16a20a33da9f9a66"; + sha256 = "1n8vya16l60i5jms43yb8fzdgwvqa2q926p5wkg3lbrk8pxy1nv0"; + }; + } + { + goPackagePath = "github.com/rivo/tview"; + fetch = { + type = "git"; + url = "https://github.com/rivo/tview"; + rev = "306abd9cb98c97417ab6c58aa0400b2e5daac88b"; + sha256 = "00q8hymxa36a178hbzylsw3ald6a7gyg8adnki3flyv1jg3dnahx"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "5cec4b58c438bd98288aeb248bab2c1840713d21"; + sha256 = "19iyz2nppicvwap5lv796sbzd82glk2jn4yn5w6z6zymwnykfzds"; + }; + } +] diff --git a/pkgs/tools/networking/skydive/default.nix b/pkgs/tools/networking/skydive/default.nix new file mode 100644 index 000000000000..ce2a8cf6a7f3 --- /dev/null +++ b/pkgs/tools/networking/skydive/default.nix @@ -0,0 +1,45 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub, perl +, go-bindata, libxml2, protobuf3_1, libpcap, pkgconfig, go-protobuf }: + +buildGoPackage rec { + name = "skydive-${version}"; + version = "0.17.0"; + goPackagePath = "github.com/skydive-project/skydive"; + + src = fetchFromGitHub { + owner = "skydive-project"; + repo = "skydive"; + rev = "v${version}"; + sha256 = "03y26imiib2v9icrgwlamzsrx3ph6vn582051vdk1x9ar80xp4dv"; + }; + + patchPhase = '' + substituteInPlace Makefile \ + --replace ".proto: builddep" ".proto: " \ + --replace ".bindata: builddep" ".bindata: " + ''; + + buildInputs = [ perl go-bindata go-protobuf libxml2 protobuf3_1 libpcap pkgconfig ]; + goDeps = ./deps.nix; + + preBuild = '' + make -C go/src/github.com/skydive-project/skydive genlocalfiles VERSION=${version} + ''; + + preInstall = '' + mkdir -p $out/share/skydive + cp go/src/github.com/skydive-project/skydive/etc/skydive.yml.default $out/share/skydive/ + ''; + + postInstall = '' + rm $bin/bin/snort + ''; + + meta = { + homepage = http://skydive.network; + description = "A real-time network analyzer"; + license = lib.licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = [ lib.maintainers.lewo ]; + }; +} diff --git a/pkgs/tools/networking/skydive/deps.nix b/pkgs/tools/networking/skydive/deps.nix new file mode 100644 index 000000000000..c573a7231bb6 --- /dev/null +++ b/pkgs/tools/networking/skydive/deps.nix @@ -0,0 +1,1335 @@ +# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev +[ + { + goPackagePath = "github.com/Microsoft/go-winio"; + fetch = { + type = "git"; + url = "https://github.com/Microsoft/go-winio"; + rev = "fff283ad5116362ca252298cfc9b95828956d85d"; + sha256 = "0kfd6477rndcdl5c4dg9k64kxxp2667qqlbp4ccl7xk4qg9jckg9"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/purell"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/purell"; + rev = "fd18e053af8a4ff11039269006e8037ff374ce0e"; + sha256 = "1v62jhcq1zvnsj83z3dyqr7msndnp85rlm53l6iq78yryd54i115"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/urlesc"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/urlesc"; + rev = "de5bf2ad457846296e2031421a34e2568e304e35"; + sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw"; + }; + } + { + goPackagePath = "github.com/Sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/Sirupsen/logrus"; + rev = "4b6ea7319e214d98c938f12692336f7ca9348d6b"; + sha256 = "06wnl1dkkib2zpm31aavk5c4290s64h2ss68nl1vgcbxzsfbxjaq"; + }; + } + { + goPackagePath = "github.com/StackExchange/wmi"; + fetch = { + type = "git"; + url = "https://github.com/StackExchange/wmi"; + rev = "5d049714c4a64225c3c79a7cf7d02f7fb5b96338"; + sha256 = "1slw6v1fl8i0hz4db9lph55pbhnrxhqyndq6vm27dgvpj22k29fk"; + }; + } + { + goPackagePath = "github.com/abbot/go-http-auth"; + fetch = { + type = "git"; + url = "https://github.com/abbot/go-http-auth"; + rev = "ca62df34b58d26b6a064246c21c0a18f97813173"; + sha256 = "169i8549ai9ljjpvfgqjx4azclps7zjvislfszw5fndkw0qx7v1n"; + }; + } + { + goPackagePath = "github.com/araddon/gou"; + fetch = { + type = "git"; + url = "https://github.com/araddon/gou"; + rev = "0c2ab7394d785afff14c983fedce4be70ccc431f"; + sha256 = "0pppl3hm6r7mf7nnncjsfjfb8l020chzzl6n3c9g3qi02fkp3b1d"; + }; + } + { + goPackagePath = "github.com/armon/consul-api"; + fetch = { + type = "git"; + url = "https://github.com/armon/consul-api"; + rev = "dcfedd50ed5334f96adee43fc88518a4f095e15c"; + sha256 = "1k3yl34j4d8y6xxqdm70pjrbdcnp11dbf8i1mp60480xg0cwpb6d"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + } + { + goPackagePath = "github.com/bitly/go-hostpool"; + fetch = { + type = "git"; + url = "https://github.com/bitly/go-hostpool"; + rev = "d0e59c22a56e8dadfed24f74f452cea5a52722d2"; + sha256 = "14ph12krn5zlg00vh9g6g08lkfjxnpw46nzadrfb718yl1hgyk3g"; + }; + } + { + goPackagePath = "github.com/c-bata/go-prompt"; + fetch = { + type = "git"; + url = "https://github.com/c-bata/go-prompt"; + rev = "e99fbc797b795e0a7a94affc8d44f6a0350d85f0"; + sha256 = "00i8wfi51hzla59qgkdlijnvad4h1p1si9jaaw3jzchm7g7ryrlj"; + }; + } + { + goPackagePath = "github.com/cenk/hub"; + fetch = { + type = "git"; + url = "https://github.com/cenk/hub"; + rev = "11382a9960d39b0ecda16fd01c424c11ff765a34"; + sha256 = "02f0l563niy2i5zq5cq7mqab775zzywp062pl0r12ny3gs0l8ssm"; + }; + } + { + goPackagePath = "github.com/cenk/rpc2"; + fetch = { + type = "git"; + url = "https://github.com/cenk/rpc2"; + rev = "7ab76d2e88c77ca1a715756036d8264b2886acd2"; + sha256 = "1yazkf6g370zy13fxnwjvn1n37zf7m7mcfws0jrrjflfw49fbpv8"; + }; + } + { + goPackagePath = "github.com/cnf/structhash"; + fetch = { + type = "git"; + url = "https://github.com/cnf/structhash"; + rev = "7710f1f78fb9c581deeeab57ecfb7978901b36bc"; + sha256 = "07dlpnwmqdmhj9s7w558lc0wnzvngz3i7d42a5y9rfg9k079l3fp"; + }; + } + { + goPackagePath = "github.com/cockroachdb/cmux"; + fetch = { + type = "git"; + url = "https://github.com/cockroachdb/cmux"; + rev = "30d10be492927e2dcae0089c374c455d42414fcb"; + sha256 = "0ixif6hwcm2dpi1si5ah49dmdyy5chillz1048jpvjzwzxyfv1nx"; + }; + } + { + goPackagePath = "github.com/coreos/bbolt"; + fetch = { + type = "git"; + url = "https://github.com/coreos/bbolt"; + rev = "32c383e75ce054674c53b5a07e55de85332aee14"; + sha256 = "0qa4434g081ksil9g479v9yk3ylhl48c9k95zki5kjq49cb0c589"; + }; + } + { + goPackagePath = "github.com/coreos/etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/etcd"; + rev = "b5abfe1858ddde05b83b96a810dc2b50cc5fcd94"; + sha256 = "0lkhc45irh2pvlnqs60s06q74q5mlym9wl8h7rk8kk4zcfxqaa8i"; + }; + } + { + goPackagePath = "github.com/coreos/go-semver"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-semver"; + rev = "8ab6407b697782a06568d4b7f1db25550ec2e4c6"; + sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; + }; + } + { + goPackagePath = "github.com/coreos/go-systemd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-systemd"; + rev = "7b2428fec40033549c68f54e26e89e7ca9a9ce31"; + sha256 = "0kfbxvm9zsjgvgmiq2jl807y4s5z0rya65rm399llr5rr7vz1lxd"; + }; + } + { + goPackagePath = "github.com/coreos/pkg"; + fetch = { + type = "git"; + url = "https://github.com/coreos/pkg"; + rev = "66fe44ad037ccb80329115cb4db0dbe8e9beb03a"; + sha256 = "1pxcwx0c6aazqdypcjvibam6zw88v1gsfhnsn5bscy33yzqmjrd4"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "346938d642f2ec3594ed81d874461961cd0faa76"; + sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; + }; + } + { + goPackagePath = "github.com/dgrijalva/jwt-go"; + fetch = { + type = "git"; + url = "https://github.com/dgrijalva/jwt-go"; + rev = "d2709f9f1f31ebcda9651b03077758c1f3a0018c"; + sha256 = "02zhyimshzfzp3by2lggm2z382j4pvbrbcxx9p1wqmmmwy5yz182"; + }; + } + { + goPackagePath = "github.com/docker/distribution"; + fetch = { + type = "git"; + url = "https://github.com/docker/distribution"; + rev = "325b0804fef3a66309d962357aac3c2ce3f4d329"; + sha256 = "1yg2zrikn3vkvkx5mn51p6bfjk840qdkn7ahhhvvcsc8mpigrjc6"; + }; + } + { + goPackagePath = "github.com/docker/docker"; + fetch = { + type = "git"; + url = "https://github.com/docker/docker"; + rev = "c6d412e329c85f32a4b2269b49aaa0794affcf88"; + sha256 = "1h3hkg15c3isfgaqpkp3mr7ys5826cz24hn3f3wz07jmismq98q7"; + }; + } + { + goPackagePath = "github.com/docker/go-connections"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-connections"; + rev = "990a1a1a70b0da4c4cb70e117971a4f0babfbf1a"; + sha256 = "16lcf485a7gl0kzkc5n0qq9frjkfinxhcr3j4874qqkr8ghghwbb"; + }; + } + { + goPackagePath = "github.com/docker/go-units"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-units"; + rev = "5d2041e26a699eaca682e2ea41c8f891e1060444"; + sha256 = "0hn8xdbaykp046inc4d2mwig5ir89ighma8hk18dfkm8rh1vvr8i"; + }; + } + { + goPackagePath = "github.com/emicklei/go-restful"; + fetch = { + type = "git"; + url = "https://github.com/emicklei/go-restful"; + rev = "68c9750c36bb8cb433f1b88c807b4b30df4acc40"; + sha256 = "0bc0wd5nipz1x078vpq82acyc7ip0qv1sddl451d7f7bvfms6h67"; + }; + } + { + goPackagePath = "github.com/emicklei/go-restful-swagger12"; + fetch = { + type = "git"; + url = "https://github.com/emicklei/go-restful-swagger12"; + rev = "7524189396c68dc4b04d53852f9edc00f816b123"; + sha256 = "1rqmrxpx55kin0059k7svmcbqx2jgybc200cjdc9ysaif3rhkd73"; + }; + } + { + goPackagePath = "github.com/fatih/structs"; + fetch = { + type = "git"; + url = "https://github.com/fatih/structs"; + rev = "f5faa72e73092639913f5833b75e1ac1d6bc7a63"; + sha256 = "1kdwvygp2g9jc9ygkr7snmk6zk6wmy7xywrf1p6q6iiwwil4xghz"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "30411dbcefb7a1da7e84f75530ad3abe4011b4f8"; + sha256 = "0kbpvyi6p9942k0vmcw5z13mja47f7hq7nqd332pn2zydss6kddm"; + }; + } + { + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7"; + sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; + }; + } + { + goPackagePath = "github.com/gima/govalid"; + fetch = { + type = "git"; + url = "https://github.com/gima/govalid"; + rev = "7b486932bea218beb6e85f7ed28650d283dd6ce6"; + sha256 = "1w3gbfjl283qdfk3xj9mavhwx5wyh1v4w26d85plcdx4kcjmn6hy"; + }; + } + { + goPackagePath = "github.com/go-ole/go-ole"; + fetch = { + type = "git"; + url = "https://github.com/go-ole/go-ole"; + rev = "a41e3c4b706f6ae8dfbff342b06e40fa4d2d0506"; + sha256 = "114h8x7dh4jp7w7k678fm98lr9icavsf74v6jfipyq7q35bsfr1p"; + }; + } + { + goPackagePath = "github.com/go-openapi/jsonpointer"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/jsonpointer"; + rev = "779f45308c19820f1a69e9a4cd965f496e0da10f"; + sha256 = "10vv0xsabkvv81xpqqq95fvxnlpf07x9zwzl41g8x2lx05ibxsnc"; + }; + } + { + goPackagePath = "github.com/go-openapi/jsonreference"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/jsonreference"; + rev = "36d33bfe519efae5632669801b180bf1a245da3b"; + sha256 = "0d163wv3mj9cbhdqc9jqzw2kwi961lg4p30d8gcd6ddz0q752ykh"; + }; + } + { + goPackagePath = "github.com/go-openapi/spec"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/spec"; + rev = "7abd5745472fff5eb3685386d5fb8bf38683154d"; + sha256 = "1z9hwfzxgwr59r1syy0s4hgybs27q87n9mm1bbxl0yl5yvzw67rl"; + }; + } + { + goPackagePath = "github.com/go-openapi/swag"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/swag"; + rev = "f3f9494671f93fcff853e3c6e9e948b3eb71e590"; + sha256 = "13lqn4xqy9vma9aqsjb0fzfzi0q8l6dmg65sjxqdxf3q6gzkvmjy"; + }; + } + { + goPackagePath = "github.com/gobwas/httphead"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/httphead"; + rev = "01c9b01b368a438f615030bbbd5e4f9e0023e15c"; + sha256 = "0g1fig36plp3668wc3hm6w4sb7ki0ss24c311a59jpdgy9awfp56"; + }; + } + { + goPackagePath = "github.com/gobwas/pool"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/pool"; + rev = "32dbaa12caca20fad12253c30591227e04f62cdd"; + sha256 = "0iqqfi7zf6jrx1857xxk17hy4j1ln90j5w4jzyxd5x72v5jnmhxm"; + }; + } + { + goPackagePath = "github.com/gobwas/ws"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/ws"; + rev = "915eed3240022c5265584c55032ef1b8c8f84168"; + sha256 = "10r08qrssbmqkxhh26h1s7vvf1lpp7j5b5a4rn0cbr38gv4zwmx9"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "2adc21fd136931e0388e278825291678e1d98309"; + sha256 = "0z6lxahhq3d16w4ff3swrggly08yavzrjsjmmchfq7wcxxdrc9s6"; + }; + } + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "925541529c1fa6821df4e44ce2723319eb2be768"; + sha256 = "1d3zjvhl115l23xakj0014qpjchivlg098h10v5nfirkk1i9f9sa"; + }; + } + { + goPackagePath = "github.com/google/btree"; + fetch = { + type = "git"; + url = "https://github.com/google/btree"; + rev = "cc6329d4279e3f025a53a83c397d2339b5705c45"; + sha256 = "1aqvcqr0c7z3sgj272n5f9g8g6cy4361697a0f240amqdvj0ax9v"; + }; + } + { + goPackagePath = "github.com/google/gofuzz"; + fetch = { + type = "git"; + url = "https://github.com/google/gofuzz"; + rev = "24818f796faf91cd76ec7bddd72458fbced7a6c1"; + sha256 = "0cq90m2lgalrdfrwwyycrrmn785rgnxa3l3vp9yxkvnv88bymmlm"; + }; + } + { + goPackagePath = "github.com/google/gopacket"; + fetch = { + type = "git"; + url = "https://github.com/google/gopacket"; + rev = "67a21c4470a0598531a769727aef40b870ffa128"; + sha256 = "1clxrcabrdrkrgwbal852w3cynvzdwbpl4gc0f5yyzncmaazxmhq"; + }; + } + { + goPackagePath = "github.com/googleapis/gnostic"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/gnostic"; + rev = "41d03372f44f2bc18a72c97615a669fb60e7452a"; + sha256 = "04l6384y7riya4wrc7s7ry7c8dil4sdyks1psqavw85bgy9q1iql"; + }; + } + { + goPackagePath = "github.com/gophercloud/gophercloud"; + fetch = { + type = "git"; + url = "https://github.com/gophercloud/gophercloud"; + rev = "849a2e71dd64dbfa2bd4be110ace68881802414b"; + sha256 = "12xn9gph7hg6sfyqd5z9advsx1s776pm5ji9qnarnq1781k7gzh2"; + }; + } + { + goPackagePath = "github.com/gorilla/context"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/context"; + rev = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42"; + sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"; + }; + } + { + goPackagePath = "github.com/gorilla/handlers"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/handlers"; + rev = "90663712d74cb411cbef281bc1e08c19d1a76145"; + sha256 = "03h5ygjcwama9kr9k7nbg0spv5c7hdlw2ydaclj969i820aq3dpz"; + }; + } + { + goPackagePath = "github.com/gorilla/mux"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/mux"; + rev = "5ab525f4fb1678e197ae59401e9050fa0b6cb5fd"; + sha256 = "0d8rbiz2ykn43knf75arnm545jfxgw0zf5yx8ncjmfm9iimzj20i"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "cdedf21e585dae942951e34d6defc3215b4280fa"; + sha256 = "1kb7phyvvyl67pdsnd80sgpq3a6gv8lkr8ylppb1i6xwi25yppiv"; + }; + } + { + goPackagePath = "github.com/gosuri/uitable"; + fetch = { + type = "git"; + url = "https://github.com/gosuri/uitable"; + rev = "36ee7e946282a3fb1cfecd476ddc9b35d8847e42"; + sha256 = "1ff68fv9g1df91fwbrcq83ar429gb4fi2vsd22zjmhvmbqx2zkil"; + }; + } + { + goPackagePath = "github.com/gregjones/httpcache"; + fetch = { + type = "git"; + url = "https://github.com/gregjones/httpcache"; + rev = "2bcd89a1743fd4b373f7370ce8ddc14dfbd18229"; + sha256 = "1qx04bqbd4cwkakzq8ahz1jq6pq8435h5zcapwn8k8a0f1bgfrnz"; + }; + } + { + goPackagePath = "github.com/grpc-ecosystem/go-grpc-prometheus"; + fetch = { + type = "git"; + url = "https://github.com/grpc-ecosystem/go-grpc-prometheus"; + rev = "6b7015e65d366bf3f19b2b2a000a831940f0f7e0"; + sha256 = "039l2c5jsqrhm0g9bngrd3kry89kkai9v97kbd4mayqb619jcdxs"; + }; + } + { + goPackagePath = "github.com/grpc-ecosystem/grpc-gateway"; + fetch = { + type = "git"; + url = "https://github.com/grpc-ecosystem/grpc-gateway"; + rev = "8cc3a55af3bcf171a1c23a90c4df9cf591706104"; + sha256 = "1pfxxskhihz7ijdfj2vinadx05iljqim9h7g19jzgvrl34p8bhix"; + }; + } + { + goPackagePath = "github.com/hashicorp/golang-lru"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/golang-lru"; + rev = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6"; + sha256 = "1iq7lbpsz7ks052mpznmkf8s4k43p51z4dik2n9ivrxk666q2wxi"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"; + sha256 = "0db4lpqb5m130rmfy3s3gjjf4dxllypmyrzxv6ggqhkmwmc7w4mc"; + }; + } + { + goPackagePath = "github.com/howeyc/gopass"; + fetch = { + type = "git"; + url = "https://github.com/howeyc/gopass"; + rev = "bf9dde6d0d2c004a008c27aaee91170c786f6db8"; + sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45"; + }; + } + { + goPackagePath = "github.com/hydrogen18/stoppableListener"; + fetch = { + type = "git"; + url = "https://github.com/hydrogen18/stoppableListener"; + rev = "dadc9ccc400c712e5a316107a5c462863919e579"; + sha256 = "0yf2a9641v5zscw8sj52aky21nm35cj5d946sbvhrjsr4vzzbbm7"; + }; + } + { + goPackagePath = "github.com/imdario/mergo"; + fetch = { + type = "git"; + url = "https://github.com/imdario/mergo"; + rev = "e3000cb3d28c72b837601cac94debd91032d19fe"; + sha256 = "1bsz1aj0h266x7g08jj7f3nd3d5islbad0cygb5vh37hjgzirg4d"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + }; + } + { + goPackagePath = "github.com/intel-go/yanff"; + fetch = { + type = "git"; + url = "https://github.com/intel-go/yanff"; + rev = "35804adce65005f76409327527e4e256569cacc6"; + sha256 = "0rank8ij0ky9ryfw23aqk4mk72lznycqqbs5wr7y71d0pl9ljrgh"; + }; + } + { + goPackagePath = "github.com/iovisor/gobpf"; + fetch = { + type = "git"; + url = "https://github.com/iovisor/gobpf"; + rev = "dd767a9fd5f868874ed117811461410100cea403"; + sha256 = "0kj7g5iz81j9qmz57m5b2a9mfpapmwpp3ad9h5rz58r6wzm5anc3"; + }; + } + { + goPackagePath = "github.com/jbowtie/gokogiri"; + fetch = { + type = "git"; + url = "https://github.com/jbowtie/gokogiri"; + rev = "e2644e49d5b4a4d2382d1a4b28dfbb313a4ffb0c"; + sha256 = "1skbfr0w438xip7p58dkv6806yvm22f1wixqppb2yszgxril0j29"; + }; + } + { + goPackagePath = "github.com/jonboulle/clockwork"; + fetch = { + type = "git"; + url = "https://github.com/jonboulle/clockwork"; + rev = "ed104f61ea4877bea08af6f759805674861e968d"; + sha256 = "04ari17wr4pabjf607jcr7cf13r83dlxlspy8yvfh7hlr0xb16z2"; + }; + } + { + goPackagePath = "github.com/json-iterator/go"; + fetch = { + type = "git"; + url = "https://github.com/json-iterator/go"; + rev = "ff2b70c1dbffdd98567bd8c2f9449d97c0d04c88"; + sha256 = "1flbh2qg16445md5vcsqvbq538icj5l25k5ygyjf86lxdfkh5kr0"; + }; + } + { + goPackagePath = "github.com/juju/loggo"; + fetch = { + type = "git"; + url = "https://github.com/juju/loggo"; + rev = "8232ab8918d91c72af1a9fb94d3edbe31d88b790"; + sha256 = "11y5gk41g1i5q6aqn6jpgm06nsq2mf7fdmkzwqrqagnajgb0h1s1"; + }; + } + { + goPackagePath = "github.com/juju/ratelimit"; + fetch = { + type = "git"; + url = "https://github.com/juju/ratelimit"; + rev = "5b9ff866471762aa2ab2dced63c9fb6f53921342"; + sha256 = "12fsx3wqg49wisigbybdzic7gc2p5a0fk55714mpv7zq8jr6i46k"; + }; + } + { + goPackagePath = "github.com/juju/webbrowser"; + fetch = { + type = "git"; + url = "https://github.com/juju/webbrowser"; + rev = "54b8c57083b4afb7dc75da7f13e2967b2606a507"; + sha256 = "0ngj27f0kgpc4m6jr2hz04kigv6p9z8hviddijgpb9srjzkl7dhz"; + }; + } + { + goPackagePath = "github.com/julienschmidt/httprouter"; + fetch = { + type = "git"; + url = "https://github.com/julienschmidt/httprouter"; + rev = "d1898390779332322e6b5ca5011da4bf249bb056"; + sha256 = "19r684s93b7pxqkpxa7p3pba9dw3xf547z05biykil39xk7rgyfa"; + }; + } + { + goPackagePath = "github.com/kardianos/osext"; + fetch = { + type = "git"; + url = "https://github.com/kardianos/osext"; + rev = "c2c54e542fb797ad986b31721e1baedf214ca413"; + sha256 = "02vmjhkx90601l5fym7c3r4d44b88h3cign86nz4yy6j8qqxvz3h"; + }; + } + { + goPackagePath = "github.com/kr/fs"; + fetch = { + type = "git"; + url = "https://github.com/kr/fs"; + rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b"; + sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly"; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "95d05c1eef33a45bd58676b6ce28d105839b8d0b"; + sha256 = "0lyvs0g2pq0hdblfnpcgvp399j13xy4fzbr24l9zh5vbiw7d1lwc"; + }; + } + { + goPackagePath = "github.com/lxc/lxd"; + fetch = { + type = "git"; + url = "https://github.com/lxc/lxd"; + rev = "9907f3a64b6b8ec9144e8be02d633b951439c0f6"; + sha256 = "0qn0v2facxvg0w5vnasa28nxhvfdy817vkmvsnfqzgcnh60k3z20"; + }; + } + { + goPackagePath = "github.com/magiconair/properties"; + fetch = { + type = "git"; + url = "https://github.com/magiconair/properties"; + rev = "c81f9d71af8f8cba1466501d30326b99a4e56c19"; + sha256 = "1000zi161vzrk2fskjna31j9r9hd6m82i7r7wz76f88421i1xlx5"; + }; + } + { + goPackagePath = "github.com/mailru/easyjson"; + fetch = { + type = "git"; + url = "https://github.com/mailru/easyjson"; + rev = "2a92e673c9a6302dd05c3a691ae1f24aef46457d"; + sha256 = "1k0c952c60zcbly9gzi48jyzwphgawnq9f70bgniciyp4jb8hfv3"; + }; + } + { + goPackagePath = "github.com/mattbaird/elastigo"; + fetch = { + type = "git"; + url = "https://github.com/safchain/elastigo"; + rev = "441c1531dca50a19990385930149f6785f78fe59"; + sha256 = "0dmsswm5zkr0054zrvq8h3naddnx4mygsd76fnjqxs25zf88v7ir"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; + sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"; + sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "d6bea18f789704b5f83375793155289da36a3c7f"; + sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; + }; + } + { + goPackagePath = "github.com/mattn/go-tty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-tty"; + rev = "931426f7535ac39720c8909d70ece5a41a2502a6"; + sha256 = "00cb07v13xrfqm39m1j2h2zvj684gl9fzr51591i9a52a9m6xlj5"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "d0c3fe89de86839aecf2e0579c40ba3bb336a453"; + sha256 = "0jkjgpi1s8l9bdbf14fh8050757jqy36kn1l1hxxlb2fjn1pcg0r"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "756f7b183b7ab78acdbbee5c7f392838ed459dda"; + sha256 = "0yd3682x22lqrfq4h0q16c4swcfn3lmds05ijynm2fk1gcbnwiqn"; + }; + } + { + goPackagePath = "github.com/mitchellh/hashstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/hashstructure"; + rev = "ab25296c0f51f1022f01cd99dfb45f1775de8799"; + sha256 = "1k21xr0x7k03hbkh72xbdi8gz8fk3wdlcbfpy7l90rxvi21jzz0f"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "281073eb9eb092240d33ef253c404f1cca550309"; + sha256 = "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh"; + }; + } + { + goPackagePath = "github.com/nlewo/contrail-introspect-cli"; + fetch = { + type = "git"; + url = "https://github.com/nlewo/contrail-introspect-cli"; + rev = "e4df28ccf9801abbe32edd5ddaba31a7a62b61b6"; + sha256 = "0wf3s9gqy8pvv5gzngz30j9p7fa4mv5qyr9gnlf5ps85xpnlngbq"; + }; + } + { + goPackagePath = "github.com/nu7hatch/gouuid"; + fetch = { + type = "git"; + url = "https://github.com/nu7hatch/gouuid"; + rev = "179d4d0c4d8d407a32af483c2354df1d2c91e6c3"; + sha256 = "1isyfix5w1wm26y3a15ha3nnpsxqaxz5ngq06hnh6c6y0inl2fwj"; + }; + } + { + goPackagePath = "github.com/op/go-logging"; + fetch = { + type = "git"; + url = "https://github.com/op/go-logging"; + rev = "970db520ece77730c7e4724c61121037378659d9"; + sha256 = "1cpna2x5l071z1vrnk7zipdkka8dzwsjyx7m79xk0lr08rip0kcj"; + }; + } + { + goPackagePath = "github.com/opencontainers/runc"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/runc"; + rev = "8fa5343b0058459296399a89bc532aa5508de28d"; + sha256 = "15wbnj19fbprgsrf0k7hpmpxrkh2vzrm71qn3gya05p908k81v03"; + }; + } + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "05bcc0fb0d3e60da4b8dd5bd7e0ea563eb4ca943"; + sha256 = "0ma7fwsyl0qflvhbb6qfc5h3yi81iy5lpc6wkdyd1sdafvrzpbb8"; + }; + } + { + goPackagePath = "github.com/petar/GoLLRB"; + fetch = { + type = "git"; + url = "https://github.com/petar/GoLLRB"; + rev = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4"; + sha256 = "01xp3lcamqkvl91jg6ly202gdsgf64j39rkrcqxi6v4pbrcv7hz0"; + }; + } + { + goPackagePath = "github.com/peterbourgon/diskv"; + fetch = { + type = "git"; + url = "https://github.com/peterbourgon/diskv"; + rev = "2973218375c3d13162e1d3afe1708aaee318ef3f"; + sha256 = "10jbkxyxilv5hixm4dww4qfn01cnb5fr8mgxvwigq5jcb85mrxig"; + }; + } + { + goPackagePath = "github.com/peterh/liner"; + fetch = { + type = "git"; + url = "https://github.com/peterh/liner"; + rev = "8975875355a81d612fafb9f5a6037bdcc2d9b073"; + sha256 = "17l7p6lxhlnna1w1drgh7g8afxcxxd5j472givm2g7l9v8yg4f17"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "ff09b135c25aae272398c51a07235b90a75aa4f0"; + sha256 = "0pwl6v3hmc22zp32gkyqykl4kg69xk1mlp0vmhgd1f44difd5fvz"; + }; + } + { + goPackagePath = "github.com/pkg/sftp"; + fetch = { + type = "git"; + url = "https://github.com/pkg/sftp"; + rev = "e84cc8c755ca39b7b64f510fe1fffc1b51f210a5"; + sha256 = "1gkmk60lskyrn5751rgb9pxn41wi7y29wsn8psrfb16bg4flcvrq"; + }; + } + { + goPackagePath = "github.com/pkg/term"; + fetch = { + type = "git"; + url = "https://github.com/pkg/term"; + rev = "cda20d4ac917ad418d86e151eff439648b06185b"; + sha256 = "08frhz411dwyli5spfxn32d3ni9mrgdav51lmg8a1wpdmw0r0wwp"; + }; + } + { + goPackagePath = "github.com/pmylund/go-cache"; + fetch = { + type = "git"; + url = "https://github.com/pmylund/go-cache"; + rev = "a3647f8e31d79543b2d0f0ae2fe5c379d72cedc0"; + sha256 = "10020inkzrm931r4bixf8wqr9n39wcrb78vfyxmbvjavvw4zybgs"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "5cec1d0429b02e4323e042eb04dafdb079ddf568"; + sha256 = "1cgd5pcxf4zgcafq284yf2i711m3kddpb05prxy51li5p1l5cbq0"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "23070236b1ebff452f494ae831569545c2b61d26"; + sha256 = "111vqp3lqsdli7z5rnkrpcfv6yri0qjikyl70whwxzcvkqp9k42s"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "406e5b7bfd8201a36e2bb5f7bdae0b03380c2ce8"; + sha256 = "0yla9hz15pg63394ygs9iiwzsqyv29labl8p424hijwsc9z9nka8"; + }; + } + { + goPackagePath = "github.com/robertkrimen/otto"; + fetch = { + type = "git"; + url = "https://github.com/robertkrimen/otto"; + rev = "6c383dd335ef8dcccef05e651ce1eccfe4d0f011"; + sha256 = "1n6h7c8gi6wv4nklqd7ygzx2afvh7ddxbml9w9x0jxwcfb3bdy17"; + }; + } + { + goPackagePath = "github.com/rogpeppe/fastuuid"; + fetch = { + type = "git"; + url = "https://github.com/rogpeppe/fastuuid"; + rev = "6724a57986aff9bff1a1770e9347036def7c89f6"; + sha256 = "12s65phfx6hxj4v0b5kj8akgrbf5mxpa101fyzw03h6hld1f70cz"; + }; + } + { + goPackagePath = "github.com/safchain/ethtool"; + fetch = { + type = "git"; + url = "https://github.com/safchain/ethtool"; + rev = "e01512671ed4c2248daf0c5e974ecf88a4947335"; + sha256 = "11wk834aas1jj3bag3rwr0sb5alhd40si3fcqkvs0fsg6wjmwxyc"; + }; + } + { + goPackagePath = "github.com/shirou/gopsutil"; + fetch = { + type = "git"; + url = "https://github.com/shirou/gopsutil"; + rev = "6a368fb7cd1221fa6ea90facc9447c9a2234c255"; + sha256 = "0vjf2jwkpb1fls997w3pvw5sg25yjygx0nv1i5pwcfrnpvnw9zxk"; + }; + } + { + goPackagePath = "github.com/skydive-project/dede"; + fetch = { + type = "git"; + url = "https://github.com/skydive-project/dede"; + rev = "d95b69cd1f75137aab3bcc01d6facf2aa7a43b80"; + sha256 = "16qgpxb24zq2js7ril8xf71yz927ly7fsadys23is8jzkgsx56mf"; + }; + } + { + goPackagePath = "github.com/socketplane/libovsdb"; + fetch = { + type = "git"; + url = "https://github.com/socketplane/libovsdb"; + rev = "5113f8fb4d9d374417ab4ce35424fbea1aad7272"; + sha256 = "1b4yz6jvsi2gz8ha9y42hy105q6ylf7516pd59wgg42r6n627w4g"; + }; + } + { + goPackagePath = "github.com/spf13/afero"; + fetch = { + type = "git"; + url = "https://github.com/spf13/afero"; + rev = "a80ea588265c05730645be8342eeafeaa72b2923"; + sha256 = "1i2z4l3a335jz0jg8xzwfdcp0dlf77h8rb6nd88mnd1nbmbd58w4"; + }; + } + { + goPackagePath = "github.com/spf13/cast"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cast"; + rev = "8965335b8c7107321228e3e3702cab9832751bac"; + sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "9c28e4bbd74e5c3ed7aacbc552b2cab7cfdfe744"; + sha256 = "02bgp0yy9bi05k2in9axqi3db1c6mjffdsmki51pn9iryxz4zkh3"; + }; + } + { + goPackagePath = "github.com/spf13/jwalterweatherman"; + fetch = { + type = "git"; + url = "https://github.com/spf13/jwalterweatherman"; + rev = "d00654080cddbd2b082acaa74007cb94a2b40866"; + sha256 = "06zv87v7m0zgx9zy3w283008fmlx0v41xyldkql7qmp7l5l4vcpw"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "c7e63cf4530bcd3ba943729cee0efeff2ebea63f"; + sha256 = "197mlkgb01zk86fxfl8r8maymcxsspqblg7hmngjxf7ivdid1i1l"; + }; + } + { + goPackagePath = "github.com/spf13/viper"; + fetch = { + type = "git"; + url = "https://github.com/lebauce/viper"; + rev = "54676d0dbb12f9b6febb2f8210e9590d81d4b5e3"; + sha256 = "1dm01151hn6mywv6hm0nbqsr8qgwp393l4xz9p9jrd8asynpdpsb"; + }; + } + { + goPackagePath = "github.com/tchap/zapext"; + fetch = { + type = "git"; + url = "https://github.com/tchap/zapext"; + rev = "e61c0c8823393722ae09ce0faee42fa177088a4b"; + sha256 = "16xw01phxkndhsn8l9n587vdpmr0kh9xg0vxlk0l6ywkp31583cr"; + }; + } + { + goPackagePath = "github.com/tebeka/selenium"; + fetch = { + type = "git"; + url = "https://github.com/tebeka/selenium"; + rev = "657e45ec600f26e76da253936c1f2adb6978ff72"; + sha256 = "1gqhmlqcq4y5pxw7inqd987xwyrnd5zsmj8blmb5vizhan7liw99"; + }; + } + { + goPackagePath = "github.com/ugorji/go"; + fetch = { + type = "git"; + url = "https://github.com/ugorji/go"; + rev = "ded73eae5db7e7a0ef6f55aace87a2873c5d2b74"; + sha256 = "04iwqjj049q4dldf1wpqymf1y9kdppxp3y0ywsqzaw21bi8b3zcc"; + }; + } + { + goPackagePath = "github.com/vishvananda/netlink"; + fetch = { + type = "git"; + url = "https://github.com/vishvananda/netlink"; + rev = "016ba6f67a12c03708643150afcfb1509be7747a"; + sha256 = "08z5g217nynq6nrdls8hj1761wwl9skhwfz2fad9di8ziy8mk7w4"; + }; + } + { + goPackagePath = "github.com/vishvananda/netns"; + fetch = { + type = "git"; + url = "https://github.com/vishvananda/netns"; + rev = "604eaf189ee867d8c147fafc28def2394e878d25"; + sha256 = "0zii8dyy6qb2dh649syz3ablabw78k038w8a7fwnsk3x482p59s7"; + }; + } + { + goPackagePath = "github.com/weaveworks/tcptracer-bpf"; + fetch = { + type = "git"; + url = "https://github.com/weaveworks/tcptracer-bpf"; + rev = "e080bd747dc6b62d4ed3ed2b7f0be4801bef8faf"; + sha256 = "1ijqpzj4nmymi8gh3pl9rnwjzm5q89d1585iwj1s190cxcp1ix81"; + }; + } + { + goPackagePath = "github.com/xeipuuv/gojsonpointer"; + fetch = { + type = "git"; + url = "https://github.com/xeipuuv/gojsonpointer"; + rev = "6fe8760cad3569743d51ddbb243b26f8456742dc"; + sha256 = "1b1flqamhzfi5lc4lbh8iw4s3lix0vxyrq0adpx0znx7lkkxhjvz"; + }; + } + { + goPackagePath = "github.com/xeipuuv/gojsonreference"; + fetch = { + type = "git"; + url = "https://github.com/xeipuuv/gojsonreference"; + rev = "e02fc20de94c78484cd5ffb007f8af96be030a45"; + sha256 = "195in5zr3bhb3r1iins2h610kz339naj284b3839xmrhc15wqxzq"; + }; + } + { + goPackagePath = "github.com/xeipuuv/gojsonschema"; + fetch = { + type = "git"; + url = "https://github.com/xeipuuv/gojsonschema"; + rev = "702b404897d4364af44dc8dcabc9815947942325"; + sha256 = "1lby7iar87q2kjqvcbx2jql4p2ggjq9ml114x7hlb3966447ayfr"; + }; + } + { + goPackagePath = "github.com/xiang90/probing"; + fetch = { + type = "git"; + url = "https://github.com/xiang90/probing"; + rev = "07dd2e8dfe18522e9c447ba95f2fe95262f63bb2"; + sha256 = "0r8rq27yigz72mk8z7p61yjfan8id021dnp1v421ln9byzpvabn2"; + }; + } + { + goPackagePath = "github.com/xordataexchange/crypt"; + fetch = { + type = "git"; + url = "https://github.com/xordataexchange/crypt"; + rev = "b2862e3d0a775f18c7cfe02273500ae307b61218"; + sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y"; + }; + } + { + goPackagePath = "go.uber.org/atomic"; + fetch = { + type = "git"; + url = "https://github.com/uber-go/atomic"; + rev = "0506d69f5564c56e25797bf7183c28921d4c6360"; + sha256 = "0b1b0iz6jwk5f77mwsggsvkywmxwwn1b4a6n63xd5czl23vi7a6q"; + }; + } + { + goPackagePath = "go.uber.org/multierr"; + fetch = { + type = "git"; + url = "https://github.com/uber-go/multierr"; + rev = "3c4937480c32f4c13a875a1829af76c98ca3d40a"; + sha256 = "1slfc6syvw8cvr6rbrjsy6ja5w8gsx0f8aq8qm16rp2x5c2pj07w"; + }; + } + { + goPackagePath = "go.uber.org/zap"; + fetch = { + type = "git"; + url = "https://github.com/uber-go/zap"; + rev = "35aad584952c3e7020db7b839f6b102de6271f89"; + sha256 = "0n79ir7jcr7s51j85swji7an0jgy1w5dxg1g68j722rmpbvsagwv"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "1f22c0103821b9390939b6776727195525381532"; + sha256 = "1acy12f396sr3lrnbcnym5q72qnlign5bagving41qijzjnc219m"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "a6577fac2d73be281a500b310739095313165611"; + sha256 = "00wks377dp0ws47dvc9f6y4sin1mwdk649v5jfz047ik1jh1nq5h"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "810d7000345868fc619eb81f46307107118f4ae1"; + sha256 = "07lm9h86l29dd45ca3vjsi06xpwg36899hf1ns7qwabflzgm0nxy"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "1cbadb444a806fd9430d14ad08967ed91da4fa0a"; + sha256 = "0ih9ysagh4ylj08393497sscf3yziybc6acg4mrh0wa7mld75j56"; + }; + } + { + goPackagePath = "google.golang.org/genproto"; + fetch = { + type = "git"; + url = "https://github.com/google/go-genproto"; + rev = "2b5a72b8730b0b16380010cfe5286c42108d88e7"; + sha256 = "0i69x08kg5yqwaz5grxbfhg2hjdkdhaqbc1v4x4l91232kw5nd38"; + }; + } + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e"; + sha256 = "1sf3fvphz16pf7jbm86n07rip9m5fh40wjcc2j2d5zpka36xvjw4"; + }; + } + { + goPackagePath = "gopkg.in/errgo.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/errgo.v1"; + rev = "442357a80af5c6bf9b6d51ae791a39c3421004f3"; + sha256 = "0gg7vqkfh2bpn2z9xfdahrxdkvn365mdb63zs8s5v5cbm2glfq56"; + }; + } + { + goPackagePath = "gopkg.in/fsnotify/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/fsnotify/fsnotify.v1"; + rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "gopkg.in/httprequest.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/httprequest.v1"; + rev = "93f8fee4081f01ea23d258bdbbcdd319f668d718"; + sha256 = "1lgicrb355m2vb31ly4ly997ral1zvqk9fy89x4qkxals1zfqi3q"; + }; + } + { + goPackagePath = "gopkg.in/inf.v0"; + fetch = { + type = "git"; + url = "https://gopkg.in/inf.v0"; + rev = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4"; + sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82"; + }; + } + { + goPackagePath = "gopkg.in/macaroon-bakery.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/macaroon-bakery.v2"; + rev = "22c04a94d902625448265ef041bb53e715452a40"; + sha256 = "1iaisvljir95m7jh02k98jv2j68bs38fdlis4pnjbpj8mbarllw4"; + }; + } + { + goPackagePath = "gopkg.in/macaroon.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/macaroon.v2"; + rev = "bed2a428da6e56d950bed5b41fcbae3141e5b0d0"; + sha256 = "199dcdl38vjj078aq56kpfzni0sm7j3062nxd8yyj1bd67x0xmsi"; + }; + } + { + goPackagePath = "gopkg.in/sourcemap.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/sourcemap.v1"; + rev = "eef8f47ab679652a7d3a4ee34c34314d255d2536"; + sha256 = "0ahmw49lswks636vz49vb33r4rq0g3rrkqwsh8fn0kmhp94c9w40"; + }; + } + { + goPackagePath = "gopkg.in/urfave/cli.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/urfave/cli.v2"; + rev = "b2bf3c5abeb90da407891aecd1df2c5a1f6170c1"; + sha256 = "1x90qcnjcicq1d933bd9mdyjkwd0h9hdxgva45z85gqr7lavs5h3"; + }; + } + { + goPackagePath = "gopkg.in/validator.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/validator.v2"; + rev = "3e4f037f12a1221a0864cf0dd2e81c452ab22448"; + sha256 = "1294nz3wi4avn1nwyr8cdcx8jqjvlzadlnswarpwrq41mhlmhjfs"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "bef53efd0c76e49e6de55ead051f886bea7e9420"; + sha256 = "0df5gr2qyflh1vmb1i2jbkc46dc3mqmdbc53vbyrzw0ilzhzh0si"; + }; + } + { + goPackagePath = "k8s.io/api"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/api"; + rev = "4df58c811fe2e65feb879227b2b245e4dc26e7ad"; + sha256 = "14pxzm1gqh4pa1179c8hfcbi5rqy9fx2cvpns8pwlyqz807rg2vl"; + }; + } + { + goPackagePath = "k8s.io/apimachinery"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/apimachinery"; + rev = "019ae5ada31de202164b118aee88ee2d14075c31"; + sha256 = "1l1przxkbid3sfn80n60w2z883yad99cl89k4zwb9i7wcydk85w1"; + }; + } + { + goPackagePath = "k8s.io/client-go"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/client-go"; + rev = "35ccd4336052e7d73018b1382413534936f34eee"; + sha256 = "1sp0v60xpy6lsdzsqq7lzcqkmqds100ziqzj2fip68svcysgqg9g"; + }; + } + { + goPackagePath = "k8s.io/kube-openapi"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/kube-openapi"; + rev = "39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1"; + sha256 = "08b5yx07saj5vzzic50hlzw68p2fd7xc118x1liq4wqrikxmv8wa"; + }; + } +] diff --git a/pkgs/tools/networking/smokeping/default.nix b/pkgs/tools/networking/smokeping/default.nix index 2172efc63e35..cca6d630fc13 100644 --- a/pkgs/tools/networking/smokeping/default.nix +++ b/pkgs/tools/networking/smokeping/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "smokeping-${version}"; version = "2.6.11"; src = fetchurl { - url = "http://oss.oetiker.ch/smokeping/pub/smokeping-${version}.tar.gz"; + url = "https://oss.oetiker.ch/smokeping/pub/smokeping-${version}.tar.gz"; sha256 = "1p9hpa2zs33p7hzrds80kwrm5255s0869v3s3qmsyx2sx63c7czj"; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix index b50d619b437d..ad2d88e4a982 100644 --- a/pkgs/tools/networking/spiped/default.nix +++ b/pkgs/tools/networking/spiped/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.5.0"; src = fetchurl { - url = "http://www.tarsnap.com/spiped/${name}.tgz"; + url = "https://www.tarsnap.com/spiped/${name}.tgz"; sha256 = "1mxcbxifr3bnj6ga8lz88y4bhff016i6kjdzwbb3gzb2zcs4pxxj"; }; diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 9ceb08ad72e9..74405a472f8a 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { version = "5.6.3"; src = fetchurl { - url = "http://download.strongswan.org/${name}.tar.bz2"; + url = "https://download.strongswan.org/${name}.tar.bz2"; sha256 = "095zg7h7qwsc456sqgwb1lhhk29ac3mk5z9gm6xja1pl061driy3"; }; diff --git a/pkgs/tools/networking/swaks/default.nix b/pkgs/tools/networking/swaks/default.nix index 1b121335ac7a..be807e307715 100644 --- a/pkgs/tools/networking/swaks/default.nix +++ b/pkgs/tools/networking/swaks/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "20170101.0"; src = fetchurl { - url = "http://www.jetmore.org/john/code/swaks/files/${name}.tar.gz"; + url = "https://www.jetmore.org/john/code/swaks/files/${name}.tar.gz"; sha256 = "0pli4mlhasnqqxmmxalwyg3x7n2vhcbgsnp2xgddamjavv82vrl4"; }; diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix index 9ef5ff2a4f08..bf039b653cc6 100644 --- a/pkgs/tools/networking/tinc/default.nix +++ b/pkgs/tools/networking/tinc/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "tinc-${version}"; src = fetchurl { - url = "http://www.tinc-vpn.org/packages/tinc-${version}.tar.gz"; + url = "https://www.tinc-vpn.org/packages/tinc-${version}.tar.gz"; sha256 = "1nngdp2x5kykrgh13q5wjry8m82vahqv53csvlb22ifxvrhrnfn0"; }; diff --git a/pkgs/tools/networking/trickle/default.nix b/pkgs/tools/networking/trickle/default.nix index 52bb418fc0d0..f6c88bb66b7c 100644 --- a/pkgs/tools/networking/trickle/default.nix +++ b/pkgs/tools/networking/trickle/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "trickle-1.07"; src = fetchurl { - url = "http://monkey.org/~marius/trickle/${name}.tar.gz"; + url = "https://monkey.org/~marius/trickle/${name}.tar.gz"; sha256 = "0s1qq3k5mpcs9i7ng0l9fvr1f75abpbzfi1jaf3zpzbs1dz50dlx"; }; diff --git a/pkgs/tools/networking/ucspi-tcp/default.nix b/pkgs/tools/networking/ucspi-tcp/default.nix index fc46c6a15bc5..8a3b292ad81f 100644 --- a/pkgs/tools/networking/ucspi-tcp/default.nix +++ b/pkgs/tools/networking/ucspi-tcp/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "ucspi-tcp-0.88"; src = fetchurl { - url = "http://cr.yp.to/ucspi-tcp/${name}.tar.gz"; + url = "https://cr.yp.to/ucspi-tcp/${name}.tar.gz"; sha256 = "171yl9kfm8w7l17dfxild99mbf877a9k5zg8yysgb1j8nz51a1ja"; }; diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index e8f8b4258721..4d4a9446b455 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "wireguard-tools-${version}"; - version = "0.0.20180613"; + version = "0.0.20180625"; src = fetchzip { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "0xndf5qxc4s0gsidzm0v4ivara6k2shjbr74xfcdpc0apfgyk2fz"; + sha256 = "1z7iibydj59nzx0jcxabb9k7b6djjz6yi032n66mqr98dh4dlkb7"; }; sourceRoot = "source/src/tools"; diff --git a/pkgs/tools/package-management/cargo-tree/default.nix b/pkgs/tools/package-management/cargo-tree/default.nix index a9c1a1a33b3c..5ac13fc42cfd 100644 --- a/pkgs/tools/package-management/cargo-tree/default.nix +++ b/pkgs/tools/package-management/cargo-tree/default.nix @@ -1,17 +1,17 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, cmake, curl, libiconv, darwin }: rustPlatform.buildRustPackage rec { name = "cargo-tree-${version}"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "sfackler"; repo = "cargo-tree"; rev = "v${version}"; - sha256 = "0lq14w11a4zl0rvv7rsd79k51dwk3w78fbsi6klkqknad02qmx3r"; + sha256 = "16vsw392qs3ag2brvcan19km7ds0s9s7505p3hnfjvjrzgdliir3"; }; - cargoSha256 = "0zi4qbadlx4l6zhb0f892ic3mdmyjjjzrirks18pl6qrn3dgny1x"; + cargoSha256 = "0g6afhqqdf76axbcs5wj9gydsabd3d5ja8qd8z8y6wbp7n0y4h6a"; nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ curl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/package-management/nix-review/default.nix b/pkgs/tools/package-management/nix-review/default.nix index 14b234c4dd5a..c216195f54d7 100644 --- a/pkgs/tools/package-management/nix-review/default.nix +++ b/pkgs/tools/package-management/nix-review/default.nix @@ -2,24 +2,27 @@ , python3 , fetchFromGitHub , nix +, git , makeWrapper }: python3.pkgs.buildPythonApplication rec { pname = "nix-review"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "Mic92"; repo = "nix-review"; rev = version; - sha256 = "138f9m2c8fwpvn3kv5q7845ffi1pjbqxcs44aych4832i0pn6jaf"; + sha256 = "0dv6hzmfqyhfi6zzjm10nzzqiy2wyfhiksm1cd4fznq0psxaihfj"; }; buildInputs = [ makeWrapper ]; preFixup = '' - wrapProgram $out/bin/nix-review --prefix PATH : ${nix}/bin + wrapProgram $out/bin/nix-review --prefix PATH : ${stdenv.lib.makeBinPath [ + git nix + ]} ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix index 75bc6ec109ce..8f3be4cc8c7f 100644 --- a/pkgs/tools/package-management/nixui/nixui.nix +++ b/pkgs/tools/package-management/nixui/nixui.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.3. Do not edit! +# This file has been generated by node2nix 1.6.0. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/tools/package-management/nixui/node-packages.nix b/pkgs/tools/package-management/nixui/node-packages.nix index b532039ede1c..846e9bcfc12a 100644 --- a/pkgs/tools/package-management/nixui/node-packages.nix +++ b/pkgs/tools/package-management/nixui/node-packages.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.5.3. Do not edit! +# This file has been generated by node2nix 1.6.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -58,13 +58,13 @@ let sha1 = "61a6a32010622afa07963bf325203cf12239d604"; }; }; - "underscore-1.8.3" = { + "underscore-1.9.1" = { name = "underscore"; packageName = "underscore"; - version = "1.8.3"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"; - sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; + url = "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz"; + sha512 = "5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="; }; }; }; @@ -81,7 +81,11 @@ in }; dependencies = [ sources."async-0.2.10" - sources."binary-search-tree-0.2.4" + (sources."binary-search-tree-0.2.4" // { + dependencies = [ + sources."underscore-1.4.4" + ]; + }) sources."isnumber-1.0.0" sources."mkdirp-0.3.5" (sources."nedb-1.0.2" // { @@ -89,7 +93,7 @@ in sources."underscore-1.4.4" ]; }) - sources."underscore-1.8.3" + sources."underscore-1.9.1" ]; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index 440f91a6d64c..677dbda7b495 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.3.6"; name = "opkg-${version}"; src = fetchurl { - url = "http://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; + url = "https://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; sha256 = "02ykhjpyxmh0qrqvc1s3vlhnr6wyxkcwqb8dplxqmkz83gkg01zn"; }; diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index 53ce183d4afb..9f334b4a9602 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -7,10 +7,10 @@ stdenv.mkDerivation rec { name = "eid-mw-${version}"; - version = "4.4.2"; + version = "4.4.3"; src = fetchFromGitHub { - sha256 = "0jsa1jl51kz8i8dpi3664a7y3bhypr3ipk1srzxfkk6aph4a5cdf"; + sha256 = "1h90iz4l85drchpkmhlsvg7f9abhw6890fdr9x5n5ir3kxikwcdm"; rev = "v${version}"; repo = "eid-mw"; owner = "Fedict"; diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index 52bc59abb4cb..287fc3e899c0 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "0.8.0"; src = fetchurl { - url = "http://people.freedesktop.org/~hadess/${name}.tar.xz"; + url = "https://people.freedesktop.org/~hadess/${name}.tar.xz"; sha256 = "00i21ycaya4x2qf94mys6s94xnbj5cfm8zhhd5sc91lvqjk4r99k"; }; diff --git a/pkgs/tools/security/gpgstats/default.nix b/pkgs/tools/security/gpgstats/default.nix index e9929cb2e6fc..c095b77129cc 100644 --- a/pkgs/tools/security/gpgstats/default.nix +++ b/pkgs/tools/security/gpgstats/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.5"; src = fetchurl { - url = "http://www.vanheusden.com/gpgstats/${name}.tgz"; + url = "https://www.vanheusden.com/gpgstats/${name}.tgz"; sha256 = "1n3njqhjwgfllcxs0xmk89dzgirrpfpfzkj71kqyvq97gc1wbcxy"; }; diff --git a/pkgs/tools/security/jd-gui/default.nix b/pkgs/tools/security/jd-gui/default.nix index 72cb19aa732b..d9617e3eb2ba 100644 --- a/pkgs/tools/security/jd-gui/default.nix +++ b/pkgs/tools/security/jd-gui/default.nix @@ -1,52 +1,102 @@ -{ stdenv, fetchurl, gtk2, atk, gdk_pixbuf, glib, pango, fontconfig, zlib, xorg, upx, patchelf }: +{ stdenv, fetchurl, gradle_2_5, perl, makeWrapper, jre, makeDesktopItem, writeShellScriptBin, writeText }: let - dynlibPath = stdenv.lib.makeLibraryPath - ([ gtk2 atk gdk_pixbuf glib pango fontconfig zlib stdenv.cc.cc.lib ] - ++ (with xorg; [ - libX11 - libXext - libXrender - libXrandr - libSM - libXfixes - libXdamage - libXcursor - libXinerama - libXi - libXcomposite - libXxf86vm - ])); -in -stdenv.mkDerivation rec { - name = "jd-gui-${version}"; - version = "0.3.5"; + version = "1.4.0"; + name = "jd-gui-${version}"; src = fetchurl { - url = "http://jd.benow.ca/jd-gui/downloads/${name}.linux.i686.tar.gz"; - sha256 = "0jrvzs2s836yvqi41c7fq0gfiwf187qg765b9r1il2bjc0mb3dqv"; + url = "https://github.com/java-decompiler/jd-gui/archive/v${version}.tar.gz"; + sha256 = "0anz7szlr5kgmsmkyv34jdynsnk8v6kvibcyz98jsd96fh725lax"; }; - nativeBuildInputs = [ upx patchelf ]; + deps = stdenv.mkDerivation { + name = "${name}-deps"; + inherit src; + nativeBuildInputs = [ gradle_2_5 perl ]; - unpackPhase = "tar xf ${src}"; - installPhase = '' - mkdir -p $out/bin - upx -d jd-gui -o $out/bin/jd-gui + buildPhase = '' + export GRADLE_USER_HOME=$(mktemp -d); + gradle --no-daemon build + ''; - patchelf \ - --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ - --set-rpath ${dynlibPath} \ - $out/bin/jd-gui + # Mavenize dependency paths + # e.g. org.codehaus.groovy/groovy/2.4.0/{hash}/groovy-2.4.0.jar -> org/codehaus/groovy/groovy/2.4.0/groovy-2.4.0.jar + installPhase = '' + find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ + | sh + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1apmqiphnav79m4rdii58h7f4qslpfig4qybyyl2fr7zk92gv3l9"; + }; + + # Point to our local deps repo + gradleInit = writeText "init.gradle" '' + logger.lifecycle 'Replacing Maven repositories with ${deps}...' + + gradle.projectsLoaded { + rootProject.allprojects { + buildscript { + repositories { + clear() + maven { url '${deps}' } + } + } + repositories { + clear() + maven { url '${deps}' } + } + } + } + ''; + + desktopItem = launcher: makeDesktopItem { + name = "jd-gui"; + exec = "${launcher} %F"; + icon = "jd-gui"; + comment = "Java Decompiler JD-GUI"; + desktopName = "JD-GUI"; + genericName = "Java Decompiler"; + mimeType = "application/x-java-archive;application/x-java"; + categories = "Development;Debugger;"; + }; + +in stdenv.mkDerivation rec { + inherit name version src; + + nativeBuildInputs = [ gradle_2_5 perl makeWrapper ]; + + buildPhase = '' + export GRADLE_USER_HOME=$(mktemp -d) + gradle --offline --no-daemon --info --init-script ${gradleInit} jar + ''; + + installPhase = let + jar = "$out/share/jd-gui/${name}.jar"; + in '' + mkdir -p $out/bin $out/share/{jd-gui,icons/hicolor/128x128/apps} + cp build/libs/${name}.jar ${jar} + cp src/linux/resources/jd_icon_128.png $out/share/icons/hicolor/128x128/apps/jd-gui.png + + cat > $out/bin/jd-gui <