diff --git a/third_party/nixpkgs/doc/languages-frameworks/python.section.md b/third_party/nixpkgs/doc/languages-frameworks/python.section.md
index 4d70409a20..2639039657 100644
--- a/third_party/nixpkgs/doc/languages-frameworks/python.section.md
+++ b/third_party/nixpkgs/doc/languages-frameworks/python.section.md
@@ -834,6 +834,7 @@ sets are
* `pkgs.python38Packages`
* `pkgs.python39Packages`
* `pkgs.python310Packages`
+* `pkgs.python311Packages`
* `pkgs.pypyPackages`
and the aliases
diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix
index b6d058c593..4b33d3d10e 100644
--- a/third_party/nixpkgs/maintainers/maintainer-list.nix
+++ b/third_party/nixpkgs/maintainers/maintainer-list.nix
@@ -119,6 +119,12 @@
githubId = 241628;
name = "Adam Russell";
};
+ aadibajpai = {
+ email = "hello@aadibajpai.com";
+ github = "aadibajpai";
+ githubId = 27063113;
+ name = "Aadi Bajpai";
+ };
aanderse = {
email = "aaron@fosslib.net";
matrix = "@aanderse:nixos.dev";
diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
index ae6ff9d434..d5e3190bf2 100644
--- a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+++ b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
@@ -190,6 +190,14 @@
usage in non-X11 environments, e.g. Wayland.
+
+
+ The services.stubby module was converted to
+ a
+ settings-style
+ configuration.
+
+
diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2205.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2205.section.md
index 3e7f8d451b..98709455ae 100644
--- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -78,3 +78,5 @@ In addition to numerous new and upgraded packages, this release has the followin
added, decoupling the setting of `SSH_ASKPASS` from
`services.xserver.enable`. This allows easy usage in non-X11 environments,
e.g. Wayland.
+
+- The `services.stubby` module was converted to a [settings-style](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) configuration.
diff --git a/third_party/nixpkgs/nixos/modules/services/databases/mysql.nix b/third_party/nixpkgs/nixos/modules/services/databases/mysql.nix
index a9d9a6d805..625b31d081 100644
--- a/third_party/nixpkgs/nixos/modules/services/databases/mysql.nix
+++ b/third_party/nixpkgs/nixos/modules/services/databases/mysql.nix
@@ -11,10 +11,8 @@ let
mysqldOptions =
"--user=${cfg.user} --datadir=${cfg.dataDir} --basedir=${cfg.package}";
- settingsFile = pkgs.writeText "my.cnf" (
- generators.toINI { listsAsDuplicateKeys = true; } cfg.settings +
- optionalString (cfg.extraOptions != null) "[mysqld]\n${cfg.extraOptions}"
- );
+ format = pkgs.formats.ini { listsAsDuplicateKeys = true; };
+ configFile = format.generate "my.cnf" cfg.settings;
in
@@ -22,6 +20,9 @@ in
imports = [
(mkRemovedOptionModule [ "services" "mysql" "pidDir" ] "Don't wait for pidfiles, describe dependencies through systemd.")
(mkRemovedOptionModule [ "services" "mysql" "rootPassword" ] "Use socket authentication or set the password outside of the nix store.")
+ (mkRemovedOptionModule [ "services" "mysql" "extraOptions" ] "Use services.mysql.settings.mysqld instead.")
+ (mkRemovedOptionModule [ "services" "mysql" "bind" ] "Use services.mysql.settings.mysqld.bind-address instead.")
+ (mkRemovedOptionModule [ "services" "mysql" "port" ] "Use services.mysql.settings.mysqld.port instead.")
];
###### interface
@@ -40,41 +41,53 @@ in
";
};
- bind = mkOption {
- type = types.nullOr types.str;
- default = null;
- example = "0.0.0.0";
- description = "Address to bind to. The default is to bind to all addresses.";
- };
-
- port = mkOption {
- type = types.port;
- default = 3306;
- description = "Port of MySQL.";
- };
-
user = mkOption {
type = types.str;
default = "mysql";
- description = "User account under which MySQL runs.";
+ description = ''
+ User account under which MySQL runs.
+
+
+ If left as the default value this user will automatically be created
+ on system activation, otherwise you are responsible for
+ ensuring the user exists before the MySQL service starts.
+
+ '';
};
group = mkOption {
type = types.str;
default = "mysql";
- description = "Group under which MySQL runs.";
+ description = ''
+ Group account under which MySQL runs.
+
+
+ If left as the default value this group will automatically be created
+ on system activation, otherwise you are responsible for
+ ensuring the user exists before the MySQL service starts.
+
+ '';
};
dataDir = mkOption {
type = types.path;
example = "/var/lib/mysql";
- description = "Location where MySQL stores its table files.";
+ description = ''
+ The data directory for MySQL.
+
+
+ If left as the default value of /var/lib/mysql this directory will automatically be created before the MySQL
+ server starts, otherwise you are responsible for ensuring the directory exists with appropriate ownership and permissions.
+
+ '';
};
configFile = mkOption {
type = types.path;
- default = settingsFile;
- defaultText = literalExpression "settingsFile";
+ default = configFile;
+ defaultText = ''
+ A configuration file automatically generated by NixOS.
+ '';
description = ''
Override the configuration file used by MySQL. By default,
NixOS generates one automatically from .
@@ -92,7 +105,7 @@ in
};
settings = mkOption {
- type = with types; attrsOf (attrsOf (oneOf [ bool int str (listOf str) ]));
+ type = format.type;
default = {};
description = ''
MySQL configuration. Refer to
@@ -125,23 +138,6 @@ in
'';
};
- extraOptions = mkOption {
- type = with types; nullOr lines;
- default = null;
- example = ''
- key_buffer_size = 6G
- table_cache = 1600
- log-error = /var/log/mysql_err.log
- '';
- description = ''
- Provide extra options to the MySQL configuration file.
-
- Please note, that these options are added to the
- [mysqld] section so you don't need to explicitly
- state it again.
- '';
- };
-
initialDatabases = mkOption {
type = types.listOf (types.submodule {
options = {
@@ -287,7 +283,7 @@ in
};
masterPort = mkOption {
- type = types.int;
+ type = types.port;
default = 3306;
description = "Port number on which the MySQL master server runs.";
};
@@ -299,9 +295,7 @@ in
###### implementation
- config = mkIf config.services.mysql.enable {
-
- warnings = optional (cfg.extraOptions != null) "services.mysql.`extraOptions` is deprecated, please use services.mysql.`settings`.";
+ config = mkIf cfg.enable {
services.mysql.dataDir =
mkDefault (if versionAtLeast config.system.stateVersion "17.09" then "/var/lib/mysql"
@@ -310,8 +304,7 @@ in
services.mysql.settings.mysqld = mkMerge [
{
datadir = cfg.dataDir;
- bind-address = mkIf (cfg.bind != null) cfg.bind;
- port = cfg.port;
+ port = mkDefault 3306;
}
(mkIf (cfg.replication.role == "master" || cfg.replication.role == "slave") {
log-bin = "mysql-bin-${toString cfg.replication.serverId}";
@@ -341,156 +334,150 @@ in
environment.etc."my.cnf".source = cfg.configFile;
- systemd.tmpfiles.rules = [
- "d '${cfg.dataDir}' 0700 '${cfg.user}' '${cfg.group}' - -"
- "z '${cfg.dataDir}' 0700 '${cfg.user}' '${cfg.group}' - -"
- ];
+ systemd.services.mysql = {
+ description = "MySQL Server";
- systemd.services.mysql = let
- hasNotify = isMariaDB;
- in {
- description = "MySQL Server";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ restartTriggers = [ cfg.configFile ];
- after = [ "network.target" ];
- wantedBy = [ "multi-user.target" ];
- restartTriggers = [ cfg.configFile ];
+ unitConfig.RequiresMountsFor = cfg.dataDir;
- unitConfig.RequiresMountsFor = "${cfg.dataDir}";
+ path = [
+ # Needed for the mysql_install_db command in the preStart script
+ # which calls the hostname command.
+ pkgs.nettools
+ ];
- path = [
- # Needed for the mysql_install_db command in the preStart script
- # which calls the hostname command.
- pkgs.nettools
- ];
+ preStart = if isMariaDB then ''
+ if ! test -e ${cfg.dataDir}/mysql; then
+ ${cfg.package}/bin/mysql_install_db --defaults-file=/etc/my.cnf ${mysqldOptions}
+ touch ${cfg.dataDir}/mysql_init
+ fi
+ '' else ''
+ if ! test -e ${cfg.dataDir}/mysql; then
+ ${cfg.package}/bin/mysqld --defaults-file=/etc/my.cnf ${mysqldOptions} --initialize-insecure
+ touch ${cfg.dataDir}/mysql_init
+ fi
+ '';
- preStart = if isMariaDB then ''
- if ! test -e ${cfg.dataDir}/mysql; then
- ${cfg.package}/bin/mysql_install_db --defaults-file=/etc/my.cnf ${mysqldOptions}
- touch ${cfg.dataDir}/mysql_init
+ script = ''
+ # https://mariadb.com/kb/en/getting-started-with-mariadb-galera-cluster/#systemd-and-galera-recovery
+ if test -n "''${_WSREP_START_POSITION}"; then
+ if test -e "${cfg.package}/bin/galera_recovery"; then
+ VAR=$(cd ${cfg.package}/bin/..; ${cfg.package}/bin/galera_recovery); [[ $? -eq 0 ]] && export _WSREP_START_POSITION=$VAR || exit 1
fi
- '' else ''
- if ! test -e ${cfg.dataDir}/mysql; then
- ${cfg.package}/bin/mysqld --defaults-file=/etc/my.cnf ${mysqldOptions} --initialize-insecure
- touch ${cfg.dataDir}/mysql_init
- fi
- '';
+ fi
- script = ''
- # https://mariadb.com/kb/en/getting-started-with-mariadb-galera-cluster/#systemd-and-galera-recovery
- if test -n "''${_WSREP_START_POSITION}"; then
- if test -e "${cfg.package}/bin/galera_recovery"; then
- VAR=$(cd ${cfg.package}/bin/..; ${cfg.package}/bin/galera_recovery); [[ $? -eq 0 ]] && export _WSREP_START_POSITION=$VAR || exit 1
- fi
- fi
+ # The last two environment variables are used for starting Galera clusters
+ exec ${cfg.package}/bin/mysqld --defaults-file=/etc/my.cnf ${mysqldOptions} $_WSREP_NEW_CLUSTER $_WSREP_START_POSITION
+ '';
- # The last two environment variables are used for starting Galera clusters
- exec ${cfg.package}/bin/mysqld --defaults-file=/etc/my.cnf ${mysqldOptions} $_WSREP_NEW_CLUSTER $_WSREP_START_POSITION
- '';
+ postStart = let
+ # The super user account to use on *first* run of MySQL server
+ superUser = if isMariaDB then cfg.user else "root";
+ in ''
+ ${optionalString (!isMariaDB) ''
+ # Wait until the MySQL server is available for use
+ count=0
+ while [ ! -e /run/mysqld/mysqld.sock ]
+ do
+ if [ $count -eq 30 ]
+ then
+ echo "Tried 30 times, giving up..."
+ exit 1
+ fi
- postStart = let
- # The super user account to use on *first* run of MySQL server
- superUser = if isMariaDB then cfg.user else "root";
- in ''
- ${optionalString (!hasNotify) ''
- # Wait until the MySQL server is available for use
- count=0
- while [ ! -e /run/mysqld/mysqld.sock ]
- do
- if [ $count -eq 30 ]
- then
- echo "Tried 30 times, giving up..."
- exit 1
- fi
+ echo "MySQL daemon not yet started. Waiting for 1 second..."
+ count=$((count++))
+ sleep 1
+ done
+ ''}
- echo "MySQL daemon not yet started. Waiting for 1 second..."
- count=$((count++))
- sleep 1
- done
- ''}
+ if [ -f ${cfg.dataDir}/mysql_init ]
+ then
+ # While MariaDB comes with a 'mysql' super user account since 10.4.x, MySQL does not
+ # Since we don't want to run this service as 'root' we need to ensure the account exists on first run
+ ( echo "CREATE USER IF NOT EXISTS '${cfg.user}'@'localhost' IDENTIFIED WITH ${if isMariaDB then "unix_socket" else "auth_socket"};"
+ echo "GRANT ALL PRIVILEGES ON *.* TO '${cfg.user}'@'localhost' WITH GRANT OPTION;"
+ ) | ${cfg.package}/bin/mysql -u ${superUser} -N
- if [ -f ${cfg.dataDir}/mysql_init ]
- then
- # While MariaDB comes with a 'mysql' super user account since 10.4.x, MySQL does not
- # Since we don't want to run this service as 'root' we need to ensure the account exists on first run
- ( echo "CREATE USER IF NOT EXISTS '${cfg.user}'@'localhost' IDENTIFIED WITH ${if isMariaDB then "unix_socket" else "auth_socket"};"
- echo "GRANT ALL PRIVILEGES ON *.* TO '${cfg.user}'@'localhost' WITH GRANT OPTION;"
- ) | ${cfg.package}/bin/mysql -u ${superUser} -N
-
- ${concatMapStrings (database: ''
- # Create initial databases
- if ! test -e "${cfg.dataDir}/${database.name}"; then
- echo "Creating initial database: ${database.name}"
- ( echo 'create database `${database.name}`;'
-
- ${optionalString (database.schema != null) ''
- echo 'use `${database.name}`;'
-
- # TODO: this silently falls through if database.schema does not exist,
- # we should catch this somehow and exit, but can't do it here because we're in a subshell.
- if [ -f "${database.schema}" ]
- then
- cat ${database.schema}
- elif [ -d "${database.schema}" ]
- then
- cat ${database.schema}/mysql-databases/*.sql
- fi
- ''}
- ) | ${cfg.package}/bin/mysql -u ${superUser} -N
- fi
- '') cfg.initialDatabases}
-
- ${optionalString (cfg.replication.role == "master")
- ''
- # Set up the replication master
-
- ( echo "use mysql;"
- echo "CREATE USER '${cfg.replication.masterUser}'@'${cfg.replication.slaveHost}' IDENTIFIED WITH mysql_native_password;"
- echo "SET PASSWORD FOR '${cfg.replication.masterUser}'@'${cfg.replication.slaveHost}' = PASSWORD('${cfg.replication.masterPassword}');"
- echo "GRANT REPLICATION SLAVE ON *.* TO '${cfg.replication.masterUser}'@'${cfg.replication.slaveHost}';"
- ) | ${cfg.package}/bin/mysql -u ${superUser} -N
- ''}
-
- ${optionalString (cfg.replication.role == "slave")
- ''
- # Set up the replication slave
-
- ( echo "stop slave;"
- echo "change master to master_host='${cfg.replication.masterHost}', master_user='${cfg.replication.masterUser}', master_password='${cfg.replication.masterPassword}';"
- echo "start slave;"
- ) | ${cfg.package}/bin/mysql -u ${superUser} -N
- ''}
-
- ${optionalString (cfg.initialScript != null)
- ''
- # Execute initial script
- # using toString to avoid copying the file to nix store if given as path instead of string,
- # as it might contain credentials
- cat ${toString cfg.initialScript} | ${cfg.package}/bin/mysql -u ${superUser} -N
- ''}
-
- rm ${cfg.dataDir}/mysql_init
- fi
-
- ${optionalString (cfg.ensureDatabases != []) ''
- (
${concatMapStrings (database: ''
- echo "CREATE DATABASE IF NOT EXISTS \`${database}\`;"
- '') cfg.ensureDatabases}
+ # Create initial databases
+ if ! test -e "${cfg.dataDir}/${database.name}"; then
+ echo "Creating initial database: ${database.name}"
+ ( echo 'create database `${database.name}`;'
+
+ ${optionalString (database.schema != null) ''
+ echo 'use `${database.name}`;'
+
+ # TODO: this silently falls through if database.schema does not exist,
+ # we should catch this somehow and exit, but can't do it here because we're in a subshell.
+ if [ -f "${database.schema}" ]
+ then
+ cat ${database.schema}
+ elif [ -d "${database.schema}" ]
+ then
+ cat ${database.schema}/mysql-databases/*.sql
+ fi
+ ''}
+ ) | ${cfg.package}/bin/mysql -u ${superUser} -N
+ fi
+ '') cfg.initialDatabases}
+
+ ${optionalString (cfg.replication.role == "master")
+ ''
+ # Set up the replication master
+
+ ( echo "use mysql;"
+ echo "CREATE USER '${cfg.replication.masterUser}'@'${cfg.replication.slaveHost}' IDENTIFIED WITH mysql_native_password;"
+ echo "SET PASSWORD FOR '${cfg.replication.masterUser}'@'${cfg.replication.slaveHost}' = PASSWORD('${cfg.replication.masterPassword}');"
+ echo "GRANT REPLICATION SLAVE ON *.* TO '${cfg.replication.masterUser}'@'${cfg.replication.slaveHost}';"
+ ) | ${cfg.package}/bin/mysql -u ${superUser} -N
+ ''}
+
+ ${optionalString (cfg.replication.role == "slave")
+ ''
+ # Set up the replication slave
+
+ ( echo "stop slave;"
+ echo "change master to master_host='${cfg.replication.masterHost}', master_user='${cfg.replication.masterUser}', master_password='${cfg.replication.masterPassword}';"
+ echo "start slave;"
+ ) | ${cfg.package}/bin/mysql -u ${superUser} -N
+ ''}
+
+ ${optionalString (cfg.initialScript != null)
+ ''
+ # Execute initial script
+ # using toString to avoid copying the file to nix store if given as path instead of string,
+ # as it might contain credentials
+ cat ${toString cfg.initialScript} | ${cfg.package}/bin/mysql -u ${superUser} -N
+ ''}
+
+ rm ${cfg.dataDir}/mysql_init
+ fi
+
+ ${optionalString (cfg.ensureDatabases != []) ''
+ (
+ ${concatMapStrings (database: ''
+ echo "CREATE DATABASE IF NOT EXISTS \`${database}\`;"
+ '') cfg.ensureDatabases}
+ ) | ${cfg.package}/bin/mysql -N
+ ''}
+
+ ${concatMapStrings (user:
+ ''
+ ( echo "CREATE USER IF NOT EXISTS '${user.name}'@'localhost' IDENTIFIED WITH ${if isMariaDB then "unix_socket" else "auth_socket"};"
+ ${concatStringsSep "\n" (mapAttrsToList (database: permission: ''
+ echo "GRANT ${permission} ON ${database} TO '${user.name}'@'localhost';"
+ '') user.ensurePermissions)}
) | ${cfg.package}/bin/mysql -N
- ''}
+ '') cfg.ensureUsers}
+ '';
- ${concatMapStrings (user:
- ''
- ( echo "CREATE USER IF NOT EXISTS '${user.name}'@'localhost' IDENTIFIED WITH ${if isMariaDB then "unix_socket" else "auth_socket"};"
- ${concatStringsSep "\n" (mapAttrsToList (database: permission: ''
- echo "GRANT ${permission} ON ${database} TO '${user.name}'@'localhost';"
- '') user.ensurePermissions)}
- ) | ${cfg.package}/bin/mysql -N
- '') cfg.ensureUsers}
- '';
-
- serviceConfig = {
- Type = if hasNotify then "notify" else "simple";
+ serviceConfig = mkMerge [
+ {
+ Type = if isMariaDB then "notify" else "simple";
Restart = "on-abort";
RestartSec = "5s";
@@ -523,9 +510,12 @@ in
PrivateMounts = true;
# System Call Filtering
SystemCallArchitectures = "native";
- };
- };
-
+ }
+ (mkIf (cfg.dataDir == "/var/lib/mysql") {
+ StateDirectory = "mysql";
+ StateDirectoryMode = "0700";
+ })
+ ];
+ };
};
-
}
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/stubby.nix b/third_party/nixpkgs/nixos/modules/services/networking/stubby.nix
index c5e0f929a1..78c13798dd 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/stubby.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/stubby.nix
@@ -1,180 +1,51 @@
-{ config, lib, pkgs, ...}:
+{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.stubby;
+ settingsFormat = pkgs.formats.yaml { };
+ confFile = settingsFormat.generate "stubby.yml" cfg.settings;
+in {
+ imports = map (x:
+ (mkRemovedOptionModule [ "services" "stubby" x ]
+ "Stubby configuration moved to services.stubby.settings.")) [
+ "authenticationMode"
+ "fallbackProtocols"
+ "idleTimeout"
+ "listenAddresses"
+ "queryPaddingBlocksize"
+ "roundRobinUpstreams"
+ "subnetPrivate"
+ "upstreamServers"
+ ];
- fallbacks = concatMapStringsSep "\n " (x: "- ${x}") cfg.fallbackProtocols;
- listeners = concatMapStringsSep "\n " (x: "- ${x}") cfg.listenAddresses;
-
- # By default, the recursive resolvers maintained by the getdns
- # project itself are enabled. More information about both getdns's servers,
- # as well as third party options for upstream resolvers, can be found here:
- # https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Test+Servers
- #
- # You can override these values by supplying a yaml-formatted array of your
- # preferred upstream resolvers in the following format:
- #
- # 106 # - address_data: IPv4 or IPv6 address of the upstream
- # port: Port for UDP/TCP (default is 53)
- # tls_auth_name: Authentication domain name checked against the server
- # certificate
- # tls_pubkey_pinset: An SPKI pinset verified against the keys in the server
- # certificate
- # - digest: Only "sha256" is currently supported
- # value: Base64 encoded value of the sha256 fingerprint of the public
- # key
- # tls_port: Port for TLS (default is 853)
-
- defaultUpstream = ''
- - address_data: 145.100.185.15
- tls_auth_name: "dnsovertls.sinodun.com"
- tls_pubkey_pinset:
- - digest: "sha256"
- value: 62lKu9HsDVbyiPenApnc4sfmSYTHOVfFgL3pyB+cBL4=
- - address_data: 145.100.185.16
- tls_auth_name: "dnsovertls1.sinodun.com"
- tls_pubkey_pinset:
- - digest: "sha256"
- value: cE2ecALeE5B+urJhDrJlVFmf38cJLAvqekONvjvpqUA=
- - address_data: 185.49.141.37
- tls_auth_name: "getdnsapi.net"
- tls_pubkey_pinset:
- - digest: "sha256"
- value: foxZRnIh9gZpWnl+zEiKa0EJ2rdCGroMWm02gaxSc9Q=
- - address_data: 2001:610:1:40ba:145:100:185:15
- tls_auth_name: "dnsovertls.sinodun.com"
- tls_pubkey_pinset:
- - digest: "sha256"
- value: 62lKu9HsDVbyiPenApnc4sfmSYTHOVfFgL3pyB+cBL4=
- - address_data: 2001:610:1:40ba:145:100:185:16
- tls_auth_name: "dnsovertls1.sinodun.com"
- tls_pubkey_pinset:
- - digest: "sha256"
- value: cE2ecALeE5B+urJhDrJlVFmf38cJLAvqekONvjvpqUA=
- - address_data: 2a04:b900:0:100::38
- tls_auth_name: "getdnsapi.net"
- tls_pubkey_pinset:
- - digest: "sha256"
- value: foxZRnIh9gZpWnl+zEiKa0EJ2rdCGroMWm02gaxSc9Q=
- '';
-
- # Resolution type is not changeable here because it is required per the
- # stubby documentation:
- #
- # "resolution_type: Work in stub mode only (not recursive mode) - required for Stubby
- # operation."
- #
- # https://dnsprivacy.org/wiki/display/DP/Configuring+Stubby
-
- confFile = pkgs.writeText "stubby.yml" ''
- resolution_type: GETDNS_RESOLUTION_STUB
- dns_transport_list:
- ${fallbacks}
- appdata_dir: "/var/cache/stubby"
- tls_authentication: ${cfg.authenticationMode}
- tls_query_padding_blocksize: ${toString cfg.queryPaddingBlocksize}
- edns_client_subnet_private: ${if cfg.subnetPrivate then "1" else "0"}
- idle_timeout: ${toString cfg.idleTimeout}
- listen_addresses:
- ${listeners}
- round_robin_upstreams: ${if cfg.roundRobinUpstreams then "1" else "0"}
- ${cfg.extraConfig}
- upstream_recursive_servers:
- ${cfg.upstreamServers}
- '';
-in
-
-{
options = {
services.stubby = {
enable = mkEnableOption "Stubby DNS resolver";
- fallbackProtocols = mkOption {
- default = [ "GETDNS_TRANSPORT_TLS" ];
- type = with types; listOf (enum [
- "GETDNS_TRANSPORT_TLS"
- "GETDNS_TRANSPORT_TCP"
- "GETDNS_TRANSPORT_UDP"
- ]);
- description = ''
- Ordered list composed of one or more transport protocols.
- Strict mode should only use GETDNS_TRANSPORT_TLS.
- Other options are GETDNS_TRANSPORT_UDP and
- GETDNS_TRANSPORT_TCP.
+ settings = mkOption {
+ type = types.attrsOf settingsFormat.type;
+ example = lib.literalExpression ''
+ pkgs.stubby.passthru.settingsExample // {
+ upstream_recursive_servers = [{
+ address_data = "158.64.1.29";
+ tls_auth_name = "kaitain.restena.lu";
+ tls_pubkey_pinset = [{
+ digest = "sha256";
+ value = "7ftvIkA+UeN/ktVkovd/7rPZ6mbkhVI7/8HnFJIiLa4=";
+ }];
+ }];
+ };
'';
- };
-
- authenticationMode = mkOption {
- default = "GETDNS_AUTHENTICATION_REQUIRED";
- type = types.enum [
- "GETDNS_AUTHENTICATION_REQUIRED"
- "GETDNS_AUTHENTICATION_NONE"
- ];
description = ''
- Selects the Strict or Opportunistic usage profile.
- For strict, set to GETDNS_AUTHENTICATION_REQUIRED.
- for opportunistic, use GETDNS_AUTHENTICATION_NONE.
- '';
- };
-
- queryPaddingBlocksize = mkOption {
- default = 128;
- type = types.int;
- description = ''
- EDNS0 option to pad the size of the DNS query to the given blocksize.
- '';
- };
-
- subnetPrivate = mkOption {
- default = true;
- type = types.bool;
- description = ''
- EDNS0 option for ECS client privacy. Default is
- true. If set, this option prevents the client
- subnet from being sent to authoritative nameservers.
- '';
- };
-
- idleTimeout = mkOption {
- default = 10000;
- type = types.int;
- description = "EDNS0 option for keepalive idle timeout expressed in
- milliseconds.";
- };
-
- listenAddresses = mkOption {
- default = [ "127.0.0.1" "0::1" ];
- type = with types; listOf str;
- description = ''
- Sets the listen address for the stubby daemon.
- Uses port 53 by default.
- Ise IP@port to specify a different port.
- '';
- };
-
- roundRobinUpstreams = mkOption {
- default = true;
- type = types.bool;
- description = ''
- Instructs stubby to distribute queries across all available name
- servers. Default is true. Set to
- false in order to use the first available.
- '';
- };
-
- upstreamServers = mkOption {
- default = defaultUpstream;
- type = types.lines;
- description = ''
- Replace default upstreams. See stubby
- 1 for an
- example of the entry formatting. In Strict mode, at least one of the
- following settings must be supplied for each nameserver:
- tls_auth_name or
- tls_pubkey_pinset.
+ Content of the Stubby configuration file. All Stubby settings may be set or queried
+ here. The default settings are available at
+ pkgs.stubby.passthru.settingsExample. See
+ .
+ A list of the public recursive servers can be found here:
+ .
'';
};
@@ -184,20 +55,21 @@ in
description = "Enable or disable debug level logging.";
};
- extraConfig = mkOption {
- default = "";
- type = types.lines;
- description = ''
- Add additional configuration options. see
- stubby1
- for more options.
- '';
- };
};
};
config = mkIf cfg.enable {
- environment.systemPackages = [ pkgs.stubby ];
+ assertions = [{
+ assertion =
+ (cfg.settings.resolution_type or "") == "GETDNS_RESOLUTION_STUB";
+ message = ''
+ services.stubby.settings.resolution_type must be set to "GETDNS_RESOLUTION_STUB".
+ Is services.stubby.settings unset?
+ '';
+ }];
+
+ services.stubby.settings.appdata_dir = "/var/cache/stubby";
+
systemd.services.stubby = {
description = "Stubby local DNS resolver";
after = [ "network.target" ];
diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/caddy/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/caddy/default.nix
index ed27dd375c..d51effa31c 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-servers/caddy/default.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-servers/caddy/default.nix
@@ -4,159 +4,81 @@ with lib;
let
cfg = config.services.caddy;
- vhostToConfig = vhostName: vhostAttrs: ''
- ${vhostName} ${builtins.concatStringsSep " " vhostAttrs.serverAliases} {
- ${vhostAttrs.extraConfig}
- }
- '';
- configFile = pkgs.writeText "Caddyfile" (builtins.concatStringsSep "\n"
- ([ cfg.config ] ++ (mapAttrsToList vhostToConfig cfg.virtualHosts)));
- formattedConfig = pkgs.runCommand "formattedCaddyFile" { } ''
- ${cfg.package}/bin/caddy fmt ${configFile} > $out
- '';
+ virtualHosts = attrValues cfg.virtualHosts;
+ acmeVHosts = filter (hostOpts: hostOpts.useACMEHost != null) virtualHosts;
- tlsConfig = {
- apps.tls.automation.policies = [{
- issuers = [{
- inherit (cfg) ca email;
- module = "acme";
- }];
- }];
- };
-
- adaptedConfig = pkgs.runCommand "caddy-config-adapted.json" { } ''
- ${cfg.package}/bin/caddy adapt \
- --config ${formattedConfig} --adapter ${cfg.adapter} > $out
- '';
- tlsJSON = pkgs.writeText "tls.json" (builtins.toJSON tlsConfig);
-
- # merge the TLS config options we expose with the ones originating in the Caddyfile
- configJSON =
- if cfg.ca != null then
- let tlsConfigMerge = ''
- {"apps":
- {"tls":
- {"automation":
- {"policies":
- (if .[0].apps.tls.automation.policies == .[1]?.apps.tls.automation.policies
- then .[0].apps.tls.automation.policies
- else (.[0].apps.tls.automation.policies + .[1]?.apps.tls.automation.policies)
- end)
- }
- }
- }
- }'';
- in
- pkgs.runCommand "caddy-config.json" { } ''
- ${pkgs.jq}/bin/jq -s '.[0] * ${tlsConfigMerge}' ${adaptedConfig} ${tlsJSON} > $out
+ mkVHostConf = hostOpts:
+ let
+ sslCertDir = config.security.acme.certs.${hostOpts.useACMEHost}.directory;
+ in
''
- else
- adaptedConfig;
+ ${hostOpts.hostName} ${concatStringsSep " " hostOpts.serverAliases} {
+ bind ${concatStringsSep " " hostOpts.listenAddresses}
+ ${optionalString (hostOpts.useACMEHost != null) "tls ${sslCertDir}/cert.pem ${sslCertDir}/key.pem"}
+ log {
+ ${hostOpts.logFormat}
+ }
+
+ ${hostOpts.extraConfig}
+ }
+ '';
+
+ configFile =
+ let
+ Caddyfile = pkgs.writeText "Caddyfile" ''
+ {
+ ${optionalString (cfg.email != null) "email ${cfg.email}"}
+ ${optionalString (cfg.acmeCA != null) "acme_ca ${cfg.acmeCA}"}
+ log {
+ ${cfg.logFormat}
+ }
+ }
+ ${cfg.extraConfig}
+ '';
+
+ Caddyfile-formatted = pkgs.runCommand "Caddyfile-formatted" { nativeBuildInputs = [ cfg.package ]; } ''
+ ${cfg.package}/bin/caddy fmt ${Caddyfile} > $out
+ '';
+ in
+ if pkgs.stdenv.buildPlatform == pkgs.stdenv.hostPlatform then Caddyfile-formatted else Caddyfile;
in
{
imports = [
(mkRemovedOptionModule [ "services" "caddy" "agree" ] "this option is no longer necessary for Caddy 2")
+ (mkRenamedOptionModule [ "services" "caddy" "ca" ] [ "services" "caddy" "acmeCA" ])
+ (mkRenamedOptionModule [ "services" "caddy" "config" ] [ "services" "caddy" "extraConfig" ])
];
+ # interface
options.services.caddy = {
enable = mkEnableOption "Caddy web server";
- config = mkOption {
- default = "";
- example = ''
- example.com {
- encode gzip
- log
- root /srv/http
- }
- '';
- type = types.lines;
- description = ''
- Verbatim Caddyfile to use.
- Caddy v2 supports multiple config formats via adapters (see ).
- '';
- };
-
- virtualHosts = mkOption {
- type = types.attrsOf (types.submodule (import ./vhost-options.nix {
- inherit config lib;
- }));
- default = { };
- example = literalExpression ''
- {
- "hydra.example.com" = {
- serverAliases = [ "www.hydra.example.com" ];
- extraConfig = ''''''
- encode gzip
- log
- root /srv/http
- '''''';
- };
- };
- '';
- description = "Declarative vhost config";
- };
-
-
user = mkOption {
default = "caddy";
type = types.str;
- description = "User account under which caddy runs.";
+ description = ''
+ User account under which caddy runs.
+
+
+ If left as the default value this user will automatically be created
+ on system activation, otherwise you are responsible for
+ ensuring the user exists before the Caddy service starts.
+
+ '';
};
group = mkOption {
default = "caddy";
type = types.str;
- description = "Group account under which caddy runs.";
- };
-
- adapter = mkOption {
- default = "caddyfile";
- example = "nginx";
- type = types.str;
description = ''
- Name of the config adapter to use.
- See https://caddyserver.com/docs/config-adapters for the full list.
- '';
- };
+ Group account under which caddy runs.
- resume = mkOption {
- default = false;
- type = types.bool;
- description = ''
- Use saved config, if any (and prefer over configuration passed with ).
- '';
- };
-
- ca = mkOption {
- default = "https://acme-v02.api.letsencrypt.org/directory";
- example = "https://acme-staging-v02.api.letsencrypt.org/directory";
- type = types.nullOr types.str;
- description = ''
- Certificate authority ACME server. The default (Let's Encrypt
- production server) should be fine for most people. Set it to null if
- you don't want to include any authority (or if you want to write a more
- fine-graned configuration manually)
- '';
- };
-
- email = mkOption {
- default = "";
- type = types.str;
- description = "Email address (for Let's Encrypt certificate)";
- };
-
- dataDir = mkOption {
- default = "/var/lib/caddy";
- type = types.path;
- description = ''
- The data directory, for storing certificates. Before 17.09, this
- would create a .caddy directory. With 17.09 the contents of the
- .caddy directory are in the specified data directory instead.
-
- Caddy v2 replaced CADDYPATH with XDG directories.
- See https://caddyserver.com/docs/conventions#file-locations.
+
+ If left as the default value this user will automatically be created
+ on system activation, otherwise you are responsible for
+ ensuring the user exists before the Caddy service starts.
+
'';
};
@@ -168,11 +90,176 @@ in
Caddy package to use.
'';
};
+
+ dataDir = mkOption {
+ type = types.path;
+ default = "/var/lib/caddy";
+ description = ''
+ The data directory for caddy.
+
+
+
+ If left as the default value this directory will automatically be created
+ before the Caddy server starts, otherwise you are responsible for ensuring
+ the directory exists with appropriate ownership and permissions.
+
+
+ Caddy v2 replaced CADDYPATH with XDG directories.
+ See .
+
+
+ '';
+ };
+
+ logDir = mkOption {
+ type = types.path;
+ default = "/var/log/caddy";
+ description = ''
+ Directory for storing Caddy access logs.
+
+
+ If left as the default value this directory will automatically be created
+ before the Caddy server starts, otherwise the sysadmin is responsible for
+ ensuring the directory exists with appropriate ownership and permissions.
+
+ '';
+ };
+
+ logFormat = mkOption {
+ type = types.lines;
+ default = ''
+ level ERROR
+ '';
+ example = literalExpression ''
+ mkForce "level INFO";
+ '';
+ description = ''
+ Configuration for the default logger. See
+
+ for details.
+ '';
+ };
+
+ configFile = mkOption {
+ type = types.path;
+ default = configFile;
+ defaultText = "A Caddyfile automatically generated by values from services.caddy.*";
+ example = literalExpression ''
+ pkgs.writeText "Caddyfile" '''
+ example.com
+
+ root * /var/www/wordpress
+ php_fastcgi unix//run/php/php-version-fpm.sock
+ file_server
+ ''';
+ '';
+ description = ''
+ Override the configuration file used by Caddy. By default,
+ NixOS generates one automatically.
+ '';
+ };
+
+ adapter = mkOption {
+ default = "caddyfile";
+ example = "nginx";
+ type = types.str;
+ description = ''
+ Name of the config adapter to use.
+ See
+ for the full list.
+
+
+ Any value other than caddyfile is only valid when
+ providing your own .
+
+ '';
+ };
+
+ resume = mkOption {
+ default = false;
+ type = types.bool;
+ description = ''
+ Use saved config, if any (and prefer over any specified configuration passed with --config).
+ '';
+ };
+
+ extraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ example = ''
+ example.com {
+ encode gzip
+ log
+ root /srv/http
+ }
+ '';
+ description = ''
+ Additional lines of configuration appended to the automatically
+ generated Caddyfile.
+ '';
+ };
+
+ virtualHosts = mkOption {
+ type = with types; attrsOf (submodule (import ./vhost-options.nix { inherit cfg; }));
+ default = {};
+ example = literalExpression ''
+ {
+ "hydra.example.com" = {
+ serverAliases = [ "www.hydra.example.com" ];
+ extraConfig = '''
+ encode gzip
+ root /srv/http
+ ''';
+ };
+ };
+ '';
+ description = ''
+ Declarative specification of virtual hosts served by Caddy.
+ '';
+ };
+
+ acmeCA = mkOption {
+ default = "https://acme-v02.api.letsencrypt.org/directory";
+ example = "https://acme-staging-v02.api.letsencrypt.org/directory";
+ type = with types; nullOr str;
+ description = ''
+ The URL to the ACME CA's directory. It is strongly recommended to set
+ this to Let's Encrypt's staging endpoint for testing or development.
+
+ Set it to null if you want to write a more
+ fine-grained configuration manually.
+ '';
+ };
+
+ email = mkOption {
+ default = null;
+ type = with types; nullOr str;
+ description = ''
+ Your email address. Mainly used when creating an ACME account with your
+ CA, and is highly recommended in case there are problems with your
+ certificates.
+ '';
+ };
+
};
+ # implementation
config = mkIf cfg.enable {
+
+ assertions = [
+ { assertion = cfg.adapter != "caddyfile" -> cfg.configFile != configFile;
+ message = "Any value other than 'caddyfile' is only valid when providing your own `services.caddy.configFile`";
+ }
+ ];
+
+ services.caddy.extraConfig = concatMapStringsSep "\n" mkVHostConf virtualHosts;
+
systemd.packages = [ cfg.package ];
systemd.services.caddy = {
+ wants = map (hostOpts: "acme-finished-${hostOpts.useACMEHost}.target") acmeVHosts;
+ after = map (hostOpts: "acme-selfsigned-${hostOpts.useACMEHost}.service") acmeVHosts;
+ before = map (hostOpts: "acme-${hostOpts.useACMEHost}.service") acmeVHosts;
+
wantedBy = [ "multi-user.target" ];
startLimitIntervalSec = 14400;
startLimitBurst = 10;
@@ -180,13 +267,17 @@ in
serviceConfig = {
# https://www.freedesktop.org/software/systemd/man/systemd.service.html#ExecStart=
# If the empty string is assigned to this option, the list of commands to start is reset, prior assignments of this option will have no effect.
- ExecStart = [ "" "${cfg.package}/bin/caddy run ${optionalString cfg.resume "--resume"} --config ${configJSON}" ];
- ExecReload = [ "" "${cfg.package}/bin/caddy reload --config ${configJSON}" ];
+ ExecStart = [ "" "${cfg.package}/bin/caddy run --config ${cfg.configFile} --adapter ${cfg.adapter} ${optionalString cfg.resume "--resume"}" ];
+ ExecReload = [ "" "${cfg.package}/bin/caddy reload --config ${cfg.configFile} --adapter ${cfg.adapter}" ];
+ ExecStartPre = "${cfg.package}/bin/caddy validate --config ${cfg.configFile} --adapter ${cfg.adapter}";
User = cfg.user;
Group = cfg.group;
ReadWriteDirectories = cfg.dataDir;
+ StateDirectory = mkIf (cfg.dataDir == "/var/lib/caddy") [ "caddy" ];
+ LogsDirectory = mkIf (cfg.logDir == "/var/log/caddy") [ "caddy" ];
Restart = "on-abnormal";
+ SupplementaryGroups = mkIf (length acmeVHosts != 0) [ "acme" ];
# TODO: attempt to upstream these options
NoNewPrivileges = true;
@@ -200,7 +291,6 @@ in
group = cfg.group;
uid = config.ids.uids.caddy;
home = cfg.dataDir;
- createHome = true;
};
};
@@ -208,5 +298,12 @@ in
caddy.gid = config.ids.gids.caddy;
};
+ security.acme.certs =
+ let
+ eachACMEHost = unique (catAttrs "useACMEHost" acmeVHosts);
+ reloads = map (useACMEHost: nameValuePair useACMEHost { reloadServices = [ "caddy.service" ]; }) eachACMEHost;
+ in
+ listToAttrs reloads;
+
};
}
diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/caddy/vhost-options.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/caddy/vhost-options.nix
index 1f74295fc9..f240ec605c 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-servers/caddy/vhost-options.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-servers/caddy/vhost-options.nix
@@ -1,15 +1,19 @@
-# This file defines the options that can be used both for the Nginx
-# main server configuration, and for the virtual hosts. (The latter
-# has additional options that affect the web server as a whole, like
-# the user/group to run under.)
-
-{ lib, ... }:
-
-with lib;
+{ cfg }:
+{ config, lib, name, ... }:
+let
+ inherit (lib) literalExpression mkOption types;
+in
{
options = {
+
+ hostName = mkOption {
+ type = types.str;
+ default = name;
+ description = "Canonical hostname for the server.";
+ };
+
serverAliases = mkOption {
- type = types.listOf types.str;
+ type = with types; listOf str;
default = [ ];
example = [ "www.example.org" "example.org" ];
description = ''
@@ -17,12 +21,59 @@ with lib;
'';
};
+ listenAddresses = mkOption {
+ type = with types; listOf str;
+ description = ''
+ A list of host interfaces to bind to for this virtual host.
+ '';
+ default = [ ];
+ example = [ "127.0.0.1" "::1" ];
+ };
+
+ useACMEHost = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = ''
+ A host of an existing Let's Encrypt certificate to use.
+ This is mostly useful if you use DNS challenges but Caddy does not
+ currently support your provider.
+
+ Note that this option does not create any certificates, nor
+ does it add subdomains to existing ones – you will need to create them
+ manually using . Additionally,
+ you should probably add the caddy user to the
+ acme group to grant access to the certificates.
+ '';
+ };
+
+ logFormat = mkOption {
+ type = types.lines;
+ default = ''
+ output file ${cfg.logDir}/access-${config.hostName}.log
+ '';
+ defaultText = ''
+ output file ''${config.services.caddy.logDir}/access-''${hostName}.log
+ '';
+ example = literalExpression ''
+ mkForce '''
+ output discard
+ ''';
+ '';
+ description = ''
+ Configuration for HTTP request logging (also known as access logs). See
+
+ for details.
+ '';
+ };
+
extraConfig = mkOption {
type = types.lines;
default = "";
description = ''
- These lines go into the vhost verbatim
+ Additional lines of configuration appended to this virtual host in the
+ automatically generated Caddyfile.
'';
};
+
};
}
diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/kubevirt.nix b/third_party/nixpkgs/nixos/modules/virtualisation/kubevirt.nix
new file mode 100644
index 0000000000..408822b6af
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/virtualisation/kubevirt.nix
@@ -0,0 +1,30 @@
+{ config, lib, pkgs, ... }:
+
+{
+ imports = [
+ ../profiles/qemu-guest.nix
+ ];
+
+ config = {
+ fileSystems."/" = {
+ device = "/dev/disk/by-label/nixos";
+ fsType = "ext4";
+ autoResize = true;
+ };
+
+ boot.growPartition = true;
+ boot.kernelParams = [ "console=ttyS0" ];
+ boot.loader.grub.device = "/dev/vda";
+ boot.loader.timeout = 0;
+
+ services.qemuGuest.enable = true;
+ services.openssh.enable = true;
+ services.cloud-init.enable = true;
+ systemd.services."serial-getty@ttyS0".enable = true;
+
+ system.build.kubevirtImage = import ../../lib/make-disk-image.nix {
+ inherit lib config pkgs;
+ format = "qcow2";
+ };
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix b/third_party/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix
index 2bf47786ef..f6f3237d6f 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "lsp-plugins";
- version = "1.1.30";
+ version = "1.1.31";
src = fetchFromGitHub {
owner = "sadko4u";
repo = pname;
rev = version;
- sha256 = "0g0nx05dyjwz2149v3pj6sa9divr26jyqvg2kk1qk48s2n4najkz";
+ sha256 = "sha256-P1woSkenSlVUwWr3q0sNv8K2fVtTa6zWwKfSHQgg9Xw=";
};
nativeBuildInputs = [ pkg-config php makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ocenaudio/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ocenaudio/default.nix
index 25371302df..30011b2be3 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/ocenaudio/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/ocenaudio/default.nix
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "ocenaudio";
- version = "3.11.1";
+ version = "3.11.2";
src = fetchurl {
url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}";
- sha256 = "sha256-m8sKu2QuEyCWQ975vDfLVWKgU7ydEp5/vRYRO3z1yio=";
+ sha256 = "sha256-kvmBOw8fQZSC1jC8FRVq4v+i7mM6ol2IrDTqfJtuZYc=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/alfis/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/alfis/default.nix
index ee64b7907a..2c8526c629 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/alfis/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/alfis/default.nix
@@ -14,16 +14,16 @@
rustPlatform.buildRustPackage rec {
pname = "alfis";
- version = "0.6.9";
+ version = "0.6.10";
src = fetchFromGitHub {
owner = "Revertron";
repo = "Alfis";
rev = "v${version}";
- sha256 = "1nnzy46hp1q9kcxzjx24d60frjhn3x46nksbqvdfcfrfn5pqrabh";
+ sha256 = "sha256-JJTU3wZ3cG5TmgHYShWJaNAZBA4z3qZXPfb7WUX6/80=";
};
- cargoSha256 = "02liz8sqnqla77bqxfa8hj93qfj2x482q2bijz66rmazfig3b045";
+ cargoSha256 = "sha256-BsFe1Fp+Q5Gqa1w4xov0tVLDKV7S+6b5fKBl09ggLB0=";
checkFlags = [
# these want internet access, disable them
diff --git a/third_party/nixpkgs/pkgs/applications/editors/deadpixi-sam/default.nix b/third_party/nixpkgs/pkgs/applications/editors/deadpixi-sam/default.nix
index 463865d26b..e17fb402ed 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/deadpixi-sam/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/deadpixi-sam/default.nix
@@ -1,20 +1,20 @@
{ lib, stdenv, fetchFromGitHub, freetype, libX11, libXi, libXt, libXft }:
stdenv.mkDerivation rec {
- version = "2017-10-27";
pname = "deadpixi-sam-unstable";
+ version = "2020-07-14";
src = fetchFromGitHub {
owner = "deadpixi";
repo = "sam";
- rev = "51693780fb1457913389db6634163998f9b775b8";
- sha256 = "0nfkj93j4bgli4ixbk041nwi14rabk04kqg8krq4mj0044m1qywr";
+ rev = "5d8acb35d78c327d76f00a54857cbd566ed9bc11";
+ sha256 = "sha256-+vRh6nDPc3UnmEdqROHRel5Te0h5m4eiaERs492xciQ=";
};
postPatch = ''
substituteInPlace config.mk.def \
--replace "/usr/include/freetype2" "${freetype.dev}/include/freetype2" \
- --replace "CC=gcc" ""
+ --replace "CC=gcc" "CC=${stdenv.cc.targetPrefix}cc"
'';
CFLAGS = "-D_DARWIN_C_SOURCE";
@@ -27,10 +27,10 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
- inherit (src.meta) homepage;
+ homepage = "https://github.com/deadpixi/sam";
description = "Updated version of the sam text editor";
- license = with licenses; lpl-102;
+ license = licenses.lpl-102;
maintainers = with maintainers; [ ramkromberg ];
- platforms = with platforms; unix;
+ platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix
index 5c129fa3f3..3a4fc329de 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix
@@ -247,12 +247,12 @@ in
clion = buildClion rec {
name = "clion-${version}";
- version = "2021.3"; /* updated by script */
+ version = "2021.3.1"; /* updated by script */
description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
- sha256 = "0rvq0k99c4kniw2k0a8m2hq27v9nvn7qg6yg9dwxlmadsrx6as29"; /* updated by script */
+ sha256 = "0nf1r02i51pplrazlyavc6xs6mi91spa92srfqpsgb78ar9vn027"; /* updated by script */
};
wmClass = "jetbrains-clion";
update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
@@ -260,12 +260,12 @@ in
datagrip = buildDataGrip rec {
name = "datagrip-${version}";
- version = "2021.3.1"; /* updated by script */
+ version = "2021.3.2"; /* updated by script */
description = "Your Swiss Army Knife for Databases and SQL";
license = lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
- sha256 = "18drbddcjbbv6q6j95wy7ila8d7imi0gh5nnf0lhj4gkkxhszmii"; /* updated by script */
+ sha256 = "0m0nc988w2a2p0l3a9cirnk2vbrsas4wb3fc4pwiml5bz5vwh255"; /* updated by script */
};
wmClass = "jetbrains-datagrip";
update-channel = "DataGrip RELEASE";
@@ -273,12 +273,12 @@ in
goland = buildGoland rec {
name = "goland-${version}";
- version = "2021.3"; /* updated by script */
+ version = "2021.3.1"; /* updated by script */
description = "Up and Coming Go IDE";
license = lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/go/${name}.tar.gz";
- sha256 = "0bdsvfsx0vhmvlqvy9phw6yz98la8qw2avm4p0yl9j8y9zplbhl0"; /* updated by script */
+ sha256 = "1kl1sg2fjh8wpx47984vw6zrqf7nakbji606cl52brkxik7py0d3"; /* updated by script */
};
wmClass = "jetbrains-goland";
update-channel = "GoLand RELEASE";
@@ -365,12 +365,12 @@ in
rider = buildRider rec {
name = "rider-${version}";
- version = "2021.3.1"; /* updated by script */
+ version = "2021.3.2"; /* updated by script */
description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
license = lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz";
- sha256 = "0c788xvcd5b9jafz2yyllj1pzgc9ry3pg82qi8glghvimjnk1cfd"; /* updated by script */
+ sha256 = "0arnh9wlw874jqlgad00q0nf1kjp7pvb4xixwrb6v1l9fbr9nsan"; /* updated by script */
};
wmClass = "jetbrains-rider";
update-channel = "Rider RELEASE";
diff --git a/third_party/nixpkgs/pkgs/applications/finance/odoo/default.nix b/third_party/nixpkgs/pkgs/applications/finance/odoo/default.nix
index 69acb43af8..c2f201774f 100644
--- a/third_party/nixpkgs/pkgs/applications/finance/odoo/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/finance/odoo/default.nix
@@ -56,6 +56,7 @@ buildPythonApplication rec {
libsass
lxml
markupsafe
+ mock
num2words
ofxparse
passlib
@@ -76,7 +77,7 @@ buildPythonApplication rec {
reportlab
requests
vobject
- werkzeug1
+ werkzeug
xlrd
XlsxWriter
xlwt
@@ -92,6 +93,6 @@ buildPythonApplication rec {
description = "Open Source ERP and CRM";
homepage = "https://www.odoo.com/";
license = licenses.lgpl3Only;
- maintainers = [ maintainers.mkg20001 ];
+ maintainers = with maintainers; [ mkg20001 ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/misc/binance/default.nix b/third_party/nixpkgs/pkgs/applications/misc/binance/default.nix
index bbfe8be6f5..e98f8bfabb 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/binance/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/binance/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "binance";
- version = "1.28.0";
+ version = "1.29.0";
src = fetchurl {
url = "https://github.com/binance/desktop/releases/download/v${version}/${pname}-${version}-amd64-linux.deb";
- sha256 = "sha256-qJuD+O4M9U8P6JhFUFc92yllX1vgZZvTlTd0bph3Vo4=";
+ sha256 = "sha256-LQX5RUTVm6lBdRzCFMBq1NLGGiLBVyykJ1LY9FqINnY=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix b/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix
index f722b2315c..841b943e86 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix
@@ -2,6 +2,7 @@
, stdenv
, fetchurl
, fetchFromGitHub
+, fetchpatch
, wrapQtAppsHook
, python3
, zbar
@@ -78,6 +79,14 @@ python3.pkgs.buildPythonApplication {
--replace "dnspython>=2.0,<2.1" "dnspython>=2.0"
'';
+ patches = [
+ # trezorlib 0.13 compatibility
+ (fetchpatch {
+ url = "https://github.com/spesmilo/electrum/commit/97e61cfacdca374103e4184f0f9a07a0c5757afb.patch";
+ sha256 = "sha256-RGVBO9IskC+lQOHNGjrqH6EM/inNPJlcD9sSWedyT5E=";
+ })
+ ];
+
nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ];
propagatedBuildInputs = with py.pkgs; [
diff --git a/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix
index 9d3b751fcd..2003e0d7e7 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix
@@ -2,7 +2,7 @@
let
pname = "joplin-desktop";
- version = "2.5.12";
+ version = "2.6.10";
name = "${pname}-${version}";
inherit (stdenv.hostPlatform) system;
@@ -16,8 +16,8 @@ let
src = fetchurl {
url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}";
sha256 = {
- x86_64-linux = "sha256-/S/paqMKVerSQFjA4wQ9fLV0WaqKm4CzQfy+0OdH7c8=";
- x86_64-darwin = "sha256-5eKTfZRpW7IYwFt8TeJiytrwEpiHBgN4k9kth+Lh0Bo=";
+ x86_64-linux = "sha256-2/QYEzQjB9n/4k5I/fry3ol8Fpsb5+tc1ttVdf2ID+4=";
+ x86_64-darwin = "sha256-BwBpq78hYJVUItUgs9lonBTV4YWJ+qvML6VTj5M4BQ4=";
}.${system} or throwSystem;
};
diff --git a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix
index f293cc60d2..f8934dafc5 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix
@@ -31,11 +31,11 @@ let
in stdenv.mkDerivation rec {
pname = "obsidian";
- version = "0.12.19";
+ version = "0.13.14";
src = fetchurl {
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz";
- sha256 = "sha256-M9U67+mCL/CziTprCAhfrZTWl6i7HRfH24l/xqUqkIg=";
+ sha256 = "0d55lk643yqjz4s6j5lbrdkf9f7wmwlz9ahjx760rzqpzy5190nr";
};
nativeBuildInputs = [ makeWrapper graphicsmagick ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix
index 99f1f79ce7..2cbcd4c2ce 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix
@@ -5,8 +5,8 @@ let
description = "PrusaSlicer fork with more features and faster development cycle";
versions = {
- stable = { version = "2.3.57.7"; sha256 = "sha256-qYvHNGuA2YDatrY/K2g5PE2gD53VXNptCaa7TpWGV7g="; };
- latest = { version = "2.3.57.7"; sha256 = "sha256-qYvHNGuA2YDatrY/K2g5PE2gD53VXNptCaa7TpWGV7g="; };
+ stable = { version = "2.3.57.8"; sha256 = "sha256-k1G9sFukYyCqVeJIbYgjJX9T8zqmFTmjmj9OXZ78+LY="; };
+ latest = { version = "2.3.57.8"; sha256 = "sha256-k1G9sFukYyCqVeJIbYgjJX9T8zqmFTmjmj9OXZ78+LY="; };
};
override = { version, sha256 }: super: {
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pwsafe/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pwsafe/default.nix
index 534f6adecd..3549fead8e 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/pwsafe/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/pwsafe/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, zip, gettext, perl
+{ lib, stdenv, fetchFromGitHub
+, cmake, pkg-config, zip, gettext, perl
, wxGTK30, libXext, libXi, libXt, libXtst, xercesc
, qrencode, libuuid, libyubikey, yubikey-personalization
, curl, openssl, file
@@ -6,13 +7,14 @@
stdenv.mkDerivation rec {
pname = "pwsafe";
- version = "3.56.0";
+ version = "1.14.0"; # do NOT update to 3.x Windows releases
+ # nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "sha256-ZLX/3cs1cdia5+32QEwE6q3V0uFNkkmiIGboKW6Xej8=";
+ hash = "sha256-s3IXe4gTwUOzQslNfWrcN/srrG9Jv02zfkGgiZN3C1s=";
};
nativeBuildInputs = [
@@ -32,19 +34,19 @@ stdenv.mkDerivation rec {
postPatch = ''
# Fix perl scripts used during the build.
- for f in `find . -type f -name '*.pl'`; do
+ for f in $(find . -type f -name '*.pl') ; do
patchShebangs $f
done
# Fix hard coded paths.
- for f in `grep -Rl /usr/share/ src`; do
+ for f in $(grep -Rl /usr/share/ src) ; do
substituteInPlace $f --replace /usr/share/ $out/share/
done
# Fix hard coded zip path.
substituteInPlace help/Makefile.linux --replace /usr/bin/zip ${zip}/bin/zip
- for f in `grep -Rl /usr/bin/ .`; do
+ for f in $(grep -Rl /usr/bin/ .) ; do
substituteInPlace $f --replace /usr/bin/ ""
done
'';
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tiramisu/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tiramisu/default.nix
index f3743d33c3..8d1e1910cb 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/tiramisu/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/tiramisu/default.nix
@@ -1,19 +1,19 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, glib }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, glib, vala }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "tiramisu";
- version = "unstable-2021-05-20";
+ version = "2.0.20211107";
src = fetchFromGitHub {
owner = "Sweets";
- repo = "tiramisu";
- rev = "e53833d0b5b0ae41ceb7dc434d8e25818fe62291";
- sha256 = "sha256-F4oaTOAQQfOkEXeBVbGH+0CHc9v9Ac08GyzHliOdAfc=";
+ repo = pname;
+ rev = version;
+ sha256 = "1n1x1ybbwbanibw7b90k7v4cadagl41li17hz2l8s2sapacvq3mw";
};
buildInputs = [ glib ];
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ pkg-config vala ];
makeFlags = [ "PREFIX=$(out)" ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix
index d0d0b6638b..f52189a7be 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix
@@ -27,9 +27,8 @@
, ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages
, gssSupport ? true, libkrb5
, pipewireSupport ? waylandSupport && webrtcSupport, pipewire
-# Workaround: disabled since currently jemalloc causes crashes with LLVM 13.
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1741454
-, jemallocSupport ? false, jemalloc
+# Jemalloc could reduce memory consumption.
+, jemallocSupport ? true, jemalloc
## privacy-related options
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix
index d24dff6fb8..59c3437383 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "helmfile";
- version = "0.141.0";
+ version = "0.142.0";
src = fetchFromGitHub {
owner = "roboll";
repo = "helmfile";
rev = "v${version}";
- sha256 = "sha256-UwjV3xgnZa0Emzw4FP/+gHh1ES6MTihrrlGKUBH6O9Q=";
+ sha256 = "sha256-kz5U9MPpN+14Eb1D1hjwDfvTOygzg0unyIgrFTFhE0Q=";
};
vendorSha256 = "sha256-HKHMeDnIDmQ7AjuS2lYCMphTHGD1JgQuBYDJe2+PEk4=";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/jmeter/default.nix b/third_party/nixpkgs/pkgs/applications/networking/jmeter/default.nix
index 100a26692d..1e7a78e4d4 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/jmeter/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/jmeter/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "jmeter";
- version = "5.4.2";
+ version = "5.4.3";
src = fetchurl {
url = "https://archive.apache.org/dist/jmeter/binaries/apache-${pname}-${version}.tgz";
- sha256 = "sha256-rtv68ACqLRnjU0zEBirLn5cwhxGy03upZWQyIqeECxA=";
+ sha256 = "sha256-clISFMDLh9rFuXTBxug6F6AJx/03e1W/I1JcckA7He4=";
};
nativeBuildInputs = [ makeWrapper jre ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix b/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix
index 49e4bd01e4..1283f0d7fa 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "protonmail-bridge";
- version = "1.8.10";
+ version = "1.8.12";
src = fetchFromGitHub {
owner = "ProtonMail";
repo = "proton-bridge";
rev = "br-${version}";
- sha256 = "sha256-T6pFfGKG4VNcZ6EYEU5A5V91PlZZDylTNSNbah/pwS4=";
+ sha256 = "sha256-CkvD7PKx2Gm2KgsIIqQ9l1Z3tWlhqIbW0sxCV2UBYTE=";
};
- vendorSha256 = "sha256-hRGedgdQlky9UBqsVTSbgAgii1skF/MA21ZQ0+goaM4=";
+ vendorSha256 = "sha256-Pz3xRTwlnJGh1XvxIbyjvYcMywk/wdp4hYovPLBD494=";
nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix
index 2f9c5f76c5..e54bc23586 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix
@@ -70,6 +70,7 @@ stdenv.mkDerivation rec {
freetype
gdk-pixbuf
gnome2.gtkglext
+ glib-networking
webkitgtk
gtk2
gtk2-x11
diff --git a/third_party/nixpkgs/pkgs/applications/networking/soulseek/nicotine-plus/default.nix b/third_party/nixpkgs/pkgs/applications/networking/soulseek/nicotine-plus/default.nix
index 483d13b689..c4d014530c 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/soulseek/nicotine-plus/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/soulseek/nicotine-plus/default.nix
@@ -5,13 +5,13 @@ with lib;
python3Packages.buildPythonApplication rec {
pname = "nicotine-plus";
- version = "3.1.1";
+ version = "3.2.0";
src = fetchFromGitHub {
owner = "Nicotine-Plus";
repo = "nicotine-plus";
rev = version;
- hash = "sha256-NfI2RfxAYhA1qefml1ayfYWjbkrzUL4l9p2Rm/ROnzQ=";
+ hash = "sha256-E8b2VRlnMWmBHu919QDPBYuMbrjov9t//bHi1Y/F0Ak=";
};
nativeBuildInputs = [ gettext wrapGAppsHook ];
@@ -23,6 +23,12 @@ python3Packages.buildPythonApplication rec {
mv $out/bin/nicotine $out/bin/nicotine-plus
'';
+ preFixup = ''
+ gappsWrapperArgs+=(
+ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}"
+ )
+ '';
+
doCheck = false;
meta = {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/tmpmail/default.nix b/third_party/nixpkgs/pkgs/applications/networking/tmpmail/default.nix
index 4deada8d7b..535f5ce6d9 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/tmpmail/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/tmpmail/default.nix
@@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "tmpmail";
- version = "1.1.4";
+ version = "1.1.9";
src = fetchFromGitHub {
owner = "sdushantha";
repo = "tmpmail";
rev = "v${version}";
- sha256 = "sha256-Rcu1qNmUZhMRvPiaWrDlzLtGksv09XBiF2GJUxXKs1Y=";
+ sha256 = "sha256-sWcsmBUHSfo7sICXyhNhbfRFSHumObnWc7stWxcwVTg=";
};
dontConfigure = true;
diff --git a/third_party/nixpkgs/pkgs/applications/printing/pappl/default.nix b/third_party/nixpkgs/pkgs/applications/printing/pappl/default.nix
index 9752ebc0e7..5df1d93f9c 100644
--- a/third_party/nixpkgs/pkgs/applications/printing/pappl/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/printing/pappl/default.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "pappl";
- version = "1.0.3";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "michaelrsweet";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-B3g6R0/li+5D4odFG21qj+SR3K4PFnzzxIGCwbk1buo=";
+ sha256 = "sha256-FsmR0fFb9bU9G3oUyJU1eDLcoZ6OQ2//TINlPrW6lU0=";
};
outputs = [ "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.8.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.8.nix
index 0e5b7701e9..a6d4099c86 100644
--- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.8.nix
+++ b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.8.nix
@@ -248,6 +248,11 @@ stdenv.mkDerivation rec {
url = "https://github.com/gnuradio/gnuradio/commit/9d7343526dd793120b6425cd9a6969416ed32503.patch";
sha256 = "sha256-usSoRDDuClUfdX4yFbQNu8wDzve6UEhZYTFj1oZbFic=";
})
+ # Fix compilation with boost 177
+ (fetchpatch {
+ url = "https://github.com/gnuradio/gnuradio/commit/2c767bb260a25b415e8c9c4b3ea37280b2127cec.patch";
+ sha256 = "sha256-l4dSzkXb5s3vcCeuKMMwiKfv83hFI9Yg+EMEX+sl+Uo=";
+ })
];
passthru = shared.passthru // {
# Deps that are potentially overriden and are used inside GR plugins - the same version must
diff --git a/third_party/nixpkgs/pkgs/applications/radio/uhd/default.nix b/third_party/nixpkgs/pkgs/applications/radio/uhd/default.nix
index 9f2f39aab2..2928b19f29 100644
--- a/third_party/nixpkgs/pkgs/applications/radio/uhd/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/radio/uhd/default.nix
@@ -6,14 +6,13 @@
, pkg-config
# See https://files.ettus.com/manual_archive/v3.15.0.0/html/page_build_guide.html for dependencies explanations
, boost
-, enableLibuhd_C_api ? true
+, enableCApi ? true
# requires numpy
-, enableLibuhd_Python_api ? false
+, enablePythonApi ? false
, python3
, enableExamples ? false
, enableUtils ? false
-, enableLiberio ? false
-, liberio
+, enableSim ? false
, libusb1
, enableDpdk ? false
, dpdk
@@ -25,7 +24,6 @@
, enableUsrp1 ? true
, enableUsrp2 ? true
, enableX300 ? true
-, enableN230 ? true
, enableN300 ? true
, enableN320 ? true
, enableE300 ? true
@@ -41,18 +39,18 @@ stdenv.mkDerivation rec {
pname = "uhd";
# UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz
# and xxx.yyy.zzz. Hrmpf... style keeps changing
- version = "4.0.0.0";
+ version = "4.1.0.5";
src = fetchFromGitHub {
owner = "EttusResearch";
repo = "uhd";
rev = "v${version}";
- sha256 = "NCyiI4pIPw0nBRFdUGpgZ/x2mWz+Qm78ZGACUnSbGSs=";
+ sha256 = "sha256-XBq4GkLRR2SFunFRvpPOMiIbTuUkMYf8tPAoHCoveRA=";
};
# Firmware images are downloaded (pre-built) from the respective release on Github
uhdImagesSrc = fetchurl {
url = "https://github.com/EttusResearch/uhd/releases/download/v${version}/uhd-images_${version}.tar.xz";
- sha256 = "Xfx0bsHUQ5+Dp+xk0sVWWP83oyXQcUH5AX4PNEE7fY4=";
+ sha256 = "HctHB90ikOMkrYNyWmjGE/2HvA7xXKCUezdtiqzN+1A=";
};
cmakeFlags = [
@@ -61,9 +59,8 @@ stdenv.mkDerivation rec {
"-DENABLE_TESTS=ON" # This installs tests as well so we delete them via postPhases
"-DENABLE_EXAMPLES=${onOffBool enableExamples}"
"-DENABLE_UTILS=${onOffBool enableUtils}"
- "-DENABLE_LIBUHD_C_API=${onOffBool enableLibuhd_C_api}"
- "-DENABLE_LIBUHD_PYTHON_API=${onOffBool enableLibuhd_Python_api}"
- "-DENABLE_LIBERIO=${onOffBool enableLiberio}"
+ "-DENABLE_C_API=${onOffBool enableCApi}"
+ "-DENABLE_PYTHON_API=${onOffBool enablePythonApi}"
"-DENABLE_DPDK=${onOffBool enableDpdk}"
# Devices
"-DENABLE_OCTOCLOCK=${onOffBool enableOctoClock}"
@@ -73,7 +70,6 @@ stdenv.mkDerivation rec {
"-DENABLE_USRP1=${onOffBool enableUsrp1}"
"-DENABLE_USRP2=${onOffBool enableUsrp2}"
"-DENABLE_X300=${onOffBool enableX300}"
- "-DENABLE_N230=${onOffBool enableN230}"
"-DENABLE_N300=${onOffBool enableN300}"
"-DENABLE_N320=${onOffBool enableN320}"
"-DENABLE_E300=${onOffBool enableE300}"
@@ -87,7 +83,7 @@ stdenv.mkDerivation rec {
# Python + Mako are always required for the build itself but not necessary for runtime.
pythonEnv = python3.withPackages (ps: with ps; [ Mako ]
- ++ optionals (enableLibuhd_Python_api) [ numpy setuptools ]
+ ++ optionals (enablePythonApi) [ numpy setuptools ]
++ optionals (enableUtils) [ requests six ]
);
@@ -98,7 +94,7 @@ stdenv.mkDerivation rec {
# If both enableLibuhd_Python_api and enableUtils are off, we don't need
# pythonEnv in buildInputs as it's a 'build' dependency and not a runtime
# dependency
- ++ optionals (!enableLibuhd_Python_api && !enableUtils) [ pythonEnv ]
+ ++ optionals (!enablePythonApi && !enableUtils) [ pythonEnv ]
;
buildInputs = [
boost
@@ -107,12 +103,12 @@ stdenv.mkDerivation rec {
# However, if enableLibuhd_Python_api *or* enableUtils is on, we need
# pythonEnv for runtime as well. The utilities' runtime dependencies are
# handled at the environment
- ++ optionals (enableLibuhd_Python_api || enableUtils) [ pythonEnv ]
- ++ optionals (enableLiberio) [ liberio ]
+ ++ optionals (enablePythonApi || enableUtils) [ pythonEnv ]
++ optionals (enableDpdk) [ dpdk ]
;
- doCheck = true;
+ # many tests fails on darwin, according to ofborg
+ doCheck = !stdenv.isDarwin;
# Build only the host software
preConfigure = "cd host";
@@ -154,6 +150,6 @@ stdenv.mkDerivation rec {
homepage = "https://uhd.ettus.com/";
license = licenses.gpl3Plus;
platforms = platforms.linux ++ platforms.darwin;
- maintainers = with maintainers; [ bjornfor fpletz tomberek ];
+ maintainers = with maintainers; [ bjornfor fpletz tomberek doronbehar ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix
index 41a2f006e8..7295889842 100644
--- a/third_party/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix
@@ -4,12 +4,12 @@ with lib;
stdenv.mkDerivation rec {
pname = "marvin";
- version = "21.18.0";
+ version = "21.20.0";
src = fetchurl {
name = "marvin-${version}.deb";
url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb";
- sha256 = "sha256-h/fwP4HyelE1jZ8GrW1nKuDNuFAchms3cKSCGiRe7gU=";
+ sha256 = "sha256-xOtlJSUY7QLyggFXW0Ay3+6KNHIqljyDpyk0CP8jxWs=";
};
nativeBuildInputs = [ dpkg makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/flatcam/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/flatcam/default.nix
index b8a80c5e9c..1f6679625e 100644
--- a/third_party/nixpkgs/pkgs/applications/science/electronics/flatcam/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/electronics/flatcam/default.nix
@@ -18,6 +18,7 @@ python3Packages.buildPythonApplication rec {
propagatedBuildInputs = with python3Packages; [
matplotlib
numpy
+ packaging
pyqt4
Rtree
scipy
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/fonttools-deprecation-warnings.patch b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/fonttools-deprecation-warnings.patch
new file mode 100644
index 0000000000..93c03a04dd
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/fonttools-deprecation-warnings.patch
@@ -0,0 +1,39 @@
+diff --git a/src/doc/en/prep/Advanced-2DPlotting.rst b/src/doc/en/prep/Advanced-2DPlotting.rst
+index 337457afef..f7c76f4b56 100644
+--- a/src/doc/en/prep/Advanced-2DPlotting.rst
++++ b/src/doc/en/prep/Advanced-2DPlotting.rst
+@@ -695,6 +695,8 @@ by the cells.
+
+ sage: pdf_savename = name+'.pdf'
+ sage: p.save(pdf_savename)
++ ...
++ DeprecationWarning: The py23 module has been deprecated and will be removed in a future release. Please update your code.
+
+ Notably, we can export in formats ready for inclusion in web pages.
+
+diff --git a/src/sage/plot/disk.py b/src/sage/plot/disk.py
+index 8680a1c9b1..e83763b678 100644
+--- a/src/sage/plot/disk.py
++++ b/src/sage/plot/disk.py
+@@ -156,6 +156,8 @@ class Disk(GraphicPrimitive):
+ sage: f = tmp_filename(ext='.pdf')
+ sage: p = disk((0,0), 5, (0, pi/4), alpha=0.5)
+ sage: p.save(f)
++ ...
++ DeprecationWarning: The py23 module has been deprecated and will be removed in a future release. Please update your code.
+
+ """
+ import matplotlib.patches as patches
+diff --git a/src/sage/plot/text.py b/src/sage/plot/text.py
+index 04cbdedf76..a970f97b79 100644
+--- a/src/sage/plot/text.py
++++ b/src/sage/plot/text.py
+@@ -325,6 +325,8 @@ def text(string, xy, **options):
+ You can save text as part of PDF output::
+
+ sage: text("sage", (0,0), rgbcolor=(0,0,0)).save(os.path.join(SAGE_TMP, 'a.pdf'))
++ ...
++ DeprecationWarning: The py23 module has been deprecated and will be removed in a future release. Please update your code.
+
+ Some examples of bounding box::
+
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix
index 1678567b77..eb07434b4c 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix
@@ -109,6 +109,14 @@ stdenv.mkDerivation rec {
# strictly necessary, but keeps us from littering in the user's HOME.
./patches/sympow-cache.patch
+ # fonttools 4.26.2, used by matplotlib, uses deprecated methods internally.
+ # This is fixed in fonttools 4.27.0, but since fonttools is a dependency of
+ # 2000+ packages and DeprecationWarnings are hidden almost everywhere by
+ # default (not on Sage's doctest harness, though), it doesn't make sense to
+ # backport the fix (see https://github.com/NixOS/nixpkgs/pull/151415).
+ # Let's just assume warnings are expected until we update to 4.27.0.
+ ./patches/fonttools-deprecation-warnings.patch
+
# https://trac.sagemath.org/ticket/32305
(fetchSageDiff {
base = "9.4";
@@ -140,6 +148,22 @@ stdenv.mkDerivation rec {
rev = "f5f7a86908daf60b25e66e6a189c51ada7e0a732";
sha256 = "sha256-H/caGx3q4KcdsyGe+ojV9bUTQ5y0siqM+QHgDbeEnbw=";
})
+
+ # https://trac.sagemath.org/ticket/32909
+ (fetchSageDiff {
+ base = "9.5.beta7";
+ name = "matplotlib-3.5-deprecation-warnings.patch";
+ rev = "a5127dc56fdf5c2e82f6bc781cfe78dbd04e97b7";
+ sha256 = "sha256-p23qUu9mgEUbdbX6cy7ArxZAtpcFjCKbgyxN4jWvj1o=";
+ })
+
+ # https://trac.sagemath.org/ticket/32968
+ (fetchSageDiff {
+ base = "9.5.beta8";
+ name = "sphinx-4.3-update.patch";
+ rev = "fc84f82f52b6f05f512cb359ec7c100f93cf8841";
+ sha256 = "sha256-bBbfdcnw/9LUOlY8rHJRbFJEdMXK4shosqTNaobTS1Q=";
+ })
];
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix
index 634d82a604..073b50c4bd 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -25,7 +25,7 @@ assert sendEmailSupport -> perlSupport;
assert svnSupport -> perlSupport;
let
- version = "2.34.0";
+ version = "2.34.1";
svn = subversionClient.override { perlBindings = perlSupport; };
gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
- sha256 = "07s1c9lzlm4kpbb5lmxy0869phg7037pv4faz5hlqyb5csrbjv7x";
+ sha256 = "0b40vf315s1kz65x1wq47g8srl4wqac39pwnvlj1mdzs3kfma1rs";
};
outputs = [ "out" ] ++ lib.optional withManual "doc";
diff --git a/third_party/nixpkgs/pkgs/applications/video/bombono/default.nix b/third_party/nixpkgs/pkgs/applications/video/bombono/default.nix
index a6633904c2..e39d09b6fe 100644
--- a/third_party/nixpkgs/pkgs/applications/video/bombono/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/bombono/default.nix
@@ -3,7 +3,7 @@
, pkg-config
, fetchpatch
, scons
-, boost
+, boost172
, dvdauthor
, dvdplusrwtools
, enca
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ wrapGAppsHook scons pkg-config gettext ];
buildInputs = [
- boost
+ boost172
dvdauthor
dvdplusrwtools
enca
diff --git a/third_party/nixpkgs/pkgs/applications/video/clapper/default.nix b/third_party/nixpkgs/pkgs/applications/video/clapper/default.nix
index 176efb7995..4f09fc14d9 100644
--- a/third_party/nixpkgs/pkgs/applications/video/clapper/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/clapper/default.nix
@@ -24,13 +24,13 @@
stdenv.mkDerivation rec {
pname = "clapper";
- version = "0.4.0";
+ version = "0.4.1";
src = fetchFromGitHub {
owner = "Rafostar";
repo = pname;
rev = version;
- sha256 = "1gf4z9lib5rxi1xilkxxyywakm9zlq5915w2wib09jyh0if82ahr";
+ sha256 = "sha256-ccvg8yxPCN7OYmJvq0SPY6iyiuFuWJyiu+mRoykEzqI=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/video/corrscope/default.nix b/third_party/nixpkgs/pkgs/applications/video/corrscope/default.nix
index c1d6669c8c..0e1d377be2 100644
--- a/third_party/nixpkgs/pkgs/applications/video/corrscope/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/corrscope/default.nix
@@ -11,6 +11,7 @@
mkDerivationWith python3Packages.buildPythonApplication rec {
pname = "corrscope";
version = "0.7.1";
+ format = "pyproject";
src = fetchFromGitHub {
owner = "corrscope";
@@ -19,8 +20,6 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
sha256 = "0c9kmrw6pcda68li04b5j2kmsgdw1q463qlc32wn96zn9hl82v6m";
};
- format = "pyproject";
-
patches = [
# Remove when bumping past 0.7.1
(fetchpatch {
@@ -30,11 +29,28 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
})
];
- nativeBuildInputs = [ wrapQtAppsHook ] ++ (with python3Packages; [ poetry-core ]);
+ nativeBuildInputs = [
+ wrapQtAppsHook
+ ] ++ (with python3Packages; [
+ poetry-core
+ ]);
- buildInputs = [ ffmpeg qtbase ];
+ buildInputs = [
+ ffmpeg
+ qtbase
+ ];
- propagatedBuildInputs = with python3Packages; [ appdirs atomicwrites attrs click matplotlib numpy pyqt5 ruamel-yaml ];
+ propagatedBuildInputs = with python3Packages; [
+ appdirs
+ atomicwrites
+ attrs
+ click
+ matplotlib
+ numpy
+ packaging
+ pyqt5
+ ruamel-yaml
+ ];
dontWrapQtApps = true;
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix
index 352c0c442d..c53eb25af3 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, fetchpatch, python, zlib, pkg-config, glib
, perl, pixman, vde2, alsa-lib, texinfo, flex
, bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, ninja, meson, sigtool
-, makeWrapper, autoPatchelfHook, runtimeShell
+, makeWrapper, runtimeShell
, attr, libcap, libcap_ng
, CoreServices, Cocoa, Hypervisor, rez, setfile
, numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl
@@ -53,7 +53,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper python python.pkgs.sphinx python.pkgs.sphinx_rtd_theme pkg-config flex bison meson ninja ]
++ lib.optionals gtkSupport [ wrapGAppsHook ]
- ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]
++ lib.optionals stdenv.isDarwin [ sigtool ];
buildInputs = [ zlib glib perl pixman
@@ -85,6 +84,8 @@ stdenv.mkDerivation rec {
dontUseMesonConfigure = true; # meson's configurePhase isn't compatible with qemu build
outputs = [ "out" "ga" ];
+ # On aarch64-linux we would shoot over the Hydra's 2G output limit.
+ separateDebugInfo = !(stdenv.isAarch64 && stdenv.isLinux);
patches = [
./fix-qemu-ga.patch
@@ -180,6 +181,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--audio-drv-list=${audio}"
+ "--disable-strip" # We'll strip ourselves after separating debug info.
"--enable-docs"
"--enable-tools"
"--enable-guest-agent"
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/status.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/status.nix
index bbbad532d0..40666b2d20 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/status.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/status.nix
@@ -1,24 +1,17 @@
-{ fetchurl, lib, stdenv, libconfuse, yajl, alsa-lib, libpulseaudio, libnl, pkg-config, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }:
+{ fetchurl, lib, stdenv, libconfuse, yajl, alsa-lib, libpulseaudio, libnl, meson, ninja, perl, pkg-config, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }:
stdenv.mkDerivation rec {
pname = "i3status";
- version = "2.13";
+ version = "2.14";
src = fetchurl {
- url = "https://i3wm.org/i3status/i3status-${version}.tar.bz2";
- sha256 = "0rhlzb96mw64z2jnhwz9nibc7pxg549626lz5642xxk5hpzwk2ff";
+ url = "https://i3wm.org/i3status/i3status-${version}.tar.xz";
+ sha256 = "0929chhvyq9hg4scpcz8r9zn3s9jvbg6a86k3wqa77qg85rh4kaw";
};
- nativeBuildInputs = [ pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ];
+ nativeBuildInputs = [ meson ninja perl pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ];
buildInputs = [ libconfuse yajl alsa-lib libpulseaudio libnl ];
- makeFlags = [ "all" "PREFIX=$(out)" ];
-
- # This hack is needed because for unknown reasons configure generates a broken makefile on the 2.13 release under nixos
- preBuild = ''
- sed -i -e 's/\$(TEST_LOGS) \$(TEST_LOGS/\$(TEST_LOGS)/g' Makefile
- '';
-
meta = {
description = "Generates a status line for i3bar, dzen2, xmobar or lemonbar";
homepage = "https://i3wm.org";
diff --git a/third_party/nixpkgs/pkgs/build-support/pkg-config-wrapper/default.nix b/third_party/nixpkgs/pkgs/build-support/pkg-config-wrapper/default.nix
index bbc49d6728..aa8f57ffb0 100644
--- a/third_party/nixpkgs/pkgs/build-support/pkg-config-wrapper/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/pkg-config-wrapper/default.nix
@@ -47,6 +47,9 @@ stdenv.mkDerivation {
dontBuild = true;
dontConfigure = true;
+ # Additional flags passed to pkg-config.
+ addFlags = lib.optional stdenv.targetPlatform.isStatic "--static";
+
unpackPhase = ''
src=$PWD
'';
diff --git a/third_party/nixpkgs/pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh b/third_party/nixpkgs/pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh
index a5a4427166..1aa14cfeb7 100644
--- a/third_party/nixpkgs/pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh
+++ b/third_party/nixpkgs/pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh
@@ -12,10 +12,12 @@ if [ -z "${NIX_PKG_CONFIG_WRAPPER_FLAGS_SET_@suffixSalt@:-}" ]; then
source @out@/nix-support/add-flags.sh
fi
+set -- "$@" @addFlags@
+
if (( ${#role_suffixes[@]} > 0 )); then
# replace env var with nix-modified one
PKG_CONFIG_PATH=$PKG_CONFIG_PATH_@suffixSalt@ exec @prog@ "$@"
else
- # pkg-config isn't a bonafied dependency so ignore setup hook entirely
+ # pkg-config isn't a real dependency so ignore setup hook entirely
exec @prog@ "$@"
fi
diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/separate-debug-info.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/separate-debug-info.sh
index 2481d8f504..1a23e6b198 100644
--- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/separate-debug-info.sh
+++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/separate-debug-info.sh
@@ -28,10 +28,16 @@ _separateDebugInfo() {
# Extract the debug info.
header "separating debug info from $i (build ID $id)"
mkdir -p "$dst/${id:0:2}"
- $OBJCOPY --only-keep-debug "$i" "$dst/${id:0:2}/${id:2}.debug"
- $STRIP --strip-debug "$i"
- # Also a create a symlink .debug.
- ln -sfn ".build-id/${id:0:2}/${id:2}.debug" "$dst/../$(basename "$i")"
+ # This may fail, e.g. if the binary is for a different
+ # architecture than we're building for. (This happens with
+ # firmware blobs in QEMU.)
+ (
+ $OBJCOPY --only-keep-debug "$i" "$dst/${id:0:2}/${id:2}.debug"
+ $STRIP --strip-debug "$i"
+
+ # Also a create a symlink .debug.
+ ln -sfn ".build-id/${id:0:2}/${id:2}.debug" "$dst/../$(basename "$i")"
+ ) || rmdir -p "$dst/${id:0:2}"
done < <(find "$prefix" -type f -print0)
}
diff --git a/third_party/nixpkgs/pkgs/data/documentation/stdman/default.nix b/third_party/nixpkgs/pkgs/data/documentation/stdman/default.nix
index e0f08e6049..c09c204c55 100644
--- a/third_party/nixpkgs/pkgs/data/documentation/stdman/default.nix
+++ b/third_party/nixpkgs/pkgs/data/documentation/stdman/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "stdman";
- version = "2020.11.17";
+ version = "2021.12.21";
src = fetchFromGitHub {
owner = "jeaye";
repo = "stdman";
rev = version;
- sha256 = "sha256-pzAVuXSuUfwI7gQpFqmH/+klSUH3KipZup2TgZs8XsY=";
+ sha256 = "sha256-wOMQzC5w8aDmxNxQ5HK8jMgoow1wXBfHGUwFBw2WiPA=";
};
outputDevdoc = "out";
diff --git a/third_party/nixpkgs/pkgs/data/fonts/last-resort/default.nix b/third_party/nixpkgs/pkgs/data/fonts/last-resort/default.nix
index 31fb300e59..8cad990ac9 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/last-resort/default.nix
+++ b/third_party/nixpkgs/pkgs/data/fonts/last-resort/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchurl }:
let
- version = "13.001";
+ version = "14.000";
in fetchurl {
name = "last-resort-${version}";
@@ -13,7 +13,7 @@ in fetchurl {
'';
recursiveHash = true;
- sha256 = "08mi65j46fv6a3y3pqnglqdjxjnbzg25v25f7c1zyk3c285m14hq";
+ sha256 = "sha256-rb69V4oExSFx4GpedpyVvGuS6o+MxmxTCSZhoe9kUhI=";
meta = with lib; {
description = "Fallback font of last resort";
diff --git a/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix
index 88c17e8f4a..d6b4488daf 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix
+++ b/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix
@@ -124,11 +124,6 @@ in
sha256 = "1d6zzk0ii43iqfnjbldwp8sasyx99lbjp1nfgqjla7ixld6yp98l";
};
- makeFlags = [
- # TODO(@sternenseemann): remove if afdko is new enough to know about Unicode 14.0
- "BYPASS_SEQUENCE_CHECK=True"
- ];
-
nativeBuildInputs = [
cairo
imagemagick
diff --git a/third_party/nixpkgs/pkgs/data/fonts/scheherazade/default.nix b/third_party/nixpkgs/pkgs/data/fonts/scheherazade/default.nix
index 3448226c58..e91d108ade 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/scheherazade/default.nix
+++ b/third_party/nixpkgs/pkgs/data/fonts/scheherazade/default.nix
@@ -1,10 +1,10 @@
-{ lib, fetchzip, version ? "3.200" }:
+{ lib, fetchzip, version ? "3.300" }:
let
new = lib.versionAtLeast version "3.000";
sha256 = {
"2.100" = "1g5f5f9gzamkq3kqyf7vbzvl4rdj3wmjf6chdrbxksrm3rnb926z";
- "3.200" = "0qvmpsn6ja3g2hlvq0vb9pjsyk6ibna7s3w3n6q7lnhk0rhjg8bv";
+ "3.300" = "1bja1ma1mnna0qlk3dis31cvq5z1kgcqj7wjp8ml03zc5mpa2wb2";
}."${version}";
in fetchzip rec {
@@ -16,8 +16,9 @@ in fetchzip rec {
mkdir -p $out/share/{doc,fonts}
unzip -l $downloadedFile
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
+ unzip $downloadedFile \*/documentation/\* -d $out/share/doc/
+ mv $out/share/doc/* $out/share/doc/${name}
unzip -j $downloadedFile \*/FONTLOG.txt \*/README.txt -d $out/share/doc/${name}
- unzip -j $downloadedFile \*/documentation/\* -d $out/share/doc/${name}/documentation
'';
inherit sha256;
@@ -30,7 +31,7 @@ in fetchzip rec {
Scheherazade${lib.optionalString new " New"}, named after the heroine of
the classic Arabian Nights tale, is designed in a similar style to
traditional typefaces such as Monotype Naskh, extended to cover the
- Unicode Arabic repertoire through Unicode ${if new then "13.0" else "8.0"}.
+ Unicode Arabic repertoire through Unicode ${if new then "14.0" else "8.0"}.
Scheherazade provides a “simplified” rendering of Arabic script, using
basic connecting glyphs but not including a wide variety of additional
diff --git a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix
index d7a7a0c861..089e098e97 100644
--- a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix
+++ b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "numix-icon-theme-circle";
- version = "21.11.29";
+ version = "21.12.05";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
- sha256 = "sha256-0hGxgmNNYvNT1QQpA7SdOdN1VM8Iix+kZZFcO2R1V/Y=";
+ sha256 = "sha256-tmrysmg4jVPurNJy3AqzAIjd1QCXoH2nGuJhRinvqVQ=";
};
nativeBuildInputs = [ gtk3 ];
diff --git a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix
index d8d22f867c..8aeb6d4466 100644
--- a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix
+++ b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "numix-icon-theme-square";
- version = "21.11.29";
+ version = "21.12.05";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
- sha256 = "sha256-3zZ/LpjYhYOHPpgRysGYXFLvYux5GgurItuYm7zAZ2M=";
+ sha256 = "sha256-SVWIY7RGwk2AKruDkAYoZ5nDSAU8LPb9dtqxDFumZ5o=";
};
nativeBuildInputs = [ gtk3 ];
diff --git a/third_party/nixpkgs/pkgs/data/icons/tela-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/tela-icon-theme/default.nix
index 6140256519..4e2b824be4 100644
--- a/third_party/nixpkgs/pkgs/data/icons/tela-icon-theme/default.nix
+++ b/third_party/nixpkgs/pkgs/data/icons/tela-icon-theme/default.nix
@@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "tela-icon-theme";
- version = "2021-11-05";
+ version = "2021-12-25";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
- sha256 = "sha256-mvkgHBdZm6vF+/DS3CRLl1m14U0Lj4Xtz4J/vpJUTQM=";
+ sha256 = "sha256-qlt9jv3lCPVFBeN4aQd4r9NE0YAxWQavMoo13cvhv6E=";
};
nativeBuildInputs = [ gtk3 jdupes ];
diff --git a/third_party/nixpkgs/pkgs/data/misc/iana-etc/default.nix b/third_party/nixpkgs/pkgs/data/misc/iana-etc/default.nix
index 29ebac848d..5e7e70a1b0 100644
--- a/third_party/nixpkgs/pkgs/data/misc/iana-etc/default.nix
+++ b/third_party/nixpkgs/pkgs/data/misc/iana-etc/default.nix
@@ -1,12 +1,12 @@
{ lib, fetchzip, stdenvNoCC, writeText }:
let
- version = "20210225";
+ version = "20211124";
in stdenvNoCC.mkDerivation {
name = "iana-etc-${version}";
src = fetchzip {
url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz";
- sha256 = "sha256:1bbbnj2ya0apyyhnw37521yl1hrz3zy3l8dw6sacmir0y6pmx9gi";
+ sha256 = "sha256-4mM/ZeGd91e1AklGHFK5UB4llg9IgCo9DKcM0iXcBls=";
};
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/patches/move-cache.patch b/third_party/nixpkgs/pkgs/development/compilers/flutter/patches/move-cache.patch
index 533d2d5d8a..701cab54d8 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/flutter/patches/move-cache.patch
+++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/patches/move-cache.patch
@@ -20,7 +20,7 @@ index ed42baea29..fee2fb1d62 100644
final Uri entryUri = _fileSystem.path.toUri(asset);
result.add(_Asset(
- baseDir: _fileSystem.path.join(Cache.flutterRoot!, 'bin', 'cache', 'artifacts', 'material_fonts'),
-+ baseDir: _fileSystem.path.join(globals.fsUtils.homeDirPath!, 'bin', 'cache', 'artifacts', 'material_fonts'),
++ baseDir: _fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter', 'artifacts', 'material_fonts'),
relativeUri: Uri(path: entryUri.pathSegments.last),
entryUri: entryUri,
package: null,
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix
index 604d90fa78..ebdc55ee3f 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix
@@ -63,6 +63,11 @@ with lib;
with builtins;
let majorVersion = "9";
+ /*
+ If you update, please build on aarch64-linux
+ and check braces adjacent to `cplusplus` lines in file
+ ./result/lib/gcc/aarch64-unknown-linux-gnu/9.*.0/include/arm_acle.h
+ */
version = "${majorVersion}.3.0";
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/head.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/head.nix
index 9a57674461..a769647940 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/ghc/head.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/head.nix
@@ -12,9 +12,10 @@
libffi ? null
# Libdw.c only supports x86_64, i686 and s390x
-, enableDwarf ? stdenv.targetPlatform.isx86 &&
- !stdenv.targetPlatform.isDarwin &&
- !stdenv.targetPlatform.isWindows
+, enableDwarf ? (stdenv.targetPlatform.isx86 ||
+ (stdenv.targetPlatform.isS390 && stdenv.targetPlatform.is64bit)) &&
+ lib.meta.availableOn stdenv.hostPlatform elfutils &&
+ lib.meta.availableOn stdenv.targetPlatform elfutils
, elfutils # for DWARF support
, useLLVM ? !(stdenv.targetPlatform.isx86
diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.16.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.16.nix
index f557c7b9e2..61d24b0ee0 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/go/1.16.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.16.nix
@@ -54,11 +54,11 @@ in
stdenv.mkDerivation rec {
pname = "go";
- version = "1.16.10";
+ version = "1.16.12";
src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz";
- sha256 = "sha256-qQVHIBFYXkA9ANKkHefO0puIhDCdc0gqMH9on9DzILU=";
+ sha256 = "sha256-Kv2Dnct20rsILFAsAaClzb/An9YwdXg1NjxP3o4vv+g=";
};
# perl is used for testing go vet
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gwt/2.4.0.nix b/third_party/nixpkgs/pkgs/development/compilers/gwt/2.4.0.nix
index 011a7979df..38f29cb320 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/gwt/2.4.0.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/gwt/2.4.0.nix
@@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, unzip }:
-stdenv.mkDerivation {
- name = "gwt-java-2.4.0";
+stdenv.mkDerivation rec {
+ pname = "gwt-java";
+ version = "2.4.0";
src = fetchurl {
- url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/google-web-toolkit/gwt-2.4.0.zip";
+ url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/google-web-toolkit/gwt-${version}.zip";
sha256 = "1gvyg00vx7fdqgfl2w7nhql78clg3abs6fxxy7m03pprdm5qmm17";
};
diff --git a/third_party/nixpkgs/pkgs/development/compilers/koka/default.nix b/third_party/nixpkgs/pkgs/development/compilers/koka/default.nix
index 9e4e446b12..51d0a9ed7b 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/koka/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/koka/default.nix
@@ -4,12 +4,12 @@
, parsec, process, regex-compat, text, time }:
let
- version = "2.3.2";
+ version = "2.3.6";
src = fetchFromGitHub {
owner = "koka-lang";
repo = "koka";
rev = "v${version}";
- sha256 = "sha256-+w99Jvsd1tccUUYaP2TRgCNyGnMINWamuNRumHGzFWA=";
+ sha256 = "sha256-AibS/HudJKFQZlTxGD5LfwjBawIy1xwO2Hm8qzAUP2M=";
fetchSubmodules = true;
};
kklib = stdenv.mkDerivation {
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libcxx/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libcxx/default.nix
index 7c01e73171..d438294bdd 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libcxx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libcxx/default.nix
@@ -21,6 +21,12 @@ stdenv.mkDerivation {
../../libcxx-0001-musl-hacks.patch
];
+ # Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz"
+ postPatch = ''
+ substituteInPlace include/__config \
+ --replace "# define _LIBCPP_USE_AVAILABILITY_APPLE" ""
+ '';
+
preConfigure = ''
# Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package
cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$LIBCXXABI_INCLUDE_DIR")
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libcxx/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libcxx/default.nix
index 596d7f9976..9aa49c9a00 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libcxx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libcxx/default.nix
@@ -29,6 +29,12 @@ stdenv.mkDerivation {
../../libcxx-0001-musl-hacks.patch
];
+ # Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz"
+ postPatch = ''
+ substituteInPlace include/__config \
+ --replace "# define _LIBCPP_USE_AVAILABILITY_APPLE" ""
+ '';
+
preConfigure = lib.optionalString stdenv.hostPlatform.isMusl ''
patchShebangs utils/cat_files.py
'';
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libcxxabi/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libcxxabi/default.nix
index 65e0139a59..61cfe8eede 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libcxxabi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libcxxabi/default.nix
@@ -1,5 +1,7 @@
{ lib, stdenv, llvm_meta, cmake, fetch, libcxx, libunwind, llvm, version
, enableShared ? !stdenv.hostPlatform.isStatic
+, standalone ? stdenv.hostPlatform.useLLVM or false
+, withLibunwind ? !stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm
}:
stdenv.mkDerivation {
@@ -29,10 +31,11 @@ stdenv.mkDerivation {
];
nativeBuildInputs = [ cmake ];
- buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;
+ buildInputs = lib.optional withLibunwind libunwind;
- cmakeFlags = lib.optionals (stdenv.hostPlatform.useLLVM or false) [
+ cmakeFlags = lib.optionals standalone [
"-DLLVM_ENABLE_LIBCXX=ON"
+ ] ++ lib.optionals (standalone && withLibunwind) [
"-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
] ++ lib.optionals stdenv.hostPlatform.isWasm [
"-DLIBCXXABI_ENABLE_THREADS=OFF"
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxx/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxx/default.nix
index 3ddcb79975..30dc3f4f20 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxx/default.nix
@@ -23,6 +23,12 @@ stdenv.mkDerivation {
../../libcxx-0001-musl-hacks.patch
];
+ # Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz"
+ postPatch = ''
+ substituteInPlace include/__config \
+ --replace "# define _LIBCPP_USE_AVAILABILITY_APPLE" ""
+ '';
+
preConfigure = lib.optionalString stdenv.hostPlatform.isMusl ''
patchShebangs utils/cat_files.py
'';
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxxabi/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxxabi/default.nix
index 16eaed20d7..803fe6a62f 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxxabi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxxabi/default.nix
@@ -1,5 +1,7 @@
{ lib, stdenv, llvm_meta, cmake, python3, fetch, libcxx, libunwind, llvm, version
, enableShared ? !stdenv.hostPlatform.isStatic
+, standalone ? stdenv.hostPlatform.useLLVM or false
+, withLibunwind ? !stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm
}:
stdenv.mkDerivation {
@@ -28,9 +30,9 @@ stdenv.mkDerivation {
];
nativeBuildInputs = [ cmake python3 ];
- buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;
+ buildInputs = lib.optional withLibunwind libunwind;
- cmakeFlags = lib.optionals (stdenv.hostPlatform.useLLVM or false) [
+ cmakeFlags = lib.optionals standalone [
"-DLLVM_ENABLE_LIBCXX=ON"
"-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
] ++ lib.optionals stdenv.hostPlatform.isWasm [
@@ -47,7 +49,7 @@ stdenv.mkDerivation {
# the magic combination of necessary CMake variables
# if you fancy a try, take a look at
# https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling
- install_name_tool -id $out/$file $file
+ ${stdenv.cc.targetPrefix}install_name_tool -id $out/$file $file
done
make install
install -d 755 $out/include
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/clang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/clang/default.nix
index a775af3031..ab826fa315 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/clang/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/clang/default.nix
@@ -37,6 +37,11 @@ let
./purity.patch
# https://reviews.llvm.org/D51899
./gnu-install-dirs.patch
+ # Revert of https://reviews.llvm.org/D100879
+ # The malloc alignment assumption is incorrect for jemalloc and causes
+ # mis-compilation in firefox.
+ # See: https://bugzilla.mozilla.org/show_bug.cgi?id=1741454
+ ./revert-malloc-alignment-assumption.patch
(substituteAll {
src = ../../clang-11-12-LLVMgold-path.patch;
libllvmLibdir = "${libllvm.lib}/lib";
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/clang/revert-malloc-alignment-assumption.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/clang/revert-malloc-alignment-assumption.patch
new file mode 100644
index 0000000000..f8e55ff7f8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/clang/revert-malloc-alignment-assumption.patch
@@ -0,0 +1,78 @@
+--- b/include/clang/Basic/TargetInfo.h
++++ a/include/clang/Basic/TargetInfo.h
+@@ -612,8 +612,8 @@
+ }
+
+ /// Return the largest alignment for which a suitably-sized allocation with
++ /// '::operator new(size_t)' is guaranteed to produce a correctly-aligned
++ /// pointer.
+- /// '::operator new(size_t)' or 'malloc' is guaranteed to produce a
+- /// correctly-aligned pointer.
+ unsigned getNewAlign() const {
+ return NewAlign ? NewAlign : std::max(LongDoubleAlign, LongLongAlign);
+ }
+--- b/lib/CodeGen/CGCall.cpp
++++ a/lib/CodeGen/CGCall.cpp
+@@ -2048,24 +2048,6 @@
+ // allows it to work on indirect virtual function calls.
+ if (AttrOnCallSite && TargetDecl->hasAttr())
+ FuncAttrs.addAttribute(llvm::Attribute::NoMerge);
+-
+- // Add known guaranteed alignment for allocation functions.
+- if (unsigned BuiltinID = Fn->getBuiltinID()) {
+- switch (BuiltinID) {
+- case Builtin::BIaligned_alloc:
+- case Builtin::BIcalloc:
+- case Builtin::BImalloc:
+- case Builtin::BImemalign:
+- case Builtin::BIrealloc:
+- case Builtin::BIstrdup:
+- case Builtin::BIstrndup:
+- RetAttrs.addAlignmentAttr(Context.getTargetInfo().getNewAlign() /
+- Context.getTargetInfo().getCharWidth());
+- break;
+- default:
+- break;
+- }
+- }
+ }
+
+ // 'const', 'pure' and 'noalias' attributed functions are also nounwind.
+--- b/test/CodeGen/alloc-fns-alignment.c
++++ /dev/null
+@@ -1,35 +0,0 @@
+-// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -emit-llvm < %s | FileCheck %s --check-prefix=ALIGN16
+-// RUN: %clang_cc1 -triple x86_64-windows-msvc -emit-llvm < %s | FileCheck %s --check-prefix=ALIGN16
+-// RUN: %clang_cc1 -triple i386-apple-darwin -emit-llvm < %s | FileCheck %s --check-prefix=ALIGN16
+-// RUN: %clang_cc1 -triple i386-unknown-linux-gnu -emit-llvm < %s | FileCheck %s --check-prefix=ALIGN8
+-// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fno-builtin-malloc -emit-llvm < %s | FileCheck %s --check-prefix=NOBUILTIN-MALLOC
+-// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fno-builtin-calloc -emit-llvm < %s | FileCheck %s --check-prefix=NOBUILTIN-CALLOC
+-// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fno-builtin-realloc -emit-llvm < %s | FileCheck %s --check-prefix=NOBUILTIN-REALLOC
+-
+-typedef __SIZE_TYPE__ size_t;
+-
+-void *malloc(size_t);
+-void *calloc(size_t, size_t);
+-void *realloc(void *, size_t);
+-
+-void *malloc_test(size_t n) {
+- return malloc(n);
+-}
+-
+-void *calloc_test(size_t n) {
+- return calloc(1, n);
+-}
+-
+-void *raalloc_test(void *p, size_t n) {
+- return realloc(p, n);
+-}
+-
+-// ALIGN16: align 16 i8* @malloc
+-// ALIGN16: align 16 i8* @calloc
+-// ALIGN16: align 16 i8* @realloc
+-// ALIGN8: align 8 i8* @malloc
+-// ALIGN8: align 8 i8* @calloc
+-// ALIGN8: align 8 i8* @realloc
+-// NOBUILTIN-MALLOC: declare i8* @malloc
+-// NOBUILTIN-CALLOC: declare i8* @calloc
+-// NOBUILTIN-REALLOC: declare i8* @realloc
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/default.nix
index 6c87366ea3..a89c6dabe3 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/default.nix
@@ -252,11 +252,18 @@ let
);
};
- libcxxabi = callPackage ./libcxxabi {
- inherit llvm_meta;
- stdenv = if stdenv.hostPlatform.useLLVM or false
+ libcxxabi = let
+ stdenv_ = if stdenv.hostPlatform.useLLVM or false
then overrideCC stdenv buildLlvmTools.clangNoLibcxx
else stdenv;
+ cxx-headers = callPackage ./libcxx {
+ inherit llvm_meta;
+ stdenv = stdenv_;
+ headersOnly = true;
+ };
+ in callPackage ./libcxxabi {
+ stdenv = stdenv_;
+ inherit llvm_meta cxx-headers;
};
libunwind = callPackage ./libunwind {
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/libcxx/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/libcxx/default.nix
index c60039274d..ddf51d9a2f 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/libcxx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/libcxx/default.nix
@@ -1,15 +1,23 @@
{ lib, stdenv, llvm_meta, src, cmake, python3, fixDarwinDylibNames, version
+, libcxxabi
, enableShared ? !stdenv.hostPlatform.isStatic
+
+# If headersOnly is true, the resulting package would only include the headers.
+# Use this to break the circular dependency between libcxx and libcxxabi.
+#
+# Some context:
+# https://reviews.llvm.org/rG1687f2bbe2e2aaa092f942d4a97d41fad43eedfb
+, headersOnly ? false
}:
stdenv.mkDerivation rec {
- pname = "libcxx";
+ pname = if headersOnly then "cxx-headers" else "libcxx";
inherit version;
inherit src;
- sourceRoot = "source/${pname}";
+ sourceRoot = "source/libcxx";
- outputs = [ "out" "dev" ];
+ outputs = [ "out" ] ++ lib.optional (!headersOnly) "dev";
patches = [
./gnu-install-dirs.patch
@@ -17,6 +25,12 @@ stdenv.mkDerivation rec {
../../libcxx-0001-musl-hacks.patch
];
+ # Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz"
+ postPatch = ''
+ substituteInPlace include/__config \
+ --replace "# define _LIBCPP_USE_AVAILABILITY_APPLE" ""
+ '';
+
preConfigure = lib.optionalString stdenv.hostPlatform.isMusl ''
patchShebangs utils/cat_files.py
'';
@@ -24,15 +38,29 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake python3 ]
++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
- cmakeFlags = [
- ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1"
+ buildInputs = lib.optionals (!headersOnly) [ libcxxabi ];
+
+ cmakeFlags = [ "-DLIBCXX_CXX_ABI=libcxxabi" ]
+ ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1"
++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"
- ++ lib.optional stdenv.hostPlatform.isWasm [
+ ++ lib.optionals stdenv.hostPlatform.isWasm [
"-DLIBCXX_ENABLE_THREADS=OFF"
"-DLIBCXX_ENABLE_FILESYSTEM=OFF"
"-DLIBCXX_ENABLE_EXCEPTIONS=OFF"
] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF";
+ buildFlags = lib.optional headersOnly "generate-cxx-headers";
+ installTargets = lib.optional headersOnly "install-cxx-headers";
+
+ # At this point, cxxabi headers would be installed in the dev output, which
+ # prevents moveToOutput from doing its job later in the build process.
+ postInstall = lib.optionalString (!headersOnly) ''
+ mv "$dev/include/c++/v1/"* "$out/include/c++/v1/"
+ pushd "$dev"
+ rmdir -p include/c++/v1
+ popd
+ '';
+
passthru = {
isLLVM = true;
};
@@ -45,9 +73,6 @@ stdenv.mkDerivation rec {
C++14 and above.
'';
- # https://github.com/NixOS/nixpkgs/pull/133217#issuecomment-895742807
- broken = stdenv.isDarwin;
-
# "All of the code in libc++ is dual licensed under the MIT license and the
# UIUC License (a BSD-like license)":
license = with lib.licenses; [ mit ncsa ];
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/libcxxabi/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/libcxxabi/default.nix
index 6267678c46..0bdbee07b7 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/libcxxabi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/libcxxabi/default.nix
@@ -1,6 +1,7 @@
-{ lib, stdenv, llvm_meta, cmake, python3, src, libunwind, version
+{ lib, stdenv, llvm_meta, cmake, python3, src, cxx-headers, libunwind, version
, enableShared ? !stdenv.hostPlatform.isStatic
-, libcxx
+, standalone ? stdenv.hostPlatform.useLLVM or false
+, withLibunwind ? !stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm
}:
stdenv.mkDerivation rec {
@@ -23,12 +24,13 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ cmake python3 ];
- buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;
+ buildInputs = lib.optional withLibunwind libunwind;
cmakeFlags = [
- "-DLIBCXXABI_LIBCXX_INCLUDES=${libcxx.dev}/include/c++/v1"
- ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [
+ "-DLIBCXXABI_LIBCXX_INCLUDES=${cxx-headers}/include/c++/v1"
+ ] ++ lib.optionals standalone [
"-DLLVM_ENABLE_LIBCXX=ON"
+ ] ++ lib.optionals (standalone && withLibunwind) [
"-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
] ++ lib.optionals stdenv.hostPlatform.isWasm [
"-DLIBCXXABI_ENABLE_THREADS=OFF"
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/libcxx/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/libcxx/default.nix
index 3e39dd8404..7077081c59 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/libcxx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/libcxx/default.nix
@@ -19,6 +19,12 @@ stdenv.mkDerivation {
../../libcxx-0001-musl-hacks.patch
];
+ # Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz"
+ postPatch = ''
+ substituteInPlace include/__config \
+ --replace "#define _LIBCPP_USE_AVAILABILITY_APPLE" ""
+ '';
+
prePatch = ''
substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++"
'';
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libcxx/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libcxx/default.nix
index ac10e8eb77..07d84432d4 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libcxx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libcxx/default.nix
@@ -21,6 +21,12 @@ stdenv.mkDerivation {
../../libcxx-0001-musl-hacks.patch
];
+ # Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz"
+ postPatch = ''
+ substituteInPlace include/__config \
+ --replace "# define _LIBCPP_USE_AVAILABILITY_APPLE" ""
+ '';
+
prePatch = ''
substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++"
'';
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libcxx/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libcxx/default.nix
index 804b9a53c2..87cd734899 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libcxx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libcxx/default.nix
@@ -21,6 +21,12 @@ stdenv.mkDerivation {
../../libcxx-0001-musl-hacks.patch
];
+ # Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz"
+ postPatch = ''
+ substituteInPlace include/__config \
+ --replace "# define _LIBCPP_USE_AVAILABILITY_APPLE" ""
+ '';
+
prePatch = ''
substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++"
'';
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libcxx/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libcxx/default.nix
index b2022f23e5..2719711031 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libcxx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libcxx/default.nix
@@ -21,6 +21,12 @@ stdenv.mkDerivation {
../../libcxx-0001-musl-hacks.patch
];
+ # Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz"
+ postPatch = ''
+ substituteInPlace include/__config \
+ --replace "# define _LIBCPP_USE_AVAILABILITY_APPLE" ""
+ '';
+
preConfigure = ''
# Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package
cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$LIBCXXABI_INCLUDE_DIR")
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/default.nix
index fb2baf0e29..666e9be3cd 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/default.nix
@@ -247,11 +247,18 @@ let
else stdenv;
};
- libcxxabi = callPackage ./libcxxabi {
- inherit llvm_meta;
- stdenv = if stdenv.hostPlatform.useLLVM or false
+ libcxxabi = let
+ stdenv_ = if stdenv.hostPlatform.useLLVM or false
then overrideCC stdenv buildLlvmTools.clangNoLibcxx
else stdenv;
+ cxx-headers = callPackage ./libcxx {
+ inherit llvm_meta;
+ stdenv = stdenv_;
+ headersOnly = true;
+ };
+ in callPackage ./libcxxabi {
+ stdenv = stdenv_;
+ inherit llvm_meta cxx-headers;
};
libunwind = callPackage ./libunwind {
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxx/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxx/default.nix
index f511eba81d..bedfd5afee 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxx/default.nix
@@ -1,15 +1,23 @@
{ lib, stdenv, llvm_meta, src, cmake, python3, fixDarwinDylibNames, version
+, libcxxabi
, enableShared ? !stdenv.hostPlatform.isStatic
+
+# If headersOnly is true, the resulting package would only include the headers.
+# Use this to break the circular dependency between libcxx and libcxxabi.
+#
+# Some context:
+# https://reviews.llvm.org/rG1687f2bbe2e2aaa092f942d4a97d41fad43eedfb
+, headersOnly ? false
}:
stdenv.mkDerivation rec {
- pname = "libcxx";
+ pname = if headersOnly then "cxx-headers" else "libcxx";
inherit version;
inherit src;
- sourceRoot = "source/${pname}";
+ sourceRoot = "source/libcxx";
- outputs = [ "out" "dev" ];
+ outputs = [ "out" ] ++ lib.optional (!headersOnly) "dev";
patches = [
./gnu-install-dirs.patch
@@ -17,6 +25,12 @@ stdenv.mkDerivation rec {
../../libcxx-0001-musl-hacks.patch
];
+ # Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz"
+ postPatch = ''
+ substituteInPlace include/__config \
+ --replace "# define _LIBCPP_USE_AVAILABILITY_APPLE" ""
+ '';
+
preConfigure = lib.optionalString stdenv.hostPlatform.isMusl ''
patchShebangs utils/cat_files.py
'';
@@ -24,15 +38,29 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake python3 ]
++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
- cmakeFlags = [
- ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1"
+ buildInputs = lib.optionals (!headersOnly) [ libcxxabi ];
+
+ cmakeFlags = [ "-DLIBCXX_CXX_ABI=libcxxabi" ]
+ ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1"
++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"
- ++ lib.optional stdenv.hostPlatform.isWasm [
+ ++ lib.optionals stdenv.hostPlatform.isWasm [
"-DLIBCXX_ENABLE_THREADS=OFF"
"-DLIBCXX_ENABLE_FILESYSTEM=OFF"
"-DLIBCXX_ENABLE_EXCEPTIONS=OFF"
] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF";
+ buildFlags = lib.optional headersOnly "generate-cxx-headers";
+ installTargets = lib.optional headersOnly "install-cxx-headers";
+
+ # At this point, cxxabi headers would be installed in the dev output, which
+ # prevents moveToOutput from doing its job later in the build process.
+ postInstall = lib.optionalString (!headersOnly) ''
+ mv "$dev/include/c++/v1/"* "$out/include/c++/v1/"
+ pushd "$dev"
+ rmdir -p include/c++/v1
+ popd
+ '';
+
passthru = {
isLLVM = true;
};
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/default.nix
index 6267678c46..9f14f87a7a 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/default.nix
@@ -1,6 +1,5 @@
-{ lib, stdenv, llvm_meta, cmake, python3, src, libunwind, version
+{ lib, stdenv, llvm_meta, cmake, python3, src, cxx-headers, libunwind, version
, enableShared ? !stdenv.hostPlatform.isStatic
-, libcxx
}:
stdenv.mkDerivation rec {
@@ -26,7 +25,7 @@ stdenv.mkDerivation rec {
buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;
cmakeFlags = [
- "-DLIBCXXABI_LIBCXX_INCLUDES=${libcxx.dev}/include/c++/v1"
+ "-DLIBCXXABI_LIBCXX_INCLUDES=${cxx-headers}/include/c++/v1"
] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [
"-DLLVM_ENABLE_LIBCXX=ON"
"-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
diff --git a/third_party/nixpkgs/pkgs/development/compilers/mozart/default.nix b/third_party/nixpkgs/pkgs/development/compilers/mozart/default.nix
index d9ab475880..4c066de860 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/mozart/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/mozart/default.nix
@@ -4,7 +4,8 @@
, cmake
, unzip
, makeWrapper
-, boost
+, boost169
+, pinnedBoost ? boost169
, llvmPackages
, llvmPackages_5
, gmp
@@ -67,7 +68,7 @@ in stdenv.mkDerivation rec {
'';
buildInputs = [
- boost
+ pinnedBoost
llvmPackages_5.llvm
llvmPackages_5.clang
llvmPackages_5.clang-unwrapped
diff --git a/third_party/nixpkgs/pkgs/development/compilers/opendylan/bin.nix b/third_party/nixpkgs/pkgs/development/compilers/opendylan/bin.nix
index 9687f1b1a6..f105707f93 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/opendylan/bin.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/opendylan/bin.nix
@@ -2,15 +2,16 @@
# The binaries can also be used as is.
{lib, stdenv, fetchurl, patchelf, boehmgc, gnused, gcc, makeWrapper}:
-stdenv.mkDerivation {
- name = "opendylan-2013.2";
+stdenv.mkDerivation rec {
+ pname = "opendylan";
+ version = "2013.2";
src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl {
- url = "https://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86_64-linux.tar.bz2";
+ url = "https://opendylan.org/downloads/opendylan/${version}/opendylan-${version}-x86_64-linux.tar.bz2";
sha256 = "035brbw3hm7zrs593q4zc42yglj1gmmkw3b1r7zzlw3ks4i2lg7h";
}
else if stdenv.hostPlatform.system == "i686-linux" then fetchurl {
- url = "https://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86-linux.tar.bz2";
+ url = "https://opendylan.org/downloads/opendylan/${version}/opendylan-${version}-x86-linux.tar.bz2";
sha256 = "0c61ihvblcsjrw6ncr8x8ylhskcrqs8pajs4mg5di36cvqw12nq5";
}
else throw "platform ${stdenv.hostPlatform.system} not supported.";
diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/1_56.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/1_57.nix
similarity index 58%
rename from third_party/nixpkgs/pkgs/development/compilers/rust/1_56.nix
rename to third_party/nixpkgs/pkgs/development/compilers/rust/1_57.nix
index 49df8bcd5e..f6b9d3c72a 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/rust/1_56.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/rust/1_57.nix
@@ -20,8 +20,8 @@
} @ args:
import ./default.nix {
- rustcVersion = "1.56.1";
- rustcSha256 = "04cmqx7nn63hzz7z27b2b0dj2qx18rck9ifvip43s6dampx8v2f3";
+ rustcVersion = "1.57.0";
+ rustcSha256 = "06jw8ka2p3kls8p0gd4p0chhhb1ia1mlvj96zn78n7qvp71zjiim";
llvmSharedForBuild = pkgsBuildBuild.llvmPackages_13.libllvm.override { enableSharedLibraries = true; };
llvmSharedForHost = pkgsBuildHost.llvmPackages_13.libllvm.override { enableSharedLibraries = true; };
@@ -37,24 +37,24 @@ import ./default.nix {
# Note: the version MUST be one version prior to the version we're
# building
- bootstrapVersion = "1.55.0";
+ bootstrapVersion = "1.56.1";
# fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
bootstrapHashes = {
- i686-unknown-linux-gnu = "6e42b6c44d2eb4170f4144423fa3c33338d8d5c3ea00b03bbac200c877bc9e98";
- x86_64-unknown-linux-gnu = "2080253a2ec36ac8ed6e060d30802d888533124b8d16545cfd4af898b365eaac";
- x86_64-unknown-linux-musl = "f24f68587253c4bfbe59d3d10fe4897068d9130538de6b2d02097a25718030c2";
- arm-unknown-linux-gnueabihf = "483444153d35cda51c6aec2c24bc4c97fa4fd30b28df4b60bf9763bd6e06da3a";
- armv7-unknown-linux-gnueabihf = "8c72f0eb75b10db970fb546c3b41f5e97df294d5dbbf0b8fa96e17f2b281ee9c";
- aarch64-unknown-linux-gnu = "eebdb2e659ed14884a49f0457d44e5e8c9f89fca3414533752c6dbb96232c156";
- aarch64-unknown-linux-musl = "2ce36a7d34f1f2aa43b4cbc0b437d96eefb45743828bf9ae699ff581ae257f28";
- x86_64-apple-darwin = "2e345ac7724c192c9487a2c6bd4f6c52c884d791981510288830d27d9a0bf2f3";
- aarch64-apple-darwin = "70c71d30d0de76912fcd88d503a6cb4323cfe6250c1a255be7e0d4e644b3d40a";
- powerpc64le-unknown-linux-gnu = "12bf6447d338cbe2b55539b84e6369b17e7eefe938d1ba7e3dd69781c9cc9812";
- riscv64gc-unknown-linux-gnu = "effceb45346fef3b0b54b357336e6f374f788b803bb1bee4084f25eace8907f3";
+ i686-unknown-linux-gnu = "84db34603ce22d93312ff8bccd5580fe112e932bbeb0361e7cc37668a9803a27";
+ x86_64-unknown-linux-gnu = "a6be5d045183a0b12dddf0d81633e2a64e63e4c2dfa44eb7593970c1ef93a98f";
+ x86_64-unknown-linux-musl = "3c09058d104d9a88943fb343af1fb70422f9c4a987e6703666ee8a8051211190";
+ arm-unknown-linux-gnueabihf = "c445706d109bb74de4c889687ae08a48af5808676fda15b84b7ef5970a82a5f6";
+ armv7-unknown-linux-gnueabihf = "29ec65af502370c0c1a49faecd7131f1243fe3005b419ead4b40b267af2b2db0";
+ aarch64-unknown-linux-gnu = "69792887357c8dd78c5424f0b4a624578296796d99edf6c30ebe2acc2b939aa3";
+ aarch64-unknown-linux-musl = "971d13d41657e50e3ac54f17f52b4198c3d8bc25ec489a6a9e6d12c18226dda5";
+ x86_64-apple-darwin = "8d65ef02a123c23be00101fb204d28b60498b9145dd2ee8edabf0afde6e01e55";
+ aarch64-apple-darwin = "e71c14c1368048a22e4d1851f301872ac2e6f4c574f04d2a7ae4d64b0e7c7235";
+ powerpc64le-unknown-linux-gnu = "fa78b28fe1ef3cd4add9ec151e5eab756dfc83c8bc3e5a576a6eddd350c4de7a";
+ riscv64gc-unknown-linux-gnu = "5ec327d1bd3ba8d00afbe9be4a1f0fb8ab845063fcf9be479be9493c52a4dbb6";
};
- selectRustPackage = pkgs: pkgs.rust_1_56;
+ selectRustPackage = pkgs: pkgs.rust_1_57;
rustcPatches = [
];
diff --git a/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix b/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix
index 76f13ec689..f446251fd3 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix
@@ -114,8 +114,8 @@ in rec {
};
vala_0_54 = generic {
- version = "0.54.2";
- sha256 = "iE3nRTF9TVbk6M7emT3I8E1Qz8o2z2DS8vJ4wwwrExE=";
+ version = "0.54.3";
+ sha256 = "7R1f5MvAzShF0N5PH/77Fa+waJLSMMfMppV4FnLo+2A=";
};
vala = vala_0_54;
diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/lib/compose.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/lib/compose.nix
index f19b6241f2..a831a83a15 100644
--- a/third_party/nixpkgs/pkgs/development/haskell-modules/lib/compose.nix
+++ b/third_party/nixpkgs/pkgs/development/haskell-modules/lib/compose.nix
@@ -288,7 +288,11 @@ rec {
enableLibraryProfiling = false;
isLibrary = false;
doHaddock = false;
- postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc";
+ postFixup = drv.postFixup or "" + ''
+
+ # Remove every directory which could have links to other store paths.
+ rm -rf $out/lib $out/nix-support $out/share/doc
+ '';
});
/* Build a source distribution tarball instead of using the source files
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/dzaima-apl/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/dzaima-apl/default.nix
index d061a6cb9c..e0a8478297 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/dzaima-apl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/dzaima-apl/default.nix
@@ -64,6 +64,7 @@ stdenv.mkDerivation rec {
license = licenses.mit;
maintainers = with maintainers; [ AndersonTorres ];
inherit (jdk.meta) platforms;
+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/dapl-native.x86_64-darwin
};
}
# TODO: Processing app
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/love/0.7.nix b/third_party/nixpkgs/pkgs/development/interpreters/love/0.7.nix
index 6cba19bff0..6d8b996f18 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/love/0.7.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/love/0.7.nix
@@ -6,9 +6,11 @@
}:
stdenv.mkDerivation rec {
- name = "love-0.7.2";
+ pname = "love";
+ version = "0.7.2";
+
src = fetchurl {
- url = "https://bitbucket.org/rude/love/downloads/${name}-linux-src.tar.gz";
+ url = "https://bitbucket.org/rude/love/downloads/love-${version}-linux-src.tar.gz";
sha256 = "0s7jywkvydlshlgy11ilzngrnybmq5xlgzp2v2dhlffwrfqdqym5";
};
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/love/0.9.nix b/third_party/nixpkgs/pkgs/development/interpreters/love/0.9.nix
index b7e20498a3..512aade7f9 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/love/0.9.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/love/0.9.nix
@@ -5,9 +5,11 @@
}:
stdenv.mkDerivation rec {
- name = "love-0.9.1";
+ pname = "love";
+ version = "0.9.1";
+
src = fetchurl {
- url = "https://bitbucket.org/rude/love/downloads/${name}-linux-src.tar.gz";
+ url = "https://bitbucket.org/rude/love/downloads/love-${version}-linux-src.tar.gz";
sha256 = "1pikd0bzb44r4bf0jbgn78whz1yswpq1n5jc8nf87v42pm30kp84";
};
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/3.11/no-ldconfig.patch b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/3.11/no-ldconfig.patch
new file mode 100644
index 0000000000..ca6a76d0ff
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/3.11/no-ldconfig.patch
@@ -0,0 +1,107 @@
+From 5330b6af9f832af59aa5c61d9ef6971053a8e709 Mon Sep 17 00:00:00 2001
+From: Jonathan Ringer
+Date: Mon, 9 Nov 2020 10:24:35 -0800
+Subject: [PATCH] CPython: Don't use ldconfig
+
+---
+ Lib/ctypes/util.py | 77 ++--------------------------------------------
+ 1 file changed, 2 insertions(+), 75 deletions(-)
+
+diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
+index 0c2510e161..7fb98af308 100644
+--- a/Lib/ctypes/util.py
++++ b/Lib/ctypes/util.py
+@@ -100,53 +100,7 @@ def _is_elf(filename):
+ return thefile.read(4) == elf_header
+
+ def _findLib_gcc(name):
+- # Run GCC's linker with the -t (aka --trace) option and examine the
+- # library name it prints out. The GCC command will fail because we
+- # haven't supplied a proper program with main(), but that does not
+- # matter.
+- expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name))
+-
+- c_compiler = shutil.which('gcc')
+- if not c_compiler:
+- c_compiler = shutil.which('cc')
+- if not c_compiler:
+- # No C compiler available, give up
+- return None
+-
+- temp = tempfile.NamedTemporaryFile()
+- try:
+- args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name]
+-
+- env = dict(os.environ)
+- env['LC_ALL'] = 'C'
+- env['LANG'] = 'C'
+- try:
+- proc = subprocess.Popen(args,
+- stdout=subprocess.PIPE,
+- stderr=subprocess.STDOUT,
+- env=env)
+- except OSError: # E.g. bad executable
+- return None
+- with proc:
+- trace = proc.stdout.read()
+- finally:
+- try:
+- temp.close()
+- except FileNotFoundError:
+- # Raised if the file was already removed, which is the normal
+- # behaviour of GCC if linking fails
+- pass
+- res = re.findall(expr, trace)
+- if not res:
+- return None
+-
+- for file in res:
+- # Check if the given file is an elf file: gcc can report
+- # some files that are linker scripts and not actual
+- # shared objects. See bpo-41976 for more details
+- if not _is_elf(file):
+- continue
+- return os.fsdecode(file)
++ return None
+
+
+ if sys.platform == "sunos5":
+@@ -268,34 +222,7 @@ def find_library(name, is64 = False):
+ else:
+
+ def _findSoname_ldconfig(name):
+- import struct
+- if struct.calcsize('l') == 4:
+- machine = os.uname().machine + '-32'
+- else:
+- machine = os.uname().machine + '-64'
+- mach_map = {
+- 'x86_64-64': 'libc6,x86-64',
+- 'ppc64-64': 'libc6,64bit',
+- 'sparc64-64': 'libc6,64bit',
+- 's390x-64': 'libc6,64bit',
+- 'ia64-64': 'libc6,IA-64',
+- }
+- abi_type = mach_map.get(machine, 'libc6')
+-
+- # XXX assuming GLIBC's ldconfig (with option -p)
+- regex = r'\s+(lib%s\.[^\s]+)\s+\(%s'
+- regex = os.fsencode(regex % (re.escape(name), abi_type))
+- try:
+- with subprocess.Popen(['/sbin/ldconfig', '-p'],
+- stdin=subprocess.DEVNULL,
+- stderr=subprocess.DEVNULL,
+- stdout=subprocess.PIPE,
+- env={'LC_ALL': 'C', 'LANG': 'C'}) as p:
+- res = re.search(regex, p.stdout.read())
+- if res:
+- return os.fsdecode(res.group(1))
+- except OSError:
+- pass
++ return None
+
+ def _findLib_ld(name):
+ # See issue #9998 for why this is needed
+--
+2.33.1
+
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix
index e033858acc..dbfe1c51b4 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix
@@ -2,10 +2,12 @@
{ stdenv, fetchurl, lib }:
-stdenv.mkDerivation {
- name = "python27-docs-html-2.7.16";
+stdenv.mkDerivation rec {
+ pname = "python27-docs-html";
+ version = "2.7.16";
+
src = fetchurl {
- url = "http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-html.tar.bz2";
+ url = "http://docs.python.org/ftp/python/doc/${version}/python-${version}-docs-html.tar.bz2";
sha256 = "1razs1grzhai65ihaiyph8kz6ncjkgp1gsn3c8v7kanf13lqim02";
};
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix
index c9a770a6fc..cf03df68b0 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix
@@ -2,10 +2,12 @@
{ stdenv, fetchurl, lib }:
-stdenv.mkDerivation {
- name = "python27-docs-pdf-a4-2.7.16";
+stdenv.mkDerivation rec {
+ pname = "python27-docs-pdf-a4";
+ version = "2.7.16";
+
src = fetchurl {
- url = "http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-pdf-a4.tar.bz2";
+ url = "http://docs.python.org/ftp/python/doc/${version}/python-${version}-docs-pdf-a4.tar.bz2";
sha256 = "14ml1ynrlbhg43737bdsb8k5y39wsffqj4iwhylhb8n8l5dplfdq";
};
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix
index e03d031bae..d75ea77f78 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix
@@ -2,10 +2,12 @@
{ stdenv, fetchurl, lib }:
-stdenv.mkDerivation {
- name = "python27-docs-pdf-letter-2.7.16";
+stdenv.mkDerivation rec {
+ pname = "python27-docs-pdf-letter";
+ version = "2.7.16";
+
src = fetchurl {
- url = "http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-pdf-letter.tar.bz2";
+ url = "http://docs.python.org/ftp/python/doc/${version}/python-${version}-docs-pdf-letter.tar.bz2";
sha256 = "019i8n48m71mn31v8d85kkwyqfgcgqnqh506y4a7fcgf656bajs0";
};
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix
index d19d7be193..0c217d1884 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix
@@ -2,10 +2,12 @@
{ stdenv, fetchurl, lib }:
-stdenv.mkDerivation {
- name = "python27-docs-text-2.7.16";
+stdenv.mkDerivation rec {
+ pname = "python27-docs-text";
+ version = "2.7.16";
+
src = fetchurl {
- url = "http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-text.tar.bz2";
+ url = "http://docs.python.org/ftp/python/doc/${version}/python-${version}-docs-text.tar.bz2";
sha256 = "1da7swlykvc013684nywycinfz3v8dqkcmv0zj8p7l5lyi5mq03r";
};
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix
index a83363b5c4..2e399aa52f 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix
@@ -2,10 +2,12 @@
{ stdenv, fetchurl, lib }:
-stdenv.mkDerivation {
- name = "python37-docs-html-3.7.2";
+stdenv.mkDerivation rec {
+ pname = "python37-docs-html";
+ version = "3.7.2";
+
src = fetchurl {
- url = "http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-html.tar.bz2";
+ url = "http://docs.python.org/ftp/python/doc/${version}/python-${version}-docs-html.tar.bz2";
sha256 = "19wbrawpdam09fmyipfy92sxwn1rl93v8jkfqsfx028qhvzf0422";
};
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix
index e60032f71b..9879a26be5 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix
@@ -2,10 +2,12 @@
{ stdenv, fetchurl, lib }:
-stdenv.mkDerivation {
- name = "python37-docs-pdf-a4-3.7.2";
+stdenv.mkDerivation rec {
+ pname = "python37-docs-pdf-a4";
+ version = "3.7.2";
+
src = fetchurl {
- url = "http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-pdf-a4.tar.bz2";
+ url = "http://docs.python.org/ftp/python/doc/${version}/python-${version}-docs-pdf-a4.tar.bz2";
sha256 = "0vdx762m30hjaabn6w88awcj2qpbz0b6z59zn9wmamd35k59lfba";
};
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix
index b737a1e329..7c58c45776 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix
@@ -2,10 +2,12 @@
{ stdenv, fetchurl, lib }:
-stdenv.mkDerivation {
- name = "python37-docs-pdf-letter-3.7.2";
+stdenv.mkDerivation rec {
+ pname = "python37-docs-pdf-letter";
+ version = "3.7.2";
+
src = fetchurl {
- url = "http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-pdf-letter.tar.bz2";
+ url = "http://docs.python.org/ftp/python/doc/${version}/python-${version}-docs-pdf-letter.tar.bz2";
sha256 = "17g57vlyvqx0k916q84q2pcx7y8myw0fda9fvg9kh0ph930c837x";
};
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix
index 2897042ec0..641e4913f6 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix
@@ -2,10 +2,12 @@
{ stdenv, fetchurl, lib }:
-stdenv.mkDerivation {
- name = "python37-docs-text-3.7.2";
+stdenv.mkDerivation rec {
+ pname = "python37-docs-text";
+ version = "3.7.2";
+
src = fetchurl {
- url = "http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-text.tar.bz2";
+ url = "http://docs.python.org/ftp/python/doc/${version}/python-${version}-docs-text.tar.bz2";
sha256 = "0h50rlr8jclwfxa106b42q2vn2ynp219c4zsy5qz65n5m3b7y1g2";
};
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix
index 9078e0901c..3e53ea251a 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix
@@ -95,6 +95,7 @@ with pkgs;
isPy38 = pythonVersion == "3.8";
isPy39 = pythonVersion == "3.9";
isPy310 = pythonVersion == "3.10";
+ isPy311 = pythonVersion == "3.11";
isPy2 = lib.strings.substring 0 1 pythonVersion == "2";
isPy3 = lib.strings.substring 0 1 pythonVersion == "3";
isPy3k = isPy3;
@@ -132,10 +133,10 @@ with pkgs;
sourceVersion = {
major = "3";
minor = "9";
- patch = "6";
+ patch = "9";
suffix = "";
};
- sha256 = "12hhw2685i68pwfx5hdkqngzhbji4ccyjmqb5rzvkigg6fpj0y9r";
+ sha256 = "sha256-BoKMBKVzwHOk5RxCkqJ8G+SuJmIcPtx8+TGEGM47bSc=";
};
};
@@ -192,6 +193,19 @@ in {
inherit passthruFun;
};
+ python311 = callPackage ./cpython {
+ self = python311;
+ sourceVersion = {
+ major = "3";
+ minor = "11";
+ patch = "0";
+ suffix = "a2";
+ };
+ sha256 = "sha256-aKjE1s4lSKe2F9aZ+9s0iTe9rODPltsaoIOEnfXa0T8=";
+ inherit (darwin) configd;
+ inherit passthruFun;
+ };
+
# Minimal versions of Python (built without optional dependencies)
python3Minimal = (callPackage ./cpython ({
self = python3Minimal;
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh b/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh
index 15d2bd0eb3..37479d9d41 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh
+++ b/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh
@@ -24,6 +24,17 @@ pythonNamespacesHook() {
rm -v "$pathToRemove"
fi
+ # remove ${pname}-${version}-${python-interpeter}-nspkg.pth
+ #
+ # Still need to check that parent directory exists in the
+ # event of a "meta-package" package, which will just install
+ # other packages, but not produce anything in site-packages
+ # besides meta information
+ if [ -d "${constructedPath}/../" -a -z ${dontRemovePth-} ]; then
+ # .pth files are located in the parent directory of a module
+ @findutils@/bin/find ${constructedPath}/../ -name '*-nspkg.pth' -exec rm -v "{}" +
+ fi
+
# remove __pycache__/ entry, can be interpreter specific. E.g. __init__.cpython-38.pyc
# use null characters to perserve potential whitespace in filepath
if [ -d "$pycachePath" ]; then
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aalib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aalib/default.nix
index b007e71ce4..af0fa61740 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/aalib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/aalib/default.nix
@@ -1,10 +1,11 @@
{lib, stdenv, fetchurl, ncurses, automake}:
-stdenv.mkDerivation {
- name = "aalib-1.4rc5";
+stdenv.mkDerivation rec {
+ pname = "aalib";
+ version = "1.4rc5";
src = fetchurl {
- url = "mirror://sourceforge/aa-project/aalib-1.4rc5.tar.gz";
+ url = "mirror://sourceforge/aa-project/aalib-${version}.tar.gz";
sha256 = "1vkh19gb76agvh4h87ysbrgy82hrw88lnsvhynjf4vng629dmpgv";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/acl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/acl/default.nix
index 936e793caf..1ac577e19c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/acl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/acl/default.nix
@@ -6,10 +6,11 @@
# files.
stdenv.mkDerivation rec {
- name = "acl-2.3.1";
+ pname = "acl";
+ version = "2.3.1";
src = fetchurl {
- url = "mirror://savannah/acl/${name}.tar.gz";
+ url = "mirror://savannah/acl/acl-${version}.tar.gz";
sha256 = "sha256-dgxhxokBs3/dXu/ur0wMeia9/disdHoe3/HODiQ8Ea8=";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aubio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aubio/default.nix
index e1f2d32687..22cac39dbe 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/aubio/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/aubio/default.nix
@@ -3,10 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "aubio-0.4.9";
+ pname = "aubio";
+ version = "0.4.9";
src = fetchurl {
- url = "https://aubio.org/pub/${name}.tar.bz2";
+ url = "https://aubio.org/pub/aubio-${version}.tar.bz2";
sha256 = "1npks71ljc48w6858l9bq30kaf5nph8z0v61jkfb70xb9np850nl";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/rtmidi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/rtmidi/default.nix
index 6c75b9866e..2ba981ae46 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/audio/rtmidi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/audio/rtmidi/default.nix
@@ -42,6 +42,9 @@ stdenv.mkDerivation rec {
url = "https://github.com/thestk/rtmidi/pull/230/commits/892fe5492f0e787484fa4a37027b08c265ce001f.patch";
sha256 = "0ca9m42xa3gmycimzvzvl67wa266xq9pfp1b4v555rh2fp52kbcj";
})
+
+ # https://github.com/thestk/rtmidi/pull/277
+ ./macos_include_targetconditionals.patch
];
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/rtmidi/macos_include_targetconditionals.patch b/third_party/nixpkgs/pkgs/development/libraries/audio/rtmidi/macos_include_targetconditionals.patch
new file mode 100644
index 0000000000..58eaf5f490
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/audio/rtmidi/macos_include_targetconditionals.patch
@@ -0,0 +1,13 @@
+diff -ru a/RtMidi.cpp b/RtMidi.cpp
+--- a/RtMidi.cpp 2021-12-23 16:46:33.000000000 -0500
++++ b/RtMidi.cpp 2021-12-23 16:48:19.000000000 -0500
+@@ -39,6 +39,9 @@
+
+ #include "RtMidi.h"
+ #include
++#if defined(__APPLE__)
++#include
++#endif
+
+ #if defined(__MACOSX_CORE__)
+ #if TARGET_OS_IPHONE
diff --git a/third_party/nixpkgs/pkgs/development/libraries/audiofile/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audiofile/default.nix
index 54df6d7b25..64c6d8ee4f 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/audiofile/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/audiofile/default.nix
@@ -11,7 +11,8 @@ let
in
stdenv.mkDerivation rec {
- name = "audiofile-0.3.6";
+ pname = "audiofile";
+ version = "0.3.6";
buildInputs =
lib.optionals stdenv.isLinux [
@@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
];
src = fetchurl {
- url = "https://audiofile.68k.org/${name}.tar.gz";
+ url = "https://audiofile.68k.org/audiofile-${version}.tar.gz";
sha256 = "0rb927zknk9kmhprd8rdr4azql4gn2dp75a36iazx2xhkbqhvind";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/beecrypt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/beecrypt/default.nix
index 6b86fca868..f6c61254c1 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/beecrypt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/beecrypt/default.nix
@@ -1,9 +1,11 @@
{lib, stdenv, fetchurl, m4}:
-stdenv.mkDerivation {
- name = "beecrypt-4.2.1";
+stdenv.mkDerivation rec {
+ pname = "beecrypt";
+ version = "4.2.1";
+
src = fetchurl {
- url = "mirror://sourceforge/beecrypt/beecrypt-4.2.1.tar.gz";
+ url = "mirror://sourceforge/beecrypt/beecrypt-${version}.tar.gz";
sha256 = "0pf5k1c4nsj77jfq5ip0ra1gzx2q47xaa0s008fnn6hd11b1yvr8";
};
buildInputs = [ m4 ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/boost-process/default.nix b/third_party/nixpkgs/pkgs/development/libraries/boost-process/default.nix
index 148e27faa2..551c124794 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/boost-process/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/boost-process/default.nix
@@ -1,18 +1,19 @@
{ lib, stdenv, fetchurl, unzip }:
-stdenv.mkDerivation {
- name = "boost-process-0.5";
+stdenv.mkDerivation rec {
+ pname = "boost-process";
+ version = "0.5";
src = fetchurl {
- url = "http://www.highscore.de/boost/process0.5/process.zip";
+ url = "http://www.highscore.de/boost/process${version}/process.zip";
sha256 = "1v9y9pffb2b7p642kp9ic4z6kg42ziizmyvbgrqd1ci0i4gn0831";
};
nativeBuildInputs = [ unzip ];
unpackPhase = ''
- mkdir $name
- cd $name
+ mkdir boost-process-$version
+ cd boost-process-$version
unzip $src
'';
diff --git a/third_party/nixpkgs/pkgs/development/libraries/boost/1.55.nix b/third_party/nixpkgs/pkgs/development/libraries/boost/1.55.nix
index bcb452ea4f..b01f62e9de 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/boost/1.55.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/boost/1.55.nix
@@ -1,12 +1,12 @@
{ callPackage, fetchurl, ... } @ args:
-callPackage ./generic.nix (args // {
+callPackage ./generic.nix (args // rec {
version = "1.55.0";
patches = [ ./clang-math.patch ./clang-math-2.patch ./gcc-5.patch ];
src = fetchurl {
- url = "mirror://sourceforge/boost/boost_1_55_0.tar.bz2";
+ url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2";
sha256 = "0lkv5dzssbl5fmh2nkaszi8x9qbj80pr4acf9i26sj3rvlih1w7z";
};
})
diff --git a/third_party/nixpkgs/pkgs/development/libraries/boost/1.59.nix b/third_party/nixpkgs/pkgs/development/libraries/boost/1.59.nix
index 0f6e9a35b6..88e584f5e4 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/boost/1.59.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/boost/1.59.nix
@@ -1,10 +1,10 @@
{ callPackage, fetchurl, ... } @ args:
-callPackage ./generic.nix (args // {
+callPackage ./generic.nix (args // rec {
version = "1.59.0";
src = fetchurl {
- url = "mirror://sourceforge/boost/boost_1_59_0.tar.bz2";
+ url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2";
sha256 = "1jj1aai5rdmd72g90a3pd8sw9vi32zad46xv5av8fhnr48ir6ykj";
};
})
diff --git a/third_party/nixpkgs/pkgs/development/libraries/boost/1.60.nix b/third_party/nixpkgs/pkgs/development/libraries/boost/1.60.nix
index 4bc7a1cc73..0cf81a0602 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/boost/1.60.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/boost/1.60.nix
@@ -1,10 +1,10 @@
{ callPackage, fetchurl, ... } @ args:
-callPackage ./generic.nix (args // {
+callPackage ./generic.nix (args // rec {
version = "1.60.0";
src = fetchurl {
- url = "mirror://sourceforge/boost/boost_1_60_0.tar.bz2";
+ url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2";
sha256 = "0fzx6dwqbrkd4bcd8pjv0fpapwmrxxwr8yx9g67lihlsk3zzysk8";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/boost/1.65.nix b/third_party/nixpkgs/pkgs/development/libraries/boost/1.65.nix
index 764f38d5b7..6238a88424 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/boost/1.65.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/boost/1.65.nix
@@ -1,10 +1,10 @@
{ callPackage, fetchurl, ... } @ args:
-callPackage ./generic.nix (args // {
+callPackage ./generic.nix (args // rec {
version = "1.65.1";
src = fetchurl {
- url = "mirror://sourceforge/boost/boost_1_65_1.tar.bz2";
+ url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2";
# SHA256 from http://www.boost.org/users/history/version_1_65_1.html
sha256 = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/boost/1.66.nix b/third_party/nixpkgs/pkgs/development/libraries/boost/1.66.nix
index af61aa5194..5bc3dcbff5 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/boost/1.66.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/boost/1.66.nix
@@ -1,10 +1,10 @@
{ callPackage, fetchurl, ... } @ args:
-callPackage ./generic.nix (args // {
+callPackage ./generic.nix (args // rec {
version = "1.66.0";
src = fetchurl {
- url = "mirror://sourceforge/boost/boost_1_66_0.tar.bz2";
+ url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2";
# SHA256 from http://www.boost.org/users/history/version_1_66_0.html
sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/boost/1.68.nix b/third_party/nixpkgs/pkgs/development/libraries/boost/1.68.nix
index 920dd9a300..7fb85d7239 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/boost/1.68.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/boost/1.68.nix
@@ -1,10 +1,10 @@
{ callPackage, fetchurl, fetchpatch, ... } @ args:
-callPackage ./generic.nix (args // {
+callPackage ./generic.nix (args // rec {
version = "1.68.0";
src = fetchurl {
- url = "mirror://sourceforge/boost/boost_1_68_0.tar.bz2";
+ url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2";
# SHA256 from http://www.boost.org/users/history/version_1_68_0.html
sha256 = "7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/boost/1.69.nix b/third_party/nixpkgs/pkgs/development/libraries/boost/1.69.nix
index 7292356ecd..d934e3267f 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/boost/1.69.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/boost/1.69.nix
@@ -1,10 +1,10 @@
{ callPackage, fetchurl, fetchpatch, ... } @ args:
-callPackage ./generic.nix (args // {
+callPackage ./generic.nix (args // rec {
version = "1.69.0";
src = fetchurl {
- url = "mirror://sourceforge/boost/boost_1_69_0.tar.bz2";
+ url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2";
# SHA256 from http://www.boost.org/users/history/version_1_69_0.html
sha256 = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/boost/1.70.nix b/third_party/nixpkgs/pkgs/development/libraries/boost/1.70.nix
index 3b898cfc0a..bc70797acd 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/boost/1.70.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/boost/1.70.nix
@@ -1,10 +1,10 @@
{ callPackage, fetchurl, fetchpatch, ... } @ args:
-callPackage ./generic.nix (args // {
+callPackage ./generic.nix (args // rec {
version = "1.70.0";
src = fetchurl {
- url = "mirror://sourceforge/boost/boost_1_70_0.tar.bz2";
+ url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2";
# SHA256 from http://www.boost.org/users/history/version_1_70_0.html
sha256 = "430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/boost/1.72.nix b/third_party/nixpkgs/pkgs/development/libraries/boost/1.72.nix
index 97dad9b6c8..bb2fccdfaf 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/boost/1.72.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/boost/1.72.nix
@@ -4,10 +4,9 @@ callPackage ./generic.nix (args // rec {
version = "1.72.0";
src = fetchurl {
- #url = "mirror://sourceforge/boost/boost_1_72_0.tar.bz2";
urls = [
- "mirror://sourceforge/boost/boost_1_72_0.tar.bz2"
- "https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.bz2"
+ "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
+ "https://dl.bintray.com/boostorg/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
];
# SHA256 from http://www.boost.org/users/history/version_1_72_0.html
sha256 = "59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/boost/1.73.nix b/third_party/nixpkgs/pkgs/development/libraries/boost/1.73.nix
index 289bea197c..1d53ebcccd 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/boost/1.73.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/boost/1.73.nix
@@ -4,10 +4,9 @@ callPackage ./generic.nix (args // rec {
version = "1.73.0";
src = fetchurl {
- #url = "mirror://sourceforge/boost/boost_1_73_0.tar.bz2";
urls = [
- "mirror://sourceforge/boost/boost_1_73_0.tar.bz2"
- "https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.bz2"
+ "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
+ "https://dl.bintray.com/boostorg/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
];
# SHA256 from http://www.boost.org/users/history/version_1_73_0.html
sha256 = "4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/boost/1.74.nix b/third_party/nixpkgs/pkgs/development/libraries/boost/1.74.nix
index a181ed94c2..f3a29dafbc 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/boost/1.74.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/boost/1.74.nix
@@ -5,8 +5,8 @@ callPackage ./generic.nix (args // rec {
src = fetchurl {
urls = [
- "mirror://sourceforge/boost/boost_1_74_0.tar.bz2"
- "https://dl.bintray.com/boostorg/release/1.74.0/source/boost_1_74_0.tar.bz2"
+ "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
+ "https://dl.bintray.com/boostorg/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
];
# SHA256 from http://www.boost.org/users/history/version_1_74_0.html
sha256 = "83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/boost/1.75.nix b/third_party/nixpkgs/pkgs/development/libraries/boost/1.75.nix
index ff1073bd02..1432899f99 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/boost/1.75.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/boost/1.75.nix
@@ -5,8 +5,8 @@ callPackage ./generic.nix (args // rec {
src = fetchurl {
urls = [
- "mirror://sourceforge/boost/boost_1_75_0.tar.bz2"
- "https://dl.bintray.com/boostorg/release/1.75.0/source/boost_1_75_0.tar.bz2"
+ "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
+ "https://dl.bintray.com/boostorg/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
];
# SHA256 from http://www.boost.org/users/history/version_1_75_0.html
sha256 = "953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/boost/1.77.nix b/third_party/nixpkgs/pkgs/development/libraries/boost/1.77.nix
new file mode 100644
index 0000000000..634523b244
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/boost/1.77.nix
@@ -0,0 +1,15 @@
+{ callPackage, fetchurl, fetchpatch, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+ version = "1.77.0";
+
+ src = fetchurl {
+ urls = [
+ "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
+ "https://dl.bintray.com/boostorg/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2"
+ ];
+ # SHA256 from http://www.boost.org/users/history/version_1_77_0.html
+ sha256 = "sha256-/J+F/AMOIzFCkIJBr3qEbmBjCqc4jeml+vsfOiaECFQ=";
+ };
+})
+
diff --git a/third_party/nixpkgs/pkgs/development/libraries/boost/default.nix b/third_party/nixpkgs/pkgs/development/libraries/boost/default.nix
index 3b79378605..aeb0878a0d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/boost/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/boost/default.nix
@@ -44,4 +44,5 @@ in {
boost173 = makeBoost ./1.73.nix;
boost174 = makeBoost ./1.74.nix;
boost175 = makeBoost ./1.75.nix;
+ boost177 = makeBoost ./1.77.nix;
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ccrtp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ccrtp/default.nix
index 39792d4fd6..3fdbbd23ec 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/ccrtp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/ccrtp/default.nix
@@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, pkg-config, ucommon, openssl, libgcrypt }:
stdenv.mkDerivation rec {
- name = "ccrtp-2.1.2";
+ pname = "ccrtp";
+ version = "2.1.2";
src = fetchurl {
- url = "mirror://gnu/ccrtp/${name}.tar.gz";
+ url = "mirror://gnu/ccrtp/ccrtp-${version}.tar.gz";
sha256 = "17ili8l7zqbbkzr1rcy4hlnazkf50mds41wg6n7bfdsx3c7cldgh";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/clearsilver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/clearsilver/default.nix
index 73ffd6c12b..1a3e261c60 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/clearsilver/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/clearsilver/default.nix
@@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, fetchpatch, python2 }:
stdenv.mkDerivation rec {
- name = "clearsilver-0.10.5";
+ pname = "clearsilver";
+ version = "0.10.5";
src = fetchurl {
- url = "http://www.clearsilver.net/downloads/${name}.tar.gz";
+ url = "http://www.clearsilver.net/downloads/clearsilver-${version}.tar.gz";
sha256 = "1046m1dpq3nkgxbis2dr2x7hynmy51n64465q78d7pdgvqwa178y";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cloog/0.18.0.nix b/third_party/nixpkgs/pkgs/development/libraries/cloog/0.18.0.nix
index c952c1a563..12e279797e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/cloog/0.18.0.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/cloog/0.18.0.nix
@@ -1,10 +1,11 @@
{ fetchurl, lib, stdenv, gmp, isl }:
stdenv.mkDerivation rec {
- name = "cloog-0.18.0";
+ pname = "cloog";
+ version = "0.18.0";
src = fetchurl {
- url = "http://www.bastoul.net/cloog/pages/download/count.php3?url=./${name}.tar.gz";
+ url = "http://www.bastoul.net/cloog/pages/download/count.php3?url=./cloog-${version}.tar.gz";
sha256 = "1c4aa8dde7886be9cbe0f9069c334843b21028f61d344a2d685f88cb1dcf2228";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/clucene-core/2.x.nix b/third_party/nixpkgs/pkgs/development/libraries/clucene-core/2.x.nix
index 9c1f3c21cd..52caa26c9c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/clucene-core/2.x.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/clucene-core/2.x.nix
@@ -1,10 +1,11 @@
{lib, stdenv, fetchurl, cmake, boost, zlib}:
stdenv.mkDerivation rec {
- name = "clucene-core-2.3.3.4";
+ pname = "clucene-core";
+ version = "2.3.3.4";
src = fetchurl {
- url = "mirror://sourceforge/clucene/${name}.tar.gz";
+ url = "mirror://sourceforge/clucene/clucene-core-${version}.tar.gz";
sha256 = "1arffdwivig88kkx685pldr784njm0249k0rb1f1plwavlrw9zfx";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/clucene-core/default.nix b/third_party/nixpkgs/pkgs/development/libraries/clucene-core/default.nix
index 8d5b389150..6f0eb8dfff 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/clucene-core/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/clucene-core/default.nix
@@ -1,10 +1,11 @@
{lib, stdenv, fetchurl}:
stdenv.mkDerivation rec {
- name = "clucene-core-0.9.21b";
+ pname = "clucene-core";
+ version = "0.9.21b";
src = fetchurl {
- url = "mirror://sourceforge/clucene/${name}.tar.bz2";
+ url = "mirror://sourceforge/clucene/clucene-core-${version}.tar.bz2";
sha256 = "202ee45af747f18642ae0a088d7c4553521714a511a1a9ec99b8144cf9928317";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cminpack/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cminpack/default.nix
index 10d0686043..02ad6acfbe 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/cminpack/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/cminpack/default.nix
@@ -1,10 +1,11 @@
{lib, stdenv, fetchurl}:
stdenv.mkDerivation rec {
- name = "cminpack-1.3.6";
+ pname = "cminpack";
+ version = "1.3.6";
src = fetchurl {
- url = "http://devernay.free.fr/hacks/cminpack/${name}.tar.gz";
+ url = "http://devernay.free.fr/hacks/cminpack/cminpack-${version}.tar.gz";
sha256 = "17yh695aim508x1kn9zf6g13jxwk3pi3404h5ix4g5lc60hzs1rw";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cpptest/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cpptest/default.nix
index 17bd390038..a3558e0ef4 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/cpptest/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/cpptest/default.nix
@@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "cpptest-2.0.0";
+ pname = "cpptest";
+ version = "2.0.0";
src = fetchurl {
- url = "mirror://sourceforge/project/cpptest/cpptest/${name}/${name}.tar.gz";
+ url = "mirror://sourceforge/project/cpptest/cpptest/cpptest-${version}/cpptest-${version}.tar.gz";
sha256 = "0lpy3f2fjx1srh02myanlp6zfi497whlldcrnij39ghfhm0arcnm";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/dbus-glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dbus-glib/default.nix
index 0bab4eb194..c6be0dd419 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/dbus-glib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/dbus-glib/default.nix
@@ -3,10 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "dbus-glib-0.112";
+ pname = "dbus-glib";
+ version = "0.112";
src = fetchurl {
- url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz";
+ url = "${meta.homepage}/releases/dbus-glib/dbus-glib-${version}.tar.gz";
sha256 = "sha256-fVUNzN/NKG4ziVUBgp7Zce62XGFOc6rbSgiu73GbFDo=";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/dbus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dbus/default.nix
index 22798fb1d8..a3c5bbbf70 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/dbus/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/dbus/default.nix
@@ -1,5 +1,6 @@
{ stdenv
, lib
+, fetchpatch
, fetchurl
, pkg-config
, expat
@@ -15,6 +16,8 @@
, docbook_xml_dtd_44
, docbook-xsl-nons
, xmlto
+, autoreconfHook
+, autoconf-archive
}:
stdenv.mkDerivation rec {
@@ -32,15 +35,23 @@ stdenv.mkDerivation rec {
# Also applied upstream in https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/189,
# expected in version 1.14
./docs-reproducible-ids.patch
+ # AC_PATH_XTRA doesn't seem to find X11 libs even though libX11 seems
+ # to provide valid pkg-config files. This replace AC_PATH_XTRA with
+ # PKG_CHECK_MODULES.
+ # MR merged cf https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/212/diffs?commit_id=23880a181e82ee7f
+ (fetchpatch {
+ url = "https://gitlab.freedesktop.org/dbus/dbus/-/commit/6bfaea0707ba1a7788c4b6d30c18fb094f3a1dd4.patch";
+ sha256 = "1d8ay55n2ksw5faqx3hsdpfni3xl3gq9hnjl65073xcfnx67x8d2";
+ })
] ++ (lib.optional stdenv.isSunOS ./implement-getgrouplist.patch);
postPatch = ''
- substituteInPlace tools/Makefile.in \
- --replace 'install-localstatelibDATA:' 'disabled:' \
+ substituteInPlace bus/Makefile.am \
+ --replace 'install-data-hook:' 'disabled:' \
+ --replace '$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus' ':'
+ substituteInPlace tools/Makefile.am \
--replace 'install-data-local:' 'disabled:' \
--replace 'installcheck-local:' 'disabled:'
- substituteInPlace bus/Makefile.in \
- --replace '$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus' ':'
'' + /* cleanup of runtime references */ ''
substituteInPlace ./dbus/dbus-sysdeps-unix.c \
--replace 'DBUS_BINDIR "/dbus-launch"' "\"$lib/bin/dbus-launch\""
@@ -51,6 +62,8 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "lib" "doc" "man" ];
nativeBuildInputs = [
+ autoreconfHook
+ autoconf-archive
pkg-config
docbook_xml_dtd_44
docbook-xsl-nons
diff --git a/third_party/nixpkgs/pkgs/development/libraries/dclib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dclib/default.nix
index b393b74f2b..05ea7db2ca 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/dclib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/dclib/default.nix
@@ -1,10 +1,11 @@
{lib, stdenv, fetchurl, libxml2, openssl, bzip2}:
-stdenv.mkDerivation {
- name = "dclib-0.3.7";
+stdenv.mkDerivation rec {
+ pname = "dclib";
+ version = "0.3.7";
src = fetchurl {
- url = "ftp://ftp.debian.nl/pub/freebsd/ports/distfiles/dclib-0.3.7.tar.bz2";
+ url = "ftp://ftp.debian.nl/pub/freebsd/ports/distfiles/dclib-${version}.tar.bz2";
sha256 = "02jdzm5hqzs1dv2rd596vgpcjaapm55pqqapz5m94l30v4q72rfc";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/dclxvi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dclxvi/default.nix
index 8d7dc5a017..ac2664a1c9 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/dclxvi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/dclxvi/default.nix
@@ -1,7 +1,8 @@
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation {
- name = "dclxvi-2013-01-27";
+ pname = "dclxvi";
+ version = "unstable-2013-01-27";
src = fetchFromGitHub {
owner = "agl";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/exiv2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/exiv2/default.nix
index e532898f80..5ef3bfa2ac 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/exiv2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/exiv2/default.nix
@@ -79,6 +79,10 @@ stdenv.mkDerivation rec {
rm -f ../tests/bugfixes/redmine/test_issue_460.py
rm -f ../tests/bugfixes/redmine/test_issue_662.py
rm -f ../tests/bugfixes/github/test_issue_1046.py
+
+ # disable tests that requires loopback networking
+ substituteInPlace ../tests/bash_tests/testcases.py \
+ --replace "def io_test(self):" "def io_disabled(self):"
''}
'';
diff --git a/third_party/nixpkgs/pkgs/development/libraries/freealut/default.nix b/third_party/nixpkgs/pkgs/development/libraries/freealut/default.nix
index 3bb6eaddfa..36bc4a2567 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/freealut/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/freealut/default.nix
@@ -1,10 +1,11 @@
{ lib, stdenv, darwin, fetchurl, openal }:
stdenv.mkDerivation rec {
- name = "freealut-1.1.0";
+ pname = "freealut";
+ version = "1.1.0";
src = fetchurl {
- url = "http://www.openal.org/openal_webstf/downloads/${name}.tar.gz";
+ url = "http://www.openal.org/openal_webstf/downloads/freealut-${version}.tar.gz";
sha256 = "0kzlil6112x2429nw6mycmif8y6bxr2cwjcvp18vh6s7g63ymlb0";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gamin/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gamin/default.nix
index 56de42d9dc..a2d6078024 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gamin/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gamin/default.nix
@@ -1,12 +1,11 @@
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, glib, autoreconfHook }:
-let
- cross = stdenv.hostPlatform != stdenv.buildPlatform;
-in stdenv.mkDerivation (rec {
- name = "gamin-0.1.10";
+stdenv.mkDerivation rec {
+ pname = "gamin";
+ version = "0.1.10";
src = fetchurl {
- url = "https://www.gnome.org/~veillard/gamin/sources/${name}.tar.gz";
+ url = "https://www.gnome.org/~veillard/gamin/sources/gamin-${version}.tar.gz";
sha256 = "18cr51y5qacvs2fc2p1bqv32rs8bzgs6l67zhasyl45yx055y218";
};
@@ -22,6 +21,10 @@ in stdenv.mkDerivation (rec {
"CPPFLAGS=-D_GNU_SOURCE"
];
+ preBuild = lib.optionalString stdenv.isDarwin ''
+ sed -i 's/,--version-script=.*$/\\/' libgamin/Makefile
+ '';
+
patches = [ ./deadlock.patch ]
++ map fetchurl (import ./debian-patches.nix)
++ lib.optional stdenv.cc.isClang ./returnval.patch
@@ -29,7 +32,7 @@ in stdenv.mkDerivation (rec {
name = "fix-pthread-mutex.patch";
url = "https://git.alpinelinux.org/aports/plain/main/gamin/fix-pthread-mutex.patch?h=3.4-stable&id=a1a836b089573752c1b0da7d144c0948b04e8ea8";
sha256 = "13igdbqsxb3sz0h417k6ifmq2n4siwqspj6slhc7fdl5wd1fxmdz";
- }) ++ lib.optional (cross) ./abstract-socket-namespace.patch ;
+ }) ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./abstract-socket-namespace.patch;
meta = with lib; {
@@ -41,8 +44,3 @@ in stdenv.mkDerivation (rec {
};
}
-// lib.optionalAttrs stdenv.isDarwin {
- preBuild = ''
- sed -i 's/,--version-script=.*$/\\/' libgamin/Makefile
- '';
-})
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gd/default.nix
index 3a64cc5639..cd971b291b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gd/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gd/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv, fetchurl, fetchpatch
+{ lib, stdenv, fetchurl
+, fetchpatch
, autoconf
, automake
, pkg-config
@@ -14,24 +15,29 @@
stdenv.mkDerivation rec {
pname = "gd";
- version = "2.3.2";
+ version = "2.3.3";
src = fetchurl {
url = "https://github.com/libgd/libgd/releases/download/${pname}-${version}/libgd-${version}.tar.xz";
- sha256 = "1yypywkh8vphcy4qqpf51kxpb0a3r7rjqk3fc61rpn70hiq092j7";
+ sha256 = "0qas3q9xz3wgw06dm2fj0i189rain6n60z1vyq50d5h7wbn25s1z";
};
- hardeningDisable = [ "format" ];
patches = [
- (fetchpatch {
- name = "CVE-2021-40812.partial.patch";
- url = "https://github.com/libgd/libgd/commit/6f5136821be86e7068fcdf651ae9420b5d42e9a9.patch";
- sha256 = "11rvhd23bl05ksj8z39hwrhqqjm66svr4hl3y230wrc64rvnd2d2";
+ (fetchpatch { # included in > 2.3.3
+ name = "restore-GD_FLIP.patch";
+ url = "https://github.com/libgd/libgd/commit/f4bc1f5c26925548662946ed7cfa473c190a104a.diff";
+ sha256 = "XRXR3NOkbEub3Nybaco2duQk0n8vxif5mTl2AUacn9w=";
})
];
- # -pthread gets passed to clang, causing warnings
- configureFlags = lib.optional stdenv.isDarwin "--enable-werror=no";
+ hardeningDisable = [ "format" ];
+
+ configureFlags =
+ [
+ "--enable-gd-formats"
+ ]
+ # -pthread gets passed to clang, causing warnings
+ ++ lib.optional stdenv.isDarwin "--enable-werror=no";
nativeBuildInputs = [ autoconf automake pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/getdns/default.nix b/third_party/nixpkgs/pkgs/development/libraries/getdns/default.nix
index edf0ac27ea..1db1c3737b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/getdns/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/getdns/default.nix
@@ -1,37 +1,87 @@
-{ lib, stdenv, fetchurl, unbound, libidn2, openssl, doxygen, cmake }:
+# Getdns and Stubby are released together, see https://getdnsapi.net/releases/
-stdenv.mkDerivation rec {
- pname = "getdns";
- version = "1.6.0";
- versionRewrite = builtins.splitVersion version;
-
- src = fetchurl {
- url = "https://getdnsapi.net/releases/${pname}-${
- builtins.concatStringsSep "-" versionRewrite
- }/${pname}-${version}.tar.gz";
- sha256 = "0jhg7258wz287kjymimvdvv04n69lwxdc3sb62l2p453f5s77ra0";
- };
-
- nativeBuildInputs = [ cmake ];
-
- buildInputs = [ unbound libidn2 openssl doxygen ];
-
- meta = with lib; {
- description = "A modern asynchronous DNS API";
- longDescription = ''
- getdns is an implementation of a modern asynchronous DNS API; the
- specification was originally edited by Paul Hoffman. It is intended to make all
- types of DNS information easily available to application developers and non-DNS
- experts. DNSSEC offers a unique global infrastructure for establishing and
- enhancing cryptographic trust relations. With the development of this API the
- developers intend to offer application developers a modern and flexible
- interface that enables end-to-end trust in the DNS architecture, and which will
- inspire application developers to implement innovative security solutions in
- their applications.
- '';
- homepage = "https://getdnsapi.net";
+{ lib, stdenv, fetchurl, cmake, darwin, doxygen, libidn2, libyaml, openssl
+, systemd, unbound, yq }:
+let
+ metaCommon = with lib; {
maintainers = with maintainers; [ leenaars ehmry ];
license = licenses.bsd3;
platforms = platforms.all;
};
+in rec {
+
+ getdns = stdenv.mkDerivation rec {
+ pname = "getdns";
+ version = "1.7.0";
+ outputs = [ "out" "dev" "lib" "man" ];
+
+ src = fetchurl {
+ url = "https://getdnsapi.net/releases/${pname}-${
+ with builtins;
+ concatStringsSep "-" (splitVersion version)
+ }/${pname}-${version}.tar.gz";
+ sha256 = "sha256-6ocTzl4HesdrFBjOtq/SXm1OOelgD29egdOjoTpg9lI=";
+ };
+
+ nativeBuildInputs = [ cmake doxygen ];
+
+ buildInputs = [ libidn2 openssl unbound ];
+
+ postInstall = "rm -r $out/share/doc";
+
+ meta = with lib;
+ metaCommon // {
+ description = "A modern asynchronous DNS API";
+ longDescription = ''
+ getdns is an implementation of a modern asynchronous DNS API; the
+ specification was originally edited by Paul Hoffman. It is intended to make all
+ types of DNS information easily available to application developers and non-DNS
+ experts. DNSSEC offers a unique global infrastructure for establishing and
+ enhancing cryptographic trust relations. With the development of this API the
+ developers intend to offer application developers a modern and flexible
+ interface that enables end-to-end trust in the DNS architecture, and which will
+ inspire application developers to implement innovative security solutions in
+ their applications.
+ '';
+ homepage = "https://getdnsapi.net";
+ };
+ };
+
+ stubby = stdenv.mkDerivation rec {
+ pname = "stubby";
+ version = "0.4.0";
+ outputs = [ "out" "man" "stubbyExampleJson" ];
+
+ inherit (getdns) src;
+ sourceRoot = "${getdns.name}/stubby";
+
+ nativeBuildInputs = [ cmake doxygen yq ];
+
+ buildInputs = [ getdns libyaml openssl systemd ]
+ ++ lib.optionals stdenv.isDarwin [ darwin.Security ];
+
+ postInstall = ''
+ rm -r $out/share/doc
+ yq \
+ < $NIX_BUILD_TOP/$sourceRoot/stubby.yml.example \
+ > $stubbyExampleJson
+ '';
+
+ passthru.settingsExample = with builtins;
+ fromJSON (readFile stubby.stubbyExampleJson);
+
+ meta = with lib;
+ metaCommon // {
+ description = "A local DNS Privacy stub resolver (using DNS-over-TLS)";
+ longDescription = ''
+ Stubby is an application that acts as a local DNS Privacy stub
+ resolver (using RFC 7858, aka DNS-over-TLS). Stubby encrypts DNS
+ queries sent from a client machine (desktop or laptop) to a DNS
+ Privacy resolver increasing end user privacy. Stubby is developed by
+ the getdns team.
+ '';
+ homepage = "https://dnsprivacy.org/wiki/x/JYAT";
+ };
+ };
+
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/giblib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/giblib/default.nix
index e66f7bfe2a..ca4a3c98e0 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/giblib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/giblib/default.nix
@@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, xlibsWrapper, imlib2 }:
stdenv.mkDerivation rec {
- name = "giblib-1.2.4";
+ pname = "giblib";
+ version = "1.2.4";
src = fetchurl {
- url = "http://linuxbrit.co.uk/downloads/${name}.tar.gz";
+ url = "http://linuxbrit.co.uk/downloads/giblib-${version}.tar.gz";
sha256 = "1b4bmbmj52glq0s898lppkpzxlprq9aav49r06j2wx4dv3212rhp";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/giflib/4.1.nix b/third_party/nixpkgs/pkgs/development/libraries/giflib/4.1.nix
index c0afe067c4..8f3ebcf7d3 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/giflib/4.1.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/giflib/4.1.nix
@@ -1,10 +1,11 @@
{lib, stdenv, fetchurl}:
-stdenv.mkDerivation {
- name = "giflib-4.1.6";
+stdenv.mkDerivation rec {
+ pname = "giflib";
+ version = "4.1.6";
src = fetchurl {
- url = "mirror://sourceforge/giflib/giflib-4.1.6.tar.bz2";
+ url = "mirror://sourceforge/giflib/giflib-${version}.tar.bz2";
sha256 = "1v9b7ywz7qg8hli0s9vv1b8q9xxb2xvqq2mg1zpr73xwqpcwxhg1";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/giflib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/giflib/default.nix
index c86b706e13..2016742351 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/giflib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/giflib/default.nix
@@ -1,9 +1,10 @@
{ lib, stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2, fixDarwinDylibNames, pkgsStatic }:
stdenv.mkDerivation rec {
- name = "giflib-5.2.1";
+ pname = "giflib";
+ version = "5.2.1";
src = fetchurl {
- url = "mirror://sourceforge/giflib/${name}.tar.gz";
+ url = "mirror://sourceforge/giflib/giflib-${version}.tar.gz";
sha256 = "1gbrg03z1b6rlrvjyc6d41bc8j1bsr7rm8206gb1apscyii5bnii";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gle/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gle/default.nix
index b7a4f7f2fe..79be821faa 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gle/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gle/default.nix
@@ -1,11 +1,12 @@
{lib, stdenv, fetchurl, freeglut, libX11, libXt, libXmu, libXi, libXext, libGL, libGLU}:
-stdenv.mkDerivation {
- name = "gle-3.1.0";
+stdenv.mkDerivation rec {
+ pname = "gle";
+ version = "3.1.0";
buildInputs = [libGLU libGL freeglut libX11 libXt libXmu libXi libXext];
src = fetchurl {
urls = [
- "mirror://sourceforge/project/gle/gle/gle-3.1.0/gle-3.1.0.tar.gz"
- "https://www.linas.org/gle/pub/gle-3.1.0.tar.gz"
+ "mirror://sourceforge/project/gle/gle/gle-${version}/gle-${version}.tar.gz"
+ "https://www.linas.org/gle/pub/gle-${version}.tar.gz"
];
sha256 = "09zs1di4dsssl9k322nzildvf41jwipbzhik9p43yb1bcfsp92nw";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/glew/1.10.nix b/third_party/nixpkgs/pkgs/development/libraries/glew/1.10.nix
index 29376cb256..ab2e740cd8 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/glew/1.10.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/glew/1.10.nix
@@ -5,10 +5,11 @@
with lib;
stdenv.mkDerivation rec {
- name = "glew-1.10.0";
+ pname = "glew";
+ version = "1.10.0";
src = fetchurl {
- url = "mirror://sourceforge/glew/${name}.tgz";
+ url = "mirror://sourceforge/glew/glew-${version}.tgz";
sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/glfw/2.x.nix b/third_party/nixpkgs/pkgs/development/libraries/glfw/2.x.nix
index d05fa6e5f7..75a7c97db2 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/glfw/2.x.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/glfw/2.x.nix
@@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, libGLU, libGL, libX11, libXext }:
stdenv.mkDerivation rec {
- name = "glfw-2.7.9";
+ pname = "glfw";
+ version = "2.7.9";
src = fetchurl {
- url = "mirror://sourceforge/glfw/${name}.tar.bz2";
+ url = "mirror://sourceforge/glfw/glfw-${version}.tar.bz2";
sha256 = "17c2msdcb7pn3p8f83805h1c216bmdqnbn9hgzr1j8wnwjcpxx6i";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibc/2.33-master.patch.gz b/third_party/nixpkgs/pkgs/development/libraries/glibc/2.33-master.patch.gz
index 3dc7774cf8..50f74b1582 100644
Binary files a/third_party/nixpkgs/pkgs/development/libraries/glibc/2.33-master.patch.gz and b/third_party/nixpkgs/pkgs/development/libraries/glibc/2.33-master.patch.gz differ
diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix b/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix
index 57c2e259e0..6fa46d6d6c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix
@@ -44,7 +44,7 @@
let
version = "2.33";
- patchSuffix = "-56";
+ patchSuffix = "-59";
sha256 = "sha256-LiVWAA4QXb1X8Layoy/yzxc73k8Nhd/8z9i35RoGd/8=";
in
@@ -63,7 +63,7 @@ stdenv.mkDerivation ({
[
/* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping.
$ git fetch --all -p && git checkout origin/release/2.33/master && git describe
- glibc-2.33-56-g6090cf1330
+ glibc-2.33-59-gf9592d65f2
$ git show --minimal --reverse glibc-2.33.. | gzip -9n --rsyncable - > 2.33-master.patch.gz
To compare the archive contents zdiff can be used.
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gnutls/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gnutls/default.nix
index 0d39abe1ac..f560529530 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gnutls/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gnutls/default.nix
@@ -1,8 +1,10 @@
{ config, lib, stdenv, fetchurl, zlib, lzo, libtasn1, nettle, pkg-config, lzip
-, perl, gmp, autoconf, automake, libidn, p11-kit, libiconv
+, perl, gmp, autoconf, automake, libidn, libiconv
, unbound, dns-root-data, gettext, util-linux
+, cxxBindings ? !stdenv.hostPlatform.isStatic # tries to link libstdc++.so
, guileBindings ? config.gnutls.guile or false, guile
, tpmSupport ? false, trousers, which, nettools, libunistring
+, withP11-kit ? !stdenv.hostPlatform.isStatic, p11-kit
, withSecurity ? false, Security # darwin Security.framework
}:
@@ -51,13 +53,15 @@ stdenv.mkDerivation rec {
preConfigure = "patchShebangs .";
configureFlags =
- lib.optionals stdenv.isLinux [
+ lib.optionals withP11-kit [
"--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt"
"--with-default-trust-store-pkcs11=pkcs11:"
] ++ [
"--disable-dependency-tracking"
"--enable-fast-install"
"--with-unbound-root-key-file=${dns-root-data}/root.key"
+ (lib.withFeature withP11-kit "p11-kit")
+ (lib.enableFeature cxxBindings "cxx")
] ++ lib.optional guileBindings [
"--enable-guile"
"--with-guile-site-dir=\${out}/share/guile/site"
@@ -67,7 +71,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- buildInputs = [ lzo lzip libtasn1 libidn p11-kit zlib gmp libunistring unbound gettext libiconv ]
+ buildInputs = [ lzo lzip libtasn1 libidn zlib gmp libunistring unbound gettext libiconv ]
+ ++ lib.optional (withP11-kit) p11-kit
++ lib.optional (isDarwin && withSecurity) Security
++ lib.optional (tpmSupport && stdenv.isLinux) trousers
++ lib.optional guileBindings guile;
diff --git a/third_party/nixpkgs/pkgs/development/libraries/grantlee/default.nix b/third_party/nixpkgs/pkgs/development/libraries/grantlee/default.nix
index 869430538e..53ae099b1b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/grantlee/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/grantlee/default.nix
@@ -1,13 +1,14 @@
{ lib, stdenv, fetchurl, qt4, cmake }:
stdenv.mkDerivation rec {
- name = "grantlee-0.5.1";
+ pname = "grantlee";
+ version = "0.5.1";
# Upstream download server has country code firewall, so I made a mirror.
src = fetchurl {
urls = [
- "http://downloads.grantlee.org/${name}.tar.gz"
- "http://www.loegria.net/grantlee/${name}.tar.gz"
+ "http://downloads.grantlee.org/grantlee-${version}.tar.gz"
+ "http://www.loegria.net/grantlee/grantlee-${version}.tar.gz"
];
sha256 = "1b501xbimizmbmysl1j5zgnp48qw0r2r7lhgmxvzhzlv9jzhj60r";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix
index dab210d6b1..28c47640ca 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix
@@ -13,11 +13,16 @@
, grpc
, abseil-cpp
, libnsl
+
+# tests
+, python3
}:
stdenv.mkDerivation rec {
pname = "grpc";
- version = "1.43.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
+ version = "1.43.0"; # N.B: if you change this, please update:
+ # pythonPackages.grpcio-tools
+ # pythonPackages.grpcio-status
src = fetchFromGitHub {
owner = "grpc";
@@ -86,6 +91,10 @@ stdenv.mkDerivation rec {
enableParallelBuilds = true;
+ passthru.tests = {
+ inherit (python3.pkgs) grpcio-status grpcio-tools;
+ };
+
meta = with lib; {
description = "The C based gRPC (C++, Python, Ruby, Objective-C, PHP, C#)";
license = licenses.asl20;
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gsl/gsl-1_16.nix b/third_party/nixpkgs/pkgs/development/libraries/gsl/gsl-1_16.nix
index 4370314f6e..2cda6c7955 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gsl/gsl-1_16.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gsl/gsl-1_16.nix
@@ -1,10 +1,11 @@
{ fetchurl, fetchpatch, lib, stdenv }:
stdenv.mkDerivation rec {
- name = "gsl-1.16";
+ pname = "gsl";
+ version = "1.16";
src = fetchurl {
- url = "mirror://gnu/gsl/${name}.tar.gz";
+ url = "mirror://gnu/gsl/gsl-${version}.tar.gz";
sha256 = "0lrgipi0z6559jqh82yx8n4xgnxkhzj46v96dl77hahdp58jzg3k";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gss/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gss/default.nix
index 6406dad7d6..0c49e97a56 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gss/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gss/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "1.0.3";
src = fetchurl {
- url = "mirror://gnu/gss/${pname}-${version}.tar.gz";
+ url = "mirror://gnu/gss/gss-${version}.tar.gz";
sha256 = "1syyvh3k659xf1hdv9pilnnhbbhs6vfapayp4xgdcc8mfgf9v4gz";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk-engine-bluecurve/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk-engine-bluecurve/default.nix
index 918e1679eb..43cf867573 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gtk-engine-bluecurve/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gtk-engine-bluecurve/default.nix
@@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, pkg-config, intltool, gtk2 }:
-stdenv.mkDerivation {
- name = "gtk-engine-bluecurve-1.0";
+stdenv.mkDerivation rec {
+ pname = "gtk-engine-bluecurve";
+ version = "1.0";
src = fetchurl {
- url = "https://ftp.gnome.org/pub/gnome/teams/art.gnome.org/archive/themes/gtk2/GTK2-Wonderland-Engine-1.0.tar.bz2";
+ url = "https://ftp.gnome.org/pub/gnome/teams/art.gnome.org/archive/themes/gtk2/GTK2-Wonderland-Engine-${version}.tar.bz2";
sha256 = "1nim3lhmbs5mw1hh76d9258c1p923854x2j6i30gmny812c7qjnm";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk-engines/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk-engines/default.nix
index 70b2c4d1e2..e553efa5f2 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gtk-engines/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gtk-engines/default.nix
@@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, pkg-config, intltool, gtk2 }:
-stdenv.mkDerivation {
- name = "gtk-engines-2.20.2";
+stdenv.mkDerivation rec {
+ pname = "gtk-engines";
+ version = "2.20.2";
src = fetchurl {
- url = "mirror://gnome/sources/gtk-engines/2.20/gtk-engines-2.20.2.tar.bz2";
+ url = "mirror://gnome/sources/gtk-engines/${lib.versions.majorMinor version}/gtk-engines-${version}.tar.bz2";
sha256 = "1db65pb0j0mijmswrvpgkdabilqd23x22d95hp5kwxvcramq1dhm";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/hotpatch/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hotpatch/default.nix
index 2dd894ff4a..84803159a2 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/hotpatch/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/hotpatch/default.nix
@@ -1,7 +1,8 @@
{ lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
- name = "hotpatch-0.2";
+ pname = "hotpatch";
+ version = "0.2";
src = fetchFromGitHub {
owner = "vikasnkumar";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/commons/bsf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/java/commons/bsf/default.nix
index 629ab7ec13..08b6a99a55 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/java/commons/bsf/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/java/commons/bsf/default.nix
@@ -1,10 +1,11 @@
{lib, stdenv, fetchurl}:
-stdenv.mkDerivation {
- name = "commons-bsf-1.2";
+stdenv.mkDerivation rec {
+ pname = "commons-bsf";
+ version = "2.4.0";
src = fetchurl {
- url = "mirror://apache/commons/bsf/binaries/bsf-bin-2.4.0.tar.gz";
+ url = "mirror://apache/commons/bsf/binaries/bsf-bin-${version}.tar.gz";
sha256 = "1my3hv4y8cvrd1kr315wvbjqsamzlzswnbqcmsa2m4hqcafddfr8";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/commons/logging/default.nix b/third_party/nixpkgs/pkgs/development/libraries/java/commons/logging/default.nix
index d63a214e2a..5b6c8b36b3 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/java/commons/logging/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/java/commons/logging/default.nix
@@ -1,10 +1,11 @@
{lib, stdenv, fetchurl}:
-stdenv.mkDerivation {
- name = "commons-logging-1.2";
+stdenv.mkDerivation rec {
+ pname = "commons-logging";
+ version = "1.2";
src = fetchurl {
- url = "mirror://apache/commons/logging/binaries/commons-logging-1.2-bin.tar.gz";
+ url = "mirror://apache/commons/logging/binaries/commons-logging-${version}-bin.tar.gz";
sha256 = "1gc70pmcv0x6ibl89jglmr22f8zpr63iaifi49nrq399qw2qhx9z";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/dbus-java/default.nix b/third_party/nixpkgs/pkgs/development/libraries/java/dbus-java/default.nix
index 9fbcf8b020..c8e67edfe2 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/java/dbus-java/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/java/dbus-java/default.nix
@@ -1,18 +1,19 @@
-{lib, stdenv, fetchurl, gettext, jdk8, libmatthew_java}:
+{ lib, stdenv, fetchurl, gettext, jdk8, libmatthew_java }:
+
+stdenv.mkDerivation rec {
+ pname = "dbus-java";
+ version = "2.7";
-let jdk = jdk8; in
-stdenv.mkDerivation {
- name = "dbus-java-2.7";
src = fetchurl {
- url = "https://dbus.freedesktop.org/releases/dbus-java/dbus-java-2.7.tar.gz";
+ url = "https://dbus.freedesktop.org/releases/dbus-java/dbus-java-${version}.tar.gz";
sha256 = "0cyaxd8x6sxmi6pklkkx45j311a6w51fxl4jc5j3inc4cailwh5y";
};
- JAVA_HOME=jdk;
- JAVA="${jdk}/bin/java";
+ JAVA_HOME=jdk8;
+ JAVA="${jdk8}/bin/java";
PREFIX="\${out}";
JAVAUNIXLIBDIR="${libmatthew_java}/lib/jni";
JAVAUNIXJARDIR="${libmatthew_java}/share/java";
- buildInputs = [ gettext jdk ];
+ buildInputs = [ gettext jdk8 ];
# I'm too lazy to build the documentation
preBuild = ''
sed -i -e "s|all: bin doc man|all: bin|" \
diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/geoipjava/default.nix b/third_party/nixpkgs/pkgs/development/libraries/java/geoipjava/default.nix
index 0e5b1084b4..cbb6b35a65 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/java/geoipjava/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/java/geoipjava/default.nix
@@ -1,9 +1,11 @@
{lib, stdenv, fetchurl, jdk, unzip}:
-stdenv.mkDerivation {
- name = "GeoIPJava-1.2.5";
+stdenv.mkDerivation rec {
+ pname = "GeoIPJava";
+ version = "1.2.5";
+
src = fetchurl {
- url = "https://geolite.maxmind.com/download/geoip/api/java/GeoIPJava-1.2.5.zip";
+ url = "https://geolite.maxmind.com/download/geoip/api/java/GeoIPJava-${version}.zip";
sha256 = "1gb2d0qvvq7xankz7l7ymbr3qprwk9bifpy4hlgw0sq4i6a55ypd";
};
nativeBuildInputs = [ unzip ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/jflex/default.nix b/third_party/nixpkgs/pkgs/development/libraries/java/jflex/default.nix
index cf5b42a0ac..4f5a9de7bd 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/java/jflex/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/java/jflex/default.nix
@@ -1,14 +1,15 @@
{lib, stdenv, fetchurl, jre} :
stdenv.mkDerivation rec {
- name = "jflex-1.8.2";
+ pname = "jflex";
+ version = "1.8.2";
src = fetchurl {
- url = "http://jflex.de/release/${name}.tar.gz";
+ url = "http://jflex.de/release/jflex-${version}.tar.gz";
sha256 = "1ar7g6zb2xjgnws3j4cqcp86jplhc9av8cpcjdmxw08x6igd5q51";
};
- sourceRoot = name;
+ sourceRoot = "${pname}-${version}";
installPhase = ''
runHook preInstall
diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/libmatthew-java/default.nix b/third_party/nixpkgs/pkgs/development/libraries/java/libmatthew-java/default.nix
index a3cdaa37ed..6f736403e0 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/java/libmatthew-java/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/java/libmatthew-java/default.nix
@@ -1,9 +1,11 @@
{lib, stdenv, fetchurl, jdk}:
-stdenv.mkDerivation {
- name = "libmatthew-java-0.8";
+stdenv.mkDerivation rec {
+ pname = "libmatthew-java";
+ version = "0.8";
+
src = fetchurl {
- url = "https://src.fedoraproject.org/repo/pkgs/libmatthew-java/libmatthew-java-0.8.tar.gz/8455b8751083ce25c99c2840609271f5/libmatthew-java-0.8.tar.gz";
+ url = "https://src.fedoraproject.org/repo/pkgs/libmatthew-java/libmatthew-java-${version}.tar.gz/8455b8751083ce25c99c2840609271f5/libmatthew-java-${version}.tar.gz";
sha256 = "1yldkhsdzm0a41a0i881bin2jklhp85y3ah245jd6fz3npcx7l85";
};
JAVA_HOME=jdk;
diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/lombok/default.nix b/third_party/nixpkgs/pkgs/development/libraries/java/lombok/default.nix
index b4f0f4525f..af75be5375 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/java/lombok/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/java/lombok/default.nix
@@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, makeWrapper, jdk }:
stdenv.mkDerivation rec {
- name = "lombok-1.18.20";
+ pname = "lombok";
+ version = "1.18.20";
src = fetchurl {
- url = "https://projectlombok.org/downloads/${name}.jar";
+ url = "https://projectlombok.org/downloads/lombok-${version}.jar";
sha256 = "sha256-zpR75sL751n7vo7ztCtoJfgUyYyIU/EBPy2WMM7fdLA=";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/mockobjects/default.nix b/third_party/nixpkgs/pkgs/development/libraries/java/mockobjects/default.nix
index 3780ef4abe..93b2223578 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/java/mockobjects/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/java/mockobjects/default.nix
@@ -1,10 +1,11 @@
-{lib, stdenv, fetchurl} :
+{ lib, stdenv, fetchurl }:
-stdenv.mkDerivation {
- name = "mockobjects-0.09";
+stdenv.mkDerivation rec {
+ pname = "mockobjects";
+ version = "0.09";
src = fetchurl {
- url = "mirror://sourceforge/mockobjects/mockobjects-bin-0.09.tar";
+ url = "mirror://sourceforge/mockobjects/mockobjects-bin-${version}.tar";
sha256 = "18rnyqfcyh0s3dwkkaszdd50ssyjx5fa1y3ii309ldqg693lfgnz";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/smack/default.nix b/third_party/nixpkgs/pkgs/development/libraries/java/smack/default.nix
index c5d6098a3c..5c032f5469 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/java/smack/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/java/smack/default.nix
@@ -1,10 +1,11 @@
-{lib, stdenv, fetchurl}:
+{ lib, stdenv, fetchurl }:
-stdenv.mkDerivation {
- name = "smack-4.1.9";
+stdenv.mkDerivation rec {
+ pname = "smack";
+ version = "4.1.9";
src = fetchurl {
- url = "http://www.igniterealtime.org/downloadServlet?filename=smack/smack_4_1_9.tar.gz";
+ url = "http://www.igniterealtime.org/downloadServlet?filename=smack/smack_${lib.replaceStrings ["."] ["_"] version}.tar.gz";
sha256 = "009x0qcxd4dkvwcjz2nla470pwbabwvg37wc21pslpw42ldi0bzp";
};
diff --git a/third_party/nixpkgs/pkgs/development/libraries/jemalloc/common.nix b/third_party/nixpkgs/pkgs/development/libraries/jemalloc/common.nix
index d5fe07b00f..5abde13a2e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/jemalloc/common.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/jemalloc/common.nix
@@ -1,5 +1,6 @@
{ version, sha256 }:
{ lib, stdenv, fetchurl
+, fetchpatch
# By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which
# then stops downstream builds (mariadb in particular) from detecting it. This
# option should remove the prefix and give us a working jemalloc.
@@ -20,6 +21,14 @@ stdenv.mkDerivation rec {
inherit sha256;
};
+ patches = [
+ # workaround https://github.com/jemalloc/jemalloc/issues/2091
+ (fetchpatch {
+ url = "https://github.com/jemalloc/jemalloc/commit/3b4a03b92b2e415415a08f0150fdb9eeb659cd52.diff";
+ sha256 = "sha256-6AYtADREhfj93ZLk9xnXtjc6vHDU0EKLLOvLd6YdJeI=";
+ })
+ ];
+
# see the comment on stripPrefix
configureFlags = []
++ optional stripPrefix "--with-jemalloc-prefix="
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdrm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdrm/default.nix
index ae442e6983..731039e26a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libdrm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libdrm/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "libdrm";
- version = "2.4.108";
+ version = "2.4.109";
src = fetchurl {
url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz";
- sha256 = "186nwf7qnzh805iz8k3djq3pd1m79mgfnjsbw7yn6rskpj699mx1";
+ sha256 = "09kzrdsd14zr0i3izvi5mck4vqccl3c9hr84r9i4is0zikh554v2";
};
outputs = [ "out" "dev" "bin" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libepoxy/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libepoxy/default.nix
index 83b8ba8960..4141de4fc0 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libepoxy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libepoxy/default.nix
@@ -1,41 +1,74 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, utilmacros, python3
-, libGL, libX11
+{ lib
+, stdenv
+, fetchFromGitHub
+, meson
+, ninja
+, pkg-config
+, utilmacros
+, python3
+, libGL
+, libX11
+, Carbon
+, OpenGL
}:
-with lib;
+let
+ inherit (lib) getLib optional optionalString;
-stdenv.mkDerivation rec {
+in
+stdenv.mkDerivation (rec {
pname = "libepoxy";
- version = "1.5.4";
+ version = "1.5.9";
src = fetchFromGitHub {
owner = "anholt";
repo = pname;
rev = version;
- sha256 = "0rmg0qlswn250h0arx434jh3hwzsr95lawanpmh1czsfvrcx59l6";
+ sha256 = "sha256-8rdmC8FZUkKkEvWPJIdfrBQHiwa81vl5tmVqRdU4UIY=";
};
- outputs = [ "out" "dev" ];
-
- nativeBuildInputs = [ autoreconfHook pkg-config utilmacros python3 ];
- buildInputs = [ libGL libX11 ];
-
- preConfigure = optionalString stdenv.isDarwin ''
- substituteInPlace configure --replace build_glx=no build_glx=yes
- substituteInPlace src/dispatch_common.h --replace "PLATFORM_HAS_GLX 0" "PLATFORM_HAS_GLX 1"
- '';
-
patches = [ ./libgl-path.patch ];
+ postPatch = ''
+ patchShebangs src/*.py
+ ''
+ + optionalString stdenv.isDarwin ''
+ substituteInPlace src/dispatch_common.h --replace "PLATFORM_HAS_GLX 0" "PLATFORM_HAS_GLX 1"
+ '';
+
+ outputs = [ "out" "dev" ];
+
+ nativeBuildInputs = [ meson ninja pkg-config utilmacros python3 ];
+
+ buildInputs = [
+ libGL
+ libX11
+ ] ++ lib.optionals stdenv.isDarwin [
+ Carbon
+ OpenGL
+ ];
+
+ mesonFlags = [
+ "-Dtests=${if doCheck then "true" else "false"}"
+ ]
+ ++ optional stdenv.isDarwin "-Dglx=yes";
+
NIX_CFLAGS_COMPILE = ''-DLIBGL_PATH="${getLib libGL}/lib"'';
- doCheck = false; # needs X11
+ # tests are running from version 1.5.9
+ doCheck = true;
- meta = {
+ meta = with lib; {
description = "A library for handling OpenGL function pointer management";
homepage = "https://github.com/anholt/libepoxy";
license = licenses.mit;
maintainers = with maintainers; [ goibhniu erictapen ];
platforms = platforms.unix;
};
-}
+} // lib.optionalAttrs stdenv.isDarwin {
+ # cgl_epoxy_api fails in darwin sandbox and on Hydra (because it's headless?)
+ preCheck = ''
+ substituteInPlace ../test/meson.build \
+ --replace "[ 'cgl_epoxy_api', [ 'cgl_epoxy_api.c' ] ]," ""
+ '';
+})
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libexif/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libexif/default.nix
index 1c650ad60d..0ab1f8fa98 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libexif/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libexif/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libexif";
- version = "0.6.23";
+ version = "0.6.24";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "${pname}-${builtins.replaceStrings ["."] ["_"] version}-release";
- sha256 = "sha256-Os0yI/IPoe9MuhXgNdDaIg6uohclA2bjeu9t3tbUoNA=";
+ sha256 = "sha256-Eqgnm31s8iPJdhTpk5HM89HSZTXTK+e7YZ/CCdbeJX4=";
};
nativeBuildInputs = [ autoreconfHook gettext ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfabric/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfabric/default.nix
index 4142c3763b..c1c6ef7032 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libfabric/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libfabric/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
pname = "libfabric";
- version = "1.13.1";
+ version = "1.13.2";
enableParallelBuilding = true;
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
owner = "ofiwg";
repo = pname;
rev = "v${version}";
- sha256 = "0USQMBXZrbz4GtXLNsSti9ohUOqqo0OCtVz+0Uk9ndI=";
+ sha256 = "sha256-ydMZP83keUGDYDw9i/SCa4U1KEgfuqkFklwRKbfLoK8=";
};
nativeBuildInputs = [ pkg-config autoreconfHook ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libplctag/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libplctag/default.nix
index a326cbc004..5276b8523d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libplctag/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libplctag/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "libplctag";
- version = "2.4.6";
+ version = "2.4.7";
src = fetchFromGitHub {
owner = "libplctag";
repo = "libplctag";
rev = "v${version}";
- sha256 = "sha256-e7WDXaFu4ujrxqSvAq2Y2MbUR1ItlKOYm9dNSPbdaMo=";
+ sha256 = "sha256-DLx9VBmyn5L30i6qPK4LD+3cOo7zG2YLOui6+krU9So=";
};
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtiff/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtiff/default.nix
index ea24679002..2fe6159556 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libtiff/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libtiff/default.nix
@@ -8,6 +8,11 @@
, libjpeg
, xz
, zlib
+
+, Cocoa
+, GLUT
+, libGL
+, libGLU
}:
#FIXME: fix aarch64-darwin build and get rid of ./aarch64-darwin.nix
@@ -21,8 +26,17 @@ stdenv.mkDerivation rec {
sha256 = "1j3snghqjbhwmnm5vz3dr1zm68dj15mgbx1wqld7vkl7n2nfaihf";
};
- # FreeImage needs this patch
- patches = [ ./headers.patch ];
+ patches = [
+ # FreeImage needs this patch
+ ./headers.patch
+ # libc++abi 11 has an `#include `, this picks up files name
+ # `version` in the project's include paths
+ ./rename-version.patch
+ ];
+
+ postPatch = ''
+ mv VERSION VERSION.txt
+ '';
outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ];
@@ -38,7 +52,8 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ libjpeg xz zlib ]; #TODO: opengl support (bogus configure detection)
- buildInputs = [ libdeflate ]; # TODO: move all propagatedBuildInputs to buildInputs.
+ buildInputs = [ libdeflate ] # TODO: move all propagatedBuildInputs to buildInputs.
+ ++ lib.optionals (stdenv.isDarwin) [ Cocoa GLUT libGL libGLU ];
enableParallelBuilding = true;
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtiff/rename-version.patch b/third_party/nixpkgs/pkgs/development/libraries/libtiff/rename-version.patch
new file mode 100644
index 0000000000..30601c0f04
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/libtiff/rename-version.patch
@@ -0,0 +1,20 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -34,7 +34,7 @@ docfiles = \
+ README.md \
+ RELEASE-DATE \
+ TODO \
+- VERSION
++ VERSION.txt
+
+ EXTRA_DIST = \
+ cmake \
+@@ -61,7 +61,7 @@ SUBDIRS = port libtiff tools build contrib test man html
+
+ release:
+ (rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE)
+- (rm -f $(top_srcdir)/VERSION && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION)
++ (rm -f $(top_srcdir)/VERSION.txt && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION.txt)
+ (rm -f $(top_srcdir)/libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(LIBTIFF_RELEASE_DATE),' $(top_srcdir)/libtiff/tiffvers.h.in > $(top_srcdir)/libtiff/tiffvers.h)
+
+ pkgconfigdir = $(libdir)/pkgconfig
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libunwind/backtrace-only-with-glibc.patch b/third_party/nixpkgs/pkgs/development/libraries/libunwind/backtrace-only-with-glibc.patch
deleted file mode 100644
index 5fcaa72c0c..0000000000
--- a/third_party/nixpkgs/pkgs/development/libraries/libunwind/backtrace-only-with-glibc.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 04437142399662b576bd55a85485c6dcc14d0812 Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Thu, 31 Dec 2015 06:44:07 +0000
-Subject: [PATCH] backtrace: Use only with glibc and uclibc
-
-backtrace API is glibc specific not linux specific
-so make it behave so.
-
-Signed-off-by: Khem Raj
----
-Upstream-Status: Pending
-
- tests/test-coredump-unwind.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/tests/test-coredump-unwind.c b/tests/test-coredump-unwind.c
-index 5254708..8767b42 100644
---- a/tests/test-coredump-unwind.c
-+++ b/tests/test-coredump-unwind.c
-@@ -57,7 +57,9 @@
- #include
-
- /* For SIGSEGV handler code */
-+#ifdef __GLIBC__
- #include
-+#endif
- #include
-
- #include
-@@ -238,11 +240,11 @@ void handle_sigsegv(int sig, siginfo_t *info, void *ucontext)
- ip);
-
- {
-+#ifdef __GLIBC__
- /* glibc extension */
- void *array[50];
- int size;
- size = backtrace(array, 50);
--#ifdef __linux__
- backtrace_symbols_fd(array, size, 2);
- #endif
- }
---
-2.6.4
-
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libunwind/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libunwind/default.nix
index 0a93182183..4bce1341c7 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libunwind/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libunwind/default.nix
@@ -1,24 +1,14 @@
-{ stdenv, lib, fetchurl, fetchpatch, autoreconfHook, xz, buildPackages }:
+{ stdenv, lib, fetchurl, autoreconfHook, xz, buildPackages }:
stdenv.mkDerivation rec {
pname = "libunwind";
- version = "1.4.0";
+ version = "1.6.2";
src = fetchurl {
url = "mirror://savannah/libunwind/${pname}-${version}.tar.gz";
- sha256 = "0dc46flppifrv2z0mrdqi60165ghxm1wk0g47vcbyzjdplqwjnfz";
+ sha256 = "sha256-SmrsZmmR+0XQiJxErt6K1usQgHHDVU/N/2cfnJR5SXY=";
};
- patches = [
- ./backtrace-only-with-glibc.patch
-
- (fetchpatch {
- # upstream build fix against -fno-common compilers like >=gcc-10
- url = "https://github.com/libunwind/libunwind/commit/29e17d8d2ccbca07c423e3089a6d5ae8a1c9cb6e.patch";
- sha256 = "1angwfq6h0jskg6zx8g6w9min38g5mgmrcbppcy5hqn59cgsxbw0";
- })
- ];
-
postPatch = if stdenv.cc.isClang then ''
substituteInPlace configure.ac --replace "-lgcc_s" ""
'' else lib.optionalString stdenv.hostPlatform.isMusl ''
@@ -48,7 +38,7 @@ stdenv.mkDerivation rec {
description = "A portable and efficient API to determine the call-chain of a program";
maintainers = with maintainers; [ orivej ];
platforms = platforms.linux;
- badPlatforms = [ "riscv32-linux" "riscv64-linux" ];
+ badPlatforms = [ "riscv32-linux" ];
license = licenses.mit;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvncserver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvncserver/default.nix
index 01a079a205..b9890f6a80 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libvncserver/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libvncserver/default.nix
@@ -1,21 +1,26 @@
-{ lib, stdenv, fetchzip, fetchpatch, cmake
-, libjpeg, openssl, zlib, libgcrypt, libpng
-, systemd, Carbon
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, cmake
+, libjpeg
+, openssl
+, zlib
+, libgcrypt
+, libpng
+, systemd
+, Carbon
}:
-let
- s = # Generated upstream information
- rec {
- pname = "libvncserver";
- version = "0.9.13";
- url = "https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${version}.tar.gz";
- sha256 = "0zz0hslw8b1p3crnfy3xnmrljik359h83dpk64s697dqdcrzy141"; # unpacked archive checksum
- };
-in
-stdenv.mkDerivation {
- inherit (s) pname version;
- src = fetchzip {
- inherit (s) url sha256;
+stdenv.mkDerivation rec {
+ pname = "libvncserver";
+ version = "0.9.13";
+
+ src = fetchFromGitHub {
+ owner = "LibVNC";
+ repo = "libvncserver";
+ rev = "LibVNCServer-${version}";
+ sha256 = "sha256-gQT/M2u4nWQ0MfO2gWAqY0ZJc7V9eGczGzcsxKmG4H8=";
};
nativeBuildInputs = [ cmake ];
@@ -24,12 +29,11 @@ stdenv.mkDerivation {
++ lib.optional stdenv.isDarwin Carbon;
propagatedBuildInputs = [ zlib ];
- meta = {
- inherit (s) version;
+ meta = with lib; {
description = "VNC server library";
homepage = "https://libvnc.github.io/";
- license = lib.licenses.gpl2Plus ;
- maintainers = [lib.maintainers.raskin];
- platforms = lib.platforms.unix;
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ raskin ];
+ platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwebp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libwebp/default.nix
index 4908dc4a9c..4333b4fbda 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libwebp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libwebp/default.nix
@@ -27,13 +27,13 @@ in
with lib;
stdenv.mkDerivation rec {
pname = "libwebp";
- version = "1.1.0";
+ version = "1.2.1";
src = fetchFromGitHub {
owner = "webmproject";
repo = pname;
- rev = version;
- sha256 = "1kl6qqa29ygqb2fpv140y59v539gdqx4vcf3mlaxhca2bks98qgm";
+ rev = "v${version}";
+ hash = "sha256-KrvB5d3KNmujbfekWaevz2JZrWtK3PjEG9NEzRBYIDw=";
};
prePatch = "patchShebangs .";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix
index a5d41d4862..4b9849fd87 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix
@@ -33,7 +33,7 @@ with lib;
let
# Release calendar: https://www.mesa3d.org/release-calendar.html
# Release frequency: https://www.mesa3d.org/releasing.html#schedule
- version = "21.2.6";
+ version = "21.3.2";
branch = versions.major version;
self = stdenv.mkDerivation {
@@ -47,7 +47,7 @@ self = stdenv.mkDerivation {
"ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
];
- sha256 = "0m69h3f9fr66h6xjxfc485zfdci6kl8j24ab0kx5k23f7kcj4zhy";
+ sha256 = "1g96y59bw10ml8h4jl259g41jdmf5ww3jbwqpz1sprq7hgxvmrz2";
};
# TODO:
diff --git a/third_party/nixpkgs/pkgs/development/libraries/netcdf-fortran/default.nix b/third_party/nixpkgs/pkgs/development/libraries/netcdf-fortran/default.nix
index fc13fbe85b..40f22b0cab 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/netcdf-fortran/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/netcdf-fortran/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, netcdf, hdf5, curl, gfortran }:
+{ lib, stdenv, fetchFromGitHub, netcdf, hdf5, curl, gfortran, CoreFoundation }:
stdenv.mkDerivation rec {
pname = "netcdf-fortran";
version = "4.4.5";
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ gfortran ];
- buildInputs = [ netcdf hdf5 curl ];
+ buildInputs = [ netcdf hdf5 curl ]
+ ++ lib.optional stdenv.isDarwin CoreFoundation;
doCheck = true;
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/libraries/nsss/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nsss/default.nix
index 9fee8333fb..e6db2aee60 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/nsss/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/nsss/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
buildPackage {
pname = "nsss";
- version = "0.2.0.0";
- sha256 = "0zg0lwkvx9ch4a6h9ryc73nqfz733v2pv4gbf65qzpz7ccniwagi";
+ version = "0.2.0.1";
+ sha256 = "0nqjnfqvzzn4i45h849b3n8qwcrzd5wlrwlvkmjdga5k4yk4x63x";
description = "An implementation of a subset of the pwd.h, group.h and shadow.h family of functions.";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pcre/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pcre/default.nix
index d2fe9a84ac..f7094e04a9 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/pcre/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/pcre/default.nix
@@ -7,14 +7,11 @@ with lib;
assert elem variant [ null "cpp" "pcre16" "pcre32" ];
-let
+stdenv.mkDerivation rec {
+ pname = "pcre"
+ + lib.optionalString (variant == "cpp") "-cpp"
+ + lib.optionalString (variant != "cpp" && variant != null) variant;
version = "8.44";
- pname = if (variant == null) then "pcre"
- else if (variant == "cpp") then "pcre-cpp"
- else variant;
-
-in stdenv.mkDerivation {
- name = "${pname}-${version}";
src = fetchurl {
url = "mirror://sourceforge/project/pcre/pcre/${version}/pcre-${version}.tar.bz2";
@@ -43,8 +40,7 @@ in stdenv.mkDerivation {
postFixup = ''
moveToOutput bin/pcre-config "$dev"
- ''
- + optionalString (variant != null) ''
+ '' + optionalString (variant != null) ''
ln -sf -t "$out/lib/" '${pcre.out}'/lib/libpcre{,posix}.{so.*.*.*,*dylib}
'';
@@ -62,5 +58,6 @@ in stdenv.mkDerivation {
'';
platforms = platforms.all;
+ maintainers = with maintainers; [ ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/portaudio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/portaudio/default.nix
index b0ab32c9e3..c1c76a9001 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/portaudio/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/portaudio/default.nix
@@ -11,7 +11,7 @@
stdenv.mkDerivation rec {
pname = "portaudio";
- version = "190700_20210406";
+ version = "190700_20210406";
src = fetchurl {
url = "http://files.portaudio.com/archives/pa_stable_v${version}.tgz";
@@ -23,9 +23,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--disable-mac-universal" "--enable-cxx" ];
- postConfigure = ''
- substituteInPlace Makefile --replace "-Werror" ""
- '';
+ NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=nullability-inferred-on-nested-type -Wno-error=nullability-completeness-on-arrays -Wno-error=implicit-const-int-float-conversion";
propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix
index ec4055d591..c400620466 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix
@@ -18,7 +18,7 @@ top-level attribute to `top-level/all-packages.nix`.
, lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper
, bison, cups ? null, harfbuzz, libGL, perl
, gstreamer, gst-plugins-base, gtk3, dconf
-, llvmPackages_5, darwin
+, darwin
# options
, developerBuild ? false
@@ -30,8 +30,6 @@ let
qtCompatVersion = srcs.qtbase.version;
- stdenvActual = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;
-
mirror = "https://download.qt.io";
srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; } // {
# Community port of the now unmaintained upstream qtwebkit.
@@ -129,7 +127,7 @@ let
mkDerivation =
import ../mkDerivation.nix
{ inherit lib; inherit debug; wrapQtAppsHook = null; }
- stdenvActual.mkDerivation;
+ stdenv.mkDerivation;
}
{ inherit self srcs patches; };
@@ -144,7 +142,7 @@ let
import ../mkDerivation.nix
{ inherit lib; inherit debug; inherit (self) wrapQtAppsHook; };
- mkDerivation = mkDerivationWith stdenvActual.mkDerivation;
+ mkDerivation = mkDerivationWith stdenv.mkDerivation;
qtbase = callPackage ../modules/qtbase.nix {
inherit (srcs.qtbase) src version;
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix
index b09826ec91..ddd9d76df4 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix
@@ -18,7 +18,7 @@ top-level attribute to `top-level/all-packages.nix`.
, lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper
, bison, cups ? null, harfbuzz, libGL, perl
, gstreamer, gst-plugins-base, gtk3, dconf
-, llvmPackages_5, darwin
+, darwin
# options
, developerBuild ? false
@@ -30,8 +30,6 @@ let
qtCompatVersion = srcs.qtbase.version;
- stdenvActual = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;
-
mirror = "https://download.qt.io";
srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; } // {
# qtwebkit does not have an official release tarball on the qt mirror and is
@@ -130,7 +128,7 @@ let
mkDerivation =
import ../mkDerivation.nix
{ inherit lib; inherit debug; wrapQtAppsHook = null; }
- stdenvActual.mkDerivation;
+ stdenv.mkDerivation;
}
{ inherit self srcs patches; };
@@ -145,7 +143,7 @@ let
import ../mkDerivation.nix
{ inherit lib; inherit debug; inherit (self) wrapQtAppsHook; };
- mkDerivation = mkDerivationWith stdenvActual.mkDerivation;
+ mkDerivation = mkDerivationWith stdenv.mkDerivation;
qtbase = callPackage ../modules/qtbase.nix {
inherit (srcs.qtbase) src version;
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix
index 650e4fd32b..7c4845fd84 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -11,7 +11,7 @@ Check for any minor version changes.
, lib, stdenv, fetchurl, fetchgit, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper
, bison, cups ? null, harfbuzz, libGL, perl
, gstreamer, gst-plugins-base, gtk3, dconf
-, llvmPackages_5, darwin
+, darwin
# options
, developerBuild ? false
@@ -25,8 +25,6 @@ let
qtCompatVersion = srcs.qtbase.version;
- stdenvActual = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;
-
patches = {
qtbase = lib.optionals stdenv.isDarwin [
./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
@@ -92,7 +90,7 @@ let
mkDerivation =
import ../mkDerivation.nix
{ inherit lib; inherit debug; wrapQtAppsHook = null; }
- stdenvActual.mkDerivation;
+ stdenv.mkDerivation;
}
{ inherit self srcs patches; };
@@ -107,7 +105,7 @@ let
import ../mkDerivation.nix
{ inherit lib; inherit debug; inherit (self) wrapQtAppsHook; };
- mkDerivation = mkDerivationWith stdenvActual.mkDerivation;
+ mkDerivation = mkDerivationWith stdenv.mkDerivation;
qtbase = callPackage ../modules/qtbase.nix {
inherit (srcs.qtbase) src version;
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 44f0869982..5e2bb41c40 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -184,6 +184,10 @@ stdenv.mkDerivation {
''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"''
] ++ lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"''
++ lib.optional stdenv.isLinux "-DUSE_X11"
+ ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-darwin") [
+ # ignore "is only available on macOS 10.12.2 or newer" in obj-c code
+ "-Wno-error=unguarded-availability"
+ ]
++ lib.optionals withGtk3 [
''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"''
''-DNIXPKGS_QGTK3_GIO_EXTRA_MODULES="${dconf.lib}/lib/gio/modules"''
@@ -358,7 +362,12 @@ stdenv.mkDerivation {
license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
maintainers = with maintainers; [ qknight ttuegel periklis bkchr ];
platforms = platforms.unix;
- broken = stdenv.isDarwin && (compareVersion "5.9.0" < 0);
+ # Qt5 is broken on aarch64-darwin
+ # the build ends up with the following error:
+ # error: unknown target CPU 'armv8.3-a+crypto+sha2+aes+crc+fp16+lse+simd+ras+rdm+rcpc'
+ # note: valid target CPU values are: nocona, core2, penryn, ..., znver1, znver2, x86-64
+ # it seems the qmake/cmake passes x86_64 as preferred architecture somewhere
+ broken = stdenv.isDarwin && stdenv.isAarch64;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index b49efa600f..68945625f5 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -110,6 +110,8 @@ qtModule {
# it fails when compiled with -march=sandybridge https://github.com/NixOS/nixpkgs/pull/59148#discussion_r276696940
# TODO: investigate and fix properly
"-march=westmere"
+ ] ++ lib.optionals stdenv.cc.isClang [
+ "-Wno-elaborated-enum-base"
] ++ lib.optionals stdenv.isDarwin [
"-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_12"
"-DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_12"
@@ -239,6 +241,10 @@ qtModule {
platforms = platforms.unix;
# This build takes a long time; particularly on slow architectures
timeout = 24 * 3600;
- broken = stdenv.isDarwin && (lib.versionAtLeast qtCompatVersion "5.14"); # requires a newer SDK
+ # we are still stuck with MacOS SDK 10.12 on x86_64-darwin
+ # and qtwebengine 5.14+ requires at least SDK 10.14
+ # (qtwebengine 5.12 is fine with SDK 10.12)
+ # on aarch64-darwin we are already at MacOS SDK 11.0
+ broken = stdenv.isDarwin && stdenv.isx86_64 && (lib.versionAtLeast qtCompatVersion "5.14");
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/restinio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/restinio/default.nix
index 2f26fdceb1..1954bb45f3 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/restinio/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/restinio/default.nix
@@ -2,12 +2,12 @@
let
pname = "restinio";
- version = "0.6.13";
+ version = "0.6.14";
in
fetchzip {
name = "${pname}-${version}";
url = "https://github.com/Stiffstream/restinio/releases/download/v.${version}/${pname}-${version}-full.tar.bz2";
- sha256 = "0cwbd5ni5pm25c7njs3wllrblb2i853ibjvpbb1iicy833zais8d";
+ sha256 = "sha256-v/t3Lo1D6rHMx3GywPpEhOnHrT7JVC8n++YxpMTRfDM=";
postFetch = ''
mkdir -p $out/include/restinio
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix
index bf7eb3d0d3..0fc00efcff 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix
@@ -129,7 +129,7 @@ let
in
stdenv.mkDerivation rec {
pname = "openblas";
- version = "0.3.17";
+ version = "0.3.18";
outputs = [ "out" "dev" ];
@@ -137,7 +137,7 @@ stdenv.mkDerivation rec {
owner = "xianyi";
repo = "OpenBLAS";
rev = "v${version}";
- sha256 = "11j103s851mml6kns781kha0asxjz6b6s1vbv80aq3b6g7p05pms";
+ sha256 = "sha256-b5i52rjsH65qAIlYGXQrzVxChi8/fwbD4eJTrxVq7Z8=";
};
inherit blas64;
diff --git a/third_party/nixpkgs/pkgs/development/libraries/simpleitk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/simpleitk/default.nix
index 2ae8b28b64..c38257dadb 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/simpleitk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/simpleitk/default.nix
@@ -1,17 +1,17 @@
-{ lib, stdenv, fetchFromGitHub, cmake, swig, lua, itk }:
+{ lib, stdenv, fetchFromGitHub, cmake, swig4, lua, itk }:
stdenv.mkDerivation rec {
pname = "simpleitk";
- version = "2.0.2";
+ version = "2.1.1";
src = fetchFromGitHub {
owner = "SimpleITK";
repo = "SimpleITK";
rev = "v${version}";
- sha256 = "1q51jmd6skrr31avxlrxx433lawc838ilzrj5vvv38a9f4gl45v8";
+ sha256 = "0ShUo9UVkliROIIR5bJtqlzESByfq9SQ1+Hy/40vJ50=";
};
- nativeBuildInputs = [ cmake swig ];
+ nativeBuildInputs = [ cmake swig4 ];
buildInputs = [ lua itk ];
# 2.0.0: linker error building examples
diff --git a/third_party/nixpkgs/pkgs/development/libraries/skalibs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/skalibs/default.nix
index 7e3e457d50..ddf2ee5b46 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/skalibs/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/skalibs/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
buildPackage {
pname = "skalibs";
- version = "2.11.0.0";
- sha256 = "1n9l7mb54dlb0iijjaf446jba6nmq1ql9n39s095ngrk5ahcipwq";
+ version = "2.11.1.0";
+ sha256 = "1fga2kmzcp2llqv5nzrmgm33p1jz7y9pnaghzbxf8ldnsns800a0";
description = "A set of general-purpose C programming libraries";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sope/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sope/default.nix
index 3b41495be7..415a2b1e1f 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/sope/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/sope/default.nix
@@ -4,13 +4,13 @@ with lib;
gnustep.stdenv.mkDerivation rec {
pname = "sope";
- version = "5.3.0";
+ version = "5.4.0";
src = fetchFromGitHub {
owner = "inverse-inc";
repo = pname;
rev = "SOPE-${version}";
- sha256 = "0xqa7fsf60acbri5dd9x8nmf1zdkalxnmkm559w4xz7sdi569ssa";
+ sha256 = "sha256-jOF429Gaf1Qo3bx9mUogBQ0u/tBUxnX7VZxJjxF24Rg=";
};
hardeningDisable = [ "format" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix
index acfce3d2e7..de433ba500 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix
@@ -11,12 +11,12 @@ in
stdenv.mkDerivation rec {
pname = "sqlite";
- version = "3.36.0";
+ version = "3.37.0";
# NB! Make sure to update ./tools.nix src (in the same directory).
src = fetchurl {
url = "https://sqlite.org/2021/sqlite-autoconf-${archiveVersion version}.tar.gz";
- sha256 = "sha256-vZDD65a+6ZYga4O+cGXJzhmu84w/T7Uwc62g0LabvOM=";
+ sha256 = "sha256-cxpGUdTUs2/H0h21hrLeTdAK8x/VT7WppLf0kgV0efc=";
};
outputs = [ "bin" "dev" "out" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix
index 352577fd2d..7309e1de0b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix
@@ -4,11 +4,11 @@ let
archiveVersion = import ./archive-version.nix lib;
mkTool = { pname, makeTarget, description, homepage }: stdenv.mkDerivation rec {
inherit pname;
- version = "3.36.0";
+ version = "3.37.0";
src = assert version == sqlite.version; fetchurl {
url = "https://sqlite.org/2021/sqlite-src-${archiveVersion version}.zip";
- sha256 = "092khwfm0m0i80sjb4fc5569jj0kilm6pa867w0akcv6h38bk8r5";
+ sha256 = "sha256-cJd/s5Qhh9RidBOv3pqUkvoCuVSFCBK1OXS2ox7Oj68=";
};
nativeBuildInputs = [ unzip ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tclap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tclap/default.nix
index eb49efa6c8..c24768bbbd 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/tclap/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/tclap/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "tclap";
- version = "1.2.4";
+ version = "1.2.5";
src = fetchurl {
url = "mirror://sourceforge/tclap/${pname}-${version}.tar.gz";
- sha256 = "sha256-Y0xbWduxzLydal9t5JSiV+KaP1nctvwwRF/zm0UYhXQ=";
+ sha256 = "sha256-u2SfdtrjXo0Ny6S1Ks/U4GLXh+aoG0P3pLASdRUxZaY=";
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/libraries/utmps/default.nix b/third_party/nixpkgs/pkgs/development/libraries/utmps/default.nix
index fcf032b265..84f5b26c30 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/utmps/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/utmps/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
buildPackage {
pname = "utmps";
- version = "0.1.0.3";
- sha256 = "0npgg90lzxmhld6hp296gbnrsixip28s7axirc2g6yjpjz2bvcan";
+ version = "0.1.1.0";
+ sha256 = "0vsx5b99fwmp05l4wsw744gg79hbfb4wlzyfip3k0g76fcs49nil";
description = "A secure utmpx and wtmp implementation";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/wayland/protocols.nix b/third_party/nixpkgs/pkgs/development/libraries/wayland/protocols.nix
index 71131516f9..73fef21ecc 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/wayland/protocols.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/wayland/protocols.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "wayland-protocols";
- version = "1.23";
+ version = "1.24";
doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
src = fetchurl {
url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz";
- sha256 = "0xizccackgwszjhlq7jjiv2z2gwppljx0w32ga91bxlnby8z22kc";
+ sha256 = "1hlb6gvyqlmsdkv5179ccj07p04cn6xacjkgklakbszczv7xiw5z";
};
postPatch = lib.optionalString doCheck ''
diff --git a/third_party/nixpkgs/pkgs/development/libraries/wt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wt/default.nix
index cb3ceeae2f..934369ac8e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/wt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/wt/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, cmake, boost, pkg-config, doxygen, qt48Full, libharu
, pango, fcgi, firebird, libmysqlclient, postgresql, graphicsmagick, glew, openssl
-, pcre, harfbuzz
+, pcre, harfbuzz, icu
}:
let
@@ -21,7 +21,7 @@ let
buildInputs = [
boost doxygen qt48Full libharu
pango fcgi firebird libmysqlclient postgresql graphicsmagick glew
- openssl pcre harfbuzz
+ openssl pcre harfbuzz icu
];
cmakeFlags = [
@@ -45,12 +45,12 @@ let
};
in {
wt3 = generic {
- version = "3.5.0";
- sha256 = "1xcwzldbval5zrf7f3n2gkpscagg51cw2jp6p3q1yh6bi59haida";
+ version = "3.7.1";
+ sha256 = "19gf5lbrc5shpvcdyzjh20k8zdj4cybxqvkhwqfl9rvhw89qr11k";
};
wt4 = generic {
- version = "4.5.0";
- sha256 = "16svzdma2mc2ggnpy5z7m1ggzhd5nrccmmj8xnc7bd1dd3486xwv";
+ version = "4.6.1";
+ sha256 = "04pv4kb8d576bfnd9kjc3cfjls9cm3cgpaiabwb3iyq9z0w585gh";
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/xml-security-c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xml-security-c/default.nix
index c3275c0ad5..925f9553fd 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/xml-security-c/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/xml-security-c/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "xml-security-c";
- version = "2.0.2";
+ version = "2.0.4";
src = fetchurl {
url = "mirror://apache/santuario/c-library/${pname}-${version}.tar.gz";
- sha256 = "1prh5sxzipkqglpsh53iblbr7rxi54wbijxdjiahzjmrijqa40y3";
+ sha256 = "sha256-p42mcg9sK6FBANJCYTHg0z6sWi26XMEb3QSXS364kAM=";
};
configureFlags = [
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix
index dab537df22..9f4979d756 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix
@@ -2,15 +2,15 @@
buildDunePackage rec {
pname = "ocaml-migrate-parsetree";
- version = "2.2.0";
+ version = "2.3.0";
useDune2 = true;
minimalOCamlVersion = "4.02";
src = fetchurl {
- url = "https://github.com/ocaml-ppx/${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
- sha256 = "188v3z09bg4gyv80c138fa3a3j2w54w5gc4r1ajw7klr70yqz9mj";
+ url = "https://github.com/ocaml-ppx/${pname}/releases/download/v${version}/${pname}-${version}.tbz";
+ sha256 = "sha256:02mzh1rcvc2xpq4iz01z7kvzsgxns3774ggxi96f147i8yr2d08h";
};
meta = {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Mako/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/Mako/default.nix
index cf30286126..4c16861823 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/Mako/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/Mako/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "Mako";
- version = "1.1.5";
+ version = "1.1.6";
src = fetchPypi {
inherit pname version;
- sha256 = "169fa52af22a91900d852e937400e79f535496191c63712e3b9fda5a9bed6fc3";
+ sha256 = "4e9e345a41924a954251b95b4b28e14a301145b544901332e658907a7464b6b2";
};
propagatedBuildInputs = [ markupsafe ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Markups/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/Markups/default.nix
index bacfe95a9a..1fa304f57a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/Markups/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/Markups/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "Markups";
- version = "3.1.2";
+ version = "3.1.3";
src = fetchPypi {
inherit pname version;
- sha256 = "2954d53656d9ec84f2f6c077e91a1de534e05647f20d327757283bbb5a857770";
+ sha256 = "ab9747a72c1c6457418eb4276c79871977c13a654618e4f12e2a1f0990fbf2fc";
};
checkInputs = [ markdown docutils pygments pyyaml ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/absl-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/absl-py/default.nix
index 611686e5c0..30a0e68dea 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/absl-py/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/absl-py/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "absl-py";
- version = "0.14.1";
+ version = "0.15.0";
src = fetchPypi {
inherit pname version;
- sha256 = "eb0383bd431c0d7b2320179904cab00120a10977e3c9671d99efbbed17efb55a";
+ sha256 = "72d782fbeafba66ba3e525d46bccac949b9a174dbf66233e50ece09ee688dc81";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adjusttext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adjusttext/default.nix
index 82613ffa52..9685f5c996 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/adjusttext/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/adjusttext/default.nix
@@ -1,13 +1,15 @@
-{ buildPythonPackage
-, numpy
-, matplotlib
+{ lib
+, buildPythonPackage
, fetchFromGitHub
-, lib
+, matplotlib
+, numpy
+, packaging
}:
buildPythonPackage rec {
pname = "adjusttext";
version = "0.7.3";
+ format = "setuptools";
src = fetchFromGitHub {
owner = "Phlya";
@@ -16,12 +18,21 @@ buildPythonPackage rec {
sha256 = "02apaznnnmwmrn342f22dj5dldn56gdl9v5qix07ah6kgp9503yw";
};
- propagatedBuildInputs = [ matplotlib numpy ];
+ nativeBuildInputs = [
+ packaging
+ ];
+
+ propagatedBuildInputs = [
+ matplotlib
+ numpy
+ ];
# Project has no tests
doCheck = false;
- pythonImportsCheck = [ "adjustText" ];
+ pythonImportsCheck = [
+ "adjustText"
+ ];
meta = with lib; {
description = "Iteratively adjust text position in matplotlib plots to minimize overlaps";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix
index c06929176d..d0de050c86 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix
@@ -1,38 +1,48 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder
+{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder
, fonttools, defcon, lxml, fs, unicodedata2, zopfli, brotlipy, fontpens
, brotli, fontmath, mutatormath, booleanoperations
, ufoprocessor, ufonormalizer, psautohint, tqdm
-, setuptools-scm
+, setuptools-scm, scikit-build
+, cmake
+, antlr4_9
, pytestCheckHook
+# Enables some expensive tests, useful for verifying an update
+, runAllTests ? false
+, afdko
}:
buildPythonPackage rec {
pname = "afdko";
- version = "3.5.1";
+ version = "3.7.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "1qg7dgl81yq0sp50pkhgvmf8az1svx20zmpkfa68ka9d0ssh1wjw";
+ sha256 = "05hj2mw3ppfjaig5zdk5db9vfrbbq5gmv5rzggmvvrj0yyfpr0pd";
};
- patches = [
- # Skip date-dependent test. See
- # https://github.com/adobe-type-tools/afdko/pull/1232
- # https://github.com/NixOS/nixpkgs/pull/98158#issuecomment-704321117
- (fetchpatch {
- url = "https://github.com/adobe-type-tools/afdko/commit/2c36ad10f9d964759f643e8ed7b0972a27aa26bd.patch";
- sha256 = "0p6a485mmzrbfldfbhgfghsypfiad3cabcw7qlw2rh993ivpnibf";
- })
- # fix tests for fonttools 4.21.1
- (fetchpatch {
- url = "https://github.com/adobe-type-tools/afdko/commit/0919e7454a0a05a1b141c23bf8134c67e6b688fc.patch";
- sha256 = "0glly85swyl1kcc0mi8i0w4bm148bb001jz1winz5drfrw3a63jp";
- })
+ format = "pyproject";
+
+ nativeBuildInputs = [
+ setuptools-scm
+ scikit-build
+ cmake
];
- nativeBuildInputs = [ setuptools-scm ];
+ buildInputs = [
+ antlr4_9.runtime.cpp
+ ];
+
+ patches = [
+ # Don't try to install cmake and ninja using pip
+ ./no-pypi-build-tools.patch
+ # Use antlr4 runtime from nixpkgs and link it dynamically
+ ./use-dynamic-system-antlr4-runtime.patch
+ ];
+
+ # setup.py will always (re-)execute cmake in buildPhase
+ dontConfigure = true;
propagatedBuildInputs = [
booleanoperations
@@ -53,10 +63,6 @@ buildPythonPackage rec {
tqdm
];
- # tests are broken on non x86_64
- # https://github.com/adobe-type-tools/afdko/issues/1163
- # https://github.com/adobe-type-tools/afdko/issues/1216
- doCheck = stdenv.isx86_64;
checkInputs = [ pytestCheckHook ];
preCheck = ''
export PATH=$PATH:$out/bin
@@ -65,7 +71,7 @@ buildPythonPackage rec {
# https://github.com/adobe-type-tools/afdko/issues/1418
find tests -name layerinfo.plist -delete
'';
- disabledTests = [
+ disabledTests = lib.optionals (!runAllTests) [
# Disable slow tests, reduces test time ~25 %
"test_report"
"test_post_overflow"
@@ -74,8 +80,16 @@ buildPythonPackage rec {
"test_filename_without_dir"
"test_overwrite"
"test_options"
+ ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [
+ # aarch64-only (?) failure, unknown reason so far
+ # https://github.com/adobe-type-tools/afdko/issues/1425
+ "test_spec"
];
+ passthru.tests = {
+ fullTestsuite = afdko.override { runAllTests = true; };
+ };
+
meta = with lib; {
description = "Adobe Font Development Kit for OpenType";
homepage = "https://adobe-type-tools.github.io/afdko/";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/afdko/no-pypi-build-tools.patch b/third_party/nixpkgs/pkgs/development/python-modules/afdko/no-pypi-build-tools.patch
new file mode 100644
index 0000000000..4acc351e7b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/afdko/no-pypi-build-tools.patch
@@ -0,0 +1,24 @@
+commit 72b0ab672d1080049431eeee07ae6d2556ae9e4a
+Author: sternenseemann
+Date: Tue Oct 5 18:17:20 2021 +0200
+
+ Don't use pypi distributions of build tools
+
+ We want to use regular cmake and ninja and not the pypi projects which
+ somehow wrap and vendor a version of the proper tool.
+
+diff --git a/setup.py b/setup.py
+index 50deb781..81417971 100644
+--- a/setup.py
++++ b/setup.py
+@@ -196,9 +196,7 @@ def main():
+ setup_requires=[
+ 'wheel',
+ 'setuptools_scm',
+- 'scikit-build',
+- 'cmake',
+- 'ninja'
++ 'scikit-build'
+ ],
+ tests_require=[
+ 'pytest',
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/afdko/use-dynamic-system-antlr4-runtime.patch b/third_party/nixpkgs/pkgs/development/python-modules/afdko/use-dynamic-system-antlr4-runtime.patch
new file mode 100644
index 0000000000..25e399e78d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/afdko/use-dynamic-system-antlr4-runtime.patch
@@ -0,0 +1,43 @@
+commit 105daa26f09034af58eb13ac7c5c4ff5420c1724
+Author: sternenseemann
+Date: Tue Oct 5 18:16:10 2021 +0200
+
+ Link against system antlr4 runtime, dynamically
+
+ Instead of cloning a antlr4 version from git, use the system one. Also
+ don't link it statically, but dynamically by default (the library is
+ called antlr4-runtime, not antlr4_static).
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d7f86fb6..c43c4456 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -36,13 +36,13 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+ # https://www.antlr.org/download/antlr4-cpp-runtime-4.9.2-source.zip
+ # set(ANTLR4_ZIP_REPOSITORY "/path_to_antlr4_archive/a4.zip")
+
+-add_definitions(-DANTLR4CPP_STATIC)
+ set(ANTLR4_WITH_STATIC_CRT OFF)
+ # Use slightly more recent commit than 4.9.2 to deal with utfcpp test
+ # compilation problems
+ # set(ANTLR4_TAG tags/4.9.2)
+ set(ANTLR4_TAG 916f03366edf15bf8b50010b11d479c189bf9f96)
+-include(ExternalAntlr4Cpp)
++find_path(ANTLR4_HEADER antlr4-runtime.h PATH_SUFFIXES antlr4-runtime)
++set(ANTLR4_INCLUDE_DIRS ${ANTLR4_HEADER})
+
+ # sanitizer support
+ # work around https://github.com/pypa/setuptools/issues/1928 with environment
+diff --git a/c/makeotf/lib/hotconv/CMakeLists.txt b/c/makeotf/lib/hotconv/CMakeLists.txt
+index 82257bf2..02eb2e30 100644
+--- a/c/makeotf/lib/hotconv/CMakeLists.txt
++++ b/c/makeotf/lib/hotconv/CMakeLists.txt
+@@ -69,7 +69,7 @@ add_library(hotconv STATIC
+
+ set_property(TARGET hotconv PROPERTY C_STANDARD 99)
+ target_include_directories(hotconv PRIVATE AFTER $<$:${ANTLR4_INCLUDE_DIRS}>)
+-target_link_libraries(hotconv PUBLIC antlr4_static)
++target_link_libraries(hotconv PUBLIC antlr4-runtime)
+
+ if ( CMAKE_COMPILER_IS_GNUCC )
+ target_compile_options(hotconv PRIVATE -Wall -Wno-attributes)
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix
index 05027dc017..592f8facae 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "aiofiles";
- version = "0.7.0";
+ version = "0.8.0";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "Tinche";
repo = pname;
rev = "v${version}";
- sha256 = "0vvk9j8cfdqvq8hw2qc6ajfzsy8x1afabf83mxafffq92rwknd4y";
+ sha256 = "sha256-V7F+xalFGMgTgT30Gmd9FVV3cPndI/i9cB5vEuW/KVc=";
};
nativeBuildInputs = [
@@ -33,9 +33,17 @@ buildPythonPackage rec {
disabledTests = lib.optionals stdenv.isDarwin [
"test_sendfile_file"
+
+ # require loopback networking:
+ "test_sendfile_socket"
+ "test_serve_small_bin_file_sync"
+ "test_serve_small_bin_file"
+ "test_slow_file"
];
- pythonImportsCheck = [ "aiofiles" ];
+ pythonImportsCheck = [
+ "aiofiles"
+ ];
meta = {
description = "File support for asyncio";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-wsgi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-wsgi/default.nix
index ed270cddd9..1e47634532 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-wsgi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-wsgi/default.nix
@@ -28,6 +28,7 @@ buildPythonPackage rec {
disabledTests = [
# makes http request to another server
+ # https://github.com/etianen/aiohttp-wsgi/issues/32
"testEnviron"
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix
index db1f810cbc..f96fa88203 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix
@@ -29,12 +29,12 @@
buildPythonPackage rec {
pname = "aiohttp";
- version = "3.8.0";
+ version = "3.8.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-07GdjRg7z9aLJb7rq43DMIKC/iyj1uo8tM0QGzwnn40=";
+ sha256 = "fc5471e1a54de15ef71c1bc6ebe80d4dc681ea600e68bfd1cbce40427f0b7578";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/amazon_kclpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/amazon_kclpy/default.nix
index b39d390274..06f6198156 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/amazon_kclpy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/amazon_kclpy/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "amazon_kclpy";
- version = "2.0.2";
+ version = "2.0.6";
src = fetchFromGitHub {
owner = "awslabs";
repo = "amazon-kinesis-client-python";
rev = "v${version}";
- sha256 = "12yxcwml6g86sv1pj3wc2k97md9szdj6xx07qwri1mr9bdkzw7rv";
+ sha256 = "0gbpwhpd9i13vi0cch48qqrma90p230psqrkbfcjvdah69w434l4";
};
# argparse is just required for python2.6
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/androguard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/androguard/default.nix
index 492c835f01..42f37e1309 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/androguard/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/androguard/default.nix
@@ -11,6 +11,7 @@
, click
, pydot
, ipython
+, packaging
, pyqt5
, pyperclip
, nose
@@ -39,6 +40,12 @@ buildPythonPackage rec {
sha256 = "1aparxiq11y0hbvkayp92w684nyxyyx7mi0n1x6x51g5z6c58vmy";
};
+ nativeBuildInputs = [
+ packaging
+ ] ++ lib.optionals withGui [
+ qt5.wrapQtAppsHook
+ ];
+
propagatedBuildInputs = [
asn1crypto
click
@@ -67,10 +74,6 @@ buildPythonPackage rec {
];
inherit doCheck;
- nativeBuildInputs = lib.optionals withGui [
- qt5.wrapQtAppsHook
- ];
-
# If it won't be verbose, you'll see nothing going on for a long time.
checkPhase = ''
runHook preCheck
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix
index a23f668529..f4ec1c1846 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix
@@ -18,11 +18,11 @@
buildPythonPackage rec {
pname = "ansible-runner";
- version = "2.0.3";
+ version = "2.1.1";
src = fetchPypi {
inherit pname version;
- sha256 = "15j0ljgw1rjxq4xiywxxxnxj4r6vwk8dwljkdsjmq3qmwgifcswg";
+ sha256 = "7684612f7543c5f07f3e8135667eeb22a9dbd98f625cc69901ba9924329ef24f";
};
checkInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aocd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aocd/default.nix
new file mode 100644
index 0000000000..ca9768569e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aocd/default.nix
@@ -0,0 +1,58 @@
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, requests
+, pytestCheckHook, tzlocal, pytest-mock, pytest-freezegun, pytest-raisin
+, pytest-socket, requests-mock, pebble, python-dateutil, termcolor
+, beautifulsoup4, setuptools
+}:
+
+buildPythonPackage rec {
+ pname = "aocd";
+ version = "1.1.1";
+
+ src = fetchFromGitHub {
+ owner = "wimglenn";
+ repo = "advent-of-code-data";
+ rev = "v${version}";
+ sha256 = "sha256-wdg6XUkjnAc9yAP7DP0UT6SlQHfj/ymhqzIGNM3fco4=";
+ };
+
+ propagatedBuildInputs = [
+ python-dateutil
+ requests
+ termcolor
+ beautifulsoup4
+ pebble
+ tzlocal
+ setuptools
+ ];
+
+ # Too many failing tests
+ preCheck = "rm pytest.ini";
+
+ disabledTests = [
+ "test_results"
+ "test_results_xmas"
+ "test_run_error"
+ "test_run_and_autosubmit"
+ "test_run_and_no_autosubmit"
+ "test_load_input_from_file"
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ pytest-mock
+ pytest-freezegun
+ pytest-raisin
+ pytest-socket
+ requests-mock
+ ];
+
+ pythonImportsCheck = [ "aocd" ];
+
+ meta = with lib; {
+ homepage = "https://github.com/wimglenn/advent-of-code-data";
+ description = "Get your Advent of Code data with a single import statement";
+ license = licenses.mit;
+ maintainers = with maintainers; [ aadibajpai ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apsw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apsw/default.nix
index c0f7274a80..034e3e0df2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/apsw/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/apsw/default.nix
@@ -1,8 +1,16 @@
-{ lib, buildPythonPackage, fetchFromGitHub, sqlite, isPyPy }:
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, sqlite
+, isPyPy
+, pytestCheckHook
+}:
buildPythonPackage rec {
pname = "apsw";
- version = "3.33.0-r1";
+ version = "3.36.0-r1";
+ format = "setuptools";
disabled = isPyPy;
@@ -10,14 +18,43 @@ buildPythonPackage rec {
owner = "rogerbinns";
repo = "apsw";
rev = version;
- sha256 = "05mxcw1382xx22285fnv92xblqby3adfrvvalaw4dc6rzsn6kcan";
+ sha256 = "sha256-kQqJqDikvEC0+PNhQxSNTcjQc+RwvaOSGz9VL3FCetg=";
};
- buildInputs = [ sqlite ];
+ buildInputs = [
+ sqlite
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pytestFlagsArray = [
+ "tests.py"
+ ];
+
+ disabledTests = [
+ "testCursor"
+ "testLoadExtension"
+ "testShell"
+ "testVFS"
+ "testVFSWithWAL"
+ "testdb"
+ ] ++ lib.optionals stdenv.isDarwin [
+ # This is https://github.com/rogerbinns/apsw/issues/277 but
+ # because we use pytestCheckHook we need to blacklist the test
+ # manually
+ "testzzForkChecker"
+ ];
+
+ pythonImportsCheck = [
+ "apsw"
+ ];
meta = with lib; {
description = "A Python wrapper for the SQLite embedded relational database engine";
homepage = "https://github.com/rogerbinns/apsw";
license = licenses.zlib;
+ maintainers = with maintainers; [ ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/arrow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/arrow/default.nix
index 72bbdb7b97..fc66509a19 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/arrow/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/arrow/default.nix
@@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "arrow";
- version = "1.2.0";
+ version = "1.2.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "16fc29bbd9e425e3eb0fef3018297910a0f4568f21116fc31771e2760a50e074";
+ sha256 = "c2dde3c382d9f7e6922ce636bf0b318a7a853df40ecb383b29192e6c5cc82840";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ase/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ase/default.nix
index 25210e4740..c3ec514844 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ase/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ase/default.nix
@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "ase";
- version = "3.22.0";
+ version = "3.22.1";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-5gJZx7UIZ7HLgXyvk4/MHtODcCQT320uGv5+oH9lrO4=";
+ sha256 = "sha256-AE32sOoEsRFMeQ+t/kXUEl6w5TElxmqTQlr4U9gqtDI=";
};
propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/astroid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/astroid/default.nix
index b6ba53055d..101f84b4fc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/astroid/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/astroid/default.nix
@@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
-, fetchpatch
, pythonOlder
, isPyPy
, lazy-object-proxy
@@ -15,32 +14,23 @@
buildPythonPackage rec {
pname = "astroid";
- version = "2.8.2"; # Check whether the version is compatible with pylint
+ version = "2.9.0"; # Check whether the version is compatible with pylint
- disabled = pythonOlder "3.6";
+ disabled = pythonOlder "3.6.2";
src = fetchFromGitHub {
owner = "PyCQA";
repo = pname;
rev = "v${version}";
- sha256 = "0140h4l7licwdw0scnfzsbi5b2ncxi7fxhdab7c1i3sk01r4asp6";
+ sha256 = "sha256-sImWiWULZ1HS3JyQHfEhc4ZRZ6anOUTqZZGNIYj2MaY=";
};
- SETUPTOOLS_SCM_PRETEND_VERSION=version;
-
- patches = [
- (fetchpatch {
- # Allow wrapt 1.13 (https://github.com/PyCQA/astroid/pull/1203)
- url = "https://github.com/PyCQA/astroid/commit/fd510e08c2ee862cd284861e02b9bcc9a7fd9809.patch";
- sha256 = "1s10whslcqnyz251fb76qkc9p41gagxljpljsmw89id1wywmjib4";
- })
- ];
+ SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools-scm
];
- # From astroid/__pkginfo__.py
propagatedBuildInputs = [
lazy-object-proxy
wrapt
@@ -52,6 +42,11 @@ buildPythonPackage rec {
pytestCheckHook
];
+ disabledTests = [
+ # assert (1, 1) == (1, 16)
+ "test_end_lineno_string"
+ ];
+
passthru.tests = {
inherit pylint;
};
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/async_stagger/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/async_stagger/default.nix
index 638e326e0d..3dafd2b219 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/async_stagger/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/async_stagger/default.nix
@@ -10,6 +10,8 @@
buildPythonPackage rec {
pname = "async_stagger";
version = "0.3.1";
+ format = "setuptools";
+
disabled = pythonOlder "3.6";
src = fetchPypi {
@@ -23,7 +25,14 @@ buildPythonPackage rec {
pytest-mock
];
- pythonImportsCheck = [ "async_stagger" ];
+ disabledTests = [
+ # RuntimeError: Logic bug in...
+ "test_stagger_coro_gen"
+ ];
+
+ pythonImportsCheck = [
+ "async_stagger"
+ ];
meta = with lib; {
description = "Happy Eyeballs connection algorithm and underlying scheduling logic in asyncio";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncio-nats-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncio-nats-client/default.nix
index b501712385..46dbcdbacd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/asyncio-nats-client/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncio-nats-client/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "asyncio-nats-client";
- version = "0.11.4";
+ version = "0.11.5";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "nats-io";
repo = "nats.py";
rev = "v${version}";
- sha256 = "1aj57xi2rj1xswq8air13xdsll1ybpi0nmz5f6jq01azm0zy9xyd";
+ sha256 = "0zwiijaswmfdk71diqmdpb6nx54fmgi8hy0vwx2m3ihhsyjxj82h";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix
index 9c9e2d623d..7ae4cb1b78 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix
@@ -3,12 +3,12 @@
buildPythonPackage rec {
pname = "asyncpg";
- version = "0.24.0";
+ version = "0.25.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-3S+gY8M0SCNIfZ3cy0CALwJiLd+L+KbMU4he56LBwMY=";
+ sha256 = "63f8e6a69733b285497c2855464a34de657f2cccd25aeaeeb5071872e9382540";
};
checkInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/atom/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/atom/default.nix
index cb9503fe6e..80e29932ee 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/atom/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/atom/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "atom";
- version = "0.6.0";
+ version = "0.7.0";
src = fetchPypi {
inherit pname version;
- sha256 = "df65a654744ccdc4843ce09c38612fd8f702c84be501b1d955c3ac0b9ad28dc5";
+ sha256 = "4055fbdeeb692d3d52c6e3c628d7513fc71f147920cac7d0da05b6dbb5ec8c8d";
};
buildInputs = [ cppy ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/authcaptureproxy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/authcaptureproxy/default.nix
index c03b423932..73422a0624 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/authcaptureproxy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/authcaptureproxy/default.nix
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "authcaptureproxy";
- version = "1.0.2";
+ version = "1.1.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "alandtse";
repo = "auth_capture_proxy";
rev = "v${version}";
- sha256 = "1cg63qhf823nf785kyl96r7vyxfl6dlbwsmhcpny8vb65pl9gng5";
+ sha256 = "08zpaclg5f9g1pix0jaq42i2ph12xc8djjrmhxz0yygw5rsilgl4";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/avro/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/avro/default.nix
index 4c1fb77dc6..d69f009aaf 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/avro/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/avro/default.nix
@@ -1,30 +1,44 @@
-{ lib, buildPythonPackage, isPy3k, fetchPypi, pycodestyle, isort }:
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchPypi
+, typing-extensions
+, pytestCheckHook
+}:
buildPythonPackage rec {
pname = "avro";
- version = "1.10.2";
+ version = "1.11.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "381b990cc4c4444743c3297348ffd46e0c3a5d7a17e15b2f4a9042f6e955c31a";
+ sha256 = "1206365cc30ad561493f735329857dd078533459cee4e928aec2505f341ce445";
};
- patchPhase = ''
- # this test requires network access
- sed -i 's/test_server_with_path/noop/' avro/test/test_ipc.py
- '' + (lib.optionalString isPy3k ''
- # these files require twisted, which is not python3 compatible
- rm avro/txipc.py
- rm avro/test/txsample*
- '');
+ propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
+ typing-extensions
+ ];
- nativeBuildInputs = [ pycodestyle ];
- propagatedBuildInputs = [ isort ];
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ disabledTests = [
+ # Requires network access
+ "test_server_with_path"
+ ];
+
+ pythonImportsCheck = [
+ "avro"
+ ];
meta = with lib; {
- description = "A serialization and RPC framework";
- homepage = "https://pypi.python.org/pypi/avro/";
+ description = "Python serialization and RPC framework";
+ homepage = "https://github.com/apache/avro";
license = licenses.asl20;
- maintainers = [ maintainers.zimbatm ];
+ maintainers = with maintainers; [ zimbatm ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault/default.nix
index f5b83df266..8a4799c688 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault/default.nix
@@ -21,10 +21,9 @@ buildPythonPackage rec {
azure-keyvault-secrets
];
- # this is just a meta package, which contains keys and secrets
+ # this is just a meta package, which contains keys and secrets packages
doCheck = false;
-
- pythonNamespaces = [ "azure" ];
+ doBuild = false;
pythonImportsCheck = [
"azure.keyvault.keys"
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix
index 6734333786..0d3a4bfb2b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-recoveryservicesbackup";
- version = "3.0.0";
+ version = "4.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "1992486b28ddd6d4f597fd3004217cd2caf4f4dc8a0ce71226b5ae767ace3a18";
+ sha256 = "a848ac1d99c935e61dfb91ca3e1577904a3eff5820fce179eb6937df8e1019ec";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bitstruct/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bitstruct/default.nix
index 43edd16f66..78b34dfbf1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bitstruct/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/bitstruct/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "bitstruct";
- version = "8.11.1";
+ version = "8.12.1";
src = fetchPypi {
inherit pname version;
- sha256 = "4e7b8769c0f09fee403d0a5f637f8b575b191a79a92e140811aa109ce7461f0c";
+ sha256 = "45b2b932ce6681f5c6ce8cba39abdd423b579b0568c76fa48b1e09c88368ede7";
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bokeh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bokeh/default.nix
index 63cd373abf..9017cbed0d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bokeh/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/bokeh/default.nix
@@ -33,11 +33,11 @@
buildPythonPackage rec {
pname = "bokeh";
# update together with panel which is not straightforward
- version = "2.3.3";
+ version = "2.4.2";
src = fetchPypi {
inherit pname version;
- sha256 = "a5fdcc181835561447fcc5a371300973fce4114692d5853addec284d1cdeb677";
+ sha256 = "f0a4b53364ed3b7eb936c5cb1a4f4132369e394c7ae0a8ef420459410958033d";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix
index 6d8cb85fa8..bf26eca41b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "boto3";
- version = "1.18.54"; # N.B: if you change this, change botocore and awscli to a matching version
+ version = "1.20.13"; # N.B: if you change this, change botocore and awscli to a matching version
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-LYHcSEAgBZ/HOBZZhDBBB9TbHGd0tjENCMiSoXUfaYA=";
+ sha256 = "bbf53a077d6a0575ddec8026f0475ca6ee6f41b227914bf315bf3e049a3d653a";
};
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix
index bf29141160..b34dbfbac9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "botocore";
- version = "1.21.54"; # N.B: if you change this, change boto3 and awscli to a matching version
+ version = "1.23.14"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-RhJ7OjhdDsc9GZS4lYsjt54GE+EsSGNxoQDfmStyobk=";
+ sha256 = "sha256-6NUsvy5zxiaM8sIH9H48+z7eCYP5PotZZ0tUYo5+8fE=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bpython/clipboard-make-which-substitutable.patch b/third_party/nixpkgs/pkgs/development/python-modules/bpython/clipboard-make-which-substitutable.patch
deleted file mode 100644
index 685d34228a..0000000000
--- a/third_party/nixpkgs/pkgs/development/python-modules/bpython/clipboard-make-which-substitutable.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 6f544a5bd43446859754cb80e012af933b843db9 Mon Sep 17 00:00:00 2001
-From: Florian Klink
-Date: Wed, 3 Jun 2020 22:05:34 +0200
-Subject: [PATCH] clipboard: make which substitutable
-
-This is used to detect the presence of xclip and other clipboard
-handling tools.
----
- bpython/clipboard.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bpython/clipboard.py b/bpython/clipboard.py
-index aee429b..f346429 100644
---- a/bpython/clipboard.py
-+++ b/bpython/clipboard.py
-@@ -58,7 +58,7 @@ class OSXClipboard(object):
-
- def command_exists(command):
- process = subprocess.Popen(
-- ["which", command], stderr=subprocess.STDOUT, stdout=subprocess.PIPE
-+ ["@which@", command], stderr=subprocess.STDOUT, stdout=subprocess.PIPE
- )
- process.communicate()
-
---
-2.26.2
-
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bpython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bpython/default.nix
index 64fe3c455e..3285f3dee9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bpython/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/bpython/default.nix
@@ -2,38 +2,41 @@
, buildPythonPackage
, fetchPypi
, curtsies
+, cwcwidth
, greenlet
, jedi
, pygments
+, pytestCheckHook
+, pyperclip
, pyxdg
, requests
, substituteAll
+, typing-extensions
, urwid
, watchdog
-, which
}:
buildPythonPackage rec {
pname = "bpython";
- version = "0.21";
+ version = "0.22.1";
src = fetchPypi {
inherit pname version;
- sha256 = "88aa9b89974f6a7726499a2608fa7ded216d84c69e78114ab2ef996a45709487";
+ sha256 = "1fb1e0a52332579fc4e3dcf75e21796af67aae2be460179ecfcce9530a49a200";
};
- patches = [ (substituteAll {
- src = ./clipboard-make-which-substitutable.patch;
- which = "${which}/bin/which";
- })];
-
propagatedBuildInputs = [
curtsies
+ cwcwidth
greenlet
+ jedi
pygments
+ pyperclip
pyxdg
requests
+ typing-extensions
urwid
+ watchdog
];
postInstall = ''
@@ -41,13 +44,16 @@ buildPythonPackage rec {
--replace "Exec=/usr/bin/bpython" "Exec=$out/bin/bpython"
'';
- checkInputs = [ jedi watchdog ];
+ checkInputs = [
+ pytestCheckHook
+ ];
+
pythonImportsCheck = [ "bpython" ];
meta = with lib; {
description = "A fancy curses interface to the Python interactive interpreter";
homepage = "https://bpython-interpreter.org/";
license = licenses.mit;
- maintainers = with maintainers; [ flokli ];
+ maintainers = with maintainers; [ flokli dotlambda ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/braintree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/braintree/default.nix
index 95e24e98d5..8cf820edbf 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/braintree/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/braintree/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "braintree";
- version = "4.13.0";
+ version = "4.13.1";
src = fetchPypi {
inherit pname version;
- sha256 = "de8270c24c4557bcb76d2079bb4cabf380ce467d17c65f10ee5159da7ff8496a";
+ sha256 = "4f6addf89f5cd6123243ddc89db325e50fceec825845901dad553fde115bd938";
};
propagatedBuildInputs = [ requests ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bumps/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bumps/default.nix
index 7e94bd55b2..6e0637d2a6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bumps/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/bumps/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "bumps";
- version = "0.8.0";
+ version = "0.8.1";
propagatedBuildInputs = [six];
@@ -12,7 +12,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "9f92c05effd8175763799d19ca55592e89b053318f611148a6725159aea41d67";
+ sha256 = "f4f2ee712a1e468a2ce5c0a32f67739a83331f0cb7b9c50b9e7510daefc12169";
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/castepxbin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/castepxbin/default.nix
index 3c44666486..993684bd5a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/castepxbin/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/castepxbin/default.nix
@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "castepxbin";
- version = "0.1.0";
+ version = "0.2.0";
src = fetchFromGitHub {
owner = "zhubonan";
repo = "castepxbin";
rev = "v${version}";
- sha256 = "16wnd1mwhl204d1s3har2fhyhyjg86sypg00bj812dxk8zixxszf";
+ sha256 = "0bqicpdyisbcz8argy4ppm59zzkcn9lcs4y1mh2f31f75x732na3";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix
index 280d53d2d8..cdd646fed1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-tBpZC0nK+OZJilfbYo5YDV+Nxv69oPQt5deDrtW3+Ag=";
+ sha256 = "b41a590b49caf8e6498a57db628e580d5f8dc6febda0f42de5d783aed5b7f808";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix
index 94aecdcc4e..a65cd297f4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix
@@ -1,39 +1,38 @@
-{ lib, stdenv, buildPythonPackage, isPyPy, fetchPypi, libffi, pycparser, pytestCheckHook }:
+{ lib, stdenv, buildPythonPackage, isPyPy, fetchPypi, pytestCheckHook,
+ libffi, pkg-config, pycparser
+}:
if isPyPy then null else buildPythonPackage rec {
pname = "cffi";
- version = "1.14.6";
+ version = "1.15.0";
src = fetchPypi {
inherit pname version;
- sha256 = "c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd";
+ sha256 = "920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954";
};
outputs = [ "out" "dev" ];
buildInputs = [ libffi ];
+ nativeBuildInputs = [ pkg-config ];
+
propagatedBuildInputs = [ pycparser ];
- # On Darwin, the cffi tests want to hit libm a lot, and look for it in a global
- # impure search path. It's obnoxious how much repetition there is, and how difficult
- # it is to get it to search somewhere else (since we do actually have a libm symlink in libSystem)
prePatch = lib.optionalString stdenv.isDarwin ''
- substituteInPlace testing/cffi0/test_parsing.py \
- --replace 'lib_m = "m"' 'lib_m = "System"' \
- --replace '"libm" in name' '"libSystem" in name'
- substituteInPlace testing/cffi0/test_unicode_literals.py --replace 'lib_m = "m"' 'lib_m = "System"'
- substituteInPlace testing/cffi0/test_zdistutils.py --replace 'self.lib_m = "m"' 'self.lib_m = "System"'
- substituteInPlace testing/cffi1/test_recompiler.py --replace 'lib_m = "m"' 'lib_m = "System"'
- substituteInPlace testing/cffi0/test_function.py --replace "lib_m = 'm'" "lib_m = 'System'"
- substituteInPlace testing/cffi0/test_verify.py --replace "lib_m = ['m']" "lib_m = ['System']"
+ # Remove setup.py impurities
+ substituteInPlace setup.py --replace "'-iwithsysroot/usr/include/ffi'" ""
+ substituteInPlace setup.py --replace "'/usr/include/ffi'," ""
+ substituteInPlace setup.py --replace '/usr/include/libffi' '${lib.getDev libffi}/include'
'';
# The tests use -Werror but with python3.6 clang detects some unreachable code.
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang
- "-Wno-unused-command-line-argument -Wno-unreachable-code";
+ "-Wno-unused-command-line-argument -Wno-unreachable-code -Wno-c++11-narrowing";
- doCheck = !stdenv.hostPlatform.isMusl && !stdenv.isDarwin; # TODO: Investigate
+ # Lots of tests fail on aarch64-darwin due to "Cannot allocate write+execute memory":
+ # * https://cffi.readthedocs.io/en/latest/using.html#callbacks
+ doCheck = !stdenv.hostPlatform.isMusl && !(stdenv.isDarwin && stdenv.isAarch64);
checkInputs = [ pytestCheckHook ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix
index f0769f5727..4a409cb41e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix
@@ -5,6 +5,7 @@
, aws-sam-translator
, importlib-metadata
, importlib-resources
+, jschema-to-python
, jsonpatch
, jsonschema
, junit-xml
@@ -12,6 +13,7 @@
, pathlib2
, pyyaml
, requests
+, sarif-om
, setuptools
, six
, mock
@@ -21,13 +23,13 @@
buildPythonPackage rec {
pname = "cfn-lint";
- version = "0.54.2";
+ version = "0.56.2";
src = fetchFromGitHub {
owner = "aws-cloudformation";
repo = "cfn-python-lint";
rev = "v${version}";
- sha256 = "04d5zyjnrl3b6cb2fxmbpii27mnq77wqsglfxfv2a1zj2p9xby0p";
+ sha256 = "0wpsj719r0p122qmi3nznzqnxqb0nx53isg9fma75894pvq2v5wc";
};
postPatch = ''
@@ -37,6 +39,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
aws-sam-translator
+ jschema-to-python
jsonpatch
jsonschema
junit-xml
@@ -44,6 +47,7 @@ buildPythonPackage rec {
pathlib2
pyyaml
requests
+ sarif-om
setuptools
six
] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata importlib-resources ];
@@ -70,6 +74,7 @@ buildPythonPackage rec {
# Tests depend on network access (fails in getaddrinfo)
"test_update_resource_specs_python_2"
"test_update_resource_specs_python_3"
+ "test_sarif_formatter"
];
pythonImportsCheck = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix
index dfdde6b0d6..43767cb1a3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix
@@ -24,13 +24,13 @@
buildPythonPackage rec {
pname = "chalice";
- version = "1.24.2";
+ version = "1.26.2";
src = fetchFromGitHub {
owner = "aws";
repo = pname;
rev = version;
- sha256 = "0xpzc3rizdkjxclgxngswz0a22kdv1pw235gsw517ma7i06d0lw6";
+ sha256 = "sha256-zF7wmrJTMX0Cr3wpJECUqhH58G2SLiVoC4Z2XbblQdQ=";
};
propagatedBuildInputs = [
@@ -85,6 +85,9 @@ buildPythonPackage rec {
# Don't build
"test_can_generate_pipeline_for_all"
"test_build_wheel"
+ # https://github.com/aws/chalice/issues/1850
+ "test_resolve_endpoint"
+ "test_endpoint_from_arn"
];
pythonImportsCheck = [ "chalice" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/charset-normalizer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/charset-normalizer/default.nix
index 66d9e23668..7f7f54b73d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/charset-normalizer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/charset-normalizer/default.nix
@@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "charset-normalizer";
- version = "2.0.5";
+ version = "2.0.8";
src = fetchFromGitHub {
owner = "Ousret";
repo = "charset_normalizer";
rev = version;
- sha256 = "0pv6yf5ialc82iimsjbq3gp5hh02pg4a7sdma48gd81h4h8qd627";
+ sha256 = "sha256-+acnzdDcujnMa0FYlWaAX7Ga9APMRlvBLKoogIyY8YM=";
};
checkInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix
index 2873b7e99e..0e80ee1a41 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "chart-studio";
- version = "5.3.1";
+ version = "5.4.0";
# chart-studio was split from plotly
src = fetchFromGitHub {
owner = "plotly";
repo = "plotly.py";
rev = "v${version}";
- sha256 = "11jazr5s2rmcxbkpb79gllwlyxvji3f0ryfrj7mkbyvfnfv43gly";
+ sha256 = "1ay9dlblxkx3pxqmizj2am9gf60j1pl6ir23yj7chg8dbafdbv8p";
};
sourceRoot = "source/packages/python/chart-studio";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/click-repl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/click-repl/default.nix
index 84665ecb09..5934adab7a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/click-repl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/click-repl/default.nix
@@ -1,15 +1,32 @@
-{ lib, buildPythonPackage, fetchPypi, click, prompt-toolkit }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, click
+, prompt-toolkit
+, six
+, pytestCheckHook
+}:
buildPythonPackage rec {
pname = "click-repl";
version = "0.2.0";
- src = fetchPypi {
- inherit pname version;
- sha256 = "cd12f68d745bf6151210790540b4cb064c7b13e571bc64b6957d98d120dacfd8";
+ src = fetchFromGitHub {
+ owner = "click-contrib";
+ repo = "click-repl";
+ rev = version;
+ hash = "sha256-kaTUKaIomJL0u3NX40bL0I54vkR+Utcdw1QKSbnVy5s=";
};
- propagatedBuildInputs = [ click prompt-toolkit ];
+ propagatedBuildInputs = [
+ click
+ prompt-toolkit
+ six
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
meta = with lib; {
homepage = "https://github.com/click-contrib/click-repl";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cliff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cliff/default.nix
index 8b8f536bab..ce229665c6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cliff/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cliff/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "cliff";
- version = "3.9.0";
+ version = "3.10.0";
src = fetchPypi {
inherit pname version;
- sha256 = "95363e9b43e2ec9599e33b5aea27a6953beda2d0673557916fa4f5796857daa3";
+ sha256 = "c68aac08d0d25853234a38fdbf1f33503849af3d5d677a4d0aacd42b0be6a4a1";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cloudsmith-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cloudsmith-api/default.nix
index 619df023f9..0e1aca7352 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cloudsmith-api/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cloudsmith-api/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "cloudsmith-api";
- version = "0.57.1";
+ version = "1.8.2";
format = "wheel";
src = fetchPypi {
pname = "cloudsmith_api";
inherit format version;
- sha256 = "6e7b4baacdc93df93c93d83db7628854adadc63915515022ed44cde06e13c986";
+ sha256 = "f00410210f0efa1af7a2d344deafc12b946e3efc7d5c8374b27dc67ed8580183";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cmd2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cmd2/default.nix
index f7308fd8ba..8339af8094 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cmd2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cmd2/default.nix
@@ -18,13 +18,13 @@
buildPythonPackage rec {
pname = "cmd2";
- version = "2.2.0";
+ version = "2.3.2";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "34cd12424d9e2835eff125146af3d9f4a4c2931c6bc5a3cea9790bd4f55756d9";
+ sha256 = "cad18787a26147dad4b161d75c5ab7de16ffe91fef1cfad8e6f18b712746e800";
};
LC_ALL = "en_US.UTF-8";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cocotb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cocotb/default.nix
index 17fe45f1cf..90616dc1f8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cocotb/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cocotb/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "cocotb";
- version = "1.5.2";
+ version = "1.6.0";
# - we need to use the tarball from PyPi
# or the full git checkout (with .git)
@@ -20,7 +20,7 @@ buildPythonPackage rec {
# because it does not include required metadata
src = fetchPypi {
inherit pname version;
- sha256 = "9f4f3e6eb9caeb479e98d604770645b57469cd25b39e28df1916ffcd593efbe6";
+ sha256 = "a695544ab314e6d795b72ece9e67b51c6668c569b21303158e00452db43c5756";
};
nativeBuildInputs = [ setuptools-scm ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cogapp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cogapp/default.nix
index 16059fe3d6..facbc32068 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cogapp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cogapp/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "cogapp";
- version = "3.2.0";
+ version = "3.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "09a6e82a55af45f5e946d7002ed997869abf6f57d28fdc79f128132b5da18bf8";
+ sha256 = "1be95183f70282422d594fa42426be6923070a4bd8335621f6347f3aeee81db0";
};
# there are no tests
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/configparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/configparser/default.nix
index 3eeae353d1..5f227fa4f9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/configparser/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/configparser/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "configparser";
- version = "5.0.2";
+ version = "5.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "85d5de102cfe6d14a5172676f09d19c465ce63d6019cf0a4ef13385fc535e828";
+ sha256 = "202b9679a809b703720afa2eacaad4c6c2d63196070e5d9edc953c0489dfd536";
};
# No tests available
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/construct/2.10.54.nix b/third_party/nixpkgs/pkgs/development/python-modules/construct/2.10.54.nix
index 30d303b60c..6cfca72605 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/construct/2.10.54.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/construct/2.10.54.nix
@@ -14,9 +14,20 @@ buildPythonPackage rec {
sha256 = "1mqspsn6bf3ibvih1zna2glkg8iw7vy5zg9gzg0d1m8zcndk2c48";
};
- checkInputs = [ pytestCheckHook pytest-benchmark enum34 numpy arrow ruamel-yaml ];
+ checkInputs = [ pytestCheckHook pytest-benchmark enum34 numpy ];
- disabledTests = lib.optionals stdenv.isDarwin [ "test_multiprocessing" ];
+ # these have dependencies that are broken on Python 2
+ disabledTestPaths = [
+ "tests/gallery/test_gallery.py"
+ "tests/test_benchmarks.py"
+ "tests/test_compiler.py"
+ ];
+
+ disabledTests = [
+ "test_timestamp"
+ ] ++ lib.optionals stdenv.isDarwin [
+ "test_multiprocessing"
+ ];
pytestFlagsArray = [ "--benchmark-disable" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/crccheck/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/crccheck/default.nix
index 1762d60dfd..891e67f644 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/crccheck/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/crccheck/default.nix
@@ -3,7 +3,7 @@
let
pname = "crccheck";
- version = "1.0";
+ version = "1.1";
in buildPythonPackage {
inherit pname version;
@@ -11,7 +11,7 @@ in buildPythonPackage {
src = fetchPypi {
inherit pname version;
- sha256 = "1ay9lgy80j7lklm07iw2wq7giwnv9fbv50mncblqlc39y322vi0p";
+ sha256 = "45962231cab62b82d05160553eebd9b60ef3ae79dc39527caef52e27f979fa96";
};
disabled = !isPy3k;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cryptography/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cryptography/default.nix
index eddd7e0b44..d21e6d060f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cryptography/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cryptography/default.nix
@@ -79,10 +79,6 @@ buildPythonPackage rec {
py.test ${pytestFlags} tests
'';
- # IOKit's dependencies are inconsistent between OSX versions, so this is the best we
- # can do until nix 1.11's release
- __impureHostDeps = [ "/usr/lib" ];
-
meta = with lib; {
description = "A package which provides cryptographic recipes and primitives";
longDescription = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/curtsies/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/curtsies/default.nix
index 549d6062c1..3ef99936c4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/curtsies/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/curtsies/default.nix
@@ -2,10 +2,10 @@
buildPythonPackage rec {
pname = "curtsies";
- version = "0.3.9";
+ version = "0.3.10";
src = fetchPypi {
inherit pname version;
- sha256 = "933b503767ce38fe32a1f77639d9a4fa3d5229d41abb31a91a6fcbdf01511a55";
+ sha256 = "11efbb153d9cb22223dd9a44041ea0c313b8411e246e7f684aa843f6aa9c1600";
};
propagatedBuildInputs = [ blessings cwcwidth ]
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix
index 2f1797bf4f..514b53b873 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "cx_Freeze";
- version = "6.8.1";
+ version = "6.8.3";
src = fetchPypi {
inherit pname version;
- sha256 = "3f16d3d40f7f2e1f6032132170d8fd4ba2f4f9ea419f13d7a68091bbe1949583";
+ sha256 = "05e7a2b099d4eb36e74116311b693dcc3103763aee92ef32079be0b6d4832fa0";
};
disabled = pythonOlder "3.5";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cx_oracle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cx_oracle/default.nix
index a5606ac3dd..3b7d701f11 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cx_oracle/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cx_oracle/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "cx_Oracle";
- version = "8.2.1";
+ version = "8.3.0";
buildInputs = [ odpic ];
src = fetchPypi {
inherit pname version;
- sha256 = "12e7e913a7a10fd8caafb9855e6703a601b7dd5cc596fcd489d0ac9529608b6c";
+ sha256 = "3b2d215af4441463c97ea469b9cc307460739f89fdfa8ea222ea3518f1a424d9";
};
preConfigure = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cycler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cycler/default.nix
index 643a57e259..b9bd167c6a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cycler/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cycler/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "cycler";
- version = "0.10.0";
+ version = "0.11.0";
src = fetchPypi {
inherit pname version;
- sha256 = "cd7b2d1018258d7247a71425e9f26463dfb444d411c39569972f4ce586b0c9d8";
+ sha256 = "9c87405839a19696e837b3b818fed3f5f69f16f1eec1a1ad77e043dcea9c772f";
};
checkInputs = [ coverage nose ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cytoolz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cytoolz/default.nix
index 86ee238eb1..9b1b9ecb8d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cytoolz/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cytoolz/default.nix
@@ -2,7 +2,7 @@
, buildPythonPackage
, fetchPypi
, isPyPy
-, nose
+, pytestCheckHook
, toolz
, python
, isPy27
@@ -10,21 +10,25 @@
buildPythonPackage rec {
pname = "cytoolz";
- version = "0.11.0";
+ version = "0.11.2";
disabled = isPy27 || isPyPy;
src = fetchPypi {
inherit pname version;
- sha256 = "c64f3590c3eb40e1548f0d3c6b2ccde70493d0b8dc6cc7f9f3fec0bb3dcd4222";
+ sha256 = "ea23663153806edddce7e4153d1d407d62357c05120a4e8485bddf1bd5ab22b4";
};
- checkInputs = [ nose ];
propagatedBuildInputs = [ toolz ];
- checkPhase = ''
- nosetests -v $out/${python.sitePackages}
+ # tests are located in cytoolz/tests, however we can't import cytoolz
+ # from $PWD, as it will break relative imports
+ preCheck = ''
+ cd cytoolz
+ export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH
'';
+ checkInputs = [ pytestCheckHook ];
+
meta = {
homepage = "https://github.com/pytoolz/cytoolz/";
description = "Cython implementation of Toolz: High performance functional utilities";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix
index 62f2a30507..60df070768 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-ml/default.nix
@@ -17,13 +17,13 @@
}:
buildPythonPackage rec {
- version = "1.9.0";
+ version = "2021.11.30";
pname = "dask-ml";
disabled = pythonOlder "3.6"; # >= 3.6
src = fetchPypi {
inherit pname version;
- sha256 = "2f376a7114133b484a6d393f62298473116fc49c79ec7d50d5b031d752f54307";
+ sha256 = "4f73306b5ee56e9b41b133697062d0028d30b1ece883ac6b56532fea5bd3e94a";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix
index d656b055d1..cc44a6e97e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix
@@ -7,12 +7,12 @@
}:
buildPythonPackage rec {
- version = "2.21.0";
+ version = "2021.11.0";
pname = "dask-mpi";
src = fetchPypi {
inherit pname version;
- sha256 = "76e153fc8c58047d898970b33ede0ab1990bd4e69cc130c6627a96f11b12a1a7";
+ sha256 = "602d2e2d7816a4abc1eb17998e1acc93a43b6f82bf94a6accca169a42de21898";
};
propagatedBuildInputs = [ dask distributed mpi4py ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix
index f0aa7a074c..c3bc5aee76 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "databricks-connect";
- version = "9.1.2";
+ version = "9.1.4";
src = fetchPypi {
inherit pname version;
- sha256 = "9672aae60b299de58a527f320df45769cadf436398e21f4ce73424a25badb7a7";
+ sha256 = "0e4c9178635d47b18ca12284c8ba970747e0b2e2fb7dd6f0a06d35788e81cb91";
};
sourceRoot = ".";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datasets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datasets/default.nix
index 0c1b8137bc..b4b60da17f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/datasets/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/datasets/default.nix
@@ -16,13 +16,13 @@
buildPythonPackage rec {
pname = "datasets";
- version = "1.11.0";
+ version = "1.16.1";
src = fetchFromGitHub {
owner = "huggingface";
repo = pname;
rev = version;
- sha256 = "0pm14cp7xaagpf4j96v0ybi5gn3r9p0if3pc197ckwx6sw3lx29p";
+ sha256 = "sha256-5J2hhy52eZqVSaeJNIOM9RzZatq3aewAulS3OX76+Io=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix
index 5a611c989f..7908b3c6b4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix
@@ -31,14 +31,15 @@
buildPythonPackage rec {
pname = "datasette";
- version = "0.58.1";
+ version = "0.59.4";
+
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "simonw";
repo = pname;
rev = version;
- sha256 = "sha256-dtKqp7LV1fRjwOMAlmmAnC19j8hLA1oixGextATW6z0=";
+ sha256 = "sha256-bH/VREo2f84wloA2jgXnQkGNSRRRYmSvUXmI0wMfmYM=";
};
nativeBuildInputs = [ pytest-runner ];
@@ -79,7 +80,6 @@ buildPythonPackage rec {
--replace "pint~=0.9" "pint" \
--replace "pluggy~=0.13.0" "pluggy" \
--replace "uvicorn~=0.11" "uvicorn" \
- --replace "PyYAML~=5.3" "PyYAML"
'';
# takes 30-180 mins to run entire test suite, not worth the CPU resources, slows down reviews
@@ -108,6 +108,6 @@ buildPythonPackage rec {
description = "Multi-tool for exploring and publishing data";
homepage = "https://datasette.io/";
license = licenses.asl20;
- maintainers = [ maintainers.costrouc ];
+ maintainers = with maintainers; [ costrouc ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix
index 5738dc64e7..587f73d81e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix
@@ -31,6 +31,13 @@ buildPythonPackage rec {
sha256 = "sha256-6JscHm1QjDmXOLLa83qhAvY/xwvlPM6duQ1lSxnCVV8=";
};
+ # the complete extra is for usage with conda, which we
+ # don't care about
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "dask[complete]" "dask"
+ '';
+
propagatedBuildInputs = [
dask
bokeh
@@ -56,11 +63,24 @@ buildPythonPackage rec {
netcdf4
];
+ preCheck = ''
+ export HOME=$TMPDIR
+ '';
+
pytestFlagsArray = [
"-n $NIX_BUILD_CORES"
"datashader"
];
+ disabledTests = [
+ # not compatible with current version of bokeh
+ # see: https://github.com/holoviz/datashader/issues/1031
+ "test_interactive_image_update"
+ # latest dask broken array marshalling
+ # see: https://github.com/holoviz/datashader/issues/1032
+ "test_raster_quadmesh_autorange_reversed"
+ ];
+
disabledTestPaths = [
# 31/50 tests fail with TypeErrors
"datashader/tests/test_datatypes.py"
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbutils/default.nix
index 14f046385f..bbfa60f03b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dbutils/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/dbutils/default.nix
@@ -5,13 +5,13 @@
}:
buildPythonPackage rec {
- version = "3.0.0";
+ version = "3.0.1";
pname = "dbutils";
src = fetchPypi {
inherit version;
pname = "DBUtils";
- sha256 = "549d472197b3eef27e7bb2dd2246b28e880ac0ae9fdf63aadfd3b7def153db0c";
+ sha256 = "6ec83f4d75d7a7b42a92e86b775f251e2671639b3b2123fe13a5d8d8fe7c5643";
};
checkInputs = [ pytestCheckHook ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deemix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deemix/default.nix
index 670a459970..f7b2ef5977 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/deemix/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/deemix/default.nix
@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "deemix";
- version = "3.5.5";
+ version = "3.6.1";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-qattUKdGr9P2al5cibG0CPJNmVCJjgE+hucOtl7pAhE=";
+ sha256 = "sha256-oLVCh268TlImOff75m3oSy0dPJi7qrOQ4YOf6rj105M=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deezer-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deezer-py/default.nix
index fea1dafbf4..66648f058f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/deezer-py/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/deezer-py/default.nix
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "deezer-py";
- version = "1.2.9";
+ version = "1.3.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "16eacdc9c53f55d2130891c6335e88046afa0601184fd5197fee35a09e99d9cf";
+ sha256 = "2e38f02b6b8809907d3fb419d54c040bd176ec921b2b226a716fe7ebb456bde4";
};
propagatedBuildInputs = [ requests ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix
index b623fe3027..6dfb531a78 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix
@@ -19,15 +19,20 @@
buildPythonPackage rec {
pname = "distributed";
- version = "2021.10.0";
+ version = "2021.11.2";
disabled = pythonOlder "3.6";
# get full repository need conftest.py to run tests
src = fetchPypi {
inherit pname version;
- sha256 = "0kfq7lwv2n2wiws4v2rj36wx56jvkp2fl6zxg04p2lc3vcgha9za";
+ sha256 = "f86a01a2e1e678865d2e42300c47552b5012cd81a2d354e47827a1fd074cc302";
};
+ postPatch = ''
+ substituteInPlace requirements.txt \
+ --replace "dask == 2021.11.2" "dask"
+ '';
+
propagatedBuildInputs = [
bokeh
click
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix
index de01f4f704..4cb23d989f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix
@@ -1,29 +1,48 @@
{ lib
, buildPythonPackage
-, fetchPypi
-, django-discover-runner
-, mock
, dj-database-url
, dj-email-url
, dj-search-url
-, django-cache-url
-, six
, django
+, django-cache-url
+, django-discover-runner
+, fetchPypi
+, importlib-metadata
+, mock
+, pythonOlder
, setuptools-scm
}:
buildPythonPackage rec {
- version = "2.2";
pname = "django-configurations";
+ version = "2.3.1";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "9e3bcea1355ac50a4c9f854f751d214cb17e5f8adf18405a4488d0a1e8945915";
+ sha256 = "e2ca25530e184f0ee3b7f5ae69563461a93a8914493306ee0bf6d71e7d8ad1d0";
};
- buildInputs = [ setuptools-scm ];
- propagatedBuildInputs = [ six ];
- checkInputs = [ django-discover-runner mock dj-database-url dj-email-url dj-search-url django-cache-url ];
+ buildInputs = [
+ setuptools-scm
+ ];
+
+ propagatedBuildInputs = [
+ django
+ ] ++ lib.optionals (pythonOlder "3.8") [
+ importlib-metadata
+ ];
+
+ checkInputs = [
+ django-discover-runner
+ mock
+ dj-database-url
+ dj-email-url
+ dj-search-url
+ django-cache-url
+ ];
checkPhase = ''
export PYTHONPATH=.:$PYTHONPATH
@@ -35,10 +54,14 @@ buildPythonPackage rec {
# django.core.exceptions.ImproperlyConfigured: django-configurations settings importer wasn't correctly installed
doCheck = false;
+ pythonImportsCheck = [
+ "configurations"
+ ];
+
meta = with lib; {
- homepage = "https://django-configurations.readthedocs.io/";
description = "A helper for organizing Django settings";
+ homepage = "https://django-configurations.readthedocs.io/";
license = licenses.bsd0;
- maintainers = [ maintainers.costrouc ];
+ maintainers = with maintainers; [ costrouc ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-formtools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-formtools/default.nix
index 311fae425a..c85d5d3fcc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-formtools/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/django-formtools/default.nix
@@ -1,19 +1,40 @@
-{ lib, buildPythonPackage, fetchPypi, django, python }:
+{ lib
+, buildPythonPackage
+, django
+, fetchPypi
+, python
+, pythonOlder
+, setuptools-scm
+}:
buildPythonPackage rec {
pname = "django-formtools";
- version = "2.2";
+ version = "2.3";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "1chkbl188yj6hvhh1wgjpfgql553k6hrfwxzb8vv4lfdq41jq9y5";
+ sha256 = "9663b6eca64777b68d6d4142efad8597fe9a685924673b25aa8a1dcff4db00c3";
};
- propagatedBuildInputs = [ django ];
+ nativeBuildInputs = [
+ setuptools-scm
+ ];
+
+ propagatedBuildInputs = [
+ django
+ ];
+
checkPhase = ''
${python.interpreter} -m django test --settings=tests.settings
'';
+ pythonImportsCheck = [
+ "formtools"
+ ];
+
meta = with lib; {
description = "A set of high-level abstractions for Django forms";
homepage = "https://github.com/jazzband/django-formtools";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-statici18n/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-statici18n/default.nix
index 95b860a333..7282cf3b98 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-statici18n/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/django-statici18n/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "django-statici18n";
- version = "2.0.1";
+ version = "2.1.1";
src = fetchPypi {
inherit pname version;
- sha256 = "0cqwfirzjbanibq3mfz9lcwqnc8655zpysf9hk9g3lbwj2m478sp";
+ sha256 = "5c85192fa95e3ef3727517ac104add8959fc0a54be3d13440a8a3319fddbc778";
};
propagatedBuildInputs = [ django django_appconf ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django_compressor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django_compressor/default.nix
index 2e58047d8a..61a32e2561 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django_compressor/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/django_compressor/default.nix
@@ -1,5 +1,6 @@
{ lib, buildPythonPackage, fetchPypi,
rcssmin, rjsmin, django_appconf }:
+
buildPythonPackage rec {
pname = "django_compressor";
version = "2.4.1";
@@ -9,8 +10,9 @@ buildPythonPackage rec {
sha256 = "3358077605c146fdcca5f9eaffb50aa5dbe15f238f8854679115ebf31c0415e0";
};
postPatch = ''
- substituteInPlace setup.py --replace 'rcssmin == 1.0.6' 'rcssmin' \
- --replace 'rjsmin == 1.0.12' 'rjsmin'
+ substituteInPlace setup.py \
+ --replace 'rcssmin == 1.0.6' 'rcssmin' \
+ --replace 'rjsmin == 1.1.0' 'rjsmin'
'';
# requires django-sekizai, which we don't have packaged yet
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix
index 348228a8c0..97836b247a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "django-reversion";
- version = "4.0.0";
+ version = "4.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "ad6d714b4b9b824e22b88d47201cc0f74b5c4294c8d4e1f8d7ac7c3631ef3188";
+ sha256 = "6991f16e5d3a972912db3d56e3a714d10b07becd566ab87f85f2e9b671981339";
};
# tests assume the availability of a mysql/postgresql database
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/djangoql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/djangoql/default.nix
index e0e83e0c06..facfc2fafc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/djangoql/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/djangoql/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "djangoql";
- version = "0.15.3";
+ version = "0.16.0";
src = fetchPypi {
inherit pname version;
- sha256 = "e1a2f32573396335a8935dfc2afb29e34eff34babec1150927ff74fcd4bbdb9d";
+ sha256 = "23cea52eca76e605fa2f34b13ae8d2bf60240737ee9ed3f60c667a4f64d28adf";
};
propagatedBuildInputs = [ ply ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/doc8/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/doc8/default.nix
index a1010f96d6..dbfb857614 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/doc8/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/doc8/default.nix
@@ -1,39 +1,52 @@
{ lib
, buildPythonPackage
+, chardet
+, docutils
, fetchPypi
, pbr
-, docutils
-, six
-, chardet
-, stevedore
-, restructuredtext_lint
, pygments
+, pytestCheckHook
+, pythonOlder
+, restructuredtext_lint
+, stevedore
}:
buildPythonPackage rec {
pname = "doc8";
- version = "0.9.1";
+ version = "0.10.1";
+ format = "pyproject";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "0e967db31ea10699667dd07790f98cf9d612ee6864df162c64e4954a8e30f90d";
+ sha256 = "376e50f4e70a1ae935416ddfcf93db35dd5d4cc0e557f2ec72f0667d0ace4548";
};
- buildInputs = [ pbr ];
+ buildInputs = [
+ pbr
+ ];
+
propagatedBuildInputs = [
docutils
- six
chardet
stevedore
restructuredtext_lint
pygments
];
- doCheck = false;
+ checkInputs = [
+ pytestCheckHook
+ ];
- meta = {
+ pythonImportsCheck = [
+ "doc8"
+ ];
+
+ meta = with lib; {
description = "Style checker for Sphinx (or other) RST documentation";
- homepage = "https://launchpad.net/doc8";
- license = lib.licenses.asl20;
+ homepage = "https://github.com/pycqa/doc8";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docstring-to-markdown/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docstring-to-markdown/default.nix
index f4f2a36f53..432f77220a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/docstring-to-markdown/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/docstring-to-markdown/default.nix
@@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "docstring-to-markdown";
- version = "0.9";
+ version = "0.10";
src = fetchFromGitHub {
owner = "python-lsp";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-XVTlSqqWmvnB5nvjvgGDJmg71KKTq2hHB4//QW7ugvA=";
+ sha256 = "0rflkbms94wkcypjcnz30bc4w4iww91h7sqq3j2b6ypzl4g48csa";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix
index 7fc0cb3b12..e43f7d7f2d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix
@@ -3,13 +3,13 @@
buildPythonPackage rec {
pname = "dropbox";
- version = "11.23.0";
+ version = "11.25.0";
src = fetchFromGitHub {
owner = "dropbox";
repo = "dropbox-sdk-python";
rev = "v${version}";
- sha256 = "1zrwr73dirmkbkcpy8v49hb52xffh0k9wp2603aysg9435w1rxvx";
+ sha256 = "1ln6m6wiym5608i26abs8a5nm4mnn7s3czhnpg9nyjyndnr7k0xj";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/easy-thumbnails/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/easy-thumbnails/default.nix
index 53913f77d2..e896e79908 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/easy-thumbnails/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/easy-thumbnails/default.nix
@@ -1,21 +1,44 @@
-{ lib, buildPythonPackage, fetchPypi,
- django, pillow
+{ lib
+, buildPythonPackage
+, django
+, fetchPypi
+, pillow
+, pytestCheckHook
+, pythonOlder
+, reportlab
+, svglib
}:
buildPythonPackage rec {
pname = "easy-thumbnails";
- version = "2.7.2";
+ version = "2.8";
+ format = "setuptools";
- meta = {
- description = "Easy thumbnails for Django";
- homepage = "https://github.com/SmileyChris/easy-thumbnails";
- license = lib.licenses.bsd3;
- };
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "a7dd9cf97efaf70ba5d76484a962f08ba65b31f1681bc417257743650e9e8a8a";
+ sha256 = "fd2249d936671847fc54a2d6c8c87bcca8f803001967dd03bab6b8bcb7590825";
};
- propagatedBuildInputs = [ django pillow ];
+ propagatedBuildInputs = [
+ django
+ pillow
+ svglib
+ reportlab
+ ];
+
+ # Tests require a Django instance which is setup
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "easy_thumbnails"
+ ];
+
+ meta = with lib; {
+ description = "Easy thumbnails for Django";
+ homepage = "https://github.com/SmileyChris/easy-thumbnails";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ ];
+ };
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eliot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eliot/default.nix
index 152561b69c..b8f7577621 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/eliot/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/eliot/default.nix
@@ -15,12 +15,12 @@
buildPythonPackage rec {
pname = "eliot";
- version = "1.13.0";
+ version = "1.14.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "5760194b308a7ab35514ae1b942d88e9f2359071556d82580383f09ca586fff7";
+ sha256 = "c2f099a3e8d5ecfc22745766e7cc664a48db64b6b89d986dff270491d8683149";
};
checkInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elmax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elmax/default.nix
index db1ff91ee0..77bbd480e9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/elmax/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/elmax/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "elmax";
- version = "0.1.3";
+ version = "0.1.5";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "home-assistant-ecosystem";
repo = "python-elmax";
rev = version;
- sha256 = "sha256-OiVPjWqQw1u0OL6/uYlT+FP2XDh7l3OZyVtQfycHICI=";
+ sha256 = "sha256-EcYEpYv+EwwEfW8Sy7aQjFAPpmsA6qVbmlwrPdxdnEw=";
};
nativeBuildInputs = [ poetry-core ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix
index 587dcf1492..f755d54559 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "env-canada";
- version = "0.5.17";
+ version = "0.5.18";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "michaeldavie";
repo = "env_canada";
rev = "v${version}";
- sha256 = "sha256-viuBuyGzAUcfb4qSecZsDvoAU++FNhuwNJET/s0qyOI=";
+ sha256 = "1w2fclpmcb41k2a3226jk62hdclc8b18kxih2ads90r4yxgpxc8p";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/envoy-reader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/envoy-reader/default.nix
index 0f2ca79d64..a327c3f457 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/envoy-reader/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/envoy-reader/default.nix
@@ -2,6 +2,7 @@
, buildPythonPackage
, envoy-utils
, fetchFromGitHub
+, fetchpatch
, httpx
, pytest-asyncio
, pytest-raises
@@ -12,6 +13,7 @@
buildPythonPackage rec {
pname = "envoy-reader";
version = "0.20.0";
+ format = "setuptools";
src = fetchFromGitHub {
owner = "jesserizzo";
@@ -37,7 +39,18 @@ buildPythonPackage rec {
--replace "pytest-runner>=5.2" ""
'';
- pythonImportsCheck = [ "envoy_reader" ];
+ patches = [
+ # Support for later httpx, https://github.com/jesserizzo/envoy_reader/pull/82
+ (fetchpatch {
+ name = "support-later-httpx.patch";
+ url = "https://github.com/jesserizzo/envoy_reader/commit/6019a89419fe9c830ba839be7d39ec54725268b0.patch";
+ sha256 = "17vsrx13rskvh8swvjisb2dk6x1jdbjcm8ikkpidia35pa24h272";
+ })
+ ];
+
+ pythonImportsCheck = [
+ "envoy_reader"
+ ];
meta = with lib; {
description = "Python module to read from Enphase Envoy units";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ephem/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ephem/default.nix
index 58c1469988..1e5db008de 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ephem/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ephem/default.nix
@@ -7,11 +7,12 @@
buildPythonPackage rec {
pname = "ephem";
- version = "4.1";
+ version = "4.1.1";
+ format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "c076794a511a34b5b91871c1cf6374dbc323ec69fca3f50eb718f20b171259d6";
+ sha256 = "sha256-26ngXHjOkQrnWgY1GlWSR5GRqNxXCsDNbRinfpgTiHM=";
};
checkInputs = [
@@ -24,7 +25,9 @@ buildPythonPackage rec {
LC_ALL="en_US.UTF-8" pytest --pyargs ephem.tests -k "not JPLTest"
'';
- pythonImportsCheck = [ "ephem" ];
+ pythonImportsCheck = [
+ "ephem"
+ ];
meta = with lib; {
description = "Compute positions of the planets and stars";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eventlet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eventlet/default.nix
index 24639b98e6..038b66a8ef 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/eventlet/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/eventlet/default.nix
@@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "eventlet";
- version = "0.32.0";
+ version = "0.33.0";
src = fetchPypi {
inherit pname version;
- sha256 = "2f0bb8ed0dc0ab21d683975d5d8ab3c054d588ce61def9faf7a465ee363e839b";
+ sha256 = "80144f489c1bb273a51b6f96ff9785a382d2866b9bab1f5bd748385019f4141f";
};
propagatedBuildInputs = [ dnspython greenlet pyopenssl six ]
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix
index 4b4d6bdd7f..add6f3f90c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "ffmpeg-progress-yield";
- version = "0.1.2";
+ version = "0.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "92ae36ff5cf38428bd3695629b5065d161c658fb0de0faf2c20cd7a99dac3820";
+ sha256 = "26696726cc70c019d1b76bb25e4823c93f0837ddc86bc4ea26c08165270b4d92";
};
propagatedBuildInputs = [ colorama tqdm ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/folium/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/folium/default.nix
index c0adaeaa55..ff8c097d6f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/folium/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/folium/default.nix
@@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "folium";
- version = "0.12.0";
+ version = "0.12.1.post1";
src = fetchPypi {
inherit pname version;
- sha256 = "d45ace0a813ae65f202ce0356eb29c40a5e8fde071e4d6b5be0a89587ebaeab2";
+ sha256 = "e91e57d8298f3ccf4cce3c5e065bea6eb17033e3c5432b8a22214009c266b2ab";
};
disabled = pythonOlder "3.5";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix
index 407b72c953..ec3acfc775 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix
@@ -4,68 +4,75 @@
, pythonOlder
, brotlipy
, zopfli
-, fs
, lxml
, scipy
, munkres
, unicodedata2
, sympy
-, matplotlib
, reportlab
, sphinx
-, pytest
-, pytest-randomly
+, pytestCheckHook
, glibcLocales
}:
buildPythonPackage rec {
pname = "fonttools";
- version = "4.21.1";
+ version = "4.26.2";
+
+ # Bump to 3.7 when https://github.com/fonttools/fonttools/pull/2417 is merged
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "1x9qrg6ppqhm5214ymwvn0r34qdz8pqvyxd0sj7rkp06wa757z2i";
+ sha256 = "1zp9idjkn4bn1a4pn8x64vi8j1ijdsd4qvgf1f70dfwqvw6ak1i6";
};
# all dependencies are optional, but
# we run the checks with them
+
checkInputs = [
- pytest
- pytest-randomly
- glibcLocales
+ pytestCheckHook
# etree extra
lxml
- # ufo extra
- fs
# woff extra
brotlipy
zopfli
- # unicode extra
- unicodedata2
# interpolatable extra
scipy
munkres
# symfont
sympy
- # varLib
- matplotlib
# pens
reportlab
sphinx
+ ] ++ lib.optionals (pythonOlder "3.9") [
+ # unicode extra
+ unicodedata2
];
preCheck = ''
- export LC_ALL="en_US.UTF-8"
+ # tests want to execute the "fonttools" executable from $PATH
+ export PATH="$out/bin:$PATH"
'';
- # avoid timing issues with timestamps in subset_test.py and ttx_test.py
- checkPhase = ''
- pytest Tests fontTools \
- -k 'not ttcompile_timestamp_calcs and not recalc_timestamp'
- '';
+ # Timestamp tests have timing issues probably related
+ # to our file timestamp normalization
+ disabledTests = [
+ "test_recalc_timestamp_ttf"
+ "test_recalc_timestamp_otf"
+ "test_ttcompile_timestamp_calcs"
+ ];
+
+ disabledTestPaths = [
+ # avoid test which depend on fs and matplotlib
+ # fs and matplotlib were removed to prevent strong cyclic dependencies
+ "Tests/misc/plistlib_test.py"
+ "Tests/pens"
+ "Tests/ufoLib"
+ ];
+
meta = with lib; {
homepage = "https://github.com/fonttools/fonttools";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/frozendict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/frozendict/default.nix
index e2ebc07ae3..e1ab3d9da8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/frozendict/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/frozendict/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "frozendict";
- version = "2.0.7"; # 2.0.6 breaks canonicaljson
+ version = "2.1.0";
format = "setuptools";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "a68f609d1af67da80b45519fdcfca2d60249c0a8c96e68279c1b6ddd92128204";
+ sha256 = "0189168749ddea8601afd648146c502533f93ae33840eb76cd71f694742623cd";
};
pythonImportsCheck = [
@@ -34,6 +34,10 @@ buildPythonPackage rec {
disabledTests = [
# TypeError: unsupported operand type(s) for |=: 'frozendict.frozendict' and 'dict'
"test_union"
+ # non-standard assertions
+ "test_repr"
+ "test_format"
+ "test_str"
];
disabledTestPaths = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fs/default.nix
index 88aba15544..0ab3778f55 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/fs/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/fs/default.nix
@@ -20,14 +20,17 @@
buildPythonPackage rec {
pname = "fs";
- version = "2.4.13";
+ version = "2.4.14";
src = fetchPypi {
inherit pname version;
- sha256 = "caab4dc1561d63c92f36ee78976f6a4a01381830d8420ce34a78d4f1bb1dc95f";
+ sha256 = "9555dc2bc58c58cac03478ac7e9f622d29fe2d20a4384c24c90ab50de2c7b36c";
};
buildInputs = [ glibcLocales ];
+
+ # strong cycle with paramaterized
+ doCheck = false;
checkInputs = [ pyftpdlib mock psutil pytestCheckHook ];
propagatedBuildInputs = [ six appdirs pytz ]
++ lib.optionals (!isPy3k) [ backports_os ]
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gdown/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gdown/default.nix
index 65bca090f9..195a7e822d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gdown/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gdown/default.nix
@@ -1,4 +1,5 @@
{ lib
+, beautifulsoup4
, buildPythonApplication
, fetchPypi
, filelock
@@ -6,24 +7,35 @@
, tqdm
, setuptools
, six
-, beautifulsoup4
}:
buildPythonApplication rec {
pname = "gdown";
version = "4.2.0";
+ format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "bd871c125242a9d3691aa74f360b6b5268a58c13991bb2405fdb3ec3028307dc";
};
- propagatedBuildInputs = [ filelock requests tqdm setuptools six beautifulsoup4 ];
+ propagatedBuildInputs = [
+ beautifulsoup4
+ filelock
+ requests
+ tqdm
+ setuptools
+ six
+ ];
checkPhase = ''
$out/bin/gdown --help > /dev/null
'';
+ pythonImportsCheck = [
+ "gdown"
+ ];
+
meta = with lib; {
description = "A CLI tool for downloading large files from Google Drive";
homepage = "https://github.com/wkentaro/gdown";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/genanki/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/genanki/default.nix
index 2c54bc4910..7b37be48f1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/genanki/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/genanki/default.nix
@@ -1,37 +1,49 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k
-, cached-property, frozendict, pystache, pyyaml, pytest, pytest-runner
+{ lib
+, buildPythonPackage
+, cached-property
+, chevron
+, fetchPypi
+, frozendict
+, pystache
+, pythonOlder
+, pyyaml
}:
buildPythonPackage rec {
pname = "genanki";
- version = "0.11.0";
+ version = "0.12.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "f2be87e3c2850bba21627d26728238f9655b448e564f8c70ab47caef558b63ef";
+ sha256 = "f787ac440ff37a3ef3389030e992e3527f000f7a69498f797033ccfad07ebe62";
};
propagatedBuildInputs = [
- pytest-runner
cached-property
+ chevron
frozendict
pystache
pyyaml
];
- checkInputs = [ pytest ];
-
- disabled = !isPy3k;
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "'pytest-runner'," ""
+ '';
# relies on upstream anki
doCheck = false;
- checkPhase = ''
- py.test
- '';
+
+ pythonImportsCheck = [
+ "genanki"
+ ];
meta = with lib; {
- homepage = "https://github.com/kerrickstaley/genanki";
description = "Generate Anki decks programmatically";
+ homepage = "https://github.com/kerrickstaley/genanki";
license = licenses.mit;
maintainers = with maintainers; [ teto ];
};
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix
index 077523bdb4..d32eea8ced 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "GeoAlchemy2";
- version = "0.9.4";
+ version = "0.10.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "b0e56d4a945bdc0f8fa9edd50ecc912889ea68e0e3558a19160dcb0d5b1b65fc";
+ sha256 = "d97f85a4ff84341c12b1d7a6fee5ab5e5e942271279684310bb2f507b6ee5c53";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geoip2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geoip2/default.nix
index fcf2441b2e..2a626c9c9e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/geoip2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/geoip2/default.nix
@@ -8,13 +8,13 @@
}:
buildPythonPackage rec {
- version = "4.4.0";
+ version = "4.5.0";
pname = "geoip2";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "f150bed3190d543712a17467208388d31bd8ddb49b2226fba53db8aaedb8ba89";
+ sha256 = "b542252e87eb40adc3a2fc0f4e84b514c4c5e04ed46923a3a74d509f25f3103a";
};
patchPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix
index 0d5b46b4dd..7e30b8e83f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "geventhttpclient";
- version = "1.5.2";
+ version = "1.5.3";
src = fetchPypi {
inherit pname version;
- sha256 = "f3c5884d62be75162426728e3d86788740b13e363b197ef592f1443dba240709";
+ sha256 = "d80ec9ff42b7219f33558185499d0b4365597fc55ff886207b45f5632e099780";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gitdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gitdb/default.nix
index a5fa115781..0895270d6c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gitdb/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gitdb/default.nix
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "gitdb";
- version = "4.0.7";
+ version = "4.0.9";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "96bf5c08b157a666fec41129e6d327235284cca4c81e92109260f353ba138005";
+ sha256 = "bac2fd45c0a1c9cf619e63a90d62bdc63892ef92387424b855792a6cabe789aa";
};
propagatedBuildInputs = [ smmap ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix
index ae6f465b1b..9d548b685e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix
@@ -4,40 +4,67 @@
, google-auth
, googleapis-common-protos
, grpcio
+, grpcio-status
, protobuf
, proto-plus
, requests
, mock
, pytest-asyncio
, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
pname = "google-api-core";
- version = "2.1.0";
+ version = "2.2.2";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-XsJ7lCs00EVZy/NnRDC7g/w9dOfTK4u9McRGbnF0C4M=";
+ sha256 = "97349cc18c2bb2415f64f1353a80273a289a61294ce3eb2f7ce682d251bdd997";
};
propagatedBuildInputs = [
googleapis-common-protos
google-auth
grpcio
+ grpcio-status
protobuf
proto-plus
requests
];
- checkInputs = [ mock pytest-asyncio pytestCheckHook ];
+ checkInputs = [
+ mock
+ pytest-asyncio
+ pytestCheckHook
+ ];
# prevent google directory from shadowing google imports
preCheck = ''
rm -r google
'';
- pythonImportsCheck = [ "google.api_core" ];
+ disabledTests = [
+ # Those grpc_helpers tests are failing
+ "test_wrap_unary_errors"
+ "test_wrap_stream_errors_raised"
+ "test_wrap_stream_errors_read"
+ "test_wrap_stream_errors_aiter"
+ "test_wrap_stream_errors_write"
+ "test_wrap_unary_errors"
+ "test___next___w_rpc_error"
+ "test_wrap_stream_errors_invocation"
+ "test_wrap_stream_errors_iterator_initialization"
+ "test_wrap_stream_errors_during_iteration"
+ "test_exception_with_error_code"
+ ];
+
+ pythonImportsCheck = [
+ "google.api_core"
+ ];
meta = with lib; {
description = "Core Library for Google Client Libraries";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix
index b612a58c4f..185c7579e4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix
@@ -1,24 +1,41 @@
-{ lib, buildPythonPackage, fetchPypi
-, google-auth, google-auth-httplib2, google-api-core
-, httplib2, six, uritemplate, oauth2client, setuptools }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, google-auth
+, google-auth-httplib2
+, google-api-core
+, httplib2
+, uritemplate
+, oauth2client
+, setuptools
+, pythonOlder
+}:
buildPythonPackage rec {
pname = "google-api-python-client";
- version = "2.25.0";
+ version = "2.31.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-dNgF7xC4sfWL04U53T0D+vEYj2TuPKQorAQtU59fVcc=";
+ sha256 = "3f64a5eee6fa03ab51806dccf48e342fda83fea60c290518c6a2dfdbf2de9efd";
};
+ propagatedBuildInputs = [
+ google-auth
+ google-auth-httplib2
+ google-api-core
+ httplib2
+ uritemplate
+ oauth2client
+ setuptools
+ ];
+
# No tests included in archive
doCheck = false;
- propagatedBuildInputs = [
- google-auth google-auth-httplib2 google-api-core
- httplib2 six uritemplate oauth2client setuptools
- ];
-
pythonImportsCheck = [
"googleapiclient"
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix
index 076d1e2da4..b51a5569a5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix
@@ -18,11 +18,11 @@
buildPythonPackage rec {
pname = "google-auth";
- version = "2.3.0";
+ version = "2.3.3";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-KAD2360pxs7V+vnKDDjqi6Hr4lWbEMApvQIePeMwFic=";
+ sha256 = "d83570a664c10b97a1dc6f8df87e5fdfff012f48f62be131e449c20dfc32630e";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix
index a3ecf1a6ec..05963856ed 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix
@@ -1,20 +1,25 @@
-{ lib, buildPythonPackage, fetchPypi, google-api-core }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, google-api-core
+, pythonOlder
+}:
buildPythonPackage rec {
pname = "google-cloud-access-context-manager";
- version = "0.1.8";
+ version = "0.1.9";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "29101f61fa0e07db6385a94da45aef8edb4efde0d2b700fbbf65164c045744a8";
+ sha256 = "249a1c1a858bb182b73749784457baacfcab8e7c13da5f3421109d5b8dace5b8";
};
- postPatch = ''
- substituteInPlace setup.py \
- --replace "google-api-core[grpc] >= 1.26.0, < 2.0.0dev" "google-api-core[grpc] >= 1.26.0, < 2.0.1"
- '';
-
- propagatedBuildInputs = [ google-api-core ];
+ propagatedBuildInputs = [
+ google-api-core
+ ];
# No tests in repo
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix
index b96d61bf67..5daa88ed94 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix
@@ -18,11 +18,12 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery";
- version = "2.28.1";
+ version = "2.30.1";
+ format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-DiNT2X5SktyM5URHtxL7nolJbnFLXKz8PVNmFNHEYdw=";
+ sha256 = "4e3b5e3dcc475d5a601d84872ac0b63e059540be2251b1c4165c51106d572855";
};
propagatedBuildInputs = [
@@ -59,6 +60,8 @@ buildPythonPackage rec {
"test_list_rows_page_size"
"test_list_rows_scalars"
"test_list_rows_scalars_extreme"
+ "test_dry_run"
+ "test_session"
# Mocking of _ensure_bqstorage_client fails
"test_to_arrow_ensure_bqstorage_client_wo_bqstorage"
# requires network
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix
index ef02d0671b..0351bd51e2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "google-cloud-core";
- version = "2.1.0";
+ version = "2.2.1";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-NaH18CqG4PouKMZp8NtKdtkoZxoo+7u0k6tZup0cuak=";
+ sha256 = "476d1f71ab78089e0638e0aaf34bfdc99bab4fce8f4170ba6321a5243d13c5c7";
};
propagatedBuildInputs = [ google-api-core ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
index 72d8e7ec60..0e0d5982c6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "google-cloud-datacatalog";
- version = "3.6.0";
+ version = "3.6.1";
src = fetchPypi {
inherit pname version;
- sha256 = "b4a3ba5bc93fb38008077335546daef9f5ea59a1b3accb98b0d07ca7fe6c6e37";
+ sha256 = "136fb153740d4154d8c9ef306284f7f899399de45eef2c9027ca3e56249c4e2d";
};
propagatedBuildInputs = [ libcst google-api-core grpc-google-iam-v1 proto-plus ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix
index cf2ff18edd..4872f7ac44 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "google-cloud-monitoring";
- version = "2.7.0";
+ version = "2.8.0";
src = fetchPypi {
inherit pname version;
- sha256 = "973f33f4da9598a30769e27510fc0cd4470f9081ba694c6c589bb8c0b86a0a6d";
+ sha256 = "2a25f7535f21cdeabfccb07fe4a75eae5a47bb36b82025537755b37d3376da46";
};
propagatedBuildInputs = [ libcst google-api-core proto-plus ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix
index 28116c61f7..67a8daf6f9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix
@@ -5,6 +5,7 @@
, google-api-core
, google-cloud-testutils
, grpc-google-iam-v1
+, grpcio-status
, libcst
, mock
, proto-plus
@@ -14,6 +15,7 @@
buildPythonPackage rec {
pname = "google-cloud-pubsub";
version = "2.9.0";
+ format = "setuptools";
src = fetchPypi {
inherit pname version;
@@ -23,6 +25,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
grpc-google-iam-v1
google-api-core
+ grpcio-status
libcst
proto-plus
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix
index 4a83a96be3..98c9f31632 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-resource-manager";
- version = "1.3.2";
+ version = "1.3.3";
src = fetchPypi {
inherit pname version;
- sha256 = "b99e11360668ed0c034c8cf3a34caf6fd4a52efaf62d54dd85407c3ad20b715c";
+ sha256 = "b13e0a614b4865287a4b5fc43f4810d3d48fef7e24d9bcf54cb4bd93bfbb2bf2";
};
propagatedBuildInputs = [ google-api-core google-cloud-core grpc-google-iam-v1 proto-plus ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix
index 5ad4c2a31f..9d97437b81 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "google-cloud-storage";
- version = "1.42.3";
+ version = "1.43.0";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-d1TU3KpFl1UUtATs4NortCkqy8Z8pVmmnhKhnVT82wY=";
+ sha256 = "f3b4f4be5c8a1b5727a8f7136c94d3bacdd4b7bf11f9553f51ae4c1d876529d3";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix
index 2c208511ee..24775464a1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "google-cloud-testutils";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "3d79051b6ca170c2a4f159bf56ac3f66c1e5360486121e72c06fdaa3911154bf";
+ sha256 = "9c60ea86b28998935875b5aea0b89b0a3aac5e433e0039236f633c5d0ff5f8b8";
};
propagatedBuildInputs = [ click google-auth six ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
index 5e0de87f44..06c1eeb857 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-texttospeech";
- version = "2.7.1";
+ version = "2.9.0";
src = fetchPypi {
inherit pname version;
- sha256 = "e81beafa612f288fe74db55dd3a409f96cb01d2bac117bcd06a4e5b427d81476";
+ sha256 = "e8e272ab54be00285c8f9451081d833980c9fc2a1eff828448dfe315dfa61250";
};
propagatedBuildInputs = [ libcst google-api-core proto-plus ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gradient-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gradient-utils/default.nix
index 171f87b5dd..b7424c44f6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gradient-utils/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gradient-utils/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "gradient-utils";
- version = "0.3.2";
+ version = "0.5.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "Paperspace";
repo = pname;
rev = "v${version}";
- sha256 = "083hnkv19mhvdc8nx28f1nph50c903gxh9g9q8531abv0w8m0744";
+ sha256 = "19plkgwwfs6298vjplgsvhirixi3jbngq5y07x9c0fjxk39fa2dk";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gradient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gradient/default.nix
index 556688323b..735dc03b6d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gradient/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gradient/default.nix
@@ -22,11 +22,11 @@
buildPythonPackage rec {
pname = "gradient";
- version = "1.8.9";
+ version = "1.8.13";
src = fetchPypi {
inherit pname version;
- sha256 = "c05913efe7fcc9f75c1fe84c157d2c2cf3ec0983e132d418c6e59fabc6361a1e";
+ sha256 = "0fa4a0553c28839e364d3aac27ec7292d26c1df27b8c54701d57eb7eda0b14f2";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grammalecte/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grammalecte/default.nix
index c6fcca9434..9aa3c4ffd0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/grammalecte/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/grammalecte/default.nix
@@ -7,23 +7,29 @@
buildPythonPackage rec {
pname = "grammalecte";
- version = "0.6.5";
+ version = "2.1.1";
src = fetchurl {
- url = "http://www.dicollecte.org/grammalecte/zip/Grammalecte-fr-v${version}.zip";
- sha256 = "11byjs3ggdhia5f4vyfqfvbbczsfqimll98h98g7hlsrm7vrifb0";
+ url = "https://grammalecte.net/grammalecte/zip/Grammalecte-fr-v${version}.zip";
+ sha256 = "076jv3ywdgqqzg92bfbagc7ypy08xjq5zn4vgna6j9350fkfqhzn";
};
+ patchPhase = ''
+ runHook prePatch
+ substituteInPlace grammalecte-server.py --replace sys.version_info.major sys.version_info
+ runHook postPatch
+ '';
+
propagatedBuildInputs = [ bottle ];
- preBuild = "cd ..";
+ sourceRoot = ".";
disabled = !isPy3k;
meta = {
- description = "Grammalecte is an open source grammar checker for the French language";
+ description = "An open source grammar and typographic corrector for the French language";
homepage = "https://grammalecte.net";
- license = with lib.licenses; [ gpl3 ];
+ license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ apeyroux ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graph-tool/2.x.x.nix b/third_party/nixpkgs/pkgs/development/python-modules/graph-tool/2.x.x.nix
index bcf1664b69..c8725dfd11 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/graph-tool/2.x.x.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/graph-tool/2.x.x.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "graph-tool";
format = "other";
- version = "2.32";
+ version = "2.43";
src = fetchurl {
url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2";
- sha256 = "0jir6fhi09lf8xf56dcsdk2knx32vq8wrzh0d0zdp22n7baavq70";
+ hash = "sha256-XxvuCUIgz7JIaNsPr0f44v/Sb3fdcJmVhC5NnomNqGw=";
};
configureFlags = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphene/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphene/default.nix
index 38c11cc4c8..7a28bc08cd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/graphene/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/graphene/default.nix
@@ -15,13 +15,13 @@
buildPythonPackage rec {
pname = "graphene";
- version = "3.0.0b8";
+ version = "3.0.0";
src = fetchFromGitHub {
owner = "graphql-python";
repo = "graphene";
rev = "v${version}";
- sha256 = "sha256-Pgln369s4qXdKqLxhX+AkgpDQm+MfSZ/OVmB1AaawHI=";
+ sha256 = "0qgp3nl6afyz6y27bw175hyqppx75pp1vqwl7nvlpwvgwyyc2mnl";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphql-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphql-core/default.nix
index 1909dd99fe..8906af53ce 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/graphql-core/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/graphql-core/default.nix
@@ -2,6 +2,7 @@
, buildPythonPackage
, fetchFromGitHub
, pytest-benchmark
+, pytest-asyncio
, pytestCheckHook
, pythonOlder
}:
@@ -9,6 +10,8 @@
buildPythonPackage rec {
pname = "graphql-core";
version = "3.1.6";
+ format = "setuptools";
+
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
@@ -19,11 +22,14 @@ buildPythonPackage rec {
};
checkInputs = [
+ pytest-asyncio
pytest-benchmark
pytestCheckHook
];
- pythonImportsCheck = [ "graphql" ];
+ pythonImportsCheck = [
+ "graphql"
+ ];
meta = with lib; {
description = "Port of graphql-js to Python";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graspologic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graspologic/default.nix
index 2096f22a24..10e7190d1f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/graspologic/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/graspologic/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "graspologic";
- version = "0.3";
+ version = "0.3.1";
disabled = isPy27;
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "microsoft";
repo = "graspologic";
rev = "v${version}";
- sha256 = "0lab76qiryxvwl6zrcikhnxil1xywl0wkkm2vzi4v9mdzpa7w29r";
+ sha256 = "07dmfb1aplha01d22b41js7634dac4v28pv1l3bzssqhi4yyds7h";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/green/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/green/default.nix
index 540d3027b9..e4a3401109 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/green/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/green/default.nix
@@ -2,6 +2,7 @@
, buildPythonPackage
, isPy3k
, fetchPypi
+, django
, colorama
, coverage
, unidecode
@@ -11,6 +12,7 @@
buildPythonPackage rec {
pname = "green";
version = "3.3.0";
+ format = "setuptools";
disabled = !isPy3k;
@@ -29,17 +31,28 @@ buildPythonPackage rec {
'';
propagatedBuildInputs = [
- colorama coverage unidecode lxml
+ colorama
+ coverage
+ unidecode
+ lxml
];
# let green run it's own test suite
checkPhase = ''
- $out/bin/green -tvvv green
+ $out/bin/green -tvvv \
+ green.test.test_version \
+ green.test.test_cmdline \
+ green.test.test_command
'';
+ pythonImportsCheck = [
+ "green"
+ ];
+
meta = with lib; {
description = "Python test runner";
homepage = "https://github.com/CleanCut/green";
license = licenses.mit;
+ maintainers = with maintainers; [ ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-status/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-status/default.nix
new file mode 100644
index 0000000000..b20426c028
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-status/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, googleapis-common-protos
+, grpcio
+, protobuf
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "grpcio-status";
+ version = "1.43.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-IXWQBvNqf/v/GH1BkfQRjActiqn6aCOhGq14QqPGzNA=";
+ };
+
+ propagatedBuildInputs = [
+ googleapis-common-protos
+ grpcio
+ protobuf
+ ];
+
+ # Projec thas no tests
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "grpc_status"
+ ];
+
+ meta = with lib; {
+ description = "GRPC Python status proto mapping";
+ homepage = "https://github.com/grpc/grpc/tree/master/src/python/grpcio_status";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gruut-ipa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gruut-ipa/default.nix
index 50140ef830..4fa9d62b7a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gruut-ipa/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gruut-ipa/default.nix
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "gruut-ipa";
- version = "0.9.3";
+ version = "0.11.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "rhasspy";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-d/AbvgAD3GHXpwhqjT5Xt9q7Kix+eFMX4kW2BywZWX0=";
+ sha256 = "08n79v60jhkz5vhychsicjz4bhz8v4gb2djmz5dfdaivyr0h3bsf";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gsd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gsd/default.nix
index e781c2127d..f4f3a7eb13 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gsd/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gsd/default.nix
@@ -4,7 +4,7 @@
}:
buildPythonPackage rec {
- version = "2.5.0";
+ version = "2.5.1";
pname = "gsd";
disabled = isPy27;
@@ -12,7 +12,7 @@ buildPythonPackage rec {
owner = "glotzerlab";
repo = pname;
rev = "v${version}";
- sha256 = "0zw3ihbzkldwijz9phwivnzwylj30a2a4lknfbwm6vkx78rdrb1a";
+ sha256 = "00cy4lw7xnl2skfx7fg7cs1c8lrbaxvkym9j6zfi1dbvsdd0r103";
};
nativeBuildInputs = [ cython ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gssapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gssapi/default.nix
index ce2ba8d373..330172f56c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gssapi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gssapi/default.nix
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "gssapi";
- version = "1.7.0";
+ version = "1.7.2";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "pythongssapi";
repo = "python-${pname}";
rev = "v${version}";
- sha256 = "0ybijgsr4ra7x1w86sva4qljhm54ilm2zv4z0ry1r14kq9hmjfa4";
+ sha256 = "1xdcnm66b07m7chf04pp58p3khvy547hns1fw1xffd4n51kl42pp";
};
# It's used to locate headers
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gviz-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gviz-api/default.nix
index 3ec69d6869..04ba3b9520 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gviz-api/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gviz-api/default.nix
@@ -4,12 +4,12 @@
buildPythonPackage rec {
pname = "gviz_api";
- version = "1.9.0";
+ version = "1.10.0";
format = "wheel";
src = fetchPypi {
inherit pname version format;
- sha256 = "1yag559lpmwfdxpxn679a6ajifcbpgljr5n6k5b7rrj38k2xq7jg";
+ sha256 = "a05055fed8c279f34f4b496eace7648c7fe9c1b06851e8a36e748541f1adbb05";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/h5py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/h5py/default.nix
index e555a41cfb..701b8f78f8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/h5py/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/h5py/default.nix
@@ -8,13 +8,13 @@ let
mpi = hdf5.mpi;
mpiSupport = hdf5.mpiSupport;
in buildPythonPackage rec {
- version = "3.4.0";
+ version = "3.6.0";
pname = "h5py";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "ee1c683d91ab010d5e85cb61e8f9e7ee0d8eab545bf3dd50a9618f1d0e8f615e";
+ sha256 = "8752d2814a92aba4e2b2a5922d2782d0029102d99caaf3c201a566bc0b40db29";
};
# avoid strict pinning of numpy
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix
index 70b1a1fe52..27c2167ff1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "hg-evolve";
- version = "10.4.0";
+ version = "10.4.1";
src = fetchPypi {
inherit pname version;
- sha256 = "64fd249a7fcabea60953fc3e7f08da6a85960aca367c04d078b999b7f6fd0246";
+ sha256 = "b47d9a1e0af3d7b54edd646581ac3e3ab046a572368eeb22dfd89dff7f9964d2";
};
checkInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hg-git/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hg-git/default.nix
index 69756083e5..eccdcdaed4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hg-git/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/hg-git/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "hg-git";
- version = "0.10.2";
+ version = "0.10.3";
src = fetchPypi {
inherit pname version;
- sha256 = "aae1c47328bb7f928778712654c3d5f100445190e2891f175dac66d743fdb2e8";
+ sha256 = "27e6d7686a1548d4632dcc977f2ff3ce2e42d80735339b1f3b389b7481260cc4";
};
propagatedBuildInputs = [ dulwich mercurial ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/homematicip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/homematicip/default.nix
index c8becd07be..fb10dc5168 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/homematicip/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/homematicip/default.nix
@@ -18,6 +18,8 @@
buildPythonPackage rec {
pname = "homematicip";
version = "1.0.1";
+ format = "setuptools";
+
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
@@ -52,6 +54,11 @@ buildPythonPackage rec {
pytestCheckHook
];
+ postPatch = ''
+ substituteInPlace homematicip/aio/connection.py \
+ --replace ", loop=self._loop" ""
+ '';
+
disabledTests = [
# Assert issues with datetime
"test_contact_interface_device"
@@ -77,7 +84,9 @@ buildPythonPackage rec {
"test_websocket"
];
- pythonImportsCheck = [ "homematicip" ];
+ pythonImportsCheck = [
+ "homematicip"
+ ];
meta = with lib; {
description = "Python module for the homematicIP REST API";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/html5lib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/html5lib/default.nix
index f0abbcfbec..1172b01951 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/html5lib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/html5lib/default.nix
@@ -1,12 +1,11 @@
{ lib
, buildPythonPackage
, fetchPypi
-, flake8
-, pytest_4
-, pytest-expect
-, mock
, six
, webencodings
+, mock
+, pytest-expect
+, pytestCheckHook_5
}:
buildPythonPackage rec {
@@ -18,17 +17,16 @@ buildPythonPackage rec {
sha256 = "b2e5b40261e20f354d198eae92afc10d750afb487ed5e50f9c4eaf07c184146f";
};
- checkInputs = [ flake8 pytest_4 pytest-expect mock ];
propagatedBuildInputs = [
- six webencodings
+ six
+ webencodings
];
- checkPhase = ''
- # remove test causing error
- # https://github.com/html5lib/html5lib-python/issues/411
- rm html5lib/tests/test_stream.py
- py.test
- '';
+ checkInputs = [
+ mock
+ pytest-expect
+ pytestCheckHook_5
+ ];
meta = {
homepage = "https://github.com/html5lib/html5lib-python";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpcore/default.nix
index 089c2d9fcc..99eb08a35a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/httpcore/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/httpcore/default.nix
@@ -3,12 +3,14 @@
, pythonOlder
, fetchFromGitHub
, anyio
+, certifi
, h11
, h2
, pproxy
, pytest-asyncio
, pytestCheckHook
, pytest-cov
+, pytest-httpbin
, sniffio
, trio
, trustme
@@ -17,18 +19,19 @@
buildPythonPackage rec {
pname = "httpcore";
- version = "0.13.7";
+ version = "0.14.3";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "encode";
repo = pname;
rev = version;
- sha256 = "sha256-9hG9MqqEYMT2j7tXafToGYwHbJfp9/klNqZozHSbweE=";
+ sha256 = "sha256-jPsbMhY1lWKBXlh6hsX6DGKXi/g7VQSU00tF6H7qkOo=";
};
propagatedBuildInputs = [
anyio
+ certifi
h11
h2
sniffio
@@ -39,19 +42,12 @@ buildPythonPackage rec {
pytest-asyncio
pytestCheckHook
pytest-cov
+ pytest-httpbin
trio
trustme
uvicorn
];
- disabledTestPaths = [
- # these tests fail during dns lookups: httpcore.ConnectError: [Errno -2] Name or service not known
- "tests/test_threadsafety.py"
- "tests/async_tests/"
- "tests/sync_tests/test_interfaces.py"
- "tests/sync_tests/test_retries.py"
- ];
-
pythonImportsCheck = [ "httpcore" ];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httplib2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httplib2/default.nix
index c399049816..3f48af86e5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/httplib2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/httplib2/default.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, buildPythonPackage
+, cryptography
, fetchFromGitHub
, isPy27
, mock
@@ -15,27 +16,22 @@
buildPythonPackage rec {
pname = "httplib2";
- version = "0.20.1";
+ version = "0.20.3";
+ format = "setuptools";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "sha256-1zqs3YRVtm5DwewETLtRg5XhMJPJsMi0QLfeGirOURs=";
+ sha256 = "sha256-Q5KkhVqyHDoIeKjvvYoHRbZPY7LUXGDwgp4CSuyvQ1g=";
};
- postPatch = ''
- sed -i "/--cov/d" setup.cfg
- '';
-
- propagatedBuildInputs = [ pyparsing ];
-
- pythonImportsCheck = [ "httplib2" ];
-
- # Don't run tests for Python 2.7
- doCheck = !isPy27;
+ propagatedBuildInputs = [
+ pyparsing
+ ];
checkInputs = [
+ cryptography
mock
pytest-forked
pytest-randomly
@@ -45,16 +41,29 @@ buildPythonPackage rec {
pytestCheckHook
];
+ # Don't run tests for Python 2.7
+ doCheck = !isPy27;
+
+ postPatch = ''
+ sed -i "/--cov/d" setup.cfg
+ '';
+
disabledTests = lib.optionals (stdenv.isDarwin) [
# fails with HTTP 408 Request Timeout, instead of expected 200 OK
"test_timeout_subsequent"
];
- pytestFlagsArray = [ "--ignore python2" ];
+ pytestFlagsArray = [
+ "--ignore python2"
+ ];
+
+ pythonImportsCheck = [
+ "httplib2"
+ ];
meta = with lib; {
description = "A comprehensive HTTP client library";
- homepage = "https://httplib2.readthedocs.io";
+ homepage = "https://github.com/httplib2/httplib2";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpx-socks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpx-socks/default.nix
index f73d81cc6a..fac9ecba6c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/httpx-socks/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/httpx-socks/default.nix
@@ -6,26 +6,30 @@
, flask
, httpcore
, httpx
+, hypercorn
, pytest-asyncio
, pytest-trio
, pytestCheckHook
, python-socks
, pythonOlder
, sniffio
+, starlette
, trio
, yarl
}:
buildPythonPackage rec {
pname = "httpx-socks";
- version = "0.4.1";
+ version = "0.7.2";
+ format = "setuptools";
+
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "romis2012";
repo = pname;
rev = "v${version}";
- sha256 = "1rz69z5fcw7d5nzy5q2q0r9gxrsqijgpg70cnyr5br6xnfgy01ar";
+ sha256 = "1wigmkhn4ymfr12z9vhdaimjcma9llicwrr29q0cc8xmy23f3445";
};
propagatedBuildInputs = [
@@ -40,13 +44,17 @@ buildPythonPackage rec {
checkInputs = [
flask
+ hypercorn
pytest-asyncio
pytest-trio
pytestCheckHook
+ starlette
yarl
];
- pythonImportsCheck = [ "httpx_socks" ];
+ pythonImportsCheck = [
+ "httpx_socks"
+ ];
meta = with lib; {
description = "Proxy (HTTP, SOCKS) transports for httpx";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix
index 014272bcc1..543308a3fd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix
@@ -9,6 +9,7 @@
, httpcore
, rfc3986
, sniffio
+, python
, pytestCheckHook
, pytest-asyncio
, pytest-trio
@@ -19,14 +20,14 @@
buildPythonPackage rec {
pname = "httpx";
- version = "0.19.0";
+ version = "0.21.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "encode";
repo = pname;
rev = version;
- sha256 = "sha256-bUxxeUYqOHBmSL2gPQG5cIq6k5QY4Kyhj9ToA5yZXPA=";
+ sha256 = "sha256-ayhLP+1hPWAx2ds227CKp5cebVkD5B2Z59L+3dzdINc=";
};
propagatedBuildInputs = [
@@ -50,12 +51,24 @@ buildPythonPackage rec {
pythonImportsCheck = [ "httpx" ];
+ # testsuite wants to find installed packages for testing entrypoint
+ preCheck = ''
+ export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH
+ '';
+
disabledTests = [
# httpcore.ConnectError: [Errno 101] Network is unreachable
"test_connect_timeout"
# httpcore.ConnectError: [Errno -2] Name or service not known
"test_async_proxy_close"
"test_sync_proxy_close"
+ # sensitive to charset_normalizer output
+ "iso-8859-1"
+ "test_response_no_charset_with_iso_8859_1_content"
+ ];
+
+ disabledTestPaths = [
+ "tests/test_main.py"
];
__darwinAllowLocalNetworking = true;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix
index 9744a74873..cf0b27c6c5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix
@@ -5,6 +5,7 @@
, filelock
, importlib-metadata
, packaging
+, pyyaml
, requests
, ruamel-yaml
, tqdm
@@ -13,19 +14,20 @@
buildPythonPackage rec {
pname = "huggingface-hub";
- version = "0.0.18";
+ version = "0.1.2";
src = fetchFromGitHub {
owner = "huggingface";
repo = "huggingface_hub";
rev = "v${version}";
- sha256 = "sha256-SxA7rAdKuSrSYFIuxG81lblPJOL69Yx4rBccVrbQa/g=";
+ sha256 = "1pmi76vinwwn0bcxy5hj8pxhzqxdbzp0y3hsd631yyys01s0n6xd";
};
nativeBuildInputs = [ packaging ];
propagatedBuildInputs = [
filelock
+ pyyaml
requests
ruamel-yaml
tqdm
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hyperopt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hyperopt/default.nix
index d407ff95a0..605377a2ec 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hyperopt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/hyperopt/default.nix
@@ -1,29 +1,53 @@
-{ lib, fetchPypi, buildPythonPackage
-, cloudpickle, numpy, future, networkx
-, six, tqdm, scipy, pymongo
+{ lib
+, buildPythonPackage
+, cloudpickle
+, fetchPypi
+, future
+, networkx
+, numpy
+, py4j
+, pymongo
+, pyspark
+, scipy
+, six
+, tqdm
}:
buildPythonPackage rec {
pname = "hyperopt";
- version = "0.2.5";
+ version = "0.2.7";
+ format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "bc6047d50f956ae64eebcb34b1fd40f186a93e214957f20e87af2f10195295cc";
+ sha256 = "1bf89ae58050bbd32c7307199046117feee245c2fd9ab6255c7308522b7ca149";
};
- propagatedBuildInputs = [ future cloudpickle numpy networkx six tqdm scipy pymongo ];
+ propagatedBuildInputs = [
+ cloudpickle
+ future
+ networkx
+ numpy
+ py4j
+ pymongo
+ pyspark
+ scipy
+ six
+ tqdm
+ ];
# tries to use /homeless-shelter to mimic container usage, etc
doCheck = false;
- pythonImportsCheck = [ "hyperopt" ];
+ pythonImportsCheck = [
+ "hyperopt"
+ ];
meta = with lib; {
description = "Distributed Asynchronous Hyperparameter Optimization";
- homepage = "http://hyperopt.github.com/hyperopt/";
- license = licenses.bsd2;
- platforms = platforms.unix;
+ homepage = "http://hyperopt.github.io/hyperopt/";
+ license = licenses.bsd2;
+ platforms = platforms.unix;
maintainers = with maintainers; [ freezeboy ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix
index 799d7e0702..4cf8acf708 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix
@@ -18,14 +18,14 @@ buildPythonPackage rec {
# If you need these, you can just add them to your environment.
pname = "hypothesis";
- version = "6.24.5";
+ version = "6.27.1";
# Use github tarballs that includes tests
src = fetchFromGitHub {
owner = "HypothesisWorks";
repo = "hypothesis-python";
rev = "hypothesis-python-${version}";
- sha256 = "+pPnMgbLdYbh0xqPewNOJRaL7VtxeN73wbHHuK0fNYo=";
+ sha256 = "05kfz041vrd9fy8gl8ch05g806jj4j6l1cnwhqgygagn9z3aq1jx";
};
postUnpack = "sourceRoot=$sourceRoot/hypothesis-python";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix
index 8c3c3670c4..1f8b4063dd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "ibm-cloud-sdk-core";
- version = "3.13.0";
+ version = "3.13.2";
src = fetchPypi {
inherit pname version;
- sha256 = "b27aec03e8c666b3e36c68b2331871f37a0c6c0467fe0f73462fda7300d3c19f";
+ sha256 = "9c615b3a6e9d9dc1c69d8f38742b156e12408521fa180a66558bbb7b850bbbc2";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/idna/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/idna/default.nix
index cb8636f135..dd01128601 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/idna/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/idna/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "idna";
- version = "3.2";
+ version = "3.3";
src = fetchPypi {
inherit pname version;
- sha256 = "467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3";
+ sha256 = "9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d";
};
checkInputs = [ pytestCheckHook ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix
index da5dfddcfb..c027eba987 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix
@@ -14,13 +14,13 @@
buildPythonPackage rec {
pname = "ignite";
- version = "0.4.6";
+ version = "0.4.7";
src = fetchFromGitHub {
owner = "pytorch";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-dlKGXjUUnyYmPDilo0LQg9OkSkBnMYNgzlFLIfI0T6I=";
+ sha256 = "11gvw0yqb3y5ddifs5f38bgslvfmw1bmd9rga1ynlrmmgmhxym6h";
};
checkInputs = [ pytestCheckHook matplotlib mock pytest-xdist torchvision ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix
index 1672e798f3..f27c9fded9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix
@@ -7,15 +7,16 @@
, pillow
, psutil
, pytestCheckHook
+, tifffile
}:
buildPythonPackage rec {
pname = "imageio";
- version = "2.9.0";
+ version = "2.12.0";
disabled = isPy27;
src = fetchPypi {
- sha256 = "52ddbaeca2dccf53ba2d6dec5676ca7bc3b2403ef8b37f7da78b7654bb3e10f0";
+ sha256 = "c416dd68328ace8536ff333cbb8927954036be56e201fed416e53e8f95e08a6c";
inherit pname version;
};
@@ -28,6 +29,7 @@ buildPythonPackage rec {
checkInputs = [
psutil
pytestCheckHook
+ tifffile
];
preCheck = ''
@@ -36,6 +38,20 @@ buildPythonPackage rec {
export HOME="$(mktemp -d)"
'';
+ disabledTests = [
+ # tries to pull remote resources, even with IMAGEIO_NO_INTERNET
+ "test_png_remote"
+ # needs git history
+ "test_mvolread_out_of_bytes"
+ "test_imiter"
+ "test_memory_size"
+ "test_legacy_write_empty"
+ ];
+
+ disabledTestPaths = [
+ "tests/test_pillow.py"
+ ];
+
meta = with lib; {
description = "Library for reading and writing a wide range of image, video, scientific, and volumetric data formats";
homepage = "http://imageio.github.io/";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imagesize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imagesize/default.nix
index 42cf6b5076..0fbe88a520 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/imagesize/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/imagesize/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "imagesize";
- version = "1.2.0";
+ version = "1.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "b1f6b5a4eab1f73479a50fb79fcf729514a900c341d8503d62a62dbc4127a2b1";
+ sha256 = "cd1750d452385ca327479d45b64d9c7729ecf0b3969a58148298c77092261f9d";
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix
index 21e371c1a4..f18750af1f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "ipykernel";
- version = "6.4.1";
+ version = "6.5.1";
src = fetchPypi {
inherit pname version;
- sha256 = "df3355e5eec23126bc89767a676c5f0abfc7f4c3497d118c592b83b316e8c0cd";
+ sha256 = "dd27172bccbbcfef952991e49372e4c6fd1c14eed0df05ebd5b4335cb27a81a2";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix
index 7b84422822..2065dc2349 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix
@@ -22,12 +22,12 @@
buildPythonPackage rec {
pname = "ipython";
- version = "7.28.0";
+ version = "7.29.0";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "2097be5c814d1b974aea57673176a924c4c8c9583890e7a5f082f547b9975b11";
+ sha256 = "4f69d7423a5a1972f6347ff233e38bbf4df6a150ef20fbb00c635442ac3060aa";
};
prePatch = lib.optionalString stdenv.isDarwin ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iterm2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iterm2/default.nix
index 125dc2691e..1cba03531b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/iterm2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/iterm2/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "iterm2";
- version = "1.29";
+ version = "1.30";
src = fetchPypi {
inherit pname version;
- sha256 = "8245562ed713fd473520f81361cdc1b15835920e1ceb7d588678cd153e77c2b6";
+ sha256 = "148b32a593f3d932a33daad01fdaa4639918eca74a6e153d9729dd8b3cba3345";
};
propagatedBuildInputs = [ protobuf websockets ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/janus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/janus/default.nix
index b68bcc3032..c8a9efdb54 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/janus/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/janus/default.nix
@@ -1,16 +1,22 @@
-{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder, pytest-asyncio }:
+{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder, pytest-asyncio
+, typing-extensions
+}:
buildPythonPackage rec {
pname = "janus";
- version = "0.6.2";
+ version = "0.7.0";
src = fetchPypi {
inherit pname version;
- sha256 = "127edc891f9e13420dd12f230d5113fa3de7f93662b81acfaf845989edf5eebf";
+ sha256 = "f10dcf5776e8d49cc30ec86d5eb7268eeec39abaa24fe0332ee8fb8fa3611845";
};
disabled = pythonOlder "3.6";
+ propagatedBuildInputs = [
+ typing-extensions
+ ];
+
checkInputs = [ pytest-asyncio pytestCheckHook ];
# also fails upstream: https://github.com/aio-libs/janus/pull/258
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-context/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-context/default.nix
new file mode 100644
index 0000000000..7be0593592
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-context/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, setuptools-scm
+}:
+
+buildPythonPackage rec {
+ pname = "jaraco-context";
+ version = "4.1.1";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "jaraco";
+ repo = "jaraco.context";
+ rev = "v${version}";
+ sha256 = "O9Lwv2d/qbiXxIVCp6FLmVKaz0MzAUkoUd0jAyIvgJc=";
+ };
+
+ SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+ pythonNamespaces = [
+ "jaraco"
+ ];
+
+ nativeBuildInputs = [
+ setuptools-scm
+ ];
+
+ # Module has no tests
+ doCheck = false;
+
+ pythonImportsCheck = [ "jaraco.context" ];
+
+
+ meta = with lib; {
+ description = "Python module for context management";
+ homepage = "https://github.com/jaraco/jaraco.context";
+ license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_functools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco_functools/default.nix
index 3ad652af76..1316c2b4e7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_functools/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco_functools/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "jaraco.functools";
- version = "3.3.0";
+ version = "3.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "bfcf7da71e2a0e980189b0744b59dba6c1dcf66dcd7a30f8a4413e478046b314";
+ sha256 = "659a64743047d00c6ae2a2aa60573c62cfc0b4b70eaa14fa50c80360ada32aa8";
};
nativeBuildInputs = [ setuptools-scm ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_text/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco_text/default.nix
index 32e8aa23ae..054f68ba2f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_text/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco_text/default.nix
@@ -1,33 +1,51 @@
-{ lib, buildPythonPackage, fetchPypi, pythonOlder
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
, importlib-resources
, jaraco_functools
+, jaraco-context
, setuptools-scm
}:
buildPythonPackage rec {
pname = "jaraco.text";
- version = "3.5.1";
+ version = "3.6.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "ede4e9103443b62b3d1d193257dfb85aab7c69a6cef78a0887d64bb307a03bc3";
+ sha256 = "901d3468eaaa04f1d8a8f141f54b8887bfd943ccba311fc1c1de62c66604dfe0";
};
- pythonNamespaces = [ "jaraco" ];
+ pythonNamespaces = [
+ "jaraco"
+ ];
+
+ nativeBuildInputs = [
+ setuptools-scm
+ ];
- nativeBuildInputs =[ setuptools-scm ];
propagatedBuildInputs = [
+ jaraco-context
jaraco_functools
- ] ++ lib.optional (pythonOlder "3.7") [ importlib-resources ];
+ ] ++ lib.optional (pythonOlder "3.9") [
+ importlib-resources
+ ];
# no tests in pypi package
doCheck = false;
+ pythonImportsCheck = [
+ "jaraco.text"
+ ];
+
meta = with lib; {
description = "Module for text manipulation";
homepage = "https://github.com/jaraco/jaraco.text";
license = licenses.mit;
maintainers = with maintainers; [ ];
};
-
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jax/default.nix
index ce9a7758bc..dd9680abcc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jax/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jax/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "jax";
- version = "0.2.24";
+ version = "0.2.25";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "google";
repo = pname;
rev = "jax-v${version}";
- sha256 = "1mmn1m4mprpwqlb1smjfdy3f74zm9p3l9dhhn25x6jrcj2cgc5pi";
+ sha256 = "0f32is9896g4shfhjipj3rlgpjxci5y607lp8gxlgsdzdqfpckm2";
};
# jaxlib is _not_ included in propagatedBuildInputs because there are
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix
index a4a6ccad54..1a4ce8f749 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "jc";
- version = "1.17.4";
+ version = "1.17.5";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "kellyjonbrazil";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-Dtyf7T34g2sD86cipKsOwfcCXet6u6f5oHVaHCBEbUA=";
+ sha256 = "004773a1wsip1gnqvas78k0snv7yq83qv1spir891sz4mmg7fyin";
};
propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jedi-language-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jedi-language-server/default.nix
index 8aead2738f..90e4634b46 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jedi-language-server/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jedi-language-server/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "jedi-language-server";
- version = "0.34.8";
+ version = "0.34.11";
format = "pyproject";
src = fetchFromGitHub {
owner = "pappasam";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-mJGgDDjPZXde4M4OHwj81KYoaFXFAwOZ+v18YE+arFE=";
+ sha256 = "0gxpq93mfyzhjz5yvjwv2jjda1djpf20x38893ngswsm7lrh62x5";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix
index 157d9b6ff2..5613b904f6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-QupCP0S+r+4OmFAJEklo4wBEf2475BgOg1aM8hUg0bE=";
+ sha256 = "42ea423f44beafee0e985009124968e300447f6e3be4180e83568cf21520d1b1";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jinja2/2.nix b/third_party/nixpkgs/pkgs/development/python-modules/jinja2/2.nix
index 3cdf83a74d..02127a50df 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jinja2/2.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jinja2/2.nix
@@ -21,7 +21,8 @@ buildPythonPackage rec {
# Multiple tests run out of stack space on 32bit systems with python2.
# See https://github.com/pallets/jinja/issues/1158
- doCheck = !stdenv.is32bit || isPy3k;
+ # warnings are no longer being filtered correctly for python2
+ doCheck = !stdenv.is32bit && isPy3k;
checkPhase = ''
pytest -v tests -W ignore::DeprecationWarning
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jinja2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jinja2/default.nix
index 7be9367da9..5d7ca68b19 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jinja2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jinja2/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "Jinja2";
- version = "3.0.2";
+ version = "3.0.3";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "827a0e32839ab1600d4eb1c4c33ec5a8edfbc5cb42dafa13b81f182f97784b45";
+ sha256 = "611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/josepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/josepy/default.nix
index b262e68833..c091480f63 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/josepy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/josepy/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "josepy";
- version = "1.10.0";
+ version = "1.11.0";
src = fetchPypi {
inherit pname version;
- sha256 = "e9bcaf605411cadaec04841ae2d5f77ebb178b7b6df7c9aed1d97399ac18685b";
+ sha256 = "40ef59f2f537ec01bafe698dad66281f6ccf4642f747411647db403ab8fa9a2d";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jschema-to-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jschema-to-python/default.nix
new file mode 100644
index 0000000000..a9100e061d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jschema-to-python/default.nix
@@ -0,0 +1,39 @@
+{ lib, buildPythonPackage, fetchPypi
+, attrs
+, jsonpickle
+, pbr
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "jschema-to-python";
+ version = "1.2.3";
+
+ src = fetchPypi {
+ pname = "jschema_to_python";
+ inherit version;
+ sha256 = "76ff14fe5d304708ccad1284e4b11f96a658949a31ee7faed9e0995279549b91";
+ };
+
+ nativeBuildInputs = [
+ pbr
+ ];
+
+ propagatedBuildInputs = [
+ attrs
+ jsonpickle
+ ];
+
+ checkInputs =[
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "jschema_to_python" ];
+
+ meta = with lib; {
+ description = "Generate source code for Python classes from a JSON schema";
+ homepage = "https://github.com/microsoft/jschema-to-python";
+ license = licenses.mit;
+ maintainers = with maintainers; [ jonringer ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonpointer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonpointer/default.nix
index 39249c648f..2bd41e0815 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jsonpointer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonpointer/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "jsonpointer";
- version = "2.1";
+ version = "2.2";
src = fetchPypi {
inherit pname version;
- sha256 = "5a34b698db1eb79ceac454159d3f7c12a451a91f6334a4f638454327b7a89962";
+ sha256 = "f09f8deecaaa5aea65b5eb4f67ca4e54e1a61f7a11c75085e360fe6feb6a48bf";
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-client/default.nix
index b543008988..9cb4659475 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-client/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-client/default.nix
@@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "jupyter_client";
- version = "7.0.6";
+ version = "7.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "8b6e06000eb9399775e0a55c52df6c1be4766666209c22f90c2691ded0e338dc";
+ sha256 = "a5f995a73cffb314ed262713ae6dfce53c6b8216cea9f332071b8ff44a6e1654";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter_core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter_core/default.nix
index f83ba13623..a7dd89a1f8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter_core/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter_core/default.nix
@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "jupyter_core";
- version = "4.8.1";
+ version = "4.9.1";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "ef210dcb4fca04de07f2ead4adf408776aca94d17151d6f750ad6ded0b91ea16";
+ sha256 = "dce8a7499da5a53ae3afd5a9f4b02e5df1d57250cf48f3ad79da23b4778cd6fa";
};
checkInputs = [ pytest mock glibcLocales nose ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix
index 686be89d2a..ab2900a2f8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "jupyterlab";
- version = "3.2.3";
+ version = "3.2.4";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "7d74593e52d4dbfacbb98e14cac4bc765ea2cffb1b980675f44930d622871705";
+ sha256 = "f692e0d95338d60f72dde660f16f3955a087775c59ec541ddb25952e3f97e9b1";
};
nativeBuildInputs = [ jupyter-packaging ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/k5test/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/k5test/default.nix
index 0079194f4f..f5efb24633 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/k5test/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/k5test/default.nix
@@ -10,13 +10,13 @@
buildPythonPackage rec {
pname = "k5test";
- version = "0.10.0";
+ version = "0.10.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "fc5e7e5e286b2f331c1396c33f2a1cd8cf34e78d8d482168a50ffd8576a1455c";
+ sha256 = "2c9181133f3d52c8e29a5ba970b668273c08f855e5da834aaee2ea9efeb6b069";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/karton-dashboard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-dashboard/default.nix
index ad7d871385..08eeed7141 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/karton-dashboard/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/karton-dashboard/default.nix
@@ -10,6 +10,7 @@
buildPythonPackage rec {
pname = "karton-dashboard";
version = "1.2.1";
+ format = "setuptools";
src = fetchFromGitHub {
owner = "CERT-Polska";
@@ -28,7 +29,7 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace requirements.txt \
--replace "Flask==1.1.1" "Flask" \
- --replace "prometheus-client==0.9.0" "prometheus-client"
+ --replace "prometheus-client==0.10.0" "prometheus-client"
'';
# Project has no tests. pythonImportsCheck requires MinIO configuration
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keepkey/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keepkey/default.nix
index 95981992fe..a29ce93680 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/keepkey/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/keepkey/default.nix
@@ -1,5 +1,13 @@
-{ lib, fetchFromGitHub, buildPythonPackage, pytest
-, ecdsa , mnemonic, protobuf, hidapi, trezor }:
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, ecdsa
+, hidapi
+, libusb1
+, mnemonic
+, protobuf
+, pytest
+}:
buildPythonPackage rec {
pname = "keepkey";
@@ -12,9 +20,7 @@ buildPythonPackage rec {
sha256 = "00hqppdj3s9y25x4ad59y8axq94dd4chhw9zixq32sdrd9v8z55a";
};
- propagatedBuildInputs = [ protobuf hidapi trezor ];
-
- buildInputs = [ ecdsa mnemonic ];
+ propagatedBuildInputs = [ ecdsa hidapi libusb1 mnemonic protobuf ];
checkInputs = [ pytest ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kombu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kombu/default.nix
index 378d62a7c1..319461b983 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/kombu/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/kombu/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-D10HY/uRaAj2F7iGaXsr4o5rw1Am8I5nlpf8gUtIpgg=";
+ sha256 = "0f5d0763fb916808f617b886697b2be28e6bc35026f08e679697fc814b48a608";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix
index 5c7d7afedc..ba7579d106 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix
@@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "labelbox";
- version = "3.6.1";
+ version = "3.10.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "Labelbox";
repo = "labelbox-python";
rev = "v${version}";
- sha256 = "0mix7ajdvyhyvi8nwmxz62mzwl3242h2pzj84zikrmh1ampwvg3g";
+ sha256 = "0afrzxy8hmsvqp84mf89k7sqlzzyh6xwp2pz5abj0981mqlzf2x9";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/langcodes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langcodes/default.nix
index 292a13d7bd..e3454acd5c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/langcodes/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/langcodes/default.nix
@@ -3,30 +3,48 @@
, marisa-trie
, pythonOlder
, fetchPypi
-, nose
+, poetry-core
+, pytestCheckHook
+, language-data
}:
buildPythonPackage rec {
pname = "langcodes";
- version = "3.2.1";
- disabled = pythonOlder "3.3";
+ version = "3.3.0";
+ format = "pyproject";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "779a6da5036f87b6b56c180b2782ab111ddd6aa9157670a9b918402b0e07cd93";
+ sha256 = "794d07d5a28781231ac335a1561b8442f8648ca07cd518310aeb45d6f0807ef6";
};
- propagatedBuildInputs = [ marisa-trie ];
+ nativeBuildInputs = [
+ poetry-core
+ ];
- checkInputs = [ nose ];
+ propagatedBuildInputs = [
+ language-data
+ marisa-trie
+ ];
- checkPhase = ''
- nosetests
- '';
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ disabledTests = [
+ # AssertionError: assert 'Unknown language [aqk]' == 'Aninka'
+ "test_updated_iana"
+ ];
+
+ pythonImportsCheck = [
+ "langcodes"
+ ];
meta = with lib; {
- description = "A toolkit for working with and comparing the standardized codes for languages, such as ‘en’ for English or ‘es’ for Spanish";
- homepage = "https://github.com/LuminosoInsight/langcodes";
+ description = "Python toolkit for working with and comparing the standardized codes for languages";
+ homepage = "https://github.com/LuminosoInsight/langcodes";
license = licenses.mit;
maintainers = with maintainers; [ ixxie ];
};
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/language-data/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/language-data/default.nix
new file mode 100644
index 0000000000..98d4885b1e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/language-data/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, buildPythonApplication
+, fetchFromGitHub
+, marisa-trie
+, poetry-core
+, pythonOlder
+}:
+
+buildPythonApplication rec {
+ pname = "language-data";
+ version = "1.0.1";
+ format = "pyproject";
+
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "rspeer";
+ repo = "language_data";
+ rev = "v${version}";
+ sha256 = "51TUVHXPHG6ofbnxI6+o5lrtr+QCIpGKu+OjDK3l7Mc=";
+ };
+
+ nativeBuildInputs = [
+ poetry-core
+ ];
+
+ propagatedBuildInputs = [
+ marisa-trie
+ ];
+
+ # Module has no tests
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "language_data"
+ ];
+
+ meta = with lib; {
+ description = "Supplement module for langcodes";
+ homepage = "https://github.com/rspeer/language_data";
+ license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix
index 84c3ad8c61..ff489f4cf2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "ledgerblue";
- version = "0.1.38";
+ version = "0.1.41";
src = fetchPypi {
inherit pname version;
- sha256 = "df1fffc4f586eaa95b8cf910176d28997e65a3ecd43d9c0af34e46078b6b6ee3";
+ sha256 = "7246a1a0442a63aff0b5de2796d306f0033e1937b3c9b9c2a92c9101cde4fe8d";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix
index 712b15f17f..774cb572e9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix
@@ -9,13 +9,14 @@
, python
, pythonOlder
, pyyaml
+, setuptools-scm
, typing-extensions
, typing-inspect
}:
buildPythonPackage rec {
pname = "libcst";
- version = "0.3.21";
+ version = "0.3.23";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -24,9 +25,21 @@ buildPythonPackage rec {
owner = "instagram";
repo = pname;
rev = "v${version}";
- sha256 = "063bl21gyyd25i2v0j6kz29cxxdfhng2nins4i2qblmac90f2nqy";
+ sha256 = "1r4aiqpndqa75119faknsghi7zxyjrx5r6i7cb3d0liwiqrkzrvx";
};
+ postPatch = ''
+ # test try to format files, which isn't necessary when consuming releases
+ sed -i libcst/codegen/generate.py \
+ -e '/ufmt/c\ pass'
+ '';
+
+ SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+ nativeBuildInputs = [
+ setuptools-scm
+ ];
+
propagatedBuildInputs = [
hypothesis
typing-extensions
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix
index 1753b0dce8..ba45ffbdea 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "limnoria";
- version = "2021.10.9";
+ version = "2021.11.20";
disabled = isPy27; # abandoned upstream
src = fetchPypi {
inherit pname version;
- sha256 = "907a4a0765ab29ccd1c2247efa0eda7a9bd82d3be3a2ecfdeb9b9e6fbb9aa56e";
+ sha256 = "da9c33497a09b4ed0cff6ed44954bbde6cb317edb68d56c73ef235128a802c11";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lxml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lxml/default.nix
index 984219b802..60deaa5af1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/lxml/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/lxml/default.nix
@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "lxml";
- version = "4.6.3";
+ version = "4.6.4-5";
src = fetchFromGitHub {
owner = pname;
repo = pname;
- rev = "${pname}-${version}";
- sha256 = "1rhkv75qr4ij3653l97sy752gyp6f20sxfpiqp1vp08fpy47q8qn";
+ rev = "lxml-${version}";
+ sha256 = "159cc48nl40qsx8pc8sasgny5xc0s3y0xrq3w3aw53s3ijncsgfl";
};
# setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lz4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lz4/default.nix
index 180264f102..cc84fa75c6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/lz4/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/lz4/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "python-lz4";
- version = "3.1.3";
+ version = "3.1.10";
# get full repository inorder to run tests
src = fetchFromGitHub {
owner = pname;
repo = pname;
- rev = "v${version}";
- sha256 = "009c4rbyj4cjb8fznccfpr5wrzdmi56wq990yjh22n0z2qqylmkf";
+ rev = version;
+ sha256 = "0a4gic8xh3simkk5k8302rxwf765pr6y63k3js79mkl983vpxcim";
};
nativeBuildInputs = [ setuptools-scm pkgconfig pytest-runner ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/markdown/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/markdown/default.nix
index c1eff88b92..83a4f224f2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/markdown/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/markdown/default.nix
@@ -8,17 +8,18 @@
}:
buildPythonPackage rec {
- pname = "Markdown";
- version = "3.3.4";
+ pname = "markdown";
+ version = "3.3.5";
disabled = pythonOlder "3.6";
src = fetchPypi {
- inherit pname version;
- sha256 = "31b5b491868dcc87d6c24b7e3d19a0d730d59d3e46f4eea6430a321bed387a49";
+ pname = "Markdown";
+ inherit version;
+ sha256 = "sha256-JulUa/vN5fzQcr2PYSycG24md8uKrb32UgZnT0bd4Gk=";
};
- propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [
+ propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [
importlib-metadata
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix
index 0e874d25f6..cc118d9f0a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchPypi, writeText, buildPythonPackage, isPy3k, pycairo
, which, cycler, python-dateutil, numpy, pyparsing, sphinx, tornado, kiwisolver
, freetype, qhull, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection
-, certifi, pillow
+, certifi, pillow, fonttools, setuptools-scm, setuptools-scm-git-archive, packaging
, enableGhostscript ? true, ghostscript, gtk3
, enableGtk3 ? false, cairo
# darwin has its own "MacOSX" backend
@@ -17,30 +17,64 @@ let
in
buildPythonPackage rec {
- version = "3.4.3";
+ version = "3.5.1";
pname = "matplotlib";
+ format = "setuptools";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "06032j0ccjxldx4z9kf97qps2g36mfgvy1nap3b9n75kzmnm4kzw";
+ sha256 = "b2e9810e09c3a47b73ce9cab5a72243a1258f61e7900969097a817232246ce1c";
};
XDG_RUNTIME_DIR = "/tmp";
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [
+ pkg-config
+ setuptools-scm
+ setuptools-scm-git-archive
+ ];
- buildInputs = [ which sphinx ]
- ++ lib.optional enableGhostscript ghostscript
- ++ lib.optional stdenv.isDarwin [ Cocoa ];
+ buildInputs = [
+ which
+ sphinx
+ ] ++ lib.optional enableGhostscript [
+ ghostscript
+ ] ++ lib.optional stdenv.isDarwin [
+ Cocoa
+ ];
- propagatedBuildInputs =
- [ cycler python-dateutil numpy pyparsing tornado freetype qhull
- kiwisolver certifi libpng mock pytz pillow ]
- ++ lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ]
- ++ lib.optionals enableTk [ tcl tk tkinter libX11 ]
- ++ lib.optionals enableQt [ pyqt5 ];
+ propagatedBuildInputs = [
+ certifi
+ cycler
+ fonttools
+ freetype
+ kiwisolver
+ libpng
+ mock
+ numpy
+ packaging
+ pillow
+ pyparsing
+ python-dateutil
+ pytz
+ qhull
+ tornado
+ ] ++ lib.optionals enableGtk3 [
+ cairo
+ gobject-introspection
+ gtk3
+ pycairo
+ pygobject3
+ ] ++ lib.optionals enableTk [
+ libX11
+ tcl
+ tk
+ tkinter
+ ] ++ lib.optionals enableQt [
+ pyqt5
+ ];
passthru.config = {
directories = { basedirlist = "."; };
@@ -52,10 +86,8 @@ buildPythonPackage rec {
enable_lto = false;
};
};
- setup_cfg = writeText "setup.cfg" (lib.generators.toINI {} passthru.config);
- preBuild = ''
- cp "$setup_cfg" ./setup.cfg
- '';
+
+ MPLSETUPCFG = writeText "mplsetup.cfg" (lib.generators.toINI {} passthru.config);
# Matplotlib tries to find Tcl/Tk by opening a Tk window and asking the
# corresponding interpreter object for its library paths. This fails if
@@ -74,6 +106,12 @@ buildPythonPackage rec {
substituteInPlace src/_c_internal_utils.c \
--replace libX11.so.6 ${libX11}/lib/libX11.so.6 \
--replace libwayland-client.so.0 ${wayland}/lib/libwayland-client.so.0
+ '' +
+ # avoid matplotlib trying to download dependencies
+ ''
+ echo "[libs]
+ system_freetype=true
+ system_qhull=true" > mplsetup.cfg
'';
# Matplotlib needs to be built against a specific version of freetype in
@@ -86,5 +124,4 @@ buildPythonPackage rec {
license = with licenses; [ psfl bsd0 ];
maintainers = with maintainers; [ lovek323 veprbl ];
};
-
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix
index ecb9a0d90e..3fa2875d98 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix
@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "mautrix";
- version = "0.11.3";
+ version = "0.12.4";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-eZ8fWemS808Hz6KoQWfMsk5WfaO+vj0kTyInhtE20Qk=";
+ sha256 = "c8d226a96e57d52bb532d7e572ba5670d2e2143f720063a4bbd04a77049030d4";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mayavi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mayavi/default.nix
index 169928e48b..6f13e63b93 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mayavi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mayavi/default.nix
@@ -4,14 +4,14 @@
buildPythonPackage rec {
pname = "mayavi";
- version = "4.7.3";
+ version = "4.7.4";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
extension = "tar.gz";
- sha256 = "Zw0AI7nNLSNGxFHbm6L2HaI6XfUDOyWuqJy22BuUZPA=";
+ sha256 = "ec50e7ec6afb0f9224ad1863d104a0d1ded6c8deb13e720652007aaca2303332";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/metakernel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/metakernel/default.nix
index b87b87a1e4..b07f68401e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/metakernel/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/metakernel/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "metakernel";
- version = "0.27.5";
+ version = "0.28.1";
src = fetchPypi {
inherit pname version;
- sha256 = "0aqq9zil6h7kxsg3v2008nr6lv47qvcsash8qzmi1xh6r4x606zy";
+ sha256 = "3b57eb7b3b332614dcba1fa53c8cc1253dbccf962b111517ea16cbecce9a11d5";
};
propagatedBuildInputs = [ ipykernel ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix
index abd79d22dc..255c9039ae 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix
@@ -24,12 +24,12 @@
buildPythonPackage rec {
pname = "mlflow";
- version = "1.20.2";
+ version = "1.21.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "b15ff0c7e5e64f864a0b40c99b9a582227315eca2065d9f831db9aeb8f24637b";
+ sha256 = "5524a371f19c66a18e7ebe9b1085a77f63a6ae514271e487428f28187d79fc8f";
};
# run into https://stackoverflow.com/questions/51203641/attributeerror-module-alembic-context-has-no-attribute-config
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mnemonic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mnemonic/default.nix
index 8d47db6369..86590c1d7b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mnemonic/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mnemonic/default.nix
@@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "mnemonic";
- version = "0.19";
+ version = "0.20";
src = fetchFromGitHub {
owner = "trezor";
repo = "python-${pname}";
rev = "v${version}";
- sha256 = "0rs3szdikkgypiwn43ad3lwh7zvpccw39j5ggkziq6v7pnw3isaq";
+ sha256 = "sha256-YYgWlYfVd1iALOziaUI8uVYjJDCIVk/dXcUmJd2jcvQ=";
};
checkInputs = [ pytestCheckHook ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix
index 8739c08128..7225e695c8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix
@@ -19,12 +19,12 @@
buildPythonPackage rec {
pname = "mocket";
- version = "3.10.0";
+ version = "3.10.1";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "1fcb4203ae257145b97c865135b3a064b47f20f42dde88c8579f43d88f1a7dfb";
+ sha256 = "c77e75432c21108e5a28a529793eb2b82753b6f7050ac9f59fc5d7a72fa74c0f";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix
index a03b3a06c3..21f0b70f63 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "more-itertools";
- version = "8.10.0";
+ version = "8.12.0";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-HevKvrHfeTgUhZ1kqBrXyxBQTCQ0k2jM8hTGZMR09B8=";
+ sha256 = "7dc6ad46f05f545f900dd59e8dfb4e84a4827b97b3cfecb175ea0c7d247f6064";
};
checkInputs = [ nose ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msgpack/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msgpack/default.nix
index 262e5d5ecd..3feeca74cc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/msgpack/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/msgpack/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "msgpack";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchPypi {
inherit pname version;
- sha256 = "1109s2yynrahwi64ikax68hx0mbclz8p35afmpphw5dwynb49q7s";
+ sha256 = "51fdc7fb93615286428ee7758cecc2f374d5ff363bdd884c7ea622a7a327a81e";
};
checkPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mysqlclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mysqlclient/default.nix
index b7a0f39990..ad1e321e9f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mysqlclient/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mysqlclient/default.nix
@@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "mysqlclient";
- version = "2.0.3";
+ version = "2.1.0";
nativeBuildInputs = [
libmysqlclient
@@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "f6ebea7c008f155baeefe16c56cd3ee6239f7a5a9ae42396c2f1860f08a7c432";
+ sha256 = "973235686f1b720536d417bf0a0d39b4ab3d5086b2b6ad5e6752393428c02b12";
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/natsort/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/natsort/default.nix
index 0aad9299f5..3c9d625db7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/natsort/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/natsort/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "natsort";
- version = "7.1.1";
+ version = "7.2.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "00c603a42365830c4722a2eb7663a25919551217ec09a243d3399fa8dd4ac403";
+ sha256 = "e7054b4e1f47365f141602a742685165a552291b643a214652d0dd9d6cea58d1";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix
index a6b09cbe31..400d59272e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix
@@ -23,11 +23,11 @@
buildPythonPackage rec {
pname = "nbconvert";
- version = "6.2.0";
+ version = "6.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "16ceecd0afaa8fd26c245fa32e2c52066c02f13aa73387fffafd84750baea863";
+ sha256 = "5e77d6203854944520105e38f2563a813a4a3708e8563aa598928a3b5ee1081a";
};
# Add $out/share/jupyter to the list of paths that are used to search for
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix
index 8d0c597a1a..68a544c9ab 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix
@@ -49,12 +49,12 @@ in
buildPythonPackage rec {
pname = "nipype";
- version = "1.6.1";
+ version = "1.7.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "8428cfc633d8e3b8c5650e241e9eedcf637b7969bcd40f3423334d4c6b0992b5";
+ sha256 = "e689fe2e5049598c9cd3708e8df1cac732fa1a88696f283e3bc0a70fecb8ab51";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/notebook/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/notebook/default.nix
index 42b9bfe382..1cb5f1b757 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/notebook/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/notebook/default.nix
@@ -27,12 +27,12 @@
buildPythonPackage rec {
pname = "notebook";
- version = "6.4.4";
+ version = "6.4.6";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "26b0095c568e307a310fd78818ad8ebade4f00462dada4c0e34cbad632b9085d";
+ sha256 = "7bcdf79bd1cda534735bd9830d2cbedab4ee34d8fe1df6e7b946b3aab0902ba3";
};
LC_ALL = "en_US.utf8";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numpy/default.nix
index fef5dfb163..945828fbc1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/numpy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/numpy/default.nix
@@ -40,14 +40,14 @@ let
};
in buildPythonPackage rec {
pname = "numpy";
- version = "1.21.2";
+ version = "1.21.4";
format = "pyproject.toml";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "423216d8afc5923b15df86037c6053bf030d15cc9e3224206ef868c2d63dd6dc";
+ sha256 = "e6c76a87633aa3fa16614b61ccedfae45b91df2767cf097aa9c933932a7ed1e0";
};
patches = lib.optionals python.hasDistutilsCxxPatch [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix
index db2043a6f9..9bb807784c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix
@@ -18,11 +18,11 @@
buildPythonPackage rec {
pname = "openstacksdk";
- version = "0.59.0";
+ version = "0.60.0";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-PfdgzScjmKv6yM6+Yu64LLxJe7JdTdcHV290qM6avw0=";
+ sha256 = "aa6efead2ac116482f29aecc2c14ba3b4c76a6f8dede93bf296a2b65492ef420";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/packet-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/packet-python/default.nix
index 6c7935c39b..b63baa80b3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/packet-python/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/packet-python/default.nix
@@ -12,10 +12,10 @@
buildPythonPackage rec {
pname = "packet-python";
- version = "1.44.1";
+ version = "1.44.2";
src = fetchPypi {
inherit pname version;
- sha256 = "ec0f40465fad5260a1b2c1ad39dc12c5df65828e171bf2aafb13c1c3883628ba";
+ sha256 = "4ce0827bc41d5bf5558284c18048344343f7c4c6e280b64bbe53fb51ab454892";
};
nativeBuildInputs = [ pytest-runner ];
propagatedBuildInputs = [ requests ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix
index 476a2433ee..880a5afdce 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix
@@ -27,11 +27,12 @@
buildPythonPackage rec {
pname = "pandas";
- version = "1.3.3";
+ version = "1.3.4";
+ format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "272c8cb14aa9793eada6b1ebe81994616e647b5892a370c7135efb2924b701df";
+ sha256 = "a2aa18d3f0b7d538e21932f637fbfe8518d085238b429e4790a35e1e44a96ffc";
};
nativeBuildInputs = [ cython ];
@@ -91,6 +92,8 @@ buildPythonPackage rec {
"test_from_coo"
# AssertionError: No common DType exists for the given inputs
"test_comparison_invalid"
+ # AssertionError: Regex pattern '"quotechar" must be string, not int'
+ "python-kwargs2"
] ++ lib.optionals stdenv.isDarwin [
"test_locale"
"test_clipboard"
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/panel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/panel/default.nix
index 3f6875f498..cfb95b23f4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/panel/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/panel/default.nix
@@ -17,7 +17,7 @@ let
in
buildPythonPackage rec {
pname = "panel";
- version = "0.12.1";
+ version = "0.12.5";
# Don't forget to also update the node packages
# 1. retrieve the package.json file
@@ -25,7 +25,7 @@ buildPythonPackage rec {
# 3. node2nix
src = fetchPypi {
inherit pname version;
- sha256 = "e4898d60abdb82f8a429df7f59dbf8bcaf7e19b3e633555512ceb4ce06678458";
+ sha256 = "351481f2a2176359b28effa64c9d9fce487d6758514109cab96f9ed84787ae99";
};
# Since 0.10.0 panel attempts to fetch from the web.
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/paramiko/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/paramiko/default.nix
index 88d63f0de9..86cdb73b26 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/paramiko/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/paramiko/default.nix
@@ -13,15 +13,18 @@
buildPythonPackage rec {
pname = "paramiko";
- version = "2.7.2";
+ version = "2.8.0";
src = fetchPypi {
inherit pname version;
- sha256 = "7f36f4ba2c0d81d219f4595e35f70d56cc94f9ac40a6acdf51d6ca210ce65035";
+ sha256 = "e673b10ee0f1c80d46182d3af7751d033d9b573dd7054d2d0aa46be186c3c1d2";
};
propagatedBuildInputs = [ bcrypt cryptography pynacl pyasn1 ];
+ # with python 3.9.6+, the deprecation warnings will fail the test suite
+ # see: https://github.com/pyinvoke/invoke/issues/829
+ doCheck = false;
checkInputs = [ invoke pytestCheckHook pytest-relaxed mock ];
disabledTestPaths = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parsy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parsy/default.nix
index ab4aeba84b..53743052f4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/parsy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/parsy/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "parsy";
- version = "1.3.0";
+ version = "1.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "bfc941ea5a69e6ac16bd4f7d9f807bbc17e35edd8b95bcd2499a25b059359012";
+ sha256 = "7c411373e520e97431f0b390db9d2cfc5089bc1d33f4f1584d2cdc9e6368f302";
};
checkInputs = [ pytest ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pastescript/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pastescript/default.nix
index bc15e5e9f2..244b51f3f8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pastescript/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pastescript/default.nix
@@ -2,6 +2,8 @@
, buildPythonPackage
, fetchPypi
, nose
+, python
+, pytestCheckHook
, six
, paste
, pastedeploy
@@ -23,10 +25,22 @@ buildPythonPackage rec {
six
];
- checkInputs = [ nose ];
+ # test suite seems to unset PYTHONPATH
+ doCheck = false;
+ checkInputs = [ nose pytestCheckHook ];
pythonNamespaces = [ "paste" ];
+ disabledTestPaths = [
+ "appsetup/testfiles"
+ ];
+
+ pythonImportsCheck = [
+ "paste.script"
+ "paste.deploy"
+ "paste.util"
+ ];
+
meta = with lib; {
description = "A pluggable command-line frontend, including commands to setup package file layouts";
homepage = "https://github.com/cdent/pastescript/";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pbr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pbr/default.nix
index d9887b626a..8775faa53c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pbr/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pbr/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "pbr";
- version = "5.7.0";
+ version = "5.8.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1dvkqixz227bhhk7c9r2bwcm7kmkfqyxw1bkha0jf3z88laclla6";
+ sha256 = "672d8ebee84921862110f23fcec2acea191ef58543d34dfe9ef3d9f13c31cddf";
};
propagatedBuildInputs = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix
index 202e6fdaf6..093e3e67ab 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "pc-ble-driver-py";
- version = "0.16.1";
+ version = "0.16.2";
disabled = pythonOlder "3.7" || pythonAtLeast "3.10";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "NordicSemiconductor";
repo = "pc-ble-driver-py";
rev = "v${version}";
- sha256 = "0q2zag77drcjkjm0cbvy2sf6fq2a4yl5li1zv1xfwmy53ami9b5l";
+ sha256 = "013kpj2df5grkrzxak22k01mskpmwf7g3aa1fmxdwi90bb1sabs5";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdftotext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdftotext/default.nix
index 2b61bfdaff..4e1ea3622e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pdftotext/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pdftotext/default.nix
@@ -6,7 +6,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-Kpqom8YgIkCHgbOdGI+r9aOtEQO2Yw8yxOJ+OV95Zu4=";
+ sha256 = "2a9aa89bc62022408781b39d188fabf5a3ad1103b6630f32c4e27e395f7966ee";
};
buildInputs = [ poppler ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pebble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pebble/default.nix
index 68aa1ba970..daf4a04586 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pebble/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pebble/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, isPy27, fetchPypi, pytestCheckHook }:
+{ lib, stdenv, buildPythonPackage, isPy27, fetchPypi, pytestCheckHook }:
buildPythonPackage rec {
pname = "pebble";
@@ -11,6 +11,8 @@ buildPythonPackage rec {
sha256 = "0a595f7mrf89xlck9b2x83bqybc9zd9jxkl0sa5cf19vax18rg8h";
};
+ doCheck = !stdenv.isDarwin;
+
checkInputs = [
pytestCheckHook
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix
index 8a95acc211..4383602608 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix
@@ -1,21 +1,21 @@
{ lib
, buildPythonPackage
, fetchPypi
-, setuptools
+, flit-core
}:
buildPythonPackage rec {
pname = "pex";
- version = "2.1.55";
- format = "setuptools";
+ version = "2.1.56";
+ format = "flit";
src = fetchPypi {
inherit pname version;
- sha256 = "1f6b60b9c50996ec3476e36dddff34afa98dc2d68fa73ed121d3c41232df1379";
+ sha256 = "8dfb7ef551cc9d3d03a6e2dc1b1ba6183cd94f3cde7431836f017d60cc992d53";
};
nativeBuildInputs = [
- setuptools
+ flit-core
];
# A few more dependencies I don't want to handle right now...
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pillow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pillow/default.nix
index c6bb944c23..e0f29d366e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pillow/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pillow/default.nix
@@ -5,13 +5,13 @@
import ./generic.nix (rec {
pname = "Pillow";
- version = "8.3.2";
+ version = "8.4.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "1361y215ydmdh4il1vay5831aqivmpwgzjqrphqjdiq0ipnz7qyx";
+ sha256 = "b8e2f83c56e141920c39464b852de3719dfbfb6e3c99a2d8da0edf4fb33176ed";
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix
index 62bab6694d..9d54eef4d7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix
@@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "pip-tools";
- version = "6.3.1";
+ version = "6.4.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "992d968df6f1a19d4d37c53b68b3d4b601b894fb3ee0926d1fa762ebc7c7e9e9";
+ sha256 = "65553a15b1ba34be5e43889345062e38fb9b219ffa23b084ca0d4c4039b6f53b";
};
checkInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix
index 5ef6c785fe..c4811044ae 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "plotly";
- version = "5.3.1";
+ version = "5.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "6598393e898a9c5ae78397f76f07002ec41fd92e5f746d3b9806248d53885643";
+ sha256 = "735d50738c760ecbf3a38e2336b8c1b119bff2d857096e4f68af31089b798161";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix
index 2534ebcedf..28a67f1da8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix
@@ -19,16 +19,21 @@
buildPythonPackage rec {
pname = "plugwise";
- version = "0.15.2";
+ version = "0.15.3";
format = "setuptools";
src = fetchFromGitHub {
owner = pname;
repo = "python-plugwise";
rev = "v${version}";
- sha256 = "sha256-VmLQ3L9FTHgdRPYmMg7ZoUApLEGKd5NANrSofhP1OQY=";
+ sha256 = "sha256-HaH0LcH6L3R9vLT0vlM1absMTbfqgEeVi/aP2FqdnQY=";
};
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "aiohttp==3.8.0" "aiohttp>=3.8.0"
+ '';
+
propagatedBuildInputs = [
aiohttp
async-timeout
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plumbum/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plumbum/default.nix
index 278caa44b1..a99591c259 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/plumbum/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/plumbum/default.nix
@@ -5,7 +5,7 @@
buildPythonPackage rec {
pname = "plumbum";
- version = "1.7.0";
+ version = "1.7.1";
checkInputs = [ pytest ];
@@ -14,6 +14,6 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "317744342c755319907c773cc87c3a30adaa3a41b0d34c0ce02d9d1904922dce";
+ sha256 = "3c0ac8c4ee57b2adddc82909d3c738a62ef5f77faf24ec7cb6f0a117e1679740";
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix
index a9e3930f67..86bbd847aa 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "policy-sentry";
- version = "0.11.18";
+ version = "0.11.19";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "salesforce";
repo = "policy_sentry";
rev = version;
- sha256 = "sha256-1wpy4WofqrPusOI2BHRqSHfXlRpbuLOx97egzSAbB8E=";
+ sha256 = "sha256-zYX2MMFIgts5brFb/hsgLHZbY5mncqnCmk7nGdxj/BM=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prettytable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prettytable/default.nix
index ddaa842e9b..85aaa1e656 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/prettytable/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/prettytable/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "prettytable";
- version = "2.2.1";
+ version = "2.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "6d465005573a5c058d4ca343449a5b28c21252b86afcdfa168cdc6a440f0b24c";
+ sha256 = "18e56447f636b447096977d468849c1e2d3cfa0af8e7b5acfcf83a64790c0aca";
};
nativeBuildInputs = [ setuptools-scm ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prometheus-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prometheus-client/default.nix
index 9a01769695..6c7cede280 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/prometheus-client/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/prometheus-client/default.nix
@@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "prometheus-client";
- version = "0.11.0";
+ version = "0.12.0";
src = fetchFromGitHub {
owner = "prometheus";
repo = "client_python";
rev = "v${version}";
- sha256 = "14swmy4dgpk6cyjsm2advgc2c8api7xaca1sl7swznblh5fyzgzg";
+ sha256 = "1a0kllal5vkkdv325k0mx1mha2l9808mcz4dqx6qrgfskz8c2xjl";
};
checkInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prompt-toolkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prompt-toolkit/default.nix
index 9aed0211a9..ae67d3d556 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/prompt-toolkit/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/prompt-toolkit/default.nix
@@ -2,28 +2,39 @@
, buildPythonPackage
, fetchPypi
, pytestCheckHook
-, six
+, pythonOlder
, wcwidth
}:
buildPythonPackage rec {
pname = "prompt-toolkit";
- version = "3.0.19";
+ version = "3.0.22";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.6";
src = fetchPypi {
pname = "prompt_toolkit";
inherit version;
- sha256 = "08360ee3a3148bdb5163621709ee322ec34fc4375099afa4bbf751e9b7b7fa4f";
+ sha256 = "sha256-RJ8zPdEgvQH10paozhRSEUujpx+ucojS8K4skYdk+nI=";
};
- propagatedBuildInputs = [ six wcwidth ];
+ propagatedBuildInputs = [
+ wcwidth
+ ];
- checkInputs = [ pytestCheckHook ];
+ checkInputs = [
+ pytestCheckHook
+ ];
disabledTests = [
"test_pathcompleter_can_expanduser"
];
+ pythonImportsCheck = [
+ "prompt_toolkit"
+ ];
+
meta = with lib; {
description = "Python library for building powerful interactive command lines";
longDescription = ''
@@ -33,7 +44,7 @@ buildPythonPackage rec {
with a nice interactive Python shell (called ptpython) built on top.
'';
homepage = "https://github.com/jonathanslenders/python-prompt-toolkit";
- maintainers = with maintainers; [ ];
license = licenses.bsd3;
+ maintainers = with maintainers; [ ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix
index a6d60567ef..dd2494729e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "proto-plus";
- version = "1.19.4";
+ version = "1.19.8";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "416dc38b090ca2093f6fac74977ac4a5599e496483a43c0076e6f6a4dd77ed9c";
+ sha256 = "bdf45f0e0be71510eb2ec9db4da78afde7b5fb8b0a507a36340a9b6ce8e48e58";
};
propagatedBuildInputs = [ protobuf ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psautohint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psautohint/default.nix
index ff312cbff8..3004d5f7a9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/psautohint/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/psautohint/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "psautohint";
- version = "2.3.0";
+ version = "2.3.1";
disabled = pythonOlder "3.6";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "adobe-type-tools";
repo = pname;
rev = "v${version}";
- sha256 = "1y7mqc2myn1gfzg4h018f8xza0q535shnqg6snnaqynz20i8jcfh";
+ sha256 = "1knh428af0lvzijvd72i30jcvx9n6ga0hai69kxg8386jdpmmvkg";
fetchSubmodules = true; # data dir for tests
};
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psycopg2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psycopg2/default.nix
index 1af8fd38ba..34660a84cd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/psycopg2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/psycopg2/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "psycopg2";
- version = "2.9.1";
+ version = "2.9.2";
# Extension modules don't work well with PyPy. Use psycopg2cffi instead.
# c.f. https://github.com/NixOS/nixpkgs/pull/104151#issuecomment-729750892
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "0z0v2d5gpgy0wf2ypqxv955c9k44yszd7r20km5s79yhy6k06lyy";
+ sha256 = "a84da9fa891848e0270e8e04dcca073bc9046441eeb47069f5c0e36783debbea";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pudb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pudb/default.nix
index 3459c5c997..81e1627324 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pudb/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pudb/default.nix
@@ -1,37 +1,49 @@
{ lib
, buildPythonPackage
+, dataclasses
, isPy3k
, fetchPypi
, jedi
, pygments
, urwid
+, urwid-readline
, pytest-mock
, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
pname = "pudb";
- version = "2021.1";
+ version = "2021.2.2";
+ format = "setuptools";
+
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "309ee82b45a0ffca0bc4c7f521fd3e357589c764f339bdf9dcabb7ad40692d6e";
+ sha256 = "82a524ab4b89d2c701b089071ccc6afa9c8a838504e3d68eb33faa8a8abbe4cb";
};
propagatedBuildInputs = [
jedi
pygments
urwid
+ urwid-readline
+ ] ++ lib.optionals (pythonOlder "3.7") [
+ dataclasses
+ ];
+
+ checkInputs = [
+ pytest-mock
+ pytestCheckHook
];
preCheck = ''
export HOME=$TMPDIR
'';
- checkInputs = [
- pytest-mock
- pytestCheckHook
+ pythonImportsCheck = [
+ "pudb"
];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py/default.nix
index ce7abe4dc2..c1cf60ca4d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/py/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/py/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "py";
- version = "1.10.0";
+ version = "1.11.0";
src = fetchPypi {
inherit pname version;
- sha256 = "21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3";
+ sha256 = "51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719";
};
# Circular dependency on pytest
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py4j/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py4j/default.nix
index 6ad9673b97..cf24d21e17 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/py4j/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/py4j/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "py4j";
- version = "0.10.9.2";
+ version = "0.10.9.3";
src = fetchPypi {
inherit pname version;
- sha256 = "624f97c363b8dd84822bc666b12fa7f7d97824632b2ff3d852cc491359ce7615";
+ sha256 = "0d92844da4cb747155b9563c44fc322c9a1562b3ef0979ae692dbde732d784dd";
};
# No tests in archive
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyaml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyaml/default.nix
index 8642c9affb..cbab9bacfb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyaml/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyaml/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "pyaml";
- version = "21.8.3";
+ version = "21.10.1";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-oWNtY8R2MooHIT0LcRG7Y1cPGrij7d9gUiYwJQwj2XU=";
+ sha256 = "c6519fee13bf06e3bb3f20cacdea8eba9140385a7c2546df5dbae4887f768383";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybase64/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybase64/default.nix
index 852f783337..ea7458f13b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pybase64/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pybase64/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "pybase64";
- version = "1.2.0";
+ version = "1.2.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "9e310fcf5cfa2cbf7d1d7eb503b6066bec785216bcd1d8c0a736f59d5ec21b0b";
+ sha256 = "d2016a3a487d3d4501d8281f61ee54c25efd65e37a4c7dce8011e0de7183c956";
};
checkInputs = [ pytestCheckHook ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix
index daa879a58a..3ad2991657 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix
@@ -14,12 +14,12 @@
}:
buildPythonPackage rec {
- version = "0.13.2";
+ version = "0.14.0";
pname = "pybids";
src = fetchPypi {
inherit pname version;
- sha256 = "9692013af3b86b096b5423b88179c6c9b604baff5a6b6f89ba5f40429feb7a3e";
+ sha256 = "73c4d03aad333f2a7cb4405abe96f55a33cffa4b5a2d23fad6ac5767c45562ef";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybind11/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybind11/default.nix
index fccc064f23..d33d9ffc57 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pybind11/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pybind11/default.nix
@@ -3,6 +3,7 @@
, buildPythonPackage
, fetchFromGitHub
, cmake
+, boost
, eigen
, python
, catch
@@ -12,13 +13,13 @@
buildPythonPackage rec {
pname = "pybind11";
- version = "2.8.0";
+ version = "2.8.1";
src = fetchFromGitHub {
owner = "pybind";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-kmyfRNZM9AtF0QA1MnWEPwWb6BebkkpanTvQwsraSJo=";
+ sha256 = "sha256-Gk4ZN/g6SRWFm0ALCvyald/9zq3wBd48mGdqdGCeGYI=";
};
nativeBuildInputs = [ cmake ];
@@ -26,7 +27,8 @@ buildPythonPackage rec {
dontUseCmakeBuildDir = true;
cmakeFlags = [
- "-DEIGEN3_INCLUDE_DIR=${eigen}/include/eigen3"
+ "-DBoost_INCLUDE_DIR=${lib.getDev boost}/include"
+ "-DEIGEN3_INCLUDE_DIR=${lib.getDev eigen}/include/eigen3"
"-DBUILD_TESTING=on"
] ++ lib.optionals (python.isPy3k && !stdenv.cc.isClang) [
"-DPYBIND11_CXX_STANDARD=-std=c++17"
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycparser/default.nix
index 5fe7cab1cd..c8283f93c5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pycparser/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pycparser/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pycparser";
- version = "2.20";
+ version = "2.21";
src = fetchPypi {
inherit pname version;
- sha256 = "2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0";
+ sha256 = "e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206";
};
checkPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydeck/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydeck/default.nix
index 7e95c60be8..6626ee19d9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pydeck/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pydeck/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "pydeck";
- version = "0.7.0";
+ version = "0.7.1";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "1zi0gqzd0byj16ja74m2dm99a1hmrlhk26y0x7am07vb1d8lvvsy";
+ sha256 = "907601c99f7510e16d27d7cb62bfa145216d166a2b5c9c50cfe2b65b032ebd2e";
};
pythonImportsCheck = [ "pydeck" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydmd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydmd/default.nix
index 32f0dde17a..dd166b78f8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pydmd/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pydmd/default.nix
@@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "pydmd";
- version = "0.3.3";
+ version = "0.4";
src = fetchFromGitHub {
owner = "mathLab";
repo = "PyDMD";
rev = "v${version}";
- sha256 = "1516dhmpwi12v9ly9jj18wpz9k696q5k6aamlrbby8wp8smajgrv";
+ sha256 = "1qwa3dyrrm20x0pzr7rklcw7433fd822n4m8bbbdd7z83xh6xm8g";
};
propagatedBuildInputs = [ future numpy scipy matplotlib ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydocstyle/2.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydocstyle/2.nix
deleted file mode 100644
index 9ce4ffc0f8..0000000000
--- a/third_party/nixpkgs/pkgs/development/python-modules/pydocstyle/2.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, pythonOlder
-, snowballstemmer, six, configparser
-, pytest, mock, pathlib }:
-
-buildPythonPackage rec {
- pname = "pydocstyle";
- version = "2.1.1";
-
- # no tests on PyPI
- # https://github.com/PyCQA/pydocstyle/issues/302
- src = fetchFromGitHub {
- owner = "PyCQA";
- repo = pname;
- rev = version;
- sha256 = "1h0k8lpx14svc8dini62j0kqiam10pck5sdzvxa4xhsx7y689g5l";
- };
-
- propagatedBuildInputs = [ snowballstemmer six ] ++ lib.optional (!isPy3k) configparser;
-
- checkInputs = [ pytest mock ] ++ lib.optional (pythonOlder "3.4") pathlib;
-
- checkPhase = ''
- # test_integration.py installs packages via pip
- py.test --cache-clear -vv src/tests -k "not test_integration"
- '';
-
- meta = with lib; {
- description = "Python docstring style checker";
- homepage = "https://github.com/PyCQA/pydocstyle/";
- license = licenses.mit;
- maintainers = with maintainers; [ dzabraev ];
- };
-}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydocstyle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydocstyle/default.nix
index 36c61ace85..0658e18571 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pydocstyle/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pydocstyle/default.nix
@@ -1,33 +1,40 @@
-{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
-, mock
-, pytest
+{ lib
+, buildPythonPackage
+, isPy3k
+, fetchFromGitHub
, snowballstemmer
+, pytestCheckHook
}:
buildPythonPackage rec {
pname = "pydocstyle";
- version = "5.0.2";
+ version = "6.1.1";
disabled = !isPy3k;
+ format = "setuptools";
+
src = fetchFromGitHub {
owner = "PyCQA";
repo = pname;
rev = version;
- sha256 = "03z8miyppm2xncrc9yjilwl7z5c5cpv51zha580v64p8sb2l0j7j";
+ sha256 = "sha256-j0WMD2qKDdMaKG2FxrrM/O7zX4waJ1afaRPRv70djkE=";
};
- propagatedBuildInputs = [ snowballstemmer ];
+ propagatedBuildInputs = [
+ snowballstemmer
+ ];
- checkInputs = [ pytest mock ];
+ checkInputs = [
+ pytestCheckHook
+ ];
- checkPhase = ''
- # test_integration.py installs packages via pip
- py.test --cache-clear -vv src/tests -k "not test_integration"
- '';
+ disabledTestPaths = [
+ "src/tests/test_integration.py" # runs pip install
+ ];
meta = with lib; {
description = "Python docstring style checker";
- homepage = "https://github.com/PyCQA/pydocstyle/";
+ homepage = "https://github.com/PyCQA/pydocstyle";
license = licenses.mit;
maintainers = with maintainers; [ dzabraev ];
};
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix
index 317691066f..a2815c3e1e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix
@@ -1,24 +1,52 @@
{ lib
, buildPythonPackage
, fetchPypi
+, nose
+, numpy
+, setuptools-scm
, six
+, pytestCheckHook
}:
buildPythonPackage rec {
pname = "pyfaidx";
- version = "0.6.2";
+ version = "0.6.3.1";
+ format = "setuptools";
src = fetchPypi {
inherit pname version;
- sha256 = "d1258f8d053cba0c90fe329254e8ec59eb28b535b48d9d06e8c7f1d74b8e4531";
+ sha256 = "93adf036a75e08dc9b1dcd59de6a4db2f65a48c603edabe2e499764b6535ed50";
};
- propagatedBuildInputs = [ six ];
+ nativeBuildInputs = [
+ setuptools-scm
+ ];
+
+ propagatedBuildInputs = [
+ six
+ ];
+
+ checkInputs = [
+ nose
+ numpy
+ pytestCheckHook
+ ];
+
+ disabledTests = [
+ # PyPI releases don't ship all the needed files for the tests
+ "test_index_zero_length"
+ "test_fetch_zero_length"
+ "test_read_back_index"
+ ];
+
+ pythonImportsCheck = [
+ "pyfaidx"
+ ];
meta = with lib; {
homepage = "https://github.com/mdshw5/pyfaidx";
description = "Python classes for indexing, retrieval, and in-place modification of FASTA files using a samtools compatible index";
license = licenses.bsd3;
- maintainers = [ maintainers.jbedo ];
+ maintainers = with maintainers; [ jbedo ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix
index 217e552aa0..eb5eb993ef 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix
@@ -7,13 +7,13 @@
}:
buildPythonPackage rec {
- version = "4.5.1";
+ version = "4.5.3";
pname = "pyfakefs";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "002a065dcbf59c2caa039e4fc4ba01d1d636aa63ee9c794d4c9fc01f0e2d6dc0";
+ sha256 = "f49db689c1d5db6172131479ca77bd474ba2cb886c869b9867fb89cdab2df397";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygit2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygit2/default.nix
index 27bfcff16d..ab4ca1efdc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pygit2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pygit2/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pygit2";
- version = "1.7.0";
+ version = "1.7.1";
src = fetchPypi {
inherit pname version;
- sha256 = "602bffa8b4dbc185a6c7f36515563b600e0ee9002583c97ae3150eedaf340edb";
+ sha256 = "d7faa29558436decc2e78110f38d6677eb366b683ba5cdc2803d47195711165d";
};
preConfigure = lib.optionalString stdenv.isDarwin ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyjwt/1.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyjwt/1.nix
new file mode 100644
index 0000000000..9978302d1c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyjwt/1.nix
@@ -0,0 +1,44 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, cryptography
+, ecdsa
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "pyjwt";
+ version = "1.7.1";
+
+ src = fetchPypi {
+ pname = "PyJWT";
+ inherit version;
+ sha256 = "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96";
+ };
+
+ postPatch = ''
+ sed -i '/^addopts/d' setup.cfg
+ '';
+
+ propagatedBuildInputs = [
+ cryptography
+ ecdsa
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ disabledTests = [
+ "test_ec_verify_should_return_false_if_signature_invalid"
+ ];
+
+ pythonImportsCheck = [ "jwt" ];
+
+ meta = with lib; {
+ description = "JSON Web Token implementation in Python";
+ homepage = "https://github.com/jpadilla/pyjwt";
+ license = licenses.mit;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylama/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylama/default.nix
index 1aa96dfe46..12378cfd72 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pylama/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pylama/default.nix
@@ -1,34 +1,66 @@
-{ lib, buildPythonPackage, fetchPypi
-, eradicate, mccabe, pycodestyle, pydocstyle, pyflakes
-, pytest, ipdb }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, substituteAll
+, git
+, eradicate
+, mccabe
+, mypy
+, pycodestyle
+, pydocstyle
+, pyflakes
+, vulture
+, pytestCheckHook
+}:
buildPythonPackage rec {
pname = "pylama";
- version = "7.7.1";
+ version = "8.0.6";
- src = fetchPypi {
- inherit pname version;
- sha256 = "9bae53ef9c1a431371d6a8dca406816a60d547147b60a4934721898f553b7d8f";
+ format = "setuptools";
+
+ src = fetchFromGitHub {
+ owner = "klen";
+ repo = "pylama";
+ rev = version;
+ sha256 = "sha256-Olq/CZ/t1wqACoknAKsvdDKnyLZkxRtHokpu33I3trg=";
};
+ patches = [
+ (substituteAll {
+ src = ./paths.patch;
+ git = "${lib.getBin git}/bin/git";
+ })
+ ];
+
propagatedBuildInputs = [
eradicate
mccabe
+ mypy
pycodestyle
pydocstyle
pyflakes
+ vulture
];
- checkInputs = [ pytest ipdb ];
+ checkInputs = [
+ pytestCheckHook
+ ];
- # tries to mess with the file system
- doCheck = false;
+ disabledTests = [
+ "test_pylint" # infinite recursion
+ "test_quotes" # FIXME package pylama-quotes
+ "test_radon" # FIXME package radon
+ ];
+
+ pythonImportsCheck = [
+ "pylama.main"
+ ];
meta = with lib; {
description = "Code audit tool for python";
homepage = "https://github.com/klen/pylama";
- # ambiguous license declarations: https://github.com/klen/pylama/issues/64
- license = [ licenses.lgpl3 ];
+ license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylama/paths.patch b/third_party/nixpkgs/pkgs/development/python-modules/pylama/paths.patch
new file mode 100644
index 0000000000..ab6a4719f3
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pylama/paths.patch
@@ -0,0 +1,13 @@
+diff --git a/pylama/hook.py b/pylama/hook.py
+index 029c9dc..9f1a9b9 100644
+--- a/pylama/hook.py
++++ b/pylama/hook.py
+@@ -26,7 +26,7 @@ def run(command: str) -> Tuple[int, List[bytes], List[bytes]]:
+
+ def git_hook(error=True):
+ """Run pylama after git commit."""
+- _, files_modified, _ = run("git diff-index --cached --name-only HEAD")
++ _, files_modified, _ = run("@git@ diff-index --cached --name-only HEAD")
+
+ options = parse_options()
+ setup_logger(options)
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix
index 4bf6c4ad93..b52cb3e2f9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix
@@ -6,6 +6,7 @@
, installShellFiles
, astroid
, isort
+, GitPython
, mccabe
, platformdirs
, toml
@@ -16,7 +17,7 @@
buildPythonPackage rec {
pname = "pylint";
- version = "2.11.1";
+ version = "2.12.2";
disabled = pythonOlder "3.6";
@@ -24,7 +25,7 @@ buildPythonPackage rec {
owner = "PyCQA";
repo = pname;
rev = "v${version}";
- sha256 = "08kc9139v1sd0vhna0rqikyds0xq8hxv0j9707n2i1nbv2z6xhsv";
+ sha256 = "sha256-seBYBTB+8PLIovqxVohkoQEfDAZI1fehLgXuHeTx9Wo=";
};
nativeBuildInputs = [
@@ -46,6 +47,7 @@ buildPythonPackage rec {
'';
checkInputs = [
+ GitPython
pytest-benchmark
pytest-xdist
pytestCheckHook
@@ -56,6 +58,7 @@ buildPythonPackage rec {
# calls executable in one of the tests
preCheck = ''
export PATH=$PATH:$out/bin
+ export HOME=$TEMPDIR
'';
pytestFlagsArray = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymongo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymongo/default.nix
index 0d18175d7e..6b627ca672 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pymongo/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pymongo/default.nix
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "pymongo";
- version = "3.12.0";
+ version = "3.12.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-uI0XQhWbyToHhzP5eJ9WPO8m9eNw66gQR2pxqpjl+8I=";
+ sha256 = "704879b6a54c45ad76cea7c6789c1ae7185050acea7afd15b58318fa1932ed45";
};
# Tests call a running mongodb instance
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pympler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pympler/default.nix
index 8cc1e2db9e..4f132ad2c8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pympler/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pympler/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "Pympler";
- version = "1.0";
+ version = "1.0.1";
src = fetchPypi {
inherit pname version;
- sha256 = "f2e82c3e33835d0378ed95fffabc00806f4070f00decaa38b340ca99b1aca25c";
+ sha256 = "993f1a3599ca3f4fcd7160c7545ad06310c9e12f70174ae7ae8d4e25f6c5d3fa";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymunk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymunk/default.nix
index 4d8dbee2c2..c98fb6dddc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pymunk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pymunk/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "pymunk";
- version = "6.2.0";
+ version = "6.2.1";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "1r3jfjg4cpdilrmlyml514hqmjgabyrrs4cvmdr56rylg1sp4gf3";
+ sha256 = "18ae0f83ec2dc20892b98c84127ce9149ab40fa3c3120097377e1506884b27b8";
};
propagatedBuildInputs = [ cffi ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyperclip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyperclip/default.nix
index 7f91cc8aec..127301752d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyperclip/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyperclip/default.nix
@@ -1,4 +1,9 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, stdenv
+, python
+}:
buildPythonPackage rec {
version = "1.8.2";
@@ -9,11 +14,19 @@ buildPythonPackage rec {
sha256 = "105254a8b04934f0bc84e9c24eb360a591aaf6535c9def5f29d92af107a9bf57";
};
- doCheck = false;
+ # No such file or directory: 'pbcopy'
+ doCheck = !stdenv.isDarwin;
+
+ checkPhase = ''
+ ${python.interpreter} tests/test_pyperclip.py
+ '';
+
+ pythonImportsCheck = [ "pyperclip" ];
meta = with lib; {
homepage = "https://github.com/asweigart/pyperclip";
license = licenses.bsd3;
description = "Cross-platform clipboard module";
+ maintainers = with maintainers; [ dotlambda ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyro5/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyro5/default.nix
index 97b41b03da..4e56bb49f5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyro5/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyro5/default.nix
@@ -1,6 +1,7 @@
{ buildPythonPackage
, fetchPypi
, lib
+, stdenv
, serpent
, pythonOlder
, pytestCheckHook
@@ -8,13 +9,13 @@
buildPythonPackage rec {
pname = "Pyro5";
- version = "5.12";
+ version = "5.13.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "616e6957c341da0ca26f947805c9c97b42031941f59ca5613537d1420ff4f2e2";
+ sha256 = "2be9da379ae0ec4cf69ffb3c5c589b698eea00e614a9af7945b87fa9bb09baf2";
};
propagatedBuildInputs = [ serpent ];
@@ -22,7 +23,10 @@ buildPythonPackage rec {
checkInputs = [ pytestCheckHook ];
# ignore network related tests, which fail in sandbox
- disabledTests = [ "StartNSfunc" "Broadcast" "GetIP" "TestNameServer" "TestBCSetup" ];
+ disabledTests = [ "StartNSfunc" "Broadcast" "GetIP" "TestNameServer" "TestBCSetup" ]
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ "Socket"
+ ];
meta = with lib; {
description = "Distributed object middleware for Python (RPC)";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysam/default.nix
index 41cdcad203..2f65aa899e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pysam/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pysam/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "pysam";
- version = "0.17.0";
+ version = "0.18.0";
# Fetching from GitHub instead of PyPi cause the 0.13 src release on PyPi is
# missing some files which cause test failures.
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "pysam-developers";
repo = "pysam";
rev = "v${version}";
- sha256 = "sha256-RDeBq6pwBGCBNIn8YOPQr96GuL6FKEYeLAPQD6XN0iE=";
+ sha256 = "042ca27r6634xg2ixgvq1079cp714wmm6ml7bwc1snn0wxxzywfg";
};
nativeBuildInputs = [ samtools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-asyncio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-asyncio/default.nix
index 3ec6392f88..9e09724624 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-asyncio/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-asyncio/default.nix
@@ -1,13 +1,13 @@
{ lib, buildPythonPackage, fetchPypi, pytest, isPy3k, isPy35, async_generator }:
buildPythonPackage rec {
pname = "pytest-asyncio";
- version = "0.15.1";
+ version = "0.16.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "2564ceb9612bbd560d19ca4b41347b54e7835c2f792c504f698e05395ed63f6f";
+ sha256 = "7496c5977ce88c34379df64a66459fe395cd05543f0a2f837016e7144391fcfb";
};
buildInputs = [ pytest ]
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix
index 0ae23ff572..74e4c77c0f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "pytest-doctestplus";
- version = "0.11.0";
+ version = "0.11.1";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "efcb24a366d3b033d343298c2a60eae418b06803c85373450f10306815c7c632";
+ sha256 = "b7a0aeb79b85ee81a3c72c49019b4bfeb57fa920abaa6c17ba8be3be9c5290f1";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix
index b0bc07b6c1..819c0a1483 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix
@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "pytest-httpx";
- version = "0.13.0";
+ version = "0.15.0";
src = fetchFromGitHub {
owner = "Colin-b";
repo = "pytest_httpx";
rev = "v${version}";
- sha256 = "0lh7df3ysxmjzvx6242xb6qiwpfxrnj70kjmw5sndvzmy5dfpxfc";
+ sha256 = "08dxvjkxlnam3r0yp17495d1vksyawzzkpykacjql1gi6hqlfrwg";
};
buildInputs = [ pytest ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-localserver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-localserver/default.nix
index 577400b859..a3f57ff40e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-localserver/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-localserver/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "pytest-localserver";
- version = "0.5.0";
+ version = "0.5.1";
src = fetchPypi {
inherit pname version;
- sha256 = "3a5427909d1dfda10772c1bae4b9803679c0a8f04adb66c338ac607773bfefc2";
+ sha256 = "ef6f04193dc0f7e8df5b27b3a8834318fa12eaf025436d2a99afff1b73cde761";
};
propagatedBuildInputs = [ werkzeug ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-raisin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-raisin/default.nix
new file mode 100644
index 0000000000..7412928062
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-raisin/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, flit-core
+, pytest
+}:
+
+buildPythonPackage rec {
+ pname = "pytest-raisin";
+ version = "0.3";
+ format = "flit";
+
+ src = fetchFromGitHub {
+ owner = "wimglenn";
+ repo = "pytest-raisin";
+ rev = "v${version}";
+ sha256 = "73cOrsqlE04m6X3a6VwtRzfi24oqkdO3HjKQH61bU88=";
+ };
+
+ nativeBuildInputs = [
+ flit-core
+ ];
+
+ propagatedBuildInputs = [
+ pytest
+ ];
+
+ # tests cause circular pytest-raisin already registered with pytest error
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Plugin enabling the use of exception instances with pytest.raises context";
+ homepage = "https://github.com/wimglenn/pytest-raisin";
+ license = licenses.mit;
+ maintainers = with maintainers; [ aadibajpai ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix
index b8f4814e53..f71522a40d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -36,6 +36,8 @@ buildPythonPackage rec {
"test_rsync_report"
"test_init_rsync_roots"
"test_rsyncignore"
+ # flakey
+ "test_internal_errors_propagate_to_controller"
];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-cinderclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-cinderclient/default.nix
index 8346074c9c..fe421fa55d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-cinderclient/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-cinderclient/default.nix
@@ -17,11 +17,11 @@
buildPythonPackage rec {
pname = "python-cinderclient";
- version = "8.1.0";
+ version = "8.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "b57b432b2ac9161c2482a569a023211d2d3d0ada81c4da62c8f6e47f0b2bf82d";
+ sha256 = "7b2f08a2d1cc05d2c1f84f02fadb2208678b1acb501acfe2de33720078ec7b9f";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix
index 22bf7ea7ec..774ca6855a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix
@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "python-dotenv";
- version = "0.19.0";
+ version = "0.19.2";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "f521bc2ac9a8e03c736f62911605c5d83970021e3fa95b37d769e2bbbe9b6172";
+ sha256 = "a5de49a31e953b45ff2d2fd434bbc2670e8db5273606c1e737cc6b93eff3655f";
};
propagatedBuildInputs = [ click ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix
index 7189a235de..e26e60c43e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "python-gnupg";
- version = "0.4.7";
+ version = "0.4.8";
src = fetchPypi {
inherit pname version;
- sha256 = "2061f56b1942c29b92727bf9aecbd3cea3893acc9cccbdc7eb4604285efe4ac7";
+ sha256 = "b64de1ae5cedf872b437201a566fa2c62ce0c95ea2e30177eb53aee1258507d7";
};
# Let's make the library default to our gpg binary
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix
index 39597afa85..4aa8d853eb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix
@@ -35,14 +35,14 @@
buildPythonPackage rec {
pname = "python-lsp-server";
- version = "1.2.4";
+ version = "1.3.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "python-lsp";
repo = pname;
rev = "v${version}";
- sha256 = "0c1g46hpzjhqbjcmv6xm3by3jprcjhzjslqzrp95hdkbykvrgs5x";
+ sha256 = "067dlhwwv4mkrirnmqinrvkbfx59hf7fiah081d62a46vxvpnv9s";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-manilaclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-manilaclient/default.nix
index 5ffe1a1ea7..aea8b6dab3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-manilaclient/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-manilaclient/default.nix
@@ -18,11 +18,11 @@
buildPythonApplication rec {
pname = "python-manilaclient";
- version = "3.0.0";
+ version = "3.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "2d90af35c5beccc53fa6b0f5a3c4b330a065e86924c33c42b017f18943ab2b05";
+ sha256 = "d53f69238cdc454c0297f513e0b481a039d0bac723990ebd5ab9d3d29633956e";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-sat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-sat/default.nix
index ea3d1bfb44..43b5e63529 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-sat/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-sat/default.nix
@@ -2,19 +2,32 @@
buildPythonPackage rec {
pname = "python-sat";
- version = "0.1.6.dev6";
+ version = "0.1.7.dev1";
src = fetchFromGitHub {
owner = "pysathq";
repo = "pysat";
rev = version;
- sha256 = "1gckxhqkvzyw7pmwg8xzxq146jysqy0s23l5mjc3awm6swdij66y";
+ sha256 = "sha256-zGdgD+SgoMB7/zDQI/trmV70l91TB7OkDxaJ30W3dkI=";
};
propagatedBuildInputs = [ six pypblib ];
checkInputs = [ pytestCheckHook ];
+ # https://github.com/pysathq/pysat/pull/102
+ postPatch = ''
+ # Fix for case-insensitive filesystem
+ cat >>solvers/patches/cadical.patch <=0.5.0'],
- ':sys_platform!="win32"': ['pykerberos>=1.1.8,<2.0.0'],
- },
-- test_suite='test_requests_kerberos',
- tests_require=['mock'],
- )
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/responses/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/responses/default.nix
index 98a04c2ac5..cff31f782c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/responses/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/responses/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "responses";
- version = "0.15.0";
+ version = "0.16.0";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-hmdXmH0ZYqqQjZyLMYVzn679cqNZ6VRZ3gwuTlNpybI=";
+ sha256 = "sha256-ouOsoqgnfmElfNOxwVSx3Q14Kxrj04t/o3y+P+tTF5E=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/respx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/respx/default.nix
index 0d7f509b4a..d085d43008 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/respx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/respx/default.nix
@@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "respx";
- version = "0.17.1";
+ version = "0.19.0";
src = fetchFromGitHub {
owner = "lundberg";
repo = pname;
rev = version;
- sha256 = "0w8idh6l2iq04ydz7r2qisq9jsxq8wszkx97kx4g3yjwg4ypvc6k";
+ sha256 = "sha256-xiAt42kc1+rro99KMwzYKi3XC+wxYVqOY11tM+M/uV8=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rfc6555/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rfc6555/default.nix
index 4e47915bdf..5be65fee23 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/rfc6555/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/rfc6555/default.nix
@@ -1,27 +1,42 @@
-{ lib, buildPythonPackage, fetchPypi, pythonPackages }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, selectors2
+}:
buildPythonPackage rec {
pname = "rfc6555";
- version = "0.0.0";
+ version = "0.1.0";
+ format = "setuptools";
- src = fetchPypi {
- inherit pname version;
- sha256 = "05sjrd6jc0sdvx0z7d3llk82rx366jlmc7ijam0nalsv66hbn70r";
+ src = fetchFromGitHub {
+ owner = "sethmlarson";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "Lmwgusc4EQlF0GHmMTUxWzUCjBk19cvurNwbOnT+1jM=";
};
- propagatedBuildInputs = with pythonPackages; [ selectors2 ];
+ propagatedBuildInputs = [
+ selectors2
+ ];
- checkInputs = with pythonPackages; [ mock pytest ];
- # disabling tests that require a functional DNS IPv{4,6} stack to pass.
- patches = [ ./disable_network_tests.patch ];
- # default doCheck = true; is not enough, apparently
- postCheck = ''
- py.test tests/
- '';
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ disabledTests = [
+ # Disabling tests that require a functional DNS IPv{4,6} stack to pass
+ "test_create_connection_has_proper_timeout"
+ ];
+
+ pythonImportsCheck = [
+ "rfc6555"
+ ];
meta = with lib; {
description = "Python implementation of the Happy Eyeballs Algorithm";
- homepage = "https://pypi.org/project/rfc6555";
+ homepage = "https://github.com/sethmlarson/rfc6555";
license = licenses.asl20;
maintainers = with maintainers; [ endocrimes ];
};
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rfc6555/disable_network_tests.patch b/third_party/nixpkgs/pkgs/development/python-modules/rfc6555/disable_network_tests.patch
deleted file mode 100644
index dc59111ac4..0000000000
--- a/third_party/nixpkgs/pkgs/development/python-modules/rfc6555/disable_network_tests.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/tests/test_create_connection.py b/tests/test_create_connection.py
-index fe38026..cdb26b4 100644
---- a/tests/test_create_connection.py
-+++ b/tests/test_create_connection.py
-@@ -6,10 +6,12 @@ from .test_utils import requires_network
-
-
- class _BasicCreateConnectionTests(object):
-+
- @requires_network
- def test_create_connection_google(self):
- sock = rfc6555.create_connection(('www.google.com', 80))
-
-+ @requires_network
- @pytest.mark.parametrize('timeout', [None, 5.0])
- def test_create_connection_has_proper_timeout(self, timeout):
- sock = rfc6555.create_connection(('www.google.com', 80), timeout=timeout)
-diff --git a/tests/test_ipv6.py b/tests/test_ipv6.py
-index 3ee8564..f0db28e 100644
---- a/tests/test_ipv6.py
-+++ b/tests/test_ipv6.py
-@@ -2,7 +2,9 @@ import socket
- import mock
- import rfc6555
-
-+from .test_utils import requires_network
-
-+@requires_network
- def test_ipv6_available():
- assert rfc6555._detect_ipv6()
-
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rich/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rich/default.nix
index ff33028973..98c26c7a7f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/rich/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/rich/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "rich";
- version = "10.12.0";
+ version = "10.14.0";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "willmcgugan";
repo = pname;
rev = "v${version}";
- sha256 = "1qq4k0pxq3r0463z4h65i9rb8cvilpnqmparklj5y5qk6svz0y2n";
+ sha256 = "1j1m1064gmy07ah4crds5sd0k7dcwvf2b1z6rvjfvq4v9fx962qv";
};
nativeBuildInputs = [ poetry-core ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rjsmin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rjsmin/default.nix
index d78c445a3e..2dbc72b1d0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/rjsmin/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/rjsmin/default.nix
@@ -1,11 +1,11 @@
{ lib, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "rjsmin";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0cmc72rlkvzz8fl89bc83czkx0pcvhzj7yn7m29r8pgnf5fcfpdi";
+ sha256 = "6c529feb6c400984452494c52dd9fdf59185afeacca2afc5174a28ab37751a1b";
};
# The package does not ship tests, and the setup machinary confuses
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/robotframework-sshlibrary/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/robotframework-sshlibrary/default.nix
index 82a5fd3fed..e72a723086 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/robotframework-sshlibrary/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/robotframework-sshlibrary/default.nix
@@ -7,12 +7,12 @@
}:
buildPythonPackage rec {
- version = "3.7.0";
+ version = "3.8.0";
pname = "robotframework-sshlibrary";
src = fetchPypi {
inherit pname version;
- sha256 = "55bd5a11bb1fe60a5a83446e6a3e1e81b13fc671e3b660aa55912a263c1f63aa";
+ sha256 = "aedf8a02bcb7344404cf8575d0ada25d6c7dc2fcb65de2113c4e07c63d2446c2";
};
# unit tests are impure
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rpcq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rpcq/default.nix
index 671038c8b4..82db76bc85 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/rpcq/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/rpcq/default.nix
@@ -14,6 +14,7 @@
buildPythonPackage rec {
pname = "rpcq";
version = "3.9.2";
+ format = "setuptools";
disabled = pythonOlder "3.6";
@@ -42,7 +43,14 @@ buildPythonPackage rec {
--replace "msgpack>=0.6,<1.0" "msgpack"
'';
- pythonImportsCheck = [ "rpcq" ];
+ disabledTests = [
+ # Test doesn't work properly on Hydra
+ "test_client_backlog"
+ ];
+
+ pythonImportsCheck = [
+ "rpcq"
+ ];
meta = with lib; {
description = "The RPC framework and message specification for rigetti Quantum Cloud services";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rsa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rsa/default.nix
index b4668e3d2e..ccfd237862 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/rsa/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/rsa/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "rsa";
- version = "4.7.2";
+ version = "4.8";
src = fetchPypi {
inherit pname version;
- sha256 = "9d689e6ca1b3038bc82bf8d23e944b6b6037bc02301a574935b2dd946e0353b9";
+ sha256 = "5c6bd9dc7a543b7fe4304a631f8a8a3b674e2bbfc49c2ae96200cdbe55df6b17";
};
checkInputs = [ unittest2 mock ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/s3fs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/s3fs/default.nix
index 2ed6361b25..e8a8bbea80 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/s3fs/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/s3fs/default.nix
@@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "s3fs";
- version = "2021.10.1";
+ version = "2021.11.0";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-STriUFPlJiVSokep8cOiyPvNIPWQf85jp0kSa6WP4F4=";
+ sha256 = "3c23eac1fa5b685c9d507950b24f75929e8bcd1ea98b9a95cf2a9cb66ee6c9f5";
};
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix
index ece8af476d..3df0a94cf8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix
@@ -16,11 +16,11 @@
buildPythonPackage rec {
pname = "sagemaker";
- version = "2.63.1";
+ version = "2.69.0";
src = fetchPypi {
inherit pname version;
- sha256 = "924847e9793b76d188049718aabbcad975296bb267812ad18e0279e7af0cb748";
+ sha256 = "8e9051a44a82be07e32d83cfc12d724fd1cb76f83ade34cd9e69c45a8d37c676";
};
pythonImportsCheck = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sanic-auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sanic-auth/default.nix
index 38d73d461c..c854017ae7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sanic-auth/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sanic-auth/default.nix
@@ -1,24 +1,44 @@
-{ lib, buildPythonPackage, fetchPypi, sanic, sanic-testing, pytestCheckHook }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, sanic
+, sanic-testing
+, pytestCheckHook
+}:
buildPythonPackage rec {
pname = "Sanic-Auth";
version = "0.3.0";
+ format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "0dc24ynqjraqwgvyk0g9bj87zgpq4xnssl24hnsn7l5vlkmk8198";
};
- propagatedBuildInputs = [ sanic ];
+ propagatedBuildInputs = [
+ sanic
+ ];
- checkInputs = [ pytestCheckHook sanic-testing ];
+ checkInputs = [
+ pytestCheckHook
+ sanic-testing
+ ];
- pythonImportsCheck = [ "sanic_auth" ];
+ postPatch = ''
+ # Support for httpx>=0.20.0
+ substituteInPlace tests/test_auth.py \
+ --replace "allow_redirects=False" "follow_redirects=False"
+ '';
+
+ pythonImportsCheck = [
+ "sanic_auth"
+ ];
meta = with lib; {
description = "Simple Authentication for Sanic";
homepage = "https://github.com/pyx/sanic-auth/";
license = licenses.bsdOriginal;
- maintainers = [ maintainers.arnoldfarkas ];
+ maintainers = with maintainers; [ arnoldfarkas ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix
index 6161f5c5eb..2fab2a3df8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix
@@ -12,6 +12,7 @@
, pytest-benchmark
, pytest-sugar
, pytestCheckHook
+, pythonOlder
, sanic-routing
, sanic-testing
, ujson
@@ -22,13 +23,16 @@
buildPythonPackage rec {
pname = "sanic";
- version = "21.9.1";
+ version = "21.9.3";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "sanic-org";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-TRrJr/L8AXLAARPjhBi2FxNh+jvxxdeMN24cT1njmqY=";
+ sha256 = "0m18jdw1mvf7jhpnrxhm96p24pxvv0h9m71a8c7sqqkwnnpa3p5i";
};
postPatch = ''
@@ -85,6 +89,10 @@ buildPythonPackage rec {
"test_auto_reload"
"test_no_exceptions_when_cancel_pending_request"
"test_ipv6_address_is_not_wrapped"
+ # Failure of the redirect tests seems to be related to httpx>0.20.0
+ "test_redirect"
+ "test_chained_redirect"
+ "test_unix_connection"
# These appear to be very sensitive to output of commands
"test_access_logs"
"test_auto_reload"
@@ -99,7 +107,9 @@ buildPythonPackage rec {
# for the same local port
__darwinAllowLocalNetworking = true;
- pythonImportsCheck = [ "sanic" ];
+ pythonImportsCheck = [
+ "sanic"
+ ];
meta = with lib; {
description = "Web server and web framework";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sarif-om/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sarif-om/default.nix
new file mode 100644
index 0000000000..b7b334ebf9
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sarif-om/default.nix
@@ -0,0 +1,35 @@
+{ lib, buildPythonPackage, fetchPypi
+, attrs
+, pbr
+}:
+
+buildPythonPackage rec {
+ pname = "sarif-om";
+ version = "1.0.4";
+
+ src = fetchPypi {
+ pname = "sarif_om";
+ inherit version;
+ sha256 = "cd5f416b3083e00d402a92e449a7ff67af46f11241073eea0461802a3b5aef98";
+ };
+
+ nativeBuildInputs = [
+ pbr
+ ];
+
+ propagatedBuildInputs = [
+ attrs
+ ];
+
+ pythonImportsCheck = [ "sarif_om" ];
+
+ # no tests included with tarball
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Classes implementing the SARIF 2.1.0 object model";
+ homepage = "https://github.com/microsoft/sarif-python-om";
+ license = licenses.mit;
+ maintainers = with maintainers; [ jonringer ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix
index c3445c1d3a..bf836fa458 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "schema-salad";
- version = "8.2.20211104054942";
+ version = "8.2.20211116214159";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-1crKyAON8iZBYxP6bhj0MxV3fSpnCh3Lqp8x91KLBT8=";
+ sha256 = "0c737af600e0a03dd97c93b9867e862463b65d95580ba711fd22f542bc80ad00";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix
index 0f76efe2ea..d8240fd833 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "scikit-hep-testdata";
- version = "0.4.10";
+ version = "0.4.11";
format = "pyproject";
# fetch from github as we want the data files
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "scikit-hep";
repo = pname;
rev = "v${version}";
- sha256 = "0x6ba02f3sba9341nhyg9jdcbl9c1h880d8m75ybdpbn7zlaya1d";
+ sha256 = "18r5nk8d5y79ihzjkjm5l0hiw2sjgj87px7vwb0bxbs73f5v353b";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix
index e7ac79b428..b717432a65 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix
@@ -19,23 +19,14 @@
buildPythonPackage rec {
pname = "scikit-learn";
- version = "0.24.1";
+ version = "1.0.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "oDNKGALmTWVgIsO/q1anP71r9LEpg0PzaIryFRgQu98=";
+ sha256 = "sha256-rCyp27dU1hz+HIO6hINJjvlR0puT7AnW8AKEfyEKmdo=";
};
- patches = [
- # This patch fixes compatibility with numpy 1.20. It was merged before 0.24.1 was released,
- # but for some reason was not included in the 0.24.1 release tarball.
- (fetchpatch {
- url = "https://github.com/scikit-learn/scikit-learn/commit/e7ef22c3ba2334cb3b476e95d7c083cf6b48ce56.patch";
- sha256 = "174554k1pbf92bj7wgq0xjj16bkib32ailyhwavdxaknh4bd9nmv";
- })
- ];
-
buildInputs = [
pillow
glibcLocales
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix
index 2e19d2d420..9c3b28e0a9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix
@@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "scipy";
- version = "1.7.1";
+ version = "1.7.3";
src = fetchPypi {
inherit pname version;
- sha256 = "6b47d5fa7ea651054362561a28b1ccc8da9368a39514c1bbf6c0977a1c376764";
+ sha256 = "ab5875facfdef77e0a47d5fd39ea178b58e60e454a4c85aa1e52fcb80db7babf";
};
nativeBuildInputs = [ cython gfortran pythran ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/screenlogicpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/screenlogicpy/default.nix
index e3c3ba72ca..1ade4b8ea1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/screenlogicpy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/screenlogicpy/default.nix
@@ -2,6 +2,7 @@
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
+, pytest-asyncio
, pytestCheckHook
}:
@@ -20,6 +21,7 @@ buildPythonPackage rec {
};
checkInputs = [
+ pytest-asyncio
pytestCheckHook
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/seaborn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/seaborn/default.nix
index d1095b1999..c190093bb3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/seaborn/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/seaborn/default.nix
@@ -32,14 +32,24 @@ buildPythonPackage rec {
pytestCheckHook
];
+ disabledTests = [
+ # Tests fail because of AttributeError:...
+ "TestKDEPlotBivariate"
+ "TestBoxPlotter"
+ "TestCatPlot"
+ "TestKDEPlotUnivariate"
+ "test_with_rug"
+ "test_bivariate_kde_norm"
+ ];
+
pythonImportsCheck= [
"seaborn"
];
- meta = {
+ meta = with lib; {
description = "Statisitical data visualization";
homepage = "https://seaborn.pydata.org/";
- license = with lib.licenses; [ bsd3 ];
- maintainers = with lib.maintainers; [ fridh ];
+ license = with licenses; [ bsd3 ];
+ maintainers = with maintainers; [ fridh ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/secp256k1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/secp256k1/default.nix
index 58fa81b444..1637814cad 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/secp256k1/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/secp256k1/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "secp256k1";
- version = "0.13.2";
+ version = "0.14.0";
src = fetchPypi {
inherit pname version;
- sha256 = "a3b43e02d321c09eafa769a6fc2c156f555cab3a7db62175ef2fd21e16cdf20c";
+ sha256 = "82c06712d69ef945220c8b53c1a0d424c2ff6a1f64aee609030df79ad8383397";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/send2trash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/send2trash/default.nix
index a91be01511..8a35d3ed71 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/send2trash/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/send2trash/default.nix
@@ -6,13 +6,14 @@
buildPythonPackage rec {
pname = "Send2Trash";
- version = "1.5.0";
+ version = "1.8.1b0";
+ format = "pyproject";
src = fetchFromGitHub {
owner = "hsoft";
repo = "send2trash";
rev = version;
- sha256 = "1c76zldhw2ay7q7r00nnzcampjz9lkqfcbzqpm0iqp5i6bmmv30v";
+ sha256 = "sha256-kDUEfyMTk8CXSxTEi7E6kl09ohnWHeaoif+EIaIJh9Q=";
};
doCheck = !stdenv.isDarwin;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shamir-mnemonic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shamir-mnemonic/default.nix
index 74ca2228d8..e6502a7652 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/shamir-mnemonic/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/shamir-mnemonic/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "shamir-mnemonic";
- version = "0.2.1";
+ version = "0.2.2";
disabled = !isPy3k;
@@ -18,14 +18,9 @@ buildPythonPackage rec {
owner = "trezor";
repo = "python-${pname}";
rev = "v${version}";
- sha256 = "1mi1n01yw8yycbiv1l0xnfzlhhq2arappyvyi2jm5yq65jln77kg";
+ sha256 = "sha256-b9tBXN9dBdAeGg3xf5ZBdd6kPpFzseJl6wRTTfNZEwo=";
};
- postPatch = ''
- substituteInPlace setup.py \
- --replace "click>=7,<8" "click"
- '';
-
propagatedBuildInputs = [
attrs
click
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix
index 128dacfd55..fbd43953b5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "shap";
- version = "0.39.0";
+ version = "0.40.0";
disabled = isPy27;
src = fetchFromGitHub {
owner = "slundberg";
repo = pname;
rev = "v${version}";
- sha256 = "065c40k6g8sy6ynzk4k8k7iddl18g2b6kb9kg4m6g7npclmn5wvp";
+ sha256 = "0ra0dp319qj13wxaqh2vz4xhn59m9h3bfg1m6wf3cxsix737b1k4";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shortuuid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shortuuid/default.nix
index f1c1efbc0e..5b7aad436f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/shortuuid/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/shortuuid/default.nix
@@ -2,21 +2,25 @@
, buildPythonPackage
, isPy3k
, fetchPypi
+, django
, pep8
}:
buildPythonPackage rec {
pname = "shortuuid";
- version = "1.0.1";
+ version = "1.0.8";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "3c11d2007b915c43bee3e10625f068d8a349e04f0d81f08f5fa08507427ebf1f";
+ sha256 = "9435e87e5a64f3b92f7110c81f989a3b7bdb9358e22d2359829167da476cfc23";
};
- buildInputs = [pep8];
+ checkInputs = [
+ django
+ pep8
+ ];
meta = with lib; {
description = "A generator library for concise, unambiguous and URL-safe UUIDs";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simple-di/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simple-di/default.nix
index 4977c3a4bf..612d913b7b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/simple-di/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/simple-di/default.nix
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "simple_di";
- version = "0.1.2";
+ version = "0.1.4";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "0wqbfbajnwmkzih0jl3mncalr7dslvmwhb5mk11asqvmbp1xhn30";
+ sha256 = "2667f2b9095e86c7726b3853c30b37f527f7d247282c7dd0b3428a7fb5d1a8a9";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simplejson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simplejson/default.nix
index 52e55c71af..1e6def5ae7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/simplejson/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/simplejson/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "simplejson";
- version = "3.17.5";
+ version = "3.17.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "1vljsd5bk12gasadkxcddwhmp38fj64x1aqi4frk3frq9lp8h3a1";
+ sha256 = "1irlp5sakbdfcf717qmrx0r9rjlmwk0vza6zm3y55d32zw5c1cxg";
};
checkInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smpplib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smpplib/default.nix
index 4966e8c8fb..179ab7ce1b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/smpplib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/smpplib/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "smpplib";
- version = "2.2.0";
+ version = "2.2.1";
src = fetchPypi {
inherit pname version;
- sha256 = "3d513178a35573f66faac4ef2127c4bd73307ddb463d145b17b013cf709d9ddd";
+ sha256 = "c0b01947b47e404f42ccb59e906b6e4eb507963c971d59b44350db0f29c76166";
};
propagatedBuildInputs = [ six ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snowballstemmer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snowballstemmer/default.nix
index 5f3029de2a..a1813fac54 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/snowballstemmer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/snowballstemmer/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "snowballstemmer";
- version = "2.1.0";
+ version = "2.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "e997baa4f2e9139951b6f4c631bad912dfd3c792467e2f03d7239464af90e914";
+ sha256 = "09b16deb8547d3412ad7b590689584cd0fe25ec8db3be37788be3810cbf19cb1";
};
# No tests included
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix
index 2914b2a704..af6cd8defc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix
@@ -24,12 +24,12 @@
buildPythonPackage rec {
pname = "snowflake-connector-python";
- version = "2.7.0";
+ version = "2.7.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "cf8624539b18f5752756b3029622c08e9113f6a861a9f4689133d483a0ffd73b";
+ sha256 = "81175ff9fe0355a7e9007a087458dddc0816985ec10dc122e690de03549afbff";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix
index dd6f2d0526..df9a06aec1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "soco";
- version = "0.25.1";
+ version = "0.25.2";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "SoCo";
repo = "SoCo";
rev = "v${version}";
- sha256 = "sha256-KmB7uTONzNTFPNzwyjQ2eBId7RQynzuNUMeIqSO2gm4=";
+ sha256 = "sha256-Bu9RtzvQVDPekIzkVvcDkTs5Z+IDx6lSBCMv5zs8gNA=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/soupsieve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/soupsieve/default.nix
index 954599ffef..6c50cc6e11 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/soupsieve/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/soupsieve/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "soupsieve";
- version = "2.2.1";
+ version = "2.3.1";
src = fetchPypi {
inherit pname version;
- sha256 = "052774848f448cf19c7e959adf5566904d525f33a3f8b6ba6f6f8f26ec7de0cc";
+ sha256 = "b8d49b1cd4f037c7082a9683dfa1801aa2597fb11c3a1155b7a5b94829b4f1f9";
};
checkPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy-alignments/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy-alignments/default.nix
index 32506c2d9e..95ba3c9463 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/spacy-alignments/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy-alignments/default.nix
@@ -11,31 +11,21 @@
buildPythonPackage rec {
pname = "spacy-alignments";
- version = "0.8.3";
+ version = "0.8.4";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- hash = "sha256-zrqBjaIjtF6bJMbmw7Zo+BeApN6sxxfLkrzsDjdvC78=";
+ sha256 = "sha256-1HApl/RZ0w5Tf2OPu1QBUa36uIqilp+dDbPjujn0e9s=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
- inherit patches src;
+ inherit src;
name = "${pname}-${version}";
- hash = "sha256-YRyG2yflEXKklNqXiDD9oK3J1lq4o704+Eeu2hyY3xI=";
+ sha256 = "sha256-oFSruBnoodv6/0/OrmJ/2SVoWm3u3FGtzVJ9xgp0+Cg=";
};
- patches = [
- # Add Cargo.lock, from upstream PR:
- # https://github.com/explosion/spacy-alignments/pull/3
- (fetchpatch {
- url = "https://github.com/explosion/spacy-alignments/commit/7b0ba13ff0d245bfbbe344a36fb7bbd311dd4906.diff";
- sha256 = "sha256-jx97SSC+3z+ByInNs8Uq58H50eCo4fDCwEi6VKxRs2k=";
- excludes = [ ".gitignore" ];
- })
- ];
-
nativeBuildInputs = [
setuptools-rust
] ++ (with rustPlatform; [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix
index d959ad8947..0d095cfef0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix
@@ -29,13 +29,13 @@
buildPythonPackage rec {
pname = "spacy";
- version = "3.1.3";
+ version = "3.2.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-WAhOZKJ5lxkupI8Yq7MOwUjFu+edBNF7pNL8JiEAwqI=";
+ sha256 = "68e54b2a14ce74eeecea9bfb0b9bdadf8a4a8157765dbefa7e50d25a1bf0f2f3";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx/0001-test-images-Use-normalization-equivalent-character.patch b/third_party/nixpkgs/pkgs/development/python-modules/sphinx/0001-test-images-Use-normalization-equivalent-character.patch
new file mode 100644
index 0000000000..805e724d0c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx/0001-test-images-Use-normalization-equivalent-character.patch
@@ -0,0 +1,35 @@
+From 181617387841b695ee77b162babf9fb177002fcb Mon Sep 17 00:00:00 2001
+From: toonn
+Date: Mon, 20 Sep 2021 11:39:46 +0200
+Subject: [PATCH] test-images: Use normalization equivalent character
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+One of the test images used a combining character `ä` that can be
+encoded multiple ways. This means the file's name can end up encoded
+differently depending on whether/which normal form the filesystem uses.
+
+For Nix this causes a different hash for a FOD depending on the
+filesystem where it is evaluated. This is problematic because hashes
+fail to match up when evaluating the FOD across multiple platforms.
+---
+ tests/roots/test-images/index.rst | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/roots/test-images/index.rst b/tests/roots/test-images/index.rst
+index 14a2987..219842e 100644
+--- a/tests/roots/test-images/index.rst
++++ b/tests/roots/test-images/index.rst
+@@ -13,7 +13,7 @@ test-image
+
+ The caption of img
+
+-.. image:: testimäge.png
++.. image:: testimæge.png
+
+ .. image:: rimg.png
+ :target: https://www.sphinx-doc.org/
+--
+2.17.2 (Apple Git-113)
+
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx/default.nix
index 9d82b4c598..75693f3657 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx/default.nix
@@ -1,4 +1,5 @@
-{ lib
+{ stdenv
+, lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
@@ -28,14 +29,20 @@
buildPythonPackage rec {
pname = "sphinx";
- version = "4.2.0";
+ version = "4.3.1";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "sphinx-doc";
repo = pname;
rev = "v${version}";
- sha256 = "1i38n5bxqiycjwmiv9dl72r3f5ks4zmif30znqg8zilclbx6g16x";
+ sha256 = "sha256-8Yj6cPZFG8ycbbZtMR+fsIAOX0brxroi6nYjP+WhnxA=";
+ extraPostFetch = ''
+ cd $out
+ mv tests/roots/test-images/testimäge.png \
+ tests/roots/test-images/testimæge.png
+ patch -p1 < ${./0001-test-images-Use-normalization-equivalent-character.patch}
+ '';
};
propagatedBuildInputs = [
@@ -76,6 +83,27 @@ buildPythonPackage rec {
# requires imagemagick (increases build closure size), doesn't
# test anything substantial
"test_ext_imgconverter"
+ ] ++ lib.optional stdenv.isDarwin [
+ # Due to lack of network sandboxing can't guarantee port 7777 isn't bound
+ "test_inspect_main_url"
+ "test_auth_header_uses_first_match"
+ "test_linkcheck_request_headers"
+ "test_linkcheck_request_headers_no_slash"
+ "test_follows_redirects_on_HEAD"
+ "test_invalid_ssl"
+ "test_connect_to_selfsigned_with_tls_verify_false"
+ "test_connect_to_selfsigned_with_tls_cacerts"
+ "test_connect_to_selfsigned_with_requests_env_var"
+ "test_connect_to_selfsigned_nonexistent_cert_file"
+ "test_TooManyRedirects_on_HEAD"
+ "test_too_many_requests_retry_after_int_del"
+ "test_too_many_requests_retry_after_HTTP_date"
+ "test_too_many_requests_retry_after_without_header"
+ "test_too_many_requests_user_timeout"
+ "test_raises_for_invalid_status"
+ "test_auth_header_no_match"
+ "test_follows_redirects_on_GET"
+ "test_connect_to_selfsigned_fails"
];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix
index 25389f2784..38558f0049 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix
@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "spyder";
- version = "5.1.5";
+ version = "5.2.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "f9ce23187f5de18f489fb03c38d884e4484b9c7292f9831faaa029fb7752fc93";
+ sha256 = "cd04acc88426acee9c4ce6bb91f50c13fc161a437e68bca701243b3415ce9d08";
};
nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix
index b2715b4d29..ee1181e9c9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
+, fetchpatch
, pythonOlder
, click
, click-default-group
@@ -13,14 +14,23 @@
buildPythonPackage rec {
pname = "sqlite-utils";
- version = "3.17.1";
+ version = "3.19";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "0cfde0c46a2d4c09d6df8609fe53642bc3ab443bcef3106d8f1eabeb3fccbe3d";
+ sha256 = "509099fce5f25faada6e76b6fb90e8ef5ba0f1715177933a816718be0c8e7244";
};
+ patches = [
+ # https://github.com/simonw/sqlite-utils/pull/347
+ (fetchpatch {
+ name = "sqlite-utils-better-test_rebuild_fts.patch";
+ url = "https://github.com/simonw/sqlite-utils/pull/347/commits/1a7ef2fe2064ace01d5535fb771f941296fb642a.diff";
+ sha256 = "sha256-WKCQGMqr8WYjG7cmAH5pYBhgikowbt3r6hObwtMDDUY=";
+ })
+ ];
+
postPatch = ''
substituteInPlace setup.py \
--replace '"pytest-runner"' ""
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix
index 9b76edc1ba..1d74a62bab 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix
@@ -7,13 +7,13 @@
}:
buildPythonPackage rec {
- version = "1.5.0";
+ version = "1.6.0";
pname = "strictyaml";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "273a6382cc98a404d20779351cd5bb12e746397fbe18a8e9ccec4ae3c0ffa0e2";
+ sha256 = "73fa9769214a310486d7916453a09bd38b07d28a9dcbdf27719183c1d7d949f6";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix
index a8c451ebf9..ddb3a314f0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "stripe";
- version = "2.62.0";
+ version = "2.63.0";
src = fetchPypi {
inherit pname version;
- sha256 = "1fb51d67a961ea889c5be324f020535ed511c6f483bd13a07f48f6e369fa8df0";
+ sha256 = "816c935e31d82737a9e4362c662e8702bdf9000ea1bd36882cd4cbd23eb81ae1";
};
propagatedBuildInputs = [ requests ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/structlog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/structlog/default.nix
index 3d1a8f8af6..2e90d3350d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/structlog/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/structlog/default.nix
@@ -1,9 +1,8 @@
{ lib
, buildPythonPackage
-, fetchPypi
-, pytest
+, fetchFromGitHub
+, pytestCheckHook
, pytest-asyncio
-, python-rapidjson
, pretend
, freezegun
, twisted
@@ -14,25 +13,23 @@
buildPythonPackage rec {
pname = "structlog";
- version = "21.2.0";
+ version = "21.4.0";
+ format = "flit";
- src = fetchPypi {
- inherit pname version;
- sha256 = "7ac42b565e1295712313f91edbcb64e0840a9037d888c8954f11fa6c43270e99";
+ # sdist is missing conftest.py
+ src = fetchFromGitHub {
+ owner = "hynek";
+ repo = "structlog";
+ rev = version;
+ sha256 = "sha256-uXFSrC1TvQV46uu0sadC3eMq7yk5TnrpQE8m6NSv1Bg=";
};
- checkInputs = [ pytest pytest-asyncio pretend freezegun simplejson twisted ]
- ++ lib.optionals (pythonAtLeast "3.6") [ python-rapidjson ];
+ checkInputs = [ pytestCheckHook pytest-asyncio pretend freezegun simplejson twisted ];
propagatedBuildInputs = [ six ];
- checkPhase = ''
- # rm tests/test_twisted.py*
- py.test
- '';
-
meta = {
description = "Painless structural logging";
- homepage = "http://www.structlog.org/";
+ homepage = "https://github.com/hynek/structlog";
license = lib.licenses.asl20;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stumpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stumpy/default.nix
index a72ca40c21..a1cdd5b84e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/stumpy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/stumpy/default.nix
@@ -16,13 +16,13 @@
buildPythonPackage rec {
pname = "stumpy";
- version = "1.9.2";
+ version = "1.10.0";
src = fetchFromGitHub {
owner = "TDAmeritrade";
repo = "stumpy";
rev = "v${version}";
- sha256 = "0x5kac8fqsi3fkfwjdn0d7anslprxaz6cizky9cyj0rpbp0b0yc3";
+ sha256 = "1h3mqz570s9rc45d217xrykcy8f4fnpyk178smam2fzynlr90gd8";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/taskw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/taskw/default.nix
index 80d86c3edb..ac8a55e24d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/taskw/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/taskw/default.nix
@@ -11,12 +11,12 @@
}:
buildPythonPackage rec {
- version = "1.3.0";
+ version = "1.3.1";
pname = "taskw";
src = fetchPypi {
inherit pname version;
- sha256 = "7673d80b3d5bace5b35eb71f5035e313a92daab6e437694128d8ce7dcdaf66fb";
+ sha256 = "1a68e49cac2d4f6da73c0ce554fd6f94932d95e20596f2ee44a769a28c12ba7d";
};
patches = [ ./use-template-for-taskwarrior-install-path.patch ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix
index d2123d207e..9524f7e449 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix
@@ -1,5 +1,5 @@
-{ stdenv
-, lib
+{ lib
+, stdenv
, buildPythonPackage
, fetchPypi
, pytestCheckHook
@@ -7,6 +7,8 @@
, catalogue
, cymem
, cython
+, contextvars
+, dataclasses
, Accelerate
, CoreFoundation
, CoreGraphics
@@ -27,17 +29,19 @@
buildPythonPackage rec {
pname = "thinc";
- version = "8.0.10";
+ version = "8.0.13";
+ format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- hash = "sha256-teTbjSTmvopfHkoXhUdyt5orVgIkUZ9Qoh85UcokAB8=";
+ sha256 = "sha256-R2YqOuM9RFp3tup7dyREgFx7uomR8SLjUNr3Le3IFxo=";
};
- buildInputs = [ cython ]
- ++ lib.optionals stdenv.isDarwin [
+ buildInputs = [
+ cython
+ ] ++ lib.optionals stdenv.isDarwin [
Accelerate
CoreFoundation
CoreGraphics
@@ -56,7 +60,12 @@ buildPythonPackage rec {
tqdm
pydantic
wasabi
- ] ++ lib.optional (pythonOlder "3.8") typing-extensions;
+ ] ++ lib.optional (pythonOlder "3.8") [
+ typing-extensions
+ ] ++ lib.optional (pythonOlder "3.7") [
+ contextvars
+ dataclasses
+ ];
checkInputs = [
hypothesis
@@ -71,7 +80,9 @@ buildPythonPackage rec {
"thinc/tests"
];
- pythonImportsCheck = [ "thinc" ];
+ pythonImportsCheck = [
+ "thinc"
+ ];
meta = with lib; {
description = "Practical Machine Learning for NLP in Python";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tifffile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tifffile/default.nix
index f495541f5d..2e46762672 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tifffile/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tifffile/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "tifffile";
- version = "2021.8.30";
+ version = "2021.11.2";
src = fetchPypi {
inherit pname version;
- sha256 = "8760e61e30106ea0dab9ec42a238d70a3ff55dde9c54456e7b748fe717cb782d";
+ sha256 = "153e31fa1d892f482fabb2ae9f2561fa429ee42d01a6f67e58cee13637d9285b";
};
patches = lib.optional isPy27 ./python2-regex-compat.patch;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/toolz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/toolz/default.nix
index 6100d2a7c5..234cb471e4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/toolz/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/toolz/default.nix
@@ -1,23 +1,19 @@
{ lib
, buildPythonPackage
, fetchPypi
-, nose
+, pytestCheckHook
}:
buildPythonPackage rec {
pname = "toolz";
- version = "0.11.1";
+ version = "0.11.2";
src = fetchPypi {
inherit pname version;
- sha256 = "1grz3zvw5ixwqqlbv0n7j11mlcxb66cirh5i9x9zw8kqy0hpk967";
+ sha256 = "6b312d5e15138552f1bda8a4e66c30e236c831b612b2bf0005f8a1df10a4bc33";
};
- checkInputs = [ nose ];
-
- checkPhase = ''
- nosetests toolz/tests
- '';
+ checkInputs = [ pytestCheckHook ];
meta = with lib; {
homepage = "https://github.com/pytoolz/toolz";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/traitlets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/traitlets/default.nix
index 9c09a206f4..0b96ba37c1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/traitlets/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/traitlets/default.nix
@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "traitlets";
- version = "5.1.0";
+ version = "5.1.1";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "bd382d7ea181fbbcce157c133db9a829ce06edffe097bcf3ab945b435452b46d";
+ sha256 = "sha256-BZ9FbFp8HIK5jC6MeZ85ybgSj20NRpQe4RjarOnrcMc=";
};
checkInputs = [ glibcLocales pytest mock ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix
index 6bf5c069c6..5479a0b122 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix
@@ -19,13 +19,13 @@
buildPythonPackage rec {
pname = "transformers";
- version = "4.12.2";
+ version = "4.12.5";
src = fetchFromGitHub {
owner = "huggingface";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-SndnMiXWiDW+E1G+WaUTVv3lySavJWF0nFDZLOxzObc=";
+ sha256 = "07v72fyhm1s3bzg2kvaff15d7d8na39nlqpf5gyxaqvp3hglc3qy";
};
nativeBuildInputs = [ packaging ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trezor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trezor/default.nix
index 78eb7eda08..f58c24e500 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/trezor/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/trezor/default.nix
@@ -24,13 +24,13 @@
buildPythonPackage rec {
pname = "trezor";
- version = "0.12.4";
+ version = "0.13.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "3e180d9f9f8b69176b5ef36311b6161f5b793b538eb2dfd4babbb4d3fb1e374e";
+ sha256 = "4571aa09dbfe88b31eb2f16c7c359b4809621b75a04b7b5bc9dbffe17046c99a";
};
nativeBuildInputs = [ installShellFiles ];
@@ -56,6 +56,10 @@ buildPythonPackage rec {
checkInputs = [ pytestCheckHook ];
+ disabledTestPaths = [
+ "tests/test_stellar.py" # requires stellar-sdk
+ ];
+
postFixup = ''
mkdir completions
_TREZORCTL_COMPLETE=source_bash $out/bin/trezorctl > completions/trezorctl || true
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trezor_agent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trezor_agent/default.nix
index cef74c8636..41ae2e2761 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/trezor_agent/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/trezor_agent/default.nix
@@ -24,6 +24,12 @@ buildPythonPackage rec {
propagatedBuildInputs = [ setuptools trezor libagent ecdsa ed25519 mnemonic keepkey semver wheel pinentry ];
+ # relax dependency constraint
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "trezor[hidapi]>=0.12.0,<0.13" "trezor[hidapi]>=0.12.0,<0.14"
+ '';
+
doCheck = false;
pythonImportsCheck = [ "libagent" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trio/default.nix
index acd7c7acfb..0e95da38ea 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/trio/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/trio/default.nix
@@ -11,7 +11,6 @@
, sniffio
, stdenv
, jedi
-, pylint
, astor
, yapf
}:
@@ -26,7 +25,7 @@ buildPythonPackage rec {
sha256 = "895e318e5ec5e8cea9f60b473b6edb95b215e82d99556a03eb2d20c5e027efe1";
};
- checkInputs = [ astor pytestCheckHook pyopenssl trustme jedi pylint yapf ];
+ checkInputs = [ astor pytestCheckHook pyopenssl trustme jedi yapf ];
# It appears that the build sandbox doesn't include /etc/services, and these tests try to use it.
disabledTests = [
"getnameinfo"
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix
index 4ad2f9f959..8ee48d938e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix
@@ -24,14 +24,14 @@
buildPythonApplication rec {
pname = "trytond";
- version = "6.2.0";
+ version = "6.2.1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-U73dzLTUJnOw24/ELQzjnxJ0PvjV+zE/PNuQHXbEukw=";
+ sha256 = "418f16c45b7130555447af901639b92bb188d39f46ce7fe4dfcd941c5959ed7e";
};
# Tells the tests which database to use
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tuya-iot-py-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tuya-iot-py-sdk/default.nix
index beca3db9c6..89db0e84f9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tuya-iot-py-sdk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tuya-iot-py-sdk/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tuya-iot-py-sdk";
- version = "0.6.3";
+ version = "0.6.6";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "tuya";
repo = "tuya-iot-python-sdk";
rev = "v${version}";
- sha256 = "sha256-i3VECGGpnvbogZ46PJh4Eto7neSZOJCUdOmAU/sMKEw=";
+ sha256 = "sha256-KmSVa71CM/kNhzE4GznaxISGmIaV+UcTSn3v+fmxmrQ=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tweedledum/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tweedledum/default.nix
index 81f0dad52e..69b126481d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tweedledum/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tweedledum/default.nix
@@ -1,4 +1,5 @@
{ lib
+, stdenv
, buildPythonPackage
, fetchFromGitHub
, cmake
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twentemilieu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twentemilieu/default.nix
index f326a56d8d..a8a0fd0c99 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/twentemilieu/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/twentemilieu/default.nix
@@ -2,10 +2,10 @@
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
-, poetry-core
, aiohttp
, yarl
, aresponses
+, poetry-core
, pytest-asyncio
, pytestCheckHook
}:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typeguard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typeguard/default.nix
index 0385bd7070..63e1502226 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/typeguard/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/typeguard/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "typeguard";
- version = "2.12.1";
+ version = "2.13.2";
src = fetchPypi {
inherit pname version;
- sha256 = "c2af8b9bdd7657f4bd27b45336e7930171aead796711bc4cfc99b4731bb9d051";
+ sha256 = "7e50071590ab997509aa0977609eb5cf9d73d84c1f416cb4fab78b77a9d15326";
};
buildInputs = [ setuptools-scm ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix
index b3e38c8640..8545db539f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "types-protobuf";
- version = "3.18.0";
+ version = "3.18.1";
src = fetchPypi {
inherit pname version;
- sha256 = "a391d1a9138fe53fe08aeb6aa15ca7f1a188659b9a6c12af5313c55730eccd6c";
+ sha256 = "6696bf3cabc51dcc076e8de025c405dbdea7488c5268c2febd14527dac82c233";
};
propagatedBuildInputs = [ types-futures ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typical/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typical/default.nix
index ec9cd4d173..ee815fa15e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/typical/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/typical/default.nix
@@ -1,18 +1,19 @@
{ lib
, buildPythonPackage
-, fetchFromGitHub
-, pytestCheckHook
-, inflection
-, pendulum
, fastjsonschema
-, typing-extensions
-, orjson
+, fetchFromGitHub
, future-typing
+, inflection
+, mypy
+, orjson
+, pandas
+, pendulum
, poetry-core
, pydantic
+, pytestCheckHook
+, pythonOlder
, sqlalchemy
-, pandas
-, mypy
+, typing-extensions
}:
buildPythonPackage rec {
@@ -20,6 +21,8 @@ buildPythonPackage rec {
version = "2.7.9";
format = "pyproject";
+ disabled = pythonOlder "3.7";
+
src = fetchFromGitHub {
owner = "seandstewart";
repo = "typical";
@@ -31,15 +34,18 @@ buildPythonPackage rec {
./use-poetry-core.patch
];
- nativeBuildInputs = [ poetry-core ];
+ nativeBuildInputs = [
+ poetry-core
+ ];
propagatedBuildInputs = [
inflection
pendulum
fastjsonschema
orjson
- typing-extensions
future-typing
+ ] ++ lib.optionals (pythonOlder "3.10") [
+ typing-extensions
];
checkInputs = [
@@ -51,18 +57,23 @@ buildPythonPackage rec {
];
disabledTests = [
- "test_ujson" # We use orjson
+ # We use orjson
+ "test_ujson"
+ # ConstraintValueError: Given value <{'key...
+ "test_tagged_union_validate"
];
disabledTestPaths = [
"benchmark/"
];
- pythonImportsCheck = [ "typic" ];
+ pythonImportsCheck = [
+ "typic"
+ ];
meta = with lib; {
+ description = "Python library for runtime analysis, inference and validation of Python types";
homepage = "https://python-typical.org/";
- description = "Typical: Python's Typing Toolkit.";
license = licenses.mit;
maintainers = with maintainers; [ kfollesdal ];
};
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix
index 70e676f6b2..4d12af0689 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "ujson";
- version = "4.2.0";
+ version = "4.3.0";
disabled = isPyPy || pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "fffe509f556861c7343c6cba57ed05fe7bcf4b48a934a5b946ccb45428cf8883";
+ sha256 = "baee56eca35cb5fbe02c28bd9c0936be41a96fa5c0812d9d4b7edeb5c3d568a0";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/validators/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/validators/default.nix
index 37f00b7348..29ec9cd73d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/validators/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/validators/default.nix
@@ -2,11 +2,8 @@
, buildPythonPackage
, fetchPypi
, isPy27
-, six
, decorator
, pytestCheckHook
-, isort
-, flake8
}:
buildPythonPackage rec {
@@ -20,18 +17,13 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [
- six
decorator
];
checkInputs = [
pytestCheckHook
- flake8
- isort
];
- disabledTests = lib.optionals isPy27 [ "url" ];
-
meta = with lib; {
description = "Python Data Validation for Humans™";
homepage = "https://github.com/kvesteri/validators";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vehicle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vehicle/default.nix
index 7447ce14cf..a56cc4ca8b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/vehicle/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/vehicle/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "vehicle";
- version = "0.3.0";
+ version = "0.3.1";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "frenck";
repo = "python-vehicle";
rev = "v${version}";
- sha256 = "0blpyh246l16bn6jy8ifym2br13k8qxagggbwpzwrwfxkb3kdz5x";
+ sha256 = "04xcs5bfjd49j870gyyznc8hkaadsa9gm9pz0w9qvzlphnxvv5h4";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix
index f23764a510..d51b3d7837 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix
@@ -23,11 +23,11 @@
buildPythonPackage rec {
pname = "virtualenv";
- version = "20.8.1";
+ version = "20.10.0";
src = fetchPypi {
inherit pname version;
- sha256 = "bcc17f0b3a29670dd777d6f0755a4c04f28815395bca279cdcb213b97199a6b8";
+ sha256 = "576d05b46eace16a9c348085f7d0dc8ef28713a2cabaa1cf0aea41e8f12c9218";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vispy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vispy/default.nix
index c13f7b6d7d..5967b9b9ab 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/vispy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/vispy/default.nix
@@ -16,11 +16,11 @@
buildPythonPackage rec {
pname = "vispy";
- version = "0.9.3";
+ version = "0.9.4";
src = fetchPypi {
inherit pname version;
- sha256 = "bc3aec042637947d4e999121bab224077a6f7ede4af745102f41737f7c81c05a";
+ sha256 = "8561e41bbcca5fadce4a8d974ca2f96cbe7710d835bfed6a55ed6d10900ef5d5";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/watchdog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/watchdog/default.nix
index 6d2725796a..9fba5785c4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/watchdog/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/watchdog/default.nix
@@ -13,6 +13,7 @@
buildPythonPackage rec {
pname = "watchdog";
version = "2.1.6";
+ format = "setuptools";
src = fetchPypi {
inherit pname version;
@@ -38,7 +39,14 @@ buildPythonPackage rec {
--replace "--cov-report=term-missing" ""
'';
- pythonImportsCheck = [ "watchdog" ];
+ disabledTestPaths = [
+ # Tests are flaky
+ "tests/test_inotify_buffer.py"
+ ];
+
+ pythonImportsCheck = [
+ "watchdog"
+ ];
meta = with lib; {
description = "Python API and shell utilities to monitor file system events";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/websockets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/websockets/default.nix
index 611c84ea81..2e13d95c38 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/websockets/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/websockets/default.nix
@@ -1,21 +1,23 @@
{ lib
+, stdenv
, buildPythonPackage
, fetchFromGitHub
, python
, pythonOlder
-, stdenv
}:
buildPythonPackage rec {
pname = "websockets";
- version = "10.0";
+ version = "10.1";
+ format = "setuptools";
+
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "aaugustin";
repo = pname;
rev = version;
- sha256 = "sha256-F10C8ukjYfbn2X2PMzrdSDqvs51/A9lx8Y3kv8YJ8Cw=";
+ sha256 = "sha256-FFaoqxa+TmKJ+P6T7HrwodjbVCir+2qJSfZsoj6deJU=";
};
# Tests fail on Darwin with `OSError: AF_UNIX path too long`
@@ -34,7 +36,9 @@ buildPythonPackage rec {
runHook postCheck
'';
- pythonImportsCheck = [ "websockets" ];
+ pythonImportsCheck = [
+ "websockets"
+ ];
meta = with lib; {
description = "WebSocket implementation in Python";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/webssh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webssh/default.nix
index 00aff79437..49b7097549 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/webssh/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/webssh/default.nix
@@ -1,21 +1,37 @@
-{ lib, buildPythonPackage, fetchPypi, tornado, paramiko }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, paramiko
+, pytestCheckHook
+, tornado
+}:
buildPythonPackage rec {
pname = "webssh";
version = "1.5.3";
+ format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-Au6PE8jYm8LkEp0B1ymW//ZkrkcV0BauwufQmrHLEU4=";
};
- propagatedBuildInputs = [ tornado paramiko ];
+ propagatedBuildInputs = [
+ paramiko
+ tornado
+ ];
- pythonImportsCheck = [ "webssh" ];
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "webssh"
+ ];
meta = with lib; {
+ description = "Web based SSH client";
homepage = "https://github.com/huashengdun/webssh/";
- description = "Web based ssh client";
license = licenses.mit;
maintainers = with maintainers; [ davidtwco ];
};
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix
index 898fa4556e..c75c59ac1c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix
@@ -12,13 +12,15 @@
buildPythonPackage rec {
pname = "werkzeug";
- version = "2.0.1";
+ version = "2.0.2";
+ format = "setuptools";
+
disabled = pythonOlder "3.6";
src = fetchPypi {
pname = "Werkzeug";
inherit version;
- sha256 = "0hlwawnn8c41f254qify5jnjj8xb97n294h09bqimzqhs0qdpq8x";
+ sha256 = "sha256-qiu2/I3ujWxQTArB5/X33FgQqZA+eTtvcVqfAVva25o=";
};
propagatedBuildInputs = lib.optionals (!stdenv.isDarwin) [
@@ -54,5 +56,6 @@ buildPythonPackage rec {
utility libraries.
'';
license = licenses.bsd3;
+ maintainers = with maintainers; [ ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch b/third_party/nixpkgs/pkgs/development/python-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch
new file mode 100644
index 0000000000..93db54b0c6
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/wheel/0001-tests-Rename-a-a-o-_-.py-_-.py.patch
@@ -0,0 +1,37 @@
+From 5879a4bbc34d1eb25e160b15b2f5a4f10eac6bd2 Mon Sep 17 00:00:00 2001
+From: toonn
+Date: Mon, 13 Sep 2021 18:07:26 +0200
+Subject: [PATCH] =?UTF-8?q?tests:=20Rename=20a=CC=8Aa=CC=88o=CC=88=5F?=
+ =?UTF-8?q?=E6=97=A5=E6=9C=AC=E8=AA=9E.py=20=3D>=20=C3=A6=C9=90=C3=B8=5F?=
+ =?UTF-8?q?=E6=97=A5=E6=9C=AC=E5=83=B9.py?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+`åäö_日本語.py` normalizes differently in NFC and NFD normal forms. This
+means a hash generated for the source directory can differ depending on
+whether or not the filesystem is normalizing and which normal form it
+uses.
+
+By renaming the file to `æɐø_日本價.py` we avoid this issue by using a
+name that has the same encoding in each normal form.
+---
+ tests/test_bdist_wheel.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_bdist_wheel.py b/tests/test_bdist_wheel.py
+index 651c034..9b94ac8 100644
+--- a/tests/test_bdist_wheel.py
++++ b/tests/test_bdist_wheel.py
+@@ -58,7 +58,7 @@ def test_unicode_record(wheel_paths):
+ with ZipFile(path) as zf:
+ record = zf.read('unicode.dist-0.1.dist-info/RECORD')
+
+- assert u'åäö_日本語.py'.encode('utf-8') in record
++ assert u'æɐø_日本價.py'.encode('utf-8') in record
+
+
+ def test_licenses_default(dummy_dist, monkeypatch, tmpdir):
+--
+2.17.2 (Apple Git-113)
+
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wheel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wheel/default.nix
index 6039899838..1b899b5989 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/wheel/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/wheel/default.nix
@@ -14,8 +14,14 @@ buildPythonPackage rec {
owner = "pypa";
repo = pname;
rev = version;
- sha256 = "sha256-8lK2UvqBIxUYm6IOuT+Jk71wYbEEjvI7typS3749N9g=";
+ sha256 = "13bj49psan1s1fxfrq613dm2l7jvrg2dpgb36lz81z3b1h7zig6j";
name = "${pname}-${version}-source";
+ extraPostFetch = ''
+ cd $out
+ mv tests/testdata/unicode.dist/unicodedist/åäö_日本語.py \
+ tests/testdata/unicode.dist/unicodedist/æɐø_日本價.py
+ patch -p1 < ${./0001-tests-Rename-a-a-o-_-.py-_-.py.patch}
+ '';
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/widgetsnbextension/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/widgetsnbextension/default.nix
index bb8f1ab3b4..8f6cb6ad18 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/widgetsnbextension/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/widgetsnbextension/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "widgetsnbextension";
- version = "3.5.1";
+ version = "3.5.2";
src = fetchPypi {
inherit pname version;
- sha256 = "079f87d87270bce047512400efd70238820751a11d2d8cb137a5a5bdbaf255c7";
+ sha256 = "e0731a60ba540cd19bbbefe771a9076dcd2dde90713a8f87f27f53f2d1db7727";
};
propagatedBuildInputs = [ notebook ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix
index 4b1104dc41..886ffea60b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix
@@ -1,24 +1,25 @@
{ lib
-, buildPythonPackage
-, pythonOlder
-, fetchFromGitHub
, aiohttp
, awesomeversion
, backoff
+, buildPythonPackage
, cachetools
+, fetchFromGitHub
, poetry-core
, yarl
, aresponses
, pytest-asyncio
, pytestCheckHook
+, pythonOlder
}:
buildPythonPackage rec {
pname = "wled";
version = "0.10.2";
- disabled = pythonOlder "3.8";
format = "pyproject";
+ disabled = pythonOlder "3.8";
+
src = fetchFromGitHub {
owner = "frenck";
repo = "python-wled";
@@ -51,7 +52,9 @@ buildPythonPackage rec {
--replace "--cov" ""
'';
- pythonImportsCheck = [ "wled" ];
+ pythonImportsCheck = [
+ "wled"
+ ];
meta = with lib; {
description = "Asynchronous Python client for WLED";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wrapt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wrapt/default.nix
index d4bdac9e6f..e567a8a672 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/wrapt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/wrapt/default.nix
@@ -5,14 +5,14 @@
buildPythonPackage rec {
pname = "wrapt";
- version = "1.13.1";
+ version = "1.13.3";
# No tests in archive
doCheck = false;
src = fetchPypi {
inherit pname version;
- sha256 = "909a80ce028821c7ad01bdcaa588126825931d177cdccd00b3545818d4a195ce";
+ sha256 = "1fea9cd438686e6682271d36f3481a9f3636195578bab9ca3382e2f5f01fc185";
};
meta = {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xattr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xattr/default.nix
index a39c3532f4..cbec33483c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/xattr/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/xattr/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "xattr";
- version = "0.9.7";
+ version = "0.9.8";
src = fetchPypi {
inherit pname version;
- sha256 = "b0bbca828e04ef2d484a6522ae7b3a7ccad5e43fa1c6f54d78e24bb870f49d44";
+ sha256 = "bf11c8c857215e3ef60b031e7807264f30af4348d7565a7e9b8dca70593753c7";
};
propagatedBuildInputs = [ cffi ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix
index ba10a335ac..1687b113b4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix
@@ -8,7 +8,7 @@
}:
buildPythonPackage rec {
- version = "1.9.1";
+ version = "1.9.2";
pname = "xmlschema";
disabled = pythonOlder "3.6";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "sissaschool";
repo = "xmlschema";
rev = "v${version}";
- sha256 = "0z1mqjilnmbsdr8hw787irdk7419df2x8k765l9n5pb6ykdgz131";
+ sha256 = "1d18x150g0jz3nw5al5dygizwkjgzdnmd5kf46v8ribfz48iirr6";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xstatic-jquery-ui/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xstatic-jquery-ui/default.nix
index 8c872d0bbd..f5509676d1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/xstatic-jquery-ui/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/xstatic-jquery-ui/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "XStatic-jquery-ui";
- version = "1.12.1.1";
+ version = "1.13.0.1";
src = fetchPypi {
inherit version pname;
- sha256 = "d6ba48bb474420a8bcb2be02eef6ae96281ec24eff6befa54f04ebc9e4cc8910";
+ sha256 = "3697e5f0ef355b8f4a1c724221592683c2db031935cbb57b46224eef474bd294";
};
# no tests implemented
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/youtube-search-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/youtube-search-python/default.nix
index 634ff5ec54..ad23a6cc16 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/youtube-search-python/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/youtube-search-python/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "youtube-search-python";
- version = "1.5.1";
+ version = "1.5.2";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "68c70e1b6a2ce5c2c0ee64ba9c63efc9ab6e6f8acb2f51e19d570b0287e61cc9";
+ sha256 = "33f0d58f4803b0b2badf860cd31fb83d3f7edecdd2c01dd09cd6511abbf0e6b9";
};
propagatedBuildInputs = [ httpx ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zarr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zarr/default.nix
index 9e5b058212..11c6f84850 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/zarr/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/zarr/default.nix
@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "zarr";
- version = "2.10.2";
+ version = "2.10.3";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "5c6ae914ab9215631bb95c09e76b9b9b4fffa70fec0c7bca26b68387d858ebe2";
+ sha256 = "76932665c2146ebdf15f6dba254f9e0030552fbfcf9322dea822bff96fbce693";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_proxy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_proxy/default.nix
index 2d1a5880d0..70e329cce9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/zope_proxy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/zope_proxy/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "zope.proxy";
- version = "4.4.0";
+ version = "4.5.0";
src = fetchPypi {
inherit pname version;
- sha256 = "b244904c5148067c3f1899d29a2c1a28faca747b143192c0f825e6bf3170a347";
+ sha256 = "1329846261cf6c552b05579f3cfad199b2d178510d0b4703eb5f7cdd6ebad01a";
};
propagatedBuildInputs = [ zope_interface ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_schema/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_schema/default.nix
index 00defd1615..9472000f15 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/zope_schema/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/zope_schema/default.nix
@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "zope.schema";
- version = "6.1.0";
+ version = "6.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "9fa04d95e8e7e9056091eed9819da6e65dde68de39c2b93617d361d1eb8a7c0c";
+ sha256 = "2201aef8ad75ee5a881284d7a6acd384661d6dca7bde5e80a22839a77124595b";
};
propagatedBuildInputs = [ zope_location zope_event zope_interface zope_testing ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_testrunner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_testrunner/default.nix
index c3bc0d0bff..2638d43147 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/zope_testrunner/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/zope_testrunner/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "zope.testrunner";
- version = "5.3.0";
+ version = "5.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "39a5ba631830703ea011383447135063db6d182794487dda9b8c1f515bb70b0f";
+ sha256 = "4869229fc909e4aa8e76665a718f90dc88f73858b32ca5fa3dea6840e9210fb4";
};
propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix
index bcc4a4fa69..3fe047a124 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix
@@ -46,13 +46,13 @@ with py.pkgs;
buildPythonApplication rec {
pname = "checkov";
- version = "2.0.690";
+ version = "2.0.692";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
- sha256 = "sha256-DF528R5cJQ5CRieEXz9Wm/71bWLon/RBVInhlty/UEQ=";
+ sha256 = "sha256-mzqSnddcZAVwgm8SJSkgcU8bYvEy2Rw+5vDl1uPTjbA=";
};
nativeBuildInputs = with py.pkgs; [
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix
index 790eafaefe..7491b58927 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "codeql";
- version = "2.7.2";
+ version = "2.7.3";
dontConfigure = true;
dontBuild = true;
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
- sha256 = "sha256-BbSYIhSFXBge/jb88UumLkHH+xw+Rp9uSYnpdntZGws=";
+ sha256 = "sha256-wvN9NODw8JV30mDGhs7qlCoyp3Z3bJSGUfQ6+GtE5kE=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix
index cbdd2d37d8..951e95b147 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tflint";
- version = "0.34.0";
+ version = "0.34.1";
src = fetchFromGitHub {
owner = "terraform-linters";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-MdA1bS8ZPsfwnmnmIKBissuvwWY9HHxoLJEfGcJQ3j0=";
+ sha256 = "sha256-ltxFduUr+poi4tEjViQXCbe+j3fUdvBG8CTaM7VdpK0=";
};
- vendorSha256 = "sha256-y+bPFCjgTu+C5Cx85lYRjUbLd6c5PcckXRpg102d1zk=";
+ vendorSha256 = "sha256-iZdWCSkdKG0SXcUtZ0DgDGk25vESlv2dSbcK1gUVTV8=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/development/tools/boost-build/darwin-default-toolset.patch b/third_party/nixpkgs/pkgs/development/tools/boost-build/darwin-default-toolset.patch
deleted file mode 100644
index ebe3f8d2e1..0000000000
--- a/third_party/nixpkgs/pkgs/development/tools/boost-build/darwin-default-toolset.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/build-system.jam b/src/build-system.jam
-index 60425c54..c6842217 100644
---- a/src/build-system.jam
-+++ b/src/build-system.jam
-@@ -644,7 +644,7 @@ local rule should-clean-project ( project )
- }
- else if [ os.name ] = MACOSX
- {
-- default-toolset = darwin ;
-+ default-toolset = clang-darwin ;
- }
- }
diff --git a/third_party/nixpkgs/pkgs/development/tools/boost-build/default.nix b/third_party/nixpkgs/pkgs/development/tools/boost-build/default.nix
index c6c66d4d21..044589a966 100644
--- a/third_party/nixpkgs/pkgs/development/tools/boost-build/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/boost-build/default.nix
@@ -33,10 +33,11 @@ stdenv.mkDerivation {
sourceRoot="$sourceRoot/tools/build"
'';
- patches = [
- # Upstream defaults to gcc on darwin, but we use clang.
- ./darwin-default-toolset.patch
- ];
+ # Upstream defaults to gcc on darwin, but we use clang.
+ postPatch = ''
+ substituteInPlace src/build-system.jam \
+ --replace "default-toolset = darwin" "default-toolset = clang-darwin"
+ '';
nativeBuildInputs = [
bison
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
index 3d67dfafb8..c0c32a76a7 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "bazel-remote";
- version = "2.3.0";
+ version = "2.3.1";
src = fetchFromGitHub {
owner = "buchgr";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-ILD7uGVzRgFugHYkhvxy0rbWarXgGZXi/SLRSQb8nl4=";
+ sha256 = "sha256-aQsc2dBS1IWm1lpBPrrHx1CfrHXJYkDIObNHMqqVYn4=";
};
vendorSha256 = "sha256-XBsYSA0i0q/mp8sQh9h//pjs+TbEDc7UIdNU24/Qemo=";
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix
index 552cb05736..21f7512588 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix
@@ -47,9 +47,6 @@ stdenv.mkDerivation rec {
./no-double-relative.patch
];
- # 'path' is unavailable: introduced in macOS 10.15
- CXXFLAGS = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") "-D_LIBCPP_DISABLE_AVAILABILITY";
-
meta = with lib; {
description = "Tool that generates a compilation database for clang tooling";
longDescription = ''
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/2.8.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/2.8.nix
index 9dabd7b355..ec03e28560 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/2.8.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/2.8.nix
@@ -15,7 +15,8 @@ let
in
stdenv.mkDerivation rec {
- name = "cmake-${os useNcurses "cursesUI-"}${os useQt4 "qt4UI-"}${version}";
+ pname = "cmake${os useNcurses "-cursesUI"}${os useQt4 "-qt4UI"}";
+ inherit version;
inherit majorVersion;
@@ -56,7 +57,7 @@ stdenv.mkDerivation rec {
(concatMap (p: [ (p.dev or p) (p.out or p) ]) buildInputs);
configureFlags = [
- "--docdir=/share/doc/${name}"
+ "--docdir=/share/doc/${pname}-${version}"
"--mandir=/share/man"
"--system-libs"
"--no-system-libarchive"
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix
index 33dbc25d9b..f74d0d4690 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix
@@ -71,6 +71,7 @@ stdenv.mkDerivation rec {
'';
configureFlags = [
+ "CXXFLAGS=-Wno-elaborated-enum-base"
"--docdir=share/doc/${pname}${version}"
] ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup
++ lib.optional withQt5 "--qt-gui"
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix
index 229a21797d..b94330d658 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix
@@ -6,7 +6,7 @@ rec {
{ version, nativeVersion, sha256, defaultJava ? jdk8 }:
{ lib, stdenv, fetchurl, makeWrapper, unzip, java ? defaultJava
- , javaToolchains ? [ ] }:
+ , javaToolchains ? [ ], ncurses5, ncurses6 }:
stdenv.mkDerivation rec {
pname = "gradle";
@@ -52,18 +52,25 @@ rec {
fixupPhase = let arch = if stdenv.is64bit then "amd64" else "i386";
in ''
- mkdir patching
- pushd patching
- jar xf $out/lib/gradle/lib/native-platform-linux-${arch}-${nativeVersion}.jar
- patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64" net/rubygrapefruit/platform/linux-${arch}/libnative-platform.so
- jar cf native-platform-linux-${arch}-${nativeVersion}.jar .
- mv native-platform-linux-${arch}-${nativeVersion}.jar $out/lib/gradle/lib/
- popd
+ for variant in "" "-ncurses5" "-ncurses6"; do
+ mkdir "patching$variant"
+ pushd "patching$variant"
+ jar xf $out/lib/gradle/lib/native-platform-linux-${arch}$variant-${nativeVersion}.jar
+ patchelf \
+ --set-rpath "${stdenv.cc.cc.lib}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ncurses5 ncurses6 ]}" \
+ net/rubygrapefruit/platform/linux-${arch}$variant/libnative-platform*.so
+ jar cf native-platform-linux-${arch}$variant-${nativeVersion}.jar .
+ mv native-platform-linux-${arch}$variant-${nativeVersion}.jar $out/lib/gradle/lib/
+ popd
+ done
# The scanner doesn't pick up the runtime dependency in the jar.
# Manually add a reference where it will be found.
mkdir $out/nix-support
echo ${stdenv.cc.cc} > $out/nix-support/manual-runtime-dependencies
+ # Gradle will refuse to start without _both_ 5 and 6 versions of ncurses.
+ echo ${ncurses5} >> $out/nix-support/manual-runtime-dependencies
+ echo ${ncurses6} >> $out/nix-support/manual-runtime-dependencies
'';
meta = with lib; {
@@ -81,7 +88,7 @@ rec {
downloadPage = "https://gradle.org/next-steps/?version=${version}";
license = licenses.asl20;
platforms = platforms.unix;
- maintainers = with maintainers; [ lorenzleutgeb ];
+ maintainers = with maintainers; [ lorenzleutgeb liff ];
};
};
diff --git a/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix b/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix
index cd2365ef86..c10e5e7f45 100644
--- a/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "pack";
- version = "0.22.0";
+ version = "0.23.0";
src = fetchFromGitHub {
owner = "buildpacks";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-ddJqHHunh8NSFJel7hCqkji8iYExytZ1phI8jxDMuPM=";
+ sha256 = "sha256-dtDciyQyTYhgYwqRCcxV0kAbPMl3KXhDM0BelPTWymA=";
};
- vendorSha256 = "sha256-PnZRyxRV/umJCS3L/GknqwcBedJVb2kRlVjiRgJoIuc=";
+ vendorSha256 = "sha256-mIXt3rWXQ6lVbV4hT7KRK7VZ4iFuDX6kZjgoE1WvJxI=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/cloudsmith-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/cloudsmith-cli/default.nix
index 8d36c89908..c58455ac24 100644
--- a/third_party/nixpkgs/pkgs/development/tools/cloudsmith-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/cloudsmith-cli/default.nix
@@ -4,14 +4,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "cloudsmith-cli";
- version = "0.26.0";
+ version = "0.31.1";
format = "wheel";
src = python3.pkgs.fetchPypi {
pname = "cloudsmith_cli";
inherit format version;
- sha256 = "c2W5+z+X4oRZxlNhB6for4mN4NeBX9MtEtmXhU5sz4A=";
+ sha256 = "sha256-r8h0fHePZoqy/oFOedkwAke0b+Huasuv+sWcL92EZ+k=";
};
propagatedBuildInputs = with python3.pkgs; [
diff --git a/third_party/nixpkgs/pkgs/development/tools/datree/default.nix b/third_party/nixpkgs/pkgs/development/tools/datree/default.nix
index 4950dca5ad..7da576555e 100644
--- a/third_party/nixpkgs/pkgs/development/tools/datree/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/datree/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "datree";
- version = "0.14.49";
+ version = "0.14.62";
src = fetchFromGitHub {
owner = "datreeio";
repo = "datree";
rev = version;
- sha256 = "0m126jjklkwiwzg44xkii9gx0pmhqm7xdj0hblsrp09jnym7rjns";
+ sha256 = "sha256-yNq3GRovFm0OlYNJJGjTe5AqKG9J4I+igJ/WVNLWdKI=";
};
- vendorSha256 = "0msgq7bmy424bcyx23srjs7w2bck4b7zad8mi8l3j20ajya3amaa";
+ vendorSha256 = "sha256-SlU1lJcKCDkoihU19c8iky3Bj5ZZD9E9W0QQX9fBT1c=";
ldflags = [
"-s"
diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/default.nix b/third_party/nixpkgs/pkgs/development/tools/electron/default.nix
index 30ba6db530..a09bd4a99d 100644
--- a/third_party/nixpkgs/pkgs/development/tools/electron/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/electron/default.nix
@@ -125,33 +125,33 @@ rec {
headers = "0v1n8izy83qq3ljs6191a7mzr6nnda5ib9ava1cjddkshl8pampq";
};
- electron_14 = mkElectron "14.2.2" {
- armv7l-linux = "185613c0141fb57b716a0fe421aab91100586fb312a92c66785b956f54451b92";
- aarch64-linux = "8e54ef999d85454d0fa1679bece3143a72086e540eb910f4f2a8a84ea07ef003";
- x86_64-linux = "e419d1fb786f828aa3f679647e7ece889a6dcc830612909c45f4adc2f976348a";
- i686-linux = "76e77d9e45c8d94605313bba1fea87c0b76f2f95c317ef2470cc4f4d88f1b195";
- x86_64-darwin = "117377067dc5afca00db6380461c98870632cbcb97dc5dcc8aa015a9f42b969d";
- aarch64-darwin = "ac03eb8fa1781e675b5a55d83438184d86e5faa6b93d008796fa8f151a31fd14";
- headers = "0l2mwi1cn1v7pnl3l56mq0qi8cif39r5s2lkgzi2nsr71qr9f369";
+ electron_14 = mkElectron "14.2.3" {
+ armv7l-linux = "d4ed85690c49b6ec1b532256bd63ccfb670d14da9bb5ccf706e03da2f5fe377e";
+ aarch64-linux = "ac8be1a06ad4b3da16438cc9c257b3c443417d5d9272830b0d51c1f2c9b14f52";
+ x86_64-linux = "c72ce5943e9e5e9b10b0822b3e60de74612db81c4ebaf475e5fa8735af344b22";
+ i686-linux = "9dec585682c0a08f048f1eda6a931cad3c85d47842786aae565af930a7ef7b51";
+ x86_64-darwin = "fb90d61855b63ac1115a60683d476931a6b6bf194e77867192d927bbb9051070";
+ aarch64-darwin = "035e6e2e8d50e867eee37b0631fc95b3f0e8760294af71c23bc73c0f3fc99f83";
+ headers = "0m03nb1nlwd03wn765rs06yiqzkxlk9jafab0zaxywsq94z5np0y";
};
- electron_15 = mkElectron "15.3.3" {
- armv7l-linux = "658d72e65891191dd47f9d93b56406401c0c425d1d1941ff6f78c33660426398";
- aarch64-linux = "27fd7a94ab09d2ad2e4907e9df587ed40060065f7e867552b77da2302abdcc0f";
- x86_64-linux = "88dc16239f4821bee8674ef79c3ebab36a263638ec660b4b84ce38b9ad8d4f7a";
- i686-linux = "61dabd62dfb5a74bdd07291c20d96fc4dc895b72a65ca5b1aab15c17e20cd6d5";
- x86_64-darwin = "c556d993d8be7064c7014e877cbd8a3d057052c4bc37599a203f4c4a9fe8793f";
- aarch64-darwin = "14f7672ab31d47ef1a38f96cdaf76eef79293b3e3594be67eded90d7dcd27a8e";
- headers = "0vfv3yapjrmlg3rabl7iwq08h1mnij0mr5p8jilhfylmyjsalgbg";
+ electron_15 = mkElectron "15.3.4" {
+ armv7l-linux = "caff953cbffdac63307b75a3b78be82ea6003782e981edfdcba14da5ee48b8b6";
+ aarch64-linux = "dba1e09b3e4924148b57539d86840fa22e5500f3e15a694dcd2e26b830c1f780";
+ x86_64-linux = "5e13b64c3b1b025ddea92b3bda577e00fc533902a9cf92bfd87b976637f7b59a";
+ i686-linux = "1253e837e98fc41c14f6b71f0f917b8f42a0777bd2554046567b512f747240d8";
+ x86_64-darwin = "ea1cb757f9c8c4c99c840357ecab42a0bcbe8c7a6a3a1265106c238088ad18f1";
+ aarch64-darwin = "65b9b3235efdb681e3a4db85068dc9fe6dfbcb7fbb146053c0a534e4b44a2f7a";
+ headers = "1xnbzskvf8p5a07bha41qqnw1hb68f019qrda3z2jn96m3qnj46r";
};
- electron_16 = mkElectron "16.0.4" {
- armv7l-linux = "f077c8a2ee0ea2a02fc2a45902e2b13fcf0ba80a9859ab8967302f5f0bdcc406";
- aarch64-linux = "ac47ece501e8844e03d2abab99afc27952c194f11a039107bb7620bee683f95d";
- x86_64-linux = "47fada0883bd62a5f47831abf70f5d41f44559de576e44accedf8489e8c5dd6b";
- i686-linux = "825cda3a9c89c5f44990f1e68f25d7871d04277468ccbc9cc29a1472b81d5fa2";
- x86_64-darwin = "0a4621c1137ce158cf396af30b732df72fa61a4ea04bc55d3d9f9915267fe8e9";
- aarch64-darwin = "0c047fd840bc7d77d36d3b0c4a6b6b8331ce0786527fa33455a7b3ee47eb0020";
- headers = "11fni4ax71c1p6yhdl402r2884anyzwd1iw8dypwvrs7gcd913k2";
+ electron_16 = mkElectron "16.0.5" {
+ armv7l-linux = "16381d22f6f3c7990435598fc50addf8addde2fa749ab23672733ec90b8d53ef";
+ aarch64-linux = "6274bdf2a3894ce9ddb70800df497a034893e1be5e2d07763e339550009d53b6";
+ x86_64-linux = "2830a9f8fc5e7fa4f70997e11d55b250e90db511b29da22699e1fe23b153128c";
+ i686-linux = "363e2588f57f3d31e506e759f723768b543baf248dfb518d06747ffa0a8d8ab1";
+ x86_64-darwin = "0bb7f2c506d8c3e9ef7ec4049baf87a3365cbf80c569f6eb98ddc1a2ddb653e6";
+ aarch64-darwin = "de4eac412a942a0b238792a38c0c80691d1a7ef2eba850c15619c0db9da89f1a";
+ headers = "1pdi86sq60z9bqd81fvgl14c3bk21wk9mwkqyn653yq4zk0mqpi5";
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/frugal/default.nix b/third_party/nixpkgs/pkgs/development/tools/frugal/default.nix
index 8ad529b42d..0fc0abca7b 100644
--- a/third_party/nixpkgs/pkgs/development/tools/frugal/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/frugal/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "frugal";
- version = "3.14.10";
+ version = "3.14.11";
src = fetchFromGitHub {
owner = "Workiva";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-K/Nptw0AEP7awS/xXCg6T2Ff3WQc7fKTUB/uEg1WOA4=";
+ sha256 = "sha256-XUG9Md6T0/+yn3KGqJO09FFlpuli2wJqOf/SEIVKXac=";
};
subPackages = [ "." ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix b/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix
index 4cc9722ed4..0e9474e4f3 100644
--- a/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "hcloud";
- version = "1.28.1";
+ version = "1.29.0";
src = fetchFromGitHub {
owner = "hetznercloud";
repo = "cli";
rev = "v${version}";
- sha256 = "sha256-gEXQaVBzvOifnCN8TWfadTgypHy+u7lZw+qoyW+mEKU=";
+ sha256 = "sha256-B5L4vK5JkcYHqdyxAsP+tBcA6PtM2Gd4JwtW5nMuIXQ=";
};
nativeBuildInputs = [ installShellFiles ];
- vendorSha256 = "sha256-SURFlHCrWqTjdHO9ZUmtR2nmKwt0S7rpA6jQ0dDD/EE=";
+ vendorSha256 = "sha256-3YU6vAIzTzkEwyMPH4QSUuQ1PQlrWnfRRCA1fHMny48=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/automake/automake-1.16.x.nix b/third_party/nixpkgs/pkgs/development/tools/misc/automake/automake-1.16.x.nix
index 4547f745a9..89a5b48790 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/automake/automake-1.16.x.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/automake/automake-1.16.x.nix
@@ -1,13 +1,12 @@
{ lib, stdenv, fetchurl, perl, autoconf }:
stdenv.mkDerivation rec {
- # When updating, beware of https://github.com/NixOS/nixpkgs/pull/131928#issuecomment-896614165
pname = "automake";
- version = "1.16.3";
+ version = "1.16.5";
src = fetchurl {
url = "mirror://gnu/automake/automake-${version}.tar.xz";
- sha256 = "0fmz2fhmzcpacnprl5msphvaflwiy0hvpgmqlgfny72ddijzfazz";
+ sha256 = "0sdl32qxdy7m06iggmkkvf7j520rmmgbsjzbm7fgnxwxdp6mh7gh";
};
nativeBuildInputs = [ autoconf perl ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix
index 62290548ec..c173b96f6e 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, targetPackages
# Build time
-, fetchurl, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages
+, fetchurl, fetchpatch, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages
# Run time
, ncurses, readline, gmp, mpfr, expat, libipt, zlib, dejagnu, sourceHighlight
@@ -41,6 +41,13 @@ stdenv.mkDerivation rec {
patches = [
./debug-info-from-env.patch
+
+ # Pull upstream fix for gcc-12. Will be included in gdb-12.
+ (fetchpatch {
+ name = "gcc-12.patch";
+ url = "https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=e97436b1b789dcdb6ffb502263f4c86f8bc22996";
+ sha256 = "1mpgw6s9qgnwhwyg3hagc6vhqhvia0l1s8nr22bcahwqxi3wvzcw";
+ })
] ++ lib.optionals stdenv.isDarwin [
./darwin-target-match.patch
];
diff --git a/third_party/nixpkgs/pkgs/development/tools/packer/default.nix b/third_party/nixpkgs/pkgs/development/tools/packer/default.nix
index aea34c5d57..6c7fdda336 100644
--- a/third_party/nixpkgs/pkgs/development/tools/packer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/packer/default.nix
@@ -1,4 +1,9 @@
-{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
+{ lib
+, stdenv
+, buildGoModule
+, fetchFromGitHub
+, installShellFiles
+}:
buildGoModule rec {
pname = "packer";
@@ -30,5 +35,6 @@ buildGoModule rec {
maintainers = with maintainers; [ cstrahan zimbatm ma27 ];
changelog = "https://github.com/hashicorp/packer/blob/v${version}/CHANGELOG.md";
platforms = platforms.unix;
+ broken = stdenv.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/antlr/4.9.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/antlr/4.9.nix
new file mode 100644
index 0000000000..efc478ecd9
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/antlr/4.9.nix
@@ -0,0 +1,95 @@
+{ lib, stdenv, fetchurl, jre
+, fetchpatch, fetchFromGitHub, cmake, ninja, pkg-config, libuuid, utf8cpp, darwin }:
+
+let
+ version = "4.9.2";
+ source = fetchFromGitHub {
+ owner = "antlr";
+ repo = "antlr4";
+ rev = version;
+ sha256 = "0rpqgl2y22iiyg42y8jyiy2g7x421yf0q16cf17j76iai6y0bm5p";
+ };
+
+ runtime = {
+ cpp = stdenv.mkDerivation {
+ pname = "antlr-runtime-cpp";
+ inherit version;
+ src = source;
+
+ outputs = [ "out" "dev" "doc" ];
+
+ patches = [
+ (fetchpatch {
+ name = "use-utfcpp-from-system.patch";
+ url = "https://github.com/antlr/antlr4/commit/5a808b470e1314b63b0a921178040ccabb357945.patch";
+ sha256 = "0nq7iajy9inllcspyqpxskfg3k5s1fwm7ph75i8lfc25rl35k1w7";
+ })
+ ];
+
+ patchFlags = [ "-p3" ];
+
+ nativeBuildInputs = [ cmake ninja pkg-config ];
+ buildInputs = [ utf8cpp ]
+ ++ lib.optional stdenv.isLinux libuuid
+ ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreFoundation;
+
+ postUnpack = ''
+ export sourceRoot=$sourceRoot/runtime/Cpp
+ '';
+
+ meta = with lib; {
+ description = "C++ target for ANTLR 4";
+ homepage = "https://www.antlr.org/";
+ license = licenses.bsd3;
+ platforms = platforms.unix;
+ };
+ };
+ };
+
+ antlr = stdenv.mkDerivation {
+ pname = "antlr";
+ inherit version;
+
+ src = fetchurl {
+ url = "https://www.antlr.org/download/antlr-${version}-complete.jar";
+ sha256 = "1k9pw5gv2zhh06n1vys76kchlz4mz0vgv3iiba8w47b9fqa7n4dv";
+ };
+
+ dontUnpack = true;
+
+ installPhase = ''
+ mkdir -p "$out"/{share/java,bin}
+ cp "$src" "$out/share/java/antlr-${version}-complete.jar"
+
+ echo "#! ${stdenv.shell}" >> "$out/bin/antlr"
+ echo "'${jre}/bin/java' -cp '$out/share/java/antlr-${version}-complete.jar:$CLASSPATH' -Xmx500M org.antlr.v4.Tool \"\$@\"" >> "$out/bin/antlr"
+
+ echo "#! ${stdenv.shell}" >> "$out/bin/grun"
+ echo "'${jre}/bin/java' -cp '$out/share/java/antlr-${version}-complete.jar:$CLASSPATH' org.antlr.v4.gui.TestRig \"\$@\"" >> "$out/bin/grun"
+
+ chmod a+x "$out/bin/antlr" "$out/bin/grun"
+ ln -s "$out/bin/antlr"{,4}
+ '';
+
+ inherit jre;
+
+ passthru = {
+ inherit runtime;
+ jarLocation = "${antlr}/share/java/antlr-${version}-complete.jar";
+ };
+
+ meta = with lib; {
+ description = "Powerful parser generator";
+ longDescription = ''
+ ANTLR (ANother Tool for Language Recognition) is a powerful parser
+ generator for reading, processing, executing, or translating structured
+ text or binary files. It's widely used to build languages, tools, and
+ frameworks. From a grammar, ANTLR generates a parser that can build and
+ walk parse trees.
+ '';
+ homepage = "https://www.antlr.org/";
+ license = licenses.bsd3;
+ platforms = platforms.unix;
+ };
+ };
+in antlr
diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
index dae0a02b61..c33cef279b 100644
--- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
@@ -5,7 +5,7 @@
}:
let
# Poetry2nix version
- version = "1.21.0";
+ version = "1.22.0";
inherit (poetryLib) isCompatible readTOML moduleName;
@@ -211,7 +211,7 @@ lib.makeScope pkgs.newScope (self: {
__toPluginAble = toPluginAble self;
- inherit (hooks) pipBuildHook removePathDependenciesHook poetry2nixFixupHook wheelUnpackHook;
+ inherit (hooks) pipBuildHook removePathDependenciesHook removeGitDependenciesHook poetry2nixFixupHook wheelUnpackHook;
} // lib.optionalAttrs (! super ? setuptools-scm) {
# The canonical name is setuptools-scm
setuptools-scm = super.setuptools_scm;
@@ -313,7 +313,10 @@ lib.makeScope pkgs.newScope (self: {
app = py.pkgs.buildPythonPackage (
passedAttrs // inputAttrs // {
- nativeBuildInputs = inputAttrs.nativeBuildInputs ++ [ py.pkgs.removePathDependenciesHook ];
+ nativeBuildInputs = inputAttrs.nativeBuildInputs ++ [
+ py.pkgs.removePathDependenciesHook
+ py.pkgs.removeGitDependenciesHook
+ ];
} // {
pname = moduleName pyProject.tool.poetry.name;
version = pyProject.tool.poetry.version;
diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix
index a66989f70e..0abbe24599 100644
--- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix
@@ -21,9 +21,28 @@ in
substitutions = {
inherit pythonInterpreter;
yj = "${buildPackages.yj}/bin/yj";
- pyprojectPatchScript = "${./pyproject-without-path.py}";
+ pyprojectPatchScript = "${./pyproject-without-special-deps.py}";
+ fields = [ "path" ];
+ kind = "path";
};
- } ./remove-path-dependencies.sh
+ } ./remove-special-dependencies.sh
+ )
+ { };
+
+ removeGitDependenciesHook = callPackage
+ ({}:
+ makeSetupHook
+ {
+ name = "remove-git-dependencies.sh";
+ deps = [ ];
+ substitutions = {
+ inherit pythonInterpreter;
+ yj = "${buildPackages.yj}/bin/yj";
+ pyprojectPatchScript = "${./pyproject-without-special-deps.py}";
+ fields = [ "git" "branch" "rev" "tag" ];
+ kind = "git";
+ };
+ } ./remove-special-dependencies.sh
)
{ };
diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-path.py b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-path.py
deleted file mode 100644
index 5d8fbcfe6b..0000000000
--- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-path.py
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env python
-# Patch out path dependencies from a pyproject.json file
-
-import json
-import sys
-
-data = json.load(sys.stdin)
-
-
-def get_deep(o, path):
- for p in path.split('.'):
- o = o.get(p, {})
- return o
-
-
-for dep in get_deep(data, 'tool.poetry.dependencies').values():
- if isinstance(dep, dict):
- try:
- del dep['path'];
- except KeyError:
- pass
- else:
- dep['version'] = '*'
-
-json.dump(data, sys.stdout, indent=4)
diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-special-deps.py b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-special-deps.py
new file mode 100644
index 0000000000..af9816cf83
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-special-deps.py
@@ -0,0 +1,52 @@
+#!/usr/bin/env python
+# Patch out special dependencies (git and path) from a pyproject.json file
+
+import argparse
+import json
+import sys
+
+
+def main(input, output, fields_to_remove):
+ data = json.load(input)
+
+ try:
+ deps = data["tool"]["poetry"]["dependencies"]
+ except KeyError:
+ pass
+ else:
+ for dep in deps.values():
+ if isinstance(dep, dict):
+ any_removed = False
+ for field in fields_to_remove:
+ any_removed |= dep.pop(field, None) is not None
+ if any_removed:
+ dep["version"] = "*"
+
+ json.dump(data, output, separators=(",", ":"))
+
+
+if __name__ == "__main__":
+ p = argparse.ArgumentParser()
+ p.add_argument(
+ "-i",
+ "--input",
+ type=argparse.FileType("r"),
+ default=sys.stdin,
+ help="Location from which to read input JSON",
+ )
+ p.add_argument(
+ "-o",
+ "--output",
+ type=argparse.FileType("w"),
+ default=sys.stdout,
+ help="Location to write output JSON",
+ )
+ p.add_argument(
+ "-f",
+ "--fields-to-remove",
+ nargs="+",
+ help="The fields to remove from the dependency's JSON",
+ )
+
+ args = p.parse_args()
+ main(args.input, args.output, args.fields_to_remove)
diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-path-dependencies.sh b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-path-dependencies.sh
deleted file mode 100644
index b22a05900a..0000000000
--- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-path-dependencies.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-remove-path-dependencies-hook() {
- if ! test -f pyproject.toml; then
- return
- fi
-
- # Tell poetry not to resolve the path dependencies. Any version is fine!
- @yj@ -tj < pyproject.toml | @pythonInterpreter@ @pyprojectPatchScript@ > pyproject.json
- @yj@ -jt < pyproject.json > pyproject.toml
- rm pyproject.json
-}
-
-postPatchHooks+=(remove-path-dependencies-hook)
diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-special-dependencies.sh b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-special-dependencies.sh
new file mode 100644
index 0000000000..2d37667d6f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-special-dependencies.sh
@@ -0,0 +1,20 @@
+remove-@kind@-dependencies-hook() {
+ if ! test -f pyproject.toml; then
+ return
+ fi
+
+ echo "Removing @kind@ dependencies"
+
+ # Tell poetry not to resolve special dependencies. Any version is fine!
+ @yj@ -tj < pyproject.toml | \
+ @pythonInterpreter@ \
+ @pyprojectPatchScript@ \
+ --fields-to-remove @fields@ > pyproject.json
+ @yj@ -jt < pyproject.json > pyproject.toml
+
+ rm pyproject.json
+
+ echo "Finished removing @kind@ dependencies"
+}
+
+postPatchHooks+=(remove-@kind@-dependencies-hook)
diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix
index f99ee3a26d..5735e320c0 100644
--- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix
@@ -119,8 +119,10 @@ pythonPackages.callPackage
pythonPackages.poetry2nixFixupHook
]
++ lib.optional (!isSource && (getManyLinuxDeps fileInfo.name).str != null) autoPatchelfHook
- ++ lib.optional (format == "pyproject") pythonPackages.removePathDependenciesHook
- ;
+ ++ lib.optionals (format == "pyproject") [
+ pythonPackages.removePathDependenciesHook
+ pythonPackages.removeGitDependenciesHook
+ ];
buildInputs = (
baseBuildInputs
diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
index e464a08c84..199e5905f0 100644
--- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
@@ -73,7 +73,6 @@ self: super:
astroid = super.astroid.overridePythonAttrs (
old: rec {
buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ];
- doCheck = false;
}
);
@@ -162,6 +161,14 @@ self: super:
}
);
+ cloudflare = super.cloudflare.overridePythonAttrs (
+ old: {
+ postPatch = ''
+ rm -rf examples/*
+ '';
+ }
+ );
+
colour = super.colour.overridePythonAttrs (
old: {
buildInputs = (old.buildInputs or [ ]) ++ [ self.d2to1 ];
@@ -184,10 +191,22 @@ self: super:
old: {
nativeBuildInputs = (old.nativeBuildInputs or [ ])
++ lib.optional (lib.versionAtLeast old.version "3.4") [ self.setuptools-rust ]
- ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) self.python.pythonForBuild.pkgs.cffi;
+ ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) self.python.pythonForBuild.pkgs.cffi
+ ++ lib.optional (lib.versionAtLeast old.version "3.5")
+ (with pkgs.rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]);
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openssl ];
} // lib.optionalAttrs (lib.versionAtLeast old.version "3.4" && lib.versionOlder old.version "3.5") {
CRYPTOGRAPHY_DONT_BUILD_RUST = "1";
+ } // lib.optionalAttrs (lib.versionAtLeast old.version "3.5") rec {
+ cargoDeps = pkgs.rustPlatform.fetchCargoTarball {
+ src = old.src;
+ sourceRoot = "${old.pname}-${old.version}/${cargoRoot}";
+ name = "${old.pname}-${old.version}";
+ # This hash could no longer be valid for cryptography versions
+ # different from 3.5.0
+ sha256 = "sha256-tQoQfo+TAoqAea86YFxyj/LNQCiViu5ij/3wj7ZnYLI=";
+ };
+ cargoRoot = "src/rust";
}
);
@@ -345,6 +364,12 @@ self: super:
}
);
+ filelock = super.filelock.overridePythonAttrs (old: {
+ postPatch = ''
+ substituteInPlace setup.py --replace 'setup()' 'setup(version="${old.version}")'
+ '';
+ });
+
fiona = super.fiona.overridePythonAttrs (
old: {
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.gdal_2 ];
@@ -845,7 +870,10 @@ self: super:
# is64bit: unfortunately the build would exhaust all possible memory on i686-linux.
stdenv.buildPlatform.is64bit
# Derivation fails to build since v0.900 if mypyc is enabled.
- && lib.strings.versionOlder old.version "0.900";
+ && (
+ lib.strings.versionOlder old.version "0.900"
+ || lib.strings.versionAtLeast old.version "0.910"
+ );
}
);
@@ -968,28 +996,6 @@ self: super:
}
);
- # Work around https://github.com/nix-community/poetry2nix/issues/244
- # where git deps are not picked up as they should
- pip =
- if lib.versionAtLeast super.pip.version "20.3" then
- super.pip.overridePythonAttrs
- (old:
- let
- pname = "pip";
- version = "20.2.4";
- in
- {
- name = pname + "-" + version;
- inherit version;
- src = pkgs.fetchFromGitHub {
- owner = "pypa";
- repo = pname;
- rev = version;
- sha256 = "eMVV4ftgV71HLQsSeaOchYlfaJVgzNrwUynn3SA1/Do=";
- name = "${pname}-${version}-source";
- };
- }) else super.pip;
-
platformdirs = super.platformdirs.overridePythonAttrs (old: {
postPatch = ''
substituteInPlace setup.py --replace 'setup()' 'setup(version="${old.version}")'
@@ -1201,7 +1207,6 @@ self: super:
pylint = super.pylint.overridePythonAttrs (
old: {
buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ];
- doCheck = false;
}
);
@@ -1369,7 +1374,6 @@ self: super:
postPatch = old.postPatch or "" + ''
sed -i '/\[metadata\]/aversion = ${old.version}' setup.cfg
'';
- doCheck = false;
}
);
@@ -1700,7 +1704,7 @@ self: super:
if (!enableCuda) then ''
export USE_CUDA=0
'' else ''
- export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${cudatoolkit}/targets/x86_64-linux/lib"
+ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${cudatoolkit}/targets/x86_64-linux/lib"
'';
preFixup = lib.optionalString (!enableCuda) ''
# For some reason pytorch retains a reference to libcuda even if it
@@ -1739,9 +1743,9 @@ self: super:
];
preConfigure =
if (enableCuda) then ''
- export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${self.torch}/${self.python.sitePackages}/torch/lib:${lib.makeLibraryPath [ cudatoolkit "${cudatoolkit}" ]}"
+ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${self.torch}/${self.python.sitePackages}/torch/lib:${lib.makeLibraryPath [ cudatoolkit "${cudatoolkit}" ]}"
'' else ''
- export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${self.torch}/${self.python.sitePackages}/torch/lib"
+ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${self.torch}/${self.python.sitePackages}/torch/lib"
'';
}))
{ };
@@ -1854,13 +1858,14 @@ self: super:
if lib.versionAtLeast super.zipp.version "2.0.0" then
(
super.zipp.overridePythonAttrs (
- old: {
+ old:
+ if (old.format or "pyproject") != "wheel" then {
prePatch = ''
substituteInPlace setup.py --replace \
'setuptools.setup()' \
'setuptools.setup(version="${super.zipp.version}")'
'';
- }
+ } else old
)
) else super.zipp
).overridePythonAttrs (
@@ -2080,9 +2085,8 @@ self: super:
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.flit-core ];
});
- virtualenv = super.virtualenv.overridePythonAttrs (old: {
- postPatch = ''
- substituteInPlace setup.cfg --replace 'platformdirs>=2,<3' 'platformdirs'
- '';
+ uwsgi = super.uwsgi.overridePythonAttrs (old: {
+ buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.ncurses ];
+ sourceRoot = ".";
});
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock
index 4f023f8e09..1ed0e52869 100644
--- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock
+++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock
@@ -274,11 +274,15 @@ python-versions = "*"
[[package]]
name = "filelock"
-version = "3.0.12"
+version = "3.2.1"
description = "A platform independent file lock."
category = "main"
optional = false
-python-versions = "*"
+python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
+
+[package.extras]
+docs = ["furo (>=2021.8.17b43)", "sphinx (>=4.1)", "sphinx-autodoc-typehints (>=1.12)"]
+testing = ["coverage (>=4)", "pytest (>=4)", "pytest-cov", "pytest-timeout (>=1.4.2)"]
[[package]]
name = "funcsigs"
@@ -343,7 +347,7 @@ six = "*"
[[package]]
name = "identify"
-version = "2.2.15"
+version = "2.3.0"
description = "File identification library for Python"
category = "dev"
optional = false
@@ -624,7 +628,7 @@ dev = ["pre-commit", "tox"]
[[package]]
name = "poetry-core"
-version = "1.0.6"
+version = "1.0.7"
description = "Poetry PEP 517 Build Backend"
category = "main"
optional = false
@@ -1004,7 +1008,7 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
[[package]]
name = "virtualenv"
-version = "20.8.0"
+version = "20.8.1"
description = "Virtual Python Environment builder"
category = "main"
optional = false
@@ -1296,8 +1300,8 @@ enum34 = [
{file = "enum34-1.1.10.tar.gz", hash = "sha256:cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248"},
]
filelock = [
- {file = "filelock-3.0.12-py3-none-any.whl", hash = "sha256:929b7d63ec5b7d6b71b0fa5ac14e030b3f70b75747cef1b10da9b879fef15836"},
- {file = "filelock-3.0.12.tar.gz", hash = "sha256:18d82244ee114f543149c66a6e0c14e9c4f8a1044b5cdaadd0f82159d6a6ff59"},
+ {file = "filelock-3.2.1-py2.py3-none-any.whl", hash = "sha256:7f07b08d731907441ff40d0c5b81f9512cd968842e0b6264c8bd18a8ce877760"},
+ {file = "filelock-3.2.1.tar.gz", hash = "sha256:9cdd29c411ab196cf4c35a1da684f7b9da723696cb356efa45bf5eb1ff313ee3"},
]
funcsigs = [
{file = "funcsigs-1.0.2-py2.py3-none-any.whl", hash = "sha256:330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca"},
@@ -1322,8 +1326,8 @@ httpretty = [
{file = "httpretty-0.9.7.tar.gz", hash = "sha256:66216f26b9d2c52e81808f3e674a6fb65d4bf719721394a1a9be926177e55fbe"},
]
identify = [
- {file = "identify-2.2.15-py2.py3-none-any.whl", hash = "sha256:de83a84d774921669774a2000bf87ebba46b4d1c04775f4a5d37deff0cf39f73"},
- {file = "identify-2.2.15.tar.gz", hash = "sha256:528a88021749035d5a39fe2ba67c0642b8341aaf71889da0e1ed669a429b87f0"},
+ {file = "identify-2.3.0-py2.py3-none-any.whl", hash = "sha256:d1e82c83d063571bb88087676f81261a4eae913c492dafde184067c584bc7c05"},
+ {file = "identify-2.3.0.tar.gz", hash = "sha256:fd08c97f23ceee72784081f1ce5125c8f53a02d3f2716dde79a6ab8f1039fea5"},
]
idna = [
{file = "idna-2.10-py2.py3-none-any.whl", hash = "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"},
@@ -1435,8 +1439,8 @@ pluggy = [
{file = "pluggy-0.13.1.tar.gz", hash = "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"},
]
poetry-core = [
- {file = "poetry-core-1.0.6.tar.gz", hash = "sha256:dd3c97003579242236890306836f2acc86d9741e6bea320dda6f844f16b0d845"},
- {file = "poetry_core-1.0.6-py2.py3-none-any.whl", hash = "sha256:4ef68b4a55a8a95a60e6a312317e5a2f2af7590cf3d46b6bfe648c1e5f13cc48"},
+ {file = "poetry-core-1.0.7.tar.gz", hash = "sha256:98c11c755a16ef6c5673c22ca94a3802a7df4746a0853a70b6fae8b9f5cac206"},
+ {file = "poetry_core-1.0.7-py2.py3-none-any.whl", hash = "sha256:4f8a7f5390d772f42c4c4c3f188e6424b802cb4b57466c6633a1b9ac36f18a43"},
]
pre-commit = [
{file = "pre_commit-2.15.0-py2.py3-none-any.whl", hash = "sha256:a4ed01000afcb484d9eb8d504272e642c4c4099bbad3a6b27e519bd6a3e928a6"},
@@ -1589,8 +1593,8 @@ urllib3 = [
{file = "urllib3-1.25.11.tar.gz", hash = "sha256:8d7eaa5a82a1cac232164990f04874c594c9453ec55eef02eab885aa02fc17a2"},
]
virtualenv = [
- {file = "virtualenv-20.8.0-py2.py3-none-any.whl", hash = "sha256:a4b987ec31c3c9996cf1bc865332f967fe4a0512c41b39652d6224f696e69da5"},
- {file = "virtualenv-20.8.0.tar.gz", hash = "sha256:4da4ac43888e97de9cf4fdd870f48ed864bbfd133d2c46cbdec941fed4a25aef"},
+ {file = "virtualenv-20.8.1-py2.py3-none-any.whl", hash = "sha256:10062e34c204b5e4ec5f62e6ef2473f8ba76513a9a617e873f1f8fb4a519d300"},
+ {file = "virtualenv-20.8.1.tar.gz", hash = "sha256:bcc17f0b3a29670dd777d6f0755a4c04f28815395bca279cdcb213b97199a6b8"},
]
wcwidth = [
{file = "wcwidth-0.2.5-py2.py3-none-any.whl", hash = "sha256:beb4802a9cebb9144e99086eff703a642a13d6a0052920003a230f3294bbe784"},
diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml
index eb11360fe1..1f3abae07e 100644
--- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml
+++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml
@@ -1,6 +1,6 @@
[tool.poetry]
name = "poetry"
-version = "1.1.10"
+version = "1.1.11"
description = "Python dependency management and packaging made easy."
authors = [
"Sébastien Eustace "
@@ -24,7 +24,7 @@ classifiers = [
[tool.poetry.dependencies]
python = "~2.7 || ^3.5"
-poetry-core = "~1.0.6"
+poetry-core = "~1.0.7"
cleo = "^0.8.1"
clikit = "^0.6.2"
crashtest = { version = "^0.3.0", python = "^3.6" }
diff --git a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json
index 2973014f91..deb0c2552d 100644
--- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json
+++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json
@@ -1,7 +1,7 @@
{
"owner": "python-poetry",
"repo": "poetry",
- "rev": "ebc5484d72fb719a6ffe949cbe95acd98f5c249b",
- "sha256": "S2HwolO7cU2c90ZcxPEiGjQ5PrOzZ6US22WLcWUJ0R8=",
+ "rev": "10d555984485088cf5d55979c1b235286de8e456",
+ "sha256": "ncZPVqW/z76BNHAZ1+xM1DNqt41z1QSFY9tqsdUbfrg=",
"fetchSubmodules": true
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/vala-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/vala-language-server/default.nix
index 1d211e55ad..fc7af67266 100644
--- a/third_party/nixpkgs/pkgs/development/tools/vala-language-server/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/vala-language-server/default.nix
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "vala-language-server";
- version = "0.48.3";
+ version = "0.48.4";
src = fetchFromGitHub {
owner = "Prince781";
repo = pname;
rev = version;
- sha256 = "sha256-MhVwK4RtEAJcwcJe71ganCaXQHa9jzxyknzc9kJi274=";
+ sha256 = "sha256-vCQ/j0DxG9sSEquPh9TtZ5hTADPh0d8sDIDSJdUDK4s=";
};
passthru = {
diff --git a/third_party/nixpkgs/pkgs/development/tools/vala-lint/default.nix b/third_party/nixpkgs/pkgs/development/tools/vala-lint/default.nix
index e91bceeae7..9e6962dca3 100644
--- a/third_party/nixpkgs/pkgs/development/tools/vala-lint/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/vala-lint/default.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
+, fetchpatch
, glib
, meson
, ninja
@@ -9,19 +10,30 @@
, vala
, gettext
, wrapGAppsHook
+, unstableGitUpdater
}:
stdenv.mkDerivation rec {
- pname = "vala-lint-unstable";
- version = "2021-02-17";
+ pname = "vala-lint";
+ version = "unstable-2021-11-18";
src = fetchFromGitHub {
owner = "vala-lang";
repo = "vala-lint";
- rev = "5b06cc2341ae7e9f7f8c35c542ef78c36e864c30";
- sha256 = "KwJ5sCp9ZrrxIqc6qi2+ZdHBt1esNOO1+uDkS+d9mW8=";
+ rev = "2db018056befba76136e6c69a78d905a128a6165";
+ sha256 = "sha256-bQaj2bETzl6ykgrpE2iLAvx691aGDLFteL/ulfoKuEk=";
};
+ patches = [
+ # Fix build against vala-0.54.3+. Pull fix pending upstream
+ # inclusion: https://github.com/vala-lang/vala-lint/pull/155
+ (fetchpatch {
+ name = "vala-0.54.patch";
+ url = "https://github.com/vala-lang/vala-lint/commit/739f9a0b7d3e92db41eb32f2bfa527efdacc223b.patch";
+ sha256 = "sha256-1IbQu3AQXRCrrjoMZKhEOqzExmPAo1SQOFHa/IrqnNA=";
+ })
+ ];
+
nativeBuildInputs = [
gettext
meson
@@ -37,6 +49,12 @@ stdenv.mkDerivation rec {
doCheck = true;
+ passthru = {
+ updateScript = unstableGitUpdater {
+ url = "https://github.com/vala-lang/vala-lint.git";
+ };
+ };
+
meta = with lib; {
homepage = "https://github.com/vala-lang/vala-lint";
description = "Check Vala code files for code-style errors";
@@ -47,5 +65,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = teams.pantheon.members;
+ mainProgram = "io.elementary.vala-lint";
};
}
diff --git a/third_party/nixpkgs/pkgs/games/openrw/default.nix b/third_party/nixpkgs/pkgs/games/openrw/default.nix
index f1bcab2895..95ec3d64cf 100644
--- a/third_party/nixpkgs/pkgs/games/openrw/default.nix
+++ b/third_party/nixpkgs/pkgs/games/openrw/default.nix
@@ -28,6 +28,11 @@ stdenv.mkDerivation {
fetchSubmodules = true;
};
+ postPatch = lib.optional (stdenv.cc.isClang && (lib.versionAtLeast stdenv.cc.version "9"))''
+ substituteInPlace cmake_configure.cmake \
+ --replace 'target_link_libraries(rw_interface INTERFACE "stdc++fs")' ""
+ '';
+
nativeBuildInputs = [ cmake ];
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/games/warzone2100/default.nix b/third_party/nixpkgs/pkgs/games/warzone2100/default.nix
index 06ed245c5f..e5656e50de 100644
--- a/third_party/nixpkgs/pkgs/games/warzone2100/default.nix
+++ b/third_party/nixpkgs/pkgs/games/warzone2100/default.nix
@@ -26,6 +26,9 @@
, vulkan-loader
, shaderc
+, testVersion
+, warzone2100
+
, withVideos ? false
}:
@@ -39,11 +42,11 @@ in
stdenv.mkDerivation rec {
inherit pname;
- version = "4.2.3";
+ version = "4.2.4";
src = fetchurl {
url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz";
- sha256 = "sha256-nmHl/Qk8Knck9kDF8cuPUzOUxNNx0Vk/g1NW/H82vo0=";
+ sha256 = "sha256-IkD1WkeKas9qtUUTTo9w4cEoGAoX+d+Cr2C5PTUFaEg=";
};
buildInputs = [
@@ -100,6 +103,14 @@ stdenv.mkDerivation rec {
cp ${sequences_src} $out/share/warzone2100/sequences.wz
'';
+ passthru.tests = {
+ version = testVersion {
+ package = warzone2100;
+ # The command always exits with code 1
+ command = "(warzone2100 --version || [ $? -eq 1 ])";
+ };
+ };
+
meta = with lib; {
description = "A free RTS game, originally developed by Pumpkin Studios";
longDescription = ''
diff --git a/third_party/nixpkgs/pkgs/misc/cups/0001-TargetConditionals.patch b/third_party/nixpkgs/pkgs/misc/cups/0001-TargetConditionals.patch
new file mode 100644
index 0000000000..42cd4c051d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/misc/cups/0001-TargetConditionals.patch
@@ -0,0 +1,29 @@
+From 1204c841999808ba27267a0039777dcbccdcd6e3 Mon Sep 17 00:00:00 2001
+From: toonn
+Date: Sun, 27 Jun 2021 12:30:08 +0200
+Subject: [PATCH] TargetConditionals
+
+---
+ test/ippserver.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/test/ippserver.c b/test/ippserver.c
+index 38b304f..68ccab1 100644
+--- a/test/ippserver.c
++++ b/test/ippserver.c
+@@ -25,7 +25,11 @@
+ * Include necessary headers...
+ */
+
+-#include /* CUPS configuration header */
++#ifdef __APPLE__
++# include /* CUPS configuration header macOS */
++#else
++# include /* CUPS configuration header */
++#endif /* __APPLE__ */
+ #include /* Public API */
+ #include /* CUPS string functions */
+ #include /* For multithreading functions */
+--
+2.17.2 (Apple Git-113)
+
diff --git a/third_party/nixpkgs/pkgs/misc/cups/default.nix b/third_party/nixpkgs/pkgs/misc/cups/default.nix
index 1d467f0a53..bbada33054 100644
--- a/third_party/nixpkgs/pkgs/misc/cups/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/cups/default.nix
@@ -40,6 +40,8 @@ stdenv.mkDerivation rec {
outputs = [ "out" "lib" "dev" "man" ];
+ patches = lib.optional (version == "2.2.6") ./0001-TargetConditionals.patch;
+
postPatch = ''
substituteInPlace cups/testfile.c \
--replace 'cupsFileFind("cat", "/bin' 'cupsFileFind("cat", "${coreutils}/bin'
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libc/0001-Define-TARGET_OS_EMBEDDED-in-std-lib-io-if-not-defin.patch b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libc/0001-Define-TARGET_OS_EMBEDDED-in-std-lib-io-if-not-defin.patch
new file mode 100644
index 0000000000..2ba67734c5
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libc/0001-Define-TARGET_OS_EMBEDDED-in-std-lib-io-if-not-defin.patch
@@ -0,0 +1,47 @@
+From 187d0e8847d080790b22724352e51de50d214dd8 Mon Sep 17 00:00:00 2001
+From: toonn
+Date: Tue, 27 Jul 2021 15:12:14 +0200
+Subject: [PATCH] Define TARGET_OS_EMBEDDED in std{lib,io} if not defined
+
+Originally attempted including `TargetConditionals.h` but this had
+knock-on effects, for example, breaking the zlib build because of
+`TARGET_OS_MAC` getting defined.
+
+This should be the lowest impact solution and corresponds to the default
+behavior IIUC.
+---
+ include/stdio.h | 3 +++
+ include/stdlib.h | 3 +++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/include/stdio.h b/include/stdio.h
+index d0cf7a5..487496e 100644
+--- a/include/stdio.h
++++ b/include/stdio.h
+@@ -351,6 +351,9 @@ __END_DECLS
+ /* Additional functionality provided by:
+ * POSIX.2-1992 C Language Binding Option
+ */
++#ifndef TARGET_OS_EMBEDDED
++# define TARGET_OS_EMBEDDED 0
++#endif
+ #if TARGET_OS_EMBEDDED
+ #define __swift_unavailable_on(osx_msg, ios_msg) __swift_unavailable(ios_msg)
+ #else
+diff --git a/include/stdlib.h b/include/stdlib.h
+index c04d3a7..0b454ba 100644
+--- a/include/stdlib.h
++++ b/include/stdlib.h
+@@ -183,6 +183,9 @@ unsigned long long
+ #ifndef LIBC_ALIAS_SYSTEM
+ //End-Libc
+
++#ifndef TARGET_OS_EMBEDDED
++# define TARGET_OS_EMBEDDED 0
++#endif
+ #if TARGET_OS_EMBEDDED
+ #define __swift_unavailable_on(osx_msg, ios_msg) __swift_unavailable(ios_msg)
+ #else
+--
+2.17.2 (Apple Git-113)
+
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix
index 9bec0b103c..915d3a61f8 100644
--- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix
@@ -3,6 +3,10 @@
appleDerivation' stdenvNoCC {
nativeBuildInputs = [ ed unifdef ];
+ patches = [
+ ./0001-Define-TARGET_OS_EMBEDDED-in-std-lib-io-if-not-defin.patch
+ ];
+
# TODO: asl.h actually comes from syslog project now
installPhase = ''
export SRCROOT=$PWD
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
index 66190b7b4e..86c91e9b55 100644
--- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
@@ -63,20 +63,21 @@ appleDerivation' stdenv {
cat < $out/include/TargetConditionals.h
#ifndef __TARGETCONDITIONALS__
#define __TARGETCONDITIONALS__
- #define TARGET_OS_MAC 1
- #define TARGET_OS_OSX 1
- #define TARGET_OS_WIN32 0
- #define TARGET_OS_UNIX 0
- #define TARGET_OS_EMBEDDED 0
- #define TARGET_OS_IPHONE 0
- #define TARGET_OS_IOS 0
- #define TARGET_OS_WATCH 0
- #define TARGET_OS_BRIDGE 0
- #define TARGET_OS_TV 0
- #define TARGET_OS_SIMULATOR 0
- #define TARGET_IPHONE_SIMULATOR 0
- #define TARGET_OS_NANO 0
- #define TARGET_OS_LINUX 0
+ #define TARGET_OS_MAC 1
+ #define TARGET_OS_WIN32 0
+ #define TARGET_OS_UNIX 0
+ #define TARGET_OS_OSX 1
+ #define TARGET_OS_IPHONE 0
+ #define TARGET_OS_IOS 0
+ #define TARGET_OS_WATCH 0
+ #define TARGET_OS_BRIDGE 0
+ #define TARGET_OS_TV 0
+ #define TARGET_OS_SIMULATOR 0
+ #define TARGET_OS_EMBEDDED 0
+ #define TARGET_OS_EMBEDDED_OTHER 0 /* Used in configd */
+ #define TARGET_IPHONE_SIMULATOR TARGET_OS_SIMULATOR /* deprecated */
+ #define TARGET_OS_NANO TARGET_OS_WATCH /* deprecated */
+ #define TARGET_OS_LINUX 0
#define TARGET_CPU_PPC 0
#define TARGET_CPU_PPC64 0
@@ -84,6 +85,7 @@ appleDerivation' stdenv {
#define TARGET_CPU_X86 0
#define TARGET_CPU_X86_64 1
#define TARGET_CPU_ARM 0
+ #define TARGET_CPU_ARM64 0
#define TARGET_CPU_MIPS 0
#define TARGET_CPU_SPARC 0
#define TARGET_CPU_ALPHA 0
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/xnu/python3.patch b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/xnu/python3.patch
index 10778406c8..9f29376187 100644
--- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/xnu/python3.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/xnu/python3.patch
@@ -18,7 +18,7 @@ index 73b2db4..d354ba0 100755
- m = id_name_pattern.match(line)
- if m:
+ m = id_name_pattern.match(line)
-+ if m:
++ if m:
code_table += [(int(m.group(1),base=16), m.group(2))]
# emit typedef:
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/swift-corelibs/0001-Add-missing-TARGET_OS_-defines.patch b/third_party/nixpkgs/pkgs/os-specific/darwin/swift-corelibs/0001-Add-missing-TARGET_OS_-defines.patch
new file mode 100644
index 0000000000..db17c517c7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/os-specific/darwin/swift-corelibs/0001-Add-missing-TARGET_OS_-defines.patch
@@ -0,0 +1,30 @@
+From 549160574ee44656d50997b27ef83736e0848201 Mon Sep 17 00:00:00 2001
+From: toonn
+Date: Mon, 26 Apr 2021 20:51:05 +0200
+Subject: [PATCH] Add missing TARGET_OS_* defines
+
+---
+ .../Base.subproj/SwiftRuntime/TargetConditionals.h | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/CoreFoundation/Base.subproj/SwiftRuntime/TargetConditionals.h b/CoreFoundation/Base.subproj/SwiftRuntime/TargetConditionals.h
+index 6d42b873..abf746c9 100644
+--- a/CoreFoundation/Base.subproj/SwiftRuntime/TargetConditionals.h
++++ b/CoreFoundation/Base.subproj/SwiftRuntime/TargetConditionals.h
+@@ -118,6 +118,13 @@
+
+ #define TARGET_OS_WIN32 TARGET_OS_WINDOWS
+ #define TARGET_OS_MAC TARGET_OS_DARWIN
++#define TARGET_OS_OSX TARGET_OS_DARWIN
++
++#define TARGET_OS_IPHONE 0
++#define TARGET_OS_WATCH 0
++#define TARGET_OS_TV 0
++#define TARGET_OS_EMBEDDED 0
++
+
+ #if __x86_64__
+ #define TARGET_CPU_PPC 0
+--
+2.17.2 (Apple Git-113)
+
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix
index 560be0c31a..bfe862eb39 100644
--- a/third_party/nixpkgs/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation {
nativeBuildInputs = [ ninja python3 ];
buildInputs = [ curl libxml2 objc4 ICU ];
+ patches = [ ./0001-Add-missing-TARGET_OS_-defines.patch ];
+
postPatch = ''
cd CoreFoundation
@@ -71,23 +73,12 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
- # FIXME: Workaround for intermittent build failures of CFRuntime.c.
- # Based on testing this issue seems to only occur with clang_7, so
- # please remove this when updating the default llvm versions to 8 or
- # later.
- buildPhase = lib.optionalString true ''
- for i in {1..512}; do
- if ninja -j $NIX_BUILD_CORES; then
- break
- fi
+ buildPhase = ''
+ runHook preBuild
- echo >&2
- echo "[$i/512] retrying build, workaround for #66811" >&2
- echo " With clang_7 the build of CFRuntime.c fails intermittently." >&2
- echo " See https://github.com/NixOS/nixpkgs/issues/66811 for more details." >&2
- echo >&2
- continue
- done
+ ninja -j $NIX_BUILD_CORES
+
+ runHook postBuild
'';
# TODO: their build system sorta kinda can do this, but it doesn't seem to work right now
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/acpid/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/acpid/default.nix
index 2b8dac0c8e..b766739aaa 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/acpid/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/acpid/default.nix
@@ -2,23 +2,15 @@
stdenv.mkDerivation rec {
pname = "acpid";
- version = "2.0.32";
+ version = "2.0.33";
src = fetchurl {
url = "mirror://sourceforge/acpid2/acpid-${version}.tar.xz";
- sha256 = "0zhmxnhnhg4v1viw82yjr22kram6k5k1ixznhayk8cnw7q5x7lpj";
+ sha256 = "sha256-CFb3Gz6zShtmPQqOY2Pfy8UZ5j2EczBJiJhljily2+g=";
};
nativeBuildInputs = [ autoreconfHook ];
- # remove when https://sourceforge.net/p/acpid2/code/merge-requests/1/ is merged
- postPatch = ''
- substituteInPlace configure.ac \
- --replace "AC_FUNC_MALLOC" "" \
- --replace "AC_FUNC_REALLOC" "" \
- --replace "strrchr strtol" "strrchr strtol malloc realloc"
- '';
-
meta = with lib; {
homepage = "https://sourceforge.net/projects/acpid2/";
description = "A daemon for delivering ACPI events to userspace programs";
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix
index 782e6ffce8..e614be978c 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "alsa-utils";
- version = "1.2.5.1";
+ version = "1.2.6";
src = fetchurl {
url = "mirror://alsa/utils/${pname}-${version}.tar.bz2";
- sha256 = "sha256-nBaa43pJKV+bl7kqzncoA9r2tlEKGVdOC3j4flYhGNA=";
+ sha256 = "sha256-ah79ih8dnTjkiWM+rsH/+lwxVmOzFsq4BL5IaIfmFF0=";
};
nativeBuildInputs = [ gettext makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/audit/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/audit/default.nix
index a7f17e4495..9fd24eea6d 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/audit/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/audit/default.nix
@@ -1,6 +1,7 @@
{
lib, stdenv, buildPackages, fetchurl, fetchpatch,
runCommand,
+ autoreconfHook,
autoconf, automake, libtool,
enablePython ? false, python ? null,
}:
@@ -19,8 +20,7 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "dev" "out" "man" ];
depsBuildBuild = [ buildPackages.stdenv.cc ];
- nativeBuildInputs = lib.optionals stdenv.hostPlatform.isMusl
- [ autoconf automake libtool ];
+ nativeBuildInputs = [ autoreconfHook ];
buildInputs = lib.optional enablePython python;
configureFlags = [
@@ -44,8 +44,7 @@ stdenv.mkDerivation rec {
url = "https://github.com/linux-audit/audit-userspace/commit/017e6c6ab95df55f34e339d2139def83e5dada1f.patch";
sha256 = "100xa1rzkv0mvhjbfgpfm72f7c4p68syflvgc3xm6pxgrqqmfq8h";
})
- ]
- ++ lib.optional stdenv.hostPlatform.isMusl [
+
(
let patch = fetchpatch {
url = "https://github.com/linux-audit/audit-userspace/commit/d579a08bb1cde71f939c13ac6b2261052ae9f77e.patch";
@@ -60,6 +59,14 @@ stdenv.mkDerivation rec {
'-* Copyright (c) 2007-09,2011-16 Red Hat Inc., Durham, North Carolina.'
''
)
+
+ # upstream fix for linux-headers-5.15 which removed ipx.h
+ (fetchpatch {
+ name = "no-ipx.patch";
+ url = "https://github.com/linux-audit/audit-userspace/commit/6b09724c69d91668418ddb3af00da6db6755208c.patch";
+ sha256 = "0qjq41ridyamajz9v9nyplgq7f8nn3fxw375s9sa5a0igsrx9pm0";
+ excludes = [ "ChangeLog" ];
+ })
];
prePatch = ''
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix
index be46f00a2c..aa8e3f15aa 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix
@@ -7,14 +7,14 @@
stdenv.mkDerivation rec {
pname = "ell";
- version = "0.45";
+ version = "0.46";
outputs = [ "out" "dev" ];
src = fetchgit {
url = "https://git.kernel.org/pub/scm/libs/ell/ell.git";
rev = version;
- sha256 = "sha256-W+IXubPuA/BQzD/LknCeJQgTXUH6I/rUrKBMeEzcBlw=";
+ sha256 = "sha256-Am1PNFFfSzII4Iaeq0wgfuVHSeMDjiDzYkNQWlnEHJY=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index c94ad67d20..ebe9b733e3 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -2,12 +2,12 @@
stdenvNoCC.mkDerivation rec {
pname = "firmware-linux-nonfree";
- version = "20211027";
+ version = "20211216";
src = fetchgit {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
rev = "refs/tags/${version}";
- sha256 = "00vv617ngr8rfrm1rw98xxgc453zb8cb5p8ssz5s3khynpqqg08x";
+ sha256 = "sha256-Q5TPtSbETDDRVKFfwQOp+GGsTGpTpGU5PQ5QkJCtWcM=";
};
installFlags = [ "DESTDIR=$(out)" ];
@@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec {
outputHashMode = "recursive";
outputHashAlgo = "sha256";
- outputHash = "1bll1drjp2y8grcxwh1mynxa6qaj1n58mh51ialm7pbryrvsla1c";
+ outputHash = "sha256-nyhxyDVO7tWkCD7fMjwiFNuMSh5e/z5w71CIZw3SJH8=";
meta = with lib; {
description = "Binary firmware collection packaged by kernel.org";
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix
index a7bc2ab7f6..3f725e3e5b 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix
@@ -12,12 +12,12 @@
stdenv.mkDerivation rec {
pname = "iwd";
- version = "1.19";
+ version = "1.20";
src = fetchgit {
url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
rev = version;
- sha256 = "sha256-sMET4ouZ33SZRnkqJBadVvIDYMCOi7pib6d1zt1EJ8k=";
+ sha256 = "sha256-GcqmMqrZSgvSrsY8FJbPynNWTzSi5A6kmyq+xJ+2i3Y=";
};
outputs = [ "out" "man" ]
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix
index 27428b3728..3c7e899cba 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -81,12 +81,12 @@ let
in {
inherit makeLinuxHeaders;
- linuxHeaders = let version = "5.14"; in
+ linuxHeaders = let version = "5.15.5"; in
makeLinuxHeaders {
inherit version;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "sha256-fgaLXg0mpisQ5TILJdzldYjLvG94HAkEQhOMnJwycbI=";
+ sha256 = "sha256-6VZaMBUlrIHBQs64MvkFPdVoXhB9vPdT0N5MWLyYhR8=";
};
patches = [
./no-relocs.patch # for building x86 kernel headers on non-ELF platforms
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix
index 43a560b8e2..b127ec9197 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix
@@ -473,6 +473,11 @@ let
# Detect buffer overflows on the stack
CC_STACKPROTECTOR_REGULAR = {optional = true; tristate = whenOlder "4.18" "y";};
+ } // optionalAttrs stdenv.hostPlatform.isx86 {
+ # Enable Intel SGX
+ X86_SGX = whenAtLeast "5.11" yes;
+ # Allow KVM guests to load SGX enclaves
+ X86_SGX_KVM = whenAtLeast "5.13" yes;
};
microcode = {
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 3d30672507..f45dd87edf 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "4.14.258";
+ version = "4.14.259";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "162bzhm0k8kipgk0ma745rjcl33rqhpwxdfdz3q6rkp48b82kbvi";
+ sha256 = "0s23iq89xdgckzyh8xv7p7wx0agjpj8ac2p42jpx6yzp3xa89qi6";
};
} // (args.argsOverride or {}))
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix
index c1247c995a..2dfdf8af2c 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "4.19.221";
+ version = "4.19.222";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1yg1cibyn53gpjnxfgj2qxxi8k3l7gv1ri6kywvp6sk5bygx8jd3";
+ sha256 = "0f48c6lv0nqggn5rn1wfnlf3xjz6ckmzvjqbhpyar43x7l687c4p";
};
} // (args.argsOverride or {}))
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix
index a3c1bb1131..e3deaf62f0 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,12 +1,12 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec {
- version = "4.4.295";
+ version = "4.4.296";
extraMeta.branch = "4.4";
extraMeta.broken = stdenv.isAarch64;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1h3i2lgm2sy325f58jildip7m6sb4hr2n9pm3gc3h2gash65kc2r";
+ sha256 = "1ydh6qiib6anxv5kxd13d9p2hjh3ni7r3whxazlzvckijmzqd5nb";
};
} // (args.argsOverride or {}))
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix
index f9c9226831..940df7cdba 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,12 +1,12 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec {
- version = "4.9.293";
+ version = "4.9.294";
extraMeta.branch = "4.9";
extraMeta.broken = stdenv.isAarch64;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0l64rz6ly5ls23lqq0cv98xb4z2mimp2jrsjrs6kq3zm4k2mm4gs";
+ sha256 = "0s527wr1zngyfz4p7nss1id14amc448g19i1wy20s13n43gm1jii";
};
} // (args.argsOverride or {}))
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix
index 908b863d14..3165e8b7e3 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.10.87";
+ version = "5.10.88";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "0jz6xhph7x0x11cjmypaw5gh8z4d53dcgx2gmg7k6d06ydq8n4h3";
+ sha256 = "1sv8j34k75xpbdgyddhlszlgn74fbj0girgixz7v18l2qfv331kg";
};
} // (args.argsOverride or {}))
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix
index 38405032e0..0a940d5e60 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.15.10";
+ version = "5.15.11";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "0jsv8lialjwp91qg9c9rh8rhn49a70ryyhzl19bxq3fhz1fwyks8";
+ sha256 = "1km1fglpg1a67vsfx6gqz9ikb6pywdl146bhws915n8jgrz8n5y1";
};
} // (args.argsOverride or { }))
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix
index 1307286571..6a9ddc2e84 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.4.167";
+ version = "5.4.168";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "19x5f3s5f4nqzjb61g22rs0hnmk43q4b7sm7mc4j1q3y44b33r5l";
+ sha256 = "108i35bnfhv7cpq8ifp915ybngygl2qf6cfslrh3aqk5sk29mdzc";
};
} // (args.argsOverride or {}))
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix
index f3f56f67d0..4d078e45fe 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -1,8 +1,8 @@
{ stdenv, lib, fetchsvn, linux
, scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
- rev = "18484";
- sha256 = "0wyxpfzkpjwxsp4pqfjrpdr9vqgszsa31g1a5f9r7d1rkkw94f3s";
+ rev = "18517";
+ sha256 = "1i4gppn3lyi3aqzscrdhm2dsvfa84xqhymcc468sakn9in3g85gg";
}
, ...
}:
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
index a4a1bf5be0..b9458b3947 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
@@ -6,7 +6,7 @@
, ... } @ args:
let
- version = "5.10.83-rt58"; # updated by ./update-rt.sh
+ version = "5.10.87-rt59"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@@ -18,14 +18,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
- sha256 = "0w4vq8wby3m9f5ryssh6z948m6zj1bjz9x432805dnrxyd1rl9gg";
+ sha256 = "0jz6xhph7x0x11cjmypaw5gh8z4d53dcgx2gmg7k6d06ydq8n4h3";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
- sha256 = "1n1jj7zyhnk4d5imf5v0cblqxv7q0ybc3i17yd224qmkj3bmly9w";
+ sha256 = "04sr3n3ilvqq0dl59l92qmn3p7fjlsxxvbs3qls7b4pncb2xyyj3";
};
}; in [ rt-patch ] ++ kernelPatches;
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix
index dac882d9cd..9740615a33 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix
@@ -51,16 +51,12 @@ buildLinux (args // rec {
# Graysky's additional CPU optimizations
CC_OPTIMIZE_FOR_PERFORMANCE_O3 = yes;
- # Android Ashmem and Binder IPC Driver as module for Anbox
- ASHMEM = module;
- ANDROID = yes;
- ANDROID_BINDER_IPC = module;
- ANDROID_BINDERFS = module;
- ANDROID_BINDER_DEVICES = freeform "binder,hwbinder,vndbinder";
-
# Futex WAIT_MULTIPLE implementation for Wine / Proton Fsync.
FUTEX = yes;
FUTEX_PI = yes;
+
+ # WineSync driver for fast kernel-backed Wine
+ WINESYNC = module;
};
extraMeta = {
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix
index e349c3073b..257485645f 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix
@@ -2,7 +2,7 @@
let
# having the full version string here makes it easier to update
- modDirVersion = "5.15.8-zen1";
+ modDirVersion = "5.15.11-zen1";
parts = lib.splitString "-" modDirVersion;
version = lib.elemAt parts 0;
suffix = lib.elemAt parts 1;
@@ -19,7 +19,7 @@ buildLinux (args // {
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${modDirVersion}";
- sha256 = "sha256-vuMgxdGjTpR4iVVm1y28Hj3CdfpwGLnTpyZEnz3jd1U=";
+ sha256 = "sha256-KOy1bmNnfa8LtnE+03Y+0pr9r1OCimY0bjGsVmGnPN4=";
};
structuredExtraConfig = with lib.kernel; {
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix
index ba765b4f92..daee83e61d 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix
@@ -1,19 +1,24 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config
-, libelf, zlib
+{ fetchFromGitHub
, fetchpatch
+, libelf
+, pkg-config
+, stdenv
+, zlib
+, lib
+, nixosTests
}:
with builtins;
stdenv.mkDerivation rec {
pname = "libbpf";
- version = "0.6.0";
+ version = "0.6.1";
src = fetchFromGitHub {
- owner = "libbpf";
- repo = "libbpf";
- rev = "v${version}";
- sha256 = "sha256-p9wUDC7r6+ElbheNkTkZW4eMNAvPbvpUyQjTjCE34ck=";
+ owner = "libbpf";
+ repo = "libbpf";
+ rev = "v${version}";
+ sha256 = "sha256-/MLPflnfooe7Wjy8M3CTowAi5oYpscruSkDsaVzhmYQ=";
};
nativeBuildInputs = [ pkg-config ];
@@ -23,6 +28,10 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
makeFlags = [ "PREFIX=$(out)" ];
+ passthru.tests = {
+ bpf = nixosTests.bpf;
+ };
+
postInstall = ''
# install linux's libbpf-compatible linux/btf.h
install -Dm444 ../include/uapi/linux/btf.h -t $out/include/linux
@@ -36,9 +45,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Upstream mirror of libbpf";
- homepage = "https://github.com/libbpf/libbpf";
- license = with licenses; [ lgpl21 /* or */ bsd2 ];
+ homepage = "https://github.com/libbpf/libbpf";
+ license = with licenses; [ lgpl21 /* or */ bsd2 ];
maintainers = with maintainers; [ thoughtpolice vcunat saschagrunert martinetd ];
- platforms = platforms.linux;
+ platforms = platforms.linux;
};
}
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libselinux/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libselinux/default.nix
index 1e0a294516..fd697fed77 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/libselinux/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/libselinux/default.nix
@@ -1,5 +1,5 @@
-{ lib, stdenv, fetchurl, pcre, pkg-config, libsepol
-, enablePython ? true, swig ? null, python3 ? null
+{ lib, stdenv, fetchurl, fetchpatch, buildPackages, pcre, pkg-config, libsepol
+, enablePython ? !stdenv.hostPlatform.isStatic, swig ? null, python3 ? null
, fts
}:
@@ -19,7 +19,28 @@ stdenv.mkDerivation rec {
sha256 = "0mvh793g7fg6wb6zqhkdyrv80x6k84ypqwi8ii89c91xcckyxzdc";
};
- nativeBuildInputs = [ pkg-config ] ++ optionals enablePython [ swig python3 ];
+ patches = [
+ # Make it possible to disable shared builds (for pkgsStatic).
+ #
+ # We can't use fetchpatch because it processes includes/excludes
+ # /after/ stripping the prefix, which wouldn't work here because
+ # there would be no way to distinguish between
+ # e.g. libselinux/src/Makefile and libsepol/src/Makefile.
+ #
+ # This is a static email, so we shouldn't have to worry about
+ # normalizing the patch.
+ (fetchurl {
+ url = "https://lore.kernel.org/selinux/20211113141616.361640-1-hi@alyssa.is/raw";
+ sha256 = "16a2s2ji9049892i15yyqgp4r20hi1hij4c1s4s8law9jsx65b3n";
+ postFetch = ''
+ mv "$out" $TMPDIR/patch
+ ${buildPackages.patchutils_0_3_3}/bin/filterdiff \
+ -i 'a/libselinux/*' --strip 1 <$TMPDIR/patch >"$out"
+ '';
+ })
+ ];
+
+ nativeBuildInputs = [ pkg-config python3 ] ++ optionals enablePython [ swig ];
buildInputs = [ libsepol pcre fts ] ++ optionals enablePython [ python3 ];
# drop fortify here since package uses it by default, leading to compile error:
@@ -40,6 +61,8 @@ stdenv.mkDerivation rec {
"LIBSEPOLA=${lib.getLib libsepol}/lib/libsepol.a"
"ARCH=${stdenv.hostPlatform.linuxArch}"
+ ] ++ optionals stdenv.hostPlatform.isStatic [
+ "DISABLE_SHARED=y"
] ++ optionals enablePython [
"PYTHON=${python3.pythonForBuild.interpreter}"
"PYTHONLIBDIR=$(py)/${python3.sitePackages}"
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libtraceevent/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libtraceevent/default.nix
index f28462652e..1278e25987 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/libtraceevent/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/libtraceevent/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "libtraceevent";
- version = "1.4.0";
+ version = "1.5.0";
src = fetchgit {
url = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git";
rev = "libtraceevent-${version}";
- sha256 = "1x36qsrcssjywjpwkgyp9hz6y878kivma9pz7zrhxdsrqv2d2zs1";
+ sha256 = "sha256-ysdsuJ9MvmNY0/XSV+aO7Gh8buWed25DQhBE/5HIASU=";
};
# Don't build and install html documentation
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/mdevd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/mdevd/default.nix
index fe549e880a..9860c3e730 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/mdevd/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/mdevd/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
buildPackage {
pname = "mdevd";
- version = "0.1.5.0";
- sha256 = "01ykxgnbm53wijdrbld10664xy2wkvyzbbs98mfnqnf4h1y064n0";
+ version = "0.1.5.1";
+ sha256 = "1xch9sk3hklf2v9z3qlw0rfhhmikqp85zkij7qzwbs09g039bkll";
description = "mdev-compatible Linux hotplug manager daemon";
platforms = lib.platforms.linux;
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/s6-linux-init/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/s6-linux-init/default.nix
index 5d579c3ab2..ab9843d07f 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/s6-linux-init/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/s6-linux-init/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
buildPackage {
pname = "s6-linux-init";
- version = "1.0.6.4";
- sha256 = "0grqk111d6aqym1c4l9j26fdqcgra1hvwb9vdgylrfbvn1c3hlpb";
+ version = "1.0.7.0";
+ sha256 = "16bzijmzxi91ycayhpn398yjgag3c5pnlghs6sqdmzlf2fiirif5";
description = "A set of minimalistic tools used to create a s6-based init system, including a /sbin/init binary, on a Linux kernel";
platforms = lib.platforms.linux;
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/s6-linux-utils/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/s6-linux-utils/default.nix
index 06a177f1cc..753a77aa1c 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/s6-linux-utils/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/s6-linux-utils/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
buildPackage {
pname = "s6-linux-utils";
- version = "2.5.1.6";
- sha256 = "0hr49nl0d7a6i5w8cfg43xzvzayb8kpqij9xg7bmw2fyvc2z338z";
+ version = "2.5.1.7";
+ sha256 = "1n6zmnczbybwcchkhg5zqixz8mdk5bfn0sxq0kxifgpi9ggw5a46";
description = "A set of minimalistic Linux-specific system utilities";
platforms = lib.platforms.linux;
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix
index 13a39f182c..70036127fc 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix
@@ -41,6 +41,7 @@
, gnupg
, zlib
, xz
+, zstd
, tpm2-tss
, libuuid
, libapparmor
@@ -48,6 +49,7 @@
, bzip2
, pcre2
, e2fsprogs
+, elfutils
, linuxHeaders ? stdenv.cc.libc.linuxHeaders
, gnu-efi
, iptables
@@ -68,7 +70,7 @@
, withAnalyze ? true
, withApparmor ? true
-, withCompression ? true # adds bzip2, lz4 and xz
+, withCompression ? true # adds bzip2, lz4, xz and zstd
, withCoredump ? true
, withCryptsetup ? true
, withDocumentation ? true
@@ -373,7 +375,8 @@ stdenv.mkDerivation {
++ lib.optional withApparmor libapparmor
++ lib.optional wantCurl (lib.getDev curl)
- ++ lib.optionals withCompression [ bzip2 lz4 xz ]
+ ++ lib.optionals withCompression [ bzip2 lz4 xz zstd ]
+ ++ lib.optional withCoredump elfutils
++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev)
++ lib.optional withEfi gnu-efi
++ lib.optional withKexectools kexec-tools
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix
index 0818d7bde7..b3536e038f 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix
@@ -1,8 +1,11 @@
{ lib, stdenv, fetchurl, pkg-config, zlib, shadow, libcap_ng
, ncurses ? null, pam, systemd ? null
, nlsSupport ? true
+, audit ? null
}:
+assert stdenv.hostPlatform.isStatic -> audit != null;
+
stdenv.mkDerivation rec {
pname = "util-linux";
version = "2.37.2";
@@ -57,7 +60,17 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs =
[ zlib pam libcap_ng ]
- ++ lib.filter (p: p != null) [ ncurses systemd ];
+ ++ lib.filter (p: p != null) [ ncurses systemd ]
+ # not sure how util-linux is linking with linux-pam,
+ # probably just with a simplistic -lpam.
+ # linux-pam doesn't seem to have a .pc file so I can't
+ # add -laudit to the Requires.private.
+ # libaudit is also needed directly anyway cf login-utils/login.c
+ # and sys-utils/hwclock.c, not sure how we got it working
+ # without audit on dynamic builds.
+ ++ lib.optionals stdenv.hostPlatform.isStatic [ audit ];
+
+ NIX_CFLAGS_LINK = lib.optionalString stdenv.hostPlatform.isStatic "-laudit";
doCheck = false; # "For development purpose only. Don't execute on production system!"
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/v86d/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/v86d/default.nix
index 254abb5838..dbc98344c5 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/v86d/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/v86d/default.nix
@@ -5,14 +5,16 @@
, klibc
}:
-stdenv.mkDerivation rec {
- name = "v86d-${version}-${kernel.version}";
- version = "0.1.10";
+let
+ pversion = "0.1.10";
+in stdenv.mkDerivation rec {
+ pname = "v86d";
+ version = "${pversion}-${kernel.version}";
src = fetchFromGitHub {
owner = "mjanusz";
repo = "v86d";
- rev = "v86d-${version}";
+ rev = "v86d-${pversion}";
hash = "sha256-95LRzVbO/DyddmPwQNNQ290tasCGoQk7FDHlst6LkbA=";
};
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/vendor-reset/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/vendor-reset/default.nix
index 8f1bde7ecb..e1395bd33c 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/vendor-reset/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/vendor-reset/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, kernel, lib }:
stdenv.mkDerivation rec {
- name = "vendor-reset-${version}-${kernel.version}";
- version = "unstable-2021-02-16";
+ pname = "vendor-reset";
+ version = "unstable-2021-02-16-${kernel.version}";
src = fetchFromGitHub {
owner = "gnif";
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/virtualbox/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/virtualbox/default.nix
index f795d36207..3aae58933c 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/virtualbox/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/virtualbox/default.nix
@@ -1,7 +1,8 @@
{ stdenv, virtualbox, kernel }:
stdenv.mkDerivation {
- name = "virtualbox-modules-${virtualbox.version}-${kernel.version}";
+ pname = "virtualbox-modules";
+ version = "${virtualbox.version}-${kernel.version}";
src = virtualbox.modsrc;
hardeningDisable = [
"fortify" "pic" "stackprotector"
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/x86_energy_perf_policy/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/x86_energy_perf_policy/default.nix
index 4b57ed4cea..d636f928f2 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/x86_energy_perf_policy/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/x86_energy_perf_policy/default.nix
@@ -1,7 +1,8 @@
{ lib, stdenv, kernel }:
stdenv.mkDerivation {
- name = "x86_energy_perf_policy-${kernel.version}";
+ pname = "x86_energy_perf_policy";
+ version = kernel.version;
src = kernel.src;
diff --git a/third_party/nixpkgs/pkgs/servers/klipper/default.nix b/third_party/nixpkgs/pkgs/servers/klipper/default.nix
index 88671f6e91..7d5ae0c74f 100644
--- a/third_party/nixpkgs/pkgs/servers/klipper/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/klipper/default.nix
@@ -6,13 +6,13 @@
}:
stdenv.mkDerivation rec {
pname = "klipper";
- version = "unstable-2021-12-02";
+ version = "unstable-2021-12-24";
src = fetchFromGitHub {
owner = "KevinOConnor";
repo = "klipper";
- rev = "051133f81c9b9b9fff6df6716038f8c0b7105c69";
- sha256 = "sha256-Exc8Q+D/2OQkan/qY10jxiH+tVSWW6biN9auejWpsGk=";
+ rev = "247cd753e283e70a9949e76d0ba669d99c0eb144";
+ sha256 = "sha256-65wxhE/XqNK6ly+fxZFLjtImvpJlgU54RStUve40CJA=";
};
sourceRoot = "source/klippy";
diff --git a/third_party/nixpkgs/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix b/third_party/nixpkgs/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix
index 90859efd3c..113a3679d1 100644
--- a/third_party/nixpkgs/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, dovecot, libtool, xapian, icu64 }:
stdenv.mkDerivation rec {
- pname = "fts-xapian";
- version = "1.4.14";
+ pname = "dovecot-fts-xapian";
+ version = "1.5.2";
src = fetchFromGitHub {
owner = "grosjo";
repo = "fts-xapian";
rev = version;
- sha256 = "sha256-Banyg10AiM1Jw6Zfl4Dcpc0/6Km48lLVuQ3xRLylE7k=";
+ sha256 = "1ap4jb43gvy7caa8lg2hg811q0n5c2gqbmcjl4126wz44hb7waa1";
};
buildInputs = [ dovecot xapian icu64 ];
@@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
configureFlags = [
"--with-dovecot=${dovecot}/lib/dovecot"
- "--without-dovecot-install-dirs"
"--with-moduledir=$(out)/lib/dovecot"
];
diff --git a/third_party/nixpkgs/pkgs/servers/metabase/default.nix b/third_party/nixpkgs/pkgs/servers/metabase/default.nix
index 4cb9700473..990ef950e6 100644
--- a/third_party/nixpkgs/pkgs/servers/metabase/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/metabase/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "metabase";
- version = "0.41.4";
+ version = "0.41.5";
src = fetchurl {
url = "https://downloads.metabase.com/v${version}/metabase.jar";
- sha256 = "1xql4d7kipyxsibzyg0c4lgkms12g1cxxnf0zkc6cbwz2vdva54a";
+ sha256 = "sha256-DH1xy1cTVDNNXyOIaayGHzOi4g0ZukNFFbZjufY+XLk=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix
index 7433328d40..932e03b99f 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix
@@ -1,16 +1,16 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "thanos";
- version = "0.23.1";
+ version = "0.24.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "thanos-io";
repo = "thanos";
- sha256 = "sha256-JQp0Bg7sCA5obb24G/Ca7EcD7er+ux9x+BgRK0L7dJE=";
+ sha256 = "sha256-HdfOxi9l2xPs4JOY15Yt+KlCm7SQ0Ap1qa5F7abr2g8=";
};
- vendorSha256 = "sha256-I7d81A5FMAOY1M8vhhrPFsPl/1sh2ydAzKySM5i5VfM=";
+ vendorSha256 = "sha256-+0XW7xGocM00kxmOMj0xHYPIpxc0rTQnyr9JQ/cPl3I=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/servers/openafs/1.8/module.nix b/third_party/nixpkgs/pkgs/servers/openafs/1.8/module.nix
index f8b2d222af..02966d2ac7 100644
--- a/third_party/nixpkgs/pkgs/servers/openafs/1.8/module.nix
+++ b/third_party/nixpkgs/pkgs/servers/openafs/1.8/module.nix
@@ -23,8 +23,9 @@ let
in
stdenv.mkDerivation {
- name = "openafs-${version}-${kernel.modDirVersion}";
- inherit version src;
+ pname = "openafs";
+ version = "${version}-${kernel.modDirVersion}";
+ inherit src;
nativeBuildInputs = [ autoconf automake flex libtool_2 perl which bison ]
++ kernel.moduleBuildDependencies;
diff --git a/third_party/nixpkgs/pkgs/servers/openafs/1.9/module.nix b/third_party/nixpkgs/pkgs/servers/openafs/1.9/module.nix
index 83fe7ac98a..9799454223 100644
--- a/third_party/nixpkgs/pkgs/servers/openafs/1.9/module.nix
+++ b/third_party/nixpkgs/pkgs/servers/openafs/1.9/module.nix
@@ -10,8 +10,9 @@ let
kernelBuildDir = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
in stdenv.mkDerivation {
- name = "openafs-${version}-${kernel.modDirVersion}";
- inherit version src;
+ pname = "openafs";
+ version = "${version}-${kernel.modDirVersion}";
+ inherit src;
nativeBuildInputs = [ autoconf automake flex libtool_2 perl which bison ]
++ kernel.moduleBuildDependencies;
diff --git a/third_party/nixpkgs/pkgs/servers/pulseaudio/default.nix b/third_party/nixpkgs/pkgs/servers/pulseaudio/default.nix
index a2836be7ef..47d0384720 100644
--- a/third_party/nixpkgs/pkgs/servers/pulseaudio/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/pulseaudio/default.nix
@@ -26,7 +26,7 @@
, # Whether to build only the library.
libOnly ? false
-, CoreServices, AudioUnit, Cocoa
+, AudioUnit, Cocoa, CoreServices, Libc
}:
stdenv.mkDerivation rec {
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ libtool libsndfile soxr speexdsp fftwFloat ]
++ lib.optionals stdenv.isLinux [ glib dbus ]
- ++ lib.optionals stdenv.isDarwin [ CoreServices AudioUnit Cocoa ]
+ ++ lib.optionals stdenv.isDarwin [ AudioUnit Cocoa CoreServices Libc ]
++ lib.optionals (!libOnly) (
[ libasyncns webrtc-audio-processing ]
++ lib.optional jackaudioSupport libjack2
@@ -94,7 +94,6 @@ stdenv.mkDerivation rec {
]
++ lib.optional (jackaudioSupport && !libOnly) "--enable-jack"
++ lib.optionals stdenv.isDarwin [
- "--with-mac-sysroot=/"
"--disable-neon-opt"
]
++ lib.optional (stdenv.isLinux && useSystemd) "--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user"
@@ -102,12 +101,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- # not sure what the best practices are here -- can't seem to find a way
- # for the compiler to bring in stdlib and stdio (etc.) properly
- # the alternative is to copy the files from /usr/include to src, but there are
- # probably a large number of files that would need to be copied (I stopped
- # after the seventh)
- NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I/usr/include";
+ NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${Libc}";
installFlags =
[ "sysconfdir=${placeholder "out"}/etc"
diff --git a/third_party/nixpkgs/pkgs/servers/search/groonga/default.nix b/third_party/nixpkgs/pkgs/servers/search/groonga/default.nix
index f9e24a9567..f42574884e 100644
--- a/third_party/nixpkgs/pkgs/servers/search/groonga/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/search/groonga/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, mecab, kytea, libedit, pkg-config
+{ lib, stdenv, fetchurl, autoreconfHook, mecab, kytea, libedit, pkg-config
, suggestSupport ? false, zeromq, libevent, msgpack, openssl
, lz4Support ? false, lz4
, zlibSupport ? true, zlib
@@ -14,12 +14,19 @@ stdenv.mkDerivation rec {
sha256 = "sha256-yE/Ok0QNY9+a4vfNJWZjR4W8E/i+lw7T85X2+oOw8m4=";
};
+ preConfigure = ''
+ # To avoid problems due to libc++abi 11 using `#include `.
+ rm version
+ '';
+
buildInputs = with lib;
- [ pkg-config mecab kytea libedit openssl ]
+ [ mecab kytea libedit openssl ]
++ optional lz4Support lz4
++ optional zlibSupport zlib
++ optionals suggestSupport [ zeromq libevent msgpack ];
+ nativeBuildInputs = [ autoreconfHook pkg-config ];
+
configureFlags = with lib;
optional zlibSupport "--with-zlib"
++ optional lz4Support "--with-lz4";
diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix
index 245ff62f7c..dbb800a276 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix
+++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix
@@ -15,13 +15,13 @@
}:
stdenv.mkDerivation rec {
pname = "postgis";
- version = "3.1.4";
+ version = "3.2.0";
outputs = [ "out" "doc" ];
src = fetchurl {
url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz";
- sha256 = "15ip38p7df9d9l6l3xhn2x8marbz8dy5lk3jblpl4bjkpkl3z3nw";
+ sha256 = "sha256-ernhVMaUfAz/uPoS1wgGrdmqBg5itshqLiBvnUtQfP0=";
};
buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ]
diff --git a/third_party/nixpkgs/pkgs/servers/traefik/default.nix b/third_party/nixpkgs/pkgs/servers/traefik/default.nix
index 677ea7b70a..962569d517 100644
--- a/third_party/nixpkgs/pkgs/servers/traefik/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/traefik/default.nix
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "traefik";
- version = "2.5.5";
+ version = "2.5.6";
src = fetchzip {
url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";
- sha256 = "sha256-Y7gYUe7vFC672f3U8QOA8NdGcZ2zGp0UjnvKFOci/vs=";
+ sha256 = "sha256-HHJTfAigUH7C0VuKUeGypqFlQwVdy05Ki/aTxDsl+tg=";
stripRoot = false;
};
- vendorSha256 = "sha256-fiODtiw7mxMshdwywW4esBYM1GEa2CS7+X80KxkzImE=";
+ vendorSha256 = "sha256-DqjqJPyoFlCjIIaHYS5jrROQWDxZk+RGfccC2jYZ8LE=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix b/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix
index c6c65d58e3..e8bfed1ab8 100644
--- a/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix
@@ -59,16 +59,17 @@ in
stdenv.mkDerivation rec {
pname = "uwsgi";
- version = "2.0.19.1";
+ version = "2.0.20";
src = fetchurl {
url = "https://projects.unbit.it/downloads/${pname}-${version}.tar.gz";
- sha256 = "0256v72b7zr6ds4srpaawk1px3bp0djdwm239w3wrxpw7dzk1gjn";
+ sha256 = "1yfz5h07rxzrqf1rdj5fzhk47idgglxj7kqr8zl8lgcpv1kriaw8";
};
patches = [
./no-ext-session-php_session.h-on-NixOS.patch
./additional-php-ldflags.patch
+ ./missing-arginfo-php8.patch # https://github.com/unbit/uwsgi/issues/2356
];
nativeBuildInputs = [ python3 pkg-config ];
@@ -96,6 +97,9 @@ stdenv.mkDerivation rec {
substituteInPlace "$f" \
--replace pkg-config "$PKG_CONFIG"
done
+ ${lib.optionalString (lib.versionAtLeast php.version "8") ''
+ sed -e "s/ + php_version//" -i plugins/php/uwsgiplugin.py
+ ''}
'';
configurePhase = ''
diff --git a/third_party/nixpkgs/pkgs/servers/uwsgi/missing-arginfo-php8.patch b/third_party/nixpkgs/pkgs/servers/uwsgi/missing-arginfo-php8.patch
new file mode 100644
index 0000000000..98a924e402
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/servers/uwsgi/missing-arginfo-php8.patch
@@ -0,0 +1,49 @@
+diff --git a/plugins/php/php_plugin.c b/plugins/php/php_plugin.c
+index ca0ef6c1..00c39b09 100644
+--- a/plugins/php/php_plugin.c
++++ b/plugins/php/php_plugin.c
+@@ -257,6 +257,9 @@ PHP_MINIT_FUNCTION(uwsgi_php_minit) {
+ return SUCCESS;
+ }
+
++ZEND_BEGIN_ARG_INFO_EX(arginfo_void, 0, 0, 0)
++ZEND_END_ARG_INFO()
++
+ PHP_FUNCTION(uwsgi_version) {
+ RETURN_STRING(UWSGI_VERSION);
+ }
+@@ -488,20 +491,20 @@ PHP_FUNCTION(uwsgi_signal) {
+ }
+
+ zend_function_entry uwsgi_php_functions[] = {
+- PHP_FE(uwsgi_version, NULL)
+- PHP_FE(uwsgi_setprocname, NULL)
+- PHP_FE(uwsgi_worker_id, NULL)
+- PHP_FE(uwsgi_masterpid, NULL)
+- PHP_FE(uwsgi_signal, NULL)
+-
+- PHP_FE(uwsgi_rpc, NULL)
+-
+- PHP_FE(uwsgi_cache_get, NULL)
+- PHP_FE(uwsgi_cache_set, NULL)
+- PHP_FE(uwsgi_cache_update, NULL)
+- PHP_FE(uwsgi_cache_del, NULL)
+- PHP_FE(uwsgi_cache_clear, NULL)
+- PHP_FE(uwsgi_cache_exists, NULL)
++ PHP_FE(uwsgi_version, arginfo_void)
++ PHP_FE(uwsgi_setprocname, arginfo_void)
++ PHP_FE(uwsgi_worker_id, arginfo_void)
++ PHP_FE(uwsgi_masterpid, arginfo_void)
++ PHP_FE(uwsgi_signal, arginfo_void)
++
++ PHP_FE(uwsgi_rpc, arginfo_void)
++
++ PHP_FE(uwsgi_cache_get, arginfo_void)
++ PHP_FE(uwsgi_cache_set, arginfo_void)
++ PHP_FE(uwsgi_cache_update, arginfo_void)
++ PHP_FE(uwsgi_cache_del, arginfo_void)
++ PHP_FE(uwsgi_cache_clear, arginfo_void)
++ PHP_FE(uwsgi_cache_exists, arginfo_void)
+ { NULL, NULL, NULL},
+ };
+
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/sogo/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/sogo/default.nix
index 3da6cf4f12..26586fbdab 100644
--- a/third_party/nixpkgs/pkgs/servers/web-apps/sogo/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/web-apps/sogo/default.nix
@@ -3,13 +3,13 @@
, oathToolkit }:
gnustep.stdenv.mkDerivation rec {
pname = "SOGo";
- version = "5.3.0";
+ version = "5.4.0";
src = fetchFromGitHub {
owner = "inverse-inc";
repo = pname;
rev = "SOGo-${version}";
- sha256 = "0f09b2ga43xdd8w14llclrsdxc1y8xb3g1h15lahxq82xkvixjjl";
+ sha256 = "0fwc9ia84f4ijnl5ymn4f6s1n8v3g7rqvpqaaadyw8jwj9x26a6k";
};
nativeBuildInputs = [ gnustep.make makeWrapper python3 ];
diff --git a/third_party/nixpkgs/pkgs/shells/powershell/default.nix b/third_party/nixpkgs/pkgs/shells/powershell/default.nix
index c34dd472f9..4efa2cd88a 100644
--- a/third_party/nixpkgs/pkgs/shells/powershell/default.nix
+++ b/third_party/nixpkgs/pkgs/shells/powershell/default.nix
@@ -9,7 +9,7 @@ let archString = if stdenv.isAarch64 then "arm64"
else throw "unsupported platform";
platformSha = if (stdenv.isDarwin && stdenv.isx86_64) then "sha256-h5zjn8wtgHmsJFiGq1rja6kZTZj3Q72W2kH3AexRDQs="
else if (stdenv.isDarwin && stdenv.isAarch64) then "sha256-NHM9ZUpBJb59Oq0Ke7DcvaN+bZ9MjSpXBRu5Ng9OVZ0="
- else if (stdenv.isLinux && stdenv.isx86_64) then "sha256-gRebkDY0WOKabuLd/WNMoRPL7oGQJtHELFNe+sQ0TwA="
+ else if (stdenv.isLinux && stdenv.isx86_64) then "sha256-kidPtDMkEZ/1r4WIApPZ/BsdJkolpSZ3f72JyDv3798="
else if (stdenv.isLinux && stdenv.isAarch64) then "sha256-bUacA4DwjDNlIG7yooXxUGL9AysAogNWuQDvcTqo1sE="
else throw "unsupported platform";
platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH"
@@ -20,7 +20,7 @@ let archString = if stdenv.isAarch64 then "arm64"
in
stdenv.mkDerivation rec {
pname = "powershell";
- version = "7.2.0";
+ version = "7.2.1";
src = fetchzip {
url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-${archString}.tar.gz";
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-better-npm-completion/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zsh-better-npm-completion/default.nix
index 983a772d6d..372d49eaeb 100644
--- a/third_party/nixpkgs/pkgs/shells/zsh/zsh-better-npm-completion/default.nix
+++ b/third_party/nixpkgs/pkgs/shells/zsh/zsh-better-npm-completion/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "zsh-better-npm-completion";
+ pname = "zsh-better-npm-completion";
version = "unstable-2019-11-19";
src = fetchFromGitHub {
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-deer/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zsh-deer/default.nix
index 895ca621cf..ab544d7c31 100644
--- a/third_party/nixpkgs/pkgs/shells/zsh/zsh-deer/default.nix
+++ b/third_party/nixpkgs/pkgs/shells/zsh/zsh-deer/default.nix
@@ -1,10 +1,8 @@
{ lib, stdenv, fetchFromGitHub, perl }:
-let
+stdenv.mkDerivation rec {
+ pname = "deer";
version = "1.4";
- name = "deer-${version}";
-in stdenv.mkDerivation {
- inherit name;
src = fetchFromGitHub {
owner = "Vifon";
diff --git a/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix b/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix
index b25a840f46..24ad0cb695 100644
--- a/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix
+++ b/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix
@@ -4,7 +4,7 @@
, config
, overlays
, crossOverlays ? [ ]
-, bootstrapLlvmVersion ? if localSystem.isAarch64 then "11.1.0" else "7.1.0"
+, bootstrapLlvmVersion ? "11.1.0"
# Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools
, bootstrapFiles ? if localSystem.isAarch64 then
let
@@ -23,7 +23,7 @@
else
let
fetch = { file, sha256, executable ? true }: import {
- url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/05ef940b94fe76e7ac06ea45a625adc8e4be96f9/${file}";
+ url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/c253216595572930316f2be737dc288a1da22558/${file}";
inherit (localSystem) system;
inherit sha256 executable;
}; in
@@ -32,7 +32,7 @@
bzip2 = fetch { file = "bzip2"; sha256 = "sha256-K3rhkJZipudT1Jgh+l41Y/fNsMkrPtiAsNRDha/lpZI="; };
mkdir = fetch { file = "mkdir"; sha256 = "sha256-VddFELwLDJGNADKB1fWwWPBtIAlEUgJv2hXRmC4NEeM="; };
cpio = fetch { file = "cpio"; sha256 = "sha256-SWkwvLaFyV44kLKL2nx720SvcL4ej/p2V/bX3uqAGO0="; };
- tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "sha256-b65dXbIm6o6s6U8tAiGpR6SMfvfn/VFcZgTHBetJZis="; executable = false; };
+ tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "sha256-kRC/bhCmlD4L7KAvJQgcukk7AinkMz4IwmG1rqlh5tA="; executable = false; };
}
}:
@@ -62,9 +62,6 @@ rec {
export NIX_IGNORE_LD_THROUGH_GCC=1
unset SDKROOT
- # Workaround for https://openradar.appspot.com/22671534 on 10.11.
- export gl_cv_func_getcwd_abort_bug=no
-
stripAllFlags=" " # the Darwin "strip" command doesn't know "-s"
'';
@@ -472,7 +469,7 @@ rec {
};
libcxxabi = libSuper.libcxxabi.override ({
stdenv = overrideCC self.stdenv self.ccNoLibcxx;
- } // lib.optionalAttrs (finalLlvmVersion == "7") {
+ } // lib.optionalAttrs (builtins.any (v: finalLlvmVersion == v) [ 7 11 12 13 ]) {
# TODO: the bootstrapping of llvm packages isn't consistent.
# `standalone` may be redundant if darwin behaves like useLLVM (or
# has useLLVM = true).
diff --git a/third_party/nixpkgs/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/third_party/nixpkgs/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index 434eadb38b..49f884cd8b 100644
--- a/third_party/nixpkgs/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/third_party/nixpkgs/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -32,50 +32,6 @@ in rec {
# Avoid messing with libkrb5 and libnghttp2.
curl_ = curlMinimal.override (args: { gssSupport = false; http2Support = false; });
- # Avoid stdenv rebuild.
- Libsystem_ = (darwin.Libsystem.override (args:
- { xnu = darwin.xnu.overrideAttrs (oldAttrs:
- { patches = [ ./fixed-xnu-python3.patch ]; });
- })).overrideAttrs (oldAttrs:
- { installPhase = oldAttrs.installPhase + ''
- cat < $out/include/TargetConditionals.h
- #ifndef __TARGETCONDITIONALS__
- #define __TARGETCONDITIONALS__
- #define TARGET_OS_MAC 1
- #define TARGET_OS_WIN32 0
- #define TARGET_OS_UNIX 0
- #define TARGET_OS_OSX 1
- #define TARGET_OS_IPHONE 0
- #define TARGET_OS_IOS 0
- #define TARGET_OS_WATCH 0
- #define TARGET_OS_BRIDGE 0
- #define TARGET_OS_TV 0
- #define TARGET_OS_SIMULATOR 0
- #define TARGET_OS_EMBEDDED 0
- #define TARGET_OS_EMBEDDED_OTHER 0 /* Used in configd */
- #define TARGET_IPHONE_SIMULATOR TARGET_OS_SIMULATOR /* deprecated */
- #define TARGET_OS_NANO TARGET_OS_WATCH /* deprecated */
-
- #define TARGET_CPU_PPC 0
- #define TARGET_CPU_PPC64 0
- #define TARGET_CPU_68K 0
- #define TARGET_CPU_X86 0
- #define TARGET_CPU_X86_64 1
- #define TARGET_CPU_ARM 0
- #define TARGET_CPU_ARM64 0
- #define TARGET_CPU_MIPS 0
- #define TARGET_CPU_SPARC 0
- #define TARGET_CPU_ALPHA 0
- #define TARGET_RT_MAC_CFM 0
- #define TARGET_RT_MAC_MACHO 1
- #define TARGET_RT_LITTLE_ENDIAN 1
- #define TARGET_RT_BIG_ENDIAN 0
- #define TARGET_RT_64_BIT 1
- #endif /* __TARGETCONDITIONALS__ */
- EOF
- '';
- });
-
build = stdenv.mkDerivation {
name = "stdenv-bootstrap-tools";
@@ -87,12 +43,12 @@ in rec {
${lib.optionalString stdenv.targetPlatform.isx86_64 ''
# Copy libSystem's .o files for various low-level boot stuff.
- cp -d ${Libsystem_}/lib/*.o $out/lib
+ cp -d ${lib.getLib darwin.Libsystem}/lib/*.o $out/lib
# Resolv is actually a link to another package, so let's copy it properly
- cp -L ${Libsystem_}/lib/libresolv.9.dylib $out/lib
+ cp -L ${lib.getLib darwin.Libsystem}/lib/libresolv.9.dylib $out/lib
- cp -rL ${Libsystem_}/include $out
+ cp -rL ${darwin.Libsystem}/include $out
chmod -R u+w $out/include
cp -rL ${darwin.ICU}/include* $out/include
cp -rL ${libiconv}/include/* $out/include
@@ -128,21 +84,21 @@ in rec {
cp -d ${gnugrep.pcre.out}/lib/libpcre*.dylib $out/lib
cp -d ${lib.getLib libiconv}/lib/lib*.dylib $out/lib
- cp -d ${gettext}/lib/libintl*.dylib $out/lib
+ cp -d ${lib.getLib gettext}/lib/libintl*.dylib $out/lib
chmod +x $out/lib/libintl*.dylib
cp -d ${ncurses.out}/lib/libncurses*.dylib $out/lib
cp -d ${libxml2.out}/lib/libxml2*.dylib $out/lib
# Copy what we need of clang
cp -d ${llvmPackages.clang-unwrapped}/bin/clang* $out/bin
- cp -rd ${llvmPackages.clang-unwrapped.lib}/lib/* $out/lib
+ cp -rd ${lib.getLib llvmPackages.clang-unwrapped}/lib/* $out/lib
- cp -d ${llvmPackages.libcxx}/lib/libc++*.dylib $out/lib
- cp -d ${llvmPackages.libcxxabi}/lib/libc++abi*.dylib $out/lib
- cp -d ${llvmPackages.compiler-rt}/lib/darwin/libclang_rt* $out/lib/darwin
- cp -d ${llvmPackages.compiler-rt}/lib/libclang_rt* $out/lib
- cp -d ${llvmPackages.llvm.lib}/lib/libLLVM.dylib $out/lib
- cp -d ${libffi}/lib/libffi*.dylib $out/lib
+ cp -d ${lib.getLib llvmPackages.libcxx}/lib/libc++*.dylib $out/lib
+ cp -d ${lib.getLib llvmPackages.libcxxabi}/lib/libc++abi*.dylib $out/lib
+ cp -d ${lib.getLib llvmPackages.compiler-rt}/lib/darwin/libclang_rt* $out/lib/darwin
+ cp -d ${lib.getLib llvmPackages.compiler-rt}/lib/libclang_rt* $out/lib
+ cp -d ${lib.getLib llvmPackages.llvm.lib}/lib/libLLVM.dylib $out/lib
+ cp -d ${lib.getLib libffi}/lib/libffi*.dylib $out/lib
mkdir $out/include
cp -rd ${llvmPackages.libcxx.dev}/include/c++ $out/include
@@ -150,11 +106,11 @@ in rec {
${lib.optionalString targetPlatform.isAarch64 ''
# copy .tbd assembly utils
cp -d ${pkgs.darwin.rewrite-tbd}/bin/rewrite-tbd $out/bin
- cp -d ${pkgs.libyaml}/lib/libyaml*.dylib $out/lib
+ cp -d ${lib.getLib pkgs.libyaml}/lib/libyaml*.dylib $out/lib
# copy package extraction tools
cp -d ${pkgs.pbzx}/bin/pbzx $out/bin
- cp -d ${pkgs.xar}/lib/libxar*.dylib $out/lib
+ cp -d ${lib.getLib pkgs.xar}/lib/libxar*.dylib $out/lib
cp -d ${pkgs.bzip2.out}/lib/libbz2*.dylib $out/lib
# copy sigtool
@@ -162,7 +118,7 @@ in rec {
cp -d ${pkgs.darwin.sigtool}/bin/codesign $out/bin
''}
- cp -d ${darwin.ICU}/lib/libicu*.dylib $out/lib
+ cp -d ${lib.getLib darwin.ICU}/lib/libicu*.dylib $out/lib
cp -d ${zlib.out}/lib/libz.* $out/lib
cp -d ${gmpxx.out}/lib/libgmp*.* $out/lib
cp -d ${xz.out}/lib/liblzma*.* $out/lib
@@ -172,7 +128,7 @@ in rec {
cp ${cctools_}/bin/$i $out/bin
done
- cp -d ${darwin.libtapi}/lib/libtapi* $out/lib
+ cp -d ${lib.getLib darwin.libtapi}/lib/libtapi* $out/lib
${lib.optionalString targetPlatform.isx86_64 ''
cp -rd ${pkgs.darwin.CF}/Library $out
diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh b/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh
index b7645547ab..2951813c0f 100644
--- a/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh
+++ b/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh
@@ -986,7 +986,18 @@ patchPhase() {
fixLibtool() {
- sed -i -e 's^eval sys_lib_.*search_path=.*^^' "$1"
+ local search_path
+ for flag in $NIX_LDFLAGS; do
+ case $flag in
+ -L*)
+ search_path+=" ${flag#-L}"
+ ;;
+ esac
+ done
+
+ sed -i "$1" \
+ -e "s^eval \(sys_lib_search_path=\).*^\1'$search_path'^" \
+ -e 's^eval sys_lib_.+search_path=.*^^'
}
diff --git a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix
index 0b9d6b4738..754b2e8cea 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix
@@ -20,17 +20,18 @@ let
in
with py.pkgs; buildPythonApplication rec {
pname = "awscli";
- version = "1.20.54"; # N.B: if you change this, change botocore and boto3 to a matching version too
+ version = "1.22.14"; # N.B: if you change this, change botocore and boto3 to a matching version too
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-stnuPobBKIpKA4iTKGTO5kmMEl7grFdZNryz40S599M=";
+ sha256 = "sha256-FTGtUqdjZel8XqSrO3s3XQNqR6fyTO3mc1gyIQfk9n8=";
};
# https://github.com/aws/aws-cli/issues/4837
postPatch = ''
substituteInPlace setup.py \
- --replace "docutils>=0.10,<0.16" "docutils>=0.10"
+ --replace "docutils>=0.10,<0.16" "docutils>=0.10" \
+ --replace "rsa>=3.1.2,<4.8" "rsa<5,>=3.1.2"
'';
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix
index 1541e79627..ab8528595a 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix
@@ -118,9 +118,6 @@ let
'';
};
- azure-appconfiguration = overrideAzureMgmtPackage super.azure-appconfiguration "1.1.1" "zip"
- "sha256-uDzSy2PZMiXehOJ6u/wFkhL43id2b0xY3Tq7g53/C+Q=";
-
azure-batch = overrideAzureMgmtPackage super.azure-batch "11.0.0" "zip"
"83d7a2b0be42ca456ac2b56fa3dc6ce704c130e888d37d924072c1d3718f32da";
@@ -149,7 +146,7 @@ let
"sha256-p9MTfVxGD1CsLUQGHWCnC08nedTKhEt3QZtXJeZeCb4=";
azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "3.0.0" "zip"
- "sha256-y5akbJdqXZsRi+mecq1opR1Ye9yTxNblGp/zjiXEqaY=";
+ "sha256-GZJIayjd1tT1l/0wBCF80sr09NyKDOcSJrWudnrOOhg=";
azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "19.0.0" "zip"
"bbb60bb9419633c2339569d4e097908638c7944e782b5aef0f5d9535085a9100";
@@ -310,6 +307,17 @@ let
azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "0.7.0" "tar.gz"
"cd4f184be8c9ca8aca969f93ed50dc7fe556d28ca11520440fc182cf876abdf9";
+ azure-appconfiguration = super.azure-appconfiguration.overrideAttrs(oldAttrs: rec {
+ version = "1.1.1";
+
+ src = super.fetchPypi {
+ inherit (oldAttrs) pname;
+ inherit version;
+ sha256 = "sha256-uDzSy2PZMiXehOJ6u/wFkhL43id2b0xY3Tq7g53/C+Q=";
+ extension = "zip";
+ };
+ });
+
azure-graphrbac = super.azure-graphrbac.overrideAttrs(oldAttrs: rec {
version = "0.60.0";
diff --git a/third_party/nixpkgs/pkgs/tools/admin/chamber/default.nix b/third_party/nixpkgs/pkgs/tools/admin/chamber/default.nix
index ef304ff208..777366e16c 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/chamber/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/chamber/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "chamber";
- version = "2.10.6";
+ version = "2.10.7";
src = fetchFromGitHub {
owner = "segmentio";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-8VnFpzm5St0AYFzups2ILQ/MrQRZLQ1xY9JjlGVBmZk=";
+ sha256 = "sha256-HpxHGbgPdu92ha0QO15x1rrJikDmpSA8E8YdgjzQ/Mw=";
};
CGO_ENABLED = 0;
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/cpio/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/cpio/default.nix
index 1ae8de975a..274fe0ac83 100644
--- a/third_party/nixpkgs/pkgs/tools/archivers/cpio/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/archivers/cpio/default.nix
@@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
})
];
+ separateDebugInfo = true;
+
preConfigure = lib.optionalString stdenv.isCygwin ''
sed -i gnu/fpending.h -e 's,include ,,'
'';
diff --git a/third_party/nixpkgs/pkgs/tools/compression/imagelol/default.nix b/third_party/nixpkgs/pkgs/tools/compression/imagelol/default.nix
index d54d2da2f9..187435d4eb 100644
--- a/third_party/nixpkgs/pkgs/tools/compression/imagelol/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/compression/imagelol/default.nix
@@ -12,6 +12,14 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
+ # fix for case-sensitive filesystems
+ # https://github.com/MCredstoner2004/ImageLOL/issues/1
+ postPatch = ''
+ mv imagelol src
+ substituteInPlace CMakeLists.txt \
+ --replace 'add_subdirectory("imagelol")' 'add_subdirectory("src")'
+ '';
+
nativeBuildInputs = [ cmake ];
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/goofys/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/goofys/default.nix
index 94ce7be08e..16c555473f 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/goofys/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/filesystems/goofys/default.nix
@@ -1,4 +1,5 @@
{ lib
+, stdenv
, buildGoModule
, fetchFromGitHub
}:
@@ -29,6 +30,7 @@ buildGoModule {
description = "A high-performance, POSIX-ish Amazon S3 file system written in Go.";
license = [ lib.licenses.mit ];
maintainers = [ lib.maintainers.adisbladis ];
+ broken = stdenv.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix
index 16a251c9cc..932d9c19f3 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "chezmoi";
- version = "2.9.2";
+ version = "2.9.4";
src = fetchFromGitHub {
owner = "twpayne";
repo = "chezmoi";
rev = "v${version}";
- sha256 = "sha256-tGmyn6RCr+1JiSAaoSDzk9rG2+y8G2Eot3srXEJ0Re0=";
+ sha256 = "sha256-idkPhBGrLz4xv/DnFt4iiO4jVRTsBmMXGhM0MQmVtpw=";
};
- vendorSha256 = "sha256-jaEaVfPlYbmQ998KwZm8PUfbNlPEIr1lX5fx90jcqV4=";
+ vendorSha256 = "sha256-9uOlNgMsz4UklSk7UJDKZMjszoxQZK6mLQwhtK8I+Mc=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/tools/misc/desktop-file-utils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/desktop-file-utils/default.nix
index da87d048b7..af3e907c04 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/desktop-file-utils/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/desktop-file-utils/default.nix
@@ -1,17 +1,17 @@
-{ lib, stdenv, fetchurl, pkg-config, glib, libintl }:
+{ lib, stdenv, fetchurl, pkg-config, meson, ninja, glib, libintl }:
with lib;
stdenv.mkDerivation rec {
pname = "desktop-file-utils";
- version = "0.24";
+ version = "0.26";
src = fetchurl {
url = "https://www.freedesktop.org/software/${pname}/releases/${pname}-${version}.tar.xz";
- sha256 = "1nc3bwjdrpcrkbdmzvhckq0yngbcxspwj2n1r7jr3gmx1jk5vpm1";
+ sha256 = "02bkfi6fyk4c0gh2avd897882ww5zl7qg7bzzf28qb57kvkvsvdj";
};
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ pkg-config meson ninja ];
buildInputs = [ glib libintl ];
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ethminer/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ethminer/default.nix
index e159622bc8..ce68e9f820 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/ethminer/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/ethminer/default.nix
@@ -5,7 +5,7 @@
opencl-headers,
cmake,
jsoncpp,
- boost,
+ boost16x,
makeWrapper,
cudatoolkit,
cudaSupport,
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
buildInputs = [
cli11
- boost
+ boost16x # 1.7x support is broken, see https://github.com/ethereum-mining/ethminer/issues/2393
opencl-headers
mesa
ethash
diff --git a/third_party/nixpkgs/pkgs/tools/misc/execline/default.nix b/third_party/nixpkgs/pkgs/tools/misc/execline/default.nix
index 2e1e1b8f7e..e1dd404a35 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/execline/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/execline/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
buildPackage {
pname = "execline";
- version = "2.8.1.0";
- sha256 = "0msmzf5zwjcsgjlvvq28rd2i0fkdb2skmv8ii0ix8dhyckwwjmav";
+ version = "2.8.2.0";
+ sha256 = "0h9kb3cx8dw05md6smvs56i4lr8g5n3ljaxy5vj4zs86yc3pdprg";
description = "A small scripting language, to be used in place of a shell in non-interactive scripts";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix
index 475d8131dd..8d6b2d3829 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "fend";
- version = "0.1.26";
+ version = "0.1.27";
src = fetchFromGitHub {
owner = "printfn";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-U5LYjoq11qZYus/McDbtVljj2RSP9MCXXDvOWgbXerk=";
+ sha256 = "sha256-4Zn42GXtX1UZYa8m3Ig90xDkmwDG7egPE5fRzPYj9sw=";
};
- cargoSha256 = "sha256-E7by7FJfmOBqDoZLA9s/bj/EHaZ4IsHYTHWcvIuaMNg=";
+ cargoSha256 = "sha256-brk6hpBq/wyt0TWQGojTk+bz3/2Jvwx7MoVSkTEq0hU=";
doInstallCheck = true;
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix
index cb79d2ea23..c243e55841 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix
@@ -34,7 +34,7 @@ xorg,
}:
let
- version = "1.29.5";
+ version = "1.29.6";
rpath = lib.makeLibraryPath [
alsa-lib
@@ -84,7 +84,7 @@ let
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb";
- sha256 = "sha256-2nzbWflONhBzzxsk+uxFP4/E2fORJatwNcbrG3xhaPc=";
+ sha256 = "sha256-yLbuHvZrI8C4X/burIo5cI+H8KEv++4FyRgtISpmPxE=";
}
else
throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/s6-portable-utils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/s6-portable-utils/default.nix
index 045a8b9ab0..8487750860 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/s6-portable-utils/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/s6-portable-utils/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
buildPackage {
pname = "s6-portable-utils";
- version = "2.2.3.3";
- sha256 = "132jj5qk8x40kw6lrrn7jiqhvqj9d2h6g6mhl8zma1sp37bg0i84";
+ version = "2.2.3.4";
+ sha256 = "04n9i9ydaa3cb3pip9d02dm24k26v3djvwrafjzq5qx94zvrifip";
description = "A set of tiny general Unix utilities optimized for simplicity and small size";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/steampipe/default.nix b/third_party/nixpkgs/pkgs/tools/misc/steampipe/default.nix
index c85486dcf1..f3cd9b785f 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/steampipe/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/steampipe/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "steampipe";
- version = "0.10.0";
+ version = "0.11.0";
src = fetchFromGitHub {
owner = "turbot";
repo = "steampipe";
rev = "v${version}";
- sha256 = "sha256-Hg9GvHB2eTcOUUC/WLpks9TUWivoV6KxXcWWBWne5Lg=";
+ sha256 = "sha256-P/Fys9/V71+VL5Az3EGGaW+tdeQbr2wO+jvVSVZmJT0=";
};
- vendorSha256 = "sha256-akMUJcAoUGHz3FzDJlMUYtHXrtvU0JMiRfqhTm4IEpA=";
+ vendorSha256 = "sha256-PYaq74NNEOJ1jZ6PoS6zcTiUN4JA9JDjO7GB9tqgT6c=";
# tests are failing for no obvious reasons
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/tools/misc/toybox/default.nix b/third_party/nixpkgs/pkgs/tools/misc/toybox/default.nix
index 0f41f15d9f..07c875a94c 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/toybox/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/toybox/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "toybox";
- version = "0.8.5";
+ version = "0.8.6";
src = fetchFromGitHub {
owner = "landley";
repo = pname;
rev = version;
- sha256 = "sha256-32LQiPsBjBh5LpRZuaYT+Dr/oETNTQERGqrpwWPhMTo=";
+ sha256 = "sha256-NbONJten685wekfCwbOOQxdS3B2/Ljfp/jdTa7D4U+M=";
};
depsBuildBuild = [ buildPackages.stdenv.cc ]; # needed for cross
diff --git a/third_party/nixpkgs/pkgs/tools/misc/woeusb-ng/default.nix b/third_party/nixpkgs/pkgs/tools/misc/woeusb-ng/default.nix
new file mode 100644
index 0000000000..6f922afdf3
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/misc/woeusb-ng/default.nix
@@ -0,0 +1,32 @@
+{ lib, python3Packages, fetchFromGitHub, p7zip, parted, grub2 }:
+with python3Packages;
+
+buildPythonApplication rec {
+ pname = "woeusb-ng";
+ version = "0.2.10";
+
+ propagatedBuildInputs = [ p7zip parted grub2 termcolor wxPython_4_0 six ];
+
+ src = fetchFromGitHub {
+ owner = "WoeUSB";
+ repo = "WoeUSB-ng";
+ rev = "v${version}";
+ sha256 = "sha256-Nsdk3SMRzj1fqLrp5Na5V3rRDMcIReL8uDb8K2GQNWI=";
+ };
+
+ postInstall = ''
+ # TODO: the gui requires additional polkit-actions to work correctly, therefore it is currently disabled
+ rm $out/bin/woeusbgui
+ '';
+
+ # checks fail, because of polkit-actions and should be reenabled when the gui is fixed.
+ doCheck = false;
+
+ meta = with lib; {
+ description = "A tool to create a Windows USB stick installer from a real Windows DVD or image";
+ homepage = "https://github.com/WoeUSB/WoeUSB-ng";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ stunkymonkey ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/yt-dlp/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yt-dlp/default.nix
index e694e15613..ece8418f0b 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/yt-dlp/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/yt-dlp/default.nix
@@ -20,12 +20,12 @@ buildPythonPackage rec {
# The websites yt-dlp deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
- version = "2021.12.1";
+ version = "2021.12.25";
src = fetchPypi {
inherit pname;
version = builtins.replaceStrings [ ".0" ] [ "." ] version;
- sha256 = "sha256-WNpbltSDT+gTDJYLnf1nDNLQ5TtlDNkuXEOBckFRuA8=";
+ sha256 = "sha256-h8E1F8VVEM+sqGFyYN43YCkDXbwvhxWnQmulZS6P4hI=";
};
propagatedBuildInputs = [ websockets mutagen ]
diff --git a/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix b/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix
index 5937249c07..a5abbc26a7 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix
@@ -43,14 +43,14 @@ assert gssSupport -> libkrb5 != null;
stdenv.mkDerivation rec {
pname = "curl";
- version = "7.79.1";
+ version = "7.80.0";
src = fetchurl {
urls = [
"https://curl.haxx.se/download/${pname}-${version}.tar.bz2"
"https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] pname}-${version}/${pname}-${version}.tar.bz2"
];
- sha256 = "0lbq73wz44p4fm2gp05mzrqrzfvhlmvlgfg8c8wkj5lkkamw8qny";
+ sha256 = "170qb2w2p5fga0vqhhnzi417z4h4vy764sz16pzhm5fd9471a3fx";
};
patches = [
@@ -96,17 +96,17 @@ stdenv.mkDerivation rec {
# The build fails when using wolfssl with --with-ca-fallback
(lib.withFeature (!wolfsslSupport) "ca-fallback")
"--disable-manual"
- (lib.withFeatureAs opensslSupport "openssl" openssl.dev)
- (lib.withFeatureAs gnutlsSupport "gnutls" gnutls.dev)
- (lib.withFeatureAs scpSupport "libssh2" libssh2.dev)
+ (lib.withFeatureAs opensslSupport "openssl" (lib.getDev openssl))
+ (lib.withFeatureAs gnutlsSupport "gnutls" (lib.getDev gnutls))
+ (lib.withFeatureAs scpSupport "libssh2" (lib.getDev libssh2))
(lib.enableFeature ldapSupport "ldap")
(lib.enableFeature ldapSupport "ldaps")
- (lib.withFeatureAs idnSupport "libidn" libidn.dev)
+ (lib.withFeatureAs idnSupport "libidn" (lib.getDev libidn))
(lib.withFeature brotliSupport "brotli")
]
- ++ lib.optional wolfsslSupport "--with-wolfssl=${wolfssl.dev}"
+ ++ lib.optional wolfsslSupport "--with-wolfssl=${lib.getDev wolfssl}"
++ lib.optional c-aresSupport "--enable-ares=${c-ares}"
- ++ lib.optional gssSupport "--with-gssapi=${libkrb5.dev}"
+ ++ lib.optional gssSupport "--with-gssapi=${lib.getDev libkrb5}"
# For the 'urandom', maybe it should be a cross-system option
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
"--with-random=/dev/urandom"
@@ -126,7 +126,7 @@ stdenv.mkDerivation rec {
# Install completions
make -C scripts install
'' + lib.optionalString scpSupport ''
- sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la
+ sed '/^dependency_libs/s|${lib.getDev libssh2}|${lib.getLib libssh2}|' -i "$out"/lib/*.la
'' + lib.optionalString gnutlsSupport ''
ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so
ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so.4
@@ -139,7 +139,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A command line tool for transferring files with URL syntax";
- homepage = "https://curl.haxx.se/";
+ homepage = "https://curl.se/";
license = licenses.curl;
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.all;
diff --git a/third_party/nixpkgs/pkgs/tools/networking/proxify/default.nix b/third_party/nixpkgs/pkgs/tools/networking/proxify/default.nix
index 47e36df3ac..36db5037a4 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/proxify/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/proxify/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "proxify";
- version = "0.0.4";
+ version = "0.0.5";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "proxify";
rev = "v${version}";
- sha256 = "0qhr51naa7ad80fsr12ka432071mfb1zq2wd852p1lyvy0mdf52s";
+ sha256 = "sha256-jITmLJHKTIXnQRUTLaXQPv57gJSbD+6AfJNl36AemR0=";
};
- vendorSha256 = "0dynyhqh8jzmljqng1yh07r6k6zfzlsgh36rlynbdgcvjl7jdhnx";
+ vendorSha256 = "sha256-Yf1edWWHao2A+iY/5N14mvtvLP+IJDZEEB0Voj47sCs=";
meta = with lib; {
description = "Proxy tool for HTTP/HTTPS traffic capture";
diff --git a/third_party/nixpkgs/pkgs/tools/networking/s6-dns/default.nix b/third_party/nixpkgs/pkgs/tools/networking/s6-dns/default.nix
index 0a7307b629..678b8639f0 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/s6-dns/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/s6-dns/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
buildPackage {
pname = "s6-dns";
- version = "2.3.5.2";
- sha256 = "0nczzjprvp6wirzycgf5h32dlgx4r8grzkqhif27n3ii6f5g78yw";
+ version = "2.3.5.3";
+ sha256 = "1nknkh2rw7ggf5ncspb11wyp6ldyqc9lf3nmnklwb5fcf5kjzi1a";
description = "A suite of DNS client programs and libraries for Unix systems";
diff --git a/third_party/nixpkgs/pkgs/tools/networking/s6-networking/default.nix b/third_party/nixpkgs/pkgs/tools/networking/s6-networking/default.nix
index 42f7187fab..abdc773280 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/s6-networking/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/s6-networking/default.nix
@@ -19,8 +19,8 @@ assert sslSupportEnabled -> sslLibs ? ${sslSupport};
buildPackage {
pname = "s6-networking";
- version = "2.5.0.0";
- sha256 = "1fn3g9gkwgmnxallhk82f5rly81pnkilj7n49g5fbfmaalsq96mh";
+ version = "2.5.1.0";
+ sha256 = "0hgzj68bk17r1gr32ld1dm5s1x1a5x8ac03klykhfbasx8gwa1r5";
description = "A suite of small networking utilities for Unix systems";
diff --git a/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix b/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix
index c2ae4020ee..b6d91da334 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "shadowsocks-rust";
- version = "1.12.4";
+ version = "1.12.5";
src = fetchFromGitHub {
rev = "v${version}";
owner = "shadowsocks";
repo = pname;
- sha256 = "sha256-gPeikQ6a7GFgjGIwcufMCnGgqqVzHkMbQIgIPpBuOLE=";
+ sha256 = "sha256-whPaFb+4mYOWmtFc/a+NkH9avCfOnGnAvqz3UFTt+RY=";
};
- cargoSha256 = "sha256-8qt8uapiFMhmPnbihqWoBalGV6LLsgg0pfxzw+gi4TI=";
+ cargoSha256 = "sha256-w7AqNsa9lolPEiHEv7E4XGaFV/UbCeYvmWekr9YzO6Q=";
RUSTC_BOOTSTRAP = 1;
diff --git a/third_party/nixpkgs/pkgs/tools/networking/stubby/default.nix b/third_party/nixpkgs/pkgs/tools/networking/stubby/default.nix
deleted file mode 100644
index abe11b7bcb..0000000000
--- a/third_party/nixpkgs/pkgs/tools/networking/stubby/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, getdns, doxygen, libyaml, darwin, cmake, systemd }:
-
-stdenv.mkDerivation rec {
- pname = "stubby";
- version = "0.3.0";
-
- src = fetchFromGitHub {
- owner = "getdnsapi";
- repo = pname;
- rev = "v${version}";
- sha256 = "04izd1v4fv9l7r75aafkrp6svczbx4cvv1vnfyx5n9105pin11mx";
- };
-
- nativeBuildInputs = [ cmake libyaml ];
-
- buildInputs = [ doxygen getdns systemd ]
- ++ lib.optionals stdenv.isDarwin [ darwin.Security ];
-
- meta = with lib; {
- description = "A local DNS Privacy stub resolver (using DNS-over-TLS)";
- longDescription = ''
- Stubby is an application that acts as a local DNS Privacy stub
- resolver (using RFC 7858, aka DNS-over-TLS). Stubby encrypts DNS
- queries sent from a client machine (desktop or laptop) to a DNS
- Privacy resolver increasing end user privacy. Stubby is developed by
- the getdns team.
- '';
- homepage = "https://dnsprivacy.org/wiki/x/JYAT";
- downloadPage = "https://github.com/getdnsapi/stubby";
- maintainers = with maintainers; [ leenaars ehmry ];
- license = licenses.bsd3; platforms = platforms.all;
- };
-}
diff --git a/third_party/nixpkgs/pkgs/tools/networking/tgt/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tgt/default.nix
index ba1f89af43..fdaf0dc177 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/tgt/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/tgt/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "tgt";
- version = "1.0.80";
+ version = "1.0.81";
src = fetchFromGitHub {
owner = "fujita";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-5qBqCHbkL6yw/iT2AtSumw8V0bV74TEyYMRgcPHW2lg=";
+ sha256 = "sha256-SgMpoaVAuTbgpmnXRfQFWlK5gl01fsE9vJxu3C2ctPU=";
};
nativeBuildInputs = [ libxslt docbook_xsl makeWrapper ];
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "iSCSI Target daemon with RDMA support";
- homepage = "http://stgt.sourceforge.net/";
+ homepage = "https://github.com/fujita/tgt";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ johnazoidberg ];
diff --git a/third_party/nixpkgs/pkgs/tools/networking/wrk/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wrk/default.nix
index 4298bd70d6..74280724ca 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/wrk/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/wrk/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "wrk";
- version = "4.1.0";
+ version = "4.2.0";
src = fetchFromGitHub {
owner = "wg";
repo = "wrk";
rev = version;
- sha256 = "0dblb3qdg8mbgb8iiks0g420pza13npbr33b2xkc5dgv7kcwmvqj";
+ sha256 = "sha256-nCfA444p7krXOB3qRtDKWxWj9tsrDZsGf03ThtE1dXM=";
};
buildInputs = [ luajit openssl perl ];
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix
index 777aadfa96..85d8c259d6 100644
--- a/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "nfpm";
- version = "2.10.0";
+ version = "2.11.2";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-ZLlTcybBoLfiSWb0DKn+U+S/LbekZvTRyDV6b1q9FDU=";
+ sha256 = "sha256-ycb5331o/ILz+eUGGipBrjI7/pYnmHUSDRc4UNpJO5s=";
};
- vendorSha256 = "sha256-uGpMOKqNgGOtgLU9ztg3GmR4FYBaldgZf6BZWxn08W8=";
+ vendorSha256 = "sha256-RaAb8QDFp/7TolsNZqcXurozr3vvK0SRyyy2h8MPhnk=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix-doc/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix-doc/default.nix
index e12bed7d92..d3d45e6bbb 100644
--- a/third_party/nixpkgs/pkgs/tools/package-management/nix-doc/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/package-management/nix-doc/default.nix
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "nix-doc";
- version = "0.5.1";
+ version = "0.5.2";
src = fetchFromGitHub {
rev = "v${version}";
owner = "lf-";
repo = "nix-doc";
- sha256 = "0yx5y90shdjwihbjrvv2m3bycgpdalafc9q4acfczfaymag8ggad";
+ sha256 = "sha256-P4AX8ERsMHGkGowc05M7xE5HTFSmaJvD2z0Prz4emeQ=";
};
doCheck = true;
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ];
- cargoSha256 = "11bcn111j4iqwqwpp26w7rnycasbhiixaqb1rq4ry2402hvl90j7";
+ cargoSha256 = "sha256-RxsH4bSAzBslK8MVGmCJxduf6MYOtQEKxt9QjgUCg1o=";
meta = with lib; {
description = "An interactive Nix documentation tool";
diff --git a/third_party/nixpkgs/pkgs/tools/security/cdk-go/default.nix b/third_party/nixpkgs/pkgs/tools/security/cdk-go/default.nix
index 465b987ec7..14f7e05140 100644
--- a/third_party/nixpkgs/pkgs/tools/security/cdk-go/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/cdk-go/default.nix
@@ -1,4 +1,5 @@
{ lib
+, stdenv
, buildGoModule
, fetchFromGitHub
}:
@@ -25,5 +26,6 @@ buildGoModule rec {
license = with licenses; [ gpl2Only ];
maintainers = with maintainers; [ fab ];
mainProgram = "cdk";
+ broken = stdenv.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/security/cve-bin-tool/default.nix b/third_party/nixpkgs/pkgs/tools/security/cve-bin-tool/default.nix
index fac9226287..dd26ce887e 100644
--- a/third_party/nixpkgs/pkgs/tools/security/cve-bin-tool/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/cve-bin-tool/default.nix
@@ -28,13 +28,13 @@
}:
buildPythonApplication rec {
pname = "cve-bin-tool";
- version = "2.2.1";
+ version = "3.0";
src = fetchFromGitHub {
owner = "intel";
repo = "cve-bin-tool";
rev = "v${version}";
- sha256 = "087w7fsc4vd4sjz8ww6q71b108yhz94ydr76d99rhlmcqsq7fihs";
+ sha256 = "1fmdnlhi03fdr4d4n7ydf6m0gx0cl77n3db8ldbs3m9zryblhzpr";
};
# Wants to open a sqlite database, access the internet, etc
diff --git a/third_party/nixpkgs/pkgs/tools/security/passff-host/default.nix b/third_party/nixpkgs/pkgs/tools/security/passff-host/default.nix
index 87b349c63a..4eb615b790 100644
--- a/third_party/nixpkgs/pkgs/tools/security/passff-host/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/passff-host/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "passff-host";
- version = "1.2.2";
+ version = "1.2.3";
src = fetchFromGitHub {
owner = "passff";
repo = pname;
rev = version;
- sha256 = "sha256-9q4onU/e/pzLp5lGQjf/ScOOCVMiMQRaLGEm8K8flX4=";
+ sha256 = "sha256-1JPToJF/ruu69TEZAAvV3Zl0qcTpEyMb2qQDAWWgKNw=";
};
buildInputs = [ python3 ];
@@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
/etc/opt/chrome/native-messaging-hosts
/etc/chromium/native-messaging-hosts
/etc/vivaldi/native-messaging-hosts
+ /lib/librewolf/native-messaging-hosts
)
for manifestDir in "''${nativeMessagingPaths[@]}"; do
@@ -42,6 +43,6 @@ stdenv.mkDerivation rec {
description = "Host app for the WebExtension PassFF";
homepage = "https://github.com/passff/passff-host";
license = licenses.gpl2;
- maintainers = with maintainers; [ nadrieril ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/security/qdigidoc/default.nix b/third_party/nixpkgs/pkgs/tools/security/qdigidoc/default.nix
index 86dc3dfff3..c0b2f73d5c 100644
--- a/third_party/nixpkgs/pkgs/tools/security/qdigidoc/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/qdigidoc/default.nix
@@ -1,25 +1,22 @@
-{ lib, mkDerivation, fetchgit, fetchurl, cmake, darkhttpd, gettext, makeWrapper, pkg-config
-, libdigidocpp, opensc, openldap, openssl, pcsclite, qtbase, qttranslations, qtsvg }:
+{ lib, mkDerivation, fetchurl, cmake, darkhttpd, gettext, makeWrapper
+, pkg-config, libdigidocpp, opensc, openldap, openssl, pcsclite, qtbase
+, qttranslations, qtsvg }:
mkDerivation rec {
pname = "qdigidoc";
- version = "4.2.8";
+ version = "4.2.9";
- src = fetchgit {
- url = "https://github.com/open-eid/DigiDoc4-Client";
- rev = "v${version}";
- sha256 = "02k2s6l79ssvrksa0midm7bq856llrmq0n40yxwm3j011nvc8vsm";
- fetchSubmodules = true;
+ src = fetchurl {
+ url =
+ "https://github.com/open-eid/DigiDoc4-Client/releases/download/v${version}/qdigidoc4-${version}.tar.gz";
+ sha256 = "1rhd3mvj6ld16zgfscj81f1vhs2nvifsizky509l1av7dsjfbbzr";
};
tsl = fetchurl {
- url = "https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl-mp.xml";
- sha256 = "0klz9blrp0jjhlr9k1i266afp44pqmii1x0y8prk0417ia3fxpli";
+ url = "https://ec.europa.eu/tools/lotl/eu-lotl-pivot-300.xml";
+ sha256 = "1cikz36w9phgczcqnwk4k3mx3kk919wy2327jksmfa4cjfjq4a8d";
};
- # Adds explicit imports for QPainterPath, fixed in upstream (https://github.com/open-eid/DigiDoc4-Client/pull/914)
- patches = [ ./qt5.15.patch ];
-
nativeBuildInputs = [ cmake darkhttpd gettext makeWrapper pkg-config ];
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/tools/security/qdigidoc/qt5.15.patch b/third_party/nixpkgs/pkgs/tools/security/qdigidoc/qt5.15.patch
deleted file mode 100644
index 6f39070234..0000000000
--- a/third_party/nixpkgs/pkgs/tools/security/qdigidoc/qt5.15.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 1aa314f5433b9b3e89a1c05b5c465fb477435e23 Mon Sep 17 00:00:00 2001
-From: Dmitri Smirnov
-Date: Mon, 8 Mar 2021 14:15:27 +0100
-Subject: [PATCH] =?UTF-8?q?Added=20explicit=20imports=20for=20QPainterPath?=
- =?UTF-8?q?=20to=20fix=20builds=20with=20Qt=20=E2=89=A5=205.15?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Dmitri Smirnov
----
- client/widgets/CheckBox.cpp | 1 +
- client/widgets/MainAction.cpp | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/client/widgets/CheckBox.cpp b/client/widgets/CheckBox.cpp
-index a03b56e5d..725d585b7 100644
---- a/client/widgets/CheckBox.cpp
-+++ b/client/widgets/CheckBox.cpp
-@@ -22,6 +22,7 @@
- #include
- #include
- #include
-+#include
- #include
-
- CheckBox::CheckBox(QWidget *parent)
-diff --git a/client/widgets/MainAction.cpp b/client/widgets/MainAction.cpp
-index 4cf4bb1cf..a46c193e3 100644
---- a/client/widgets/MainAction.cpp
-+++ b/client/widgets/MainAction.cpp
-@@ -24,6 +24,7 @@
-
- #include
- #include
-+#include
- #include
-
- using namespace ria::qdigidoc4;
diff --git a/third_party/nixpkgs/pkgs/tools/security/wapiti/default.nix b/third_party/nixpkgs/pkgs/tools/security/wapiti/default.nix
index 38ba47a512..4d877030e5 100644
--- a/third_party/nixpkgs/pkgs/tools/security/wapiti/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/wapiti/default.nix
@@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "wapiti";
- version = "3.0.5";
+ version = "3.0.7";
src = fetchFromGitHub {
owner = "wapiti-scanner";
repo = pname;
rev = version;
- sha256 = "0663hzpmn6p5xh65d2gk4yk2zh992lfd9lhdwwabhpv3n85nza75";
+ sha256 = "0kya9a2zs1c518z4p34pfjx2sms6843gh3c9qc9zvk4lr4g7hw3x";
};
nativeBuildInputs = with python3.pkgs; [
@@ -19,19 +19,26 @@ python3.pkgs.buildPythonApplication rec {
];
propagatedBuildInputs = with python3.pkgs; [
+ aiocache
+ aiosqlite
beautifulsoup4
browser-cookie3
cryptography
- Mako
- markupsafe
- pysocks
+ dnspython
httpx
httpx-ntlm
httpx-socks
+ loguru
+ Mako
+ markupsafe
+ pysocks
six
+ sqlalchemy
tld
yaswfp
- ] ++ lib.optionals (python3.pythonOlder "3.8") [ importlib-metadata ];
+ ] ++ lib.optionals (python3.pythonOlder "3.8") [
+ importlib-metadata
+ ];
checkInputs = with python3.pkgs; [
respx
@@ -42,9 +49,18 @@ python3.pkgs.buildPythonApplication rec {
postPatch = ''
# Ignore pinned versions
substituteInPlace setup.py \
- --replace "==" ">="
+ --replace "httpx-socks[asyncio] == 0.5.1" "httpx-socks[asyncio]" \
+ --replace "markupsafe==1.1.1" "markupsafe" \
+ --replace "importlib_metadata==3.7.2" "importlib_metadata" \
+ --replace "browser-cookie3==0.11.4" "browser-cookie3" \
+ --replace "cryptography==3.3.2" "cryptography" \
+ --replace "httpx[brotli]==0.20.0" "httpx" \
+ --replace "sqlalchemy>=1.4.26" "sqlalchemy" \
+ --replace "aiocache==0.11.1" "aiocache" \
+ --replace "aiosqlite==0.17.0" "aiosqlite" \
+ --replace "dnspython==2.1.0" "dnspython"
substituteInPlace setup.cfg \
- --replace " --cov" ""
+ --replace " --cov --cov-report=xml" ""
'';
preCheck = ''
@@ -92,6 +108,7 @@ python3.pkgs.buildPythonApplication rec {
"test_title_false_positive"
"test_title_positive"
"test_true_positive_request_count"
+ "test_unregistered_cname"
"test_url_detection"
"test_warning"
"test_whole"
@@ -108,7 +125,9 @@ python3.pkgs.buildPythonApplication rec {
"test_persister_upload"
];
- pythonImportsCheck = [ "wapitiCore" ];
+ pythonImportsCheck = [
+ "wapitiCore"
+ ];
meta = with lib; {
description = "Web application vulnerability scanner";
diff --git a/third_party/nixpkgs/pkgs/tools/system/gotop/default.nix b/third_party/nixpkgs/pkgs/tools/system/gotop/default.nix
index dffbaaa818..27b24b869c 100644
--- a/third_party/nixpkgs/pkgs/tools/system/gotop/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/gotop/default.nix
@@ -28,5 +28,6 @@ buildGoModule rec {
changelog = "https://github.com/xxxserxxx/gotop/raw/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = [ maintainers.magnetophon ];
+ broken = stdenv.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/system/s6-rc/default.nix b/third_party/nixpkgs/pkgs/tools/system/s6-rc/default.nix
index ab4ea78049..0144a605e4 100644
--- a/third_party/nixpkgs/pkgs/tools/system/s6-rc/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/s6-rc/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
buildPackage {
pname = "s6-rc";
- version = "0.5.2.3";
- sha256 = "1xyaplwzvqnb53mg59a7jklakzwsiqivp6qggsry3sbaw4hf3d5j";
+ version = "0.5.3.0";
+ sha256 = "09rznjlz988fk9pff6mxc3dknwh2mibbawr9g62gcscmscmiv8wk";
description = "A service manager for s6-based systems";
platforms = lib.platforms.unix;
diff --git a/third_party/nixpkgs/pkgs/tools/system/s6/default.nix b/third_party/nixpkgs/pkgs/tools/system/s6/default.nix
index dc64afa624..f1215f9934 100644
--- a/third_party/nixpkgs/pkgs/tools/system/s6/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/s6/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
buildPackage {
pname = "s6";
- version = "2.11.0.0";
- sha256 = "1a3lj0xfhn1w3a4ygqsxy8q4dr3n48hnwml4xzdpz3nrikhy8if5";
+ version = "2.11.0.1";
+ sha256 = "02pr4q4cr9wc8i8ad8s6184a6fyndpmpnylgxwhfnkk3hx2j0zxd";
description = "skarnet.org's small & secure supervision software suite";
diff --git a/third_party/nixpkgs/pkgs/tools/video/rav1e/default.nix b/third_party/nixpkgs/pkgs/tools/video/rav1e/default.nix
index d6fc422b4c..bbf1e81a83 100644
--- a/third_party/nixpkgs/pkgs/tools/video/rav1e/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/video/rav1e/default.nix
@@ -16,6 +16,8 @@ in rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ nasm cargo-c ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
+ checkType = "debug";
+
postBuild = ''
cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec}
'';
diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix
index b66badd5f8..c0ff147fce 100644
--- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix
@@ -186,6 +186,8 @@ with pkgs;
antsimulator = callPackage ../games/antsimulator { };
+ aocd = with pythonPackages; toPythonApplication aocd;
+
astrolog = callPackage ../applications/science/astronomy/astrolog { };
atkinson-hyperlegible = callPackage ../data/fonts/atkinson-hyperlegible { };
@@ -4030,7 +4032,7 @@ with pkgs;
libceph = ceph.lib;
inherit (callPackages ../tools/filesystems/ceph {
- boost = boost17x.override { enablePython = true; python = python3; };
+ boost = boost175.override { enablePython = true; python = python3; };
lua = lua5_4;
})
ceph
@@ -4960,9 +4962,7 @@ with pkgs;
vorta = libsForQt5.callPackage ../applications/backup/vorta { };
- vowpal-wabbit = callPackage ../applications/science/machine-learning/vowpal-wabbit {
- boost = boost17x;
- };
+ vowpal-wabbit = callPackage ../applications/science/machine-learning/vowpal-wabbit { };
utahfs = callPackage ../applications/networking/utahfs { };
@@ -5070,7 +5070,9 @@ with pkgs;
emv = callPackage ../tools/misc/emv { };
- enblend-enfuse = callPackage ../tools/graphics/enblend-enfuse { };
+ enblend-enfuse = callPackage ../tools/graphics/enblend-enfuse {
+ boost = boost172;
+ };
endlessh = callPackage ../servers/endlessh { };
@@ -6657,7 +6659,9 @@ with pkgs;
isl_0_20 = callPackage ../development/libraries/isl/0.20.0.nix { };
isl_0_24 = callPackage ../development/libraries/isl/0.24.0.nix { };
- ispike = callPackage ../development/libraries/science/robotics/ispike { };
+ ispike = callPackage ../development/libraries/science/robotics/ispike {
+ boost = boost16x;
+ };
isrcsubmit = callPackage ../tools/audio/isrcsubmit { };
@@ -7231,9 +7235,9 @@ with pkgs;
nixnote2 = libsForQt514.callPackage ../applications/misc/nixnote2 { };
- nodejs = hiPrio nodejs-14_x;
+ nodejs = hiPrio nodejs-16_x;
- nodejs-slim = nodejs-slim-14_x;
+ nodejs-slim = nodejs-slim-16_x;
nodejs-10_x = callPackage ../development/web/nodejs/v10.nix {
@@ -7266,7 +7270,10 @@ with pkgs;
nodePackages_latest = dontRecurseIntoAttrs nodejs_latest.pkgs;
- nodePackages = dontRecurseIntoAttrs nodejs.pkgs;
+ nodePackages = (dontRecurseIntoAttrs nodejs.pkgs).override {
+ # It does not work on 16.x: https://github.com/NixOS/nixpkgs/issues/132456
+ nodejs = nodejs-14_x;
+ };
np2kai = callPackage ../misc/emulators/np2kai { };
@@ -7943,7 +7950,9 @@ with pkgs;
netcdfcxx4 = callPackage ../development/libraries/netcdf-cxx4 { };
- netcdffortran = callPackage ../development/libraries/netcdf-fortran { };
+ netcdffortran = callPackage ../development/libraries/netcdf-fortran {
+ inherit (darwin.apple_sdk.frameworks) CoreFoundation;
+ };
networking-ts-cxx = callPackage ../development/libraries/networking-ts-cxx { };
@@ -8839,7 +8848,9 @@ with pkgs;
postscript-lexmark = callPackage ../misc/drivers/postscript-lexmark { };
- povray = callPackage ../tools/graphics/povray { };
+ povray = callPackage ../tools/graphics/povray {
+ boost = boost175;
+ };
power-profiles-daemon = callPackage ../os-specific/linux/power-profiles-daemon { };
@@ -9780,8 +9791,6 @@ with pkgs;
stremio = qt5.callPackage ../applications/video/stremio { };
- stubby = callPackage ../tools/networking/stubby { };
-
sunwait = callPackage ../applications/misc/sunwait { };
surface-control = callPackage ../applications/misc/surface-control { };
@@ -11012,6 +11021,8 @@ with pkgs;
woeusb = callPackage ../tools/misc/woeusb { };
+ woeusb-ng = callPackage ../tools/misc/woeusb-ng { };
+
wslu = callPackage ../tools/system/wslu { };
chase = callPackage ../tools/system/chase { };
@@ -12587,7 +12598,7 @@ with pkgs;
# This returns the minimum supported version for the platform. The
# assumption is that or any later version is good.
choose = platform:
- /**/ if platform.isDarwin then (if platform.isAarch64 then 11 else 7)
+ /**/ if platform.isDarwin then 11
else if platform.isFreeBSD then 7
else if platform.isAndroid then 12
else if platform.isLinux then
@@ -12871,18 +12882,18 @@ with pkgs;
inherit (darwin) apple_sdk;
};
- rust_1_56 = callPackage ../development/compilers/rust/1_56.nix {
+ rust_1_57 = callPackage ../development/compilers/rust/1_57.nix {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
llvm_13 = llvmPackages_13.libllvm;
};
- rust = rust_1_56;
+ rust = rust_1_57;
mrustc = callPackage ../development/compilers/mrustc { };
mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { };
mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { };
- rustPackages_1_56 = rust_1_56.packages.stable;
- rustPackages = rustPackages_1_56;
+ rustPackages_1_57 = rust_1_57.packages.stable;
+ rustPackages = rustPackages_1_57;
inherit (rustPackages) cargo clippy rustc rustPlatform;
@@ -13126,7 +13137,9 @@ with pkgs;
smlpkg = callPackage ../tools/package-management/smlpkg { };
- solc = callPackage ../development/compilers/solc { };
+ solc = callPackage ../development/compilers/solc {
+ boost = boost172;
+ };
souffle = callPackage ../development/compilers/souffle {
autoreconfHook = buildPackages.autoreconfHook269;
@@ -13665,7 +13678,7 @@ with pkgs;
python3Packages = python3.pkgs;
pythonInterpreters = callPackage ./../development/interpreters/python { };
- inherit (pythonInterpreters) python27 python37 python38 python39 python310 python3Minimal pypy27 pypy38 pypy37 rustpython;
+ inherit (pythonInterpreters) python27 python37 python38 python39 python310 python311 python3Minimal pypy27 pypy38 pypy37 rustpython;
# Python package sets.
python27Packages = python27.pkgs;
@@ -13673,6 +13686,7 @@ with pkgs;
python38Packages = recurseIntoAttrs python38.pkgs;
python39Packages = recurseIntoAttrs python39.pkgs;
python310Packages = python310.pkgs;
+ python311Packages = python311.pkgs;
pypyPackages = pypy.pkgs;
pypy2Packages = pypy2.pkgs;
pypy27Packages = pypy27.pkgs;
@@ -14020,6 +14034,8 @@ with pkgs;
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
+ antlr4_9 = callPackage ../development/tools/parsing/antlr/4.9.nix { };
+
antlr4 = antlr4_8;
antlr = antlr4;
@@ -15561,9 +15577,7 @@ with pkgs;
uefi-firmware-parser = callPackage ../development/tools/analysis/uefi-firmware-parser { };
uhd3_5 = callPackage ../applications/radio/uhd/3.5.nix { };
- uhd = callPackage ../applications/radio/uhd {
- boost = boost17x;
- };
+ uhd = callPackage ../applications/radio/uhd { };
uisp = callPackage ../development/embedded/uisp { };
@@ -15658,6 +15672,7 @@ with pkgs;
ycmd = callPackage ../development/tools/misc/ycmd {
inherit (darwin.apple_sdk.frameworks) Cocoa;
python = python3;
+ boost = boost174;
};
yodl = callPackage ../development/tools/misc/yodl { };
@@ -15891,12 +15906,13 @@ with pkgs;
boost173
boost174
boost175
+ boost177
;
boost15x = boost159;
boost16x = boost169;
- boost17x = boost175;
- boost = boost16x;
+ boost17x = boost177;
+ boost = boost17x;
boost_process = callPackage ../development/libraries/boost-process { };
@@ -15948,7 +15964,9 @@ with pkgs;
captive-browser = callPackage ../applications/networking/browsers/captive-browser { };
- ndn-cxx = callPackage ../development/libraries/ndn-cxx { };
+ ndn-cxx = callPackage ../development/libraries/ndn-cxx {
+ boost = boost175;
+ };
ndn-tools = callPackage ../tools/networking/ndn-tools { };
@@ -16082,7 +16100,9 @@ with pkgs;
cpp-ipfs-api = callPackage ../development/libraries/cpp-ipfs-api { };
- cpp-netlib = callPackage ../development/libraries/cpp-netlib {};
+ cpp-netlib = callPackage ../development/libraries/cpp-netlib {
+ boost = boost169; # fatal error: 'boost/asio/stream_socket_service.hpp' file not found
+ };
ubus = callPackage ../development/libraries/ubus { };
@@ -16255,7 +16275,9 @@ with pkgs;
entt = callPackage ../development/libraries/entt { };
- libepoxy = callPackage ../development/libraries/libepoxy {};
+ libepoxy = callPackage ../development/libraries/libepoxy {
+ inherit (darwin.apple_sdk.frameworks) Carbon OpenGL;
+ };
libesmtp = callPackage ../development/libraries/libesmtp { };
@@ -16494,7 +16516,8 @@ with pkgs;
getdata = callPackage ../development/libraries/getdata { };
- getdns = callPackage ../development/libraries/getdns { };
+ inherit (callPackages ../development/libraries/getdns { })
+ getdns stubby;
gettext = callPackage ../development/libraries/gettext { };
@@ -17245,7 +17268,11 @@ with pkgs;
jbigkit = callPackage ../development/libraries/jbigkit { };
- jemalloc = callPackage ../development/libraries/jemalloc { };
+ jemalloc = callPackage ../development/libraries/jemalloc {
+ # tests fail with LLVM 11+
+ # https://github.com/jemalloc/jemalloc/issues/2091
+ stdenv = if stdenv.cc.isClang then llvmPackages_10.stdenv else stdenv;
+ };
jemalloc450 = callPackage ../development/libraries/jemalloc/jemalloc450.nix { };
@@ -17785,7 +17812,9 @@ with pkgs;
libgtop = callPackage ../development/libraries/libgtop {};
- libLAS = callPackage ../development/libraries/libLAS { };
+ libLAS = callPackage ../development/libraries/libLAS {
+ boost = boost172;
+ };
liblaxjson = callPackage ../development/libraries/liblaxjson { };
@@ -18006,7 +18035,9 @@ with pkgs;
librevisa = callPackage ../development/libraries/librevisa { };
- librime = callPackage ../development/libraries/librime {};
+ librime = callPackage ../development/libraries/librime {
+ boost = boost174;
+ };
librsb = callPackage ../development/libraries/librsb {
# Taken from https://build.opensuse.org/package/view_file/science/librsb/librsb.spec
@@ -18198,7 +18229,9 @@ with pkgs;
libndctl = callPackage ../development/libraries/libndctl { };
- libnest2d = callPackage ../development/libraries/libnest2d { };
+ libnest2d = callPackage ../development/libraries/libnest2d {
+ boost = boost174;
+ };
libnet = callPackage ../development/libraries/libnet { };
@@ -18416,7 +18449,9 @@ with pkgs;
libtiff = if stdenv.isDarwin && stdenv.isAarch64
then callPackage ../development/libraries/libtiff/aarch64-darwin.nix { }
- else callPackage ../development/libraries/libtiff { };
+ else callPackage ../development/libraries/libtiff {
+ inherit (darwin.apple_sdk.frameworks) Cocoa GLUT;
+ };
libtiger = callPackage ../development/libraries/libtiger { };
@@ -18509,7 +18544,7 @@ with pkgs;
libunwind =
if stdenv.isDarwin then darwin.libunwind
- else if stdenv.hostPlatform.isRiscV then llvmPackages_latest.libunwind
+ else if stdenv.hostPlatform.system == "riscv32-linux" then llvmPackages_latest.libunwind
else callPackage ../development/libraries/libunwind { };
libuv = callPackage ../development/libraries/libuv {
@@ -18725,6 +18760,7 @@ with pkgs;
proj = proj_7;
};
proj = proj_7;
+ boost = boost175;
};
@@ -19402,7 +19438,7 @@ with pkgs;
inherit lib stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper;
inherit bison cups dconf harfbuzz libGL perl gtk3;
inherit (gst_all_1) gstreamer gst-plugins-base;
- inherit llvmPackages_5 darwin;
+ inherit darwin;
});
qt514 = recurseIntoAttrs (makeOverridable
@@ -19411,7 +19447,7 @@ with pkgs;
inherit lib stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper;
inherit bison cups dconf harfbuzz libGL perl gtk3;
inherit (gst_all_1) gstreamer gst-plugins-base;
- inherit llvmPackages_5 darwin;
+ inherit darwin;
});
qt515 = recurseIntoAttrs (makeOverridable
@@ -19420,7 +19456,7 @@ with pkgs;
inherit lib stdenv fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper;
inherit bison cups dconf harfbuzz libGL perl gtk3;
inherit (gst_all_1) gstreamer gst-plugins-base;
- inherit llvmPackages_5 darwin;
+ inherit darwin;
});
libsForQt512 = recurseIntoAttrs (import ./qt5-packages.nix {
@@ -19700,7 +19736,7 @@ with pkgs;
simp_le = callPackage ../tools/admin/simp_le { };
- simpleitk = callPackage ../development/libraries/simpleitk { };
+ simpleitk = callPackage ../development/libraries/simpleitk { lua = lua5_3; };
sfml = callPackage ../development/libraries/sfml {
inherit (darwin.apple_sdk.frameworks) IOKit Foundation AppKit OpenAL;
@@ -20269,7 +20305,9 @@ with pkgs;
wlr-protocols = callPackage ../development/libraries/wlroots/protocols.nix { };
wt = wt4;
- inherit (callPackages ../development/libraries/wt {})
+ inherit (callPackages ../development/libraries/wt {
+ boost = boost175;
+ })
wt3
wt4;
@@ -21280,6 +21318,7 @@ with pkgs;
};
pulseaudio = callPackage ../servers/pulseaudio ({
+ inherit (darwin) Libc;
inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa;
} // lib.optionalAttrs stdenv.isDarwin {
# Default autoreconfHook (2.70) fails on darwin,
@@ -21647,14 +21686,12 @@ with pkgs;
libtool = darwin.cctools;
};
- # Fails to compile with boost >= 1.72
+ # Fails to compile with boost <= 1.72
rippled = callPackage ../servers/rippled {
- boost = boost17x;
+ boost = boost172;
};
- rippled-validator-keys-tool = callPackage ../servers/rippled/validator-keys-tool.nix {
- boost = boost17x;
- };
+ rippled-validator-keys-tool = callPackage ../servers/rippled/validator-keys-tool.nix { };
roon-bridge = callPackage ../servers/roon-bridge { };
@@ -22733,7 +22770,9 @@ with pkgs;
semodule-utils = callPackage ../os-specific/linux/semodule-utils { };
- powerdns = callPackage ../servers/dns/powerdns { };
+ powerdns = callPackage ../servers/dns/powerdns {
+ boost = boost172;
+ };
powerdns-admin = callPackage ../applications/networking/powerdns-admin { };
@@ -24298,11 +24337,21 @@ with pkgs;
jnetmap = callPackage ../applications/networking/jnetmap {};
- libbitcoin = callPackage ../tools/misc/libbitcoin/libbitcoin.nix { };
- libbitcoin-protocol = callPackage ../tools/misc/libbitcoin/libbitcoin-protocol.nix { };
- libbitcoin-client = callPackage ../tools/misc/libbitcoin/libbitcoin-client.nix { };
- libbitcoin-network = callPackage ../tools/misc/libbitcoin/libbitcoin-network.nix { };
- libbitcoin-explorer = callPackage ../tools/misc/libbitcoin/libbitcoin-explorer.nix { };
+ libbitcoin = callPackage ../tools/misc/libbitcoin/libbitcoin.nix {
+ boost = boost175; # fatal error: 'boost/interprocess/detail/posix_time_types_wrk.hpp' file not found
+ };
+ libbitcoin-protocol = callPackage ../tools/misc/libbitcoin/libbitcoin-protocol.nix {
+ boost = boost175;
+ };
+ libbitcoin-client = callPackage ../tools/misc/libbitcoin/libbitcoin-client.nix {
+ boost = boost175;
+ };
+ libbitcoin-network = callPackage ../tools/misc/libbitcoin/libbitcoin-network.nix {
+ boost = boost175;
+ };
+ libbitcoin-explorer = callPackage ../tools/misc/libbitcoin/libbitcoin-explorer.nix {
+ boost = boost175;
+ };
aumix = callPackage ../applications/audio/aumix {
@@ -25235,7 +25284,6 @@ with pkgs;
unwrapped = callPackage ../applications/radio/gnuradio {
inherit (darwin.apple_sdk.frameworks) CoreAudio;
python = python3;
- boost = boost17x;
};
};
gnuradioPackages = lib.recurseIntoAttrs gnuradio.pkgs;
@@ -25268,7 +25316,6 @@ with pkgs;
unwrapped = callPackage ../applications/radio/gnuradio/3.8.nix {
inherit (darwin.apple_sdk.frameworks) CoreAudio;
python = python3;
- boost = boost17x;
};
};
gnuradio3_8Packages = lib.recurseIntoAttrs gnuradio3_8.pkgs;
@@ -25537,9 +25584,9 @@ with pkgs;
fragments = callPackage ../applications/networking/p2p/fragments { };
freecad = libsForQt5.callPackage ../applications/graphics/freecad {
+ boost = python3Packages.boost169;
inherit (python3Packages)
GitPython
- boost
matplotlib
pivy
ply
@@ -26688,7 +26735,9 @@ with pkgs;
libowlevelzs = callPackage ../development/libraries/libowlevelzs { };
- librecad = libsForQt514.callPackage ../applications/misc/librecad { };
+ librecad = libsForQt514.callPackage ../applications/misc/librecad {
+ boost = boost175;
+ };
libreoffice = hiPrio libreoffice-still;
libreoffice-unwrapped = libreoffice.libreoffice;
@@ -27074,6 +27123,7 @@ with pkgs;
monotone = callPackage ../applications/version-management/monotone {
lua = lua5;
+ boost = boost170;
};
monotoneViz = callPackage ../applications/version-management/monotone-viz {
@@ -27631,7 +27681,9 @@ with pkgs;
openfx = callPackage ../development/libraries/openfx {};
- openimageio = callPackage ../applications/graphics/openimageio { };
+ openimageio = callPackage ../applications/graphics/openimageio {
+ boost = boost175;
+ };
openimageio2 = callPackage ../applications/graphics/openimageio/2.x.nix { };
@@ -28045,9 +28097,7 @@ with pkgs;
qmapshack = libsForQt5.callPackage ../applications/gis/qmapshack { };
- qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview {
- boost = boost17x;
- };
+ qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { };
qmplay2 = libsForQt5.callPackage ../applications/video/qmplay2 { };
@@ -28983,7 +29033,9 @@ with pkgs;
swt = swt_jdk8;
};
- twister = callPackage ../applications/networking/p2p/twister { };
+ twister = callPackage ../applications/networking/p2p/twister {
+ boost = boost16x;
+ };
twmn = libsForQt5.callPackage ../applications/misc/twmn { };
@@ -29856,7 +29908,9 @@ with pkgs;
### BLOCKCHAINS / CRYPTOCURRENCIES / WALLETS
- aeon = callPackage ../applications/blockchains/aeon { };
+ aeon = callPackage ../applications/blockchains/aeon {
+ boost = boost172;
+ };
alfis = callPackage ../applications/blockchains/alfis {
inherit (darwin.apple_sdk.frameworks) Cocoa Security WebKit;
@@ -29945,8 +29999,14 @@ with pkgs;
dcrd = callPackage ../applications/blockchains/dcrd { };
dcrwallet = callPackage ../applications/blockchains/dcrwallet { };
- digibyte = libsForQt514.callPackage ../applications/blockchains/digibyte { withGui = true; };
- digibyted = callPackage ../applications/blockchains/digibyte { withGui = false; };
+ digibyte = libsForQt514.callPackage ../applications/blockchains/digibyte {
+ withGui = true;
+ boost = boost170;
+ };
+ digibyted = callPackage ../applications/blockchains/digibyte {
+ withGui = false;
+ boost = boost170;
+ };
dogecoin = callPackage ../applications/blockchains/dogecoin {
boost = boost165;
@@ -29966,10 +30026,12 @@ with pkgs;
elements = libsForQt5.callPackage ../applications/blockchains/elements {
miniupnpc = miniupnpc_2;
withGui = true;
+ boost = boost175;
};
elementsd = callPackage ../applications/blockchains/elements {
miniupnpc = miniupnpc_2;
withGui = false;
+ boost = boost175;
};
ergo = callPackage ../applications/blockchains/ergo { };
@@ -30008,7 +30070,6 @@ with pkgs;
monero-cli = callPackage ../applications/blockchains/monero-cli {
inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC;
- boost = boost17x;
};
monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui {
@@ -30021,7 +30082,9 @@ with pkgs;
masari = callPackage ../applications/blockchains/masari { boost = boost165; };
- nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { };
+ nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet {
+ boost = boost172;
+ };
namecoin = callPackage ../applications/blockchains/namecoin { withGui = true; };
namecoind = callPackage ../applications/blockchains/namecoin { withGui = false; };
@@ -30060,7 +30123,9 @@ with pkgs;
wasabibackend = callPackage ../applications/blockchains/wasabibackend { Nuget = dotnetPackages.Nuget; };
- wownero = callPackage ../applications/blockchains/wownero { };
+ wownero = callPackage ../applications/blockchains/wownero {
+ boost = boost175;
+ };
zcash = callPackage ../applications/blockchains/zcash { stdenv = llvmPackages_11.stdenv; };
@@ -31441,7 +31506,9 @@ with pkgs;
minia = callPackage ../applications/science/biology/minia { };
- mirtk = callPackage ../development/libraries/science/biology/mirtk { };
+ mirtk = callPackage ../development/libraries/science/biology/mirtk {
+ boost = boost16x;
+ };
muscle = callPackage ../applications/science/biology/muscle { };
@@ -32195,7 +32262,9 @@ with pkgs;
gildas = callPackage ../applications/science/astronomy/gildas { };
- gplates = libsForQt5.callPackage ../applications/science/misc/gplates { };
+ gplates = libsForQt5.callPackage ../applications/science/misc/gplates {
+ boost = boost175;
+ };
gravit = callPackage ../applications/science/astronomy/gravit { };
@@ -32890,7 +32959,7 @@ with pkgs;
nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { };
- nix-doc = callPackage ../tools/package-management/nix-doc { nix = nix_2_3; };
+ nix-doc = callPackage ../tools/package-management/nix-doc { };
nix-bundle = callPackage ../tools/package-management/nix-bundle { };
@@ -33824,7 +33893,9 @@ with pkgs;
NSPlist = callPackage ../development/libraries/NSPlist {};
- PlistCpp = callPackage ../development/libraries/PlistCpp {};
+ PlistCpp = callPackage ../development/libraries/PlistCpp {
+ boost = boost172;
+ };
xib2nib = callPackage ../development/tools/xib2nib {};
diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix
index 339b237493..e2d6c24d60 100644
--- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix
@@ -277,6 +277,7 @@ let
meta = {
description = "Gumbo parser library";
license = with lib.licenses; [ artistic1 gpl1Plus ];
+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.AlienLibGumbo.x86_64-darwin
};
};
@@ -5159,6 +5160,7 @@ let
description = "MessagePack serializing/deserializing";
license = with lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.sgo ];
+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.DataMessagePack.x86_64-darwin
};
};
@@ -5403,6 +5405,7 @@ let
description = "A selection of utilities for data and data types";
license = with lib.licenses; [ artistic1 gpl1Plus ];
homepage = "https://github.com/gfx/Perl-Data-Util";
+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.DataUtil.x86_64-darwin
};
};
@@ -6078,11 +6081,11 @@ let
DBDSQLite = buildPerlPackage {
pname = "DBD-SQLite";
- version = "1.66";
+ version = "1.70";
src = fetchurl {
- url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.66.tar.gz";
- sha256 = "1zljln5nh61gj3k22a1fv2vhx5l83waizmarwkh77hk6kzzmvrw9";
+ url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.70.tar.gz";
+ sha256 = "0gpyv89p3yfwifbm005bz5ci8c63jikkfvafg8x7f3lyaggqvza0";
};
propagatedBuildInputs = [ DBI ];
@@ -6091,6 +6094,13 @@ let
patches = [
# Support building against our own sqlite.
../development/perl-modules/DBD-SQLite/external-sqlite.patch
+
+ # Pull upstream fix for test failures against sqlite-3.37.
+ (fetchpatch {
+ name = "sqlite-3.37-compat.patch";
+ url = "https://github.com/DBD-SQLite/DBD-SQLite/commit/ba4f472e7372dbf453444c7764d1c342e7af12b8.patch";
+ sha256 = "02lg1y6px7h89pfvgrf23anhbl3v050gn0kmaajvv5h6layhjzly";
+ })
];
makeMakerFlags = "SQLITE_INC=${pkgs.sqlite.dev}/include SQLITE_LIB=${pkgs.sqlite.out}/lib";
@@ -6201,6 +6211,10 @@ let
propagatedBuildInputs = [ DBI ];
doCheck = false;
+
+ meta = {
+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.DBDsybase.x86_64-darwin
+ };
};
DBFile = buildPerlPackage {
@@ -8516,6 +8530,7 @@ let
meta = {
description = "Determine MIME types of data or files using libmagic";
license = with lib.licenses; [ artistic1 gpl1Plus ];
+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.FileLibMagic.x86_64-darwin
};
};
@@ -9351,6 +9366,7 @@ let
homepage = "http://gtk2-perl.sourceforge.net";
description = "Perl interface to the 2.x series of the GNOME libraries";
license = lib.licenses.lgpl21Plus;
+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Gnome2Canvas.x86_64-darwin
};
};
@@ -9649,6 +9665,7 @@ let
meta = {
description = "Create user interfaces directly from Glade XML files";
license = lib.licenses.lgpl2Plus;
+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Gtk2GladeXML.x86_64-darwin
};
};
@@ -9662,6 +9679,7 @@ let
propagatedBuildInputs = [ pkgs.gtk2 Gtk2 ];
meta = {
license = lib.licenses.gpl2;
+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Gtk2TrayIcon.x86_64-darwin
};
};
@@ -9712,6 +9730,7 @@ let
meta = {
description = "Use single instance applications";
license = with lib.licenses; [ artistic1 gpl1Plus ];
+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Gtk2Unique.x86_64-darwin
};
};
@@ -9905,6 +9924,7 @@ let
meta = {
description = "Efficient shared mutable hash";
license = with lib.licenses; [ artistic1 gpl1Plus ];
+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.HashSharedMem.x86_64-darwin
};
};
@@ -9977,6 +9997,7 @@ let
homepage = "https://github.com/tokuhirom/HTML-Escape";
description = "Extremely fast HTML escaping";
license = with lib.licenses; [ artistic1 gpl1Plus ];
+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.HTMLEscape.x86_64-darwin
};
};
@@ -10510,7 +10531,9 @@ let
url = "mirror://cpan/authors/id/M/MA/MARKSMITH/HTTP-HeaderParser-XS-0.20.tar.gz";
sha256 = "1vs6sw431nnlnbdy6jii9vqlz30ndlfwdpdgm8a1m6fqngzhzq59";
};
- meta.broken = stdenv.isi686; # loadable library and perl binaries are mismatched (got handshake key 0x7d40080, needed 0x7dc0080)
+ meta.broken =
+ stdenv.isi686 # loadable library and perl binaries are mismatched (got handshake key 0x7d40080, needed 0x7dc0080)
+ || stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.HTTPHeaderParserXS.x86_64-darwin
};
HTTPHeadersFast = buildPerlModule {
@@ -10743,6 +10766,7 @@ let
meta = {
description = "Perl interface to the C library \"libpng\"";
license = with lib.licenses; [ artistic1 gpl1Plus ];
+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.ImagePNGLibpng.x86_64-darwin
};
};
@@ -11476,6 +11500,7 @@ let
'';
license = lib.licenses.artistic2;
+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.InlineJava.x86_64-darwin
};
};
@@ -13485,6 +13510,7 @@ let
meta = {
description = "Fast XS implementation of MaxMind DB reader";
license = with lib.licenses; [ artistic2 ];
+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.MaxMindDBReaderXS.x86_64-darwin
};
};
@@ -13501,6 +13527,7 @@ let
meta = {
description = "Create MaxMind DB database files";
license = with lib.licenses; [ artistic1 gpl1Plus ];
+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.MaxMindDBWriter.x86_64-darwin
};
};
@@ -16252,6 +16279,7 @@ let
meta = {
description = "Perl interface to freedb server(s)";
license = with lib.licenses; [ artistic1 ];
+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.NetFreeDB.x86_64-darwin
};
};
@@ -17515,6 +17543,7 @@ let
description = "Communicate with a smart card using PC/SC";
license = lib.licenses.gpl2Plus;
maintainers = with maintainers; [ abbradar ];
+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.pcscperl.x86_64-darwin
};
};
@@ -18997,6 +19026,29 @@ let
};
};
+ RegexpCommontime = buildPerlPackage {
+ pname = "Regexp-Common-time";
+ version = "0.16";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/M/MA/MANWAR/Regexp-Common-time-0.16.tar.gz";
+ sha256 = "1jjay5gybbls3xn5ihc6q5ig3kf4i28nq4gvg2zp4p5m1ajhg08w";
+ };
+ propagatedBuildInputs = [ RegexpCommon ];
+ meta = {
+ homepage = "https://github.com/manwar/Regexp-Common-time";
+ description = "Date and time regexps.";
+ maintainers = [ maintainers.artturin ];
+ # This module is copyrighted only to ensure proper attribution of
+ # authorship and to ensure that it remains available to all. This
+ # module is free, open-source software. This module may be freely used
+ # for any purpose, commercial, public, or private, provided that proper
+ # credit is given, and that no more-restrictive license is applied to
+ # derivative (not dependent) works.
+ # https://metacpan.org/release/MANWAR/Regexp-Common-time-0.13/view/lib/Regexp/Common/time.pm#LICENSE-AND-COPYRIGHT
+ license = lib.licenses.free;
+ };
+ };
+
RegexpGrammars = buildPerlModule {
pname = "Regexp-Grammars";
version = "1.057";
@@ -20680,6 +20732,9 @@ let
nativeBuildInputs = [ pkgs.pkg-config ];
buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ];
perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local'
+ meta = {
+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.SysVirt.x86_64-darwin
+ };
};
TAPParserSourceHandlerpgTAP = buildPerlModule {
@@ -21169,6 +21224,7 @@ let
meta = {
description = "A new and improved test harness with better Test2 integration";
license = with lib.licenses; [ artistic1 gpl1Plus ];
+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Test2Harness.x86_64-darwin
};
};
@@ -21796,6 +21852,7 @@ let
description = "A LWP::UserAgent suitable for simulating and testing network calls";
license = with lib.licenses; [ artistic1 gpl1Plus ];
homepage = "https://github.com/karenetheridge/Test-LWP-UserAgent";
+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.TestLWPUserAgent.x86_64-darwin
};
};
@@ -21871,6 +21928,7 @@ let
meta = {
description = "assert that code does not cause growth in memory usage";
license = with lib.licenses; [ artistic1 gpl1Plus ];
+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.TestMemoryGrowth.x86_64-darwin
};
};
@@ -22992,6 +23050,9 @@ let
url = "mirror://cpan/authors/id/M/MP/MPIOTR/Text-Iconv-1.7.tar.gz";
sha256 = "5b80b7d5e709d34393bcba88971864a17b44a5bf0f9e4bcee383d029e7d2d5c3";
};
+ meta = {
+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.TextIconv.x86_64-darwin
+ };
};
TestInDistDir = buildPerlPackage {
@@ -23374,6 +23435,9 @@ let
};
# https://rt.cpan.org/Public/Bug/Display.html?id=124815
NIX_CFLAGS_COMPILE = "-DHAS_VPRINTF";
+ meta = {
+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.TextUnaccent.x86_64-darwin
+ };
};
TextUnidecode = buildPerlPackage {
@@ -24434,6 +24498,9 @@ let
substituteInPlace t/cgi-bin/script.cgi \
--replace '#!/usr/bin/perl' '#!${perl}/bin/perl'
'';
+ meta = {
+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.WWWMechanizeCGI.x86_64-darwin
+ };
};
WWWRobotRules = buildPerlPackage {
diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix
index 71230bce63..d35623b12c 100644
--- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix
@@ -137,6 +137,11 @@ in {
# it should not override the version of pytest that is used for say
# Python 2. This is an ugly hack that is needed now because the hook
# propagates the package.
+ pytestCheckHook_5 = if isPy3k then
+ self.pytestCheckHook.override { pytest = self.pytest_5; }
+ else
+ self.pytestCheckHook;
+
pytestCheckHook_6_1 = if isPy3k then
self.pytestCheckHook.override { pytest = self.pytest_6_1; }
else
@@ -535,6 +540,8 @@ in {
inherit (pkgs) graphviz;
};
+ aocd = callPackage ../development/python-modules/aocd { };
+
apache-airflow = callPackage ../development/python-modules/apache-airflow { };
apcaccess = callPackage ../development/python-modules/apcaccess { };
@@ -1262,6 +1269,11 @@ in {
enablePython = true;
});
+ boost169 = toPythonModule (pkgs.boost169.override {
+ inherit (self) python numpy;
+ enablePython = true;
+ });
+
boschshcpy = callPackage ../development/python-modules/boschshcpy { };
boost-histogram = callPackage ../development/python-modules/boost-histogram {
@@ -3453,6 +3465,8 @@ in {
grpcio-gcp = callPackage ../development/python-modules/grpcio-gcp { };
+ grpcio-status = callPackage ../development/python-modules/grpcio-status { };
+
grpcio-tools = callPackage ../development/python-modules/grpcio-tools { };
gruut = callPackage ../development/python-modules/gruut { };
@@ -4021,6 +4035,8 @@ in {
jaraco_collections = callPackage ../development/python-modules/jaraco_collections { };
+ jaraco-context = callPackage ../development/python-modules/jaraco-context { };
+
jaraco_functools = callPackage ../development/python-modules/jaraco_functools { };
jaraco_itertools = callPackage ../development/python-modules/jaraco_itertools { };
@@ -4099,6 +4115,8 @@ in {
jsbeautifier = callPackage ../development/python-modules/jsbeautifier { };
+ jschema-to-python = callPackage ../development/python-modules/jschema-to-python { };
+
jsmin = callPackage ../development/python-modules/jsmin { };
json5 = callPackage ../development/python-modules/json5 { };
@@ -4330,6 +4348,8 @@ in {
langdetect = callPackage ../development/python-modules/langdetect { };
+ language-data = callPackage ../development/python-modules/language-data { };
+
lark-parser = callPackage ../development/python-modules/lark-parser { };
latexcodec = callPackage ../development/python-modules/latexcodec { };
@@ -7605,6 +7625,8 @@ in {
pytest-raisesregexp = callPackage ../development/python-modules/pytest-raisesregexp { };
+ pytest-raisin = callPackage ../development/python-modules/pytest-raisin { };
+
pytest-randomly = callPackage ../development/python-modules/pytest-randomly { };
pytest-random-order = callPackage ../development/python-modules/pytest-random-order { };
@@ -8616,6 +8638,8 @@ in {
sapi-python-client = callPackage ../development/python-modules/sapi-python-client { };
+ sarif-om = callPackage ../development/python-modules/sarif-om { };
+
sarge = callPackage ../development/python-modules/sarge { };
sasmodels = callPackage ../development/python-modules/sasmodels { };
diff --git a/third_party/nixpkgs/pkgs/top-level/python2-packages.nix b/third_party/nixpkgs/pkgs/top-level/python2-packages.nix
index 64e8abd224..5efc400537 100644
--- a/third_party/nixpkgs/pkgs/top-level/python2-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/python2-packages.nix
@@ -437,8 +437,6 @@ with self; with super; {
pydns = callPackage ../development/python-modules/pydns { };
- pydocstyle = callPackage ../development/python-modules/pydocstyle/2.nix { };
-
pyechonest = callPackage ../development/python-modules/pyechonest { };
pyexcelerator = callPackage ../development/python-modules/pyexcelerator { };
@@ -461,6 +459,8 @@ with self; with super; {
pyhamcrest = callPackage ../development/python-modules/pyhamcrest/1.nix { };
+ pyjwt = callPackage ../development/python-modules/pyjwt/1.nix { };
+
pykickstart = callPackage ../development/python-modules/pykickstart { };
pylibacl = callPackage ../development/python-modules/pylibacl/0.5.nix { };
diff --git a/third_party/nixpkgs/pkgs/top-level/release.nix b/third_party/nixpkgs/pkgs/top-level/release.nix
index e7d1b25b13..13526349df 100644
--- a/third_party/nixpkgs/pkgs/top-level/release.nix
+++ b/third_party/nixpkgs/pkgs/top-level/release.nix
@@ -179,8 +179,7 @@ let
# Lightweight distribution and test
inherit (bootstrap) dist test;
# Test a full stdenv bootstrap from the bootstrap tools definition
- # TODO re-enable with https://github.com/NixOS/nixpkgs/pull/126411
- # inherit (bootstrap.test-pkgs) stdenv;
+ inherit (bootstrap.test-pkgs) stdenv;
};
# Cross compiled bootstrap tools