diff --git a/doc/languages-frameworks/ruby.section.md b/doc/languages-frameworks/ruby.section.md
index 36b794458cba..5e2f72ed61ec 100644
--- a/doc/languages-frameworks/ruby.section.md
+++ b/doc/languages-frameworks/ruby.section.md
@@ -8,7 +8,7 @@ In the Nixpkgs tree, Ruby packages can be found throughout, depending on what th
There are two main approaches for using Ruby with gems. One is to use a specifically locked `Gemfile` for an application that has very strict dependencies. The other is to depend on the common gems, which we'll explain further down, and rely on them being updated regularly.
-The interpreters have common attributes, namely `gems`, and `withPackages`. So you can refer to `ruby.gems.nokogiri`, or `ruby_2_6.gems.nokogiri` to get the Nokogiri gem already compiled and ready to use.
+The interpreters have common attributes, namely `gems`, and `withPackages`. So you can refer to `ruby.gems.nokogiri`, or `ruby_2_7.gems.nokogiri` to get the Nokogiri gem already compiled and ready to use.
Since not all gems have executables like `nokogiri`, it's usually more convenient to use the `withPackages` function like this: `ruby.withPackages (p: with p; [ nokogiri ])`. This will also make sure that the Ruby in your environment will be able to find the gem and it can be used in your Ruby code (for example via `ruby` or `irb` executables) via `require "nokogiri"` as usual.
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
index 4bbd46428524..cbcc3cb7cfcd 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
@@ -1138,6 +1138,14 @@ Superuser created successfully.
coursier, you can create a shell alias.
+
+
+ The services.mosquitto module has been
+ rewritten to support multiple listeners and per-listener
+ configuration. Module configurations from previous releases
+ will no longer work and must be updated.
+
+
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md
index 36d03fd0b59b..982f87daecdc 100644
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@@ -351,6 +351,9 @@ In addition to numerous new and upgraded packages, this release has the followin
- The `coursier` package's binary was renamed from `coursier` to `cs`. Completions which haven't worked for a while should now work with the renamed binary. To keep using `coursier`, you can create a shell alias.
+- The `services.mosquitto` module has been rewritten to support multiple listeners and per-listener configuration.
+ Module configurations from previous releases will no longer work and must be updated.
+
## Other Notable Changes {#sec-release-21.11-notable-changes}
diff --git a/nixos/modules/config/console.nix b/nixos/modules/config/console.nix
index 98f942ee63f5..168bebd8d06a 100644
--- a/nixos/modules/config/console.nix
+++ b/nixos/modules/config/console.nix
@@ -116,7 +116,7 @@ in
{ console.keyMap = with config.services.xserver;
mkIf cfg.useXkbConfig
(pkgs.runCommand "xkb-console-keymap" { preferLocalBuild = true; } ''
- '${pkgs.ckbcomp}/bin/ckbcomp' \
+ '${pkgs.buildPackages.ckbcomp}/bin/ckbcomp' \
${optionalString (config.environment.sessionVariables ? XKB_CONFIG_ROOT)
"-I${config.environment.sessionVariables.XKB_CONFIG_ROOT}"
} \
diff --git a/nixos/modules/programs/file-roller.nix b/nixos/modules/programs/file-roller.nix
index b939d59909c0..3c47d5981654 100644
--- a/nixos/modules/programs/file-roller.nix
+++ b/nixos/modules/programs/file-roller.nix
@@ -4,7 +4,9 @@
with lib;
-{
+let cfg = config.programs.file-roller;
+
+in {
# Added 2019-08-09
imports = [
@@ -21,6 +23,13 @@ with lib;
enable = mkEnableOption "File Roller, an archive manager for GNOME";
+ package = mkOption {
+ type = types.package;
+ default = pkgs.gnome.file-roller;
+ defaultText = literalExpression "pkgs.gnome.file-roller";
+ description = "File Roller derivation to use.";
+ };
+
};
};
@@ -28,11 +37,11 @@ with lib;
###### implementation
- config = mkIf config.programs.file-roller.enable {
+ config = mkIf cfg.enable {
- environment.systemPackages = [ pkgs.gnome.file-roller ];
+ environment.systemPackages = [ cfg.package ];
- services.dbus.packages = [ pkgs.gnome.file-roller ];
+ services.dbus.packages = [ cfg.package ];
};
diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix
index 5461dbaf0bd0..220c571b927e 100644
--- a/nixos/modules/services/backup/borgbackup.nix
+++ b/nixos/modules/services/backup/borgbackup.nix
@@ -42,12 +42,16 @@ let
${cfg.postInit}
fi
'' + ''
- borg create $extraArgs \
- --compression ${cfg.compression} \
- --exclude-from ${mkExcludeFile cfg} \
- $extraCreateArgs \
- "::$archiveName$archiveSuffix" \
- ${escapeShellArgs cfg.paths}
+ (
+ set -o pipefail
+ ${optionalString (cfg.dumpCommand != null) ''${escapeShellArg cfg.dumpCommand} | \''}
+ borg create $extraArgs \
+ --compression ${cfg.compression} \
+ --exclude-from ${mkExcludeFile cfg} \
+ $extraCreateArgs \
+ "::$archiveName$archiveSuffix" \
+ ${if cfg.paths == null then "-" else escapeShellArgs cfg.paths}
+ )
'' + optionalString cfg.appendFailedSuffix ''
borg rename $extraArgs \
"::$archiveName$archiveSuffix" "$archiveName"
@@ -182,6 +186,14 @@ let
+ " without at least one public key";
};
+ mkSourceAssertions = name: cfg: {
+ assertion = count isNull [ cfg.dumpCommand cfg.paths ] == 1;
+ message = ''
+ Exactly one of borgbackup.jobs.${name}.paths or borgbackup.jobs.${name}.dumpCommand
+ must be set.
+ '';
+ };
+
mkRemovableDeviceAssertions = name: cfg: {
assertion = !(isLocalPath cfg.repo) -> !cfg.removableDevice;
message = ''
@@ -240,11 +252,25 @@ in {
options = {
paths = mkOption {
- type = with types; coercedTo str lib.singleton (listOf str);
- description = "Path(s) to back up.";
+ type = with types; nullOr (coercedTo str lib.singleton (listOf str));
+ default = null;
+ description = ''
+ Path(s) to back up.
+ Mutually exclusive with .
+ '';
example = "/home/user";
};
+ dumpCommand = mkOption {
+ type = with types; nullOr path;
+ default = null;
+ description = ''
+ Backup the stdout of this program instead of filesystem paths.
+ Mutually exclusive with .
+ '';
+ example = "/path/to/createZFSsend.sh";
+ };
+
repo = mkOption {
type = types.str;
description = "Remote or local repository to back up to.";
@@ -657,6 +683,7 @@ in {
assertions =
mapAttrsToList mkPassAssertion jobs
++ mapAttrsToList mkKeysAssertion repos
+ ++ mapAttrsToList mkSourceAssertions jobs
++ mapAttrsToList mkRemovableDeviceAssertions jobs;
system.activationScripts = mapAttrs' mkActivationScript jobs;
diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix
index b0fbfc194083..5a573cbf4ac9 100644
--- a/nixos/modules/services/networking/mosquitto.nix
+++ b/nixos/modules/services/networking/mosquitto.nix
@@ -5,35 +5,529 @@ with lib;
let
cfg = config.services.mosquitto;
- listenerConf = optionalString cfg.ssl.enable ''
- listener ${toString cfg.ssl.port} ${cfg.ssl.host}
- cafile ${cfg.ssl.cafile}
- certfile ${cfg.ssl.certfile}
- keyfile ${cfg.ssl.keyfile}
- '';
+ # note that mosquitto config parsing is very simplistic as of may 2021.
+ # often times they'll e.g. strtok() a line, check the first two tokens, and ignore the rest.
+ # there's no escaping available either, so we have to prevent any being necessary.
+ str = types.strMatching "[^\r\n]*" // {
+ description = "single-line string";
+ };
+ path = types.addCheck types.path (p: str.check "${p}");
+ configKey = types.strMatching "[^\r\n\t ]+";
+ optionType = with types; oneOf [ str path bool int ] // {
+ description = "string, path, bool, or integer";
+ };
+ optionToString = v:
+ if isBool v then boolToString v
+ else if path.check v then "${v}"
+ else toString v;
- passwordConf = optionalString cfg.checkPasswords ''
- password_file ${cfg.dataDir}/passwd
- '';
+ assertKeysValid = prefix: valid: config:
+ mapAttrsToList
+ (n: _: {
+ assertion = valid ? ${n};
+ message = "Invalid config key ${prefix}.${n}.";
+ })
+ config;
- mosquittoConf = pkgs.writeText "mosquitto.conf" ''
- acl_file ${aclFile}
- persistence true
- allow_anonymous ${boolToString cfg.allowAnonymous}
- listener ${toString cfg.port} ${cfg.host}
- ${passwordConf}
- ${listenerConf}
- ${cfg.extraConf}
- '';
+ formatFreeform = { prefix ? "" }: mapAttrsToList (n: v: "${prefix}${n} ${optionToString v}");
- userAcl = (concatStringsSep "\n\n" (mapAttrsToList (n: c:
- "user ${n}\n" + (concatStringsSep "\n" c.acl)) cfg.users
- ));
+ userOptions = with types; submodule {
+ options = {
+ password = mkOption {
+ type = uniq (nullOr str);
+ default = null;
+ description = ''
+ Specifies the (clear text) password for the MQTT User.
+ '';
+ };
- aclFile = pkgs.writeText "mosquitto.acl" ''
- ${cfg.aclExtraConf}
- ${userAcl}
- '';
+ passwordFile = mkOption {
+ type = uniq (nullOr types.path);
+ example = "/path/to/file";
+ default = null;
+ description = ''
+ Specifies the path to a file containing the
+ clear text password for the MQTT user.
+ '';
+ };
+
+ hashedPassword = mkOption {
+ type = uniq (nullOr str);
+ default = null;
+ description = ''
+ Specifies the hashed password for the MQTT User.
+ To generate hashed password install mosquitto
+ package and use mosquitto_passwd.
+ '';
+ };
+
+ hashedPasswordFile = mkOption {
+ type = uniq (nullOr types.path);
+ example = "/path/to/file";
+ default = null;
+ description = ''
+ Specifies the path to a file containing the
+ hashed password for the MQTT user.
+ To generate hashed password install mosquitto
+ package and use mosquitto_passwd.
+ '';
+ };
+
+ acl = mkOption {
+ type = listOf str;
+ example = [ "read A/B" "readwrite A/#" ];
+ default = [];
+ description = ''
+ Control client access to topics on the broker.
+ '';
+ };
+ };
+ };
+
+ userAsserts = prefix: users:
+ mapAttrsToList
+ (n: _: {
+ assertion = builtins.match "[^:\r\n]+" n != null;
+ message = "Invalid user name ${n} in ${prefix}";
+ })
+ users
+ ++ mapAttrsToList
+ (n: u: {
+ assertion = count (s: s != null) [
+ u.password u.passwordFile u.hashedPassword u.hashedPasswordFile
+ ] <= 1;
+ message = "Cannot set more than one password option for user ${n} in ${prefix}";
+ }) users;
+
+ makePasswordFile = users: path:
+ let
+ makeLines = store: file:
+ mapAttrsToList
+ (n: u: "addLine ${escapeShellArg n} ${escapeShellArg u.${store}}")
+ (filterAttrs (_: u: u.${store} != null) users)
+ ++ mapAttrsToList
+ (n: u: "addFile ${escapeShellArg n} ${escapeShellArg "${u.${file}}"}")
+ (filterAttrs (_: u: u.${file} != null) users);
+ plainLines = makeLines "password" "passwordFile";
+ hashedLines = makeLines "hashedPassword" "hashedPasswordFile";
+ in
+ pkgs.writeScript "make-mosquitto-passwd"
+ (''
+ #! ${pkgs.runtimeShell}
+
+ set -eu
+
+ file=${escapeShellArg path}
+
+ rm -f "$file"
+ touch "$file"
+
+ addLine() {
+ echo "$1:$2" >> "$file"
+ }
+ addFile() {
+ if [ $(wc -l <"$2") -gt 1 ]; then
+ echo "invalid mosquitto password file $2" >&2
+ return 1
+ fi
+ echo "$1:$(cat "$2")" >> "$file"
+ }
+ ''
+ + concatStringsSep "\n"
+ (plainLines
+ ++ optional (plainLines != []) ''
+ ${pkgs.mosquitto}/bin/mosquitto_passwd -U "$file"
+ ''
+ ++ hashedLines));
+
+ makeACLFile = idx: users: supplement:
+ pkgs.writeText "mosquitto-acl-${toString idx}.conf"
+ (concatStringsSep
+ "\n"
+ (flatten [
+ supplement
+ (mapAttrsToList
+ (n: u: [ "user ${n}" ] ++ map (t: "topic ${t}") u.acl)
+ users)
+ ]));
+
+ authPluginOptions = with types; submodule {
+ options = {
+ plugin = mkOption {
+ type = path;
+ description = ''
+ Plugin path to load, should be a .so file.
+ '';
+ };
+
+ denySpecialChars = mkOption {
+ type = bool;
+ description = ''
+ Automatically disallow all clients using #
+ or + in their name/id.
+ '';
+ default = true;
+ };
+
+ options = mkOption {
+ type = attrsOf optionType;
+ description = ''
+ Options for the auth plugin. Each key turns into a auth_opt_*
+ line in the config.
+ '';
+ default = {};
+ };
+ };
+ };
+
+ authAsserts = prefix: auth:
+ mapAttrsToList
+ (n: _: {
+ assertion = configKey.check n;
+ message = "Invalid auth plugin key ${prefix}.${n}";
+ })
+ auth;
+
+ formatAuthPlugin = plugin:
+ [
+ "auth_plugin ${plugin.plugin}"
+ "auth_plugin_deny_special_chars ${optionToString plugin.denySpecialChars}"
+ ]
+ ++ formatFreeform { prefix = "auth_opt_"; } plugin.options;
+
+ freeformListenerKeys = {
+ allow_anonymous = 1;
+ allow_zero_length_clientid = 1;
+ auto_id_prefix = 1;
+ cafile = 1;
+ capath = 1;
+ certfile = 1;
+ ciphers = 1;
+ "ciphers_tls1.3" = 1;
+ crlfile = 1;
+ dhparamfile = 1;
+ http_dir = 1;
+ keyfile = 1;
+ max_connections = 1;
+ max_qos = 1;
+ max_topic_alias = 1;
+ mount_point = 1;
+ protocol = 1;
+ psk_file = 1;
+ psk_hint = 1;
+ require_certificate = 1;
+ socket_domain = 1;
+ tls_engine = 1;
+ tls_engine_kpass_sha1 = 1;
+ tls_keyform = 1;
+ tls_version = 1;
+ use_identity_as_username = 1;
+ use_subject_as_username = 1;
+ use_username_as_clientid = 1;
+ };
+
+ listenerOptions = with types; submodule {
+ options = {
+ port = mkOption {
+ type = port;
+ description = ''
+ Port to listen on. Must be set to 0 to listen on a unix domain socket.
+ '';
+ default = 1883;
+ };
+
+ address = mkOption {
+ type = nullOr str;
+ description = ''
+ Address to listen on. Listen on 0.0.0.0/::
+ when unset.
+ '';
+ default = null;
+ };
+
+ authPlugins = mkOption {
+ type = listOf authPluginOptions;
+ description = ''
+ Authentication plugin to attach to this listener.
+ Refer to the
+ mosquitto.conf documentation for details on authentication plugins.
+ '';
+ default = [];
+ };
+
+ users = mkOption {
+ type = attrsOf userOptions;
+ example = { john = { password = "123456"; acl = [ "topic readwrite john/#" ]; }; };
+ description = ''
+ A set of users and their passwords and ACLs.
+ '';
+ default = {};
+ };
+
+ acl = mkOption {
+ type = listOf str;
+ description = ''
+ Additional ACL items to prepend to the generated ACL file.
+ '';
+ default = [];
+ };
+
+ settings = mkOption {
+ type = submodule {
+ freeformType = attrsOf optionType;
+ };
+ description = ''
+ Additional settings for this listener.
+ '';
+ default = {};
+ };
+ };
+ };
+
+ listenerAsserts = prefix: listener:
+ assertKeysValid prefix freeformListenerKeys listener.settings
+ ++ userAsserts prefix listener.users
+ ++ imap0
+ (i: v: authAsserts "${prefix}.authPlugins.${toString i}" v)
+ listener.authPlugins;
+
+ formatListener = idx: listener:
+ [
+ "listener ${toString listener.port} ${toString listener.address}"
+ "password_file ${cfg.dataDir}/passwd-${toString idx}"
+ "acl_file ${makeACLFile idx listener.users listener.acl}"
+ ]
+ ++ formatFreeform {} listener.settings
+ ++ concatMap formatAuthPlugin listener.authPlugins;
+
+ freeformBridgeKeys = {
+ bridge_alpn = 1;
+ bridge_attempt_unsubscribe = 1;
+ bridge_bind_address = 1;
+ bridge_cafile = 1;
+ bridge_capath = 1;
+ bridge_certfile = 1;
+ bridge_identity = 1;
+ bridge_insecure = 1;
+ bridge_keyfile = 1;
+ bridge_max_packet_size = 1;
+ bridge_outgoing_retain = 1;
+ bridge_protocol_version = 1;
+ bridge_psk = 1;
+ bridge_require_ocsp = 1;
+ bridge_tls_version = 1;
+ cleansession = 1;
+ idle_timeout = 1;
+ keepalive_interval = 1;
+ local_cleansession = 1;
+ local_clientid = 1;
+ local_password = 1;
+ local_username = 1;
+ notification_topic = 1;
+ notifications = 1;
+ notifications_local_only = 1;
+ remote_clientid = 1;
+ remote_password = 1;
+ remote_username = 1;
+ restart_timeout = 1;
+ round_robin = 1;
+ start_type = 1;
+ threshold = 1;
+ try_private = 1;
+ };
+
+ bridgeOptions = with types; submodule {
+ options = {
+ addresses = mkOption {
+ type = listOf (submodule {
+ options = {
+ address = mkOption {
+ type = str;
+ description = ''
+ Address of the remote MQTT broker.
+ '';
+ };
+
+ port = mkOption {
+ type = port;
+ description = ''
+ Port of the remote MQTT broker.
+ '';
+ default = 1883;
+ };
+ };
+ });
+ default = [];
+ description = ''
+ Remote endpoints for the bridge.
+ '';
+ };
+
+ topics = mkOption {
+ type = listOf str;
+ description = ''
+ Topic patterns to be shared between the two brokers.
+ Refer to the
+ mosquitto.conf documentation for details on the format.
+ '';
+ default = [];
+ example = [ "# both 2 local/topic/ remote/topic/" ];
+ };
+
+ settings = mkOption {
+ type = submodule {
+ freeformType = attrsOf optionType;
+ };
+ description = ''
+ Additional settings for this bridge.
+ '';
+ default = {};
+ };
+ };
+ };
+
+ bridgeAsserts = prefix: bridge:
+ assertKeysValid prefix freeformBridgeKeys bridge.settings
+ ++ [ {
+ assertion = length bridge.addresses > 0;
+ message = "Bridge ${prefix} needs remote broker addresses";
+ } ];
+
+ formatBridge = name: bridge:
+ [
+ "connection ${name}"
+ "addresses ${concatMapStringsSep " " (a: "${a.address}:${toString a.port}") bridge.addresses}"
+ ]
+ ++ map (t: "topic ${t}") bridge.topics
+ ++ formatFreeform {} bridge.settings;
+
+ freeformGlobalKeys = {
+ allow_duplicate_messages = 1;
+ autosave_interval = 1;
+ autosave_on_changes = 1;
+ check_retain_source = 1;
+ connection_messages = 1;
+ log_facility = 1;
+ log_timestamp = 1;
+ log_timestamp_format = 1;
+ max_inflight_bytes = 1;
+ max_inflight_messages = 1;
+ max_keepalive = 1;
+ max_packet_size = 1;
+ max_queued_bytes = 1;
+ max_queued_messages = 1;
+ memory_limit = 1;
+ message_size_limit = 1;
+ persistence_file = 1;
+ persistence_location = 1;
+ persistent_client_expiration = 1;
+ pid_file = 1;
+ queue_qos0_messages = 1;
+ retain_available = 1;
+ set_tcp_nodelay = 1;
+ sys_interval = 1;
+ upgrade_outgoing_qos = 1;
+ websockets_headers_size = 1;
+ websockets_log_level = 1;
+ };
+
+ globalOptions = with types; {
+ enable = mkEnableOption "the MQTT Mosquitto broker";
+
+ bridges = mkOption {
+ type = attrsOf bridgeOptions;
+ default = {};
+ description = ''
+ Bridges to build to other MQTT brokers.
+ '';
+ };
+
+ listeners = mkOption {
+ type = listOf listenerOptions;
+ default = {};
+ description = ''
+ Listeners to configure on this broker.
+ '';
+ };
+
+ includeDirs = mkOption {
+ type = listOf path;
+ description = ''
+ Directories to be scanned for further config files to include.
+ Directories will processed in the order given,
+ *.conf files in the directory will be
+ read in case-sensistive alphabetical order.
+ '';
+ default = [];
+ };
+
+ logDest = mkOption {
+ type = listOf (either path (enum [ "stdout" "stderr" "syslog" "topic" "dlt" ]));
+ description = ''
+ Destinations to send log messages to.
+ '';
+ default = [ "stderr" ];
+ };
+
+ logType = mkOption {
+ type = listOf (enum [ "debug" "error" "warning" "notice" "information"
+ "subscribe" "unsubscribe" "websockets" "none" "all" ]);
+ description = ''
+ Types of messages to log.
+ '';
+ default = [];
+ };
+
+ persistence = mkOption {
+ type = bool;
+ description = ''
+ Enable persistent storage of subscriptions and messages.
+ '';
+ default = true;
+ };
+
+ dataDir = mkOption {
+ default = "/var/lib/mosquitto";
+ type = types.path;
+ description = ''
+ The data directory.
+ '';
+ };
+
+ settings = mkOption {
+ type = submodule {
+ freeformType = attrsOf optionType;
+ };
+ description = ''
+ Global configuration options for the mosquitto broker.
+ '';
+ default = {};
+ };
+ };
+
+ globalAsserts = prefix: cfg:
+ flatten [
+ (assertKeysValid prefix freeformGlobalKeys cfg.settings)
+ (imap0 (n: l: listenerAsserts "${prefix}.listener.${toString n}" l) cfg.listeners)
+ (mapAttrsToList (n: b: bridgeAsserts "${prefix}.bridge.${n}" b) cfg.bridges)
+ ];
+
+ formatGlobal = cfg:
+ [
+ "per_listener_settings true"
+ "persistence ${optionToString cfg.persistence}"
+ ]
+ ++ map
+ (d: if path.check d then "log_dest file ${d}" else "log_dest ${d}")
+ cfg.logDest
+ ++ map (t: "log_type ${t}") cfg.logType
+ ++ formatFreeform {} cfg.settings
+ ++ concatLists (imap0 formatListener cfg.listeners)
+ ++ concatLists (mapAttrsToList formatBridge cfg.bridges)
+ ++ map (d: "include_dir ${d}") cfg.includeDirs;
+
+ configFile = pkgs.writeText "mosquitto.conf"
+ (concatStringsSep "\n" (formatGlobal cfg));
in
@@ -41,179 +535,13 @@ in
###### Interface
- options = {
- services.mosquitto = {
- enable = mkEnableOption "the MQTT Mosquitto broker";
-
- host = mkOption {
- default = "127.0.0.1";
- example = "0.0.0.0";
- type = types.str;
- description = ''
- Host to listen on without SSL.
- '';
- };
-
- port = mkOption {
- default = 1883;
- type = types.int;
- description = ''
- Port on which to listen without SSL.
- '';
- };
-
- ssl = {
- enable = mkEnableOption "SSL listener";
-
- cafile = mkOption {
- type = types.nullOr types.path;
- default = null;
- description = "Path to PEM encoded CA certificates.";
- };
-
- certfile = mkOption {
- type = types.nullOr types.path;
- default = null;
- description = "Path to PEM encoded server certificate.";
- };
-
- keyfile = mkOption {
- type = types.nullOr types.path;
- default = null;
- description = "Path to PEM encoded server key.";
- };
-
- host = mkOption {
- default = "0.0.0.0";
- example = "localhost";
- type = types.str;
- description = ''
- Host to listen on with SSL.
- '';
- };
-
- port = mkOption {
- default = 8883;
- type = types.int;
- description = ''
- Port on which to listen with SSL.
- '';
- };
- };
-
- dataDir = mkOption {
- default = "/var/lib/mosquitto";
- type = types.path;
- description = ''
- The data directory.
- '';
- };
-
- users = mkOption {
- type = types.attrsOf (types.submodule {
- options = {
- password = mkOption {
- type = with types; uniq (nullOr str);
- default = null;
- description = ''
- Specifies the (clear text) password for the MQTT User.
- '';
- };
-
- passwordFile = mkOption {
- type = with types; uniq (nullOr str);
- example = "/path/to/file";
- default = null;
- description = ''
- Specifies the path to a file containing the
- clear text password for the MQTT user.
- '';
- };
-
- hashedPassword = mkOption {
- type = with types; uniq (nullOr str);
- default = null;
- description = ''
- Specifies the hashed password for the MQTT User.
- To generate hashed password install mosquitto
- package and use mosquitto_passwd.
- '';
- };
-
- hashedPasswordFile = mkOption {
- type = with types; uniq (nullOr str);
- example = "/path/to/file";
- default = null;
- description = ''
- Specifies the path to a file containing the
- hashed password for the MQTT user.
- To generate hashed password install mosquitto
- package and use mosquitto_passwd.
- '';
- };
-
- acl = mkOption {
- type = types.listOf types.str;
- example = [ "topic read A/B" "topic A/#" ];
- description = ''
- Control client access to topics on the broker.
- '';
- };
- };
- });
- example = { john = { password = "123456"; acl = [ "topic readwrite john/#" ]; }; };
- description = ''
- A set of users and their passwords and ACLs.
- '';
- };
-
- allowAnonymous = mkOption {
- default = false;
- type = types.bool;
- description = ''
- Allow clients to connect without authentication.
- '';
- };
-
- checkPasswords = mkOption {
- default = false;
- example = true;
- type = types.bool;
- description = ''
- Refuse connection when clients provide incorrect passwords.
- '';
- };
-
- extraConf = mkOption {
- default = "";
- type = types.lines;
- description = ''
- Extra config to append to `mosquitto.conf` file.
- '';
- };
-
- aclExtraConf = mkOption {
- default = "";
- type = types.lines;
- description = ''
- Extra config to prepend to the ACL file.
- '';
- };
-
- };
- };
-
+ options.services.mosquitto = globalOptions;
###### Implementation
config = mkIf cfg.enable {
- assertions = mapAttrsToList (name: cfg: {
- assertion = length (filter (s: s != null) (with cfg; [
- password passwordFile hashedPassword hashedPasswordFile
- ])) <= 1;
- message = "Cannot set more than one password option";
- }) cfg.users;
+ assertions = globalAsserts "services.mosquitto" cfg;
systemd.services.mosquitto = {
description = "Mosquitto MQTT Broker Daemon";
@@ -227,7 +555,7 @@ in
RuntimeDirectory = "mosquitto";
WorkingDirectory = cfg.dataDir;
Restart = "on-failure";
- ExecStart = "${pkgs.mosquitto}/bin/mosquitto -c ${mosquittoConf}";
+ ExecStart = "${pkgs.mosquitto}/bin/mosquitto -c ${configFile}";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
# Hardening
@@ -252,12 +580,34 @@ in
ReadWritePaths = [
cfg.dataDir
"/tmp" # mosquitto_passwd creates files in /tmp before moving them
- ];
- ReadOnlyPaths = with cfg.ssl; lib.optionals (enable) [
- certfile
- keyfile
- cafile
- ];
+ ] ++ filter path.check cfg.logDest;
+ ReadOnlyPaths =
+ map (p: "${p}")
+ (cfg.includeDirs
+ ++ filter
+ (v: v != null)
+ (flatten [
+ (map
+ (l: [
+ (l.settings.psk_file or null)
+ (l.settings.http_dir or null)
+ (l.settings.cafile or null)
+ (l.settings.capath or null)
+ (l.settings.certfile or null)
+ (l.settings.crlfile or null)
+ (l.settings.dhparamfile or null)
+ (l.settings.keyfile or null)
+ ])
+ cfg.listeners)
+ (mapAttrsToList
+ (_: b: [
+ (b.settings.bridge_cafile or null)
+ (b.settings.bridge_capath or null)
+ (b.settings.bridge_certfile or null)
+ (b.settings.bridge_keyfile or null)
+ ])
+ cfg.bridges)
+ ]));
RemoveIPC = true;
RestrictAddressFamilies = [
"AF_UNIX" # for sd_notify() call
@@ -275,20 +625,12 @@ in
];
UMask = "0077";
};
- preStart = ''
- rm -f ${cfg.dataDir}/passwd
- touch ${cfg.dataDir}/passwd
- '' + concatStringsSep "\n" (
- mapAttrsToList (n: c:
- if c.hashedPasswordFile != null then
- "echo '${n}:'$(cat '${c.hashedPasswordFile}') >> ${cfg.dataDir}/passwd"
- else if c.passwordFile != null then
- "${pkgs.mosquitto}/bin/mosquitto_passwd -b ${cfg.dataDir}/passwd ${n} $(cat '${c.passwordFile}')"
- else if c.hashedPassword != null then
- "echo '${n}:${c.hashedPassword}' >> ${cfg.dataDir}/passwd"
- else optionalString (c.password != null)
- "${pkgs.mosquitto}/bin/mosquitto_passwd -b ${cfg.dataDir}/passwd ${n} '${c.password}'"
- ) cfg.users);
+ preStart =
+ concatStringsSep
+ "\n"
+ (imap0
+ (idx: listener: makePasswordFile listener.users "${cfg.dataDir}/passwd-${toString idx}")
+ cfg.listeners);
};
users.users.mosquitto = {
@@ -302,4 +644,6 @@ in
users.groups.mosquitto.gid = config.ids.gids.mosquitto;
};
+
+ meta.maintainers = with lib.maintainers; [ pennae ];
}
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index 112f493b811c..178d6f1fb7c5 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -221,6 +221,7 @@ in
programs.evince.enable = mkDefault true;
programs.evince.package = pkgs.pantheon.evince;
programs.file-roller.enable = mkDefault true;
+ programs.file-roller.package = pkgs.pantheon.file-roller;
# Settings from elementary-default-settings
environment.sessionVariables.GTK_CSD = "1";
diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index 11cb4d3b8a95..e67c71d5a704 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -1,15 +1,18 @@
{ config, lib, pkgs, ... }:
-with lib;
-
let
-
xcfg = config.services.xserver;
cfg = xcfg.desktopManager.plasma5;
libsForQt5 = pkgs.plasma5Packages;
inherit (libsForQt5) kdeGear kdeFrameworks plasma5;
inherit (pkgs) writeText;
+ inherit (lib)
+ getBin optionalString
+ mkRemovedOptionModule mkRenamedOptionModule
+ mkDefault mkIf mkMerge mkOption types;
+
+ ini = pkgs.formats.ini { };
pulseaudio = config.hardware.pulseaudio;
pactl = "${getBin pulseaudio.package}/bin/pactl";
@@ -33,23 +36,25 @@ let
gtk-button-images=1
'';
- gtk3_settings = writeText "settings.ini" ''
- [Settings]
- gtk-font-name=Sans Serif Regular 10
- gtk-theme-name=Breeze
- gtk-icon-theme-name=breeze
- gtk-fallback-icon-theme=hicolor
- gtk-cursor-theme-name=breeze_cursors
- gtk-toolbar-style=GTK_TOOLBAR_ICONS
- gtk-menu-images=1
- gtk-button-images=1
- '';
+ gtk3_settings = ini.generate "settings.ini" {
+ Settings = {
+ gtk-font-name = "Sans Serif Regular 10";
+ gtk-theme-name = "Breeze";
+ gtk-icon-theme-name = "breeze";
+ gtk-fallback-icon-theme = "hicolor";
+ gtk-cursor-theme-name = "breeze_cursors";
+ gtk-toolbar-style = "GTK_TOOLBAR_ICONS";
+ gtk-menu-images = 1;
+ gtk-button-images = 1;
+ };
+ };
- kcminputrc = writeText "kcminputrc" ''
- [Mouse]
- cursorTheme=breeze_cursors
- cursorSize=0
- '';
+ kcminputrc = ini.generate "kcminputrc" {
+ Mouse = {
+ cursorTheme = "breeze_cursors";
+ cursorSize = 0;
+ };
+ };
activationScript = ''
${set_XDG_CONFIG_HOME}
@@ -87,13 +92,13 @@ let
'';
set_XDG_CONFIG_HOME = ''
- # Set the default XDG_CONFIG_HOME if it is unset.
- # Per the XDG Base Directory Specification:
- # https://specifications.freedesktop.org/basedir-spec/latest
- # 1. Never export this variable! If it is unset, then child processes are
- # expected to set the default themselves.
- # 2. Contaminate / if $HOME is unset; do not check if $HOME is set.
- XDG_CONFIG_HOME=''${XDG_CONFIG_HOME:-$HOME/.config}
+ # Set the default XDG_CONFIG_HOME if it is unset.
+ # Per the XDG Base Directory Specification:
+ # https://specifications.freedesktop.org/basedir-spec/latest
+ # 1. Never export this variable! If it is unset, then child processes are
+ # expected to set the default themselves.
+ # 2. Contaminate / if $HOME is unset; do not check if $HOME is set.
+ XDG_CONFIG_HOME=''${XDG_CONFIG_HOME:-$HOME/.config}
'';
startplasma =
@@ -116,20 +121,17 @@ let
if ! [ -f "$kdeglobals" ]
then
kcminputrc="''${XDG_CONFIG_HOME}/kcminputrc"
- if ! [ -f "$kcminputrc" ]
- then
+ if ! [ -f "$kcminputrc" ]; then
cat ${kcminputrc} >"$kcminputrc"
fi
gtkrc2="$HOME/.gtkrc-2.0"
- if ! [ -f "$gtkrc2" ]
- then
+ if ! [ -f "$gtkrc2" ]; then
cat ${gtkrc2} >"$gtkrc2"
fi
gtk3_settings="''${XDG_CONFIG_HOME}/gtk-3.0/settings.ini"
- if ! [ -f "$gtk3_settings" ]
- then
+ if ! [ -f "$gtk3_settings" ]; then
mkdir -p "$(dirname "$gtk3_settings")"
cat ${gtk3_settings} >"$gtk3_settings"
fi
@@ -140,42 +142,44 @@ let
in
{
- options = {
-
- services.xserver.desktopManager.plasma5 = {
- enable = mkOption {
- type = types.bool;
- default = false;
- description = "Enable the Plasma 5 (KDE 5) desktop environment.";
- };
-
- phononBackend = mkOption {
- type = types.enum [ "gstreamer" "vlc" ];
- default = "gstreamer";
- example = "vlc";
- description = "Phonon audio backend to install.";
- };
-
- supportDDC = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Support setting monitor brightness via DDC.
-
-
- This is not needed for controlling brightness of the internal monitor
- of a laptop and as it is considered experimental by upstream, it is
- disabled by default.
- '';
- };
-
- useQtScaling = mkOption {
- type = types.bool;
- default = false;
- description = "Enable HiDPI scaling in Qt.";
- };
+ options.services.xserver.desktopManager.plasma5 = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Enable the Plasma 5 (KDE 5) desktop environment.";
};
+ phononBackend = mkOption {
+ type = types.enum [ "gstreamer" "vlc" ];
+ default = "gstreamer";
+ example = "vlc";
+ description = "Phonon audio backend to install.";
+ };
+
+ supportDDC = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Support setting monitor brightness via DDC.
+
+
+ This is not needed for controlling brightness of the internal monitor
+ of a laptop and as it is considered experimental by upstream, it is
+ disabled by default.
+ '';
+ };
+
+ useQtScaling = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Enable HiDPI scaling in Qt.";
+ };
+
+ runUsingSystemd = mkOption {
+ description = "Use systemd to manage the Plasma session";
+ type = types.bool;
+ default = false;
+ };
};
imports = [
@@ -187,32 +191,37 @@ in
(mkIf cfg.enable {
# Seed our configuration into nixos-generate-config
- system.nixos-generate-config.desktopConfiguration = [''
- # Enable the Plasma 5 Desktop Environment.
- services.xserver.displayManager.sddm.enable = true;
- services.xserver.desktopManager.plasma5.enable = true;
- ''];
+ system.nixos-generate-config.desktopConfiguration = [
+ ''
+ # Enable the Plasma 5 Desktop Environment.
+ services.xserver.displayManager.sddm.enable = true;
+ services.xserver.desktopManager.plasma5.enable = true;
+ ''
+ ];
services.xserver.displayManager.sessionPackages = [ pkgs.libsForQt5.plasma5.plasma-workspace ];
security.wrappers = {
kcheckpass =
- { setuid = true;
+ {
+ setuid = true;
owner = "root";
group = "root";
- source = "${lib.getBin libsForQt5.kscreenlocker}/libexec/kcheckpass";
+ source = "${getBin libsForQt5.kscreenlocker}/libexec/kcheckpass";
};
start_kdeinit =
- { setuid = true;
+ {
+ setuid = true;
owner = "root";
group = "root";
- source = "${lib.getBin libsForQt5.kinit}/libexec/kf5/start_kdeinit";
+ source = "${getBin libsForQt5.kinit}/libexec/kf5/start_kdeinit";
};
kwin_wayland =
- { owner = "root";
+ {
+ owner = "root";
group = "root";
capabilities = "cap_sys_nice+ep";
- source = "${lib.getBin plasma5.kwin}/bin/kwin_wayland";
+ source = "${getBin plasma5.kwin}/bin/kwin_wayland";
};
};
@@ -247,7 +256,7 @@ in
kidletime
kimageformats
kinit
- kirigami2 # In system profile for SDDM theme. TODO: wrapper.
+ kirigami2 # In system profile for SDDM theme. TODO: wrapper.
kio
kjobwidgets
knewstuff
@@ -314,7 +323,8 @@ in
breeze-icons
pkgs.hicolor-icon-theme
- kde-gtk-config breeze-gtk
+ kde-gtk-config
+ breeze-gtk
qtvirtualkeyboard
@@ -336,6 +346,7 @@ in
++ lib.optional config.services.pipewire.pulse.enable plasma-pa
++ lib.optional config.powerManagement.enable powerdevil
++ lib.optional config.services.colord.enable pkgs.colord-kde
+ ++ lib.optional config.services.hardware.bolt.enable pkgs.plasma-thunderbolt
++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ]
++ lib.optional config.services.xserver.wacom.enable pkgs.wacomtablet;
@@ -385,6 +396,27 @@ in
security.pam.services.lightdm.enableKwallet = true;
security.pam.services.sddm.enableKwallet = true;
+ systemd.user.services = {
+ plasma-early-setup = mkIf cfg.runUsingSystemd {
+ description = "Early Plasma setup";
+ wantedBy = [ "graphical-session-pre.target" ];
+ serviceConfig.Type = "oneshot";
+ script = activationScript;
+ };
+
+ plasma-run-with-systemd = {
+ description = "Run KDE Plasma via systemd";
+ wantedBy = [ "basic.target" ];
+ serviceConfig.Type = "oneshot";
+ script = ''
+ ${set_XDG_CONFIG_HOME}
+
+ ${kdeFrameworks.kconfig}/bin/kwriteconfig5 \
+ --file startkderc --group General --key systemdBoot ${lib.boolToString cfg.runUsingSystemd}
+ '';
+ };
+ };
+
xdg.portal.enable = true;
xdg.portal.extraPortals = [ plasma5.xdg-desktop-portal-kde ];
diff --git a/nixos/tests/borgbackup.nix b/nixos/tests/borgbackup.nix
index fae1d2d07138..cbb28689209b 100644
--- a/nixos/tests/borgbackup.nix
+++ b/nixos/tests/borgbackup.nix
@@ -81,6 +81,24 @@ in {
environment.BORG_RSH = "ssh -oStrictHostKeyChecking=no -i /root/id_ed25519.appendOnly";
};
+ commandSuccess = {
+ dumpCommand = pkgs.writeScript "commandSuccess" ''
+ echo -n test
+ '';
+ repo = remoteRepo;
+ encryption.mode = "none";
+ startAt = [ ];
+ environment.BORG_RSH = "ssh -oStrictHostKeyChecking=no -i /root/id_ed25519";
+ };
+
+ commandFail = {
+ dumpCommand = "${pkgs.coreutils}/bin/false";
+ repo = remoteRepo;
+ encryption.mode = "none";
+ startAt = [ ];
+ environment.BORG_RSH = "ssh -oStrictHostKeyChecking=no -i /root/id_ed25519";
+ };
+
};
};
@@ -171,5 +189,20 @@ in {
client.fail("{} list borg\@server:wrong".format(borg))
# TODO: Make sure that data is not actually deleted
+
+ with subtest("commandSuccess"):
+ server.wait_for_unit("sshd.service")
+ client.wait_for_unit("network.target")
+ client.systemctl("start --wait borgbackup-job-commandSuccess")
+ client.fail("systemctl is-failed borgbackup-job-commandSuccess")
+ id = client.succeed("borg-job-commandSuccess list | tail -n1 | cut -d' ' -f1").strip()
+ client.succeed(f"borg-job-commandSuccess extract ::{id} stdin")
+ assert "test" == client.succeed("cat stdin")
+
+ with subtest("commandFail"):
+ server.wait_for_unit("sshd.service")
+ client.wait_for_unit("network.target")
+ client.systemctl("start --wait borgbackup-job-commandFail")
+ client.succeed("systemctl is-failed borgbackup-job-commandFail")
'';
})
diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix
index 699be8fd7dc6..0894736bac9c 100644
--- a/nixos/tests/home-assistant.nix
+++ b/nixos/tests/home-assistant.nix
@@ -12,13 +12,14 @@ in {
environment.systemPackages = with pkgs; [ mosquitto ];
services.mosquitto = {
enable = true;
- checkPasswords = true;
- users = {
- "${mqttUsername}" = {
- acl = [ "topic readwrite #" ];
- password = mqttPassword;
+ listeners = [ {
+ users = {
+ "${mqttUsername}" = {
+ acl = [ "readwrite #" ];
+ password = mqttPassword;
+ };
};
- };
+ } ];
};
services.home-assistant = {
inherit configDir;
diff --git a/nixos/tests/mosquitto.nix b/nixos/tests/mosquitto.nix
index e29bd559ed9b..eb47e97ba04b 100644
--- a/nixos/tests/mosquitto.nix
+++ b/nixos/tests/mosquitto.nix
@@ -2,13 +2,59 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
let
port = 1888;
- username = "mqtt";
+ tlsPort = 1889;
password = "VERY_secret";
+ hashedPassword = "$7$101$/WJc4Mp+I+uYE9sR$o7z9rD1EYXHPwEP5GqQj6A7k4W1yVbePlb8TqNcuOLV9WNCiDgwHOB0JHC1WCtdkssqTBduBNUnUGd6kmZvDSw==";
topic = "test/foo";
+
+ snakeOil = pkgs.runCommand "snakeoil-certs" {
+ buildInputs = [ pkgs.gnutls.bin ];
+ caTemplate = pkgs.writeText "snakeoil-ca.template" ''
+ cn = server
+ expiration_days = -1
+ cert_signing_key
+ ca
+ '';
+ certTemplate = pkgs.writeText "snakeoil-cert.template" ''
+ cn = server
+ expiration_days = -1
+ tls_www_server
+ encryption_key
+ signing_key
+ '';
+ userCertTemplate = pkgs.writeText "snakeoil-user-cert.template" ''
+ organization = snakeoil
+ cn = client1
+ expiration_days = -1
+ tls_www_client
+ encryption_key
+ signing_key
+ '';
+ } ''
+ mkdir "$out"
+
+ certtool -p --bits 2048 --outfile "$out/ca.key"
+ certtool -s --template "$caTemplate" --load-privkey "$out/ca.key" \
+ --outfile "$out/ca.crt"
+ certtool -p --bits 2048 --outfile "$out/server.key"
+ certtool -c --template "$certTemplate" \
+ --load-ca-privkey "$out/ca.key" \
+ --load-ca-certificate "$out/ca.crt" \
+ --load-privkey "$out/server.key" \
+ --outfile "$out/server.crt"
+
+ certtool -p --bits 2048 --outfile "$out/client1.key"
+ certtool -c --template "$userCertTemplate" \
+ --load-privkey "$out/client1.key" \
+ --load-ca-privkey "$out/ca.key" \
+ --load-ca-certificate "$out/ca.crt" \
+ --outfile "$out/client1.crt"
+ '';
+
in {
name = "mosquitto";
meta = with pkgs.lib; {
- maintainers = with maintainers; [ peterhoeg ];
+ maintainers = with maintainers; [ pennae peterhoeg ];
};
nodes = let
@@ -17,77 +63,131 @@ in {
};
in {
server = { pkgs, ... }: {
- networking.firewall.allowedTCPPorts = [ port ];
+ networking.firewall.allowedTCPPorts = [ port tlsPort ];
services.mosquitto = {
- inherit port;
enable = true;
- host = "0.0.0.0";
- checkPasswords = true;
- users.${username} = {
- inherit password;
- acl = [
- "topic readwrite ${topic}"
- ];
+ settings = {
+ sys_interval = 1;
};
- };
+ listeners = [
+ {
+ inherit port;
+ users = {
+ password_store = {
+ inherit password;
+ };
+ password_file = {
+ passwordFile = pkgs.writeText "mqtt-password" password;
+ };
+ hashed_store = {
+ inherit hashedPassword;
+ };
+ hashed_file = {
+ hashedPasswordFile = pkgs.writeText "mqtt-hashed-password" hashedPassword;
+ };
- # disable private /tmp for this test
- systemd.services.mosquitto.serviceConfig.PrivateTmp = lib.mkForce false;
+ reader = {
+ inherit password;
+ acl = [
+ "read ${topic}"
+ "read $SYS/#" # so we always have something to read
+ ];
+ };
+ writer = {
+ inherit password;
+ acl = [ "write ${topic}" ];
+ };
+ };
+ }
+ {
+ port = tlsPort;
+ users.client1 = {
+ acl = [ "read $SYS/#" ];
+ };
+ settings = {
+ cafile = "${snakeOil}/ca.crt";
+ certfile = "${snakeOil}/server.crt";
+ keyfile = "${snakeOil}/server.key";
+ require_certificate = true;
+ use_identity_as_username = true;
+ };
+ }
+ ];
+ };
};
client1 = client;
client2 = client;
};
- testScript = let
- file = "/tmp/msg";
- in ''
- def mosquitto_cmd(binary):
+ testScript = ''
+ def mosquitto_cmd(binary, user, topic, port):
return (
- "${pkgs.mosquitto}/bin/mosquitto_{} "
+ "mosquitto_{} "
"-V mqttv311 "
"-h server "
- "-p ${toString port} "
- "-u ${username} "
+ "-p {} "
+ "-u {} "
"-P '${password}' "
- "-t ${topic}"
- ).format(binary)
+ "-t '{}'"
+ ).format(binary, port, user, topic)
- def publish(args):
- return "{} {}".format(mosquitto_cmd("pub"), args)
+ def publish(args, user, topic="${topic}", port=${toString port}):
+ return "{} {}".format(mosquitto_cmd("pub", user, topic, port), args)
- def subscribe(args):
- return "({} -C 1 {} | tee ${file} &)".format(mosquitto_cmd("sub"), args)
+ def subscribe(args, user, topic="${topic}", port=${toString port}):
+ return "{} -C 1 {}".format(mosquitto_cmd("sub", user, topic, port), args)
+
+ def parallel(*fns):
+ from threading import Thread
+ threads = [ Thread(target=fn) for fn in fns ]
+ for t in threads: t.start()
+ for t in threads: t.join()
start_all()
server.wait_for_unit("mosquitto.service")
- for machine in server, client1, client2:
- machine.fail("test -f ${file}")
+ def check_passwords():
+ client1.succeed(publish("-m test", "password_store"))
+ client1.succeed(publish("-m test", "password_file"))
+ client1.succeed(publish("-m test", "hashed_store"))
+ client1.succeed(publish("-m test", "hashed_file"))
- # QoS = 0, so only one subscribers should get it
- server.execute(subscribe("-q 0"))
+ check_passwords()
- # we need to give the subscribers some time to connect
- client2.execute("sleep 5")
- client2.succeed(publish("-m FOO -q 0"))
+ def check_acl():
+ client1.succeed(subscribe("", "reader", topic="$SYS/#"))
+ client1.fail(subscribe("-W 5", "writer", topic="$SYS/#"))
- server.wait_until_succeeds("grep -q FOO ${file}")
- server.execute("rm ${file}")
+ parallel(
+ lambda: client1.succeed(subscribe("-i 3688cdd7-aa07-42a4-be22-cb9352917e40", "reader")),
+ lambda: [
+ server.wait_for_console_text("3688cdd7-aa07-42a4-be22-cb9352917e40"),
+ client2.succeed(publish("-m test", "writer"))
+ ])
- # QoS = 1, so both subscribers should get it
- server.execute(subscribe("-q 1"))
- client1.execute(subscribe("-q 1"))
+ parallel(
+ lambda: client1.fail(subscribe("-W 5 -i 24ff16a2-ae33-4a51-9098-1b417153c712", "reader")),
+ lambda: [
+ server.wait_for_console_text("24ff16a2-ae33-4a51-9098-1b417153c712"),
+ client2.succeed(publish("-m test", "reader"))
+ ])
- # we need to give the subscribers some time to connect
- client2.execute("sleep 5")
- client2.succeed(publish("-m BAR -q 1"))
+ check_acl()
- for machine in server, client1:
- machine.wait_until_succeeds("grep -q BAR ${file}")
- machine.execute("rm ${file}")
+ def check_tls():
+ client1.succeed(
+ subscribe(
+ "--cafile ${snakeOil}/ca.crt "
+ "--cert ${snakeOil}/client1.crt "
+ "--key ${snakeOil}/client1.key",
+ topic="$SYS/#",
+ port=${toString tlsPort},
+ user="no_such_user"))
+
+ check_tls()
'';
})
diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix
index b7277fc1f770..a64ab5249a53 100644
--- a/pkgs/applications/blockchains/polkadot/default.nix
+++ b/pkgs/applications/blockchains/polkadot/default.nix
@@ -7,16 +7,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "polkadot";
- version = "0.9.11";
+ version = "0.9.12";
src = fetchFromGitHub {
owner = "paritytech";
repo = "polkadot";
rev = "v${version}";
- sha256 = "17a0g4sijc1p9fy5xh8krs3y1hc75s17ak0hfhpi231gs4fl20pd";
+ sha256 = "1d1ppj8djqm97k18cbdvbgv9a5vhvxdgjiqair0bmxc44hwapl65";
};
- cargoSha256 = "07yzdchpzs2g1f8fzhaj11yybd2d8lv9ib859z7122anxzdr0028";
+ cargoSha256 = "09kcacz836sm1zsi08mmf4ca5vbqc0lwwaam9p4vi0v4kd45axx9";
nativeBuildInputs = [ clang ];
diff --git a/pkgs/applications/graphics/ciano/default.nix b/pkgs/applications/graphics/ciano/default.nix
new file mode 100644
index 000000000000..dcaabed6b19c
--- /dev/null
+++ b/pkgs/applications/graphics/ciano/default.nix
@@ -0,0 +1,76 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, desktop-file-utils
+, ffmpeg
+, gobject-introspection
+, granite
+, gtk
+, imagemagick
+, libgee
+, libhandy
+, libsecret
+, libsoup
+, meson
+, ninja
+, pkg-config
+, python
+, vala
+, wrapGAppsHook
+}:
+
+stdenv.mkDerivation rec {
+ pname = "ciano";
+ version = "0.2.4";
+
+ src = fetchFromGitHub {
+ owner = "robertsanseries";
+ repo = pname;
+ rev = version;
+ hash = "sha256-nubm6vBWwsHrrmvFAL/cIzYPxg9B1EhnpC79IJMNuFY=";
+ };
+
+ nativeBuildInputs = [
+ desktop-file-utils
+ meson
+ ninja
+ pkg-config
+ python
+ vala
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ ffmpeg
+ imagemagick
+ granite
+ gtk
+ ];
+
+ postPatch = ''
+ chmod +x meson/post_install.py
+ patchShebangs meson/post_install.py
+ '';
+
+ dontWrapGApps = true;
+
+ postFixup = let
+ binPath = lib.makeBinPath [
+ ffmpeg
+ imagemagick
+ ];
+ in
+ ''
+ wrapProgram $out/bin/com.github.robertsanseries.ciano \
+ --prefix PATH : ${binPath} "''${gappsWrapperArgs[@]}"
+ ln -s $out/bin/com.github.robertsanseries.ciano $out/bin/ciano
+ '';
+
+ meta = with lib; {
+ homepage = "https://github.com/robertsanseries/ciano";
+ description = "A multimedia file converter focused on simplicity";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ AndersonTorres ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 93185f2dd5ce..31c1d4a19937 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -26,11 +26,11 @@ let
in
stdenv.mkDerivation rec {
pname = "blender";
- version = "2.93.2";
+ version = "2.93.5";
src = fetchurl {
url = "https://download.blender.org/source/${pname}-${version}.tar.xz";
- sha256 = "sha256-nG1Kk6UtiCwsQBDz7VELcMRVEovS49QiO3haIpvSfu4=";
+ sha256 = "1fsw8w80h8k5w4zmy659bjlzqyn5i198hi1kbpzfrdn8psxg2bfj";
};
patches = lib.optional stdenv.isDarwin ./darwin.patch;
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index e48539aab5bb..aa77bae2d231 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -31,15 +31,15 @@
}
},
"dev": {
- "version": "96.0.4664.18",
- "sha256": "0z7hplfl9mlbn07svcavzcb2gqn1hchwhhlpz0qykf6kd441kxpf",
- "sha256bin64": "0y09aginw5qg7apm9wvxny7y8nxhsq7gnxp1jmghfjhv5xq7pdn9",
+ "version": "97.0.4676.0",
+ "sha256": "1cf660h7n1d4ds63747zfc4wmwxm348grcv40zg614cpjm4q68b5",
+ "sha256bin64": "116a4d47s3sx1pq8hhqybdsjxcv8657xaldrlix2z7jh94ip2nwh",
"deps": {
"gn": {
- "version": "2021-09-24",
+ "version": "2021-10-08",
"url": "https://gn.googlesource.com/gn",
- "rev": "0153d369bbccc908f4da4993b1ba82728055926a",
- "sha256": "0y4414h8jqsbz5af6pn91c0vkfp4s281s85g992xfyl785c5zbsi"
+ "rev": "693f9fb87e4febdd4299db9f73d8d2c958e63148",
+ "sha256": "1qfjj2mdpflry4f9fkagvb76zwfibys4nqz9lddy1zh5nnbd9mff"
}
}
},
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index d245e7035a46..e92815476676 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -31,12 +31,12 @@ let
in mkDerivationWith python3Packages.buildPythonApplication rec {
pname = "qutebrowser";
- version = "2.3.1";
+ version = "2.4.0";
# the release tarballs are different from the git checkout!
src = fetchurl {
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
- sha256 = "05n64mw9lzzxpxr7lhakbkm9ir3x8p0rwk6vbbg01aqg5iaanyj0";
+ sha256 = "8s2auxTrq/ljBXOy+4RHvhkod3h9xOOWThtV9yqFkuw=";
};
# Needs tox
diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix
index ccefd6d3de25..55f3e23ad6c3 100644
--- a/pkgs/applications/networking/cluster/flink/default.nix
+++ b/pkgs/applications/networking/cluster/flink/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "flink";
- version = "1.13.2";
+ version = "1.14.0";
src = fetchurl {
url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.11.tgz";
- sha256 = "sha256-GPiHV19Z2Htt75hCXK2nCeQMIBQFEEUxXlBembenFL0=";
+ sha256 = "149b9ae774022acc0109dced893ca2d73430627a612be17ff12de8734464aff8";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix
index 4002f7478b33..9eabf0ac1b5d 100644
--- a/pkgs/applications/networking/cluster/nixops/default.nix
+++ b/pkgs/applications/networking/cluster/nixops/default.nix
@@ -62,6 +62,7 @@ let
pkg = interpreter.pkgs.nixops.withPlugins(ps: [
ps.nixops-encrypted-links
+ ps.nixops-hercules-ci
ps.nixops-virtd
ps.nixops-aws
ps.nixops-gcp
diff --git a/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix b/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix
index cc40395d6d97..75b9471c9e09 100644
--- a/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix
+++ b/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix
@@ -41,6 +41,16 @@ self: super: {
}
);
+ nixops-hercules-ci = super.nixops-hercules-ci.overridePythonAttrs (
+ _: {
+ src = pkgs.fetchgit {
+ url = "https://github.com/hercules-ci/nixops-hercules-ci.git";
+ rev = "e601d5baffd003fd5f22deeaea0cb96444b054dc";
+ sha256 = "0rcpv5hc6l9ia8lq8ivwa80b2pwssmdz8an25lhr4i2472mpx1p0";
+ };
+ }
+ );
+
nixops-virtd = super.nixops-virtd.overridePythonAttrs (
_: {
src = pkgs.fetchgit {
diff --git a/pkgs/applications/networking/cluster/nixops/poetry.lock b/pkgs/applications/networking/cluster/nixops/poetry.lock
index 08e6b714982c..87d8fce2f23c 100644
--- a/pkgs/applications/networking/cluster/nixops/poetry.lock
+++ b/pkgs/applications/networking/cluster/nixops/poetry.lock
@@ -38,14 +38,14 @@ python-versions = "*"
[[package]]
name = "boto3"
-version = "1.18.60"
+version = "1.18.64"
description = "The AWS SDK for Python"
category = "main"
optional = false
python-versions = ">= 3.6"
[package.dependencies]
-botocore = ">=1.21.60,<1.22.0"
+botocore = ">=1.21.64,<1.22.0"
jmespath = ">=0.7.1,<1.0.0"
s3transfer = ">=0.5.0,<0.6.0"
@@ -54,7 +54,7 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"]
[[package]]
name = "botocore"
-version = "1.21.60"
+version = "1.21.64"
description = "Low-level, data-driven core of boto 3."
category = "main"
optional = false
@@ -66,7 +66,7 @@ python-dateutil = ">=2.1,<3.0.0"
urllib3 = ">=1.25.4,<1.27"
[package.extras]
-crt = ["awscrt (==0.11.24)"]
+crt = ["awscrt (==0.12.5)"]
[[package]]
name = "certifi"
@@ -78,7 +78,7 @@ python-versions = "*"
[[package]]
name = "cffi"
-version = "1.14.6"
+version = "1.15.0"
description = "Foreign Function Interface for Python calling C code."
category = "main"
optional = false
@@ -135,7 +135,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
[[package]]
name = "idna"
-version = "3.2"
+version = "3.3"
description = "Internationalized Domain Names in Applications (IDNA)"
category = "main"
optional = false
@@ -269,6 +269,24 @@ url = "https://github.com/nix-community/nixops-gce.git"
reference = "master"
resolved_reference = "712453027486e62e087b9c91e4a8a171eebb6ddd"
+[[package]]
+name = "nixops-hercules-ci"
+version = "0.1.0"
+description = ""
+category = "main"
+optional = false
+python-versions = "^3.8"
+develop = false
+
+[package.dependencies]
+nixops = {git = "https://github.com/NixOS/nixops.git", branch = "master"}
+
+[package.source]
+type = "git"
+url = "https://github.com/hercules-ci/nixops-hercules-ci.git"
+reference = "master"
+resolved_reference = "e601d5baffd003fd5f22deeaea0cb96444b054dc"
+
[[package]]
name = "nixops-virtd"
version = "1.0"
@@ -583,7 +601,7 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
[metadata]
lock-version = "1.1"
python-versions = "^3.8"
-content-hash = "bd064837654a0d4a4691b3df01338b92c95a449ff400a9cd49fee843ab13ee92"
+content-hash = "8a294b2745b271983bac54258b4f3a2ab3b2e5b218440329fa7eea482c63774f"
[metadata.files]
alabaster = [
@@ -603,63 +621,68 @@ boto = [
{file = "boto-2.49.0.tar.gz", hash = "sha256:ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"},
]
boto3 = [
- {file = "boto3-1.18.60-py3-none-any.whl", hash = "sha256:8f3face72d2ac6ad36bd7724410548891ce338b350e6f98574890a7b1d425d78"},
- {file = "boto3-1.18.60.tar.gz", hash = "sha256:45709a04ec5fb67ce5a8eaade3eb0ab24d6eb08d9a9ca6bdb2153047896197fc"},
+ {file = "boto3-1.18.64-py3-none-any.whl", hash = "sha256:b4d6299dd16a3042b7750cde00fe38d57fd59d3ce242308ba8488618ca931694"},
+ {file = "boto3-1.18.64.tar.gz", hash = "sha256:9223b433b0d3b74f2b9574fb3c384048998343ccd6b608044318a7f9b904f661"},
]
botocore = [
- {file = "botocore-1.21.60-py3-none-any.whl", hash = "sha256:890a5835ac00415ff78f1c7118a774aae83c0c70742284b68abd1176f9d05761"},
- {file = "botocore-1.21.60.tar.gz", hash = "sha256:3e746ca75fb7539ba3f001169264fa54dfaded2477ffc8bd979ce1e1df200620"},
+ {file = "botocore-1.21.64-py3-none-any.whl", hash = "sha256:d57287377e4c7c7d7bf6c5fa39e02994de1d99fced9492a58a00e5a54bae1cca"},
+ {file = "botocore-1.21.64.tar.gz", hash = "sha256:0a30dca4dad7d43fd856e671ace95f9afc4726caa1e22f0ae11b654fc76e0c7d"},
]
certifi = [
{file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"},
{file = "certifi-2021.10.8.tar.gz", hash = "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872"},
]
cffi = [
- {file = "cffi-1.14.6-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:22b9c3c320171c108e903d61a3723b51e37aaa8c81255b5e7ce102775bd01e2c"},
- {file = "cffi-1.14.6-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:f0c5d1acbfca6ebdd6b1e3eded8d261affb6ddcf2186205518f1428b8569bb99"},
- {file = "cffi-1.14.6-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:99f27fefe34c37ba9875f224a8f36e31d744d8083e00f520f133cab79ad5e819"},
- {file = "cffi-1.14.6-cp27-cp27m-win32.whl", hash = "sha256:55af55e32ae468e9946f741a5d51f9896da6b9bf0bbdd326843fec05c730eb20"},
- {file = "cffi-1.14.6-cp27-cp27m-win_amd64.whl", hash = "sha256:7bcac9a2b4fdbed2c16fa5681356d7121ecabf041f18d97ed5b8e0dd38a80224"},
- {file = "cffi-1.14.6-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:ed38b924ce794e505647f7c331b22a693bee1538fdf46b0222c4717b42f744e7"},
- {file = "cffi-1.14.6-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:e22dcb48709fc51a7b58a927391b23ab37eb3737a98ac4338e2448bef8559b33"},
- {file = "cffi-1.14.6-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:aedb15f0a5a5949ecb129a82b72b19df97bbbca024081ed2ef88bd5c0a610534"},
- {file = "cffi-1.14.6-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:48916e459c54c4a70e52745639f1db524542140433599e13911b2f329834276a"},
- {file = "cffi-1.14.6-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:f627688813d0a4140153ff532537fbe4afea5a3dffce1f9deb7f91f848a832b5"},
- {file = "cffi-1.14.6-cp35-cp35m-win32.whl", hash = "sha256:f0010c6f9d1a4011e429109fda55a225921e3206e7f62a0c22a35344bfd13cca"},
- {file = "cffi-1.14.6-cp35-cp35m-win_amd64.whl", hash = "sha256:57e555a9feb4a8460415f1aac331a2dc833b1115284f7ded7278b54afc5bd218"},
- {file = "cffi-1.14.6-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:e8c6a99be100371dbb046880e7a282152aa5d6127ae01783e37662ef73850d8f"},
- {file = "cffi-1.14.6-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:19ca0dbdeda3b2615421d54bef8985f72af6e0c47082a8d26122adac81a95872"},
- {file = "cffi-1.14.6-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:d950695ae4381ecd856bcaf2b1e866720e4ab9a1498cba61c602e56630ca7195"},
- {file = "cffi-1.14.6-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e9dc245e3ac69c92ee4c167fbdd7428ec1956d4e754223124991ef29eb57a09d"},
- {file = "cffi-1.14.6-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a8661b2ce9694ca01c529bfa204dbb144b275a31685a075ce123f12331be790b"},
- {file = "cffi-1.14.6-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b315d709717a99f4b27b59b021e6207c64620790ca3e0bde636a6c7f14618abb"},
- {file = "cffi-1.14.6-cp36-cp36m-win32.whl", hash = "sha256:80b06212075346b5546b0417b9f2bf467fea3bfe7352f781ffc05a8ab24ba14a"},
- {file = "cffi-1.14.6-cp36-cp36m-win_amd64.whl", hash = "sha256:a9da7010cec5a12193d1af9872a00888f396aba3dc79186604a09ea3ee7c029e"},
- {file = "cffi-1.14.6-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:4373612d59c404baeb7cbd788a18b2b2a8331abcc84c3ba40051fcd18b17a4d5"},
- {file = "cffi-1.14.6-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:f10afb1004f102c7868ebfe91c28f4a712227fe4cb24974350ace1f90e1febbf"},
- {file = "cffi-1.14.6-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:fd4305f86f53dfd8cd3522269ed7fc34856a8ee3709a5e28b2836b2db9d4cd69"},
- {file = "cffi-1.14.6-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6d6169cb3c6c2ad50db5b868db6491a790300ade1ed5d1da29289d73bbe40b56"},
- {file = "cffi-1.14.6-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5d4b68e216fc65e9fe4f524c177b54964af043dde734807586cf5435af84045c"},
- {file = "cffi-1.14.6-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33791e8a2dc2953f28b8d8d300dde42dd929ac28f974c4b4c6272cb2955cb762"},
- {file = "cffi-1.14.6-cp37-cp37m-win32.whl", hash = "sha256:0c0591bee64e438883b0c92a7bed78f6290d40bf02e54c5bf0978eaf36061771"},
- {file = "cffi-1.14.6-cp37-cp37m-win_amd64.whl", hash = "sha256:8eb687582ed7cd8c4bdbff3df6c0da443eb89c3c72e6e5dcdd9c81729712791a"},
- {file = "cffi-1.14.6-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ba6f2b3f452e150945d58f4badd92310449876c4c954836cfb1803bdd7b422f0"},
- {file = "cffi-1.14.6-cp38-cp38-manylinux1_i686.whl", hash = "sha256:64fda793737bc4037521d4899be780534b9aea552eb673b9833b01f945904c2e"},
- {file = "cffi-1.14.6-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:9f3e33c28cd39d1b655ed1ba7247133b6f7fc16fa16887b120c0c670e35ce346"},
- {file = "cffi-1.14.6-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:26bb2549b72708c833f5abe62b756176022a7b9a7f689b571e74c8478ead51dc"},
- {file = "cffi-1.14.6-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:eb687a11f0a7a1839719edd80f41e459cc5366857ecbed383ff376c4e3cc6afd"},
- {file = "cffi-1.14.6-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d2ad4d668a5c0645d281dcd17aff2be3212bc109b33814bbb15c4939f44181cc"},
- {file = "cffi-1.14.6-cp38-cp38-win32.whl", hash = "sha256:487d63e1454627c8e47dd230025780e91869cfba4c753a74fda196a1f6ad6548"},
- {file = "cffi-1.14.6-cp38-cp38-win_amd64.whl", hash = "sha256:c33d18eb6e6bc36f09d793c0dc58b0211fccc6ae5149b808da4a62660678b156"},
- {file = "cffi-1.14.6-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:06c54a68935738d206570b20da5ef2b6b6d92b38ef3ec45c5422c0ebaf338d4d"},
- {file = "cffi-1.14.6-cp39-cp39-manylinux1_i686.whl", hash = "sha256:f174135f5609428cc6e1b9090f9268f5c8935fddb1b25ccb8255a2d50de6789e"},
- {file = "cffi-1.14.6-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:f3ebe6e73c319340830a9b2825d32eb6d8475c1dac020b4f0aa774ee3b898d1c"},
- {file = "cffi-1.14.6-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3c8d896becff2fa653dc4438b54a5a25a971d1f4110b32bd3068db3722c80202"},
- {file = "cffi-1.14.6-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4922cd707b25e623b902c86188aca466d3620892db76c0bdd7b99a3d5e61d35f"},
- {file = "cffi-1.14.6-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c9e005e9bd57bc987764c32a1bee4364c44fdc11a3cc20a40b93b444984f2b87"},
- {file = "cffi-1.14.6-cp39-cp39-win32.whl", hash = "sha256:eb9e2a346c5238a30a746893f23a9535e700f8192a68c07c0258e7ece6ff3728"},
- {file = "cffi-1.14.6-cp39-cp39-win_amd64.whl", hash = "sha256:818014c754cd3dba7229c0f5884396264d51ffb87ec86e927ef0be140bfdb0d2"},
- {file = "cffi-1.14.6.tar.gz", hash = "sha256:c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd"},
+ {file = "cffi-1.15.0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:c2502a1a03b6312837279c8c1bd3ebedf6c12c4228ddbad40912d671ccc8a962"},
+ {file = "cffi-1.15.0-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:23cfe892bd5dd8941608f93348c0737e369e51c100d03718f108bf1add7bd6d0"},
+ {file = "cffi-1.15.0-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:41d45de54cd277a7878919867c0f08b0cf817605e4eb94093e7516505d3c8d14"},
+ {file = "cffi-1.15.0-cp27-cp27m-win32.whl", hash = "sha256:4a306fa632e8f0928956a41fa8e1d6243c71e7eb59ffbd165fc0b41e316b2474"},
+ {file = "cffi-1.15.0-cp27-cp27m-win_amd64.whl", hash = "sha256:e7022a66d9b55e93e1a845d8c9eba2a1bebd4966cd8bfc25d9cd07d515b33fa6"},
+ {file = "cffi-1.15.0-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:14cd121ea63ecdae71efa69c15c5543a4b5fbcd0bbe2aad864baca0063cecf27"},
+ {file = "cffi-1.15.0-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:d4d692a89c5cf08a8557fdeb329b82e7bf609aadfaed6c0d79f5a449a3c7c023"},
+ {file = "cffi-1.15.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0104fb5ae2391d46a4cb082abdd5c69ea4eab79d8d44eaaf79f1b1fd806ee4c2"},
+ {file = "cffi-1.15.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:91ec59c33514b7c7559a6acda53bbfe1b283949c34fe7440bcf917f96ac0723e"},
+ {file = "cffi-1.15.0-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:f5c7150ad32ba43a07c4479f40241756145a1f03b43480e058cfd862bf5041c7"},
+ {file = "cffi-1.15.0-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:00c878c90cb53ccfaae6b8bc18ad05d2036553e6d9d1d9dbcf323bbe83854ca3"},
+ {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:abb9a20a72ac4e0fdb50dae135ba5e77880518e742077ced47eb1499e29a443c"},
+ {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a5263e363c27b653a90078143adb3d076c1a748ec9ecc78ea2fb916f9b861962"},
+ {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f54a64f8b0c8ff0b64d18aa76675262e1700f3995182267998c31ae974fbc382"},
+ {file = "cffi-1.15.0-cp310-cp310-win32.whl", hash = "sha256:c21c9e3896c23007803a875460fb786118f0cdd4434359577ea25eb556e34c55"},
+ {file = "cffi-1.15.0-cp310-cp310-win_amd64.whl", hash = "sha256:5e069f72d497312b24fcc02073d70cb989045d1c91cbd53979366077959933e0"},
+ {file = "cffi-1.15.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:64d4ec9f448dfe041705426000cc13e34e6e5bb13736e9fd62e34a0b0c41566e"},
+ {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2756c88cbb94231c7a147402476be2c4df2f6078099a6f4a480d239a8817ae39"},
+ {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3b96a311ac60a3f6be21d2572e46ce67f09abcf4d09344c49274eb9e0bf345fc"},
+ {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:75e4024375654472cc27e91cbe9eaa08567f7fbdf822638be2814ce059f58032"},
+ {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:59888172256cac5629e60e72e86598027aca6bf01fa2465bdb676d37636573e8"},
+ {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:27c219baf94952ae9d50ec19651a687b826792055353d07648a5695413e0c605"},
+ {file = "cffi-1.15.0-cp36-cp36m-win32.whl", hash = "sha256:4958391dbd6249d7ad855b9ca88fae690783a6be9e86df65865058ed81fc860e"},
+ {file = "cffi-1.15.0-cp36-cp36m-win_amd64.whl", hash = "sha256:f6f824dc3bce0edab5f427efcfb1d63ee75b6fcb7282900ccaf925be84efb0fc"},
+ {file = "cffi-1.15.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:06c48159c1abed75c2e721b1715c379fa3200c7784271b3c46df01383b593636"},
+ {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:c2051981a968d7de9dd2d7b87bcb9c939c74a34626a6e2f8181455dd49ed69e4"},
+ {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:fd8a250edc26254fe5b33be00402e6d287f562b6a5b2152dec302fa15bb3e997"},
+ {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:91d77d2a782be4274da750752bb1650a97bfd8f291022b379bb8e01c66b4e96b"},
+ {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:45db3a33139e9c8f7c09234b5784a5e33d31fd6907800b316decad50af323ff2"},
+ {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:263cc3d821c4ab2213cbe8cd8b355a7f72a8324577dc865ef98487c1aeee2bc7"},
+ {file = "cffi-1.15.0-cp37-cp37m-win32.whl", hash = "sha256:17771976e82e9f94976180f76468546834d22a7cc404b17c22df2a2c81db0c66"},
+ {file = "cffi-1.15.0-cp37-cp37m-win_amd64.whl", hash = "sha256:3415c89f9204ee60cd09b235810be700e993e343a408693e80ce7f6a40108029"},
+ {file = "cffi-1.15.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:4238e6dab5d6a8ba812de994bbb0a79bddbdf80994e4ce802b6f6f3142fcc880"},
+ {file = "cffi-1.15.0-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0808014eb713677ec1292301ea4c81ad277b6cdf2fdd90fd540af98c0b101d20"},
+ {file = "cffi-1.15.0-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:57e9ac9ccc3101fac9d6014fba037473e4358ef4e89f8e181f8951a2c0162024"},
+ {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8b6c2ea03845c9f501ed1313e78de148cd3f6cad741a75d43a29b43da27f2e1e"},
+ {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:10dffb601ccfb65262a27233ac273d552ddc4d8ae1bf93b21c94b8511bffe728"},
+ {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:786902fb9ba7433aae840e0ed609f45c7bcd4e225ebb9c753aa39725bb3e6ad6"},
+ {file = "cffi-1.15.0-cp38-cp38-win32.whl", hash = "sha256:da5db4e883f1ce37f55c667e5c0de439df76ac4cb55964655906306918e7363c"},
+ {file = "cffi-1.15.0-cp38-cp38-win_amd64.whl", hash = "sha256:181dee03b1170ff1969489acf1c26533710231c58f95534e3edac87fff06c443"},
+ {file = "cffi-1.15.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:45e8636704eacc432a206ac7345a5d3d2c62d95a507ec70d62f23cd91770482a"},
+ {file = "cffi-1.15.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:31fb708d9d7c3f49a60f04cf5b119aeefe5644daba1cd2a0fe389b674fd1de37"},
+ {file = "cffi-1.15.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:6dc2737a3674b3e344847c8686cf29e500584ccad76204efea14f451d4cc669a"},
+ {file = "cffi-1.15.0-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:74fdfdbfdc48d3f47148976f49fab3251e550a8720bebc99bf1483f5bfb5db3e"},
+ {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffaa5c925128e29efbde7301d8ecaf35c8c60ffbcd6a1ffd3a552177c8e5e796"},
+ {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3f7d084648d77af029acb79a0ff49a0ad7e9d09057a9bf46596dac9514dc07df"},
+ {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ef1f279350da2c586a69d32fc8733092fd32cc8ac95139a00377841f59a3f8d8"},
+ {file = "cffi-1.15.0-cp39-cp39-win32.whl", hash = "sha256:2a23af14f408d53d5e6cd4e3d9a24ff9e05906ad574822a10563efcef137979a"},
+ {file = "cffi-1.15.0-cp39-cp39-win_amd64.whl", hash = "sha256:3773c4d81e6e818df2efbc7dd77325ca0dcb688116050fb2b3011218eda36139"},
+ {file = "cffi-1.15.0.tar.gz", hash = "sha256:920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954"},
]
charset-normalizer = [
{file = "charset-normalizer-2.0.7.tar.gz", hash = "sha256:e019de665e2bcf9c2b64e2e5aa025fa991da8720daa3c1138cadd2fd1856aed0"},
@@ -676,8 +699,6 @@ cryptography = [
{file = "cryptography-3.4.8-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:34dae04a0dce5730d8eb7894eab617d8a70d0c97da76b905de9efb7128ad7085"},
{file = "cryptography-3.4.8-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1eb7bb0df6f6f583dd8e054689def236255161ebbcf62b226454ab9ec663746b"},
{file = "cryptography-3.4.8-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:9965c46c674ba8cc572bc09a03f4c649292ee73e1b683adb1ce81e82e9a6a0fb"},
- {file = "cryptography-3.4.8-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:3c4129fc3fdc0fa8e40861b5ac0c673315b3c902bbdc05fc176764815b43dd1d"},
- {file = "cryptography-3.4.8-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:695104a9223a7239d155d7627ad912953b540929ef97ae0c34c7b8bf30857e89"},
{file = "cryptography-3.4.8-cp36-abi3-win32.whl", hash = "sha256:21ca464b3a4b8d8e86ba0ee5045e103a1fcfac3b39319727bc0fc58c09c6aff7"},
{file = "cryptography-3.4.8-cp36-abi3-win_amd64.whl", hash = "sha256:3520667fda779eb788ea00080124875be18f2d8f0848ec00733c0ec3bb8219fc"},
{file = "cryptography-3.4.8-pp36-pypy36_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:d2a6e5ef66503da51d2110edf6c403dc6b494cc0082f85db12f54e9c5d4c3ec5"},
@@ -695,8 +716,8 @@ docutils = [
{file = "docutils-0.16.tar.gz", hash = "sha256:c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc"},
]
idna = [
- {file = "idna-3.2-py3-none-any.whl", hash = "sha256:14475042e284991034cb48e06f6851428fb14c4dc953acd9be9a5e95c7b6dd7a"},
- {file = "idna-3.2.tar.gz", hash = "sha256:467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3"},
+ {file = "idna-3.3-py3-none-any.whl", hash = "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff"},
+ {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"},
]
imagesize = [
{file = "imagesize-1.2.0-py2.py3-none-any.whl", hash = "sha256:6965f19a6a2039c7d48bca7dba2473069ff854c36ae6f19d2cde309d998228a1"},
@@ -714,22 +735,12 @@ libvirt-python = [
{file = "libvirt-python-7.8.0.tar.gz", hash = "sha256:9d07416d66805bf1a17f34491b3ced2ac6c42b6a012ddf9177e0e3ae1b103fd5"},
]
markupsafe = [
- {file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53"},
- {file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:36bc903cbb393720fad60fc28c10de6acf10dc6cc883f3e24ee4012371399a38"},
- {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad"},
- {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d"},
- {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646"},
- {file = "MarkupSafe-2.0.1-cp310-cp310-win32.whl", hash = "sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28"},
- {file = "MarkupSafe-2.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134"},
{file = "MarkupSafe-2.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51"},
{file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:0955295dd5eec6cb6cc2fe1698f4c6d84af2e92de33fbcac4111913cd100a6ff"},
{file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:0446679737af14f45767963a1a9ef7620189912317d095f2d9ffa183a4d25d2b"},
{file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:f826e31d18b516f653fe296d967d700fddad5901ae07c622bb3705955e1faa94"},
{file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872"},
{file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:905fec760bd2fa1388bb5b489ee8ee5f7291d692638ea5f67982d968366bef9f"},
- {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c"},
- {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724"},
- {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:baa1a4e8f868845af802979fcdbf0bb11f94f1cb7ced4c4b8a351bb60d108145"},
{file = "MarkupSafe-2.0.1-cp36-cp36m-win32.whl", hash = "sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d"},
{file = "MarkupSafe-2.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9"},
{file = "MarkupSafe-2.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567"},
@@ -738,21 +749,14 @@ markupsafe = [
{file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:d7f9850398e85aba693bb640262d3611788b1f29a79f0c93c565694658f4071f"},
{file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:6a7fae0dd14cf60ad5ff42baa2e95727c3d81ded453457771d02b7d2b3f9c0c2"},
{file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:b7f2d075102dc8c794cbde1947378051c4e5180d52d276987b8d28a3bd58c17d"},
- {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85"},
- {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6"},
- {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864"},
{file = "MarkupSafe-2.0.1-cp37-cp37m-win32.whl", hash = "sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415"},
{file = "MarkupSafe-2.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914"},
- {file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9"},
{file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066"},
{file = "MarkupSafe-2.0.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35"},
{file = "MarkupSafe-2.0.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b"},
{file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298"},
{file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75"},
{file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb"},
- {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b"},
- {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a"},
- {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6"},
{file = "MarkupSafe-2.0.1-cp38-cp38-win32.whl", hash = "sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64"},
{file = "MarkupSafe-2.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833"},
{file = "MarkupSafe-2.0.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26"},
@@ -762,9 +766,6 @@ markupsafe = [
{file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135"},
{file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902"},
{file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509"},
- {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1"},
- {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac"},
- {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6"},
{file = "MarkupSafe-2.0.1-cp39-cp39-win32.whl", hash = "sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74"},
{file = "MarkupSafe-2.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8"},
{file = "MarkupSafe-2.0.1.tar.gz", hash = "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a"},
@@ -773,6 +774,7 @@ nixops = []
nixops-aws = []
nixops-encrypted-links = []
nixops-gcp = []
+nixops-hercules-ci = []
nixops-virtd = []
nixopsvbox = []
nixos-modules-contrib = []
diff --git a/pkgs/applications/networking/cluster/nixops/pyproject.toml b/pkgs/applications/networking/cluster/nixops/pyproject.toml
index 09ffb54fa2bb..3cd3025b1fa5 100644
--- a/pkgs/applications/networking/cluster/nixops/pyproject.toml
+++ b/pkgs/applications/networking/cluster/nixops/pyproject.toml
@@ -11,6 +11,7 @@ nixops-aws = {git = "https://github.com/NixOS/nixops-aws.git"}
nixops-gcp = {git = "https://github.com/nix-community/nixops-gce.git"}
nixopsvbox = {git = "https://github.com/nix-community/nixops-vbox.git"}
nixops-encrypted-links = {git = "https://github.com/nix-community/nixops-encrypted-links.git"}
+nixops-hercules-ci = {git = "https://github.com/hercules-ci/nixops-hercules-ci.git"}
nixops-virtd = {git = "https://github.com/nix-community/nixops-libvirtd.git"}
[tool.poetry.dev-dependencies]
diff --git a/pkgs/applications/networking/mailreaders/bubblemail/default.nix b/pkgs/applications/networking/mailreaders/bubblemail/default.nix
index d415eb4e51f2..612762207565 100644
--- a/pkgs/applications/networking/mailreaders/bubblemail/default.nix
+++ b/pkgs/applications/networking/mailreaders/bubblemail/default.nix
@@ -17,14 +17,14 @@
python3Packages.buildPythonApplication rec {
pname = "bubblemail";
- version = "1.3";
+ version = "1.4";
src = fetchFromGitLab {
domain = "framagit.org";
owner = "razer";
repo = "bubblemail";
rev = "v${version}";
- sha256 = "FEIdEoZBlM28F5kSMoln7KACwetb8hp+qix1P+DIE8k=";
+ sha256 = "sha256-MPl4pXvdhwCFWTepn/Mxp8ZMs+HCzXC59qdKZp3mHdw=";
};
buildInputs = [
diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index 23b636458c9b..5eeec874deeb 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -4,14 +4,14 @@
}:
stdenv.mkDerivation rec {
- version = "20211015";
+ version = "20211022";
pname = "neomutt";
src = fetchFromGitHub {
owner = "neomutt";
repo = "neomutt";
rev = version;
- sha256 = "sha256-ObYeh9Q/WZ1N60pxR2LoDNCU8rP4tQt/oIxnqALqMhs=";
+ sha256 = "sha256-gPMbl+g9tU7YmT3uJoJozCdDBb/4eFyVyvHdREK1Ss0=";
};
buildInputs = [
diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix
index b106deb074e3..429042f3ee4b 100644
--- a/pkgs/applications/networking/sync/unison/default.nix
+++ b/pkgs/applications/networking/sync/unison/default.nix
@@ -7,7 +7,6 @@
, makeWrapper
, ncurses
, gnugrep
-, fetchpatch
, copyDesktopItems
, makeDesktopItem
, enableX11 ? true
@@ -15,29 +14,19 @@
stdenv.mkDerivation rec {
pname = "unison";
- version = "2.51.3";
+ version = "2.51.4";
src = fetchFromGitHub {
owner = "bcpierce00";
repo = "unison";
rev = "v${version}";
- sha256 = "sha256-42hmdMwOYSWGiDCmhuqtpCWtvtyD2l+kA/bhHD/Qh5Y=";
+ sha256 = "sha256-jcfq4X+r98bQqbQ3gRqJyryLdt1Y/2CLawqqIiUaQOo=";
};
nativeBuildInputs = [ makeWrapper ]
++ lib.optional enableX11 copyDesktopItems;
buildInputs = [ ocamlPackages.ocaml ncurses ];
- patches = [
- # Patch to fix build with ocaml 4.12. Remove in 2.51.4
- # https://github.com/bcpierce00/unison/pull/481
- (fetchpatch {
- name = "fix-compile-with-ocaml-4.12.patch";
- url = "https://github.com/bcpierce00/unison/commit/14b885316e0a4b41cb80fe3daef7950f88be5c8f.patch?full_index=1";
- sha256 = "0j1rma1cwdsfql19zvzhfj2ys5c4lbhjcp6jrnck04xnckxxiy3d";
- })
- ];
-
preBuild = lib.optionalString enableX11 ''
sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${ocamlPackages.lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" src/Makefile.OCaml
'' + ''
diff --git a/pkgs/applications/networking/browsers/angelfish/default.nix b/pkgs/applications/plasma-mobile/angelfish.nix
similarity index 58%
rename from pkgs/applications/networking/browsers/angelfish/default.nix
rename to pkgs/applications/plasma-mobile/angelfish.nix
index dedc51469670..99df3f55c1d5 100644
--- a/pkgs/applications/networking/browsers/angelfish/default.nix
+++ b/pkgs/applications/plasma-mobile/angelfish.nix
@@ -16,21 +16,29 @@
, qtquickcontrols2
, qtwebengine
, rustPlatform
+, srcs
+
+# These must be updated in tandem with package updates.
+, cargoShaForVersion ? "21.08"
+, cargoSha256 ? "1pbvw9hdzn3i97mahdy9y6jnjsmwmjs3lxfz7q6r9r10i8swbkak"
}:
+# Guard against incomplete updates.
+# Values are provided as callPackage inputs to enable easier overrides through overlays.
+if cargoShaForVersion != srcs.angelfish.version
+then builtins.throw ''
+ angelfish package update is incomplete.
+ Hash for cargo dependencies is declared for version ${cargoShaForVersion}, but we're building ${srcs.angelfish.version}.
+ Update the cargoSha256 and cargoShaForVersion for angelfish.
+'' else
+
mkDerivation rec {
pname = "angelfish";
- version = "21.08";
-
- src = fetchurl {
- url = "mirror://kde/stable/plasma-mobile/${version}/angelfish-${version}.tar.xz";
- sha256 = "1gzvlha159bw767mj8lisn89592j4j4dazzfws3v4anddjh60xnh";
- };
cargoDeps = rustPlatform.fetchCargoTarball {
- inherit src;
- name = "${pname}-${version}";
- sha256 = "1pbvw9hdzn3i97mahdy9y6jnjsmwmjs3lxfz7q6r9r10i8swbkak";
+ src = srcs.angelfish.src;
+ name = "${pname}-${srcs.angelfish.version}";
+ sha256 = cargoSha256;
};
nativeBuildInputs = [
diff --git a/pkgs/applications/plasma-mobile/audiotube.nix b/pkgs/applications/plasma-mobile/audiotube.nix
new file mode 100644
index 000000000000..1a1dedc7b426
--- /dev/null
+++ b/pkgs/applications/plasma-mobile/audiotube.nix
@@ -0,0 +1,61 @@
+{ lib
+, mkDerivation
+, fetchpatch
+
+, extra-cmake-modules
+
+, kcoreaddons
+, kcrash
+, ki18n
+, kirigami2
+, qtmultimedia
+, qtquickcontrols2
+, python3Packages
+}:
+
+mkDerivation rec {
+ pname = "audiotube";
+
+ patches = [
+ # Fix compatibility with ytmusicapi 0.19.1
+ (fetchpatch {
+ url = "https://invent.kde.org/plasma-mobile/audiotube/-/commit/734caa02805988200f923b88d1590b3f7dac8ac2.patch";
+ sha256 = "0zq4f0w84dv0630bpvmqkfmhxbvibr2fxhzy6d2mnf098028gzyd";
+ })
+ ];
+
+ nativeBuildInputs = [
+ extra-cmake-modules
+ python3Packages.wrapPython
+ python3Packages.pybind11
+ ];
+
+ buildInputs = [
+ kcoreaddons
+ kcrash
+ ki18n
+ kirigami2
+ qtmultimedia
+ qtquickcontrols2
+ python3Packages.youtube-dl
+ python3Packages.ytmusicapi
+ ];
+
+ pythonPath = [
+ python3Packages.youtube-dl
+ python3Packages.ytmusicapi
+ ];
+
+ preFixup = ''
+ buildPythonPath "$pythonPath"
+ qtWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH")
+ '';
+
+ meta = with lib; {
+ description = "Client for YouTube Music";
+ homepage = "https://invent.kde.org/plasma-mobile/audiotube";
+ # https://invent.kde.org/plasma-mobile/audiotube/-/tree/c503d0607a3386112beaa9cf990ab85fe33ef115/LICENSES
+ license = with licenses; [ bsd2 cc0 gpl2Only gpl3Only ];
+ maintainers = with maintainers; [ samueldr ];
+ };
+}
diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix
index 18f550955c57..fd9ae2a2bae8 100644
--- a/pkgs/applications/plasma-mobile/default.nix
+++ b/pkgs/applications/plasma-mobile/default.nix
@@ -62,12 +62,17 @@ let
};
in {
alligator = callPackage ./alligator.nix {};
+ angelfish = callPackage ./angelfish.nix { inherit srcs; };
+ audiotube = callPackage ./audiotube.nix {};
calindori = callPackage ./calindori.nix {};
kalk = callPackage ./kalk.nix {};
+ kasts = callPackage ./kasts.nix {};
kclock = callPackage ./kclock.nix {};
+ keysmith = callPackage ./keysmith.nix {};
koko = callPackage ./koko.nix {};
krecorder = callPackage ./krecorder.nix {};
ktrip = callPackage ./ktrip.nix {};
+ kweather = callPackage ./kweather.nix {};
plasma-dialer = callPackage ./plasma-dialer.nix {};
plasma-phonebook = callPackage ./plasma-phonebook.nix {};
spacebar = callPackage ./spacebar.nix {};
diff --git a/pkgs/applications/plasma-mobile/fetch.sh b/pkgs/applications/plasma-mobile/fetch.sh
index 29a8e6b4c792..14995aeb2b7f 100644
--- a/pkgs/applications/plasma-mobile/fetch.sh
+++ b/pkgs/applications/plasma-mobile/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/plasma-mobile/21.05 -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma-mobile/21.08/ -A '*.tar.xz' )
diff --git a/pkgs/applications/plasma-mobile/kasts.nix b/pkgs/applications/plasma-mobile/kasts.nix
new file mode 100644
index 000000000000..370cba7e2ea8
--- /dev/null
+++ b/pkgs/applications/plasma-mobile/kasts.nix
@@ -0,0 +1,57 @@
+{ lib
+, mkDerivation
+
+, cmake
+, extra-cmake-modules
+, wrapGAppsHook
+
+, gst_all_1
+, kconfig
+, kcoreaddons
+, ki18n
+, kirigami2
+, qtmultimedia
+, qtquickcontrols2
+, syndication
+}:
+
+let
+ inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad;
+in
+mkDerivation rec {
+ pname = "kasts";
+
+ nativeBuildInputs = [
+ cmake
+ extra-cmake-modules
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ gst-plugins-bad
+ gst-plugins-base
+ gst-plugins-good
+ gstreamer
+
+ kconfig
+ kcoreaddons
+ ki18n
+ kirigami2
+ qtquickcontrols2
+ qtmultimedia
+ syndication
+ ];
+
+ preFixup = ''
+ qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
+ '';
+ dontWrapGApps = true;
+
+ meta = with lib; {
+ description = "Mobile podcast application";
+ homepage = "https://apps.kde.org/kasts/";
+ # https://invent.kde.org/plasma-mobile/kasts/-/tree/master/LICENSES
+ license = with licenses; [ bsd2 cc-by-sa-40 cc0 gpl2Only gpl2Plus gpl3Only gpl3Plus lgpl3Plus ];
+ maintainers = with maintainers; [ samueldr ];
+ };
+}
diff --git a/pkgs/applications/plasma-mobile/keysmith.nix b/pkgs/applications/plasma-mobile/keysmith.nix
new file mode 100644
index 000000000000..eaca7f68e24b
--- /dev/null
+++ b/pkgs/applications/plasma-mobile/keysmith.nix
@@ -0,0 +1,39 @@
+{ lib
+, mkDerivation
+
+, cmake
+, extra-cmake-modules
+
+, kdbusaddons
+, ki18n
+, kirigami2
+, kwindowsystem
+, libsodium
+, qtquickcontrols2
+}:
+
+mkDerivation rec {
+ pname = "keysmith";
+
+ nativeBuildInputs = [
+ cmake
+ extra-cmake-modules
+ ];
+
+ buildInputs = [
+ kdbusaddons
+ ki18n
+ kirigami2
+ kwindowsystem
+ libsodium
+ qtquickcontrols2
+ ];
+
+ meta = with lib; {
+ description = "OTP client for Plasma Mobile and Desktop";
+ license = licenses.gpl3;
+ homepage = "https://github.com/KDE/keysmith";
+ maintainers = with maintainers; [ samueldr shamilton ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/plasma-mobile/ktrip.nix b/pkgs/applications/plasma-mobile/ktrip.nix
index cc1404d064fd..5377dd106586 100644
--- a/pkgs/applications/plasma-mobile/ktrip.nix
+++ b/pkgs/applications/plasma-mobile/ktrip.nix
@@ -12,6 +12,7 @@
, kirigami2
, kitemmodels
, kpublictransport
+, qqc2-desktop-style
, qtquickcontrols2
}:
@@ -32,6 +33,7 @@ mkDerivation rec {
kirigami2
kitemmodels
kpublictransport
+ qqc2-desktop-style
qtquickcontrols2
];
diff --git a/pkgs/applications/plasma-mobile/kweather.nix b/pkgs/applications/plasma-mobile/kweather.nix
new file mode 100644
index 000000000000..497061624b92
--- /dev/null
+++ b/pkgs/applications/plasma-mobile/kweather.nix
@@ -0,0 +1,44 @@
+{ lib
+, mkDerivation
+
+, cmake
+, extra-cmake-modules
+
+, kconfig
+, ki18n
+, kirigami2
+, knotifications
+, kquickcharts
+, kweathercore
+, plasma-framework
+, qtcharts
+, qtquickcontrols2
+}:
+
+mkDerivation rec {
+ pname = "kweather";
+
+ nativeBuildInputs = [
+ cmake
+ extra-cmake-modules
+ ];
+
+ buildInputs = [
+ kconfig
+ ki18n
+ kirigami2
+ knotifications
+ kquickcharts
+ kweathercore
+ plasma-framework
+ qtcharts
+ qtquickcontrols2
+ ];
+
+ meta = with lib; {
+ description = "Weather application for Plasma Mobile";
+ homepage = "https://invent.kde.org/plasma-mobile/kweather";
+ license = with licenses; [ gpl2Plus cc-by-40 ];
+ maintainers = with maintainers; [ samueldr ];
+ };
+}
diff --git a/pkgs/applications/plasma-mobile/spacebar.nix b/pkgs/applications/plasma-mobile/spacebar.nix
index 1c661041f7ae..8d5665501086 100644
--- a/pkgs/applications/plasma-mobile/spacebar.nix
+++ b/pkgs/applications/plasma-mobile/spacebar.nix
@@ -9,7 +9,9 @@
, kirigami2
, knotifications
, kpeople
+, libphonenumber
, libqofono
+, protobuf
, telepathy
}:
@@ -27,7 +29,9 @@ mkDerivation rec {
kirigami2
knotifications
kpeople
+ libphonenumber
libqofono
+ protobuf # Needed by libphonenumber
telepathy
];
diff --git a/pkgs/applications/plasma-mobile/srcs.nix b/pkgs/applications/plasma-mobile/srcs.nix
index 4df185aa0aec..06b551a94cf4 100644
--- a/pkgs/applications/plasma-mobile/srcs.nix
+++ b/pkgs/applications/plasma-mobile/srcs.nix
@@ -1,118 +1,158 @@
# DO NOT EDIT! This file is generated automatically.
-# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/plasma-mobile/
+# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/plasma-mobile
{ fetchurl, mirror }:
{
alligator = {
- version = "21.05";
+ version = "21.08";
src = fetchurl {
- url = "${mirror}/stable/plasma-mobile/21.05/alligator-21.05.tar.xz";
- sha256 = "04zgxfx2zmn1p2ap08i5sfsnrly3smip4ylr07ghkhkiyjzbv9w6";
- name = "alligator-21.05.tar.xz";
+ url = "${mirror}/stable/plasma-mobile/21.08/alligator-21.08.tar.xz";
+ sha256 = "1dhwfwd1v5wmx3sldpygb79kz87j13wd0arhlkm94z1whsixan0q";
+ name = "alligator-21.08.tar.xz";
};
};
angelfish = {
- version = "21.05";
+ version = "21.08";
src = fetchurl {
- url = "${mirror}/stable/plasma-mobile/21.05/angelfish-21.05.tar.xz";
- sha256 = "11jd5dwy0xa7kh5z5rc29xy3wfn20hm31908zjax4x83qqjrm075";
- name = "angelfish-21.05.tar.xz";
+ url = "${mirror}/stable/plasma-mobile/21.08/angelfish-21.08.tar.xz";
+ sha256 = "1gzvlha159bw767mj8lisn89592j4j4dazzfws3v4anddjh60xnh";
+ name = "angelfish-21.08.tar.xz";
+ };
+ };
+ audiotube = {
+ version = "21.08";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma-mobile/21.08/audiotube-21.08.tar.xz";
+ sha256 = "14h4xna9v70lmp7cfpvdnz0f5a4gwgj0q3byccmawm38xsv15v8c";
+ name = "audiotube-21.08.tar.xz";
};
};
calindori = {
- version = "21.05";
+ version = "21.08";
src = fetchurl {
- url = "${mirror}/stable/plasma-mobile/21.05/calindori-21.05.tar.xz";
- sha256 = "110f9ri9r1nb6q1ybhkfxljl4q5gqxikh9z0xkzjjbxjjqfscqcj";
- name = "calindori-21.05.tar.xz";
+ url = "${mirror}/stable/plasma-mobile/21.08/calindori-21.08.tar.xz";
+ sha256 = "08s16a8skh02n8ygqwryxpzczj5aqr5k58aijaz2gzx45m7ym31b";
+ name = "calindori-21.08.tar.xz";
};
};
kalk = {
- version = "21.05";
+ version = "21.08";
src = fetchurl {
- url = "${mirror}/stable/plasma-mobile/21.05/kalk-21.05.tar.xz";
- sha256 = "04n65hx0j9rx6b3jq69zgypi8qjd4ig3rfw7d44c3q7dgh4k451l";
- name = "kalk-21.05.tar.xz";
+ url = "${mirror}/stable/plasma-mobile/21.08/kalk-21.08.tar.xz";
+ sha256 = "0xzrahpz47yajalsfmpzmavxjwmr4bgljwyz2dhxdg40ryjxdy23";
+ name = "kalk-21.08.tar.xz";
+ };
+ };
+ kasts = {
+ version = "21.08";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma-mobile/21.08/kasts-21.08.tar.xz";
+ sha256 = "10v6icxwv46nihzbdi0n2w71bsg7l166z7jf9rb7vf2mjh1gqavn";
+ name = "kasts-21.08.tar.xz";
};
};
kclock = {
- version = "21.05";
+ version = "21.08";
src = fetchurl {
- url = "${mirror}/stable/plasma-mobile/21.05/kclock-21.05.tar.xz";
- sha256 = "0pa5hvax0y80l8yrqczh9mcknfm3z0vdq3xc35cxdiz1vc6fwqmd";
- name = "kclock-21.05.tar.xz";
+ url = "${mirror}/stable/plasma-mobile/21.08/kclock-21.08.tar.xz";
+ sha256 = "1zq0fxlwd7l3b6dgfqsmv1x4wvhmrjz5r0a38hbd7j7pzgyix47d";
+ name = "kclock-21.08.tar.xz";
+ };
+ };
+ keysmith = {
+ version = "21.08";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma-mobile/21.08/keysmith-21.08.tar.xz";
+ sha256 = "0fa8inli7cwmb75af0mr2cflng0r6k3pd6ckih6ph7szqbpg2x90";
+ name = "keysmith-21.08.tar.xz";
};
};
koko = {
- version = "21.05";
+ version = "21.08";
src = fetchurl {
- url = "${mirror}/stable/plasma-mobile/21.05/koko-21.05.tar.xz";
- sha256 = "00hnzkl8dvf15psrcfh96b8wfb3pbggd2f7xnadzcb87sbaml035";
- name = "koko-21.05.tar.xz";
+ url = "${mirror}/stable/plasma-mobile/21.08/koko-21.08.tar.xz";
+ sha256 = "1sqlcl871m6dlrnkkhqa3xfwix01d74d7jf94r1a3p32hqljv76p";
+ name = "koko-21.08.tar.xz";
};
};
kongress = {
- version = "21.05";
+ version = "21.08";
src = fetchurl {
- url = "${mirror}/stable/plasma-mobile/21.05/kongress-21.05.tar.xz";
- sha256 = "0qxgpi04ra9crc6drgbdm9arjbvcx52pprjr1dj8acch07f6i2gs";
- name = "kongress-21.05.tar.xz";
+ url = "${mirror}/stable/plasma-mobile/21.08/kongress-21.08.tar.xz";
+ sha256 = "099ds4bv4ngx21f28hxcvc17wd2nk786kydwf2h5n3mdd2mgz3ka";
+ name = "kongress-21.08.tar.xz";
};
};
krecorder = {
- version = "21.05";
+ version = "21.08";
src = fetchurl {
- url = "${mirror}/stable/plasma-mobile/21.05/krecorder-21.05.tar.xz";
- sha256 = "0ydaidxx2616bixihyaagvyym1r5s9rjkgg04vq9k4608d4vnn5c";
- name = "krecorder-21.05.tar.xz";
+ url = "${mirror}/stable/plasma-mobile/21.08/krecorder-21.08.tar.xz";
+ sha256 = "1381x889h37saf6k875iqhwz5vbixrp7650smxp31r56ycrqq26i";
+ name = "krecorder-21.08.tar.xz";
};
};
ktrip = {
- version = "21.05";
+ version = "21.08";
src = fetchurl {
- url = "${mirror}/stable/plasma-mobile/21.05/ktrip-21.05.tar.xz";
- sha256 = "0hxgnncyc2ir6i9p6s9fy1r4mhxgm643pxvp8lj3j5y0c5wk2kp9";
- name = "ktrip-21.05.tar.xz";
+ url = "${mirror}/stable/plasma-mobile/21.08/ktrip-21.08.tar.xz";
+ sha256 = "0ipxi3pqd7mznq3qjf9j9w3wyck85lxnr81ay6b3ricfb08ry68x";
+ name = "ktrip-21.08.tar.xz";
+ };
+ };
+ kweather = {
+ version = "21.08";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma-mobile/21.08/kweather-21.08.tar.xz";
+ sha256 = "0b1zjwsakwsnh6827zjhypvb04c78gwwygr7k1cy2x3finrp5if5";
+ name = "kweather-21.08.tar.xz";
};
};
plasma-dialer = {
- version = "21.05";
+ version = "21.08";
src = fetchurl {
- url = "${mirror}/stable/plasma-mobile/21.05/plasma-dialer-21.05.tar.xz";
- sha256 = "0kwkjn7ry6snc86qi1j7kcq5qa6rbyk5i7v6gqf7a7wywkk9n045";
- name = "plasma-dialer-21.05.tar.xz";
+ url = "${mirror}/stable/plasma-mobile/21.08/plasma-dialer-21.08.tar.xz";
+ sha256 = "14vgjg0nihhm446cfrrld1l43r50dlah5xs2ypdnm68618bdc7p1";
+ name = "plasma-dialer-21.08.tar.xz";
};
};
plasma-phonebook = {
- version = "21.05";
+ version = "21.08";
src = fetchurl {
- url = "${mirror}/stable/plasma-mobile/21.05/plasma-phonebook-21.05.tar.xz";
- sha256 = "0aqqi3gvcsh4zg41zf8y0c626lwrabjchhr8pxj4n9la7y0wdvca";
- name = "plasma-phonebook-21.05.tar.xz";
+ url = "${mirror}/stable/plasma-mobile/21.08/plasma-phonebook-21.08.tar.xz";
+ sha256 = "09gr5mkwhayx6k6bhm29bmcvdlqqw8jj7gydh5fz40g9z98c84km";
+ name = "plasma-phonebook-21.08.tar.xz";
};
};
plasma-settings = {
- version = "21.05";
+ version = "21.08";
src = fetchurl {
- url = "${mirror}/stable/plasma-mobile/21.05/plasma-settings-21.05.tar.xz";
- sha256 = "16bhx0i8gvi9ina4jxzx02xyzypyjic9646lahxvzvzmd9hn9ipi";
- name = "plasma-settings-21.05.tar.xz";
+ url = "${mirror}/stable/plasma-mobile/21.08/plasma-settings-21.08.tar.xz";
+ sha256 = "005v1gyrzl9b0k875p2wipja3l8l4awp8nl2d1jx7c28lqaspz2j";
+ name = "plasma-settings-21.08.tar.xz";
};
};
qmlkonsole = {
- version = "21.05";
+ version = "21.08";
src = fetchurl {
- url = "${mirror}/stable/plasma-mobile/21.05/qmlkonsole-21.05.tar.xz";
- sha256 = "1ga48n09zlgvf5vvk2m26ak3ih5gjf361xxnyfprimmd7yj23han";
- name = "qmlkonsole-21.05.tar.xz";
+ url = "${mirror}/stable/plasma-mobile/21.08/qmlkonsole-21.08.tar.xz";
+ sha256 = "1p3ysf6sgiji86400523hm67rvw3znj3a7k6g6s83dxynxdh2faq";
+ name = "qmlkonsole-21.08.tar.xz";
};
};
spacebar = {
- version = "21.05";
+ version = "21.08";
src = fetchurl {
- url = "${mirror}/stable/plasma-mobile/21.05/spacebar-21.05.tar.xz";
- sha256 = "16lvi5yzmvk6gb5m7csk44y2jbkk7psn1lkljmj1938p2475b94c";
- name = "spacebar-21.05.tar.xz";
+ url = "${mirror}/stable/plasma-mobile/21.08/spacebar-21.08.tar.xz";
+ sha256 = "1cg36iys4x7p97ywilnp2lzz1ry5a1m7jz38yh2yiw6m8wvzfqff";
+ name = "spacebar-21.08.tar.xz";
+ };
+ };
+ tokodon = {
+ version = "21.08";
+ src = fetchurl {
+ url = "${mirror}/stable/plasma-mobile/21.08/tokodon-21.08.tar.xz";
+ sha256 = "0j9zfcdss1872hv8xxrmy0jjmcz3y5kdz8gdrd6qmig5scrzjvnf";
+ name = "tokodon-21.08.tar.xz";
};
};
}
diff --git a/pkgs/applications/radio/airspyhf/default.nix b/pkgs/applications/radio/airspyhf/default.nix
new file mode 100644
index 000000000000..a54e8441e36b
--- /dev/null
+++ b/pkgs/applications/radio/airspyhf/default.nix
@@ -0,0 +1,25 @@
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libusb1 }:
+
+stdenv.mkDerivation rec {
+ pname = "airspyhf";
+ version = "1.6.8";
+
+ src = fetchFromGitHub {
+ owner = "airspy";
+ repo = pname;
+ rev = version;
+ hash = "sha256-RKTMEDPeKcerJZtXTn8eAShxDcZUMgeQg/+7pEpMyVg=";
+ };
+
+ nativeBuildInputs = [ cmake pkg-config ];
+
+ buildInputs = [ libusb1 ];
+
+ meta = with lib; {
+ description = "User mode driver for Airspy HF+";
+ homepage = "https://github.com/airspy/airspyhf";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ sikmir ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/radio/freedv/default.nix b/pkgs/applications/radio/freedv/default.nix
new file mode 100644
index 000000000000..b369a5475e53
--- /dev/null
+++ b/pkgs/applications/radio/freedv/default.nix
@@ -0,0 +1,49 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, codec2
+, libsamplerate
+, libsndfile
+, lpcnetfreedv
+, portaudio
+, speexdsp
+, hamlib
+, wxGTK31-gtk3
+}:
+
+stdenv.mkDerivation rec {
+ pname = "freedv";
+ version = "1.6.1";
+
+ src = fetchFromGitHub {
+ owner = "drowe67";
+ repo = "freedv-gui";
+ rev = "v${version}";
+ sha256 = "1dzhf944vgla9a5ilcgwivhzgdbfaknqnwbpb071a0rz8rajnv0q";
+ };
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [
+ codec2
+ libsamplerate
+ libsndfile
+ lpcnetfreedv
+ portaudio
+ speexdsp
+ hamlib
+ wxGTK31-gtk3
+ ];
+
+ cmakeFlags = [
+ "-DUSE_INTERNAL_CODEC2:BOOL=FALSE"
+ "-DUSE_STATIC_DEPS:BOOL=FALSE"
+ ];
+
+ meta = with lib; {
+ homepage = "https://freedv.org/";
+ description = "Digital voice for HF radio";
+ license = licenses.lgpl21;
+ maintainers = with maintainers; [ mvs ];
+ };
+}
diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix
index fd742474ec13..4c22d0e9325e 100644
--- a/pkgs/applications/radio/sdrangel/default.nix
+++ b/pkgs/applications/radio/sdrangel/default.nix
@@ -33,13 +33,13 @@
mkDerivation rec {
pname = "sdrangel";
- version = "6.16.3";
+ version = "6.17.1";
src = fetchFromGitHub {
owner = "f4exb";
repo = "sdrangel";
rev = "v${version}";
- sha256 = "sha256-qgFnl9IliKRI4TptpXyK9JHzpLEUQ7NZLIfc0AROCvA=";
+ sha256 = "sha256-VWHFrgJVyI3CtLXUiG3/4/cRTD8jSdunbrro34yLKvs=";
fetchSubmodules = false;
};
diff --git a/pkgs/applications/radio/sdrpp/default.nix b/pkgs/applications/radio/sdrpp/default.nix
new file mode 100644
index 000000000000..2324d400323a
--- /dev/null
+++ b/pkgs/applications/radio/sdrpp/default.nix
@@ -0,0 +1,107 @@
+{ stdenv, lib, fetchFromGitHub, cmake, pkg-config
+, libX11, glfw, glew, fftwFloat, volk
+# Sources
+, airspy_source ? true, airspy
+, airspyhf_source ? true, airspyhf
+, bladerf_source ? false, libbladeRF
+, file_source ? true
+, hackrf_source ? true, hackrf
+, limesdr_source ? false, limesuite
+, sddc_source ? false
+, rtl_sdr_source ? true, librtlsdr, libusb1
+, rtl_tcp_source ? true
+, sdrplay_source ? false, sdrplay
+, soapy_source ? true, soapysdr
+, spyserver_source ? true
+, plutosdr_source ? true, libiio, libad9361
+# Sinks
+, audio_sink ? true, rtaudio
+, portaudio_sink ? false, portaudio
+, network_sink ? true
+# Decoders
+, falcon9_decoder ? false
+, m17_decoder ? false, codec2
+, meteor_demodulator ? true
+, radio ? true
+, weather_sat_decoder ? true
+# Misc
+, discord_presence ? true
+, frequency_manager ? true
+, recorder ? true
+, rigctl_server ? true
+}:
+
+stdenv.mkDerivation rec {
+ pname = "sdrpp";
+ version = "1.0.4";
+
+ src = fetchFromGitHub {
+ owner = "AlexandreRouma";
+ repo = "SDRPlusPlus";
+ rev = version;
+ hash = "sha256-g9tpWvVRMXRhPfgvOeJhX6IMouF9+tLUr9wo5r35i/c=";
+ };
+
+ postPatch = ''
+ substituteInPlace CMakeLists.txt \
+ --replace "/usr" $out
+ substituteInPlace decoder_modules/m17_decoder/src/m17dsp.h \
+ --replace "codec2.h" "codec2/codec2.h"
+ '';
+
+ nativeBuildInputs = [ cmake pkg-config ];
+
+ buildInputs = [ glfw glew fftwFloat volk ]
+ ++ lib.optional stdenv.isLinux libX11
+ ++ lib.optional airspy_source airspy
+ ++ lib.optional airspyhf_source airspyhf
+ ++ lib.optional bladerf_source libbladeRF
+ ++ lib.optional hackrf_source hackrf
+ ++ lib.optional limesdr_source limesuite
+ ++ lib.optionals rtl_sdr_source [ librtlsdr libusb1 ]
+ ++ lib.optional sdrplay_source sdrplay
+ ++ lib.optional soapy_source soapysdr
+ ++ lib.optionals plutosdr_source [ libiio libad9361 ]
+ ++ lib.optional audio_sink rtaudio
+ ++ lib.optional portaudio_sink portaudio
+ ++ lib.optional m17_decoder codec2;
+
+ cmakeFlags = lib.mapAttrsToList (k: v: "-D${k}=${if v then "ON" else "OFF"}") {
+ OPT_BUILD_AIRSPY_SOURCE = airspy_source;
+ OPT_BUILD_AIRSPYHF_SOURCE = airspyhf_source;
+ OPT_BUILD_BLADERF_SOURCE = bladerf_source;
+ OPT_BUILD_FILE_SOURCE = file_source;
+ OPT_BUILD_HACKRF_SOURCE = hackrf_source;
+ OPT_BUILD_LIMESDR_SOURCE = limesdr_source;
+ OPT_BUILD_SDDC_SOURCE = sddc_source;
+ OPT_BUILD_RTL_SDR_SOURCE = rtl_sdr_source;
+ OPT_BUILD_RTL_TCP_SOURCE = rtl_tcp_source;
+ OPT_BUILD_SDRPLAY_SOURCE = sdrplay_source;
+ OPT_BUILD_SOAPY_SOURCE = soapy_source;
+ OPT_BUILD_SPYSERVER_SOURCE = spyserver_source;
+ OPT_BUILD_PLUTOSDR_SOURCE = plutosdr_source;
+ OPT_BUILD_AUDIO_SINK = audio_sink;
+ OPT_BUILD_PORTAUDIO_SINK = portaudio_sink;
+ OPT_BUILD_NETWORK_SINK = network_sink;
+ OPT_BUILD_NEW_PORTAUDIO_SINK = portaudio_sink;
+ OPT_BUILD_FALCON9_DECODER = falcon9_decoder;
+ OPT_BUILD_M17_DECODER = m17_decoder;
+ OPT_BUILD_METEOR_DEMODULATOR = meteor_demodulator;
+ OPT_BUILD_RADIO = radio;
+ OPT_BUILD_WEATHER_SAT_DECODER = weather_sat_decoder;
+ OPT_BUILD_DISCORD_PRESENCE = discord_presence;
+ OPT_BUILD_FREQUENCY_MANAGER = frequency_manager;
+ OPT_BUILD_RECORDER = recorder;
+ OPT_BUILD_RIGCTL_SERVER = rigctl_server;
+ };
+
+ NIX_CFLAGS_COMPILE = "-fpermissive";
+
+ meta = with lib; {
+ description = "Cross-Platform SDR Software";
+ homepage = "https://github.com/AlexandreRouma/SDRPlusPlus";
+ license = licenses.gpl3Only;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ sikmir ];
+ };
+}
diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/applications/science/biology/last/default.nix
index 0c5b81452fd5..8de0580a8199 100644
--- a/pkgs/applications/science/biology/last/default.nix
+++ b/pkgs/applications/science/biology/last/default.nix
@@ -1,12 +1,14 @@
-{ lib, stdenv, fetchurl, unzip, zlib, python3, parallel }:
+{ lib, stdenv, fetchFromGitLab, unzip, zlib, python3, parallel }:
stdenv.mkDerivation rec {
pname = "last";
- version = "1179";
+ version = "1256";
- src = fetchurl {
- url = "http://last.cbrc.jp/last-${version}.zip";
- sha256 = "sha256-949oiE7ZNkCOJuOK/huPkCN0c4TlVaTskkBe0joc0HU=";
+ src = fetchFromGitLab {
+ owner = "mcfrith";
+ repo = "last";
+ rev = version;
+ sha256 = "sha256-lOsU0X4K6jYcbkTzwQV+KAerQh9odE4zCLtSgZrYH6s=";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix
index a5b226bd0a9f..4c16413746dd 100644
--- a/pkgs/applications/science/biology/picard-tools/default.nix
+++ b/pkgs/applications/science/biology/picard-tools/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "picard-tools";
- version = "2.26.2";
+ version = "2.26.3";
src = fetchurl {
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
- sha256 = "sha256-mfqxaZpzX9BIoFl1okN3TxzJnoepsoMR1KqHLQY5BHQ=";
+ sha256 = "sha256-H7VgD75tmAEd01Pj1o6BNT0QaXhd1pUIpAFmKM6OUlo=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix
index a77f2dbac442..76dc559cb7ae 100644
--- a/pkgs/applications/science/logic/tamarin-prover/default.nix
+++ b/pkgs/applications/science/logic/tamarin-prover/default.nix
@@ -4,12 +4,12 @@
}:
let
- version = "1.6.0";
+ version = "1.6.1";
src = fetchFromGitHub {
owner = "tamarin-prover";
repo = "tamarin-prover";
rev = version;
- sha256 = "1pl3kz7gyw9g6s4x5j90z4snd10vq6296g3ajlr8d4n53p3c9i3w";
+ sha256 = "sha256:0cz1v7k4d0im749ag632nc34n91b51b0pq4z05rzw1p59a5lza92";
};
# tamarin has its own dependencies, but they're kept inside the repo,
@@ -85,15 +85,11 @@ mkDerivation (common "tamarin-prover" src // {
executableHaskellDepends = (with haskellPackages; [
binary-instances binary-orphans blaze-html conduit file-embed
- gitrev http-types lifted-base monad-control monad-unlift
+ gitrev http-types lifted-base monad-control
resourcet shakespeare threads wai warp yesod-core yesod-static
]) ++ [ tamarin-prover-utils
tamarin-prover-sapic
tamarin-prover-term
tamarin-prover-theory
];
-
- # tamarin-prover 1.6 is incompatible with maude 3.1.
- hydraPlatforms = lib.platforms.none;
- broken = true;
})
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index c26964bb3144..dbd2fb095e00 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -119,6 +119,6 @@ stdenv.mkDerivation rec {
platforms = platforms.all;
- maintainers = with maintainers; teams.sage.members;
+ maintainers = with maintainers; [ jbedo ] ++ teams.sage.members;
};
}
diff --git a/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix b/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix
new file mode 100644
index 000000000000..71c40e86aa97
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, withOpenCL ? true
+, ocl-icd
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "lucky-commit";
+ version = "2.1.0";
+
+ src = fetchFromGitHub {
+ owner = "not-an-aardvark";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0vs668i1yglfcqs94jhwdk90v0lja2w5kr5gakz082wykilms0zg";
+ };
+
+ cargoSha256 = "sha256-MvopLKhovwXaEmRgXnAzJeuhPgqnMjt0EtKUGSWFpaY=";
+
+ buildInputs = lib.optional withOpenCL [ ocl-icd ];
+
+ cargoBuildFlags = lib.optional (!withOpenCL) "--no-default-features";
+
+ # disable tests that require gpu
+ cargoTestFlags = [ "--no-default-features" ];
+
+ meta = with lib; {
+ description = "Change the start of your git commit hashes to whatever you want";
+ homepage = "https://github.com/not-an-aardvark/lucky-commit";
+ license = licenses.mit;
+ maintainers = with maintainers; [ figsoda ];
+ mainProgram = "lucky_commit";
+ };
+}
diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index 3088a68ca699..de0e97501fd4 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -16,12 +16,12 @@ with lib;
buildGoPackage rec {
pname = "gitea";
- version = "1.15.4";
+ version = "1.15.5";
# not fetching directly from the git repo, because that lacks several vendor files for the web UI
src = fetchurl {
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
- sha256 = "sha256-UsaTA6bI5pr3vbvO3jFn8A8qVRi385fbiJQD09Ut/X0=";
+ sha256 = "sha256-W+czWzo4keTLRPDLcTeYl3JSccwfq+P6k4ELADO9FVM=";
};
unpackPhase = ''
diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix
index b4bc0db4bac4..570a4c06abf9 100644
--- a/pkgs/applications/version-management/gitoxide/default.nix
+++ b/pkgs/applications/version-management/gitoxide/default.nix
@@ -1,22 +1,31 @@
-{ lib, stdenv, rustPlatform, cmake, fetchFromGitHub, pkg-config, openssl
-, libiconv, Security, SystemConfiguration }:
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, cmake
+, pkg-config
+, stdenv
+, libiconv
+, Security
+, SystemConfiguration
+, openssl
+}:
rustPlatform.buildRustPackage rec {
pname = "gitoxide";
- version = "0.8.4";
+ version = "0.10.0";
src = fetchFromGitHub {
owner = "Byron";
repo = "gitoxide";
rev = "v${version}";
- sha256 = "WH8YiW1X7TkURjncm0OefxrZhnhGHaGLwxRNxe17g/0=";
+ sha256 = "sha256-c29gmmkIOyS+HNq2kv53yq+sdEDmQbSmcvVGcd55/hk=";
};
- cargoSha256 = "eTPJMYl9m81o4PJKfpDs61KmehSvKnY+bgybEodOhAM=";
+ cargoSha256 = "sha256-oc7XpiOZj4bfqdwrEHj/CzNtWzYWFkgMJOySJNgxAGQ=";
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = if stdenv.isDarwin
- then [ libiconv Security SystemConfiguration]
+ then [ libiconv Security SystemConfiguration ]
else [ openssl ];
# Needed to get openssl-sys to use pkg-config.
@@ -25,7 +34,8 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "A command-line application for interacting with git repositories";
homepage = "https://github.com/Byron/gitoxide";
+ changelog = "https://github.com/Byron/gitoxide/blob/v${version}/CHANGELOG.md";
license = with licenses; [ mit /* or */ asl20 ];
- maintainers = [ maintainers.syberant ];
+ maintainers = with maintainers; [ syberant ];
};
}
diff --git a/pkgs/desktops/gnome/apps/file-roller/default.nix b/pkgs/desktops/gnome/apps/file-roller/default.nix
index a26428652007..c4c489dae08e 100644
--- a/pkgs/desktops/gnome/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome/apps/file-roller/default.nix
@@ -1,6 +1,30 @@
-{ lib, stdenv, fetchurl, glib, gtk3, meson, ninja, pkg-config, gnome, gettext, itstool, libxml2, libarchive
-, file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales
-, unzip, cpio }:
+{ lib
+, stdenv
+, fetchurl
+, fetchpatch
+, desktop-file-utils
+, gettext
+, glibcLocales
+, itstool
+, libxml2
+, meson
+, ninja
+, pkg-config
+, python3
+, wrapGAppsHook
+, cpio
+, file
+, glib
+, gnome
+, gtk3
+, json-glib
+, libarchive
+, libnotify
+, nautilus
+, pantheon
+, unzip
+, withPantheon ? false
+}:
stdenv.mkDerivation rec {
pname = "file-roller";
@@ -11,11 +35,43 @@ stdenv.mkDerivation rec {
sha256 = "039w1dcpa5ypmv6sm634alk9vbcdkyvy595vkh5gn032jsiqca2a";
};
+ patches = lib.optionals withPantheon [
+ # Make this respect dark mode settings from Pantheon
+ # https://github.com/elementary/fileroller/
+ (fetchpatch {
+ url = "https://raw.githubusercontent.com/elementary/fileroller/f183eac36c68c9c9441e72294d4e305cf5fe36ed/fr-application-prefers-color-scheme.patch";
+ sha256 = "sha256-d/sqf4Oen9UrzYqru7Ck15o/6g6WfxRDH/iAGFXgYAA=";
+ })
+ ];
+
LANG = "en_US.UTF-8"; # postinstall.py
- nativeBuildInputs = [ meson ninja gettext itstool pkg-config libxml2 python3 wrapGAppsHook glibcLocales desktop-file-utils ];
+ nativeBuildInputs = [
+ desktop-file-utils
+ gettext
+ glibcLocales
+ itstool
+ libxml2
+ meson
+ ninja
+ pkg-config
+ python3
+ wrapGAppsHook
+ ];
- buildInputs = [ glib gtk3 json-glib libarchive file gnome.adwaita-icon-theme libnotify nautilus cpio ];
+ buildInputs = [
+ cpio
+ file
+ glib
+ gnome.adwaita-icon-theme
+ gtk3
+ json-glib
+ libarchive
+ libnotify
+ nautilus
+ ] ++ lib.optionals withPantheon [
+ pantheon.granite
+ ];
PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0";
@@ -44,6 +100,6 @@ stdenv.mkDerivation rec {
description = "Archive manager for the GNOME desktop environment";
license = licenses.gpl2Plus;
platforms = platforms.linux;
- maintainers = teams.gnome.members;
+ maintainers = teams.gnome.members ++ teams.pantheon.members;
};
}
diff --git a/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix b/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix
index d57ccdcff837..8332d0afa4ac 100644
--- a/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix
+++ b/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-night-theme-switcher";
- version = "50";
+ version = "53";
src = fetchFromGitLab {
owner = "rmnvgr";
repo = "nightthemeswitcher-gnome-shell-extension";
- rev = "v${version}";
- sha256 = "0rs08kr3wizs1vpkmm6pbcvnn7rz47yrq7vnb1s8d58yda9a850d";
+ rev = version;
+ sha256 = "0dgnh1aj0y89jzfkpj8zs4gdbmyc1v8lbki2q30gld17ljv4l6lh";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/desktops/gnome/extensions/system-monitor/default.nix b/pkgs/desktops/gnome/extensions/system-monitor/default.nix
index 439f02622a64..d770acfec16f 100644
--- a/pkgs/desktops/gnome/extensions/system-monitor/default.nix
+++ b/pkgs/desktops/gnome/extensions/system-monitor/default.nix
@@ -1,14 +1,14 @@
-{ lib, stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, gnome }:
+{ lib, stdenv, substituteAll, fetchFromGitHub, fetchpatch, glib, glib-networking, libgtop, gnome }:
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-system-monitor";
- version = "unstable-2021-06-19";
+ version = "unstable-2021-09-07";
src = fetchFromGitHub {
owner = "paradoxxxzero";
repo = "gnome-shell-system-monitor-applet";
- rev = "bece7be22352b81d3d81e64e18a385812851b8de";
- sha256 = "08nnsg7z3cqk25hfgy4wm02hd2wpz13kig498kn4mf5f1q4hslmx";
+ rev = "133f9f32bca5d159515d709bbdee81bf497ebdc5";
+ sha256 = "1vz1s1x22xmmzaayrzv5jyzlmxslhfaybbnv959szvfp4mdrhch9";
};
buildInputs = [
@@ -24,6 +24,11 @@ stdenv.mkDerivation rec {
gtop_path = "${libgtop}/lib/girepository-1.0";
glib_net_path = "${glib-networking}/lib/girepository-1.0";
})
+ # Support GNOME 41
+ (fetchpatch {
+ url = "https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet/pull/718/commits/f4ebc29afa707326b977230329e634db169f55b1.patch";
+ sha256 = "0ndnla41mvrww6ldf9d55ar1ibyj8ak5pp1dkjg75jii9slgzjqb";
+ })
];
buildPhase = ''
@@ -47,7 +52,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Display system informations in gnome shell status bar";
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ tiramiseb ];
+ maintainers = with maintainers; [ andersk ];
homepage = "https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet";
};
}
diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix
index 668638c1bfec..61436ba57ae5 100644
--- a/pkgs/desktops/pantheon/default.nix
+++ b/pkgs/desktops/pantheon/default.nix
@@ -73,6 +73,8 @@ lib.makeScope pkgs.newScope (self: with self; {
evince = pkgs.evince.override { withPantheon = true; };
+ file-roller = pkgs.gnome.file-roller.override { withPantheon = true; };
+
sideload = callPackage ./apps/sideload { };
#### DESKTOP
diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index 29e826c88d66..18f6da39b254 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -241,8 +241,8 @@ rec {
};
crystal_1_2 = generic {
- version = "1.2.0";
- sha256 = "sha256-38mmsolzmCnv+MFUMc+AEiklDLBHIr/jqXMLzc0nVq4=";
+ version = "1.2.1";
+ sha256 = "sha256-jyNmY3n+u8WoVqHY8B5H9Vr9Ix3RogCtm8irkXZ3aek=";
binary = crystal_1_1;
};
diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix
index f9b8020c924c..9a6764191d63 100644
--- a/pkgs/development/compilers/ligo/default.nix
+++ b/pkgs/development/compilers/ligo/default.nix
@@ -6,16 +6,16 @@
coq.ocamlPackages.buildDunePackage rec {
pname = "ligo";
- version = "0.26.0";
+ version = "0.27.0";
src = fetchFromGitLab {
owner = "ligolang";
repo = "ligo";
- rev = "d48098c6724bc0a62170c2f9ff73c792c71c8452";
- sha256 = "sha256-uu5985llYsi/9ExKZetk48FqU0sJQB1EirdT/pUw0DA=";
+ rev = version;
+ sha256 = "sha256-OUrjMlAWxTPs56ltMt0I/XR9GScD6upXU2arT99u8hk=";
};
# The build picks this up for ligo --version
- LIGO_VERSION=version;
+ LIGO_VERSION = version;
useDune2 = true;
diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix
index 7fc2485da019..764c2c93daef 100644
--- a/pkgs/development/compilers/swift/default.nix
+++ b/pkgs/development/compilers/swift/default.nix
@@ -252,6 +252,7 @@ stdenv.mkDerivation {
# LLVM toolchain patches.
patch -p1 -d llvm-project/clang -i ${./patches/0005-clang-toolchain-dir.patch}
patch -p1 -d llvm-project/clang -i ${./patches/0006-clang-purity.patch}
+ patch -p1 -d llvm-project/compiler-rt -i ${../llvm/common/compiler-rt/libsanitizer-no-cyclades-11.patch}
substituteInPlace llvm-project/clang/lib/Driver/ToolChains/Linux.cpp \
--replace 'SysRoot + "/lib' '"${glibc}/lib" "' \
--replace 'SysRoot + "/usr/lib' '"${glibc}/lib" "' \
diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/development/interpreters/kona/default.nix
index 15ce9321a8d7..ff5929745baa 100644
--- a/pkgs/development/interpreters/kona/default.nix
+++ b/pkgs/development/interpreters/kona/default.nix
@@ -1,11 +1,14 @@
-{ lib, stdenv, fetchurl }:
+{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "kona";
- version = "3.21";
- src = fetchurl {
- url = "https://github.com/kevinlawler/kona/archive/Win.${version}-64.tar.gz";
- sha256 = "0c1yf3idqkfq593xgqb25r2ykmfmp83zzh3q7kb8095a069gvri3";
+ version = "20201009";
+
+ src = fetchFromGitHub {
+ owner = "kevinlawler";
+ repo = "kona";
+ rev = "Win64-${version}";
+ sha256 = "0v252zds61y01cf29hxznz1zc1724vxmzy059k9jiri4r73k679v";
};
makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index ba132acf722f..b6010cf32d10 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -26,7 +26,6 @@ let
generic = { version, sha256 }: let
ver = version;
tag = ver.gitTag;
- atLeast27 = lib.versionAtLeast ver.majMin "2.7";
atLeast30 = lib.versionAtLeast ver.majMin "3.0";
baseruby = self.override {
useRailsExpress = false;
@@ -105,7 +104,7 @@ let
inherit patchSet useRailsExpress ops fetchpatch;
patchLevel = ver.patchLevel;
}).${ver.majMinTiny}
- ++ op atLeast27 ./do-not-regenerate-revision.h.patch
+ ++ [ ./do-not-regenerate-revision.h.patch ]
++ op (atLeast30 && useRailsExpress) ./do-not-update-gems-baseruby.patch
# Ruby prior to 3.0 has a bug the installer (tools/rbinstall.rb) but
# the resulting error was swallowed. Newer rubygems no longer swallows
@@ -252,14 +251,6 @@ let
) args; in self;
in {
- ruby_2_6 = generic {
- version = rubyVersion "2" "6" "8" "";
- sha256 = {
- src = "0vfam28ifl6h2wxi6p70j0hm3f1pvsp432hf75m5j25wfy2vf1qq";
- git = "0rc3n6sk8632r0libpv8jwslc7852hgk64rvbdrspc9razjwx21c";
- };
- };
-
ruby_2_7 = generic {
version = rubyVersion "2" "7" "4" "";
sha256 = {
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index 5c2992bb859b..3ea358c349a3 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -1,11 +1,6 @@
{ patchSet, useRailsExpress, ops, patchLevel, fetchpatch }:
{
- "2.6.8" = ops useRailsExpress [
- "${patchSet}/patches/ruby/2.6/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
- "${patchSet}/patches/ruby/2.6/head/railsexpress/02-improve-gc-stats.patch"
- "${patchSet}/patches/ruby/2.6/head/railsexpress/03-more-detailed-stacktrace.patch"
- ];
"2.7.4" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.7/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
"${patchSet}/patches/ruby/2.7/head/railsexpress/02-improve-gc-stats.patch"
diff --git a/pkgs/development/libraries/codec2/default.nix b/pkgs/development/libraries/codec2/default.nix
index a860470af317..9f15f9e16d4f 100644
--- a/pkgs/development/libraries/codec2/default.nix
+++ b/pkgs/development/libraries/codec2/default.nix
@@ -2,17 +2,22 @@
stdenv.mkDerivation rec {
pname = "codec2";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchFromGitHub {
owner = "drowe67";
repo = "codec2";
rev = "v${version}";
- sha256 = "sha256-R4H6gwmc8nPgRfhNms7n7jMCHhkzX7i/zfGT4CYSsY8=";
+ sha256 = "05xjsb67dzwncl2rnhg6fqih8krf38b7vmvzlsb7y9g6d1b085wg";
};
nativeBuildInputs = [ cmake ];
+ # Swap keyword order to satisfy SWIG parser
+ postFixup = ''
+ sed -r -i 's/(\<_Complex)(\s+)(float|double)/\3\2\1/' $out/include/$pname/freedv_api.h
+ '';
+
meta = with lib; {
description = "Speech codec designed for communications quality speech at low data rates";
homepage = "http://www.rowetel.com/blog/?page_id=452";
diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix
index 71a466067ad6..5f62acf2dc0f 100644
--- a/pkgs/development/libraries/duckdb/default.nix
+++ b/pkgs/development/libraries/duckdb/default.nix
@@ -5,19 +5,19 @@
stdenv.mkDerivation rec {
pname = "duckdb";
- version = "0.2.9";
+ version = "0.3.0";
src = fetchFromGitHub {
- owner = "cwida";
- repo = "duckdb";
+ owner = pname;
+ repo = pname;
rev = "v${version}";
- sha256 = "sha256-ID65xpNSDyi19OcOs9Gdf5xpK++UVWclp8pVggIWQNU=";
+ sha256 = "sha256-SvihG6PdHQ+03JAXdkuzvGug4lw0ngcxYigS7R7yK9g=";
};
nativeBuildInputs = [ cmake ];
meta = with lib; {
- homepage = "https://github.com/cwida/duckdb";
+ homepage = "https://github.com/duckdb/duckdb";
description = "Embeddable SQL OLAP Database Management System";
license = licenses.mit;
platforms = platforms.all;
diff --git a/pkgs/development/libraries/kweathercore/default.nix b/pkgs/development/libraries/kweathercore/default.nix
new file mode 100644
index 000000000000..f3617059f1e7
--- /dev/null
+++ b/pkgs/development/libraries/kweathercore/default.nix
@@ -0,0 +1,35 @@
+{ mkDerivation
+, lib
+, fetchFromGitLab
+, extra-cmake-modules
+, ki18n
+, qtlocation
+}:
+
+mkDerivation rec {
+ pname = "kweathercore";
+ version = "0.5";
+
+ src = fetchFromGitLab {
+ domain = "invent.kde.org";
+ owner = "libraries";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "08ipabskhsbspkzzdlpwl89r070q8d0vc9500ma6d5i9fnpmkz6d";
+ };
+
+ buildInputs = [
+ ki18n
+ qtlocation
+ ];
+
+ nativeBuildInputs = [ extra-cmake-modules ];
+
+ meta = with lib; {
+ license = [ licenses.cc0 ];
+ maintainers = [ maintainers.samueldr ];
+ description = ''
+ Library to facilitate retrieval of weather information including forecasts and alerts
+ '';
+ };
+}
diff --git a/pkgs/development/libraries/libad9361/default.nix b/pkgs/development/libraries/libad9361/default.nix
new file mode 100644
index 000000000000..74707897bd0c
--- /dev/null
+++ b/pkgs/development/libraries/libad9361/default.nix
@@ -0,0 +1,25 @@
+{ lib, stdenv, fetchFromGitHub, cmake, libiio }:
+
+stdenv.mkDerivation rec {
+ pname = "libad9361";
+ version = "0.2";
+
+ src = fetchFromGitHub {
+ owner = "analogdevicesinc";
+ repo = "libad9361-iio";
+ rev = "v${version}";
+ hash = "sha256-dYoFWRnREvlOC514ZpmmvoS37DmIkVqfq7JPpTXqXd8=";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ buildInputs = [ libiio ];
+
+ meta = with lib; {
+ description = "IIO AD9361 library for filter design and handling, multi-chip sync, etc";
+ homepage = "http://analogdevicesinc.github.io/libad9361-iio/";
+ license = licenses.lgpl21Plus;
+ maintainers = with maintainers; [ sikmir ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/lpcnetfreedv/default.nix b/pkgs/development/libraries/lpcnetfreedv/default.nix
new file mode 100644
index 000000000000..ac12d3a5fd6b
--- /dev/null
+++ b/pkgs/development/libraries/lpcnetfreedv/default.nix
@@ -0,0 +1,34 @@
+{ lib, stdenv, fetchFromGitHub, fetchurl, cmake, codec2 }:
+
+let
+ dataVersion = "191005_v1.0";
+ data = fetchurl {
+ url = "http://rowetel.com/downloads/deep/lpcnet_${dataVersion}.tgz";
+ sha256 = "1j1695hm2pg6ri611f9kr3spm4yxvpikws55z9zxizai8y94152h";
+ };
+in stdenv.mkDerivation rec {
+ pname = "lpcnetfreedv";
+ version = "unstable-2021-06-29";
+
+ src = fetchFromGitHub {
+ owner = "drowe67";
+ repo = "LPCNet";
+ rev = "0dc5935bbf49ff3ba3c9654cc2f802838ebbaead";
+ sha256 = "0r6488z40fkar11ync8achpg5l6qz7y7cbh7cs3b3w4fsxn58q9i";
+ };
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ codec2 ];
+
+ postPatch = ''
+ mkdir build
+ ln -s ${data} build/lpcnet_${dataVersion}.tgz
+ '';
+
+ meta = with lib; {
+ homepage = "https://freedv.org/";
+ description = "Experimental Neural Net speech coding for FreeDV";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ mvs ];
+ };
+}
diff --git a/pkgs/development/libraries/pulseaudio-qt/default.nix b/pkgs/development/libraries/pulseaudio-qt/default.nix
index 03d656f91fae..c1ba89f05842 100644
--- a/pkgs/development/libraries/pulseaudio-qt/default.nix
+++ b/pkgs/development/libraries/pulseaudio-qt/default.nix
@@ -9,11 +9,11 @@
mkDerivation rec {
pname = "pulseaudio-qt";
- version = "1.2.0";
+ version = "1.3.0";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${pname}-${lib.versions.majorMinor version}.tar.xz";
- sha256 = "1i0ql68kxv9jxs24rsd3s7jhjid3f2fq56fj4wbp16zb4wd14099";
+ sha256 = "1i4yb0v1mmhih8c2i61hybg6q60qys3pc5wbjb7a0vwl1mihgsxw";
};
buildInputs = [
diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix
index 6c89a8496e8d..6d60321a3044 100644
--- a/pkgs/development/libraries/sqlite/tools.nix
+++ b/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.35.5";
+ version = "3.36.0";
src = assert version == sqlite.version; fetchurl {
url = "https://sqlite.org/2021/sqlite-src-${archiveVersion version}.zip";
- sha256 = "049vdpk50sba786345ibmlxnkzk5zp4xj859658ancswb6jyrgpl";
+ sha256 = "092khwfm0m0i80sjb4fc5569jj0kilm6pa867w0akcv6h38bk8r5";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/development/ocaml-modules/carton/default.nix b/pkgs/development/ocaml-modules/carton/default.nix
index 81893ae9ac36..97e00dc71b62 100644
--- a/pkgs/development/ocaml-modules/carton/default.nix
+++ b/pkgs/development/ocaml-modules/carton/default.nix
@@ -7,14 +7,14 @@
buildDunePackage rec {
pname = "carton";
- version = "0.4.2";
+ version = "0.4.3";
useDune2 = true;
- minimumOCamlVersion = "4.08";
+ minimalOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/${pname}-${pname}-v${version}.tbz";
- sha256 = "a0a03b2f7bb7dafe070bc6a74583b6d6da714d2c636dd4d5a6443c9f299ceacc";
+ sha256 = "sha256:0qz9ds5761wx4m7ly3av843b6dii7lmjpx2nnyijv8rm8aw95jgr";
};
# remove changelogs for mimic and the git* packages
diff --git a/pkgs/development/ocaml-modules/carton/git.nix b/pkgs/development/ocaml-modules/carton/git.nix
index ef41ff2b5947..4f7c880ae065 100644
--- a/pkgs/development/ocaml-modules/carton/git.nix
+++ b/pkgs/development/ocaml-modules/carton/git.nix
@@ -8,7 +8,7 @@
buildDunePackage {
pname = "carton-git";
- inherit (carton) version src useDune2 minimumOCamlVersion postPatch;
+ inherit (carton) version src useDune2 postPatch;
propagatedBuildInputs = [
carton
diff --git a/pkgs/development/ocaml-modules/carton/lwt.nix b/pkgs/development/ocaml-modules/carton/lwt.nix
index 024ff51559e4..17ba5dddf24e 100644
--- a/pkgs/development/ocaml-modules/carton/lwt.nix
+++ b/pkgs/development/ocaml-modules/carton/lwt.nix
@@ -10,7 +10,7 @@
buildDunePackage {
pname = "carton-lwt";
- inherit (carton) version src useDune2 minimumOCamlVersion postPatch;
+ inherit (carton) version src useDune2 postPatch;
propagatedBuildInputs = [
carton
diff --git a/pkgs/development/python-modules/adb-shell/default.nix b/pkgs/development/python-modules/adb-shell/default.nix
index 9094b1c780cf..bc71e3721288 100644
--- a/pkgs/development/python-modules/adb-shell/default.nix
+++ b/pkgs/development/python-modules/adb-shell/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "adb-shell";
- version = "0.4.1";
+ version = "0.4.2";
disabled = !isPy3k;
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "JeffLIrion";
repo = "adb_shell";
rev = "v${version}";
- sha256 = "sha256-E7sX+N6d5Otwp1AbdPCnQJ2YT/k89+6kMJDLt8U2Dsg=";
+ sha256 = "sha256-8tclSjmLlTAIeq6t7YPGtJwvSwtlzQ7sRAQatcQRzeY=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/alectryon/default.nix b/pkgs/development/python-modules/alectryon/default.nix
index f10a0f03e07d..08fcd9f9651f 100644
--- a/pkgs/development/python-modules/alectryon/default.nix
+++ b/pkgs/development/python-modules/alectryon/default.nix
@@ -1,23 +1,15 @@
-{ lib, buildPythonPackage, fetchPypi, fetchpatch
+{ lib, buildPythonPackage, fetchPypi
, pygments, dominate, beautifulsoup4, docutils, sphinx }:
buildPythonPackage rec {
pname = "alectryon";
- owner = "cpitclaudel";
- version = "1.3.1";
+ version = "1.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256:0mca25jv917myb4n91ccpl5fz058aiqsn8cniflwfw5pp6lqnfg7";
+ sha256 = "00cxzfifvgcf3d3s8lsj1yxcwyf3a1964p86fj7b42q8pa0b4r3i";
};
- patches = [
- (fetchpatch {
- url = "https://github.com/cpitclaudel/alectryon/commit/c779def3fa268e703d4e0ff8ae0b2981e194b269.patch";
- sha256 = "0xsz56ibq8xj7gg530pfm1jmxbxw4r6v8xvzj5k1wdry83srqi65";
- })
- ];
-
propagatedBuildInputs = [
pygments
dominate
diff --git a/pkgs/development/python-modules/buildout/default.nix b/pkgs/development/python-modules/buildout/default.nix
index 796eaa18259f..3cf2c1712fb3 100644
--- a/pkgs/development/python-modules/buildout/default.nix
+++ b/pkgs/development/python-modules/buildout/default.nix
@@ -1,18 +1,37 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ buildPythonPackage
+, fetchFromGitHub
+, lib
+, pip
+, setuptools
+, wheel
+}:
buildPythonPackage rec {
- pname = "zc.buildout";
- version = "2.13.4";
+ pname = "zc-buildout";
+ version = "3.0.0b2";
- src = fetchPypi {
- inherit pname version;
- sha256 = "b978b2f9317b317ee4191f78fcc4f05b1ac41bdaaae47f0956f14c8285feef63";
+ src = fetchFromGitHub {
+ owner = "buildout";
+ repo = "buildout";
+ rev = version;
+ sha256 = "01sj09xx5kmkzynhq1xd8ahn6xqybfi8lrqjqr5lr45aaxjk2pid";
};
+ propagatedBuildInputs = [
+ setuptools
+ pip
+ wheel
+ ];
+
+ doCheck = false; # Missing package & BLOCKED on "zc.recipe.egg"
+
+ pythonImportsCheck = [ "zc.buildout" ];
+
meta = with lib; {
- homepage = "http://www.buildout.org";
description = "A software build and configuration system";
+ downloadPage = "https://github.com/buildout/buildout";
+ homepage = "https://www.buildout.org";
license = licenses.zpl21;
- maintainers = with maintainers; [ ];
+ maintainers = with maintainers; [ superherointj ];
};
}
diff --git a/pkgs/development/python-modules/colorcet/default.nix b/pkgs/development/python-modules/colorcet/default.nix
index 207653375144..6135730beb00 100644
--- a/pkgs/development/python-modules/colorcet/default.nix
+++ b/pkgs/development/python-modules/colorcet/default.nix
@@ -1,12 +1,11 @@
{ lib
, buildPythonPackage
, fetchPypi
+, nbsmoke
, param
, pyct
-, nbsmoke
-, flake8
-, pytest
, pytest-mpl
+, pytestCheckHook
}:
buildPythonPackage rec {
@@ -24,25 +23,29 @@ buildPythonPackage rec {
];
checkInputs = [
- pytest
- flake8
pytest-mpl
+ pytestCheckHook
];
- checkPhase = ''
+ preCheck = ''
export HOME=$(mktemp -d)
mkdir -p $HOME/.config/matplotlib
echo "backend: ps" > $HOME/.config/matplotlib/matplotlibrc
ln -s $HOME/.config/matplotlib $HOME/.matplotlib
-
- # requires other backends to be available
- pytest colorcet -k 'not matplotlib_default_colormap_plot'
'';
+ disabledTests = [
+ "matplotlib_default_colormap_plot"
+ ];
+
+ pythonImportsCheck = [
+ "colorcet"
+ ];
+
meta = with lib; {
description = "Collection of perceptually uniform colormaps";
homepage = "https://colorcet.pyviz.org";
license = licenses.cc-by-40;
- maintainers = [ maintainers.costrouc ];
+ maintainers = with maintainers; [ costrouc ];
};
}
diff --git a/pkgs/development/python-modules/faraday-plugins/default.nix b/pkgs/development/python-modules/faraday-plugins/default.nix
index 2db85b410935..1116ea046a42 100644
--- a/pkgs/development/python-modules/faraday-plugins/default.nix
+++ b/pkgs/development/python-modules/faraday-plugins/default.nix
@@ -16,13 +16,13 @@
buildPythonPackage rec {
pname = "faraday-plugins";
- version = "1.5.4";
+ version = "1.5.5";
src = fetchFromGitHub {
owner = "infobyte";
repo = "faraday_plugins";
rev = "v${version}";
- sha256 = "sha256-TKT++56pc1+nZXkqMgIq5DFgF9H1+Q5Fuj4KidCdRh0=";
+ sha256 = "sha256-dnd6q/L3yh/9XkrWC4ETccSO6zr31wBsuumDvwemKyA=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix
index 271b3923033c..22be0ff75c9f 100644
--- a/pkgs/development/python-modules/hvplot/default.nix
+++ b/pkgs/development/python-modules/hvplot/default.nix
@@ -1,18 +1,10 @@
{ lib
-, buildPythonPackage
-, fetchPypi
, bokeh
+, buildPythonPackage
+, colorcet
+, fetchPypi
, holoviews
, pandas
-, pytest
-, parameterized
-, nbsmoke
-, flake8
-, coveralls
-, xarray
-, networkx
-, streamz
-, colorcet
, pythonImportsCheckHook
}:
@@ -29,7 +21,6 @@ buildPythonPackage rec {
pythonImportsCheckHook
];
- checkInputs = [ pytest parameterized nbsmoke flake8 coveralls xarray networkx streamz ];
propagatedBuildInputs = [
bokeh
colorcet
@@ -37,11 +28,7 @@ buildPythonPackage rec {
pandas
];
- preCheck = ''
- export HOME=$(mktemp -d)
- '';
-
- # many tests require a network connection
+ # Many tests require a network connection
doCheck = false;
pythonImportsCheck = [
@@ -52,6 +39,6 @@ buildPythonPackage rec {
description = "A high-level plotting API for the PyData ecosystem built on HoloViews";
homepage = "https://hvplot.pyviz.org";
license = licenses.bsd3;
- maintainers = [ maintainers.costrouc ];
+ maintainers = with maintainers; [ costrouc ];
};
}
diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix
index 361469f540e1..26448f3a21d2 100644
--- a/pkgs/development/python-modules/intake/default.nix
+++ b/pkgs/development/python-modules/intake/default.nix
@@ -1,67 +1,71 @@
{ lib
-, buildPythonPackage
-, fetchPypi
, appdirs
+, bokeh
+, buildPythonPackage
, dask
+, entrypoints
+, fetchFromGitHub
+, fsspec
, holoviews
, hvplot
-, fsspec
+, intake-parquet
, jinja2
, msgpack
, msgpack-numpy
, numpy
, pandas
, panel
-, intake-parquet
, pyarrow
, pytestCheckHook
-, pythonOlder
, python-snappy
+, pythonOlder
+, pyyaml
, requests
-, ruamel_yaml
-, six
, tornado
}:
buildPythonPackage rec {
pname = "intake";
- version = "0.6.3";
+ version = "0.6.4";
- disabled = pythonOlder "3.6";
+ disabled = pythonOlder "3.7";
- src = fetchPypi {
- inherit pname version;
- sha256 = "f64543353f30d9440b953984f78b7a0954e5756d70c64243609d307ba488014f";
+ src = fetchFromGitHub {
+ owner = pname;
+ repo = pname;
+ rev = version;
+ sha256 = "194cdd6lx92zcpkn3wgm490kxvw0c58ziix8hcihsr5ayfr1wdsl";
};
propagatedBuildInputs = [
appdirs
+ bokeh
dask
+ entrypoints
+ fsspec
holoviews
hvplot
jinja2
- msgpack-numpy
msgpack
+ msgpack-numpy
numpy
pandas
panel
+ pyarrow
python-snappy
+ pyyaml
requests
- ruamel_yaml
- six
tornado
];
checkInputs = [
- fsspec
intake-parquet
- pyarrow
pytestCheckHook
];
postPatch = ''
- # Is in setup_requires but not used in setup.py...
- substituteInPlace setup.py --replace "'pytest-runner'" ""
+ substituteInPlace setup.py \
+ --replace "'pytest-runner'" ""
'';
# test_discover requires driver_with_entrypoints-0.1.dist-info, which is not included in tarball
@@ -72,7 +76,7 @@ buildPythonPackage rec {
'';
disabledTests = [
- # disable tests which touch network and are broken
+ # Disable tests which touch network and are broken
"test_discover"
"test_filtered_compressed_cache"
"test_get_dir"
@@ -82,6 +86,10 @@ buildPythonPackage rec {
"test_remote_arr"
];
+ pythonImportsCheck = [
+ "intake"
+ ];
+
meta = with lib; {
description = "Data load and catalog system";
homepage = "https://github.com/ContinuumIO/intake";
diff --git a/pkgs/development/python-modules/jaeger-client/default.nix b/pkgs/development/python-modules/jaeger-client/default.nix
new file mode 100644
index 000000000000..05a76333af09
--- /dev/null
+++ b/pkgs/development/python-modules/jaeger-client/default.nix
@@ -0,0 +1,40 @@
+{ buildPythonPackage
+, fetchPypi
+, lib
+, opentracing
+, threadloop
+, thrift
+, tornado
+}:
+
+buildPythonPackage rec {
+ pname = "jaeger-client";
+ version = "4.6.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "3bc27ad77e035efd0899f377a15f180467fec44b2afbf5be0660cc888a2a4ac3";
+ };
+
+ propagatedBuildInputs = [
+ threadloop
+ thrift
+ tornado
+ opentracing
+ ];
+
+ # FIXME: Missing dependencies: tchannel, opentracing_instrumentation
+ # opentracing_instrumentation: Requires "tornado" lower than 6. Current is 6.1.
+ # https://github.com/uber-common/opentracing-python-instrumentation/pull/115
+ doCheck = false;
+
+ pythonImportsCheck = [ "jaeger_client" ];
+
+ meta = with lib; {
+ description = "Jaeger bindings for Python OpenTracing API";
+ downloadPage = "https://pypi.org/project/jaeger-client/";
+ homepage = "https://github.com/jaegertracing/jaeger-client-python";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ superherointj ];
+ };
+}
diff --git a/pkgs/development/python-modules/jupyter-server-mathjax/default.nix b/pkgs/development/python-modules/jupyter-server-mathjax/default.nix
new file mode 100644
index 000000000000..9aff01cd9d38
--- /dev/null
+++ b/pkgs/development/python-modules/jupyter-server-mathjax/default.nix
@@ -0,0 +1,39 @@
+{ lib, buildPythonPackage, fetchPypi
+, jupyter-packaging
+, jupyter_server
+, pytest-tornasync
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "jupyter-server-mathjax";
+ version = "0.2.3";
+
+ src = fetchPypi {
+ inherit version;
+ pname = "jupyter_server_mathjax";
+ sha256 = "564e8d1272019c6771208f577b5f9f2b3afb02b9e2bff3b34c042cef8ed84451";
+ };
+
+ nativeBuildInputs = [
+ jupyter-packaging
+ ];
+
+ propagatedBuildInputs = [
+ jupyter_server
+ ];
+
+ checkInputs = [
+ pytest-tornasync
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "jupyter_server_mathjax" ];
+
+ meta = with lib; {
+ description = "MathJax resources as a Jupyter Server Extension";
+ homepage = "http://jupyter.org";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ jonringer ];
+ };
+}
diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix
index 884e9865c6bf..df4c9b43a73a 100644
--- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix
@@ -8,23 +8,27 @@
buildPythonPackage rec {
pname = "mypy-boto3-s3";
- version = "1.19.0";
+ version = "1.19.1";
+
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-VCQmtpoemK91+tkPE6HrdFt3wPYrlPcR0CVn7uo2vp0=";
+ sha256 = "sha256-Ov3JVCYa+3VU26VYtPYcqwSUMdDowSk8GWGt4PX/DKk=";
};
propagatedBuildInputs = [
boto3
- ] ++ lib.optionals (pythonOlder "3.8") [
+ ] ++ lib.optionals (pythonOlder "3.9") [
typing-extensions
];
# Project has no tests
doCheck = false;
- pythonImportsCheck = [ "mypy_boto3_s3" ];
+
+ pythonImportsCheck = [
+ "mypy_boto3_s3"
+ ];
meta = with lib; {
description = "Type annotations for boto3";
diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix
index a4cbe11fbe7a..0d073027e5d5 100644
--- a/pkgs/development/python-modules/nbdime/default.nix
+++ b/pkgs/development/python-modules/nbdime/default.nix
@@ -18,6 +18,7 @@
, tornado
, requests
, GitPython
+, jupyter-server-mathjax
, notebook
, jinja2
}:
@@ -59,6 +60,7 @@ buildPythonPackage rec {
py
setuptools
six
+ jupyter-server-mathjax
nbformat
colorama
pygments
diff --git a/pkgs/development/python-modules/param/default.nix b/pkgs/development/python-modules/param/default.nix
index 0ae362dd28ac..23c9bc9c3933 100644
--- a/pkgs/development/python-modules/param/default.nix
+++ b/pkgs/development/python-modules/param/default.nix
@@ -1,28 +1,38 @@
{ lib
, buildPythonPackage
-, fetchPypi
-, flake8
-, nose
+, fetchFromGitHub
+, pytestCheckHook
}:
buildPythonPackage rec {
pname = "param";
- version = "1.11.1";
+ version = "1.12.0";
- src = fetchPypi {
- inherit pname version;
- sha256 = "b9857df01495bd55ddafb214fd1ed017d20699ce42ec2a0fd190d99caa03099f";
+ src = fetchFromGitHub {
+ owner = "holoviz";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "02zmd4bwyn8b4q1l9jgddc70ii1i7bmynacanl1cvbr6la4v9b2c";
};
- checkInputs = [ flake8 nose ];
+ checkInputs = [
+ pytestCheckHook
+ ];
- # tests not included with pypi release
- doCheck = false;
+ postPatch = ''
+ # Version is not set properly
+ substituteInPlace setup.py \
+ --replace 'version=get_setup_version("param"),' 'version="${version}",'
+ '';
+
+ pythonImportsCheck = [
+ "param"
+ ];
meta = with lib; {
description = "Declarative Python programming using Parameters";
homepage = "https://github.com/pyviz/param";
license = licenses.bsd3;
- maintainers = [ maintainers.costrouc ];
+ maintainers = with maintainers; [ costrouc ];
};
}
diff --git a/pkgs/development/python-modules/py-synologydsm-api/default.nix b/pkgs/development/python-modules/py-synologydsm-api/default.nix
index 3aa0fe76fff0..73ac2fcc0191 100644
--- a/pkgs/development/python-modules/py-synologydsm-api/default.nix
+++ b/pkgs/development/python-modules/py-synologydsm-api/default.nix
@@ -1,25 +1,28 @@
{ lib
, buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
+, pytestCheckHook
+, poetry-core
, urllib3
, requests
}:
buildPythonPackage rec {
pname = "py-synologydsm-api";
- version = "1.0.2";
+ version = "1.0.4";
+ format = "pyproject";
- src = fetchPypi {
- pname = "synologydsm-api";
- inherit version;
- sha256 = "42ea453ef5734dd5b8163e3d18ef309658f0298411720e6b834bededd28c5d53";
+ src = fetchFromGitHub {
+ owner = "mib1185";
+ repo = "synologydsm-api";
+ rev = "v${version}";
+ sha256 = "1f9fbcp6dbh1c7q1cpppwggnw4m89w14cjdgl64f1bzv72rggpn1";
};
+ nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = [ urllib3 requests ];
-
- pythonImportsCheck = [
- "synology_dsm"
- ];
+ pythonImportsCheck = [ "synology_dsm" ];
+ checkInputs = [ pytestCheckHook ];
meta = with lib; {
description = "Python API for Synology DSM";
diff --git a/pkgs/development/python-modules/pyct/default.nix b/pkgs/development/python-modules/pyct/default.nix
index b2314e6edfeb..4538410c3623 100644
--- a/pkgs/development/python-modules/pyct/default.nix
+++ b/pkgs/development/python-modules/pyct/default.nix
@@ -3,9 +3,9 @@
, fetchPypi
, isPy27
, param
+, pytestCheckHook
, pyyaml
, requests
-, pytest
}:
buildPythonPackage rec {
@@ -17,22 +17,26 @@ buildPythonPackage rec {
sha256 = "23d7525b5a1567535c093aea4b9c33809415aa5f018dd77f6eb738b1226df6f7";
};
- doCheck = !isPy27;
- checkInputs = [ pytest ];
propagatedBuildInputs = [
param
pyyaml
requests
];
- checkPhase = ''
- pytest
- '';
+ checkInputs = [
+ pytestCheckHook
+ ];
+
+ doCheck = !isPy27;
+
+ pythonImportsCheck = [
+ "pyct"
+ ];
meta = with lib; {
- description = "Cli for python common tasks for users";
+ description = "ClI for Python common tasks for users";
homepage = "https://github.com/pyviz/pyct";
license = licenses.bsd3;
- maintainers = [ maintainers.costrouc ];
+ maintainers = with maintainers; [ costrouc ];
};
}
diff --git a/pkgs/development/python-modules/pysmart-smartx/default.nix b/pkgs/development/python-modules/pysmart-smartx/default.nix
deleted file mode 100644
index 66b789668a01..000000000000
--- a/pkgs/development/python-modules/pysmart-smartx/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, isPy3k
-, future
-, pytestCheckHook
-, mock
-}:
-
-buildPythonPackage rec {
- pname = "pysmart-smartx";
- version = "0.3.10";
-
- src = fetchFromGitHub {
- owner = "smartxworks";
- repo = "pySMART";
- rev = "v${version}";
- sha256 = "1irl4nlgz3ds3aikraa9928gzn6hz8chfh7jnpmq2q7d2vqbdrjs";
- };
-
- propagatedBuildInputs = [ future ];
-
- # tests require contextlib.nested
- doCheck = !isPy3k;
-
- checkInputs = [ pytestCheckHook mock ];
-
- pythonImportsCheck = [ "pySMART" ];
-
- meta = with lib; {
- description = "It's a fork of pySMART with lots of bug fix and enhances";
- homepage = "https://github.com/smartxworks/pySMART";
- maintainers = with maintainers; [ rhoriguchi ];
- license = licenses.gpl2Only;
- };
-}
diff --git a/pkgs/development/python-modules/pysmart/default.nix b/pkgs/development/python-modules/pysmart/default.nix
new file mode 100644
index 000000000000..3bd5fa50a133
--- /dev/null
+++ b/pkgs/development/python-modules/pysmart/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, smartmontools
+, humanfriendly
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "pysmart";
+ version = "1.1.0";
+
+ src = fetchFromGitHub {
+ owner = "truenas";
+ repo = "py-SMART";
+ rev = "v${version}";
+ sha256 = "sha256-e46ALiYg0Db/gOzqLmVc1vi9ObhfxzqwfQk9/9pz+r0=";
+ };
+
+ postPatch = ''
+ substituteInPlace pySMART/utils.py \
+ --replace "which('smartctl')" '"${smartmontools}/bin/smartctl"'
+ '';
+
+ propagatedBuildInputs = [ humanfriendly ];
+
+ checkInputs = [ pytestCheckHook ];
+
+ pythonImportsCheck = [ "pySMART" ];
+
+ meta = with lib; {
+ description = "Wrapper for smartctl (smartmontools)";
+ homepage = "https://github.com/truenas/py-SMART";
+ maintainers = with maintainers; [ nyanloutre ];
+ license = licenses.lgpl21Only;
+ };
+}
diff --git a/pkgs/development/python-modules/pywizlight/default.nix b/pkgs/development/python-modules/pywizlight/default.nix
index 57c0bec47e44..755e1555a431 100644
--- a/pkgs/development/python-modules/pywizlight/default.nix
+++ b/pkgs/development/python-modules/pywizlight/default.nix
@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "pywizlight";
- version = "0.4.8";
+ version = "0.4.10";
src = fetchFromGitHub {
owner = "sbidy";
repo = pname;
rev = "v${version}";
- sha256 = "0zagdb90bxmf06fzpljhqgsgzg36zc1yhdibacfrx8bmnx3l657h";
+ sha256 = "sha256-XO9KmsC3DXgVcGWr5ss3m2wB8rVboWyQUWBidynhkP8=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/rzpipe/default.nix b/pkgs/development/python-modules/rzpipe/default.nix
index 8ff52a289cdd..91c25f9a3b32 100644
--- a/pkgs/development/python-modules/rzpipe/default.nix
+++ b/pkgs/development/python-modules/rzpipe/default.nix
@@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "rzpipe";
- version = "0.1.1";
+ version = "0.1.2";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "13z88c4zjy10a1sc98ba25sz200v6w2wprbq4iknm4sy2fmrsydh";
+ sha256 = "sha256-va56xSWDIVtZ88QUzPfk8cCr28+5nZCNcSJMiVj3SZU=";
};
# No native rz_core library
diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix
index e6342b90bba4..4e778054875e 100644
--- a/pkgs/development/python-modules/schema-salad/default.nix
+++ b/pkgs/development/python-modules/schema-salad/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "schema-salad";
- version = "8.1.20210721123742";
+ version = "8.2.20210918131710";
src = fetchPypi {
inherit pname version;
- sha256 = "1549555b9b5656cfc690716f04fb76b9fa002feb278638c446522f030632b450";
+ sha256 = "464180407f49a3533cd5a5bc7db9254769bc77595ea00562bbe4a50493f7f445";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/threadloop/default.nix b/pkgs/development/python-modules/threadloop/default.nix
new file mode 100644
index 000000000000..4a4a781cac93
--- /dev/null
+++ b/pkgs/development/python-modules/threadloop/default.nix
@@ -0,0 +1,30 @@
+{ buildPythonPackage
+, fetchPypi
+, lib
+, tornado
+}:
+
+buildPythonPackage rec {
+ pname = "threadloop";
+ version = "1.0.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "8b180aac31013de13c2ad5c834819771992d350267bddb854613ae77ef571944";
+ };
+
+ propagatedBuildInputs = [
+ tornado
+ ];
+
+ doCheck = false; # ImportError: cannot import name 'ThreadLoop' from 'threadloop'
+
+ pythonImportsCheck = [ "threadloop" ];
+
+ meta = with lib; {
+ description = "A library to run tornado coroutines from synchronous Python";
+ homepage = "https://github.com/GoodPete/threadloop";
+ license = licenses.mit;
+ maintainers = with maintainers; [ superherointj ];
+ };
+}
diff --git a/pkgs/development/python-modules/z3c-checkversions/default.nix b/pkgs/development/python-modules/z3c-checkversions/default.nix
index 8610306ea6f2..b8c684295a6f 100644
--- a/pkgs/development/python-modules/z3c-checkversions/default.nix
+++ b/pkgs/development/python-modules/z3c-checkversions/default.nix
@@ -2,7 +2,7 @@
, buildPythonPackage
, fetchPypi
, python
-, zc_buildout
+, zc-buildout
, zope_testrunner
}:
@@ -16,7 +16,7 @@ buildPythonPackage rec {
sha256 = "b45bd22ae01ed60933694fb5abede1ff71fe8ffa79b37082b2fcf38a2f0dec9d";
};
- propagatedBuildInputs = [ zc_buildout ];
+ propagatedBuildInputs = [ zc-buildout ];
checkInputs = [ zope_testrunner ];
doCheck = !python.pkgs.isPy27;
checkPhase = ''
diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix
index cc47fe9e5ac1..0a8f13705eb5 100644
--- a/pkgs/development/python-modules/zarr/default.nix
+++ b/pkgs/development/python-modules/zarr/default.nix
@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "zarr";
- version = "2.10.0";
+ version = "2.10.1";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "8ca8e505cadb4f7f97aab4e4193bb302b6338bf54593c98fe7581bf574ed864c";
+ sha256 = "29e90114f037d433752b3cf951e4a3cb6c6f67b6501a273439b4be4a824e4caf";
};
nativeBuildInputs = [
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 38511dd3b82f..f713a4e5f9bf 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -158,6 +158,38 @@ let
in
builtins.listToAttrs nameValuePairs;
+ # Overrides package definition requiring a home directory to install or to
+ # run tests.
+ # For example,
+ #
+ # overrideRequireHome [
+ # "foo"
+ # ] old
+ #
+ # results in
+ #
+ # {
+ # foo = old.foo.overrideAttrs (oldAttrs: {
+ # preInstall = ''
+ # ${oldAttrs.preInstall or ""}
+ # export HOME=$(mktemp -d)
+ # '';
+ # });
+ # }
+ overrideRequireHome = packageNames: old:
+ let
+ nameValuePairs = map (name: {
+ inherit name;
+ value = (builtins.getAttr name old).overrideAttrs (oldAttrs: {
+ preInstall = ''
+ ${oldAttrs.preInstall or ""}
+ export HOME=$(mktemp -d)
+ '';
+ });
+ }) packageNames;
+ in
+ builtins.listToAttrs nameValuePairs;
+
# Overrides package definition to skip check.
# For example,
#
@@ -211,13 +243,14 @@ let
defaultOverrides = old: new:
let old0 = old; in
let
- old1 = old0 // (overrideRequireX packagesRequireingX old0);
- old2 = old1 // (overrideSkipCheck packagesToSkipCheck old1);
- old3 = old2 // (overrideRDepends packagesWithRDepends old2);
- old4 = old3 // (overrideNativeBuildInputs packagesWithNativeBuildInputs old3);
- old5 = old4 // (overrideBuildInputs packagesWithBuildInputs old4);
- old6 = old5 // (overrideBroken brokenPackages old5);
- old = old6;
+ old1 = old0 // (overrideRequireX packagesRequiringX old0);
+ old2 = old1 // (overrideRequireHome packagesRequiringHome old1);
+ old3 = old2 // (overrideSkipCheck packagesToSkipCheck old2);
+ old4 = old3 // (overrideRDepends packagesWithRDepends old3);
+ old5 = old4 // (overrideNativeBuildInputs packagesWithNativeBuildInputs old4);
+ old6 = old5 // (overrideBuildInputs packagesWithBuildInputs old5);
+ old7 = old6 // (overrideBroken brokenPackages old6);
+ old = old7;
in old // (otherOverrides old new);
# Recursive override pattern.
@@ -243,14 +276,14 @@ let
adimpro = [ pkgs.imagemagick ];
animation = [ pkgs.which ];
audio = [ pkgs.portaudio ];
- BayesSAE = [ pkgs.gsl_1 ];
- BayesVarSel = [ pkgs.gsl_1 ];
+ BayesSAE = [ pkgs.gsl ];
+ BayesVarSel = [ pkgs.gsl ];
BayesXsrc = with pkgs; [ readline.dev ncurses ];
bigGP = [ pkgs.mpi ];
bio3d = [ pkgs.zlib ];
BiocCheck = [ pkgs.which ];
Biostrings = [ pkgs.zlib ];
- bnpmr = [ pkgs.gsl_1 ];
+ bnpmr = [ pkgs.gsl ];
cairoDevice = [ pkgs.gtk2.dev ];
Cairo = with pkgs; [ libtiff libjpeg cairo.dev x11 fontconfig.lib ];
Cardinal = [ pkgs.which ];
@@ -259,37 +292,39 @@ let
curl = [ pkgs.curl.dev ];
data_table = [ pkgs.zlib.dev ] ++ lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp;
devEMF = with pkgs; [ xorg.libXft.dev x11 ];
- diversitree = with pkgs; [ gsl_1 fftw ];
+ diversitree = with pkgs; [ gsl fftw ];
exactextractr = [ pkgs.geos ];
EMCluster = [ pkgs.lapack ];
fftw = [ pkgs.fftw.dev ];
fftwtools = with pkgs; [ fftw.dev pkg-config ];
Formula = [ pkgs.gmp ];
gdtools = with pkgs; [ cairo.dev fontconfig.lib freetype.dev ];
+ ggiraph = with pkgs; [ pkgs.libpng.dev ];
git2r = with pkgs; [ zlib.dev openssl.dev libssh2.dev libgit2 pkg-config ];
- GLAD = [ pkgs.gsl_1 ];
+ GLAD = [ pkgs.gsl ];
glpkAPI = with pkgs; [ gmp glpk ];
gmp = [ pkgs.gmp.dev ];
- graphscan = [ pkgs.gsl_1 ];
- gsl = [ pkgs.gsl_1 ];
+ graphscan = [ pkgs.gsl ];
+ gsl = [ pkgs.gsl ];
gert = [ pkgs.libgit2 ];
haven = with pkgs; [ libiconv zlib.dev ];
h5vc = [ pkgs.zlib.dev ];
- HiCseg = [ pkgs.gsl_1 ];
+ HiCseg = [ pkgs.gsl ];
imager = [ pkgs.x11 ];
- iBMQ = [ pkgs.gsl_1 ];
+ iBMQ = [ pkgs.gsl ];
igraph = with pkgs; [ gmp libxml2.dev ];
JavaGD = [ pkgs.jdk ];
jpeg = [ pkgs.libjpeg.dev ];
jqr = [ pkgs.jq.dev ];
- KFKSDS = [ pkgs.gsl_1 ];
+ KFKSDS = [ pkgs.gsl ];
kza = [ pkgs.fftw.dev ];
lpsymphony = with pkgs; [ pkg-config gfortran gettext ];
lwgeom = with pkgs; [ proj geos gdal ];
magick = [ pkgs.imagemagick.dev ];
ModelMetrics = lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp;
- mvabund = [ pkgs.gsl_1 ];
+ mvabund = [ pkgs.gsl ];
mwaved = [ pkgs.fftw.dev ];
+ mzR = with pkgs; [ zlib boost159.dev netcdf ];
ncdf4 = [ pkgs.netcdf ];
nloptr = with pkgs; [ nlopt pkg-config ];
n1qn1 = [ pkgs.gfortran ];
@@ -311,8 +346,8 @@ let
readxl = [ pkgs.libiconv ];
rcdd = [ pkgs.gmp.dev ];
RcppCNPy = [ pkgs.zlib.dev ];
- RcppGSL = [ pkgs.gsl_1 ];
- RcppZiggurat = [ pkgs.gsl_1 ];
+ RcppGSL = [ pkgs.gsl ];
+ RcppZiggurat = [ pkgs.gsl ];
reprex = [ pkgs.which ];
rgdal = with pkgs; [ proj.dev gdal ];
rgeos = [ pkgs.geos ];
@@ -324,7 +359,7 @@ let
Rhtslib = with pkgs; [ zlib.dev automake autoconf bzip2.dev xz.dev curl.dev ];
rjags = [ pkgs.jags ];
rJava = with pkgs; [ zlib bzip2.dev icu xz.dev pcre.dev jdk libzip ];
- Rlibeemd = [ pkgs.gsl_1 ];
+ Rlibeemd = [ pkgs.gsl ];
rmatio = [ pkgs.zlib.dev ];
Rmpfr = with pkgs; [ gmp mpfr.dev ];
Rmpi = [ pkgs.mpi ];
@@ -352,12 +387,12 @@ let
sf = with pkgs; [ gdal proj geos ];
terra = with pkgs; [ gdal proj geos ];
showtext = with pkgs; [ zlib libpng icu freetype.dev ];
- simplexreg = [ pkgs.gsl_1 ];
+ simplexreg = [ pkgs.gsl ];
spate = [ pkgs.fftw.dev ];
ssanv = [ pkgs.proj ];
- stsm = [ pkgs.gsl_1 ];
+ stsm = [ pkgs.gsl ];
stringi = [ pkgs.icu.dev ];
- survSNP = [ pkgs.gsl_1 ];
+ survSNP = [ pkgs.gsl ];
svglite = [ pkgs.libpng.dev ];
sysfonts = with pkgs; [ zlib libpng freetype.dev ];
systemfonts = with pkgs; [ fontconfig.dev freetype.dev ];
@@ -365,7 +400,7 @@ let
tesseract = with pkgs; [ tesseract leptonica ];
tiff = [ pkgs.libtiff.dev ];
tkrplot = with pkgs; [ xorg.libX11 tk.dev ];
- topicmodels = [ pkgs.gsl_1 ];
+ topicmodels = [ pkgs.gsl ];
udunits2 = with pkgs; [ udunits expat ];
units = [ pkgs.udunits ];
V8 = [ pkgs.v8 ];
@@ -444,7 +479,6 @@ let
tikzDevice = with pkgs; [ which texlive.combined.scheme-medium ];
gridGraphics = [ pkgs.which ];
adimpro = with pkgs; [ which xorg.xdpyinfo ];
- mzR = [ pkgs.netcdf ];
cluster = [ pkgs.libiconv ];
KernSmooth = [ pkgs.libiconv ];
nlme = [ pkgs.libiconv ];
@@ -478,9 +512,12 @@ let
Rbowtie = with pkgs; [ zlib.dev ];
gaston = with pkgs; [ zlib.dev ];
csaw = with pkgs; [ zlib.dev curl ];
+ DirichletMultinomial = with pkgs; [ gsl ];
+ DiffBind = with pkgs; [ zlib.dev ];
+ CNEr = with pkgs; [ zlib ];
};
- packagesRequireingX = [
+ packagesRequiringX = [
"accrual"
"ade4TkGUI"
"analogue"
@@ -670,6 +707,27 @@ let
"x12GUI"
];
+ packagesRequiringHome = [
+ "aroma_affymetrix"
+ "aroma_cn"
+ "aroma_core"
+ "csodata"
+ "DiceView"
+ "MSnID"
+ "OmnipathR"
+ "precommit"
+ "PSCBS"
+ "repmis"
+ "R_cache"
+ "R_filesets"
+ "RKorAPClient"
+ "R_rsp"
+ "scholar"
+ "stepR"
+ "styler"
+ "TreeTools"
+ ];
+
packagesToSkipCheck = [
"Rmpi" # tries to run MPI processes
"pbdMPI" # tries to run MPI processes
@@ -678,6 +736,11 @@ let
# Packages which cannot be installed due to lack of dependencies or other reasons.
brokenPackages = [
+ "av"
+ "rgl"
+ "NetLogoR"
+ "proj4"
+ "x13binary"
];
otherOverrides = old: new: {
@@ -821,10 +884,6 @@ let
PKG_LIBS = "-L${pkgs.blas}/lib -lblas -L${pkgs.lapack}/lib -llapack";
});
- EMCluster = old.EMCluster.overrideDerivation (attrs: {
- patches = [ ./patches/EMCluster.patch ];
- });
-
spMC = old.spMC.overrideDerivation (attrs: {
patches = [ ./patches/spMC.patch ];
});
@@ -972,12 +1031,6 @@ let
'';
});
- R_cache = old.R_cache.overrideDerivation (attrs: {
- preConfigure = ''
- export R_CACHE_ROOTPATH=$TMP
- '';
- });
-
lpsymphony = old.lpsymphony.overrideDerivation (attrs: {
preConfigure = ''
patchShebangs configure
@@ -992,12 +1045,37 @@ let
buildInputs = [ libsodium.dev ] ++ attrs.buildInputs;
});
+ keyring = old.keyring.overrideDerivation (attrs: {
+ preConfigure = ''
+ patchShebangs configure
+ '';
+ });
+
Rhtslib = old.Rhtslib.overrideDerivation (attrs: {
preConfigure = ''
substituteInPlace R/zzz.R --replace "-lcurl" "-L${pkgs.curl.out}/lib -lcurl"
'';
});
+ MatchIt = old.MatchIt.overrideDerivation (attrs: {
+ patches = [ (pkgs.fetchpatch {
+ url = "https://github.com/kosukeimai/MatchIt/commit/8c15a1afa16b74eb04a45e7e46f8aca64ed89bcb.patch";
+ sha256 = "sha256-3UI60n49xuX6LniHpTLOUSsHCEAQ7f1FMBVH0jNlW60=";
+ }) ];
+ });
+
+ h2o = old.h2o.overrideDerivation (attrs: {
+ preConfigure = ''
+ # prevent download of jar file during install and postpone to first use
+ sed -i '/downloadJar()/d' R/zzz.R
+
+ # during runtime the package directory is not writable as it's in the
+ # nix store, so store the jar in the user's cache directory instead
+ substituteInPlace R/connection.R --replace \
+ 'dest_file <- file.path(dest_folder, "h2o.jar")' \
+ 'dest_file <- file.path("~/.cache/", "h2o.jar")'
+ '';
+ });
};
in
self
diff --git a/pkgs/development/r-modules/patches/EMCluster.patch b/pkgs/development/r-modules/patches/EMCluster.patch
deleted file mode 100644
index afc9de3a95a9..000000000000
--- a/pkgs/development/r-modules/patches/EMCluster.patch
+++ /dev/null
@@ -1,6 +0,0 @@
-diff -ru -x '*~' EMCluster_orig/src/Makevars EMCluster/src/Makevars
---- EMCluster_orig/src/Makevars 2013-07-05 02:43:25.000000000 +0900
-+++ EMCluster/src/Makevars 2014-10-25 18:10:19.190992120 +0900
-@@ -1 +1 @@
--PKG_LIBS = $(FLIBS) $(BLAS_LIBS) $(LAPACK_LIBS)
-+PKG_LIBS = $(FLIBS) $(LAPACK_LIBS) $(BLAS_LIBS)
diff --git a/pkgs/development/ruby-modules/with-packages/test.nix b/pkgs/development/ruby-modules/with-packages/test.nix
index bcd9a787f7d3..ca2934b6f61c 100644
--- a/pkgs/development/ruby-modules/with-packages/test.nix
+++ b/pkgs/development/ruby-modules/with-packages/test.nix
@@ -6,7 +6,6 @@ let
stdenv = pkgs.stdenv;
rubyVersions = with pkgs; [
- ruby_2_6
ruby_2_7
];
diff --git a/pkgs/development/tools/analysis/rr/zen_workaround.nix b/pkgs/development/tools/analysis/rr/zen_workaround.nix
new file mode 100644
index 000000000000..d15587d2a811
--- /dev/null
+++ b/pkgs/development/tools/analysis/rr/zen_workaround.nix
@@ -0,0 +1,44 @@
+{ stdenv, lib, fetchzip, kernel }:
+
+/* The python script shouldn't be needed for users of this kernel module.
+ https://github.com/rr-debugger/rr/blob/master/scripts/zen_workaround.py
+ The module itself is called "zen_workaround" (a bit generic unfortunatelly).
+*/
+stdenv.mkDerivation rec {
+ pname = "rr-zen_workaround";
+ version = "2020-09-22";
+
+ src = fetchzip {
+ url = "https://gist.github.com/glandium/01d54cefdb70561b5f6675e08f2990f2/archive/2f430f0c136a69b0886281d0c76708997d8878af.zip";
+ sha256 = "1mbmbyymgl75wparv3rgnyxnc44rd6n935jziz9anl9apy031ryi";
+ };
+
+ hardeningDisable = [ "pic" ];
+ nativeBuildInputs = kernel.moduleBuildDependencies;
+
+ makeFlags = [
+ "-C${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+ ];
+ postConfigure = ''
+ makeFlags="$makeFlags M=$(pwd)"
+ '';
+ buildFlags = "modules";
+
+ installPhase = let
+ modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel"; #TODO: longer path?
+ in ''
+ runHook preInstall
+ mkdir -p "${modDestDir}"
+ cp *.ko "${modDestDir}/"
+ find ${modDestDir} -name '*.ko' -exec xz -f '{}' \;
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Kernel module supporting the rr debugger on (some) AMD Zen-based CPUs";
+ homepage = "https://github.com/rr-debugger/rr/wiki/Zen#kernel-module";
+ license = licenses.gpl2;
+ maintainers = [ maintainers.vcunat ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix
index 3ee608d4bb7f..bf0391fd755f 100644
--- a/pkgs/development/tools/delve/default.nix
+++ b/pkgs/development/tools/delve/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "delve";
- version = "1.7.1";
+ version = "1.7.2";
goPackagePath = "github.com/go-delve/delve";
excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)";
@@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "go-delve";
repo = "delve";
rev = "v${version}";
- sha256 = "sha256-dnmV7LZjq86AwLWXfWBGm1pmFM0uipv1FwR6EhV8CZQ=";
+ sha256 = "sha256-Mye8Gh73yQ1fhjVpEOKBQGjdOzgMUqzdNiBjRRTteTg=";
};
subPackages = [ "cmd/dlv" ];
@@ -22,12 +22,16 @@ buildGoPackage rec {
# fortify source breaks build since delve compiles with -O0
wrapProgram $out/bin/dlv \
--prefix disableHardening " " fortify
+
+ # add symlink for vscode golang extension
+ # https://github.com/golang/vscode-go/blob/master/docs/debugging.md#manually-installing-dlv-dap
+ ln $out/bin/dlv $out/bin/dlv-dap
'';
meta = with lib; {
description = "debugger for the Go programming language";
homepage = "https://github.com/derekparker/delve";
- maintainers = with maintainers; [ vdemeester ];
+ maintainers = with maintainers; [ SuperSandro2000 vdemeester ];
license = licenses.mit;
platforms = [ "x86_64-linux" ] ++ platforms.darwin;
};
diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix
index cf4fe39754fc..6779c096d398 100644
--- a/pkgs/development/tools/misc/ycmd/default.nix
+++ b/pkgs/development/tools/misc/ycmd/default.nix
@@ -3,7 +3,6 @@
, godef ? null
, gotools ? null
, nodePackages ? null
-, rustracerd ? null
, fixDarwinDylibNames, Cocoa ? null
}:
@@ -74,10 +73,6 @@ stdenv.mkDerivation {
'' + lib.optionalString (nodePackages != null) ''
TARGET=$out/lib/ycmd/third_party/tsserver
ln -sf ${nodePackages.typescript} $TARGET
- '' + lib.optionalString (rustracerd != null) ''
- TARGET=$out/lib/ycmd/third_party/racerd/target/release
- mkdir -p $TARGET
- ln -sf ${rustracerd}/bin/racerd $TARGET
'';
# fixup the argv[0] and replace __file__ with the corresponding path so
diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix
index 8340891da01a..57a0f188dc8f 100644
--- a/pkgs/development/tools/qtcreator/default.nix
+++ b/pkgs/development/tools/qtcreator/default.nix
@@ -20,12 +20,12 @@ in
mkDerivation rec {
pname = "qtcreator";
- version = "4.14.0";
+ version = "5.0.2";
baseVersion = builtins.concatStringsSep "." (lib.take 2 (builtins.splitVersion version));
src = fetchurl {
url = "http://download.qt-project.org/official_releases/${pname}/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.xz";
- sha256 = "07i045mzwbfhwj2jlijhz9xs6ay03qs5dgcw2kzlcr79a69i0h6j";
+ sha256 = "1bf07150226da46237f26f5eaa9f090ce81ed79b9bc75e0dfa6328043e360103";
};
buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative elfutils.dev ] ++
@@ -75,6 +75,8 @@ mkDerivation rec {
'';
postInstall = ''
+ mkdir -p $out/share/applications
+ cp share/applications/org.qt-project.qtcreator.desktop $out/share/applications
substituteInPlace $out/share/applications/org.qt-project.qtcreator.desktop \
--replace "Exec=qtcreator" "Exec=$out/bin/qtcreator"
'';
diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix
deleted file mode 100644
index 6ffa49aa6b9f..000000000000
--- a/pkgs/development/tools/rust/racerd/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, makeWrapper, Security }:
-
-rustPlatform.buildRustPackage rec {
- pname = "racerd";
- version = "unstable-2019-09-02";
-
- src = fetchFromGitHub {
- owner = "jwilm";
- repo = "racerd";
- rev = "e3d380b9a1d3f3b67286d60465746bc89fea9098";
- sha256 = "13jqdvjk4savcl03mrn2vzgdsd7vxv2racqbyavrxp2cm9h6cjln";
- };
-
- cargoPatches = [
- (fetchpatch {
- url = "https://github.com/jwilm/racerd/commit/856f3656e160cd2909c5166e962f422c901720ee.patch";
- sha256 = "1qq2k4bnwjz5qgn7s8yxd090smwn2wvdm8dd1rrlgpln0a5vxkpb";
- })
- ];
-
- cargoSha256 = "08zn65c5ivhn2qs02aiixyqwhywrw8kfvs0kgzxdzsipic47n2qq";
-
- # a nightly compiler is required unless we use this cheat code.
- RUSTC_BOOTSTRAP=1;
-
- doCheck = false;
-
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = lib.optional stdenv.isDarwin Security;
-
- RUST_SRC_PATH = rustPlatform.rustcSrc;
-
- installPhase = ''
- mkdir -p $out/bin
- cp -p $releaseDir/racerd $out/bin/
- wrapProgram $out/bin/racerd --set-default RUST_SRC_PATH "$RUST_SRC_PATH"
- '';
-
- meta = with lib; {
- broken = true;
- description = "JSON/HTTP Server based on racer for adding Rust support to editors and IDEs";
- homepage = "https://github.com/jwilm/racerd";
- license = licenses.asl20;
- };
-}
diff --git a/pkgs/games/factorio/update.py b/pkgs/games/factorio/update.py
index 3806ba3614f1..833a4ae068ea 100755
--- a/pkgs/games/factorio/update.py
+++ b/pkgs/games/factorio/update.py
@@ -89,7 +89,9 @@ def generate_our_versions(factorio_versions: FactorioVersionsJSON) -> OurVersion
for system in SYSTEMS:
for release_type in RELEASE_TYPES:
for release_channel in RELEASE_CHANNELS:
- version = factorio_versions[release_channel.name][release_type.name]
+ version = factorio_versions[release_channel.name].get(release_type.name)
+ if version == None:
+ continue
this_release = {
"name": f"factorio_{release_type.name}_{system.tar_name}-{version}.tar.xz",
"url": f"https://factorio.com/get-download/{version}/{release_type.name}/{system.url_name}",
diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json
index d1175d9670e6..90d472605023 100644
--- a/pkgs/games/factorio/versions.json
+++ b/pkgs/games/factorio/versions.json
@@ -2,56 +2,48 @@
"x86_64-linux": {
"alpha": {
"experimental": {
- "name": "factorio_alpha_x64-1.1.39.tar.xz",
+ "name": "factorio_alpha_x64-1.1.42.tar.xz",
"needsAuth": true,
- "sha256": "1wyvk0niyppg7h9ayfsiy6x309bjwsbgf62nah13aps89jk8n1pc",
+ "sha256": "08h2pxzsk7sigjqnqm1jxya3i9i5g2mgl378gmbp2jcy2mnn4dvm",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.39/alpha/linux64",
- "version": "1.1.39"
+ "url": "https://factorio.com/get-download/1.1.42/alpha/linux64",
+ "version": "1.1.42"
},
"stable": {
- "name": "factorio_alpha_x64-1.1.38.tar.xz",
+ "name": "factorio_alpha_x64-1.1.42.tar.xz",
"needsAuth": true,
- "sha256": "0cjhfyz4j06yn08n239ajjjpgykh39hzifhmd0ygr5szw9gdc851",
+ "sha256": "08h2pxzsk7sigjqnqm1jxya3i9i5g2mgl378gmbp2jcy2mnn4dvm",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.38/alpha/linux64",
- "version": "1.1.38"
+ "url": "https://factorio.com/get-download/1.1.42/alpha/linux64",
+ "version": "1.1.42"
}
},
"demo": {
- "experimental": {
- "name": "factorio_demo_x64-1.1.37.tar.xz",
- "needsAuth": false,
- "sha256": "06qwx9wd3990d3256y9y5qsxa0936076jgwhinmrlvjp9lxwl4ly",
- "tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.37/demo/linux64",
- "version": "1.1.37"
- },
"stable": {
- "name": "factorio_demo_x64-1.1.38.tar.xz",
+ "name": "factorio_demo_x64-1.1.42.tar.xz",
"needsAuth": false,
- "sha256": "0y53w01dyfmavw1yxbjqjiirmvw32bnf9bqz0isnd72dvkg0kziv",
+ "sha256": "155m1ijdbc7szhpdw8f8g82ysd7av9zb6llqq4z96nn834px9m2d",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.38/demo/linux64",
- "version": "1.1.38"
+ "url": "https://factorio.com/get-download/1.1.42/demo/linux64",
+ "version": "1.1.42"
}
},
"headless": {
"experimental": {
- "name": "factorio_headless_x64-1.1.39.tar.xz",
+ "name": "factorio_headless_x64-1.1.42.tar.xz",
"needsAuth": false,
- "sha256": "06figqmyd5bgwhpppziag4hs7x3ixr7wd8186cza3ly57bibha2m",
+ "sha256": "1l217fcjcwfi0g5dilsi703cl0wyxsqdqn422hwdbp2ql839k422",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.39/headless/linux64",
- "version": "1.1.39"
+ "url": "https://factorio.com/get-download/1.1.42/headless/linux64",
+ "version": "1.1.42"
},
"stable": {
- "name": "factorio_headless_x64-1.1.38.tar.xz",
+ "name": "factorio_headless_x64-1.1.42.tar.xz",
"needsAuth": false,
- "sha256": "1c929pa9ifz0cvmx9k5yd267hjd5p7fdbln0czl3dq1vlskk1w71",
+ "sha256": "1l217fcjcwfi0g5dilsi703cl0wyxsqdqn422hwdbp2ql839k422",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.38/headless/linux64",
- "version": "1.1.38"
+ "url": "https://factorio.com/get-download/1.1.42/headless/linux64",
+ "version": "1.1.42"
}
}
}
diff --git a/pkgs/misc/vim-plugins/aliases.nix b/pkgs/misc/vim-plugins/aliases.nix
index 67607fe4562c..b880c15d790a 100644
--- a/pkgs/misc/vim-plugins/aliases.nix
+++ b/pkgs/misc/vim-plugins/aliases.nix
@@ -94,6 +94,7 @@ mapAliases (with prev; {
neosnippet = neosnippet-vim;
The_NERD_Commenter = nerdcommenter;
The_NERD_tree = nerdtree;
+ onedark-nvim = onedarkpro-nvim; # added 2021-10-22
open-browser = open-browser-vim;
pathogen = vim-pathogen;
polyglot = vim-polyglot;
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 18bd9510b61a..e3703ec0292c 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -77,12 +77,12 @@ final: prev:
ale = buildVimPluginFrom2Nix {
pname = "ale";
- version = "2021-10-16";
+ version = "2021-10-22";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
- rev = "16898417e68ffb6034b2a6de0c1b25502bd846d8";
- sha256 = "1zyzw8m8bfs3p06nq582pb5lja204xhzkd60bp1wyyq1q5qv9y3v";
+ rev = "95ba7898b45c3cbac77463aace447ead4e173556";
+ sha256 = "063ks4yf2l9384xi7candw1069j8k465rz2sniliak9r6hy1k100";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@@ -401,12 +401,12 @@ final: prev:
bufferline-nvim = buildVimPluginFrom2Nix {
pname = "bufferline.nvim";
- version = "2021-09-28";
+ version = "2021-10-21";
src = fetchFromGitHub {
owner = "akinsho";
repo = "bufferline.nvim";
- rev = "5fb90051aa17a840b0bcdbff0055ea83d6ad9f59";
- sha256 = "0bvkl9c2mb90khz6xffs3aki46v73zr3wwmh6yb9l2k5qmim5r6j";
+ rev = "58e8d9b7c9aaf603f1093f808628b5a8f03493af";
+ sha256 = "19l7sh0xfxg4lra1zww3msawy3a4y74b3xr4qrjais8wm8wc4nb4";
};
meta.homepage = "https://github.com/akinsho/bufferline.nvim/";
};
@@ -461,12 +461,12 @@ final: prev:
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
- version = "2021-10-18";
+ version = "2021-10-22";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
- rev = "47071cacfb9bcd5ac86dddb1e3ef272ca7ac254d";
- sha256 = "1b2dx5j44441xgfk3dj8f135kim38fnp2s8rpf098q8r2gn3zv8d";
+ rev = "094a446fdcceb72a28a47314a92ab2537dd747ec";
+ sha256 = "0q9qjxc49w80v5d2apzzcl2bhdr050f4bib6w27msva4r9vzsgjy";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@@ -653,24 +653,24 @@ final: prev:
cmp-path = buildVimPluginFrom2Nix {
pname = "cmp-path";
- version = "2021-10-16";
+ version = "2021-10-22";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "cmp-path";
- rev = "2b1d31fef79a4c0ff803f6230859faf76e4409f9";
- sha256 = "1l3lyzgwlr7drxzig01by99vrgi7flvrnln3dmy14pg2x56lsbf3";
+ rev = "387b740fc1a038a434f18f7d7a66fc6c52a3de35";
+ sha256 = "0xxfdswrl2lg9drvaqrdqj2djp0ifnr5v6x271nk4d9m46cr6x4q";
};
meta.homepage = "https://github.com/hrsh7th/cmp-path/";
};
cmp-spell = buildVimPluginFrom2Nix {
pname = "cmp-spell";
- version = "2021-10-12";
+ version = "2021-10-19";
src = fetchFromGitHub {
owner = "f3fora";
repo = "cmp-spell";
- rev = "4ce11f44edc54f7e3087c85c1b7b388f9aece983";
- sha256 = "05akncv4w8p3h25q5dmx8h0jbn2b4l5mz9x62wj7d7qks4fjik4j";
+ rev = "5602f1a0de7831f8dad5b0c6db45328fbd539971";
+ sha256 = "1pk6izww8canfqpiyrqd6qx1p3j18pwfzkfx4ynbng8kl9nh6nv5";
};
meta.homepage = "https://github.com/f3fora/cmp-spell/";
};
@@ -713,12 +713,12 @@ final: prev:
cmp_luasnip = buildVimPluginFrom2Nix {
pname = "cmp_luasnip";
- version = "2021-10-14";
+ version = "2021-10-18";
src = fetchFromGitHub {
owner = "saadparwaiz1";
repo = "cmp_luasnip";
- rev = "8da7e78e54415753d6b688f96d54290d754f7c6b";
- sha256 = "0s9s2kpfg6mqrl0xdqxl1k17vj4pc433v89i1p5kcrxsydfvdxp3";
+ rev = "0347dddd1d88484aadbc39a34c98567708e4b7e0";
+ sha256 = "1kiwav1gds9xcibm21vmvnpfkyvgqrjwwrbcm1bb9dvq82nvd1b5";
};
meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/";
};
@@ -870,12 +870,12 @@ final: prev:
comment-nvim = buildVimPluginFrom2Nix {
pname = "comment.nvim";
- version = "2021-10-18";
+ version = "2021-10-22";
src = fetchFromGitHub {
owner = "numtostr";
repo = "comment.nvim";
- rev = "5365cc7f1fc2522ffa1b560830d3125372928d6a";
- sha256 = "0lvcl3pykcry35r6c9fxmjklzvzz7lpxfchbz1qgadpq45pidyir";
+ rev = "4208e09ea8d8b75b6273468cf4cfb48e4a3f59ca";
+ sha256 = "1182y3lafs37dx1alpr58phvnfncknx3ia4j401hckp49i3sdxql";
};
meta.homepage = "https://github.com/numtostr/comment.nvim/";
};
@@ -1170,12 +1170,12 @@ final: prev:
ctrlp-vim = buildVimPluginFrom2Nix {
pname = "ctrlp.vim";
- version = "2021-04-18";
+ version = "2021-10-19";
src = fetchFromGitHub {
owner = "ctrlpvim";
repo = "ctrlp.vim";
- rev = "f68f4d00b9c99d0d711bfde3b071f0dafd249901";
- sha256 = "0lj596jmisv42mpaxp0w1gm31lyiv28kxjyy7352d16dv5a5432g";
+ rev = "61e964f2d168f52cb8e80e67d26605b52d726b16";
+ sha256 = "0qi4ip94lxfxzbkhs779v1afmvh6q0wp8fcfxxdhzgl44qlhy6hx";
};
meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/";
};
@@ -1568,12 +1568,12 @@ final: prev:
diffview-nvim = buildVimPluginFrom2Nix {
pname = "diffview.nvim";
- version = "2021-10-08";
+ version = "2021-10-22";
src = fetchFromGitHub {
owner = "sindrets";
repo = "diffview.nvim";
- rev = "2a838d444ef38e07170b161ed12ce241a8d8c54f";
- sha256 = "1d23mxvc4ldlsv5a6zy0glxfnfmx08fvp1zyxds1v369pn6x61pi";
+ rev = "d4ee04c9eb8951dcf1aa83d7a896bededfc68228";
+ sha256 = "0wfrbhnal7y82bhrf446igc6g9avavk2jx0idk5sbv24bqhi9b60";
};
meta.homepage = "https://github.com/sindrets/diffview.nvim/";
};
@@ -2015,12 +2015,12 @@ final: prev:
fzf-lsp-nvim = buildVimPluginFrom2Nix {
pname = "fzf-lsp.nvim";
- version = "2021-10-06";
+ version = "2021-10-21";
src = fetchFromGitHub {
owner = "gfanto";
repo = "fzf-lsp.nvim";
- rev = "180b979697493d3b0878829202e8c9b0a27aa2cd";
- sha256 = "0nypq514xx6rcvszxv2sz3s6vlg54adqkn2iawfy2jms93brcqs5";
+ rev = "34bddd8a31441435f1d29eef0452576d12144da7";
+ sha256 = "1ijqnqmdlm2f3jkjh68baif05lf27rww43vvndix2icypnd16vcp";
};
meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/";
};
@@ -2171,12 +2171,12 @@ final: prev:
gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns.nvim";
- version = "2021-10-15";
+ version = "2021-10-22";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
- rev = "552f114caeaec4ce97822cb55dfa7c7e5368136b";
- sha256 = "0qdafm3arjf8bcqpvv085dwzbikad3sr3xzvrn3gfa0dsls8pg6q";
+ rev = "a2a18c69bfd7923c4be8a57ed91d5dd0e7e34a93";
+ sha256 = "064fkd3dx16cxkkcghwc332v22xdghbfh7dakq81c269w5qzk8gr";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
};
@@ -2243,12 +2243,12 @@ final: prev:
goto-preview = buildVimPluginFrom2Nix {
pname = "goto-preview";
- version = "2021-10-15";
+ version = "2021-10-18";
src = fetchFromGitHub {
owner = "rmagatti";
repo = "goto-preview";
- rev = "05c6983e6d6cb6e35367a13eeda1ffb160f48753";
- sha256 = "1qa22gsa62ginkad21bigj8qgbh8h3car598gl59643y2kc7lip3";
+ rev = "05383bbbfccbf4fd6a4527ef8383270d03dde833";
+ sha256 = "0djcvbj94k4qp09bvzvcnwwybsincc4lvdz84vw9jyzkz3pgxmy5";
};
meta.homepage = "https://github.com/rmagatti/goto-preview/";
};
@@ -2339,12 +2339,12 @@ final: prev:
gv-vim = buildVimPluginFrom2Nix {
pname = "gv.vim";
- version = "2021-08-24";
+ version = "2021-10-19";
src = fetchFromGitHub {
owner = "junegunn";
repo = "gv.vim";
- rev = "6f6a3afe73a2cb52d8517d1a95ecfc9b09fb3e92";
- sha256 = "1j1yqanqcndxzi3r3d3pvgjh14bw28sfy0ik5jh8zvggkl240sqn";
+ rev = "386d770e916dd680d1d622e715b9eb3a77f21bd1";
+ sha256 = "184kvydzz9nyg0sv3crn38v04s24km0ma8vfg4i3agmffb1riibk";
};
meta.homepage = "https://github.com/junegunn/gv.vim/";
};
@@ -2531,12 +2531,12 @@ final: prev:
indent-blankline-nvim = buildVimPluginFrom2Nix {
pname = "indent-blankline.nvim";
- version = "2021-10-12";
+ version = "2021-10-22";
src = fetchFromGitHub {
owner = "lukas-reineke";
repo = "indent-blankline.nvim";
- rev = "0a98fa8dacafe22df0c44658f9de3968dc284d20";
- sha256 = "1mwj3wsp6b1m6amii5pz2b0nbs6ac8w0285wg8gd3g2y3ywihi2g";
+ rev = "cefd4ab194072ca608c2bc8e51f15882d6f1854e";
+ sha256 = "13ljp3dri9wz1y2l1d1va1qf7bzdcvhanj2bafv06i4mjcp3i73v";
};
meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/";
};
@@ -2964,12 +2964,12 @@ final: prev:
lightspeed-nvim = buildVimPluginFrom2Nix {
pname = "lightspeed.nvim";
- version = "2021-10-18";
+ version = "2021-10-21";
src = fetchFromGitHub {
owner = "ggandor";
repo = "lightspeed.nvim";
- rev = "d2d47534b00d6fcd16cabab8ec8a6cd15c40ebf3";
- sha256 = "13yb0srx7g9yf6rrr0bycxr4kac1ip1a1nzz27hamfkq3l9rcgn5";
+ rev = "61710967a57cc780f4b505c3821d3be54f53e79b";
+ sha256 = "12g6dfc5pkxz0s2vq6p747zw21pigv6sskrgnxsq7awp92xahxbd";
};
meta.homepage = "https://github.com/ggandor/lightspeed.nvim/";
};
@@ -2988,36 +2988,36 @@ final: prev:
lir-nvim = buildVimPluginFrom2Nix {
pname = "lir.nvim";
- version = "2021-10-17";
+ version = "2021-10-19";
src = fetchFromGitHub {
owner = "tamago324";
repo = "lir.nvim";
- rev = "5a7b21b0fdafe73719902b9848880fb3eb8500aa";
- sha256 = "0pdswmrmc2nicii5szhig4qnmcx2cks6rc5g7s787cc0c458l98p";
+ rev = "e33a669824ea160a03b77357ba7f1a2617a3f16d";
+ sha256 = "1l5syicgdcd6badrrpxji8nig98mwq9dv0nq6abjyg4scip251li";
};
meta.homepage = "https://github.com/tamago324/lir.nvim/";
};
lispdocs-nvim = buildVimPluginFrom2Nix {
pname = "lispdocs.nvim";
- version = "2021-09-08";
+ version = "2021-10-19";
src = fetchFromGitHub {
owner = "tami5";
repo = "lispdocs.nvim";
- rev = "811527775351070008549c3c2931f80f809fa25c";
- sha256 = "1idbl5wmj0svh01dfvcilzbx24xl4cc6i77pb3laizh4fz7x7vza";
+ rev = "44d8321843b499a966255270ac59be6148b74097";
+ sha256 = "0pqyfx4b1wsfw30b22ycfvfwbf8h6gw2s4f4hxkicj24ix9qwx6w";
};
meta.homepage = "https://github.com/tami5/lispdocs.nvim/";
};
lsp-colors-nvim = buildVimPluginFrom2Nix {
pname = "lsp-colors.nvim";
- version = "2021-04-30";
+ version = "2021-10-22";
src = fetchFromGitHub {
owner = "folke";
repo = "lsp-colors.nvim";
- rev = "00b40add53f2f6bd249932d0c0cd25a42ce7a2fc";
- sha256 = "1qa1kb5abrka5iixmz81kz4v8xrs4jv620nd583rhwya2jmkbaji";
+ rev = "517fe3ab6b63f9907b093bc9443ef06b56f804f3";
+ sha256 = "15q3hiwh0zpyhadapjk3wabnn71kafcljj2gq11qk53fk3zzsxdx";
};
meta.homepage = "https://github.com/folke/lsp-colors.nvim/";
};
@@ -3060,12 +3060,12 @@ final: prev:
lsp_signature-nvim = buildVimPluginFrom2Nix {
pname = "lsp_signature.nvim";
- version = "2021-10-11";
+ version = "2021-10-21";
src = fetchFromGitHub {
owner = "ray-x";
repo = "lsp_signature.nvim";
- rev = "422006c33c0da8947772c3a1040fa6c93be418d8";
- sha256 = "0079b9zac83yjmv6ln37fzyl91f4pw8bzy075czvsx7kbpcg2a04";
+ rev = "c88cc24ec89a7ab0ecabdd6624f0bf717d83d2dd";
+ sha256 = "0jgznv9x7ickpdy492prv6yird847hqxjvr0a5zzfxbhlyvdysqk";
};
meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
};
@@ -3108,36 +3108,36 @@ final: prev:
lualine-nvim = buildVimPluginFrom2Nix {
pname = "lualine.nvim";
- version = "2021-05-27";
+ version = "2021-10-22";
src = fetchFromGitHub {
- owner = "hoob3rt";
+ owner = "nvim-lualine";
repo = "lualine.nvim";
- rev = "9726824f1dcc8907632bc7c32f9882f26340f815";
- sha256 = "0gmbv0pbswkxjd4qw7dq66gp3fj594di0pgkb47yh3b46id8vkyj";
+ rev = "71f6fed3c3b29366bf58b2753803b93f58646ca4";
+ sha256 = "0wn9hjln2ixgm42sgy1biswp3knhac818bnj2v24ji7swryxjjda";
};
- meta.homepage = "https://github.com/hoob3rt/lualine.nvim/";
+ meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/";
};
luasnip = buildVimPluginFrom2Nix {
pname = "luasnip";
- version = "2021-10-13";
+ version = "2021-10-22";
src = fetchFromGitHub {
owner = "l3mon4d3";
repo = "luasnip";
- rev = "4526e71635b2d238c0f76f058e8c4de3a6b5bd51";
- sha256 = "08xrppvjzc6hnzfkjy1y7k4n5pxgamrzchv9nry6yzi9w3ijnhyb";
+ rev = "3dc04d379f82b7263b26565c74748ea68879b022";
+ sha256 = "1wn6wa03xq3gsp79wsxwml14sxrg4540b3g4rvqhxilyi30m3kdn";
};
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
};
lush-nvim = buildVimPluginFrom2Nix {
pname = "lush.nvim";
- version = "2021-10-10";
+ version = "2021-10-19";
src = fetchFromGitHub {
owner = "rktjmp";
repo = "lush.nvim";
- rev = "80366a41bcbb0dbbcaa6e6f51156d37c405e1d0b";
- sha256 = "08xbiwqv69cjy28m3yirqa2f0vfm816gmsa3zp38ih5i41gfbqnr";
+ rev = "40d92a16a8d639b6cb928f9d49710711892fbf77";
+ sha256 = "0316lvwffkm4cgzgk4pxnmr6hc1ypgdiswb4yhg4wx9pfq8pccxb";
};
meta.homepage = "https://github.com/rktjmp/lush.nvim/";
};
@@ -3504,12 +3504,12 @@ final: prev:
neco-vim = buildVimPluginFrom2Nix {
pname = "neco-vim";
- version = "2021-10-16";
+ version = "2021-10-20";
src = fetchFromGitHub {
owner = "Shougo";
repo = "neco-vim";
- rev = "253dc1d0c7de287440cc5e93c3e60d93cd92f096";
- sha256 = "0xfb4dry3ybv1q2gkqbxkj4y9q6g7hvc4x6z4mvxfks96lcmgrm8";
+ rev = "8d45fc9266d005929a964b099c8f9f61e526ec10";
+ sha256 = "06skc44r4nccq0nfklm079b9yf99d9qfl8jp1ndn513hrnv8v5fp";
};
meta.homepage = "https://github.com/Shougo/neco-vim/";
};
@@ -3540,24 +3540,24 @@ final: prev:
neoformat = buildVimPluginFrom2Nix {
pname = "neoformat";
- version = "2021-09-26";
+ version = "2021-10-20";
src = fetchFromGitHub {
owner = "sbdchd";
repo = "neoformat";
- rev = "964c66fa22500ae7375114342d212d7fe15da341";
- sha256 = "18gfwjgmk56n5xw4xrl8kn860a5sjqsbk14zjbc599id7m4jnaw9";
+ rev = "63c50a72ec44033b95a7dbc3bc2515bfa4dea457";
+ sha256 = "1rvn9bnjxhbmkd96b6a525yb4r8v338rc5k0vq6c6lxqd413vzrs";
};
meta.homepage = "https://github.com/sbdchd/neoformat/";
};
neogit = buildVimPluginFrom2Nix {
pname = "neogit";
- version = "2021-10-12";
+ version = "2021-10-21";
src = fetchFromGitHub {
owner = "TimUntersberger";
repo = "neogit";
- rev = "727652348bf4f39a354e88d1b2cbf36220d109db";
- sha256 = "07skmgl78vqks21lr64sm808zqbqf2013rf7ph9rkfz5wrn4zcvd";
+ rev = "495ae477caa40b467e8b01aa83b5d240fabf13fa";
+ sha256 = "16kbzqgk3pbwkyyrzg461c7vw9rj7sa8hczv74ai4393cgcil38m";
};
meta.homepage = "https://github.com/TimUntersberger/neogit/";
};
@@ -3768,12 +3768,12 @@ final: prev:
neuron-nvim = buildVimPluginFrom2Nix {
pname = "neuron.nvim";
- version = "2021-03-20";
+ version = "2021-10-18";
src = fetchFromGitHub {
owner = "oberblastmeister";
repo = "neuron.nvim";
- rev = "9c85f892f2f50a4e546950edd8fa41ac0d602549";
- sha256 = "14mrimw2rjsz5j6613j1kjpkxk4yn7vw5mfw1g0xl9jmlvx7v085";
+ rev = "10b189437c3e080502ca14ed0e7bc041274e0610";
+ sha256 = "11p6n33c642z6q89j2a71czffp3d3mzhp9mdygw2gadar9g4fvl8";
};
meta.homepage = "https://github.com/oberblastmeister/neuron.nvim/";
};
@@ -3804,12 +3804,12 @@ final: prev:
nightfox-nvim = buildVimPluginFrom2Nix {
pname = "nightfox.nvim";
- version = "2021-10-15";
+ version = "2021-10-21";
src = fetchFromGitHub {
owner = "EdenEast";
repo = "nightfox.nvim";
- rev = "dfaacec99f03a8412538974e8d6a96a0916a3a5f";
- sha256 = "0hjqbisj9kd181qc6jav43r3jk2qyf79n56mxrjzwb8i5rndlr93";
+ rev = "fb46cbf616470707fac1232d135c0bd69906249d";
+ sha256 = "0lia11ni3q3ixjhngnhyrz4s33f19p784y22x3vxi0nvnibj6c40";
};
meta.homepage = "https://github.com/EdenEast/nightfox.nvim/";
};
@@ -3840,12 +3840,12 @@ final: prev:
nnn-vim = buildVimPluginFrom2Nix {
pname = "nnn.vim";
- version = "2021-10-12";
+ version = "2021-10-22";
src = fetchFromGitHub {
owner = "mcchrish";
repo = "nnn.vim";
- rev = "f7ebbaa41da15a964758f009e8e05463974a0aee";
- sha256 = "1spma6n0vyavllawd98zccwmkscisq69547qqxqgfz9j69dllrfg";
+ rev = "be8fb31a073f92bf30d066bee7e4cb3a156ae101";
+ sha256 = "18j5m27wlwanzp63yh3db8hn1qkpbzr21jix3qjjkkj1bjw2cjh3";
};
meta.homepage = "https://github.com/mcchrish/nnn.vim/";
};
@@ -3864,12 +3864,12 @@ final: prev:
nord-nvim = buildVimPluginFrom2Nix {
pname = "nord.nvim";
- version = "2021-10-16";
+ version = "2021-10-20";
src = fetchFromGitHub {
owner = "shaunsingh";
repo = "nord.nvim";
- rev = "99941237d7b54831ce31026b2bf48f5af7c3eaa3";
- sha256 = "1z46fkjyhfnaw3x8id7xs2fkglkbbv6sp45zmzg0f1r881dismi2";
+ rev = "9db1b2f034a90f5038a55bb0c9627599d6ea3900";
+ sha256 = "0av212d3rf8fawbkjj0x2f9qs3pdvxjzdxl8zf6slw14knqpydc3";
};
meta.homepage = "https://github.com/shaunsingh/nord.nvim/";
};
@@ -3900,12 +3900,12 @@ final: prev:
null-ls-nvim = buildVimPluginFrom2Nix {
pname = "null-ls.nvim";
- version = "2021-10-17";
+ version = "2021-10-21";
src = fetchFromGitHub {
owner = "jose-elias-alvarez";
repo = "null-ls.nvim";
- rev = "9534bda66ec8e919bace771bec74678b50b87a88";
- sha256 = "0n61rf8qg8kqxa9hmf7jvnrj36xqi5ml9h3kfwszzbjmq89533kw";
+ rev = "4a7ac163de30d04ab697eeea86b7ea773100b8e4";
+ sha256 = "0chgqap87v2ar7jj1n0g6haqiprz5lhkny9jy4imi5qgf7hb5f6i";
};
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
};
@@ -3948,12 +3948,12 @@ final: prev:
nvim-autopairs = buildVimPluginFrom2Nix {
pname = "nvim-autopairs";
- version = "2021-10-17";
+ version = "2021-10-21";
src = fetchFromGitHub {
owner = "windwp";
repo = "nvim-autopairs";
- rev = "7becc6bc9d8baa62eb0dbf65305f8e7f1470ace7";
- sha256 = "1ihz1kci00r93f52fzz5nx9byh7rrax1sknmj9q232z1wv7dxb06";
+ rev = "3b1b99028340a3b31c620887b8f5b99f4193157c";
+ sha256 = "0ax5i7jjp1dmcywch8392vma91rk5cmi5201lhspggl8mawkcmbs";
};
meta.homepage = "https://github.com/windwp/nvim-autopairs/";
};
@@ -3972,12 +3972,12 @@ final: prev:
nvim-bqf = buildVimPluginFrom2Nix {
pname = "nvim-bqf";
- version = "2021-09-26";
+ version = "2021-10-19";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "nvim-bqf";
- rev = "84789c508a1d4323f494faa5cf18f7cb00b5cb81";
- sha256 = "0ddfkgx8235p07bnjmk01n9z5gnb51s8y22f905lfv2cn1jnaag5";
+ rev = "a57e44b31fe65665a29dd44597dbab0801723d61";
+ sha256 = "15cxpx5vdg9lqs9h7w3azg54z1di9hqzy7bkk0kw813mv7n0bcn0";
};
meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";
};
@@ -4008,12 +4008,12 @@ final: prev:
nvim-cmp = buildVimPluginFrom2Nix {
pname = "nvim-cmp";
- version = "2021-10-18";
+ version = "2021-10-22";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-cmp";
- rev = "a6a98856c3986de675bc40c9c98b7458fb19e95c";
- sha256 = "0x0hzymvna939iscz0llm64ic28iinh4bn6xihv8afgm693j3jbi";
+ rev = "533f17c5692d2b81cda487b327fafcbf8967142c";
+ sha256 = "1cc9a9wv00wqfd1cb9nk13hy51fjh128yhmd4zkkw9qgd7qhcks9";
};
meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
};
@@ -4104,12 +4104,12 @@ final: prev:
nvim-dap-virtual-text = buildVimPluginFrom2Nix {
pname = "nvim-dap-virtual-text";
- version = "2021-09-24";
+ version = "2021-10-19";
src = fetchFromGitHub {
owner = "theHamsta";
repo = "nvim-dap-virtual-text";
- rev = "8ab2aa7b04a4f3c0c8d72dc6affc8e5e20410d93";
- sha256 = "1llrx9n0jg7j9q37lzjax2h1y1z6xp6a2d701q30j6l98yan6x9n";
+ rev = "5fb1dea489fee93fb30751860f98d3e0e6641b33";
+ sha256 = "14l98a3j8wb4d0952x1ids6ba6k9960bx07dqzzp8yvd38hxas80";
};
meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/";
};
@@ -4188,12 +4188,12 @@ final: prev:
nvim-jdtls = buildVimPluginFrom2Nix {
pname = "nvim-jdtls";
- version = "2021-09-29";
+ version = "2021-10-18";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-jdtls";
- rev = "adeca37bd8ac86ec1782f1a9f270827e7a64dac3";
- sha256 = "0vrzvqzn8y2rr30fzyildc4mcicf0x6pv4d34z0lbfij2xjnlhqz";
+ rev = "914530792c9fbe4c87eca4aa6d4eebe8fe46717c";
+ sha256 = "0wkv5vwmwq9ij7h23qfzwv81f0z585w6q8i0qliizszfiik15lph";
};
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
};
@@ -4212,24 +4212,24 @@ final: prev:
nvim-lsp-ts-utils = buildVimPluginFrom2Nix {
pname = "nvim-lsp-ts-utils";
- version = "2021-10-18";
+ version = "2021-10-21";
src = fetchFromGitHub {
owner = "jose-elias-alvarez";
repo = "nvim-lsp-ts-utils";
- rev = "cae4c06308c1ba4f2fdde31836fd98de3fc3e2b5";
- sha256 = "1s2jbl4wpylvqfc4mrycd211xsi1p97r8r579fccjxpswvsm4bbk";
+ rev = "ab8d54f206cff9fc7e686407be1c02ee58a3727f";
+ sha256 = "05npzvf40w0z0n2snn15vr055gkxhvyrhg451yppzqnx1af10skx";
};
meta.homepage = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/";
};
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
- version = "2021-10-17";
+ version = "2021-10-22";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
- rev = "7f902f952944aa708c78138f6536c0dc55aec3a2";
- sha256 = "1n8srlrfliak2587r30la87x3jgl9iq1x8jdxlhrx7i874ha3ykp";
+ rev = "2fb4b6a2f3188f12bad5196e1978528d8bd1c733";
+ sha256 = "1rcijb0hh85sd0j659yinfiaz49ga5fwpragfsfdib6w12nlyiyx";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@@ -4416,12 +4416,12 @@ final: prev:
nvim-ts-rainbow = buildVimPluginFrom2Nix {
pname = "nvim-ts-rainbow";
- version = "2021-10-14";
+ version = "2021-10-21";
src = fetchFromGitHub {
owner = "p00f";
repo = "nvim-ts-rainbow";
- rev = "2bd142b45fbe890d9588a50df3f26212c2b87c80";
- sha256 = "09hcwm10b5rb77rpv0qbwak1x8hhqr0wqnrn118b7768pkqqwka0";
+ rev = "3e6597b4e560404ef5d2f1d5fb0ce3307b5d57f7";
+ sha256 = "0kkk16yl219p6p6bvyfgsipfsh1s15l2p80c2x88wqjvpk78wxmw";
};
meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";
};
@@ -4522,18 +4522,6 @@ final: prev:
meta.homepage = "https://github.com/Th3Whit3Wolf/one-nvim/";
};
- onedark-nvim = buildVimPluginFrom2Nix {
- pname = "onedark.nvim";
- version = "2021-10-15";
- src = fetchFromGitHub {
- owner = "olimorris";
- repo = "onedark.nvim";
- rev = "836551aee06e07dc77ff0aa5dc1de4ace50596a1";
- sha256 = "0s654i6xlk3nkhjdrdmx202f9ig0xby5p9n98ajkhi6wq2yhfr72";
- };
- meta.homepage = "https://github.com/olimorris/onedark.nvim/";
- };
-
onedark-vim = buildVimPluginFrom2Nix {
pname = "onedark.vim";
version = "2021-10-15";
@@ -4546,6 +4534,18 @@ final: prev:
meta.homepage = "https://github.com/joshdick/onedark.vim/";
};
+ onedarkpro-nvim = buildVimPluginFrom2Nix {
+ pname = "onedarkpro.nvim";
+ version = "2021-10-21";
+ src = fetchFromGitHub {
+ owner = "olimorris";
+ repo = "onedarkpro.nvim";
+ rev = "abf91455610bc11b9a2f9e504179b9e48042e6b6";
+ sha256 = "0a5dp4fa4c63n1mpwn0jnhid0hzxiw33vqwrxdsiawgxdgg71sad";
+ };
+ meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
+ };
+
onehalf = buildVimPluginFrom2Nix {
pname = "onehalf";
version = "2021-01-31";
@@ -4584,24 +4584,24 @@ final: prev:
orgmode-nvim = buildVimPluginFrom2Nix {
pname = "orgmode.nvim";
- version = "2021-10-01";
+ version = "2021-10-19";
src = fetchFromGitHub {
owner = "kristijanhusak";
repo = "orgmode.nvim";
- rev = "a94f7b8169ed9cbb8ca0d1ef9701fdcd2f4c4bbc";
- sha256 = "0yf4nc7yywh22a44892cppilq58hd4dvlwn0v9jdl7p1b1fng9kc";
+ rev = "7592652e72cb1a69bd147e118fc05d373f09045b";
+ sha256 = "12r73q94m5cpgdm7rslz7p214nwlrhzm1rnvlbhhmvm3mq1g68ij";
};
meta.homepage = "https://github.com/kristijanhusak/orgmode.nvim/";
};
packer-nvim = buildVimPluginFrom2Nix {
pname = "packer.nvim";
- version = "2021-10-08";
+ version = "2021-10-19";
src = fetchFromGitHub {
owner = "wbthomason";
repo = "packer.nvim";
- rev = "257d6d30e4bd4ab8f5d2a40d73a9f1a4a65779fc";
- sha256 = "0nxr1hy2hlqlmxaf2n8l8qkb1jk2rb8y6p4076zyhmg8lgn8gs8a";
+ rev = "797f15afd80dcfe213d421e969f9f5f62af3a728";
+ sha256 = "1zi6f7yabz9bvzyj2zwrl5fwbnzjhalacqznj09n8a4l0gxm0x7j";
};
meta.homepage = "https://github.com/wbthomason/packer.nvim/";
};
@@ -4704,12 +4704,12 @@ final: prev:
plenary-nvim = buildVimPluginFrom2Nix {
pname = "plenary.nvim";
- version = "2021-10-18";
+ version = "2021-10-21";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "plenary.nvim";
- rev = "901b96d37a30be0504c97cc2c05d3a99b4cca842";
- sha256 = "14nkpj4x9213waqsy93sdgnll42s4dxxpq5kv6g8w015drjrbwhv";
+ rev = "de5acdcb595f0a97bec874693008c94f94b57060";
+ sha256 = "1g0j2nnmnfkmbirpqg751pl1qxrbx6fx39r9ak0f7sl9rm8322s7";
};
meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
};
@@ -4753,12 +4753,12 @@ final: prev:
presence-nvim = buildVimPluginFrom2Nix {
pname = "presence.nvim";
- version = "2021-09-28";
+ version = "2021-10-19";
src = fetchFromGitHub {
owner = "andweeb";
repo = "presence.nvim";
- rev = "84bf65287f32a9dbb9fd802f05f14bc688abc587";
- sha256 = "0935j9s1mvgiwvxsaj6qiyycqa8drizlqw5969hrj61g7dnl2vp9";
+ rev = "11adcec0db647625c5f4876257d2764db4621662";
+ sha256 = "0jzks4nvsw69g0gvrb8qpqszhd957fmx0ly9a11h2m5wry179ppp";
};
meta.homepage = "https://github.com/andweeb/presence.nvim/";
};
@@ -4981,24 +4981,24 @@ final: prev:
refactoring-nvim = buildVimPluginFrom2Nix {
pname = "refactoring.nvim";
- version = "2021-10-11";
+ version = "2021-10-20";
src = fetchFromGitHub {
owner = "theprimeagen";
repo = "refactoring.nvim";
- rev = "3990e5b3609bd883fdc432082f5e1c467ae7d615";
- sha256 = "0hh4wysfm1p8kkh6ji27vmvxvg2nm7fnkicaby6y88v0zf5scham";
+ rev = "b572093519ccfae919e8d0d1e85fbbd11a1b127c";
+ sha256 = "1n7qi7xsg34x3dgbl5qbmsgkfdrscgfddn2rpimvcc6krdr1jzn2";
};
meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";
};
registers-nvim = buildVimPluginFrom2Nix {
pname = "registers.nvim";
- version = "2021-10-18";
+ version = "2021-10-22";
src = fetchFromGitHub {
owner = "tversteeg";
repo = "registers.nvim";
- rev = "35227ec930cfa836f9a82bfdc3afc302b68a372f";
- sha256 = "1pcc5bhacs6h0bxr3ksr6bwdgl75irqwmiwk4l3dwifdj1arhvq7";
+ rev = "4d1f3525c6f9be4297e99e6aed515af3677d7241";
+ sha256 = "1lw8nwa8z8d8r1i9wg0mm4qdfv17ijzw7iadg2n980dkl6clh1ag";
};
meta.homepage = "https://github.com/tversteeg/registers.nvim/";
};
@@ -5041,12 +5041,12 @@ final: prev:
rnvimr = buildVimPluginFrom2Nix {
pname = "rnvimr";
- version = "2021-09-23";
+ version = "2021-10-21";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "rnvimr";
- rev = "ad2d155d7e1a633a597ed3b01e5a8eb084471620";
- sha256 = "1h9d1pqqs1vzk8qiqzjpycv880m3amb1synfp0sl43a1lbavk8qr";
+ rev = "58fe5d6fae9a56e8d16a5184a12eff322803108d";
+ sha256 = "0q5pji0iwawzqq0g97vd816bj6p8p8i59wwlwvc0vnf21cfrmymz";
};
meta.homepage = "https://github.com/kevinhwang91/rnvimr/";
};
@@ -5089,12 +5089,12 @@ final: prev:
rust-tools-nvim = buildVimPluginFrom2Nix {
pname = "rust-tools.nvim";
- version = "2021-10-16";
+ version = "2021-10-22";
src = fetchFromGitHub {
owner = "simrat39";
repo = "rust-tools.nvim";
- rev = "441e0104648e1bae89e3eac6857590a64f17583d";
- sha256 = "13g6vlg3r49vmzl0q6z2mqwz2p2chcjc74bfgn89c284bjri8x94";
+ rev = "04e471c8ba7b32ebc2a127ed7cb8a9e48788a898";
+ sha256 = "1h38zxnsdzswrdibwlxadb7ba6207n3v4q1lxi8k702z8p6ls5p6";
};
meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";
};
@@ -5559,12 +5559,12 @@ final: prev:
sved = buildVimPluginFrom2Nix {
pname = "sved";
- version = "2019-01-25";
+ version = "2021-10-22";
src = fetchFromGitHub {
owner = "peterbjorgensen";
repo = "sved";
- rev = "3362db72447e8ac812c7299c15ecfc9f41341713";
- sha256 = "1r2nv069d6r2q6gbiz795x94mfjm9hnv05zka085hhq9a3yf1pgx";
+ rev = "2f98472720d0e0c7da5a93b4ab4574f75747f693";
+ sha256 = "070fzga0b039wjhfzb7s0s422kv3as7ifv94ma6vh62ml6zm6mpl";
};
meta.homepage = "https://github.com/peterbjorgensen/sved/";
};
@@ -5583,12 +5583,12 @@ final: prev:
symbols-outline-nvim = buildVimPluginFrom2Nix {
pname = "symbols-outline.nvim";
- version = "2021-10-06";
+ version = "2021-10-21";
src = fetchFromGitHub {
owner = "simrat39";
repo = "symbols-outline.nvim";
- rev = "a1bbef84b7c7240f88092c57732c5b8eb6f48234";
- sha256 = "0vai0p365hwjs8vzadfgx66ax6jdx6pivfzzjr5v63c83kc466hq";
+ rev = "552b67993ed959993279e0b0f8a1da9f3c5e6fc0";
+ sha256 = "051505dmgcl3hgkmbaszz5l8m9j0fx4jwc2xffgkryxgqwsm4j8s";
};
meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/";
};
@@ -5861,12 +5861,12 @@ final: prev:
telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope.nvim";
- version = "2021-10-12";
+ version = "2021-10-21";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
- rev = "b5c63c6329cff8dd8e23047eecd1f581379f1587";
- sha256 = "16xd50ihmdlsbjidykqc53zk98vc0yfpj7rkmyha2jkvanxy53yh";
+ rev = "f56222738b719f5ae94ed85fdf080690371da0b9";
+ sha256 = "0sprnp1636srwa0vs93af3qbrqnhxdmrb6vmagdr66ypk8fpbibg";
};
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
};
@@ -5981,12 +5981,12 @@ final: prev:
todo-comments-nvim = buildVimPluginFrom2Nix {
pname = "todo-comments.nvim";
- version = "2021-08-05";
+ version = "2021-10-22";
src = fetchFromGitHub {
owner = "folke";
repo = "todo-comments.nvim";
- rev = "808a2e524b3720804716a99fd900986b9d727d4d";
- sha256 = "1j1ls4d6c3shbm9pd0b6lwmccxsvlr8j12c3fhn9q6dizkir08qx";
+ rev = "9983edc5ef38c7a035c17c85f60ee13dbd75dcc8";
+ sha256 = "177syll14r0s7hbdv34rnjwc1r8gg7avcz6g9g08j1qzbb3sijh3";
};
meta.homepage = "https://github.com/folke/todo-comments.nvim/";
};
@@ -6018,12 +6018,12 @@ final: prev:
tokyonight-nvim = buildVimPluginFrom2Nix {
pname = "tokyonight.nvim";
- version = "2021-08-30";
+ version = "2021-10-22";
src = fetchFromGitHub {
owner = "folke";
repo = "tokyonight.nvim";
- rev = "eede574f9ef57137e6d7e4bab37b09db636c5a56";
- sha256 = "06hhg5n8k9iri3mlgbf80hwz9qwjkvvl6x5f6kjih7klzcx6x04j";
+ rev = "2981e4bd0919305675d8d665f9a20281bb33ed06";
+ sha256 = "15kv5g1srqsayryf3x469sl2bgaq69ni31imp7yi7dfvmzlxf6q1";
};
meta.homepage = "https://github.com/folke/tokyonight.nvim/";
};
@@ -6066,12 +6066,12 @@ final: prev:
trouble-nvim = buildVimPluginFrom2Nix {
pname = "trouble.nvim";
- version = "2021-08-05";
+ version = "2021-10-22";
src = fetchFromGitHub {
owner = "folke";
repo = "trouble.nvim";
- rev = "51dd9175eb506b026189c70f81823dfa77defe86";
- sha256 = "0cd3xiiwsqivy8vx408wdz622i7kcvxw6whmkm1dcw6lnsp4bcg1";
+ rev = "d40695ee07736d16bd764afb48faa193a33641ac";
+ sha256 = "0fqdrp4xyfzb6ch0p1dqlk5sa8xf6rf25kbfn63acjp5c23g6rl1";
};
meta.homepage = "https://github.com/folke/trouble.nvim/";
};
@@ -6834,12 +6834,12 @@ final: prev:
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
- version = "2021-09-26";
+ version = "2021-10-19";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
- rev = "c0cb720b416d9641f37c11abd9bcc005cfe4d8cd";
- sha256 = "1zw9ygsmzs6n30vra8yxz2rglh5gm6zv81hvfrbvhmvw3cyz7yxf";
+ rev = "582ced5e7b75d68418ae893b346aac3123b9a31e";
+ sha256 = "1541mv5ivqj6nf79csr39pg03bm65fn9agw1wmikph3afplwx96c";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@@ -7458,12 +7458,12 @@ final: prev:
vim-exchange = buildVimPluginFrom2Nix {
pname = "vim-exchange";
- version = "2020-12-16";
+ version = "2021-10-21";
src = fetchFromGitHub {
owner = "tommcdo";
repo = "vim-exchange";
- rev = "17f1a2cc0d009cfd7f0dcda06dd0f017fcc1c70b";
- sha256 = "0c4s9cmyx1myqz9k35waply2mv0yr3agpkv64ndhwgqbmlxyifnj";
+ rev = "784d63083ad7d613aa96f00021cd0dfb126a781a";
+ sha256 = "15bwlky7if7jp3g3banxi2kkci1wa54y36b4m27mggsc6kdabd6q";
};
meta.homepage = "https://github.com/tommcdo/vim-exchange/";
};
@@ -7638,12 +7638,12 @@ final: prev:
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
- version = "2021-10-18";
+ version = "2021-10-19";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
- rev = "4d29c1d6a0def18923b4762c8f85ca3ee5ae6c83";
- sha256 = "1m8qw6pqgyvfnbph8xwpsvgwdyapsg2abxbpqvsjhcg6ylbxfx17";
+ rev = "30933405bbc77877d714260f4ad1cd4dadf34532";
+ sha256 = "147dpafl5g5h1y47gry26lqw6b7c480qddam1l5npp5bnv58swv4";
};
meta.homepage = "https://github.com/tpope/vim-fugitive/";
};
@@ -7770,12 +7770,12 @@ final: prev:
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
- version = "2021-10-17";
+ version = "2021-10-19";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
- rev = "66ce1595569513a23e3e0dc7aeb8bcacec3b220c";
- sha256 = "0bcbrbyqbn993g1i5py2ix8rnsvcxzyhn9fbk7c08257l2i7cc6x";
+ rev = "d317e93675df73feaa2aa32f4cb8f77feeb7114a";
+ sha256 = "0a2xv161kxqjgqvp72ha0gndqvv8f4rrzgiph1lpqbrfhp9jiqci";
};
meta.homepage = "https://github.com/fatih/vim-go/";
};
@@ -8504,12 +8504,12 @@ final: prev:
vim-lsp-cxx-highlight = buildVimPluginFrom2Nix {
pname = "vim-lsp-cxx-highlight";
- version = "2021-10-18";
+ version = "2021-10-20";
src = fetchFromGitHub {
owner = "jackguo380";
repo = "vim-lsp-cxx-highlight";
- rev = "679db721db12c2a1c3ae7addf2cc17ae9a26cf08";
- sha256 = "064sqa11hnnxj6fnnp9dvd7m367ywg6vzwvqxawqv3cwvgr7123w";
+ rev = "0e7476ff41cd65e55f92fdbc7326335ec33b59b0";
+ sha256 = "02gyxhx39zqphqybsj8sgg70ilgcp0jaj9lcmyyivljg0qirnxhf";
};
meta.homepage = "https://github.com/jackguo380/vim-lsp-cxx-highlight/";
};
@@ -8601,12 +8601,12 @@ final: prev:
vim-matchup = buildVimPluginFrom2Nix {
pname = "vim-matchup";
- version = "2021-10-11";
+ version = "2021-10-21";
src = fetchFromGitHub {
owner = "andymass";
repo = "vim-matchup";
- rev = "d0a84be64812f20d92fcd573980f0bc86e7c9bf5";
- sha256 = "19sks7zai88mw0fvr8ksbwmzf1k34kv7kbkkr1xiqw82zkp7b544";
+ rev = "42c91ec8cc69f47c384c9b9e0aa12918da2e313c";
+ sha256 = "151xx3v95g0qlvxc8k52crnvakvjf0yq25qygwbp5bwh1jf1fbkd";
};
meta.homepage = "https://github.com/andymass/vim-matchup/";
};
@@ -9225,12 +9225,12 @@ final: prev:
vim-projectionist = buildVimPluginFrom2Nix {
pname = "vim-projectionist";
- version = "2021-04-05";
+ version = "2021-10-19";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-projectionist";
- rev = "8dda7acb7e24b44ef691ba19b35f585e97e91b30";
- sha256 = "0laqkgwv6hq1ix3kahvx0sfb8c7ifx61z2n4npqswpn0ri4ckd2j";
+ rev = "438b58aab54624e554d71063a69ba3d1e1bfbc2f";
+ sha256 = "1x9x7nb1r4x1lyj16l337dflccx7mbkqrhk7pz02zqnb7qip032f";
};
meta.homepage = "https://github.com/tpope/vim-projectionist/";
};
@@ -9393,12 +9393,12 @@ final: prev:
vim-rails = buildVimPluginFrom2Nix {
pname = "vim-rails";
- version = "2021-08-21";
+ version = "2021-10-19";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-rails";
- rev = "03a5c3e85411db1488cdfd1029d2a91f9327c8a2";
- sha256 = "0x72948i7ilzavf3922hl5d5vmq57f8a7zazpvlmnzs0msvvqzwr";
+ rev = "a4595b48a83824e36c1ebe48b574aa8624632695";
+ sha256 = "1czfv1v7vp2br8mpbb5zpi6rrzfrqr7mq5q4xa3n7b9lhdjw6r4i";
};
meta.homepage = "https://github.com/tpope/vim-rails/";
};
@@ -10654,12 +10654,12 @@ final: prev:
vimspector = buildVimPluginFrom2Nix {
pname = "vimspector";
- version = "2021-10-15";
+ version = "2021-10-20";
src = fetchFromGitHub {
owner = "puremourning";
repo = "vimspector";
- rev = "3aab9711c06186fc8205e920a82f9e357be66666";
- sha256 = "16wssm6b0fsj45h4354xbwjz02gg0kasw7907hdhi4jyhpnn0xxs";
+ rev = "c1fca028b3f15779a6447c8be65dbdb9acce31ef";
+ sha256 = "0bq0i1skyrvbbksz3wv8l2021bxxzqbv8q56fc1mi1j9rj8bc459";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/puremourning/vimspector/";
@@ -10667,12 +10667,12 @@ final: prev:
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
- version = "2021-10-17";
+ version = "2021-10-21";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
- rev = "0824ade4187472fcdc1634f462da84b3cfc5931f";
- sha256 = "0p7308x3yy9n43jhpggqb1vmz39k00ckx3svpxbckwh9y21hjxnc";
+ rev = "60bec44a17f72f9bfbc04d1ea9e6f7752e240502";
+ sha256 = "1h7rp0fsc49af531d7hv8v738s07fv17xx6xlpkixi4rydlsmbv1";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};
@@ -10775,24 +10775,24 @@ final: prev:
which-key-nvim = buildVimPluginFrom2Nix {
pname = "which-key.nvim";
- version = "2021-08-05";
+ version = "2021-10-22";
src = fetchFromGitHub {
owner = "folke";
repo = "which-key.nvim";
- rev = "b582c9d78f0d105041ed29ec3a8ee11d98ddfd50";
- sha256 = "00k4x121v5zmd70xn24ipiqnpvzlvbv5p089mxsd0wpkng3q31ks";
+ rev = "d3032b6d3e0adb667975170f626cb693bfc66baa";
+ sha256 = "1jcaxljrknwh73i2s9vd6c5bly1x8gb7j09c8rixb2qwzz0fc0ls";
};
meta.homepage = "https://github.com/folke/which-key.nvim/";
};
wilder-nvim = buildVimPluginFrom2Nix {
pname = "wilder.nvim";
- version = "2021-10-11";
+ version = "2021-10-20";
src = fetchFromGitHub {
owner = "gelguy";
repo = "wilder.nvim";
- rev = "52ff550ef05a0110f4decc4629e0a58b94ca97b8";
- sha256 = "1xwn6jcgf1wbyzsm64n51m82xpy8s6k7yhyvd7c8byp2gbh7z0r8";
+ rev = "e08642c862bd73828f50c4f701286cae3c81fe4f";
+ sha256 = "0v8jfldjvg7rybs2jgyzrv2mfbda5rgd3x2g4zz8kli6p1513zfp";
};
meta.homepage = "https://github.com/gelguy/wilder.nvim/";
};
@@ -10908,12 +10908,12 @@ final: prev:
YouCompleteMe = buildVimPluginFrom2Nix {
pname = "YouCompleteMe";
- version = "2021-10-16";
+ version = "2021-10-20";
src = fetchFromGitHub {
owner = "ycm-core";
repo = "YouCompleteMe";
- rev = "69430d7ee6f204e0148102ba9c1b9b31a6315cf8";
- sha256 = "1qqjnhybzf34xmzhhjk5zwv2aly2my51f4r81h54q5xqmkk05sgc";
+ rev = "f35a30d4e22783050944c89b666e481d016cd4e1";
+ sha256 = "1daj2p2gcpyasdik6chib7crz5spi410fy8vdd84xaak8g9s2b9b";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 887a0fb1778d..cc12ff401fae 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -496,10 +496,6 @@ self: super: {
});
});
- onedark-nvim = super.onedark-nvim.overrideAttrs (old: {
- dependencies = with self; [ lush-nvim ];
- });
-
onehalf = super.onehalf.overrideAttrs (old: {
configurePhase = "cd vim";
});
@@ -724,7 +720,7 @@ self: super: {
libiconv
];
- cargoSha256 = "sha256-zg8PKuzC1srCOtn0ZcqI9cZxMwN9hsf+sNhYgDg93Gs=";
+ cargoSha256 = "sha256-DiCQpgyz0iNEm6gjaJU5IGdsQISHhPqlDQBzZafngjY=";
};
in
''
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index e4dbfb9f43e5..a903f12a8a1b 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -223,7 +223,6 @@ hecal3/vim-leader-guide
henrik/vim-indexed-search
HerringtonDarkholme/yats.vim
honza/vim-snippets
-hoob3rt/lualine.nvim
hotwatermorning/auto-git-diff
hrsh7th/cmp-buffer@main
hrsh7th/cmp-calc@main
@@ -527,6 +526,7 @@ nvim-lua/lsp-status.nvim
nvim-lua/lsp_extensions.nvim
nvim-lua/plenary.nvim
nvim-lua/popup.nvim
+nvim-lualine/lualine.nvim
nvim-neorg/neorg@main
nvim-telescope/telescope-cheat.nvim
nvim-telescope/telescope-dap.nvim
@@ -551,7 +551,7 @@ ojroques/nvim-bufdel@main
ojroques/vim-oscyank@main
Olical/aniseed
Olical/conjure
-olimorris/onedark.nvim
+olimorris/onedarkpro.nvim@main
onsails/diaglist.nvim
onsails/lspkind-nvim
OrangeT/vim-csharp
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 7fc03228f60d..fa319dbab8fd 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -1082,6 +1082,18 @@ let
};
};
+ mhutchie.git-graph = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "git-graph";
+ publisher = "mhutchie";
+ version = "1.30.0";
+ sha256 = "sha256-sHeaMMr5hmQ0kAFZxxMiRk6f0mfjkg2XMnA4Gf+DHwA=";
+ };
+ meta = {
+ license = lib.licenses.mit;
+ };
+ };
+
mikestead.dotenv = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "dotenv";
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 019a8698c088..0e48b2460bc8 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -412,7 +412,7 @@ let
CIFS_POSIX = option yes;
CIFS_FSCACHE = yes;
CIFS_STATS = whenOlder "4.19" yes;
- CIFS_WEAK_PW_HASH = yes;
+ CIFS_WEAK_PW_HASH = whenOlder "5.15" yes;
CIFS_UPCALL = yes;
CIFS_ACL = whenOlder "5.3" yes;
CIFS_DFS_UPCALL = yes;
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 2caea08416ea..0754ff335bae 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -3,15 +3,15 @@
with lib;
buildLinux (args // rec {
- version = "5.13-rc6";
- extraMeta.branch = "5.12";
+ version = "5.15-rc6";
+ extraMeta.branch = lib.versions.majorMinor version;
# modDirVersion needs to be x.y.z, will always add .0
modDirVersion = if (modDirVersionArg == null) then builtins.replaceStrings ["-"] [".0-"] version else modDirVersionArg;
src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
- sha256 = "sha256-PunFd6tOsmrsPItp2QX4TEVxHnvvi1BMSwWio/DTlMU=";
+ sha256 = "1lp3jqwsbd97k3bx4crs8rc2wssyaf0v8x4kl4zv7g7ww2kkg2ii";
};
# Should the testing kernels ever be built on Hydra?
diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index e10af3abf923..bfe888c6e448 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -9,11 +9,11 @@
with lib;
stdenv.mkDerivation rec {
pname = "lxc";
- version = "4.0.10";
+ version = "4.0.11";
src = fetchurl {
url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz";
- sha256 = "1sgsic9dzj3wv2k5bx2vhcgappivhp1glkqfc2yrgr6jas052351";
+ sha256 = "0b7hv4n8b3lndhr0jf9j1gkbzxm8897a1myjsfgwzad9gkhq395g";
};
nativeBuildInputs = [
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 5cc4b49bacd4..e66f138c66cb 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -845,7 +845,7 @@
"syncthing" = ps: with ps; [ aiosyncthing ];
"syncthru" = ps: with ps; [ pysyncthru url-normalize ];
"synology_chat" = ps: with ps; [ ];
- "synology_dsm" = ps: with ps; [ ]; # missing inputs: py-synologydsm-api
+ "synology_dsm" = ps: with ps; [ py-synologydsm-api ];
"synology_srm" = ps: with ps; [ ]; # missing inputs: synology-srm
"syslog" = ps: with ps; [ ];
"system_bridge" = ps: with ps; [ aiohttp-cors ifaddr systembridge zeroconf ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index ef1ce97ae74c..8bc4a292d8bd 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -640,6 +640,7 @@ in with py.pkgs; buildPythonApplication rec {
"switcher_kis"
"syncthing"
"syncthru"
+ "synology_dsm"
"system_health"
"system_log"
"tado"
diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix
index d2b46097ac10..3bda53ad1404 100644
--- a/pkgs/servers/hqplayerd/default.nix
+++ b/pkgs/servers/hqplayerd/default.nix
@@ -1,5 +1,6 @@
{ stdenv
, alsa-lib
+, addOpenGLRunpath
, autoPatchelfHook
, cairo
, fetchurl
@@ -28,7 +29,7 @@ stdenv.mkDerivation rec {
${rpmextract}/bin/rpmextract $src
'';
- nativeBuildInputs = [ autoPatchelfHook rpmextract ];
+ nativeBuildInputs = [ addOpenGLRunpath autoPatchelfHook rpmextract ];
buildInputs = [
alsa-lib
@@ -86,8 +87,12 @@ stdenv.mkDerivation rec {
--replace "NetworkManager-wait-online.service" ""
'';
- postFixup = ''
- patchelf --replace-needed libomp.so.5 libomp.so $out/bin/hqplayerd
+ # NB: addOpenGLRunpath needs to run _after_ autoPatchelfHook, which runs in
+ # postFixup, so we tack it on here.
+ doInstallCheck = true;
+ installCheckPhase = ''
+ addOpenGLRunpath $out/bin/hqplayerd
+ $out/bin/hqplayerd --version
'';
meta = with lib; {
diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix
index d08161c76b24..4503d362dc63 100644
--- a/pkgs/servers/http/unit/default.nix
+++ b/pkgs/servers/http/unit/default.nix
@@ -7,7 +7,6 @@
, withPerl532 ? false, perl532
, withPerl534 ? true, perl534
, withPerldevel ? false, perldevel
-, withRuby_2_6 ? true, ruby_2_6
, withRuby_2_7 ? false, ruby_2_7
, withSSL ? true, openssl ? null
, withIPv6 ? true
@@ -50,7 +49,6 @@ in stdenv.mkDerivation rec {
++ optional withPerl532 perl532
++ optional withPerl534 perl534
++ optional withPerldevel perldevel
- ++ optional withRuby_2_6 ruby_2_6
++ optional withRuby_2_7 ruby_2_7
++ optional withSSL openssl;
@@ -75,7 +73,6 @@ in stdenv.mkDerivation rec {
${optionalString withPerl532 "./configure perl --module=perl532 --perl=${perl532}/bin/perl"}
${optionalString withPerl534 "./configure perl --module=perl534 --perl=${perl534}/bin/perl"}
${optionalString withPerldevel "./configure perl --module=perldev --perl=${perldevel}/bin/perl"}
- ${optionalString withRuby_2_6 "./configure ruby --module=ruby26 --ruby=${ruby_2_6}/bin/ruby"}
${optionalString withRuby_2_7 "./configure ruby --module=ruby27 --ruby=${ruby_2_7}/bin/ruby"}
'';
diff --git a/pkgs/servers/piping-server-rust/default.nix b/pkgs/servers/piping-server-rust/default.nix
new file mode 100644
index 000000000000..f37dbee8eb39
--- /dev/null
+++ b/pkgs/servers/piping-server-rust/default.nix
@@ -0,0 +1,24 @@
+{ lib, rustPlatform, fetchFromGitHub }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "piping-server-rust";
+ version = "0.9.1";
+
+ src = fetchFromGitHub {
+ owner = "nwtgck";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "16jzl0nk14gzb5kvilr17f02b41ma7xwh8y0g42pm9sb7jdbcn7g";
+ };
+
+ cargoSha256 = "sha256-SDAxXYX51/4S7zRTdNZK9uSjKHKrAXpDJgRRDyu6qug=";
+
+ meta = with lib; {
+ description = "Infinitely transfer between every device over pure HTTP with pipes or browsers";
+ homepage = "https://github.com/nwtgck/piping-server-rust";
+ changelog = "https://github.com/nwtgck/piping-server-rust/blob/v${version}/CHANGELOG.md";
+ license = licenses.mit;
+ maintainers = with maintainers; [ figsoda ];
+ mainProgram = "piping-server";
+ };
+}
diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix
index 9cca7c8374bd..1986ed681997 100644
--- a/pkgs/servers/sql/postgresql/packages.nix
+++ b/pkgs/servers/sql/postgresql/packages.nix
@@ -1,8 +1,6 @@
self: super: {
- age = super.callPackage ./ext/age.nix {
- bison = self.bison_3_5;
- };
+ age = super.callPackage ./ext/age.nix { };
periods = super.callPackage ./ext/periods.nix { };
diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix
index 592b981dd772..587cb363fc6e 100644
--- a/pkgs/servers/web-apps/discourse/default.nix
+++ b/pkgs/servers/web-apps/discourse/default.nix
@@ -266,6 +266,11 @@ let
# Make sure the notification email setting applies
./notification_email.patch
+
+ # Change the path to the public directory reported by Discourse
+ # to its real path instead of the symlink in the store, since
+ # the store path won't be matched by any nginx rules
+ ./public_dir_path.patch
];
postPatch = ''
diff --git a/pkgs/servers/web-apps/discourse/public_dir_path.patch b/pkgs/servers/web-apps/discourse/public_dir_path.patch
new file mode 100644
index 000000000000..0c6579736e22
--- /dev/null
+++ b/pkgs/servers/web-apps/discourse/public_dir_path.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/file_store/local_store.rb b/lib/file_store/local_store.rb
+index 25649532c0..614e062dc1 100644
+--- a/lib/file_store/local_store.rb
++++ b/lib/file_store/local_store.rb
+@@ -88,7 +88,7 @@ module FileStore
+ end
+
+ def public_dir
+- File.join(Rails.root, "public")
++ "/run/discourse/public"
+ end
+
+ def tombstone_dir
diff --git a/pkgs/shells/hilbish/default.nix b/pkgs/shells/hilbish/default.nix
index a4a54e45c636..f7e33b88cecc 100644
--- a/pkgs/shells/hilbish/default.nix
+++ b/pkgs/shells/hilbish/default.nix
@@ -2,26 +2,25 @@
buildGoModule rec {
pname = "hilbish";
- version = "0.6.0";
+ version = "0.6.1";
src = fetchFromGitHub {
owner = "Rosettea";
repo = "Hilbish";
rev = "v${version}";
- sha256 = "sha256-ACHHHGT3VGnvZVi1UZb57+g/slcld5e3bh+DDhUVVpQ=";
+ sha256 = "sha256-3qU1gQSWxyKgQcHgT61Q+n6u0rGU0vqTdT/VwMN20yw=";
fetchSubmodules = true;
};
- vendorSha256 = "sha256-SVGPMFpQjVOWCfiPpEmqhp6MEO0wqeyAZVyeNmTuXl0=";
+ vendorSha256 = "sha256-xnq0CEfz9uVpDkqY5/Sw9O5uMTHV74vQBXrav3bbH7E=";
buildInputs = [ readline ];
- ldflags = [ "-s" "-w" ];
-
- postPatch = ''
- substituteInPlace vars_linux.go \
- --replace "/usr/share" "${placeholder "out"}/share/"
- '';
+ ldflags = [
+ "-s"
+ "-w"
+ "-X main.dataDir=${placeholder "out"}/share/hilbish"
+ ];
postInstall = ''
mkdir -p "$out/share/hilbish"
diff --git a/pkgs/tools/admin/winbox/default.nix b/pkgs/tools/admin/winbox/default.nix
new file mode 100644
index 000000000000..c8595ee10726
--- /dev/null
+++ b/pkgs/tools/admin/winbox/default.nix
@@ -0,0 +1,79 @@
+{ lib
+, stdenv
+, fetchurl
+, makeDesktopItem
+, makeWrapper
+, symlinkJoin
+, writeShellScriptBin
+
+, wine
+, use64 ? false
+}:
+
+let
+ inherit (lib) last splitString;
+
+ pname = "winbox";
+ version = "3.31";
+ name = "${pname}-${version}";
+
+ executable = fetchurl (if use64 then {
+ url = "https://download.mikrotik.com/winbox/${version}/${pname}64.exe";
+ sha256 = "sha256-aE6RZ2bCYahxH5QWxBH4CJOjW9dbzibx8zQ4Z5652V4=";
+ } else {
+ url = "https://download.mikrotik.com/winbox/${version}/${pname}.exe";
+ sha256 = "sha256-yyKiU5xJlp/VQVYuX79pdCEve63yV3SUzi+/c915gAc=";
+ });
+ # This is from the winbox AUR package:
+ # https://aur.archlinux.org/cgit/aur.git/tree/winbox64?h=winbox64&id=8edd93792af84e87592e8645ca09e9795931e60e
+ wrapper = writeShellScriptBin pname ''
+ export WINEPREFIX="''${WINBOX_HOME:-"''${XDG_DATA_HOME:-"''${HOME}/.local/share"}/winbox"}/wine"
+ export WINEARCH=${if use64 then "win64" else "win32"}
+ export WINEDLLOVERRIDES="mscoree=" # disable mono
+ export WINEDEBUG=-all
+ if [ ! -d "$WINEPREFIX" ] ; then
+ mkdir -p "$WINEPREFIX"
+ ${wine}/bin/wineboot -u
+ fi
+
+ ${wine}/bin/wine ${executable} "$@"
+ '';
+
+ desktopItem = makeDesktopItem {
+ name = pname;
+ desktopName = "Winbox";
+ comment = "GUI administration for Mikrotik RouterOS";
+ exec = pname;
+ icon = pname;
+ type = "Application";
+ categories = "Utility";
+ extraDesktopEntries = {
+ StartupWMClass = last (splitString "/" executable);
+ };
+ };
+
+ # The icon is also from the winbox AUR package (see above).
+ icon = fetchurl {
+ name = "winbox.png";
+ url = "https://aur.archlinux.org/cgit/aur.git/plain/winbox.png?h=winbox";
+ sha256 = "sha256-YD6u2N+1thRnEsXO6AHm138fRda9XEtUX5+EGTg004A=";
+ };
+in
+symlinkJoin {
+ inherit name pname version;
+ paths = [ wrapper desktopItem ];
+
+ postBuild = ''
+ mkdir -p "$out/share/pixmaps"
+ ln -s "${icon}" "$out/share/pixmaps/${pname}.png"
+ '';
+
+ meta = with lib; {
+ description = "Graphical configuration utility for RouterOS-based devices";
+ homepage = "https://mikrotik.com";
+ downloadPage = "https://mikrotik.com/download";
+ changelog = "https://wiki.mikrotik.com/wiki/Winbox_changelog";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ yrd ];
+ };
+}
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 37ea9ebd026c..bdac532f07e1 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -9,11 +9,11 @@
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
python3Packages.buildPythonApplication rec {
pname = "diffoscope";
- version = "187";
+ version = "188";
src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
- sha256 = "sha256-oXWdXJhf8OOxBcLumjeWW0Xev0LjcTScAw9baDOs6ls=";
+ sha256 = "sha256-kB3EnmnQYqal4cdzwArH+QdHe5wnUOnbjbQAz52g1Us=";
};
outputs = [ "out" "man" ];
diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix
index 9457507458d8..e4ca354e4a3f 100644
--- a/pkgs/tools/misc/ethtool/default.nix
+++ b/pkgs/tools/misc/ethtool/default.nix
@@ -1,22 +1,32 @@
-{ lib, stdenv, fetchurl, pkg-config, libmnl }:
+{ lib
+, stdenv
+, fetchurl
+, libmnl
+, pkg-config
+}:
stdenv.mkDerivation rec {
pname = "ethtool";
- version = "5.13";
+ version = "5.14";
src = fetchurl {
url = "mirror://kernel/software/network/${pname}/${pname}-${version}.tar.xz";
- sha256 = "1wwcwiav0fbl75axmx8wms4xfdp1ji5c7j49k4yl8bngqra74fp6";
+ sha256 = "sha256-uxPbkZFcrNekkrZbZd8Hpn5Ll03b6vdiBbGUWiPSdoY=";
};
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ libmnl ];
+ nativeBuildInputs = [
+ pkg-config
+ ];
+
+ buildInputs = [
+ libmnl
+ ];
meta = with lib; {
description = "Utility for controlling network drivers and hardware";
homepage = "https://www.kernel.org/pub/software/network/ethtool/";
- license = licenses.gpl2;
+ license = licenses.gpl2Plus;
platforms = platforms.linux;
- maintainers = [ maintainers.bjornfor ];
+ maintainers = with maintainers; [ bjornfor ];
};
}
diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix
index 0182440a8eb7..65adb3c5eb89 100644
--- a/pkgs/tools/networking/miniupnpc/default.nix
+++ b/pkgs/tools/networking/miniupnpc/default.nix
@@ -19,7 +19,9 @@ let
makeFlags = [ "PREFIX=$(out)" "INSTALLPREFIX=$(out)" ];
- postInstall = ''chmod +x "$out"/lib/libminiupnpc.so'';
+ postInstall = ''
+ chmod +x "$out"/lib/libminiupnpc${stdenv.hostPlatform.extensions.sharedLibrary}
+ '';
meta = with lib; {
homepage = "http://miniupnp.free.fr/";
diff --git a/pkgs/tools/networking/p2p/jesec-rtorrent/default.nix b/pkgs/tools/networking/p2p/jesec-rtorrent/default.nix
new file mode 100644
index 000000000000..56fec5333fc7
--- /dev/null
+++ b/pkgs/tools/networking/p2p/jesec-rtorrent/default.nix
@@ -0,0 +1,9 @@
+{ lib
+, pkgs
+, callPackage
+}:
+
+rec {
+ libtorrent = callPackage ./libtorrent.nix { };
+ rtorrent = callPackage ./rtorrent.nix { };
+}
diff --git a/pkgs/tools/networking/p2p/jesec-rtorrent/libtorrent.nix b/pkgs/tools/networking/p2p/jesec-rtorrent/libtorrent.nix
new file mode 100644
index 000000000000..08b646421b88
--- /dev/null
+++ b/pkgs/tools/networking/p2p/jesec-rtorrent/libtorrent.nix
@@ -0,0 +1,44 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, gtest
+, openssl
+, zlib
+}:
+
+stdenv.mkDerivation rec {
+ pname = "jesec-libtorrent";
+ version = "0.13.8-r3";
+
+ src = fetchFromGitHub {
+ owner = "jesec";
+ repo = "libtorrent";
+ rev = "v${version}";
+ hash = "sha256-S3DOKzXkvU+ZJxfrxwLXCVBnepzmiZ+3iiQqz084BEk=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ ];
+ buildInputs = [
+ openssl
+ zlib
+ ];
+
+ doCheck = true;
+ preCheck = ''
+ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD
+ '';
+ checkInputs = [
+ gtest
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/jesec/libtorrent";
+ description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code (jesec's fork)";
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ winterqt AndersonTorres ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/tools/networking/p2p/rtorrent-jesec/default.nix b/pkgs/tools/networking/p2p/jesec-rtorrent/rtorrent.nix
similarity index 52%
rename from pkgs/tools/networking/p2p/rtorrent-jesec/default.nix
rename to pkgs/tools/networking/p2p/jesec-rtorrent/rtorrent.nix
index eeff6e91399d..3e69e64de35b 100644
--- a/pkgs/tools/networking/p2p/rtorrent-jesec/default.nix
+++ b/pkgs/tools/networking/p2p/jesec-rtorrent/rtorrent.nix
@@ -2,40 +2,48 @@
, stdenv
, fetchFromGitHub
, cmake
-, gtest
-, libtorrent-jesec
, curl
+, gtest
+, libtorrent
, ncurses
-, xmlrpc_c
-, nlohmann_json
-, xmlRpcSupport ? true
-, jsonRpcSupport ? true
+, jsonRpcSupport ? true, nlohmann_json
+, xmlRpcSupport ? true, xmlrpc_c
}:
-let
- inherit (lib) optional;
-in
+
stdenv.mkDerivation rec {
- pname = "rtorrent-jesec";
- version = "0.9.8-r14";
+ pname = "jesec-rtorrent";
+ version = "0.9.8-r15";
src = fetchFromGitHub {
owner = "jesec";
repo = "rtorrent";
rev = "v${version}";
- sha256 = "sha256-AbjzNIha3MkCZi6MuyUfPx9r3zeXeTUzkbD7uHB85lo=";
+ hash = "sha256-yYOw8wsiQd478JijLgPtEWsw2/ewd46re+t9D705rmk=";
};
- nativeBuildInputs = [ cmake ];
- buildInputs = [ libtorrent-jesec curl ncurses ]
- ++ optional xmlRpcSupport xmlrpc_c
- ++ optional jsonRpcSupport nlohmann_json;
+ nativeBuildInputs = [
+ cmake
+ ];
+
+ buildInputs = [
+ curl
+ libtorrent
+ ncurses
+ ]
+ ++ lib.optional jsonRpcSupport nlohmann_json
+ ++ lib.optional xmlRpcSupport xmlrpc_c;
+
+ cmakeFlags = [
+ "-DUSE_RUNTIME_CA_DETECTION=NO"
+ ]
+ ++ lib.optional (!jsonRpcSupport) "-DUSE_JSONRPC=NO"
+ ++ lib.optional (!xmlRpcSupport) "-DUSE_XMLRPC=NO";
- cmakeFlags = [ "-DUSE_RUNTIME_CA_DETECTION=NO" ]
- ++ optional (!xmlRpcSupport) "-DUSE_XMLRPC=NO"
- ++ optional (!jsonRpcSupport) "-DUSE_JSONRPC=NO";
doCheck = true;
- checkInputs = [ gtest ];
+ checkInputs = [
+ gtest
+ ];
prePatch = ''
substituteInPlace src/main.cc \
@@ -51,7 +59,7 @@ stdenv.mkDerivation rec {
description = "An ncurses client for libtorrent, ideal for use with screen, tmux, or dtach (jesec's fork)";
homepage = "https://github.com/jesec/rtorrent";
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ winterqt ];
+ maintainers = with maintainers; [ winterqt AndersonTorres ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/networking/p2p/libtorrent-jesec/default.nix b/pkgs/tools/networking/p2p/libtorrent-jesec/default.nix
deleted file mode 100644
index 0fd16f4799d6..000000000000
--- a/pkgs/tools/networking/p2p/libtorrent-jesec/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, gtest, openssl, zlib }:
-
-stdenv.mkDerivation rec {
- pname = "libtorrent-jesec";
- version = "0.13.8-r2";
-
- src = fetchFromGitHub {
- owner = "jesec";
- repo = "libtorrent";
- rev = "v${version}";
- sha256 = "sha256-eIXVTbVOCRHcxSsLPvIm9F60t2upk5ORpDSOOYqTCJ4=";
- };
-
- patches = [
- (fetchpatch {
- name = "test-fallback";
- url = "https://github.com/jesec/libtorrent/commit/a38205ce06aadc9908478ec3a9c8aefd9be06344.patch";
- sha256 = "sha256-2TyQ9zYWZw6bzAfVZzTOQSkfIZnDU8ykgpRAFXscEH0=";
- })
- ];
-
- nativeBuildInputs = [ cmake ];
- buildInputs = [ openssl zlib ];
-
- doCheck = true;
- preCheck = ''
- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD
- '';
- checkInputs = [ gtest ];
-
- meta = with lib; {
- description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code (jesec's fork)";
- homepage = "https://github.com/jesec/libtorrent";
- license = licenses.gpl2Plus;
- maintainers = with maintainers; [ winterqt ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix
deleted file mode 100644
index 9a635512f04f..000000000000
--- a/pkgs/tools/networking/p2p/libtorrent/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-# NOTE: this is rakshava's version of libtorrent, used mainly by rtorrent
-# This is NOT libtorrent-rasterbar, used by Deluge, qbitttorent, and others
-{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook
-, cppunit, openssl, libsigcxx, zlib
-}:
-
-stdenv.mkDerivation rec {
- pname = "libtorrent";
- version = "0.13.8";
-
- src = fetchFromGitHub {
- owner = "rakshasa";
- repo = pname;
- rev = "v${version}";
- sha256 = "1h5y6ab3gs20yyprdfwcw8fh1c6czs4yrdj0kf54d2vp9qwz685r";
- };
-
- nativeBuildInputs = [ pkg-config autoreconfHook ];
- buildInputs = [ cppunit openssl libsigcxx zlib ];
-
- enableParallelBuilding = true;
-
- meta = with lib; {
- homepage = "https://github.com/rakshasa/libtorrent";
- description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code";
-
- platforms = platforms.unix;
- maintainers = with maintainers; [ ebzzry codyopel ];
- };
-}
diff --git a/pkgs/tools/networking/p2p/rakshasa-rtorrent/default.nix b/pkgs/tools/networking/p2p/rakshasa-rtorrent/default.nix
new file mode 100644
index 000000000000..56fec5333fc7
--- /dev/null
+++ b/pkgs/tools/networking/p2p/rakshasa-rtorrent/default.nix
@@ -0,0 +1,9 @@
+{ lib
+, pkgs
+, callPackage
+}:
+
+rec {
+ libtorrent = callPackage ./libtorrent.nix { };
+ rtorrent = callPackage ./rtorrent.nix { };
+}
diff --git a/pkgs/tools/networking/p2p/rakshasa-rtorrent/libtorrent.nix b/pkgs/tools/networking/p2p/rakshasa-rtorrent/libtorrent.nix
new file mode 100644
index 000000000000..fff4cbb36cf6
--- /dev/null
+++ b/pkgs/tools/networking/p2p/rakshasa-rtorrent/libtorrent.nix
@@ -0,0 +1,48 @@
+# Note: this is rakshasa's version of libtorrent, used mainly by rtorrent.
+# *Do not* mistake it by libtorrent-rasterbar, used by Deluge, qbitttorent etc.
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoconf-archive
+, autoreconfHook
+, cppunit
+, libsigcxx
+, openssl
+, pkg-config
+, zlib
+}:
+
+stdenv.mkDerivation rec {
+ pname = "rakshasa-libtorrent";
+ version = "0.13.8+date=2021-08-07";
+
+ src = fetchFromGitHub {
+ owner = "rakshasa";
+ repo = "libtorrent";
+ rev = "53596afc5fae275b3fb5753a4bb2a1a7f7cf6a51";
+ hash = "sha256-gyl/jfbptHz/gHkkVGWShhv1Z7o9fa9nJIz27U2A6wg=";
+ };
+
+ nativeBuildInputs = [
+ autoconf-archive
+ autoreconfHook
+ pkg-config
+ ];
+
+ buildInputs = [
+ cppunit
+ libsigcxx
+ openssl
+ zlib
+ ];
+
+ enableParallelBuilding = true;
+
+ meta = with lib; {
+ homepage = "https://github.com/rakshasa/libtorrent";
+ description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code";
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ ebzzry codyopel ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/tools/networking/p2p/rakshasa-rtorrent/rtorrent.nix b/pkgs/tools/networking/p2p/rakshasa-rtorrent/rtorrent.nix
new file mode 100644
index 000000000000..f166f6d0e29f
--- /dev/null
+++ b/pkgs/tools/networking/p2p/rakshasa-rtorrent/rtorrent.nix
@@ -0,0 +1,68 @@
+{ lib
+, stdenv
+, fetchurl
+, fetchFromGitHub
+, autoreconfHook
+, autoconf-archive
+, cppunit
+, curl
+, libsigcxx
+, libtool
+, libtorrent
+, ncurses
+, openssl
+, pkg-config
+, xmlrpc_c
+, zlib
+}:
+
+stdenv.mkDerivation rec {
+ pname = "rakshasa-rtorrent";
+ version = "0.9.8+date=2021-08-07";
+
+ src = fetchFromGitHub {
+ owner = "rakshasa";
+ repo = "rtorrent";
+ rev = "a6bc99bb821d86b3b0633552db3fbd0a22497657";
+ hash = "sha256-HTwAs8dfZVXfLRNiT6QpjKGnuahHfoMfYWqdKkedUL0=";
+ };
+
+ nativeBuildInputs = [
+ autoconf-archive
+ autoreconfHook
+ pkg-config
+ ];
+
+ buildInputs = [
+ cppunit
+ curl
+ libsigcxx
+ libtool
+ libtorrent
+ ncurses
+ openssl
+ xmlrpc_c
+ zlib
+ ];
+
+ configureFlags = [
+ "--with-xmlrpc-c"
+ "--with-posix-fallocate"
+ ];
+
+ enableParallelBuilding = true;
+
+ postInstall = ''
+ mkdir -p $out/share/man/man1 $out/share/doc/rtorrent
+ mv doc/old/rtorrent.1 $out/share/man/man1/rtorrent.1
+ mv doc/rtorrent.rc $out/share/doc/rtorrent/rtorrent.rc
+ '';
+
+ meta = with lib; {
+ homepage = "https://rakshasa.github.io/rtorrent/";
+ description = "An ncurses client for libtorrent, ideal for use with screen, tmux, or dtach";
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ ebzzry codyopel ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix
deleted file mode 100644
index ead7d9f79fb5..000000000000
--- a/pkgs/tools/networking/p2p/rtorrent/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ lib, stdenv, fetchurl, fetchFromGitHub, pkg-config
-, libtool, autoconf, automake, cppunit
-, libtorrent, ncurses, libsigcxx, curl
-, zlib, openssl, xmlrpc_c
-
-# This no longer works
-, colorSupport ? false
-}:
-
-stdenv.mkDerivation rec {
- pname = "rtorrent";
- version = "0.9.8";
-
- src = fetchFromGitHub {
- owner = "rakshasa";
- repo = pname;
- rev = "v${version}";
- sha256 = "0hcaf1brk402caa7hhlb2r1c93mjzxkm8gb19xfl33gkp3jpf372";
- };
-
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [
- libtool autoconf automake cppunit
- libtorrent ncurses libsigcxx curl zlib openssl xmlrpc_c
- ];
-
- # Optional patch adds support for custom configurable colors
- # https://github.com/Chlorm/chlorm_overlay/blob/master/net-p2p/rtorrent/README.md
- patches = lib.optional colorSupport (fetchurl {
- url = "https://gist.githubusercontent.com/codyopel/a816c2993f8013b5f4d6/raw/b952b32da1dcf14c61820dfcf7df00bc8918fec4/rtorrent-color.patch";
- sha256 = "00gcl7yq6261rrfzpz2k8bd7mffwya0ifji1xqcvhfw50syk8965";
- });
-
- preConfigure = "./autogen.sh";
-
- configureFlags = [ "--with-xmlrpc-c" "--with-posix-fallocate" ];
-
- enableParallelBuilding = true;
-
- postInstall = ''
- mkdir -p $out/share/man/man1 $out/share/doc/rtorrent
- mv doc/old/rtorrent.1 $out/share/man/man1/rtorrent.1
- mv doc/rtorrent.rc $out/share/doc/rtorrent/rtorrent.rc
- '';
-
- meta = with lib; {
- homepage = "https://rakshasa.github.io/rtorrent/";
- description = "An ncurses client for libtorrent, ideal for use with screen, tmux, or dtach";
-
- platforms = platforms.unix;
- maintainers = with maintainers; [ ebzzry codyopel ];
- license = licenses.gpl2Plus;
- };
-}
diff --git a/pkgs/tools/security/kbs2/default.nix b/pkgs/tools/security/kbs2/default.nix
index 54c9bfa1f4b1..5cccc1dd5f52 100644
--- a/pkgs/tools/security/kbs2/default.nix
+++ b/pkgs/tools/security/kbs2/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "kbs2";
- version = "0.3.0";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "woodruffw";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-Mh56VjFHwjiZ0fvOF3fFw+1IU5HwkRdMlFrt3tZjcZY=";
+ sha256 = "1bipphrzfz4dfzaqn1q60qazs7ylcx0b34gyl4q6d6jivsrhi8a4";
};
- cargoSha256 = "sha256-hjUDLA5vNCCIEFQsAhv3hDur1LIGQKYO2rR6AoEb+wA=";
+ cargoSha256 = "0r254k85hqf2v8kdhwld8k7b350qjvkwfw2v22ikk2b41b2g4gbw";
nativeBuildInputs = [ installShellFiles ]
++ lib.optionals stdenv.isLinux [ python3 ];
diff --git a/pkgs/tools/security/keysmith/default.nix b/pkgs/tools/security/keysmith/default.nix
deleted file mode 100644
index 142e9c1e4a04..000000000000
--- a/pkgs/tools/security/keysmith/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ lib
-, mkDerivation
-, makeWrapper
-, fetchFromGitHub
-, cmake
-, extra-cmake-modules
-, qtbase
-, qtquickcontrols2
-, qtdeclarative
-, qtgraphicaleffects
-, kirigami2
-, oathToolkit
-, ki18n
-, libsodium
-}:
-mkDerivation rec {
-
- pname = "keysmith";
- version = "0.2";
-
- src = fetchFromGitHub {
- owner = "KDE";
- repo = "keysmith";
- rev = "v${version}";
- sha256 = "1gvzw23mly8cp7ag3xpbngpid9gqrfj8cyv9dar6i9j660bh03km";
- };
-
- nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper ];
-
- buildInputs = [ libsodium ki18n oathToolkit kirigami2 qtquickcontrols2 qtbase ];
- propagatedBuildInput = [ oathToolkit ];
-
- meta = with lib; {
- description = "OTP client for Plasma Mobile and Desktop";
- license = licenses.gpl3;
- homepage = "https://github.com/KDE/keysmith";
- maintainers = with maintainers; [ shamilton ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix
index 4d8107902e6e..a9785cde190b 100644
--- a/pkgs/tools/security/nuclei/default.nix
+++ b/pkgs/tools/security/nuclei/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "nuclei";
- version = "2.5.2";
+ version = "2.5.3";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = pname;
rev = "v${version}";
- sha256 = "1rn4qys3af41f40zr4gi23zy9gawbbjddssm95v5a4zyd5xjfr6b";
+ sha256 = "sha256-LcOErqnjnBjC2OKObI1r4ydJ2mes2j6WdQpyHi0rLoU=";
};
- vendorSha256 = "04q9japkv41127kl0x2268n6j13y22qg1icd783cl40584ajk2am";
+ vendorSha256 = "sha256-lC88sV/WGZuiFZhXNdmMhDyrBdCxbspvpl8JPBS4in4=";
modRoot = "./v2";
subPackages = [
diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/tools/security/terrascan/default.nix
index 0308bc5d35bc..da338ba347ca 100644
--- a/pkgs/tools/security/terrascan/default.nix
+++ b/pkgs/tools/security/terrascan/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "terrascan";
- version = "1.11.0";
+ version = "1.12.0";
src = fetchFromGitHub {
owner = "accurics";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-vKKBbTculy/r1l3lHnHiBZLAwhw/61kDAsypa0o2VXQ=";
+ sha256 = "sha256-DYWp7D2CQxasEYkoCEa0KdFQDvo4rNgRcTKzxYLsYFg=";
};
vendorSha256 = "0vx406y3kj1qmgr1y9vg3rprwjpm5g8p9shmhq28gp7sxz3j82ry";
diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix
index 7b56e50e3bc0..a0a06e2906c4 100644
--- a/pkgs/tools/security/yara/default.nix
+++ b/pkgs/tools/security/yara/default.nix
@@ -14,14 +14,14 @@
}:
stdenv.mkDerivation rec {
- version = "4.1.2";
+ version = "4.1.3";
pname = "yara";
src = fetchFromGitHub {
owner = "VirusTotal";
repo = "yara";
rev = "v${version}";
- sha256 = "0n716snh0h5pk00kps6xvfi8z16xw12h1a8cd7w02cj2537xzj3m";
+ sha256 = "sha256-7t2KksI3l+wFHqUSw2L4FXepMTJfTow/cTFYA47YBqY=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
diff --git a/pkgs/tools/text/anewer/default.nix b/pkgs/tools/text/anewer/default.nix
new file mode 100644
index 000000000000..e41b12cee447
--- /dev/null
+++ b/pkgs/tools/text/anewer/default.nix
@@ -0,0 +1,22 @@
+{ lib, rustPlatform, fetchFromGitHub }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "anewer";
+ version = "0.1.6";
+
+ src = fetchFromGitHub {
+ owner = "ysf";
+ repo = pname;
+ rev = version;
+ sha256 = "181mi674354bddnq894yyq587w7skjh35vn61i41vfi6lqz5dy3d";
+ };
+
+ cargoSha256 = "sha256-LJ0l5CZM5NqdbCZe4ELkYf9EkKyBxL/LrNmFy+JS6gM=";
+
+ meta = with lib; {
+ description = "Append lines from stdin to a file if they don't already exist in the file";
+ homepage = "https://github.com/ysf/anewer";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ figsoda ];
+ };
+}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 73fff60ff456..eb5abb37d382 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -53,6 +53,7 @@ mapAliases ({
aminal = throw "aminal was renamed to darktile."; # added 2021-09-28
ammonite-repl = ammonite; # added 2017-05-02
amsn = throw "amsn has been removed due to being unmaintained."; # added 2020-12-09
+ angelfish = libsForQt5.plasmaMobileGear.angelfish; # added 2021-10-06
antimicro = throw "antimicro has been removed as it was broken, see antimicroX instead."; # added 2020-08-06
arduino_core = arduino-core; # added 2015-02-04
ardour_5 = throw "ardour_5 has been removed. see https://github.com/NixOS/nixpkgs/issues/139549"; # added 2021-09-28
@@ -84,9 +85,6 @@ mapAliases ({
bomi = throw "bomi has been removed from nixpkgs since it was broken and abandoned upstream"; # added 2020-12-10
btrfsProgs = btrfs-progs; # added 2016-01-03
bitsnbots = throw "bitsnbots has been removed because it was broken and upstream missing"; # added 2021-08-22
- bittorrentSync = throw "bittorrentSync has been deprecated by resilio-sync."; # added 2019-06-03
- bittorrentSync14 = throw "bittorrentSync14 has been deprecated by resilio-sync."; # added 2019-06-03
- bittorrentSync20 = throw "bittorrentSync20 has been deprecated by resilio-sync."; # added 2019-06-03
# bitwarden_rs renamed to vaultwarden with release 1.21.0 (2021-04-30)
bitwarden_rs = vaultwarden;
@@ -100,7 +98,6 @@ mapAliases ({
buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12
buildGo112Package = throw "buildGo112Package has been removed"; # added 2020-04-26
buildGo112Module = throw "buildGo112Module has been removed"; # added 2020-04-26
- buildkite-agent2 = throw "buildkite-agent2 has been discontinued. Please use buildkite-agent (v3.x)"; # added 2018-09-26
buildkite-agent3 = buildkite-agent; # added 2018-09-26
bundler_HEAD = bundler; # added 2015-11-15
calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement."; # added 2021-01-13
@@ -143,7 +140,6 @@ mapAliases ({
coprthr = throw "coprthr has been removed."; # added 2019-12-08
couchdb = throw "couchdb was removed from nixpkgs, use couchdb3 instead"; # added 2021-03-03
couchdb2 = throw "couchdb2 was removed from nixpkgs, use couchdb3 instead"; # added 2021-03-03
- corebird = throw "corebird was deprecated 2019-10-02: See https://www.patreon.com/posts/corebirds-future-18921328. Please use Cawbird as replacement.";
coredumper = throw "coredumper has been removed: abandoned by upstream."; # added 2019-11-16
cpp_ethereum = throw "cpp_ethereum has been removed; abandoned upstream."; # added 2020-11-30
cryptol = throw "cryptol was removed due to prolonged broken build"; # added 2020-08-21
@@ -223,7 +219,6 @@ mapAliases ({
emacs27WithPackages = emacs27.pkgs.withPackages; # added 2020-12-18
emacsWithPackages = emacs.pkgs.withPackages; # added 2020-12-18
emacsPackages = emacs.pkgs; # added 2020-12-18
- emby = throw "The Emby derivation has been removed, see jellyfin instead for a free software fork."; # added 2019-05-01
enblendenfuse = enblend-enfuse; # 2015-09-30
envelope = throw "envelope has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-05
esniper = throw "esniper has been removed because upstream no longer maintains it (and it no longer works)"; # added 2021-04-12
@@ -268,15 +263,12 @@ mapAliases ({
fontconfig 2.10.x hasn't had a release in years, is vulnerable to CVE-2016-5384
and has only been used for old fontconfig caches.
'';
- font-droid = throw "font-droid has been deprecated by noto-fonts"; # 2019-04-12
foomatic_filters = foomatic-filters; # 2016-08
fsharp41 = throw "fsharp41 has been removed, please use dotnet-sdk_5 or later";
fuse_exfat = exfat; # 2015-09-11
fuseki = apache-jena-fuseki; # added 2018-04-25
- fusesmb = throw "fusesmb is abandoned by upstream"; # added 2019-10-15
fwupdate = throw "fwupdate was merged into fwupd"; # added 2020-05-19
g4py = python3Packages.geant4; # added 2020-06-06
- gccApple = throw "gccApple is no longer supported"; # added 2018-04-25
gdal_1_11 = throw "gdal_1_11 was removed. Use gdal instead."; # added 2021-04-03
gdb-multitarget = gdb; # added 2017-11-13
gdk_pixbuf = gdk-pixbuf; # added 2019-05-22
@@ -399,6 +391,7 @@ mapAliases ({
keepassx2-http = keepassx-reboot; # added 2016-10-17
kexectools = kexec-tools; # added 2021-09-03
keybase-go = keybase; # added 2016-08-24
+ keysmith = libsForQt5.plasmaMobileGear.keysmith; # added 2021-07-14
kinetic-cpp-client = throw "kinetic-cpp-client has been removed from nixpkgs, as it's abandoned."; # 2020-04-28
kicad-with-packages3d = kicad; # added 2019-11-25
kindlegen = throw "kindlegen has been removed from nixpkgs, as it's abandoned and no longer available for download."; # 2021-03-09
@@ -410,7 +403,6 @@ mapAliases ({
kvm = qemu_kvm; # added 2018-04-25
latinmodern-math = lmmath;
letsencrypt = certbot; # added 2016-05-16
- leksah = throw "To use leksah, refer to the instructions in https://github.com/leksah/leksah."; # added 2019-04-28
libaudit = audit; # added 2018-04-25
libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25
libcanberra_gtk3 = libcanberra-gtk3; # added 2018-02-25
@@ -564,7 +556,6 @@ mapAliases ({
mobile_broadband_provider_info = mobile-broadband-provider-info; # added 2018-02-25
moby = throw "moby has been removed, merged into linuxkit in 2018. Use linuxkit instead.";
module_init_tools = kmod; # added 2016-04-22
- mono-zeroconf = throw "mono-zeroconf was deprecated on 2019-09-20: abandoned by upstream.";
mozart = mozart2-binary; # added 2019-09-23
mozart-binary = mozart2-binary; # added 2019-09-23
mpd_clientlib = libmpdclient; # added 2021-02-11
@@ -709,7 +700,6 @@ mapAliases ({
polarssl = mbedtls; # added 2018-04-25
poppler_qt5 = libsForQt5.poppler; # added 2015-12-19
postgresql96 = postgresql_9_6;
- postgresql100 = throw "postgresql100 was deprecated on 2018-10-21: use postgresql_10 instead";
# postgresql plugins
pgjwt = postgresqlPackages.pgjwt;
pg_repack = postgresqlPackages.pg_repack;
@@ -731,7 +721,6 @@ mapAliases ({
pinentry_qt5 = pinentry-qt; # added 2020-02-11
postgis = postgresqlPackages.postgis;
# end
- ppl-address-book = throw "ppl-address-book deprecated on 2019-05-02: abandoned by upstream.";
privateer = throw "privateer was removed because it was broken"; # added 2021-05-18
processing3 = processing; # added 2019-08-16
procps-ng = procps; # added 2018-06-08
@@ -764,14 +753,12 @@ mapAliases ({
qwt6 = libsForQt5.qwt; # added 2015-12-19
qtkeychain = throw "the qtkeychain attribute (qt4 version) has been removes, use the qt5 version: libsForQt5.qtkeychain"; # added 2021-08-04
qtcurve = libsForQt5.qtcurve; # added 2020-11-07
- qtpfsgui = throw "qtpfsgui is now luminanceHDR"; # added 2019-06-26
quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # added 2020-04-09
raspberrypi-tools = throw "raspberrypi-tools has been removed in favor of identical 'libraspberrypi'"; # added 2020-12-24
rdf4store = throw "rdf4store has been removed from nixpkgs."; # added 2019-12-21
rdiff_backup = rdiff-backup; # added 2014-11-23
rdmd = dtools; # added 2017-08-19
readline80 = throw "readline-8.0 is no longer supported in nixpkgs, please use 'readline' for main supported version or 'readline81' for most recent version"; # added 2021-04-22
- rhc = throw "rhc was deprecated on 2019-04-09: abandoned by upstream.";
rng_tools = rng-tools; # added 2018-10-24
robomongo = robo3t; #added 2017-09-28
rocm-runtime-ext = throw "rocm-runtime-ext has been removed, since its functionality was added to rocm-runtime"; #added 2020-08-21
@@ -792,22 +779,12 @@ mapAliases ({
rkt = throw "rkt was archived by upstream"; # added 2020-05-16
rpiboot-unstable = rpiboot; # added 2021-07-30
rtv = throw "rtv was archived by upstream. Consider using tuir, an actively maintained fork"; # added 2021-08-08
- ruby_2_0_0 = throw "ruby_2_0_0 was deprecated on 2018-02-13: use a newer version of ruby";
- ruby_2_1_0 = throw "ruby_2_1_0 was deprecated on 2018-02-13: use a newer version of ruby";
- ruby_2_2_9 = throw "ruby_2_2_9 was deprecated on 2018-02-13: use a newer version of ruby";
- ruby_2_3_6 = throw "ruby_2_3_6 was deprecated on 2018-02-13: use a newer version of ruby";
- ruby_2_3 = throw "ruby_2_3 was deprecated on 2019-09-06: use a newer version of ruby";
- ruby_2_4_3 = throw "ruby_2_4_3 was deprecated on 2018-02-13: use a newer version of ruby";
- ruby_2_4 = throw "ruby_2_4 was deprecated in 2019-12: use a newer version of ruby";
- ruby_2_5_0 = throw "ruby_2_5_0 was deprecated on 2018-02-13: use a newer version of ruby";
- rubyPackages_2_4 = throw "rubyPackages_2_4 was deprecated in 2019-12: use a newer version of rubyPackages instead";
- ruby_2_5 = throw "ruby_2_5 was deprecated in 2021-02: use a newer version of ruby";
- rubyPackages_2_5 = throw "rubyPackages_2_5 was deprecated in 2021-02: use a newer version of rubyPackages instead";
rubygems = throw "rubygems was deprecated on 2016-03-02: rubygems is now bundled with ruby";
rubyMinimal = throw "rubyMinimal was removed due to being unused";
runCommandNoCC = runCommand;
runCommandNoCCLocal = runCommandLocal;
runwayml = throw "runwayml is now a webapp"; # added 2021-04-17
+ rustracerd = throw "rustracerd has been removed because it is broken and unmaintained"; # added 2021-10-19
rxvt_unicode-with-plugins = rxvt-unicode; # added 2020-02-02
rxvt_unicode = rxvt-unicode-unwrapped; # added 2020-02-02
subversion19 = throw "subversion19 has been removed as it has reached its end of life"; # added 2021-03-31
@@ -829,15 +806,11 @@ mapAliases ({
s6PortableUtils = s6-portable-utils; # added 2018-07-23
sagemath = sage; # added 2018-10-27
sam = deadpixi-sam; # added 2018-04-25
- samba3 = throw "Samba 3 is discontinued, please switch to samba4"; # added 2019-10-15
- samba3_light = throw "Samba 3 is discontinued, please switch to samba4"; # added 2019-10-15
- sambaMaster = throw "sambaMaster was removed in 2019-09-13: outdated and no longer needed";
samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25
saneBackends = sane-backends; # added 2016-01-02
saneBackendsGit = sane-backends; # added 2016-01-02
sane-backends-git = sane-backends; # added 2021-02-19
saneFrontends = sane-frontends; # added 2016-01-02
- sapic = throw "sapic was deprecated on 2019-1-19: sapic is bundled with 'tamarin-prover' now";
scaff = throw "scaff is deprecated - replaced by https://gitlab.com/jD91mZM2/inc (not in nixpkgs yet)"; # added 2020-03-01
scim = sc-im; # added 2016-01-22
scollector = bosun; # added 2018-04-25
@@ -850,7 +823,6 @@ mapAliases ({
skype = skypeforlinux; # added 2017-07-27
skype_call_recorder = throw "skype_call_recorder has been removed from nixpkgs, because it stopped working when classic Skype was retired."; # added 2020-10-31
skype4pidgin = throw "skype4pidgin has been remove from nixpkgs, because it stopped working when classic Skype was retired."; # added 2021-07-14
- skydive = throw "skydive has been removed from nixpkgs (2019-09-10)";
slack-dark = slack; # added 2020-03-27
slic3r-prusa3d = prusa-slicer; # added 2019-05-21
slurm-llnl = slurm; # renamed July 2017
@@ -907,7 +879,6 @@ mapAliases ({
stanchion = throw "Stanchion was part of riak-cs which is not maintained anymore"; # added 2020-10-14
stumpwm-git = throw "stumpwm-git has been broken for a long time and lispPackages.stumpwm follows Quicklisp that is close to git version"; # added 2021-05-09
surf-webkit2 = surf; # added 2017-04-02
- sup = throw "sup was deprecated on 2019-09-10: abandoned by upstream";
swec = throw "swec has been removed; broken and abandoned upstream."; # added 2021-10-14
swfdec = throw "swfdec has been removed as broken and unmaintained."; # added 2020-08-23
swtpm-tpm2 = swtpm; # added 2021-02-26
@@ -938,7 +909,6 @@ mapAliases ({
terraform-provider-lxd = terraform-providers.lxd; # added 2020-03-16
terraform-provider-nixos = terraform-providers.nixos; # added 2018-09-28
tesseract_4 = tesseract4; # added 2018-12-19
- testdisk-photorec = throw "testdisk-photorec: This package was a duplicate, please use testdisk or testdisk-qt instead"; # added 2019-10-13
tex-gyre-bonum-math = tex-gyre-math.bonum; # added 2018-04-03
tex-gyre-pagella-math = tex-gyre-math.pagella; # added 2018-04-03
tex-gyre-schola-math = tex-gyre-math.schola; # added 2018-04-03
@@ -946,8 +916,8 @@ mapAliases ({
tftp_hpa = tftp-hpa; # added 2015-04-03
timescale-prometheus = promscale; # added 2020-09-29
timetable = throw "timetable has been removed, as the upstream project has been abandoned"; # added 2021-09-05
- tomcat7 = throw "tomcat7 has been removed from nixpkgs as it has reached end of life."; # added 2022-06-16
- tomcat8 = throw "tomcat8 has been removed from nixpkgs as it has reached end of life."; # added 2022-06-16
+ tomcat7 = throw "tomcat7 has been removed from nixpkgs as it has reached end of life."; # added 2021-06-16
+ tomcat8 = throw "tomcat8 has been removed from nixpkgs as it has reached end of life."; # added 2021-06-16
tomcat85 = throw "tomcat85 has been removed from nixpkgs as it has reached end of life."; # added 2020-03-11
torbrowser = tor-browser-bundle-bin; # added 2017-04-05
torch = throw "torch has been removed, as the upstream project has been abandoned"; # added 2020-03-28
@@ -980,7 +950,6 @@ mapAliases ({
uzbl = throw "uzbl has been removed from nixpkgs, as it's unmaintained and uses insecure libraries";
v4l_utils = v4l-utils; # added 2019-08-07
v8_3_16_14 = throw "v8_3_16_14 was removed in 2019-11-01: no longer referenced by other packages";
- valadoc = throw "valadoc was deprecated on 2019-10-10: valadoc was merged into vala 0.38";
vamp = { vampSDK = vamp-plugin-sdk; }; # added 2020-03-26
varnish62 = throw "varnish62 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-07-26
varnish63 = throw "varnish63 was removed from nixpkgs, because it is unmaintained upstream. Please switch to a different release."; # 2021-07-26
@@ -1003,7 +972,6 @@ mapAliases ({
wicd = throw "wicd has been removed as it is abandoned."; # added 2021-09-11
wineStaging = wine-staging; # added 2018-01-08
winusb = woeusb; # added 2017-12-22
- winstone = throw "winstone is not supported anymore. Alternatives are Jetty or Tomcat."; # added 2019-05-14
winswitch = throw "winswitch has been removed from nixpkgs."; # added 2019-12-10
wireshark-gtk = throw "wireshark-gtk is not supported anymore. Use wireshark-qt or wireshark-cli instead."; # added 2019-11-18
wireguard = wireguard-tools; # added 2018-05-19
@@ -1096,11 +1064,6 @@ mapAliases ({
tor-browser-unwrapped = throw "tor-browser-unwrapped was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452."; # added 2020-01-10
dina-font-pcf = dina-font; # added 2020-02-09
- # added 2019-04-13
- # *-polly pointed to llvmPackages_latest
- llvm-polly = throw "llvm-polly: clang is now built with polly-plugin by default";
- clang-polly = throw "clang-polly: clang is now built with polly-plugin by default";
-
/* Cleanup before 20.09 */
oraclejdk8psu = throw ''
oraclejdk8psu: The *psu versions of oraclejdk aren't provided by upstream anymore and were therefore removed!
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2d12d01244f1..7def9cf264d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -904,6 +904,8 @@ with pkgs;
airspy = callPackage ../applications/radio/airspy { };
+ airspyhf = callPackage ../applications/radio/airspyhf { };
+
airtame = callPackage ../applications/misc/airtame { };
aj-snapshot = callPackage ../applications/audio/aj-snapshot { };
@@ -971,6 +973,11 @@ with pkgs;
vopono = callPackage ../tools/networking/vopono { };
+ winbox = callPackage ../tools/admin/winbox {
+ wine = wineWowPackages.staging;
+ use64 = true;
+ };
+
xcd = callPackage ../tools/misc/xcd { };
xtrt = callPackage ../tools/archivers/xtrt { };
@@ -1169,6 +1176,8 @@ with pkgs;
stdenv = if stdenv.targetPlatform.isAarch64 then gcc10Stdenv else stdenv;
});
+ anewer = callPackage ../tools/text/anewer { };
+
angle-grinder = callPackage ../tools/text/angle-grinder {};
ansifilter = callPackage ../tools/text/ansifilter {};
@@ -2258,6 +2267,12 @@ with pkgs;
bs-platform = callPackage ../development/compilers/bs-platform {};
+ ciano = callPackage ../applications/graphics/ciano {
+ inherit (pantheon) granite;
+ python = python3;
+ gtk = gtk3;
+ };
+
c3d = callPackage ../applications/graphics/c3d {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
@@ -6785,6 +6800,8 @@ with pkgs;
lottieconverter = callPackage ../tools/misc/lottieconverter { };
+ lpcnetfreedv = callPackage ../development/libraries/lpcnetfreedv { };
+
lsd = callPackage ../tools/misc/lsd { };
lsdvd = callPackage ../tools/cd-dvd/lsdvd {};
@@ -7021,8 +7038,6 @@ with pkgs;
kea = callPackage ../tools/networking/kea { };
- keysmith = libsForQt5.callPackage ../tools/security/keysmith { };
-
ispell = callPackage ../tools/text/ispell {};
iodash = callPackage ../development/libraries/iodash { };
@@ -7172,9 +7187,21 @@ with pkgs;
libnids = callPackage ../tools/networking/libnids { };
- libtorrent = callPackage ../tools/networking/p2p/libtorrent { };
+ rakshasa-rtorrent = recurseIntoAttrs
+ (callPackage ../tools/networking/p2p/rakshasa-rtorrent {
+ callPackage = newScope pkgs.rakshasa-rtorrent;
+ });
- libtorrent-jesec = callPackage ../tools/networking/p2p/libtorrent-jesec { };
+ rtorrent = rakshasa-rtorrent.rtorrent;
+ libtorrent = rakshasa-rtorrent.libtorrent;
+
+ jesec-rtorrent = recurseIntoAttrs
+ (callPackage ../tools/networking/p2p/jesec-rtorrent {
+ callPackage = newScope pkgs.jesec-rtorrent;
+ });
+
+ rtorrent-jesec = jesec-rtorrent.rtorrent;
+ libtorrent-jesec = jesec-rtorrent.libtorrent;
libmpack = callPackage ../development/libraries/libmpack { };
@@ -8424,6 +8451,8 @@ with pkgs;
pinnwand = callPackage ../servers/pinnwand { };
+ piping-server-rust = callPackage ../servers/piping-server-rust { };
+
pirate-get = callPackage ../tools/networking/pirate-get { };
pipr = callPackage ../applications/misc/pipr { };
@@ -9010,10 +9039,6 @@ with pkgs;
rsstail = callPackage ../applications/networking/feedreaders/rsstail { };
- rtorrent = callPackage ../tools/networking/p2p/rtorrent { };
-
- rtorrent-jesec = callPackage ../tools/networking/p2p/rtorrent-jesec { };
-
rubber = callPackage ../tools/typesetting/rubber { };
rubocop = rubyPackages.rubocop;
@@ -12769,9 +12794,6 @@ with pkgs;
rustracer = callPackage ../development/tools/rust/racer {
inherit (darwin.apple_sdk.frameworks) Security;
};
- rustracerd = callPackage ../development/tools/rust/racerd {
- inherit (darwin.apple_sdk.frameworks) Security;
- };
rust-analyzer-unwrapped = callPackage ../development/tools/rust/rust-analyzer {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
@@ -13489,14 +13511,12 @@ with pkgs;
autoreconfHook = buildPackages.autoreconfHook269;
bison = buildPackages.bison_3_5;
})
- ruby_2_6
ruby_2_7
ruby_3_0;
ruby = ruby_2_7;
rubyPackages = rubyPackages_2_7;
- rubyPackages_2_6 = recurseIntoAttrs ruby_2_6.gems;
rubyPackages_2_7 = recurseIntoAttrs ruby_2_7.gems;
rubyPackages_3_0 = recurseIntoAttrs ruby_3_0.gems;
@@ -15320,8 +15340,6 @@ with pkgs;
ycmd = callPackage ../development/tools/misc/ycmd {
inherit (darwin.apple_sdk.frameworks) Cocoa;
python = python3;
- # currently broken
- rustracerd = null;
};
yodl = callPackage ../development/tools/misc/yodl { };
@@ -16989,6 +17007,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) IOKit;
};
+ libad9361 = callPackage ../development/libraries/libad9361 { };
+
libadwaita = callPackage ../development/libraries/libadwaita { };
libaec = callPackage ../development/libraries/libaec { };
@@ -19237,6 +19257,8 @@ with pkgs;
sdrplay = callPackage ../applications/radio/sdrplay {};
+ sdrpp = callPackage ../applications/radio/sdrpp { };
+
sblim-sfcc = callPackage ../development/libraries/sblim-sfcc {};
selinux-sandbox = callPackage ../os-specific/linux/selinux-sandbox { };
@@ -23639,8 +23661,6 @@ with pkgs;
});
android-studio = androidStudioPackages.stable;
- angelfish = libsForQt5.callPackage ../applications/networking/browsers/angelfish { };
-
animbar = callPackage ../applications/graphics/animbar { };
antfs-cli = callPackage ../applications/misc/antfs-cli {};
@@ -24976,6 +24996,8 @@ with pkgs;
shiboken2;
};
+ freedv = callPackage ../applications/radio/freedv { };
+
freemind = callPackage ../applications/misc/freemind {
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
@@ -26196,6 +26218,8 @@ with pkgs;
lscolors = callPackage ../applications/misc/lscolors { };
+ lucky-commit = callPackage ../applications/version-management/git-and-tools/lucky-commit { };
+
luddite = with python3Packages; toPythonApplication luddite;
lumail = callPackage ../applications/networking/mailreaders/lumail {
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index da6bd08e5673..4220d57aee1d 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -395,6 +395,8 @@ in {
isgx = callPackage ../os-specific/linux/isgx { };
+ rr-zen_workaround = callPackage ../development/tools/analysis/rr/zen_workaround.nix { };
+
sysdig = callPackage ../os-specific/linux/sysdig {};
systemtap = callPackage ../development/tools/profiling/systemtap { };
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 9e24ea29e7f2..bf85ffe07ffa 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -62,6 +62,7 @@ mapAliases ({
prompt_toolkit = prompt-toolkit;
pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20
pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04
+ pysmart-smartx = pysmart; # added 2021-10-22
pytestcov = pytest-cov; # added 2021-01-04
pytest-pep8 = pytestpep8; # added 2021-01-04
pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10
@@ -84,5 +85,5 @@ mapAliases ({
tvnamer = throw "python3Packages.tvnamer was moved to tvnamer"; # 2021-07-05
WazeRouteCalculator = wazeroutecalculator; # 2021-09-29
websocket_client = websocket-client;
- zc_buildout221 = zc_buildout; # added 2021-07-21
+ zc-buildout221 = zc-buildout; # added 2021-07-21
})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 61cadea5f264..fafa812eb6ea 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3833,6 +3833,8 @@ in {
j2cli = callPackage ../development/python-modules/j2cli { };
+ jaeger-client = callPackage ../development/python-modules/jaeger-client { };
+
janus = callPackage ../development/python-modules/janus { };
jaraco_classes = callPackage ../development/python-modules/jaraco_classes { };
@@ -4011,6 +4013,8 @@ in {
pkgs-docker = pkgs.docker;
};
+ jupyter-server-mathjax = callPackage ../development/python-modules/jupyter-server-mathjax { };
+
jupyter-sphinx = callPackage ../development/python-modules/jupyter-sphinx { };
jupyter-telemetry = callPackage ../development/python-modules/jupyter-telemetry { };
@@ -6989,7 +6993,7 @@ in {
pysmappee = callPackage ../development/python-modules/pysmappee { };
- pysmart-smartx = callPackage ../development/python-modules/pysmart-smartx { };
+ pysmart = callPackage ../development/python-modules/pysmart { };
pysmartapp = callPackage ../development/python-modules/pysmartapp { };
@@ -9120,6 +9124,8 @@ in {
inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate CoreFoundation CoreGraphics CoreVideo;
};
+ threadloop = callPackage ../development/python-modules/threadloop { };
+
threadpool = callPackage ../development/python-modules/threadpool { };
threadpoolctl = callPackage ../development/python-modules/threadpoolctl { };
@@ -10007,7 +10013,7 @@ in {
zarr = callPackage ../development/python-modules/zarr { };
- zc_buildout = callPackage ../development/python-modules/buildout { };
+ zc-buildout = callPackage ../development/python-modules/buildout { };
zc_buildout_nix = callPackage ../development/python-modules/buildout-nix { };
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index 21d11d339f3a..bc3f5524e6aa 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -108,6 +108,8 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea
kquickimageedit = callPackage ../development/libraries/kquickimageedit { };
+ kweathercore = libsForQt5.callPackage ../development/libraries/kweathercore { };
+
ldutils = callPackage ../development/libraries/ldutils { };
libcommuni = callPackage ../development/libraries/libcommuni { };