diff --git a/third_party/nixpkgs/doc/builders/special/fhs-environments.section.md b/third_party/nixpkgs/doc/builders/special/fhs-environments.section.md
index 146ded5324..43dc99b7c1 100644
--- a/third_party/nixpkgs/doc/builders/special/fhs-environments.section.md
+++ b/third_party/nixpkgs/doc/builders/special/fhs-environments.section.md
@@ -18,6 +18,8 @@
Additional commands to be executed for finalizing the derivation with runner script.
- `runScript`
A command that would be executed inside the sandbox and passed all the command line arguments. It defaults to `bash`.
+- `profile`
+ Optional script for `/etc/profile` within the sandbox.
One can create a simple environment using a `shell.nix` like that:
diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix
index e1e77aa83e..939d6121ee 100644
--- a/third_party/nixpkgs/maintainers/maintainer-list.nix
+++ b/third_party/nixpkgs/maintainers/maintainer-list.nix
@@ -7888,6 +7888,12 @@
githubId = 757752;
name = "Jonas Heinrich";
};
+ ony = {
+ name = "Mykola Orliuk";
+ email = "virkony@gmail.com";
+ github = "ony";
+ githubId = 11265;
+ };
OPNA2608 = {
email = "christoph.neidahl@gmail.com";
github = "OPNA2608";
@@ -10678,6 +10684,16 @@
githubId = 9853194;
name = "Philipp Bartsch";
};
+ toastal = {
+ email = "toastal+nix@posteo.net";
+ github = "toastal";
+ githubId = 561087;
+ name = "toastal";
+ keys = [{
+ longkeyid = "ed25519/5CCE6F1466D47C9E";
+ fingerprint = "7944 74B7 D236 DAB9 C9EF E7F9 5CCE 6F14 66D4 7C9E";
+ }];
+ };
tobim = {
email = "nix@tobim.fastmail.fm";
github = "tobim";
@@ -11878,12 +11894,6 @@
githubId = 8686360;
name = "Illia Shestakov";
};
- foxit64 = {
- email = "o4nsxy05@gmail.com";
- github = "foxit64";
- githubId = 56247270;
- name = "Foxit";
- };
masaeedu = {
email = "masaeedu@gmail.com";
github = "masaeedu";
diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
index 6f2a7fd8dd..fcaac9e8be 100644
--- a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+++ b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
@@ -486,7 +486,7 @@
-
+
yggdrasil was upgraded to a new major
@@ -495,6 +495,14 @@
changelog.
+
+
+ icingaweb2 was upgraded to a new release
+ which requires a manual database upgrade, see
+ upstream
+ changelog.
+
+
@@ -538,6 +546,22 @@
claws-mail-gtk2 package.
+
+
+ The wordpress module provides a new interface which allows to
+ use different webservers with the new option
+ services.wordpress.webserver.
+ Currently httpd and
+ nginx are supported. The definitions of
+ wordpress sites should now be set in
+ services.wordpress.sites.
+
+
+ Sites definitions that use the old interface are automatically
+ migrated in the new option. This backward compatibility will
+ be removed in 22.05.
+
+
diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md
index 5a1a29c270..030f1d2181 100644
--- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md
@@ -124,6 +124,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- `yggdrasil` was upgraded to a new major release with breaking changes, see [upstream changelog](https://github.com/yggdrasil-network/yggdrasil-go/releases/tag/v0.4.0).
+- `icingaweb2` was upgraded to a new release which requires a manual database upgrade, see [upstream changelog](https://github.com/Icinga/icingaweb2/releases/tag/v2.9.0).
+
## Other Notable Changes {#sec-release-21.11-notable-changes}
- The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets.
@@ -133,3 +135,7 @@ In addition to numerous new and upgraded packages, this release has the followin
- Sway: The terminal emulator `rxvt-unicode` is no longer installed by default via `programs.sway.extraPackages`. The current default configuration uses `alacritty` (and soon `foot`) so this is only an issue when using a customized configuration and not installing `rxvt-unicode` explicitly.
- The `claws-mail` package now references the new GTK+ 3 release branch, major version 4. To use the GTK+ 2 releases, one can install the `claws-mail-gtk2` package.
+
+- The wordpress module provides a new interface which allows to use different webservers with the new option [`services.wordpress.webserver`](options.html#opt-services.wordpress.webserver). Currently `httpd` and `nginx` are supported. The definitions of wordpress sites should now be set in [`services.wordpress.sites`](options.html#opt-services.wordpress.sites).
+
+ Sites definitions that use the old interface are automatically migrated in the new option. This backward compatibility will be removed in 22.05.
diff --git a/third_party/nixpkgs/nixos/modules/programs/xwayland.nix b/third_party/nixpkgs/nixos/modules/programs/xwayland.nix
index 7e9a424a71..cb3c9c5b15 100644
--- a/third_party/nixpkgs/nixos/modules/programs/xwayland.nix
+++ b/third_party/nixpkgs/nixos/modules/programs/xwayland.nix
@@ -10,14 +10,16 @@ in
{
options.programs.xwayland = {
- enable = mkEnableOption ''
- Xwayland X server allows running X programs on a Wayland compositor.
- '';
+ enable = mkEnableOption "Xwayland (an X server for interfacing X11 apps with the Wayland protocol)";
defaultFontPath = mkOption {
type = types.str;
default = optionalString config.fonts.fontDir.enable
"/run/current-system/sw/share/X11/fonts";
+ defaultText = literalExample ''
+ optionalString config.fonts.fontDir.enable
+ "/run/current-system/sw/share/X11/fonts";
+ '';
description = ''
Default font path. Setting this option causes Xwayland to be rebuilt.
'';
@@ -25,7 +27,15 @@ in
package = mkOption {
type = types.path;
- description = "The Xwayland package";
+ default = pkgs.xwayland.override (oldArgs: {
+ inherit (cfg) defaultFontPath;
+ });
+ defaultText = literalExample ''
+ pkgs.xwayland.override (oldArgs: {
+ inherit (config.programs.xwayland) defaultFontPath;
+ });
+ '';
+ description = "The Xwayland package to use.";
};
};
@@ -37,9 +47,5 @@ in
environment.systemPackages = [ cfg.package ];
- programs.xwayland.package = pkgs.xwayland.override (oldArgs: {
- inherit (cfg) defaultFontPath;
- });
-
};
}
diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/k3s/default.nix b/third_party/nixpkgs/nixos/modules/services/cluster/k3s/default.nix
index 300c182406..d0fb8cc509 100644
--- a/third_party/nixpkgs/nixos/modules/services/cluster/k3s/default.nix
+++ b/third_party/nixpkgs/nixos/modules/services/cluster/k3s/default.nix
@@ -35,10 +35,20 @@ in
token = mkOption {
type = types.str;
- description = "The k3s token to use when connecting to the server. This option only makes sense for an agent.";
+ description = ''
+ The k3s token to use when connecting to the server. This option only makes sense for an agent.
+ WARNING: This option will expose store your token unencrypted world-readable in the nix store.
+ If this is undesired use the tokenFile option instead.
+ '';
default = "";
};
+ tokenFile = mkOption {
+ type = types.nullOr types.path;
+ description = "File path containing k3s token to use when connecting to the server. This option only makes sense for an agent.";
+ default = null;
+ };
+
docker = mkOption {
type = types.bool;
default = false;
@@ -68,8 +78,8 @@ in
message = "serverAddr should be set if role is 'agent'";
}
{
- assertion = cfg.role == "agent" -> cfg.token != "";
- message = "token should be set if role is 'agent'";
+ assertion = cfg.role == "agent" -> cfg.token != "" || cfg.tokenFile != null;
+ message = "token or tokenFile should be set if role is 'agent'";
}
];
@@ -105,7 +115,12 @@ in
"${cfg.package}/bin/k3s ${cfg.role}"
] ++ (optional cfg.docker "--docker")
++ (optional cfg.disableAgent "--disable-agent")
- ++ (optional (cfg.role == "agent") "--server ${cfg.serverAddr} --token ${cfg.token}")
+ ++ (optional (cfg.role == "agent") "--server ${cfg.serverAddr} ${
+ if cfg.tokenFile != null then
+ "--token-file ${cfg.tokenFile}"
+ else
+ "--token ${cfg.token}"
+ }")
++ [ cfg.extraFlags ]
);
};
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.nix
index d3ae072f86..8d5302ba26 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.nix
@@ -475,21 +475,16 @@ in
plugins = lib.mkOption {
type = lib.types.listOf lib.types.package;
default = [];
- example = ''
- [
- (pkgs.fetchFromGitHub {
- owner = "discourse";
- repo = "discourse-spoiler-alert";
- rev = "e200cfa571d252cab63f3d30d619b370986e4cee";
- sha256 = "0ya69ix5g77wz4c9x9gmng6l25ghb5xxlx3icr6jam16q14dzc33";
- })
+ example = lib.literalExample ''
+ with config.services.discourse.package.plugins; [
+ discourse-canned-replies
+ discourse-github
];
'';
description = ''
- Discourse plugins to install as a
- list of derivations. As long as a plugin supports the
- standard install method, packaging it should only require
- fetching its source with an appropriate fetcher.
+ Plugins to install as part of
+ Discourse, expressed as a list of
+ derivations.
'';
};
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.xml b/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.xml
index bae5624232..1d6866e7b3 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.xml
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.xml
@@ -262,9 +262,31 @@ services.discourse = {
You can install Discourse plugins
using the
- option. As long as a plugin supports the standard install
- method, packaging it should only require fetching its source
- with an appropriate fetcher.
+ option. Pre-packaged plugins are provided in
+ <your_discourse_package_here>.plugins. If
+ you want the full suite of plugins provided through
+ nixpkgs, you can also set the option to
+ pkgs.discourseAllPlugins.
+
+
+
+ Plugins can be built with the
+ <your_discourse_package_here>.mkDiscoursePlugin
+ function. Normally, it should suffice to provide a
+ name and src attribute. If
+ the plugin has Ruby dependencies, however, they need to be
+ packaged in accordance with the Developing
+ with Ruby section of the Nixpkgs manual and the
+ appropriate gem options set in bundlerEnvArgs
+ (normally gemdir is sufficient). A plugin's
+ Ruby dependencies are listed in its
+ plugin.rb file as function calls to
+ gem. To construct the corresponding
+ Gemfile, run bundle
+ init, then add the gem lines to it
+ verbatim.
@@ -280,7 +302,10 @@ services.discourse = {
For example, to add the discourse-spoiler-alert
- plugin and disable it by default:
+ and discourse-solved
+ plugins, and disable discourse-spoiler-alert
+ by default:
services.discourse = {
@@ -301,13 +326,9 @@ services.discourse = {
passwordFile = "/path/to/smtp_password_file";
};
mail.incoming.enable = true;
- plugins = [
- (pkgs.fetchFromGitHub {
- owner = "discourse";
- repo = "discourse-spoiler-alert";
- rev = "e200cfa571d252cab63f3d30d619b370986e4cee";
- sha256 = "0ya69ix5g77wz4c9x9gmng6l25ghb5xxlx3icr6jam16q14dzc33";
- })
+ plugins = with config.services.discourse.package.plugins; [
+ discourse-spoiler-alert
+ discourse-solved
];
siteSettings = {
plugins = {
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix
index eea49bda28..f8f0854f1b 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix
@@ -23,6 +23,16 @@ in {
'';
};
+ libraryPaths = mkOption {
+ type = attrsOf package;
+ default = { };
+ description = ''
+ Libraries to add to the Icingaweb2 library path.
+ The name of the attribute is the name of the library, the value
+ is the package to add.
+ '';
+ };
+
virtualHost = mkOption {
type = nullOr str;
default = "icingaweb2";
@@ -167,6 +177,9 @@ in {
services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") {
${poolName} = {
user = "icingaweb2";
+ phpEnv = {
+ ICINGAWEB_LIBDIR = toString (pkgs.linkFarm "icingaweb2-libdir" (mapAttrsToList (name: path: { inherit name path; }) cfg.libraryPaths));
+ };
phpPackage = pkgs.php.withExtensions ({ enabled, all }: [ all.imagick ] ++ enabled);
phpOptions = ''
date.timezone = "${cfg.timezone}"
@@ -184,6 +197,11 @@ in {
};
};
+ services.icingaweb2.libraryPaths = {
+ ipl = pkgs.icingaweb2-ipl;
+ thirdparty = pkgs.icingaweb2-thirdparty;
+ };
+
systemd.services."phpfpm-${poolName}".serviceConfig.ReadWritePaths = [ "/etc/icingaweb2" ];
services.nginx = {
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/wordpress.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/wordpress.nix
index 775ecb3aca..6f1ef815bc 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/wordpress.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/wordpress.nix
@@ -3,13 +3,18 @@
let
inherit (lib) mkDefault mkEnableOption mkForce mkIf mkMerge mkOption types;
inherit (lib) any attrValues concatMapStringsSep flatten literalExample;
- inherit (lib) mapAttrs mapAttrs' mapAttrsToList nameValuePair optional optionalAttrs optionalString;
+ inherit (lib) filterAttrs mapAttrs mapAttrs' mapAttrsToList nameValuePair optional optionalAttrs optionalString;
- eachSite = config.services.wordpress;
+ cfg = migrateOldAttrs config.services.wordpress;
+ eachSite = cfg.sites;
user = "wordpress";
- group = config.services.httpd.group;
+ webserver = config.services.${cfg.webserver};
stateDir = hostName: "/var/lib/wordpress/${hostName}";
+ # Migrate config.services.wordpress. to config.services.wordpress.sites.
+ oldSites = filterAttrs (o: _: o != "sites" && o != "webserver");
+ migrateOldAttrs = cfg: cfg // { sites = cfg.sites // oldSites cfg; };
+
pkg = hostName: cfg: pkgs.stdenv.mkDerivation rec {
pname = "wordpress-${hostName}";
version = src.version;
@@ -261,21 +266,48 @@ in
# interface
options = {
services.wordpress = mkOption {
- type = types.attrsOf (types.submodule siteOpts);
+ type = types.submodule {
+ # Used to support old interface
+ freeformType = types.attrsOf (types.submodule siteOpts);
+
+ # New interface
+ options.sites = mkOption {
+ type = types.attrsOf (types.submodule siteOpts);
+ default = {};
+ description = "Specification of one or more WordPress sites to serve";
+ };
+
+ options.webserver = mkOption {
+ type = types.enum [ "httpd" "nginx" ];
+ default = "httpd";
+ description = ''
+ Whether to use apache2 or nginx for virtual host management.
+
+ Further nginx configuration can be done by adapting services.nginx.virtualHosts.<name>.
+ See for further information.
+
+ Further apache2 configuration can be done by adapting services.httpd.virtualHosts.<name>.
+ See for further information.
+ '';
+ };
+ };
default = {};
- description = "Specification of one or more WordPress sites to serve via Apache.";
+ description = "Wordpress configuration";
};
+
};
# implementation
- config = mkIf (eachSite != {}) {
+ config = mkIf (eachSite != {}) (mkMerge [{
assertions = mapAttrsToList (hostName: cfg:
{ assertion = cfg.database.createLocally -> cfg.database.user == user;
- message = "services.wordpress.${hostName}.database.user must be ${user} if the database is to be automatically provisioned";
+ message = ''services.wordpress.sites."${hostName}".database.user must be ${user} if the database is to be automatically provisioned'';
}
) eachSite;
+ warnings = mapAttrsToList (hostName: _: ''services.wordpress."${hostName}" is deprecated use services.wordpress.sites."${hostName}"'') (oldSites cfg);
+
services.mysql = mkIf (any (v: v.database.createLocally) (attrValues eachSite)) {
enable = true;
package = mkDefault pkgs.mariadb;
@@ -289,14 +321,18 @@ in
services.phpfpm.pools = mapAttrs' (hostName: cfg: (
nameValuePair "wordpress-${hostName}" {
- inherit user group;
+ inherit user;
+ group = webserver.group;
settings = {
- "listen.owner" = config.services.httpd.user;
- "listen.group" = config.services.httpd.group;
+ "listen.owner" = webserver.user;
+ "listen.group" = webserver.group;
} // cfg.poolConfig;
}
)) eachSite;
+ }
+
+ (mkIf (cfg.webserver == "httpd") {
services.httpd = {
enable = true;
extraModules = [ "proxy_fcgi" ];
@@ -332,11 +368,13 @@ in
'';
} ]) eachSite;
};
+ })
+ {
systemd.tmpfiles.rules = flatten (mapAttrsToList (hostName: cfg: [
- "d '${stateDir hostName}' 0750 ${user} ${group} - -"
- "d '${cfg.uploadsDir}' 0750 ${user} ${group} - -"
- "Z '${cfg.uploadsDir}' 0750 ${user} ${group} - -"
+ "d '${stateDir hostName}' 0750 ${user} ${webserver.group} - -"
+ "d '${cfg.uploadsDir}' 0750 ${user} ${webserver.group} - -"
+ "Z '${cfg.uploadsDir}' 0750 ${user} ${webserver.group} - -"
]) eachSite);
systemd.services = mkMerge [
@@ -350,7 +388,7 @@ in
serviceConfig = {
Type = "oneshot";
User = user;
- Group = group;
+ Group = webserver.group;
};
})) eachSite)
@@ -360,9 +398,65 @@ in
];
users.users.${user} = {
- group = group;
+ group = webserver.group;
isSystemUser = true;
};
+ }
- };
+ (mkIf (cfg.webserver == "nginx") {
+ services.nginx = {
+ enable = true;
+ virtualHosts = mapAttrs (hostName: cfg: {
+ serverName = mkDefault hostName;
+ root = "${pkg hostName cfg}/share/wordpress";
+ extraConfig = ''
+ index index.php;
+ '';
+ locations = {
+ "/" = {
+ priority = 200;
+ extraConfig = ''
+ try_files $uri $uri/ /index.php$is_args$args;
+ '';
+ };
+ "~ \\.php$" = {
+ priority = 500;
+ extraConfig = ''
+ fastcgi_split_path_info ^(.+\.php)(/.+)$;
+ fastcgi_pass unix:${config.services.phpfpm.pools."wordpress-${hostName}".socket};
+ fastcgi_index index.php;
+ include "${config.services.nginx.package}/conf/fastcgi.conf";
+ fastcgi_param PATH_INFO $fastcgi_path_info;
+ fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;
+ # Mitigate https://httpoxy.org/ vulnerabilities
+ fastcgi_param HTTP_PROXY "";
+ fastcgi_intercept_errors off;
+ fastcgi_buffer_size 16k;
+ fastcgi_buffers 4 16k;
+ fastcgi_connect_timeout 300;
+ fastcgi_send_timeout 300;
+ fastcgi_read_timeout 300;
+ '';
+ };
+ "~ /\\." = {
+ priority = 800;
+ extraConfig = "deny all;";
+ };
+ "~* /(?:uploads|files)/.*\\.php$" = {
+ priority = 900;
+ extraConfig = "deny all;";
+ };
+ "~* \\.(js|css|png|jpg|jpeg|gif|ico)$" = {
+ priority = 1000;
+ extraConfig = ''
+ expires max;
+ log_not_found off;
+ '';
+ };
+ };
+ }) eachSite;
+ };
+ })
+
+ ]);
}
diff --git a/third_party/nixpkgs/nixos/tests/wordpress.nix b/third_party/nixpkgs/nixos/tests/wordpress.nix
index a5c10c2de7..45c58b5b65 100644
--- a/third_party/nixpkgs/nixos/tests/wordpress.nix
+++ b/third_party/nixpkgs/nixos/tests/wordpress.nix
@@ -10,48 +10,68 @@ import ./make-test-python.nix ({ pkgs, ... }:
];
};
- machine =
- { ... }:
- { services.httpd.adminAddr = "webmaster@site.local";
+ nodes = {
+ wp_httpd = { ... }: {
+ services.httpd.adminAddr = "webmaster@site.local";
services.httpd.logPerVirtualHost = true;
- services.wordpress."site1.local" = {
- database.tablePrefix = "site1_";
- };
-
- services.wordpress."site2.local" = {
- database.tablePrefix = "site2_";
+ services.wordpress = {
+ # Test support for old interface
+ "site1.local" = {
+ database.tablePrefix = "site1_";
+ };
+ sites = {
+ "site2.local" = {
+ database.tablePrefix = "site2_";
+ };
+ };
};
+ networking.firewall.allowedTCPPorts = [ 80 ];
networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ];
};
+ wp_nginx = { ... }: {
+ services.wordpress.webserver = "nginx";
+ services.wordpress.sites = {
+ "site1.local" = {
+ database.tablePrefix = "site1_";
+ };
+ "site2.local" = {
+ database.tablePrefix = "site2_";
+ };
+ };
+
+ networking.firewall.allowedTCPPorts = [ 80 ];
+ networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ];
+ };
+ };
+
testScript = ''
import re
start_all()
- machine.wait_for_unit("httpd")
-
- machine.wait_for_unit("phpfpm-wordpress-site1.local")
- machine.wait_for_unit("phpfpm-wordpress-site2.local")
+ wp_httpd.wait_for_unit("httpd")
+ wp_nginx.wait_for_unit("nginx")
site_names = ["site1.local", "site2.local"]
- with subtest("website returns welcome screen"):
+ for machine in (wp_httpd, wp_nginx):
for site_name in site_names:
- assert "Welcome to the famous" in machine.succeed(f"curl -fL {site_name}")
+ machine.wait_for_unit(f"phpfpm-wordpress-{site_name}")
- with subtest("wordpress-init went through"):
- for site_name in site_names:
- info = machine.get_unit_info(f"wordpress-init-{site_name}")
- assert info["Result"] == "success"
+ with subtest("website returns welcome screen"):
+ assert "Welcome to the famous" in machine.succeed(f"curl -L {site_name}")
- with subtest("secret keys are set"):
- pattern = re.compile(r"^define.*NONCE_SALT.{64,};$", re.MULTILINE)
- for site_name in site_names:
- assert pattern.search(
- machine.succeed(f"cat /var/lib/wordpress/{site_name}/secret-keys.php")
- )
+ with subtest("wordpress-init went through"):
+ info = machine.get_unit_info(f"wordpress-init-{site_name}")
+ assert info["Result"] == "success"
+
+ with subtest("secret keys are set"):
+ pattern = re.compile(r"^define.*NONCE_SALT.{64,};$", re.MULTILINE)
+ assert pattern.search(
+ machine.succeed(f"cat /var/lib/wordpress/{site_name}/secret-keys.php")
+ )
'';
})
diff --git a/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix
new file mode 100644
index 0000000000..b6dea53012
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix
@@ -0,0 +1,75 @@
+{ stdenv, fetchurl, alsa-lib, cairo, dpkg, freetype
+, gdk-pixbuf, glib, gtk3, lib, xorg
+, libglvnd, libjack2, ffmpeg
+, libxkbcommon, xdg-utils, zlib, pulseaudio
+, wrapGAppsHook, makeWrapper }:
+
+stdenv.mkDerivation rec {
+ pname = "bitwig-studio";
+ version = "4.0";
+
+ src = fetchurl {
+ url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb";
+ sha256 = "38381c1a382abd9543931f34d5ae1789c31ec1217a1c852b5c5c442ccaf97063";
+ };
+
+ nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ];
+
+ unpackCmd = ''
+ mkdir -p root
+ dpkg-deb -x $curSrc root
+ '';
+
+ dontBuild = true;
+ dontWrapGApps = true; # we only want $gappsWrapperArgs here
+
+ buildInputs = with xorg; [
+ alsa-lib cairo freetype gdk-pixbuf glib gtk3 libxcb xcbutil xcbutilwm zlib libXtst libxkbcommon pulseaudio libjack2 libX11 libglvnd libXcursor stdenv.cc.cc.lib
+ ];
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/bin
+ cp -r opt/bitwig-studio $out/libexec
+ ln -s $out/libexec/bitwig-studio $out/bin/bitwig-studio
+ cp -r usr/share $out/share
+ substitute usr/share/applications/com.bitwig.BitwigStudio.desktop \
+ $out/share/applications/com.bitwig.BitwigStudio.desktop \
+ --replace /usr/bin/bitwig-studio $out/bin/bitwig-studio
+
+ runHook postInstall
+ '';
+
+ postFixup = ''
+ # patchelf fails to set rpath on BitwigStudioEngine, so we use
+ # the LD_LIBRARY_PATH way
+
+ find $out -type f -executable \
+ -not -name '*.so.*' \
+ -not -name '*.so' \
+ -not -name '*.jar' \
+ -not -path '*/resources/*' | \
+ while IFS= read -r f ; do
+ patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" $f
+ wrapProgram $f \
+ "''${gappsWrapperArgs[@]}" \
+ --prefix PATH : "${lib.makeBinPath [ xdg-utils ffmpeg ]}" \
+ --suffix LD_LIBRARY_PATH : "${lib.strings.makeLibraryPath buildInputs}"
+ done
+
+ '';
+
+ meta = with lib; {
+ description = "A digital audio workstation";
+ longDescription = ''
+ Bitwig Studio is a multi-platform music-creation system for
+ production, performance and DJing, with a focus on flexible
+ editing tools and a super-fast workflow.
+ '';
+ homepage = "https://www.bitwig.com/";
+ license = licenses.unfree;
+ platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [ bfortz michalrus mrVanDalo ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix b/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix
index db0f69c80a..d81ab4b3ac 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeWrapper, openssl, freetype
+{ fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeWrapper, wrapGAppsHook, openssl, freetype
, glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify
, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curl, zlib, gnome
, at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon
@@ -82,7 +82,7 @@ stdenv.mkDerivation {
sha512 = "dabb55d2ba41f977b6d3f03bfcf147d11785136dd1277efc62011c8371ef25cc04531266bd16608639b9b6a500c1a18a45f44ba7a43e17ab5ac139e36eff7149";
};
- nativeBuildInputs = [ makeWrapper squashfsTools ];
+ nativeBuildInputs = [ makeWrapper wrapGAppsHook squashfsTools ];
dontStrip = true;
dontPatchELF = true;
@@ -109,6 +109,9 @@ stdenv.mkDerivation {
runHook postUnpack
'';
+ # Prevent double wrapping
+ dontWrapGApps = true;
+
installPhase =
''
runHook preInstall
@@ -138,6 +141,7 @@ stdenv.mkDerivation {
librarypath="${lib.makeLibraryPath deps}:$libdir"
wrapProgram $out/share/spotify/spotify \
+ ''${gappsWrapperArgs[@]} \
--prefix LD_LIBRARY_PATH : "$librarypath" \
--prefix PATH : "${gnome.zenity}/bin"
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin.nix b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin.nix
index 162a5ddee1..00727d294d 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin.nix
@@ -1,21 +1,22 @@
-{ lib, stdenv
+{ lib
+, stdenv
, fetchurl
-, pkg-config
, autoreconfHook
+, pkg-config
+, util-linux
+, hexdump
+, wrapQtAppsHook ? null
+, boost
+, libevent
+, miniupnpc
+, zeromq
+, zlib
, db48
, sqlite
-, boost
-, zeromq
-, hexdump
-, zlib
-, miniupnpc
+, qrencode
, qtbase ? null
, qttools ? null
-, wrapQtAppsHook ? null
-, util-linux
, python3
-, qrencode
-, libevent
, nixosTests
, withGui
, withWallet ? true
@@ -43,13 +44,14 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs =
- [ pkg-config autoreconfHook ]
- ++ optional stdenv.isDarwin hexdump
- ++ optional withGui wrapQtAppsHook;
- buildInputs = [ boost zlib zeromq miniupnpc libevent ]
+ [ autoreconfHook pkg-config ]
++ optionals stdenv.isLinux [ util-linux ]
+ ++ optionals stdenv.isDarwin [ hexdump ]
+ ++ optionals withGui [ wrapQtAppsHook ];
+
+ buildInputs = [ boost libevent miniupnpc zeromq zlib ]
++ optionals withWallet [ db48 sqlite ]
- ++ optionals withGui [ qtbase qttools qrencode ];
+ ++ optionals withGui [ qrencode qtbase qttools ];
postInstall = optional withGui ''
install -Dm644 ${desktop} $out/share/applications/bitcoin-qt.desktop
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/elements.nix b/third_party/nixpkgs/pkgs/applications/blockchains/elements.nix
new file mode 100644
index 0000000000..c44f2078da
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/elements.nix
@@ -0,0 +1,86 @@
+{ lib
+, stdenv
+, fetchurl
+, autoreconfHook
+, pkg-config
+, util-linux
+, hexdump
+, wrapQtAppsHook ? null
+, boost
+, libevent
+, miniupnpc
+, zeromq
+, zlib
+, db48
+, sqlite
+, qrencode
+, qtbase ? null
+, qttools ? null
+, python3
+, openssl
+, withGui
+, withWallet ? true
+}:
+
+with lib;
+stdenv.mkDerivation rec {
+ pname = if withGui then "elements" else "elementsd";
+ version = "0.18.1.12";
+
+ src = fetchurl {
+ url = "https://github.com/ElementsProject/elements/archive/elements-${version}.tar.gz";
+ sha256 = "84a51013596b09c62913649ac90373622185f779446ee7e65b4b258a2876609f";
+ };
+
+ nativeBuildInputs =
+ [ autoreconfHook pkg-config ]
+ ++ optionals stdenv.isLinux [ util-linux ]
+ ++ optionals stdenv.isDarwin [ hexdump ]
+ ++ optionals withGui [ wrapQtAppsHook ];
+
+ buildInputs = [ boost libevent miniupnpc zeromq zlib openssl ]
+ ++ optionals withWallet [ db48 sqlite ]
+ ++ optionals withGui [ qrencode qtbase qttools ];
+
+ configureFlags = [
+ "--with-boost-libdir=${boost.out}/lib"
+ "--disable-bench"
+ ] ++ optionals (!doCheck) [
+ "--disable-tests"
+ "--disable-gui-tests"
+ ] ++ optionals (!withWallet) [
+ "--disable-wallet"
+ ] ++ optionals withGui [
+ "--with-gui=qt5"
+ "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
+ ];
+
+ checkInputs = [ python3 ];
+
+ doCheck = true;
+
+ checkFlags =
+ [ "LC_ALL=C.UTF-8" ]
+ # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI.
+ # See also https://github.com/NixOS/nixpkgs/issues/24256
+ ++ optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}";
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "Open Source implementation of advanced blockchain features extending the Bitcoin protocol";
+ longDescription= ''
+ The Elements blockchain platform is a collection of feature experiments and extensions to the
+ Bitcoin protocol. This platform enables anyone to build their own businesses or networks
+ pegged to Bitcoin as a sidechain or run as a standalone blockchain with arbitrary asset
+ tokens.
+ '';
+ homepage = "https://www.github.com/ElementsProject/elements";
+ maintainers = with maintainers; [ prusnak ];
+ license = licenses.mit;
+ platforms = platforms.unix;
+ # Qt GUI is currently broken in upstream
+ # No rule to make target 'qt/res/rendered_icons/about.png', needed by 'qt/qrc_bitcoin.cpp'.
+ broken = withGui;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix
index 59e09939e8..d7a27dd4bc 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/monero-gui/default.nix
@@ -9,14 +9,9 @@
, boost, libunwind, libsodium, pcsclite
, randomx, zeromq, libgcrypt, libgpgerror
, hidapi, rapidjson, quirc
-, trezorSupport ? true
-, libusb1
-, protobuf
-, python3
+, trezorSupport ? true, libusb1, protobuf, python3
}:
-with lib;
-
stdenv.mkDerivation rec {
pname = "monero-gui";
version = "0.17.2.2";
@@ -30,7 +25,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake pkg-config wrapQtAppsHook
- (getDev qttools)
+ (lib.getDev qttools)
];
buildInputs = [
@@ -41,8 +36,8 @@ stdenv.mkDerivation rec {
randomx libgcrypt libgpgerror
boost libunwind libsodium pcsclite
zeromq hidapi rapidjson quirc
- ] ++ optionals trezorSupport [ libusb1 protobuf python3 ]
- ++ optionals stdenv.isDarwin [ qtmacextras ];
+ ] ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ]
+ ++ lib.optionals stdenv.isDarwin [ qtmacextras ];
postUnpack = ''
# copy monero sources here
@@ -98,7 +93,7 @@ stdenv.mkDerivation rec {
done;
'';
- meta = {
+ meta = with lib; {
description = "Private, secure, untraceable currency";
homepage = "https://getmonero.org/";
license = licenses.bsd3;
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/monero/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/monero/default.nix
index 2a12bfe872..7dd2e56902 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/monero/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/monero/default.nix
@@ -4,17 +4,9 @@
, zeromq, pcsclite, readline, libsodium, hidapi
, randomx, rapidjson
, CoreData, IOKit, PCSC
-, trezorSupport ? true
-, libusb1 ? null
-, protobuf ? null
-, python3 ? null
+, trezorSupport ? true, libusb1, protobuf, python3
}:
-with lib;
-
-assert stdenv.isDarwin -> IOKit != null;
-assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ];
-
stdenv.mkDerivation rec {
pname = "monero";
version = "0.17.2.0";
@@ -45,8 +37,8 @@ stdenv.mkDerivation rec {
zeromq pcsclite readline
libsodium hidapi randomx rapidjson
protobuf
- ] ++ optionals stdenv.isDarwin [ IOKit CoreData PCSC ]
- ++ optionals trezorSupport [ libusb1 protobuf python3 ];
+ ] ++ lib.optionals stdenv.isDarwin [ IOKit CoreData PCSC ]
+ ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ];
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
@@ -54,7 +46,7 @@ stdenv.mkDerivation rec {
"-DBUILD_GUI_DEPS=ON"
"-DReadline_ROOT_DIR=${readline.dev}"
"-DRandomX_ROOT_DIR=${randomx}"
- ] ++ optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF";
+ ] ++ lib.optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF";
outputs = [ "out" "source" ];
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/oxen/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/oxen/default.nix
new file mode 100644
index 0000000000..6fd91495b4
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/oxen/default.nix
@@ -0,0 +1,67 @@
+{ stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch
+, cmake, pkg-config
+, boost, openssl, unbound
+, pcsclite, readline, libsodium, hidapi
+, rapidjson
+, curl, sqlite
+, trezorSupport ? true
+, libusb1
+, protobuf
+, python3
+}:
+
+stdenv.mkDerivation rec {
+ pname = "oxen";
+ version = "9.1.3";
+
+ src = fetchFromGitHub {
+ owner = "oxen-io";
+ repo = "oxen-core";
+ rev = "v${version}";
+ sha256 = "11g3wqn0syk47yfcsdql5737kpad8skwdxhifn2yaz9zy8n3xqqb";
+ fetchSubmodules = true;
+ };
+
+ # Required for static linking, the only supported install path
+ lbzmqsrc = fetchurl {
+ url = "https://github.com/zeromq/libzmq/releases/download/v4.3.3/zeromq-4.3.3.tar.gz";
+ sha512 = "4c18d784085179c5b1fcb753a93813095a12c8d34970f2e1bfca6499be6c9d67769c71c68b7ca54ff181b20390043170e89733c22f76ff1ea46494814f7095b1";
+ };
+
+ postPatch = ''
+ # remove vendored libraries
+ rm -r external/rapidjson
+ sed -i s,/lib/,/lib64/, external/loki-mq/cmake/local-libzmq//LocalLibzmq.cmake
+ '';
+
+ postInstall = ''
+ rm -R $out/lib $out/include
+ '';
+
+ nativeBuildInputs = [ cmake pkg-config ];
+
+ buildInputs = [
+ boost openssl unbound
+ pcsclite readline
+ libsodium hidapi rapidjson
+ protobuf curl sqlite
+ ] ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ];
+
+ cmakeFlags = [
+ "-DCMAKE_BUILD_TYPE=Release"
+ # "-DUSE_DEVICE_TREZOR=ON"
+ # "-DBUILD_GUI_DEPS=ON"
+ "-DReadline_ROOT_DIR=${readline.dev}"
+ # It build with shared libs but doesn't install them. Fail.
+ # "-DBUILD_SHARED_LIBS=ON"
+ "-DLIBZMQ_TARBALL_URL=${lbzmqsrc}"
+ ] ++ lib.optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF";
+
+ meta = with lib; {
+ description = "Private cryptocurrency based on Monero";
+ homepage = "https://oxen.io/";
+ license = licenses.bsd3;
+ platforms = platforms.all;
+ maintainers = [ maintainers.viric ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
index 02a9a6e656..69db13fec1 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
@@ -21,7 +21,7 @@ formats commits for you.
*/
-{ lib, stdenv, texinfo, writeText }:
+{ lib, stdenv, texinfo, writeText, gcc }:
self: let
@@ -32,7 +32,7 @@ self: let
};
elpaBuild = import ../../../../build-support/emacs/elpa.nix {
- inherit lib stdenv texinfo writeText;
+ inherit lib stdenv texinfo writeText gcc;
inherit (self) emacs;
};
diff --git a/third_party/nixpkgs/pkgs/applications/editors/lighttable/default.nix b/third_party/nixpkgs/pkgs/applications/editors/lighttable/default.nix
index b19b1ac2b6..0b550c5f11 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/lighttable/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/lighttable/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
sha256 = "06fj725xfhf3fwrf7dya7ijmxq3v76kfmd4lr2067a92zhlwr5pv";
};
- phases = [ "installPhase" ];
+ dontConfigure = true;
installPhase = ''
tar xf ${src}
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/fig2dev/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/fig2dev/default.nix
index c7484f4cbf..31d14185dc 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/fig2dev/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/fig2dev/default.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchurl
+, fetchpatch
, ghostscript
, libpng
, makeWrapper
@@ -20,6 +21,15 @@ stdenv.mkDerivation rec {
sha256 = "1bm75lf9j54qpbjx8hzp6ixaayp1x9w4v3yxl6vxyw8g5m4sqdk3";
};
+ patches = [
+ (fetchpatch {
+ name = "CVE-2021-3561.patch";
+ # Using Debian patch since it is not possible to download it directly from Sourceforge
+ url = "https://sources.debian.org/data/main/f/fig2dev/1:3.2.8-3/debian/patches/33_sanitize-color.patch";
+ sha256 = "1bppr3li03nj4qjibnddr2f38mpk55pcn5z6k98pf00gabq33fgs";
+ })
+ ];
+
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ libpng ];
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/swingsane/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/swingsane/default.nix
index e9507129a2..c9d119a7d6 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/swingsane/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/swingsane/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ unzip ];
- phases = [ "unpackPhase" "installPhase" ];
+ dontConfigure = true;
installPhase = let
diff --git a/third_party/nixpkgs/pkgs/applications/kde/spectacle.nix b/third_party/nixpkgs/pkgs/applications/kde/spectacle.nix
index c6861b218d..587877ad7a 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/spectacle.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/spectacle.nix
@@ -1,24 +1,26 @@
-{
- mkDerivation, lib,
- extra-cmake-modules, kdoctools,
- ki18n, xcb-util-cursor,
- kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins,
- knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi,
- qtx11extras, knewstuff, kwayland, qttools
+{ mkDerivation, lib
+, extra-cmake-modules, kdoctools
+, ki18n, xcb-util-cursor
+, kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins
+, knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi
+, qtbase, qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator
}:
mkDerivation {
pname = "spectacle";
- meta = with lib; { maintainers = with maintainers; [ ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor
- knewstuff kwayland
+ knewstuff kwayland kcolorpicker kimageannotator
];
postPatch = ''
substituteInPlace desktop/org.kde.spectacle.desktop.cmake \
--replace "Exec=@QtBinariesDir@/qdbus" "Exec=${lib.getBin qttools}/bin/qdbus"
'';
propagatedUserEnvPkgs = [ kipi-plugins libkipi ];
+ meta = with lib; {
+ maintainers = with maintainers; [ ttuegel ];
+ broken = versionOlder qtbase.version "5.15";
+ };
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/archivy/default.nix b/third_party/nixpkgs/pkgs/applications/misc/archivy/default.nix
index 08d5524fc3..0a89e4f476 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/archivy/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/archivy/default.nix
@@ -21,11 +21,11 @@
buildPythonApplication rec {
pname = "archivy";
- version = "1.3.1";
+ version = "1.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-g7H22zJOQuxSmoJ3373eRcbderC67vkuiLN1CgaytFM=";
+ sha256 = "sha256-wQuR7cltDLr2u8BQ851MSjKmeLW8mQ/3bdEF5c9nxL0=";
};
# Relax some dependencies
@@ -38,7 +38,10 @@ buildPythonApplication rec {
--replace 'python_frontmatter == 0.5.0' 'python_frontmatter' \
--replace 'requests ==' 'requests >=' \
--replace 'validators ==' 'validators >=' \
- --replace 'tinydb ==' 'tinydb >='
+ --replace 'tinydb ==' 'tinydb >=' \
+ --replace 'Flask_WTF == 0.14.3' 'Flask_WTF' \
+ --replace 'Werkzeug ==' 'Werkzeug >=' \
+ --replace 'Flask ==' 'Flask >='
'';
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/misc/dmenu/wayland.nix b/third_party/nixpkgs/pkgs/applications/misc/dmenu/wayland.nix
index 8d77588ce8..6b8f92ddb1 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/dmenu/wayland.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/dmenu/wayland.nix
@@ -1,5 +1,6 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, cairo, pango, pkg-config, wayland-protocols
-, glib, wayland, libxkbcommon, makeWrapper
+, glib, wayland, libxkbcommon, makeWrapper, wayland-scanner
+, fetchpatch
}:
stdenv.mkDerivation rec {
@@ -15,9 +16,19 @@ stdenv.mkDerivation rec {
outputs = [ "out" "man" ];
- nativeBuildInputs = [ meson ninja pkg-config makeWrapper ];
+ depsBuildBuild = [ pkg-config ];
+ nativeBuildInputs = [ meson ninja pkg-config makeWrapper wayland-scanner ];
buildInputs = [ cairo pango wayland-protocols glib wayland libxkbcommon ];
+ # Patch to support cross-compilation, see https://github.com/nyyManni/dmenu-wayland/pull/23/
+ patches = [
+ # can be removed when https://github.com/nyyManni/dmenu-wayland/pull/23 is included
+ (fetchpatch {
+ url = "https://github.com/nyyManni/dmenu-wayland/commit/3434410de5dcb007539495395f7dc5421923dd3a.patch";
+ sha256 = "sha256-im16kU8RWrCY0btYOYjDp8XtfGEivemIPlhwPX0C77o=";
+ })
+ ];
+
postInstall = ''
wrapProgram $out/bin/dmenu-wl_run \
--prefix PATH : $out/bin
diff --git a/third_party/nixpkgs/pkgs/applications/misc/dstask/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dstask/default.nix
index cd1c659ec5..c17ed9b3af 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/dstask/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/dstask/default.nix
@@ -36,7 +36,7 @@ buildGoModule rec {
description = "Command line todo list with super-reliable git sync";
homepage = src.meta.homepage;
license = licenses.mit;
- maintainers = with maintainers; [ stianlagstad foxit64 ];
+ maintainers = with maintainers; [ stianlagstad ];
platforms = platforms.linux;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gopacked/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gopacked/default.nix
index 57f6be40ab..42b886e4c7 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/gopacked/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/gopacked/default.nix
@@ -19,7 +19,6 @@ buildGoModule rec {
description = "A simple text-based Minecraft modpack manager";
license = licenses.agpl3;
homepage = src.meta.homepage;
- maintainers = with maintainers; [ foxit64 ];
+ maintainers = with maintainers; [ ];
};
-
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-wrapper/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nwg-wrapper/default.nix
new file mode 100644
index 0000000000..9567b051f5
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-wrapper/default.nix
@@ -0,0 +1,41 @@
+{ lib, python3Packages, fetchFromGitHub, gtk-layer-shell, gtk3, gobject-introspection, wrapGAppsHook, wlr-randr }:
+
+python3Packages.buildPythonPackage rec {
+ pname = "nwg-wrapper";
+ version = "0.0.1";
+
+ src = fetchFromGitHub {
+ owner = "nwg-piotr";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1rpkcjr0chmgsfkan88lsi476bamg9a6y7h0x9zsh60a9rdf7dl8";
+ };
+
+ nativeBuildInputs = [ gobject-introspection wrapGAppsHook ];
+
+ buildInputs = [ gtk3 gtk-layer-shell ];
+
+ propagatedBuildInputs = with python3Packages; [ i3ipc pygobject3 ];
+
+ # ValueError: Namespace GtkLayerShell not available
+ strictDeps = false;
+
+ # No tests
+ doCheck = false;
+
+ preFixup = ''
+ makeWrapperArgs+=(
+ "''${gappsWrapperArgs[@]}"
+ --prefix PATH : "${lib.makeBinPath [ wlr-randr ]}"
+ )
+ '';
+
+ pythonImportsCheck = [ "nwg_wrapper" ];
+
+ meta = with lib; {
+ description = "Wrapper to display a script output or a text file content on the desktop in sway or other wlroots-based compositors";
+ homepage = "https://github.com/nwg-piotr/nwg-wrapper/";
+ license = licenses.mit;
+ maintainers = with maintainers; [ artturin ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/phoc/default.nix b/third_party/nixpkgs/pkgs/applications/misc/phoc/default.nix
index 2e3f323051..aad2a4d0e4 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/phoc/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/phoc/default.nix
@@ -36,14 +36,14 @@ let
});
in stdenv.mkDerivation rec {
pname = "phoc";
- version = "0.7.0";
+ version = "0.7.1";
src = fetchFromGitLab {
domain = "source.puri.sm";
owner = "Librem5";
repo = pname;
rev = "v${version}";
- sha256 = "0afiyr2slg38ksrqn19zygsmjy9k5bpwv6n7zjas3s5djr6hch45";
+ sha256 = "0n188xa2pwl4258naxhz45cvipcid8y1zvlbddll9xydrrh9bwqn";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/get-commit-message.py b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/get-commit-message.py
index 2768e31bd0..7a91b74c83 100755
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/get-commit-message.py
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/get-commit-message.py
@@ -19,14 +19,14 @@ for entry in feed.entries:
continue
url = requests.get(entry.link).url.split('?')[0]
content = entry.content[0].value
+ content = html_tags.sub('', content) # Remove any HTML tags
if re.search(r'Linux', content) is None:
continue
#print(url) # For debugging purposes
version = re.search(r'\d+(\.\d+){3}', content).group(0)
print('chromium: TODO -> ' + version)
print('\n' + url)
- if fixes := re.search(r'This update includes .+ security fixes\.', content):
- fixes = html_tags.sub('', fixes.group(0))
+ if fixes := re.search(r'This update includes .+ security fixes\.', content).group(0):
zero_days = re.search(r'Google is aware( of reports)? that .+ in the wild\.', content)
if zero_days:
fixes += " " + zero_days.group(0)
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json
index a8afe2ea8a..6860612b88 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -1,8 +1,8 @@
{
"stable": {
- "version": "91.0.4472.114",
- "sha256": "0wbyiwbdazgjjgj9vs56x26q3g9r80a57gfl0f2rfl1j7xwgxiy1",
- "sha256bin64": "00ac1dyqxpxy1j11jvc5j35bgc629n2f2pll3912gzih4ir0vrys",
+ "version": "91.0.4472.164",
+ "sha256": "1g96hk72ds2b0aymgw7yjr0akgx7mkp17i99nk511ncnmni6zrc4",
+ "sha256bin64": "1j6p2gqlikaibcwa40k46dsm9jlrpbj21lv1snnjw8apjnjfd2wr",
"deps": {
"gn": {
"version": "2021-04-06",
@@ -18,9 +18,9 @@
}
},
"beta": {
- "version": "92.0.4515.93",
- "sha256": "077i1rw84cgcmg2k0p1ycg5pwvnhgsa3qdfsr7icrn7gmagagqd0",
- "sha256bin64": "1gf4qv8wvaagdgsinf2gprx9wcfgm8jql6870k50bi26mjqv9800",
+ "version": "92.0.4515.101",
+ "sha256": "1jcas265hhlqd9f63h4zw4n4xsl26c5zmjlmbf1px5icvcjfb2xd",
+ "sha256bin64": "0sb5l5nzfzisvrnhcfwhdh9rn6z6pkzqz4p92c40q2mlhmjrfhj0",
"deps": {
"gn": {
"version": "2021-05-07",
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 3410ab5a25..12c76c8e4d 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,975 +1,975 @@
{
- version = "89.0.2";
+ version = "90.0";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ach/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ach/firefox-90.0.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha256 = "7de9c1dc38a4508aeca588a6ad49ededef067fe7589b099f1e4bdda2dfc99d60";
+ sha256 = "b21effb602d202574d3498a2a1d4d381f1581eb794691123fa00eb25adb21b5a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/af/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/af/firefox-90.0.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha256 = "bdff1c8983f94e4f9237cfbbeed6a9e10dabd029e3f4efaf9f8ed0d4cd04db6d";
+ sha256 = "2ee727fe495f586ca0f825e1bbadd4d737b1c6e4050ad1e77f3cb84cd9d50e3a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/an/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/an/firefox-90.0.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha256 = "f2e1157d325a91d41600db763dedbf2344dbcb07c1af04ba02079a3c134a76b5";
+ sha256 = "f33700fc2178d6ea0bc6bd47cf16744a7551e3987abe9cd9bb891cd48a019000";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ar/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ar/firefox-90.0.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha256 = "dc65f87a192c5940053e1d696f0b82dd9c4dfd4e1b9ffa70e7e608bd81622e53";
+ sha256 = "5633334afb6a338a861b665c78209ba13558c0b6dfab44f80cd690533633575d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ast/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ast/firefox-90.0.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha256 = "96305dcf9c86fa8357fc691ace8496916effc32896416e3507263e740256fe00";
+ sha256 = "98fff4f8216441b7b404dc00ca4bbd3b8161514dde85bfe56c23ea15a20c1ba6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/az/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/az/firefox-90.0.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha256 = "8f5a0a0050bbd221700d3dc65b749393d855ac0b93288d498ed6911aa727f577";
+ sha256 = "02a48160df4f22842f09bbf54190ed91f83f0b0af9b15134ce6f83a163de8891";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/be/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/be/firefox-90.0.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha256 = "cad622598b126c17049fd2c18cb8c5cfc0b08a41559b872d2cd474eedd8cc64c";
+ sha256 = "1848205609b3bb57a84fb2ddd002e57868dce7f2046a4603e2058fb4bf6b4046";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/bg/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/bg/firefox-90.0.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha256 = "60dcc88ee1532178b601fca3fa1711b83ef40a58f38ecdbd2abf504a74650f51";
+ sha256 = "27a40aba90c5b8ef51d2077770ee0803e0d8327db36d1f95a463c54ca74a7536";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/bn/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/bn/firefox-90.0.tar.bz2";
locale = "bn";
arch = "linux-x86_64";
- sha256 = "d8d48d57861c369631762141ff3230ea6877d1cfa25ab445ff8482c3505336ef";
+ sha256 = "490da4669e9711bbdb309abba2251b88407ec843065b5c81e61cae5be59d8e9e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/br/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/br/firefox-90.0.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha256 = "93753f265ddab79e1632b17a39ff009d4b0831a57b522fbd042b85ac1b0e4526";
+ sha256 = "be50bcfb6bfc9144cf690165801abc294dfa9b67597d727f7707025b8a61be97";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/bs/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/bs/firefox-90.0.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha256 = "e0f253a239e7bbd89d051377ad3250160154568f92ae7ca7e813b202fb3ab2af";
+ sha256 = "90fcf0f8a7fa13ca4157ec710e06053485df7e47264ba46bebe4551154244b89";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ca-valencia/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ca-valencia/firefox-90.0.tar.bz2";
locale = "ca-valencia";
arch = "linux-x86_64";
- sha256 = "7aee988a5af50bc98cd9d8ec7beb2c4dcb7183a736be1fc47b5535280a20f7dc";
+ sha256 = "bb32faff40658d974d9f1909ee574043c3501d7d5149629a8abce919aeb37232";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ca/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ca/firefox-90.0.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha256 = "ce9617a904bb05391525af0eb6119f333a04d01ae6eecc60096d1bb159296933";
+ sha256 = "bd5b977e54ee504dce9aafcb093419b23da0c85ca1f84c6c0060014d3ec3b32a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/cak/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/cak/firefox-90.0.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha256 = "a20708a942536373236c784a93d67a53623dd389c42167d09ddfd2577456d5b4";
+ sha256 = "aa2e5b116ebfc296cfb6522b2b35bf006cd2d4154b04d20ac4c6a720fad90008";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/cs/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/cs/firefox-90.0.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha256 = "4d40e2d2f8bb1d3a3c2f7319dec6106b1781d717d430bd6e75db3cd8b12af31f";
+ sha256 = "ec9b5c46617f9ef8f29374793c8a5f272d370b9e974d004ec0db85a65b5a76d3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/cy/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/cy/firefox-90.0.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha256 = "0b7dc949e79d29534651b450c29b9e7458817e4286cdbf7a8602855b5c0057a4";
+ sha256 = "17ef10b7e321db0374c87595d13e4bad57707902dd02a4a20e7f375ff328b905";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/da/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/da/firefox-90.0.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha256 = "ab37e800cb1f5ced51c3fb18534200a5d68586a31f649d6c7d5e475ea2bc28a9";
+ sha256 = "46d83a4256eb11f5db42039184e0ed138280f21ecdbafb1e7533399cfd58f88d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/de/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/de/firefox-90.0.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha256 = "6233b625e67bbbc5432daf596e4e654dbecb02e7f8a5511f07f6ab015a07ecdb";
+ sha256 = "b4417505454008a2722c691c9006450d90ec80c7461eaf0ecb9b4f9cc0883ed0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/dsb/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/dsb/firefox-90.0.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha256 = "2468c1b03785a381525e4fe58ec106337ae8414a3d46894b7a00fc81c1859ba3";
+ sha256 = "8eec9d5753aaa92c31fd52556595c9fb5889f36904cb05722bb2d727fa618941";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/el/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/el/firefox-90.0.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha256 = "1a77f00567ef8a255a012a33c8ca2d66e0b1ee379c555b110cc660846262e482";
+ sha256 = "ca3e4958df9aedc5e6e1f5a9a8778248cc8b3f8b988b143aa2da94a8fbc6b3af";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/en-CA/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/en-CA/firefox-90.0.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha256 = "f94fe35737d04152809893a775e411d8d92503addda508414c0d8ddc3d40e513";
+ sha256 = "341f133b3787746993df3e9176601b485bb7a0a16c7a294e7de64f8af39c2ac7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/en-GB/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/en-GB/firefox-90.0.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha256 = "bf610dacccf834f4f62c96215e8a9620493d08ef2b2445b675ddef36c1eba036";
+ sha256 = "13343f3cb63be5c02ee7c8d6883ff473681bff8f55377f74095768c87109f620";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/en-US/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/en-US/firefox-90.0.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha256 = "964b6b515151bb9a0f4e90e9902afd09ff64bfaafa231480b9829264d36fd76f";
+ sha256 = "29fd51b6316d1e589220c2f47e5ff7cdd996cddd450f64ce1dd28ed0e8e4e8fa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/eo/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/eo/firefox-90.0.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha256 = "e2e4da131a01355c4cc6710ef04b61963609026455d4e8bb51c2675ac44d4a94";
+ sha256 = "41c9ed4d9da13fa798e6d75e67b854b84fa0bb76a0771d387a1cf3261838408d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/es-AR/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/es-AR/firefox-90.0.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha256 = "7d5ef9dc2667570752b65cadc3851dda050afad82b9af8de35565d7c56b9dfe2";
+ sha256 = "8b5c954f4942834a93424b2af17e01f1bcea3d07e1ac404cb205b7b53094088c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/es-CL/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/es-CL/firefox-90.0.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha256 = "018f07814bf6ddf7891a1c6104ddf6f10dd0bb9595772a367fc0f66b0f1586a2";
+ sha256 = "cdd4eefae21d33263feb67f020e727e4f9d569a49a0311483f24837a19a88c49";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/es-ES/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/es-ES/firefox-90.0.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha256 = "9076d5dfd5422a298b7f35b15d57a7793fc4a84c5acfca02157ae37234a7c526";
+ sha256 = "7cc98380be959aa6375b05b7861e0bd29ab0c2f87824fe0a7a4d0655fb2daf6f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/es-MX/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/es-MX/firefox-90.0.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha256 = "dfddfbff84b42948ddff2527a819d0e3ffd4272c705a5a9d503b5034e4355ecb";
+ sha256 = "52ab52d3c2d92cb7919b1505f1a72a2a066629f1adb45600c08b5f1a7df7b714";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/et/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/et/firefox-90.0.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha256 = "3f05022e625074b79e7902b1b43ba141c0b39af65b247eb63d80aa38e7d7df56";
+ sha256 = "aacc5ae2e7750d917e117349183afe8f166f4f51ff7c442f205e119c60faec7d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/eu/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/eu/firefox-90.0.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha256 = "9996e2133fdb56856bb744b439cba4f2570e7e2f6c46373c75d967412b8fefc3";
+ sha256 = "c6c9276e9e4ac8f34005f6cc6c6fc8d1ec06a25665d9564e864fd77faf0cf777";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/fa/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/fa/firefox-90.0.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha256 = "2a8d3de485d4ab1f2689f50fa06c40653690b7039617c5286b89a5e1483537ed";
+ sha256 = "a1253cf75cbb09b9aed574464285360c6f4bae185ca2ec0e4ee28ecbe2582c19";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ff/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ff/firefox-90.0.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha256 = "f4efb3e0bc68ae3a905b0e846e6884b3209a3557cef9de9bf43b52987d4b01c3";
+ sha256 = "e7a13e96f1f231053de8599d1a1b75ffe0d10a2303938ffb74b5bf0ad954da41";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/fi/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/fi/firefox-90.0.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha256 = "5d1a787f6d9798d0cbc58b0dbf3fc20892d7dbc0ee1ffaa5a26879578fe8a030";
+ sha256 = "0e7651b6c88fe0308490d716193a16ed6fcfead4f490f299047604c49662a56b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/fr/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/fr/firefox-90.0.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha256 = "c07643b687f699f92c4a3725ad3589f9dbd8ed7ed859e49cc8d8f39242cb6b56";
+ sha256 = "72b35bd4c84d3ea42c40873500177c0cbde37e5ebcbc49c2dc2c5f436d261a15";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/fy-NL/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/fy-NL/firefox-90.0.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha256 = "3cbf0aa2f6fd2842c11b2d774348dc7656f92e78c1dc15e351b30e772a7e3e6f";
+ sha256 = "62aa9cb69604233483bd7d510980f4b6a1c96874e98effa9d4179b150f4118a1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ga-IE/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ga-IE/firefox-90.0.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha256 = "e0a307dff5bee1049446b9657036e336a2d7ab5b8fe9782b3ca83aef595be307";
+ sha256 = "159dabccaab426c9aade1379be14874b04ee099752d38bbf0bca5db6b82dc4b1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/gd/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/gd/firefox-90.0.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha256 = "2ac2e6e617d93df8ca5c3166da944d897940dff279ba842d20b197ed15744971";
+ sha256 = "26b2deeeabf6fb49cd87c138a7c5a1142358db743f2a55468374ad63ff7f60f7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/gl/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/gl/firefox-90.0.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha256 = "359870aa13c2dab4d79bda23c13a43cd899d0fd732089cbd75d44ee2a23ec0c9";
+ sha256 = "31cd8e5029cbad931492ab3dcc0abf9b194e08292f4ab7876ebf662ab707bea7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/gn/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/gn/firefox-90.0.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha256 = "a39e9ccb2d9b6b7f0e9303134a1c8e7081e5d56c1039d734fd390810efc7729f";
+ sha256 = "ccdd7ad239105e642a721a44737165bb075f1e6db74733fc2f5b30c863b8222e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/gu-IN/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/gu-IN/firefox-90.0.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha256 = "e621ffee06c2858633505693c3f7da980a3b69d053d641cf796d85d53dd68af6";
+ sha256 = "a25562ca23e69f03f2d6d106afefcf11c5770820aed885a8efbcef001c256fe0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/he/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/he/firefox-90.0.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha256 = "8258e2b3e70a1c7ad5ca5c49d482b0dca13f61f0ee7c91f1cb4df704e950db5e";
+ sha256 = "e28b51837f7a9c8b8ac4a62bc5b7ac6c834696c8c41c7609b77c9d2807bb05b0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/hi-IN/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/hi-IN/firefox-90.0.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha256 = "1a01c93c3cd83b756dee3a7984187821bf1cfc30460e8ff84cf934f549b0d2ba";
+ sha256 = "8e6a5104be7e05a58e01acae446294d7459289871213e62e26d59076619f674a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/hr/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/hr/firefox-90.0.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha256 = "7b896ceaebbe84e015fa69a02c484dce61358ecc08be81915e944e11fbbb3361";
+ sha256 = "e2d7f357b9574e0892d3cb8672b43ac9532e59c32f9eba0e36bac32d65fb0c25";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/hsb/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/hsb/firefox-90.0.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha256 = "c25fd4d7941e03190bf2472297beb9622825759752e24cde982e1ba5ace2d1dc";
+ sha256 = "9039cd192bb39e3b4a828fdea48630f8e113f54db87644ecf2b3c84eb8201990";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/hu/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/hu/firefox-90.0.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha256 = "d8588d5540b85daf24148671781ea9ff814d550bb2bc4f5b42c58480ec73edb2";
+ sha256 = "98550b7e259df01476dad15cfe8bb3ec055e1ff57041ae73d09156671dcfdf6f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/hy-AM/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/hy-AM/firefox-90.0.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha256 = "e965b9d0c419d930b5d32e5fca9feaf5498c79b862d86890775625bfcf6d4c61";
+ sha256 = "74d34585f9ff86fbd5bf68620964bdad82d7f5b5e0cf7087b12cba3fcc795271";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ia/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ia/firefox-90.0.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha256 = "ca72f852352f39332a8483cd8a237bd341fc5a59dd9691a611e3b376339e9214";
+ sha256 = "fa705d3b2c9dde9e0cd190e183219f879d72a57f7a1209a293a1bf74cc0a86d8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/id/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/id/firefox-90.0.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha256 = "cbce57ce7feebde4bfaf1cc9fb32dbbac93ccbfca3a8bc0f78654825becece21";
+ sha256 = "23bda2ac0b1026bd3443f89e78157cbe47807ae2e0316d68804fd734ed6e196c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/is/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/is/firefox-90.0.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha256 = "469b8167124a958e8d63ac1b1e71936a586e887c747753be484f5761f41c3ac2";
+ sha256 = "257dbec349ed5368a10463a1cf1e21d03c1eac1ed3b093a54b1f28e274ec575c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/it/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/it/firefox-90.0.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha256 = "ebaab65016d9c3a5e04d48589b1ed98d3ce8dfd0fcf1a47c301b35859602ad71";
+ sha256 = "ff19dbc318739dd11cab9424b5058a6ca8396d6988723a4a3d8b72ef7095713d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ja/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ja/firefox-90.0.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha256 = "ca67a104f71c48d61dbf6edc927c4081129aa66f48dfd504edb1ece7a9e2277a";
+ sha256 = "3c3003bf0366ccfe5b6e964720411e06d5622fb5e76ab7f0b2f1d06bb92c8e44";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ka/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ka/firefox-90.0.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha256 = "5b5c42725b471cc505a9b87786fd3197903703235495ca81d87c19d96627da45";
+ sha256 = "70b53851ec2b8e512fbafee0d87b0dd32123019c1ed798f4b03b08fed790af68";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/kab/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/kab/firefox-90.0.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha256 = "0fe867e946add17cfa0d7b55c8141ba2d01d1f369df8ad4afa40c6ac723d13fc";
+ sha256 = "175f112e07f75bda7e42291779655a18601f50c81c84d529874baf3aa1c5bd35";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/kk/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/kk/firefox-90.0.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha256 = "0f2cbf77404aefedae1ef092da3b55ce3f5f781af8a9e7017a458fb535b23ce4";
+ sha256 = "7aa1edddf9f1d55aa307f8954b0a4043fa8f27243331d97ffb21ccbab4439a3e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/km/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/km/firefox-90.0.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha256 = "1bc3a6e917ad851cac0148788da0c74fd3879732aeae5c188d964d2cad4b3c15";
+ sha256 = "45d013eb6a15558722b9633bbcfbe38c74f20964db716797b4c5358a31596b55";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/kn/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/kn/firefox-90.0.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha256 = "77fc84153e242e6f07cce2ed4456e7bb9556ddc1048469ae6dbdec99cc8e96c4";
+ sha256 = "19f7cf799760e51d852981d1217f3303f347631bdc484d44293a85fbe16a2752";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ko/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ko/firefox-90.0.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha256 = "5eda0b318f39eedf6982aaf7965a086372e0750a3acd711d4b7474325216b2da";
+ sha256 = "c2a1aca33c678e225cc66f1f363f666313d41de5629575bccc3244b2246a517a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/lij/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/lij/firefox-90.0.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha256 = "393223aa925d239bb690b910144a702b46be7e8e256ab52b246e1372e7f89275";
+ sha256 = "6645b96ea75cf11afa03d7830fcaeb3cf40ae62a34cd780d703632b04c1c70db";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/lt/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/lt/firefox-90.0.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha256 = "8cac447febbe03018759b56f2e96ce07f78c464aa0da3ebf17fc731da0602b46";
+ sha256 = "c4c9b1c346a2e18d813302094c5048b758db64effd0276fb453d77f76a3795c6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/lv/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/lv/firefox-90.0.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha256 = "5c000888c60575410a8a851bc2ecddbc981c512683411a1d0792e43e07da0c71";
+ sha256 = "3cd2b96471ce03fcc7ce0217ae68534d0f891cbb21c7c325ff37f02e8a96f310";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/mk/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/mk/firefox-90.0.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha256 = "5bf30fa470ad03c9447ea3e53fde900e8a2f51a607066ab50c713a93cd6e9b06";
+ sha256 = "95de1a0db3f284e23741f39c9de13acdb2cc8aa3046387f2c923b2fb41ea9e85";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/mr/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/mr/firefox-90.0.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha256 = "f842218097dc96dfed8726d971a1383dc60e9054f7f974879e88dbcc615daaf1";
+ sha256 = "6336fa56e8eaefc5f30934cb1232bc9b4c5a4a1070612026fd4eaaf79a763af2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ms/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ms/firefox-90.0.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha256 = "dcff05df156a85049712eaf31a5f7676a047c94562529a9cfcad7320f3fcc4c9";
+ sha256 = "1efd8100aa12bc3b2c304837b16638bd23fcc1bebbd1b7cdaf8f07bb642eba09";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/my/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/my/firefox-90.0.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha256 = "f6b159ae83c05440c0d3e2fb4af26b63df4a776702a5afbef837f0846faf41e1";
+ sha256 = "4b9dcf5f8d476ff931a497acfb42747b3b788a031d156b1444126fcece789d68";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/nb-NO/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/nb-NO/firefox-90.0.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha256 = "9a3520ab261ba3c5e599ee04e2a6d494ec6471b8ef1dec266d45ecd530bb1a85";
+ sha256 = "81c5973aa829b52c2ebb3ebe35a355bd65c5e803dd5b02fbfcdb58cad56d768a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ne-NP/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ne-NP/firefox-90.0.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha256 = "d73479851c04957855f3ffa90a14d40ee249ad61013ac101491d1d60bd9ee310";
+ sha256 = "ca1823de015e593f89a78a578fbf136748ae9e56eeb819773c32fc4d21169398";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/nl/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/nl/firefox-90.0.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha256 = "91fa566bc4fb42633e8e0a1ce8cb4c5ae9a3f730d3b4541ec128ba83319320c8";
+ sha256 = "253e19bbca6cdae42673b2f102bf930531a72a6d67ef3c0a93e2c415fefa18e3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/nn-NO/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/nn-NO/firefox-90.0.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha256 = "9e46ca01cbe183474b1fb3e5d59e75629bb272472c0aa3a781fe7e47723a90f7";
+ sha256 = "248d44236b2111f0aa8b49ac97e17353740f983448dc0b5085efca9ca1401ed8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/oc/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/oc/firefox-90.0.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha256 = "d5a208d52747413ef2adbbfcbfd7264351337ee57e53aa3817857c0a996e37ac";
+ sha256 = "85414645c073035536a940f2e2daff958d25213aae01dd5a8617019f5315b9e7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/pa-IN/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/pa-IN/firefox-90.0.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha256 = "d79022a314255210a3eb97f82b9653a20612dc871d6c418afa1a7e0fe63d274d";
+ sha256 = "9ce28522a04464bec876d301380f991e3543e2eb9fabe294066e23ee1a1ffa87";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/pl/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/pl/firefox-90.0.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha256 = "accad8da9a17749f43c676a69391b5b33a9d024624783228eef7ce48af56cb45";
+ sha256 = "6a05196e0b881ca19ed405cd42d3dd377a22e0cc7788971ca3fb3ddb6da5c73d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/pt-BR/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/pt-BR/firefox-90.0.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha256 = "6f9202ef11e2d4368ccd0d6d98daa62ddabeab51087b84fe340bd935fb754f36";
+ sha256 = "e15e7fee01afbd4b585aa74b5de4efbbd2e30cc4e9e87911c4707760c6a8d198";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/pt-PT/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/pt-PT/firefox-90.0.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha256 = "8020109a785542a33f3139fde8b0cea5920ac1618ffceb96bcaa81627c5da772";
+ sha256 = "f76da7fb580424c0d1326f2daf40ba4f27083447bd7051fc77e6162caadd5292";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/rm/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/rm/firefox-90.0.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha256 = "0e97d8aa72831ca0ec8d33f6877fa904bcc2f7ca3795bee85121ce5589388e97";
+ sha256 = "55b0aa8f6dc462190a01f3385ff36cc813fcbd071d0e024c388efd3f247b22f0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ro/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ro/firefox-90.0.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha256 = "6cb71deb1f0b9d42b20d9400d6789b7b9b88a057f505a68491ab493eca0f4313";
+ sha256 = "4d245e0e633e741bf0438603fd0ac76030878bccf69cc28509c018514fbc55be";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ru/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ru/firefox-90.0.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha256 = "a492308ff61a2b4673d178caf47e480376bb6b96ff8965a360f6f49321ee51e2";
+ sha256 = "5687877a5e8dd4c5eb9dcfbde681f1d6fd9997b562d44592956ecc86024c8806";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/si/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/si/firefox-90.0.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha256 = "6858b2100d235dd7770ec003a4e9c2374354ad9f3a682aa9afd2c95ec2b81ff7";
+ sha256 = "4843700d73e84099cbbca968d2d251fbfd012d3230735c22f8dd8e39edb57ed6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/sk/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/sk/firefox-90.0.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha256 = "bf74268fb305ff461e118641cee1b26ba687d9dda294284b2a5d4c7f6e5bb39a";
+ sha256 = "26bf6c61cf9388f3c0f83362a3f6e744cde8aef12bf48de4e5da0debdd232a4d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/sl/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/sl/firefox-90.0.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha256 = "fb2ea5d4b1fa4c7eb88806efed2b3a0c724c5d81f716b54c015d7d976c457f5f";
+ sha256 = "65578af61cfde136408690f38867b141d48205514398af1b7f2771f6c219c513";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/son/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/son/firefox-90.0.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha256 = "75e6a69bf9ca85c1d214202de55f0b5c831b41c22d375448db6eab3f7161779f";
+ sha256 = "69d59e4ef8dbaabdf86acd7fe413b0fc3532b13cffd67cb0d122c08e72f234b9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/sq/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/sq/firefox-90.0.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha256 = "bbe1935033db10b0004c7746b089040decafc0cb04825a5df5004905dd470320";
+ sha256 = "d8bc0fab11d1d3641159dcbe0248d1987e6d5a25cb45acde769c3c4632f6364f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/sr/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/sr/firefox-90.0.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha256 = "cd97fca2ee3d57c418e0bbdad529c1ec424d18a0aa5976a4cff13fdb7bcb3f39";
+ sha256 = "7ea2ff12e6df802e98cef89aede582e3c6ee800e51c4d5cd6a9ba6a7aba0e4a6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/sv-SE/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/sv-SE/firefox-90.0.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha256 = "a3eeca622d63db7fd94fcd691a2d910380e211bb0d78d131587a448df6ebc635";
+ sha256 = "e4924167458d6b1251956de695c610bf311047a2b3cce4cffc3b09bb026c07c0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/szl/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/szl/firefox-90.0.tar.bz2";
locale = "szl";
arch = "linux-x86_64";
- sha256 = "72c868394c285d890fbdc560813803aa26ae5342f36a6864588a829cf4639c09";
+ sha256 = "4904579fff0628ba012f269c9be0123f06fe8d414066fa3f52fd28832d6f004e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ta/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ta/firefox-90.0.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha256 = "c87f9e8d7f5935c30f9a916fb76990d0678e9032287fffad48230d5f66aed24d";
+ sha256 = "9611d0624ea57ead7eb9b889faac6a166a1581c64e0fcf8d89e1ff3c6f43c963";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/te/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/te/firefox-90.0.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha256 = "2d415574a612f011c22b782e439025d1a50ef12217bd3b538ff36010747f1eea";
+ sha256 = "d06b945ee1646a37f347f438dcc5cfc2ca34e520fda7e5119d076a35a1636537";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/th/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/th/firefox-90.0.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha256 = "7c73cff2af72421231b9a03d3196186db98ce6b09a0ccf4954219506b50c27cd";
+ sha256 = "4e0f715b9df45ed6e5c469d31e886184ab3712d65ed9b5f09f930de55bac7cae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/tl/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/tl/firefox-90.0.tar.bz2";
locale = "tl";
arch = "linux-x86_64";
- sha256 = "6a37fae3a5c0156827f6b69aaa068aca6982cab7e6dd242f74846e743c00f96b";
+ sha256 = "ffb9acf1bdc1470c5d077707a38b8b754b638297bdcae51ecd985faed50d0c51";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/tr/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/tr/firefox-90.0.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha256 = "42cd3896f2b726cff21ce0cadd4135ae1f325dc3102efa17cd3a3c5c6948c6f6";
+ sha256 = "58a4e1b95887aef20744113cc712961cd331afe7b32c9fce9ae95cd10036a075";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/trs/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/trs/firefox-90.0.tar.bz2";
locale = "trs";
arch = "linux-x86_64";
- sha256 = "1ccf3ce127603a42fc5addcbaa238b36e9bd798615a2e6bfc95de7db5d12402e";
+ sha256 = "f517e93f9819e008f224078af54c6b080e5022cdfb84ae13e16a65368cf3c971";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/uk/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/uk/firefox-90.0.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha256 = "2ad2a6306019dd5960e4e25ec59c7fb2eec0c233f07c04930049d5d75f3b84f5";
+ sha256 = "e6f29d8f6e7c92b5c911444c869173a8991bbab60e13c2279c1bb8139bf7d3ee";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/ur/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/ur/firefox-90.0.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha256 = "e63605011a8cef5e239a39a21edce7b1e2bbf342827888e1ab36c22bdc6ac5c3";
+ sha256 = "bcc00d70f7ab06bd024053d5f66d6363f8aaaea65be089bcad99fb0dad2d978c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/uz/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/uz/firefox-90.0.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha256 = "8f5d446ce0dac4bfb0640a492de57d087336578c157c238a8e3e9f186408e337";
+ sha256 = "62d8ff68b7c144610c05300fcc8072b832c5ca3ea3b0da3f197f04c1c352114b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/vi/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/vi/firefox-90.0.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha256 = "5f62f1e64035a158883e7e774cb87cf15b336bdd2171ffd65e13ea8cc81c5542";
+ sha256 = "152b2c3e4b66d5056cf02d6a0d88968da0d2d0d7983ba4a90b17937c752dbc68";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/xh/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/xh/firefox-90.0.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha256 = "ff111b178134fd2dfc6f7597b6c33b4a8ed4aa6ef64c6687bcedfcef26982d5c";
+ sha256 = "bbd12d232fd53c2ca879b55f19abce804ad14da4c47ee11c2723f37f166d69fb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/zh-CN/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/zh-CN/firefox-90.0.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha256 = "90af3045eae839ca67a42e8ff810156ebe6115c3749e0547e907ca910eef3ef1";
+ sha256 = "44f71d53e7055b19617b66985f583b44b3d8aa6b63621a8ce34cb2f33e2c35fe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-x86_64/zh-TW/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-x86_64/zh-TW/firefox-90.0.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha256 = "5285b29bd463013c80cf23db6947cc720c5327a71a9dc35e678444e7ca2f3a42";
+ sha256 = "23a5054f37211f0b4637baa7b17c0b41cbf16f8c30cbb7c00d486698a98150e9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ach/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ach/firefox-90.0.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha256 = "0de413f3533dcd0fb5d2fdcf63673d814afb611324cb32fe9431f59b735ab152";
+ sha256 = "985bb9b46a2767f00704f7dbf43ffdf650fa70da1b5c82b66bae9b3ed8e53ec9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/af/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/af/firefox-90.0.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha256 = "98069b18e97b3fb887d191321bed74935def28a4288abe8765c27acb62812ba9";
+ sha256 = "2b9ac10fca0815b755c89eeaaec3db597bd7eb56294452c715615bcd9edb685b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/an/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/an/firefox-90.0.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha256 = "d84d8c1ec45d53207b48043b8f468bceb211b199a3a5e76337700ec8b5f40f04";
+ sha256 = "cd6aa9c8b5e384c36f35c4620954fc29facc9e82600f1fe759bcf239bacd5cb6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ar/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ar/firefox-90.0.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha256 = "22dea08d8f9d100881d9a3e5b56d2618502d6d498ea56ad7cc6afa8e862bc7e1";
+ sha256 = "c6a75b71f6c24f05a92608401b70ce4b3e91f83f7511eeed0b7dfb91ce52ab22";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ast/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ast/firefox-90.0.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha256 = "e92ea890c51def74523dadae1f40f1fdac4816db50025e12a6575d798febc1eb";
+ sha256 = "ffc9f0b54fb7df8398e5ccedd75902d4872b2b735d79189e2e00bc519b7914be";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/az/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/az/firefox-90.0.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha256 = "abb1a31a0374b95fa3ad36fea893c39dd8056f8a06e4d94dbfced3d80bd8197c";
+ sha256 = "3843e554e11c687e9d0676ed9ed06c11cc6eb571287430cbe8ab26b4c2553e63";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/be/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/be/firefox-90.0.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha256 = "c5a8895155b3e4cae1c3541e66b3e551b3c14460d2e522ba72d83b5d702a8889";
+ sha256 = "412e6a776fbf1cd698092bcaafe30a652a8ab35b72e3edf4cffd0b7438c091c7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/bg/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/bg/firefox-90.0.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha256 = "b6b811ed0e53795623f6c928d0411600aa2ccdfc9fa890e846018e085bbcc6ad";
+ sha256 = "142d1db515272948aa7788403be55080471773d835476a532fd0e44f08a223c9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/bn/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/bn/firefox-90.0.tar.bz2";
locale = "bn";
arch = "linux-i686";
- sha256 = "4597c3c41daa76c3bdb30d3fcb4cfbc51a7571bab98abc8b35f6b7ae2df1ae5c";
+ sha256 = "75531cdc30d0c9173ab8d8113ceb9897373f7808e1019834545f0130ebbb8ee9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/br/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/br/firefox-90.0.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha256 = "5346306c5cdfce1b3d7ece50ea1fe3dbe9ae69ccb83f70a0a2c451972ef40afc";
+ sha256 = "20e76daf7a280c5d50c9a937e409f25aac7f0ee3254f9145605ee00d00316d5f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/bs/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/bs/firefox-90.0.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha256 = "260e08c62ea7fd0d6d130453e1247588c83f4e0414aa569dc23f100bdd534347";
+ sha256 = "1bc0fd2a8ec265d59594bb298cdb51f5506b56e40e5dfc0fc66a37e3d4328e5f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ca-valencia/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ca-valencia/firefox-90.0.tar.bz2";
locale = "ca-valencia";
arch = "linux-i686";
- sha256 = "855660233c59d97b05e56dbc2efcaa1ab538c1433ea14e2159d3efca8531ecef";
+ sha256 = "dfffd0c2b98641944d74486de4d9f08c2e76b30506942021a5263d1238ab07db";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ca/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ca/firefox-90.0.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha256 = "b71bf5b2137a715fc75c36d9ee9c1e20525f31b8a2f2dfa56af51305a94058c5";
+ sha256 = "bcf3b78bcb2bd133ad66d551695d372d099d250e01d790f48bbd69b46c07abd4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/cak/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/cak/firefox-90.0.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha256 = "fbf2092e4b56716042f993eb4d5bf41a9518da2243245282c9cfbc812c8c5268";
+ sha256 = "e27cc065df6bc8ff338a34c97d9f6d4825d711b77bf24e5f1d16ca68dffd6f74";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/cs/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/cs/firefox-90.0.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha256 = "466a81994a51fc42ff2b936a2e2d20089524bb514031f740f7a6a0865ff57b1d";
+ sha256 = "f25b02aecf709edfd75ceb2faa01979e99ea2a88e981c0d3fa5dc118eca77a5d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/cy/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/cy/firefox-90.0.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha256 = "ef3596c10627fdf196a5f52f59240fd85d6eab33035cce708613c7dde041b413";
+ sha256 = "d9f09d6c812740f077234dcd5f7caee7be17569526b215d4ebb7d987b8915b47";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/da/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/da/firefox-90.0.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha256 = "946b42c16cb861b21a0a1808cfdf554c955998aebcf59299c240a334abb8aa47";
+ sha256 = "604342f07532112ca7ad6c8a1d6194dc1487a3f0a05c9785f4d252d6359996c8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/de/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/de/firefox-90.0.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha256 = "b4d003e8abd272870ed332448aef29bf2bb40de74ac0640912a65031da5012c0";
+ sha256 = "c2383d7801ff0fd4a111c49d82d7b41f140f1974d20c8bcbfc745b76a78f24f4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/dsb/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/dsb/firefox-90.0.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha256 = "57c7b439616ec7eeddf05c7c5a5fde0947092762c5d5f98e87c3850a3ee768de";
+ sha256 = "9972aef81947ebcd09349776a01f7335c41971ac72d2ed806cfd384831b35623";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/el/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/el/firefox-90.0.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha256 = "3c444a23416b6080d2d6b5e8744651b4f4796e3ecb601c8eee3f21cca8eaf224";
+ sha256 = "942285c706c4321dc6c4578e665edc76523e46f98aa89521f4276bdb2736f610";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/en-CA/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/en-CA/firefox-90.0.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha256 = "aeb3d01315db024984739999b9fbf1eba0464a7a393451d311fcee786509198f";
+ sha256 = "71b236a224823a13ea1b0f144217a735e76c4d25b2725591a5aaea068d1a9808";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/en-GB/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/en-GB/firefox-90.0.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha256 = "c327ce261f0c843eb6a50c7e6ef9d3163548d03391429f9a55c1adc6b9969759";
+ sha256 = "1c9f4c7b35faa87d7c1b046abd629e2d4305ff8769f986a4e1def8e381a0ca94";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/en-US/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/en-US/firefox-90.0.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha256 = "491fd0066a893fdb3a6cc58e3e0b6b02f15096d07563437a79b2727d09256890";
+ sha256 = "f983e7537f54131697366c0926b6aad8045c2f1e16c78a0d5edb392d214e535f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/eo/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/eo/firefox-90.0.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha256 = "1c39ec1e448288541cbdcc10f7d66e8c36a66d08b1eadd9f8f90e590f6473908";
+ sha256 = "90f713f53326849e1b41c7aad160eb5828e4a06f2e9f11918ba61b9ec4d29fef";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/es-AR/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/es-AR/firefox-90.0.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha256 = "fa8dea8cecce162a25ae9d2640b35ab5f9f2073c136d051ee4795caf8f888aaa";
+ sha256 = "e9abf48307351d5461086d34cd765dcd5af38eac50dbaf3833ddcdd5432908c8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/es-CL/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/es-CL/firefox-90.0.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha256 = "e156fd02f2c1c8deaf416f17d78dea0433e0e84967b09233ceee9e33cbe42bbc";
+ sha256 = "04797e8c12c08eb25f8048f0a653380582cff4f193d03e8e6d3e0d66cf1e59ea";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/es-ES/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/es-ES/firefox-90.0.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha256 = "7359fc86b0f6da2916e8f178295c85ed3c8abebc1732f7735ec7b2f4c2aeb76f";
+ sha256 = "1f655463e919d3546a841e86e3aac0bb6b4bc3482153a24d6afaf4eb4f09db0d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/es-MX/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/es-MX/firefox-90.0.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha256 = "57bebe4dfd2812c8b48f597893738b0cf9badbdb11fe1e3cfeae45290dae7f2e";
+ sha256 = "3e9b14809de0df3d1f5c0d7bb83f9a769fb5852194511b1cfc33275ca1bbed41";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/et/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/et/firefox-90.0.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha256 = "71e3d1a1bf3a8d480cde7cf8ad747c90b8eb217cadb445ae1ed3aa10c1232275";
+ sha256 = "918f284c60618404b7f8130b7e14a57d4ca483adeb6007a79422e6fdb7908114";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/eu/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/eu/firefox-90.0.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha256 = "1e38c53105664f6dccca1b67928222f161c6de37f9a661c46a8ffafea3600cb3";
+ sha256 = "5f682f553356652d92684dff3f8385d1d675539d6cb8b155f12874682c0de235";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/fa/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/fa/firefox-90.0.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha256 = "b72165e2561de0d65e6cf991a4f5e4ce72fffabb23d80f3b7408c03e1eb6d0c3";
+ sha256 = "5056f42eaef5f5538bfa9af23e123bf9f0a0d370d6fd7848dcdbc50d0cf61d92";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ff/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ff/firefox-90.0.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha256 = "9f2d7b11c3a05fbffee4d4e9dd5f3b397fdf3edcdee174a0907b1ebb1625ea62";
+ sha256 = "cf58279f578ef725e2b89ed4a89021a811b3e237d46d02c7d98137fef3775318";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/fi/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/fi/firefox-90.0.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha256 = "29e2279d03732703576c0dd43afabe1f416c14d517979f6dde78ab42cb561d4e";
+ sha256 = "28bd2f67ae638fd602adac6327fe51ebf90ff52c8695e8c8ff4161d6bc20be2b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/fr/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/fr/firefox-90.0.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha256 = "93bda1a56ecce4dfd84fb9333f3b333887e2014edfdae4b555b6a4296baf4805";
+ sha256 = "53b69cbc6cd3097b67537979637614a6bcc01450426883b7d35a8de5df6647ae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/fy-NL/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/fy-NL/firefox-90.0.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha256 = "1238d1e763457d4e9cabd00505cce7ce3dd9979e41ff1d1b005e35a229d8dce6";
+ sha256 = "8ee8e11a845a2e2b0f9d12d95f8dcc6b58be2722a68f1a8707b0c1f3a66f90d5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ga-IE/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ga-IE/firefox-90.0.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha256 = "8eca1fbd8f536f62eb645ddb5cfd5e9c573492ef7a86f86a930b3a09829eb9c2";
+ sha256 = "39a2bbb6c9a3b3a0ec2c21eeb9f919a54502f891834556ee439704af3705f3fa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/gd/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/gd/firefox-90.0.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha256 = "dc173ac67ad7353229ee1c606ebde73c4be2ccf64ee97f3746e45a2766031e63";
+ sha256 = "b667e68662d81518f03ffa0bab538d4601457b6b1eab1f51dc0be3752855d5ad";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/gl/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/gl/firefox-90.0.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha256 = "038bd87c6c72727d6f535b863279b03d6e2c979672d717556222b280327cacf6";
+ sha256 = "65e9376490e6ee833312b99aa7d8f730495f8320e14203a8d6cc7a94e83e6adc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/gn/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/gn/firefox-90.0.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha256 = "42f4d4fadeacdb003db6104c0003cdec7ee81558d07b11573e7d0fab9351dbc8";
+ sha256 = "45f3da559b51c5ec300ac64f8d5f0e7583c55abfca4c22e72994f65682d0717e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/gu-IN/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/gu-IN/firefox-90.0.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha256 = "6dfa19890282d88605585a5d5c640d200d52d8c0bc61218fc2e8f19d16a9811d";
+ sha256 = "db1394cf1c52fc0eeab116d49fff3bbcef07f64870345490a1f46f3045268d94";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/he/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/he/firefox-90.0.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha256 = "a16c0423c33f6f05f9a1aa607232506e7353e2774d7edc224e3955813d212eb7";
+ sha256 = "52b49a0014fa2aad266f2503b6e455310d37af0d93102f22404b303de6afe772";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/hi-IN/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/hi-IN/firefox-90.0.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha256 = "fef5a9c06a3befcab35a0532cdcdaa3c6757a5ea5b6bc0d4ecbc684f37443077";
+ sha256 = "59484d61d3d4802f9389d668f6125299ba072077a87a16d9b09f9780e975d120";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/hr/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/hr/firefox-90.0.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha256 = "464ebe80e2d55686a56960f6a6789b58127e86efb5bf7dd8ab79220f49790659";
+ sha256 = "292ac6975f6319c0b4274fbe64bd9512a8361c254f82c079e8ac75c974839316";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/hsb/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/hsb/firefox-90.0.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha256 = "92458b19e0a3a8c573a126f120d3da76f185d9822c5f32c3d56f3cc90d999f55";
+ sha256 = "81bcc94349b7b83533b5a60d3f8bcef9b3fd0d85628ce0f043013a4c7fe0aacd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/hu/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/hu/firefox-90.0.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha256 = "9c078d9022a2d83444709fec7a4a122369ceaebc4b27b99bbec9c67be4370ec4";
+ sha256 = "1c5867bd108e9232472ccdec0bc24a6558d9a5a6d9147d0c44a4fba2c44ae01a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/hy-AM/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/hy-AM/firefox-90.0.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha256 = "36b64295d46fde7a85994e374b38a8781bdebb4e15872f81c8e694b4218e2713";
+ sha256 = "de35f4653730d253e5bf147e65ec1f8680ef1fda008f785eb3e49831a00d8b4d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ia/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ia/firefox-90.0.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha256 = "080f890f868a4c7e7f03db96ab2c25b6f39dcbb1f960052ce75dbdd5983487a0";
+ sha256 = "5ea51c02e6f41291da5840d511bf4ad743e475d6d35fbbfa76c4df3e8f45fb50";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/id/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/id/firefox-90.0.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha256 = "b43ceb1d6f6a003aae01a02af15c0e4aa0fe9e8547703adcd872767c2c797717";
+ sha256 = "b9ebc450eb9097902f13c7c30e45a361ade71b99b273d0da898301d3e9bdae36";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/is/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/is/firefox-90.0.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha256 = "35edad7f2a31b7b2ffe0d8eee2b0f0ab94f5f91c8b2507b344b7d28ac13fbbbf";
+ sha256 = "64f7480703eb13e9ba4f12615bd84dead1322d139af1115813b7ab8e6819190d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/it/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/it/firefox-90.0.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha256 = "47f17fe75d1ddd17a4c044dce4dc223a69da7f7de478b87d58e8f99d488ccf79";
+ sha256 = "3f314ed7442d57345d6d1b368dd55bb9e2dd966e269e56d5ea2abfd9140aca67";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ja/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ja/firefox-90.0.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha256 = "86850b09c992a6383a406e99bc8698b8471f8240cef752126714e6f070e2b220";
+ sha256 = "7cbd06ee69dec66522d35163427f8034bd3ee928aa6bd3c5203f3c9a5e526018";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ka/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ka/firefox-90.0.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha256 = "42297e2f4c1d72bc46dde66ddca934962b2aee9a918e24b90870fc5774284bd9";
+ sha256 = "81575f637a65d1d31503967b380b3337a8af532d5ebd3bc7d35026c37831d50e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/kab/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/kab/firefox-90.0.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha256 = "7f00172ed2f2285ef5b8ed3774781f5036c1cde57f1a321f9b91c54679ef68ce";
+ sha256 = "bb84536e819cd77b4d45786982384821b7d08dda48fc8fa3f0e12e90e75a688e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/kk/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/kk/firefox-90.0.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha256 = "f7046b78d72074fcf0f62c7d4b660cb8a63095dcd8c24fcdfc61c574ddfb42ae";
+ sha256 = "ced99ad16e7b84fd1c344ff2ad96715e0654ed6cfa0cf6379179bdabf5cb0443";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/km/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/km/firefox-90.0.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha256 = "4157455134722e29c8a039cc11cac68cff7ff9311405a2c71e30f982f12888c2";
+ sha256 = "f2641008a2bfd95467b274419d4305014b8b3e5c75622d30a46c5eb9ad761990";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/kn/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/kn/firefox-90.0.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha256 = "ea5812c8eb194be0e8335f48ebde884a4375df2513c9275ac551aa0b18580dc0";
+ sha256 = "5bcda92360ae86a1ed015736847e7d43eac239a6bd995fc932259f169a7f3821";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ko/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ko/firefox-90.0.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha256 = "b25b99297a64c9a700d9dd285db01d6f859402f09b38b2ada3bfaf914c72ec7f";
+ sha256 = "5be9eaa06a7e35b1d401643601ac7e212489609c52961303cb8fe054bf698190";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/lij/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/lij/firefox-90.0.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha256 = "2c875ea5c87840527e2dff471fcfe774e8ee4d01c764bf1d73da99d9e875f4ac";
+ sha256 = "01baf23ab6d89adb3eed47b9f216a0b17b8bc8850b10d09c2bef10792fb1d76a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/lt/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/lt/firefox-90.0.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha256 = "27dc824ad230ea5f3cfaafa4024733de85e67cc1b6678aae64686b6a54042855";
+ sha256 = "a5f8a4fa438fe054d1e8d09ced0079673bc25431aa9cbc6b36ca2e5a1dc58d72";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/lv/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/lv/firefox-90.0.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha256 = "ad865a647d9fa2b20c68ea2d597595aa9b03bbf40987e763d1225fffc91176cf";
+ sha256 = "8ed19c630ad2cabdd374d2499ddda0ab8993a79c50e7e6728081a6842d1f68d2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/mk/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/mk/firefox-90.0.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha256 = "85c556608247de5e02808f264c721e16f909c5299f6ff423ff0e594da87fccb7";
+ sha256 = "cb497f4b8f1766afdeed4e351a597bd1da4376c78cdb4172d4815c055583ef4c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/mr/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/mr/firefox-90.0.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha256 = "1970b70f983bc985778537728b044f27325bfa89cfbea7e000e91e5e66fcea1c";
+ sha256 = "0e03049ef7efb5c78963b4f718a61469cb6b1931313ffb50d3e4484b6cf14837";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ms/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ms/firefox-90.0.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha256 = "ca86002d548f94414fae96a266818ef4038c06f7307be854a997c5ff4b3529c3";
+ sha256 = "1a92300fdd218d1fff96388794cea650371c0b1da72b20b22d6deaef7a794c24";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/my/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/my/firefox-90.0.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha256 = "6e6af248e80428fc0314be80a66f5ab054437e119e17c84eca6e8ca9d34db948";
+ sha256 = "066061e09aace32d8a7a67499a75aeb143ef1e474e8ce37131e6c37472704169";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/nb-NO/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/nb-NO/firefox-90.0.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha256 = "1310663a3617f78245e46dee283a3932354b9774a39555849c342a0620fe48bb";
+ sha256 = "12771de667402fc8d8d782ad1b799cc20974f2ee6dba8db87b39f319e6752dc1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ne-NP/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ne-NP/firefox-90.0.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha256 = "ffc16051f275d04978c1414f919cf9dcde219f998148c9ec2e4f63a7620243f8";
+ sha256 = "d2d8610eb11fe1aeb948a2ad2b580a396450c92458a9b4cf6cc2b3b051e6b7c1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/nl/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/nl/firefox-90.0.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha256 = "e2a654e66edf777397c31ab1a6862a051071abae376f5d2ceb939ee7c86d90e5";
+ sha256 = "99c76cd723c19c6a2192de4f588557060284185047e4597c067e35ba623f01f4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/nn-NO/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/nn-NO/firefox-90.0.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha256 = "8b2ee4cdd6346b918a5de6c1191d48f5606f40414ab3332129b10614495e1f4a";
+ sha256 = "5e25d25ae36bbe8346aab027ad684fee3766a1b79c9bf86a370b91e36ab417b9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/oc/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/oc/firefox-90.0.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha256 = "cd7bb8a640662df12a56cd15569ff8eb611db31a4df676427c1da94579a5a37f";
+ sha256 = "462c07c7a8864711c0309fa0847bbb993eee518508dbb5614571f994f2241099";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/pa-IN/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/pa-IN/firefox-90.0.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha256 = "18ff5174c3ce73a2733c2f1ad579e9d87c249af5aa1f708c0437d11c720e7669";
+ sha256 = "d1b1f53ed3aa7bd139541e249f29e6672c30d5f88eb980be793b6c6622338eb0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/pl/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/pl/firefox-90.0.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha256 = "d187fdac08aa62958cf2238f6e2749de5b8701634b99757e043cba0218451a26";
+ sha256 = "b63144adb425b8477f3b8c9026ea3a1168fb3af513d25d5594b810a0aa4be831";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/pt-BR/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/pt-BR/firefox-90.0.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha256 = "63c81069183b3862e2b379a5d6a816aa02338ac0c324e33c0e020f579d9e2ebe";
+ sha256 = "218108b556c88c9d4ce6f0cc37b3b45dd5b03e7beb591ba0c52aa257d17c54db";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/pt-PT/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/pt-PT/firefox-90.0.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha256 = "5d24712703b54d2e4aeb82a2ce95b9d937e58886574b80252450b7ede7120d23";
+ sha256 = "96600b7012300cfea1ede41e2c3ac9756cac3981691908e8b2e7c2624eca2d9d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/rm/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/rm/firefox-90.0.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha256 = "cb6bacee900a12c51960d2175caeeba96c57908d860bb0b64ee2529ffde284ed";
+ sha256 = "93bf70fc04f53f779335db31a264a0298188459aa3687d15c7b890199dfd76fc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ro/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ro/firefox-90.0.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha256 = "29d344efd66aae4645208746a1c8083ceed01ffe8b8c372e8e97885e385e3e19";
+ sha256 = "bd38c728d06513f3b8fc0ebcfadce3e3029a5779f0c745085d52d823075f0266";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ru/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ru/firefox-90.0.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha256 = "17b9ba80d6dc056fe774e1836533ebf44be27edf6123c3bb430a00b1f2a21d65";
+ sha256 = "abc35efade33dc03e6a4ce093d5995e79daea3383c8a4a4b63d83f8336ecfad1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/si/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/si/firefox-90.0.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha256 = "781b6ccc99d8f886e6bdf103327332ada06529ab6b728ff4ec6bffb5d176abf9";
+ sha256 = "201dd56f43db3862243b41fc5b41eefba737d91a05826d50e922f206bd6f6906";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/sk/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/sk/firefox-90.0.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha256 = "1895f1c5ac0dd749a3e37576c6a90f9b7c5f3f7e9eec24af2cb9a87dcb730127";
+ sha256 = "fa5b0d2d00c146ffc0fafb760e870db3133d9b387d383f34099e7e5446986169";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/sl/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/sl/firefox-90.0.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha256 = "b3f27a10c094a7d9e308ab0b2ccb3fecb94a8f596b45ace8f66f0dea628e68da";
+ sha256 = "84900580af3f7b7b10481f6acd42bcf30b98ffa5af3b80cc020f4217a150252a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/son/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/son/firefox-90.0.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha256 = "376bab9502491c3946538e3b26b7a106895bd41de918cb268337af4ce58cd4ac";
+ sha256 = "122f4a2f50a5bf38e59fd7ea1fc5eaefa8f4dd55a603220a272a32252d6b7c80";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/sq/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/sq/firefox-90.0.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha256 = "572251b4b621551e7a2d889489c223fd4dc08b9b19242a2524ffd3cdec53dd01";
+ sha256 = "b829a9b18ca57b53b029841812ce6bd4400f3df60d71980258b9a8e7f5b4c33b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/sr/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/sr/firefox-90.0.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha256 = "50e594b3857c7ed71bfdda5f6ad7a2460508d029055e5ba17b8eca3269659ae8";
+ sha256 = "523bc6ed11bd320067361f8be81b0c0793618e376be9a8ef1a7a513b544a279a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/sv-SE/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/sv-SE/firefox-90.0.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha256 = "b9dcabfa670c6a8f3de85558bf2ea83ff6741754e2eb9ea90ccab81b2f3abce5";
+ sha256 = "8c8a7f21fedf76d294a1521f4c786c944498e98567c969c9e1455f6b2a535022";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/szl/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/szl/firefox-90.0.tar.bz2";
locale = "szl";
arch = "linux-i686";
- sha256 = "ffeb74d2b09595aa6b4d45b5e8587d5fb566188e8cce484bf6887eea1fb83f18";
+ sha256 = "a1530e1ad9eef4cad401d0374db80593a3960feca67715d352aac51c66dc0415";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ta/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ta/firefox-90.0.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha256 = "410bbc5abf26f49a6e54c762d62ff91068cf95cbb12725a3bb3ce21911abf029";
+ sha256 = "0d4da9f60ffaa360424e73120a782d0480d52227e8b110a1eafdaeb0e6f47092";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/te/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/te/firefox-90.0.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha256 = "fd8aec949b92d15e8b52b9d4ad069598e6ed732cfa90747b29539b9c36103f64";
+ sha256 = "fe7cfd5db5b98a9245fa30a8970a729497e563ddf5511609d7930537b5586f2b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/th/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/th/firefox-90.0.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha256 = "f10cdd31b1a0ca18f2fe945549b5c98997a3cf821974760363d3977f378449ae";
+ sha256 = "1c1a643ea94193bbb063e35921db54bcb6b6333fa06b2de6b91c88ecb888e868";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/tl/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/tl/firefox-90.0.tar.bz2";
locale = "tl";
arch = "linux-i686";
- sha256 = "5d0655ec55e4857884eb6e87a6bff8a1efc53e961bc525f6537a0caca6caef9d";
+ sha256 = "89ec5b3f116c6e86bc8e003548c9be2772b7d46c86233b87e96b579d5d7d8851";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/tr/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/tr/firefox-90.0.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha256 = "c4fc2bf69b8df0bdbf0976541a3ff53090cf9cb6d44cb6c5f883cb805fb9931f";
+ sha256 = "03a367c5f7b52a8e8e863ea108485dafc0232e5dea5da538a3a632e8ae5de454";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/trs/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/trs/firefox-90.0.tar.bz2";
locale = "trs";
arch = "linux-i686";
- sha256 = "54fcae7123f16cc2956af67b13e3a0c43358e82c3ce4498f87f4cefed1333bf7";
+ sha256 = "85d3ba651e9f39a76f2ef1d92d6ce34ed792f6477848b7e75a806c699c72c3c6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/uk/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/uk/firefox-90.0.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha256 = "9eefa4110e1feb6bb4ac92470c89a3c29709486bebeff3b3f41479f59593b807";
+ sha256 = "90649b7b2cad702b53b7b63fea7e72e666bad605841887bb42d69d487a561678";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/ur/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/ur/firefox-90.0.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha256 = "81baf8cbd6c47468471729eb59529af660a3940c4d4795892922532304ff1a11";
+ sha256 = "9b9c80716edc99a3e0b7bec2da38a7391798d401734fce4d1bee60f0c71a18ea";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/uz/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/uz/firefox-90.0.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha256 = "29d49de5f1ff8c351b19936350a6448480b9dac6c206589dd681fc26f43e3f91";
+ sha256 = "5b154b4f8c036ed7c62bf123e0802f2318cfede67bfafe9aa86cda7b2650a2b2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/vi/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/vi/firefox-90.0.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha256 = "78dccd68c82b5e54a1bea87b47cf6fea80c82c8b07b92f82ed4a7c5216657053";
+ sha256 = "8c3b943e33a1f33086fcce734e183dcf96cd29be0daedc1b4a1f4cd068aaca8b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/xh/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/xh/firefox-90.0.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha256 = "ce11b8aa7529f43ca7c2aeebba17aaf3b6a5b22dd543302122c71dd0ee9f6eb6";
+ sha256 = "c43f991777a8fbf8372f1928a465de170b25b07ede53dfb0adc83af18fd11e02";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/zh-CN/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/zh-CN/firefox-90.0.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha256 = "407a7e16d28fee88428ce021b7a7c63f1027e7c991652227aaa11223356c5af7";
+ sha256 = "1b8f9f96ee1d59b92b974f9f18639c7e38cd3124c5fb2f9ba7fd44ceb5c532a0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.2/linux-i686/zh-TW/firefox-89.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/90.0/linux-i686/zh-TW/firefox-90.0.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha256 = "1f500d830d6e465a2ed71baa1b0245fbf5eef9ab9098e9559553e2a9916cc733";
+ sha256 = "7a6b520e84e7f5cbf372f1482e4b138a7bf785215776f193e49b30c3860e3625";
}
];
}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
index f00f0bfeee..8799764fe2 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -32,10 +32,10 @@ rec {
firefox-esr-78 = common rec {
pname = "firefox-esr";
- ffversion = "78.11.0esr";
+ ffversion = "78.12.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
- sha512 = "d02fc2eda587155b1c54ca12a6c5cde220a29f41f154f1c9b71ae8f966d8cc9439201a5b241e03fc0795b74e2479f7aa5d6b69f70b7639432e5382f321f7a6f4";
+ sha512 = "646eb803e0d0e541773e3111708c7eaa85e784e4bae6e4a77dcecdc617ee29e2e349c9ef16ae7e663311734dd7491aebd904359124dda62672dbc18bfb608f0a";
};
meta = {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix
index ed4ffffe45..374062f0d8 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cloudflared";
- version = "2021.6.0";
+ version = "2021.7.0";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "cloudflared";
rev = version;
- sha256 = "sha256-cX0kdBPDgwjHphxGWrnXohHPp1nzs4SnvCry4AxMtp0=";
+ sha256 = "sha256-FQejuKBDUCCcEq9ZmSMigdvqowTurCYEhOiXQN7exIE=";
};
vendorSha256 = null;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix
index dcdf134b26..dbbf652487 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "octant";
- version = "0.21.0";
+ version = "0.22.0";
src =
let
@@ -19,10 +19,10 @@ stdenv.mkDerivation rec {
};
in
fetchsrc version {
- x86_64-linux = "sha256-Ben2wAquHADWBv1MEfPWxs96pLz1bK2F6bLoYVTSkng=";
- aarch64-linux = "sha256-1kK0Gu4cQYk+QDJJJiiDan4SnP3Xjr8nLOBtv26UDV4=";
- x86_64-darwin = "sha256-gOkHpUTWKrikKYZmkfgck3Lf3g5Pakcn0i2A9Hd07UE=";
- aarch64-darwin = "sha256-Xpl8odVXw4WzF7CEZ+Bbxa6oQDBv9VMzHCNOjIcFGzE=";
+ x86_64-linux = "sha256-1/vyV6pUqovVpovTYFF4d75wJvtTNdrbLZyjw1lLacA=";
+ aarch64-linux = "sha256-1duNW0Edj0jrpv/RMrebtZF4ph6j3PXCJ2RFejOopGQ=";
+ x86_64-darwin = "sha256-Ur5jBPk5hA6cGg+pPf36Ijh94gWEdaWlJK3yCMBYyEU=";
+ aarch64-darwin = "sha256-RaiXW+MUihk291UWmrf6gLpyrd5stIkhyWNFEQ0daCk=";
};
dontConfigure = true;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/desktop.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/desktop.nix
index 4095a7907e..e793df71a5 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/desktop.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/desktop.nix
@@ -2,7 +2,7 @@
let
pname = "octant-desktop";
- version = "0.21.0";
+ version = "0.22.0";
name = "${pname}-${version}";
inherit (stdenv.hostPlatform) system;
@@ -15,8 +15,8 @@ let
src = fetchurl {
url = "https://github.com/vmware-tanzu/octant/releases/download/v${version}/Octant-${version}.${suffix}";
sha256 = {
- x86_64-linux = "sha256-Woridi8uGsxvccdeaDzVLs+2YrRKUnm3WbX5LhorM1Y=";
- x86_64-darwin = "sha256-NF3bm8WFEs4kgrUp+7qCbj6Z6pUMRUp7h4nhJQDJnoY=";
+ x86_64-linux = "sha256-xMdNoH0UE/KLIQ0DjJfb+ZB/q2F+kyFEncrQ9YYJgE0=";
+ x86_64-darwin = "sha256-y3fmxrsQ0hCa1wuMiRGHf79kpi25qXv/idKrVT87oc0=";
}.${system};
};
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix
index a7778af231..0db134bdb2 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix
@@ -2,20 +2,18 @@
buildGoModule rec {
pname = "tektoncd-cli";
- version = "0.19.1";
+ version = "0.20.0";
src = fetchFromGitHub {
owner = "tektoncd";
repo = "cli";
rev = "v${version}";
- sha256 = "sha256-duJSTk5LmJWbaVYybZZHWDe8E/ZqZLCCsdPIiH5d/G4=";
+ sha256 = "sha256-aVR1xNmL6M/m+1znt70vrCtuABCqDz0sDp8mDFI2uIg=";
};
vendorSha256 = null;
- preBuild = ''
- buildFlagsArray+=("-ldflags" "-s -w -X github.com/tektoncd/cli/pkg/cmd/version.clientVersion=${version}")
- '';
+ ldflags = [ "-s" "-w" "-X github.com/tektoncd/cli/pkg/cmd/version.clientVersion=${version}" ];
nativeBuildInputs = [ installShellFiles ];
@@ -27,7 +25,7 @@ buildGoModule rec {
# Some tests try to write to the home dir
export HOME="$TMPDIR"
# Change the golden files to match our desired version
- sed -i "s/dev/${version}/" pkg/cmd/version/testdata/TestGetVersions-*.golden
+ sed -i "s/dev/${version}/" pkg/cmd/version/testdata/{TestGetVersions-,TestGetComponentVersions/}*.golden
'';
postInstall = ''
@@ -43,8 +41,7 @@ buildGoModule rec {
installCheckPhase = ''
runHook preInstallCheck
$out/bin/tkn --help
- # New tkn version functionality outputs empty https://github.com/tektoncd/cli/issues/1389
- # $out/bin/tkn version | grep "Client version: ${version}"
+ $out/bin/tkn version | grep "Client version: ${version}"
runHook postInstallCheck
'';
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/base.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/base.nix
index a8b2b02f0b..2d67236c90 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/base.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/base.nix
@@ -5,6 +5,7 @@
, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext
, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence
, mesa, nspr, nss, pango, systemd, libappindicator-gtk3, libdbusmenu
+, writeScript, common-updater-scripts
}:
let
@@ -71,7 +72,15 @@ in stdenv.mkDerivation rec {
mimeType = "x-scheme-handler/discord";
};
- passthru.updateScript = ./update-discord.sh;
+ passthru.updateScript = writeScript "discord-update-script" ''
+ #!/usr/bin/env nix-shell
+ #!nix-shell -i bash -p curl gnugrep common-updater-scripts
+ set -eou pipefail;
+ url=$(curl -sI "https://discordapp.com/api/download/${builtins.replaceStrings ["discord-" "discord"] ["" "stable"] pname}?platform=linux&format=tar.gz" | grep -oP 'location: \K\S+')
+ version=''${url##https://dl*.discordapp.net/apps/linux/}
+ version=''${version%%/*.tar.gz}
+ update-source-version ${pname} "$version" --file=./pkgs/applications/networking/instant-messengers/discord/default.nix
+ '';
meta = with lib; {
description = "All-in-one cross-platform voice and text chat for gamers";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix
index f7435aa3ae..d2d8c9a3ec 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -27,10 +27,10 @@ in {
pname = "discord-canary";
binaryName = "DiscordCanary";
desktopName = "Discord Canary";
- version = "0.0.125";
+ version = "0.0.126";
src = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
- sha256 = "0ly5a6l7rvl54mc39xma14jrcrf11q3ndnkkr16by5hy3palmz9g";
+ sha256 = "EraTDRKd6t0c9U68tSRdGkeB1hfqNS4KUewEXwkL8io=";
};
};
}.${branch}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/update-discord.sh b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/update-discord.sh
deleted file mode 100755
index 34c1574c65..0000000000
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/update-discord.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env bash
-# script to generate ./default.nix
-
-set -e
-exec >"${BASH_SOURCE%/*}/default.nix"
-
-cat < enablePlugins;
+
mkDerivation rec {
pname = "psi-plus";
version = "1.5.1549";
@@ -21,19 +52,40 @@ mkDerivation rec {
};
cmakeFlags = [
- "-DENABLE_PLUGINS=ON"
+ "-DCHAT_TYPE=${chatType}"
+ "-DENABLE_PLUGINS=${if enablePlugins then "ON" else "OFF"}"
+ "-DBUILD_PSIMEDIA=${if enablePsiMedia then "ON" else "OFF"}"
];
- nativeBuildInputs = [ cmake qttools ];
+ nativeBuildInputs = [
+ cmake
+ qttools
+ ] ++ lib.optionals enablePsiMedia [
+ pkg-config
+ ];
buildInputs = [
- qtbase qtmultimedia qtx11extras qtwebengine
- libidn qca-qt5 libXScrnSaver hunspell
- libsecret libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c
+ qtbase
+ qtmultimedia
+ qtx11extras
+ libidn
+ qca-qt5
+ libXScrnSaver
+ hunspell
+ libsecret
+ libgcrypt
+ libotr
+ html-tidy
+ libgpgerror
+ libsignal-protocol-c
usrsctp
] ++ lib.optionals voiceMessagesSupport [
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
+ ] ++ lib.optionals (chatType == "webkit") [
+ qtwebkit
+ ] ++ lib.optionals (chatType == "webengine") [
+ qtwebengine
];
preFixup = lib.optionalString voiceMessagesSupport ''
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 9357a02a64..daf1c476e6 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -28,7 +28,7 @@ let
else "");
in stdenv.mkDerivation rec {
pname = "signal-desktop";
- version = "5.8.0"; # Please backport all updates to the stable channel.
+ version = "5.9.0"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@@ -38,7 +38,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
- sha256 = "0icwmlnnnlsj2g1p2q4lf7hlhys3rakaim7bah5qkmhwkrzkk30y";
+ sha256 = "1pmyi9b0b5h6mi6dwml41x4igy8rfpsv6j67izh78m5gla8wp34h";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/office/timedoctor/default.nix b/third_party/nixpkgs/pkgs/applications/office/timedoctor/default.nix
index e6d3186578..4b97f7b3dc 100644
--- a/third_party/nixpkgs/pkgs/applications/office/timedoctor/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/timedoctor/default.nix
@@ -36,9 +36,9 @@ appimageTools.wrapType2 {
git
glib
glibc
- gnome.gdk_pixbuf
- gnome.gtk
- gnome.gtk.dev
+ gdk-pixbuf
+ gtk3
+ gtk3.dev
gnome.zenity
gnome2.GConf
gnumake
@@ -48,7 +48,7 @@ appimageTools.wrapType2 {
gtk3.dev
gtk3-x11
gtk3-x11.dev
- kdialog
+ plasma5Packages.kdialog
libappindicator-gtk2.out
libexif
(libjpeg.override { enableJpeg8 = true; }).out
@@ -70,12 +70,12 @@ appimageTools.wrapType2 {
sqlite.dev
udev
unzip
- utillinux
+ util-linux
watch
wget
which
wrapGAppsHook
- xdg_utils
+ xdg-utils
xorg.libX11
xorg.libXau
xorg.libXaw
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/gappa/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/gappa/default.nix
index c7c5c9c6fa..be1d6f253b 100644
--- a/third_party/nixpkgs/pkgs/applications/science/logic/gappa/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/logic/gappa/default.nix
@@ -4,8 +4,8 @@ stdenv.mkDerivation {
name = "gappa-1.4.0";
src = fetchurl {
- url = "https://gforge.inria.fr/frs/download.php/file/38044/gappa-1.4.0.tar.gz";
- sha256 = "sha256-/IDIf5XnFBqVllgH5GtQ6C8g7vxheaVcXNoZiXlsPGA=";
+ url = "https://gforge.inria.fr/frs/download.php/file/38436/gappa-1.4.0.tar.gz";
+ sha256 = "12x42z901pr05ldmparqdi8sq9s7fxbavhzk2dbq3l6hy247dwbb";
};
buildInputs = [ gmp mpfr boost.dev ];
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/verifast/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/verifast/default.nix
index 2d625a1c1b..e426f7b809 100644
--- a/third_party/nixpkgs/pkgs/applications/science/logic/verifast/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/logic/verifast/default.nix
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
sha256 = "169kshjq4cf4i9v92azv0xaflrnik5686w7fwcgdhd6qkbzflzl6";
};
+ dontConfigure = true;
dontStrip = true;
- phases = "unpackPhase installPhase";
installPhase = ''
mkdir -p $out/bin
cp -R bin $out/libexec
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix
index 7fb73419c0..63a9463656 100644
--- a/third_party/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ];
- phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
+ dontConfigure = true;
installPhase = ''
mkdir -p $out/share
@@ -28,6 +28,5 @@ stdenv.mkDerivation rec {
platforms = lib.platforms.linux;
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ timor ];
- inherit version;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/mathematica/l10ns.nix b/third_party/nixpkgs/pkgs/applications/science/math/mathematica/l10ns.nix
index d9f6a0c74e..7de63c287e 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/mathematica/l10ns.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/mathematica/l10ns.nix
@@ -8,10 +8,10 @@ let allVersions = with lib; flip map
# N.B. Versions in this list should be ordered from newest to oldest.
[
{
- version = "12.3.0";
+ version = "12.3.1";
lang = "en";
language = "English";
- sha256 = "045df045f6e796ded59f64eb2e0f1949ac88dcba1d5b6e05fb53ea0a4aed7215";
+ sha256 = "51b9cab12fd91b009ea7ad4968a2c8a59e94dc55d2e6cc1d712acd5ba2c4d509";
}
{
version = "11.3.0";
diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/root/5.nix b/third_party/nixpkgs/pkgs/applications/science/misc/root/5.nix
index 75607fdda3..0da3014507 100644
--- a/third_party/nixpkgs/pkgs/applications/science/misc/root/5.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/misc/root/5.nix
@@ -1,6 +1,27 @@
-{ lib, stdenv, fetchurl, fetchpatch, cmake, pcre, pkg-config, python2
-, libX11, libXpm, libXft, libXext, libGLU, libGL, zlib, libxml2, lz4, xz, gsl_1, xxHash
-, Cocoa, OpenGL, noSplash ? false }:
+{ lib
+, stdenv
+, fetchurl
+, fetchpatch
+, cmake
+, pcre
+, pkg-config
+, python2
+, libX11
+, libXpm
+, libXft
+, libXext
+, libGLU
+, libGL
+, zlib
+, libxml2
+, lz4
+, xz
+, gsl_1
+, xxHash
+, Cocoa
+, OpenGL
+, noSplash ? false
+}:
stdenv.mkDerivation rec {
pname = "root";
@@ -15,7 +36,7 @@ stdenv.mkDerivation rec {
buildInputs = [ pcre python2 zlib libxml2 lz4 xz gsl_1 xxHash ]
++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ]
++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ]
- ;
+ ;
patches = [
./sw_vers_root5.patch
diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix
index a97be6ec76..8aa9006d52 100644
--- a/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix
@@ -1,23 +1,73 @@
-{ stdenv, lib, fetchurl, makeWrapper, cmake, git, ftgl, gl2ps, glew, gsl
-, libX11, libXpm, libXft, libXext, libGLU, libGL, libxml2, lz4, xz, pcre, nlohmann_json
-, pkg-config, python, xxHash, zlib, zstd
-, libAfterImage, giflib, libjpeg, libtiff, libpng
-, Cocoa, CoreSymbolication, OpenGL, noSplash ? false }:
+{ stdenv
+, lib
+, fetchurl
+, makeWrapper
+, cmake
+, git
+, ftgl
+, gl2ps
+, glew
+, gsl
+, libX11
+, libXpm
+, libXft
+, libXext
+, libGLU
+, libGL
+, libxml2
+, lz4
+, xz
+, pcre
+, nlohmann_json
+, pkg-config
+, python
+, xxHash
+, zlib
+, zstd
+, libAfterImage
+, giflib
+, libjpeg
+, libtiff
+, libpng
+, Cocoa
+, CoreSymbolication
+, OpenGL
+, noSplash ? false
+}:
stdenv.mkDerivation rec {
pname = "root";
- version = "6.24.00";
+ version = "6.24.02";
src = fetchurl {
url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
- sha256 = "12crjzd7pzx5qpk2pb3z0rhmxlw5gsqaqzfl48qiq8c9l940b8wx";
+ sha256 = "sha256-BQfhCV4nnMxyQPZR0llmAkMlF5+oWhJZtpS1ZyOtfBw=";
};
nativeBuildInputs = [ makeWrapper cmake pkg-config git ];
- buildInputs = [ ftgl gl2ps glew pcre zlib zstd libxml2 lz4 xz gsl xxHash libAfterImage giflib libjpeg libtiff libpng nlohmann_json python.pkgs.numpy ]
- ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ]
- ++ lib.optionals (stdenv.isDarwin) [ Cocoa CoreSymbolication OpenGL ]
- ;
+ buildInputs = [
+ ftgl
+ gl2ps
+ glew
+ pcre
+ zlib
+ zstd
+ libxml2
+ lz4
+ xz
+ gsl
+ xxHash
+ libAfterImage
+ giflib
+ libjpeg
+ libtiff
+ libpng
+ nlohmann_json
+ python.pkgs.numpy
+ ]
+ ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ]
+ ++ lib.optionals (stdenv.isDarwin) [ Cocoa CoreSymbolication OpenGL ]
+ ;
patches = [
./sw_vers.patch
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-sync/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-sync/default.nix
index add7bfc552..15d0fe9bc0 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-sync/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-sync/default.nix
@@ -1,15 +1,14 @@
-{ lib, stdenv, fetchFromGitHub, coreutils, gnugrep, gnused, makeWrapper, git
-}:
+{ lib, stdenv, fetchFromGitHub, coreutils, git, gnugrep, gnused, makeWrapper, inotify-tools }:
stdenv.mkDerivation rec {
pname = "git-sync";
- version = "20151024";
+ version = "unstable-2021-07-14";
src = fetchFromGitHub {
owner = "simonthum";
repo = "git-sync";
- rev = "eb9adaf2b5fd65aac1e83d6544b9076aae6af5b7";
- sha256 = "01if8y93wa0mwbkzkzx2v1vqh47zlz4k1dysl6yh5rmppd1psknz";
+ rev = "7d3d34bf3ee2483fba00948f5b97f964b849a590";
+ sha256 = "sha256-PuYREW5NBkYF1tlcLTbOI8570nvHn5ifN8OIInfNNxI=";
};
nativeBuildInputs = [ makeWrapper ];
@@ -18,10 +17,11 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin
- cp -a git-sync $out/bin/git-sync
+ cp -a git-* $out/bin/
'';
wrapperPath = with lib; makeBinPath [
+ inotify-tools
coreutils
git
gnugrep
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix
index 258e81aced..bd61d984c6 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix
@@ -16,12 +16,12 @@ with lib;
buildGoPackage rec {
pname = "gitea";
- version = "1.14.4";
+ version = "1.14.5";
# not fetching directly from the git repo, because that lacks several vendor files for the web UI
src = fetchurl {
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
- sha256 = "sha256-sl/Vml8QmwZEAd2PIYWQcP7s6NYeomGJQGKhRiddtoo=";
+ sha256 = "sha256-8nwLVpe/5IjXJqO179lN80B/3WGUL3LKM8OWdh/bYOE=";
};
unpackPhase = ''
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix
index c0cc9d5e2b..3e10add49d 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix
@@ -13,11 +13,11 @@ let
in
stdenv.mkDerivation rec {
pname = "gitkraken";
- version = "7.6.1";
+ version = "7.7.0";
src = fetchzip {
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
- sha256 = "sha256-wpfTozXxanZkYtYQHY950PLsVO4lXLt5OOP/xDCrFEw=";
+ sha256 = "0zb94ipi777qkznxpgb7ah31mx9b63713k92vhxhz4glna59lvk3";
};
dontBuild = true;
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix
index ee7c4d6bcf..ec358507c2 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix
@@ -8,7 +8,7 @@ rec {
, moby-src
, runcRev, runcSha256
, containerdRev, containerdSha256
- , tiniRev, tiniSha256, buildxSupport ? false
+ , tiniRev, tiniSha256, buildxSupport ? true
# package dependencies
, stdenv, fetchFromGitHub, buildGoPackage
, makeWrapper, installShellFiles, pkg-config, glibc
@@ -77,6 +77,10 @@ rec {
extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute2 iptables e2fsprogs xz xfsprogs procps util-linux git ]);
+ postPatch = ''
+ patchShebangs hack/make.sh hack/make/
+ '';
+
buildPhase = ''
export GOCACHE="$TMPDIR/go-cache"
# build engine
@@ -88,11 +92,6 @@ rec {
cd -
'';
- postPatch = ''
- patchShebangs .
- substituteInPlace ./hack/make.sh --replace libsystemd-journal libsystemd
- '';
-
installPhase = ''
cd ./go/src/${goPackagePath}
install -Dm755 ./bundles/dynbinary-daemon/dockerd $out/libexec/docker/dockerd
@@ -144,6 +143,14 @@ rec {
sqlite lvm2 btrfs-progs systemd libseccomp
] ++ optionals (buildxSupport) [ docker-buildx ];
+ postPatch = ''
+ patchShebangs man scripts/build/
+ substituteInPlace ./scripts/build/.variables --replace "set -eu" ""
+ '' + optionalString buildxSupport ''
+ substituteInPlace ./cli-plugins/manager/manager_unix.go --replace /usr/libexec/docker/cli-plugins \
+ ${lib.strings.makeSearchPathOutput "bin" "libexec/docker/cli-plugins" [docker-buildx]}
+ '';
+
# Keep eyes on BUILDTIME format - https://github.com/docker/cli/blob/${version}/scripts/build/.variables
buildPhase = ''
export GOCACHE="$TMPDIR/go-cache"
@@ -162,14 +169,6 @@ rec {
cd -
'';
- postPatch = ''
- patchShebangs .
- substituteInPlace ./scripts/build/.variables --replace "set -eu" ""
- '' + optionalString buildxSupport ''
- substituteInPlace ./cli-plugins/manager/manager_unix.go --replace /usr/libexec/docker/cli-plugins \
- ${lib.strings.makeSearchPathOutput "bin" "libexec/docker/cli-plugins" [docker-buildx]}
- '';
-
outputs = ["out" "man"];
installPhase = ''
@@ -211,7 +210,7 @@ rec {
homepage = "https://www.docker.com/";
description = "An open source project to pack, ship and run any application as a lightweight container";
license = licenses.asl20;
- maintainers = with maintainers; [ offline tailhook vdemeester periklis ];
+ maintainers = with maintainers; [ offline tailhook vdemeester periklis mikroskeem ];
platforms = with platforms; linux ++ darwin;
};
@@ -222,14 +221,14 @@ rec {
# Get revisions from
# https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/*
docker_20_10 = callPackage dockerGen rec {
- version = "20.10.6";
+ version = "20.10.7";
rev = "v${version}";
- sha256 = "15kknb26vyzjgqmn8r81a1sy1i5br6bvngqd5xljihppnxvp2gvl";
+ sha256 = "1r854jrjph4v1n5lr82z0cl0241ycili4qr3qh3k3bmqx790cds3";
moby-src = fetchFromGitHub {
owner = "moby";
repo = "moby";
rev = "v${version}";
- sha256 = "1l4ra9bsvydaxd2fy7dgxp7ynpp0mrlwvcdhxiafw596559ab6qk";
+ sha256 = "0xhn11kgcbzda4z9j0rflvq0nfivizh3jrzhanwn5vnghafy4zqw";
};
runcRev = "b9ee9c6314599f1b4a7f497e1f1f856fe433d3b7"; # v1.0.0-rc95
runcSha256 = "18sbvmlvb6kird4w3rqsfrjdj7n25firabvdxsl0rxjfy9r1g2xb";
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/afterstep/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/afterstep/default.nix
index fbb4a7a5e4..ec7d3ae500 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/afterstep/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/afterstep/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, pkg-config
-, libjpeg, libtiff, libpng, freetype
+, libtiff
, fltk, gtk
-, libX11, libXext, libICE
+, libICE, libSM
, dbus
, fetchpatch
}:
@@ -24,8 +24,16 @@ stdenv.mkDerivation rec {
})
];
+ postPatch = ''
+ # Causes fatal ldconfig cache generation attempt on non-NixOS Linux
+ for mkfile in autoconf/Makefile.common.lib.in libAfter{Base,Image}/Makefile.in; do
+ substituteInPlace $mkfile \
+ --replace 'test -w /etc' 'false'
+ done
+ '';
+
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ libjpeg libtiff libpng freetype fltk gtk libX11 libXext libICE dbus dbus ];
+ buildInputs = [ libtiff fltk gtk libICE libSM dbus ];
# A strange type of bug: dbus is not immediately found by pkg-config
preConfigure = ''
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/phosh/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/phosh/default.nix
index dc1080d97b..9fa0959ed5 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/phosh/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/phosh/default.nix
@@ -37,14 +37,14 @@ let
};
in stdenv.mkDerivation rec {
pname = "phosh";
- version = "0.11.0";
+ version = "0.12.0";
src = fetchFromGitLab {
domain = "source.puri.sm";
owner = "Librem5";
repo = pname;
rev = "v${version}";
- sha256 = "104qib4blh32s7bg6j3xza3s9syrxrvyh2wpyh5yx7v5wqarr20x";
+ sha256 = "1s0lgq04qz562iri535wpwvfkmmngdpclyl329cf7rc9ihy1kjvs";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/build-support/emacs/elpa.nix b/third_party/nixpkgs/pkgs/build-support/emacs/elpa.nix
index 41a0670d0c..965b8d8189 100644
--- a/third_party/nixpkgs/pkgs/build-support/emacs/elpa.nix
+++ b/third_party/nixpkgs/pkgs/build-support/emacs/elpa.nix
@@ -1,6 +1,6 @@
# builder for Emacs packages built for packages.el
-{ lib, stdenv, emacs, texinfo, writeText }:
+{ lib, stdenv, emacs, texinfo, writeText, gcc }:
with lib;
@@ -19,7 +19,7 @@ let
in
-import ./generic.nix { inherit lib stdenv emacs texinfo writeText; } ({
+import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({
phases = "installPhase fixupPhase distPhase";
diff --git a/third_party/nixpkgs/pkgs/build-support/emacs/generic.nix b/third_party/nixpkgs/pkgs/build-support/emacs/generic.nix
index 1456d9e423..ef154982ad 100644
--- a/third_party/nixpkgs/pkgs/build-support/emacs/generic.nix
+++ b/third_party/nixpkgs/pkgs/build-support/emacs/generic.nix
@@ -1,6 +1,6 @@
# generic builder for Emacs packages
-{ lib, stdenv, emacs, texinfo, writeText, ... }:
+{ lib, stdenv, emacs, texinfo, writeText, gcc, ... }:
with lib;
@@ -72,6 +72,8 @@ stdenv.mkDerivation ({
LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib";
+ nativeBuildInputs = [ gcc ];
+
addEmacsNativeLoadPath = true;
postInstall = ''
diff --git a/third_party/nixpkgs/pkgs/build-support/emacs/melpa.nix b/third_party/nixpkgs/pkgs/build-support/emacs/melpa.nix
index c30d3e5990..408448f26a 100644
--- a/third_party/nixpkgs/pkgs/build-support/emacs/melpa.nix
+++ b/third_party/nixpkgs/pkgs/build-support/emacs/melpa.nix
@@ -1,7 +1,7 @@
# builder for Emacs packages built for packages.el
# using MELPA package-build.el
-{ lib, stdenv, fetchFromGitHub, emacs, texinfo, writeText }:
+{ lib, stdenv, fetchFromGitHub, emacs, texinfo, writeText, gcc }:
with lib;
@@ -28,7 +28,7 @@ let
in
-import ./generic.nix { inherit lib stdenv emacs texinfo writeText; } ({
+import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({
ename =
if ename == null
diff --git a/third_party/nixpkgs/pkgs/build-support/emacs/wrapper.nix b/third_party/nixpkgs/pkgs/build-support/emacs/wrapper.nix
index 571d0eb687..6b53f3fdd9 100644
--- a/third_party/nixpkgs/pkgs/build-support/emacs/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/build-support/emacs/wrapper.nix
@@ -32,7 +32,7 @@ in customEmacsPackages.emacs.pkgs.withPackages (epkgs: [ epkgs.evil epkgs.magit
*/
-{ lib, lndir, makeWrapper, runCommand }: self:
+{ lib, lndir, makeWrapper, runCommand, gcc }: self:
with lib;
@@ -65,7 +65,10 @@ runCommand
# Store all paths we want to add to emacs here, so that we only need to add
# one path to the load lists
deps = runCommand "emacs-packages-deps"
- { inherit explicitRequires lndir emacs; }
+ {
+ inherit explicitRequires lndir emacs;
+ nativeBuildInputs = lib.optional nativeComp gcc;
+ }
''
findInputsOld() {
local pkg="$1"; shift
diff --git a/third_party/nixpkgs/pkgs/data/fonts/kanit/default.nix b/third_party/nixpkgs/pkgs/data/fonts/kanit/default.nix
new file mode 100644
index 0000000000..9b5be79061
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/data/fonts/kanit/default.nix
@@ -0,0 +1,39 @@
+{ lib, stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ pname = "kanit";
+ version = "unstable-2020-06-16";
+
+ src = fetchFromGitHub {
+ owner = "cadsondemak";
+ repo = pname;
+ rev = "467dfe842185681d8042cd608b8291199dd37cda";
+ sha256 = "0p0klb0376r8ki4ap2j99j7jcsq6wgb7m1hf3j1dkncwm7ikmg3h";
+ };
+
+ installPhase = ''
+ mkdir -p $out/share/doc/${pname}/css/ $out/share/fonts/{opentype,truetype}
+
+ cp $src/OFL.txt $src/documentation/{BRIEF.md,features.html} $out/share/doc/${pname}
+ cp $src/documentation/css/fonts.css $out/share/doc/${pname}/css
+ cp $src/fonts/otf/*.otf $out/share/fonts/opentype
+ cp $src/fonts/ttf/*.ttf $out/share/fonts/truetype
+ '';
+
+ meta = with lib; {
+ homepage = "https://cadsondemak.github.io/kanit/";
+ description = "A loopless Thai and sans serif Latin typeface for contemporary and futuristic uses";
+ longDescription = ''
+ Kanit means mathematics in Thai, and the Kanit typeface family is a formal
+ Loopless Thai and Sans Latin design. It is a combination of concepts,
+ mixing a Humanist Sans Serif motif with the curves of Capsulated Geometric
+ styles that makes it suitable for various uses, contemporary and
+ futuristic. A notable detail is that the stroke terminals have flat angles,
+ which allows the design to enjoy decreased spacing between letters while
+ preserving readability and legibility at smaller point sizes.
+ '';
+ license = licenses.ofl;
+ platforms = platforms.all;
+ maintainers = [ maintainers.toastal ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix
index e647b02f01..00de4f6760 100644
--- a/third_party/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix
+++ b/third_party/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix
@@ -1,32 +1,39 @@
-{ lib, stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }:
+{ lib, stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme, jdupes }:
stdenv.mkDerivation rec {
pname = "qogir-icon-theme";
- version = "2020-11-22";
+ version = "2021-07-14";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
- sha256 = "04rkpsiz8jg9i55mslsh7a6wgyp30ja3xss7qacqimdab236300d";
+ sha256 = "0anma2ss3yqr9njx4ay2nyxjkgnj7ky17c93ipwgrvgsv8jk5nn2";
};
- nativeBuildInputs = [ gtk3 ];
+ nativeBuildInputs = [ gtk3 jdupes ];
propagatedBuildInputs = [ hicolor-icon-theme ];
dontDropIconThemeCache = true;
+ # These fixup steps are slow and unnecessary.
+ dontPatchELF = true;
+ dontRewriteSymlinks = true;
+
installPhase = ''
+ runHook preInstall
patchShebangs install.sh
mkdir -p $out/share/icons
name= ./install.sh -d $out/share/icons
+ jdupes -l -r $out/share/icons
+ runHook postInstall
'';
meta = with lib; {
description = "Flat colorful design icon theme";
homepage = "https://github.com/vinceliuice/Qogir-icon-theme";
- license = with licenses; [ gpl3 ];
+ license = with licenses; [ gpl3Only ];
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
};
diff --git a/third_party/nixpkgs/pkgs/desktops/arcan/arcan.nix b/third_party/nixpkgs/pkgs/desktops/arcan/arcan.nix
index 8a30da9e81..c6a57ecc3b 100644
--- a/third_party/nixpkgs/pkgs/desktops/arcan/arcan.nix
+++ b/third_party/nixpkgs/pkgs/desktops/arcan/arcan.nix
@@ -52,13 +52,13 @@ let
in
stdenv.mkDerivation rec {
pname = "arcan";
- version = "0.6.1pre1+unstable=2021-07-07";
+ version = "0.6.1pre1+unstable=2021-07-10";
src = fetchFromGitHub {
owner = "letoram";
repo = "arcan";
- rev = "f3341ab94b32d02f3d15c3b91a512b2614e950a5";
- hash = "sha256-YBtRA5uCk4tjX3Bsu5vMkaNaCLRlM6HVQ53sna3gDsY=";
+ rev = "25da999e6e03688c71c7df3852314c01ed610e0d";
+ hash = "sha256-+ZF6mD/Z0N/5QCjXe80z4L6JOE33+Yv4ZlwKvlG/c44=";
};
postUnpack = ''
diff --git a/third_party/nixpkgs/pkgs/desktops/arcan/default.nix b/third_party/nixpkgs/pkgs/desktops/arcan/default.nix
index dba284f010..874035c480 100644
--- a/third_party/nixpkgs/pkgs/desktops/arcan/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/arcan/default.nix
@@ -37,6 +37,6 @@ rec {
everyone-wrapped = callPackage ./wrapper.nix {
name = "everyone-wrapped";
- appls = [ durden pipeworld prio ];
+ appls = [ durden pipeworld ];
};
}
diff --git a/third_party/nixpkgs/pkgs/desktops/arcan/durden.nix b/third_party/nixpkgs/pkgs/desktops/arcan/durden.nix
index cfe41cb6ec..f6837f96fb 100644
--- a/third_party/nixpkgs/pkgs/desktops/arcan/durden.nix
+++ b/third_party/nixpkgs/pkgs/desktops/arcan/durden.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "durden";
- version = "0.6.1+unstable=2021-06-25";
+ version = "0.6.1+unstable=2021-07-11";
src = fetchFromGitHub {
owner = "letoram";
repo = pname;
- rev = "fb618fccc57a68b6ce933b4df5822acd1965d591";
- hash = "sha256-PovI837Xca4wV0g0s4tYUMFGVUDf+f8HcdvM1+0aDxk=";
+ rev = "8e0a5c07cade9ad9f606781615c9ebae7b28b6d5";
+ hash = "sha256-4cGuCAeYmmr4ACWt2akVQu2cPqqyE6p+XFaKWcFf3t0=";
};
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/desktops/arcan/wrapper.nix b/third_party/nixpkgs/pkgs/desktops/arcan/wrapper.nix
index a8b93ca1de..4368b0ad3a 100644
--- a/third_party/nixpkgs/pkgs/desktops/arcan/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/desktops/arcan/wrapper.nix
@@ -21,7 +21,7 @@ symlinkJoin rec {
--set ARCAN_LIBPATH "${placeholder "out"}/lib/" \
--set ARCAN_RESOURCEPATH "${placeholder "out"}/share/arcan/resources/" \
--set ARCAN_SCRIPTPATH "${placeholder "out"}/share/arcan/scripts/" \
- --set ARCAN_STATEBASEPATH "$HOME/.arcan/resources/savestates/"
+ --set ARCAN_STATEBASEPATH "\$HOME/.arcan/resources/savestates/"
done
'';
}
diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/default.nix
index ae2255acb9..979ddafc10 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/gnome/default.nix
@@ -312,7 +312,7 @@ lib.makeScope pkgs.newScope (self: with self; {
# added 2019-02-08
inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3
- libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4
+ libgtop libgudev libhttpseverywhere librsvg libsecret gdk-pixbuf gtksourceview gtksourceviewmm gtksourceview4
easytag meld orca rhythmbox shotwell gnome-usage
clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 gnome-menus gdl;
inherit (pkgs) gsettings-desktop-schemas; # added 2019-04-16
diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
index 21aeb38530..2e20314d48 100644
--- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
@@ -11,15 +11,17 @@
, glib
, granite
, libgee
+, libhandy
, elementary-icon-theme
, elementary-gtk-theme
, gettext
, wrapGAppsHook
+, appstream
}:
stdenv.mkDerivation rec {
pname = "elementary-feedback";
- version = "1.0";
+ version = "6.0.0";
repoName = "feedback";
@@ -27,7 +29,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "sha256-GkVnowqGXwnEgplT34Po/BKzC2F/IQE2kIw0SLSLhGU=";
+ sha256 = "1fh9a0nfvbrxamki9avm9by760csj2nqy4ya7wzbnqbrrvjwd3fv";
};
passthru = {
@@ -47,11 +49,13 @@ stdenv.mkDerivation rec {
];
buildInputs = [
+ appstream
elementary-icon-theme
granite
gtk3
elementary-gtk-theme
libgee
+ libhandy
glib
];
diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-music/default.nix
index 5a5c314b3e..fe6c3f187f 100644
--- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-music/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-music/default.nix
@@ -1,6 +1,5 @@
{ lib, stdenv
, fetchFromGitHub
-, fetchpatch
, nix-update-script
, pantheon
, pkg-config
@@ -16,6 +15,7 @@
, json-glib
, libgda
, libgpod
+, libhandy
, libnotify
, libpeas
, libsoup
@@ -31,7 +31,7 @@
stdenv.mkDerivation rec {
pname = "elementary-music";
- version = "5.0.5";
+ version = "5.1.0";
repoName = "music";
@@ -39,17 +39,9 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "sha256-3GZoBCu9rF+BnNk9APBzKWO1JYg1XYWwrEvwcjWvYDE=";
+ sha256 = "13v7rii9ardyd661s6d4hvvs4ig44v7s3qd1bx7imaigr72gg58b";
};
- patches = [
- # Fix build with latest Vala.
- (fetchpatch {
- url = "https://github.com/elementary/music/commit/9ed3bbb3a0d68e289a772b4603f58e52a4973316.patch";
- sha256 = "fFO97SQzTc2fYFJFGfFPSUCdkCgZxfX1fjDQ7GH4BUs=";
- })
- ];
-
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
@@ -82,6 +74,7 @@ stdenv.mkDerivation rec {
libgda
libgee
libgpod
+ libhandy
libnotify
libpeas
libsignon-glib
diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
index 7280051361..bced420dbc 100644
--- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
@@ -1,6 +1,5 @@
{ lib, stdenv
, fetchFromGitHub
-, fetchpatch
, nix-update-script
, pantheon
, meson
@@ -12,6 +11,7 @@
, libaccounts-glib
, libexif
, libgee
+, libhandy
, geocode-glib
, gexiv2
, libgphoto2
@@ -35,7 +35,7 @@
stdenv.mkDerivation rec {
pname = "elementary-photos";
- version = "2.7.0";
+ version = "2.7.1";
repoName = "photos";
@@ -43,17 +43,9 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "sha256-bTk4shryAWWMrKX3mza6xQ05qpBPf80Ey7fmYgKLUiY=";
+ sha256 = "1dql14k43rv3in451amiwv4z71hz3ailx67hd8gw1ka3yw12128p";
};
- patches = [
- # Fix build with latest Vala.
- (fetchpatch {
- url = "https://github.com/elementary/photos/commit/27e529fc96da828982563e2e19a6f0cef883a29e.patch";
- sha256 = "w39wh45VHggCs62TN6wpUEyz/hJ1y7qL1Ox+sp0Pt2s=";
- })
- ];
-
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
@@ -88,6 +80,7 @@ stdenv.mkDerivation rec {
libgee
libgphoto2
libgudev
+ libhandy
libraw
librest
libsoup
diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
index e550609371..95df9a613a 100644
--- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
@@ -20,7 +20,7 @@
stdenv.mkDerivation rec {
pname = "elementary-videos";
- version = "2.7.2";
+ version = "2.7.3";
repoName = "videos";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "sha256-MSyhCXsziQ0MD4lGp9X/9odidjT/L+2Aihwd1qCGvB0=";
+ sha256 = "04nl9kn33dysvsg0n5qx1z8qgrifkgfwsm7gh1l308v3n8c69lh7";
};
passthru = {
diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
index 55935b2ee0..bd4845172c 100644
--- a/third_party/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
@@ -13,7 +13,7 @@
stdenv.mkDerivation rec {
pname = "elementary-icon-theme";
- version = "5.3.1";
+ version = "6.0.0";
repoName = "icons";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "sha256-6XFzjpuHpGIZ+azkPuFcSF7p66sDonwLwjvlNBZDRmc=";
+ sha256 = "0k94zi8fzi0nf5q471fmrlz8jjkv8m6vav1spzv7ynkg2hik8d9b";
};
passthru = {
diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/granite/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/granite/default.nix
index 3d4dc6bd84..2397dd8ffc 100644
--- a/third_party/nixpkgs/pkgs/desktops/pantheon/granite/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/pantheon/granite/default.nix
@@ -18,7 +18,7 @@
stdenv.mkDerivation rec {
pname = "granite";
- version = "6.0.0";
+ version = "6.1.0";
outputs = [ "out" "dev" ];
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "sha256-RGukXeFmtnyCfK8pKdvTHL0t8yhEYwAiiPelTy1Xcf0=";
+ sha256 = "02hn4abnsn6fm2m33pjmlnkj8dljsm292z62vn8ccvy7l8f9my6l";
};
passthru = {
diff --git a/third_party/nixpkgs/pkgs/development/compilers/idris2/default.nix b/third_party/nixpkgs/pkgs/development/compilers/idris2/default.nix
index ac0f331241..c399772a9f 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/idris2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/idris2/default.nix
@@ -48,7 +48,8 @@ stdenv.mkDerivation rec {
postInstall = let
includedLibs = [ "base" "contrib" "network" "prelude" ];
name = "${pname}-${version}";
- packagePaths = builtins.map (l: "$out/${name}/" + l) includedLibs;
+ packagePaths =
+ builtins.map (l: "$out/${name}/${l}-${version}") includedLibs;
additionalIdris2Paths = builtins.concatStringsSep ":" packagePaths;
in ''
# Remove existing idris2 wrapper that sets incorrect LD_LIBRARY_PATH
diff --git a/third_party/nixpkgs/pkgs/development/libraries/dqlite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dqlite/default.nix
index 83e63abb3c..15785d25fe 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/dqlite/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/dqlite/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "dqlite";
- version = "1.7.0";
+ version = "1.8.0";
src = fetchFromGitHub {
owner = "canonical";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-lCMTmKnDv/fb5fP/Ch8AwpuNfmR+gecxeIweO6hHj5U=";
+ sha256 = "0ghvwlgj5574kpgc53bfhqp4437xxvr05061wwxplpjxn37hy26d";
};
nativeBuildInputs = [ autoreconfHook file pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/fltk/1.4.nix b/third_party/nixpkgs/pkgs/development/libraries/fltk/1.4.nix
index 38926f298d..2a430844eb 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/fltk/1.4.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/fltk/1.4.nix
@@ -1,52 +1,5 @@
-{ lib, stdenv, fetchurl, pkg-config, xlibsWrapper, xorgproto, libXi
-, freeglut, libGLU, libGL, libjpeg, zlib, libXft, libpng
-, libtiff, freetype, Cocoa, AGL, GLUT
-}:
-
-let
- version = "1.4.x-r13121";
-in
-
-stdenv.mkDerivation {
- pname = "fltk";
- inherit version;
-
- src = fetchurl {
- url = "https://www.fltk.org/pub/fltk/snapshots/fltk-${version}.tar.gz";
- sha256 = "1v8wxvxcbk99i82x2v5fpqg5vj8n7g8a38g30ry7nzcjn5sf3r63";
- };
-
- patches = lib.optionals stdenv.isDarwin [ ./nsosv.patch ];
-
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ libGLU libGL libjpeg zlib libpng libXft ]
- ++ lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ];
-
- propagatedBuildInputs = [ xorgproto ]
- ++ (if stdenv.isDarwin
- then [ freetype libtiff ]
- else [ xlibsWrapper libXi freeglut ]);
-
- configureFlags = [
- "--enable-gl"
- "--enable-largefile"
- "--enable-shared"
- "--enable-threads"
- "--enable-xft"
- ];
-
- preConfigure = ''
- make clean
- rm VERSION
- '';
-
- enableParallelBuilding = true;
-
- meta = with lib; {
- description = "A C++ cross-platform lightweight GUI library";
- homepage = "https://www.fltk.org";
- platforms = platforms.linux ++ platforms.darwin;
- license = licenses.gpl2;
- };
-
+import ./common.nix rec {
+ version = "1.4.x-2021-07-04";
+ rev = "1008cdfab27609a6f6a0e82dadad9fd9cbd8a66d";
+ sha256 = "1h057dyhd04b9bjci952b2l7brxv183l9jw9i50mn9qjfljmvqim";
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/fltk/common.nix b/third_party/nixpkgs/pkgs/development/libraries/fltk/common.nix
new file mode 100644
index 0000000000..06e1c05c7d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/fltk/common.nix
@@ -0,0 +1,205 @@
+{ version, rev, sha256 }:
+
+{ stdenv
+, lib
+, fetchFromGitHub
+, cmake
+, pkg-config
+, zlib
+, libjpeg
+, libpng
+, fontconfig
+, freetype
+, libX11
+, libXext
+, libXinerama
+, libXfixes
+, libXcursor
+, libXft
+, libXrender
+, ApplicationServices
+, Carbon
+, Cocoa
+
+, withGL ? true
+, libGL
+, libGLU
+, glew
+, OpenGL
+
+, withCairo ? true
+, cairo
+
+, withPango ? (lib.strings.versionAtLeast version "1.4" && stdenv.hostPlatform.isLinux)
+, pango
+
+, withDocs ? true
+, doxygen
+, graphviz
+, texlive
+
+, withExamples ? true
+, withShared ? true
+}:
+
+let
+ onOff = value: if value then "ON" else "OFF";
+ tex = texlive.combine {
+ inherit (texlive)
+ scheme-medium varwidth multirow hanging adjustbox collectbox stackengine
+ sectsty tocloft newunicodechar etoc;
+ };
+in
+stdenv.mkDerivation rec {
+ pname = "fltk";
+ inherit version;
+
+ src = fetchFromGitHub {
+ owner = "fltk";
+ repo = "fltk";
+ inherit rev sha256;
+ };
+
+ outputs = [ "out" ]
+ ++ lib.optional withExamples "bin"
+ ++ lib.optional withDocs "doc";
+
+ # Manually move example & test binaries to $bin to avoid cyclic dependencies on dev binaries
+ outputBin = lib.optionalString withExamples "out";
+
+ patches = lib.optionals stdenv.hostPlatform.isDarwin [
+ ./nsosv.patch
+ ];
+
+ postPatch = ''
+ patchShebangs documentation/make_*
+ '';
+
+ nativeBuildInputs = [
+ cmake
+ pkg-config
+ ] ++ lib.optionals withDocs [
+ doxygen
+ graphviz
+ tex
+ ];
+
+ buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
+ ApplicationServices
+ Carbon
+ ] ++ lib.optionals (withGL && !stdenv.hostPlatform.isDarwin) [
+ libGL
+ libGLU
+ ] ++ lib.optionals (withExamples && withGL) [
+ glew
+ ];
+
+ propagatedBuildInputs = [
+ zlib
+ libjpeg
+ libpng
+ ] ++ lib.optionals stdenv.hostPlatform.isLinux [
+ freetype
+ fontconfig
+ libX11
+ libXext
+ libXinerama
+ libXfixes
+ libXcursor
+ libXft
+ libXrender
+ ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ Cocoa
+ ] ++ lib.optionals (withGL && stdenv.hostPlatform.isDarwin) [
+ OpenGL
+ ] ++ lib.optionals withCairo [
+ cairo
+ ] ++ lib.optionals withPango [
+ pango
+ ];
+
+ cmakeFlags = [
+ # Common
+ "-DOPTION_BUILD_SHARED_LIBS=${onOff withShared}"
+ "-DOPTION_USE_SYSTEM_ZLIB=ON"
+ "-DOPTION_USE_SYSTEM_LIBJPEG=ON"
+ "-DOPTION_USE_SYSTEM_LIBPNG=ON"
+
+ # X11
+ "-DOPTION_USE_XINERAMA=${onOff stdenv.hostPlatform.isLinux}"
+ "-DOPTION_USE_XFIXES=${onOff stdenv.hostPlatform.isLinux}"
+ "-DOPTION_USE_XCURSOR=${onOff stdenv.hostPlatform.isLinux}"
+ "-DOPTION_USE_XFT=${onOff stdenv.hostPlatform.isLinux}"
+ "-DOPTION_USE_XRENDER=${onOff stdenv.hostPlatform.isLinux}"
+ "-DOPTION_USE_XDBE=${onOff stdenv.hostPlatform.isLinux}"
+
+ # GL
+ "-DOPTION_USE_GL=${onOff withGL}"
+ "-DOpenGL_GL_PREFERENCE=GLVND"
+
+ # Cairo
+ "-DOPTION_CAIRO=${onOff withCairo}"
+ "-DOPTION_CAIROEXT=${onOff withCairo}"
+
+ # Pango
+ "-DOPTION_USE_PANGO=${onOff withPango}"
+
+ # Examples & Tests
+ "-DFLTK_BUILD_EXAMPLES=${onOff withExamples}"
+
+ # Docs
+ "-DOPTION_BUILD_HTML_DOCUMENTATION=${onOff withDocs}"
+ "-DOPTION_BUILD_PDF_DOCUMENTATION=${onOff withDocs}"
+ "-DOPTION_INSTALL_HTML_DOCUMENTATION=${onOff withDocs}"
+ "-DOPTION_INSTALL_PDF_DOCUMENTATION=${onOff withDocs}"
+ "-DOPTION_INCLUDE_DRIVER_DOCUMENTATION=${onOff withDocs}"
+ ];
+
+ preBuild = lib.optionalString (withCairo && withShared && stdenv.hostPlatform.isDarwin) ''
+ # unresolved symbols in cairo dylib without this: https://github.com/fltk/fltk/issues/250
+ export NIX_LDFLAGS="$NIX_LDFLAGS -undefined dynamic_lookup"
+ '';
+
+ postBuild = lib.optionalString withDocs ''
+ make docs
+ '';
+
+ postInstall = lib.optionalString withExamples ''
+ mkdir -p $bin/bin
+ mv bin/{test,examples}/* $bin/bin/
+ '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
+ mkdir -p $out/Library/Frameworks
+ mv $out{,/Library/Frameworks}/FLTK.framework
+
+ moveAppBundles() {
+ echo "Moving and symlinking $1"
+ appname="$(basename "$1")"
+ binname="$(basename "$(find "$1"/Contents/MacOS/ -type f -executable | head -n1)")"
+ curpath="$(dirname "$1")"
+
+ mkdir -p "$curpath"/../Applications/
+ mv "$1" "$curpath"/../Applications/
+ [ -f "$curpath"/"$binname" ] && rm "$curpath"/"$binname"
+ ln -s ../Applications/"$appname"/Contents/MacOS/"$binname" "$curpath"/"$binname"
+ }
+
+ rm $out/bin/fluid.icns
+ for app in $out/bin/*.app ${lib.optionalString withExamples "$bin/bin/*.app"}; do
+ moveAppBundles "$app"
+ done
+ '';
+
+ postFixup = ''
+ substituteInPlace $out/bin/fltk-config \
+ --replace "/$out/" "/"
+ '';
+
+ meta = with lib; {
+ description = "A C++ cross-platform lightweight GUI library";
+ homepage = "https://www.fltk.org";
+ platforms = platforms.unix;
+ # LGPL2 with static linking exception
+ # https://www.fltk.org/COPYING.php
+ license = licenses.lgpl2Only;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/fltk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fltk/default.nix
index 5cbd993fc6..831a96f71f 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/fltk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/fltk/default.nix
@@ -1,46 +1,5 @@
-{ lib, stdenv, fetchurl, pkg-config, xlibsWrapper, xorgproto, libXi
-, freeglut, libGL, libGLU, libjpeg, zlib, libXft, libpng
-, libtiff, freetype, Cocoa, AGL, GLUT
-}:
-
-let
- version = "1.3.5";
-in
-
-stdenv.mkDerivation {
- pname = "fltk";
- inherit version;
-
- src = fetchurl {
- url = "https://www.fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz";
- sha256 = "00jp24z1818k9n6nn6lx7qflqf2k13g4kxr0p8v1d37kanhb4ac7";
- };
-
- patches = lib.optionals stdenv.isDarwin [ ./nsosv.patch ];
-
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ libGLU libGL libjpeg zlib libpng libXft ]
- ++ lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ];
-
- propagatedBuildInputs = [ xorgproto ]
- ++ (if stdenv.isDarwin
- then [ freetype libtiff ]
- else [ xlibsWrapper libXi freeglut ]);
-
- configureFlags = [
- "--enable-gl"
- "--enable-largefile"
- "--enable-shared"
- "--enable-threads"
- "--enable-xft"
- ];
-
- enableParallelBuilding = true;
-
- meta = with lib; {
- description = "A C++ cross-platform lightweight GUI library";
- homepage = "https://www.fltk.org";
- platforms = platforms.linux ++ platforms.darwin;
- license = licenses.gpl2;
- };
+import ./common.nix rec {
+ version = "1.3.6";
+ rev = "release-${version}";
+ sha256 = "0vzk4d6j927v7dxywr5xlqlf70myal1xikkdfvd11p94rcdf9bsv";
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kcolorpicker/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kcolorpicker/default.nix
new file mode 100644
index 0000000000..75a07b17a7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/kcolorpicker/default.nix
@@ -0,0 +1,24 @@
+{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase }:
+
+mkDerivation rec {
+ pname = "kcolorpicker";
+ version = "0.1.6";
+
+ src = fetchFromGitHub {
+ owner = "ksnip";
+ repo = "kColorPicker";
+ rev = "v${version}";
+ sha256 = "1167xwk75yiz697vddbz3lq42l7ckhyl2cvigy4m05qgg9693ksd";
+ };
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ qtbase ];
+
+ meta = with lib; {
+ description = "Qt based Color Picker with popup menu";
+ homepage = "https://github.com/ksnip/kColorPicker";
+ license = licenses.lgpl3Plus;
+ maintainers = with maintainers; [ fliegendewurst ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kimageannotator/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kimageannotator/default.nix
new file mode 100644
index 0000000000..3188415ea0
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/kimageannotator/default.nix
@@ -0,0 +1,24 @@
+{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, kcolorpicker, qttools }:
+
+mkDerivation rec {
+ pname = "kimageannotator";
+ version = "0.5.1";
+
+ src = fetchFromGitHub {
+ owner = "ksnip";
+ repo = "kImageAnnotator";
+ rev = "v${version}";
+ sha256 = "0hfvrd78lgwd7bccz0fx2pr7g0v3s401y5plra63rxwk55ffkxf8";
+ };
+
+ nativeBuildInputs = [ cmake qttools ];
+ buildInputs = [ qtbase kcolorpicker ];
+
+ meta = with lib; {
+ description = "Tool for annotating images";
+ homepage = "https://github.com/ksnip/kImageAnnotator";
+ license = licenses.lgpl3Plus;
+ maintainers = with maintainers; [ fliegendewurst ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libconfig/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libconfig/default.nix
index 10d688d89b..d94a0e1d78 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libconfig/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libconfig/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
doCheck = true;
- configureFlags = lib.optional stdenv.targetPlatform.isWindows "--disable-examples";
+ configureFlags = lib.optional (stdenv.targetPlatform.isWindows || stdenv.hostPlatform.isStatic) "--disable-examples";
meta = with lib; {
homepage = "http://www.hyperrealm.com/libconfig";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgnt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgnt/default.nix
new file mode 100644
index 0000000000..33ce7fbaa1
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/libgnt/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, lib, fetchurl, meson, ninja, pkg-config
+, gtk-doc, docbook-xsl-nons
+, glib, ncurses, libxml2
+, buildDocs ? true
+}:
+stdenv.mkDerivation rec {
+ pname = "libgnt";
+ version = "2.14.1";
+
+ outputs = [ "out" "dev" ] ++ lib.optional buildDocs "devdoc";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/pidgin/${pname}-${version}.tar.xz";
+ sha256 = "1n2bxg0ignn53c08cp69pj4sdg53kwlqn23rincyjmpr327fdhsy";
+ };
+
+ nativeBuildInputs = [ meson ninja pkg-config ]
+ ++ lib.optionals buildDocs [ gtk-doc docbook-xsl-nons ];
+
+ buildInputs = [ glib ncurses libxml2 ];
+
+ postPatch = ''
+ substituteInPlace meson.build --replace \
+ "ncurses_sys_prefix = '/usr'" \
+ "ncurses_sys_prefix = '${lib.getDev ncurses}'"
+ '' + lib.optionalString (!buildDocs) ''
+ sed "/^subdir('doc')$/d" -i meson.build
+ '';
+
+ meta = with lib; {
+ description = "An ncurses toolkit for creating text-mode graphical user interfaces";
+ homepage = "https://keep.imfreedom.org/libgnt/libgnt/";
+ license = licenses.gpl2Plus;
+ platforms = platforms.unix;
+ maintainers = with lib.maintainers; [ ony ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/portaudio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/portaudio/default.nix
index 7f5818ae1b..840c9e773f 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/portaudio/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/portaudio/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--disable-mac-universal" "--enable-cxx" ];
- NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-const-int-float-conversion -Wno-error=nullability-completeness-on-arrays";
+ NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=deprecated-declarations -Wno-error=implicit-const-int-float-conversion -Wno-error=nullability-completeness-on-arrays";
propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tezos-rust-libs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tezos-rust-libs/default.nix
new file mode 100644
index 0000000000..bd406d6324
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/tezos-rust-libs/default.nix
@@ -0,0 +1,36 @@
+{ lib, fetchFromGitLab, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "tezos-rust-libs";
+ version = "1.0";
+
+ src = fetchFromGitLab {
+ owner = "tezos";
+ repo = "tezos-rust-libs";
+ rev = "v${version}";
+ sha256 = "1ffkzbvb0ls4wk9205g3xh2c26cmwnl68x43gh6dm9z4xsic94v5";
+ };
+
+ cargoSha256 = "0dgyqfr3dvvdwdi1wvpd7v9j21740jy4zwrwiwknw7csb4bq9wfx";
+
+ preBuild = ''
+ mkdir .cargo
+ mv cargo-config .cargo/config
+ '';
+
+ postInstall = ''
+ mkdir $out/lib/tezos-rust-libs
+ cp -r rustc-bls12-381/include $out/include
+ cp $out/lib/librustc_bls12_381.a $out/lib/tezos-rust-libs
+ cp $out/lib/librustzcash.a $out/lib/tezos-rust-libs
+ '';
+
+ doCheck = true;
+
+ meta = {
+ homepage = "https://gitlab.com/tezos/tezos-rust-libs";
+ description = "Tezos: all rust dependencies and their dependencies";
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.ulrikstrid ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/node-packages/default.nix b/third_party/nixpkgs/pkgs/development/node-packages/default.nix
index 5c99ceab20..daa97bfddd 100644
--- a/third_party/nixpkgs/pkgs/development/node-packages/default.nix
+++ b/third_party/nixpkgs/pkgs/development/node-packages/default.nix
@@ -35,6 +35,24 @@ let
'';
};
+ hyperspace-cli = super."@hyperspace/cli".override {
+ nativeBuildInputs = with pkgs; [
+ makeWrapper
+ libtool
+ autoconf
+ automake
+ ];
+ buildInputs = with pkgs; [
+ nodePackages.node-gyp-build
+ nodejs
+ ];
+ postInstall = ''
+ wrapProgram "$out/bin/hyp" --prefix PATH : ${
+ pkgs.lib.makeBinPath [ pkgs.nodejs ]
+ }
+ '';
+ };
+
coc-imselect = super.coc-imselect.override {
meta.broken = since "10";
};
@@ -107,6 +125,19 @@ let
nativeBuildInputs = drv.nativeBuildInputs or [] ++ [ pkgs.psc-package self.pulp ];
});
+ jsonplaceholder = super.jsonplaceholder.override (drv: {
+ buildInputs = [ nodejs ];
+ postInstall = ''
+ exe=$out/bin/jsonplaceholder
+ mkdir -p $out/bin
+ cat >$exe <=0.7" \
--replace "docker~=4.2.0" "docker>=4.2.0" \
--replace "requests==2.23.0" "requests~=2.24" \
diff --git a/third_party/nixpkgs/pkgs/development/tools/azure-functions-core-tools/default.nix b/third_party/nixpkgs/pkgs/development/tools/azure-functions-core-tools/default.nix
new file mode 100644
index 0000000000..9396821f8c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/azure-functions-core-tools/default.nix
@@ -0,0 +1,74 @@
+{ stdenv
+, lib
+, config
+, fetchurl
+, unzip
+, makeWrapper
+, icu
+, libunwind
+, curl
+, zlib
+, libuuid
+, dotnetbuildhelpers
+, dotnetCorePackages
+, coreclr
+, openssl
+}:
+
+stdenv.mkDerivation rec {
+ pname = "azure-functions-core-tools";
+ version = "3.0.3568";
+
+ src = fetchurl {
+ url = "https://github.com/Azure/${pname}/releases/download/${version}/Azure.Functions.Cli.linux-x64.${version}.zip";
+ sha256 = "0yxdqc5d1xsixjj2dlvs32d6fz4vh58ih2l00lc456fg15mfw3lg";
+ };
+
+ buildInputs = [
+ unzip
+ makeWrapper
+ dotnetbuildhelpers
+ ];
+
+ nativeBuildInputs = [
+ icu
+ libunwind
+ curl
+ zlib
+ dotnetCorePackages.sdk_3_1
+ ];
+
+ libPath = lib.makeLibraryPath [
+ libunwind
+ libuuid
+ stdenv.cc.cc
+ curl
+ zlib
+ icu
+ openssl
+ ];
+
+ unpackPhase = ''
+ unzip $src
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp -prd * $out/bin
+ patchelf \
+ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath "${libPath}" "$out/bin/func"
+ chmod +x $out/bin/func $out/bin/gozip
+ find $out/bin -type f -name "*.so" -exec patchelf --set-rpath "${libPath}" {} \;
+ wrapProgram "$out/bin/func" --prefix LD_LIBRARY_PATH : ${libPath}
+ '';
+ dontStrip = true; # Causes rpath patching to break if not set
+
+ meta = with lib; {
+ homepage = "https://github.com/Azure/azure-functions-core-tools";
+ description = "Command line tools for Azure Functions";
+ license = licenses.mit;
+ maintainers = with maintainers; [ jshcmpbll ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix
index fccee0ede2..24e2e0fea6 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "reviewdog";
- version = "0.11.0";
+ version = "0.12.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "0n7hk3va25ym8sb900i1s1hjszgwrfl7gfsjbj1m330fidh3q6jc";
+ sha256 = "18fk4xzl6ys3azyw9ap14zgf3av5fdsrdn4mxx9calimvzbl4nfp";
};
- vendorSha256 = "0xscirzi0gqww33ngwh29jiylarj0w5snn9kvv43wfrphb6c79s5";
+ vendorSha256 = "1qcp8v426500cpfrchazsh5rw4nr0c31vmrhbfgb9js4vxrn8acr";
doCheck = false;
@@ -22,7 +22,7 @@ buildGoModule rec {
meta = with lib; {
description = "Automated code review tool integrated with any code analysis tools regardless of programming language";
homepage = "https://github.com/reviewdog/reviewdog";
- changelog = "https://github.com/reviewdog/reviewdog/releases/tag/v${version}";
+ changelog = "https://github.com/reviewdog/reviewdog/raw/v${version}/CHANGELOG.md";
maintainers = [ maintainers.marsam ];
license = licenses.mit;
};
diff --git a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix
index a07f2f9115..7cf36fd1f8 100644
--- a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix
@@ -66,13 +66,13 @@ let
in stdenv.mkDerivation rec {
pname = "omnisharp-roslyn";
- version = "1.37.8";
+ version = "1.37.12";
src = fetchFromGitHub {
owner = "OmniSharp";
repo = pname;
rev = "v${version}";
- sha256 = "1zi31m6ngk4rm7444n6q7mim096w5h4j2biwmvwmcf5yvig845za";
+ sha256 = "0gyy49v3pslr0l0q6h8hzah4s0iwkhkyckyrj3g2cg08w20b10gw";
};
nativeBuildInputs = [ makeWrapper msbuild ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/deps.nix b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/deps.nix
index de6761045d..b64d5894da 100644
--- a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/deps.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/deps.nix
@@ -1,34 +1,34 @@
{ fetchurl }: [
{
name = "cake.scripting.abstractions";
- version = "0.3.0";
+ version = "0.6.4";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/cake.scripting.abstractions/0.3.0/cake.scripting.abstractions.0.3.0.nupkg";
- sha256 = "009yca6zskcwx9hg3gpgapvzl5mvisl8ni737plbznx033bhw8s8";
+ url = "https://api.nuget.org/v3-flatcontainer/cake.scripting.abstractions/0.6.4/cake.scripting.abstractions.0.6.4.nupkg";
+ sha256 = "14fcixlj2xazf6cb46gw8jgbsz89c6s8fnhvppxs8q12pygmkx0l";
};
}
{
name = "cake.scripting.transport";
- version = "0.3.0";
+ version = "0.6.4";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/cake.scripting.transport/0.3.0/cake.scripting.transport.0.3.0.nupkg";
- sha256 = "0sc7rlnrqq30753h5cg3fndrlmix4vp2sxqb4sl044296mzcszl4";
+ url = "https://api.nuget.org/v3-flatcontainer/cake.scripting.transport/0.6.4/cake.scripting.transport.0.6.4.nupkg";
+ sha256 = "08cwj572mvmlagj5jry11j2l2fqc6yl4sw0szvql4ard9cx7j51n";
};
}
{
name = "dotnet.script.dependencymodel";
- version = "1.0.2";
+ version = "1.1.0";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/dotnet.script.dependencymodel/1.0.2/dotnet.script.dependencymodel.1.0.2.nupkg";
- sha256 = "0nqqplwykgbkpyidvkls9nrwxkpl1w1zrv8l7smjm62s18z5mqxb";
+ url = "https://api.nuget.org/v3-flatcontainer/dotnet.script.dependencymodel/1.1.0/dotnet.script.dependencymodel.1.1.0.nupkg";
+ sha256 = "0ly1jwvzndrhgvrwy7kagabyca40j8w9p5jvvfj4wlpffvxq44xl";
};
}
{
name = "dotnet.script.dependencymodel.nuget";
- version = "1.0.1";
+ version = "1.1.0";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/dotnet.script.dependencymodel.nuget/1.0.1/dotnet.script.dependencymodel.nuget.1.0.1.nupkg";
- sha256 = "1ja9wsc73l5bqx0nv8lzyj2l65h1i7sk77wc7biplb80wm1rvsj4";
+ url = "https://api.nuget.org/v3-flatcontainer/dotnet.script.dependencymodel.nuget/1.1.0/dotnet.script.dependencymodel.nuget.1.1.0.nupkg";
+ sha256 = "1kvjrm28jlfmcsy5fna8hy814chbcsc39ka12h8mgpdvjkr93njr";
};
}
{
@@ -41,10 +41,10 @@
}
{
name = "icsharpcode.decompiler";
- version = "7.0.0.6372-preview3";
+ version = "7.1.0.6543";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/icsharpcode.decompiler/7.0.0.6372-preview3/icsharpcode.decompiler.7.0.0.6372-preview3.nupkg";
- sha256 = "0g7ki0ia1qcp9z9hgs2f63yffx66y8zi43k7nrf2n122ll1f0hsg";
+ url = "https://api.nuget.org/v3-flatcontainer/icsharpcode.decompiler/7.1.0.6543/icsharpcode.decompiler.7.1.0.6543.nupkg";
+ sha256 = "1xrajs5dcd7aqsg9ibhdcy39yrd8737kknkmqf907n7fqs2jxr46";
};
}
{
@@ -113,26 +113,34 @@
}
{
name = "microsoft.build";
- version = "16.9.0";
+ version = "16.10.0";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/microsoft.build/16.9.0/microsoft.build.16.9.0.nupkg";
- sha256 = "0kgfx3iqmc58f3a59ggc1wi486fjrqnzgayxldhpr2w7q5600w5p";
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.build/16.10.0/microsoft.build.16.10.0.nupkg";
+ sha256 = "1ran3fp016wvj8d2ahv0cmwhm6hjjh64w82s7cy52s7qffrgjk46";
};
}
{
name = "microsoft.build.framework";
- version = "16.9.0";
+ version = "16.10.0";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.framework/16.9.0/microsoft.build.framework.16.9.0.nupkg";
- sha256 = "1yddq21q82p28k6cdq3hzic20l6dcma2fzfbm35zanfljxdsb4cf";
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.framework/16.10.0/microsoft.build.framework.16.10.0.nupkg";
+ sha256 = "17a8qxgq0jzxpjannhxkcg0941b64yb7z0yq75gz6hsq9ln3agja";
+ };
+ }
+ {
+ name = "microsoft.build.locator";
+ version = "1.4.1";
+ src = fetchurl {
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.locator/1.4.1/microsoft.build.locator.1.4.1.nupkg";
+ sha256 = "0j119rri7a401rca67cxdyrn3rprzdl1b2wrblqc23xsff1xvlrx";
};
}
{
name = "microsoft.build.tasks.core";
- version = "16.9.0";
+ version = "16.10.0";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.tasks.core/16.9.0/microsoft.build.tasks.core.16.9.0.nupkg";
- sha256 = "1gpra00srwvwzi0a3d5nkjik9y8glh6qn0qdba4f5wiza1l2bdzw";
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.tasks.core/16.10.0/microsoft.build.tasks.core.16.10.0.nupkg";
+ sha256 = "0yc3p4bksxmbq1n8wfqgn6b6x9ccyzq229f0mn08z4jfima3cnxg";
};
}
{
@@ -145,18 +153,18 @@
}
{
name = "microsoft.build.utilities.core";
- version = "16.9.0";
+ version = "16.10.0";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.utilities.core/16.9.0/microsoft.build.utilities.core.16.9.0.nupkg";
- sha256 = "0g05hmpzj33bknigdz5samw5pqss1q0sscv34sr53w2aiki5nx2c";
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.utilities.core/16.10.0/microsoft.build.utilities.core.16.10.0.nupkg";
+ sha256 = "1rh3gzrz8mmzilvs33cxngv0a805nb47s615rvj4xk5igm384w14";
};
}
{
name = "microsoft.codeanalysis.analyzers";
- version = "3.0.0";
+ version = "3.3.2";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.analyzers/3.0.0/microsoft.codeanalysis.analyzers.3.0.0.nupkg";
- sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8";
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.analyzers/3.3.2/microsoft.codeanalysis.analyzers.3.3.2.nupkg";
+ sha256 = "162vb5894zxps0cf5n9gc08an7gwybzz87allx3lsszvllr9ldx4";
};
}
{
@@ -169,66 +177,82 @@
}
{
name = "microsoft.codeanalysis.common";
- version = "3.10.0-1.21125.6";
+ version = "4.0.0-2.21322.50";
src = fetchurl {
- url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/3.10.0-1.21125.6/microsoft.codeanalysis.common.3.10.0-1.21125.6.nupkg";
- sha256 = "0rj7210v3i16pwjswa6fz3ksg19ncn8g7nm8qp8ly3xf9v5j25kn";
+ url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.0.0-2.21322.50/microsoft.codeanalysis.common.4.0.0-2.21322.50.nupkg";
+ sha256 = "1j9yl7m0lr03fjklzjyiac1lrgs8541frqmi4xlldn8a2sx3h97x";
};
}
{
name = "microsoft.codeanalysis.csharp";
- version = "3.10.0-1.21125.6";
+ version = "4.0.0-2.21322.50";
src = fetchurl {
- url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/3.10.0-1.21125.6/microsoft.codeanalysis.csharp.3.10.0-1.21125.6.nupkg";
- sha256 = "194h2r33f2w2ssbnrp21ly3m7md9mizhhanmccqbkqg3pbjd2lik";
+ url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.0.0-2.21322.50/microsoft.codeanalysis.csharp.4.0.0-2.21322.50.nupkg";
+ sha256 = "1mmcl4rj3n1q7zh1n9b9ph3lvm8i51sdm87q3sgiczv2pxrihzs6";
};
}
{
name = "microsoft.codeanalysis.csharp.features";
- version = "3.10.0-1.21125.6";
+ version = "4.0.0-2.21322.50";
src = fetchurl {
- url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/3.10.0-1.21125.6/microsoft.codeanalysis.csharp.features.3.10.0-1.21125.6.nupkg";
- sha256 = "027njgyzc4w136sa9f68n8fx62qpzb4nigx50knljgk622k3acjl";
+ url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/4.0.0-2.21322.50/microsoft.codeanalysis.csharp.features.4.0.0-2.21322.50.nupkg";
+ sha256 = "11pzbswlznz71m248c1p4fi4i3zzvpc4a71px9j2lhnm57zy2lvy";
};
}
{
name = "microsoft.codeanalysis.csharp.scripting";
- version = "3.10.0-1.21125.6";
+ version = "4.0.0-2.21322.50";
src = fetchurl {
- url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/3.10.0-1.21125.6/microsoft.codeanalysis.csharp.scripting.3.10.0-1.21125.6.nupkg";
- sha256 = "1378ad9cfv5zlzix96q0viqylqzhgcb52zb8bc5y9k8rvnjqgppk";
+ url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.0.0-2.21322.50/microsoft.codeanalysis.csharp.scripting.4.0.0-2.21322.50.nupkg";
+ sha256 = "0piiyg1l27cy6s4ii80phrdsyhl8zvwbj9aljqkg53gki520x19p";
};
}
{
name = "microsoft.codeanalysis.csharp.workspaces";
- version = "3.10.0-1.21125.6";
+ version = "4.0.0-2.21322.50";
src = fetchurl {
- url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/3.10.0-1.21125.6/microsoft.codeanalysis.csharp.workspaces.3.10.0-1.21125.6.nupkg";
- sha256 = "1yhcm1qm7jjmp1fkpkkzq136frjqc558w49ygdiknyk253llqvm7";
+ url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/4.0.0-2.21322.50/microsoft.codeanalysis.csharp.workspaces.4.0.0-2.21322.50.nupkg";
+ sha256 = "0q6jkgjh1dylmjx8a79ighgbai1jr2fhls9m7khi87anzc3wdcl2";
+ };
+ }
+ {
+ name = "microsoft.codeanalysis.externalaccess.omnisharp";
+ version = "4.0.0-2.21322.50";
+ src = fetchurl {
+ url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.0.0-2.21322.50/microsoft.codeanalysis.externalaccess.omnisharp.4.0.0-2.21322.50.nupkg";
+ sha256 = "1rv5qsj8lsfqxdzd6zazrzwzaxwmj6szd9hv2ckbb4lypkn8ifs8";
+ };
+ }
+ {
+ name = "microsoft.codeanalysis.externalaccess.omnisharp.csharp";
+ version = "4.0.0-2.21322.50";
+ src = fetchurl {
+ url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.0.0-2.21322.50/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.0.0-2.21322.50.nupkg";
+ sha256 = "0ygp7hnm6mn9khh6z573avhvbcx5459fmyz4z657dx9p2v1f0fs0";
};
}
{
name = "microsoft.codeanalysis.features";
- version = "3.10.0-1.21125.6";
+ version = "4.0.0-2.21322.50";
src = fetchurl {
- url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/3.10.0-1.21125.6/microsoft.codeanalysis.features.3.10.0-1.21125.6.nupkg";
- sha256 = "1ydzx96a925a98zdxd6l9kgkl7b67sfbnkam61y0hkvgfdg1xg1a";
+ url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.0.0-2.21322.50/microsoft.codeanalysis.features.4.0.0-2.21322.50.nupkg";
+ sha256 = "1grkql2wcqsqlmqnfchw6wxynwpz4x9wgqd00zpc1g04z9lqimq6";
};
}
{
name = "microsoft.codeanalysis.scripting.common";
- version = "3.10.0-1.21125.6";
+ version = "4.0.0-2.21322.50";
src = fetchurl {
- url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/3.10.0-1.21125.6/microsoft.codeanalysis.scripting.common.3.10.0-1.21125.6.nupkg";
- sha256 = "1blr101n2l7k0bmc248blh36a7nxbbjw3kirsn154zrbmc8s8m1m";
+ url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/4.0.0-2.21322.50/microsoft.codeanalysis.scripting.common.4.0.0-2.21322.50.nupkg";
+ sha256 = "1c14bg99ywxdvlp5zc08ijc030rxmpb3171kz2z6f5kr02vf296x";
};
}
{
name = "microsoft.codeanalysis.workspaces.common";
- version = "3.10.0-1.21125.6";
+ version = "4.0.0-2.21322.50";
src = fetchurl {
- url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/3.10.0-1.21125.6/microsoft.codeanalysis.workspaces.common.3.10.0-1.21125.6.nupkg";
- sha256 = "029scic0mdbmw8gm6wmg5wsnjfx0s4wbfw5lbvyrpbfvdcagvyb2";
+ url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/4.0.0-2.21322.50/microsoft.codeanalysis.workspaces.common.4.0.0-2.21322.50.nupkg";
+ sha256 = "1c0m5pg156x8zh50x7rp25p8cn09gbv50wpbz2p1nc5ff5dyavf5";
};
}
{
@@ -257,18 +281,18 @@
}
{
name = "microsoft.extensions.caching.abstractions";
- version = "3.1.12";
+ version = "5.0.0";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.caching.abstractions/3.1.12/microsoft.extensions.caching.abstractions.3.1.12.nupkg";
- sha256 = "1p65fs9rjrygviwbqdd214p9y7acpln6zhbd6b741slvp2jwjmyg";
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.caching.abstractions/5.0.0/microsoft.extensions.caching.abstractions.5.0.0.nupkg";
+ sha256 = "0j83zapqhgqb4v5f6kn891km095pfhvsqha357a86ccclmv2czvb";
};
}
{
name = "microsoft.extensions.caching.memory";
- version = "3.1.12";
+ version = "5.0.0";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.caching.memory/3.1.12/microsoft.extensions.caching.memory.3.1.12.nupkg";
- sha256 = "0ydrnqwnph5npf3rwzw1kzq0g3c2kajicdk251fdnjkx6yiw1vsp";
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.caching.memory/5.0.0/microsoft.extensions.caching.memory.5.0.0.nupkg";
+ sha256 = "0l8spndl3kvccjlay202msm31iy5iig0i9ddbsdy92wbcjr97lca";
};
}
{
@@ -281,10 +305,10 @@
}
{
name = "microsoft.extensions.configuration";
- version = "3.1.12";
+ version = "5.0.0";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration/3.1.12/microsoft.extensions.configuration.3.1.12.nupkg";
- sha256 = "02bp53ahr98q3h8fzjl9rrxi48zja966dalrkbsqxqk1c5g1kl48";
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration/5.0.0/microsoft.extensions.configuration.5.0.0.nupkg";
+ sha256 = "01m9vzlq0vg0lhckj2dimwq42niwny8g3lm13c9a401hlyg90z1p";
};
}
{
@@ -297,10 +321,10 @@
}
{
name = "microsoft.extensions.configuration.abstractions";
- version = "3.1.12";
+ version = "5.0.0";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.abstractions/3.1.12/microsoft.extensions.configuration.abstractions.3.1.12.nupkg";
- sha256 = "0g35m4q03aag60pi3i5xi3p9q398w4jlq18n0n5qzq0xrlmny6k9";
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.abstractions/5.0.0/microsoft.extensions.configuration.abstractions.5.0.0.nupkg";
+ sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k";
};
}
{
@@ -313,42 +337,42 @@
}
{
name = "microsoft.extensions.configuration.binder";
- version = "3.1.12";
+ version = "5.0.0";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.binder/3.1.12/microsoft.extensions.configuration.binder.3.1.12.nupkg";
- sha256 = "18xizhcjwknwvj0fwdm91pssrpwndz7gzdlx48hph53z8cqqvkbv";
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.binder/5.0.0/microsoft.extensions.configuration.binder.5.0.0.nupkg";
+ sha256 = "0sld0bh2k5kss32i3nf8mwqkjagmw0d1cdfmxm87ckiicwm413a0";
};
}
{
name = "microsoft.extensions.configuration.commandline";
- version = "3.1.12";
+ version = "5.0.0";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.commandline/3.1.12/microsoft.extensions.configuration.commandline.3.1.12.nupkg";
- sha256 = "1c2qldblfp5m376a2nc82ljxjk0ljzrj48iwcvl6j48sjwcn3jl4";
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.commandline/5.0.0/microsoft.extensions.configuration.commandline.5.0.0.nupkg";
+ sha256 = "084hnz5l0vr15ay23rksqipslqnz3pp30w9hsirpx1iqdm5688mc";
};
}
{
name = "microsoft.extensions.configuration.environmentvariables";
- version = "3.1.12";
+ version = "5.0.0";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.environmentvariables/3.1.12/microsoft.extensions.configuration.environmentvariables.3.1.12.nupkg";
- sha256 = "08wb14rp6pgsqwakvn0491mmarqhwbihq8gnri7bnf6chaaqbxml";
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.environmentvariables/5.0.0/microsoft.extensions.configuration.environmentvariables.5.0.0.nupkg";
+ sha256 = "03gvckj10ljk1mir9g8cf3cajsnihhvmh8z8341gkr9h5653qkv0";
};
}
{
name = "microsoft.extensions.configuration.fileextensions";
- version = "3.1.12";
+ version = "5.0.0";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.fileextensions/3.1.12/microsoft.extensions.configuration.fileextensions.3.1.12.nupkg";
- sha256 = "03qg5mjs2f6ihs5dp6d7gbv5bxd98xdvmpwzxp8qyqifjgpkprkj";
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.fileextensions/5.0.0/microsoft.extensions.configuration.fileextensions.5.0.0.nupkg";
+ sha256 = "1wq229r3xcmm9wh9sqdpvmfv4qpbp2zms9x6xk7g7sbb8h32hnz3";
};
}
{
name = "microsoft.extensions.configuration.json";
- version = "3.1.12";
+ version = "5.0.0";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.json/3.1.12/microsoft.extensions.configuration.json.3.1.12.nupkg";
- sha256 = "0mhq8d6iijhjyk9jv2k3fnqr6gpbxlzarb5m6y48dx5amnf89k42";
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.json/5.0.0/microsoft.extensions.configuration.json.5.0.0.nupkg";
+ sha256 = "0hq5i483bjbvprp1la9l3si82x1ydxbvkpfc7r3s7zgxg957fyp9";
};
}
{
@@ -361,10 +385,10 @@
}
{
name = "microsoft.extensions.dependencyinjection";
- version = "3.1.12";
+ version = "5.0.0";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection/3.1.12/microsoft.extensions.dependencyinjection.3.1.12.nupkg";
- sha256 = "0fkcyxayj1mzdj124mabzvhl1p5irwab02rxnwf8bnvszkwgam8l";
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection/5.0.0/microsoft.extensions.dependencyinjection.5.0.0.nupkg";
+ sha256 = "15sdwcyzz0qlybwbdq854bn3jk6kx7awx28gs864c4shhbqkppj4";
};
}
{
@@ -377,42 +401,42 @@
}
{
name = "microsoft.extensions.dependencyinjection.abstractions";
- version = "3.1.12";
+ version = "5.0.0";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection.abstractions/3.1.12/microsoft.extensions.dependencyinjection.abstractions.3.1.12.nupkg";
- sha256 = "0flixm1physp9gxqzrrplzqkpfz4lljiak7fw87g65av0cksval2";
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection.abstractions/5.0.0/microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg";
+ sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj";
};
}
{
name = "microsoft.extensions.dependencymodel";
- version = "3.1.6";
+ version = "5.0.0";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencymodel/3.1.6/microsoft.extensions.dependencymodel.3.1.6.nupkg";
- sha256 = "13m2na8a5mglbbjjp0dxb8ifkf23grkyk1g8585mr7v6cbj098ac";
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencymodel/5.0.0/microsoft.extensions.dependencymodel.5.0.0.nupkg";
+ sha256 = "1mma1zxi0b40972cwfvkj9y0w9r7vjbi74784jzcb22pric00k5x";
};
}
{
name = "microsoft.extensions.fileproviders.abstractions";
- version = "3.1.12";
+ version = "5.0.0";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.fileproviders.abstractions/3.1.12/microsoft.extensions.fileproviders.abstractions.3.1.12.nupkg";
- sha256 = "11plp1izss3sz03a76gpicwfs0l3jqad0yhz0dam6iirdniharvx";
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.fileproviders.abstractions/5.0.0/microsoft.extensions.fileproviders.abstractions.5.0.0.nupkg";
+ sha256 = "01ahgd0b2z2zycrr2lcsq2cl59fn04bh51hdwdp9dcsdkpvnasj1";
};
}
{
name = "microsoft.extensions.fileproviders.physical";
- version = "3.1.12";
+ version = "5.0.0";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.fileproviders.physical/3.1.12/microsoft.extensions.fileproviders.physical.3.1.12.nupkg";
- sha256 = "1lgqvpbqhq2izgq2cka9ls5l99gymhx1ynh1887rjb890cb9hg42";
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.fileproviders.physical/5.0.0/microsoft.extensions.fileproviders.physical.5.0.0.nupkg";
+ sha256 = "00vii8148a6pk12l9jl0rhjp7apil5q5qcy7v1smnv17lj4p8szd";
};
}
{
name = "microsoft.extensions.filesystemglobbing";
- version = "3.1.12";
+ version = "5.0.0";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.filesystemglobbing/3.1.12/microsoft.extensions.filesystemglobbing.3.1.12.nupkg";
- sha256 = "16binlxq56n6a3vkmxhlrhiyl01fb2zvyzfh00hwa4ixxfl1is8n";
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.filesystemglobbing/5.0.0/microsoft.extensions.filesystemglobbing.5.0.0.nupkg";
+ sha256 = "0lm6n9vbyjh0l17qcc2y9qwn1cns3dyjmkvbxjp0g9sll32kjpmb";
};
}
{
@@ -425,18 +449,10 @@
}
{
name = "microsoft.extensions.logging";
- version = "3.1.12";
+ version = "5.0.0";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging/3.1.12/microsoft.extensions.logging.3.1.12.nupkg";
- sha256 = "12i0kvv4fl2y15dgzqzhqhj7fxy4qapqd78xwi1wsvrlbn9pp9h0";
- };
- }
- {
- name = "microsoft.extensions.logging.abstractions";
- version = "1.1.0";
- src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/1.1.0/microsoft.extensions.logging.abstractions.1.1.0.nupkg";
- sha256 = "0vgp0jqi7rik4p5i86ib1lzhwldc3kyf4w38a1pd3086gfz021ab";
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging/5.0.0/microsoft.extensions.logging.5.0.0.nupkg";
+ sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3";
};
}
{
@@ -449,26 +465,34 @@
}
{
name = "microsoft.extensions.logging.abstractions";
- version = "3.1.12";
+ version = "2.1.1";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/3.1.12/microsoft.extensions.logging.abstractions.3.1.12.nupkg";
- sha256 = "0yv681ddcrsn8cf0fnfi3jgcrmganf05r8lsw82d8rk0ljbjivz5";
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/2.1.1/microsoft.extensions.logging.abstractions.2.1.1.nupkg";
+ sha256 = "1sgpwj0sa0ac7m5fnkb482mnch8fsv8hfbvk53c6lyh47s1xhdjg";
+ };
+ }
+ {
+ name = "microsoft.extensions.logging.abstractions";
+ version = "5.0.0";
+ src = fetchurl {
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/5.0.0/microsoft.extensions.logging.abstractions.5.0.0.nupkg";
+ sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc";
};
}
{
name = "microsoft.extensions.logging.configuration";
- version = "3.1.12";
+ version = "5.0.0";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.configuration/3.1.12/microsoft.extensions.logging.configuration.3.1.12.nupkg";
- sha256 = "0nrijpk4azaw5xk4473yb9sc1aal7phjrbswdg7dr6yrfibpb3fn";
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.configuration/5.0.0/microsoft.extensions.logging.configuration.5.0.0.nupkg";
+ sha256 = "1kmjax24w0ph362jr64rr6f8pyn6ayq39k502q9yrgr7zgrv65pa";
};
}
{
name = "microsoft.extensions.logging.console";
- version = "3.1.12";
+ version = "5.0.0";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.console/3.1.12/microsoft.extensions.logging.console.3.1.12.nupkg";
- sha256 = "0vr65vcw15kycbpxk5z04nwcxlkcq0ljsnb4njcbzdcj4p87bcmr";
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.console/5.0.0/microsoft.extensions.logging.console.5.0.0.nupkg";
+ sha256 = "162akclrhk5r62fza8yr30p5824inwmrpq2s510c3a64v76v9cqz";
};
}
{
@@ -481,10 +505,10 @@
}
{
name = "microsoft.extensions.options";
- version = "3.1.12";
+ version = "5.0.0";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options/3.1.12/microsoft.extensions.options.3.1.12.nupkg";
- sha256 = "0phxp1m5p2sfn7mgdb4dzb2rscda8wwzgr0hqqyh19faf0kg2msm";
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options/5.0.0/microsoft.extensions.options.5.0.0.nupkg";
+ sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay";
};
}
{
@@ -497,10 +521,10 @@
}
{
name = "microsoft.extensions.options.configurationextensions";
- version = "3.1.12";
+ version = "5.0.0";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options.configurationextensions/3.1.12/microsoft.extensions.options.configurationextensions.3.1.12.nupkg";
- sha256 = "1vvxhy31mf3z7al8gh9pvzn4z67ma6zc7wwc6f7bvbg6k235wz2v";
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options.configurationextensions/5.0.0/microsoft.extensions.options.configurationextensions.5.0.0.nupkg";
+ sha256 = "1085yrfgc70am43v8i5rxh14kal3bhdd5q85vgny5qp7y1rw0xyw";
};
}
{
@@ -513,10 +537,10 @@
}
{
name = "microsoft.extensions.primitives";
- version = "3.1.12";
+ version = "5.0.0";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.primitives/3.1.12/microsoft.extensions.primitives.3.1.12.nupkg";
- sha256 = "0ns4dsrfglas2qdn6qdyg004yjsk578fgfq76rs16hjr3iw9dkks";
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.primitives/5.0.0/microsoft.extensions.primitives.5.0.0.nupkg";
+ sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6";
};
}
{
@@ -639,6 +663,14 @@
sha256 = "1bqinq2nxnpqxziypg1sqy3ly0nymxxjpn8fwkn3rl4vl6gdg3rc";
};
}
+ {
+ name = "microsoft.net.stringtools";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.net.stringtools/1.0.0/microsoft.net.stringtools.1.0.0.nupkg";
+ sha256 = "06yakiyzgss399giivfx6xdrnfxqfsvy5fzm90scjanvandv0sdj";
+ };
+ }
{
name = "microsoft.sourcelink.common";
version = "1.0.0";
@@ -657,26 +689,26 @@
}
{
name = "microsoft.testplatform.objectmodel";
- version = "16.6.1";
+ version = "16.9.4";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.objectmodel/16.6.1/microsoft.testplatform.objectmodel.16.6.1.nupkg";
- sha256 = "0q98q1nw6jl4bajm66z4a9vvh928w8ffsd3k6fpsps23ykpsky7h";
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.objectmodel/16.9.4/microsoft.testplatform.objectmodel.16.9.4.nupkg";
+ sha256 = "1jizkbrnm4pv60zch29ki7gj8m7j5whk141x9cwx4kwsd6cfzwi6";
};
}
{
name = "microsoft.testplatform.translationlayer";
- version = "16.6.1";
+ version = "16.9.4";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.translationlayer/16.6.1/microsoft.testplatform.translationlayer.16.6.1.nupkg";
- sha256 = "1j5pg3qdgqxila90x5h1hvq8wk53s4zf225x5zddmx6q26r9zq83";
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.translationlayer/16.9.4/microsoft.testplatform.translationlayer.16.9.4.nupkg";
+ sha256 = "0y5w2zflvq06jim2i6d49qi45ix0b8vlyf024w29n5g1lb570qf0";
};
}
{
name = "microsoft.visualstudio.debugger.contracts";
- version = "16.9.0-beta.20604.1";
+ version = "17.2.0-beta.21262.1";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.debugger.contracts/16.9.0-beta.20604.1/microsoft.visualstudio.debugger.contracts.16.9.0-beta.20604.1.nupkg";
- sha256 = "0sy1ahy1xv39mkk5inhb63lmfnmkcc6vjljhljx0l2lkrrc33k0h";
+ url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/78665e4c-b767-412b-9804-2b1ef7a48b8a/nuget/v3/flat2/microsoft.visualstudio.debugger.contracts/17.2.0-beta.21262.1/microsoft.visualstudio.debugger.contracts.17.2.0-beta.21262.1.nupkg";
+ sha256 = "10fi1jdxnxvww1qzfhqi53fn0a411gvpvcsb0pvwvj7qk0lzs7c9";
};
}
{
@@ -1191,22 +1223,6 @@
sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r";
};
}
- {
- name = "system.componentmodel.annotations";
- version = "4.4.1";
- src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/system.componentmodel.annotations/4.4.1/system.componentmodel.annotations.4.4.1.nupkg";
- sha256 = "1d46yx6h36bssqyshq44qxx0fsx43bjf09zrlbvqfigacfsp9mph";
- };
- }
- {
- name = "system.componentmodel.annotations";
- version = "4.7.0";
- src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/system.componentmodel.annotations/4.7.0/system.componentmodel.annotations.4.7.0.nupkg";
- sha256 = "06x1m46ddxj0ng28d7gry9gjkqdg2kp89jyf480g5gznyybbs49z";
- };
- }
{
name = "system.componentmodel.composition";
version = "4.5.0";
@@ -1263,6 +1279,14 @@
sha256 = "1m4j19zx50lbbdx1xxbgpsd1dai2r3kzkyapw47kdvkb89qjkl63";
};
}
+ {
+ name = "system.configuration.configurationmanager";
+ version = "4.7.0";
+ src = fetchurl {
+ url = "https://api.nuget.org/v3-flatcontainer/system.configuration.configurationmanager/4.7.0/system.configuration.configurationmanager.4.7.0.nupkg";
+ sha256 = "0pav0n21ghf2ax6fiwjbng29f27wkb4a2ddma0cqx04s97yyk25d";
+ };
+ }
{
name = "system.console";
version = "4.3.0";
@@ -1287,6 +1311,14 @@
sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq";
};
}
+ {
+ name = "system.diagnostics.diagnosticsource";
+ version = "5.0.0";
+ src = fetchurl {
+ url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.diagnosticsource/5.0.0/system.diagnostics.diagnosticsource.5.0.0.nupkg";
+ sha256 = "0phd2qizshjvglhzws1jd0cq4m54gscz4ychzr3x6wbgl4vvfrga";
+ };
+ }
{
name = "system.diagnostics.process";
version = "4.3.0";
@@ -1409,10 +1441,10 @@
}
{
name = "system.io.pipelines";
- version = "5.0.0";
+ version = "5.0.1";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/system.io.pipelines/5.0.0/system.io.pipelines.5.0.0.nupkg";
- sha256 = "1kdvbzr98sdddm18r3gbsbcxpv58gm1yy3iig8zg9dvp7mli7453";
+ url = "https://api.nuget.org/v3-flatcontainer/system.io.pipelines/5.0.1/system.io.pipelines.5.0.1.nupkg";
+ sha256 = "1zvfcd2l1d5qxifsqd0cjyv57nr61a9ac2ca5jinyqmj32wgjd6v";
};
}
{
@@ -1431,14 +1463,6 @@
sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv";
};
}
- {
- name = "system.memory";
- version = "4.5.2";
- src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/system.memory/4.5.2/system.memory.4.5.2.nupkg";
- sha256 = "1g24dwqfcmf4gpbgbhaw1j49xmpsz389l6bw2xxbsmnzvsf860ld";
- };
- }
{
name = "system.memory";
version = "4.5.3";
@@ -1631,14 +1655,6 @@
sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276";
};
}
- {
- name = "system.reflection.typeextensions";
- version = "4.1.0";
- src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/system.reflection.typeextensions/4.1.0/system.reflection.typeextensions.4.1.0.nupkg";
- sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7";
- };
- }
{
name = "system.reflection.typeextensions";
version = "4.3.0";
@@ -1847,6 +1863,14 @@
sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml";
};
}
+ {
+ name = "system.security.cryptography.algorithms";
+ version = "4.3.1";
+ src = fetchurl {
+ url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.algorithms/4.3.1/system.security.cryptography.algorithms.4.3.1.nupkg";
+ sha256 = "1m2wnzg3m3c0s11jg4lshcl2a47d78zri8khc21yrz34jjkbyls2";
+ };
+ }
{
name = "system.security.cryptography.cng";
version = "4.3.0";
@@ -1911,6 +1935,14 @@
sha256 = "1kg264xmqabyz8gfg8ymp6qp6aw43vawfp0znf0909d7b5jd3dq9";
};
}
+ {
+ name = "system.security.cryptography.protecteddata";
+ version = "4.7.0";
+ src = fetchurl {
+ url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.protecteddata/4.7.0/system.security.cryptography.protecteddata.4.7.0.nupkg";
+ sha256 = "1s1sh8k10s0apa09c5m2lkavi3ys90y657whg2smb3y8mpkfr5vm";
+ };
+ }
{
name = "system.security.cryptography.x509certificates";
version = "4.3.0";
@@ -2017,10 +2049,10 @@
}
{
name = "system.text.encodings.web";
- version = "4.7.1";
+ version = "5.0.0";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/system.text.encodings.web/4.7.1/system.text.encodings.web.4.7.1.nupkg";
- sha256 = "1wj7r07mjwbf9a79kapy2l9m8mcq8b3nbhg0zaprlsav09k85fmb";
+ url = "https://api.nuget.org/v3-flatcontainer/system.text.encodings.web/5.0.0/system.text.encodings.web.5.0.0.nupkg";
+ sha256 = "144pgy65jc3bkar7d4fg1c0rq6qmkx68gj9k1ldk97558w22v1r1";
};
}
{
@@ -2033,10 +2065,10 @@
}
{
name = "system.text.json";
- version = "4.7.2";
+ version = "5.0.0";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/system.text.json/4.7.2/system.text.json.4.7.2.nupkg";
- sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4";
+ url = "https://api.nuget.org/v3-flatcontainer/system.text.json/5.0.0/system.text.json.5.0.0.nupkg";
+ sha256 = "1gpgl18z6qrgmqrikgh99xkjwzb1didrjp77bch7nrlra21gr4ks";
};
}
{
diff --git a/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix b/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix
index 6737f16175..17dc0900fd 100644
--- a/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "open-policy-agent";
- version = "0.30.0";
+ version = "0.30.2";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "opa";
rev = "v${version}";
- sha256 = "sha256-AjNr+t30ftF92+cEfvt8iHBDVD/SO52ojJRLAkYF9l4=";
+ sha256 = "sha256-pyqG8k2jHUhYZ1ftfAjxpJ4H1P1uWfqSdGcyR7pw1rE=";
};
vendorSha256 = null;
diff --git a/third_party/nixpkgs/pkgs/development/tools/rq/default.nix b/third_party/nixpkgs/pkgs/development/tools/rq/default.nix
index 7d222e03bc..68669e8851 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rq/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rq/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, rustPlatform, libiconv, llvmPackages, v8 }:
+{ stdenv, lib, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "rq";
@@ -13,9 +13,6 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "0071q08f75qrxdkbx1b9phqpbj15r79jbh391y32acifi7hr35hj";
- buildInputs = [ llvmPackages.libclang v8 ]
- ++ lib.optionals stdenv.isDarwin [ libiconv ];
-
postPatch = ''
# Remove #[deny(warnings)] which is equivalent to -Werror in C.
# Prevents build failures when upgrading rustc, which may give more warnings.
@@ -23,11 +20,6 @@ rustPlatform.buildRustPackage rec {
--replace "#![deny(warnings)]" ""
'';
- configurePhase = ''
- export LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib"
- export V8_SOURCE="${v8}"
- '';
-
meta = with lib; {
description = "A tool for doing record analysis and transformation";
homepage = "https://github.com/dflemstr/rq";
diff --git a/third_party/nixpkgs/pkgs/development/tools/unityhub/default.nix b/third_party/nixpkgs/pkgs/development/tools/unityhub/default.nix
index 19cd15e7be..27453ed598 100644
--- a/third_party/nixpkgs/pkgs/development/tools/unityhub/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/unityhub/default.nix
@@ -5,7 +5,7 @@ let
in appimageTools.wrapType2 rec {
name = "unityhub";
- extraPkgs = (pkgs: with pkgs; with xorg; [ gtk2 gdk_pixbuf glib libGL libGLU nss nspr
+ extraPkgs = (pkgs: with pkgs; with xorg; [ gtk2 gdk-pixbuf glib libGL libGLU nss nspr
alsa-lib cups gnome2.GConf libcap fontconfig freetype pango
cairo dbus dbus-glib libdbusmenu libdbusmenu-gtk2 expat zlib libpng12 udev tbb
libpqxx gtk3 libsecret lsb-release openssl nodejs ncurses5
diff --git a/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/README.md b/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/README.md
new file mode 100644
index 0000000000..d5a6460ed9
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/README.md
@@ -0,0 +1,24 @@
+
+# `cypress-example-kitchensink`
+
+This directory 'packages' [cypress-example-kitchensink](https://github.com/cypress-io/cypress-example-kitchensink),
+which is used in `cypress.passthru.tests`.
+
+The app is not really intended for deployment, so I didn't bother with actual packaging, just testing.
+If your real-world app looks like `cypress-example-kitchensink`, you'll want to use Nix multiple outputs so you don't deploy your test videos along with your app.
+Alternatively, you can set it up so that one derivation builds your server exe and another derivation takes that server exe and runs it with the cypress e2e tests.
+
+## Peculiarities
+
+**cypress and Cypress** are distinct names.
+ - `cypress` is the npm module, containing the executable `cypress`
+ - whereas the executable `Cypress` comes from `pkgs.cypress`, a binary distribution (as of writing) by cypress.io.
+
+**updateScript** is not provided for this example project. This seems preferable,
+ because updates to it aren't particularly valuable and have a significant overhead.
+ The goal is to smoke test `cypress`; not run the latest test suite (which it isn't anyway).
+
+## Updating
+
+ - update the hash in `src.nix`
+ - run `regen-nix`
diff --git a/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/cypress-example-kitchensink.nix b/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/cypress-example-kitchensink.nix
new file mode 100644
index 0000000000..653dbe4a25
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/cypress-example-kitchensink.nix
@@ -0,0 +1,17 @@
+# This file has been generated by node2nix 1.9.0. Do not edit!
+
+{pkgs ? import {
+ inherit system;
+ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
+
+let
+ nodeEnv = import ./node-env.nix {
+ inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
+ inherit pkgs nodejs;
+ libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+ };
+in
+import ./node-packages.nix {
+ inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit callPackage;
+ inherit nodeEnv;
+}
diff --git a/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/default.nix b/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/default.nix
new file mode 100644
index 0000000000..86fec89500
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/default.nix
@@ -0,0 +1,59 @@
+{ callPackage
+, cypress
+, nodejs-12_x
+, # FIXME: duplicated from ./regen-nix. node2nix should expose this
+ nodePackages
+, xorg
+, pkgs
+, stdenv
+,
+}:
+
+let
+ fromNode2nix = import ./cypress-example-kitchensink.nix {
+ inherit pkgs;
+ };
+
+ nodeDependencies = fromNode2nix.shell.nodeDependencies.overrideAttrs (o: {
+ CYPRESS_INSTALL_BINARY = "0";
+ PUPPETEER_SKIP_DOWNLOAD = "1";
+ });
+
+ fontConfigEtc = (
+ pkgs.nixos { config.fonts.fontconfig.enable = true; }
+ ).config.environment.etc.fonts.source;
+
+in
+stdenv.mkDerivation {
+ name = "cypress-example-kitchensink";
+ src = callPackage ./src.nix { };
+ passthru.fc = fontConfigEtc;
+ nativeBuildInputs = [
+ cypress
+ nodejs-12_x
+ xorg.xorgserver
+ nodePackages.jsonplaceholder
+ ];
+ FONTCONFIG_PATH = fontConfigEtc;
+ postPatch = ''
+ # Use our own offline backend. 15011 means js0n ;)
+ sed -e 's^https://jsonplaceholder.cypress.io^http://localhost:15011^g' -i $(find . -type f)
+ '';
+ buildPhase = ''
+ ln -s ${nodeDependencies}/lib/node_modules ./node_modules
+ PATH="${nodeDependencies}/bin:$PATH"
+ runHook preBuild
+ PORT=15011 jsonplaceholder &
+ # assumption: jsonplaceholder start far quicker than cypress run
+
+ export CYPRESS_RUN_BINARY=${cypress}/bin/Cypress
+ export HOME=$PWD/home
+ mkdir $HOME
+ npm run test
+ runHook postBuild
+ '';
+ installPhase = ''
+ mkdir $out
+ cp -r cypress/videos $out/
+ '';
+}
diff --git a/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/node-env.nix b/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/node-env.nix
new file mode 100644
index 0000000000..c2b723195b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/node-env.nix
@@ -0,0 +1,567 @@
+# This file originates from node2nix
+
+{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}:
+
+let
+ # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master
+ utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux;
+
+ python = if nodejs ? python then nodejs.python else python2;
+
+ # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
+ tarWrapper = runCommand "tarWrapper" {} ''
+ mkdir -p $out/bin
+
+ cat > $out/bin/tar <> $out/nix-support/hydra-build-products
+ '';
+ };
+
+ includeDependencies = {dependencies}:
+ lib.optionalString (dependencies != [])
+ (lib.concatMapStrings (dependency:
+ ''
+ # Bundle the dependencies of the package
+ mkdir -p node_modules
+ cd node_modules
+
+ # Only include dependencies if they don't exist. They may also be bundled in the package.
+ if [ ! -e "${dependency.name}" ]
+ then
+ ${composePackage dependency}
+ fi
+
+ cd ..
+ ''
+ ) dependencies);
+
+ # Recursively composes the dependencies of a package
+ composePackage = { name, packageName, src, dependencies ? [], ... }@args:
+ builtins.addErrorContext "while evaluating node package '${packageName}'" ''
+ DIR=$(pwd)
+ cd $TMPDIR
+
+ unpackFile ${src}
+
+ # Make the base dir in which the target dependency resides first
+ mkdir -p "$(dirname "$DIR/${packageName}")"
+
+ if [ -f "${src}" ]
+ then
+ # Figure out what directory has been unpacked
+ packageDir="$(find . -maxdepth 1 -type d | tail -1)"
+
+ # Restore write permissions to make building work
+ find "$packageDir" -type d -exec chmod u+x {} \;
+ chmod -R u+w "$packageDir"
+
+ # Move the extracted tarball into the output folder
+ mv "$packageDir" "$DIR/${packageName}"
+ elif [ -d "${src}" ]
+ then
+ # Get a stripped name (without hash) of the source directory.
+ # On old nixpkgs it's already set internally.
+ if [ -z "$strippedName" ]
+ then
+ strippedName="$(stripHash ${src})"
+ fi
+
+ # Restore write permissions to make building work
+ chmod -R u+w "$strippedName"
+
+ # Move the extracted directory into the output folder
+ mv "$strippedName" "$DIR/${packageName}"
+ fi
+
+ # Unset the stripped name to not confuse the next unpack step
+ unset strippedName
+
+ # Include the dependencies of the package
+ cd "$DIR/${packageName}"
+ ${includeDependencies { inherit dependencies; }}
+ cd ..
+ ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+ '';
+
+ pinpointDependencies = {dependencies, production}:
+ let
+ pinpointDependenciesFromPackageJSON = writeTextFile {
+ name = "pinpointDependencies.js";
+ text = ''
+ var fs = require('fs');
+ var path = require('path');
+
+ function resolveDependencyVersion(location, name) {
+ if(location == process.env['NIX_STORE']) {
+ return null;
+ } else {
+ var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json");
+
+ if(fs.existsSync(dependencyPackageJSON)) {
+ var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON));
+
+ if(dependencyPackageObj.name == name) {
+ return dependencyPackageObj.version;
+ }
+ } else {
+ return resolveDependencyVersion(path.resolve(location, ".."), name);
+ }
+ }
+ }
+
+ function replaceDependencies(dependencies) {
+ if(typeof dependencies == "object" && dependencies !== null) {
+ for(var dependency in dependencies) {
+ var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency);
+
+ if(resolvedVersion === null) {
+ process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n");
+ } else {
+ dependencies[dependency] = resolvedVersion;
+ }
+ }
+ }
+ }
+
+ /* Read the package.json configuration */
+ var packageObj = JSON.parse(fs.readFileSync('./package.json'));
+
+ /* Pinpoint all dependencies */
+ replaceDependencies(packageObj.dependencies);
+ if(process.argv[2] == "development") {
+ replaceDependencies(packageObj.devDependencies);
+ }
+ replaceDependencies(packageObj.optionalDependencies);
+
+ /* Write the fixed package.json file */
+ fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2));
+ '';
+ };
+ in
+ ''
+ node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
+
+ ${lib.optionalString (dependencies != [])
+ ''
+ if [ -d node_modules ]
+ then
+ cd node_modules
+ ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
+ cd ..
+ fi
+ ''}
+ '';
+
+ # Recursively traverses all dependencies of a package and pinpoints all
+ # dependencies in the package.json file to the versions that are actually
+ # being used.
+
+ pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args:
+ ''
+ if [ -d "${packageName}" ]
+ then
+ cd "${packageName}"
+ ${pinpointDependencies { inherit dependencies production; }}
+ cd ..
+ ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+ fi
+ '';
+
+ # Extract the Node.js source code which is used to compile packages with
+ # native bindings
+ nodeSources = runCommand "node-sources" {} ''
+ tar --no-same-owner --no-same-permissions -xf ${nodejs.src}
+ mv node-* $out
+ '';
+
+ # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty)
+ addIntegrityFieldsScript = writeTextFile {
+ name = "addintegrityfields.js";
+ text = ''
+ var fs = require('fs');
+ var path = require('path');
+
+ function augmentDependencies(baseDir, dependencies) {
+ for(var dependencyName in dependencies) {
+ var dependency = dependencies[dependencyName];
+
+ // Open package.json and augment metadata fields
+ var packageJSONDir = path.join(baseDir, "node_modules", dependencyName);
+ var packageJSONPath = path.join(packageJSONDir, "package.json");
+
+ if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored
+ console.log("Adding metadata fields to: "+packageJSONPath);
+ var packageObj = JSON.parse(fs.readFileSync(packageJSONPath));
+
+ if(dependency.integrity) {
+ packageObj["_integrity"] = dependency.integrity;
+ } else {
+ packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads.
+ }
+
+ if(dependency.resolved) {
+ packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided
+ } else {
+ packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories.
+ }
+
+ if(dependency.from !== undefined) { // Adopt from property if one has been provided
+ packageObj["_from"] = dependency.from;
+ }
+
+ fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2));
+ }
+
+ // Augment transitive dependencies
+ if(dependency.dependencies !== undefined) {
+ augmentDependencies(packageJSONDir, dependency.dependencies);
+ }
+ }
+ }
+
+ if(fs.existsSync("./package-lock.json")) {
+ var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
+
+ if(![1, 2].includes(packageLock.lockfileVersion)) {
+ process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
+ process.exit(1);
+ }
+
+ if(packageLock.dependencies !== undefined) {
+ augmentDependencies(".", packageLock.dependencies);
+ }
+ }
+ '';
+ };
+
+ # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes
+ reconstructPackageLock = writeTextFile {
+ name = "addintegrityfields.js";
+ text = ''
+ var fs = require('fs');
+ var path = require('path');
+
+ var packageObj = JSON.parse(fs.readFileSync("package.json"));
+
+ var lockObj = {
+ name: packageObj.name,
+ version: packageObj.version,
+ lockfileVersion: 1,
+ requires: true,
+ dependencies: {}
+ };
+
+ function augmentPackageJSON(filePath, dependencies) {
+ var packageJSON = path.join(filePath, "package.json");
+ if(fs.existsSync(packageJSON)) {
+ var packageObj = JSON.parse(fs.readFileSync(packageJSON));
+ dependencies[packageObj.name] = {
+ version: packageObj.version,
+ integrity: "sha1-000000000000000000000000000=",
+ dependencies: {}
+ };
+ processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies);
+ }
+ }
+
+ function processDependencies(dir, dependencies) {
+ if(fs.existsSync(dir)) {
+ var files = fs.readdirSync(dir);
+
+ files.forEach(function(entry) {
+ var filePath = path.join(dir, entry);
+ var stats = fs.statSync(filePath);
+
+ if(stats.isDirectory()) {
+ if(entry.substr(0, 1) == "@") {
+ // When we encounter a namespace folder, augment all packages belonging to the scope
+ var pkgFiles = fs.readdirSync(filePath);
+
+ pkgFiles.forEach(function(entry) {
+ if(stats.isDirectory()) {
+ var pkgFilePath = path.join(filePath, entry);
+ augmentPackageJSON(pkgFilePath, dependencies);
+ }
+ });
+ } else {
+ augmentPackageJSON(filePath, dependencies);
+ }
+ }
+ });
+ }
+ }
+
+ processDependencies("node_modules", lockObj.dependencies);
+
+ fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2));
+ '';
+ };
+
+ prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}:
+ let
+ forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
+ in
+ ''
+ # Pinpoint the versions of all dependencies to the ones that are actually being used
+ echo "pinpointing versions of dependencies..."
+ source $pinpointDependenciesScriptPath
+
+ # Patch the shebangs of the bundled modules to prevent them from
+ # calling executables outside the Nix store as much as possible
+ patchShebangs .
+
+ # Deploy the Node.js package by running npm install. Since the
+ # dependencies have been provided already by ourselves, it should not
+ # attempt to install them again, which is good, because we want to make
+ # it Nix's responsibility. If it needs to install any dependencies
+ # anyway (e.g. because the dependency parameters are
+ # incomplete/incorrect), it fails.
+ #
+ # The other responsibilities of NPM are kept -- version checks, build
+ # steps, postprocessing etc.
+
+ export HOME=$TMPDIR
+ cd "${packageName}"
+ runHook preRebuild
+
+ ${lib.optionalString bypassCache ''
+ ${lib.optionalString reconstructLock ''
+ if [ -f package-lock.json ]
+ then
+ echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!"
+ echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!"
+ rm package-lock.json
+ else
+ echo "No package-lock.json file found, reconstructing..."
+ fi
+
+ node ${reconstructPackageLock}
+ ''}
+
+ node ${addIntegrityFieldsScript}
+ ''}
+
+ npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild
+
+ if [ "''${dontNpmInstall-}" != "1" ]
+ then
+ # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
+ rm -f npm-shrinkwrap.json
+
+ npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install
+ fi
+ '';
+
+ # Builds and composes an NPM package including all its dependencies
+ buildNodePackage =
+ { name
+ , packageName
+ , version
+ , dependencies ? []
+ , buildInputs ? []
+ , production ? true
+ , npmFlags ? ""
+ , dontNpmInstall ? false
+ , bypassCache ? false
+ , reconstructLock ? false
+ , preRebuild ? ""
+ , dontStrip ? true
+ , unpackPhase ? "true"
+ , buildPhase ? "true"
+ , ... }@args:
+
+ let
+ extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ];
+ in
+ stdenv.mkDerivation ({
+ name = "node_${name}-${version}";
+ buildInputs = [ tarWrapper python nodejs ]
+ ++ lib.optional (stdenv.isLinux) utillinux
+ ++ lib.optional (stdenv.isDarwin) libtool
+ ++ buildInputs;
+
+ inherit nodejs;
+
+ 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 = ''
+ # Create and enter a root node_modules/ folder
+ mkdir -p $out/lib/node_modules
+ cd $out/lib/node_modules
+
+ # Compose the package and all its dependencies
+ source $compositionScriptPath
+
+ ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
+
+ # Create symlink to the deployed executable folder, if applicable
+ if [ -d "$out/lib/node_modules/.bin" ]
+ then
+ ln -s $out/lib/node_modules/.bin $out/bin
+ fi
+
+ # Create symlinks to the deployed manual page folders, if applicable
+ if [ -d "$out/lib/node_modules/${packageName}/man" ]
+ then
+ mkdir -p $out/share
+ for dir in "$out/lib/node_modules/${packageName}/man/"*
+ do
+ mkdir -p $out/share/man/$(basename "$dir")
+ for page in "$dir"/*
+ do
+ ln -s $page $out/share/man/$(basename "$dir")
+ done
+ done
+ fi
+
+ # Run post install hook, if provided
+ runHook postInstall
+ '';
+ } // extraArgs);
+
+ # Builds a node environment (a node_modules folder and a set of binaries)
+ buildNodeDependencies =
+ { name
+ , packageName
+ , version
+ , src
+ , dependencies ? []
+ , buildInputs ? []
+ , production ? true
+ , npmFlags ? ""
+ , dontNpmInstall ? false
+ , bypassCache ? false
+ , reconstructLock ? false
+ , dontStrip ? true
+ , unpackPhase ? "true"
+ , buildPhase ? "true"
+ , ... }@args:
+
+ let
+ extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
+ in
+ stdenv.mkDerivation ({
+ name = "node-dependencies-${name}-${version}";
+
+ buildInputs = [ tarWrapper python nodejs ]
+ ++ lib.optional (stdenv.isLinux) utillinux
+ ++ lib.optional (stdenv.isDarwin) libtool
+ ++ 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" ];
+
+ installPhase = ''
+ mkdir -p $out/${packageName}
+ cd $out/${packageName}
+
+ source $includeScriptPath
+
+ # Create fake package.json to make the npm commands work properly
+ cp ${src}/package.json .
+ chmod 644 package.json
+ ${lib.optionalString bypassCache ''
+ if [ -f ${src}/package-lock.json ]
+ then
+ cp ${src}/package-lock.json .
+ fi
+ ''}
+
+ # Go to the parent folder to make sure that all packages are pinpointed
+ cd ..
+ ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+
+ ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
+
+ # Expose the executables that were installed
+ cd ..
+ ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+
+ mv ${packageName} lib
+ ln -s $out/lib/node_modules/.bin $out/bin
+ '';
+ } // extraArgs);
+
+ # Builds a development shell
+ buildNodeShell =
+ { name
+ , packageName
+ , version
+ , src
+ , dependencies ? []
+ , buildInputs ? []
+ , production ? true
+ , npmFlags ? ""
+ , dontNpmInstall ? false
+ , bypassCache ? false
+ , reconstructLock ? false
+ , dontStrip ? true
+ , unpackPhase ? "true"
+ , buildPhase ? "true"
+ , ... }@args:
+
+ let
+ nodeDependencies = buildNodeDependencies args;
+ in
+ stdenv.mkDerivation {
+ name = "node-shell-${name}-${version}";
+
+ buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
+ buildCommand = ''
+ mkdir -p $out/bin
+ cat > $out/bin/shell < Local/Makefile
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix
index 0a60ebc77c..578bb10652 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix
@@ -27,6 +27,6 @@ buildGoModule rec {
description = "The plugin-driven server agent for collecting & reporting metrics";
license = licenses.mit;
homepage = "https://www.influxdata.com/time-series-platform/telegraf/";
- maintainers = with maintainers; [ mic92 roblabla timstott foxit64 ];
+ maintainers = with maintainers; [ mic92 roblabla timstott ];
};
}
diff --git a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix
index ff2c8f9af3..e09def926e 100644
--- a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "tailscale";
- version = "1.10.1";
+ version = "1.10.2";
src = fetchFromGitHub {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
- sha256 = "1s4qpz4jwar3lcqyzkgyvgm4bghzass974lq1pw4fziqlsblh0vm";
+ sha256 = "sha256-bAWQTdpqDF7ERQzNY1k0NtxdA9M9bIyfHtvX0nKfIQY=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/default.nix
index 5a3301040d..72ea8a943d 100644
--- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/default.nix
@@ -9,13 +9,13 @@
}:
let
- version = "2.7.4";
+ version = "2.7.5";
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse";
rev = "v${version}";
- sha256 = "sha256-3cvrdWBXRM5F8qFEqbe8ru1U0wBqCkRxK7GAV0beJNk=";
+ sha256 = "sha256-OykWaiBAHcZy41i+aRzBHCRgwnfQUBijHjb+ofIk25M=";
};
runtimeDeps = [
@@ -64,7 +64,6 @@ let
});
in
stdenv.mkDerivation (builtins.removeAttrs args [ "bundlerEnvArgs" ] // {
- inherit name pname version src meta;
pluginName = if name != null then name else "${pname}-${version}";
phases = [ "unpackPhase" "installPhase" ];
installPhase = ''
@@ -151,6 +150,7 @@ let
brotli
procps
nodePackages.uglify-js
+ nodePackages.terser
];
patches = [
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix
index e6640cbbe9..f64fbb137d 100644
--- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix
+++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix
@@ -3,10 +3,10 @@ let
callPackage = newScope args;
in
{
- discourse-spoiler-alert = callPackage ./discourse-spoiler-alert {};
- discourse-solved = callPackage ./discourse-solved {};
discourse-canned-replies = callPackage ./discourse-canned-replies {};
- discourse-math = callPackage ./discourse-math {};
discourse-github = callPackage ./discourse-github {};
+ discourse-math = callPackage ./discourse-math {};
+ discourse-solved = callPackage ./discourse-solved {};
+ discourse-spoiler-alert = callPackage ./discourse-spoiler-alert {};
discourse-yearly-review = callPackage ./discourse-yearly-review {};
}
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix
index 05c153cd70..558abec36f 100644
--- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix
@@ -1,11 +1,17 @@
-{ mkDiscoursePlugin, fetchFromGitHub }:
+{ lib, mkDiscoursePlugin, fetchFromGitHub }:
mkDiscoursePlugin {
name = "discourse-canned-replies";
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-canned-replies";
- rev = "7ee748f18a276aca42185e2079c1d4cadeecdaf8";
- sha256 = "0j10kxfr6v2rdd58smg2i7iac46z74qnnjk8b91jd1svazhis1ph";
+ rev = "e3f1de8928df5955b64994079b7e2073556e5456";
+ sha256 = "1g4fazm6cn6hbfd08mq2zhc6dgm4qj1r1f1amhbgxhk6qsxf42cd";
+ };
+ meta = with lib; {
+ homepage = "https://github.com/discourse/discourse-canned-replies";
+ maintainers = with maintainers; [ talyz ];
+ license = licenses.gpl2Only;
+ description = "Adds support for inserting a canned reply into the composer window via a UI";
};
}
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile
index f0205f4ff1..7c0e7f435a 100644
--- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile
+++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile
@@ -1,3 +1,9 @@
-source 'https://rubygems.org'
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
+
+# gem "rails"
gem 'sawyer', '0.8.2'
gem 'octokit', '4.21.0'
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock
index f28833a35c..0486ea1402 100644
--- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock
+++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock
@@ -1,21 +1,25 @@
GEM
remote: https://rubygems.org/
specs:
- addressable (2.7.0)
+ addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
- faraday (1.4.2)
+ faraday (1.5.0)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
+ faraday-httpclient (~> 1.0.1)
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.1)
+ faraday-patron (~> 1.0)
multipart-post (>= 1.2, < 3)
ruby2_keywords (>= 0.0.4)
faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
+ faraday-httpclient (1.0.1)
faraday-net_http (1.0.1)
faraday-net_http_persistent (1.1.0)
+ faraday-patron (1.0.0)
multipart-post (2.1.1)
octokit (4.21.0)
faraday (>= 0.9)
@@ -27,11 +31,11 @@ GEM
faraday (> 0.8, < 2.0)
PLATFORMS
- ruby
+ x86_64-linux
DEPENDENCIES
octokit (= 4.21.0)
sawyer (= 0.8.2)
BUNDLED WITH
- 2.1.4
+ 2.2.20
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix
index e5d8cff0a9..bb6d16bfe4 100644
--- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix
@@ -1,4 +1,4 @@
-{ mkDiscoursePlugin, fetchFromGitHub }:
+{ lib, mkDiscoursePlugin, fetchFromGitHub }:
mkDiscoursePlugin {
name = "discourse-github";
@@ -6,7 +6,14 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-github";
- rev = "151e353a5a1971157c70c2e2b0f56387f212a81f";
- sha256 = "00kra6zd2k1f2vwcdvxnxnammzh72f5qxcqbb94m0z6maj598wdy";
+ rev = "154fd5ea597640c2259ce489b4ce75b48ac1973c";
+ sha256 = "0wb5p219z42rc035rnh2iwrbsj000nxa9shbmc325rzcg6xlhdhw";
};
+ meta = with lib; {
+ homepage = "https://github.com/discourse/discourse-github";
+ maintainers = with maintainers; [ talyz ];
+ license = licenses.mit;
+ description = "Adds GitHub badges and linkback functionality";
+ };
+
}
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix
index bad1f96295..ae20ec8952 100644
--- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix
+++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix
@@ -5,21 +5,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";
+ sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp";
type = "gem";
};
- version = "2.7.0";
+ version = "2.8.0";
};
faraday = {
- dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-net_http" "faraday-net_http_persistent" "multipart-post" "ruby2_keywords"];
+ dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "multipart-post" "ruby2_keywords"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07mhk70gv453pg38md346470hknyhipdqppnplq706ll3k3lzb7v";
+ sha256 = "0gwbii45plm9bljk22bwzhzxrc5xid8qx24f54vrm74q3zaz00ah";
type = "gem";
};
- version = "1.4.2";
+ version = "1.5.0";
};
faraday-em_http = {
groups = ["default"];
@@ -51,6 +51,16 @@
};
version = "1.1.0";
};
+ faraday-httpclient = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc";
+ type = "gem";
+ };
+ version = "1.0.1";
+ };
faraday-net_http = {
groups = ["default"];
platforms = [];
@@ -71,6 +81,16 @@
};
version = "1.1.0";
};
+ faraday-patron = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w";
+ type = "gem";
+ };
+ version = "1.0.0";
+ };
multipart-post = {
groups = ["default"];
platforms = [];
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix
index 8cf2a4abc0..0e751c1dc5 100644
--- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix
@@ -1,11 +1,17 @@
-{ mkDiscoursePlugin, fetchFromGitHub }:
+{ lib, mkDiscoursePlugin, fetchFromGitHub }:
mkDiscoursePlugin {
name = "discourse-math";
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-math";
- rev = "143ddea4558ea9a1b3fd71635bc11e055763c8e7";
- sha256 = "18pq5ybl3g34i39cpixc3nszvq8gx5yji58zlbbl6428mm011cbx";
+ rev = "aed0c83cee568d5239143bcf1df59c5fbe86b276";
+ sha256 = "1k6kpnhf8s2l0w9zr5pn3wvn8w0n3gwkv7qkv0mkhkzy246ag20z";
+ };
+ meta = with lib; {
+ homepage = "https://github.com/discourse/discourse-math";
+ maintainers = with maintainers; [ talyz ];
+ license = licenses.mit;
+ description = "Official MathJax support for Discourse";
};
}
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix
index c382a83d08..2d451418bd 100644
--- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix
@@ -1,11 +1,17 @@
-{ mkDiscoursePlugin, fetchFromGitHub }:
+{ lib, mkDiscoursePlugin, fetchFromGitHub }:
mkDiscoursePlugin {
name = "discourse-solved";
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-solved";
- rev = "179611766d53974308e6f7def21836997c3c55fc";
- sha256 = "sha256:1s77h42d3bv2lqw33akxh8ss482vxnz4d7qz6xicwqfwv34qjf03";
+ rev = "b96374bf4ab7e6d5cecb0761918b060a524eb9bf";
+ sha256 = "0zrv70p0wz93akpcj6gpwjkw7az3iz9bx4n2z630kyrlmxdbj32a";
+ };
+ meta = with lib; {
+ homepage = "https://github.com/discourse/discourse-solved";
+ maintainers = with maintainers; [ talyz ];
+ license = licenses.mit;
+ description = "Allow accepted answers on topics";
};
}
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix
index 8eba43e47e..da47dbf182 100644
--- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix
@@ -1,11 +1,17 @@
-{ mkDiscoursePlugin, fetchFromGitHub }:
+{ lib, mkDiscoursePlugin, fetchFromGitHub }:
mkDiscoursePlugin {
name = "discourse-spoiler-alert";
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-spoiler-alert";
- rev = "e200cfa571d252cab63f3d30d619b370986e4cee";
- sha256 = "0ya69ix5g77wz4c9x9gmng6l25ghb5xxlx3icr6jam16q14dzc33";
+ rev = "ec14a2316da0a4fc055cfc21c68a60040188a2b4";
+ sha256 = "11n977gp8va7jkqa6i3ja279k4nmkhk5l4hg9xhs229450m1rnfp";
+ };
+ meta = with lib; {
+ homepage = "https://github.com/discourse/discourse-spoiler-alert";
+ maintainers = with maintainers; [ talyz ];
+ license = licenses.mit;
+ description = "Hide spoilers behind the spoiler-alert jQuery plugin";
};
}
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix
index 8e76123ae5..b20e16118c 100644
--- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix
@@ -1,11 +1,17 @@
-{ mkDiscoursePlugin, fetchFromGitHub }:
+{ lib, mkDiscoursePlugin, fetchFromGitHub }:
mkDiscoursePlugin {
name = "discourse-yearly-review";
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-yearly-review";
- rev = "d1471bdb68945f55342e72e2c525b4f628419a50";
- sha256 = "sha256:0xpl0l1vpih8xzb6y7k1lm72nj4ya99378viyhqfvpwzsn5pha2a";
+ rev = "95149df2282d62eebeb265b4895df15a2b259d03";
+ sha256 = "02n27al8n8cxz3dx4awlnd4qhv8a0fmjac57yyblmpviapja1wj7";
+ };
+ meta = with lib; {
+ homepage = "https://github.com/discourse/discourse-yearly-review";
+ maintainers = with maintainers; [ talyz ];
+ license = licenses.mit;
+ description = "Publishes an automated Year in Review topic";
};
}
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock
index af968cdf33..1f7a3641ca 100644
--- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock
+++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock
@@ -186,11 +186,6 @@ GEM
jwt (2.2.3)
kgio (2.11.3)
libv8-node (15.14.0.1)
- libv8-node (15.14.0.1-arm64-darwin-20)
- libv8-node (15.14.0.1-x86_64-darwin-18)
- libv8-node (15.14.0.1-x86_64-darwin-19)
- libv8-node (15.14.0.1-x86_64-darwin-20)
- libv8-node (15.14.0.1-x86_64-linux)
listen (3.5.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
@@ -214,7 +209,7 @@ GEM
rack (>= 1.1.3)
method_source (1.0.0)
mini_mime (1.1.0)
- mini_portile2 (2.5.1)
+ mini_portile2 (2.5.3)
mini_racer (0.4.0)
libv8-node (~> 15.14.0.0)
mini_scheduler (0.13.0)
@@ -232,7 +227,7 @@ GEM
multipart-post (2.1.1)
mustache (1.1.1)
nio4r (2.5.7)
- nokogiri (1.11.5)
+ nokogiri (1.11.7)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
nokogumbo (2.0.5)
@@ -267,7 +262,7 @@ GEM
omniauth-twitter (1.4.0)
omniauth-oauth (~> 1.1)
rack
- onebox (2.2.15)
+ onebox (2.2.17)
addressable (~> 2.7.0)
htmlentities (~> 4.3)
multi_json (~> 1.11)
@@ -465,12 +460,7 @@ GEM
zeitwerk (2.4.2)
PLATFORMS
- arm64-darwin-20
ruby
- x86_64-darwin-18
- x86_64-darwin-19
- x86_64-darwin-20
- x86_64-linux
DEPENDENCIES
actionmailer (= 6.1.3.2)
@@ -600,4 +590,4 @@ DEPENDENCIES
yaml-lint
BUNDLED WITH
- 2.2.16
+ 2.2.20
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix
index 974df1ed4e..2fe2587d25 100644
--- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix
+++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix
@@ -1135,10 +1135,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0xg1x4708a4pn2wk8qs2d8kfzzdyv9kjjachg2f1phsx62ap2rx2";
+ sha256 = "1ad0mli9rc0f17zw4ibp24dbj1y39zkykijsjmnzl4gwpg5s0j6k";
type = "gem";
};
- version = "2.5.1";
+ version = "2.5.3";
};
mini_racer = {
dependencies = ["libv8-node"];
@@ -1284,10 +1284,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1i80ny61maqzqr1fq5wgpkijmh5j8abisrmhn16kv7mzmxqg5w0m";
+ sha256 = "1vrn31385ix5k9b0yalnlzv360isv6dincbcvi8psllnwz4sjxj9";
type = "gem";
};
- version = "1.11.5";
+ version = "1.11.7";
};
nokogumbo = {
dependencies = ["nokogiri"];
@@ -1414,10 +1414,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0a76xmwikcg2lv8k2cawzhmi2hx7j145v12mbpriby6zff797z4g";
+ sha256 = "1swlysqwfc6mb7smv52yv12sd79dchjf2f6r738wrag0wp5hazqy";
type = "gem";
};
- version = "2.2.15";
+ version = "2.2.17";
};
openssl = {
groups = ["default"];
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/update.py b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/update.py
index c401ab552b..ae4dadfc3a 100755
--- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/update.py
+++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/update.py
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
-#! nix-shell -i python3 -p bundix bundler nix-update python3 python3Packages.requests python3Packages.click python3Packages.click-log
+#! nix-shell -i python3 -p bundix bundler nix-update nix-universal-prefetch python3 python3Packages.requests python3Packages.click python3Packages.click-log
import click
import click_log
@@ -8,17 +8,22 @@ import tempfile
import re
import logging
import subprocess
-import pathlib
+import os
+import stat
+import json
+import requests
from distutils.version import LooseVersion
+from pathlib import Path
from typing import Iterable
-import requests
logger = logging.getLogger(__name__)
class DiscourseRepo:
version_regex = re.compile(r'^v\d+\.\d+\.\d+$')
+ _latest_commit_sha = None
+
def __init__(self, owner: str = 'discourse', repo: str = 'discourse'):
self.owner = owner
self.repo = repo
@@ -35,6 +40,15 @@ class DiscourseRepo:
versions.sort(key=lambda x: LooseVersion(x.replace('v', '')), reverse=True)
return versions
+ @property
+ def latest_commit_sha(self) -> str:
+ if self._latest_commit_sha is None:
+ r = requests.get(f'https://api.github.com/repos/{self.owner}/{self.repo}/commits?per_page=1')
+ r.raise_for_status()
+ self._latest_commit_sha = r.json()[0]['sha']
+
+ return self._latest_commit_sha
+
@staticmethod
def rev2version(tag: str) -> str:
"""
@@ -57,19 +71,23 @@ class DiscourseRepo:
def _call_nix_update(pkg, version):
"""calls nix-update from nixpkgs root dir"""
- nixpkgs_path = pathlib.Path(__file__).parent / '../../../../'
+ nixpkgs_path = Path(__file__).parent / '../../../../'
return subprocess.check_output(['nix-update', pkg, '--version', version], cwd=nixpkgs_path)
+def _nix_eval(expr: str):
+ nixpkgs_path = Path(__file__).parent / '../../../../'
+ return json.loads(subprocess.check_output(['nix', 'eval', '--json', f'(with import {nixpkgs_path} {{}}; {expr})'], text=True))
+
+
def _get_current_package_version(pkg: str):
- nixpkgs_path = pathlib.Path(__file__).parent / '../../../../'
- return subprocess.check_output(['nix', 'eval', '--raw', f'nixpkgs.{pkg}.version'], text=True)
+ return _nix_eval(f'{pkg}.version')
def _diff_file(filepath: str, old_version: str, new_version: str):
repo = DiscourseRepo()
- current_dir = pathlib.Path(__file__).parent
+ current_dir = Path(__file__).parent
old = repo.get_file(filepath, 'v' + old_version)
new = repo.get_file(filepath, 'v' + new_version)
@@ -148,17 +166,87 @@ def update(rev):
version = repo.rev2version(rev)
logger.debug(f"Using version {version}")
- rubyenv_dir = pathlib.Path(__file__).parent / "rubyEnv"
+ rubyenv_dir = Path(__file__).parent / "rubyEnv"
for fn in ['Gemfile.lock', 'Gemfile']:
with open(rubyenv_dir / fn, 'w') as f:
f.write(repo.get_file(fn, rev))
subprocess.check_output(['bundle', 'lock'], cwd=rubyenv_dir)
+ for platform in ['arm64-darwin-20', 'x86_64-darwin-18',
+ 'x86_64-darwin-19', 'x86_64-darwin-20',
+ 'x86_64-linux']:
+ subprocess.check_output(['bundle', 'lock', '--remove-platform', platform], cwd=rubyenv_dir)
subprocess.check_output(['bundix'], cwd=rubyenv_dir)
_call_nix_update('discourse', repo.rev2version(rev))
+@cli.command()
+def update_plugins():
+ """Update plugins to their latest revision.
+
+ """
+ plugins = [
+ {'name': 'discourse-canned-replies'},
+ {'name': 'discourse-github'},
+ {'name': 'discourse-math'},
+ {'name': 'discourse-solved'},
+ {'name': 'discourse-spoiler-alert'},
+ {'name': 'discourse-yearly-review'},
+ ]
+
+ for plugin in plugins:
+ fetcher = plugin.get('fetcher') or "fetchFromGitHub"
+ owner = plugin.get('owner') or "discourse"
+ name = plugin.get('name')
+ repo_name = plugin.get('repo_name') or name
+
+ repo = DiscourseRepo(owner=owner, repo=repo_name)
+ prev_commit_sha = _nix_eval(f'discourse.plugins.{name}.src.rev')
+
+ if prev_commit_sha == repo.latest_commit_sha:
+ click.echo(f'Plugin {name} is already at the latest revision')
+ continue
+
+ filename = _nix_eval(f'builtins.unsafeGetAttrPos "src" discourse.plugins.{name}')['file']
+ prev_hash = _nix_eval(f'discourse.plugins.{name}.src.outputHash')
+ new_hash = subprocess.check_output([
+ 'nix-universal-prefetch', fetcher,
+ '--owner', owner,
+ '--repo', repo_name,
+ '--rev', repo.latest_commit_sha,
+ ], text=True).strip("\n")
+
+ click.echo(f"Update {name}, {prev_commit_sha} -> {repo.latest_commit_sha} in {filename}")
+
+ with open(filename, 'r+') as f:
+ content = f.read()
+ content = content.replace(prev_commit_sha, repo.latest_commit_sha)
+ content = content.replace(prev_hash, new_hash)
+ f.seek(0)
+ f.write(content)
+ f.truncate()
+
+ rubyenv_dir = Path(filename).parent
+ gemfile = rubyenv_dir / "Gemfile"
+ gemfile_text = ''
+ for line in repo.get_file('plugin.rb', repo.latest_commit_sha).splitlines():
+ if 'gem ' in line:
+ gemfile_text = gemfile_text + line + os.linesep
+
+ if len(gemfile_text) > 0:
+ if os.path.isfile(gemfile):
+ os.remove(gemfile)
+
+ subprocess.check_output(['bundle', 'init'], cwd=rubyenv_dir)
+ os.chmod(gemfile, stat.S_IREAD | stat.S_IWRITE | stat.S_IRGRP | stat.S_IROTH)
+
+ with open(gemfile, 'a') as f:
+ f.write(gemfile_text)
+
+ subprocess.check_output(['bundle', 'lock', '--update'], cwd=rubyenv_dir)
+ subprocess.check_output(['bundix'], cwd=rubyenv_dir)
+
if __name__ == '__main__':
cli()
diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix b/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix
index 125c329c4b..9a75403cec 100644
--- a/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix
@@ -3102,11 +3102,11 @@ lib.makeScope newScope (self: with self; {
# THIS IS A GENERATED FILE. DO NOT EDIT!
xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation {
pname = "xorg-server";
- version = "1.20.11";
+ version = "1.20.12";
builder = ./builder.sh;
src = fetchurl {
- url = "mirror://xorg/individual/xserver/xorg-server-1.20.11.tar.bz2";
- sha256 = "0jacqgin8kcyy8fyv0lhgb4if8g9hp60rm3ih3s1mgps7xp7jk4i";
+ url = "mirror://xorg/individual/xserver/xorg-server-1.20.12.tar.xz";
+ sha256 = "1b4ckvxaiiiwdxwyfzbbfkr384qqy5qzfsm37z0fr08x8f9w0v9k";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list b/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list
index 4bb1867903..42cb2da3a0 100644
--- a/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list
+++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list
@@ -218,4 +218,4 @@ mirror://xorg/individual/util/lndir-1.0.3.tar.bz2
mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2
mirror://xorg/individual/util/util-macros-1.19.3.tar.bz2
mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2
-mirror://xorg/individual/xserver/xorg-server-1.20.11.tar.bz2
+mirror://xorg/individual/xserver/xorg-server-1.20.12.tar.xz
diff --git a/third_party/nixpkgs/pkgs/tools/X11/virtualgl/lib.nix b/third_party/nixpkgs/pkgs/tools/X11/virtualgl/lib.nix
index 362a86fff3..5974b2bd3d 100644
--- a/third_party/nixpkgs/pkgs/tools/X11/virtualgl/lib.nix
+++ b/third_party/nixpkgs/pkgs/tools/X11/virtualgl/lib.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, cmake
-, libGL, libGLU, libX11, libXv, libXtst, libjpeg_turbo, fltk
+, libGL, libGLU, libXv, libXtst, libXi, libjpeg_turbo, fltk
, xorg
, opencl-headers, opencl-clhpp, ocl-icd
}:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ libjpeg_turbo libGL libGLU fltk
- libX11 libXv libXtst xorg.xcbutilkeysyms
+ libXv libXtst libXi xorg.xcbutilkeysyms
opencl-headers opencl-clhpp ocl-icd
];
diff --git a/third_party/nixpkgs/pkgs/tools/X11/wmctrl/default.nix b/third_party/nixpkgs/pkgs/tools/X11/wmctrl/default.nix
index 0a01a3dad5..19a464aff7 100644
--- a/third_party/nixpkgs/pkgs/tools/X11/wmctrl/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/X11/wmctrl/default.nix
@@ -17,7 +17,9 @@ stdenv.mkDerivation rec {
sha256 = "1afclc57b9017a73mfs9w7lbdvdipmf9q0xdk116f61gnvyix2np";
};
- nativeBuildInputs = [ pkg-config ];
+ strictDeps = true;
+ depsBuildBuild = [ pkg-config ];
+ nativeBuildInputs = [ glib.dev ];
buildInputs = [ libX11 libXmu glib ];
patches = [ ./64-bit-data.patch ];
diff --git a/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix b/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix
index fde3e829cc..ac831c9da4 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix
@@ -19,13 +19,13 @@ let
in
buildGoPackage rec {
pname = "lxd";
- version = "4.15";
+ version = "4.16";
goPackagePath = "github.com/lxc/lxd";
src = fetchurl {
url = "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz";
- sha256 = "sha256-UXipGNWclBKgr0r0wav85Gnhp2SXkTvDFr9gKJWismU=";
+ sha256 = "1da9avmxs8sy92d9nrdgry2x685ral58zgf89yr88qxc0llbzq7r";
};
postPatch = ''
@@ -40,6 +40,9 @@ buildGoPackage rec {
cp -r _dist/src/* ../../..
popd
+ # required for go-dqlite. See: https://github.com/lxc/lxd/pull/8939
+ export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)"
+
makeFlagsArray+=("-tags libsqlite3")
'';
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/svgbob/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/svgbob/default.nix
index b9784a85b2..1f72243293 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/svgbob/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/graphics/svgbob/default.nix
@@ -1,25 +1,16 @@
-{ lib, rustPlatform, fetchFromGitHub }:
+{ lib, rustPlatform, fetchCrate }:
rustPlatform.buildRustPackage rec {
pname = "svgbob";
- version = "0.4.2";
+ version = "0.5.3";
- src = fetchFromGitHub {
- owner = "ivanceras";
- repo = pname;
- rev = "0febc4377134a2ea3b3cd43ebdf5ea688a0e7432";
- sha256 = "1n0w5b3fjgbczy1iw52172x1p3y1bvw1qpz77fkaxkhrkgfd7vwr";
+ src = fetchCrate {
+ inherit version;
+ crateName = "svgbob_cli";
+ sha256 = "1gi8h4wzpi477y1gwi4708pn2kr65934a4dmphbhwppxbw447qiw";
};
- sourceRoot = "source/svgbob_cli";
- postPatch = ''
- substituteInPlace ../svgbob/src/lib.rs \
- --replace '#![deny(warnings)]' ""
- '';
- cargoSha256 = "1jyycr95gjginx6bzmay9b5dbpnbwdqbv13w1qy58znicsmh3v8a";
-
- # Test tries to build outdated examples
- doCheck = false;
+ cargoSha256 = "1x8phpllwm12igaachghwq6wgxl7nl8bhh7xybfrmn447viwxhq2";
meta = with lib; {
description = "Convert your ascii diagram scribbles into happy little SVG";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/afetch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/afetch/default.nix
new file mode 100644
index 0000000000..aea2ff1ff2
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/misc/afetch/default.nix
@@ -0,0 +1,28 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation rec {
+ pname = "afetch";
+ version = "2.2.0";
+
+ src = fetchFromGitHub {
+ owner = "13-CF";
+ repo = "afetch";
+ rev = "V${version}";
+ sha256 = "sha256-bHP3DJpgh89AaCX4c1tQGaZ/PiWjArED1rMdszFUq+U=";
+ };
+
+ makeFlags = [
+ "PREFIX=${placeholder "out"}"
+ ];
+
+ meta = with lib; {
+ description = "A fetch program written in C";
+ homepage = "https://github.com/13-CF/afetch";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ dan4ik605743 jk ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix b/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix
index fcf29beb18..d9c4ceeca2 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix
@@ -39,7 +39,7 @@ let
canEfi = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild);
inPCSystems = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) pcSystems);
- version = "2.06-rc1";
+ version = "2.06";
in (
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
src = fetchgit {
url = "git://git.savannah.gnu.org/grub.git";
rev = "${pname}-${version}";
- sha256 = "1ngc960g4w91rg13l724v6nlj6fq1adxp6is2mrq4bnp7sm9mysa";
+ sha256 = "1vkxr6b4p7h259vayjw8bfgqj57x68byy939y4bmyaz6g7fgrv0f";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/tools/misc/infracost/default.nix b/third_party/nixpkgs/pkgs/tools/misc/infracost/default.nix
index c912eb3322..3d91dd6d9a 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/infracost/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/infracost/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "infracost";
- version = "0.9.3";
+ version = "0.9.4";
src = fetchFromGitHub {
owner = "infracost";
rev = "v${version}";
repo = "infracost";
- sha256 = "sha256-3AH/VUKIno/jObep5GNfIpyOW5TcfZ5UZyornJWTGOw=";
+ sha256 = "sha256-OQwMO9bhPK+Wjob8rAFYJQRpAYf1bPdRi2BjETjpSpE=";
};
vendorSha256 = "sha256-zMEtVPyzwW4SrbpydDFDqgHEC0/khkrSxlEnQ5I0he8=";
@@ -25,12 +25,7 @@ buildGoModule rec {
'';
postInstall = ''
- # panic if .config directory can't be accessed
- # https://github.com/infracost/infracost/pull/862
- export HOME="$TMPDIR"
- mkdir -p "$HOME/.config/infracost"
export INFRACOST_SKIP_UPDATE_CHECK=true
-
installShellCompletion --cmd infracost \
--bash <($out/bin/infracost completion --shell bash) \
--fish <($out/bin/infracost completion --shell fish) \
@@ -41,10 +36,7 @@ buildGoModule rec {
installCheckPhase = ''
runHook preInstallCheck
- export HOME="$TMPDIR"
- mkdir -p "$HOME/.config/infracost"
export INFRACOST_SKIP_UPDATE_CHECK=true
-
$out/bin/infracost --help
$out/bin/infracost --version | grep "v${version}"
@@ -60,7 +52,7 @@ buildGoModule rec {
This helps developers, DevOps et al. quickly see the cost breakdown and
compare different deployment options upfront.
'';
- license = [ licenses.asl20 ];
+ license = licenses.asl20;
maintainers = with maintainers; [ davegallant jk ];
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/tremor-rs/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tremor-rs/default.nix
index 9c0a68805a..5f6acfd969 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/tremor-rs/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/tremor-rs/default.nix
@@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec {
pname = "tremor";
- version = "0.11.2";
+ version = "0.11.5";
src = fetchFromGitHub {
owner = "tremor-rs";
repo = "tremor-runtime";
rev = "v${version}";
- sha256 = "sha256-FedRwFVc+m25+Elj1Vp/fInbK6DVsUpniw29/dtecWo=";
+ sha256 = "sha256-fE0f0tCI2V+HqHZwn9cO+xs0o3o6w0nrJg9Et0zJMOE=";
};
- cargoSha256 = "sha256-jxXoFOwoBSkn7pv10ctLpD7ko8bokc1ADkB7NQFRC7c=";
+ cargoHash = "sha256-dky9ejzMgKXlzpg+9bmkd7th+EHBpNmZJkgYt2pjuuI=";
nativeBuildInputs = [ cmake pkg-config installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/tools/networking/innernet/default.nix b/third_party/nixpkgs/pkgs/tools/networking/innernet/default.nix
index cee4956269..f643702d62 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/innernet/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/innernet/default.nix
@@ -2,15 +2,15 @@
rustPlatform.buildRustPackage rec {
pname = "innernet";
- version = "1.3.1";
+ version = "1.4.0";
src = fetchFromGitHub {
owner = "tonarino";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-Tnwq86gAbi24O8/26134gJCf9+wol1zma980t9iHEKY=";
+ sha256 = "sha256-n+xNWhOkRCIcoBHR8u+xZK81fU0usIfFhYg3BO9yXik=";
};
- cargoSha256 = "sha256-Wy+i1lmXpsy0Sy0GF5XUfXsLQHeV7cQo9nUxUEFnHOU=";
+ cargoSha256 = "sha256-cTqQtJpuwVlUKfAK8ASf6vq6PU2NE8PT/el/Hz4HgtA=";
nativeBuildInputs = with llvmPackages; [
llvm
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ookla-speedtest/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ookla-speedtest/default.nix
new file mode 100644
index 0000000000..200b488cf7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/networking/ookla-speedtest/default.nix
@@ -0,0 +1,43 @@
+{ lib, stdenv, fetchurl }:
+
+let
+ pname = "ookla-speedtest";
+ version = "1.0.0";
+
+ srcs = {
+ x86_64-linux = fetchurl {
+ url = "https://install.speedtest.net/app/cli/${pname}-${version}-x86_64-linux.tgz";
+ sha256 = "sha256-X+ICjw1EJ+T0Ix2fnPcOZpG7iQpwY211Iy/k2XBjMWg=";
+ };
+ aarch64-linux = fetchurl {
+ url = "https://install.speedtest.net/app/cli/${pname}-${version}-aarch64-linux.tgz";
+ sha256 = "sha256-BzaE3DSQUIygGwTFhV4Ez9eX/tM/bqam7cJt+8b2qp4=";
+ };
+ };
+in
+
+stdenv.mkDerivation rec {
+ inherit pname version;
+
+ src = srcs.${stdenv.hostPlatform.system};
+
+ setSourceRoot = ''
+ sourceRoot=$PWD
+ '';
+
+ dontBuild = true;
+ dontConfigure = true;
+
+ installPhase = ''
+ install -D speedtest $out/bin/speedtest
+ install -D speedtest.5 $out/share/man/man5/speedtest.5
+ '';
+
+ meta = with lib; {
+ description = "Command line internet speedtest tool by Ookla";
+ homepage = "https://www.speedtest.net/apps/cli";
+ license = licenses.unfree;
+ maintainers = with maintainers; [ kranzes ];
+ platforms = lib.attrNames srcs;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix-template/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix-template/default.nix
index 0345830fb9..f56222f403 100644
--- a/third_party/nixpkgs/pkgs/tools/package-management/nix-template/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/package-management/nix-template/default.nix
@@ -1,17 +1,33 @@
-{ lib, rustPlatform, fetchFromGitHub }:
+{ lib, stdenv, rustPlatform, fetchFromGitHub
+, makeWrapper
+, nix
+, openssl
+, pkg-config
+, Security
+}:
rustPlatform.buildRustPackage rec {
pname = "nix-template";
- version = "0.1.0";
+ version = "0.1.1";
src = fetchFromGitHub {
owner = "jonringer";
repo = pname;
rev = "v${version}";
- sha256 = "1h6xdvhzg7nb0s82b3r5bsh8bfdb1l5sm7fa24lfwd396xp9yyig";
+ sha256 = "sha256-A1b/fgSr27sfMDnTi4R3PUZfhAdLA5wUOd4yh9/4Bnk=";
};
- cargoSha256 = "0hp31b5q4s6grkha2jz55945cbjkqdpvx1l8m49zv5prczhd7mz5";
+ cargoSha256 = "sha256-resyY/moqLo4KWOKUvFJiOWealCmcEsLFgkN12slKN0=";
+
+ nativeBuildInputs = [ makeWrapper pkg-config ];
+ buildInputs = [ openssl ]
+ ++ lib.optional stdenv.isDarwin Security;
+
+ # needed for nix-prefetch-url
+ postInstall = ''
+ wrapProgram $out/bin/nix-template \
+ --prefix PATH : ${lib.makeBinPath [ nix ]}
+ '';
meta = with lib; {
description = "Make creating nix expressions easy";
diff --git a/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix b/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix
index 550f965b07..bdc32570df 100644
--- a/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoModule, fetchFromGitHub, pcsclite, pkg-config, PCSC }:
+{ stdenv, lib, buildGoModule, fetchFromGitHub, pcsclite, pkg-config, PCSC, pivKeySupport ? true }:
buildGoModule rec {
pname = "cosign";
@@ -12,8 +12,8 @@ buildGoModule rec {
};
buildInputs =
- lib.optional stdenv.isLinux (lib.getDev pcsclite)
- ++ lib.optionals stdenv.isDarwin [ PCSC ];
+ lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite)
+ ++ lib.optionals (stdenv.isDarwin && pivKeySupport) [ PCSC ];
nativeBuildInputs = [ pkg-config ];
@@ -21,6 +21,9 @@ buildGoModule rec {
subPackages = [ "cmd/cosign" ];
+ preBuild = ''
+ buildFlagsArray+=(${lib.optionalString pivKeySupport "-tags=pivkey"})
+ '';
ldflags = [ "-s" "-w" "-X github.com/sigstore/cosign/cmd/cosign/cli.gitVersion=v${version}"];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile
index 4a30b94f42..8b90f7dd5f 100644
--- a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile
+++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile
@@ -1,4 +1,4 @@
# frozen_string_literal: true
source "https://rubygems.org"
-gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.52"
+gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.53"
diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock
index 1d324982a4..53b1170b21 100644
--- a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock
+++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
- revision: f376002331f03483d56ade1c19134dbf02ef2cff
- ref: refs/tags/6.0.52
+ revision: b7cef30d11f0509b7e27334030dae6b8cb34e7f2
+ ref: refs/tags/6.0.53
specs:
- metasploit-framework (6.0.52)
+ metasploit-framework (6.0.53)
actionpack (~> 5.2.2)
activerecord (~> 5.2.2)
activesupport (~> 5.2.2)
@@ -85,6 +85,7 @@ GIT
thin
tzinfo
tzinfo-data
+ unix-crypt
warden
windows_error
xdr
@@ -126,13 +127,13 @@ GEM
arel-helpers (2.12.0)
activerecord (>= 3.1.0, < 7)
aws-eventstream (1.1.1)
- aws-partitions (1.475.0)
- aws-sdk-core (3.116.0)
+ aws-partitions (1.478.0)
+ aws-sdk-core (3.117.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
- aws-sdk-ec2 (1.248.0)
+ aws-sdk-ec2 (1.249.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-iam (1.56.0)
@@ -173,7 +174,7 @@ GEM
eventmachine (1.2.7)
faker (2.18.0)
i18n (>= 1.6, < 2)
- faraday (1.5.0)
+ faraday (1.5.1)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
@@ -188,7 +189,7 @@ GEM
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
faraday-net_http (1.0.1)
- faraday-net_http_persistent (1.1.0)
+ faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faye-websocket (0.11.1)
eventmachine (>= 0.12.0)
@@ -312,7 +313,7 @@ GEM
rex-core
rex-struct2
rex-text
- rex-core (0.1.16)
+ rex-core (0.1.17)
rex-encoder (0.1.5)
metasm
rex-arch
@@ -331,7 +332,7 @@ GEM
rex-arch
rex-ole (0.1.7)
rex-text
- rex-powershell (0.1.90)
+ rex-powershell (0.1.91)
rex-random_identifier
rex-text
ruby-rc4
@@ -356,7 +357,7 @@ GEM
rkelly-remix (0.0.7)
ruby-macho (2.5.1)
ruby-rc4 (0.1.5)
- ruby2_keywords (0.0.4)
+ ruby2_keywords (0.0.5)
ruby_smb (2.0.10)
bindata
openssl-ccm
@@ -393,6 +394,7 @@ GEM
unf (0.1.4)
unf_ext
unf_ext (0.0.7.7)
+ unix-crypt (1.3.0)
warden (1.2.9)
rack (>= 2.0.9)
webrick (1.7.0)
diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix
index e2e1f6371f..5217322fd6 100644
--- a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix
@@ -8,13 +8,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
- version = "6.0.52";
+ version = "6.0.53";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = version;
- sha256 = "sha256-JN+ulGd47xZFSR7AdxfvviR5mwCHdfBmFkaAJPdaLJ8=";
+ sha256 = "sha256-0tg2FSRtwo1LRxA5jNQ1Pxx54TPs3ZwErXim8uj24VI=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix
index 23eb207484..ab8a1a21ca 100644
--- a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix
@@ -114,30 +114,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0x9d0awfm8s9y025iwn7d5an476f6xq9v99lnynj2vvj1kgya79s";
+ sha256 = "0vsxqayzh04gxxan5i8vvfxh0n238dc9305bc89xs2mx2x1pw167";
type = "gem";
};
- version = "1.475.0";
+ version = "1.478.0";
};
aws-sdk-core = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0vjr1lzddm1pcs5vkpxns1gmrv0l0wb53kcxhh1xdznb7hm8h5km";
+ sha256 = "1mcagbyzy7l39lxm9g85frvjwlv3yfd9x8jddd1pfc0xsy9y0rax";
type = "gem";
};
- version = "3.116.0";
+ version = "3.117.0";
};
aws-sdk-ec2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1s0r1vk39sjxkc5km2ldvcm1l5ac2c4w5z9bvz18jgqis98j6zd5";
+ sha256 = "1n6yl7qbzmjlxp3rzm3a62vinzdg9a8rqspq7xdaa9sxrf4zsamf";
type = "gem";
};
- version = "1.248.0";
+ version = "1.249.0";
};
aws-sdk-iam = {
groups = ["default"];
@@ -354,10 +354,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0gwbii45plm9bljk22bwzhzxrc5xid8qx24f54vrm74q3zaz00ah";
+ sha256 = "1xpq9w46alagszx2mx82mqxxmsmyni2bpxd08gygzpl03zwbpr63";
type = "gem";
};
- version = "1.5.0";
+ version = "1.5.1";
};
faraday-em_http = {
groups = ["default"];
@@ -414,10 +414,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0l2c835wl7gv34xp49fhd1bl4czkpw2g3ahqsak2251iqv5589ka";
+ sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b";
type = "gem";
};
- version = "1.1.0";
+ version = "1.2.0";
};
faraday-patron = {
groups = ["default"];
@@ -594,12 +594,12 @@
platforms = [];
source = {
fetchSubmodules = false;
- rev = "f376002331f03483d56ade1c19134dbf02ef2cff";
- sha256 = "17rcbbvj90262rkg0xc702dpj95yxwbpgh0y952idvvqcyaaxpr4";
+ rev = "b7cef30d11f0509b7e27334030dae6b8cb34e7f2";
+ sha256 = "0lp1yvlg59kqml29rpgc6ghpj71z6pa8qf8h8x5qvhkd4hakdn6j";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
- version = "6.0.52";
+ version = "6.0.53";
};
metasploit-model = {
groups = ["default"];
@@ -1036,10 +1036,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "08krnf05mbq6x2d92fv34bl8xdz1d3yq2m0mp8bfbq5kd6a13l2w";
+ sha256 = "0b0f9s18d2ax2k1xmwrvr97gxh8gfm79kfibv55fqmv846vgkkvk";
type = "gem";
};
- version = "0.1.16";
+ version = "0.1.17";
};
rex-encoder = {
groups = ["default"];
@@ -1106,10 +1106,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "08a9s82y4bv2bis0szasrrqvz6imwx94ckg259f7w39ng1fbc7b1";
+ sha256 = "0zrc0pr1pla0amw6hagllj82hyq8pyy6wb38xry2cxg7q70ghfq7";
type = "gem";
};
- version = "0.1.90";
+ version = "0.1.91";
};
rex-random_identifier = {
groups = ["default"];
@@ -1236,10 +1236,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs";
+ sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz";
type = "gem";
};
- version = "0.0.4";
+ version = "0.0.5";
};
ruby_smb = {
groups = ["default"];
@@ -1421,6 +1421,16 @@
};
version = "0.0.7.7";
};
+ unix-crypt = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1wflipsmmicmgvqilp9pml4x19b337kh6p6jgrzqrzpkq2z52gdq";
+ type = "gem";
+ };
+ version = "1.3.0";
+ };
warden = {
groups = ["default"];
platforms = [];
diff --git a/third_party/nixpkgs/pkgs/tools/security/oath-toolkit/default.nix b/third_party/nixpkgs/pkgs/tools/security/oath-toolkit/default.nix
index a925d07cb7..e542a2ae71 100644
--- a/third_party/nixpkgs/pkgs/tools/security/oath-toolkit/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/oath-toolkit/default.nix
@@ -1,6 +1,7 @@
{ lib, stdenv, fetchurl, pam, xmlsec }:
let
+ # TODO: Switch to OpenPAM once https://gitlab.com/oath-toolkit/oath-toolkit/-/issues/26 is addressed upstream
securityDependency =
if stdenv.isDarwin then xmlsec
else pam;
@@ -16,6 +17,8 @@ in stdenv.mkDerivation rec {
buildInputs = [ securityDependency ];
+ configureFlags = lib.optionals stdenv.isDarwin [ "--disable-pam" ];
+
passthru.updateScript = ./update.sh;
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/tools/text/mdcat/default.nix b/third_party/nixpkgs/pkgs/tools/text/mdcat/default.nix
index e298a56c58..beedabe34a 100644
--- a/third_party/nixpkgs/pkgs/tools/text/mdcat/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/mdcat/default.nix
@@ -12,20 +12,20 @@
rustPlatform.buildRustPackage rec {
pname = "mdcat";
- version = "0.23.0";
+ version = "0.23.1";
src = fetchFromGitHub {
owner = "lunaryorn";
repo = pname;
rev = "mdcat-${version}";
- hash = "sha256-bGXuYGQyrXa9gUEQfB7BF9K04z88r1UoM8R5gpL2nRM=";
+ sha256 = "sha256-aJ7rL+EKa5zWmCmekVuRmdeOwTmVo0IQ+GJ8Ga4iTI0=";
};
nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ];
buildInputs = [ openssl ]
++ lib.optional stdenv.isDarwin Security;
- cargoSha256 = "sha256-hmv4LNk7NEYjT/5XXUpMd+xGS19KHOW+HIgsiFEWeig=";
+ cargoSha256 = "sha256-r0dJ/lDOfRzEdwySR/eEvsrO8qn4g7ZIfpekiirUp3Q=";
checkInputs = [ ansi2html ];
# Skip tests that use the network and that include files.
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix
index b30c4b8865..f05c4a43b9 100644
--- a/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix
@@ -11,17 +11,17 @@
}:
let
- specVersion = "4.96.0"; # Version taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`.
+ specVersion = "4.98.0"; # Version taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`.
spec = fetchurl {
url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml";
- sha256 = "sha256-4+j5BBTOFLLiA+n0YEUH/ICK4Iuxr6nNB7ZRrYACW2I=";
+ sha256 = "sha256-3SweDMfgq2+QQIdeb6EjL7A2Grd/7KQzsbMNZKPtXts=";
};
in
buildPythonApplication rec {
pname = "linode-cli";
- version = "5.4.3";
+ version = "5.5.1";
src = fetchFromGitHub {
owner = "linode";
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/swayr/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/swayr/default.nix
new file mode 100644
index 0000000000..24a830a727
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/wayland/swayr/default.nix
@@ -0,0 +1,30 @@
+{ lib, fetchFromSourcehut, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "swayr";
+ version = "0.6.1";
+
+ src = fetchFromSourcehut {
+ owner = "~tsdh";
+ repo = "swayr";
+ rev = "v${version}";
+ sha256 = "1865064q8jb75nfb0hbx4swbbijpibm0n7m4cid8qgylzp4bxvs2";
+ };
+
+ cargoSha256 = "0w6zjnywifdlaw01xz2824lwm4b6r1b7r99wi3p12vgbrmks4jcr";
+
+ patches = [
+ ./icon-paths.patch
+ ];
+
+ preCheck = ''
+ export HOME=$TMPDIR
+ '';
+
+ meta = with lib; {
+ description = "A window switcher (and more) for sway";
+ homepage = "https://git.sr.ht/~tsdh/swayr";
+ license = with licenses; [ gpl3Plus ];
+ maintainers = with maintainers; [ artturin ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/swayr/icon-paths.patch b/third_party/nixpkgs/pkgs/tools/wayland/swayr/icon-paths.patch
new file mode 100644
index 0000000000..8fafc4c415
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/wayland/swayr/icon-paths.patch
@@ -0,0 +1,17 @@
+diff --git a/src/config.rs b/src/config.rs
+index de7d04b..291114b 100644
+--- a/src/config.rs
++++ b/src/config.rs
+@@ -197,6 +197,12 @@ impl Default for Format {
+ ),
+ urgency_end: Some("".to_string()),
+ icon_dirs: Some(vec![
++ "/run/current-system/sw/share/icons/hicolor/scalable/apps".to_string(),
++ "/run/current-system/sw/share/icons/hicolor/48x48/apps".to_string(),
++ "/run/current-system/sw/share/pixmaps".to_string(),
++ "~/.nix-profile/share/icons/hicolor/scalable/apps".to_string(),
++ "~/.nix-profile/share/icons/hicolor/48x48/apps".to_string(),
++ "~/.nix-profile/share/pixmaps".to_string(),
+ "/usr/share/icons/hicolor/scalable/apps".to_string(),
+ "/usr/share/icons/hicolor/48x48/apps".to_string(),
+ "/usr/share/pixmaps".to_string(),
diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix
index 1b9f956102..a7b6157235 100644
--- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix
@@ -808,6 +808,8 @@ in
afew = callPackage ../applications/networking/mailreaders/afew { };
+ afetch = callPackage ../tools/misc/afetch { };
+
afio = callPackage ../tools/archivers/afio { };
afl = callPackage ../tools/security/afl {
@@ -1237,6 +1239,8 @@ in
azure-cli = callPackage ../tools/admin/azure-cli { };
+ azure-functions-core-tools = callPackage ../development/tools/azure-functions-core-tools { };
+
azure-storage-azcopy = callPackage ../development/tools/azcopy { };
azure-vhd-utils = callPackage ../tools/misc/azure-vhd-utils { };
@@ -1323,6 +1327,8 @@ in
inherit (nodePackages) bitwarden-cli;
+ inherit (nodePackages) hyperspace-cli;
+
bkyml = callPackage ../tools/misc/bkyml { };
blockbench-electron = callPackage ../applications/graphics/blockbench-electron { };
@@ -1979,6 +1985,8 @@ in
tensorflow-lite = callPackage ../development/libraries/science/math/tensorflow-lite { };
+ tezos-rust-libs = callPackage ../development/libraries/tezos-rust-libs { };
+
behdad-fonts = callPackage ../data/fonts/behdad-fonts { };
bfetch = callPackage ../tools/misc/bfetch { };
@@ -2305,6 +2313,8 @@ in
swaycwd = callPackage ../tools/wayland/swaycwd { };
+ swayr = callPackage ../tools/wayland/swayr { };
+
wayland-utils = callPackage ../tools/wayland/wayland-utils { };
wayland-proxy-virtwl = callPackage ../tools/wayland/wayland-proxy-virtwl { };
@@ -2485,6 +2495,10 @@ in
discourse = callPackage ../servers/web-apps/discourse { };
+ discourseAllPlugins = discourse.override {
+ plugins = lib.filter (p: p ? pluginName) (builtins.attrValues discourse.plugins);
+ };
+
discourse-mail-receiver = callPackage ../servers/web-apps/discourse/mail_receiver { };
discocss = callPackage ../tools/misc/discocss { };
@@ -3085,7 +3099,9 @@ in
nix-output-monitor = haskell.lib.justStaticExecutables (haskellPackages.nix-output-monitor);
- nix-template = callPackage ../tools/package-management/nix-template { };
+ nix-template = callPackage ../tools/package-management/nix-template {
+ inherit (darwin.apple_sdk.frameworks) Security;
+ };
nodepy-runtime = with python3.pkgs; toPythonApplication nodepy-runtime;
@@ -8473,9 +8489,7 @@ in
routino = callPackage ../tools/misc/routino { };
- rq = callPackage ../development/tools/rq {
- inherit (darwin) libiconv;
- };
+ rq = callPackage ../development/tools/rq { };
rs-git-fsmonitor = callPackage ../applications/version-management/git-and-tools/rs-git-fsmonitor { };
@@ -15104,12 +15118,27 @@ in
flite = callPackage ../development/libraries/flite { };
fltk13 = callPackage ../development/libraries/fltk {
- inherit (darwin.apple_sdk.frameworks) Cocoa AGL GLUT;
+ inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa OpenGL;
};
fltk14 = callPackage ../development/libraries/fltk/1.4.nix {
- inherit (darwin.apple_sdk.frameworks) Cocoa AGL GLUT;
+ inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa OpenGL;
};
- fltk = res.fltk13;
+ fltk13-minimal = fltk13.override {
+ withGL = false;
+ withCairo = false;
+ withPango = false;
+ withExamples = false;
+ withDocs = false;
+ };
+ fltk14-minimal = fltk14.override {
+ withGL = false;
+ withCairo = false;
+ withPango = false;
+ withExamples = false;
+ withDocs = false;
+ };
+ fltk = fltk13;
+ fltk-minimal = fltk13-minimal;
flyway = callPackage ../development/tools/flyway { };
@@ -16511,6 +16540,8 @@ in
libgksu = callPackage ../development/libraries/libgksu { };
+ libgnt = callPackage ../development/libraries/libgnt { };
+
libgpgerror = callPackage ../development/libraries/libgpg-error { };
# https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob;f=README;h=fd6e1a83f55696c1f7a08f6dfca08b2d6b7617ec;hb=70058cd9f944d620764e57c838209afae8a58c78#l118
@@ -17653,6 +17684,8 @@ in
oobicpl = callPackage ../development/libraries/science/biology/oobicpl { };
+ ookla-speedtest = callPackage ../tools/networking/ookla-speedtest { };
+
openalSoft = callPackage ../development/libraries/openal-soft {
inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox;
};
@@ -19524,6 +19557,8 @@ in
icecream = callPackage ../servers/icecream { };
+ icingaweb2-ipl = callPackage ../servers/icingaweb2/ipl.nix { };
+ icingaweb2-thirdparty = callPackage ../servers/icingaweb2/thirdparty.nix { };
icingaweb2 = callPackage ../servers/icingaweb2 { };
icingaweb2Modules = {
theme-april = callPackage ../servers/icingaweb2/theme-april { };
@@ -19543,6 +19578,8 @@ in
ircdHybrid = callPackage ../servers/irc/ircd-hybrid { };
+ janus-gateway = callPackage ../servers/janus-gateway { };
+
jboss = callPackage ../servers/http/jboss { };
jboss_mysql_jdbc = callPackage ../servers/http/jboss/jdbc/mysql { };
@@ -22300,6 +22337,8 @@ in
juno-theme = callPackage ../data/themes/juno { };
+ kanit-font = callPackage ../data/fonts/kanit { };
+
kanji-stroke-order-font = callPackage ../data/fonts/kanji-stroke-order-font {};
kawkab-mono-font = callPackage ../data/fonts/kawkab-mono {};
@@ -23158,8 +23197,9 @@ in
inherit (pkgs) bitwig-studio1;
};
bitwig-studio3 = callPackage ../applications/audio/bitwig-studio/bitwig-studio3.nix { };
+ bitwig-studio4 = callPackage ../applications/audio/bitwig-studio/bitwig-studio4.nix { };
- bitwig-studio = bitwig-studio3;
+ bitwig-studio = bitwig-studio4;
bgpdump = callPackage ../tools/networking/bgpdump { };
@@ -25847,6 +25887,8 @@ in
nwg-panel = callPackage ../applications/misc/nwg-panel { };
+ nwg-wrapper = callPackage ../applications/misc/nwg-wrapper { };
+
ocenaudio = callPackage ../applications/audio/ocenaudio { };
onlyoffice-bin = callPackage ../applications/office/onlyoffice-bin { };
@@ -28468,6 +28510,9 @@ in
electrs = callPackage ../applications/blockchains/electrs.nix { };
+ elements = libsForQt5.callPackage ../applications/blockchains/elements.nix { miniupnpc = miniupnpc_2; withGui = true; };
+ elementsd = callPackage ../applications/blockchains/elements.nix { miniupnpc = miniupnpc_2; withGui = false; };
+
ergo = callPackage ../applications/blockchains/ergo { };
exodus = callPackage ../applications/blockchains/exodus { };
@@ -28505,6 +28550,10 @@ in
boost = boost17x;
};
+ oxen = callPackage ../applications/blockchains/oxen {
+ boost = boost17x;
+ };
+
monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui {
boost = boost17x;
};
@@ -28799,7 +28848,9 @@ in
exult = callPackage ../games/exult { };
- fltrator = callPackage ../games/fltrator { };
+ fltrator = callPackage ../games/fltrator {
+ fltk = fltk-minimal;
+ };
factorio = callPackage ../games/factorio { releaseType = "alpha"; };
diff --git a/third_party/nixpkgs/pkgs/top-level/emacs-packages.nix b/third_party/nixpkgs/pkgs/top-level/emacs-packages.nix
index d168d34e37..34f9956160 100644
--- a/third_party/nixpkgs/pkgs/top-level/emacs-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/emacs-packages.nix
@@ -26,7 +26,7 @@
let
mkElpaPackages = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/elpa-packages.nix {
- inherit (pkgs) stdenv texinfo writeText;
+ inherit (pkgs) stdenv texinfo writeText gcc;
inherit lib;
};
@@ -44,7 +44,7 @@ let
};
emacsWithPackages = { pkgs, lib }: import ../build-support/emacs/wrapper.nix {
- inherit (pkgs) makeWrapper runCommand;
+ inherit (pkgs) makeWrapper runCommand gcc;
inherit (pkgs.xorg) lndir;
inherit lib;
};
diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix
index 31ef92e420..ebe7465fae 100644
--- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix
@@ -78,6 +78,8 @@ let
bitv = callPackage ../development/ocaml-modules/bitv { };
+ bls12-381 = callPackage ../development/ocaml-modules/bls12-381 { };
+
bolt = callPackage ../development/ocaml-modules/bolt { };
bos = callPackage ../development/ocaml-modules/bos { };
@@ -371,6 +373,8 @@ let
fdkaac = callPackage ../development/ocaml-modules/fdkaac { };
+ ff = callPackage ../development/ocaml-modules/ff { };
+
fiat-p256 = callPackage ../development/ocaml-modules/fiat-p256 { };
fieldslib_p4 = callPackage ../development/ocaml-modules/fieldslib { };
@@ -626,6 +630,8 @@ let
lwt-dllist = callPackage ../development/ocaml-modules/lwt-dllist { };
+ lwt-watcher = callPackage ../development/ocaml-modules/lwt-watcher { };
+
lwt_log = callPackage ../development/ocaml-modules/lwt_log { };
lwt_ppx = callPackage ../development/ocaml-modules/lwt/ppx.nix { };
@@ -1025,6 +1031,8 @@ let
inherit (pkgs) secp256k1;
};
+ secp256k1-internal = callPackage ../development/ocaml-modules/secp256k1-internal { };
+
seq = callPackage ../development/ocaml-modules/seq { };
sosa = callPackage ../development/ocaml-modules/sosa { };
@@ -1159,6 +1167,18 @@ let
reason-native = lib.recurseIntoAttrs (callPackage ../development/ocaml-modules/reason-native { });
+ ezresto = callPackage ../development/ocaml-modules/resto/ezresto.nix { };
+ ezresto-directory = callPackage ../development/ocaml-modules/resto/ezresto-directory.nix { };
+
+ resto = callPackage ../development/ocaml-modules/resto { };
+ resto-acl = callPackage ../development/ocaml-modules/resto/acl.nix { };
+ resto-cohttp = callPackage ../development/ocaml-modules/resto/cohttp.nix { };
+ resto-cohttp-client = callPackage ../development/ocaml-modules/resto/cohttp-client.nix { };
+ resto-cohttp-self-serving-client = callPackage ../development/ocaml-modules/resto/cohttp-self-serving-client.nix { };
+ resto-cohttp-server = callPackage ../development/ocaml-modules/resto/cohttp-server.nix { };
+ resto-directory = callPackage ../development/ocaml-modules/resto/directory.nix { };
+ resto-json = callPackage ../development/ocaml-modules/resto/json.nix { };
+
rope = callPackage ../development/ocaml-modules/rope { };
routes = callPackage ../development/ocaml-modules/routes { };
diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix
index 206f7cdb36..0ea1e6a456 100644
--- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix
@@ -4674,6 +4674,8 @@ in {
names = callPackage ../development/python-modules/names { };
+ nampa = callPackage ../development/python-modules/nampa { };
+
nanoleaf = callPackage ../development/python-modules/nanoleaf { };
nanomsg-python = callPackage ../development/python-modules/nanomsg-python {
@@ -4987,6 +4989,8 @@ in {
openshift = callPackage ../development/python-modules/openshift { };
+ opensimplex = callPackage ../development/python-modules/opensimplex { };
+
opentimestamps = callPackage ../development/python-modules/opentimestamps { };
opentracing = callPackage ../development/python-modules/opentracing { };
diff --git a/third_party/nixpkgs/pkgs/top-level/qt5-packages.nix b/third_party/nixpkgs/pkgs/top-level/qt5-packages.nix
index 60b4609479..4c3518436d 100644
--- a/third_party/nixpkgs/pkgs/top-level/qt5-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/qt5-packages.nix
@@ -80,12 +80,16 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeGear // qt5 // {
kde2-decoration = callPackage ../data/themes/kde2 { };
+ kcolorpicker = callPackage ../development/libraries/kcolorpicker { };
+
kdiagram = callPackage ../development/libraries/kdiagram { };
kdsoap = callPackage ../development/libraries/kdsoap { };
kf5gpgmepp = callPackage ../development/libraries/kf5gpgmepp { };
+ kimageannotator = callPackage ../development/libraries/kimageannotator { };
+
kproperty = callPackage ../development/libraries/kproperty { };
kpeoplevcard = callPackage ../development/libraries/kpeoplevcard { };